From f81a38057f1d240fe7b7a069612776f788bc88ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Mon, 28 Jun 2021 12:14:12 +0200
Subject: [PATCH 01/14] updated README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 517494c82..45bbee19c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![alt text][logo]
 
 
-[![poco-ci](https://github.com/pocoproject/poco/actions/workflows/ci.yml/badge.svg?branch=poco-1.11.0)](https://github.com/pocoproject/poco/actions/workflows/ci.yml)
+[![poco-ci](https://github.com/pocoproject/poco/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/pocoproject/poco/actions/workflows/ci.yml)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/370/badge)](https://bestpractices.coreinfrastructure.org/projects/370)
 
 

From 94832726810a3116ce8c9887c17675716dbb6243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Tue, 10 Aug 2021 09:40:48 +0200
Subject: [PATCH 02/14] Create close-inactive-issues.yml

---
 .github/workflows/close-inactive-issues.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/close-inactive-issues.yml

diff --git a/.github/workflows/close-inactive-issues.yml b/.github/workflows/close-inactive-issues.yml
new file mode 100644
index 000000000..4495c2b05
--- /dev/null
+++ b/.github/workflows/close-inactive-issues.yml
@@ -0,0 +1,19 @@
+name: Close inactive issues
+on:
+  schedule:
+    - cron: "30 2 * * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v3
+        with:
+          days-before-issue-stale: 365
+          days-before-issue-close: 60
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 365 days with no activity."
+          close-issue-message: "This issue was closed because it has been inactive for 60 days since being marked as stale."
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

From 9d1c428c861f2e5ccf09149bbe8d2149720c5896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Sun, 17 Apr 2022 20:53:19 +0200
Subject: [PATCH 03/14] PocoDoc: fix iframe sandboxing

---
 PocoDoc/resources/index.thtml | 2 +-
 PocoDoc/src/DocWriter.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PocoDoc/resources/index.thtml b/PocoDoc/resources/index.thtml
index f568ed1c6..6d2fb3115 100644
--- a/PocoDoc/resources/index.thtml
+++ b/PocoDoc/resources/index.thtml
@@ -16,7 +16,7 @@ ${PocoDoc.customHeadHTML}
 </div>
 <div class="body">
 <div id="navigation">
-<iframe sandbox src="navigation.html" onload="iFrameResize(this);" scrolling="no"></iframe>
+<iframe sandbox="allow-scripts allow-top-navigation-by-user-activation allow-same-origin" src="navigation.html" onload="iFrameResize(this);" scrolling="no"></iframe>
 </div>
 <div id="content">
 <h2>User Guides And Tutorials</h2>
diff --git a/PocoDoc/src/DocWriter.cpp b/PocoDoc/src/DocWriter.cpp
index dbe382d02..40067d52c 100644
--- a/PocoDoc/src/DocWriter.cpp
+++ b/PocoDoc/src/DocWriter.cpp
@@ -808,7 +808,7 @@ void DocWriter::writeNavigationFrame(std::ostream& ostr, const std::string& grou
 		query += item;
 	}
 	ostr << "<div id=\"navigation\">\n";
-	ostr << "<iframe sandbox src=\"navigation.html" << query << "\" onload=\"iFrameResize(this);\" scrolling=\"no\"></iframe>\n";
+	ostr << "<iframe sandbox=\"allow-scripts allow-top-navigation-by-user-activation allow-same-origin\" src=\"navigation.html" << query << "\" onload=\"iFrameResize(this);\" scrolling=\"no\"></iframe>\n";
 	ostr << "</div>\n";
 }
 

From b83a66500b1134f819f867f8abab3d0f15e326e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Wed, 20 Apr 2022 11:56:40 +0200
Subject: [PATCH 04/14] create poco-1.11.3 branch, bump version

---
 CHANGELOG                         | 6 ++++++
 DLLVersion.rc                     | 4 ++--
 Foundation/include/Poco/Version.h | 2 +-
 VERSION                           | 2 +-
 doc/99100-ReleaseNotes.page       | 7 +++++++
 libversion                        | 2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2cce38b75..6feaa125a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
 This is the changelog file for the POCO C++ Libraries.
 
+Release 1.11.2 (2022-05-XX)
+===========================
+
+- TODO
+
+
 Release 1.11.2 (2022-04-16)
 ===========================
 
diff --git a/DLLVersion.rc b/DLLVersion.rc
index 4dc20e6f6..75c78e578 100644
--- a/DLLVersion.rc
+++ b/DLLVersion.rc
@@ -4,8 +4,8 @@
 
 #include "winres.h"
 
-#define POCO_VERSION 1,11,2,0
-#define POCO_VERSION_STR "1.11.2"
+#define POCO_VERSION 1,11,3,0
+#define POCO_VERSION_STR "1.11.3"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION POCO_VERSION
diff --git a/Foundation/include/Poco/Version.h b/Foundation/include/Poco/Version.h
index a0a05a92c..9ef9c629b 100644
--- a/Foundation/include/Poco/Version.h
+++ b/Foundation/include/Poco/Version.h
@@ -35,7 +35,7 @@
 //      Ax: alpha releases
 //      Bx: beta releases
 //
-#define POCO_VERSION 0x010B0200
+#define POCO_VERSION 0x010B0300
 
 
 #endif // Foundation_Version_INCLUDED
diff --git a/VERSION b/VERSION
index ca7176690..0a5af26df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.11.2
+1.11.3
diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page
index ca8c4214e..9454ee357 100644
--- a/doc/99100-ReleaseNotes.page
+++ b/doc/99100-ReleaseNotes.page
@@ -1,6 +1,13 @@
 POCO C++ Libraries Release Notes
 AAAIntroduction
 
+!!!Release 1.11.3
+
+!!Summary of Changes
+
+  - TODO
+
+
 !!!Release 1.11.2
 
 !!Summary of Changes
diff --git a/libversion b/libversion
index 9d1ce53f8..24af08a48 100644
--- a/libversion
+++ b/libversion
@@ -1 +1 @@
-82
\ No newline at end of file
+83
\ No newline at end of file

From 60100d839f8891c937cf411f263434294af7829f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Wed, 20 Apr 2022 11:59:50 +0200
Subject: [PATCH 05/14] update copyright date

---
 ActiveRecord/Compiler/src/Compiler.cpp          | 2 +-
 Encodings/Compiler/src/TextEncodingCompiler.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ActiveRecord/Compiler/src/Compiler.cpp b/ActiveRecord/Compiler/src/Compiler.cpp
index 140f24be4..f5bd06faa 100644
--- a/ActiveRecord/Compiler/src/Compiler.cpp
+++ b/ActiveRecord/Compiler/src/Compiler.cpp
@@ -78,7 +78,7 @@ protected:
 		helpFormatter.setHeader(
 			"\n"
 			"The POCO C++ Libraries ActiveRecord ORM Compiler.\n"
-			"Copyright (c) 2020-2021 by Applied Informatics Software Engineering GmbH.\n"
+			"Copyright (c) 2020-2022 by Applied Informatics Software Engineering GmbH.\n"
 			"All rights reserved.\n\n"
 			"This program generates C++ source code from an ActiveRecord "
 			"XML definition. "
diff --git a/Encodings/Compiler/src/TextEncodingCompiler.cpp b/Encodings/Compiler/src/TextEncodingCompiler.cpp
index 08299432f..ff1e410c9 100644
--- a/Encodings/Compiler/src/TextEncodingCompiler.cpp
+++ b/Encodings/Compiler/src/TextEncodingCompiler.cpp
@@ -117,7 +117,7 @@ protected:
 		helpFormatter.setHeader(
 			"\n"
 			"The POCO C++ Text Encodings Compiler.\n"
-			"Copyright (c) 2018-2021 by Applied Informatics Software Engineering GmbH.\n"
+			"Copyright (c) 2018-2022 by Applied Informatics Software Engineering GmbH.\n"
 			"All rights reserved.\n\n"
 			"This program compiles Unicode character encoding tables "
 			"from http://www.unicode.org/Public/MAPPINGS/ to TextEncoding "

From 11dbce9a5567ef90059cd08dd6cbc6bac9303003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Wed, 20 Apr 2022 12:19:21 +0200
Subject: [PATCH 06/14] #3567: check legacy provider existence for legacy
 exception #3567

---
 Crypto/include/Poco/Crypto/OpenSSLInitializer.h | 4 ++--
 Crypto/src/OpenSSLInitializer.cpp               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
index aa29cc63e..4bba5455f 100644
--- a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
+++ b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
@@ -63,10 +63,10 @@ public:
 		/// Shuts down the OpenSSL machinery.
 
 	static bool isFIPSEnabled();
-		// Returns true if FIPS mode is enabled, false otherwise.
+		/// Returns true if FIPS mode is enabled, false otherwise.
 
 	static void enableFIPSMode(bool enabled);
-		// Enable or disable FIPS mode. If FIPS is not available, this method doesn't do anything.
+		/// Enable or disable FIPS mode. If FIPS is not available, this method doesn't do anything.
 
 protected:
 	enum
diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp
index 3cdeb1470..e873f242b 100644
--- a/Crypto/src/OpenSSLInitializer.cpp
+++ b/Crypto/src/OpenSSLInitializer.cpp
@@ -136,8 +136,8 @@ void OpenSSLInitializer::initialize()
 		}
 		if (!_legacyProvider)
 		{
-			_legacyProvider  = OSSL_PROVIDER_load(NULL, "legacy");
-			if (!_defaultProvider) throw CryptoException("Failed to load OpenSSL legacy provider");
+			_legacyProvider = OSSL_PROVIDER_load(NULL, "legacy");
+			if (!_legacyProvider) throw CryptoException("Failed to load OpenSSL legacy provider");
 		}
 #endif
 	}

From 3b3747eb405eb459217963411c10f8751336d1bd Mon Sep 17 00:00:00 2001
From: Alex Fabijanic <alex@pocoproject.org>
Date: Fri, 22 Apr 2022 15:59:55 +0000
Subject: [PATCH 07/14] fix(OpenSSLInitializer): unload provider on
 uninitialize (#3567)

---
 Crypto/src/OpenSSLInitializer.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp
index e873f242b..1cc3cf0dd 100644
--- a/Crypto/src/OpenSSLInitializer.cpp
+++ b/Crypto/src/OpenSSLInitializer.cpp
@@ -158,6 +158,16 @@ void OpenSSLInitializer::uninitialize()
 		delete [] _mutexes;
 #endif
 
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+		if (_defaultProvider)
+		{
+			OSSL_PROVIDER_unload(_defaultProvider);
+		}
+		if (_legacyProvider)
+		{
+			OSSL_PROVIDER_unload(_legacyProvider);
+		}
+#endif
 	}
 }
 

From 484eed7e9b32cd9bd45d7b965ebe79676a1e9509 Mon Sep 17 00:00:00 2001
From: Alex Fabijanic <alex@pocoproject.org>
Date: Fri, 22 Apr 2022 22:24:54 +0200
Subject: [PATCH 08/14] fix(OpenSSLInitializer): fix provider unloading (#3567)

---
 Crypto/include/Poco/Crypto/OpenSSLInitializer.h |  5 +++--
 Crypto/src/OpenSSLInitializer.cpp               | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
index 4bba5455f..25e4c477a 100644
--- a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
+++ b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
@@ -24,6 +24,7 @@
 #include <openssl/crypto.h>
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 #include <openssl/provider.h>
+#include <atomic>
 #endif
 #if defined(OPENSSL_FIPS) && OPENSSL_VERSION_NUMBER < 0x010001000L
 #include <openssl/fips.h>
@@ -91,8 +92,8 @@ private:
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-	static OSSL_PROVIDER* _defaultProvider;
-	static OSSL_PROVIDER* _legacyProvider;
+	static std::atomic<OSSL_PROVIDER*> _defaultProvider;
+	static std::atomic<OSSL_PROVIDER*> _legacyProvider;
 #endif
 };
 
diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp
index 1cc3cf0dd..4678d2229 100644
--- a/Crypto/src/OpenSSLInitializer.cpp
+++ b/Crypto/src/OpenSSLInitializer.cpp
@@ -66,8 +66,8 @@ Poco::FastMutex* OpenSSLInitializer::_mutexes(0);
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-OSSL_PROVIDER* OpenSSLInitializer::_defaultProvider(0);
-OSSL_PROVIDER* OpenSSLInitializer::_legacyProvider(0);
+std::atomic<OSSL_PROVIDER*> OpenSSLInitializer::_defaultProvider(0);
+std::atomic<OSSL_PROVIDER*> OpenSSLInitializer::_legacyProvider(0);
 #endif
 
 
@@ -159,13 +159,14 @@ void OpenSSLInitializer::uninitialize()
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-		if (_defaultProvider)
+		OSSL_PROVIDER* provider = nullptr;
+		if ((provider = _defaultProvider.exchange(nullptr)))
 		{
-			OSSL_PROVIDER_unload(_defaultProvider);
+			OSSL_PROVIDER_unload(provider);
 		}
-		if (_legacyProvider)
+		if ((provider = _legacyProvider.exchange(nullptr)))
 		{
-			OSSL_PROVIDER_unload(_legacyProvider);
+			OSSL_PROVIDER_unload(provider);
 		}
 #endif
 	}

From 132f4f476747e686421386e60a945b288355ef7b Mon Sep 17 00:00:00 2001
From: Alex Fabijanic <alex@pocoproject.org>
Date: Tue, 26 Apr 2022 16:14:23 +0000
Subject: [PATCH 09/14] fix(OpenSSLInitializer): revert unload provider on
 uninitialize (#3567)

---
 Crypto/include/Poco/Crypto/OpenSSLInitializer.h |  5 ++---
 Crypto/src/OpenSSLInitializer.cpp               | 16 ++--------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
index 25e4c477a..4bba5455f 100644
--- a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
+++ b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
@@ -24,7 +24,6 @@
 #include <openssl/crypto.h>
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 #include <openssl/provider.h>
-#include <atomic>
 #endif
 #if defined(OPENSSL_FIPS) && OPENSSL_VERSION_NUMBER < 0x010001000L
 #include <openssl/fips.h>
@@ -92,8 +91,8 @@ private:
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-	static std::atomic<OSSL_PROVIDER*> _defaultProvider;
-	static std::atomic<OSSL_PROVIDER*> _legacyProvider;
+	static OSSL_PROVIDER* _defaultProvider;
+	static OSSL_PROVIDER* _legacyProvider;
 #endif
 };
 
diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp
index 4678d2229..1d2c92551 100644
--- a/Crypto/src/OpenSSLInitializer.cpp
+++ b/Crypto/src/OpenSSLInitializer.cpp
@@ -66,8 +66,8 @@ Poco::FastMutex* OpenSSLInitializer::_mutexes(0);
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-std::atomic<OSSL_PROVIDER*> OpenSSLInitializer::_defaultProvider(0);
-std::atomic<OSSL_PROVIDER*> OpenSSLInitializer::_legacyProvider(0);
+OSSL_PROVIDER* OpenSSLInitializer::_defaultProvider(0);
+OSSL_PROVIDER* OpenSSLInitializer::_legacyProvider(0);
 #endif
 
 
@@ -157,18 +157,6 @@ void OpenSSLInitializer::uninitialize()
 #endif
 		delete [] _mutexes;
 #endif
-
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-		OSSL_PROVIDER* provider = nullptr;
-		if ((provider = _defaultProvider.exchange(nullptr)))
-		{
-			OSSL_PROVIDER_unload(provider);
-		}
-		if ((provider = _legacyProvider.exchange(nullptr)))
-		{
-			OSSL_PROVIDER_unload(provider);
-		}
-#endif
 	}
 }
 

From 02dcc550b40c2c5009fdea3540486749e8982c61 Mon Sep 17 00:00:00 2001
From: Alex Fabijanic <alex@pocoproject.org>
Date: Thu, 5 May 2022 17:41:52 -0500
Subject: [PATCH 10/14] fix(MySQL): MySQL UUID binding temporary string #3587

---
 Data/MySQL/src/Binder.cpp               |  3 +--
 Data/include/Poco/Data/AbstractBinder.h |  7 +++++++
 Data/src/AbstractBinder.cpp             | 13 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Data/MySQL/src/Binder.cpp b/Data/MySQL/src/Binder.cpp
index c1fb4e7df..9bb19ee9d 100644
--- a/Data/MySQL/src/Binder.cpp
+++ b/Data/MySQL/src/Binder.cpp
@@ -213,8 +213,7 @@ void Binder::bind(std::size_t pos, const Time& val, Direction dir)
 
 void Binder::bind(std::size_t pos, const UUID& val, Direction dir)
 {
-	std::string str = val.toString();
-	bind(pos, str, dir);
+	bind(pos, toString(val), dir);
 }
 
 
diff --git a/Data/include/Poco/Data/AbstractBinder.h b/Data/include/Poco/Data/AbstractBinder.h
index f0ea63346..f084ab843 100644
--- a/Data/include/Poco/Data/AbstractBinder.h
+++ b/Data/include/Poco/Data/AbstractBinder.h
@@ -356,6 +356,13 @@ public:
 
 	static bool isInBound(Direction dir);
 		/// Returns true if direction is in bound;
+
+protected:
+	const std::string& toString(const UUID& uuid);
+
+private:
+	using StringList = std::vector<std::string*>;
+	std::unique_ptr<StringList> _pStrings;
 };
 
 
diff --git a/Data/src/AbstractBinder.cpp b/Data/src/AbstractBinder.cpp
index 8fe39e256..f3ac4edcf 100644
--- a/Data/src/AbstractBinder.cpp
+++ b/Data/src/AbstractBinder.cpp
@@ -33,6 +33,19 @@ AbstractBinder::AbstractBinder()
 
 AbstractBinder::~AbstractBinder()
 {
+	if (_pStrings)
+	{
+		for (auto& s : *_pStrings)
+			delete s;
+	}
+}
+
+
+const std::string& AbstractBinder::toString(const UUID& uuid)
+{
+	if (!_pStrings) _pStrings.reset(new StringList);
+	_pStrings->push_back(new std::string(uuid.toString()));
+	return *_pStrings->back();
 }
 
 

From 7cf1342d299d81ae15b2a43e6d22056aac41f235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Sun, 12 Jun 2022 07:37:06 +0200
Subject: [PATCH 11/14] update CI link in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c8de21652..7d0c57f1f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![alt text][logo]
 
 
-[![poco-ci](https://github.com/pocoproject/poco/actions/workflows/ci.yml/badge.svg?branch=poco-1.11.2)](https://github.com/pocoproject/poco/actions/workflows/ci.yml)
+[![poco-ci](https://github.com/pocoproject/poco/actions/workflows/ci.yml/badge.svg?branch=poco-1.11.3)](https://github.com/pocoproject/poco/actions/workflows/ci.yml)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/370/badge)](https://bestpractices.coreinfrastructure.org/projects/370)
 
 

From d15755daa686d5def82dd32582983a83f6f6922a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Sun, 12 Jun 2022 07:52:57 +0200
Subject: [PATCH 12/14] #3632: add overloads to ctor and connect() to allow
 passing a Poco::Net::StreamSocket/Poco::Net::SecureStreamSocket to enable TLS
 connections without introduding a direct dependency to NetSSL.

---
 Redis/include/Poco/Redis/Client.h | 10 ++++++++++
 Redis/src/Client.cpp              | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/Redis/include/Poco/Redis/Client.h b/Redis/include/Poco/Redis/Client.h
index 079947e9b..009cd1899 100644
--- a/Redis/include/Poco/Redis/Client.h
+++ b/Redis/include/Poco/Redis/Client.h
@@ -87,6 +87,11 @@ public:
 	Client(const Net::SocketAddress& addrs);
 		/// Constructor which connects to the given Redis host/port.
 
+	Client(const Net::StreamSocket& socket);
+		/// Constructor which connects using an existing TCP
+		/// connection. This can be used to connect via TLS, if the
+		/// given socket is a Poco::Net::SecureStreamSocket.
+
 	virtual ~Client();
 		/// Destroys the Client.
 
@@ -113,6 +118,11 @@ public:
 	void connect(const Net::SocketAddress& addrs, const Timespan& timeout);
 		/// Connects to the given Redis server.
 
+	void connect(const Net::StreamSocket& socket);
+		/// Connects to the given Redis server using an existing TCP
+		/// connection. This can be used to connect via TLS, if the
+		/// given socket is a Poco::Net::SecureStreamSocket.
+
 	void disconnect();
 		/// Disconnects from the Redis server.
 
diff --git a/Redis/src/Client.cpp b/Redis/src/Client.cpp
index 6d28f6a29..60b97f4e5 100644
--- a/Redis/src/Client.cpp
+++ b/Redis/src/Client.cpp
@@ -61,6 +61,16 @@ Client::Client(const Net::SocketAddress& addrs):
 }
 
 
+Client::Client(const Net::StreamSocket& socket):
+	_address(),
+	_socket(),
+	_input(0),
+	_output(0)
+{
+	connect(socket);
+}
+
+
 Client::~Client()
 {
 	delete _input;
@@ -133,6 +143,18 @@ void Client::connect(const Net::SocketAddress& addrs, const Timespan& timeout)
 }
 
 
+void Client::connect(const Poco::Net::StreamSocket& socket)
+{
+	poco_assert(! _input);
+	poco_assert(! _output);
+
+	_address = socket.peerAddress();
+	_socket = socket;
+	_input = new RedisInputStream(_socket);
+	_output = new RedisOutputStream(_socket);
+}
+
+
 void Client::disconnect()
 {
 	delete _input;

From 0bab41e1bf3865dd3782973808f229cc475771d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Sun, 12 Jun 2022 07:57:57 +0200
Subject: [PATCH 13/14] updated changelog

---
 CHANGELOG                   | 7 +++++--
 doc/99100-ReleaseNotes.page | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6feaa125a..dd04b8d0c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,12 @@
 This is the changelog file for the POCO C++ Libraries.
 
-Release 1.11.2 (2022-05-XX)
+Release 1.11.3 (2022-06-12)
 ===========================
 
-- TODO
+- GH #3567: fix(openssl-initializer): check legacy provider existence for legacy exception
+- GH #3587: MySQL UUID binding temporary string
+- GH #3632: Redis - add TLS support
+- updated a few copyright dates
 
 
 Release 1.11.2 (2022-04-16)
diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page
index 9454ee357..201ade50e 100644
--- a/doc/99100-ReleaseNotes.page
+++ b/doc/99100-ReleaseNotes.page
@@ -5,7 +5,10 @@ AAAIntroduction
 
 !!Summary of Changes
 
-  - TODO
+  - GH #3567: fix(openssl-initializer): check legacy provider existence for legacy exception
+  - GH #3587: MySQL UUID binding temporary string
+  - GH #3632: Redis - add TLS support
+  - updated a few copyright dates
 
 
 !!!Release 1.11.2

From f70101cb05cb8e5b373ebea48dc6d8ddbff70ac3 Mon Sep 17 00:00:00 2001
From: Aleksandar Fabijanic <aleks-f@users.noreply.github.com>
Date: Fri, 8 Jul 2022 17:29:18 +0200
Subject: [PATCH 14/14] devel-release-1.12.0 (#3673)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix percent-encoded fragment modification in Poco::URI

Before this commit using Poco::URI class to parse specific URIs that had
percent-encoded fragment identifier resulted in the loss of information
concerning the way the fragment identifier was encoded. There could be the cases
when the  result of Poco::URI object serialization to string did not match the
original URI string Poco::URI object was created from.

In this commit we change the internal logic of fragment processing in Poco::URI,
so that the fragment is stored inside the class in raw form (the same way as
query string). The methods getFragment and setFragment work the old way (with
percent-decoded fragment values), new methods getRawFragment and setRawFragment
are added to get access to the original fragment representation.

* Remove SDK version from VS2022 test projects (#3607)

* Remaining changes for Windows on ARM64 support (#3608)

* Add ARM64 to Foundation

* Changed lib, and bin folders of ARM64 builds

* Updated buildwin.cmd

* Added missing closing </File> tags (#3610)

* feat(Platform): LoongArch support #3460

* fix(PollSet): default enable epoll on linux

* default disable new state on move

* fix(UDPHandler): data race #3613; clean up all Net tsan warnings

* ProGen vs170 projects with Win32,x64,ARM64 (#3612)

* fix(TCPServer): #1884 #1965

* fix(LogFile): LogFile_STD (LogFileImpl) fails to recover from getting out of space #2084

* Avoid clang 10 -Wimplicit-int-float-conversion warning/error when converting int into float (#2943)

Example of warning (error when using -Werror) we get with clang 10:

/remote/intdeliv/components/osp/Poco/Foundation/19-0-0-6/include/Poco/Dynamic/VarHolder.h:444:14: error: implicit conversion from 'int' to 'float' changes value from 2147483647 to 2147483648 [-Werror,-Wimplicit-int-float-conversion]
                if (from > std::numeric_limits<T>::max())
                         ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/remote/intdeliv/components/osp/Poco/Foundation/19-0-0-6/include/Poco/Dynamic/VarHolder.h:332:4: note: in instantiation of function template specialization 'Poco::Dynamic::VarHolder::checkUpperLimitFloat<float, int>' requested here
                        checkUpperLimitFloat<F,T>(from);
                        ^
/remote/intdeliv/components/osp/Poco/Foundation/19-0-0-6/include/Poco/Dynamic/VarHolder.h:2175:3: note: in instantiation of function template specialization 'Poco::Dynamic::VarHolder::convertToSmaller<float, int>' requested here
                convertToSmaller(_val, val);
                ^

* chore(ci): run ci on pull requests

* #2569: Added TIMESTAMP data type support on MySQL (#3471)

* Unit test for TIMESTAMP data type in MySQL.

* Added support for TIMESTAMP data type.

Co-authored-by: Hector Toledo Soto <hsoto@transperfect.com>

* MongoDB::Array: int --> size_t in get for consistency with size(), new helper functions to add elements to an array. (#3016)

* fix(CppUnit): enable_if disarm numeric notEqualsMessage

* fix(CppUnit): CppUnit notEqualsMessage causing compile errors #3615

* Syslog: Include Facility to Syslog Message (#3452)

* Fixed indentation

* Added Facility to Message in RemoteSyslogListener

* Net: make MessageHeader limits configurable (#3404)

* Add Message::getAll (#3104)

* chore(Message): fix formatting for #3104

* Output to stderr in Poco::WindowsConsoleChannel (#3058)

- Fixes #3056

* HTTPDigestCredentials added support for RFC7616 algorithms (#3026)

* chore(SHA2Engine): fix formatting for #3026

* Added support for SQLite transaction types using Session property (#3018)

* chore(SQLite): fix enum names case for #3018

* fix(HTTPResponse): Add 425 / HTTP_TOO_EARLY to HTTPResponse::HTTPStatus #3592

* fix(SQLite): windows build (global var does not link) #3018

* Added missing SocketProactor class to ProGen source (#3616)

* Added missing SocketProactor class to ProGen source

* ProGen'd VS2022 Net project

* chore(Net): regenerate VS 140,150,160 projects #3614

* Handle MariaDB JSON columns since they are stored as `longtext` (#3621)

* Also extract BLOBs when reading longtext columns as std::string

* Fix error message in unit test

* Added unit test to read longtext columns as std::string

* Use `tx_isolation` when connected to MariaDB regardless of version (#3622)

* Use `tx_isolation` when connected to MariaDB regardless of version

* Rename variable

* Handle MariaDB server info in the middle of the string

* Updated to PCRE version 8.45  (#3623)

* Add missing changes from zlib update

* Updated to PCRE version 8.45

Build on Win32 and Linux, RegularExpressionTest was successful

* Fix/tsan (#3617)

* fix(Foundation): tsan warnings fixes

* fix(Thread_POSIX): tsan warnings fixes; add tsan.suppress

* fix(Util): tsan fixes

* fix(netSSL_OpenSSL): tsan fixes

* fix(Data): tsan warnings fixes

* feat(ci): add tsan job

* feat(ci): add tsan job, another attempt

* feat(ci): add tsan job, 3rd attempt

* fix(Foundation): tsan warnings fixes

* fix(Thread_POSIX): tsan warnings fixes; add tsan.suppress

* fix(Util): tsan fixes

* fix(netSSL_OpenSSL): tsan fixes

* fix(Data): tsan warnings fixes

* feat(ci): add tsan job

* feat(ci): add tsan job, another attempt

* feat(ci): add tsan job, 3rd attempt

* fix(ResultMetadata): memory leak #3474

* feat(ci): disable ActiveDispatcher tests for tsan runs

* feat(ci): try to fix tsan options file detection (again)

* chore(TestLibrary: correct spelling

* fix(ci): fix tsan run; add -y to apt; disable samples build for some jobs

* fix(ci): add mysql ports

* feat(ci): add VS asan

* feat(double-conversion): Upgrade double-conversion to v3.2.0 #3624

* chore(asan): disable msvc asan build (dll not found)

* chore(double-conversion): move NumericString.h before double-conversion includes to prevent min/max collision; reinstate lost loongarch64

* chore(JSON): sync pdjson with upstream

* fix(Statement): Poco::Data::Statement becomes unusable after exception #2287

* added facility to SyslogChannel (#3453)

* TCPServerDispatcher.h: missing <atomic> (#2961)

Fixes: b8af168151fe0147fb06557029002ae226dcc549
Fixes: #1965

* Windows embedded OpenSSL: Fixed bogus warning during compilation (External OpenSSL defined but internal headers used - possible mismatch!) (#3627)

* fix(double-conversion): nios2 and riscv defines

* fix(double-conversion): riscv defines

* fix(cmake): TestLibrary debug postfix

* fix(cmake): add WebNotifier to samples #3184

* doc(Crypto): Fix error in find_package example #3088

* fix(Event): Event data race #3629

* fix(AsyncChannel): race condition in AsyncChannel close/log #1039

* fix(Zip): Zip 64-bit extensions not set #2590 (tentative) (#3604)

* PocoDoc: fix handling of font-style tags if tag is immediately followed by punctuation

* Static code analyzer warnings #2688

* MinGW: fatal error: kernelspecs.h: No such file #2691

* Poco::Data::SessionPool change connection timeout #3241

* Makefile: space(s) following target name will break build (during link) #3062

* json format PrintHandler #2678

* indicate compiler that functions will never return (#3639)

* fix warning C4717: 'format<std::vector<std::any,std::allocatorstd::an… (#3640)

* fix warning C4717: 'format<std::vector<std::any,std::allocatorstd::any > >': recursive on all control paths, function will cause runtime stack overflow

* keep origin format.

* fix(format): scope

* fix(Crypto): libPocoCrypto.so: undefined reference to pthread_atfork when linking statically with OpenSSL 1.1 #3073

* chore(LocalConfigurationView): fix style #3529

* fix(ConfigurationView): ConfigurationView and JSON is broken for array access #3635

* FifoBuffer.advance method not throw exception when length==0 (#3641)

* fifobuffer not throw error when length = 0

* Update FIFOBuffer.h

fix indentation

Co-authored-by: Aleksandar Fabijanic <aleks-f@users.noreply.github.com>

* fix(URI): Decoding URI query parameters ( ::getQueryParameters) incompatible with Spring 5 #2619

* fix(NTPClient): NTPClient ignores second fractions #2614

* chore(JSON): add test for #2612

* fix(Platform): MinGW also defines __GNUC__. #3195

* Fix some clang 10 -Wsign-compare warnings (#2960)

In file included from /data/mwrep/res/osp/Poco/JSON/20-0-0-0/include/Poco/JSON/Object.h:22:
In file included from /data/mwrep/res/osp/Poco/JSON/20-0-0-0/include/Poco/JSON/Array.h:23:
In file included from /data/mwrep/res/osp/Poco/Foundation/20-0-0-0/include/Poco/Dynamic/Var.h:26:
In file included from /data/mwrep/res/osp/Poco/Foundation/20-0-0-0/include/Poco/Dynamic/VarHolder.h:22:
In file included from /data/mwrep/res/osp/Poco/Foundation/20-0-0-0/include/Poco/NumberFormatter.h:22:
/data/mwrep/res/osp/Poco/Foundation/20-0-0-0/include/Poco/NumericString.h:220:31: error: comparison of integers of different signs: 'unsigned long' and 'char' [-Werror,-Wsign-compare]
                                if ((limitCheck - result) < add) return false;
                                     ~~~~~~~~~~~~~~~~~~~  ^ ~~~
/data/mwrep/res/osp/Poco/Foundation/20-0-0-0/include/Poco/NumericString.h:229:31: error: comparison of integers of different signs: 'unsigned long' and 'char' [-Werror,-Wsign-compare]
                                if ((limitCheck - result) < add) return false;
                                     ~~~~~~~~~~~~~~~~~~~  ^ ~~~
/data/mwrep/res/osp/Poco/Foundation/20-0-0-0/include/Poco/NumericString.h:240:31: error: comparison of integers of different signs: 'unsigned long' and 'char' [-Werror,-Wsign-compare]
                                if ((limitCheck - result) < add) return false;
                                     ~~~~~~~~~~~~~~~~~~~  ^ ~~~
/data/mwrep/res/osp/Poco/Foundation/20-0-0-0/include/Poco/NumericString.h:249:31: error: comparison of integers of different signs: 'unsigned long' and 'char' [-Werror,-Wsign-compare]
                                if ((limitCheck - result) < add) return false;
                                     ~~~~~~~~~~~~~~~~~~~  ^ ~~~
4 errors generated.

* chore(README): Add vcpkg installation instructions #2940

* fix(SQLite): SQLite::Connector::open() crashes on db file with non existing directory #2285

* fix(MailMessage): read hangs on missing final multipart boundary #2401

* fix(NumberParser): Rounds very large negative numbers to the incorrect values #3580

* fix(JSON::Stringifier): JSON Serializing NAN #3251

* feat(Timespan): Add std::chrono support #2576 #2623

* fix(strToInt): overflows #3580

* fix(strToInt): thousand separator regression #3580

* fix(MySQL::Extractor): MySQL Extractor #2521

* feat(FTPClientSession): activeDataConnection 1.11.0 cannot set specific data port #3372

* feat(Cipher): No access to padding in Cipher #3374

* feat(TypeHandler): DB into() does not compile for more than 20 members in a tuple #3342

* fix(NumberFormatter): Negative precision in NumberFormatter::format() #2511

* Make ParallelSocketReactor thread namable (#3642)

make ParallelSocketReactor thread namable

* fix(Redis): Poco::Redis after executing auth command next command always return OK #2457

* chore(NumberParserTest): add test for #2441

* avoid clang tidy warning (#3646)

* Revert "avoid clang tidy warning (#3646)" (#3648)

This reverts commit b23488d6feab13645ce306fd02fd50635f54b25f.

* fix(VarHolder): limits check

* As of C++11, std::swap is noexcept. #2386 (#3645)

* As of C++11, std::swap is noexcept. #2386

* fix(Any): remove throw on swap

* fix(Any): As of C++11, std::swap is noexcept. #2386

* fix(Any): make size const #2386

* fix(SimpleRowFormatter): clang won't compile noexcept #2386

* a couple of arm fixes

* fix(Any): As of C++11, std::swap is noexcept. #2386

* fix(AnyTest): local() for POCO_NO_SOO# 2386

* test(RSACipher): RSA encryption without private key #2367

* chore(RSACipherTest): delete ciphers #2367

* add separate accessors and mutators for connect, send and receive tim… (#3476)

* add separate accessors and mutators for connect, send and receive timeouts

* implement timeout methods outside of class declaration to conform to existing code structure

* Update HTTPSession.h

Co-authored-by: bfoster <bfoster@malwarebytes.com>
Co-authored-by: Aleksandar Fabijanic <aleks-f@users.noreply.github.com>

* Make poll set interruptable (#3644)

* Make poll set interruptable

* open test for poll set

* fix poll set wake up test

* fix build error

* feat(SecureSocketImpl): how to set the socket of SecureSocketImpl to no-blocking? #2352

* better socket reactor wake up (#3647)

* better socket reactor wake up

* Remove documentation comment from source file

Co-authored-by: Aleksandar Fabijanic <aleks-f@users.noreply.github.com>

* test(MailMesage): MailMessage::read() chokes on Content-disposition #3650

* chore(Net/samples): tcpserver missing from Net/samples/CMakeLists.txt #3651

* fix(CMake): Linking with Foundation on Android gives error #3652 #3653

* #2821: Poco::Buffer: full on creation? - add documentation describing the behavior.

* add note regarding receiveFrame with Poco::Buffer

* merge changes from 1.11.3

* #3633: Redis: Support Authentication

* #3658: Support for chunked transfer encoding trailer

* formatHex with lower case (#3657)

* feat(Socket): add lastErrorDesc()

* fix(Socket): Socket::select EPOLL implementation returns socket in exceptList when empty list is given #3655; mark select as deprecated #1459

* Fix/poll set race (#3630)

* fix(PollSet): PollSet data race #3628

* fix(SocketConnector): SocketConnector test #2875

* fix(PollSet): optimize the amount of locked code; fix and simplify wakeUp logic

* fix(SocketConnectorTest): fix test memleak (data not flowing, handlers not deleted) #2875

* fix(PollSet): clear() and tests

* fix(PollSet): #1459 #3628 #3655 #3661

* fix(PollSet): Integrate windows epoll #2091, #3649

* chore(ProGen): MSVC does not properly recognize std version #3665

* fix(PollSet): eventfd call arg; add wepoll to CMakelists.txt

* fix(PollSet): CMakelists.txt

* fix(cmake): MSVC does not properly recognize std version #3665

* chore(vscode): add mac config

* fix(PollSet): PollSet::add()/update() semantics #3661

* Feat/pcre2 (#3663)

* upgrade to pcre2

* use pcre2_*_8 names

* fix pcre2 lib name for unbundled build

* CMake changes for PCRE2

* add missing macro for unbundled build

* add PCRE2_STATIC

* updated VS project files for pcre2

Co-authored-by: Günter Obiltschnig <guenter.obiltschnig@appinf.com>

* Revert "formatHex with lower case (#3657)" (#3670)

This reverts commit b1823b61c0902252d1e15e8a7175f40e31a865b2.

* Always set thread names on POSIX platforms (#3384)

* chore: gitignore vim .swp files

* feat(POSIX): Always set thread names.

I'm not sure about the original intent to hide it under a DEBUG macro.

Naming the threads in release mode makes it easier to see runtime
application and know which thread pool uses how many threads and what
their names are. Firefox, Chromium and many other apps do this on Linux.

* Remove trailing whitespace (#3668)

* doc: update CHANGLEOG

Co-authored-by: Daniil Zotkin <zotkin@rutoken.ru>
Co-authored-by: Hernan Martinez <hernan.c.martinez@gmail.com>
Co-authored-by: Romain Geissler @ Amadeus <romain.geissler@amadeus.com>
Co-authored-by: hectots <monkey.instinct@gmail.com>
Co-authored-by: Hector Toledo Soto <hsoto@transperfect.com>
Co-authored-by: Matej Kenda <matejken@gmail.com>
Co-authored-by: BeBinder <93721965+BeBinder@users.noreply.github.com>
Co-authored-by: Tavi Cacina <tavi-cacina@users.noreply.github.com>
Co-authored-by: Mathieu Stefani <m.stefani@abc-arbitrage.com>
Co-authored-by: Fritz Elfert <fritz@fritz-elfert.de>
Co-authored-by: Maksim Kita <kitaetoya@gmail.com>
Co-authored-by: Spaky <Spaky@users.noreply.github.com>
Co-authored-by: Azat Khuzhin <a3at.mail@gmail.com>
Co-authored-by: Matej Kenda <matej.kenda@topit.si>
Co-authored-by: Günter Obiltschnig <guenter.obiltschnig@appinf.com>
Co-authored-by: Guillermo Frontera <gfrontera86@gmail.com>
Co-authored-by: junwufan <shelllet.com@gmail.com>
Co-authored-by: JackyWoo <wuchienchao@qq.com>
Co-authored-by: Ben Foster <bfoster7593@gmail.com>
Co-authored-by: bfoster <bfoster@malwarebytes.com>
Co-authored-by: Arun Chandrasekaran <arun@paravision.ai>
Co-authored-by: John Vandenberg <jayvdb@gmail.com>
---
 .github/workflows/ci.yml                      |    57 +-
 .gitignore                                    |     7 +
 .vscode/c_cpp_properties.json                 |   136 +-
 .vscode/settings.json                         |     7 +-
 ActiveRecord/ActiveRecord_vs170.sln           |    60 +
 ActiveRecord/ActiveRecord_vs170.vcxproj       |   271 +-
 ActiveRecord/Compiler/Compiler.progen         |     2 +-
 ActiveRecord/Compiler/Compiler_vs170.sln      |    24 +
 ActiveRecord/Compiler/Compiler_vs170.vcxproj  |   294 +-
 .../testsuite/TestSuite_vs170.vcxproj         |   296 +-
 ApacheConnector/ApacheConnector_vs170.sln     |     8 +
 ApacheConnector/ApacheConnector_vs170.vcxproj |   105 +-
 .../doc/ApacheConnectorUserGuide.page         |    32 +-
 ApacheConnector/include/ApacheConnector.h     |     2 +-
 .../include/ApacheRequestHandlerFactory.h     |     2 +-
 ApacheConnector/include/ApacheServerRequest.h |    12 +-
 .../include/ApacheServerResponse.h            |    20 +-
 ApacheConnector/include/ApacheStream.h        |     8 +-
 .../samples/FormServer/src/FormServer.cpp     |    22 +-
 .../samples/TimeServer/src/TimeServer.cpp     |     4 +-
 ApacheConnector/src/ApacheApplication.cpp     |     2 +-
 .../src/ApacheRequestHandlerFactory.cpp       |     4 +-
 ApacheConnector/src/ApacheServerRequest.cpp   |     8 +-
 ApacheConnector/src/ApacheServerResponse.cpp  |     6 +-
 ApacheConnector/src/ApacheStream.cpp          |     2 +-
 CHANGELOG                                     |   126 +-
 CMakeLists.txt                                |    11 +-
 CppParser/CppParser_vs170.sln                 |    42 +
 CppParser/CppParser_vs170.vcxproj             |   271 +-
 CppParser/include/Poco/CppParser/Attributes.h |    22 +-
 .../include/Poco/CppParser/AttributesParser.h |     6 +-
 CppParser/include/Poco/CppParser/Function.h   |    34 +-
 CppParser/include/Poco/CppParser/NameSpace.h  |    32 +-
 CppParser/include/Poco/CppParser/Parser.h     |     2 +-
 CppParser/include/Poco/CppParser/Struct.h     |    32 +-
 CppParser/include/Poco/CppParser/Utility.h    |     4 +-
 CppParser/include/Poco/CppParser/Variable.h   |     6 +-
 CppParser/src/Attributes.cpp                  |     8 +-
 CppParser/src/AttributesParser.cpp            |     4 +-
 CppParser/src/Function.cpp                    |     8 +-
 CppParser/src/NameSpace.cpp                   |    24 +-
 CppParser/src/Struct.cpp                      |     4 +-
 CppParser/src/Tokenizer.cpp                   |     2 +-
 CppParser/src/Utility.cpp                     |     8 +-
 CppParser/src/Variable.cpp                    |     6 +-
 CppParser/testsuite/TestSuite_vs170.vcxproj   |   296 +-
 CppUnit/CppUnit_vs170.sln                     |    24 +
 CppUnit/CppUnit_vs170.vcxproj                 |   267 +-
 CppUnit/doc/README.html                       |     8 +-
 CppUnit/doc/cookbook.htm                      |     6 +-
 CppUnit/include/CppUnit/CppUnitException.h    |    12 +-
 CppUnit/include/CppUnit/Orthodox.h            |     8 +-
 CppUnit/include/CppUnit/RepeatedTest.h        |     4 +-
 CppUnit/include/CppUnit/Test.h                |     2 +-
 CppUnit/include/CppUnit/TestCase.h            |     8 +-
 CppUnit/include/CppUnit/TestFailure.h         |     2 +-
 CppUnit/include/CppUnit/TestResult.h          |    32 +-
 CppUnit/include/CppUnit/TestSetup.h           |    10 +-
 CppUnit/include/CppUnit/TestSuite.h           |     4 +-
 CppUnit/include/CppUnit/TextTestResult.h      |     2 +-
 CppUnit/include/CppUnit/estring.h             |    20 +-
 CppUnit/src/TestSuite.cpp                     |     2 +-
 Crypto/Crypto_vs170.sln                       |    42 +
 Crypto/Crypto_vs170.vcxproj                   |   273 +-
 Crypto/Makefile                               |     5 +-
 Crypto/include/Poco/Crypto/Cipher.h           |     8 +-
 Crypto/include/Poco/Crypto/CipherFactory.h    |     6 +-
 Crypto/include/Poco/Crypto/DigestEngine.h     |     8 +-
 Crypto/include/Poco/Crypto/ECKeyImpl.h        |     6 +-
 Crypto/include/Poco/Crypto/EVPPKey.h          |     2 +-
 Crypto/include/Poco/Crypto/KeyPairImpl.h      |     2 +-
 Crypto/include/Poco/Crypto/RSADigestEngine.h  |    10 +-
 Crypto/include/Poco/Crypto/RSAKeyImpl.h       |     6 +-
 Crypto/include/Poco/Crypto/X509Certificate.h  |     2 +-
 Crypto/samples/genrsakey/src/genrsakey.cpp    |    24 +-
 Crypto/src/Cipher.cpp                         |    20 +-
 Crypto/src/CryptoTransform.cpp                |     2 +-
 Crypto/src/DigestEngine.cpp                   |     4 +-
 Crypto/src/RSADigestEngine.cpp                |     4 +-
 Crypto/src/X509Certificate.cpp                |     2 +-
 Crypto/testsuite/TestSuite_vs170.vcxproj      |   296 +-
 Crypto/testsuite/src/DigestEngineTest.cpp     |     2 +-
 Crypto/testsuite/src/Driver.cpp               |     4 +-
 Crypto/testsuite/src/RSATest.cpp              |    34 +-
 Crypto/testsuite/src/WinCEDriver.cpp          |     4 +-
 Crypto/testsuite/src/WinDriver.cpp            |     2 +-
 Data/Data_vs170.sln                           |    42 +
 Data/Data_vs170.vcxproj                       |   275 +-
 Data/MySQL/MySQL_vs170.sln                    |    42 +
 Data/MySQL/MySQL_vs170.vcxproj                |   271 +-
 .../MySQL/include/Poco/Data/MySQL/Connector.h |     2 +-
 .../Poco/Data/MySQL/MySQLStatementImpl.h      |    20 +-
 .../include/Poco/Data/MySQL/ResultMetadata.h  |     2 +
 Data/MySQL/src/Extractor.cpp                  |     3 +
 Data/MySQL/src/ResultMetadata.cpp             |    46 +-
 Data/MySQL/src/SessionImpl.cpp                |    24 +-
 Data/MySQL/testsuite/TestSuite_vs170.vcxproj  |   296 +-
 Data/MySQL/testsuite/src/MySQLTest.cpp        |    24 +-
 Data/MySQL/testsuite/src/MySQLTest.h          |     2 +
 Data/MySQL/testsuite/src/SQLExecutor.cpp      |    53 +
 Data/MySQL/testsuite/src/SQLExecutor.h        |     2 +
 Data/ODBC/Makefile                            |     2 +-
 Data/ODBC/ODBC_vs170.sln                      |    42 +
 Data/ODBC/ODBC_vs170.vcxproj                  |   285 +-
 Data/ODBC/include/Poco/Data/ODBC/Connector.h  |     2 +-
 .../ODBC/include/Poco/Data/ODBC/Diagnostics.h |    58 +-
 Data/ODBC/include/Poco/Data/ODBC/Error.h      |     6 +-
 Data/ODBC/include/Poco/Data/ODBC/Handle.h     |    10 +-
 .../include/Poco/Data/ODBC/ODBCMetaColumn.h   |    10 +-
 .../Poco/Data/ODBC/ODBCStatementImpl.h        |    14 +-
 Data/ODBC/include/Poco/Data/ODBC/Parameter.h  |     6 +-
 .../ODBC/include/Poco/Data/ODBC/SessionImpl.h |    16 +-
 Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h   |     8 +-
 .../include/Poco/Data/ODBC/Unicode_WIN32.h    |     4 +-
 Data/ODBC/src/ConnectionHandle.cpp            |    10 +-
 Data/ODBC/src/EnvironmentHandle.cpp           |    10 +-
 Data/ODBC/src/Parameter.cpp                   |    10 +-
 Data/ODBC/src/SessionImpl.cpp                 |    38 +-
 Data/ODBC/src/TypeInfo.cpp                    |    46 +-
 Data/ODBC/src/Unicode_UNIXODBC.cpp            |    36 +-
 Data/ODBC/src/Unicode_WIN32.cpp               |    32 +-
 Data/ODBC/src/Utility.cpp                     |    12 +-
 Data/ODBC/testsuite/TestSuite_vs170.vcxproj   |   296 +-
 Data/ODBC/testsuite/src/ODBCAccessTest.cpp    |     8 +-
 Data/ODBC/testsuite/src/ODBCAccessTest.h      |     2 +-
 Data/ODBC/testsuite/src/ODBCDB2Test.cpp       |    40 +-
 Data/ODBC/testsuite/src/ODBCDB2Test.h         |     2 +-
 Data/ODBC/testsuite/src/ODBCMySQLTest.cpp     |    24 +-
 Data/ODBC/testsuite/src/ODBCMySQLTest.h       |     6 +-
 Data/ODBC/testsuite/src/ODBCOracleTest.cpp    |    80 +-
 Data/ODBC/testsuite/src/ODBCOracleTest.h      |     6 +-
 .../ODBC/testsuite/src/ODBCPostgreSQLTest.cpp |    46 +-
 Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h  |    10 +-
 Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp |    44 +-
 Data/ODBC/testsuite/src/ODBCSQLServerTest.h   |     4 +-
 Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp    |    24 +-
 Data/ODBC/testsuite/src/ODBCSQLiteTest.h      |     2 +-
 Data/ODBC/testsuite/src/ODBCTest.cpp          |    46 +-
 Data/ODBC/testsuite/src/ODBCTest.h            |   102 +-
 Data/ODBC/testsuite/src/ODBCTestSuite.cpp     |    10 +-
 Data/ODBC/testsuite/src/SQLExecutor.cpp       |   502 +-
 Data/ODBC/testsuite/src/SQLExecutor.h         |   142 +-
 Data/PostgreSQL/PostgreSQL_vs170.sln          |    42 +
 Data/PostgreSQL/PostgreSQL_vs170.vcxproj      |   271 +-
 .../testsuite/TestSuite_vs170.vcxproj         |   296 +-
 Data/SQLite/SQLite_vs170.sln                  |    42 +
 Data/SQLite/SQLite_vs170.vcxproj              |   277 +-
 .../include/Poco/Data/SQLite/Notifier.h       |    22 +-
 .../Poco/Data/SQLite/SQLiteStatementImpl.h    |     2 +-
 .../include/Poco/Data/SQLite/SessionImpl.h    |    27 +-
 .../SQLite/include/Poco/Data/SQLite/Utility.h |    40 +-
 Data/SQLite/src/Notifier.cpp                  |    24 +-
 Data/SQLite/src/SQLiteStatementImpl.cpp       |     4 +-
 Data/SQLite/src/SessionImpl.cpp               |    35 +-
 Data/SQLite/src/Utility.cpp                   |     2 +
 Data/SQLite/testsuite/TestSuite_vs170.vcxproj |   296 +-
 Data/SQLite/testsuite/src/SQLiteTest.cpp      |    38 +-
 Data/SQLite/testsuite/src/SQLiteTest.h        |     2 +
 Data/SQLite/testsuite/src/WinCEDriver.cpp     |     2 +-
 Data/doc/00300-DataDeveloperManual.page       |   162 +-
 Data/include/Poco/Data/AbstractBinding.h      |     2 +-
 Data/include/Poco/Data/AbstractSessionImpl.h  |    66 +-
 Data/include/Poco/Data/ArchiveStrategy.h      |    16 +-
 Data/include/Poco/Data/Binding.h              |   192 +-
 Data/include/Poco/Data/Bulk.h                 |    16 +-
 Data/include/Poco/Data/BulkBinding.h          |    20 +-
 Data/include/Poco/Data/BulkExtraction.h       |    40 +-
 Data/include/Poco/Data/Column.h               |    50 +-
 Data/include/Poco/Data/Date.h                 |     4 +-
 Data/include/Poco/Data/LOB.h                  |     4 +-
 Data/include/Poco/Data/LOBStream.h            |     2 +-
 Data/include/Poco/Data/Limit.h                |     4 +-
 Data/include/Poco/Data/MetaColumn.h           |     2 +-
 Data/include/Poco/Data/PooledSessionHolder.h  |     2 +-
 Data/include/Poco/Data/PooledSessionImpl.h    |    10 +-
 Data/include/Poco/Data/Position.h             |     8 +-
 Data/include/Poco/Data/Preparation.h          |    24 +-
 Data/include/Poco/Data/Range.h                |     8 +-
 Data/include/Poco/Data/RecordSet.h            |    28 +-
 Data/include/Poco/Data/Row.h                  |     8 +-
 Data/include/Poco/Data/RowFilter.h            |     2 +-
 Data/include/Poco/Data/RowFormatter.h         |     6 +-
 Data/include/Poco/Data/RowIterator.h          |     2 +-
 Data/include/Poco/Data/SessionFactory.h       |    14 +-
 Data/include/Poco/Data/SessionPool.h          |    45 +-
 Data/include/Poco/Data/SessionPoolContainer.h |    14 +-
 Data/include/Poco/Data/SimpleRowFormatter.h   |    10 +-
 Data/include/Poco/Data/Statement.h            |    14 +-
 Data/include/Poco/Data/StatementCreator.h     |    10 +-
 Data/include/Poco/Data/StatementImpl.h        |     2 +-
 Data/include/Poco/Data/Time.h                 |     4 +-
 Data/include/Poco/Data/Transaction.h          |    24 +-
 Data/include/Poco/Data/TypeHandler.h          |  4090 +++++-
 Data/samples/Binding/src/Binding.cpp          |    20 +-
 Data/samples/CMakeLists.txt                   |     1 +
 Data/samples/RecordSet/Makefile               |     2 +-
 Data/samples/RecordSet/src/RecordSet.cpp      |     8 +-
 Data/samples/RowFormatter/Makefile            |     2 +-
 .../samples/RowFormatter/src/RowFormatter.cpp |    14 +-
 Data/samples/Tuple/Makefile                   |     2 +-
 Data/samples/Tuple/src/Tuple.cpp              |    14 +-
 Data/samples/TypeHandler/Makefile             |     2 +-
 Data/samples/TypeHandler/src/TypeHandler.cpp  |    32 +-
 Data/samples/WebNotifier/WebNotifier.html     |    30 +-
 Data/src/AbstractBinding.cpp                  |     6 +-
 Data/src/AbstractExtraction.cpp               |     4 +-
 Data/src/ArchiveStrategy.cpp                  |    14 +-
 Data/src/Date.cpp                             |     4 +-
 Data/src/MetaColumn.cpp                       |     2 +-
 Data/src/Row.cpp                              |    22 +-
 Data/src/RowFilter.cpp                        |     6 +-
 Data/src/RowFormatter.cpp                     |     2 +-
 Data/src/RowIterator.cpp                      |     6 +-
 Data/src/SQLChannel.cpp                       |    14 +-
 Data/src/SessionFactory.cpp                   |     4 +-
 Data/src/SessionPool.cpp                      |    11 +-
 Data/src/SessionPoolContainer.cpp             |    12 +-
 Data/src/SimpleRowFormatter.cpp               |     4 +-
 Data/src/Statement.cpp                        |    16 +-
 Data/src/StatementCreator.cpp                 |     2 +-
 Data/src/StatementImpl.cpp                    |    50 +-
 Data/src/Time.cpp                             |    10 +-
 Data/src/Transaction.cpp                      |    14 +-
 Data/testsuite/TestSuite_vs170.vcxproj        |   296 +-
 Data/testsuite/src/DataTest.cpp               |   117 +-
 Data/testsuite/src/DataTest.h                 |     6 +-
 Data/testsuite/src/SessionImpl.cpp            |    18 +-
 Data/testsuite/src/SessionImpl.h              |     5 +-
 Data/testsuite/src/SessionPoolTest.cpp        |    35 +-
 Data/testsuite/src/StatementImpl.cpp          |     2 +-
 Data/testsuite/src/TestStatementImpl.cpp      |     9 +-
 Data/testsuite/src/TestStatementImpl.h        |     9 +-
 Data/testsuite/src/WinCEDriver.cpp            |     2 +-
 Encodings/Compiler/Compiler_vs170.sln         |    24 +
 Encodings/Compiler/Compiler_vs170.vcxproj     |   296 +-
 Encodings/Encodings_vs170.sln                 |    42 +
 Encodings/Encodings_vs170.vcxproj             |   271 +-
 Encodings/include/Poco/ISO8859_10Encoding.h   |     2 +-
 Encodings/include/Poco/ISO8859_11Encoding.h   |     2 +-
 Encodings/include/Poco/ISO8859_13Encoding.h   |     2 +-
 Encodings/include/Poco/ISO8859_14Encoding.h   |     2 +-
 Encodings/include/Poco/ISO8859_16Encoding.h   |     2 +-
 Encodings/include/Poco/ISO8859_3Encoding.h    |     2 +-
 Encodings/include/Poco/ISO8859_4Encoding.h    |     2 +-
 Encodings/include/Poco/ISO8859_5Encoding.h    |     2 +-
 Encodings/include/Poco/ISO8859_6Encoding.h    |     2 +-
 Encodings/include/Poco/ISO8859_7Encoding.h    |     2 +-
 Encodings/include/Poco/ISO8859_8Encoding.h    |     2 +-
 Encodings/include/Poco/ISO8859_9Encoding.h    |     2 +-
 .../include/Poco/MacCentralEurRomanEncoding.h |     2 +-
 .../include/Poco/MacChineseSimpEncoding.h     |     2 +-
 .../include/Poco/MacChineseTradEncoding.h     |     2 +-
 Encodings/include/Poco/MacCyrillicEncoding.h  |     2 +-
 Encodings/include/Poco/MacJapaneseEncoding.h  |     2 +-
 Encodings/include/Poco/MacKoreanEncoding.h    |     2 +-
 Encodings/include/Poco/MacRomanEncoding.h     |     2 +-
 Encodings/include/Poco/Windows1253Encoding.h  |     2 +-
 Encodings/include/Poco/Windows1254Encoding.h  |     2 +-
 Encodings/include/Poco/Windows1255Encoding.h  |     2 +-
 Encodings/include/Poco/Windows1256Encoding.h  |     2 +-
 Encodings/include/Poco/Windows1257Encoding.h  |     2 +-
 Encodings/include/Poco/Windows1258Encoding.h  |     2 +-
 Encodings/include/Poco/Windows874Encoding.h   |     2 +-
 Encodings/include/Poco/Windows932Encoding.h   |     2 +-
 Encodings/include/Poco/Windows936Encoding.h   |     2 +-
 Encodings/include/Poco/Windows949Encoding.h   |     2 +-
 Encodings/include/Poco/Windows950Encoding.h   |     2 +-
 Encodings/src/ISO8859_10Encoding.cpp          |    98 +-
 Encodings/src/ISO8859_11Encoding.cpp          |    96 +-
 Encodings/src/ISO8859_13Encoding.cpp          |    98 +-
 Encodings/src/ISO8859_14Encoding.cpp          |    98 +-
 Encodings/src/ISO8859_16Encoding.cpp          |    98 +-
 Encodings/src/ISO8859_3Encoding.cpp           |    98 +-
 Encodings/src/ISO8859_4Encoding.cpp           |    98 +-
 Encodings/src/ISO8859_5Encoding.cpp           |    98 +-
 Encodings/src/ISO8859_6Encoding.cpp           |    88 +-
 Encodings/src/ISO8859_7Encoding.cpp           |    98 +-
 Encodings/src/ISO8859_8Encoding.cpp           |    90 +-
 Encodings/src/ISO8859_9Encoding.cpp           |    98 +-
 Encodings/src/MacCentralEurRomanEncoding.cpp  |    90 +-
 Encodings/src/MacChineseSimpEncoding.cpp      |  3802 +++---
 Encodings/src/MacChineseTradEncoding.cpp      |  6786 +++++-----
 Encodings/src/MacCyrillicEncoding.cpp         |    90 +-
 Encodings/src/MacJapaneseEncoding.cpp         |  3646 +++---
 Encodings/src/MacKoreanEncoding.cpp           |  4326 +++----
 Encodings/src/MacRomanEncoding.cpp            |    90 +-
 Encodings/src/Windows1253Encoding.cpp         |    94 +-
 Encodings/src/Windows1254Encoding.cpp         |    98 +-
 Encodings/src/Windows1255Encoding.cpp         |    94 +-
 Encodings/src/Windows1256Encoding.cpp         |    98 +-
 Encodings/src/Windows1257Encoding.cpp         |    96 +-
 Encodings/src/Windows1258Encoding.cpp         |    96 +-
 Encodings/src/Windows874Encoding.cpp          |    92 +-
 Encodings/testsuite/TestSuite_vs170.vcxproj   |   296 +-
 Foundation/CMakeLists.txt                     |    62 +-
 Foundation/Foundation_vs140.vcxproj           |    99 +-
 Foundation/Foundation_vs140.vcxproj.filters   |   192 +-
 Foundation/Foundation_vs150.vcxproj           |    99 +-
 Foundation/Foundation_vs150.vcxproj.filters   |   192 +-
 Foundation/Foundation_vs160.vcxproj           |   105 +-
 Foundation/Foundation_vs160.vcxproj.filters   |   192 +-
 Foundation/Foundation_vs170.sln               |    54 +
 Foundation/Foundation_vs170.vcxproj           |   683 +-
 Foundation/Foundation_vs170.vcxproj.filters   |   192 +-
 Foundation/Makefile                           |    14 +-
 Foundation/include/Poco/ASCIIEncoding.h       |     2 +-
 Foundation/include/Poco/AbstractDelegate.h    |    12 +-
 Foundation/include/Poco/AbstractObserver.h    |     2 +-
 .../include/Poco/AbstractPriorityDelegate.h   |     4 +-
 Foundation/include/Poco/AbstractStrategy.h    |     6 +-
 .../include/Poco/AccessExpirationDecorator.h  |     2 +-
 Foundation/include/Poco/AccessExpireCache.h   |    12 +-
 .../include/Poco/AccessExpireLRUCache.h       |     4 +-
 Foundation/include/Poco/ActiveDispatcher.h    |     7 +-
 Foundation/include/Poco/ActiveMethod.h        |    12 +-
 Foundation/include/Poco/ActiveResult.h        |   108 +-
 Foundation/include/Poco/ActiveStarter.h       |     2 +-
 Foundation/include/Poco/Activity.h            |    30 +-
 Foundation/include/Poco/Any.h                 |    42 +-
 Foundation/include/Poco/ArchiveStrategy.h     |    16 +-
 Foundation/include/Poco/Array.h               |     4 +-
 Foundation/include/Poco/Ascii.h               |    28 +-
 Foundation/include/Poco/AsyncChannel.h        |     2 +
 Foundation/include/Poco/AutoPtr.h             |     4 +-
 Foundation/include/Poco/AutoReleasePool.h     |    14 +-
 Foundation/include/Poco/Base32Decoder.h       |    16 +-
 Foundation/include/Poco/Base32Encoder.h       |     6 +-
 Foundation/include/Poco/Base64Decoder.h       |     8 +-
 Foundation/include/Poco/Base64Encoder.h       |     2 +-
 Foundation/include/Poco/BasicEvent.h          |     6 +-
 Foundation/include/Poco/Buffer.h              |    17 +-
 Foundation/include/Poco/BufferAllocator.h     |     2 +-
 .../Poco/BufferedBidirectionalStreamBuf.h     |    18 +-
 Foundation/include/Poco/BufferedStreamBuf.h   |    16 +-
 Foundation/include/Poco/Bugcheck.h            |    14 +-
 Foundation/include/Poco/ByteOrder.h           |     2 +-
 Foundation/include/Poco/Channel.h             |    12 +-
 Foundation/include/Poco/Checksum.h            |    12 +-
 Foundation/include/Poco/ClassLibrary.h        |     2 +-
 Foundation/include/Poco/ClassLoader.h         |    18 +-
 Foundation/include/Poco/Clock.h               |    34 +-
 Foundation/include/Poco/Condition.h           |    26 +-
 Foundation/include/Poco/Config.h              |    15 +-
 Foundation/include/Poco/Configurable.h        |     6 +-
 Foundation/include/Poco/ConsoleChannel.h      |    24 +-
 Foundation/include/Poco/CountingStream.h      |    26 +-
 .../include/Poco/DataURIStreamFactory.h       |     2 +-
 Foundation/include/Poco/DateTime.h            |    82 +-
 Foundation/include/Poco/DateTimeFormat.h      |    22 +-
 Foundation/include/Poco/DateTimeFormatter.h   |     8 +-
 Foundation/include/Poco/DateTimeParser.h      |    14 +-
 Foundation/include/Poco/DefaultStrategy.h     |     4 +-
 Foundation/include/Poco/DeflatingStream.h     |    18 +-
 Foundation/include/Poco/DigestStream.h        |     4 +-
 Foundation/include/Poco/DirectoryIterator.h   |    18 +-
 .../include/Poco/DirectoryIterator_UNIX.h     |     6 +-
 .../include/Poco/DirectoryIterator_WIN32U.h   |     6 +-
 Foundation/include/Poco/DirectoryWatcher.h    |    36 +-
 Foundation/include/Poco/Dynamic/Pair.h        |     2 +-
 Foundation/include/Poco/Dynamic/Struct.h      |     2 +-
 Foundation/include/Poco/Dynamic/VarHolder.h   |    54 +-
 Foundation/include/Poco/Dynamic/VarIterator.h |    10 +-
 Foundation/include/Poco/Environment_UNIX.h    |     6 +-
 Foundation/include/Poco/Environment_VX.h      |     6 +-
 Foundation/include/Poco/Environment_WIN32U.h  |     6 +-
 Foundation/include/Poco/Environment_WINCE.h   |    12 +-
 Foundation/include/Poco/ErrorHandler.h        |    20 +-
 Foundation/include/Poco/Event.h               |     6 +-
 Foundation/include/Poco/EventArgs.h           |     2 +-
 Foundation/include/Poco/EventChannel.h        |     2 +-
 Foundation/include/Poco/EventLogChannel.h     |    16 +-
 Foundation/include/Poco/Event_POSIX.h         |    17 +-
 Foundation/include/Poco/Event_VX.h            |     4 +-
 Foundation/include/Poco/Event_WIN32.h         |     8 +-
 Foundation/include/Poco/Exception.h           |    18 +-
 Foundation/include/Poco/ExpirationDecorator.h |     2 +-
 Foundation/include/Poco/Expire.h              |    16 +-
 Foundation/include/Poco/ExpireCache.h         |    12 +-
 Foundation/include/Poco/ExpireLRUCache.h      |     4 +-
 Foundation/include/Poco/ExpireStrategy.h      |     4 +-
 Foundation/include/Poco/FIFOBuffer.h          |    89 +-
 Foundation/include/Poco/FIFOBufferStream.h    |    10 +-
 Foundation/include/Poco/FIFOEvent.h           |     6 +-
 Foundation/include/Poco/FIFOStrategy.h        |     4 +-
 Foundation/include/Poco/FPEnvironment_DEC.h   |    10 +-
 Foundation/include/Poco/FPEnvironment_QNX.h   |    10 +-
 Foundation/include/Poco/FPEnvironment_SUN.h   |    10 +-
 Foundation/include/Poco/File.h                |     6 +-
 Foundation/include/Poco/FileChannel.h         |    26 +-
 Foundation/include/Poco/FileStream.h          |    18 +-
 Foundation/include/Poco/FileStreamFactory.h   |     4 +-
 Foundation/include/Poco/FileStream_POSIX.h    |     2 +-
 Foundation/include/Poco/File_WIN32U.h         |     2 +-
 Foundation/include/Poco/Format.h              |    12 +
 Foundation/include/Poco/Formatter.h           |    10 +-
 Foundation/include/Poco/FormattingChannel.h   |    16 +-
 Foundation/include/Poco/FunctionDelegate.h    |    36 +-
 .../include/Poco/FunctionPriorityDelegate.h   |    20 +-
 Foundation/include/Poco/Glob.h                |    14 +-
 Foundation/include/Poco/HMACEngine.h          |    16 +-
 Foundation/include/Poco/Hash.h                |    16 +-
 Foundation/include/Poco/HashMap.h             |    38 +-
 Foundation/include/Poco/HashSet.h             |    44 +-
 Foundation/include/Poco/HashStatistic.h       |     8 +-
 Foundation/include/Poco/HashTable.h           |    14 +-
 Foundation/include/Poco/HexBinaryDecoder.h    |    14 +-
 Foundation/include/Poco/HexBinaryEncoder.h    |    18 +-
 Foundation/include/Poco/InflatingStream.h     |    34 +-
 Foundation/include/Poco/Instantiator.h        |    12 +-
 Foundation/include/Poco/KeyValueArgs.h        |     8 +-
 Foundation/include/Poco/LRUCache.h            |     6 +-
 Foundation/include/Poco/LRUStrategy.h         |     4 +-
 Foundation/include/Poco/Latin1Encoding.h      |     2 +-
 Foundation/include/Poco/Latin2Encoding.h      |     2 +-
 Foundation/include/Poco/Latin9Encoding.h      |     2 +-
 Foundation/include/Poco/LineEndingConverter.h |    10 +-
 Foundation/include/Poco/LinearHashTable.h     |    96 +-
 Foundation/include/Poco/ListMap.h             |    38 +-
 Foundation/include/Poco/LocalDateTime.h       |    84 +-
 Foundation/include/Poco/LogFile_STD.h         |     1 +
 Foundation/include/Poco/LoggingRegistry.h     |     4 +-
 Foundation/include/Poco/MD4Engine.h           |     2 +-
 Foundation/include/Poco/MD5Engine.h           |     4 +-
 Foundation/include/Poco/Manifest.h            |     2 +-
 Foundation/include/Poco/MemoryStream.h        |    16 +-
 Foundation/include/Poco/Message.h             |     8 +-
 Foundation/include/Poco/MetaObject.h          |    36 +-
 Foundation/include/Poco/MetaProgramming.h     |     8 +-
 Foundation/include/Poco/Mutex.h               |    30 +-
 Foundation/include/Poco/Mutex_POSIX.h         |     4 +-
 Foundation/include/Poco/Mutex_VX.h            |     2 +-
 Foundation/include/Poco/Mutex_WIN32.h         |     2 +-
 Foundation/include/Poco/Mutex_WINCE.h         |     2 +-
 Foundation/include/Poco/NObserver.h           |    26 +-
 Foundation/include/Poco/NamedEvent.h          |     2 +-
 Foundation/include/Poco/NamedEvent_Android.h  |     2 +-
 Foundation/include/Poco/NamedEvent_UNIX.h     |     4 +-
 Foundation/include/Poco/NamedEvent_WIN32U.h   |     6 +-
 Foundation/include/Poco/NamedMutex.h          |     2 +-
 Foundation/include/Poco/NamedMutex_UNIX.h     |     2 +-
 Foundation/include/Poco/NamedMutex_WIN32U.h   |     2 +-
 Foundation/include/Poco/NamedTuple.h          |  4674 +++----
 .../include/Poco/NestedDiagnosticContext.h    |    26 +-
 Foundation/include/Poco/Notification.h        |     2 +-
 Foundation/include/Poco/NotificationCenter.h  |    24 +-
 Foundation/include/Poco/NotificationQueue.h   |    14 +-
 .../include/Poco/NotificationStrategy.h       |     8 +-
 Foundation/include/Poco/NullChannel.h         |     2 +-
 Foundation/include/Poco/NullStream.h          |     6 +-
 Foundation/include/Poco/Nullable.h            |     4 +-
 Foundation/include/Poco/NumberFormatter.h     |    12 +-
 Foundation/include/Poco/NumberParser.h        |    24 +-
 Foundation/include/Poco/NumericString.h       |   131 +-
 Foundation/include/Poco/Observer.h            |    24 +-
 Foundation/include/Poco/Optional.h            |     4 +-
 Foundation/include/Poco/PBKDF2Engine.h        |    46 +-
 Foundation/include/Poco/Path.h                |     4 +-
 Foundation/include/Poco/Path_WIN32U.h         |     2 +-
 Foundation/include/Poco/Path_WINCE.h          |     2 +-
 Foundation/include/Poco/PatternFormatter.h    |    10 +-
 Foundation/include/Poco/Pipe.h                |    12 +-
 Foundation/include/Poco/PipeImpl_POSIX.h      |     2 +-
 Foundation/include/Poco/PipeImpl_WIN32.h      |     2 +-
 Foundation/include/Poco/PipeStream.h          |    14 +-
 Foundation/include/Poco/Platform.h            |     6 +
 Foundation/include/Poco/Platform_VX.h         |     4 +-
 Foundation/include/Poco/Platform_WIN32.h      |     2 +-
 Foundation/include/Poco/PriorityDelegate.h    |    16 +-
 Foundation/include/Poco/PriorityEvent.h       |     6 +-
 Foundation/include/Poco/PriorityExpire.h      |    10 +-
 .../include/Poco/PriorityNotificationQueue.h  |    28 +-
 Foundation/include/Poco/PriorityStrategy.h    |     2 +-
 Foundation/include/Poco/PurgeStrategy.h       |    10 +-
 Foundation/include/Poco/RWLock.h              |     8 +-
 Foundation/include/Poco/RWLock_Android.h      |     6 +-
 Foundation/include/Poco/RWLock_POSIX.h        |     6 +-
 Foundation/include/Poco/RWLock_VX.h           |     4 +-
 Foundation/include/Poco/RWLock_WIN32.h        |     2 +-
 Foundation/include/Poco/RWLock_WINCE.h        |     2 +-
 Foundation/include/Poco/RefCountedObject.h    |     4 +-
 Foundation/include/Poco/RegularExpression.h   |    19 +-
 Foundation/include/Poco/RotateStrategy.h      |    18 +-
 Foundation/include/Poco/Runnable.h            |     4 +-
 Foundation/include/Poco/RunnableAdapter.h     |     6 +-
 Foundation/include/Poco/SHA1Engine.h          |     2 +-
 Foundation/include/Poco/SHA2Engine.h          |    10 +-
 Foundation/include/Poco/ScopedLock.h          |    10 +-
 Foundation/include/Poco/Semaphore.h           |    22 +-
 Foundation/include/Poco/Semaphore_POSIX.h     |     8 +-
 Foundation/include/Poco/Semaphore_VX.h        |     4 +-
 Foundation/include/Poco/Semaphore_WIN32.h     |     4 +-
 Foundation/include/Poco/SharedLibrary.h       |     2 +-
 Foundation/include/Poco/SharedMemory.h        |     8 +-
 Foundation/include/Poco/SharedMemory_DUMMY.h  |     2 +-
 Foundation/include/Poco/SharedMemory_POSIX.h  |     2 +-
 Foundation/include/Poco/SharedPtr.h           |     2 +-
 Foundation/include/Poco/SignalHandler.h       |    10 +-
 Foundation/include/Poco/SimpleFileChannel.h   |    18 +-
 Foundation/include/Poco/SimpleHashTable.h     |    12 +-
 Foundation/include/Poco/SingletonHolder.h     |     8 +-
 Foundation/include/Poco/SplitterChannel.h     |     8 +-
 Foundation/include/Poco/Stopwatch.h           |    10 +-
 Foundation/include/Poco/StrategyCollection.h  |     2 +-
 Foundation/include/Poco/StreamChannel.h       |     4 +-
 Foundation/include/Poco/StreamConverter.h     |     4 +-
 Foundation/include/Poco/StreamTokenizer.h     |    10 +-
 Foundation/include/Poco/StringTokenizer.h     |    12 +-
 Foundation/include/Poco/SynchronizedObject.h  |    12 +-
 Foundation/include/Poco/SyslogChannel.h       |    16 +-
 Foundation/include/Poco/Task.h                |    24 +-
 Foundation/include/Poco/TaskManager.h         |     4 +-
 Foundation/include/Poco/TaskNotification.h    |     8 +-
 Foundation/include/Poco/TeeStream.h           |     6 +-
 Foundation/include/Poco/TextBufferIterator.h  |    24 +-
 Foundation/include/Poco/TextConverter.h       |     4 +-
 Foundation/include/Poco/TextIterator.h        |    26 +-
 Foundation/include/Poco/ThreadLocal.h         |    24 +-
 Foundation/include/Poco/ThreadTarget.h        |    14 +-
 Foundation/include/Poco/Thread_POSIX.h        |     7 +-
 Foundation/include/Poco/Thread_VX.h           |     4 +-
 Foundation/include/Poco/Thread_WIN32.h        |     6 +-
 Foundation/include/Poco/Thread_WINCE.h        |     6 +-
 .../include/Poco/TimedNotificationQueue.h     |    14 +-
 Foundation/include/Poco/Timer.h               |    22 +-
 Foundation/include/Poco/Timespan.h            |    70 +-
 Foundation/include/Poco/Timestamp.h           |    44 +-
 Foundation/include/Poco/Token.h               |    16 +-
 Foundation/include/Poco/Tuple.h               |    38 +-
 Foundation/include/Poco/TypeList.h            |    28 +-
 Foundation/include/Poco/URI.h                 |    35 +-
 Foundation/include/Poco/URIStreamFactory.h    |    12 +-
 Foundation/include/Poco/URIStreamOpener.h     |     8 +-
 Foundation/include/Poco/UTF16Encoding.h       |    18 +-
 Foundation/include/Poco/UTF32Encoding.h       |    18 +-
 Foundation/include/Poco/UTF8Encoding.h        |     4 +-
 Foundation/include/Poco/UTF8String.h          |     2 +-
 Foundation/include/Poco/UTFString.h           |    24 +-
 Foundation/include/Poco/UUID.h                |    28 +-
 Foundation/include/Poco/UnbufferedStreamBuf.h |    12 +-
 Foundation/include/Poco/Unicode.h             |    26 +-
 Foundation/include/Poco/UnicodeConverter.h    |     4 +-
 .../include/Poco/UniqueAccessExpireCache.h    |    14 +-
 .../include/Poco/UniqueAccessExpireLRUCache.h |    10 +-
 .../include/Poco/UniqueAccessExpireStrategy.h |    10 +-
 Foundation/include/Poco/UniqueExpireCache.h   |    14 +-
 .../include/Poco/UniqueExpireLRUCache.h       |     8 +-
 .../include/Poco/UniqueExpireStrategy.h       |     8 +-
 Foundation/include/Poco/ValidArgs.h           |     8 +-
 Foundation/include/Poco/Void.h                |     6 +-
 Foundation/include/Poco/Windows1250Encoding.h |     2 +-
 Foundation/include/Poco/Windows1251Encoding.h |     2 +-
 Foundation/include/Poco/Windows1252Encoding.h |     2 +-
 .../include/Poco/WindowsConsoleChannel.h      |    16 +-
 Foundation/include/Poco/ordered_hash.h        |   700 +-
 Foundation/include/Poco/ordered_map.h         |   615 +-
 Foundation/include/Poco/ordered_set.h         |   424 +-
 .../samples/ActiveMethod/src/ActiveMethod.cpp |    10 +-
 Foundation/samples/Activity/src/Activity.cpp  |     6 +-
 .../BinaryReaderWriter.progen                 |     1 +
 .../src/BinaryReaderWriter.cpp                |    10 +-
 Foundation/samples/DateTime/DateTime.progen   |     1 +
 Foundation/samples/DateTime/src/DateTime.cpp  |     2 +-
 .../LineEndingConverter.progen                |     1 +
 .../samples/LogRotation/LogRotation.progen    |     1 +
 Foundation/samples/Logger/Logger.progen       |     1 +
 Foundation/samples/Logger/src/Logger.cpp      |    14 +-
 .../NotificationQueue.progen                  |     1 +
 .../src/NotificationQueue.cpp                 |    18 +-
 .../StringTokenizer/StringTokenizer.progen    |     1 +
 Foundation/samples/Timer/Timer.progen         |     1 +
 Foundation/samples/Timer/src/Timer.cpp        |    12 +-
 Foundation/samples/URI/URI.progen             |     1 +
 Foundation/samples/URI/src/URI.cpp            |     8 +-
 .../samples/base64decode/base64decode.progen  |     1 +
 .../samples/base64decode/src/base64decode.cpp |    10 +-
 .../samples/base64encode/base64encode.progen  |     1 +
 .../samples/base64encode/src/base64encode.cpp |    10 +-
 Foundation/samples/deflate/deflate.progen     |     1 +
 Foundation/samples/deflate/src/deflate.cpp    |    10 +-
 Foundation/samples/dir/dir.progen             |     1 +
 Foundation/samples/dir/src/dir.cpp            |     4 +-
 Foundation/samples/grep/grep.progen           |     1 +
 Foundation/samples/grep/src/grep.cpp          |     8 +-
 Foundation/samples/hmacmd5/hmacmd5.progen     |     1 +
 Foundation/samples/hmacmd5/src/hmacmd5.cpp    |    12 +-
 Foundation/samples/inflate/inflate.progen     |     1 +
 Foundation/samples/inflate/src/inflate.cpp    |    10 +-
 Foundation/samples/md5/md5.progen             |     1 +
 Foundation/samples/md5/src/md5.cpp            |     8 +-
 Foundation/samples/uuidgen/src/uuidgen.cpp    |     8 +-
 Foundation/samples/uuidgen/uuidgen.progen     |     1 +
 Foundation/src/ASCIIEncoding.cpp              |    34 +-
 Foundation/src/AbstractObserver.cpp           |     2 +-
 Foundation/src/ActiveDispatcher.cpp           |     6 +-
 Foundation/src/ArchiveStrategy.cpp            |     8 +-
 Foundation/src/Ascii.cpp                      |     2 +-
 Foundation/src/AsyncChannel.cpp               |    19 +-
 Foundation/src/AtomicCounter.cpp              |     4 +-
 Foundation/src/Base32Decoder.cpp              |    10 +-
 Foundation/src/Base32Encoder.cpp              |     2 +-
 Foundation/src/Bugcheck.cpp                   |     2 +-
 Foundation/src/Clock.cpp                      |    16 +-
 Foundation/src/Condition.cpp                  |     4 +-
 Foundation/src/ConsoleChannel.cpp             |    14 +-
 Foundation/src/CountingStream.cpp             |    38 +-
 Foundation/src/DateTime.cpp                   |    16 +-
 Foundation/src/DateTimeFormatter.cpp          |     8 +-
 Foundation/src/DateTimeParser.cpp             |    26 +-
 Foundation/src/DigestStream.cpp               |    44 +-
 Foundation/src/DirectoryIterator_WIN32U.cpp   |     2 +-
 Foundation/src/DirectoryWatcher.cpp           |     4 +-
 Foundation/src/Environment_WINCE.cpp          |    10 +-
 Foundation/src/Error.cpp                      |    12 +-
 Foundation/src/ErrorHandler.cpp               |     4 +-
 Foundation/src/EventLogChannel.cpp            |    18 +-
 Foundation/src/Event_POSIX.cpp                |     5 +-
 Foundation/src/Event_WIN32.cpp                |     2 +-
 Foundation/src/Exception.cpp                  |     6 +-
 Foundation/src/File.cpp                       |     2 +-
 Foundation/src/FileChannel.cpp                |    16 +-
 Foundation/src/FileStreamFactory.cpp          |     4 +-
 Foundation/src/FileStream_POSIX.cpp           |    12 +-
 Foundation/src/FileStream_WIN32.cpp           |    14 +-
 Foundation/src/File_VX.cpp                    |     2 +-
 Foundation/src/File_WINCE.cpp                 |     2 +-
 Foundation/src/Format.cpp                     |    20 +-
 Foundation/src/FormattingChannel.cpp          |    12 +-
 Foundation/src/Glob.cpp                       |     6 +-
 Foundation/src/HashStatistic.cpp              |     8 +-
 Foundation/src/HexBinaryDecoder.cpp           |     2 +-
 Foundation/src/HexBinaryEncoder.cpp           |     6 +-
 Foundation/src/JSONString.cpp                 |     5 +-
 Foundation/src/Latin1Encoding.cpp             |    34 +-
 Foundation/src/Latin2Encoding.cpp             |    22 +-
 Foundation/src/Latin9Encoding.cpp             |    34 +-
 Foundation/src/LineEndingConverter.cpp        |    28 +-
 Foundation/src/LogFile_STD.cpp                |    18 +-
 Foundation/src/LogFile_WIN32U.cpp             |     2 +-
 Foundation/src/Logger.cpp                     |     2 +-
 Foundation/src/LoggingRegistry.cpp            |     4 +-
 Foundation/src/MD4Engine.cpp                  |     6 +-
 Foundation/src/MD5Engine.cpp                  |    10 +-
 Foundation/src/MemoryPool.cpp                 |    10 +-
 Foundation/src/MemoryStream.cpp               |     8 +-
 Foundation/src/Message.cpp                    |     9 +
 Foundation/src/Mutex_WINCE.cpp                |     4 +-
 Foundation/src/NamedEvent_WIN32U.cpp          |     2 +-
 Foundation/src/NamedMutex_WIN32U.cpp          |     2 +-
 Foundation/src/NestedDiagnosticContext.cpp    |     8 +-
 Foundation/src/NotificationQueue.cpp          |     8 +-
 Foundation/src/NullStream.cpp                 |     2 +-
 Foundation/src/NumberParser.cpp               |     8 +-
 Foundation/src/NumericString.cpp              |     8 +-
 Foundation/src/Path.cpp                       |     2 +-
 Foundation/src/Path_WINCE.cpp                 |     2 +-
 Foundation/src/PatternFormatter.cpp           |     6 +-
 Foundation/src/Pipe.cpp                       |     2 +-
 Foundation/src/PipeImpl_WIN32.cpp             |     2 +-
 Foundation/src/PipeStream.cpp                 |     2 +-
 Foundation/src/PriorityNotificationQueue.cpp  |     6 +-
 Foundation/src/RWLock.cpp                     |     2 +-
 Foundation/src/RWLock_WIN32.cpp               |     2 +-
 Foundation/src/RWLock_WINCE.cpp               |    42 +-
 Foundation/src/Random.cpp                     |    30 +-
 Foundation/src/RandomStream.cpp               |     4 +-
 Foundation/src/RegularExpression.cpp          |   199 +-
 Foundation/src/RotateStrategy.cpp             |     2 +-
 Foundation/src/SHA1Engine.cpp                 |     4 +-
 Foundation/src/SHA2Engine.cpp                 |    60 +-
 Foundation/src/Semaphore_WIN32.cpp            |     2 +-
 Foundation/src/SharedLibrary.cpp              |     2 +-
 Foundation/src/SharedMemory_WIN32.cpp         |     2 +-
 Foundation/src/SignalHandler.cpp              |     2 +-
 Foundation/src/SimpleFileChannel.cpp          |    10 +-
 Foundation/src/SortedDirectoryIterator.cpp    |     2 +-
 Foundation/src/SplitterChannel.cpp            |     2 +-
 Foundation/src/StreamChannel.cpp              |     2 +-
 Foundation/src/StreamConverter.cpp            |    10 +-
 Foundation/src/StreamTokenizer.cpp            |     6 +-
 Foundation/src/String.cpp                     |     8 +-
 Foundation/src/StringTokenizer.cpp            |     6 +-
 Foundation/src/SynchronizedObject.cpp         |     2 +-
 Foundation/src/SyslogChannel.cpp              |    17 +-
 Foundation/src/Task.cpp                       |     4 +-
 Foundation/src/TaskManager.cpp                |     8 +-
 Foundation/src/TaskNotification.cpp           |    10 +-
 Foundation/src/TeeStream.cpp                  |     6 +-
 Foundation/src/TemporaryFile.cpp              |    10 +-
 Foundation/src/TextBufferIterator.cpp         |    26 +-
 Foundation/src/TextConverter.cpp              |     2 +-
 Foundation/src/TextEncoding.cpp               |    16 +-
 Foundation/src/TextIterator.cpp               |    26 +-
 Foundation/src/ThreadLocal.cpp                |     2 +-
 Foundation/src/ThreadPool.cpp                 |    42 +-
 Foundation/src/Thread_POSIX.cpp               |    29 +-
 Foundation/src/Thread_VX.cpp                  |     4 +-
 Foundation/src/Thread_WIN32.cpp               |     8 +-
 Foundation/src/Thread_WINCE.cpp               |     2 +-
 Foundation/src/TimedNotificationQueue.cpp     |     6 +-
 Foundation/src/Timer.cpp                      |     8 +-
 Foundation/src/Timespan.cpp                   |     6 +-
 Foundation/src/Timestamp.cpp                  |     2 +-
 Foundation/src/Token.cpp                      |     2 +-
 Foundation/src/URI.cpp                        |    33 +-
 Foundation/src/URIStreamFactory.cpp           |     2 +-
 Foundation/src/URIStreamOpener.cpp            |     8 +-
 Foundation/src/UUID.cpp                       |    26 +-
 Foundation/src/Unicode.cpp                    |     6 +-
 Foundation/src/UnicodeConverter.cpp           |     2 +-
 Foundation/src/VarIterator.cpp                |     4 +-
 Foundation/src/Windows1250Encoding.cpp        |    18 +-
 Foundation/src/Windows1251Encoding.cpp        |    16 +-
 Foundation/src/Windows1252Encoding.cpp        |    34 +-
 Foundation/src/WindowsConsoleChannel.cpp      |    14 +-
 Foundation/src/bignum-dtoa.cc                 |    46 +-
 Foundation/src/bignum.cc                      |   583 +-
 Foundation/src/bignum.h                       |    64 +-
 Foundation/src/cached-powers.cc               |   204 +-
 Foundation/src/cached-powers.h                |    26 +-
 Foundation/src/diy-fp.cc                      |    57 -
 Foundation/src/diy-fp.h                       |    59 +-
 Foundation/src/double-conversion.h            |   546 +-
 Foundation/src/double-to-string.cc            |   440 +
 Foundation/src/double-to-string.h             |   445 +
 Foundation/src/fast-dtoa.cc                   |    58 +-
 Foundation/src/fixed-dtoa.cc                  |    24 +-
 Foundation/src/ieee.h                         |    79 +-
 Foundation/src/pcre.h                         |   677 -
 Foundation/src/pcre2.h                        |   993 ++
 Foundation/src/pcre2_auto_possess.c           |  1361 ++
 .../{pcre_chartables.c => pcre2_chartables.c} |    90 +-
 Foundation/src/pcre2_compile.c                | 10621 ++++++++++++++++
 Foundation/src/pcre2_config.c                 |   250 +
 Foundation/src/pcre2_config.h                 |   458 +
 Foundation/src/pcre2_context.c                |   485 +
 Foundation/src/pcre2_convert.c                |  1179 ++
 .../{pcre_dfa_exec.c => pcre2_dfa_match.c}    |  2105 +--
 Foundation/src/pcre2_error.c                  |   338 +
 Foundation/src/pcre2_extuni.c                 |   144 +
 Foundation/src/pcre2_find_bracket.c           |   216 +
 Foundation/src/pcre2_internal.h               |  2048 +++
 Foundation/src/pcre2_intmodedep.h             |   934 ++
 ...pcre_jit_compile.c => pcre2_jit_compile.c} |  8696 ++++++++-----
 Foundation/src/pcre2_jit_match.c              |   186 +
 Foundation/src/pcre2_jit_misc.c               |   232 +
 .../{pcre_maketables.c => pcre2_maketables.c} |   118 +-
 Foundation/src/pcre2_match.c                  |  7534 +++++++++++
 Foundation/src/pcre2_match_data.c             |   163 +
 .../src/{pcre_newline.c => pcre2_newline.c}   |   153 +-
 .../src/{pcre_ord2utf8.c => pcre2_ord2utf.c}  |    75 +-
 Foundation/src/pcre2_pattern_info.c           |   429 +
 Foundation/src/pcre2_script_run.c             |   341 +
 Foundation/src/pcre2_serialize.c              |   282 +
 Foundation/src/pcre2_string_utils.c           |   234 +
 Foundation/src/pcre2_study.c                  |  1822 +++
 Foundation/src/pcre2_substitute.c             |  1003 ++
 Foundation/src/pcre2_substring.c              |   544 +
 Foundation/src/pcre2_tables.c                 |   232 +
 Foundation/src/pcre2_ucd.c                    |  5394 ++++++++
 Foundation/src/pcre2_ucp.h                    |   394 +
 Foundation/src/pcre2_ucptables.c              |  1524 +++
 .../{pcre_valid_utf8.c => pcre2_valid_utf.c}  |   276 +-
 .../src/{pcre_xclass.c => pcre2_xclass.c}     |    69 +-
 Foundation/src/pcre_byte_order.c              |   315 -
 Foundation/src/pcre_compile.c                 |  9812 --------------
 Foundation/src/pcre_config.c                  |   187 -
 Foundation/src/pcre_config.h                  |   413 -
 Foundation/src/pcre_exec.c                    |  7174 -----------
 Foundation/src/pcre_fullinfo.c                |   242 -
 Foundation/src/pcre_get.c                     |   666 -
 Foundation/src/pcre_globals.c                 |    83 -
 Foundation/src/pcre_internal.h                |  2827 ----
 Foundation/src/pcre_refcount.c                |    90 -
 Foundation/src/pcre_string_utils.c            |   207 -
 Foundation/src/pcre_study.c                   |  1683 ---
 Foundation/src/pcre_tables.c                  |   723 --
 Foundation/src/pcre_ucd.c                     |  3641 ------
 Foundation/src/pcre_version.c                 |    94 -
 ...uble-conversion.cc => string-to-double.cc} |   519 +-
 Foundation/src/string-to-double.h             |   238 +
 Foundation/src/strtod.cc                      |   136 +-
 Foundation/src/strtod.h                       |    19 +
 Foundation/src/utils.h                        |   161 +-
 Foundation/testsuite/CMakeLists.txt           |     2 +-
 Foundation/testsuite/TestApp_vs160.vcxproj    |    12 +-
 Foundation/testsuite/TestApp_vs170.vcxproj    |   278 +-
 .../testsuite/TestLibrary_vs160.vcxproj       |     4 +-
 .../testsuite/TestLibrary_vs170.vcxproj       |    99 +-
 Foundation/testsuite/TestSuite_vs160.vcxproj  |     6 +
 Foundation/testsuite/TestSuite_vs170.vcxproj  |   283 +-
 .../testsuite/src/ActiveDispatcherTest.cpp    |    39 +-
 .../testsuite/src/ActiveDispatcherTest.h      |     1 +
 Foundation/testsuite/src/ActiveMethodTest.cpp |    10 +-
 Foundation/testsuite/src/ActivityTest.cpp     |    12 +-
 Foundation/testsuite/src/AnyTest.cpp          |   101 +-
 Foundation/testsuite/src/ArrayTest.cpp        |     4 +-
 .../testsuite/src/AutoReleasePoolTest.cpp     |    14 +-
 Foundation/testsuite/src/BasicEventTest.h     |     4 +-
 .../testsuite/src/BinaryReaderWriterTest.cpp  |    20 +-
 Foundation/testsuite/src/ByteOrderTest.cpp    |    12 +-
 Foundation/testsuite/src/ChannelTest.cpp      |    35 +-
 Foundation/testsuite/src/ClassLoaderTest.cpp  |    26 +-
 Foundation/testsuite/src/ClockTest.cpp        |     6 +-
 Foundation/testsuite/src/ConditionTest.cpp    |    46 +-
 .../testsuite/src/DateTimeFormatterTest.cpp   |     2 +-
 .../testsuite/src/DateTimeFormatterTest.h     |     2 +-
 .../testsuite/src/DateTimeParserTest.cpp      |    10 +-
 Foundation/testsuite/src/DateTimeTest.cpp     |   210 +-
 Foundation/testsuite/src/DigestStreamTest.cpp |     2 +-
 .../testsuite/src/DirectoryIteratorsTest.h    |     4 +-
 .../testsuite/src/DirectoryWatcherTest.cpp    |    32 +-
 .../testsuite/src/DirectoryWatcherTest.h      |     2 +
 Foundation/testsuite/src/ExpireCacheTest.cpp  |     2 +-
 .../testsuite/src/ExpireLRUCacheTest.cpp      |     2 +-
 .../testsuite/src/FIFOBufferStreamTest.cpp    |     8 +-
 Foundation/testsuite/src/FIFOEventTest.h      |     2 +-
 Foundation/testsuite/src/FPETest.cpp          |    12 +-
 Foundation/testsuite/src/FileChannelTest.h    |     2 +-
 Foundation/testsuite/src/FileTest.h           |     2 +-
 .../testsuite/src/FilesystemTestSuite.cpp     |     2 +-
 Foundation/testsuite/src/FormatTest.cpp       |    54 +-
 Foundation/testsuite/src/GlobTest.cpp         |    84 +-
 Foundation/testsuite/src/HMACEngineTest.cpp   |     6 +-
 Foundation/testsuite/src/HashMapTest.cpp      |    36 +-
 Foundation/testsuite/src/HashSetTest.cpp      |    26 +-
 .../testsuite/src/LinearHashTableTest.cpp     |    58 +-
 .../testsuite/src/LinearHashTableTest.h       |     2 +-
 Foundation/testsuite/src/ListMapTest.cpp      |    38 +-
 Foundation/testsuite/src/LoggerTest.cpp       |    24 +-
 .../testsuite/src/LoggingRegistryTest.cpp     |    26 +-
 Foundation/testsuite/src/MD4EngineTest.cpp    |     2 +-
 Foundation/testsuite/src/ManifestTest.cpp     |     8 +-
 Foundation/testsuite/src/MemoryPoolTest.cpp   |    10 +-
 Foundation/testsuite/src/MemoryStreamTest.cpp |    10 +-
 Foundation/testsuite/src/NamedMutexTest.h     |     2 +-
 Foundation/testsuite/src/NamedTuplesTest.cpp  |  1290 +-
 .../testsuite/src/NotificationCenterTest.cpp  |     8 +-
 .../testsuite/src/NotificationCenterTest.h    |     2 +-
 .../testsuite/src/NotificationQueueTest.cpp   |     6 +-
 .../testsuite/src/NumberFormatterTest.cpp     |    22 +-
 Foundation/testsuite/src/NumberParserTest.cpp |    38 +-
 Foundation/testsuite/src/PBKDF2EngineTest.cpp |    12 +-
 .../testsuite/src/PatternFormatterTest.cpp    |     8 +-
 Foundation/testsuite/src/PriorityEventTest.h  |     2 +-
 .../src/PriorityNotificationQueueTest.cpp     |     8 +-
 Foundation/testsuite/src/ProcessTest.cpp      |     2 +-
 Foundation/testsuite/src/RWLockTest.cpp       |    12 +-
 Foundation/testsuite/src/RandomStreamTest.cpp |     4 +-
 Foundation/testsuite/src/RandomTest.cpp       |    10 +-
 Foundation/testsuite/src/RandomTest.h         |     2 +-
 Foundation/testsuite/src/SHA2EngineTest.cpp   |    56 +-
 Foundation/testsuite/src/SHA2EngineTest.h     |     2 +
 Foundation/testsuite/src/SemaphoreTest.cpp    |    14 +-
 .../testsuite/src/SharedLibraryTest.cpp       |     6 +-
 Foundation/testsuite/src/SharedMemoryTest.cpp |     2 +-
 Foundation/testsuite/src/StopwatchTest.cpp    |     8 +-
 .../testsuite/src/StreamConverterTest.cpp     |    28 +-
 .../testsuite/src/StreamTokenizerTest.cpp     |    28 +-
 Foundation/testsuite/src/StringTest.cpp       |   381 +-
 Foundation/testsuite/src/StringTest.h         |    23 +-
 .../testsuite/src/StringTokenizerTest.cpp     |     8 +-
 Foundation/testsuite/src/TaskManagerTest.cpp  |    88 +-
 Foundation/testsuite/src/TaskTest.cpp         |     6 +-
 Foundation/testsuite/src/TestChannel.h        |     6 +-
 Foundation/testsuite/src/TestLibrary.cpp      |    14 +-
 .../testsuite/src/TextBufferIteratorTest.cpp  |    38 +-
 .../testsuite/src/TextConverterTest.cpp       |    32 +-
 Foundation/testsuite/src/TextEncodingTest.cpp |     6 +-
 Foundation/testsuite/src/TextIteratorTest.cpp |    38 +-
 Foundation/testsuite/src/ThreadLocalTest.cpp  |     6 +-
 Foundation/testsuite/src/ThreadPoolTest.cpp   |    14 +-
 Foundation/testsuite/src/ThreadTest.cpp       |     6 +-
 .../src/TimedNotificationQueueTest.cpp        |    40 +-
 Foundation/testsuite/src/TimerTest.cpp        |     2 +-
 Foundation/testsuite/src/TimespanTest.cpp     |    16 +-
 Foundation/testsuite/src/TimestampTest.cpp    |    10 +-
 Foundation/testsuite/src/TuplesTest.cpp       |    78 +-
 Foundation/testsuite/src/TypeListTest.cpp     |     2 +-
 .../testsuite/src/URIStreamOpenerTest.cpp     |    26 +-
 Foundation/testsuite/src/URITest.cpp          |    48 +
 Foundation/testsuite/src/URITest.h            |     1 +
 .../testsuite/src/UUIDGeneratorTest.cpp       |     2 +-
 Foundation/testsuite/src/UUIDGeneratorTest.h  |     2 +-
 Foundation/testsuite/src/UUIDTest.cpp         |    18 +-
 .../testsuite/src/UnicodeConverterTest.cpp    |     2 +-
 .../testsuite/src/UniqueExpireCacheTest.cpp   |     4 +-
 .../testsuite/src/UniqueExpireCacheTest.h     |     2 +-
 .../src/UniqueExpireLRUCacheTest.cpp          |     2 +-
 .../testsuite/src/UniqueExpireLRUCacheTest.h  |     2 +-
 Foundation/testsuite/src/VarTest.cpp          |     4 +-
 Foundation/testsuite/src/WinCEDriver.cpp      |     2 +-
 Foundation/testsuite/src/ZLibTest.cpp         |    12 +-
 Foundation/wcelibcex-1.0/LICENSE.txt          |     4 +-
 Foundation/wcelibcex-1.0/README.txt           |     2 +-
 Foundation/wcelibcex-1.0/src/errno.h          |     6 +-
 Foundation/wcelibcex-1.0/src/fcntl.h          |     6 +-
 Foundation/wcelibcex-1.0/src/wce_abort.c      |    10 +-
 Foundation/wcelibcex-1.0/src/wce_access.c     |    16 +-
 Foundation/wcelibcex-1.0/src/wce_asctime.c    |    18 +-
 Foundation/wcelibcex-1.0/src/wce_bsearch.c    |     8 +-
 Foundation/wcelibcex-1.0/src/wce_clock.c      |    18 +-
 Foundation/wcelibcex-1.0/src/wce_ctime.c      |    12 +-
 Foundation/wcelibcex-1.0/src/wce_direct.h     |     6 +-
 .../src/wce_directorymanagement.c             |    14 +-
 Foundation/wcelibcex-1.0/src/wce_errno.c      |     6 +-
 Foundation/wcelibcex-1.0/src/wce_errno.h      |     6 +-
 Foundation/wcelibcex-1.0/src/wce_fcntl.h      |     8 +-
 Foundation/wcelibcex-1.0/src/wce_findfile.c   |    40 +-
 Foundation/wcelibcex-1.0/src/wce_getenv.c     |     8 +-
 Foundation/wcelibcex-1.0/src/wce_getopt.c     |     4 +-
 .../wcelibcex-1.0/src/wce_gettimeofday.c      |     4 +-
 Foundation/wcelibcex-1.0/src/wce_io.h         |     6 +-
 Foundation/wcelibcex-1.0/src/wce_lfind.c      |     2 +-
 Foundation/wcelibcex-1.0/src/wce_localtime.c  |    20 +-
 Foundation/wcelibcex-1.0/src/wce_mkdir.c      |    20 +-
 Foundation/wcelibcex-1.0/src/wce_mktime.c     |    18 +-
 Foundation/wcelibcex-1.0/src/wce_path.c       |    16 +-
 Foundation/wcelibcex-1.0/src/wce_rename.c     |    18 +-
 Foundation/wcelibcex-1.0/src/wce_rewind.c     |    12 +-
 Foundation/wcelibcex-1.0/src/wce_rmdir.c      |    16 +-
 Foundation/wcelibcex-1.0/src/wce_setlocale.c  |     8 +-
 Foundation/wcelibcex-1.0/src/wce_stat.c       |     6 +-
 Foundation/wcelibcex-1.0/src/wce_stat.h       |    14 +-
 Foundation/wcelibcex-1.0/src/wce_stdio.h      |     8 +-
 Foundation/wcelibcex-1.0/src/wce_stdlib.h     |    14 +-
 Foundation/wcelibcex-1.0/src/wce_strerror.c   |     8 +-
 Foundation/wcelibcex-1.0/src/wce_string.h     |     6 +-
 Foundation/wcelibcex-1.0/src/wce_time.c       |    16 +-
 Foundation/wcelibcex-1.0/src/wce_time.h       |    12 +-
 Foundation/wcelibcex-1.0/src/wce_timesys.c    |    20 +-
 Foundation/wcelibcex-1.0/src/wce_timesys.h    |     6 +-
 Foundation/wcelibcex-1.0/src/wce_types.h      |     6 +-
 Foundation/wcelibcex-1.0/src/wce_unistd.h     |    10 +-
 Foundation/wcelibcex-1.0/src/wce_unlink.c     |    16 +-
 Foundation/wcelibcex-1.0/src/wce_winbase.c    |     6 +-
 Foundation/wcelibcex-1.0/src/wce_winbase.h    |     6 +-
 JSON/JSON.progen                              |     1 +
 JSON/JSON_vs170.sln                           |    42 +
 JSON/JSON_vs170.vcxproj                       |   283 +-
 JSON/include/Poco/JSON/Handler.h              |     2 +-
 JSON/include/Poco/JSON/ParseHandler.h         |     2 +-
 JSON/include/Poco/JSON/PrintHandler.h         |     2 +-
 JSON/include/Poco/JSON/Query.h                |    24 +-
 JSON/include/Poco/JSON/Template.h             |    10 +-
 JSON/include/Poco/JSON/TemplateCache.h        |     2 +-
 JSON/samples/Benchmark/Benchmark.progen       |     1 +
 JSON/src/Query.cpp                            |    12 +-
 JSON/src/Stringifier.cpp                      |     2 +
 JSON/src/Template.cpp                         |    12 +-
 JSON/src/TemplateCache.cpp                    |     4 +-
 JSON/src/pdjson.c                             |     2 +-
 JSON/src/pdjson.h                             |    18 +-
 JSON/testsuite/TestSuite.progen               |     1 +
 JSON/testsuite/TestSuite_vs170.vcxproj        |   296 +-
 JSON/testsuite/src/JSONTest.cpp               |    88 +
 JSON/testsuite/src/JSONTest.h                 |     1 +
 JSON/testsuite/src/WinCEDriver.cpp            |     2 +-
 JWT/JWT.progen                                |     1 +
 JWT/JWT_vs170.sln                             |    42 +
 JWT/JWT_vs170.vcxproj                         |   271 +-
 JWT/testsuite/TestSuite.progen                |     1 +
 JWT/testsuite/TestSuite_vs170.vcxproj         |   296 +-
 MongoDB/MongoDB.progen                        |     1 +
 MongoDB/MongoDB_vs170.sln                     |    42 +
 MongoDB/MongoDB_vs170.vcxproj                 |   271 +-
 MongoDB/include/Poco/MongoDB/Array.h          |    34 +-
 MongoDB/include/Poco/MongoDB/BSONWriter.h     |     2 +-
 MongoDB/include/Poco/MongoDB/Database.h       |    16 +-
 MongoDB/include/Poco/MongoDB/DeleteRequest.h  |    12 +-
 MongoDB/include/Poco/MongoDB/GetMoreRequest.h |    10 +-
 MongoDB/include/Poco/MongoDB/InsertRequest.h  |    16 +-
 .../include/Poco/MongoDB/KillCursorsRequest.h |     8 +-
 MongoDB/include/Poco/MongoDB/Message.h        |     2 +-
 MongoDB/include/Poco/MongoDB/QueryRequest.h   |    52 +-
 MongoDB/include/Poco/MongoDB/UpdateRequest.h  |    10 +-
 MongoDB/samples/SQLToMongo/SQLToMongo.progen  |     1 +
 MongoDB/src/Array.cpp                         |     4 +-
 MongoDB/src/Database.cpp                      |    52 +-
 MongoDB/src/DeleteRequest.cpp                 |     4 +-
 MongoDB/src/Element.cpp                       |     2 +-
 MongoDB/src/GetMoreRequest.cpp                |     2 +-
 MongoDB/src/InsertRequest.cpp                 |     2 +-
 MongoDB/src/KillCursorsRequest.cpp            |     2 +-
 MongoDB/src/Message.cpp                       |     2 +-
 MongoDB/src/MessageHeader.cpp                 |     8 +-
 MongoDB/src/ObjectId.cpp                      |     2 +-
 MongoDB/src/QueryRequest.cpp                  |     6 +-
 MongoDB/src/RegularExpression.cpp             |     4 +-
 MongoDB/src/ReplicaSet.cpp                    |     6 +-
 MongoDB/src/ResponseMessage.cpp               |    10 +-
 MongoDB/src/UpdateRequest.cpp                 |     2 +-
 MongoDB/testsuite/TestSuite.progen            |     1 +
 MongoDB/testsuite/TestSuite_vs170.vcxproj     |   296 +-
 MongoDB/testsuite/src/MongoDBTest.cpp         |    37 +
 MongoDB/testsuite/src/MongoDBTest.h           |     1 +
 MongoDB/testsuite/src/WinCEDriver.cpp         |     2 +-
 Net/CMakeLists.txt                            |     4 +
 Net/Net.progen                                |     1 +
 Net/Net_vs140.vcxproj                         |     8 +-
 Net/Net_vs140.vcxproj.filters                 |   114 +-
 Net/Net_vs150.vcxproj                         |   796 +-
 Net/Net_vs150.vcxproj.filters                 |   120 +-
 Net/Net_vs160.vcxproj                         |   518 +-
 Net/Net_vs160.vcxproj.filters                 |   126 +-
 Net/Net_vs170.sln                             |    42 +
 Net/Net_vs170.vcxproj                         |   796 +-
 Net/Net_vs170.vcxproj.filters                 |   120 +-
 Net/Net_vs90.vcproj                           |    18 +-
 .../Poco/Net/AbstractHTTPRequestHandler.h     |     8 +-
 Net/include/Poco/Net/DatagramSocketImpl.h     |     4 +-
 Net/include/Poco/Net/DialogSocket.h           |    22 +-
 Net/include/Poco/Net/FTPClientSession.h       |    10 +-
 Net/include/Poco/Net/FilePartSource.h         |     6 +-
 Net/include/Poco/Net/HTTPChunkedStream.h      |    16 +-
 Net/include/Poco/Net/HTTPDigestCredentials.h  |    17 +-
 Net/include/Poco/Net/HTTPFixedLengthStream.h  |     8 +-
 Net/include/Poco/Net/HTTPHeaderStream.h       |     6 +-
 Net/include/Poco/Net/HTTPIOStream.h           |    14 +-
 Net/include/Poco/Net/HTTPRequestHandler.h     |     4 +-
 .../Poco/Net/HTTPRequestHandlerFactory.h      |     8 +-
 Net/include/Poco/Net/HTTPResponse.h           |     2 +
 Net/include/Poco/Net/HTTPServerConnection.h   |     2 +-
 .../Poco/Net/HTTPServerConnectionFactory.h    |     2 +-
 Net/include/Poco/Net/HTTPServerRequest.h      |     8 +-
 Net/include/Poco/Net/HTTPServerRequestImpl.h  |    18 +-
 Net/include/Poco/Net/HTTPServerResponse.h     |    20 +-
 Net/include/Poco/Net/HTTPServerResponseImpl.h |    24 +-
 Net/include/Poco/Net/HTTPServerSession.h      |    10 +-
 Net/include/Poco/Net/HTTPSession.h            |   135 +-
 Net/include/Poco/Net/HTTPStream.h             |     6 +-
 Net/include/Poco/Net/HTTPStreamFactory.h      |    14 +-
 Net/include/Poco/Net/HostEntry.h              |    10 +-
 Net/include/Poco/Net/ICMPClient.h             |    10 +-
 Net/include/Poco/Net/ICMPEventArgs.h          |     4 +-
 Net/include/Poco/Net/ICMPPacket.h             |     6 +-
 Net/include/Poco/Net/ICMPSocket.h             |     4 +-
 Net/include/Poco/Net/ICMPSocketImpl.h         |     2 +-
 Net/include/Poco/Net/IPAddress.h              |    86 +-
 Net/include/Poco/Net/IPAddressImpl.h          |     4 +-
 Net/include/Poco/Net/MailRecipient.h          |    22 +-
 Net/include/Poco/Net/MailStream.h             |    10 +-
 Net/include/Poco/Net/MediaType.h              |    40 +-
 Net/include/Poco/Net/MessageHeader.h          |    51 +-
 Net/include/Poco/Net/MulticastSocket.h        |     4 +-
 Net/include/Poco/Net/MultipartReader.h        |    12 +-
 Net/include/Poco/Net/MultipartWriter.h        |     8 +-
 Net/include/Poco/Net/NTPClient.h              |     4 +-
 Net/include/Poco/Net/NTPEventArgs.h           |     4 +-
 Net/include/Poco/Net/NTPPacket.h              |     2 +-
 Net/include/Poco/Net/NameValueCollection.h    |    28 +-
 Net/include/Poco/Net/Net.h                    |    18 +-
 Net/include/Poco/Net/NetworkInterface.h       |    38 +-
 Net/include/Poco/Net/NullPartHandler.h        |     4 +-
 Net/include/Poco/Net/OAuth10Credentials.h     |    46 +-
 Net/include/Poco/Net/OAuth20Credentials.h     |    14 +-
 Net/include/Poco/Net/POP3ClientSession.h      |    10 +-
 Net/include/Poco/Net/ParallelSocketAcceptor.h |    33 +-
 Net/include/Poco/Net/ParallelSocketReactor.h  |    16 +-
 Net/include/Poco/Net/PartHandler.h            |     6 +-
 Net/include/Poco/Net/PollSet.h                |    35 +-
 Net/include/Poco/Net/QuotedPrintableDecoder.h |    12 +-
 Net/include/Poco/Net/QuotedPrintableEncoder.h |     2 +-
 Net/include/Poco/Net/RawSocket.h              |     6 +-
 Net/include/Poco/Net/RawSocketImpl.h          |     6 +-
 Net/include/Poco/Net/RemoteSyslogChannel.h    |     3 +
 Net/include/Poco/Net/RemoteSyslogListener.h   |     5 +-
 Net/include/Poco/Net/SMTPChannel.h            |    16 +-
 Net/include/Poco/Net/ServerSocket.h           |    12 +-
 Net/include/Poco/Net/Socket.h                 |   170 +-
 Net/include/Poco/Net/SocketAcceptor.h         |    14 +-
 Net/include/Poco/Net/SocketConnector.h        |    10 +-
 Net/include/Poco/Net/SocketNotification.h     |    12 +-
 Net/include/Poco/Net/SocketNotifier.h         |    18 +-
 Net/include/Poco/Net/SocketProactor.h         |     1 +
 Net/include/Poco/Net/SocketReactor.h          |    20 +-
 Net/include/Poco/Net/SocketStream.h           |    14 +-
 Net/include/Poco/Net/StreamSocketImpl.h       |     4 +-
 Net/include/Poco/Net/StringPartSource.h       |     6 +-
 Net/include/Poco/Net/TCPServer.h              |    23 +-
 Net/include/Poco/Net/TCPServerConnection.h    |     4 +-
 .../Poco/Net/TCPServerConnectionFactory.h     |     6 +-
 Net/include/Poco/Net/TCPServerDispatcher.h    |    61 +-
 Net/include/Poco/Net/TCPServerParams.h        |    18 +-
 Net/include/Poco/Net/UDPClient.h              |     2 +-
 Net/include/Poco/Net/UDPHandler.h             |    60 +-
 Net/include/Poco/Net/UDPServer.h              |     4 +-
 Net/include/Poco/Net/WebSocket.h              |    10 +
 Net/include/Poco/Net/WebSocketImpl.h          |     2 +-
 Net/samples/CMakeLists.txt                    |     2 +
 Net/samples/EchoServer/EchoServer.progen      |     1 +
 Net/samples/EchoServer/src/EchoServer.cpp     |    28 +-
 .../HTTPFormServer/HTTPFormServer.progen      |     1 +
 .../HTTPFormServer/src/HTTPFormServer.cpp     |    32 +-
 Net/samples/HTTPLoadTest/HTTPLoadTest.progen  |     1 +
 Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp |    52 +-
 .../HTTPTimeServer/HTTPTimeServer.progen      |     1 +
 .../HTTPTimeServer/src/HTTPTimeServer.cpp     |    20 +-
 Net/samples/Mail/Mail.progen                  |     1 +
 Net/samples/Mail/src/Mail.cpp                 |     6 +-
 Net/samples/Mail/src/PocoLogo.hpp             |   262 +-
 Net/samples/Ping/Ping.progen                  |     1 +
 Net/samples/Ping/src/Ping.cpp                 |    34 +-
 Net/samples/SMTPLogger/SMTPLogger.progen      |     1 +
 Net/samples/SMTPLogger/src/SMTPLogger.cpp     |     2 +-
 Net/samples/TimeServer/TimeServer.progen      |     1 +
 Net/samples/TimeServer/src/TimeServer.cpp     |    18 +-
 .../WebSocketServer/WebSocketServer.progen    |     1 +
 .../WebSocketServer/src/WebSocketServer.cpp   |    16 +-
 Net/samples/dict/dict.progen                  |     1 +
 Net/samples/dict/src/dict.cpp                 |     8 +-
 Net/samples/download/download.progen          |     1 +
 Net/samples/httpget/httpget.progen            |     1 +
 Net/samples/ifconfig/ifconfig.progen          |     1 +
 Net/samples/tcpserver/tcpserver.progen        |     1 +
 Net/src/FTPClientSession.cpp                  |    14 +-
 Net/src/FTPStreamFactory.cpp                  |    26 +-
 Net/src/HTTPChunkedStream.cpp                 |    52 +-
 Net/src/HTTPClientSession.cpp                 |     5 +-
 Net/src/HTTPDigestCredentials.cpp             |   131 +-
 Net/src/HTTPResponse.cpp                      |     3 +
 Net/src/HTTPServerConnection.cpp              |     2 +
 Net/src/HTTPServerParams.cpp                  |    12 +-
 Net/src/HTTPServerRequestImpl.cpp             |     6 +-
 Net/src/HTTPServerResponseImpl.cpp            |    10 +-
 Net/src/HTTPServerSession.cpp                 |     2 +-
 Net/src/HTTPSession.cpp                       |     6 +-
 Net/src/HTTPStreamFactory.cpp                 |    24 +-
 Net/src/HostEntry.cpp                         |     6 +-
 Net/src/ICMPEventArgs.cpp                     |    24 +-
 Net/src/ICMPPacketImpl.cpp                    |     4 +-
 Net/src/ICMPSocket.cpp                        |     6 +-
 Net/src/IPAddress.cpp                         |    10 +-
 Net/src/IPAddressImpl.cpp                     |    22 +-
 Net/src/MailMessage.cpp                       |    54 +-
 Net/src/MailRecipient.cpp                     |    14 +-
 Net/src/MailStream.cpp                        |    14 +-
 Net/src/MediaType.cpp                         |     2 +-
 Net/src/MessageHeader.cpp                     |    75 +-
 Net/src/MulticastSocket.cpp                   |    22 +-
 Net/src/MultipartReader.cpp                   |     7 +-
 Net/src/NTPClient.cpp                         |     2 +-
 Net/src/NTPEventArgs.cpp                      |     4 +-
 Net/src/NTPPacket.cpp                         |     9 +-
 Net/src/NameValueCollection.cpp               |    18 +-
 Net/src/NetworkInterface.cpp                  |     2 +-
 Net/src/OAuth10Credentials.cpp                |    30 +-
 Net/src/OAuth20Credentials.cpp                |     2 +-
 Net/src/POP3ClientSession.cpp                 |    16 +-
 Net/src/PartSource.cpp                        |     2 +-
 Net/src/PollSet.cpp                           |   558 +-
 Net/src/QuotedPrintableDecoder.cpp            |     6 +-
 Net/src/QuotedPrintableEncoder.cpp            |     6 +-
 Net/src/RawSocket.cpp                         |    14 +-
 Net/src/RawSocketImpl.cpp                     |     4 +-
 Net/src/RemoteSyslogChannel.cpp               |    69 +-
 Net/src/RemoteSyslogListener.cpp              |     7 +-
 Net/src/SMTPChannel.cpp                       |    58 +-
 Net/src/ServerSocket.cpp                      |     4 +-
 Net/src/Socket.cpp                            |   151 +-
 Net/src/SocketImpl.cpp                        |    26 +-
 Net/src/SocketNotification.cpp                |    12 +-
 Net/src/SocketReactor.cpp                     |     6 +-
 Net/src/SocketStream.cpp                      |     4 +-
 Net/src/StreamSocket.cpp                      |     2 +-
 Net/src/StreamSocketImpl.cpp                  |     2 +-
 Net/src/StringPartSource.cpp                  |     2 +-
 Net/src/TCPServer.cpp                         |    14 +-
 Net/src/TCPServerDispatcher.cpp               |    57 +-
 Net/src/WebSocket.cpp                         |    30 +-
 Net/src/wepoll.c                              |  2253 ++++
 Net/src/wepoll.h                              |   114 +
 Net/testsuite/Makefile                        |     3 +-
 Net/testsuite/TestSuite.progen                |     1 +
 Net/testsuite/TestSuite_vs150.vcxproj         |   532 +-
 Net/testsuite/TestSuite_vs150.vcxproj.filters |   124 +-
 Net/testsuite/TestSuite_vs160.vcxproj         |   358 +-
 Net/testsuite/TestSuite_vs160.vcxproj.filters |   130 +-
 Net/testsuite/TestSuite_vs170.vcxproj         |   532 +-
 Net/testsuite/TestSuite_vs170.vcxproj.filters |   124 +-
 Net/testsuite/TestSuite_vs90.vcproj           |    18 +-
 Net/testsuite/src/DNSTest.cpp                 |     8 +-
 Net/testsuite/src/DialogServer.cpp            |     8 +-
 Net/testsuite/src/DialogServer.h              |    20 +-
 Net/testsuite/src/DialogSocketTest.cpp        |    10 +-
 Net/testsuite/src/EchoServer.h                |     5 +-
 Net/testsuite/src/FTPClientSessionTest.cpp    |    56 +-
 Net/testsuite/src/FTPClientSessionTest.h      |     2 +-
 Net/testsuite/src/HTTPClientSessionTest.cpp   |    32 +-
 Net/testsuite/src/HTTPClientSessionTest.h     |     1 +
 Net/testsuite/src/HTTPCredentialsTest.cpp     |    79 +
 Net/testsuite/src/HTTPCredentialsTest.h       |     3 +
 Net/testsuite/src/HTTPRequestTest.cpp         |    10 +-
 Net/testsuite/src/HTTPRequestTest.h           |     2 +-
 Net/testsuite/src/HTTPServerTest.cpp          |    88 +-
 Net/testsuite/src/HTTPServerTest.h            |     1 +
 Net/testsuite/src/HTTPTestServer.cpp          |    33 +-
 Net/testsuite/src/HTTPTestServer.h            |     8 +-
 Net/testsuite/src/ICMPClientTest.cpp          |    12 +-
 Net/testsuite/src/IPAddressTest.cpp           |    20 +-
 Net/testsuite/src/MailMessageTest.cpp         |   160 +-
 Net/testsuite/src/MailMessageTest.h           |     2 +
 Net/testsuite/src/MailStreamTest.cpp          |     8 +-
 Net/testsuite/src/MessageHeaderTest.cpp       |    66 +-
 Net/testsuite/src/MessageHeaderTest.h         |     2 +
 Net/testsuite/src/MulticastEchoServer.cpp     |     6 +-
 Net/testsuite/src/MulticastEchoServer.h       |    14 +-
 Net/testsuite/src/MultipartWriterTest.cpp     |     4 +-
 Net/testsuite/src/NTPClientTest.cpp           |     6 +-
 Net/testsuite/src/NameValueCollectionTest.cpp |    30 +-
 Net/testsuite/src/OAuth10CredentialsTest.cpp  |    82 +-
 Net/testsuite/src/OAuth20CredentialsTest.cpp  |     4 +-
 Net/testsuite/src/PollSetTest.cpp             |   147 +-
 Net/testsuite/src/PollSetTest.h               |     2 +
 Net/testsuite/src/QuotedPrintableTest.cpp     |     2 +-
 Net/testsuite/src/QuotedPrintableTest.h       |     2 +-
 Net/testsuite/src/RawSocketTest.cpp           |     7 +-
 Net/testsuite/src/ReactorTestSuite.cpp        |     2 +
 Net/testsuite/src/SMTPClientSessionTest.cpp   |     2 +-
 Net/testsuite/src/SMTPClientSessionTest.h     |     2 +-
 Net/testsuite/src/SocketConnectorTest.cpp     |   170 +
 Net/testsuite/src/SocketConnectorTest.h       |    36 +
 Net/testsuite/src/SocketProactorTest.cpp      |    61 +-
 Net/testsuite/src/SocketStreamTest.cpp        |     4 +-
 Net/testsuite/src/SocketTest.cpp              |    36 +-
 Net/testsuite/src/SyslogTest.cpp              |    42 +-
 Net/testsuite/src/SyslogTest.h                |     1 +
 Net/testsuite/src/TCPServerTest.cpp           |    22 +-
 Net/testsuite/src/UDPEchoServer.h             |     8 +-
 Net/testsuite/src/UDPServerTest.cpp           |     5 +-
 Net/testsuite/src/WebSocketTest.cpp           |    18 +-
 Net/testsuite/src/WinCEDriver.cpp             |     2 +-
 NetSSL_OpenSSL/NetSSL_OpenSSL.progen          |     1 +
 NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.sln       |    42 +
 NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj   |   273 +-
 NetSSL_OpenSSL/doc/howtobuild.txt             |     2 +-
 .../Poco/Net/CertificateHandlerFactory.h      |     4 +-
 .../Poco/Net/ConsoleCertificateHandler.h      |     2 +-
 .../include/Poco/Net/HTTPSClientSession.h     |    16 +-
 .../include/Poco/Net/HTTPSStreamFactory.h     |    12 +-
 .../include/Poco/Net/KeyFileHandler.h         |     2 +-
 NetSSL_OpenSSL/include/Poco/Net/NetSSL.h      |     6 +-
 .../include/Poco/Net/PrivateKeyFactory.h      |     4 +-
 .../Poco/Net/PrivateKeyPassphraseHandler.h    |     6 +-
 .../Poco/Net/RejectCertificateHandler.h       |     2 +-
 .../include/Poco/Net/SecureServerSocket.h     |     2 +-
 .../include/Poco/Net/SecureSocketImpl.h       |     9 +
 .../include/Poco/Net/SecureStreamSocket.h     |    42 +-
 .../include/Poco/Net/SecureStreamSocketImpl.h |    50 +-
 .../include/Poco/Net/X509Certificate.h        |    14 +-
 .../HTTPSTimeServer/HTTPSTimeServer.progen    |     1 +
 .../HTTPSTimeServer/src/HTTPSTimeServer.cpp   |    20 +-
 NetSSL_OpenSSL/samples/Mail/Mail.progen       |     1 +
 NetSSL_OpenSSL/samples/Mail/src/Mail.cpp      |    10 +-
 NetSSL_OpenSSL/samples/Mail/src/PocoLogo.hpp  |   262 +-
 .../samples/SetSourceIP/SetSourceIP.progen    |     1 +
 .../TwitterClient/TwitterClient.progen        |     1 +
 .../samples/TwitterClient/src/TweetApp.cpp    |    20 +-
 .../samples/TwitterClient/src/Twitter.cpp     |    16 +-
 .../samples/TwitterClient/src/Twitter.h       |    14 +-
 .../samples/download/doc/readme.txt           |     4 +-
 .../samples/download/download.progen          |     1 +
 .../src/CertificateHandlerFactoryMgr.cpp      |     6 +-
 NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp     |    20 +-
 NetSSL_OpenSSL/src/KeyFileHandler.cpp         |     2 +-
 NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp   |     6 +-
 NetSSL_OpenSSL/src/SecureServerSocket.cpp     |    12 +-
 NetSSL_OpenSSL/src/SecureSocketImpl.cpp       |    16 +
 NetSSL_OpenSSL/src/SecureStreamSocket.cpp     |    30 +-
 NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp |    14 +-
 NetSSL_OpenSSL/src/Session.cpp                |     2 +-
 NetSSL_OpenSSL/testsuite/TestSuite.progen     |     1 +
 .../testsuite/TestSuite_vs170.vcxproj         |   296 +-
 NetSSL_OpenSSL/testsuite/src/DialogServer.cpp |     2 +-
 NetSSL_OpenSSL/testsuite/src/DialogServer.h   |    16 +-
 NetSSL_OpenSSL/testsuite/src/Driver.cpp       |     4 +-
 .../testsuite/src/HTTPSTestServer.cpp         |    16 +-
 .../testsuite/src/HTTPSTestServer.h           |     8 +-
 NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp  |     6 +-
 NetSSL_OpenSSL/testsuite/src/WinDriver.cpp    |     4 +-
 NetSSL_Win/NetSSL_Win.progen                  |     1 +
 NetSSL_Win/NetSSL_Win_vs170.sln               |    42 +
 NetSSL_Win/NetSSL_Win_vs170.vcxproj           |   273 +-
 NetSSL_Win/doc/README.txt                     |    16 +-
 .../Poco/Net/AcceptCertificateHandler.h       |     2 +-
 .../include/Poco/Net/AutoSecBufferDesc.h      |     4 +-
 .../Poco/Net/CertificateHandlerFactory.h      |     4 +-
 .../Poco/Net/CertificateHandlerFactoryMgr.h   |     6 +-
 .../Poco/Net/ConsoleCertificateHandler.h      |     2 +-
 NetSSL_Win/include/Poco/Net/Context.h         |    56 +-
 .../include/Poco/Net/HTTPSClientSession.h     |    16 +-
 .../include/Poco/Net/HTTPSStreamFactory.h     |    12 +-
 .../Poco/Net/InvalidCertificateHandler.h      |     8 +-
 NetSSL_Win/include/Poco/Net/KeyFileHandler.h  |     2 +-
 NetSSL_Win/include/Poco/Net/NetSSL.h          |     2 +-
 .../include/Poco/Net/PrivateKeyFactory.h      |     4 +-
 .../include/Poco/Net/PrivateKeyFactoryMgr.h   |     6 +-
 .../Poco/Net/PrivateKeyPassphraseHandler.h    |     6 +-
 .../Poco/Net/RejectCertificateHandler.h       |     2 +-
 NetSSL_Win/include/Poco/Net/SSLManager.h      |    30 +-
 .../include/Poco/Net/SecureServerSocket.h     |     2 +-
 .../include/Poco/Net/SecureStreamSocket.h     |    42 +-
 .../include/Poco/Net/SecureStreamSocketImpl.h |    50 +-
 NetSSL_Win/include/Poco/Net/Session.h         |     6 +-
 NetSSL_Win/include/Poco/Net/X509Certificate.h |    34 +-
 .../HTTPSTimeServer/HTTPSTimeServer.progen    |     1 +
 .../HTTPSTimeServer/src/HTTPSTimeServer.cpp   |    20 +-
 NetSSL_Win/samples/Mail/Mail.progen           |     1 +
 NetSSL_Win/samples/Mail/src/Mail.cpp          |    10 +-
 NetSSL_Win/samples/Mail/src/PocoLogo.hpp      |   262 +-
 NetSSL_Win/samples/download/download.progen   |     1 +
 .../src/CertificateHandlerFactoryMgr.cpp      |     6 +-
 NetSSL_Win/src/HTTPSClientSession.cpp         |     2 +-
 NetSSL_Win/src/HTTPSStreamFactory.cpp         |    16 +-
 NetSSL_Win/src/KeyFileHandler.cpp             |     2 +-
 NetSSL_Win/src/PrivateKeyFactoryMgr.cpp       |     6 +-
 NetSSL_Win/src/SSLManager.cpp                 |    10 +-
 NetSSL_Win/src/SecureServerSocket.cpp         |    12 +-
 NetSSL_Win/src/SecureStreamSocket.cpp         |    30 +-
 NetSSL_Win/src/SecureStreamSocketImpl.cpp     |    14 +-
 NetSSL_Win/src/Session.cpp                    |     2 +-
 NetSSL_Win/src/X509Certificate.cpp            |     2 +-
 NetSSL_Win/testsuite/TestSuite.progen         |     1 +
 NetSSL_Win/testsuite/TestSuite_vs170.vcxproj  |   296 +-
 NetSSL_Win/testsuite/src/Driver.cpp           |     4 +-
 .../testsuite/src/HTTPSClientSessionTest.cpp  |    20 +-
 NetSSL_Win/testsuite/src/HTTPSServerTest.cpp  |    26 +-
 NetSSL_Win/testsuite/src/HTTPSTestServer.cpp  |    16 +-
 NetSSL_Win/testsuite/src/HTTPSTestServer.h    |     6 +-
 NetSSL_Win/testsuite/src/TCPServerTest.cpp    |    40 +-
 NetSSL_Win/testsuite/src/WinCEDriver.cpp      |     6 +-
 NetSSL_Win/testsuite/src/WinDriver.cpp        |     4 +-
 PDF/PDF.progen                                |     1 +
 PDF/PDF_vs170.sln                             |    42 +
 PDF/PDF_vs170.vcxproj                         |   271 +-
 PDF/include/Poco/PDF/Destination.h            |     4 +-
 PDF/include/Poco/PDF/Document.h               |    38 +-
 PDF/include/Poco/PDF/Encoder.h                |     8 +-
 PDF/include/Poco/PDF/Font.h                   |     4 +-
 PDF/include/Poco/PDF/Page.h                   |    74 +-
 PDF/include/Poco/PDF/Resource.h               |     8 +-
 PDF/include/Poco/PDF/hpdf.h                   |    22 +-
 PDF/include/Poco/PDF/hpdf_3dmeasure.h         |     2 +-
 PDF/include/Poco/PDF/hpdf_exdata.h            |     2 +-
 PDF/include/Poco/PDF/hpdf_ext_gstate.h        |     2 +-
 PDF/include/Poco/PDF/hpdf_pages.h             |     2 +-
 PDF/include/Poco/PDF/hpdf_pdfa.h              |     2 +-
 PDF/include/Poco/PDF/hpdf_types.h             |     4 +-
 PDF/include/Poco/PDF/png.h                    |     6 +-
 PDF/include/Poco/PDF/pngconf.h                |    26 +-
 PDF/samples/Image/Image.progen                |     1 +
 PDF/samples/Template/Template.progen          |     1 +
 PDF/samples/Text/Text.progen                  |     1 +
 PDF/src/AttributedString.cpp                  |     6 +-
 PDF/src/Destination.cpp                       |     2 +-
 PDF/src/Document.cpp                          |    22 +-
 PDF/src/Encoder.cpp                           |     2 +-
 PDF/src/Font.cpp                              |     2 +-
 PDF/src/Image.cpp                             |     2 +-
 PDF/src/LinkAnnotation.cpp                    |     2 +-
 PDF/src/Outline.cpp                           |     2 +-
 PDF/src/PDFException.cpp                      |    38 +-
 PDF/src/Page.cpp                              |    24 +-
 PDF/src/TextAnnotation.cpp                    |     2 +-
 PDF/src/XMLTemplate.cpp                       |     2 +-
 PDF/src/hpdf_3dmeasure.c                      |    12 +-
 PDF/src/hpdf_annotation.c                     |    42 +-
 PDF/src/hpdf_encoder_utf.c                    |     2 +-
 PDF/src/hpdf_exdata.c                         |     2 +-
 PDF/src/hpdf_ext_gstate.c                     |    24 +-
 PDF/src/hpdf_image_ccitt.c                    |    28 +-
 PDF/src/hpdf_image_png.c                      |     4 +-
 PDF/src/hpdf_page_operator.c                  |     6 +-
 PDF/src/hpdf_pages.c                          |    16 +-
 PDF/src/hpdf_pdfa.c                           |    16 +-
 PDF/src/hpdf_streams.c                        |     6 +-
 PDF/src/hpdf_u3d.c                            |    20 +-
 PDF/src/pngget.c                              |     2 +-
 PDF/src/pngpread.c                            |     2 +-
 PDF/src/pngrtran.c                            |     4 +-
 PDF/src/pngrutil.c                            |     2 +-
 PDF/src/pngset.c                              |     4 +-
 PDF/src/pngtest.c                             |     2 +-
 PDF/src/t4.h                                  |    16 +-
 PDF/testsuite/TestSuite.progen                |     1 +
 PDF/testsuite/TestSuite_vs170.vcxproj         |   296 +-
 PageCompiler/File2Page/File2Page.progen       |     1 +
 PageCompiler/File2Page/File2Page_vs170.sln    |    24 +
 .../File2Page/File2Page_vs170.vcxproj         |   296 +-
 PageCompiler/File2Page/src/File2Page.cpp      |    28 +-
 PageCompiler/PageCompiler.progen              |     1 +
 PageCompiler/PageCompiler_vs170.sln           |    24 +
 PageCompiler/PageCompiler_vs170.vcxproj       |   296 +-
 PageCompiler/cpspc.properties                 |     2 +-
 .../HTTPTimeServer/HTTPTimeServer.progen      |     1 +
 .../HTTPTimeServer/src/HTTPTimeServerApp.cpp  |    10 +-
 PageCompiler/src/CodeWriter.h                 |     6 +-
 PageCompiler/src/Page.cpp                     |     2 +-
 PageCompiler/src/Page.h                       |     8 +-
 PageCompiler/src/PageReader.h                 |     4 +-
 PocoDoc/PocoDoc.progen                        |     1 +
 PocoDoc/PocoDoc_vs170.sln                     |    24 +
 PocoDoc/PocoDoc_vs170.vcxproj                 |   296 +-
 PocoDoc/cfg/mkdoc-poco.xml                    |     2 +-
 PocoDoc/cfg/mkdocumentation.xml               |     2 +-
 PocoDoc/pages/samplePage.page                 |     2 +-
 PocoDoc/resources/css/styles.css              |   228 +-
 PocoDoc/resources/js/CollapsibleLists.js      |    14 +-
 .../js/iframeResizer.contentWindow.js         |     2 +-
 PocoDoc/src/DocWriter.cpp                     |     5 +-
 PocoDoc/src/DocWriter.h                       |    32 +-
 ProGen/ProGen.progen                          |     1 +
 ProGen/ProGen_vs170.sln                       |    24 +
 ProGen/ProGen_vs170.vcxproj                   |   296 +-
 ProGen/progen.bat                             |     2 +-
 ProGen/rebuildall32.bat                       |     2 +-
 ProGen/src/ProGen.cpp                         |    90 +-
 ProGen/src/VSXMLWriter.cpp                    |     4 +-
 ProGen/src/VSXMLWriter.h                      |     2 +-
 Prometheus/Prometheus.progen                  |     1 +
 Prometheus/Prometheus_vs170.sln               |    42 +
 Prometheus/Prometheus_vs170.vcxproj           |   271 +-
 .../MetricsSample/MetricsSample.progen        |     1 +
 Prometheus/testsuite/TestSuite.progen         |     1 +
 Prometheus/testsuite/TestSuite_vs170.vcxproj  |   296 +-
 README                                        |    17 +
 README.md                                     |    16 +
 Redis/Redis.progen                            |     1 +
 Redis/Redis_vs170.sln                         |    42 +
 Redis/Redis_vs170.vcxproj                     |   271 +-
 Redis/include/Poco/Redis/Client.h             |    10 +
 Redis/include/Poco/Redis/Command.h            |     6 +
 Redis/src/Array.cpp                           |     2 +-
 Redis/src/AsyncReader.cpp                     |     2 +-
 Redis/src/Client.cpp                          |    22 +
 Redis/src/Command.cpp                         |    18 +
 Redis/testsuite/TestSuite.progen              |     1 +
 Redis/testsuite/TestSuite_vs170.vcxproj       |   296 +-
 Redis/testsuite/src/RedisTest.cpp             |     2 +-
 Redis/testsuite/src/WinCEDriver.cpp           |     2 +-
 SevenZip/SevenZip.progen                      |     1 +
 SevenZip/SevenZip_vs170.sln                   |    24 +
 SevenZip/SevenZip_vs170.vcxproj               |   277 +-
 SevenZip/include/Poco/SevenZip/Archive.h      |    26 +-
 SevenZip/include/Poco/SevenZip/ArchiveEntry.h |    30 +-
 SevenZip/samples/un7zip/src/un7zip.cpp        |    42 +-
 SevenZip/samples/un7zip/un7zip.progen         |     1 +
 SevenZip/src/7z.h                             |     6 +-
 SevenZip/src/7zCrc.c                          |     4 +-
 SevenZip/src/7zFile.c                         |    20 +-
 SevenZip/src/7zIn.c                           |    24 +-
 SevenZip/src/Alloc.c                          |     4 +-
 SevenZip/src/ArchiveEntry.cpp                 |     6 +-
 SevenZip/src/Bra.c                            |    10 +-
 SevenZip/src/Bra.h                            |     8 +-
 SevenZip/src/BraIA64.c                        |    10 +-
 SevenZip/src/CpuArch.c                        |     2 +-
 SevenZip/src/LzFind.c                         |     4 +-
 SevenZip/src/LzFindMt.c                       |    16 +-
 SevenZip/src/LzFindMt.h                       |     4 +-
 SevenZip/src/Lzma2Dec.c                       |    14 +-
 SevenZip/src/Lzma2Enc.c                       |    18 +-
 SevenZip/src/Lzma86Enc.c                      |     6 +-
 SevenZip/src/LzmaDec.c                        |    12 +-
 SevenZip/src/LzmaDec.h                        |     4 +-
 SevenZip/src/LzmaEnc.c                        |    40 +-
 SevenZip/src/LzmaLib.h                        |     4 +-
 SevenZip/src/MtCoder.c                        |     4 +-
 SevenZip/src/MtCoder.h                        |     4 +-
 SevenZip/src/Ppmd.h                           |     2 +-
 SevenZip/src/Ppmd7.c                          |    36 +-
 SevenZip/src/Ppmd7.h                          |     2 +-
 SevenZip/src/Ppmd7Dec.c                       |     4 +-
 SevenZip/src/Ppmd7Enc.c                       |     6 +-
 SevenZip/src/Sha256.c                         |     2 +-
 SevenZip/src/Xz.h                             |     2 +-
 SevenZip/src/XzDec.c                          |    24 +-
 SevenZip/src/XzEnc.c                          |    10 +-
 SevenZip/src/XzIn.c                           |     6 +-
 Util/Util.progen                              |     1 +
 Util/Util_vs170.sln                           |    42 +
 Util/Util_vs170.vcxproj                       |   271 +-
 Util/Util_vs90.vcproj                         |     2 +
 .../include/Poco/Util/AbstractConfiguration.h |    56 +-
 Util/include/Poco/Util/ConfigurationMapper.h  |     6 +-
 Util/include/Poco/Util/ConfigurationView.h    |     8 +-
 .../Poco/Util/FilesystemConfiguration.h       |     4 +-
 Util/include/Poco/Util/HelpFormatter.h        |    34 +-
 Util/include/Poco/Util/IniFileConfiguration.h |    12 +-
 Util/include/Poco/Util/JSONConfiguration.h    |     6 +-
 Util/include/Poco/Util/LayeredConfiguration.h |    16 +-
 .../Poco/Util/LocalConfigurationView.h        |    81 +-
 Util/include/Poco/Util/LoggingConfigurator.h  |    16 +-
 Util/include/Poco/Util/LoggingSubsystem.h     |     2 +-
 Util/include/Poco/Util/MapConfiguration.h     |     2 +-
 Util/include/Poco/Util/Option.h               |     2 +-
 Util/include/Poco/Util/OptionCallback.h       |    16 +-
 Util/include/Poco/Util/OptionProcessor.h      |     8 +-
 Util/include/Poco/Util/OptionSet.h            |    10 +-
 .../Poco/Util/PropertyFileConfiguration.h     |    14 +-
 Util/include/Poco/Util/RegExpValidator.h      |     2 +-
 Util/include/Poco/Util/ServerApplication.h    |    24 +-
 Util/include/Poco/Util/SystemConfiguration.h  |    10 +-
 Util/include/Poco/Util/TimerTask.h            |    17 +-
 Util/include/Poco/Util/TimerTaskAdapter.h     |    12 +-
 Util/include/Poco/Util/Units.h                |   120 +-
 .../Poco/Util/WinRegistryConfiguration.h      |     2 +-
 Util/include/Poco/Util/WinService.h           |    20 +-
 Util/include/Poco/Util/XMLConfiguration.h     |    16 +-
 Util/samples/SampleApp/SampleApp.progen       |     1 +
 Util/samples/SampleApp/src/SampleApp.cpp      |    24 +-
 Util/samples/SampleServer/SampleServer.progen |     1 +
 .../samples/SampleServer/src/SampleServer.cpp |    10 +-
 Util/samples/Units/Makefile                   |     2 +-
 Util/samples/Units/Units.progen               |     1 +
 Util/samples/Units/src/Units.cpp              |    36 +-
 Util/samples/pkill/pkill.progen               |     1 +
 Util/samples/pkill/src/pkill.cpp              |    14 +-
 Util/src/AbstractConfiguration.cpp            |    30 +-
 Util/src/ConfigurationMapper.cpp              |     2 +-
 Util/src/ConfigurationView.cpp                |     2 +-
 Util/src/FilesystemConfiguration.cpp          |     2 +-
 Util/src/HelpFormatter.cpp                    |     8 +-
 Util/src/IniFileConfiguration.cpp             |     6 +-
 Util/src/JSONConfiguration.cpp                |    50 +-
 Util/src/LayeredConfiguration.cpp             |     4 +-
 Util/src/LocalConfigurationView.cpp           |    77 +-
 Util/src/LoggingConfigurator.cpp              |     8 +-
 Util/src/LoggingSubsystem.cpp                 |     2 +-
 Util/src/Option.cpp                           |     2 +-
 Util/src/OptionProcessor.cpp                  |     2 +-
 Util/src/OptionSet.cpp                        |     2 +-
 Util/src/PropertyFileConfiguration.cpp        |     8 +-
 Util/src/Timer.cpp                            |     2 +-
 Util/src/WinService.cpp                       |    22 +-
 Util/src/XMLConfiguration.cpp                 |    14 +-
 Util/testsuite/TestSuite.progen               |     1 +
 Util/testsuite/TestSuite_vs170.vcxproj        |   298 +-
 .../src/AbstractConfigurationTest.cpp         |    36 +-
 .../testsuite/src/AbstractConfigurationTest.h |     4 +-
 .../testsuite/src/ConfigurationMapperTest.cpp |    14 +-
 Util/testsuite/src/ConfigurationViewTest.cpp  |    14 +-
 .../src/FilesystemConfigurationTest.cpp       |     6 +-
 Util/testsuite/src/HelpFormatterTest.cpp      |    12 +-
 .../src/IniFileConfigurationTest.cpp          |    14 +-
 Util/testsuite/src/JSONConfigurationTest.cpp  |    21 +
 Util/testsuite/src/JSONConfigurationTest.h    |     1 +
 .../src/LayeredConfigurationTest.cpp          |    36 +-
 .../testsuite/src/LoggingConfiguratorTest.cpp |    20 +-
 Util/testsuite/src/MapConfigurationTest.cpp   |     4 +-
 Util/testsuite/src/OptionProcessorTest.cpp    |    54 +-
 Util/testsuite/src/OptionSetTest.cpp          |     8 +-
 Util/testsuite/src/OptionTest.cpp             |    48 +-
 .../src/PropertyFileConfigurationTest.cpp     |    16 +-
 .../testsuite/src/SystemConfigurationTest.cpp |     8 +-
 Util/testsuite/src/TimerTest.cpp              |     2 +-
 Util/testsuite/src/ValidatorTest.cpp          |     6 +-
 Util/testsuite/src/WinCEDriver.cpp            |     2 +-
 Util/testsuite/src/WinConfigurationTest.cpp   |     8 +-
 Util/testsuite/src/WinRegistryTest.cpp        |    10 +-
 Util/testsuite/src/WinServiceTest.cpp         |    20 +-
 Util/testsuite/src/XMLConfigurationTest.cpp   |    34 +-
 XML/XML.progen                                |     1 +
 XML/XML_vs170.sln                             |    42 +
 XML/XML_vs170.vcxproj                         |   289 +-
 XML/include/Poco/DOM/Attr.h                   |    12 +-
 XML/include/Poco/DOM/AttrMap.h                |     2 +-
 XML/include/Poco/DOM/CDATASection.h           |     8 +-
 XML/include/Poco/DOM/CharacterData.h          |     8 +-
 XML/include/Poco/DOM/ChildNodesList.h         |     4 +-
 XML/include/Poco/DOM/Comment.h                |     2 +-
 XML/include/Poco/DOM/DOMBuilder.h             |     6 +-
 XML/include/Poco/DOM/DOMException.h           |    18 +-
 XML/include/Poco/DOM/DOMImplementation.h      |    14 +-
 XML/include/Poco/DOM/DOMObject.h              |     4 +-
 XML/include/Poco/DOM/DOMParser.h              |    10 +-
 XML/include/Poco/DOM/DOMSerializer.h          |     8 +-
 XML/include/Poco/DOM/DOMWriter.h              |     6 +-
 XML/include/Poco/DOM/DTDMap.h                 |     6 +-
 XML/include/Poco/DOM/Document.h               |    40 +-
 XML/include/Poco/DOM/DocumentFragment.h       |    10 +-
 XML/include/Poco/DOM/DocumentType.h           |    10 +-
 XML/include/Poco/DOM/Element.h                |    24 +-
 XML/include/Poco/DOM/ElementsByTagNameList.h  |     4 +-
 XML/include/Poco/DOM/Entity.h                 |    14 +-
 XML/include/Poco/DOM/EntityReference.h        |     6 +-
 XML/include/Poco/DOM/Event.h                  |    52 +-
 XML/include/Poco/DOM/EventDispatcher.h        |    18 +-
 XML/include/Poco/DOM/EventException.h         |     8 +-
 XML/include/Poco/DOM/EventListener.h          |     4 +-
 XML/include/Poco/DOM/EventTarget.h            |    30 +-
 XML/include/Poco/DOM/MutationEvent.h          |    28 +-
 XML/include/Poco/DOM/NamedNodeMap.h           |     8 +-
 XML/include/Poco/DOM/Node.h                   |    40 +-
 XML/include/Poco/DOM/NodeAppender.h           |     4 +-
 XML/include/Poco/DOM/NodeFilter.h             |    16 +-
 XML/include/Poco/DOM/NodeIterator.h           |    18 +-
 XML/include/Poco/DOM/NodeList.h               |     6 +-
 XML/include/Poco/DOM/Notation.h               |    10 +-
 XML/include/Poco/DOM/ProcessingInstruction.h  |     6 +-
 XML/include/Poco/DOM/Text.h                   |     4 +-
 XML/include/Poco/DOM/TreeWalker.h             |    18 +-
 XML/include/Poco/SAX/Attributes.h             |    36 +-
 XML/include/Poco/SAX/AttributesImpl.h         |    12 +-
 XML/include/Poco/SAX/ContentHandler.h         |    62 +-
 XML/include/Poco/SAX/DTDHandler.h             |    52 +-
 XML/include/Poco/SAX/DeclHandler.h            |    52 +-
 XML/include/Poco/SAX/DefaultHandler.h         |    22 +-
 XML/include/Poco/SAX/EntityResolver.h         |    52 +-
 XML/include/Poco/SAX/EntityResolverImpl.h     |    16 +-
 XML/include/Poco/SAX/ErrorHandler.h           |    62 +-
 XML/include/Poco/SAX/InputSource.h            |    78 +-
 XML/include/Poco/SAX/LexicalHandler.h         |    92 +-
 XML/include/Poco/SAX/Locator.h                |    74 +-
 XML/include/Poco/SAX/LocatorImpl.h            |    20 +-
 XML/include/Poco/SAX/NamespaceSupport.h       |    56 +-
 XML/include/Poco/SAX/SAXException.h           |    62 +-
 XML/include/Poco/SAX/WhitespaceFilter.h       |     2 +-
 XML/include/Poco/SAX/XMLFilter.h              |    22 +-
 XML/include/Poco/SAX/XMLFilterImpl.h          |    22 +-
 XML/include/Poco/SAX/XMLReader.h              |   124 +-
 XML/include/Poco/XML/Name.h                   |    32 +-
 XML/include/Poco/XML/NamePool.h               |     8 +-
 XML/include/Poco/XML/NamespaceStrategy.h      |    12 +-
 XML/include/Poco/XML/QName.h                  |     2 +-
 XML/include/Poco/XML/XML.h                    |     6 +-
 XML/include/Poco/XML/XMLString.h              |     6 +-
 XML/include/Poco/XML/XMLWriter.h              |    38 +-
 XML/samples/DOMParser/DOMParser.progen        |     1 +
 XML/samples/DOMParser/src/DOMParser.cpp       |     6 +-
 XML/samples/DOMWriter/DOMWriter.progen        |     1 +
 XML/samples/DOMWriter/src/DOMWriter.cpp       |     6 +-
 XML/samples/PrettyPrint/PrettyPrint.progen    |     1 +
 XML/samples/PrettyPrint/src/PrettyPrint.cpp   |     2 +-
 XML/samples/SAXParser/SAXParser.progen        |     1 +
 XML/samples/SAXParser/src/SAXParser.cpp       |    50 +-
 XML/src/AbstractNode.cpp                      |     4 +-
 XML/src/Attr.cpp                              |     2 +-
 XML/src/AttrMap.cpp                           |     6 +-
 XML/src/AttributesImpl.cpp                    |     4 +-
 XML/src/CDATASection.cpp                      |     4 +-
 XML/src/CharacterData.cpp                     |     4 +-
 XML/src/Comment.cpp                           |     4 +-
 XML/src/DOMException.cpp                      |     6 +-
 XML/src/DOMImplementation.cpp                 |     2 +-
 XML/src/DOMObject.cpp                         |     2 +-
 XML/src/DOMSerializer.cpp                     |    14 +-
 XML/src/DOMWriter.cpp                         |     4 +-
 XML/src/Document.cpp                          |    14 +-
 XML/src/DocumentFragment.cpp                  |     4 +-
 XML/src/DocumentType.cpp                      |     4 +-
 XML/src/Element.cpp                           |     4 +-
 XML/src/ElementsByTagNameList.cpp             |     4 +-
 XML/src/Entity.cpp                            |     4 +-
 XML/src/EntityReference.cpp                   |     4 +-
 XML/src/EntityResolverImpl.cpp                |     2 +-
 XML/src/EventDispatcher.cpp                   |     8 +-
 XML/src/MutationEvent.cpp                     |     8 +-
 XML/src/Name.cpp                              |     6 +-
 XML/src/NamePool.cpp                          |    18 +-
 XML/src/NamespaceStrategy.cpp                 |     4 +-
 XML/src/NamespaceSupport.cpp                  |    10 +-
 XML/src/NodeAppender.cpp                      |     4 +-
 XML/src/NodeIterator.cpp                      |    32 +-
 XML/src/Notation.cpp                          |     4 +-
 XML/src/ProcessingInstruction.cpp             |     4 +-
 XML/src/QName.cpp                             |     4 +-
 XML/src/SAXException.cpp                      |     4 +-
 XML/src/Text.cpp                              |     4 +-
 XML/src/TreeWalker.cpp                        |    34 +-
 XML/src/WhitespaceFilter.cpp                  |     6 +-
 XML/src/XMLFilterImpl.cpp                     |     4 +-
 XML/src/XMLString.cpp                         |     4 +-
 XML/src/XMLWriter.cpp                         |    32 +-
 XML/src/xmltok.c                              |     2 +-
 XML/testsuite/TestSuite.progen                |     1 +
 XML/testsuite/TestSuite_vs170.vcxproj         |   296 +-
 XML/testsuite/src/AttributesImplTest.cpp      |    36 +-
 XML/testsuite/src/ChildNodesTest.cpp          |     6 +-
 XML/testsuite/src/DocumentTest.cpp            |    42 +-
 XML/testsuite/src/DocumentTypeTest.cpp        |    12 +-
 XML/testsuite/src/ElementTest.h               |     2 +-
 XML/testsuite/src/EventTest.cpp               |   100 +-
 XML/testsuite/src/NamePoolTest.cpp            |     8 +-
 XML/testsuite/src/NameTest.cpp                |    12 +-
 XML/testsuite/src/NameTest.h                  |     2 +-
 XML/testsuite/src/NamespaceSupportTest.cpp    |    30 +-
 XML/testsuite/src/NodeAppenderTest.cpp        |    36 +-
 XML/testsuite/src/NodeIteratorTest.cpp        |    32 +-
 XML/testsuite/src/NodeTest.cpp                |    62 +-
 XML/testsuite/src/ParserWriterTest.cpp        |     8 +-
 XML/testsuite/src/SAXParserTest.cpp           |    20 +-
 XML/testsuite/src/TreeWalkerTest.cpp          |    58 +-
 XML/testsuite/src/WinCEDriver.cpp             |     2 +-
 Zip/Zip.progen                                |     1 +
 Zip/Zip_vs170.sln                             |    42 +
 Zip/Zip_vs170.vcxproj                         |   279 +-
 Zip/include/Poco/Zip/AutoDetectStream.h       |    10 +-
 Zip/include/Poco/Zip/Compress.h               |     4 +-
 Zip/include/Poco/Zip/Decompress.h             |     2 +-
 Zip/include/Poco/Zip/PartialStream.h          |     8 +-
 Zip/include/Poco/Zip/ZipArchive.h             |     2 +-
 Zip/include/Poco/Zip/ZipArchiveInfo.h         |     8 +-
 Zip/include/Poco/Zip/ZipFileInfo.h            |    11 +-
 Zip/include/Poco/Zip/ZipManipulator.h         |     4 +-
 Zip/include/Poco/Zip/ZipStream.h              |     2 +-
 Zip/include/Poco/Zip/ZipUtil.h                |     2 +-
 Zip/samples/unzip/src/unzip.cpp               |    16 +-
 Zip/samples/unzip/unzip.progen                |     1 +
 Zip/samples/zip/src/zip.cpp                   |    16 +-
 Zip/samples/zip/zip.progen                    |     1 +
 Zip/src/AutoDetectStream.cpp                  |     8 +-
 Zip/src/Compress.cpp                          |    14 +-
 Zip/src/ZipArchiveInfo.cpp                    |     2 +-
 Zip/src/ZipLocalFileHeader.cpp                |     3 +-
 Zip/src/ZipManipulator.cpp                    |     4 +-
 Zip/src/ZipUtil.cpp                           |    10 +-
 Zip/testsuite/TestSuite.progen                |     1 +
 Zip/testsuite/TestSuite_vs170.vcxproj         |   296 +-
 Zip/testsuite/src/PartialStreamTest.cpp       |    10 +-
 Zip/testsuite/src/WinCEDriver.cpp             |     2 +-
 Zip/testsuite/src/ZipTest.h                   |     2 +-
 Zip/testsuite/testfile.txt                    |    82 +-
 Zip/testsuite/testfile2.txt                   |    82 +-
 Zip/testsuite/testfile3.txt                   |    82 +-
 build/config/AIX                              |     4 +-
 build/config/ARM-Linux                        |     2 +-
 build/config/Android                          |    10 +-
 build/config/AppleTV                          |    20 +-
 build/config/AppleTVSimulator                 |     2 +-
 build/config/CEGCCARM                         |    10 +-
 build/config/CygLinux                         |     4 +-
 build/config/Cygwin                           |    34 +-
 build/config/FreeBSD-Linux-compat             |     4 +-
 build/config/HP-UX                            |     4 +-
 build/config/Linux-SolarisStudio              |     4 +-
 build/config/Linux-clang                      |     2 +-
 build/config/MinGW                            |     2 +-
 build/config/MinGW-CrossEnv                   |     2 +-
 build/config/NIOS2-Linux                      |     2 +-
 build/config/OSF1                             |    20 +-
 build/config/QNX                              |     6 +-
 build/config/SmartOS-gcc                      |     2 +-
 build/config/SunOS-GCC                        |     4 +-
 build/config/SunOS-SunForte                   |     2 +-
 build/config/SunOS-SunStudio                  |     2 +-
 build/config/SunOS-SunStudio11                |     2 +-
 build/config/SunOS-stdcxx-x86_64              |     2 +-
 build/config/WatchOS                          |    20 +-
 build/config/WatchSimulator                   |     2 +-
 build/config/iPhone-clang                     |     2 +-
 build/config/iPhone-clang-libc++              |     2 +-
 build/config/iPhoneSimulator                  |     2 +-
 build/config/iPhoneSimulator-clang            |     2 +-
 build/config/iPhoneSimulator-clang-libc++     |     2 +-
 build/rules/dylib                             |     4 +
 build/rules/exec                              |     4 +
 build/rules/global                            |     6 +-
 build/rules/lib                               |     4 +
 build/rules/sample                            |     2 +-
 build/script/makedepend.aCC                   |     2 +-
 build/script/makeldpath                       |     2 +-
 build/script/vxprogen                         |     6 +-
 buildwin.cmd                                  |    16 +-
 ci/runtests.sh                                |     4 +
 cmake/FindODBC.cmake                          |     6 +-
 cmake/FindPCRE.cmake                          |   107 -
 cmake/FindPCRE2.cmake                         |   107 +
 cmake/UseEmbeddedOpenSSL.cmake                |     4 +-
 doc/00200-GettingStarted.page                 |     2 +-
 doc/99100-ReleaseNotes.page                   |   128 +-
 doc/99200-WinCEPlatformNotes.page             |    28 +-
 doc/99250-VxWorksPlatformNotes.page           |    28 +-
 doc/99300-AndroidPlatformNotes.page           |    30 +-
 packaging/README.md                           |     6 +-
 packaging/README.txt                          |     2 +-
 packaging/Windows/NuGet/Poco.shared.nuspec    |     4 +-
 packaging/Windows/NuGet/Poco.static.nuspec    |     4 +-
 packaging/Windows/NuGet/Poco.static.targets   |     2 +-
 packaging/Windows/NuGet/bap.cmd               |     4 +-
 packaging/Windows/NuGet/pack.cmd              |     6 +-
 release/script/mkrel                          |     2 +-
 release/spec/all.release                      |     1 +
 tsan.suppress                                 |    25 +
 1783 files changed, 101745 insertions(+), 63569 deletions(-)
 delete mode 100644 Foundation/src/diy-fp.cc
 create mode 100644 Foundation/src/double-to-string.cc
 create mode 100644 Foundation/src/double-to-string.h
 delete mode 100644 Foundation/src/pcre.h
 create mode 100644 Foundation/src/pcre2.h
 create mode 100644 Foundation/src/pcre2_auto_possess.c
 rename Foundation/src/{pcre_chartables.c => pcre2_chartables.c} (67%)
 create mode 100644 Foundation/src/pcre2_compile.c
 create mode 100644 Foundation/src/pcre2_config.c
 create mode 100644 Foundation/src/pcre2_config.h
 create mode 100644 Foundation/src/pcre2_context.c
 create mode 100644 Foundation/src/pcre2_convert.c
 rename Foundation/src/{pcre_dfa_exec.c => pcre2_dfa_match.c} (64%)
 create mode 100644 Foundation/src/pcre2_error.c
 create mode 100644 Foundation/src/pcre2_extuni.c
 create mode 100644 Foundation/src/pcre2_find_bracket.c
 create mode 100644 Foundation/src/pcre2_internal.h
 create mode 100644 Foundation/src/pcre2_intmodedep.h
 rename Foundation/src/{pcre_jit_compile.c => pcre2_jit_compile.c} (57%)
 create mode 100644 Foundation/src/pcre2_jit_match.c
 create mode 100644 Foundation/src/pcre2_jit_misc.c
 rename Foundation/src/{pcre_maketables.c => pcre2_maketables.c} (56%)
 create mode 100644 Foundation/src/pcre2_match.c
 create mode 100644 Foundation/src/pcre2_match_data.c
 rename Foundation/src/{pcre_newline.c => pcre2_newline.c} (64%)
 rename Foundation/src/{pcre_ord2utf8.c => pcre2_ord2utf.c} (65%)
 create mode 100644 Foundation/src/pcre2_pattern_info.c
 create mode 100644 Foundation/src/pcre2_script_run.c
 create mode 100644 Foundation/src/pcre2_serialize.c
 create mode 100644 Foundation/src/pcre2_string_utils.c
 create mode 100644 Foundation/src/pcre2_study.c
 create mode 100644 Foundation/src/pcre2_substitute.c
 create mode 100644 Foundation/src/pcre2_substring.c
 create mode 100644 Foundation/src/pcre2_tables.c
 create mode 100644 Foundation/src/pcre2_ucd.c
 create mode 100644 Foundation/src/pcre2_ucp.h
 create mode 100644 Foundation/src/pcre2_ucptables.c
 rename Foundation/src/{pcre_valid_utf8.c => pcre2_valid_utf.c} (51%)
 rename Foundation/src/{pcre_xclass.c => pcre2_xclass.c} (81%)
 delete mode 100644 Foundation/src/pcre_byte_order.c
 delete mode 100644 Foundation/src/pcre_compile.c
 delete mode 100644 Foundation/src/pcre_config.c
 delete mode 100644 Foundation/src/pcre_config.h
 delete mode 100644 Foundation/src/pcre_exec.c
 delete mode 100644 Foundation/src/pcre_fullinfo.c
 delete mode 100644 Foundation/src/pcre_get.c
 delete mode 100644 Foundation/src/pcre_globals.c
 delete mode 100644 Foundation/src/pcre_internal.h
 delete mode 100644 Foundation/src/pcre_refcount.c
 delete mode 100644 Foundation/src/pcre_string_utils.c
 delete mode 100644 Foundation/src/pcre_study.c
 delete mode 100644 Foundation/src/pcre_tables.c
 delete mode 100644 Foundation/src/pcre_ucd.c
 delete mode 100644 Foundation/src/pcre_version.c
 rename Foundation/src/{double-conversion.cc => string-to-double.cc} (62%)
 create mode 100644 Foundation/src/string-to-double.h
 create mode 100644 Net/src/wepoll.c
 create mode 100644 Net/src/wepoll.h
 create mode 100644 Net/testsuite/src/SocketConnectorTest.cpp
 create mode 100644 Net/testsuite/src/SocketConnectorTest.h
 delete mode 100644 cmake/FindPCRE.cmake
 create mode 100644 cmake/FindPCRE2.cmake
 create mode 100644 tsan.suppress

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6945857ea..5af0030b2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 name: poco-ci
-on: [push]
+on: [push, pull_request]
 jobs:
   linux-gcc-make:
     runs-on: ubuntu-20.04
@@ -15,7 +15,7 @@ jobs:
           - 3306:3306
     steps:
       - uses: actions/checkout@v2
-      - run: sudo apt update && sudo apt install libssl-dev unixodbc-dev redis-server libmysqlclient-dev
+      - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev redis-server libmysqlclient-dev
       - run: ./configure --everything --omit=PDF && make all -s -j4 && sudo make install
       - run: >-
           sudo -s
@@ -24,21 +24,31 @@ jobs:
 
   linux-gcc-make-asan:
     runs-on: ubuntu-20.04
+    services:
+      mysql:
+        image: mysql:latest
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_USER: pocotest
+          MYSQL_PASSWORD: pocotest
+          MYSQL_DATABASE: pocotest
+        ports:
+          - 3306:3306
     steps:
       - uses: actions/checkout@v2
-      - run: sudo apt update && sudo apt install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
-      - run: ./configure --everything --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install
+      - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
+      - run: ./configure --everything --no-samples --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install
       - run: >-
           sudo -s
-          EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB"
+          EXCLUDE_TESTS="Data/ODBC Data/PostgreSQL MongoDB"
           ./ci/runtests.sh
 
   linux-gcc-make-asan-no-soo:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - run: sudo apt update && sudo apt install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
-      - run: ./configure --everything --omit=PDF --no-soo && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install
+      - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
+      - run: ./configure --everything --no-samples --omit=PDF --no-soo && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install
       - run: >-
           sudo -s
           EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB"
@@ -48,18 +58,28 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - run: sudo apt update && sudo apt install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
-      - run: ./configure --everything --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=undefined && sudo make install
+      - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
+      - run: ./configure --everything --no-samples --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=undefined && sudo make install
       - run: >-
           sudo -s
           EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB"
           ./ci/runtests.sh
 
+  linux-gcc-make-tsan:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
+      - run: ./configure --everything --no-samples --omit=CppParser,Encodings,Data/MySQL,Data/ODBC,Data/PostgreSQL,MongoDB,PageCompiler,PDF,PocoDoc,ProGen,Redis,SevenZip && make all -s -j4 SANITIZEFLAGS=-fsanitize=thread && sudo make install
+      - run: >-
+          sudo -s
+          ./ci/runtests.sh TSAN
+
   linux-gcc-cmake:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - run: sudo apt update && sudo apt install cmake ninja-build libssl-dev unixodbc-dev libmysqlclient-dev redis-server
+      - run: sudo apt -y update && sudo apt -y install cmake ninja-build libssl-dev unixodbc-dev libmysqlclient-dev redis-server
       - run: cmake -H. -Bcmake-build -GNinja -DENABLE_PDF=OFF -DENABLE_TESTS=ON && cmake --build cmake-build --target all
       - run: >-
           cd cmake-build &&
@@ -72,8 +92,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: >-
-          sudo apt-get update &&
-          sudo apt-get install crossbuild-essential-armhf
+          sudo apt-get -y update &&
+          sudo apt-get -y install crossbuild-essential-armhf
       - run: >-
           ./configure --config=ARM-Linux --everything --omit=PDF,Crypto,NetSSL_OpenSSL,JWT,Data/MySQL,Data/ODBC,Data/PostgreSQL,PageCompiler,PageCompiler/File2Page &&
           make all -s -j4 ARCHFLAGS="-mcpu=cortex-a8 -mfloat-abi=hard -mfpu=neon" TOOL=arm-linux-gnueabihf
@@ -139,3 +159,16 @@ jobs:
       - run: >-
           cd cmake-build;
           ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Release
+
+# missing asan dll path
+#  windows-2022-msvc-cmake-2022-asan:
+#    runs-on: windows-2022
+#    env:
+#      CPPUNIT_IGNORE: class CppUnit::TestCaller<class PathTest>.testFind,class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom,class CppUnit::TestCaller<class ICMPClientTest>.testPing,class CppUnit::TestCaller<class ICMPClientTest>.testBigPing,class CppUnit::TestCaller<class ICMPSocketTest>.testMTU,class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy,class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
+#    steps:
+#      - uses: actions/checkout@v2
+#      - run: cmake -S. -Bcmake-build -DPOCO_SANITIZE_ASAN=ON -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON
+#      - run: cmake --build cmake-build --config Debug
+#      - run: >-
+#          cd cmake-build;
+#          ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Debug
diff --git a/.gitignore b/.gitignore
index a326021e3..b334caf22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,3 +144,10 @@ cmake-build/
 *.bak
 stage/
 releases/
+
+# vim #
+#######
+*.orig
+*.swp
+*.vim
+tags
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index bb03adf50..9ba835918 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -1,64 +1,76 @@
 {
-	"env": {
-		"POCO_BASE": "${workspaceFolder}",
-		"pocoIncludePath": [
-			"${POCO_BASE}/CppUnit/include",
-			"${POCO_BASE}/Foundation/include",
-      "${POCO_BASE}/Encodings/include",
-			"${POCO_BASE}/XML/include",
-			"${POCO_BASE}/JSON/include",
-			"${POCO_BASE}/Util/include",
-			"${POCO_BASE}/Net/include",
-			"${POCO_BASE}/Crypto/include",
-			"${POCO_BASE}/NetSSL_OpenSSL/include",
-			"${POCO_BASE}/Data/include",
-			"${POCO_BASE}/Data/SQLite/include",
-			"${POCO_BASE}/Data/ODBC/include",
-			"${POCO_BASE}/Data/MySQL/include",
-			"${POCO_BASE}/Data/PostgreSQL/include",
-      "${POCO_BASE}/ActiveRecord/include",
-			"${POCO_BASE}/Zip/include",
-			"${POCO_BASE}/CppParser/include",
-			"${POCO_BASE}/JWT/include",
-			"${POCO_BASE}/Redis/include",
-			"${POCO_BASE}/MongoDB/include",
-      "${POCO_BASE}/ApacheConnector/include"
-		]
-  },
-  "configurations": [
-    {
-      "name": "Mac",
-      "intelliSenseMode": "clang-x64",
-      "includePath": ["${pocoIncludePath}", "/usr/local/opt/openssl@3/include"],
-      "macFrameworkPath": ["/System/Library/Frameworks"],
-      "defines": [],
-      "forcedInclude": [],
-      "compilerPath": "/usr/bin/clang",
-      "cStandard": "c11",
-      "cppStandard": "c++14",
-      "compileCommands": "",
-      "browse": {
-        "path": ["${workspaceFolder}"],
-        "limitSymbolsToIncludedHeaders": true,
-        "databaseFilename": ""
-      }
+    "env": {
+        "POCO_BASE": "${workspaceFolder}",
+        "pocoIncludePath": [
+            "${POCO_BASE}/CppUnit/include",
+            "${POCO_BASE}/Foundation/include",
+            "${POCO_BASE}/Encodings/include",
+            "${POCO_BASE}/XML/include",
+            "${POCO_BASE}/JSON/include",
+            "${POCO_BASE}/Util/include",
+            "${POCO_BASE}/Net/include",
+            "${POCO_BASE}/Crypto/include",
+            "${POCO_BASE}/NetSSL_OpenSSL/include",
+            "${POCO_BASE}/Data/include",
+            "${POCO_BASE}/Data/SQLite/include",
+            "${POCO_BASE}/Data/ODBC/include",
+            "${POCO_BASE}/Data/MySQL/include",
+            "${POCO_BASE}/Data/PostgreSQL/include",
+            "${POCO_BASE}/ActiveRecord/include",
+            "${POCO_BASE}/Zip/include",
+            "${POCO_BASE}/CppParser/include",
+            "${POCO_BASE}/JWT/include",
+            "${POCO_BASE}/Redis/include",
+            "${POCO_BASE}/MongoDB/include",
+            "${POCO_BASE}/ApacheConnector/include"
+        ]
     },
-    {
-      "name": "Linux",
-      "intelliSenseMode": "gcc-x64",
-      "includePath": ["${pocoIncludePath}"],
-      "defines": [],
-      "forcedInclude": [],
-      "compilerPath": "/usr/bin/gcc",
-      "cStandard": "c11",
-      "cppStandard": "c++14",
-      "compileCommands": "",
-      "browse": {
-        "path": ["${workspaceFolder}"],
-        "limitSymbolsToIncludedHeaders": true,
-        "databaseFilename": ""
-      }
-    }
-  ],
-  "version": 4
-}
+    "configurations": [
+        {
+            "name": "Mac",
+            "intelliSenseMode": "clang-x64",
+            "includePath": [
+                "${pocoIncludePath}",
+                "/usr/local/opt/openssl@3/include"
+            ],
+            "macFrameworkPath": [
+                "/System/Library/Frameworks"
+            ],
+            "defines": [],
+            "forcedInclude": [],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c11",
+            "cppStandard": "c++14",
+            "compileCommands": "",
+            "browse": {
+                "path": [
+                    "${workspaceFolder}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "configurationProvider": "ms-vscode.makefile-tools"
+        },
+        {
+            "name": "Linux",
+            "intelliSenseMode": "gcc-x64",
+            "includePath": [
+                "${pocoIncludePath}"
+            ],
+            "defines": [],
+            "forcedInclude": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++14",
+            "compileCommands": "",
+            "browse": {
+                "path": [
+                    "${workspaceFolder}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ],
+    "version": 4
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0c7d752e4..bc8e0af14 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -89,12 +89,15 @@
 		"ranges": "cpp",
 		"cfenv": "cpp",
 		"__bits": "cpp",
-		"variant": "cpp"
+		"variant": "cpp",
+		"condition_variable": "cpp",
+		"valarray": "cpp"
 	},
 	"files.exclude": {
         "**/.dep": true,
         "**/bin": true,
         "**/obj": true
 	},
-	"git.ignoreLimitWarning": true
+	"git.ignoreLimitWarning": true,
+	"cmake.configureOnOpen": false
 }
diff --git a/ActiveRecord/ActiveRecord_vs170.sln b/ActiveRecord/ActiveRecord_vs170.sln
index b712dd3a6..c87e3d4da 100644
--- a/ActiveRecord/ActiveRecord_vs170.sln
+++ b/ActiveRecord/ActiveRecord_vs170.sln
@@ -15,6 +15,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Compiler", "Compiler\Compil
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -29,6 +35,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -65,6 +89,24 @@ Global
 		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_static_md|x64.Build.0 = release_static_md|x64
 		{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{16B8C4E7-6F29-4910-9350-848730F9EF77}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -101,6 +143,24 @@ Global
 		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_static_md|x64.Build.0 = release_static_md|x64
 		{16B8C4E7-6F29-4910-9350-848730F9EF77}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/ActiveRecord/ActiveRecord_vs170.vcxproj b/ActiveRecord/ActiveRecord_vs170.vcxproj
index d73a8f41c..d0af33fa4 100644
--- a/ActiveRecord/ActiveRecord_vs170.vcxproj
+++ b/ActiveRecord/ActiveRecord_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>ActiveRecord</ProjectName>
     <ProjectGuid>{CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E}</ProjectGuid>
     <RootNamespace>ActiveRecord</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoActiveRecordA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoActiveRecordmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoActiveRecordmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoActiveRecordA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoActiveRecordmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoActiveRecordmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoActiveRecordd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoActiveRecordmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoActiveRecordmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoActiveRecordmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoActiveRecordmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\ActiveRecord\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\ActiveRecord\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\ActiveRecord\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\ActiveRecord\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\ActiveRecord\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\ActiveRecord\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\ActiveRecord\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\ActiveRecord\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoActiveRecordA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoActiveRecordA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoActiveRecordd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoActiveRecordA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoActiveRecord.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoActiveRecordmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoActiveRecordmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoActiveRecordmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoActiveRecordmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoActiveRecordmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoActiveRecordmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -564,12 +827,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/ActiveRecord/Compiler/Compiler.progen b/ActiveRecord/Compiler/Compiler.progen
index 14d6ad151..624f293a6 100644
--- a/ActiveRecord/Compiler/Compiler.progen
+++ b/ActiveRecord/Compiler/Compiler.progen
@@ -12,5 +12,5 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared =
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
-vc.project.linker.dependencies = 
+vc.project.linker.dependencies =
 vc.solution.create = true
diff --git a/ActiveRecord/Compiler/Compiler_vs170.sln b/ActiveRecord/Compiler/Compiler_vs170.sln
index 615fbaa35..820d34cc9 100644
--- a/ActiveRecord/Compiler/Compiler_vs170.sln
+++ b/ActiveRecord/Compiler/Compiler_vs170.sln
@@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Compiler", "Compiler_vs170.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -18,6 +24,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{84DD1CB5-4735-478A-B48E-5E4858F0E831}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/ActiveRecord/Compiler/Compiler_vs170.vcxproj b/ActiveRecord/Compiler/Compiler_vs170.vcxproj
index 755b43ae1..02a5053ac 100644
--- a/ActiveRecord/Compiler/Compiler_vs170.vcxproj
+++ b/ActiveRecord/Compiler/Compiler_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>Compiler</ProjectName>
     <ProjectGuid>{84DD1CB5-4735-478A-B48E-5E4858F0E831}</ProjectGuid>
     <RootNamespace>Compiler</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">arcd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">arcd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">arcd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">arc</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">arc</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">arc</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">arcd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">arcd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">arcd</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">arc</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">arc</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\Compiler\$(Configuration)\</IntDir>
@@ -231,6 +340,187 @@
     <IntDir>obj64\Compiler\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>binA64\arcd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\arcd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>binA64\arc.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\arcd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\arcd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\arc.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\arcd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\arcd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\arc.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj
index b78371221..12f536372 100644
--- a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj
+++ b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{16B8C4E7-6F29-4910-9350-848730F9EF77}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/ApacheConnector/ApacheConnector_vs170.sln b/ApacheConnector/ApacheConnector_vs170.sln
index 67e7f47c8..86cdecee5 100644
--- a/ApacheConnector/ApacheConnector_vs170.sln
+++ b/ApacheConnector/ApacheConnector_vs170.sln
@@ -4,12 +4,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheCo
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_shared|x64 = debug_shared|x64
 		release_shared|x64 = release_shared|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
 		{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/ApacheConnector/ApacheConnector_vs170.vcxproj b/ApacheConnector/ApacheConnector_vs170.vcxproj
index 7409023c3..53d920ca1 100644
--- a/ApacheConnector/ApacheConnector_vs170.vcxproj
+++ b/ApacheConnector/ApacheConnector_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -19,6 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>ApacheConnector</ProjectName>
     <ProjectGuid>{9866EE28-0612-4746-BD35-3B15B0AF7267}</ProjectGuid>
     <RootNamespace>ApacheConnector</RootNamespace>
@@ -35,6 +44,16 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -53,6 +72,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -61,12 +86,24 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">mod_pocoA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">mod_pocoA64</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">mod_pocod</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">mod_poco</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">mod_poco64d</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">mod_poco64</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\ApacheConnector\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\ApacheConnector\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\ApacheConnector\$(Configuration)\</IntDir>
@@ -87,6 +124,70 @@
     <IntDir>obj64\ApacheConnector\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\mod_pocoA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\mod_pocoA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\mod_pocod.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\mod_pocoA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\mod_poco.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/ApacheConnector/doc/ApacheConnectorUserGuide.page b/ApacheConnector/doc/ApacheConnectorUserGuide.page
index b045dc54e..7c3162221 100644
--- a/ApacheConnector/doc/ApacheConnectorUserGuide.page
+++ b/ApacheConnector/doc/ApacheConnectorUserGuide.page
@@ -16,7 +16,7 @@ file (usually <[httpd.conf]>):
 
     LoadModule poco_module modules/mod_pocod.so
 ----
-    
+
 !!!Configuring ApacheConnector
 ApacheConnector must be able to find shared libraries containing request handler, as well
 as optional configuration files. ApacheConnector provides an Poco::Util::Application class
@@ -30,7 +30,7 @@ is used in the Apache configuration file:
 
     AddPocoRequestHandler <FactoryClass> <SharedLibrary> <Path>...
 ----
-    
+
 The first argument specifies the name of the request handler factory class. The second argument
 contains the path of the shared library containing the request handler.
 The third (and optionally following) argument(s) specify the URI paths handled by the
@@ -38,7 +38,7 @@ request handler. For example:
 
     AddPocoRequestHandler TimeRequestHandlerFactory p:/Poco/ApacheConnector/samples/TimeServer/bin/TimeServerd.dll /time
 ----
-   
+
 loads the TimeRequestHandlerFactory from TimeServerd.dll. Whenever a request for a URI starting with "/time"
 is sent by a client, this request will be handled by the TimeRequestHandler.
 
@@ -76,8 +76,8 @@ Following is a sample for a request handler implementation. The complete sample
     #include "Poco/DateTimeFormatter.h"
     #include "Poco/DateTimeFormat.h"
     #include "Poco/ClassLibrary.h"
-    
-    
+
+
     using Poco::Net::HTTPRequestHandler;
     using Poco::Net::HTTPRequestHandlerFactory;
     using Poco::Net::HTTPServerRequest;
@@ -85,24 +85,24 @@ Following is a sample for a request handler implementation. The complete sample
     using Poco::Timestamp;
     using Poco::DateTimeFormatter;
     using Poco::DateTimeFormat;
-    
-    
+
+
     class TimeRequestHandler: public HTTPRequestHandler
         /// Return a HTML document with the current date and time.
     {
     public:
-        TimeRequestHandler() 
+        TimeRequestHandler()
         {
         }
-        
+
         void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
         {
             Timestamp now;
             std::string dt(DateTimeFormatter::format(now, DateTimeFormat::SORTABLE_FORMAT));
-    
+
             response.setChunkedTransferEncoding(true);
             response.setContentType("text/html");
-    
+
             std::ostream& ostr = response.send();
             ostr << "<html><head><title>TimeServer powered by POCO ApacheConnector</title>";
             ostr << "<meta http-equiv=\"refresh\" content=\"1\"></head>";
@@ -111,22 +111,22 @@ Following is a sample for a request handler implementation. The complete sample
             ostr << "</p></body></html>";
         }
     };
-    
-    
+
+
     class TimeRequestHandlerFactory: public HTTPRequestHandlerFactory
     {
     public:
         TimeRequestHandlerFactory()
         {
         }
-    
+
         HTTPRequestHandler* createRequestHandler(const HTTPServerRequest& request)
         {
             return new TimeRequestHandler;
         }
     };
-    
-    
+
+
     POCO_BEGIN_MANIFEST(HTTPRequestHandlerFactory)
         POCO_EXPORT_CLASS(TimeRequestHandlerFactory)
     POCO_END_MANIFEST
diff --git a/ApacheConnector/include/ApacheConnector.h b/ApacheConnector/include/ApacheConnector.h
index 55a6cf3f3..1de4130ff 100644
--- a/ApacheConnector/include/ApacheConnector.h
+++ b/ApacheConnector/include/ApacheConnector.h
@@ -25,7 +25,7 @@ class ApacheRequestRec
 public:
 	ApacheRequestRec(request_rec* _pRec);
 		/// Creates the ApacheRequestRec;
-	
+
 	bool haveRequestBody();
 		/// Returns true if the request contains a body.
 
diff --git a/ApacheConnector/include/ApacheRequestHandlerFactory.h b/ApacheConnector/include/ApacheRequestHandlerFactory.h
index 7e071aab5..f24e86879 100644
--- a/ApacheConnector/include/ApacheRequestHandlerFactory.h
+++ b/ApacheConnector/include/ApacheRequestHandlerFactory.h
@@ -45,7 +45,7 @@ public:
 
 private:
 	typedef std::map<std::string, Poco::Net::HTTPRequestHandlerFactory*> RequestHandlerFactories;
-	
+
 	RequestHandlerFactories _requestHandlers;
 	Poco::ClassLoader<Poco::Net::HTTPRequestHandlerFactory> _loader;
 	Poco::FastMutex _mutex;
diff --git a/ApacheConnector/include/ApacheServerRequest.h b/ApacheConnector/include/ApacheServerRequest.h
index 825d6b734..6dd9b5c60 100644
--- a/ApacheConnector/include/ApacheServerRequest.h
+++ b/ApacheConnector/include/ApacheServerRequest.h
@@ -25,10 +25,10 @@ class ApacheServerRequest: public Poco::Net::HTTPServerRequest
 {
 public:
 	ApacheServerRequest(
-		ApacheRequestRec* pApacheRequest, 
-		const char* serverName, 
-		int serverPort, 
-		const char* clientName, 
+		ApacheRequestRec* pApacheRequest,
+		const char* serverName,
+		int serverPort,
+		const char* clientName,
 		int clientPort);
 		/// Creates a new ApacheServerRequest.
 
@@ -73,7 +73,7 @@ private:
 	ApacheInputStream*       _pStream;
 	Poco::Net::SocketAddress _serverAddress;
 	Poco::Net::SocketAddress _clientAddress;
-	
+
 	friend class ApacheServerResponse;
 };
 
@@ -84,7 +84,7 @@ private:
 inline std::istream& ApacheServerRequest::stream()
 {
 	poco_check_ptr (_pStream);
-	
+
 	return *_pStream;
 }
 
diff --git a/ApacheConnector/include/ApacheServerResponse.h b/ApacheConnector/include/ApacheServerResponse.h
index 5b110dea1..ea03caec8 100644
--- a/ApacheConnector/include/ApacheServerResponse.h
+++ b/ApacheConnector/include/ApacheServerResponse.h
@@ -42,7 +42,7 @@ public:
 	void sendContinue();
 		/// Sends a 100 Continue response to the
 		/// client.
-		
+
 	void sendErrorResponse(int status);
 		/// Sends an error response with the given
 		/// status back to the client.
@@ -55,20 +55,20 @@ public:
 		/// The returned stream is valid until the response
 		/// object is destroyed.
 		///
-		/// Must not be called after sendFile(), sendBuffer() 
+		/// Must not be called after sendFile(), sendBuffer()
 		/// or redirect() has been called.
-		
+
 	void sendFile(const std::string& path, const std::string& mediaType);
 		/// Sends the response header to the client, followed
 		/// by the content of the given file.
 		///
-		/// Must not be called after send(), sendBuffer() 
+		/// Must not be called after send(), sendBuffer()
 		/// or redirect() has been called.
 		///
 		/// Throws a FileNotFoundException if the file
 		/// cannot be found, or an OpenFileException if
 		/// the file cannot be opened.
-		
+
 	void sendBuffer(const void* pBuffer, std::size_t length);
 		/// Sends the response header to the client, followed
 		/// by the contents of the given buffer.
@@ -77,12 +77,12 @@ public:
 		/// to length and chunked transfer encoding is disabled.
 		///
 		/// If both the HTTP message header and body (from the
-		/// given buffer) fit into one single network packet, the 
+		/// given buffer) fit into one single network packet, the
 		/// complete response can be sent in one network packet.
 		///
-		/// Must not be called after send(), sendFile()  
+		/// Must not be called after send(), sendFile()
 		/// or redirect() has been called.
-		
+
 	void redirect(const std::string& uri, Poco::Net::HTTPResponse::HTTPStatus status);
 		/// Sets the status code, which must be one of
 		/// HTTP_MOVED_PERMANENTLY (301), HTTP_FOUND (302),
@@ -92,12 +92,12 @@ public:
 		/// the HTTP specification, must be absolute.
 		///
 		/// Must not be called after send() has been called.
-		
+
 	void requireAuthentication(const std::string& realm);
 		/// Sets the status code to 401 (Unauthorized)
 		/// and sets the "WWW-Authenticate" header field
 		/// according to the given realm.
-		
+
 	bool sent() const;
 		/// Returns true if the response (header) has been sent.
 
diff --git a/ApacheConnector/include/ApacheStream.h b/ApacheConnector/include/ApacheStream.h
index f79cfc7e0..22b355e8d 100644
--- a/ApacheConnector/include/ApacheStream.h
+++ b/ApacheConnector/include/ApacheStream.h
@@ -33,7 +33,7 @@ protected:
 	int writeToDevice(const char* buffer, std::streamsize length);
 
 private:
-	enum 
+	enum
 	{
 		STREAM_BUFFER_SIZE = 1024
 	};
@@ -53,15 +53,15 @@ class ApacheIOS: public virtual std::ios
 public:
 	ApacheIOS(ApacheRequestRec* pApacheRequest, bool haveData = false);
 		/// Creates the ApacheIOS with the given socket.
-		
+
 	~ApacheIOS();
 		/// Destroys the ApacheIOS.
 		///
 		/// Flushes the buffer, but does not close the socket.
-		
+
 	ApacheStreamBuf* rdbuf();
 		/// Returns a pointer to the internal ApacheStreamBuf.
-		
+
 	void close();
 		/// Flushes the stream.
 
diff --git a/ApacheConnector/samples/FormServer/src/FormServer.cpp b/ApacheConnector/samples/FormServer/src/FormServer.cpp
index 278b71700..c5df459c7 100644
--- a/ApacheConnector/samples/FormServer/src/FormServer.cpp
+++ b/ApacheConnector/samples/FormServer/src/FormServer.cpp
@@ -40,7 +40,7 @@ public:
 		_length(0)
 	{
 	}
-	
+
 	void handlePart(const MessageHeader& header, std::istream& stream)
 	{
 		_type = header.get("Content-Type", "(unspecified)");
@@ -52,18 +52,18 @@ public:
 			_name = params.get("name", "(unnamed)");
 			_fileName = params.get("filename", "(unnamed)");
 		}
-		
+
 		CountingInputStream istr(stream);
 		NullOutputStream ostr;
 		StreamCopier::copyStream(istr, ostr);
 		_length = istr.chars();
 	}
-	
+
 	int length() const
 	{
 		return _length;
 	}
-	
+
 	const std::string& name() const
 	{
 		return _name;
@@ -73,12 +73,12 @@ public:
 	{
 		return _fileName;
 	}
-	
+
 	const std::string& contentType() const
 	{
 		return _type;
 	}
-	
+
 private:
 	int _length;
 	std::string _type;
@@ -91,10 +91,10 @@ class FormRequestHandler: public HTTPRequestHandler
 	/// Return a HTML document with the current date and time.
 {
 public:
-	FormRequestHandler() 
+	FormRequestHandler()
 	{
 	}
-	
+
 	void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
 	{
 		MyPartHandler partHandler;
@@ -104,7 +104,7 @@ public:
 		response.setContentType("text/html");
 
 		std::ostream& ostr = response.send();
-		
+
 		ostr <<
 			"<html>\n"
 			"<head>\n"
@@ -127,7 +127,7 @@ public:
 			"<input type=\"file\" name=\"file\" size=\"31\"> \n"
 			"<input type=\"submit\" value=\"Upload\">\n"
 			"</form>\n";
-			
+
 		ostr << "<h2>Request</h2><p>\n";
 		ostr << "Method: " << request.getMethod() << "<br>\n";
 		ostr << "URI: " << request.getURI() << "<br>\n";
@@ -150,7 +150,7 @@ public:
 			}
 			ostr << "</p>";
 		}
-		
+
 		if (!partHandler.name().empty())
 		{
 			ostr << "<h2>Upload</h2><p>\n";
diff --git a/ApacheConnector/samples/TimeServer/src/TimeServer.cpp b/ApacheConnector/samples/TimeServer/src/TimeServer.cpp
index d12642df5..f577981f4 100644
--- a/ApacheConnector/samples/TimeServer/src/TimeServer.cpp
+++ b/ApacheConnector/samples/TimeServer/src/TimeServer.cpp
@@ -32,10 +32,10 @@ class TimeRequestHandler: public HTTPRequestHandler
 	/// Return a HTML document with the current date and time.
 {
 public:
-	TimeRequestHandler() 
+	TimeRequestHandler()
 	{
 	}
-	
+
 	void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
 	{
 		Timestamp now;
diff --git a/ApacheConnector/src/ApacheApplication.cpp b/ApacheConnector/src/ApacheApplication.cpp
index c67810ceb..114356e6c 100644
--- a/ApacheConnector/src/ApacheApplication.cpp
+++ b/ApacheConnector/src/ApacheApplication.cpp
@@ -35,7 +35,7 @@ ApacheApplication::~ApacheApplication()
 void ApacheApplication::setup()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	if (!_ready)
 	{
 		std::vector<std::string> cmdLine;
diff --git a/ApacheConnector/src/ApacheRequestHandlerFactory.cpp b/ApacheConnector/src/ApacheRequestHandlerFactory.cpp
index d1ac5d78d..cd1fdb1b4 100644
--- a/ApacheConnector/src/ApacheRequestHandlerFactory.cpp
+++ b/ApacheConnector/src/ApacheRequestHandlerFactory.cpp
@@ -34,7 +34,7 @@ ApacheRequestHandlerFactory::~ApacheRequestHandlerFactory()
 Poco::Net::HTTPRequestHandler* ApacheRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest& request)
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	// only if the given uri is found in _uris we are
 	// handling this request.
 	RequestHandlerFactories::iterator it = _requestHandlers.begin();
@@ -75,7 +75,7 @@ void ApacheRequestHandlerFactory::handleURIs(const std::string& uris)
 
 
 void ApacheRequestHandlerFactory::addRequestHandlerFactory(const std::string& dllPath, const std::string& factoryName, const std::string& uri)
-{	
+{
 	try
 	{
 		_loader.loadLibrary(dllPath);
diff --git a/ApacheConnector/src/ApacheServerRequest.cpp b/ApacheConnector/src/ApacheServerRequest.cpp
index 0699c79ba..d36382b32 100644
--- a/ApacheConnector/src/ApacheServerRequest.cpp
+++ b/ApacheConnector/src/ApacheServerRequest.cpp
@@ -16,10 +16,10 @@
 
 
 ApacheServerRequest::ApacheServerRequest(
-	ApacheRequestRec* pApacheRequest, 
-	const char* serverName, 
-	int serverPort, 
-	const char* clientName, 
+	ApacheRequestRec* pApacheRequest,
+	const char* serverName,
+	int serverPort,
+	const char* clientName,
 	int clientPort):
 	_pApacheRequest(pApacheRequest),
     _pResponse(0),
diff --git a/ApacheConnector/src/ApacheServerResponse.cpp b/ApacheConnector/src/ApacheServerResponse.cpp
index a8e866054..73f1e95fa 100644
--- a/ApacheConnector/src/ApacheServerResponse.cpp
+++ b/ApacheConnector/src/ApacheServerResponse.cpp
@@ -52,7 +52,7 @@ void ApacheServerResponse::initApacheOutputStream()
 
 	std::vector<HTTPCookie> cookies;
 	getCookies(cookies);
-	
+
 	std::size_t cnt = cookies.size();
 	for (int c = 0; c < cnt; c++)
 	{
@@ -77,7 +77,7 @@ void ApacheServerResponse::sendContinue()
 std::ostream& ApacheServerResponse::send()
 {
 	poco_assert (!_pStream);
-		
+
 	initApacheOutputStream();
 
 	return *_pStream;
@@ -124,7 +124,7 @@ void ApacheServerResponse::redirect(const std::string& uri, HTTPStatus status)
 
 
 void ApacheServerResponse::sendErrorResponse(int status)
-{		
+{
 	initApacheOutputStream();
 
 	_pApacheRequest->sendErrorResponse(status);
diff --git a/ApacheConnector/src/ApacheStream.cpp b/ApacheConnector/src/ApacheStream.cpp
index aeaacc6a1..5f92f7c7d 100644
--- a/ApacheConnector/src/ApacheStream.cpp
+++ b/ApacheConnector/src/ApacheStream.cpp
@@ -21,7 +21,7 @@ using Poco::BufferedStreamBuf;
 //
 
 
-ApacheStreamBuf::ApacheStreamBuf(ApacheRequestRec* pApacheRequest, bool haveData): 
+ApacheStreamBuf::ApacheStreamBuf(ApacheRequestRec* pApacheRequest, bool haveData):
 	BufferedStreamBuf(STREAM_BUFFER_SIZE, std::ios::in | std::ios::out),
 	_pApacheRequest(pApacheRequest),
 	_haveData(haveData)
diff --git a/CHANGELOG b/CHANGELOG
index 0e3347222..4f6fcd266 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,131 @@
 This is the changelog file for the POCO C++ Libraries.
 
-Release 1.12.0 (2022-06-XX)
+Release 1.12.0 (2022-07-08)
 ===========================
 
-- TODO
+- This release introduces Prometheus library
+- Upgraded bundled PCRE to PCRE2 10.40
+- Small object optimization for Any and Dynamic::Var (compile-time option, enabled by default)
+- All swap operations are noexcept now
+- PollSet::add() is mode-cumulative now
+- UDPServer now requires explicit starting
+- Move semantics for sockets and SocketAddress (compile-time option, disabled by default)
+
+- GH #709: Poco::Dynamic::Var memory leak
+- GH #1039 Race condition in AsyncChannel close/log
+- GH #1459 Fix Socket::select() epoll and poll implementations
+- GH #1687 SQLite Notifier has no table information
+- GH #1884 TCPServerDispatcher::run() issue
+- GH #2084 LogFile_STD (LogFileImpl) fails to recover from getting out of space
+- GH #2085 Crash due to race condition in TCPServerDispatcher
+- GH #2091 Integrate windows poll
+- GH #2222 Warning when compiling my that's use VarHolder
+- GH #2270 HTTPClientSession not supporting binding source address for proxy connect
+- GH #2271 HTTPClientSession source IP address
+- GH #2285 SQLite::Connector::open() crashes on db file with non existing directory
+- GH #2287 Poco::Data::Statement becomes unusable after exception
+- GH #2352 Allow setting the socket of SecureSocketImpl to no-blocking
+- GH #2386 As of C++11, std::swap is noexcept
+- GH #2401 Net::MailMessage::read hangs on missing final multipart boundary
+- GH #2457 Poco::Redis after executing "auth" command next command always return "OK"
+- GH #2465 Operating system specific thread ID is not available any more in Logger/Formatter
+- GH #2470 Can't use Poco::MongoDB::Cursor on aggregation cursor
+- GH #2511 Negative precision in NumberFormatter::format()
+- GH #2513 Poco::Net::SocketConnector unregistering
+- GH #2516 SHA3Engine hard to use with HMACEngine duplicate enhancement
+- GH #2521 MySQL Extractor null value extraction
+- GH #2538 Poco::Data::Session::connector() returns empty string for MySQL session
+- GH #2569 MySQL timestamp
+- GH #2576 Add std::chrono support to Timespan
+- GH #2590 Zip 64-bit extensions not set
+- GH #2614 NTPClient ignores second fractions enhancement
+- GH #2619 Decoding URI query parameters incompatible with Spring 5
+- GH #2638 Upgrade Windows SDK Used for Building Poco
+- GH #2688 Static code analyzer warnings
+- GH #2691 MinGW: fatal error: kernelspecs.h: No such file
+- GH #2706 [windows bug] pollset WSAPoll with non blocking socket will not report error
+- GH #2755 MySQL LONGTEXT
+- GH #2821 Poco::Buffer: full on creation
+- GH #2849 setPadding does nothing when OpenSSL 1.1.x is used
+- GH #2864 SessionImpl begin
+- GH #2940 Add vcpkg installation instructions
+- GH #2943 Avoid clang 10 -Wimplicit-int-float-conversion warning/error when converting int into float
+- GH #2959 Fix percent-encoded fragment modification in Poco::URI
+- GH #2980 Memory leaks in Poco::Any
+- GH #2986 Once exhausted, Poco::ObjectPool does not lend out returned objects
+- GH #3016 MongoDB::Array interface improvements
+- GH #3026 HTTPDigestCredentials added support for RFC7616 algorithms
+- GH #3039 Poco errors with _DEBUG and NDEBUG
+- GH #3052 Fix constness of URI::getPathSegments
+- GH #3088 Fix error in find_package example
+- GH #3056 Inconsistent behavior ConsoleChannel vs. WindowsConsoleChannel
+- GH #3062 Makefile: space(s) following target name will break build (during link)
+- GH #3073 libPocoCrypto.so: undefined reference to `pthread_atfork' when linking statically with OpenSSL 1.1
+- GH #3104 Publicly expose Poco::Message parameters
+- GH #3105 CMake: use GNUInstallDirs
+- GH #3175 SharedLibrary::isLoaded() not thread safe
+- GH #3195 MinGW also defines __GNUC__
+- GH #3240 Task::postNotification possible leak
+- GH #3241 Poco::Data::SessionPool change connection timeout
+- GH #3251 JSON Serializing NAN
+- GH #3253 Arbitrary indent of 2 applied to JSON string objects Var conversion
+- GH #3261 Upgrade to PCRE2 latest version
+- GH #3283 DatagramSocket does not allow IPV6_V6ONLY
+- GH #3296 Add move semantics to Net (sockets and addresses)
+- GH #3297 Poco Foundation Fails to Compile With POCO_ENABLE_SOO Defined
+- GH #3323 Extend format patterns %T and %I to support native threads
+- GH #3342 DB into() does not compile for more than 20 members in a tuple
+- GH #3357 Add socket proactor
+- GH #3359 Make PollSet::poll() interruptible
+- GH #3371 SocketReactor::getNotifier() does not use socket.impl()
+- GH #3372 FTPClientSession::activeDataConnection 1.11.0 cannot set specific data port
+- GH #3374 No access to padding in Cipher
+- GH #3375 PollSet::SocketModeMap poll(const Poco::Timespan& timeout) hasSignaledFDs issue slow down connections
+- GH #3378 PollSet function setMode 1.11.0 cause while(1) on windows
+- GH #3380 Windows SO_REUSEADDR is neither reliable nor safe
+- GH #3384 Always set thread names on POSIX platforms
+- GH #3385 IPAddress::tryParse does not work for "::"
+- GH #3396 Poco::Data::ODBC - dbEncoding property not used for insert/update
+- GH #3399 IPAddress::isLoopback() returns false for IPv4 mapped in IPv6
+- GH #3404 Net: make MessageHeader limits configurable
+- GH #3415 OpenSSL 3.0 support
+- GH #3417 Calling SocketReactor's run() method in a program's main thread yields a lot of null pointer exceptions
+- GH #3421 Cannot use HMACEngine with SHA2Engine
+- GH #3452 Syslog: Include Facility to Syslog Message
+- GH #3453 added facility to SyslogChannel
+- GH #3460 LoongArch support
+- GH #3481 JSON DataType support for MySQL
+- GH #3482 Visual Studio 2022 (v170) missing from buildwin.cmd
+- GH #3486 Windows on ARM64 support
+- GH #3516 Fix OpenSSL 3.0 deprecated warnings
+- GH #3529 Added LocalConfigurationView to only search inside the viewed scope
+- GH #3543 Visual Studio Warning C4244
+- GH #3558 Race condition in SSLManager
+- GH #3561 Add envelope to crypto
+- GH #3569 Readded named substring support for regexes
+- GH #3580 Rounds very large negative numbers to the incorrect values
+- GH #3592 Add 425 / HTTP_TOO_EARLY to HTTPResponse::HTTPStatus
+- GH #3598 Socket::available does not always return correct value for UDP
+- GH #3602 Add Data::JSONRowFormatter
+- GH #3603 Update minimum GCC version information
+- GH #3611 VS2022 Arm64 projects missing or do not load
+- GH #3613 UDPHandler data race
+- GH #3620 MariaDB still uses tx_isolation for transaction isolation unlike MySQL 8+ which uses transaction_isolation
+- GH #3624 Upgrade double-conversion to v3.2.0
+- GH #3628 PollSet data race
+- GH #3629 Event data race
+- GH #3633 Redis: Support Authentication
+- GH #3635 ConfigurationView and JSON is broken for array access
+- GH #3639 Bugcheck: indicate compiler that functions will never return
+- GH #3640 fix warning C4717: 'format<vector<any>': recursive on all control paths, function will cause runtime stack overflow
+- GH #3641 FifoBuffer.advance method not throw exception when length==0
+- GH #3642 Make ParallelSocketReactor thread namable
+- GH #3651 TCPserver missing from Net/samples/CMakeLists.txt
+- GH #3652 Linking with Foundation on Android gives error
+- GH #3655 Socket::select EPOLL implementation returns socket in exceptList when empty list is given
+- GH #3658 Support for chunked transfer encoding trailer
+- GH #3661 PollSet::add()/update() semantics
+- GH #3665 MSVC does not properly recognize std version
 
 
 Release 1.11.2 (2022-04-16)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 845ead127..c5520915c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,11 @@ if(MSVC)
 	if((NOT POCO_DISABLE_INTERNAL_OPENSSL) AND (ENABLE_NETSSL OR ENABLE_CRYPTO OR (ENABLE_DATA_MYSQL AND MINGW)))
 		include(UseEmbeddedOpenSSL)
 	endif()
+
+	if(POCO_SANITIZE_ASAN)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address")
+	endif()
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
 endif()
 
 option(ENABLE_NETSSL_WIN "Enable NetSSL Windows" OFF)
@@ -201,9 +206,9 @@ else()
 endif()
 
 if(POCO_UNBUNDLED)
-	message(STATUS "Using external sqlite, zlib, pcre, expat, ...")
+	message(STATUS "Using external sqlite, zlib, pcre2, expat, ...")
 else()
-	message(STATUS "Using internal sqlite, zlib, pcre, expat, ...")
+	message(STATUS "Using internal sqlite, zlib, pcre2, expat, ...")
 endif()
 
 # Disable fork exec
@@ -488,7 +493,7 @@ install(
 )
 
 if(POCO_UNBUNDLED)
-	install(FILES cmake/FindPCRE.cmake
+	install(FILES cmake/FindPCRE2.cmake
 			DESTINATION "${PocoConfigPackageLocation}")
 	install(FILES cmake/V39/FindEXPAT.cmake
 			DESTINATION "${PocoConfigPackageLocation}/V39")
diff --git a/CppParser/CppParser_vs170.sln b/CppParser/CppParser_vs170.sln
index 728a152b3..ace73f8ad 100644
--- a/CppParser/CppParser_vs170.sln
+++ b/CppParser/CppParser_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64
 		{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/CppParser/CppParser_vs170.vcxproj b/CppParser/CppParser_vs170.vcxproj
index f5556a8d5..9dfabac9b 100644
--- a/CppParser/CppParser_vs170.vcxproj
+++ b/CppParser/CppParser_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>CppParser</ProjectName>
     <ProjectGuid>{C77B9D92-EC91-11DA-A4CE-005056C00008}</ProjectGuid>
     <RootNamespace>CppParser</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoCppParserA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoCppParsermdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoCppParserA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoCppParsermd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoCppParsermt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppParserd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParsermdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParsermtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParsermd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParsermt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\CppParser\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\CppParser\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\CppParser\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\CppParser\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\CppParser\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\CppParser\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\CppParser\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\CppParser\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoCppParserA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoCppParserA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoCppParserd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoCppParserA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoCppParser.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoCppParsermtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoCppParsermtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoCppParsermt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoCppParsermdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoCppParsermd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -615,12 +878,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/include/Poco/CppParser/Attributes.h b/CppParser/include/Poco/CppParser/Attributes.h
index 2f90db269..3c1519b2d 100644
--- a/CppParser/include/Poco/CppParser/Attributes.h
+++ b/CppParser/include/Poco/CppParser/Attributes.h
@@ -34,7 +34,7 @@ class CppParser_API Attributes
 public:
 	typedef std::map<std::string, std::string> AttrMap;
 	typedef AttrMap::const_iterator Iterator;
-	
+
 	Attributes();
 		/// Creates the Attributes object.
 
@@ -46,15 +46,15 @@ public:
 
 	Attributes& operator = (const Attributes& attrs);
 		/// Assignment operator.
-		
+
 	bool has(const std::string& name) const;
 		/// Returns true if an attribute with the given name exists.
-	
+
 	std::string getString(const std::string& name) const;
 		/// Returns the attribute's value as a string.
 		///
 		/// Throws a Poco::NotFoundException if the attribute does not exist.
-		
+
 	std::string getString(const std::string& name, const std::string& defaultValue) const;
 		/// Returns the attribute's value as a string, if it exists.
 		/// Returns the defaultValue if the attribute does not exist.
@@ -64,7 +64,7 @@ public:
 		///
 		/// Throws a Poco::NotFoundException if the attribute does not exist.
 		/// Throws a Poco::SyntaxException if the stored value is not an integer.
-		
+
 	int getInt(const std::string& name, int defaultValue) const;
 		/// Returns the attribute's value as an integer, if it exists.
 		/// Returns the defaultValue if the attribute does not exist.
@@ -74,7 +74,7 @@ public:
 	bool getBool(const std::string& name) const;
 		/// Returns the attribute's value as a boolean.
 		/// The returned value is 'true', iff the stored value is not "false".
-		/// 
+		///
 		/// Throws a Poco::NotFoundException if the attribute does not exist.
 
 	bool getBool(const std::string& name, bool defaultValue) const;
@@ -83,17 +83,17 @@ public:
 
 	void set(const std::string& name, const std::string& value);
 		/// Sets the value of an attribute.
-	
+
 	void remove(const std::string& name);
 		/// Removes the attribute with the given name.
 		/// Does nothing if the attribute does not exist.
-		
+
 	const std::string& operator [] (const std::string& name) const;
-	std::string& operator [] (const std::string& name);		
-		
+	std::string& operator [] (const std::string& name);
+
 	Iterator begin() const;
 	Iterator end() const;
-	
+
 	void clear();
 		/// Clears all attributes.
 
diff --git a/CppParser/include/Poco/CppParser/AttributesParser.h b/CppParser/include/Poco/CppParser/AttributesParser.h
index 8dcd62537..2cbeee8e8 100644
--- a/CppParser/include/Poco/CppParser/AttributesParser.h
+++ b/CppParser/include/Poco/CppParser/AttributesParser.h
@@ -34,13 +34,13 @@ class CppParser_API AttributesParser
 	/// structs/classes, functions, types, etc. can be annotated
 	/// with attributes.
 	///
-	/// Attributes always come immediately before the symbol that 
+	/// Attributes always come immediately before the symbol that
 	/// is being annotated, and are written inside special comments
 	/// with the syntax:
 	///     //@ <attrDecl>[,<attrDec>...]
 	/// where <attrDecl> is
 	///     <name>[=<value>]
-	/// <name> is a valid C++ identifier, or two identifiers separated by 
+	/// <name> is a valid C++ identifier, or two identifiers separated by
 	/// a period (struct accessor notation).
 	/// <value> is a string, integer, identifier, bool literal, or a complex value
 	/// in the form
@@ -67,7 +67,7 @@ protected:
 	static bool isOperator(const Poco::Token* pToken, int kind);
 	static bool isLiteral(const Poco::Token* pToken);
 	static bool isEOF(const Poco::Token* pToken);
-	
+
 private:
 	Attributes& _attrs;
 	Tokenizer   _tokenizer;
diff --git a/CppParser/include/Poco/CppParser/Function.h b/CppParser/include/Poco/CppParser/Function.h
index b59c273c7..4f4853201 100644
--- a/CppParser/include/Poco/CppParser/Function.h
+++ b/CppParser/include/Poco/CppParser/Function.h
@@ -48,7 +48,7 @@ public:
 		FN_DEFAULT      = 512, /// The function is default.
 		FN_DELETE       = 1024 /// The function has been deleted.
 	};
-	
+
 	typedef std::vector<Parameter*> Parameters;
 	typedef Parameters::const_iterator Iterator;
 
@@ -68,51 +68,51 @@ public:
 
 	Iterator end() const;
 		/// Returns an iterator for iterating over the Function's Parameter's.
-	
+
 	void makeInline();
 		/// Sets the FN_INLINE flag.
-	
+
 	void makeConst();
 		/// Sets the FN_CONST flag.
-		
+
 	void makePureVirtual();
 		/// Sets the FN_PURE_VIRTUAL flag.
-		
+
 	void makeFinal();
 		/// Sets the FN_FINAL flag.
-		
+
 	void makeOverride();
 		/// Sets the FN_OVERRIDE flag.
-		
+
 	void makeNoexcept();
 		/// Sets the FN_NOEXCEPT flag.
 
 	void makeDefault();
 		/// Sets the FN_DEFAULT flag.
-	
+
 	void makeDelete();
 		/// Sets the FN_DELETE flag.
-	
+
 	int flags() const;
 		/// Returns the function's flags.
-		
+
 	bool isConstructor() const;
 		/// Returns true iff the function is a constructor.
-		
+
 	bool isDestructor() const;
 		/// Returns true iff the function is a destructor.
 
 	bool isMethod() const;
 		/// Returns true iff the function is a method (it's part of
 		/// a Struct and it's neither a constructor nor a destructor).
-		
+
 	bool isFunction() const;
 		/// Returns true iff the function is not a member of a class
 		/// (a freestanding function).
 
 	bool isConst() const;
 		/// Returns true iff the method is const.
-		
+
 	bool isDefault() const;
 		/// Returns true iff the method has a default implementation.
 
@@ -121,20 +121,20 @@ public:
 
 	int countParameters() const;
 		/// Returns the number of parameters.
-	
+
 	std::string signature() const;
 		/// Returns the signature of the function.
-		
+
 	bool isVirtual() const;
 		/// Returns true if the method is virtual. Also examines base
 		/// classes to check for a virtual function with the same
 		/// signature.
-		
+
 	Function* getOverridden() const;
 		/// If the function is virtual and overrides a function in a
 		/// base class, the base class function is returned.
 		/// Otherwise, null is returned.
-		
+
 	Symbol::Kind kind() const;
 	std::string toString() const;
 
diff --git a/CppParser/include/Poco/CppParser/NameSpace.h b/CppParser/include/Poco/CppParser/NameSpace.h
index bd3417b92..02d7f5450 100644
--- a/CppParser/include/Poco/CppParser/NameSpace.h
+++ b/CppParser/include/Poco/CppParser/NameSpace.h
@@ -37,7 +37,7 @@ public:
 	typedef SymbolTable::const_iterator Iterator;
 	typedef std::map<std::string, std::string> AliasMap;
 	typedef std::vector<std::string> NameSpaceVec;
-	
+
 	NameSpace();
 		/// Creates the NameSpace.
 
@@ -46,56 +46,56 @@ public:
 
 	~NameSpace();
 		/// Destroys the NameSpace.
-	
+
 	void addSymbol(Symbol* pSymbol);
 		/// Adds a symbol to the namespace.
-		
+
 	void importSymbol(const std::string& fullName);
 		/// Imports a symbol from another namespace (using <symbol>).
-		
+
 	void importNameSpace(const std::string& nameSpace);
 		/// Imports a namespace (using namespace <namespace>).
-	
+
 	Iterator begin() const;
 		/// Returns an iterator for iterating over the NameSpace's Symbol's.
 
 	Iterator end() const;
 		/// Returns an iterator for iterating over the NameSpace's Symbol's.
-	
+
 	Symbol* lookup(const std::string& name) const;
 		/// Looks up the given name in the symbol table
 		/// and returns the corresponding symbol, or null
 		/// if no symbol can be found. The name can include
 		/// a namespace.
-		
+
 	static NameSpace* root();
 		/// Returns the root namespace. Never delete this one!
-	
+
 	void nameSpaces(SymbolTable& table) const;
 		/// Fills the symbol table with all namespaces.
-		
+
 	void typeDefs(SymbolTable& table) const;
 		/// Fills the symbol table with all type definitions.
-		
+
 	void typeAliases(SymbolTable& table) const;
 		/// Fills the symbol table with all type alias (using) definitions.
 
 	void enums(SymbolTable& table) const;
 		/// Fills the symbol table with all enums.
-		
+
 	void classes(SymbolTable& table) const;
 		/// Fills the symbol table with all classes and structs.
-		
+
 	void functions(SymbolTable& table) const;
 		/// Fills the symbol table with all functions.
-		
+
 	void variables(SymbolTable& table) const;
 		/// Fills the symbol table with all variables.
-		
+
 	const AliasMap& importedSymbols() const;
 		/// Returns a const reference to a SymbolTable containing all
 		/// imported symbols.
-		
+
 	const NameSpaceVec& importedNameSpaces() const;
 		/// Returns a vector containing all imported namespaces.
 
@@ -128,7 +128,7 @@ inline const NameSpace::AliasMap& NameSpace::importedSymbols() const
 	return _importedSymbols;
 }
 
-	
+
 inline const NameSpace::NameSpaceVec& NameSpace::importedNameSpaces() const
 {
 	return _importedNameSpaces;
diff --git a/CppParser/include/Poco/CppParser/Parser.h b/CppParser/include/Poco/CppParser/Parser.h
index 6c7e4a4d1..060551b8c 100644
--- a/CppParser/include/Poco/CppParser/Parser.h
+++ b/CppParser/include/Poco/CppParser/Parser.h
@@ -82,7 +82,7 @@ protected:
 	const Poco::Token* parseClassMembers(const Poco::Token* pNext, Struct* pClass);
 	const Poco::Token* parseAccess(const Poco::Token* pNext);
 	const Poco::Token* parseIdentifier(const Poco::Token* pNext, std::string& id);
-	
+
 	void addSymbol(Symbol* pSymbol, int lineNumber, bool addGST = true);
 	void pushNameSpace(NameSpace* pNameSpace, int lineNumber, bool addGST = true);
 	void popNameSpace();
diff --git a/CppParser/include/Poco/CppParser/Struct.h b/CppParser/include/Poco/CppParser/Struct.h
index 12c25cbf4..2c3a5c7cd 100644
--- a/CppParser/include/Poco/CppParser/Struct.h
+++ b/CppParser/include/Poco/CppParser/Struct.h
@@ -42,7 +42,7 @@ public:
 		FN_TEMPLATE_SPECIALIZATION = 4,
 		FN_FINAL = 8
 	};
-	
+
 	struct Base
 	{
 		Symbol::Access access;
@@ -50,7 +50,7 @@ public:
 		std::string    name;
 		Struct*        pClass;
 	};
-	
+
 	typedef std::vector<Base>           BaseClasses;
 	typedef BaseClasses::const_iterator BaseIterator;
 	typedef std::vector<Struct*>        StructVec;
@@ -67,13 +67,13 @@ public:
 
 	void addBase(const std::string&, Symbol::Access access, bool isVirtual);
 		/// Adds a base class.
-				
+
 	BaseIterator baseBegin() const;
 		/// Returns an iterator for iterating over all base classes.
-		
+
 	BaseIterator baseEnd() const;
 		/// Returns an iterator for iterating over all base classes.
-	
+
 	void fixupBases();
 		/// Adds pointers for all base classes.
 
@@ -88,13 +88,13 @@ public:
 
 	const std::string& declaration() const;
 		/// Returns the declaration.
-	
+
 	int flags() const;
 		/// Returns the struct's flags.
 
 	void makeInline();
 		/// Changes the class to a inline class, i.e. definition and implementation are hidden in a cpp file.
-		
+
 	void makeFinal();
 		/// Makes the class final.
 
@@ -106,39 +106,39 @@ public:
 
 	void constructors(Functions& functions) const;
 		/// Returns all constructors, sorted by their parameter count.
-	
+
 	Function* destructor() const;
 		/// Returns the destructor, or NULL if no
 		/// destructor is defined.
 
 	void methods(Symbol::Access access, Functions& functions) const;
 		/// Returns all functions with the given access.
-	
+
 	void inheritedMethods(FunctionSet& functions) const;
 		/// Returns all inherited methods.
-	
+
 	void bases(std::set<std::string>& bases) const;
 		/// Returns all base classes.
-		
+
 	void derived(StructSet& derived) const;
-		/// Returns all derived classes.	
-		
+		/// Returns all derived classes.
+
 	Function* findFunction(const std::string& signature) const;
 		/// Finds a function with the given signature.
-		
+
 	bool hasVirtualDestructor() const;
 		/// Returns true if the class CppParser_API or one if its base classes
 		/// has a virtual destructor.
 
 	bool isClass() const;
 		/// Returns true iff the struct was declared as class.
-		
+
 	bool isDerived() const;
 		/// Returns true iff the struct or class is derived from another struct or class.
 
 	Symbol::Kind kind() const;
 	std::string toString() const;
-	
+
 private:
 	std::string _decl;
 	BaseClasses _bases;
diff --git a/CppParser/include/Poco/CppParser/Utility.h b/CppParser/include/Poco/CppParser/Utility.h
index 3ded488e0..8fa9267b8 100644
--- a/CppParser/include/Poco/CppParser/Utility.h
+++ b/CppParser/include/Poco/CppParser/Utility.h
@@ -37,9 +37,9 @@ public:
 	public:
 		std::string beginNameSpaceDecl;      // contains either $(NS)_BEGIN or the namespace x { decl
 		std::string endNameSpaceDecl;        // contains either $(NS)_END or the closing brackets }
-		std::vector<std::string> classDecls; // contains strings of the form "class X;" 
+		std::vector<std::string> classDecls; // contains strings of the form "class X;"
 	};
-	
+
 	static void parse(const std::string& file, NameSpace::SymbolTable& st, const std::string& exec, const std::string& options, const std::string& path);
 		/// Preprocesses and parses the file. The resulting symboltable has base class references already fixed,
 
diff --git a/CppParser/include/Poco/CppParser/Variable.h b/CppParser/include/Poco/CppParser/Variable.h
index d167eda59..92f67752d 100644
--- a/CppParser/include/Poco/CppParser/Variable.h
+++ b/CppParser/include/Poco/CppParser/Variable.h
@@ -37,13 +37,13 @@ public:
 		VAR_VOLATILE = 4, /// The variable is volatile.
 		VAR_CONST    = 8  /// The variable is const.
 	};
-	
+
 	Variable(const std::string& decl, NameSpace* pNameSpace);
 		/// Creates the Variable.
 
 	~Variable();
 		/// Destroys the Variable.
-		
+
 	int flags() const;
 		/// Returns the variable's flags.
 
@@ -57,7 +57,7 @@ public:
 		///
 		/// Example: a type const std::string& -> std::string, a type const std::string* returns std::string
 
-		
+
 private:
 	int _flags;
 	bool _isPointer;
diff --git a/CppParser/src/Attributes.cpp b/CppParser/src/Attributes.cpp
index 21d14e808..5507d20cf 100644
--- a/CppParser/src/Attributes.cpp
+++ b/CppParser/src/Attributes.cpp
@@ -48,13 +48,13 @@ Attributes& Attributes::operator = (const Attributes& attrs)
 	return *this;
 }
 
-	
+
 bool Attributes::has(const std::string& name) const
 {
 	return _map.find(name) != _map.end();
 }
 
-	
+
 std::string Attributes::getString(const std::string& name) const
 {
 	AttrMap::const_iterator it = _map.find(name);
@@ -64,7 +64,7 @@ std::string Attributes::getString(const std::string& name) const
 		throw Poco::NotFoundException(name);
 }
 
-	
+
 std::string Attributes::getString(const std::string& name, const std::string& defaultValue) const
 {
 	AttrMap::const_iterator it = _map.find(name);
@@ -84,7 +84,7 @@ int Attributes::getInt(const std::string& name) const
 		throw Poco::NotFoundException(name);
 }
 
-	
+
 int Attributes::getInt(const std::string& name, int defaultValue) const
 {
 	AttrMap::const_iterator it = _map.find(name);
diff --git a/CppParser/src/AttributesParser.cpp b/CppParser/src/AttributesParser.cpp
index 441c988b8..ef8eb3dc1 100644
--- a/CppParser/src/AttributesParser.cpp
+++ b/CppParser/src/AttributesParser.cpp
@@ -88,7 +88,7 @@ const Token* AttributesParser::parseAttribute(const Token* pNext)
 const Token* AttributesParser::parseComplexAttribute(const Token* pNext, const std::string& id)
 {
 	poco_assert_dbg (isOperator(pNext, OperatorToken::OP_OPENBRACE));
-	
+
 	pNext = next();
 	std::string oldId(_id);
 	if (!_id.empty())
@@ -103,7 +103,7 @@ const Token* AttributesParser::parseComplexAttribute(const Token* pNext, const s
 		pNext = next();
 	else
 		throw SyntaxException("bad attribute declaration");
-	
+
 	return pNext;
 }
 
diff --git a/CppParser/src/Function.cpp b/CppParser/src/Function.cpp
index b518d8940..e41db8004 100644
--- a/CppParser/src/Function.cpp
+++ b/CppParser/src/Function.cpp
@@ -111,13 +111,13 @@ void Function::makeFinal()
 	_flags |= FN_FINAL;
 }
 
-	
+
 void Function::makeOverride()
 {
 	_flags |= FN_OVERRIDE;
 }
 
-	
+
 void Function::makeNoexcept()
 {
 	_flags |= FN_NOEXCEPT;
@@ -141,7 +141,7 @@ bool Function::isConstructor() const
 	return name() == nameSpace()->name();
 }
 
-	
+
 bool Function::isDestructor() const
 {
 	return name()[0] == '~';
@@ -201,7 +201,7 @@ std::string Function::signature() const
 	return signature;
 }
 
-	
+
 bool Function::isVirtual() const
 {
 	if (_flags & FN_VIRTUAL)
diff --git a/CppParser/src/NameSpace.cpp b/CppParser/src/NameSpace.cpp
index 7551bc17f..9bd683030 100644
--- a/CppParser/src/NameSpace.cpp
+++ b/CppParser/src/NameSpace.cpp
@@ -49,7 +49,7 @@ NameSpace::~NameSpace()
 void NameSpace::addSymbol(Symbol* pSymbol)
 {
 	poco_check_ptr (pSymbol);
-	
+
 	_symbols.insert(SymbolTable::value_type(pSymbol->name(), pSymbol));
 }
 
@@ -65,7 +65,7 @@ void NameSpace::importSymbol(const std::string& fullName)
 	}
 }
 
-	
+
 void NameSpace::importNameSpace(const std::string& nameSpace)
 {
 	_importedNameSpaces.push_back(nameSpace);
@@ -94,7 +94,7 @@ Symbol* NameSpace::lookup(const std::string& name) const
 Symbol* NameSpace::lookup(const std::string& name, std::set<const NameSpace*>& alreadyVisited) const
 {
 	Symbol* pSymbol = 0;
-	
+
 	if (name.empty())
 		return pSymbol;
 
@@ -103,12 +103,12 @@ Symbol* NameSpace::lookup(const std::string& name, std::set<const NameSpace*>& a
 	std::string head;
 	std::string tail;
 	splitName(name, head, tail);
-	
+
 	alreadyVisited.insert(this);
 	bool currentNSInserted = true;
 
-	
-	if (head.empty()) 
+
+	if (head.empty())
 	{
 		alreadyVisited.insert(this);
 		return root()->lookup(tail, alreadyVisited);
@@ -161,13 +161,13 @@ void NameSpace::nameSpaces(SymbolTable& table) const
 	extract(Symbol::SYM_NAMESPACE, table);
 }
 
-	
+
 void NameSpace::typeDefs(SymbolTable& table) const
 {
 	extract(Symbol::SYM_TYPEDEF, table);
 }
 
-	
+
 void NameSpace::typeAliases(SymbolTable& table) const
 {
 	extract(Symbol::SYM_TYPEALIAS, table);
@@ -179,19 +179,19 @@ void NameSpace::enums(SymbolTable& table) const
 	extract(Symbol::SYM_ENUM, table);
 }
 
-	
+
 void NameSpace::classes(SymbolTable& table) const
 {
 	extract(Symbol::SYM_STRUCT, table);
 }
 
-	
+
 void NameSpace::functions(SymbolTable& table) const
 {
 	extract(Symbol::SYM_FUNCTION, table);
 }
 
-	
+
 void NameSpace::variables(SymbolTable& table) const
 {
 	extract(Symbol::SYM_VARIABLE, table);
@@ -226,7 +226,7 @@ void NameSpace::splitName(const std::string& name, std::string& head, std::strin
 		head.assign(name, 0, pos);
 		pos += 2;
 		poco_assert (pos < name.length());
-		tail.assign(name, pos, name.length() - pos); 
+		tail.assign(name, pos, name.length() - pos);
 	}
 	else head = name;
 }
diff --git a/CppParser/src/Struct.cpp b/CppParser/src/Struct.cpp
index 02db88321..fa2ed6db4 100644
--- a/CppParser/src/Struct.cpp
+++ b/CppParser/src/Struct.cpp
@@ -62,7 +62,7 @@ void Struct::addBase(const std::string& name, Symbol::Access access, bool isVirt
 	_bases.push_back(base);
 }
 
-	
+
 Struct::BaseIterator Struct::baseBegin() const
 {
 	return _bases.begin();
@@ -78,7 +78,7 @@ Struct::BaseIterator Struct::baseEnd() const
 void Struct::addDerived(Struct* pClass)
 {
 	poco_check_ptr (pClass);
-	
+
 	_derived.push_back(pClass);
 }
 
diff --git a/CppParser/src/Tokenizer.cpp b/CppParser/src/Tokenizer.cpp
index d557e2a86..a51258584 100644
--- a/CppParser/src/Tokenizer.cpp
+++ b/CppParser/src/Tokenizer.cpp
@@ -25,7 +25,7 @@ namespace CppParser {
 
 
 Tokenizer::Tokenizer(std::istream& istr):
-	StreamTokenizer(istr)	
+	StreamTokenizer(istr)
 {
 	addToken(new OperatorToken);
 	addToken(new IdentifierToken);
diff --git a/CppParser/src/Utility.cpp b/CppParser/src/Utility.cpp
index 2eb93a266..c6017a01b 100644
--- a/CppParser/src/Utility.cpp
+++ b/CppParser/src/Utility.cpp
@@ -195,14 +195,14 @@ std::string Utility::preprocessFile(const std::string& file, const std::string&
 		newPath += path;
 		Environment::set("PATH", path);
 	}
-	
-	ProcessHandle proc = Process::launch(exec, args);		
+
+	ProcessHandle proc = Process::launch(exec, args);
 	int rc = Process::wait(proc);
 	if (rc != 0)
 	{
 		throw Poco::RuntimeException("Failed to process file");
 	}
-	
+
 	return pp.getFileName();
 }
 
@@ -293,7 +293,7 @@ std::string replace(const std::string& input, const std::string& oldToken, const
 		start = pos + oldToken.length();
 	}
 	while (pos != std::string::npos);
-	
+
 	return result;
 }
 
diff --git a/CppParser/src/Variable.cpp b/CppParser/src/Variable.cpp
index 01459f0e5..5062e8033 100644
--- a/CppParser/src/Variable.cpp
+++ b/CppParser/src/Variable.cpp
@@ -39,10 +39,10 @@ Variable::Variable(const std::string& decl, NameSpace* pNameSpace):
 	std::size_t pos = decl.rfind(name());
 	std::string tmp = decl.substr(0, pos);
 	tmp = Poco::trim(tmp);
-	
+
 	pos = tmp.rfind("*");
 	_isPointer = (pos == (tmp.size()-1));
-	
+
 	Poco::replaceInPlace(tmp, "static ", "");
 	Poco::replaceInPlace(tmp, "mutable ", "");
 	Poco::replaceInPlace(tmp, "volatile ", "");
@@ -53,7 +53,7 @@ Variable::Variable(const std::string& decl, NameSpace* pNameSpace):
 		tmp = tmp.substr(6);
 	if (tmp.find("const\t") == 0)
 		tmp = tmp.substr(6);
-	
+
 	std::size_t rightCut = tmp.size();
 	while (rightCut > 0 && (tmp[rightCut-1] == '&' || tmp[rightCut-1] == '*' || tmp[rightCut-1] == '\t' || tmp[rightCut-1] == ' '))
 		--rightCut;
diff --git a/CppParser/testsuite/TestSuite_vs170.vcxproj b/CppParser/testsuite/TestSuite_vs170.vcxproj
index b63f29c0e..8ddceef30 100644
--- a/CppParser/testsuite/TestSuite_vs170.vcxproj
+++ b/CppParser/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{C79112BD-EC91-11DA-A4CE-005056C00008}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/CppUnit/CppUnit_vs170.sln b/CppUnit/CppUnit_vs170.sln
index 6ca2d6861..e9a5caf63 100644
--- a/CppUnit/CppUnit_vs170.sln
+++ b/CppUnit/CppUnit_vs170.sln
@@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs170.vc
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -18,6 +24,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/CppUnit/CppUnit_vs170.vcxproj b/CppUnit/CppUnit_vs170.vcxproj
index 13dc51ca5..5d8927b1a 100644
--- a/CppUnit/CppUnit_vs170.vcxproj
+++ b/CppUnit/CppUnit_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>CppUnit</ProjectName>
     <ProjectGuid>{138BB448-808A-4FE5-A66D-78D1F8770F59}</ProjectGuid>
     <RootNamespace>CppUnit</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">CppUnitA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">CppUnitmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">CppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">CppUnitA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">CppUnitmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">CppUnitmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">CppUnitd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">CppUnitmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">CppUnitmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">CppUnitmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">CppUnitmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\CppUnit\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\CppUnit\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\CppUnit\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\CppUnit\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\CppUnit\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\CppUnit\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\CppUnit\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\CppUnit\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\CppUnitA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\CppUnitA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\CppUnitd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\CppUnitA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\CppUnit.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\CppUnitmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\CppUnitmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\CppUnitmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\CppUnitmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\CppUnitmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\CppUnitmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/CppUnit/doc/README.html b/CppUnit/doc/README.html
index 5f8a1418a..788619cd3 100644
--- a/CppUnit/doc/README.html
+++ b/CppUnit/doc/README.html
@@ -15,14 +15,14 @@
 <P>CppUnit is a simple unit test framework for C++. It is a port from JUnit, a testing framework for Java, developed by Kent Beck and Erich Gamma. </P>
 <H3>Contents</H3>
 <PRE>README.html&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; this file
-&nbsp;&nbsp;&nbsp; 
+&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;&nbsp; test&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; the source code
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; framework&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; the testing framework
-&#9;&#9;extensions&#9;some framework extension classes 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; textui&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; a command line interface to run tests 
+&#9;&#9;extensions&#9;some framework extension classes
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; textui&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; a command line interface to run tests
 &nbsp;&nbsp;&nbsp;&nbsp;ms&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; code for a Microsoft specific TestRunner
 &nbsp;&nbsp;&nbsp;&nbsp;samples&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; some example test cases and extensions to the framework
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; multicaster&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; a sample illustrating a publish/subscribe 
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; multicaster&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; a sample illustrating a publish/subscribe
 &#9;&#9;&#9;&#9;multicaster under test
 &nbsp;&nbsp;&nbsp; doc&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; documentation</PRE>
 <H3>Installation</H3>
diff --git a/CppUnit/doc/cookbook.htm b/CppUnit/doc/cookbook.htm
index 08224883b..2cf027258 100644
--- a/CppUnit/doc/cookbook.htm
+++ b/CppUnit/doc/cookbook.htm
@@ -17,7 +17,7 @@
 <P>Subclass the TestCase class. Override the method "runTest ()". When you want to check a value, call "assert (bool)" and pass in an expression that is true if the test succeeds. </P>
 <P>For example, to test the equality comparison for a Complex number class, write:</P>
 <TT><PRE>&#9;class ComplexNumberTest : public TestCase {&nbsp;
-&#9;public: 
+&#9;public:
                     ComplexNumberTest (string name) : TestCase (name) {}
         void        runTest () {
                         assert (Complex (10, 1) == Complex (10, 1));
@@ -59,7 +59,7 @@
 &#9;void&#9;&#9;setUp ()  {
 &#9;&#9;&#9;    m_10_1 = new Complex (10, 1);
 &#9;&#9;&#9;    m_1_1  = new Complex (1, 1);
-&#9;&#9;&#9;    m_11_2  = new Complex (11, 2);  
+&#9;&#9;&#9;    m_11_2  = new Complex (11, 2);
                         }
 &#9;void&#9;&#9;tearDown ()  {
 &#9;&#9;&#9;    delete m_10_1, delete m_1_1, delete m_11_2;
@@ -83,7 +83,7 @@
 &#9;void&#9;&#9;setUp ()  {
 &#9;&#9;&#9;    m_10_1 = new Complex (10, 1);
 &#9;&#9;&#9;    m_1_1  = new Complex (1, 1);
-&#9;&#9;&#9;    m_11_2 = new Complex (11, 2);  
+&#9;&#9;&#9;    m_11_2 = new Complex (11, 2);
                         }
 &#9;void&#9;&#9;tearDown ()  {
 &#9;&#9;&#9;    delete m_10_1, delete m_1_1, delete m_11_2;
diff --git a/CppUnit/include/CppUnit/CppUnitException.h b/CppUnit/include/CppUnit/CppUnitException.h
index 68eb9739c..7bbc891d1 100644
--- a/CppUnit/include/CppUnit/CppUnitException.h
+++ b/CppUnit/include/CppUnit/CppUnitException.h
@@ -20,8 +20,8 @@ class CppUnit_API CppUnitException: public std::exception
 	/// descriptive strings through its what() method
 {
 public:
-	CppUnitException(const std::string& message = "", 
-	                 long lineNumber = CPPUNIT_UNKNOWNLINENUMBER, 
+	CppUnitException(const std::string& message = "",
+	                 long lineNumber = CPPUNIT_UNKNOWNLINENUMBER,
 	                 const std::string& fileName = CPPUNIT_UNKNOWNFILENAME);
 	CppUnitException(const std::string& message,
 	                 long lineNumber,
@@ -110,26 +110,26 @@ inline const char* CppUnitException::what() const throw ()
 
 inline long CppUnitException::lineNumber() const
 {
-	return _lineNumber; 
+	return _lineNumber;
 }
 
 
 inline long CppUnitException::data1LineNumber() const
 {
-	return _data1lineNumber; 
+	return _data1lineNumber;
 }
 
 
 inline long CppUnitException::data2LineNumber() const
 {
-	return _data2lineNumber; 
+	return _data2lineNumber;
 }
 
 
 // The file in which the error occurred
 inline const std::string& CppUnitException::fileName() const
 {
-	return _fileName; 
+	return _fileName;
 }
 
 
diff --git a/CppUnit/include/CppUnit/Orthodox.h b/CppUnit/include/CppUnit/Orthodox.h
index 5e9f41c37..ac08c0100 100644
--- a/CppUnit/include/CppUnit/Orthodox.h
+++ b/CppUnit/include/CppUnit/Orthodox.h
@@ -45,11 +45,11 @@ namespace CppUnit {
  *
  * see TestSuite
  */
-template <class ClassUnderTest> 
+template <class ClassUnderTest>
 class Orthodox: public TestCase
 {
 public:
-	Orthodox(): TestCase("Orthodox") 
+	Orthodox(): TestCase("Orthodox")
 	{
 	}
 
@@ -60,7 +60,7 @@ protected:
 
 
 // Run an orthodoxy test
-template <class ClassUnderTest> 
+template <class ClassUnderTest>
 void Orthodox<ClassUnderTest>::runTest()
 {
     // make sure we have a default constructor
@@ -90,7 +90,7 @@ void Orthodox<ClassUnderTest>::runTest()
 
 
 // Exercise a call
-template <class ClassUnderTest> 
+template <class ClassUnderTest>
 ClassUnderTest Orthodox<ClassUnderTest>::call(ClassUnderTest object)
 {
     return object;
diff --git a/CppUnit/include/CppUnit/RepeatedTest.h b/CppUnit/include/CppUnit/RepeatedTest.h
index dd471c0c1..21499f780 100644
--- a/CppUnit/include/CppUnit/RepeatedTest.h
+++ b/CppUnit/include/CppUnit/RepeatedTest.h
@@ -29,7 +29,7 @@ class CppUnit_API RepeatedTest: public TestDecorator
 	REFERENCEOBJECT (RepeatedTest)
 
 public:
-	RepeatedTest(Test* test, int timesRepeat): TestDecorator (test), _timesRepeat (timesRepeat) 
+	RepeatedTest(Test* test, int timesRepeat): TestDecorator (test), _timesRepeat (timesRepeat)
 	{
 	}
 
@@ -59,7 +59,7 @@ inline std::string RepeatedTest::toString()
 // Runs a repeated test
 inline void RepeatedTest::run(TestResult *result)
 {
-	for (int n = 0; n < _timesRepeat; n++) 
+	for (int n = 0; n < _timesRepeat; n++)
 	{
 		if (result->shouldStop())
 			break;
diff --git a/CppUnit/include/CppUnit/Test.h b/CppUnit/include/CppUnit/Test.h
index 642f41b6e..aeabfe099 100644
--- a/CppUnit/include/CppUnit/Test.h
+++ b/CppUnit/include/CppUnit/Test.h
@@ -64,7 +64,7 @@ inline void Test::run(TestResult *result, const Callback& callback)
 // Counts the number of test cases that will be run by this test.
 inline int Test::countTestCases() const
 {
-	return 0; 
+	return 0;
 }
 
 
diff --git a/CppUnit/include/CppUnit/TestCase.h b/CppUnit/include/CppUnit/TestCase.h
index 924ca9ce0..bd18de301 100644
--- a/CppUnit/include/CppUnit/TestCase.h
+++ b/CppUnit/include/CppUnit/TestCase.h
@@ -124,7 +124,9 @@ protected:
                                    long data2LineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER,
 	                               const std::string& fileName = CppUnitException::CPPUNIT_UNKNOWNFILENAME);
 
-	template <typename T1, typename T2>
+	template <typename T1, typename T2,
+		typename = typename std::enable_if<std::is_arithmetic<T1>::value, T1>::type,
+		typename = typename std::enable_if<std::is_arithmetic<T2>::value, T2>::type>
 	void assertEquals(T1 expected,
 	                  T2 actual,
 	                  long lineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER,
@@ -155,7 +157,9 @@ protected:
 	                  long lineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER,
 	                  const std::string& fileName = CppUnitException::CPPUNIT_UNKNOWNFILENAME);
 
-	template <typename T1, typename T2>
+	template <typename T1, typename T2,
+		typename = typename std::enable_if<std::is_arithmetic<T1>::value, T1>::type,
+		typename = typename std::enable_if<std::is_arithmetic<T2>::value, T2>::type>
 	std::string notEqualsMessage(T1 expected, T2 actual)
 	{
 		return "expected: " + std::to_string(expected) + " but was: " + std::to_string(actual);
diff --git a/CppUnit/include/CppUnit/TestFailure.h b/CppUnit/include/CppUnit/TestFailure.h
index b443f5970..b2ff60aae 100644
--- a/CppUnit/include/CppUnit/TestFailure.h
+++ b/CppUnit/include/CppUnit/TestFailure.h
@@ -57,7 +57,7 @@ inline TestFailure::TestFailure(Test* failedTest, CppUnitException* thrownExcept
 
 // Deletes the owned exception.
 inline TestFailure::~TestFailure()
-{ 
+{
 	delete _thrownException;
 }
 
diff --git a/CppUnit/include/CppUnit/TestResult.h b/CppUnit/include/CppUnit/TestResult.h
index a09aa9e88..6539e0bae 100644
--- a/CppUnit/include/CppUnit/TestResult.h
+++ b/CppUnit/include/CppUnit/TestResult.h
@@ -67,7 +67,7 @@ public:
 		SynchronizationObject()
 		{
 		}
-		
+
 		virtual ~SynchronizationObject()
 		{
 		}
@@ -75,7 +75,7 @@ public:
 		virtual void lock()
 		{
 		}
-		
+
 		virtual void unlock()
 		{
 		}
@@ -112,7 +112,7 @@ protected:
 // Construct a TestResult
 inline TestResult::TestResult(): _syncObject(new SynchronizationObject())
 {
-	_runTests = 0; 
+	_runTests = 0;
 	_stop = false;
 }
 
@@ -121,7 +121,7 @@ inline TestResult::TestResult(): _syncObject(new SynchronizationObject())
 // caused the error
 inline void TestResult::addError(Test* test, CppUnitException* e)
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	_errors.push_back(new TestFailure(test, e));
 }
 
@@ -130,7 +130,7 @@ inline void TestResult::addError(Test* test, CppUnitException* e)
 // caused the failure.
 inline void TestResult::addFailure(Test* test, CppUnitException* e)
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	_failures.push_back(new TestFailure(test, e));
 }
 
@@ -138,7 +138,7 @@ inline void TestResult::addFailure(Test* test, CppUnitException* e)
 // Informs the result that a test will be started.
 inline void TestResult::startTest(Test* test)
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	_runTests++;
 }
 
@@ -153,7 +153,7 @@ inline void TestResult::endTest(Test* test)
 // Gets the number of run tests.
 inline int TestResult::runTests()
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	return _runTests;
 }
 
@@ -161,7 +161,7 @@ inline int TestResult::runTests()
 // Gets the number of detected errors.
 inline int TestResult::testErrors()
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	return (int) _errors.size();
 }
 
@@ -169,7 +169,7 @@ inline int TestResult::testErrors()
 // Gets the number of detected failures.
 inline int TestResult::testFailures()
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	return (int) _failures.size();
 }
 
@@ -177,15 +177,15 @@ inline int TestResult::testFailures()
 // Returns whether the entire test was successful or not.
 inline bool TestResult::wasSuccessful()
 {
-	ExclusiveZone zone(_syncObject); 
-	return _failures.size() == 0 && _errors.size () == 0; 
+	ExclusiveZone zone(_syncObject);
+	return _failures.size() == 0 && _errors.size () == 0;
 }
 
 
 // Returns a std::vector of the errors.
 inline std::vector<TestFailure*>& TestResult::errors()
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	return _errors;
 }
 
@@ -193,7 +193,7 @@ inline std::vector<TestFailure*>& TestResult::errors()
 // Returns a std::vector of the failures.
 inline std::vector<TestFailure*>& TestResult::failures()
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	return _failures;
 }
 
@@ -201,7 +201,7 @@ inline std::vector<TestFailure*>& TestResult::failures()
 // Returns whether testing should be stopped
 inline bool TestResult::shouldStop()
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	return _stop;
 }
 
@@ -209,7 +209,7 @@ inline bool TestResult::shouldStop()
 // Stop testing
 inline void TestResult::stop()
 {
-	ExclusiveZone zone(_syncObject); 
+	ExclusiveZone zone(_syncObject);
 	_stop = true;
 }
 
@@ -218,7 +218,7 @@ inline void TestResult::stop()
 // TestResult assumes ownership of the object
 inline void TestResult::setSynchronizationObject(SynchronizationObject* syncObject)
 {
-	delete _syncObject; 
+	delete _syncObject;
 	_syncObject = syncObject;
 }
 
diff --git a/CppUnit/include/CppUnit/TestSetup.h b/CppUnit/include/CppUnit/TestSetup.h
index 323d6cf5b..040b7685a 100644
--- a/CppUnit/include/CppUnit/TestSetup.h
+++ b/CppUnit/include/CppUnit/TestSetup.h
@@ -24,17 +24,17 @@ class CppUnit_API TestSetup: public TestDecorator
 	REFERENCEOBJECT (TestSetup)
 
 public:
-	TestSetup(Test* test): TestDecorator(test) 
+	TestSetup(Test* test): TestDecorator(test)
 	{
 	}
-	
+
 	void run(TestResult* result);
 
 protected:
-	void setUp() 
+	void setUp()
 	{
 	}
-	
+
 	void tearDown()
 	{
 	}
@@ -44,7 +44,7 @@ protected:
 inline void TestSetup::run(TestResult* result)
 {
 	setUp();
-	TestDecorator::run(result); 
+	TestDecorator::run(result);
 	tearDown();
 }
 
diff --git a/CppUnit/include/CppUnit/TestSuite.h b/CppUnit/include/CppUnit/TestSuite.h
index 425fdcb3b..9aa6a55d9 100644
--- a/CppUnit/include/CppUnit/TestSuite.h
+++ b/CppUnit/include/CppUnit/TestSuite.h
@@ -48,7 +48,7 @@ public:
 	Test::Type getType() const;
 
 	virtual void deleteContents();
-	
+
 	const std::vector<Test*> tests() const;
 
 private:
@@ -80,7 +80,7 @@ inline void TestSuite::addTest(Test* test)
 // Returns a std::string representation of the test suite.
 inline std::string TestSuite::toString() const
 {
-	return "suite " + _name; 
+	return "suite " + _name;
 }
 
 // Returns the type of the test, see Test::Type
diff --git a/CppUnit/include/CppUnit/TextTestResult.h b/CppUnit/include/CppUnit/TextTestResult.h
index d7421f16f..867679965 100644
--- a/CppUnit/include/CppUnit/TextTestResult.h
+++ b/CppUnit/include/CppUnit/TextTestResult.h
@@ -31,7 +31,7 @@ public:
 	virtual void printErrors(std::ostream& stream);
 	virtual void printFailures(std::ostream& stream);
 	virtual void printHeader(std::ostream& stream);
-	
+
 protected:
 	std::string shortName(const std::string& testName);
 	void setup();
diff --git a/CppUnit/include/CppUnit/estring.h b/CppUnit/include/CppUnit/estring.h
index 8adf030b3..b323db9ed 100644
--- a/CppUnit/include/CppUnit/estring.h
+++ b/CppUnit/include/CppUnit/estring.h
@@ -32,26 +32,26 @@ inline std::string estring(std::string& expandedString)
 // Create a std::string from an int
 inline std::string estring(int number)
 {
-	char buffer[50]; 
-	std::snprintf(buffer, sizeof(buffer), "%d", number); 
-	return std::string (buffer); 
+	char buffer[50];
+	std::snprintf(buffer, sizeof(buffer), "%d", number);
+	return std::string (buffer);
 }
 
 
 // Create a string from a long
 inline std::string estring(long number)
 {
-	char buffer[50]; 
-	std::snprintf(buffer, sizeof(buffer), "%ld", number); 
-	return std::string (buffer); 
+	char buffer[50];
+	std::snprintf(buffer, sizeof(buffer), "%ld", number);
+	return std::string (buffer);
 }
 
 
 // Create a std::string from a double
 inline std::string estring(double number)
 {
-	char buffer[50]; 
-	std::snprintf(buffer, sizeof(buffer), "%lf", number); 
+	char buffer[50];
+	std::snprintf(buffer, sizeof(buffer), "%lf", number);
 	return std::string(buffer);
 }
 
@@ -59,8 +59,8 @@ inline std::string estring(double number)
 // Create a std::string from a double
 inline std::string estring(const void* ptr)
 {
-	char buffer[50]; 
-	std::snprintf(buffer, sizeof(buffer), "%p", ptr); 
+	char buffer[50];
+	std::snprintf(buffer, sizeof(buffer), "%p", ptr);
 	return std::string(buffer);
 }
 
diff --git a/CppUnit/src/TestSuite.cpp b/CppUnit/src/TestSuite.cpp
index e172cc218..00d336d06 100644
--- a/CppUnit/src/TestSuite.cpp
+++ b/CppUnit/src/TestSuite.cpp
@@ -21,7 +21,7 @@ void TestSuite::deleteContents()
 // Runs the tests and collects their result in a TestResult.
 void TestSuite::run(TestResult *result, const Test::Callback& callback)
 {
-	for (std::vector<Test*>::iterator it = _tests.begin(); it != _tests.end(); ++it) 
+	for (std::vector<Test*>::iterator it = _tests.begin(); it != _tests.end(); ++it)
 	{
 		if (result->shouldStop ())
 			break;
diff --git a/Crypto/Crypto_vs170.sln b/Crypto/Crypto_vs170.sln
index 4ac53237f..a73ee33fd 100644
--- a/Crypto/Crypto_vs170.sln
+++ b/Crypto/Crypto_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.Build.0 = release_static_md|x64
 		{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Crypto/Crypto_vs170.vcxproj b/Crypto/Crypto_vs170.vcxproj
index 55aeb08cf..aa7b65bff 100644
--- a/Crypto/Crypto_vs170.vcxproj
+++ b/Crypto/Crypto_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>Crypto</ProjectName>
     <ProjectGuid>{EEEE7259-32E9-4D56-B023-C733940AB2A0}</ProjectGuid>
     <RootNamespace>Crypto</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoCryptoA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoCryptomdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoCryptoA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoCryptomd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoCryptomt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCryptod</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptomdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptomtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptomd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptomt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Crypto\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Crypto\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Crypto\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Crypto\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Crypto\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Crypto\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\Crypto\$(Configuration)\</IntDir>
@@ -223,6 +328,166 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\Crypto\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoCryptoA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoCryptoA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoCryptod.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoCryptoA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoCrypto.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoCryptomtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoCryptomtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoCryptomt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoCryptomdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoCryptomd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -640,12 +905,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Crypto/Makefile b/Crypto/Makefile
index 39a95bfef..732eb031c 100644
--- a/Crypto/Makefile
+++ b/Crypto/Makefile
@@ -6,7 +6,10 @@
 
 include $(POCO_BASE)/build/rules/global
 
-SYSLIBS += -lssl -lcrypto
+# see https://github.com/pocoproject/poco/issues/3073
+GLOBAL_SYSLIBS := $(SYSLIBS)
+SYSLIBS = -lssl -lcrypto
+SYSLIBS += $(GLOBAL_SYSLIBS)
 
 objects = Cipher CipherFactory CipherImpl CipherKey CipherKeyImpl \
 	CryptoException CryptoStream CryptoTransform \
diff --git a/Crypto/include/Poco/Crypto/Cipher.h b/Crypto/include/Poco/Crypto/Cipher.h
index b6ecf1172..c0a6188fc 100644
--- a/Crypto/include/Poco/Crypto/Cipher.h
+++ b/Crypto/include/Poco/Crypto/Cipher.h
@@ -107,16 +107,16 @@ public:
 	virtual CryptoTransform::Ptr createDecryptor() = 0;
 		/// Creates a decryptor object to be used with a CryptoStream.
 
-	virtual std::string encryptString(const std::string& str, Encoding encoding = ENC_NONE);
+	virtual std::string encryptString(const std::string& str, Encoding encoding = ENC_NONE, bool padding = true);
 		/// Directly encrypt a string and encode it using the given encoding.
 
-	virtual std::string decryptString(const std::string& str, Encoding encoding = ENC_NONE);
+	virtual std::string decryptString(const std::string& str, Encoding encoding = ENC_NONE, bool padding = true);
 		/// Directly decrypt a string that is encoded with the given encoding.
 
-	virtual void encrypt(std::istream& source, std::ostream& sink, Encoding encoding = ENC_NONE);
+	virtual void encrypt(std::istream& source, std::ostream& sink, Encoding encoding = ENC_NONE, bool padding = true);
 		/// Directly encrypts an input stream and encodes it using the given encoding.
 
-	virtual void decrypt(std::istream& source, std::ostream& sink, Encoding encoding = ENC_NONE);
+	virtual void decrypt(std::istream& source, std::ostream& sink, Encoding encoding = ENC_NONE, bool padding = true);
 		/// Directly decrypt an input stream that is encoded with the given encoding.
 
 protected:
diff --git a/Crypto/include/Poco/Crypto/CipherFactory.h b/Crypto/include/Poco/Crypto/CipherFactory.h
index d284dbfe6..5202e3f70 100644
--- a/Crypto/include/Poco/Crypto/CipherFactory.h
+++ b/Crypto/include/Poco/Crypto/CipherFactory.h
@@ -43,8 +43,8 @@ public:
 		/// Destroys the CipherFactory.
 
 	Cipher* createCipher(const CipherKey& key);
-		/// Creates a Cipher object for the given Cipher name. Valid cipher 
-		/// names depend on the OpenSSL version the library is linked with;  
+		/// Creates a Cipher object for the given Cipher name. Valid cipher
+		/// names depend on the OpenSSL version the library is linked with;
 		/// see the output of
 		///
 		///     openssl enc --help
@@ -64,7 +64,7 @@ public:
 	Cipher* createCipher(const EVPPKey& key);
 		/// Creates an EVPCipher using the given EVP key
 		/// for public key encryption/private key decryption.
-	
+
 	static CipherFactory& defaultFactory();
 		/// Returns the default CipherFactory.
 
diff --git a/Crypto/include/Poco/Crypto/DigestEngine.h b/Crypto/include/Poco/Crypto/DigestEngine.h
index 8244a6ea8..1c30e769d 100644
--- a/Crypto/include/Poco/Crypto/DigestEngine.h
+++ b/Crypto/include/Poco/Crypto/DigestEngine.h
@@ -39,13 +39,13 @@ public:
 		/// See the OpenSSL documentation for a list of supported digest algorithms.
 		///
 		/// Throws a Poco::NotFoundException if no algorithm with the given name exists.
-		
+
 	~DigestEngine();
 		/// Destroys the DigestEngine.
-	
+
 	const std::string& algorithm() const;
 		/// Returns the name of the digest algorithm.
-	
+
 	int nid() const;
 		/// Returns the NID (OpenSSL object identifier) of the digest algorithm.
 
@@ -56,7 +56,7 @@ public:
 
 protected:
 	void updateImpl(const void* data, std::size_t length);
-	
+
 private:
 	std::string _name;
 	EVP_MD_CTX* _pContext;
diff --git a/Crypto/include/Poco/Crypto/ECKeyImpl.h b/Crypto/include/Poco/Crypto/ECKeyImpl.h
index 1795e9584..f9c1b1d42 100644
--- a/Crypto/include/Poco/Crypto/ECKeyImpl.h
+++ b/Crypto/include/Poco/Crypto/ECKeyImpl.h
@@ -62,8 +62,8 @@ public:
 
 	ECKeyImpl(const std::string& publicKeyFile, const std::string& privateKeyFile, const std::string& privateKeyPassphrase);
 		/// Creates the ECKey, by reading public and private key from the given files and
-		/// using the given passphrase for the private key. Can only by used for signing if 
-		/// a private key is available. 
+		/// using the given passphrase for the private key. Can only by used for signing if
+		/// a private key is available.
 
 	ECKeyImpl(std::istream* pPublicKeyStream, std::istream* pPrivateKeyStream, const std::string& privateKeyPassphrase);
 		/// Creates the ECKey. Can only by used for signing if pPrivKey
@@ -91,7 +91,7 @@ public:
 	void save(const std::string& publicKeyFile,
 		const std::string& privateKeyFile = "",
 		const std::string& privateKeyPassphrase = "") const;
-		/// Exports the public and private keys to the given files. 
+		/// Exports the public and private keys to the given files.
 		///
 		/// If an empty filename is specified, the corresponding key
 		/// is not exported.
diff --git a/Crypto/include/Poco/Crypto/EVPPKey.h b/Crypto/include/Poco/Crypto/EVPPKey.h
index 925544de9..1bc0356f9 100644
--- a/Crypto/include/Poco/Crypto/EVPPKey.h
+++ b/Crypto/include/Poco/Crypto/EVPPKey.h
@@ -220,7 +220,7 @@ private:
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4996) // deprecation warnings
-#endif				
+#endif
 				pFile = fopen(keyFile.c_str(), "r");
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/Crypto/include/Poco/Crypto/KeyPairImpl.h b/Crypto/include/Poco/Crypto/KeyPairImpl.h
index 6999a46d8..50718ce37 100644
--- a/Crypto/include/Poco/Crypto/KeyPairImpl.h
+++ b/Crypto/include/Poco/Crypto/KeyPairImpl.h
@@ -56,7 +56,7 @@ public:
 	virtual void save(const std::string& publicKeyFile,
 		const std::string& privateKeyFile = "",
 		const std::string& privateKeyPassphrase = "") const = 0;
-		/// Exports the public and private keys to the given files. 
+		/// Exports the public and private keys to the given files.
 		///
 		/// If an empty filename is specified, the corresponding key
 		/// is not exported.
diff --git a/Crypto/include/Poco/Crypto/RSADigestEngine.h b/Crypto/include/Poco/Crypto/RSADigestEngine.h
index 7c4d38605..e0c451d24 100644
--- a/Crypto/include/Poco/Crypto/RSADigestEngine.h
+++ b/Crypto/include/Poco/Crypto/RSADigestEngine.h
@@ -39,7 +39,7 @@ class Crypto_API RSADigestEngine: public Poco::DigestEngine
 	/// signed. Then, the hash value is encrypted, using
 	/// the RSA private key.
 	///
-	/// To verify a signature, pass it to the verify() 
+	/// To verify a signature, pass it to the verify()
 	/// member function. It will decrypt the signature
 	/// using the RSA public key and compare the resulting
 	/// hash with the actual hash of the data.
@@ -50,7 +50,7 @@ public:
 		DIGEST_MD5,
 		DIGEST_SHA1
 	};
-	
+
 	//@ deprecated
 	RSADigestEngine(const RSAKey& key, DigestType digestType = DIGEST_SHA1);
 		/// Creates the RSADigestEngine with the given RSA key,
@@ -74,11 +74,11 @@ public:
 	void reset();
 		/// Resets the engine so that a new
 		/// digest can be computed.
-		
+
 	const DigestEngine::Digest& digest();
-		/// Finishes the computation of the digest 
+		/// Finishes the computation of the digest
 		/// (the first time it's called) and
-		/// returns the message digest. 
+		/// returns the message digest.
 		///
 		/// Can be called multiple times.
 
diff --git a/Crypto/include/Poco/Crypto/RSAKeyImpl.h b/Crypto/include/Poco/Crypto/RSAKeyImpl.h
index 7b9f0f547..f0397381c 100644
--- a/Crypto/include/Poco/Crypto/RSAKeyImpl.h
+++ b/Crypto/include/Poco/Crypto/RSAKeyImpl.h
@@ -65,8 +65,8 @@ public:
 
 	RSAKeyImpl(const std::string& publicKeyFile, const std::string& privateKeyFile, const std::string& privateKeyPassphrase);
 		/// Creates the RSAKey, by reading public and private key from the given files and
-		/// using the given passphrase for the private key. Can only by used for signing if 
-		/// a private key is available. 
+		/// using the given passphrase for the private key. Can only by used for signing if
+		/// a private key is available.
 
 	RSAKeyImpl(std::istream* pPublicKeyStream, std::istream* pPrivateKeyStream, const std::string& privateKeyPassphrase);
 		/// Creates the RSAKey. Can only by used for signing if pPrivKey
@@ -97,7 +97,7 @@ public:
 	void save(const std::string& publicKeyFile,
 		const std::string& privateKeyFile = "",
 		const std::string& privateKeyPassphrase = "") const;
-		/// Exports the public and private keys to the given files. 
+		/// Exports the public and private keys to the given files.
 		///
 		/// If an empty filename is specified, the corresponding key
 		/// is not exported.
diff --git a/Crypto/include/Poco/Crypto/X509Certificate.h b/Crypto/include/Poco/Crypto/X509Certificate.h
index a3ea8e164..8284dd71d 100644
--- a/Crypto/include/Poco/Crypto/X509Certificate.h
+++ b/Crypto/include/Poco/Crypto/X509Certificate.h
@@ -84,7 +84,7 @@ public:
 	X509Certificate& operator = (X509Certificate&& cert) noexcept;
 		/// Move assignment.
 
-	void swap(X509Certificate& cert);
+	void swap(X509Certificate& cert) noexcept;
 		/// Exchanges the certificate with another one.
 
 	~X509Certificate();
diff --git a/Crypto/samples/genrsakey/src/genrsakey.cpp b/Crypto/samples/genrsakey/src/genrsakey.cpp
index 75ce37544..f284c6281 100644
--- a/Crypto/samples/genrsakey/src/genrsakey.cpp
+++ b/Crypto/samples/genrsakey/src/genrsakey.cpp
@@ -52,29 +52,29 @@ public:
 	{
 		Poco::Crypto::initializeCrypto();
 	}
-	
+
 	~RSAApp()
 	{
 		Poco::Crypto::uninitializeCrypto();
 	}
 
-protected:	
+protected:
 	void initialize(Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Application::initialize(self);
 	}
-	
+
 	void uninitialize()
 	{
 		Application::uninitialize();
 	}
-	
+
 	void reinitialize(Application& self)
 	{
 		Application::reinitialize(self);
 	}
-	
+
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -97,7 +97,7 @@ protected:
 				.repeatable(false)
 				.argument("512|1024|2048|4096")
 				.callback(OptionCallback<RSAApp>(this, &RSAApp::handleKeyLength)));
-				
+
 		options.addOption(
 			Option("exponent", "e", "defines the exponent of the key")
 				.required(false)
@@ -119,14 +119,14 @@ protected:
 				.argument("pwd")
 				.callback(OptionCallback<RSAApp>(this, &RSAApp::handlePassword)));
 	}
-	
+
 	void handleHelp(const std::string& name, const std::string& value)
 	{
 		_helpRequested = true;
 		displayHelp();
 		stopOptionsProcessing();
 	}
-	
+
 	void handleKeyLength(const std::string& name, const std::string& value)
 	{
 		int keyLen = Poco::NumberParser::parse(value);
@@ -150,12 +150,12 @@ protected:
 			throw Poco::Util::IncompatibleOptionsException("Empty file prefix forbidden");
 		_name = value;
 	}
-	
+
 	void handlePassword(const std::string& name, const std::string& value)
 	{
 		_pwd = value;
 	}
-		
+
 	void displayHelp()
 	{
 		HelpFormatter helpFormatter(options());
@@ -176,14 +176,14 @@ protected:
 			logger().information("Generating key: DONE");
 			std::string pubFile(_name + ".pub");
 			std::string privFile(_name + ".priv");
-			
+
 			logger().information("Saving key to " + pubFile + " and " + privFile);
 			key.save(pubFile, privFile, _pwd);
 			logger().information("Key saved");
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 	RSAKey::KeyLength _length;
diff --git a/Crypto/src/Cipher.cpp b/Crypto/src/Cipher.cpp
index 8b4d57964..2e9326f44 100644
--- a/Crypto/src/Cipher.cpp
+++ b/Crypto/src/Cipher.cpp
@@ -39,30 +39,32 @@ Cipher::~Cipher()
 }
 
 
-std::string Cipher::encryptString(const std::string& str, Encoding encoding)
+std::string Cipher::encryptString(const std::string& str, Encoding encoding, bool padding)
 {
 	std::istringstream source(str);
 	std::ostringstream sink;
 
-	encrypt(source, sink, encoding);
+	encrypt(source, sink, encoding, padding);
 
 	return sink.str();
 }
 
 
-std::string Cipher::decryptString(const std::string& str, Encoding encoding)
+std::string Cipher::decryptString(const std::string& str, Encoding encoding, bool padding)
 {
 	std::istringstream source(str);
 	std::ostringstream sink;
 
-	decrypt(source, sink, encoding);
+	decrypt(source, sink, encoding, padding);
 	return sink.str();
 }
 
 
-void Cipher::encrypt(std::istream& source, std::ostream& sink, Encoding encoding)
+void Cipher::encrypt(std::istream& source, std::ostream& sink, Encoding encoding, bool padding)
 {
-	CryptoInputStream encryptor(source, createEncryptor());
+	CryptoTransform::Ptr p = createEncryptor();
+	if (!padding) p->setPadding(0);
+	CryptoInputStream encryptor(source, p);
 
 	switch (encoding)
 	{
@@ -102,9 +104,11 @@ void Cipher::encrypt(std::istream& source, std::ostream& sink, Encoding encoding
 }
 
 
-void Cipher::decrypt(std::istream& source, std::ostream& sink, Encoding encoding)
+void Cipher::decrypt(std::istream& source, std::ostream& sink, Encoding encoding, bool padding)
 {
-	CryptoOutputStream decryptor(sink, createDecryptor());
+	CryptoTransform::Ptr p = createDecryptor();
+	if (!padding) p->setPadding(0);
+	CryptoOutputStream decryptor(sink, p);
 
 	switch (encoding)
 	{
diff --git a/Crypto/src/CryptoTransform.cpp b/Crypto/src/CryptoTransform.cpp
index e4e58fd6e..6ecba2ec8 100644
--- a/Crypto/src/CryptoTransform.cpp
+++ b/Crypto/src/CryptoTransform.cpp
@@ -28,7 +28,7 @@ CryptoTransform::~CryptoTransform()
 {
 }
 
-  
+
 int CryptoTransform::setPadding(int padding)
 {
 	return 1;
diff --git a/Crypto/src/DigestEngine.cpp b/Crypto/src/DigestEngine.cpp
index 92e7adeed..db5cf6069 100644
--- a/Crypto/src/DigestEngine.cpp
+++ b/Crypto/src/DigestEngine.cpp
@@ -26,10 +26,10 @@ DigestEngine::DigestEngine(const std::string& name):
 {
 	const EVP_MD* md = EVP_get_digestbyname(_name.c_str());
 	if (!md) throw Poco::NotFoundException(_name);
-	EVP_DigestInit_ex(_pContext, md, NULL);	
+	EVP_DigestInit_ex(_pContext, md, NULL);
 }
 
-	
+
 DigestEngine::~DigestEngine()
 {
 	EVP_MD_CTX_destroy(_pContext);
diff --git a/Crypto/src/RSADigestEngine.cpp b/Crypto/src/RSADigestEngine.cpp
index 948aa25ac..9786eec3f 100644
--- a/Crypto/src/RSADigestEngine.cpp
+++ b/Crypto/src/RSADigestEngine.cpp
@@ -51,7 +51,7 @@ void RSADigestEngine::reset()
 	_signature.clear();
 }
 
-	
+
 const DigestEngine::Digest& RSADigestEngine::digest()
 {
 	if (_digest.empty())
@@ -77,7 +77,7 @@ const DigestEngine::Digest& RSADigestEngine::signature()
     return _signature;
 }
 
-	
+
 bool RSADigestEngine::verify(const DigestEngine::Digest& sig)
 {
 	digest();
diff --git a/Crypto/src/X509Certificate.cpp b/Crypto/src/X509Certificate.cpp
index ed5beeba6..d3f3e5377 100644
--- a/Crypto/src/X509Certificate.cpp
+++ b/Crypto/src/X509Certificate.cpp
@@ -121,7 +121,7 @@ X509Certificate& X509Certificate::operator = (X509Certificate&& cert) noexcept
 }
 
 
-void X509Certificate::swap(X509Certificate& cert)
+void X509Certificate::swap(X509Certificate& cert) noexcept
 {
 	using std::swap;
 	swap(cert._issuerName, _issuerName);
diff --git a/Crypto/testsuite/TestSuite_vs170.vcxproj b/Crypto/testsuite/TestSuite_vs170.vcxproj
index 77708cf45..8c416e4e5 100644
--- a/Crypto/testsuite/TestSuite_vs170.vcxproj
+++ b/Crypto/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Crypto/testsuite/src/DigestEngineTest.cpp b/Crypto/testsuite/src/DigestEngineTest.cpp
index bedba5b97..7e1ccd819 100644
--- a/Crypto/testsuite/src/DigestEngineTest.cpp
+++ b/Crypto/testsuite/src/DigestEngineTest.cpp
@@ -47,7 +47,7 @@ void DigestEngineTest::testMD5()
 
 	engine.update("abcdefghijklmnopqrstuvwxyz");
 	assertTrue (DigestEngine::digestToHex(engine.digest()) == "c3fcd3d76192e4007dfb496cca67e13b");
-	
+
 	engine.update("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
 	engine.update("abcdefghijklmnopqrstuvwxyz0123456789");
 	assertTrue (DigestEngine::digestToHex(engine.digest()) == "d174ab98d277d9f5a5611c2c9f419d9f");
diff --git a/Crypto/testsuite/src/Driver.cpp b/Crypto/testsuite/src/Driver.cpp
index d5bbcfc8e..a4c76e977 100644
--- a/Crypto/testsuite/src/Driver.cpp
+++ b/Crypto/testsuite/src/Driver.cpp
@@ -23,7 +23,7 @@ public:
 	{
 		Poco::Crypto::initializeCrypto();
 	}
-	
+
 	~CryptoInitializer()
 	{
 		Poco::Crypto::uninitializeCrypto();
@@ -34,7 +34,7 @@ public:
 int main(int ac, char **av)
 {
 	CryptoInitializer ci;
-	
+
 	std::vector<std::string> args;
 	for (int i = 0; i < ac; ++i)
 		args.push_back(std::string(av[i]));
diff --git a/Crypto/testsuite/src/RSATest.cpp b/Crypto/testsuite/src/RSATest.cpp
index 5ea1eda8b..e5a978cfa 100644
--- a/Crypto/testsuite/src/RSATest.cpp
+++ b/Crypto/testsuite/src/RSATest.cpp
@@ -15,7 +15,10 @@
 #include "Poco/Crypto/CipherFactory.h"
 #include "Poco/Crypto/Cipher.h"
 #include "Poco/Crypto/X509Certificate.h"
+#include "Poco/Path.h"
+#include "Poco/File.h"
 #include <sstream>
+#include <fstream>
 
 
 using namespace Poco::Crypto;
@@ -203,6 +206,33 @@ void RSATest::testRSACipher()
 		std::string dec = pCipher->decryptString(enc);
 		assertTrue (dec == val);
 	}
+
+	RSAKey key(RSAKey::KL_1024, RSAKey::EXP_SMALL);
+	std::string pubKeyFile = Poco::Path::temp() + "poco.key.pub";
+	std::string privKeyFile = Poco::Path::temp() + "poco.key.priv";
+
+	if (Poco::File(pubKeyFile).exists()) Poco::File(pubKeyFile).remove();
+	if (Poco::File(privKeyFile).exists()) Poco::File(privKeyFile).remove();
+	std::ofstream strPub(pubKeyFile);
+	std::ofstream strPriv(privKeyFile);
+	key.save(&strPub, &strPriv);
+	strPub.close();
+	strPriv.close();
+
+    Poco::Crypto::RSAKey encryptKey(pubKeyFile);
+	Poco::Crypto::RSAKey decryptKey(pubKeyFile, privKeyFile);
+
+    Poco::Crypto::CipherFactory factory;
+    auto iengine = factory.createCipher(encryptKey);
+    auto oengine = factory.createCipher(decryptKey);
+
+    std::string ss = "test_str";
+    auto enc = iengine->encryptString(ss);
+    auto dec = oengine->decryptString(enc);
+    assertEqual (ss, dec);
+
+	delete iengine;
+	delete oengine;
 }
 
 
@@ -221,7 +251,7 @@ void RSATest::testRSACipherLarge()
 	sizes.push_back (16383);
 	sizes.push_back (16384);
 	sizes.push_back (16385);
-	
+
 	Cipher::Ptr pCipher = CipherFactory::defaultFactory().createCipher(RSAKey(RSAKey::KL_1024, RSAKey::EXP_SMALL));
 	for (std::vector<std::size_t>::const_iterator it = sizes.begin(); it != sizes.end(); ++it)
 	{
@@ -243,7 +273,7 @@ void RSATest::testCertificate()
 	Cipher::Ptr pCipher = CipherFactory::defaultFactory().createCipher(publicKey);
 	Cipher::Ptr pCipher2 = CipherFactory::defaultFactory().createCipher(privateKey);
 	std::string val("lets do some encryption");
-	
+
 	std::string enc = pCipher->encryptString(val);
 	std::string dec = pCipher2->decryptString(enc);
 	assertTrue (dec == val);
diff --git a/Crypto/testsuite/src/WinCEDriver.cpp b/Crypto/testsuite/src/WinCEDriver.cpp
index 9bbd0b29b..6f0530a76 100644
--- a/Crypto/testsuite/src/WinCEDriver.cpp
+++ b/Crypto/testsuite/src/WinCEDriver.cpp
@@ -23,7 +23,7 @@ public:
 	{
 		Poco::Crypto::initializeCrypto();
 	}
-	
+
 	~CryptoInitializer()
 	{
 		Poco::Crypto::uninitializeCrypto();
@@ -42,7 +42,7 @@ int _tmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("CryptoTestSuite", CryptoTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/Crypto/testsuite/src/WinDriver.cpp b/Crypto/testsuite/src/WinDriver.cpp
index d7f26bba6..90d085fda 100644
--- a/Crypto/testsuite/src/WinDriver.cpp
+++ b/Crypto/testsuite/src/WinDriver.cpp
@@ -22,7 +22,7 @@ public:
 	{
 		Poco::Crypto::initializeCrypto();
 	}
-	
+
 	~CryptoInitializer()
 	{
 		Poco::Crypto::uninitializeCrypto();
diff --git a/Data/Data_vs170.sln b/Data/Data_vs170.sln
index 1e8444f55..222c7e57f 100644
--- a/Data/Data_vs170.sln
+++ b/Data/Data_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64
 		{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Data/Data_vs170.vcxproj b/Data/Data_vs170.vcxproj
index f9059b382..a3f0a4dd6 100644
--- a/Data/Data_vs170.vcxproj
+++ b/Data/Data_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>Data</ProjectName>
     <ProjectGuid>{240E83C3-368D-11DB-9FBC-00123FC423B5}</ProjectGuid>
     <RootNamespace>Data</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>16.0.32002.118</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDatamdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDatamtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoDataA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoDatamd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoDatamt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDatad</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDatamdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDatamtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoDatamd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoDatamt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Data\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Data\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Data\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Data\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Data\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Data\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\Data\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\Data\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoDataA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoDataA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoDatad.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoDataA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoData.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoDatamtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoDatamtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoDatamt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoDatamdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoDatamdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoDatamd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -569,6 +832,7 @@
     <ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
     <ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
     <ClInclude Include="include\Poco\Data\Extraction.h"/>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
     <ClInclude Include="include\Poco\Data\Limit.h"/>
     <ClInclude Include="include\Poco\Data\LOB.h"/>
     <ClInclude Include="include\Poco\Data\LOBStream.h"/>
@@ -635,6 +899,9 @@
     <ClCompile Include="src\DynamicLOB.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
+    <ClCompile Include="src\JSONRowFormatter.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
     <ClCompile Include="src\Limit.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -710,12 +977,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Data/MySQL/MySQL_vs170.sln b/Data/MySQL/MySQL_vs170.sln
index d62f78d9d..1352dbb99 100644
--- a/Data/MySQL/MySQL_vs170.sln
+++ b/Data/MySQL/MySQL_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Data/MySQL/MySQL_vs170.vcxproj b/Data/MySQL/MySQL_vs170.vcxproj
index 067cd7c62..29b7943d6 100644
--- a/Data/MySQL/MySQL_vs170.vcxproj
+++ b/Data/MySQL/MySQL_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>MySQL</ProjectName>
     <ProjectGuid>{73E19FDE-1570-488C-B3DB-72A60FADD408}</ProjectGuid>
     <RootNamespace>MySQL</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataMySQLA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataMySQLmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataMySQLmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoDataMySQLA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoDataMySQLmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoDataMySQLmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataMySQLd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataMySQLmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataMySQLmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoDataMySQLmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoDataMySQLmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\..\binA64\</OutDir>
+    <IntDir>objA64\MySQL\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\..\binA64\</OutDir>
+    <IntDir>objA64\MySQL\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\MySQL\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\MySQL\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\MySQL\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\MySQL\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\..\bin\</OutDir>
     <IntDir>obj\MySQL\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\..\lib64\</OutDir>
     <IntDir>obj64\MySQL\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\..\binA64\PocoDataMySQLA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\binA64\PocoDataMySQLA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\libA64\PocoDataMySQLd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\..\binA64\PocoDataMySQLA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\libA64\PocoDataMySQL.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\..\libA64\PocoDataMySQLmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataMySQLmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataMySQLmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\..\libA64\PocoDataMySQLmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataMySQLmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataMySQLmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -587,12 +850,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h
index 14960f439..77878ac6c 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h
@@ -35,7 +35,7 @@ public:
 
 	Connector();
 		/// Creates the Connector.
-	
+
 	virtual ~Connector();
 		/// Destroys the Connector.
 
diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
index d06a8ba2f..e303afd27 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
@@ -40,10 +40,10 @@ class MySQL_API MySQLStatementImpl: public Poco::Data::StatementImpl
 public:
 	MySQLStatementImpl(SessionImpl& s);
 		/// Creates the MySQLStatementImpl.
-		
+
 	~MySQLStatementImpl();
 		/// Destroys the MySQLStatementImpl.
-		
+
 protected:
 	virtual std::size_t columnsReturned() const;
 		/// Returns number of columns returned by query.
@@ -51,32 +51,32 @@ protected:
 	virtual int affectedRowCount() const;
 		/// Returns the number of affected rows.
 		/// Used to find out the number of rows affected by insert, delete or update.
-	
+
 	virtual const MetaColumn& metaColumn(std::size_t pos) const;
 		/// Returns column meta data.
-		
+
 	virtual bool hasNext();
 		/// Returns true if a call to next() will return data.
-		
+
 	virtual std::size_t next();
 		/// Retrieves the next row from the resultset.
 		/// Will throw, if the resultset is empty.
-	
+
 	virtual bool canBind() const;
 		/// Returns true if a valid statement is set and we can bind.
 
 	virtual bool canCompile() const;
 		/// Returns true if another compile is possible.
-		
+
 	virtual void compileImpl();
 		/// Compiles the statement, doesn't bind yet
-		
+
 	virtual void bindImpl();
 		/// Binds parameters
-		
+
 	virtual Poco::Data::AbstractExtractor::Ptr extractor();
 		/// Returns the concrete extractor used by the statement.
-		
+
 	virtual Poco::Data::AbstractBinder::Ptr binder();
 		/// Returns the concrete binder used by the statement.
 
diff --git a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
index bd6111f06..8b45e2a3b 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
@@ -71,6 +71,8 @@ public:
 		/// Expands the size allocated for column to fit the length of the data.
 
 private:
+	void freeMemory();
+
 	std::vector<MetaColumn>    _columns;
 	std::vector<MYSQL_BIND>    _row;
 	std::vector<char*>         _buffer;
diff --git a/Data/MySQL/src/Extractor.cpp b/Data/MySQL/src/Extractor.cpp
index 0e0862ea3..cb06a2d5d 100644
--- a/Data/MySQL/src/Extractor.cpp
+++ b/Data/MySQL/src/Extractor.cpp
@@ -134,6 +134,9 @@ bool Extractor::extract(std::size_t pos, std::string& val)
 	if (columnType == Poco::Data::MetaColumn::FDT_JSON && !extractJSON(pos))
 		return false;
 
+	if (columnType == Poco::Data::MetaColumn::FDT_BLOB && !extractLongLOB(pos))
+		return false;
+
 	val.assign(reinterpret_cast<const char*>(_metadata.rawData(pos)), _metadata.length(pos));
 	return true;
 }
diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp
index 3d631c0d3..33c3785ed 100644
--- a/Data/MySQL/src/ResultMetadata.cpp
+++ b/Data/MySQL/src/ResultMetadata.cpp
@@ -61,6 +61,7 @@ namespace
 		case MYSQL_TYPE_DATE:
 		case MYSQL_TYPE_TIME:
 		case MYSQL_TYPE_DATETIME:
+		case MYSQL_TYPE_TIMESTAMP:
 			return sizeof(MYSQL_TIME);
 
 		case MYSQL_TYPE_DECIMAL:
@@ -77,16 +78,16 @@ namespace
 		default:
 			throw Poco::Data::MySQL::StatementException("unknown field type");
 		}
-	}	
+	}
 
 	Poco::Data::MetaColumn::ColumnDataType fieldType(const MYSQL_FIELD& field)
-		/// Convert field MySQL-type to Poco-type	
+		/// Convert field MySQL-type to Poco-type
 	{
 		bool unsig = ((field.flags & UNSIGNED_FLAG) == UNSIGNED_FLAG);
 
 		switch (field.type)
 		{
-		case MYSQL_TYPE_TINY:     
+		case MYSQL_TYPE_TINY:
 			if (unsig) return Poco::Data::MetaColumn::FDT_UINT8;
 			return Poco::Data::MetaColumn::FDT_INT8;
 
@@ -95,31 +96,32 @@ namespace
 			return Poco::Data::MetaColumn::FDT_INT16;
 
 		case MYSQL_TYPE_INT24:
-		case MYSQL_TYPE_LONG:     
+		case MYSQL_TYPE_LONG:
 			if (unsig) return Poco::Data::MetaColumn::FDT_UINT32;
 			return Poco::Data::MetaColumn::FDT_INT32;
 
-		case MYSQL_TYPE_FLOAT:    
+		case MYSQL_TYPE_FLOAT:
 			return Poco::Data::MetaColumn::FDT_FLOAT;
 
 		case MYSQL_TYPE_DECIMAL:
 		case MYSQL_TYPE_NEWDECIMAL:
-		case MYSQL_TYPE_DOUBLE:   
+		case MYSQL_TYPE_DOUBLE:
 			return Poco::Data::MetaColumn::FDT_DOUBLE;
 
-		case MYSQL_TYPE_LONGLONG: 
+		case MYSQL_TYPE_LONGLONG:
 			if (unsig) return Poco::Data::MetaColumn::FDT_UINT64;
 			return Poco::Data::MetaColumn::FDT_INT64;
-			
+
 		case MYSQL_TYPE_DATE:
 			return Poco::Data::MetaColumn::FDT_DATE;
-			
+
 		case MYSQL_TYPE_TIME:
 			return Poco::Data::MetaColumn::FDT_TIME;
-			
+
 		case MYSQL_TYPE_DATETIME:
+		case MYSQL_TYPE_TIMESTAMP:
 			return Poco::Data::MetaColumn::FDT_TIMESTAMP;
-			
+
 		case MYSQL_TYPE_STRING:
 		case MYSQL_TYPE_VAR_STRING:
 			return Poco::Data::MetaColumn::FDT_STRING;
@@ -145,13 +147,13 @@ namespace MySQL {
 
 ResultMetadata::~ResultMetadata()
 {
-	for (std::vector<char*>::iterator it = _buffer.begin(); it != _buffer.end(); ++it)
-		std::free(*it);
+	freeMemory();
 }
 
 
 void ResultMetadata::reset()
 {
+	freeMemory();
 	_columns.resize(0);
 	_row.resize(0);
 	_buffer.resize(0);
@@ -160,14 +162,20 @@ void ResultMetadata::reset()
 }
 
 
+void ResultMetadata::freeMemory()
+{
+	for (std::vector<char*>::iterator it = _buffer.begin(); it != _buffer.end(); ++it)
+		std::free(*it);
+}
+
+
 void ResultMetadata::init(MYSQL_STMT* stmt)
 {
 	ResultMetadataHandle h(stmt);
 
 	if (!h)
 	{
-		// all right, it is normal
-		// querys such an "INSERT INTO" just does not have result at all
+		// some queries (eg. INSERT) don't have result
 		reset();
 		return;
 	}
@@ -236,13 +244,17 @@ std::size_t ResultMetadata::length(std::size_t pos) const
 }
 
 
-const unsigned char* ResultMetadata::rawData(std::size_t pos) const 
+const unsigned char* ResultMetadata::rawData(std::size_t pos) const
 {
+	if ((_lengths[pos] == 0) && (_row[pos].buffer == nullptr))
+		return reinterpret_cast<const unsigned char*>("");
+	else
+		poco_check_ptr (_row[pos].buffer);
 	return reinterpret_cast<const unsigned char*>(_row[pos].buffer);
 }
 
 
-bool ResultMetadata::isNull(std::size_t pos) const 
+bool ResultMetadata::isNull(std::size_t pos) const
 {
 	return (_isNull[pos] != 0);
 }
diff --git a/Data/MySQL/src/SessionImpl.cpp b/Data/MySQL/src/SessionImpl.cpp
index 998fa5c6b..dab3ada08 100644
--- a/Data/MySQL/src/SessionImpl.cpp
+++ b/Data/MySQL/src/SessionImpl.cpp
@@ -255,16 +255,28 @@ void SessionImpl::setTransactionIsolation(Poco::UInt32 ti)
 
 Poco::UInt32 SessionImpl::getTransactionIsolation() const
 {
+	const std::string MARIADB_SERVERINFO = "MariaDB";
+
 	std::string isolation;
+	std::string serverInfo = Utility::serverInfo(_handle);
 	unsigned long version = Utility::serverVersion(_handle);
-	if (version >= 80000)
-	{
-		getSetting("transaction_isolation", isolation);
-		isolation = isolation.c_str();
-	}
-	else
+
+	if (serverInfo.find(MARIADB_SERVERINFO) != std::string::npos) //MariaDB
 	{
 		getSetting("tx_isolation", isolation);
+		isolation = isolation.c_str();
+	}
+	else //MySQL
+	{
+		if (version >= 80000)
+		{
+			getSetting("transaction_isolation", isolation);
+			isolation = isolation.c_str();
+		}
+		else
+		{
+			getSetting("tx_isolation", isolation);
+		}
 	}
 	Poco::replaceInPlace(isolation, "-", " ");
 	if (MYSQL_READ_UNCOMMITTED == isolation)
diff --git a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj
index 7298ffe2f..146f19de2 100644
--- a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj
+++ b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp
index bdfb68377..cbe6a5dc8 100644
--- a/Data/MySQL/testsuite/src/MySQLTest.cpp
+++ b/Data/MySQL/testsuite/src/MySQLTest.cpp
@@ -422,6 +422,8 @@ void MySQLTest::testDateTime()
 	_pExecutor->date();
 	recreatePersonTimeTable();
 	_pExecutor->time();
+	recreatePersonTimestampTable();
+	_pExecutor->timestamp();
 }
 
 
@@ -477,6 +479,14 @@ void MySQLTest::testLongBLOB()
 	_pExecutor->longBlob();
 }
 
+void MySQLTest::testLongTEXT()
+{
+	if (!_pSession) fail ("Test not available.");
+
+	recreatePersonLongBLOBTable();
+	_pExecutor->longText();
+}
+
 void MySQLTest::testJSON()
 {
 	if (!_pSession) fail("Test not available.");
@@ -769,6 +779,15 @@ void MySQLTest::recreatePersonTimeTable()
 }
 
 
+void MySQLTest::recreatePersonTimestampTable()
+{
+	dropTable("Person");
+	try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Birthday TIMESTAMP(6))", now; }
+	catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonTimestampTable()"); }
+	catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonTimestampTable()"); }
+}
+
+
 void MySQLTest::recreatePersonLongBLOBTable()
 {
 	dropTable("Person");
@@ -782,8 +801,8 @@ void MySQLTest::recreatePersonJSONTable()
 {
 	dropTable("Person");
 	try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Biography JSON)", now; }
-	catch (ConnectionException& ce) { std::cout << ce.displayText() << std::endl; fail("recreatePersonLongBLOBTable()"); }
-	catch (StatementException& se) { std::cout << se.displayText() << std::endl; fail("recreatePersonLongBLOBTable()"); }
+	catch (ConnectionException& ce) { std::cout << ce.displayText() << std::endl; fail("recreatePersonJSONTable()"); }
+	catch (StatementException& se) { std::cout << se.displayText() << std::endl; fail("recreatePersonJSONTable()"); }
 }
 
 
@@ -955,6 +974,7 @@ CppUnit::Test* MySQLTest::suite()
 	//CppUnit_addTest(pSuite, MySQLTest, testBLOB);
 	CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt);
 	CppUnit_addTest(pSuite, MySQLTest, testLongBLOB);
+	CppUnit_addTest(pSuite, MySQLTest, testLongTEXT);
 	CppUnit_addTest(pSuite, MySQLTest, testJSON);
 	CppUnit_addTest(pSuite, MySQLTest, testUnsignedInts);
 	CppUnit_addTest(pSuite, MySQLTest, testFloat);
diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h
index 3d75d7f45..8afdfb2d2 100644
--- a/Data/MySQL/testsuite/src/MySQLTest.h
+++ b/Data/MySQL/testsuite/src/MySQLTest.h
@@ -80,6 +80,7 @@ public:
 	void testBLOB();
 	void testBLOBStmt();
 	void testLongBLOB();
+	void testLongTEXT();
 	void testJSON();
 
 	void testUnsignedInts();
@@ -119,6 +120,7 @@ private:
 	void recreatePersonDateTimeTable();
 	void recreatePersonDateTable();
 	void recreatePersonTimeTable();
+	void recreatePersonTimestampTable();
 	void recreatePersonLongBLOBTable();
 	void recreatePersonJSONTable();
 	void recreateStringsTable();
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp
index e8a22b7c1..6c036b9b4 100644
--- a/Data/MySQL/testsuite/src/SQLExecutor.cpp
+++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp
@@ -1364,6 +1364,34 @@ void SQLExecutor::time()
 }
 
 
+void SQLExecutor::timestamp()
+{
+	std::string funct = "timestamp()";
+	std::string lastName("Bart");
+	std::string firstName("Simpson");
+	std::string address("Springfield");
+	DateTime birthday(1980, 4, 1, 5, 45, 12, 354, 879);
+	
+	int count = 0;
+	try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(birthday), now; }
+	catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); }
+	catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); }
+	try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; }
+	catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); }
+	catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); }
+	assertTrue (count == 1);
+	
+	DateTime bd;
+	assertTrue (bd != birthday);
+	try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; }
+	catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); }
+	catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); }
+	assertTrue (bd == birthday);
+	
+	std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person");
+}
+
+
 void SQLExecutor::blob(unsigned int bigSize)
 {
 	std::string funct = "blob()";
@@ -1460,6 +1488,31 @@ void SQLExecutor::longBlob()
 	poco_assert (res == biography);
 }
 
+void SQLExecutor::longText()
+{
+	std::string funct = "longText()";
+	std::string lastName("lastname");
+	std::string firstName("firstname");
+	std::string address("Address");
+	std::string biography("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", 123);
+
+	int count = 0;
+	Statement ins = (*_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(biography));
+	ins.execute();
+	try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; }
+	catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); }
+	catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); }
+	assertTrue (count == 1);
+
+	std::string longTextRes;
+	poco_assert (longTextRes.size() == 0);
+	Statement stmt = (*_pSession << "SELECT Biography FROM Person", into(longTextRes));
+	try { stmt.execute(); }
+	catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); }
+	catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); }
+	poco_assert (longTextRes == biography);
+}
+
 void SQLExecutor::json()
 {
 	std::string funct = "json()";
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h b/Data/MySQL/testsuite/src/SQLExecutor.h
index e11811853..0bec61457 100644
--- a/Data/MySQL/testsuite/src/SQLExecutor.h
+++ b/Data/MySQL/testsuite/src/SQLExecutor.h
@@ -83,7 +83,9 @@ public:
 	void dateTime();
 	void date();
 	void time();
+	void timestamp();
 	void longBlob();
+	void longText();
 	void json();
 	void unsignedInts();
 	void floats();
diff --git a/Data/ODBC/Makefile b/Data/ODBC/Makefile
index 00e86dc45..180a72b70 100644
--- a/Data/ODBC/Makefile
+++ b/Data/ODBC/Makefile
@@ -10,7 +10,7 @@ include ODBC.make
 
 objects = Binder ConnectionHandle Connector EnvironmentHandle \
 	Extractor ODBCException ODBCMetaColumn ODBCStatementImpl \
-	Parameter Preparator SessionImpl TypeInfo Unicode Utility 
+	Parameter Preparator SessionImpl TypeInfo Unicode Utility
 
 target         = PocoDataODBC
 target_version = $(LIBVERSION)
diff --git a/Data/ODBC/ODBC_vs170.sln b/Data/ODBC/ODBC_vs170.sln
index 9188c5035..c591617b5 100644
--- a/Data/ODBC/ODBC_vs170.sln
+++ b/Data/ODBC/ODBC_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64
 		{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{00627063-395B-4413-9099-23BDB56562FA}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Data/ODBC/ODBC_vs170.vcxproj b/Data/ODBC/ODBC_vs170.vcxproj
index 24c28c8e6..52b5e120f 100644
--- a/Data/ODBC/ODBC_vs170.vcxproj
+++ b/Data/ODBC/ODBC_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>ODBC</ProjectName>
     <ProjectGuid>{1B29820D-375F-11DB-837B-00123FC423B5}</ProjectGuid>
     <RootNamespace>ODBC</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataODBCA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataODBCmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataODBCmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoDataODBCA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoDataODBCmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoDataODBCmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataODBCd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataODBCmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataODBCmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoDataODBCmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoDataODBCmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\..\binA64\</OutDir>
+    <IntDir>objA64\ODBC\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\..\binA64\</OutDir>
+    <IntDir>objA64\ODBC\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\ODBC\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\ODBC\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\ODBC\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\ODBC\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\..\bin\</OutDir>
     <IntDir>obj\ODBC\$(Configuration)\</IntDir>
@@ -223,6 +328,166 @@
     <OutDir>..\..\lib64\</OutDir>
     <IntDir>obj64\ODBC\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\binA64\PocoDataODBCA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\binA64\PocoDataODBCA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\libA64\PocoDataODBCd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\binA64\PocoDataODBCA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\libA64\PocoDataODBC.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\..\libA64\PocoDataODBCmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataODBCmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataODBCmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\..\libA64\PocoDataODBCmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataODBCmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataODBCmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -608,31 +873,43 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ClCompile Include="src\Unicode_UNIXODBC.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ClCompile Include="src\Unicode_WIN32.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -643,12 +920,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Connector.h b/Data/ODBC/include/Poco/Data/ODBC/Connector.h
index 8849bf775..6ddfedf75 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/Connector.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Connector.h
@@ -58,7 +58,7 @@ public:
 		///
 		/// This can cause issues with SQL Server, resulting in an error
 		/// ("The data types varchar and text are incompatible in the equal to operator")
-		/// when comparing against a VARCHAR. 
+		/// when comparing against a VARCHAR.
 		///
 		/// Set this to false to bind std::string to SQL_VARCHAR.
 		///
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h b/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
index 86c15fa42..818be4a1e 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
@@ -36,7 +36,7 @@ template <typename H, SQLSMALLINT handleType>
 class Diagnostics
 	/// Utility class providing functionality for retrieving ODBC diagnostic
 	/// records. Diagnostics object must be created with corresponding handle
-	/// as constructor argument. During construction, diagnostic records fields 
+	/// as constructor argument. During construction, diagnostic records fields
 	/// are populated and the object is ready for querying.
 {
 public:
@@ -92,7 +92,7 @@ public:
 	}
 
 	std::string connectionName() const
-		/// Returns the connection name. 
+		/// Returns the connection name.
 		/// If there is no active connection, connection name defaults to NONE.
 		/// If connection name is not applicable for query context (such as when querying environment handle),
 		/// connection name defaults to NOT_APPLICABLE.
@@ -146,54 +146,54 @@ public:
 
 		reset();
 
-		while (!Utility::isError(SQLGetDiagRec(handleType, 
-			_handle, 
-			count, 
-			df._sqlState, 
-			&df._nativeError, 
-			df._message, 
-			SQL_MESSAGE_LENGTH, 
-			&messageLength))) 
+		while (!Utility::isError(SQLGetDiagRec(handleType,
+			_handle,
+			count,
+			df._sqlState,
+			&df._nativeError,
+			df._message,
+			SQL_MESSAGE_LENGTH,
+			&messageLength)))
 		{
 			if (1 == count)
 			{
 				// success of the following two calls is optional
 				// (they fail if connection has not been established yet
 				//  or return empty string if not applicable for the context)
-				if (Utility::isError(SQLGetDiagField(handleType, 
-					_handle, 
-					count, 
-					SQL_DIAG_CONNECTION_NAME, 
-					_connectionName, 
-					sizeof(_connectionName), 
+				if (Utility::isError(SQLGetDiagField(handleType,
+					_handle,
+					count,
+					SQL_DIAG_CONNECTION_NAME,
+					_connectionName,
+					sizeof(_connectionName),
 					&messageLength)))
 				{
-					std::size_t len = sizeof(_connectionName) > none.length() ? 
+					std::size_t len = sizeof(_connectionName) > none.length() ?
 						none.length() : sizeof(_connectionName) - 1;
 					std::memcpy(_connectionName, none.c_str(), len);
 				}
-				else if (0 == _connectionName[0]) 
+				else if (0 == _connectionName[0])
 				{
-					std::size_t len = sizeof(_connectionName) > na.length() ? 
+					std::size_t len = sizeof(_connectionName) > na.length() ?
 						na.length() : sizeof(_connectionName) - 1;
 					std::memcpy(_connectionName, na.c_str(), len);
 				}
-				
-				if (Utility::isError(SQLGetDiagField(handleType, 
-					_handle, 
-					count, 
-					SQL_DIAG_SERVER_NAME, 
-					_serverName, 
-					sizeof(_serverName), 
+
+				if (Utility::isError(SQLGetDiagField(handleType,
+					_handle,
+					count,
+					SQL_DIAG_SERVER_NAME,
+					_serverName,
+					sizeof(_serverName),
 					&messageLength)))
 				{
-					std::size_t len = sizeof(_serverName) > none.length() ? 
+					std::size_t len = sizeof(_serverName) > none.length() ?
 						none.length() : sizeof(_serverName) - 1;
 					std::memcpy(_serverName, none.c_str(), len);
 				}
-				else if (0 == _serverName[0]) 
+				else if (0 == _serverName[0])
 				{
-					std::size_t len = sizeof(_serverName) > na.length() ? 
+					std::size_t len = sizeof(_serverName) > na.length() ?
 						na.length() : sizeof(_serverName) - 1;
 					std::memcpy(_serverName, na.c_str(), len);
 				}
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Error.h b/Data/ODBC/include/Poco/Data/ODBC/Error.h
index 049cc02d1..8afc08468 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/Error.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Error.h
@@ -66,11 +66,11 @@ public:
 	std::string& toString(int index, std::string& str) const
 		/// Generates the string for the diagnostic record.
 	{
-		if ((index < 0) || (index > (count() - 1))) 
+		if ((index < 0) || (index > (count() - 1)))
 			return str;
 
 		std::string s;
-		Poco::format(s, 
+		Poco::format(s,
 			"===========================\n"
 			"ODBC Diagnostic record #%d:\n"
 			"===========================\n"
@@ -90,7 +90,7 @@ public:
 	{
 		std::string str;
 
-		Poco::format(str, 
+		Poco::format(str,
 			"Connection:%s\nServer:%s\n",
 			_diagnostics.connectionName(),
 			_diagnostics.serverName());
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Handle.h b/Data/ODBC/include/Poco/Data/ODBC/Handle.h
index 962ffe6c8..9d9dbc60c 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/Handle.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Handle.h
@@ -39,14 +39,14 @@ class Handle
 /// ODBC handle class template
 {
 public:
-	Handle(const ConnectionHandle& rConnection): 
+	Handle(const ConnectionHandle& rConnection):
 		_rConnection(rConnection),
 		_handle(0)
 			/// Creates the Handle.
 	{
-		if (Utility::isError(SQLAllocHandle(handleType, 
-			_rConnection, 
-			&_handle))) 
+		if (Utility::isError(SQLAllocHandle(handleType,
+			_rConnection,
+			&_handle)))
 		{
 			throw ODBCException("Could not allocate statement handle.");
 		}
@@ -58,7 +58,7 @@ public:
 		try
 		{
 #if defined(_DEBUG)
-			SQLRETURN rc = 
+			SQLRETURN rc =
 #endif
 			SQLFreeHandle(handleType, _handle);
 			// N.B. Destructors should not throw, but neither do we want to
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
index cc9df6d36..374f34dfe 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
@@ -39,15 +39,15 @@ class ODBC_API ODBCMetaColumn: public MetaColumn
 public:
 	explicit ODBCMetaColumn(const StatementHandle& rStmt, std::size_t position);
 		/// Creates the ODBCMetaColumn.
-		
+
 	~ODBCMetaColumn();
 		/// Destroys the ODBCMetaColumn.
 
 	std::size_t dataLength() const;
-		/// A numeric value that is either the maximum or actual character length of a character 
-		/// string or binary data type. It is the maximum character length for a fixed-length data type, 
-		/// or the actual character length for a variable-length data type. Its value always excludes the 
-		/// null-termination byte that ends the character string. 
+		/// A numeric value that is either the maximum or actual character length of a character
+		/// string or binary data type. It is the maximum character length for a fixed-length data type,
+		/// or the actual character length for a variable-length data type. Its value always excludes the
+		/// null-termination byte that ends the character string.
 		/// This information is returned from the SQL_DESC_LENGTH record field of the IRD.
 
 	bool isUnsigned() const;
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
index e3a6492ca..db83e6d2d 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
@@ -76,7 +76,7 @@ protected:
 		/// Returns true if another compile is possible.
 
 	void compileImpl();
-		/// Compiles the statement, doesn't bind yet. 
+		/// Compiles the statement, doesn't bind yet.
 		/// Does nothing if the statement has already been compiled.
 
 	void bindImpl();
@@ -101,12 +101,12 @@ private:
 	typedef std::vector<ExtractorPtr>         ExtractorVec;
 	typedef std::vector<ODBCMetaColumn*>      ColumnPtrVec;
 	typedef std::vector<ColumnPtrVec>         ColumnPtrVecVec;
-	
+
 	static const std::string INVALID_CURSOR_STATE;
 
 	void clear();
 		/// Closes the cursor and resets indicator variables.
-	
+
 	void doBind();
 		/// Binds parameters.
 
@@ -119,8 +119,8 @@ private:
 	void doPrepare();
 		/// Prepares placeholders for data returned by statement.
 		/// It is called during statement compilation for SQL statements
-		/// returning data. For stored procedures returning datasets, 
-		/// it is called upon the first check for data availability 
+		/// returning data. For stored procedures returning datasets,
+		/// it is called upon the first check for data availability
 		/// (see hasNext() function).
 
 	bool hasData() const;
@@ -133,8 +133,8 @@ private:
 		/// Returns true if there is a row fetched but not yet extracted.
 
 	void putData();
-		/// Called whenever SQLExecute returns SQL_NEED_DATA. This is expected 
-		/// behavior for PB_AT_EXEC binding mode. 
+		/// Called whenever SQLExecute returns SQL_NEED_DATA. This is expected
+		/// behavior for PB_AT_EXEC binding mode.
 
 	void addPreparator();
 	void fillColumns();
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Parameter.h b/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
index e9f11bdb5..6afc4fec1 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
@@ -36,7 +36,7 @@ class ODBC_API Parameter
 public:
 	explicit Parameter(const StatementHandle& rStmt, std::size_t colNum);
 		/// Creates the Parameter.
-		
+
 	~Parameter();
 		/// Destroys the Parameter.
 
@@ -47,11 +47,11 @@ public:
 		/// Returns the SQL data type.
 
 	std::size_t columnSize() const;
-		/// Returns the the size of the column or expression of the corresponding 
+		/// Returns the the size of the column or expression of the corresponding
 		/// parameter marker as defined by the data source.
 
 	std::size_t decimalDigits() const;
-		/// Returns the number of decimal digits of the column or expression 
+		/// Returns the number of decimal digits of the column or expression
 		/// of the corresponding parameter as defined by the data source.
 
 	bool isNullable() const;
diff --git a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
index 0b132cbc7..d67269816 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
@@ -54,15 +54,15 @@ public:
 
 	SessionImpl(const std::string& connect,
 		std::size_t loginTimeout,
-		std::size_t maxFieldSize = ODBC_MAX_FIELD_SIZE, 
+		std::size_t maxFieldSize = ODBC_MAX_FIELD_SIZE,
 		bool autoBind = true,
 		bool autoExtract = true);
 		/// Creates the SessionImpl. Opens a connection to the database.
 		/// Throws NotConnectedException if connection was not succesful.
 
 	//@ deprecated
-	SessionImpl(const std::string& connect, 
-		Poco::Any maxFieldSize = ODBC_MAX_FIELD_SIZE, 
+	SessionImpl(const std::string& connect,
+		Poco::Any maxFieldSize = ODBC_MAX_FIELD_SIZE,
 		bool enforceCapability=false,
 		bool autoBind = true,
 		bool autoExtract = true);
@@ -144,7 +144,7 @@ public:
 
 	void setMaxFieldSize(const std::string& rName, const Poco::Any& rValue);
 		/// Sets the max field size (the default used when column size is unknown).
-		
+
 	Poco::Any getMaxFieldSize(const std::string& rName="") const;
 		/// Returns the max field size (the default used when column size is unknown).
 
@@ -154,11 +154,11 @@ public:
 	void setQueryTimeout(const std::string&, const Poco::Any& value);
 		/// Sets the timeout (in seconds) for queries.
 		/// Value must be of type int.
-		
+
 	Poco::Any getQueryTimeout(const std::string&) const;
 		/// Returns the timeout (in seconds) for queries,
 		/// or -1 if no timeout has been set.
-		
+
 	int queryTimeout() const;
 		/// Returns the timeout (in seconds) for queries,
 		/// or -1 if no timeout has been set.
@@ -230,7 +230,7 @@ inline void SessionImpl::setMaxFieldSize(const std::string& rName, const Poco::A
 	_maxFieldSize = rValue;
 }
 
-		
+
 inline Poco::Any SessionImpl::getMaxFieldSize(const std::string& rName) const
 {
 	return _maxFieldSize;
@@ -242,7 +242,7 @@ inline void SessionImpl::setDataTypeInfo(const std::string& rName, const Poco::A
 	throw InvalidAccessException();
 }
 
-		
+
 inline Poco::Any SessionImpl::dataTypeInfo(const std::string& rName) const
 {
 	return &_dataTypes;
diff --git a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
index f8b14a801..043bf7e72 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
@@ -89,12 +89,12 @@ public:
 		/// Returns information about specified data type as specified by parameter 'type'.
 		/// The requested information is specified by parameter 'param'.
 		/// Will fail with a Poco::NotFoundException thrown if the param is not found
-		
+
 	bool tryGetInfo(SQLSMALLINT type, const std::string& param, DynamicAny& result) const;
 		/// Returns information about specified data type as specified by parameter 'type' in param result.
 		/// The requested information is specified by parameter 'param'.
 		/// Will return false if the param is not found. The value of result will be not changed in this case.
-			
+
 
 	void print(std::ostream& ostr);
 		/// Prints all the types (as reported by the underlying database)
@@ -104,8 +104,8 @@ private:
 	void fillCTypes();
 	void fillSQLTypes();
 
-	DataTypeMap _cDataTypes; 
-	DataTypeMap _sqlDataTypes; 
+	DataTypeMap _cDataTypes;
+	DataTypeMap _sqlDataTypes;
 	TypeInfoVec _typeInfo;
 	SQLHDBC*    _pHDBC;
 };
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
index 2cd237b94..8c22d31cc 100644
--- a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
@@ -27,7 +27,7 @@ inline void makeUTF16(SQLCHAR* pSQLChar, SQLINTEGER length, std::wstring& target
 	/// Utility function for conversion from UTF-8 to UTF-16
 {
 	int len = length;
-	if (SQL_NTS == len) 
+	if (SQL_NTS == len)
 		len = (int) std::strlen((const char *) pSQLChar);
 
 	UnicodeConverter::toUTF16((const char *) pSQLChar, len, target);
@@ -45,7 +45,7 @@ inline void makeUTF8(Poco::Buffer<wchar_t>& buffer, SQLINTEGER length, SQLPOINTE
 	length /= sizeof(wchar_t);
 	std::string result;
 	UnicodeConverter::toUTF8(buffer.begin(), length, result);
-	
+
 	std::memset(pTarget, 0, targetLength);
 #if defined(_MSC_VER)
 #pragma warning(push)
diff --git a/Data/ODBC/src/ConnectionHandle.cpp b/Data/ODBC/src/ConnectionHandle.cpp
index 1fde52994..3efc04824 100644
--- a/Data/ODBC/src/ConnectionHandle.cpp
+++ b/Data/ODBC/src/ConnectionHandle.cpp
@@ -24,14 +24,14 @@ namespace Data {
 namespace ODBC {
 
 
-ConnectionHandle::ConnectionHandle(EnvironmentHandle* pEnvironment): 
+ConnectionHandle::ConnectionHandle(EnvironmentHandle* pEnvironment):
 	_pEnvironment(pEnvironment ? pEnvironment : new EnvironmentHandle),
-	_hdbc(SQL_NULL_HDBC), 
+	_hdbc(SQL_NULL_HDBC),
 	_ownsEnvironment(pEnvironment ? false : true)
 {
-	if (Utility::isError(SQLAllocHandle(SQL_HANDLE_DBC, 
-		_pEnvironment->handle(), 
-		&_hdbc))) 
+	if (Utility::isError(SQLAllocHandle(SQL_HANDLE_DBC,
+		_pEnvironment->handle(),
+		&_hdbc)))
 	{
 		throw ODBCException("Could not allocate connection handle.");
 	}
diff --git a/Data/ODBC/src/EnvironmentHandle.cpp b/Data/ODBC/src/EnvironmentHandle.cpp
index 5b2351daf..b9c19182a 100644
--- a/Data/ODBC/src/EnvironmentHandle.cpp
+++ b/Data/ODBC/src/EnvironmentHandle.cpp
@@ -26,12 +26,12 @@ namespace ODBC {
 
 EnvironmentHandle::EnvironmentHandle(): _henv(SQL_NULL_HENV)
 {
-	if (Utility::isError(SQLAllocHandle(SQL_HANDLE_ENV, 
-			SQL_NULL_HANDLE, 
+	if (Utility::isError(SQLAllocHandle(SQL_HANDLE_ENV,
+			SQL_NULL_HANDLE,
 			&_henv)) ||
-		Utility::isError(SQLSetEnvAttr(_henv, 
-			SQL_ATTR_ODBC_VERSION, 
-			(SQLPOINTER) SQL_OV_ODBC3, 
+		Utility::isError(SQLSetEnvAttr(_henv,
+			SQL_ATTR_ODBC_VERSION,
+			(SQLPOINTER) SQL_OV_ODBC3,
 			0)))
 	{
 		throw ODBCException("Could not initialize environment.");
diff --git a/Data/ODBC/src/Parameter.cpp b/Data/ODBC/src/Parameter.cpp
index 23023779b..b7dfe2970 100644
--- a/Data/ODBC/src/Parameter.cpp
+++ b/Data/ODBC/src/Parameter.cpp
@@ -23,14 +23,14 @@ namespace Data {
 namespace ODBC {
 
 
-Parameter::Parameter(const StatementHandle& rStmt, std::size_t colNum) : 
-	_rStmt(rStmt), 
+Parameter::Parameter(const StatementHandle& rStmt, std::size_t colNum) :
+	_rStmt(rStmt),
 	_number(colNum)
 {
 	init();
 }
 
-	
+
 Parameter::~Parameter()
 {
 }
@@ -38,8 +38,8 @@ Parameter::~Parameter()
 
 void Parameter::init()
 {
-	if (Utility::isError(SQLDescribeParam(_rStmt, 
-		(SQLUSMALLINT) _number + 1, 
+	if (Utility::isError(SQLDescribeParam(_rStmt,
+		(SQLUSMALLINT) _number + 1,
 		&_dataType,
 		&_columnSize,
 		&_decimalDigits,
diff --git a/Data/ODBC/src/SessionImpl.cpp b/Data/ODBC/src/SessionImpl.cpp
index 50d83470d..dc21541a1 100644
--- a/Data/ODBC/src/SessionImpl.cpp
+++ b/Data/ODBC/src/SessionImpl.cpp
@@ -31,7 +31,7 @@ SessionImpl::SessionImpl(const std::string& connect,
 	std::size_t loginTimeout,
 	std::size_t maxFieldSize,
 	bool autoBind,
-	bool autoExtract): 
+	bool autoExtract):
 	Poco::Data::AbstractSessionImpl<SessionImpl>(connect, loginTimeout),
 		_connector(Connector::KEY),
 		_maxFieldSize(maxFieldSize),
@@ -49,7 +49,7 @@ SessionImpl::SessionImpl(const std::string& connect,
 
 
 SessionImpl::SessionImpl(const std::string& connect,
-	Poco::Any maxFieldSize, 
+	Poco::Any maxFieldSize,
 	bool enforceCapability,
 	bool autoBind,
 	bool autoExtract): Poco::Data::AbstractSessionImpl<SessionImpl>(connect),
@@ -136,20 +136,20 @@ void SessionImpl::open(const std::string& connect)
 	}
 
 	_dataTypes.fillTypeInfo(_db);
-		addProperty("dataTypeInfo", 
-		&SessionImpl::setDataTypeInfo, 
+		addProperty("dataTypeInfo",
+		&SessionImpl::setDataTypeInfo,
 		&SessionImpl::dataTypeInfo);
 
-	addFeature("autoCommit", 
-		&SessionImpl::autoCommit, 
+	addFeature("autoCommit",
+		&SessionImpl::autoCommit,
 		&SessionImpl::isAutoCommit);
 
-	addFeature("autoBind", 
-		&SessionImpl::autoBind, 
+	addFeature("autoBind",
+		&SessionImpl::autoBind,
 		&SessionImpl::isAutoBind);
 
-	addFeature("autoExtract", 
-		&SessionImpl::autoExtract, 
+	addFeature("autoExtract",
+		&SessionImpl::autoExtract,
 		&SessionImpl::isAutoExtract);
 
 	addProperty("maxFieldSize",
@@ -222,11 +222,11 @@ bool SessionImpl::canTransact() const
 	if (ODBC_TXN_CAPABILITY_UNKNOWN == _canTransact)
 	{
 		SQLUSMALLINT ret;
-		checkError(Poco::Data::ODBC::SQLGetInfo(_db, SQL_TXN_CAPABLE, &ret, 0, 0), 
+		checkError(Poco::Data::ODBC::SQLGetInfo(_db, SQL_TXN_CAPABLE, &ret, 0, 0),
 			"Failed to obtain transaction capability info.");
 
-		_canTransact = (SQL_TC_NONE != ret) ? 
-			ODBC_TXN_CAPABILITY_TRUE : 
+		_canTransact = (SQL_TC_NONE != ret) ?
+			ODBC_TXN_CAPABILITY_TRUE :
 			ODBC_TXN_CAPABILITY_FALSE;
 	}
 
@@ -329,10 +329,10 @@ Poco::UInt32 SessionImpl::transactionIsolation(SQLULEN isolation)
 
 void SessionImpl::autoCommit(const std::string&, bool val)
 {
-	checkError(Poco::Data::ODBC::SQLSetConnectAttr(_db, 
-		SQL_ATTR_AUTOCOMMIT, 
-		val ? (SQLPOINTER) SQL_AUTOCOMMIT_ON : 
-			(SQLPOINTER) SQL_AUTOCOMMIT_OFF, 
+	checkError(Poco::Data::ODBC::SQLSetConnectAttr(_db,
+		SQL_ATTR_AUTOCOMMIT,
+		val ? (SQLPOINTER) SQL_AUTOCOMMIT_ON :
+			(SQLPOINTER) SQL_AUTOCOMMIT_OFF,
 		SQL_IS_UINTEGER), "Failed to set automatic commit.");
 }
 
@@ -415,7 +415,7 @@ void SessionImpl::close()
 	{
 		commit();
 	}
-	catch (ConnectionException&) 
+	catch (ConnectionException&)
 	{
 	}
 
@@ -433,7 +433,7 @@ int SessionImpl::maxStatementLength() const
 		0,
 		0)))
 	{
-		throw ConnectionException(_db, 
+		throw ConnectionException(_db,
 			"SQLGetInfo(SQL_MAXIMUM_STATEMENT_LENGTH)");
 	}
 
diff --git a/Data/ODBC/src/TypeInfo.cpp b/Data/ODBC/src/TypeInfo.cpp
index ca5aa0eb1..d667ad00b 100644
--- a/Data/ODBC/src/TypeInfo.cpp
+++ b/Data/ODBC/src/TypeInfo.cpp
@@ -110,7 +110,7 @@ void TypeInfo::fillTypeInfo(SQLHDBC pHDBC)
 				char literalSuffix[stringSize] = { 0 };
 				char createParams[stringSize] = { 0 };
 				char localTypeName[stringSize] = { 0 };
-				
+
 				TypeInfoTup ti("TYPE_NAME", "",
 					"DATA_TYPE", 0,
 					"COLUMN_SIZE", 0,
@@ -142,10 +142,10 @@ void TypeInfo::fillTypeInfo(SQLHDBC pHDBC)
 				ti.set<4>(literalSuffix);
 				rc = SQLGetData(hstmt, 6, SQL_C_CHAR, createParams, sizeof(createParams), &ind);
 				ti.set<5>(createParams);
-				rc = SQLGetData(hstmt, 7, SQL_C_SSHORT, &ti.get<6>(), sizeof(SQLSMALLINT), &ind); 
-				rc = SQLGetData(hstmt, 8, SQL_C_SSHORT, &ti.get<7>(), sizeof(SQLSMALLINT), &ind); 
-				rc = SQLGetData(hstmt, 9, SQL_C_SSHORT, &ti.get<8>(), sizeof(SQLSMALLINT), &ind); 
-				rc = SQLGetData(hstmt, 10, SQL_C_SSHORT, &ti.get<9>(), sizeof(SQLSMALLINT), &ind); 
+				rc = SQLGetData(hstmt, 7, SQL_C_SSHORT, &ti.get<6>(), sizeof(SQLSMALLINT), &ind);
+				rc = SQLGetData(hstmt, 8, SQL_C_SSHORT, &ti.get<7>(), sizeof(SQLSMALLINT), &ind);
+				rc = SQLGetData(hstmt, 9, SQL_C_SSHORT, &ti.get<8>(), sizeof(SQLSMALLINT), &ind);
+				rc = SQLGetData(hstmt, 10, SQL_C_SSHORT, &ti.get<9>(), sizeof(SQLSMALLINT), &ind);
 				rc = SQLGetData(hstmt, 11, SQL_C_SSHORT, &ti.get<10>(), sizeof(SQLSMALLINT), &ind);
 				rc = SQLGetData(hstmt, 12, SQL_C_SSHORT, &ti.get<11>(), sizeof(SQLSMALLINT), &ind);
 				rc = SQLGetData(hstmt, 13, SQL_C_CHAR, localTypeName, sizeof(localTypeName), &ind);
@@ -192,7 +192,7 @@ bool TypeInfo::tryGetInfo(SQLSMALLINT type, const std::string& param, DynamicAny
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
@@ -239,24 +239,24 @@ void TypeInfo::print(std::ostream& ostr)
 
 	for (; it != end; ++it)
 	{
-		ostr << it->get<0>() << "\t" 
-			<< it->get<1>() << "\t" 
-			<< it->get<2>() << "\t" 
-			<< it->get<3>() << "\t" 
-			<< it->get<4>() << "\t" 
-			<< it->get<5>() << "\t" 
-			<< it->get<6>() << "\t" 
-			<< it->get<7>() << "\t" 
-			<< it->get<8>() << "\t" 
-			<< it->get<9>() << "\t" 
-			<< it->get<10>() << "\t" 
-			<< it->get<11>() << "\t" 
-			<< it->get<12>() << "\t" 
-			<< it->get<13>() << "\t" 
+		ostr << it->get<0>() << "\t"
+			<< it->get<1>() << "\t"
+			<< it->get<2>() << "\t"
+			<< it->get<3>() << "\t"
+			<< it->get<4>() << "\t"
+			<< it->get<5>() << "\t"
+			<< it->get<6>() << "\t"
+			<< it->get<7>() << "\t"
+			<< it->get<8>() << "\t"
+			<< it->get<9>() << "\t"
+			<< it->get<10>() << "\t"
+			<< it->get<11>() << "\t"
+			<< it->get<12>() << "\t"
+			<< it->get<13>() << "\t"
 			<< it->get<14>() << "\t"
-			<< it->get<15>() << "\t" 
-			<< it->get<16>() << "\t" 
-			<< it->get<17>() << "\t" 
+			<< it->get<15>() << "\t"
+			<< it->get<16>() << "\t"
+			<< it->get<17>() << "\t"
 			<< it->get<18>() << std::endl;
 	}
 }
diff --git a/Data/ODBC/src/Unicode_UNIXODBC.cpp b/Data/ODBC/src/Unicode_UNIXODBC.cpp
index 4caf097c2..1f671fed5 100644
--- a/Data/ODBC/src/Unicode_UNIXODBC.cpp
+++ b/Data/ODBC/src/Unicode_UNIXODBC.cpp
@@ -38,7 +38,7 @@ namespace ODBC {
 void makeUTF16(SQLCHAR* pSQLChar, SQLINTEGER length, std::string& target)
 {
 	int len = length;
-	if (SQL_NTS == len) 
+	if (SQL_NTS == len)
 		len = (int) std::strlen((const char *) pSQLChar);
 
 	UTF8Encoding utf8Encoding;
@@ -59,7 +59,7 @@ void makeUTF8(Poco::Buffer<SQLWCHAR>& buffer, SQLINTEGER length, SQLPOINTER pTar
 	std::string result;
 	if (0 != converter.convert(buffer.begin(), length, result))
 		throw DataFormatException("Error converting UTF-16 to UTF-8");
-	
+
 	std::memset(pTarget, 0, targetLength);
 	std::strncpy((char*) pTarget, result.c_str(), result.size() < targetLength ? result.size() : targetLength);
 }
@@ -69,7 +69,7 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt,
 	SQLUSMALLINT   iCol,
 	SQLUSMALLINT   iField,
 	SQLPOINTER	   pCharAttr,
-	SQLSMALLINT	   cbCharAttrMax,	
+	SQLSMALLINT	   cbCharAttrMax,
 	SQLSMALLINT*   pcbCharAttr,
 	NumAttrPtrType pNumAttr)
 {
@@ -93,7 +93,7 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt,
 		iCol,
 		iField,
 		pCharAttr,
-		cbCharAttrMax,	
+		cbCharAttrMax,
 		pcbCharAttr,
 		pNumAttr);
 }
@@ -133,8 +133,8 @@ SQLRETURN SQLConnect(SQLHDBC hdbc,
 
 	std::string sqlPWD;
 	makeUTF16(szAuthStr, cbAuthStr, sqlPWD);
-	
-	return SQLConnectW(hdbc, 
+
+	return SQLConnectW(hdbc,
 		(SQLWCHAR*) sqlDSN.c_str(), cbDSN,
 		(SQLWCHAR*) sqlUID.c_str(), cbUID,
 		(SQLWCHAR*) sqlPWD.c_str(), cbAuthStr);
@@ -211,7 +211,7 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc,
 		makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
 		return rc;
 	}
-	
+
 
 	return SQLGetConnectAttrW(hdbc,
 		fAttribute,
@@ -231,9 +231,9 @@ SQLRETURN SQLGetCursorName(SQLHSTMT hstmt,
 
 
 SQLRETURN SQLSetDescField(SQLHDESC hdesc,
-	SQLSMALLINT iRecord, 
+	SQLSMALLINT iRecord,
 	SQLSMALLINT iField,
-	SQLPOINTER  rgbValue, 
+	SQLPOINTER  rgbValue,
 	SQLINTEGER  cbValueMax)
 {
 	if (isString(rgbValue, cbValueMax))
@@ -242,16 +242,16 @@ SQLRETURN SQLSetDescField(SQLHDESC hdesc,
 		makeUTF16((SQLCHAR*) rgbValue, cbValueMax, str);
 
 		return SQLSetDescFieldW(hdesc,
-			iRecord, 
+			iRecord,
 			iField,
-			(SQLPOINTER) str.c_str(), 
+			(SQLPOINTER) str.c_str(),
 			(SQLINTEGER) str.size() * sizeof(SQLWCHAR));
 	}
 
 	return SQLSetDescFieldW(hdesc,
-		iRecord, 
+		iRecord,
 		iField,
-		rgbValue, 
+		rgbValue,
 		cbValueMax);
 }
 
@@ -296,7 +296,7 @@ SQLRETURN SQLGetDescRec(SQLHDESC hdesc,
 	SQLSMALLINT* pfType,
 	SQLSMALLINT* pfSubType,
 	SQLLEN*      pLength,
-	SQLSMALLINT* pPrecision, 
+	SQLSMALLINT* pPrecision,
 	SQLSMALLINT* pScale,
 	SQLSMALLINT* pNullable)
 {
@@ -391,7 +391,7 @@ SQLRETURN SQLSetConnectAttr(SQLHDBC hdbc,
 
 		return SQLSetConnectAttrW(hdbc,
 			fAttribute,
-			(SQLWCHAR*) str.c_str(), 
+			(SQLWCHAR*) str.c_str(),
 			(SQLINTEGER) str.size() * sizeof(SQLWCHAR));
 	}
 
@@ -487,7 +487,7 @@ SQLRETURN SQLGetInfo(SQLHDBC hdbc,
 			pcbInfoValue);
 
 		makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax);
-		
+
 		return rc;
 	}
 
@@ -590,12 +590,12 @@ SQLRETURN SQLDriverConnect(SQLHDBC hdbc,
 	SQLUSMALLINT fDriverCompletion)
 {
 	SQLSMALLINT len = cbConnStrIn;
-	if (SQL_NTS == len) 
+	if (SQL_NTS == len)
 		len = (SQLSMALLINT) std::strlen((const char*) szConnStrIn) + 1;
 
 	std::string connStrIn;
 	makeUTF16(szConnStrIn, len, connStrIn);
-	
+
 	Buffer<SQLWCHAR> out(cbConnStrOutMax);
 	SQLRETURN rc = SQLDriverConnectW(hdbc,
 		hwnd,
diff --git a/Data/ODBC/src/Unicode_WIN32.cpp b/Data/ODBC/src/Unicode_WIN32.cpp
index fe637e49b..ed472115a 100644
--- a/Data/ODBC/src/Unicode_WIN32.cpp
+++ b/Data/ODBC/src/Unicode_WIN32.cpp
@@ -97,7 +97,7 @@ SQLRETURN SQLConnect(SQLHDBC hdbc,
 
 	std::wstring sqlPWD;
 	makeUTF16(szAuthStr, cbAuthStr, sqlPWD);
-	
+
 	return SQLConnectW(hdbc,
 		(SQLWCHAR*) sqlDSN.c_str(),
 		(SQLSMALLINT) sqlDSN.size(),
@@ -155,8 +155,8 @@ SQLRETURN SQLExecDirect(SQLHSTMT hstmt,
 	std::wstring sqlStr;
 	makeUTF16(szSqlStr, cbSqlStr, sqlStr);
 
-	return SQLExecDirectW(hstmt, 
-		(SQLWCHAR*) sqlStr.c_str(), 
+	return SQLExecDirectW(hstmt,
+		(SQLWCHAR*) sqlStr.c_str(),
 		(SQLINTEGER) sqlStr.size());
 }
 
@@ -180,7 +180,7 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc,
 		makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
 		return rc;
 	}
-	
+
 
 	return SQLGetConnectAttrW(hdbc,
 		fAttribute,
@@ -200,9 +200,9 @@ SQLRETURN SQLGetCursorName(SQLHSTMT hstmt,
 
 
 SQLRETURN SQLSetDescField(SQLHDESC hdesc,
-	SQLSMALLINT iRecord, 
+	SQLSMALLINT iRecord,
 	SQLSMALLINT iField,
-	SQLPOINTER  rgbValue, 
+	SQLPOINTER  rgbValue,
 	SQLINTEGER  cbValueMax)
 {
 	if (isString(rgbValue, cbValueMax))
@@ -211,18 +211,18 @@ SQLRETURN SQLSetDescField(SQLHDESC hdesc,
 		makeUTF16((SQLCHAR*) rgbValue, cbValueMax, str);
 
 		SQLRETURN rc = SQLSetDescFieldW(hdesc,
-			iRecord, 
+			iRecord,
 			iField,
-			(SQLPOINTER) str.c_str(), 
+			(SQLPOINTER) str.c_str(),
 			(SQLINTEGER) str.size() * sizeof(std::wstring::value_type));
 
 		return rc;
 	}
 
 	return SQLSetDescFieldW(hdesc,
-		iRecord, 
+		iRecord,
 		iField,
-		rgbValue, 
+		rgbValue,
 		cbValueMax);
 }
 
@@ -266,7 +266,7 @@ SQLRETURN SQLGetDescRec(SQLHDESC hdesc,
 	SQLSMALLINT* pfType,
 	SQLSMALLINT* pfSubType,
 	SQLLEN*      pLength,
-	SQLSMALLINT* pPrecision, 
+	SQLSMALLINT* pPrecision,
 	SQLSMALLINT* pScale,
 	SQLSMALLINT* pNullable)
 {
@@ -344,8 +344,8 @@ SQLRETURN SQLPrepare(SQLHSTMT hstmt,
 	std::wstring sqlStr;
 	makeUTF16(szSqlStr, cbSqlStr, sqlStr);
 
-	return SQLPrepareW(hstmt, 
-		(SQLWCHAR*) sqlStr.c_str(), 
+	return SQLPrepareW(hstmt,
+		(SQLWCHAR*) sqlStr.c_str(),
 		(SQLINTEGER) sqlStr.size());
 }
 
@@ -362,13 +362,13 @@ SQLRETURN SQLSetConnectAttr(SQLHDBC hdbc,
 
 		return SQLSetConnectAttrW(hdbc,
 			fAttribute,
-			(SQLWCHAR*) str.c_str(), 
+			(SQLWCHAR*) str.c_str(),
 			(SQLINTEGER) str.size() * sizeof(std::wstring::value_type));
 	}
 
 	return SQLSetConnectAttrW(hdbc,
 		fAttribute,
-		rgbValue, 
+		rgbValue,
 		cbValue);
 }
 
@@ -576,7 +576,7 @@ SQLRETURN SQLDriverConnect(SQLHDBC hdbc,
 {
 	std::wstring connStrIn;
 	int len = cbConnStrIn;
-	if (SQL_NTS == len) 
+	if (SQL_NTS == len)
 		len = (int) std::strlen((const char*) szConnStrIn);
 
 	Poco::UnicodeConverter::toUTF16((const char *) szConnStrIn, len, connStrIn);
diff --git a/Data/ODBC/src/Utility.cpp b/Data/ODBC/src/Utility.cpp
index 62a22a40b..8d3b4a5e5 100644
--- a/Data/ODBC/src/Utility.cpp
+++ b/Data/ODBC/src/Utility.cpp
@@ -41,7 +41,7 @@ Utility::DriverMap& Utility::drivers(Utility::DriverMap& driverMap)
 	SQLSMALLINT len2 = length;
 	RETCODE rc = 0;
 
-	if (!Utility::isError(rc = SQLDrivers(henv, 
+	if (!Utility::isError(rc = SQLDrivers(henv,
 		SQL_FETCH_FIRST,
 		desc,
 		length,
@@ -52,12 +52,12 @@ Utility::DriverMap& Utility::drivers(Utility::DriverMap& driverMap)
 	{
 		do
 		{
-			driverMap.insert(DSNMap::value_type(std::string((char *) desc), 
+			driverMap.insert(DSNMap::value_type(std::string((char *) desc),
 				std::string((char *) attr)));
 			std::memset(desc, 0, length);
 			std::memset(attr, 0, length);
 			len2 = length;
-		}while (!Utility::isError(rc = SQLDrivers(henv, 
+		}while (!Utility::isError(rc = SQLDrivers(henv,
 			SQL_FETCH_NEXT,
 			desc,
 			length,
@@ -67,7 +67,7 @@ Utility::DriverMap& Utility::drivers(Utility::DriverMap& driverMap)
 			&len2)));
 	}
 
-	if (SQL_NO_DATA != rc) 
+	if (SQL_NO_DATA != rc)
 		throw EnvironmentException(henv);
 
 	return driverMap;
@@ -88,7 +88,7 @@ Utility::DSNMap& Utility::dataSources(Utility::DSNMap& dsnMap)
 	SQLSMALLINT len2 = length;
 	RETCODE rc = 0;
 
-	while (!Utility::isError(rc = Poco::Data::ODBC::SQLDataSources(henv, 
+	while (!Utility::isError(rc = Poco::Data::ODBC::SQLDataSources(henv,
 		SQL_FETCH_NEXT,
 		dsn,
 		SQL_MAX_DSN_LENGTH,
@@ -103,7 +103,7 @@ Utility::DSNMap& Utility::dataSources(Utility::DSNMap& dsnMap)
 		len2 = length;
 	}
 
-	if (SQL_NO_DATA != rc) 
+	if (SQL_NO_DATA != rc)
 		throw EnvironmentException(henv);
 
 	return dsnMap;
diff --git a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj
index 92dfd5979..214f11b4e 100644
--- a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj
+++ b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{00627063-395B-4413-9099-23BDB56562FA}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp
index 12bea3710..55aec9ba7 100644
--- a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp
@@ -40,7 +40,7 @@ std::string ODBCAccessTest::_dbConnString;
 Poco::Data::ODBC::Utility::DriverMap ODBCAccessTest::_drivers;
 
 
-ODBCAccessTest::ODBCAccessTest(const std::string& name): 
+ODBCAccessTest::ODBCAccessTest(const std::string& name):
 	CppUnit::TestCase(name)
 {
 }
@@ -123,13 +123,13 @@ bool ODBCAccessTest::canConnect(const std::string& driver, const std::string& ds
 	{
 		if (((itDrv->first).find(driver) != std::string::npos))
 		{
-			std::cout << "Driver found: " << itDrv->first 
+			std::cout << "Driver found: " << itDrv->first
 				<< " (" << itDrv->second << ')' << std::endl;
 			break;
 		}
 	}
 
-	if (_drivers.end() == itDrv) 
+	if (_drivers.end() == itDrv)
 	{
 		std::cout << driver << " driver NOT found, tests not available." << std::endl;
 		return false;
@@ -142,7 +142,7 @@ bool ODBCAccessTest::canConnect(const std::string& driver, const std::string& ds
 	{
 		if (itDSN->first == dsn && itDSN->second == driver)
 		{
-			std::cout << "DSN found: " << itDSN->first 
+			std::cout << "DSN found: " << itDSN->first
 				<< " (" << itDSN->second << ')' << std::endl;
 			format(_dbConnString, "DSN=%s", dsn);
 			return true;
diff --git a/Data/ODBC/testsuite/src/ODBCAccessTest.h b/Data/ODBC/testsuite/src/ODBCAccessTest.h
index 498b23f27..18bd6ce11 100644
--- a/Data/ODBC/testsuite/src/ODBCAccessTest.h
+++ b/Data/ODBC/testsuite/src/ODBCAccessTest.h
@@ -25,7 +25,7 @@
 class ODBCAccessTest: public CppUnit::TestCase
 	/// MS Access ODBC test class
 	/// Tested:
-	/// 
+	///
 	/// Driver		|	DB		| OS
 	/// ------------+-----------+------------------------------------------
 	///	4.00.6305.00| Jet 4.0	| MS Windows XP Professional x64 v.2003/SP1
diff --git a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp
index f5c2ff79f..c880ad6fb 100644
--- a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp
+++ b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp
@@ -66,7 +66,7 @@ std::string          ODBCDB2Test::_connectString = "Driver=" DB2_ODBC_DRIVER ";"
 	"Pwd=" DB2_PWD ";";
 
 
-ODBCDB2Test::ODBCDB2Test(const std::string& name): 
+ODBCDB2Test::ODBCDB2Test(const std::string& name):
 	ODBCTest(name, _pSession, _pExecutor, _dsn, _uid, _pwd, _connectString)
 {
 }
@@ -110,7 +110,7 @@ void ODBCDB2Test::testBareboneODBC()
 void ODBCDB2Test::testBLOB()
 {
 	if (!_pSession) fail ("Test not available.");
-	
+
 	const std::size_t maxFldSize = 1000000;
 	_pSession->setProperty("maxFieldSize", Poco::Any(maxFldSize-1));
 	recreatePersonBLOBTable();
@@ -120,7 +120,7 @@ void ODBCDB2Test::testBLOB()
 		_pExecutor->blob(maxFldSize);
 		fail ("must fail");
 	}
-	catch (DataException&) 
+	catch (DataException&)
 	{
 		_pSession->setProperty("maxFieldSize", Poco::Any(maxFldSize));
 	}
@@ -183,14 +183,14 @@ void ODBCDB2Test::testStoredProcedure()
 			"BEGIN "
 			" SET outParam = inParam*inParam; "
 			"END" , now;
-		
+
 
 		i = 2;
 		int j = 0;
 		*_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now;
 		assertTrue (4 == j);
 		dropObject("PROCEDURE", "storedProcedure");
-	
+
 		*_pSession << "CREATE PROCEDURE storedProcedure(INOUT ioParam INTEGER) "
 			"BEGIN "
 			" SET ioParam = ioParam*ioParam; "
@@ -209,7 +209,7 @@ void ODBCDB2Test::testStoredProcedure()
 			" SET outParam = inParam; "
 			"END" , now;
 
-		std::string inParam = 
+		std::string inParam =
 			"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
 			"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
 			"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
@@ -272,7 +272,7 @@ void ODBCDB2Test::testStoredProcedureDynamicAny()
 	for (int k = 0; k < 8;)
 	{
 		_pSession->setFeature("autoBind", bindValue(k));
-		
+
 		DynamicAny i = 2;
 		DynamicAny j = 0;
 
@@ -319,12 +319,12 @@ void ODBCDB2Test::testStoredFunction()
 		*_pSession << "{? = call storedFunction()}", out(i), now;
 		assertTrue (-1 == i);
 		dropObject("PROCEDURE", "storedFunction");
-		
+
 		*_pSession << "CREATE PROCEDURE storedFunction(inParam INTEGER) "
 			"BEGIN "
 			" RETURN inParam*inParam; "
 			"END" , now;
-		
+
 		i = 2;
 		int result = 0;
 		*_pSession << "{? = call storedFunction(?)}", out(result), in(i), now;
@@ -342,7 +342,7 @@ void ODBCDB2Test::testStoredFunction()
 		result = 0;
 		*_pSession << "{? = call storedFunction(?, ?)}", out(result), in(i), out(j), now;
 		assertTrue (4 == j);
-		assertTrue (j == result); 
+		assertTrue (j == result);
 		dropObject("PROCEDURE", "storedFunction");
 
 		*_pSession << "CREATE PROCEDURE storedFunction(INOUT param1 INTEGER, INOUT param2 INTEGER) "
@@ -360,7 +360,7 @@ void ODBCDB2Test::testStoredFunction()
 		*_pSession << "{? = call storedFunction(?, ?)}", out(result), io(i), io(j), now;
 		assertTrue (1 == j);
 		assertTrue (2 == i);
-		assertTrue (3 == result); 
+		assertTrue (3 == result);
 
 		Tuple<int, int> params(1, 2);
 		assertTrue (1 == params.get<0>());
@@ -369,7 +369,7 @@ void ODBCDB2Test::testStoredFunction()
 		*_pSession << "{? = call storedFunction(?, ?)}", out(result), io(params), now;
 		assertTrue (1 == params.get<1>());
 		assertTrue (2 == params.get<0>());
-		assertTrue (3 == result); 
+		assertTrue (3 == result);
 
 		dropObject("PROCEDURE", "storedFunction");
 
@@ -545,14 +545,14 @@ void ODBCDB2Test::recreateNullsTable(const std::string& notNull)
 void ODBCDB2Test::recreateMiscTable()
 {
 	dropObject("TABLE", "MiscTest");
-	try 
-	{ 
+	try
+	{
 		session() << "CREATE TABLE MiscTest "
 			"(First VARCHAR(30),"
 			"Second BLOB,"
 			"Third INTEGER,"
 			"Fourth FLOAT,"
-			"Fifth TIMESTAMP)", now; 
+			"Fifth TIMESTAMP)", now;
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateMiscTable()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateMiscTable()"); }
 }
@@ -563,19 +563,19 @@ void ODBCDB2Test::recreateLogTable()
 	dropObject("TABLE", "T_POCO_LOG");
 	dropObject("TABLE", "T_POCO_LOG_ARCHIVE");
 
-	try 
-	{ 
+	try
+	{
 		std::string sql = "CREATE TABLE %s "
 			"(Source VARCHAR(100),"
 			"Name VARCHAR(100),"
 			"ProcessId INTEGER,"
 			"Thread VARCHAR(100), "
-			"ThreadId INTEGER," 
+			"ThreadId INTEGER,"
 			"Priority INTEGER,"
 			"Text VARCHAR(100),"
-			"DateTime TIMESTAMP)"; 
+			"DateTime TIMESTAMP)";
 
-		session() << sql, "T_POCO_LOG", now; 
+		session() << sql, "T_POCO_LOG", now;
 		session() << sql, "T_POCO_LOG_ARCHIVE", now;
 
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()"); }
diff --git a/Data/ODBC/testsuite/src/ODBCDB2Test.h b/Data/ODBC/testsuite/src/ODBCDB2Test.h
index e0e18da75..57263707f 100644
--- a/Data/ODBC/testsuite/src/ODBCDB2Test.h
+++ b/Data/ODBC/testsuite/src/ODBCDB2Test.h
@@ -21,7 +21,7 @@
 class ODBCDB2Test: public ODBCTest
 	/// IBM DB2 UDB ODBC test class
 	/// Tested:
-	/// 
+	///
 	/// Driver		|	DB				| OS
 	/// ------------+-------------------+------------------------------------------
 	///	9.01.00.356 | DB2 Express-C 9.1	| MS Windows XP Professional x64 v.2003/SP1
diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp
index ed539e13e..bd90d438a 100644
--- a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp
@@ -61,7 +61,7 @@ std::string          ODBCMySQLTest::_connectString = "DRIVER={" MYSQL_ODBC_DRIVE
 	"PWD=" MYSQL_PWD ";";
 
 
-ODBCMySQLTest::ODBCMySQLTest(const std::string& name): 
+ODBCMySQLTest::ODBCMySQLTest(const std::string& name):
 	ODBCTest(name, _pSession, _pExecutor, _dsn, _uid, _pwd, _connectString)
 {
 	_pExecutor->execute("SET @@global.sql_mode= '';"); // disable strict mode
@@ -120,7 +120,7 @@ So, we skip this test.
 void ODBCMySQLTest::testBLOB()
 {
 	if (!_pSession) fail ("Test not available.");
-	
+
 	const std::size_t maxFldSize = 65534;
 	_pSession->setProperty("maxFieldSize", Poco::Any(maxFldSize-1));
 	recreatePersonBLOBTable();
@@ -130,7 +130,7 @@ void ODBCMySQLTest::testBLOB()
 		_pExecutor->blob(maxFldSize);
 		fail ("must fail");
 	}
-	catch (DataException&) 
+	catch (DataException&)
 	{
 		_pSession->setProperty("maxFieldSize", Poco::Any(maxFldSize));
 	}
@@ -182,10 +182,10 @@ void ODBCMySQLTest::testNull()
 
 void ODBCMySQLTest::testStoredProcedure()
 {
-	//MySQL is currently buggy in this area: 
+	//MySQL is currently buggy in this area:
 	// http://bugs.mysql.com/bug.php?id=17898
 	// http://bugs.mysql.com/bug.php?id=27632
-	// Additionally, the standard ODBC stored procedure call syntax 
+	// Additionally, the standard ODBC stored procedure call syntax
 	// {call storedProcedure(?)} is currently (3.51.12.00) not supported.
 	// See http://bugs.mysql.com/bug.php?id=26535
 	// Poco::Data support for MySQL ODBC is postponed until the above
@@ -195,10 +195,10 @@ void ODBCMySQLTest::testStoredProcedure()
 
 void ODBCMySQLTest::testStoredFunction()
 {
-	//MySQL is currently buggy in this area: 
+	//MySQL is currently buggy in this area:
 	// http://bugs.mysql.com/bug.php?id=17898
 	// http://bugs.mysql.com/bug.php?id=27632
-	// Additionally, the standard ODBC stored procedure call syntax 
+	// Additionally, the standard ODBC stored procedure call syntax
 	// {call storedProcedure(?)} is currently (3.51.12.00) not supported.
 	// See http://bugs.mysql.com/bug.php?id=26535
 	// Poco::Data support for MySQL ODBC is postponed until the above
@@ -390,19 +390,19 @@ void ODBCMySQLTest::recreateLogTable()
 	dropObject("TABLE", "T_POCO_LOG");
 	dropObject("TABLE", "T_POCO_LOG_ARCHIVE");
 
-	try 
-	{ 
+	try
+	{
 		std::string sql = "CREATE TABLE %s "
 			"(Source VARCHAR(100),"
 			"Name VARCHAR(100),"
 			"ProcessId INTEGER,"
 			"Thread VARCHAR(100), "
-			"ThreadId INTEGER," 
+			"ThreadId INTEGER,"
 			"Priority INTEGER,"
 			"Text VARCHAR(100),"
-			"DateTime DATETIME)"; 
+			"DateTime DATETIME)";
 
-		session() << sql, "T_POCO_LOG", now; 
+		session() << sql, "T_POCO_LOG", now;
 		session() << sql, "T_POCO_LOG_ARCHIVE", now;
 
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()"); }
diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.h b/Data/ODBC/testsuite/src/ODBCMySQLTest.h
index c1ea5dc5d..ce1104109 100644
--- a/Data/ODBC/testsuite/src/ODBCMySQLTest.h
+++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.h
@@ -21,8 +21,8 @@
 class ODBCMySQLTest: public ODBCTest
 	/// MySQL ODBC test class
 	/// Tested:
-	/// 
-	/// Driver          | DB                        | OS                                        | Driver Manager 
+	///
+	/// Driver          | DB                        | OS                                        | Driver Manager
 	/// ----------------+---------------------------+-------------------------------------------+---------------------
 	/// 03.51.12.00     | MySQL 5.0.27-community-nt | MS Windows XP Professional x64 v.2003/SP1 | 3.526.3959.0
 	///  3.51.11.-6     | MySQL 5.0.27-community-nt | Ubuntu 7.04 (2.6.20-15-generic #2 SMP)    | unixODBC 2.2.11.-13
@@ -41,7 +41,7 @@ public:
 	void testStoredFunction();
 
 	void testNull();
-	
+
 	void testMultipleResults();
 	void testFilter();
 
diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp
index fc90a070e..29091efe3 100644
--- a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp
@@ -81,7 +81,7 @@ std::string          ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRI
 	"APA=T;" // thread safety (T/F), default T
 	"DBA=W;"; // write access (R/W)
 
-const std::string ODBCOracleTest::MULTI_INSERT = 
+const std::string ODBCOracleTest::MULTI_INSERT =
 	"BEGIN "
 	"INSERT INTO Test VALUES ('1', 2, 3.5);"
 	"INSERT INTO Test VALUES ('2', 3, 4.5);"
@@ -94,7 +94,7 @@ const std::string ODBCOracleTest::MULTI_SELECT =
 	"{CALL multiResultsProcedure()}";
 
 
-ODBCOracleTest::ODBCOracleTest(const std::string& name): 
+ODBCOracleTest::ODBCOracleTest(const std::string& name):
 	ODBCTest(name, _pSession, _pExecutor, _dsn, _uid, _pwd, _connectString)
 {
 }
@@ -139,27 +139,27 @@ void ODBCOracleTest::testBarebone()
 			"OPEN ret5 FOR SELECT * FROM Test WHERE First = '5';"
 			"END multiResultsProcedure;" , now;
 
-	_pExecutor->bareboneODBCMultiResultTest(_connectString, 
-		tableCreateString, 
-		SQLExecutor::PB_IMMEDIATE, 
+	_pExecutor->bareboneODBCMultiResultTest(_connectString,
+		tableCreateString,
+		SQLExecutor::PB_IMMEDIATE,
 		SQLExecutor::DE_MANUAL,
 		MULTI_INSERT,
 		MULTI_SELECT);
-	_pExecutor->bareboneODBCMultiResultTest(_connectString, 
-		tableCreateString, 
-		SQLExecutor::PB_IMMEDIATE, 
+	_pExecutor->bareboneODBCMultiResultTest(_connectString,
+		tableCreateString,
+		SQLExecutor::PB_IMMEDIATE,
 		SQLExecutor::DE_BOUND,
 		MULTI_INSERT,
 		MULTI_SELECT);
-	_pExecutor->bareboneODBCMultiResultTest(_connectString, 
-		tableCreateString, 
-		SQLExecutor::PB_AT_EXEC, 
+	_pExecutor->bareboneODBCMultiResultTest(_connectString,
+		tableCreateString,
+		SQLExecutor::PB_AT_EXEC,
 		SQLExecutor::DE_MANUAL,
 		MULTI_INSERT,
 		MULTI_SELECT);
-	_pExecutor->bareboneODBCMultiResultTest(_connectString, 
-		tableCreateString, 
-		SQLExecutor::PB_AT_EXEC, 
+	_pExecutor->bareboneODBCMultiResultTest(_connectString,
+		tableCreateString,
+		SQLExecutor::PB_AT_EXEC,
 		SQLExecutor::DE_BOUND,
 		MULTI_INSERT,
 		MULTI_SELECT);
@@ -178,7 +178,7 @@ void ODBCOracleTest::testBLOB()
 		executor().blob(maxFldSize);
 		fail ("must fail");
 	}
-	catch (DataException&) 
+	catch (DataException&)
 	{
 		session().setProperty("maxFieldSize", Poco::Any(maxFldSize));
 	}
@@ -277,7 +277,7 @@ void ODBCOracleTest::testStoredProcedure()
 		k += 2;
 	}
 
-	
+
 	//strings only work with auto-binding
 	session().setFeature("autoBind", true);
 
@@ -286,7 +286,7 @@ void ODBCOracleTest::testStoredProcedure()
 		" BEGIN outParam := inParam; "
 		"END storedProcedure;" , now;
 
-	std::string inParam = 
+	std::string inParam =
 		"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
 		"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
 		"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
@@ -342,7 +342,7 @@ void ODBCOracleTest::testStoredProcedureDynamicAny()
 	for (int k = 0; k < 8;)
 	{
 		session().setFeature("autoBind", bindValue(k));
-		
+
 		DynamicAny i = 2;
 		DynamicAny j = 0;
 
@@ -391,15 +391,15 @@ void ODBCOracleTest::testCursorStoredProcedure()
 			" OPEN ret FOR "
 			" SELECT * "
 			" FROM Person "
-			" WHERE Age < ageLimit " 
+			" WHERE Age < ageLimit "
 			" ORDER BY Age DESC; "
 			" END storedCursorProcedure;" , now;
 
 		people.clear();
 		int age = 13;
-		
+
 		*_pSession << "{call storedCursorProcedure(?)}", in(age), into(people), now;
-		
+
 		assertTrue (2 == people.size());
 		assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]);
 		assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]);
@@ -460,7 +460,7 @@ void ODBCOracleTest::testStoredFunction()
 		result = 0;
 		*_pSession << "{? = call storedFunction(?, ?)}", out(result), in(i), out(j), now;
 		assertTrue (4 == j);
-		assertTrue (j == result); 
+		assertTrue (j == result);
 		dropObject("FUNCTION", "storedFunction");
 
 		*_pSession << "CREATE OR REPLACE "
@@ -475,8 +475,8 @@ void ODBCOracleTest::testStoredFunction()
 		*_pSession << "{? = call storedFunction(?, ?)}", out(result), io(i), io(j), now;
 		assertTrue (1 == j);
 		assertTrue (2 == i);
-		assertTrue (3 == result); 
-		
+		assertTrue (3 == result);
+
 		Tuple<int, int> params(1, 2);
 		assertTrue (1 == params.get<0>());
 		assertTrue (2 == params.get<1>());
@@ -484,9 +484,9 @@ void ODBCOracleTest::testStoredFunction()
 		*_pSession << "{? = call storedFunction(?, ?)}", out(result), io(params), now;
 		assertTrue (1 == params.get<1>());
 		assertTrue (2 == params.get<0>());
-		assertTrue (3 == result); 
+		assertTrue (3 == result);
 		dropObject("FUNCTION", "storedFunction");
-		
+
 		k += 2;
 	}
 
@@ -530,16 +530,16 @@ void ODBCOracleTest::testCursorStoredFunction()
 			" OPEN ret FOR "
 			" SELECT * "
 			" FROM Person "
-			" WHERE Age < ageLimit " 
+			" WHERE Age < ageLimit "
 			" ORDER BY Age DESC; "
 			" RETURN ret; "
 			" END storedCursorFunction;" , now;
 
 		people.clear();
 		int age = 13;
-		
+
 		*_pSession << "{call storedCursorFunction(?)}", in(age), into(people), now;
-		
+
 		assertTrue (2 == people.size());
 		assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]);
 		assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]);
@@ -553,7 +553,7 @@ void ODBCOracleTest::testCursorStoredFunction()
 
 		dropObject("TABLE", "Person");
 		dropObject("FUNCTION", "storedCursorFunction");
-		
+
 		k += 2;
 	}
 }
@@ -611,7 +611,7 @@ void ODBCOracleTest::testAutoTransaction()
 	assertTrue (0 == count);
 
 	session().setFeature("autoCommit", false);
-	
+
 	try
 	{
 		AutoTransaction at(session());
@@ -794,14 +794,14 @@ void ODBCOracleTest::recreateNullsTable(const std::string& notNull)
 void ODBCOracleTest::recreateMiscTable()
 {
 	dropObject("TABLE", "MiscTest");
-	try 
-	{ 
+	try
+	{
 		session() << "CREATE TABLE MiscTest "
 			"(First VARCHAR(30),"
 			"Second BLOB,"
 			"Third INTEGER,"
 			"Fourth NUMBER,"
-			"Fifth TIMESTAMP)", now; 
+			"Fifth TIMESTAMP)", now;
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateMiscTable()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateMiscTable()"); }
 }
@@ -812,20 +812,20 @@ void ODBCOracleTest::recreateLogTable()
 	dropObject("TABLE", "T_POCO_LOG");
 	dropObject("TABLE", "T_POCO_LOG_ARCHIVE");
 
-	try 
-	{ 
+	try
+	{
 		std::string sql = "CREATE TABLE %s "
 			"(Source VARCHAR(100),"
 			"Name VARCHAR(100),"
 			"ProcessId INTEGER,"
 			"Thread VARCHAR(100), "
-			"ThreadId INTEGER," 
+			"ThreadId INTEGER,"
 			"Priority INTEGER,"
 			"Text VARCHAR(100),"
-			"DateTime TIMESTAMP)"; 
+			"DateTime TIMESTAMP)";
 
-		session() << sql, "T_POCO_LOG", now; 
-		session() << sql, "T_POCO_LOG_ARCHIVE", now; 
+		session() << sql, "T_POCO_LOG", now;
+		session() << sql, "T_POCO_LOG_ARCHIVE", now;
 
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateLogTable()"); }
diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.h b/Data/ODBC/testsuite/src/ODBCOracleTest.h
index 92a1bbcaf..168710be2 100644
--- a/Data/ODBC/testsuite/src/ODBCOracleTest.h
+++ b/Data/ODBC/testsuite/src/ODBCOracleTest.h
@@ -21,7 +21,7 @@
 class ODBCOracleTest: public ODBCTest
 	/// Oracle ODBC test class
 	/// Tested:
-	/// 
+	///
 	/// Driver		|	DB							| OS
 	/// ------------+-------------------------------+------------------------------------------
 	///	10.02.00.01	| Oracle9i Release 9.2.0.4.0	| MS Windows XP Professional x64 v.2003/SP1
@@ -51,7 +51,7 @@ public:
 
 private:
 	static void testBarebone();
-	
+
 	void dropObject(const std::string& type, const std::string& name);
 	void recreateNullableTable();
 	void recreatePersonTable();
@@ -72,7 +72,7 @@ private:
 
 	static ODBCTest::SessionPtr _pSession;
 	static ODBCTest::ExecPtr    _pExecutor;
-	
+
 	static std::string _driver;
 	static std::string _dsn;
 	static std::string _uid;
diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp
index 2c2f1cf34..81d467b59 100644
--- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp
@@ -75,7 +75,7 @@ std::string          ODBCPostgreSQLTest::_driver = POSTGRESQL_ODBC_DRIVER;
 std::string          ODBCPostgreSQLTest::_dsn = POSTGRESQL_DSN;
 std::string          ODBCPostgreSQLTest::_uid = POSTGRESQL_UID;
 std::string          ODBCPostgreSQLTest::_pwd = POSTGRESQL_PWD;
-std::string ODBCPostgreSQLTest::_connectString = 
+std::string ODBCPostgreSQLTest::_connectString =
 	"DRIVER=" POSTGRESQL_ODBC_DRIVER ";"
 	"DATABASE=" POSTGRESQL_DB ";"
 	"SERVER=" POSTGRESQL_SERVER ";"
@@ -114,7 +114,7 @@ std::string ODBCPostgreSQLTest::_connectString =
 	"ReadOnly=0;";
 
 
-ODBCPostgreSQLTest::ODBCPostgreSQLTest(const std::string& name): 
+ODBCPostgreSQLTest::ODBCPostgreSQLTest(const std::string& name):
 	ODBCTest(name, _pSession, _pExecutor, _dsn, _uid, _pwd, _connectString)
 {
 }
@@ -179,7 +179,7 @@ void ODBCPostgreSQLTest::testBLOB()
 		executor().blob(maxFldSize);
 		fail ("must fail");
 	}
-	catch (DataException&) 
+	catch (DataException&)
 	{
 		session().setProperty("maxFieldSize", Poco::Any(maxFldSize));
 	}
@@ -207,7 +207,7 @@ void ODBCPostgreSQLTest::testStoredFunction()
 		session().setFeature("autoExtract", bindValue(k+1));
 
 		dropObject("FUNCTION", "storedFunction()");
-		try 
+		try
 		{
 			session() << "CREATE FUNCTION storedFunction() RETURNS INTEGER AS '"
 				"BEGIN "
@@ -223,7 +223,7 @@ void ODBCPostgreSQLTest::testStoredFunction()
 		assertTrue (-1 == i);
 		dropObject("FUNCTION", "storedFunction()");
 
-		try 
+		try
 		{
 			session() << "CREATE FUNCTION storedFunction(INTEGER) RETURNS INTEGER AS '"
 				"BEGIN "
@@ -241,7 +241,7 @@ void ODBCPostgreSQLTest::testStoredFunction()
 		dropObject("FUNCTION", "storedFunction(INTEGER)");
 
 		dropObject("FUNCTION", "storedFunction(TIMESTAMP)");
-		try 
+		try
 		{
 			session() << "CREATE FUNCTION storedFunction(TIMESTAMP) RETURNS TIMESTAMP AS '"
 				"BEGIN "
@@ -259,23 +259,23 @@ void ODBCPostgreSQLTest::testStoredFunction()
 		dropObject("FUNCTION", "storedFunction(TIMESTAMP)");
 
 		dropObject("FUNCTION", "storedFunction(TEXT, TEXT)");
-		try 
+		try
 		{
 			session() << "CREATE FUNCTION storedFunction(TEXT,TEXT) RETURNS TEXT AS '"
 				"BEGIN "
 				" RETURN $1 || '', '' || $2 || ''!'';"
 				"END;'"
-				"LANGUAGE 'plpgsql'" , now; 
+				"LANGUAGE 'plpgsql'" , now;
 		}
 		catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (func); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (func); }
-		
+
 		std::string param1 = "Hello";
 		std::string param2 = "world";
 		std::string ret;
-		try 
+		try
 		{
-			session() << "{? = call storedFunction(?,?)}", out(ret), in(param1), in(param2), now; 
+			session() << "{? = call storedFunction(?,?)}", out(ret), in(param1), in(param2), now;
 		}
 		catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (func); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (func); }
@@ -346,13 +346,13 @@ void ODBCPostgreSQLTest::configurePLPgSQL()
 			"RETURNS OPAQUE "
 			"AS '%splpgsql.dll' "
 			"LANGUAGE 'C';", _libDir), now;
-		
+
 		session() << "CREATE LANGUAGE 'plpgsql' "
 			"HANDLER plpgsql_call_handler "
 			"LANCOMPILER 'PL/pgSQL'", now;
 
-	}catch(StatementException& ex) 
-	{  
+	}catch(StatementException& ex)
+	{
 		if (1 != ex.diagnostics().nativeError(0))
 			throw;
 	}
@@ -522,15 +522,15 @@ void ODBCPostgreSQLTest::recreateBoolTable()
 void ODBCPostgreSQLTest::recreateMiscTable()
 {
 	dropObject("TABLE", "MiscTest");
-	try 
-	{ 
+	try
+	{
 		// Mammoth does not bind columns properly
 		session() << "CREATE TABLE MiscTest "
 			"(First VARCHAR(30),"
 			"Second BYTEA,"
 			"Third INTEGER,"
 			"Fourth FLOAT,"
-			"Fifth TIMESTAMP)", now; 
+			"Fifth TIMESTAMP)", now;
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateMiscTable()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateMiscTable()"); }
 }
@@ -541,20 +541,20 @@ void ODBCPostgreSQLTest::recreateLogTable()
 	dropObject("TABLE", "T_POCO_LOG");
 	dropObject("TABLE", "T_POCO_LOG_ARCHIVE");
 
-	try 
-	{ 
+	try
+	{
 		std::string sql = "CREATE TABLE %s "
 			"(Source VARCHAR,"
 			"Name VARCHAR,"
 			"ProcessId INTEGER,"
 			"Thread VARCHAR, "
-			"ThreadId INTEGER," 
+			"ThreadId INTEGER,"
 			"Priority INTEGER,"
 			"Text VARCHAR,"
-			"DateTime TIMESTAMP)"; 
+			"DateTime TIMESTAMP)";
 
-		session() << sql, "T_POCO_LOG", now; 
-		session() << sql, "T_POCO_LOG_ARCHIVE", now; 
+		session() << sql, "T_POCO_LOG", now;
+		session() << sql, "T_POCO_LOG_ARCHIVE", now;
 
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateLogTable()"); }
diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h
index 072d670b7..37b47a7b9 100644
--- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h
+++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h
@@ -25,15 +25,15 @@
 class ODBCPostgreSQLTest: public ODBCTest
 	/// PostgreSQL ODBC test class
 	/// Tested:
-	/// 
+	///
 	/// Driver		   |	DB                | OS                                        | Driver Manager     |Notes
 	/// ---------------+----------------------+-------------------------------------------+--------------------+--------------------------
 	///	07.03.02.60	   | PostgreSQL 7.4.6     | MS Windows XP Professional x64 v.2003/SP1 | 3.526.3959.0       | BLOB fails (missing 'lo')
 	/// 08.01.02.00    | PostgreSQL 8.1.5-1   | MS Windows XP Professional x64 v.2003/SP1 | 3.526.3959.0       |
 	/// 1:08.01.0200-2 | PostgreSQL 8.1.5-1   | Ubuntu 7.04 (2.6.20-15-generic #2 SMP)    | unixODBC 2.2.11.-13|
-	/// Mammoth ODBCng |                      |                                           |                    | 
+	/// Mammoth ODBCng |                      |                                           |                    |
 	/// (0.99.00.122)  | PostgreSQL 8.1.5-1   | MS Windows XP Professional x64 v.2003/SP1 | 3.526.3959.0       |
-	/// 
+	///
 {
 public:
 	ODBCPostgreSQLTest(const std::string& name);
@@ -71,8 +71,8 @@ private:
 
 	void configurePLPgSQL();
 		/// Configures PL/pgSQL in the database. A reasonable defaults
-		/// for the interpreter location on WIN32 and POSIX platforms are 
-		/// supplied (see installDir member variable). 
+		/// for the interpreter location on WIN32 and POSIX platforms are
+		/// supplied (see installDir member variable).
 		/// If these do not work, user must determine the proper location,
 		/// modify the function and recompile.
 		/// Alternative is direct database configuration for PL/pgSQL usage.
diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp
index 3e09f01d7..97a6c919f 100644
--- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp
@@ -107,7 +107,7 @@ std::string ODBCSQLServerTest::_connectString = "DRIVER=" MS_SQL_SERVER_ODBC_DRI
 	;
 
 
-ODBCSQLServerTest::ODBCSQLServerTest(const std::string& name): 
+ODBCSQLServerTest::ODBCSQLServerTest(const std::string& name):
 	ODBCTest(name, _pSession, _pExecutor, _dsn, _uid, _pwd, _connectString)
 {
 }
@@ -128,13 +128,13 @@ void ODBCSQLServerTest::testBareboneODBC()
 		"Fifth FLOAT,"
 		"Sixth DATETIME)";
 
-	executor().bareboneODBCTest(dbConnString(), tableCreateString, 
+	executor().bareboneODBCTest(dbConnString(), tableCreateString,
 		SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_MANUAL, true, "CONVERT(VARBINARY(30),?)");
-	executor().bareboneODBCTest(dbConnString(), tableCreateString, 
+	executor().bareboneODBCTest(dbConnString(), tableCreateString,
 		SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_BOUND, true, "CONVERT(VARBINARY(30),?)");
-	executor().bareboneODBCTest(dbConnString(), tableCreateString, 
+	executor().bareboneODBCTest(dbConnString(), tableCreateString,
 		SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_MANUAL, true, "CONVERT(VARBINARY(30),?)");
-	executor().bareboneODBCTest(dbConnString(), tableCreateString, 
+	executor().bareboneODBCTest(dbConnString(), tableCreateString,
 		SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_BOUND, true, "CONVERT(VARBINARY(30),?)");
 
 	tableCreateString = "CREATE TABLE Test "
@@ -255,7 +255,7 @@ void ODBCSQLServerTest::testStoredProcedure()
 			"SET @outParam = -1; "
 			"END;"
 		, now;
-		
+
 		int i = 0;
 		session() << "{call storedProcedure(?)}", out(i), now;
 		assertTrue (-1 == i);
@@ -298,8 +298,8 @@ void ODBCSQLServerTest::testStoredProcedure()
 	}
 /*TODO - currently fails with following error:
 
-[Microsoft][ODBC SQL Server Driver][SQL Server]Invalid parameter 
-2 (''):  Data type 0x23 is a deprecated large object, or LOB, but is marked as output parameter.  
+[Microsoft][ODBC SQL Server Driver][SQL Server]Invalid parameter
+2 (''):  Data type 0x23 is a deprecated large object, or LOB, but is marked as output parameter.
 Deprecated types are not supported as output parameters.  Use current large object types instead.
 
 	session().setFeature("autoBind", true);
@@ -340,16 +340,16 @@ void ODBCSQLServerTest::testCursorStoredProcedure()
 			"BEGIN "
 			" SELECT * "
 			" FROM Person "
-			" WHERE Age < @ageLimit " 
+			" WHERE Age < @ageLimit "
 			" ORDER BY Age DESC; "
 			"END;"
 		, now;
 
 		people.clear();
 		int age = 13;
-		
+
 		session() << "{call storedCursorProcedure(?)}", in(age), into(people), now;
-		
+
 		assertTrue (2 == people.size());
 		assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]);
 		assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]);
@@ -410,7 +410,7 @@ void ODBCSQLServerTest::testStoredProcedureDynamicAny()
 	for (int k = 0; k < 8;)
 	{
 		session().setFeature("autoBind", bindValue(k));
-		
+
 		DynamicAny i = 2;
 		DynamicAny j = 0;
 
@@ -507,7 +507,7 @@ void ODBCSQLServerTest::testStoredFunction()
 		session() << "{? = call storedFunction(?, ?)}", out(result), io(i), io(j), now;
 		assertTrue (1 == j);
 		assertTrue (2 == i);
-		assertTrue (3 == result); 
+		assertTrue (3 == result);
 
 		Tuple<int, int> params(1, 2);
 		assertTrue (1 == params.get<0>());
@@ -516,7 +516,7 @@ void ODBCSQLServerTest::testStoredFunction()
 		session() << "{? = call storedFunction(?, ?)}", out(result), io(params), now;
 		assertTrue (1 == params.get<1>());
 		assertTrue (2 == params.get<0>());
-		assertTrue (3 == result); 
+		assertTrue (3 == result);
 
 		dropObject("PROCEDURE", "storedFunction");
 
@@ -684,15 +684,15 @@ void ODBCSQLServerTest::recreateBoolTable()
 void ODBCSQLServerTest::recreateMiscTable()
 {
 	dropObject("TABLE", "MiscTest");
-	try 
-	{ 
+	try
+	{
 		session() << "CREATE TABLE MiscTest "
 			"(First VARCHAR(30),"
 			"Second VARBINARY(30),"
 			"Third INTEGER,"
 			"Fourth FLOAT,"
 			"Fifth DATETIME,"
-			"Sixth BIT)", now; 
+			"Sixth BIT)", now;
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateMiscTable()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateMiscTable()"); }
 }
@@ -703,20 +703,20 @@ void ODBCSQLServerTest::recreateLogTable()
 	dropObject("TABLE", "T_POCO_LOG");
 	dropObject("TABLE", "T_POCO_LOG_ARCHIVE");
 
-	try 
-	{ 
+	try
+	{
 		std::string sql = "CREATE TABLE %s "
 			"(Source VARCHAR(max),"
 			"Name VARCHAR(max),"
 			"ProcessId INTEGER,"
 			"Thread VARCHAR(max), "
-			"ThreadId INTEGER," 
+			"ThreadId INTEGER,"
 			"Priority INTEGER,"
 			"Text VARCHAR(max),"
 			"DateTime DATETIME)";
 
-		session() << sql, "T_POCO_LOG", now; 
-		session() << sql, "T_POCO_LOG_ARCHIVE", now; 
+		session() << sql, "T_POCO_LOG", now;
+		session() << sql, "T_POCO_LOG_ARCHIVE", now;
 
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateLogTable()"); }
diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.h b/Data/ODBC/testsuite/src/ODBCSQLServerTest.h
index d0c8b425b..40de51413 100644
--- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.h
+++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.h
@@ -25,7 +25,7 @@
 class ODBCSQLServerTest: public ODBCTest
 	/// SQLServer ODBC test class
 	/// Tested:
-	/// 
+	///
 	/// Driver				|	DB								| OS
 	/// --------------------+-----------------------------------+------------------------------------------
 	/// 2000.86.1830.00		| SQL Server Express 9.0.2047		| MS Windows XP Professional x64 v.2003/SP1
@@ -48,7 +48,7 @@ public:
 	void testCursorStoredProcedure();
 	void testStoredProcedureAny();
 	void testStoredProcedureDynamicAny();
-	
+
 	void testStoredFunction();
 
 	static CppUnit::Test* suite();
diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp
index 645a9a8b9..61b4bcf60 100644
--- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp
@@ -45,11 +45,11 @@ std::string          ODBCSQLiteTest::_driver = SQLITE_ODBC_DRIVER;
 std::string          ODBCSQLiteTest::_dsn = SQLITE_DSN;
 std::string          ODBCSQLiteTest::_uid = "";
 std::string          ODBCSQLiteTest::_pwd = "";
-std::string          ODBCSQLiteTest::_connectString = "Driver=" SQLITE_ODBC_DRIVER 
+std::string          ODBCSQLiteTest::_connectString = "Driver=" SQLITE_ODBC_DRIVER
 	";Database=" SQLITE_DB ";";
 
 
-ODBCSQLiteTest::ODBCSQLiteTest(const std::string& name): 
+ODBCSQLiteTest::ODBCSQLiteTest(const std::string& name):
 	ODBCTest(name, _pSession, _pExecutor, _dsn, _uid, _pwd, _connectString)
 {
 }
@@ -116,7 +116,7 @@ void ODBCSQLiteTest::testAffectedRows()
 		// why "WHERE 1" is necessary here
 		_pExecutor->affectedRows("WHERE 1");
 		i += 2;
-	}	
+	}
 }
 
 
@@ -156,7 +156,7 @@ void ODBCSQLiteTest::dropObject(const std::string& type, const std::string& name
 			}
 		}
 
-		if (!ignoreError) 
+		if (!ignoreError)
 		{
 			std::cout << ex.toString() << std::endl;
 			throw;
@@ -273,15 +273,15 @@ void ODBCSQLiteTest::recreateNullsTable(const std::string& notNull)
 void ODBCSQLiteTest::recreateMiscTable()
 {
 	dropObject("TABLE", "MiscTest");
-	try 
-	{ 
+	try
+	{
 		// SQLite fails with BLOB bulk operations
 		session() << "CREATE TABLE MiscTest "
 			"(First VARCHAR(30),"
 			//"Second BLOB,"
 			"Third INTEGER,"
 			"Fourth REAL,"
-			"Fifth DATETIME)", now; 
+			"Fifth DATETIME)", now;
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateMiscTable()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateMiscTable()"); }
 }
@@ -292,20 +292,20 @@ void ODBCSQLiteTest::recreateLogTable()
 	dropObject("TABLE", "T_POCO_LOG");
 	dropObject("TABLE", "T_POCO_LOG_ARCHIVE");
 
-	try 
-	{ 
+	try
+	{
 		std::string sql = "CREATE TABLE %s "
 			"(Source VARCHAR,"
 			"Name VARCHAR,"
 			"ProcessId INTEGER,"
 			"Thread VARCHAR, "
-			"ThreadId INTEGER," 
+			"ThreadId INTEGER,"
 			"Priority INTEGER,"
 			"Text VARCHAR,"
 			"DateTime DATETIME)";
 
-		session() << sql, "T_POCO_LOG", now; 
-		session() << sql, "T_POCO_LOG_ARCHIVE", now; 
+		session() << sql, "T_POCO_LOG", now;
+		session() << sql, "T_POCO_LOG_ARCHIVE", now;
 
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateLogTable()"); }
diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.h b/Data/ODBC/testsuite/src/ODBCSQLiteTest.h
index 83a6d1ed6..b878c1574 100644
--- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.h
+++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.h
@@ -21,7 +21,7 @@
 class ODBCSQLiteTest: public ODBCTest
 	/// SQLite3 ODBC test class
 	/// Tested:
-	/// 
+	///
 	/// Driver		|	DB			| OS
 	/// ------------+---------------+------------------------------------------
 	///	00.70.00.00	| SQLite 3.*	| MS Windows XP Professional x64 v.2003/SP1
diff --git a/Data/ODBC/testsuite/src/ODBCTest.cpp b/Data/ODBC/testsuite/src/ODBCTest.cpp
index 555e7a126..6d5e98b7b 100644
--- a/Data/ODBC/testsuite/src/ODBCTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCTest.cpp
@@ -49,7 +49,7 @@ using Poco::NotFoundException;
 
 
 ODBCTest::Drivers ODBCTest::_drivers;
-const bool        ODBCTest::_bindValues[8] = 
+const bool        ODBCTest::_bindValues[8] =
 	{true, true, true, false, false, true, false, false};
 
 
@@ -59,7 +59,7 @@ ODBCTest::ODBCTest(const std::string& name,
 	std::string& rDSN,
 	std::string& rUID,
 	std::string& rPwd,
-	std::string& rConnectString): 
+	std::string& rConnectString):
 	CppUnit::TestCase(name),
 	_pSession(pSession),
 	_pExecutor(pExecutor),
@@ -212,7 +212,7 @@ void ODBCTest::testInsertVector()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->insertVector();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -227,7 +227,7 @@ void ODBCTest::testInsertEmptyVector()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->insertEmptyVector();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -257,7 +257,7 @@ void ODBCTest::testComplexTypeList()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->complexTypeList();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -272,7 +272,7 @@ void ODBCTest::testInsertList()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->insertList();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -287,7 +287,7 @@ void ODBCTest::testInsertEmptyList()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->insertEmptyList();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -317,7 +317,7 @@ void ODBCTest::testComplexTypeDeque()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->complexTypeDeque();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -332,7 +332,7 @@ void ODBCTest::testInsertDeque()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->insertDeque();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -347,7 +347,7 @@ void ODBCTest::testInsertEmptyDeque()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->insertEmptyDeque();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -362,7 +362,7 @@ void ODBCTest::testAffectedRows()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->affectedRows();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -377,7 +377,7 @@ void ODBCTest::testInsertSingleBulk()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->insertSingleBulk();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -392,7 +392,7 @@ void ODBCTest::testInsertSingleBulkVec()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->insertSingleBulkVec();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -422,7 +422,7 @@ void ODBCTest::testLimitZero()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->limitZero();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -432,7 +432,7 @@ void ODBCTest::testLimitOnce()
 
 	recreateIntsTable();
 	_pExecutor->limitOnce();
-	
+
 }
 
 
@@ -579,7 +579,7 @@ void ODBCTest::testMultiSetComplex()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->multiSetComplex();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -654,7 +654,7 @@ void ODBCTest::testSelectIntoSingleStep()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->selectIntoSingleStep();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -669,7 +669,7 @@ void ODBCTest::testSelectIntoSingleFail()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->selectIntoSingleFail();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -684,7 +684,7 @@ void ODBCTest::testLowerLimitOk()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->lowerLimitOk();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -699,7 +699,7 @@ void ODBCTest::testSingleSelect()
 		_pSession->setFeature("autoExtract", bindValue(i+1));
 		_pExecutor->singleSelect();
 		i += 2;
-	}	
+	}
 }
 
 
@@ -1300,13 +1300,13 @@ bool ODBCTest::canConnect(const std::string& driver,
 	{
 		if (((itDrv->first).find(driver) != std::string::npos))
 		{
-			std::cout << "Driver found: " << itDrv->first 
+			std::cout << "Driver found: " << itDrv->first
 				<< " (" << itDrv->second << ')' << std::endl;
 			break;
 		}
 	}
 
-	if (_drivers.end() == itDrv) 
+	if (_drivers.end() == itDrv)
 	{
 		dsn = "";
 		uid = "";
@@ -1365,7 +1365,7 @@ ODBCTest::SessionPtr ODBCTest::init(const std::string& driver,
 {
 	Utility::drivers(_drivers);
 	if (!canConnect(driver, dsn, uid, pwd, dbConnString, db)) return 0;
-	
+
 	try
 	{
 		std::cout << "Conecting to [" << dbConnString << ']' << std::endl;
diff --git a/Data/ODBC/testsuite/src/ODBCTest.h b/Data/ODBC/testsuite/src/ODBCTest.h
index 456031e0f..1971e6db9 100644
--- a/Data/ODBC/testsuite/src/ODBCTest.h
+++ b/Data/ODBC/testsuite/src/ODBCTest.h
@@ -221,38 +221,38 @@ private:
 // inlines
 //
 
-inline void ODBCTest::testStoredProcedure() 
-{ 
+inline void ODBCTest::testStoredProcedure()
+{
 	throw Poco::NotImplementedException("ODBCTest::testStoredProcedure()");
 }
 
 
-inline void ODBCTest::testStoredProcedureAny() 
-{ 
+inline void ODBCTest::testStoredProcedureAny()
+{
 	throw Poco::NotImplementedException("ODBCTest::testStoredProcedureAny()");
 }
 
 
-inline void ODBCTest::testStoredProcedureDynamicAny() 
-{ 
+inline void ODBCTest::testStoredProcedureDynamicAny()
+{
 	throw Poco::NotImplementedException("ODBCTest::testStoredProcedureDynamicAny()");
 }
 
 
-inline void ODBCTest::testStoredFunction() 
-{ 
+inline void ODBCTest::testStoredFunction()
+{
 	throw Poco::NotImplementedException("ODBCTest::testStoredFunction()");
 }
 
 
-inline void ODBCTest::testStoredFunctionAny() 
-{ 
+inline void ODBCTest::testStoredFunctionAny()
+{
 	throw Poco::NotImplementedException("ODBCTest::testStoredFunctionAny()");
 }
 
 
-inline void ODBCTest::testStoredFunctionDynamicAny() 
-{ 
+inline void ODBCTest::testStoredFunctionDynamicAny()
+{
 	throw Poco::NotImplementedException("ODBCTest::testStoredFunctionDynamicAny()");
 }
 
@@ -264,109 +264,109 @@ inline void ODBCTest::dropObject(const std::string& type, const std::string& nam
 
 
 inline void ODBCTest::recreateNullableTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateNullableTable()");
 }
 
 
 inline void ODBCTest::recreatePersonTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreatePersonTable()");
 }
 
 
 inline void ODBCTest::recreatePersonTupleTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreatePersonTupleTable()");
 }
 
 
 inline void ODBCTest::recreatePersonBLOBTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreatePersonBLOBTable()");
 }
 
 
 inline void ODBCTest::recreatePersonDateTimeTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreatePersonDateTimeTable()");
 }
 
 
 inline void ODBCTest::recreatePersonDateTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreatePersonDateTable()");
 }
 
 
 inline void ODBCTest::recreatePersonTimeTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreatePersonTimeTable()");
 }
 
 
 inline void ODBCTest::recreateStringsTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateStringsTable()");
 }
 
 
 inline void ODBCTest::recreateIntsTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateIntsTable()");
 }
 
 
 inline void ODBCTest::recreateFloatsTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateFloatsTable()");
 }
 
 
 inline void ODBCTest::recreateUUIDsTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateUUIDsTable()");
 }
 
 
 inline void ODBCTest::recreateTuplesTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateTuplesTable()");
 }
 
 
 inline void ODBCTest::recreateVectorsTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateVectorsTable()");
 }
 
 
 inline void ODBCTest::recreateAnysTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateAnysTable()");
 }
 
 
 inline void ODBCTest::recreateNullsTable(const std::string&)
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateNullsTable()");
 }
 
 
 inline void ODBCTest::recreateBoolTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateBoolTable()");
 }
 
 
 inline void ODBCTest::recreateMiscTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateMiscTable()");
 }
 
 
 inline void ODBCTest::recreateLogTable()
-{ 
+{
 	throw Poco::NotImplementedException("ODBCTest::recreateLogTable()");
 }
 
@@ -383,48 +383,48 @@ inline void ODBCTest::recreateEncodingTables()
 }
 
 
-inline bool ODBCTest::bindValue(int i) 
-{ 
+inline bool ODBCTest::bindValue(int i)
+{
 	poco_assert (i < 8);
-	return _bindValues[i]; 
+	return _bindValues[i];
 }
 
 
-inline Poco::Data::Session& ODBCTest::session() 
-{ 
+inline Poco::Data::Session& ODBCTest::session()
+{
 	poco_check_ptr (_pSession);
-	return *_pSession; 
+	return *_pSession;
 }
 
 
-inline SQLExecutor& ODBCTest::executor() 
-{ 
+inline SQLExecutor& ODBCTest::executor()
+{
 	poco_check_ptr (_pExecutor);
-	return *_pExecutor; 
+	return *_pExecutor;
 }
 
 
-inline const std::string& ODBCTest::dsn() 
-{ 
-	return _rDSN; 
+inline const std::string& ODBCTest::dsn()
+{
+	return _rDSN;
 }
 
 
-inline const std::string& ODBCTest::uid() 
-{ 
-	return _rUID; 
+inline const std::string& ODBCTest::uid()
+{
+	return _rUID;
 }
 
 
-inline const std::string& ODBCTest::pwd() 
-{ 
-	return _rPwd; 
+inline const std::string& ODBCTest::pwd()
+{
+	return _rPwd;
 }
 
 
-inline const std::string& ODBCTest::dbConnString() 
-{ 
-	return _rConnectString; 
+inline const std::string& ODBCTest::dbConnString()
+{
+	return _rConnectString;
 }
 
 
diff --git a/Data/ODBC/testsuite/src/ODBCTestSuite.cpp b/Data/ODBC/testsuite/src/ODBCTestSuite.cpp
index 64e508e62..d9d418a6b 100644
--- a/Data/ODBC/testsuite/src/ODBCTestSuite.cpp
+++ b/Data/ODBC/testsuite/src/ODBCTestSuite.cpp
@@ -26,15 +26,15 @@ CppUnit::Test* ODBCTestSuite::suite()
 
 	// WARNING!
 	// On Win XP Pro, the PostgreSQL connection fails if attempted after DB2 w/ following error:
-	// 
-	// sqlState="IM003" 
-	// message="Specified driver could not be loaded due to system error  127 (PostgreSQL ANSI)." 
-	// nativeError=160 
+	//
+	// sqlState="IM003"
+	// message="Specified driver could not be loaded due to system error  127 (PostgreSQL ANSI)."
+	// nativeError=160
 	// System error 127 is "The specified procedure could not be found."
 	// This problem does not manifest with Mammoth ODBCng PostgreSQL driver.
 	//
 	// Oracle tests do not exit cleanly if Oracle driver is loaded after DB2.
-	// 
+	//
 	// For the time being, the workaround is to connect to DB2 after connecting to PostgreSQL and Oracle.
 
 	addTest(pSuite, ODBCMySQLTest::suite());
diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp
index 9fb26cb6b..84f44c7aa 100644
--- a/Data/ODBC/testsuite/src/SQLExecutor.cpp
+++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp
@@ -180,9 +180,9 @@ template <>
 class TypeHandler<Person>
 {
 public:
-	static void bind(std::size_t pos, 
-		const Person& obj, 
-		AbstractBinder::Ptr pBinder, 
+	static void bind(std::size_t pos,
+		const Person& obj,
+		AbstractBinder::Ptr pBinder,
 		AbstractBinder::Direction dir = AbstractBinder::PD_IN)
 	{
 		// the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3))
@@ -231,9 +231,9 @@ template <>
 class TypeHandler<RefCountedPerson>
 {
 public:
-	static void bind(std::size_t pos, 
-		const RefCountedPerson& obj, 
-		AbstractBinder::Ptr pBinder, 
+	static void bind(std::size_t pos,
+		const RefCountedPerson& obj,
+		AbstractBinder::Ptr pBinder,
 		AbstractBinder::Direction dir = AbstractBinder::PD_IN)
 	{
 		// the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3))
@@ -281,7 +281,7 @@ private:
 } } // namespace Poco::Data
 
 
-const std::string SQLExecutor::MULTI_INSERT = 
+const std::string SQLExecutor::MULTI_INSERT =
 	"INSERT INTO Test VALUES ('1', 2, 3.5);"
 	"INSERT INTO Test VALUES ('2', 3, 4.5);"
 	"INSERT INTO Test VALUES ('3', 4, 5.5);"
@@ -309,9 +309,9 @@ SQLExecutor::~SQLExecutor()
 }
 
 
-void SQLExecutor::bareboneODBCTest(const std::string& dbConnString, 
-	const std::string& tableCreateString, 
-	SQLExecutor::DataBinding bindMode, 
+void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
+	const std::string& tableCreateString,
+	SQLExecutor::DataBinding bindMode,
 	SQLExecutor::DataExtraction extractMode,
 	bool doTime,
 	const std::string& blobPlaceholder)
@@ -349,7 +349,7 @@ void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
 
 		rc = SQLGetTypeInfo(hstmt, SQL_TYPE_TIMESTAMP);
 		poco_odbc_check_stmt (rc, hstmt);
-		
+
 		rc = SQLFetch(hstmt);
 		assertTrue (SQL_SUCCEEDED(rc) || SQL_NO_DATA == rc);
 
@@ -414,15 +414,15 @@ void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
 			if (SQLExecutor::PB_AT_EXEC == bindMode)
 				li[0] = SQL_LEN_DATA_AT_EXEC(size);
 
-			rc = SQLBindParameter(hstmt, 
-				(SQLUSMALLINT) 1, 
-				SQL_PARAM_INPUT, 
-				SQL_C_CHAR, 
-				SQL_LONGVARCHAR, 
+			rc = SQLBindParameter(hstmt,
+				(SQLUSMALLINT) 1,
+				SQL_PARAM_INPUT,
+				SQL_C_CHAR,
+				SQL_LONGVARCHAR,
 				(SQLUINTEGER) size,
 				0,
-				(SQLPOINTER) str[0].c_str(), 
-				size, 
+				(SQLPOINTER) str[0].c_str(),
+				size,
 				&li[0]);
 			poco_odbc_check_stmt (rc, hstmt);
 
@@ -431,15 +431,15 @@ void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
 				li[1] = SQL_LEN_DATA_AT_EXEC(size);
 			else li[1] = SQL_NTS;
 
-			rc = SQLBindParameter(hstmt, 
-				(SQLUSMALLINT) 2, 
-				SQL_PARAM_INPUT, 
-				SQL_C_CHAR, 
-				SQL_LONGVARCHAR, 
+			rc = SQLBindParameter(hstmt,
+				(SQLUSMALLINT) 2,
+				SQL_PARAM_INPUT,
+				SQL_C_CHAR,
+				SQL_LONGVARCHAR,
 				(SQLUINTEGER) size,
 				0,
-				(SQLPOINTER) str[1].c_str(), 
-				size, 
+				(SQLPOINTER) str[1].c_str(),
+				size,
 				&li[1]);
 			poco_odbc_check_stmt (rc, hstmt);
 
@@ -448,39 +448,39 @@ void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
 				li[2] = SQL_LEN_DATA_AT_EXEC(size);
 			else li[2] = size;
 
-			rc = SQLBindParameter(hstmt, 
-				(SQLUSMALLINT) 3, 
-				SQL_PARAM_INPUT, 
-				SQL_C_BINARY, 
-				SQL_LONGVARBINARY, 
+			rc = SQLBindParameter(hstmt,
+				(SQLUSMALLINT) 3,
+				SQL_PARAM_INPUT,
+				SQL_C_BINARY,
+				SQL_LONGVARBINARY,
 				(SQLUINTEGER) size,
 				0,
-				(SQLPOINTER) str[2].data(), 
-				size, 
+				(SQLPOINTER) str[2].data(),
+				size,
 				&li[2]);
 			poco_odbc_check_stmt (rc, hstmt);
 
-			rc = SQLBindParameter(hstmt, 
-				(SQLUSMALLINT) 4, 
-				SQL_PARAM_INPUT, 
-				SQL_C_SLONG, 
-				SQL_INTEGER, 
+			rc = SQLBindParameter(hstmt,
+				(SQLUSMALLINT) 4,
+				SQL_PARAM_INPUT,
+				SQL_C_SLONG,
+				SQL_INTEGER,
 				0,
 				0,
-				(SQLPOINTER) &fourth, 
-				0, 
+				(SQLPOINTER) &fourth,
+				0,
 				0);
 			poco_odbc_check_stmt (rc, hstmt);
 
-			rc = SQLBindParameter(hstmt, 
-				(SQLUSMALLINT) 5, 
-				SQL_PARAM_INPUT, 
-				SQL_C_FLOAT, 
-				SQL_REAL, 
+			rc = SQLBindParameter(hstmt,
+				(SQLUSMALLINT) 5,
+				SQL_PARAM_INPUT,
+				SQL_C_FLOAT,
+				SQL_REAL,
 				0,
 				1,
-				(SQLPOINTER) &fifth, 
-				0, 
+				(SQLPOINTER) &fifth,
+				0,
 				0);
 			poco_odbc_check_stmt (rc, hstmt);
 
@@ -499,14 +499,14 @@ void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
 			else
 				std::cerr << '[' << name() << ']' << " Warning: could not get SQL_TYPE_TIMESTAMP parameter description." << std::endl;
 
-			rc = SQLBindParameter(hstmt, 
-				(SQLUSMALLINT) 6, 
-				SQL_PARAM_INPUT, 
-				SQL_C_TYPE_TIMESTAMP, 
-				SQL_TYPE_TIMESTAMP, 
+			rc = SQLBindParameter(hstmt,
+				(SQLUSMALLINT) 6,
+				SQL_PARAM_INPUT,
+				SQL_C_TYPE_TIMESTAMP,
+				SQL_TYPE_TIMESTAMP,
 				dateTimeColSize,
 				dateTimeDecDigits,
-				(SQLPOINTER) &sixth, 
+				(SQLPOINTER) &sixth,
 				0,
 				0);
 			poco_odbc_check_stmt (rc, hstmt);
@@ -520,9 +520,9 @@ void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
 				while (SQL_NEED_DATA == (rc = SQLParamData(hstmt, &pParam)))
 				{
 					SQLINTEGER dataSize = 0;
-					// Data size should be ignored for non-null, 
-					// non-variable length fields, but SQLite ODBC 
-					// driver insists on it always being the actual 
+					// Data size should be ignored for non-null,
+					// non-variable length fields, but SQLite ODBC
+					// driver insists on it always being the actual
 					// data length
 
 					if (pParam == (SQLPOINTER) str[0].c_str())
@@ -558,55 +558,55 @@ void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
 
 			if (SQLExecutor::DE_BOUND == extractMode)
 			{
-				rc = SQLBindCol(hstmt, 
-					(SQLUSMALLINT) 1, 
-					SQL_C_CHAR, 
-					(SQLPOINTER) chr[0], 
-					(SQLINTEGER) sizeof(chr[0]), 
+				rc = SQLBindCol(hstmt,
+					(SQLUSMALLINT) 1,
+					SQL_C_CHAR,
+					(SQLPOINTER) chr[0],
+					(SQLINTEGER) sizeof(chr[0]),
 					&lengths[0]);
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLBindCol(hstmt, 
-					(SQLUSMALLINT) 2, 
-					SQL_C_CHAR, 
-					(SQLPOINTER) chr[1], 
-					(SQLINTEGER) sizeof(chr[1]), 
+				rc = SQLBindCol(hstmt,
+					(SQLUSMALLINT) 2,
+					SQL_C_CHAR,
+					(SQLPOINTER) chr[1],
+					(SQLINTEGER) sizeof(chr[1]),
 					&lengths[1]);
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLBindCol(hstmt, 
-					(SQLUSMALLINT) 3, 
-					SQL_C_BINARY, 
-					(SQLPOINTER) chr[2], 
-					(SQLINTEGER) sizeof(chr[2]), 
+				rc = SQLBindCol(hstmt,
+					(SQLUSMALLINT) 3,
+					SQL_C_BINARY,
+					(SQLPOINTER) chr[2],
+					(SQLINTEGER) sizeof(chr[2]),
 					&lengths[2]);
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLBindCol(hstmt, 
-					(SQLUSMALLINT) 4, 
-					SQL_C_SLONG, 
-					(SQLPOINTER) &fourth, 
-					(SQLINTEGER) 0, 
+				rc = SQLBindCol(hstmt,
+					(SQLUSMALLINT) 4,
+					SQL_C_SLONG,
+					(SQLPOINTER) &fourth,
+					(SQLINTEGER) 0,
 					&lengths[3]);
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLBindCol(hstmt, 
-					(SQLUSMALLINT) 5, 
-					SQL_C_FLOAT, 
-					(SQLPOINTER) &fifth, 
-					(SQLINTEGER) 0, 
+				rc = SQLBindCol(hstmt,
+					(SQLUSMALLINT) 5,
+					SQL_C_FLOAT,
+					(SQLPOINTER) &fifth,
+					(SQLINTEGER) 0,
 					&lengths[4]);
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLBindCol(hstmt, 
-					(SQLUSMALLINT) 6, 
-					SQL_C_TYPE_TIMESTAMP, 
-					(SQLPOINTER) &sixth, 
-					(SQLINTEGER) 0, 
+				rc = SQLBindCol(hstmt,
+					(SQLUSMALLINT) 6,
+					SQL_C_TYPE_TIMESTAMP,
+					(SQLPOINTER) &sixth,
+					(SQLINTEGER) 0,
 					&lengths[5]);
 				poco_odbc_check_stmt (rc, hstmt);
 			}
-			
+
 			rc = SQLExecute(hstmt);
 			poco_odbc_check_stmt (rc, hstmt);
 			rc = SQLFetch(hstmt);
@@ -615,67 +615,67 @@ void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
 			if (SQLExecutor::DE_MANUAL == extractMode)
 			{
 				SQLLEN len = lengths[0] = 0;
-				while (SQL_SUCCESS_WITH_INFO == (rc = SQLGetData(hstmt, 
-					(SQLUSMALLINT) 1, 
-					SQL_C_CHAR, 
-					chr[0] + len, 
+				while (SQL_SUCCESS_WITH_INFO == (rc = SQLGetData(hstmt,
+					(SQLUSMALLINT) 1,
+					SQL_C_CHAR,
+					chr[0] + len,
 					sizeof(chr[0]) - len,
 					&lengths[0])))
 				{
 					len += lengths[0];
-					if (!lengths[0] || len >= sizeof(chr[1])) 
+					if (!lengths[0] || len >= sizeof(chr[1]))
 						break;
 				}
 				poco_odbc_check_stmt (rc, hstmt);
 
 				len = lengths[1] = 0;
-				while (SQL_SUCCESS_WITH_INFO == (rc = SQLGetData(hstmt, 
-					(SQLUSMALLINT) 2, 
-					SQL_C_CHAR, 
-					chr[1] + len, 
+				while (SQL_SUCCESS_WITH_INFO == (rc = SQLGetData(hstmt,
+					(SQLUSMALLINT) 2,
+					SQL_C_CHAR,
+					chr[1] + len,
 					sizeof(chr[1]) - len,
 					&lengths[1])))
 				{
 					len += lengths[1];
-					if (!lengths[1] || len >= sizeof(chr[1])) 
+					if (!lengths[1] || len >= sizeof(chr[1]))
 						break;
 				}
 				poco_odbc_check_stmt (rc, hstmt);
 
 				len = lengths[2] = 0;
-				while (SQL_SUCCESS_WITH_INFO == (rc = SQLGetData(hstmt, 
-					(SQLUSMALLINT) 3, 
-					SQL_C_BINARY, 
-					chr[2] + len, 
+				while (SQL_SUCCESS_WITH_INFO == (rc = SQLGetData(hstmt,
+					(SQLUSMALLINT) 3,
+					SQL_C_BINARY,
+					chr[2] + len,
 					sizeof(chr[2]) - len,
 					&lengths[2])))
 				{
 					len += lengths[1];
-					if (!lengths[2] || len >= sizeof(chr[2])) 
+					if (!lengths[2] || len >= sizeof(chr[2]))
 						break;
 				}
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLGetData(hstmt, 
-					(SQLUSMALLINT) 4, 
-					SQL_C_SLONG, 
-					&fourth, 
+				rc = SQLGetData(hstmt,
+					(SQLUSMALLINT) 4,
+					SQL_C_SLONG,
+					&fourth,
 					0,
 					&lengths[3]);
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLGetData(hstmt, 
-					(SQLUSMALLINT) 5, 
-					SQL_C_FLOAT, 
-					&fifth, 
+				rc = SQLGetData(hstmt,
+					(SQLUSMALLINT) 5,
+					SQL_C_FLOAT,
+					&fifth,
 					0,
 					&lengths[4]);
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLGetData(hstmt, 
-					(SQLUSMALLINT) 6, 
-					SQL_C_TYPE_TIMESTAMP, 
-					&sixth, 
+				rc = SQLGetData(hstmt,
+					(SQLUSMALLINT) 6,
+					SQL_C_TYPE_TIMESTAMP,
+					&sixth,
 					0,
 					&lengths[5]);
 				poco_odbc_check_stmt (rc, hstmt);
@@ -728,9 +728,9 @@ void SQLExecutor::bareboneODBCTest(const std::string& dbConnString,
 }
 
 
-void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString, 
-	const std::string& tableCreateString, 
-	SQLExecutor::DataBinding bindMode, 
+void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString,
+	const std::string& tableCreateString,
+	SQLExecutor::DataBinding bindMode,
 	SQLExecutor::DataExtraction extractMode,
 	const std::string& insert,
 	const std::string& select)
@@ -802,11 +802,11 @@ void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString,
 			poco_odbc_check_stmt (rc, hstmt);
 			if (SQLExecutor::DE_BOUND == extractMode)
 			{
-				rc = SQLBindCol(hstmt, 
-						(SQLUSMALLINT) 1, 
-						SQL_C_SLONG, 
-						(SQLPOINTER) &count, 
-						(SQLINTEGER) 0, 
+				rc = SQLBindCol(hstmt,
+						(SQLUSMALLINT) 1,
+						SQL_C_SLONG,
+						(SQLPOINTER) &count,
+						(SQLINTEGER) 0,
 						&length);
 				poco_odbc_check_stmt (rc, hstmt);
 			}
@@ -819,10 +819,10 @@ void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString,
 
 			if (SQLExecutor::DE_MANUAL == extractMode)
 			{
-				rc = SQLGetData(hstmt, 
-					(SQLUSMALLINT) 1, 
-					SQL_C_SLONG, 
-					&count, 
+				rc = SQLGetData(hstmt,
+					(SQLUSMALLINT) 1,
+					SQL_C_SLONG,
+					&count,
 					0,
 					&length);
 				poco_odbc_check_stmt (rc, hstmt);
@@ -841,34 +841,34 @@ void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString,
 			SQLLEN lengths[3] = { 0 };
 			int second = 0;
 			float third = 0.0f;
-			
+
 			if (SQLExecutor::DE_BOUND == extractMode)
 			{
-				rc = SQLBindCol(hstmt, 
-					(SQLUSMALLINT) 1, 
-					SQL_C_CHAR, 
-					(SQLPOINTER) chr, 
-					(SQLINTEGER) 4, 
+				rc = SQLBindCol(hstmt,
+					(SQLUSMALLINT) 1,
+					SQL_C_CHAR,
+					(SQLPOINTER) chr,
+					(SQLINTEGER) 4,
 					&lengths[0]);
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLBindCol(hstmt, 
-					(SQLUSMALLINT) 2, 
-					SQL_C_SLONG, 
-					(SQLPOINTER) &second, 
-					(SQLINTEGER) 0, 
+				rc = SQLBindCol(hstmt,
+					(SQLUSMALLINT) 2,
+					SQL_C_SLONG,
+					(SQLPOINTER) &second,
+					(SQLINTEGER) 0,
 					&lengths[1]);
 				poco_odbc_check_stmt (rc, hstmt);
 
-				rc = SQLBindCol(hstmt, 
-					(SQLUSMALLINT) 3, 
-					SQL_C_FLOAT, 
-					(SQLPOINTER) &third, 
-					(SQLINTEGER) 0, 
+				rc = SQLBindCol(hstmt,
+					(SQLUSMALLINT) 3,
+					SQL_C_FLOAT,
+					(SQLPOINTER) &third,
+					(SQLINTEGER) 0,
 					&lengths[2]);
 				poco_odbc_check_stmt (rc, hstmt);
 			}
-			
+
 			rc = SQLExecute(hstmt);
 			poco_odbc_check_stmt (rc, hstmt);
 
@@ -884,26 +884,26 @@ void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString,
 
 				if (SQLExecutor::DE_MANUAL == extractMode)
 				{
-					rc = SQLGetData(hstmt, 
-						(SQLUSMALLINT) 1, 
-						SQL_C_CHAR, 
-						chr, 
+					rc = SQLGetData(hstmt,
+						(SQLUSMALLINT) 1,
+						SQL_C_CHAR,
+						chr,
 						4,
 						&lengths[0]);
 					poco_odbc_check_stmt (rc, hstmt);
 
-					rc = SQLGetData(hstmt, 
-						(SQLUSMALLINT) 2, 
-						SQL_C_SLONG, 
-						&second, 
+					rc = SQLGetData(hstmt,
+						(SQLUSMALLINT) 2,
+						SQL_C_SLONG,
+						&second,
 						0,
 						&lengths[1]);
 					poco_odbc_check_stmt (rc, hstmt);
 
-					rc = SQLGetData(hstmt, 
-						(SQLUSMALLINT) 3, 
-						SQL_C_FLOAT, 
-						&third, 
+					rc = SQLGetData(hstmt,
+						(SQLUSMALLINT) 3,
+						SQL_C_FLOAT,
+						&third,
 						0,
 						&lengths[2]);
 					poco_odbc_check_stmt (rc, hstmt);
@@ -1568,7 +1568,7 @@ void SQLExecutor::insertSingleBulkVec()
 {
 	std::string funct = "insertSingleBulkVec()";
 	std::vector<int> data;
-	
+
 	for (int x = 0; x < 100; ++x)
 		data.push_back(x);
 
@@ -1674,9 +1674,9 @@ void SQLExecutor::limitPrepare()
 		data.push_back(x);
 	}
 
-	try 
-	{ 
-		Statement stmt = (session() << "INSERT INTO Strings VALUES (?)", use(data)); 
+	try
+	{
+		Statement stmt = (session() << "INSERT INTO Strings VALUES (?)", use(data));
 		assertTrue (100 == stmt.execute());
 	}
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
@@ -1738,13 +1738,13 @@ void SQLExecutor::doBulkPerformance(Poco::UInt32 size)
 	std::vector<std::string> strings(size, "abc");
 	std::vector<double> floats(size, .5);
 	std::vector<DateTime> dateTimes(size);
-	
+
 	Stopwatch sw;
-	try 
+	try
 	{
 		sw.start();
-		session() << "INSERT INTO MiscTest (First, Third, Fourth, Fifth) VALUES (?,?,?,?)", 
-			use(strings), 
+		session() << "INSERT INTO MiscTest (First, Third, Fourth, Fifth) VALUES (?,?,?,?)",
+			use(strings),
 			use(ints),
 			use(floats),
 			use(dateTimes), now;
@@ -1758,18 +1758,18 @@ void SQLExecutor::doBulkPerformance(Poco::UInt32 size)
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
-	try 
+	try
 	{
 		sw.restart();
-		session() << "INSERT INTO MiscTest (First, Third, Fourth, Fifth) VALUES (?,?,?,?)", 
-			use(strings, bulk), 
+		session() << "INSERT INTO MiscTest (First, Third, Fourth, Fifth) VALUES (?,?,?,?)",
+			use(strings, bulk),
 			use(ints, bulk),
 			use(floats, bulk),
 			use(dateTimes, bulk), now;
 		sw.stop();
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
-	
+
 	double bulkTime = sw.elapsed() / 1000.0;
 
 	double speedup;
@@ -1781,10 +1781,10 @@ void SQLExecutor::doBulkPerformance(Poco::UInt32 size)
 	else
 		speedup = time / bulkTime;
 
-	std::cout << "INSERT => Size:" << size 
-		<< ", Time: " << time 
-		<< ", Bulk Time: " << bulkTime 
-		<< " [ms], Speedup: " << speedup 
+	std::cout << "INSERT => Size:" << size
+		<< ", Time: " << time
+		<< ", Bulk Time: " << bulkTime
+		<< " [ms], Speedup: " << speedup
 		<< 'x' << std::endl;
 
 	ints.clear();
@@ -1792,19 +1792,19 @@ void SQLExecutor::doBulkPerformance(Poco::UInt32 size)
 	floats.clear();
 	dateTimes.clear();
 
-	try 
-	{ 
+	try
+	{
 		sw.restart();
-		session() << "SELECT First, Third, Fourth, Fifth FROM MiscTest", 
-			into(strings), 
-			into(ints), 
+		session() << "SELECT First, Third, Fourth, Fifth FROM MiscTest",
+			into(strings),
+			into(ints),
 			into(floats),
 			into(dateTimes),
-			now; 
+			now;
 		sw.stop();
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
-	
+
 	time = sw.elapsed() / 1000.0;
 
 	assertTrue (ints.size() == size);
@@ -1813,20 +1813,20 @@ void SQLExecutor::doBulkPerformance(Poco::UInt32 size)
 	strings.clear();
 	floats.clear();
 	dateTimes.clear();
-	
-	try 
-	{ 
+
+	try
+	{
 		sw.restart();
-		session() << "SELECT First, Third, Fourth, Fifth FROM MiscTest", 
+		session() << "SELECT First, Third, Fourth, Fifth FROM MiscTest",
 			into(strings, bulk(size)),
 			into(ints, bulk(size)),
 			into(floats, bulk(size)),
 			into(dateTimes, bulk(size)),
-			now; 
+			now;
 		sw.stop();
 	} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
-	
+
 	bulkTime = sw.elapsed() / 1000.0;
 
 	assertTrue (ints.size() == size);
@@ -1839,10 +1839,10 @@ void SQLExecutor::doBulkPerformance(Poco::UInt32 size)
 	else
 		speedup = time / bulkTime;
 
-	std::cout << "SELECT => Size:" << size 
-		<< ", Time: " << time 
-		<< ", Bulk Time: " << bulkTime 
-		<< " [ms], Speedup: " << speedup 
+	std::cout << "SELECT => Size:" << size
+		<< ", Time: " << time
+		<< ", Bulk Time: " << bulkTime
+		<< " [ms], Speedup: " << speedup
 		<< 'x' << std::endl;
 }
 
@@ -2078,7 +2078,7 @@ void SQLExecutor::multiMapComplex()
 	people.insert(std::make_pair("LN1", p1));
 	people.insert(std::make_pair("LN1", p1));
 	people.insert(std::make_pair("LN2", p2));
-	
+
 	try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; }
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
@@ -2140,7 +2140,7 @@ void SQLExecutor::selectIntoSingleStep()
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 	assertTrue (count == 2);
 	Person result;
-	Statement stmt = (session() << "SELECT * FROM Person", into(result), limit(1)); 
+	Statement stmt = (session() << "SELECT * FROM Person", into(result), limit(1));
 	stmt.execute();
 	assertTrue (result == p1);
 	assertTrue (!stmt.done());
@@ -2406,7 +2406,7 @@ void SQLExecutor::blob(int bigSize, const std::string& blobPlaceholder)
 
 	CLOB img("0123456789", 10);
 	int count = 0;
-	try { session() << format("INSERT INTO Person VALUES (?,?,?,%s)", blobPlaceholder), 
+	try { session() << format("INSERT INTO Person VALUES (?,?,?,%s)", blobPlaceholder),
 		use(lastName), use(firstName), use(address), use(img), now; }
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
@@ -2432,7 +2432,7 @@ void SQLExecutor::blob(int bigSize, const std::string& blobPlaceholder)
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
-	try { session() << format("INSERT INTO Person VALUES (?,?,?,%s)", blobPlaceholder), 
+	try { session() << format("INSERT INTO Person VALUES (?,?,?,%s)", blobPlaceholder),
 		use(lastName), use(firstName), use(address), use(big), now; }
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
@@ -2510,11 +2510,11 @@ void SQLExecutor::date()
 
 	Date bornDate(1965, 6, 18);
 	int count = 0;
-	try { session() << "INSERT INTO Person VALUES (?,?,?,?)", 
-		use(lastName), 
-		use(firstName), 
-		use(address), 
-		use(bornDate), 
+	try { session() << "INSERT INTO Person VALUES (?,?,?,?)",
+		use(lastName),
+		use(firstName),
+		use(address),
+		use(bornDate),
 		now; }
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
@@ -2549,11 +2549,11 @@ void SQLExecutor::time()
 
 	Time bornTime (5, 35, 1);
 	int count = 0;
-	try { session() << "INSERT INTO Person VALUES (?,?,?,?)", 
-		use(lastName), 
-		use(firstName), 
-		use(address), 
-		use(bornTime), 
+	try { session() << "INSERT INTO Person VALUES (?,?,?,?)",
+		use(lastName),
+		use(firstName),
+		use(address),
+		use(bornTime),
 		now; }
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
@@ -2601,7 +2601,7 @@ void SQLExecutor::tupleVector()
 	typedef Tuple<int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int> TupleType;
 	std::string funct = "tupleVector()";
 	TupleType t(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19);
-	Tuple<int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int> 
+	Tuple<int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int>
 		t10(10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29);
 	TupleType t100(100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119);
 	std::vector<TupleType> v;
@@ -2640,8 +2640,8 @@ void SQLExecutor::internalExtraction()
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
-	try 
-	{ 
+	try
+	{
 		Statement stmt = (session() << "SELECT * FROM Vectors", now);
 		RecordSet rset(stmt);
 
@@ -2697,7 +2697,7 @@ void SQLExecutor::internalExtraction()
 
 		i = rset.value("str0", 2);
 		assertTrue (5 == i);
-		
+
 		const Column<std::deque<int> >& col = rset.column<std::deque<int> >(0);
 		Column<std::deque<int> >::Iterator it = col.begin();
 		Column<std::deque<int> >::Iterator end = col.end();
@@ -2737,7 +2737,7 @@ void SQLExecutor::internalExtraction()
 
 		try	{ rset.value<std::string>(0,0); fail ("must fail"); }
 		catch (BadCastException&) {	}
-		
+
 		stmt = (session() << "DELETE FROM Vectors", now);
 		rset = stmt;
 
@@ -2762,8 +2762,8 @@ void SQLExecutor::filter(const std::string& query, const std::string& intFldName
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
-	try 
-	{ 
+	try
+	{
 		Statement stmt = (session() << query, now);
 		RecordSet rset(stmt);
 		assertTrue (rset.totalRowCount() == 4);
@@ -2773,11 +2773,11 @@ void SQLExecutor::filter(const std::string& query, const std::string& intFldName
 		assertTrue (!pRF->isEmpty());
 
 		Var da;
-		try 
+		try
 		{
 			da = rset.value(0, 1);
 			fail ("must fail");
-		} catch (InvalidAccessException&) 
+		} catch (InvalidAccessException&)
 		{
 			da = rset.value(0, 1, false);
 			assertTrue (2 == da);
@@ -2846,22 +2846,22 @@ void SQLExecutor::internalBulkExtraction()
 		age[i] = i;
 	}
 
-	try 
-	{ 
-		session() << "INSERT INTO Person VALUES (?,?,?,?)", 
-			use(lastName, bulk), 
-			use(firstName, bulk), 
-			use(address, bulk), 
-			use(age, bulk), 
-			now; 
+	try
+	{
+		session() << "INSERT INTO Person VALUES (?,?,?,?)",
+			use(lastName, bulk),
+			use(firstName, bulk),
+			use(address, bulk),
+			use(age, bulk),
+			now;
 	}
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
-	try 
-	{ 
+	try
+	{
 		Statement stmt = (session() << "SELECT * FROM Person", bulk(size), now);
-		RecordSet rset(stmt); 
+		RecordSet rset(stmt);
 		assertTrue (size == rset.rowCount());
 		assertTrue ("LN0" == rset["LastName"]);
 		assertTrue (0 == rset["Age"]);
@@ -2875,10 +2875,10 @@ void SQLExecutor::internalBulkExtraction()
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
-	try 
-	{ 
+	try
+	{
 		Statement stmt = (session() << "SELECT * FROM Person", limit(size), bulk, now);
-		RecordSet rset(stmt); 
+		RecordSet rset(stmt);
 		assertTrue (size == rset.rowCount());
 		assertTrue ("LN0" == rset["LastName"]);
 		assertTrue (0 == rset["Age"]);
@@ -2971,8 +2971,8 @@ void SQLExecutor::internalStorageType()
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
-	try 
-	{ 
+	try
+	{
 		std::vector<Statement::Manipulator>::iterator it = manips.begin();
 		std::vector<Statement::Manipulator>::iterator end = manips.end();
 
@@ -3029,15 +3029,15 @@ void SQLExecutor::notNulls(const std::string& sqlState)
 	{
 		session() << "INSERT INTO NullTest (i,r,v) VALUES (?,?,?)", use(null), use(null), use(null), now;
 		fail ("must fail");
-	}catch (StatementException& se) 
-	{ 
+	}catch (StatementException& se)
+	{
 		//double check if we're failing for the right reason
 		//default sqlState value is "23502"; some drivers report "HY???" codes
 		if (se.diagnostics().fields().size())
 		{
 			std::string st = se.diagnostics().sqlState(0);
 			if (sqlState != st)
-				std::cerr << '[' << name() << ']' << " Warning: expected SQL state [" << sqlState << 
+				std::cerr << '[' << name() << ']' << " Warning: expected SQL state [" << sqlState <<
 					"], received [" << se.diagnostics().sqlState(0) << "] instead." << std::endl;
 		}
 	}
@@ -3185,7 +3185,7 @@ void SQLExecutor::rowIterator()
 	std::ostringstream osLoop;
 	RecordSet::Iterator it = rset.begin();
 	RecordSet::Iterator end = rset.end();
-	for (int i = 1; it != end; ++it, ++i) 
+	for (int i = 1; it != end; ++it, ++i)
 	{
 		assertTrue (it->get(0) == i);
 		osLoop << *it;
@@ -3202,7 +3202,7 @@ void SQLExecutor::rowIterator()
 	assertTrue (!pRF->isEmpty());
 	it = rset.begin();
 	end = rset.end();
-	for (int i = 1; it != end; ++it, ++i) 
+	for (int i = 1; it != end; ++it, ++i)
 	{
 		assertTrue (it->get(0) == i);
 		assertTrue (1 == i);
@@ -3279,7 +3279,7 @@ void SQLExecutor::asynchronous(int rowCount)
 	Statement::Result result = stmt.executeAsync();
 	assertTrue (!stmt.isAsync());
 	result.wait();
-	
+
 	Statement stmt1 = (tmp << "SELECT * FROM Strings", into(data), async, now);
 	assertTrue (stmt1.isAsync());
 	assertTrue (stmt1.wait() == rowCount);
@@ -3302,7 +3302,7 @@ void SQLExecutor::asynchronous(int rowCount)
 	assertTrue (stmt.isAsync());
 	stmt.wait();
 	assertTrue (stmt.execute() == 0);
-	
+
 	// +++ if this part of the test case fails, increase the rowCount until achieved
 	//  that first execute is still executing when the second one is called
 	try {
@@ -3338,7 +3338,7 @@ void SQLExecutor::asynchronous(int rowCount)
 	assertTrue (data.size() == 0);
 	assertTrue (!stmt2.done());
 	std::size_t rows = 0;
-	
+
 	for (int i = 0; !stmt2.done(); i += step)
 	{
 		stmt2.execute();
@@ -3504,8 +3504,8 @@ void SQLExecutor::sqlChannel(const std::string& connect)
 		rs2.moveNext();
 		assertTrue ("WarningSource" == rs2["Source"]);
 		assertTrue ("f Warning sync message" == rs2["Text"]);
-		
-	} 
+
+	}
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("sqlChannel()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("sqlChannel()"); }
 }
@@ -3518,7 +3518,7 @@ void SQLExecutor::sqlLogger(const std::string& connect)
 		Logger& root = Logger::root();
 		root.setChannel(new SQLChannel(Poco::Data::ODBC::Connector::KEY, connect, "TestSQLChannel"));
 		root.setLevel(Message::PRIO_INFORMATION);
-		
+
 		root.information("a Informational message");
 		root.warning("b Warning message");
 		root.debug("Debug message");
@@ -3532,26 +3532,26 @@ void SQLExecutor::sqlLogger(const std::string& connect)
 		assertTrue ("TestSQLChannel" == rs["Source"]);
 		assertTrue ("b Warning message" == rs["Text"]);
 		root.setChannel(nullptr);
-	} 
+	}
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("sqlLogger()"); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("sqlLogger()"); }
 }
 
 
 void SQLExecutor::setTransactionIsolation(Session& session, Poco::UInt32 ti)
-{ 
+{
 	if (session.hasTransactionIsolation(ti))
 	{
 		std::string funct = "setTransactionIsolation()";
 
-		try 
+		try
 		{
 			Transaction t(session, false);
 			t.setIsolation(ti);
-			
+
 			assertTrue (ti == t.getIsolation());
 			assertTrue (t.isIsolation(ti));
-			
+
 			assertTrue (ti == session.getTransactionIsolation());
 			assertTrue (session.isTransactionIsolation(ti));
 		}
@@ -3714,11 +3714,11 @@ void SQLExecutor::transaction(const std::string& connect)
 		Transaction trans(session());
 		assertTrue (trans.isActive());
 		assertTrue (session().isTransaction());
-		
+
 		try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; }
 		catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
-		
+
 		assertTrue (session().isTransaction());
 		assertTrue (trans.isActive());
 
@@ -3770,7 +3770,7 @@ void SQLExecutor::transaction(const std::string& connect)
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 	assertTrue (0 == count);
-	try 
+	try
 	{
 		stmt1.wait(5000);
 		if (local.getTransactionIsolation() == Session::TRANSACTION_READ_UNCOMMITTED)
@@ -3818,7 +3818,7 @@ void SQLExecutor::transaction(const std::string& connect)
 	assertTrue (0 == count);
 
 	trans.execute(sql);
-	
+
 	Statement stmt3 = (local << "SELECT COUNT(*) FROM Person", into(locCount), now);
 	assertTrue (2 == locCount);
 
@@ -3870,7 +3870,7 @@ void SQLExecutor::transactor()
 	try { session() << "DELETE FROM Person", now; session().commit();}
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
-	
+
 	try { session() << "SELECT count(*) FROM Person", into(count), now; }
 	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
@@ -3961,7 +3961,7 @@ void SQLExecutor::nullable()
 	assertTrue (rs.isNull("EmptyInteger"));
 	assertTrue (rs.isNull("EmptyFloat"));
 	assertTrue (rs.isNull("EmptyDateTime"));
-	
+
 	Var di = 1;
 	Var df = 1.5;
 	Var ds = "abc";
@@ -3971,7 +3971,7 @@ void SQLExecutor::nullable()
 	assertTrue (!df.isEmpty());
 	assertTrue (!ds.isEmpty());
 	assertTrue (!dd.isEmpty());
-	
+
 	Statement stmt = (session() << "SELECT EmptyString, EmptyInteger, EmptyFloat, EmptyDateTime FROM NullableTest", into(ds), into(di), into(df), into(dd), now);
 
 	assertTrue (di.isEmpty());
@@ -4004,9 +4004,9 @@ void SQLExecutor::reconnect()
 	assertTrue (session().isConnected());
 	session().close();
 	assertTrue (!session().isConnected());
-	try 
+	try
 	{
-		session() << "SELECT LastName FROM Person", into(result), now;  
+		session() << "SELECT LastName FROM Person", into(result), now;
 		fail ("must fail");
 	}
 	catch(NotConnectedException&){ }
diff --git a/Data/ODBC/testsuite/src/SQLExecutor.h b/Data/ODBC/testsuite/src/SQLExecutor.h
index ac8e4b69a..5f21805d7 100644
--- a/Data/ODBC/testsuite/src/SQLExecutor.h
+++ b/Data/ODBC/testsuite/src/SQLExecutor.h
@@ -80,7 +80,7 @@ public:
 		PB_IMMEDIATE,
 		PB_AT_EXEC
 	};
-	
+
 	enum DataExtraction
 	{
 		DE_MANUAL,
@@ -95,22 +95,22 @@ public:
 
 	void bareboneODBCTest(const std::string& dbConnString,
 		const std::string& tableCreateString,
-		DataBinding bindMode, 
+		DataBinding bindMode,
 		DataExtraction extractMode,
 		bool doTime=true,
 		const std::string& blobPlaceholder="?");
 
-	void bareboneODBCMultiResultTest(const std::string& dbConnString, 
-		const std::string& tableCreateString, 
-		SQLExecutor::DataBinding bindMode, 
+	void bareboneODBCMultiResultTest(const std::string& dbConnString,
+		const std::string& tableCreateString,
+		SQLExecutor::DataBinding bindMode,
 		SQLExecutor::DataExtraction extractMode,
 		const std::string& insert = MULTI_INSERT,
 		const std::string& select = MULTI_SELECT);
-		/// The above two functions use "bare bone" ODBC API calls  
+		/// The above two functions use "bare bone" ODBC API calls
 		/// (i.e. calls are not "wrapped" in PocoData framework structures).
 		/// The purpose of the functions is to verify that a driver behaves
-		/// correctly as well as to determine its capabilities 
-		/// (e.g. SQLGetData() restrictions relaxation policy, if any). 
+		/// correctly as well as to determine its capabilities
+		/// (e.g. SQLGetData() restrictions relaxation policy, if any).
 		/// If these test pass, subsequent tests failures are likely ours.
 
 	void zeroRows();
@@ -158,7 +158,7 @@ public:
 		C4 floats;
 		C5 dateTimes(size);
 		C6 bools;
-		
+
 		for (int i = 0; i < size; ++i)
 		{
 			ints.push_back(i);
@@ -168,12 +168,12 @@ public:
 			bools.push_back(0 == i % 2);
 		}
 
-		try 
+		try
 		{
-			session() << 
-				Poco::format("INSERT INTO MiscTest VALUES (?,%s,?,?,?,?)", blobPlaceholder), 
-				use(strings), 
-				use(blobs), 
+			session() <<
+				Poco::format("INSERT INTO MiscTest VALUES (?,%s,?,?,?,?)", blobPlaceholder),
+				use(strings),
+				use(blobs),
 				use(ints),
 				use(floats),
 				use(dateTimes),
@@ -185,12 +185,12 @@ public:
 		catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
-		try 
+		try
 		{
-			session() <<  
+			session() <<
 				Poco::format("INSERT INTO MiscTest VALUES (?,%s,?,?,?,?)", blobPlaceholder),
-				use(strings, bulk), 
-				use(blobs, bulk), 
+				use(strings, bulk),
+				use(blobs, bulk),
 				use(ints, bulk),
 				use(floats, bulk),
 				use(dateTimes, bulk),
@@ -204,20 +204,20 @@ public:
 		floats.clear();
 		dateTimes.clear();
 		bools.clear();
-		
-		try 
-		{ 
-			session() << "SELECT * FROM MiscTest ORDER BY Third", 
-				into(strings), 
-				into(blobs), 
-				into(ints), 
+
+		try
+		{
+			session() << "SELECT * FROM MiscTest ORDER BY Third",
+				into(strings),
+				into(blobs),
+				into(ints),
 				into(floats),
 				into(dateTimes),
 				into(bools),
-				now; 
+				now;
 		} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
-		
+
 		std::string number = Poco::NumberFormatter::format(size - 1);
 		assert (size == ints.size());
 		assert (0 == ints.front());
@@ -235,16 +235,16 @@ public:
 
 		ints.clear();
 
-		try 
-		{ 
-			session() << "SELECT First FROM MiscTest", into(ints, bulk(size)), limit(size+1), now; 
+		try
+		{
+			session() << "SELECT First FROM MiscTest", into(ints, bulk(size)), limit(size+1), now;
 			fail ("must fail");
 		}
 		catch(Poco::InvalidArgumentException&){ }
 
-		try 
-		{ 
-			session() << "SELECT First FROM MiscTest", into(ints), bulk(size), now; 
+		try
+		{
+			session() << "SELECT First FROM MiscTest", into(ints), bulk(size), now;
 			fail ("must fail");
 		}
 		catch(Poco::InvalidAccessException&){ }
@@ -258,17 +258,17 @@ public:
 		dateTimes.clear();
 		bools.clear();
 		bools.resize(size);
-		
-		try 
-		{ 
-			session() << "SELECT First, Second, Third, Fourth, Fifth, Sixth FROM MiscTest ORDER BY Third", 
+
+		try
+		{
+			session() << "SELECT First, Second, Third, Fourth, Fifth, Sixth FROM MiscTest ORDER BY Third",
 				into(strings, bulk),
 				into(blobs, bulk(size)),
 				into(ints, bulk(size)),
 				into(floats, bulk),
 				into(dateTimes, bulk(size)),
 				into(bools, bulk),
-				now; 
+				now;
 		} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
@@ -300,7 +300,7 @@ public:
 		C3 blobs;
 		C4 floats;
 		C5 dateTimes(size);
-	
+
 		for (int i = 0; i < size; ++i)
 		{
 			ints.push_back(i);
@@ -309,11 +309,11 @@ public:
 			floats.push_back(i + .5);
 		}
 
-		try 
+		try
 		{
-			session() << "INSERT INTO MiscTest VALUES (?,?,?,?,?)", 
-				use(strings), 
-				use(blobs), 
+			session() << "INSERT INTO MiscTest VALUES (?,?,?,?,?)",
+				use(strings),
+				use(blobs),
 				use(ints),
 				use(floats),
 				use(dateTimes), now;
@@ -324,35 +324,35 @@ public:
 		catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
 
-		try 
+		try
 		{
-			session() << "INSERT INTO MiscTest VALUES (?,?,?,?,?)", 
-				use(strings, bulk), 
-				use(blobs, bulk), 
+			session() << "INSERT INTO MiscTest VALUES (?,?,?,?,?)",
+				use(strings, bulk),
+				use(blobs, bulk),
 				use(ints, bulk),
 				use(floats, bulk),
 				use(dateTimes, bulk), now;
 		} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
-		
+
 		ints.clear();
 		strings.clear();
 		blobs.clear();
 		floats.clear();
 		dateTimes.clear();
 
-		try 
-		{ 
-			session() << "SELECT * FROM MiscTest ORDER BY First", 
-				into(strings), 
-				into(blobs), 
-				into(ints), 
+		try
+		{
+			session() << "SELECT * FROM MiscTest ORDER BY First",
+				into(strings),
+				into(blobs),
+				into(ints),
 				into(floats),
 				into(dateTimes),
-				now; 
+				now;
 		} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
-		
+
 		std::string number = Poco::NumberFormatter::format(size - 1);
 		assert (size == ints.size());
 		assert (0 == ints.front());
@@ -368,16 +368,16 @@ public:
 
 		ints.clear();
 
-		try 
-		{ 
-			session() << "SELECT First FROM MiscTest", into(ints, bulk(size)), limit(size+1), now; 
+		try
+		{
+			session() << "SELECT First FROM MiscTest", into(ints, bulk(size)), limit(size+1), now;
 			fail ("must fail");
 		}
 		catch(Poco::InvalidArgumentException&){ }
 
-		try 
-		{ 
-			session() << "SELECT First FROM MiscTest", into(ints), bulk(size), now; 
+		try
+		{
+			session() << "SELECT First FROM MiscTest", into(ints), bulk(size), now;
 			fail ("must fail");
 		}
 		catch(Poco::InvalidAccessException&){ }
@@ -387,19 +387,19 @@ public:
 		blobs.clear();
 		floats.clear();
 		dateTimes.clear();
-		
-		try 
-		{ 
-			session() << "SELECT * FROM MiscTest ORDER BY First", 
+
+		try
+		{
+			session() << "SELECT * FROM MiscTest ORDER BY First",
 				into(strings, bulk(size)),
 				into(blobs, bulk(size)),
 				into(ints, bulk(size)),
 				into(floats, bulk(size)),
 				into(dateTimes, bulk(size)),
-				now; 
+				now;
 		} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
 		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
-		
+
 		assert (size == ints.size());
 		assert (0 == ints.front());
 		assert (size - 1 == ints.back());
@@ -474,7 +474,7 @@ public:
 	void tupleVector();
 
 	void internalExtraction();
-	void filter(const std::string& query = 
+	void filter(const std::string& query =
 		"SELECT * FROM Vectors ORDER BY int0 ASC",
 		const std::string& intFldName = "int0");
 
@@ -487,11 +487,11 @@ public:
 	void stdVectorBool();
 
 	void asynchronous(int rowCount = 500);
-	
+
 	void any();
 	void dynamicAny();
 
-	void multipleResults(const std::string& sql = 
+	void multipleResults(const std::string& sql =
 		"SELECT * FROM Person WHERE Age = ?; "
 		"SELECT Age FROM Person WHERE FirstName = 'Bart'; "
 		"SELECT * FROM Person WHERE Age = ? OR Age = ? ORDER BY Age;");
diff --git a/Data/PostgreSQL/PostgreSQL_vs170.sln b/Data/PostgreSQL/PostgreSQL_vs170.sln
index 268cd3b1e..ebfbf7850 100644
--- a/Data/PostgreSQL/PostgreSQL_vs170.sln
+++ b/Data/PostgreSQL/PostgreSQL_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64
 		{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj
index cd0d4f3cc..20c711b26 100644
--- a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj
+++ b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>PostgreSQL</ProjectName>
     <ProjectGuid>{73E19FDE-1570-488C-B3DB-72A60FADD408}</ProjectGuid>
     <RootNamespace>PostgreSQL</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataPostgreSQLA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataPostgreSQLmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataPostgreSQLmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoDataPostgreSQLA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoDataPostgreSQLmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoDataPostgreSQLmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataPostgreSQLd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataPostgreSQLmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataPostgreSQLmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoDataPostgreSQLmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoDataPostgreSQLmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\..\binA64\</OutDir>
+    <IntDir>objA64\PostgreSQL\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\..\binA64\</OutDir>
+    <IntDir>objA64\PostgreSQL\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\PostgreSQL\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\PostgreSQL\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\PostgreSQL\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\PostgreSQL\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\..\bin\</OutDir>
     <IntDir>obj\PostgreSQL\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\..\lib64\</OutDir>
     <IntDir>obj64\PostgreSQL\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\..\binA64\PocoDataPostgreSQLA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\binA64\PocoDataPostgreSQLA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\libA64\PocoDataPostgreSQLd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\..\binA64\PocoDataPostgreSQLA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\libA64\PocoDataPostgreSQL.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\..\libA64\PocoDataPostgreSQLmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataPostgreSQLmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataPostgreSQLmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\..\libA64\PocoDataPostgreSQLmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataPostgreSQLmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataPostgreSQLmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -591,12 +854,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj
index 534550b33..54a9b0d80 100644
--- a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj
+++ b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Data/SQLite/SQLite_vs170.sln b/Data/SQLite/SQLite_vs170.sln
index c9e22694c..7d92fab9a 100644
--- a/Data/SQLite/SQLite_vs170.sln
+++ b/Data/SQLite/SQLite_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.Build.0 = release_static_md|x64
 		{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Data/SQLite/SQLite_vs170.vcxproj b/Data/SQLite/SQLite_vs170.vcxproj
index 25c9a3924..d1a5bed10 100644
--- a/Data/SQLite/SQLite_vs170.vcxproj
+++ b/Data/SQLite/SQLite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>SQLite</ProjectName>
     <ProjectGuid>{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}</ProjectGuid>
     <RootNamespace>SQLite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataSQLiteA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataSQLitemdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataSQLitemtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoDataSQLiteA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoDataSQLitemd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoDataSQLitemt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataSQLited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataSQLitemdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataSQLitemtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoDataSQLitemd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoDataSQLitemt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\..\binA64\</OutDir>
+    <IntDir>objA64\SQLite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\..\binA64\</OutDir>
+    <IntDir>objA64\SQLite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\SQLite\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\SQLite\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\SQLite\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\..\libA64\</OutDir>
+    <IntDir>objA64\SQLite\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\..\bin\</OutDir>
     <IntDir>obj\SQLite\$(Configuration)\</IntDir>
@@ -223,6 +328,170 @@
     <OutDir>..\..\lib64\</OutDir>
     <IntDir>obj64\SQLite\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\..\binA64\PocoDataSQLiteA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\binA64\PocoDataSQLiteA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\libA64\PocoDataSQLited.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\..\binA64\PocoDataSQLiteA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\libA64\PocoDataSQLite.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\..\libA64\PocoDataSQLitemtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataSQLitemtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataSQLitemt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\..\libA64\PocoDataSQLitemdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataSQLitemdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\libA64\PocoDataSQLitemd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -595,12 +864,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h
index 10a165007..ceabe7efa 100644
--- a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h
@@ -35,15 +35,15 @@ namespace SQLite {
 
 class SQLite_API Notifier
 	/// Notifier is a wrapper for SQLite callback calls. It supports event callbacks
-	/// for insert, update, delete, commit and rollback events. While (un)registering 
-	/// callbacks is thread-safe, execution of the callbacks themselves are not; 
-	/// it is the user's responsibility to ensure the thread-safey of the functions 
+	/// for insert, update, delete, commit and rollback events. While (un)registering
+	/// callbacks is thread-safe, execution of the callbacks themselves are not;
+	/// it is the user's responsibility to ensure the thread-safey of the functions
 	/// they provide as callback target. Additionally, commit callbacks may prevent
 	/// database transactions from succeeding (see sqliteCommitCallbackFn documentation
-	/// for details). 
-	/// 
+	/// for details).
+	///
 	/// There can be only one set of callbacks per session (i.e. registering a new
-	/// callback automatically unregisters the previous one). All callbacks are 
+	/// callback automatically unregisters the previous one). All callbacks are
 	/// registered and enabled at Notifier contruction time and can be disabled
 	/// at a later point time.
 {
@@ -53,9 +53,9 @@ public:
 
 	typedef Poco::BasicEvent<void> Event;
 
-	// 
+	//
 	// Events
-	// 
+	//
 	Event update;
 	Event insert;
 	Event erase;
@@ -113,7 +113,7 @@ public:
 		/// Disables all callbacks.
 
 	static void sqliteUpdateCallbackFn(void* pVal, int opCode, const char* pDB, const char* pTable, Poco::Int64 row);
-		/// Update callback event dispatcher. Determines the type of the event, updates the row number 
+		/// Update callback event dispatcher. Determines the type of the event, updates the row number
 		/// and triggers the event.
 
 	static int sqliteCommitCallbackFn(void* pVal);
@@ -165,9 +165,9 @@ private:
 };
 
 
-// 
+//
 // inlines
-// 
+//
 
 inline bool Notifier::operator == (const Notifier& other) const
 {
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
index 1044beb7e..75a5afdb8 100644
--- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
@@ -55,7 +55,7 @@ protected:
 	int affectedRowCount() const;
 		/// Returns the number of affected rows.
 		/// Used to find out the number of rows affected by insert, delete or update.
-		/// All changes are counted, even if they are later undone by a ROLLBACK or ABORT. 
+		/// All changes are counted, even if they are later undone by a ROLLBACK or ABORT.
 		/// Changes associated with creating and dropping tables are not counted.
 
 	const MetaColumn& metaColumn(std::size_t pos) const;
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
index 893e1a9a1..9d6d292cb 100644
--- a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
@@ -19,6 +19,7 @@
 
 
 #include "Poco/Data/SQLite/SQLite.h"
+#include "Poco/Data/SQLite/Utility.h"
 #include "Poco/Data/SQLite/Connector.h"
 #include "Poco/Data/SQLite/Binder.h"
 #include "Poco/Data/AbstractSessionImpl.h"
@@ -53,16 +54,16 @@ public:
 
 	void open(const std::string& connect = "");
 		/// Opens a connection to the Database.
-		/// 
-		/// An in-memory system database (sys), with a single table (dual) 
+		///
+		/// An in-memory system database (sys), with a single table (dual)
 		/// containing single field (dummy) is attached to the database.
 		/// The in-memory system database is used to force change count
-		/// to be reset to zero on every new query (or batch of queries) 
+		/// to be reset to zero on every new query (or batch of queries)
 		/// execution. Without this functionality, select statements
 		/// executions that do not return any rows return the count of
 		/// changes effected by the most recent insert, update or delete.
 		/// In-memory system database can be queried and updated but can not
-		/// be dropped. It may be used for other purposes 
+		/// be dropped. It may be used for other purposes
 		/// in the future.
 
 	void close();
@@ -117,6 +118,12 @@ public:
 	bool isAutoCommit(const std::string& name="") const;
 		/// Returns autocommit property value.
 
+	void setTransactionType(TransactionType transactionType);
+		/// Sets begin transaction type for the session.
+
+	TransactionType getTransactionType() const;
+		/// Returns begin transaction type.
+
 	const std::string& connectorName() const;
 		/// Returns the name of the connector.
 
@@ -124,16 +131,20 @@ protected:
 	void setConnectionTimeout(const std::string& prop, const Poco::Any& value);
 	Poco::Any getConnectionTimeout(const std::string& prop) const;
 
+	void setTransactionType(const std::string &prop, const Poco::Any& value);
+	Poco::Any getTransactionType(const std::string& prop) const;
 private:
 	std::string _connector;
 	sqlite3*    _pDB;
 	bool        _connected;
 	bool        _isTransaction;
+	TransactionType _transactionType;
 	int         _timeout;
 	mutable
 	Poco::Mutex _mutex;
-
 	static const std::string DEFERRED_BEGIN_TRANSACTION;
+	static const std::string EXCLUSIVE_BEGIN_TRANSACTION;
+	static const std::string IMMEDIATE_BEGIN_TRANSACTION; 
 	static const std::string COMMIT_TRANSACTION;
 	static const std::string ABORT_TRANSACTION;
 };
@@ -148,7 +159,7 @@ inline bool SessionImpl::canTransact() const
 }
 
 
-inline 	bool SessionImpl::isTransaction() const
+inline bool SessionImpl::isTransaction() const
 {
 	return _isTransaction;
 }
@@ -165,6 +176,10 @@ inline std::size_t SessionImpl::getConnectionTimeout() const
 	return static_cast<std::size_t>(_timeout/1000);
 }
 
+inline TransactionType SessionImpl::getTransactionType() const
+{
+	return _transactionType;
+}
 
 } } } // namespace Poco::Data::SQLite
 
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Utility.h b/Data/SQLite/include/Poco/Data/SQLite/Utility.h
index 55170471c..c4d6e050b 100644
--- a/Data/SQLite/include/Poco/Data/SQLite/Utility.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/Utility.h
@@ -43,6 +43,17 @@ class SQLite_API Utility
 	/// Various utility functions for SQLite.
 {
 public:
+
+	// SQLite Transaction type
+	static const std::string TRANSACTION_TYPE_PROPERTY_KEY;
+
+	enum class TransactionType
+	{
+		DEFERRED,
+		EXCLUSIVE,
+		IMMEDIATE
+	};
+
 	static const std::string SQLITE_DATE_FORMAT;
 	static const std::string SQLITE_TIME_FORMAT;
 	typedef std::map<std::string, MetaColumn::ColumnDataType> TypeMap;
@@ -73,37 +84,37 @@ public:
 	static bool fileToMemory(sqlite3* pInMemory, const std::string& fileName);
 		/// Loads the contents of a database file on disk into an opened
 		/// database in memory.
-		/// 
+		///
 		/// Returns true if succesful.
 
 	static bool fileToMemory(const Session& session, const std::string& fileName);
 		/// Loads the contents of a database file on disk into an opened
 		/// database in memory.
-		/// 
+		///
 		/// Returns true if succesful.
 
 	static bool memoryToFile(const std::string& fileName, sqlite3* pInMemory);
 		/// Saves the contents of an opened database in memory to the
 		/// database on disk.
-		/// 
+		///
 		/// Returns true if succesful.
 
 	static bool memoryToFile(const std::string& fileName, const Session& session);
 		/// Saves the contents of an opened database in memory to the
 		/// database on disk.
-		/// 
+		///
 		/// Returns true if succesful.
 
 	static bool isThreadSafe();
 		/// Returns true if SQLite was compiled in multi-thread or serialized mode.
 		/// See http://www.sqlite.org/c3ref/threadsafe.html for details.
-		/// 
+		///
 		/// Returns true if succesful
 
 	static bool setThreadMode(int mode);
 		/// Sets the threading mode to single, multi or serialized.
 		/// See http://www.sqlite.org/threadsafe.html for details.
-		/// 
+		///
 		/// Returns true if succesful
 
 	static int getThreadMode();
@@ -111,7 +122,7 @@ public:
 
 	typedef void(*UpdateCallbackType)(void*, int, const char*, const char*, Poco::Int64);
 		/// Update callback function type.
- 
+
 	typedef int(*CommitCallbackType)(void*);
 		/// Commit callback function type.
 
@@ -120,13 +131,13 @@ public:
 
 	template <typename T, typename CBT>
 	static bool registerUpdateHandler(sqlite3* pDB, CBT callbackFn, T* pParam)
-		/// Registers the callback for (1)(insert, delete, update), (2)(commit) or 
+		/// Registers the callback for (1)(insert, delete, update), (2)(commit) or
 		/// or (3)(rollback) events. Only one function per group can be registered
 		/// at a time. Registration is not thread-safe. Storage pointed to by pParam
 		/// must remain valid as long as registration is active. Registering with
 		/// callbackFn set to zero disables notifications.
-		/// 
-		/// See http://www.sqlite.org/c3ref/update_hook.html and 
+		///
+		/// See http://www.sqlite.org/c3ref/update_hook.html and
 		/// http://www.sqlite.org/c3ref/commit_hook.html for details.
 	{
 		typedef std::pair<CBT, T*> CBPair;
@@ -190,11 +201,11 @@ private:
 	Utility();
 		/// Maps SQLite column declared types to Poco::Data types through
 		/// static TypeMap member.
-		/// 
+		///
 		/// Note: SQLite is type-agnostic and it is the end-user responsibility
-		/// to ensure that column declared data type corresponds to the type of 
+		/// to ensure that column declared data type corresponds to the type of
 		/// data actually held in the database.
-		/// 
+		///
 		/// Column types are case-insensitive.
 
 	Utility(const Utility&);
@@ -210,6 +221,9 @@ private:
 };
 
 
+using TransactionType = Utility::TransactionType;
+
+
 //
 // inlines
 //
diff --git a/Data/SQLite/src/Notifier.cpp b/Data/SQLite/src/Notifier.cpp
index 9beb75663..163cfc4a2 100644
--- a/Data/SQLite/src/Notifier.cpp
+++ b/Data/SQLite/src/Notifier.cpp
@@ -57,10 +57,10 @@ Notifier::~Notifier()
 bool Notifier::enableUpdate()
 {
 	Poco::Mutex::ScopedLock l(_mutex);
-	
+
 	if (Utility::registerUpdateHandler(Utility::dbHandle(_session), &sqliteUpdateCallbackFn, this))
 		_enabledEvents |= SQLITE_NOTIFY_UPDATE;
-	
+
 	return updateEnabled();
 }
 
@@ -68,10 +68,10 @@ bool Notifier::enableUpdate()
 bool Notifier::disableUpdate()
 {
 	Poco::Mutex::ScopedLock l(_mutex);
-	
+
 	if (Utility::registerUpdateHandler(Utility::dbHandle(_session), (Utility::UpdateCallbackType) 0, this))
 		_enabledEvents &= ~SQLITE_NOTIFY_UPDATE;
-	
+
 	return !updateEnabled();
 }
 
@@ -85,10 +85,10 @@ bool Notifier::updateEnabled() const
 bool Notifier::enableCommit()
 {
 	Poco::Mutex::ScopedLock l(_mutex);
-	
+
 	if (Utility::registerUpdateHandler(Utility::dbHandle(_session), &sqliteCommitCallbackFn, this))
 		_enabledEvents |= SQLITE_NOTIFY_COMMIT;
-	
+
 	return commitEnabled();
 }
 
@@ -96,10 +96,10 @@ bool Notifier::enableCommit()
 bool Notifier::disableCommit()
 {
 	Poco::Mutex::ScopedLock l(_mutex);
-	
+
 	if (Utility::registerUpdateHandler(Utility::dbHandle(_session), (Utility::CommitCallbackType) 0, this))
 		_enabledEvents &= ~SQLITE_NOTIFY_COMMIT;
-	
+
 	return !commitEnabled();
 }
 
@@ -113,10 +113,10 @@ bool Notifier::commitEnabled() const
 bool Notifier::enableRollback()
 {
 	Poco::Mutex::ScopedLock l(_mutex);
-	
+
 	if (Utility::registerUpdateHandler(Utility::dbHandle(_session), &sqliteRollbackCallbackFn, this))
 		_enabledEvents |= SQLITE_NOTIFY_ROLLBACK;
-	
+
 	return rollbackEnabled();
 }
 
@@ -127,7 +127,7 @@ bool Notifier::disableRollback()
 
 	if (Utility::registerUpdateHandler(Utility::dbHandle(_session), (Utility::RollbackCallbackType) 0, this))
 		_enabledEvents &= ~SQLITE_NOTIFY_ROLLBACK;
-	
+
 	return !rollbackEnabled();
 }
 
@@ -154,7 +154,7 @@ void Notifier::sqliteUpdateCallbackFn(void* pVal, int opCode, const char* pDB, c
 {
 	poco_check_ptr(pVal);
 	Notifier* pV = reinterpret_cast<Notifier*>(pVal);
-	
+
 	if (opCode == Utility::OPERATION_INSERT)
 	{
 		pV->_table = pTable;
diff --git a/Data/SQLite/src/SQLiteStatementImpl.cpp b/Data/SQLite/src/SQLiteStatementImpl.cpp
index 746b50c01..ec3e469d9 100644
--- a/Data/SQLite/src/SQLiteStatementImpl.cpp
+++ b/Data/SQLite/src/SQLiteStatementImpl.cpp
@@ -46,7 +46,7 @@ SQLiteStatementImpl::SQLiteStatementImpl(Poco::Data::SessionImpl& rSession, sqli
 {
 	_columns.resize(1);
 }
-	
+
 
 SQLiteStatementImpl::~SQLiteStatementImpl()
 {
@@ -287,7 +287,7 @@ std::size_t SQLiteStatementImpl::next()
 	{
 		Utility::throwException(_pDB, _nextResponse, std::string("Iterator Error: trying to access the next value"));
 	}
-	
+
 	return 1u;
 }
 
diff --git a/Data/SQLite/src/SessionImpl.cpp b/Data/SQLite/src/SessionImpl.cpp
index 9d1583e9e..da6c7dd89 100644
--- a/Data/SQLite/src/SessionImpl.cpp
+++ b/Data/SQLite/src/SessionImpl.cpp
@@ -40,6 +40,8 @@ namespace SQLite {
 
 
 const std::string SessionImpl::DEFERRED_BEGIN_TRANSACTION("BEGIN DEFERRED");
+const std::string SessionImpl::EXCLUSIVE_BEGIN_TRANSACTION("BEGIN EXCLUSIVE");
+const std::string SessionImpl::IMMEDIATE_BEGIN_TRANSACTION("BEGIN IMMEDIATE");
 const std::string SessionImpl::COMMIT_TRANSACTION("COMMIT");
 const std::string SessionImpl::ABORT_TRANSACTION("ROLLBACK");
 
@@ -49,7 +51,8 @@ SessionImpl::SessionImpl(const std::string& fileName, std::size_t loginTimeout):
 	_connector(Connector::KEY),
 	_pDB(0),
 	_connected(false),
-	_isTransaction(false)
+	_isTransaction(false),
+	_transactionType(TransactionType::DEFERRED)
 {
 	open();
 	setConnectionTimeout(loginTimeout);
@@ -58,6 +61,7 @@ SessionImpl::SessionImpl(const std::string& fileName, std::size_t loginTimeout):
 		&SessionImpl::autoCommit,
 		&SessionImpl::isAutoCommit);
 	addProperty("connectionTimeout", &SessionImpl::setConnectionTimeout, &SessionImpl::getConnectionTimeout);
+	addProperty(Utility::TRANSACTION_TYPE_PROPERTY_KEY, &SessionImpl::setTransactionType, &SessionImpl::getTransactionType);
 }
 
 
@@ -85,7 +89,18 @@ void SessionImpl::begin()
 {
 	Poco::Mutex::ScopedLock l(_mutex);
 	SQLiteStatementImpl tmp(*this, _pDB);
-	tmp.add(DEFERRED_BEGIN_TRANSACTION);
+	switch (_transactionType)
+	{
+	case TransactionType::DEFERRED:
+		tmp.add(DEFERRED_BEGIN_TRANSACTION);
+		break;
+	case TransactionType::EXCLUSIVE:
+		tmp.add(EXCLUSIVE_BEGIN_TRANSACTION);
+		break;
+	case TransactionType::IMMEDIATE:
+		tmp.add(IMMEDIATE_BEGIN_TRANSACTION);
+		break;
+	}
 	tmp.execute();
 	_isTransaction = true;
 }
@@ -161,6 +176,8 @@ void SessionImpl::open(const std::string& connect)
 			rc = sqlite3_open_v2(connectionString().c_str(), &_pDB,
 				SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_URI, NULL);
 			if (rc == SQLITE_OK) break;
+			if (!_pDB)
+				throw ConnectionFailedException(std::string(sqlite3_errstr(rc)));
 			if (sw.elapsedSeconds() >= tout)
 			{
 				Utility::throwException(_pDB, rc);
@@ -223,6 +240,20 @@ Poco::Any SessionImpl::getConnectionTimeout(const std::string& prop) const
 	return Poco::Any(_timeout/1000);
 }
 
+void SessionImpl::setTransactionType(TransactionType transactionType) 
+{
+	_transactionType = transactionType;
+}
+
+void SessionImpl::setTransactionType(const std::string &prop, const Poco::Any& value) 
+{
+	setTransactionType(Poco::RefAnyCast<TransactionType>(value));
+}
+
+Poco::Any SessionImpl::getTransactionType(const std::string& prop) const 
+{
+	return Poco::Any(_transactionType);
+}
 
 void SessionImpl::autoCommit(const std::string&, bool)
 {
diff --git a/Data/SQLite/src/Utility.cpp b/Data/SQLite/src/Utility.cpp
index 60af9c3bb..d07426326 100644
--- a/Data/SQLite/src/Utility.cpp
+++ b/Data/SQLite/src/Utility.cpp
@@ -37,6 +37,8 @@ namespace Data {
 namespace SQLite {
 
 
+const std::string Utility::TRANSACTION_TYPE_PROPERTY_KEY = "transactionType";
+
 const int Utility::THREAD_MODE_SINGLE = SQLITE_CONFIG_SINGLETHREAD;
 const int Utility::THREAD_MODE_MULTI = SQLITE_CONFIG_MULTITHREAD;
 const int Utility::THREAD_MODE_SERIAL = SQLITE_CONFIG_SERIALIZED;
diff --git a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj
index db7e3a796..e96fb07f5 100644
--- a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj
+++ b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Data/SQLite/testsuite/src/SQLiteTest.cpp b/Data/SQLite/testsuite/src/SQLiteTest.cpp
index 32b1dbe11..931e00e4d 100755
--- a/Data/SQLite/testsuite/src/SQLiteTest.cpp
+++ b/Data/SQLite/testsuite/src/SQLiteTest.cpp
@@ -464,7 +464,7 @@ void SQLiteTest::testInsertCharPointer()
 
 	pc = (const char*) std::calloc(9, sizeof(char));
 	poco_check_ptr (pc);
-	std::strncpy((char*) pc, "lastname", 8);
+	std::strncpy((char*) pc, "lastname", 9);
 	Statement stmt = (tmp << "INSERT INTO PERSON VALUES(:ln, :fn, :ad, :age)",
 		bind(pc),
 		bind("firstname"),
@@ -1376,6 +1376,21 @@ void SQLiteTest::testEmptyDB()
 }
 
 
+void SQLiteTest::testNonexistingDB()
+{
+	try
+	{
+		Session tmp (Poco::Data::SQLite::Connector::KEY, "foo/bar/nonexisting.db", 1);
+		fail("non-existing DB must throw");
+	}
+	catch(ConnectionFailedException& ex)
+	{
+		return;
+	}
+	fail("non-existing DB must throw ConnectionFailedException");
+}
+
+
 void SQLiteTest::testCLOB()
 {
 	std::string lastName("lastname");
@@ -3205,7 +3220,8 @@ void SQLiteTest::testTransaction()
 	std::string result;
 
 	session.setTransactionIsolation(Session::TRANSACTION_READ_COMMITTED);
-
+	session.setProperty(Poco::Data::SQLite::Utility::TRANSACTION_TYPE_PROPERTY_KEY,
+		Poco::Data::SQLite::TransactionType::EXCLUSIVE);
 	{
 		Transaction trans(session);
 		assertTrue (trans.isActive());
@@ -3227,7 +3243,8 @@ void SQLiteTest::testTransaction()
 	session << "SELECT count(*) FROM Person", into(count), now;
 	assertTrue (0 == count);
 	assertTrue (!session.isTransaction());
-
+	session.setProperty(Utility::TRANSACTION_TYPE_PROPERTY_KEY,
+		Poco::Data::SQLite::TransactionType::IMMEDIATE);
 	{
 		Transaction trans(session);
 		session << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now;
@@ -3436,6 +3453,19 @@ void SQLiteTest::testIllegalFilePath()
 	}
 }
 
+void SQLiteTest::testTransactionTypeProperty() 
+{
+	try {
+		using namespace Poco::Data::SQLite;
+
+		Session tmp(Connector::KEY, "dummy.db");
+		tmp.setProperty(Utility::TRANSACTION_TYPE_PROPERTY_KEY, TransactionType::EXCLUSIVE);
+		Poco::Any property = tmp.getProperty(Utility::TRANSACTION_TYPE_PROPERTY_KEY);
+		TransactionType value = Poco::RefAnyCast<TransactionType>(property);
+		assertTrue(value == TransactionType::EXCLUSIVE);
+	} catch (Poco::Exception&) {}
+}
+
 
 void SQLiteTest::setUp()
 {
@@ -3491,6 +3521,7 @@ CppUnit::Test* SQLiteTest::suite()
 	CppUnit_addTest(pSuite, SQLiteTest, testIllegalRange);
 	CppUnit_addTest(pSuite, SQLiteTest, testSingleSelect);
 	CppUnit_addTest(pSuite, SQLiteTest, testEmptyDB);
+	CppUnit_addTest(pSuite, SQLiteTest, testNonexistingDB);
 	CppUnit_addTest(pSuite, SQLiteTest, testCLOB);
 	CppUnit_addTest(pSuite, SQLiteTest, testBLOB);
 	CppUnit_addTest(pSuite, SQLiteTest, testTuple10);
@@ -3540,6 +3571,7 @@ CppUnit::Test* SQLiteTest::suite()
 	CppUnit_addTest(pSuite, SQLiteTest, testTransactor);
 	CppUnit_addTest(pSuite, SQLiteTest, testFTS3);
 	CppUnit_addTest(pSuite, SQLiteTest, testIllegalFilePath);
+	CppUnit_addTest(pSuite, SQLiteTest, testTransactionTypeProperty);
 
 	return pSuite;
 }
diff --git a/Data/SQLite/testsuite/src/SQLiteTest.h b/Data/SQLite/testsuite/src/SQLiteTest.h
index 76864945e..6e4f911ea 100755
--- a/Data/SQLite/testsuite/src/SQLiteTest.h
+++ b/Data/SQLite/testsuite/src/SQLiteTest.h
@@ -74,6 +74,7 @@ public:
 	void testIllegalRange();
 	void testSingleSelect();
 	void testEmptyDB();
+	void testNonexistingDB();
 
 	void testCLOB();
 	void testBLOB();
@@ -137,6 +138,7 @@ public:
 	void testFTS3();
 
 	void testIllegalFilePath();
+	void testTransactionTypeProperty();
 
 	void setUp();
 	void tearDown();
diff --git a/Data/SQLite/testsuite/src/WinCEDriver.cpp b/Data/SQLite/testsuite/src/WinCEDriver.cpp
index b05045b15..8fd5bc023 100644
--- a/Data/SQLite/testsuite/src/WinCEDriver.cpp
+++ b/Data/SQLite/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int wmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("SQLiteTestSuite", SQLiteTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/Data/doc/00300-DataDeveloperManual.page b/Data/doc/00300-DataDeveloperManual.page
index 5fdb7251e..abbbab862 100644
--- a/Data/doc/00300-DataDeveloperManual.page
+++ b/Data/doc/00300-DataDeveloperManual.page
@@ -11,25 +11,25 @@ Just implement the following interfaces:
   * Poco::Data::Connector
   * optional: Poco::Data::AbstractPreparation
 
-It is recommended to implement the classes from top to down (ie. start with Binder and Extractor) and to use a 
+It is recommended to implement the classes from top to down (ie. start with Binder and Extractor) and to use a
 namespace that has <[ Poco::Data ]> as parent, e.g.<[ Poco::Data::SQLite ]>.
 
 !!!AbstractBinder
-An <[AbstractBinder]> is a class that maps values to placeholders. It is also responsible to bind primitive C++ data types to database 
-data types. The constructor of the subclass should receive everything needed to bind variables to 
+An <[AbstractBinder]> is a class that maps values to placeholders. It is also responsible to bind primitive C++ data types to database
+data types. The constructor of the subclass should receive everything needed to bind variables to
 placeholders by position. An example taken from the SQLite implementation would be:
 
     Binder::Binder(sqlite3_stmt* pStmt):
         _pStmt(pStmt)
     {
     }
-    
+
     void Binder::bind(std::size_t pos, const Poco::Int32& val)
     {
         int rc = sqlite3_bind_int(_pStmt, (int)pos, val);
         checkReturn(rc);
     }
-    
+
     void Binder::bind(std::size_t pos, const Poco::Int16& val)
     {
         Poco::Int32 tmp = val;
@@ -43,55 +43,55 @@ All methods are public.
 
     AbstractBinder();
         /// Creates the AbstractBinder.
-    
+
     virtual ~AbstractBinder();
         /// Destroys the AbstractBinder.
-    
+
     virtual void bind(std::size_t pos, const Poco::Int8 &val) = 0;
         /// Binds an Int8.
-    
+
     virtual void bind(std::size_t pos, const Poco::UInt8 &val) = 0;
         /// Binds an UInt8.
-    
+
     virtual void bind(std::size_t pos, const Poco::Int16 &val) = 0;
         /// Binds an Int16.
-    
+
     virtual void bind(std::size_t pos, const Poco::UInt16 &val) = 0;
         /// Binds an UInt16.
-    
+
     virtual void bind(std::size_t pos, const Poco::Int32 &val) = 0;
         /// Binds an Int32.
-    
+
     virtual void bind(std::size_t pos, const Poco::UInt32 &val) = 0;
         /// Binds an UInt32.
-    
+
     virtual void bind(std::size_t pos, const Poco::Int64 &val) = 0;
         /// Binds an Int64.
-    
+
     virtual void bind(std::size_t pos, const Poco::UInt64 &val) = 0;
         /// Binds an UInt64.
-    
+
     virtual void bind(std::size_t pos, const bool &val) = 0;
         /// Binds a boolean.
-    
+
     virtual void bind(std::size_t pos, const float &val) = 0;
         /// Binds a float.
-    
+
     virtual void bind(std::size_t pos, const double &val) = 0;
         /// Binds a double.
-    
+
     virtual void bind(std::size_t pos, const char &val) = 0;
         /// Binds a single character.
-    
+
     virtual void bind(std::size_t pos, const char* const &pVal) = 0;
         /// Binds a const char ptr.
-    
+
     virtual void bind(std::size_t pos, const std::string& val) = 0;
         /// Binds a string.
-    
+
     virtual void bind(std::size_t pos, const BLOB& val) = 0;
         /// Binds a BLOB.
-    
+
     virtual void reset() = 0;
         /// Resets the internal state, called before a rebind
 ----
@@ -105,7 +105,7 @@ the incoming value but will simply return false. An example taken from the SQLit
         _pStmt(pStmt)
     {
     }
-    
+
     bool Extractor::extract(std::size_t pos, Poco::Int32& val)
     {
         if (isNull(pos<[
@@ -113,7 +113,7 @@ the incoming value but will simply return false. An example taken from the SQLit
         val = sqlite3_column_int(_pStmt, (int)pos);
         return true;
     }
-    
+
     bool Extractor::extract(std::size_t pos, Poco::Int16& val)
     {
         if (isNull(pos<[
@@ -128,49 +128,49 @@ All methods are public.
 
     AbstractExtractor();
         /// Creates the AbstractExtractor.
-    
+
     virtual ~AbstractExtractor();
         /// Destroys the AbstractExtractor.
-    
+
     virtual bool extract(std::size_t pos, Poco::Int8& val) = 0;
         /// Extracts an Int8. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, Poco::UInt8& val) = 0;
         /// Extracts an UInt8. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, Poco::Int16& val) = 0;
         /// Extracts an Int16. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, Poco::UInt16& val) = 0;
         /// Extracts an UInt16. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, Poco::Int32& val) = 0;
         /// Extracts an Int32. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, Poco::UInt32& val) = 0;
         /// Extracts an UInt32. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, Poco::Int64& val) = 0;
         /// Extracts an Int64. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, Poco::UInt64& val) = 0;
         /// Extracts an UInt64. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, bool& val) = 0;
         /// Extracts a boolean. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, float& val) = 0;
         /// Extracts a float. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, double& val) = 0;
         /// Extracts a double. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, char& val) = 0;
         /// Extracts a single character. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, std::string& val) = 0;
         /// Extracts a string. Returns false if null was received.
-    
+
     virtual bool extract(std::size_t pos, BLOB& val) = 0;
         /// Extracts a BLOB. Returns false if null was received.
 ----
@@ -196,7 +196,7 @@ The ODBC implementation is different:
        _myVec[pos] =  Poco::Any a(val);
        int* i = AnyCast<int>(&_myVec[pos]);
        //register int* i for output, Db specific
-    } 
+    }
 ----
 Extract now changes to:
 
@@ -213,49 +213,49 @@ Extract now changes to:
 
     AbstractPreparation();
         /// Creates the AbstractPreparation.
-    
+
     virtual ~AbstractPreparation();
         /// Destroys the AbstractPreparation.
-    
+
     virtual void prepare(std::size_t pos, Poco::Int8) = 0;
         /// Prepares an Int8.
-    
+
     virtual void prepare(std::size_t pos, Poco::UInt8) = 0;
         /// Prepares an UInt8.
-    
+
     virtual void prepare(std::size_t pos, Poco::Int16) = 0;
         /// Prepares an Int16.
-    
+
     virtual void prepare(std::size_t pos, Poco::UInt16) = 0;
         /// Prepares an UInt16.
-    
+
     virtual void prepare(std::size_t pos, Poco::Int32) = 0;
         /// Prepares an Int32.
-    
+
     virtual void prepare(std::size_t pos, Poco::UInt32) = 0;
         /// Prepares an UInt32.
-    
+
     virtual void prepare(std::size_t pos, Poco::Int64) = 0;
         /// Prepares an Int64.
-    
+
     virtual void prepare(std::size_t pos, Poco::UInt64) = 0;
         /// Prepares an UInt64.
-    
+
     virtual void prepare(std::size_t pos, bool) = 0;
         /// Prepares a boolean.
-    
+
     virtual void prepare(std::size_t pos, float) = 0;
         /// Prepares a float.
-    
+
     virtual void prepare(std::size_t pos, double) = 0;
         /// Prepares a double.
-    
+
     virtual void prepare(std::size_t pos, char) = 0;
         /// Prepares a single character.
-    
+
     virtual void prepare(std::size_t pos, const std::string& ) = 0;
         /// Prepares a string.
-    
+
     virtual void prepare(std::size_t pos, const BLOB&) = 0;
 ----
 
@@ -280,38 +280,38 @@ The interface it has to implement is given as:
     public:
         StatementImpl();
             /// Creates the StatementImpl.
-        
+
         virtual ~StatementImpl();
             /// Destroys the StatementImpl.
-    
+
     protected:
         virtual bool hasNext() = 0;
-            /// Returns true if a call to next() will return data. Note that the 
-            /// implementation must support several consecutive calls to hasNext 
-            /// without data getting lost, ie. hasNext(); hasNext(); next() must 
+            /// Returns true if a call to next() will return data. Note that the
+            /// implementation must support several consecutive calls to hasNext
+            /// without data getting lost, ie. hasNext(); hasNext(); next() must
             /// be equal to hasNext(); next();
-    
+
         virtual void next() = 0;
             /// Retrieves the next row from the resultset.
             /// Will throw, if the resultset is empty.
             /// Expects the statement to be compiled and bound
-    
+
         virtual bool canBind() const = 0;
             /// Returns if another bind is possible.
-    
+
         virtual void compileImpl() = 0;
             /// Compiles the statement, doesn't bind yet.
-            /// From now on AbstractBinder and AbstractExtractor 
+            /// From now on AbstractBinder and AbstractExtractor
             /// will be used
-    
+
         virtual void bindImpl() = 0;
             /// Binds parameters.
-    
+
         virtual AbstractExtractor& extractor() = 0;
             /// Returns the concrete extractor used by the statement.
-    
+
         virtual AbstractBinder& binder() = 0;
-            /// Returns the concrete binder used by the statement.  
+            /// Returns the concrete binder used by the statement.
 ----
 
 The Extracting and Binding objects can be accessed via the calls to the super-class methods <*extractings()*> and <*bindings()*>.
@@ -334,7 +334,7 @@ A high-level <*next*> implementation:
     if (!hasNext())
         throw Poco::Data::DataException("No data received");
     int nCol = countColumnsInResult...;
-    poco_assert (columnsHandled() == nCol); 
+    poco_assert (columnsHandled() == nCol);
     Poco::Data::AbstractExtractingVec::iterator it = extractings().begin();
     Poco::Data::AbstractExtractingVec::iterator itEnd = extractings().end();
     std::size_t pos = 0; // sqlite starts with pos 0 for results! your DB maybe with 1
@@ -354,7 +354,7 @@ A high-level <*hasNext*> implementation:
         cacheResult
         disablehasNext()
     }
-    
+
     return cachedResult;
 ----
 
@@ -362,13 +362,13 @@ A high-level <*compileImpl*>:
 
     if (compiled)
         return;
-    
+
     std::string sqlStmt(toString());
 
    if database expects placeholders in different format than ":name", parse and replace them
 
     compile statement;
-    
+
     create Binder;
     create Extractor;
 ----
@@ -378,7 +378,7 @@ A high-level <*canBind*>:
     bool ret = false;
     if (!bindings().empty() && validCompiledStatement)
         ret = (*bindings().begin())->canBind();
-    
+
     return ret;
 ----
 
@@ -388,13 +388,13 @@ The connection is opened in the constructor, and closed in the destructor.
 
     Poco::Data::StatementImpl* createStatementImpl();
         /// Returns an SQLite StatementImpl
-    
+
     void begin();
         /// Starts a transaction
-    
+
     void commit();
         /// Commits and ends a transaction
-    
+
     void rollback();
         /// Aborts a transaction
 ----
@@ -410,19 +410,19 @@ It should also have a static <*addToFactory()*> and a static <*removeFromFactory
     public:
         static const std::string KEY;
             /// Keyword for creating sessions
-    
+
         Connector();
             /// Creates the Connector.
-    
+
         ~Connector();
         /// Destroys the Connector.
-    
+
         Poco::AutoPtr < Poco::Data::SessionImpl > createSession(const std::string& connectionString);
             /// Creates a SessionImpl object and initializes it with the given connectionString.
-    
+
         static void registerConnector();
             /// Registers the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory
-    
+
         static void unregisterConnector();
             /// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory
     };
diff --git a/Data/include/Poco/Data/AbstractBinding.h b/Data/include/Poco/Data/AbstractBinding.h
index aaed3e6f8..4791d4b5e 100644
--- a/Data/include/Poco/Data/AbstractBinding.h
+++ b/Data/include/Poco/Data/AbstractBinding.h
@@ -68,7 +68,7 @@ public:
 	virtual std::size_t numOfRowsHandled() const = 0;
 		/// Returns the number of rows that the binding handles.
 		///
-		/// The trivial case will be one single row but 
+		/// The trivial case will be one single row but
 		/// for collection data types it can be larger.
 
 	virtual bool canBind() const = 0;
diff --git a/Data/include/Poco/Data/AbstractSessionImpl.h b/Data/include/Poco/Data/AbstractSessionImpl.h
index d01f73d47..43a45fe72 100644
--- a/Data/include/Poco/Data/AbstractSessionImpl.h
+++ b/Data/include/Poco/Data/AbstractSessionImpl.h
@@ -40,13 +40,13 @@ class AbstractSessionImpl: public SessionImpl
 public:
 	typedef void (C::*FeatureSetter)(const std::string&, bool);
 		/// The setter method for a feature.
-		
+
 	typedef bool (C::*FeatureGetter)(const std::string&) const;
 		/// The getter method for a feature.
-		
+
 	typedef void (C::*PropertySetter)(const std::string&, const Poco::Any&);
 		/// The setter method for a property.
-		
+
 	typedef Poco::Any (C::*PropertyGetter)(const std::string&) const;
 		/// The getter method for a property.
 
@@ -57,28 +57,28 @@ public:
 			_emptyStringIsNull(false),
 			_forceEmptyString(false)
 		/// Creates the AbstractSessionImpl.
-		/// 
-		/// Adds "storage" property and sets the default internal storage container 
+		///
+		/// Adds "storage" property and sets the default internal storage container
 		/// type to std::deque.
-		/// The storage is created by statements automatically whenever a query 
+		/// The storage is created by statements automatically whenever a query
 		/// returning results is executed but external storage is provided by the user.
 		/// Storage type can be reconfigured at runtime both globally (for the
-		/// duration of the session) and locally (for a single statement execution only). 
+		/// duration of the session) and locally (for a single statement execution only).
 		/// See StatementImpl for details on how this property is used at runtime.
-		/// 
+		///
 		/// Adds "handle" property which, if set by the back end, returns native handle
 		/// for the back end DB.
-		/// 
+		///
 		/// Adds "bulk" feature and sets it to false.
 		/// Bulk feature determines whether the session is capable of bulk operations.
-		/// Connectors that are capable of it must set this feature prior to attempting 
+		/// Connectors that are capable of it must set this feature prior to attempting
 		/// bulk operations.
 		///
 		/// Adds "emptyStringIsNull" feature and sets it to false. This feature should be
 		/// set to true in order to modify the behavior of the databases that distinguish
-		/// between zero-length character strings as nulls. Setting this feature to true 
+		/// between zero-length character strings as nulls. Setting this feature to true
 		/// shall disregard any difference between empty character strings and nulls,
-		/// causing the framework to treat them the same (i.e. behave like Oracle).		
+		/// causing the framework to treat them the same (i.e. behave like Oracle).
 		///
 		/// Adds "forceEmptyString" feature and sets it to false. This feature should be set
 		/// to true in order to force the databases that do not distinguish empty strings from
@@ -89,23 +89,23 @@ public:
 		/// resulting in default underlying database behavior.
 		///
 	{
-		addProperty("storage", 
-			&AbstractSessionImpl<C>::setStorage, 
+		addProperty("storage",
+			&AbstractSessionImpl<C>::setStorage,
 			&AbstractSessionImpl<C>::getStorage);
 
-		addProperty("handle", 
+		addProperty("handle",
 			&AbstractSessionImpl<C>::setHandle,
 			&AbstractSessionImpl<C>::getHandle);
 
-		addFeature("bulk", 
-			&AbstractSessionImpl<C>::setBulk, 
+		addFeature("bulk",
+			&AbstractSessionImpl<C>::setBulk,
 			&AbstractSessionImpl<C>::getBulk);
 
-		addFeature("emptyStringIsNull", 
+		addFeature("emptyStringIsNull",
 			&AbstractSessionImpl<C>::setEmptyStringIsNull,
 			&AbstractSessionImpl<C>::getEmptyStringIsNull);
 
-		addFeature("forceEmptyString", 
+		addFeature("forceEmptyString",
 			&AbstractSessionImpl<C>::setForceEmptyString,
 			&AbstractSessionImpl<C>::getForceEmptyString);
 	}
@@ -129,7 +129,7 @@ public:
 		}
 		else throw NotSupportedException(name);
 	}
-	
+
 	bool getFeature(const std::string& name)
 		/// Looks a feature up in the features map
 		/// and calls the feature's getter, if there is one.
@@ -144,7 +144,7 @@ public:
 		}
 		else throw NotSupportedException(name);
 	}
-	
+
 	void setProperty(const std::string& name, const Poco::Any& value)
 		/// Looks a property up in the properties map
 		/// and calls the property's setter, if there is one.
@@ -174,7 +174,7 @@ public:
 		}
 		else throw NotSupportedException(name);
 	}
-	
+
 	void setStorage(const std::string& value)
 		/// Sets the storage type.
 	{
@@ -186,7 +186,7 @@ public:
 	{
 		_storage = Poco::RefAnyCast<std::string>(value);
 	}
-		
+
 	Poco::Any getStorage(const std::string& name="") const
 		/// Returns the storage type
 	{
@@ -194,13 +194,13 @@ public:
 	}
 
 	void setHandle(const std::string& name, const Poco::Any& handle)
-		/// Sets the native session handle. 
+		/// Sets the native session handle.
 	{
 		_handle = handle;
 	}
-		
+
 	Poco::Any getHandle(const std::string& name="") const
-		/// Returns the native session handle. 
+		/// Returns the native session handle.
 	{
 		return _handle;
 	}
@@ -210,7 +210,7 @@ public:
 	{
 		_bulk = bulk;
 	}
-		
+
 	bool getBulk(const std::string& name="") const
 		/// Returns the execution type
 	{
@@ -228,7 +228,7 @@ public:
 
 		_emptyStringIsNull = emptyStringIsNull;
 	}
-		
+
 	bool getEmptyStringIsNull(const std::string& name="") const
 		/// Returns the setting for the behavior regarding empty variable
 		/// length strings. See setEmptyStringIsNull(const std::string&, bool)
@@ -249,7 +249,7 @@ public:
 
 		_forceEmptyString = forceEmptyString;
 	}
-		
+
 	bool getForceEmptyString(const std::string& name="") const
 		/// Returns the setting for the behavior regarding empty variable
 		/// length strings. See setForceEmptyString(const std::string&, bool)
@@ -270,7 +270,7 @@ protected:
 		feature.getter = getter;
 		_features[name] = feature;
 	}
-		
+
 	void addProperty(const std::string& name, PropertySetter setter, PropertyGetter getter)
 		/// Adds a property to the map of supported properties.
 		///
@@ -289,16 +289,16 @@ private:
 		FeatureSetter setter;
 		FeatureGetter getter;
 	};
-	
+
 	struct Property
 	{
 		PropertySetter setter;
 		PropertyGetter getter;
 	};
-	
+
 	using FeatureMap = std::map<std::string, Feature>;
 	using PropertyMap = std::map<std::string, Property>;
-	
+
 	FeatureMap  _features;
 	PropertyMap _properties;
 	std::string _storage;
diff --git a/Data/include/Poco/Data/ArchiveStrategy.h b/Data/include/Poco/Data/ArchiveStrategy.h
index 2f4befac9..24116efec 100644
--- a/Data/include/Poco/Data/ArchiveStrategy.h
+++ b/Data/include/Poco/Data/ArchiveStrategy.h
@@ -36,9 +36,9 @@ class Data_API ArchiveStrategy
 public:
 	static const std::string DEFAULT_ARCHIVE_DESTINATION;
 
-	ArchiveStrategy(const std::string& connector, 
-		const std::string& connect, 
-		const std::string& source, 
+	ArchiveStrategy(const std::string& connector,
+		const std::string& connect,
+		const std::string& source,
 		const std::string& destination = DEFAULT_ARCHIVE_DESTINATION);
 		/// Creates archive strategy.
 
@@ -83,7 +83,7 @@ protected:
 	Statement& getDeleteStatement();
 	Statement& getCountStatement();
 private:
-	
+
 	ArchiveStrategy();
 	ArchiveStrategy(const ArchiveStrategy&);
 	ArchiveStrategy& operator = (const ArchiveStrategy&);
@@ -177,11 +177,11 @@ class Data_API ArchiveByAgeStrategy: public ArchiveStrategy
 	/// Archives rows scheduled for archiving.
 {
 public:
-	ArchiveByAgeStrategy(const std::string& connector, 
-		const std::string& connect, 
-		const std::string& sourceTable, 
+	ArchiveByAgeStrategy(const std::string& connector,
+		const std::string& connect,
+		const std::string& sourceTable,
 		const std::string& destinationTable = DEFAULT_ARCHIVE_DESTINATION);
-	
+
 	~ArchiveByAgeStrategy();
 
 	void archive();
diff --git a/Data/include/Poco/Data/Binding.h b/Data/include/Poco/Data/Binding.h
index d8cdc7564..9585f85e4 100644
--- a/Data/include/Poco/Data/Binding.h
+++ b/Data/include/Poco/Data/Binding.h
@@ -40,10 +40,10 @@ namespace Data {
 template <class T>
 class Binding: public AbstractBinding
 	/// Binding maps a value or multiple values (see Binding specializations for STL containers as
-	/// well as type handlers) to database column(s). Values to be bound can be either mapped 
+	/// well as type handlers) to database column(s). Values to be bound can be either mapped
 	/// directly (by reference) or a copy can be created, depending on the value of the copy argument.
 	/// To pass a reference to a variable, it is recommended to pass it to the intermediate
-	/// utility function use(), which will create the proper binding. In cases when a reference 
+	/// utility function use(), which will create the proper binding. In cases when a reference
 	/// is passed to binding, the storage it refers to must be valid at the statement execution time.
 	/// To pass a copy of a variable, constant or string literal, use utility function bind().
 	/// Variables can be passed as either copies or references (i.e. using either use() or bind()).
@@ -57,10 +57,10 @@ public:
 	using Ptr = SharedPtr<Type>;
 
 	explicit Binding(T& val,
-		const std::string& name = "", 
-		Direction direction = PD_IN): 
+		const std::string& name = "",
+		Direction direction = PD_IN):
 		AbstractBinding(name, direction),
-		_val(val), 
+		_val(val),
 		_bound(false)
 		/// Creates the Binding using the passed reference as bound value.
 		/// If copy is true, a copy of the value referred to is created.
@@ -112,10 +112,10 @@ private:
 template <class T>
 class CopyBinding: public AbstractBinding
 	/// Binding maps a value or multiple values (see Binding specializations for STL containers as
-	/// well as type handlers) to database column(s). Values to be bound can be either mapped 
+	/// well as type handlers) to database column(s). Values to be bound can be either mapped
 	/// directly (by reference) or a copy can be created, depending on the value of the copy argument.
 	/// To pass a reference to a variable, it is recommended to pass it to the intermediate
-	/// utility function use(), which will create the proper binding. In cases when a reference 
+	/// utility function use(), which will create the proper binding. In cases when a reference
 	/// is passed to binding, the storage it refers to must be valid at the statement execution time.
 	/// To pass a copy of a variable, constant or string literal, use utility function bind().
 	/// Variables can be passed as either copies or references (i.e. using either use() or bind()).
@@ -127,8 +127,8 @@ public:
 	using Ptr = SharedPtr<Type>;
 
 	explicit CopyBinding(T& val,
-		const std::string& name = "", 
-		Direction direction = PD_IN): 
+		const std::string& name = "",
+		Direction direction = PD_IN):
 		AbstractBinding(name, direction),
 		_pVal(new T(val)),
 		_bound(false)
@@ -189,10 +189,10 @@ public:
 	using Type = Binding<const char*>;
 	using Ptr = SharedPtr<Type>;
 
-	explicit Binding(const char* pVal, 
+	explicit Binding(const char* pVal,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
 		_val(pVal ? pVal : throw NullPointerException() ),
 		_bound(false)
 		/// Creates the Binding by copying the passed string.
@@ -251,10 +251,10 @@ public:
 	using Type = CopyBinding<const char*>;
 	using Ptr = SharedPtr<Type>;
 
-	explicit CopyBinding(const char* pVal, 
+	explicit CopyBinding(const char* pVal,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
 		_val(pVal ? pVal : throw NullPointerException() ),
 		_bound(false)
 		/// Creates the Binding by copying the passed string.
@@ -312,12 +312,12 @@ public:
 	using Ptr = SharedPtr<Binding<ValType>>;
 	using Iterator = typename ValType::const_iterator;
 
-	explicit Binding(std::vector<T>& val, 
-		const std::string& name = "", 
-		Direction direction = PD_IN): 
+	explicit Binding(std::vector<T>& val,
+		const std::string& name = "",
+		Direction direction = PD_IN):
 		AbstractBinding(name, direction),
-		_val(val), 
-		_begin(), 
+		_val(val),
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -350,7 +350,7 @@ public:
 	{
 		poco_assert_dbg(!getBinder().isNull());
 		poco_assert_dbg(canBind());
-		
+
 		TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
 		++_begin;
 	}
@@ -373,18 +373,18 @@ class CopyBinding<std::vector<T>>: public AbstractBinding
 	/// Specialization for std::vector.
 {
 public:
-	
+
 	using ValType = std::vector<T>;
 	using ValPtr = SharedPtr<ValType>;
 	using Ptr = SharedPtr<CopyBinding<ValType>>;
 	using Iterator = typename ValType::const_iterator;
 
-	explicit CopyBinding(std::vector<T>& val, 
-		const std::string& name = "", 
-		Direction direction = PD_IN): 
+	explicit CopyBinding(std::vector<T>& val,
+		const std::string& name = "",
+		Direction direction = PD_IN):
 		AbstractBinding(name, direction),
 		_pVal(new std::vector<T>(val)),
-		_begin(), 
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -417,7 +417,7 @@ public:
 	{
 		poco_assert_dbg(!getBinder().isNull());
 		poco_assert_dbg(canBind());
-		
+
 		TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
 		++_begin;
 	}
@@ -439,14 +439,14 @@ template <>
 class Binding<std::vector<bool>>: public AbstractBinding
 	/// Specialization for std::vector<bool>.
 	/// This specialization is necessary due to the nature of std::vector<bool>.
-	/// For details, see the standard library implementation of std::vector<bool> 
+	/// For details, see the standard library implementation of std::vector<bool>
 	/// or
 	/// S. Meyers: "Effective STL" (Copyright Addison-Wesley 2001),
 	/// Item 18: "Avoid using vector<bool>."
-	/// 
+	///
 	/// The workaround employed here is using std::deque<bool> as an
-	/// internal replacement container. 
-	/// 
+	/// internal replacement container.
+	///
 	/// IMPORTANT:
 	/// Only IN binding is supported.
 {
@@ -456,13 +456,13 @@ public:
 	using Ptr = SharedPtr<Binding<ValType>>;
 	using Iterator = ValType::const_iterator;
 
-	explicit Binding(const std::vector<bool>& val, 
-		const std::string& name = "", 
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
-		_val(val), 
+	explicit Binding(const std::vector<bool>& val,
+		const std::string& name = "",
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
+		_val(val),
 		_deq(_val.begin(), _val.end()),
-		_begin(), 
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -520,14 +520,14 @@ template <>
 class CopyBinding<std::vector<bool>>: public AbstractBinding
 	/// Specialization for std::vector<bool>.
 	/// This specialization is necessary due to the nature of std::vector<bool>.
-	/// For details, see the standard library implementation of std::vector<bool> 
+	/// For details, see the standard library implementation of std::vector<bool>
 	/// or
 	/// S. Meyers: "Effective STL" (Copyright Addison-Wesley 2001),
 	/// Item 18: "Avoid using vector<bool>."
-	/// 
+	///
 	/// The workaround employed here is using std::deque<bool> as an
-	/// internal replacement container. 
-	/// 
+	/// internal replacement container.
+	///
 	/// IMPORTANT:
 	/// Only IN binding is supported.
 {
@@ -537,12 +537,12 @@ public:
 	using Ptr = SharedPtr<CopyBinding<ValType>>;
 	using Iterator = ValType::const_iterator;
 
-	explicit CopyBinding(const std::vector<bool>& val, 
-		const std::string& name = "", 
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
+	explicit CopyBinding(const std::vector<bool>& val,
+		const std::string& name = "",
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
 		_deq(val.begin(), val.end()),
-		_begin(), 
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -608,10 +608,10 @@ public:
 
 	explicit Binding(std::list<T>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
-		_val(val), 
-		_begin(), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
+		_val(val),
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -673,10 +673,10 @@ public:
 
 	explicit CopyBinding(ValType& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
 		_pVal(new std::list<T>(val)),
-		_begin(), 
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -738,10 +738,10 @@ public:
 
 	explicit Binding(std::deque<T>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
-		_val(val), 
-		_begin(), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
+		_val(val),
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -803,10 +803,10 @@ public:
 
 	explicit CopyBinding(std::deque<T>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
 		_pVal(new std::deque<T>(val)),
-		_begin(), 
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -868,10 +868,10 @@ public:
 
 	explicit Binding(std::set<T>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
-		_val(val), 
-		_begin(), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
+		_val(val),
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -933,10 +933,10 @@ public:
 
 	explicit CopyBinding(std::set<T>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
 		_pVal(new std::set<T>(val)),
-		_begin(), 
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -998,10 +998,10 @@ public:
 
 	explicit Binding(std::multiset<T>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
-		_val(val), 
-		_begin(), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
+		_val(val),
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -1063,10 +1063,10 @@ public:
 
 	explicit CopyBinding(std::multiset<T>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
 		_pVal(new std::multiset<T>(val)),
-		_begin(), 
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -1128,10 +1128,10 @@ public:
 
 	explicit Binding(std::map<K, V>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
-		_val(val), 
-		_begin(), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
+		_val(val),
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -1193,10 +1193,10 @@ public:
 
 	explicit CopyBinding(std::map<K, V>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
 		_pVal(new std::map<K, V>(val)),
-		_begin(), 
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -1258,10 +1258,10 @@ public:
 
 	explicit Binding(std::multimap<K, V>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
-		_val(val), 
-		_begin(), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
+		_val(val),
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -1323,10 +1323,10 @@ public:
 
 	explicit CopyBinding(std::multimap<K, V>& val,
 		const std::string& name = "",
-		Direction direction = PD_IN): 
-		AbstractBinding(name, direction), 
+		Direction direction = PD_IN):
+		AbstractBinding(name, direction),
 		_pVal(new std::multimap<K, V>(val)),
-		_begin(), 
+		_begin(),
 		_end()
 		/// Creates the Binding.
 	{
@@ -1379,13 +1379,13 @@ private:
 namespace Keywords {
 
 
-template <typename T> 
+template <typename T>
 inline AbstractBinding::Ptr use(T& t, const std::string& name = "")
 	/// Convenience function for a more compact Binding creation.
 {
 	// If this fails to compile, a const ref was passed to use().
 	// This can be resolved by either (a) using bind (which will copy the value),
-	// or (b) if the const ref is guaranteed to exist when execute is called 
+	// or (b) if the const ref is guaranteed to exist when execute is called
 	// (which can be much later!), by using the "useRef" keyword instead
 	poco_static_assert (!IsConst<T>::VALUE);
 	return new Binding<T>(t, name, AbstractBinding::PD_IN);
@@ -1399,7 +1399,7 @@ inline AbstractBinding::Ptr use(const NullData& t, const std::string& name = "")
 }
 
 
-template <typename T> 
+template <typename T>
 inline AbstractBinding::Ptr useRef(T& t, const std::string& name = "")
 	/// Convenience function for a more compact Binding creation.
 {
@@ -1407,7 +1407,7 @@ inline AbstractBinding::Ptr useRef(T& t, const std::string& name = "")
 }
 
 
-template <typename T> 
+template <typename T>
 inline AbstractBinding::Ptr in(T& t, const std::string& name = "")
 	/// Convenience function for a more compact Binding creation.
 {
@@ -1422,7 +1422,7 @@ inline AbstractBinding::Ptr in(const NullData& t, const std::string& name = "")
 }
 
 
-template <typename T> 
+template <typename T>
 inline AbstractBinding::Ptr out(T& t)
 	/// Convenience function for a more compact Binding creation.
 {
@@ -1431,7 +1431,7 @@ inline AbstractBinding::Ptr out(T& t)
 }
 
 
-template <typename T> 
+template <typename T>
 inline AbstractBinding::Ptr io(T& t)
 	/// Convenience function for a more compact Binding creation.
 {
@@ -1468,7 +1468,7 @@ inline AbstractBindingVec& io(AbstractBindingVec& bv)
 }
 
 
-template <typename T> 
+template <typename T>
 inline AbstractBinding::Ptr bind(T t, const std::string& name)
 	/// Convenience function for a more compact Binding creation.
 	/// This funtion differs from use() in its value copy semantics.
@@ -1477,7 +1477,7 @@ inline AbstractBinding::Ptr bind(T t, const std::string& name)
 }
 
 
-template <typename T> 
+template <typename T>
 inline AbstractBinding::Ptr bind(T t)
 	/// Convenience function for a more compact Binding creation.
 	/// This funtion differs from use() in its value copy semantics.
diff --git a/Data/include/Poco/Data/Bulk.h b/Data/include/Poco/Data/Bulk.h
index 7b30ae633..f55d4008c 100644
--- a/Data/include/Poco/Data/Bulk.h
+++ b/Data/include/Poco/Data/Bulk.h
@@ -42,9 +42,9 @@ public:
 		/// Returns the limit asociated with this bulk object.
 
 	Poco::UInt32 size() const;
-		/// Returns the value of the limit asociated with 
+		/// Returns the value of the limit asociated with
 		/// this bulk object.
-	
+
 private:
 	Bulk();
 
@@ -55,15 +55,15 @@ private:
 ///
 /// inlines
 ///
-inline const Limit& Bulk::limit() const 
-{ 
-	return _limit; 
+inline const Limit& Bulk::limit() const
+{
+	return _limit;
 }
 
 
-inline Poco::UInt32 Bulk::size() const 
-{ 
-	return _limit.value(); 
+inline Poco::UInt32 Bulk::size() const
+{
+	return _limit.value();
 }
 
 
diff --git a/Data/include/Poco/Data/BulkBinding.h b/Data/include/Poco/Data/BulkBinding.h
index a1a4004b2..51637e6b4 100644
--- a/Data/include/Poco/Data/BulkBinding.h
+++ b/Data/include/Poco/Data/BulkBinding.h
@@ -35,13 +35,13 @@ namespace Data {
 
 template <class T>
 class BulkBinding: public AbstractBinding
-	/// A BulkBinding maps a value to a column. 
+	/// A BulkBinding maps a value to a column.
 	/// Bulk binding support is provided only for std::vector.
 {
 public:
-	BulkBinding(const T& val, Poco::UInt32 bulkSize, const std::string& name = "", Direction direction = PD_IN): 
-		AbstractBinding(name, direction, bulkSize), 
-		_val(val), 
+	BulkBinding(const T& val, Poco::UInt32 bulkSize, const std::string& name = "", Direction direction = PD_IN):
+		AbstractBinding(name, direction, bulkSize),
+		_val(val),
 		_bound(false)
 		/// Creates the BulkBinding.
 	{
@@ -91,7 +91,7 @@ private:
 namespace Keywords {
 
 
-template <typename T> 
+template <typename T>
 AbstractBinding::Ptr use(const std::vector<T>& t, BulkFnType, const std::string& name = "")
 	/// Convenience function for a more compact BulkBinding creation for std::vector.
 {
@@ -99,7 +99,7 @@ AbstractBinding::Ptr use(const std::vector<T>& t, BulkFnType, const std::string&
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractBinding::Ptr in(const std::vector<T>& t, BulkFnType, const std::string& name = "")
 	/// Convenience function for a more compact BulkBinding creation for std::vector.
 {
@@ -107,7 +107,7 @@ AbstractBinding::Ptr in(const std::vector<T>& t, BulkFnType, const std::string&
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractBinding::Ptr use(const std::deque<T>& t, BulkFnType, const std::string& name = "")
 	/// Convenience function for a more compact BulkBinding creation for std::deque.
 {
@@ -115,7 +115,7 @@ AbstractBinding::Ptr use(const std::deque<T>& t, BulkFnType, const std::string&
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractBinding::Ptr in(const std::deque<T>& t, BulkFnType, const std::string& name = "")
 	/// Convenience function for a more compact BulkBinding creation for std::deque.
 {
@@ -123,7 +123,7 @@ AbstractBinding::Ptr in(const std::deque<T>& t, BulkFnType, const std::string& n
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractBinding::Ptr use(const std::list<T>& t, BulkFnType, const std::string& name = "")
 	/// Convenience function for a more compact BulkBinding creation for std::list.
 {
@@ -131,7 +131,7 @@ AbstractBinding::Ptr use(const std::list<T>& t, BulkFnType, const std::string& n
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractBinding::Ptr in(const std::list<T>& t, BulkFnType, const std::string& name = "")
 	/// Convenience function for a more compact BulkBinding creation for std::list.
 {
diff --git a/Data/include/Poco/Data/BulkExtraction.h b/Data/include/Poco/Data/BulkExtraction.h
index bb61a1500..0ed297952 100644
--- a/Data/include/Poco/Data/BulkExtraction.h
+++ b/Data/include/Poco/Data/BulkExtraction.h
@@ -44,18 +44,18 @@ public:
 	using Type = BulkExtraction<ValType>;
 	using Ptr = SharedPtr<Type>;
 
-	BulkExtraction(C& result, Poco::UInt32 limit, const Position& pos = Position(0)): 
+	BulkExtraction(C& result, Poco::UInt32 limit, const Position& pos = Position(0)):
 		AbstractExtraction(limit, pos.value(), true),
-		_rResult(result), 
+		_rResult(result),
 		_default()
 	{
 		if (static_cast<Poco::UInt32>(result.size()) != limit)
 			result.resize(limit);
 	}
 
-	BulkExtraction(C& result, const CValType& def, Poco::UInt32 limit, const Position& pos = Position(0)): 
+	BulkExtraction(C& result, const CValType& def, Poco::UInt32 limit, const Position& pos = Position(0)):
 		AbstractExtraction(limit, pos.value(), true),
-		_rResult(result), 
+		_rResult(result),
 		_default(def)
 	{
 		if (static_cast<Poco::UInt32>(result.size()) != limit)
@@ -88,8 +88,8 @@ public:
 			return _nulls.at(row);
 		}
 		catch (std::out_of_range& ex)
-		{ 
-			throw RangeException(ex.what()); 
+		{
+			throw RangeException(ex.what());
 		}
 	}
 
@@ -137,7 +137,7 @@ template <class C>
 class InternalBulkExtraction: public BulkExtraction<C>
 	/// Container Data Type specialization extension for extraction of values from a query result set.
 	///
-	/// This class is intended for PocoData internal use - it is used by StatementImpl 
+	/// This class is intended for PocoData internal use - it is used by StatementImpl
 	/// to automaticaly create internal BulkExtraction in cases when statement returns data and no external storage
 	/// was supplied. It is later used by RecordSet to retrieve the fetched data after statement execution.
 	/// It takes ownership of the Column pointer supplied as constructor argument. Column object, in turn
@@ -155,8 +155,8 @@ public:
 	InternalBulkExtraction(C& result,
 		Column<C>* pColumn,
 		Poco::UInt32 limit,
-		const Position& pos = Position(0)): 
-		BulkExtraction<C>(result, CValType(), limit, pos), 
+		const Position& pos = Position(0)):
+		BulkExtraction<C>(result, CValType(), limit, pos),
 		_pColumn(pColumn)
 		/// Creates InternalBulkExtraction.
 	{
@@ -171,17 +171,17 @@ public:
 	void reset()
 	{
 		_pColumn->reset();
-	}	
+	}
 
 	const CValType& value(int index) const
 	{
 		try
-		{ 
-			return BulkExtraction<C>::result().at(index); 
+		{
+			return BulkExtraction<C>::result().at(index);
 		}
 		catch (std::out_of_range& ex)
-		{ 
-			throw RangeException(ex.what()); 
+		{
+			throw RangeException(ex.what());
 		}
 	}
 
@@ -207,7 +207,7 @@ private:
 namespace Keywords {
 
 
-template <typename T> 
+template <typename T>
 AbstractExtraction::Ptr into(std::vector<T>& t, const Bulk& bulk, const Position& pos = Position(0))
 	/// Convenience function to allow for a more compact creation of an extraction object
 	/// with std::vector bulk extraction support.
@@ -216,7 +216,7 @@ AbstractExtraction::Ptr into(std::vector<T>& t, const Bulk& bulk, const Position
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractExtraction::Ptr into(std::vector<T>& t, BulkFnType, const Position& pos = Position(0))
 	/// Convenience function to allow for a more compact creation of an extraction object
 	/// with std::vector bulk extraction support.
@@ -227,7 +227,7 @@ AbstractExtraction::Ptr into(std::vector<T>& t, BulkFnType, const Position& pos
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractExtraction::Ptr into(std::deque<T>& t, const Bulk& bulk, const Position& pos = Position(0))
 	/// Convenience function to allow for a more compact creation of an extraction object
 	/// with std::deque bulk extraction support.
@@ -236,7 +236,7 @@ AbstractExtraction::Ptr into(std::deque<T>& t, const Bulk& bulk, const Position&
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractExtraction::Ptr into(std::deque<T>& t, BulkFnType, const Position& pos = Position(0))
 	/// Convenience function to allow for a more compact creation of an extraction object
 	/// with std::deque bulk extraction support.
@@ -247,7 +247,7 @@ AbstractExtraction::Ptr into(std::deque<T>& t, BulkFnType, const Position& pos =
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractExtraction::Ptr into(std::list<T>& t, const Bulk& bulk, const Position& pos = Position(0))
 	/// Convenience function to allow for a more compact creation of an extraction object
 	/// with std::list bulk extraction support.
@@ -256,7 +256,7 @@ AbstractExtraction::Ptr into(std::list<T>& t, const Bulk& bulk, const Position&
 }
 
 
-template <typename T> 
+template <typename T>
 AbstractExtraction::Ptr into(std::list<T>& t, BulkFnType, const Position& pos = Position(0))
 	/// Convenience function to allow for a more compact creation of an extraction object
 	/// with std::list bulk extraction support.
diff --git a/Data/include/Poco/Data/Column.h b/Data/include/Poco/Data/Column.h
index c6764b4c9..83469f225 100644
--- a/Data/include/Poco/Data/Column.h
+++ b/Data/include/Poco/Data/Column.h
@@ -34,7 +34,7 @@ namespace Data {
 template <class C>
 class Column
 	/// Column class is column data container.
-	/// Data (a pointer to underlying STL container) is assigned to the class 
+	/// Data (a pointer to underlying STL container) is assigned to the class
 	/// at construction time. Construction with null pointer is not allowed.
 	/// This class owns the data assigned to it and deletes the storage on destruction.
 {
@@ -46,7 +46,7 @@ public:
 	using Size = typename C::size_type;
 	using Type = typename C::value_type;
 
-	Column(const MetaColumn& metaColumn, Container* pData): 
+	Column(const MetaColumn& metaColumn, Container* pData):
 		_metaColumn(metaColumn),
 		_pData(pData)
 		/// Creates the Column.
@@ -55,15 +55,15 @@ public:
 			throw NullPointerException("Container pointer must point to valid storage.");
 	}
 
-	Column(const Column& col): 
-		_metaColumn(col._metaColumn), 
+	Column(const Column& col):
+		_metaColumn(col._metaColumn),
 		_pData(col._pData)
 		/// Creates the Column.
 	{
 	}
 
-	Column(Column&& col) noexcept: 
-		_metaColumn(std::move(col._metaColumn)), 
+	Column(Column&& col) noexcept:
+		_metaColumn(std::move(col._metaColumn)),
 		_pData(std::move(col._pData))
 		/// Creates the Column.
 	{
@@ -90,7 +90,7 @@ public:
 		return *this;
 	}
 
-	void swap(Column& other)
+	void swap(Column& other) noexcept
 		/// Swaps the column with another one.
 	{
 		using std::swap;
@@ -112,8 +112,8 @@ public:
 			return _pData->at(row);
 		}
 		catch (std::out_of_range& ex)
-		{ 
-			throw RangeException(ex.what()); 
+		{
+			throw RangeException(ex.what());
 		}
 	}
 
@@ -189,13 +189,13 @@ private:
 template <>
 class Column<std::vector<bool>>
 	/// The std::vector<bool> specialization for the Column class.
-	/// 
+	///
 	/// This specialization is necessary due to the nature of std::vector<bool>.
-	/// For details, see the standard library implementation of vector<bool> 
+	/// For details, see the standard library implementation of vector<bool>
 	/// or
 	/// S. Meyers: "Effective STL" (Copyright Addison-Wesley 2001),
 	/// Item 18: "Avoid using vector<bool>."
-	/// 
+	///
 	/// The workaround employed here is using deque<bool> as an
 	/// internal "companion" container kept in sync with the vector<bool>
 	/// column data.
@@ -207,8 +207,8 @@ public:
 	using RIterator = Container::const_reverse_iterator;
 	using Size = Container::size_type;
 
-	Column(const MetaColumn& metaColumn, Container* pData): 
-		_metaColumn(metaColumn), 
+	Column(const MetaColumn& metaColumn, Container* pData):
+		_metaColumn(metaColumn),
 		_pData(pData)
 		/// Creates the Column.
 	{
@@ -216,8 +216,8 @@ public:
 		_deque.assign(_pData->begin(), _pData->end());
 	}
 
-	Column(const Column& col): 
-		_metaColumn(col._metaColumn), 
+	Column(const Column& col):
+		_metaColumn(col._metaColumn),
 		_pData(col._pData)
 		/// Creates the Column.
 	{
@@ -237,7 +237,7 @@ public:
 		return *this;
 	}
 
-	void swap(Column& other)
+	void swap(Column& other) noexcept
 		/// Swaps the column with another one.
 	{
 		using std::swap;
@@ -263,8 +263,8 @@ public:
 			return _deque.at(row) = _pData->at(row);
 		}
 		catch (std::out_of_range& ex)
-		{ 
-			throw RangeException(ex.what()); 
+		{
+			throw RangeException(ex.what());
 		}
 	}
 
@@ -350,8 +350,8 @@ public:
 	using RIterator = typename Container::const_reverse_iterator;
 	using Size = typename Container::size_type;
 
-	Column(const MetaColumn& metaColumn, std::list<T>* pData): 
-		_metaColumn(metaColumn), 
+	Column(const MetaColumn& metaColumn, std::list<T>* pData):
+		_metaColumn(metaColumn),
 		_pData(pData)
 		/// Creates the Column.
 	{
@@ -378,7 +378,7 @@ public:
 		return *this;
 	}
 
-	void swap(Column& other)
+	void swap(Column& other) noexcept
 		/// Swaps the column with another one.
 	{
 		using std::swap;
@@ -395,7 +395,7 @@ public:
 	const T& value(std::size_t row) const
 		/// Returns the field value in specified row.
 		/// This is the std::list specialization and std::list
-		/// is not the optimal solution for cases where random 
+		/// is not the optimal solution for cases where random
 		/// access is needed.
 		/// However, to allow for compatibility with other
 		/// containers, this functionality is provided here.
@@ -419,7 +419,7 @@ public:
 				if (i == row) return *it;
 		}
 
-		throw RangeException("Invalid row number."); 
+		throw RangeException("Invalid row number.");
 	}
 
 	const T& operator [] (std::size_t row) const
@@ -492,7 +492,7 @@ private:
 
 
 template <typename C>
-inline void swap(Column<C>& c1, Column<C>& c2)
+inline void swap(Column<C>& c1, Column<C>& c2) noexcept
 {
 	c1.swap(c2);
 }
diff --git a/Data/include/Poco/Data/Date.h b/Data/include/Poco/Data/Date.h
index 4ac234bb7..9340ef7cb 100644
--- a/Data/include/Poco/Data/Date.h
+++ b/Data/include/Poco/Data/Date.h
@@ -174,7 +174,7 @@ public:
 	~VarHolderImpl()
 	{
 	}
-	
+
 	const std::type_info& type() const
 	{
 		return typeid(Poco::Data::Date);
@@ -207,7 +207,7 @@ public:
 	{
 		return cloneHolder(pVarHolder, _val);
 	}
-	
+
 	const Poco::Data::Date& value() const
 	{
 		return _val;
diff --git a/Data/include/Poco/Data/LOB.h b/Data/include/Poco/Data/LOB.h
index ea8e842f3..61b4b1a82 100644
--- a/Data/include/Poco/Data/LOB.h
+++ b/Data/include/Poco/Data/LOB.h
@@ -109,7 +109,7 @@ public:
 		return *_pContent != *other._pContent;
 	}
 
-	void swap(LOB& other)
+	void swap(LOB& other) noexcept
 		/// Swaps the LOB with another one.
 	{
 		using std::swap;
@@ -228,7 +228,7 @@ using JSON = std::string;
 //
 
 template <typename T>
-inline void swap(LOB<T>& b1, LOB<T>& b2)
+inline void swap(LOB<T>& b1, LOB<T>& b2) noexcept
 {
 	b1.swap(b2);
 }
diff --git a/Data/include/Poco/Data/LOBStream.h b/Data/include/Poco/Data/LOBStream.h
index b3cbc5c34..a5f9ef701 100644
--- a/Data/include/Poco/Data/LOBStream.h
+++ b/Data/include/Poco/Data/LOBStream.h
@@ -33,7 +33,7 @@ template <typename T>
 class LOBStreamBuf: public BasicUnbufferedStreamBuf<T, std::char_traits<T>>
 	/// This is the streambuf class used for reading from and writing to a LOB.
 {
-public:	
+public:
 	LOBStreamBuf(LOB<T>& lob): _lob(lob), _it(_lob.begin())
 		/// Creates LOBStreamBuf.
 	{
diff --git a/Data/include/Poco/Data/Limit.h b/Data/include/Poco/Data/Limit.h
index 73bccf90b..80dcdc27c 100644
--- a/Data/include/Poco/Data/Limit.h
+++ b/Data/include/Poco/Data/Limit.h
@@ -35,9 +35,9 @@ public:
 	{
 		LIMIT_UNLIMITED = ~((SizeT) 0)
 	};
-	
+
 	Limit(SizeT value, bool hardLimit = false, bool isLowerLimit = false);
-		/// Creates the Limit. 
+		/// Creates the Limit.
 		///
 		/// Value contains the upper row hint, if hardLimit is set to true, the limit acts as a hard
 		/// border, ie. every query must return exactly value rows, returning more than value objects will throw an exception!
diff --git a/Data/include/Poco/Data/MetaColumn.h b/Data/include/Poco/Data/MetaColumn.h
index 0351766f1..99a1b0db1 100644
--- a/Data/include/Poco/Data/MetaColumn.h
+++ b/Data/include/Poco/Data/MetaColumn.h
@@ -78,7 +78,7 @@ public:
 	MetaColumn& operator = (MetaColumn&& other) noexcept;
 		/// Assignment operator.
 
-	void swap(MetaColumn& other);
+	void swap(MetaColumn& other) noexcept;
 		/// Swaps the contents with another instance.
 
 	~MetaColumn();
diff --git a/Data/include/Poco/Data/PooledSessionHolder.h b/Data/include/Poco/Data/PooledSessionHolder.h
index 8924589fb..fbf2b70e3 100644
--- a/Data/include/Poco/Data/PooledSessionHolder.h
+++ b/Data/include/Poco/Data/PooledSessionHolder.h
@@ -80,7 +80,7 @@ inline SessionPool& PooledSessionHolder::owner()
 inline void PooledSessionHolder::access()
 {
 	Poco::FastMutex::ScopedLock lock(_mutex);
-	
+
 	_lastUsed.update();
 }
 
diff --git a/Data/include/Poco/Data/PooledSessionImpl.h b/Data/include/Poco/Data/PooledSessionImpl.h
index 90d234633..0d5edf578 100644
--- a/Data/include/Poco/Data/PooledSessionImpl.h
+++ b/Data/include/Poco/Data/PooledSessionImpl.h
@@ -62,11 +62,11 @@ public:
 	bool hasTransactionIsolation(Poco::UInt32) const;
 	bool isTransactionIsolation(Poco::UInt32) const;
 	const std::string& connectorName() const;
-	void setFeature(const std::string& name, bool state);	
+	void setFeature(const std::string& name, bool state);
 	bool getFeature(const std::string& name);
 	void setProperty(const std::string& name, const Poco::Any& value);
 	Poco::Any getProperty(const std::string& name);
-	
+
 protected:
 	SessionImpl* access() const;
 		/// Updates the last access timestamp,
@@ -75,11 +75,11 @@ protected:
 		///
 		/// Throws an SessionUnavailableException if the
 		/// session is no longer valid.
-		
+
 	SessionImpl* impl() const;
 		/// Returns a pointer to the SessionImpl.
-				
-private:	
+
+private:
 	mutable Poco::AutoPtr<PooledSessionHolder> _pHolder;
 };
 
diff --git a/Data/include/Poco/Data/Position.h b/Data/include/Poco/Data/Position.h
index 727d27b74..19ba55543 100644
--- a/Data/include/Poco/Data/Position.h
+++ b/Data/include/Poco/Data/Position.h
@@ -38,7 +38,7 @@ public:
 
 	Poco::UInt32 value() const;
 		/// Returns the position value.
-	
+
 private:
 	Position();
 
@@ -49,9 +49,9 @@ private:
 ///
 /// inlines
 ///
-inline Poco::UInt32 Position::value() const 
-{ 
-	return _value; 
+inline Poco::UInt32 Position::value() const
+{
+	return _value;
 }
 
 
diff --git a/Data/include/Poco/Data/Preparation.h b/Data/include/Poco/Data/Preparation.h
index 6515063d9..870dfdcf2 100644
--- a/Data/include/Poco/Data/Preparation.h
+++ b/Data/include/Poco/Data/Preparation.h
@@ -34,9 +34,9 @@ class Preparation: public AbstractPreparation
 	/// Class for calling the appropriate AbstractPreparator method.
 {
 public:
-	Preparation(AbstractPreparator::Ptr& pPreparator, std::size_t pos, T& val): 
-		AbstractPreparation(pPreparator), 
-		_pos(pos), 
+	Preparation(AbstractPreparator::Ptr& pPreparator, std::size_t pos, T& val):
+		AbstractPreparation(pPreparator),
+		_pos(pos),
 		_val(val)
 		/// Creates the Preparation.
 	{
@@ -66,9 +66,9 @@ class Preparation<std::vector<T>>: public AbstractPreparation
 	/// the whole vector preparation, rather than only individual contained values.
 {
 public:
-	Preparation(AbstractPreparator::Ptr pPreparator, std::size_t pos, std::vector<T>& val = std::vector<T>()): 
-		AbstractPreparation(pPreparator), 
-		_pos(pos), 
+	Preparation(AbstractPreparator::Ptr pPreparator, std::size_t pos, std::vector<T>& val = std::vector<T>()):
+		AbstractPreparation(pPreparator),
+		_pos(pos),
 		_val(val)
 		/// Creates the Preparation.
 	{
@@ -98,9 +98,9 @@ class Preparation<std::deque<T>>: public AbstractPreparation
 	/// the whole deque preparation, rather than only individual contained values.
 {
 public:
-	Preparation(AbstractPreparator::Ptr pPreparator, std::size_t pos, std::deque<T>& val = std::deque<T>()): 
-		AbstractPreparation(pPreparator), 
-		_pos(pos), 
+	Preparation(AbstractPreparator::Ptr pPreparator, std::size_t pos, std::deque<T>& val = std::deque<T>()):
+		AbstractPreparation(pPreparator),
+		_pos(pos),
 		_val(val)
 		/// Creates the Preparation.
 	{
@@ -130,9 +130,9 @@ class Preparation<std::list<T>>: public AbstractPreparation
 	/// the whole list preparation, rather than only individual contained values.
 {
 public:
-	Preparation(AbstractPreparator::Ptr pPreparator, std::size_t pos, std::list<T>& val = std::list<T>()): 
-		AbstractPreparation(pPreparator), 
-		_pos(pos), 
+	Preparation(AbstractPreparator::Ptr pPreparator, std::size_t pos, std::list<T>& val = std::list<T>()):
+		AbstractPreparation(pPreparator),
+		_pos(pos),
 		_val(val)
 		/// Creates the Preparation.
 	{
diff --git a/Data/include/Poco/Data/Range.h b/Data/include/Poco/Data/Range.h
index 8f0ab042e..08222a43c 100644
--- a/Data/include/Poco/Data/Range.h
+++ b/Data/include/Poco/Data/Range.h
@@ -66,7 +66,7 @@ inline const Limit& Range::upper() const
 namespace Keywords {
 
 
-template <typename T> 
+template <typename T>
 Limit limit(T lim, bool hard = false)
 	/// Creates an upperLimit
 {
@@ -74,21 +74,21 @@ Limit limit(T lim, bool hard = false)
 }
 
 
-template <typename T> 
+template <typename T>
 Limit upperLimit(T lim, bool hard = false)
 {
 	return limit(lim, hard);
 }
 
 
-template <typename T> 
+template <typename T>
 Limit lowerLimit(T lim)
 {
 	return Limit(static_cast<Limit::SizeT>(lim), true, true);
 }
 
 
-template <typename T> 
+template <typename T>
 Range range(T low, T upp, bool hard = false)
 {
 	return Range(static_cast<Limit::SizeT>(low), static_cast<Limit::SizeT>(upp), hard);
diff --git a/Data/include/Poco/Data/RecordSet.h b/Data/include/Poco/Data/RecordSet.h
index d3733cfe2..603ed52da 100644
--- a/Data/include/Poco/Data/RecordSet.h
+++ b/Data/include/Poco/Data/RecordSet.h
@@ -44,7 +44,7 @@ class RowFilter;
 class Data_API RecordSet: private Statement
 	/// RecordSet provides access to data returned from a query.
 	/// Data access indices (row and column) are 0-based, as usual in C++.
-	/// 
+	///
 	/// Recordset provides navigation methods to iterate through the
 	/// recordset, retrieval methods to extract data, and methods
 	/// to get metadata (type, etc.) about columns.
@@ -64,7 +64,7 @@ class Data_API RecordSet: private Statement
 	/// The third (optional) argument passed to the Recordset constructor is a RowFormatter
 	/// implementation. The formatter is used in conjunction with << operator for recordset
 	/// data formating.
-	/// 
+	///
 	/// The number of rows in the RecordSet can be limited by specifying
 	/// a limit for the Statement.
 {
@@ -82,18 +82,18 @@ public:
 		RowFormatter::Ptr pRowFormatter = 0);
 		/// Creates the RecordSet.
 
-	RecordSet(Session& rSession, 
+	RecordSet(Session& rSession,
 		const std::string& query,
 		RowFormatter::Ptr pRowFormatter = 0);
 		/// Creates the RecordSet.
 
-	RecordSet(Session& rSession, 
+	RecordSet(Session& rSession,
 		const std::string& query,
 		const RowFormatter& rowFormatter);
 		/// Creates the RecordSet.
 
 	template <class RF>
-	RecordSet(Session& rSession, const std::string& query, const RF& rowFormatter): 
+	RecordSet(Session& rSession, const std::string& query, const RF& rowFormatter):
 		Statement((rSession << query, Keywords::now)),
 		_currentRow(0),
 		_pBegin(new RowIterator(this, 0 == rowsExtracted())),
@@ -145,7 +145,7 @@ public:
 	std::size_t getTotalRowCount() const;
 		/// Returns the total number of rows in the RecordSet.
 		/// The number of rows reported is independent of filtering.
-		/// If the total row count has not been set externally 
+		/// If the total row count has not been set externally
 		/// (either explicitly or implicitly through SQL), the value
 		/// returned shall only be accurate if the statement limit
 		/// is less or equal to the total row count.
@@ -274,7 +274,7 @@ public:
 		else
 			return value(name, _currentRow);
 	}
-	
+
 	template <typename T>
 	Poco::Dynamic::Var nvl(std::size_t index, const T& deflt = T()) const
 		/// Returns the value in the given column of the current row
@@ -378,11 +378,11 @@ public:
 	void formatNames() const;
 		/// Formats names using the current RowFormatter.
 
-	std::ostream& copyValues(std::ostream& os, 
-		std::size_t offset = 0, 
+	std::ostream& copyValues(std::ostream& os,
+		std::size_t offset = 0,
 		std::size_t length = RowIterator::POSITION_END) const;
 		/// Copies the data values to the supplied output stream.
-		/// The data set to be copied is starting at the specified offset 
+		/// The data set to be copied is starting at the specified offset
 		/// from the recordset beginning. The number of rows to be copied
 		/// is specified by length argument.
 		/// An invalid combination of offset/length arguments shall
@@ -391,7 +391,7 @@ public:
 
 	void formatValues(std::size_t offset, std::size_t length) const;
 		/// Formats values using the current RowFormatter.
-		/// The data set to be formatted is starting at the specified offset 
+		/// The data set to be formatted is starting at the specified offset
 		/// from the recordset beginning. The number of rows to be copied
 		/// is specified by length argument.
 		/// An invalid combination of offset/length arguments shall
@@ -421,7 +421,7 @@ private:
 		const AbstractExtractionVec& rExtractions = extractions();
 		AbstractExtractionVec::const_iterator it = rExtractions.begin();
 		AbstractExtractionVec::const_iterator end = rExtractions.end();
-		
+
 		for (; it != end; ++it)
 		{
 			ExtractionVecPtr pExtraction = dynamic_cast<ExtractionVecPtr>(it->get());
@@ -467,9 +467,9 @@ private:
 		{
 			return pExtraction->column();
 		}
-		else 
+		else
 		{
-			throw Poco::BadCastException(Poco::format("Type cast failed!\nColumn: %z\nTarget type:\t%s",  
+			throw Poco::BadCastException(Poco::format("Type cast failed!\nColumn: %z\nTarget type:\t%s",
 				pos,
 				std::string(typeid(T).name())));
 		}
diff --git a/Data/include/Poco/Data/Row.h b/Data/include/Poco/Data/Row.h
index 110be6f0d..089d9ae87 100644
--- a/Data/include/Poco/Data/Row.h
+++ b/Data/include/Poco/Data/Row.h
@@ -41,12 +41,12 @@ class Data_API Row
 	/// Rows are sortable. The sortability is maintained at all times (i.e. there
 	/// is always at least one column specified as a sorting criteria) .
 	/// The default and minimal sorting criteria is the first field (position 0).
-	/// The default sorting criteria can be replaced with any other field by 
+	/// The default sorting criteria can be replaced with any other field by
 	/// calling replaceSortField() member function.
 	/// Additional fields can be added to sorting criteria, in which case the
 	/// field precedence corresponds to addition order (i.e. later added fields
 	/// have lower sorting precedence).
-	/// These features make Row suitable for use with standard sorted 
+	/// These features make Row suitable for use with standard sorted
 	/// containers and algorithms. The main constraint is that all the rows from
 	/// a set that is being sorted must have the same sorting criteria (i.e., the same
 	/// set of fields must be in sorting criteria in the same order). Since rows don't
@@ -73,7 +73,7 @@ public:
 	using SortMap = std::vector<SortTuple>;
 		/// The type for map holding fields used for sorting criteria.
 		/// Fields are added sequentially and have precedence that
-		/// corresponds to field adding sequence order (rather than field's 
+		/// corresponds to field adding sequence order (rather than field's
 		/// position in the row).
 		/// This requirement rules out use of std::map due to its sorted nature.
 	using SortMapPtr = SharedPtr<SortMap>;
@@ -111,7 +111,7 @@ public:
 		_pNames->push_back(name);
 		if (1 == _values.size()) addSortField(0);
 	}
-	
+
 	template <typename T>
 	void set(std::size_t pos, const T& val)
 		/// Assigns the value to the row.
diff --git a/Data/include/Poco/Data/RowFilter.h b/Data/include/Poco/Data/RowFilter.h
index 37d2c903d..4bec4c49e 100644
--- a/Data/include/Poco/Data/RowFilter.h
+++ b/Data/include/Poco/Data/RowFilter.h
@@ -167,7 +167,7 @@ private:
 	RecordSet& recordSet() const;
 
 	Comparison getComparison(const std::string& comp) const;
-	
+
 	void rewindRecordSet();
 
 	Comparisons        _comparisons;
diff --git a/Data/include/Poco/Data/RowFormatter.h b/Data/include/Poco/Data/RowFormatter.h
index 7c735a18d..e916d4f92 100644
--- a/Data/include/Poco/Data/RowFormatter.h
+++ b/Data/include/Poco/Data/RowFormatter.h
@@ -50,8 +50,8 @@ class Data_API RowFormatter
 	/// it with rows through RecordSet.
 	///
 	/// To accomodate for various formatting needs, a formatter can operate in two modes:
-	/// 
-	///	  - progressive: formatted individual row strings are gemerated and returned from each 
+	///
+	///	  - progressive: formatted individual row strings are gemerated and returned from each
 	///     call to formatValues;
 	///     std::string& formatNames(const NameVecPtr, std::string&) and
 	///     std::string& formatValues(const ValueVec&, std::string&) member calls should be
@@ -106,7 +106,7 @@ public:
 		/// The default implementation does nothing.
 
 	virtual const std::string& toString();
-		/// Throws NotImplementedException. Formatters operating in bulk mode should 
+		/// Throws NotImplementedException. Formatters operating in bulk mode should
 		/// implement this member function to return valid pointer to the formatted result.
 
 	virtual int rowCount() const;
diff --git a/Data/include/Poco/Data/RowIterator.h b/Data/include/Poco/Data/RowIterator.h
index 88fe51d96..e1e32cb49 100644
--- a/Data/include/Poco/Data/RowIterator.h
+++ b/Data/include/Poco/Data/RowIterator.h
@@ -98,7 +98,7 @@ public:
 		/// Returns a copy the RowIterator backed by diff positions.
 		/// Throws RangeException if diff is larger than current position.
 
-	void swap(RowIterator& other);
+	void swap(RowIterator& other) noexcept;
 		/// Swaps the RowIterator with another one.
 
 private:
diff --git a/Data/include/Poco/Data/SessionFactory.h b/Data/include/Poco/Data/SessionFactory.h
index 0185a8a38..3753cf3e1 100644
--- a/Data/include/Poco/Data/SessionFactory.h
+++ b/Data/include/Poco/Data/SessionFactory.h
@@ -32,16 +32,16 @@ namespace Data {
 
 
 class Data_API SessionFactory
-	/// A SessionFactory is a singleton class that stores Connectors and allows to 
+	/// A SessionFactory is a singleton class that stores Connectors and allows to
 	/// create Sessions of the required type:
-	///    
+	///
 	///     Session ses(SessionFactory::instance().create(connector, connectionString));
-	///    
+	///
 	/// where the first param presents the type of session one wants to create (e.g. for SQLite one would choose "SQLite")
 	/// and the second param is the connection string that the connector requires to connect to the database.
 	///
 	/// A concrete example to open an SQLite database stored in the file "dummy.db" would be
-	///    
+	///
 	///     Session ses(SessionFactory::instance().create(SQLite::Connector::KEY, "dummy.db"));
 	///
 	/// An even simpler way to create a session is to use the two argument constructor of Session, which
@@ -50,7 +50,7 @@ class Data_API SessionFactory
 	///      Session ses("SQLite", "dummy.db");
 {
 public:
-	
+
 	static SessionFactory& instance();
 		/// returns the static instance of the singleton.
 
@@ -71,7 +71,7 @@ public:
 
 	Session create(const std::string& uri,
 		std::size_t timeout = Session::LOGIN_TIMEOUT_DEFAULT);
-		/// Creates a Session for the given URI (must be in key:///connectionString format). 
+		/// Creates a Session for the given URI (must be in key:///connectionString format).
 		/// Throws a Poco:Data::UnknownDataBaseException if no Connector is registered for the key.
 
 private:
@@ -86,7 +86,7 @@ private:
 		Poco::SharedPtr<Connector> ptrSI;
 		SessionInfo(Connector* pSI);
 	};
-	
+
 	typedef std::map<std::string, SessionInfo, Poco::CILess> Connectors;
 	Connectors      _connectors;
 	Poco::FastMutex _mutex;
diff --git a/Data/include/Poco/Data/SessionPool.h b/Data/include/Poco/Data/SessionPool.h
index 6994c331e..0c801c44b 100644
--- a/Data/include/Poco/Data/SessionPool.h
+++ b/Data/include/Poco/Data/SessionPool.h
@@ -40,7 +40,7 @@ class Data_API SessionPool: public RefCountedObject
 	/// operation. Therefore it makes sense to reuse a session object
 	/// once it is no longer needed.
 	///
-	/// A SessionPool manages a collection of SessionImpl objects 
+	/// A SessionPool manages a collection of SessionImpl objects
 	/// (decorated with a PooledSessionImpl).
 	///
 	/// When a SessionImpl object is requested, the SessionPool first
@@ -52,7 +52,7 @@ class Data_API SessionPool: public RefCountedObject
 	/// can be set on the maximum number of objects.
 	/// Sessions found not to be connected to the database are purged
 	/// from the pool whenever one of the following events occurs:
-	/// 
+	///
 	///   - JanitorTimer event
 	///   - get() request
 	///   - putBack() request
@@ -67,11 +67,12 @@ class Data_API SessionPool: public RefCountedObject
 	///     ...
 {
 public:
-	SessionPool(const std::string& connector, 
-		const std::string& connectionString, 
-		int minSessions = 1, 
-		int maxSessions = 32, 
-		int idleTime = 60);
+	SessionPool(const std::string& connector,
+		const std::string& connectionString,
+		int minSessions = 1,
+		int maxSessions = 32,
+		int idleTime = 60,
+		int connTimeout = 60);
 		/// Creates the SessionPool for sessions with the given connector
 		/// and connectionString.
 		///
@@ -81,23 +82,23 @@ public:
 
 	~SessionPool();
 		/// Destroys the SessionPool.
-		
+
 	Session get();
 		/// Returns a Session.
 		///
 		/// If there are unused sessions available, one of the
 		/// unused sessions is recycled. Otherwise, a new session
-		/// is created. 
+		/// is created.
 		///
 		/// If the maximum number of sessions for this pool has
 		/// already been created, a SessionPoolExhaustedException
 		/// is thrown.
-	
+
 	template <typename T>
 	Session get(const std::string& name, const T& value)
 		/// Returns a Session with requested property set.
 		/// The property can be different from the default pool
-		/// value, in which case it is reset back to the pool 
+		/// value, in which case it is reset back to the pool
 		/// value when the session is reclaimed by the pool.
 	{
 		Session s = get();
@@ -111,24 +112,27 @@ public:
 	Session get(const std::string& name, bool value);
 		/// Returns a Session with requested feature set.
 		/// The feature can be different from the default pool
-		/// value, in which case it is reset back to the pool 
+		/// value, in which case it is reset back to the pool
 		/// value when the session is reclaimed by the pool.
 
 	int capacity() const;
 		/// Returns the maximum number of sessions the SessionPool will manage.
-		
+
 	int used() const;
 		/// Returns the number of sessions currently in use.
-		
+
 	int idle() const;
 		/// Returns the number of idle sessions.
-		
+
+	int connTimeout() const;
+		/// Returns the connection timeout.
+
 	int dead();
 		/// Returns the number of not connected active sessions.
 
 	int allocated() const;
 		/// Returns the number of allocated sessions.
-		
+
 	int available() const;
 		/// Returns the number of available (idle + remaining capacity) sessions.
 
@@ -177,14 +181,14 @@ protected:
 	void onJanitorTimer(Poco::Timer&);
 
 private:
-	typedef std::pair<std::string, Poco::Any> PropertyPair; 
-	typedef std::pair<std::string, bool> FeaturePair; 
+	typedef std::pair<std::string, Poco::Any> PropertyPair;
+	typedef std::pair<std::string, bool> FeaturePair;
 	typedef std::map<SessionImpl*, PropertyPair> AddPropertyMap;
 	typedef std::map<SessionImpl*, FeaturePair> AddFeatureMap;
 
 	SessionPool(const SessionPool&);
 	SessionPool& operator = (const SessionPool&);
-		
+
 	void closeAll(SessionList& sessionList);
 
 	std::string    _connector;
@@ -192,6 +196,7 @@ private:
 	int            _minSessions;
 	int            _maxSessions;
 	int            _idleTime;
+	int            _connTimeout;
 	int            _nSessions;
 	SessionList    _idleSessions;
 	SessionList    _activeSessions;
@@ -203,7 +208,7 @@ private:
 	AddFeatureMap  _addFeatureMap;
 	mutable
 	Poco::Mutex _mutex;
-	
+
 	friend class PooledSessionImpl;
 };
 
diff --git a/Data/include/Poco/Data/SessionPoolContainer.h b/Data/include/Poco/Data/SessionPoolContainer.h
index 15c3e83b9..a1479b180 100644
--- a/Data/include/Poco/Data/SessionPoolContainer.h
+++ b/Data/include/Poco/Data/SessionPoolContainer.h
@@ -38,15 +38,15 @@ public:
 
 	~SessionPoolContainer();
 		/// Destroys the SessionPoolContainer.
-	
+
 	void add(SessionPool* pPool);
 		/// Adds existing session pool to the container.
 		/// Throws SessionPoolExistsException if pool already exists.
 
-	Session add(const std::string& sessionKey, 
+	Session add(const std::string& sessionKey,
 		const std::string& connectionString,
-		int minSessions = 1, 
-		int maxSessions = 32, 
+		int minSessions = 1,
+		int maxSessions = 32,
 		int idleTime = 60);
 		/// Adds a new session pool to the container and returns a Session from
 		/// newly created pool. If pool already exists, request to add is silently
@@ -58,7 +58,7 @@ public:
 	bool isActive(const std::string& sessionKey,
 		const std::string& connectionString = "") const;
 		/// Returns true if the session is active (i.e. not shut down).
-		/// If connectionString is empty string, sessionKey must be a 
+		/// If connectionString is empty string, sessionKey must be a
 		/// fully qualified session name as registered with the pool
 		/// container.
 
@@ -72,7 +72,7 @@ public:
 
 	void remove(const std::string& name);
 		/// Removes a SessionPool.
-		
+
 	int count() const;
 		/// Returns the number of session pols in the container.
 
@@ -84,7 +84,7 @@ private:
 
 	SessionPoolContainer(const SessionPoolContainer&);
 	SessionPoolContainer& operator = (const SessionPoolContainer&);
-		
+
 	SessionPoolMap  _sessionPools;
 	Poco::FastMutex _mutex;
 };
diff --git a/Data/include/Poco/Data/SimpleRowFormatter.h b/Data/include/Poco/Data/SimpleRowFormatter.h
index 67d82c6a8..0dcb43b0b 100644
--- a/Data/include/Poco/Data/SimpleRowFormatter.h
+++ b/Data/include/Poco/Data/SimpleRowFormatter.h
@@ -49,7 +49,7 @@ public:
 	~SimpleRowFormatter();
 		/// Destroys the SimpleRowFormatter.
 
-	void swap(SimpleRowFormatter& other);
+	void swap(SimpleRowFormatter& other) noexcept;
 		/// Swaps the row formatter with another one.
 
 	std::string& formatNames(const NameVecPtr pNames, std::string& formattedNames);
@@ -66,7 +66,7 @@ public:
 
 	std::streamsize getColumnWidth() const;
 		/// Returns the column width.
-		
+
 	std::streamsize getSpacing() const;
 		/// Returns the spacing.
 
@@ -109,9 +109,13 @@ inline std::streamsize SimpleRowFormatter::getSpacing() const
 
 namespace std
 {
+	// Note: for an unknown reason, clang refuses to compile this function as noexcept
 	template<>
-	inline void swap<Poco::Data::SimpleRowFormatter>(Poco::Data::SimpleRowFormatter& s1, 
+	inline void swap<Poco::Data::SimpleRowFormatter>(Poco::Data::SimpleRowFormatter& s1,
 		Poco::Data::SimpleRowFormatter& s2)
+#ifndef POCO_COMPILER_CLANG
+		noexcept
+#endif
 		/// Full template specalization of std:::swap for SimpleRowFormatter
 	{
 		s1.swap(s2);
diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h
index 610eead67..c3f30cce3 100644
--- a/Data/include/Poco/Data/Statement.h
+++ b/Data/include/Poco/Data/Statement.h
@@ -78,6 +78,7 @@ public:
 	using ResultPtr = SharedPtr<Result>;
 	using AsyncExecMethod = ActiveMethod<std::size_t, bool, StatementImpl>;
 	using AsyncExecMethodPtr = SharedPtr<AsyncExecMethod>;
+	using State = StatementImpl::State;
 
 	static const int WAIT_FOREVER = -1;
 
@@ -124,7 +125,7 @@ public:
 	Statement& operator = (Statement&& stmt) noexcept;
 		/// Move assignment.
 
-	void swap(Statement& other);
+	void swap(Statement& other) noexcept;
 		/// Swaps the statement with another one.
 
 	template <typename T>
@@ -385,6 +386,9 @@ public:
 		/// Sets the row formatter for this statement.
 		/// Statement takes the ownership of the formatter.
 
+	State state() const;
+		/// Returns the statement state.
+
 protected:
 	using ImplPtr = StatementImpl::Ptr;
 
@@ -791,6 +795,12 @@ inline bool Statement::isAsync() const
 }
 
 
+inline Statement::State Statement::state() const
+{
+	return _pImpl->getState();
+}
+
+
 inline void Statement::setRowFormatter(RowFormatter::Ptr pRowFormatter)
 {
 	_pRowFormatter = pRowFormatter;
@@ -804,7 +814,7 @@ inline const RowFormatter::Ptr& Statement::getRowFormatter()
 }
 
 
-inline void swap(Statement& s1, Statement& s2)
+inline void swap(Statement& s1, Statement& s2) noexcept
 {
 	s1.swap(s2);
 }
diff --git a/Data/include/Poco/Data/StatementCreator.h b/Data/include/Poco/Data/StatementCreator.h
index 635de7e1d..23ca43032 100644
--- a/Data/include/Poco/Data/StatementCreator.h
+++ b/Data/include/Poco/Data/StatementCreator.h
@@ -34,7 +34,7 @@ class Data_API StatementCreator
 public:
 	StatementCreator();
 		/// Creates an unitialized StatementCreator.
-		
+
 	StatementCreator(Poco::AutoPtr<SessionImpl> ptrImpl);
 		/// Creates a StatementCreator.
 
@@ -52,10 +52,10 @@ public:
 
 	StatementCreator& operator = (StatementCreator&& other) noexcept;
 		/// Assignment operator.
-		
-	void swap(StatementCreator& other);
-		/// Swaps the StatementCreator with another one.	
-		
+
+	void swap(StatementCreator& other) noexcept;
+		/// Swaps the StatementCreator with another one.
+
 	template <typename T>
 	Statement operator << (const T& t)
 		/// Creates a Statement.
diff --git a/Data/include/Poco/Data/StatementImpl.h b/Data/include/Poco/Data/StatementImpl.h
index 58e1d2d1f..fc2c9ffb9 100644
--- a/Data/include/Poco/Data/StatementImpl.h
+++ b/Data/include/Poco/Data/StatementImpl.h
@@ -432,7 +432,7 @@ private:
 
 	using CountVec = std::vector<std::size_t>;
 
-	State                    _state;
+	std::atomic<State>       _state;
 	Limit                    _extrLimit;
 	std::size_t              _lowerLimit;
 	std::vector<int>         _columnsExtracted;
diff --git a/Data/include/Poco/Data/Time.h b/Data/include/Poco/Data/Time.h
index 07116906b..80619a595 100644
--- a/Data/include/Poco/Data/Time.h
+++ b/Data/include/Poco/Data/Time.h
@@ -174,7 +174,7 @@ public:
 	~VarHolderImpl()
 	{
 	}
-	
+
 	const std::type_info& type() const
 	{
 		return typeid(Poco::Data::Time);
@@ -211,7 +211,7 @@ public:
 	{
 		return cloneHolder(pVarHolder, _val);
 	}
-	
+
 	const Poco::Data::Time& value() const
 	{
 		return _val;
diff --git a/Data/include/Poco/Data/Transaction.h b/Data/include/Poco/Data/Transaction.h
index a8fdc4699..caf3e7f85 100644
--- a/Data/include/Poco/Data/Transaction.h
+++ b/Data/include/Poco/Data/Transaction.h
@@ -44,22 +44,22 @@ public:
 		/// Creates the Transaction, using the given database session.
 		/// If start is true, transaction is started, otherwise begin() must be called
 		/// to start the transaction.
-		
+
 	template <typename T>
-	Transaction(Poco::Data::Session& rSession, T& t, Poco::Logger* pLogger = 0): 
+	Transaction(Poco::Data::Session& rSession, T& t, Poco::Logger* pLogger = 0):
 		_rSession(rSession),
 		_pLogger(pLogger)
 		/// Creates the Transaction, using the given database session, transactor and logger.
-		/// The transactor type must provide operator () overload taking non-const Session 
+		/// The transactor type must provide operator () overload taking non-const Session
 		/// reference as an argument.
 		///
 		/// When transaction is created using this constructor, it is executed and
 		/// commited automatically. If no error occurs, rollback is disabled and does
 		/// not occur at destruction time. If an error occurs resulting in exception being
 		/// thrown, the transaction is rolled back and exception propagated to calling code.
-		/// 
+		///
 		/// Example usage:
-		/// 
+		///
 		/// struct Transactor
 		/// {
 		///		void operator () (Session& session) const
@@ -67,9 +67,9 @@ public:
 		///			// do something ...
 		///		}
 		/// };
-		/// 
+		///
 		/// Transactor tr;
-		/// Transaction tn(session, tr); 
+		/// Transaction tn(session, tr);
 	{
 		try { transact(t); }
 		catch (...)
@@ -86,7 +86,7 @@ public:
 		/// (by calling commit()), or rolled back (by calling rollback()).
 		///
 		/// If an exception is thrown during rollback, the exception is logged
-		/// and no further action is taken. 
+		/// and no further action is taken.
 
 	void setIsolation(Poco::UInt32 ti);
 		/// Sets the transaction isolation level.
@@ -116,7 +116,7 @@ public:
 
 	template <typename T>
 	void transact(T& t)
-		/// Executes the transactor and, unless transactor throws an exception, 
+		/// Executes the transactor and, unless transactor throws an exception,
 		/// commits the transaction.
 	{
 		if (!isActive()) begin();
@@ -126,10 +126,10 @@ public:
 
 	void commit();
 		/// Commits the current transaction.
-		
+
 	void rollback();
 		/// Rolls back the current transaction.
-		
+
 	bool isActive();
 		/// Returns false after the transaction has been committed or rolled back,
 		/// true if the transaction is ongoing.
@@ -142,7 +142,7 @@ private:
 	Transaction();
 	Transaction(const Transaction&);
 	Transaction& operator = (const Transaction&);
-	
+
 	void begin();
 		/// Begins the transaction if the session is already not in transaction.
 		/// Otherwise does nothing.
diff --git a/Data/include/Poco/Data/TypeHandler.h b/Data/include/Poco/Data/TypeHandler.h
index 85684666e..235cbbb26 100644
--- a/Data/include/Poco/Data/TypeHandler.h
+++ b/Data/include/Poco/Data/TypeHandler.h
@@ -79,18 +79,18 @@ class TypeHandler: public AbstractTypeHandler
 	///			// the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3))
 	///			// Note that we advance pos by the number of columns the datatype uses! For string/int this is one.
 	///			poco_assert_dbg (!pBinder.isNull());
-	///			TypeHandler<std::string>::bind(pos++, obj.getLastName(), pBinder, dir);
-	///			TypeHandler<std::string>::bind(pos++, obj.getFirstName(), pBinder, dir);
-	///			TypeHandler<int>::bind(pos++, obj.getAge(), pBinder, dir);
+	///			   TypeHandler<std::string>::bind(pos++, obj.getLastName(), pBinder, dir);
+	///			   TypeHandler<std::string>::bind(pos++, obj.getFirstName(), pBinder, dir);
+	///			   TypeHandler<int>::bind(pos++, obj.getAge(), pBinder, dir);
 	///		}
 	///
 	///		static void prepare(std::size_t pos, const Person& obj, AbstractPreparator::Ptr pPreparator)
 	///		{
 	///			// the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3))
 	///			poco_assert_dbg (!pPreparator.isNull());
-	///			TypeHandler<std::string>::prepare(pos++, obj.getLastName(), pPreparator);
-	///			TypeHandler<std::string>::prepare(pos++, obj.getFirstName(), pPreparator);
-	///			TypeHandler<int>::prepare(pos++, obj.getAge(), pPreparator);
+	///			   TypeHandler<std::string>::prepare(pos++, obj.getLastName(), pPreparator);
+	///			   TypeHandler<std::string>::prepare(pos++, obj.getFirstName(), pPreparator);
+	///			   TypeHandler<int>::prepare(pos++, obj.getAge(), pPreparator);
 	///		}
 	///
 	///		static void extract(std::size_t pos, Person& obj, const Person& defVal, AbstractExtractor::Ptr pExt)
@@ -102,9 +102,9 @@ class TypeHandler: public AbstractTypeHandler
 	///			std::string firstName;
 	///			int age = 0;
 	///			// the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3))
-	///			TypeHandler<std::string>::extract(pos++, lastName, defVal.getLastName(), pExt);
-	///			TypeHandler<std::string>::extract(pos++, firstName, defVal.getFirstName(), pExt);
-	///			TypeHandler<int>::extract(pos++, age, defVal.getAge(), pExt);
+	///			   TypeHandler<std::string>::extract(pos++, lastName, defVal.getLastName(), pExt);
+	///			   TypeHandler<std::string>::extract(pos++, firstName, defVal.getFirstName(), pExt);
+	///			   TypeHandler<int>::extract(pos++, age, defVal.getAge(), pExt);
 	///			obj.setLastName(lastName);
 	///			obj.setFirstName(firstName);
 	///			obj.setAge(age);
@@ -343,6 +343,3670 @@ void tupleExtract(std::size_t& pos, TupleType tuple, DefValType defVal, Abstract
 }
 
 
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+	class T30,
+	class T31,
+	class T32,
+	class T33,
+	class T34,
+	class T35,
+	class T36,
+	class T37,
+	class T38,
+    class T39>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38,T39>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38,T39>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38,T39>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T31, 31>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T32, 32>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T33, 33>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T34, 34>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T35, 35>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T36, 36>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T37, 37>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T38, 38>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T39, 39>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T31, 31>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T32, 32>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T33, 33>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T34, 34>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T35, 35>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T36, 36>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T37, 37>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T38, 38>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T39, 39>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size() +
+			   TypeHandler<T31>::size() +
+			   TypeHandler<T32>::size() +
+			   TypeHandler<T33>::size() +
+			   TypeHandler<T34>::size() +
+			   TypeHandler<T35>::size() +
+			   TypeHandler<T36>::size() +
+			   TypeHandler<T37>::size() +
+			   TypeHandler<T38>::size() +
+			   TypeHandler<T39>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T31, 31>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T32, 32>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T33, 33>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T34, 34>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T35, 35>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T36, 36>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T37, 37>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T38, 38>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T39, 39>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+	class T30,
+	class T31,
+	class T32,
+	class T33,
+	class T34,
+	class T35,
+	class T36,
+	class T37,
+    class T38>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T31, 31>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T32, 32>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T33, 33>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T34, 34>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T35, 35>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T36, 36>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T37, 37>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T38, 38>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T31, 31>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T32, 32>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T33, 33>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T34, 34>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T35, 35>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T36, 36>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T37, 37>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T38, 38>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size() +
+			   TypeHandler<T31>::size() +
+			   TypeHandler<T32>::size() +
+			   TypeHandler<T33>::size() +
+			   TypeHandler<T34>::size() +
+			   TypeHandler<T35>::size() +
+			   TypeHandler<T36>::size() +
+			   TypeHandler<T37>::size() +
+			   TypeHandler<T38>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T31, 31>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T32, 32>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T33, 33>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T34, 34>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T35, 35>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T36, 36>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T37, 37>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T38, 38>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+	class T30,
+	class T31,
+	class T32,
+	class T33,
+	class T34,
+	class T35,
+	class T36,
+    class T37>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T31, 31>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T32, 32>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T33, 33>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T34, 34>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T35, 35>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T36, 36>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T37, 37>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T31, 31>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T32, 32>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T33, 33>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T34, 34>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T35, 35>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T36, 36>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T37, 37>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size() +
+			   TypeHandler<T31>::size() +
+			   TypeHandler<T32>::size() +
+			   TypeHandler<T33>::size() +
+			   TypeHandler<T34>::size() +
+			   TypeHandler<T35>::size() +
+			   TypeHandler<T36>::size() +
+			   TypeHandler<T37>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T31, 31>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T32, 32>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T33, 33>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T34, 34>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T35, 35>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T36, 36>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T37, 37>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+	class T30,
+	class T31,
+	class T32,
+	class T33,
+	class T34,
+	class T35,
+    class T36>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T31, 31>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T32, 32>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T33, 33>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T34, 34>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T35, 35>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T36, 36>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T31, 31>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T32, 32>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T33, 33>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T34, 34>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T35, 35>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T36, 36>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size() +
+			   TypeHandler<T31>::size() +
+			   TypeHandler<T32>::size() +
+			   TypeHandler<T33>::size() +
+			   TypeHandler<T34>::size() +
+			   TypeHandler<T35>::size() +
+			   TypeHandler<T36>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T31, 31>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T32, 32>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T33, 33>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T34, 34>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T35, 35>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T36, 36>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+	class T30,
+	class T31,
+	class T32,
+	class T33,
+	class T34,
+    class T35>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T31, 31>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T32, 32>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T33, 33>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T34, 34>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T35, 35>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T31, 31>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T32, 32>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T33, 33>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T34, 34>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T35, 35>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size() +
+			   TypeHandler<T31>::size() +
+			   TypeHandler<T32>::size() +
+			   TypeHandler<T33>::size() +
+			   TypeHandler<T34>::size() +
+   		       TypeHandler<T35>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T31, 31>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T32, 32>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T33, 33>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T34, 34>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T35, 35>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+	class T30,
+	class T31,
+	class T32,
+	class T33,
+    class T34>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T31, 31>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T32, 32>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T33, 33>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T34, 34>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T31, 31>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T32, 32>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T33, 33>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T34, 34>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size() +
+			   TypeHandler<T31>::size() +
+			   TypeHandler<T32>::size() +
+			   TypeHandler<T33>::size() +
+    		   TypeHandler<T34>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T31, 31>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T32, 32>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T33, 33>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T34, 34>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+	class T30,
+	class T31,
+	class T32,
+    class T33>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T31, 31>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T32, 32>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T33, 33>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T31, 31>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T32, 32>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T33, 33>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size() +
+			   TypeHandler<T31>::size() +
+			   TypeHandler<T32>::size() +
+			   TypeHandler<T33>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T31, 31>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T32, 32>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T33, 33>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+	class T30,
+	class T31,
+    class T32>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T31, 31>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T32, 32>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T31, 31>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T32, 32>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size() +
+			   TypeHandler<T31>::size() +
+			   TypeHandler<T32>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T31, 31>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T32, 32>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+	class T30,
+    class T31>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T31, 31>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T31, 31>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size() +
+		       TypeHandler<T31>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T31, 31>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29,
+    class T30>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T30, 30>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T30, 30>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size() +
+			   TypeHandler<T30>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T30, 30>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28,
+	class T29>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T29, 29>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T29, 29>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size() +
+			   TypeHandler<T29>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T29, 29>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27,
+	class T28>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T28, 28>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T28, 28>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size() +
+			   TypeHandler<T28>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T28, 28>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26,
+	class T27>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T27, 27>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T27, 27>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size() +
+			   TypeHandler<T27>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T27, 27>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25,
+	class T26>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T26, 26>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T26, 26>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size() +
+			   TypeHandler<T26>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T26, 26>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24,
+	class T25>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T25, 25>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T25, 25>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size() +
+			   TypeHandler<T25>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T25, 25>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23,
+	class T24>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T24, 24>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T24, 24>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size() +
+			   TypeHandler<T24>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T24, 24>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+	class T22,
+	class T23>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T23, 23>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T23, 23>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size() +
+			   TypeHandler<T23>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T23, 23>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+	class T21,
+    class T22>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T22, 22>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T22, 22>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+	   		   TypeHandler<T21>::size() +
+			   TypeHandler<T22>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T22, 22>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20,
+  	class T21>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T21, 21>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T21, 21>(pos, tuple, pPreparator);
+
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size() +
+			   TypeHandler<T21>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T21, 21>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18,
+	class T19,
+	class T20>
+class TypeHandler<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20>>
+{
+  public:
+	using TupleConstRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20>>::CONSTREFTYPE;
+	using TupleRef = typename Poco::TypeWrapper<Poco::Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20>>::REFTYPE;
+
+	static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
+	{
+		poco_assert_dbg (!pBinder.isNull());
+		tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
+		tupleBind<TupleConstRef, T20, 20>(pos, tuple, pBinder, dir);
+	}
+
+	static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
+	{
+		poco_assert_dbg (!pPreparator.isNull());
+		tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
+		tuplePrepare<TupleConstRef, T20, 20>(pos, tuple, pPreparator);
+	}
+
+	static std::size_t size()
+	{
+		return TypeHandler<T0>::size() +
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size() +
+			   TypeHandler<T20>::size();
+	}
+
+	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
+	{
+		poco_assert_dbg (!pExt.isNull());
+		tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
+		tupleExtract<TupleRef, TupleConstRef, T20, 20>(pos, tuple, defVal, pExt);
+	}
+
+  private:
+	TypeHandler(const TypeHandler&);
+	TypeHandler& operator=(const TypeHandler&);
+};
+
+
 template <class T0,
 	class T1,
 	class T2,
@@ -422,25 +4086,25 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size() +
-			TypeHandler<T11>::size() +
-			TypeHandler<T12>::size() +
-			TypeHandler<T13>::size() +
-			TypeHandler<T14>::size() +
-			TypeHandler<T15>::size() +
-			TypeHandler<T16>::size() +
-			TypeHandler<T17>::size() +
-			TypeHandler<T18>::size() +
-			TypeHandler<T19>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size() +
+			   TypeHandler<T19>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -550,24 +4214,24 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size() +
-			TypeHandler<T11>::size() +
-			TypeHandler<T12>::size() +
-			TypeHandler<T13>::size() +
-			TypeHandler<T14>::size() +
-			TypeHandler<T15>::size() +
-			TypeHandler<T16>::size() +
-			TypeHandler<T17>::size() +
-			TypeHandler<T18>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size() +
+			   TypeHandler<T18>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -673,23 +4337,23 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size() +
-			TypeHandler<T11>::size() +
-			TypeHandler<T12>::size() +
-			TypeHandler<T13>::size() +
-			TypeHandler<T14>::size() +
-			TypeHandler<T15>::size() +
-			TypeHandler<T16>::size() +
-			TypeHandler<T17>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size() +
+			   TypeHandler<T17>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -791,22 +4455,22 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size() +
-			TypeHandler<T11>::size() +
-			TypeHandler<T12>::size() +
-			TypeHandler<T13>::size() +
-			TypeHandler<T14>::size() +
-			TypeHandler<T15>::size() +
-			TypeHandler<T16>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size() +
+			   TypeHandler<T16>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -904,21 +4568,21 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size() +
-			TypeHandler<T11>::size() +
-			TypeHandler<T12>::size() +
-			TypeHandler<T13>::size() +
-			TypeHandler<T14>::size() +
-			TypeHandler<T15>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size() +
+			   TypeHandler<T15>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1012,20 +4676,20 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size() +
-			TypeHandler<T11>::size() +
-			TypeHandler<T12>::size() +
-			TypeHandler<T13>::size() +
-			TypeHandler<T14>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size() +
+			   TypeHandler<T14>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1115,19 +4779,19 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size() +
-			TypeHandler<T11>::size() +
-			TypeHandler<T12>::size() +
-			TypeHandler<T13>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size() +
+			   TypeHandler<T13>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1213,18 +4877,18 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size() +
-			TypeHandler<T11>::size() +
-			TypeHandler<T12>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size() +
+			   TypeHandler<T12>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1306,17 +4970,17 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size() +
-			TypeHandler<T11>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size() +
+			   TypeHandler<T11>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1394,16 +5058,16 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size() +
-			TypeHandler<T10>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size() +
+			   TypeHandler<T10>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1468,15 +5132,15 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size() +
-			TypeHandler<T9>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size() +
+			   TypeHandler<T9>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1538,14 +5202,14 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size() +
-			TypeHandler<T8>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size() +
+			   TypeHandler<T8>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1604,13 +5268,13 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size() +
-			TypeHandler<T7>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size() +
+			   TypeHandler<T7>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1666,12 +5330,12 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size() +
-			TypeHandler<T6>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size() +
+			   TypeHandler<T6>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1724,11 +5388,11 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size() +
-			TypeHandler<T5>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size() +
+			   TypeHandler<T5>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1778,10 +5442,10 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size() +
-			TypeHandler<T4>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size() +
+			   TypeHandler<T4>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1828,9 +5492,9 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size() +
-			TypeHandler<T3>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size() +
+			   TypeHandler<T3>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1874,8 +5538,8 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size() +
-			TypeHandler<T2>::size();
+			   TypeHandler<T1>::size() +
+			   TypeHandler<T2>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1916,7 +5580,7 @@ public:
 	static std::size_t size()
 	{
 		return TypeHandler<T0>::size() +
-			TypeHandler<T1>::size();
+			   TypeHandler<T1>::size();
 	}
 
 	static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
@@ -1975,9 +5639,9 @@ class TypeHandler<std::pair<K, V>>: public AbstractTypeHandler
 public:
 	static void bind(std::size_t pos, const std::pair<K, V>& obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
 	{
-		TypeHandler<K>::bind(pos, obj.first, pBinder, dir);
+			   TypeHandler<K>::bind(pos, obj.first, pBinder, dir);
 		pos += TypeHandler<K>::size();
-		TypeHandler<V>::bind(pos, obj.second, pBinder, dir);
+			   TypeHandler<V>::bind(pos, obj.second, pBinder, dir);
 	}
 
 	static std::size_t size()
@@ -1987,16 +5651,16 @@ public:
 
 	static void extract(std::size_t pos, std::pair<K, V>& obj, const std::pair<K, V>& defVal, AbstractExtractor::Ptr pExt)
 	{
-		TypeHandler<K>::extract(pos, obj.first, defVal.first, pExt);
+			   TypeHandler<K>::extract(pos, obj.first, defVal.first, pExt);
 		pos += TypeHandler<K>::size();
-		TypeHandler<V>::extract(pos, obj.second, defVal.second, pExt);
+			   TypeHandler<V>::extract(pos, obj.second, defVal.second, pExt);
 	}
 
 	static void prepare(std::size_t pos, const std::pair<K, V>& obj, AbstractPreparator::Ptr pPreparator)
 	{
-		TypeHandler<K>::prepare(pos, obj.first, pPreparator);
+			   TypeHandler<K>::prepare(pos, obj.first, pPreparator);
 		pos += TypeHandler<K>::size();
-		TypeHandler<V>::prepare(pos, obj.second, pPreparator);
+			   TypeHandler<V>::prepare(pos, obj.second, pPreparator);
 	}
 
 private:
@@ -2013,7 +5677,7 @@ public:
 	static void bind(std::size_t pos, const Poco::AutoPtr<T>& obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
 	{
 		// *obj will trigger a nullpointer exception if empty: this is on purpose
-		TypeHandler<T>::bind(pos, *obj, pBinder, dir);
+			   TypeHandler<T>::bind(pos, *obj, pBinder, dir);
 	}
 
 	static std::size_t size()
@@ -2027,15 +5691,15 @@ public:
 
 		obj = Poco::AutoPtr<T>(new T());
 		if (defVal)
-			TypeHandler<T>::extract(pos, *obj, *defVal, pExt);
+			   TypeHandler<T>::extract(pos, *obj, *defVal, pExt);
 		else
-			TypeHandler<T>::extract(pos, *obj, *obj, pExt);
+			   TypeHandler<T>::extract(pos, *obj, *obj, pExt);
 	}
 
 	static void prepare(std::size_t pos, const Poco::AutoPtr<T>&, AbstractPreparator::Ptr pPreparator)
 	{
 		poco_assert_dbg (!pPreparator.isNull());
-		TypeHandler<T>::prepare(pos, T(), pPreparator);
+			   TypeHandler<T>::prepare(pos, T(), pPreparator);
 	}
 
 private:
@@ -2053,7 +5717,7 @@ public:
 	static void bind(std::size_t pos, const Poco::SharedPtr<T>& obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
 	{
 		// *obj will trigger a nullpointer exception if empty
-		TypeHandler<T>::bind(pos, *obj, pBinder, dir);
+			   TypeHandler<T>::bind(pos, *obj, pBinder, dir);
 	}
 
 	static std::size_t size()
@@ -2067,15 +5731,15 @@ public:
 
 		obj = Poco::SharedPtr<T>(new T());
 		if (defVal)
-			TypeHandler<T>::extract(pos, *obj, *defVal, pExt);
+			   TypeHandler<T>::extract(pos, *obj, *defVal, pExt);
 		else
-			TypeHandler<T>::extract(pos, *obj, *obj, pExt);
+			   TypeHandler<T>::extract(pos, *obj, *obj, pExt);
 	}
 
 	static void prepare(std::size_t pos, const Poco::SharedPtr<T>&, AbstractPreparator::Ptr pPreparator)
 	{
 		poco_assert_dbg (!pPreparator.isNull());
-		TypeHandler<T>::prepare(pos, T(), pPreparator);
+			   TypeHandler<T>::prepare(pos, T(), pPreparator);
 	}
 
 private:
diff --git a/Data/samples/Binding/src/Binding.cpp b/Data/samples/Binding/src/Binding.cpp
index d80f9bc10..d17d96404 100644
--- a/Data/samples/Binding/src/Binding.cpp
+++ b/Data/samples/Binding/src/Binding.cpp
@@ -38,32 +38,32 @@ int main(int argc, char** argv)
 
 	// drop sample table, if it exists
 	session << "DROP TABLE IF EXISTS Person", now;
-	
+
 	// (re)create table
 	session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3))", now;
-	
+
 	// insert some rows
-	Person person = 
+	Person person =
 	{
 		"Bart Simpson",
 		"Springfield",
 		12
 	};
-	
+
 	Statement insert(session);
 	insert << "INSERT INTO Person VALUES(?, ?, ?)",
 		use(person.name),
 		use(person.address),
 		use(person.age);
-	
+
 	insert.execute();
-	
+
 	person.name    = "Lisa Simpson";
 	person.address = "Springfield";
 	person.age     = 10;
-	
+
 	insert.execute();
-	
+
 	// a simple query
 	Statement select(session);
 	select << "SELECT Name, Address, Age FROM Person",
@@ -71,7 +71,7 @@ int main(int argc, char** argv)
 		into(person.address),
 		into(person.age),
 		range(0, 1); //  iterate over result set one row at a time
-		
+
 	while (!select.done())
 	{
 		select.execute();
@@ -83,7 +83,7 @@ int main(int argc, char** argv)
 	session << "SELECT Name FROM Person",
 		into(names),
 		now;
-		
+
 	for (std::vector<std::string>::const_iterator it = names.begin(); it != names.end(); ++it)
 	{
 		std::cout << *it << std::endl;
diff --git a/Data/samples/CMakeLists.txt b/Data/samples/CMakeLists.txt
index 551d453cc..58727cd3c 100644
--- a/Data/samples/CMakeLists.txt
+++ b/Data/samples/CMakeLists.txt
@@ -3,3 +3,4 @@ add_subdirectory(RecordSet)
 add_subdirectory(RowFormatter)
 add_subdirectory(Tuple)
 add_subdirectory(TypeHandler)
+add_subdirectory(WebNotifier)
diff --git a/Data/samples/RecordSet/Makefile b/Data/samples/RecordSet/Makefile
index e65ba747c..2f6a7b1b5 100644
--- a/Data/samples/RecordSet/Makefile
+++ b/Data/samples/RecordSet/Makefile
@@ -10,6 +10,6 @@ objects = RecordSet
 
 target         = RecordSet
 target_version = 1
-target_libs    = PocoDataSQLite PocoData PocoFoundation 
+target_libs    = PocoDataSQLite PocoData PocoFoundation
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Data/samples/RecordSet/src/RecordSet.cpp b/Data/samples/RecordSet/src/RecordSet.cpp
index f5ac85e75..7d804e4c4 100644
--- a/Data/samples/RecordSet/src/RecordSet.cpp
+++ b/Data/samples/RecordSet/src/RecordSet.cpp
@@ -36,22 +36,22 @@ int main(int argc, char** argv)
 
 	// drop sample table, if it exists
 	session << "DROP TABLE IF EXISTS Person", now;
-	
+
 	// (re)create table
 	session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now;
-	
+
 	// insert some rows
 	DateTime bd(1980, 4, 1);
 	DateTime ld(1982, 5, 9);
 	session << "INSERT INTO Person VALUES('Bart Simpson', 'Springfield', 12, ?)", use(bd), now;
 	session << "INSERT INTO Person VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(ld), now;
-		
+
 	// a simple query
 	Statement select(session);
 	select << "SELECT * FROM Person";
 	select.execute();
 
-	// create a RecordSet 
+	// create a RecordSet
 	RecordSet rs(select);
 	std::size_t cols = rs.columnCount();
 	// print all column names
diff --git a/Data/samples/RowFormatter/Makefile b/Data/samples/RowFormatter/Makefile
index 9e9306a31..b225bb0b7 100644
--- a/Data/samples/RowFormatter/Makefile
+++ b/Data/samples/RowFormatter/Makefile
@@ -10,6 +10,6 @@ objects = RowFormatter
 
 target         = RowFormatter
 target_version = 1
-target_libs    = PocoDataSQLite PocoData PocoFoundation 
+target_libs    = PocoDataSQLite PocoData PocoFoundation
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Data/samples/RowFormatter/src/RowFormatter.cpp b/Data/samples/RowFormatter/src/RowFormatter.cpp
index 4c928f940..597a0a167 100644
--- a/Data/samples/RowFormatter/src/RowFormatter.cpp
+++ b/Data/samples/RowFormatter/src/RowFormatter.cpp
@@ -39,7 +39,7 @@ public:
 		std::ostringstream os;
 		os << "<TABLE border=\"1\" cellspacing=\"0\">" << std::endl;
 		setPrefix(os.str());
-		
+
 		os.str("");
 		os << "</TABLE>" << std::endl;
 		setPostfix(os.str());
@@ -67,9 +67,9 @@ public:
 		ValueVec::const_iterator end = vals.end();
 		for (; it != end; ++it)
 		{
-			if (it->isNumeric()) 
+			if (it->isNumeric())
 				str << "\t\t<TD align=\"right\">";
-			else 
+			else
 				str << "\t\t<TD align=\"left\">";
 
 			str << it->convert<std::string>() << "</TD>" << std::endl;
@@ -85,16 +85,16 @@ int main(int argc, char** argv)
 {
 	// register SQLite connector
 	Poco::Data::SQLite::Connector::registerConnector();
-	
+
 	// create a session
 	Session session("SQLite", "sample.db");
 
 	// drop sample table, if it exists
 	session << "DROP TABLE IF EXISTS Simpsons", now;
-	
+
 	// (re)create table
 	session << "CREATE TABLE Simpsons (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now;
-	
+
 	// insert some rows
 	DateTime hd(1956, 3, 1);
 	session << "INSERT INTO Simpsons VALUES('Homer Simpson', 'Springfield', 42, ?)", use(hd), now;
@@ -104,7 +104,7 @@ int main(int argc, char** argv)
 	session << "INSERT INTO Simpsons VALUES('Bart Simpson', 'Springfield', 12, ?)", use(hd), now;
 	hd.assign(1982, 5, 9);
 	session << "INSERT INTO Simpsons VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(hd), now;
-		
+
 	// create a statement and print the column names and data as HTML table
 	HTMLTableFormatter tf;
 	Statement stmt = (session << "SELECT * FROM Simpsons", format(tf), now);
diff --git a/Data/samples/Tuple/Makefile b/Data/samples/Tuple/Makefile
index c2b921217..4e8f28eb7 100644
--- a/Data/samples/Tuple/Makefile
+++ b/Data/samples/Tuple/Makefile
@@ -10,6 +10,6 @@ objects = Tuple
 
 target         = Tuple
 target_version = 1
-target_libs    = PocoDataSQLite PocoData PocoFoundation 
+target_libs    = PocoDataSQLite PocoData PocoFoundation
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Data/samples/Tuple/src/Tuple.cpp b/Data/samples/Tuple/src/Tuple.cpp
index d269b26b8..dd01566fe 100644
--- a/Data/samples/Tuple/src/Tuple.cpp
+++ b/Data/samples/Tuple/src/Tuple.cpp
@@ -36,19 +36,19 @@ int main(int argc, char** argv)
 
 	// drop sample table, if it exists
 	session << "DROP TABLE IF EXISTS Person", now;
-	
+
 	// (re)create table
 	session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3))", now;
-	
+
 	// insert some rows
 	People people;
 	people.push_back(Person("Bart Simpson",	"Springfield", 12));
 	people.push_back(Person("Lisa Simpson",	"Springfield", 10));
-	
+
 	Statement insert(session);
 	insert << "INSERT INTO Person VALUES(:name, :address, :age)",
 		use(people), now;
-	
+
 	people.clear();
 
 	// a simple query
@@ -56,11 +56,11 @@ int main(int argc, char** argv)
 	select << "SELECT Name, Address, Age FROM Person",
 		into(people),
 		now;
-	
+
 	for (People::const_iterator it = people.begin(); it != people.end(); ++it)
 	{
-		std::cout << "Name: " << it->get<0>() << 
-			", Address: " << it->get<1>() << 
+		std::cout << "Name: " << it->get<0>() <<
+			", Address: " << it->get<1>() <<
 			", Age: " << it->get<2>() <<std::endl;
 	}
 
diff --git a/Data/samples/TypeHandler/Makefile b/Data/samples/TypeHandler/Makefile
index 7c2d16ac8..0ba271e58 100644
--- a/Data/samples/TypeHandler/Makefile
+++ b/Data/samples/TypeHandler/Makefile
@@ -10,6 +10,6 @@ objects = TypeHandler
 
 target         = TypeHandler
 target_version = 1
-target_libs    = PocoDataSQLite PocoData PocoFoundation 
+target_libs    = PocoDataSQLite PocoData PocoFoundation
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Data/samples/TypeHandler/src/TypeHandler.cpp b/Data/samples/TypeHandler/src/TypeHandler.cpp
index ae3e3cc49..04f0fb9d9 100644
--- a/Data/samples/TypeHandler/src/TypeHandler.cpp
+++ b/Data/samples/TypeHandler/src/TypeHandler.cpp
@@ -49,7 +49,7 @@ public:
 	{
 		return 4;
 	}
-	
+
 	static void bind(std::size_t pos, const Person& person, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
 	{
 		TypeHandler<std::string>::bind(pos++, person.name, pBinder, dir);
@@ -57,7 +57,7 @@ public:
 		TypeHandler<int>::bind(pos++, person.age, pBinder, dir);
 		TypeHandler<DateTime>::bind(pos++, person.birthday, pBinder, dir);
 	}
-	
+
 	static void extract(std::size_t pos, Person& person, const Person& deflt, AbstractExtractor::Ptr pExtr)
 	{
 		TypeHandler<std::string>::extract(pos++, person.name, deflt.name, pExtr);
@@ -65,7 +65,7 @@ public:
 		TypeHandler<int>::extract(pos++, person.age, deflt.age, pExtr);
 		TypeHandler<DateTime>::extract(pos++, person.birthday, deflt.birthday, pExtr);
 	}
-	
+
 	static void prepare(std::size_t pos, const Person& person, AbstractPreparator::Ptr pPrep)
 	{
 		TypeHandler<std::string>::prepare(pos++, person.name, pPrep);
@@ -89,62 +89,62 @@ int main(int argc, char** argv)
 
 	// drop sample table, if it exists
 	session << "DROP TABLE IF EXISTS Person", now;
-	
+
 	// (re)create table
 	session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now;
-	
+
 	// insert some rows
-	Person person = 
+	Person person =
 	{
 		"Bart Simpson",
 		"Springfield",
 		10,
 		DateTime(1980, 4, 1)
 	};
-	
+
 	Statement insert(session);
 	insert << "INSERT INTO Person VALUES(?, ?, ?, ?)",
 		use(person);
-		
+
 	insert.execute();
-	
+
 	person.name    = "Lisa Simpson";
 	person.address = "Springfield";
 	person.age     = 8;
 	person.birthday = DateTime(1982, 5, 9);
 
 	insert.execute();
-	
+
 	// a simple query
 	Statement select(session);
 	select << "SELECT Name, Address, Age, Birthday FROM Person",
 		into(person),
 		range(0, 1); //  iterate over result set one row at a time
-		
+
 	while (!select.done())
 	{
 		select.execute();
 		std::cout << person.name << "\t"
 			<< person.address << "\t"
 			<< person.age << "\t"
-			<< DateTimeFormatter::format(person.birthday, "%b %d %Y") 
+			<< DateTimeFormatter::format(person.birthday, "%b %d %Y")
 		<< std::endl;
 	}
-	
+
 	// another query - store the result in a container
 	std::vector<Person> persons;
 	session << "SELECT Name, Address, Age, Birthday FROM Person",
 		into(persons),
 		now;
-		
+
 	for (std::vector<Person>::const_iterator it = persons.begin(); it != persons.end(); ++it)
 	{
 		std::cout << it->name << "\t"
 			<< it->address << "\t"
 			<< it->age << "\t"
-			<< DateTimeFormatter::format(it->birthday, "%b %d %Y") 
+			<< DateTimeFormatter::format(it->birthday, "%b %d %Y")
 		<< std::endl;
 	}
-	
+
 	return 0;
 }
diff --git a/Data/samples/WebNotifier/WebNotifier.html b/Data/samples/WebNotifier/WebNotifier.html
index 30b94c3dc..c826d3a27 100644
--- a/Data/samples/WebNotifier/WebNotifier.html
+++ b/Data/samples/WebNotifier/WebNotifier.html
@@ -8,10 +8,10 @@
       var div = document.getElementById("output");
       div.innerHTML = div.innerHTML + "<pre style='color:" + color + "'>" + msg + "</pre>";
     }
-	  
+
     function WebSocketOpen()
     {
-      if ("WebSocket" in window) 
+      if ("WebSocket" in window)
       {
         ws = new WebSocket("ws://localhost:9980/ws");
 
@@ -20,7 +20,7 @@
           ws.send("Hello, world!");
 		  log("WebSocket opened.", "green");
         };
-    
+
         ws.onmessage = function(evt)
         {
           var arr = evt.data.split(",");
@@ -32,7 +32,7 @@
           else
             log("Unknown message received: " + evt.data, "red");
         };
-        
+
         ws.onclose = function()
         {
           log("WebSocket closed.", "red");
@@ -43,22 +43,22 @@
         log("This browser does not support WebSockets.", "red");
       }
     }
-    
+
     function WebSocketSend(msg)
     {
       ws.send("hello");
     }
-    
+
     function WebSocketClose()
     {
       ws.close();
     }
-    
+
     function updateTable(id, name, address, age)
     {
       var table = document.getElementById("dataTable");
-      
-      
+
+
       if (table.rows.length > 1)
       {
         for (r = 1; r < table.rows.length; r++)
@@ -72,18 +72,18 @@
           }
         }
       }
-      
+
       var row = table.insertRow(table.rows.length);
-      
+
       var cell1 = row.insertCell(0);
       cell1.innerHTML = id;
-      
+
       var cell2 = row.insertCell(1);
       cell2.innerHTML = name;
-      
+
       var cell3 = row.insertCell(2);
       cell3.innerHTML = address;
-      
+
       var cell4 = row.insertCell(3);
       cell4.innerHTML = age;
     }
@@ -101,4 +101,4 @@
     </table>
     <div id="output"></div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/Data/src/AbstractBinding.cpp b/Data/src/AbstractBinding.cpp
index d30ccd1d8..be6fd363d 100644
--- a/Data/src/AbstractBinding.cpp
+++ b/Data/src/AbstractBinding.cpp
@@ -19,9 +19,9 @@ namespace Poco {
 namespace Data {
 
 
-AbstractBinding::AbstractBinding(const std::string& name, 
-	Direction direction, 
-	Poco::UInt32 bulkSize): 
+AbstractBinding::AbstractBinding(const std::string& name,
+	Direction direction,
+	Poco::UInt32 bulkSize):
 	_pBinder(0),
 	_name(name),
 	_direction(direction),
diff --git a/Data/src/AbstractExtraction.cpp b/Data/src/AbstractExtraction.cpp
index ac3f83927..94b394bdc 100644
--- a/Data/src/AbstractExtraction.cpp
+++ b/Data/src/AbstractExtraction.cpp
@@ -21,8 +21,8 @@ namespace Data {
 
 AbstractExtraction::AbstractExtraction(Poco::UInt32 limit,
 	Poco::UInt32 position,
-	bool bulk): 
-	_pExtractor(0), 
+	bool bulk):
+	_pExtractor(0),
 	_limit(limit),
 	_position(position),
 	_bulk(bulk),
diff --git a/Data/src/ArchiveStrategy.cpp b/Data/src/ArchiveStrategy.cpp
index 2d8842ba2..c1cb8d995 100644
--- a/Data/src/ArchiveStrategy.cpp
+++ b/Data/src/ArchiveStrategy.cpp
@@ -30,8 +30,8 @@ const std::string ArchiveStrategy::DEFAULT_ARCHIVE_DESTINATION = "T_POCO_LOG_ARC
 
 
 ArchiveStrategy::ArchiveStrategy(const std::string& connector,
-	const std::string& connect, 
-	const std::string& source, 
+	const std::string& connect,
+	const std::string& source,
 	const std::string& destination):
 	_connector(connector),
 	_connect(connect),
@@ -61,9 +61,9 @@ void ArchiveStrategy::open()
 //
 
 
-ArchiveByAgeStrategy::ArchiveByAgeStrategy(const std::string& connector, 
-	const std::string& connect, 
-	const std::string& sourceTable, 
+ArchiveByAgeStrategy::ArchiveByAgeStrategy(const std::string& connector,
+	const std::string& connect,
+	const std::string& sourceTable,
 	const std::string& destinationTable):
 	ArchiveStrategy(connector, connect, sourceTable, destinationTable)
 {
@@ -124,7 +124,7 @@ void ArchiveByAgeStrategy::setThreshold(const std::string& age)
 	while (it != end && Ascii::isSpace(*it)) ++it;
 	std::string unit;
 	while (it != end && Ascii::isAlpha(*it)) unit += *it++;
-	
+
 	Timespan::TimeDiff factor = Timespan::SECONDS;
 	if (unit == "minutes")
 		factor = Timespan::MINUTES;
@@ -138,7 +138,7 @@ void ArchiveByAgeStrategy::setThreshold(const std::string& age)
 		factor = 30*Timespan::DAYS;
 	else if (unit != "seconds")
 		throw InvalidArgumentException("setMaxAge", age);
-		
+
 	_maxAge = factor * n;
 }
 
diff --git a/Data/src/Date.cpp b/Data/src/Date.cpp
index 542d9a981..302b6a1d4 100644
--- a/Data/src/Date.cpp
+++ b/Data/src/Date.cpp
@@ -61,7 +61,7 @@ void Date::assign(int year, int month, int day)
 		throw InvalidArgumentException("Month must be between 1 and 12");
 
 	if (day < 1 || day > DateTime::daysOfMonth(year, month))
-		throw InvalidArgumentException("Month must be between 1 and " + 
+		throw InvalidArgumentException("Month must be between 1 and " +
 			NumberFormatter::format(DateTime::daysOfMonth(year, month)));
 
 	_year = year;
@@ -80,7 +80,7 @@ bool Date::operator < (const Date& date) const
 	{
 		int month = date.month();
 		if (_month < month) return true;
-		else 
+		else
 		if (_month > month) return false;
 		else // months equal
 		if (_day < date.day()) return true;
diff --git a/Data/src/MetaColumn.cpp b/Data/src/MetaColumn.cpp
index d333164fe..cf1de736c 100644
--- a/Data/src/MetaColumn.cpp
+++ b/Data/src/MetaColumn.cpp
@@ -92,7 +92,7 @@ MetaColumn& MetaColumn::operator = (MetaColumn&& other) noexcept
 }
 
 
-void MetaColumn::swap(MetaColumn& other)
+void MetaColumn::swap(MetaColumn& other) noexcept
 {
 	std::swap(_name, other._name);
 	std::swap(_length, other._length);
diff --git a/Data/src/Row.cpp b/Data/src/Row.cpp
index d078536bd..9cc6b0daf 100644
--- a/Data/src/Row.cpp
+++ b/Data/src/Row.cpp
@@ -29,7 +29,7 @@ std::ostream& operator << (std::ostream &os, const Row& row)
 }
 
 
-Row::Row(): 
+Row::Row():
 	_pNames(0),
 	_pSortMap(new SortMap),
 	_pFormatter(new SimpleRowFormatter)
@@ -63,9 +63,9 @@ void Row::init(const SortMapPtr& pSortMap, const RowFormatter::Ptr& pFormatter)
 	if (sz)
 	{
 		_values.resize(sz);
-		// Row sortability in the strict weak ordering sense is 
+		// Row sortability in the strict weak ordering sense is
 		// an invariant, hence we must start with a zero here.
-		// If null value is later retrieved from DB, the 
+		// If null value is later retrieved from DB, the
 		// Var::empty() call should be used to empty
 		// the corresponding Row value.
 		_values[0] = 0;
@@ -102,7 +102,7 @@ std::size_t Row::getPosition(const std::string& name)
 	std::size_t col = 0;
 	for (; it != end; ++it, ++col)
 		if (0 == icompare(name, *it)) return col;
-	
+
 	throw NotFoundException(name);
 }
 
@@ -115,7 +115,7 @@ void Row::addSortField(std::size_t pos)
 	SortMap::iterator end = _pSortMap->end();
 	for (; it != end; ++it)
 	{
-		if (it->get<0>() == pos) return; 
+		if (it->get<0>() == pos) return;
 	}
 
 	ComparisonType ct;
@@ -295,16 +295,16 @@ bool Row::operator < (const Row& other) const
 			return false;
 
 		case COMPARE_AS_INTEGER:
-			if (_values[it->get<0>()].convert<Poco::Int64>() < 
+			if (_values[it->get<0>()].convert<Poco::Int64>() <
 				other._values[it->get<0>()].convert<Poco::Int64>())
 				return true;
-			else if (_values[it->get<0>()].convert<Poco::Int64>() != 
+			else if (_values[it->get<0>()].convert<Poco::Int64>() !=
 				other._values[it->get<0>()].convert<Poco::Int64>())
 				return false;
 			break;
 
 		case COMPARE_AS_FLOAT:
-			if (_values[it->get<0>()].convert<double>() < 
+			if (_values[it->get<0>()].convert<double>() <
 				other._values[it->get<0>()].convert<double>())
 				return true;
 			else if (_values[it->get<0>()].convert<double>() !=
@@ -313,7 +313,7 @@ bool Row::operator < (const Row& other) const
 			break;
 
 		case COMPARE_AS_STRING:
-			if (_values[it->get<0>()].convert<std::string>() < 
+			if (_values[it->get<0>()].convert<std::string>() <
 				other._values[it->get<0>()].convert<std::string>())
 				return true;
 			else if (_values[it->get<0>()].convert<std::string>() !=
@@ -334,7 +334,7 @@ void Row::setFormatter(const RowFormatter::Ptr& pFormatter)
 {
 	if (pFormatter.get())
 		_pFormatter = pFormatter;
-	else 
+	else
 		_pFormatter = new SimpleRowFormatter;
 }
 
@@ -343,7 +343,7 @@ void Row::setSortMap(const SortMapPtr& pSortMap)
 {
 	if (pSortMap.get())
 		_pSortMap = pSortMap;
-	else 
+	else
 		_pSortMap = new SortMap;
 }
 
diff --git a/Data/src/RowFilter.cpp b/Data/src/RowFilter.cpp
index 9fd0b6287..c66c6b5ea 100644
--- a/Data/src/RowFilter.cpp
+++ b/Data/src/RowFilter.cpp
@@ -77,7 +77,7 @@ bool RowFilter::isAllowed(std::size_t row) const
 {
 	Poco::Dynamic::Var retVal;
 	const RecordSet& rs = recordSet();
-	
+
 	std::size_t columns = rs.columnCount();
 	ComparisonMap::const_iterator it = _comparisonMap.begin();
 	ComparisonMap::const_iterator end = _comparisonMap.end();
@@ -111,7 +111,7 @@ bool RowFilter::isAllowed(std::size_t row) const
 			default:
 				throw IllegalStateException("Unsupported comparison criteria.");
 			}
-			
+
 			doCompare(ret, val, compOp, it->second);
 			if (retVal.isEmpty()) retVal = ret;
 			else retVal = retVal || ret;
@@ -212,7 +212,7 @@ RecordSet& RowFilter::recordSet() const
 			_pRecordSet = pParent->_pRecordSet;
 	}
 	poco_check_ptr (_pRecordSet);
-	return *_pRecordSet; 
+	return *_pRecordSet;
 }
 
 
diff --git a/Data/src/RowFormatter.cpp b/Data/src/RowFormatter.cpp
index 3173fd84e..56564e9a9 100644
--- a/Data/src/RowFormatter.cpp
+++ b/Data/src/RowFormatter.cpp
@@ -24,7 +24,7 @@ namespace Data {
 RowFormatter::RowFormatter(const std::string& prefix,
 	const std::string& postfix,
 	Mode mode):
-	_prefix(prefix), 
+	_prefix(prefix),
 	_postfix(postfix),
 	_mode(mode),
 	_totalRowCount(0)
diff --git a/Data/src/RowIterator.cpp b/Data/src/RowIterator.cpp
index 912002111..73d73e36c 100644
--- a/Data/src/RowIterator.cpp
+++ b/Data/src/RowIterator.cpp
@@ -26,7 +26,7 @@ namespace Data {
 const std::size_t RowIterator::POSITION_END = std::numeric_limits<std::size_t>::max();
 
 
-RowIterator::RowIterator(RecordSet* pRecordSet, bool positionEnd): 
+RowIterator::RowIterator(RecordSet* pRecordSet, bool positionEnd):
 	_pRecordSet(pRecordSet),
 	_position(positionEnd ? POSITION_END : 0)
 {
@@ -67,10 +67,10 @@ RowIterator& RowIterator::operator = (RowIterator&& other) noexcept
 }
 
 
-void RowIterator::swap(RowIterator& other)
+void RowIterator::swap(RowIterator& other) noexcept
 {
 	using std::swap;
-	
+
 	swap(_pRecordSet, other._pRecordSet);
 	swap(_position, other._position);
 }
diff --git a/Data/src/SQLChannel.cpp b/Data/src/SQLChannel.cpp
index 7818aa327..886b7c399 100644
--- a/Data/src/SQLChannel.cpp
+++ b/Data/src/SQLChannel.cpp
@@ -53,7 +53,7 @@ SQLChannel::SQLChannel():
 }
 
 
-SQLChannel::SQLChannel(const std::string& connector, 
+SQLChannel::SQLChannel(const std::string& connector,
 	const std::string& connect,
 	const std::string& name):
 	_connector(connector),
@@ -93,7 +93,7 @@ void SQLChannel::open()
 	initLogStatement();
 }
 
-	
+
 void SQLChannel::close()
 {
 	wait();
@@ -110,9 +110,9 @@ void SQLChannel::log(const Message& msg)
 void SQLChannel::logAsync(const Message& msg)
 {
 	poco_check_ptr (_pLogStatement);
-	if (0 == wait() && !_pLogStatement->done() && !_pLogStatement->initialized()) 
+	if (0 == wait() && !_pLogStatement->done() && !_pLogStatement->initialized())
 	{
-		if (_throw) 
+		if (_throw)
 			throw TimeoutException("Timed out waiting for previous statement completion");
 		else return;
 	}
@@ -145,7 +145,7 @@ void SQLChannel::logSync(const Message& msg)
 	}
 }
 
-	
+
 void SQLChannel::setProperty(const std::string& name, const std::string& value)
 {
 	if (name == PROP_NAME)
@@ -222,7 +222,7 @@ void SQLChannel::setProperty(const std::string& name, const std::string& value)
 	}
 }
 
-	
+
 std::string SQLChannel::getProperty(const std::string& name) const
 {
 	if (name == PROP_NAME)
@@ -288,7 +288,7 @@ void SQLChannel::initLogStatement()
 
 void SQLChannel::registerChannel()
 {
-	Poco::LoggingFactory::defaultFactory().registerChannelClass("SQLChannel", 
+	Poco::LoggingFactory::defaultFactory().registerChannelClass("SQLChannel",
 		new Poco::Instantiator<SQLChannel, Poco::Channel>);
 }
 
diff --git a/Data/src/SessionFactory.cpp b/Data/src/SessionFactory.cpp
index bcc5c412f..3c886c858 100644
--- a/Data/src/SessionFactory.cpp
+++ b/Data/src/SessionFactory.cpp
@@ -83,8 +83,8 @@ Session SessionFactory::create(const std::string& uri,
 }
 
 
-SessionFactory::SessionInfo::SessionInfo(Connector* pSI): 
-	cnt(1), 
+SessionFactory::SessionInfo::SessionInfo(Connector* pSI):
+	cnt(1),
 	ptrSI(pSI)
 {
 }
diff --git a/Data/src/SessionPool.cpp b/Data/src/SessionPool.cpp
index 56e8584af..c1640094b 100644
--- a/Data/src/SessionPool.cpp
+++ b/Data/src/SessionPool.cpp
@@ -22,12 +22,13 @@ namespace Poco {
 namespace Data {
 
 
-SessionPool::SessionPool(const std::string& connector, const std::string& connectionString, int minSessions, int maxSessions, int idleTime):
+SessionPool::SessionPool(const std::string& connector, const std::string& connectionString, int minSessions, int maxSessions, int idleTime, int connTimeout):
 	_connector(connector),
 	_connectionString(connectionString),
 	_minSessions(minSessions),
 	_maxSessions(maxSessions),
 	_idleTime(idleTime),
+	_connTimeout(connTimeout),
 	_nSessions(0),
 	_janitorTimer(1000*idleTime, 1000*idleTime/4),
 	_shutdown(false)
@@ -72,7 +73,7 @@ Session SessionPool::get()
 	{
 		if (_nSessions < _maxSessions)
 		{
-			Session newSession(SessionFactory::instance().create(_connector, _connectionString));
+			Session newSession(SessionFactory::instance().create(_connector, _connectionString, static_cast<std::size_t>(_connTimeout)));
 			applySettings(newSession.impl());
 			customizeSession(newSession);
 
@@ -130,6 +131,12 @@ int SessionPool::idle() const
 }
 
 
+int SessionPool::connTimeout() const
+{
+	return _connTimeout;
+}
+
+
 int SessionPool::dead()
 {
 	Poco::Mutex::ScopedLock lock(_mutex);
diff --git a/Data/src/SessionPoolContainer.cpp b/Data/src/SessionPoolContainer.cpp
index 1fd1bb292..f8f7c434c 100644
--- a/Data/src/SessionPoolContainer.cpp
+++ b/Data/src/SessionPoolContainer.cpp
@@ -51,10 +51,10 @@ void SessionPoolContainer::add(SessionPool* pPool)
 }
 
 
-Session SessionPoolContainer::add(const std::string& sessionKey, 
+Session SessionPoolContainer::add(const std::string& sessionKey,
 	const std::string& connectionString,
-	int minSessions, 
-	int maxSessions, 
+	int minSessions,
+	int maxSessions,
 	int idleTime)
 {
 	std::string name = SessionPool::name(sessionKey, connectionString);
@@ -65,10 +65,10 @@ Session SessionPoolContainer::add(const std::string& sessionKey,
 	// pool already exists, silently return a session from it
 	if (it != _sessionPools.end()) return it->second->get();
 
-	SessionPool* pSP = 
+	SessionPool* pSP =
 		new SessionPool(sessionKey, connectionString, minSessions, maxSessions, idleTime);
 
-	std::pair<SessionPoolMap::iterator, bool> ins = 
+	std::pair<SessionPoolMap::iterator, bool> ins =
 		_sessionPools.insert(SessionPoolMap::value_type(name, pSP));
 
 	return ins.first->second->get();
@@ -78,7 +78,7 @@ Session SessionPoolContainer::add(const std::string& sessionKey,
 bool SessionPoolContainer::isActive(const std::string& sessionKey,
 		const std::string& connectionString) const
 {
-	std::string name = connectionString.empty() ? 
+	std::string name = connectionString.empty() ?
 		sessionKey : SessionPool::name(sessionKey, connectionString);
 
 	SessionPoolMap::const_iterator it = _sessionPools.find(name);
diff --git a/Data/src/SimpleRowFormatter.cpp b/Data/src/SimpleRowFormatter.cpp
index 839eb86e5..00cc53bdd 100644
--- a/Data/src/SimpleRowFormatter.cpp
+++ b/Data/src/SimpleRowFormatter.cpp
@@ -49,7 +49,7 @@ SimpleRowFormatter& SimpleRowFormatter::operator = (const SimpleRowFormatter& ro
 }
 
 
-void SimpleRowFormatter::swap(SimpleRowFormatter& other)
+void SimpleRowFormatter::swap(SimpleRowFormatter& other) noexcept
 {
 	using std::swap;
 
@@ -91,7 +91,7 @@ std::string& SimpleRowFormatter::formatValues(const ValueVec& vals, std::string&
 		if (it != vals.begin()) str << space;
 		if (it->isNumeric())
 		{
-			str << std::right 
+			str << std::right
 				<< std::fixed
 				<< std::setprecision(2);
 		}
diff --git a/Data/src/Statement.cpp b/Data/src/Statement.cpp
index d67ba0553..089377aa1 100644
--- a/Data/src/Statement.cpp
+++ b/Data/src/Statement.cpp
@@ -89,10 +89,10 @@ Statement& Statement::operator = (Statement&& stmt) noexcept
 	return *this;
 }
 
-void Statement::swap(Statement& other)
+void Statement::swap(Statement& other) noexcept
 {
 	using std::swap;
-	
+
 	swap(_pImpl, other._pImpl);
 	swap(_async, other._async);
 	swap(_pAsyncExec, other._pAsyncExec);
@@ -116,7 +116,7 @@ std::size_t Statement::execute(bool reset)
 	bool isDone = done();
 	if (initialized() || paused() || isDone)
 	{
-		if (_arguments.size()) 
+		if (_arguments.size())
 		{
 			_pImpl->formatSQL(_arguments);
 			_arguments.clear();
@@ -132,7 +132,7 @@ std::size_t Statement::execute(bool reset)
 			doAsyncExec();
 			return 0;
 		}
-	} 
+	}
 	else throw InvalidAccessException("Statement still executing.");
 }
 
@@ -275,7 +275,7 @@ Statement& Statement::operator , (const Bulk& bulk)
 	if (!_pImpl->isBulkSupported())
 			throw InvalidAccessException("Bulk not supported by this session.");
 
-	if (0 == _pImpl->extractions().size() && 
+	if (0 == _pImpl->extractions().size() &&
 		0 == _pImpl->bindings().size() &&
 		_pImpl->bulkExtractionAllowed() &&
 		_pImpl->bulkBindingAllowed())
@@ -293,8 +293,8 @@ Statement& Statement::operator , (const Bulk& bulk)
 Statement& Statement::operator , (BulkFnType)
 {
 	const Limit& limit(_pImpl->extractionLimit());
-	if (limit.isHardLimit() || 
-		limit.isLowerLimit() || 
+	if (limit.isHardLimit() ||
+		limit.isLowerLimit() ||
 		Limit::LIMIT_UNLIMITED == limit.value())
 	{
 		throw InvalidAccessException("Bulk is only allowed with limited extraction,"
@@ -311,7 +311,7 @@ Statement& Statement::operator , (BulkFnType)
 
 Session Statement::session()
 {
-	Poco::AutoPtr<SessionImpl> ps(&impl()->session(), true); 
+	Poco::AutoPtr<SessionImpl> ps(&impl()->session(), true);
 	return Session(ps);
 }
 
diff --git a/Data/src/StatementCreator.cpp b/Data/src/StatementCreator.cpp
index 56d9bc679..bb3b845a5 100644
--- a/Data/src/StatementCreator.cpp
+++ b/Data/src/StatementCreator.cpp
@@ -57,7 +57,7 @@ StatementCreator& StatementCreator::operator = (StatementCreator&& other) noexce
 	return *this;
 }
 
-void StatementCreator::swap(StatementCreator& other)
+void StatementCreator::swap(StatementCreator& other) noexcept
 {
 	using std::swap;
 	swap(_ptrImpl, other._ptrImpl);
diff --git a/Data/src/StatementImpl.cpp b/Data/src/StatementImpl.cpp
index a00f93bcc..51f94eb5e 100644
--- a/Data/src/StatementImpl.cpp
+++ b/Data/src/StatementImpl.cpp
@@ -69,34 +69,40 @@ StatementImpl::~StatementImpl()
 
 std::size_t StatementImpl::execute(const bool& reset)
 {
-	if (reset) resetExtraction();
-
-	if (!_rSession.isConnected())
-	{
-		_state = ST_DONE;
-		throw NotConnectedException(_rSession.connectionString());
-	}
-
 	std::size_t lim = 0;
-	if (_lowerLimit > _extrLimit.value())
-		throw LimitException("Illegal Statement state. Upper limit must not be smaller than the lower limit.");
 
-	do
+	try
 	{
-		compile();
+		if (reset) resetExtraction();
+
+		if (!_rSession.isConnected())
+			throw NotConnectedException(_rSession.connectionString());
+
+		if (_lowerLimit > _extrLimit.value())
+			throw LimitException("Illegal Statement state. Upper limit must not be smaller than the lower limit.");
+
+		do
+		{
+			compile();
+			if (_extrLimit.value() == Limit::LIMIT_UNLIMITED)
+				lim += executeWithoutLimit();
+			else
+				lim += executeWithLimit();
+		} while (canCompile());
+
 		if (_extrLimit.value() == Limit::LIMIT_UNLIMITED)
-			lim += executeWithoutLimit();
-		else
-			lim += executeWithLimit();
-	} while (canCompile());
+			_state = ST_DONE;
 
-	if (_extrLimit.value() == Limit::LIMIT_UNLIMITED)
+		if (lim < _lowerLimit)
+			throw LimitException("Did not receive enough data.");
+
+		assignSubTotal(reset);
+	}
+	catch(...)
+	{
 		_state = ST_DONE;
-
-	if (lim < _lowerLimit)
-		throw LimitException("Did not receive enough data.");
-
-	assignSubTotal(reset);
+		throw;
+	}
 
 	return lim;
 }
diff --git a/Data/src/Time.cpp b/Data/src/Time.cpp
index de54b96e7..9030f1574 100644
--- a/Data/src/Time.cpp
+++ b/Data/src/Time.cpp
@@ -52,13 +52,13 @@ Time::~Time()
 
 void Time::assign(int hour, int minute, int second)
 {
-	if (hour < 0 || hour > 23) 
+	if (hour < 0 || hour > 23)
 		throw InvalidArgumentException("Hour must be between 0 and 23.");
 
-	if (minute < 0 || minute > 59) 
+	if (minute < 0 || minute > 59)
 		throw InvalidArgumentException("Minute must be between 0 and 59.");
 
-	if (second < 0 || second > 59) 
+	if (second < 0 || second > 59)
 		throw InvalidArgumentException("Second must be between 0 and 59.");
 
 	_hour = hour;
@@ -77,7 +77,7 @@ bool Time::operator < (const Time& time) const
 	{
 		int minute = time.minute();
 		if (_minute < minute) return true;
-		else 
+		else
 		if (_minute > minute) return false;
 		else // minutes equal
 		if (_second < time.second()) return true;
@@ -94,7 +94,7 @@ Time& Time::operator = (const Var& var)
 // TODO: determine the version able to handle it properly
 	*this = var.extract<Time>();
 #else
-	*this = var.operator Time(); 
+	*this = var.operator Time();
 #endif
 	return *this;
 }
diff --git a/Data/src/Transaction.cpp b/Data/src/Transaction.cpp
index 21da65304..e66b6b3c8 100644
--- a/Data/src/Transaction.cpp
+++ b/Data/src/Transaction.cpp
@@ -35,7 +35,7 @@ Transaction::Transaction(Poco::Data::Session& rSession, bool start):
 	if (start) begin();
 }
 
-	
+
 Transaction::~Transaction()
 {
 	try
@@ -44,19 +44,19 @@ Transaction::~Transaction()
 		{
 			try
 			{
-				if (_pLogger) 
+				if (_pLogger)
 					_pLogger->debug("Rolling back transaction.");
 
 				_rSession.rollback();
 			}
 			catch (Poco::Exception& exc)
 			{
-				if (_pLogger) 
+				if (_pLogger)
 					_pLogger->error("Error while rolling back database transaction: %s", exc.displayText());
 			}
 			catch (...)
 			{
-				if (_pLogger) 
+				if (_pLogger)
 					_pLogger->error("Error while rolling back database transaction.");
 			}
 		}
@@ -105,16 +105,16 @@ void Transaction::execute(const std::vector<std::string>& sql)
 
 void Transaction::commit()
 {
-	if (_pLogger) 
+	if (_pLogger)
 		_pLogger->debug("Committing transaction.");
 
 	_rSession.commit();
 }
 
-	
+
 void Transaction::rollback()
 {
-	if (_pLogger) 
+	if (_pLogger)
 		_pLogger->debug("Rolling back transaction.");
 
 	_rSession.rollback();
diff --git a/Data/testsuite/TestSuite_vs170.vcxproj b/Data/testsuite/TestSuite_vs170.vcxproj
index 8bd1aa749..7714a48e8 100644
--- a/Data/testsuite/TestSuite_vs170.vcxproj
+++ b/Data/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Data/testsuite/src/DataTest.cpp b/Data/testsuite/src/DataTest.cpp
index 9afb65ec4..65abe389a 100644
--- a/Data/testsuite/src/DataTest.cpp
+++ b/Data/testsuite/src/DataTest.cpp
@@ -112,7 +112,7 @@ void DataTest::testSession()
 	sess << "DROP TABLE IF EXISTS Test", now;
 	int count;
 	sess << "SELECT COUNT(*) FROM PERSON", into(count), now;
-	
+
 	std::string str;
 	Statement stmt = (sess << "SELECT * FROM Strings", into(str), limit(50));
 	stmt.execute();
@@ -123,28 +123,45 @@ void DataTest::testSession()
 
 	try
 	{
-		stmt.execute(); 
+		stmt.execute();
 		fail ("must fail");
 	} catch (NotConnectedException&) { }
 
+	assertTrue(stmt.done());
+
 	try
 	{
-		sess << "SELECT * FROM Strings", now; 
+		sess << "SELECT * FROM Strings", now;
 		fail ("must fail");
 	} catch (NotConnectedException&) { }
 
 	sess.open();
 	assertTrue (sess.getFeature("connected"));
 	assertTrue (sess.isConnected());
-	
-	sess << "SELECT * FROM Strings", now; 
+
+	// ensure that throwing during execution leaves
+	// statement in valid state (ST_DONE)
+	sess.setFeature("throwOnHasNext", true);
+	Statement stmt1 = (sess << "SELECT * FROM Strings", into(str), limit(50));
+	assertTrue (sess.getFeature("throwOnHasNext"));
+	try
+	{
+		stmt1.execute();
+		fail ("must trow UnknownDataBaseException");
+	}
+	catch(const Poco::Data::UnknownDataBaseException&) {}
+	assertTrue(stmt1.done());
+
+	// reset session back to normal operation
+	sess.setFeature("throwOnHasNext", false);
+	sess << "SELECT * FROM Strings", now;
 	stmt.execute();
 
 	sess.reconnect();
 	assertTrue (sess.getFeature("connected"));
 	assertTrue (sess.isConnected());
-	
-	sess << "SELECT * FROM Strings", now; 
+
+	sess << "SELECT * FROM Strings", now;
 	stmt.execute();
 }
 
@@ -153,9 +170,9 @@ void DataTest::testStatementFormatting()
 {
 	Session sess(SessionFactory::instance().create("test", "cs"));
 
-	Statement stmt = (sess << "SELECT %s%c%s,%d,%u,%f,%s FROM Person WHERE Name LIKE 'Simp%%'", 
+	Statement stmt = (sess << "SELECT %s%c%s,%d,%u,%f,%s FROM Person WHERE Name LIKE 'Simp%%'",
 		"'",'a',"'",-1, 1u, 1.5, "42", now);
-	
+
 	assertTrue ("SELECT 'a',-1,1,1.500000,42 FROM Person WHERE Name LIKE 'Simp%'" == stmt.toString());
 }
 
@@ -163,11 +180,11 @@ void DataTest::testStatementFormatting()
 void DataTest::testFeatures()
 {
 	Session sess(SessionFactory::instance().create("test", "cs"));
-	
+
 	sess.setFeature("f1", true);
 	assertTrue (sess.getFeature("f1"));
 	assertTrue (sess.getFeature("f2"));
-	
+
 	try
 	{
 		sess.setFeature("f2", false);
@@ -175,10 +192,10 @@ void DataTest::testFeatures()
 	catch (NotImplementedException&)
 	{
 	}
-	
+
 	sess.setFeature("f3", false);
 	assertTrue (!sess.getFeature("f2"));
-	
+
 	try
 	{
 		sess.setFeature("f3", true);
@@ -186,7 +203,7 @@ void DataTest::testFeatures()
 	catch (NotImplementedException&)
 	{
 	}
-	
+
 	try
 	{
 		sess.setFeature("f4", false);
@@ -200,13 +217,13 @@ void DataTest::testFeatures()
 void DataTest::testProperties()
 {
 	Session sess(SessionFactory::instance().create("test", "cs"));
-		
+
 	sess.setProperty("p1", 1);
 	Poco::Any v1 = sess.getProperty("p1");
 	assertTrue (Poco::AnyCast<int>(v1) == 1);
 	Poco::Any v2 = sess.getProperty("p2");
 	assertTrue (Poco::AnyCast<int>(v2) == 1);
-	
+
 	try
 	{
 		sess.setProperty("p2", 2);
@@ -214,11 +231,11 @@ void DataTest::testProperties()
 	catch (NotImplementedException&)
 	{
 	}
-	
+
 	sess.setProperty("p3", 2);
 	v1 = sess.getProperty("p2");
 	assertTrue (Poco::AnyCast<int>(v1) == 2);
-	
+
 	try
 	{
 		sess.setProperty("p3", 3);
@@ -226,7 +243,7 @@ void DataTest::testProperties()
 	catch (NotImplementedException&)
 	{
 	}
-	
+
 	try
 	{
 		sess.setProperty("p4", 4);
@@ -257,7 +274,7 @@ void DataTest::testLOB()
 	assertTrue (*lobNum1.begin() == 0);
 	Poco::Data::LOB<int>::Iterator it1 = lobNum1.end();
 	assertTrue (*(--it1) == 9);
-	
+
 	Poco::Data::LOB<int> lobNum2(lobNum1);
 	assertTrue (lobNum2.size() == lobNum1.size());
 	assertTrue (lobNum2 == lobNum1);
@@ -272,7 +289,7 @@ void DataTest::testCLOB()
 	std::string strAlpha = "abcdefghijklmnopqrstuvwxyz";
 	std::vector<char> vecAlpha(strAlpha.begin(), strAlpha.end());
 	std::vector<char> vecDigit(strDigit.begin(), strDigit.end());
-	
+
 	CLOB blobNumStr(strDigit.c_str(), strDigit.size());
 	assertTrue (blobNumStr.size() == strDigit.size());
 	assertTrue (0 == std::strncmp(strDigit.c_str(), blobNumStr.rawContent(), blobNumStr.size()));
@@ -351,19 +368,19 @@ void DataTest::writeToCLOB(BinaryWriter& writer)
 	writer << (unsigned) 123456;
 	writer << (long) -1234567890;
 	writer << (unsigned long) 1234567890;
-	
+
 	writer << (Int64) -1234567890;
 	writer << (UInt64) 1234567890;
 
 	writer << (float) 1.5;
 	writer << (double) -1.5;
-	
+
 	writer << "foo";
 	writer << "";
 
 	writer << std::string("bar");
 	writer << std::string();
-	
+
 	writer.write7BitEncoded((UInt32) 100);
 	writer.write7BitEncoded((UInt32) 1000);
 	writer.write7BitEncoded((UInt32) 10000);
@@ -387,7 +404,7 @@ void DataTest::readFromCLOB(BinaryReader& reader)
 	assertTrue (b);
 	reader >> b;
 	assertTrue (!b);
-	
+
 	char c = ' ';
 	reader >> c;
 	assertTrue (c == 'a');
@@ -419,7 +436,7 @@ void DataTest::readFromCLOB(BinaryReader& reader)
 	Int64 int64v = 0;
 	reader >> int64v;
 	assertTrue (int64v == -1234567890);
-	
+
 	UInt64 uint64v = 0;
 	reader >> uint64v;
 	assertTrue (uint64v == 1234567890);
@@ -427,7 +444,7 @@ void DataTest::readFromCLOB(BinaryReader& reader)
 	float floatv = 0.0;
 	reader >> floatv;
 	assertTrue (floatv == 1.5);
-	
+
 	double doublev = 0.0;
 	reader >> doublev;
 	assertTrue (doublev == -1.5);
@@ -437,7 +454,7 @@ void DataTest::readFromCLOB(BinaryReader& reader)
 	assertTrue (str == "foo");
 	reader >> str;
 	assertTrue (str == "");
-	
+
 	reader >> str;
 	assertTrue (str == "bar");
 	reader >> str;
@@ -488,7 +505,7 @@ void DataTest::testColumnVector()
 	pData->push_back(3);
 	pData->push_back(4);
 	pData->push_back(5);
-	
+
 	Column<std::vector<int>> c(mc, pData);
 
 	assertTrue (c.rowCount() == 5);
@@ -505,7 +522,7 @@ void DataTest::testColumnVector()
 
 	try
 	{
-		int i; i = c[100]; // to silence gcc
+		POCO_UNUSED int i; i = c[100];
 		fail ("must fail");
 	}
 	catch (RangeException&) { }
@@ -556,7 +573,7 @@ void DataTest::testColumnVector()
 	pV2->push_back(1);
 	Column<std::vector<int>> c3(mc, pV1);
 	Column<std::vector<int>> c4(mc, pV2);
-	
+
 	Poco::Data::swap(c3, c4);
 	assertTrue (c3[0] == 5);
 	assertTrue (c3[1] == 4);
@@ -595,7 +612,7 @@ void DataTest::testColumnVectorBool()
 	pData->push_back(true);
 	pData->push_back(false);
 	pData->push_back(true);
-	
+
 	Column<std::vector<bool>> c(mc, pData);
 
 	assertTrue (c.rowCount() == 5);
@@ -608,7 +625,7 @@ void DataTest::testColumnVectorBool()
 
 	try
 	{
-		bool b; b = c[100]; // to silence gcc
+		POCO_UNUSED bool b; b = c[100];
 		fail ("must fail");
 	}
 	catch (RangeException&) { }
@@ -667,7 +684,7 @@ void DataTest::testColumnDeque()
 	pData->push_back(3);
 	pData->push_back(4);
 	pData->push_back(5);
-	
+
 	ColumnType c(mc, pData);
 
 	assertTrue (c.rowCount() == 5);
@@ -684,7 +701,7 @@ void DataTest::testColumnDeque()
 
 	try
 	{
-		int i; i = c[100]; // to silence gcc
+		POCO_UNUSED int i; i = c[100];
 		fail ("must fail");
 	}
 	catch (RangeException&) { }
@@ -735,7 +752,7 @@ void DataTest::testColumnDeque()
 	pV2->push_back(1);
 	Column<ContainerType> c3(mc, pV1);
 	Column<ContainerType> c4(mc, pV2);
-	
+
 	Poco::Data::swap(c3, c4);
 	assertTrue (c3[0] == 5);
 	assertTrue (c3[1] == 4);
@@ -784,7 +801,7 @@ void DataTest::testColumnList()
 	pData->push_back(3);
 	pData->push_back(4);
 	pData->push_back(5);
-	
+
 	ColumnType c(mc, pData);
 
 	assertTrue (c.rowCount() == 5);
@@ -801,7 +818,7 @@ void DataTest::testColumnList()
 
 	try
 	{
-		int i; i = c[100]; // to silence gcc
+		POCO_UNUSED int i; i = c[100];
 		fail ("must fail");
 	}
 	catch (RangeException&) { }
@@ -850,7 +867,7 @@ void DataTest::testColumnList()
 	pV2->push_back(1);
 	Column<ContainerType> c3(mc, pV1);
 	Column<ContainerType> c4(mc, pV2);
-	
+
 	Poco::Data::swap(c3, c4);
 	assertTrue (c3[0] == 5);
 	assertTrue (c3[1] == 4);
@@ -908,13 +925,13 @@ void DataTest::testRow()
 
 	try
 	{
-		int i; i = row[5].convert<int>(); // to silence gcc
+		POCO_UNUSED int i; i = row[5].convert<int>();
 		fail ("must fail");
 	}catch (RangeException&) {}
 
 	try
 	{
-		int i; i = row["a bad name"].convert<int>(); // to silence gcc
+		POCO_UNUSED int i; i = row["a bad name"].convert<int>();
 		fail ("must fail");
 	}catch (NotFoundException&) {}
 
@@ -1175,7 +1192,7 @@ void DataTest::testSimpleRowFormatter()
 	std::string line(std::string::size_type(sz * 5 + sp * 4), '-');
 	std::string spacer(sp, ' ');
 	std::ostringstream os;
-	os << std::left 
+	os << std::left
 		<< std::setw(sz) << "field0"
 		<< spacer
 		<< std::setw(sz) << "field1"
@@ -1184,12 +1201,12 @@ void DataTest::testSimpleRowFormatter()
 		<< spacer
 		<< std::setw(sz) << "field3"
 		<< spacer
-		<< std::setw(sz) << "field4" << std::endl 
+		<< std::setw(sz) << "field4" << std::endl
 		<< line << std::endl;
 	assertTrue (row1.namesToString() == os.str());
 
 	os.str("");
-	os << std::right 
+	os << std::right
 		<< std::setw(sz) << "0"
 		<< spacer
 		<< std::setw(sz) << "1"
@@ -1248,7 +1265,7 @@ void DataTest::testDateAndTime()
 	assertTrue (dt.hour() == t.hour());
 	assertTrue (dt.minute() == t.minute());
 	assertTrue (dt.second() == t.second());
-	
+
 	Date d1(2007, 6, 15);
 	d1.assign(d.year() - 1, d.month(), (d.month() == 2 && d.day() == 29) ? 28 : d.day());
 	assertTrue (d1 < d); assertTrue (d1 != d);
@@ -1264,7 +1281,7 @@ void DataTest::testDateAndTime()
 
 	d1.assign(d.year() + 1, d.month(), (d.month() == 2 && d.day() == 29) ? 28 : d.day());
 	assertTrue (d1 > d); assertTrue (d1 != d);
-	
+
 	d1.assign(d.year() + 1, 1, d.day());
 	assertTrue (d1 > d); assertTrue (d1 != d);
 
@@ -1273,7 +1290,7 @@ void DataTest::testDateAndTime()
 		d1.assign(d.year(), d.month(), d.day() + 1);
 		assertTrue (d1 > d); assertTrue (d1 != d);
 	}
-	
+
 	d1.assign(d.year(), d.month(), d.day());
 	assertTrue (d1 == d);
 
@@ -1285,7 +1302,7 @@ void DataTest::testDateAndTime()
 	catch (InvalidArgumentException&) { }
 
 	Time t1(12, 30, 15);
-	
+
 	if (t.hour() > 1)
 	{
 		t1.assign(t.hour() - 1, t.minute(), t.second());
@@ -1297,14 +1314,14 @@ void DataTest::testDateAndTime()
 		t1.assign(t.hour(), t.minute() - 1, t.second());
 		assertTrue (t1 < t); assertTrue (t1 != t);
 	}
-	
+
 	if (t.second() > 1)
 	{
 		t1.assign(t.hour(), t.minute(), t.second() - 1);
 		assertTrue (t1 < t); assertTrue (t1 != t);
 	}
 
-	if (t.hour() < 23) 
+	if (t.hour() < 23)
 	{
 		t1.assign(t.hour() + 1, t.minute(), t.second());
 		assertTrue (t1 > t); assertTrue (t1 != t);
diff --git a/Data/testsuite/src/DataTest.h b/Data/testsuite/src/DataTest.h
index ae3241166..55214dd39 100644
--- a/Data/testsuite/src/DataTest.h
+++ b/Data/testsuite/src/DataTest.h
@@ -52,13 +52,13 @@ public:
 	static CppUnit::Test* suite();
 
 private:
-	void testRowStrictWeak(const Poco::Data::Row& row1, 
-		const Poco::Data::Row& row2, 
+	void testRowStrictWeak(const Poco::Data::Row& row1,
+		const Poco::Data::Row& row2,
 		const Poco::Data::Row& row3);
 		/// Strict weak ordering requirement for sorted containers
 		/// as described in Josuttis "The Standard C++ Library"
 		/// chapter 6.5. pg. 176.
-		/// For this to pass, the following condition must be satisifed: 
+		/// For this to pass, the following condition must be satisifed:
 		/// row1 < row2 < row3
 
 	void writeToCLOB(Poco::BinaryWriter& writer);
diff --git a/Data/testsuite/src/SessionImpl.cpp b/Data/testsuite/src/SessionImpl.cpp
index e1c61f4ae..198f9960d 100644
--- a/Data/testsuite/src/SessionImpl.cpp
+++ b/Data/testsuite/src/SessionImpl.cpp
@@ -26,6 +26,7 @@ SessionImpl::SessionImpl(const std::string& init, std::size_t timeout):
 	addFeature("f1", &SessionImpl::setF, &SessionImpl::getF);
 	addFeature("f2", 0, &SessionImpl::getF);
 	addFeature("f3", &SessionImpl::setF, 0);
+	addFeature("throwOnHasNext", &SessionImpl::setThrowOnHasNext, &SessionImpl::getThrowOnHasNext);
 	addFeature("connected", &SessionImpl::setConnected, &SessionImpl::getConnected);
 	addProperty("p1", &SessionImpl::setP, &SessionImpl::getP);
 	addProperty("p2", 0, &SessionImpl::getP);
@@ -73,7 +74,7 @@ std::size_t SessionImpl::getConnectionTimeout() const
 
 StatementImpl::Ptr SessionImpl::createStatementImpl()
 {
-	return new TestStatementImpl(*this);
+	return new TestStatementImpl(*this, _throwOnHasNext);
 }
 
 
@@ -139,13 +140,13 @@ bool SessionImpl::getConnected(const std::string& name) const
 }
 
 
-void SessionImpl::setConnected(const std::string& name, bool value)
+void SessionImpl::setConnected(const std::string&, bool value)
 {
 	_connected = value;
 }
 
 
-void SessionImpl::setF(const std::string& name, bool value)
+void SessionImpl::setF(const std::string&, bool value)
 {
 	_f = value;
 }
@@ -157,6 +158,17 @@ bool SessionImpl::getF(const std::string& name) const
 }
 
 
+void SessionImpl::setThrowOnHasNext(const std::string&, bool value)
+{
+	_throwOnHasNext = value;
+}
+
+
+bool SessionImpl::getThrowOnHasNext(const std::string& name) const
+{
+	return _throwOnHasNext;
+}
+
 void SessionImpl::setP(const std::string& name, const Poco::Any& value)
 {
 	_p = value;
diff --git a/Data/testsuite/src/SessionImpl.h b/Data/testsuite/src/SessionImpl.h
index f418c0e07..a0d695533 100644
--- a/Data/testsuite/src/SessionImpl.h
+++ b/Data/testsuite/src/SessionImpl.h
@@ -49,7 +49,7 @@ public:
 		/// Reset connection with dababase and clears session state, but without disconnecting
 
 	bool isConnected() const;
-		/// Returns true if session is connected to the database, 
+		/// Returns true if session is connected to the database,
 		/// false otherwise.
 
 	void setConnectionTimeout(std::size_t timeout);
@@ -98,11 +98,14 @@ public:
 
 	void setF(const std::string& name, bool value);
 	bool getF(const std::string& name) const;
+	void setThrowOnHasNext(const std::string& name, bool value);
+	bool getThrowOnHasNext(const std::string& name) const;
 	void setP(const std::string& name, const Poco::Any& value);
 	Poco::Any getP(const std::string& name) const;
 
 private:
 	bool         _f;
+	bool         _throwOnHasNext = false;
 	Poco::Any    _p;
 	bool         _connected;
 	std::string  _connectionString;
diff --git a/Data/testsuite/src/SessionPoolTest.cpp b/Data/testsuite/src/SessionPoolTest.cpp
index e9ed87c04..a8e54598c 100644
--- a/Data/testsuite/src/SessionPoolTest.cpp
+++ b/Data/testsuite/src/SessionPoolTest.cpp
@@ -46,8 +46,8 @@ SessionPoolTest::~SessionPoolTest()
 
 void SessionPoolTest::testSessionPool()
 {
-	SessionPool pool("test", "cs", 1, 4, 2);
-	
+	SessionPool pool("test", "cs", 1, 4, 2, 10);
+
 	pool.setFeature("f1", true);
 	assertTrue (pool.getFeature("f1"));
 	try { pool.getFeature("g1"); fail ("must fail"); }
@@ -61,23 +61,25 @@ void SessionPoolTest::testSessionPool()
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 0);
 	assertTrue (pool.idle() == 0);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 4);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
 	Session s1(pool.get());
-	
+
 	assertTrue (s1.getFeature("f1"));
 	assertTrue (1 == Poco::AnyCast<int>(s1.getProperty("p1")));
 
 	try { pool.setFeature("f1", true); fail ("must fail"); }
 	catch ( Poco::InvalidAccessException& ) { }
-	
+
 	try { pool.setProperty("p1", 1); fail ("must fail"); }
 	catch ( Poco::InvalidAccessException& ) { }
 
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 1);
 	assertTrue (pool.idle() == 0);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 3);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
@@ -89,10 +91,11 @@ void SessionPoolTest::testSessionPool()
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 2);
 	assertTrue (pool.idle() == 0);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 2);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
-	
+
 	{
 		Session s3(pool.get("p1", 2));
 		assertTrue (s3.getFeature("f1"));
@@ -101,6 +104,7 @@ void SessionPoolTest::testSessionPool()
 		assertTrue (pool.capacity() == 4);
 		assertTrue (pool.allocated() == 3);
 		assertTrue (pool.idle() == 0);
+		assertTrue (pool.connTimeout() == 10);
 		assertTrue (pool.available() == 1);
 		assertTrue (pool.dead() == 0);
 		assertTrue (pool.allocated() == pool.used() + pool.idle());
@@ -109,6 +113,7 @@ void SessionPoolTest::testSessionPool()
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 3);
 	assertTrue (pool.idle() == 1);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 2);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
@@ -120,6 +125,7 @@ void SessionPoolTest::testSessionPool()
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 3);
 	assertTrue (pool.idle() == 0);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 1);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
@@ -129,21 +135,23 @@ void SessionPoolTest::testSessionPool()
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 4);
 	assertTrue (pool.idle() == 0);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 0);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
-	
+
 	try
 	{
 		Session s6(pool.get());
 		fail("pool exhausted - must throw");
 	}
 	catch (SessionPoolExhaustedException&) { }
-	
+
 	s5.close();
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 4);
 	assertTrue (pool.idle() == 1);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 1);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
@@ -159,35 +167,39 @@ void SessionPoolTest::testSessionPool()
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 4);
 	assertTrue (pool.idle() == 2);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 2);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
-	
+
 	Thread::sleep(5000); // time to clean up idle sessions
-	
+
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 2);
 	assertTrue (pool.idle() == 0);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 2);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
-	
+
 	Session s6(pool.get());
 
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 3);
 	assertTrue (pool.idle() == 0);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 1);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
 
 	s6.setFeature("connected", false);
 	assertTrue (pool.dead() == 1);
-	
+
 	s6.close();
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 2);
 	assertTrue (pool.idle() == 0);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 2);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
@@ -205,6 +217,7 @@ void SessionPoolTest::testSessionPool()
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.allocated() == 0);
 	assertTrue (pool.idle() == 0);
+	assertTrue (pool.connTimeout() == 10);
 	assertTrue (pool.available() == 0);
 	assertTrue (pool.dead() == 0);
 	assertTrue (pool.allocated() == pool.used() + pool.idle());
diff --git a/Data/testsuite/src/StatementImpl.cpp b/Data/testsuite/src/StatementImpl.cpp
index 9a962b11d..5c19c05a7 100644
--- a/Data/testsuite/src/StatementImpl.cpp
+++ b/Data/testsuite/src/StatementImpl.cpp
@@ -70,7 +70,7 @@ void StatementImpl::next()
 {
 	Poco::Data::AbstractExtractionVec::iterator it    = extractions().begin();
 	Poco::Data::AbstractExtractionVec::iterator itEnd = extractions().end();
-	std::size_t pos = 0; 
+	std::size_t pos = 0;
 	for (; it != itEnd; ++it)
 	{
 		(*it)->extract(pos);
diff --git a/Data/testsuite/src/TestStatementImpl.cpp b/Data/testsuite/src/TestStatementImpl.cpp
index 09cfca2a3..e681752ba 100644
--- a/Data/testsuite/src/TestStatementImpl.cpp
+++ b/Data/testsuite/src/TestStatementImpl.cpp
@@ -17,9 +17,10 @@ namespace Data {
 namespace Test {
 
 
-TestStatementImpl::TestStatementImpl(SessionImpl& rSession):
+TestStatementImpl::TestStatementImpl(SessionImpl& rSession, bool throwOnHasNext):
 	Poco::Data::StatementImpl(rSession),
-	_compiled(false)
+	_compiled(false),
+	_throwOnHasNext(throwOnHasNext)
 {
 }
 
@@ -79,6 +80,8 @@ const MetaColumn& TestStatementImpl::metaColumn(std::size_t pos) const
 
 bool TestStatementImpl::hasNext()
 {
+	if (_throwOnHasNext)
+		throw Poco::Data::UnknownDataBaseException();
 	return false;
 }
 
@@ -87,7 +90,7 @@ std::size_t TestStatementImpl::next()
 {
 	Poco::Data::AbstractExtractionVec::iterator it    = extractions().begin();
 	Poco::Data::AbstractExtractionVec::iterator itEnd = extractions().end();
-	std::size_t pos = 0; 
+	std::size_t pos = 0;
 	for (; it != itEnd; ++it)
 	{
 		(*it)->extract(pos);
diff --git a/Data/testsuite/src/TestStatementImpl.h b/Data/testsuite/src/TestStatementImpl.h
index c71ad63d9..c9a373f2d 100644
--- a/Data/testsuite/src/TestStatementImpl.h
+++ b/Data/testsuite/src/TestStatementImpl.h
@@ -34,7 +34,7 @@ class TestStatementImpl: public Poco::Data::StatementImpl
 	/// A no-op implementation of TestStatementImpl for testing.
 {
 public:
-	TestStatementImpl(SessionImpl& rSession);
+	TestStatementImpl(SessionImpl& rSession, bool throwOnHasNext = false);
 		/// Creates the TestStatementImpl.
 
 	~TestStatementImpl();
@@ -42,8 +42,8 @@ public:
 
 protected:
 	std::size_t columnsReturned() const;
-		/// Returns number of columns returned by query. 
-	
+		/// Returns number of columns returned by query.
+
 	int affectedRowCount() const;
 		/// Returns the number of affected rows.
 		/// Used to find out the number of rows affected by insert or update.
@@ -80,7 +80,8 @@ private:
 	Poco::SharedPtr<Binder>     _ptrBinder;
 	Poco::SharedPtr<Extractor>  _ptrExtractor;
 	Poco::SharedPtr<Preparator> _ptrPreparation;
-	bool                        _compiled; 
+	bool                        _compiled;
+	bool                        _throwOnHasNext = false;
 };
 
 
diff --git a/Data/testsuite/src/WinCEDriver.cpp b/Data/testsuite/src/WinCEDriver.cpp
index e03bc0e38..422f789ce 100644
--- a/Data/testsuite/src/WinCEDriver.cpp
+++ b/Data/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int wmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("DataTestSuite", DataTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/Encodings/Compiler/Compiler_vs170.sln b/Encodings/Compiler/Compiler_vs170.sln
index fbcd50087..ec86d9448 100644
--- a/Encodings/Compiler/Compiler_vs170.sln
+++ b/Encodings/Compiler/Compiler_vs170.sln
@@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Compiler", "Compiler_vs170.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -18,6 +24,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Encodings/Compiler/Compiler_vs170.vcxproj b/Encodings/Compiler/Compiler_vs170.vcxproj
index 6e1c44694..b5255def9 100644
--- a/Encodings/Compiler/Compiler_vs170.vcxproj
+++ b/Encodings/Compiler/Compiler_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>Compiler</ProjectName>
     <ProjectGuid>{0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}</ProjectGuid>
     <RootNamespace>Compiler</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">tecd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">tecd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">tecd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">tec</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">tec</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">tec</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">tecd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">tecd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">tecd</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">tec</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">tec</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\Compiler\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\Compiler\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\Compiler\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\tecd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\tecd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\tec.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\tecd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\tecd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\tec.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\tecd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\tecd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\tec.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Encodings/Encodings_vs170.sln b/Encodings/Encodings_vs170.sln
index 277c5443f..dbfc6efe8 100644
--- a/Encodings/Encodings_vs170.sln
+++ b/Encodings/Encodings_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_static_md|x64.Build.0 = release_static_md|x64
 		{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{7784E068-96B2-4DDC-BA8B-780206E06B30}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{7784E068-96B2-4DDC-BA8B-780206E06B30}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Encodings/Encodings_vs170.vcxproj b/Encodings/Encodings_vs170.vcxproj
index 6eb8a4f7d..4d9bd9cb9 100644
--- a/Encodings/Encodings_vs170.vcxproj
+++ b/Encodings/Encodings_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>Encodings</ProjectName>
     <ProjectGuid>{D7AAB91A-9AB8-457D-A329-02D1FA47CB7E}</ProjectGuid>
     <RootNamespace>Encodings</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoEncodingsA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoEncodingsmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoEncodingsmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoEncodingsA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoEncodingsmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoEncodingsmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoEncodingsd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoEncodingsmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoEncodingsmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoEncodingsmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoEncodingsmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Encodings\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Encodings\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Encodings\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Encodings\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Encodings\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Encodings\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\Encodings\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\Encodings\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Encodings_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoEncodingsA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoEncodingsA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoEncodingsd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Encodings_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoEncodingsA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoEncodings.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoEncodingsmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoEncodingsmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoEncodingsmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoEncodingsmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoEncodingsmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoEncodingsmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -674,12 +937,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Encodings/include/Poco/ISO8859_10Encoding.h b/Encodings/include/Poco/ISO8859_10Encoding.h
index 6c6687ba3..17c51e02a 100644
--- a/Encodings/include/Poco/ISO8859_10Encoding.h
+++ b/Encodings/include/Poco/ISO8859_10Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_10Encoding: public DoubleByteEncoding
 public:
 	ISO8859_10Encoding();
 	~ISO8859_10Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_11Encoding.h b/Encodings/include/Poco/ISO8859_11Encoding.h
index c5cd3230b..5a75a51fd 100644
--- a/Encodings/include/Poco/ISO8859_11Encoding.h
+++ b/Encodings/include/Poco/ISO8859_11Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_11Encoding: public DoubleByteEncoding
 public:
 	ISO8859_11Encoding();
 	~ISO8859_11Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_13Encoding.h b/Encodings/include/Poco/ISO8859_13Encoding.h
index aa395333f..52dda9507 100644
--- a/Encodings/include/Poco/ISO8859_13Encoding.h
+++ b/Encodings/include/Poco/ISO8859_13Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_13Encoding: public DoubleByteEncoding
 public:
 	ISO8859_13Encoding();
 	~ISO8859_13Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_14Encoding.h b/Encodings/include/Poco/ISO8859_14Encoding.h
index 4d0e00b80..d96e1514c 100644
--- a/Encodings/include/Poco/ISO8859_14Encoding.h
+++ b/Encodings/include/Poco/ISO8859_14Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_14Encoding: public DoubleByteEncoding
 public:
 	ISO8859_14Encoding();
 	~ISO8859_14Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_16Encoding.h b/Encodings/include/Poco/ISO8859_16Encoding.h
index d5e8b98d2..bd3016d7d 100644
--- a/Encodings/include/Poco/ISO8859_16Encoding.h
+++ b/Encodings/include/Poco/ISO8859_16Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_16Encoding: public DoubleByteEncoding
 public:
 	ISO8859_16Encoding();
 	~ISO8859_16Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_3Encoding.h b/Encodings/include/Poco/ISO8859_3Encoding.h
index 471fd1636..d32f71391 100644
--- a/Encodings/include/Poco/ISO8859_3Encoding.h
+++ b/Encodings/include/Poco/ISO8859_3Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_3Encoding: public DoubleByteEncoding
 public:
 	ISO8859_3Encoding();
 	~ISO8859_3Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_4Encoding.h b/Encodings/include/Poco/ISO8859_4Encoding.h
index 50af46045..f1e3580ef 100644
--- a/Encodings/include/Poco/ISO8859_4Encoding.h
+++ b/Encodings/include/Poco/ISO8859_4Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_4Encoding: public DoubleByteEncoding
 public:
 	ISO8859_4Encoding();
 	~ISO8859_4Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_5Encoding.h b/Encodings/include/Poco/ISO8859_5Encoding.h
index b8a81eeb7..10b0db8cb 100644
--- a/Encodings/include/Poco/ISO8859_5Encoding.h
+++ b/Encodings/include/Poco/ISO8859_5Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_5Encoding: public DoubleByteEncoding
 public:
 	ISO8859_5Encoding();
 	~ISO8859_5Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_6Encoding.h b/Encodings/include/Poco/ISO8859_6Encoding.h
index 4cac110d8..75a96e60c 100644
--- a/Encodings/include/Poco/ISO8859_6Encoding.h
+++ b/Encodings/include/Poco/ISO8859_6Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_6Encoding: public DoubleByteEncoding
 public:
 	ISO8859_6Encoding();
 	~ISO8859_6Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_7Encoding.h b/Encodings/include/Poco/ISO8859_7Encoding.h
index d67240581..c3788af64 100644
--- a/Encodings/include/Poco/ISO8859_7Encoding.h
+++ b/Encodings/include/Poco/ISO8859_7Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_7Encoding: public DoubleByteEncoding
 public:
 	ISO8859_7Encoding();
 	~ISO8859_7Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_8Encoding.h b/Encodings/include/Poco/ISO8859_8Encoding.h
index 0ccc6e4b0..84408a0cd 100644
--- a/Encodings/include/Poco/ISO8859_8Encoding.h
+++ b/Encodings/include/Poco/ISO8859_8Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_8Encoding: public DoubleByteEncoding
 public:
 	ISO8859_8Encoding();
 	~ISO8859_8Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/ISO8859_9Encoding.h b/Encodings/include/Poco/ISO8859_9Encoding.h
index 3be8acfc7..e69275d72 100644
--- a/Encodings/include/Poco/ISO8859_9Encoding.h
+++ b/Encodings/include/Poco/ISO8859_9Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API ISO8859_9Encoding: public DoubleByteEncoding
 public:
 	ISO8859_9Encoding();
 	~ISO8859_9Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/MacCentralEurRomanEncoding.h b/Encodings/include/Poco/MacCentralEurRomanEncoding.h
index 340011bed..48150dfee 100644
--- a/Encodings/include/Poco/MacCentralEurRomanEncoding.h
+++ b/Encodings/include/Poco/MacCentralEurRomanEncoding.h
@@ -33,7 +33,7 @@ class Encodings_API MacCentralEurRomanEncoding: public DoubleByteEncoding
 public:
 	MacCentralEurRomanEncoding();
 	~MacCentralEurRomanEncoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/MacChineseSimpEncoding.h b/Encodings/include/Poco/MacChineseSimpEncoding.h
index de551f75c..2c1683223 100644
--- a/Encodings/include/Poco/MacChineseSimpEncoding.h
+++ b/Encodings/include/Poco/MacChineseSimpEncoding.h
@@ -33,7 +33,7 @@ class Encodings_API MacChineseSimpEncoding: public DoubleByteEncoding
 public:
 	MacChineseSimpEncoding();
 	~MacChineseSimpEncoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/MacChineseTradEncoding.h b/Encodings/include/Poco/MacChineseTradEncoding.h
index 06c99c318..a67f066dc 100644
--- a/Encodings/include/Poco/MacChineseTradEncoding.h
+++ b/Encodings/include/Poco/MacChineseTradEncoding.h
@@ -33,7 +33,7 @@ class Encodings_API MacChineseTradEncoding: public DoubleByteEncoding
 public:
 	MacChineseTradEncoding();
 	~MacChineseTradEncoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/MacCyrillicEncoding.h b/Encodings/include/Poco/MacCyrillicEncoding.h
index 4cb40e368..7e6495424 100644
--- a/Encodings/include/Poco/MacCyrillicEncoding.h
+++ b/Encodings/include/Poco/MacCyrillicEncoding.h
@@ -33,7 +33,7 @@ class Encodings_API MacCyrillicEncoding: public DoubleByteEncoding
 public:
 	MacCyrillicEncoding();
 	~MacCyrillicEncoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/MacJapaneseEncoding.h b/Encodings/include/Poco/MacJapaneseEncoding.h
index 903c39780..b235a8430 100644
--- a/Encodings/include/Poco/MacJapaneseEncoding.h
+++ b/Encodings/include/Poco/MacJapaneseEncoding.h
@@ -33,7 +33,7 @@ class Encodings_API MacJapaneseEncoding: public DoubleByteEncoding
 public:
 	MacJapaneseEncoding();
 	~MacJapaneseEncoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/MacKoreanEncoding.h b/Encodings/include/Poco/MacKoreanEncoding.h
index 5e5c5cd94..636af82a1 100644
--- a/Encodings/include/Poco/MacKoreanEncoding.h
+++ b/Encodings/include/Poco/MacKoreanEncoding.h
@@ -33,7 +33,7 @@ class Encodings_API MacKoreanEncoding: public DoubleByteEncoding
 public:
 	MacKoreanEncoding();
 	~MacKoreanEncoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/MacRomanEncoding.h b/Encodings/include/Poco/MacRomanEncoding.h
index bad288eda..99c91aaa6 100644
--- a/Encodings/include/Poco/MacRomanEncoding.h
+++ b/Encodings/include/Poco/MacRomanEncoding.h
@@ -33,7 +33,7 @@ class Encodings_API MacRomanEncoding: public DoubleByteEncoding
 public:
 	MacRomanEncoding();
 	~MacRomanEncoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows1253Encoding.h b/Encodings/include/Poco/Windows1253Encoding.h
index ef5af622a..61ba42fb3 100644
--- a/Encodings/include/Poco/Windows1253Encoding.h
+++ b/Encodings/include/Poco/Windows1253Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows1253Encoding: public DoubleByteEncoding
 public:
 	Windows1253Encoding();
 	~Windows1253Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows1254Encoding.h b/Encodings/include/Poco/Windows1254Encoding.h
index 558da862d..b140f1da5 100644
--- a/Encodings/include/Poco/Windows1254Encoding.h
+++ b/Encodings/include/Poco/Windows1254Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows1254Encoding: public DoubleByteEncoding
 public:
 	Windows1254Encoding();
 	~Windows1254Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows1255Encoding.h b/Encodings/include/Poco/Windows1255Encoding.h
index e2b88fd5d..1195262b5 100644
--- a/Encodings/include/Poco/Windows1255Encoding.h
+++ b/Encodings/include/Poco/Windows1255Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows1255Encoding: public DoubleByteEncoding
 public:
 	Windows1255Encoding();
 	~Windows1255Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows1256Encoding.h b/Encodings/include/Poco/Windows1256Encoding.h
index 1629cc8e7..9618e67f9 100644
--- a/Encodings/include/Poco/Windows1256Encoding.h
+++ b/Encodings/include/Poco/Windows1256Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows1256Encoding: public DoubleByteEncoding
 public:
 	Windows1256Encoding();
 	~Windows1256Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows1257Encoding.h b/Encodings/include/Poco/Windows1257Encoding.h
index 5fd71279c..6f2a5f26e 100644
--- a/Encodings/include/Poco/Windows1257Encoding.h
+++ b/Encodings/include/Poco/Windows1257Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows1257Encoding: public DoubleByteEncoding
 public:
 	Windows1257Encoding();
 	~Windows1257Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows1258Encoding.h b/Encodings/include/Poco/Windows1258Encoding.h
index b73521735..8e3f5a053 100644
--- a/Encodings/include/Poco/Windows1258Encoding.h
+++ b/Encodings/include/Poco/Windows1258Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows1258Encoding: public DoubleByteEncoding
 public:
 	Windows1258Encoding();
 	~Windows1258Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows874Encoding.h b/Encodings/include/Poco/Windows874Encoding.h
index 2434adf16..9c01dac4b 100644
--- a/Encodings/include/Poco/Windows874Encoding.h
+++ b/Encodings/include/Poco/Windows874Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows874Encoding: public DoubleByteEncoding
 public:
 	Windows874Encoding();
 	~Windows874Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows932Encoding.h b/Encodings/include/Poco/Windows932Encoding.h
index e2c9e9e40..2be9cbe24 100644
--- a/Encodings/include/Poco/Windows932Encoding.h
+++ b/Encodings/include/Poco/Windows932Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows932Encoding: public DoubleByteEncoding
 public:
 	Windows932Encoding();
 	~Windows932Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows936Encoding.h b/Encodings/include/Poco/Windows936Encoding.h
index 25910f2c3..478767119 100644
--- a/Encodings/include/Poco/Windows936Encoding.h
+++ b/Encodings/include/Poco/Windows936Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows936Encoding: public DoubleByteEncoding
 public:
 	Windows936Encoding();
 	~Windows936Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows949Encoding.h b/Encodings/include/Poco/Windows949Encoding.h
index 974959a83..f23d95a06 100644
--- a/Encodings/include/Poco/Windows949Encoding.h
+++ b/Encodings/include/Poco/Windows949Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows949Encoding: public DoubleByteEncoding
 public:
 	Windows949Encoding();
 	~Windows949Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/include/Poco/Windows950Encoding.h b/Encodings/include/Poco/Windows950Encoding.h
index 21dc03cf0..4a67d1f90 100644
--- a/Encodings/include/Poco/Windows950Encoding.h
+++ b/Encodings/include/Poco/Windows950Encoding.h
@@ -33,7 +33,7 @@ class Encodings_API Windows950Encoding: public DoubleByteEncoding
 public:
 	Windows950Encoding();
 	~Windows950Encoding();
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Encodings/src/ISO8859_10Encoding.cpp b/Encodings/src/ISO8859_10Encoding.cpp
index e2c31eaf8..4312268c5 100644
--- a/Encodings/src/ISO8859_10Encoding.cpp
+++ b/Encodings/src/ISO8859_10Encoding.cpp
@@ -27,24 +27,24 @@ const char* ISO8859_10Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_10Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_10Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7, 0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A, 
-	0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7, 0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B, 
-	0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF, 
-	0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, 
-	0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x00EF, 
-	0x00F0, 0x0146, 0x014D, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0169, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7, 0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A,
+	0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7, 0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B,
+	0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF,
+	0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+	0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x00EF,
+	0x00F0, 0x0146, 0x014D, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0169, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138,
 };
 
 
@@ -54,38 +54,38 @@ const DoubleByteEncoding::Mapping ISO8859_10Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_10Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A7, 0x00A7 }, { 0x00AD, 0x00AD }, { 0x00B0, 0x00B0 }, { 0x00B7, 0x00B7 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 }, 
-	{ 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C9, 0x00C9 }, { 0x00CB, 0x00CB }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, 
-	{ 0x00D0, 0x00D0 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D8, 0x00D8 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, 
-	{ 0x00DC, 0x00DC }, { 0x00DD, 0x00DD }, { 0x00DE, 0x00DE }, { 0x00DF, 0x00DF }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E3, 0x00E3 }, { 0x00E4, 0x00E4 }, 
-	{ 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E9, 0x00E9 }, { 0x00EB, 0x00EB }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F0, 0x00F0 }, 
-	{ 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 }, { 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F8, 0x00F8 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, 
-	{ 0x00FD, 0x00FD }, { 0x00FE, 0x00FE }, { 0x0100, 0x00C0 }, { 0x0101, 0x00E0 }, { 0x0104, 0x00A1 }, { 0x0105, 0x00B1 }, { 0x010C, 0x00C8 }, { 0x010D, 0x00E8 }, 
-	{ 0x0110, 0x00A9 }, { 0x0111, 0x00B9 }, { 0x0112, 0x00A2 }, { 0x0113, 0x00B2 }, { 0x0116, 0x00CC }, { 0x0117, 0x00EC }, { 0x0118, 0x00CA }, { 0x0119, 0x00EA }, 
-	{ 0x0122, 0x00A3 }, { 0x0123, 0x00B3 }, { 0x0128, 0x00A5 }, { 0x0129, 0x00B5 }, { 0x012A, 0x00A4 }, { 0x012B, 0x00B4 }, { 0x012E, 0x00C7 }, { 0x012F, 0x00E7 }, 
-	{ 0x0136, 0x00A6 }, { 0x0137, 0x00B6 }, { 0x0138, 0x00FF }, { 0x013B, 0x00A8 }, { 0x013C, 0x00B8 }, { 0x0145, 0x00D1 }, { 0x0146, 0x00F1 }, { 0x014A, 0x00AF }, 
-	{ 0x014B, 0x00BF }, { 0x014C, 0x00D2 }, { 0x014D, 0x00F2 }, { 0x0160, 0x00AA }, { 0x0161, 0x00BA }, { 0x0166, 0x00AB }, { 0x0167, 0x00BB }, { 0x0168, 0x00D7 }, 
-	{ 0x0169, 0x00F7 }, { 0x016A, 0x00AE }, { 0x016B, 0x00BE }, { 0x0172, 0x00D9 }, { 0x0173, 0x00F9 }, { 0x017D, 0x00AC }, { 0x017E, 0x00BC }, { 0x2015, 0x00BD }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A7, 0x00A7 }, { 0x00AD, 0x00AD }, { 0x00B0, 0x00B0 }, { 0x00B7, 0x00B7 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 },
+	{ 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C9, 0x00C9 }, { 0x00CB, 0x00CB }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF },
+	{ 0x00D0, 0x00D0 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D8, 0x00D8 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB },
+	{ 0x00DC, 0x00DC }, { 0x00DD, 0x00DD }, { 0x00DE, 0x00DE }, { 0x00DF, 0x00DF }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E3, 0x00E3 }, { 0x00E4, 0x00E4 },
+	{ 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E9, 0x00E9 }, { 0x00EB, 0x00EB }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F0, 0x00F0 },
+	{ 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 }, { 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F8, 0x00F8 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC },
+	{ 0x00FD, 0x00FD }, { 0x00FE, 0x00FE }, { 0x0100, 0x00C0 }, { 0x0101, 0x00E0 }, { 0x0104, 0x00A1 }, { 0x0105, 0x00B1 }, { 0x010C, 0x00C8 }, { 0x010D, 0x00E8 },
+	{ 0x0110, 0x00A9 }, { 0x0111, 0x00B9 }, { 0x0112, 0x00A2 }, { 0x0113, 0x00B2 }, { 0x0116, 0x00CC }, { 0x0117, 0x00EC }, { 0x0118, 0x00CA }, { 0x0119, 0x00EA },
+	{ 0x0122, 0x00A3 }, { 0x0123, 0x00B3 }, { 0x0128, 0x00A5 }, { 0x0129, 0x00B5 }, { 0x012A, 0x00A4 }, { 0x012B, 0x00B4 }, { 0x012E, 0x00C7 }, { 0x012F, 0x00E7 },
+	{ 0x0136, 0x00A6 }, { 0x0137, 0x00B6 }, { 0x0138, 0x00FF }, { 0x013B, 0x00A8 }, { 0x013C, 0x00B8 }, { 0x0145, 0x00D1 }, { 0x0146, 0x00F1 }, { 0x014A, 0x00AF },
+	{ 0x014B, 0x00BF }, { 0x014C, 0x00D2 }, { 0x014D, 0x00F2 }, { 0x0160, 0x00AA }, { 0x0161, 0x00BA }, { 0x0166, 0x00AB }, { 0x0167, 0x00BB }, { 0x0168, 0x00D7 },
+	{ 0x0169, 0x00F7 }, { 0x016A, 0x00AE }, { 0x016B, 0x00BE }, { 0x0172, 0x00D9 }, { 0x0173, 0x00F9 }, { 0x017D, 0x00AC }, { 0x017E, 0x00BC }, { 0x2015, 0x00BD },
 };
 
 
diff --git a/Encodings/src/ISO8859_11Encoding.cpp b/Encodings/src/ISO8859_11Encoding.cpp
index 7f969bcd7..c3fe7bfb2 100644
--- a/Encodings/src/ISO8859_11Encoding.cpp
+++ b/Encodings/src/ISO8859_11Encoding.cpp
@@ -25,24 +25,24 @@ const char* ISO8859_11Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_11Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_11Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, 
-	0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, 
-	0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, 
-	0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, 0x0E38, 0x0E39, 0x0E3A,     -1,     -1,     -1,     -1, 0x0E3F, 
-	0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, 
-	0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59, 0x0E5A, 0x0E5B,     -1,     -1,     -1,     -1, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
+	0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
+	0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
+	0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, 0x0E38, 0x0E39, 0x0E3A,     -1,     -1,     -1,     -1, 0x0E3F,
+	0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
+	0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59, 0x0E5A, 0x0E5B,     -1,     -1,     -1,     -1,
 };
 
 
@@ -52,37 +52,37 @@ const DoubleByteEncoding::Mapping ISO8859_11Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_11Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x0E01, 0x00A1 }, { 0x0E02, 0x00A2 }, { 0x0E03, 0x00A3 }, { 0x0E04, 0x00A4 }, { 0x0E05, 0x00A5 }, { 0x0E06, 0x00A6 }, { 0x0E07, 0x00A7 }, 
-	{ 0x0E08, 0x00A8 }, { 0x0E09, 0x00A9 }, { 0x0E0A, 0x00AA }, { 0x0E0B, 0x00AB }, { 0x0E0C, 0x00AC }, { 0x0E0D, 0x00AD }, { 0x0E0E, 0x00AE }, { 0x0E0F, 0x00AF }, 
-	{ 0x0E10, 0x00B0 }, { 0x0E11, 0x00B1 }, { 0x0E12, 0x00B2 }, { 0x0E13, 0x00B3 }, { 0x0E14, 0x00B4 }, { 0x0E15, 0x00B5 }, { 0x0E16, 0x00B6 }, { 0x0E17, 0x00B7 }, 
-	{ 0x0E18, 0x00B8 }, { 0x0E19, 0x00B9 }, { 0x0E1A, 0x00BA }, { 0x0E1B, 0x00BB }, { 0x0E1C, 0x00BC }, { 0x0E1D, 0x00BD }, { 0x0E1E, 0x00BE }, { 0x0E1F, 0x00BF }, 
-	{ 0x0E20, 0x00C0 }, { 0x0E21, 0x00C1 }, { 0x0E22, 0x00C2 }, { 0x0E23, 0x00C3 }, { 0x0E24, 0x00C4 }, { 0x0E25, 0x00C5 }, { 0x0E26, 0x00C6 }, { 0x0E27, 0x00C7 }, 
-	{ 0x0E28, 0x00C8 }, { 0x0E29, 0x00C9 }, { 0x0E2A, 0x00CA }, { 0x0E2B, 0x00CB }, { 0x0E2C, 0x00CC }, { 0x0E2D, 0x00CD }, { 0x0E2E, 0x00CE }, { 0x0E2F, 0x00CF }, 
-	{ 0x0E30, 0x00D0 }, { 0x0E31, 0x00D1 }, { 0x0E32, 0x00D2 }, { 0x0E33, 0x00D3 }, { 0x0E34, 0x00D4 }, { 0x0E35, 0x00D5 }, { 0x0E36, 0x00D6 }, { 0x0E37, 0x00D7 }, 
-	{ 0x0E38, 0x00D8 }, { 0x0E39, 0x00D9 }, { 0x0E3A, 0x00DA }, { 0x0E3F, 0x00DF }, { 0x0E40, 0x00E0 }, { 0x0E41, 0x00E1 }, { 0x0E42, 0x00E2 }, { 0x0E43, 0x00E3 }, 
-	{ 0x0E44, 0x00E4 }, { 0x0E45, 0x00E5 }, { 0x0E46, 0x00E6 }, { 0x0E47, 0x00E7 }, { 0x0E48, 0x00E8 }, { 0x0E49, 0x00E9 }, { 0x0E4A, 0x00EA }, { 0x0E4B, 0x00EB }, 
-	{ 0x0E4C, 0x00EC }, { 0x0E4D, 0x00ED }, { 0x0E4E, 0x00EE }, { 0x0E4F, 0x00EF }, { 0x0E50, 0x00F0 }, { 0x0E51, 0x00F1 }, { 0x0E52, 0x00F2 }, { 0x0E53, 0x00F3 }, 
-	{ 0x0E54, 0x00F4 }, { 0x0E55, 0x00F5 }, { 0x0E56, 0x00F6 }, { 0x0E57, 0x00F7 }, { 0x0E58, 0x00F8 }, { 0x0E59, 0x00F9 }, { 0x0E5A, 0x00FA }, { 0x0E5B, 0x00FB }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x0E01, 0x00A1 }, { 0x0E02, 0x00A2 }, { 0x0E03, 0x00A3 }, { 0x0E04, 0x00A4 }, { 0x0E05, 0x00A5 }, { 0x0E06, 0x00A6 }, { 0x0E07, 0x00A7 },
+	{ 0x0E08, 0x00A8 }, { 0x0E09, 0x00A9 }, { 0x0E0A, 0x00AA }, { 0x0E0B, 0x00AB }, { 0x0E0C, 0x00AC }, { 0x0E0D, 0x00AD }, { 0x0E0E, 0x00AE }, { 0x0E0F, 0x00AF },
+	{ 0x0E10, 0x00B0 }, { 0x0E11, 0x00B1 }, { 0x0E12, 0x00B2 }, { 0x0E13, 0x00B3 }, { 0x0E14, 0x00B4 }, { 0x0E15, 0x00B5 }, { 0x0E16, 0x00B6 }, { 0x0E17, 0x00B7 },
+	{ 0x0E18, 0x00B8 }, { 0x0E19, 0x00B9 }, { 0x0E1A, 0x00BA }, { 0x0E1B, 0x00BB }, { 0x0E1C, 0x00BC }, { 0x0E1D, 0x00BD }, { 0x0E1E, 0x00BE }, { 0x0E1F, 0x00BF },
+	{ 0x0E20, 0x00C0 }, { 0x0E21, 0x00C1 }, { 0x0E22, 0x00C2 }, { 0x0E23, 0x00C3 }, { 0x0E24, 0x00C4 }, { 0x0E25, 0x00C5 }, { 0x0E26, 0x00C6 }, { 0x0E27, 0x00C7 },
+	{ 0x0E28, 0x00C8 }, { 0x0E29, 0x00C9 }, { 0x0E2A, 0x00CA }, { 0x0E2B, 0x00CB }, { 0x0E2C, 0x00CC }, { 0x0E2D, 0x00CD }, { 0x0E2E, 0x00CE }, { 0x0E2F, 0x00CF },
+	{ 0x0E30, 0x00D0 }, { 0x0E31, 0x00D1 }, { 0x0E32, 0x00D2 }, { 0x0E33, 0x00D3 }, { 0x0E34, 0x00D4 }, { 0x0E35, 0x00D5 }, { 0x0E36, 0x00D6 }, { 0x0E37, 0x00D7 },
+	{ 0x0E38, 0x00D8 }, { 0x0E39, 0x00D9 }, { 0x0E3A, 0x00DA }, { 0x0E3F, 0x00DF }, { 0x0E40, 0x00E0 }, { 0x0E41, 0x00E1 }, { 0x0E42, 0x00E2 }, { 0x0E43, 0x00E3 },
+	{ 0x0E44, 0x00E4 }, { 0x0E45, 0x00E5 }, { 0x0E46, 0x00E6 }, { 0x0E47, 0x00E7 }, { 0x0E48, 0x00E8 }, { 0x0E49, 0x00E9 }, { 0x0E4A, 0x00EA }, { 0x0E4B, 0x00EB },
+	{ 0x0E4C, 0x00EC }, { 0x0E4D, 0x00ED }, { 0x0E4E, 0x00EE }, { 0x0E4F, 0x00EF }, { 0x0E50, 0x00F0 }, { 0x0E51, 0x00F1 }, { 0x0E52, 0x00F2 }, { 0x0E53, 0x00F3 },
+	{ 0x0E54, 0x00F4 }, { 0x0E55, 0x00F5 }, { 0x0E56, 0x00F6 }, { 0x0E57, 0x00F7 }, { 0x0E58, 0x00F8 }, { 0x0E59, 0x00F9 }, { 0x0E5A, 0x00FA }, { 0x0E5B, 0x00FB },
 };
 
 
diff --git a/Encodings/src/ISO8859_13Encoding.cpp b/Encodings/src/ISO8859_13Encoding.cpp
index bdb4c5bfa..29be260c8 100644
--- a/Encodings/src/ISO8859_13Encoding.cpp
+++ b/Encodings/src/ISO8859_13Encoding.cpp
@@ -27,24 +27,24 @@ const char* ISO8859_13Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_13Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_13Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7, 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7, 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6, 
-	0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, 
-	0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, 
-	0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, 
-	0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7, 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7, 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+	0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+	0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+	0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+	0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019,
 };
 
 
@@ -54,38 +54,38 @@ const DoubleByteEncoding::Mapping ISO8859_13Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_13Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, 
-	{ 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B5, 0x00B5 }, 
-	{ 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B9, 0x00B9 }, { 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00C4, 0x00C4 }, 
-	{ 0x00C5, 0x00C5 }, { 0x00C6, 0x00AF }, { 0x00C9, 0x00C9 }, { 0x00D3, 0x00D3 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00A8 }, 
-	{ 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00BF }, { 0x00E9, 0x00E9 }, { 0x00F3, 0x00F3 }, { 0x00F5, 0x00F5 }, 
-	{ 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00B8 }, { 0x00FC, 0x00FC }, { 0x0100, 0x00C2 }, { 0x0101, 0x00E2 }, { 0x0104, 0x00C0 }, { 0x0105, 0x00E0 }, 
-	{ 0x0106, 0x00C3 }, { 0x0107, 0x00E3 }, { 0x010C, 0x00C8 }, { 0x010D, 0x00E8 }, { 0x0112, 0x00C7 }, { 0x0113, 0x00E7 }, { 0x0116, 0x00CB }, { 0x0117, 0x00EB }, 
-	{ 0x0118, 0x00C6 }, { 0x0119, 0x00E6 }, { 0x0122, 0x00CC }, { 0x0123, 0x00EC }, { 0x012A, 0x00CE }, { 0x012B, 0x00EE }, { 0x012E, 0x00C1 }, { 0x012F, 0x00E1 }, 
-	{ 0x0136, 0x00CD }, { 0x0137, 0x00ED }, { 0x013B, 0x00CF }, { 0x013C, 0x00EF }, { 0x0141, 0x00D9 }, { 0x0142, 0x00F9 }, { 0x0143, 0x00D1 }, { 0x0144, 0x00F1 }, 
-	{ 0x0145, 0x00D2 }, { 0x0146, 0x00F2 }, { 0x014C, 0x00D4 }, { 0x014D, 0x00F4 }, { 0x0156, 0x00AA }, { 0x0157, 0x00BA }, { 0x015A, 0x00DA }, { 0x015B, 0x00FA }, 
-	{ 0x0160, 0x00D0 }, { 0x0161, 0x00F0 }, { 0x016A, 0x00DB }, { 0x016B, 0x00FB }, { 0x0172, 0x00D8 }, { 0x0173, 0x00F8 }, { 0x0179, 0x00CA }, { 0x017A, 0x00EA }, 
-	{ 0x017B, 0x00DD }, { 0x017C, 0x00FD }, { 0x017D, 0x00DE }, { 0x017E, 0x00FE }, { 0x2019, 0x00FF }, { 0x201C, 0x00B4 }, { 0x201D, 0x00A1 }, { 0x201E, 0x00A5 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB },
+	{ 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B5, 0x00B5 },
+	{ 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B9, 0x00B9 }, { 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00C4, 0x00C4 },
+	{ 0x00C5, 0x00C5 }, { 0x00C6, 0x00AF }, { 0x00C9, 0x00C9 }, { 0x00D3, 0x00D3 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00A8 },
+	{ 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00BF }, { 0x00E9, 0x00E9 }, { 0x00F3, 0x00F3 }, { 0x00F5, 0x00F5 },
+	{ 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00B8 }, { 0x00FC, 0x00FC }, { 0x0100, 0x00C2 }, { 0x0101, 0x00E2 }, { 0x0104, 0x00C0 }, { 0x0105, 0x00E0 },
+	{ 0x0106, 0x00C3 }, { 0x0107, 0x00E3 }, { 0x010C, 0x00C8 }, { 0x010D, 0x00E8 }, { 0x0112, 0x00C7 }, { 0x0113, 0x00E7 }, { 0x0116, 0x00CB }, { 0x0117, 0x00EB },
+	{ 0x0118, 0x00C6 }, { 0x0119, 0x00E6 }, { 0x0122, 0x00CC }, { 0x0123, 0x00EC }, { 0x012A, 0x00CE }, { 0x012B, 0x00EE }, { 0x012E, 0x00C1 }, { 0x012F, 0x00E1 },
+	{ 0x0136, 0x00CD }, { 0x0137, 0x00ED }, { 0x013B, 0x00CF }, { 0x013C, 0x00EF }, { 0x0141, 0x00D9 }, { 0x0142, 0x00F9 }, { 0x0143, 0x00D1 }, { 0x0144, 0x00F1 },
+	{ 0x0145, 0x00D2 }, { 0x0146, 0x00F2 }, { 0x014C, 0x00D4 }, { 0x014D, 0x00F4 }, { 0x0156, 0x00AA }, { 0x0157, 0x00BA }, { 0x015A, 0x00DA }, { 0x015B, 0x00FA },
+	{ 0x0160, 0x00D0 }, { 0x0161, 0x00F0 }, { 0x016A, 0x00DB }, { 0x016B, 0x00FB }, { 0x0172, 0x00D8 }, { 0x0173, 0x00F8 }, { 0x0179, 0x00CA }, { 0x017A, 0x00EA },
+	{ 0x017B, 0x00DD }, { 0x017C, 0x00FD }, { 0x017D, 0x00DE }, { 0x017E, 0x00FE }, { 0x2019, 0x00FF }, { 0x201C, 0x00B4 }, { 0x201D, 0x00A1 }, { 0x201E, 0x00A5 },
 };
 
 
diff --git a/Encodings/src/ISO8859_14Encoding.cpp b/Encodings/src/ISO8859_14Encoding.cpp
index 26a7e6f3f..891ad9051 100644
--- a/Encodings/src/ISO8859_14Encoding.cpp
+++ b/Encodings/src/ISO8859_14Encoding.cpp
@@ -27,24 +27,24 @@ const char* ISO8859_14Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_14Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_14Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x1E02, 0x1E03, 0x00A3, 0x010A, 0x010B, 0x1E0A, 0x00A7, 0x1E80, 0x00A9, 0x1E82, 0x1E0B, 0x1EF2, 0x00AD, 0x00AE, 0x0178, 
-	0x1E1E, 0x1E1F, 0x0120, 0x0121, 0x1E40, 0x1E41, 0x00B6, 0x1E56, 0x1E81, 0x1E57, 0x1E83, 0x1E60, 0x1EF3, 0x1E84, 0x1E85, 0x1E61, 
-	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 
-	0x0174, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x1E6A, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x0176, 0x00DF, 
-	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 
-	0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x1E02, 0x1E03, 0x00A3, 0x010A, 0x010B, 0x1E0A, 0x00A7, 0x1E80, 0x00A9, 0x1E82, 0x1E0B, 0x1EF2, 0x00AD, 0x00AE, 0x0178,
+	0x1E1E, 0x1E1F, 0x0120, 0x0121, 0x1E40, 0x1E41, 0x00B6, 0x1E56, 0x1E81, 0x1E57, 0x1E83, 0x1E60, 0x1EF3, 0x1E84, 0x1E85, 0x1E61,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x0174, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x1E6A, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x0176, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF,
 };
 
 
@@ -54,38 +54,38 @@ const DoubleByteEncoding::Mapping ISO8859_14Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_14Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A3, 0x00A3 }, { 0x00A7, 0x00A7 }, { 0x00A9, 0x00A9 }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00B6, 0x00B6 }, { 0x00C0, 0x00C0 }, 
-	{ 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 }, { 0x00C8, 0x00C8 }, 
-	{ 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, { 0x00D1, 0x00D1 }, 
-	{ 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D8, 0x00D8 }, { 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, 
-	{ 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DD, 0x00DD }, { 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E3, 0x00E3 }, 
-	{ 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB }, 
-	{ 0x00EC, 0x00EC }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 }, { 0x00F2, 0x00F2 }, { 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 }, 
-	{ 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F8, 0x00F8 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x00FD, 0x00FD }, 
-	{ 0x00FF, 0x00FF }, { 0x010A, 0x00A4 }, { 0x010B, 0x00A5 }, { 0x0120, 0x00B2 }, { 0x0121, 0x00B3 }, { 0x0174, 0x00D0 }, { 0x0175, 0x00F0 }, { 0x0176, 0x00DE }, 
-	{ 0x0177, 0x00FE }, { 0x0178, 0x00AF }, { 0x1E02, 0x00A1 }, { 0x1E03, 0x00A2 }, { 0x1E0A, 0x00A6 }, { 0x1E0B, 0x00AB }, { 0x1E1E, 0x00B0 }, { 0x1E1F, 0x00B1 }, 
-	{ 0x1E40, 0x00B4 }, { 0x1E41, 0x00B5 }, { 0x1E56, 0x00B7 }, { 0x1E57, 0x00B9 }, { 0x1E60, 0x00BB }, { 0x1E61, 0x00BF }, { 0x1E6A, 0x00D7 }, { 0x1E6B, 0x00F7 }, 
-	{ 0x1E80, 0x00A8 }, { 0x1E81, 0x00B8 }, { 0x1E82, 0x00AA }, { 0x1E83, 0x00BA }, { 0x1E84, 0x00BD }, { 0x1E85, 0x00BE }, { 0x1EF2, 0x00AC }, { 0x1EF3, 0x00BC }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A3, 0x00A3 }, { 0x00A7, 0x00A7 }, { 0x00A9, 0x00A9 }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00B6, 0x00B6 }, { 0x00C0, 0x00C0 },
+	{ 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 }, { 0x00C8, 0x00C8 },
+	{ 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, { 0x00D1, 0x00D1 },
+	{ 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D8, 0x00D8 }, { 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA },
+	{ 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DD, 0x00DD }, { 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E3, 0x00E3 },
+	{ 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB },
+	{ 0x00EC, 0x00EC }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 }, { 0x00F2, 0x00F2 }, { 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 },
+	{ 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F8, 0x00F8 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x00FD, 0x00FD },
+	{ 0x00FF, 0x00FF }, { 0x010A, 0x00A4 }, { 0x010B, 0x00A5 }, { 0x0120, 0x00B2 }, { 0x0121, 0x00B3 }, { 0x0174, 0x00D0 }, { 0x0175, 0x00F0 }, { 0x0176, 0x00DE },
+	{ 0x0177, 0x00FE }, { 0x0178, 0x00AF }, { 0x1E02, 0x00A1 }, { 0x1E03, 0x00A2 }, { 0x1E0A, 0x00A6 }, { 0x1E0B, 0x00AB }, { 0x1E1E, 0x00B0 }, { 0x1E1F, 0x00B1 },
+	{ 0x1E40, 0x00B4 }, { 0x1E41, 0x00B5 }, { 0x1E56, 0x00B7 }, { 0x1E57, 0x00B9 }, { 0x1E60, 0x00BB }, { 0x1E61, 0x00BF }, { 0x1E6A, 0x00D7 }, { 0x1E6B, 0x00F7 },
+	{ 0x1E80, 0x00A8 }, { 0x1E81, 0x00B8 }, { 0x1E82, 0x00AA }, { 0x1E83, 0x00BA }, { 0x1E84, 0x00BD }, { 0x1E85, 0x00BE }, { 0x1EF2, 0x00AC }, { 0x1EF3, 0x00BC },
 };
 
 
diff --git a/Encodings/src/ISO8859_16Encoding.cpp b/Encodings/src/ISO8859_16Encoding.cpp
index d07aaf904..3f548d376 100644
--- a/Encodings/src/ISO8859_16Encoding.cpp
+++ b/Encodings/src/ISO8859_16Encoding.cpp
@@ -27,24 +27,24 @@ const char* ISO8859_16Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_16Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_16Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x0104, 0x0105, 0x0141, 0x20AC, 0x201E, 0x0160, 0x00A7, 0x0161, 0x00A9, 0x0218, 0x00AB, 0x0179, 0x00AD, 0x017A, 0x017B, 
-	0x00B0, 0x00B1, 0x010C, 0x0142, 0x017D, 0x201D, 0x00B6, 0x00B7, 0x017E, 0x010D, 0x0219, 0x00BB, 0x0152, 0x0153, 0x0178, 0x017C, 
-	0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0106, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 
-	0x0110, 0x0143, 0x00D2, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x015A, 0x0170, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0118, 0x021A, 0x00DF, 
-	0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x0107, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 
-	0x0111, 0x0144, 0x00F2, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x015B, 0x0171, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0119, 0x021B, 0x00FF, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0104, 0x0105, 0x0141, 0x20AC, 0x201E, 0x0160, 0x00A7, 0x0161, 0x00A9, 0x0218, 0x00AB, 0x0179, 0x00AD, 0x017A, 0x017B,
+	0x00B0, 0x00B1, 0x010C, 0x0142, 0x017D, 0x201D, 0x00B6, 0x00B7, 0x017E, 0x010D, 0x0219, 0x00BB, 0x0152, 0x0153, 0x0178, 0x017C,
+	0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0106, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x0110, 0x0143, 0x00D2, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x015A, 0x0170, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0118, 0x021A, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x0107, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x0111, 0x0144, 0x00F2, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x015B, 0x0171, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0119, 0x021B, 0x00FF,
 };
 
 
@@ -54,38 +54,38 @@ const DoubleByteEncoding::Mapping ISO8859_16Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_16Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A7, 0x00A7 }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AD, 0x00AD }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B6, 0x00B6 }, 
-	{ 0x00B7, 0x00B7 }, { 0x00BB, 0x00BB }, { 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C4, 0x00C4 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 }, 
-	{ 0x00C8, 0x00C8 }, { 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, 
-	{ 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D6, 0x00D6 }, { 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, 
-	{ 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E4, 0x00E4 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 }, 
-	{ 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB }, { 0x00EC, 0x00EC }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F2, 0x00F2 }, 
-	{ 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 }, { 0x00F6, 0x00F6 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x00FF, 0x00FF }, 
-	{ 0x0102, 0x00C3 }, { 0x0103, 0x00E3 }, { 0x0104, 0x00A1 }, { 0x0105, 0x00A2 }, { 0x0106, 0x00C5 }, { 0x0107, 0x00E5 }, { 0x010C, 0x00B2 }, { 0x010D, 0x00B9 }, 
-	{ 0x0110, 0x00D0 }, { 0x0111, 0x00F0 }, { 0x0118, 0x00DD }, { 0x0119, 0x00FD }, { 0x0141, 0x00A3 }, { 0x0142, 0x00B3 }, { 0x0143, 0x00D1 }, { 0x0144, 0x00F1 }, 
-	{ 0x0150, 0x00D5 }, { 0x0151, 0x00F5 }, { 0x0152, 0x00BC }, { 0x0153, 0x00BD }, { 0x015A, 0x00D7 }, { 0x015B, 0x00F7 }, { 0x0160, 0x00A6 }, { 0x0161, 0x00A8 }, 
-	{ 0x0170, 0x00D8 }, { 0x0171, 0x00F8 }, { 0x0178, 0x00BE }, { 0x0179, 0x00AC }, { 0x017A, 0x00AE }, { 0x017B, 0x00AF }, { 0x017C, 0x00BF }, { 0x017D, 0x00B4 }, 
-	{ 0x017E, 0x00B8 }, { 0x0218, 0x00AA }, { 0x0219, 0x00BA }, { 0x021A, 0x00DE }, { 0x021B, 0x00FE }, { 0x201D, 0x00B5 }, { 0x201E, 0x00A5 }, { 0x20AC, 0x00A4 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A7, 0x00A7 }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AD, 0x00AD }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B6, 0x00B6 },
+	{ 0x00B7, 0x00B7 }, { 0x00BB, 0x00BB }, { 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C4, 0x00C4 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 },
+	{ 0x00C8, 0x00C8 }, { 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF },
+	{ 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D6, 0x00D6 }, { 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC },
+	{ 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E4, 0x00E4 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 },
+	{ 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB }, { 0x00EC, 0x00EC }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F2, 0x00F2 },
+	{ 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 }, { 0x00F6, 0x00F6 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x00FF, 0x00FF },
+	{ 0x0102, 0x00C3 }, { 0x0103, 0x00E3 }, { 0x0104, 0x00A1 }, { 0x0105, 0x00A2 }, { 0x0106, 0x00C5 }, { 0x0107, 0x00E5 }, { 0x010C, 0x00B2 }, { 0x010D, 0x00B9 },
+	{ 0x0110, 0x00D0 }, { 0x0111, 0x00F0 }, { 0x0118, 0x00DD }, { 0x0119, 0x00FD }, { 0x0141, 0x00A3 }, { 0x0142, 0x00B3 }, { 0x0143, 0x00D1 }, { 0x0144, 0x00F1 },
+	{ 0x0150, 0x00D5 }, { 0x0151, 0x00F5 }, { 0x0152, 0x00BC }, { 0x0153, 0x00BD }, { 0x015A, 0x00D7 }, { 0x015B, 0x00F7 }, { 0x0160, 0x00A6 }, { 0x0161, 0x00A8 },
+	{ 0x0170, 0x00D8 }, { 0x0171, 0x00F8 }, { 0x0178, 0x00BE }, { 0x0179, 0x00AC }, { 0x017A, 0x00AE }, { 0x017B, 0x00AF }, { 0x017C, 0x00BF }, { 0x017D, 0x00B4 },
+	{ 0x017E, 0x00B8 }, { 0x0218, 0x00AA }, { 0x0219, 0x00BA }, { 0x021A, 0x00DE }, { 0x021B, 0x00FE }, { 0x201D, 0x00B5 }, { 0x201E, 0x00A5 }, { 0x20AC, 0x00A4 },
 };
 
 
diff --git a/Encodings/src/ISO8859_3Encoding.cpp b/Encodings/src/ISO8859_3Encoding.cpp
index 18c413933..276ee1687 100644
--- a/Encodings/src/ISO8859_3Encoding.cpp
+++ b/Encodings/src/ISO8859_3Encoding.cpp
@@ -27,24 +27,24 @@ const char* ISO8859_3Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_3Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_3Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4,     -1, 0x0124, 0x00A7, 0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD,     -1, 0x017B, 
-	0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7, 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD,     -1, 0x017C, 
-	0x00C0, 0x00C1, 0x00C2,     -1, 0x00C4, 0x010A, 0x0108, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 
-	    -1, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, 0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, 
-	0x00E0, 0x00E1, 0x00E2,     -1, 0x00E4, 0x010B, 0x0109, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 
-	    -1, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7, 0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4,     -1, 0x0124, 0x00A7, 0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD,     -1, 0x017B,
+	0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7, 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD,     -1, 0x017C,
+	0x00C0, 0x00C1, 0x00C2,     -1, 0x00C4, 0x010A, 0x0108, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	    -1, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, 0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2,     -1, 0x00E4, 0x010B, 0x0109, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	    -1, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7, 0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9,
 };
 
 
@@ -54,38 +54,38 @@ const DoubleByteEncoding::Mapping ISO8859_3Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_3Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, { 0x00AD, 0x00AD }, { 0x00B0, 0x00B0 }, { 0x00B2, 0x00B2 }, 
-	{ 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x00B8 }, { 0x00BD, 0x00BD }, { 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 }, 
-	{ 0x00C2, 0x00C2 }, { 0x00C4, 0x00C4 }, { 0x00C7, 0x00C7 }, { 0x00C8, 0x00C8 }, { 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC }, 
-	{ 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, { 0x00D1, 0x00D1 }, { 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D6, 0x00D6 }, 
-	{ 0x00D7, 0x00D7 }, { 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, 
-	{ 0x00E2, 0x00E2 }, { 0x00E4, 0x00E4 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB }, { 0x00EC, 0x00EC }, 
-	{ 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 }, { 0x00F2, 0x00F2 }, { 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 }, { 0x00F6, 0x00F6 }, 
-	{ 0x00F7, 0x00F7 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x0108, 0x00C6 }, { 0x0109, 0x00E6 }, { 0x010A, 0x00C5 }, 
-	{ 0x010B, 0x00E5 }, { 0x011C, 0x00D8 }, { 0x011D, 0x00F8 }, { 0x011E, 0x00AB }, { 0x011F, 0x00BB }, { 0x0120, 0x00D5 }, { 0x0121, 0x00F5 }, { 0x0124, 0x00A6 }, 
-	{ 0x0125, 0x00B6 }, { 0x0126, 0x00A1 }, { 0x0127, 0x00B1 }, { 0x0130, 0x00A9 }, { 0x0131, 0x00B9 }, { 0x0134, 0x00AC }, { 0x0135, 0x00BC }, { 0x015C, 0x00DE }, 
-	{ 0x015D, 0x00FE }, { 0x015E, 0x00AA }, { 0x015F, 0x00BA }, { 0x016C, 0x00DD }, { 0x016D, 0x00FD }, { 0x017B, 0x00AF }, { 0x017C, 0x00BF }, { 0x02D8, 0x00A2 }, 
-	{ 0x02D9, 0x00FF }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, { 0x00AD, 0x00AD }, { 0x00B0, 0x00B0 }, { 0x00B2, 0x00B2 },
+	{ 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x00B8 }, { 0x00BD, 0x00BD }, { 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 },
+	{ 0x00C2, 0x00C2 }, { 0x00C4, 0x00C4 }, { 0x00C7, 0x00C7 }, { 0x00C8, 0x00C8 }, { 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC },
+	{ 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, { 0x00D1, 0x00D1 }, { 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D6, 0x00D6 },
+	{ 0x00D7, 0x00D7 }, { 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 },
+	{ 0x00E2, 0x00E2 }, { 0x00E4, 0x00E4 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB }, { 0x00EC, 0x00EC },
+	{ 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 }, { 0x00F2, 0x00F2 }, { 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 }, { 0x00F6, 0x00F6 },
+	{ 0x00F7, 0x00F7 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x0108, 0x00C6 }, { 0x0109, 0x00E6 }, { 0x010A, 0x00C5 },
+	{ 0x010B, 0x00E5 }, { 0x011C, 0x00D8 }, { 0x011D, 0x00F8 }, { 0x011E, 0x00AB }, { 0x011F, 0x00BB }, { 0x0120, 0x00D5 }, { 0x0121, 0x00F5 }, { 0x0124, 0x00A6 },
+	{ 0x0125, 0x00B6 }, { 0x0126, 0x00A1 }, { 0x0127, 0x00B1 }, { 0x0130, 0x00A9 }, { 0x0131, 0x00B9 }, { 0x0134, 0x00AC }, { 0x0135, 0x00BC }, { 0x015C, 0x00DE },
+	{ 0x015D, 0x00FE }, { 0x015E, 0x00AA }, { 0x015F, 0x00BA }, { 0x016C, 0x00DD }, { 0x016D, 0x00FD }, { 0x017B, 0x00AF }, { 0x017C, 0x00BF }, { 0x02D8, 0x00A2 },
+	{ 0x02D9, 0x00FF },
 };
 
 
diff --git a/Encodings/src/ISO8859_4Encoding.cpp b/Encodings/src/ISO8859_4Encoding.cpp
index bb18a9ba1..7baa8a0a0 100644
--- a/Encodings/src/ISO8859_4Encoding.cpp
+++ b/Encodings/src/ISO8859_4Encoding.cpp
@@ -27,24 +27,24 @@ const char* ISO8859_4Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_4Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_4Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7, 0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF, 
-	0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7, 0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B, 
-	0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A, 
-	0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF, 
-	0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B, 
-	0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7, 0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF,
+	0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7, 0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B,
+	0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A,
+	0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF,
+	0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B,
+	0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9,
 };
 
 
@@ -54,38 +54,38 @@ const DoubleByteEncoding::Mapping ISO8859_4Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_4Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, { 0x00AD, 0x00AD }, { 0x00AF, 0x00AF }, { 0x00B0, 0x00B0 }, { 0x00B4, 0x00B4 }, 
-	{ 0x00B8, 0x00B8 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C9, 0x00C9 }, 
-	{ 0x00CB, 0x00CB }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00D8 }, 
-	{ 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E3, 0x00E3 }, { 0x00E4, 0x00E4 }, 
-	{ 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E9, 0x00E9 }, { 0x00EB, 0x00EB }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00F4, 0x00F4 }, { 0x00F5, 0x00F5 }, 
-	{ 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00F8 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x0100, 0x00C0 }, { 0x0101, 0x00E0 }, 
-	{ 0x0104, 0x00A1 }, { 0x0105, 0x00B1 }, { 0x010C, 0x00C8 }, { 0x010D, 0x00E8 }, { 0x0110, 0x00D0 }, { 0x0111, 0x00F0 }, { 0x0112, 0x00AA }, { 0x0113, 0x00BA }, 
-	{ 0x0116, 0x00CC }, { 0x0117, 0x00EC }, { 0x0118, 0x00CA }, { 0x0119, 0x00EA }, { 0x0122, 0x00AB }, { 0x0123, 0x00BB }, { 0x0128, 0x00A5 }, { 0x0129, 0x00B5 }, 
-	{ 0x012A, 0x00CF }, { 0x012B, 0x00EF }, { 0x012E, 0x00C7 }, { 0x012F, 0x00E7 }, { 0x0136, 0x00D3 }, { 0x0137, 0x00F3 }, { 0x0138, 0x00A2 }, { 0x013B, 0x00A6 }, 
-	{ 0x013C, 0x00B6 }, { 0x0145, 0x00D1 }, { 0x0146, 0x00F1 }, { 0x014A, 0x00BD }, { 0x014B, 0x00BF }, { 0x014C, 0x00D2 }, { 0x014D, 0x00F2 }, { 0x0156, 0x00A3 }, 
-	{ 0x0157, 0x00B3 }, { 0x0160, 0x00A9 }, { 0x0161, 0x00B9 }, { 0x0166, 0x00AC }, { 0x0167, 0x00BC }, { 0x0168, 0x00DD }, { 0x0169, 0x00FD }, { 0x016A, 0x00DE }, 
-	{ 0x016B, 0x00FE }, { 0x0172, 0x00D9 }, { 0x0173, 0x00F9 }, { 0x017D, 0x00AE }, { 0x017E, 0x00BE }, { 0x02C7, 0x00B7 }, { 0x02D9, 0x00FF }, { 0x02DB, 0x00B2 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, { 0x00AD, 0x00AD }, { 0x00AF, 0x00AF }, { 0x00B0, 0x00B0 }, { 0x00B4, 0x00B4 },
+	{ 0x00B8, 0x00B8 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C9, 0x00C9 },
+	{ 0x00CB, 0x00CB }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00D8 },
+	{ 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E3, 0x00E3 }, { 0x00E4, 0x00E4 },
+	{ 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E9, 0x00E9 }, { 0x00EB, 0x00EB }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00F4, 0x00F4 }, { 0x00F5, 0x00F5 },
+	{ 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00F8 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x0100, 0x00C0 }, { 0x0101, 0x00E0 },
+	{ 0x0104, 0x00A1 }, { 0x0105, 0x00B1 }, { 0x010C, 0x00C8 }, { 0x010D, 0x00E8 }, { 0x0110, 0x00D0 }, { 0x0111, 0x00F0 }, { 0x0112, 0x00AA }, { 0x0113, 0x00BA },
+	{ 0x0116, 0x00CC }, { 0x0117, 0x00EC }, { 0x0118, 0x00CA }, { 0x0119, 0x00EA }, { 0x0122, 0x00AB }, { 0x0123, 0x00BB }, { 0x0128, 0x00A5 }, { 0x0129, 0x00B5 },
+	{ 0x012A, 0x00CF }, { 0x012B, 0x00EF }, { 0x012E, 0x00C7 }, { 0x012F, 0x00E7 }, { 0x0136, 0x00D3 }, { 0x0137, 0x00F3 }, { 0x0138, 0x00A2 }, { 0x013B, 0x00A6 },
+	{ 0x013C, 0x00B6 }, { 0x0145, 0x00D1 }, { 0x0146, 0x00F1 }, { 0x014A, 0x00BD }, { 0x014B, 0x00BF }, { 0x014C, 0x00D2 }, { 0x014D, 0x00F2 }, { 0x0156, 0x00A3 },
+	{ 0x0157, 0x00B3 }, { 0x0160, 0x00A9 }, { 0x0161, 0x00B9 }, { 0x0166, 0x00AC }, { 0x0167, 0x00BC }, { 0x0168, 0x00DD }, { 0x0169, 0x00FD }, { 0x016A, 0x00DE },
+	{ 0x016B, 0x00FE }, { 0x0172, 0x00D9 }, { 0x0173, 0x00F9 }, { 0x017D, 0x00AE }, { 0x017E, 0x00BE }, { 0x02C7, 0x00B7 }, { 0x02D9, 0x00FF }, { 0x02DB, 0x00B2 },
 };
 
 
diff --git a/Encodings/src/ISO8859_5Encoding.cpp b/Encodings/src/ISO8859_5Encoding.cpp
index fdca44f4b..a700ef1a0 100644
--- a/Encodings/src/ISO8859_5Encoding.cpp
+++ b/Encodings/src/ISO8859_5Encoding.cpp
@@ -25,24 +25,24 @@ const char* ISO8859_5Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_5Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_5Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, 
-	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 
-	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 
-	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 
-	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 
-	0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F,
+	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
+	0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F,
 };
 
 
@@ -52,38 +52,38 @@ const DoubleByteEncoding::Mapping ISO8859_5Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_5Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A7, 0x00FD }, { 0x00AD, 0x00AD }, { 0x0401, 0x00A1 }, { 0x0402, 0x00A2 }, { 0x0403, 0x00A3 }, { 0x0404, 0x00A4 }, { 0x0405, 0x00A5 }, 
-	{ 0x0406, 0x00A6 }, { 0x0407, 0x00A7 }, { 0x0408, 0x00A8 }, { 0x0409, 0x00A9 }, { 0x040A, 0x00AA }, { 0x040B, 0x00AB }, { 0x040C, 0x00AC }, { 0x040E, 0x00AE }, 
-	{ 0x040F, 0x00AF }, { 0x0410, 0x00B0 }, { 0x0411, 0x00B1 }, { 0x0412, 0x00B2 }, { 0x0413, 0x00B3 }, { 0x0414, 0x00B4 }, { 0x0415, 0x00B5 }, { 0x0416, 0x00B6 }, 
-	{ 0x0417, 0x00B7 }, { 0x0418, 0x00B8 }, { 0x0419, 0x00B9 }, { 0x041A, 0x00BA }, { 0x041B, 0x00BB }, { 0x041C, 0x00BC }, { 0x041D, 0x00BD }, { 0x041E, 0x00BE }, 
-	{ 0x041F, 0x00BF }, { 0x0420, 0x00C0 }, { 0x0421, 0x00C1 }, { 0x0422, 0x00C2 }, { 0x0423, 0x00C3 }, { 0x0424, 0x00C4 }, { 0x0425, 0x00C5 }, { 0x0426, 0x00C6 }, 
-	{ 0x0427, 0x00C7 }, { 0x0428, 0x00C8 }, { 0x0429, 0x00C9 }, { 0x042A, 0x00CA }, { 0x042B, 0x00CB }, { 0x042C, 0x00CC }, { 0x042D, 0x00CD }, { 0x042E, 0x00CE }, 
-	{ 0x042F, 0x00CF }, { 0x0430, 0x00D0 }, { 0x0431, 0x00D1 }, { 0x0432, 0x00D2 }, { 0x0433, 0x00D3 }, { 0x0434, 0x00D4 }, { 0x0435, 0x00D5 }, { 0x0436, 0x00D6 }, 
-	{ 0x0437, 0x00D7 }, { 0x0438, 0x00D8 }, { 0x0439, 0x00D9 }, { 0x043A, 0x00DA }, { 0x043B, 0x00DB }, { 0x043C, 0x00DC }, { 0x043D, 0x00DD }, { 0x043E, 0x00DE }, 
-	{ 0x043F, 0x00DF }, { 0x0440, 0x00E0 }, { 0x0441, 0x00E1 }, { 0x0442, 0x00E2 }, { 0x0443, 0x00E3 }, { 0x0444, 0x00E4 }, { 0x0445, 0x00E5 }, { 0x0446, 0x00E6 }, 
-	{ 0x0447, 0x00E7 }, { 0x0448, 0x00E8 }, { 0x0449, 0x00E9 }, { 0x044A, 0x00EA }, { 0x044B, 0x00EB }, { 0x044C, 0x00EC }, { 0x044D, 0x00ED }, { 0x044E, 0x00EE }, 
-	{ 0x044F, 0x00EF }, { 0x0451, 0x00F1 }, { 0x0452, 0x00F2 }, { 0x0453, 0x00F3 }, { 0x0454, 0x00F4 }, { 0x0455, 0x00F5 }, { 0x0456, 0x00F6 }, { 0x0457, 0x00F7 }, 
-	{ 0x0458, 0x00F8 }, { 0x0459, 0x00F9 }, { 0x045A, 0x00FA }, { 0x045B, 0x00FB }, { 0x045C, 0x00FC }, { 0x045E, 0x00FE }, { 0x045F, 0x00FF }, { 0x2116, 0x00F0 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A7, 0x00FD }, { 0x00AD, 0x00AD }, { 0x0401, 0x00A1 }, { 0x0402, 0x00A2 }, { 0x0403, 0x00A3 }, { 0x0404, 0x00A4 }, { 0x0405, 0x00A5 },
+	{ 0x0406, 0x00A6 }, { 0x0407, 0x00A7 }, { 0x0408, 0x00A8 }, { 0x0409, 0x00A9 }, { 0x040A, 0x00AA }, { 0x040B, 0x00AB }, { 0x040C, 0x00AC }, { 0x040E, 0x00AE },
+	{ 0x040F, 0x00AF }, { 0x0410, 0x00B0 }, { 0x0411, 0x00B1 }, { 0x0412, 0x00B2 }, { 0x0413, 0x00B3 }, { 0x0414, 0x00B4 }, { 0x0415, 0x00B5 }, { 0x0416, 0x00B6 },
+	{ 0x0417, 0x00B7 }, { 0x0418, 0x00B8 }, { 0x0419, 0x00B9 }, { 0x041A, 0x00BA }, { 0x041B, 0x00BB }, { 0x041C, 0x00BC }, { 0x041D, 0x00BD }, { 0x041E, 0x00BE },
+	{ 0x041F, 0x00BF }, { 0x0420, 0x00C0 }, { 0x0421, 0x00C1 }, { 0x0422, 0x00C2 }, { 0x0423, 0x00C3 }, { 0x0424, 0x00C4 }, { 0x0425, 0x00C5 }, { 0x0426, 0x00C6 },
+	{ 0x0427, 0x00C7 }, { 0x0428, 0x00C8 }, { 0x0429, 0x00C9 }, { 0x042A, 0x00CA }, { 0x042B, 0x00CB }, { 0x042C, 0x00CC }, { 0x042D, 0x00CD }, { 0x042E, 0x00CE },
+	{ 0x042F, 0x00CF }, { 0x0430, 0x00D0 }, { 0x0431, 0x00D1 }, { 0x0432, 0x00D2 }, { 0x0433, 0x00D3 }, { 0x0434, 0x00D4 }, { 0x0435, 0x00D5 }, { 0x0436, 0x00D6 },
+	{ 0x0437, 0x00D7 }, { 0x0438, 0x00D8 }, { 0x0439, 0x00D9 }, { 0x043A, 0x00DA }, { 0x043B, 0x00DB }, { 0x043C, 0x00DC }, { 0x043D, 0x00DD }, { 0x043E, 0x00DE },
+	{ 0x043F, 0x00DF }, { 0x0440, 0x00E0 }, { 0x0441, 0x00E1 }, { 0x0442, 0x00E2 }, { 0x0443, 0x00E3 }, { 0x0444, 0x00E4 }, { 0x0445, 0x00E5 }, { 0x0446, 0x00E6 },
+	{ 0x0447, 0x00E7 }, { 0x0448, 0x00E8 }, { 0x0449, 0x00E9 }, { 0x044A, 0x00EA }, { 0x044B, 0x00EB }, { 0x044C, 0x00EC }, { 0x044D, 0x00ED }, { 0x044E, 0x00EE },
+	{ 0x044F, 0x00EF }, { 0x0451, 0x00F1 }, { 0x0452, 0x00F2 }, { 0x0453, 0x00F3 }, { 0x0454, 0x00F4 }, { 0x0455, 0x00F5 }, { 0x0456, 0x00F6 }, { 0x0457, 0x00F7 },
+	{ 0x0458, 0x00F8 }, { 0x0459, 0x00F9 }, { 0x045A, 0x00FA }, { 0x045B, 0x00FB }, { 0x045C, 0x00FC }, { 0x045E, 0x00FE }, { 0x045F, 0x00FF }, { 0x2116, 0x00F0 },
 };
 
 
diff --git a/Encodings/src/ISO8859_6Encoding.cpp b/Encodings/src/ISO8859_6Encoding.cpp
index 2ee7ccdab..0aff953e0 100644
--- a/Encodings/src/ISO8859_6Encoding.cpp
+++ b/Encodings/src/ISO8859_6Encoding.cpp
@@ -25,24 +25,24 @@ const char* ISO8859_6Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_6Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_6Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0,     -1,     -1,     -1, 0x00A4,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 0x060C, 0x00AD,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 0x061B,     -1,     -1,     -1, 0x061F, 
-	    -1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, 
-	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x063A,     -1,     -1,     -1,     -1,     -1, 
-	0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 
-	0x0650, 0x0651, 0x0652,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0,     -1,     -1,     -1, 0x00A4,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 0x060C, 0x00AD,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 0x061B,     -1,     -1,     -1, 0x061F,
+	    -1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x063A,     -1,     -1,     -1,     -1,     -1,
+	0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F,
+	0x0650, 0x0651, 0x0652,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
 };
 
 
@@ -52,33 +52,33 @@ const DoubleByteEncoding::Mapping ISO8859_6Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_6Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A4, 0x00A4 }, { 0x00AD, 0x00AD }, { 0x060C, 0x00AC }, { 0x061B, 0x00BB }, { 0x061F, 0x00BF }, { 0x0621, 0x00C1 }, { 0x0622, 0x00C2 }, 
-	{ 0x0623, 0x00C3 }, { 0x0624, 0x00C4 }, { 0x0625, 0x00C5 }, { 0x0626, 0x00C6 }, { 0x0627, 0x00C7 }, { 0x0628, 0x00C8 }, { 0x0629, 0x00C9 }, { 0x062A, 0x00CA }, 
-	{ 0x062B, 0x00CB }, { 0x062C, 0x00CC }, { 0x062D, 0x00CD }, { 0x062E, 0x00CE }, { 0x062F, 0x00CF }, { 0x0630, 0x00D0 }, { 0x0631, 0x00D1 }, { 0x0632, 0x00D2 }, 
-	{ 0x0633, 0x00D3 }, { 0x0634, 0x00D4 }, { 0x0635, 0x00D5 }, { 0x0636, 0x00D6 }, { 0x0637, 0x00D7 }, { 0x0638, 0x00D8 }, { 0x0639, 0x00D9 }, { 0x063A, 0x00DA }, 
-	{ 0x0640, 0x00E0 }, { 0x0641, 0x00E1 }, { 0x0642, 0x00E2 }, { 0x0643, 0x00E3 }, { 0x0644, 0x00E4 }, { 0x0645, 0x00E5 }, { 0x0646, 0x00E6 }, { 0x0647, 0x00E7 }, 
-	{ 0x0648, 0x00E8 }, { 0x0649, 0x00E9 }, { 0x064A, 0x00EA }, { 0x064B, 0x00EB }, { 0x064C, 0x00EC }, { 0x064D, 0x00ED }, { 0x064E, 0x00EE }, { 0x064F, 0x00EF }, 
-	{ 0x0650, 0x00F0 }, { 0x0651, 0x00F1 }, { 0x0652, 0x00F2 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A4, 0x00A4 }, { 0x00AD, 0x00AD }, { 0x060C, 0x00AC }, { 0x061B, 0x00BB }, { 0x061F, 0x00BF }, { 0x0621, 0x00C1 }, { 0x0622, 0x00C2 },
+	{ 0x0623, 0x00C3 }, { 0x0624, 0x00C4 }, { 0x0625, 0x00C5 }, { 0x0626, 0x00C6 }, { 0x0627, 0x00C7 }, { 0x0628, 0x00C8 }, { 0x0629, 0x00C9 }, { 0x062A, 0x00CA },
+	{ 0x062B, 0x00CB }, { 0x062C, 0x00CC }, { 0x062D, 0x00CD }, { 0x062E, 0x00CE }, { 0x062F, 0x00CF }, { 0x0630, 0x00D0 }, { 0x0631, 0x00D1 }, { 0x0632, 0x00D2 },
+	{ 0x0633, 0x00D3 }, { 0x0634, 0x00D4 }, { 0x0635, 0x00D5 }, { 0x0636, 0x00D6 }, { 0x0637, 0x00D7 }, { 0x0638, 0x00D8 }, { 0x0639, 0x00D9 }, { 0x063A, 0x00DA },
+	{ 0x0640, 0x00E0 }, { 0x0641, 0x00E1 }, { 0x0642, 0x00E2 }, { 0x0643, 0x00E3 }, { 0x0644, 0x00E4 }, { 0x0645, 0x00E5 }, { 0x0646, 0x00E6 }, { 0x0647, 0x00E7 },
+	{ 0x0648, 0x00E8 }, { 0x0649, 0x00E9 }, { 0x064A, 0x00EA }, { 0x064B, 0x00EB }, { 0x064C, 0x00EC }, { 0x064D, 0x00ED }, { 0x064E, 0x00EE }, { 0x064F, 0x00EF },
+	{ 0x0650, 0x00F0 }, { 0x0651, 0x00F1 }, { 0x0652, 0x00F2 },
 };
 
 
diff --git a/Encodings/src/ISO8859_7Encoding.cpp b/Encodings/src/ISO8859_7Encoding.cpp
index 9908f375e..edc4465b9 100644
--- a/Encodings/src/ISO8859_7Encoding.cpp
+++ b/Encodings/src/ISO8859_7Encoding.cpp
@@ -25,24 +25,24 @@ const char* ISO8859_7Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_7Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_7Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x2018, 0x2019, 0x00A3, 0x20AC, 0x20AF, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x037A, 0x00AB, 0x00AC, 0x00AD,     -1, 0x2015, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, 
-	0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 
-	0x03A0, 0x03A1,     -1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 
-	0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 
-	0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE,     -1, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x2018, 0x2019, 0x00A3, 0x20AC, 0x20AF, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x037A, 0x00AB, 0x00AC, 0x00AD,     -1, 0x2015,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+	0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+	0x03A0, 0x03A1,     -1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+	0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+	0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE,     -1,
 };
 
 
@@ -52,38 +52,38 @@ const DoubleByteEncoding::Mapping ISO8859_7Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_7Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A3, 0x00A3 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, 
-	{ 0x00AD, 0x00AD }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B7, 0x00B7 }, { 0x00BB, 0x00BB }, { 0x00BD, 0x00BD }, 
-	{ 0x037A, 0x00AA }, { 0x0384, 0x00B4 }, { 0x0385, 0x00B5 }, { 0x0386, 0x00B6 }, { 0x0388, 0x00B8 }, { 0x0389, 0x00B9 }, { 0x038A, 0x00BA }, { 0x038C, 0x00BC }, 
-	{ 0x038E, 0x00BE }, { 0x038F, 0x00BF }, { 0x0390, 0x00C0 }, { 0x0391, 0x00C1 }, { 0x0392, 0x00C2 }, { 0x0393, 0x00C3 }, { 0x0394, 0x00C4 }, { 0x0395, 0x00C5 }, 
-	{ 0x0396, 0x00C6 }, { 0x0397, 0x00C7 }, { 0x0398, 0x00C8 }, { 0x0399, 0x00C9 }, { 0x039A, 0x00CA }, { 0x039B, 0x00CB }, { 0x039C, 0x00CC }, { 0x039D, 0x00CD }, 
-	{ 0x039E, 0x00CE }, { 0x039F, 0x00CF }, { 0x03A0, 0x00D0 }, { 0x03A1, 0x00D1 }, { 0x03A3, 0x00D3 }, { 0x03A4, 0x00D4 }, { 0x03A5, 0x00D5 }, { 0x03A6, 0x00D6 }, 
-	{ 0x03A7, 0x00D7 }, { 0x03A8, 0x00D8 }, { 0x03A9, 0x00D9 }, { 0x03AA, 0x00DA }, { 0x03AB, 0x00DB }, { 0x03AC, 0x00DC }, { 0x03AD, 0x00DD }, { 0x03AE, 0x00DE }, 
-	{ 0x03AF, 0x00DF }, { 0x03B0, 0x00E0 }, { 0x03B1, 0x00E1 }, { 0x03B2, 0x00E2 }, { 0x03B3, 0x00E3 }, { 0x03B4, 0x00E4 }, { 0x03B5, 0x00E5 }, { 0x03B6, 0x00E6 }, 
-	{ 0x03B7, 0x00E7 }, { 0x03B8, 0x00E8 }, { 0x03B9, 0x00E9 }, { 0x03BA, 0x00EA }, { 0x03BB, 0x00EB }, { 0x03BC, 0x00EC }, { 0x03BD, 0x00ED }, { 0x03BE, 0x00EE }, 
-	{ 0x03BF, 0x00EF }, { 0x03C0, 0x00F0 }, { 0x03C1, 0x00F1 }, { 0x03C2, 0x00F2 }, { 0x03C3, 0x00F3 }, { 0x03C4, 0x00F4 }, { 0x03C5, 0x00F5 }, { 0x03C6, 0x00F6 }, 
-	{ 0x03C7, 0x00F7 }, { 0x03C8, 0x00F8 }, { 0x03C9, 0x00F9 }, { 0x03CA, 0x00FA }, { 0x03CB, 0x00FB }, { 0x03CC, 0x00FC }, { 0x03CD, 0x00FD }, { 0x03CE, 0x00FE }, 
-	{ 0x2015, 0x00AF }, { 0x2018, 0x00A1 }, { 0x2019, 0x00A2 }, { 0x20AC, 0x00A4 }, { 0x20AF, 0x00A5 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A3, 0x00A3 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC },
+	{ 0x00AD, 0x00AD }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B7, 0x00B7 }, { 0x00BB, 0x00BB }, { 0x00BD, 0x00BD },
+	{ 0x037A, 0x00AA }, { 0x0384, 0x00B4 }, { 0x0385, 0x00B5 }, { 0x0386, 0x00B6 }, { 0x0388, 0x00B8 }, { 0x0389, 0x00B9 }, { 0x038A, 0x00BA }, { 0x038C, 0x00BC },
+	{ 0x038E, 0x00BE }, { 0x038F, 0x00BF }, { 0x0390, 0x00C0 }, { 0x0391, 0x00C1 }, { 0x0392, 0x00C2 }, { 0x0393, 0x00C3 }, { 0x0394, 0x00C4 }, { 0x0395, 0x00C5 },
+	{ 0x0396, 0x00C6 }, { 0x0397, 0x00C7 }, { 0x0398, 0x00C8 }, { 0x0399, 0x00C9 }, { 0x039A, 0x00CA }, { 0x039B, 0x00CB }, { 0x039C, 0x00CC }, { 0x039D, 0x00CD },
+	{ 0x039E, 0x00CE }, { 0x039F, 0x00CF }, { 0x03A0, 0x00D0 }, { 0x03A1, 0x00D1 }, { 0x03A3, 0x00D3 }, { 0x03A4, 0x00D4 }, { 0x03A5, 0x00D5 }, { 0x03A6, 0x00D6 },
+	{ 0x03A7, 0x00D7 }, { 0x03A8, 0x00D8 }, { 0x03A9, 0x00D9 }, { 0x03AA, 0x00DA }, { 0x03AB, 0x00DB }, { 0x03AC, 0x00DC }, { 0x03AD, 0x00DD }, { 0x03AE, 0x00DE },
+	{ 0x03AF, 0x00DF }, { 0x03B0, 0x00E0 }, { 0x03B1, 0x00E1 }, { 0x03B2, 0x00E2 }, { 0x03B3, 0x00E3 }, { 0x03B4, 0x00E4 }, { 0x03B5, 0x00E5 }, { 0x03B6, 0x00E6 },
+	{ 0x03B7, 0x00E7 }, { 0x03B8, 0x00E8 }, { 0x03B9, 0x00E9 }, { 0x03BA, 0x00EA }, { 0x03BB, 0x00EB }, { 0x03BC, 0x00EC }, { 0x03BD, 0x00ED }, { 0x03BE, 0x00EE },
+	{ 0x03BF, 0x00EF }, { 0x03C0, 0x00F0 }, { 0x03C1, 0x00F1 }, { 0x03C2, 0x00F2 }, { 0x03C3, 0x00F3 }, { 0x03C4, 0x00F4 }, { 0x03C5, 0x00F5 }, { 0x03C6, 0x00F6 },
+	{ 0x03C7, 0x00F7 }, { 0x03C8, 0x00F8 }, { 0x03C9, 0x00F9 }, { 0x03CA, 0x00FA }, { 0x03CB, 0x00FB }, { 0x03CC, 0x00FC }, { 0x03CD, 0x00FD }, { 0x03CE, 0x00FE },
+	{ 0x2015, 0x00AF }, { 0x2018, 0x00A1 }, { 0x2019, 0x00A2 }, { 0x20AC, 0x00A4 }, { 0x20AF, 0x00A5 },
 };
 
 
diff --git a/Encodings/src/ISO8859_8Encoding.cpp b/Encodings/src/ISO8859_8Encoding.cpp
index 023e32846..117cfb564 100644
--- a/Encodings/src/ISO8859_8Encoding.cpp
+++ b/Encodings/src/ISO8859_8Encoding.cpp
@@ -25,24 +25,24 @@ const char* ISO8859_8Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_8Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_8Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0,     -1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 0x2017, 
-	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, 
-	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA,     -1,     -1, 0x200E, 0x200F,     -1, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0,     -1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 0x2017,
+	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA,     -1,     -1, 0x200E, 0x200F,     -1,
 };
 
 
@@ -52,34 +52,34 @@ const DoubleByteEncoding::Mapping ISO8859_8Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_8Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, 
-	{ 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, 
-	{ 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 }, 
-	{ 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00D7, 0x00AA }, { 0x00F7, 0x00BA }, { 0x05D0, 0x00E0 }, { 0x05D1, 0x00E1 }, 
-	{ 0x05D2, 0x00E2 }, { 0x05D3, 0x00E3 }, { 0x05D4, 0x00E4 }, { 0x05D5, 0x00E5 }, { 0x05D6, 0x00E6 }, { 0x05D7, 0x00E7 }, { 0x05D8, 0x00E8 }, { 0x05D9, 0x00E9 }, 
-	{ 0x05DA, 0x00EA }, { 0x05DB, 0x00EB }, { 0x05DC, 0x00EC }, { 0x05DD, 0x00ED }, { 0x05DE, 0x00EE }, { 0x05DF, 0x00EF }, { 0x05E0, 0x00F0 }, { 0x05E1, 0x00F1 }, 
-	{ 0x05E2, 0x00F2 }, { 0x05E3, 0x00F3 }, { 0x05E4, 0x00F4 }, { 0x05E5, 0x00F5 }, { 0x05E6, 0x00F6 }, { 0x05E7, 0x00F7 }, { 0x05E8, 0x00F8 }, { 0x05E9, 0x00F9 }, 
-	{ 0x05EA, 0x00FA }, { 0x200E, 0x00FD }, { 0x200F, 0x00FE }, { 0x2017, 0x00DF }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 },
+	{ 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 },
+	{ 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 },
+	{ 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00D7, 0x00AA }, { 0x00F7, 0x00BA }, { 0x05D0, 0x00E0 }, { 0x05D1, 0x00E1 },
+	{ 0x05D2, 0x00E2 }, { 0x05D3, 0x00E3 }, { 0x05D4, 0x00E4 }, { 0x05D5, 0x00E5 }, { 0x05D6, 0x00E6 }, { 0x05D7, 0x00E7 }, { 0x05D8, 0x00E8 }, { 0x05D9, 0x00E9 },
+	{ 0x05DA, 0x00EA }, { 0x05DB, 0x00EB }, { 0x05DC, 0x00EC }, { 0x05DD, 0x00ED }, { 0x05DE, 0x00EE }, { 0x05DF, 0x00EF }, { 0x05E0, 0x00F0 }, { 0x05E1, 0x00F1 },
+	{ 0x05E2, 0x00F2 }, { 0x05E3, 0x00F3 }, { 0x05E4, 0x00F4 }, { 0x05E5, 0x00F5 }, { 0x05E6, 0x00F6 }, { 0x05E7, 0x00F7 }, { 0x05E8, 0x00F8 }, { 0x05E9, 0x00F9 },
+	{ 0x05EA, 0x00FA }, { 0x200E, 0x00FD }, { 0x200F, 0x00FE }, { 0x2017, 0x00DF },
 };
 
 
diff --git a/Encodings/src/ISO8859_9Encoding.cpp b/Encodings/src/ISO8859_9Encoding.cpp
index 1c6734d4d..fe3464aa2 100644
--- a/Encodings/src/ISO8859_9Encoding.cpp
+++ b/Encodings/src/ISO8859_9Encoding.cpp
@@ -27,24 +27,24 @@ const char* ISO8859_9Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ISO8859_9Encoding::_charMap = 
+const TextEncoding::CharacterMap ISO8859_9Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 
-	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 
-	0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, 
-	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 
-	0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF,
 };
 
 
@@ -54,38 +54,38 @@ const DoubleByteEncoding::Mapping ISO8859_9Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping ISO8859_9Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, 
-	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, 
-	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, 
-	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A1, 0x00A1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, 
-	{ 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 }, { 0x00AA, 0x00AA }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF }, 
-	{ 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, 
-	{ 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 }, { 0x00BA, 0x00BA }, { 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00BF, 0x00BF }, 
-	{ 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 }, 
-	{ 0x00C8, 0x00C8 }, { 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, 
-	{ 0x00D1, 0x00D1 }, { 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00D8 }, 
-	{ 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, 
-	{ 0x00E3, 0x00E3 }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, 
-	{ 0x00EB, 0x00EB }, { 0x00EC, 0x00EC }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 }, { 0x00F2, 0x00F2 }, { 0x00F3, 0x00F3 }, 
-	{ 0x00F4, 0x00F4 }, { 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00F8 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, 
-	{ 0x00FC, 0x00FC }, { 0x00FF, 0x00FF }, { 0x011E, 0x00D0 }, { 0x011F, 0x00F0 }, { 0x0130, 0x00DD }, { 0x0131, 0x00FD }, { 0x015E, 0x00DE }, { 0x015F, 0x00FE }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x0080, 0x0080 }, { 0x0081, 0x0081 }, { 0x0082, 0x0082 }, { 0x0083, 0x0083 }, { 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 },
+	{ 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F },
+	{ 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 },
+	{ 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F },
+	{ 0x00A0, 0x00A0 }, { 0x00A1, 0x00A1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 },
+	{ 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 }, { 0x00AA, 0x00AA }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF },
+	{ 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 },
+	{ 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 }, { 0x00BA, 0x00BA }, { 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00BF, 0x00BF },
+	{ 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 },
+	{ 0x00C8, 0x00C8 }, { 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF },
+	{ 0x00D1, 0x00D1 }, { 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00D8 },
+	{ 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 },
+	{ 0x00E3, 0x00E3 }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA },
+	{ 0x00EB, 0x00EB }, { 0x00EC, 0x00EC }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 }, { 0x00F2, 0x00F2 }, { 0x00F3, 0x00F3 },
+	{ 0x00F4, 0x00F4 }, { 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00F8 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB },
+	{ 0x00FC, 0x00FC }, { 0x00FF, 0x00FF }, { 0x011E, 0x00D0 }, { 0x011F, 0x00F0 }, { 0x0130, 0x00DD }, { 0x0131, 0x00FD }, { 0x015E, 0x00DE }, { 0x015F, 0x00FE },
 };
 
 
diff --git a/Encodings/src/MacCentralEurRomanEncoding.cpp b/Encodings/src/MacCentralEurRomanEncoding.cpp
index 20900d287..6d1735537 100644
--- a/Encodings/src/MacCentralEurRomanEncoding.cpp
+++ b/Encodings/src/MacCentralEurRomanEncoding.cpp
@@ -25,24 +25,24 @@ const char* MacCentralEurRomanEncoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap MacCentralEurRomanEncoding::_charMap = 
+const TextEncoding::CharacterMap MacCentralEurRomanEncoding::_charMap =
 {
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
-	0x00C4, 0x0100, 0x0101, 0x00C9, 0x0104, 0x00D6, 0x00DC, 0x00E1, 0x0105, 0x010C, 0x00E4, 0x010D, 0x0106, 0x0107, 0x00E9, 0x0179, 
-	0x017A, 0x010E, 0x00ED, 0x010F, 0x0112, 0x0113, 0x0116, 0x00F3, 0x0117, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x011A, 0x011B, 0x00FC, 
-	0x2020, 0x00B0, 0x0118, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, 0x00AE, 0x00A9, 0x2122, 0x0119, 0x00A8, 0x2260, 0x0123, 0x012E, 
-	0x012F, 0x012A, 0x2264, 0x2265, 0x012B, 0x0136, 0x2202, 0x2211, 0x0142, 0x013B, 0x013C, 0x013D, 0x013E, 0x0139, 0x013A, 0x0145, 
-	0x0146, 0x0143, 0x00AC, 0x221A, 0x0144, 0x0147, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x0148, 0x0150, 0x00D5, 0x0151, 0x014C, 
-	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, 0x014D, 0x0154, 0x0155, 0x0158, 0x2039, 0x203A, 0x0159, 0x0156, 
-	0x0157, 0x0160, 0x201A, 0x201E, 0x0161, 0x015A, 0x015B, 0x00C1, 0x0164, 0x0165, 0x00CD, 0x017D, 0x017E, 0x016A, 0x00D3, 0x00D4, 
-	0x016B, 0x016E, 0x00DA, 0x016F, 0x0170, 0x0171, 0x0172, 0x0173, 0x00DD, 0x00FD, 0x0137, 0x017B, 0x0141, 0x017C, 0x0122, 0x02C7, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1,
+	0x00C4, 0x0100, 0x0101, 0x00C9, 0x0104, 0x00D6, 0x00DC, 0x00E1, 0x0105, 0x010C, 0x00E4, 0x010D, 0x0106, 0x0107, 0x00E9, 0x0179,
+	0x017A, 0x010E, 0x00ED, 0x010F, 0x0112, 0x0113, 0x0116, 0x00F3, 0x0117, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x011A, 0x011B, 0x00FC,
+	0x2020, 0x00B0, 0x0118, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, 0x00AE, 0x00A9, 0x2122, 0x0119, 0x00A8, 0x2260, 0x0123, 0x012E,
+	0x012F, 0x012A, 0x2264, 0x2265, 0x012B, 0x0136, 0x2202, 0x2211, 0x0142, 0x013B, 0x013C, 0x013D, 0x013E, 0x0139, 0x013A, 0x0145,
+	0x0146, 0x0143, 0x00AC, 0x221A, 0x0144, 0x0147, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x0148, 0x0150, 0x00D5, 0x0151, 0x014C,
+	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, 0x014D, 0x0154, 0x0155, 0x0158, 0x2039, 0x203A, 0x0159, 0x0156,
+	0x0157, 0x0160, 0x201A, 0x201E, 0x0161, 0x015A, 0x015B, 0x00C1, 0x0164, 0x0165, 0x00CD, 0x017D, 0x017E, 0x016A, 0x00D3, 0x00D4,
+	0x016B, 0x016E, 0x00DA, 0x016F, 0x0170, 0x0171, 0x0172, 0x0173, 0x00DD, 0x00FD, 0x0137, 0x017B, 0x0141, 0x017C, 0x0122, 0x02C7,
 };
 
 
@@ -52,34 +52,34 @@ const DoubleByteEncoding::Mapping MacCentralEurRomanEncoding::_mappingTable[] =
 
 
 const DoubleByteEncoding::Mapping MacCentralEurRomanEncoding::_reverseMappingTable[] = {
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00CA }, 
-	{ 0x00A3, 0x00A3 }, { 0x00A7, 0x00A4 }, { 0x00A8, 0x00AC }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00C7 }, { 0x00AC, 0x00C2 }, { 0x00AE, 0x00A8 }, { 0x00B0, 0x00A1 }, 
-	{ 0x00B6, 0x00A6 }, { 0x00BB, 0x00C8 }, { 0x00C1, 0x00E7 }, { 0x00C4, 0x0080 }, { 0x00C9, 0x0083 }, { 0x00CD, 0x00EA }, { 0x00D3, 0x00EE }, { 0x00D4, 0x00EF }, 
-	{ 0x00D5, 0x00CD }, { 0x00D6, 0x0085 }, { 0x00DA, 0x00F2 }, { 0x00DC, 0x0086 }, { 0x00DD, 0x00F8 }, { 0x00DF, 0x00A7 }, { 0x00E1, 0x0087 }, { 0x00E4, 0x008A }, 
-	{ 0x00E9, 0x008E }, { 0x00ED, 0x0092 }, { 0x00F3, 0x0097 }, { 0x00F4, 0x0099 }, { 0x00F5, 0x009B }, { 0x00F6, 0x009A }, { 0x00F7, 0x00D6 }, { 0x00FA, 0x009C }, 
-	{ 0x00FC, 0x009F }, { 0x00FD, 0x00F9 }, { 0x0100, 0x0081 }, { 0x0101, 0x0082 }, { 0x0104, 0x0084 }, { 0x0105, 0x0088 }, { 0x0106, 0x008C }, { 0x0107, 0x008D }, 
-	{ 0x010C, 0x0089 }, { 0x010D, 0x008B }, { 0x010E, 0x0091 }, { 0x010F, 0x0093 }, { 0x0112, 0x0094 }, { 0x0113, 0x0095 }, { 0x0116, 0x0096 }, { 0x0117, 0x0098 }, 
-	{ 0x0118, 0x00A2 }, { 0x0119, 0x00AB }, { 0x011A, 0x009D }, { 0x011B, 0x009E }, { 0x0122, 0x00FE }, { 0x0123, 0x00AE }, { 0x012A, 0x00B1 }, { 0x012B, 0x00B4 }, 
-	{ 0x012E, 0x00AF }, { 0x012F, 0x00B0 }, { 0x0136, 0x00B5 }, { 0x0137, 0x00FA }, { 0x0139, 0x00BD }, { 0x013A, 0x00BE }, { 0x013B, 0x00B9 }, { 0x013C, 0x00BA }, 
-	{ 0x013D, 0x00BB }, { 0x013E, 0x00BC }, { 0x0141, 0x00FC }, { 0x0142, 0x00B8 }, { 0x0143, 0x00C1 }, { 0x0144, 0x00C4 }, { 0x0145, 0x00BF }, { 0x0146, 0x00C0 }, 
-	{ 0x0147, 0x00C5 }, { 0x0148, 0x00CB }, { 0x014C, 0x00CF }, { 0x014D, 0x00D8 }, { 0x0150, 0x00CC }, { 0x0151, 0x00CE }, { 0x0154, 0x00D9 }, { 0x0155, 0x00DA }, 
-	{ 0x0156, 0x00DF }, { 0x0157, 0x00E0 }, { 0x0158, 0x00DB }, { 0x0159, 0x00DE }, { 0x015A, 0x00E5 }, { 0x015B, 0x00E6 }, { 0x0160, 0x00E1 }, { 0x0161, 0x00E4 }, 
-	{ 0x0164, 0x00E8 }, { 0x0165, 0x00E9 }, { 0x016A, 0x00ED }, { 0x016B, 0x00F0 }, { 0x016E, 0x00F1 }, { 0x016F, 0x00F3 }, { 0x0170, 0x00F4 }, { 0x0171, 0x00F5 }, 
-	{ 0x0172, 0x00F6 }, { 0x0173, 0x00F7 }, { 0x0179, 0x008F }, { 0x017A, 0x0090 }, { 0x017B, 0x00FB }, { 0x017C, 0x00FD }, { 0x017D, 0x00EB }, { 0x017E, 0x00EC }, 
-	{ 0x02C7, 0x00FF }, { 0x2013, 0x00D0 }, { 0x2014, 0x00D1 }, { 0x2018, 0x00D4 }, { 0x2019, 0x00D5 }, { 0x201A, 0x00E2 }, { 0x201C, 0x00D2 }, { 0x201D, 0x00D3 }, 
-	{ 0x201E, 0x00E3 }, { 0x2020, 0x00A0 }, { 0x2022, 0x00A5 }, { 0x2026, 0x00C9 }, { 0x2039, 0x00DC }, { 0x203A, 0x00DD }, { 0x2122, 0x00AA }, { 0x2202, 0x00B6 }, 
-	{ 0x2206, 0x00C6 }, { 0x2211, 0x00B7 }, { 0x221A, 0x00C3 }, { 0x2260, 0x00AD }, { 0x2264, 0x00B2 }, { 0x2265, 0x00B3 }, { 0x25CA, 0x00D7 }, 
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00CA },
+	{ 0x00A3, 0x00A3 }, { 0x00A7, 0x00A4 }, { 0x00A8, 0x00AC }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00C7 }, { 0x00AC, 0x00C2 }, { 0x00AE, 0x00A8 }, { 0x00B0, 0x00A1 },
+	{ 0x00B6, 0x00A6 }, { 0x00BB, 0x00C8 }, { 0x00C1, 0x00E7 }, { 0x00C4, 0x0080 }, { 0x00C9, 0x0083 }, { 0x00CD, 0x00EA }, { 0x00D3, 0x00EE }, { 0x00D4, 0x00EF },
+	{ 0x00D5, 0x00CD }, { 0x00D6, 0x0085 }, { 0x00DA, 0x00F2 }, { 0x00DC, 0x0086 }, { 0x00DD, 0x00F8 }, { 0x00DF, 0x00A7 }, { 0x00E1, 0x0087 }, { 0x00E4, 0x008A },
+	{ 0x00E9, 0x008E }, { 0x00ED, 0x0092 }, { 0x00F3, 0x0097 }, { 0x00F4, 0x0099 }, { 0x00F5, 0x009B }, { 0x00F6, 0x009A }, { 0x00F7, 0x00D6 }, { 0x00FA, 0x009C },
+	{ 0x00FC, 0x009F }, { 0x00FD, 0x00F9 }, { 0x0100, 0x0081 }, { 0x0101, 0x0082 }, { 0x0104, 0x0084 }, { 0x0105, 0x0088 }, { 0x0106, 0x008C }, { 0x0107, 0x008D },
+	{ 0x010C, 0x0089 }, { 0x010D, 0x008B }, { 0x010E, 0x0091 }, { 0x010F, 0x0093 }, { 0x0112, 0x0094 }, { 0x0113, 0x0095 }, { 0x0116, 0x0096 }, { 0x0117, 0x0098 },
+	{ 0x0118, 0x00A2 }, { 0x0119, 0x00AB }, { 0x011A, 0x009D }, { 0x011B, 0x009E }, { 0x0122, 0x00FE }, { 0x0123, 0x00AE }, { 0x012A, 0x00B1 }, { 0x012B, 0x00B4 },
+	{ 0x012E, 0x00AF }, { 0x012F, 0x00B0 }, { 0x0136, 0x00B5 }, { 0x0137, 0x00FA }, { 0x0139, 0x00BD }, { 0x013A, 0x00BE }, { 0x013B, 0x00B9 }, { 0x013C, 0x00BA },
+	{ 0x013D, 0x00BB }, { 0x013E, 0x00BC }, { 0x0141, 0x00FC }, { 0x0142, 0x00B8 }, { 0x0143, 0x00C1 }, { 0x0144, 0x00C4 }, { 0x0145, 0x00BF }, { 0x0146, 0x00C0 },
+	{ 0x0147, 0x00C5 }, { 0x0148, 0x00CB }, { 0x014C, 0x00CF }, { 0x014D, 0x00D8 }, { 0x0150, 0x00CC }, { 0x0151, 0x00CE }, { 0x0154, 0x00D9 }, { 0x0155, 0x00DA },
+	{ 0x0156, 0x00DF }, { 0x0157, 0x00E0 }, { 0x0158, 0x00DB }, { 0x0159, 0x00DE }, { 0x015A, 0x00E5 }, { 0x015B, 0x00E6 }, { 0x0160, 0x00E1 }, { 0x0161, 0x00E4 },
+	{ 0x0164, 0x00E8 }, { 0x0165, 0x00E9 }, { 0x016A, 0x00ED }, { 0x016B, 0x00F0 }, { 0x016E, 0x00F1 }, { 0x016F, 0x00F3 }, { 0x0170, 0x00F4 }, { 0x0171, 0x00F5 },
+	{ 0x0172, 0x00F6 }, { 0x0173, 0x00F7 }, { 0x0179, 0x008F }, { 0x017A, 0x0090 }, { 0x017B, 0x00FB }, { 0x017C, 0x00FD }, { 0x017D, 0x00EB }, { 0x017E, 0x00EC },
+	{ 0x02C7, 0x00FF }, { 0x2013, 0x00D0 }, { 0x2014, 0x00D1 }, { 0x2018, 0x00D4 }, { 0x2019, 0x00D5 }, { 0x201A, 0x00E2 }, { 0x201C, 0x00D2 }, { 0x201D, 0x00D3 },
+	{ 0x201E, 0x00E3 }, { 0x2020, 0x00A0 }, { 0x2022, 0x00A5 }, { 0x2026, 0x00C9 }, { 0x2039, 0x00DC }, { 0x203A, 0x00DD }, { 0x2122, 0x00AA }, { 0x2202, 0x00B6 },
+	{ 0x2206, 0x00C6 }, { 0x2211, 0x00B7 }, { 0x221A, 0x00C3 }, { 0x2260, 0x00AD }, { 0x2264, 0x00B2 }, { 0x2265, 0x00B3 }, { 0x25CA, 0x00D7 },
 };
 
 
diff --git a/Encodings/src/MacChineseSimpEncoding.cpp b/Encodings/src/MacChineseSimpEncoding.cpp
index 54b8284df..70401094e 100644
--- a/Encodings/src/MacChineseSimpEncoding.cpp
+++ b/Encodings/src/MacChineseSimpEncoding.cpp
@@ -25,1916 +25,1916 @@ const char* MacChineseSimpEncoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap MacChineseSimpEncoding::_charMap = 
+const TextEncoding::CharacterMap MacChineseSimpEncoding::_charMap =
 {
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
-	    -1, 0xF880, 0xF881, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -1,     -1,     -1, 0x00A9, 0x2122, 0x2026, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1,
+	    -1, 0xF880, 0xF881, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -1,     -1,     -1, 0x00A9, 0x2122, 0x2026,
 };
 
 
 const DoubleByteEncoding::Mapping MacChineseSimpEncoding::_mappingTable[] = {
-	{ 0xA1A1, 0x3000 }, { 0xA1A2, 0x3001 }, { 0xA1A3, 0x3002 }, { 0xA1A4, 0x00B7 }, { 0xA1A5, 0x02C9 }, { 0xA1A6, 0x02C7 }, { 0xA1A7, 0x00A8 }, { 0xA1A8, 0x3003 }, 
-	{ 0xA1A9, 0x3005 }, { 0xA1AA, 0x2014 }, { 0xA1AB, 0x301C }, { 0xA1AC, 0x2016 }, { 0xA1AD, 0x22EF }, { 0xA1AE, 0x2018 }, { 0xA1AF, 0x2019 }, { 0xA1B0, 0x201C }, 
-	{ 0xA1B1, 0x201D }, { 0xA1B2, 0x3014 }, { 0xA1B3, 0x3015 }, { 0xA1B4, 0x3008 }, { 0xA1B5, 0x3009 }, { 0xA1B6, 0x300A }, { 0xA1B7, 0x300B }, { 0xA1B8, 0x300C }, 
-	{ 0xA1B9, 0x300D }, { 0xA1BA, 0x300E }, { 0xA1BB, 0x300F }, { 0xA1BC, 0x3016 }, { 0xA1BD, 0x3017 }, { 0xA1BE, 0x3010 }, { 0xA1BF, 0x3011 }, { 0xA1C0, 0x00B1 }, 
-	{ 0xA1C1, 0x00D7 }, { 0xA1C2, 0x00F7 }, { 0xA1C3, 0x2236 }, { 0xA1C4, 0x2227 }, { 0xA1C5, 0x2228 }, { 0xA1C6, 0x2211 }, { 0xA1C7, 0x220F }, { 0xA1C8, 0x222A }, 
-	{ 0xA1C9, 0x2229 }, { 0xA1CA, 0x2208 }, { 0xA1CB, 0x2237 }, { 0xA1CC, 0x221A }, { 0xA1CD, 0x22A5 }, { 0xA1CE, 0x2225 }, { 0xA1CF, 0x2220 }, { 0xA1D0, 0x2312 }, 
-	{ 0xA1D1, 0x2299 }, { 0xA1D2, 0x222B }, { 0xA1D3, 0x222E }, { 0xA1D4, 0x2261 }, { 0xA1D5, 0x224C }, { 0xA1D6, 0x2248 }, { 0xA1D7, 0x223D }, { 0xA1D8, 0x221D }, 
-	{ 0xA1D9, 0x2260 }, { 0xA1DA, 0x226E }, { 0xA1DB, 0x226F }, { 0xA1DC, 0x2264 }, { 0xA1DD, 0x2265 }, { 0xA1DE, 0x221E }, { 0xA1DF, 0x2235 }, { 0xA1E0, 0x2234 }, 
-	{ 0xA1E1, 0x2642 }, { 0xA1E2, 0x2640 }, { 0xA1E3, 0x00B0 }, { 0xA1E4, 0x2032 }, { 0xA1E5, 0x2033 }, { 0xA1E6, 0x2103 }, { 0xA1E7, 0xFF04 }, { 0xA1E8, 0x00A4 }, 
-	{ 0xA1E9, 0x00A2 }, { 0xA1EA, 0x00A3 }, { 0xA1EB, 0x2030 }, { 0xA1EC, 0x00A7 }, { 0xA1ED, 0x2116 }, { 0xA1EE, 0x2606 }, { 0xA1EF, 0x2605 }, { 0xA1F0, 0x25CB }, 
-	{ 0xA1F1, 0x25CF }, { 0xA1F2, 0x25CE }, { 0xA1F3, 0x25C7 }, { 0xA1F4, 0x25C6 }, { 0xA1F5, 0x25A1 }, { 0xA1F6, 0x25A0 }, { 0xA1F7, 0x25B3 }, { 0xA1F8, 0x25B2 }, 
-	{ 0xA1F9, 0x203B }, { 0xA1FA, 0x2192 }, { 0xA1FB, 0x2190 }, { 0xA1FC, 0x2191 }, { 0xA1FD, 0x2193 }, { 0xA1FE, 0x3013 }, { 0xA2B1, 0x2488 }, { 0xA2B2, 0x2489 }, 
-	{ 0xA2B3, 0x248A }, { 0xA2B4, 0x248B }, { 0xA2B5, 0x248C }, { 0xA2B6, 0x248D }, { 0xA2B7, 0x248E }, { 0xA2B8, 0x248F }, { 0xA2B9, 0x2490 }, { 0xA2BA, 0x2491 }, 
-	{ 0xA2BB, 0x2492 }, { 0xA2BC, 0x2493 }, { 0xA2BD, 0x2494 }, { 0xA2BE, 0x2495 }, { 0xA2BF, 0x2496 }, { 0xA2C0, 0x2497 }, { 0xA2C1, 0x2498 }, { 0xA2C2, 0x2499 }, 
-	{ 0xA2C3, 0x249A }, { 0xA2C4, 0x249B }, { 0xA2C5, 0x2474 }, { 0xA2C6, 0x2475 }, { 0xA2C7, 0x2476 }, { 0xA2C8, 0x2477 }, { 0xA2C9, 0x2478 }, { 0xA2CA, 0x2479 }, 
-	{ 0xA2CB, 0x247A }, { 0xA2CC, 0x247B }, { 0xA2CD, 0x247C }, { 0xA2CE, 0x247D }, { 0xA2CF, 0x247E }, { 0xA2D0, 0x247F }, { 0xA2D1, 0x2480 }, { 0xA2D2, 0x2481 }, 
-	{ 0xA2D3, 0x2482 }, { 0xA2D4, 0x2483 }, { 0xA2D5, 0x2484 }, { 0xA2D6, 0x2485 }, { 0xA2D7, 0x2486 }, { 0xA2D8, 0x2487 }, { 0xA2D9, 0x2460 }, { 0xA2DA, 0x2461 }, 
-	{ 0xA2DB, 0x2462 }, { 0xA2DC, 0x2463 }, { 0xA2DD, 0x2464 }, { 0xA2DE, 0x2465 }, { 0xA2DF, 0x2466 }, { 0xA2E0, 0x2467 }, { 0xA2E1, 0x2468 }, { 0xA2E2, 0x2469 }, 
-	{ 0xA2E5, 0x3220 }, { 0xA2E6, 0x3221 }, { 0xA2E7, 0x3222 }, { 0xA2E8, 0x3223 }, { 0xA2E9, 0x3224 }, { 0xA2EA, 0x3225 }, { 0xA2EB, 0x3226 }, { 0xA2EC, 0x3227 }, 
-	{ 0xA2ED, 0x3228 }, { 0xA2EE, 0x3229 }, { 0xA2F1, 0x2160 }, { 0xA2F2, 0x2161 }, { 0xA2F3, 0x2162 }, { 0xA2F4, 0x2163 }, { 0xA2F5, 0x2164 }, { 0xA2F6, 0x2165 }, 
-	{ 0xA2F7, 0x2166 }, { 0xA2F8, 0x2167 }, { 0xA2F9, 0x2168 }, { 0xA2FA, 0x2169 }, { 0xA2FB, 0x216A }, { 0xA2FC, 0x216B }, { 0xA3A1, 0xFF01 }, { 0xA3A2, 0xFF02 }, 
-	{ 0xA3A3, 0xFF03 }, { 0xA3A4, 0x00A5 }, { 0xA3A5, 0xFF05 }, { 0xA3A6, 0xFF06 }, { 0xA3A7, 0xFF07 }, { 0xA3A8, 0xFF08 }, { 0xA3A9, 0xFF09 }, { 0xA3AA, 0xFF0A }, 
-	{ 0xA3AB, 0xFF0B }, { 0xA3AC, 0xFF0C }, { 0xA3AD, 0xFF0D }, { 0xA3AE, 0xFF0E }, { 0xA3AF, 0xFF0F }, { 0xA3B0, 0xFF10 }, { 0xA3B1, 0xFF11 }, { 0xA3B2, 0xFF12 }, 
-	{ 0xA3B3, 0xFF13 }, { 0xA3B4, 0xFF14 }, { 0xA3B5, 0xFF15 }, { 0xA3B6, 0xFF16 }, { 0xA3B7, 0xFF17 }, { 0xA3B8, 0xFF18 }, { 0xA3B9, 0xFF19 }, { 0xA3BA, 0xFF1A }, 
-	{ 0xA3BB, 0xFF1B }, { 0xA3BC, 0xFF1C }, { 0xA3BD, 0xFF1D }, { 0xA3BE, 0xFF1E }, { 0xA3BF, 0xFF1F }, { 0xA3C0, 0xFF20 }, { 0xA3C1, 0xFF21 }, { 0xA3C2, 0xFF22 }, 
-	{ 0xA3C3, 0xFF23 }, { 0xA3C4, 0xFF24 }, { 0xA3C5, 0xFF25 }, { 0xA3C6, 0xFF26 }, { 0xA3C7, 0xFF27 }, { 0xA3C8, 0xFF28 }, { 0xA3C9, 0xFF29 }, { 0xA3CA, 0xFF2A }, 
-	{ 0xA3CB, 0xFF2B }, { 0xA3CC, 0xFF2C }, { 0xA3CD, 0xFF2D }, { 0xA3CE, 0xFF2E }, { 0xA3CF, 0xFF2F }, { 0xA3D0, 0xFF30 }, { 0xA3D1, 0xFF31 }, { 0xA3D2, 0xFF32 }, 
-	{ 0xA3D3, 0xFF33 }, { 0xA3D4, 0xFF34 }, { 0xA3D5, 0xFF35 }, { 0xA3D6, 0xFF36 }, { 0xA3D7, 0xFF37 }, { 0xA3D8, 0xFF38 }, { 0xA3D9, 0xFF39 }, { 0xA3DA, 0xFF3A }, 
-	{ 0xA3DB, 0xFF3B }, { 0xA3DC, 0xFF3C }, { 0xA3DD, 0xFF3D }, { 0xA3DE, 0xFF3E }, { 0xA3DF, 0xFF3F }, { 0xA3E0, 0xFF40 }, { 0xA3E1, 0xFF41 }, { 0xA3E2, 0xFF42 }, 
-	{ 0xA3E3, 0xFF43 }, { 0xA3E4, 0xFF44 }, { 0xA3E5, 0xFF45 }, { 0xA3E6, 0xFF46 }, { 0xA3E7, 0xFF47 }, { 0xA3E8, 0xFF48 }, { 0xA3E9, 0xFF49 }, { 0xA3EA, 0xFF4A }, 
-	{ 0xA3EB, 0xFF4B }, { 0xA3EC, 0xFF4C }, { 0xA3ED, 0xFF4D }, { 0xA3EE, 0xFF4E }, { 0xA3EF, 0xFF4F }, { 0xA3F0, 0xFF50 }, { 0xA3F1, 0xFF51 }, { 0xA3F2, 0xFF52 }, 
-	{ 0xA3F3, 0xFF53 }, { 0xA3F4, 0xFF54 }, { 0xA3F5, 0xFF55 }, { 0xA3F6, 0xFF56 }, { 0xA3F7, 0xFF57 }, { 0xA3F8, 0xFF58 }, { 0xA3F9, 0xFF59 }, { 0xA3FA, 0xFF5A }, 
-	{ 0xA3FB, 0xFF5B }, { 0xA3FC, 0xFF5C }, { 0xA3FD, 0xFF5D }, { 0xA3FE, 0x203E }, { 0xA4A1, 0x3041 }, { 0xA4A2, 0x3042 }, { 0xA4A3, 0x3043 }, { 0xA4A4, 0x3044 }, 
-	{ 0xA4A5, 0x3045 }, { 0xA4A6, 0x3046 }, { 0xA4A7, 0x3047 }, { 0xA4A8, 0x3048 }, { 0xA4A9, 0x3049 }, { 0xA4AA, 0x304A }, { 0xA4AB, 0x304B }, { 0xA4AC, 0x304C }, 
-	{ 0xA4AD, 0x304D }, { 0xA4AE, 0x304E }, { 0xA4AF, 0x304F }, { 0xA4B0, 0x3050 }, { 0xA4B1, 0x3051 }, { 0xA4B2, 0x3052 }, { 0xA4B3, 0x3053 }, { 0xA4B4, 0x3054 }, 
-	{ 0xA4B5, 0x3055 }, { 0xA4B6, 0x3056 }, { 0xA4B7, 0x3057 }, { 0xA4B8, 0x3058 }, { 0xA4B9, 0x3059 }, { 0xA4BA, 0x305A }, { 0xA4BB, 0x305B }, { 0xA4BC, 0x305C }, 
-	{ 0xA4BD, 0x305D }, { 0xA4BE, 0x305E }, { 0xA4BF, 0x305F }, { 0xA4C0, 0x3060 }, { 0xA4C1, 0x3061 }, { 0xA4C2, 0x3062 }, { 0xA4C3, 0x3063 }, { 0xA4C4, 0x3064 }, 
-	{ 0xA4C5, 0x3065 }, { 0xA4C6, 0x3066 }, { 0xA4C7, 0x3067 }, { 0xA4C8, 0x3068 }, { 0xA4C9, 0x3069 }, { 0xA4CA, 0x306A }, { 0xA4CB, 0x306B }, { 0xA4CC, 0x306C }, 
-	{ 0xA4CD, 0x306D }, { 0xA4CE, 0x306E }, { 0xA4CF, 0x306F }, { 0xA4D0, 0x3070 }, { 0xA4D1, 0x3071 }, { 0xA4D2, 0x3072 }, { 0xA4D3, 0x3073 }, { 0xA4D4, 0x3074 }, 
-	{ 0xA4D5, 0x3075 }, { 0xA4D6, 0x3076 }, { 0xA4D7, 0x3077 }, { 0xA4D8, 0x3078 }, { 0xA4D9, 0x3079 }, { 0xA4DA, 0x307A }, { 0xA4DB, 0x307B }, { 0xA4DC, 0x307C }, 
-	{ 0xA4DD, 0x307D }, { 0xA4DE, 0x307E }, { 0xA4DF, 0x307F }, { 0xA4E0, 0x3080 }, { 0xA4E1, 0x3081 }, { 0xA4E2, 0x3082 }, { 0xA4E3, 0x3083 }, { 0xA4E4, 0x3084 }, 
-	{ 0xA4E5, 0x3085 }, { 0xA4E6, 0x3086 }, { 0xA4E7, 0x3087 }, { 0xA4E8, 0x3088 }, { 0xA4E9, 0x3089 }, { 0xA4EA, 0x308A }, { 0xA4EB, 0x308B }, { 0xA4EC, 0x308C }, 
-	{ 0xA4ED, 0x308D }, { 0xA4EE, 0x308E }, { 0xA4EF, 0x308F }, { 0xA4F0, 0x3090 }, { 0xA4F1, 0x3091 }, { 0xA4F2, 0x3092 }, { 0xA4F3, 0x3093 }, { 0xA5A1, 0x30A1 }, 
-	{ 0xA5A2, 0x30A2 }, { 0xA5A3, 0x30A3 }, { 0xA5A4, 0x30A4 }, { 0xA5A5, 0x30A5 }, { 0xA5A6, 0x30A6 }, { 0xA5A7, 0x30A7 }, { 0xA5A8, 0x30A8 }, { 0xA5A9, 0x30A9 }, 
-	{ 0xA5AA, 0x30AA }, { 0xA5AB, 0x30AB }, { 0xA5AC, 0x30AC }, { 0xA5AD, 0x30AD }, { 0xA5AE, 0x30AE }, { 0xA5AF, 0x30AF }, { 0xA5B0, 0x30B0 }, { 0xA5B1, 0x30B1 }, 
-	{ 0xA5B2, 0x30B2 }, { 0xA5B3, 0x30B3 }, { 0xA5B4, 0x30B4 }, { 0xA5B5, 0x30B5 }, { 0xA5B6, 0x30B6 }, { 0xA5B7, 0x30B7 }, { 0xA5B8, 0x30B8 }, { 0xA5B9, 0x30B9 }, 
-	{ 0xA5BA, 0x30BA }, { 0xA5BB, 0x30BB }, { 0xA5BC, 0x30BC }, { 0xA5BD, 0x30BD }, { 0xA5BE, 0x30BE }, { 0xA5BF, 0x30BF }, { 0xA5C0, 0x30C0 }, { 0xA5C1, 0x30C1 }, 
-	{ 0xA5C2, 0x30C2 }, { 0xA5C3, 0x30C3 }, { 0xA5C4, 0x30C4 }, { 0xA5C5, 0x30C5 }, { 0xA5C6, 0x30C6 }, { 0xA5C7, 0x30C7 }, { 0xA5C8, 0x30C8 }, { 0xA5C9, 0x30C9 }, 
-	{ 0xA5CA, 0x30CA }, { 0xA5CB, 0x30CB }, { 0xA5CC, 0x30CC }, { 0xA5CD, 0x30CD }, { 0xA5CE, 0x30CE }, { 0xA5CF, 0x30CF }, { 0xA5D0, 0x30D0 }, { 0xA5D1, 0x30D1 }, 
-	{ 0xA5D2, 0x30D2 }, { 0xA5D3, 0x30D3 }, { 0xA5D4, 0x30D4 }, { 0xA5D5, 0x30D5 }, { 0xA5D6, 0x30D6 }, { 0xA5D7, 0x30D7 }, { 0xA5D8, 0x30D8 }, { 0xA5D9, 0x30D9 }, 
-	{ 0xA5DA, 0x30DA }, { 0xA5DB, 0x30DB }, { 0xA5DC, 0x30DC }, { 0xA5DD, 0x30DD }, { 0xA5DE, 0x30DE }, { 0xA5DF, 0x30DF }, { 0xA5E0, 0x30E0 }, { 0xA5E1, 0x30E1 }, 
-	{ 0xA5E2, 0x30E2 }, { 0xA5E3, 0x30E3 }, { 0xA5E4, 0x30E4 }, { 0xA5E5, 0x30E5 }, { 0xA5E6, 0x30E6 }, { 0xA5E7, 0x30E7 }, { 0xA5E8, 0x30E8 }, { 0xA5E9, 0x30E9 }, 
-	{ 0xA5EA, 0x30EA }, { 0xA5EB, 0x30EB }, { 0xA5EC, 0x30EC }, { 0xA5ED, 0x30ED }, { 0xA5EE, 0x30EE }, { 0xA5EF, 0x30EF }, { 0xA5F0, 0x30F0 }, { 0xA5F1, 0x30F1 }, 
-	{ 0xA5F2, 0x30F2 }, { 0xA5F3, 0x30F3 }, { 0xA5F4, 0x30F4 }, { 0xA5F5, 0x30F5 }, { 0xA5F6, 0x30F6 }, { 0xA6A1, 0x0391 }, { 0xA6A2, 0x0392 }, { 0xA6A3, 0x0393 }, 
-	{ 0xA6A4, 0x0394 }, { 0xA6A5, 0x0395 }, { 0xA6A6, 0x0396 }, { 0xA6A7, 0x0397 }, { 0xA6A8, 0x0398 }, { 0xA6A9, 0x0399 }, { 0xA6AA, 0x039A }, { 0xA6AB, 0x039B }, 
-	{ 0xA6AC, 0x039C }, { 0xA6AD, 0x039D }, { 0xA6AE, 0x039E }, { 0xA6AF, 0x039F }, { 0xA6B0, 0x03A0 }, { 0xA6B1, 0x03A1 }, { 0xA6B2, 0x03A3 }, { 0xA6B3, 0x03A4 }, 
-	{ 0xA6B4, 0x03A5 }, { 0xA6B5, 0x03A6 }, { 0xA6B6, 0x03A7 }, { 0xA6B7, 0x03A8 }, { 0xA6B8, 0x03A9 }, { 0xA6C1, 0x03B1 }, { 0xA6C2, 0x03B2 }, { 0xA6C3, 0x03B3 }, 
-	{ 0xA6C4, 0x03B4 }, { 0xA6C5, 0x03B5 }, { 0xA6C6, 0x03B6 }, { 0xA6C7, 0x03B7 }, { 0xA6C8, 0x03B8 }, { 0xA6C9, 0x03B9 }, { 0xA6CA, 0x03BA }, { 0xA6CB, 0x03BB }, 
-	{ 0xA6CC, 0x03BC }, { 0xA6CD, 0x03BD }, { 0xA6CE, 0x03BE }, { 0xA6CF, 0x03BF }, { 0xA6D0, 0x03C0 }, { 0xA6D1, 0x03C1 }, { 0xA6D2, 0x03C3 }, { 0xA6D3, 0x03C4 }, 
-	{ 0xA6D4, 0x03C5 }, { 0xA6D5, 0x03C6 }, { 0xA6D6, 0x03C7 }, { 0xA6D7, 0x03C8 }, { 0xA6D8, 0x03C9 }, { 0xA6E0, 0xFE35 }, { 0xA6E1, 0xFE36 }, { 0xA6E2, 0xFE39 }, 
-	{ 0xA6E3, 0xFE3A }, { 0xA6E4, 0xFE3F }, { 0xA6E5, 0xFE40 }, { 0xA6E6, 0xFE3D }, { 0xA6E7, 0xFE3E }, { 0xA6E8, 0xFE41 }, { 0xA6E9, 0xFE42 }, { 0xA6EA, 0xFE43 }, 
-	{ 0xA6EB, 0xFE44 }, { 0xA6EE, 0xFE3B }, { 0xA6EF, 0xFE3C }, { 0xA6F0, 0xFE37 }, { 0xA6F1, 0xFE38 }, { 0xA6F2, 0xFE31 }, { 0xA6F4, 0xFE33 }, { 0xA6F5, 0xFE34 }, 
-	{ 0xA7A1, 0x0410 }, { 0xA7A2, 0x0411 }, { 0xA7A3, 0x0412 }, { 0xA7A4, 0x0413 }, { 0xA7A5, 0x0414 }, { 0xA7A6, 0x0415 }, { 0xA7A7, 0x0401 }, { 0xA7A8, 0x0416 }, 
-	{ 0xA7A9, 0x0417 }, { 0xA7AA, 0x0418 }, { 0xA7AB, 0x0419 }, { 0xA7AC, 0x041A }, { 0xA7AD, 0x041B }, { 0xA7AE, 0x041C }, { 0xA7AF, 0x041D }, { 0xA7B0, 0x041E }, 
-	{ 0xA7B1, 0x041F }, { 0xA7B2, 0x0420 }, { 0xA7B3, 0x0421 }, { 0xA7B4, 0x0422 }, { 0xA7B5, 0x0423 }, { 0xA7B6, 0x0424 }, { 0xA7B7, 0x0425 }, { 0xA7B8, 0x0426 }, 
-	{ 0xA7B9, 0x0427 }, { 0xA7BA, 0x0428 }, { 0xA7BB, 0x0429 }, { 0xA7BC, 0x042A }, { 0xA7BD, 0x042B }, { 0xA7BE, 0x042C }, { 0xA7BF, 0x042D }, { 0xA7C0, 0x042E }, 
-	{ 0xA7C1, 0x042F }, { 0xA7D1, 0x0430 }, { 0xA7D2, 0x0431 }, { 0xA7D3, 0x0432 }, { 0xA7D4, 0x0433 }, { 0xA7D5, 0x0434 }, { 0xA7D6, 0x0435 }, { 0xA7D7, 0x0451 }, 
-	{ 0xA7D8, 0x0436 }, { 0xA7D9, 0x0437 }, { 0xA7DA, 0x0438 }, { 0xA7DB, 0x0439 }, { 0xA7DC, 0x043A }, { 0xA7DD, 0x043B }, { 0xA7DE, 0x043C }, { 0xA7DF, 0x043D }, 
-	{ 0xA7E0, 0x043E }, { 0xA7E1, 0x043F }, { 0xA7E2, 0x0440 }, { 0xA7E3, 0x0441 }, { 0xA7E4, 0x0442 }, { 0xA7E5, 0x0443 }, { 0xA7E6, 0x0444 }, { 0xA7E7, 0x0445 }, 
-	{ 0xA7E8, 0x0446 }, { 0xA7E9, 0x0447 }, { 0xA7EA, 0x0448 }, { 0xA7EB, 0x0449 }, { 0xA7EC, 0x044A }, { 0xA7ED, 0x044B }, { 0xA7EE, 0x044C }, { 0xA7EF, 0x044D }, 
-	{ 0xA7F0, 0x044E }, { 0xA7F1, 0x044F }, { 0xA8A1, 0x0101 }, { 0xA8A2, 0x00E1 }, { 0xA8A3, 0x01CE }, { 0xA8A4, 0x00E0 }, { 0xA8A5, 0x0113 }, { 0xA8A6, 0x00E9 }, 
-	{ 0xA8A7, 0x011B }, { 0xA8A8, 0x00E8 }, { 0xA8A9, 0x012B }, { 0xA8AA, 0x00ED }, { 0xA8AB, 0x01D0 }, { 0xA8AC, 0x00EC }, { 0xA8AD, 0x014D }, { 0xA8AE, 0x00F3 }, 
-	{ 0xA8AF, 0x01D2 }, { 0xA8B0, 0x00F2 }, { 0xA8B1, 0x016B }, { 0xA8B2, 0x00FA }, { 0xA8B3, 0x01D4 }, { 0xA8B4, 0x00F9 }, { 0xA8B5, 0x01D6 }, { 0xA8B6, 0x01D8 }, 
-	{ 0xA8B7, 0x01DA }, { 0xA8B8, 0x01DC }, { 0xA8B9, 0x00FC }, { 0xA8BA, 0x00EA }, { 0xA8BB, 0x0251 }, { 0xA8BC, 0x1E3F }, { 0xA8BD, 0x0144 }, { 0xA8BE, 0x0148 }, 
-	{ 0xA8BF, 0x01F9 }, { 0xA8C0, 0x0261 }, { 0xA8C5, 0x3105 }, { 0xA8C6, 0x3106 }, { 0xA8C7, 0x3107 }, { 0xA8C8, 0x3108 }, { 0xA8C9, 0x3109 }, { 0xA8CA, 0x310A }, 
-	{ 0xA8CB, 0x310B }, { 0xA8CC, 0x310C }, { 0xA8CD, 0x310D }, { 0xA8CE, 0x310E }, { 0xA8CF, 0x310F }, { 0xA8D0, 0x3110 }, { 0xA8D1, 0x3111 }, { 0xA8D2, 0x3112 }, 
-	{ 0xA8D3, 0x3113 }, { 0xA8D4, 0x3114 }, { 0xA8D5, 0x3115 }, { 0xA8D6, 0x3116 }, { 0xA8D7, 0x3117 }, { 0xA8D8, 0x3118 }, { 0xA8D9, 0x3119 }, { 0xA8DA, 0x311A }, 
-	{ 0xA8DB, 0x311B }, { 0xA8DC, 0x311C }, { 0xA8DD, 0x311D }, { 0xA8DE, 0x311E }, { 0xA8DF, 0x311F }, { 0xA8E0, 0x3120 }, { 0xA8E1, 0x3121 }, { 0xA8E2, 0x3122 }, 
-	{ 0xA8E3, 0x3123 }, { 0xA8E4, 0x3124 }, { 0xA8E5, 0x3125 }, { 0xA8E6, 0x3126 }, { 0xA8E7, 0x3127 }, { 0xA8E8, 0x3128 }, { 0xA8E9, 0x3129 }, { 0xA9A4, 0x2500 }, 
-	{ 0xA9A5, 0x2501 }, { 0xA9A6, 0x2502 }, { 0xA9A7, 0x2503 }, { 0xA9A8, 0x2504 }, { 0xA9A9, 0x2505 }, { 0xA9AA, 0x2506 }, { 0xA9AB, 0x2507 }, { 0xA9AC, 0x2508 }, 
-	{ 0xA9AD, 0x2509 }, { 0xA9AE, 0x250A }, { 0xA9AF, 0x250B }, { 0xA9B0, 0x250C }, { 0xA9B1, 0x250D }, { 0xA9B2, 0x250E }, { 0xA9B3, 0x250F }, { 0xA9B4, 0x2510 }, 
-	{ 0xA9B5, 0x2511 }, { 0xA9B6, 0x2512 }, { 0xA9B7, 0x2513 }, { 0xA9B8, 0x2514 }, { 0xA9B9, 0x2515 }, { 0xA9BA, 0x2516 }, { 0xA9BB, 0x2517 }, { 0xA9BC, 0x2518 }, 
-	{ 0xA9BD, 0x2519 }, { 0xA9BE, 0x251A }, { 0xA9BF, 0x251B }, { 0xA9C0, 0x251C }, { 0xA9C1, 0x251D }, { 0xA9C2, 0x251E }, { 0xA9C3, 0x251F }, { 0xA9C4, 0x2520 }, 
-	{ 0xA9C5, 0x2521 }, { 0xA9C6, 0x2522 }, { 0xA9C7, 0x2523 }, { 0xA9C8, 0x2524 }, { 0xA9C9, 0x2525 }, { 0xA9CA, 0x2526 }, { 0xA9CB, 0x2527 }, { 0xA9CC, 0x2528 }, 
-	{ 0xA9CD, 0x2529 }, { 0xA9CE, 0x252A }, { 0xA9CF, 0x252B }, { 0xA9D0, 0x252C }, { 0xA9D1, 0x252D }, { 0xA9D2, 0x252E }, { 0xA9D3, 0x252F }, { 0xA9D4, 0x2530 }, 
-	{ 0xA9D5, 0x2531 }, { 0xA9D6, 0x2532 }, { 0xA9D7, 0x2533 }, { 0xA9D8, 0x2534 }, { 0xA9D9, 0x2535 }, { 0xA9DA, 0x2536 }, { 0xA9DB, 0x2537 }, { 0xA9DC, 0x2538 }, 
-	{ 0xA9DD, 0x2539 }, { 0xA9DE, 0x253A }, { 0xA9DF, 0x253B }, { 0xA9E0, 0x253C }, { 0xA9E1, 0x253D }, { 0xA9E2, 0x253E }, { 0xA9E3, 0x253F }, { 0xA9E4, 0x2540 }, 
-	{ 0xA9E5, 0x2541 }, { 0xA9E6, 0x2542 }, { 0xA9E7, 0x2543 }, { 0xA9E8, 0x2544 }, { 0xA9E9, 0x2545 }, { 0xA9EA, 0x2546 }, { 0xA9EB, 0x2547 }, { 0xA9EC, 0x2548 }, 
-	{ 0xA9ED, 0x2549 }, { 0xA9EE, 0x254A }, { 0xA9EF, 0x254B }, { 0xB0A1, 0x554A }, { 0xB0A2, 0x963F }, { 0xB0A3, 0x57C3 }, { 0xB0A4, 0x6328 }, { 0xB0A5, 0x54CE }, 
-	{ 0xB0A6, 0x5509 }, { 0xB0A7, 0x54C0 }, { 0xB0A8, 0x7691 }, { 0xB0A9, 0x764C }, { 0xB0AA, 0x853C }, { 0xB0AB, 0x77EE }, { 0xB0AC, 0x827E }, { 0xB0AD, 0x788D }, 
-	{ 0xB0AE, 0x7231 }, { 0xB0AF, 0x9698 }, { 0xB0B0, 0x978D }, { 0xB0B1, 0x6C28 }, { 0xB0B2, 0x5B89 }, { 0xB0B3, 0x4FFA }, { 0xB0B4, 0x6309 }, { 0xB0B5, 0x6697 }, 
-	{ 0xB0B6, 0x5CB8 }, { 0xB0B7, 0x80FA }, { 0xB0B8, 0x6848 }, { 0xB0B9, 0x80AE }, { 0xB0BA, 0x6602 }, { 0xB0BB, 0x76CE }, { 0xB0BC, 0x51F9 }, { 0xB0BD, 0x6556 }, 
-	{ 0xB0BE, 0x71AC }, { 0xB0BF, 0x7FF1 }, { 0xB0C0, 0x8884 }, { 0xB0C1, 0x50B2 }, { 0xB0C2, 0x5965 }, { 0xB0C3, 0x61CA }, { 0xB0C4, 0x6FB3 }, { 0xB0C5, 0x82AD }, 
-	{ 0xB0C6, 0x634C }, { 0xB0C7, 0x6252 }, { 0xB0C8, 0x53ED }, { 0xB0C9, 0x5427 }, { 0xB0CA, 0x7B06 }, { 0xB0CB, 0x516B }, { 0xB0CC, 0x75A4 }, { 0xB0CD, 0x5DF4 }, 
-	{ 0xB0CE, 0x62D4 }, { 0xB0CF, 0x8DCB }, { 0xB0D0, 0x9776 }, { 0xB0D1, 0x628A }, { 0xB0D2, 0x8019 }, { 0xB0D3, 0x575D }, { 0xB0D4, 0x9738 }, { 0xB0D5, 0x7F62 }, 
-	{ 0xB0D6, 0x7238 }, { 0xB0D7, 0x767D }, { 0xB0D8, 0x67CF }, { 0xB0D9, 0x767E }, { 0xB0DA, 0x6446 }, { 0xB0DB, 0x4F70 }, { 0xB0DC, 0x8D25 }, { 0xB0DD, 0x62DC }, 
-	{ 0xB0DE, 0x7A17 }, { 0xB0DF, 0x6591 }, { 0xB0E0, 0x73ED }, { 0xB0E1, 0x642C }, { 0xB0E2, 0x6273 }, { 0xB0E3, 0x822C }, { 0xB0E4, 0x9881 }, { 0xB0E5, 0x677F }, 
-	{ 0xB0E6, 0x7248 }, { 0xB0E7, 0x626E }, { 0xB0E8, 0x62CC }, { 0xB0E9, 0x4F34 }, { 0xB0EA, 0x74E3 }, { 0xB0EB, 0x534A }, { 0xB0EC, 0x529E }, { 0xB0ED, 0x7ECA }, 
-	{ 0xB0EE, 0x90A6 }, { 0xB0EF, 0x5E2E }, { 0xB0F0, 0x6886 }, { 0xB0F1, 0x699C }, { 0xB0F2, 0x8180 }, { 0xB0F3, 0x7ED1 }, { 0xB0F4, 0x68D2 }, { 0xB0F5, 0x78C5 }, 
-	{ 0xB0F6, 0x868C }, { 0xB0F7, 0x9551 }, { 0xB0F8, 0x508D }, { 0xB0F9, 0x8C24 }, { 0xB0FA, 0x82DE }, { 0xB0FB, 0x80DE }, { 0xB0FC, 0x5305 }, { 0xB0FD, 0x8912 }, 
-	{ 0xB0FE, 0x5265 }, { 0xB1A1, 0x8584 }, { 0xB1A2, 0x96F9 }, { 0xB1A3, 0x4FDD }, { 0xB1A4, 0x5821 }, { 0xB1A5, 0x9971 }, { 0xB1A6, 0x5B9D }, { 0xB1A7, 0x62B1 }, 
-	{ 0xB1A8, 0x62A5 }, { 0xB1A9, 0x66B4 }, { 0xB1AA, 0x8C79 }, { 0xB1AB, 0x9C8D }, { 0xB1AC, 0x7206 }, { 0xB1AD, 0x676F }, { 0xB1AE, 0x7891 }, { 0xB1AF, 0x60B2 }, 
-	{ 0xB1B0, 0x5351 }, { 0xB1B1, 0x5317 }, { 0xB1B2, 0x8F88 }, { 0xB1B3, 0x80CC }, { 0xB1B4, 0x8D1D }, { 0xB1B5, 0x94A1 }, { 0xB1B6, 0x500D }, { 0xB1B7, 0x72C8 }, 
-	{ 0xB1B8, 0x5907 }, { 0xB1B9, 0x60EB }, { 0xB1BA, 0x7119 }, { 0xB1BB, 0x88AB }, { 0xB1BC, 0x5954 }, { 0xB1BD, 0x82EF }, { 0xB1BE, 0x672C }, { 0xB1BF, 0x7B28 }, 
-	{ 0xB1C0, 0x5D29 }, { 0xB1C1, 0x7EF7 }, { 0xB1C2, 0x752D }, { 0xB1C3, 0x6CF5 }, { 0xB1C4, 0x8E66 }, { 0xB1C5, 0x8FF8 }, { 0xB1C6, 0x903C }, { 0xB1C7, 0x9F3B }, 
-	{ 0xB1C8, 0x6BD4 }, { 0xB1C9, 0x9119 }, { 0xB1CA, 0x7B14 }, { 0xB1CB, 0x5F7C }, { 0xB1CC, 0x78A7 }, { 0xB1CD, 0x84D6 }, { 0xB1CE, 0x853D }, { 0xB1CF, 0x6BD5 }, 
-	{ 0xB1D0, 0x6BD9 }, { 0xB1D1, 0x6BD6 }, { 0xB1D2, 0x5E01 }, { 0xB1D3, 0x5E87 }, { 0xB1D4, 0x75F9 }, { 0xB1D5, 0x95ED }, { 0xB1D6, 0x655D }, { 0xB1D7, 0x5F0A }, 
-	{ 0xB1D8, 0x5FC5 }, { 0xB1D9, 0x8F9F }, { 0xB1DA, 0x58C1 }, { 0xB1DB, 0x81C2 }, { 0xB1DC, 0x907F }, { 0xB1DD, 0x965B }, { 0xB1DE, 0x97AD }, { 0xB1DF, 0x8FB9 }, 
-	{ 0xB1E0, 0x7F16 }, { 0xB1E1, 0x8D2C }, { 0xB1E2, 0x6241 }, { 0xB1E3, 0x4FBF }, { 0xB1E4, 0x53D8 }, { 0xB1E5, 0x535E }, { 0xB1E6, 0x8FA8 }, { 0xB1E7, 0x8FA9 }, 
-	{ 0xB1E8, 0x8FAB }, { 0xB1E9, 0x904D }, { 0xB1EA, 0x6807 }, { 0xB1EB, 0x5F6A }, { 0xB1EC, 0x8198 }, { 0xB1ED, 0x8868 }, { 0xB1EE, 0x9CD6 }, { 0xB1EF, 0x618B }, 
-	{ 0xB1F0, 0x522B }, { 0xB1F1, 0x762A }, { 0xB1F2, 0x5F6C }, { 0xB1F3, 0x658C }, { 0xB1F4, 0x6FD2 }, { 0xB1F5, 0x6EE8 }, { 0xB1F6, 0x5BBE }, { 0xB1F7, 0x6448 }, 
-	{ 0xB1F8, 0x5175 }, { 0xB1F9, 0x51B0 }, { 0xB1FA, 0x67C4 }, { 0xB1FB, 0x4E19 }, { 0xB1FC, 0x79C9 }, { 0xB1FD, 0x997C }, { 0xB1FE, 0x70B3 }, { 0xB2A1, 0x75C5 }, 
-	{ 0xB2A2, 0x5E76 }, { 0xB2A3, 0x73BB }, { 0xB2A4, 0x83E0 }, { 0xB2A5, 0x64AD }, { 0xB2A6, 0x62E8 }, { 0xB2A7, 0x94B5 }, { 0xB2A8, 0x6CE2 }, { 0xB2A9, 0x535A }, 
-	{ 0xB2AA, 0x52C3 }, { 0xB2AB, 0x640F }, { 0xB2AC, 0x94C2 }, { 0xB2AD, 0x7B94 }, { 0xB2AE, 0x4F2F }, { 0xB2AF, 0x5E1B }, { 0xB2B0, 0x8236 }, { 0xB2B1, 0x8116 }, 
-	{ 0xB2B2, 0x818A }, { 0xB2B3, 0x6E24 }, { 0xB2B4, 0x6CCA }, { 0xB2B5, 0x9A73 }, { 0xB2B6, 0x6355 }, { 0xB2B7, 0x535C }, { 0xB2B8, 0x54FA }, { 0xB2B9, 0x8865 }, 
-	{ 0xB2BA, 0x57E0 }, { 0xB2BB, 0x4E0D }, { 0xB2BC, 0x5E03 }, { 0xB2BD, 0x6B65 }, { 0xB2BE, 0x7C3F }, { 0xB2BF, 0x90E8 }, { 0xB2C0, 0x6016 }, { 0xB2C1, 0x64E6 }, 
-	{ 0xB2C2, 0x731C }, { 0xB2C3, 0x88C1 }, { 0xB2C4, 0x6750 }, { 0xB2C5, 0x624D }, { 0xB2C6, 0x8D22 }, { 0xB2C7, 0x776C }, { 0xB2C8, 0x8E29 }, { 0xB2C9, 0x91C7 }, 
-	{ 0xB2CA, 0x5F69 }, { 0xB2CB, 0x83DC }, { 0xB2CC, 0x8521 }, { 0xB2CD, 0x9910 }, { 0xB2CE, 0x53C2 }, { 0xB2CF, 0x8695 }, { 0xB2D0, 0x6B8B }, { 0xB2D1, 0x60ED }, 
-	{ 0xB2D2, 0x60E8 }, { 0xB2D3, 0x707F }, { 0xB2D4, 0x82CD }, { 0xB2D5, 0x8231 }, { 0xB2D6, 0x4ED3 }, { 0xB2D7, 0x6CA7 }, { 0xB2D8, 0x85CF }, { 0xB2D9, 0x64CD }, 
-	{ 0xB2DA, 0x7CD9 }, { 0xB2DB, 0x69FD }, { 0xB2DC, 0x66F9 }, { 0xB2DD, 0x8349 }, { 0xB2DE, 0x5395 }, { 0xB2DF, 0x7B56 }, { 0xB2E0, 0x4FA7 }, { 0xB2E1, 0x518C }, 
-	{ 0xB2E2, 0x6D4B }, { 0xB2E3, 0x5C42 }, { 0xB2E4, 0x8E6D }, { 0xB2E5, 0x63D2 }, { 0xB2E6, 0x53C9 }, { 0xB2E7, 0x832C }, { 0xB2E8, 0x8336 }, { 0xB2E9, 0x67E5 }, 
-	{ 0xB2EA, 0x78B4 }, { 0xB2EB, 0x643D }, { 0xB2EC, 0x5BDF }, { 0xB2ED, 0x5C94 }, { 0xB2EE, 0x5DEE }, { 0xB2EF, 0x8BE7 }, { 0xB2F0, 0x62C6 }, { 0xB2F1, 0x67F4 }, 
-	{ 0xB2F2, 0x8C7A }, { 0xB2F3, 0x6400 }, { 0xB2F4, 0x63BA }, { 0xB2F5, 0x8749 }, { 0xB2F6, 0x998B }, { 0xB2F7, 0x8C17 }, { 0xB2F8, 0x7F20 }, { 0xB2F9, 0x94F2 }, 
-	{ 0xB2FA, 0x4EA7 }, { 0xB2FB, 0x9610 }, { 0xB2FC, 0x98A4 }, { 0xB2FD, 0x660C }, { 0xB2FE, 0x7316 }, { 0xB3A1, 0x573A }, { 0xB3A2, 0x5C1D }, { 0xB3A3, 0x5E38 }, 
-	{ 0xB3A4, 0x957F }, { 0xB3A5, 0x507F }, { 0xB3A6, 0x80A0 }, { 0xB3A7, 0x5382 }, { 0xB3A8, 0x655E }, { 0xB3A9, 0x7545 }, { 0xB3AA, 0x5531 }, { 0xB3AB, 0x5021 }, 
-	{ 0xB3AC, 0x8D85 }, { 0xB3AD, 0x6284 }, { 0xB3AE, 0x949E }, { 0xB3AF, 0x671D }, { 0xB3B0, 0x5632 }, { 0xB3B1, 0x6F6E }, { 0xB3B2, 0x5DE2 }, { 0xB3B3, 0x5435 }, 
-	{ 0xB3B4, 0x7092 }, { 0xB3B5, 0x8F66 }, { 0xB3B6, 0x626F }, { 0xB3B7, 0x64A4 }, { 0xB3B8, 0x63A3 }, { 0xB3B9, 0x5F7B }, { 0xB3BA, 0x6F88 }, { 0xB3BB, 0x90F4 }, 
-	{ 0xB3BC, 0x81E3 }, { 0xB3BD, 0x8FB0 }, { 0xB3BE, 0x5C18 }, { 0xB3BF, 0x6668 }, { 0xB3C0, 0x5FF1 }, { 0xB3C1, 0x6C89 }, { 0xB3C2, 0x9648 }, { 0xB3C3, 0x8D81 }, 
-	{ 0xB3C4, 0x886C }, { 0xB3C5, 0x6491 }, { 0xB3C6, 0x79F0 }, { 0xB3C7, 0x57CE }, { 0xB3C8, 0x6A59 }, { 0xB3C9, 0x6210 }, { 0xB3CA, 0x5448 }, { 0xB3CB, 0x4E58 }, 
-	{ 0xB3CC, 0x7A0B }, { 0xB3CD, 0x60E9 }, { 0xB3CE, 0x6F84 }, { 0xB3CF, 0x8BDA }, { 0xB3D0, 0x627F }, { 0xB3D1, 0x901E }, { 0xB3D2, 0x9A8B }, { 0xB3D3, 0x79E4 }, 
-	{ 0xB3D4, 0x5403 }, { 0xB3D5, 0x75F4 }, { 0xB3D6, 0x6301 }, { 0xB3D7, 0x5319 }, { 0xB3D8, 0x6C60 }, { 0xB3D9, 0x8FDF }, { 0xB3DA, 0x5F1B }, { 0xB3DB, 0x9A70 }, 
-	{ 0xB3DC, 0x803B }, { 0xB3DD, 0x9F7F }, { 0xB3DE, 0x4F88 }, { 0xB3DF, 0x5C3A }, { 0xB3E0, 0x8D64 }, { 0xB3E1, 0x7FC5 }, { 0xB3E2, 0x65A5 }, { 0xB3E3, 0x70BD }, 
-	{ 0xB3E4, 0x5145 }, { 0xB3E5, 0x51B2 }, { 0xB3E6, 0x866B }, { 0xB3E7, 0x5D07 }, { 0xB3E8, 0x5BA0 }, { 0xB3E9, 0x62BD }, { 0xB3EA, 0x916C }, { 0xB3EB, 0x7574 }, 
-	{ 0xB3EC, 0x8E0C }, { 0xB3ED, 0x7A20 }, { 0xB3EE, 0x6101 }, { 0xB3EF, 0x7B79 }, { 0xB3F0, 0x4EC7 }, { 0xB3F1, 0x7EF8 }, { 0xB3F2, 0x7785 }, { 0xB3F3, 0x4E11 }, 
-	{ 0xB3F4, 0x81ED }, { 0xB3F5, 0x521D }, { 0xB3F6, 0x51FA }, { 0xB3F7, 0x6A71 }, { 0xB3F8, 0x53A8 }, { 0xB3F9, 0x8E87 }, { 0xB3FA, 0x9504 }, { 0xB3FB, 0x96CF }, 
-	{ 0xB3FC, 0x6EC1 }, { 0xB3FD, 0x9664 }, { 0xB3FE, 0x695A }, { 0xB4A1, 0x7840 }, { 0xB4A2, 0x50A8 }, { 0xB4A3, 0x77D7 }, { 0xB4A4, 0x6410 }, { 0xB4A5, 0x89E6 }, 
-	{ 0xB4A6, 0x5904 }, { 0xB4A7, 0x63E3 }, { 0xB4A8, 0x5DDD }, { 0xB4A9, 0x7A7F }, { 0xB4AA, 0x693D }, { 0xB4AB, 0x4F20 }, { 0xB4AC, 0x8239 }, { 0xB4AD, 0x5598 }, 
-	{ 0xB4AE, 0x4E32 }, { 0xB4AF, 0x75AE }, { 0xB4B0, 0x7A97 }, { 0xB4B1, 0x5E62 }, { 0xB4B2, 0x5E8A }, { 0xB4B3, 0x95EF }, { 0xB4B4, 0x521B }, { 0xB4B5, 0x5439 }, 
-	{ 0xB4B6, 0x708A }, { 0xB4B7, 0x6376 }, { 0xB4B8, 0x9524 }, { 0xB4B9, 0x5782 }, { 0xB4BA, 0x6625 }, { 0xB4BB, 0x693F }, { 0xB4BC, 0x9187 }, { 0xB4BD, 0x5507 }, 
-	{ 0xB4BE, 0x6DF3 }, { 0xB4BF, 0x7EAF }, { 0xB4C0, 0x8822 }, { 0xB4C1, 0x6233 }, { 0xB4C2, 0x7EF0 }, { 0xB4C3, 0x75B5 }, { 0xB4C4, 0x8328 }, { 0xB4C5, 0x78C1 }, 
-	{ 0xB4C6, 0x96CC }, { 0xB4C7, 0x8F9E }, { 0xB4C8, 0x6148 }, { 0xB4C9, 0x74F7 }, { 0xB4CA, 0x8BCD }, { 0xB4CB, 0x6B64 }, { 0xB4CC, 0x523A }, { 0xB4CD, 0x8D50 }, 
-	{ 0xB4CE, 0x6B21 }, { 0xB4CF, 0x806A }, { 0xB4D0, 0x8471 }, { 0xB4D1, 0x56F1 }, { 0xB4D2, 0x5306 }, { 0xB4D3, 0x4ECE }, { 0xB4D4, 0x4E1B }, { 0xB4D5, 0x51D1 }, 
-	{ 0xB4D6, 0x7C97 }, { 0xB4D7, 0x918B }, { 0xB4D8, 0x7C07 }, { 0xB4D9, 0x4FC3 }, { 0xB4DA, 0x8E7F }, { 0xB4DB, 0x7BE1 }, { 0xB4DC, 0x7A9C }, { 0xB4DD, 0x6467 }, 
-	{ 0xB4DE, 0x5D14 }, { 0xB4DF, 0x50AC }, { 0xB4E0, 0x8106 }, { 0xB4E1, 0x7601 }, { 0xB4E2, 0x7CB9 }, { 0xB4E3, 0x6DEC }, { 0xB4E4, 0x7FE0 }, { 0xB4E5, 0x6751 }, 
-	{ 0xB4E6, 0x5B58 }, { 0xB4E7, 0x5BF8 }, { 0xB4E8, 0x78CB }, { 0xB4E9, 0x64AE }, { 0xB4EA, 0x6413 }, { 0xB4EB, 0x63AA }, { 0xB4EC, 0x632B }, { 0xB4ED, 0x9519 }, 
-	{ 0xB4EE, 0x642D }, { 0xB4EF, 0x8FBE }, { 0xB4F0, 0x7B54 }, { 0xB4F1, 0x7629 }, { 0xB4F2, 0x6253 }, { 0xB4F3, 0x5927 }, { 0xB4F4, 0x5446 }, { 0xB4F5, 0x6B79 }, 
-	{ 0xB4F6, 0x50A3 }, { 0xB4F7, 0x6234 }, { 0xB4F8, 0x5E26 }, { 0xB4F9, 0x6B86 }, { 0xB4FA, 0x4EE3 }, { 0xB4FB, 0x8D37 }, { 0xB4FC, 0x888B }, { 0xB4FD, 0x5F85 }, 
-	{ 0xB4FE, 0x902E }, { 0xB5A1, 0x6020 }, { 0xB5A2, 0x803D }, { 0xB5A3, 0x62C5 }, { 0xB5A4, 0x4E39 }, { 0xB5A5, 0x5355 }, { 0xB5A6, 0x90F8 }, { 0xB5A7, 0x63B8 }, 
-	{ 0xB5A8, 0x80C6 }, { 0xB5A9, 0x65E6 }, { 0xB5AA, 0x6C2E }, { 0xB5AB, 0x4F46 }, { 0xB5AC, 0x60EE }, { 0xB5AD, 0x6DE1 }, { 0xB5AE, 0x8BDE }, { 0xB5AF, 0x5F39 }, 
-	{ 0xB5B0, 0x86CB }, { 0xB5B1, 0x5F53 }, { 0xB5B2, 0x6321 }, { 0xB5B3, 0x515A }, { 0xB5B4, 0x8361 }, { 0xB5B5, 0x6863 }, { 0xB5B6, 0x5200 }, { 0xB5B7, 0x6363 }, 
-	{ 0xB5B8, 0x8E48 }, { 0xB5B9, 0x5012 }, { 0xB5BA, 0x5C9B }, { 0xB5BB, 0x7977 }, { 0xB5BC, 0x5BFC }, { 0xB5BD, 0x5230 }, { 0xB5BE, 0x7A3B }, { 0xB5BF, 0x60BC }, 
-	{ 0xB5C0, 0x9053 }, { 0xB5C1, 0x76D7 }, { 0xB5C2, 0x5FB7 }, { 0xB5C3, 0x5F97 }, { 0xB5C4, 0x7684 }, { 0xB5C5, 0x8E6C }, { 0xB5C6, 0x706F }, { 0xB5C7, 0x767B }, 
-	{ 0xB5C8, 0x7B49 }, { 0xB5C9, 0x77AA }, { 0xB5CA, 0x51F3 }, { 0xB5CB, 0x9093 }, { 0xB5CC, 0x5824 }, { 0xB5CD, 0x4F4E }, { 0xB5CE, 0x6EF4 }, { 0xB5CF, 0x8FEA }, 
-	{ 0xB5D0, 0x654C }, { 0xB5D1, 0x7B1B }, { 0xB5D2, 0x72C4 }, { 0xB5D3, 0x6DA4 }, { 0xB5D4, 0x7FDF }, { 0xB5D5, 0x5AE1 }, { 0xB5D6, 0x62B5 }, { 0xB5D7, 0x5E95 }, 
-	{ 0xB5D8, 0x5730 }, { 0xB5D9, 0x8482 }, { 0xB5DA, 0x7B2C }, { 0xB5DB, 0x5E1D }, { 0xB5DC, 0x5F1F }, { 0xB5DD, 0x9012 }, { 0xB5DE, 0x7F14 }, { 0xB5DF, 0x98A0 }, 
-	{ 0xB5E0, 0x6382 }, { 0xB5E1, 0x6EC7 }, { 0xB5E2, 0x7898 }, { 0xB5E3, 0x70B9 }, { 0xB5E4, 0x5178 }, { 0xB5E5, 0x975B }, { 0xB5E6, 0x57AB }, { 0xB5E7, 0x7535 }, 
-	{ 0xB5E8, 0x4F43 }, { 0xB5E9, 0x7538 }, { 0xB5EA, 0x5E97 }, { 0xB5EB, 0x60E6 }, { 0xB5EC, 0x5960 }, { 0xB5ED, 0x6DC0 }, { 0xB5EE, 0x6BBF }, { 0xB5EF, 0x7889 }, 
-	{ 0xB5F0, 0x53FC }, { 0xB5F1, 0x96D5 }, { 0xB5F2, 0x51CB }, { 0xB5F3, 0x5201 }, { 0xB5F4, 0x6389 }, { 0xB5F5, 0x540A }, { 0xB5F6, 0x9493 }, { 0xB5F7, 0x8C03 }, 
-	{ 0xB5F8, 0x8DCC }, { 0xB5F9, 0x7239 }, { 0xB5FA, 0x789F }, { 0xB5FB, 0x8776 }, { 0xB5FC, 0x8FED }, { 0xB5FD, 0x8C0D }, { 0xB5FE, 0x53E0 }, { 0xB6A1, 0x4E01 }, 
-	{ 0xB6A2, 0x76EF }, { 0xB6A3, 0x53EE }, { 0xB6A4, 0x9489 }, { 0xB6A5, 0x9876 }, { 0xB6A6, 0x9F0E }, { 0xB6A7, 0x952D }, { 0xB6A8, 0x5B9A }, { 0xB6A9, 0x8BA2 }, 
-	{ 0xB6AA, 0x4E22 }, { 0xB6AB, 0x4E1C }, { 0xB6AC, 0x51AC }, { 0xB6AD, 0x8463 }, { 0xB6AE, 0x61C2 }, { 0xB6AF, 0x52A8 }, { 0xB6B0, 0x680B }, { 0xB6B1, 0x4F97 }, 
-	{ 0xB6B2, 0x606B }, { 0xB6B3, 0x51BB }, { 0xB6B4, 0x6D1E }, { 0xB6B5, 0x515C }, { 0xB6B6, 0x6296 }, { 0xB6B7, 0x6597 }, { 0xB6B8, 0x9661 }, { 0xB6B9, 0x8C46 }, 
-	{ 0xB6BA, 0x9017 }, { 0xB6BB, 0x75D8 }, { 0xB6BC, 0x90FD }, { 0xB6BD, 0x7763 }, { 0xB6BE, 0x6BD2 }, { 0xB6BF, 0x728A }, { 0xB6C0, 0x72EC }, { 0xB6C1, 0x8BFB }, 
-	{ 0xB6C2, 0x5835 }, { 0xB6C3, 0x7779 }, { 0xB6C4, 0x8D4C }, { 0xB6C5, 0x675C }, { 0xB6C6, 0x9540 }, { 0xB6C7, 0x809A }, { 0xB6C8, 0x5EA6 }, { 0xB6C9, 0x6E21 }, 
-	{ 0xB6CA, 0x5992 }, { 0xB6CB, 0x7AEF }, { 0xB6CC, 0x77ED }, { 0xB6CD, 0x953B }, { 0xB6CE, 0x6BB5 }, { 0xB6CF, 0x65AD }, { 0xB6D0, 0x7F0E }, { 0xB6D1, 0x5806 }, 
-	{ 0xB6D2, 0x5151 }, { 0xB6D3, 0x961F }, { 0xB6D4, 0x5BF9 }, { 0xB6D5, 0x58A9 }, { 0xB6D6, 0x5428 }, { 0xB6D7, 0x8E72 }, { 0xB6D8, 0x6566 }, { 0xB6D9, 0x987F }, 
-	{ 0xB6DA, 0x56E4 }, { 0xB6DB, 0x949D }, { 0xB6DC, 0x76FE }, { 0xB6DD, 0x9041 }, { 0xB6DE, 0x6387 }, { 0xB6DF, 0x54C6 }, { 0xB6E0, 0x591A }, { 0xB6E1, 0x593A }, 
-	{ 0xB6E2, 0x579B }, { 0xB6E3, 0x8EB2 }, { 0xB6E4, 0x6735 }, { 0xB6E5, 0x8DFA }, { 0xB6E6, 0x8235 }, { 0xB6E7, 0x5241 }, { 0xB6E8, 0x60F0 }, { 0xB6E9, 0x5815 }, 
-	{ 0xB6EA, 0x86FE }, { 0xB6EB, 0x5CE8 }, { 0xB6EC, 0x9E45 }, { 0xB6ED, 0x4FC4 }, { 0xB6EE, 0x989D }, { 0xB6EF, 0x8BB9 }, { 0xB6F0, 0x5A25 }, { 0xB6F1, 0x6076 }, 
-	{ 0xB6F2, 0x5384 }, { 0xB6F3, 0x627C }, { 0xB6F4, 0x904F }, { 0xB6F5, 0x9102 }, { 0xB6F6, 0x997F }, { 0xB6F7, 0x6069 }, { 0xB6F8, 0x800C }, { 0xB6F9, 0x513F }, 
-	{ 0xB6FA, 0x8033 }, { 0xB6FB, 0x5C14 }, { 0xB6FC, 0x9975 }, { 0xB6FD, 0x6D31 }, { 0xB6FE, 0x4E8C }, { 0xB7A1, 0x8D30 }, { 0xB7A2, 0x53D1 }, { 0xB7A3, 0x7F5A }, 
-	{ 0xB7A4, 0x7B4F }, { 0xB7A5, 0x4F10 }, { 0xB7A6, 0x4E4F }, { 0xB7A7, 0x9600 }, { 0xB7A8, 0x6CD5 }, { 0xB7A9, 0x73D0 }, { 0xB7AA, 0x85E9 }, { 0xB7AB, 0x5E06 }, 
-	{ 0xB7AC, 0x756A }, { 0xB7AD, 0x7FFB }, { 0xB7AE, 0x6A0A }, { 0xB7AF, 0x77FE }, { 0xB7B0, 0x9492 }, { 0xB7B1, 0x7E41 }, { 0xB7B2, 0x51E1 }, { 0xB7B3, 0x70E6 }, 
-	{ 0xB7B4, 0x53CD }, { 0xB7B5, 0x8FD4 }, { 0xB7B6, 0x8303 }, { 0xB7B7, 0x8D29 }, { 0xB7B8, 0x72AF }, { 0xB7B9, 0x996D }, { 0xB7BA, 0x6CDB }, { 0xB7BB, 0x574A }, 
-	{ 0xB7BC, 0x82B3 }, { 0xB7BD, 0x65B9 }, { 0xB7BE, 0x80AA }, { 0xB7BF, 0x623F }, { 0xB7C0, 0x9632 }, { 0xB7C1, 0x59A8 }, { 0xB7C2, 0x4EFF }, { 0xB7C3, 0x8BBF }, 
-	{ 0xB7C4, 0x7EBA }, { 0xB7C5, 0x653E }, { 0xB7C6, 0x83F2 }, { 0xB7C7, 0x975E }, { 0xB7C8, 0x5561 }, { 0xB7C9, 0x98DE }, { 0xB7CA, 0x80A5 }, { 0xB7CB, 0x532A }, 
-	{ 0xB7CC, 0x8BFD }, { 0xB7CD, 0x5420 }, { 0xB7CE, 0x80BA }, { 0xB7CF, 0x5E9F }, { 0xB7D0, 0x6CB8 }, { 0xB7D1, 0x8D39 }, { 0xB7D2, 0x82AC }, { 0xB7D3, 0x915A }, 
-	{ 0xB7D4, 0x5429 }, { 0xB7D5, 0x6C1B }, { 0xB7D6, 0x5206 }, { 0xB7D7, 0x7EB7 }, { 0xB7D8, 0x575F }, { 0xB7D9, 0x711A }, { 0xB7DA, 0x6C7E }, { 0xB7DB, 0x7C89 }, 
-	{ 0xB7DC, 0x594B }, { 0xB7DD, 0x4EFD }, { 0xB7DE, 0x5FFF }, { 0xB7DF, 0x6124 }, { 0xB7E0, 0x7CAA }, { 0xB7E1, 0x4E30 }, { 0xB7E2, 0x5C01 }, { 0xB7E3, 0x67AB }, 
-	{ 0xB7E4, 0x8702 }, { 0xB7E5, 0x5CF0 }, { 0xB7E6, 0x950B }, { 0xB7E7, 0x98CE }, { 0xB7E8, 0x75AF }, { 0xB7E9, 0x70FD }, { 0xB7EA, 0x9022 }, { 0xB7EB, 0x51AF }, 
-	{ 0xB7EC, 0x7F1D }, { 0xB7ED, 0x8BBD }, { 0xB7EE, 0x5949 }, { 0xB7EF, 0x51E4 }, { 0xB7F0, 0x4F5B }, { 0xB7F1, 0x5426 }, { 0xB7F2, 0x592B }, { 0xB7F3, 0x6577 }, 
-	{ 0xB7F4, 0x80A4 }, { 0xB7F5, 0x5B75 }, { 0xB7F6, 0x6276 }, { 0xB7F7, 0x62C2 }, { 0xB7F8, 0x8F90 }, { 0xB7F9, 0x5E45 }, { 0xB7FA, 0x6C1F }, { 0xB7FB, 0x7B26 }, 
-	{ 0xB7FC, 0x4F0F }, { 0xB7FD, 0x4FD8 }, { 0xB7FE, 0x670D }, { 0xB8A1, 0x6D6E }, { 0xB8A2, 0x6DAA }, { 0xB8A3, 0x798F }, { 0xB8A4, 0x88B1 }, { 0xB8A5, 0x5F17 }, 
-	{ 0xB8A6, 0x752B }, { 0xB8A7, 0x629A }, { 0xB8A8, 0x8F85 }, { 0xB8A9, 0x4FEF }, { 0xB8AA, 0x91DC }, { 0xB8AB, 0x65A7 }, { 0xB8AC, 0x812F }, { 0xB8AD, 0x8151 }, 
-	{ 0xB8AE, 0x5E9C }, { 0xB8AF, 0x8150 }, { 0xB8B0, 0x8D74 }, { 0xB8B1, 0x526F }, { 0xB8B2, 0x8986 }, { 0xB8B3, 0x8D4B }, { 0xB8B4, 0x590D }, { 0xB8B5, 0x5085 }, 
-	{ 0xB8B6, 0x4ED8 }, { 0xB8B7, 0x961C }, { 0xB8B8, 0x7236 }, { 0xB8B9, 0x8179 }, { 0xB8BA, 0x8D1F }, { 0xB8BB, 0x5BCC }, { 0xB8BC, 0x8BA3 }, { 0xB8BD, 0x9644 }, 
-	{ 0xB8BE, 0x5987 }, { 0xB8BF, 0x7F1A }, { 0xB8C0, 0x5490 }, { 0xB8C1, 0x5676 }, { 0xB8C2, 0x560E }, { 0xB8C3, 0x8BE5 }, { 0xB8C4, 0x6539 }, { 0xB8C5, 0x6982 }, 
-	{ 0xB8C6, 0x9499 }, { 0xB8C7, 0x76D6 }, { 0xB8C8, 0x6E89 }, { 0xB8C9, 0x5E72 }, { 0xB8CA, 0x7518 }, { 0xB8CB, 0x6746 }, { 0xB8CC, 0x67D1 }, { 0xB8CD, 0x7AFF }, 
-	{ 0xB8CE, 0x809D }, { 0xB8CF, 0x8D76 }, { 0xB8D0, 0x611F }, { 0xB8D1, 0x79C6 }, { 0xB8D2, 0x6562 }, { 0xB8D3, 0x8D63 }, { 0xB8D4, 0x5188 }, { 0xB8D5, 0x521A }, 
-	{ 0xB8D6, 0x94A2 }, { 0xB8D7, 0x7F38 }, { 0xB8D8, 0x809B }, { 0xB8D9, 0x7EB2 }, { 0xB8DA, 0x5C97 }, { 0xB8DB, 0x6E2F }, { 0xB8DC, 0x6760 }, { 0xB8DD, 0x7BD9 }, 
-	{ 0xB8DE, 0x768B }, { 0xB8DF, 0x9AD8 }, { 0xB8E0, 0x818F }, { 0xB8E1, 0x7F94 }, { 0xB8E2, 0x7CD5 }, { 0xB8E3, 0x641E }, { 0xB8E4, 0x9550 }, { 0xB8E5, 0x7A3F }, 
-	{ 0xB8E6, 0x544A }, { 0xB8E7, 0x54E5 }, { 0xB8E8, 0x6B4C }, { 0xB8E9, 0x6401 }, { 0xB8EA, 0x6208 }, { 0xB8EB, 0x9E3D }, { 0xB8EC, 0x80F3 }, { 0xB8ED, 0x7599 }, 
-	{ 0xB8EE, 0x5272 }, { 0xB8EF, 0x9769 }, { 0xB8F0, 0x845B }, { 0xB8F1, 0x683C }, { 0xB8F2, 0x86E4 }, { 0xB8F3, 0x9601 }, { 0xB8F4, 0x9694 }, { 0xB8F5, 0x94EC }, 
-	{ 0xB8F6, 0x4E2A }, { 0xB8F7, 0x5404 }, { 0xB8F8, 0x7ED9 }, { 0xB8F9, 0x6839 }, { 0xB8FA, 0x8DDF }, { 0xB8FB, 0x8015 }, { 0xB8FC, 0x66F4 }, { 0xB8FD, 0x5E9A }, 
-	{ 0xB8FE, 0x7FB9 }, { 0xB9A1, 0x57C2 }, { 0xB9A2, 0x803F }, { 0xB9A3, 0x6897 }, { 0xB9A4, 0x5DE5 }, { 0xB9A5, 0x653B }, { 0xB9A6, 0x529F }, { 0xB9A7, 0x606D }, 
-	{ 0xB9A8, 0x9F9A }, { 0xB9A9, 0x4F9B }, { 0xB9AA, 0x8EAC }, { 0xB9AB, 0x516C }, { 0xB9AC, 0x5BAB }, { 0xB9AD, 0x5F13 }, { 0xB9AE, 0x5DE9 }, { 0xB9AF, 0x6C5E }, 
-	{ 0xB9B0, 0x62F1 }, { 0xB9B1, 0x8D21 }, { 0xB9B2, 0x5171 }, { 0xB9B3, 0x94A9 }, { 0xB9B4, 0x52FE }, { 0xB9B5, 0x6C9F }, { 0xB9B6, 0x82DF }, { 0xB9B7, 0x72D7 }, 
-	{ 0xB9B8, 0x57A2 }, { 0xB9B9, 0x6784 }, { 0xB9BA, 0x8D2D }, { 0xB9BB, 0x591F }, { 0xB9BC, 0x8F9C }, { 0xB9BD, 0x83C7 }, { 0xB9BE, 0x5495 }, { 0xB9BF, 0x7B8D }, 
-	{ 0xB9C0, 0x4F30 }, { 0xB9C1, 0x6CBD }, { 0xB9C2, 0x5B64 }, { 0xB9C3, 0x59D1 }, { 0xB9C4, 0x9F13 }, { 0xB9C5, 0x53E4 }, { 0xB9C6, 0x86CA }, { 0xB9C7, 0x9AA8 }, 
-	{ 0xB9C8, 0x8C37 }, { 0xB9C9, 0x80A1 }, { 0xB9CA, 0x6545 }, { 0xB9CB, 0x987E }, { 0xB9CC, 0x56FA }, { 0xB9CD, 0x96C7 }, { 0xB9CE, 0x522E }, { 0xB9CF, 0x74DC }, 
-	{ 0xB9D0, 0x5250 }, { 0xB9D1, 0x5BE1 }, { 0xB9D2, 0x6302 }, { 0xB9D3, 0x8902 }, { 0xB9D4, 0x4E56 }, { 0xB9D5, 0x62D0 }, { 0xB9D6, 0x602A }, { 0xB9D7, 0x68FA }, 
-	{ 0xB9D8, 0x5173 }, { 0xB9D9, 0x5B98 }, { 0xB9DA, 0x51A0 }, { 0xB9DB, 0x89C2 }, { 0xB9DC, 0x7BA1 }, { 0xB9DD, 0x9986 }, { 0xB9DE, 0x7F50 }, { 0xB9DF, 0x60EF }, 
-	{ 0xB9E0, 0x704C }, { 0xB9E1, 0x8D2F }, { 0xB9E2, 0x5149 }, { 0xB9E3, 0x5E7F }, { 0xB9E4, 0x901B }, { 0xB9E5, 0x7470 }, { 0xB9E6, 0x89C4 }, { 0xB9E7, 0x572D }, 
-	{ 0xB9E8, 0x7845 }, { 0xB9E9, 0x5F52 }, { 0xB9EA, 0x9F9F }, { 0xB9EB, 0x95FA }, { 0xB9EC, 0x8F68 }, { 0xB9ED, 0x9B3C }, { 0xB9EE, 0x8BE1 }, { 0xB9EF, 0x7678 }, 
-	{ 0xB9F0, 0x6842 }, { 0xB9F1, 0x67DC }, { 0xB9F2, 0x8DEA }, { 0xB9F3, 0x8D35 }, { 0xB9F4, 0x523D }, { 0xB9F5, 0x8F8A }, { 0xB9F6, 0x6EDA }, { 0xB9F7, 0x68CD }, 
-	{ 0xB9F8, 0x9505 }, { 0xB9F9, 0x90ED }, { 0xB9FA, 0x56FD }, { 0xB9FB, 0x679C }, { 0xB9FC, 0x88F9 }, { 0xB9FD, 0x8FC7 }, { 0xB9FE, 0x54C8 }, { 0xBAA1, 0x9AB8 }, 
-	{ 0xBAA2, 0x5B69 }, { 0xBAA3, 0x6D77 }, { 0xBAA4, 0x6C26 }, { 0xBAA5, 0x4EA5 }, { 0xBAA6, 0x5BB3 }, { 0xBAA7, 0x9A87 }, { 0xBAA8, 0x9163 }, { 0xBAA9, 0x61A8 }, 
-	{ 0xBAAA, 0x90AF }, { 0xBAAB, 0x97E9 }, { 0xBAAC, 0x542B }, { 0xBAAD, 0x6DB5 }, { 0xBAAE, 0x5BD2 }, { 0xBAAF, 0x51FD }, { 0xBAB0, 0x558A }, { 0xBAB1, 0x7F55 }, 
-	{ 0xBAB2, 0x7FF0 }, { 0xBAB3, 0x64BC }, { 0xBAB4, 0x634D }, { 0xBAB5, 0x65F1 }, { 0xBAB6, 0x61BE }, { 0xBAB7, 0x608D }, { 0xBAB8, 0x710A }, { 0xBAB9, 0x6C57 }, 
-	{ 0xBABA, 0x6C49 }, { 0xBABB, 0x592F }, { 0xBABC, 0x676D }, { 0xBABD, 0x822A }, { 0xBABE, 0x58D5 }, { 0xBABF, 0x568E }, { 0xBAC0, 0x8C6A }, { 0xBAC1, 0x6BEB }, 
-	{ 0xBAC2, 0x90DD }, { 0xBAC3, 0x597D }, { 0xBAC4, 0x8017 }, { 0xBAC5, 0x53F7 }, { 0xBAC6, 0x6D69 }, { 0xBAC7, 0x5475 }, { 0xBAC8, 0x559D }, { 0xBAC9, 0x8377 }, 
-	{ 0xBACA, 0x83CF }, { 0xBACB, 0x6838 }, { 0xBACC, 0x79BE }, { 0xBACD, 0x548C }, { 0xBACE, 0x4F55 }, { 0xBACF, 0x5408 }, { 0xBAD0, 0x76D2 }, { 0xBAD1, 0x8C89 }, 
-	{ 0xBAD2, 0x9602 }, { 0xBAD3, 0x6CB3 }, { 0xBAD4, 0x6DB8 }, { 0xBAD5, 0x8D6B }, { 0xBAD6, 0x8910 }, { 0xBAD7, 0x9E64 }, { 0xBAD8, 0x8D3A }, { 0xBAD9, 0x563F }, 
-	{ 0xBADA, 0x9ED1 }, { 0xBADB, 0x75D5 }, { 0xBADC, 0x5F88 }, { 0xBADD, 0x72E0 }, { 0xBADE, 0x6068 }, { 0xBADF, 0x54FC }, { 0xBAE0, 0x4EA8 }, { 0xBAE1, 0x6A2A }, 
-	{ 0xBAE2, 0x8861 }, { 0xBAE3, 0x6052 }, { 0xBAE4, 0x8F70 }, { 0xBAE5, 0x54C4 }, { 0xBAE6, 0x70D8 }, { 0xBAE7, 0x8679 }, { 0xBAE8, 0x9E3F }, { 0xBAE9, 0x6D2A }, 
-	{ 0xBAEA, 0x5B8F }, { 0xBAEB, 0x5F18 }, { 0xBAEC, 0x7EA2 }, { 0xBAED, 0x5589 }, { 0xBAEE, 0x4FAF }, { 0xBAEF, 0x7334 }, { 0xBAF0, 0x543C }, { 0xBAF1, 0x539A }, 
-	{ 0xBAF2, 0x5019 }, { 0xBAF3, 0x540E }, { 0xBAF4, 0x547C }, { 0xBAF5, 0x4E4E }, { 0xBAF6, 0x5FFD }, { 0xBAF7, 0x745A }, { 0xBAF8, 0x58F6 }, { 0xBAF9, 0x846B }, 
-	{ 0xBAFA, 0x80E1 }, { 0xBAFB, 0x8774 }, { 0xBAFC, 0x72D0 }, { 0xBAFD, 0x7CCA }, { 0xBAFE, 0x6E56 }, { 0xBBA1, 0x5F27 }, { 0xBBA2, 0x864E }, { 0xBBA3, 0x552C }, 
-	{ 0xBBA4, 0x62A4 }, { 0xBBA5, 0x4E92 }, { 0xBBA6, 0x6CAA }, { 0xBBA7, 0x6237 }, { 0xBBA8, 0x82B1 }, { 0xBBA9, 0x54D7 }, { 0xBBAA, 0x534E }, { 0xBBAB, 0x733E }, 
-	{ 0xBBAC, 0x6ED1 }, { 0xBBAD, 0x753B }, { 0xBBAE, 0x5212 }, { 0xBBAF, 0x5316 }, { 0xBBB0, 0x8BDD }, { 0xBBB1, 0x69D0 }, { 0xBBB2, 0x5F8A }, { 0xBBB3, 0x6000 }, 
-	{ 0xBBB4, 0x6DEE }, { 0xBBB5, 0x574F }, { 0xBBB6, 0x6B22 }, { 0xBBB7, 0x73AF }, { 0xBBB8, 0x6853 }, { 0xBBB9, 0x8FD8 }, { 0xBBBA, 0x7F13 }, { 0xBBBB, 0x6362 }, 
-	{ 0xBBBC, 0x60A3 }, { 0xBBBD, 0x5524 }, { 0xBBBE, 0x75EA }, { 0xBBBF, 0x8C62 }, { 0xBBC0, 0x7115 }, { 0xBBC1, 0x6DA3 }, { 0xBBC2, 0x5BA6 }, { 0xBBC3, 0x5E7B }, 
-	{ 0xBBC4, 0x8352 }, { 0xBBC5, 0x614C }, { 0xBBC6, 0x9EC4 }, { 0xBBC7, 0x78FA }, { 0xBBC8, 0x8757 }, { 0xBBC9, 0x7C27 }, { 0xBBCA, 0x7687 }, { 0xBBCB, 0x51F0 }, 
-	{ 0xBBCC, 0x60F6 }, { 0xBBCD, 0x714C }, { 0xBBCE, 0x6643 }, { 0xBBCF, 0x5E4C }, { 0xBBD0, 0x604D }, { 0xBBD1, 0x8C0E }, { 0xBBD2, 0x7070 }, { 0xBBD3, 0x6325 }, 
-	{ 0xBBD4, 0x8F89 }, { 0xBBD5, 0x5FBD }, { 0xBBD6, 0x6062 }, { 0xBBD7, 0x86D4 }, { 0xBBD8, 0x56DE }, { 0xBBD9, 0x6BC1 }, { 0xBBDA, 0x6094 }, { 0xBBDB, 0x6167 }, 
-	{ 0xBBDC, 0x5349 }, { 0xBBDD, 0x60E0 }, { 0xBBDE, 0x6666 }, { 0xBBDF, 0x8D3F }, { 0xBBE0, 0x79FD }, { 0xBBE1, 0x4F1A }, { 0xBBE2, 0x70E9 }, { 0xBBE3, 0x6C47 }, 
-	{ 0xBBE4, 0x8BB3 }, { 0xBBE5, 0x8BF2 }, { 0xBBE6, 0x7ED8 }, { 0xBBE7, 0x8364 }, { 0xBBE8, 0x660F }, { 0xBBE9, 0x5A5A }, { 0xBBEA, 0x9B42 }, { 0xBBEB, 0x6D51 }, 
-	{ 0xBBEC, 0x6DF7 }, { 0xBBED, 0x8C41 }, { 0xBBEE, 0x6D3B }, { 0xBBEF, 0x4F19 }, { 0xBBF0, 0x706B }, { 0xBBF1, 0x83B7 }, { 0xBBF2, 0x6216 }, { 0xBBF3, 0x60D1 }, 
-	{ 0xBBF4, 0x970D }, { 0xBBF5, 0x8D27 }, { 0xBBF6, 0x7978 }, { 0xBBF7, 0x51FB }, { 0xBBF8, 0x573E }, { 0xBBF9, 0x57FA }, { 0xBBFA, 0x673A }, { 0xBBFB, 0x7578 }, 
-	{ 0xBBFC, 0x7A3D }, { 0xBBFD, 0x79EF }, { 0xBBFE, 0x7B95 }, { 0xBCA1, 0x808C }, { 0xBCA2, 0x9965 }, { 0xBCA3, 0x8FF9 }, { 0xBCA4, 0x6FC0 }, { 0xBCA5, 0x8BA5 }, 
-	{ 0xBCA6, 0x9E21 }, { 0xBCA7, 0x59EC }, { 0xBCA8, 0x7EE9 }, { 0xBCA9, 0x7F09 }, { 0xBCAA, 0x5409 }, { 0xBCAB, 0x6781 }, { 0xBCAC, 0x68D8 }, { 0xBCAD, 0x8F91 }, 
-	{ 0xBCAE, 0x7C4D }, { 0xBCAF, 0x96C6 }, { 0xBCB0, 0x53CA }, { 0xBCB1, 0x6025 }, { 0xBCB2, 0x75BE }, { 0xBCB3, 0x6C72 }, { 0xBCB4, 0x5373 }, { 0xBCB5, 0x5AC9 }, 
-	{ 0xBCB6, 0x7EA7 }, { 0xBCB7, 0x6324 }, { 0xBCB8, 0x51E0 }, { 0xBCB9, 0x810A }, { 0xBCBA, 0x5DF1 }, { 0xBCBB, 0x84DF }, { 0xBCBC, 0x6280 }, { 0xBCBD, 0x5180 }, 
-	{ 0xBCBE, 0x5B63 }, { 0xBCBF, 0x4F0E }, { 0xBCC0, 0x796D }, { 0xBCC1, 0x5242 }, { 0xBCC2, 0x60B8 }, { 0xBCC3, 0x6D4E }, { 0xBCC4, 0x5BC4 }, { 0xBCC5, 0x5BC2 }, 
-	{ 0xBCC6, 0x8BA1 }, { 0xBCC7, 0x8BB0 }, { 0xBCC8, 0x65E2 }, { 0xBCC9, 0x5FCC }, { 0xBCCA, 0x9645 }, { 0xBCCB, 0x5993 }, { 0xBCCC, 0x7EE7 }, { 0xBCCD, 0x7EAA }, 
-	{ 0xBCCE, 0x5609 }, { 0xBCCF, 0x67B7 }, { 0xBCD0, 0x5939 }, { 0xBCD1, 0x4F73 }, { 0xBCD2, 0x5BB6 }, { 0xBCD3, 0x52A0 }, { 0xBCD4, 0x835A }, { 0xBCD5, 0x988A }, 
-	{ 0xBCD6, 0x8D3E }, { 0xBCD7, 0x7532 }, { 0xBCD8, 0x94BE }, { 0xBCD9, 0x5047 }, { 0xBCDA, 0x7A3C }, { 0xBCDB, 0x4EF7 }, { 0xBCDC, 0x67B6 }, { 0xBCDD, 0x9A7E }, 
-	{ 0xBCDE, 0x5AC1 }, { 0xBCDF, 0x6B7C }, { 0xBCE0, 0x76D1 }, { 0xBCE1, 0x575A }, { 0xBCE2, 0x5C16 }, { 0xBCE3, 0x7B3A }, { 0xBCE4, 0x95F4 }, { 0xBCE5, 0x714E }, 
-	{ 0xBCE6, 0x517C }, { 0xBCE7, 0x80A9 }, { 0xBCE8, 0x8270 }, { 0xBCE9, 0x5978 }, { 0xBCEA, 0x7F04 }, { 0xBCEB, 0x8327 }, { 0xBCEC, 0x68C0 }, { 0xBCED, 0x67EC }, 
-	{ 0xBCEE, 0x78B1 }, { 0xBCEF, 0x7877 }, { 0xBCF0, 0x62E3 }, { 0xBCF1, 0x6361 }, { 0xBCF2, 0x7B80 }, { 0xBCF3, 0x4FED }, { 0xBCF4, 0x526A }, { 0xBCF5, 0x51CF }, 
-	{ 0xBCF6, 0x8350 }, { 0xBCF7, 0x69DB }, { 0xBCF8, 0x9274 }, { 0xBCF9, 0x8DF5 }, { 0xBCFA, 0x8D31 }, { 0xBCFB, 0x89C1 }, { 0xBCFC, 0x952E }, { 0xBCFD, 0x7BAD }, 
-	{ 0xBCFE, 0x4EF6 }, { 0xBDA1, 0x5065 }, { 0xBDA2, 0x8230 }, { 0xBDA3, 0x5251 }, { 0xBDA4, 0x996F }, { 0xBDA5, 0x6E10 }, { 0xBDA6, 0x6E85 }, { 0xBDA7, 0x6DA7 }, 
-	{ 0xBDA8, 0x5EFA }, { 0xBDA9, 0x50F5 }, { 0xBDAA, 0x59DC }, { 0xBDAB, 0x5C06 }, { 0xBDAC, 0x6D46 }, { 0xBDAD, 0x6C5F }, { 0xBDAE, 0x7586 }, { 0xBDAF, 0x848B }, 
-	{ 0xBDB0, 0x6868 }, { 0xBDB1, 0x5956 }, { 0xBDB2, 0x8BB2 }, { 0xBDB3, 0x5320 }, { 0xBDB4, 0x9171 }, { 0xBDB5, 0x964D }, { 0xBDB6, 0x8549 }, { 0xBDB7, 0x6912 }, 
-	{ 0xBDB8, 0x7901 }, { 0xBDB9, 0x7126 }, { 0xBDBA, 0x80F6 }, { 0xBDBB, 0x4EA4 }, { 0xBDBC, 0x90CA }, { 0xBDBD, 0x6D47 }, { 0xBDBE, 0x9A84 }, { 0xBDBF, 0x5A07 }, 
-	{ 0xBDC0, 0x56BC }, { 0xBDC1, 0x6405 }, { 0xBDC2, 0x94F0 }, { 0xBDC3, 0x77EB }, { 0xBDC4, 0x4FA5 }, { 0xBDC5, 0x811A }, { 0xBDC6, 0x72E1 }, { 0xBDC7, 0x89D2 }, 
-	{ 0xBDC8, 0x997A }, { 0xBDC9, 0x7F34 }, { 0xBDCA, 0x7EDE }, { 0xBDCB, 0x527F }, { 0xBDCC, 0x6559 }, { 0xBDCD, 0x9175 }, { 0xBDCE, 0x8F7F }, { 0xBDCF, 0x8F83 }, 
-	{ 0xBDD0, 0x53EB }, { 0xBDD1, 0x7A96 }, { 0xBDD2, 0x63ED }, { 0xBDD3, 0x63A5 }, { 0xBDD4, 0x7686 }, { 0xBDD5, 0x79F8 }, { 0xBDD6, 0x8857 }, { 0xBDD7, 0x9636 }, 
-	{ 0xBDD8, 0x622A }, { 0xBDD9, 0x52AB }, { 0xBDDA, 0x8282 }, { 0xBDDB, 0x6854 }, { 0xBDDC, 0x6770 }, { 0xBDDD, 0x6377 }, { 0xBDDE, 0x776B }, { 0xBDDF, 0x7AED }, 
-	{ 0xBDE0, 0x6D01 }, { 0xBDE1, 0x7ED3 }, { 0xBDE2, 0x89E3 }, { 0xBDE3, 0x59D0 }, { 0xBDE4, 0x6212 }, { 0xBDE5, 0x85C9 }, { 0xBDE6, 0x82A5 }, { 0xBDE7, 0x754C }, 
-	{ 0xBDE8, 0x501F }, { 0xBDE9, 0x4ECB }, { 0xBDEA, 0x75A5 }, { 0xBDEB, 0x8BEB }, { 0xBDEC, 0x5C4A }, { 0xBDED, 0x5DFE }, { 0xBDEE, 0x7B4B }, { 0xBDEF, 0x65A4 }, 
-	{ 0xBDF0, 0x91D1 }, { 0xBDF1, 0x4ECA }, { 0xBDF2, 0x6D25 }, { 0xBDF3, 0x895F }, { 0xBDF4, 0x7D27 }, { 0xBDF5, 0x9526 }, { 0xBDF6, 0x4EC5 }, { 0xBDF7, 0x8C28 }, 
-	{ 0xBDF8, 0x8FDB }, { 0xBDF9, 0x9773 }, { 0xBDFA, 0x664B }, { 0xBDFB, 0x7981 }, { 0xBDFC, 0x8FD1 }, { 0xBDFD, 0x70EC }, { 0xBDFE, 0x6D78 }, { 0xBEA1, 0x5C3D }, 
-	{ 0xBEA2, 0x52B2 }, { 0xBEA3, 0x8346 }, { 0xBEA4, 0x5162 }, { 0xBEA5, 0x830E }, { 0xBEA6, 0x775B }, { 0xBEA7, 0x6676 }, { 0xBEA8, 0x9CB8 }, { 0xBEA9, 0x4EAC }, 
-	{ 0xBEAA, 0x60CA }, { 0xBEAB, 0x7CBE }, { 0xBEAC, 0x7CB3 }, { 0xBEAD, 0x7ECF }, { 0xBEAE, 0x4E95 }, { 0xBEAF, 0x8B66 }, { 0xBEB0, 0x666F }, { 0xBEB1, 0x9888 }, 
-	{ 0xBEB2, 0x9759 }, { 0xBEB3, 0x5883 }, { 0xBEB4, 0x656C }, { 0xBEB5, 0x955C }, { 0xBEB6, 0x5F84 }, { 0xBEB7, 0x75C9 }, { 0xBEB8, 0x9756 }, { 0xBEB9, 0x7ADF }, 
-	{ 0xBEBA, 0x7ADE }, { 0xBEBB, 0x51C0 }, { 0xBEBC, 0x70AF }, { 0xBEBD, 0x7A98 }, { 0xBEBE, 0x63EA }, { 0xBEBF, 0x7A76 }, { 0xBEC0, 0x7EA0 }, { 0xBEC1, 0x7396 }, 
-	{ 0xBEC2, 0x97ED }, { 0xBEC3, 0x4E45 }, { 0xBEC4, 0x7078 }, { 0xBEC5, 0x4E5D }, { 0xBEC6, 0x9152 }, { 0xBEC7, 0x53A9 }, { 0xBEC8, 0x6551 }, { 0xBEC9, 0x65E7 }, 
-	{ 0xBECA, 0x81FC }, { 0xBECB, 0x8205 }, { 0xBECC, 0x548E }, { 0xBECD, 0x5C31 }, { 0xBECE, 0x759A }, { 0xBECF, 0x97A0 }, { 0xBED0, 0x62D8 }, { 0xBED1, 0x72D9 }, 
-	{ 0xBED2, 0x75BD }, { 0xBED3, 0x5C45 }, { 0xBED4, 0x9A79 }, { 0xBED5, 0x83CA }, { 0xBED6, 0x5C40 }, { 0xBED7, 0x5480 }, { 0xBED8, 0x77E9 }, { 0xBED9, 0x4E3E }, 
-	{ 0xBEDA, 0x6CAE }, { 0xBEDB, 0x805A }, { 0xBEDC, 0x62D2 }, { 0xBEDD, 0x636E }, { 0xBEDE, 0x5DE8 }, { 0xBEDF, 0x5177 }, { 0xBEE0, 0x8DDD }, { 0xBEE1, 0x8E1E }, 
-	{ 0xBEE2, 0x952F }, { 0xBEE3, 0x4FF1 }, { 0xBEE4, 0x53E5 }, { 0xBEE5, 0x60E7 }, { 0xBEE6, 0x70AC }, { 0xBEE7, 0x5267 }, { 0xBEE8, 0x6350 }, { 0xBEE9, 0x9E43 }, 
-	{ 0xBEEA, 0x5A1F }, { 0xBEEB, 0x5026 }, { 0xBEEC, 0x7737 }, { 0xBEED, 0x5377 }, { 0xBEEE, 0x7EE2 }, { 0xBEEF, 0x6485 }, { 0xBEF0, 0x652B }, { 0xBEF1, 0x6289 }, 
-	{ 0xBEF2, 0x6398 }, { 0xBEF3, 0x5014 }, { 0xBEF4, 0x7235 }, { 0xBEF5, 0x89C9 }, { 0xBEF6, 0x51B3 }, { 0xBEF7, 0x8BC0 }, { 0xBEF8, 0x7EDD }, { 0xBEF9, 0x5747 }, 
-	{ 0xBEFA, 0x83CC }, { 0xBEFB, 0x94A7 }, { 0xBEFC, 0x519B }, { 0xBEFD, 0x541B }, { 0xBEFE, 0x5CFB }, { 0xBFA1, 0x4FCA }, { 0xBFA2, 0x7AE3 }, { 0xBFA3, 0x6D5A }, 
-	{ 0xBFA4, 0x90E1 }, { 0xBFA5, 0x9A8F }, { 0xBFA6, 0x5580 }, { 0xBFA7, 0x5496 }, { 0xBFA8, 0x5361 }, { 0xBFA9, 0x54AF }, { 0xBFAA, 0x5F00 }, { 0xBFAB, 0x63E9 }, 
-	{ 0xBFAC, 0x6977 }, { 0xBFAD, 0x51EF }, { 0xBFAE, 0x6168 }, { 0xBFAF, 0x520A }, { 0xBFB0, 0x582A }, { 0xBFB1, 0x52D8 }, { 0xBFB2, 0x574E }, { 0xBFB3, 0x780D }, 
-	{ 0xBFB4, 0x770B }, { 0xBFB5, 0x5EB7 }, { 0xBFB6, 0x6177 }, { 0xBFB7, 0x7CE0 }, { 0xBFB8, 0x625B }, { 0xBFB9, 0x6297 }, { 0xBFBA, 0x4EA2 }, { 0xBFBB, 0x7095 }, 
-	{ 0xBFBC, 0x8003 }, { 0xBFBD, 0x62F7 }, { 0xBFBE, 0x70E4 }, { 0xBFBF, 0x9760 }, { 0xBFC0, 0x5777 }, { 0xBFC1, 0x82DB }, { 0xBFC2, 0x67EF }, { 0xBFC3, 0x68F5 }, 
-	{ 0xBFC4, 0x78D5 }, { 0xBFC5, 0x9897 }, { 0xBFC6, 0x79D1 }, { 0xBFC7, 0x58F3 }, { 0xBFC8, 0x54B3 }, { 0xBFC9, 0x53EF }, { 0xBFCA, 0x6E34 }, { 0xBFCB, 0x514B }, 
-	{ 0xBFCC, 0x523B }, { 0xBFCD, 0x5BA2 }, { 0xBFCE, 0x8BFE }, { 0xBFCF, 0x80AF }, { 0xBFD0, 0x5543 }, { 0xBFD1, 0x57A6 }, { 0xBFD2, 0x6073 }, { 0xBFD3, 0x5751 }, 
-	{ 0xBFD4, 0x542D }, { 0xBFD5, 0x7A7A }, { 0xBFD6, 0x6050 }, { 0xBFD7, 0x5B54 }, { 0xBFD8, 0x63A7 }, { 0xBFD9, 0x62A0 }, { 0xBFDA, 0x53E3 }, { 0xBFDB, 0x6263 }, 
-	{ 0xBFDC, 0x5BC7 }, { 0xBFDD, 0x67AF }, { 0xBFDE, 0x54ED }, { 0xBFDF, 0x7A9F }, { 0xBFE0, 0x82E6 }, { 0xBFE1, 0x9177 }, { 0xBFE2, 0x5E93 }, { 0xBFE3, 0x88E4 }, 
-	{ 0xBFE4, 0x5938 }, { 0xBFE5, 0x57AE }, { 0xBFE6, 0x630E }, { 0xBFE7, 0x8DE8 }, { 0xBFE8, 0x80EF }, { 0xBFE9, 0x5757 }, { 0xBFEA, 0x7B77 }, { 0xBFEB, 0x4FA9 }, 
-	{ 0xBFEC, 0x5FEB }, { 0xBFED, 0x5BBD }, { 0xBFEE, 0x6B3E }, { 0xBFEF, 0x5321 }, { 0xBFF0, 0x7B50 }, { 0xBFF1, 0x72C2 }, { 0xBFF2, 0x6846 }, { 0xBFF3, 0x77FF }, 
-	{ 0xBFF4, 0x7736 }, { 0xBFF5, 0x65F7 }, { 0xBFF6, 0x51B5 }, { 0xBFF7, 0x4E8F }, { 0xBFF8, 0x76D4 }, { 0xBFF9, 0x5CBF }, { 0xBFFA, 0x7AA5 }, { 0xBFFB, 0x8475 }, 
-	{ 0xBFFC, 0x594E }, { 0xBFFD, 0x9B41 }, { 0xBFFE, 0x5080 }, { 0xC0A1, 0x9988 }, { 0xC0A2, 0x6127 }, { 0xC0A3, 0x6E83 }, { 0xC0A4, 0x5764 }, { 0xC0A5, 0x6606 }, 
-	{ 0xC0A6, 0x6346 }, { 0xC0A7, 0x56F0 }, { 0xC0A8, 0x62EC }, { 0xC0A9, 0x6269 }, { 0xC0AA, 0x5ED3 }, { 0xC0AB, 0x9614 }, { 0xC0AC, 0x5783 }, { 0xC0AD, 0x62C9 }, 
-	{ 0xC0AE, 0x5587 }, { 0xC0AF, 0x8721 }, { 0xC0B0, 0x814A }, { 0xC0B1, 0x8FA3 }, { 0xC0B2, 0x5566 }, { 0xC0B3, 0x83B1 }, { 0xC0B4, 0x6765 }, { 0xC0B5, 0x8D56 }, 
-	{ 0xC0B6, 0x84DD }, { 0xC0B7, 0x5A6A }, { 0xC0B8, 0x680F }, { 0xC0B9, 0x62E6 }, { 0xC0BA, 0x7BEE }, { 0xC0BB, 0x9611 }, { 0xC0BC, 0x5170 }, { 0xC0BD, 0x6F9C }, 
-	{ 0xC0BE, 0x8C30 }, { 0xC0BF, 0x63FD }, { 0xC0C0, 0x89C8 }, { 0xC0C1, 0x61D2 }, { 0xC0C2, 0x7F06 }, { 0xC0C3, 0x70C2 }, { 0xC0C4, 0x6EE5 }, { 0xC0C5, 0x7405 }, 
-	{ 0xC0C6, 0x6994 }, { 0xC0C7, 0x72FC }, { 0xC0C8, 0x5ECA }, { 0xC0C9, 0x90CE }, { 0xC0CA, 0x6717 }, { 0xC0CB, 0x6D6A }, { 0xC0CC, 0x635E }, { 0xC0CD, 0x52B3 }, 
-	{ 0xC0CE, 0x7262 }, { 0xC0CF, 0x8001 }, { 0xC0D0, 0x4F6C }, { 0xC0D1, 0x59E5 }, { 0xC0D2, 0x916A }, { 0xC0D3, 0x70D9 }, { 0xC0D4, 0x6D9D }, { 0xC0D5, 0x52D2 }, 
-	{ 0xC0D6, 0x4E50 }, { 0xC0D7, 0x96F7 }, { 0xC0D8, 0x956D }, { 0xC0D9, 0x857E }, { 0xC0DA, 0x78CA }, { 0xC0DB, 0x7D2F }, { 0xC0DC, 0x5121 }, { 0xC0DD, 0x5792 }, 
-	{ 0xC0DE, 0x64C2 }, { 0xC0DF, 0x808B }, { 0xC0E0, 0x7C7B }, { 0xC0E1, 0x6CEA }, { 0xC0E2, 0x68F1 }, { 0xC0E3, 0x695E }, { 0xC0E4, 0x51B7 }, { 0xC0E5, 0x5398 }, 
-	{ 0xC0E6, 0x68A8 }, { 0xC0E7, 0x7281 }, { 0xC0E8, 0x9ECE }, { 0xC0E9, 0x7BF1 }, { 0xC0EA, 0x72F8 }, { 0xC0EB, 0x79BB }, { 0xC0EC, 0x6F13 }, { 0xC0ED, 0x7406 }, 
-	{ 0xC0EE, 0x674E }, { 0xC0EF, 0x91CC }, { 0xC0F0, 0x9CA4 }, { 0xC0F1, 0x793C }, { 0xC0F2, 0x8389 }, { 0xC0F3, 0x8354 }, { 0xC0F4, 0x540F }, { 0xC0F5, 0x6817 }, 
-	{ 0xC0F6, 0x4E3D }, { 0xC0F7, 0x5389 }, { 0xC0F8, 0x52B1 }, { 0xC0F9, 0x783E }, { 0xC0FA, 0x5386 }, { 0xC0FB, 0x5229 }, { 0xC0FC, 0x5088 }, { 0xC0FD, 0x4F8B }, 
-	{ 0xC0FE, 0x4FD0 }, { 0xC1A1, 0x75E2 }, { 0xC1A2, 0x7ACB }, { 0xC1A3, 0x7C92 }, { 0xC1A4, 0x6CA5 }, { 0xC1A5, 0x96B6 }, { 0xC1A6, 0x529B }, { 0xC1A7, 0x7483 }, 
-	{ 0xC1A8, 0x54E9 }, { 0xC1A9, 0x4FE9 }, { 0xC1AA, 0x8054 }, { 0xC1AB, 0x83B2 }, { 0xC1AC, 0x8FDE }, { 0xC1AD, 0x9570 }, { 0xC1AE, 0x5EC9 }, { 0xC1AF, 0x601C }, 
-	{ 0xC1B0, 0x6D9F }, { 0xC1B1, 0x5E18 }, { 0xC1B2, 0x655B }, { 0xC1B3, 0x8138 }, { 0xC1B4, 0x94FE }, { 0xC1B5, 0x604B }, { 0xC1B6, 0x70BC }, { 0xC1B7, 0x7EC3 }, 
-	{ 0xC1B8, 0x7CAE }, { 0xC1B9, 0x51C9 }, { 0xC1BA, 0x6881 }, { 0xC1BB, 0x7CB1 }, { 0xC1BC, 0x826F }, { 0xC1BD, 0x4E24 }, { 0xC1BE, 0x8F86 }, { 0xC1BF, 0x91CF }, 
-	{ 0xC1C0, 0x667E }, { 0xC1C1, 0x4EAE }, { 0xC1C2, 0x8C05 }, { 0xC1C3, 0x64A9 }, { 0xC1C4, 0x804A }, { 0xC1C5, 0x50DA }, { 0xC1C6, 0x7597 }, { 0xC1C7, 0x71CE }, 
-	{ 0xC1C8, 0x5BE5 }, { 0xC1C9, 0x8FBD }, { 0xC1CA, 0x6F66 }, { 0xC1CB, 0x4E86 }, { 0xC1CC, 0x6482 }, { 0xC1CD, 0x9563 }, { 0xC1CE, 0x5ED6 }, { 0xC1CF, 0x6599 }, 
-	{ 0xC1D0, 0x5217 }, { 0xC1D1, 0x88C2 }, { 0xC1D2, 0x70C8 }, { 0xC1D3, 0x52A3 }, { 0xC1D4, 0x730E }, { 0xC1D5, 0x7433 }, { 0xC1D6, 0x6797 }, { 0xC1D7, 0x78F7 }, 
-	{ 0xC1D8, 0x9716 }, { 0xC1D9, 0x4E34 }, { 0xC1DA, 0x90BB }, { 0xC1DB, 0x9CDE }, { 0xC1DC, 0x6DCB }, { 0xC1DD, 0x51DB }, { 0xC1DE, 0x8D41 }, { 0xC1DF, 0x541D }, 
-	{ 0xC1E0, 0x62CE }, { 0xC1E1, 0x73B2 }, { 0xC1E2, 0x83F1 }, { 0xC1E3, 0x96F6 }, { 0xC1E4, 0x9F84 }, { 0xC1E5, 0x94C3 }, { 0xC1E6, 0x4F36 }, { 0xC1E7, 0x7F9A }, 
-	{ 0xC1E8, 0x51CC }, { 0xC1E9, 0x7075 }, { 0xC1EA, 0x9675 }, { 0xC1EB, 0x5CAD }, { 0xC1EC, 0x9886 }, { 0xC1ED, 0x53E6 }, { 0xC1EE, 0x4EE4 }, { 0xC1EF, 0x6E9C }, 
-	{ 0xC1F0, 0x7409 }, { 0xC1F1, 0x69B4 }, { 0xC1F2, 0x786B }, { 0xC1F3, 0x998F }, { 0xC1F4, 0x7559 }, { 0xC1F5, 0x5218 }, { 0xC1F6, 0x7624 }, { 0xC1F7, 0x6D41 }, 
-	{ 0xC1F8, 0x67F3 }, { 0xC1F9, 0x516D }, { 0xC1FA, 0x9F99 }, { 0xC1FB, 0x804B }, { 0xC1FC, 0x5499 }, { 0xC1FD, 0x7B3C }, { 0xC1FE, 0x7ABF }, { 0xC2A1, 0x9686 }, 
-	{ 0xC2A2, 0x5784 }, { 0xC2A3, 0x62E2 }, { 0xC2A4, 0x9647 }, { 0xC2A5, 0x697C }, { 0xC2A6, 0x5A04 }, { 0xC2A7, 0x6402 }, { 0xC2A8, 0x7BD3 }, { 0xC2A9, 0x6F0F }, 
-	{ 0xC2AA, 0x964B }, { 0xC2AB, 0x82A6 }, { 0xC2AC, 0x5362 }, { 0xC2AD, 0x9885 }, { 0xC2AE, 0x5E90 }, { 0xC2AF, 0x7089 }, { 0xC2B0, 0x63B3 }, { 0xC2B1, 0x5364 }, 
-	{ 0xC2B2, 0x864F }, { 0xC2B3, 0x9C81 }, { 0xC2B4, 0x9E93 }, { 0xC2B5, 0x788C }, { 0xC2B6, 0x9732 }, { 0xC2B7, 0x8DEF }, { 0xC2B8, 0x8D42 }, { 0xC2B9, 0x9E7F }, 
-	{ 0xC2BA, 0x6F5E }, { 0xC2BB, 0x7984 }, { 0xC2BC, 0x5F55 }, { 0xC2BD, 0x9646 }, { 0xC2BE, 0x622E }, { 0xC2BF, 0x9A74 }, { 0xC2C0, 0x5415 }, { 0xC2C1, 0x94DD }, 
-	{ 0xC2C2, 0x4FA3 }, { 0xC2C3, 0x65C5 }, { 0xC2C4, 0x5C65 }, { 0xC2C5, 0x5C61 }, { 0xC2C6, 0x7F15 }, { 0xC2C7, 0x8651 }, { 0xC2C8, 0x6C2F }, { 0xC2C9, 0x5F8B }, 
-	{ 0xC2CA, 0x7387 }, { 0xC2CB, 0x6EE4 }, { 0xC2CC, 0x7EFF }, { 0xC2CD, 0x5CE6 }, { 0xC2CE, 0x631B }, { 0xC2CF, 0x5B6A }, { 0xC2D0, 0x6EE6 }, { 0xC2D1, 0x5375 }, 
-	{ 0xC2D2, 0x4E71 }, { 0xC2D3, 0x63A0 }, { 0xC2D4, 0x7565 }, { 0xC2D5, 0x62A1 }, { 0xC2D6, 0x8F6E }, { 0xC2D7, 0x4F26 }, { 0xC2D8, 0x4ED1 }, { 0xC2D9, 0x6CA6 }, 
-	{ 0xC2DA, 0x7EB6 }, { 0xC2DB, 0x8BBA }, { 0xC2DC, 0x841D }, { 0xC2DD, 0x87BA }, { 0xC2DE, 0x7F57 }, { 0xC2DF, 0x903B }, { 0xC2E0, 0x9523 }, { 0xC2E1, 0x7BA9 }, 
-	{ 0xC2E2, 0x9AA1 }, { 0xC2E3, 0x88F8 }, { 0xC2E4, 0x843D }, { 0xC2E5, 0x6D1B }, { 0xC2E6, 0x9A86 }, { 0xC2E7, 0x7EDC }, { 0xC2E8, 0x5988 }, { 0xC2E9, 0x9EBB }, 
-	{ 0xC2EA, 0x739B }, { 0xC2EB, 0x7801 }, { 0xC2EC, 0x8682 }, { 0xC2ED, 0x9A6C }, { 0xC2EE, 0x9A82 }, { 0xC2EF, 0x561B }, { 0xC2F0, 0x5417 }, { 0xC2F1, 0x57CB }, 
-	{ 0xC2F2, 0x4E70 }, { 0xC2F3, 0x9EA6 }, { 0xC2F4, 0x5356 }, { 0xC2F5, 0x8FC8 }, { 0xC2F6, 0x8109 }, { 0xC2F7, 0x7792 }, { 0xC2F8, 0x9992 }, { 0xC2F9, 0x86EE }, 
-	{ 0xC2FA, 0x6EE1 }, { 0xC2FB, 0x8513 }, { 0xC2FC, 0x66FC }, { 0xC2FD, 0x6162 }, { 0xC2FE, 0x6F2B }, { 0xC3A1, 0x8C29 }, { 0xC3A2, 0x8292 }, { 0xC3A3, 0x832B }, 
-	{ 0xC3A4, 0x76F2 }, { 0xC3A5, 0x6C13 }, { 0xC3A6, 0x5FD9 }, { 0xC3A7, 0x83BD }, { 0xC3A8, 0x732B }, { 0xC3A9, 0x8305 }, { 0xC3AA, 0x951A }, { 0xC3AB, 0x6BDB }, 
-	{ 0xC3AC, 0x77DB }, { 0xC3AD, 0x94C6 }, { 0xC3AE, 0x536F }, { 0xC3AF, 0x8302 }, { 0xC3B0, 0x5192 }, { 0xC3B1, 0x5E3D }, { 0xC3B2, 0x8C8C }, { 0xC3B3, 0x8D38 }, 
-	{ 0xC3B4, 0x4E48 }, { 0xC3B5, 0x73AB }, { 0xC3B6, 0x679A }, { 0xC3B7, 0x6885 }, { 0xC3B8, 0x9176 }, { 0xC3B9, 0x9709 }, { 0xC3BA, 0x7164 }, { 0xC3BB, 0x6CA1 }, 
-	{ 0xC3BC, 0x7709 }, { 0xC3BD, 0x5A92 }, { 0xC3BE, 0x9541 }, { 0xC3BF, 0x6BCF }, { 0xC3C0, 0x7F8E }, { 0xC3C1, 0x6627 }, { 0xC3C2, 0x5BD0 }, { 0xC3C3, 0x59B9 }, 
-	{ 0xC3C4, 0x5A9A }, { 0xC3C5, 0x95E8 }, { 0xC3C6, 0x95F7 }, { 0xC3C7, 0x4EEC }, { 0xC3C8, 0x840C }, { 0xC3C9, 0x8499 }, { 0xC3CA, 0x6AAC }, { 0xC3CB, 0x76DF }, 
-	{ 0xC3CC, 0x9530 }, { 0xC3CD, 0x731B }, { 0xC3CE, 0x68A6 }, { 0xC3CF, 0x5B5F }, { 0xC3D0, 0x772F }, { 0xC3D1, 0x919A }, { 0xC3D2, 0x9761 }, { 0xC3D3, 0x7CDC }, 
-	{ 0xC3D4, 0x8FF7 }, { 0xC3D5, 0x8C1C }, { 0xC3D6, 0x5F25 }, { 0xC3D7, 0x7C73 }, { 0xC3D8, 0x79D8 }, { 0xC3D9, 0x89C5 }, { 0xC3DA, 0x6CCC }, { 0xC3DB, 0x871C }, 
-	{ 0xC3DC, 0x5BC6 }, { 0xC3DD, 0x5E42 }, { 0xC3DE, 0x68C9 }, { 0xC3DF, 0x7720 }, { 0xC3E0, 0x7EF5 }, { 0xC3E1, 0x5195 }, { 0xC3E2, 0x514D }, { 0xC3E3, 0x52C9 }, 
-	{ 0xC3E4, 0x5A29 }, { 0xC3E5, 0x7F05 }, { 0xC3E6, 0x9762 }, { 0xC3E7, 0x82D7 }, { 0xC3E8, 0x63CF }, { 0xC3E9, 0x7784 }, { 0xC3EA, 0x85D0 }, { 0xC3EB, 0x79D2 }, 
-	{ 0xC3EC, 0x6E3A }, { 0xC3ED, 0x5E99 }, { 0xC3EE, 0x5999 }, { 0xC3EF, 0x8511 }, { 0xC3F0, 0x706D }, { 0xC3F1, 0x6C11 }, { 0xC3F2, 0x62BF }, { 0xC3F3, 0x76BF }, 
-	{ 0xC3F4, 0x654F }, { 0xC3F5, 0x60AF }, { 0xC3F6, 0x95FD }, { 0xC3F7, 0x660E }, { 0xC3F8, 0x879F }, { 0xC3F9, 0x9E23 }, { 0xC3FA, 0x94ED }, { 0xC3FB, 0x540D }, 
-	{ 0xC3FC, 0x547D }, { 0xC3FD, 0x8C2C }, { 0xC3FE, 0x6478 }, { 0xC4A1, 0x6479 }, { 0xC4A2, 0x8611 }, { 0xC4A3, 0x6A21 }, { 0xC4A4, 0x819C }, { 0xC4A5, 0x78E8 }, 
-	{ 0xC4A6, 0x6469 }, { 0xC4A7, 0x9B54 }, { 0xC4A8, 0x62B9 }, { 0xC4A9, 0x672B }, { 0xC4AA, 0x83AB }, { 0xC4AB, 0x58A8 }, { 0xC4AC, 0x9ED8 }, { 0xC4AD, 0x6CAB }, 
-	{ 0xC4AE, 0x6F20 }, { 0xC4AF, 0x5BDE }, { 0xC4B0, 0x964C }, { 0xC4B1, 0x8C0B }, { 0xC4B2, 0x725F }, { 0xC4B3, 0x67D0 }, { 0xC4B4, 0x62C7 }, { 0xC4B5, 0x7261 }, 
-	{ 0xC4B6, 0x4EA9 }, { 0xC4B7, 0x59C6 }, { 0xC4B8, 0x6BCD }, { 0xC4B9, 0x5893 }, { 0xC4BA, 0x66AE }, { 0xC4BB, 0x5E55 }, { 0xC4BC, 0x52DF }, { 0xC4BD, 0x6155 }, 
-	{ 0xC4BE, 0x6728 }, { 0xC4BF, 0x76EE }, { 0xC4C0, 0x7766 }, { 0xC4C1, 0x7267 }, { 0xC4C2, 0x7A46 }, { 0xC4C3, 0x62FF }, { 0xC4C4, 0x54EA }, { 0xC4C5, 0x5450 }, 
-	{ 0xC4C6, 0x94A0 }, { 0xC4C7, 0x90A3 }, { 0xC4C8, 0x5A1C }, { 0xC4C9, 0x7EB3 }, { 0xC4CA, 0x6C16 }, { 0xC4CB, 0x4E43 }, { 0xC4CC, 0x5976 }, { 0xC4CD, 0x8010 }, 
-	{ 0xC4CE, 0x5948 }, { 0xC4CF, 0x5357 }, { 0xC4D0, 0x7537 }, { 0xC4D1, 0x96BE }, { 0xC4D2, 0x56CA }, { 0xC4D3, 0x6320 }, { 0xC4D4, 0x8111 }, { 0xC4D5, 0x607C }, 
-	{ 0xC4D6, 0x95F9 }, { 0xC4D7, 0x6DD6 }, { 0xC4D8, 0x5462 }, { 0xC4D9, 0x9981 }, { 0xC4DA, 0x5185 }, { 0xC4DB, 0x5AE9 }, { 0xC4DC, 0x80FD }, { 0xC4DD, 0x59AE }, 
-	{ 0xC4DE, 0x9713 }, { 0xC4DF, 0x502A }, { 0xC4E0, 0x6CE5 }, { 0xC4E1, 0x5C3C }, { 0xC4E2, 0x62DF }, { 0xC4E3, 0x4F60 }, { 0xC4E4, 0x533F }, { 0xC4E5, 0x817B }, 
-	{ 0xC4E6, 0x9006 }, { 0xC4E7, 0x6EBA }, { 0xC4E8, 0x852B }, { 0xC4E9, 0x62C8 }, { 0xC4EA, 0x5E74 }, { 0xC4EB, 0x78BE }, { 0xC4EC, 0x64B5 }, { 0xC4ED, 0x637B }, 
-	{ 0xC4EE, 0x5FF5 }, { 0xC4EF, 0x5A18 }, { 0xC4F0, 0x917F }, { 0xC4F1, 0x9E1F }, { 0xC4F2, 0x5C3F }, { 0xC4F3, 0x634F }, { 0xC4F4, 0x8042 }, { 0xC4F5, 0x5B7D }, 
-	{ 0xC4F6, 0x556E }, { 0xC4F7, 0x954A }, { 0xC4F8, 0x954D }, { 0xC4F9, 0x6D85 }, { 0xC4FA, 0x60A8 }, { 0xC4FB, 0x67E0 }, { 0xC4FC, 0x72DE }, { 0xC4FD, 0x51DD }, 
-	{ 0xC4FE, 0x5B81 }, { 0xC5A1, 0x62E7 }, { 0xC5A2, 0x6CDE }, { 0xC5A3, 0x725B }, { 0xC5A4, 0x626D }, { 0xC5A5, 0x94AE }, { 0xC5A6, 0x7EBD }, { 0xC5A7, 0x8113 }, 
-	{ 0xC5A8, 0x6D53 }, { 0xC5A9, 0x519C }, { 0xC5AA, 0x5F04 }, { 0xC5AB, 0x5974 }, { 0xC5AC, 0x52AA }, { 0xC5AD, 0x6012 }, { 0xC5AE, 0x5973 }, { 0xC5AF, 0x6696 }, 
-	{ 0xC5B0, 0x8650 }, { 0xC5B1, 0x759F }, { 0xC5B2, 0x632A }, { 0xC5B3, 0x61E6 }, { 0xC5B4, 0x7CEF }, { 0xC5B5, 0x8BFA }, { 0xC5B6, 0x54E6 }, { 0xC5B7, 0x6B27 }, 
-	{ 0xC5B8, 0x9E25 }, { 0xC5B9, 0x6BB4 }, { 0xC5BA, 0x85D5 }, { 0xC5BB, 0x5455 }, { 0xC5BC, 0x5076 }, { 0xC5BD, 0x6CA4 }, { 0xC5BE, 0x556A }, { 0xC5BF, 0x8DB4 }, 
-	{ 0xC5C0, 0x722C }, { 0xC5C1, 0x5E15 }, { 0xC5C2, 0x6015 }, { 0xC5C3, 0x7436 }, { 0xC5C4, 0x62CD }, { 0xC5C5, 0x6392 }, { 0xC5C6, 0x724C }, { 0xC5C7, 0x5F98 }, 
-	{ 0xC5C8, 0x6E43 }, { 0xC5C9, 0x6D3E }, { 0xC5CA, 0x6500 }, { 0xC5CB, 0x6F58 }, { 0xC5CC, 0x76D8 }, { 0xC5CD, 0x78D0 }, { 0xC5CE, 0x76FC }, { 0xC5CF, 0x7554 }, 
-	{ 0xC5D0, 0x5224 }, { 0xC5D1, 0x53DB }, { 0xC5D2, 0x4E53 }, { 0xC5D3, 0x5E9E }, { 0xC5D4, 0x65C1 }, { 0xC5D5, 0x802A }, { 0xC5D6, 0x80D6 }, { 0xC5D7, 0x629B }, 
-	{ 0xC5D8, 0x5486 }, { 0xC5D9, 0x5228 }, { 0xC5DA, 0x70AE }, { 0xC5DB, 0x888D }, { 0xC5DC, 0x8DD1 }, { 0xC5DD, 0x6CE1 }, { 0xC5DE, 0x5478 }, { 0xC5DF, 0x80DA }, 
-	{ 0xC5E0, 0x57F9 }, { 0xC5E1, 0x88F4 }, { 0xC5E2, 0x8D54 }, { 0xC5E3, 0x966A }, { 0xC5E4, 0x914D }, { 0xC5E5, 0x4F69 }, { 0xC5E6, 0x6C9B }, { 0xC5E7, 0x55B7 }, 
-	{ 0xC5E8, 0x76C6 }, { 0xC5E9, 0x7830 }, { 0xC5EA, 0x62A8 }, { 0xC5EB, 0x70F9 }, { 0xC5EC, 0x6F8E }, { 0xC5ED, 0x5F6D }, { 0xC5EE, 0x84EC }, { 0xC5EF, 0x68DA }, 
-	{ 0xC5F0, 0x787C }, { 0xC5F1, 0x7BF7 }, { 0xC5F2, 0x81A8 }, { 0xC5F3, 0x670B }, { 0xC5F4, 0x9E4F }, { 0xC5F5, 0x6367 }, { 0xC5F6, 0x78B0 }, { 0xC5F7, 0x576F }, 
-	{ 0xC5F8, 0x7812 }, { 0xC5F9, 0x9739 }, { 0xC5FA, 0x6279 }, { 0xC5FB, 0x62AB }, { 0xC5FC, 0x5288 }, { 0xC5FD, 0x7435 }, { 0xC5FE, 0x6BD7 }, { 0xC6A1, 0x5564 }, 
-	{ 0xC6A2, 0x813E }, { 0xC6A3, 0x75B2 }, { 0xC6A4, 0x76AE }, { 0xC6A5, 0x5339 }, { 0xC6A6, 0x75DE }, { 0xC6A7, 0x50FB }, { 0xC6A8, 0x5C41 }, { 0xC6A9, 0x8B6C }, 
-	{ 0xC6AA, 0x7BC7 }, { 0xC6AB, 0x504F }, { 0xC6AC, 0x7247 }, { 0xC6AD, 0x9A97 }, { 0xC6AE, 0x98D8 }, { 0xC6AF, 0x6F02 }, { 0xC6B0, 0x74E2 }, { 0xC6B1, 0x7968 }, 
-	{ 0xC6B2, 0x6487 }, { 0xC6B3, 0x77A5 }, { 0xC6B4, 0x62FC }, { 0xC6B5, 0x9891 }, { 0xC6B6, 0x8D2B }, { 0xC6B7, 0x54C1 }, { 0xC6B8, 0x8058 }, { 0xC6B9, 0x4E52 }, 
-	{ 0xC6BA, 0x576A }, { 0xC6BB, 0x82F9 }, { 0xC6BC, 0x840D }, { 0xC6BD, 0x5E73 }, { 0xC6BE, 0x51ED }, { 0xC6BF, 0x74F6 }, { 0xC6C0, 0x8BC4 }, { 0xC6C1, 0x5C4F }, 
-	{ 0xC6C2, 0x5761 }, { 0xC6C3, 0x6CFC }, { 0xC6C4, 0x9887 }, { 0xC6C5, 0x5A46 }, { 0xC6C6, 0x7834 }, { 0xC6C7, 0x9B44 }, { 0xC6C8, 0x8FEB }, { 0xC6C9, 0x7C95 }, 
-	{ 0xC6CA, 0x5256 }, { 0xC6CB, 0x6251 }, { 0xC6CC, 0x94FA }, { 0xC6CD, 0x4EC6 }, { 0xC6CE, 0x8386 }, { 0xC6CF, 0x8461 }, { 0xC6D0, 0x83E9 }, { 0xC6D1, 0x84B2 }, 
-	{ 0xC6D2, 0x57D4 }, { 0xC6D3, 0x6734 }, { 0xC6D4, 0x5703 }, { 0xC6D5, 0x666E }, { 0xC6D6, 0x6D66 }, { 0xC6D7, 0x8C31 }, { 0xC6D8, 0x66DD }, { 0xC6D9, 0x7011 }, 
-	{ 0xC6DA, 0x671F }, { 0xC6DB, 0x6B3A }, { 0xC6DC, 0x6816 }, { 0xC6DD, 0x621A }, { 0xC6DE, 0x59BB }, { 0xC6DF, 0x4E03 }, { 0xC6E0, 0x51C4 }, { 0xC6E1, 0x6F06 }, 
-	{ 0xC6E2, 0x67D2 }, { 0xC6E3, 0x6C8F }, { 0xC6E4, 0x5176 }, { 0xC6E5, 0x68CB }, { 0xC6E6, 0x5947 }, { 0xC6E7, 0x6B67 }, { 0xC6E8, 0x7566 }, { 0xC6E9, 0x5D0E }, 
-	{ 0xC6EA, 0x8110 }, { 0xC6EB, 0x9F50 }, { 0xC6EC, 0x65D7 }, { 0xC6ED, 0x7948 }, { 0xC6EE, 0x7941 }, { 0xC6EF, 0x9A91 }, { 0xC6F0, 0x8D77 }, { 0xC6F1, 0x5C82 }, 
-	{ 0xC6F2, 0x4E5E }, { 0xC6F3, 0x4F01 }, { 0xC6F4, 0x542F }, { 0xC6F5, 0x5951 }, { 0xC6F6, 0x780C }, { 0xC6F7, 0x5668 }, { 0xC6F8, 0x6C14 }, { 0xC6F9, 0x8FC4 }, 
-	{ 0xC6FA, 0x5F03 }, { 0xC6FB, 0x6C7D }, { 0xC6FC, 0x6CE3 }, { 0xC6FD, 0x8BAB }, { 0xC6FE, 0x6390 }, { 0xC7A1, 0x6070 }, { 0xC7A2, 0x6D3D }, { 0xC7A3, 0x7275 }, 
-	{ 0xC7A4, 0x6266 }, { 0xC7A5, 0x948E }, { 0xC7A6, 0x94C5 }, { 0xC7A7, 0x5343 }, { 0xC7A8, 0x8FC1 }, { 0xC7A9, 0x7B7E }, { 0xC7AA, 0x4EDF }, { 0xC7AB, 0x8C26 }, 
-	{ 0xC7AC, 0x4E7E }, { 0xC7AD, 0x9ED4 }, { 0xC7AE, 0x94B1 }, { 0xC7AF, 0x94B3 }, { 0xC7B0, 0x524D }, { 0xC7B1, 0x6F5C }, { 0xC7B2, 0x9063 }, { 0xC7B3, 0x6D45 }, 
-	{ 0xC7B4, 0x8C34 }, { 0xC7B5, 0x5811 }, { 0xC7B6, 0x5D4C }, { 0xC7B7, 0x6B20 }, { 0xC7B8, 0x6B49 }, { 0xC7B9, 0x67AA }, { 0xC7BA, 0x545B }, { 0xC7BB, 0x8154 }, 
-	{ 0xC7BC, 0x7F8C }, { 0xC7BD, 0x5899 }, { 0xC7BE, 0x8537 }, { 0xC7BF, 0x5F3A }, { 0xC7C0, 0x62A2 }, { 0xC7C1, 0x6A47 }, { 0xC7C2, 0x9539 }, { 0xC7C3, 0x6572 }, 
-	{ 0xC7C4, 0x6084 }, { 0xC7C5, 0x6865 }, { 0xC7C6, 0x77A7 }, { 0xC7C7, 0x4E54 }, { 0xC7C8, 0x4FA8 }, { 0xC7C9, 0x5DE7 }, { 0xC7CA, 0x9798 }, { 0xC7CB, 0x64AC }, 
-	{ 0xC7CC, 0x7FD8 }, { 0xC7CD, 0x5CED }, { 0xC7CE, 0x4FCF }, { 0xC7CF, 0x7A8D }, { 0xC7D0, 0x5207 }, { 0xC7D1, 0x8304 }, { 0xC7D2, 0x4E14 }, { 0xC7D3, 0x602F }, 
-	{ 0xC7D4, 0x7A83 }, { 0xC7D5, 0x94A6 }, { 0xC7D6, 0x4FB5 }, { 0xC7D7, 0x4EB2 }, { 0xC7D8, 0x79E6 }, { 0xC7D9, 0x7434 }, { 0xC7DA, 0x52E4 }, { 0xC7DB, 0x82B9 }, 
-	{ 0xC7DC, 0x64D2 }, { 0xC7DD, 0x79BD }, { 0xC7DE, 0x5BDD }, { 0xC7DF, 0x6C81 }, { 0xC7E0, 0x9752 }, { 0xC7E1, 0x8F7B }, { 0xC7E2, 0x6C22 }, { 0xC7E3, 0x503E }, 
-	{ 0xC7E4, 0x537F }, { 0xC7E5, 0x6E05 }, { 0xC7E6, 0x64CE }, { 0xC7E7, 0x6674 }, { 0xC7E8, 0x6C30 }, { 0xC7E9, 0x60C5 }, { 0xC7EA, 0x9877 }, { 0xC7EB, 0x8BF7 }, 
-	{ 0xC7EC, 0x5E86 }, { 0xC7ED, 0x743C }, { 0xC7EE, 0x7A77 }, { 0xC7EF, 0x79CB }, { 0xC7F0, 0x4E18 }, { 0xC7F1, 0x90B1 }, { 0xC7F2, 0x7403 }, { 0xC7F3, 0x6C42 }, 
-	{ 0xC7F4, 0x56DA }, { 0xC7F5, 0x914B }, { 0xC7F6, 0x6CC5 }, { 0xC7F7, 0x8D8B }, { 0xC7F8, 0x533A }, { 0xC7F9, 0x86C6 }, { 0xC7FA, 0x66F2 }, { 0xC7FB, 0x8EAF }, 
-	{ 0xC7FC, 0x5C48 }, { 0xC7FD, 0x9A71 }, { 0xC7FE, 0x6E20 }, { 0xC8A1, 0x53D6 }, { 0xC8A2, 0x5A36 }, { 0xC8A3, 0x9F8B }, { 0xC8A4, 0x8DA3 }, { 0xC8A5, 0x53BB }, 
-	{ 0xC8A6, 0x5708 }, { 0xC8A7, 0x98A7 }, { 0xC8A8, 0x6743 }, { 0xC8A9, 0x919B }, { 0xC8AA, 0x6CC9 }, { 0xC8AB, 0x5168 }, { 0xC8AC, 0x75CA }, { 0xC8AD, 0x62F3 }, 
-	{ 0xC8AE, 0x72AC }, { 0xC8AF, 0x5238 }, { 0xC8B0, 0x529D }, { 0xC8B1, 0x7F3A }, { 0xC8B2, 0x7094 }, { 0xC8B3, 0x7638 }, { 0xC8B4, 0x5374 }, { 0xC8B5, 0x9E4A }, 
-	{ 0xC8B6, 0x69B7 }, { 0xC8B7, 0x786E }, { 0xC8B8, 0x96C0 }, { 0xC8B9, 0x88D9 }, { 0xC8BA, 0x7FA4 }, { 0xC8BB, 0x7136 }, { 0xC8BC, 0x71C3 }, { 0xC8BD, 0x5189 }, 
-	{ 0xC8BE, 0x67D3 }, { 0xC8BF, 0x74E4 }, { 0xC8C0, 0x58E4 }, { 0xC8C1, 0x6518 }, { 0xC8C2, 0x56B7 }, { 0xC8C3, 0x8BA9 }, { 0xC8C4, 0x9976 }, { 0xC8C5, 0x6270 }, 
-	{ 0xC8C6, 0x7ED5 }, { 0xC8C7, 0x60F9 }, { 0xC8C8, 0x70ED }, { 0xC8C9, 0x58EC }, { 0xC8CA, 0x4EC1 }, { 0xC8CB, 0x4EBA }, { 0xC8CC, 0x5FCD }, { 0xC8CD, 0x97E7 }, 
-	{ 0xC8CE, 0x4EFB }, { 0xC8CF, 0x8BA4 }, { 0xC8D0, 0x5203 }, { 0xC8D1, 0x598A }, { 0xC8D2, 0x7EAB }, { 0xC8D3, 0x6254 }, { 0xC8D4, 0x4ECD }, { 0xC8D5, 0x65E5 }, 
-	{ 0xC8D6, 0x620E }, { 0xC8D7, 0x8338 }, { 0xC8D8, 0x84C9 }, { 0xC8D9, 0x8363 }, { 0xC8DA, 0x878D }, { 0xC8DB, 0x7194 }, { 0xC8DC, 0x6EB6 }, { 0xC8DD, 0x5BB9 }, 
-	{ 0xC8DE, 0x7ED2 }, { 0xC8DF, 0x5197 }, { 0xC8E0, 0x63C9 }, { 0xC8E1, 0x67D4 }, { 0xC8E2, 0x8089 }, { 0xC8E3, 0x8339 }, { 0xC8E4, 0x8815 }, { 0xC8E5, 0x5112 }, 
-	{ 0xC8E6, 0x5B7A }, { 0xC8E7, 0x5982 }, { 0xC8E8, 0x8FB1 }, { 0xC8E9, 0x4E73 }, { 0xC8EA, 0x6C5D }, { 0xC8EB, 0x5165 }, { 0xC8EC, 0x8925 }, { 0xC8ED, 0x8F6F }, 
-	{ 0xC8EE, 0x962E }, { 0xC8EF, 0x854A }, { 0xC8F0, 0x745E }, { 0xC8F1, 0x9510 }, { 0xC8F2, 0x95F0 }, { 0xC8F3, 0x6DA6 }, { 0xC8F4, 0x82E5 }, { 0xC8F5, 0x5F31 }, 
-	{ 0xC8F6, 0x6492 }, { 0xC8F7, 0x6D12 }, { 0xC8F8, 0x8428 }, { 0xC8F9, 0x816E }, { 0xC8FA, 0x9CC3 }, { 0xC8FB, 0x585E }, { 0xC8FC, 0x8D5B }, { 0xC8FD, 0x4E09 }, 
-	{ 0xC8FE, 0x53C1 }, { 0xC9A1, 0x4F1E }, { 0xC9A2, 0x6563 }, { 0xC9A3, 0x6851 }, { 0xC9A4, 0x55D3 }, { 0xC9A5, 0x4E27 }, { 0xC9A6, 0x6414 }, { 0xC9A7, 0x9A9A }, 
-	{ 0xC9A8, 0x626B }, { 0xC9A9, 0x5AC2 }, { 0xC9AA, 0x745F }, { 0xC9AB, 0x8272 }, { 0xC9AC, 0x6DA9 }, { 0xC9AD, 0x68EE }, { 0xC9AE, 0x50E7 }, { 0xC9AF, 0x838E }, 
-	{ 0xC9B0, 0x7802 }, { 0xC9B1, 0x6740 }, { 0xC9B2, 0x5239 }, { 0xC9B3, 0x6C99 }, { 0xC9B4, 0x7EB1 }, { 0xC9B5, 0x50BB }, { 0xC9B6, 0x5565 }, { 0xC9B7, 0x715E }, 
-	{ 0xC9B8, 0x7B5B }, { 0xC9B9, 0x6652 }, { 0xC9BA, 0x73CA }, { 0xC9BB, 0x82EB }, { 0xC9BC, 0x6749 }, { 0xC9BD, 0x5C71 }, { 0xC9BE, 0x5220 }, { 0xC9BF, 0x717D }, 
-	{ 0xC9C0, 0x886B }, { 0xC9C1, 0x95EA }, { 0xC9C2, 0x9655 }, { 0xC9C3, 0x64C5 }, { 0xC9C4, 0x8D61 }, { 0xC9C5, 0x81B3 }, { 0xC9C6, 0x5584 }, { 0xC9C7, 0x6C55 }, 
-	{ 0xC9C8, 0x6247 }, { 0xC9C9, 0x7F2E }, { 0xC9CA, 0x5892 }, { 0xC9CB, 0x4F24 }, { 0xC9CC, 0x5546 }, { 0xC9CD, 0x8D4F }, { 0xC9CE, 0x664C }, { 0xC9CF, 0x4E0A }, 
-	{ 0xC9D0, 0x5C1A }, { 0xC9D1, 0x88F3 }, { 0xC9D2, 0x68A2 }, { 0xC9D3, 0x634E }, { 0xC9D4, 0x7A0D }, { 0xC9D5, 0x70E7 }, { 0xC9D6, 0x828D }, { 0xC9D7, 0x52FA }, 
-	{ 0xC9D8, 0x97F6 }, { 0xC9D9, 0x5C11 }, { 0xC9DA, 0x54E8 }, { 0xC9DB, 0x90B5 }, { 0xC9DC, 0x7ECD }, { 0xC9DD, 0x5962 }, { 0xC9DE, 0x8D4A }, { 0xC9DF, 0x86C7 }, 
-	{ 0xC9E0, 0x820C }, { 0xC9E1, 0x820D }, { 0xC9E2, 0x8D66 }, { 0xC9E3, 0x6444 }, { 0xC9E4, 0x5C04 }, { 0xC9E5, 0x6151 }, { 0xC9E6, 0x6D89 }, { 0xC9E7, 0x793E }, 
-	{ 0xC9E8, 0x8BBE }, { 0xC9E9, 0x7837 }, { 0xC9EA, 0x7533 }, { 0xC9EB, 0x547B }, { 0xC9EC, 0x4F38 }, { 0xC9ED, 0x8EAB }, { 0xC9EE, 0x6DF1 }, { 0xC9EF, 0x5A20 }, 
-	{ 0xC9F0, 0x7EC5 }, { 0xC9F1, 0x795E }, { 0xC9F2, 0x6C88 }, { 0xC9F3, 0x5BA1 }, { 0xC9F4, 0x5A76 }, { 0xC9F5, 0x751A }, { 0xC9F6, 0x80BE }, { 0xC9F7, 0x614E }, 
-	{ 0xC9F8, 0x6E17 }, { 0xC9F9, 0x58F0 }, { 0xC9FA, 0x751F }, { 0xC9FB, 0x7525 }, { 0xC9FC, 0x7272 }, { 0xC9FD, 0x5347 }, { 0xC9FE, 0x7EF3 }, { 0xCAA1, 0x7701 }, 
-	{ 0xCAA2, 0x76DB }, { 0xCAA3, 0x5269 }, { 0xCAA4, 0x80DC }, { 0xCAA5, 0x5723 }, { 0xCAA6, 0x5E08 }, { 0xCAA7, 0x5931 }, { 0xCAA8, 0x72EE }, { 0xCAA9, 0x65BD }, 
-	{ 0xCAAA, 0x6E7F }, { 0xCAAB, 0x8BD7 }, { 0xCAAC, 0x5C38 }, { 0xCAAD, 0x8671 }, { 0xCAAE, 0x5341 }, { 0xCAAF, 0x77F3 }, { 0xCAB0, 0x62FE }, { 0xCAB1, 0x65F6 }, 
-	{ 0xCAB2, 0x4EC0 }, { 0xCAB3, 0x98DF }, { 0xCAB4, 0x8680 }, { 0xCAB5, 0x5B9E }, { 0xCAB6, 0x8BC6 }, { 0xCAB7, 0x53F2 }, { 0xCAB8, 0x77E2 }, { 0xCAB9, 0x4F7F }, 
-	{ 0xCABA, 0x5C4E }, { 0xCABB, 0x9A76 }, { 0xCABC, 0x59CB }, { 0xCABD, 0x5F0F }, { 0xCABE, 0x793A }, { 0xCABF, 0x58EB }, { 0xCAC0, 0x4E16 }, { 0xCAC1, 0x67FF }, 
-	{ 0xCAC2, 0x4E8B }, { 0xCAC3, 0x62ED }, { 0xCAC4, 0x8A93 }, { 0xCAC5, 0x901D }, { 0xCAC6, 0x52BF }, { 0xCAC7, 0x662F }, { 0xCAC8, 0x55DC }, { 0xCAC9, 0x566C }, 
-	{ 0xCACA, 0x9002 }, { 0xCACB, 0x4ED5 }, { 0xCACC, 0x4F8D }, { 0xCACD, 0x91CA }, { 0xCACE, 0x9970 }, { 0xCACF, 0x6C0F }, { 0xCAD0, 0x5E02 }, { 0xCAD1, 0x6043 }, 
-	{ 0xCAD2, 0x5BA4 }, { 0xCAD3, 0x89C6 }, { 0xCAD4, 0x8BD5 }, { 0xCAD5, 0x6536 }, { 0xCAD6, 0x624B }, { 0xCAD7, 0x9996 }, { 0xCAD8, 0x5B88 }, { 0xCAD9, 0x5BFF }, 
-	{ 0xCADA, 0x6388 }, { 0xCADB, 0x552E }, { 0xCADC, 0x53D7 }, { 0xCADD, 0x7626 }, { 0xCADE, 0x517D }, { 0xCADF, 0x852C }, { 0xCAE0, 0x67A2 }, { 0xCAE1, 0x68B3 }, 
-	{ 0xCAE2, 0x6B8A }, { 0xCAE3, 0x6292 }, { 0xCAE4, 0x8F93 }, { 0xCAE5, 0x53D4 }, { 0xCAE6, 0x8212 }, { 0xCAE7, 0x6DD1 }, { 0xCAE8, 0x758F }, { 0xCAE9, 0x4E66 }, 
-	{ 0xCAEA, 0x8D4E }, { 0xCAEB, 0x5B70 }, { 0xCAEC, 0x719F }, { 0xCAED, 0x85AF }, { 0xCAEE, 0x6691 }, { 0xCAEF, 0x66D9 }, { 0xCAF0, 0x7F72 }, { 0xCAF1, 0x8700 }, 
-	{ 0xCAF2, 0x9ECD }, { 0xCAF3, 0x9F20 }, { 0xCAF4, 0x5C5E }, { 0xCAF5, 0x672F }, { 0xCAF6, 0x8FF0 }, { 0xCAF7, 0x6811 }, { 0xCAF8, 0x675F }, { 0xCAF9, 0x620D }, 
-	{ 0xCAFA, 0x7AD6 }, { 0xCAFB, 0x5885 }, { 0xCAFC, 0x5EB6 }, { 0xCAFD, 0x6570 }, { 0xCAFE, 0x6F31 }, { 0xCBA1, 0x6055 }, { 0xCBA2, 0x5237 }, { 0xCBA3, 0x800D }, 
-	{ 0xCBA4, 0x6454 }, { 0xCBA5, 0x8870 }, { 0xCBA6, 0x7529 }, { 0xCBA7, 0x5E05 }, { 0xCBA8, 0x6813 }, { 0xCBA9, 0x62F4 }, { 0xCBAA, 0x971C }, { 0xCBAB, 0x53CC }, 
-	{ 0xCBAC, 0x723D }, { 0xCBAD, 0x8C01 }, { 0xCBAE, 0x6C34 }, { 0xCBAF, 0x7761 }, { 0xCBB0, 0x7A0E }, { 0xCBB1, 0x542E }, { 0xCBB2, 0x77AC }, { 0xCBB3, 0x987A }, 
-	{ 0xCBB4, 0x821C }, { 0xCBB5, 0x8BF4 }, { 0xCBB6, 0x7855 }, { 0xCBB7, 0x6714 }, { 0xCBB8, 0x70C1 }, { 0xCBB9, 0x65AF }, { 0xCBBA, 0x6495 }, { 0xCBBB, 0x5636 }, 
-	{ 0xCBBC, 0x601D }, { 0xCBBD, 0x79C1 }, { 0xCBBE, 0x53F8 }, { 0xCBBF, 0x4E1D }, { 0xCBC0, 0x6B7B }, { 0xCBC1, 0x8086 }, { 0xCBC2, 0x5BFA }, { 0xCBC3, 0x55E3 }, 
-	{ 0xCBC4, 0x56DB }, { 0xCBC5, 0x4F3A }, { 0xCBC6, 0x4F3C }, { 0xCBC7, 0x9972 }, { 0xCBC8, 0x5DF3 }, { 0xCBC9, 0x677E }, { 0xCBCA, 0x8038 }, { 0xCBCB, 0x6002 }, 
-	{ 0xCBCC, 0x9882 }, { 0xCBCD, 0x9001 }, { 0xCBCE, 0x5B8B }, { 0xCBCF, 0x8BBC }, { 0xCBD0, 0x8BF5 }, { 0xCBD1, 0x641C }, { 0xCBD2, 0x8258 }, { 0xCBD3, 0x64DE }, 
-	{ 0xCBD4, 0x55FD }, { 0xCBD5, 0x82CF }, { 0xCBD6, 0x9165 }, { 0xCBD7, 0x4FD7 }, { 0xCBD8, 0x7D20 }, { 0xCBD9, 0x901F }, { 0xCBDA, 0x7C9F }, { 0xCBDB, 0x50F3 }, 
-	{ 0xCBDC, 0x5851 }, { 0xCBDD, 0x6EAF }, { 0xCBDE, 0x5BBF }, { 0xCBDF, 0x8BC9 }, { 0xCBE0, 0x8083 }, { 0xCBE1, 0x9178 }, { 0xCBE2, 0x849C }, { 0xCBE3, 0x7B97 }, 
-	{ 0xCBE4, 0x867D }, { 0xCBE5, 0x968B }, { 0xCBE6, 0x968F }, { 0xCBE7, 0x7EE5 }, { 0xCBE8, 0x9AD3 }, { 0xCBE9, 0x788E }, { 0xCBEA, 0x5C81 }, { 0xCBEB, 0x7A57 }, 
-	{ 0xCBEC, 0x9042 }, { 0xCBED, 0x96A7 }, { 0xCBEE, 0x795F }, { 0xCBEF, 0x5B59 }, { 0xCBF0, 0x635F }, { 0xCBF1, 0x7B0B }, { 0xCBF2, 0x84D1 }, { 0xCBF3, 0x68AD }, 
-	{ 0xCBF4, 0x5506 }, { 0xCBF5, 0x7F29 }, { 0xCBF6, 0x7410 }, { 0xCBF7, 0x7D22 }, { 0xCBF8, 0x9501 }, { 0xCBF9, 0x6240 }, { 0xCBFA, 0x584C }, { 0xCBFB, 0x4ED6 }, 
-	{ 0xCBFC, 0x5B83 }, { 0xCBFD, 0x5979 }, { 0xCBFE, 0x5854 }, { 0xCCA1, 0x736D }, { 0xCCA2, 0x631E }, { 0xCCA3, 0x8E4B }, { 0xCCA4, 0x8E0F }, { 0xCCA5, 0x80CE }, 
-	{ 0xCCA6, 0x82D4 }, { 0xCCA7, 0x62AC }, { 0xCCA8, 0x53F0 }, { 0xCCA9, 0x6CF0 }, { 0xCCAA, 0x915E }, { 0xCCAB, 0x592A }, { 0xCCAC, 0x6001 }, { 0xCCAD, 0x6C70 }, 
-	{ 0xCCAE, 0x574D }, { 0xCCAF, 0x644A }, { 0xCCB0, 0x8D2A }, { 0xCCB1, 0x762B }, { 0xCCB2, 0x6EE9 }, { 0xCCB3, 0x575B }, { 0xCCB4, 0x6A80 }, { 0xCCB5, 0x75F0 }, 
-	{ 0xCCB6, 0x6F6D }, { 0xCCB7, 0x8C2D }, { 0xCCB8, 0x8C08 }, { 0xCCB9, 0x5766 }, { 0xCCBA, 0x6BEF }, { 0xCCBB, 0x8892 }, { 0xCCBC, 0x78B3 }, { 0xCCBD, 0x63A2 }, 
-	{ 0xCCBE, 0x53F9 }, { 0xCCBF, 0x70AD }, { 0xCCC0, 0x6C64 }, { 0xCCC1, 0x5858 }, { 0xCCC2, 0x642A }, { 0xCCC3, 0x5802 }, { 0xCCC4, 0x68E0 }, { 0xCCC5, 0x819B }, 
-	{ 0xCCC6, 0x5510 }, { 0xCCC7, 0x7CD6 }, { 0xCCC8, 0x5018 }, { 0xCCC9, 0x8EBA }, { 0xCCCA, 0x6DCC }, { 0xCCCB, 0x8D9F }, { 0xCCCC, 0x70EB }, { 0xCCCD, 0x638F }, 
-	{ 0xCCCE, 0x6D9B }, { 0xCCCF, 0x6ED4 }, { 0xCCD0, 0x7EE6 }, { 0xCCD1, 0x8404 }, { 0xCCD2, 0x6843 }, { 0xCCD3, 0x9003 }, { 0xCCD4, 0x6DD8 }, { 0xCCD5, 0x9676 }, 
-	{ 0xCCD6, 0x8BA8 }, { 0xCCD7, 0x5957 }, { 0xCCD8, 0x7279 }, { 0xCCD9, 0x85E4 }, { 0xCCDA, 0x817E }, { 0xCCDB, 0x75BC }, { 0xCCDC, 0x8A8A }, { 0xCCDD, 0x68AF }, 
-	{ 0xCCDE, 0x5254 }, { 0xCCDF, 0x8E22 }, { 0xCCE0, 0x9511 }, { 0xCCE1, 0x63D0 }, { 0xCCE2, 0x9898 }, { 0xCCE3, 0x8E44 }, { 0xCCE4, 0x557C }, { 0xCCE5, 0x4F53 }, 
-	{ 0xCCE6, 0x66FF }, { 0xCCE7, 0x568F }, { 0xCCE8, 0x60D5 }, { 0xCCE9, 0x6D95 }, { 0xCCEA, 0x5243 }, { 0xCCEB, 0x5C49 }, { 0xCCEC, 0x5929 }, { 0xCCED, 0x6DFB }, 
-	{ 0xCCEE, 0x586B }, { 0xCCEF, 0x7530 }, { 0xCCF0, 0x751C }, { 0xCCF1, 0x606C }, { 0xCCF2, 0x8214 }, { 0xCCF3, 0x8146 }, { 0xCCF4, 0x6311 }, { 0xCCF5, 0x6761 }, 
-	{ 0xCCF6, 0x8FE2 }, { 0xCCF7, 0x773A }, { 0xCCF8, 0x8DF3 }, { 0xCCF9, 0x8D34 }, { 0xCCFA, 0x94C1 }, { 0xCCFB, 0x5E16 }, { 0xCCFC, 0x5385 }, { 0xCCFD, 0x542C }, 
-	{ 0xCCFE, 0x70C3 }, { 0xCDA1, 0x6C40 }, { 0xCDA2, 0x5EF7 }, { 0xCDA3, 0x505C }, { 0xCDA4, 0x4EAD }, { 0xCDA5, 0x5EAD }, { 0xCDA6, 0x633A }, { 0xCDA7, 0x8247 }, 
-	{ 0xCDA8, 0x901A }, { 0xCDA9, 0x6850 }, { 0xCDAA, 0x916E }, { 0xCDAB, 0x77B3 }, { 0xCDAC, 0x540C }, { 0xCDAD, 0x94DC }, { 0xCDAE, 0x5F64 }, { 0xCDAF, 0x7AE5 }, 
-	{ 0xCDB0, 0x6876 }, { 0xCDB1, 0x6345 }, { 0xCDB2, 0x7B52 }, { 0xCDB3, 0x7EDF }, { 0xCDB4, 0x75DB }, { 0xCDB5, 0x5077 }, { 0xCDB6, 0x6295 }, { 0xCDB7, 0x5934 }, 
-	{ 0xCDB8, 0x900F }, { 0xCDB9, 0x51F8 }, { 0xCDBA, 0x79C3 }, { 0xCDBB, 0x7A81 }, { 0xCDBC, 0x56FE }, { 0xCDBD, 0x5F92 }, { 0xCDBE, 0x9014 }, { 0xCDBF, 0x6D82 }, 
-	{ 0xCDC0, 0x5C60 }, { 0xCDC1, 0x571F }, { 0xCDC2, 0x5410 }, { 0xCDC3, 0x5154 }, { 0xCDC4, 0x6E4D }, { 0xCDC5, 0x56E2 }, { 0xCDC6, 0x63A8 }, { 0xCDC7, 0x9893 }, 
-	{ 0xCDC8, 0x817F }, { 0xCDC9, 0x8715 }, { 0xCDCA, 0x892A }, { 0xCDCB, 0x9000 }, { 0xCDCC, 0x541E }, { 0xCDCD, 0x5C6F }, { 0xCDCE, 0x81C0 }, { 0xCDCF, 0x62D6 }, 
-	{ 0xCDD0, 0x6258 }, { 0xCDD1, 0x8131 }, { 0xCDD2, 0x9E35 }, { 0xCDD3, 0x9640 }, { 0xCDD4, 0x9A6E }, { 0xCDD5, 0x9A7C }, { 0xCDD6, 0x692D }, { 0xCDD7, 0x59A5 }, 
-	{ 0xCDD8, 0x62D3 }, { 0xCDD9, 0x553E }, { 0xCDDA, 0x6316 }, { 0xCDDB, 0x54C7 }, { 0xCDDC, 0x86D9 }, { 0xCDDD, 0x6D3C }, { 0xCDDE, 0x5A03 }, { 0xCDDF, 0x74E6 }, 
-	{ 0xCDE0, 0x889C }, { 0xCDE1, 0x6B6A }, { 0xCDE2, 0x5916 }, { 0xCDE3, 0x8C4C }, { 0xCDE4, 0x5F2F }, { 0xCDE5, 0x6E7E }, { 0xCDE6, 0x73A9 }, { 0xCDE7, 0x987D }, 
-	{ 0xCDE8, 0x4E38 }, { 0xCDE9, 0x70F7 }, { 0xCDEA, 0x5B8C }, { 0xCDEB, 0x7897 }, { 0xCDEC, 0x633D }, { 0xCDED, 0x665A }, { 0xCDEE, 0x7696 }, { 0xCDEF, 0x60CB }, 
-	{ 0xCDF0, 0x5B9B }, { 0xCDF1, 0x5A49 }, { 0xCDF2, 0x4E07 }, { 0xCDF3, 0x8155 }, { 0xCDF4, 0x6C6A }, { 0xCDF5, 0x738B }, { 0xCDF6, 0x4EA1 }, { 0xCDF7, 0x6789 }, 
-	{ 0xCDF8, 0x7F51 }, { 0xCDF9, 0x5F80 }, { 0xCDFA, 0x65FA }, { 0xCDFB, 0x671B }, { 0xCDFC, 0x5FD8 }, { 0xCDFD, 0x5984 }, { 0xCDFE, 0x5A01 }, { 0xCEA1, 0x5DCD }, 
-	{ 0xCEA2, 0x5FAE }, { 0xCEA3, 0x5371 }, { 0xCEA4, 0x97E6 }, { 0xCEA5, 0x8FDD }, { 0xCEA6, 0x6845 }, { 0xCEA7, 0x56F4 }, { 0xCEA8, 0x552F }, { 0xCEA9, 0x60DF }, 
-	{ 0xCEAA, 0x4E3A }, { 0xCEAB, 0x6F4D }, { 0xCEAC, 0x7EF4 }, { 0xCEAD, 0x82C7 }, { 0xCEAE, 0x840E }, { 0xCEAF, 0x59D4 }, { 0xCEB0, 0x4F1F }, { 0xCEB1, 0x4F2A }, 
-	{ 0xCEB2, 0x5C3E }, { 0xCEB3, 0x7EAC }, { 0xCEB4, 0x672A }, { 0xCEB5, 0x851A }, { 0xCEB6, 0x5473 }, { 0xCEB7, 0x754F }, { 0xCEB8, 0x80C3 }, { 0xCEB9, 0x5582 }, 
-	{ 0xCEBA, 0x9B4F }, { 0xCEBB, 0x4F4D }, { 0xCEBC, 0x6E2D }, { 0xCEBD, 0x8C13 }, { 0xCEBE, 0x5C09 }, { 0xCEBF, 0x6170 }, { 0xCEC0, 0x536B }, { 0xCEC1, 0x761F }, 
-	{ 0xCEC2, 0x6E29 }, { 0xCEC3, 0x868A }, { 0xCEC4, 0x6587 }, { 0xCEC5, 0x95FB }, { 0xCEC6, 0x7EB9 }, { 0xCEC7, 0x543B }, { 0xCEC8, 0x7A33 }, { 0xCEC9, 0x7D0A }, 
-	{ 0xCECA, 0x95EE }, { 0xCECB, 0x55E1 }, { 0xCECC, 0x7FC1 }, { 0xCECD, 0x74EE }, { 0xCECE, 0x631D }, { 0xCECF, 0x8717 }, { 0xCED0, 0x6DA1 }, { 0xCED1, 0x7A9D }, 
-	{ 0xCED2, 0x6211 }, { 0xCED3, 0x65A1 }, { 0xCED4, 0x5367 }, { 0xCED5, 0x63E1 }, { 0xCED6, 0x6C83 }, { 0xCED7, 0x5DEB }, { 0xCED8, 0x545C }, { 0xCED9, 0x94A8 }, 
-	{ 0xCEDA, 0x4E4C }, { 0xCEDB, 0x6C61 }, { 0xCEDC, 0x8BEC }, { 0xCEDD, 0x5C4B }, { 0xCEDE, 0x65E0 }, { 0xCEDF, 0x829C }, { 0xCEE0, 0x68A7 }, { 0xCEE1, 0x543E }, 
-	{ 0xCEE2, 0x5434 }, { 0xCEE3, 0x6BCB }, { 0xCEE4, 0x6B66 }, { 0xCEE5, 0x4E94 }, { 0xCEE6, 0x6342 }, { 0xCEE7, 0x5348 }, { 0xCEE8, 0x821E }, { 0xCEE9, 0x4F0D }, 
-	{ 0xCEEA, 0x4FAE }, { 0xCEEB, 0x575E }, { 0xCEEC, 0x620A }, { 0xCEED, 0x96FE }, { 0xCEEE, 0x6664 }, { 0xCEEF, 0x7269 }, { 0xCEF0, 0x52FF }, { 0xCEF1, 0x52A1 }, 
-	{ 0xCEF2, 0x609F }, { 0xCEF3, 0x8BEF }, { 0xCEF4, 0x6614 }, { 0xCEF5, 0x7199 }, { 0xCEF6, 0x6790 }, { 0xCEF7, 0x897F }, { 0xCEF8, 0x7852 }, { 0xCEF9, 0x77FD }, 
-	{ 0xCEFA, 0x6670 }, { 0xCEFB, 0x563B }, { 0xCEFC, 0x5438 }, { 0xCEFD, 0x9521 }, { 0xCEFE, 0x727A }, { 0xCFA1, 0x7A00 }, { 0xCFA2, 0x606F }, { 0xCFA3, 0x5E0C }, 
-	{ 0xCFA4, 0x6089 }, { 0xCFA5, 0x819D }, { 0xCFA6, 0x5915 }, { 0xCFA7, 0x60DC }, { 0xCFA8, 0x7184 }, { 0xCFA9, 0x70EF }, { 0xCFAA, 0x6EAA }, { 0xCFAB, 0x6C50 }, 
-	{ 0xCFAC, 0x7280 }, { 0xCFAD, 0x6A84 }, { 0xCFAE, 0x88AD }, { 0xCFAF, 0x5E2D }, { 0xCFB0, 0x4E60 }, { 0xCFB1, 0x5AB3 }, { 0xCFB2, 0x559C }, { 0xCFB3, 0x94E3 }, 
-	{ 0xCFB4, 0x6D17 }, { 0xCFB5, 0x7CFB }, { 0xCFB6, 0x9699 }, { 0xCFB7, 0x620F }, { 0xCFB8, 0x7EC6 }, { 0xCFB9, 0x778E }, { 0xCFBA, 0x867E }, { 0xCFBB, 0x5323 }, 
-	{ 0xCFBC, 0x971E }, { 0xCFBD, 0x8F96 }, { 0xCFBE, 0x6687 }, { 0xCFBF, 0x5CE1 }, { 0xCFC0, 0x4FA0 }, { 0xCFC1, 0x72ED }, { 0xCFC2, 0x4E0B }, { 0xCFC3, 0x53A6 }, 
-	{ 0xCFC4, 0x590F }, { 0xCFC5, 0x5413 }, { 0xCFC6, 0x6380 }, { 0xCFC7, 0x9528 }, { 0xCFC8, 0x5148 }, { 0xCFC9, 0x4ED9 }, { 0xCFCA, 0x9C9C }, { 0xCFCB, 0x7EA4 }, 
-	{ 0xCFCC, 0x54B8 }, { 0xCFCD, 0x8D24 }, { 0xCFCE, 0x8854 }, { 0xCFCF, 0x8237 }, { 0xCFD0, 0x95F2 }, { 0xCFD1, 0x6D8E }, { 0xCFD2, 0x5F26 }, { 0xCFD3, 0x5ACC }, 
-	{ 0xCFD4, 0x663E }, { 0xCFD5, 0x9669 }, { 0xCFD6, 0x73B0 }, { 0xCFD7, 0x732E }, { 0xCFD8, 0x53BF }, { 0xCFD9, 0x817A }, { 0xCFDA, 0x9985 }, { 0xCFDB, 0x7FA1 }, 
-	{ 0xCFDC, 0x5BAA }, { 0xCFDD, 0x9677 }, { 0xCFDE, 0x9650 }, { 0xCFDF, 0x7EBF }, { 0xCFE0, 0x76F8 }, { 0xCFE1, 0x53A2 }, { 0xCFE2, 0x9576 }, { 0xCFE3, 0x9999 }, 
-	{ 0xCFE4, 0x7BB1 }, { 0xCFE5, 0x8944 }, { 0xCFE6, 0x6E58 }, { 0xCFE7, 0x4E61 }, { 0xCFE8, 0x7FD4 }, { 0xCFE9, 0x7965 }, { 0xCFEA, 0x8BE6 }, { 0xCFEB, 0x60F3 }, 
-	{ 0xCFEC, 0x54CD }, { 0xCFED, 0x4EAB }, { 0xCFEE, 0x9879 }, { 0xCFEF, 0x5DF7 }, { 0xCFF0, 0x6A61 }, { 0xCFF1, 0x50CF }, { 0xCFF2, 0x5411 }, { 0xCFF3, 0x8C61 }, 
-	{ 0xCFF4, 0x8427 }, { 0xCFF5, 0x785D }, { 0xCFF6, 0x9704 }, { 0xCFF7, 0x524A }, { 0xCFF8, 0x54EE }, { 0xCFF9, 0x56A3 }, { 0xCFFA, 0x9500 }, { 0xCFFB, 0x6D88 }, 
-	{ 0xCFFC, 0x5BB5 }, { 0xCFFD, 0x6DC6 }, { 0xCFFE, 0x6653 }, { 0xD0A1, 0x5C0F }, { 0xD0A2, 0x5B5D }, { 0xD0A3, 0x6821 }, { 0xD0A4, 0x8096 }, { 0xD0A5, 0x5578 }, 
-	{ 0xD0A6, 0x7B11 }, { 0xD0A7, 0x6548 }, { 0xD0A8, 0x6954 }, { 0xD0A9, 0x4E9B }, { 0xD0AA, 0x6B47 }, { 0xD0AB, 0x874E }, { 0xD0AC, 0x978B }, { 0xD0AD, 0x534F }, 
-	{ 0xD0AE, 0x631F }, { 0xD0AF, 0x643A }, { 0xD0B0, 0x90AA }, { 0xD0B1, 0x659C }, { 0xD0B2, 0x80C1 }, { 0xD0B3, 0x8C10 }, { 0xD0B4, 0x5199 }, { 0xD0B5, 0x68B0 }, 
-	{ 0xD0B6, 0x5378 }, { 0xD0B7, 0x87F9 }, { 0xD0B8, 0x61C8 }, { 0xD0B9, 0x6CC4 }, { 0xD0BA, 0x6CFB }, { 0xD0BB, 0x8C22 }, { 0xD0BC, 0x5C51 }, { 0xD0BD, 0x85AA }, 
-	{ 0xD0BE, 0x82AF }, { 0xD0BF, 0x950C }, { 0xD0C0, 0x6B23 }, { 0xD0C1, 0x8F9B }, { 0xD0C2, 0x65B0 }, { 0xD0C3, 0x5FFB }, { 0xD0C4, 0x5FC3 }, { 0xD0C5, 0x4FE1 }, 
-	{ 0xD0C6, 0x8845 }, { 0xD0C7, 0x661F }, { 0xD0C8, 0x8165 }, { 0xD0C9, 0x7329 }, { 0xD0CA, 0x60FA }, { 0xD0CB, 0x5174 }, { 0xD0CC, 0x5211 }, { 0xD0CD, 0x578B }, 
-	{ 0xD0CE, 0x5F62 }, { 0xD0CF, 0x90A2 }, { 0xD0D0, 0x884C }, { 0xD0D1, 0x9192 }, { 0xD0D2, 0x5E78 }, { 0xD0D3, 0x674F }, { 0xD0D4, 0x6027 }, { 0xD0D5, 0x59D3 }, 
-	{ 0xD0D6, 0x5144 }, { 0xD0D7, 0x51F6 }, { 0xD0D8, 0x80F8 }, { 0xD0D9, 0x5308 }, { 0xD0DA, 0x6C79 }, { 0xD0DB, 0x96C4 }, { 0xD0DC, 0x718A }, { 0xD0DD, 0x4F11 }, 
-	{ 0xD0DE, 0x4FEE }, { 0xD0DF, 0x7F9E }, { 0xD0E0, 0x673D }, { 0xD0E1, 0x55C5 }, { 0xD0E2, 0x9508 }, { 0xD0E3, 0x79C0 }, { 0xD0E4, 0x8896 }, { 0xD0E5, 0x7EE3 }, 
-	{ 0xD0E6, 0x589F }, { 0xD0E7, 0x620C }, { 0xD0E8, 0x9700 }, { 0xD0E9, 0x865A }, { 0xD0EA, 0x5618 }, { 0xD0EB, 0x987B }, { 0xD0EC, 0x5F90 }, { 0xD0ED, 0x8BB8 }, 
-	{ 0xD0EE, 0x84C4 }, { 0xD0EF, 0x9157 }, { 0xD0F0, 0x53D9 }, { 0xD0F1, 0x65ED }, { 0xD0F2, 0x5E8F }, { 0xD0F3, 0x755C }, { 0xD0F4, 0x6064 }, { 0xD0F5, 0x7D6E }, 
-	{ 0xD0F6, 0x5A7F }, { 0xD0F7, 0x7EEA }, { 0xD0F8, 0x7EED }, { 0xD0F9, 0x8F69 }, { 0xD0FA, 0x55A7 }, { 0xD0FB, 0x5BA3 }, { 0xD0FC, 0x60AC }, { 0xD0FD, 0x65CB }, 
-	{ 0xD0FE, 0x7384 }, { 0xD1A1, 0x9009 }, { 0xD1A2, 0x7663 }, { 0xD1A3, 0x7729 }, { 0xD1A4, 0x7EDA }, { 0xD1A5, 0x9774 }, { 0xD1A6, 0x859B }, { 0xD1A7, 0x5B66 }, 
-	{ 0xD1A8, 0x7A74 }, { 0xD1A9, 0x96EA }, { 0xD1AA, 0x8840 }, { 0xD1AB, 0x52CB }, { 0xD1AC, 0x718F }, { 0xD1AD, 0x5FAA }, { 0xD1AE, 0x65EC }, { 0xD1AF, 0x8BE2 }, 
-	{ 0xD1B0, 0x5BFB }, { 0xD1B1, 0x9A6F }, { 0xD1B2, 0x5DE1 }, { 0xD1B3, 0x6B89 }, { 0xD1B4, 0x6C5B }, { 0xD1B5, 0x8BAD }, { 0xD1B6, 0x8BAF }, { 0xD1B7, 0x900A }, 
-	{ 0xD1B8, 0x8FC5 }, { 0xD1B9, 0x538B }, { 0xD1BA, 0x62BC }, { 0xD1BB, 0x9E26 }, { 0xD1BC, 0x9E2D }, { 0xD1BD, 0x5440 }, { 0xD1BE, 0x4E2B }, { 0xD1BF, 0x82BD }, 
-	{ 0xD1C0, 0x7259 }, { 0xD1C1, 0x869C }, { 0xD1C2, 0x5D16 }, { 0xD1C3, 0x8859 }, { 0xD1C4, 0x6DAF }, { 0xD1C5, 0x96C5 }, { 0xD1C6, 0x54D1 }, { 0xD1C7, 0x4E9A }, 
-	{ 0xD1C8, 0x8BB6 }, { 0xD1C9, 0x7109 }, { 0xD1CA, 0x54BD }, { 0xD1CB, 0x9609 }, { 0xD1CC, 0x70DF }, { 0xD1CD, 0x6DF9 }, { 0xD1CE, 0x76D0 }, { 0xD1CF, 0x4E25 }, 
-	{ 0xD1D0, 0x7814 }, { 0xD1D1, 0x8712 }, { 0xD1D2, 0x5CA9 }, { 0xD1D3, 0x5EF6 }, { 0xD1D4, 0x8A00 }, { 0xD1D5, 0x989C }, { 0xD1D6, 0x960E }, { 0xD1D7, 0x708E }, 
-	{ 0xD1D8, 0x6CBF }, { 0xD1D9, 0x5944 }, { 0xD1DA, 0x63A9 }, { 0xD1DB, 0x773C }, { 0xD1DC, 0x884D }, { 0xD1DD, 0x6F14 }, { 0xD1DE, 0x8273 }, { 0xD1DF, 0x5830 }, 
-	{ 0xD1E0, 0x71D5 }, { 0xD1E1, 0x538C }, { 0xD1E2, 0x781A }, { 0xD1E3, 0x96C1 }, { 0xD1E4, 0x5501 }, { 0xD1E5, 0x5F66 }, { 0xD1E6, 0x7130 }, { 0xD1E7, 0x5BB4 }, 
-	{ 0xD1E8, 0x8C1A }, { 0xD1E9, 0x9A8C }, { 0xD1EA, 0x6B83 }, { 0xD1EB, 0x592E }, { 0xD1EC, 0x9E2F }, { 0xD1ED, 0x79E7 }, { 0xD1EE, 0x6768 }, { 0xD1EF, 0x626C }, 
-	{ 0xD1F0, 0x4F6F }, { 0xD1F1, 0x75A1 }, { 0xD1F2, 0x7F8A }, { 0xD1F3, 0x6D0B }, { 0xD1F4, 0x9633 }, { 0xD1F5, 0x6C27 }, { 0xD1F6, 0x4EF0 }, { 0xD1F7, 0x75D2 }, 
-	{ 0xD1F8, 0x517B }, { 0xD1F9, 0x6837 }, { 0xD1FA, 0x6F3E }, { 0xD1FB, 0x9080 }, { 0xD1FC, 0x8170 }, { 0xD1FD, 0x5996 }, { 0xD1FE, 0x7476 }, { 0xD2A1, 0x6447 }, 
-	{ 0xD2A2, 0x5C27 }, { 0xD2A3, 0x9065 }, { 0xD2A4, 0x7A91 }, { 0xD2A5, 0x8C23 }, { 0xD2A6, 0x59DA }, { 0xD2A7, 0x54AC }, { 0xD2A8, 0x8200 }, { 0xD2A9, 0x836F }, 
-	{ 0xD2AA, 0x8981 }, { 0xD2AB, 0x8000 }, { 0xD2AC, 0x6930 }, { 0xD2AD, 0x564E }, { 0xD2AE, 0x8036 }, { 0xD2AF, 0x7237 }, { 0xD2B0, 0x91CE }, { 0xD2B1, 0x51B6 }, 
-	{ 0xD2B2, 0x4E5F }, { 0xD2B3, 0x9875 }, { 0xD2B4, 0x6396 }, { 0xD2B5, 0x4E1A }, { 0xD2B6, 0x53F6 }, { 0xD2B7, 0x66F3 }, { 0xD2B8, 0x814B }, { 0xD2B9, 0x591C }, 
-	{ 0xD2BA, 0x6DB2 }, { 0xD2BB, 0x4E00 }, { 0xD2BC, 0x58F9 }, { 0xD2BD, 0x533B }, { 0xD2BE, 0x63D6 }, { 0xD2BF, 0x94F1 }, { 0xD2C0, 0x4F9D }, { 0xD2C1, 0x4F0A }, 
-	{ 0xD2C2, 0x8863 }, { 0xD2C3, 0x9890 }, { 0xD2C4, 0x5937 }, { 0xD2C5, 0x9057 }, { 0xD2C6, 0x79FB }, { 0xD2C7, 0x4EEA }, { 0xD2C8, 0x80F0 }, { 0xD2C9, 0x7591 }, 
-	{ 0xD2CA, 0x6C82 }, { 0xD2CB, 0x5B9C }, { 0xD2CC, 0x59E8 }, { 0xD2CD, 0x5F5D }, { 0xD2CE, 0x6905 }, { 0xD2CF, 0x8681 }, { 0xD2D0, 0x501A }, { 0xD2D1, 0x5DF2 }, 
-	{ 0xD2D2, 0x4E59 }, { 0xD2D3, 0x77E3 }, { 0xD2D4, 0x4EE5 }, { 0xD2D5, 0x827A }, { 0xD2D6, 0x6291 }, { 0xD2D7, 0x6613 }, { 0xD2D8, 0x9091 }, { 0xD2D9, 0x5C79 }, 
-	{ 0xD2DA, 0x4EBF }, { 0xD2DB, 0x5F79 }, { 0xD2DC, 0x81C6 }, { 0xD2DD, 0x9038 }, { 0xD2DE, 0x8084 }, { 0xD2DF, 0x75AB }, { 0xD2E0, 0x4EA6 }, { 0xD2E1, 0x88D4 }, 
-	{ 0xD2E2, 0x610F }, { 0xD2E3, 0x6BC5 }, { 0xD2E4, 0x5FC6 }, { 0xD2E5, 0x4E49 }, { 0xD2E6, 0x76CA }, { 0xD2E7, 0x6EA2 }, { 0xD2E8, 0x8BE3 }, { 0xD2E9, 0x8BAE }, 
-	{ 0xD2EA, 0x8C0A }, { 0xD2EB, 0x8BD1 }, { 0xD2EC, 0x5F02 }, { 0xD2ED, 0x7FFC }, { 0xD2EE, 0x7FCC }, { 0xD2EF, 0x7ECE }, { 0xD2F0, 0x8335 }, { 0xD2F1, 0x836B }, 
-	{ 0xD2F2, 0x56E0 }, { 0xD2F3, 0x6BB7 }, { 0xD2F4, 0x97F3 }, { 0xD2F5, 0x9634 }, { 0xD2F6, 0x59FB }, { 0xD2F7, 0x541F }, { 0xD2F8, 0x94F6 }, { 0xD2F9, 0x6DEB }, 
-	{ 0xD2FA, 0x5BC5 }, { 0xD2FB, 0x996E }, { 0xD2FC, 0x5C39 }, { 0xD2FD, 0x5F15 }, { 0xD2FE, 0x9690 }, { 0xD3A1, 0x5370 }, { 0xD3A2, 0x82F1 }, { 0xD3A3, 0x6A31 }, 
-	{ 0xD3A4, 0x5A74 }, { 0xD3A5, 0x9E70 }, { 0xD3A6, 0x5E94 }, { 0xD3A7, 0x7F28 }, { 0xD3A8, 0x83B9 }, { 0xD3A9, 0x8424 }, { 0xD3AA, 0x8425 }, { 0xD3AB, 0x8367 }, 
-	{ 0xD3AC, 0x8747 }, { 0xD3AD, 0x8FCE }, { 0xD3AE, 0x8D62 }, { 0xD3AF, 0x76C8 }, { 0xD3B0, 0x5F71 }, { 0xD3B1, 0x9896 }, { 0xD3B2, 0x786C }, { 0xD3B3, 0x6620 }, 
-	{ 0xD3B4, 0x54DF }, { 0xD3B5, 0x62E5 }, { 0xD3B6, 0x4F63 }, { 0xD3B7, 0x81C3 }, { 0xD3B8, 0x75C8 }, { 0xD3B9, 0x5EB8 }, { 0xD3BA, 0x96CD }, { 0xD3BB, 0x8E0A }, 
-	{ 0xD3BC, 0x86F9 }, { 0xD3BD, 0x548F }, { 0xD3BE, 0x6CF3 }, { 0xD3BF, 0x6D8C }, { 0xD3C0, 0x6C38 }, { 0xD3C1, 0x607F }, { 0xD3C2, 0x52C7 }, { 0xD3C3, 0x7528 }, 
-	{ 0xD3C4, 0x5E7D }, { 0xD3C5, 0x4F18 }, { 0xD3C6, 0x60A0 }, { 0xD3C7, 0x5FE7 }, { 0xD3C8, 0x5C24 }, { 0xD3C9, 0x7531 }, { 0xD3CA, 0x90AE }, { 0xD3CB, 0x94C0 }, 
-	{ 0xD3CC, 0x72B9 }, { 0xD3CD, 0x6CB9 }, { 0xD3CE, 0x6E38 }, { 0xD3CF, 0x9149 }, { 0xD3D0, 0x6709 }, { 0xD3D1, 0x53CB }, { 0xD3D2, 0x53F3 }, { 0xD3D3, 0x4F51 }, 
-	{ 0xD3D4, 0x91C9 }, { 0xD3D5, 0x8BF1 }, { 0xD3D6, 0x53C8 }, { 0xD3D7, 0x5E7C }, { 0xD3D8, 0x8FC2 }, { 0xD3D9, 0x6DE4 }, { 0xD3DA, 0x4E8E }, { 0xD3DB, 0x76C2 }, 
-	{ 0xD3DC, 0x6986 }, { 0xD3DD, 0x865E }, { 0xD3DE, 0x611A }, { 0xD3DF, 0x8206 }, { 0xD3E0, 0x4F59 }, { 0xD3E1, 0x4FDE }, { 0xD3E2, 0x903E }, { 0xD3E3, 0x9C7C }, 
-	{ 0xD3E4, 0x6109 }, { 0xD3E5, 0x6E1D }, { 0xD3E6, 0x6E14 }, { 0xD3E7, 0x9685 }, { 0xD3E8, 0x4E88 }, { 0xD3E9, 0x5A31 }, { 0xD3EA, 0x96E8 }, { 0xD3EB, 0x4E0E }, 
-	{ 0xD3EC, 0x5C7F }, { 0xD3ED, 0x79B9 }, { 0xD3EE, 0x5B87 }, { 0xD3EF, 0x8BED }, { 0xD3F0, 0x7FBD }, { 0xD3F1, 0x7389 }, { 0xD3F2, 0x57DF }, { 0xD3F3, 0x828B }, 
-	{ 0xD3F4, 0x90C1 }, { 0xD3F5, 0x5401 }, { 0xD3F6, 0x9047 }, { 0xD3F7, 0x55BB }, { 0xD3F8, 0x5CEA }, { 0xD3F9, 0x5FA1 }, { 0xD3FA, 0x6108 }, { 0xD3FB, 0x6B32 }, 
-	{ 0xD3FC, 0x72F1 }, { 0xD3FD, 0x80B2 }, { 0xD3FE, 0x8A89 }, { 0xD4A1, 0x6D74 }, { 0xD4A2, 0x5BD3 }, { 0xD4A3, 0x88D5 }, { 0xD4A4, 0x9884 }, { 0xD4A5, 0x8C6B }, 
-	{ 0xD4A6, 0x9A6D }, { 0xD4A7, 0x9E33 }, { 0xD4A8, 0x6E0A }, { 0xD4A9, 0x51A4 }, { 0xD4AA, 0x5143 }, { 0xD4AB, 0x57A3 }, { 0xD4AC, 0x8881 }, { 0xD4AD, 0x539F }, 
-	{ 0xD4AE, 0x63F4 }, { 0xD4AF, 0x8F95 }, { 0xD4B0, 0x56ED }, { 0xD4B1, 0x5458 }, { 0xD4B2, 0x5706 }, { 0xD4B3, 0x733F }, { 0xD4B4, 0x6E90 }, { 0xD4B5, 0x7F18 }, 
-	{ 0xD4B6, 0x8FDC }, { 0xD4B7, 0x82D1 }, { 0xD4B8, 0x613F }, { 0xD4B9, 0x6028 }, { 0xD4BA, 0x9662 }, { 0xD4BB, 0x66F0 }, { 0xD4BC, 0x7EA6 }, { 0xD4BD, 0x8D8A }, 
-	{ 0xD4BE, 0x8DC3 }, { 0xD4BF, 0x94A5 }, { 0xD4C0, 0x5CB3 }, { 0xD4C1, 0x7CA4 }, { 0xD4C2, 0x6708 }, { 0xD4C3, 0x60A6 }, { 0xD4C4, 0x9605 }, { 0xD4C5, 0x8018 }, 
-	{ 0xD4C6, 0x4E91 }, { 0xD4C7, 0x90E7 }, { 0xD4C8, 0x5300 }, { 0xD4C9, 0x9668 }, { 0xD4CA, 0x5141 }, { 0xD4CB, 0x8FD0 }, { 0xD4CC, 0x8574 }, { 0xD4CD, 0x915D }, 
-	{ 0xD4CE, 0x6655 }, { 0xD4CF, 0x97F5 }, { 0xD4D0, 0x5B55 }, { 0xD4D1, 0x531D }, { 0xD4D2, 0x7838 }, { 0xD4D3, 0x6742 }, { 0xD4D4, 0x683D }, { 0xD4D5, 0x54C9 }, 
-	{ 0xD4D6, 0x707E }, { 0xD4D7, 0x5BB0 }, { 0xD4D8, 0x8F7D }, { 0xD4D9, 0x518D }, { 0xD4DA, 0x5728 }, { 0xD4DB, 0x54B1 }, { 0xD4DC, 0x6512 }, { 0xD4DD, 0x6682 }, 
-	{ 0xD4DE, 0x8D5E }, { 0xD4DF, 0x8D43 }, { 0xD4E0, 0x810F }, { 0xD4E1, 0x846C }, { 0xD4E2, 0x906D }, { 0xD4E3, 0x7CDF }, { 0xD4E4, 0x51FF }, { 0xD4E5, 0x85FB }, 
-	{ 0xD4E6, 0x67A3 }, { 0xD4E7, 0x65E9 }, { 0xD4E8, 0x6FA1 }, { 0xD4E9, 0x86A4 }, { 0xD4EA, 0x8E81 }, { 0xD4EB, 0x566A }, { 0xD4EC, 0x9020 }, { 0xD4ED, 0x7682 }, 
-	{ 0xD4EE, 0x7076 }, { 0xD4EF, 0x71E5 }, { 0xD4F0, 0x8D23 }, { 0xD4F1, 0x62E9 }, { 0xD4F2, 0x5219 }, { 0xD4F3, 0x6CFD }, { 0xD4F4, 0x8D3C }, { 0xD4F5, 0x600E }, 
-	{ 0xD4F6, 0x589E }, { 0xD4F7, 0x618E }, { 0xD4F8, 0x66FE }, { 0xD4F9, 0x8D60 }, { 0xD4FA, 0x624E }, { 0xD4FB, 0x55B3 }, { 0xD4FC, 0x6E23 }, { 0xD4FD, 0x672D }, 
-	{ 0xD4FE, 0x8F67 }, { 0xD5A1, 0x94E1 }, { 0xD5A2, 0x95F8 }, { 0xD5A3, 0x7728 }, { 0xD5A4, 0x6805 }, { 0xD5A5, 0x69A8 }, { 0xD5A6, 0x548B }, { 0xD5A7, 0x4E4D }, 
-	{ 0xD5A8, 0x70B8 }, { 0xD5A9, 0x8BC8 }, { 0xD5AA, 0x6458 }, { 0xD5AB, 0x658B }, { 0xD5AC, 0x5B85 }, { 0xD5AD, 0x7A84 }, { 0xD5AE, 0x503A }, { 0xD5AF, 0x5BE8 }, 
-	{ 0xD5B0, 0x77BB }, { 0xD5B1, 0x6BE1 }, { 0xD5B2, 0x8A79 }, { 0xD5B3, 0x7C98 }, { 0xD5B4, 0x6CBE }, { 0xD5B5, 0x76CF }, { 0xD5B6, 0x65A9 }, { 0xD5B7, 0x8F97 }, 
-	{ 0xD5B8, 0x5D2D }, { 0xD5B9, 0x5C55 }, { 0xD5BA, 0x8638 }, { 0xD5BB, 0x6808 }, { 0xD5BC, 0x5360 }, { 0xD5BD, 0x6218 }, { 0xD5BE, 0x7AD9 }, { 0xD5BF, 0x6E5B }, 
-	{ 0xD5C0, 0x7EFD }, { 0xD5C1, 0x6A1F }, { 0xD5C2, 0x7AE0 }, { 0xD5C3, 0x5F70 }, { 0xD5C4, 0x6F33 }, { 0xD5C5, 0x5F20 }, { 0xD5C6, 0x638C }, { 0xD5C7, 0x6DA8 }, 
-	{ 0xD5C8, 0x6756 }, { 0xD5C9, 0x4E08 }, { 0xD5CA, 0x5E10 }, { 0xD5CB, 0x8D26 }, { 0xD5CC, 0x4ED7 }, { 0xD5CD, 0x80C0 }, { 0xD5CE, 0x7634 }, { 0xD5CF, 0x969C }, 
-	{ 0xD5D0, 0x62DB }, { 0xD5D1, 0x662D }, { 0xD5D2, 0x627E }, { 0xD5D3, 0x6CBC }, { 0xD5D4, 0x8D75 }, { 0xD5D5, 0x7167 }, { 0xD5D6, 0x7F69 }, { 0xD5D7, 0x5146 }, 
-	{ 0xD5D8, 0x8087 }, { 0xD5D9, 0x53EC }, { 0xD5DA, 0x906E }, { 0xD5DB, 0x6298 }, { 0xD5DC, 0x54F2 }, { 0xD5DD, 0x86F0 }, { 0xD5DE, 0x8F99 }, { 0xD5DF, 0x8005 }, 
-	{ 0xD5E0, 0x9517 }, { 0xD5E1, 0x8517 }, { 0xD5E2, 0x8FD9 }, { 0xD5E3, 0x6D59 }, { 0xD5E4, 0x73CD }, { 0xD5E5, 0x659F }, { 0xD5E6, 0x771F }, { 0xD5E7, 0x7504 }, 
-	{ 0xD5E8, 0x7827 }, { 0xD5E9, 0x81FB }, { 0xD5EA, 0x8D1E }, { 0xD5EB, 0x9488 }, { 0xD5EC, 0x4FA6 }, { 0xD5ED, 0x6795 }, { 0xD5EE, 0x75B9 }, { 0xD5EF, 0x8BCA }, 
-	{ 0xD5F0, 0x9707 }, { 0xD5F1, 0x632F }, { 0xD5F2, 0x9547 }, { 0xD5F3, 0x9635 }, { 0xD5F4, 0x84B8 }, { 0xD5F5, 0x6323 }, { 0xD5F6, 0x7741 }, { 0xD5F7, 0x5F81 }, 
-	{ 0xD5F8, 0x72F0 }, { 0xD5F9, 0x4E89 }, { 0xD5FA, 0x6014 }, { 0xD5FB, 0x6574 }, { 0xD5FC, 0x62EF }, { 0xD5FD, 0x6B63 }, { 0xD5FE, 0x653F }, { 0xD6A1, 0x5E27 }, 
-	{ 0xD6A2, 0x75C7 }, { 0xD6A3, 0x90D1 }, { 0xD6A4, 0x8BC1 }, { 0xD6A5, 0x829D }, { 0xD6A6, 0x679D }, { 0xD6A7, 0x652F }, { 0xD6A8, 0x5431 }, { 0xD6A9, 0x8718 }, 
-	{ 0xD6AA, 0x77E5 }, { 0xD6AB, 0x80A2 }, { 0xD6AC, 0x8102 }, { 0xD6AD, 0x6C41 }, { 0xD6AE, 0x4E4B }, { 0xD6AF, 0x7EC7 }, { 0xD6B0, 0x804C }, { 0xD6B1, 0x76F4 }, 
-	{ 0xD6B2, 0x690D }, { 0xD6B3, 0x6B96 }, { 0xD6B4, 0x6267 }, { 0xD6B5, 0x503C }, { 0xD6B6, 0x4F84 }, { 0xD6B7, 0x5740 }, { 0xD6B8, 0x6307 }, { 0xD6B9, 0x6B62 }, 
-	{ 0xD6BA, 0x8DBE }, { 0xD6BB, 0x53EA }, { 0xD6BC, 0x65E8 }, { 0xD6BD, 0x7EB8 }, { 0xD6BE, 0x5FD7 }, { 0xD6BF, 0x631A }, { 0xD6C0, 0x63B7 }, { 0xD6C1, 0x81F3 }, 
-	{ 0xD6C2, 0x81F4 }, { 0xD6C3, 0x7F6E }, { 0xD6C4, 0x5E1C }, { 0xD6C5, 0x5CD9 }, { 0xD6C6, 0x5236 }, { 0xD6C7, 0x667A }, { 0xD6C8, 0x79E9 }, { 0xD6C9, 0x7A1A }, 
-	{ 0xD6CA, 0x8D28 }, { 0xD6CB, 0x7099 }, { 0xD6CC, 0x75D4 }, { 0xD6CD, 0x6EDE }, { 0xD6CE, 0x6CBB }, { 0xD6CF, 0x7A92 }, { 0xD6D0, 0x4E2D }, { 0xD6D1, 0x76C5 }, 
-	{ 0xD6D2, 0x5FE0 }, { 0xD6D3, 0x949F }, { 0xD6D4, 0x8877 }, { 0xD6D5, 0x7EC8 }, { 0xD6D6, 0x79CD }, { 0xD6D7, 0x80BF }, { 0xD6D8, 0x91CD }, { 0xD6D9, 0x4EF2 }, 
-	{ 0xD6DA, 0x4F17 }, { 0xD6DB, 0x821F }, { 0xD6DC, 0x5468 }, { 0xD6DD, 0x5DDE }, { 0xD6DE, 0x6D32 }, { 0xD6DF, 0x8BCC }, { 0xD6E0, 0x7CA5 }, { 0xD6E1, 0x8F74 }, 
-	{ 0xD6E2, 0x8098 }, { 0xD6E3, 0x5E1A }, { 0xD6E4, 0x5492 }, { 0xD6E5, 0x76B1 }, { 0xD6E6, 0x5B99 }, { 0xD6E7, 0x663C }, { 0xD6E8, 0x9AA4 }, { 0xD6E9, 0x73E0 }, 
-	{ 0xD6EA, 0x682A }, { 0xD6EB, 0x86DB }, { 0xD6EC, 0x6731 }, { 0xD6ED, 0x732A }, { 0xD6EE, 0x8BF8 }, { 0xD6EF, 0x8BDB }, { 0xD6F0, 0x9010 }, { 0xD6F1, 0x7AF9 }, 
-	{ 0xD6F2, 0x70DB }, { 0xD6F3, 0x716E }, { 0xD6F4, 0x62C4 }, { 0xD6F5, 0x77A9 }, { 0xD6F6, 0x5631 }, { 0xD6F7, 0x4E3B }, { 0xD6F8, 0x8457 }, { 0xD6F9, 0x67F1 }, 
-	{ 0xD6FA, 0x52A9 }, { 0xD6FB, 0x86C0 }, { 0xD6FC, 0x8D2E }, { 0xD6FD, 0x94F8 }, { 0xD6FE, 0x7B51 }, { 0xD7A1, 0x4F4F }, { 0xD7A2, 0x6CE8 }, { 0xD7A3, 0x795D }, 
-	{ 0xD7A4, 0x9A7B }, { 0xD7A5, 0x6293 }, { 0xD7A6, 0x722A }, { 0xD7A7, 0x62FD }, { 0xD7A8, 0x4E13 }, { 0xD7A9, 0x7816 }, { 0xD7AA, 0x8F6C }, { 0xD7AB, 0x64B0 }, 
-	{ 0xD7AC, 0x8D5A }, { 0xD7AD, 0x7BC6 }, { 0xD7AE, 0x6869 }, { 0xD7AF, 0x5E84 }, { 0xD7B0, 0x88C5 }, { 0xD7B1, 0x5986 }, { 0xD7B2, 0x649E }, { 0xD7B3, 0x58EE }, 
-	{ 0xD7B4, 0x72B6 }, { 0xD7B5, 0x690E }, { 0xD7B6, 0x9525 }, { 0xD7B7, 0x8FFD }, { 0xD7B8, 0x8D58 }, { 0xD7B9, 0x5760 }, { 0xD7BA, 0x7F00 }, { 0xD7BB, 0x8C06 }, 
-	{ 0xD7BC, 0x51C6 }, { 0xD7BD, 0x6349 }, { 0xD7BE, 0x62D9 }, { 0xD7BF, 0x5353 }, { 0xD7C0, 0x684C }, { 0xD7C1, 0x7422 }, { 0xD7C2, 0x8301 }, { 0xD7C3, 0x914C }, 
-	{ 0xD7C4, 0x5544 }, { 0xD7C5, 0x7740 }, { 0xD7C6, 0x707C }, { 0xD7C7, 0x6D4A }, { 0xD7C8, 0x5179 }, { 0xD7C9, 0x54A8 }, { 0xD7CA, 0x8D44 }, { 0xD7CB, 0x59FF }, 
-	{ 0xD7CC, 0x6ECB }, { 0xD7CD, 0x6DC4 }, { 0xD7CE, 0x5B5C }, { 0xD7CF, 0x7D2B }, { 0xD7D0, 0x4ED4 }, { 0xD7D1, 0x7C7D }, { 0xD7D2, 0x6ED3 }, { 0xD7D3, 0x5B50 }, 
-	{ 0xD7D4, 0x81EA }, { 0xD7D5, 0x6E0D }, { 0xD7D6, 0x5B57 }, { 0xD7D7, 0x9B03 }, { 0xD7D8, 0x68D5 }, { 0xD7D9, 0x8E2A }, { 0xD7DA, 0x5B97 }, { 0xD7DB, 0x7EFC }, 
-	{ 0xD7DC, 0x603B }, { 0xD7DD, 0x7EB5 }, { 0xD7DE, 0x90B9 }, { 0xD7DF, 0x8D70 }, { 0xD7E0, 0x594F }, { 0xD7E1, 0x63CD }, { 0xD7E2, 0x79DF }, { 0xD7E3, 0x8DB3 }, 
-	{ 0xD7E4, 0x5352 }, { 0xD7E5, 0x65CF }, { 0xD7E6, 0x7956 }, { 0xD7E7, 0x8BC5 }, { 0xD7E8, 0x963B }, { 0xD7E9, 0x7EC4 }, { 0xD7EA, 0x94BB }, { 0xD7EB, 0x7E82 }, 
-	{ 0xD7EC, 0x5634 }, { 0xD7ED, 0x9189 }, { 0xD7EE, 0x6700 }, { 0xD7EF, 0x7F6A }, { 0xD7F0, 0x5C0A }, { 0xD7F1, 0x9075 }, { 0xD7F2, 0x6628 }, { 0xD7F3, 0x5DE6 }, 
-	{ 0xD7F4, 0x4F50 }, { 0xD7F5, 0x67DE }, { 0xD7F6, 0x505A }, { 0xD7F7, 0x4F5C }, { 0xD7F8, 0x5750 }, { 0xD7F9, 0x5EA7 }, { 0xD8A1, 0x4E8D }, { 0xD8A2, 0x4E0C }, 
-	{ 0xD8A3, 0x5140 }, { 0xD8A4, 0x4E10 }, { 0xD8A5, 0x5EFF }, { 0xD8A6, 0x5345 }, { 0xD8A7, 0x4E15 }, { 0xD8A8, 0x4E98 }, { 0xD8A9, 0x4E1E }, { 0xD8AA, 0x9B32 }, 
-	{ 0xD8AB, 0x5B6C }, { 0xD8AC, 0x5669 }, { 0xD8AD, 0x4E28 }, { 0xD8AE, 0x79BA }, { 0xD8AF, 0x4E3F }, { 0xD8B0, 0x5315 }, { 0xD8B1, 0x4E47 }, { 0xD8B2, 0x592D }, 
-	{ 0xD8B3, 0x723B }, { 0xD8B4, 0x536E }, { 0xD8B5, 0x6C10 }, { 0xD8B6, 0x56DF }, { 0xD8B7, 0x80E4 }, { 0xD8B8, 0x9997 }, { 0xD8B9, 0x6BD3 }, { 0xD8BA, 0x777E }, 
-	{ 0xD8BB, 0x9F17 }, { 0xD8BC, 0x4E36 }, { 0xD8BD, 0x4E9F }, { 0xD8BE, 0x9F10 }, { 0xD8BF, 0x4E5C }, { 0xD8C0, 0x4E69 }, { 0xD8C1, 0x4E93 }, { 0xD8C2, 0x8288 }, 
-	{ 0xD8C3, 0x5B5B }, { 0xD8C4, 0x556C }, { 0xD8C5, 0x560F }, { 0xD8C6, 0x4EC4 }, { 0xD8C7, 0x538D }, { 0xD8C8, 0x539D }, { 0xD8C9, 0x53A3 }, { 0xD8CA, 0x53A5 }, 
-	{ 0xD8CB, 0x53AE }, { 0xD8CC, 0x9765 }, { 0xD8CD, 0x8D5D }, { 0xD8CE, 0x531A }, { 0xD8CF, 0x53F5 }, { 0xD8D0, 0x5326 }, { 0xD8D1, 0x532E }, { 0xD8D2, 0x533E }, 
-	{ 0xD8D3, 0x8D5C }, { 0xD8D4, 0x5366 }, { 0xD8D5, 0x5363 }, { 0xD8D6, 0x5202 }, { 0xD8D7, 0x5208 }, { 0xD8D8, 0x520E }, { 0xD8D9, 0x522D }, { 0xD8DA, 0x5233 }, 
-	{ 0xD8DB, 0x523F }, { 0xD8DC, 0x5240 }, { 0xD8DD, 0x524C }, { 0xD8DE, 0x525E }, { 0xD8DF, 0x5261 }, { 0xD8E0, 0x525C }, { 0xD8E1, 0x84AF }, { 0xD8E2, 0x527D }, 
-	{ 0xD8E3, 0x5282 }, { 0xD8E4, 0x5281 }, { 0xD8E5, 0x5290 }, { 0xD8E6, 0x5293 }, { 0xD8E7, 0x5182 }, { 0xD8E8, 0x7F54 }, { 0xD8E9, 0x4EBB }, { 0xD8EA, 0x4EC3 }, 
-	{ 0xD8EB, 0x4EC9 }, { 0xD8EC, 0x4EC2 }, { 0xD8ED, 0x4EE8 }, { 0xD8EE, 0x4EE1 }, { 0xD8EF, 0x4EEB }, { 0xD8F0, 0x4EDE }, { 0xD8F1, 0x4F1B }, { 0xD8F2, 0x4EF3 }, 
-	{ 0xD8F3, 0x4F22 }, { 0xD8F4, 0x4F64 }, { 0xD8F5, 0x4EF5 }, { 0xD8F6, 0x4F25 }, { 0xD8F7, 0x4F27 }, { 0xD8F8, 0x4F09 }, { 0xD8F9, 0x4F2B }, { 0xD8FA, 0x4F5E }, 
-	{ 0xD8FB, 0x4F67 }, { 0xD8FC, 0x6538 }, { 0xD8FD, 0x4F5A }, { 0xD8FE, 0x4F5D }, { 0xD9A1, 0x4F5F }, { 0xD9A2, 0x4F57 }, { 0xD9A3, 0x4F32 }, { 0xD9A4, 0x4F3D }, 
-	{ 0xD9A5, 0x4F76 }, { 0xD9A6, 0x4F74 }, { 0xD9A7, 0x4F91 }, { 0xD9A8, 0x4F89 }, { 0xD9A9, 0x4F83 }, { 0xD9AA, 0x4F8F }, { 0xD9AB, 0x4F7E }, { 0xD9AC, 0x4F7B }, 
-	{ 0xD9AD, 0x4FAA }, { 0xD9AE, 0x4F7C }, { 0xD9AF, 0x4FAC }, { 0xD9B0, 0x4F94 }, { 0xD9B1, 0x4FE6 }, { 0xD9B2, 0x4FE8 }, { 0xD9B3, 0x4FEA }, { 0xD9B4, 0x4FC5 }, 
-	{ 0xD9B5, 0x4FDA }, { 0xD9B6, 0x4FE3 }, { 0xD9B7, 0x4FDC }, { 0xD9B8, 0x4FD1 }, { 0xD9B9, 0x4FDF }, { 0xD9BA, 0x4FF8 }, { 0xD9BB, 0x5029 }, { 0xD9BC, 0x504C }, 
-	{ 0xD9BD, 0x4FF3 }, { 0xD9BE, 0x502C }, { 0xD9BF, 0x500F }, { 0xD9C0, 0x502E }, { 0xD9C1, 0x502D }, { 0xD9C2, 0x4FFE }, { 0xD9C3, 0x501C }, { 0xD9C4, 0x500C }, 
-	{ 0xD9C5, 0x5025 }, { 0xD9C6, 0x5028 }, { 0xD9C7, 0x507E }, { 0xD9C8, 0x5043 }, { 0xD9C9, 0x5055 }, { 0xD9CA, 0x5048 }, { 0xD9CB, 0x504E }, { 0xD9CC, 0x506C }, 
-	{ 0xD9CD, 0x507B }, { 0xD9CE, 0x50A5 }, { 0xD9CF, 0x50A7 }, { 0xD9D0, 0x50A9 }, { 0xD9D1, 0x50BA }, { 0xD9D2, 0x50D6 }, { 0xD9D3, 0x5106 }, { 0xD9D4, 0x50ED }, 
-	{ 0xD9D5, 0x50EC }, { 0xD9D6, 0x50E6 }, { 0xD9D7, 0x50EE }, { 0xD9D8, 0x5107 }, { 0xD9D9, 0x510B }, { 0xD9DA, 0x4EDD }, { 0xD9DB, 0x6C3D }, { 0xD9DC, 0x4F58 }, 
-	{ 0xD9DD, 0x4F65 }, { 0xD9DE, 0x4FCE }, { 0xD9DF, 0x9FA0 }, { 0xD9E0, 0x6C46 }, { 0xD9E1, 0x7C74 }, { 0xD9E2, 0x516E }, { 0xD9E3, 0x5DFD }, { 0xD9E4, 0x9EC9 }, 
-	{ 0xD9E5, 0x9998 }, { 0xD9E6, 0x5181 }, { 0xD9E7, 0x5914 }, { 0xD9E8, 0x52F9 }, { 0xD9E9, 0x530D }, { 0xD9EA, 0x8A07 }, { 0xD9EB, 0x5310 }, { 0xD9EC, 0x51EB }, 
-	{ 0xD9ED, 0x5919 }, { 0xD9EE, 0x5155 }, { 0xD9EF, 0x4EA0 }, { 0xD9F0, 0x5156 }, { 0xD9F1, 0x4EB3 }, { 0xD9F2, 0x886E }, { 0xD9F3, 0x88A4 }, { 0xD9F4, 0x4EB5 }, 
-	{ 0xD9F5, 0x8114 }, { 0xD9F6, 0x88D2 }, { 0xD9F7, 0x7980 }, { 0xD9F8, 0x5B34 }, { 0xD9F9, 0x8803 }, { 0xD9FA, 0x7FB8 }, { 0xD9FB, 0x51AB }, { 0xD9FC, 0x51B1 }, 
-	{ 0xD9FD, 0x51BD }, { 0xD9FE, 0x51BC }, { 0xDAA1, 0x51C7 }, { 0xDAA2, 0x5196 }, { 0xDAA3, 0x51A2 }, { 0xDAA4, 0x51A5 }, { 0xDAA5, 0x8BA0 }, { 0xDAA6, 0x8BA6 }, 
-	{ 0xDAA7, 0x8BA7 }, { 0xDAA8, 0x8BAA }, { 0xDAA9, 0x8BB4 }, { 0xDAAA, 0x8BB5 }, { 0xDAAB, 0x8BB7 }, { 0xDAAC, 0x8BC2 }, { 0xDAAD, 0x8BC3 }, { 0xDAAE, 0x8BCB }, 
-	{ 0xDAAF, 0x8BCF }, { 0xDAB0, 0x8BCE }, { 0xDAB1, 0x8BD2 }, { 0xDAB2, 0x8BD3 }, { 0xDAB3, 0x8BD4 }, { 0xDAB4, 0x8BD6 }, { 0xDAB5, 0x8BD8 }, { 0xDAB6, 0x8BD9 }, 
-	{ 0xDAB7, 0x8BDC }, { 0xDAB8, 0x8BDF }, { 0xDAB9, 0x8BE0 }, { 0xDABA, 0x8BE4 }, { 0xDABB, 0x8BE8 }, { 0xDABC, 0x8BE9 }, { 0xDABD, 0x8BEE }, { 0xDABE, 0x8BF0 }, 
-	{ 0xDABF, 0x8BF3 }, { 0xDAC0, 0x8BF6 }, { 0xDAC1, 0x8BF9 }, { 0xDAC2, 0x8BFC }, { 0xDAC3, 0x8BFF }, { 0xDAC4, 0x8C00 }, { 0xDAC5, 0x8C02 }, { 0xDAC6, 0x8C04 }, 
-	{ 0xDAC7, 0x8C07 }, { 0xDAC8, 0x8C0C }, { 0xDAC9, 0x8C0F }, { 0xDACA, 0x8C11 }, { 0xDACB, 0x8C12 }, { 0xDACC, 0x8C14 }, { 0xDACD, 0x8C15 }, { 0xDACE, 0x8C16 }, 
-	{ 0xDACF, 0x8C19 }, { 0xDAD0, 0x8C1B }, { 0xDAD1, 0x8C18 }, { 0xDAD2, 0x8C1D }, { 0xDAD3, 0x8C1F }, { 0xDAD4, 0x8C20 }, { 0xDAD5, 0x8C21 }, { 0xDAD6, 0x8C25 }, 
-	{ 0xDAD7, 0x8C27 }, { 0xDAD8, 0x8C2A }, { 0xDAD9, 0x8C2B }, { 0xDADA, 0x8C2E }, { 0xDADB, 0x8C2F }, { 0xDADC, 0x8C32 }, { 0xDADD, 0x8C33 }, { 0xDADE, 0x8C35 }, 
-	{ 0xDADF, 0x8C36 }, { 0xDAE0, 0x5369 }, { 0xDAE1, 0x537A }, { 0xDAE2, 0x961D }, { 0xDAE3, 0x9622 }, { 0xDAE4, 0x9621 }, { 0xDAE5, 0x9631 }, { 0xDAE6, 0x962A }, 
-	{ 0xDAE7, 0x963D }, { 0xDAE8, 0x963C }, { 0xDAE9, 0x9642 }, { 0xDAEA, 0x9649 }, { 0xDAEB, 0x9654 }, { 0xDAEC, 0x965F }, { 0xDAED, 0x9667 }, { 0xDAEE, 0x966C }, 
-	{ 0xDAEF, 0x9672 }, { 0xDAF0, 0x9674 }, { 0xDAF1, 0x9688 }, { 0xDAF2, 0x968D }, { 0xDAF3, 0x9697 }, { 0xDAF4, 0x96B0 }, { 0xDAF5, 0x9097 }, { 0xDAF6, 0x909B }, 
-	{ 0xDAF7, 0x909D }, { 0xDAF8, 0x9099 }, { 0xDAF9, 0x90AC }, { 0xDAFA, 0x90A1 }, { 0xDAFB, 0x90B4 }, { 0xDAFC, 0x90B3 }, { 0xDAFD, 0x90B6 }, { 0xDAFE, 0x90BA }, 
-	{ 0xDBA1, 0x90B8 }, { 0xDBA2, 0x90B0 }, { 0xDBA3, 0x90CF }, { 0xDBA4, 0x90C5 }, { 0xDBA5, 0x90BE }, { 0xDBA6, 0x90D0 }, { 0xDBA7, 0x90C4 }, { 0xDBA8, 0x90C7 }, 
-	{ 0xDBA9, 0x90D3 }, { 0xDBAA, 0x90E6 }, { 0xDBAB, 0x90E2 }, { 0xDBAC, 0x90DC }, { 0xDBAD, 0x90D7 }, { 0xDBAE, 0x90DB }, { 0xDBAF, 0x90EB }, { 0xDBB0, 0x90EF }, 
-	{ 0xDBB1, 0x90FE }, { 0xDBB2, 0x9104 }, { 0xDBB3, 0x9122 }, { 0xDBB4, 0x911E }, { 0xDBB5, 0x9123 }, { 0xDBB6, 0x9131 }, { 0xDBB7, 0x912F }, { 0xDBB8, 0x9139 }, 
-	{ 0xDBB9, 0x9143 }, { 0xDBBA, 0x9146 }, { 0xDBBB, 0x520D }, { 0xDBBC, 0x5942 }, { 0xDBBD, 0x52A2 }, { 0xDBBE, 0x52AC }, { 0xDBBF, 0x52AD }, { 0xDBC0, 0x52BE }, 
-	{ 0xDBC1, 0x54FF }, { 0xDBC2, 0x52D0 }, { 0xDBC3, 0x52D6 }, { 0xDBC4, 0x52F0 }, { 0xDBC5, 0x53DF }, { 0xDBC6, 0x71EE }, { 0xDBC7, 0x77CD }, { 0xDBC8, 0x5EF4 }, 
-	{ 0xDBC9, 0x51F5 }, { 0xDBCA, 0x51FC }, { 0xDBCB, 0x9B2F }, { 0xDBCC, 0x53B6 }, { 0xDBCD, 0x5F01 }, { 0xDBCE, 0x755A }, { 0xDBCF, 0x5DEF }, { 0xDBD0, 0x574C }, 
-	{ 0xDBD1, 0x57A9 }, { 0xDBD2, 0x57A1 }, { 0xDBD3, 0x587E }, { 0xDBD4, 0x58BC }, { 0xDBD5, 0x58C5 }, { 0xDBD6, 0x58D1 }, { 0xDBD7, 0x5729 }, { 0xDBD8, 0x572C }, 
-	{ 0xDBD9, 0x572A }, { 0xDBDA, 0x5733 }, { 0xDBDB, 0x5739 }, { 0xDBDC, 0x572E }, { 0xDBDD, 0x572F }, { 0xDBDE, 0x575C }, { 0xDBDF, 0x573B }, { 0xDBE0, 0x5742 }, 
-	{ 0xDBE1, 0x5769 }, { 0xDBE2, 0x5785 }, { 0xDBE3, 0x576B }, { 0xDBE4, 0x5786 }, { 0xDBE5, 0x577C }, { 0xDBE6, 0x577B }, { 0xDBE7, 0x5768 }, { 0xDBE8, 0x576D }, 
-	{ 0xDBE9, 0x5776 }, { 0xDBEA, 0x5773 }, { 0xDBEB, 0x57AD }, { 0xDBEC, 0x57A4 }, { 0xDBED, 0x578C }, { 0xDBEE, 0x57B2 }, { 0xDBEF, 0x57CF }, { 0xDBF0, 0x57A7 }, 
-	{ 0xDBF1, 0x57B4 }, { 0xDBF2, 0x5793 }, { 0xDBF3, 0x57A0 }, { 0xDBF4, 0x57D5 }, { 0xDBF5, 0x57D8 }, { 0xDBF6, 0x57DA }, { 0xDBF7, 0x57D9 }, { 0xDBF8, 0x57D2 }, 
-	{ 0xDBF9, 0x57B8 }, { 0xDBFA, 0x57F4 }, { 0xDBFB, 0x57EF }, { 0xDBFC, 0x57F8 }, { 0xDBFD, 0x57E4 }, { 0xDBFE, 0x57DD }, { 0xDCA1, 0x580B }, { 0xDCA2, 0x580D }, 
-	{ 0xDCA3, 0x57FD }, { 0xDCA4, 0x57ED }, { 0xDCA5, 0x5800 }, { 0xDCA6, 0x581E }, { 0xDCA7, 0x5819 }, { 0xDCA8, 0x5844 }, { 0xDCA9, 0x5820 }, { 0xDCAA, 0x5865 }, 
-	{ 0xDCAB, 0x586C }, { 0xDCAC, 0x5881 }, { 0xDCAD, 0x5889 }, { 0xDCAE, 0x589A }, { 0xDCAF, 0x5880 }, { 0xDCB0, 0x99A8 }, { 0xDCB1, 0x9F19 }, { 0xDCB2, 0x61FF }, 
-	{ 0xDCB3, 0x8279 }, { 0xDCB4, 0x827D }, { 0xDCB5, 0x827F }, { 0xDCB6, 0x828F }, { 0xDCB7, 0x828A }, { 0xDCB8, 0x82A8 }, { 0xDCB9, 0x8284 }, { 0xDCBA, 0x828E }, 
-	{ 0xDCBB, 0x8291 }, { 0xDCBC, 0x8297 }, { 0xDCBD, 0x8299 }, { 0xDCBE, 0x82AB }, { 0xDCBF, 0x82B8 }, { 0xDCC0, 0x82BE }, { 0xDCC1, 0x82B0 }, { 0xDCC2, 0x82C8 }, 
-	{ 0xDCC3, 0x82CA }, { 0xDCC4, 0x82E3 }, { 0xDCC5, 0x8298 }, { 0xDCC6, 0x82B7 }, { 0xDCC7, 0x82AE }, { 0xDCC8, 0x82CB }, { 0xDCC9, 0x82CC }, { 0xDCCA, 0x82C1 }, 
-	{ 0xDCCB, 0x82A9 }, { 0xDCCC, 0x82B4 }, { 0xDCCD, 0x82A1 }, { 0xDCCE, 0x82AA }, { 0xDCCF, 0x829F }, { 0xDCD0, 0x82C4 }, { 0xDCD1, 0x82CE }, { 0xDCD2, 0x82A4 }, 
-	{ 0xDCD3, 0x82E1 }, { 0xDCD4, 0x8309 }, { 0xDCD5, 0x82F7 }, { 0xDCD6, 0x82E4 }, { 0xDCD7, 0x830F }, { 0xDCD8, 0x8307 }, { 0xDCD9, 0x82DC }, { 0xDCDA, 0x82F4 }, 
-	{ 0xDCDB, 0x82D2 }, { 0xDCDC, 0x82D8 }, { 0xDCDD, 0x830C }, { 0xDCDE, 0x82FB }, { 0xDCDF, 0x82D3 }, { 0xDCE0, 0x8311 }, { 0xDCE1, 0x831A }, { 0xDCE2, 0x8306 }, 
-	{ 0xDCE3, 0x8314 }, { 0xDCE4, 0x8315 }, { 0xDCE5, 0x82E0 }, { 0xDCE6, 0x82D5 }, { 0xDCE7, 0x831C }, { 0xDCE8, 0x8351 }, { 0xDCE9, 0x835B }, { 0xDCEA, 0x835C }, 
-	{ 0xDCEB, 0x8308 }, { 0xDCEC, 0x8392 }, { 0xDCED, 0x833C }, { 0xDCEE, 0x8334 }, { 0xDCEF, 0x8331 }, { 0xDCF0, 0x839B }, { 0xDCF1, 0x835E }, { 0xDCF2, 0x832F }, 
-	{ 0xDCF3, 0x834F }, { 0xDCF4, 0x8347 }, { 0xDCF5, 0x8343 }, { 0xDCF6, 0x835F }, { 0xDCF7, 0x8340 }, { 0xDCF8, 0x8317 }, { 0xDCF9, 0x8360 }, { 0xDCFA, 0x832D }, 
-	{ 0xDCFB, 0x833A }, { 0xDCFC, 0x8333 }, { 0xDCFD, 0x8366 }, { 0xDCFE, 0x8365 }, { 0xDDA1, 0x8368 }, { 0xDDA2, 0x831B }, { 0xDDA3, 0x8369 }, { 0xDDA4, 0x836C }, 
-	{ 0xDDA5, 0x836A }, { 0xDDA6, 0x836D }, { 0xDDA7, 0x836E }, { 0xDDA8, 0x83B0 }, { 0xDDA9, 0x8378 }, { 0xDDAA, 0x83B3 }, { 0xDDAB, 0x83B4 }, { 0xDDAC, 0x83A0 }, 
-	{ 0xDDAD, 0x83AA }, { 0xDDAE, 0x8393 }, { 0xDDAF, 0x839C }, { 0xDDB0, 0x8385 }, { 0xDDB1, 0x837C }, { 0xDDB2, 0x83B6 }, { 0xDDB3, 0x83A9 }, { 0xDDB4, 0x837D }, 
-	{ 0xDDB5, 0x83B8 }, { 0xDDB6, 0x837B }, { 0xDDB7, 0x8398 }, { 0xDDB8, 0x839E }, { 0xDDB9, 0x83A8 }, { 0xDDBA, 0x83BA }, { 0xDDBB, 0x83BC }, { 0xDDBC, 0x83C1 }, 
-	{ 0xDDBD, 0x8401 }, { 0xDDBE, 0x83E5 }, { 0xDDBF, 0x83D8 }, { 0xDDC0, 0x5807 }, { 0xDDC1, 0x8418 }, { 0xDDC2, 0x840B }, { 0xDDC3, 0x83DD }, { 0xDDC4, 0x83FD }, 
-	{ 0xDDC5, 0x83D6 }, { 0xDDC6, 0x841C }, { 0xDDC7, 0x8438 }, { 0xDDC8, 0x8411 }, { 0xDDC9, 0x8406 }, { 0xDDCA, 0x83D4 }, { 0xDDCB, 0x83DF }, { 0xDDCC, 0x840F }, 
-	{ 0xDDCD, 0x8403 }, { 0xDDCE, 0x83F8 }, { 0xDDCF, 0x83F9 }, { 0xDDD0, 0x83EA }, { 0xDDD1, 0x83C5 }, { 0xDDD2, 0x83C0 }, { 0xDDD3, 0x8426 }, { 0xDDD4, 0x83F0 }, 
-	{ 0xDDD5, 0x83E1 }, { 0xDDD6, 0x845C }, { 0xDDD7, 0x8451 }, { 0xDDD8, 0x845A }, { 0xDDD9, 0x8459 }, { 0xDDDA, 0x8473 }, { 0xDDDB, 0x8487 }, { 0xDDDC, 0x8488 }, 
-	{ 0xDDDD, 0x847A }, { 0xDDDE, 0x8489 }, { 0xDDDF, 0x8478 }, { 0xDDE0, 0x843C }, { 0xDDE1, 0x8446 }, { 0xDDE2, 0x8469 }, { 0xDDE3, 0x8476 }, { 0xDDE4, 0x848C }, 
-	{ 0xDDE5, 0x848E }, { 0xDDE6, 0x8431 }, { 0xDDE7, 0x846D }, { 0xDDE8, 0x84C1 }, { 0xDDE9, 0x84CD }, { 0xDDEA, 0x84D0 }, { 0xDDEB, 0x84E6 }, { 0xDDEC, 0x84BD }, 
-	{ 0xDDED, 0x84D3 }, { 0xDDEE, 0x84CA }, { 0xDDEF, 0x84BF }, { 0xDDF0, 0x84BA }, { 0xDDF1, 0x84E0 }, { 0xDDF2, 0x84A1 }, { 0xDDF3, 0x84B9 }, { 0xDDF4, 0x84B4 }, 
-	{ 0xDDF5, 0x8497 }, { 0xDDF6, 0x84E5 }, { 0xDDF7, 0x84E3 }, { 0xDDF8, 0x850C }, { 0xDDF9, 0x750D }, { 0xDDFA, 0x8538 }, { 0xDDFB, 0x84F0 }, { 0xDDFC, 0x8539 }, 
-	{ 0xDDFD, 0x851F }, { 0xDDFE, 0x853A }, { 0xDEA1, 0x8556 }, { 0xDEA2, 0x853B }, { 0xDEA3, 0x84FF }, { 0xDEA4, 0x84FC }, { 0xDEA5, 0x8559 }, { 0xDEA6, 0x8548 }, 
-	{ 0xDEA7, 0x8568 }, { 0xDEA8, 0x8564 }, { 0xDEA9, 0x855E }, { 0xDEAA, 0x857A }, { 0xDEAB, 0x77A2 }, { 0xDEAC, 0x8543 }, { 0xDEAD, 0x8572 }, { 0xDEAE, 0x857B }, 
-	{ 0xDEAF, 0x85A4 }, { 0xDEB0, 0x85A8 }, { 0xDEB1, 0x8587 }, { 0xDEB2, 0x858F }, { 0xDEB3, 0x8579 }, { 0xDEB4, 0x85AE }, { 0xDEB5, 0x859C }, { 0xDEB6, 0x8585 }, 
-	{ 0xDEB7, 0x85B9 }, { 0xDEB8, 0x85B7 }, { 0xDEB9, 0x85B0 }, { 0xDEBA, 0x85D3 }, { 0xDEBB, 0x85C1 }, { 0xDEBC, 0x85DC }, { 0xDEBD, 0x85FF }, { 0xDEBE, 0x8627 }, 
-	{ 0xDEBF, 0x8605 }, { 0xDEC0, 0x8629 }, { 0xDEC1, 0x8616 }, { 0xDEC2, 0x863C }, { 0xDEC3, 0x5EFE }, { 0xDEC4, 0x5F08 }, { 0xDEC5, 0x593C }, { 0xDEC6, 0x5941 }, 
-	{ 0xDEC7, 0x8037 }, { 0xDEC8, 0x5955 }, { 0xDEC9, 0x595A }, { 0xDECA, 0x5958 }, { 0xDECB, 0x530F }, { 0xDECC, 0x5C22 }, { 0xDECD, 0x5C25 }, { 0xDECE, 0x5C2C }, 
-	{ 0xDECF, 0x5C34 }, { 0xDED0, 0x624C }, { 0xDED1, 0x626A }, { 0xDED2, 0x629F }, { 0xDED3, 0x62BB }, { 0xDED4, 0x62CA }, { 0xDED5, 0x62DA }, { 0xDED6, 0x62D7 }, 
-	{ 0xDED7, 0x62EE }, { 0xDED8, 0x6322 }, { 0xDED9, 0x62F6 }, { 0xDEDA, 0x6339 }, { 0xDEDB, 0x634B }, { 0xDEDC, 0x6343 }, { 0xDEDD, 0x63AD }, { 0xDEDE, 0x63F6 }, 
-	{ 0xDEDF, 0x6371 }, { 0xDEE0, 0x637A }, { 0xDEE1, 0x638E }, { 0xDEE2, 0x63B4 }, { 0xDEE3, 0x636D }, { 0xDEE4, 0x63AC }, { 0xDEE5, 0x638A }, { 0xDEE6, 0x6369 }, 
-	{ 0xDEE7, 0x63AE }, { 0xDEE8, 0x63BC }, { 0xDEE9, 0x63F2 }, { 0xDEEA, 0x63F8 }, { 0xDEEB, 0x63E0 }, { 0xDEEC, 0x63FF }, { 0xDEED, 0x63C4 }, { 0xDEEE, 0x63DE }, 
-	{ 0xDEEF, 0x63CE }, { 0xDEF0, 0x6452 }, { 0xDEF1, 0x63C6 }, { 0xDEF2, 0x63BE }, { 0xDEF3, 0x6445 }, { 0xDEF4, 0x6441 }, { 0xDEF5, 0x640B }, { 0xDEF6, 0x641B }, 
-	{ 0xDEF7, 0x6420 }, { 0xDEF8, 0x640C }, { 0xDEF9, 0x6426 }, { 0xDEFA, 0x6421 }, { 0xDEFB, 0x645E }, { 0xDEFC, 0x6484 }, { 0xDEFD, 0x646D }, { 0xDEFE, 0x6496 }, 
-	{ 0xDFA1, 0x647A }, { 0xDFA2, 0x64B7 }, { 0xDFA3, 0x64B8 }, { 0xDFA4, 0x6499 }, { 0xDFA5, 0x64BA }, { 0xDFA6, 0x64C0 }, { 0xDFA7, 0x64D0 }, { 0xDFA8, 0x64D7 }, 
-	{ 0xDFA9, 0x64E4 }, { 0xDFAA, 0x64E2 }, { 0xDFAB, 0x6509 }, { 0xDFAC, 0x6525 }, { 0xDFAD, 0x652E }, { 0xDFAE, 0x5F0B }, { 0xDFAF, 0x5FD2 }, { 0xDFB0, 0x7519 }, 
-	{ 0xDFB1, 0x5F11 }, { 0xDFB2, 0x535F }, { 0xDFB3, 0x53F1 }, { 0xDFB4, 0x53FD }, { 0xDFB5, 0x53E9 }, { 0xDFB6, 0x53E8 }, { 0xDFB7, 0x53FB }, { 0xDFB8, 0x5412 }, 
-	{ 0xDFB9, 0x5416 }, { 0xDFBA, 0x5406 }, { 0xDFBB, 0x544B }, { 0xDFBC, 0x5452 }, { 0xDFBD, 0x5453 }, { 0xDFBE, 0x5454 }, { 0xDFBF, 0x5456 }, { 0xDFC0, 0x5443 }, 
-	{ 0xDFC1, 0x5421 }, { 0xDFC2, 0x5457 }, { 0xDFC3, 0x5459 }, { 0xDFC4, 0x5423 }, { 0xDFC5, 0x5432 }, { 0xDFC6, 0x5482 }, { 0xDFC7, 0x5494 }, { 0xDFC8, 0x5477 }, 
-	{ 0xDFC9, 0x5471 }, { 0xDFCA, 0x5464 }, { 0xDFCB, 0x549A }, { 0xDFCC, 0x549B }, { 0xDFCD, 0x5484 }, { 0xDFCE, 0x5476 }, { 0xDFCF, 0x5466 }, { 0xDFD0, 0x549D }, 
-	{ 0xDFD1, 0x54D0 }, { 0xDFD2, 0x54AD }, { 0xDFD3, 0x54C2 }, { 0xDFD4, 0x54B4 }, { 0xDFD5, 0x54D2 }, { 0xDFD6, 0x54A7 }, { 0xDFD7, 0x54A6 }, { 0xDFD8, 0x54D3 }, 
-	{ 0xDFD9, 0x54D4 }, { 0xDFDA, 0x5472 }, { 0xDFDB, 0x54A3 }, { 0xDFDC, 0x54D5 }, { 0xDFDD, 0x54BB }, { 0xDFDE, 0x54BF }, { 0xDFDF, 0x54CC }, { 0xDFE0, 0x54D9 }, 
-	{ 0xDFE1, 0x54DA }, { 0xDFE2, 0x54DC }, { 0xDFE3, 0x54A9 }, { 0xDFE4, 0x54AA }, { 0xDFE5, 0x54A4 }, { 0xDFE6, 0x54DD }, { 0xDFE7, 0x54CF }, { 0xDFE8, 0x54DE }, 
-	{ 0xDFE9, 0x551B }, { 0xDFEA, 0x54E7 }, { 0xDFEB, 0x5520 }, { 0xDFEC, 0x54FD }, { 0xDFED, 0x5514 }, { 0xDFEE, 0x54F3 }, { 0xDFEF, 0x5522 }, { 0xDFF0, 0x5523 }, 
-	{ 0xDFF1, 0x550F }, { 0xDFF2, 0x5511 }, { 0xDFF3, 0x5527 }, { 0xDFF4, 0x552A }, { 0xDFF5, 0x5567 }, { 0xDFF6, 0x558F }, { 0xDFF7, 0x55B5 }, { 0xDFF8, 0x5549 }, 
-	{ 0xDFF9, 0x556D }, { 0xDFFA, 0x5541 }, { 0xDFFB, 0x5555 }, { 0xDFFC, 0x553F }, { 0xDFFD, 0x5550 }, { 0xDFFE, 0x553C }, { 0xE0A1, 0x5537 }, { 0xE0A2, 0x5556 }, 
-	{ 0xE0A3, 0x5575 }, { 0xE0A4, 0x5576 }, { 0xE0A5, 0x5577 }, { 0xE0A6, 0x5533 }, { 0xE0A7, 0x5530 }, { 0xE0A8, 0x555C }, { 0xE0A9, 0x558B }, { 0xE0AA, 0x55D2 }, 
-	{ 0xE0AB, 0x5583 }, { 0xE0AC, 0x55B1 }, { 0xE0AD, 0x55B9 }, { 0xE0AE, 0x5588 }, { 0xE0AF, 0x5581 }, { 0xE0B0, 0x559F }, { 0xE0B1, 0x557E }, { 0xE0B2, 0x55D6 }, 
-	{ 0xE0B3, 0x5591 }, { 0xE0B4, 0x557B }, { 0xE0B5, 0x55DF }, { 0xE0B6, 0x55BD }, { 0xE0B7, 0x55BE }, { 0xE0B8, 0x5594 }, { 0xE0B9, 0x5599 }, { 0xE0BA, 0x55EA }, 
-	{ 0xE0BB, 0x55F7 }, { 0xE0BC, 0x55C9 }, { 0xE0BD, 0x561F }, { 0xE0BE, 0x55D1 }, { 0xE0BF, 0x55EB }, { 0xE0C0, 0x55EC }, { 0xE0C1, 0x55D4 }, { 0xE0C2, 0x55E6 }, 
-	{ 0xE0C3, 0x55DD }, { 0xE0C4, 0x55C4 }, { 0xE0C5, 0x55EF }, { 0xE0C6, 0x55E5 }, { 0xE0C7, 0x55F2 }, { 0xE0C8, 0x55F3 }, { 0xE0C9, 0x55CC }, { 0xE0CA, 0x55CD }, 
-	{ 0xE0CB, 0x55E8 }, { 0xE0CC, 0x55F5 }, { 0xE0CD, 0x55E4 }, { 0xE0CE, 0x8F94 }, { 0xE0CF, 0x561E }, { 0xE0D0, 0x5608 }, { 0xE0D1, 0x560C }, { 0xE0D2, 0x5601 }, 
-	{ 0xE0D3, 0x5624 }, { 0xE0D4, 0x5623 }, { 0xE0D5, 0x55FE }, { 0xE0D6, 0x5600 }, { 0xE0D7, 0x5627 }, { 0xE0D8, 0x562D }, { 0xE0D9, 0x5658 }, { 0xE0DA, 0x5639 }, 
-	{ 0xE0DB, 0x5657 }, { 0xE0DC, 0x562C }, { 0xE0DD, 0x564D }, { 0xE0DE, 0x5662 }, { 0xE0DF, 0x5659 }, { 0xE0E0, 0x565C }, { 0xE0E1, 0x564C }, { 0xE0E2, 0x5654 }, 
-	{ 0xE0E3, 0x5686 }, { 0xE0E4, 0x5664 }, { 0xE0E5, 0x5671 }, { 0xE0E6, 0x566B }, { 0xE0E7, 0x567B }, { 0xE0E8, 0x567C }, { 0xE0E9, 0x5685 }, { 0xE0EA, 0x5693 }, 
-	{ 0xE0EB, 0x56AF }, { 0xE0EC, 0x56D4 }, { 0xE0ED, 0x56D7 }, { 0xE0EE, 0x56DD }, { 0xE0EF, 0x56E1 }, { 0xE0F0, 0x56F5 }, { 0xE0F1, 0x56EB }, { 0xE0F2, 0x56F9 }, 
-	{ 0xE0F3, 0x56FF }, { 0xE0F4, 0x5704 }, { 0xE0F5, 0x570A }, { 0xE0F6, 0x5709 }, { 0xE0F7, 0x571C }, { 0xE0F8, 0x5E0F }, { 0xE0F9, 0x5E19 }, { 0xE0FA, 0x5E14 }, 
-	{ 0xE0FB, 0x5E11 }, { 0xE0FC, 0x5E31 }, { 0xE0FD, 0x5E3B }, { 0xE0FE, 0x5E3C }, { 0xE1A1, 0x5E37 }, { 0xE1A2, 0x5E44 }, { 0xE1A3, 0x5E54 }, { 0xE1A4, 0x5E5B }, 
-	{ 0xE1A5, 0x5E5E }, { 0xE1A6, 0x5E61 }, { 0xE1A7, 0x5C8C }, { 0xE1A8, 0x5C7A }, { 0xE1A9, 0x5C8D }, { 0xE1AA, 0x5C90 }, { 0xE1AB, 0x5C96 }, { 0xE1AC, 0x5C88 }, 
-	{ 0xE1AD, 0x5C98 }, { 0xE1AE, 0x5C99 }, { 0xE1AF, 0x5C91 }, { 0xE1B0, 0x5C9A }, { 0xE1B1, 0x5C9C }, { 0xE1B2, 0x5CB5 }, { 0xE1B3, 0x5CA2 }, { 0xE1B4, 0x5CBD }, 
-	{ 0xE1B5, 0x5CAC }, { 0xE1B6, 0x5CAB }, { 0xE1B7, 0x5CB1 }, { 0xE1B8, 0x5CA3 }, { 0xE1B9, 0x5CC1 }, { 0xE1BA, 0x5CB7 }, { 0xE1BB, 0x5CC4 }, { 0xE1BC, 0x5CD2 }, 
-	{ 0xE1BD, 0x5CE4 }, { 0xE1BE, 0x5CCB }, { 0xE1BF, 0x5CE5 }, { 0xE1C0, 0x5D02 }, { 0xE1C1, 0x5D03 }, { 0xE1C2, 0x5D27 }, { 0xE1C3, 0x5D26 }, { 0xE1C4, 0x5D2E }, 
-	{ 0xE1C5, 0x5D24 }, { 0xE1C6, 0x5D1E }, { 0xE1C7, 0x5D06 }, { 0xE1C8, 0x5D1B }, { 0xE1C9, 0x5D58 }, { 0xE1CA, 0x5D3E }, { 0xE1CB, 0x5D34 }, { 0xE1CC, 0x5D3D }, 
-	{ 0xE1CD, 0x5D6C }, { 0xE1CE, 0x5D5B }, { 0xE1CF, 0x5D6F }, { 0xE1D0, 0x5D5D }, { 0xE1D1, 0x5D6B }, { 0xE1D2, 0x5D4B }, { 0xE1D3, 0x5D4A }, { 0xE1D4, 0x5D69 }, 
-	{ 0xE1D5, 0x5D74 }, { 0xE1D6, 0x5D82 }, { 0xE1D7, 0x5D99 }, { 0xE1D8, 0x5D9D }, { 0xE1D9, 0x8C73 }, { 0xE1DA, 0x5DB7 }, { 0xE1DB, 0x5DC5 }, { 0xE1DC, 0x5F73 }, 
-	{ 0xE1DD, 0x5F77 }, { 0xE1DE, 0x5F82 }, { 0xE1DF, 0x5F87 }, { 0xE1E0, 0x5F89 }, { 0xE1E1, 0x5F8C }, { 0xE1E2, 0x5F95 }, { 0xE1E3, 0x5F99 }, { 0xE1E4, 0x5F9C }, 
-	{ 0xE1E5, 0x5FA8 }, { 0xE1E6, 0x5FAD }, { 0xE1E7, 0x5FB5 }, { 0xE1E8, 0x5FBC }, { 0xE1E9, 0x8862 }, { 0xE1EA, 0x5F61 }, { 0xE1EB, 0x72AD }, { 0xE1EC, 0x72B0 }, 
-	{ 0xE1ED, 0x72B4 }, { 0xE1EE, 0x72B7 }, { 0xE1EF, 0x72B8 }, { 0xE1F0, 0x72C3 }, { 0xE1F1, 0x72C1 }, { 0xE1F2, 0x72CE }, { 0xE1F3, 0x72CD }, { 0xE1F4, 0x72D2 }, 
-	{ 0xE1F5, 0x72E8 }, { 0xE1F6, 0x72EF }, { 0xE1F7, 0x72E9 }, { 0xE1F8, 0x72F2 }, { 0xE1F9, 0x72F4 }, { 0xE1FA, 0x72F7 }, { 0xE1FB, 0x7301 }, { 0xE1FC, 0x72F3 }, 
-	{ 0xE1FD, 0x7303 }, { 0xE1FE, 0x72FA }, { 0xE2A1, 0x72FB }, { 0xE2A2, 0x7317 }, { 0xE2A3, 0x7313 }, { 0xE2A4, 0x7321 }, { 0xE2A5, 0x730A }, { 0xE2A6, 0x731E }, 
-	{ 0xE2A7, 0x731D }, { 0xE2A8, 0x7315 }, { 0xE2A9, 0x7322 }, { 0xE2AA, 0x7339 }, { 0xE2AB, 0x7325 }, { 0xE2AC, 0x732C }, { 0xE2AD, 0x7338 }, { 0xE2AE, 0x7331 }, 
-	{ 0xE2AF, 0x7350 }, { 0xE2B0, 0x734D }, { 0xE2B1, 0x7357 }, { 0xE2B2, 0x7360 }, { 0xE2B3, 0x736C }, { 0xE2B4, 0x736F }, { 0xE2B5, 0x737E }, { 0xE2B6, 0x821B }, 
-	{ 0xE2B7, 0x5925 }, { 0xE2B8, 0x98E7 }, { 0xE2B9, 0x5924 }, { 0xE2BA, 0x5902 }, { 0xE2BB, 0x9963 }, { 0xE2BC, 0x9967 }, { 0xE2BD, 0x9968 }, { 0xE2BE, 0x9969 }, 
-	{ 0xE2BF, 0x996A }, { 0xE2C0, 0x996B }, { 0xE2C1, 0x996C }, { 0xE2C2, 0x9974 }, { 0xE2C3, 0x9977 }, { 0xE2C4, 0x997D }, { 0xE2C5, 0x9980 }, { 0xE2C6, 0x9984 }, 
-	{ 0xE2C7, 0x9987 }, { 0xE2C8, 0x998A }, { 0xE2C9, 0x998D }, { 0xE2CA, 0x9990 }, { 0xE2CB, 0x9991 }, { 0xE2CC, 0x9993 }, { 0xE2CD, 0x9994 }, { 0xE2CE, 0x9995 }, 
-	{ 0xE2CF, 0x5E80 }, { 0xE2D0, 0x5E91 }, { 0xE2D1, 0x5E8B }, { 0xE2D2, 0x5E96 }, { 0xE2D3, 0x5EA5 }, { 0xE2D4, 0x5EA0 }, { 0xE2D5, 0x5EB9 }, { 0xE2D6, 0x5EB5 }, 
-	{ 0xE2D7, 0x5EBE }, { 0xE2D8, 0x5EB3 }, { 0xE2D9, 0x8D53 }, { 0xE2DA, 0x5ED2 }, { 0xE2DB, 0x5ED1 }, { 0xE2DC, 0x5EDB }, { 0xE2DD, 0x5EE8 }, { 0xE2DE, 0x5EEA }, 
-	{ 0xE2DF, 0x81BA }, { 0xE2E0, 0x5FC4 }, { 0xE2E1, 0x5FC9 }, { 0xE2E2, 0x5FD6 }, { 0xE2E3, 0x5FCF }, { 0xE2E4, 0x6003 }, { 0xE2E5, 0x5FEE }, { 0xE2E6, 0x6004 }, 
-	{ 0xE2E7, 0x5FE1 }, { 0xE2E8, 0x5FE4 }, { 0xE2E9, 0x5FFE }, { 0xE2EA, 0x6005 }, { 0xE2EB, 0x6006 }, { 0xE2EC, 0x5FEA }, { 0xE2ED, 0x5FED }, { 0xE2EE, 0x5FF8 }, 
-	{ 0xE2EF, 0x6019 }, { 0xE2F0, 0x6035 }, { 0xE2F1, 0x6026 }, { 0xE2F2, 0x601B }, { 0xE2F3, 0x600F }, { 0xE2F4, 0x600D }, { 0xE2F5, 0x6029 }, { 0xE2F6, 0x602B }, 
-	{ 0xE2F7, 0x600A }, { 0xE2F8, 0x603F }, { 0xE2F9, 0x6021 }, { 0xE2FA, 0x6078 }, { 0xE2FB, 0x6079 }, { 0xE2FC, 0x607B }, { 0xE2FD, 0x607A }, { 0xE2FE, 0x6042 }, 
-	{ 0xE3A1, 0x606A }, { 0xE3A2, 0x607D }, { 0xE3A3, 0x6096 }, { 0xE3A4, 0x609A }, { 0xE3A5, 0x60AD }, { 0xE3A6, 0x609D }, { 0xE3A7, 0x6083 }, { 0xE3A8, 0x6092 }, 
-	{ 0xE3A9, 0x608C }, { 0xE3AA, 0x609B }, { 0xE3AB, 0x60EC }, { 0xE3AC, 0x60BB }, { 0xE3AD, 0x60B1 }, { 0xE3AE, 0x60DD }, { 0xE3AF, 0x60D8 }, { 0xE3B0, 0x60C6 }, 
-	{ 0xE3B1, 0x60DA }, { 0xE3B2, 0x60B4 }, { 0xE3B3, 0x6120 }, { 0xE3B4, 0x6126 }, { 0xE3B5, 0x6115 }, { 0xE3B6, 0x6123 }, { 0xE3B7, 0x60F4 }, { 0xE3B8, 0x6100 }, 
-	{ 0xE3B9, 0x610E }, { 0xE3BA, 0x612B }, { 0xE3BB, 0x614A }, { 0xE3BC, 0x6175 }, { 0xE3BD, 0x61AC }, { 0xE3BE, 0x6194 }, { 0xE3BF, 0x61A7 }, { 0xE3C0, 0x61B7 }, 
-	{ 0xE3C1, 0x61D4 }, { 0xE3C2, 0x61F5 }, { 0xE3C3, 0x5FDD }, { 0xE3C4, 0x96B3 }, { 0xE3C5, 0x95E9 }, { 0xE3C6, 0x95EB }, { 0xE3C7, 0x95F1 }, { 0xE3C8, 0x95F3 }, 
-	{ 0xE3C9, 0x95F5 }, { 0xE3CA, 0x95F6 }, { 0xE3CB, 0x95FC }, { 0xE3CC, 0x95FE }, { 0xE3CD, 0x9603 }, { 0xE3CE, 0x9604 }, { 0xE3CF, 0x9606 }, { 0xE3D0, 0x9608 }, 
-	{ 0xE3D1, 0x960A }, { 0xE3D2, 0x960B }, { 0xE3D3, 0x960C }, { 0xE3D4, 0x960D }, { 0xE3D5, 0x960F }, { 0xE3D6, 0x9612 }, { 0xE3D7, 0x9615 }, { 0xE3D8, 0x9616 }, 
-	{ 0xE3D9, 0x9617 }, { 0xE3DA, 0x9619 }, { 0xE3DB, 0x961A }, { 0xE3DC, 0x4E2C }, { 0xE3DD, 0x723F }, { 0xE3DE, 0x6215 }, { 0xE3DF, 0x6C35 }, { 0xE3E0, 0x6C54 }, 
-	{ 0xE3E1, 0x6C5C }, { 0xE3E2, 0x6C4A }, { 0xE3E3, 0x6CA3 }, { 0xE3E4, 0x6C85 }, { 0xE3E5, 0x6C90 }, { 0xE3E6, 0x6C94 }, { 0xE3E7, 0x6C8C }, { 0xE3E8, 0x6C68 }, 
-	{ 0xE3E9, 0x6C69 }, { 0xE3EA, 0x6C74 }, { 0xE3EB, 0x6C76 }, { 0xE3EC, 0x6C86 }, { 0xE3ED, 0x6CA9 }, { 0xE3EE, 0x6CD0 }, { 0xE3EF, 0x6CD4 }, { 0xE3F0, 0x6CAD }, 
-	{ 0xE3F1, 0x6CF7 }, { 0xE3F2, 0x6CF8 }, { 0xE3F3, 0x6CF1 }, { 0xE3F4, 0x6CD7 }, { 0xE3F5, 0x6CB2 }, { 0xE3F6, 0x6CE0 }, { 0xE3F7, 0x6CD6 }, { 0xE3F8, 0x6CFA }, 
-	{ 0xE3F9, 0x6CEB }, { 0xE3FA, 0x6CEE }, { 0xE3FB, 0x6CB1 }, { 0xE3FC, 0x6CD3 }, { 0xE3FD, 0x6CEF }, { 0xE3FE, 0x6CFE }, { 0xE4A1, 0x6D39 }, { 0xE4A2, 0x6D27 }, 
-	{ 0xE4A3, 0x6D0C }, { 0xE4A4, 0x6D43 }, { 0xE4A5, 0x6D48 }, { 0xE4A6, 0x6D07 }, { 0xE4A7, 0x6D04 }, { 0xE4A8, 0x6D19 }, { 0xE4A9, 0x6D0E }, { 0xE4AA, 0x6D2B }, 
-	{ 0xE4AB, 0x6D4D }, { 0xE4AC, 0x6D2E }, { 0xE4AD, 0x6D35 }, { 0xE4AE, 0x6D1A }, { 0xE4AF, 0x6D4F }, { 0xE4B0, 0x6D52 }, { 0xE4B1, 0x6D54 }, { 0xE4B2, 0x6D33 }, 
-	{ 0xE4B3, 0x6D91 }, { 0xE4B4, 0x6D6F }, { 0xE4B5, 0x6D9E }, { 0xE4B6, 0x6DA0 }, { 0xE4B7, 0x6D5E }, { 0xE4B8, 0x6D93 }, { 0xE4B9, 0x6D94 }, { 0xE4BA, 0x6D5C }, 
-	{ 0xE4BB, 0x6D60 }, { 0xE4BC, 0x6D7C }, { 0xE4BD, 0x6D63 }, { 0xE4BE, 0x6E1A }, { 0xE4BF, 0x6DC7 }, { 0xE4C0, 0x6DC5 }, { 0xE4C1, 0x6DDE }, { 0xE4C2, 0x6E0E }, 
-	{ 0xE4C3, 0x6DBF }, { 0xE4C4, 0x6DE0 }, { 0xE4C5, 0x6E11 }, { 0xE4C6, 0x6DE6 }, { 0xE4C7, 0x6DDD }, { 0xE4C8, 0x6DD9 }, { 0xE4C9, 0x6E16 }, { 0xE4CA, 0x6DAB }, 
-	{ 0xE4CB, 0x6E0C }, { 0xE4CC, 0x6DAE }, { 0xE4CD, 0x6E2B }, { 0xE4CE, 0x6E6E }, { 0xE4CF, 0x6E4E }, { 0xE4D0, 0x6E6B }, { 0xE4D1, 0x6EB2 }, { 0xE4D2, 0x6E5F }, 
-	{ 0xE4D3, 0x6E86 }, { 0xE4D4, 0x6E53 }, { 0xE4D5, 0x6E54 }, { 0xE4D6, 0x6E32 }, { 0xE4D7, 0x6E25 }, { 0xE4D8, 0x6E44 }, { 0xE4D9, 0x6EDF }, { 0xE4DA, 0x6EB1 }, 
-	{ 0xE4DB, 0x6E98 }, { 0xE4DC, 0x6EE0 }, { 0xE4DD, 0x6F2D }, { 0xE4DE, 0x6EE2 }, { 0xE4DF, 0x6EA5 }, { 0xE4E0, 0x6EA7 }, { 0xE4E1, 0x6EBD }, { 0xE4E2, 0x6EBB }, 
-	{ 0xE4E3, 0x6EB7 }, { 0xE4E4, 0x6ED7 }, { 0xE4E5, 0x6EB4 }, { 0xE4E6, 0x6ECF }, { 0xE4E7, 0x6E8F }, { 0xE4E8, 0x6EC2 }, { 0xE4E9, 0x6E9F }, { 0xE4EA, 0x6F62 }, 
-	{ 0xE4EB, 0x6F46 }, { 0xE4EC, 0x6F47 }, { 0xE4ED, 0x6F24 }, { 0xE4EE, 0x6F15 }, { 0xE4EF, 0x6EF9 }, { 0xE4F0, 0x6F2F }, { 0xE4F1, 0x6F36 }, { 0xE4F2, 0x6F4B }, 
-	{ 0xE4F3, 0x6F74 }, { 0xE4F4, 0x6F2A }, { 0xE4F5, 0x6F09 }, { 0xE4F6, 0x6F29 }, { 0xE4F7, 0x6F89 }, { 0xE4F8, 0x6F8D }, { 0xE4F9, 0x6F8C }, { 0xE4FA, 0x6F78 }, 
-	{ 0xE4FB, 0x6F72 }, { 0xE4FC, 0x6F7C }, { 0xE4FD, 0x6F7A }, { 0xE4FE, 0x6FD1 }, { 0xE5A1, 0x6FC9 }, { 0xE5A2, 0x6FA7 }, { 0xE5A3, 0x6FB9 }, { 0xE5A4, 0x6FB6 }, 
-	{ 0xE5A5, 0x6FC2 }, { 0xE5A6, 0x6FE1 }, { 0xE5A7, 0x6FEE }, { 0xE5A8, 0x6FDE }, { 0xE5A9, 0x6FE0 }, { 0xE5AA, 0x6FEF }, { 0xE5AB, 0x701A }, { 0xE5AC, 0x7023 }, 
-	{ 0xE5AD, 0x701B }, { 0xE5AE, 0x7039 }, { 0xE5AF, 0x7035 }, { 0xE5B0, 0x704F }, { 0xE5B1, 0x705E }, { 0xE5B2, 0x5B80 }, { 0xE5B3, 0x5B84 }, { 0xE5B4, 0x5B95 }, 
-	{ 0xE5B5, 0x5B93 }, { 0xE5B6, 0x5BA5 }, { 0xE5B7, 0x5BB8 }, { 0xE5B8, 0x752F }, { 0xE5B9, 0x9A9E }, { 0xE5BA, 0x6434 }, { 0xE5BB, 0x5BE4 }, { 0xE5BC, 0x5BEE }, 
-	{ 0xE5BD, 0x8930 }, { 0xE5BE, 0x5BF0 }, { 0xE5BF, 0x8E47 }, { 0xE5C0, 0x8B07 }, { 0xE5C1, 0x8FB6 }, { 0xE5C2, 0x8FD3 }, { 0xE5C3, 0x8FD5 }, { 0xE5C4, 0x8FE5 }, 
-	{ 0xE5C5, 0x8FEE }, { 0xE5C6, 0x8FE4 }, { 0xE5C7, 0x8FE9 }, { 0xE5C8, 0x8FE6 }, { 0xE5C9, 0x8FF3 }, { 0xE5CA, 0x8FE8 }, { 0xE5CB, 0x9005 }, { 0xE5CC, 0x9004 }, 
-	{ 0xE5CD, 0x900B }, { 0xE5CE, 0x9026 }, { 0xE5CF, 0x9011 }, { 0xE5D0, 0x900D }, { 0xE5D1, 0x9016 }, { 0xE5D2, 0x9021 }, { 0xE5D3, 0x9035 }, { 0xE5D4, 0x9036 }, 
-	{ 0xE5D5, 0x902D }, { 0xE5D6, 0x902F }, { 0xE5D7, 0x9044 }, { 0xE5D8, 0x9051 }, { 0xE5D9, 0x9052 }, { 0xE5DA, 0x9050 }, { 0xE5DB, 0x9068 }, { 0xE5DC, 0x9058 }, 
-	{ 0xE5DD, 0x9062 }, { 0xE5DE, 0x905B }, { 0xE5DF, 0x66B9 }, { 0xE5E0, 0x9074 }, { 0xE5E1, 0x907D }, { 0xE5E2, 0x9082 }, { 0xE5E3, 0x9088 }, { 0xE5E4, 0x9083 }, 
-	{ 0xE5E5, 0x908B }, { 0xE5E6, 0x5F50 }, { 0xE5E7, 0x5F57 }, { 0xE5E8, 0x5F56 }, { 0xE5E9, 0x5F58 }, { 0xE5EA, 0x5C3B }, { 0xE5EB, 0x54AB }, { 0xE5EC, 0x5C50 }, 
-	{ 0xE5ED, 0x5C59 }, { 0xE5EE, 0x5B71 }, { 0xE5EF, 0x5C63 }, { 0xE5F0, 0x5C66 }, { 0xE5F1, 0x7FBC }, { 0xE5F2, 0x5F2A }, { 0xE5F3, 0x5F29 }, { 0xE5F4, 0x5F2D }, 
-	{ 0xE5F5, 0x8274 }, { 0xE5F6, 0x5F3C }, { 0xE5F7, 0x9B3B }, { 0xE5F8, 0x5C6E }, { 0xE5F9, 0x5981 }, { 0xE5FA, 0x5983 }, { 0xE5FB, 0x598D }, { 0xE5FC, 0x59A9 }, 
-	{ 0xE5FD, 0x59AA }, { 0xE5FE, 0x59A3 }, { 0xE6A1, 0x5997 }, { 0xE6A2, 0x59CA }, { 0xE6A3, 0x59AB }, { 0xE6A4, 0x599E }, { 0xE6A5, 0x59A4 }, { 0xE6A6, 0x59D2 }, 
-	{ 0xE6A7, 0x59B2 }, { 0xE6A8, 0x59AF }, { 0xE6A9, 0x59D7 }, { 0xE6AA, 0x59BE }, { 0xE6AB, 0x5A05 }, { 0xE6AC, 0x5A06 }, { 0xE6AD, 0x59DD }, { 0xE6AE, 0x5A08 }, 
-	{ 0xE6AF, 0x59E3 }, { 0xE6B0, 0x59D8 }, { 0xE6B1, 0x59F9 }, { 0xE6B2, 0x5A0C }, { 0xE6B3, 0x5A09 }, { 0xE6B4, 0x5A32 }, { 0xE6B5, 0x5A34 }, { 0xE6B6, 0x5A11 }, 
-	{ 0xE6B7, 0x5A23 }, { 0xE6B8, 0x5A13 }, { 0xE6B9, 0x5A40 }, { 0xE6BA, 0x5A67 }, { 0xE6BB, 0x5A4A }, { 0xE6BC, 0x5A55 }, { 0xE6BD, 0x5A3C }, { 0xE6BE, 0x5A62 }, 
-	{ 0xE6BF, 0x5A75 }, { 0xE6C0, 0x80EC }, { 0xE6C1, 0x5AAA }, { 0xE6C2, 0x5A9B }, { 0xE6C3, 0x5A77 }, { 0xE6C4, 0x5A7A }, { 0xE6C5, 0x5ABE }, { 0xE6C6, 0x5AEB }, 
-	{ 0xE6C7, 0x5AB2 }, { 0xE6C8, 0x5AD2 }, { 0xE6C9, 0x5AD4 }, { 0xE6CA, 0x5AB8 }, { 0xE6CB, 0x5AE0 }, { 0xE6CC, 0x5AE3 }, { 0xE6CD, 0x5AF1 }, { 0xE6CE, 0x5AD6 }, 
-	{ 0xE6CF, 0x5AE6 }, { 0xE6D0, 0x5AD8 }, { 0xE6D1, 0x5ADC }, { 0xE6D2, 0x5B09 }, { 0xE6D3, 0x5B17 }, { 0xE6D4, 0x5B16 }, { 0xE6D5, 0x5B32 }, { 0xE6D6, 0x5B37 }, 
-	{ 0xE6D7, 0x5B40 }, { 0xE6D8, 0x5C15 }, { 0xE6D9, 0x5C1C }, { 0xE6DA, 0x5B5A }, { 0xE6DB, 0x5B65 }, { 0xE6DC, 0x5B73 }, { 0xE6DD, 0x5B51 }, { 0xE6DE, 0x5B53 }, 
-	{ 0xE6DF, 0x5B62 }, { 0xE6E0, 0x9A75 }, { 0xE6E1, 0x9A77 }, { 0xE6E2, 0x9A78 }, { 0xE6E3, 0x9A7A }, { 0xE6E4, 0x9A7F }, { 0xE6E5, 0x9A7D }, { 0xE6E6, 0x9A80 }, 
-	{ 0xE6E7, 0x9A81 }, { 0xE6E8, 0x9A85 }, { 0xE6E9, 0x9A88 }, { 0xE6EA, 0x9A8A }, { 0xE6EB, 0x9A90 }, { 0xE6EC, 0x9A92 }, { 0xE6ED, 0x9A93 }, { 0xE6EE, 0x9A96 }, 
-	{ 0xE6EF, 0x9A98 }, { 0xE6F0, 0x9A9B }, { 0xE6F1, 0x9A9C }, { 0xE6F2, 0x9A9D }, { 0xE6F3, 0x9A9F }, { 0xE6F4, 0x9AA0 }, { 0xE6F5, 0x9AA2 }, { 0xE6F6, 0x9AA3 }, 
-	{ 0xE6F7, 0x9AA5 }, { 0xE6F8, 0x9AA7 }, { 0xE6F9, 0x7E9F }, { 0xE6FA, 0x7EA1 }, { 0xE6FB, 0x7EA3 }, { 0xE6FC, 0x7EA5 }, { 0xE6FD, 0x7EA8 }, { 0xE6FE, 0x7EA9 }, 
-	{ 0xE7A1, 0x7EAD }, { 0xE7A2, 0x7EB0 }, { 0xE7A3, 0x7EBE }, { 0xE7A4, 0x7EC0 }, { 0xE7A5, 0x7EC1 }, { 0xE7A6, 0x7EC2 }, { 0xE7A7, 0x7EC9 }, { 0xE7A8, 0x7ECB }, 
-	{ 0xE7A9, 0x7ECC }, { 0xE7AA, 0x7ED0 }, { 0xE7AB, 0x7ED4 }, { 0xE7AC, 0x7ED7 }, { 0xE7AD, 0x7EDB }, { 0xE7AE, 0x7EE0 }, { 0xE7AF, 0x7EE1 }, { 0xE7B0, 0x7EE8 }, 
-	{ 0xE7B1, 0x7EEB }, { 0xE7B2, 0x7EEE }, { 0xE7B3, 0x7EEF }, { 0xE7B4, 0x7EF1 }, { 0xE7B5, 0x7EF2 }, { 0xE7B6, 0x7F0D }, { 0xE7B7, 0x7EF6 }, { 0xE7B8, 0x7EFA }, 
-	{ 0xE7B9, 0x7EFB }, { 0xE7BA, 0x7EFE }, { 0xE7BB, 0x7F01 }, { 0xE7BC, 0x7F02 }, { 0xE7BD, 0x7F03 }, { 0xE7BE, 0x7F07 }, { 0xE7BF, 0x7F08 }, { 0xE7C0, 0x7F0B }, 
-	{ 0xE7C1, 0x7F0C }, { 0xE7C2, 0x7F0F }, { 0xE7C3, 0x7F11 }, { 0xE7C4, 0x7F12 }, { 0xE7C5, 0x7F17 }, { 0xE7C6, 0x7F19 }, { 0xE7C7, 0x7F1C }, { 0xE7C8, 0x7F1B }, 
-	{ 0xE7C9, 0x7F1F }, { 0xE7CA, 0x7F21 }, { 0xE7CB, 0x7F22 }, { 0xE7CC, 0x7F23 }, { 0xE7CD, 0x7F24 }, { 0xE7CE, 0x7F25 }, { 0xE7CF, 0x7F26 }, { 0xE7D0, 0x7F27 }, 
-	{ 0xE7D1, 0x7F2A }, { 0xE7D2, 0x7F2B }, { 0xE7D3, 0x7F2C }, { 0xE7D4, 0x7F2D }, { 0xE7D5, 0x7F2F }, { 0xE7D6, 0x7F30 }, { 0xE7D7, 0x7F31 }, { 0xE7D8, 0x7F32 }, 
-	{ 0xE7D9, 0x7F33 }, { 0xE7DA, 0x7F35 }, { 0xE7DB, 0x5E7A }, { 0xE7DC, 0x757F }, { 0xE7DD, 0x5DDB }, { 0xE7DE, 0x753E }, { 0xE7DF, 0x9095 }, { 0xE7E0, 0x738E }, 
-	{ 0xE7E1, 0x7391 }, { 0xE7E2, 0x73AE }, { 0xE7E3, 0x73A2 }, { 0xE7E4, 0x739F }, { 0xE7E5, 0x73CF }, { 0xE7E6, 0x73C2 }, { 0xE7E7, 0x73D1 }, { 0xE7E8, 0x73B7 }, 
-	{ 0xE7E9, 0x73B3 }, { 0xE7EA, 0x73C0 }, { 0xE7EB, 0x73C9 }, { 0xE7EC, 0x73C8 }, { 0xE7ED, 0x73E5 }, { 0xE7EE, 0x73D9 }, { 0xE7EF, 0x987C }, { 0xE7F0, 0x740A }, 
-	{ 0xE7F1, 0x73E9 }, { 0xE7F2, 0x73E7 }, { 0xE7F3, 0x73DE }, { 0xE7F4, 0x73BA }, { 0xE7F5, 0x73F2 }, { 0xE7F6, 0x740F }, { 0xE7F7, 0x742A }, { 0xE7F8, 0x745B }, 
-	{ 0xE7F9, 0x7426 }, { 0xE7FA, 0x7425 }, { 0xE7FB, 0x7428 }, { 0xE7FC, 0x7430 }, { 0xE7FD, 0x742E }, { 0xE7FE, 0x742C }, { 0xE8A1, 0x741B }, { 0xE8A2, 0x741A }, 
-	{ 0xE8A3, 0x7441 }, { 0xE8A4, 0x745C }, { 0xE8A5, 0x7457 }, { 0xE8A6, 0x7455 }, { 0xE8A7, 0x7459 }, { 0xE8A8, 0x7477 }, { 0xE8A9, 0x746D }, { 0xE8AA, 0x747E }, 
-	{ 0xE8AB, 0x749C }, { 0xE8AC, 0x748E }, { 0xE8AD, 0x7480 }, { 0xE8AE, 0x7481 }, { 0xE8AF, 0x7487 }, { 0xE8B0, 0x748B }, { 0xE8B1, 0x749E }, { 0xE8B2, 0x74A8 }, 
-	{ 0xE8B3, 0x74A9 }, { 0xE8B4, 0x7490 }, { 0xE8B5, 0x74A7 }, { 0xE8B6, 0x74D2 }, { 0xE8B7, 0x74BA }, { 0xE8B8, 0x97EA }, { 0xE8B9, 0x97EB }, { 0xE8BA, 0x97EC }, 
-	{ 0xE8BB, 0x674C }, { 0xE8BC, 0x6753 }, { 0xE8BD, 0x675E }, { 0xE8BE, 0x6748 }, { 0xE8BF, 0x6769 }, { 0xE8C0, 0x67A5 }, { 0xE8C1, 0x6787 }, { 0xE8C2, 0x676A }, 
-	{ 0xE8C3, 0x6773 }, { 0xE8C4, 0x6798 }, { 0xE8C5, 0x67A7 }, { 0xE8C6, 0x6775 }, { 0xE8C7, 0x67A8 }, { 0xE8C8, 0x679E }, { 0xE8C9, 0x67AD }, { 0xE8CA, 0x678B }, 
-	{ 0xE8CB, 0x6777 }, { 0xE8CC, 0x677C }, { 0xE8CD, 0x67F0 }, { 0xE8CE, 0x6809 }, { 0xE8CF, 0x67D8 }, { 0xE8D0, 0x680A }, { 0xE8D1, 0x67E9 }, { 0xE8D2, 0x67B0 }, 
-	{ 0xE8D3, 0x680C }, { 0xE8D4, 0x67D9 }, { 0xE8D5, 0x67B5 }, { 0xE8D6, 0x67DA }, { 0xE8D7, 0x67B3 }, { 0xE8D8, 0x67DD }, { 0xE8D9, 0x6800 }, { 0xE8DA, 0x67C3 }, 
-	{ 0xE8DB, 0x67B8 }, { 0xE8DC, 0x67E2 }, { 0xE8DD, 0x680E }, { 0xE8DE, 0x67C1 }, { 0xE8DF, 0x67FD }, { 0xE8E0, 0x6832 }, { 0xE8E1, 0x6833 }, { 0xE8E2, 0x6860 }, 
-	{ 0xE8E3, 0x6861 }, { 0xE8E4, 0x684E }, { 0xE8E5, 0x6862 }, { 0xE8E6, 0x6844 }, { 0xE8E7, 0x6864 }, { 0xE8E8, 0x6883 }, { 0xE8E9, 0x681D }, { 0xE8EA, 0x6855 }, 
-	{ 0xE8EB, 0x6866 }, { 0xE8EC, 0x6841 }, { 0xE8ED, 0x6867 }, { 0xE8EE, 0x6840 }, { 0xE8EF, 0x683E }, { 0xE8F0, 0x684A }, { 0xE8F1, 0x6849 }, { 0xE8F2, 0x6829 }, 
-	{ 0xE8F3, 0x68B5 }, { 0xE8F4, 0x688F }, { 0xE8F5, 0x6874 }, { 0xE8F6, 0x6877 }, { 0xE8F7, 0x6893 }, { 0xE8F8, 0x686B }, { 0xE8F9, 0x68C2 }, { 0xE8FA, 0x696E }, 
-	{ 0xE8FB, 0x68FC }, { 0xE8FC, 0x691F }, { 0xE8FD, 0x6920 }, { 0xE8FE, 0x68F9 }, { 0xE9A1, 0x6924 }, { 0xE9A2, 0x68F0 }, { 0xE9A3, 0x690B }, { 0xE9A4, 0x6901 }, 
-	{ 0xE9A5, 0x6957 }, { 0xE9A6, 0x68E3 }, { 0xE9A7, 0x6910 }, { 0xE9A8, 0x6971 }, { 0xE9A9, 0x6939 }, { 0xE9AA, 0x6960 }, { 0xE9AB, 0x6942 }, { 0xE9AC, 0x695D }, 
-	{ 0xE9AD, 0x6984 }, { 0xE9AE, 0x696B }, { 0xE9AF, 0x6980 }, { 0xE9B0, 0x6998 }, { 0xE9B1, 0x6978 }, { 0xE9B2, 0x6934 }, { 0xE9B3, 0x69CC }, { 0xE9B4, 0x6987 }, 
-	{ 0xE9B5, 0x6988 }, { 0xE9B6, 0x69CE }, { 0xE9B7, 0x6989 }, { 0xE9B8, 0x6966 }, { 0xE9B9, 0x6963 }, { 0xE9BA, 0x6979 }, { 0xE9BB, 0x699B }, { 0xE9BC, 0x69A7 }, 
-	{ 0xE9BD, 0x69BB }, { 0xE9BE, 0x69AB }, { 0xE9BF, 0x69AD }, { 0xE9C0, 0x69D4 }, { 0xE9C1, 0x69B1 }, { 0xE9C2, 0x69C1 }, { 0xE9C3, 0x69CA }, { 0xE9C4, 0x69DF }, 
-	{ 0xE9C5, 0x6995 }, { 0xE9C6, 0x69E0 }, { 0xE9C7, 0x698D }, { 0xE9C8, 0x69FF }, { 0xE9C9, 0x6A2F }, { 0xE9CA, 0x69ED }, { 0xE9CB, 0x6A17 }, { 0xE9CC, 0x6A18 }, 
-	{ 0xE9CD, 0x6A65 }, { 0xE9CE, 0x69F2 }, { 0xE9CF, 0x6A44 }, { 0xE9D0, 0x6A3E }, { 0xE9D1, 0x6AA0 }, { 0xE9D2, 0x6A50 }, { 0xE9D3, 0x6A5B }, { 0xE9D4, 0x6A35 }, 
-	{ 0xE9D5, 0x6A8E }, { 0xE9D6, 0x6A79 }, { 0xE9D7, 0x6A3D }, { 0xE9D8, 0x6A28 }, { 0xE9D9, 0x6A58 }, { 0xE9DA, 0x6A7C }, { 0xE9DB, 0x6A91 }, { 0xE9DC, 0x6A90 }, 
-	{ 0xE9DD, 0x6AA9 }, { 0xE9DE, 0x6A97 }, { 0xE9DF, 0x6AAB }, { 0xE9E0, 0x7337 }, { 0xE9E1, 0x7352 }, { 0xE9E2, 0x6B81 }, { 0xE9E3, 0x6B82 }, { 0xE9E4, 0x6B87 }, 
-	{ 0xE9E5, 0x6B84 }, { 0xE9E6, 0x6B92 }, { 0xE9E7, 0x6B93 }, { 0xE9E8, 0x6B8D }, { 0xE9E9, 0x6B9A }, { 0xE9EA, 0x6B9B }, { 0xE9EB, 0x6BA1 }, { 0xE9EC, 0x6BAA }, 
-	{ 0xE9ED, 0x8F6B }, { 0xE9EE, 0x8F6D }, { 0xE9EF, 0x8F71 }, { 0xE9F0, 0x8F72 }, { 0xE9F1, 0x8F73 }, { 0xE9F2, 0x8F75 }, { 0xE9F3, 0x8F76 }, { 0xE9F4, 0x8F78 }, 
-	{ 0xE9F5, 0x8F77 }, { 0xE9F6, 0x8F79 }, { 0xE9F7, 0x8F7A }, { 0xE9F8, 0x8F7C }, { 0xE9F9, 0x8F7E }, { 0xE9FA, 0x8F81 }, { 0xE9FB, 0x8F82 }, { 0xE9FC, 0x8F84 }, 
-	{ 0xE9FD, 0x8F87 }, { 0xE9FE, 0x8F8B }, { 0xEAA1, 0x8F8D }, { 0xEAA2, 0x8F8E }, { 0xEAA3, 0x8F8F }, { 0xEAA4, 0x8F98 }, { 0xEAA5, 0x8F9A }, { 0xEAA6, 0x8ECE }, 
-	{ 0xEAA7, 0x620B }, { 0xEAA8, 0x6217 }, { 0xEAA9, 0x621B }, { 0xEAAA, 0x621F }, { 0xEAAB, 0x6222 }, { 0xEAAC, 0x6221 }, { 0xEAAD, 0x6225 }, { 0xEAAE, 0x6224 }, 
-	{ 0xEAAF, 0x622C }, { 0xEAB0, 0x81E7 }, { 0xEAB1, 0x74EF }, { 0xEAB2, 0x74F4 }, { 0xEAB3, 0x74FF }, { 0xEAB4, 0x750F }, { 0xEAB5, 0x7511 }, { 0xEAB6, 0x7513 }, 
-	{ 0xEAB7, 0x6534 }, { 0xEAB8, 0x65EE }, { 0xEAB9, 0x65EF }, { 0xEABA, 0x65F0 }, { 0xEABB, 0x660A }, { 0xEABC, 0x6619 }, { 0xEABD, 0x6772 }, { 0xEABE, 0x6603 }, 
-	{ 0xEABF, 0x6615 }, { 0xEAC0, 0x6600 }, { 0xEAC1, 0x7085 }, { 0xEAC2, 0x66F7 }, { 0xEAC3, 0x661D }, { 0xEAC4, 0x6634 }, { 0xEAC5, 0x6631 }, { 0xEAC6, 0x6636 }, 
-	{ 0xEAC7, 0x6635 }, { 0xEAC8, 0x8006 }, { 0xEAC9, 0x665F }, { 0xEACA, 0x6654 }, { 0xEACB, 0x6641 }, { 0xEACC, 0x664F }, { 0xEACD, 0x6656 }, { 0xEACE, 0x6661 }, 
-	{ 0xEACF, 0x6657 }, { 0xEAD0, 0x6677 }, { 0xEAD1, 0x6684 }, { 0xEAD2, 0x668C }, { 0xEAD3, 0x66A7 }, { 0xEAD4, 0x669D }, { 0xEAD5, 0x66BE }, { 0xEAD6, 0x66DB }, 
-	{ 0xEAD7, 0x66DC }, { 0xEAD8, 0x66E6 }, { 0xEAD9, 0x66E9 }, { 0xEADA, 0x8D32 }, { 0xEADB, 0x8D33 }, { 0xEADC, 0x8D36 }, { 0xEADD, 0x8D3B }, { 0xEADE, 0x8D3D }, 
-	{ 0xEADF, 0x8D40 }, { 0xEAE0, 0x8D45 }, { 0xEAE1, 0x8D46 }, { 0xEAE2, 0x8D48 }, { 0xEAE3, 0x8D49 }, { 0xEAE4, 0x8D47 }, { 0xEAE5, 0x8D4D }, { 0xEAE6, 0x8D55 }, 
-	{ 0xEAE7, 0x8D59 }, { 0xEAE8, 0x89C7 }, { 0xEAE9, 0x89CA }, { 0xEAEA, 0x89CB }, { 0xEAEB, 0x89CC }, { 0xEAEC, 0x89CE }, { 0xEAED, 0x89CF }, { 0xEAEE, 0x89D0 }, 
-	{ 0xEAEF, 0x89D1 }, { 0xEAF0, 0x726E }, { 0xEAF1, 0x729F }, { 0xEAF2, 0x725D }, { 0xEAF3, 0x7266 }, { 0xEAF4, 0x726F }, { 0xEAF5, 0x727E }, { 0xEAF6, 0x727F }, 
-	{ 0xEAF7, 0x7284 }, { 0xEAF8, 0x728B }, { 0xEAF9, 0x728D }, { 0xEAFA, 0x728F }, { 0xEAFB, 0x7292 }, { 0xEAFC, 0x6308 }, { 0xEAFD, 0x6332 }, { 0xEAFE, 0x63B0 }, 
-	{ 0xEBA1, 0x643F }, { 0xEBA2, 0x64D8 }, { 0xEBA3, 0x8004 }, { 0xEBA4, 0x6BEA }, { 0xEBA5, 0x6BF3 }, { 0xEBA6, 0x6BFD }, { 0xEBA7, 0x6BF5 }, { 0xEBA8, 0x6BF9 }, 
-	{ 0xEBA9, 0x6C05 }, { 0xEBAA, 0x6C07 }, { 0xEBAB, 0x6C06 }, { 0xEBAC, 0x6C0D }, { 0xEBAD, 0x6C15 }, { 0xEBAE, 0x6C18 }, { 0xEBAF, 0x6C19 }, { 0xEBB0, 0x6C1A }, 
-	{ 0xEBB1, 0x6C21 }, { 0xEBB2, 0x6C29 }, { 0xEBB3, 0x6C24 }, { 0xEBB4, 0x6C2A }, { 0xEBB5, 0x6C32 }, { 0xEBB6, 0x6535 }, { 0xEBB7, 0x6555 }, { 0xEBB8, 0x656B }, 
-	{ 0xEBB9, 0x724D }, { 0xEBBA, 0x7252 }, { 0xEBBB, 0x7256 }, { 0xEBBC, 0x7230 }, { 0xEBBD, 0x8662 }, { 0xEBBE, 0x5216 }, { 0xEBBF, 0x809F }, { 0xEBC0, 0x809C }, 
-	{ 0xEBC1, 0x8093 }, { 0xEBC2, 0x80BC }, { 0xEBC3, 0x670A }, { 0xEBC4, 0x80BD }, { 0xEBC5, 0x80B1 }, { 0xEBC6, 0x80AB }, { 0xEBC7, 0x80AD }, { 0xEBC8, 0x80B4 }, 
-	{ 0xEBC9, 0x80B7 }, { 0xEBCA, 0x80E7 }, { 0xEBCB, 0x80E8 }, { 0xEBCC, 0x80E9 }, { 0xEBCD, 0x80EA }, { 0xEBCE, 0x80DB }, { 0xEBCF, 0x80C2 }, { 0xEBD0, 0x80C4 }, 
-	{ 0xEBD1, 0x80D9 }, { 0xEBD2, 0x80CD }, { 0xEBD3, 0x80D7 }, { 0xEBD4, 0x6710 }, { 0xEBD5, 0x80DD }, { 0xEBD6, 0x80EB }, { 0xEBD7, 0x80F1 }, { 0xEBD8, 0x80F4 }, 
-	{ 0xEBD9, 0x80ED }, { 0xEBDA, 0x810D }, { 0xEBDB, 0x810E }, { 0xEBDC, 0x80F2 }, { 0xEBDD, 0x80FC }, { 0xEBDE, 0x6715 }, { 0xEBDF, 0x8112 }, { 0xEBE0, 0x8C5A }, 
-	{ 0xEBE1, 0x8136 }, { 0xEBE2, 0x811E }, { 0xEBE3, 0x812C }, { 0xEBE4, 0x8118 }, { 0xEBE5, 0x8132 }, { 0xEBE6, 0x8148 }, { 0xEBE7, 0x814C }, { 0xEBE8, 0x8153 }, 
-	{ 0xEBE9, 0x8174 }, { 0xEBEA, 0x8159 }, { 0xEBEB, 0x815A }, { 0xEBEC, 0x8171 }, { 0xEBED, 0x8160 }, { 0xEBEE, 0x8169 }, { 0xEBEF, 0x817C }, { 0xEBF0, 0x817D }, 
-	{ 0xEBF1, 0x816D }, { 0xEBF2, 0x8167 }, { 0xEBF3, 0x584D }, { 0xEBF4, 0x5AB5 }, { 0xEBF5, 0x8188 }, { 0xEBF6, 0x8182 }, { 0xEBF7, 0x8191 }, { 0xEBF8, 0x6ED5 }, 
-	{ 0xEBF9, 0x81A3 }, { 0xEBFA, 0x81AA }, { 0xEBFB, 0x81CC }, { 0xEBFC, 0x6726 }, { 0xEBFD, 0x81CA }, { 0xEBFE, 0x81BB }, { 0xECA1, 0x81C1 }, { 0xECA2, 0x81A6 }, 
-	{ 0xECA3, 0x6B24 }, { 0xECA4, 0x6B37 }, { 0xECA5, 0x6B39 }, { 0xECA6, 0x6B43 }, { 0xECA7, 0x6B46 }, { 0xECA8, 0x6B59 }, { 0xECA9, 0x98D1 }, { 0xECAA, 0x98D2 }, 
-	{ 0xECAB, 0x98D3 }, { 0xECAC, 0x98D5 }, { 0xECAD, 0x98D9 }, { 0xECAE, 0x98DA }, { 0xECAF, 0x6BB3 }, { 0xECB0, 0x5F40 }, { 0xECB1, 0x6BC2 }, { 0xECB2, 0x89F3 }, 
-	{ 0xECB3, 0x6590 }, { 0xECB4, 0x9F51 }, { 0xECB5, 0x6593 }, { 0xECB6, 0x65BC }, { 0xECB7, 0x65C6 }, { 0xECB8, 0x65C4 }, { 0xECB9, 0x65C3 }, { 0xECBA, 0x65CC }, 
-	{ 0xECBB, 0x65CE }, { 0xECBC, 0x65D2 }, { 0xECBD, 0x65D6 }, { 0xECBE, 0x7080 }, { 0xECBF, 0x709C }, { 0xECC0, 0x7096 }, { 0xECC1, 0x709D }, { 0xECC2, 0x70BB }, 
-	{ 0xECC3, 0x70C0 }, { 0xECC4, 0x70B7 }, { 0xECC5, 0x70AB }, { 0xECC6, 0x70B1 }, { 0xECC7, 0x70E8 }, { 0xECC8, 0x70CA }, { 0xECC9, 0x7110 }, { 0xECCA, 0x7113 }, 
-	{ 0xECCB, 0x7116 }, { 0xECCC, 0x712F }, { 0xECCD, 0x7131 }, { 0xECCE, 0x7173 }, { 0xECCF, 0x715C }, { 0xECD0, 0x7168 }, { 0xECD1, 0x7145 }, { 0xECD2, 0x7172 }, 
-	{ 0xECD3, 0x714A }, { 0xECD4, 0x7178 }, { 0xECD5, 0x717A }, { 0xECD6, 0x7198 }, { 0xECD7, 0x71B3 }, { 0xECD8, 0x71B5 }, { 0xECD9, 0x71A8 }, { 0xECDA, 0x71A0 }, 
-	{ 0xECDB, 0x71E0 }, { 0xECDC, 0x71D4 }, { 0xECDD, 0x71E7 }, { 0xECDE, 0x71F9 }, { 0xECDF, 0x721D }, { 0xECE0, 0x7228 }, { 0xECE1, 0x706C }, { 0xECE2, 0x7118 }, 
-	{ 0xECE3, 0x7166 }, { 0xECE4, 0x71B9 }, { 0xECE5, 0x623E }, { 0xECE6, 0x623D }, { 0xECE7, 0x6243 }, { 0xECE8, 0x6248 }, { 0xECE9, 0x6249 }, { 0xECEA, 0x793B }, 
-	{ 0xECEB, 0x7940 }, { 0xECEC, 0x7946 }, { 0xECED, 0x7949 }, { 0xECEE, 0x795B }, { 0xECEF, 0x795C }, { 0xECF0, 0x7953 }, { 0xECF1, 0x795A }, { 0xECF2, 0x7962 }, 
-	{ 0xECF3, 0x7957 }, { 0xECF4, 0x7960 }, { 0xECF5, 0x796F }, { 0xECF6, 0x7967 }, { 0xECF7, 0x797A }, { 0xECF8, 0x7985 }, { 0xECF9, 0x798A }, { 0xECFA, 0x799A }, 
-	{ 0xECFB, 0x79A7 }, { 0xECFC, 0x79B3 }, { 0xECFD, 0x5FD1 }, { 0xECFE, 0x5FD0 }, { 0xEDA1, 0x603C }, { 0xEDA2, 0x605D }, { 0xEDA3, 0x605A }, { 0xEDA4, 0x6067 }, 
-	{ 0xEDA5, 0x6041 }, { 0xEDA6, 0x6059 }, { 0xEDA7, 0x6063 }, { 0xEDA8, 0x60AB }, { 0xEDA9, 0x6106 }, { 0xEDAA, 0x610D }, { 0xEDAB, 0x615D }, { 0xEDAC, 0x61A9 }, 
-	{ 0xEDAD, 0x619D }, { 0xEDAE, 0x61CB }, { 0xEDAF, 0x61D1 }, { 0xEDB0, 0x6206 }, { 0xEDB1, 0x8080 }, { 0xEDB2, 0x807F }, { 0xEDB3, 0x6C93 }, { 0xEDB4, 0x6CF6 }, 
-	{ 0xEDB5, 0x6DFC }, { 0xEDB6, 0x77F6 }, { 0xEDB7, 0x77F8 }, { 0xEDB8, 0x7800 }, { 0xEDB9, 0x7809 }, { 0xEDBA, 0x7817 }, { 0xEDBB, 0x7818 }, { 0xEDBC, 0x7811 }, 
-	{ 0xEDBD, 0x65AB }, { 0xEDBE, 0x782D }, { 0xEDBF, 0x781C }, { 0xEDC0, 0x781D }, { 0xEDC1, 0x7839 }, { 0xEDC2, 0x783A }, { 0xEDC3, 0x783B }, { 0xEDC4, 0x781F }, 
-	{ 0xEDC5, 0x783C }, { 0xEDC6, 0x7825 }, { 0xEDC7, 0x782C }, { 0xEDC8, 0x7823 }, { 0xEDC9, 0x7829 }, { 0xEDCA, 0x784E }, { 0xEDCB, 0x786D }, { 0xEDCC, 0x7856 }, 
-	{ 0xEDCD, 0x7857 }, { 0xEDCE, 0x7826 }, { 0xEDCF, 0x7850 }, { 0xEDD0, 0x7847 }, { 0xEDD1, 0x784C }, { 0xEDD2, 0x786A }, { 0xEDD3, 0x789B }, { 0xEDD4, 0x7893 }, 
-	{ 0xEDD5, 0x789A }, { 0xEDD6, 0x7887 }, { 0xEDD7, 0x789C }, { 0xEDD8, 0x78A1 }, { 0xEDD9, 0x78A3 }, { 0xEDDA, 0x78B2 }, { 0xEDDB, 0x78B9 }, { 0xEDDC, 0x78A5 }, 
-	{ 0xEDDD, 0x78D4 }, { 0xEDDE, 0x78D9 }, { 0xEDDF, 0x78C9 }, { 0xEDE0, 0x78EC }, { 0xEDE1, 0x78F2 }, { 0xEDE2, 0x7905 }, { 0xEDE3, 0x78F4 }, { 0xEDE4, 0x7913 }, 
-	{ 0xEDE5, 0x7924 }, { 0xEDE6, 0x791E }, { 0xEDE7, 0x7934 }, { 0xEDE8, 0x9F9B }, { 0xEDE9, 0x9EF9 }, { 0xEDEA, 0x9EFB }, { 0xEDEB, 0x9EFC }, { 0xEDEC, 0x76F1 }, 
-	{ 0xEDED, 0x7704 }, { 0xEDEE, 0x770D }, { 0xEDEF, 0x76F9 }, { 0xEDF0, 0x7707 }, { 0xEDF1, 0x7708 }, { 0xEDF2, 0x771A }, { 0xEDF3, 0x7722 }, { 0xEDF4, 0x7719 }, 
-	{ 0xEDF5, 0x772D }, { 0xEDF6, 0x7726 }, { 0xEDF7, 0x7735 }, { 0xEDF8, 0x7738 }, { 0xEDF9, 0x7750 }, { 0xEDFA, 0x7751 }, { 0xEDFB, 0x7747 }, { 0xEDFC, 0x7743 }, 
-	{ 0xEDFD, 0x775A }, { 0xEDFE, 0x7768 }, { 0xEEA1, 0x7762 }, { 0xEEA2, 0x7765 }, { 0xEEA3, 0x777F }, { 0xEEA4, 0x778D }, { 0xEEA5, 0x777D }, { 0xEEA6, 0x7780 }, 
-	{ 0xEEA7, 0x778C }, { 0xEEA8, 0x7791 }, { 0xEEA9, 0x779F }, { 0xEEAA, 0x77A0 }, { 0xEEAB, 0x77B0 }, { 0xEEAC, 0x77B5 }, { 0xEEAD, 0x77BD }, { 0xEEAE, 0x753A }, 
-	{ 0xEEAF, 0x7540 }, { 0xEEB0, 0x754E }, { 0xEEB1, 0x754B }, { 0xEEB2, 0x7548 }, { 0xEEB3, 0x755B }, { 0xEEB4, 0x7572 }, { 0xEEB5, 0x7579 }, { 0xEEB6, 0x7583 }, 
-	{ 0xEEB7, 0x7F58 }, { 0xEEB8, 0x7F61 }, { 0xEEB9, 0x7F5F }, { 0xEEBA, 0x8A48 }, { 0xEEBB, 0x7F68 }, { 0xEEBC, 0x7F74 }, { 0xEEBD, 0x7F71 }, { 0xEEBE, 0x7F79 }, 
-	{ 0xEEBF, 0x7F81 }, { 0xEEC0, 0x7F7E }, { 0xEEC1, 0x76CD }, { 0xEEC2, 0x76E5 }, { 0xEEC3, 0x8832 }, { 0xEEC4, 0x9485 }, { 0xEEC5, 0x9486 }, { 0xEEC6, 0x9487 }, 
-	{ 0xEEC7, 0x948B }, { 0xEEC8, 0x948A }, { 0xEEC9, 0x948C }, { 0xEECA, 0x948D }, { 0xEECB, 0x948F }, { 0xEECC, 0x9490 }, { 0xEECD, 0x9494 }, { 0xEECE, 0x9497 }, 
-	{ 0xEECF, 0x9495 }, { 0xEED0, 0x949A }, { 0xEED1, 0x949B }, { 0xEED2, 0x949C }, { 0xEED3, 0x94A3 }, { 0xEED4, 0x94A4 }, { 0xEED5, 0x94AB }, { 0xEED6, 0x94AA }, 
-	{ 0xEED7, 0x94AD }, { 0xEED8, 0x94AC }, { 0xEED9, 0x94AF }, { 0xEEDA, 0x94B0 }, { 0xEEDB, 0x94B2 }, { 0xEEDC, 0x94B4 }, { 0xEEDD, 0x94B6 }, { 0xEEDE, 0x94B7 }, 
-	{ 0xEEDF, 0x94B8 }, { 0xEEE0, 0x94B9 }, { 0xEEE1, 0x94BA }, { 0xEEE2, 0x94BC }, { 0xEEE3, 0x94BD }, { 0xEEE4, 0x94BF }, { 0xEEE5, 0x94C4 }, { 0xEEE6, 0x94C8 }, 
-	{ 0xEEE7, 0x94C9 }, { 0xEEE8, 0x94CA }, { 0xEEE9, 0x94CB }, { 0xEEEA, 0x94CC }, { 0xEEEB, 0x94CD }, { 0xEEEC, 0x94CE }, { 0xEEED, 0x94D0 }, { 0xEEEE, 0x94D1 }, 
-	{ 0xEEEF, 0x94D2 }, { 0xEEF0, 0x94D5 }, { 0xEEF1, 0x94D6 }, { 0xEEF2, 0x94D7 }, { 0xEEF3, 0x94D9 }, { 0xEEF4, 0x94D8 }, { 0xEEF5, 0x94DB }, { 0xEEF6, 0x94DE }, 
-	{ 0xEEF7, 0x94DF }, { 0xEEF8, 0x94E0 }, { 0xEEF9, 0x94E2 }, { 0xEEFA, 0x94E4 }, { 0xEEFB, 0x94E5 }, { 0xEEFC, 0x94E7 }, { 0xEEFD, 0x94E8 }, { 0xEEFE, 0x94EA }, 
-	{ 0xEFA1, 0x94E9 }, { 0xEFA2, 0x94EB }, { 0xEFA3, 0x94EE }, { 0xEFA4, 0x94EF }, { 0xEFA5, 0x94F3 }, { 0xEFA6, 0x94F4 }, { 0xEFA7, 0x94F5 }, { 0xEFA8, 0x94F7 }, 
-	{ 0xEFA9, 0x94F9 }, { 0xEFAA, 0x94FC }, { 0xEFAB, 0x94FD }, { 0xEFAC, 0x94FF }, { 0xEFAD, 0x9503 }, { 0xEFAE, 0x9502 }, { 0xEFAF, 0x9506 }, { 0xEFB0, 0x9507 }, 
-	{ 0xEFB1, 0x9509 }, { 0xEFB2, 0x950A }, { 0xEFB3, 0x950D }, { 0xEFB4, 0x950E }, { 0xEFB5, 0x950F }, { 0xEFB6, 0x9512 }, { 0xEFB7, 0x9513 }, { 0xEFB8, 0x9514 }, 
-	{ 0xEFB9, 0x9515 }, { 0xEFBA, 0x9516 }, { 0xEFBB, 0x9518 }, { 0xEFBC, 0x951B }, { 0xEFBD, 0x951D }, { 0xEFBE, 0x951E }, { 0xEFBF, 0x951F }, { 0xEFC0, 0x9522 }, 
-	{ 0xEFC1, 0x952A }, { 0xEFC2, 0x952B }, { 0xEFC3, 0x9529 }, { 0xEFC4, 0x952C }, { 0xEFC5, 0x9531 }, { 0xEFC6, 0x9532 }, { 0xEFC7, 0x9534 }, { 0xEFC8, 0x9536 }, 
-	{ 0xEFC9, 0x9537 }, { 0xEFCA, 0x9538 }, { 0xEFCB, 0x953C }, { 0xEFCC, 0x953E }, { 0xEFCD, 0x953F }, { 0xEFCE, 0x9542 }, { 0xEFCF, 0x9535 }, { 0xEFD0, 0x9544 }, 
-	{ 0xEFD1, 0x9545 }, { 0xEFD2, 0x9546 }, { 0xEFD3, 0x9549 }, { 0xEFD4, 0x954C }, { 0xEFD5, 0x954E }, { 0xEFD6, 0x954F }, { 0xEFD7, 0x9552 }, { 0xEFD8, 0x9553 }, 
-	{ 0xEFD9, 0x9554 }, { 0xEFDA, 0x9556 }, { 0xEFDB, 0x9557 }, { 0xEFDC, 0x9558 }, { 0xEFDD, 0x9559 }, { 0xEFDE, 0x955B }, { 0xEFDF, 0x955E }, { 0xEFE0, 0x955F }, 
-	{ 0xEFE1, 0x955D }, { 0xEFE2, 0x9561 }, { 0xEFE3, 0x9562 }, { 0xEFE4, 0x9564 }, { 0xEFE5, 0x9565 }, { 0xEFE6, 0x9566 }, { 0xEFE7, 0x9567 }, { 0xEFE8, 0x9568 }, 
-	{ 0xEFE9, 0x9569 }, { 0xEFEA, 0x956A }, { 0xEFEB, 0x956B }, { 0xEFEC, 0x956C }, { 0xEFED, 0x956F }, { 0xEFEE, 0x9571 }, { 0xEFEF, 0x9572 }, { 0xEFF0, 0x9573 }, 
-	{ 0xEFF1, 0x953A }, { 0xEFF2, 0x77E7 }, { 0xEFF3, 0x77EC }, { 0xEFF4, 0x96C9 }, { 0xEFF5, 0x79D5 }, { 0xEFF6, 0x79ED }, { 0xEFF7, 0x79E3 }, { 0xEFF8, 0x79EB }, 
-	{ 0xEFF9, 0x7A06 }, { 0xEFFA, 0x5D47 }, { 0xEFFB, 0x7A03 }, { 0xEFFC, 0x7A02 }, { 0xEFFD, 0x7A1E }, { 0xEFFE, 0x7A14 }, { 0xF0A1, 0x7A39 }, { 0xF0A2, 0x7A37 }, 
-	{ 0xF0A3, 0x7A51 }, { 0xF0A4, 0x9ECF }, { 0xF0A5, 0x99A5 }, { 0xF0A6, 0x7A70 }, { 0xF0A7, 0x7688 }, { 0xF0A8, 0x768E }, { 0xF0A9, 0x7693 }, { 0xF0AA, 0x7699 }, 
-	{ 0xF0AB, 0x76A4 }, { 0xF0AC, 0x74DE }, { 0xF0AD, 0x74E0 }, { 0xF0AE, 0x752C }, { 0xF0AF, 0x9E20 }, { 0xF0B0, 0x9E22 }, { 0xF0B1, 0x9E28 }, { 0xF0B2, 0x9E29 }, 
-	{ 0xF0B3, 0x9E2A }, { 0xF0B4, 0x9E2B }, { 0xF0B5, 0x9E2C }, { 0xF0B6, 0x9E32 }, { 0xF0B7, 0x9E31 }, { 0xF0B8, 0x9E36 }, { 0xF0B9, 0x9E38 }, { 0xF0BA, 0x9E37 }, 
-	{ 0xF0BB, 0x9E39 }, { 0xF0BC, 0x9E3A }, { 0xF0BD, 0x9E3E }, { 0xF0BE, 0x9E41 }, { 0xF0BF, 0x9E42 }, { 0xF0C0, 0x9E44 }, { 0xF0C1, 0x9E46 }, { 0xF0C2, 0x9E47 }, 
-	{ 0xF0C3, 0x9E48 }, { 0xF0C4, 0x9E49 }, { 0xF0C5, 0x9E4B }, { 0xF0C6, 0x9E4C }, { 0xF0C7, 0x9E4E }, { 0xF0C8, 0x9E51 }, { 0xF0C9, 0x9E55 }, { 0xF0CA, 0x9E57 }, 
-	{ 0xF0CB, 0x9E5A }, { 0xF0CC, 0x9E5B }, { 0xF0CD, 0x9E5C }, { 0xF0CE, 0x9E5E }, { 0xF0CF, 0x9E63 }, { 0xF0D0, 0x9E66 }, { 0xF0D1, 0x9E67 }, { 0xF0D2, 0x9E68 }, 
-	{ 0xF0D3, 0x9E69 }, { 0xF0D4, 0x9E6A }, { 0xF0D5, 0x9E6B }, { 0xF0D6, 0x9E6C }, { 0xF0D7, 0x9E71 }, { 0xF0D8, 0x9E6D }, { 0xF0D9, 0x9E73 }, { 0xF0DA, 0x7592 }, 
-	{ 0xF0DB, 0x7594 }, { 0xF0DC, 0x7596 }, { 0xF0DD, 0x75A0 }, { 0xF0DE, 0x759D }, { 0xF0DF, 0x75AC }, { 0xF0E0, 0x75A3 }, { 0xF0E1, 0x75B3 }, { 0xF0E2, 0x75B4 }, 
-	{ 0xF0E3, 0x75B8 }, { 0xF0E4, 0x75C4 }, { 0xF0E5, 0x75B1 }, { 0xF0E6, 0x75B0 }, { 0xF0E7, 0x75C3 }, { 0xF0E8, 0x75C2 }, { 0xF0E9, 0x75D6 }, { 0xF0EA, 0x75CD }, 
-	{ 0xF0EB, 0x75E3 }, { 0xF0EC, 0x75E8 }, { 0xF0ED, 0x75E6 }, { 0xF0EE, 0x75E4 }, { 0xF0EF, 0x75EB }, { 0xF0F0, 0x75E7 }, { 0xF0F1, 0x7603 }, { 0xF0F2, 0x75F1 }, 
-	{ 0xF0F3, 0x75FC }, { 0xF0F4, 0x75FF }, { 0xF0F5, 0x7610 }, { 0xF0F6, 0x7600 }, { 0xF0F7, 0x7605 }, { 0xF0F8, 0x760C }, { 0xF0F9, 0x7617 }, { 0xF0FA, 0x760A }, 
-	{ 0xF0FB, 0x7625 }, { 0xF0FC, 0x7618 }, { 0xF0FD, 0x7615 }, { 0xF0FE, 0x7619 }, { 0xF1A1, 0x761B }, { 0xF1A2, 0x763C }, { 0xF1A3, 0x7622 }, { 0xF1A4, 0x7620 }, 
-	{ 0xF1A5, 0x7640 }, { 0xF1A6, 0x762D }, { 0xF1A7, 0x7630 }, { 0xF1A8, 0x763F }, { 0xF1A9, 0x7635 }, { 0xF1AA, 0x7643 }, { 0xF1AB, 0x763E }, { 0xF1AC, 0x7633 }, 
-	{ 0xF1AD, 0x764D }, { 0xF1AE, 0x765E }, { 0xF1AF, 0x7654 }, { 0xF1B0, 0x765C }, { 0xF1B1, 0x7656 }, { 0xF1B2, 0x766B }, { 0xF1B3, 0x766F }, { 0xF1B4, 0x7FCA }, 
-	{ 0xF1B5, 0x7AE6 }, { 0xF1B6, 0x7A78 }, { 0xF1B7, 0x7A79 }, { 0xF1B8, 0x7A80 }, { 0xF1B9, 0x7A86 }, { 0xF1BA, 0x7A88 }, { 0xF1BB, 0x7A95 }, { 0xF1BC, 0x7AA6 }, 
-	{ 0xF1BD, 0x7AA0 }, { 0xF1BE, 0x7AAC }, { 0xF1BF, 0x7AA8 }, { 0xF1C0, 0x7AAD }, { 0xF1C1, 0x7AB3 }, { 0xF1C2, 0x8864 }, { 0xF1C3, 0x8869 }, { 0xF1C4, 0x8872 }, 
-	{ 0xF1C5, 0x887D }, { 0xF1C6, 0x887F }, { 0xF1C7, 0x8882 }, { 0xF1C8, 0x88A2 }, { 0xF1C9, 0x88C6 }, { 0xF1CA, 0x88B7 }, { 0xF1CB, 0x88BC }, { 0xF1CC, 0x88C9 }, 
-	{ 0xF1CD, 0x88E2 }, { 0xF1CE, 0x88CE }, { 0xF1CF, 0x88E3 }, { 0xF1D0, 0x88E5 }, { 0xF1D1, 0x88F1 }, { 0xF1D2, 0x891A }, { 0xF1D3, 0x88FC }, { 0xF1D4, 0x88E8 }, 
-	{ 0xF1D5, 0x88FE }, { 0xF1D6, 0x88F0 }, { 0xF1D7, 0x8921 }, { 0xF1D8, 0x8919 }, { 0xF1D9, 0x8913 }, { 0xF1DA, 0x891B }, { 0xF1DB, 0x890A }, { 0xF1DC, 0x8934 }, 
-	{ 0xF1DD, 0x892B }, { 0xF1DE, 0x8936 }, { 0xF1DF, 0x8941 }, { 0xF1E0, 0x8966 }, { 0xF1E1, 0x897B }, { 0xF1E2, 0x758B }, { 0xF1E3, 0x80E5 }, { 0xF1E4, 0x76B2 }, 
-	{ 0xF1E5, 0x76B4 }, { 0xF1E6, 0x77DC }, { 0xF1E7, 0x8012 }, { 0xF1E8, 0x8014 }, { 0xF1E9, 0x8016 }, { 0xF1EA, 0x801C }, { 0xF1EB, 0x8020 }, { 0xF1EC, 0x8022 }, 
-	{ 0xF1ED, 0x8025 }, { 0xF1EE, 0x8026 }, { 0xF1EF, 0x8027 }, { 0xF1F0, 0x8029 }, { 0xF1F1, 0x8028 }, { 0xF1F2, 0x8031 }, { 0xF1F3, 0x800B }, { 0xF1F4, 0x8035 }, 
-	{ 0xF1F5, 0x8043 }, { 0xF1F6, 0x8046 }, { 0xF1F7, 0x804D }, { 0xF1F8, 0x8052 }, { 0xF1F9, 0x8069 }, { 0xF1FA, 0x8071 }, { 0xF1FB, 0x8983 }, { 0xF1FC, 0x9878 }, 
-	{ 0xF1FD, 0x9880 }, { 0xF1FE, 0x9883 }, { 0xF2A1, 0x9889 }, { 0xF2A2, 0x988C }, { 0xF2A3, 0x988D }, { 0xF2A4, 0x988F }, { 0xF2A5, 0x9894 }, { 0xF2A6, 0x989A }, 
-	{ 0xF2A7, 0x989B }, { 0xF2A8, 0x989E }, { 0xF2A9, 0x989F }, { 0xF2AA, 0x98A1 }, { 0xF2AB, 0x98A2 }, { 0xF2AC, 0x98A5 }, { 0xF2AD, 0x98A6 }, { 0xF2AE, 0x864D }, 
-	{ 0xF2AF, 0x8654 }, { 0xF2B0, 0x866C }, { 0xF2B1, 0x866E }, { 0xF2B2, 0x867F }, { 0xF2B3, 0x867A }, { 0xF2B4, 0x867C }, { 0xF2B5, 0x867B }, { 0xF2B6, 0x86A8 }, 
-	{ 0xF2B7, 0x868D }, { 0xF2B8, 0x868B }, { 0xF2B9, 0x86AC }, { 0xF2BA, 0x869D }, { 0xF2BB, 0x86A7 }, { 0xF2BC, 0x86A3 }, { 0xF2BD, 0x86AA }, { 0xF2BE, 0x8693 }, 
-	{ 0xF2BF, 0x86A9 }, { 0xF2C0, 0x86B6 }, { 0xF2C1, 0x86C4 }, { 0xF2C2, 0x86B5 }, { 0xF2C3, 0x86CE }, { 0xF2C4, 0x86B0 }, { 0xF2C5, 0x86BA }, { 0xF2C6, 0x86B1 }, 
-	{ 0xF2C7, 0x86AF }, { 0xF2C8, 0x86C9 }, { 0xF2C9, 0x86CF }, { 0xF2CA, 0x86B4 }, { 0xF2CB, 0x86E9 }, { 0xF2CC, 0x86F1 }, { 0xF2CD, 0x86F2 }, { 0xF2CE, 0x86ED }, 
-	{ 0xF2CF, 0x86F3 }, { 0xF2D0, 0x86D0 }, { 0xF2D1, 0x8713 }, { 0xF2D2, 0x86DE }, { 0xF2D3, 0x86F4 }, { 0xF2D4, 0x86DF }, { 0xF2D5, 0x86D8 }, { 0xF2D6, 0x86D1 }, 
-	{ 0xF2D7, 0x8703 }, { 0xF2D8, 0x8707 }, { 0xF2D9, 0x86F8 }, { 0xF2DA, 0x8708 }, { 0xF2DB, 0x870A }, { 0xF2DC, 0x870D }, { 0xF2DD, 0x8709 }, { 0xF2DE, 0x8723 }, 
-	{ 0xF2DF, 0x873B }, { 0xF2E0, 0x871E }, { 0xF2E1, 0x8725 }, { 0xF2E2, 0x872E }, { 0xF2E3, 0x871A }, { 0xF2E4, 0x873E }, { 0xF2E5, 0x8748 }, { 0xF2E6, 0x8734 }, 
-	{ 0xF2E7, 0x8731 }, { 0xF2E8, 0x8729 }, { 0xF2E9, 0x8737 }, { 0xF2EA, 0x873F }, { 0xF2EB, 0x8782 }, { 0xF2EC, 0x8722 }, { 0xF2ED, 0x877D }, { 0xF2EE, 0x877E }, 
-	{ 0xF2EF, 0x877B }, { 0xF2F0, 0x8760 }, { 0xF2F1, 0x8770 }, { 0xF2F2, 0x874C }, { 0xF2F3, 0x876E }, { 0xF2F4, 0x878B }, { 0xF2F5, 0x8753 }, { 0xF2F6, 0x8763 }, 
-	{ 0xF2F7, 0x877C }, { 0xF2F8, 0x8764 }, { 0xF2F9, 0x8759 }, { 0xF2FA, 0x8765 }, { 0xF2FB, 0x8793 }, { 0xF2FC, 0x87AF }, { 0xF2FD, 0x87A8 }, { 0xF2FE, 0x87D2 }, 
-	{ 0xF3A1, 0x87C6 }, { 0xF3A2, 0x8788 }, { 0xF3A3, 0x8785 }, { 0xF3A4, 0x87AD }, { 0xF3A5, 0x8797 }, { 0xF3A6, 0x8783 }, { 0xF3A7, 0x87AB }, { 0xF3A8, 0x87E5 }, 
-	{ 0xF3A9, 0x87AC }, { 0xF3AA, 0x87B5 }, { 0xF3AB, 0x87B3 }, { 0xF3AC, 0x87CB }, { 0xF3AD, 0x87D3 }, { 0xF3AE, 0x87BD }, { 0xF3AF, 0x87D1 }, { 0xF3B0, 0x87C0 }, 
-	{ 0xF3B1, 0x87CA }, { 0xF3B2, 0x87DB }, { 0xF3B3, 0x87EA }, { 0xF3B4, 0x87E0 }, { 0xF3B5, 0x87EE }, { 0xF3B6, 0x8816 }, { 0xF3B7, 0x8813 }, { 0xF3B8, 0x87FE }, 
-	{ 0xF3B9, 0x880A }, { 0xF3BA, 0x881B }, { 0xF3BB, 0x8821 }, { 0xF3BC, 0x8839 }, { 0xF3BD, 0x883C }, { 0xF3BE, 0x7F36 }, { 0xF3BF, 0x7F42 }, { 0xF3C0, 0x7F44 }, 
-	{ 0xF3C1, 0x7F45 }, { 0xF3C2, 0x8210 }, { 0xF3C3, 0x7AFA }, { 0xF3C4, 0x7AFD }, { 0xF3C5, 0x7B08 }, { 0xF3C6, 0x7B03 }, { 0xF3C7, 0x7B04 }, { 0xF3C8, 0x7B15 }, 
-	{ 0xF3C9, 0x7B0A }, { 0xF3CA, 0x7B2B }, { 0xF3CB, 0x7B0F }, { 0xF3CC, 0x7B47 }, { 0xF3CD, 0x7B38 }, { 0xF3CE, 0x7B2A }, { 0xF3CF, 0x7B19 }, { 0xF3D0, 0x7B2E }, 
-	{ 0xF3D1, 0x7B31 }, { 0xF3D2, 0x7B20 }, { 0xF3D3, 0x7B25 }, { 0xF3D4, 0x7B24 }, { 0xF3D5, 0x7B33 }, { 0xF3D6, 0x7B3E }, { 0xF3D7, 0x7B1E }, { 0xF3D8, 0x7B58 }, 
-	{ 0xF3D9, 0x7B5A }, { 0xF3DA, 0x7B45 }, { 0xF3DB, 0x7B75 }, { 0xF3DC, 0x7B4C }, { 0xF3DD, 0x7B5D }, { 0xF3DE, 0x7B60 }, { 0xF3DF, 0x7B6E }, { 0xF3E0, 0x7B7B }, 
-	{ 0xF3E1, 0x7B62 }, { 0xF3E2, 0x7B72 }, { 0xF3E3, 0x7B71 }, { 0xF3E4, 0x7B90 }, { 0xF3E5, 0x7BA6 }, { 0xF3E6, 0x7BA7 }, { 0xF3E7, 0x7BB8 }, { 0xF3E8, 0x7BAC }, 
-	{ 0xF3E9, 0x7B9D }, { 0xF3EA, 0x7BA8 }, { 0xF3EB, 0x7B85 }, { 0xF3EC, 0x7BAA }, { 0xF3ED, 0x7B9C }, { 0xF3EE, 0x7BA2 }, { 0xF3EF, 0x7BAB }, { 0xF3F0, 0x7BB4 }, 
-	{ 0xF3F1, 0x7BD1 }, { 0xF3F2, 0x7BC1 }, { 0xF3F3, 0x7BCC }, { 0xF3F4, 0x7BDD }, { 0xF3F5, 0x7BDA }, { 0xF3F6, 0x7BE5 }, { 0xF3F7, 0x7BE6 }, { 0xF3F8, 0x7BEA }, 
-	{ 0xF3F9, 0x7C0C }, { 0xF3FA, 0x7BFE }, { 0xF3FB, 0x7BFC }, { 0xF3FC, 0x7C0F }, { 0xF3FD, 0x7C16 }, { 0xF3FE, 0x7C0B }, { 0xF4A1, 0x7C1F }, { 0xF4A2, 0x7C2A }, 
-	{ 0xF4A3, 0x7C26 }, { 0xF4A4, 0x7C38 }, { 0xF4A5, 0x7C41 }, { 0xF4A6, 0x7C40 }, { 0xF4A7, 0x81FE }, { 0xF4A8, 0x8201 }, { 0xF4A9, 0x8202 }, { 0xF4AA, 0x8204 }, 
-	{ 0xF4AB, 0x81EC }, { 0xF4AC, 0x8844 }, { 0xF4AD, 0x8221 }, { 0xF4AE, 0x8222 }, { 0xF4AF, 0x8223 }, { 0xF4B0, 0x822D }, { 0xF4B1, 0x822F }, { 0xF4B2, 0x8228 }, 
-	{ 0xF4B3, 0x822B }, { 0xF4B4, 0x8238 }, { 0xF4B5, 0x823B }, { 0xF4B6, 0x8233 }, { 0xF4B7, 0x8234 }, { 0xF4B8, 0x823E }, { 0xF4B9, 0x8244 }, { 0xF4BA, 0x8249 }, 
-	{ 0xF4BB, 0x824B }, { 0xF4BC, 0x824F }, { 0xF4BD, 0x825A }, { 0xF4BE, 0x825F }, { 0xF4BF, 0x8268 }, { 0xF4C0, 0x887E }, { 0xF4C1, 0x8885 }, { 0xF4C2, 0x8888 }, 
-	{ 0xF4C3, 0x88D8 }, { 0xF4C4, 0x88DF }, { 0xF4C5, 0x895E }, { 0xF4C6, 0x7F9D }, { 0xF4C7, 0x7F9F }, { 0xF4C8, 0x7FA7 }, { 0xF4C9, 0x7FAF }, { 0xF4CA, 0x7FB0 }, 
-	{ 0xF4CB, 0x7FB2 }, { 0xF4CC, 0x7C7C }, { 0xF4CD, 0x6549 }, { 0xF4CE, 0x7C91 }, { 0xF4CF, 0x7C9D }, { 0xF4D0, 0x7C9C }, { 0xF4D1, 0x7C9E }, { 0xF4D2, 0x7CA2 }, 
-	{ 0xF4D3, 0x7CB2 }, { 0xF4D4, 0x7CBC }, { 0xF4D5, 0x7CBD }, { 0xF4D6, 0x7CC1 }, { 0xF4D7, 0x7CC7 }, { 0xF4D8, 0x7CCC }, { 0xF4D9, 0x7CCD }, { 0xF4DA, 0x7CC8 }, 
-	{ 0xF4DB, 0x7CC5 }, { 0xF4DC, 0x7CD7 }, { 0xF4DD, 0x7CE8 }, { 0xF4DE, 0x826E }, { 0xF4DF, 0x66A8 }, { 0xF4E0, 0x7FBF }, { 0xF4E1, 0x7FCE }, { 0xF4E2, 0x7FD5 }, 
-	{ 0xF4E3, 0x7FE5 }, { 0xF4E4, 0x7FE1 }, { 0xF4E5, 0x7FE6 }, { 0xF4E6, 0x7FE9 }, { 0xF4E7, 0x7FEE }, { 0xF4E8, 0x7FF3 }, { 0xF4E9, 0x7CF8 }, { 0xF4EA, 0x7D77 }, 
-	{ 0xF4EB, 0x7DA6 }, { 0xF4EC, 0x7DAE }, { 0xF4ED, 0x7E47 }, { 0xF4EE, 0x7E9B }, { 0xF4EF, 0x9EB8 }, { 0xF4F0, 0x9EB4 }, { 0xF4F1, 0x8D73 }, { 0xF4F2, 0x8D84 }, 
-	{ 0xF4F3, 0x8D94 }, { 0xF4F4, 0x8D91 }, { 0xF4F5, 0x8DB1 }, { 0xF4F6, 0x8D67 }, { 0xF4F7, 0x8D6D }, { 0xF4F8, 0x8C47 }, { 0xF4F9, 0x8C49 }, { 0xF4FA, 0x914A }, 
-	{ 0xF4FB, 0x9150 }, { 0xF4FC, 0x914E }, { 0xF4FD, 0x914F }, { 0xF4FE, 0x9164 }, { 0xF5A1, 0x9162 }, { 0xF5A2, 0x9161 }, { 0xF5A3, 0x9170 }, { 0xF5A4, 0x9169 }, 
-	{ 0xF5A5, 0x916F }, { 0xF5A6, 0x917D }, { 0xF5A7, 0x917E }, { 0xF5A8, 0x9172 }, { 0xF5A9, 0x9174 }, { 0xF5AA, 0x9179 }, { 0xF5AB, 0x918C }, { 0xF5AC, 0x9185 }, 
-	{ 0xF5AD, 0x9190 }, { 0xF5AE, 0x918D }, { 0xF5AF, 0x9191 }, { 0xF5B0, 0x91A2 }, { 0xF5B1, 0x91A3 }, { 0xF5B2, 0x91AA }, { 0xF5B3, 0x91AD }, { 0xF5B4, 0x91AE }, 
-	{ 0xF5B5, 0x91AF }, { 0xF5B6, 0x91B5 }, { 0xF5B7, 0x91B4 }, { 0xF5B8, 0x91BA }, { 0xF5B9, 0x8C55 }, { 0xF5BA, 0x9E7E }, { 0xF5BB, 0x8DB8 }, { 0xF5BC, 0x8DEB }, 
-	{ 0xF5BD, 0x8E05 }, { 0xF5BE, 0x8E59 }, { 0xF5BF, 0x8E69 }, { 0xF5C0, 0x8DB5 }, { 0xF5C1, 0x8DBF }, { 0xF5C2, 0x8DBC }, { 0xF5C3, 0x8DBA }, { 0xF5C4, 0x8DC4 }, 
-	{ 0xF5C5, 0x8DD6 }, { 0xF5C6, 0x8DD7 }, { 0xF5C7, 0x8DDA }, { 0xF5C8, 0x8DDE }, { 0xF5C9, 0x8DCE }, { 0xF5CA, 0x8DCF }, { 0xF5CB, 0x8DDB }, { 0xF5CC, 0x8DC6 }, 
-	{ 0xF5CD, 0x8DEC }, { 0xF5CE, 0x8DF7 }, { 0xF5CF, 0x8DF8 }, { 0xF5D0, 0x8DE3 }, { 0xF5D1, 0x8DF9 }, { 0xF5D2, 0x8DFB }, { 0xF5D3, 0x8DE4 }, { 0xF5D4, 0x8E09 }, 
-	{ 0xF5D5, 0x8DFD }, { 0xF5D6, 0x8E14 }, { 0xF5D7, 0x8E1D }, { 0xF5D8, 0x8E1F }, { 0xF5D9, 0x8E2C }, { 0xF5DA, 0x8E2E }, { 0xF5DB, 0x8E23 }, { 0xF5DC, 0x8E2F }, 
-	{ 0xF5DD, 0x8E3A }, { 0xF5DE, 0x8E40 }, { 0xF5DF, 0x8E39 }, { 0xF5E0, 0x8E35 }, { 0xF5E1, 0x8E3D }, { 0xF5E2, 0x8E31 }, { 0xF5E3, 0x8E49 }, { 0xF5E4, 0x8E41 }, 
-	{ 0xF5E5, 0x8E42 }, { 0xF5E6, 0x8E51 }, { 0xF5E7, 0x8E52 }, { 0xF5E8, 0x8E4A }, { 0xF5E9, 0x8E70 }, { 0xF5EA, 0x8E76 }, { 0xF5EB, 0x8E7C }, { 0xF5EC, 0x8E6F }, 
-	{ 0xF5ED, 0x8E74 }, { 0xF5EE, 0x8E85 }, { 0xF5EF, 0x8E8F }, { 0xF5F0, 0x8E94 }, { 0xF5F1, 0x8E90 }, { 0xF5F2, 0x8E9C }, { 0xF5F3, 0x8E9E }, { 0xF5F4, 0x8C78 }, 
-	{ 0xF5F5, 0x8C82 }, { 0xF5F6, 0x8C8A }, { 0xF5F7, 0x8C85 }, { 0xF5F8, 0x8C98 }, { 0xF5F9, 0x8C94 }, { 0xF5FA, 0x659B }, { 0xF5FB, 0x89D6 }, { 0xF5FC, 0x89DE }, 
-	{ 0xF5FD, 0x89DA }, { 0xF5FE, 0x89DC }, { 0xF6A1, 0x89E5 }, { 0xF6A2, 0x89EB }, { 0xF6A3, 0x89EF }, { 0xF6A4, 0x8A3E }, { 0xF6A5, 0x8B26 }, { 0xF6A6, 0x9753 }, 
-	{ 0xF6A7, 0x96E9 }, { 0xF6A8, 0x96F3 }, { 0xF6A9, 0x96EF }, { 0xF6AA, 0x9706 }, { 0xF6AB, 0x9701 }, { 0xF6AC, 0x9708 }, { 0xF6AD, 0x970F }, { 0xF6AE, 0x970E }, 
-	{ 0xF6AF, 0x972A }, { 0xF6B0, 0x972D }, { 0xF6B1, 0x9730 }, { 0xF6B2, 0x973E }, { 0xF6B3, 0x9F80 }, { 0xF6B4, 0x9F83 }, { 0xF6B5, 0x9F85 }, { 0xF6B6, 0x9F86 }, 
-	{ 0xF6B7, 0x9F87 }, { 0xF6B8, 0x9F88 }, { 0xF6B9, 0x9F89 }, { 0xF6BA, 0x9F8A }, { 0xF6BB, 0x9F8C }, { 0xF6BC, 0x9EFE }, { 0xF6BD, 0x9F0B }, { 0xF6BE, 0x9F0D }, 
-	{ 0xF6BF, 0x96B9 }, { 0xF6C0, 0x96BC }, { 0xF6C1, 0x96BD }, { 0xF6C2, 0x96CE }, { 0xF6C3, 0x96D2 }, { 0xF6C4, 0x77BF }, { 0xF6C5, 0x96E0 }, { 0xF6C6, 0x928E }, 
-	{ 0xF6C7, 0x92AE }, { 0xF6C8, 0x92C8 }, { 0xF6C9, 0x933E }, { 0xF6CA, 0x936A }, { 0xF6CB, 0x93CA }, { 0xF6CC, 0x938F }, { 0xF6CD, 0x943E }, { 0xF6CE, 0x946B }, 
-	{ 0xF6CF, 0x9C7F }, { 0xF6D0, 0x9C82 }, { 0xF6D1, 0x9C85 }, { 0xF6D2, 0x9C86 }, { 0xF6D3, 0x9C87 }, { 0xF6D4, 0x9C88 }, { 0xF6D5, 0x7A23 }, { 0xF6D6, 0x9C8B }, 
-	{ 0xF6D7, 0x9C8E }, { 0xF6D8, 0x9C90 }, { 0xF6D9, 0x9C91 }, { 0xF6DA, 0x9C92 }, { 0xF6DB, 0x9C94 }, { 0xF6DC, 0x9C95 }, { 0xF6DD, 0x9C9A }, { 0xF6DE, 0x9C9B }, 
-	{ 0xF6DF, 0x9C9E }, { 0xF6E0, 0x9C9F }, { 0xF6E1, 0x9CA0 }, { 0xF6E2, 0x9CA1 }, { 0xF6E3, 0x9CA2 }, { 0xF6E4, 0x9CA3 }, { 0xF6E5, 0x9CA5 }, { 0xF6E6, 0x9CA6 }, 
-	{ 0xF6E7, 0x9CA7 }, { 0xF6E8, 0x9CA8 }, { 0xF6E9, 0x9CA9 }, { 0xF6EA, 0x9CAB }, { 0xF6EB, 0x9CAD }, { 0xF6EC, 0x9CAE }, { 0xF6ED, 0x9CB0 }, { 0xF6EE, 0x9CB1 }, 
-	{ 0xF6EF, 0x9CB2 }, { 0xF6F0, 0x9CB3 }, { 0xF6F1, 0x9CB4 }, { 0xF6F2, 0x9CB5 }, { 0xF6F3, 0x9CB6 }, { 0xF6F4, 0x9CB7 }, { 0xF6F5, 0x9CBA }, { 0xF6F6, 0x9CBB }, 
-	{ 0xF6F7, 0x9CBC }, { 0xF6F8, 0x9CBD }, { 0xF6F9, 0x9CC4 }, { 0xF6FA, 0x9CC5 }, { 0xF6FB, 0x9CC6 }, { 0xF6FC, 0x9CC7 }, { 0xF6FD, 0x9CCA }, { 0xF6FE, 0x9CCB }, 
-	{ 0xF7A1, 0x9CCC }, { 0xF7A2, 0x9CCD }, { 0xF7A3, 0x9CCE }, { 0xF7A4, 0x9CCF }, { 0xF7A5, 0x9CD0 }, { 0xF7A6, 0x9CD3 }, { 0xF7A7, 0x9CD4 }, { 0xF7A8, 0x9CD5 }, 
-	{ 0xF7A9, 0x9CD7 }, { 0xF7AA, 0x9CD8 }, { 0xF7AB, 0x9CD9 }, { 0xF7AC, 0x9CDC }, { 0xF7AD, 0x9CDD }, { 0xF7AE, 0x9CDF }, { 0xF7AF, 0x9CE2 }, { 0xF7B0, 0x977C }, 
-	{ 0xF7B1, 0x9785 }, { 0xF7B2, 0x9791 }, { 0xF7B3, 0x9792 }, { 0xF7B4, 0x9794 }, { 0xF7B5, 0x97AF }, { 0xF7B6, 0x97AB }, { 0xF7B7, 0x97A3 }, { 0xF7B8, 0x97B2 }, 
-	{ 0xF7B9, 0x97B4 }, { 0xF7BA, 0x9AB1 }, { 0xF7BB, 0x9AB0 }, { 0xF7BC, 0x9AB7 }, { 0xF7BD, 0x9E58 }, { 0xF7BE, 0x9AB6 }, { 0xF7BF, 0x9ABA }, { 0xF7C0, 0x9ABC }, 
-	{ 0xF7C1, 0x9AC1 }, { 0xF7C2, 0x9AC0 }, { 0xF7C3, 0x9AC5 }, { 0xF7C4, 0x9AC2 }, { 0xF7C5, 0x9ACB }, { 0xF7C6, 0x9ACC }, { 0xF7C7, 0x9AD1 }, { 0xF7C8, 0x9B45 }, 
-	{ 0xF7C9, 0x9B43 }, { 0xF7CA, 0x9B47 }, { 0xF7CB, 0x9B49 }, { 0xF7CC, 0x9B48 }, { 0xF7CD, 0x9B4D }, { 0xF7CE, 0x9B51 }, { 0xF7CF, 0x98E8 }, { 0xF7D0, 0x990D }, 
-	{ 0xF7D1, 0x992E }, { 0xF7D2, 0x9955 }, { 0xF7D3, 0x9954 }, { 0xF7D4, 0x9ADF }, { 0xF7D5, 0x9AE1 }, { 0xF7D6, 0x9AE6 }, { 0xF7D7, 0x9AEF }, { 0xF7D8, 0x9AEB }, 
-	{ 0xF7D9, 0x9AFB }, { 0xF7DA, 0x9AED }, { 0xF7DB, 0x9AF9 }, { 0xF7DC, 0x9B08 }, { 0xF7DD, 0x9B0F }, { 0xF7DE, 0x9B13 }, { 0xF7DF, 0x9B1F }, { 0xF7E0, 0x9B23 }, 
-	{ 0xF7E1, 0x9EBD }, { 0xF7E2, 0x9EBE }, { 0xF7E3, 0x7E3B }, { 0xF7E4, 0x9E82 }, { 0xF7E5, 0x9E87 }, { 0xF7E6, 0x9E88 }, { 0xF7E7, 0x9E8B }, { 0xF7E8, 0x9E92 }, 
-	{ 0xF7E9, 0x93D6 }, { 0xF7EA, 0x9E9D }, { 0xF7EB, 0x9E9F }, { 0xF7EC, 0x9EDB }, { 0xF7ED, 0x9EDC }, { 0xF7EE, 0x9EDD }, { 0xF7EF, 0x9EE0 }, { 0xF7F0, 0x9EDF }, 
-	{ 0xF7F1, 0x9EE2 }, { 0xF7F2, 0x9EE9 }, { 0xF7F3, 0x9EE7 }, { 0xF7F4, 0x9EE5 }, { 0xF7F5, 0x9EEA }, { 0xF7F6, 0x9EEF }, { 0xF7F7, 0x9F22 }, { 0xF7F8, 0x9F2C }, 
-	{ 0xF7F9, 0x9F2F }, { 0xF7FA, 0x9F39 }, { 0xF7FB, 0x9F37 }, { 0xF7FC, 0x9F3D }, { 0xF7FD, 0x9F3E }, { 0xF7FE, 0x9F44 }, 
+	{ 0xA1A1, 0x3000 }, { 0xA1A2, 0x3001 }, { 0xA1A3, 0x3002 }, { 0xA1A4, 0x00B7 }, { 0xA1A5, 0x02C9 }, { 0xA1A6, 0x02C7 }, { 0xA1A7, 0x00A8 }, { 0xA1A8, 0x3003 },
+	{ 0xA1A9, 0x3005 }, { 0xA1AA, 0x2014 }, { 0xA1AB, 0x301C }, { 0xA1AC, 0x2016 }, { 0xA1AD, 0x22EF }, { 0xA1AE, 0x2018 }, { 0xA1AF, 0x2019 }, { 0xA1B0, 0x201C },
+	{ 0xA1B1, 0x201D }, { 0xA1B2, 0x3014 }, { 0xA1B3, 0x3015 }, { 0xA1B4, 0x3008 }, { 0xA1B5, 0x3009 }, { 0xA1B6, 0x300A }, { 0xA1B7, 0x300B }, { 0xA1B8, 0x300C },
+	{ 0xA1B9, 0x300D }, { 0xA1BA, 0x300E }, { 0xA1BB, 0x300F }, { 0xA1BC, 0x3016 }, { 0xA1BD, 0x3017 }, { 0xA1BE, 0x3010 }, { 0xA1BF, 0x3011 }, { 0xA1C0, 0x00B1 },
+	{ 0xA1C1, 0x00D7 }, { 0xA1C2, 0x00F7 }, { 0xA1C3, 0x2236 }, { 0xA1C4, 0x2227 }, { 0xA1C5, 0x2228 }, { 0xA1C6, 0x2211 }, { 0xA1C7, 0x220F }, { 0xA1C8, 0x222A },
+	{ 0xA1C9, 0x2229 }, { 0xA1CA, 0x2208 }, { 0xA1CB, 0x2237 }, { 0xA1CC, 0x221A }, { 0xA1CD, 0x22A5 }, { 0xA1CE, 0x2225 }, { 0xA1CF, 0x2220 }, { 0xA1D0, 0x2312 },
+	{ 0xA1D1, 0x2299 }, { 0xA1D2, 0x222B }, { 0xA1D3, 0x222E }, { 0xA1D4, 0x2261 }, { 0xA1D5, 0x224C }, { 0xA1D6, 0x2248 }, { 0xA1D7, 0x223D }, { 0xA1D8, 0x221D },
+	{ 0xA1D9, 0x2260 }, { 0xA1DA, 0x226E }, { 0xA1DB, 0x226F }, { 0xA1DC, 0x2264 }, { 0xA1DD, 0x2265 }, { 0xA1DE, 0x221E }, { 0xA1DF, 0x2235 }, { 0xA1E0, 0x2234 },
+	{ 0xA1E1, 0x2642 }, { 0xA1E2, 0x2640 }, { 0xA1E3, 0x00B0 }, { 0xA1E4, 0x2032 }, { 0xA1E5, 0x2033 }, { 0xA1E6, 0x2103 }, { 0xA1E7, 0xFF04 }, { 0xA1E8, 0x00A4 },
+	{ 0xA1E9, 0x00A2 }, { 0xA1EA, 0x00A3 }, { 0xA1EB, 0x2030 }, { 0xA1EC, 0x00A7 }, { 0xA1ED, 0x2116 }, { 0xA1EE, 0x2606 }, { 0xA1EF, 0x2605 }, { 0xA1F0, 0x25CB },
+	{ 0xA1F1, 0x25CF }, { 0xA1F2, 0x25CE }, { 0xA1F3, 0x25C7 }, { 0xA1F4, 0x25C6 }, { 0xA1F5, 0x25A1 }, { 0xA1F6, 0x25A0 }, { 0xA1F7, 0x25B3 }, { 0xA1F8, 0x25B2 },
+	{ 0xA1F9, 0x203B }, { 0xA1FA, 0x2192 }, { 0xA1FB, 0x2190 }, { 0xA1FC, 0x2191 }, { 0xA1FD, 0x2193 }, { 0xA1FE, 0x3013 }, { 0xA2B1, 0x2488 }, { 0xA2B2, 0x2489 },
+	{ 0xA2B3, 0x248A }, { 0xA2B4, 0x248B }, { 0xA2B5, 0x248C }, { 0xA2B6, 0x248D }, { 0xA2B7, 0x248E }, { 0xA2B8, 0x248F }, { 0xA2B9, 0x2490 }, { 0xA2BA, 0x2491 },
+	{ 0xA2BB, 0x2492 }, { 0xA2BC, 0x2493 }, { 0xA2BD, 0x2494 }, { 0xA2BE, 0x2495 }, { 0xA2BF, 0x2496 }, { 0xA2C0, 0x2497 }, { 0xA2C1, 0x2498 }, { 0xA2C2, 0x2499 },
+	{ 0xA2C3, 0x249A }, { 0xA2C4, 0x249B }, { 0xA2C5, 0x2474 }, { 0xA2C6, 0x2475 }, { 0xA2C7, 0x2476 }, { 0xA2C8, 0x2477 }, { 0xA2C9, 0x2478 }, { 0xA2CA, 0x2479 },
+	{ 0xA2CB, 0x247A }, { 0xA2CC, 0x247B }, { 0xA2CD, 0x247C }, { 0xA2CE, 0x247D }, { 0xA2CF, 0x247E }, { 0xA2D0, 0x247F }, { 0xA2D1, 0x2480 }, { 0xA2D2, 0x2481 },
+	{ 0xA2D3, 0x2482 }, { 0xA2D4, 0x2483 }, { 0xA2D5, 0x2484 }, { 0xA2D6, 0x2485 }, { 0xA2D7, 0x2486 }, { 0xA2D8, 0x2487 }, { 0xA2D9, 0x2460 }, { 0xA2DA, 0x2461 },
+	{ 0xA2DB, 0x2462 }, { 0xA2DC, 0x2463 }, { 0xA2DD, 0x2464 }, { 0xA2DE, 0x2465 }, { 0xA2DF, 0x2466 }, { 0xA2E0, 0x2467 }, { 0xA2E1, 0x2468 }, { 0xA2E2, 0x2469 },
+	{ 0xA2E5, 0x3220 }, { 0xA2E6, 0x3221 }, { 0xA2E7, 0x3222 }, { 0xA2E8, 0x3223 }, { 0xA2E9, 0x3224 }, { 0xA2EA, 0x3225 }, { 0xA2EB, 0x3226 }, { 0xA2EC, 0x3227 },
+	{ 0xA2ED, 0x3228 }, { 0xA2EE, 0x3229 }, { 0xA2F1, 0x2160 }, { 0xA2F2, 0x2161 }, { 0xA2F3, 0x2162 }, { 0xA2F4, 0x2163 }, { 0xA2F5, 0x2164 }, { 0xA2F6, 0x2165 },
+	{ 0xA2F7, 0x2166 }, { 0xA2F8, 0x2167 }, { 0xA2F9, 0x2168 }, { 0xA2FA, 0x2169 }, { 0xA2FB, 0x216A }, { 0xA2FC, 0x216B }, { 0xA3A1, 0xFF01 }, { 0xA3A2, 0xFF02 },
+	{ 0xA3A3, 0xFF03 }, { 0xA3A4, 0x00A5 }, { 0xA3A5, 0xFF05 }, { 0xA3A6, 0xFF06 }, { 0xA3A7, 0xFF07 }, { 0xA3A8, 0xFF08 }, { 0xA3A9, 0xFF09 }, { 0xA3AA, 0xFF0A },
+	{ 0xA3AB, 0xFF0B }, { 0xA3AC, 0xFF0C }, { 0xA3AD, 0xFF0D }, { 0xA3AE, 0xFF0E }, { 0xA3AF, 0xFF0F }, { 0xA3B0, 0xFF10 }, { 0xA3B1, 0xFF11 }, { 0xA3B2, 0xFF12 },
+	{ 0xA3B3, 0xFF13 }, { 0xA3B4, 0xFF14 }, { 0xA3B5, 0xFF15 }, { 0xA3B6, 0xFF16 }, { 0xA3B7, 0xFF17 }, { 0xA3B8, 0xFF18 }, { 0xA3B9, 0xFF19 }, { 0xA3BA, 0xFF1A },
+	{ 0xA3BB, 0xFF1B }, { 0xA3BC, 0xFF1C }, { 0xA3BD, 0xFF1D }, { 0xA3BE, 0xFF1E }, { 0xA3BF, 0xFF1F }, { 0xA3C0, 0xFF20 }, { 0xA3C1, 0xFF21 }, { 0xA3C2, 0xFF22 },
+	{ 0xA3C3, 0xFF23 }, { 0xA3C4, 0xFF24 }, { 0xA3C5, 0xFF25 }, { 0xA3C6, 0xFF26 }, { 0xA3C7, 0xFF27 }, { 0xA3C8, 0xFF28 }, { 0xA3C9, 0xFF29 }, { 0xA3CA, 0xFF2A },
+	{ 0xA3CB, 0xFF2B }, { 0xA3CC, 0xFF2C }, { 0xA3CD, 0xFF2D }, { 0xA3CE, 0xFF2E }, { 0xA3CF, 0xFF2F }, { 0xA3D0, 0xFF30 }, { 0xA3D1, 0xFF31 }, { 0xA3D2, 0xFF32 },
+	{ 0xA3D3, 0xFF33 }, { 0xA3D4, 0xFF34 }, { 0xA3D5, 0xFF35 }, { 0xA3D6, 0xFF36 }, { 0xA3D7, 0xFF37 }, { 0xA3D8, 0xFF38 }, { 0xA3D9, 0xFF39 }, { 0xA3DA, 0xFF3A },
+	{ 0xA3DB, 0xFF3B }, { 0xA3DC, 0xFF3C }, { 0xA3DD, 0xFF3D }, { 0xA3DE, 0xFF3E }, { 0xA3DF, 0xFF3F }, { 0xA3E0, 0xFF40 }, { 0xA3E1, 0xFF41 }, { 0xA3E2, 0xFF42 },
+	{ 0xA3E3, 0xFF43 }, { 0xA3E4, 0xFF44 }, { 0xA3E5, 0xFF45 }, { 0xA3E6, 0xFF46 }, { 0xA3E7, 0xFF47 }, { 0xA3E8, 0xFF48 }, { 0xA3E9, 0xFF49 }, { 0xA3EA, 0xFF4A },
+	{ 0xA3EB, 0xFF4B }, { 0xA3EC, 0xFF4C }, { 0xA3ED, 0xFF4D }, { 0xA3EE, 0xFF4E }, { 0xA3EF, 0xFF4F }, { 0xA3F0, 0xFF50 }, { 0xA3F1, 0xFF51 }, { 0xA3F2, 0xFF52 },
+	{ 0xA3F3, 0xFF53 }, { 0xA3F4, 0xFF54 }, { 0xA3F5, 0xFF55 }, { 0xA3F6, 0xFF56 }, { 0xA3F7, 0xFF57 }, { 0xA3F8, 0xFF58 }, { 0xA3F9, 0xFF59 }, { 0xA3FA, 0xFF5A },
+	{ 0xA3FB, 0xFF5B }, { 0xA3FC, 0xFF5C }, { 0xA3FD, 0xFF5D }, { 0xA3FE, 0x203E }, { 0xA4A1, 0x3041 }, { 0xA4A2, 0x3042 }, { 0xA4A3, 0x3043 }, { 0xA4A4, 0x3044 },
+	{ 0xA4A5, 0x3045 }, { 0xA4A6, 0x3046 }, { 0xA4A7, 0x3047 }, { 0xA4A8, 0x3048 }, { 0xA4A9, 0x3049 }, { 0xA4AA, 0x304A }, { 0xA4AB, 0x304B }, { 0xA4AC, 0x304C },
+	{ 0xA4AD, 0x304D }, { 0xA4AE, 0x304E }, { 0xA4AF, 0x304F }, { 0xA4B0, 0x3050 }, { 0xA4B1, 0x3051 }, { 0xA4B2, 0x3052 }, { 0xA4B3, 0x3053 }, { 0xA4B4, 0x3054 },
+	{ 0xA4B5, 0x3055 }, { 0xA4B6, 0x3056 }, { 0xA4B7, 0x3057 }, { 0xA4B8, 0x3058 }, { 0xA4B9, 0x3059 }, { 0xA4BA, 0x305A }, { 0xA4BB, 0x305B }, { 0xA4BC, 0x305C },
+	{ 0xA4BD, 0x305D }, { 0xA4BE, 0x305E }, { 0xA4BF, 0x305F }, { 0xA4C0, 0x3060 }, { 0xA4C1, 0x3061 }, { 0xA4C2, 0x3062 }, { 0xA4C3, 0x3063 }, { 0xA4C4, 0x3064 },
+	{ 0xA4C5, 0x3065 }, { 0xA4C6, 0x3066 }, { 0xA4C7, 0x3067 }, { 0xA4C8, 0x3068 }, { 0xA4C9, 0x3069 }, { 0xA4CA, 0x306A }, { 0xA4CB, 0x306B }, { 0xA4CC, 0x306C },
+	{ 0xA4CD, 0x306D }, { 0xA4CE, 0x306E }, { 0xA4CF, 0x306F }, { 0xA4D0, 0x3070 }, { 0xA4D1, 0x3071 }, { 0xA4D2, 0x3072 }, { 0xA4D3, 0x3073 }, { 0xA4D4, 0x3074 },
+	{ 0xA4D5, 0x3075 }, { 0xA4D6, 0x3076 }, { 0xA4D7, 0x3077 }, { 0xA4D8, 0x3078 }, { 0xA4D9, 0x3079 }, { 0xA4DA, 0x307A }, { 0xA4DB, 0x307B }, { 0xA4DC, 0x307C },
+	{ 0xA4DD, 0x307D }, { 0xA4DE, 0x307E }, { 0xA4DF, 0x307F }, { 0xA4E0, 0x3080 }, { 0xA4E1, 0x3081 }, { 0xA4E2, 0x3082 }, { 0xA4E3, 0x3083 }, { 0xA4E4, 0x3084 },
+	{ 0xA4E5, 0x3085 }, { 0xA4E6, 0x3086 }, { 0xA4E7, 0x3087 }, { 0xA4E8, 0x3088 }, { 0xA4E9, 0x3089 }, { 0xA4EA, 0x308A }, { 0xA4EB, 0x308B }, { 0xA4EC, 0x308C },
+	{ 0xA4ED, 0x308D }, { 0xA4EE, 0x308E }, { 0xA4EF, 0x308F }, { 0xA4F0, 0x3090 }, { 0xA4F1, 0x3091 }, { 0xA4F2, 0x3092 }, { 0xA4F3, 0x3093 }, { 0xA5A1, 0x30A1 },
+	{ 0xA5A2, 0x30A2 }, { 0xA5A3, 0x30A3 }, { 0xA5A4, 0x30A4 }, { 0xA5A5, 0x30A5 }, { 0xA5A6, 0x30A6 }, { 0xA5A7, 0x30A7 }, { 0xA5A8, 0x30A8 }, { 0xA5A9, 0x30A9 },
+	{ 0xA5AA, 0x30AA }, { 0xA5AB, 0x30AB }, { 0xA5AC, 0x30AC }, { 0xA5AD, 0x30AD }, { 0xA5AE, 0x30AE }, { 0xA5AF, 0x30AF }, { 0xA5B0, 0x30B0 }, { 0xA5B1, 0x30B1 },
+	{ 0xA5B2, 0x30B2 }, { 0xA5B3, 0x30B3 }, { 0xA5B4, 0x30B4 }, { 0xA5B5, 0x30B5 }, { 0xA5B6, 0x30B6 }, { 0xA5B7, 0x30B7 }, { 0xA5B8, 0x30B8 }, { 0xA5B9, 0x30B9 },
+	{ 0xA5BA, 0x30BA }, { 0xA5BB, 0x30BB }, { 0xA5BC, 0x30BC }, { 0xA5BD, 0x30BD }, { 0xA5BE, 0x30BE }, { 0xA5BF, 0x30BF }, { 0xA5C0, 0x30C0 }, { 0xA5C1, 0x30C1 },
+	{ 0xA5C2, 0x30C2 }, { 0xA5C3, 0x30C3 }, { 0xA5C4, 0x30C4 }, { 0xA5C5, 0x30C5 }, { 0xA5C6, 0x30C6 }, { 0xA5C7, 0x30C7 }, { 0xA5C8, 0x30C8 }, { 0xA5C9, 0x30C9 },
+	{ 0xA5CA, 0x30CA }, { 0xA5CB, 0x30CB }, { 0xA5CC, 0x30CC }, { 0xA5CD, 0x30CD }, { 0xA5CE, 0x30CE }, { 0xA5CF, 0x30CF }, { 0xA5D0, 0x30D0 }, { 0xA5D1, 0x30D1 },
+	{ 0xA5D2, 0x30D2 }, { 0xA5D3, 0x30D3 }, { 0xA5D4, 0x30D4 }, { 0xA5D5, 0x30D5 }, { 0xA5D6, 0x30D6 }, { 0xA5D7, 0x30D7 }, { 0xA5D8, 0x30D8 }, { 0xA5D9, 0x30D9 },
+	{ 0xA5DA, 0x30DA }, { 0xA5DB, 0x30DB }, { 0xA5DC, 0x30DC }, { 0xA5DD, 0x30DD }, { 0xA5DE, 0x30DE }, { 0xA5DF, 0x30DF }, { 0xA5E0, 0x30E0 }, { 0xA5E1, 0x30E1 },
+	{ 0xA5E2, 0x30E2 }, { 0xA5E3, 0x30E3 }, { 0xA5E4, 0x30E4 }, { 0xA5E5, 0x30E5 }, { 0xA5E6, 0x30E6 }, { 0xA5E7, 0x30E7 }, { 0xA5E8, 0x30E8 }, { 0xA5E9, 0x30E9 },
+	{ 0xA5EA, 0x30EA }, { 0xA5EB, 0x30EB }, { 0xA5EC, 0x30EC }, { 0xA5ED, 0x30ED }, { 0xA5EE, 0x30EE }, { 0xA5EF, 0x30EF }, { 0xA5F0, 0x30F0 }, { 0xA5F1, 0x30F1 },
+	{ 0xA5F2, 0x30F2 }, { 0xA5F3, 0x30F3 }, { 0xA5F4, 0x30F4 }, { 0xA5F5, 0x30F5 }, { 0xA5F6, 0x30F6 }, { 0xA6A1, 0x0391 }, { 0xA6A2, 0x0392 }, { 0xA6A3, 0x0393 },
+	{ 0xA6A4, 0x0394 }, { 0xA6A5, 0x0395 }, { 0xA6A6, 0x0396 }, { 0xA6A7, 0x0397 }, { 0xA6A8, 0x0398 }, { 0xA6A9, 0x0399 }, { 0xA6AA, 0x039A }, { 0xA6AB, 0x039B },
+	{ 0xA6AC, 0x039C }, { 0xA6AD, 0x039D }, { 0xA6AE, 0x039E }, { 0xA6AF, 0x039F }, { 0xA6B0, 0x03A0 }, { 0xA6B1, 0x03A1 }, { 0xA6B2, 0x03A3 }, { 0xA6B3, 0x03A4 },
+	{ 0xA6B4, 0x03A5 }, { 0xA6B5, 0x03A6 }, { 0xA6B6, 0x03A7 }, { 0xA6B7, 0x03A8 }, { 0xA6B8, 0x03A9 }, { 0xA6C1, 0x03B1 }, { 0xA6C2, 0x03B2 }, { 0xA6C3, 0x03B3 },
+	{ 0xA6C4, 0x03B4 }, { 0xA6C5, 0x03B5 }, { 0xA6C6, 0x03B6 }, { 0xA6C7, 0x03B7 }, { 0xA6C8, 0x03B8 }, { 0xA6C9, 0x03B9 }, { 0xA6CA, 0x03BA }, { 0xA6CB, 0x03BB },
+	{ 0xA6CC, 0x03BC }, { 0xA6CD, 0x03BD }, { 0xA6CE, 0x03BE }, { 0xA6CF, 0x03BF }, { 0xA6D0, 0x03C0 }, { 0xA6D1, 0x03C1 }, { 0xA6D2, 0x03C3 }, { 0xA6D3, 0x03C4 },
+	{ 0xA6D4, 0x03C5 }, { 0xA6D5, 0x03C6 }, { 0xA6D6, 0x03C7 }, { 0xA6D7, 0x03C8 }, { 0xA6D8, 0x03C9 }, { 0xA6E0, 0xFE35 }, { 0xA6E1, 0xFE36 }, { 0xA6E2, 0xFE39 },
+	{ 0xA6E3, 0xFE3A }, { 0xA6E4, 0xFE3F }, { 0xA6E5, 0xFE40 }, { 0xA6E6, 0xFE3D }, { 0xA6E7, 0xFE3E }, { 0xA6E8, 0xFE41 }, { 0xA6E9, 0xFE42 }, { 0xA6EA, 0xFE43 },
+	{ 0xA6EB, 0xFE44 }, { 0xA6EE, 0xFE3B }, { 0xA6EF, 0xFE3C }, { 0xA6F0, 0xFE37 }, { 0xA6F1, 0xFE38 }, { 0xA6F2, 0xFE31 }, { 0xA6F4, 0xFE33 }, { 0xA6F5, 0xFE34 },
+	{ 0xA7A1, 0x0410 }, { 0xA7A2, 0x0411 }, { 0xA7A3, 0x0412 }, { 0xA7A4, 0x0413 }, { 0xA7A5, 0x0414 }, { 0xA7A6, 0x0415 }, { 0xA7A7, 0x0401 }, { 0xA7A8, 0x0416 },
+	{ 0xA7A9, 0x0417 }, { 0xA7AA, 0x0418 }, { 0xA7AB, 0x0419 }, { 0xA7AC, 0x041A }, { 0xA7AD, 0x041B }, { 0xA7AE, 0x041C }, { 0xA7AF, 0x041D }, { 0xA7B0, 0x041E },
+	{ 0xA7B1, 0x041F }, { 0xA7B2, 0x0420 }, { 0xA7B3, 0x0421 }, { 0xA7B4, 0x0422 }, { 0xA7B5, 0x0423 }, { 0xA7B6, 0x0424 }, { 0xA7B7, 0x0425 }, { 0xA7B8, 0x0426 },
+	{ 0xA7B9, 0x0427 }, { 0xA7BA, 0x0428 }, { 0xA7BB, 0x0429 }, { 0xA7BC, 0x042A }, { 0xA7BD, 0x042B }, { 0xA7BE, 0x042C }, { 0xA7BF, 0x042D }, { 0xA7C0, 0x042E },
+	{ 0xA7C1, 0x042F }, { 0xA7D1, 0x0430 }, { 0xA7D2, 0x0431 }, { 0xA7D3, 0x0432 }, { 0xA7D4, 0x0433 }, { 0xA7D5, 0x0434 }, { 0xA7D6, 0x0435 }, { 0xA7D7, 0x0451 },
+	{ 0xA7D8, 0x0436 }, { 0xA7D9, 0x0437 }, { 0xA7DA, 0x0438 }, { 0xA7DB, 0x0439 }, { 0xA7DC, 0x043A }, { 0xA7DD, 0x043B }, { 0xA7DE, 0x043C }, { 0xA7DF, 0x043D },
+	{ 0xA7E0, 0x043E }, { 0xA7E1, 0x043F }, { 0xA7E2, 0x0440 }, { 0xA7E3, 0x0441 }, { 0xA7E4, 0x0442 }, { 0xA7E5, 0x0443 }, { 0xA7E6, 0x0444 }, { 0xA7E7, 0x0445 },
+	{ 0xA7E8, 0x0446 }, { 0xA7E9, 0x0447 }, { 0xA7EA, 0x0448 }, { 0xA7EB, 0x0449 }, { 0xA7EC, 0x044A }, { 0xA7ED, 0x044B }, { 0xA7EE, 0x044C }, { 0xA7EF, 0x044D },
+	{ 0xA7F0, 0x044E }, { 0xA7F1, 0x044F }, { 0xA8A1, 0x0101 }, { 0xA8A2, 0x00E1 }, { 0xA8A3, 0x01CE }, { 0xA8A4, 0x00E0 }, { 0xA8A5, 0x0113 }, { 0xA8A6, 0x00E9 },
+	{ 0xA8A7, 0x011B }, { 0xA8A8, 0x00E8 }, { 0xA8A9, 0x012B }, { 0xA8AA, 0x00ED }, { 0xA8AB, 0x01D0 }, { 0xA8AC, 0x00EC }, { 0xA8AD, 0x014D }, { 0xA8AE, 0x00F3 },
+	{ 0xA8AF, 0x01D2 }, { 0xA8B0, 0x00F2 }, { 0xA8B1, 0x016B }, { 0xA8B2, 0x00FA }, { 0xA8B3, 0x01D4 }, { 0xA8B4, 0x00F9 }, { 0xA8B5, 0x01D6 }, { 0xA8B6, 0x01D8 },
+	{ 0xA8B7, 0x01DA }, { 0xA8B8, 0x01DC }, { 0xA8B9, 0x00FC }, { 0xA8BA, 0x00EA }, { 0xA8BB, 0x0251 }, { 0xA8BC, 0x1E3F }, { 0xA8BD, 0x0144 }, { 0xA8BE, 0x0148 },
+	{ 0xA8BF, 0x01F9 }, { 0xA8C0, 0x0261 }, { 0xA8C5, 0x3105 }, { 0xA8C6, 0x3106 }, { 0xA8C7, 0x3107 }, { 0xA8C8, 0x3108 }, { 0xA8C9, 0x3109 }, { 0xA8CA, 0x310A },
+	{ 0xA8CB, 0x310B }, { 0xA8CC, 0x310C }, { 0xA8CD, 0x310D }, { 0xA8CE, 0x310E }, { 0xA8CF, 0x310F }, { 0xA8D0, 0x3110 }, { 0xA8D1, 0x3111 }, { 0xA8D2, 0x3112 },
+	{ 0xA8D3, 0x3113 }, { 0xA8D4, 0x3114 }, { 0xA8D5, 0x3115 }, { 0xA8D6, 0x3116 }, { 0xA8D7, 0x3117 }, { 0xA8D8, 0x3118 }, { 0xA8D9, 0x3119 }, { 0xA8DA, 0x311A },
+	{ 0xA8DB, 0x311B }, { 0xA8DC, 0x311C }, { 0xA8DD, 0x311D }, { 0xA8DE, 0x311E }, { 0xA8DF, 0x311F }, { 0xA8E0, 0x3120 }, { 0xA8E1, 0x3121 }, { 0xA8E2, 0x3122 },
+	{ 0xA8E3, 0x3123 }, { 0xA8E4, 0x3124 }, { 0xA8E5, 0x3125 }, { 0xA8E6, 0x3126 }, { 0xA8E7, 0x3127 }, { 0xA8E8, 0x3128 }, { 0xA8E9, 0x3129 }, { 0xA9A4, 0x2500 },
+	{ 0xA9A5, 0x2501 }, { 0xA9A6, 0x2502 }, { 0xA9A7, 0x2503 }, { 0xA9A8, 0x2504 }, { 0xA9A9, 0x2505 }, { 0xA9AA, 0x2506 }, { 0xA9AB, 0x2507 }, { 0xA9AC, 0x2508 },
+	{ 0xA9AD, 0x2509 }, { 0xA9AE, 0x250A }, { 0xA9AF, 0x250B }, { 0xA9B0, 0x250C }, { 0xA9B1, 0x250D }, { 0xA9B2, 0x250E }, { 0xA9B3, 0x250F }, { 0xA9B4, 0x2510 },
+	{ 0xA9B5, 0x2511 }, { 0xA9B6, 0x2512 }, { 0xA9B7, 0x2513 }, { 0xA9B8, 0x2514 }, { 0xA9B9, 0x2515 }, { 0xA9BA, 0x2516 }, { 0xA9BB, 0x2517 }, { 0xA9BC, 0x2518 },
+	{ 0xA9BD, 0x2519 }, { 0xA9BE, 0x251A }, { 0xA9BF, 0x251B }, { 0xA9C0, 0x251C }, { 0xA9C1, 0x251D }, { 0xA9C2, 0x251E }, { 0xA9C3, 0x251F }, { 0xA9C4, 0x2520 },
+	{ 0xA9C5, 0x2521 }, { 0xA9C6, 0x2522 }, { 0xA9C7, 0x2523 }, { 0xA9C8, 0x2524 }, { 0xA9C9, 0x2525 }, { 0xA9CA, 0x2526 }, { 0xA9CB, 0x2527 }, { 0xA9CC, 0x2528 },
+	{ 0xA9CD, 0x2529 }, { 0xA9CE, 0x252A }, { 0xA9CF, 0x252B }, { 0xA9D0, 0x252C }, { 0xA9D1, 0x252D }, { 0xA9D2, 0x252E }, { 0xA9D3, 0x252F }, { 0xA9D4, 0x2530 },
+	{ 0xA9D5, 0x2531 }, { 0xA9D6, 0x2532 }, { 0xA9D7, 0x2533 }, { 0xA9D8, 0x2534 }, { 0xA9D9, 0x2535 }, { 0xA9DA, 0x2536 }, { 0xA9DB, 0x2537 }, { 0xA9DC, 0x2538 },
+	{ 0xA9DD, 0x2539 }, { 0xA9DE, 0x253A }, { 0xA9DF, 0x253B }, { 0xA9E0, 0x253C }, { 0xA9E1, 0x253D }, { 0xA9E2, 0x253E }, { 0xA9E3, 0x253F }, { 0xA9E4, 0x2540 },
+	{ 0xA9E5, 0x2541 }, { 0xA9E6, 0x2542 }, { 0xA9E7, 0x2543 }, { 0xA9E8, 0x2544 }, { 0xA9E9, 0x2545 }, { 0xA9EA, 0x2546 }, { 0xA9EB, 0x2547 }, { 0xA9EC, 0x2548 },
+	{ 0xA9ED, 0x2549 }, { 0xA9EE, 0x254A }, { 0xA9EF, 0x254B }, { 0xB0A1, 0x554A }, { 0xB0A2, 0x963F }, { 0xB0A3, 0x57C3 }, { 0xB0A4, 0x6328 }, { 0xB0A5, 0x54CE },
+	{ 0xB0A6, 0x5509 }, { 0xB0A7, 0x54C0 }, { 0xB0A8, 0x7691 }, { 0xB0A9, 0x764C }, { 0xB0AA, 0x853C }, { 0xB0AB, 0x77EE }, { 0xB0AC, 0x827E }, { 0xB0AD, 0x788D },
+	{ 0xB0AE, 0x7231 }, { 0xB0AF, 0x9698 }, { 0xB0B0, 0x978D }, { 0xB0B1, 0x6C28 }, { 0xB0B2, 0x5B89 }, { 0xB0B3, 0x4FFA }, { 0xB0B4, 0x6309 }, { 0xB0B5, 0x6697 },
+	{ 0xB0B6, 0x5CB8 }, { 0xB0B7, 0x80FA }, { 0xB0B8, 0x6848 }, { 0xB0B9, 0x80AE }, { 0xB0BA, 0x6602 }, { 0xB0BB, 0x76CE }, { 0xB0BC, 0x51F9 }, { 0xB0BD, 0x6556 },
+	{ 0xB0BE, 0x71AC }, { 0xB0BF, 0x7FF1 }, { 0xB0C0, 0x8884 }, { 0xB0C1, 0x50B2 }, { 0xB0C2, 0x5965 }, { 0xB0C3, 0x61CA }, { 0xB0C4, 0x6FB3 }, { 0xB0C5, 0x82AD },
+	{ 0xB0C6, 0x634C }, { 0xB0C7, 0x6252 }, { 0xB0C8, 0x53ED }, { 0xB0C9, 0x5427 }, { 0xB0CA, 0x7B06 }, { 0xB0CB, 0x516B }, { 0xB0CC, 0x75A4 }, { 0xB0CD, 0x5DF4 },
+	{ 0xB0CE, 0x62D4 }, { 0xB0CF, 0x8DCB }, { 0xB0D0, 0x9776 }, { 0xB0D1, 0x628A }, { 0xB0D2, 0x8019 }, { 0xB0D3, 0x575D }, { 0xB0D4, 0x9738 }, { 0xB0D5, 0x7F62 },
+	{ 0xB0D6, 0x7238 }, { 0xB0D7, 0x767D }, { 0xB0D8, 0x67CF }, { 0xB0D9, 0x767E }, { 0xB0DA, 0x6446 }, { 0xB0DB, 0x4F70 }, { 0xB0DC, 0x8D25 }, { 0xB0DD, 0x62DC },
+	{ 0xB0DE, 0x7A17 }, { 0xB0DF, 0x6591 }, { 0xB0E0, 0x73ED }, { 0xB0E1, 0x642C }, { 0xB0E2, 0x6273 }, { 0xB0E3, 0x822C }, { 0xB0E4, 0x9881 }, { 0xB0E5, 0x677F },
+	{ 0xB0E6, 0x7248 }, { 0xB0E7, 0x626E }, { 0xB0E8, 0x62CC }, { 0xB0E9, 0x4F34 }, { 0xB0EA, 0x74E3 }, { 0xB0EB, 0x534A }, { 0xB0EC, 0x529E }, { 0xB0ED, 0x7ECA },
+	{ 0xB0EE, 0x90A6 }, { 0xB0EF, 0x5E2E }, { 0xB0F0, 0x6886 }, { 0xB0F1, 0x699C }, { 0xB0F2, 0x8180 }, { 0xB0F3, 0x7ED1 }, { 0xB0F4, 0x68D2 }, { 0xB0F5, 0x78C5 },
+	{ 0xB0F6, 0x868C }, { 0xB0F7, 0x9551 }, { 0xB0F8, 0x508D }, { 0xB0F9, 0x8C24 }, { 0xB0FA, 0x82DE }, { 0xB0FB, 0x80DE }, { 0xB0FC, 0x5305 }, { 0xB0FD, 0x8912 },
+	{ 0xB0FE, 0x5265 }, { 0xB1A1, 0x8584 }, { 0xB1A2, 0x96F9 }, { 0xB1A3, 0x4FDD }, { 0xB1A4, 0x5821 }, { 0xB1A5, 0x9971 }, { 0xB1A6, 0x5B9D }, { 0xB1A7, 0x62B1 },
+	{ 0xB1A8, 0x62A5 }, { 0xB1A9, 0x66B4 }, { 0xB1AA, 0x8C79 }, { 0xB1AB, 0x9C8D }, { 0xB1AC, 0x7206 }, { 0xB1AD, 0x676F }, { 0xB1AE, 0x7891 }, { 0xB1AF, 0x60B2 },
+	{ 0xB1B0, 0x5351 }, { 0xB1B1, 0x5317 }, { 0xB1B2, 0x8F88 }, { 0xB1B3, 0x80CC }, { 0xB1B4, 0x8D1D }, { 0xB1B5, 0x94A1 }, { 0xB1B6, 0x500D }, { 0xB1B7, 0x72C8 },
+	{ 0xB1B8, 0x5907 }, { 0xB1B9, 0x60EB }, { 0xB1BA, 0x7119 }, { 0xB1BB, 0x88AB }, { 0xB1BC, 0x5954 }, { 0xB1BD, 0x82EF }, { 0xB1BE, 0x672C }, { 0xB1BF, 0x7B28 },
+	{ 0xB1C0, 0x5D29 }, { 0xB1C1, 0x7EF7 }, { 0xB1C2, 0x752D }, { 0xB1C3, 0x6CF5 }, { 0xB1C4, 0x8E66 }, { 0xB1C5, 0x8FF8 }, { 0xB1C6, 0x903C }, { 0xB1C7, 0x9F3B },
+	{ 0xB1C8, 0x6BD4 }, { 0xB1C9, 0x9119 }, { 0xB1CA, 0x7B14 }, { 0xB1CB, 0x5F7C }, { 0xB1CC, 0x78A7 }, { 0xB1CD, 0x84D6 }, { 0xB1CE, 0x853D }, { 0xB1CF, 0x6BD5 },
+	{ 0xB1D0, 0x6BD9 }, { 0xB1D1, 0x6BD6 }, { 0xB1D2, 0x5E01 }, { 0xB1D3, 0x5E87 }, { 0xB1D4, 0x75F9 }, { 0xB1D5, 0x95ED }, { 0xB1D6, 0x655D }, { 0xB1D7, 0x5F0A },
+	{ 0xB1D8, 0x5FC5 }, { 0xB1D9, 0x8F9F }, { 0xB1DA, 0x58C1 }, { 0xB1DB, 0x81C2 }, { 0xB1DC, 0x907F }, { 0xB1DD, 0x965B }, { 0xB1DE, 0x97AD }, { 0xB1DF, 0x8FB9 },
+	{ 0xB1E0, 0x7F16 }, { 0xB1E1, 0x8D2C }, { 0xB1E2, 0x6241 }, { 0xB1E3, 0x4FBF }, { 0xB1E4, 0x53D8 }, { 0xB1E5, 0x535E }, { 0xB1E6, 0x8FA8 }, { 0xB1E7, 0x8FA9 },
+	{ 0xB1E8, 0x8FAB }, { 0xB1E9, 0x904D }, { 0xB1EA, 0x6807 }, { 0xB1EB, 0x5F6A }, { 0xB1EC, 0x8198 }, { 0xB1ED, 0x8868 }, { 0xB1EE, 0x9CD6 }, { 0xB1EF, 0x618B },
+	{ 0xB1F0, 0x522B }, { 0xB1F1, 0x762A }, { 0xB1F2, 0x5F6C }, { 0xB1F3, 0x658C }, { 0xB1F4, 0x6FD2 }, { 0xB1F5, 0x6EE8 }, { 0xB1F6, 0x5BBE }, { 0xB1F7, 0x6448 },
+	{ 0xB1F8, 0x5175 }, { 0xB1F9, 0x51B0 }, { 0xB1FA, 0x67C4 }, { 0xB1FB, 0x4E19 }, { 0xB1FC, 0x79C9 }, { 0xB1FD, 0x997C }, { 0xB1FE, 0x70B3 }, { 0xB2A1, 0x75C5 },
+	{ 0xB2A2, 0x5E76 }, { 0xB2A3, 0x73BB }, { 0xB2A4, 0x83E0 }, { 0xB2A5, 0x64AD }, { 0xB2A6, 0x62E8 }, { 0xB2A7, 0x94B5 }, { 0xB2A8, 0x6CE2 }, { 0xB2A9, 0x535A },
+	{ 0xB2AA, 0x52C3 }, { 0xB2AB, 0x640F }, { 0xB2AC, 0x94C2 }, { 0xB2AD, 0x7B94 }, { 0xB2AE, 0x4F2F }, { 0xB2AF, 0x5E1B }, { 0xB2B0, 0x8236 }, { 0xB2B1, 0x8116 },
+	{ 0xB2B2, 0x818A }, { 0xB2B3, 0x6E24 }, { 0xB2B4, 0x6CCA }, { 0xB2B5, 0x9A73 }, { 0xB2B6, 0x6355 }, { 0xB2B7, 0x535C }, { 0xB2B8, 0x54FA }, { 0xB2B9, 0x8865 },
+	{ 0xB2BA, 0x57E0 }, { 0xB2BB, 0x4E0D }, { 0xB2BC, 0x5E03 }, { 0xB2BD, 0x6B65 }, { 0xB2BE, 0x7C3F }, { 0xB2BF, 0x90E8 }, { 0xB2C0, 0x6016 }, { 0xB2C1, 0x64E6 },
+	{ 0xB2C2, 0x731C }, { 0xB2C3, 0x88C1 }, { 0xB2C4, 0x6750 }, { 0xB2C5, 0x624D }, { 0xB2C6, 0x8D22 }, { 0xB2C7, 0x776C }, { 0xB2C8, 0x8E29 }, { 0xB2C9, 0x91C7 },
+	{ 0xB2CA, 0x5F69 }, { 0xB2CB, 0x83DC }, { 0xB2CC, 0x8521 }, { 0xB2CD, 0x9910 }, { 0xB2CE, 0x53C2 }, { 0xB2CF, 0x8695 }, { 0xB2D0, 0x6B8B }, { 0xB2D1, 0x60ED },
+	{ 0xB2D2, 0x60E8 }, { 0xB2D3, 0x707F }, { 0xB2D4, 0x82CD }, { 0xB2D5, 0x8231 }, { 0xB2D6, 0x4ED3 }, { 0xB2D7, 0x6CA7 }, { 0xB2D8, 0x85CF }, { 0xB2D9, 0x64CD },
+	{ 0xB2DA, 0x7CD9 }, { 0xB2DB, 0x69FD }, { 0xB2DC, 0x66F9 }, { 0xB2DD, 0x8349 }, { 0xB2DE, 0x5395 }, { 0xB2DF, 0x7B56 }, { 0xB2E0, 0x4FA7 }, { 0xB2E1, 0x518C },
+	{ 0xB2E2, 0x6D4B }, { 0xB2E3, 0x5C42 }, { 0xB2E4, 0x8E6D }, { 0xB2E5, 0x63D2 }, { 0xB2E6, 0x53C9 }, { 0xB2E7, 0x832C }, { 0xB2E8, 0x8336 }, { 0xB2E9, 0x67E5 },
+	{ 0xB2EA, 0x78B4 }, { 0xB2EB, 0x643D }, { 0xB2EC, 0x5BDF }, { 0xB2ED, 0x5C94 }, { 0xB2EE, 0x5DEE }, { 0xB2EF, 0x8BE7 }, { 0xB2F0, 0x62C6 }, { 0xB2F1, 0x67F4 },
+	{ 0xB2F2, 0x8C7A }, { 0xB2F3, 0x6400 }, { 0xB2F4, 0x63BA }, { 0xB2F5, 0x8749 }, { 0xB2F6, 0x998B }, { 0xB2F7, 0x8C17 }, { 0xB2F8, 0x7F20 }, { 0xB2F9, 0x94F2 },
+	{ 0xB2FA, 0x4EA7 }, { 0xB2FB, 0x9610 }, { 0xB2FC, 0x98A4 }, { 0xB2FD, 0x660C }, { 0xB2FE, 0x7316 }, { 0xB3A1, 0x573A }, { 0xB3A2, 0x5C1D }, { 0xB3A3, 0x5E38 },
+	{ 0xB3A4, 0x957F }, { 0xB3A5, 0x507F }, { 0xB3A6, 0x80A0 }, { 0xB3A7, 0x5382 }, { 0xB3A8, 0x655E }, { 0xB3A9, 0x7545 }, { 0xB3AA, 0x5531 }, { 0xB3AB, 0x5021 },
+	{ 0xB3AC, 0x8D85 }, { 0xB3AD, 0x6284 }, { 0xB3AE, 0x949E }, { 0xB3AF, 0x671D }, { 0xB3B0, 0x5632 }, { 0xB3B1, 0x6F6E }, { 0xB3B2, 0x5DE2 }, { 0xB3B3, 0x5435 },
+	{ 0xB3B4, 0x7092 }, { 0xB3B5, 0x8F66 }, { 0xB3B6, 0x626F }, { 0xB3B7, 0x64A4 }, { 0xB3B8, 0x63A3 }, { 0xB3B9, 0x5F7B }, { 0xB3BA, 0x6F88 }, { 0xB3BB, 0x90F4 },
+	{ 0xB3BC, 0x81E3 }, { 0xB3BD, 0x8FB0 }, { 0xB3BE, 0x5C18 }, { 0xB3BF, 0x6668 }, { 0xB3C0, 0x5FF1 }, { 0xB3C1, 0x6C89 }, { 0xB3C2, 0x9648 }, { 0xB3C3, 0x8D81 },
+	{ 0xB3C4, 0x886C }, { 0xB3C5, 0x6491 }, { 0xB3C6, 0x79F0 }, { 0xB3C7, 0x57CE }, { 0xB3C8, 0x6A59 }, { 0xB3C9, 0x6210 }, { 0xB3CA, 0x5448 }, { 0xB3CB, 0x4E58 },
+	{ 0xB3CC, 0x7A0B }, { 0xB3CD, 0x60E9 }, { 0xB3CE, 0x6F84 }, { 0xB3CF, 0x8BDA }, { 0xB3D0, 0x627F }, { 0xB3D1, 0x901E }, { 0xB3D2, 0x9A8B }, { 0xB3D3, 0x79E4 },
+	{ 0xB3D4, 0x5403 }, { 0xB3D5, 0x75F4 }, { 0xB3D6, 0x6301 }, { 0xB3D7, 0x5319 }, { 0xB3D8, 0x6C60 }, { 0xB3D9, 0x8FDF }, { 0xB3DA, 0x5F1B }, { 0xB3DB, 0x9A70 },
+	{ 0xB3DC, 0x803B }, { 0xB3DD, 0x9F7F }, { 0xB3DE, 0x4F88 }, { 0xB3DF, 0x5C3A }, { 0xB3E0, 0x8D64 }, { 0xB3E1, 0x7FC5 }, { 0xB3E2, 0x65A5 }, { 0xB3E3, 0x70BD },
+	{ 0xB3E4, 0x5145 }, { 0xB3E5, 0x51B2 }, { 0xB3E6, 0x866B }, { 0xB3E7, 0x5D07 }, { 0xB3E8, 0x5BA0 }, { 0xB3E9, 0x62BD }, { 0xB3EA, 0x916C }, { 0xB3EB, 0x7574 },
+	{ 0xB3EC, 0x8E0C }, { 0xB3ED, 0x7A20 }, { 0xB3EE, 0x6101 }, { 0xB3EF, 0x7B79 }, { 0xB3F0, 0x4EC7 }, { 0xB3F1, 0x7EF8 }, { 0xB3F2, 0x7785 }, { 0xB3F3, 0x4E11 },
+	{ 0xB3F4, 0x81ED }, { 0xB3F5, 0x521D }, { 0xB3F6, 0x51FA }, { 0xB3F7, 0x6A71 }, { 0xB3F8, 0x53A8 }, { 0xB3F9, 0x8E87 }, { 0xB3FA, 0x9504 }, { 0xB3FB, 0x96CF },
+	{ 0xB3FC, 0x6EC1 }, { 0xB3FD, 0x9664 }, { 0xB3FE, 0x695A }, { 0xB4A1, 0x7840 }, { 0xB4A2, 0x50A8 }, { 0xB4A3, 0x77D7 }, { 0xB4A4, 0x6410 }, { 0xB4A5, 0x89E6 },
+	{ 0xB4A6, 0x5904 }, { 0xB4A7, 0x63E3 }, { 0xB4A8, 0x5DDD }, { 0xB4A9, 0x7A7F }, { 0xB4AA, 0x693D }, { 0xB4AB, 0x4F20 }, { 0xB4AC, 0x8239 }, { 0xB4AD, 0x5598 },
+	{ 0xB4AE, 0x4E32 }, { 0xB4AF, 0x75AE }, { 0xB4B0, 0x7A97 }, { 0xB4B1, 0x5E62 }, { 0xB4B2, 0x5E8A }, { 0xB4B3, 0x95EF }, { 0xB4B4, 0x521B }, { 0xB4B5, 0x5439 },
+	{ 0xB4B6, 0x708A }, { 0xB4B7, 0x6376 }, { 0xB4B8, 0x9524 }, { 0xB4B9, 0x5782 }, { 0xB4BA, 0x6625 }, { 0xB4BB, 0x693F }, { 0xB4BC, 0x9187 }, { 0xB4BD, 0x5507 },
+	{ 0xB4BE, 0x6DF3 }, { 0xB4BF, 0x7EAF }, { 0xB4C0, 0x8822 }, { 0xB4C1, 0x6233 }, { 0xB4C2, 0x7EF0 }, { 0xB4C3, 0x75B5 }, { 0xB4C4, 0x8328 }, { 0xB4C5, 0x78C1 },
+	{ 0xB4C6, 0x96CC }, { 0xB4C7, 0x8F9E }, { 0xB4C8, 0x6148 }, { 0xB4C9, 0x74F7 }, { 0xB4CA, 0x8BCD }, { 0xB4CB, 0x6B64 }, { 0xB4CC, 0x523A }, { 0xB4CD, 0x8D50 },
+	{ 0xB4CE, 0x6B21 }, { 0xB4CF, 0x806A }, { 0xB4D0, 0x8471 }, { 0xB4D1, 0x56F1 }, { 0xB4D2, 0x5306 }, { 0xB4D3, 0x4ECE }, { 0xB4D4, 0x4E1B }, { 0xB4D5, 0x51D1 },
+	{ 0xB4D6, 0x7C97 }, { 0xB4D7, 0x918B }, { 0xB4D8, 0x7C07 }, { 0xB4D9, 0x4FC3 }, { 0xB4DA, 0x8E7F }, { 0xB4DB, 0x7BE1 }, { 0xB4DC, 0x7A9C }, { 0xB4DD, 0x6467 },
+	{ 0xB4DE, 0x5D14 }, { 0xB4DF, 0x50AC }, { 0xB4E0, 0x8106 }, { 0xB4E1, 0x7601 }, { 0xB4E2, 0x7CB9 }, { 0xB4E3, 0x6DEC }, { 0xB4E4, 0x7FE0 }, { 0xB4E5, 0x6751 },
+	{ 0xB4E6, 0x5B58 }, { 0xB4E7, 0x5BF8 }, { 0xB4E8, 0x78CB }, { 0xB4E9, 0x64AE }, { 0xB4EA, 0x6413 }, { 0xB4EB, 0x63AA }, { 0xB4EC, 0x632B }, { 0xB4ED, 0x9519 },
+	{ 0xB4EE, 0x642D }, { 0xB4EF, 0x8FBE }, { 0xB4F0, 0x7B54 }, { 0xB4F1, 0x7629 }, { 0xB4F2, 0x6253 }, { 0xB4F3, 0x5927 }, { 0xB4F4, 0x5446 }, { 0xB4F5, 0x6B79 },
+	{ 0xB4F6, 0x50A3 }, { 0xB4F7, 0x6234 }, { 0xB4F8, 0x5E26 }, { 0xB4F9, 0x6B86 }, { 0xB4FA, 0x4EE3 }, { 0xB4FB, 0x8D37 }, { 0xB4FC, 0x888B }, { 0xB4FD, 0x5F85 },
+	{ 0xB4FE, 0x902E }, { 0xB5A1, 0x6020 }, { 0xB5A2, 0x803D }, { 0xB5A3, 0x62C5 }, { 0xB5A4, 0x4E39 }, { 0xB5A5, 0x5355 }, { 0xB5A6, 0x90F8 }, { 0xB5A7, 0x63B8 },
+	{ 0xB5A8, 0x80C6 }, { 0xB5A9, 0x65E6 }, { 0xB5AA, 0x6C2E }, { 0xB5AB, 0x4F46 }, { 0xB5AC, 0x60EE }, { 0xB5AD, 0x6DE1 }, { 0xB5AE, 0x8BDE }, { 0xB5AF, 0x5F39 },
+	{ 0xB5B0, 0x86CB }, { 0xB5B1, 0x5F53 }, { 0xB5B2, 0x6321 }, { 0xB5B3, 0x515A }, { 0xB5B4, 0x8361 }, { 0xB5B5, 0x6863 }, { 0xB5B6, 0x5200 }, { 0xB5B7, 0x6363 },
+	{ 0xB5B8, 0x8E48 }, { 0xB5B9, 0x5012 }, { 0xB5BA, 0x5C9B }, { 0xB5BB, 0x7977 }, { 0xB5BC, 0x5BFC }, { 0xB5BD, 0x5230 }, { 0xB5BE, 0x7A3B }, { 0xB5BF, 0x60BC },
+	{ 0xB5C0, 0x9053 }, { 0xB5C1, 0x76D7 }, { 0xB5C2, 0x5FB7 }, { 0xB5C3, 0x5F97 }, { 0xB5C4, 0x7684 }, { 0xB5C5, 0x8E6C }, { 0xB5C6, 0x706F }, { 0xB5C7, 0x767B },
+	{ 0xB5C8, 0x7B49 }, { 0xB5C9, 0x77AA }, { 0xB5CA, 0x51F3 }, { 0xB5CB, 0x9093 }, { 0xB5CC, 0x5824 }, { 0xB5CD, 0x4F4E }, { 0xB5CE, 0x6EF4 }, { 0xB5CF, 0x8FEA },
+	{ 0xB5D0, 0x654C }, { 0xB5D1, 0x7B1B }, { 0xB5D2, 0x72C4 }, { 0xB5D3, 0x6DA4 }, { 0xB5D4, 0x7FDF }, { 0xB5D5, 0x5AE1 }, { 0xB5D6, 0x62B5 }, { 0xB5D7, 0x5E95 },
+	{ 0xB5D8, 0x5730 }, { 0xB5D9, 0x8482 }, { 0xB5DA, 0x7B2C }, { 0xB5DB, 0x5E1D }, { 0xB5DC, 0x5F1F }, { 0xB5DD, 0x9012 }, { 0xB5DE, 0x7F14 }, { 0xB5DF, 0x98A0 },
+	{ 0xB5E0, 0x6382 }, { 0xB5E1, 0x6EC7 }, { 0xB5E2, 0x7898 }, { 0xB5E3, 0x70B9 }, { 0xB5E4, 0x5178 }, { 0xB5E5, 0x975B }, { 0xB5E6, 0x57AB }, { 0xB5E7, 0x7535 },
+	{ 0xB5E8, 0x4F43 }, { 0xB5E9, 0x7538 }, { 0xB5EA, 0x5E97 }, { 0xB5EB, 0x60E6 }, { 0xB5EC, 0x5960 }, { 0xB5ED, 0x6DC0 }, { 0xB5EE, 0x6BBF }, { 0xB5EF, 0x7889 },
+	{ 0xB5F0, 0x53FC }, { 0xB5F1, 0x96D5 }, { 0xB5F2, 0x51CB }, { 0xB5F3, 0x5201 }, { 0xB5F4, 0x6389 }, { 0xB5F5, 0x540A }, { 0xB5F6, 0x9493 }, { 0xB5F7, 0x8C03 },
+	{ 0xB5F8, 0x8DCC }, { 0xB5F9, 0x7239 }, { 0xB5FA, 0x789F }, { 0xB5FB, 0x8776 }, { 0xB5FC, 0x8FED }, { 0xB5FD, 0x8C0D }, { 0xB5FE, 0x53E0 }, { 0xB6A1, 0x4E01 },
+	{ 0xB6A2, 0x76EF }, { 0xB6A3, 0x53EE }, { 0xB6A4, 0x9489 }, { 0xB6A5, 0x9876 }, { 0xB6A6, 0x9F0E }, { 0xB6A7, 0x952D }, { 0xB6A8, 0x5B9A }, { 0xB6A9, 0x8BA2 },
+	{ 0xB6AA, 0x4E22 }, { 0xB6AB, 0x4E1C }, { 0xB6AC, 0x51AC }, { 0xB6AD, 0x8463 }, { 0xB6AE, 0x61C2 }, { 0xB6AF, 0x52A8 }, { 0xB6B0, 0x680B }, { 0xB6B1, 0x4F97 },
+	{ 0xB6B2, 0x606B }, { 0xB6B3, 0x51BB }, { 0xB6B4, 0x6D1E }, { 0xB6B5, 0x515C }, { 0xB6B6, 0x6296 }, { 0xB6B7, 0x6597 }, { 0xB6B8, 0x9661 }, { 0xB6B9, 0x8C46 },
+	{ 0xB6BA, 0x9017 }, { 0xB6BB, 0x75D8 }, { 0xB6BC, 0x90FD }, { 0xB6BD, 0x7763 }, { 0xB6BE, 0x6BD2 }, { 0xB6BF, 0x728A }, { 0xB6C0, 0x72EC }, { 0xB6C1, 0x8BFB },
+	{ 0xB6C2, 0x5835 }, { 0xB6C3, 0x7779 }, { 0xB6C4, 0x8D4C }, { 0xB6C5, 0x675C }, { 0xB6C6, 0x9540 }, { 0xB6C7, 0x809A }, { 0xB6C8, 0x5EA6 }, { 0xB6C9, 0x6E21 },
+	{ 0xB6CA, 0x5992 }, { 0xB6CB, 0x7AEF }, { 0xB6CC, 0x77ED }, { 0xB6CD, 0x953B }, { 0xB6CE, 0x6BB5 }, { 0xB6CF, 0x65AD }, { 0xB6D0, 0x7F0E }, { 0xB6D1, 0x5806 },
+	{ 0xB6D2, 0x5151 }, { 0xB6D3, 0x961F }, { 0xB6D4, 0x5BF9 }, { 0xB6D5, 0x58A9 }, { 0xB6D6, 0x5428 }, { 0xB6D7, 0x8E72 }, { 0xB6D8, 0x6566 }, { 0xB6D9, 0x987F },
+	{ 0xB6DA, 0x56E4 }, { 0xB6DB, 0x949D }, { 0xB6DC, 0x76FE }, { 0xB6DD, 0x9041 }, { 0xB6DE, 0x6387 }, { 0xB6DF, 0x54C6 }, { 0xB6E0, 0x591A }, { 0xB6E1, 0x593A },
+	{ 0xB6E2, 0x579B }, { 0xB6E3, 0x8EB2 }, { 0xB6E4, 0x6735 }, { 0xB6E5, 0x8DFA }, { 0xB6E6, 0x8235 }, { 0xB6E7, 0x5241 }, { 0xB6E8, 0x60F0 }, { 0xB6E9, 0x5815 },
+	{ 0xB6EA, 0x86FE }, { 0xB6EB, 0x5CE8 }, { 0xB6EC, 0x9E45 }, { 0xB6ED, 0x4FC4 }, { 0xB6EE, 0x989D }, { 0xB6EF, 0x8BB9 }, { 0xB6F0, 0x5A25 }, { 0xB6F1, 0x6076 },
+	{ 0xB6F2, 0x5384 }, { 0xB6F3, 0x627C }, { 0xB6F4, 0x904F }, { 0xB6F5, 0x9102 }, { 0xB6F6, 0x997F }, { 0xB6F7, 0x6069 }, { 0xB6F8, 0x800C }, { 0xB6F9, 0x513F },
+	{ 0xB6FA, 0x8033 }, { 0xB6FB, 0x5C14 }, { 0xB6FC, 0x9975 }, { 0xB6FD, 0x6D31 }, { 0xB6FE, 0x4E8C }, { 0xB7A1, 0x8D30 }, { 0xB7A2, 0x53D1 }, { 0xB7A3, 0x7F5A },
+	{ 0xB7A4, 0x7B4F }, { 0xB7A5, 0x4F10 }, { 0xB7A6, 0x4E4F }, { 0xB7A7, 0x9600 }, { 0xB7A8, 0x6CD5 }, { 0xB7A9, 0x73D0 }, { 0xB7AA, 0x85E9 }, { 0xB7AB, 0x5E06 },
+	{ 0xB7AC, 0x756A }, { 0xB7AD, 0x7FFB }, { 0xB7AE, 0x6A0A }, { 0xB7AF, 0x77FE }, { 0xB7B0, 0x9492 }, { 0xB7B1, 0x7E41 }, { 0xB7B2, 0x51E1 }, { 0xB7B3, 0x70E6 },
+	{ 0xB7B4, 0x53CD }, { 0xB7B5, 0x8FD4 }, { 0xB7B6, 0x8303 }, { 0xB7B7, 0x8D29 }, { 0xB7B8, 0x72AF }, { 0xB7B9, 0x996D }, { 0xB7BA, 0x6CDB }, { 0xB7BB, 0x574A },
+	{ 0xB7BC, 0x82B3 }, { 0xB7BD, 0x65B9 }, { 0xB7BE, 0x80AA }, { 0xB7BF, 0x623F }, { 0xB7C0, 0x9632 }, { 0xB7C1, 0x59A8 }, { 0xB7C2, 0x4EFF }, { 0xB7C3, 0x8BBF },
+	{ 0xB7C4, 0x7EBA }, { 0xB7C5, 0x653E }, { 0xB7C6, 0x83F2 }, { 0xB7C7, 0x975E }, { 0xB7C8, 0x5561 }, { 0xB7C9, 0x98DE }, { 0xB7CA, 0x80A5 }, { 0xB7CB, 0x532A },
+	{ 0xB7CC, 0x8BFD }, { 0xB7CD, 0x5420 }, { 0xB7CE, 0x80BA }, { 0xB7CF, 0x5E9F }, { 0xB7D0, 0x6CB8 }, { 0xB7D1, 0x8D39 }, { 0xB7D2, 0x82AC }, { 0xB7D3, 0x915A },
+	{ 0xB7D4, 0x5429 }, { 0xB7D5, 0x6C1B }, { 0xB7D6, 0x5206 }, { 0xB7D7, 0x7EB7 }, { 0xB7D8, 0x575F }, { 0xB7D9, 0x711A }, { 0xB7DA, 0x6C7E }, { 0xB7DB, 0x7C89 },
+	{ 0xB7DC, 0x594B }, { 0xB7DD, 0x4EFD }, { 0xB7DE, 0x5FFF }, { 0xB7DF, 0x6124 }, { 0xB7E0, 0x7CAA }, { 0xB7E1, 0x4E30 }, { 0xB7E2, 0x5C01 }, { 0xB7E3, 0x67AB },
+	{ 0xB7E4, 0x8702 }, { 0xB7E5, 0x5CF0 }, { 0xB7E6, 0x950B }, { 0xB7E7, 0x98CE }, { 0xB7E8, 0x75AF }, { 0xB7E9, 0x70FD }, { 0xB7EA, 0x9022 }, { 0xB7EB, 0x51AF },
+	{ 0xB7EC, 0x7F1D }, { 0xB7ED, 0x8BBD }, { 0xB7EE, 0x5949 }, { 0xB7EF, 0x51E4 }, { 0xB7F0, 0x4F5B }, { 0xB7F1, 0x5426 }, { 0xB7F2, 0x592B }, { 0xB7F3, 0x6577 },
+	{ 0xB7F4, 0x80A4 }, { 0xB7F5, 0x5B75 }, { 0xB7F6, 0x6276 }, { 0xB7F7, 0x62C2 }, { 0xB7F8, 0x8F90 }, { 0xB7F9, 0x5E45 }, { 0xB7FA, 0x6C1F }, { 0xB7FB, 0x7B26 },
+	{ 0xB7FC, 0x4F0F }, { 0xB7FD, 0x4FD8 }, { 0xB7FE, 0x670D }, { 0xB8A1, 0x6D6E }, { 0xB8A2, 0x6DAA }, { 0xB8A3, 0x798F }, { 0xB8A4, 0x88B1 }, { 0xB8A5, 0x5F17 },
+	{ 0xB8A6, 0x752B }, { 0xB8A7, 0x629A }, { 0xB8A8, 0x8F85 }, { 0xB8A9, 0x4FEF }, { 0xB8AA, 0x91DC }, { 0xB8AB, 0x65A7 }, { 0xB8AC, 0x812F }, { 0xB8AD, 0x8151 },
+	{ 0xB8AE, 0x5E9C }, { 0xB8AF, 0x8150 }, { 0xB8B0, 0x8D74 }, { 0xB8B1, 0x526F }, { 0xB8B2, 0x8986 }, { 0xB8B3, 0x8D4B }, { 0xB8B4, 0x590D }, { 0xB8B5, 0x5085 },
+	{ 0xB8B6, 0x4ED8 }, { 0xB8B7, 0x961C }, { 0xB8B8, 0x7236 }, { 0xB8B9, 0x8179 }, { 0xB8BA, 0x8D1F }, { 0xB8BB, 0x5BCC }, { 0xB8BC, 0x8BA3 }, { 0xB8BD, 0x9644 },
+	{ 0xB8BE, 0x5987 }, { 0xB8BF, 0x7F1A }, { 0xB8C0, 0x5490 }, { 0xB8C1, 0x5676 }, { 0xB8C2, 0x560E }, { 0xB8C3, 0x8BE5 }, { 0xB8C4, 0x6539 }, { 0xB8C5, 0x6982 },
+	{ 0xB8C6, 0x9499 }, { 0xB8C7, 0x76D6 }, { 0xB8C8, 0x6E89 }, { 0xB8C9, 0x5E72 }, { 0xB8CA, 0x7518 }, { 0xB8CB, 0x6746 }, { 0xB8CC, 0x67D1 }, { 0xB8CD, 0x7AFF },
+	{ 0xB8CE, 0x809D }, { 0xB8CF, 0x8D76 }, { 0xB8D0, 0x611F }, { 0xB8D1, 0x79C6 }, { 0xB8D2, 0x6562 }, { 0xB8D3, 0x8D63 }, { 0xB8D4, 0x5188 }, { 0xB8D5, 0x521A },
+	{ 0xB8D6, 0x94A2 }, { 0xB8D7, 0x7F38 }, { 0xB8D8, 0x809B }, { 0xB8D9, 0x7EB2 }, { 0xB8DA, 0x5C97 }, { 0xB8DB, 0x6E2F }, { 0xB8DC, 0x6760 }, { 0xB8DD, 0x7BD9 },
+	{ 0xB8DE, 0x768B }, { 0xB8DF, 0x9AD8 }, { 0xB8E0, 0x818F }, { 0xB8E1, 0x7F94 }, { 0xB8E2, 0x7CD5 }, { 0xB8E3, 0x641E }, { 0xB8E4, 0x9550 }, { 0xB8E5, 0x7A3F },
+	{ 0xB8E6, 0x544A }, { 0xB8E7, 0x54E5 }, { 0xB8E8, 0x6B4C }, { 0xB8E9, 0x6401 }, { 0xB8EA, 0x6208 }, { 0xB8EB, 0x9E3D }, { 0xB8EC, 0x80F3 }, { 0xB8ED, 0x7599 },
+	{ 0xB8EE, 0x5272 }, { 0xB8EF, 0x9769 }, { 0xB8F0, 0x845B }, { 0xB8F1, 0x683C }, { 0xB8F2, 0x86E4 }, { 0xB8F3, 0x9601 }, { 0xB8F4, 0x9694 }, { 0xB8F5, 0x94EC },
+	{ 0xB8F6, 0x4E2A }, { 0xB8F7, 0x5404 }, { 0xB8F8, 0x7ED9 }, { 0xB8F9, 0x6839 }, { 0xB8FA, 0x8DDF }, { 0xB8FB, 0x8015 }, { 0xB8FC, 0x66F4 }, { 0xB8FD, 0x5E9A },
+	{ 0xB8FE, 0x7FB9 }, { 0xB9A1, 0x57C2 }, { 0xB9A2, 0x803F }, { 0xB9A3, 0x6897 }, { 0xB9A4, 0x5DE5 }, { 0xB9A5, 0x653B }, { 0xB9A6, 0x529F }, { 0xB9A7, 0x606D },
+	{ 0xB9A8, 0x9F9A }, { 0xB9A9, 0x4F9B }, { 0xB9AA, 0x8EAC }, { 0xB9AB, 0x516C }, { 0xB9AC, 0x5BAB }, { 0xB9AD, 0x5F13 }, { 0xB9AE, 0x5DE9 }, { 0xB9AF, 0x6C5E },
+	{ 0xB9B0, 0x62F1 }, { 0xB9B1, 0x8D21 }, { 0xB9B2, 0x5171 }, { 0xB9B3, 0x94A9 }, { 0xB9B4, 0x52FE }, { 0xB9B5, 0x6C9F }, { 0xB9B6, 0x82DF }, { 0xB9B7, 0x72D7 },
+	{ 0xB9B8, 0x57A2 }, { 0xB9B9, 0x6784 }, { 0xB9BA, 0x8D2D }, { 0xB9BB, 0x591F }, { 0xB9BC, 0x8F9C }, { 0xB9BD, 0x83C7 }, { 0xB9BE, 0x5495 }, { 0xB9BF, 0x7B8D },
+	{ 0xB9C0, 0x4F30 }, { 0xB9C1, 0x6CBD }, { 0xB9C2, 0x5B64 }, { 0xB9C3, 0x59D1 }, { 0xB9C4, 0x9F13 }, { 0xB9C5, 0x53E4 }, { 0xB9C6, 0x86CA }, { 0xB9C7, 0x9AA8 },
+	{ 0xB9C8, 0x8C37 }, { 0xB9C9, 0x80A1 }, { 0xB9CA, 0x6545 }, { 0xB9CB, 0x987E }, { 0xB9CC, 0x56FA }, { 0xB9CD, 0x96C7 }, { 0xB9CE, 0x522E }, { 0xB9CF, 0x74DC },
+	{ 0xB9D0, 0x5250 }, { 0xB9D1, 0x5BE1 }, { 0xB9D2, 0x6302 }, { 0xB9D3, 0x8902 }, { 0xB9D4, 0x4E56 }, { 0xB9D5, 0x62D0 }, { 0xB9D6, 0x602A }, { 0xB9D7, 0x68FA },
+	{ 0xB9D8, 0x5173 }, { 0xB9D9, 0x5B98 }, { 0xB9DA, 0x51A0 }, { 0xB9DB, 0x89C2 }, { 0xB9DC, 0x7BA1 }, { 0xB9DD, 0x9986 }, { 0xB9DE, 0x7F50 }, { 0xB9DF, 0x60EF },
+	{ 0xB9E0, 0x704C }, { 0xB9E1, 0x8D2F }, { 0xB9E2, 0x5149 }, { 0xB9E3, 0x5E7F }, { 0xB9E4, 0x901B }, { 0xB9E5, 0x7470 }, { 0xB9E6, 0x89C4 }, { 0xB9E7, 0x572D },
+	{ 0xB9E8, 0x7845 }, { 0xB9E9, 0x5F52 }, { 0xB9EA, 0x9F9F }, { 0xB9EB, 0x95FA }, { 0xB9EC, 0x8F68 }, { 0xB9ED, 0x9B3C }, { 0xB9EE, 0x8BE1 }, { 0xB9EF, 0x7678 },
+	{ 0xB9F0, 0x6842 }, { 0xB9F1, 0x67DC }, { 0xB9F2, 0x8DEA }, { 0xB9F3, 0x8D35 }, { 0xB9F4, 0x523D }, { 0xB9F5, 0x8F8A }, { 0xB9F6, 0x6EDA }, { 0xB9F7, 0x68CD },
+	{ 0xB9F8, 0x9505 }, { 0xB9F9, 0x90ED }, { 0xB9FA, 0x56FD }, { 0xB9FB, 0x679C }, { 0xB9FC, 0x88F9 }, { 0xB9FD, 0x8FC7 }, { 0xB9FE, 0x54C8 }, { 0xBAA1, 0x9AB8 },
+	{ 0xBAA2, 0x5B69 }, { 0xBAA3, 0x6D77 }, { 0xBAA4, 0x6C26 }, { 0xBAA5, 0x4EA5 }, { 0xBAA6, 0x5BB3 }, { 0xBAA7, 0x9A87 }, { 0xBAA8, 0x9163 }, { 0xBAA9, 0x61A8 },
+	{ 0xBAAA, 0x90AF }, { 0xBAAB, 0x97E9 }, { 0xBAAC, 0x542B }, { 0xBAAD, 0x6DB5 }, { 0xBAAE, 0x5BD2 }, { 0xBAAF, 0x51FD }, { 0xBAB0, 0x558A }, { 0xBAB1, 0x7F55 },
+	{ 0xBAB2, 0x7FF0 }, { 0xBAB3, 0x64BC }, { 0xBAB4, 0x634D }, { 0xBAB5, 0x65F1 }, { 0xBAB6, 0x61BE }, { 0xBAB7, 0x608D }, { 0xBAB8, 0x710A }, { 0xBAB9, 0x6C57 },
+	{ 0xBABA, 0x6C49 }, { 0xBABB, 0x592F }, { 0xBABC, 0x676D }, { 0xBABD, 0x822A }, { 0xBABE, 0x58D5 }, { 0xBABF, 0x568E }, { 0xBAC0, 0x8C6A }, { 0xBAC1, 0x6BEB },
+	{ 0xBAC2, 0x90DD }, { 0xBAC3, 0x597D }, { 0xBAC4, 0x8017 }, { 0xBAC5, 0x53F7 }, { 0xBAC6, 0x6D69 }, { 0xBAC7, 0x5475 }, { 0xBAC8, 0x559D }, { 0xBAC9, 0x8377 },
+	{ 0xBACA, 0x83CF }, { 0xBACB, 0x6838 }, { 0xBACC, 0x79BE }, { 0xBACD, 0x548C }, { 0xBACE, 0x4F55 }, { 0xBACF, 0x5408 }, { 0xBAD0, 0x76D2 }, { 0xBAD1, 0x8C89 },
+	{ 0xBAD2, 0x9602 }, { 0xBAD3, 0x6CB3 }, { 0xBAD4, 0x6DB8 }, { 0xBAD5, 0x8D6B }, { 0xBAD6, 0x8910 }, { 0xBAD7, 0x9E64 }, { 0xBAD8, 0x8D3A }, { 0xBAD9, 0x563F },
+	{ 0xBADA, 0x9ED1 }, { 0xBADB, 0x75D5 }, { 0xBADC, 0x5F88 }, { 0xBADD, 0x72E0 }, { 0xBADE, 0x6068 }, { 0xBADF, 0x54FC }, { 0xBAE0, 0x4EA8 }, { 0xBAE1, 0x6A2A },
+	{ 0xBAE2, 0x8861 }, { 0xBAE3, 0x6052 }, { 0xBAE4, 0x8F70 }, { 0xBAE5, 0x54C4 }, { 0xBAE6, 0x70D8 }, { 0xBAE7, 0x8679 }, { 0xBAE8, 0x9E3F }, { 0xBAE9, 0x6D2A },
+	{ 0xBAEA, 0x5B8F }, { 0xBAEB, 0x5F18 }, { 0xBAEC, 0x7EA2 }, { 0xBAED, 0x5589 }, { 0xBAEE, 0x4FAF }, { 0xBAEF, 0x7334 }, { 0xBAF0, 0x543C }, { 0xBAF1, 0x539A },
+	{ 0xBAF2, 0x5019 }, { 0xBAF3, 0x540E }, { 0xBAF4, 0x547C }, { 0xBAF5, 0x4E4E }, { 0xBAF6, 0x5FFD }, { 0xBAF7, 0x745A }, { 0xBAF8, 0x58F6 }, { 0xBAF9, 0x846B },
+	{ 0xBAFA, 0x80E1 }, { 0xBAFB, 0x8774 }, { 0xBAFC, 0x72D0 }, { 0xBAFD, 0x7CCA }, { 0xBAFE, 0x6E56 }, { 0xBBA1, 0x5F27 }, { 0xBBA2, 0x864E }, { 0xBBA3, 0x552C },
+	{ 0xBBA4, 0x62A4 }, { 0xBBA5, 0x4E92 }, { 0xBBA6, 0x6CAA }, { 0xBBA7, 0x6237 }, { 0xBBA8, 0x82B1 }, { 0xBBA9, 0x54D7 }, { 0xBBAA, 0x534E }, { 0xBBAB, 0x733E },
+	{ 0xBBAC, 0x6ED1 }, { 0xBBAD, 0x753B }, { 0xBBAE, 0x5212 }, { 0xBBAF, 0x5316 }, { 0xBBB0, 0x8BDD }, { 0xBBB1, 0x69D0 }, { 0xBBB2, 0x5F8A }, { 0xBBB3, 0x6000 },
+	{ 0xBBB4, 0x6DEE }, { 0xBBB5, 0x574F }, { 0xBBB6, 0x6B22 }, { 0xBBB7, 0x73AF }, { 0xBBB8, 0x6853 }, { 0xBBB9, 0x8FD8 }, { 0xBBBA, 0x7F13 }, { 0xBBBB, 0x6362 },
+	{ 0xBBBC, 0x60A3 }, { 0xBBBD, 0x5524 }, { 0xBBBE, 0x75EA }, { 0xBBBF, 0x8C62 }, { 0xBBC0, 0x7115 }, { 0xBBC1, 0x6DA3 }, { 0xBBC2, 0x5BA6 }, { 0xBBC3, 0x5E7B },
+	{ 0xBBC4, 0x8352 }, { 0xBBC5, 0x614C }, { 0xBBC6, 0x9EC4 }, { 0xBBC7, 0x78FA }, { 0xBBC8, 0x8757 }, { 0xBBC9, 0x7C27 }, { 0xBBCA, 0x7687 }, { 0xBBCB, 0x51F0 },
+	{ 0xBBCC, 0x60F6 }, { 0xBBCD, 0x714C }, { 0xBBCE, 0x6643 }, { 0xBBCF, 0x5E4C }, { 0xBBD0, 0x604D }, { 0xBBD1, 0x8C0E }, { 0xBBD2, 0x7070 }, { 0xBBD3, 0x6325 },
+	{ 0xBBD4, 0x8F89 }, { 0xBBD5, 0x5FBD }, { 0xBBD6, 0x6062 }, { 0xBBD7, 0x86D4 }, { 0xBBD8, 0x56DE }, { 0xBBD9, 0x6BC1 }, { 0xBBDA, 0x6094 }, { 0xBBDB, 0x6167 },
+	{ 0xBBDC, 0x5349 }, { 0xBBDD, 0x60E0 }, { 0xBBDE, 0x6666 }, { 0xBBDF, 0x8D3F }, { 0xBBE0, 0x79FD }, { 0xBBE1, 0x4F1A }, { 0xBBE2, 0x70E9 }, { 0xBBE3, 0x6C47 },
+	{ 0xBBE4, 0x8BB3 }, { 0xBBE5, 0x8BF2 }, { 0xBBE6, 0x7ED8 }, { 0xBBE7, 0x8364 }, { 0xBBE8, 0x660F }, { 0xBBE9, 0x5A5A }, { 0xBBEA, 0x9B42 }, { 0xBBEB, 0x6D51 },
+	{ 0xBBEC, 0x6DF7 }, { 0xBBED, 0x8C41 }, { 0xBBEE, 0x6D3B }, { 0xBBEF, 0x4F19 }, { 0xBBF0, 0x706B }, { 0xBBF1, 0x83B7 }, { 0xBBF2, 0x6216 }, { 0xBBF3, 0x60D1 },
+	{ 0xBBF4, 0x970D }, { 0xBBF5, 0x8D27 }, { 0xBBF6, 0x7978 }, { 0xBBF7, 0x51FB }, { 0xBBF8, 0x573E }, { 0xBBF9, 0x57FA }, { 0xBBFA, 0x673A }, { 0xBBFB, 0x7578 },
+	{ 0xBBFC, 0x7A3D }, { 0xBBFD, 0x79EF }, { 0xBBFE, 0x7B95 }, { 0xBCA1, 0x808C }, { 0xBCA2, 0x9965 }, { 0xBCA3, 0x8FF9 }, { 0xBCA4, 0x6FC0 }, { 0xBCA5, 0x8BA5 },
+	{ 0xBCA6, 0x9E21 }, { 0xBCA7, 0x59EC }, { 0xBCA8, 0x7EE9 }, { 0xBCA9, 0x7F09 }, { 0xBCAA, 0x5409 }, { 0xBCAB, 0x6781 }, { 0xBCAC, 0x68D8 }, { 0xBCAD, 0x8F91 },
+	{ 0xBCAE, 0x7C4D }, { 0xBCAF, 0x96C6 }, { 0xBCB0, 0x53CA }, { 0xBCB1, 0x6025 }, { 0xBCB2, 0x75BE }, { 0xBCB3, 0x6C72 }, { 0xBCB4, 0x5373 }, { 0xBCB5, 0x5AC9 },
+	{ 0xBCB6, 0x7EA7 }, { 0xBCB7, 0x6324 }, { 0xBCB8, 0x51E0 }, { 0xBCB9, 0x810A }, { 0xBCBA, 0x5DF1 }, { 0xBCBB, 0x84DF }, { 0xBCBC, 0x6280 }, { 0xBCBD, 0x5180 },
+	{ 0xBCBE, 0x5B63 }, { 0xBCBF, 0x4F0E }, { 0xBCC0, 0x796D }, { 0xBCC1, 0x5242 }, { 0xBCC2, 0x60B8 }, { 0xBCC3, 0x6D4E }, { 0xBCC4, 0x5BC4 }, { 0xBCC5, 0x5BC2 },
+	{ 0xBCC6, 0x8BA1 }, { 0xBCC7, 0x8BB0 }, { 0xBCC8, 0x65E2 }, { 0xBCC9, 0x5FCC }, { 0xBCCA, 0x9645 }, { 0xBCCB, 0x5993 }, { 0xBCCC, 0x7EE7 }, { 0xBCCD, 0x7EAA },
+	{ 0xBCCE, 0x5609 }, { 0xBCCF, 0x67B7 }, { 0xBCD0, 0x5939 }, { 0xBCD1, 0x4F73 }, { 0xBCD2, 0x5BB6 }, { 0xBCD3, 0x52A0 }, { 0xBCD4, 0x835A }, { 0xBCD5, 0x988A },
+	{ 0xBCD6, 0x8D3E }, { 0xBCD7, 0x7532 }, { 0xBCD8, 0x94BE }, { 0xBCD9, 0x5047 }, { 0xBCDA, 0x7A3C }, { 0xBCDB, 0x4EF7 }, { 0xBCDC, 0x67B6 }, { 0xBCDD, 0x9A7E },
+	{ 0xBCDE, 0x5AC1 }, { 0xBCDF, 0x6B7C }, { 0xBCE0, 0x76D1 }, { 0xBCE1, 0x575A }, { 0xBCE2, 0x5C16 }, { 0xBCE3, 0x7B3A }, { 0xBCE4, 0x95F4 }, { 0xBCE5, 0x714E },
+	{ 0xBCE6, 0x517C }, { 0xBCE7, 0x80A9 }, { 0xBCE8, 0x8270 }, { 0xBCE9, 0x5978 }, { 0xBCEA, 0x7F04 }, { 0xBCEB, 0x8327 }, { 0xBCEC, 0x68C0 }, { 0xBCED, 0x67EC },
+	{ 0xBCEE, 0x78B1 }, { 0xBCEF, 0x7877 }, { 0xBCF0, 0x62E3 }, { 0xBCF1, 0x6361 }, { 0xBCF2, 0x7B80 }, { 0xBCF3, 0x4FED }, { 0xBCF4, 0x526A }, { 0xBCF5, 0x51CF },
+	{ 0xBCF6, 0x8350 }, { 0xBCF7, 0x69DB }, { 0xBCF8, 0x9274 }, { 0xBCF9, 0x8DF5 }, { 0xBCFA, 0x8D31 }, { 0xBCFB, 0x89C1 }, { 0xBCFC, 0x952E }, { 0xBCFD, 0x7BAD },
+	{ 0xBCFE, 0x4EF6 }, { 0xBDA1, 0x5065 }, { 0xBDA2, 0x8230 }, { 0xBDA3, 0x5251 }, { 0xBDA4, 0x996F }, { 0xBDA5, 0x6E10 }, { 0xBDA6, 0x6E85 }, { 0xBDA7, 0x6DA7 },
+	{ 0xBDA8, 0x5EFA }, { 0xBDA9, 0x50F5 }, { 0xBDAA, 0x59DC }, { 0xBDAB, 0x5C06 }, { 0xBDAC, 0x6D46 }, { 0xBDAD, 0x6C5F }, { 0xBDAE, 0x7586 }, { 0xBDAF, 0x848B },
+	{ 0xBDB0, 0x6868 }, { 0xBDB1, 0x5956 }, { 0xBDB2, 0x8BB2 }, { 0xBDB3, 0x5320 }, { 0xBDB4, 0x9171 }, { 0xBDB5, 0x964D }, { 0xBDB6, 0x8549 }, { 0xBDB7, 0x6912 },
+	{ 0xBDB8, 0x7901 }, { 0xBDB9, 0x7126 }, { 0xBDBA, 0x80F6 }, { 0xBDBB, 0x4EA4 }, { 0xBDBC, 0x90CA }, { 0xBDBD, 0x6D47 }, { 0xBDBE, 0x9A84 }, { 0xBDBF, 0x5A07 },
+	{ 0xBDC0, 0x56BC }, { 0xBDC1, 0x6405 }, { 0xBDC2, 0x94F0 }, { 0xBDC3, 0x77EB }, { 0xBDC4, 0x4FA5 }, { 0xBDC5, 0x811A }, { 0xBDC6, 0x72E1 }, { 0xBDC7, 0x89D2 },
+	{ 0xBDC8, 0x997A }, { 0xBDC9, 0x7F34 }, { 0xBDCA, 0x7EDE }, { 0xBDCB, 0x527F }, { 0xBDCC, 0x6559 }, { 0xBDCD, 0x9175 }, { 0xBDCE, 0x8F7F }, { 0xBDCF, 0x8F83 },
+	{ 0xBDD0, 0x53EB }, { 0xBDD1, 0x7A96 }, { 0xBDD2, 0x63ED }, { 0xBDD3, 0x63A5 }, { 0xBDD4, 0x7686 }, { 0xBDD5, 0x79F8 }, { 0xBDD6, 0x8857 }, { 0xBDD7, 0x9636 },
+	{ 0xBDD8, 0x622A }, { 0xBDD9, 0x52AB }, { 0xBDDA, 0x8282 }, { 0xBDDB, 0x6854 }, { 0xBDDC, 0x6770 }, { 0xBDDD, 0x6377 }, { 0xBDDE, 0x776B }, { 0xBDDF, 0x7AED },
+	{ 0xBDE0, 0x6D01 }, { 0xBDE1, 0x7ED3 }, { 0xBDE2, 0x89E3 }, { 0xBDE3, 0x59D0 }, { 0xBDE4, 0x6212 }, { 0xBDE5, 0x85C9 }, { 0xBDE6, 0x82A5 }, { 0xBDE7, 0x754C },
+	{ 0xBDE8, 0x501F }, { 0xBDE9, 0x4ECB }, { 0xBDEA, 0x75A5 }, { 0xBDEB, 0x8BEB }, { 0xBDEC, 0x5C4A }, { 0xBDED, 0x5DFE }, { 0xBDEE, 0x7B4B }, { 0xBDEF, 0x65A4 },
+	{ 0xBDF0, 0x91D1 }, { 0xBDF1, 0x4ECA }, { 0xBDF2, 0x6D25 }, { 0xBDF3, 0x895F }, { 0xBDF4, 0x7D27 }, { 0xBDF5, 0x9526 }, { 0xBDF6, 0x4EC5 }, { 0xBDF7, 0x8C28 },
+	{ 0xBDF8, 0x8FDB }, { 0xBDF9, 0x9773 }, { 0xBDFA, 0x664B }, { 0xBDFB, 0x7981 }, { 0xBDFC, 0x8FD1 }, { 0xBDFD, 0x70EC }, { 0xBDFE, 0x6D78 }, { 0xBEA1, 0x5C3D },
+	{ 0xBEA2, 0x52B2 }, { 0xBEA3, 0x8346 }, { 0xBEA4, 0x5162 }, { 0xBEA5, 0x830E }, { 0xBEA6, 0x775B }, { 0xBEA7, 0x6676 }, { 0xBEA8, 0x9CB8 }, { 0xBEA9, 0x4EAC },
+	{ 0xBEAA, 0x60CA }, { 0xBEAB, 0x7CBE }, { 0xBEAC, 0x7CB3 }, { 0xBEAD, 0x7ECF }, { 0xBEAE, 0x4E95 }, { 0xBEAF, 0x8B66 }, { 0xBEB0, 0x666F }, { 0xBEB1, 0x9888 },
+	{ 0xBEB2, 0x9759 }, { 0xBEB3, 0x5883 }, { 0xBEB4, 0x656C }, { 0xBEB5, 0x955C }, { 0xBEB6, 0x5F84 }, { 0xBEB7, 0x75C9 }, { 0xBEB8, 0x9756 }, { 0xBEB9, 0x7ADF },
+	{ 0xBEBA, 0x7ADE }, { 0xBEBB, 0x51C0 }, { 0xBEBC, 0x70AF }, { 0xBEBD, 0x7A98 }, { 0xBEBE, 0x63EA }, { 0xBEBF, 0x7A76 }, { 0xBEC0, 0x7EA0 }, { 0xBEC1, 0x7396 },
+	{ 0xBEC2, 0x97ED }, { 0xBEC3, 0x4E45 }, { 0xBEC4, 0x7078 }, { 0xBEC5, 0x4E5D }, { 0xBEC6, 0x9152 }, { 0xBEC7, 0x53A9 }, { 0xBEC8, 0x6551 }, { 0xBEC9, 0x65E7 },
+	{ 0xBECA, 0x81FC }, { 0xBECB, 0x8205 }, { 0xBECC, 0x548E }, { 0xBECD, 0x5C31 }, { 0xBECE, 0x759A }, { 0xBECF, 0x97A0 }, { 0xBED0, 0x62D8 }, { 0xBED1, 0x72D9 },
+	{ 0xBED2, 0x75BD }, { 0xBED3, 0x5C45 }, { 0xBED4, 0x9A79 }, { 0xBED5, 0x83CA }, { 0xBED6, 0x5C40 }, { 0xBED7, 0x5480 }, { 0xBED8, 0x77E9 }, { 0xBED9, 0x4E3E },
+	{ 0xBEDA, 0x6CAE }, { 0xBEDB, 0x805A }, { 0xBEDC, 0x62D2 }, { 0xBEDD, 0x636E }, { 0xBEDE, 0x5DE8 }, { 0xBEDF, 0x5177 }, { 0xBEE0, 0x8DDD }, { 0xBEE1, 0x8E1E },
+	{ 0xBEE2, 0x952F }, { 0xBEE3, 0x4FF1 }, { 0xBEE4, 0x53E5 }, { 0xBEE5, 0x60E7 }, { 0xBEE6, 0x70AC }, { 0xBEE7, 0x5267 }, { 0xBEE8, 0x6350 }, { 0xBEE9, 0x9E43 },
+	{ 0xBEEA, 0x5A1F }, { 0xBEEB, 0x5026 }, { 0xBEEC, 0x7737 }, { 0xBEED, 0x5377 }, { 0xBEEE, 0x7EE2 }, { 0xBEEF, 0x6485 }, { 0xBEF0, 0x652B }, { 0xBEF1, 0x6289 },
+	{ 0xBEF2, 0x6398 }, { 0xBEF3, 0x5014 }, { 0xBEF4, 0x7235 }, { 0xBEF5, 0x89C9 }, { 0xBEF6, 0x51B3 }, { 0xBEF7, 0x8BC0 }, { 0xBEF8, 0x7EDD }, { 0xBEF9, 0x5747 },
+	{ 0xBEFA, 0x83CC }, { 0xBEFB, 0x94A7 }, { 0xBEFC, 0x519B }, { 0xBEFD, 0x541B }, { 0xBEFE, 0x5CFB }, { 0xBFA1, 0x4FCA }, { 0xBFA2, 0x7AE3 }, { 0xBFA3, 0x6D5A },
+	{ 0xBFA4, 0x90E1 }, { 0xBFA5, 0x9A8F }, { 0xBFA6, 0x5580 }, { 0xBFA7, 0x5496 }, { 0xBFA8, 0x5361 }, { 0xBFA9, 0x54AF }, { 0xBFAA, 0x5F00 }, { 0xBFAB, 0x63E9 },
+	{ 0xBFAC, 0x6977 }, { 0xBFAD, 0x51EF }, { 0xBFAE, 0x6168 }, { 0xBFAF, 0x520A }, { 0xBFB0, 0x582A }, { 0xBFB1, 0x52D8 }, { 0xBFB2, 0x574E }, { 0xBFB3, 0x780D },
+	{ 0xBFB4, 0x770B }, { 0xBFB5, 0x5EB7 }, { 0xBFB6, 0x6177 }, { 0xBFB7, 0x7CE0 }, { 0xBFB8, 0x625B }, { 0xBFB9, 0x6297 }, { 0xBFBA, 0x4EA2 }, { 0xBFBB, 0x7095 },
+	{ 0xBFBC, 0x8003 }, { 0xBFBD, 0x62F7 }, { 0xBFBE, 0x70E4 }, { 0xBFBF, 0x9760 }, { 0xBFC0, 0x5777 }, { 0xBFC1, 0x82DB }, { 0xBFC2, 0x67EF }, { 0xBFC3, 0x68F5 },
+	{ 0xBFC4, 0x78D5 }, { 0xBFC5, 0x9897 }, { 0xBFC6, 0x79D1 }, { 0xBFC7, 0x58F3 }, { 0xBFC8, 0x54B3 }, { 0xBFC9, 0x53EF }, { 0xBFCA, 0x6E34 }, { 0xBFCB, 0x514B },
+	{ 0xBFCC, 0x523B }, { 0xBFCD, 0x5BA2 }, { 0xBFCE, 0x8BFE }, { 0xBFCF, 0x80AF }, { 0xBFD0, 0x5543 }, { 0xBFD1, 0x57A6 }, { 0xBFD2, 0x6073 }, { 0xBFD3, 0x5751 },
+	{ 0xBFD4, 0x542D }, { 0xBFD5, 0x7A7A }, { 0xBFD6, 0x6050 }, { 0xBFD7, 0x5B54 }, { 0xBFD8, 0x63A7 }, { 0xBFD9, 0x62A0 }, { 0xBFDA, 0x53E3 }, { 0xBFDB, 0x6263 },
+	{ 0xBFDC, 0x5BC7 }, { 0xBFDD, 0x67AF }, { 0xBFDE, 0x54ED }, { 0xBFDF, 0x7A9F }, { 0xBFE0, 0x82E6 }, { 0xBFE1, 0x9177 }, { 0xBFE2, 0x5E93 }, { 0xBFE3, 0x88E4 },
+	{ 0xBFE4, 0x5938 }, { 0xBFE5, 0x57AE }, { 0xBFE6, 0x630E }, { 0xBFE7, 0x8DE8 }, { 0xBFE8, 0x80EF }, { 0xBFE9, 0x5757 }, { 0xBFEA, 0x7B77 }, { 0xBFEB, 0x4FA9 },
+	{ 0xBFEC, 0x5FEB }, { 0xBFED, 0x5BBD }, { 0xBFEE, 0x6B3E }, { 0xBFEF, 0x5321 }, { 0xBFF0, 0x7B50 }, { 0xBFF1, 0x72C2 }, { 0xBFF2, 0x6846 }, { 0xBFF3, 0x77FF },
+	{ 0xBFF4, 0x7736 }, { 0xBFF5, 0x65F7 }, { 0xBFF6, 0x51B5 }, { 0xBFF7, 0x4E8F }, { 0xBFF8, 0x76D4 }, { 0xBFF9, 0x5CBF }, { 0xBFFA, 0x7AA5 }, { 0xBFFB, 0x8475 },
+	{ 0xBFFC, 0x594E }, { 0xBFFD, 0x9B41 }, { 0xBFFE, 0x5080 }, { 0xC0A1, 0x9988 }, { 0xC0A2, 0x6127 }, { 0xC0A3, 0x6E83 }, { 0xC0A4, 0x5764 }, { 0xC0A5, 0x6606 },
+	{ 0xC0A6, 0x6346 }, { 0xC0A7, 0x56F0 }, { 0xC0A8, 0x62EC }, { 0xC0A9, 0x6269 }, { 0xC0AA, 0x5ED3 }, { 0xC0AB, 0x9614 }, { 0xC0AC, 0x5783 }, { 0xC0AD, 0x62C9 },
+	{ 0xC0AE, 0x5587 }, { 0xC0AF, 0x8721 }, { 0xC0B0, 0x814A }, { 0xC0B1, 0x8FA3 }, { 0xC0B2, 0x5566 }, { 0xC0B3, 0x83B1 }, { 0xC0B4, 0x6765 }, { 0xC0B5, 0x8D56 },
+	{ 0xC0B6, 0x84DD }, { 0xC0B7, 0x5A6A }, { 0xC0B8, 0x680F }, { 0xC0B9, 0x62E6 }, { 0xC0BA, 0x7BEE }, { 0xC0BB, 0x9611 }, { 0xC0BC, 0x5170 }, { 0xC0BD, 0x6F9C },
+	{ 0xC0BE, 0x8C30 }, { 0xC0BF, 0x63FD }, { 0xC0C0, 0x89C8 }, { 0xC0C1, 0x61D2 }, { 0xC0C2, 0x7F06 }, { 0xC0C3, 0x70C2 }, { 0xC0C4, 0x6EE5 }, { 0xC0C5, 0x7405 },
+	{ 0xC0C6, 0x6994 }, { 0xC0C7, 0x72FC }, { 0xC0C8, 0x5ECA }, { 0xC0C9, 0x90CE }, { 0xC0CA, 0x6717 }, { 0xC0CB, 0x6D6A }, { 0xC0CC, 0x635E }, { 0xC0CD, 0x52B3 },
+	{ 0xC0CE, 0x7262 }, { 0xC0CF, 0x8001 }, { 0xC0D0, 0x4F6C }, { 0xC0D1, 0x59E5 }, { 0xC0D2, 0x916A }, { 0xC0D3, 0x70D9 }, { 0xC0D4, 0x6D9D }, { 0xC0D5, 0x52D2 },
+	{ 0xC0D6, 0x4E50 }, { 0xC0D7, 0x96F7 }, { 0xC0D8, 0x956D }, { 0xC0D9, 0x857E }, { 0xC0DA, 0x78CA }, { 0xC0DB, 0x7D2F }, { 0xC0DC, 0x5121 }, { 0xC0DD, 0x5792 },
+	{ 0xC0DE, 0x64C2 }, { 0xC0DF, 0x808B }, { 0xC0E0, 0x7C7B }, { 0xC0E1, 0x6CEA }, { 0xC0E2, 0x68F1 }, { 0xC0E3, 0x695E }, { 0xC0E4, 0x51B7 }, { 0xC0E5, 0x5398 },
+	{ 0xC0E6, 0x68A8 }, { 0xC0E7, 0x7281 }, { 0xC0E8, 0x9ECE }, { 0xC0E9, 0x7BF1 }, { 0xC0EA, 0x72F8 }, { 0xC0EB, 0x79BB }, { 0xC0EC, 0x6F13 }, { 0xC0ED, 0x7406 },
+	{ 0xC0EE, 0x674E }, { 0xC0EF, 0x91CC }, { 0xC0F0, 0x9CA4 }, { 0xC0F1, 0x793C }, { 0xC0F2, 0x8389 }, { 0xC0F3, 0x8354 }, { 0xC0F4, 0x540F }, { 0xC0F5, 0x6817 },
+	{ 0xC0F6, 0x4E3D }, { 0xC0F7, 0x5389 }, { 0xC0F8, 0x52B1 }, { 0xC0F9, 0x783E }, { 0xC0FA, 0x5386 }, { 0xC0FB, 0x5229 }, { 0xC0FC, 0x5088 }, { 0xC0FD, 0x4F8B },
+	{ 0xC0FE, 0x4FD0 }, { 0xC1A1, 0x75E2 }, { 0xC1A2, 0x7ACB }, { 0xC1A3, 0x7C92 }, { 0xC1A4, 0x6CA5 }, { 0xC1A5, 0x96B6 }, { 0xC1A6, 0x529B }, { 0xC1A7, 0x7483 },
+	{ 0xC1A8, 0x54E9 }, { 0xC1A9, 0x4FE9 }, { 0xC1AA, 0x8054 }, { 0xC1AB, 0x83B2 }, { 0xC1AC, 0x8FDE }, { 0xC1AD, 0x9570 }, { 0xC1AE, 0x5EC9 }, { 0xC1AF, 0x601C },
+	{ 0xC1B0, 0x6D9F }, { 0xC1B1, 0x5E18 }, { 0xC1B2, 0x655B }, { 0xC1B3, 0x8138 }, { 0xC1B4, 0x94FE }, { 0xC1B5, 0x604B }, { 0xC1B6, 0x70BC }, { 0xC1B7, 0x7EC3 },
+	{ 0xC1B8, 0x7CAE }, { 0xC1B9, 0x51C9 }, { 0xC1BA, 0x6881 }, { 0xC1BB, 0x7CB1 }, { 0xC1BC, 0x826F }, { 0xC1BD, 0x4E24 }, { 0xC1BE, 0x8F86 }, { 0xC1BF, 0x91CF },
+	{ 0xC1C0, 0x667E }, { 0xC1C1, 0x4EAE }, { 0xC1C2, 0x8C05 }, { 0xC1C3, 0x64A9 }, { 0xC1C4, 0x804A }, { 0xC1C5, 0x50DA }, { 0xC1C6, 0x7597 }, { 0xC1C7, 0x71CE },
+	{ 0xC1C8, 0x5BE5 }, { 0xC1C9, 0x8FBD }, { 0xC1CA, 0x6F66 }, { 0xC1CB, 0x4E86 }, { 0xC1CC, 0x6482 }, { 0xC1CD, 0x9563 }, { 0xC1CE, 0x5ED6 }, { 0xC1CF, 0x6599 },
+	{ 0xC1D0, 0x5217 }, { 0xC1D1, 0x88C2 }, { 0xC1D2, 0x70C8 }, { 0xC1D3, 0x52A3 }, { 0xC1D4, 0x730E }, { 0xC1D5, 0x7433 }, { 0xC1D6, 0x6797 }, { 0xC1D7, 0x78F7 },
+	{ 0xC1D8, 0x9716 }, { 0xC1D9, 0x4E34 }, { 0xC1DA, 0x90BB }, { 0xC1DB, 0x9CDE }, { 0xC1DC, 0x6DCB }, { 0xC1DD, 0x51DB }, { 0xC1DE, 0x8D41 }, { 0xC1DF, 0x541D },
+	{ 0xC1E0, 0x62CE }, { 0xC1E1, 0x73B2 }, { 0xC1E2, 0x83F1 }, { 0xC1E3, 0x96F6 }, { 0xC1E4, 0x9F84 }, { 0xC1E5, 0x94C3 }, { 0xC1E6, 0x4F36 }, { 0xC1E7, 0x7F9A },
+	{ 0xC1E8, 0x51CC }, { 0xC1E9, 0x7075 }, { 0xC1EA, 0x9675 }, { 0xC1EB, 0x5CAD }, { 0xC1EC, 0x9886 }, { 0xC1ED, 0x53E6 }, { 0xC1EE, 0x4EE4 }, { 0xC1EF, 0x6E9C },
+	{ 0xC1F0, 0x7409 }, { 0xC1F1, 0x69B4 }, { 0xC1F2, 0x786B }, { 0xC1F3, 0x998F }, { 0xC1F4, 0x7559 }, { 0xC1F5, 0x5218 }, { 0xC1F6, 0x7624 }, { 0xC1F7, 0x6D41 },
+	{ 0xC1F8, 0x67F3 }, { 0xC1F9, 0x516D }, { 0xC1FA, 0x9F99 }, { 0xC1FB, 0x804B }, { 0xC1FC, 0x5499 }, { 0xC1FD, 0x7B3C }, { 0xC1FE, 0x7ABF }, { 0xC2A1, 0x9686 },
+	{ 0xC2A2, 0x5784 }, { 0xC2A3, 0x62E2 }, { 0xC2A4, 0x9647 }, { 0xC2A5, 0x697C }, { 0xC2A6, 0x5A04 }, { 0xC2A7, 0x6402 }, { 0xC2A8, 0x7BD3 }, { 0xC2A9, 0x6F0F },
+	{ 0xC2AA, 0x964B }, { 0xC2AB, 0x82A6 }, { 0xC2AC, 0x5362 }, { 0xC2AD, 0x9885 }, { 0xC2AE, 0x5E90 }, { 0xC2AF, 0x7089 }, { 0xC2B0, 0x63B3 }, { 0xC2B1, 0x5364 },
+	{ 0xC2B2, 0x864F }, { 0xC2B3, 0x9C81 }, { 0xC2B4, 0x9E93 }, { 0xC2B5, 0x788C }, { 0xC2B6, 0x9732 }, { 0xC2B7, 0x8DEF }, { 0xC2B8, 0x8D42 }, { 0xC2B9, 0x9E7F },
+	{ 0xC2BA, 0x6F5E }, { 0xC2BB, 0x7984 }, { 0xC2BC, 0x5F55 }, { 0xC2BD, 0x9646 }, { 0xC2BE, 0x622E }, { 0xC2BF, 0x9A74 }, { 0xC2C0, 0x5415 }, { 0xC2C1, 0x94DD },
+	{ 0xC2C2, 0x4FA3 }, { 0xC2C3, 0x65C5 }, { 0xC2C4, 0x5C65 }, { 0xC2C5, 0x5C61 }, { 0xC2C6, 0x7F15 }, { 0xC2C7, 0x8651 }, { 0xC2C8, 0x6C2F }, { 0xC2C9, 0x5F8B },
+	{ 0xC2CA, 0x7387 }, { 0xC2CB, 0x6EE4 }, { 0xC2CC, 0x7EFF }, { 0xC2CD, 0x5CE6 }, { 0xC2CE, 0x631B }, { 0xC2CF, 0x5B6A }, { 0xC2D0, 0x6EE6 }, { 0xC2D1, 0x5375 },
+	{ 0xC2D2, 0x4E71 }, { 0xC2D3, 0x63A0 }, { 0xC2D4, 0x7565 }, { 0xC2D5, 0x62A1 }, { 0xC2D6, 0x8F6E }, { 0xC2D7, 0x4F26 }, { 0xC2D8, 0x4ED1 }, { 0xC2D9, 0x6CA6 },
+	{ 0xC2DA, 0x7EB6 }, { 0xC2DB, 0x8BBA }, { 0xC2DC, 0x841D }, { 0xC2DD, 0x87BA }, { 0xC2DE, 0x7F57 }, { 0xC2DF, 0x903B }, { 0xC2E0, 0x9523 }, { 0xC2E1, 0x7BA9 },
+	{ 0xC2E2, 0x9AA1 }, { 0xC2E3, 0x88F8 }, { 0xC2E4, 0x843D }, { 0xC2E5, 0x6D1B }, { 0xC2E6, 0x9A86 }, { 0xC2E7, 0x7EDC }, { 0xC2E8, 0x5988 }, { 0xC2E9, 0x9EBB },
+	{ 0xC2EA, 0x739B }, { 0xC2EB, 0x7801 }, { 0xC2EC, 0x8682 }, { 0xC2ED, 0x9A6C }, { 0xC2EE, 0x9A82 }, { 0xC2EF, 0x561B }, { 0xC2F0, 0x5417 }, { 0xC2F1, 0x57CB },
+	{ 0xC2F2, 0x4E70 }, { 0xC2F3, 0x9EA6 }, { 0xC2F4, 0x5356 }, { 0xC2F5, 0x8FC8 }, { 0xC2F6, 0x8109 }, { 0xC2F7, 0x7792 }, { 0xC2F8, 0x9992 }, { 0xC2F9, 0x86EE },
+	{ 0xC2FA, 0x6EE1 }, { 0xC2FB, 0x8513 }, { 0xC2FC, 0x66FC }, { 0xC2FD, 0x6162 }, { 0xC2FE, 0x6F2B }, { 0xC3A1, 0x8C29 }, { 0xC3A2, 0x8292 }, { 0xC3A3, 0x832B },
+	{ 0xC3A4, 0x76F2 }, { 0xC3A5, 0x6C13 }, { 0xC3A6, 0x5FD9 }, { 0xC3A7, 0x83BD }, { 0xC3A8, 0x732B }, { 0xC3A9, 0x8305 }, { 0xC3AA, 0x951A }, { 0xC3AB, 0x6BDB },
+	{ 0xC3AC, 0x77DB }, { 0xC3AD, 0x94C6 }, { 0xC3AE, 0x536F }, { 0xC3AF, 0x8302 }, { 0xC3B0, 0x5192 }, { 0xC3B1, 0x5E3D }, { 0xC3B2, 0x8C8C }, { 0xC3B3, 0x8D38 },
+	{ 0xC3B4, 0x4E48 }, { 0xC3B5, 0x73AB }, { 0xC3B6, 0x679A }, { 0xC3B7, 0x6885 }, { 0xC3B8, 0x9176 }, { 0xC3B9, 0x9709 }, { 0xC3BA, 0x7164 }, { 0xC3BB, 0x6CA1 },
+	{ 0xC3BC, 0x7709 }, { 0xC3BD, 0x5A92 }, { 0xC3BE, 0x9541 }, { 0xC3BF, 0x6BCF }, { 0xC3C0, 0x7F8E }, { 0xC3C1, 0x6627 }, { 0xC3C2, 0x5BD0 }, { 0xC3C3, 0x59B9 },
+	{ 0xC3C4, 0x5A9A }, { 0xC3C5, 0x95E8 }, { 0xC3C6, 0x95F7 }, { 0xC3C7, 0x4EEC }, { 0xC3C8, 0x840C }, { 0xC3C9, 0x8499 }, { 0xC3CA, 0x6AAC }, { 0xC3CB, 0x76DF },
+	{ 0xC3CC, 0x9530 }, { 0xC3CD, 0x731B }, { 0xC3CE, 0x68A6 }, { 0xC3CF, 0x5B5F }, { 0xC3D0, 0x772F }, { 0xC3D1, 0x919A }, { 0xC3D2, 0x9761 }, { 0xC3D3, 0x7CDC },
+	{ 0xC3D4, 0x8FF7 }, { 0xC3D5, 0x8C1C }, { 0xC3D6, 0x5F25 }, { 0xC3D7, 0x7C73 }, { 0xC3D8, 0x79D8 }, { 0xC3D9, 0x89C5 }, { 0xC3DA, 0x6CCC }, { 0xC3DB, 0x871C },
+	{ 0xC3DC, 0x5BC6 }, { 0xC3DD, 0x5E42 }, { 0xC3DE, 0x68C9 }, { 0xC3DF, 0x7720 }, { 0xC3E0, 0x7EF5 }, { 0xC3E1, 0x5195 }, { 0xC3E2, 0x514D }, { 0xC3E3, 0x52C9 },
+	{ 0xC3E4, 0x5A29 }, { 0xC3E5, 0x7F05 }, { 0xC3E6, 0x9762 }, { 0xC3E7, 0x82D7 }, { 0xC3E8, 0x63CF }, { 0xC3E9, 0x7784 }, { 0xC3EA, 0x85D0 }, { 0xC3EB, 0x79D2 },
+	{ 0xC3EC, 0x6E3A }, { 0xC3ED, 0x5E99 }, { 0xC3EE, 0x5999 }, { 0xC3EF, 0x8511 }, { 0xC3F0, 0x706D }, { 0xC3F1, 0x6C11 }, { 0xC3F2, 0x62BF }, { 0xC3F3, 0x76BF },
+	{ 0xC3F4, 0x654F }, { 0xC3F5, 0x60AF }, { 0xC3F6, 0x95FD }, { 0xC3F7, 0x660E }, { 0xC3F8, 0x879F }, { 0xC3F9, 0x9E23 }, { 0xC3FA, 0x94ED }, { 0xC3FB, 0x540D },
+	{ 0xC3FC, 0x547D }, { 0xC3FD, 0x8C2C }, { 0xC3FE, 0x6478 }, { 0xC4A1, 0x6479 }, { 0xC4A2, 0x8611 }, { 0xC4A3, 0x6A21 }, { 0xC4A4, 0x819C }, { 0xC4A5, 0x78E8 },
+	{ 0xC4A6, 0x6469 }, { 0xC4A7, 0x9B54 }, { 0xC4A8, 0x62B9 }, { 0xC4A9, 0x672B }, { 0xC4AA, 0x83AB }, { 0xC4AB, 0x58A8 }, { 0xC4AC, 0x9ED8 }, { 0xC4AD, 0x6CAB },
+	{ 0xC4AE, 0x6F20 }, { 0xC4AF, 0x5BDE }, { 0xC4B0, 0x964C }, { 0xC4B1, 0x8C0B }, { 0xC4B2, 0x725F }, { 0xC4B3, 0x67D0 }, { 0xC4B4, 0x62C7 }, { 0xC4B5, 0x7261 },
+	{ 0xC4B6, 0x4EA9 }, { 0xC4B7, 0x59C6 }, { 0xC4B8, 0x6BCD }, { 0xC4B9, 0x5893 }, { 0xC4BA, 0x66AE }, { 0xC4BB, 0x5E55 }, { 0xC4BC, 0x52DF }, { 0xC4BD, 0x6155 },
+	{ 0xC4BE, 0x6728 }, { 0xC4BF, 0x76EE }, { 0xC4C0, 0x7766 }, { 0xC4C1, 0x7267 }, { 0xC4C2, 0x7A46 }, { 0xC4C3, 0x62FF }, { 0xC4C4, 0x54EA }, { 0xC4C5, 0x5450 },
+	{ 0xC4C6, 0x94A0 }, { 0xC4C7, 0x90A3 }, { 0xC4C8, 0x5A1C }, { 0xC4C9, 0x7EB3 }, { 0xC4CA, 0x6C16 }, { 0xC4CB, 0x4E43 }, { 0xC4CC, 0x5976 }, { 0xC4CD, 0x8010 },
+	{ 0xC4CE, 0x5948 }, { 0xC4CF, 0x5357 }, { 0xC4D0, 0x7537 }, { 0xC4D1, 0x96BE }, { 0xC4D2, 0x56CA }, { 0xC4D3, 0x6320 }, { 0xC4D4, 0x8111 }, { 0xC4D5, 0x607C },
+	{ 0xC4D6, 0x95F9 }, { 0xC4D7, 0x6DD6 }, { 0xC4D8, 0x5462 }, { 0xC4D9, 0x9981 }, { 0xC4DA, 0x5185 }, { 0xC4DB, 0x5AE9 }, { 0xC4DC, 0x80FD }, { 0xC4DD, 0x59AE },
+	{ 0xC4DE, 0x9713 }, { 0xC4DF, 0x502A }, { 0xC4E0, 0x6CE5 }, { 0xC4E1, 0x5C3C }, { 0xC4E2, 0x62DF }, { 0xC4E3, 0x4F60 }, { 0xC4E4, 0x533F }, { 0xC4E5, 0x817B },
+	{ 0xC4E6, 0x9006 }, { 0xC4E7, 0x6EBA }, { 0xC4E8, 0x852B }, { 0xC4E9, 0x62C8 }, { 0xC4EA, 0x5E74 }, { 0xC4EB, 0x78BE }, { 0xC4EC, 0x64B5 }, { 0xC4ED, 0x637B },
+	{ 0xC4EE, 0x5FF5 }, { 0xC4EF, 0x5A18 }, { 0xC4F0, 0x917F }, { 0xC4F1, 0x9E1F }, { 0xC4F2, 0x5C3F }, { 0xC4F3, 0x634F }, { 0xC4F4, 0x8042 }, { 0xC4F5, 0x5B7D },
+	{ 0xC4F6, 0x556E }, { 0xC4F7, 0x954A }, { 0xC4F8, 0x954D }, { 0xC4F9, 0x6D85 }, { 0xC4FA, 0x60A8 }, { 0xC4FB, 0x67E0 }, { 0xC4FC, 0x72DE }, { 0xC4FD, 0x51DD },
+	{ 0xC4FE, 0x5B81 }, { 0xC5A1, 0x62E7 }, { 0xC5A2, 0x6CDE }, { 0xC5A3, 0x725B }, { 0xC5A4, 0x626D }, { 0xC5A5, 0x94AE }, { 0xC5A6, 0x7EBD }, { 0xC5A7, 0x8113 },
+	{ 0xC5A8, 0x6D53 }, { 0xC5A9, 0x519C }, { 0xC5AA, 0x5F04 }, { 0xC5AB, 0x5974 }, { 0xC5AC, 0x52AA }, { 0xC5AD, 0x6012 }, { 0xC5AE, 0x5973 }, { 0xC5AF, 0x6696 },
+	{ 0xC5B0, 0x8650 }, { 0xC5B1, 0x759F }, { 0xC5B2, 0x632A }, { 0xC5B3, 0x61E6 }, { 0xC5B4, 0x7CEF }, { 0xC5B5, 0x8BFA }, { 0xC5B6, 0x54E6 }, { 0xC5B7, 0x6B27 },
+	{ 0xC5B8, 0x9E25 }, { 0xC5B9, 0x6BB4 }, { 0xC5BA, 0x85D5 }, { 0xC5BB, 0x5455 }, { 0xC5BC, 0x5076 }, { 0xC5BD, 0x6CA4 }, { 0xC5BE, 0x556A }, { 0xC5BF, 0x8DB4 },
+	{ 0xC5C0, 0x722C }, { 0xC5C1, 0x5E15 }, { 0xC5C2, 0x6015 }, { 0xC5C3, 0x7436 }, { 0xC5C4, 0x62CD }, { 0xC5C5, 0x6392 }, { 0xC5C6, 0x724C }, { 0xC5C7, 0x5F98 },
+	{ 0xC5C8, 0x6E43 }, { 0xC5C9, 0x6D3E }, { 0xC5CA, 0x6500 }, { 0xC5CB, 0x6F58 }, { 0xC5CC, 0x76D8 }, { 0xC5CD, 0x78D0 }, { 0xC5CE, 0x76FC }, { 0xC5CF, 0x7554 },
+	{ 0xC5D0, 0x5224 }, { 0xC5D1, 0x53DB }, { 0xC5D2, 0x4E53 }, { 0xC5D3, 0x5E9E }, { 0xC5D4, 0x65C1 }, { 0xC5D5, 0x802A }, { 0xC5D6, 0x80D6 }, { 0xC5D7, 0x629B },
+	{ 0xC5D8, 0x5486 }, { 0xC5D9, 0x5228 }, { 0xC5DA, 0x70AE }, { 0xC5DB, 0x888D }, { 0xC5DC, 0x8DD1 }, { 0xC5DD, 0x6CE1 }, { 0xC5DE, 0x5478 }, { 0xC5DF, 0x80DA },
+	{ 0xC5E0, 0x57F9 }, { 0xC5E1, 0x88F4 }, { 0xC5E2, 0x8D54 }, { 0xC5E3, 0x966A }, { 0xC5E4, 0x914D }, { 0xC5E5, 0x4F69 }, { 0xC5E6, 0x6C9B }, { 0xC5E7, 0x55B7 },
+	{ 0xC5E8, 0x76C6 }, { 0xC5E9, 0x7830 }, { 0xC5EA, 0x62A8 }, { 0xC5EB, 0x70F9 }, { 0xC5EC, 0x6F8E }, { 0xC5ED, 0x5F6D }, { 0xC5EE, 0x84EC }, { 0xC5EF, 0x68DA },
+	{ 0xC5F0, 0x787C }, { 0xC5F1, 0x7BF7 }, { 0xC5F2, 0x81A8 }, { 0xC5F3, 0x670B }, { 0xC5F4, 0x9E4F }, { 0xC5F5, 0x6367 }, { 0xC5F6, 0x78B0 }, { 0xC5F7, 0x576F },
+	{ 0xC5F8, 0x7812 }, { 0xC5F9, 0x9739 }, { 0xC5FA, 0x6279 }, { 0xC5FB, 0x62AB }, { 0xC5FC, 0x5288 }, { 0xC5FD, 0x7435 }, { 0xC5FE, 0x6BD7 }, { 0xC6A1, 0x5564 },
+	{ 0xC6A2, 0x813E }, { 0xC6A3, 0x75B2 }, { 0xC6A4, 0x76AE }, { 0xC6A5, 0x5339 }, { 0xC6A6, 0x75DE }, { 0xC6A7, 0x50FB }, { 0xC6A8, 0x5C41 }, { 0xC6A9, 0x8B6C },
+	{ 0xC6AA, 0x7BC7 }, { 0xC6AB, 0x504F }, { 0xC6AC, 0x7247 }, { 0xC6AD, 0x9A97 }, { 0xC6AE, 0x98D8 }, { 0xC6AF, 0x6F02 }, { 0xC6B0, 0x74E2 }, { 0xC6B1, 0x7968 },
+	{ 0xC6B2, 0x6487 }, { 0xC6B3, 0x77A5 }, { 0xC6B4, 0x62FC }, { 0xC6B5, 0x9891 }, { 0xC6B6, 0x8D2B }, { 0xC6B7, 0x54C1 }, { 0xC6B8, 0x8058 }, { 0xC6B9, 0x4E52 },
+	{ 0xC6BA, 0x576A }, { 0xC6BB, 0x82F9 }, { 0xC6BC, 0x840D }, { 0xC6BD, 0x5E73 }, { 0xC6BE, 0x51ED }, { 0xC6BF, 0x74F6 }, { 0xC6C0, 0x8BC4 }, { 0xC6C1, 0x5C4F },
+	{ 0xC6C2, 0x5761 }, { 0xC6C3, 0x6CFC }, { 0xC6C4, 0x9887 }, { 0xC6C5, 0x5A46 }, { 0xC6C6, 0x7834 }, { 0xC6C7, 0x9B44 }, { 0xC6C8, 0x8FEB }, { 0xC6C9, 0x7C95 },
+	{ 0xC6CA, 0x5256 }, { 0xC6CB, 0x6251 }, { 0xC6CC, 0x94FA }, { 0xC6CD, 0x4EC6 }, { 0xC6CE, 0x8386 }, { 0xC6CF, 0x8461 }, { 0xC6D0, 0x83E9 }, { 0xC6D1, 0x84B2 },
+	{ 0xC6D2, 0x57D4 }, { 0xC6D3, 0x6734 }, { 0xC6D4, 0x5703 }, { 0xC6D5, 0x666E }, { 0xC6D6, 0x6D66 }, { 0xC6D7, 0x8C31 }, { 0xC6D8, 0x66DD }, { 0xC6D9, 0x7011 },
+	{ 0xC6DA, 0x671F }, { 0xC6DB, 0x6B3A }, { 0xC6DC, 0x6816 }, { 0xC6DD, 0x621A }, { 0xC6DE, 0x59BB }, { 0xC6DF, 0x4E03 }, { 0xC6E0, 0x51C4 }, { 0xC6E1, 0x6F06 },
+	{ 0xC6E2, 0x67D2 }, { 0xC6E3, 0x6C8F }, { 0xC6E4, 0x5176 }, { 0xC6E5, 0x68CB }, { 0xC6E6, 0x5947 }, { 0xC6E7, 0x6B67 }, { 0xC6E8, 0x7566 }, { 0xC6E9, 0x5D0E },
+	{ 0xC6EA, 0x8110 }, { 0xC6EB, 0x9F50 }, { 0xC6EC, 0x65D7 }, { 0xC6ED, 0x7948 }, { 0xC6EE, 0x7941 }, { 0xC6EF, 0x9A91 }, { 0xC6F0, 0x8D77 }, { 0xC6F1, 0x5C82 },
+	{ 0xC6F2, 0x4E5E }, { 0xC6F3, 0x4F01 }, { 0xC6F4, 0x542F }, { 0xC6F5, 0x5951 }, { 0xC6F6, 0x780C }, { 0xC6F7, 0x5668 }, { 0xC6F8, 0x6C14 }, { 0xC6F9, 0x8FC4 },
+	{ 0xC6FA, 0x5F03 }, { 0xC6FB, 0x6C7D }, { 0xC6FC, 0x6CE3 }, { 0xC6FD, 0x8BAB }, { 0xC6FE, 0x6390 }, { 0xC7A1, 0x6070 }, { 0xC7A2, 0x6D3D }, { 0xC7A3, 0x7275 },
+	{ 0xC7A4, 0x6266 }, { 0xC7A5, 0x948E }, { 0xC7A6, 0x94C5 }, { 0xC7A7, 0x5343 }, { 0xC7A8, 0x8FC1 }, { 0xC7A9, 0x7B7E }, { 0xC7AA, 0x4EDF }, { 0xC7AB, 0x8C26 },
+	{ 0xC7AC, 0x4E7E }, { 0xC7AD, 0x9ED4 }, { 0xC7AE, 0x94B1 }, { 0xC7AF, 0x94B3 }, { 0xC7B0, 0x524D }, { 0xC7B1, 0x6F5C }, { 0xC7B2, 0x9063 }, { 0xC7B3, 0x6D45 },
+	{ 0xC7B4, 0x8C34 }, { 0xC7B5, 0x5811 }, { 0xC7B6, 0x5D4C }, { 0xC7B7, 0x6B20 }, { 0xC7B8, 0x6B49 }, { 0xC7B9, 0x67AA }, { 0xC7BA, 0x545B }, { 0xC7BB, 0x8154 },
+	{ 0xC7BC, 0x7F8C }, { 0xC7BD, 0x5899 }, { 0xC7BE, 0x8537 }, { 0xC7BF, 0x5F3A }, { 0xC7C0, 0x62A2 }, { 0xC7C1, 0x6A47 }, { 0xC7C2, 0x9539 }, { 0xC7C3, 0x6572 },
+	{ 0xC7C4, 0x6084 }, { 0xC7C5, 0x6865 }, { 0xC7C6, 0x77A7 }, { 0xC7C7, 0x4E54 }, { 0xC7C8, 0x4FA8 }, { 0xC7C9, 0x5DE7 }, { 0xC7CA, 0x9798 }, { 0xC7CB, 0x64AC },
+	{ 0xC7CC, 0x7FD8 }, { 0xC7CD, 0x5CED }, { 0xC7CE, 0x4FCF }, { 0xC7CF, 0x7A8D }, { 0xC7D0, 0x5207 }, { 0xC7D1, 0x8304 }, { 0xC7D2, 0x4E14 }, { 0xC7D3, 0x602F },
+	{ 0xC7D4, 0x7A83 }, { 0xC7D5, 0x94A6 }, { 0xC7D6, 0x4FB5 }, { 0xC7D7, 0x4EB2 }, { 0xC7D8, 0x79E6 }, { 0xC7D9, 0x7434 }, { 0xC7DA, 0x52E4 }, { 0xC7DB, 0x82B9 },
+	{ 0xC7DC, 0x64D2 }, { 0xC7DD, 0x79BD }, { 0xC7DE, 0x5BDD }, { 0xC7DF, 0x6C81 }, { 0xC7E0, 0x9752 }, { 0xC7E1, 0x8F7B }, { 0xC7E2, 0x6C22 }, { 0xC7E3, 0x503E },
+	{ 0xC7E4, 0x537F }, { 0xC7E5, 0x6E05 }, { 0xC7E6, 0x64CE }, { 0xC7E7, 0x6674 }, { 0xC7E8, 0x6C30 }, { 0xC7E9, 0x60C5 }, { 0xC7EA, 0x9877 }, { 0xC7EB, 0x8BF7 },
+	{ 0xC7EC, 0x5E86 }, { 0xC7ED, 0x743C }, { 0xC7EE, 0x7A77 }, { 0xC7EF, 0x79CB }, { 0xC7F0, 0x4E18 }, { 0xC7F1, 0x90B1 }, { 0xC7F2, 0x7403 }, { 0xC7F3, 0x6C42 },
+	{ 0xC7F4, 0x56DA }, { 0xC7F5, 0x914B }, { 0xC7F6, 0x6CC5 }, { 0xC7F7, 0x8D8B }, { 0xC7F8, 0x533A }, { 0xC7F9, 0x86C6 }, { 0xC7FA, 0x66F2 }, { 0xC7FB, 0x8EAF },
+	{ 0xC7FC, 0x5C48 }, { 0xC7FD, 0x9A71 }, { 0xC7FE, 0x6E20 }, { 0xC8A1, 0x53D6 }, { 0xC8A2, 0x5A36 }, { 0xC8A3, 0x9F8B }, { 0xC8A4, 0x8DA3 }, { 0xC8A5, 0x53BB },
+	{ 0xC8A6, 0x5708 }, { 0xC8A7, 0x98A7 }, { 0xC8A8, 0x6743 }, { 0xC8A9, 0x919B }, { 0xC8AA, 0x6CC9 }, { 0xC8AB, 0x5168 }, { 0xC8AC, 0x75CA }, { 0xC8AD, 0x62F3 },
+	{ 0xC8AE, 0x72AC }, { 0xC8AF, 0x5238 }, { 0xC8B0, 0x529D }, { 0xC8B1, 0x7F3A }, { 0xC8B2, 0x7094 }, { 0xC8B3, 0x7638 }, { 0xC8B4, 0x5374 }, { 0xC8B5, 0x9E4A },
+	{ 0xC8B6, 0x69B7 }, { 0xC8B7, 0x786E }, { 0xC8B8, 0x96C0 }, { 0xC8B9, 0x88D9 }, { 0xC8BA, 0x7FA4 }, { 0xC8BB, 0x7136 }, { 0xC8BC, 0x71C3 }, { 0xC8BD, 0x5189 },
+	{ 0xC8BE, 0x67D3 }, { 0xC8BF, 0x74E4 }, { 0xC8C0, 0x58E4 }, { 0xC8C1, 0x6518 }, { 0xC8C2, 0x56B7 }, { 0xC8C3, 0x8BA9 }, { 0xC8C4, 0x9976 }, { 0xC8C5, 0x6270 },
+	{ 0xC8C6, 0x7ED5 }, { 0xC8C7, 0x60F9 }, { 0xC8C8, 0x70ED }, { 0xC8C9, 0x58EC }, { 0xC8CA, 0x4EC1 }, { 0xC8CB, 0x4EBA }, { 0xC8CC, 0x5FCD }, { 0xC8CD, 0x97E7 },
+	{ 0xC8CE, 0x4EFB }, { 0xC8CF, 0x8BA4 }, { 0xC8D0, 0x5203 }, { 0xC8D1, 0x598A }, { 0xC8D2, 0x7EAB }, { 0xC8D3, 0x6254 }, { 0xC8D4, 0x4ECD }, { 0xC8D5, 0x65E5 },
+	{ 0xC8D6, 0x620E }, { 0xC8D7, 0x8338 }, { 0xC8D8, 0x84C9 }, { 0xC8D9, 0x8363 }, { 0xC8DA, 0x878D }, { 0xC8DB, 0x7194 }, { 0xC8DC, 0x6EB6 }, { 0xC8DD, 0x5BB9 },
+	{ 0xC8DE, 0x7ED2 }, { 0xC8DF, 0x5197 }, { 0xC8E0, 0x63C9 }, { 0xC8E1, 0x67D4 }, { 0xC8E2, 0x8089 }, { 0xC8E3, 0x8339 }, { 0xC8E4, 0x8815 }, { 0xC8E5, 0x5112 },
+	{ 0xC8E6, 0x5B7A }, { 0xC8E7, 0x5982 }, { 0xC8E8, 0x8FB1 }, { 0xC8E9, 0x4E73 }, { 0xC8EA, 0x6C5D }, { 0xC8EB, 0x5165 }, { 0xC8EC, 0x8925 }, { 0xC8ED, 0x8F6F },
+	{ 0xC8EE, 0x962E }, { 0xC8EF, 0x854A }, { 0xC8F0, 0x745E }, { 0xC8F1, 0x9510 }, { 0xC8F2, 0x95F0 }, { 0xC8F3, 0x6DA6 }, { 0xC8F4, 0x82E5 }, { 0xC8F5, 0x5F31 },
+	{ 0xC8F6, 0x6492 }, { 0xC8F7, 0x6D12 }, { 0xC8F8, 0x8428 }, { 0xC8F9, 0x816E }, { 0xC8FA, 0x9CC3 }, { 0xC8FB, 0x585E }, { 0xC8FC, 0x8D5B }, { 0xC8FD, 0x4E09 },
+	{ 0xC8FE, 0x53C1 }, { 0xC9A1, 0x4F1E }, { 0xC9A2, 0x6563 }, { 0xC9A3, 0x6851 }, { 0xC9A4, 0x55D3 }, { 0xC9A5, 0x4E27 }, { 0xC9A6, 0x6414 }, { 0xC9A7, 0x9A9A },
+	{ 0xC9A8, 0x626B }, { 0xC9A9, 0x5AC2 }, { 0xC9AA, 0x745F }, { 0xC9AB, 0x8272 }, { 0xC9AC, 0x6DA9 }, { 0xC9AD, 0x68EE }, { 0xC9AE, 0x50E7 }, { 0xC9AF, 0x838E },
+	{ 0xC9B0, 0x7802 }, { 0xC9B1, 0x6740 }, { 0xC9B2, 0x5239 }, { 0xC9B3, 0x6C99 }, { 0xC9B4, 0x7EB1 }, { 0xC9B5, 0x50BB }, { 0xC9B6, 0x5565 }, { 0xC9B7, 0x715E },
+	{ 0xC9B8, 0x7B5B }, { 0xC9B9, 0x6652 }, { 0xC9BA, 0x73CA }, { 0xC9BB, 0x82EB }, { 0xC9BC, 0x6749 }, { 0xC9BD, 0x5C71 }, { 0xC9BE, 0x5220 }, { 0xC9BF, 0x717D },
+	{ 0xC9C0, 0x886B }, { 0xC9C1, 0x95EA }, { 0xC9C2, 0x9655 }, { 0xC9C3, 0x64C5 }, { 0xC9C4, 0x8D61 }, { 0xC9C5, 0x81B3 }, { 0xC9C6, 0x5584 }, { 0xC9C7, 0x6C55 },
+	{ 0xC9C8, 0x6247 }, { 0xC9C9, 0x7F2E }, { 0xC9CA, 0x5892 }, { 0xC9CB, 0x4F24 }, { 0xC9CC, 0x5546 }, { 0xC9CD, 0x8D4F }, { 0xC9CE, 0x664C }, { 0xC9CF, 0x4E0A },
+	{ 0xC9D0, 0x5C1A }, { 0xC9D1, 0x88F3 }, { 0xC9D2, 0x68A2 }, { 0xC9D3, 0x634E }, { 0xC9D4, 0x7A0D }, { 0xC9D5, 0x70E7 }, { 0xC9D6, 0x828D }, { 0xC9D7, 0x52FA },
+	{ 0xC9D8, 0x97F6 }, { 0xC9D9, 0x5C11 }, { 0xC9DA, 0x54E8 }, { 0xC9DB, 0x90B5 }, { 0xC9DC, 0x7ECD }, { 0xC9DD, 0x5962 }, { 0xC9DE, 0x8D4A }, { 0xC9DF, 0x86C7 },
+	{ 0xC9E0, 0x820C }, { 0xC9E1, 0x820D }, { 0xC9E2, 0x8D66 }, { 0xC9E3, 0x6444 }, { 0xC9E4, 0x5C04 }, { 0xC9E5, 0x6151 }, { 0xC9E6, 0x6D89 }, { 0xC9E7, 0x793E },
+	{ 0xC9E8, 0x8BBE }, { 0xC9E9, 0x7837 }, { 0xC9EA, 0x7533 }, { 0xC9EB, 0x547B }, { 0xC9EC, 0x4F38 }, { 0xC9ED, 0x8EAB }, { 0xC9EE, 0x6DF1 }, { 0xC9EF, 0x5A20 },
+	{ 0xC9F0, 0x7EC5 }, { 0xC9F1, 0x795E }, { 0xC9F2, 0x6C88 }, { 0xC9F3, 0x5BA1 }, { 0xC9F4, 0x5A76 }, { 0xC9F5, 0x751A }, { 0xC9F6, 0x80BE }, { 0xC9F7, 0x614E },
+	{ 0xC9F8, 0x6E17 }, { 0xC9F9, 0x58F0 }, { 0xC9FA, 0x751F }, { 0xC9FB, 0x7525 }, { 0xC9FC, 0x7272 }, { 0xC9FD, 0x5347 }, { 0xC9FE, 0x7EF3 }, { 0xCAA1, 0x7701 },
+	{ 0xCAA2, 0x76DB }, { 0xCAA3, 0x5269 }, { 0xCAA4, 0x80DC }, { 0xCAA5, 0x5723 }, { 0xCAA6, 0x5E08 }, { 0xCAA7, 0x5931 }, { 0xCAA8, 0x72EE }, { 0xCAA9, 0x65BD },
+	{ 0xCAAA, 0x6E7F }, { 0xCAAB, 0x8BD7 }, { 0xCAAC, 0x5C38 }, { 0xCAAD, 0x8671 }, { 0xCAAE, 0x5341 }, { 0xCAAF, 0x77F3 }, { 0xCAB0, 0x62FE }, { 0xCAB1, 0x65F6 },
+	{ 0xCAB2, 0x4EC0 }, { 0xCAB3, 0x98DF }, { 0xCAB4, 0x8680 }, { 0xCAB5, 0x5B9E }, { 0xCAB6, 0x8BC6 }, { 0xCAB7, 0x53F2 }, { 0xCAB8, 0x77E2 }, { 0xCAB9, 0x4F7F },
+	{ 0xCABA, 0x5C4E }, { 0xCABB, 0x9A76 }, { 0xCABC, 0x59CB }, { 0xCABD, 0x5F0F }, { 0xCABE, 0x793A }, { 0xCABF, 0x58EB }, { 0xCAC0, 0x4E16 }, { 0xCAC1, 0x67FF },
+	{ 0xCAC2, 0x4E8B }, { 0xCAC3, 0x62ED }, { 0xCAC4, 0x8A93 }, { 0xCAC5, 0x901D }, { 0xCAC6, 0x52BF }, { 0xCAC7, 0x662F }, { 0xCAC8, 0x55DC }, { 0xCAC9, 0x566C },
+	{ 0xCACA, 0x9002 }, { 0xCACB, 0x4ED5 }, { 0xCACC, 0x4F8D }, { 0xCACD, 0x91CA }, { 0xCACE, 0x9970 }, { 0xCACF, 0x6C0F }, { 0xCAD0, 0x5E02 }, { 0xCAD1, 0x6043 },
+	{ 0xCAD2, 0x5BA4 }, { 0xCAD3, 0x89C6 }, { 0xCAD4, 0x8BD5 }, { 0xCAD5, 0x6536 }, { 0xCAD6, 0x624B }, { 0xCAD7, 0x9996 }, { 0xCAD8, 0x5B88 }, { 0xCAD9, 0x5BFF },
+	{ 0xCADA, 0x6388 }, { 0xCADB, 0x552E }, { 0xCADC, 0x53D7 }, { 0xCADD, 0x7626 }, { 0xCADE, 0x517D }, { 0xCADF, 0x852C }, { 0xCAE0, 0x67A2 }, { 0xCAE1, 0x68B3 },
+	{ 0xCAE2, 0x6B8A }, { 0xCAE3, 0x6292 }, { 0xCAE4, 0x8F93 }, { 0xCAE5, 0x53D4 }, { 0xCAE6, 0x8212 }, { 0xCAE7, 0x6DD1 }, { 0xCAE8, 0x758F }, { 0xCAE9, 0x4E66 },
+	{ 0xCAEA, 0x8D4E }, { 0xCAEB, 0x5B70 }, { 0xCAEC, 0x719F }, { 0xCAED, 0x85AF }, { 0xCAEE, 0x6691 }, { 0xCAEF, 0x66D9 }, { 0xCAF0, 0x7F72 }, { 0xCAF1, 0x8700 },
+	{ 0xCAF2, 0x9ECD }, { 0xCAF3, 0x9F20 }, { 0xCAF4, 0x5C5E }, { 0xCAF5, 0x672F }, { 0xCAF6, 0x8FF0 }, { 0xCAF7, 0x6811 }, { 0xCAF8, 0x675F }, { 0xCAF9, 0x620D },
+	{ 0xCAFA, 0x7AD6 }, { 0xCAFB, 0x5885 }, { 0xCAFC, 0x5EB6 }, { 0xCAFD, 0x6570 }, { 0xCAFE, 0x6F31 }, { 0xCBA1, 0x6055 }, { 0xCBA2, 0x5237 }, { 0xCBA3, 0x800D },
+	{ 0xCBA4, 0x6454 }, { 0xCBA5, 0x8870 }, { 0xCBA6, 0x7529 }, { 0xCBA7, 0x5E05 }, { 0xCBA8, 0x6813 }, { 0xCBA9, 0x62F4 }, { 0xCBAA, 0x971C }, { 0xCBAB, 0x53CC },
+	{ 0xCBAC, 0x723D }, { 0xCBAD, 0x8C01 }, { 0xCBAE, 0x6C34 }, { 0xCBAF, 0x7761 }, { 0xCBB0, 0x7A0E }, { 0xCBB1, 0x542E }, { 0xCBB2, 0x77AC }, { 0xCBB3, 0x987A },
+	{ 0xCBB4, 0x821C }, { 0xCBB5, 0x8BF4 }, { 0xCBB6, 0x7855 }, { 0xCBB7, 0x6714 }, { 0xCBB8, 0x70C1 }, { 0xCBB9, 0x65AF }, { 0xCBBA, 0x6495 }, { 0xCBBB, 0x5636 },
+	{ 0xCBBC, 0x601D }, { 0xCBBD, 0x79C1 }, { 0xCBBE, 0x53F8 }, { 0xCBBF, 0x4E1D }, { 0xCBC0, 0x6B7B }, { 0xCBC1, 0x8086 }, { 0xCBC2, 0x5BFA }, { 0xCBC3, 0x55E3 },
+	{ 0xCBC4, 0x56DB }, { 0xCBC5, 0x4F3A }, { 0xCBC6, 0x4F3C }, { 0xCBC7, 0x9972 }, { 0xCBC8, 0x5DF3 }, { 0xCBC9, 0x677E }, { 0xCBCA, 0x8038 }, { 0xCBCB, 0x6002 },
+	{ 0xCBCC, 0x9882 }, { 0xCBCD, 0x9001 }, { 0xCBCE, 0x5B8B }, { 0xCBCF, 0x8BBC }, { 0xCBD0, 0x8BF5 }, { 0xCBD1, 0x641C }, { 0xCBD2, 0x8258 }, { 0xCBD3, 0x64DE },
+	{ 0xCBD4, 0x55FD }, { 0xCBD5, 0x82CF }, { 0xCBD6, 0x9165 }, { 0xCBD7, 0x4FD7 }, { 0xCBD8, 0x7D20 }, { 0xCBD9, 0x901F }, { 0xCBDA, 0x7C9F }, { 0xCBDB, 0x50F3 },
+	{ 0xCBDC, 0x5851 }, { 0xCBDD, 0x6EAF }, { 0xCBDE, 0x5BBF }, { 0xCBDF, 0x8BC9 }, { 0xCBE0, 0x8083 }, { 0xCBE1, 0x9178 }, { 0xCBE2, 0x849C }, { 0xCBE3, 0x7B97 },
+	{ 0xCBE4, 0x867D }, { 0xCBE5, 0x968B }, { 0xCBE6, 0x968F }, { 0xCBE7, 0x7EE5 }, { 0xCBE8, 0x9AD3 }, { 0xCBE9, 0x788E }, { 0xCBEA, 0x5C81 }, { 0xCBEB, 0x7A57 },
+	{ 0xCBEC, 0x9042 }, { 0xCBED, 0x96A7 }, { 0xCBEE, 0x795F }, { 0xCBEF, 0x5B59 }, { 0xCBF0, 0x635F }, { 0xCBF1, 0x7B0B }, { 0xCBF2, 0x84D1 }, { 0xCBF3, 0x68AD },
+	{ 0xCBF4, 0x5506 }, { 0xCBF5, 0x7F29 }, { 0xCBF6, 0x7410 }, { 0xCBF7, 0x7D22 }, { 0xCBF8, 0x9501 }, { 0xCBF9, 0x6240 }, { 0xCBFA, 0x584C }, { 0xCBFB, 0x4ED6 },
+	{ 0xCBFC, 0x5B83 }, { 0xCBFD, 0x5979 }, { 0xCBFE, 0x5854 }, { 0xCCA1, 0x736D }, { 0xCCA2, 0x631E }, { 0xCCA3, 0x8E4B }, { 0xCCA4, 0x8E0F }, { 0xCCA5, 0x80CE },
+	{ 0xCCA6, 0x82D4 }, { 0xCCA7, 0x62AC }, { 0xCCA8, 0x53F0 }, { 0xCCA9, 0x6CF0 }, { 0xCCAA, 0x915E }, { 0xCCAB, 0x592A }, { 0xCCAC, 0x6001 }, { 0xCCAD, 0x6C70 },
+	{ 0xCCAE, 0x574D }, { 0xCCAF, 0x644A }, { 0xCCB0, 0x8D2A }, { 0xCCB1, 0x762B }, { 0xCCB2, 0x6EE9 }, { 0xCCB3, 0x575B }, { 0xCCB4, 0x6A80 }, { 0xCCB5, 0x75F0 },
+	{ 0xCCB6, 0x6F6D }, { 0xCCB7, 0x8C2D }, { 0xCCB8, 0x8C08 }, { 0xCCB9, 0x5766 }, { 0xCCBA, 0x6BEF }, { 0xCCBB, 0x8892 }, { 0xCCBC, 0x78B3 }, { 0xCCBD, 0x63A2 },
+	{ 0xCCBE, 0x53F9 }, { 0xCCBF, 0x70AD }, { 0xCCC0, 0x6C64 }, { 0xCCC1, 0x5858 }, { 0xCCC2, 0x642A }, { 0xCCC3, 0x5802 }, { 0xCCC4, 0x68E0 }, { 0xCCC5, 0x819B },
+	{ 0xCCC6, 0x5510 }, { 0xCCC7, 0x7CD6 }, { 0xCCC8, 0x5018 }, { 0xCCC9, 0x8EBA }, { 0xCCCA, 0x6DCC }, { 0xCCCB, 0x8D9F }, { 0xCCCC, 0x70EB }, { 0xCCCD, 0x638F },
+	{ 0xCCCE, 0x6D9B }, { 0xCCCF, 0x6ED4 }, { 0xCCD0, 0x7EE6 }, { 0xCCD1, 0x8404 }, { 0xCCD2, 0x6843 }, { 0xCCD3, 0x9003 }, { 0xCCD4, 0x6DD8 }, { 0xCCD5, 0x9676 },
+	{ 0xCCD6, 0x8BA8 }, { 0xCCD7, 0x5957 }, { 0xCCD8, 0x7279 }, { 0xCCD9, 0x85E4 }, { 0xCCDA, 0x817E }, { 0xCCDB, 0x75BC }, { 0xCCDC, 0x8A8A }, { 0xCCDD, 0x68AF },
+	{ 0xCCDE, 0x5254 }, { 0xCCDF, 0x8E22 }, { 0xCCE0, 0x9511 }, { 0xCCE1, 0x63D0 }, { 0xCCE2, 0x9898 }, { 0xCCE3, 0x8E44 }, { 0xCCE4, 0x557C }, { 0xCCE5, 0x4F53 },
+	{ 0xCCE6, 0x66FF }, { 0xCCE7, 0x568F }, { 0xCCE8, 0x60D5 }, { 0xCCE9, 0x6D95 }, { 0xCCEA, 0x5243 }, { 0xCCEB, 0x5C49 }, { 0xCCEC, 0x5929 }, { 0xCCED, 0x6DFB },
+	{ 0xCCEE, 0x586B }, { 0xCCEF, 0x7530 }, { 0xCCF0, 0x751C }, { 0xCCF1, 0x606C }, { 0xCCF2, 0x8214 }, { 0xCCF3, 0x8146 }, { 0xCCF4, 0x6311 }, { 0xCCF5, 0x6761 },
+	{ 0xCCF6, 0x8FE2 }, { 0xCCF7, 0x773A }, { 0xCCF8, 0x8DF3 }, { 0xCCF9, 0x8D34 }, { 0xCCFA, 0x94C1 }, { 0xCCFB, 0x5E16 }, { 0xCCFC, 0x5385 }, { 0xCCFD, 0x542C },
+	{ 0xCCFE, 0x70C3 }, { 0xCDA1, 0x6C40 }, { 0xCDA2, 0x5EF7 }, { 0xCDA3, 0x505C }, { 0xCDA4, 0x4EAD }, { 0xCDA5, 0x5EAD }, { 0xCDA6, 0x633A }, { 0xCDA7, 0x8247 },
+	{ 0xCDA8, 0x901A }, { 0xCDA9, 0x6850 }, { 0xCDAA, 0x916E }, { 0xCDAB, 0x77B3 }, { 0xCDAC, 0x540C }, { 0xCDAD, 0x94DC }, { 0xCDAE, 0x5F64 }, { 0xCDAF, 0x7AE5 },
+	{ 0xCDB0, 0x6876 }, { 0xCDB1, 0x6345 }, { 0xCDB2, 0x7B52 }, { 0xCDB3, 0x7EDF }, { 0xCDB4, 0x75DB }, { 0xCDB5, 0x5077 }, { 0xCDB6, 0x6295 }, { 0xCDB7, 0x5934 },
+	{ 0xCDB8, 0x900F }, { 0xCDB9, 0x51F8 }, { 0xCDBA, 0x79C3 }, { 0xCDBB, 0x7A81 }, { 0xCDBC, 0x56FE }, { 0xCDBD, 0x5F92 }, { 0xCDBE, 0x9014 }, { 0xCDBF, 0x6D82 },
+	{ 0xCDC0, 0x5C60 }, { 0xCDC1, 0x571F }, { 0xCDC2, 0x5410 }, { 0xCDC3, 0x5154 }, { 0xCDC4, 0x6E4D }, { 0xCDC5, 0x56E2 }, { 0xCDC6, 0x63A8 }, { 0xCDC7, 0x9893 },
+	{ 0xCDC8, 0x817F }, { 0xCDC9, 0x8715 }, { 0xCDCA, 0x892A }, { 0xCDCB, 0x9000 }, { 0xCDCC, 0x541E }, { 0xCDCD, 0x5C6F }, { 0xCDCE, 0x81C0 }, { 0xCDCF, 0x62D6 },
+	{ 0xCDD0, 0x6258 }, { 0xCDD1, 0x8131 }, { 0xCDD2, 0x9E35 }, { 0xCDD3, 0x9640 }, { 0xCDD4, 0x9A6E }, { 0xCDD5, 0x9A7C }, { 0xCDD6, 0x692D }, { 0xCDD7, 0x59A5 },
+	{ 0xCDD8, 0x62D3 }, { 0xCDD9, 0x553E }, { 0xCDDA, 0x6316 }, { 0xCDDB, 0x54C7 }, { 0xCDDC, 0x86D9 }, { 0xCDDD, 0x6D3C }, { 0xCDDE, 0x5A03 }, { 0xCDDF, 0x74E6 },
+	{ 0xCDE0, 0x889C }, { 0xCDE1, 0x6B6A }, { 0xCDE2, 0x5916 }, { 0xCDE3, 0x8C4C }, { 0xCDE4, 0x5F2F }, { 0xCDE5, 0x6E7E }, { 0xCDE6, 0x73A9 }, { 0xCDE7, 0x987D },
+	{ 0xCDE8, 0x4E38 }, { 0xCDE9, 0x70F7 }, { 0xCDEA, 0x5B8C }, { 0xCDEB, 0x7897 }, { 0xCDEC, 0x633D }, { 0xCDED, 0x665A }, { 0xCDEE, 0x7696 }, { 0xCDEF, 0x60CB },
+	{ 0xCDF0, 0x5B9B }, { 0xCDF1, 0x5A49 }, { 0xCDF2, 0x4E07 }, { 0xCDF3, 0x8155 }, { 0xCDF4, 0x6C6A }, { 0xCDF5, 0x738B }, { 0xCDF6, 0x4EA1 }, { 0xCDF7, 0x6789 },
+	{ 0xCDF8, 0x7F51 }, { 0xCDF9, 0x5F80 }, { 0xCDFA, 0x65FA }, { 0xCDFB, 0x671B }, { 0xCDFC, 0x5FD8 }, { 0xCDFD, 0x5984 }, { 0xCDFE, 0x5A01 }, { 0xCEA1, 0x5DCD },
+	{ 0xCEA2, 0x5FAE }, { 0xCEA3, 0x5371 }, { 0xCEA4, 0x97E6 }, { 0xCEA5, 0x8FDD }, { 0xCEA6, 0x6845 }, { 0xCEA7, 0x56F4 }, { 0xCEA8, 0x552F }, { 0xCEA9, 0x60DF },
+	{ 0xCEAA, 0x4E3A }, { 0xCEAB, 0x6F4D }, { 0xCEAC, 0x7EF4 }, { 0xCEAD, 0x82C7 }, { 0xCEAE, 0x840E }, { 0xCEAF, 0x59D4 }, { 0xCEB0, 0x4F1F }, { 0xCEB1, 0x4F2A },
+	{ 0xCEB2, 0x5C3E }, { 0xCEB3, 0x7EAC }, { 0xCEB4, 0x672A }, { 0xCEB5, 0x851A }, { 0xCEB6, 0x5473 }, { 0xCEB7, 0x754F }, { 0xCEB8, 0x80C3 }, { 0xCEB9, 0x5582 },
+	{ 0xCEBA, 0x9B4F }, { 0xCEBB, 0x4F4D }, { 0xCEBC, 0x6E2D }, { 0xCEBD, 0x8C13 }, { 0xCEBE, 0x5C09 }, { 0xCEBF, 0x6170 }, { 0xCEC0, 0x536B }, { 0xCEC1, 0x761F },
+	{ 0xCEC2, 0x6E29 }, { 0xCEC3, 0x868A }, { 0xCEC4, 0x6587 }, { 0xCEC5, 0x95FB }, { 0xCEC6, 0x7EB9 }, { 0xCEC7, 0x543B }, { 0xCEC8, 0x7A33 }, { 0xCEC9, 0x7D0A },
+	{ 0xCECA, 0x95EE }, { 0xCECB, 0x55E1 }, { 0xCECC, 0x7FC1 }, { 0xCECD, 0x74EE }, { 0xCECE, 0x631D }, { 0xCECF, 0x8717 }, { 0xCED0, 0x6DA1 }, { 0xCED1, 0x7A9D },
+	{ 0xCED2, 0x6211 }, { 0xCED3, 0x65A1 }, { 0xCED4, 0x5367 }, { 0xCED5, 0x63E1 }, { 0xCED6, 0x6C83 }, { 0xCED7, 0x5DEB }, { 0xCED8, 0x545C }, { 0xCED9, 0x94A8 },
+	{ 0xCEDA, 0x4E4C }, { 0xCEDB, 0x6C61 }, { 0xCEDC, 0x8BEC }, { 0xCEDD, 0x5C4B }, { 0xCEDE, 0x65E0 }, { 0xCEDF, 0x829C }, { 0xCEE0, 0x68A7 }, { 0xCEE1, 0x543E },
+	{ 0xCEE2, 0x5434 }, { 0xCEE3, 0x6BCB }, { 0xCEE4, 0x6B66 }, { 0xCEE5, 0x4E94 }, { 0xCEE6, 0x6342 }, { 0xCEE7, 0x5348 }, { 0xCEE8, 0x821E }, { 0xCEE9, 0x4F0D },
+	{ 0xCEEA, 0x4FAE }, { 0xCEEB, 0x575E }, { 0xCEEC, 0x620A }, { 0xCEED, 0x96FE }, { 0xCEEE, 0x6664 }, { 0xCEEF, 0x7269 }, { 0xCEF0, 0x52FF }, { 0xCEF1, 0x52A1 },
+	{ 0xCEF2, 0x609F }, { 0xCEF3, 0x8BEF }, { 0xCEF4, 0x6614 }, { 0xCEF5, 0x7199 }, { 0xCEF6, 0x6790 }, { 0xCEF7, 0x897F }, { 0xCEF8, 0x7852 }, { 0xCEF9, 0x77FD },
+	{ 0xCEFA, 0x6670 }, { 0xCEFB, 0x563B }, { 0xCEFC, 0x5438 }, { 0xCEFD, 0x9521 }, { 0xCEFE, 0x727A }, { 0xCFA1, 0x7A00 }, { 0xCFA2, 0x606F }, { 0xCFA3, 0x5E0C },
+	{ 0xCFA4, 0x6089 }, { 0xCFA5, 0x819D }, { 0xCFA6, 0x5915 }, { 0xCFA7, 0x60DC }, { 0xCFA8, 0x7184 }, { 0xCFA9, 0x70EF }, { 0xCFAA, 0x6EAA }, { 0xCFAB, 0x6C50 },
+	{ 0xCFAC, 0x7280 }, { 0xCFAD, 0x6A84 }, { 0xCFAE, 0x88AD }, { 0xCFAF, 0x5E2D }, { 0xCFB0, 0x4E60 }, { 0xCFB1, 0x5AB3 }, { 0xCFB2, 0x559C }, { 0xCFB3, 0x94E3 },
+	{ 0xCFB4, 0x6D17 }, { 0xCFB5, 0x7CFB }, { 0xCFB6, 0x9699 }, { 0xCFB7, 0x620F }, { 0xCFB8, 0x7EC6 }, { 0xCFB9, 0x778E }, { 0xCFBA, 0x867E }, { 0xCFBB, 0x5323 },
+	{ 0xCFBC, 0x971E }, { 0xCFBD, 0x8F96 }, { 0xCFBE, 0x6687 }, { 0xCFBF, 0x5CE1 }, { 0xCFC0, 0x4FA0 }, { 0xCFC1, 0x72ED }, { 0xCFC2, 0x4E0B }, { 0xCFC3, 0x53A6 },
+	{ 0xCFC4, 0x590F }, { 0xCFC5, 0x5413 }, { 0xCFC6, 0x6380 }, { 0xCFC7, 0x9528 }, { 0xCFC8, 0x5148 }, { 0xCFC9, 0x4ED9 }, { 0xCFCA, 0x9C9C }, { 0xCFCB, 0x7EA4 },
+	{ 0xCFCC, 0x54B8 }, { 0xCFCD, 0x8D24 }, { 0xCFCE, 0x8854 }, { 0xCFCF, 0x8237 }, { 0xCFD0, 0x95F2 }, { 0xCFD1, 0x6D8E }, { 0xCFD2, 0x5F26 }, { 0xCFD3, 0x5ACC },
+	{ 0xCFD4, 0x663E }, { 0xCFD5, 0x9669 }, { 0xCFD6, 0x73B0 }, { 0xCFD7, 0x732E }, { 0xCFD8, 0x53BF }, { 0xCFD9, 0x817A }, { 0xCFDA, 0x9985 }, { 0xCFDB, 0x7FA1 },
+	{ 0xCFDC, 0x5BAA }, { 0xCFDD, 0x9677 }, { 0xCFDE, 0x9650 }, { 0xCFDF, 0x7EBF }, { 0xCFE0, 0x76F8 }, { 0xCFE1, 0x53A2 }, { 0xCFE2, 0x9576 }, { 0xCFE3, 0x9999 },
+	{ 0xCFE4, 0x7BB1 }, { 0xCFE5, 0x8944 }, { 0xCFE6, 0x6E58 }, { 0xCFE7, 0x4E61 }, { 0xCFE8, 0x7FD4 }, { 0xCFE9, 0x7965 }, { 0xCFEA, 0x8BE6 }, { 0xCFEB, 0x60F3 },
+	{ 0xCFEC, 0x54CD }, { 0xCFED, 0x4EAB }, { 0xCFEE, 0x9879 }, { 0xCFEF, 0x5DF7 }, { 0xCFF0, 0x6A61 }, { 0xCFF1, 0x50CF }, { 0xCFF2, 0x5411 }, { 0xCFF3, 0x8C61 },
+	{ 0xCFF4, 0x8427 }, { 0xCFF5, 0x785D }, { 0xCFF6, 0x9704 }, { 0xCFF7, 0x524A }, { 0xCFF8, 0x54EE }, { 0xCFF9, 0x56A3 }, { 0xCFFA, 0x9500 }, { 0xCFFB, 0x6D88 },
+	{ 0xCFFC, 0x5BB5 }, { 0xCFFD, 0x6DC6 }, { 0xCFFE, 0x6653 }, { 0xD0A1, 0x5C0F }, { 0xD0A2, 0x5B5D }, { 0xD0A3, 0x6821 }, { 0xD0A4, 0x8096 }, { 0xD0A5, 0x5578 },
+	{ 0xD0A6, 0x7B11 }, { 0xD0A7, 0x6548 }, { 0xD0A8, 0x6954 }, { 0xD0A9, 0x4E9B }, { 0xD0AA, 0x6B47 }, { 0xD0AB, 0x874E }, { 0xD0AC, 0x978B }, { 0xD0AD, 0x534F },
+	{ 0xD0AE, 0x631F }, { 0xD0AF, 0x643A }, { 0xD0B0, 0x90AA }, { 0xD0B1, 0x659C }, { 0xD0B2, 0x80C1 }, { 0xD0B3, 0x8C10 }, { 0xD0B4, 0x5199 }, { 0xD0B5, 0x68B0 },
+	{ 0xD0B6, 0x5378 }, { 0xD0B7, 0x87F9 }, { 0xD0B8, 0x61C8 }, { 0xD0B9, 0x6CC4 }, { 0xD0BA, 0x6CFB }, { 0xD0BB, 0x8C22 }, { 0xD0BC, 0x5C51 }, { 0xD0BD, 0x85AA },
+	{ 0xD0BE, 0x82AF }, { 0xD0BF, 0x950C }, { 0xD0C0, 0x6B23 }, { 0xD0C1, 0x8F9B }, { 0xD0C2, 0x65B0 }, { 0xD0C3, 0x5FFB }, { 0xD0C4, 0x5FC3 }, { 0xD0C5, 0x4FE1 },
+	{ 0xD0C6, 0x8845 }, { 0xD0C7, 0x661F }, { 0xD0C8, 0x8165 }, { 0xD0C9, 0x7329 }, { 0xD0CA, 0x60FA }, { 0xD0CB, 0x5174 }, { 0xD0CC, 0x5211 }, { 0xD0CD, 0x578B },
+	{ 0xD0CE, 0x5F62 }, { 0xD0CF, 0x90A2 }, { 0xD0D0, 0x884C }, { 0xD0D1, 0x9192 }, { 0xD0D2, 0x5E78 }, { 0xD0D3, 0x674F }, { 0xD0D4, 0x6027 }, { 0xD0D5, 0x59D3 },
+	{ 0xD0D6, 0x5144 }, { 0xD0D7, 0x51F6 }, { 0xD0D8, 0x80F8 }, { 0xD0D9, 0x5308 }, { 0xD0DA, 0x6C79 }, { 0xD0DB, 0x96C4 }, { 0xD0DC, 0x718A }, { 0xD0DD, 0x4F11 },
+	{ 0xD0DE, 0x4FEE }, { 0xD0DF, 0x7F9E }, { 0xD0E0, 0x673D }, { 0xD0E1, 0x55C5 }, { 0xD0E2, 0x9508 }, { 0xD0E3, 0x79C0 }, { 0xD0E4, 0x8896 }, { 0xD0E5, 0x7EE3 },
+	{ 0xD0E6, 0x589F }, { 0xD0E7, 0x620C }, { 0xD0E8, 0x9700 }, { 0xD0E9, 0x865A }, { 0xD0EA, 0x5618 }, { 0xD0EB, 0x987B }, { 0xD0EC, 0x5F90 }, { 0xD0ED, 0x8BB8 },
+	{ 0xD0EE, 0x84C4 }, { 0xD0EF, 0x9157 }, { 0xD0F0, 0x53D9 }, { 0xD0F1, 0x65ED }, { 0xD0F2, 0x5E8F }, { 0xD0F3, 0x755C }, { 0xD0F4, 0x6064 }, { 0xD0F5, 0x7D6E },
+	{ 0xD0F6, 0x5A7F }, { 0xD0F7, 0x7EEA }, { 0xD0F8, 0x7EED }, { 0xD0F9, 0x8F69 }, { 0xD0FA, 0x55A7 }, { 0xD0FB, 0x5BA3 }, { 0xD0FC, 0x60AC }, { 0xD0FD, 0x65CB },
+	{ 0xD0FE, 0x7384 }, { 0xD1A1, 0x9009 }, { 0xD1A2, 0x7663 }, { 0xD1A3, 0x7729 }, { 0xD1A4, 0x7EDA }, { 0xD1A5, 0x9774 }, { 0xD1A6, 0x859B }, { 0xD1A7, 0x5B66 },
+	{ 0xD1A8, 0x7A74 }, { 0xD1A9, 0x96EA }, { 0xD1AA, 0x8840 }, { 0xD1AB, 0x52CB }, { 0xD1AC, 0x718F }, { 0xD1AD, 0x5FAA }, { 0xD1AE, 0x65EC }, { 0xD1AF, 0x8BE2 },
+	{ 0xD1B0, 0x5BFB }, { 0xD1B1, 0x9A6F }, { 0xD1B2, 0x5DE1 }, { 0xD1B3, 0x6B89 }, { 0xD1B4, 0x6C5B }, { 0xD1B5, 0x8BAD }, { 0xD1B6, 0x8BAF }, { 0xD1B7, 0x900A },
+	{ 0xD1B8, 0x8FC5 }, { 0xD1B9, 0x538B }, { 0xD1BA, 0x62BC }, { 0xD1BB, 0x9E26 }, { 0xD1BC, 0x9E2D }, { 0xD1BD, 0x5440 }, { 0xD1BE, 0x4E2B }, { 0xD1BF, 0x82BD },
+	{ 0xD1C0, 0x7259 }, { 0xD1C1, 0x869C }, { 0xD1C2, 0x5D16 }, { 0xD1C3, 0x8859 }, { 0xD1C4, 0x6DAF }, { 0xD1C5, 0x96C5 }, { 0xD1C6, 0x54D1 }, { 0xD1C7, 0x4E9A },
+	{ 0xD1C8, 0x8BB6 }, { 0xD1C9, 0x7109 }, { 0xD1CA, 0x54BD }, { 0xD1CB, 0x9609 }, { 0xD1CC, 0x70DF }, { 0xD1CD, 0x6DF9 }, { 0xD1CE, 0x76D0 }, { 0xD1CF, 0x4E25 },
+	{ 0xD1D0, 0x7814 }, { 0xD1D1, 0x8712 }, { 0xD1D2, 0x5CA9 }, { 0xD1D3, 0x5EF6 }, { 0xD1D4, 0x8A00 }, { 0xD1D5, 0x989C }, { 0xD1D6, 0x960E }, { 0xD1D7, 0x708E },
+	{ 0xD1D8, 0x6CBF }, { 0xD1D9, 0x5944 }, { 0xD1DA, 0x63A9 }, { 0xD1DB, 0x773C }, { 0xD1DC, 0x884D }, { 0xD1DD, 0x6F14 }, { 0xD1DE, 0x8273 }, { 0xD1DF, 0x5830 },
+	{ 0xD1E0, 0x71D5 }, { 0xD1E1, 0x538C }, { 0xD1E2, 0x781A }, { 0xD1E3, 0x96C1 }, { 0xD1E4, 0x5501 }, { 0xD1E5, 0x5F66 }, { 0xD1E6, 0x7130 }, { 0xD1E7, 0x5BB4 },
+	{ 0xD1E8, 0x8C1A }, { 0xD1E9, 0x9A8C }, { 0xD1EA, 0x6B83 }, { 0xD1EB, 0x592E }, { 0xD1EC, 0x9E2F }, { 0xD1ED, 0x79E7 }, { 0xD1EE, 0x6768 }, { 0xD1EF, 0x626C },
+	{ 0xD1F0, 0x4F6F }, { 0xD1F1, 0x75A1 }, { 0xD1F2, 0x7F8A }, { 0xD1F3, 0x6D0B }, { 0xD1F4, 0x9633 }, { 0xD1F5, 0x6C27 }, { 0xD1F6, 0x4EF0 }, { 0xD1F7, 0x75D2 },
+	{ 0xD1F8, 0x517B }, { 0xD1F9, 0x6837 }, { 0xD1FA, 0x6F3E }, { 0xD1FB, 0x9080 }, { 0xD1FC, 0x8170 }, { 0xD1FD, 0x5996 }, { 0xD1FE, 0x7476 }, { 0xD2A1, 0x6447 },
+	{ 0xD2A2, 0x5C27 }, { 0xD2A3, 0x9065 }, { 0xD2A4, 0x7A91 }, { 0xD2A5, 0x8C23 }, { 0xD2A6, 0x59DA }, { 0xD2A7, 0x54AC }, { 0xD2A8, 0x8200 }, { 0xD2A9, 0x836F },
+	{ 0xD2AA, 0x8981 }, { 0xD2AB, 0x8000 }, { 0xD2AC, 0x6930 }, { 0xD2AD, 0x564E }, { 0xD2AE, 0x8036 }, { 0xD2AF, 0x7237 }, { 0xD2B0, 0x91CE }, { 0xD2B1, 0x51B6 },
+	{ 0xD2B2, 0x4E5F }, { 0xD2B3, 0x9875 }, { 0xD2B4, 0x6396 }, { 0xD2B5, 0x4E1A }, { 0xD2B6, 0x53F6 }, { 0xD2B7, 0x66F3 }, { 0xD2B8, 0x814B }, { 0xD2B9, 0x591C },
+	{ 0xD2BA, 0x6DB2 }, { 0xD2BB, 0x4E00 }, { 0xD2BC, 0x58F9 }, { 0xD2BD, 0x533B }, { 0xD2BE, 0x63D6 }, { 0xD2BF, 0x94F1 }, { 0xD2C0, 0x4F9D }, { 0xD2C1, 0x4F0A },
+	{ 0xD2C2, 0x8863 }, { 0xD2C3, 0x9890 }, { 0xD2C4, 0x5937 }, { 0xD2C5, 0x9057 }, { 0xD2C6, 0x79FB }, { 0xD2C7, 0x4EEA }, { 0xD2C8, 0x80F0 }, { 0xD2C9, 0x7591 },
+	{ 0xD2CA, 0x6C82 }, { 0xD2CB, 0x5B9C }, { 0xD2CC, 0x59E8 }, { 0xD2CD, 0x5F5D }, { 0xD2CE, 0x6905 }, { 0xD2CF, 0x8681 }, { 0xD2D0, 0x501A }, { 0xD2D1, 0x5DF2 },
+	{ 0xD2D2, 0x4E59 }, { 0xD2D3, 0x77E3 }, { 0xD2D4, 0x4EE5 }, { 0xD2D5, 0x827A }, { 0xD2D6, 0x6291 }, { 0xD2D7, 0x6613 }, { 0xD2D8, 0x9091 }, { 0xD2D9, 0x5C79 },
+	{ 0xD2DA, 0x4EBF }, { 0xD2DB, 0x5F79 }, { 0xD2DC, 0x81C6 }, { 0xD2DD, 0x9038 }, { 0xD2DE, 0x8084 }, { 0xD2DF, 0x75AB }, { 0xD2E0, 0x4EA6 }, { 0xD2E1, 0x88D4 },
+	{ 0xD2E2, 0x610F }, { 0xD2E3, 0x6BC5 }, { 0xD2E4, 0x5FC6 }, { 0xD2E5, 0x4E49 }, { 0xD2E6, 0x76CA }, { 0xD2E7, 0x6EA2 }, { 0xD2E8, 0x8BE3 }, { 0xD2E9, 0x8BAE },
+	{ 0xD2EA, 0x8C0A }, { 0xD2EB, 0x8BD1 }, { 0xD2EC, 0x5F02 }, { 0xD2ED, 0x7FFC }, { 0xD2EE, 0x7FCC }, { 0xD2EF, 0x7ECE }, { 0xD2F0, 0x8335 }, { 0xD2F1, 0x836B },
+	{ 0xD2F2, 0x56E0 }, { 0xD2F3, 0x6BB7 }, { 0xD2F4, 0x97F3 }, { 0xD2F5, 0x9634 }, { 0xD2F6, 0x59FB }, { 0xD2F7, 0x541F }, { 0xD2F8, 0x94F6 }, { 0xD2F9, 0x6DEB },
+	{ 0xD2FA, 0x5BC5 }, { 0xD2FB, 0x996E }, { 0xD2FC, 0x5C39 }, { 0xD2FD, 0x5F15 }, { 0xD2FE, 0x9690 }, { 0xD3A1, 0x5370 }, { 0xD3A2, 0x82F1 }, { 0xD3A3, 0x6A31 },
+	{ 0xD3A4, 0x5A74 }, { 0xD3A5, 0x9E70 }, { 0xD3A6, 0x5E94 }, { 0xD3A7, 0x7F28 }, { 0xD3A8, 0x83B9 }, { 0xD3A9, 0x8424 }, { 0xD3AA, 0x8425 }, { 0xD3AB, 0x8367 },
+	{ 0xD3AC, 0x8747 }, { 0xD3AD, 0x8FCE }, { 0xD3AE, 0x8D62 }, { 0xD3AF, 0x76C8 }, { 0xD3B0, 0x5F71 }, { 0xD3B1, 0x9896 }, { 0xD3B2, 0x786C }, { 0xD3B3, 0x6620 },
+	{ 0xD3B4, 0x54DF }, { 0xD3B5, 0x62E5 }, { 0xD3B6, 0x4F63 }, { 0xD3B7, 0x81C3 }, { 0xD3B8, 0x75C8 }, { 0xD3B9, 0x5EB8 }, { 0xD3BA, 0x96CD }, { 0xD3BB, 0x8E0A },
+	{ 0xD3BC, 0x86F9 }, { 0xD3BD, 0x548F }, { 0xD3BE, 0x6CF3 }, { 0xD3BF, 0x6D8C }, { 0xD3C0, 0x6C38 }, { 0xD3C1, 0x607F }, { 0xD3C2, 0x52C7 }, { 0xD3C3, 0x7528 },
+	{ 0xD3C4, 0x5E7D }, { 0xD3C5, 0x4F18 }, { 0xD3C6, 0x60A0 }, { 0xD3C7, 0x5FE7 }, { 0xD3C8, 0x5C24 }, { 0xD3C9, 0x7531 }, { 0xD3CA, 0x90AE }, { 0xD3CB, 0x94C0 },
+	{ 0xD3CC, 0x72B9 }, { 0xD3CD, 0x6CB9 }, { 0xD3CE, 0x6E38 }, { 0xD3CF, 0x9149 }, { 0xD3D0, 0x6709 }, { 0xD3D1, 0x53CB }, { 0xD3D2, 0x53F3 }, { 0xD3D3, 0x4F51 },
+	{ 0xD3D4, 0x91C9 }, { 0xD3D5, 0x8BF1 }, { 0xD3D6, 0x53C8 }, { 0xD3D7, 0x5E7C }, { 0xD3D8, 0x8FC2 }, { 0xD3D9, 0x6DE4 }, { 0xD3DA, 0x4E8E }, { 0xD3DB, 0x76C2 },
+	{ 0xD3DC, 0x6986 }, { 0xD3DD, 0x865E }, { 0xD3DE, 0x611A }, { 0xD3DF, 0x8206 }, { 0xD3E0, 0x4F59 }, { 0xD3E1, 0x4FDE }, { 0xD3E2, 0x903E }, { 0xD3E3, 0x9C7C },
+	{ 0xD3E4, 0x6109 }, { 0xD3E5, 0x6E1D }, { 0xD3E6, 0x6E14 }, { 0xD3E7, 0x9685 }, { 0xD3E8, 0x4E88 }, { 0xD3E9, 0x5A31 }, { 0xD3EA, 0x96E8 }, { 0xD3EB, 0x4E0E },
+	{ 0xD3EC, 0x5C7F }, { 0xD3ED, 0x79B9 }, { 0xD3EE, 0x5B87 }, { 0xD3EF, 0x8BED }, { 0xD3F0, 0x7FBD }, { 0xD3F1, 0x7389 }, { 0xD3F2, 0x57DF }, { 0xD3F3, 0x828B },
+	{ 0xD3F4, 0x90C1 }, { 0xD3F5, 0x5401 }, { 0xD3F6, 0x9047 }, { 0xD3F7, 0x55BB }, { 0xD3F8, 0x5CEA }, { 0xD3F9, 0x5FA1 }, { 0xD3FA, 0x6108 }, { 0xD3FB, 0x6B32 },
+	{ 0xD3FC, 0x72F1 }, { 0xD3FD, 0x80B2 }, { 0xD3FE, 0x8A89 }, { 0xD4A1, 0x6D74 }, { 0xD4A2, 0x5BD3 }, { 0xD4A3, 0x88D5 }, { 0xD4A4, 0x9884 }, { 0xD4A5, 0x8C6B },
+	{ 0xD4A6, 0x9A6D }, { 0xD4A7, 0x9E33 }, { 0xD4A8, 0x6E0A }, { 0xD4A9, 0x51A4 }, { 0xD4AA, 0x5143 }, { 0xD4AB, 0x57A3 }, { 0xD4AC, 0x8881 }, { 0xD4AD, 0x539F },
+	{ 0xD4AE, 0x63F4 }, { 0xD4AF, 0x8F95 }, { 0xD4B0, 0x56ED }, { 0xD4B1, 0x5458 }, { 0xD4B2, 0x5706 }, { 0xD4B3, 0x733F }, { 0xD4B4, 0x6E90 }, { 0xD4B5, 0x7F18 },
+	{ 0xD4B6, 0x8FDC }, { 0xD4B7, 0x82D1 }, { 0xD4B8, 0x613F }, { 0xD4B9, 0x6028 }, { 0xD4BA, 0x9662 }, { 0xD4BB, 0x66F0 }, { 0xD4BC, 0x7EA6 }, { 0xD4BD, 0x8D8A },
+	{ 0xD4BE, 0x8DC3 }, { 0xD4BF, 0x94A5 }, { 0xD4C0, 0x5CB3 }, { 0xD4C1, 0x7CA4 }, { 0xD4C2, 0x6708 }, { 0xD4C3, 0x60A6 }, { 0xD4C4, 0x9605 }, { 0xD4C5, 0x8018 },
+	{ 0xD4C6, 0x4E91 }, { 0xD4C7, 0x90E7 }, { 0xD4C8, 0x5300 }, { 0xD4C9, 0x9668 }, { 0xD4CA, 0x5141 }, { 0xD4CB, 0x8FD0 }, { 0xD4CC, 0x8574 }, { 0xD4CD, 0x915D },
+	{ 0xD4CE, 0x6655 }, { 0xD4CF, 0x97F5 }, { 0xD4D0, 0x5B55 }, { 0xD4D1, 0x531D }, { 0xD4D2, 0x7838 }, { 0xD4D3, 0x6742 }, { 0xD4D4, 0x683D }, { 0xD4D5, 0x54C9 },
+	{ 0xD4D6, 0x707E }, { 0xD4D7, 0x5BB0 }, { 0xD4D8, 0x8F7D }, { 0xD4D9, 0x518D }, { 0xD4DA, 0x5728 }, { 0xD4DB, 0x54B1 }, { 0xD4DC, 0x6512 }, { 0xD4DD, 0x6682 },
+	{ 0xD4DE, 0x8D5E }, { 0xD4DF, 0x8D43 }, { 0xD4E0, 0x810F }, { 0xD4E1, 0x846C }, { 0xD4E2, 0x906D }, { 0xD4E3, 0x7CDF }, { 0xD4E4, 0x51FF }, { 0xD4E5, 0x85FB },
+	{ 0xD4E6, 0x67A3 }, { 0xD4E7, 0x65E9 }, { 0xD4E8, 0x6FA1 }, { 0xD4E9, 0x86A4 }, { 0xD4EA, 0x8E81 }, { 0xD4EB, 0x566A }, { 0xD4EC, 0x9020 }, { 0xD4ED, 0x7682 },
+	{ 0xD4EE, 0x7076 }, { 0xD4EF, 0x71E5 }, { 0xD4F0, 0x8D23 }, { 0xD4F1, 0x62E9 }, { 0xD4F2, 0x5219 }, { 0xD4F3, 0x6CFD }, { 0xD4F4, 0x8D3C }, { 0xD4F5, 0x600E },
+	{ 0xD4F6, 0x589E }, { 0xD4F7, 0x618E }, { 0xD4F8, 0x66FE }, { 0xD4F9, 0x8D60 }, { 0xD4FA, 0x624E }, { 0xD4FB, 0x55B3 }, { 0xD4FC, 0x6E23 }, { 0xD4FD, 0x672D },
+	{ 0xD4FE, 0x8F67 }, { 0xD5A1, 0x94E1 }, { 0xD5A2, 0x95F8 }, { 0xD5A3, 0x7728 }, { 0xD5A4, 0x6805 }, { 0xD5A5, 0x69A8 }, { 0xD5A6, 0x548B }, { 0xD5A7, 0x4E4D },
+	{ 0xD5A8, 0x70B8 }, { 0xD5A9, 0x8BC8 }, { 0xD5AA, 0x6458 }, { 0xD5AB, 0x658B }, { 0xD5AC, 0x5B85 }, { 0xD5AD, 0x7A84 }, { 0xD5AE, 0x503A }, { 0xD5AF, 0x5BE8 },
+	{ 0xD5B0, 0x77BB }, { 0xD5B1, 0x6BE1 }, { 0xD5B2, 0x8A79 }, { 0xD5B3, 0x7C98 }, { 0xD5B4, 0x6CBE }, { 0xD5B5, 0x76CF }, { 0xD5B6, 0x65A9 }, { 0xD5B7, 0x8F97 },
+	{ 0xD5B8, 0x5D2D }, { 0xD5B9, 0x5C55 }, { 0xD5BA, 0x8638 }, { 0xD5BB, 0x6808 }, { 0xD5BC, 0x5360 }, { 0xD5BD, 0x6218 }, { 0xD5BE, 0x7AD9 }, { 0xD5BF, 0x6E5B },
+	{ 0xD5C0, 0x7EFD }, { 0xD5C1, 0x6A1F }, { 0xD5C2, 0x7AE0 }, { 0xD5C3, 0x5F70 }, { 0xD5C4, 0x6F33 }, { 0xD5C5, 0x5F20 }, { 0xD5C6, 0x638C }, { 0xD5C7, 0x6DA8 },
+	{ 0xD5C8, 0x6756 }, { 0xD5C9, 0x4E08 }, { 0xD5CA, 0x5E10 }, { 0xD5CB, 0x8D26 }, { 0xD5CC, 0x4ED7 }, { 0xD5CD, 0x80C0 }, { 0xD5CE, 0x7634 }, { 0xD5CF, 0x969C },
+	{ 0xD5D0, 0x62DB }, { 0xD5D1, 0x662D }, { 0xD5D2, 0x627E }, { 0xD5D3, 0x6CBC }, { 0xD5D4, 0x8D75 }, { 0xD5D5, 0x7167 }, { 0xD5D6, 0x7F69 }, { 0xD5D7, 0x5146 },
+	{ 0xD5D8, 0x8087 }, { 0xD5D9, 0x53EC }, { 0xD5DA, 0x906E }, { 0xD5DB, 0x6298 }, { 0xD5DC, 0x54F2 }, { 0xD5DD, 0x86F0 }, { 0xD5DE, 0x8F99 }, { 0xD5DF, 0x8005 },
+	{ 0xD5E0, 0x9517 }, { 0xD5E1, 0x8517 }, { 0xD5E2, 0x8FD9 }, { 0xD5E3, 0x6D59 }, { 0xD5E4, 0x73CD }, { 0xD5E5, 0x659F }, { 0xD5E6, 0x771F }, { 0xD5E7, 0x7504 },
+	{ 0xD5E8, 0x7827 }, { 0xD5E9, 0x81FB }, { 0xD5EA, 0x8D1E }, { 0xD5EB, 0x9488 }, { 0xD5EC, 0x4FA6 }, { 0xD5ED, 0x6795 }, { 0xD5EE, 0x75B9 }, { 0xD5EF, 0x8BCA },
+	{ 0xD5F0, 0x9707 }, { 0xD5F1, 0x632F }, { 0xD5F2, 0x9547 }, { 0xD5F3, 0x9635 }, { 0xD5F4, 0x84B8 }, { 0xD5F5, 0x6323 }, { 0xD5F6, 0x7741 }, { 0xD5F7, 0x5F81 },
+	{ 0xD5F8, 0x72F0 }, { 0xD5F9, 0x4E89 }, { 0xD5FA, 0x6014 }, { 0xD5FB, 0x6574 }, { 0xD5FC, 0x62EF }, { 0xD5FD, 0x6B63 }, { 0xD5FE, 0x653F }, { 0xD6A1, 0x5E27 },
+	{ 0xD6A2, 0x75C7 }, { 0xD6A3, 0x90D1 }, { 0xD6A4, 0x8BC1 }, { 0xD6A5, 0x829D }, { 0xD6A6, 0x679D }, { 0xD6A7, 0x652F }, { 0xD6A8, 0x5431 }, { 0xD6A9, 0x8718 },
+	{ 0xD6AA, 0x77E5 }, { 0xD6AB, 0x80A2 }, { 0xD6AC, 0x8102 }, { 0xD6AD, 0x6C41 }, { 0xD6AE, 0x4E4B }, { 0xD6AF, 0x7EC7 }, { 0xD6B0, 0x804C }, { 0xD6B1, 0x76F4 },
+	{ 0xD6B2, 0x690D }, { 0xD6B3, 0x6B96 }, { 0xD6B4, 0x6267 }, { 0xD6B5, 0x503C }, { 0xD6B6, 0x4F84 }, { 0xD6B7, 0x5740 }, { 0xD6B8, 0x6307 }, { 0xD6B9, 0x6B62 },
+	{ 0xD6BA, 0x8DBE }, { 0xD6BB, 0x53EA }, { 0xD6BC, 0x65E8 }, { 0xD6BD, 0x7EB8 }, { 0xD6BE, 0x5FD7 }, { 0xD6BF, 0x631A }, { 0xD6C0, 0x63B7 }, { 0xD6C1, 0x81F3 },
+	{ 0xD6C2, 0x81F4 }, { 0xD6C3, 0x7F6E }, { 0xD6C4, 0x5E1C }, { 0xD6C5, 0x5CD9 }, { 0xD6C6, 0x5236 }, { 0xD6C7, 0x667A }, { 0xD6C8, 0x79E9 }, { 0xD6C9, 0x7A1A },
+	{ 0xD6CA, 0x8D28 }, { 0xD6CB, 0x7099 }, { 0xD6CC, 0x75D4 }, { 0xD6CD, 0x6EDE }, { 0xD6CE, 0x6CBB }, { 0xD6CF, 0x7A92 }, { 0xD6D0, 0x4E2D }, { 0xD6D1, 0x76C5 },
+	{ 0xD6D2, 0x5FE0 }, { 0xD6D3, 0x949F }, { 0xD6D4, 0x8877 }, { 0xD6D5, 0x7EC8 }, { 0xD6D6, 0x79CD }, { 0xD6D7, 0x80BF }, { 0xD6D8, 0x91CD }, { 0xD6D9, 0x4EF2 },
+	{ 0xD6DA, 0x4F17 }, { 0xD6DB, 0x821F }, { 0xD6DC, 0x5468 }, { 0xD6DD, 0x5DDE }, { 0xD6DE, 0x6D32 }, { 0xD6DF, 0x8BCC }, { 0xD6E0, 0x7CA5 }, { 0xD6E1, 0x8F74 },
+	{ 0xD6E2, 0x8098 }, { 0xD6E3, 0x5E1A }, { 0xD6E4, 0x5492 }, { 0xD6E5, 0x76B1 }, { 0xD6E6, 0x5B99 }, { 0xD6E7, 0x663C }, { 0xD6E8, 0x9AA4 }, { 0xD6E9, 0x73E0 },
+	{ 0xD6EA, 0x682A }, { 0xD6EB, 0x86DB }, { 0xD6EC, 0x6731 }, { 0xD6ED, 0x732A }, { 0xD6EE, 0x8BF8 }, { 0xD6EF, 0x8BDB }, { 0xD6F0, 0x9010 }, { 0xD6F1, 0x7AF9 },
+	{ 0xD6F2, 0x70DB }, { 0xD6F3, 0x716E }, { 0xD6F4, 0x62C4 }, { 0xD6F5, 0x77A9 }, { 0xD6F6, 0x5631 }, { 0xD6F7, 0x4E3B }, { 0xD6F8, 0x8457 }, { 0xD6F9, 0x67F1 },
+	{ 0xD6FA, 0x52A9 }, { 0xD6FB, 0x86C0 }, { 0xD6FC, 0x8D2E }, { 0xD6FD, 0x94F8 }, { 0xD6FE, 0x7B51 }, { 0xD7A1, 0x4F4F }, { 0xD7A2, 0x6CE8 }, { 0xD7A3, 0x795D },
+	{ 0xD7A4, 0x9A7B }, { 0xD7A5, 0x6293 }, { 0xD7A6, 0x722A }, { 0xD7A7, 0x62FD }, { 0xD7A8, 0x4E13 }, { 0xD7A9, 0x7816 }, { 0xD7AA, 0x8F6C }, { 0xD7AB, 0x64B0 },
+	{ 0xD7AC, 0x8D5A }, { 0xD7AD, 0x7BC6 }, { 0xD7AE, 0x6869 }, { 0xD7AF, 0x5E84 }, { 0xD7B0, 0x88C5 }, { 0xD7B1, 0x5986 }, { 0xD7B2, 0x649E }, { 0xD7B3, 0x58EE },
+	{ 0xD7B4, 0x72B6 }, { 0xD7B5, 0x690E }, { 0xD7B6, 0x9525 }, { 0xD7B7, 0x8FFD }, { 0xD7B8, 0x8D58 }, { 0xD7B9, 0x5760 }, { 0xD7BA, 0x7F00 }, { 0xD7BB, 0x8C06 },
+	{ 0xD7BC, 0x51C6 }, { 0xD7BD, 0x6349 }, { 0xD7BE, 0x62D9 }, { 0xD7BF, 0x5353 }, { 0xD7C0, 0x684C }, { 0xD7C1, 0x7422 }, { 0xD7C2, 0x8301 }, { 0xD7C3, 0x914C },
+	{ 0xD7C4, 0x5544 }, { 0xD7C5, 0x7740 }, { 0xD7C6, 0x707C }, { 0xD7C7, 0x6D4A }, { 0xD7C8, 0x5179 }, { 0xD7C9, 0x54A8 }, { 0xD7CA, 0x8D44 }, { 0xD7CB, 0x59FF },
+	{ 0xD7CC, 0x6ECB }, { 0xD7CD, 0x6DC4 }, { 0xD7CE, 0x5B5C }, { 0xD7CF, 0x7D2B }, { 0xD7D0, 0x4ED4 }, { 0xD7D1, 0x7C7D }, { 0xD7D2, 0x6ED3 }, { 0xD7D3, 0x5B50 },
+	{ 0xD7D4, 0x81EA }, { 0xD7D5, 0x6E0D }, { 0xD7D6, 0x5B57 }, { 0xD7D7, 0x9B03 }, { 0xD7D8, 0x68D5 }, { 0xD7D9, 0x8E2A }, { 0xD7DA, 0x5B97 }, { 0xD7DB, 0x7EFC },
+	{ 0xD7DC, 0x603B }, { 0xD7DD, 0x7EB5 }, { 0xD7DE, 0x90B9 }, { 0xD7DF, 0x8D70 }, { 0xD7E0, 0x594F }, { 0xD7E1, 0x63CD }, { 0xD7E2, 0x79DF }, { 0xD7E3, 0x8DB3 },
+	{ 0xD7E4, 0x5352 }, { 0xD7E5, 0x65CF }, { 0xD7E6, 0x7956 }, { 0xD7E7, 0x8BC5 }, { 0xD7E8, 0x963B }, { 0xD7E9, 0x7EC4 }, { 0xD7EA, 0x94BB }, { 0xD7EB, 0x7E82 },
+	{ 0xD7EC, 0x5634 }, { 0xD7ED, 0x9189 }, { 0xD7EE, 0x6700 }, { 0xD7EF, 0x7F6A }, { 0xD7F0, 0x5C0A }, { 0xD7F1, 0x9075 }, { 0xD7F2, 0x6628 }, { 0xD7F3, 0x5DE6 },
+	{ 0xD7F4, 0x4F50 }, { 0xD7F5, 0x67DE }, { 0xD7F6, 0x505A }, { 0xD7F7, 0x4F5C }, { 0xD7F8, 0x5750 }, { 0xD7F9, 0x5EA7 }, { 0xD8A1, 0x4E8D }, { 0xD8A2, 0x4E0C },
+	{ 0xD8A3, 0x5140 }, { 0xD8A4, 0x4E10 }, { 0xD8A5, 0x5EFF }, { 0xD8A6, 0x5345 }, { 0xD8A7, 0x4E15 }, { 0xD8A8, 0x4E98 }, { 0xD8A9, 0x4E1E }, { 0xD8AA, 0x9B32 },
+	{ 0xD8AB, 0x5B6C }, { 0xD8AC, 0x5669 }, { 0xD8AD, 0x4E28 }, { 0xD8AE, 0x79BA }, { 0xD8AF, 0x4E3F }, { 0xD8B0, 0x5315 }, { 0xD8B1, 0x4E47 }, { 0xD8B2, 0x592D },
+	{ 0xD8B3, 0x723B }, { 0xD8B4, 0x536E }, { 0xD8B5, 0x6C10 }, { 0xD8B6, 0x56DF }, { 0xD8B7, 0x80E4 }, { 0xD8B8, 0x9997 }, { 0xD8B9, 0x6BD3 }, { 0xD8BA, 0x777E },
+	{ 0xD8BB, 0x9F17 }, { 0xD8BC, 0x4E36 }, { 0xD8BD, 0x4E9F }, { 0xD8BE, 0x9F10 }, { 0xD8BF, 0x4E5C }, { 0xD8C0, 0x4E69 }, { 0xD8C1, 0x4E93 }, { 0xD8C2, 0x8288 },
+	{ 0xD8C3, 0x5B5B }, { 0xD8C4, 0x556C }, { 0xD8C5, 0x560F }, { 0xD8C6, 0x4EC4 }, { 0xD8C7, 0x538D }, { 0xD8C8, 0x539D }, { 0xD8C9, 0x53A3 }, { 0xD8CA, 0x53A5 },
+	{ 0xD8CB, 0x53AE }, { 0xD8CC, 0x9765 }, { 0xD8CD, 0x8D5D }, { 0xD8CE, 0x531A }, { 0xD8CF, 0x53F5 }, { 0xD8D0, 0x5326 }, { 0xD8D1, 0x532E }, { 0xD8D2, 0x533E },
+	{ 0xD8D3, 0x8D5C }, { 0xD8D4, 0x5366 }, { 0xD8D5, 0x5363 }, { 0xD8D6, 0x5202 }, { 0xD8D7, 0x5208 }, { 0xD8D8, 0x520E }, { 0xD8D9, 0x522D }, { 0xD8DA, 0x5233 },
+	{ 0xD8DB, 0x523F }, { 0xD8DC, 0x5240 }, { 0xD8DD, 0x524C }, { 0xD8DE, 0x525E }, { 0xD8DF, 0x5261 }, { 0xD8E0, 0x525C }, { 0xD8E1, 0x84AF }, { 0xD8E2, 0x527D },
+	{ 0xD8E3, 0x5282 }, { 0xD8E4, 0x5281 }, { 0xD8E5, 0x5290 }, { 0xD8E6, 0x5293 }, { 0xD8E7, 0x5182 }, { 0xD8E8, 0x7F54 }, { 0xD8E9, 0x4EBB }, { 0xD8EA, 0x4EC3 },
+	{ 0xD8EB, 0x4EC9 }, { 0xD8EC, 0x4EC2 }, { 0xD8ED, 0x4EE8 }, { 0xD8EE, 0x4EE1 }, { 0xD8EF, 0x4EEB }, { 0xD8F0, 0x4EDE }, { 0xD8F1, 0x4F1B }, { 0xD8F2, 0x4EF3 },
+	{ 0xD8F3, 0x4F22 }, { 0xD8F4, 0x4F64 }, { 0xD8F5, 0x4EF5 }, { 0xD8F6, 0x4F25 }, { 0xD8F7, 0x4F27 }, { 0xD8F8, 0x4F09 }, { 0xD8F9, 0x4F2B }, { 0xD8FA, 0x4F5E },
+	{ 0xD8FB, 0x4F67 }, { 0xD8FC, 0x6538 }, { 0xD8FD, 0x4F5A }, { 0xD8FE, 0x4F5D }, { 0xD9A1, 0x4F5F }, { 0xD9A2, 0x4F57 }, { 0xD9A3, 0x4F32 }, { 0xD9A4, 0x4F3D },
+	{ 0xD9A5, 0x4F76 }, { 0xD9A6, 0x4F74 }, { 0xD9A7, 0x4F91 }, { 0xD9A8, 0x4F89 }, { 0xD9A9, 0x4F83 }, { 0xD9AA, 0x4F8F }, { 0xD9AB, 0x4F7E }, { 0xD9AC, 0x4F7B },
+	{ 0xD9AD, 0x4FAA }, { 0xD9AE, 0x4F7C }, { 0xD9AF, 0x4FAC }, { 0xD9B0, 0x4F94 }, { 0xD9B1, 0x4FE6 }, { 0xD9B2, 0x4FE8 }, { 0xD9B3, 0x4FEA }, { 0xD9B4, 0x4FC5 },
+	{ 0xD9B5, 0x4FDA }, { 0xD9B6, 0x4FE3 }, { 0xD9B7, 0x4FDC }, { 0xD9B8, 0x4FD1 }, { 0xD9B9, 0x4FDF }, { 0xD9BA, 0x4FF8 }, { 0xD9BB, 0x5029 }, { 0xD9BC, 0x504C },
+	{ 0xD9BD, 0x4FF3 }, { 0xD9BE, 0x502C }, { 0xD9BF, 0x500F }, { 0xD9C0, 0x502E }, { 0xD9C1, 0x502D }, { 0xD9C2, 0x4FFE }, { 0xD9C3, 0x501C }, { 0xD9C4, 0x500C },
+	{ 0xD9C5, 0x5025 }, { 0xD9C6, 0x5028 }, { 0xD9C7, 0x507E }, { 0xD9C8, 0x5043 }, { 0xD9C9, 0x5055 }, { 0xD9CA, 0x5048 }, { 0xD9CB, 0x504E }, { 0xD9CC, 0x506C },
+	{ 0xD9CD, 0x507B }, { 0xD9CE, 0x50A5 }, { 0xD9CF, 0x50A7 }, { 0xD9D0, 0x50A9 }, { 0xD9D1, 0x50BA }, { 0xD9D2, 0x50D6 }, { 0xD9D3, 0x5106 }, { 0xD9D4, 0x50ED },
+	{ 0xD9D5, 0x50EC }, { 0xD9D6, 0x50E6 }, { 0xD9D7, 0x50EE }, { 0xD9D8, 0x5107 }, { 0xD9D9, 0x510B }, { 0xD9DA, 0x4EDD }, { 0xD9DB, 0x6C3D }, { 0xD9DC, 0x4F58 },
+	{ 0xD9DD, 0x4F65 }, { 0xD9DE, 0x4FCE }, { 0xD9DF, 0x9FA0 }, { 0xD9E0, 0x6C46 }, { 0xD9E1, 0x7C74 }, { 0xD9E2, 0x516E }, { 0xD9E3, 0x5DFD }, { 0xD9E4, 0x9EC9 },
+	{ 0xD9E5, 0x9998 }, { 0xD9E6, 0x5181 }, { 0xD9E7, 0x5914 }, { 0xD9E8, 0x52F9 }, { 0xD9E9, 0x530D }, { 0xD9EA, 0x8A07 }, { 0xD9EB, 0x5310 }, { 0xD9EC, 0x51EB },
+	{ 0xD9ED, 0x5919 }, { 0xD9EE, 0x5155 }, { 0xD9EF, 0x4EA0 }, { 0xD9F0, 0x5156 }, { 0xD9F1, 0x4EB3 }, { 0xD9F2, 0x886E }, { 0xD9F3, 0x88A4 }, { 0xD9F4, 0x4EB5 },
+	{ 0xD9F5, 0x8114 }, { 0xD9F6, 0x88D2 }, { 0xD9F7, 0x7980 }, { 0xD9F8, 0x5B34 }, { 0xD9F9, 0x8803 }, { 0xD9FA, 0x7FB8 }, { 0xD9FB, 0x51AB }, { 0xD9FC, 0x51B1 },
+	{ 0xD9FD, 0x51BD }, { 0xD9FE, 0x51BC }, { 0xDAA1, 0x51C7 }, { 0xDAA2, 0x5196 }, { 0xDAA3, 0x51A2 }, { 0xDAA4, 0x51A5 }, { 0xDAA5, 0x8BA0 }, { 0xDAA6, 0x8BA6 },
+	{ 0xDAA7, 0x8BA7 }, { 0xDAA8, 0x8BAA }, { 0xDAA9, 0x8BB4 }, { 0xDAAA, 0x8BB5 }, { 0xDAAB, 0x8BB7 }, { 0xDAAC, 0x8BC2 }, { 0xDAAD, 0x8BC3 }, { 0xDAAE, 0x8BCB },
+	{ 0xDAAF, 0x8BCF }, { 0xDAB0, 0x8BCE }, { 0xDAB1, 0x8BD2 }, { 0xDAB2, 0x8BD3 }, { 0xDAB3, 0x8BD4 }, { 0xDAB4, 0x8BD6 }, { 0xDAB5, 0x8BD8 }, { 0xDAB6, 0x8BD9 },
+	{ 0xDAB7, 0x8BDC }, { 0xDAB8, 0x8BDF }, { 0xDAB9, 0x8BE0 }, { 0xDABA, 0x8BE4 }, { 0xDABB, 0x8BE8 }, { 0xDABC, 0x8BE9 }, { 0xDABD, 0x8BEE }, { 0xDABE, 0x8BF0 },
+	{ 0xDABF, 0x8BF3 }, { 0xDAC0, 0x8BF6 }, { 0xDAC1, 0x8BF9 }, { 0xDAC2, 0x8BFC }, { 0xDAC3, 0x8BFF }, { 0xDAC4, 0x8C00 }, { 0xDAC5, 0x8C02 }, { 0xDAC6, 0x8C04 },
+	{ 0xDAC7, 0x8C07 }, { 0xDAC8, 0x8C0C }, { 0xDAC9, 0x8C0F }, { 0xDACA, 0x8C11 }, { 0xDACB, 0x8C12 }, { 0xDACC, 0x8C14 }, { 0xDACD, 0x8C15 }, { 0xDACE, 0x8C16 },
+	{ 0xDACF, 0x8C19 }, { 0xDAD0, 0x8C1B }, { 0xDAD1, 0x8C18 }, { 0xDAD2, 0x8C1D }, { 0xDAD3, 0x8C1F }, { 0xDAD4, 0x8C20 }, { 0xDAD5, 0x8C21 }, { 0xDAD6, 0x8C25 },
+	{ 0xDAD7, 0x8C27 }, { 0xDAD8, 0x8C2A }, { 0xDAD9, 0x8C2B }, { 0xDADA, 0x8C2E }, { 0xDADB, 0x8C2F }, { 0xDADC, 0x8C32 }, { 0xDADD, 0x8C33 }, { 0xDADE, 0x8C35 },
+	{ 0xDADF, 0x8C36 }, { 0xDAE0, 0x5369 }, { 0xDAE1, 0x537A }, { 0xDAE2, 0x961D }, { 0xDAE3, 0x9622 }, { 0xDAE4, 0x9621 }, { 0xDAE5, 0x9631 }, { 0xDAE6, 0x962A },
+	{ 0xDAE7, 0x963D }, { 0xDAE8, 0x963C }, { 0xDAE9, 0x9642 }, { 0xDAEA, 0x9649 }, { 0xDAEB, 0x9654 }, { 0xDAEC, 0x965F }, { 0xDAED, 0x9667 }, { 0xDAEE, 0x966C },
+	{ 0xDAEF, 0x9672 }, { 0xDAF0, 0x9674 }, { 0xDAF1, 0x9688 }, { 0xDAF2, 0x968D }, { 0xDAF3, 0x9697 }, { 0xDAF4, 0x96B0 }, { 0xDAF5, 0x9097 }, { 0xDAF6, 0x909B },
+	{ 0xDAF7, 0x909D }, { 0xDAF8, 0x9099 }, { 0xDAF9, 0x90AC }, { 0xDAFA, 0x90A1 }, { 0xDAFB, 0x90B4 }, { 0xDAFC, 0x90B3 }, { 0xDAFD, 0x90B6 }, { 0xDAFE, 0x90BA },
+	{ 0xDBA1, 0x90B8 }, { 0xDBA2, 0x90B0 }, { 0xDBA3, 0x90CF }, { 0xDBA4, 0x90C5 }, { 0xDBA5, 0x90BE }, { 0xDBA6, 0x90D0 }, { 0xDBA7, 0x90C4 }, { 0xDBA8, 0x90C7 },
+	{ 0xDBA9, 0x90D3 }, { 0xDBAA, 0x90E6 }, { 0xDBAB, 0x90E2 }, { 0xDBAC, 0x90DC }, { 0xDBAD, 0x90D7 }, { 0xDBAE, 0x90DB }, { 0xDBAF, 0x90EB }, { 0xDBB0, 0x90EF },
+	{ 0xDBB1, 0x90FE }, { 0xDBB2, 0x9104 }, { 0xDBB3, 0x9122 }, { 0xDBB4, 0x911E }, { 0xDBB5, 0x9123 }, { 0xDBB6, 0x9131 }, { 0xDBB7, 0x912F }, { 0xDBB8, 0x9139 },
+	{ 0xDBB9, 0x9143 }, { 0xDBBA, 0x9146 }, { 0xDBBB, 0x520D }, { 0xDBBC, 0x5942 }, { 0xDBBD, 0x52A2 }, { 0xDBBE, 0x52AC }, { 0xDBBF, 0x52AD }, { 0xDBC0, 0x52BE },
+	{ 0xDBC1, 0x54FF }, { 0xDBC2, 0x52D0 }, { 0xDBC3, 0x52D6 }, { 0xDBC4, 0x52F0 }, { 0xDBC5, 0x53DF }, { 0xDBC6, 0x71EE }, { 0xDBC7, 0x77CD }, { 0xDBC8, 0x5EF4 },
+	{ 0xDBC9, 0x51F5 }, { 0xDBCA, 0x51FC }, { 0xDBCB, 0x9B2F }, { 0xDBCC, 0x53B6 }, { 0xDBCD, 0x5F01 }, { 0xDBCE, 0x755A }, { 0xDBCF, 0x5DEF }, { 0xDBD0, 0x574C },
+	{ 0xDBD1, 0x57A9 }, { 0xDBD2, 0x57A1 }, { 0xDBD3, 0x587E }, { 0xDBD4, 0x58BC }, { 0xDBD5, 0x58C5 }, { 0xDBD6, 0x58D1 }, { 0xDBD7, 0x5729 }, { 0xDBD8, 0x572C },
+	{ 0xDBD9, 0x572A }, { 0xDBDA, 0x5733 }, { 0xDBDB, 0x5739 }, { 0xDBDC, 0x572E }, { 0xDBDD, 0x572F }, { 0xDBDE, 0x575C }, { 0xDBDF, 0x573B }, { 0xDBE0, 0x5742 },
+	{ 0xDBE1, 0x5769 }, { 0xDBE2, 0x5785 }, { 0xDBE3, 0x576B }, { 0xDBE4, 0x5786 }, { 0xDBE5, 0x577C }, { 0xDBE6, 0x577B }, { 0xDBE7, 0x5768 }, { 0xDBE8, 0x576D },
+	{ 0xDBE9, 0x5776 }, { 0xDBEA, 0x5773 }, { 0xDBEB, 0x57AD }, { 0xDBEC, 0x57A4 }, { 0xDBED, 0x578C }, { 0xDBEE, 0x57B2 }, { 0xDBEF, 0x57CF }, { 0xDBF0, 0x57A7 },
+	{ 0xDBF1, 0x57B4 }, { 0xDBF2, 0x5793 }, { 0xDBF3, 0x57A0 }, { 0xDBF4, 0x57D5 }, { 0xDBF5, 0x57D8 }, { 0xDBF6, 0x57DA }, { 0xDBF7, 0x57D9 }, { 0xDBF8, 0x57D2 },
+	{ 0xDBF9, 0x57B8 }, { 0xDBFA, 0x57F4 }, { 0xDBFB, 0x57EF }, { 0xDBFC, 0x57F8 }, { 0xDBFD, 0x57E4 }, { 0xDBFE, 0x57DD }, { 0xDCA1, 0x580B }, { 0xDCA2, 0x580D },
+	{ 0xDCA3, 0x57FD }, { 0xDCA4, 0x57ED }, { 0xDCA5, 0x5800 }, { 0xDCA6, 0x581E }, { 0xDCA7, 0x5819 }, { 0xDCA8, 0x5844 }, { 0xDCA9, 0x5820 }, { 0xDCAA, 0x5865 },
+	{ 0xDCAB, 0x586C }, { 0xDCAC, 0x5881 }, { 0xDCAD, 0x5889 }, { 0xDCAE, 0x589A }, { 0xDCAF, 0x5880 }, { 0xDCB0, 0x99A8 }, { 0xDCB1, 0x9F19 }, { 0xDCB2, 0x61FF },
+	{ 0xDCB3, 0x8279 }, { 0xDCB4, 0x827D }, { 0xDCB5, 0x827F }, { 0xDCB6, 0x828F }, { 0xDCB7, 0x828A }, { 0xDCB8, 0x82A8 }, { 0xDCB9, 0x8284 }, { 0xDCBA, 0x828E },
+	{ 0xDCBB, 0x8291 }, { 0xDCBC, 0x8297 }, { 0xDCBD, 0x8299 }, { 0xDCBE, 0x82AB }, { 0xDCBF, 0x82B8 }, { 0xDCC0, 0x82BE }, { 0xDCC1, 0x82B0 }, { 0xDCC2, 0x82C8 },
+	{ 0xDCC3, 0x82CA }, { 0xDCC4, 0x82E3 }, { 0xDCC5, 0x8298 }, { 0xDCC6, 0x82B7 }, { 0xDCC7, 0x82AE }, { 0xDCC8, 0x82CB }, { 0xDCC9, 0x82CC }, { 0xDCCA, 0x82C1 },
+	{ 0xDCCB, 0x82A9 }, { 0xDCCC, 0x82B4 }, { 0xDCCD, 0x82A1 }, { 0xDCCE, 0x82AA }, { 0xDCCF, 0x829F }, { 0xDCD0, 0x82C4 }, { 0xDCD1, 0x82CE }, { 0xDCD2, 0x82A4 },
+	{ 0xDCD3, 0x82E1 }, { 0xDCD4, 0x8309 }, { 0xDCD5, 0x82F7 }, { 0xDCD6, 0x82E4 }, { 0xDCD7, 0x830F }, { 0xDCD8, 0x8307 }, { 0xDCD9, 0x82DC }, { 0xDCDA, 0x82F4 },
+	{ 0xDCDB, 0x82D2 }, { 0xDCDC, 0x82D8 }, { 0xDCDD, 0x830C }, { 0xDCDE, 0x82FB }, { 0xDCDF, 0x82D3 }, { 0xDCE0, 0x8311 }, { 0xDCE1, 0x831A }, { 0xDCE2, 0x8306 },
+	{ 0xDCE3, 0x8314 }, { 0xDCE4, 0x8315 }, { 0xDCE5, 0x82E0 }, { 0xDCE6, 0x82D5 }, { 0xDCE7, 0x831C }, { 0xDCE8, 0x8351 }, { 0xDCE9, 0x835B }, { 0xDCEA, 0x835C },
+	{ 0xDCEB, 0x8308 }, { 0xDCEC, 0x8392 }, { 0xDCED, 0x833C }, { 0xDCEE, 0x8334 }, { 0xDCEF, 0x8331 }, { 0xDCF0, 0x839B }, { 0xDCF1, 0x835E }, { 0xDCF2, 0x832F },
+	{ 0xDCF3, 0x834F }, { 0xDCF4, 0x8347 }, { 0xDCF5, 0x8343 }, { 0xDCF6, 0x835F }, { 0xDCF7, 0x8340 }, { 0xDCF8, 0x8317 }, { 0xDCF9, 0x8360 }, { 0xDCFA, 0x832D },
+	{ 0xDCFB, 0x833A }, { 0xDCFC, 0x8333 }, { 0xDCFD, 0x8366 }, { 0xDCFE, 0x8365 }, { 0xDDA1, 0x8368 }, { 0xDDA2, 0x831B }, { 0xDDA3, 0x8369 }, { 0xDDA4, 0x836C },
+	{ 0xDDA5, 0x836A }, { 0xDDA6, 0x836D }, { 0xDDA7, 0x836E }, { 0xDDA8, 0x83B0 }, { 0xDDA9, 0x8378 }, { 0xDDAA, 0x83B3 }, { 0xDDAB, 0x83B4 }, { 0xDDAC, 0x83A0 },
+	{ 0xDDAD, 0x83AA }, { 0xDDAE, 0x8393 }, { 0xDDAF, 0x839C }, { 0xDDB0, 0x8385 }, { 0xDDB1, 0x837C }, { 0xDDB2, 0x83B6 }, { 0xDDB3, 0x83A9 }, { 0xDDB4, 0x837D },
+	{ 0xDDB5, 0x83B8 }, { 0xDDB6, 0x837B }, { 0xDDB7, 0x8398 }, { 0xDDB8, 0x839E }, { 0xDDB9, 0x83A8 }, { 0xDDBA, 0x83BA }, { 0xDDBB, 0x83BC }, { 0xDDBC, 0x83C1 },
+	{ 0xDDBD, 0x8401 }, { 0xDDBE, 0x83E5 }, { 0xDDBF, 0x83D8 }, { 0xDDC0, 0x5807 }, { 0xDDC1, 0x8418 }, { 0xDDC2, 0x840B }, { 0xDDC3, 0x83DD }, { 0xDDC4, 0x83FD },
+	{ 0xDDC5, 0x83D6 }, { 0xDDC6, 0x841C }, { 0xDDC7, 0x8438 }, { 0xDDC8, 0x8411 }, { 0xDDC9, 0x8406 }, { 0xDDCA, 0x83D4 }, { 0xDDCB, 0x83DF }, { 0xDDCC, 0x840F },
+	{ 0xDDCD, 0x8403 }, { 0xDDCE, 0x83F8 }, { 0xDDCF, 0x83F9 }, { 0xDDD0, 0x83EA }, { 0xDDD1, 0x83C5 }, { 0xDDD2, 0x83C0 }, { 0xDDD3, 0x8426 }, { 0xDDD4, 0x83F0 },
+	{ 0xDDD5, 0x83E1 }, { 0xDDD6, 0x845C }, { 0xDDD7, 0x8451 }, { 0xDDD8, 0x845A }, { 0xDDD9, 0x8459 }, { 0xDDDA, 0x8473 }, { 0xDDDB, 0x8487 }, { 0xDDDC, 0x8488 },
+	{ 0xDDDD, 0x847A }, { 0xDDDE, 0x8489 }, { 0xDDDF, 0x8478 }, { 0xDDE0, 0x843C }, { 0xDDE1, 0x8446 }, { 0xDDE2, 0x8469 }, { 0xDDE3, 0x8476 }, { 0xDDE4, 0x848C },
+	{ 0xDDE5, 0x848E }, { 0xDDE6, 0x8431 }, { 0xDDE7, 0x846D }, { 0xDDE8, 0x84C1 }, { 0xDDE9, 0x84CD }, { 0xDDEA, 0x84D0 }, { 0xDDEB, 0x84E6 }, { 0xDDEC, 0x84BD },
+	{ 0xDDED, 0x84D3 }, { 0xDDEE, 0x84CA }, { 0xDDEF, 0x84BF }, { 0xDDF0, 0x84BA }, { 0xDDF1, 0x84E0 }, { 0xDDF2, 0x84A1 }, { 0xDDF3, 0x84B9 }, { 0xDDF4, 0x84B4 },
+	{ 0xDDF5, 0x8497 }, { 0xDDF6, 0x84E5 }, { 0xDDF7, 0x84E3 }, { 0xDDF8, 0x850C }, { 0xDDF9, 0x750D }, { 0xDDFA, 0x8538 }, { 0xDDFB, 0x84F0 }, { 0xDDFC, 0x8539 },
+	{ 0xDDFD, 0x851F }, { 0xDDFE, 0x853A }, { 0xDEA1, 0x8556 }, { 0xDEA2, 0x853B }, { 0xDEA3, 0x84FF }, { 0xDEA4, 0x84FC }, { 0xDEA5, 0x8559 }, { 0xDEA6, 0x8548 },
+	{ 0xDEA7, 0x8568 }, { 0xDEA8, 0x8564 }, { 0xDEA9, 0x855E }, { 0xDEAA, 0x857A }, { 0xDEAB, 0x77A2 }, { 0xDEAC, 0x8543 }, { 0xDEAD, 0x8572 }, { 0xDEAE, 0x857B },
+	{ 0xDEAF, 0x85A4 }, { 0xDEB0, 0x85A8 }, { 0xDEB1, 0x8587 }, { 0xDEB2, 0x858F }, { 0xDEB3, 0x8579 }, { 0xDEB4, 0x85AE }, { 0xDEB5, 0x859C }, { 0xDEB6, 0x8585 },
+	{ 0xDEB7, 0x85B9 }, { 0xDEB8, 0x85B7 }, { 0xDEB9, 0x85B0 }, { 0xDEBA, 0x85D3 }, { 0xDEBB, 0x85C1 }, { 0xDEBC, 0x85DC }, { 0xDEBD, 0x85FF }, { 0xDEBE, 0x8627 },
+	{ 0xDEBF, 0x8605 }, { 0xDEC0, 0x8629 }, { 0xDEC1, 0x8616 }, { 0xDEC2, 0x863C }, { 0xDEC3, 0x5EFE }, { 0xDEC4, 0x5F08 }, { 0xDEC5, 0x593C }, { 0xDEC6, 0x5941 },
+	{ 0xDEC7, 0x8037 }, { 0xDEC8, 0x5955 }, { 0xDEC9, 0x595A }, { 0xDECA, 0x5958 }, { 0xDECB, 0x530F }, { 0xDECC, 0x5C22 }, { 0xDECD, 0x5C25 }, { 0xDECE, 0x5C2C },
+	{ 0xDECF, 0x5C34 }, { 0xDED0, 0x624C }, { 0xDED1, 0x626A }, { 0xDED2, 0x629F }, { 0xDED3, 0x62BB }, { 0xDED4, 0x62CA }, { 0xDED5, 0x62DA }, { 0xDED6, 0x62D7 },
+	{ 0xDED7, 0x62EE }, { 0xDED8, 0x6322 }, { 0xDED9, 0x62F6 }, { 0xDEDA, 0x6339 }, { 0xDEDB, 0x634B }, { 0xDEDC, 0x6343 }, { 0xDEDD, 0x63AD }, { 0xDEDE, 0x63F6 },
+	{ 0xDEDF, 0x6371 }, { 0xDEE0, 0x637A }, { 0xDEE1, 0x638E }, { 0xDEE2, 0x63B4 }, { 0xDEE3, 0x636D }, { 0xDEE4, 0x63AC }, { 0xDEE5, 0x638A }, { 0xDEE6, 0x6369 },
+	{ 0xDEE7, 0x63AE }, { 0xDEE8, 0x63BC }, { 0xDEE9, 0x63F2 }, { 0xDEEA, 0x63F8 }, { 0xDEEB, 0x63E0 }, { 0xDEEC, 0x63FF }, { 0xDEED, 0x63C4 }, { 0xDEEE, 0x63DE },
+	{ 0xDEEF, 0x63CE }, { 0xDEF0, 0x6452 }, { 0xDEF1, 0x63C6 }, { 0xDEF2, 0x63BE }, { 0xDEF3, 0x6445 }, { 0xDEF4, 0x6441 }, { 0xDEF5, 0x640B }, { 0xDEF6, 0x641B },
+	{ 0xDEF7, 0x6420 }, { 0xDEF8, 0x640C }, { 0xDEF9, 0x6426 }, { 0xDEFA, 0x6421 }, { 0xDEFB, 0x645E }, { 0xDEFC, 0x6484 }, { 0xDEFD, 0x646D }, { 0xDEFE, 0x6496 },
+	{ 0xDFA1, 0x647A }, { 0xDFA2, 0x64B7 }, { 0xDFA3, 0x64B8 }, { 0xDFA4, 0x6499 }, { 0xDFA5, 0x64BA }, { 0xDFA6, 0x64C0 }, { 0xDFA7, 0x64D0 }, { 0xDFA8, 0x64D7 },
+	{ 0xDFA9, 0x64E4 }, { 0xDFAA, 0x64E2 }, { 0xDFAB, 0x6509 }, { 0xDFAC, 0x6525 }, { 0xDFAD, 0x652E }, { 0xDFAE, 0x5F0B }, { 0xDFAF, 0x5FD2 }, { 0xDFB0, 0x7519 },
+	{ 0xDFB1, 0x5F11 }, { 0xDFB2, 0x535F }, { 0xDFB3, 0x53F1 }, { 0xDFB4, 0x53FD }, { 0xDFB5, 0x53E9 }, { 0xDFB6, 0x53E8 }, { 0xDFB7, 0x53FB }, { 0xDFB8, 0x5412 },
+	{ 0xDFB9, 0x5416 }, { 0xDFBA, 0x5406 }, { 0xDFBB, 0x544B }, { 0xDFBC, 0x5452 }, { 0xDFBD, 0x5453 }, { 0xDFBE, 0x5454 }, { 0xDFBF, 0x5456 }, { 0xDFC0, 0x5443 },
+	{ 0xDFC1, 0x5421 }, { 0xDFC2, 0x5457 }, { 0xDFC3, 0x5459 }, { 0xDFC4, 0x5423 }, { 0xDFC5, 0x5432 }, { 0xDFC6, 0x5482 }, { 0xDFC7, 0x5494 }, { 0xDFC8, 0x5477 },
+	{ 0xDFC9, 0x5471 }, { 0xDFCA, 0x5464 }, { 0xDFCB, 0x549A }, { 0xDFCC, 0x549B }, { 0xDFCD, 0x5484 }, { 0xDFCE, 0x5476 }, { 0xDFCF, 0x5466 }, { 0xDFD0, 0x549D },
+	{ 0xDFD1, 0x54D0 }, { 0xDFD2, 0x54AD }, { 0xDFD3, 0x54C2 }, { 0xDFD4, 0x54B4 }, { 0xDFD5, 0x54D2 }, { 0xDFD6, 0x54A7 }, { 0xDFD7, 0x54A6 }, { 0xDFD8, 0x54D3 },
+	{ 0xDFD9, 0x54D4 }, { 0xDFDA, 0x5472 }, { 0xDFDB, 0x54A3 }, { 0xDFDC, 0x54D5 }, { 0xDFDD, 0x54BB }, { 0xDFDE, 0x54BF }, { 0xDFDF, 0x54CC }, { 0xDFE0, 0x54D9 },
+	{ 0xDFE1, 0x54DA }, { 0xDFE2, 0x54DC }, { 0xDFE3, 0x54A9 }, { 0xDFE4, 0x54AA }, { 0xDFE5, 0x54A4 }, { 0xDFE6, 0x54DD }, { 0xDFE7, 0x54CF }, { 0xDFE8, 0x54DE },
+	{ 0xDFE9, 0x551B }, { 0xDFEA, 0x54E7 }, { 0xDFEB, 0x5520 }, { 0xDFEC, 0x54FD }, { 0xDFED, 0x5514 }, { 0xDFEE, 0x54F3 }, { 0xDFEF, 0x5522 }, { 0xDFF0, 0x5523 },
+	{ 0xDFF1, 0x550F }, { 0xDFF2, 0x5511 }, { 0xDFF3, 0x5527 }, { 0xDFF4, 0x552A }, { 0xDFF5, 0x5567 }, { 0xDFF6, 0x558F }, { 0xDFF7, 0x55B5 }, { 0xDFF8, 0x5549 },
+	{ 0xDFF9, 0x556D }, { 0xDFFA, 0x5541 }, { 0xDFFB, 0x5555 }, { 0xDFFC, 0x553F }, { 0xDFFD, 0x5550 }, { 0xDFFE, 0x553C }, { 0xE0A1, 0x5537 }, { 0xE0A2, 0x5556 },
+	{ 0xE0A3, 0x5575 }, { 0xE0A4, 0x5576 }, { 0xE0A5, 0x5577 }, { 0xE0A6, 0x5533 }, { 0xE0A7, 0x5530 }, { 0xE0A8, 0x555C }, { 0xE0A9, 0x558B }, { 0xE0AA, 0x55D2 },
+	{ 0xE0AB, 0x5583 }, { 0xE0AC, 0x55B1 }, { 0xE0AD, 0x55B9 }, { 0xE0AE, 0x5588 }, { 0xE0AF, 0x5581 }, { 0xE0B0, 0x559F }, { 0xE0B1, 0x557E }, { 0xE0B2, 0x55D6 },
+	{ 0xE0B3, 0x5591 }, { 0xE0B4, 0x557B }, { 0xE0B5, 0x55DF }, { 0xE0B6, 0x55BD }, { 0xE0B7, 0x55BE }, { 0xE0B8, 0x5594 }, { 0xE0B9, 0x5599 }, { 0xE0BA, 0x55EA },
+	{ 0xE0BB, 0x55F7 }, { 0xE0BC, 0x55C9 }, { 0xE0BD, 0x561F }, { 0xE0BE, 0x55D1 }, { 0xE0BF, 0x55EB }, { 0xE0C0, 0x55EC }, { 0xE0C1, 0x55D4 }, { 0xE0C2, 0x55E6 },
+	{ 0xE0C3, 0x55DD }, { 0xE0C4, 0x55C4 }, { 0xE0C5, 0x55EF }, { 0xE0C6, 0x55E5 }, { 0xE0C7, 0x55F2 }, { 0xE0C8, 0x55F3 }, { 0xE0C9, 0x55CC }, { 0xE0CA, 0x55CD },
+	{ 0xE0CB, 0x55E8 }, { 0xE0CC, 0x55F5 }, { 0xE0CD, 0x55E4 }, { 0xE0CE, 0x8F94 }, { 0xE0CF, 0x561E }, { 0xE0D0, 0x5608 }, { 0xE0D1, 0x560C }, { 0xE0D2, 0x5601 },
+	{ 0xE0D3, 0x5624 }, { 0xE0D4, 0x5623 }, { 0xE0D5, 0x55FE }, { 0xE0D6, 0x5600 }, { 0xE0D7, 0x5627 }, { 0xE0D8, 0x562D }, { 0xE0D9, 0x5658 }, { 0xE0DA, 0x5639 },
+	{ 0xE0DB, 0x5657 }, { 0xE0DC, 0x562C }, { 0xE0DD, 0x564D }, { 0xE0DE, 0x5662 }, { 0xE0DF, 0x5659 }, { 0xE0E0, 0x565C }, { 0xE0E1, 0x564C }, { 0xE0E2, 0x5654 },
+	{ 0xE0E3, 0x5686 }, { 0xE0E4, 0x5664 }, { 0xE0E5, 0x5671 }, { 0xE0E6, 0x566B }, { 0xE0E7, 0x567B }, { 0xE0E8, 0x567C }, { 0xE0E9, 0x5685 }, { 0xE0EA, 0x5693 },
+	{ 0xE0EB, 0x56AF }, { 0xE0EC, 0x56D4 }, { 0xE0ED, 0x56D7 }, { 0xE0EE, 0x56DD }, { 0xE0EF, 0x56E1 }, { 0xE0F0, 0x56F5 }, { 0xE0F1, 0x56EB }, { 0xE0F2, 0x56F9 },
+	{ 0xE0F3, 0x56FF }, { 0xE0F4, 0x5704 }, { 0xE0F5, 0x570A }, { 0xE0F6, 0x5709 }, { 0xE0F7, 0x571C }, { 0xE0F8, 0x5E0F }, { 0xE0F9, 0x5E19 }, { 0xE0FA, 0x5E14 },
+	{ 0xE0FB, 0x5E11 }, { 0xE0FC, 0x5E31 }, { 0xE0FD, 0x5E3B }, { 0xE0FE, 0x5E3C }, { 0xE1A1, 0x5E37 }, { 0xE1A2, 0x5E44 }, { 0xE1A3, 0x5E54 }, { 0xE1A4, 0x5E5B },
+	{ 0xE1A5, 0x5E5E }, { 0xE1A6, 0x5E61 }, { 0xE1A7, 0x5C8C }, { 0xE1A8, 0x5C7A }, { 0xE1A9, 0x5C8D }, { 0xE1AA, 0x5C90 }, { 0xE1AB, 0x5C96 }, { 0xE1AC, 0x5C88 },
+	{ 0xE1AD, 0x5C98 }, { 0xE1AE, 0x5C99 }, { 0xE1AF, 0x5C91 }, { 0xE1B0, 0x5C9A }, { 0xE1B1, 0x5C9C }, { 0xE1B2, 0x5CB5 }, { 0xE1B3, 0x5CA2 }, { 0xE1B4, 0x5CBD },
+	{ 0xE1B5, 0x5CAC }, { 0xE1B6, 0x5CAB }, { 0xE1B7, 0x5CB1 }, { 0xE1B8, 0x5CA3 }, { 0xE1B9, 0x5CC1 }, { 0xE1BA, 0x5CB7 }, { 0xE1BB, 0x5CC4 }, { 0xE1BC, 0x5CD2 },
+	{ 0xE1BD, 0x5CE4 }, { 0xE1BE, 0x5CCB }, { 0xE1BF, 0x5CE5 }, { 0xE1C0, 0x5D02 }, { 0xE1C1, 0x5D03 }, { 0xE1C2, 0x5D27 }, { 0xE1C3, 0x5D26 }, { 0xE1C4, 0x5D2E },
+	{ 0xE1C5, 0x5D24 }, { 0xE1C6, 0x5D1E }, { 0xE1C7, 0x5D06 }, { 0xE1C8, 0x5D1B }, { 0xE1C9, 0x5D58 }, { 0xE1CA, 0x5D3E }, { 0xE1CB, 0x5D34 }, { 0xE1CC, 0x5D3D },
+	{ 0xE1CD, 0x5D6C }, { 0xE1CE, 0x5D5B }, { 0xE1CF, 0x5D6F }, { 0xE1D0, 0x5D5D }, { 0xE1D1, 0x5D6B }, { 0xE1D2, 0x5D4B }, { 0xE1D3, 0x5D4A }, { 0xE1D4, 0x5D69 },
+	{ 0xE1D5, 0x5D74 }, { 0xE1D6, 0x5D82 }, { 0xE1D7, 0x5D99 }, { 0xE1D8, 0x5D9D }, { 0xE1D9, 0x8C73 }, { 0xE1DA, 0x5DB7 }, { 0xE1DB, 0x5DC5 }, { 0xE1DC, 0x5F73 },
+	{ 0xE1DD, 0x5F77 }, { 0xE1DE, 0x5F82 }, { 0xE1DF, 0x5F87 }, { 0xE1E0, 0x5F89 }, { 0xE1E1, 0x5F8C }, { 0xE1E2, 0x5F95 }, { 0xE1E3, 0x5F99 }, { 0xE1E4, 0x5F9C },
+	{ 0xE1E5, 0x5FA8 }, { 0xE1E6, 0x5FAD }, { 0xE1E7, 0x5FB5 }, { 0xE1E8, 0x5FBC }, { 0xE1E9, 0x8862 }, { 0xE1EA, 0x5F61 }, { 0xE1EB, 0x72AD }, { 0xE1EC, 0x72B0 },
+	{ 0xE1ED, 0x72B4 }, { 0xE1EE, 0x72B7 }, { 0xE1EF, 0x72B8 }, { 0xE1F0, 0x72C3 }, { 0xE1F1, 0x72C1 }, { 0xE1F2, 0x72CE }, { 0xE1F3, 0x72CD }, { 0xE1F4, 0x72D2 },
+	{ 0xE1F5, 0x72E8 }, { 0xE1F6, 0x72EF }, { 0xE1F7, 0x72E9 }, { 0xE1F8, 0x72F2 }, { 0xE1F9, 0x72F4 }, { 0xE1FA, 0x72F7 }, { 0xE1FB, 0x7301 }, { 0xE1FC, 0x72F3 },
+	{ 0xE1FD, 0x7303 }, { 0xE1FE, 0x72FA }, { 0xE2A1, 0x72FB }, { 0xE2A2, 0x7317 }, { 0xE2A3, 0x7313 }, { 0xE2A4, 0x7321 }, { 0xE2A5, 0x730A }, { 0xE2A6, 0x731E },
+	{ 0xE2A7, 0x731D }, { 0xE2A8, 0x7315 }, { 0xE2A9, 0x7322 }, { 0xE2AA, 0x7339 }, { 0xE2AB, 0x7325 }, { 0xE2AC, 0x732C }, { 0xE2AD, 0x7338 }, { 0xE2AE, 0x7331 },
+	{ 0xE2AF, 0x7350 }, { 0xE2B0, 0x734D }, { 0xE2B1, 0x7357 }, { 0xE2B2, 0x7360 }, { 0xE2B3, 0x736C }, { 0xE2B4, 0x736F }, { 0xE2B5, 0x737E }, { 0xE2B6, 0x821B },
+	{ 0xE2B7, 0x5925 }, { 0xE2B8, 0x98E7 }, { 0xE2B9, 0x5924 }, { 0xE2BA, 0x5902 }, { 0xE2BB, 0x9963 }, { 0xE2BC, 0x9967 }, { 0xE2BD, 0x9968 }, { 0xE2BE, 0x9969 },
+	{ 0xE2BF, 0x996A }, { 0xE2C0, 0x996B }, { 0xE2C1, 0x996C }, { 0xE2C2, 0x9974 }, { 0xE2C3, 0x9977 }, { 0xE2C4, 0x997D }, { 0xE2C5, 0x9980 }, { 0xE2C6, 0x9984 },
+	{ 0xE2C7, 0x9987 }, { 0xE2C8, 0x998A }, { 0xE2C9, 0x998D }, { 0xE2CA, 0x9990 }, { 0xE2CB, 0x9991 }, { 0xE2CC, 0x9993 }, { 0xE2CD, 0x9994 }, { 0xE2CE, 0x9995 },
+	{ 0xE2CF, 0x5E80 }, { 0xE2D0, 0x5E91 }, { 0xE2D1, 0x5E8B }, { 0xE2D2, 0x5E96 }, { 0xE2D3, 0x5EA5 }, { 0xE2D4, 0x5EA0 }, { 0xE2D5, 0x5EB9 }, { 0xE2D6, 0x5EB5 },
+	{ 0xE2D7, 0x5EBE }, { 0xE2D8, 0x5EB3 }, { 0xE2D9, 0x8D53 }, { 0xE2DA, 0x5ED2 }, { 0xE2DB, 0x5ED1 }, { 0xE2DC, 0x5EDB }, { 0xE2DD, 0x5EE8 }, { 0xE2DE, 0x5EEA },
+	{ 0xE2DF, 0x81BA }, { 0xE2E0, 0x5FC4 }, { 0xE2E1, 0x5FC9 }, { 0xE2E2, 0x5FD6 }, { 0xE2E3, 0x5FCF }, { 0xE2E4, 0x6003 }, { 0xE2E5, 0x5FEE }, { 0xE2E6, 0x6004 },
+	{ 0xE2E7, 0x5FE1 }, { 0xE2E8, 0x5FE4 }, { 0xE2E9, 0x5FFE }, { 0xE2EA, 0x6005 }, { 0xE2EB, 0x6006 }, { 0xE2EC, 0x5FEA }, { 0xE2ED, 0x5FED }, { 0xE2EE, 0x5FF8 },
+	{ 0xE2EF, 0x6019 }, { 0xE2F0, 0x6035 }, { 0xE2F1, 0x6026 }, { 0xE2F2, 0x601B }, { 0xE2F3, 0x600F }, { 0xE2F4, 0x600D }, { 0xE2F5, 0x6029 }, { 0xE2F6, 0x602B },
+	{ 0xE2F7, 0x600A }, { 0xE2F8, 0x603F }, { 0xE2F9, 0x6021 }, { 0xE2FA, 0x6078 }, { 0xE2FB, 0x6079 }, { 0xE2FC, 0x607B }, { 0xE2FD, 0x607A }, { 0xE2FE, 0x6042 },
+	{ 0xE3A1, 0x606A }, { 0xE3A2, 0x607D }, { 0xE3A3, 0x6096 }, { 0xE3A4, 0x609A }, { 0xE3A5, 0x60AD }, { 0xE3A6, 0x609D }, { 0xE3A7, 0x6083 }, { 0xE3A8, 0x6092 },
+	{ 0xE3A9, 0x608C }, { 0xE3AA, 0x609B }, { 0xE3AB, 0x60EC }, { 0xE3AC, 0x60BB }, { 0xE3AD, 0x60B1 }, { 0xE3AE, 0x60DD }, { 0xE3AF, 0x60D8 }, { 0xE3B0, 0x60C6 },
+	{ 0xE3B1, 0x60DA }, { 0xE3B2, 0x60B4 }, { 0xE3B3, 0x6120 }, { 0xE3B4, 0x6126 }, { 0xE3B5, 0x6115 }, { 0xE3B6, 0x6123 }, { 0xE3B7, 0x60F4 }, { 0xE3B8, 0x6100 },
+	{ 0xE3B9, 0x610E }, { 0xE3BA, 0x612B }, { 0xE3BB, 0x614A }, { 0xE3BC, 0x6175 }, { 0xE3BD, 0x61AC }, { 0xE3BE, 0x6194 }, { 0xE3BF, 0x61A7 }, { 0xE3C0, 0x61B7 },
+	{ 0xE3C1, 0x61D4 }, { 0xE3C2, 0x61F5 }, { 0xE3C3, 0x5FDD }, { 0xE3C4, 0x96B3 }, { 0xE3C5, 0x95E9 }, { 0xE3C6, 0x95EB }, { 0xE3C7, 0x95F1 }, { 0xE3C8, 0x95F3 },
+	{ 0xE3C9, 0x95F5 }, { 0xE3CA, 0x95F6 }, { 0xE3CB, 0x95FC }, { 0xE3CC, 0x95FE }, { 0xE3CD, 0x9603 }, { 0xE3CE, 0x9604 }, { 0xE3CF, 0x9606 }, { 0xE3D0, 0x9608 },
+	{ 0xE3D1, 0x960A }, { 0xE3D2, 0x960B }, { 0xE3D3, 0x960C }, { 0xE3D4, 0x960D }, { 0xE3D5, 0x960F }, { 0xE3D6, 0x9612 }, { 0xE3D7, 0x9615 }, { 0xE3D8, 0x9616 },
+	{ 0xE3D9, 0x9617 }, { 0xE3DA, 0x9619 }, { 0xE3DB, 0x961A }, { 0xE3DC, 0x4E2C }, { 0xE3DD, 0x723F }, { 0xE3DE, 0x6215 }, { 0xE3DF, 0x6C35 }, { 0xE3E0, 0x6C54 },
+	{ 0xE3E1, 0x6C5C }, { 0xE3E2, 0x6C4A }, { 0xE3E3, 0x6CA3 }, { 0xE3E4, 0x6C85 }, { 0xE3E5, 0x6C90 }, { 0xE3E6, 0x6C94 }, { 0xE3E7, 0x6C8C }, { 0xE3E8, 0x6C68 },
+	{ 0xE3E9, 0x6C69 }, { 0xE3EA, 0x6C74 }, { 0xE3EB, 0x6C76 }, { 0xE3EC, 0x6C86 }, { 0xE3ED, 0x6CA9 }, { 0xE3EE, 0x6CD0 }, { 0xE3EF, 0x6CD4 }, { 0xE3F0, 0x6CAD },
+	{ 0xE3F1, 0x6CF7 }, { 0xE3F2, 0x6CF8 }, { 0xE3F3, 0x6CF1 }, { 0xE3F4, 0x6CD7 }, { 0xE3F5, 0x6CB2 }, { 0xE3F6, 0x6CE0 }, { 0xE3F7, 0x6CD6 }, { 0xE3F8, 0x6CFA },
+	{ 0xE3F9, 0x6CEB }, { 0xE3FA, 0x6CEE }, { 0xE3FB, 0x6CB1 }, { 0xE3FC, 0x6CD3 }, { 0xE3FD, 0x6CEF }, { 0xE3FE, 0x6CFE }, { 0xE4A1, 0x6D39 }, { 0xE4A2, 0x6D27 },
+	{ 0xE4A3, 0x6D0C }, { 0xE4A4, 0x6D43 }, { 0xE4A5, 0x6D48 }, { 0xE4A6, 0x6D07 }, { 0xE4A7, 0x6D04 }, { 0xE4A8, 0x6D19 }, { 0xE4A9, 0x6D0E }, { 0xE4AA, 0x6D2B },
+	{ 0xE4AB, 0x6D4D }, { 0xE4AC, 0x6D2E }, { 0xE4AD, 0x6D35 }, { 0xE4AE, 0x6D1A }, { 0xE4AF, 0x6D4F }, { 0xE4B0, 0x6D52 }, { 0xE4B1, 0x6D54 }, { 0xE4B2, 0x6D33 },
+	{ 0xE4B3, 0x6D91 }, { 0xE4B4, 0x6D6F }, { 0xE4B5, 0x6D9E }, { 0xE4B6, 0x6DA0 }, { 0xE4B7, 0x6D5E }, { 0xE4B8, 0x6D93 }, { 0xE4B9, 0x6D94 }, { 0xE4BA, 0x6D5C },
+	{ 0xE4BB, 0x6D60 }, { 0xE4BC, 0x6D7C }, { 0xE4BD, 0x6D63 }, { 0xE4BE, 0x6E1A }, { 0xE4BF, 0x6DC7 }, { 0xE4C0, 0x6DC5 }, { 0xE4C1, 0x6DDE }, { 0xE4C2, 0x6E0E },
+	{ 0xE4C3, 0x6DBF }, { 0xE4C4, 0x6DE0 }, { 0xE4C5, 0x6E11 }, { 0xE4C6, 0x6DE6 }, { 0xE4C7, 0x6DDD }, { 0xE4C8, 0x6DD9 }, { 0xE4C9, 0x6E16 }, { 0xE4CA, 0x6DAB },
+	{ 0xE4CB, 0x6E0C }, { 0xE4CC, 0x6DAE }, { 0xE4CD, 0x6E2B }, { 0xE4CE, 0x6E6E }, { 0xE4CF, 0x6E4E }, { 0xE4D0, 0x6E6B }, { 0xE4D1, 0x6EB2 }, { 0xE4D2, 0x6E5F },
+	{ 0xE4D3, 0x6E86 }, { 0xE4D4, 0x6E53 }, { 0xE4D5, 0x6E54 }, { 0xE4D6, 0x6E32 }, { 0xE4D7, 0x6E25 }, { 0xE4D8, 0x6E44 }, { 0xE4D9, 0x6EDF }, { 0xE4DA, 0x6EB1 },
+	{ 0xE4DB, 0x6E98 }, { 0xE4DC, 0x6EE0 }, { 0xE4DD, 0x6F2D }, { 0xE4DE, 0x6EE2 }, { 0xE4DF, 0x6EA5 }, { 0xE4E0, 0x6EA7 }, { 0xE4E1, 0x6EBD }, { 0xE4E2, 0x6EBB },
+	{ 0xE4E3, 0x6EB7 }, { 0xE4E4, 0x6ED7 }, { 0xE4E5, 0x6EB4 }, { 0xE4E6, 0x6ECF }, { 0xE4E7, 0x6E8F }, { 0xE4E8, 0x6EC2 }, { 0xE4E9, 0x6E9F }, { 0xE4EA, 0x6F62 },
+	{ 0xE4EB, 0x6F46 }, { 0xE4EC, 0x6F47 }, { 0xE4ED, 0x6F24 }, { 0xE4EE, 0x6F15 }, { 0xE4EF, 0x6EF9 }, { 0xE4F0, 0x6F2F }, { 0xE4F1, 0x6F36 }, { 0xE4F2, 0x6F4B },
+	{ 0xE4F3, 0x6F74 }, { 0xE4F4, 0x6F2A }, { 0xE4F5, 0x6F09 }, { 0xE4F6, 0x6F29 }, { 0xE4F7, 0x6F89 }, { 0xE4F8, 0x6F8D }, { 0xE4F9, 0x6F8C }, { 0xE4FA, 0x6F78 },
+	{ 0xE4FB, 0x6F72 }, { 0xE4FC, 0x6F7C }, { 0xE4FD, 0x6F7A }, { 0xE4FE, 0x6FD1 }, { 0xE5A1, 0x6FC9 }, { 0xE5A2, 0x6FA7 }, { 0xE5A3, 0x6FB9 }, { 0xE5A4, 0x6FB6 },
+	{ 0xE5A5, 0x6FC2 }, { 0xE5A6, 0x6FE1 }, { 0xE5A7, 0x6FEE }, { 0xE5A8, 0x6FDE }, { 0xE5A9, 0x6FE0 }, { 0xE5AA, 0x6FEF }, { 0xE5AB, 0x701A }, { 0xE5AC, 0x7023 },
+	{ 0xE5AD, 0x701B }, { 0xE5AE, 0x7039 }, { 0xE5AF, 0x7035 }, { 0xE5B0, 0x704F }, { 0xE5B1, 0x705E }, { 0xE5B2, 0x5B80 }, { 0xE5B3, 0x5B84 }, { 0xE5B4, 0x5B95 },
+	{ 0xE5B5, 0x5B93 }, { 0xE5B6, 0x5BA5 }, { 0xE5B7, 0x5BB8 }, { 0xE5B8, 0x752F }, { 0xE5B9, 0x9A9E }, { 0xE5BA, 0x6434 }, { 0xE5BB, 0x5BE4 }, { 0xE5BC, 0x5BEE },
+	{ 0xE5BD, 0x8930 }, { 0xE5BE, 0x5BF0 }, { 0xE5BF, 0x8E47 }, { 0xE5C0, 0x8B07 }, { 0xE5C1, 0x8FB6 }, { 0xE5C2, 0x8FD3 }, { 0xE5C3, 0x8FD5 }, { 0xE5C4, 0x8FE5 },
+	{ 0xE5C5, 0x8FEE }, { 0xE5C6, 0x8FE4 }, { 0xE5C7, 0x8FE9 }, { 0xE5C8, 0x8FE6 }, { 0xE5C9, 0x8FF3 }, { 0xE5CA, 0x8FE8 }, { 0xE5CB, 0x9005 }, { 0xE5CC, 0x9004 },
+	{ 0xE5CD, 0x900B }, { 0xE5CE, 0x9026 }, { 0xE5CF, 0x9011 }, { 0xE5D0, 0x900D }, { 0xE5D1, 0x9016 }, { 0xE5D2, 0x9021 }, { 0xE5D3, 0x9035 }, { 0xE5D4, 0x9036 },
+	{ 0xE5D5, 0x902D }, { 0xE5D6, 0x902F }, { 0xE5D7, 0x9044 }, { 0xE5D8, 0x9051 }, { 0xE5D9, 0x9052 }, { 0xE5DA, 0x9050 }, { 0xE5DB, 0x9068 }, { 0xE5DC, 0x9058 },
+	{ 0xE5DD, 0x9062 }, { 0xE5DE, 0x905B }, { 0xE5DF, 0x66B9 }, { 0xE5E0, 0x9074 }, { 0xE5E1, 0x907D }, { 0xE5E2, 0x9082 }, { 0xE5E3, 0x9088 }, { 0xE5E4, 0x9083 },
+	{ 0xE5E5, 0x908B }, { 0xE5E6, 0x5F50 }, { 0xE5E7, 0x5F57 }, { 0xE5E8, 0x5F56 }, { 0xE5E9, 0x5F58 }, { 0xE5EA, 0x5C3B }, { 0xE5EB, 0x54AB }, { 0xE5EC, 0x5C50 },
+	{ 0xE5ED, 0x5C59 }, { 0xE5EE, 0x5B71 }, { 0xE5EF, 0x5C63 }, { 0xE5F0, 0x5C66 }, { 0xE5F1, 0x7FBC }, { 0xE5F2, 0x5F2A }, { 0xE5F3, 0x5F29 }, { 0xE5F4, 0x5F2D },
+	{ 0xE5F5, 0x8274 }, { 0xE5F6, 0x5F3C }, { 0xE5F7, 0x9B3B }, { 0xE5F8, 0x5C6E }, { 0xE5F9, 0x5981 }, { 0xE5FA, 0x5983 }, { 0xE5FB, 0x598D }, { 0xE5FC, 0x59A9 },
+	{ 0xE5FD, 0x59AA }, { 0xE5FE, 0x59A3 }, { 0xE6A1, 0x5997 }, { 0xE6A2, 0x59CA }, { 0xE6A3, 0x59AB }, { 0xE6A4, 0x599E }, { 0xE6A5, 0x59A4 }, { 0xE6A6, 0x59D2 },
+	{ 0xE6A7, 0x59B2 }, { 0xE6A8, 0x59AF }, { 0xE6A9, 0x59D7 }, { 0xE6AA, 0x59BE }, { 0xE6AB, 0x5A05 }, { 0xE6AC, 0x5A06 }, { 0xE6AD, 0x59DD }, { 0xE6AE, 0x5A08 },
+	{ 0xE6AF, 0x59E3 }, { 0xE6B0, 0x59D8 }, { 0xE6B1, 0x59F9 }, { 0xE6B2, 0x5A0C }, { 0xE6B3, 0x5A09 }, { 0xE6B4, 0x5A32 }, { 0xE6B5, 0x5A34 }, { 0xE6B6, 0x5A11 },
+	{ 0xE6B7, 0x5A23 }, { 0xE6B8, 0x5A13 }, { 0xE6B9, 0x5A40 }, { 0xE6BA, 0x5A67 }, { 0xE6BB, 0x5A4A }, { 0xE6BC, 0x5A55 }, { 0xE6BD, 0x5A3C }, { 0xE6BE, 0x5A62 },
+	{ 0xE6BF, 0x5A75 }, { 0xE6C0, 0x80EC }, { 0xE6C1, 0x5AAA }, { 0xE6C2, 0x5A9B }, { 0xE6C3, 0x5A77 }, { 0xE6C4, 0x5A7A }, { 0xE6C5, 0x5ABE }, { 0xE6C6, 0x5AEB },
+	{ 0xE6C7, 0x5AB2 }, { 0xE6C8, 0x5AD2 }, { 0xE6C9, 0x5AD4 }, { 0xE6CA, 0x5AB8 }, { 0xE6CB, 0x5AE0 }, { 0xE6CC, 0x5AE3 }, { 0xE6CD, 0x5AF1 }, { 0xE6CE, 0x5AD6 },
+	{ 0xE6CF, 0x5AE6 }, { 0xE6D0, 0x5AD8 }, { 0xE6D1, 0x5ADC }, { 0xE6D2, 0x5B09 }, { 0xE6D3, 0x5B17 }, { 0xE6D4, 0x5B16 }, { 0xE6D5, 0x5B32 }, { 0xE6D6, 0x5B37 },
+	{ 0xE6D7, 0x5B40 }, { 0xE6D8, 0x5C15 }, { 0xE6D9, 0x5C1C }, { 0xE6DA, 0x5B5A }, { 0xE6DB, 0x5B65 }, { 0xE6DC, 0x5B73 }, { 0xE6DD, 0x5B51 }, { 0xE6DE, 0x5B53 },
+	{ 0xE6DF, 0x5B62 }, { 0xE6E0, 0x9A75 }, { 0xE6E1, 0x9A77 }, { 0xE6E2, 0x9A78 }, { 0xE6E3, 0x9A7A }, { 0xE6E4, 0x9A7F }, { 0xE6E5, 0x9A7D }, { 0xE6E6, 0x9A80 },
+	{ 0xE6E7, 0x9A81 }, { 0xE6E8, 0x9A85 }, { 0xE6E9, 0x9A88 }, { 0xE6EA, 0x9A8A }, { 0xE6EB, 0x9A90 }, { 0xE6EC, 0x9A92 }, { 0xE6ED, 0x9A93 }, { 0xE6EE, 0x9A96 },
+	{ 0xE6EF, 0x9A98 }, { 0xE6F0, 0x9A9B }, { 0xE6F1, 0x9A9C }, { 0xE6F2, 0x9A9D }, { 0xE6F3, 0x9A9F }, { 0xE6F4, 0x9AA0 }, { 0xE6F5, 0x9AA2 }, { 0xE6F6, 0x9AA3 },
+	{ 0xE6F7, 0x9AA5 }, { 0xE6F8, 0x9AA7 }, { 0xE6F9, 0x7E9F }, { 0xE6FA, 0x7EA1 }, { 0xE6FB, 0x7EA3 }, { 0xE6FC, 0x7EA5 }, { 0xE6FD, 0x7EA8 }, { 0xE6FE, 0x7EA9 },
+	{ 0xE7A1, 0x7EAD }, { 0xE7A2, 0x7EB0 }, { 0xE7A3, 0x7EBE }, { 0xE7A4, 0x7EC0 }, { 0xE7A5, 0x7EC1 }, { 0xE7A6, 0x7EC2 }, { 0xE7A7, 0x7EC9 }, { 0xE7A8, 0x7ECB },
+	{ 0xE7A9, 0x7ECC }, { 0xE7AA, 0x7ED0 }, { 0xE7AB, 0x7ED4 }, { 0xE7AC, 0x7ED7 }, { 0xE7AD, 0x7EDB }, { 0xE7AE, 0x7EE0 }, { 0xE7AF, 0x7EE1 }, { 0xE7B0, 0x7EE8 },
+	{ 0xE7B1, 0x7EEB }, { 0xE7B2, 0x7EEE }, { 0xE7B3, 0x7EEF }, { 0xE7B4, 0x7EF1 }, { 0xE7B5, 0x7EF2 }, { 0xE7B6, 0x7F0D }, { 0xE7B7, 0x7EF6 }, { 0xE7B8, 0x7EFA },
+	{ 0xE7B9, 0x7EFB }, { 0xE7BA, 0x7EFE }, { 0xE7BB, 0x7F01 }, { 0xE7BC, 0x7F02 }, { 0xE7BD, 0x7F03 }, { 0xE7BE, 0x7F07 }, { 0xE7BF, 0x7F08 }, { 0xE7C0, 0x7F0B },
+	{ 0xE7C1, 0x7F0C }, { 0xE7C2, 0x7F0F }, { 0xE7C3, 0x7F11 }, { 0xE7C4, 0x7F12 }, { 0xE7C5, 0x7F17 }, { 0xE7C6, 0x7F19 }, { 0xE7C7, 0x7F1C }, { 0xE7C8, 0x7F1B },
+	{ 0xE7C9, 0x7F1F }, { 0xE7CA, 0x7F21 }, { 0xE7CB, 0x7F22 }, { 0xE7CC, 0x7F23 }, { 0xE7CD, 0x7F24 }, { 0xE7CE, 0x7F25 }, { 0xE7CF, 0x7F26 }, { 0xE7D0, 0x7F27 },
+	{ 0xE7D1, 0x7F2A }, { 0xE7D2, 0x7F2B }, { 0xE7D3, 0x7F2C }, { 0xE7D4, 0x7F2D }, { 0xE7D5, 0x7F2F }, { 0xE7D6, 0x7F30 }, { 0xE7D7, 0x7F31 }, { 0xE7D8, 0x7F32 },
+	{ 0xE7D9, 0x7F33 }, { 0xE7DA, 0x7F35 }, { 0xE7DB, 0x5E7A }, { 0xE7DC, 0x757F }, { 0xE7DD, 0x5DDB }, { 0xE7DE, 0x753E }, { 0xE7DF, 0x9095 }, { 0xE7E0, 0x738E },
+	{ 0xE7E1, 0x7391 }, { 0xE7E2, 0x73AE }, { 0xE7E3, 0x73A2 }, { 0xE7E4, 0x739F }, { 0xE7E5, 0x73CF }, { 0xE7E6, 0x73C2 }, { 0xE7E7, 0x73D1 }, { 0xE7E8, 0x73B7 },
+	{ 0xE7E9, 0x73B3 }, { 0xE7EA, 0x73C0 }, { 0xE7EB, 0x73C9 }, { 0xE7EC, 0x73C8 }, { 0xE7ED, 0x73E5 }, { 0xE7EE, 0x73D9 }, { 0xE7EF, 0x987C }, { 0xE7F0, 0x740A },
+	{ 0xE7F1, 0x73E9 }, { 0xE7F2, 0x73E7 }, { 0xE7F3, 0x73DE }, { 0xE7F4, 0x73BA }, { 0xE7F5, 0x73F2 }, { 0xE7F6, 0x740F }, { 0xE7F7, 0x742A }, { 0xE7F8, 0x745B },
+	{ 0xE7F9, 0x7426 }, { 0xE7FA, 0x7425 }, { 0xE7FB, 0x7428 }, { 0xE7FC, 0x7430 }, { 0xE7FD, 0x742E }, { 0xE7FE, 0x742C }, { 0xE8A1, 0x741B }, { 0xE8A2, 0x741A },
+	{ 0xE8A3, 0x7441 }, { 0xE8A4, 0x745C }, { 0xE8A5, 0x7457 }, { 0xE8A6, 0x7455 }, { 0xE8A7, 0x7459 }, { 0xE8A8, 0x7477 }, { 0xE8A9, 0x746D }, { 0xE8AA, 0x747E },
+	{ 0xE8AB, 0x749C }, { 0xE8AC, 0x748E }, { 0xE8AD, 0x7480 }, { 0xE8AE, 0x7481 }, { 0xE8AF, 0x7487 }, { 0xE8B0, 0x748B }, { 0xE8B1, 0x749E }, { 0xE8B2, 0x74A8 },
+	{ 0xE8B3, 0x74A9 }, { 0xE8B4, 0x7490 }, { 0xE8B5, 0x74A7 }, { 0xE8B6, 0x74D2 }, { 0xE8B7, 0x74BA }, { 0xE8B8, 0x97EA }, { 0xE8B9, 0x97EB }, { 0xE8BA, 0x97EC },
+	{ 0xE8BB, 0x674C }, { 0xE8BC, 0x6753 }, { 0xE8BD, 0x675E }, { 0xE8BE, 0x6748 }, { 0xE8BF, 0x6769 }, { 0xE8C0, 0x67A5 }, { 0xE8C1, 0x6787 }, { 0xE8C2, 0x676A },
+	{ 0xE8C3, 0x6773 }, { 0xE8C4, 0x6798 }, { 0xE8C5, 0x67A7 }, { 0xE8C6, 0x6775 }, { 0xE8C7, 0x67A8 }, { 0xE8C8, 0x679E }, { 0xE8C9, 0x67AD }, { 0xE8CA, 0x678B },
+	{ 0xE8CB, 0x6777 }, { 0xE8CC, 0x677C }, { 0xE8CD, 0x67F0 }, { 0xE8CE, 0x6809 }, { 0xE8CF, 0x67D8 }, { 0xE8D0, 0x680A }, { 0xE8D1, 0x67E9 }, { 0xE8D2, 0x67B0 },
+	{ 0xE8D3, 0x680C }, { 0xE8D4, 0x67D9 }, { 0xE8D5, 0x67B5 }, { 0xE8D6, 0x67DA }, { 0xE8D7, 0x67B3 }, { 0xE8D8, 0x67DD }, { 0xE8D9, 0x6800 }, { 0xE8DA, 0x67C3 },
+	{ 0xE8DB, 0x67B8 }, { 0xE8DC, 0x67E2 }, { 0xE8DD, 0x680E }, { 0xE8DE, 0x67C1 }, { 0xE8DF, 0x67FD }, { 0xE8E0, 0x6832 }, { 0xE8E1, 0x6833 }, { 0xE8E2, 0x6860 },
+	{ 0xE8E3, 0x6861 }, { 0xE8E4, 0x684E }, { 0xE8E5, 0x6862 }, { 0xE8E6, 0x6844 }, { 0xE8E7, 0x6864 }, { 0xE8E8, 0x6883 }, { 0xE8E9, 0x681D }, { 0xE8EA, 0x6855 },
+	{ 0xE8EB, 0x6866 }, { 0xE8EC, 0x6841 }, { 0xE8ED, 0x6867 }, { 0xE8EE, 0x6840 }, { 0xE8EF, 0x683E }, { 0xE8F0, 0x684A }, { 0xE8F1, 0x6849 }, { 0xE8F2, 0x6829 },
+	{ 0xE8F3, 0x68B5 }, { 0xE8F4, 0x688F }, { 0xE8F5, 0x6874 }, { 0xE8F6, 0x6877 }, { 0xE8F7, 0x6893 }, { 0xE8F8, 0x686B }, { 0xE8F9, 0x68C2 }, { 0xE8FA, 0x696E },
+	{ 0xE8FB, 0x68FC }, { 0xE8FC, 0x691F }, { 0xE8FD, 0x6920 }, { 0xE8FE, 0x68F9 }, { 0xE9A1, 0x6924 }, { 0xE9A2, 0x68F0 }, { 0xE9A3, 0x690B }, { 0xE9A4, 0x6901 },
+	{ 0xE9A5, 0x6957 }, { 0xE9A6, 0x68E3 }, { 0xE9A7, 0x6910 }, { 0xE9A8, 0x6971 }, { 0xE9A9, 0x6939 }, { 0xE9AA, 0x6960 }, { 0xE9AB, 0x6942 }, { 0xE9AC, 0x695D },
+	{ 0xE9AD, 0x6984 }, { 0xE9AE, 0x696B }, { 0xE9AF, 0x6980 }, { 0xE9B0, 0x6998 }, { 0xE9B1, 0x6978 }, { 0xE9B2, 0x6934 }, { 0xE9B3, 0x69CC }, { 0xE9B4, 0x6987 },
+	{ 0xE9B5, 0x6988 }, { 0xE9B6, 0x69CE }, { 0xE9B7, 0x6989 }, { 0xE9B8, 0x6966 }, { 0xE9B9, 0x6963 }, { 0xE9BA, 0x6979 }, { 0xE9BB, 0x699B }, { 0xE9BC, 0x69A7 },
+	{ 0xE9BD, 0x69BB }, { 0xE9BE, 0x69AB }, { 0xE9BF, 0x69AD }, { 0xE9C0, 0x69D4 }, { 0xE9C1, 0x69B1 }, { 0xE9C2, 0x69C1 }, { 0xE9C3, 0x69CA }, { 0xE9C4, 0x69DF },
+	{ 0xE9C5, 0x6995 }, { 0xE9C6, 0x69E0 }, { 0xE9C7, 0x698D }, { 0xE9C8, 0x69FF }, { 0xE9C9, 0x6A2F }, { 0xE9CA, 0x69ED }, { 0xE9CB, 0x6A17 }, { 0xE9CC, 0x6A18 },
+	{ 0xE9CD, 0x6A65 }, { 0xE9CE, 0x69F2 }, { 0xE9CF, 0x6A44 }, { 0xE9D0, 0x6A3E }, { 0xE9D1, 0x6AA0 }, { 0xE9D2, 0x6A50 }, { 0xE9D3, 0x6A5B }, { 0xE9D4, 0x6A35 },
+	{ 0xE9D5, 0x6A8E }, { 0xE9D6, 0x6A79 }, { 0xE9D7, 0x6A3D }, { 0xE9D8, 0x6A28 }, { 0xE9D9, 0x6A58 }, { 0xE9DA, 0x6A7C }, { 0xE9DB, 0x6A91 }, { 0xE9DC, 0x6A90 },
+	{ 0xE9DD, 0x6AA9 }, { 0xE9DE, 0x6A97 }, { 0xE9DF, 0x6AAB }, { 0xE9E0, 0x7337 }, { 0xE9E1, 0x7352 }, { 0xE9E2, 0x6B81 }, { 0xE9E3, 0x6B82 }, { 0xE9E4, 0x6B87 },
+	{ 0xE9E5, 0x6B84 }, { 0xE9E6, 0x6B92 }, { 0xE9E7, 0x6B93 }, { 0xE9E8, 0x6B8D }, { 0xE9E9, 0x6B9A }, { 0xE9EA, 0x6B9B }, { 0xE9EB, 0x6BA1 }, { 0xE9EC, 0x6BAA },
+	{ 0xE9ED, 0x8F6B }, { 0xE9EE, 0x8F6D }, { 0xE9EF, 0x8F71 }, { 0xE9F0, 0x8F72 }, { 0xE9F1, 0x8F73 }, { 0xE9F2, 0x8F75 }, { 0xE9F3, 0x8F76 }, { 0xE9F4, 0x8F78 },
+	{ 0xE9F5, 0x8F77 }, { 0xE9F6, 0x8F79 }, { 0xE9F7, 0x8F7A }, { 0xE9F8, 0x8F7C }, { 0xE9F9, 0x8F7E }, { 0xE9FA, 0x8F81 }, { 0xE9FB, 0x8F82 }, { 0xE9FC, 0x8F84 },
+	{ 0xE9FD, 0x8F87 }, { 0xE9FE, 0x8F8B }, { 0xEAA1, 0x8F8D }, { 0xEAA2, 0x8F8E }, { 0xEAA3, 0x8F8F }, { 0xEAA4, 0x8F98 }, { 0xEAA5, 0x8F9A }, { 0xEAA6, 0x8ECE },
+	{ 0xEAA7, 0x620B }, { 0xEAA8, 0x6217 }, { 0xEAA9, 0x621B }, { 0xEAAA, 0x621F }, { 0xEAAB, 0x6222 }, { 0xEAAC, 0x6221 }, { 0xEAAD, 0x6225 }, { 0xEAAE, 0x6224 },
+	{ 0xEAAF, 0x622C }, { 0xEAB0, 0x81E7 }, { 0xEAB1, 0x74EF }, { 0xEAB2, 0x74F4 }, { 0xEAB3, 0x74FF }, { 0xEAB4, 0x750F }, { 0xEAB5, 0x7511 }, { 0xEAB6, 0x7513 },
+	{ 0xEAB7, 0x6534 }, { 0xEAB8, 0x65EE }, { 0xEAB9, 0x65EF }, { 0xEABA, 0x65F0 }, { 0xEABB, 0x660A }, { 0xEABC, 0x6619 }, { 0xEABD, 0x6772 }, { 0xEABE, 0x6603 },
+	{ 0xEABF, 0x6615 }, { 0xEAC0, 0x6600 }, { 0xEAC1, 0x7085 }, { 0xEAC2, 0x66F7 }, { 0xEAC3, 0x661D }, { 0xEAC4, 0x6634 }, { 0xEAC5, 0x6631 }, { 0xEAC6, 0x6636 },
+	{ 0xEAC7, 0x6635 }, { 0xEAC8, 0x8006 }, { 0xEAC9, 0x665F }, { 0xEACA, 0x6654 }, { 0xEACB, 0x6641 }, { 0xEACC, 0x664F }, { 0xEACD, 0x6656 }, { 0xEACE, 0x6661 },
+	{ 0xEACF, 0x6657 }, { 0xEAD0, 0x6677 }, { 0xEAD1, 0x6684 }, { 0xEAD2, 0x668C }, { 0xEAD3, 0x66A7 }, { 0xEAD4, 0x669D }, { 0xEAD5, 0x66BE }, { 0xEAD6, 0x66DB },
+	{ 0xEAD7, 0x66DC }, { 0xEAD8, 0x66E6 }, { 0xEAD9, 0x66E9 }, { 0xEADA, 0x8D32 }, { 0xEADB, 0x8D33 }, { 0xEADC, 0x8D36 }, { 0xEADD, 0x8D3B }, { 0xEADE, 0x8D3D },
+	{ 0xEADF, 0x8D40 }, { 0xEAE0, 0x8D45 }, { 0xEAE1, 0x8D46 }, { 0xEAE2, 0x8D48 }, { 0xEAE3, 0x8D49 }, { 0xEAE4, 0x8D47 }, { 0xEAE5, 0x8D4D }, { 0xEAE6, 0x8D55 },
+	{ 0xEAE7, 0x8D59 }, { 0xEAE8, 0x89C7 }, { 0xEAE9, 0x89CA }, { 0xEAEA, 0x89CB }, { 0xEAEB, 0x89CC }, { 0xEAEC, 0x89CE }, { 0xEAED, 0x89CF }, { 0xEAEE, 0x89D0 },
+	{ 0xEAEF, 0x89D1 }, { 0xEAF0, 0x726E }, { 0xEAF1, 0x729F }, { 0xEAF2, 0x725D }, { 0xEAF3, 0x7266 }, { 0xEAF4, 0x726F }, { 0xEAF5, 0x727E }, { 0xEAF6, 0x727F },
+	{ 0xEAF7, 0x7284 }, { 0xEAF8, 0x728B }, { 0xEAF9, 0x728D }, { 0xEAFA, 0x728F }, { 0xEAFB, 0x7292 }, { 0xEAFC, 0x6308 }, { 0xEAFD, 0x6332 }, { 0xEAFE, 0x63B0 },
+	{ 0xEBA1, 0x643F }, { 0xEBA2, 0x64D8 }, { 0xEBA3, 0x8004 }, { 0xEBA4, 0x6BEA }, { 0xEBA5, 0x6BF3 }, { 0xEBA6, 0x6BFD }, { 0xEBA7, 0x6BF5 }, { 0xEBA8, 0x6BF9 },
+	{ 0xEBA9, 0x6C05 }, { 0xEBAA, 0x6C07 }, { 0xEBAB, 0x6C06 }, { 0xEBAC, 0x6C0D }, { 0xEBAD, 0x6C15 }, { 0xEBAE, 0x6C18 }, { 0xEBAF, 0x6C19 }, { 0xEBB0, 0x6C1A },
+	{ 0xEBB1, 0x6C21 }, { 0xEBB2, 0x6C29 }, { 0xEBB3, 0x6C24 }, { 0xEBB4, 0x6C2A }, { 0xEBB5, 0x6C32 }, { 0xEBB6, 0x6535 }, { 0xEBB7, 0x6555 }, { 0xEBB8, 0x656B },
+	{ 0xEBB9, 0x724D }, { 0xEBBA, 0x7252 }, { 0xEBBB, 0x7256 }, { 0xEBBC, 0x7230 }, { 0xEBBD, 0x8662 }, { 0xEBBE, 0x5216 }, { 0xEBBF, 0x809F }, { 0xEBC0, 0x809C },
+	{ 0xEBC1, 0x8093 }, { 0xEBC2, 0x80BC }, { 0xEBC3, 0x670A }, { 0xEBC4, 0x80BD }, { 0xEBC5, 0x80B1 }, { 0xEBC6, 0x80AB }, { 0xEBC7, 0x80AD }, { 0xEBC8, 0x80B4 },
+	{ 0xEBC9, 0x80B7 }, { 0xEBCA, 0x80E7 }, { 0xEBCB, 0x80E8 }, { 0xEBCC, 0x80E9 }, { 0xEBCD, 0x80EA }, { 0xEBCE, 0x80DB }, { 0xEBCF, 0x80C2 }, { 0xEBD0, 0x80C4 },
+	{ 0xEBD1, 0x80D9 }, { 0xEBD2, 0x80CD }, { 0xEBD3, 0x80D7 }, { 0xEBD4, 0x6710 }, { 0xEBD5, 0x80DD }, { 0xEBD6, 0x80EB }, { 0xEBD7, 0x80F1 }, { 0xEBD8, 0x80F4 },
+	{ 0xEBD9, 0x80ED }, { 0xEBDA, 0x810D }, { 0xEBDB, 0x810E }, { 0xEBDC, 0x80F2 }, { 0xEBDD, 0x80FC }, { 0xEBDE, 0x6715 }, { 0xEBDF, 0x8112 }, { 0xEBE0, 0x8C5A },
+	{ 0xEBE1, 0x8136 }, { 0xEBE2, 0x811E }, { 0xEBE3, 0x812C }, { 0xEBE4, 0x8118 }, { 0xEBE5, 0x8132 }, { 0xEBE6, 0x8148 }, { 0xEBE7, 0x814C }, { 0xEBE8, 0x8153 },
+	{ 0xEBE9, 0x8174 }, { 0xEBEA, 0x8159 }, { 0xEBEB, 0x815A }, { 0xEBEC, 0x8171 }, { 0xEBED, 0x8160 }, { 0xEBEE, 0x8169 }, { 0xEBEF, 0x817C }, { 0xEBF0, 0x817D },
+	{ 0xEBF1, 0x816D }, { 0xEBF2, 0x8167 }, { 0xEBF3, 0x584D }, { 0xEBF4, 0x5AB5 }, { 0xEBF5, 0x8188 }, { 0xEBF6, 0x8182 }, { 0xEBF7, 0x8191 }, { 0xEBF8, 0x6ED5 },
+	{ 0xEBF9, 0x81A3 }, { 0xEBFA, 0x81AA }, { 0xEBFB, 0x81CC }, { 0xEBFC, 0x6726 }, { 0xEBFD, 0x81CA }, { 0xEBFE, 0x81BB }, { 0xECA1, 0x81C1 }, { 0xECA2, 0x81A6 },
+	{ 0xECA3, 0x6B24 }, { 0xECA4, 0x6B37 }, { 0xECA5, 0x6B39 }, { 0xECA6, 0x6B43 }, { 0xECA7, 0x6B46 }, { 0xECA8, 0x6B59 }, { 0xECA9, 0x98D1 }, { 0xECAA, 0x98D2 },
+	{ 0xECAB, 0x98D3 }, { 0xECAC, 0x98D5 }, { 0xECAD, 0x98D9 }, { 0xECAE, 0x98DA }, { 0xECAF, 0x6BB3 }, { 0xECB0, 0x5F40 }, { 0xECB1, 0x6BC2 }, { 0xECB2, 0x89F3 },
+	{ 0xECB3, 0x6590 }, { 0xECB4, 0x9F51 }, { 0xECB5, 0x6593 }, { 0xECB6, 0x65BC }, { 0xECB7, 0x65C6 }, { 0xECB8, 0x65C4 }, { 0xECB9, 0x65C3 }, { 0xECBA, 0x65CC },
+	{ 0xECBB, 0x65CE }, { 0xECBC, 0x65D2 }, { 0xECBD, 0x65D6 }, { 0xECBE, 0x7080 }, { 0xECBF, 0x709C }, { 0xECC0, 0x7096 }, { 0xECC1, 0x709D }, { 0xECC2, 0x70BB },
+	{ 0xECC3, 0x70C0 }, { 0xECC4, 0x70B7 }, { 0xECC5, 0x70AB }, { 0xECC6, 0x70B1 }, { 0xECC7, 0x70E8 }, { 0xECC8, 0x70CA }, { 0xECC9, 0x7110 }, { 0xECCA, 0x7113 },
+	{ 0xECCB, 0x7116 }, { 0xECCC, 0x712F }, { 0xECCD, 0x7131 }, { 0xECCE, 0x7173 }, { 0xECCF, 0x715C }, { 0xECD0, 0x7168 }, { 0xECD1, 0x7145 }, { 0xECD2, 0x7172 },
+	{ 0xECD3, 0x714A }, { 0xECD4, 0x7178 }, { 0xECD5, 0x717A }, { 0xECD6, 0x7198 }, { 0xECD7, 0x71B3 }, { 0xECD8, 0x71B5 }, { 0xECD9, 0x71A8 }, { 0xECDA, 0x71A0 },
+	{ 0xECDB, 0x71E0 }, { 0xECDC, 0x71D4 }, { 0xECDD, 0x71E7 }, { 0xECDE, 0x71F9 }, { 0xECDF, 0x721D }, { 0xECE0, 0x7228 }, { 0xECE1, 0x706C }, { 0xECE2, 0x7118 },
+	{ 0xECE3, 0x7166 }, { 0xECE4, 0x71B9 }, { 0xECE5, 0x623E }, { 0xECE6, 0x623D }, { 0xECE7, 0x6243 }, { 0xECE8, 0x6248 }, { 0xECE9, 0x6249 }, { 0xECEA, 0x793B },
+	{ 0xECEB, 0x7940 }, { 0xECEC, 0x7946 }, { 0xECED, 0x7949 }, { 0xECEE, 0x795B }, { 0xECEF, 0x795C }, { 0xECF0, 0x7953 }, { 0xECF1, 0x795A }, { 0xECF2, 0x7962 },
+	{ 0xECF3, 0x7957 }, { 0xECF4, 0x7960 }, { 0xECF5, 0x796F }, { 0xECF6, 0x7967 }, { 0xECF7, 0x797A }, { 0xECF8, 0x7985 }, { 0xECF9, 0x798A }, { 0xECFA, 0x799A },
+	{ 0xECFB, 0x79A7 }, { 0xECFC, 0x79B3 }, { 0xECFD, 0x5FD1 }, { 0xECFE, 0x5FD0 }, { 0xEDA1, 0x603C }, { 0xEDA2, 0x605D }, { 0xEDA3, 0x605A }, { 0xEDA4, 0x6067 },
+	{ 0xEDA5, 0x6041 }, { 0xEDA6, 0x6059 }, { 0xEDA7, 0x6063 }, { 0xEDA8, 0x60AB }, { 0xEDA9, 0x6106 }, { 0xEDAA, 0x610D }, { 0xEDAB, 0x615D }, { 0xEDAC, 0x61A9 },
+	{ 0xEDAD, 0x619D }, { 0xEDAE, 0x61CB }, { 0xEDAF, 0x61D1 }, { 0xEDB0, 0x6206 }, { 0xEDB1, 0x8080 }, { 0xEDB2, 0x807F }, { 0xEDB3, 0x6C93 }, { 0xEDB4, 0x6CF6 },
+	{ 0xEDB5, 0x6DFC }, { 0xEDB6, 0x77F6 }, { 0xEDB7, 0x77F8 }, { 0xEDB8, 0x7800 }, { 0xEDB9, 0x7809 }, { 0xEDBA, 0x7817 }, { 0xEDBB, 0x7818 }, { 0xEDBC, 0x7811 },
+	{ 0xEDBD, 0x65AB }, { 0xEDBE, 0x782D }, { 0xEDBF, 0x781C }, { 0xEDC0, 0x781D }, { 0xEDC1, 0x7839 }, { 0xEDC2, 0x783A }, { 0xEDC3, 0x783B }, { 0xEDC4, 0x781F },
+	{ 0xEDC5, 0x783C }, { 0xEDC6, 0x7825 }, { 0xEDC7, 0x782C }, { 0xEDC8, 0x7823 }, { 0xEDC9, 0x7829 }, { 0xEDCA, 0x784E }, { 0xEDCB, 0x786D }, { 0xEDCC, 0x7856 },
+	{ 0xEDCD, 0x7857 }, { 0xEDCE, 0x7826 }, { 0xEDCF, 0x7850 }, { 0xEDD0, 0x7847 }, { 0xEDD1, 0x784C }, { 0xEDD2, 0x786A }, { 0xEDD3, 0x789B }, { 0xEDD4, 0x7893 },
+	{ 0xEDD5, 0x789A }, { 0xEDD6, 0x7887 }, { 0xEDD7, 0x789C }, { 0xEDD8, 0x78A1 }, { 0xEDD9, 0x78A3 }, { 0xEDDA, 0x78B2 }, { 0xEDDB, 0x78B9 }, { 0xEDDC, 0x78A5 },
+	{ 0xEDDD, 0x78D4 }, { 0xEDDE, 0x78D9 }, { 0xEDDF, 0x78C9 }, { 0xEDE0, 0x78EC }, { 0xEDE1, 0x78F2 }, { 0xEDE2, 0x7905 }, { 0xEDE3, 0x78F4 }, { 0xEDE4, 0x7913 },
+	{ 0xEDE5, 0x7924 }, { 0xEDE6, 0x791E }, { 0xEDE7, 0x7934 }, { 0xEDE8, 0x9F9B }, { 0xEDE9, 0x9EF9 }, { 0xEDEA, 0x9EFB }, { 0xEDEB, 0x9EFC }, { 0xEDEC, 0x76F1 },
+	{ 0xEDED, 0x7704 }, { 0xEDEE, 0x770D }, { 0xEDEF, 0x76F9 }, { 0xEDF0, 0x7707 }, { 0xEDF1, 0x7708 }, { 0xEDF2, 0x771A }, { 0xEDF3, 0x7722 }, { 0xEDF4, 0x7719 },
+	{ 0xEDF5, 0x772D }, { 0xEDF6, 0x7726 }, { 0xEDF7, 0x7735 }, { 0xEDF8, 0x7738 }, { 0xEDF9, 0x7750 }, { 0xEDFA, 0x7751 }, { 0xEDFB, 0x7747 }, { 0xEDFC, 0x7743 },
+	{ 0xEDFD, 0x775A }, { 0xEDFE, 0x7768 }, { 0xEEA1, 0x7762 }, { 0xEEA2, 0x7765 }, { 0xEEA3, 0x777F }, { 0xEEA4, 0x778D }, { 0xEEA5, 0x777D }, { 0xEEA6, 0x7780 },
+	{ 0xEEA7, 0x778C }, { 0xEEA8, 0x7791 }, { 0xEEA9, 0x779F }, { 0xEEAA, 0x77A0 }, { 0xEEAB, 0x77B0 }, { 0xEEAC, 0x77B5 }, { 0xEEAD, 0x77BD }, { 0xEEAE, 0x753A },
+	{ 0xEEAF, 0x7540 }, { 0xEEB0, 0x754E }, { 0xEEB1, 0x754B }, { 0xEEB2, 0x7548 }, { 0xEEB3, 0x755B }, { 0xEEB4, 0x7572 }, { 0xEEB5, 0x7579 }, { 0xEEB6, 0x7583 },
+	{ 0xEEB7, 0x7F58 }, { 0xEEB8, 0x7F61 }, { 0xEEB9, 0x7F5F }, { 0xEEBA, 0x8A48 }, { 0xEEBB, 0x7F68 }, { 0xEEBC, 0x7F74 }, { 0xEEBD, 0x7F71 }, { 0xEEBE, 0x7F79 },
+	{ 0xEEBF, 0x7F81 }, { 0xEEC0, 0x7F7E }, { 0xEEC1, 0x76CD }, { 0xEEC2, 0x76E5 }, { 0xEEC3, 0x8832 }, { 0xEEC4, 0x9485 }, { 0xEEC5, 0x9486 }, { 0xEEC6, 0x9487 },
+	{ 0xEEC7, 0x948B }, { 0xEEC8, 0x948A }, { 0xEEC9, 0x948C }, { 0xEECA, 0x948D }, { 0xEECB, 0x948F }, { 0xEECC, 0x9490 }, { 0xEECD, 0x9494 }, { 0xEECE, 0x9497 },
+	{ 0xEECF, 0x9495 }, { 0xEED0, 0x949A }, { 0xEED1, 0x949B }, { 0xEED2, 0x949C }, { 0xEED3, 0x94A3 }, { 0xEED4, 0x94A4 }, { 0xEED5, 0x94AB }, { 0xEED6, 0x94AA },
+	{ 0xEED7, 0x94AD }, { 0xEED8, 0x94AC }, { 0xEED9, 0x94AF }, { 0xEEDA, 0x94B0 }, { 0xEEDB, 0x94B2 }, { 0xEEDC, 0x94B4 }, { 0xEEDD, 0x94B6 }, { 0xEEDE, 0x94B7 },
+	{ 0xEEDF, 0x94B8 }, { 0xEEE0, 0x94B9 }, { 0xEEE1, 0x94BA }, { 0xEEE2, 0x94BC }, { 0xEEE3, 0x94BD }, { 0xEEE4, 0x94BF }, { 0xEEE5, 0x94C4 }, { 0xEEE6, 0x94C8 },
+	{ 0xEEE7, 0x94C9 }, { 0xEEE8, 0x94CA }, { 0xEEE9, 0x94CB }, { 0xEEEA, 0x94CC }, { 0xEEEB, 0x94CD }, { 0xEEEC, 0x94CE }, { 0xEEED, 0x94D0 }, { 0xEEEE, 0x94D1 },
+	{ 0xEEEF, 0x94D2 }, { 0xEEF0, 0x94D5 }, { 0xEEF1, 0x94D6 }, { 0xEEF2, 0x94D7 }, { 0xEEF3, 0x94D9 }, { 0xEEF4, 0x94D8 }, { 0xEEF5, 0x94DB }, { 0xEEF6, 0x94DE },
+	{ 0xEEF7, 0x94DF }, { 0xEEF8, 0x94E0 }, { 0xEEF9, 0x94E2 }, { 0xEEFA, 0x94E4 }, { 0xEEFB, 0x94E5 }, { 0xEEFC, 0x94E7 }, { 0xEEFD, 0x94E8 }, { 0xEEFE, 0x94EA },
+	{ 0xEFA1, 0x94E9 }, { 0xEFA2, 0x94EB }, { 0xEFA3, 0x94EE }, { 0xEFA4, 0x94EF }, { 0xEFA5, 0x94F3 }, { 0xEFA6, 0x94F4 }, { 0xEFA7, 0x94F5 }, { 0xEFA8, 0x94F7 },
+	{ 0xEFA9, 0x94F9 }, { 0xEFAA, 0x94FC }, { 0xEFAB, 0x94FD }, { 0xEFAC, 0x94FF }, { 0xEFAD, 0x9503 }, { 0xEFAE, 0x9502 }, { 0xEFAF, 0x9506 }, { 0xEFB0, 0x9507 },
+	{ 0xEFB1, 0x9509 }, { 0xEFB2, 0x950A }, { 0xEFB3, 0x950D }, { 0xEFB4, 0x950E }, { 0xEFB5, 0x950F }, { 0xEFB6, 0x9512 }, { 0xEFB7, 0x9513 }, { 0xEFB8, 0x9514 },
+	{ 0xEFB9, 0x9515 }, { 0xEFBA, 0x9516 }, { 0xEFBB, 0x9518 }, { 0xEFBC, 0x951B }, { 0xEFBD, 0x951D }, { 0xEFBE, 0x951E }, { 0xEFBF, 0x951F }, { 0xEFC0, 0x9522 },
+	{ 0xEFC1, 0x952A }, { 0xEFC2, 0x952B }, { 0xEFC3, 0x9529 }, { 0xEFC4, 0x952C }, { 0xEFC5, 0x9531 }, { 0xEFC6, 0x9532 }, { 0xEFC7, 0x9534 }, { 0xEFC8, 0x9536 },
+	{ 0xEFC9, 0x9537 }, { 0xEFCA, 0x9538 }, { 0xEFCB, 0x953C }, { 0xEFCC, 0x953E }, { 0xEFCD, 0x953F }, { 0xEFCE, 0x9542 }, { 0xEFCF, 0x9535 }, { 0xEFD0, 0x9544 },
+	{ 0xEFD1, 0x9545 }, { 0xEFD2, 0x9546 }, { 0xEFD3, 0x9549 }, { 0xEFD4, 0x954C }, { 0xEFD5, 0x954E }, { 0xEFD6, 0x954F }, { 0xEFD7, 0x9552 }, { 0xEFD8, 0x9553 },
+	{ 0xEFD9, 0x9554 }, { 0xEFDA, 0x9556 }, { 0xEFDB, 0x9557 }, { 0xEFDC, 0x9558 }, { 0xEFDD, 0x9559 }, { 0xEFDE, 0x955B }, { 0xEFDF, 0x955E }, { 0xEFE0, 0x955F },
+	{ 0xEFE1, 0x955D }, { 0xEFE2, 0x9561 }, { 0xEFE3, 0x9562 }, { 0xEFE4, 0x9564 }, { 0xEFE5, 0x9565 }, { 0xEFE6, 0x9566 }, { 0xEFE7, 0x9567 }, { 0xEFE8, 0x9568 },
+	{ 0xEFE9, 0x9569 }, { 0xEFEA, 0x956A }, { 0xEFEB, 0x956B }, { 0xEFEC, 0x956C }, { 0xEFED, 0x956F }, { 0xEFEE, 0x9571 }, { 0xEFEF, 0x9572 }, { 0xEFF0, 0x9573 },
+	{ 0xEFF1, 0x953A }, { 0xEFF2, 0x77E7 }, { 0xEFF3, 0x77EC }, { 0xEFF4, 0x96C9 }, { 0xEFF5, 0x79D5 }, { 0xEFF6, 0x79ED }, { 0xEFF7, 0x79E3 }, { 0xEFF8, 0x79EB },
+	{ 0xEFF9, 0x7A06 }, { 0xEFFA, 0x5D47 }, { 0xEFFB, 0x7A03 }, { 0xEFFC, 0x7A02 }, { 0xEFFD, 0x7A1E }, { 0xEFFE, 0x7A14 }, { 0xF0A1, 0x7A39 }, { 0xF0A2, 0x7A37 },
+	{ 0xF0A3, 0x7A51 }, { 0xF0A4, 0x9ECF }, { 0xF0A5, 0x99A5 }, { 0xF0A6, 0x7A70 }, { 0xF0A7, 0x7688 }, { 0xF0A8, 0x768E }, { 0xF0A9, 0x7693 }, { 0xF0AA, 0x7699 },
+	{ 0xF0AB, 0x76A4 }, { 0xF0AC, 0x74DE }, { 0xF0AD, 0x74E0 }, { 0xF0AE, 0x752C }, { 0xF0AF, 0x9E20 }, { 0xF0B0, 0x9E22 }, { 0xF0B1, 0x9E28 }, { 0xF0B2, 0x9E29 },
+	{ 0xF0B3, 0x9E2A }, { 0xF0B4, 0x9E2B }, { 0xF0B5, 0x9E2C }, { 0xF0B6, 0x9E32 }, { 0xF0B7, 0x9E31 }, { 0xF0B8, 0x9E36 }, { 0xF0B9, 0x9E38 }, { 0xF0BA, 0x9E37 },
+	{ 0xF0BB, 0x9E39 }, { 0xF0BC, 0x9E3A }, { 0xF0BD, 0x9E3E }, { 0xF0BE, 0x9E41 }, { 0xF0BF, 0x9E42 }, { 0xF0C0, 0x9E44 }, { 0xF0C1, 0x9E46 }, { 0xF0C2, 0x9E47 },
+	{ 0xF0C3, 0x9E48 }, { 0xF0C4, 0x9E49 }, { 0xF0C5, 0x9E4B }, { 0xF0C6, 0x9E4C }, { 0xF0C7, 0x9E4E }, { 0xF0C8, 0x9E51 }, { 0xF0C9, 0x9E55 }, { 0xF0CA, 0x9E57 },
+	{ 0xF0CB, 0x9E5A }, { 0xF0CC, 0x9E5B }, { 0xF0CD, 0x9E5C }, { 0xF0CE, 0x9E5E }, { 0xF0CF, 0x9E63 }, { 0xF0D0, 0x9E66 }, { 0xF0D1, 0x9E67 }, { 0xF0D2, 0x9E68 },
+	{ 0xF0D3, 0x9E69 }, { 0xF0D4, 0x9E6A }, { 0xF0D5, 0x9E6B }, { 0xF0D6, 0x9E6C }, { 0xF0D7, 0x9E71 }, { 0xF0D8, 0x9E6D }, { 0xF0D9, 0x9E73 }, { 0xF0DA, 0x7592 },
+	{ 0xF0DB, 0x7594 }, { 0xF0DC, 0x7596 }, { 0xF0DD, 0x75A0 }, { 0xF0DE, 0x759D }, { 0xF0DF, 0x75AC }, { 0xF0E0, 0x75A3 }, { 0xF0E1, 0x75B3 }, { 0xF0E2, 0x75B4 },
+	{ 0xF0E3, 0x75B8 }, { 0xF0E4, 0x75C4 }, { 0xF0E5, 0x75B1 }, { 0xF0E6, 0x75B0 }, { 0xF0E7, 0x75C3 }, { 0xF0E8, 0x75C2 }, { 0xF0E9, 0x75D6 }, { 0xF0EA, 0x75CD },
+	{ 0xF0EB, 0x75E3 }, { 0xF0EC, 0x75E8 }, { 0xF0ED, 0x75E6 }, { 0xF0EE, 0x75E4 }, { 0xF0EF, 0x75EB }, { 0xF0F0, 0x75E7 }, { 0xF0F1, 0x7603 }, { 0xF0F2, 0x75F1 },
+	{ 0xF0F3, 0x75FC }, { 0xF0F4, 0x75FF }, { 0xF0F5, 0x7610 }, { 0xF0F6, 0x7600 }, { 0xF0F7, 0x7605 }, { 0xF0F8, 0x760C }, { 0xF0F9, 0x7617 }, { 0xF0FA, 0x760A },
+	{ 0xF0FB, 0x7625 }, { 0xF0FC, 0x7618 }, { 0xF0FD, 0x7615 }, { 0xF0FE, 0x7619 }, { 0xF1A1, 0x761B }, { 0xF1A2, 0x763C }, { 0xF1A3, 0x7622 }, { 0xF1A4, 0x7620 },
+	{ 0xF1A5, 0x7640 }, { 0xF1A6, 0x762D }, { 0xF1A7, 0x7630 }, { 0xF1A8, 0x763F }, { 0xF1A9, 0x7635 }, { 0xF1AA, 0x7643 }, { 0xF1AB, 0x763E }, { 0xF1AC, 0x7633 },
+	{ 0xF1AD, 0x764D }, { 0xF1AE, 0x765E }, { 0xF1AF, 0x7654 }, { 0xF1B0, 0x765C }, { 0xF1B1, 0x7656 }, { 0xF1B2, 0x766B }, { 0xF1B3, 0x766F }, { 0xF1B4, 0x7FCA },
+	{ 0xF1B5, 0x7AE6 }, { 0xF1B6, 0x7A78 }, { 0xF1B7, 0x7A79 }, { 0xF1B8, 0x7A80 }, { 0xF1B9, 0x7A86 }, { 0xF1BA, 0x7A88 }, { 0xF1BB, 0x7A95 }, { 0xF1BC, 0x7AA6 },
+	{ 0xF1BD, 0x7AA0 }, { 0xF1BE, 0x7AAC }, { 0xF1BF, 0x7AA8 }, { 0xF1C0, 0x7AAD }, { 0xF1C1, 0x7AB3 }, { 0xF1C2, 0x8864 }, { 0xF1C3, 0x8869 }, { 0xF1C4, 0x8872 },
+	{ 0xF1C5, 0x887D }, { 0xF1C6, 0x887F }, { 0xF1C7, 0x8882 }, { 0xF1C8, 0x88A2 }, { 0xF1C9, 0x88C6 }, { 0xF1CA, 0x88B7 }, { 0xF1CB, 0x88BC }, { 0xF1CC, 0x88C9 },
+	{ 0xF1CD, 0x88E2 }, { 0xF1CE, 0x88CE }, { 0xF1CF, 0x88E3 }, { 0xF1D0, 0x88E5 }, { 0xF1D1, 0x88F1 }, { 0xF1D2, 0x891A }, { 0xF1D3, 0x88FC }, { 0xF1D4, 0x88E8 },
+	{ 0xF1D5, 0x88FE }, { 0xF1D6, 0x88F0 }, { 0xF1D7, 0x8921 }, { 0xF1D8, 0x8919 }, { 0xF1D9, 0x8913 }, { 0xF1DA, 0x891B }, { 0xF1DB, 0x890A }, { 0xF1DC, 0x8934 },
+	{ 0xF1DD, 0x892B }, { 0xF1DE, 0x8936 }, { 0xF1DF, 0x8941 }, { 0xF1E0, 0x8966 }, { 0xF1E1, 0x897B }, { 0xF1E2, 0x758B }, { 0xF1E3, 0x80E5 }, { 0xF1E4, 0x76B2 },
+	{ 0xF1E5, 0x76B4 }, { 0xF1E6, 0x77DC }, { 0xF1E7, 0x8012 }, { 0xF1E8, 0x8014 }, { 0xF1E9, 0x8016 }, { 0xF1EA, 0x801C }, { 0xF1EB, 0x8020 }, { 0xF1EC, 0x8022 },
+	{ 0xF1ED, 0x8025 }, { 0xF1EE, 0x8026 }, { 0xF1EF, 0x8027 }, { 0xF1F0, 0x8029 }, { 0xF1F1, 0x8028 }, { 0xF1F2, 0x8031 }, { 0xF1F3, 0x800B }, { 0xF1F4, 0x8035 },
+	{ 0xF1F5, 0x8043 }, { 0xF1F6, 0x8046 }, { 0xF1F7, 0x804D }, { 0xF1F8, 0x8052 }, { 0xF1F9, 0x8069 }, { 0xF1FA, 0x8071 }, { 0xF1FB, 0x8983 }, { 0xF1FC, 0x9878 },
+	{ 0xF1FD, 0x9880 }, { 0xF1FE, 0x9883 }, { 0xF2A1, 0x9889 }, { 0xF2A2, 0x988C }, { 0xF2A3, 0x988D }, { 0xF2A4, 0x988F }, { 0xF2A5, 0x9894 }, { 0xF2A6, 0x989A },
+	{ 0xF2A7, 0x989B }, { 0xF2A8, 0x989E }, { 0xF2A9, 0x989F }, { 0xF2AA, 0x98A1 }, { 0xF2AB, 0x98A2 }, { 0xF2AC, 0x98A5 }, { 0xF2AD, 0x98A6 }, { 0xF2AE, 0x864D },
+	{ 0xF2AF, 0x8654 }, { 0xF2B0, 0x866C }, { 0xF2B1, 0x866E }, { 0xF2B2, 0x867F }, { 0xF2B3, 0x867A }, { 0xF2B4, 0x867C }, { 0xF2B5, 0x867B }, { 0xF2B6, 0x86A8 },
+	{ 0xF2B7, 0x868D }, { 0xF2B8, 0x868B }, { 0xF2B9, 0x86AC }, { 0xF2BA, 0x869D }, { 0xF2BB, 0x86A7 }, { 0xF2BC, 0x86A3 }, { 0xF2BD, 0x86AA }, { 0xF2BE, 0x8693 },
+	{ 0xF2BF, 0x86A9 }, { 0xF2C0, 0x86B6 }, { 0xF2C1, 0x86C4 }, { 0xF2C2, 0x86B5 }, { 0xF2C3, 0x86CE }, { 0xF2C4, 0x86B0 }, { 0xF2C5, 0x86BA }, { 0xF2C6, 0x86B1 },
+	{ 0xF2C7, 0x86AF }, { 0xF2C8, 0x86C9 }, { 0xF2C9, 0x86CF }, { 0xF2CA, 0x86B4 }, { 0xF2CB, 0x86E9 }, { 0xF2CC, 0x86F1 }, { 0xF2CD, 0x86F2 }, { 0xF2CE, 0x86ED },
+	{ 0xF2CF, 0x86F3 }, { 0xF2D0, 0x86D0 }, { 0xF2D1, 0x8713 }, { 0xF2D2, 0x86DE }, { 0xF2D3, 0x86F4 }, { 0xF2D4, 0x86DF }, { 0xF2D5, 0x86D8 }, { 0xF2D6, 0x86D1 },
+	{ 0xF2D7, 0x8703 }, { 0xF2D8, 0x8707 }, { 0xF2D9, 0x86F8 }, { 0xF2DA, 0x8708 }, { 0xF2DB, 0x870A }, { 0xF2DC, 0x870D }, { 0xF2DD, 0x8709 }, { 0xF2DE, 0x8723 },
+	{ 0xF2DF, 0x873B }, { 0xF2E0, 0x871E }, { 0xF2E1, 0x8725 }, { 0xF2E2, 0x872E }, { 0xF2E3, 0x871A }, { 0xF2E4, 0x873E }, { 0xF2E5, 0x8748 }, { 0xF2E6, 0x8734 },
+	{ 0xF2E7, 0x8731 }, { 0xF2E8, 0x8729 }, { 0xF2E9, 0x8737 }, { 0xF2EA, 0x873F }, { 0xF2EB, 0x8782 }, { 0xF2EC, 0x8722 }, { 0xF2ED, 0x877D }, { 0xF2EE, 0x877E },
+	{ 0xF2EF, 0x877B }, { 0xF2F0, 0x8760 }, { 0xF2F1, 0x8770 }, { 0xF2F2, 0x874C }, { 0xF2F3, 0x876E }, { 0xF2F4, 0x878B }, { 0xF2F5, 0x8753 }, { 0xF2F6, 0x8763 },
+	{ 0xF2F7, 0x877C }, { 0xF2F8, 0x8764 }, { 0xF2F9, 0x8759 }, { 0xF2FA, 0x8765 }, { 0xF2FB, 0x8793 }, { 0xF2FC, 0x87AF }, { 0xF2FD, 0x87A8 }, { 0xF2FE, 0x87D2 },
+	{ 0xF3A1, 0x87C6 }, { 0xF3A2, 0x8788 }, { 0xF3A3, 0x8785 }, { 0xF3A4, 0x87AD }, { 0xF3A5, 0x8797 }, { 0xF3A6, 0x8783 }, { 0xF3A7, 0x87AB }, { 0xF3A8, 0x87E5 },
+	{ 0xF3A9, 0x87AC }, { 0xF3AA, 0x87B5 }, { 0xF3AB, 0x87B3 }, { 0xF3AC, 0x87CB }, { 0xF3AD, 0x87D3 }, { 0xF3AE, 0x87BD }, { 0xF3AF, 0x87D1 }, { 0xF3B0, 0x87C0 },
+	{ 0xF3B1, 0x87CA }, { 0xF3B2, 0x87DB }, { 0xF3B3, 0x87EA }, { 0xF3B4, 0x87E0 }, { 0xF3B5, 0x87EE }, { 0xF3B6, 0x8816 }, { 0xF3B7, 0x8813 }, { 0xF3B8, 0x87FE },
+	{ 0xF3B9, 0x880A }, { 0xF3BA, 0x881B }, { 0xF3BB, 0x8821 }, { 0xF3BC, 0x8839 }, { 0xF3BD, 0x883C }, { 0xF3BE, 0x7F36 }, { 0xF3BF, 0x7F42 }, { 0xF3C0, 0x7F44 },
+	{ 0xF3C1, 0x7F45 }, { 0xF3C2, 0x8210 }, { 0xF3C3, 0x7AFA }, { 0xF3C4, 0x7AFD }, { 0xF3C5, 0x7B08 }, { 0xF3C6, 0x7B03 }, { 0xF3C7, 0x7B04 }, { 0xF3C8, 0x7B15 },
+	{ 0xF3C9, 0x7B0A }, { 0xF3CA, 0x7B2B }, { 0xF3CB, 0x7B0F }, { 0xF3CC, 0x7B47 }, { 0xF3CD, 0x7B38 }, { 0xF3CE, 0x7B2A }, { 0xF3CF, 0x7B19 }, { 0xF3D0, 0x7B2E },
+	{ 0xF3D1, 0x7B31 }, { 0xF3D2, 0x7B20 }, { 0xF3D3, 0x7B25 }, { 0xF3D4, 0x7B24 }, { 0xF3D5, 0x7B33 }, { 0xF3D6, 0x7B3E }, { 0xF3D7, 0x7B1E }, { 0xF3D8, 0x7B58 },
+	{ 0xF3D9, 0x7B5A }, { 0xF3DA, 0x7B45 }, { 0xF3DB, 0x7B75 }, { 0xF3DC, 0x7B4C }, { 0xF3DD, 0x7B5D }, { 0xF3DE, 0x7B60 }, { 0xF3DF, 0x7B6E }, { 0xF3E0, 0x7B7B },
+	{ 0xF3E1, 0x7B62 }, { 0xF3E2, 0x7B72 }, { 0xF3E3, 0x7B71 }, { 0xF3E4, 0x7B90 }, { 0xF3E5, 0x7BA6 }, { 0xF3E6, 0x7BA7 }, { 0xF3E7, 0x7BB8 }, { 0xF3E8, 0x7BAC },
+	{ 0xF3E9, 0x7B9D }, { 0xF3EA, 0x7BA8 }, { 0xF3EB, 0x7B85 }, { 0xF3EC, 0x7BAA }, { 0xF3ED, 0x7B9C }, { 0xF3EE, 0x7BA2 }, { 0xF3EF, 0x7BAB }, { 0xF3F0, 0x7BB4 },
+	{ 0xF3F1, 0x7BD1 }, { 0xF3F2, 0x7BC1 }, { 0xF3F3, 0x7BCC }, { 0xF3F4, 0x7BDD }, { 0xF3F5, 0x7BDA }, { 0xF3F6, 0x7BE5 }, { 0xF3F7, 0x7BE6 }, { 0xF3F8, 0x7BEA },
+	{ 0xF3F9, 0x7C0C }, { 0xF3FA, 0x7BFE }, { 0xF3FB, 0x7BFC }, { 0xF3FC, 0x7C0F }, { 0xF3FD, 0x7C16 }, { 0xF3FE, 0x7C0B }, { 0xF4A1, 0x7C1F }, { 0xF4A2, 0x7C2A },
+	{ 0xF4A3, 0x7C26 }, { 0xF4A4, 0x7C38 }, { 0xF4A5, 0x7C41 }, { 0xF4A6, 0x7C40 }, { 0xF4A7, 0x81FE }, { 0xF4A8, 0x8201 }, { 0xF4A9, 0x8202 }, { 0xF4AA, 0x8204 },
+	{ 0xF4AB, 0x81EC }, { 0xF4AC, 0x8844 }, { 0xF4AD, 0x8221 }, { 0xF4AE, 0x8222 }, { 0xF4AF, 0x8223 }, { 0xF4B0, 0x822D }, { 0xF4B1, 0x822F }, { 0xF4B2, 0x8228 },
+	{ 0xF4B3, 0x822B }, { 0xF4B4, 0x8238 }, { 0xF4B5, 0x823B }, { 0xF4B6, 0x8233 }, { 0xF4B7, 0x8234 }, { 0xF4B8, 0x823E }, { 0xF4B9, 0x8244 }, { 0xF4BA, 0x8249 },
+	{ 0xF4BB, 0x824B }, { 0xF4BC, 0x824F }, { 0xF4BD, 0x825A }, { 0xF4BE, 0x825F }, { 0xF4BF, 0x8268 }, { 0xF4C0, 0x887E }, { 0xF4C1, 0x8885 }, { 0xF4C2, 0x8888 },
+	{ 0xF4C3, 0x88D8 }, { 0xF4C4, 0x88DF }, { 0xF4C5, 0x895E }, { 0xF4C6, 0x7F9D }, { 0xF4C7, 0x7F9F }, { 0xF4C8, 0x7FA7 }, { 0xF4C9, 0x7FAF }, { 0xF4CA, 0x7FB0 },
+	{ 0xF4CB, 0x7FB2 }, { 0xF4CC, 0x7C7C }, { 0xF4CD, 0x6549 }, { 0xF4CE, 0x7C91 }, { 0xF4CF, 0x7C9D }, { 0xF4D0, 0x7C9C }, { 0xF4D1, 0x7C9E }, { 0xF4D2, 0x7CA2 },
+	{ 0xF4D3, 0x7CB2 }, { 0xF4D4, 0x7CBC }, { 0xF4D5, 0x7CBD }, { 0xF4D6, 0x7CC1 }, { 0xF4D7, 0x7CC7 }, { 0xF4D8, 0x7CCC }, { 0xF4D9, 0x7CCD }, { 0xF4DA, 0x7CC8 },
+	{ 0xF4DB, 0x7CC5 }, { 0xF4DC, 0x7CD7 }, { 0xF4DD, 0x7CE8 }, { 0xF4DE, 0x826E }, { 0xF4DF, 0x66A8 }, { 0xF4E0, 0x7FBF }, { 0xF4E1, 0x7FCE }, { 0xF4E2, 0x7FD5 },
+	{ 0xF4E3, 0x7FE5 }, { 0xF4E4, 0x7FE1 }, { 0xF4E5, 0x7FE6 }, { 0xF4E6, 0x7FE9 }, { 0xF4E7, 0x7FEE }, { 0xF4E8, 0x7FF3 }, { 0xF4E9, 0x7CF8 }, { 0xF4EA, 0x7D77 },
+	{ 0xF4EB, 0x7DA6 }, { 0xF4EC, 0x7DAE }, { 0xF4ED, 0x7E47 }, { 0xF4EE, 0x7E9B }, { 0xF4EF, 0x9EB8 }, { 0xF4F0, 0x9EB4 }, { 0xF4F1, 0x8D73 }, { 0xF4F2, 0x8D84 },
+	{ 0xF4F3, 0x8D94 }, { 0xF4F4, 0x8D91 }, { 0xF4F5, 0x8DB1 }, { 0xF4F6, 0x8D67 }, { 0xF4F7, 0x8D6D }, { 0xF4F8, 0x8C47 }, { 0xF4F9, 0x8C49 }, { 0xF4FA, 0x914A },
+	{ 0xF4FB, 0x9150 }, { 0xF4FC, 0x914E }, { 0xF4FD, 0x914F }, { 0xF4FE, 0x9164 }, { 0xF5A1, 0x9162 }, { 0xF5A2, 0x9161 }, { 0xF5A3, 0x9170 }, { 0xF5A4, 0x9169 },
+	{ 0xF5A5, 0x916F }, { 0xF5A6, 0x917D }, { 0xF5A7, 0x917E }, { 0xF5A8, 0x9172 }, { 0xF5A9, 0x9174 }, { 0xF5AA, 0x9179 }, { 0xF5AB, 0x918C }, { 0xF5AC, 0x9185 },
+	{ 0xF5AD, 0x9190 }, { 0xF5AE, 0x918D }, { 0xF5AF, 0x9191 }, { 0xF5B0, 0x91A2 }, { 0xF5B1, 0x91A3 }, { 0xF5B2, 0x91AA }, { 0xF5B3, 0x91AD }, { 0xF5B4, 0x91AE },
+	{ 0xF5B5, 0x91AF }, { 0xF5B6, 0x91B5 }, { 0xF5B7, 0x91B4 }, { 0xF5B8, 0x91BA }, { 0xF5B9, 0x8C55 }, { 0xF5BA, 0x9E7E }, { 0xF5BB, 0x8DB8 }, { 0xF5BC, 0x8DEB },
+	{ 0xF5BD, 0x8E05 }, { 0xF5BE, 0x8E59 }, { 0xF5BF, 0x8E69 }, { 0xF5C0, 0x8DB5 }, { 0xF5C1, 0x8DBF }, { 0xF5C2, 0x8DBC }, { 0xF5C3, 0x8DBA }, { 0xF5C4, 0x8DC4 },
+	{ 0xF5C5, 0x8DD6 }, { 0xF5C6, 0x8DD7 }, { 0xF5C7, 0x8DDA }, { 0xF5C8, 0x8DDE }, { 0xF5C9, 0x8DCE }, { 0xF5CA, 0x8DCF }, { 0xF5CB, 0x8DDB }, { 0xF5CC, 0x8DC6 },
+	{ 0xF5CD, 0x8DEC }, { 0xF5CE, 0x8DF7 }, { 0xF5CF, 0x8DF8 }, { 0xF5D0, 0x8DE3 }, { 0xF5D1, 0x8DF9 }, { 0xF5D2, 0x8DFB }, { 0xF5D3, 0x8DE4 }, { 0xF5D4, 0x8E09 },
+	{ 0xF5D5, 0x8DFD }, { 0xF5D6, 0x8E14 }, { 0xF5D7, 0x8E1D }, { 0xF5D8, 0x8E1F }, { 0xF5D9, 0x8E2C }, { 0xF5DA, 0x8E2E }, { 0xF5DB, 0x8E23 }, { 0xF5DC, 0x8E2F },
+	{ 0xF5DD, 0x8E3A }, { 0xF5DE, 0x8E40 }, { 0xF5DF, 0x8E39 }, { 0xF5E0, 0x8E35 }, { 0xF5E1, 0x8E3D }, { 0xF5E2, 0x8E31 }, { 0xF5E3, 0x8E49 }, { 0xF5E4, 0x8E41 },
+	{ 0xF5E5, 0x8E42 }, { 0xF5E6, 0x8E51 }, { 0xF5E7, 0x8E52 }, { 0xF5E8, 0x8E4A }, { 0xF5E9, 0x8E70 }, { 0xF5EA, 0x8E76 }, { 0xF5EB, 0x8E7C }, { 0xF5EC, 0x8E6F },
+	{ 0xF5ED, 0x8E74 }, { 0xF5EE, 0x8E85 }, { 0xF5EF, 0x8E8F }, { 0xF5F0, 0x8E94 }, { 0xF5F1, 0x8E90 }, { 0xF5F2, 0x8E9C }, { 0xF5F3, 0x8E9E }, { 0xF5F4, 0x8C78 },
+	{ 0xF5F5, 0x8C82 }, { 0xF5F6, 0x8C8A }, { 0xF5F7, 0x8C85 }, { 0xF5F8, 0x8C98 }, { 0xF5F9, 0x8C94 }, { 0xF5FA, 0x659B }, { 0xF5FB, 0x89D6 }, { 0xF5FC, 0x89DE },
+	{ 0xF5FD, 0x89DA }, { 0xF5FE, 0x89DC }, { 0xF6A1, 0x89E5 }, { 0xF6A2, 0x89EB }, { 0xF6A3, 0x89EF }, { 0xF6A4, 0x8A3E }, { 0xF6A5, 0x8B26 }, { 0xF6A6, 0x9753 },
+	{ 0xF6A7, 0x96E9 }, { 0xF6A8, 0x96F3 }, { 0xF6A9, 0x96EF }, { 0xF6AA, 0x9706 }, { 0xF6AB, 0x9701 }, { 0xF6AC, 0x9708 }, { 0xF6AD, 0x970F }, { 0xF6AE, 0x970E },
+	{ 0xF6AF, 0x972A }, { 0xF6B0, 0x972D }, { 0xF6B1, 0x9730 }, { 0xF6B2, 0x973E }, { 0xF6B3, 0x9F80 }, { 0xF6B4, 0x9F83 }, { 0xF6B5, 0x9F85 }, { 0xF6B6, 0x9F86 },
+	{ 0xF6B7, 0x9F87 }, { 0xF6B8, 0x9F88 }, { 0xF6B9, 0x9F89 }, { 0xF6BA, 0x9F8A }, { 0xF6BB, 0x9F8C }, { 0xF6BC, 0x9EFE }, { 0xF6BD, 0x9F0B }, { 0xF6BE, 0x9F0D },
+	{ 0xF6BF, 0x96B9 }, { 0xF6C0, 0x96BC }, { 0xF6C1, 0x96BD }, { 0xF6C2, 0x96CE }, { 0xF6C3, 0x96D2 }, { 0xF6C4, 0x77BF }, { 0xF6C5, 0x96E0 }, { 0xF6C6, 0x928E },
+	{ 0xF6C7, 0x92AE }, { 0xF6C8, 0x92C8 }, { 0xF6C9, 0x933E }, { 0xF6CA, 0x936A }, { 0xF6CB, 0x93CA }, { 0xF6CC, 0x938F }, { 0xF6CD, 0x943E }, { 0xF6CE, 0x946B },
+	{ 0xF6CF, 0x9C7F }, { 0xF6D0, 0x9C82 }, { 0xF6D1, 0x9C85 }, { 0xF6D2, 0x9C86 }, { 0xF6D3, 0x9C87 }, { 0xF6D4, 0x9C88 }, { 0xF6D5, 0x7A23 }, { 0xF6D6, 0x9C8B },
+	{ 0xF6D7, 0x9C8E }, { 0xF6D8, 0x9C90 }, { 0xF6D9, 0x9C91 }, { 0xF6DA, 0x9C92 }, { 0xF6DB, 0x9C94 }, { 0xF6DC, 0x9C95 }, { 0xF6DD, 0x9C9A }, { 0xF6DE, 0x9C9B },
+	{ 0xF6DF, 0x9C9E }, { 0xF6E0, 0x9C9F }, { 0xF6E1, 0x9CA0 }, { 0xF6E2, 0x9CA1 }, { 0xF6E3, 0x9CA2 }, { 0xF6E4, 0x9CA3 }, { 0xF6E5, 0x9CA5 }, { 0xF6E6, 0x9CA6 },
+	{ 0xF6E7, 0x9CA7 }, { 0xF6E8, 0x9CA8 }, { 0xF6E9, 0x9CA9 }, { 0xF6EA, 0x9CAB }, { 0xF6EB, 0x9CAD }, { 0xF6EC, 0x9CAE }, { 0xF6ED, 0x9CB0 }, { 0xF6EE, 0x9CB1 },
+	{ 0xF6EF, 0x9CB2 }, { 0xF6F0, 0x9CB3 }, { 0xF6F1, 0x9CB4 }, { 0xF6F2, 0x9CB5 }, { 0xF6F3, 0x9CB6 }, { 0xF6F4, 0x9CB7 }, { 0xF6F5, 0x9CBA }, { 0xF6F6, 0x9CBB },
+	{ 0xF6F7, 0x9CBC }, { 0xF6F8, 0x9CBD }, { 0xF6F9, 0x9CC4 }, { 0xF6FA, 0x9CC5 }, { 0xF6FB, 0x9CC6 }, { 0xF6FC, 0x9CC7 }, { 0xF6FD, 0x9CCA }, { 0xF6FE, 0x9CCB },
+	{ 0xF7A1, 0x9CCC }, { 0xF7A2, 0x9CCD }, { 0xF7A3, 0x9CCE }, { 0xF7A4, 0x9CCF }, { 0xF7A5, 0x9CD0 }, { 0xF7A6, 0x9CD3 }, { 0xF7A7, 0x9CD4 }, { 0xF7A8, 0x9CD5 },
+	{ 0xF7A9, 0x9CD7 }, { 0xF7AA, 0x9CD8 }, { 0xF7AB, 0x9CD9 }, { 0xF7AC, 0x9CDC }, { 0xF7AD, 0x9CDD }, { 0xF7AE, 0x9CDF }, { 0xF7AF, 0x9CE2 }, { 0xF7B0, 0x977C },
+	{ 0xF7B1, 0x9785 }, { 0xF7B2, 0x9791 }, { 0xF7B3, 0x9792 }, { 0xF7B4, 0x9794 }, { 0xF7B5, 0x97AF }, { 0xF7B6, 0x97AB }, { 0xF7B7, 0x97A3 }, { 0xF7B8, 0x97B2 },
+	{ 0xF7B9, 0x97B4 }, { 0xF7BA, 0x9AB1 }, { 0xF7BB, 0x9AB0 }, { 0xF7BC, 0x9AB7 }, { 0xF7BD, 0x9E58 }, { 0xF7BE, 0x9AB6 }, { 0xF7BF, 0x9ABA }, { 0xF7C0, 0x9ABC },
+	{ 0xF7C1, 0x9AC1 }, { 0xF7C2, 0x9AC0 }, { 0xF7C3, 0x9AC5 }, { 0xF7C4, 0x9AC2 }, { 0xF7C5, 0x9ACB }, { 0xF7C6, 0x9ACC }, { 0xF7C7, 0x9AD1 }, { 0xF7C8, 0x9B45 },
+	{ 0xF7C9, 0x9B43 }, { 0xF7CA, 0x9B47 }, { 0xF7CB, 0x9B49 }, { 0xF7CC, 0x9B48 }, { 0xF7CD, 0x9B4D }, { 0xF7CE, 0x9B51 }, { 0xF7CF, 0x98E8 }, { 0xF7D0, 0x990D },
+	{ 0xF7D1, 0x992E }, { 0xF7D2, 0x9955 }, { 0xF7D3, 0x9954 }, { 0xF7D4, 0x9ADF }, { 0xF7D5, 0x9AE1 }, { 0xF7D6, 0x9AE6 }, { 0xF7D7, 0x9AEF }, { 0xF7D8, 0x9AEB },
+	{ 0xF7D9, 0x9AFB }, { 0xF7DA, 0x9AED }, { 0xF7DB, 0x9AF9 }, { 0xF7DC, 0x9B08 }, { 0xF7DD, 0x9B0F }, { 0xF7DE, 0x9B13 }, { 0xF7DF, 0x9B1F }, { 0xF7E0, 0x9B23 },
+	{ 0xF7E1, 0x9EBD }, { 0xF7E2, 0x9EBE }, { 0xF7E3, 0x7E3B }, { 0xF7E4, 0x9E82 }, { 0xF7E5, 0x9E87 }, { 0xF7E6, 0x9E88 }, { 0xF7E7, 0x9E8B }, { 0xF7E8, 0x9E92 },
+	{ 0xF7E9, 0x93D6 }, { 0xF7EA, 0x9E9D }, { 0xF7EB, 0x9E9F }, { 0xF7EC, 0x9EDB }, { 0xF7ED, 0x9EDC }, { 0xF7EE, 0x9EDD }, { 0xF7EF, 0x9EE0 }, { 0xF7F0, 0x9EDF },
+	{ 0xF7F1, 0x9EE2 }, { 0xF7F2, 0x9EE9 }, { 0xF7F3, 0x9EE7 }, { 0xF7F4, 0x9EE5 }, { 0xF7F5, 0x9EEA }, { 0xF7F6, 0x9EEF }, { 0xF7F7, 0x9F22 }, { 0xF7F8, 0x9F2C },
+	{ 0xF7F9, 0x9F2F }, { 0xF7FA, 0x9F39 }, { 0xF7FB, 0x9F37 }, { 0xF7FC, 0x9F3D }, { 0xF7FD, 0x9F3E }, { 0xF7FE, 0x9F44 },
 };
 
 
 const DoubleByteEncoding::Mapping MacChineseSimpEncoding::_reverseMappingTable[] = {
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x0083, 0x0083 }, 
-	{ 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, { 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, 
-	{ 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, { 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, 
-	{ 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, { 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, 
-	{ 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, { 0x00A0, 0x00A0 }, { 0x00A2, 0xA1E9 }, { 0x00A3, 0xA1EA }, { 0x00A4, 0xA1E8 }, 
-	{ 0x00A5, 0xA3A4 }, { 0x00A7, 0xA1EC }, { 0x00A8, 0xA1A7 }, { 0x00A9, 0x00FD }, { 0x00B0, 0xA1E3 }, { 0x00B1, 0xA1C0 }, { 0x00B7, 0xA1A4 }, { 0x00D7, 0xA1C1 }, 
-	{ 0x00E0, 0xA8A4 }, { 0x00E1, 0xA8A2 }, { 0x00E8, 0xA8A8 }, { 0x00E9, 0xA8A6 }, { 0x00EA, 0xA8BA }, { 0x00EC, 0xA8AC }, { 0x00ED, 0xA8AA }, { 0x00F2, 0xA8B0 }, 
-	{ 0x00F3, 0xA8AE }, { 0x00F7, 0xA1C2 }, { 0x00F9, 0xA8B4 }, { 0x00FA, 0xA8B2 }, { 0x00FC, 0xA8B9 }, { 0x0101, 0xA8A1 }, { 0x0113, 0xA8A5 }, { 0x011B, 0xA8A7 }, 
-	{ 0x012B, 0xA8A9 }, { 0x0144, 0xA8BD }, { 0x0148, 0xA8BE }, { 0x014D, 0xA8AD }, { 0x016B, 0xA8B1 }, { 0x01CE, 0xA8A3 }, { 0x01D0, 0xA8AB }, { 0x01D2, 0xA8AF }, 
-	{ 0x01D4, 0xA8B3 }, { 0x01D6, 0xA8B5 }, { 0x01D8, 0xA8B6 }, { 0x01DA, 0xA8B7 }, { 0x01DC, 0xA8B8 }, { 0x01F9, 0xA8BF }, { 0x0251, 0xA8BB }, { 0x0261, 0xA8C0 }, 
-	{ 0x02C7, 0xA1A6 }, { 0x02C9, 0xA1A5 }, { 0x0391, 0xA6A1 }, { 0x0392, 0xA6A2 }, { 0x0393, 0xA6A3 }, { 0x0394, 0xA6A4 }, { 0x0395, 0xA6A5 }, { 0x0396, 0xA6A6 }, 
-	{ 0x0397, 0xA6A7 }, { 0x0398, 0xA6A8 }, { 0x0399, 0xA6A9 }, { 0x039A, 0xA6AA }, { 0x039B, 0xA6AB }, { 0x039C, 0xA6AC }, { 0x039D, 0xA6AD }, { 0x039E, 0xA6AE }, 
-	{ 0x039F, 0xA6AF }, { 0x03A0, 0xA6B0 }, { 0x03A1, 0xA6B1 }, { 0x03A3, 0xA6B2 }, { 0x03A4, 0xA6B3 }, { 0x03A5, 0xA6B4 }, { 0x03A6, 0xA6B5 }, { 0x03A7, 0xA6B6 }, 
-	{ 0x03A8, 0xA6B7 }, { 0x03A9, 0xA6B8 }, { 0x03B1, 0xA6C1 }, { 0x03B2, 0xA6C2 }, { 0x03B3, 0xA6C3 }, { 0x03B4, 0xA6C4 }, { 0x03B5, 0xA6C5 }, { 0x03B6, 0xA6C6 }, 
-	{ 0x03B7, 0xA6C7 }, { 0x03B8, 0xA6C8 }, { 0x03B9, 0xA6C9 }, { 0x03BA, 0xA6CA }, { 0x03BB, 0xA6CB }, { 0x03BC, 0xA6CC }, { 0x03BD, 0xA6CD }, { 0x03BE, 0xA6CE }, 
-	{ 0x03BF, 0xA6CF }, { 0x03C0, 0xA6D0 }, { 0x03C1, 0xA6D1 }, { 0x03C3, 0xA6D2 }, { 0x03C4, 0xA6D3 }, { 0x03C5, 0xA6D4 }, { 0x03C6, 0xA6D5 }, { 0x03C7, 0xA6D6 }, 
-	{ 0x03C8, 0xA6D7 }, { 0x03C9, 0xA6D8 }, { 0x0401, 0xA7A7 }, { 0x0410, 0xA7A1 }, { 0x0411, 0xA7A2 }, { 0x0412, 0xA7A3 }, { 0x0413, 0xA7A4 }, { 0x0414, 0xA7A5 }, 
-	{ 0x0415, 0xA7A6 }, { 0x0416, 0xA7A8 }, { 0x0417, 0xA7A9 }, { 0x0418, 0xA7AA }, { 0x0419, 0xA7AB }, { 0x041A, 0xA7AC }, { 0x041B, 0xA7AD }, { 0x041C, 0xA7AE }, 
-	{ 0x041D, 0xA7AF }, { 0x041E, 0xA7B0 }, { 0x041F, 0xA7B1 }, { 0x0420, 0xA7B2 }, { 0x0421, 0xA7B3 }, { 0x0422, 0xA7B4 }, { 0x0423, 0xA7B5 }, { 0x0424, 0xA7B6 }, 
-	{ 0x0425, 0xA7B7 }, { 0x0426, 0xA7B8 }, { 0x0427, 0xA7B9 }, { 0x0428, 0xA7BA }, { 0x0429, 0xA7BB }, { 0x042A, 0xA7BC }, { 0x042B, 0xA7BD }, { 0x042C, 0xA7BE }, 
-	{ 0x042D, 0xA7BF }, { 0x042E, 0xA7C0 }, { 0x042F, 0xA7C1 }, { 0x0430, 0xA7D1 }, { 0x0431, 0xA7D2 }, { 0x0432, 0xA7D3 }, { 0x0433, 0xA7D4 }, { 0x0434, 0xA7D5 }, 
-	{ 0x0435, 0xA7D6 }, { 0x0436, 0xA7D8 }, { 0x0437, 0xA7D9 }, { 0x0438, 0xA7DA }, { 0x0439, 0xA7DB }, { 0x043A, 0xA7DC }, { 0x043B, 0xA7DD }, { 0x043C, 0xA7DE }, 
-	{ 0x043D, 0xA7DF }, { 0x043E, 0xA7E0 }, { 0x043F, 0xA7E1 }, { 0x0440, 0xA7E2 }, { 0x0441, 0xA7E3 }, { 0x0442, 0xA7E4 }, { 0x0443, 0xA7E5 }, { 0x0444, 0xA7E6 }, 
-	{ 0x0445, 0xA7E7 }, { 0x0446, 0xA7E8 }, { 0x0447, 0xA7E9 }, { 0x0448, 0xA7EA }, { 0x0449, 0xA7EB }, { 0x044A, 0xA7EC }, { 0x044B, 0xA7ED }, { 0x044C, 0xA7EE }, 
-	{ 0x044D, 0xA7EF }, { 0x044E, 0xA7F0 }, { 0x044F, 0xA7F1 }, { 0x0451, 0xA7D7 }, { 0x1E3F, 0xA8BC }, { 0x2014, 0xA1AA }, { 0x2016, 0xA1AC }, { 0x2018, 0xA1AE }, 
-	{ 0x2019, 0xA1AF }, { 0x201C, 0xA1B0 }, { 0x201D, 0xA1B1 }, { 0x2026, 0x00FF }, { 0x2030, 0xA1EB }, { 0x2032, 0xA1E4 }, { 0x2033, 0xA1E5 }, { 0x203B, 0xA1F9 }, 
-	{ 0x203E, 0xA3FE }, { 0x2103, 0xA1E6 }, { 0x2116, 0xA1ED }, { 0x2122, 0x00FE }, { 0x2160, 0xA2F1 }, { 0x2161, 0xA2F2 }, { 0x2162, 0xA2F3 }, { 0x2163, 0xA2F4 }, 
-	{ 0x2164, 0xA2F5 }, { 0x2165, 0xA2F6 }, { 0x2166, 0xA2F7 }, { 0x2167, 0xA2F8 }, { 0x2168, 0xA2F9 }, { 0x2169, 0xA2FA }, { 0x216A, 0xA2FB }, { 0x216B, 0xA2FC }, 
-	{ 0x2190, 0xA1FB }, { 0x2191, 0xA1FC }, { 0x2192, 0xA1FA }, { 0x2193, 0xA1FD }, { 0x2208, 0xA1CA }, { 0x220F, 0xA1C7 }, { 0x2211, 0xA1C6 }, { 0x221A, 0xA1CC }, 
-	{ 0x221D, 0xA1D8 }, { 0x221E, 0xA1DE }, { 0x2220, 0xA1CF }, { 0x2225, 0xA1CE }, { 0x2227, 0xA1C4 }, { 0x2228, 0xA1C5 }, { 0x2229, 0xA1C9 }, { 0x222A, 0xA1C8 }, 
-	{ 0x222B, 0xA1D2 }, { 0x222E, 0xA1D3 }, { 0x2234, 0xA1E0 }, { 0x2235, 0xA1DF }, { 0x2236, 0xA1C3 }, { 0x2237, 0xA1CB }, { 0x223D, 0xA1D7 }, { 0x2248, 0xA1D6 }, 
-	{ 0x224C, 0xA1D5 }, { 0x2260, 0xA1D9 }, { 0x2261, 0xA1D4 }, { 0x2264, 0xA1DC }, { 0x2265, 0xA1DD }, { 0x226E, 0xA1DA }, { 0x226F, 0xA1DB }, { 0x2299, 0xA1D1 }, 
-	{ 0x22A5, 0xA1CD }, { 0x22EF, 0xA1AD }, { 0x2312, 0xA1D0 }, { 0x2460, 0xA2D9 }, { 0x2461, 0xA2DA }, { 0x2462, 0xA2DB }, { 0x2463, 0xA2DC }, { 0x2464, 0xA2DD }, 
-	{ 0x2465, 0xA2DE }, { 0x2466, 0xA2DF }, { 0x2467, 0xA2E0 }, { 0x2468, 0xA2E1 }, { 0x2469, 0xA2E2 }, { 0x2474, 0xA2C5 }, { 0x2475, 0xA2C6 }, { 0x2476, 0xA2C7 }, 
-	{ 0x2477, 0xA2C8 }, { 0x2478, 0xA2C9 }, { 0x2479, 0xA2CA }, { 0x247A, 0xA2CB }, { 0x247B, 0xA2CC }, { 0x247C, 0xA2CD }, { 0x247D, 0xA2CE }, { 0x247E, 0xA2CF }, 
-	{ 0x247F, 0xA2D0 }, { 0x2480, 0xA2D1 }, { 0x2481, 0xA2D2 }, { 0x2482, 0xA2D3 }, { 0x2483, 0xA2D4 }, { 0x2484, 0xA2D5 }, { 0x2485, 0xA2D6 }, { 0x2486, 0xA2D7 }, 
-	{ 0x2487, 0xA2D8 }, { 0x2488, 0xA2B1 }, { 0x2489, 0xA2B2 }, { 0x248A, 0xA2B3 }, { 0x248B, 0xA2B4 }, { 0x248C, 0xA2B5 }, { 0x248D, 0xA2B6 }, { 0x248E, 0xA2B7 }, 
-	{ 0x248F, 0xA2B8 }, { 0x2490, 0xA2B9 }, { 0x2491, 0xA2BA }, { 0x2492, 0xA2BB }, { 0x2493, 0xA2BC }, { 0x2494, 0xA2BD }, { 0x2495, 0xA2BE }, { 0x2496, 0xA2BF }, 
-	{ 0x2497, 0xA2C0 }, { 0x2498, 0xA2C1 }, { 0x2499, 0xA2C2 }, { 0x249A, 0xA2C3 }, { 0x249B, 0xA2C4 }, { 0x2500, 0xA9A4 }, { 0x2501, 0xA9A5 }, { 0x2502, 0xA9A6 }, 
-	{ 0x2503, 0xA9A7 }, { 0x2504, 0xA9A8 }, { 0x2505, 0xA9A9 }, { 0x2506, 0xA9AA }, { 0x2507, 0xA9AB }, { 0x2508, 0xA9AC }, { 0x2509, 0xA9AD }, { 0x250A, 0xA9AE }, 
-	{ 0x250B, 0xA9AF }, { 0x250C, 0xA9B0 }, { 0x250D, 0xA9B1 }, { 0x250E, 0xA9B2 }, { 0x250F, 0xA9B3 }, { 0x2510, 0xA9B4 }, { 0x2511, 0xA9B5 }, { 0x2512, 0xA9B6 }, 
-	{ 0x2513, 0xA9B7 }, { 0x2514, 0xA9B8 }, { 0x2515, 0xA9B9 }, { 0x2516, 0xA9BA }, { 0x2517, 0xA9BB }, { 0x2518, 0xA9BC }, { 0x2519, 0xA9BD }, { 0x251A, 0xA9BE }, 
-	{ 0x251B, 0xA9BF }, { 0x251C, 0xA9C0 }, { 0x251D, 0xA9C1 }, { 0x251E, 0xA9C2 }, { 0x251F, 0xA9C3 }, { 0x2520, 0xA9C4 }, { 0x2521, 0xA9C5 }, { 0x2522, 0xA9C6 }, 
-	{ 0x2523, 0xA9C7 }, { 0x2524, 0xA9C8 }, { 0x2525, 0xA9C9 }, { 0x2526, 0xA9CA }, { 0x2527, 0xA9CB }, { 0x2528, 0xA9CC }, { 0x2529, 0xA9CD }, { 0x252A, 0xA9CE }, 
-	{ 0x252B, 0xA9CF }, { 0x252C, 0xA9D0 }, { 0x252D, 0xA9D1 }, { 0x252E, 0xA9D2 }, { 0x252F, 0xA9D3 }, { 0x2530, 0xA9D4 }, { 0x2531, 0xA9D5 }, { 0x2532, 0xA9D6 }, 
-	{ 0x2533, 0xA9D7 }, { 0x2534, 0xA9D8 }, { 0x2535, 0xA9D9 }, { 0x2536, 0xA9DA }, { 0x2537, 0xA9DB }, { 0x2538, 0xA9DC }, { 0x2539, 0xA9DD }, { 0x253A, 0xA9DE }, 
-	{ 0x253B, 0xA9DF }, { 0x253C, 0xA9E0 }, { 0x253D, 0xA9E1 }, { 0x253E, 0xA9E2 }, { 0x253F, 0xA9E3 }, { 0x2540, 0xA9E4 }, { 0x2541, 0xA9E5 }, { 0x2542, 0xA9E6 }, 
-	{ 0x2543, 0xA9E7 }, { 0x2544, 0xA9E8 }, { 0x2545, 0xA9E9 }, { 0x2546, 0xA9EA }, { 0x2547, 0xA9EB }, { 0x2548, 0xA9EC }, { 0x2549, 0xA9ED }, { 0x254A, 0xA9EE }, 
-	{ 0x254B, 0xA9EF }, { 0x25A0, 0xA1F6 }, { 0x25A1, 0xA1F5 }, { 0x25B2, 0xA1F8 }, { 0x25B3, 0xA1F7 }, { 0x25C6, 0xA1F4 }, { 0x25C7, 0xA1F3 }, { 0x25CB, 0xA1F0 }, 
-	{ 0x25CE, 0xA1F2 }, { 0x25CF, 0xA1F1 }, { 0x2605, 0xA1EF }, { 0x2606, 0xA1EE }, { 0x2640, 0xA1E2 }, { 0x2642, 0xA1E1 }, { 0x3000, 0xA1A1 }, { 0x3001, 0xA1A2 }, 
-	{ 0x3002, 0xA1A3 }, { 0x3003, 0xA1A8 }, { 0x3005, 0xA1A9 }, { 0x3008, 0xA1B4 }, { 0x3009, 0xA1B5 }, { 0x300A, 0xA1B6 }, { 0x300B, 0xA1B7 }, { 0x300C, 0xA1B8 }, 
-	{ 0x300D, 0xA1B9 }, { 0x300E, 0xA1BA }, { 0x300F, 0xA1BB }, { 0x3010, 0xA1BE }, { 0x3011, 0xA1BF }, { 0x3013, 0xA1FE }, { 0x3014, 0xA1B2 }, { 0x3015, 0xA1B3 }, 
-	{ 0x3016, 0xA1BC }, { 0x3017, 0xA1BD }, { 0x301C, 0xA1AB }, { 0x3041, 0xA4A1 }, { 0x3042, 0xA4A2 }, { 0x3043, 0xA4A3 }, { 0x3044, 0xA4A4 }, { 0x3045, 0xA4A5 }, 
-	{ 0x3046, 0xA4A6 }, { 0x3047, 0xA4A7 }, { 0x3048, 0xA4A8 }, { 0x3049, 0xA4A9 }, { 0x304A, 0xA4AA }, { 0x304B, 0xA4AB }, { 0x304C, 0xA4AC }, { 0x304D, 0xA4AD }, 
-	{ 0x304E, 0xA4AE }, { 0x304F, 0xA4AF }, { 0x3050, 0xA4B0 }, { 0x3051, 0xA4B1 }, { 0x3052, 0xA4B2 }, { 0x3053, 0xA4B3 }, { 0x3054, 0xA4B4 }, { 0x3055, 0xA4B5 }, 
-	{ 0x3056, 0xA4B6 }, { 0x3057, 0xA4B7 }, { 0x3058, 0xA4B8 }, { 0x3059, 0xA4B9 }, { 0x305A, 0xA4BA }, { 0x305B, 0xA4BB }, { 0x305C, 0xA4BC }, { 0x305D, 0xA4BD }, 
-	{ 0x305E, 0xA4BE }, { 0x305F, 0xA4BF }, { 0x3060, 0xA4C0 }, { 0x3061, 0xA4C1 }, { 0x3062, 0xA4C2 }, { 0x3063, 0xA4C3 }, { 0x3064, 0xA4C4 }, { 0x3065, 0xA4C5 }, 
-	{ 0x3066, 0xA4C6 }, { 0x3067, 0xA4C7 }, { 0x3068, 0xA4C8 }, { 0x3069, 0xA4C9 }, { 0x306A, 0xA4CA }, { 0x306B, 0xA4CB }, { 0x306C, 0xA4CC }, { 0x306D, 0xA4CD }, 
-	{ 0x306E, 0xA4CE }, { 0x306F, 0xA4CF }, { 0x3070, 0xA4D0 }, { 0x3071, 0xA4D1 }, { 0x3072, 0xA4D2 }, { 0x3073, 0xA4D3 }, { 0x3074, 0xA4D4 }, { 0x3075, 0xA4D5 }, 
-	{ 0x3076, 0xA4D6 }, { 0x3077, 0xA4D7 }, { 0x3078, 0xA4D8 }, { 0x3079, 0xA4D9 }, { 0x307A, 0xA4DA }, { 0x307B, 0xA4DB }, { 0x307C, 0xA4DC }, { 0x307D, 0xA4DD }, 
-	{ 0x307E, 0xA4DE }, { 0x307F, 0xA4DF }, { 0x3080, 0xA4E0 }, { 0x3081, 0xA4E1 }, { 0x3082, 0xA4E2 }, { 0x3083, 0xA4E3 }, { 0x3084, 0xA4E4 }, { 0x3085, 0xA4E5 }, 
-	{ 0x3086, 0xA4E6 }, { 0x3087, 0xA4E7 }, { 0x3088, 0xA4E8 }, { 0x3089, 0xA4E9 }, { 0x308A, 0xA4EA }, { 0x308B, 0xA4EB }, { 0x308C, 0xA4EC }, { 0x308D, 0xA4ED }, 
-	{ 0x308E, 0xA4EE }, { 0x308F, 0xA4EF }, { 0x3090, 0xA4F0 }, { 0x3091, 0xA4F1 }, { 0x3092, 0xA4F2 }, { 0x3093, 0xA4F3 }, { 0x30A1, 0xA5A1 }, { 0x30A2, 0xA5A2 }, 
-	{ 0x30A3, 0xA5A3 }, { 0x30A4, 0xA5A4 }, { 0x30A5, 0xA5A5 }, { 0x30A6, 0xA5A6 }, { 0x30A7, 0xA5A7 }, { 0x30A8, 0xA5A8 }, { 0x30A9, 0xA5A9 }, { 0x30AA, 0xA5AA }, 
-	{ 0x30AB, 0xA5AB }, { 0x30AC, 0xA5AC }, { 0x30AD, 0xA5AD }, { 0x30AE, 0xA5AE }, { 0x30AF, 0xA5AF }, { 0x30B0, 0xA5B0 }, { 0x30B1, 0xA5B1 }, { 0x30B2, 0xA5B2 }, 
-	{ 0x30B3, 0xA5B3 }, { 0x30B4, 0xA5B4 }, { 0x30B5, 0xA5B5 }, { 0x30B6, 0xA5B6 }, { 0x30B7, 0xA5B7 }, { 0x30B8, 0xA5B8 }, { 0x30B9, 0xA5B9 }, { 0x30BA, 0xA5BA }, 
-	{ 0x30BB, 0xA5BB }, { 0x30BC, 0xA5BC }, { 0x30BD, 0xA5BD }, { 0x30BE, 0xA5BE }, { 0x30BF, 0xA5BF }, { 0x30C0, 0xA5C0 }, { 0x30C1, 0xA5C1 }, { 0x30C2, 0xA5C2 }, 
-	{ 0x30C3, 0xA5C3 }, { 0x30C4, 0xA5C4 }, { 0x30C5, 0xA5C5 }, { 0x30C6, 0xA5C6 }, { 0x30C7, 0xA5C7 }, { 0x30C8, 0xA5C8 }, { 0x30C9, 0xA5C9 }, { 0x30CA, 0xA5CA }, 
-	{ 0x30CB, 0xA5CB }, { 0x30CC, 0xA5CC }, { 0x30CD, 0xA5CD }, { 0x30CE, 0xA5CE }, { 0x30CF, 0xA5CF }, { 0x30D0, 0xA5D0 }, { 0x30D1, 0xA5D1 }, { 0x30D2, 0xA5D2 }, 
-	{ 0x30D3, 0xA5D3 }, { 0x30D4, 0xA5D4 }, { 0x30D5, 0xA5D5 }, { 0x30D6, 0xA5D6 }, { 0x30D7, 0xA5D7 }, { 0x30D8, 0xA5D8 }, { 0x30D9, 0xA5D9 }, { 0x30DA, 0xA5DA }, 
-	{ 0x30DB, 0xA5DB }, { 0x30DC, 0xA5DC }, { 0x30DD, 0xA5DD }, { 0x30DE, 0xA5DE }, { 0x30DF, 0xA5DF }, { 0x30E0, 0xA5E0 }, { 0x30E1, 0xA5E1 }, { 0x30E2, 0xA5E2 }, 
-	{ 0x30E3, 0xA5E3 }, { 0x30E4, 0xA5E4 }, { 0x30E5, 0xA5E5 }, { 0x30E6, 0xA5E6 }, { 0x30E7, 0xA5E7 }, { 0x30E8, 0xA5E8 }, { 0x30E9, 0xA5E9 }, { 0x30EA, 0xA5EA }, 
-	{ 0x30EB, 0xA5EB }, { 0x30EC, 0xA5EC }, { 0x30ED, 0xA5ED }, { 0x30EE, 0xA5EE }, { 0x30EF, 0xA5EF }, { 0x30F0, 0xA5F0 }, { 0x30F1, 0xA5F1 }, { 0x30F2, 0xA5F2 }, 
-	{ 0x30F3, 0xA5F3 }, { 0x30F4, 0xA5F4 }, { 0x30F5, 0xA5F5 }, { 0x30F6, 0xA5F6 }, { 0x3105, 0xA8C5 }, { 0x3106, 0xA8C6 }, { 0x3107, 0xA8C7 }, { 0x3108, 0xA8C8 }, 
-	{ 0x3109, 0xA8C9 }, { 0x310A, 0xA8CA }, { 0x310B, 0xA8CB }, { 0x310C, 0xA8CC }, { 0x310D, 0xA8CD }, { 0x310E, 0xA8CE }, { 0x310F, 0xA8CF }, { 0x3110, 0xA8D0 }, 
-	{ 0x3111, 0xA8D1 }, { 0x3112, 0xA8D2 }, { 0x3113, 0xA8D3 }, { 0x3114, 0xA8D4 }, { 0x3115, 0xA8D5 }, { 0x3116, 0xA8D6 }, { 0x3117, 0xA8D7 }, { 0x3118, 0xA8D8 }, 
-	{ 0x3119, 0xA8D9 }, { 0x311A, 0xA8DA }, { 0x311B, 0xA8DB }, { 0x311C, 0xA8DC }, { 0x311D, 0xA8DD }, { 0x311E, 0xA8DE }, { 0x311F, 0xA8DF }, { 0x3120, 0xA8E0 }, 
-	{ 0x3121, 0xA8E1 }, { 0x3122, 0xA8E2 }, { 0x3123, 0xA8E3 }, { 0x3124, 0xA8E4 }, { 0x3125, 0xA8E5 }, { 0x3126, 0xA8E6 }, { 0x3127, 0xA8E7 }, { 0x3128, 0xA8E8 }, 
-	{ 0x3129, 0xA8E9 }, { 0x3220, 0xA2E5 }, { 0x3221, 0xA2E6 }, { 0x3222, 0xA2E7 }, { 0x3223, 0xA2E8 }, { 0x3224, 0xA2E9 }, { 0x3225, 0xA2EA }, { 0x3226, 0xA2EB }, 
-	{ 0x3227, 0xA2EC }, { 0x3228, 0xA2ED }, { 0x3229, 0xA2EE }, { 0x4E00, 0xD2BB }, { 0x4E01, 0xB6A1 }, { 0x4E03, 0xC6DF }, { 0x4E07, 0xCDF2 }, { 0x4E08, 0xD5C9 }, 
-	{ 0x4E09, 0xC8FD }, { 0x4E0A, 0xC9CF }, { 0x4E0B, 0xCFC2 }, { 0x4E0C, 0xD8A2 }, { 0x4E0D, 0xB2BB }, { 0x4E0E, 0xD3EB }, { 0x4E10, 0xD8A4 }, { 0x4E11, 0xB3F3 }, 
-	{ 0x4E13, 0xD7A8 }, { 0x4E14, 0xC7D2 }, { 0x4E15, 0xD8A7 }, { 0x4E16, 0xCAC0 }, { 0x4E18, 0xC7F0 }, { 0x4E19, 0xB1FB }, { 0x4E1A, 0xD2B5 }, { 0x4E1B, 0xB4D4 }, 
-	{ 0x4E1C, 0xB6AB }, { 0x4E1D, 0xCBBF }, { 0x4E1E, 0xD8A9 }, { 0x4E22, 0xB6AA }, { 0x4E24, 0xC1BD }, { 0x4E25, 0xD1CF }, { 0x4E27, 0xC9A5 }, { 0x4E28, 0xD8AD }, 
-	{ 0x4E2A, 0xB8F6 }, { 0x4E2B, 0xD1BE }, { 0x4E2C, 0xE3DC }, { 0x4E2D, 0xD6D0 }, { 0x4E30, 0xB7E1 }, { 0x4E32, 0xB4AE }, { 0x4E34, 0xC1D9 }, { 0x4E36, 0xD8BC }, 
-	{ 0x4E38, 0xCDE8 }, { 0x4E39, 0xB5A4 }, { 0x4E3A, 0xCEAA }, { 0x4E3B, 0xD6F7 }, { 0x4E3D, 0xC0F6 }, { 0x4E3E, 0xBED9 }, { 0x4E3F, 0xD8AF }, { 0x4E43, 0xC4CB }, 
-	{ 0x4E45, 0xBEC3 }, { 0x4E47, 0xD8B1 }, { 0x4E48, 0xC3B4 }, { 0x4E49, 0xD2E5 }, { 0x4E4B, 0xD6AE }, { 0x4E4C, 0xCEDA }, { 0x4E4D, 0xD5A7 }, { 0x4E4E, 0xBAF5 }, 
-	{ 0x4E4F, 0xB7A6 }, { 0x4E50, 0xC0D6 }, { 0x4E52, 0xC6B9 }, { 0x4E53, 0xC5D2 }, { 0x4E54, 0xC7C7 }, { 0x4E56, 0xB9D4 }, { 0x4E58, 0xB3CB }, { 0x4E59, 0xD2D2 }, 
-	{ 0x4E5C, 0xD8BF }, { 0x4E5D, 0xBEC5 }, { 0x4E5E, 0xC6F2 }, { 0x4E5F, 0xD2B2 }, { 0x4E60, 0xCFB0 }, { 0x4E61, 0xCFE7 }, { 0x4E66, 0xCAE9 }, { 0x4E69, 0xD8C0 }, 
-	{ 0x4E70, 0xC2F2 }, { 0x4E71, 0xC2D2 }, { 0x4E73, 0xC8E9 }, { 0x4E7E, 0xC7AC }, { 0x4E86, 0xC1CB }, { 0x4E88, 0xD3E8 }, { 0x4E89, 0xD5F9 }, { 0x4E8B, 0xCAC2 }, 
-	{ 0x4E8C, 0xB6FE }, { 0x4E8D, 0xD8A1 }, { 0x4E8E, 0xD3DA }, { 0x4E8F, 0xBFF7 }, { 0x4E91, 0xD4C6 }, { 0x4E92, 0xBBA5 }, { 0x4E93, 0xD8C1 }, { 0x4E94, 0xCEE5 }, 
-	{ 0x4E95, 0xBEAE }, { 0x4E98, 0xD8A8 }, { 0x4E9A, 0xD1C7 }, { 0x4E9B, 0xD0A9 }, { 0x4E9F, 0xD8BD }, { 0x4EA0, 0xD9EF }, { 0x4EA1, 0xCDF6 }, { 0x4EA2, 0xBFBA }, 
-	{ 0x4EA4, 0xBDBB }, { 0x4EA5, 0xBAA5 }, { 0x4EA6, 0xD2E0 }, { 0x4EA7, 0xB2FA }, { 0x4EA8, 0xBAE0 }, { 0x4EA9, 0xC4B6 }, { 0x4EAB, 0xCFED }, { 0x4EAC, 0xBEA9 }, 
-	{ 0x4EAD, 0xCDA4 }, { 0x4EAE, 0xC1C1 }, { 0x4EB2, 0xC7D7 }, { 0x4EB3, 0xD9F1 }, { 0x4EB5, 0xD9F4 }, { 0x4EBA, 0xC8CB }, { 0x4EBB, 0xD8E9 }, { 0x4EBF, 0xD2DA }, 
-	{ 0x4EC0, 0xCAB2 }, { 0x4EC1, 0xC8CA }, { 0x4EC2, 0xD8EC }, { 0x4EC3, 0xD8EA }, { 0x4EC4, 0xD8C6 }, { 0x4EC5, 0xBDF6 }, { 0x4EC6, 0xC6CD }, { 0x4EC7, 0xB3F0 }, 
-	{ 0x4EC9, 0xD8EB }, { 0x4ECA, 0xBDF1 }, { 0x4ECB, 0xBDE9 }, { 0x4ECD, 0xC8D4 }, { 0x4ECE, 0xB4D3 }, { 0x4ED1, 0xC2D8 }, { 0x4ED3, 0xB2D6 }, { 0x4ED4, 0xD7D0 }, 
-	{ 0x4ED5, 0xCACB }, { 0x4ED6, 0xCBFB }, { 0x4ED7, 0xD5CC }, { 0x4ED8, 0xB8B6 }, { 0x4ED9, 0xCFC9 }, { 0x4EDD, 0xD9DA }, { 0x4EDE, 0xD8F0 }, { 0x4EDF, 0xC7AA }, 
-	{ 0x4EE1, 0xD8EE }, { 0x4EE3, 0xB4FA }, { 0x4EE4, 0xC1EE }, { 0x4EE5, 0xD2D4 }, { 0x4EE8, 0xD8ED }, { 0x4EEA, 0xD2C7 }, { 0x4EEB, 0xD8EF }, { 0x4EEC, 0xC3C7 }, 
-	{ 0x4EF0, 0xD1F6 }, { 0x4EF2, 0xD6D9 }, { 0x4EF3, 0xD8F2 }, { 0x4EF5, 0xD8F5 }, { 0x4EF6, 0xBCFE }, { 0x4EF7, 0xBCDB }, { 0x4EFB, 0xC8CE }, { 0x4EFD, 0xB7DD }, 
-	{ 0x4EFF, 0xB7C2 }, { 0x4F01, 0xC6F3 }, { 0x4F09, 0xD8F8 }, { 0x4F0A, 0xD2C1 }, { 0x4F0D, 0xCEE9 }, { 0x4F0E, 0xBCBF }, { 0x4F0F, 0xB7FC }, { 0x4F10, 0xB7A5 }, 
-	{ 0x4F11, 0xD0DD }, { 0x4F17, 0xD6DA }, { 0x4F18, 0xD3C5 }, { 0x4F19, 0xBBEF }, { 0x4F1A, 0xBBE1 }, { 0x4F1B, 0xD8F1 }, { 0x4F1E, 0xC9A1 }, { 0x4F1F, 0xCEB0 }, 
-	{ 0x4F20, 0xB4AB }, { 0x4F22, 0xD8F3 }, { 0x4F24, 0xC9CB }, { 0x4F25, 0xD8F6 }, { 0x4F26, 0xC2D7 }, { 0x4F27, 0xD8F7 }, { 0x4F2A, 0xCEB1 }, { 0x4F2B, 0xD8F9 }, 
-	{ 0x4F2F, 0xB2AE }, { 0x4F30, 0xB9C0 }, { 0x4F32, 0xD9A3 }, { 0x4F34, 0xB0E9 }, { 0x4F36, 0xC1E6 }, { 0x4F38, 0xC9EC }, { 0x4F3A, 0xCBC5 }, { 0x4F3C, 0xCBC6 }, 
-	{ 0x4F3D, 0xD9A4 }, { 0x4F43, 0xB5E8 }, { 0x4F46, 0xB5AB }, { 0x4F4D, 0xCEBB }, { 0x4F4E, 0xB5CD }, { 0x4F4F, 0xD7A1 }, { 0x4F50, 0xD7F4 }, { 0x4F51, 0xD3D3 }, 
-	{ 0x4F53, 0xCCE5 }, { 0x4F55, 0xBACE }, { 0x4F57, 0xD9A2 }, { 0x4F58, 0xD9DC }, { 0x4F59, 0xD3E0 }, { 0x4F5A, 0xD8FD }, { 0x4F5B, 0xB7F0 }, { 0x4F5C, 0xD7F7 }, 
-	{ 0x4F5D, 0xD8FE }, { 0x4F5E, 0xD8FA }, { 0x4F5F, 0xD9A1 }, { 0x4F60, 0xC4E3 }, { 0x4F63, 0xD3B6 }, { 0x4F64, 0xD8F4 }, { 0x4F65, 0xD9DD }, { 0x4F67, 0xD8FB }, 
-	{ 0x4F69, 0xC5E5 }, { 0x4F6C, 0xC0D0 }, { 0x4F6F, 0xD1F0 }, { 0x4F70, 0xB0DB }, { 0x4F73, 0xBCD1 }, { 0x4F74, 0xD9A6 }, { 0x4F76, 0xD9A5 }, { 0x4F7B, 0xD9AC }, 
-	{ 0x4F7C, 0xD9AE }, { 0x4F7E, 0xD9AB }, { 0x4F7F, 0xCAB9 }, { 0x4F83, 0xD9A9 }, { 0x4F84, 0xD6B6 }, { 0x4F88, 0xB3DE }, { 0x4F89, 0xD9A8 }, { 0x4F8B, 0xC0FD }, 
-	{ 0x4F8D, 0xCACC }, { 0x4F8F, 0xD9AA }, { 0x4F91, 0xD9A7 }, { 0x4F94, 0xD9B0 }, { 0x4F97, 0xB6B1 }, { 0x4F9B, 0xB9A9 }, { 0x4F9D, 0xD2C0 }, { 0x4FA0, 0xCFC0 }, 
-	{ 0x4FA3, 0xC2C2 }, { 0x4FA5, 0xBDC4 }, { 0x4FA6, 0xD5EC }, { 0x4FA7, 0xB2E0 }, { 0x4FA8, 0xC7C8 }, { 0x4FA9, 0xBFEB }, { 0x4FAA, 0xD9AD }, { 0x4FAC, 0xD9AF }, 
-	{ 0x4FAE, 0xCEEA }, { 0x4FAF, 0xBAEE }, { 0x4FB5, 0xC7D6 }, { 0x4FBF, 0xB1E3 }, { 0x4FC3, 0xB4D9 }, { 0x4FC4, 0xB6ED }, { 0x4FC5, 0xD9B4 }, { 0x4FCA, 0xBFA1 }, 
-	{ 0x4FCE, 0xD9DE }, { 0x4FCF, 0xC7CE }, { 0x4FD0, 0xC0FE }, { 0x4FD1, 0xD9B8 }, { 0x4FD7, 0xCBD7 }, { 0x4FD8, 0xB7FD }, { 0x4FDA, 0xD9B5 }, { 0x4FDC, 0xD9B7 }, 
-	{ 0x4FDD, 0xB1A3 }, { 0x4FDE, 0xD3E1 }, { 0x4FDF, 0xD9B9 }, { 0x4FE1, 0xD0C5 }, { 0x4FE3, 0xD9B6 }, { 0x4FE6, 0xD9B1 }, { 0x4FE8, 0xD9B2 }, { 0x4FE9, 0xC1A9 }, 
-	{ 0x4FEA, 0xD9B3 }, { 0x4FED, 0xBCF3 }, { 0x4FEE, 0xD0DE }, { 0x4FEF, 0xB8A9 }, { 0x4FF1, 0xBEE3 }, { 0x4FF3, 0xD9BD }, { 0x4FF8, 0xD9BA }, { 0x4FFA, 0xB0B3 }, 
-	{ 0x4FFE, 0xD9C2 }, { 0x500C, 0xD9C4 }, { 0x500D, 0xB1B6 }, { 0x500F, 0xD9BF }, { 0x5012, 0xB5B9 }, { 0x5014, 0xBEF3 }, { 0x5018, 0xCCC8 }, { 0x5019, 0xBAF2 }, 
-	{ 0x501A, 0xD2D0 }, { 0x501C, 0xD9C3 }, { 0x501F, 0xBDE8 }, { 0x5021, 0xB3AB }, { 0x5025, 0xD9C5 }, { 0x5026, 0xBEEB }, { 0x5028, 0xD9C6 }, { 0x5029, 0xD9BB }, 
-	{ 0x502A, 0xC4DF }, { 0x502C, 0xD9BE }, { 0x502D, 0xD9C1 }, { 0x502E, 0xD9C0 }, { 0x503A, 0xD5AE }, { 0x503C, 0xD6B5 }, { 0x503E, 0xC7E3 }, { 0x5043, 0xD9C8 }, 
-	{ 0x5047, 0xBCD9 }, { 0x5048, 0xD9CA }, { 0x504C, 0xD9BC }, { 0x504E, 0xD9CB }, { 0x504F, 0xC6AB }, { 0x5055, 0xD9C9 }, { 0x505A, 0xD7F6 }, { 0x505C, 0xCDA3 }, 
-	{ 0x5065, 0xBDA1 }, { 0x506C, 0xD9CC }, { 0x5076, 0xC5BC }, { 0x5077, 0xCDB5 }, { 0x507B, 0xD9CD }, { 0x507E, 0xD9C7 }, { 0x507F, 0xB3A5 }, { 0x5080, 0xBFFE }, 
-	{ 0x5085, 0xB8B5 }, { 0x5088, 0xC0FC }, { 0x508D, 0xB0F8 }, { 0x50A3, 0xB4F6 }, { 0x50A5, 0xD9CE }, { 0x50A7, 0xD9CF }, { 0x50A8, 0xB4A2 }, { 0x50A9, 0xD9D0 }, 
-	{ 0x50AC, 0xB4DF }, { 0x50B2, 0xB0C1 }, { 0x50BA, 0xD9D1 }, { 0x50BB, 0xC9B5 }, { 0x50CF, 0xCFF1 }, { 0x50D6, 0xD9D2 }, { 0x50DA, 0xC1C5 }, { 0x50E6, 0xD9D6 }, 
-	{ 0x50E7, 0xC9AE }, { 0x50EC, 0xD9D5 }, { 0x50ED, 0xD9D4 }, { 0x50EE, 0xD9D7 }, { 0x50F3, 0xCBDB }, { 0x50F5, 0xBDA9 }, { 0x50FB, 0xC6A7 }, { 0x5106, 0xD9D3 }, 
-	{ 0x5107, 0xD9D8 }, { 0x510B, 0xD9D9 }, { 0x5112, 0xC8E5 }, { 0x5121, 0xC0DC }, { 0x513F, 0xB6F9 }, { 0x5140, 0xD8A3 }, { 0x5141, 0xD4CA }, { 0x5143, 0xD4AA }, 
-	{ 0x5144, 0xD0D6 }, { 0x5145, 0xB3E4 }, { 0x5146, 0xD5D7 }, { 0x5148, 0xCFC8 }, { 0x5149, 0xB9E2 }, { 0x514B, 0xBFCB }, { 0x514D, 0xC3E2 }, { 0x5151, 0xB6D2 }, 
-	{ 0x5154, 0xCDC3 }, { 0x5155, 0xD9EE }, { 0x5156, 0xD9F0 }, { 0x515A, 0xB5B3 }, { 0x515C, 0xB6B5 }, { 0x5162, 0xBEA4 }, { 0x5165, 0xC8EB }, { 0x5168, 0xC8AB }, 
-	{ 0x516B, 0xB0CB }, { 0x516C, 0xB9AB }, { 0x516D, 0xC1F9 }, { 0x516E, 0xD9E2 }, { 0x5170, 0xC0BC }, { 0x5171, 0xB9B2 }, { 0x5173, 0xB9D8 }, { 0x5174, 0xD0CB }, 
-	{ 0x5175, 0xB1F8 }, { 0x5176, 0xC6E4 }, { 0x5177, 0xBEDF }, { 0x5178, 0xB5E4 }, { 0x5179, 0xD7C8 }, { 0x517B, 0xD1F8 }, { 0x517C, 0xBCE6 }, { 0x517D, 0xCADE }, 
-	{ 0x5180, 0xBCBD }, { 0x5181, 0xD9E6 }, { 0x5182, 0xD8E7 }, { 0x5185, 0xC4DA }, { 0x5188, 0xB8D4 }, { 0x5189, 0xC8BD }, { 0x518C, 0xB2E1 }, { 0x518D, 0xD4D9 }, 
-	{ 0x5192, 0xC3B0 }, { 0x5195, 0xC3E1 }, { 0x5196, 0xDAA2 }, { 0x5197, 0xC8DF }, { 0x5199, 0xD0B4 }, { 0x519B, 0xBEFC }, { 0x519C, 0xC5A9 }, { 0x51A0, 0xB9DA }, 
-	{ 0x51A2, 0xDAA3 }, { 0x51A4, 0xD4A9 }, { 0x51A5, 0xDAA4 }, { 0x51AB, 0xD9FB }, { 0x51AC, 0xB6AC }, { 0x51AF, 0xB7EB }, { 0x51B0, 0xB1F9 }, { 0x51B1, 0xD9FC }, 
-	{ 0x51B2, 0xB3E5 }, { 0x51B3, 0xBEF6 }, { 0x51B5, 0xBFF6 }, { 0x51B6, 0xD2B1 }, { 0x51B7, 0xC0E4 }, { 0x51BB, 0xB6B3 }, { 0x51BC, 0xD9FE }, { 0x51BD, 0xD9FD }, 
-	{ 0x51C0, 0xBEBB }, { 0x51C4, 0xC6E0 }, { 0x51C6, 0xD7BC }, { 0x51C7, 0xDAA1 }, { 0x51C9, 0xC1B9 }, { 0x51CB, 0xB5F2 }, { 0x51CC, 0xC1E8 }, { 0x51CF, 0xBCF5 }, 
-	{ 0x51D1, 0xB4D5 }, { 0x51DB, 0xC1DD }, { 0x51DD, 0xC4FD }, { 0x51E0, 0xBCB8 }, { 0x51E1, 0xB7B2 }, { 0x51E4, 0xB7EF }, { 0x51EB, 0xD9EC }, { 0x51ED, 0xC6BE }, 
-	{ 0x51EF, 0xBFAD }, { 0x51F0, 0xBBCB }, { 0x51F3, 0xB5CA }, { 0x51F5, 0xDBC9 }, { 0x51F6, 0xD0D7 }, { 0x51F8, 0xCDB9 }, { 0x51F9, 0xB0BC }, { 0x51FA, 0xB3F6 }, 
-	{ 0x51FB, 0xBBF7 }, { 0x51FC, 0xDBCA }, { 0x51FD, 0xBAAF }, { 0x51FF, 0xD4E4 }, { 0x5200, 0xB5B6 }, { 0x5201, 0xB5F3 }, { 0x5202, 0xD8D6 }, { 0x5203, 0xC8D0 }, 
-	{ 0x5206, 0xB7D6 }, { 0x5207, 0xC7D0 }, { 0x5208, 0xD8D7 }, { 0x520A, 0xBFAF }, { 0x520D, 0xDBBB }, { 0x520E, 0xD8D8 }, { 0x5211, 0xD0CC }, { 0x5212, 0xBBAE }, 
-	{ 0x5216, 0xEBBE }, { 0x5217, 0xC1D0 }, { 0x5218, 0xC1F5 }, { 0x5219, 0xD4F2 }, { 0x521A, 0xB8D5 }, { 0x521B, 0xB4B4 }, { 0x521D, 0xB3F5 }, { 0x5220, 0xC9BE }, 
-	{ 0x5224, 0xC5D0 }, { 0x5228, 0xC5D9 }, { 0x5229, 0xC0FB }, { 0x522B, 0xB1F0 }, { 0x522D, 0xD8D9 }, { 0x522E, 0xB9CE }, { 0x5230, 0xB5BD }, { 0x5233, 0xD8DA }, 
-	{ 0x5236, 0xD6C6 }, { 0x5237, 0xCBA2 }, { 0x5238, 0xC8AF }, { 0x5239, 0xC9B2 }, { 0x523A, 0xB4CC }, { 0x523B, 0xBFCC }, { 0x523D, 0xB9F4 }, { 0x523F, 0xD8DB }, 
-	{ 0x5240, 0xD8DC }, { 0x5241, 0xB6E7 }, { 0x5242, 0xBCC1 }, { 0x5243, 0xCCEA }, { 0x524A, 0xCFF7 }, { 0x524C, 0xD8DD }, { 0x524D, 0xC7B0 }, { 0x5250, 0xB9D0 }, 
-	{ 0x5251, 0xBDA3 }, { 0x5254, 0xCCDE }, { 0x5256, 0xC6CA }, { 0x525C, 0xD8E0 }, { 0x525E, 0xD8DE }, { 0x5261, 0xD8DF }, { 0x5265, 0xB0FE }, { 0x5267, 0xBEE7 }, 
-	{ 0x5269, 0xCAA3 }, { 0x526A, 0xBCF4 }, { 0x526F, 0xB8B1 }, { 0x5272, 0xB8EE }, { 0x527D, 0xD8E2 }, { 0x527F, 0xBDCB }, { 0x5281, 0xD8E4 }, { 0x5282, 0xD8E3 }, 
-	{ 0x5288, 0xC5FC }, { 0x5290, 0xD8E5 }, { 0x5293, 0xD8E6 }, { 0x529B, 0xC1A6 }, { 0x529D, 0xC8B0 }, { 0x529E, 0xB0EC }, { 0x529F, 0xB9A6 }, { 0x52A0, 0xBCD3 }, 
-	{ 0x52A1, 0xCEF1 }, { 0x52A2, 0xDBBD }, { 0x52A3, 0xC1D3 }, { 0x52A8, 0xB6AF }, { 0x52A9, 0xD6FA }, { 0x52AA, 0xC5AC }, { 0x52AB, 0xBDD9 }, { 0x52AC, 0xDBBE }, 
-	{ 0x52AD, 0xDBBF }, { 0x52B1, 0xC0F8 }, { 0x52B2, 0xBEA2 }, { 0x52B3, 0xC0CD }, { 0x52BE, 0xDBC0 }, { 0x52BF, 0xCAC6 }, { 0x52C3, 0xB2AA }, { 0x52C7, 0xD3C2 }, 
-	{ 0x52C9, 0xC3E3 }, { 0x52CB, 0xD1AB }, { 0x52D0, 0xDBC2 }, { 0x52D2, 0xC0D5 }, { 0x52D6, 0xDBC3 }, { 0x52D8, 0xBFB1 }, { 0x52DF, 0xC4BC }, { 0x52E4, 0xC7DA }, 
-	{ 0x52F0, 0xDBC4 }, { 0x52F9, 0xD9E8 }, { 0x52FA, 0xC9D7 }, { 0x52FE, 0xB9B4 }, { 0x52FF, 0xCEF0 }, { 0x5300, 0xD4C8 }, { 0x5305, 0xB0FC }, { 0x5306, 0xB4D2 }, 
-	{ 0x5308, 0xD0D9 }, { 0x530D, 0xD9E9 }, { 0x530F, 0xDECB }, { 0x5310, 0xD9EB }, { 0x5315, 0xD8B0 }, { 0x5316, 0xBBAF }, { 0x5317, 0xB1B1 }, { 0x5319, 0xB3D7 }, 
-	{ 0x531A, 0xD8CE }, { 0x531D, 0xD4D1 }, { 0x5320, 0xBDB3 }, { 0x5321, 0xBFEF }, { 0x5323, 0xCFBB }, { 0x5326, 0xD8D0 }, { 0x532A, 0xB7CB }, { 0x532E, 0xD8D1 }, 
-	{ 0x5339, 0xC6A5 }, { 0x533A, 0xC7F8 }, { 0x533B, 0xD2BD }, { 0x533E, 0xD8D2 }, { 0x533F, 0xC4E4 }, { 0x5341, 0xCAAE }, { 0x5343, 0xC7A7 }, { 0x5345, 0xD8A6 }, 
-	{ 0x5347, 0xC9FD }, { 0x5348, 0xCEE7 }, { 0x5349, 0xBBDC }, { 0x534A, 0xB0EB }, { 0x534E, 0xBBAA }, { 0x534F, 0xD0AD }, { 0x5351, 0xB1B0 }, { 0x5352, 0xD7E4 }, 
-	{ 0x5353, 0xD7BF }, { 0x5355, 0xB5A5 }, { 0x5356, 0xC2F4 }, { 0x5357, 0xC4CF }, { 0x535A, 0xB2A9 }, { 0x535C, 0xB2B7 }, { 0x535E, 0xB1E5 }, { 0x535F, 0xDFB2 }, 
-	{ 0x5360, 0xD5BC }, { 0x5361, 0xBFA8 }, { 0x5362, 0xC2AC }, { 0x5363, 0xD8D5 }, { 0x5364, 0xC2B1 }, { 0x5366, 0xD8D4 }, { 0x5367, 0xCED4 }, { 0x5369, 0xDAE0 }, 
-	{ 0x536B, 0xCEC0 }, { 0x536E, 0xD8B4 }, { 0x536F, 0xC3AE }, { 0x5370, 0xD3A1 }, { 0x5371, 0xCEA3 }, { 0x5373, 0xBCB4 }, { 0x5374, 0xC8B4 }, { 0x5375, 0xC2D1 }, 
-	{ 0x5377, 0xBEED }, { 0x5378, 0xD0B6 }, { 0x537A, 0xDAE1 }, { 0x537F, 0xC7E4 }, { 0x5382, 0xB3A7 }, { 0x5384, 0xB6F2 }, { 0x5385, 0xCCFC }, { 0x5386, 0xC0FA }, 
-	{ 0x5389, 0xC0F7 }, { 0x538B, 0xD1B9 }, { 0x538C, 0xD1E1 }, { 0x538D, 0xD8C7 }, { 0x5395, 0xB2DE }, { 0x5398, 0xC0E5 }, { 0x539A, 0xBAF1 }, { 0x539D, 0xD8C8 }, 
-	{ 0x539F, 0xD4AD }, { 0x53A2, 0xCFE1 }, { 0x53A3, 0xD8C9 }, { 0x53A5, 0xD8CA }, { 0x53A6, 0xCFC3 }, { 0x53A8, 0xB3F8 }, { 0x53A9, 0xBEC7 }, { 0x53AE, 0xD8CB }, 
-	{ 0x53B6, 0xDBCC }, { 0x53BB, 0xC8A5 }, { 0x53BF, 0xCFD8 }, { 0x53C1, 0xC8FE }, { 0x53C2, 0xB2CE }, { 0x53C8, 0xD3D6 }, { 0x53C9, 0xB2E6 }, { 0x53CA, 0xBCB0 }, 
-	{ 0x53CB, 0xD3D1 }, { 0x53CC, 0xCBAB }, { 0x53CD, 0xB7B4 }, { 0x53D1, 0xB7A2 }, { 0x53D4, 0xCAE5 }, { 0x53D6, 0xC8A1 }, { 0x53D7, 0xCADC }, { 0x53D8, 0xB1E4 }, 
-	{ 0x53D9, 0xD0F0 }, { 0x53DB, 0xC5D1 }, { 0x53DF, 0xDBC5 }, { 0x53E0, 0xB5FE }, { 0x53E3, 0xBFDA }, { 0x53E4, 0xB9C5 }, { 0x53E5, 0xBEE4 }, { 0x53E6, 0xC1ED }, 
-	{ 0x53E8, 0xDFB6 }, { 0x53E9, 0xDFB5 }, { 0x53EA, 0xD6BB }, { 0x53EB, 0xBDD0 }, { 0x53EC, 0xD5D9 }, { 0x53ED, 0xB0C8 }, { 0x53EE, 0xB6A3 }, { 0x53EF, 0xBFC9 }, 
-	{ 0x53F0, 0xCCA8 }, { 0x53F1, 0xDFB3 }, { 0x53F2, 0xCAB7 }, { 0x53F3, 0xD3D2 }, { 0x53F5, 0xD8CF }, { 0x53F6, 0xD2B6 }, { 0x53F7, 0xBAC5 }, { 0x53F8, 0xCBBE }, 
-	{ 0x53F9, 0xCCBE }, { 0x53FB, 0xDFB7 }, { 0x53FC, 0xB5F0 }, { 0x53FD, 0xDFB4 }, { 0x5401, 0xD3F5 }, { 0x5403, 0xB3D4 }, { 0x5404, 0xB8F7 }, { 0x5406, 0xDFBA }, 
-	{ 0x5408, 0xBACF }, { 0x5409, 0xBCAA }, { 0x540A, 0xB5F5 }, { 0x540C, 0xCDAC }, { 0x540D, 0xC3FB }, { 0x540E, 0xBAF3 }, { 0x540F, 0xC0F4 }, { 0x5410, 0xCDC2 }, 
-	{ 0x5411, 0xCFF2 }, { 0x5412, 0xDFB8 }, { 0x5413, 0xCFC5 }, { 0x5415, 0xC2C0 }, { 0x5416, 0xDFB9 }, { 0x5417, 0xC2F0 }, { 0x541B, 0xBEFD }, { 0x541D, 0xC1DF }, 
-	{ 0x541E, 0xCDCC }, { 0x541F, 0xD2F7 }, { 0x5420, 0xB7CD }, { 0x5421, 0xDFC1 }, { 0x5423, 0xDFC4 }, { 0x5426, 0xB7F1 }, { 0x5427, 0xB0C9 }, { 0x5428, 0xB6D6 }, 
-	{ 0x5429, 0xB7D4 }, { 0x542B, 0xBAAC }, { 0x542C, 0xCCFD }, { 0x542D, 0xBFD4 }, { 0x542E, 0xCBB1 }, { 0x542F, 0xC6F4 }, { 0x5431, 0xD6A8 }, { 0x5432, 0xDFC5 }, 
-	{ 0x5434, 0xCEE2 }, { 0x5435, 0xB3B3 }, { 0x5438, 0xCEFC }, { 0x5439, 0xB4B5 }, { 0x543B, 0xCEC7 }, { 0x543C, 0xBAF0 }, { 0x543E, 0xCEE1 }, { 0x5440, 0xD1BD }, 
-	{ 0x5443, 0xDFC0 }, { 0x5446, 0xB4F4 }, { 0x5448, 0xB3CA }, { 0x544A, 0xB8E6 }, { 0x544B, 0xDFBB }, { 0x5450, 0xC4C5 }, { 0x5452, 0xDFBC }, { 0x5453, 0xDFBD }, 
-	{ 0x5454, 0xDFBE }, { 0x5455, 0xC5BB }, { 0x5456, 0xDFBF }, { 0x5457, 0xDFC2 }, { 0x5458, 0xD4B1 }, { 0x5459, 0xDFC3 }, { 0x545B, 0xC7BA }, { 0x545C, 0xCED8 }, 
-	{ 0x5462, 0xC4D8 }, { 0x5464, 0xDFCA }, { 0x5466, 0xDFCF }, { 0x5468, 0xD6DC }, { 0x5471, 0xDFC9 }, { 0x5472, 0xDFDA }, { 0x5473, 0xCEB6 }, { 0x5475, 0xBAC7 }, 
-	{ 0x5476, 0xDFCE }, { 0x5477, 0xDFC8 }, { 0x5478, 0xC5DE }, { 0x547B, 0xC9EB }, { 0x547C, 0xBAF4 }, { 0x547D, 0xC3FC }, { 0x5480, 0xBED7 }, { 0x5482, 0xDFC6 }, 
-	{ 0x5484, 0xDFCD }, { 0x5486, 0xC5D8 }, { 0x548B, 0xD5A6 }, { 0x548C, 0xBACD }, { 0x548E, 0xBECC }, { 0x548F, 0xD3BD }, { 0x5490, 0xB8C0 }, { 0x5492, 0xD6E4 }, 
-	{ 0x5494, 0xDFC7 }, { 0x5495, 0xB9BE }, { 0x5496, 0xBFA7 }, { 0x5499, 0xC1FC }, { 0x549A, 0xDFCB }, { 0x549B, 0xDFCC }, { 0x549D, 0xDFD0 }, { 0x54A3, 0xDFDB }, 
-	{ 0x54A4, 0xDFE5 }, { 0x54A6, 0xDFD7 }, { 0x54A7, 0xDFD6 }, { 0x54A8, 0xD7C9 }, { 0x54A9, 0xDFE3 }, { 0x54AA, 0xDFE4 }, { 0x54AB, 0xE5EB }, { 0x54AC, 0xD2A7 }, 
-	{ 0x54AD, 0xDFD2 }, { 0x54AF, 0xBFA9 }, { 0x54B1, 0xD4DB }, { 0x54B3, 0xBFC8 }, { 0x54B4, 0xDFD4 }, { 0x54B8, 0xCFCC }, { 0x54BB, 0xDFDD }, { 0x54BD, 0xD1CA }, 
-	{ 0x54BF, 0xDFDE }, { 0x54C0, 0xB0A7 }, { 0x54C1, 0xC6B7 }, { 0x54C2, 0xDFD3 }, { 0x54C4, 0xBAE5 }, { 0x54C6, 0xB6DF }, { 0x54C7, 0xCDDB }, { 0x54C8, 0xB9FE }, 
-	{ 0x54C9, 0xD4D5 }, { 0x54CC, 0xDFDF }, { 0x54CD, 0xCFEC }, { 0x54CE, 0xB0A5 }, { 0x54CF, 0xDFE7 }, { 0x54D0, 0xDFD1 }, { 0x54D1, 0xD1C6 }, { 0x54D2, 0xDFD5 }, 
-	{ 0x54D3, 0xDFD8 }, { 0x54D4, 0xDFD9 }, { 0x54D5, 0xDFDC }, { 0x54D7, 0xBBA9 }, { 0x54D9, 0xDFE0 }, { 0x54DA, 0xDFE1 }, { 0x54DC, 0xDFE2 }, { 0x54DD, 0xDFE6 }, 
-	{ 0x54DE, 0xDFE8 }, { 0x54DF, 0xD3B4 }, { 0x54E5, 0xB8E7 }, { 0x54E6, 0xC5B6 }, { 0x54E7, 0xDFEA }, { 0x54E8, 0xC9DA }, { 0x54E9, 0xC1A8 }, { 0x54EA, 0xC4C4 }, 
-	{ 0x54ED, 0xBFDE }, { 0x54EE, 0xCFF8 }, { 0x54F2, 0xD5DC }, { 0x54F3, 0xDFEE }, { 0x54FA, 0xB2B8 }, { 0x54FC, 0xBADF }, { 0x54FD, 0xDFEC }, { 0x54FF, 0xDBC1 }, 
-	{ 0x5501, 0xD1E4 }, { 0x5506, 0xCBF4 }, { 0x5507, 0xB4BD }, { 0x5509, 0xB0A6 }, { 0x550F, 0xDFF1 }, { 0x5510, 0xCCC6 }, { 0x5511, 0xDFF2 }, { 0x5514, 0xDFED }, 
-	{ 0x551B, 0xDFE9 }, { 0x5520, 0xDFEB }, { 0x5522, 0xDFEF }, { 0x5523, 0xDFF0 }, { 0x5524, 0xBBBD }, { 0x5527, 0xDFF3 }, { 0x552A, 0xDFF4 }, { 0x552C, 0xBBA3 }, 
-	{ 0x552E, 0xCADB }, { 0x552F, 0xCEA8 }, { 0x5530, 0xE0A7 }, { 0x5531, 0xB3AA }, { 0x5533, 0xE0A6 }, { 0x5537, 0xE0A1 }, { 0x553C, 0xDFFE }, { 0x553E, 0xCDD9 }, 
-	{ 0x553F, 0xDFFC }, { 0x5541, 0xDFFA }, { 0x5543, 0xBFD0 }, { 0x5544, 0xD7C4 }, { 0x5546, 0xC9CC }, { 0x5549, 0xDFF8 }, { 0x554A, 0xB0A1 }, { 0x5550, 0xDFFD }, 
-	{ 0x5555, 0xDFFB }, { 0x5556, 0xE0A2 }, { 0x555C, 0xE0A8 }, { 0x5561, 0xB7C8 }, { 0x5564, 0xC6A1 }, { 0x5565, 0xC9B6 }, { 0x5566, 0xC0B2 }, { 0x5567, 0xDFF5 }, 
-	{ 0x556A, 0xC5BE }, { 0x556C, 0xD8C4 }, { 0x556D, 0xDFF9 }, { 0x556E, 0xC4F6 }, { 0x5575, 0xE0A3 }, { 0x5576, 0xE0A4 }, { 0x5577, 0xE0A5 }, { 0x5578, 0xD0A5 }, 
-	{ 0x557B, 0xE0B4 }, { 0x557C, 0xCCE4 }, { 0x557E, 0xE0B1 }, { 0x5580, 0xBFA6 }, { 0x5581, 0xE0AF }, { 0x5582, 0xCEB9 }, { 0x5583, 0xE0AB }, { 0x5584, 0xC9C6 }, 
-	{ 0x5587, 0xC0AE }, { 0x5588, 0xE0AE }, { 0x5589, 0xBAED }, { 0x558A, 0xBAB0 }, { 0x558B, 0xE0A9 }, { 0x558F, 0xDFF6 }, { 0x5591, 0xE0B3 }, { 0x5594, 0xE0B8 }, 
-	{ 0x5598, 0xB4AD }, { 0x5599, 0xE0B9 }, { 0x559C, 0xCFB2 }, { 0x559D, 0xBAC8 }, { 0x559F, 0xE0B0 }, { 0x55A7, 0xD0FA }, { 0x55B1, 0xE0AC }, { 0x55B3, 0xD4FB }, 
-	{ 0x55B5, 0xDFF7 }, { 0x55B7, 0xC5E7 }, { 0x55B9, 0xE0AD }, { 0x55BB, 0xD3F7 }, { 0x55BD, 0xE0B6 }, { 0x55BE, 0xE0B7 }, { 0x55C4, 0xE0C4 }, { 0x55C5, 0xD0E1 }, 
-	{ 0x55C9, 0xE0BC }, { 0x55CC, 0xE0C9 }, { 0x55CD, 0xE0CA }, { 0x55D1, 0xE0BE }, { 0x55D2, 0xE0AA }, { 0x55D3, 0xC9A4 }, { 0x55D4, 0xE0C1 }, { 0x55D6, 0xE0B2 }, 
-	{ 0x55DC, 0xCAC8 }, { 0x55DD, 0xE0C3 }, { 0x55DF, 0xE0B5 }, { 0x55E1, 0xCECB }, { 0x55E3, 0xCBC3 }, { 0x55E4, 0xE0CD }, { 0x55E5, 0xE0C6 }, { 0x55E6, 0xE0C2 }, 
-	{ 0x55E8, 0xE0CB }, { 0x55EA, 0xE0BA }, { 0x55EB, 0xE0BF }, { 0x55EC, 0xE0C0 }, { 0x55EF, 0xE0C5 }, { 0x55F2, 0xE0C7 }, { 0x55F3, 0xE0C8 }, { 0x55F5, 0xE0CC }, 
-	{ 0x55F7, 0xE0BB }, { 0x55FD, 0xCBD4 }, { 0x55FE, 0xE0D5 }, { 0x5600, 0xE0D6 }, { 0x5601, 0xE0D2 }, { 0x5608, 0xE0D0 }, { 0x5609, 0xBCCE }, { 0x560C, 0xE0D1 }, 
-	{ 0x560E, 0xB8C2 }, { 0x560F, 0xD8C5 }, { 0x5618, 0xD0EA }, { 0x561B, 0xC2EF }, { 0x561E, 0xE0CF }, { 0x561F, 0xE0BD }, { 0x5623, 0xE0D4 }, { 0x5624, 0xE0D3 }, 
-	{ 0x5627, 0xE0D7 }, { 0x562C, 0xE0DC }, { 0x562D, 0xE0D8 }, { 0x5631, 0xD6F6 }, { 0x5632, 0xB3B0 }, { 0x5634, 0xD7EC }, { 0x5636, 0xCBBB }, { 0x5639, 0xE0DA }, 
-	{ 0x563B, 0xCEFB }, { 0x563F, 0xBAD9 }, { 0x564C, 0xE0E1 }, { 0x564D, 0xE0DD }, { 0x564E, 0xD2AD }, { 0x5654, 0xE0E2 }, { 0x5657, 0xE0DB }, { 0x5658, 0xE0D9 }, 
-	{ 0x5659, 0xE0DF }, { 0x565C, 0xE0E0 }, { 0x5662, 0xE0DE }, { 0x5664, 0xE0E4 }, { 0x5668, 0xC6F7 }, { 0x5669, 0xD8AC }, { 0x566A, 0xD4EB }, { 0x566B, 0xE0E6 }, 
-	{ 0x566C, 0xCAC9 }, { 0x5671, 0xE0E5 }, { 0x5676, 0xB8C1 }, { 0x567B, 0xE0E7 }, { 0x567C, 0xE0E8 }, { 0x5685, 0xE0E9 }, { 0x5686, 0xE0E3 }, { 0x568E, 0xBABF }, 
-	{ 0x568F, 0xCCE7 }, { 0x5693, 0xE0EA }, { 0x56A3, 0xCFF9 }, { 0x56AF, 0xE0EB }, { 0x56B7, 0xC8C2 }, { 0x56BC, 0xBDC0 }, { 0x56CA, 0xC4D2 }, { 0x56D4, 0xE0EC }, 
-	{ 0x56D7, 0xE0ED }, { 0x56DA, 0xC7F4 }, { 0x56DB, 0xCBC4 }, { 0x56DD, 0xE0EE }, { 0x56DE, 0xBBD8 }, { 0x56DF, 0xD8B6 }, { 0x56E0, 0xD2F2 }, { 0x56E1, 0xE0EF }, 
-	{ 0x56E2, 0xCDC5 }, { 0x56E4, 0xB6DA }, { 0x56EB, 0xE0F1 }, { 0x56ED, 0xD4B0 }, { 0x56F0, 0xC0A7 }, { 0x56F1, 0xB4D1 }, { 0x56F4, 0xCEA7 }, { 0x56F5, 0xE0F0 }, 
-	{ 0x56F9, 0xE0F2 }, { 0x56FA, 0xB9CC }, { 0x56FD, 0xB9FA }, { 0x56FE, 0xCDBC }, { 0x56FF, 0xE0F3 }, { 0x5703, 0xC6D4 }, { 0x5704, 0xE0F4 }, { 0x5706, 0xD4B2 }, 
-	{ 0x5708, 0xC8A6 }, { 0x5709, 0xE0F6 }, { 0x570A, 0xE0F5 }, { 0x571C, 0xE0F7 }, { 0x571F, 0xCDC1 }, { 0x5723, 0xCAA5 }, { 0x5728, 0xD4DA }, { 0x5729, 0xDBD7 }, 
-	{ 0x572A, 0xDBD9 }, { 0x572C, 0xDBD8 }, { 0x572D, 0xB9E7 }, { 0x572E, 0xDBDC }, { 0x572F, 0xDBDD }, { 0x5730, 0xB5D8 }, { 0x5733, 0xDBDA }, { 0x5739, 0xDBDB }, 
-	{ 0x573A, 0xB3A1 }, { 0x573B, 0xDBDF }, { 0x573E, 0xBBF8 }, { 0x5740, 0xD6B7 }, { 0x5742, 0xDBE0 }, { 0x5747, 0xBEF9 }, { 0x574A, 0xB7BB }, { 0x574C, 0xDBD0 }, 
-	{ 0x574D, 0xCCAE }, { 0x574E, 0xBFB2 }, { 0x574F, 0xBBB5 }, { 0x5750, 0xD7F8 }, { 0x5751, 0xBFD3 }, { 0x5757, 0xBFE9 }, { 0x575A, 0xBCE1 }, { 0x575B, 0xCCB3 }, 
-	{ 0x575C, 0xDBDE }, { 0x575D, 0xB0D3 }, { 0x575E, 0xCEEB }, { 0x575F, 0xB7D8 }, { 0x5760, 0xD7B9 }, { 0x5761, 0xC6C2 }, { 0x5764, 0xC0A4 }, { 0x5766, 0xCCB9 }, 
-	{ 0x5768, 0xDBE7 }, { 0x5769, 0xDBE1 }, { 0x576A, 0xC6BA }, { 0x576B, 0xDBE3 }, { 0x576D, 0xDBE8 }, { 0x576F, 0xC5F7 }, { 0x5773, 0xDBEA }, { 0x5776, 0xDBE9 }, 
-	{ 0x5777, 0xBFC0 }, { 0x577B, 0xDBE6 }, { 0x577C, 0xDBE5 }, { 0x5782, 0xB4B9 }, { 0x5783, 0xC0AC }, { 0x5784, 0xC2A2 }, { 0x5785, 0xDBE2 }, { 0x5786, 0xDBE4 }, 
-	{ 0x578B, 0xD0CD }, { 0x578C, 0xDBED }, { 0x5792, 0xC0DD }, { 0x5793, 0xDBF2 }, { 0x579B, 0xB6E2 }, { 0x57A0, 0xDBF3 }, { 0x57A1, 0xDBD2 }, { 0x57A2, 0xB9B8 }, 
-	{ 0x57A3, 0xD4AB }, { 0x57A4, 0xDBEC }, { 0x57A6, 0xBFD1 }, { 0x57A7, 0xDBF0 }, { 0x57A9, 0xDBD1 }, { 0x57AB, 0xB5E6 }, { 0x57AD, 0xDBEB }, { 0x57AE, 0xBFE5 }, 
-	{ 0x57B2, 0xDBEE }, { 0x57B4, 0xDBF1 }, { 0x57B8, 0xDBF9 }, { 0x57C2, 0xB9A1 }, { 0x57C3, 0xB0A3 }, { 0x57CB, 0xC2F1 }, { 0x57CE, 0xB3C7 }, { 0x57CF, 0xDBEF }, 
-	{ 0x57D2, 0xDBF8 }, { 0x57D4, 0xC6D2 }, { 0x57D5, 0xDBF4 }, { 0x57D8, 0xDBF5 }, { 0x57D9, 0xDBF7 }, { 0x57DA, 0xDBF6 }, { 0x57DD, 0xDBFE }, { 0x57DF, 0xD3F2 }, 
-	{ 0x57E0, 0xB2BA }, { 0x57E4, 0xDBFD }, { 0x57ED, 0xDCA4 }, { 0x57EF, 0xDBFB }, { 0x57F4, 0xDBFA }, { 0x57F8, 0xDBFC }, { 0x57F9, 0xC5E0 }, { 0x57FA, 0xBBF9 }, 
-	{ 0x57FD, 0xDCA3 }, { 0x5800, 0xDCA5 }, { 0x5802, 0xCCC3 }, { 0x5806, 0xB6D1 }, { 0x5807, 0xDDC0 }, { 0x580B, 0xDCA1 }, { 0x580D, 0xDCA2 }, { 0x5811, 0xC7B5 }, 
-	{ 0x5815, 0xB6E9 }, { 0x5819, 0xDCA7 }, { 0x581E, 0xDCA6 }, { 0x5820, 0xDCA9 }, { 0x5821, 0xB1A4 }, { 0x5824, 0xB5CC }, { 0x582A, 0xBFB0 }, { 0x5830, 0xD1DF }, 
-	{ 0x5835, 0xB6C2 }, { 0x5844, 0xDCA8 }, { 0x584C, 0xCBFA }, { 0x584D, 0xEBF3 }, { 0x5851, 0xCBDC }, { 0x5854, 0xCBFE }, { 0x5858, 0xCCC1 }, { 0x585E, 0xC8FB }, 
-	{ 0x5865, 0xDCAA }, { 0x586B, 0xCCEE }, { 0x586C, 0xDCAB }, { 0x587E, 0xDBD3 }, { 0x5880, 0xDCAF }, { 0x5881, 0xDCAC }, { 0x5883, 0xBEB3 }, { 0x5885, 0xCAFB }, 
-	{ 0x5889, 0xDCAD }, { 0x5892, 0xC9CA }, { 0x5893, 0xC4B9 }, { 0x5899, 0xC7BD }, { 0x589A, 0xDCAE }, { 0x589E, 0xD4F6 }, { 0x589F, 0xD0E6 }, { 0x58A8, 0xC4AB }, 
-	{ 0x58A9, 0xB6D5 }, { 0x58BC, 0xDBD4 }, { 0x58C1, 0xB1DA }, { 0x58C5, 0xDBD5 }, { 0x58D1, 0xDBD6 }, { 0x58D5, 0xBABE }, { 0x58E4, 0xC8C0 }, { 0x58EB, 0xCABF }, 
-	{ 0x58EC, 0xC8C9 }, { 0x58EE, 0xD7B3 }, { 0x58F0, 0xC9F9 }, { 0x58F3, 0xBFC7 }, { 0x58F6, 0xBAF8 }, { 0x58F9, 0xD2BC }, { 0x5902, 0xE2BA }, { 0x5904, 0xB4A6 }, 
-	{ 0x5907, 0xB1B8 }, { 0x590D, 0xB8B4 }, { 0x590F, 0xCFC4 }, { 0x5914, 0xD9E7 }, { 0x5915, 0xCFA6 }, { 0x5916, 0xCDE2 }, { 0x5919, 0xD9ED }, { 0x591A, 0xB6E0 }, 
-	{ 0x591C, 0xD2B9 }, { 0x591F, 0xB9BB }, { 0x5924, 0xE2B9 }, { 0x5925, 0xE2B7 }, { 0x5927, 0xB4F3 }, { 0x5929, 0xCCEC }, { 0x592A, 0xCCAB }, { 0x592B, 0xB7F2 }, 
-	{ 0x592D, 0xD8B2 }, { 0x592E, 0xD1EB }, { 0x592F, 0xBABB }, { 0x5931, 0xCAA7 }, { 0x5934, 0xCDB7 }, { 0x5937, 0xD2C4 }, { 0x5938, 0xBFE4 }, { 0x5939, 0xBCD0 }, 
-	{ 0x593A, 0xB6E1 }, { 0x593C, 0xDEC5 }, { 0x5941, 0xDEC6 }, { 0x5942, 0xDBBC }, { 0x5944, 0xD1D9 }, { 0x5947, 0xC6E6 }, { 0x5948, 0xC4CE }, { 0x5949, 0xB7EE }, 
-	{ 0x594B, 0xB7DC }, { 0x594E, 0xBFFC }, { 0x594F, 0xD7E0 }, { 0x5951, 0xC6F5 }, { 0x5954, 0xB1BC }, { 0x5955, 0xDEC8 }, { 0x5956, 0xBDB1 }, { 0x5957, 0xCCD7 }, 
-	{ 0x5958, 0xDECA }, { 0x595A, 0xDEC9 }, { 0x5960, 0xB5EC }, { 0x5962, 0xC9DD }, { 0x5965, 0xB0C2 }, { 0x5973, 0xC5AE }, { 0x5974, 0xC5AB }, { 0x5976, 0xC4CC }, 
-	{ 0x5978, 0xBCE9 }, { 0x5979, 0xCBFD }, { 0x597D, 0xBAC3 }, { 0x5981, 0xE5F9 }, { 0x5982, 0xC8E7 }, { 0x5983, 0xE5FA }, { 0x5984, 0xCDFD }, { 0x5986, 0xD7B1 }, 
-	{ 0x5987, 0xB8BE }, { 0x5988, 0xC2E8 }, { 0x598A, 0xC8D1 }, { 0x598D, 0xE5FB }, { 0x5992, 0xB6CA }, { 0x5993, 0xBCCB }, { 0x5996, 0xD1FD }, { 0x5997, 0xE6A1 }, 
-	{ 0x5999, 0xC3EE }, { 0x599E, 0xE6A4 }, { 0x59A3, 0xE5FE }, { 0x59A4, 0xE6A5 }, { 0x59A5, 0xCDD7 }, { 0x59A8, 0xB7C1 }, { 0x59A9, 0xE5FC }, { 0x59AA, 0xE5FD }, 
-	{ 0x59AB, 0xE6A3 }, { 0x59AE, 0xC4DD }, { 0x59AF, 0xE6A8 }, { 0x59B2, 0xE6A7 }, { 0x59B9, 0xC3C3 }, { 0x59BB, 0xC6DE }, { 0x59BE, 0xE6AA }, { 0x59C6, 0xC4B7 }, 
-	{ 0x59CA, 0xE6A2 }, { 0x59CB, 0xCABC }, { 0x59D0, 0xBDE3 }, { 0x59D1, 0xB9C3 }, { 0x59D2, 0xE6A6 }, { 0x59D3, 0xD0D5 }, { 0x59D4, 0xCEAF }, { 0x59D7, 0xE6A9 }, 
-	{ 0x59D8, 0xE6B0 }, { 0x59DA, 0xD2A6 }, { 0x59DC, 0xBDAA }, { 0x59DD, 0xE6AD }, { 0x59E3, 0xE6AF }, { 0x59E5, 0xC0D1 }, { 0x59E8, 0xD2CC }, { 0x59EC, 0xBCA7 }, 
-	{ 0x59F9, 0xE6B1 }, { 0x59FB, 0xD2F6 }, { 0x59FF, 0xD7CB }, { 0x5A01, 0xCDFE }, { 0x5A03, 0xCDDE }, { 0x5A04, 0xC2A6 }, { 0x5A05, 0xE6AB }, { 0x5A06, 0xE6AC }, 
-	{ 0x5A07, 0xBDBF }, { 0x5A08, 0xE6AE }, { 0x5A09, 0xE6B3 }, { 0x5A0C, 0xE6B2 }, { 0x5A11, 0xE6B6 }, { 0x5A13, 0xE6B8 }, { 0x5A18, 0xC4EF }, { 0x5A1C, 0xC4C8 }, 
-	{ 0x5A1F, 0xBEEA }, { 0x5A20, 0xC9EF }, { 0x5A23, 0xE6B7 }, { 0x5A25, 0xB6F0 }, { 0x5A29, 0xC3E4 }, { 0x5A31, 0xD3E9 }, { 0x5A32, 0xE6B4 }, { 0x5A34, 0xE6B5 }, 
-	{ 0x5A36, 0xC8A2 }, { 0x5A3C, 0xE6BD }, { 0x5A40, 0xE6B9 }, { 0x5A46, 0xC6C5 }, { 0x5A49, 0xCDF1 }, { 0x5A4A, 0xE6BB }, { 0x5A55, 0xE6BC }, { 0x5A5A, 0xBBE9 }, 
-	{ 0x5A62, 0xE6BE }, { 0x5A67, 0xE6BA }, { 0x5A6A, 0xC0B7 }, { 0x5A74, 0xD3A4 }, { 0x5A75, 0xE6BF }, { 0x5A76, 0xC9F4 }, { 0x5A77, 0xE6C3 }, { 0x5A7A, 0xE6C4 }, 
-	{ 0x5A7F, 0xD0F6 }, { 0x5A92, 0xC3BD }, { 0x5A9A, 0xC3C4 }, { 0x5A9B, 0xE6C2 }, { 0x5AAA, 0xE6C1 }, { 0x5AB2, 0xE6C7 }, { 0x5AB3, 0xCFB1 }, { 0x5AB5, 0xEBF4 }, 
-	{ 0x5AB8, 0xE6CA }, { 0x5ABE, 0xE6C5 }, { 0x5AC1, 0xBCDE }, { 0x5AC2, 0xC9A9 }, { 0x5AC9, 0xBCB5 }, { 0x5ACC, 0xCFD3 }, { 0x5AD2, 0xE6C8 }, { 0x5AD4, 0xE6C9 }, 
-	{ 0x5AD6, 0xE6CE }, { 0x5AD8, 0xE6D0 }, { 0x5ADC, 0xE6D1 }, { 0x5AE0, 0xE6CB }, { 0x5AE1, 0xB5D5 }, { 0x5AE3, 0xE6CC }, { 0x5AE6, 0xE6CF }, { 0x5AE9, 0xC4DB }, 
-	{ 0x5AEB, 0xE6C6 }, { 0x5AF1, 0xE6CD }, { 0x5B09, 0xE6D2 }, { 0x5B16, 0xE6D4 }, { 0x5B17, 0xE6D3 }, { 0x5B32, 0xE6D5 }, { 0x5B34, 0xD9F8 }, { 0x5B37, 0xE6D6 }, 
-	{ 0x5B40, 0xE6D7 }, { 0x5B50, 0xD7D3 }, { 0x5B51, 0xE6DD }, { 0x5B53, 0xE6DE }, { 0x5B54, 0xBFD7 }, { 0x5B55, 0xD4D0 }, { 0x5B57, 0xD7D6 }, { 0x5B58, 0xB4E6 }, 
-	{ 0x5B59, 0xCBEF }, { 0x5B5A, 0xE6DA }, { 0x5B5B, 0xD8C3 }, { 0x5B5C, 0xD7CE }, { 0x5B5D, 0xD0A2 }, { 0x5B5F, 0xC3CF }, { 0x5B62, 0xE6DF }, { 0x5B63, 0xBCBE }, 
-	{ 0x5B64, 0xB9C2 }, { 0x5B65, 0xE6DB }, { 0x5B66, 0xD1A7 }, { 0x5B69, 0xBAA2 }, { 0x5B6A, 0xC2CF }, { 0x5B6C, 0xD8AB }, { 0x5B70, 0xCAEB }, { 0x5B71, 0xE5EE }, 
-	{ 0x5B73, 0xE6DC }, { 0x5B75, 0xB7F5 }, { 0x5B7A, 0xC8E6 }, { 0x5B7D, 0xC4F5 }, { 0x5B80, 0xE5B2 }, { 0x5B81, 0xC4FE }, { 0x5B83, 0xCBFC }, { 0x5B84, 0xE5B3 }, 
-	{ 0x5B85, 0xD5AC }, { 0x5B87, 0xD3EE }, { 0x5B88, 0xCAD8 }, { 0x5B89, 0xB0B2 }, { 0x5B8B, 0xCBCE }, { 0x5B8C, 0xCDEA }, { 0x5B8F, 0xBAEA }, { 0x5B93, 0xE5B5 }, 
-	{ 0x5B95, 0xE5B4 }, { 0x5B97, 0xD7DA }, { 0x5B98, 0xB9D9 }, { 0x5B99, 0xD6E6 }, { 0x5B9A, 0xB6A8 }, { 0x5B9B, 0xCDF0 }, { 0x5B9C, 0xD2CB }, { 0x5B9D, 0xB1A6 }, 
-	{ 0x5B9E, 0xCAB5 }, { 0x5BA0, 0xB3E8 }, { 0x5BA1, 0xC9F3 }, { 0x5BA2, 0xBFCD }, { 0x5BA3, 0xD0FB }, { 0x5BA4, 0xCAD2 }, { 0x5BA5, 0xE5B6 }, { 0x5BA6, 0xBBC2 }, 
-	{ 0x5BAA, 0xCFDC }, { 0x5BAB, 0xB9AC }, { 0x5BB0, 0xD4D7 }, { 0x5BB3, 0xBAA6 }, { 0x5BB4, 0xD1E7 }, { 0x5BB5, 0xCFFC }, { 0x5BB6, 0xBCD2 }, { 0x5BB8, 0xE5B7 }, 
-	{ 0x5BB9, 0xC8DD }, { 0x5BBD, 0xBFED }, { 0x5BBE, 0xB1F6 }, { 0x5BBF, 0xCBDE }, { 0x5BC2, 0xBCC5 }, { 0x5BC4, 0xBCC4 }, { 0x5BC5, 0xD2FA }, { 0x5BC6, 0xC3DC }, 
-	{ 0x5BC7, 0xBFDC }, { 0x5BCC, 0xB8BB }, { 0x5BD0, 0xC3C2 }, { 0x5BD2, 0xBAAE }, { 0x5BD3, 0xD4A2 }, { 0x5BDD, 0xC7DE }, { 0x5BDE, 0xC4AF }, { 0x5BDF, 0xB2EC }, 
-	{ 0x5BE1, 0xB9D1 }, { 0x5BE4, 0xE5BB }, { 0x5BE5, 0xC1C8 }, { 0x5BE8, 0xD5AF }, { 0x5BEE, 0xE5BC }, { 0x5BF0, 0xE5BE }, { 0x5BF8, 0xB4E7 }, { 0x5BF9, 0xB6D4 }, 
-	{ 0x5BFA, 0xCBC2 }, { 0x5BFB, 0xD1B0 }, { 0x5BFC, 0xB5BC }, { 0x5BFF, 0xCAD9 }, { 0x5C01, 0xB7E2 }, { 0x5C04, 0xC9E4 }, { 0x5C06, 0xBDAB }, { 0x5C09, 0xCEBE }, 
-	{ 0x5C0A, 0xD7F0 }, { 0x5C0F, 0xD0A1 }, { 0x5C11, 0xC9D9 }, { 0x5C14, 0xB6FB }, { 0x5C15, 0xE6D8 }, { 0x5C16, 0xBCE2 }, { 0x5C18, 0xB3BE }, { 0x5C1A, 0xC9D0 }, 
-	{ 0x5C1C, 0xE6D9 }, { 0x5C1D, 0xB3A2 }, { 0x5C22, 0xDECC }, { 0x5C24, 0xD3C8 }, { 0x5C25, 0xDECD }, { 0x5C27, 0xD2A2 }, { 0x5C2C, 0xDECE }, { 0x5C31, 0xBECD }, 
-	{ 0x5C34, 0xDECF }, { 0x5C38, 0xCAAC }, { 0x5C39, 0xD2FC }, { 0x5C3A, 0xB3DF }, { 0x5C3B, 0xE5EA }, { 0x5C3C, 0xC4E1 }, { 0x5C3D, 0xBEA1 }, { 0x5C3E, 0xCEB2 }, 
-	{ 0x5C3F, 0xC4F2 }, { 0x5C40, 0xBED6 }, { 0x5C41, 0xC6A8 }, { 0x5C42, 0xB2E3 }, { 0x5C45, 0xBED3 }, { 0x5C48, 0xC7FC }, { 0x5C49, 0xCCEB }, { 0x5C4A, 0xBDEC }, 
-	{ 0x5C4B, 0xCEDD }, { 0x5C4E, 0xCABA }, { 0x5C4F, 0xC6C1 }, { 0x5C50, 0xE5EC }, { 0x5C51, 0xD0BC }, { 0x5C55, 0xD5B9 }, { 0x5C59, 0xE5ED }, { 0x5C5E, 0xCAF4 }, 
-	{ 0x5C60, 0xCDC0 }, { 0x5C61, 0xC2C5 }, { 0x5C63, 0xE5EF }, { 0x5C65, 0xC2C4 }, { 0x5C66, 0xE5F0 }, { 0x5C6E, 0xE5F8 }, { 0x5C6F, 0xCDCD }, { 0x5C71, 0xC9BD }, 
-	{ 0x5C79, 0xD2D9 }, { 0x5C7A, 0xE1A8 }, { 0x5C7F, 0xD3EC }, { 0x5C81, 0xCBEA }, { 0x5C82, 0xC6F1 }, { 0x5C88, 0xE1AC }, { 0x5C8C, 0xE1A7 }, { 0x5C8D, 0xE1A9 }, 
-	{ 0x5C90, 0xE1AA }, { 0x5C91, 0xE1AF }, { 0x5C94, 0xB2ED }, { 0x5C96, 0xE1AB }, { 0x5C97, 0xB8DA }, { 0x5C98, 0xE1AD }, { 0x5C99, 0xE1AE }, { 0x5C9A, 0xE1B0 }, 
-	{ 0x5C9B, 0xB5BA }, { 0x5C9C, 0xE1B1 }, { 0x5CA2, 0xE1B3 }, { 0x5CA3, 0xE1B8 }, { 0x5CA9, 0xD1D2 }, { 0x5CAB, 0xE1B6 }, { 0x5CAC, 0xE1B5 }, { 0x5CAD, 0xC1EB }, 
-	{ 0x5CB1, 0xE1B7 }, { 0x5CB3, 0xD4C0 }, { 0x5CB5, 0xE1B2 }, { 0x5CB7, 0xE1BA }, { 0x5CB8, 0xB0B6 }, { 0x5CBD, 0xE1B4 }, { 0x5CBF, 0xBFF9 }, { 0x5CC1, 0xE1B9 }, 
-	{ 0x5CC4, 0xE1BB }, { 0x5CCB, 0xE1BE }, { 0x5CD2, 0xE1BC }, { 0x5CD9, 0xD6C5 }, { 0x5CE1, 0xCFBF }, { 0x5CE4, 0xE1BD }, { 0x5CE5, 0xE1BF }, { 0x5CE6, 0xC2CD }, 
-	{ 0x5CE8, 0xB6EB }, { 0x5CEA, 0xD3F8 }, { 0x5CED, 0xC7CD }, { 0x5CF0, 0xB7E5 }, { 0x5CFB, 0xBEFE }, { 0x5D02, 0xE1C0 }, { 0x5D03, 0xE1C1 }, { 0x5D06, 0xE1C7 }, 
-	{ 0x5D07, 0xB3E7 }, { 0x5D0E, 0xC6E9 }, { 0x5D14, 0xB4DE }, { 0x5D16, 0xD1C2 }, { 0x5D1B, 0xE1C8 }, { 0x5D1E, 0xE1C6 }, { 0x5D24, 0xE1C5 }, { 0x5D26, 0xE1C3 }, 
-	{ 0x5D27, 0xE1C2 }, { 0x5D29, 0xB1C0 }, { 0x5D2D, 0xD5B8 }, { 0x5D2E, 0xE1C4 }, { 0x5D34, 0xE1CB }, { 0x5D3D, 0xE1CC }, { 0x5D3E, 0xE1CA }, { 0x5D47, 0xEFFA }, 
-	{ 0x5D4A, 0xE1D3 }, { 0x5D4B, 0xE1D2 }, { 0x5D4C, 0xC7B6 }, { 0x5D58, 0xE1C9 }, { 0x5D5B, 0xE1CE }, { 0x5D5D, 0xE1D0 }, { 0x5D69, 0xE1D4 }, { 0x5D6B, 0xE1D1 }, 
-	{ 0x5D6C, 0xE1CD }, { 0x5D6F, 0xE1CF }, { 0x5D74, 0xE1D5 }, { 0x5D82, 0xE1D6 }, { 0x5D99, 0xE1D7 }, { 0x5D9D, 0xE1D8 }, { 0x5DB7, 0xE1DA }, { 0x5DC5, 0xE1DB }, 
-	{ 0x5DCD, 0xCEA1 }, { 0x5DDB, 0xE7DD }, { 0x5DDD, 0xB4A8 }, { 0x5DDE, 0xD6DD }, { 0x5DE1, 0xD1B2 }, { 0x5DE2, 0xB3B2 }, { 0x5DE5, 0xB9A4 }, { 0x5DE6, 0xD7F3 }, 
-	{ 0x5DE7, 0xC7C9 }, { 0x5DE8, 0xBEDE }, { 0x5DE9, 0xB9AE }, { 0x5DEB, 0xCED7 }, { 0x5DEE, 0xB2EE }, { 0x5DEF, 0xDBCF }, { 0x5DF1, 0xBCBA }, { 0x5DF2, 0xD2D1 }, 
-	{ 0x5DF3, 0xCBC8 }, { 0x5DF4, 0xB0CD }, { 0x5DF7, 0xCFEF }, { 0x5DFD, 0xD9E3 }, { 0x5DFE, 0xBDED }, { 0x5E01, 0xB1D2 }, { 0x5E02, 0xCAD0 }, { 0x5E03, 0xB2BC }, 
-	{ 0x5E05, 0xCBA7 }, { 0x5E06, 0xB7AB }, { 0x5E08, 0xCAA6 }, { 0x5E0C, 0xCFA3 }, { 0x5E0F, 0xE0F8 }, { 0x5E10, 0xD5CA }, { 0x5E11, 0xE0FB }, { 0x5E14, 0xE0FA }, 
-	{ 0x5E15, 0xC5C1 }, { 0x5E16, 0xCCFB }, { 0x5E18, 0xC1B1 }, { 0x5E19, 0xE0F9 }, { 0x5E1A, 0xD6E3 }, { 0x5E1B, 0xB2AF }, { 0x5E1C, 0xD6C4 }, { 0x5E1D, 0xB5DB }, 
-	{ 0x5E26, 0xB4F8 }, { 0x5E27, 0xD6A1 }, { 0x5E2D, 0xCFAF }, { 0x5E2E, 0xB0EF }, { 0x5E31, 0xE0FC }, { 0x5E37, 0xE1A1 }, { 0x5E38, 0xB3A3 }, { 0x5E3B, 0xE0FD }, 
-	{ 0x5E3C, 0xE0FE }, { 0x5E3D, 0xC3B1 }, { 0x5E42, 0xC3DD }, { 0x5E44, 0xE1A2 }, { 0x5E45, 0xB7F9 }, { 0x5E4C, 0xBBCF }, { 0x5E54, 0xE1A3 }, { 0x5E55, 0xC4BB }, 
-	{ 0x5E5B, 0xE1A4 }, { 0x5E5E, 0xE1A5 }, { 0x5E61, 0xE1A6 }, { 0x5E62, 0xB4B1 }, { 0x5E72, 0xB8C9 }, { 0x5E73, 0xC6BD }, { 0x5E74, 0xC4EA }, { 0x5E76, 0xB2A2 }, 
-	{ 0x5E78, 0xD0D2 }, { 0x5E7A, 0xE7DB }, { 0x5E7B, 0xBBC3 }, { 0x5E7C, 0xD3D7 }, { 0x5E7D, 0xD3C4 }, { 0x5E7F, 0xB9E3 }, { 0x5E80, 0xE2CF }, { 0x5E84, 0xD7AF }, 
-	{ 0x5E86, 0xC7EC }, { 0x5E87, 0xB1D3 }, { 0x5E8A, 0xB4B2 }, { 0x5E8B, 0xE2D1 }, { 0x5E8F, 0xD0F2 }, { 0x5E90, 0xC2AE }, { 0x5E91, 0xE2D0 }, { 0x5E93, 0xBFE2 }, 
-	{ 0x5E94, 0xD3A6 }, { 0x5E95, 0xB5D7 }, { 0x5E96, 0xE2D2 }, { 0x5E97, 0xB5EA }, { 0x5E99, 0xC3ED }, { 0x5E9A, 0xB8FD }, { 0x5E9C, 0xB8AE }, { 0x5E9E, 0xC5D3 }, 
-	{ 0x5E9F, 0xB7CF }, { 0x5EA0, 0xE2D4 }, { 0x5EA5, 0xE2D3 }, { 0x5EA6, 0xB6C8 }, { 0x5EA7, 0xD7F9 }, { 0x5EAD, 0xCDA5 }, { 0x5EB3, 0xE2D8 }, { 0x5EB5, 0xE2D6 }, 
-	{ 0x5EB6, 0xCAFC }, { 0x5EB7, 0xBFB5 }, { 0x5EB8, 0xD3B9 }, { 0x5EB9, 0xE2D5 }, { 0x5EBE, 0xE2D7 }, { 0x5EC9, 0xC1AE }, { 0x5ECA, 0xC0C8 }, { 0x5ED1, 0xE2DB }, 
-	{ 0x5ED2, 0xE2DA }, { 0x5ED3, 0xC0AA }, { 0x5ED6, 0xC1CE }, { 0x5EDB, 0xE2DC }, { 0x5EE8, 0xE2DD }, { 0x5EEA, 0xE2DE }, { 0x5EF4, 0xDBC8 }, { 0x5EF6, 0xD1D3 }, 
-	{ 0x5EF7, 0xCDA2 }, { 0x5EFA, 0xBDA8 }, { 0x5EFE, 0xDEC3 }, { 0x5EFF, 0xD8A5 }, { 0x5F00, 0xBFAA }, { 0x5F01, 0xDBCD }, { 0x5F02, 0xD2EC }, { 0x5F03, 0xC6FA }, 
-	{ 0x5F04, 0xC5AA }, { 0x5F08, 0xDEC4 }, { 0x5F0A, 0xB1D7 }, { 0x5F0B, 0xDFAE }, { 0x5F0F, 0xCABD }, { 0x5F11, 0xDFB1 }, { 0x5F13, 0xB9AD }, { 0x5F15, 0xD2FD }, 
-	{ 0x5F17, 0xB8A5 }, { 0x5F18, 0xBAEB }, { 0x5F1B, 0xB3DA }, { 0x5F1F, 0xB5DC }, { 0x5F20, 0xD5C5 }, { 0x5F25, 0xC3D6 }, { 0x5F26, 0xCFD2 }, { 0x5F27, 0xBBA1 }, 
-	{ 0x5F29, 0xE5F3 }, { 0x5F2A, 0xE5F2 }, { 0x5F2D, 0xE5F4 }, { 0x5F2F, 0xCDE4 }, { 0x5F31, 0xC8F5 }, { 0x5F39, 0xB5AF }, { 0x5F3A, 0xC7BF }, { 0x5F3C, 0xE5F6 }, 
-	{ 0x5F40, 0xECB0 }, { 0x5F50, 0xE5E6 }, { 0x5F52, 0xB9E9 }, { 0x5F53, 0xB5B1 }, { 0x5F55, 0xC2BC }, { 0x5F56, 0xE5E8 }, { 0x5F57, 0xE5E7 }, { 0x5F58, 0xE5E9 }, 
-	{ 0x5F5D, 0xD2CD }, { 0x5F61, 0xE1EA }, { 0x5F62, 0xD0CE }, { 0x5F64, 0xCDAE }, { 0x5F66, 0xD1E5 }, { 0x5F69, 0xB2CA }, { 0x5F6A, 0xB1EB }, { 0x5F6C, 0xB1F2 }, 
-	{ 0x5F6D, 0xC5ED }, { 0x5F70, 0xD5C3 }, { 0x5F71, 0xD3B0 }, { 0x5F73, 0xE1DC }, { 0x5F77, 0xE1DD }, { 0x5F79, 0xD2DB }, { 0x5F7B, 0xB3B9 }, { 0x5F7C, 0xB1CB }, 
-	{ 0x5F80, 0xCDF9 }, { 0x5F81, 0xD5F7 }, { 0x5F82, 0xE1DE }, { 0x5F84, 0xBEB6 }, { 0x5F85, 0xB4FD }, { 0x5F87, 0xE1DF }, { 0x5F88, 0xBADC }, { 0x5F89, 0xE1E0 }, 
-	{ 0x5F8A, 0xBBB2 }, { 0x5F8B, 0xC2C9 }, { 0x5F8C, 0xE1E1 }, { 0x5F90, 0xD0EC }, { 0x5F92, 0xCDBD }, { 0x5F95, 0xE1E2 }, { 0x5F97, 0xB5C3 }, { 0x5F98, 0xC5C7 }, 
-	{ 0x5F99, 0xE1E3 }, { 0x5F9C, 0xE1E4 }, { 0x5FA1, 0xD3F9 }, { 0x5FA8, 0xE1E5 }, { 0x5FAA, 0xD1AD }, { 0x5FAD, 0xE1E6 }, { 0x5FAE, 0xCEA2 }, { 0x5FB5, 0xE1E7 }, 
-	{ 0x5FB7, 0xB5C2 }, { 0x5FBC, 0xE1E8 }, { 0x5FBD, 0xBBD5 }, { 0x5FC3, 0xD0C4 }, { 0x5FC4, 0xE2E0 }, { 0x5FC5, 0xB1D8 }, { 0x5FC6, 0xD2E4 }, { 0x5FC9, 0xE2E1 }, 
-	{ 0x5FCC, 0xBCC9 }, { 0x5FCD, 0xC8CC }, { 0x5FCF, 0xE2E3 }, { 0x5FD0, 0xECFE }, { 0x5FD1, 0xECFD }, { 0x5FD2, 0xDFAF }, { 0x5FD6, 0xE2E2 }, { 0x5FD7, 0xD6BE }, 
-	{ 0x5FD8, 0xCDFC }, { 0x5FD9, 0xC3A6 }, { 0x5FDD, 0xE3C3 }, { 0x5FE0, 0xD6D2 }, { 0x5FE1, 0xE2E7 }, { 0x5FE4, 0xE2E8 }, { 0x5FE7, 0xD3C7 }, { 0x5FEA, 0xE2EC }, 
-	{ 0x5FEB, 0xBFEC }, { 0x5FED, 0xE2ED }, { 0x5FEE, 0xE2E5 }, { 0x5FF1, 0xB3C0 }, { 0x5FF5, 0xC4EE }, { 0x5FF8, 0xE2EE }, { 0x5FFB, 0xD0C3 }, { 0x5FFD, 0xBAF6 }, 
-	{ 0x5FFE, 0xE2E9 }, { 0x5FFF, 0xB7DE }, { 0x6000, 0xBBB3 }, { 0x6001, 0xCCAC }, { 0x6002, 0xCBCB }, { 0x6003, 0xE2E4 }, { 0x6004, 0xE2E6 }, { 0x6005, 0xE2EA }, 
-	{ 0x6006, 0xE2EB }, { 0x600A, 0xE2F7 }, { 0x600D, 0xE2F4 }, { 0x600E, 0xD4F5 }, { 0x600F, 0xE2F3 }, { 0x6012, 0xC5AD }, { 0x6014, 0xD5FA }, { 0x6015, 0xC5C2 }, 
-	{ 0x6016, 0xB2C0 }, { 0x6019, 0xE2EF }, { 0x601B, 0xE2F2 }, { 0x601C, 0xC1AF }, { 0x601D, 0xCBBC }, { 0x6020, 0xB5A1 }, { 0x6021, 0xE2F9 }, { 0x6025, 0xBCB1 }, 
-	{ 0x6026, 0xE2F1 }, { 0x6027, 0xD0D4 }, { 0x6028, 0xD4B9 }, { 0x6029, 0xE2F5 }, { 0x602A, 0xB9D6 }, { 0x602B, 0xE2F6 }, { 0x602F, 0xC7D3 }, { 0x6035, 0xE2F0 }, 
-	{ 0x603B, 0xD7DC }, { 0x603C, 0xEDA1 }, { 0x603F, 0xE2F8 }, { 0x6041, 0xEDA5 }, { 0x6042, 0xE2FE }, { 0x6043, 0xCAD1 }, { 0x604B, 0xC1B5 }, { 0x604D, 0xBBD0 }, 
-	{ 0x6050, 0xBFD6 }, { 0x6052, 0xBAE3 }, { 0x6055, 0xCBA1 }, { 0x6059, 0xEDA6 }, { 0x605A, 0xEDA3 }, { 0x605D, 0xEDA2 }, { 0x6062, 0xBBD6 }, { 0x6063, 0xEDA7 }, 
-	{ 0x6064, 0xD0F4 }, { 0x6067, 0xEDA4 }, { 0x6068, 0xBADE }, { 0x6069, 0xB6F7 }, { 0x606A, 0xE3A1 }, { 0x606B, 0xB6B2 }, { 0x606C, 0xCCF1 }, { 0x606D, 0xB9A7 }, 
-	{ 0x606F, 0xCFA2 }, { 0x6070, 0xC7A1 }, { 0x6073, 0xBFD2 }, { 0x6076, 0xB6F1 }, { 0x6078, 0xE2FA }, { 0x6079, 0xE2FB }, { 0x607A, 0xE2FD }, { 0x607B, 0xE2FC }, 
-	{ 0x607C, 0xC4D5 }, { 0x607D, 0xE3A2 }, { 0x607F, 0xD3C1 }, { 0x6083, 0xE3A7 }, { 0x6084, 0xC7C4 }, { 0x6089, 0xCFA4 }, { 0x608C, 0xE3A9 }, { 0x608D, 0xBAB7 }, 
-	{ 0x6092, 0xE3A8 }, { 0x6094, 0xBBDA }, { 0x6096, 0xE3A3 }, { 0x609A, 0xE3A4 }, { 0x609B, 0xE3AA }, { 0x609D, 0xE3A6 }, { 0x609F, 0xCEF2 }, { 0x60A0, 0xD3C6 }, 
-	{ 0x60A3, 0xBBBC }, { 0x60A6, 0xD4C3 }, { 0x60A8, 0xC4FA }, { 0x60AB, 0xEDA8 }, { 0x60AC, 0xD0FC }, { 0x60AD, 0xE3A5 }, { 0x60AF, 0xC3F5 }, { 0x60B1, 0xE3AD }, 
-	{ 0x60B2, 0xB1AF }, { 0x60B4, 0xE3B2 }, { 0x60B8, 0xBCC2 }, { 0x60BB, 0xE3AC }, { 0x60BC, 0xB5BF }, { 0x60C5, 0xC7E9 }, { 0x60C6, 0xE3B0 }, { 0x60CA, 0xBEAA }, 
-	{ 0x60CB, 0xCDEF }, { 0x60D1, 0xBBF3 }, { 0x60D5, 0xCCE8 }, { 0x60D8, 0xE3AF }, { 0x60DA, 0xE3B1 }, { 0x60DC, 0xCFA7 }, { 0x60DD, 0xE3AE }, { 0x60DF, 0xCEA9 }, 
-	{ 0x60E0, 0xBBDD }, { 0x60E6, 0xB5EB }, { 0x60E7, 0xBEE5 }, { 0x60E8, 0xB2D2 }, { 0x60E9, 0xB3CD }, { 0x60EB, 0xB1B9 }, { 0x60EC, 0xE3AB }, { 0x60ED, 0xB2D1 }, 
-	{ 0x60EE, 0xB5AC }, { 0x60EF, 0xB9DF }, { 0x60F0, 0xB6E8 }, { 0x60F3, 0xCFEB }, { 0x60F4, 0xE3B7 }, { 0x60F6, 0xBBCC }, { 0x60F9, 0xC8C7 }, { 0x60FA, 0xD0CA }, 
-	{ 0x6100, 0xE3B8 }, { 0x6101, 0xB3EE }, { 0x6106, 0xEDA9 }, { 0x6108, 0xD3FA }, { 0x6109, 0xD3E4 }, { 0x610D, 0xEDAA }, { 0x610E, 0xE3B9 }, { 0x610F, 0xD2E2 }, 
-	{ 0x6115, 0xE3B5 }, { 0x611A, 0xD3DE }, { 0x611F, 0xB8D0 }, { 0x6120, 0xE3B3 }, { 0x6123, 0xE3B6 }, { 0x6124, 0xB7DF }, { 0x6126, 0xE3B4 }, { 0x6127, 0xC0A2 }, 
-	{ 0x612B, 0xE3BA }, { 0x613F, 0xD4B8 }, { 0x6148, 0xB4C8 }, { 0x614A, 0xE3BB }, { 0x614C, 0xBBC5 }, { 0x614E, 0xC9F7 }, { 0x6151, 0xC9E5 }, { 0x6155, 0xC4BD }, 
-	{ 0x615D, 0xEDAB }, { 0x6162, 0xC2FD }, { 0x6167, 0xBBDB }, { 0x6168, 0xBFAE }, { 0x6170, 0xCEBF }, { 0x6175, 0xE3BC }, { 0x6177, 0xBFB6 }, { 0x618B, 0xB1EF }, 
-	{ 0x618E, 0xD4F7 }, { 0x6194, 0xE3BE }, { 0x619D, 0xEDAD }, { 0x61A7, 0xE3BF }, { 0x61A8, 0xBAA9 }, { 0x61A9, 0xEDAC }, { 0x61AC, 0xE3BD }, { 0x61B7, 0xE3C0 }, 
-	{ 0x61BE, 0xBAB6 }, { 0x61C2, 0xB6AE }, { 0x61C8, 0xD0B8 }, { 0x61CA, 0xB0C3 }, { 0x61CB, 0xEDAE }, { 0x61D1, 0xEDAF }, { 0x61D2, 0xC0C1 }, { 0x61D4, 0xE3C1 }, 
-	{ 0x61E6, 0xC5B3 }, { 0x61F5, 0xE3C2 }, { 0x61FF, 0xDCB2 }, { 0x6206, 0xEDB0 }, { 0x6208, 0xB8EA }, { 0x620A, 0xCEEC }, { 0x620B, 0xEAA7 }, { 0x620C, 0xD0E7 }, 
-	{ 0x620D, 0xCAF9 }, { 0x620E, 0xC8D6 }, { 0x620F, 0xCFB7 }, { 0x6210, 0xB3C9 }, { 0x6211, 0xCED2 }, { 0x6212, 0xBDE4 }, { 0x6215, 0xE3DE }, { 0x6216, 0xBBF2 }, 
-	{ 0x6217, 0xEAA8 }, { 0x6218, 0xD5BD }, { 0x621A, 0xC6DD }, { 0x621B, 0xEAA9 }, { 0x621F, 0xEAAA }, { 0x6221, 0xEAAC }, { 0x6222, 0xEAAB }, { 0x6224, 0xEAAE }, 
-	{ 0x6225, 0xEAAD }, { 0x622A, 0xBDD8 }, { 0x622C, 0xEAAF }, { 0x622E, 0xC2BE }, { 0x6233, 0xB4C1 }, { 0x6234, 0xB4F7 }, { 0x6237, 0xBBA7 }, { 0x623D, 0xECE6 }, 
-	{ 0x623E, 0xECE5 }, { 0x623F, 0xB7BF }, { 0x6240, 0xCBF9 }, { 0x6241, 0xB1E2 }, { 0x6243, 0xECE7 }, { 0x6247, 0xC9C8 }, { 0x6248, 0xECE8 }, { 0x6249, 0xECE9 }, 
-	{ 0x624B, 0xCAD6 }, { 0x624C, 0xDED0 }, { 0x624D, 0xB2C5 }, { 0x624E, 0xD4FA }, { 0x6251, 0xC6CB }, { 0x6252, 0xB0C7 }, { 0x6253, 0xB4F2 }, { 0x6254, 0xC8D3 }, 
-	{ 0x6258, 0xCDD0 }, { 0x625B, 0xBFB8 }, { 0x6263, 0xBFDB }, { 0x6266, 0xC7A4 }, { 0x6267, 0xD6B4 }, { 0x6269, 0xC0A9 }, { 0x626A, 0xDED1 }, { 0x626B, 0xC9A8 }, 
-	{ 0x626C, 0xD1EF }, { 0x626D, 0xC5A4 }, { 0x626E, 0xB0E7 }, { 0x626F, 0xB3B6 }, { 0x6270, 0xC8C5 }, { 0x6273, 0xB0E2 }, { 0x6276, 0xB7F6 }, { 0x6279, 0xC5FA }, 
-	{ 0x627C, 0xB6F3 }, { 0x627E, 0xD5D2 }, { 0x627F, 0xB3D0 }, { 0x6280, 0xBCBC }, { 0x6284, 0xB3AD }, { 0x6289, 0xBEF1 }, { 0x628A, 0xB0D1 }, { 0x6291, 0xD2D6 }, 
-	{ 0x6292, 0xCAE3 }, { 0x6293, 0xD7A5 }, { 0x6295, 0xCDB6 }, { 0x6296, 0xB6B6 }, { 0x6297, 0xBFB9 }, { 0x6298, 0xD5DB }, { 0x629A, 0xB8A7 }, { 0x629B, 0xC5D7 }, 
-	{ 0x629F, 0xDED2 }, { 0x62A0, 0xBFD9 }, { 0x62A1, 0xC2D5 }, { 0x62A2, 0xC7C0 }, { 0x62A4, 0xBBA4 }, { 0x62A5, 0xB1A8 }, { 0x62A8, 0xC5EA }, { 0x62AB, 0xC5FB }, 
-	{ 0x62AC, 0xCCA7 }, { 0x62B1, 0xB1A7 }, { 0x62B5, 0xB5D6 }, { 0x62B9, 0xC4A8 }, { 0x62BB, 0xDED3 }, { 0x62BC, 0xD1BA }, { 0x62BD, 0xB3E9 }, { 0x62BF, 0xC3F2 }, 
-	{ 0x62C2, 0xB7F7 }, { 0x62C4, 0xD6F4 }, { 0x62C5, 0xB5A3 }, { 0x62C6, 0xB2F0 }, { 0x62C7, 0xC4B4 }, { 0x62C8, 0xC4E9 }, { 0x62C9, 0xC0AD }, { 0x62CA, 0xDED4 }, 
-	{ 0x62CC, 0xB0E8 }, { 0x62CD, 0xC5C4 }, { 0x62CE, 0xC1E0 }, { 0x62D0, 0xB9D5 }, { 0x62D2, 0xBEDC }, { 0x62D3, 0xCDD8 }, { 0x62D4, 0xB0CE }, { 0x62D6, 0xCDCF }, 
-	{ 0x62D7, 0xDED6 }, { 0x62D8, 0xBED0 }, { 0x62D9, 0xD7BE }, { 0x62DA, 0xDED5 }, { 0x62DB, 0xD5D0 }, { 0x62DC, 0xB0DD }, { 0x62DF, 0xC4E2 }, { 0x62E2, 0xC2A3 }, 
-	{ 0x62E3, 0xBCF0 }, { 0x62E5, 0xD3B5 }, { 0x62E6, 0xC0B9 }, { 0x62E7, 0xC5A1 }, { 0x62E8, 0xB2A6 }, { 0x62E9, 0xD4F1 }, { 0x62EC, 0xC0A8 }, { 0x62ED, 0xCAC3 }, 
-	{ 0x62EE, 0xDED7 }, { 0x62EF, 0xD5FC }, { 0x62F1, 0xB9B0 }, { 0x62F3, 0xC8AD }, { 0x62F4, 0xCBA9 }, { 0x62F6, 0xDED9 }, { 0x62F7, 0xBFBD }, { 0x62FC, 0xC6B4 }, 
-	{ 0x62FD, 0xD7A7 }, { 0x62FE, 0xCAB0 }, { 0x62FF, 0xC4C3 }, { 0x6301, 0xB3D6 }, { 0x6302, 0xB9D2 }, { 0x6307, 0xD6B8 }, { 0x6308, 0xEAFC }, { 0x6309, 0xB0B4 }, 
-	{ 0x630E, 0xBFE6 }, { 0x6311, 0xCCF4 }, { 0x6316, 0xCDDA }, { 0x631A, 0xD6BF }, { 0x631B, 0xC2CE }, { 0x631D, 0xCECE }, { 0x631E, 0xCCA2 }, { 0x631F, 0xD0AE }, 
-	{ 0x6320, 0xC4D3 }, { 0x6321, 0xB5B2 }, { 0x6322, 0xDED8 }, { 0x6323, 0xD5F5 }, { 0x6324, 0xBCB7 }, { 0x6325, 0xBBD3 }, { 0x6328, 0xB0A4 }, { 0x632A, 0xC5B2 }, 
-	{ 0x632B, 0xB4EC }, { 0x632F, 0xD5F1 }, { 0x6332, 0xEAFD }, { 0x6339, 0xDEDA }, { 0x633A, 0xCDA6 }, { 0x633D, 0xCDEC }, { 0x6342, 0xCEE6 }, { 0x6343, 0xDEDC }, 
-	{ 0x6345, 0xCDB1 }, { 0x6346, 0xC0A6 }, { 0x6349, 0xD7BD }, { 0x634B, 0xDEDB }, { 0x634C, 0xB0C6 }, { 0x634D, 0xBAB4 }, { 0x634E, 0xC9D3 }, { 0x634F, 0xC4F3 }, 
-	{ 0x6350, 0xBEE8 }, { 0x6355, 0xB2B6 }, { 0x635E, 0xC0CC }, { 0x635F, 0xCBF0 }, { 0x6361, 0xBCF1 }, { 0x6362, 0xBBBB }, { 0x6363, 0xB5B7 }, { 0x6367, 0xC5F5 }, 
-	{ 0x6369, 0xDEE6 }, { 0x636D, 0xDEE3 }, { 0x636E, 0xBEDD }, { 0x6371, 0xDEDF }, { 0x6376, 0xB4B7 }, { 0x6377, 0xBDDD }, { 0x637A, 0xDEE0 }, { 0x637B, 0xC4ED }, 
-	{ 0x6380, 0xCFC6 }, { 0x6382, 0xB5E0 }, { 0x6387, 0xB6DE }, { 0x6388, 0xCADA }, { 0x6389, 0xB5F4 }, { 0x638A, 0xDEE5 }, { 0x638C, 0xD5C6 }, { 0x638E, 0xDEE1 }, 
-	{ 0x638F, 0xCCCD }, { 0x6390, 0xC6FE }, { 0x6392, 0xC5C5 }, { 0x6396, 0xD2B4 }, { 0x6398, 0xBEF2 }, { 0x63A0, 0xC2D3 }, { 0x63A2, 0xCCBD }, { 0x63A3, 0xB3B8 }, 
-	{ 0x63A5, 0xBDD3 }, { 0x63A7, 0xBFD8 }, { 0x63A8, 0xCDC6 }, { 0x63A9, 0xD1DA }, { 0x63AA, 0xB4EB }, { 0x63AC, 0xDEE4 }, { 0x63AD, 0xDEDD }, { 0x63AE, 0xDEE7 }, 
-	{ 0x63B0, 0xEAFE }, { 0x63B3, 0xC2B0 }, { 0x63B4, 0xDEE2 }, { 0x63B7, 0xD6C0 }, { 0x63B8, 0xB5A7 }, { 0x63BA, 0xB2F4 }, { 0x63BC, 0xDEE8 }, { 0x63BE, 0xDEF2 }, 
-	{ 0x63C4, 0xDEED }, { 0x63C6, 0xDEF1 }, { 0x63C9, 0xC8E0 }, { 0x63CD, 0xD7E1 }, { 0x63CE, 0xDEEF }, { 0x63CF, 0xC3E8 }, { 0x63D0, 0xCCE1 }, { 0x63D2, 0xB2E5 }, 
-	{ 0x63D6, 0xD2BE }, { 0x63DE, 0xDEEE }, { 0x63E0, 0xDEEB }, { 0x63E1, 0xCED5 }, { 0x63E3, 0xB4A7 }, { 0x63E9, 0xBFAB }, { 0x63EA, 0xBEBE }, { 0x63ED, 0xBDD2 }, 
-	{ 0x63F2, 0xDEE9 }, { 0x63F4, 0xD4AE }, { 0x63F6, 0xDEDE }, { 0x63F8, 0xDEEA }, { 0x63FD, 0xC0BF }, { 0x63FF, 0xDEEC }, { 0x6400, 0xB2F3 }, { 0x6401, 0xB8E9 }, 
-	{ 0x6402, 0xC2A7 }, { 0x6405, 0xBDC1 }, { 0x640B, 0xDEF5 }, { 0x640C, 0xDEF8 }, { 0x640F, 0xB2AB }, { 0x6410, 0xB4A4 }, { 0x6413, 0xB4EA }, { 0x6414, 0xC9A6 }, 
-	{ 0x641B, 0xDEF6 }, { 0x641C, 0xCBD1 }, { 0x641E, 0xB8E3 }, { 0x6420, 0xDEF7 }, { 0x6421, 0xDEFA }, { 0x6426, 0xDEF9 }, { 0x642A, 0xCCC2 }, { 0x642C, 0xB0E1 }, 
-	{ 0x642D, 0xB4EE }, { 0x6434, 0xE5BA }, { 0x643A, 0xD0AF }, { 0x643D, 0xB2EB }, { 0x643F, 0xEBA1 }, { 0x6441, 0xDEF4 }, { 0x6444, 0xC9E3 }, { 0x6445, 0xDEF3 }, 
-	{ 0x6446, 0xB0DA }, { 0x6447, 0xD2A1 }, { 0x6448, 0xB1F7 }, { 0x644A, 0xCCAF }, { 0x6452, 0xDEF0 }, { 0x6454, 0xCBA4 }, { 0x6458, 0xD5AA }, { 0x645E, 0xDEFB }, 
-	{ 0x6467, 0xB4DD }, { 0x6469, 0xC4A6 }, { 0x646D, 0xDEFD }, { 0x6478, 0xC3FE }, { 0x6479, 0xC4A1 }, { 0x647A, 0xDFA1 }, { 0x6482, 0xC1CC }, { 0x6484, 0xDEFC }, 
-	{ 0x6485, 0xBEEF }, { 0x6487, 0xC6B2 }, { 0x6491, 0xB3C5 }, { 0x6492, 0xC8F6 }, { 0x6495, 0xCBBA }, { 0x6496, 0xDEFE }, { 0x6499, 0xDFA4 }, { 0x649E, 0xD7B2 }, 
-	{ 0x64A4, 0xB3B7 }, { 0x64A9, 0xC1C3 }, { 0x64AC, 0xC7CB }, { 0x64AD, 0xB2A5 }, { 0x64AE, 0xB4E9 }, { 0x64B0, 0xD7AB }, { 0x64B5, 0xC4EC }, { 0x64B7, 0xDFA2 }, 
-	{ 0x64B8, 0xDFA3 }, { 0x64BA, 0xDFA5 }, { 0x64BC, 0xBAB3 }, { 0x64C0, 0xDFA6 }, { 0x64C2, 0xC0DE }, { 0x64C5, 0xC9C3 }, { 0x64CD, 0xB2D9 }, { 0x64CE, 0xC7E6 }, 
-	{ 0x64D0, 0xDFA7 }, { 0x64D2, 0xC7DC }, { 0x64D7, 0xDFA8 }, { 0x64D8, 0xEBA2 }, { 0x64DE, 0xCBD3 }, { 0x64E2, 0xDFAA }, { 0x64E4, 0xDFA9 }, { 0x64E6, 0xB2C1 }, 
-	{ 0x6500, 0xC5CA }, { 0x6509, 0xDFAB }, { 0x6512, 0xD4DC }, { 0x6518, 0xC8C1 }, { 0x6525, 0xDFAC }, { 0x652B, 0xBEF0 }, { 0x652E, 0xDFAD }, { 0x652F, 0xD6A7 }, 
-	{ 0x6534, 0xEAB7 }, { 0x6535, 0xEBB6 }, { 0x6536, 0xCAD5 }, { 0x6538, 0xD8FC }, { 0x6539, 0xB8C4 }, { 0x653B, 0xB9A5 }, { 0x653E, 0xB7C5 }, { 0x653F, 0xD5FE }, 
-	{ 0x6545, 0xB9CA }, { 0x6548, 0xD0A7 }, { 0x6549, 0xF4CD }, { 0x654C, 0xB5D0 }, { 0x654F, 0xC3F4 }, { 0x6551, 0xBEC8 }, { 0x6555, 0xEBB7 }, { 0x6556, 0xB0BD }, 
-	{ 0x6559, 0xBDCC }, { 0x655B, 0xC1B2 }, { 0x655D, 0xB1D6 }, { 0x655E, 0xB3A8 }, { 0x6562, 0xB8D2 }, { 0x6563, 0xC9A2 }, { 0x6566, 0xB6D8 }, { 0x656B, 0xEBB8 }, 
-	{ 0x656C, 0xBEB4 }, { 0x6570, 0xCAFD }, { 0x6572, 0xC7C3 }, { 0x6574, 0xD5FB }, { 0x6577, 0xB7F3 }, { 0x6587, 0xCEC4 }, { 0x658B, 0xD5AB }, { 0x658C, 0xB1F3 }, 
-	{ 0x6590, 0xECB3 }, { 0x6591, 0xB0DF }, { 0x6593, 0xECB5 }, { 0x6597, 0xB6B7 }, { 0x6599, 0xC1CF }, { 0x659B, 0xF5FA }, { 0x659C, 0xD0B1 }, { 0x659F, 0xD5E5 }, 
-	{ 0x65A1, 0xCED3 }, { 0x65A4, 0xBDEF }, { 0x65A5, 0xB3E2 }, { 0x65A7, 0xB8AB }, { 0x65A9, 0xD5B6 }, { 0x65AB, 0xEDBD }, { 0x65AD, 0xB6CF }, { 0x65AF, 0xCBB9 }, 
-	{ 0x65B0, 0xD0C2 }, { 0x65B9, 0xB7BD }, { 0x65BC, 0xECB6 }, { 0x65BD, 0xCAA9 }, { 0x65C1, 0xC5D4 }, { 0x65C3, 0xECB9 }, { 0x65C4, 0xECB8 }, { 0x65C5, 0xC2C3 }, 
-	{ 0x65C6, 0xECB7 }, { 0x65CB, 0xD0FD }, { 0x65CC, 0xECBA }, { 0x65CE, 0xECBB }, { 0x65CF, 0xD7E5 }, { 0x65D2, 0xECBC }, { 0x65D6, 0xECBD }, { 0x65D7, 0xC6EC }, 
-	{ 0x65E0, 0xCEDE }, { 0x65E2, 0xBCC8 }, { 0x65E5, 0xC8D5 }, { 0x65E6, 0xB5A9 }, { 0x65E7, 0xBEC9 }, { 0x65E8, 0xD6BC }, { 0x65E9, 0xD4E7 }, { 0x65EC, 0xD1AE }, 
-	{ 0x65ED, 0xD0F1 }, { 0x65EE, 0xEAB8 }, { 0x65EF, 0xEAB9 }, { 0x65F0, 0xEABA }, { 0x65F1, 0xBAB5 }, { 0x65F6, 0xCAB1 }, { 0x65F7, 0xBFF5 }, { 0x65FA, 0xCDFA }, 
-	{ 0x6600, 0xEAC0 }, { 0x6602, 0xB0BA }, { 0x6603, 0xEABE }, { 0x6606, 0xC0A5 }, { 0x660A, 0xEABB }, { 0x660C, 0xB2FD }, { 0x660E, 0xC3F7 }, { 0x660F, 0xBBE8 }, 
-	{ 0x6613, 0xD2D7 }, { 0x6614, 0xCEF4 }, { 0x6615, 0xEABF }, { 0x6619, 0xEABC }, { 0x661D, 0xEAC3 }, { 0x661F, 0xD0C7 }, { 0x6620, 0xD3B3 }, { 0x6625, 0xB4BA }, 
-	{ 0x6627, 0xC3C1 }, { 0x6628, 0xD7F2 }, { 0x662D, 0xD5D1 }, { 0x662F, 0xCAC7 }, { 0x6631, 0xEAC5 }, { 0x6634, 0xEAC4 }, { 0x6635, 0xEAC7 }, { 0x6636, 0xEAC6 }, 
-	{ 0x663C, 0xD6E7 }, { 0x663E, 0xCFD4 }, { 0x6641, 0xEACB }, { 0x6643, 0xBBCE }, { 0x664B, 0xBDFA }, { 0x664C, 0xC9CE }, { 0x664F, 0xEACC }, { 0x6652, 0xC9B9 }, 
-	{ 0x6653, 0xCFFE }, { 0x6654, 0xEACA }, { 0x6655, 0xD4CE }, { 0x6656, 0xEACD }, { 0x6657, 0xEACF }, { 0x665A, 0xCDED }, { 0x665F, 0xEAC9 }, { 0x6661, 0xEACE }, 
-	{ 0x6664, 0xCEEE }, { 0x6666, 0xBBDE }, { 0x6668, 0xB3BF }, { 0x666E, 0xC6D5 }, { 0x666F, 0xBEB0 }, { 0x6670, 0xCEFA }, { 0x6674, 0xC7E7 }, { 0x6676, 0xBEA7 }, 
-	{ 0x6677, 0xEAD0 }, { 0x667A, 0xD6C7 }, { 0x667E, 0xC1C0 }, { 0x6682, 0xD4DD }, { 0x6684, 0xEAD1 }, { 0x6687, 0xCFBE }, { 0x668C, 0xEAD2 }, { 0x6691, 0xCAEE }, 
-	{ 0x6696, 0xC5AF }, { 0x6697, 0xB0B5 }, { 0x669D, 0xEAD4 }, { 0x66A7, 0xEAD3 }, { 0x66A8, 0xF4DF }, { 0x66AE, 0xC4BA }, { 0x66B4, 0xB1A9 }, { 0x66B9, 0xE5DF }, 
-	{ 0x66BE, 0xEAD5 }, { 0x66D9, 0xCAEF }, { 0x66DB, 0xEAD6 }, { 0x66DC, 0xEAD7 }, { 0x66DD, 0xC6D8 }, { 0x66E6, 0xEAD8 }, { 0x66E9, 0xEAD9 }, { 0x66F0, 0xD4BB }, 
-	{ 0x66F2, 0xC7FA }, { 0x66F3, 0xD2B7 }, { 0x66F4, 0xB8FC }, { 0x66F7, 0xEAC2 }, { 0x66F9, 0xB2DC }, { 0x66FC, 0xC2FC }, { 0x66FE, 0xD4F8 }, { 0x66FF, 0xCCE6 }, 
-	{ 0x6700, 0xD7EE }, { 0x6708, 0xD4C2 }, { 0x6709, 0xD3D0 }, { 0x670A, 0xEBC3 }, { 0x670B, 0xC5F3 }, { 0x670D, 0xB7FE }, { 0x6710, 0xEBD4 }, { 0x6714, 0xCBB7 }, 
-	{ 0x6715, 0xEBDE }, { 0x6717, 0xC0CA }, { 0x671B, 0xCDFB }, { 0x671D, 0xB3AF }, { 0x671F, 0xC6DA }, { 0x6726, 0xEBFC }, { 0x6728, 0xC4BE }, { 0x672A, 0xCEB4 }, 
-	{ 0x672B, 0xC4A9 }, { 0x672C, 0xB1BE }, { 0x672D, 0xD4FD }, { 0x672F, 0xCAF5 }, { 0x6731, 0xD6EC }, { 0x6734, 0xC6D3 }, { 0x6735, 0xB6E4 }, { 0x673A, 0xBBFA }, 
-	{ 0x673D, 0xD0E0 }, { 0x6740, 0xC9B1 }, { 0x6742, 0xD4D3 }, { 0x6743, 0xC8A8 }, { 0x6746, 0xB8CB }, { 0x6748, 0xE8BE }, { 0x6749, 0xC9BC }, { 0x674C, 0xE8BB }, 
-	{ 0x674E, 0xC0EE }, { 0x674F, 0xD0D3 }, { 0x6750, 0xB2C4 }, { 0x6751, 0xB4E5 }, { 0x6753, 0xE8BC }, { 0x6756, 0xD5C8 }, { 0x675C, 0xB6C5 }, { 0x675E, 0xE8BD }, 
-	{ 0x675F, 0xCAF8 }, { 0x6760, 0xB8DC }, { 0x6761, 0xCCF5 }, { 0x6765, 0xC0B4 }, { 0x6768, 0xD1EE }, { 0x6769, 0xE8BF }, { 0x676A, 0xE8C2 }, { 0x676D, 0xBABC }, 
-	{ 0x676F, 0xB1AD }, { 0x6770, 0xBDDC }, { 0x6772, 0xEABD }, { 0x6773, 0xE8C3 }, { 0x6775, 0xE8C6 }, { 0x6777, 0xE8CB }, { 0x677C, 0xE8CC }, { 0x677E, 0xCBC9 }, 
-	{ 0x677F, 0xB0E5 }, { 0x6781, 0xBCAB }, { 0x6784, 0xB9B9 }, { 0x6787, 0xE8C1 }, { 0x6789, 0xCDF7 }, { 0x678B, 0xE8CA }, { 0x6790, 0xCEF6 }, { 0x6795, 0xD5ED }, 
-	{ 0x6797, 0xC1D6 }, { 0x6798, 0xE8C4 }, { 0x679A, 0xC3B6 }, { 0x679C, 0xB9FB }, { 0x679D, 0xD6A6 }, { 0x679E, 0xE8C8 }, { 0x67A2, 0xCAE0 }, { 0x67A3, 0xD4E6 }, 
-	{ 0x67A5, 0xE8C0 }, { 0x67A7, 0xE8C5 }, { 0x67A8, 0xE8C7 }, { 0x67AA, 0xC7B9 }, { 0x67AB, 0xB7E3 }, { 0x67AD, 0xE8C9 }, { 0x67AF, 0xBFDD }, { 0x67B0, 0xE8D2 }, 
-	{ 0x67B3, 0xE8D7 }, { 0x67B5, 0xE8D5 }, { 0x67B6, 0xBCDC }, { 0x67B7, 0xBCCF }, { 0x67B8, 0xE8DB }, { 0x67C1, 0xE8DE }, { 0x67C3, 0xE8DA }, { 0x67C4, 0xB1FA }, 
-	{ 0x67CF, 0xB0D8 }, { 0x67D0, 0xC4B3 }, { 0x67D1, 0xB8CC }, { 0x67D2, 0xC6E2 }, { 0x67D3, 0xC8BE }, { 0x67D4, 0xC8E1 }, { 0x67D8, 0xE8CF }, { 0x67D9, 0xE8D4 }, 
-	{ 0x67DA, 0xE8D6 }, { 0x67DC, 0xB9F1 }, { 0x67DD, 0xE8D8 }, { 0x67DE, 0xD7F5 }, { 0x67E0, 0xC4FB }, { 0x67E2, 0xE8DC }, { 0x67E5, 0xB2E9 }, { 0x67E9, 0xE8D1 }, 
-	{ 0x67EC, 0xBCED }, { 0x67EF, 0xBFC2 }, { 0x67F0, 0xE8CD }, { 0x67F1, 0xD6F9 }, { 0x67F3, 0xC1F8 }, { 0x67F4, 0xB2F1 }, { 0x67FD, 0xE8DF }, { 0x67FF, 0xCAC1 }, 
-	{ 0x6800, 0xE8D9 }, { 0x6805, 0xD5A4 }, { 0x6807, 0xB1EA }, { 0x6808, 0xD5BB }, { 0x6809, 0xE8CE }, { 0x680A, 0xE8D0 }, { 0x680B, 0xB6B0 }, { 0x680C, 0xE8D3 }, 
-	{ 0x680E, 0xE8DD }, { 0x680F, 0xC0B8 }, { 0x6811, 0xCAF7 }, { 0x6813, 0xCBA8 }, { 0x6816, 0xC6DC }, { 0x6817, 0xC0F5 }, { 0x681D, 0xE8E9 }, { 0x6821, 0xD0A3 }, 
-	{ 0x6829, 0xE8F2 }, { 0x682A, 0xD6EA }, { 0x6832, 0xE8E0 }, { 0x6833, 0xE8E1 }, { 0x6837, 0xD1F9 }, { 0x6838, 0xBACB }, { 0x6839, 0xB8F9 }, { 0x683C, 0xB8F1 }, 
-	{ 0x683D, 0xD4D4 }, { 0x683E, 0xE8EF }, { 0x6840, 0xE8EE }, { 0x6841, 0xE8EC }, { 0x6842, 0xB9F0 }, { 0x6843, 0xCCD2 }, { 0x6844, 0xE8E6 }, { 0x6845, 0xCEA6 }, 
-	{ 0x6846, 0xBFF2 }, { 0x6848, 0xB0B8 }, { 0x6849, 0xE8F1 }, { 0x684A, 0xE8F0 }, { 0x684C, 0xD7C0 }, { 0x684E, 0xE8E4 }, { 0x6850, 0xCDA9 }, { 0x6851, 0xC9A3 }, 
-	{ 0x6853, 0xBBB8 }, { 0x6854, 0xBDDB }, { 0x6855, 0xE8EA }, { 0x6860, 0xE8E2 }, { 0x6861, 0xE8E3 }, { 0x6862, 0xE8E5 }, { 0x6863, 0xB5B5 }, { 0x6864, 0xE8E7 }, 
-	{ 0x6865, 0xC7C5 }, { 0x6866, 0xE8EB }, { 0x6867, 0xE8ED }, { 0x6868, 0xBDB0 }, { 0x6869, 0xD7AE }, { 0x686B, 0xE8F8 }, { 0x6874, 0xE8F5 }, { 0x6876, 0xCDB0 }, 
-	{ 0x6877, 0xE8F6 }, { 0x6881, 0xC1BA }, { 0x6883, 0xE8E8 }, { 0x6885, 0xC3B7 }, { 0x6886, 0xB0F0 }, { 0x688F, 0xE8F4 }, { 0x6893, 0xE8F7 }, { 0x6897, 0xB9A3 }, 
-	{ 0x68A2, 0xC9D2 }, { 0x68A6, 0xC3CE }, { 0x68A7, 0xCEE0 }, { 0x68A8, 0xC0E6 }, { 0x68AD, 0xCBF3 }, { 0x68AF, 0xCCDD }, { 0x68B0, 0xD0B5 }, { 0x68B3, 0xCAE1 }, 
-	{ 0x68B5, 0xE8F3 }, { 0x68C0, 0xBCEC }, { 0x68C2, 0xE8F9 }, { 0x68C9, 0xC3DE }, { 0x68CB, 0xC6E5 }, { 0x68CD, 0xB9F7 }, { 0x68D2, 0xB0F4 }, { 0x68D5, 0xD7D8 }, 
-	{ 0x68D8, 0xBCAC }, { 0x68DA, 0xC5EF }, { 0x68E0, 0xCCC4 }, { 0x68E3, 0xE9A6 }, { 0x68EE, 0xC9AD }, { 0x68F0, 0xE9A2 }, { 0x68F1, 0xC0E2 }, { 0x68F5, 0xBFC3 }, 
-	{ 0x68F9, 0xE8FE }, { 0x68FA, 0xB9D7 }, { 0x68FC, 0xE8FB }, { 0x6901, 0xE9A4 }, { 0x6905, 0xD2CE }, { 0x690B, 0xE9A3 }, { 0x690D, 0xD6B2 }, { 0x690E, 0xD7B5 }, 
-	{ 0x6910, 0xE9A7 }, { 0x6912, 0xBDB7 }, { 0x691F, 0xE8FC }, { 0x6920, 0xE8FD }, { 0x6924, 0xE9A1 }, { 0x692D, 0xCDD6 }, { 0x6930, 0xD2AC }, { 0x6934, 0xE9B2 }, 
-	{ 0x6939, 0xE9A9 }, { 0x693D, 0xB4AA }, { 0x693F, 0xB4BB }, { 0x6942, 0xE9AB }, { 0x6954, 0xD0A8 }, { 0x6957, 0xE9A5 }, { 0x695A, 0xB3FE }, { 0x695D, 0xE9AC }, 
-	{ 0x695E, 0xC0E3 }, { 0x6960, 0xE9AA }, { 0x6963, 0xE9B9 }, { 0x6966, 0xE9B8 }, { 0x696B, 0xE9AE }, { 0x696E, 0xE8FA }, { 0x6971, 0xE9A8 }, { 0x6977, 0xBFAC }, 
-	{ 0x6978, 0xE9B1 }, { 0x6979, 0xE9BA }, { 0x697C, 0xC2A5 }, { 0x6980, 0xE9AF }, { 0x6982, 0xB8C5 }, { 0x6984, 0xE9AD }, { 0x6986, 0xD3DC }, { 0x6987, 0xE9B4 }, 
-	{ 0x6988, 0xE9B5 }, { 0x6989, 0xE9B7 }, { 0x698D, 0xE9C7 }, { 0x6994, 0xC0C6 }, { 0x6995, 0xE9C5 }, { 0x6998, 0xE9B0 }, { 0x699B, 0xE9BB }, { 0x699C, 0xB0F1 }, 
-	{ 0x69A7, 0xE9BC }, { 0x69A8, 0xD5A5 }, { 0x69AB, 0xE9BE }, { 0x69AD, 0xE9BF }, { 0x69B1, 0xE9C1 }, { 0x69B4, 0xC1F1 }, { 0x69B7, 0xC8B6 }, { 0x69BB, 0xE9BD }, 
-	{ 0x69C1, 0xE9C2 }, { 0x69CA, 0xE9C3 }, { 0x69CC, 0xE9B3 }, { 0x69CE, 0xE9B6 }, { 0x69D0, 0xBBB1 }, { 0x69D4, 0xE9C0 }, { 0x69DB, 0xBCF7 }, { 0x69DF, 0xE9C4 }, 
-	{ 0x69E0, 0xE9C6 }, { 0x69ED, 0xE9CA }, { 0x69F2, 0xE9CE }, { 0x69FD, 0xB2DB }, { 0x69FF, 0xE9C8 }, { 0x6A0A, 0xB7AE }, { 0x6A17, 0xE9CB }, { 0x6A18, 0xE9CC }, 
-	{ 0x6A1F, 0xD5C1 }, { 0x6A21, 0xC4A3 }, { 0x6A28, 0xE9D8 }, { 0x6A2A, 0xBAE1 }, { 0x6A2F, 0xE9C9 }, { 0x6A31, 0xD3A3 }, { 0x6A35, 0xE9D4 }, { 0x6A3D, 0xE9D7 }, 
-	{ 0x6A3E, 0xE9D0 }, { 0x6A44, 0xE9CF }, { 0x6A47, 0xC7C1 }, { 0x6A50, 0xE9D2 }, { 0x6A58, 0xE9D9 }, { 0x6A59, 0xB3C8 }, { 0x6A5B, 0xE9D3 }, { 0x6A61, 0xCFF0 }, 
-	{ 0x6A65, 0xE9CD }, { 0x6A71, 0xB3F7 }, { 0x6A79, 0xE9D6 }, { 0x6A7C, 0xE9DA }, { 0x6A80, 0xCCB4 }, { 0x6A84, 0xCFAD }, { 0x6A8E, 0xE9D5 }, { 0x6A90, 0xE9DC }, 
-	{ 0x6A91, 0xE9DB }, { 0x6A97, 0xE9DE }, { 0x6AA0, 0xE9D1 }, { 0x6AA9, 0xE9DD }, { 0x6AAB, 0xE9DF }, { 0x6AAC, 0xC3CA }, { 0x6B20, 0xC7B7 }, { 0x6B21, 0xB4CE }, 
-	{ 0x6B22, 0xBBB6 }, { 0x6B23, 0xD0C0 }, { 0x6B24, 0xECA3 }, { 0x6B27, 0xC5B7 }, { 0x6B32, 0xD3FB }, { 0x6B37, 0xECA4 }, { 0x6B39, 0xECA5 }, { 0x6B3A, 0xC6DB }, 
-	{ 0x6B3E, 0xBFEE }, { 0x6B43, 0xECA6 }, { 0x6B46, 0xECA7 }, { 0x6B47, 0xD0AA }, { 0x6B49, 0xC7B8 }, { 0x6B4C, 0xB8E8 }, { 0x6B59, 0xECA8 }, { 0x6B62, 0xD6B9 }, 
-	{ 0x6B63, 0xD5FD }, { 0x6B64, 0xB4CB }, { 0x6B65, 0xB2BD }, { 0x6B66, 0xCEE4 }, { 0x6B67, 0xC6E7 }, { 0x6B6A, 0xCDE1 }, { 0x6B79, 0xB4F5 }, { 0x6B7B, 0xCBC0 }, 
-	{ 0x6B7C, 0xBCDF }, { 0x6B81, 0xE9E2 }, { 0x6B82, 0xE9E3 }, { 0x6B83, 0xD1EA }, { 0x6B84, 0xE9E5 }, { 0x6B86, 0xB4F9 }, { 0x6B87, 0xE9E4 }, { 0x6B89, 0xD1B3 }, 
-	{ 0x6B8A, 0xCAE2 }, { 0x6B8B, 0xB2D0 }, { 0x6B8D, 0xE9E8 }, { 0x6B92, 0xE9E6 }, { 0x6B93, 0xE9E7 }, { 0x6B96, 0xD6B3 }, { 0x6B9A, 0xE9E9 }, { 0x6B9B, 0xE9EA }, 
-	{ 0x6BA1, 0xE9EB }, { 0x6BAA, 0xE9EC }, { 0x6BB3, 0xECAF }, { 0x6BB4, 0xC5B9 }, { 0x6BB5, 0xB6CE }, { 0x6BB7, 0xD2F3 }, { 0x6BBF, 0xB5EE }, { 0x6BC1, 0xBBD9 }, 
-	{ 0x6BC2, 0xECB1 }, { 0x6BC5, 0xD2E3 }, { 0x6BCB, 0xCEE3 }, { 0x6BCD, 0xC4B8 }, { 0x6BCF, 0xC3BF }, { 0x6BD2, 0xB6BE }, { 0x6BD3, 0xD8B9 }, { 0x6BD4, 0xB1C8 }, 
-	{ 0x6BD5, 0xB1CF }, { 0x6BD6, 0xB1D1 }, { 0x6BD7, 0xC5FE }, { 0x6BD9, 0xB1D0 }, { 0x6BDB, 0xC3AB }, { 0x6BE1, 0xD5B1 }, { 0x6BEA, 0xEBA4 }, { 0x6BEB, 0xBAC1 }, 
-	{ 0x6BEF, 0xCCBA }, { 0x6BF3, 0xEBA5 }, { 0x6BF5, 0xEBA7 }, { 0x6BF9, 0xEBA8 }, { 0x6BFD, 0xEBA6 }, { 0x6C05, 0xEBA9 }, { 0x6C06, 0xEBAB }, { 0x6C07, 0xEBAA }, 
-	{ 0x6C0D, 0xEBAC }, { 0x6C0F, 0xCACF }, { 0x6C10, 0xD8B5 }, { 0x6C11, 0xC3F1 }, { 0x6C13, 0xC3A5 }, { 0x6C14, 0xC6F8 }, { 0x6C15, 0xEBAD }, { 0x6C16, 0xC4CA }, 
-	{ 0x6C18, 0xEBAE }, { 0x6C19, 0xEBAF }, { 0x6C1A, 0xEBB0 }, { 0x6C1B, 0xB7D5 }, { 0x6C1F, 0xB7FA }, { 0x6C21, 0xEBB1 }, { 0x6C22, 0xC7E2 }, { 0x6C24, 0xEBB3 }, 
-	{ 0x6C26, 0xBAA4 }, { 0x6C27, 0xD1F5 }, { 0x6C28, 0xB0B1 }, { 0x6C29, 0xEBB2 }, { 0x6C2A, 0xEBB4 }, { 0x6C2E, 0xB5AA }, { 0x6C2F, 0xC2C8 }, { 0x6C30, 0xC7E8 }, 
-	{ 0x6C32, 0xEBB5 }, { 0x6C34, 0xCBAE }, { 0x6C35, 0xE3DF }, { 0x6C38, 0xD3C0 }, { 0x6C3D, 0xD9DB }, { 0x6C40, 0xCDA1 }, { 0x6C41, 0xD6AD }, { 0x6C42, 0xC7F3 }, 
-	{ 0x6C46, 0xD9E0 }, { 0x6C47, 0xBBE3 }, { 0x6C49, 0xBABA }, { 0x6C4A, 0xE3E2 }, { 0x6C50, 0xCFAB }, { 0x6C54, 0xE3E0 }, { 0x6C55, 0xC9C7 }, { 0x6C57, 0xBAB9 }, 
-	{ 0x6C5B, 0xD1B4 }, { 0x6C5C, 0xE3E1 }, { 0x6C5D, 0xC8EA }, { 0x6C5E, 0xB9AF }, { 0x6C5F, 0xBDAD }, { 0x6C60, 0xB3D8 }, { 0x6C61, 0xCEDB }, { 0x6C64, 0xCCC0 }, 
-	{ 0x6C68, 0xE3E8 }, { 0x6C69, 0xE3E9 }, { 0x6C6A, 0xCDF4 }, { 0x6C70, 0xCCAD }, { 0x6C72, 0xBCB3 }, { 0x6C74, 0xE3EA }, { 0x6C76, 0xE3EB }, { 0x6C79, 0xD0DA }, 
-	{ 0x6C7D, 0xC6FB }, { 0x6C7E, 0xB7DA }, { 0x6C81, 0xC7DF }, { 0x6C82, 0xD2CA }, { 0x6C83, 0xCED6 }, { 0x6C85, 0xE3E4 }, { 0x6C86, 0xE3EC }, { 0x6C88, 0xC9F2 }, 
-	{ 0x6C89, 0xB3C1 }, { 0x6C8C, 0xE3E7 }, { 0x6C8F, 0xC6E3 }, { 0x6C90, 0xE3E5 }, { 0x6C93, 0xEDB3 }, { 0x6C94, 0xE3E6 }, { 0x6C99, 0xC9B3 }, { 0x6C9B, 0xC5E6 }, 
-	{ 0x6C9F, 0xB9B5 }, { 0x6CA1, 0xC3BB }, { 0x6CA3, 0xE3E3 }, { 0x6CA4, 0xC5BD }, { 0x6CA5, 0xC1A4 }, { 0x6CA6, 0xC2D9 }, { 0x6CA7, 0xB2D7 }, { 0x6CA9, 0xE3ED }, 
-	{ 0x6CAA, 0xBBA6 }, { 0x6CAB, 0xC4AD }, { 0x6CAD, 0xE3F0 }, { 0x6CAE, 0xBEDA }, { 0x6CB1, 0xE3FB }, { 0x6CB2, 0xE3F5 }, { 0x6CB3, 0xBAD3 }, { 0x6CB8, 0xB7D0 }, 
-	{ 0x6CB9, 0xD3CD }, { 0x6CBB, 0xD6CE }, { 0x6CBC, 0xD5D3 }, { 0x6CBD, 0xB9C1 }, { 0x6CBE, 0xD5B4 }, { 0x6CBF, 0xD1D8 }, { 0x6CC4, 0xD0B9 }, { 0x6CC5, 0xC7F6 }, 
-	{ 0x6CC9, 0xC8AA }, { 0x6CCA, 0xB2B4 }, { 0x6CCC, 0xC3DA }, { 0x6CD0, 0xE3EE }, { 0x6CD3, 0xE3FC }, { 0x6CD4, 0xE3EF }, { 0x6CD5, 0xB7A8 }, { 0x6CD6, 0xE3F7 }, 
-	{ 0x6CD7, 0xE3F4 }, { 0x6CDB, 0xB7BA }, { 0x6CDE, 0xC5A2 }, { 0x6CE0, 0xE3F6 }, { 0x6CE1, 0xC5DD }, { 0x6CE2, 0xB2A8 }, { 0x6CE3, 0xC6FC }, { 0x6CE5, 0xC4E0 }, 
-	{ 0x6CE8, 0xD7A2 }, { 0x6CEA, 0xC0E1 }, { 0x6CEB, 0xE3F9 }, { 0x6CEE, 0xE3FA }, { 0x6CEF, 0xE3FD }, { 0x6CF0, 0xCCA9 }, { 0x6CF1, 0xE3F3 }, { 0x6CF3, 0xD3BE }, 
-	{ 0x6CF5, 0xB1C3 }, { 0x6CF6, 0xEDB4 }, { 0x6CF7, 0xE3F1 }, { 0x6CF8, 0xE3F2 }, { 0x6CFA, 0xE3F8 }, { 0x6CFB, 0xD0BA }, { 0x6CFC, 0xC6C3 }, { 0x6CFD, 0xD4F3 }, 
-	{ 0x6CFE, 0xE3FE }, { 0x6D01, 0xBDE0 }, { 0x6D04, 0xE4A7 }, { 0x6D07, 0xE4A6 }, { 0x6D0B, 0xD1F3 }, { 0x6D0C, 0xE4A3 }, { 0x6D0E, 0xE4A9 }, { 0x6D12, 0xC8F7 }, 
-	{ 0x6D17, 0xCFB4 }, { 0x6D19, 0xE4A8 }, { 0x6D1A, 0xE4AE }, { 0x6D1B, 0xC2E5 }, { 0x6D1E, 0xB6B4 }, { 0x6D25, 0xBDF2 }, { 0x6D27, 0xE4A2 }, { 0x6D2A, 0xBAE9 }, 
-	{ 0x6D2B, 0xE4AA }, { 0x6D2E, 0xE4AC }, { 0x6D31, 0xB6FD }, { 0x6D32, 0xD6DE }, { 0x6D33, 0xE4B2 }, { 0x6D35, 0xE4AD }, { 0x6D39, 0xE4A1 }, { 0x6D3B, 0xBBEE }, 
-	{ 0x6D3C, 0xCDDD }, { 0x6D3D, 0xC7A2 }, { 0x6D3E, 0xC5C9 }, { 0x6D41, 0xC1F7 }, { 0x6D43, 0xE4A4 }, { 0x6D45, 0xC7B3 }, { 0x6D46, 0xBDAC }, { 0x6D47, 0xBDBD }, 
-	{ 0x6D48, 0xE4A5 }, { 0x6D4A, 0xD7C7 }, { 0x6D4B, 0xB2E2 }, { 0x6D4D, 0xE4AB }, { 0x6D4E, 0xBCC3 }, { 0x6D4F, 0xE4AF }, { 0x6D51, 0xBBEB }, { 0x6D52, 0xE4B0 }, 
-	{ 0x6D53, 0xC5A8 }, { 0x6D54, 0xE4B1 }, { 0x6D59, 0xD5E3 }, { 0x6D5A, 0xBFA3 }, { 0x6D5C, 0xE4BA }, { 0x6D5E, 0xE4B7 }, { 0x6D60, 0xE4BB }, { 0x6D63, 0xE4BD }, 
-	{ 0x6D66, 0xC6D6 }, { 0x6D69, 0xBAC6 }, { 0x6D6A, 0xC0CB }, { 0x6D6E, 0xB8A1 }, { 0x6D6F, 0xE4B4 }, { 0x6D74, 0xD4A1 }, { 0x6D77, 0xBAA3 }, { 0x6D78, 0xBDFE }, 
-	{ 0x6D7C, 0xE4BC }, { 0x6D82, 0xCDBF }, { 0x6D85, 0xC4F9 }, { 0x6D88, 0xCFFB }, { 0x6D89, 0xC9E6 }, { 0x6D8C, 0xD3BF }, { 0x6D8E, 0xCFD1 }, { 0x6D91, 0xE4B3 }, 
-	{ 0x6D93, 0xE4B8 }, { 0x6D94, 0xE4B9 }, { 0x6D95, 0xCCE9 }, { 0x6D9B, 0xCCCE }, { 0x6D9D, 0xC0D4 }, { 0x6D9E, 0xE4B5 }, { 0x6D9F, 0xC1B0 }, { 0x6DA0, 0xE4B6 }, 
-	{ 0x6DA1, 0xCED0 }, { 0x6DA3, 0xBBC1 }, { 0x6DA4, 0xB5D3 }, { 0x6DA6, 0xC8F3 }, { 0x6DA7, 0xBDA7 }, { 0x6DA8, 0xD5C7 }, { 0x6DA9, 0xC9AC }, { 0x6DAA, 0xB8A2 }, 
-	{ 0x6DAB, 0xE4CA }, { 0x6DAE, 0xE4CC }, { 0x6DAF, 0xD1C4 }, { 0x6DB2, 0xD2BA }, { 0x6DB5, 0xBAAD }, { 0x6DB8, 0xBAD4 }, { 0x6DBF, 0xE4C3 }, { 0x6DC0, 0xB5ED }, 
-	{ 0x6DC4, 0xD7CD }, { 0x6DC5, 0xE4C0 }, { 0x6DC6, 0xCFFD }, { 0x6DC7, 0xE4BF }, { 0x6DCB, 0xC1DC }, { 0x6DCC, 0xCCCA }, { 0x6DD1, 0xCAE7 }, { 0x6DD6, 0xC4D7 }, 
-	{ 0x6DD8, 0xCCD4 }, { 0x6DD9, 0xE4C8 }, { 0x6DDD, 0xE4C7 }, { 0x6DDE, 0xE4C1 }, { 0x6DE0, 0xE4C4 }, { 0x6DE1, 0xB5AD }, { 0x6DE4, 0xD3D9 }, { 0x6DE6, 0xE4C6 }, 
-	{ 0x6DEB, 0xD2F9 }, { 0x6DEC, 0xB4E3 }, { 0x6DEE, 0xBBB4 }, { 0x6DF1, 0xC9EE }, { 0x6DF3, 0xB4BE }, { 0x6DF7, 0xBBEC }, { 0x6DF9, 0xD1CD }, { 0x6DFB, 0xCCED }, 
-	{ 0x6DFC, 0xEDB5 }, { 0x6E05, 0xC7E5 }, { 0x6E0A, 0xD4A8 }, { 0x6E0C, 0xE4CB }, { 0x6E0D, 0xD7D5 }, { 0x6E0E, 0xE4C2 }, { 0x6E10, 0xBDA5 }, { 0x6E11, 0xE4C5 }, 
-	{ 0x6E14, 0xD3E6 }, { 0x6E16, 0xE4C9 }, { 0x6E17, 0xC9F8 }, { 0x6E1A, 0xE4BE }, { 0x6E1D, 0xD3E5 }, { 0x6E20, 0xC7FE }, { 0x6E21, 0xB6C9 }, { 0x6E23, 0xD4FC }, 
-	{ 0x6E24, 0xB2B3 }, { 0x6E25, 0xE4D7 }, { 0x6E29, 0xCEC2 }, { 0x6E2B, 0xE4CD }, { 0x6E2D, 0xCEBC }, { 0x6E2F, 0xB8DB }, { 0x6E32, 0xE4D6 }, { 0x6E34, 0xBFCA }, 
-	{ 0x6E38, 0xD3CE }, { 0x6E3A, 0xC3EC }, { 0x6E43, 0xC5C8 }, { 0x6E44, 0xE4D8 }, { 0x6E4D, 0xCDC4 }, { 0x6E4E, 0xE4CF }, { 0x6E53, 0xE4D4 }, { 0x6E54, 0xE4D5 }, 
-	{ 0x6E56, 0xBAFE }, { 0x6E58, 0xCFE6 }, { 0x6E5B, 0xD5BF }, { 0x6E5F, 0xE4D2 }, { 0x6E6B, 0xE4D0 }, { 0x6E6E, 0xE4CE }, { 0x6E7E, 0xCDE5 }, { 0x6E7F, 0xCAAA }, 
-	{ 0x6E83, 0xC0A3 }, { 0x6E85, 0xBDA6 }, { 0x6E86, 0xE4D3 }, { 0x6E89, 0xB8C8 }, { 0x6E8F, 0xE4E7 }, { 0x6E90, 0xD4B4 }, { 0x6E98, 0xE4DB }, { 0x6E9C, 0xC1EF }, 
-	{ 0x6E9F, 0xE4E9 }, { 0x6EA2, 0xD2E7 }, { 0x6EA5, 0xE4DF }, { 0x6EA7, 0xE4E0 }, { 0x6EAA, 0xCFAA }, { 0x6EAF, 0xCBDD }, { 0x6EB1, 0xE4DA }, { 0x6EB2, 0xE4D1 }, 
-	{ 0x6EB4, 0xE4E5 }, { 0x6EB6, 0xC8DC }, { 0x6EB7, 0xE4E3 }, { 0x6EBA, 0xC4E7 }, { 0x6EBB, 0xE4E2 }, { 0x6EBD, 0xE4E1 }, { 0x6EC1, 0xB3FC }, { 0x6EC2, 0xE4E8 }, 
-	{ 0x6EC7, 0xB5E1 }, { 0x6ECB, 0xD7CC }, { 0x6ECF, 0xE4E6 }, { 0x6ED1, 0xBBAC }, { 0x6ED3, 0xD7D2 }, { 0x6ED4, 0xCCCF }, { 0x6ED5, 0xEBF8 }, { 0x6ED7, 0xE4E4 }, 
-	{ 0x6EDA, 0xB9F6 }, { 0x6EDE, 0xD6CD }, { 0x6EDF, 0xE4D9 }, { 0x6EE0, 0xE4DC }, { 0x6EE1, 0xC2FA }, { 0x6EE2, 0xE4DE }, { 0x6EE4, 0xC2CB }, { 0x6EE5, 0xC0C4 }, 
-	{ 0x6EE6, 0xC2D0 }, { 0x6EE8, 0xB1F5 }, { 0x6EE9, 0xCCB2 }, { 0x6EF4, 0xB5CE }, { 0x6EF9, 0xE4EF }, { 0x6F02, 0xC6AF }, { 0x6F06, 0xC6E1 }, { 0x6F09, 0xE4F5 }, 
-	{ 0x6F0F, 0xC2A9 }, { 0x6F13, 0xC0EC }, { 0x6F14, 0xD1DD }, { 0x6F15, 0xE4EE }, { 0x6F20, 0xC4AE }, { 0x6F24, 0xE4ED }, { 0x6F29, 0xE4F6 }, { 0x6F2A, 0xE4F4 }, 
-	{ 0x6F2B, 0xC2FE }, { 0x6F2D, 0xE4DD }, { 0x6F2F, 0xE4F0 }, { 0x6F31, 0xCAFE }, { 0x6F33, 0xD5C4 }, { 0x6F36, 0xE4F1 }, { 0x6F3E, 0xD1FA }, { 0x6F46, 0xE4EB }, 
-	{ 0x6F47, 0xE4EC }, { 0x6F4B, 0xE4F2 }, { 0x6F4D, 0xCEAB }, { 0x6F58, 0xC5CB }, { 0x6F5C, 0xC7B1 }, { 0x6F5E, 0xC2BA }, { 0x6F62, 0xE4EA }, { 0x6F66, 0xC1CA }, 
-	{ 0x6F6D, 0xCCB6 }, { 0x6F6E, 0xB3B1 }, { 0x6F72, 0xE4FB }, { 0x6F74, 0xE4F3 }, { 0x6F78, 0xE4FA }, { 0x6F7A, 0xE4FD }, { 0x6F7C, 0xE4FC }, { 0x6F84, 0xB3CE }, 
-	{ 0x6F88, 0xB3BA }, { 0x6F89, 0xE4F7 }, { 0x6F8C, 0xE4F9 }, { 0x6F8D, 0xE4F8 }, { 0x6F8E, 0xC5EC }, { 0x6F9C, 0xC0BD }, { 0x6FA1, 0xD4E8 }, { 0x6FA7, 0xE5A2 }, 
-	{ 0x6FB3, 0xB0C4 }, { 0x6FB6, 0xE5A4 }, { 0x6FB9, 0xE5A3 }, { 0x6FC0, 0xBCA4 }, { 0x6FC2, 0xE5A5 }, { 0x6FC9, 0xE5A1 }, { 0x6FD1, 0xE4FE }, { 0x6FD2, 0xB1F4 }, 
-	{ 0x6FDE, 0xE5A8 }, { 0x6FE0, 0xE5A9 }, { 0x6FE1, 0xE5A6 }, { 0x6FEE, 0xE5A7 }, { 0x6FEF, 0xE5AA }, { 0x7011, 0xC6D9 }, { 0x701A, 0xE5AB }, { 0x701B, 0xE5AD }, 
-	{ 0x7023, 0xE5AC }, { 0x7035, 0xE5AF }, { 0x7039, 0xE5AE }, { 0x704C, 0xB9E0 }, { 0x704F, 0xE5B0 }, { 0x705E, 0xE5B1 }, { 0x706B, 0xBBF0 }, { 0x706C, 0xECE1 }, 
-	{ 0x706D, 0xC3F0 }, { 0x706F, 0xB5C6 }, { 0x7070, 0xBBD2 }, { 0x7075, 0xC1E9 }, { 0x7076, 0xD4EE }, { 0x7078, 0xBEC4 }, { 0x707C, 0xD7C6 }, { 0x707E, 0xD4D6 }, 
-	{ 0x707F, 0xB2D3 }, { 0x7080, 0xECBE }, { 0x7085, 0xEAC1 }, { 0x7089, 0xC2AF }, { 0x708A, 0xB4B6 }, { 0x708E, 0xD1D7 }, { 0x7092, 0xB3B4 }, { 0x7094, 0xC8B2 }, 
-	{ 0x7095, 0xBFBB }, { 0x7096, 0xECC0 }, { 0x7099, 0xD6CB }, { 0x709C, 0xECBF }, { 0x709D, 0xECC1 }, { 0x70AB, 0xECC5 }, { 0x70AC, 0xBEE6 }, { 0x70AD, 0xCCBF }, 
-	{ 0x70AE, 0xC5DA }, { 0x70AF, 0xBEBC }, { 0x70B1, 0xECC6 }, { 0x70B3, 0xB1FE }, { 0x70B7, 0xECC4 }, { 0x70B8, 0xD5A8 }, { 0x70B9, 0xB5E3 }, { 0x70BB, 0xECC2 }, 
-	{ 0x70BC, 0xC1B6 }, { 0x70BD, 0xB3E3 }, { 0x70C0, 0xECC3 }, { 0x70C1, 0xCBB8 }, { 0x70C2, 0xC0C3 }, { 0x70C3, 0xCCFE }, { 0x70C8, 0xC1D2 }, { 0x70CA, 0xECC8 }, 
-	{ 0x70D8, 0xBAE6 }, { 0x70D9, 0xC0D3 }, { 0x70DB, 0xD6F2 }, { 0x70DF, 0xD1CC }, { 0x70E4, 0xBFBE }, { 0x70E6, 0xB7B3 }, { 0x70E7, 0xC9D5 }, { 0x70E8, 0xECC7 }, 
-	{ 0x70E9, 0xBBE2 }, { 0x70EB, 0xCCCC }, { 0x70EC, 0xBDFD }, { 0x70ED, 0xC8C8 }, { 0x70EF, 0xCFA9 }, { 0x70F7, 0xCDE9 }, { 0x70F9, 0xC5EB }, { 0x70FD, 0xB7E9 }, 
-	{ 0x7109, 0xD1C9 }, { 0x710A, 0xBAB8 }, { 0x7110, 0xECC9 }, { 0x7113, 0xECCA }, { 0x7115, 0xBBC0 }, { 0x7116, 0xECCB }, { 0x7118, 0xECE2 }, { 0x7119, 0xB1BA }, 
-	{ 0x711A, 0xB7D9 }, { 0x7126, 0xBDB9 }, { 0x712F, 0xECCC }, { 0x7130, 0xD1E6 }, { 0x7131, 0xECCD }, { 0x7136, 0xC8BB }, { 0x7145, 0xECD1 }, { 0x714A, 0xECD3 }, 
-	{ 0x714C, 0xBBCD }, { 0x714E, 0xBCE5 }, { 0x715C, 0xECCF }, { 0x715E, 0xC9B7 }, { 0x7164, 0xC3BA }, { 0x7166, 0xECE3 }, { 0x7167, 0xD5D5 }, { 0x7168, 0xECD0 }, 
-	{ 0x716E, 0xD6F3 }, { 0x7172, 0xECD2 }, { 0x7173, 0xECCE }, { 0x7178, 0xECD4 }, { 0x717A, 0xECD5 }, { 0x717D, 0xC9BF }, { 0x7184, 0xCFA8 }, { 0x718A, 0xD0DC }, 
-	{ 0x718F, 0xD1AC }, { 0x7194, 0xC8DB }, { 0x7198, 0xECD6 }, { 0x7199, 0xCEF5 }, { 0x719F, 0xCAEC }, { 0x71A0, 0xECDA }, { 0x71A8, 0xECD9 }, { 0x71AC, 0xB0BE }, 
-	{ 0x71B3, 0xECD7 }, { 0x71B5, 0xECD8 }, { 0x71B9, 0xECE4 }, { 0x71C3, 0xC8BC }, { 0x71CE, 0xC1C7 }, { 0x71D4, 0xECDC }, { 0x71D5, 0xD1E0 }, { 0x71E0, 0xECDB }, 
-	{ 0x71E5, 0xD4EF }, { 0x71E7, 0xECDD }, { 0x71EE, 0xDBC6 }, { 0x71F9, 0xECDE }, { 0x7206, 0xB1AC }, { 0x721D, 0xECDF }, { 0x7228, 0xECE0 }, { 0x722A, 0xD7A6 }, 
-	{ 0x722C, 0xC5C0 }, { 0x7230, 0xEBBC }, { 0x7231, 0xB0AE }, { 0x7235, 0xBEF4 }, { 0x7236, 0xB8B8 }, { 0x7237, 0xD2AF }, { 0x7238, 0xB0D6 }, { 0x7239, 0xB5F9 }, 
-	{ 0x723B, 0xD8B3 }, { 0x723D, 0xCBAC }, { 0x723F, 0xE3DD }, { 0x7247, 0xC6AC }, { 0x7248, 0xB0E6 }, { 0x724C, 0xC5C6 }, { 0x724D, 0xEBB9 }, { 0x7252, 0xEBBA }, 
-	{ 0x7256, 0xEBBB }, { 0x7259, 0xD1C0 }, { 0x725B, 0xC5A3 }, { 0x725D, 0xEAF2 }, { 0x725F, 0xC4B2 }, { 0x7261, 0xC4B5 }, { 0x7262, 0xC0CE }, { 0x7266, 0xEAF3 }, 
-	{ 0x7267, 0xC4C1 }, { 0x7269, 0xCEEF }, { 0x726E, 0xEAF0 }, { 0x726F, 0xEAF4 }, { 0x7272, 0xC9FC }, { 0x7275, 0xC7A3 }, { 0x7279, 0xCCD8 }, { 0x727A, 0xCEFE }, 
-	{ 0x727E, 0xEAF5 }, { 0x727F, 0xEAF6 }, { 0x7280, 0xCFAC }, { 0x7281, 0xC0E7 }, { 0x7284, 0xEAF7 }, { 0x728A, 0xB6BF }, { 0x728B, 0xEAF8 }, { 0x728D, 0xEAF9 }, 
-	{ 0x728F, 0xEAFA }, { 0x7292, 0xEAFB }, { 0x729F, 0xEAF1 }, { 0x72AC, 0xC8AE }, { 0x72AD, 0xE1EB }, { 0x72AF, 0xB7B8 }, { 0x72B0, 0xE1EC }, { 0x72B4, 0xE1ED }, 
-	{ 0x72B6, 0xD7B4 }, { 0x72B7, 0xE1EE }, { 0x72B8, 0xE1EF }, { 0x72B9, 0xD3CC }, { 0x72C1, 0xE1F1 }, { 0x72C2, 0xBFF1 }, { 0x72C3, 0xE1F0 }, { 0x72C4, 0xB5D2 }, 
-	{ 0x72C8, 0xB1B7 }, { 0x72CD, 0xE1F3 }, { 0x72CE, 0xE1F2 }, { 0x72D0, 0xBAFC }, { 0x72D2, 0xE1F4 }, { 0x72D7, 0xB9B7 }, { 0x72D9, 0xBED1 }, { 0x72DE, 0xC4FC }, 
-	{ 0x72E0, 0xBADD }, { 0x72E1, 0xBDC6 }, { 0x72E8, 0xE1F5 }, { 0x72E9, 0xE1F7 }, { 0x72EC, 0xB6C0 }, { 0x72ED, 0xCFC1 }, { 0x72EE, 0xCAA8 }, { 0x72EF, 0xE1F6 }, 
-	{ 0x72F0, 0xD5F8 }, { 0x72F1, 0xD3FC }, { 0x72F2, 0xE1F8 }, { 0x72F3, 0xE1FC }, { 0x72F4, 0xE1F9 }, { 0x72F7, 0xE1FA }, { 0x72F8, 0xC0EA }, { 0x72FA, 0xE1FE }, 
-	{ 0x72FB, 0xE2A1 }, { 0x72FC, 0xC0C7 }, { 0x7301, 0xE1FB }, { 0x7303, 0xE1FD }, { 0x730A, 0xE2A5 }, { 0x730E, 0xC1D4 }, { 0x7313, 0xE2A3 }, { 0x7315, 0xE2A8 }, 
-	{ 0x7316, 0xB2FE }, { 0x7317, 0xE2A2 }, { 0x731B, 0xC3CD }, { 0x731C, 0xB2C2 }, { 0x731D, 0xE2A7 }, { 0x731E, 0xE2A6 }, { 0x7321, 0xE2A4 }, { 0x7322, 0xE2A9 }, 
-	{ 0x7325, 0xE2AB }, { 0x7329, 0xD0C9 }, { 0x732A, 0xD6ED }, { 0x732B, 0xC3A8 }, { 0x732C, 0xE2AC }, { 0x732E, 0xCFD7 }, { 0x7331, 0xE2AE }, { 0x7334, 0xBAEF }, 
-	{ 0x7337, 0xE9E0 }, { 0x7338, 0xE2AD }, { 0x7339, 0xE2AA }, { 0x733E, 0xBBAB }, { 0x733F, 0xD4B3 }, { 0x734D, 0xE2B0 }, { 0x7350, 0xE2AF }, { 0x7352, 0xE9E1 }, 
-	{ 0x7357, 0xE2B1 }, { 0x7360, 0xE2B2 }, { 0x736C, 0xE2B3 }, { 0x736D, 0xCCA1 }, { 0x736F, 0xE2B4 }, { 0x737E, 0xE2B5 }, { 0x7384, 0xD0FE }, { 0x7387, 0xC2CA }, 
-	{ 0x7389, 0xD3F1 }, { 0x738B, 0xCDF5 }, { 0x738E, 0xE7E0 }, { 0x7391, 0xE7E1 }, { 0x7396, 0xBEC1 }, { 0x739B, 0xC2EA }, { 0x739F, 0xE7E4 }, { 0x73A2, 0xE7E3 }, 
-	{ 0x73A9, 0xCDE6 }, { 0x73AB, 0xC3B5 }, { 0x73AE, 0xE7E2 }, { 0x73AF, 0xBBB7 }, { 0x73B0, 0xCFD6 }, { 0x73B2, 0xC1E1 }, { 0x73B3, 0xE7E9 }, { 0x73B7, 0xE7E8 }, 
-	{ 0x73BA, 0xE7F4 }, { 0x73BB, 0xB2A3 }, { 0x73C0, 0xE7EA }, { 0x73C2, 0xE7E6 }, { 0x73C8, 0xE7EC }, { 0x73C9, 0xE7EB }, { 0x73CA, 0xC9BA }, { 0x73CD, 0xD5E4 }, 
-	{ 0x73CF, 0xE7E5 }, { 0x73D0, 0xB7A9 }, { 0x73D1, 0xE7E7 }, { 0x73D9, 0xE7EE }, { 0x73DE, 0xE7F3 }, { 0x73E0, 0xD6E9 }, { 0x73E5, 0xE7ED }, { 0x73E7, 0xE7F2 }, 
-	{ 0x73E9, 0xE7F1 }, { 0x73ED, 0xB0E0 }, { 0x73F2, 0xE7F5 }, { 0x7403, 0xC7F2 }, { 0x7405, 0xC0C5 }, { 0x7406, 0xC0ED }, { 0x7409, 0xC1F0 }, { 0x740A, 0xE7F0 }, 
-	{ 0x740F, 0xE7F6 }, { 0x7410, 0xCBF6 }, { 0x741A, 0xE8A2 }, { 0x741B, 0xE8A1 }, { 0x7422, 0xD7C1 }, { 0x7425, 0xE7FA }, { 0x7426, 0xE7F9 }, { 0x7428, 0xE7FB }, 
-	{ 0x742A, 0xE7F7 }, { 0x742C, 0xE7FE }, { 0x742E, 0xE7FD }, { 0x7430, 0xE7FC }, { 0x7433, 0xC1D5 }, { 0x7434, 0xC7D9 }, { 0x7435, 0xC5FD }, { 0x7436, 0xC5C3 }, 
-	{ 0x743C, 0xC7ED }, { 0x7441, 0xE8A3 }, { 0x7455, 0xE8A6 }, { 0x7457, 0xE8A5 }, { 0x7459, 0xE8A7 }, { 0x745A, 0xBAF7 }, { 0x745B, 0xE7F8 }, { 0x745C, 0xE8A4 }, 
-	{ 0x745E, 0xC8F0 }, { 0x745F, 0xC9AA }, { 0x746D, 0xE8A9 }, { 0x7470, 0xB9E5 }, { 0x7476, 0xD1FE }, { 0x7477, 0xE8A8 }, { 0x747E, 0xE8AA }, { 0x7480, 0xE8AD }, 
-	{ 0x7481, 0xE8AE }, { 0x7483, 0xC1A7 }, { 0x7487, 0xE8AF }, { 0x748B, 0xE8B0 }, { 0x748E, 0xE8AC }, { 0x7490, 0xE8B4 }, { 0x749C, 0xE8AB }, { 0x749E, 0xE8B1 }, 
-	{ 0x74A7, 0xE8B5 }, { 0x74A8, 0xE8B2 }, { 0x74A9, 0xE8B3 }, { 0x74BA, 0xE8B7 }, { 0x74D2, 0xE8B6 }, { 0x74DC, 0xB9CF }, { 0x74DE, 0xF0AC }, { 0x74E0, 0xF0AD }, 
-	{ 0x74E2, 0xC6B0 }, { 0x74E3, 0xB0EA }, { 0x74E4, 0xC8BF }, { 0x74E6, 0xCDDF }, { 0x74EE, 0xCECD }, { 0x74EF, 0xEAB1 }, { 0x74F4, 0xEAB2 }, { 0x74F6, 0xC6BF }, 
-	{ 0x74F7, 0xB4C9 }, { 0x74FF, 0xEAB3 }, { 0x7504, 0xD5E7 }, { 0x750D, 0xDDF9 }, { 0x750F, 0xEAB4 }, { 0x7511, 0xEAB5 }, { 0x7513, 0xEAB6 }, { 0x7518, 0xB8CA }, 
-	{ 0x7519, 0xDFB0 }, { 0x751A, 0xC9F5 }, { 0x751C, 0xCCF0 }, { 0x751F, 0xC9FA }, { 0x7525, 0xC9FB }, { 0x7528, 0xD3C3 }, { 0x7529, 0xCBA6 }, { 0x752B, 0xB8A6 }, 
-	{ 0x752C, 0xF0AE }, { 0x752D, 0xB1C2 }, { 0x752F, 0xE5B8 }, { 0x7530, 0xCCEF }, { 0x7531, 0xD3C9 }, { 0x7532, 0xBCD7 }, { 0x7533, 0xC9EA }, { 0x7535, 0xB5E7 }, 
-	{ 0x7537, 0xC4D0 }, { 0x7538, 0xB5E9 }, { 0x753A, 0xEEAE }, { 0x753B, 0xBBAD }, { 0x753E, 0xE7DE }, { 0x7540, 0xEEAF }, { 0x7545, 0xB3A9 }, { 0x7548, 0xEEB2 }, 
-	{ 0x754B, 0xEEB1 }, { 0x754C, 0xBDE7 }, { 0x754E, 0xEEB0 }, { 0x754F, 0xCEB7 }, { 0x7554, 0xC5CF }, { 0x7559, 0xC1F4 }, { 0x755A, 0xDBCE }, { 0x755B, 0xEEB3 }, 
-	{ 0x755C, 0xD0F3 }, { 0x7565, 0xC2D4 }, { 0x7566, 0xC6E8 }, { 0x756A, 0xB7AC }, { 0x7572, 0xEEB4 }, { 0x7574, 0xB3EB }, { 0x7578, 0xBBFB }, { 0x7579, 0xEEB5 }, 
-	{ 0x757F, 0xE7DC }, { 0x7583, 0xEEB6 }, { 0x7586, 0xBDAE }, { 0x758B, 0xF1E2 }, { 0x758F, 0xCAE8 }, { 0x7591, 0xD2C9 }, { 0x7592, 0xF0DA }, { 0x7594, 0xF0DB }, 
-	{ 0x7596, 0xF0DC }, { 0x7597, 0xC1C6 }, { 0x7599, 0xB8ED }, { 0x759A, 0xBECE }, { 0x759D, 0xF0DE }, { 0x759F, 0xC5B1 }, { 0x75A0, 0xF0DD }, { 0x75A1, 0xD1F1 }, 
-	{ 0x75A3, 0xF0E0 }, { 0x75A4, 0xB0CC }, { 0x75A5, 0xBDEA }, { 0x75AB, 0xD2DF }, { 0x75AC, 0xF0DF }, { 0x75AE, 0xB4AF }, { 0x75AF, 0xB7E8 }, { 0x75B0, 0xF0E6 }, 
-	{ 0x75B1, 0xF0E5 }, { 0x75B2, 0xC6A3 }, { 0x75B3, 0xF0E1 }, { 0x75B4, 0xF0E2 }, { 0x75B5, 0xB4C3 }, { 0x75B8, 0xF0E3 }, { 0x75B9, 0xD5EE }, { 0x75BC, 0xCCDB }, 
-	{ 0x75BD, 0xBED2 }, { 0x75BE, 0xBCB2 }, { 0x75C2, 0xF0E8 }, { 0x75C3, 0xF0E7 }, { 0x75C4, 0xF0E4 }, { 0x75C5, 0xB2A1 }, { 0x75C7, 0xD6A2 }, { 0x75C8, 0xD3B8 }, 
-	{ 0x75C9, 0xBEB7 }, { 0x75CA, 0xC8AC }, { 0x75CD, 0xF0EA }, { 0x75D2, 0xD1F7 }, { 0x75D4, 0xD6CC }, { 0x75D5, 0xBADB }, { 0x75D6, 0xF0E9 }, { 0x75D8, 0xB6BB }, 
-	{ 0x75DB, 0xCDB4 }, { 0x75DE, 0xC6A6 }, { 0x75E2, 0xC1A1 }, { 0x75E3, 0xF0EB }, { 0x75E4, 0xF0EE }, { 0x75E6, 0xF0ED }, { 0x75E7, 0xF0F0 }, { 0x75E8, 0xF0EC }, 
-	{ 0x75EA, 0xBBBE }, { 0x75EB, 0xF0EF }, { 0x75F0, 0xCCB5 }, { 0x75F1, 0xF0F2 }, { 0x75F4, 0xB3D5 }, { 0x75F9, 0xB1D4 }, { 0x75FC, 0xF0F3 }, { 0x75FF, 0xF0F4 }, 
-	{ 0x7600, 0xF0F6 }, { 0x7601, 0xB4E1 }, { 0x7603, 0xF0F1 }, { 0x7605, 0xF0F7 }, { 0x760A, 0xF0FA }, { 0x760C, 0xF0F8 }, { 0x7610, 0xF0F5 }, { 0x7615, 0xF0FD }, 
-	{ 0x7617, 0xF0F9 }, { 0x7618, 0xF0FC }, { 0x7619, 0xF0FE }, { 0x761B, 0xF1A1 }, { 0x761F, 0xCEC1 }, { 0x7620, 0xF1A4 }, { 0x7622, 0xF1A3 }, { 0x7624, 0xC1F6 }, 
-	{ 0x7625, 0xF0FB }, { 0x7626, 0xCADD }, { 0x7629, 0xB4F1 }, { 0x762A, 0xB1F1 }, { 0x762B, 0xCCB1 }, { 0x762D, 0xF1A6 }, { 0x7630, 0xF1A7 }, { 0x7633, 0xF1AC }, 
-	{ 0x7634, 0xD5CE }, { 0x7635, 0xF1A9 }, { 0x7638, 0xC8B3 }, { 0x763C, 0xF1A2 }, { 0x763E, 0xF1AB }, { 0x763F, 0xF1A8 }, { 0x7640, 0xF1A5 }, { 0x7643, 0xF1AA }, 
-	{ 0x764C, 0xB0A9 }, { 0x764D, 0xF1AD }, { 0x7654, 0xF1AF }, { 0x7656, 0xF1B1 }, { 0x765C, 0xF1B0 }, { 0x765E, 0xF1AE }, { 0x7663, 0xD1A2 }, { 0x766B, 0xF1B2 }, 
-	{ 0x766F, 0xF1B3 }, { 0x7678, 0xB9EF }, { 0x767B, 0xB5C7 }, { 0x767D, 0xB0D7 }, { 0x767E, 0xB0D9 }, { 0x7682, 0xD4ED }, { 0x7684, 0xB5C4 }, { 0x7686, 0xBDD4 }, 
-	{ 0x7687, 0xBBCA }, { 0x7688, 0xF0A7 }, { 0x768B, 0xB8DE }, { 0x768E, 0xF0A8 }, { 0x7691, 0xB0A8 }, { 0x7693, 0xF0A9 }, { 0x7696, 0xCDEE }, { 0x7699, 0xF0AA }, 
-	{ 0x76A4, 0xF0AB }, { 0x76AE, 0xC6A4 }, { 0x76B1, 0xD6E5 }, { 0x76B2, 0xF1E4 }, { 0x76B4, 0xF1E5 }, { 0x76BF, 0xC3F3 }, { 0x76C2, 0xD3DB }, { 0x76C5, 0xD6D1 }, 
-	{ 0x76C6, 0xC5E8 }, { 0x76C8, 0xD3AF }, { 0x76CA, 0xD2E6 }, { 0x76CD, 0xEEC1 }, { 0x76CE, 0xB0BB }, { 0x76CF, 0xD5B5 }, { 0x76D0, 0xD1CE }, { 0x76D1, 0xBCE0 }, 
-	{ 0x76D2, 0xBAD0 }, { 0x76D4, 0xBFF8 }, { 0x76D6, 0xB8C7 }, { 0x76D7, 0xB5C1 }, { 0x76D8, 0xC5CC }, { 0x76DB, 0xCAA2 }, { 0x76DF, 0xC3CB }, { 0x76E5, 0xEEC2 }, 
-	{ 0x76EE, 0xC4BF }, { 0x76EF, 0xB6A2 }, { 0x76F1, 0xEDEC }, { 0x76F2, 0xC3A4 }, { 0x76F4, 0xD6B1 }, { 0x76F8, 0xCFE0 }, { 0x76F9, 0xEDEF }, { 0x76FC, 0xC5CE }, 
-	{ 0x76FE, 0xB6DC }, { 0x7701, 0xCAA1 }, { 0x7704, 0xEDED }, { 0x7707, 0xEDF0 }, { 0x7708, 0xEDF1 }, { 0x7709, 0xC3BC }, { 0x770B, 0xBFB4 }, { 0x770D, 0xEDEE }, 
-	{ 0x7719, 0xEDF4 }, { 0x771A, 0xEDF2 }, { 0x771F, 0xD5E6 }, { 0x7720, 0xC3DF }, { 0x7722, 0xEDF3 }, { 0x7726, 0xEDF6 }, { 0x7728, 0xD5A3 }, { 0x7729, 0xD1A3 }, 
-	{ 0x772D, 0xEDF5 }, { 0x772F, 0xC3D0 }, { 0x7735, 0xEDF7 }, { 0x7736, 0xBFF4 }, { 0x7737, 0xBEEC }, { 0x7738, 0xEDF8 }, { 0x773A, 0xCCF7 }, { 0x773C, 0xD1DB }, 
-	{ 0x7740, 0xD7C5 }, { 0x7741, 0xD5F6 }, { 0x7743, 0xEDFC }, { 0x7747, 0xEDFB }, { 0x7750, 0xEDF9 }, { 0x7751, 0xEDFA }, { 0x775A, 0xEDFD }, { 0x775B, 0xBEA6 }, 
-	{ 0x7761, 0xCBAF }, { 0x7762, 0xEEA1 }, { 0x7763, 0xB6BD }, { 0x7765, 0xEEA2 }, { 0x7766, 0xC4C0 }, { 0x7768, 0xEDFE }, { 0x776B, 0xBDDE }, { 0x776C, 0xB2C7 }, 
-	{ 0x7779, 0xB6C3 }, { 0x777D, 0xEEA5 }, { 0x777E, 0xD8BA }, { 0x777F, 0xEEA3 }, { 0x7780, 0xEEA6 }, { 0x7784, 0xC3E9 }, { 0x7785, 0xB3F2 }, { 0x778C, 0xEEA7 }, 
-	{ 0x778D, 0xEEA4 }, { 0x778E, 0xCFB9 }, { 0x7791, 0xEEA8 }, { 0x7792, 0xC2F7 }, { 0x779F, 0xEEA9 }, { 0x77A0, 0xEEAA }, { 0x77A2, 0xDEAB }, { 0x77A5, 0xC6B3 }, 
-	{ 0x77A7, 0xC7C6 }, { 0x77A9, 0xD6F5 }, { 0x77AA, 0xB5C9 }, { 0x77AC, 0xCBB2 }, { 0x77B0, 0xEEAB }, { 0x77B3, 0xCDAB }, { 0x77B5, 0xEEAC }, { 0x77BB, 0xD5B0 }, 
-	{ 0x77BD, 0xEEAD }, { 0x77BF, 0xF6C4 }, { 0x77CD, 0xDBC7 }, { 0x77D7, 0xB4A3 }, { 0x77DB, 0xC3AC }, { 0x77DC, 0xF1E6 }, { 0x77E2, 0xCAB8 }, { 0x77E3, 0xD2D3 }, 
-	{ 0x77E5, 0xD6AA }, { 0x77E7, 0xEFF2 }, { 0x77E9, 0xBED8 }, { 0x77EB, 0xBDC3 }, { 0x77EC, 0xEFF3 }, { 0x77ED, 0xB6CC }, { 0x77EE, 0xB0AB }, { 0x77F3, 0xCAAF }, 
-	{ 0x77F6, 0xEDB6 }, { 0x77F8, 0xEDB7 }, { 0x77FD, 0xCEF9 }, { 0x77FE, 0xB7AF }, { 0x77FF, 0xBFF3 }, { 0x7800, 0xEDB8 }, { 0x7801, 0xC2EB }, { 0x7802, 0xC9B0 }, 
-	{ 0x7809, 0xEDB9 }, { 0x780C, 0xC6F6 }, { 0x780D, 0xBFB3 }, { 0x7811, 0xEDBC }, { 0x7812, 0xC5F8 }, { 0x7814, 0xD1D0 }, { 0x7816, 0xD7A9 }, { 0x7817, 0xEDBA }, 
-	{ 0x7818, 0xEDBB }, { 0x781A, 0xD1E2 }, { 0x781C, 0xEDBF }, { 0x781D, 0xEDC0 }, { 0x781F, 0xEDC4 }, { 0x7823, 0xEDC8 }, { 0x7825, 0xEDC6 }, { 0x7826, 0xEDCE }, 
-	{ 0x7827, 0xD5E8 }, { 0x7829, 0xEDC9 }, { 0x782C, 0xEDC7 }, { 0x782D, 0xEDBE }, { 0x7830, 0xC5E9 }, { 0x7834, 0xC6C6 }, { 0x7837, 0xC9E9 }, { 0x7838, 0xD4D2 }, 
-	{ 0x7839, 0xEDC1 }, { 0x783A, 0xEDC2 }, { 0x783B, 0xEDC3 }, { 0x783C, 0xEDC5 }, { 0x783E, 0xC0F9 }, { 0x7840, 0xB4A1 }, { 0x7845, 0xB9E8 }, { 0x7847, 0xEDD0 }, 
-	{ 0x784C, 0xEDD1 }, { 0x784E, 0xEDCA }, { 0x7850, 0xEDCF }, { 0x7852, 0xCEF8 }, { 0x7855, 0xCBB6 }, { 0x7856, 0xEDCC }, { 0x7857, 0xEDCD }, { 0x785D, 0xCFF5 }, 
-	{ 0x786A, 0xEDD2 }, { 0x786B, 0xC1F2 }, { 0x786C, 0xD3B2 }, { 0x786D, 0xEDCB }, { 0x786E, 0xC8B7 }, { 0x7877, 0xBCEF }, { 0x787C, 0xC5F0 }, { 0x7887, 0xEDD6 }, 
-	{ 0x7889, 0xB5EF }, { 0x788C, 0xC2B5 }, { 0x788D, 0xB0AD }, { 0x788E, 0xCBE9 }, { 0x7891, 0xB1AE }, { 0x7893, 0xEDD4 }, { 0x7897, 0xCDEB }, { 0x7898, 0xB5E2 }, 
-	{ 0x789A, 0xEDD5 }, { 0x789B, 0xEDD3 }, { 0x789C, 0xEDD7 }, { 0x789F, 0xB5FA }, { 0x78A1, 0xEDD8 }, { 0x78A3, 0xEDD9 }, { 0x78A5, 0xEDDC }, { 0x78A7, 0xB1CC }, 
-	{ 0x78B0, 0xC5F6 }, { 0x78B1, 0xBCEE }, { 0x78B2, 0xEDDA }, { 0x78B3, 0xCCBC }, { 0x78B4, 0xB2EA }, { 0x78B9, 0xEDDB }, { 0x78BE, 0xC4EB }, { 0x78C1, 0xB4C5 }, 
-	{ 0x78C5, 0xB0F5 }, { 0x78C9, 0xEDDF }, { 0x78CA, 0xC0DA }, { 0x78CB, 0xB4E8 }, { 0x78D0, 0xC5CD }, { 0x78D4, 0xEDDD }, { 0x78D5, 0xBFC4 }, { 0x78D9, 0xEDDE }, 
-	{ 0x78E8, 0xC4A5 }, { 0x78EC, 0xEDE0 }, { 0x78F2, 0xEDE1 }, { 0x78F4, 0xEDE3 }, { 0x78F7, 0xC1D7 }, { 0x78FA, 0xBBC7 }, { 0x7901, 0xBDB8 }, { 0x7905, 0xEDE2 }, 
-	{ 0x7913, 0xEDE4 }, { 0x791E, 0xEDE6 }, { 0x7924, 0xEDE5 }, { 0x7934, 0xEDE7 }, { 0x793A, 0xCABE }, { 0x793B, 0xECEA }, { 0x793C, 0xC0F1 }, { 0x793E, 0xC9E7 }, 
-	{ 0x7940, 0xECEB }, { 0x7941, 0xC6EE }, { 0x7946, 0xECEC }, { 0x7948, 0xC6ED }, { 0x7949, 0xECED }, { 0x7953, 0xECF0 }, { 0x7956, 0xD7E6 }, { 0x7957, 0xECF3 }, 
-	{ 0x795A, 0xECF1 }, { 0x795B, 0xECEE }, { 0x795C, 0xECEF }, { 0x795D, 0xD7A3 }, { 0x795E, 0xC9F1 }, { 0x795F, 0xCBEE }, { 0x7960, 0xECF4 }, { 0x7962, 0xECF2 }, 
-	{ 0x7965, 0xCFE9 }, { 0x7967, 0xECF6 }, { 0x7968, 0xC6B1 }, { 0x796D, 0xBCC0 }, { 0x796F, 0xECF5 }, { 0x7977, 0xB5BB }, { 0x7978, 0xBBF6 }, { 0x797A, 0xECF7 }, 
-	{ 0x7980, 0xD9F7 }, { 0x7981, 0xBDFB }, { 0x7984, 0xC2BB }, { 0x7985, 0xECF8 }, { 0x798A, 0xECF9 }, { 0x798F, 0xB8A3 }, { 0x799A, 0xECFA }, { 0x79A7, 0xECFB }, 
-	{ 0x79B3, 0xECFC }, { 0x79B9, 0xD3ED }, { 0x79BA, 0xD8AE }, { 0x79BB, 0xC0EB }, { 0x79BD, 0xC7DD }, { 0x79BE, 0xBACC }, { 0x79C0, 0xD0E3 }, { 0x79C1, 0xCBBD }, 
-	{ 0x79C3, 0xCDBA }, { 0x79C6, 0xB8D1 }, { 0x79C9, 0xB1FC }, { 0x79CB, 0xC7EF }, { 0x79CD, 0xD6D6 }, { 0x79D1, 0xBFC6 }, { 0x79D2, 0xC3EB }, { 0x79D5, 0xEFF5 }, 
-	{ 0x79D8, 0xC3D8 }, { 0x79DF, 0xD7E2 }, { 0x79E3, 0xEFF7 }, { 0x79E4, 0xB3D3 }, { 0x79E6, 0xC7D8 }, { 0x79E7, 0xD1ED }, { 0x79E9, 0xD6C8 }, { 0x79EB, 0xEFF8 }, 
-	{ 0x79ED, 0xEFF6 }, { 0x79EF, 0xBBFD }, { 0x79F0, 0xB3C6 }, { 0x79F8, 0xBDD5 }, { 0x79FB, 0xD2C6 }, { 0x79FD, 0xBBE0 }, { 0x7A00, 0xCFA1 }, { 0x7A02, 0xEFFC }, 
-	{ 0x7A03, 0xEFFB }, { 0x7A06, 0xEFF9 }, { 0x7A0B, 0xB3CC }, { 0x7A0D, 0xC9D4 }, { 0x7A0E, 0xCBB0 }, { 0x7A14, 0xEFFE }, { 0x7A17, 0xB0DE }, { 0x7A1A, 0xD6C9 }, 
-	{ 0x7A1E, 0xEFFD }, { 0x7A20, 0xB3ED }, { 0x7A23, 0xF6D5 }, { 0x7A33, 0xCEC8 }, { 0x7A37, 0xF0A2 }, { 0x7A39, 0xF0A1 }, { 0x7A3B, 0xB5BE }, { 0x7A3C, 0xBCDA }, 
-	{ 0x7A3D, 0xBBFC }, { 0x7A3F, 0xB8E5 }, { 0x7A46, 0xC4C2 }, { 0x7A51, 0xF0A3 }, { 0x7A57, 0xCBEB }, { 0x7A70, 0xF0A6 }, { 0x7A74, 0xD1A8 }, { 0x7A76, 0xBEBF }, 
-	{ 0x7A77, 0xC7EE }, { 0x7A78, 0xF1B6 }, { 0x7A79, 0xF1B7 }, { 0x7A7A, 0xBFD5 }, { 0x7A7F, 0xB4A9 }, { 0x7A80, 0xF1B8 }, { 0x7A81, 0xCDBB }, { 0x7A83, 0xC7D4 }, 
-	{ 0x7A84, 0xD5AD }, { 0x7A86, 0xF1B9 }, { 0x7A88, 0xF1BA }, { 0x7A8D, 0xC7CF }, { 0x7A91, 0xD2A4 }, { 0x7A92, 0xD6CF }, { 0x7A95, 0xF1BB }, { 0x7A96, 0xBDD1 }, 
-	{ 0x7A97, 0xB4B0 }, { 0x7A98, 0xBEBD }, { 0x7A9C, 0xB4DC }, { 0x7A9D, 0xCED1 }, { 0x7A9F, 0xBFDF }, { 0x7AA0, 0xF1BD }, { 0x7AA5, 0xBFFA }, { 0x7AA6, 0xF1BC }, 
-	{ 0x7AA8, 0xF1BF }, { 0x7AAC, 0xF1BE }, { 0x7AAD, 0xF1C0 }, { 0x7AB3, 0xF1C1 }, { 0x7ABF, 0xC1FE }, { 0x7ACB, 0xC1A2 }, { 0x7AD6, 0xCAFA }, { 0x7AD9, 0xD5BE }, 
-	{ 0x7ADE, 0xBEBA }, { 0x7ADF, 0xBEB9 }, { 0x7AE0, 0xD5C2 }, { 0x7AE3, 0xBFA2 }, { 0x7AE5, 0xCDAF }, { 0x7AE6, 0xF1B5 }, { 0x7AED, 0xBDDF }, { 0x7AEF, 0xB6CB }, 
-	{ 0x7AF9, 0xD6F1 }, { 0x7AFA, 0xF3C3 }, { 0x7AFD, 0xF3C4 }, { 0x7AFF, 0xB8CD }, { 0x7B03, 0xF3C6 }, { 0x7B04, 0xF3C7 }, { 0x7B06, 0xB0CA }, { 0x7B08, 0xF3C5 }, 
-	{ 0x7B0A, 0xF3C9 }, { 0x7B0B, 0xCBF1 }, { 0x7B0F, 0xF3CB }, { 0x7B11, 0xD0A6 }, { 0x7B14, 0xB1CA }, { 0x7B15, 0xF3C8 }, { 0x7B19, 0xF3CF }, { 0x7B1B, 0xB5D1 }, 
-	{ 0x7B1E, 0xF3D7 }, { 0x7B20, 0xF3D2 }, { 0x7B24, 0xF3D4 }, { 0x7B25, 0xF3D3 }, { 0x7B26, 0xB7FB }, { 0x7B28, 0xB1BF }, { 0x7B2A, 0xF3CE }, { 0x7B2B, 0xF3CA }, 
-	{ 0x7B2C, 0xB5DA }, { 0x7B2E, 0xF3D0 }, { 0x7B31, 0xF3D1 }, { 0x7B33, 0xF3D5 }, { 0x7B38, 0xF3CD }, { 0x7B3A, 0xBCE3 }, { 0x7B3C, 0xC1FD }, { 0x7B3E, 0xF3D6 }, 
-	{ 0x7B45, 0xF3DA }, { 0x7B47, 0xF3CC }, { 0x7B49, 0xB5C8 }, { 0x7B4B, 0xBDEE }, { 0x7B4C, 0xF3DC }, { 0x7B4F, 0xB7A4 }, { 0x7B50, 0xBFF0 }, { 0x7B51, 0xD6FE }, 
-	{ 0x7B52, 0xCDB2 }, { 0x7B54, 0xB4F0 }, { 0x7B56, 0xB2DF }, { 0x7B58, 0xF3D8 }, { 0x7B5A, 0xF3D9 }, { 0x7B5B, 0xC9B8 }, { 0x7B5D, 0xF3DD }, { 0x7B60, 0xF3DE }, 
-	{ 0x7B62, 0xF3E1 }, { 0x7B6E, 0xF3DF }, { 0x7B71, 0xF3E3 }, { 0x7B72, 0xF3E2 }, { 0x7B75, 0xF3DB }, { 0x7B77, 0xBFEA }, { 0x7B79, 0xB3EF }, { 0x7B7B, 0xF3E0 }, 
-	{ 0x7B7E, 0xC7A9 }, { 0x7B80, 0xBCF2 }, { 0x7B85, 0xF3EB }, { 0x7B8D, 0xB9BF }, { 0x7B90, 0xF3E4 }, { 0x7B94, 0xB2AD }, { 0x7B95, 0xBBFE }, { 0x7B97, 0xCBE3 }, 
-	{ 0x7B9C, 0xF3ED }, { 0x7B9D, 0xF3E9 }, { 0x7BA1, 0xB9DC }, { 0x7BA2, 0xF3EE }, { 0x7BA6, 0xF3E5 }, { 0x7BA7, 0xF3E6 }, { 0x7BA8, 0xF3EA }, { 0x7BA9, 0xC2E1 }, 
-	{ 0x7BAA, 0xF3EC }, { 0x7BAB, 0xF3EF }, { 0x7BAC, 0xF3E8 }, { 0x7BAD, 0xBCFD }, { 0x7BB1, 0xCFE4 }, { 0x7BB4, 0xF3F0 }, { 0x7BB8, 0xF3E7 }, { 0x7BC1, 0xF3F2 }, 
-	{ 0x7BC6, 0xD7AD }, { 0x7BC7, 0xC6AA }, { 0x7BCC, 0xF3F3 }, { 0x7BD1, 0xF3F1 }, { 0x7BD3, 0xC2A8 }, { 0x7BD9, 0xB8DD }, { 0x7BDA, 0xF3F5 }, { 0x7BDD, 0xF3F4 }, 
-	{ 0x7BE1, 0xB4DB }, { 0x7BE5, 0xF3F6 }, { 0x7BE6, 0xF3F7 }, { 0x7BEA, 0xF3F8 }, { 0x7BEE, 0xC0BA }, { 0x7BF1, 0xC0E9 }, { 0x7BF7, 0xC5F1 }, { 0x7BFC, 0xF3FB }, 
-	{ 0x7BFE, 0xF3FA }, { 0x7C07, 0xB4D8 }, { 0x7C0B, 0xF3FE }, { 0x7C0C, 0xF3F9 }, { 0x7C0F, 0xF3FC }, { 0x7C16, 0xF3FD }, { 0x7C1F, 0xF4A1 }, { 0x7C26, 0xF4A3 }, 
-	{ 0x7C27, 0xBBC9 }, { 0x7C2A, 0xF4A2 }, { 0x7C38, 0xF4A4 }, { 0x7C3F, 0xB2BE }, { 0x7C40, 0xF4A6 }, { 0x7C41, 0xF4A5 }, { 0x7C4D, 0xBCAE }, { 0x7C73, 0xC3D7 }, 
-	{ 0x7C74, 0xD9E1 }, { 0x7C7B, 0xC0E0 }, { 0x7C7C, 0xF4CC }, { 0x7C7D, 0xD7D1 }, { 0x7C89, 0xB7DB }, { 0x7C91, 0xF4CE }, { 0x7C92, 0xC1A3 }, { 0x7C95, 0xC6C9 }, 
-	{ 0x7C97, 0xB4D6 }, { 0x7C98, 0xD5B3 }, { 0x7C9C, 0xF4D0 }, { 0x7C9D, 0xF4CF }, { 0x7C9E, 0xF4D1 }, { 0x7C9F, 0xCBDA }, { 0x7CA2, 0xF4D2 }, { 0x7CA4, 0xD4C1 }, 
-	{ 0x7CA5, 0xD6E0 }, { 0x7CAA, 0xB7E0 }, { 0x7CAE, 0xC1B8 }, { 0x7CB1, 0xC1BB }, { 0x7CB2, 0xF4D3 }, { 0x7CB3, 0xBEAC }, { 0x7CB9, 0xB4E2 }, { 0x7CBC, 0xF4D4 }, 
-	{ 0x7CBD, 0xF4D5 }, { 0x7CBE, 0xBEAB }, { 0x7CC1, 0xF4D6 }, { 0x7CC5, 0xF4DB }, { 0x7CC7, 0xF4D7 }, { 0x7CC8, 0xF4DA }, { 0x7CCA, 0xBAFD }, { 0x7CCC, 0xF4D8 }, 
-	{ 0x7CCD, 0xF4D9 }, { 0x7CD5, 0xB8E2 }, { 0x7CD6, 0xCCC7 }, { 0x7CD7, 0xF4DC }, { 0x7CD9, 0xB2DA }, { 0x7CDC, 0xC3D3 }, { 0x7CDF, 0xD4E3 }, { 0x7CE0, 0xBFB7 }, 
-	{ 0x7CE8, 0xF4DD }, { 0x7CEF, 0xC5B4 }, { 0x7CF8, 0xF4E9 }, { 0x7CFB, 0xCFB5 }, { 0x7D0A, 0xCEC9 }, { 0x7D20, 0xCBD8 }, { 0x7D22, 0xCBF7 }, { 0x7D27, 0xBDF4 }, 
-	{ 0x7D2B, 0xD7CF }, { 0x7D2F, 0xC0DB }, { 0x7D6E, 0xD0F5 }, { 0x7D77, 0xF4EA }, { 0x7DA6, 0xF4EB }, { 0x7DAE, 0xF4EC }, { 0x7E3B, 0xF7E3 }, { 0x7E41, 0xB7B1 }, 
-	{ 0x7E47, 0xF4ED }, { 0x7E82, 0xD7EB }, { 0x7E9B, 0xF4EE }, { 0x7E9F, 0xE6F9 }, { 0x7EA0, 0xBEC0 }, { 0x7EA1, 0xE6FA }, { 0x7EA2, 0xBAEC }, { 0x7EA3, 0xE6FB }, 
-	{ 0x7EA4, 0xCFCB }, { 0x7EA5, 0xE6FC }, { 0x7EA6, 0xD4BC }, { 0x7EA7, 0xBCB6 }, { 0x7EA8, 0xE6FD }, { 0x7EA9, 0xE6FE }, { 0x7EAA, 0xBCCD }, { 0x7EAB, 0xC8D2 }, 
-	{ 0x7EAC, 0xCEB3 }, { 0x7EAD, 0xE7A1 }, { 0x7EAF, 0xB4BF }, { 0x7EB0, 0xE7A2 }, { 0x7EB1, 0xC9B4 }, { 0x7EB2, 0xB8D9 }, { 0x7EB3, 0xC4C9 }, { 0x7EB5, 0xD7DD }, 
-	{ 0x7EB6, 0xC2DA }, { 0x7EB7, 0xB7D7 }, { 0x7EB8, 0xD6BD }, { 0x7EB9, 0xCEC6 }, { 0x7EBA, 0xB7C4 }, { 0x7EBD, 0xC5A6 }, { 0x7EBE, 0xE7A3 }, { 0x7EBF, 0xCFDF }, 
-	{ 0x7EC0, 0xE7A4 }, { 0x7EC1, 0xE7A5 }, { 0x7EC2, 0xE7A6 }, { 0x7EC3, 0xC1B7 }, { 0x7EC4, 0xD7E9 }, { 0x7EC5, 0xC9F0 }, { 0x7EC6, 0xCFB8 }, { 0x7EC7, 0xD6AF }, 
-	{ 0x7EC8, 0xD6D5 }, { 0x7EC9, 0xE7A7 }, { 0x7ECA, 0xB0ED }, { 0x7ECB, 0xE7A8 }, { 0x7ECC, 0xE7A9 }, { 0x7ECD, 0xC9DC }, { 0x7ECE, 0xD2EF }, { 0x7ECF, 0xBEAD }, 
-	{ 0x7ED0, 0xE7AA }, { 0x7ED1, 0xB0F3 }, { 0x7ED2, 0xC8DE }, { 0x7ED3, 0xBDE1 }, { 0x7ED4, 0xE7AB }, { 0x7ED5, 0xC8C6 }, { 0x7ED7, 0xE7AC }, { 0x7ED8, 0xBBE6 }, 
-	{ 0x7ED9, 0xB8F8 }, { 0x7EDA, 0xD1A4 }, { 0x7EDB, 0xE7AD }, { 0x7EDC, 0xC2E7 }, { 0x7EDD, 0xBEF8 }, { 0x7EDE, 0xBDCA }, { 0x7EDF, 0xCDB3 }, { 0x7EE0, 0xE7AE }, 
-	{ 0x7EE1, 0xE7AF }, { 0x7EE2, 0xBEEE }, { 0x7EE3, 0xD0E5 }, { 0x7EE5, 0xCBE7 }, { 0x7EE6, 0xCCD0 }, { 0x7EE7, 0xBCCC }, { 0x7EE8, 0xE7B0 }, { 0x7EE9, 0xBCA8 }, 
-	{ 0x7EEA, 0xD0F7 }, { 0x7EEB, 0xE7B1 }, { 0x7EED, 0xD0F8 }, { 0x7EEE, 0xE7B2 }, { 0x7EEF, 0xE7B3 }, { 0x7EF0, 0xB4C2 }, { 0x7EF1, 0xE7B4 }, { 0x7EF2, 0xE7B5 }, 
-	{ 0x7EF3, 0xC9FE }, { 0x7EF4, 0xCEAC }, { 0x7EF5, 0xC3E0 }, { 0x7EF6, 0xE7B7 }, { 0x7EF7, 0xB1C1 }, { 0x7EF8, 0xB3F1 }, { 0x7EFA, 0xE7B8 }, { 0x7EFB, 0xE7B9 }, 
-	{ 0x7EFC, 0xD7DB }, { 0x7EFD, 0xD5C0 }, { 0x7EFE, 0xE7BA }, { 0x7EFF, 0xC2CC }, { 0x7F00, 0xD7BA }, { 0x7F01, 0xE7BB }, { 0x7F02, 0xE7BC }, { 0x7F03, 0xE7BD }, 
-	{ 0x7F04, 0xBCEA }, { 0x7F05, 0xC3E5 }, { 0x7F06, 0xC0C2 }, { 0x7F07, 0xE7BE }, { 0x7F08, 0xE7BF }, { 0x7F09, 0xBCA9 }, { 0x7F0B, 0xE7C0 }, { 0x7F0C, 0xE7C1 }, 
-	{ 0x7F0D, 0xE7B6 }, { 0x7F0E, 0xB6D0 }, { 0x7F0F, 0xE7C2 }, { 0x7F11, 0xE7C3 }, { 0x7F12, 0xE7C4 }, { 0x7F13, 0xBBBA }, { 0x7F14, 0xB5DE }, { 0x7F15, 0xC2C6 }, 
-	{ 0x7F16, 0xB1E0 }, { 0x7F17, 0xE7C5 }, { 0x7F18, 0xD4B5 }, { 0x7F19, 0xE7C6 }, { 0x7F1A, 0xB8BF }, { 0x7F1B, 0xE7C8 }, { 0x7F1C, 0xE7C7 }, { 0x7F1D, 0xB7EC }, 
-	{ 0x7F1F, 0xE7C9 }, { 0x7F20, 0xB2F8 }, { 0x7F21, 0xE7CA }, { 0x7F22, 0xE7CB }, { 0x7F23, 0xE7CC }, { 0x7F24, 0xE7CD }, { 0x7F25, 0xE7CE }, { 0x7F26, 0xE7CF }, 
-	{ 0x7F27, 0xE7D0 }, { 0x7F28, 0xD3A7 }, { 0x7F29, 0xCBF5 }, { 0x7F2A, 0xE7D1 }, { 0x7F2B, 0xE7D2 }, { 0x7F2C, 0xE7D3 }, { 0x7F2D, 0xE7D4 }, { 0x7F2E, 0xC9C9 }, 
-	{ 0x7F2F, 0xE7D5 }, { 0x7F30, 0xE7D6 }, { 0x7F31, 0xE7D7 }, { 0x7F32, 0xE7D8 }, { 0x7F33, 0xE7D9 }, { 0x7F34, 0xBDC9 }, { 0x7F35, 0xE7DA }, { 0x7F36, 0xF3BE }, 
-	{ 0x7F38, 0xB8D7 }, { 0x7F3A, 0xC8B1 }, { 0x7F42, 0xF3BF }, { 0x7F44, 0xF3C0 }, { 0x7F45, 0xF3C1 }, { 0x7F50, 0xB9DE }, { 0x7F51, 0xCDF8 }, { 0x7F54, 0xD8E8 }, 
-	{ 0x7F55, 0xBAB1 }, { 0x7F57, 0xC2DE }, { 0x7F58, 0xEEB7 }, { 0x7F5A, 0xB7A3 }, { 0x7F5F, 0xEEB9 }, { 0x7F61, 0xEEB8 }, { 0x7F62, 0xB0D5 }, { 0x7F68, 0xEEBB }, 
-	{ 0x7F69, 0xD5D6 }, { 0x7F6A, 0xD7EF }, { 0x7F6E, 0xD6C3 }, { 0x7F71, 0xEEBD }, { 0x7F72, 0xCAF0 }, { 0x7F74, 0xEEBC }, { 0x7F79, 0xEEBE }, { 0x7F7E, 0xEEC0 }, 
-	{ 0x7F81, 0xEEBF }, { 0x7F8A, 0xD1F2 }, { 0x7F8C, 0xC7BC }, { 0x7F8E, 0xC3C0 }, { 0x7F94, 0xB8E1 }, { 0x7F9A, 0xC1E7 }, { 0x7F9D, 0xF4C6 }, { 0x7F9E, 0xD0DF }, 
-	{ 0x7F9F, 0xF4C7 }, { 0x7FA1, 0xCFDB }, { 0x7FA4, 0xC8BA }, { 0x7FA7, 0xF4C8 }, { 0x7FAF, 0xF4C9 }, { 0x7FB0, 0xF4CA }, { 0x7FB2, 0xF4CB }, { 0x7FB8, 0xD9FA }, 
-	{ 0x7FB9, 0xB8FE }, { 0x7FBC, 0xE5F1 }, { 0x7FBD, 0xD3F0 }, { 0x7FBF, 0xF4E0 }, { 0x7FC1, 0xCECC }, { 0x7FC5, 0xB3E1 }, { 0x7FCA, 0xF1B4 }, { 0x7FCC, 0xD2EE }, 
-	{ 0x7FCE, 0xF4E1 }, { 0x7FD4, 0xCFE8 }, { 0x7FD5, 0xF4E2 }, { 0x7FD8, 0xC7CC }, { 0x7FDF, 0xB5D4 }, { 0x7FE0, 0xB4E4 }, { 0x7FE1, 0xF4E4 }, { 0x7FE5, 0xF4E3 }, 
-	{ 0x7FE6, 0xF4E5 }, { 0x7FE9, 0xF4E6 }, { 0x7FEE, 0xF4E7 }, { 0x7FF0, 0xBAB2 }, { 0x7FF1, 0xB0BF }, { 0x7FF3, 0xF4E8 }, { 0x7FFB, 0xB7AD }, { 0x7FFC, 0xD2ED }, 
-	{ 0x8000, 0xD2AB }, { 0x8001, 0xC0CF }, { 0x8003, 0xBFBC }, { 0x8004, 0xEBA3 }, { 0x8005, 0xD5DF }, { 0x8006, 0xEAC8 }, { 0x800B, 0xF1F3 }, { 0x800C, 0xB6F8 }, 
-	{ 0x800D, 0xCBA3 }, { 0x8010, 0xC4CD }, { 0x8012, 0xF1E7 }, { 0x8014, 0xF1E8 }, { 0x8015, 0xB8FB }, { 0x8016, 0xF1E9 }, { 0x8017, 0xBAC4 }, { 0x8018, 0xD4C5 }, 
-	{ 0x8019, 0xB0D2 }, { 0x801C, 0xF1EA }, { 0x8020, 0xF1EB }, { 0x8022, 0xF1EC }, { 0x8025, 0xF1ED }, { 0x8026, 0xF1EE }, { 0x8027, 0xF1EF }, { 0x8028, 0xF1F1 }, 
-	{ 0x8029, 0xF1F0 }, { 0x802A, 0xC5D5 }, { 0x8031, 0xF1F2 }, { 0x8033, 0xB6FA }, { 0x8035, 0xF1F4 }, { 0x8036, 0xD2AE }, { 0x8037, 0xDEC7 }, { 0x8038, 0xCBCA }, 
-	{ 0x803B, 0xB3DC }, { 0x803D, 0xB5A2 }, { 0x803F, 0xB9A2 }, { 0x8042, 0xC4F4 }, { 0x8043, 0xF1F5 }, { 0x8046, 0xF1F6 }, { 0x804A, 0xC1C4 }, { 0x804B, 0xC1FB }, 
-	{ 0x804C, 0xD6B0 }, { 0x804D, 0xF1F7 }, { 0x8052, 0xF1F8 }, { 0x8054, 0xC1AA }, { 0x8058, 0xC6B8 }, { 0x805A, 0xBEDB }, { 0x8069, 0xF1F9 }, { 0x806A, 0xB4CF }, 
-	{ 0x8071, 0xF1FA }, { 0x807F, 0xEDB2 }, { 0x8080, 0xEDB1 }, { 0x8083, 0xCBE0 }, { 0x8084, 0xD2DE }, { 0x8086, 0xCBC1 }, { 0x8087, 0xD5D8 }, { 0x8089, 0xC8E2 }, 
-	{ 0x808B, 0xC0DF }, { 0x808C, 0xBCA1 }, { 0x8093, 0xEBC1 }, { 0x8096, 0xD0A4 }, { 0x8098, 0xD6E2 }, { 0x809A, 0xB6C7 }, { 0x809B, 0xB8D8 }, { 0x809C, 0xEBC0 }, 
-	{ 0x809D, 0xB8CE }, { 0x809F, 0xEBBF }, { 0x80A0, 0xB3A6 }, { 0x80A1, 0xB9C9 }, { 0x80A2, 0xD6AB }, { 0x80A4, 0xB7F4 }, { 0x80A5, 0xB7CA }, { 0x80A9, 0xBCE7 }, 
-	{ 0x80AA, 0xB7BE }, { 0x80AB, 0xEBC6 }, { 0x80AD, 0xEBC7 }, { 0x80AE, 0xB0B9 }, { 0x80AF, 0xBFCF }, { 0x80B1, 0xEBC5 }, { 0x80B2, 0xD3FD }, { 0x80B4, 0xEBC8 }, 
-	{ 0x80B7, 0xEBC9 }, { 0x80BA, 0xB7CE }, { 0x80BC, 0xEBC2 }, { 0x80BD, 0xEBC4 }, { 0x80BE, 0xC9F6 }, { 0x80BF, 0xD6D7 }, { 0x80C0, 0xD5CD }, { 0x80C1, 0xD0B2 }, 
-	{ 0x80C2, 0xEBCF }, { 0x80C3, 0xCEB8 }, { 0x80C4, 0xEBD0 }, { 0x80C6, 0xB5A8 }, { 0x80CC, 0xB1B3 }, { 0x80CD, 0xEBD2 }, { 0x80CE, 0xCCA5 }, { 0x80D6, 0xC5D6 }, 
-	{ 0x80D7, 0xEBD3 }, { 0x80D9, 0xEBD1 }, { 0x80DA, 0xC5DF }, { 0x80DB, 0xEBCE }, { 0x80DC, 0xCAA4 }, { 0x80DD, 0xEBD5 }, { 0x80DE, 0xB0FB }, { 0x80E1, 0xBAFA }, 
-	{ 0x80E4, 0xD8B7 }, { 0x80E5, 0xF1E3 }, { 0x80E7, 0xEBCA }, { 0x80E8, 0xEBCB }, { 0x80E9, 0xEBCC }, { 0x80EA, 0xEBCD }, { 0x80EB, 0xEBD6 }, { 0x80EC, 0xE6C0 }, 
-	{ 0x80ED, 0xEBD9 }, { 0x80EF, 0xBFE8 }, { 0x80F0, 0xD2C8 }, { 0x80F1, 0xEBD7 }, { 0x80F2, 0xEBDC }, { 0x80F3, 0xB8EC }, { 0x80F4, 0xEBD8 }, { 0x80F6, 0xBDBA }, 
-	{ 0x80F8, 0xD0D8 }, { 0x80FA, 0xB0B7 }, { 0x80FC, 0xEBDD }, { 0x80FD, 0xC4DC }, { 0x8102, 0xD6AC }, { 0x8106, 0xB4E0 }, { 0x8109, 0xC2F6 }, { 0x810A, 0xBCB9 }, 
-	{ 0x810D, 0xEBDA }, { 0x810E, 0xEBDB }, { 0x810F, 0xD4E0 }, { 0x8110, 0xC6EA }, { 0x8111, 0xC4D4 }, { 0x8112, 0xEBDF }, { 0x8113, 0xC5A7 }, { 0x8114, 0xD9F5 }, 
-	{ 0x8116, 0xB2B1 }, { 0x8118, 0xEBE4 }, { 0x811A, 0xBDC5 }, { 0x811E, 0xEBE2 }, { 0x812C, 0xEBE3 }, { 0x812F, 0xB8AC }, { 0x8131, 0xCDD1 }, { 0x8132, 0xEBE5 }, 
-	{ 0x8136, 0xEBE1 }, { 0x8138, 0xC1B3 }, { 0x813E, 0xC6A2 }, { 0x8146, 0xCCF3 }, { 0x8148, 0xEBE6 }, { 0x814A, 0xC0B0 }, { 0x814B, 0xD2B8 }, { 0x814C, 0xEBE7 }, 
-	{ 0x8150, 0xB8AF }, { 0x8151, 0xB8AD }, { 0x8153, 0xEBE8 }, { 0x8154, 0xC7BB }, { 0x8155, 0xCDF3 }, { 0x8159, 0xEBEA }, { 0x815A, 0xEBEB }, { 0x8160, 0xEBED }, 
-	{ 0x8165, 0xD0C8 }, { 0x8167, 0xEBF2 }, { 0x8169, 0xEBEE }, { 0x816D, 0xEBF1 }, { 0x816E, 0xC8F9 }, { 0x8170, 0xD1FC }, { 0x8171, 0xEBEC }, { 0x8174, 0xEBE9 }, 
-	{ 0x8179, 0xB8B9 }, { 0x817A, 0xCFD9 }, { 0x817B, 0xC4E5 }, { 0x817C, 0xEBEF }, { 0x817D, 0xEBF0 }, { 0x817E, 0xCCDA }, { 0x817F, 0xCDC8 }, { 0x8180, 0xB0F2 }, 
-	{ 0x8182, 0xEBF6 }, { 0x8188, 0xEBF5 }, { 0x818A, 0xB2B2 }, { 0x818F, 0xB8E0 }, { 0x8191, 0xEBF7 }, { 0x8198, 0xB1EC }, { 0x819B, 0xCCC5 }, { 0x819C, 0xC4A4 }, 
-	{ 0x819D, 0xCFA5 }, { 0x81A3, 0xEBF9 }, { 0x81A6, 0xECA2 }, { 0x81A8, 0xC5F2 }, { 0x81AA, 0xEBFA }, { 0x81B3, 0xC9C5 }, { 0x81BA, 0xE2DF }, { 0x81BB, 0xEBFE }, 
-	{ 0x81C0, 0xCDCE }, { 0x81C1, 0xECA1 }, { 0x81C2, 0xB1DB }, { 0x81C3, 0xD3B7 }, { 0x81C6, 0xD2DC }, { 0x81CA, 0xEBFD }, { 0x81CC, 0xEBFB }, { 0x81E3, 0xB3BC }, 
-	{ 0x81E7, 0xEAB0 }, { 0x81EA, 0xD7D4 }, { 0x81EC, 0xF4AB }, { 0x81ED, 0xB3F4 }, { 0x81F3, 0xD6C1 }, { 0x81F4, 0xD6C2 }, { 0x81FB, 0xD5E9 }, { 0x81FC, 0xBECA }, 
-	{ 0x81FE, 0xF4A7 }, { 0x8200, 0xD2A8 }, { 0x8201, 0xF4A8 }, { 0x8202, 0xF4A9 }, { 0x8204, 0xF4AA }, { 0x8205, 0xBECB }, { 0x8206, 0xD3DF }, { 0x820C, 0xC9E0 }, 
-	{ 0x820D, 0xC9E1 }, { 0x8210, 0xF3C2 }, { 0x8212, 0xCAE6 }, { 0x8214, 0xCCF2 }, { 0x821B, 0xE2B6 }, { 0x821C, 0xCBB4 }, { 0x821E, 0xCEE8 }, { 0x821F, 0xD6DB }, 
-	{ 0x8221, 0xF4AD }, { 0x8222, 0xF4AE }, { 0x8223, 0xF4AF }, { 0x8228, 0xF4B2 }, { 0x822A, 0xBABD }, { 0x822B, 0xF4B3 }, { 0x822C, 0xB0E3 }, { 0x822D, 0xF4B0 }, 
-	{ 0x822F, 0xF4B1 }, { 0x8230, 0xBDA2 }, { 0x8231, 0xB2D5 }, { 0x8233, 0xF4B6 }, { 0x8234, 0xF4B7 }, { 0x8235, 0xB6E6 }, { 0x8236, 0xB2B0 }, { 0x8237, 0xCFCF }, 
-	{ 0x8238, 0xF4B4 }, { 0x8239, 0xB4AC }, { 0x823B, 0xF4B5 }, { 0x823E, 0xF4B8 }, { 0x8244, 0xF4B9 }, { 0x8247, 0xCDA7 }, { 0x8249, 0xF4BA }, { 0x824B, 0xF4BB }, 
-	{ 0x824F, 0xF4BC }, { 0x8258, 0xCBD2 }, { 0x825A, 0xF4BD }, { 0x825F, 0xF4BE }, { 0x8268, 0xF4BF }, { 0x826E, 0xF4DE }, { 0x826F, 0xC1BC }, { 0x8270, 0xBCE8 }, 
-	{ 0x8272, 0xC9AB }, { 0x8273, 0xD1DE }, { 0x8274, 0xE5F5 }, { 0x8279, 0xDCB3 }, { 0x827A, 0xD2D5 }, { 0x827D, 0xDCB4 }, { 0x827E, 0xB0AC }, { 0x827F, 0xDCB5 }, 
-	{ 0x8282, 0xBDDA }, { 0x8284, 0xDCB9 }, { 0x8288, 0xD8C2 }, { 0x828A, 0xDCB7 }, { 0x828B, 0xD3F3 }, { 0x828D, 0xC9D6 }, { 0x828E, 0xDCBA }, { 0x828F, 0xDCB6 }, 
-	{ 0x8291, 0xDCBB }, { 0x8292, 0xC3A2 }, { 0x8297, 0xDCBC }, { 0x8298, 0xDCC5 }, { 0x8299, 0xDCBD }, { 0x829C, 0xCEDF }, { 0x829D, 0xD6A5 }, { 0x829F, 0xDCCF }, 
-	{ 0x82A1, 0xDCCD }, { 0x82A4, 0xDCD2 }, { 0x82A5, 0xBDE6 }, { 0x82A6, 0xC2AB }, { 0x82A8, 0xDCB8 }, { 0x82A9, 0xDCCB }, { 0x82AA, 0xDCCE }, { 0x82AB, 0xDCBE }, 
-	{ 0x82AC, 0xB7D2 }, { 0x82AD, 0xB0C5 }, { 0x82AE, 0xDCC7 }, { 0x82AF, 0xD0BE }, { 0x82B0, 0xDCC1 }, { 0x82B1, 0xBBA8 }, { 0x82B3, 0xB7BC }, { 0x82B4, 0xDCCC }, 
-	{ 0x82B7, 0xDCC6 }, { 0x82B8, 0xDCBF }, { 0x82B9, 0xC7DB }, { 0x82BD, 0xD1BF }, { 0x82BE, 0xDCC0 }, { 0x82C1, 0xDCCA }, { 0x82C4, 0xDCD0 }, { 0x82C7, 0xCEAD }, 
-	{ 0x82C8, 0xDCC2 }, { 0x82CA, 0xDCC3 }, { 0x82CB, 0xDCC8 }, { 0x82CC, 0xDCC9 }, { 0x82CD, 0xB2D4 }, { 0x82CE, 0xDCD1 }, { 0x82CF, 0xCBD5 }, { 0x82D1, 0xD4B7 }, 
-	{ 0x82D2, 0xDCDB }, { 0x82D3, 0xDCDF }, { 0x82D4, 0xCCA6 }, { 0x82D5, 0xDCE6 }, { 0x82D7, 0xC3E7 }, { 0x82D8, 0xDCDC }, { 0x82DB, 0xBFC1 }, { 0x82DC, 0xDCD9 }, 
-	{ 0x82DE, 0xB0FA }, { 0x82DF, 0xB9B6 }, { 0x82E0, 0xDCE5 }, { 0x82E1, 0xDCD3 }, { 0x82E3, 0xDCC4 }, { 0x82E4, 0xDCD6 }, { 0x82E5, 0xC8F4 }, { 0x82E6, 0xBFE0 }, 
-	{ 0x82EB, 0xC9BB }, { 0x82EF, 0xB1BD }, { 0x82F1, 0xD3A2 }, { 0x82F4, 0xDCDA }, { 0x82F7, 0xDCD5 }, { 0x82F9, 0xC6BB }, { 0x82FB, 0xDCDE }, { 0x8301, 0xD7C2 }, 
-	{ 0x8302, 0xC3AF }, { 0x8303, 0xB7B6 }, { 0x8304, 0xC7D1 }, { 0x8305, 0xC3A9 }, { 0x8306, 0xDCE2 }, { 0x8307, 0xDCD8 }, { 0x8308, 0xDCEB }, { 0x8309, 0xDCD4 }, 
-	{ 0x830C, 0xDCDD }, { 0x830E, 0xBEA5 }, { 0x830F, 0xDCD7 }, { 0x8311, 0xDCE0 }, { 0x8314, 0xDCE3 }, { 0x8315, 0xDCE4 }, { 0x8317, 0xDCF8 }, { 0x831A, 0xDCE1 }, 
-	{ 0x831B, 0xDDA2 }, { 0x831C, 0xDCE7 }, { 0x8327, 0xBCEB }, { 0x8328, 0xB4C4 }, { 0x832B, 0xC3A3 }, { 0x832C, 0xB2E7 }, { 0x832D, 0xDCFA }, { 0x832F, 0xDCF2 }, 
-	{ 0x8331, 0xDCEF }, { 0x8333, 0xDCFC }, { 0x8334, 0xDCEE }, { 0x8335, 0xD2F0 }, { 0x8336, 0xB2E8 }, { 0x8338, 0xC8D7 }, { 0x8339, 0xC8E3 }, { 0x833A, 0xDCFB }, 
-	{ 0x833C, 0xDCED }, { 0x8340, 0xDCF7 }, { 0x8343, 0xDCF5 }, { 0x8346, 0xBEA3 }, { 0x8347, 0xDCF4 }, { 0x8349, 0xB2DD }, { 0x834F, 0xDCF3 }, { 0x8350, 0xBCF6 }, 
-	{ 0x8351, 0xDCE8 }, { 0x8352, 0xBBC4 }, { 0x8354, 0xC0F3 }, { 0x835A, 0xBCD4 }, { 0x835B, 0xDCE9 }, { 0x835C, 0xDCEA }, { 0x835E, 0xDCF1 }, { 0x835F, 0xDCF6 }, 
-	{ 0x8360, 0xDCF9 }, { 0x8361, 0xB5B4 }, { 0x8363, 0xC8D9 }, { 0x8364, 0xBBE7 }, { 0x8365, 0xDCFE }, { 0x8366, 0xDCFD }, { 0x8367, 0xD3AB }, { 0x8368, 0xDDA1 }, 
-	{ 0x8369, 0xDDA3 }, { 0x836A, 0xDDA5 }, { 0x836B, 0xD2F1 }, { 0x836C, 0xDDA4 }, { 0x836D, 0xDDA6 }, { 0x836E, 0xDDA7 }, { 0x836F, 0xD2A9 }, { 0x8377, 0xBAC9 }, 
-	{ 0x8378, 0xDDA9 }, { 0x837B, 0xDDB6 }, { 0x837C, 0xDDB1 }, { 0x837D, 0xDDB4 }, { 0x8385, 0xDDB0 }, { 0x8386, 0xC6CE }, { 0x8389, 0xC0F2 }, { 0x838E, 0xC9AF }, 
-	{ 0x8392, 0xDCEC }, { 0x8393, 0xDDAE }, { 0x8398, 0xDDB7 }, { 0x839B, 0xDCF0 }, { 0x839C, 0xDDAF }, { 0x839E, 0xDDB8 }, { 0x83A0, 0xDDAC }, { 0x83A8, 0xDDB9 }, 
-	{ 0x83A9, 0xDDB3 }, { 0x83AA, 0xDDAD }, { 0x83AB, 0xC4AA }, { 0x83B0, 0xDDA8 }, { 0x83B1, 0xC0B3 }, { 0x83B2, 0xC1AB }, { 0x83B3, 0xDDAA }, { 0x83B4, 0xDDAB }, 
-	{ 0x83B6, 0xDDB2 }, { 0x83B7, 0xBBF1 }, { 0x83B8, 0xDDB5 }, { 0x83B9, 0xD3A8 }, { 0x83BA, 0xDDBA }, { 0x83BC, 0xDDBB }, { 0x83BD, 0xC3A7 }, { 0x83C0, 0xDDD2 }, 
-	{ 0x83C1, 0xDDBC }, { 0x83C5, 0xDDD1 }, { 0x83C7, 0xB9BD }, { 0x83CA, 0xBED5 }, { 0x83CC, 0xBEFA }, { 0x83CF, 0xBACA }, { 0x83D4, 0xDDCA }, { 0x83D6, 0xDDC5 }, 
-	{ 0x83D8, 0xDDBF }, { 0x83DC, 0xB2CB }, { 0x83DD, 0xDDC3 }, { 0x83DF, 0xDDCB }, { 0x83E0, 0xB2A4 }, { 0x83E1, 0xDDD5 }, { 0x83E5, 0xDDBE }, { 0x83E9, 0xC6D0 }, 
-	{ 0x83EA, 0xDDD0 }, { 0x83F0, 0xDDD4 }, { 0x83F1, 0xC1E2 }, { 0x83F2, 0xB7C6 }, { 0x83F8, 0xDDCE }, { 0x83F9, 0xDDCF }, { 0x83FD, 0xDDC4 }, { 0x8401, 0xDDBD }, 
-	{ 0x8403, 0xDDCD }, { 0x8404, 0xCCD1 }, { 0x8406, 0xDDC9 }, { 0x840B, 0xDDC2 }, { 0x840C, 0xC3C8 }, { 0x840D, 0xC6BC }, { 0x840E, 0xCEAE }, { 0x840F, 0xDDCC }, 
-	{ 0x8411, 0xDDC8 }, { 0x8418, 0xDDC1 }, { 0x841C, 0xDDC6 }, { 0x841D, 0xC2DC }, { 0x8424, 0xD3A9 }, { 0x8425, 0xD3AA }, { 0x8426, 0xDDD3 }, { 0x8427, 0xCFF4 }, 
-	{ 0x8428, 0xC8F8 }, { 0x8431, 0xDDE6 }, { 0x8438, 0xDDC7 }, { 0x843C, 0xDDE0 }, { 0x843D, 0xC2E4 }, { 0x8446, 0xDDE1 }, { 0x8451, 0xDDD7 }, { 0x8457, 0xD6F8 }, 
-	{ 0x8459, 0xDDD9 }, { 0x845A, 0xDDD8 }, { 0x845B, 0xB8F0 }, { 0x845C, 0xDDD6 }, { 0x8461, 0xC6CF }, { 0x8463, 0xB6AD }, { 0x8469, 0xDDE2 }, { 0x846B, 0xBAF9 }, 
-	{ 0x846C, 0xD4E1 }, { 0x846D, 0xDDE7 }, { 0x8471, 0xB4D0 }, { 0x8473, 0xDDDA }, { 0x8475, 0xBFFB }, { 0x8476, 0xDDE3 }, { 0x8478, 0xDDDF }, { 0x847A, 0xDDDD }, 
-	{ 0x8482, 0xB5D9 }, { 0x8487, 0xDDDB }, { 0x8488, 0xDDDC }, { 0x8489, 0xDDDE }, { 0x848B, 0xBDAF }, { 0x848C, 0xDDE4 }, { 0x848E, 0xDDE5 }, { 0x8497, 0xDDF5 }, 
-	{ 0x8499, 0xC3C9 }, { 0x849C, 0xCBE2 }, { 0x84A1, 0xDDF2 }, { 0x84AF, 0xD8E1 }, { 0x84B2, 0xC6D1 }, { 0x84B4, 0xDDF4 }, { 0x84B8, 0xD5F4 }, { 0x84B9, 0xDDF3 }, 
-	{ 0x84BA, 0xDDF0 }, { 0x84BD, 0xDDEC }, { 0x84BF, 0xDDEF }, { 0x84C1, 0xDDE8 }, { 0x84C4, 0xD0EE }, { 0x84C9, 0xC8D8 }, { 0x84CA, 0xDDEE }, { 0x84CD, 0xDDE9 }, 
-	{ 0x84D0, 0xDDEA }, { 0x84D1, 0xCBF2 }, { 0x84D3, 0xDDED }, { 0x84D6, 0xB1CD }, { 0x84DD, 0xC0B6 }, { 0x84DF, 0xBCBB }, { 0x84E0, 0xDDF1 }, { 0x84E3, 0xDDF7 }, 
-	{ 0x84E5, 0xDDF6 }, { 0x84E6, 0xDDEB }, { 0x84EC, 0xC5EE }, { 0x84F0, 0xDDFB }, { 0x84FC, 0xDEA4 }, { 0x84FF, 0xDEA3 }, { 0x850C, 0xDDF8 }, { 0x8511, 0xC3EF }, 
-	{ 0x8513, 0xC2FB }, { 0x8517, 0xD5E1 }, { 0x851A, 0xCEB5 }, { 0x851F, 0xDDFD }, { 0x8521, 0xB2CC }, { 0x852B, 0xC4E8 }, { 0x852C, 0xCADF }, { 0x8537, 0xC7BE }, 
-	{ 0x8538, 0xDDFA }, { 0x8539, 0xDDFC }, { 0x853A, 0xDDFE }, { 0x853B, 0xDEA2 }, { 0x853C, 0xB0AA }, { 0x853D, 0xB1CE }, { 0x8543, 0xDEAC }, { 0x8548, 0xDEA6 }, 
-	{ 0x8549, 0xBDB6 }, { 0x854A, 0xC8EF }, { 0x8556, 0xDEA1 }, { 0x8559, 0xDEA5 }, { 0x855E, 0xDEA9 }, { 0x8564, 0xDEA8 }, { 0x8568, 0xDEA7 }, { 0x8572, 0xDEAD }, 
-	{ 0x8574, 0xD4CC }, { 0x8579, 0xDEB3 }, { 0x857A, 0xDEAA }, { 0x857B, 0xDEAE }, { 0x857E, 0xC0D9 }, { 0x8584, 0xB1A1 }, { 0x8585, 0xDEB6 }, { 0x8587, 0xDEB1 }, 
-	{ 0x858F, 0xDEB2 }, { 0x859B, 0xD1A6 }, { 0x859C, 0xDEB5 }, { 0x85A4, 0xDEAF }, { 0x85A8, 0xDEB0 }, { 0x85AA, 0xD0BD }, { 0x85AE, 0xDEB4 }, { 0x85AF, 0xCAED }, 
-	{ 0x85B0, 0xDEB9 }, { 0x85B7, 0xDEB8 }, { 0x85B9, 0xDEB7 }, { 0x85C1, 0xDEBB }, { 0x85C9, 0xBDE5 }, { 0x85CF, 0xB2D8 }, { 0x85D0, 0xC3EA }, { 0x85D3, 0xDEBA }, 
-	{ 0x85D5, 0xC5BA }, { 0x85DC, 0xDEBC }, { 0x85E4, 0xCCD9 }, { 0x85E9, 0xB7AA }, { 0x85FB, 0xD4E5 }, { 0x85FF, 0xDEBD }, { 0x8605, 0xDEBF }, { 0x8611, 0xC4A2 }, 
-	{ 0x8616, 0xDEC1 }, { 0x8627, 0xDEBE }, { 0x8629, 0xDEC0 }, { 0x8638, 0xD5BA }, { 0x863C, 0xDEC2 }, { 0x864D, 0xF2AE }, { 0x864E, 0xBBA2 }, { 0x864F, 0xC2B2 }, 
-	{ 0x8650, 0xC5B0 }, { 0x8651, 0xC2C7 }, { 0x8654, 0xF2AF }, { 0x865A, 0xD0E9 }, { 0x865E, 0xD3DD }, { 0x8662, 0xEBBD }, { 0x866B, 0xB3E6 }, { 0x866C, 0xF2B0 }, 
-	{ 0x866E, 0xF2B1 }, { 0x8671, 0xCAAD }, { 0x8679, 0xBAE7 }, { 0x867A, 0xF2B3 }, { 0x867B, 0xF2B5 }, { 0x867C, 0xF2B4 }, { 0x867D, 0xCBE4 }, { 0x867E, 0xCFBA }, 
-	{ 0x867F, 0xF2B2 }, { 0x8680, 0xCAB4 }, { 0x8681, 0xD2CF }, { 0x8682, 0xC2EC }, { 0x868A, 0xCEC3 }, { 0x868B, 0xF2B8 }, { 0x868C, 0xB0F6 }, { 0x868D, 0xF2B7 }, 
-	{ 0x8693, 0xF2BE }, { 0x8695, 0xB2CF }, { 0x869C, 0xD1C1 }, { 0x869D, 0xF2BA }, { 0x86A3, 0xF2BC }, { 0x86A4, 0xD4E9 }, { 0x86A7, 0xF2BB }, { 0x86A8, 0xF2B6 }, 
-	{ 0x86A9, 0xF2BF }, { 0x86AA, 0xF2BD }, { 0x86AC, 0xF2B9 }, { 0x86AF, 0xF2C7 }, { 0x86B0, 0xF2C4 }, { 0x86B1, 0xF2C6 }, { 0x86B4, 0xF2CA }, { 0x86B5, 0xF2C2 }, 
-	{ 0x86B6, 0xF2C0 }, { 0x86BA, 0xF2C5 }, { 0x86C0, 0xD6FB }, { 0x86C4, 0xF2C1 }, { 0x86C6, 0xC7F9 }, { 0x86C7, 0xC9DF }, { 0x86C9, 0xF2C8 }, { 0x86CA, 0xB9C6 }, 
-	{ 0x86CB, 0xB5B0 }, { 0x86CE, 0xF2C3 }, { 0x86CF, 0xF2C9 }, { 0x86D0, 0xF2D0 }, { 0x86D1, 0xF2D6 }, { 0x86D4, 0xBBD7 }, { 0x86D8, 0xF2D5 }, { 0x86D9, 0xCDDC }, 
-	{ 0x86DB, 0xD6EB }, { 0x86DE, 0xF2D2 }, { 0x86DF, 0xF2D4 }, { 0x86E4, 0xB8F2 }, { 0x86E9, 0xF2CB }, { 0x86ED, 0xF2CE }, { 0x86EE, 0xC2F9 }, { 0x86F0, 0xD5DD }, 
-	{ 0x86F1, 0xF2CC }, { 0x86F2, 0xF2CD }, { 0x86F3, 0xF2CF }, { 0x86F4, 0xF2D3 }, { 0x86F8, 0xF2D9 }, { 0x86F9, 0xD3BC }, { 0x86FE, 0xB6EA }, { 0x8700, 0xCAF1 }, 
-	{ 0x8702, 0xB7E4 }, { 0x8703, 0xF2D7 }, { 0x8707, 0xF2D8 }, { 0x8708, 0xF2DA }, { 0x8709, 0xF2DD }, { 0x870A, 0xF2DB }, { 0x870D, 0xF2DC }, { 0x8712, 0xD1D1 }, 
-	{ 0x8713, 0xF2D1 }, { 0x8715, 0xCDC9 }, { 0x8717, 0xCECF }, { 0x8718, 0xD6A9 }, { 0x871A, 0xF2E3 }, { 0x871C, 0xC3DB }, { 0x871E, 0xF2E0 }, { 0x8721, 0xC0AF }, 
-	{ 0x8722, 0xF2EC }, { 0x8723, 0xF2DE }, { 0x8725, 0xF2E1 }, { 0x8729, 0xF2E8 }, { 0x872E, 0xF2E2 }, { 0x8731, 0xF2E7 }, { 0x8734, 0xF2E6 }, { 0x8737, 0xF2E9 }, 
-	{ 0x873B, 0xF2DF }, { 0x873E, 0xF2E4 }, { 0x873F, 0xF2EA }, { 0x8747, 0xD3AC }, { 0x8748, 0xF2E5 }, { 0x8749, 0xB2F5 }, { 0x874C, 0xF2F2 }, { 0x874E, 0xD0AB }, 
-	{ 0x8753, 0xF2F5 }, { 0x8757, 0xBBC8 }, { 0x8759, 0xF2F9 }, { 0x8760, 0xF2F0 }, { 0x8763, 0xF2F6 }, { 0x8764, 0xF2F8 }, { 0x8765, 0xF2FA }, { 0x876E, 0xF2F3 }, 
-	{ 0x8770, 0xF2F1 }, { 0x8774, 0xBAFB }, { 0x8776, 0xB5FB }, { 0x877B, 0xF2EF }, { 0x877C, 0xF2F7 }, { 0x877D, 0xF2ED }, { 0x877E, 0xF2EE }, { 0x8782, 0xF2EB }, 
-	{ 0x8783, 0xF3A6 }, { 0x8785, 0xF3A3 }, { 0x8788, 0xF3A2 }, { 0x878B, 0xF2F4 }, { 0x878D, 0xC8DA }, { 0x8793, 0xF2FB }, { 0x8797, 0xF3A5 }, { 0x879F, 0xC3F8 }, 
-	{ 0x87A8, 0xF2FD }, { 0x87AB, 0xF3A7 }, { 0x87AC, 0xF3A9 }, { 0x87AD, 0xF3A4 }, { 0x87AF, 0xF2FC }, { 0x87B3, 0xF3AB }, { 0x87B5, 0xF3AA }, { 0x87BA, 0xC2DD }, 
-	{ 0x87BD, 0xF3AE }, { 0x87C0, 0xF3B0 }, { 0x87C6, 0xF3A1 }, { 0x87CA, 0xF3B1 }, { 0x87CB, 0xF3AC }, { 0x87D1, 0xF3AF }, { 0x87D2, 0xF2FE }, { 0x87D3, 0xF3AD }, 
-	{ 0x87DB, 0xF3B2 }, { 0x87E0, 0xF3B4 }, { 0x87E5, 0xF3A8 }, { 0x87EA, 0xF3B3 }, { 0x87EE, 0xF3B5 }, { 0x87F9, 0xD0B7 }, { 0x87FE, 0xF3B8 }, { 0x8803, 0xD9F9 }, 
-	{ 0x880A, 0xF3B9 }, { 0x8813, 0xF3B7 }, { 0x8815, 0xC8E4 }, { 0x8816, 0xF3B6 }, { 0x881B, 0xF3BA }, { 0x8821, 0xF3BB }, { 0x8822, 0xB4C0 }, { 0x8832, 0xEEC3 }, 
-	{ 0x8839, 0xF3BC }, { 0x883C, 0xF3BD }, { 0x8840, 0xD1AA }, { 0x8844, 0xF4AC }, { 0x8845, 0xD0C6 }, { 0x884C, 0xD0D0 }, { 0x884D, 0xD1DC }, { 0x8854, 0xCFCE }, 
-	{ 0x8857, 0xBDD6 }, { 0x8859, 0xD1C3 }, { 0x8861, 0xBAE2 }, { 0x8862, 0xE1E9 }, { 0x8863, 0xD2C2 }, { 0x8864, 0xF1C2 }, { 0x8865, 0xB2B9 }, { 0x8868, 0xB1ED }, 
-	{ 0x8869, 0xF1C3 }, { 0x886B, 0xC9C0 }, { 0x886C, 0xB3C4 }, { 0x886E, 0xD9F2 }, { 0x8870, 0xCBA5 }, { 0x8872, 0xF1C4 }, { 0x8877, 0xD6D4 }, { 0x887D, 0xF1C5 }, 
-	{ 0x887E, 0xF4C0 }, { 0x887F, 0xF1C6 }, { 0x8881, 0xD4AC }, { 0x8882, 0xF1C7 }, { 0x8884, 0xB0C0 }, { 0x8885, 0xF4C1 }, { 0x8888, 0xF4C2 }, { 0x888B, 0xB4FC }, 
-	{ 0x888D, 0xC5DB }, { 0x8892, 0xCCBB }, { 0x8896, 0xD0E4 }, { 0x889C, 0xCDE0 }, { 0x88A2, 0xF1C8 }, { 0x88A4, 0xD9F3 }, { 0x88AB, 0xB1BB }, { 0x88AD, 0xCFAE }, 
-	{ 0x88B1, 0xB8A4 }, { 0x88B7, 0xF1CA }, { 0x88BC, 0xF1CB }, { 0x88C1, 0xB2C3 }, { 0x88C2, 0xC1D1 }, { 0x88C5, 0xD7B0 }, { 0x88C6, 0xF1C9 }, { 0x88C9, 0xF1CC }, 
-	{ 0x88CE, 0xF1CE }, { 0x88D2, 0xD9F6 }, { 0x88D4, 0xD2E1 }, { 0x88D5, 0xD4A3 }, { 0x88D8, 0xF4C3 }, { 0x88D9, 0xC8B9 }, { 0x88DF, 0xF4C4 }, { 0x88E2, 0xF1CD }, 
-	{ 0x88E3, 0xF1CF }, { 0x88E4, 0xBFE3 }, { 0x88E5, 0xF1D0 }, { 0x88E8, 0xF1D4 }, { 0x88F0, 0xF1D6 }, { 0x88F1, 0xF1D1 }, { 0x88F3, 0xC9D1 }, { 0x88F4, 0xC5E1 }, 
-	{ 0x88F8, 0xC2E3 }, { 0x88F9, 0xB9FC }, { 0x88FC, 0xF1D3 }, { 0x88FE, 0xF1D5 }, { 0x8902, 0xB9D3 }, { 0x890A, 0xF1DB }, { 0x8910, 0xBAD6 }, { 0x8912, 0xB0FD }, 
-	{ 0x8913, 0xF1D9 }, { 0x8919, 0xF1D8 }, { 0x891A, 0xF1D2 }, { 0x891B, 0xF1DA }, { 0x8921, 0xF1D7 }, { 0x8925, 0xC8EC }, { 0x892A, 0xCDCA }, { 0x892B, 0xF1DD }, 
-	{ 0x8930, 0xE5BD }, { 0x8934, 0xF1DC }, { 0x8936, 0xF1DE }, { 0x8941, 0xF1DF }, { 0x8944, 0xCFE5 }, { 0x895E, 0xF4C5 }, { 0x895F, 0xBDF3 }, { 0x8966, 0xF1E0 }, 
-	{ 0x897B, 0xF1E1 }, { 0x897F, 0xCEF7 }, { 0x8981, 0xD2AA }, { 0x8983, 0xF1FB }, { 0x8986, 0xB8B2 }, { 0x89C1, 0xBCFB }, { 0x89C2, 0xB9DB }, { 0x89C4, 0xB9E6 }, 
-	{ 0x89C5, 0xC3D9 }, { 0x89C6, 0xCAD3 }, { 0x89C7, 0xEAE8 }, { 0x89C8, 0xC0C0 }, { 0x89C9, 0xBEF5 }, { 0x89CA, 0xEAE9 }, { 0x89CB, 0xEAEA }, { 0x89CC, 0xEAEB }, 
-	{ 0x89CE, 0xEAEC }, { 0x89CF, 0xEAED }, { 0x89D0, 0xEAEE }, { 0x89D1, 0xEAEF }, { 0x89D2, 0xBDC7 }, { 0x89D6, 0xF5FB }, { 0x89DA, 0xF5FD }, { 0x89DC, 0xF5FE }, 
-	{ 0x89DE, 0xF5FC }, { 0x89E3, 0xBDE2 }, { 0x89E5, 0xF6A1 }, { 0x89E6, 0xB4A5 }, { 0x89EB, 0xF6A2 }, { 0x89EF, 0xF6A3 }, { 0x89F3, 0xECB2 }, { 0x8A00, 0xD1D4 }, 
-	{ 0x8A07, 0xD9EA }, { 0x8A3E, 0xF6A4 }, { 0x8A48, 0xEEBA }, { 0x8A79, 0xD5B2 }, { 0x8A89, 0xD3FE }, { 0x8A8A, 0xCCDC }, { 0x8A93, 0xCAC4 }, { 0x8B07, 0xE5C0 }, 
-	{ 0x8B26, 0xF6A5 }, { 0x8B66, 0xBEAF }, { 0x8B6C, 0xC6A9 }, { 0x8BA0, 0xDAA5 }, { 0x8BA1, 0xBCC6 }, { 0x8BA2, 0xB6A9 }, { 0x8BA3, 0xB8BC }, { 0x8BA4, 0xC8CF }, 
-	{ 0x8BA5, 0xBCA5 }, { 0x8BA6, 0xDAA6 }, { 0x8BA7, 0xDAA7 }, { 0x8BA8, 0xCCD6 }, { 0x8BA9, 0xC8C3 }, { 0x8BAA, 0xDAA8 }, { 0x8BAB, 0xC6FD }, { 0x8BAD, 0xD1B5 }, 
-	{ 0x8BAE, 0xD2E9 }, { 0x8BAF, 0xD1B6 }, { 0x8BB0, 0xBCC7 }, { 0x8BB2, 0xBDB2 }, { 0x8BB3, 0xBBE4 }, { 0x8BB4, 0xDAA9 }, { 0x8BB5, 0xDAAA }, { 0x8BB6, 0xD1C8 }, 
-	{ 0x8BB7, 0xDAAB }, { 0x8BB8, 0xD0ED }, { 0x8BB9, 0xB6EF }, { 0x8BBA, 0xC2DB }, { 0x8BBC, 0xCBCF }, { 0x8BBD, 0xB7ED }, { 0x8BBE, 0xC9E8 }, { 0x8BBF, 0xB7C3 }, 
-	{ 0x8BC0, 0xBEF7 }, { 0x8BC1, 0xD6A4 }, { 0x8BC2, 0xDAAC }, { 0x8BC3, 0xDAAD }, { 0x8BC4, 0xC6C0 }, { 0x8BC5, 0xD7E7 }, { 0x8BC6, 0xCAB6 }, { 0x8BC8, 0xD5A9 }, 
-	{ 0x8BC9, 0xCBDF }, { 0x8BCA, 0xD5EF }, { 0x8BCB, 0xDAAE }, { 0x8BCC, 0xD6DF }, { 0x8BCD, 0xB4CA }, { 0x8BCE, 0xDAB0 }, { 0x8BCF, 0xDAAF }, { 0x8BD1, 0xD2EB }, 
-	{ 0x8BD2, 0xDAB1 }, { 0x8BD3, 0xDAB2 }, { 0x8BD4, 0xDAB3 }, { 0x8BD5, 0xCAD4 }, { 0x8BD6, 0xDAB4 }, { 0x8BD7, 0xCAAB }, { 0x8BD8, 0xDAB5 }, { 0x8BD9, 0xDAB6 }, 
-	{ 0x8BDA, 0xB3CF }, { 0x8BDB, 0xD6EF }, { 0x8BDC, 0xDAB7 }, { 0x8BDD, 0xBBB0 }, { 0x8BDE, 0xB5AE }, { 0x8BDF, 0xDAB8 }, { 0x8BE0, 0xDAB9 }, { 0x8BE1, 0xB9EE }, 
-	{ 0x8BE2, 0xD1AF }, { 0x8BE3, 0xD2E8 }, { 0x8BE4, 0xDABA }, { 0x8BE5, 0xB8C3 }, { 0x8BE6, 0xCFEA }, { 0x8BE7, 0xB2EF }, { 0x8BE8, 0xDABB }, { 0x8BE9, 0xDABC }, 
-	{ 0x8BEB, 0xBDEB }, { 0x8BEC, 0xCEDC }, { 0x8BED, 0xD3EF }, { 0x8BEE, 0xDABD }, { 0x8BEF, 0xCEF3 }, { 0x8BF0, 0xDABE }, { 0x8BF1, 0xD3D5 }, { 0x8BF2, 0xBBE5 }, 
-	{ 0x8BF3, 0xDABF }, { 0x8BF4, 0xCBB5 }, { 0x8BF5, 0xCBD0 }, { 0x8BF6, 0xDAC0 }, { 0x8BF7, 0xC7EB }, { 0x8BF8, 0xD6EE }, { 0x8BF9, 0xDAC1 }, { 0x8BFA, 0xC5B5 }, 
-	{ 0x8BFB, 0xB6C1 }, { 0x8BFC, 0xDAC2 }, { 0x8BFD, 0xB7CC }, { 0x8BFE, 0xBFCE }, { 0x8BFF, 0xDAC3 }, { 0x8C00, 0xDAC4 }, { 0x8C01, 0xCBAD }, { 0x8C02, 0xDAC5 }, 
-	{ 0x8C03, 0xB5F7 }, { 0x8C04, 0xDAC6 }, { 0x8C05, 0xC1C2 }, { 0x8C06, 0xD7BB }, { 0x8C07, 0xDAC7 }, { 0x8C08, 0xCCB8 }, { 0x8C0A, 0xD2EA }, { 0x8C0B, 0xC4B1 }, 
-	{ 0x8C0C, 0xDAC8 }, { 0x8C0D, 0xB5FD }, { 0x8C0E, 0xBBD1 }, { 0x8C0F, 0xDAC9 }, { 0x8C10, 0xD0B3 }, { 0x8C11, 0xDACA }, { 0x8C12, 0xDACB }, { 0x8C13, 0xCEBD }, 
-	{ 0x8C14, 0xDACC }, { 0x8C15, 0xDACD }, { 0x8C16, 0xDACE }, { 0x8C17, 0xB2F7 }, { 0x8C18, 0xDAD1 }, { 0x8C19, 0xDACF }, { 0x8C1A, 0xD1E8 }, { 0x8C1B, 0xDAD0 }, 
-	{ 0x8C1C, 0xC3D5 }, { 0x8C1D, 0xDAD2 }, { 0x8C1F, 0xDAD3 }, { 0x8C20, 0xDAD4 }, { 0x8C21, 0xDAD5 }, { 0x8C22, 0xD0BB }, { 0x8C23, 0xD2A5 }, { 0x8C24, 0xB0F9 }, 
-	{ 0x8C25, 0xDAD6 }, { 0x8C26, 0xC7AB }, { 0x8C27, 0xDAD7 }, { 0x8C28, 0xBDF7 }, { 0x8C29, 0xC3A1 }, { 0x8C2A, 0xDAD8 }, { 0x8C2B, 0xDAD9 }, { 0x8C2C, 0xC3FD }, 
-	{ 0x8C2D, 0xCCB7 }, { 0x8C2E, 0xDADA }, { 0x8C2F, 0xDADB }, { 0x8C30, 0xC0BE }, { 0x8C31, 0xC6D7 }, { 0x8C32, 0xDADC }, { 0x8C33, 0xDADD }, { 0x8C34, 0xC7B4 }, 
-	{ 0x8C35, 0xDADE }, { 0x8C36, 0xDADF }, { 0x8C37, 0xB9C8 }, { 0x8C41, 0xBBED }, { 0x8C46, 0xB6B9 }, { 0x8C47, 0xF4F8 }, { 0x8C49, 0xF4F9 }, { 0x8C4C, 0xCDE3 }, 
-	{ 0x8C55, 0xF5B9 }, { 0x8C5A, 0xEBE0 }, { 0x8C61, 0xCFF3 }, { 0x8C62, 0xBBBF }, { 0x8C6A, 0xBAC0 }, { 0x8C6B, 0xD4A5 }, { 0x8C73, 0xE1D9 }, { 0x8C78, 0xF5F4 }, 
-	{ 0x8C79, 0xB1AA }, { 0x8C7A, 0xB2F2 }, { 0x8C82, 0xF5F5 }, { 0x8C85, 0xF5F7 }, { 0x8C89, 0xBAD1 }, { 0x8C8A, 0xF5F6 }, { 0x8C8C, 0xC3B2 }, { 0x8C94, 0xF5F9 }, 
-	{ 0x8C98, 0xF5F8 }, { 0x8D1D, 0xB1B4 }, { 0x8D1E, 0xD5EA }, { 0x8D1F, 0xB8BA }, { 0x8D21, 0xB9B1 }, { 0x8D22, 0xB2C6 }, { 0x8D23, 0xD4F0 }, { 0x8D24, 0xCFCD }, 
-	{ 0x8D25, 0xB0DC }, { 0x8D26, 0xD5CB }, { 0x8D27, 0xBBF5 }, { 0x8D28, 0xD6CA }, { 0x8D29, 0xB7B7 }, { 0x8D2A, 0xCCB0 }, { 0x8D2B, 0xC6B6 }, { 0x8D2C, 0xB1E1 }, 
-	{ 0x8D2D, 0xB9BA }, { 0x8D2E, 0xD6FC }, { 0x8D2F, 0xB9E1 }, { 0x8D30, 0xB7A1 }, { 0x8D31, 0xBCFA }, { 0x8D32, 0xEADA }, { 0x8D33, 0xEADB }, { 0x8D34, 0xCCF9 }, 
-	{ 0x8D35, 0xB9F3 }, { 0x8D36, 0xEADC }, { 0x8D37, 0xB4FB }, { 0x8D38, 0xC3B3 }, { 0x8D39, 0xB7D1 }, { 0x8D3A, 0xBAD8 }, { 0x8D3B, 0xEADD }, { 0x8D3C, 0xD4F4 }, 
-	{ 0x8D3D, 0xEADE }, { 0x8D3E, 0xBCD6 }, { 0x8D3F, 0xBBDF }, { 0x8D40, 0xEADF }, { 0x8D41, 0xC1DE }, { 0x8D42, 0xC2B8 }, { 0x8D43, 0xD4DF }, { 0x8D44, 0xD7CA }, 
-	{ 0x8D45, 0xEAE0 }, { 0x8D46, 0xEAE1 }, { 0x8D47, 0xEAE4 }, { 0x8D48, 0xEAE2 }, { 0x8D49, 0xEAE3 }, { 0x8D4A, 0xC9DE }, { 0x8D4B, 0xB8B3 }, { 0x8D4C, 0xB6C4 }, 
-	{ 0x8D4D, 0xEAE5 }, { 0x8D4E, 0xCAEA }, { 0x8D4F, 0xC9CD }, { 0x8D50, 0xB4CD }, { 0x8D53, 0xE2D9 }, { 0x8D54, 0xC5E2 }, { 0x8D55, 0xEAE6 }, { 0x8D56, 0xC0B5 }, 
-	{ 0x8D58, 0xD7B8 }, { 0x8D59, 0xEAE7 }, { 0x8D5A, 0xD7AC }, { 0x8D5B, 0xC8FC }, { 0x8D5C, 0xD8D3 }, { 0x8D5D, 0xD8CD }, { 0x8D5E, 0xD4DE }, { 0x8D60, 0xD4F9 }, 
-	{ 0x8D61, 0xC9C4 }, { 0x8D62, 0xD3AE }, { 0x8D63, 0xB8D3 }, { 0x8D64, 0xB3E0 }, { 0x8D66, 0xC9E2 }, { 0x8D67, 0xF4F6 }, { 0x8D6B, 0xBAD5 }, { 0x8D6D, 0xF4F7 }, 
-	{ 0x8D70, 0xD7DF }, { 0x8D73, 0xF4F1 }, { 0x8D74, 0xB8B0 }, { 0x8D75, 0xD5D4 }, { 0x8D76, 0xB8CF }, { 0x8D77, 0xC6F0 }, { 0x8D81, 0xB3C3 }, { 0x8D84, 0xF4F2 }, 
-	{ 0x8D85, 0xB3AC }, { 0x8D8A, 0xD4BD }, { 0x8D8B, 0xC7F7 }, { 0x8D91, 0xF4F4 }, { 0x8D94, 0xF4F3 }, { 0x8D9F, 0xCCCB }, { 0x8DA3, 0xC8A4 }, { 0x8DB1, 0xF4F5 }, 
-	{ 0x8DB3, 0xD7E3 }, { 0x8DB4, 0xC5BF }, { 0x8DB5, 0xF5C0 }, { 0x8DB8, 0xF5BB }, { 0x8DBA, 0xF5C3 }, { 0x8DBC, 0xF5C2 }, { 0x8DBE, 0xD6BA }, { 0x8DBF, 0xF5C1 }, 
-	{ 0x8DC3, 0xD4BE }, { 0x8DC4, 0xF5C4 }, { 0x8DC6, 0xF5CC }, { 0x8DCB, 0xB0CF }, { 0x8DCC, 0xB5F8 }, { 0x8DCE, 0xF5C9 }, { 0x8DCF, 0xF5CA }, { 0x8DD1, 0xC5DC }, 
-	{ 0x8DD6, 0xF5C5 }, { 0x8DD7, 0xF5C6 }, { 0x8DDA, 0xF5C7 }, { 0x8DDB, 0xF5CB }, { 0x8DDD, 0xBEE0 }, { 0x8DDE, 0xF5C8 }, { 0x8DDF, 0xB8FA }, { 0x8DE3, 0xF5D0 }, 
-	{ 0x8DE4, 0xF5D3 }, { 0x8DE8, 0xBFE7 }, { 0x8DEA, 0xB9F2 }, { 0x8DEB, 0xF5BC }, { 0x8DEC, 0xF5CD }, { 0x8DEF, 0xC2B7 }, { 0x8DF3, 0xCCF8 }, { 0x8DF5, 0xBCF9 }, 
-	{ 0x8DF7, 0xF5CE }, { 0x8DF8, 0xF5CF }, { 0x8DF9, 0xF5D1 }, { 0x8DFA, 0xB6E5 }, { 0x8DFB, 0xF5D2 }, { 0x8DFD, 0xF5D5 }, { 0x8E05, 0xF5BD }, { 0x8E09, 0xF5D4 }, 
-	{ 0x8E0A, 0xD3BB }, { 0x8E0C, 0xB3EC }, { 0x8E0F, 0xCCA4 }, { 0x8E14, 0xF5D6 }, { 0x8E1D, 0xF5D7 }, { 0x8E1E, 0xBEE1 }, { 0x8E1F, 0xF5D8 }, { 0x8E22, 0xCCDF }, 
-	{ 0x8E23, 0xF5DB }, { 0x8E29, 0xB2C8 }, { 0x8E2A, 0xD7D9 }, { 0x8E2C, 0xF5D9 }, { 0x8E2E, 0xF5DA }, { 0x8E2F, 0xF5DC }, { 0x8E31, 0xF5E2 }, { 0x8E35, 0xF5E0 }, 
-	{ 0x8E39, 0xF5DF }, { 0x8E3A, 0xF5DD }, { 0x8E3D, 0xF5E1 }, { 0x8E40, 0xF5DE }, { 0x8E41, 0xF5E4 }, { 0x8E42, 0xF5E5 }, { 0x8E44, 0xCCE3 }, { 0x8E47, 0xE5BF }, 
-	{ 0x8E48, 0xB5B8 }, { 0x8E49, 0xF5E3 }, { 0x8E4A, 0xF5E8 }, { 0x8E4B, 0xCCA3 }, { 0x8E51, 0xF5E6 }, { 0x8E52, 0xF5E7 }, { 0x8E59, 0xF5BE }, { 0x8E66, 0xB1C4 }, 
-	{ 0x8E69, 0xF5BF }, { 0x8E6C, 0xB5C5 }, { 0x8E6D, 0xB2E4 }, { 0x8E6F, 0xF5EC }, { 0x8E70, 0xF5E9 }, { 0x8E72, 0xB6D7 }, { 0x8E74, 0xF5ED }, { 0x8E76, 0xF5EA }, 
-	{ 0x8E7C, 0xF5EB }, { 0x8E7F, 0xB4DA }, { 0x8E81, 0xD4EA }, { 0x8E85, 0xF5EE }, { 0x8E87, 0xB3F9 }, { 0x8E8F, 0xF5EF }, { 0x8E90, 0xF5F1 }, { 0x8E94, 0xF5F0 }, 
-	{ 0x8E9C, 0xF5F2 }, { 0x8E9E, 0xF5F3 }, { 0x8EAB, 0xC9ED }, { 0x8EAC, 0xB9AA }, { 0x8EAF, 0xC7FB }, { 0x8EB2, 0xB6E3 }, { 0x8EBA, 0xCCC9 }, { 0x8ECE, 0xEAA6 }, 
-	{ 0x8F66, 0xB3B5 }, { 0x8F67, 0xD4FE }, { 0x8F68, 0xB9EC }, { 0x8F69, 0xD0F9 }, { 0x8F6B, 0xE9ED }, { 0x8F6C, 0xD7AA }, { 0x8F6D, 0xE9EE }, { 0x8F6E, 0xC2D6 }, 
-	{ 0x8F6F, 0xC8ED }, { 0x8F70, 0xBAE4 }, { 0x8F71, 0xE9EF }, { 0x8F72, 0xE9F0 }, { 0x8F73, 0xE9F1 }, { 0x8F74, 0xD6E1 }, { 0x8F75, 0xE9F2 }, { 0x8F76, 0xE9F3 }, 
-	{ 0x8F77, 0xE9F5 }, { 0x8F78, 0xE9F4 }, { 0x8F79, 0xE9F6 }, { 0x8F7A, 0xE9F7 }, { 0x8F7B, 0xC7E1 }, { 0x8F7C, 0xE9F8 }, { 0x8F7D, 0xD4D8 }, { 0x8F7E, 0xE9F9 }, 
-	{ 0x8F7F, 0xBDCE }, { 0x8F81, 0xE9FA }, { 0x8F82, 0xE9FB }, { 0x8F83, 0xBDCF }, { 0x8F84, 0xE9FC }, { 0x8F85, 0xB8A8 }, { 0x8F86, 0xC1BE }, { 0x8F87, 0xE9FD }, 
-	{ 0x8F88, 0xB1B2 }, { 0x8F89, 0xBBD4 }, { 0x8F8A, 0xB9F5 }, { 0x8F8B, 0xE9FE }, { 0x8F8D, 0xEAA1 }, { 0x8F8E, 0xEAA2 }, { 0x8F8F, 0xEAA3 }, { 0x8F90, 0xB7F8 }, 
-	{ 0x8F91, 0xBCAD }, { 0x8F93, 0xCAE4 }, { 0x8F94, 0xE0CE }, { 0x8F95, 0xD4AF }, { 0x8F96, 0xCFBD }, { 0x8F97, 0xD5B7 }, { 0x8F98, 0xEAA4 }, { 0x8F99, 0xD5DE }, 
-	{ 0x8F9A, 0xEAA5 }, { 0x8F9B, 0xD0C1 }, { 0x8F9C, 0xB9BC }, { 0x8F9E, 0xB4C7 }, { 0x8F9F, 0xB1D9 }, { 0x8FA3, 0xC0B1 }, { 0x8FA8, 0xB1E6 }, { 0x8FA9, 0xB1E7 }, 
-	{ 0x8FAB, 0xB1E8 }, { 0x8FB0, 0xB3BD }, { 0x8FB1, 0xC8E8 }, { 0x8FB6, 0xE5C1 }, { 0x8FB9, 0xB1DF }, { 0x8FBD, 0xC1C9 }, { 0x8FBE, 0xB4EF }, { 0x8FC1, 0xC7A8 }, 
-	{ 0x8FC2, 0xD3D8 }, { 0x8FC4, 0xC6F9 }, { 0x8FC5, 0xD1B8 }, { 0x8FC7, 0xB9FD }, { 0x8FC8, 0xC2F5 }, { 0x8FCE, 0xD3AD }, { 0x8FD0, 0xD4CB }, { 0x8FD1, 0xBDFC }, 
-	{ 0x8FD3, 0xE5C2 }, { 0x8FD4, 0xB7B5 }, { 0x8FD5, 0xE5C3 }, { 0x8FD8, 0xBBB9 }, { 0x8FD9, 0xD5E2 }, { 0x8FDB, 0xBDF8 }, { 0x8FDC, 0xD4B6 }, { 0x8FDD, 0xCEA5 }, 
-	{ 0x8FDE, 0xC1AC }, { 0x8FDF, 0xB3D9 }, { 0x8FE2, 0xCCF6 }, { 0x8FE4, 0xE5C6 }, { 0x8FE5, 0xE5C4 }, { 0x8FE6, 0xE5C8 }, { 0x8FE8, 0xE5CA }, { 0x8FE9, 0xE5C7 }, 
-	{ 0x8FEA, 0xB5CF }, { 0x8FEB, 0xC6C8 }, { 0x8FED, 0xB5FC }, { 0x8FEE, 0xE5C5 }, { 0x8FF0, 0xCAF6 }, { 0x8FF3, 0xE5C9 }, { 0x8FF7, 0xC3D4 }, { 0x8FF8, 0xB1C5 }, 
-	{ 0x8FF9, 0xBCA3 }, { 0x8FFD, 0xD7B7 }, { 0x9000, 0xCDCB }, { 0x9001, 0xCBCD }, { 0x9002, 0xCACA }, { 0x9003, 0xCCD3 }, { 0x9004, 0xE5CC }, { 0x9005, 0xE5CB }, 
-	{ 0x9006, 0xC4E6 }, { 0x9009, 0xD1A1 }, { 0x900A, 0xD1B7 }, { 0x900B, 0xE5CD }, { 0x900D, 0xE5D0 }, { 0x900F, 0xCDB8 }, { 0x9010, 0xD6F0 }, { 0x9011, 0xE5CF }, 
-	{ 0x9012, 0xB5DD }, { 0x9014, 0xCDBE }, { 0x9016, 0xE5D1 }, { 0x9017, 0xB6BA }, { 0x901A, 0xCDA8 }, { 0x901B, 0xB9E4 }, { 0x901D, 0xCAC5 }, { 0x901E, 0xB3D1 }, 
-	{ 0x901F, 0xCBD9 }, { 0x9020, 0xD4EC }, { 0x9021, 0xE5D2 }, { 0x9022, 0xB7EA }, { 0x9026, 0xE5CE }, { 0x902D, 0xE5D5 }, { 0x902E, 0xB4FE }, { 0x902F, 0xE5D6 }, 
-	{ 0x9035, 0xE5D3 }, { 0x9036, 0xE5D4 }, { 0x9038, 0xD2DD }, { 0x903B, 0xC2DF }, { 0x903C, 0xB1C6 }, { 0x903E, 0xD3E2 }, { 0x9041, 0xB6DD }, { 0x9042, 0xCBEC }, 
-	{ 0x9044, 0xE5D7 }, { 0x9047, 0xD3F6 }, { 0x904D, 0xB1E9 }, { 0x904F, 0xB6F4 }, { 0x9050, 0xE5DA }, { 0x9051, 0xE5D8 }, { 0x9052, 0xE5D9 }, { 0x9053, 0xB5C0 }, 
-	{ 0x9057, 0xD2C5 }, { 0x9058, 0xE5DC }, { 0x905B, 0xE5DE }, { 0x9062, 0xE5DD }, { 0x9063, 0xC7B2 }, { 0x9065, 0xD2A3 }, { 0x9068, 0xE5DB }, { 0x906D, 0xD4E2 }, 
-	{ 0x906E, 0xD5DA }, { 0x9074, 0xE5E0 }, { 0x9075, 0xD7F1 }, { 0x907D, 0xE5E1 }, { 0x907F, 0xB1DC }, { 0x9080, 0xD1FB }, { 0x9082, 0xE5E2 }, { 0x9083, 0xE5E4 }, 
-	{ 0x9088, 0xE5E3 }, { 0x908B, 0xE5E5 }, { 0x9091, 0xD2D8 }, { 0x9093, 0xB5CB }, { 0x9095, 0xE7DF }, { 0x9097, 0xDAF5 }, { 0x9099, 0xDAF8 }, { 0x909B, 0xDAF6 }, 
-	{ 0x909D, 0xDAF7 }, { 0x90A1, 0xDAFA }, { 0x90A2, 0xD0CF }, { 0x90A3, 0xC4C7 }, { 0x90A6, 0xB0EE }, { 0x90AA, 0xD0B0 }, { 0x90AC, 0xDAF9 }, { 0x90AE, 0xD3CA }, 
-	{ 0x90AF, 0xBAAA }, { 0x90B0, 0xDBA2 }, { 0x90B1, 0xC7F1 }, { 0x90B3, 0xDAFC }, { 0x90B4, 0xDAFB }, { 0x90B5, 0xC9DB }, { 0x90B6, 0xDAFD }, { 0x90B8, 0xDBA1 }, 
-	{ 0x90B9, 0xD7DE }, { 0x90BA, 0xDAFE }, { 0x90BB, 0xC1DA }, { 0x90BE, 0xDBA5 }, { 0x90C1, 0xD3F4 }, { 0x90C4, 0xDBA7 }, { 0x90C5, 0xDBA4 }, { 0x90C7, 0xDBA8 }, 
-	{ 0x90CA, 0xBDBC }, { 0x90CE, 0xC0C9 }, { 0x90CF, 0xDBA3 }, { 0x90D0, 0xDBA6 }, { 0x90D1, 0xD6A3 }, { 0x90D3, 0xDBA9 }, { 0x90D7, 0xDBAD }, { 0x90DB, 0xDBAE }, 
-	{ 0x90DC, 0xDBAC }, { 0x90DD, 0xBAC2 }, { 0x90E1, 0xBFA4 }, { 0x90E2, 0xDBAB }, { 0x90E6, 0xDBAA }, { 0x90E7, 0xD4C7 }, { 0x90E8, 0xB2BF }, { 0x90EB, 0xDBAF }, 
-	{ 0x90ED, 0xB9F9 }, { 0x90EF, 0xDBB0 }, { 0x90F4, 0xB3BB }, { 0x90F8, 0xB5A6 }, { 0x90FD, 0xB6BC }, { 0x90FE, 0xDBB1 }, { 0x9102, 0xB6F5 }, { 0x9104, 0xDBB2 }, 
-	{ 0x9119, 0xB1C9 }, { 0x911E, 0xDBB4 }, { 0x9122, 0xDBB3 }, { 0x9123, 0xDBB5 }, { 0x912F, 0xDBB7 }, { 0x9131, 0xDBB6 }, { 0x9139, 0xDBB8 }, { 0x9143, 0xDBB9 }, 
-	{ 0x9146, 0xDBBA }, { 0x9149, 0xD3CF }, { 0x914A, 0xF4FA }, { 0x914B, 0xC7F5 }, { 0x914C, 0xD7C3 }, { 0x914D, 0xC5E4 }, { 0x914E, 0xF4FC }, { 0x914F, 0xF4FD }, 
-	{ 0x9150, 0xF4FB }, { 0x9152, 0xBEC6 }, { 0x9157, 0xD0EF }, { 0x915A, 0xB7D3 }, { 0x915D, 0xD4CD }, { 0x915E, 0xCCAA }, { 0x9161, 0xF5A2 }, { 0x9162, 0xF5A1 }, 
-	{ 0x9163, 0xBAA8 }, { 0x9164, 0xF4FE }, { 0x9165, 0xCBD6 }, { 0x9169, 0xF5A4 }, { 0x916A, 0xC0D2 }, { 0x916C, 0xB3EA }, { 0x916E, 0xCDAA }, { 0x916F, 0xF5A5 }, 
-	{ 0x9170, 0xF5A3 }, { 0x9171, 0xBDB4 }, { 0x9172, 0xF5A8 }, { 0x9174, 0xF5A9 }, { 0x9175, 0xBDCD }, { 0x9176, 0xC3B8 }, { 0x9177, 0xBFE1 }, { 0x9178, 0xCBE1 }, 
-	{ 0x9179, 0xF5AA }, { 0x917D, 0xF5A6 }, { 0x917E, 0xF5A7 }, { 0x917F, 0xC4F0 }, { 0x9185, 0xF5AC }, { 0x9187, 0xB4BC }, { 0x9189, 0xD7ED }, { 0x918B, 0xB4D7 }, 
-	{ 0x918C, 0xF5AB }, { 0x918D, 0xF5AE }, { 0x9190, 0xF5AD }, { 0x9191, 0xF5AF }, { 0x9192, 0xD0D1 }, { 0x919A, 0xC3D1 }, { 0x919B, 0xC8A9 }, { 0x91A2, 0xF5B0 }, 
-	{ 0x91A3, 0xF5B1 }, { 0x91AA, 0xF5B2 }, { 0x91AD, 0xF5B3 }, { 0x91AE, 0xF5B4 }, { 0x91AF, 0xF5B5 }, { 0x91B4, 0xF5B7 }, { 0x91B5, 0xF5B6 }, { 0x91BA, 0xF5B8 }, 
-	{ 0x91C7, 0xB2C9 }, { 0x91C9, 0xD3D4 }, { 0x91CA, 0xCACD }, { 0x91CC, 0xC0EF }, { 0x91CD, 0xD6D8 }, { 0x91CE, 0xD2B0 }, { 0x91CF, 0xC1BF }, { 0x91D1, 0xBDF0 }, 
-	{ 0x91DC, 0xB8AA }, { 0x9274, 0xBCF8 }, { 0x928E, 0xF6C6 }, { 0x92AE, 0xF6C7 }, { 0x92C8, 0xF6C8 }, { 0x933E, 0xF6C9 }, { 0x936A, 0xF6CA }, { 0x938F, 0xF6CC }, 
-	{ 0x93CA, 0xF6CB }, { 0x93D6, 0xF7E9 }, { 0x943E, 0xF6CD }, { 0x946B, 0xF6CE }, { 0x9485, 0xEEC4 }, { 0x9486, 0xEEC5 }, { 0x9487, 0xEEC6 }, { 0x9488, 0xD5EB }, 
-	{ 0x9489, 0xB6A4 }, { 0x948A, 0xEEC8 }, { 0x948B, 0xEEC7 }, { 0x948C, 0xEEC9 }, { 0x948D, 0xEECA }, { 0x948E, 0xC7A5 }, { 0x948F, 0xEECB }, { 0x9490, 0xEECC }, 
-	{ 0x9492, 0xB7B0 }, { 0x9493, 0xB5F6 }, { 0x9494, 0xEECD }, { 0x9495, 0xEECF }, { 0x9497, 0xEECE }, { 0x9499, 0xB8C6 }, { 0x949A, 0xEED0 }, { 0x949B, 0xEED1 }, 
-	{ 0x949C, 0xEED2 }, { 0x949D, 0xB6DB }, { 0x949E, 0xB3AE }, { 0x949F, 0xD6D3 }, { 0x94A0, 0xC4C6 }, { 0x94A1, 0xB1B5 }, { 0x94A2, 0xB8D6 }, { 0x94A3, 0xEED3 }, 
-	{ 0x94A4, 0xEED4 }, { 0x94A5, 0xD4BF }, { 0x94A6, 0xC7D5 }, { 0x94A7, 0xBEFB }, { 0x94A8, 0xCED9 }, { 0x94A9, 0xB9B3 }, { 0x94AA, 0xEED6 }, { 0x94AB, 0xEED5 }, 
-	{ 0x94AC, 0xEED8 }, { 0x94AD, 0xEED7 }, { 0x94AE, 0xC5A5 }, { 0x94AF, 0xEED9 }, { 0x94B0, 0xEEDA }, { 0x94B1, 0xC7AE }, { 0x94B2, 0xEEDB }, { 0x94B3, 0xC7AF }, 
-	{ 0x94B4, 0xEEDC }, { 0x94B5, 0xB2A7 }, { 0x94B6, 0xEEDD }, { 0x94B7, 0xEEDE }, { 0x94B8, 0xEEDF }, { 0x94B9, 0xEEE0 }, { 0x94BA, 0xEEE1 }, { 0x94BB, 0xD7EA }, 
-	{ 0x94BC, 0xEEE2 }, { 0x94BD, 0xEEE3 }, { 0x94BE, 0xBCD8 }, { 0x94BF, 0xEEE4 }, { 0x94C0, 0xD3CB }, { 0x94C1, 0xCCFA }, { 0x94C2, 0xB2AC }, { 0x94C3, 0xC1E5 }, 
-	{ 0x94C4, 0xEEE5 }, { 0x94C5, 0xC7A6 }, { 0x94C6, 0xC3AD }, { 0x94C8, 0xEEE6 }, { 0x94C9, 0xEEE7 }, { 0x94CA, 0xEEE8 }, { 0x94CB, 0xEEE9 }, { 0x94CC, 0xEEEA }, 
-	{ 0x94CD, 0xEEEB }, { 0x94CE, 0xEEEC }, { 0x94D0, 0xEEED }, { 0x94D1, 0xEEEE }, { 0x94D2, 0xEEEF }, { 0x94D5, 0xEEF0 }, { 0x94D6, 0xEEF1 }, { 0x94D7, 0xEEF2 }, 
-	{ 0x94D8, 0xEEF4 }, { 0x94D9, 0xEEF3 }, { 0x94DB, 0xEEF5 }, { 0x94DC, 0xCDAD }, { 0x94DD, 0xC2C1 }, { 0x94DE, 0xEEF6 }, { 0x94DF, 0xEEF7 }, { 0x94E0, 0xEEF8 }, 
-	{ 0x94E1, 0xD5A1 }, { 0x94E2, 0xEEF9 }, { 0x94E3, 0xCFB3 }, { 0x94E4, 0xEEFA }, { 0x94E5, 0xEEFB }, { 0x94E7, 0xEEFC }, { 0x94E8, 0xEEFD }, { 0x94E9, 0xEFA1 }, 
-	{ 0x94EA, 0xEEFE }, { 0x94EB, 0xEFA2 }, { 0x94EC, 0xB8F5 }, { 0x94ED, 0xC3FA }, { 0x94EE, 0xEFA3 }, { 0x94EF, 0xEFA4 }, { 0x94F0, 0xBDC2 }, { 0x94F1, 0xD2BF }, 
-	{ 0x94F2, 0xB2F9 }, { 0x94F3, 0xEFA5 }, { 0x94F4, 0xEFA6 }, { 0x94F5, 0xEFA7 }, { 0x94F6, 0xD2F8 }, { 0x94F7, 0xEFA8 }, { 0x94F8, 0xD6FD }, { 0x94F9, 0xEFA9 }, 
-	{ 0x94FA, 0xC6CC }, { 0x94FC, 0xEFAA }, { 0x94FD, 0xEFAB }, { 0x94FE, 0xC1B4 }, { 0x94FF, 0xEFAC }, { 0x9500, 0xCFFA }, { 0x9501, 0xCBF8 }, { 0x9502, 0xEFAE }, 
-	{ 0x9503, 0xEFAD }, { 0x9504, 0xB3FA }, { 0x9505, 0xB9F8 }, { 0x9506, 0xEFAF }, { 0x9507, 0xEFB0 }, { 0x9508, 0xD0E2 }, { 0x9509, 0xEFB1 }, { 0x950A, 0xEFB2 }, 
-	{ 0x950B, 0xB7E6 }, { 0x950C, 0xD0BF }, { 0x950D, 0xEFB3 }, { 0x950E, 0xEFB4 }, { 0x950F, 0xEFB5 }, { 0x9510, 0xC8F1 }, { 0x9511, 0xCCE0 }, { 0x9512, 0xEFB6 }, 
-	{ 0x9513, 0xEFB7 }, { 0x9514, 0xEFB8 }, { 0x9515, 0xEFB9 }, { 0x9516, 0xEFBA }, { 0x9517, 0xD5E0 }, { 0x9518, 0xEFBB }, { 0x9519, 0xB4ED }, { 0x951A, 0xC3AA }, 
-	{ 0x951B, 0xEFBC }, { 0x951D, 0xEFBD }, { 0x951E, 0xEFBE }, { 0x951F, 0xEFBF }, { 0x9521, 0xCEFD }, { 0x9522, 0xEFC0 }, { 0x9523, 0xC2E0 }, { 0x9524, 0xB4B8 }, 
-	{ 0x9525, 0xD7B6 }, { 0x9526, 0xBDF5 }, { 0x9528, 0xCFC7 }, { 0x9529, 0xEFC3 }, { 0x952A, 0xEFC1 }, { 0x952B, 0xEFC2 }, { 0x952C, 0xEFC4 }, { 0x952D, 0xB6A7 }, 
-	{ 0x952E, 0xBCFC }, { 0x952F, 0xBEE2 }, { 0x9530, 0xC3CC }, { 0x9531, 0xEFC5 }, { 0x9532, 0xEFC6 }, { 0x9534, 0xEFC7 }, { 0x9535, 0xEFCF }, { 0x9536, 0xEFC8 }, 
-	{ 0x9537, 0xEFC9 }, { 0x9538, 0xEFCA }, { 0x9539, 0xC7C2 }, { 0x953A, 0xEFF1 }, { 0x953B, 0xB6CD }, { 0x953C, 0xEFCB }, { 0x953E, 0xEFCC }, { 0x953F, 0xEFCD }, 
-	{ 0x9540, 0xB6C6 }, { 0x9541, 0xC3BE }, { 0x9542, 0xEFCE }, { 0x9544, 0xEFD0 }, { 0x9545, 0xEFD1 }, { 0x9546, 0xEFD2 }, { 0x9547, 0xD5F2 }, { 0x9549, 0xEFD3 }, 
-	{ 0x954A, 0xC4F7 }, { 0x954C, 0xEFD4 }, { 0x954D, 0xC4F8 }, { 0x954E, 0xEFD5 }, { 0x954F, 0xEFD6 }, { 0x9550, 0xB8E4 }, { 0x9551, 0xB0F7 }, { 0x9552, 0xEFD7 }, 
-	{ 0x9553, 0xEFD8 }, { 0x9554, 0xEFD9 }, { 0x9556, 0xEFDA }, { 0x9557, 0xEFDB }, { 0x9558, 0xEFDC }, { 0x9559, 0xEFDD }, { 0x955B, 0xEFDE }, { 0x955C, 0xBEB5 }, 
-	{ 0x955D, 0xEFE1 }, { 0x955E, 0xEFDF }, { 0x955F, 0xEFE0 }, { 0x9561, 0xEFE2 }, { 0x9562, 0xEFE3 }, { 0x9563, 0xC1CD }, { 0x9564, 0xEFE4 }, { 0x9565, 0xEFE5 }, 
-	{ 0x9566, 0xEFE6 }, { 0x9567, 0xEFE7 }, { 0x9568, 0xEFE8 }, { 0x9569, 0xEFE9 }, { 0x956A, 0xEFEA }, { 0x956B, 0xEFEB }, { 0x956C, 0xEFEC }, { 0x956D, 0xC0D8 }, 
-	{ 0x956F, 0xEFED }, { 0x9570, 0xC1AD }, { 0x9571, 0xEFEE }, { 0x9572, 0xEFEF }, { 0x9573, 0xEFF0 }, { 0x9576, 0xCFE2 }, { 0x957F, 0xB3A4 }, { 0x95E8, 0xC3C5 }, 
-	{ 0x95E9, 0xE3C5 }, { 0x95EA, 0xC9C1 }, { 0x95EB, 0xE3C6 }, { 0x95ED, 0xB1D5 }, { 0x95EE, 0xCECA }, { 0x95EF, 0xB4B3 }, { 0x95F0, 0xC8F2 }, { 0x95F1, 0xE3C7 }, 
-	{ 0x95F2, 0xCFD0 }, { 0x95F3, 0xE3C8 }, { 0x95F4, 0xBCE4 }, { 0x95F5, 0xE3C9 }, { 0x95F6, 0xE3CA }, { 0x95F7, 0xC3C6 }, { 0x95F8, 0xD5A2 }, { 0x95F9, 0xC4D6 }, 
-	{ 0x95FA, 0xB9EB }, { 0x95FB, 0xCEC5 }, { 0x95FC, 0xE3CB }, { 0x95FD, 0xC3F6 }, { 0x95FE, 0xE3CC }, { 0x9600, 0xB7A7 }, { 0x9601, 0xB8F3 }, { 0x9602, 0xBAD2 }, 
-	{ 0x9603, 0xE3CD }, { 0x9604, 0xE3CE }, { 0x9605, 0xD4C4 }, { 0x9606, 0xE3CF }, { 0x9608, 0xE3D0 }, { 0x9609, 0xD1CB }, { 0x960A, 0xE3D1 }, { 0x960B, 0xE3D2 }, 
-	{ 0x960C, 0xE3D3 }, { 0x960D, 0xE3D4 }, { 0x960E, 0xD1D6 }, { 0x960F, 0xE3D5 }, { 0x9610, 0xB2FB }, { 0x9611, 0xC0BB }, { 0x9612, 0xE3D6 }, { 0x9614, 0xC0AB }, 
-	{ 0x9615, 0xE3D7 }, { 0x9616, 0xE3D8 }, { 0x9617, 0xE3D9 }, { 0x9619, 0xE3DA }, { 0x961A, 0xE3DB }, { 0x961C, 0xB8B7 }, { 0x961D, 0xDAE2 }, { 0x961F, 0xB6D3 }, 
-	{ 0x9621, 0xDAE4 }, { 0x9622, 0xDAE3 }, { 0x962A, 0xDAE6 }, { 0x962E, 0xC8EE }, { 0x9631, 0xDAE5 }, { 0x9632, 0xB7C0 }, { 0x9633, 0xD1F4 }, { 0x9634, 0xD2F5 }, 
-	{ 0x9635, 0xD5F3 }, { 0x9636, 0xBDD7 }, { 0x963B, 0xD7E8 }, { 0x963C, 0xDAE8 }, { 0x963D, 0xDAE7 }, { 0x963F, 0xB0A2 }, { 0x9640, 0xCDD3 }, { 0x9642, 0xDAE9 }, 
-	{ 0x9644, 0xB8BD }, { 0x9645, 0xBCCA }, { 0x9646, 0xC2BD }, { 0x9647, 0xC2A4 }, { 0x9648, 0xB3C2 }, { 0x9649, 0xDAEA }, { 0x964B, 0xC2AA }, { 0x964C, 0xC4B0 }, 
-	{ 0x964D, 0xBDB5 }, { 0x9650, 0xCFDE }, { 0x9654, 0xDAEB }, { 0x9655, 0xC9C2 }, { 0x965B, 0xB1DD }, { 0x965F, 0xDAEC }, { 0x9661, 0xB6B8 }, { 0x9662, 0xD4BA }, 
-	{ 0x9664, 0xB3FD }, { 0x9667, 0xDAED }, { 0x9668, 0xD4C9 }, { 0x9669, 0xCFD5 }, { 0x966A, 0xC5E3 }, { 0x966C, 0xDAEE }, { 0x9672, 0xDAEF }, { 0x9674, 0xDAF0 }, 
-	{ 0x9675, 0xC1EA }, { 0x9676, 0xCCD5 }, { 0x9677, 0xCFDD }, { 0x9685, 0xD3E7 }, { 0x9686, 0xC2A1 }, { 0x9688, 0xDAF1 }, { 0x968B, 0xCBE5 }, { 0x968D, 0xDAF2 }, 
-	{ 0x968F, 0xCBE6 }, { 0x9690, 0xD2FE }, { 0x9694, 0xB8F4 }, { 0x9697, 0xDAF3 }, { 0x9698, 0xB0AF }, { 0x9699, 0xCFB6 }, { 0x969C, 0xD5CF }, { 0x96A7, 0xCBED }, 
-	{ 0x96B0, 0xDAF4 }, { 0x96B3, 0xE3C4 }, { 0x96B6, 0xC1A5 }, { 0x96B9, 0xF6BF }, { 0x96BC, 0xF6C0 }, { 0x96BD, 0xF6C1 }, { 0x96BE, 0xC4D1 }, { 0x96C0, 0xC8B8 }, 
-	{ 0x96C1, 0xD1E3 }, { 0x96C4, 0xD0DB }, { 0x96C5, 0xD1C5 }, { 0x96C6, 0xBCAF }, { 0x96C7, 0xB9CD }, { 0x96C9, 0xEFF4 }, { 0x96CC, 0xB4C6 }, { 0x96CD, 0xD3BA }, 
-	{ 0x96CE, 0xF6C2 }, { 0x96CF, 0xB3FB }, { 0x96D2, 0xF6C3 }, { 0x96D5, 0xB5F1 }, { 0x96E0, 0xF6C5 }, { 0x96E8, 0xD3EA }, { 0x96E9, 0xF6A7 }, { 0x96EA, 0xD1A9 }, 
-	{ 0x96EF, 0xF6A9 }, { 0x96F3, 0xF6A8 }, { 0x96F6, 0xC1E3 }, { 0x96F7, 0xC0D7 }, { 0x96F9, 0xB1A2 }, { 0x96FE, 0xCEED }, { 0x9700, 0xD0E8 }, { 0x9701, 0xF6AB }, 
-	{ 0x9704, 0xCFF6 }, { 0x9706, 0xF6AA }, { 0x9707, 0xD5F0 }, { 0x9708, 0xF6AC }, { 0x9709, 0xC3B9 }, { 0x970D, 0xBBF4 }, { 0x970E, 0xF6AE }, { 0x970F, 0xF6AD }, 
-	{ 0x9713, 0xC4DE }, { 0x9716, 0xC1D8 }, { 0x971C, 0xCBAA }, { 0x971E, 0xCFBC }, { 0x972A, 0xF6AF }, { 0x972D, 0xF6B0 }, { 0x9730, 0xF6B1 }, { 0x9732, 0xC2B6 }, 
-	{ 0x9738, 0xB0D4 }, { 0x9739, 0xC5F9 }, { 0x973E, 0xF6B2 }, { 0x9752, 0xC7E0 }, { 0x9753, 0xF6A6 }, { 0x9756, 0xBEB8 }, { 0x9759, 0xBEB2 }, { 0x975B, 0xB5E5 }, 
-	{ 0x975E, 0xB7C7 }, { 0x9760, 0xBFBF }, { 0x9761, 0xC3D2 }, { 0x9762, 0xC3E6 }, { 0x9765, 0xD8CC }, { 0x9769, 0xB8EF }, { 0x9773, 0xBDF9 }, { 0x9774, 0xD1A5 }, 
-	{ 0x9776, 0xB0D0 }, { 0x977C, 0xF7B0 }, { 0x9785, 0xF7B1 }, { 0x978B, 0xD0AC }, { 0x978D, 0xB0B0 }, { 0x9791, 0xF7B2 }, { 0x9792, 0xF7B3 }, { 0x9794, 0xF7B4 }, 
-	{ 0x9798, 0xC7CA }, { 0x97A0, 0xBECF }, { 0x97A3, 0xF7B7 }, { 0x97AB, 0xF7B6 }, { 0x97AD, 0xB1DE }, { 0x97AF, 0xF7B5 }, { 0x97B2, 0xF7B8 }, { 0x97B4, 0xF7B9 }, 
-	{ 0x97E6, 0xCEA4 }, { 0x97E7, 0xC8CD }, { 0x97E9, 0xBAAB }, { 0x97EA, 0xE8B8 }, { 0x97EB, 0xE8B9 }, { 0x97EC, 0xE8BA }, { 0x97ED, 0xBEC2 }, { 0x97F3, 0xD2F4 }, 
-	{ 0x97F5, 0xD4CF }, { 0x97F6, 0xC9D8 }, { 0x9875, 0xD2B3 }, { 0x9876, 0xB6A5 }, { 0x9877, 0xC7EA }, { 0x9878, 0xF1FC }, { 0x9879, 0xCFEE }, { 0x987A, 0xCBB3 }, 
-	{ 0x987B, 0xD0EB }, { 0x987C, 0xE7EF }, { 0x987D, 0xCDE7 }, { 0x987E, 0xB9CB }, { 0x987F, 0xB6D9 }, { 0x9880, 0xF1FD }, { 0x9881, 0xB0E4 }, { 0x9882, 0xCBCC }, 
-	{ 0x9883, 0xF1FE }, { 0x9884, 0xD4A4 }, { 0x9885, 0xC2AD }, { 0x9886, 0xC1EC }, { 0x9887, 0xC6C4 }, { 0x9888, 0xBEB1 }, { 0x9889, 0xF2A1 }, { 0x988A, 0xBCD5 }, 
-	{ 0x988C, 0xF2A2 }, { 0x988D, 0xF2A3 }, { 0x988F, 0xF2A4 }, { 0x9890, 0xD2C3 }, { 0x9891, 0xC6B5 }, { 0x9893, 0xCDC7 }, { 0x9894, 0xF2A5 }, { 0x9896, 0xD3B1 }, 
-	{ 0x9897, 0xBFC5 }, { 0x9898, 0xCCE2 }, { 0x989A, 0xF2A6 }, { 0x989B, 0xF2A7 }, { 0x989C, 0xD1D5 }, { 0x989D, 0xB6EE }, { 0x989E, 0xF2A8 }, { 0x989F, 0xF2A9 }, 
-	{ 0x98A0, 0xB5DF }, { 0x98A1, 0xF2AA }, { 0x98A2, 0xF2AB }, { 0x98A4, 0xB2FC }, { 0x98A5, 0xF2AC }, { 0x98A6, 0xF2AD }, { 0x98A7, 0xC8A7 }, { 0x98CE, 0xB7E7 }, 
-	{ 0x98D1, 0xECA9 }, { 0x98D2, 0xECAA }, { 0x98D3, 0xECAB }, { 0x98D5, 0xECAC }, { 0x98D8, 0xC6AE }, { 0x98D9, 0xECAD }, { 0x98DA, 0xECAE }, { 0x98DE, 0xB7C9 }, 
-	{ 0x98DF, 0xCAB3 }, { 0x98E7, 0xE2B8 }, { 0x98E8, 0xF7CF }, { 0x990D, 0xF7D0 }, { 0x9910, 0xB2CD }, { 0x992E, 0xF7D1 }, { 0x9954, 0xF7D3 }, { 0x9955, 0xF7D2 }, 
-	{ 0x9963, 0xE2BB }, { 0x9965, 0xBCA2 }, { 0x9967, 0xE2BC }, { 0x9968, 0xE2BD }, { 0x9969, 0xE2BE }, { 0x996A, 0xE2BF }, { 0x996B, 0xE2C0 }, { 0x996C, 0xE2C1 }, 
-	{ 0x996D, 0xB7B9 }, { 0x996E, 0xD2FB }, { 0x996F, 0xBDA4 }, { 0x9970, 0xCACE }, { 0x9971, 0xB1A5 }, { 0x9972, 0xCBC7 }, { 0x9974, 0xE2C2 }, { 0x9975, 0xB6FC }, 
-	{ 0x9976, 0xC8C4 }, { 0x9977, 0xE2C3 }, { 0x997A, 0xBDC8 }, { 0x997C, 0xB1FD }, { 0x997D, 0xE2C4 }, { 0x997F, 0xB6F6 }, { 0x9980, 0xE2C5 }, { 0x9981, 0xC4D9 }, 
-	{ 0x9984, 0xE2C6 }, { 0x9985, 0xCFDA }, { 0x9986, 0xB9DD }, { 0x9987, 0xE2C7 }, { 0x9988, 0xC0A1 }, { 0x998A, 0xE2C8 }, { 0x998B, 0xB2F6 }, { 0x998D, 0xE2C9 }, 
-	{ 0x998F, 0xC1F3 }, { 0x9990, 0xE2CA }, { 0x9991, 0xE2CB }, { 0x9992, 0xC2F8 }, { 0x9993, 0xE2CC }, { 0x9994, 0xE2CD }, { 0x9995, 0xE2CE }, { 0x9996, 0xCAD7 }, 
-	{ 0x9997, 0xD8B8 }, { 0x9998, 0xD9E5 }, { 0x9999, 0xCFE3 }, { 0x99A5, 0xF0A5 }, { 0x99A8, 0xDCB0 }, { 0x9A6C, 0xC2ED }, { 0x9A6D, 0xD4A6 }, { 0x9A6E, 0xCDD4 }, 
-	{ 0x9A6F, 0xD1B1 }, { 0x9A70, 0xB3DB }, { 0x9A71, 0xC7FD }, { 0x9A73, 0xB2B5 }, { 0x9A74, 0xC2BF }, { 0x9A75, 0xE6E0 }, { 0x9A76, 0xCABB }, { 0x9A77, 0xE6E1 }, 
-	{ 0x9A78, 0xE6E2 }, { 0x9A79, 0xBED4 }, { 0x9A7A, 0xE6E3 }, { 0x9A7B, 0xD7A4 }, { 0x9A7C, 0xCDD5 }, { 0x9A7D, 0xE6E5 }, { 0x9A7E, 0xBCDD }, { 0x9A7F, 0xE6E4 }, 
-	{ 0x9A80, 0xE6E6 }, { 0x9A81, 0xE6E7 }, { 0x9A82, 0xC2EE }, { 0x9A84, 0xBDBE }, { 0x9A85, 0xE6E8 }, { 0x9A86, 0xC2E6 }, { 0x9A87, 0xBAA7 }, { 0x9A88, 0xE6E9 }, 
-	{ 0x9A8A, 0xE6EA }, { 0x9A8B, 0xB3D2 }, { 0x9A8C, 0xD1E9 }, { 0x9A8F, 0xBFA5 }, { 0x9A90, 0xE6EB }, { 0x9A91, 0xC6EF }, { 0x9A92, 0xE6EC }, { 0x9A93, 0xE6ED }, 
-	{ 0x9A96, 0xE6EE }, { 0x9A97, 0xC6AD }, { 0x9A98, 0xE6EF }, { 0x9A9A, 0xC9A7 }, { 0x9A9B, 0xE6F0 }, { 0x9A9C, 0xE6F1 }, { 0x9A9D, 0xE6F2 }, { 0x9A9E, 0xE5B9 }, 
-	{ 0x9A9F, 0xE6F3 }, { 0x9AA0, 0xE6F4 }, { 0x9AA1, 0xC2E2 }, { 0x9AA2, 0xE6F5 }, { 0x9AA3, 0xE6F6 }, { 0x9AA4, 0xD6E8 }, { 0x9AA5, 0xE6F7 }, { 0x9AA7, 0xE6F8 }, 
-	{ 0x9AA8, 0xB9C7 }, { 0x9AB0, 0xF7BB }, { 0x9AB1, 0xF7BA }, { 0x9AB6, 0xF7BE }, { 0x9AB7, 0xF7BC }, { 0x9AB8, 0xBAA1 }, { 0x9ABA, 0xF7BF }, { 0x9ABC, 0xF7C0 }, 
-	{ 0x9AC0, 0xF7C2 }, { 0x9AC1, 0xF7C1 }, { 0x9AC2, 0xF7C4 }, { 0x9AC5, 0xF7C3 }, { 0x9ACB, 0xF7C5 }, { 0x9ACC, 0xF7C6 }, { 0x9AD1, 0xF7C7 }, { 0x9AD3, 0xCBE8 }, 
-	{ 0x9AD8, 0xB8DF }, { 0x9ADF, 0xF7D4 }, { 0x9AE1, 0xF7D5 }, { 0x9AE6, 0xF7D6 }, { 0x9AEB, 0xF7D8 }, { 0x9AED, 0xF7DA }, { 0x9AEF, 0xF7D7 }, { 0x9AF9, 0xF7DB }, 
-	{ 0x9AFB, 0xF7D9 }, { 0x9B03, 0xD7D7 }, { 0x9B08, 0xF7DC }, { 0x9B0F, 0xF7DD }, { 0x9B13, 0xF7DE }, { 0x9B1F, 0xF7DF }, { 0x9B23, 0xF7E0 }, { 0x9B2F, 0xDBCB }, 
-	{ 0x9B32, 0xD8AA }, { 0x9B3B, 0xE5F7 }, { 0x9B3C, 0xB9ED }, { 0x9B41, 0xBFFD }, { 0x9B42, 0xBBEA }, { 0x9B43, 0xF7C9 }, { 0x9B44, 0xC6C7 }, { 0x9B45, 0xF7C8 }, 
-	{ 0x9B47, 0xF7CA }, { 0x9B48, 0xF7CC }, { 0x9B49, 0xF7CB }, { 0x9B4D, 0xF7CD }, { 0x9B4F, 0xCEBA }, { 0x9B51, 0xF7CE }, { 0x9B54, 0xC4A7 }, { 0x9C7C, 0xD3E3 }, 
-	{ 0x9C7F, 0xF6CF }, { 0x9C81, 0xC2B3 }, { 0x9C82, 0xF6D0 }, { 0x9C85, 0xF6D1 }, { 0x9C86, 0xF6D2 }, { 0x9C87, 0xF6D3 }, { 0x9C88, 0xF6D4 }, { 0x9C8B, 0xF6D6 }, 
-	{ 0x9C8D, 0xB1AB }, { 0x9C8E, 0xF6D7 }, { 0x9C90, 0xF6D8 }, { 0x9C91, 0xF6D9 }, { 0x9C92, 0xF6DA }, { 0x9C94, 0xF6DB }, { 0x9C95, 0xF6DC }, { 0x9C9A, 0xF6DD }, 
-	{ 0x9C9B, 0xF6DE }, { 0x9C9C, 0xCFCA }, { 0x9C9E, 0xF6DF }, { 0x9C9F, 0xF6E0 }, { 0x9CA0, 0xF6E1 }, { 0x9CA1, 0xF6E2 }, { 0x9CA2, 0xF6E3 }, { 0x9CA3, 0xF6E4 }, 
-	{ 0x9CA4, 0xC0F0 }, { 0x9CA5, 0xF6E5 }, { 0x9CA6, 0xF6E6 }, { 0x9CA7, 0xF6E7 }, { 0x9CA8, 0xF6E8 }, { 0x9CA9, 0xF6E9 }, { 0x9CAB, 0xF6EA }, { 0x9CAD, 0xF6EB }, 
-	{ 0x9CAE, 0xF6EC }, { 0x9CB0, 0xF6ED }, { 0x9CB1, 0xF6EE }, { 0x9CB2, 0xF6EF }, { 0x9CB3, 0xF6F0 }, { 0x9CB4, 0xF6F1 }, { 0x9CB5, 0xF6F2 }, { 0x9CB6, 0xF6F3 }, 
-	{ 0x9CB7, 0xF6F4 }, { 0x9CB8, 0xBEA8 }, { 0x9CBA, 0xF6F5 }, { 0x9CBB, 0xF6F6 }, { 0x9CBC, 0xF6F7 }, { 0x9CBD, 0xF6F8 }, { 0x9CC3, 0xC8FA }, { 0x9CC4, 0xF6F9 }, 
-	{ 0x9CC5, 0xF6FA }, { 0x9CC6, 0xF6FB }, { 0x9CC7, 0xF6FC }, { 0x9CCA, 0xF6FD }, { 0x9CCB, 0xF6FE }, { 0x9CCC, 0xF7A1 }, { 0x9CCD, 0xF7A2 }, { 0x9CCE, 0xF7A3 }, 
-	{ 0x9CCF, 0xF7A4 }, { 0x9CD0, 0xF7A5 }, { 0x9CD3, 0xF7A6 }, { 0x9CD4, 0xF7A7 }, { 0x9CD5, 0xF7A8 }, { 0x9CD6, 0xB1EE }, { 0x9CD7, 0xF7A9 }, { 0x9CD8, 0xF7AA }, 
-	{ 0x9CD9, 0xF7AB }, { 0x9CDC, 0xF7AC }, { 0x9CDD, 0xF7AD }, { 0x9CDE, 0xC1DB }, { 0x9CDF, 0xF7AE }, { 0x9CE2, 0xF7AF }, { 0x9E1F, 0xC4F1 }, { 0x9E20, 0xF0AF }, 
-	{ 0x9E21, 0xBCA6 }, { 0x9E22, 0xF0B0 }, { 0x9E23, 0xC3F9 }, { 0x9E25, 0xC5B8 }, { 0x9E26, 0xD1BB }, { 0x9E28, 0xF0B1 }, { 0x9E29, 0xF0B2 }, { 0x9E2A, 0xF0B3 }, 
-	{ 0x9E2B, 0xF0B4 }, { 0x9E2C, 0xF0B5 }, { 0x9E2D, 0xD1BC }, { 0x9E2F, 0xD1EC }, { 0x9E31, 0xF0B7 }, { 0x9E32, 0xF0B6 }, { 0x9E33, 0xD4A7 }, { 0x9E35, 0xCDD2 }, 
-	{ 0x9E36, 0xF0B8 }, { 0x9E37, 0xF0BA }, { 0x9E38, 0xF0B9 }, { 0x9E39, 0xF0BB }, { 0x9E3A, 0xF0BC }, { 0x9E3D, 0xB8EB }, { 0x9E3E, 0xF0BD }, { 0x9E3F, 0xBAE8 }, 
-	{ 0x9E41, 0xF0BE }, { 0x9E42, 0xF0BF }, { 0x9E43, 0xBEE9 }, { 0x9E44, 0xF0C0 }, { 0x9E45, 0xB6EC }, { 0x9E46, 0xF0C1 }, { 0x9E47, 0xF0C2 }, { 0x9E48, 0xF0C3 }, 
-	{ 0x9E49, 0xF0C4 }, { 0x9E4A, 0xC8B5 }, { 0x9E4B, 0xF0C5 }, { 0x9E4C, 0xF0C6 }, { 0x9E4E, 0xF0C7 }, { 0x9E4F, 0xC5F4 }, { 0x9E51, 0xF0C8 }, { 0x9E55, 0xF0C9 }, 
-	{ 0x9E57, 0xF0CA }, { 0x9E58, 0xF7BD }, { 0x9E5A, 0xF0CB }, { 0x9E5B, 0xF0CC }, { 0x9E5C, 0xF0CD }, { 0x9E5E, 0xF0CE }, { 0x9E63, 0xF0CF }, { 0x9E64, 0xBAD7 }, 
-	{ 0x9E66, 0xF0D0 }, { 0x9E67, 0xF0D1 }, { 0x9E68, 0xF0D2 }, { 0x9E69, 0xF0D3 }, { 0x9E6A, 0xF0D4 }, { 0x9E6B, 0xF0D5 }, { 0x9E6C, 0xF0D6 }, { 0x9E6D, 0xF0D8 }, 
-	{ 0x9E70, 0xD3A5 }, { 0x9E71, 0xF0D7 }, { 0x9E73, 0xF0D9 }, { 0x9E7E, 0xF5BA }, { 0x9E7F, 0xC2B9 }, { 0x9E82, 0xF7E4 }, { 0x9E87, 0xF7E5 }, { 0x9E88, 0xF7E6 }, 
-	{ 0x9E8B, 0xF7E7 }, { 0x9E92, 0xF7E8 }, { 0x9E93, 0xC2B4 }, { 0x9E9D, 0xF7EA }, { 0x9E9F, 0xF7EB }, { 0x9EA6, 0xC2F3 }, { 0x9EB4, 0xF4F0 }, { 0x9EB8, 0xF4EF }, 
-	{ 0x9EBB, 0xC2E9 }, { 0x9EBD, 0xF7E1 }, { 0x9EBE, 0xF7E2 }, { 0x9EC4, 0xBBC6 }, { 0x9EC9, 0xD9E4 }, { 0x9ECD, 0xCAF2 }, { 0x9ECE, 0xC0E8 }, { 0x9ECF, 0xF0A4 }, 
-	{ 0x9ED1, 0xBADA }, { 0x9ED4, 0xC7AD }, { 0x9ED8, 0xC4AC }, { 0x9EDB, 0xF7EC }, { 0x9EDC, 0xF7ED }, { 0x9EDD, 0xF7EE }, { 0x9EDF, 0xF7F0 }, { 0x9EE0, 0xF7EF }, 
-	{ 0x9EE2, 0xF7F1 }, { 0x9EE5, 0xF7F4 }, { 0x9EE7, 0xF7F3 }, { 0x9EE9, 0xF7F2 }, { 0x9EEA, 0xF7F5 }, { 0x9EEF, 0xF7F6 }, { 0x9EF9, 0xEDE9 }, { 0x9EFB, 0xEDEA }, 
-	{ 0x9EFC, 0xEDEB }, { 0x9EFE, 0xF6BC }, { 0x9F0B, 0xF6BD }, { 0x9F0D, 0xF6BE }, { 0x9F0E, 0xB6A6 }, { 0x9F10, 0xD8BE }, { 0x9F13, 0xB9C4 }, { 0x9F17, 0xD8BB }, 
-	{ 0x9F19, 0xDCB1 }, { 0x9F20, 0xCAF3 }, { 0x9F22, 0xF7F7 }, { 0x9F2C, 0xF7F8 }, { 0x9F2F, 0xF7F9 }, { 0x9F37, 0xF7FB }, { 0x9F39, 0xF7FA }, { 0x9F3B, 0xB1C7 }, 
-	{ 0x9F3D, 0xF7FC }, { 0x9F3E, 0xF7FD }, { 0x9F44, 0xF7FE }, { 0x9F50, 0xC6EB }, { 0x9F51, 0xECB4 }, { 0x9F7F, 0xB3DD }, { 0x9F80, 0xF6B3 }, { 0x9F83, 0xF6B4 }, 
-	{ 0x9F84, 0xC1E4 }, { 0x9F85, 0xF6B5 }, { 0x9F86, 0xF6B6 }, { 0x9F87, 0xF6B7 }, { 0x9F88, 0xF6B8 }, { 0x9F89, 0xF6B9 }, { 0x9F8A, 0xF6BA }, { 0x9F8B, 0xC8A3 }, 
-	{ 0x9F8C, 0xF6BB }, { 0x9F99, 0xC1FA }, { 0x9F9A, 0xB9A8 }, { 0x9F9B, 0xEDE8 }, { 0x9F9F, 0xB9EA }, { 0x9FA0, 0xD9DF }, { 0xF880, 0x0081 }, { 0xF881, 0x0082 }, 
-	{ 0xFE31, 0xA6F2 }, { 0xFE33, 0xA6F4 }, { 0xFE34, 0xA6F5 }, { 0xFE35, 0xA6E0 }, { 0xFE36, 0xA6E1 }, { 0xFE37, 0xA6F0 }, { 0xFE38, 0xA6F1 }, { 0xFE39, 0xA6E2 }, 
-	{ 0xFE3A, 0xA6E3 }, { 0xFE3B, 0xA6EE }, { 0xFE3C, 0xA6EF }, { 0xFE3D, 0xA6E6 }, { 0xFE3E, 0xA6E7 }, { 0xFE3F, 0xA6E4 }, { 0xFE40, 0xA6E5 }, { 0xFE41, 0xA6E8 }, 
-	{ 0xFE42, 0xA6E9 }, { 0xFE43, 0xA6EA }, { 0xFE44, 0xA6EB }, { 0xFF01, 0xA3A1 }, { 0xFF02, 0xA3A2 }, { 0xFF03, 0xA3A3 }, { 0xFF04, 0xA1E7 }, { 0xFF05, 0xA3A5 }, 
-	{ 0xFF06, 0xA3A6 }, { 0xFF07, 0xA3A7 }, { 0xFF08, 0xA3A8 }, { 0xFF09, 0xA3A9 }, { 0xFF0A, 0xA3AA }, { 0xFF0B, 0xA3AB }, { 0xFF0C, 0xA3AC }, { 0xFF0D, 0xA3AD }, 
-	{ 0xFF0E, 0xA3AE }, { 0xFF0F, 0xA3AF }, { 0xFF10, 0xA3B0 }, { 0xFF11, 0xA3B1 }, { 0xFF12, 0xA3B2 }, { 0xFF13, 0xA3B3 }, { 0xFF14, 0xA3B4 }, { 0xFF15, 0xA3B5 }, 
-	{ 0xFF16, 0xA3B6 }, { 0xFF17, 0xA3B7 }, { 0xFF18, 0xA3B8 }, { 0xFF19, 0xA3B9 }, { 0xFF1A, 0xA3BA }, { 0xFF1B, 0xA3BB }, { 0xFF1C, 0xA3BC }, { 0xFF1D, 0xA3BD }, 
-	{ 0xFF1E, 0xA3BE }, { 0xFF1F, 0xA3BF }, { 0xFF20, 0xA3C0 }, { 0xFF21, 0xA3C1 }, { 0xFF22, 0xA3C2 }, { 0xFF23, 0xA3C3 }, { 0xFF24, 0xA3C4 }, { 0xFF25, 0xA3C5 }, 
-	{ 0xFF26, 0xA3C6 }, { 0xFF27, 0xA3C7 }, { 0xFF28, 0xA3C8 }, { 0xFF29, 0xA3C9 }, { 0xFF2A, 0xA3CA }, { 0xFF2B, 0xA3CB }, { 0xFF2C, 0xA3CC }, { 0xFF2D, 0xA3CD }, 
-	{ 0xFF2E, 0xA3CE }, { 0xFF2F, 0xA3CF }, { 0xFF30, 0xA3D0 }, { 0xFF31, 0xA3D1 }, { 0xFF32, 0xA3D2 }, { 0xFF33, 0xA3D3 }, { 0xFF34, 0xA3D4 }, { 0xFF35, 0xA3D5 }, 
-	{ 0xFF36, 0xA3D6 }, { 0xFF37, 0xA3D7 }, { 0xFF38, 0xA3D8 }, { 0xFF39, 0xA3D9 }, { 0xFF3A, 0xA3DA }, { 0xFF3B, 0xA3DB }, { 0xFF3C, 0xA3DC }, { 0xFF3D, 0xA3DD }, 
-	{ 0xFF3E, 0xA3DE }, { 0xFF3F, 0xA3DF }, { 0xFF40, 0xA3E0 }, { 0xFF41, 0xA3E1 }, { 0xFF42, 0xA3E2 }, { 0xFF43, 0xA3E3 }, { 0xFF44, 0xA3E4 }, { 0xFF45, 0xA3E5 }, 
-	{ 0xFF46, 0xA3E6 }, { 0xFF47, 0xA3E7 }, { 0xFF48, 0xA3E8 }, { 0xFF49, 0xA3E9 }, { 0xFF4A, 0xA3EA }, { 0xFF4B, 0xA3EB }, { 0xFF4C, 0xA3EC }, { 0xFF4D, 0xA3ED }, 
-	{ 0xFF4E, 0xA3EE }, { 0xFF4F, 0xA3EF }, { 0xFF50, 0xA3F0 }, { 0xFF51, 0xA3F1 }, { 0xFF52, 0xA3F2 }, { 0xFF53, 0xA3F3 }, { 0xFF54, 0xA3F4 }, { 0xFF55, 0xA3F5 }, 
-	{ 0xFF56, 0xA3F6 }, { 0xFF57, 0xA3F7 }, { 0xFF58, 0xA3F8 }, { 0xFF59, 0xA3F9 }, { 0xFF5A, 0xA3FA }, { 0xFF5B, 0xA3FB }, { 0xFF5C, 0xA3FC }, { 0xFF5D, 0xA3FD }, 
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x0083, 0x0083 },
+	{ 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, { 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B },
+	{ 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, { 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 },
+	{ 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, { 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B },
+	{ 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, { 0x00A0, 0x00A0 }, { 0x00A2, 0xA1E9 }, { 0x00A3, 0xA1EA }, { 0x00A4, 0xA1E8 },
+	{ 0x00A5, 0xA3A4 }, { 0x00A7, 0xA1EC }, { 0x00A8, 0xA1A7 }, { 0x00A9, 0x00FD }, { 0x00B0, 0xA1E3 }, { 0x00B1, 0xA1C0 }, { 0x00B7, 0xA1A4 }, { 0x00D7, 0xA1C1 },
+	{ 0x00E0, 0xA8A4 }, { 0x00E1, 0xA8A2 }, { 0x00E8, 0xA8A8 }, { 0x00E9, 0xA8A6 }, { 0x00EA, 0xA8BA }, { 0x00EC, 0xA8AC }, { 0x00ED, 0xA8AA }, { 0x00F2, 0xA8B0 },
+	{ 0x00F3, 0xA8AE }, { 0x00F7, 0xA1C2 }, { 0x00F9, 0xA8B4 }, { 0x00FA, 0xA8B2 }, { 0x00FC, 0xA8B9 }, { 0x0101, 0xA8A1 }, { 0x0113, 0xA8A5 }, { 0x011B, 0xA8A7 },
+	{ 0x012B, 0xA8A9 }, { 0x0144, 0xA8BD }, { 0x0148, 0xA8BE }, { 0x014D, 0xA8AD }, { 0x016B, 0xA8B1 }, { 0x01CE, 0xA8A3 }, { 0x01D0, 0xA8AB }, { 0x01D2, 0xA8AF },
+	{ 0x01D4, 0xA8B3 }, { 0x01D6, 0xA8B5 }, { 0x01D8, 0xA8B6 }, { 0x01DA, 0xA8B7 }, { 0x01DC, 0xA8B8 }, { 0x01F9, 0xA8BF }, { 0x0251, 0xA8BB }, { 0x0261, 0xA8C0 },
+	{ 0x02C7, 0xA1A6 }, { 0x02C9, 0xA1A5 }, { 0x0391, 0xA6A1 }, { 0x0392, 0xA6A2 }, { 0x0393, 0xA6A3 }, { 0x0394, 0xA6A4 }, { 0x0395, 0xA6A5 }, { 0x0396, 0xA6A6 },
+	{ 0x0397, 0xA6A7 }, { 0x0398, 0xA6A8 }, { 0x0399, 0xA6A9 }, { 0x039A, 0xA6AA }, { 0x039B, 0xA6AB }, { 0x039C, 0xA6AC }, { 0x039D, 0xA6AD }, { 0x039E, 0xA6AE },
+	{ 0x039F, 0xA6AF }, { 0x03A0, 0xA6B0 }, { 0x03A1, 0xA6B1 }, { 0x03A3, 0xA6B2 }, { 0x03A4, 0xA6B3 }, { 0x03A5, 0xA6B4 }, { 0x03A6, 0xA6B5 }, { 0x03A7, 0xA6B6 },
+	{ 0x03A8, 0xA6B7 }, { 0x03A9, 0xA6B8 }, { 0x03B1, 0xA6C1 }, { 0x03B2, 0xA6C2 }, { 0x03B3, 0xA6C3 }, { 0x03B4, 0xA6C4 }, { 0x03B5, 0xA6C5 }, { 0x03B6, 0xA6C6 },
+	{ 0x03B7, 0xA6C7 }, { 0x03B8, 0xA6C8 }, { 0x03B9, 0xA6C9 }, { 0x03BA, 0xA6CA }, { 0x03BB, 0xA6CB }, { 0x03BC, 0xA6CC }, { 0x03BD, 0xA6CD }, { 0x03BE, 0xA6CE },
+	{ 0x03BF, 0xA6CF }, { 0x03C0, 0xA6D0 }, { 0x03C1, 0xA6D1 }, { 0x03C3, 0xA6D2 }, { 0x03C4, 0xA6D3 }, { 0x03C5, 0xA6D4 }, { 0x03C6, 0xA6D5 }, { 0x03C7, 0xA6D6 },
+	{ 0x03C8, 0xA6D7 }, { 0x03C9, 0xA6D8 }, { 0x0401, 0xA7A7 }, { 0x0410, 0xA7A1 }, { 0x0411, 0xA7A2 }, { 0x0412, 0xA7A3 }, { 0x0413, 0xA7A4 }, { 0x0414, 0xA7A5 },
+	{ 0x0415, 0xA7A6 }, { 0x0416, 0xA7A8 }, { 0x0417, 0xA7A9 }, { 0x0418, 0xA7AA }, { 0x0419, 0xA7AB }, { 0x041A, 0xA7AC }, { 0x041B, 0xA7AD }, { 0x041C, 0xA7AE },
+	{ 0x041D, 0xA7AF }, { 0x041E, 0xA7B0 }, { 0x041F, 0xA7B1 }, { 0x0420, 0xA7B2 }, { 0x0421, 0xA7B3 }, { 0x0422, 0xA7B4 }, { 0x0423, 0xA7B5 }, { 0x0424, 0xA7B6 },
+	{ 0x0425, 0xA7B7 }, { 0x0426, 0xA7B8 }, { 0x0427, 0xA7B9 }, { 0x0428, 0xA7BA }, { 0x0429, 0xA7BB }, { 0x042A, 0xA7BC }, { 0x042B, 0xA7BD }, { 0x042C, 0xA7BE },
+	{ 0x042D, 0xA7BF }, { 0x042E, 0xA7C0 }, { 0x042F, 0xA7C1 }, { 0x0430, 0xA7D1 }, { 0x0431, 0xA7D2 }, { 0x0432, 0xA7D3 }, { 0x0433, 0xA7D4 }, { 0x0434, 0xA7D5 },
+	{ 0x0435, 0xA7D6 }, { 0x0436, 0xA7D8 }, { 0x0437, 0xA7D9 }, { 0x0438, 0xA7DA }, { 0x0439, 0xA7DB }, { 0x043A, 0xA7DC }, { 0x043B, 0xA7DD }, { 0x043C, 0xA7DE },
+	{ 0x043D, 0xA7DF }, { 0x043E, 0xA7E0 }, { 0x043F, 0xA7E1 }, { 0x0440, 0xA7E2 }, { 0x0441, 0xA7E3 }, { 0x0442, 0xA7E4 }, { 0x0443, 0xA7E5 }, { 0x0444, 0xA7E6 },
+	{ 0x0445, 0xA7E7 }, { 0x0446, 0xA7E8 }, { 0x0447, 0xA7E9 }, { 0x0448, 0xA7EA }, { 0x0449, 0xA7EB }, { 0x044A, 0xA7EC }, { 0x044B, 0xA7ED }, { 0x044C, 0xA7EE },
+	{ 0x044D, 0xA7EF }, { 0x044E, 0xA7F0 }, { 0x044F, 0xA7F1 }, { 0x0451, 0xA7D7 }, { 0x1E3F, 0xA8BC }, { 0x2014, 0xA1AA }, { 0x2016, 0xA1AC }, { 0x2018, 0xA1AE },
+	{ 0x2019, 0xA1AF }, { 0x201C, 0xA1B0 }, { 0x201D, 0xA1B1 }, { 0x2026, 0x00FF }, { 0x2030, 0xA1EB }, { 0x2032, 0xA1E4 }, { 0x2033, 0xA1E5 }, { 0x203B, 0xA1F9 },
+	{ 0x203E, 0xA3FE }, { 0x2103, 0xA1E6 }, { 0x2116, 0xA1ED }, { 0x2122, 0x00FE }, { 0x2160, 0xA2F1 }, { 0x2161, 0xA2F2 }, { 0x2162, 0xA2F3 }, { 0x2163, 0xA2F4 },
+	{ 0x2164, 0xA2F5 }, { 0x2165, 0xA2F6 }, { 0x2166, 0xA2F7 }, { 0x2167, 0xA2F8 }, { 0x2168, 0xA2F9 }, { 0x2169, 0xA2FA }, { 0x216A, 0xA2FB }, { 0x216B, 0xA2FC },
+	{ 0x2190, 0xA1FB }, { 0x2191, 0xA1FC }, { 0x2192, 0xA1FA }, { 0x2193, 0xA1FD }, { 0x2208, 0xA1CA }, { 0x220F, 0xA1C7 }, { 0x2211, 0xA1C6 }, { 0x221A, 0xA1CC },
+	{ 0x221D, 0xA1D8 }, { 0x221E, 0xA1DE }, { 0x2220, 0xA1CF }, { 0x2225, 0xA1CE }, { 0x2227, 0xA1C4 }, { 0x2228, 0xA1C5 }, { 0x2229, 0xA1C9 }, { 0x222A, 0xA1C8 },
+	{ 0x222B, 0xA1D2 }, { 0x222E, 0xA1D3 }, { 0x2234, 0xA1E0 }, { 0x2235, 0xA1DF }, { 0x2236, 0xA1C3 }, { 0x2237, 0xA1CB }, { 0x223D, 0xA1D7 }, { 0x2248, 0xA1D6 },
+	{ 0x224C, 0xA1D5 }, { 0x2260, 0xA1D9 }, { 0x2261, 0xA1D4 }, { 0x2264, 0xA1DC }, { 0x2265, 0xA1DD }, { 0x226E, 0xA1DA }, { 0x226F, 0xA1DB }, { 0x2299, 0xA1D1 },
+	{ 0x22A5, 0xA1CD }, { 0x22EF, 0xA1AD }, { 0x2312, 0xA1D0 }, { 0x2460, 0xA2D9 }, { 0x2461, 0xA2DA }, { 0x2462, 0xA2DB }, { 0x2463, 0xA2DC }, { 0x2464, 0xA2DD },
+	{ 0x2465, 0xA2DE }, { 0x2466, 0xA2DF }, { 0x2467, 0xA2E0 }, { 0x2468, 0xA2E1 }, { 0x2469, 0xA2E2 }, { 0x2474, 0xA2C5 }, { 0x2475, 0xA2C6 }, { 0x2476, 0xA2C7 },
+	{ 0x2477, 0xA2C8 }, { 0x2478, 0xA2C9 }, { 0x2479, 0xA2CA }, { 0x247A, 0xA2CB }, { 0x247B, 0xA2CC }, { 0x247C, 0xA2CD }, { 0x247D, 0xA2CE }, { 0x247E, 0xA2CF },
+	{ 0x247F, 0xA2D0 }, { 0x2480, 0xA2D1 }, { 0x2481, 0xA2D2 }, { 0x2482, 0xA2D3 }, { 0x2483, 0xA2D4 }, { 0x2484, 0xA2D5 }, { 0x2485, 0xA2D6 }, { 0x2486, 0xA2D7 },
+	{ 0x2487, 0xA2D8 }, { 0x2488, 0xA2B1 }, { 0x2489, 0xA2B2 }, { 0x248A, 0xA2B3 }, { 0x248B, 0xA2B4 }, { 0x248C, 0xA2B5 }, { 0x248D, 0xA2B6 }, { 0x248E, 0xA2B7 },
+	{ 0x248F, 0xA2B8 }, { 0x2490, 0xA2B9 }, { 0x2491, 0xA2BA }, { 0x2492, 0xA2BB }, { 0x2493, 0xA2BC }, { 0x2494, 0xA2BD }, { 0x2495, 0xA2BE }, { 0x2496, 0xA2BF },
+	{ 0x2497, 0xA2C0 }, { 0x2498, 0xA2C1 }, { 0x2499, 0xA2C2 }, { 0x249A, 0xA2C3 }, { 0x249B, 0xA2C4 }, { 0x2500, 0xA9A4 }, { 0x2501, 0xA9A5 }, { 0x2502, 0xA9A6 },
+	{ 0x2503, 0xA9A7 }, { 0x2504, 0xA9A8 }, { 0x2505, 0xA9A9 }, { 0x2506, 0xA9AA }, { 0x2507, 0xA9AB }, { 0x2508, 0xA9AC }, { 0x2509, 0xA9AD }, { 0x250A, 0xA9AE },
+	{ 0x250B, 0xA9AF }, { 0x250C, 0xA9B0 }, { 0x250D, 0xA9B1 }, { 0x250E, 0xA9B2 }, { 0x250F, 0xA9B3 }, { 0x2510, 0xA9B4 }, { 0x2511, 0xA9B5 }, { 0x2512, 0xA9B6 },
+	{ 0x2513, 0xA9B7 }, { 0x2514, 0xA9B8 }, { 0x2515, 0xA9B9 }, { 0x2516, 0xA9BA }, { 0x2517, 0xA9BB }, { 0x2518, 0xA9BC }, { 0x2519, 0xA9BD }, { 0x251A, 0xA9BE },
+	{ 0x251B, 0xA9BF }, { 0x251C, 0xA9C0 }, { 0x251D, 0xA9C1 }, { 0x251E, 0xA9C2 }, { 0x251F, 0xA9C3 }, { 0x2520, 0xA9C4 }, { 0x2521, 0xA9C5 }, { 0x2522, 0xA9C6 },
+	{ 0x2523, 0xA9C7 }, { 0x2524, 0xA9C8 }, { 0x2525, 0xA9C9 }, { 0x2526, 0xA9CA }, { 0x2527, 0xA9CB }, { 0x2528, 0xA9CC }, { 0x2529, 0xA9CD }, { 0x252A, 0xA9CE },
+	{ 0x252B, 0xA9CF }, { 0x252C, 0xA9D0 }, { 0x252D, 0xA9D1 }, { 0x252E, 0xA9D2 }, { 0x252F, 0xA9D3 }, { 0x2530, 0xA9D4 }, { 0x2531, 0xA9D5 }, { 0x2532, 0xA9D6 },
+	{ 0x2533, 0xA9D7 }, { 0x2534, 0xA9D8 }, { 0x2535, 0xA9D9 }, { 0x2536, 0xA9DA }, { 0x2537, 0xA9DB }, { 0x2538, 0xA9DC }, { 0x2539, 0xA9DD }, { 0x253A, 0xA9DE },
+	{ 0x253B, 0xA9DF }, { 0x253C, 0xA9E0 }, { 0x253D, 0xA9E1 }, { 0x253E, 0xA9E2 }, { 0x253F, 0xA9E3 }, { 0x2540, 0xA9E4 }, { 0x2541, 0xA9E5 }, { 0x2542, 0xA9E6 },
+	{ 0x2543, 0xA9E7 }, { 0x2544, 0xA9E8 }, { 0x2545, 0xA9E9 }, { 0x2546, 0xA9EA }, { 0x2547, 0xA9EB }, { 0x2548, 0xA9EC }, { 0x2549, 0xA9ED }, { 0x254A, 0xA9EE },
+	{ 0x254B, 0xA9EF }, { 0x25A0, 0xA1F6 }, { 0x25A1, 0xA1F5 }, { 0x25B2, 0xA1F8 }, { 0x25B3, 0xA1F7 }, { 0x25C6, 0xA1F4 }, { 0x25C7, 0xA1F3 }, { 0x25CB, 0xA1F0 },
+	{ 0x25CE, 0xA1F2 }, { 0x25CF, 0xA1F1 }, { 0x2605, 0xA1EF }, { 0x2606, 0xA1EE }, { 0x2640, 0xA1E2 }, { 0x2642, 0xA1E1 }, { 0x3000, 0xA1A1 }, { 0x3001, 0xA1A2 },
+	{ 0x3002, 0xA1A3 }, { 0x3003, 0xA1A8 }, { 0x3005, 0xA1A9 }, { 0x3008, 0xA1B4 }, { 0x3009, 0xA1B5 }, { 0x300A, 0xA1B6 }, { 0x300B, 0xA1B7 }, { 0x300C, 0xA1B8 },
+	{ 0x300D, 0xA1B9 }, { 0x300E, 0xA1BA }, { 0x300F, 0xA1BB }, { 0x3010, 0xA1BE }, { 0x3011, 0xA1BF }, { 0x3013, 0xA1FE }, { 0x3014, 0xA1B2 }, { 0x3015, 0xA1B3 },
+	{ 0x3016, 0xA1BC }, { 0x3017, 0xA1BD }, { 0x301C, 0xA1AB }, { 0x3041, 0xA4A1 }, { 0x3042, 0xA4A2 }, { 0x3043, 0xA4A3 }, { 0x3044, 0xA4A4 }, { 0x3045, 0xA4A5 },
+	{ 0x3046, 0xA4A6 }, { 0x3047, 0xA4A7 }, { 0x3048, 0xA4A8 }, { 0x3049, 0xA4A9 }, { 0x304A, 0xA4AA }, { 0x304B, 0xA4AB }, { 0x304C, 0xA4AC }, { 0x304D, 0xA4AD },
+	{ 0x304E, 0xA4AE }, { 0x304F, 0xA4AF }, { 0x3050, 0xA4B0 }, { 0x3051, 0xA4B1 }, { 0x3052, 0xA4B2 }, { 0x3053, 0xA4B3 }, { 0x3054, 0xA4B4 }, { 0x3055, 0xA4B5 },
+	{ 0x3056, 0xA4B6 }, { 0x3057, 0xA4B7 }, { 0x3058, 0xA4B8 }, { 0x3059, 0xA4B9 }, { 0x305A, 0xA4BA }, { 0x305B, 0xA4BB }, { 0x305C, 0xA4BC }, { 0x305D, 0xA4BD },
+	{ 0x305E, 0xA4BE }, { 0x305F, 0xA4BF }, { 0x3060, 0xA4C0 }, { 0x3061, 0xA4C1 }, { 0x3062, 0xA4C2 }, { 0x3063, 0xA4C3 }, { 0x3064, 0xA4C4 }, { 0x3065, 0xA4C5 },
+	{ 0x3066, 0xA4C6 }, { 0x3067, 0xA4C7 }, { 0x3068, 0xA4C8 }, { 0x3069, 0xA4C9 }, { 0x306A, 0xA4CA }, { 0x306B, 0xA4CB }, { 0x306C, 0xA4CC }, { 0x306D, 0xA4CD },
+	{ 0x306E, 0xA4CE }, { 0x306F, 0xA4CF }, { 0x3070, 0xA4D0 }, { 0x3071, 0xA4D1 }, { 0x3072, 0xA4D2 }, { 0x3073, 0xA4D3 }, { 0x3074, 0xA4D4 }, { 0x3075, 0xA4D5 },
+	{ 0x3076, 0xA4D6 }, { 0x3077, 0xA4D7 }, { 0x3078, 0xA4D8 }, { 0x3079, 0xA4D9 }, { 0x307A, 0xA4DA }, { 0x307B, 0xA4DB }, { 0x307C, 0xA4DC }, { 0x307D, 0xA4DD },
+	{ 0x307E, 0xA4DE }, { 0x307F, 0xA4DF }, { 0x3080, 0xA4E0 }, { 0x3081, 0xA4E1 }, { 0x3082, 0xA4E2 }, { 0x3083, 0xA4E3 }, { 0x3084, 0xA4E4 }, { 0x3085, 0xA4E5 },
+	{ 0x3086, 0xA4E6 }, { 0x3087, 0xA4E7 }, { 0x3088, 0xA4E8 }, { 0x3089, 0xA4E9 }, { 0x308A, 0xA4EA }, { 0x308B, 0xA4EB }, { 0x308C, 0xA4EC }, { 0x308D, 0xA4ED },
+	{ 0x308E, 0xA4EE }, { 0x308F, 0xA4EF }, { 0x3090, 0xA4F0 }, { 0x3091, 0xA4F1 }, { 0x3092, 0xA4F2 }, { 0x3093, 0xA4F3 }, { 0x30A1, 0xA5A1 }, { 0x30A2, 0xA5A2 },
+	{ 0x30A3, 0xA5A3 }, { 0x30A4, 0xA5A4 }, { 0x30A5, 0xA5A5 }, { 0x30A6, 0xA5A6 }, { 0x30A7, 0xA5A7 }, { 0x30A8, 0xA5A8 }, { 0x30A9, 0xA5A9 }, { 0x30AA, 0xA5AA },
+	{ 0x30AB, 0xA5AB }, { 0x30AC, 0xA5AC }, { 0x30AD, 0xA5AD }, { 0x30AE, 0xA5AE }, { 0x30AF, 0xA5AF }, { 0x30B0, 0xA5B0 }, { 0x30B1, 0xA5B1 }, { 0x30B2, 0xA5B2 },
+	{ 0x30B3, 0xA5B3 }, { 0x30B4, 0xA5B4 }, { 0x30B5, 0xA5B5 }, { 0x30B6, 0xA5B6 }, { 0x30B7, 0xA5B7 }, { 0x30B8, 0xA5B8 }, { 0x30B9, 0xA5B9 }, { 0x30BA, 0xA5BA },
+	{ 0x30BB, 0xA5BB }, { 0x30BC, 0xA5BC }, { 0x30BD, 0xA5BD }, { 0x30BE, 0xA5BE }, { 0x30BF, 0xA5BF }, { 0x30C0, 0xA5C0 }, { 0x30C1, 0xA5C1 }, { 0x30C2, 0xA5C2 },
+	{ 0x30C3, 0xA5C3 }, { 0x30C4, 0xA5C4 }, { 0x30C5, 0xA5C5 }, { 0x30C6, 0xA5C6 }, { 0x30C7, 0xA5C7 }, { 0x30C8, 0xA5C8 }, { 0x30C9, 0xA5C9 }, { 0x30CA, 0xA5CA },
+	{ 0x30CB, 0xA5CB }, { 0x30CC, 0xA5CC }, { 0x30CD, 0xA5CD }, { 0x30CE, 0xA5CE }, { 0x30CF, 0xA5CF }, { 0x30D0, 0xA5D0 }, { 0x30D1, 0xA5D1 }, { 0x30D2, 0xA5D2 },
+	{ 0x30D3, 0xA5D3 }, { 0x30D4, 0xA5D4 }, { 0x30D5, 0xA5D5 }, { 0x30D6, 0xA5D6 }, { 0x30D7, 0xA5D7 }, { 0x30D8, 0xA5D8 }, { 0x30D9, 0xA5D9 }, { 0x30DA, 0xA5DA },
+	{ 0x30DB, 0xA5DB }, { 0x30DC, 0xA5DC }, { 0x30DD, 0xA5DD }, { 0x30DE, 0xA5DE }, { 0x30DF, 0xA5DF }, { 0x30E0, 0xA5E0 }, { 0x30E1, 0xA5E1 }, { 0x30E2, 0xA5E2 },
+	{ 0x30E3, 0xA5E3 }, { 0x30E4, 0xA5E4 }, { 0x30E5, 0xA5E5 }, { 0x30E6, 0xA5E6 }, { 0x30E7, 0xA5E7 }, { 0x30E8, 0xA5E8 }, { 0x30E9, 0xA5E9 }, { 0x30EA, 0xA5EA },
+	{ 0x30EB, 0xA5EB }, { 0x30EC, 0xA5EC }, { 0x30ED, 0xA5ED }, { 0x30EE, 0xA5EE }, { 0x30EF, 0xA5EF }, { 0x30F0, 0xA5F0 }, { 0x30F1, 0xA5F1 }, { 0x30F2, 0xA5F2 },
+	{ 0x30F3, 0xA5F3 }, { 0x30F4, 0xA5F4 }, { 0x30F5, 0xA5F5 }, { 0x30F6, 0xA5F6 }, { 0x3105, 0xA8C5 }, { 0x3106, 0xA8C6 }, { 0x3107, 0xA8C7 }, { 0x3108, 0xA8C8 },
+	{ 0x3109, 0xA8C9 }, { 0x310A, 0xA8CA }, { 0x310B, 0xA8CB }, { 0x310C, 0xA8CC }, { 0x310D, 0xA8CD }, { 0x310E, 0xA8CE }, { 0x310F, 0xA8CF }, { 0x3110, 0xA8D0 },
+	{ 0x3111, 0xA8D1 }, { 0x3112, 0xA8D2 }, { 0x3113, 0xA8D3 }, { 0x3114, 0xA8D4 }, { 0x3115, 0xA8D5 }, { 0x3116, 0xA8D6 }, { 0x3117, 0xA8D7 }, { 0x3118, 0xA8D8 },
+	{ 0x3119, 0xA8D9 }, { 0x311A, 0xA8DA }, { 0x311B, 0xA8DB }, { 0x311C, 0xA8DC }, { 0x311D, 0xA8DD }, { 0x311E, 0xA8DE }, { 0x311F, 0xA8DF }, { 0x3120, 0xA8E0 },
+	{ 0x3121, 0xA8E1 }, { 0x3122, 0xA8E2 }, { 0x3123, 0xA8E3 }, { 0x3124, 0xA8E4 }, { 0x3125, 0xA8E5 }, { 0x3126, 0xA8E6 }, { 0x3127, 0xA8E7 }, { 0x3128, 0xA8E8 },
+	{ 0x3129, 0xA8E9 }, { 0x3220, 0xA2E5 }, { 0x3221, 0xA2E6 }, { 0x3222, 0xA2E7 }, { 0x3223, 0xA2E8 }, { 0x3224, 0xA2E9 }, { 0x3225, 0xA2EA }, { 0x3226, 0xA2EB },
+	{ 0x3227, 0xA2EC }, { 0x3228, 0xA2ED }, { 0x3229, 0xA2EE }, { 0x4E00, 0xD2BB }, { 0x4E01, 0xB6A1 }, { 0x4E03, 0xC6DF }, { 0x4E07, 0xCDF2 }, { 0x4E08, 0xD5C9 },
+	{ 0x4E09, 0xC8FD }, { 0x4E0A, 0xC9CF }, { 0x4E0B, 0xCFC2 }, { 0x4E0C, 0xD8A2 }, { 0x4E0D, 0xB2BB }, { 0x4E0E, 0xD3EB }, { 0x4E10, 0xD8A4 }, { 0x4E11, 0xB3F3 },
+	{ 0x4E13, 0xD7A8 }, { 0x4E14, 0xC7D2 }, { 0x4E15, 0xD8A7 }, { 0x4E16, 0xCAC0 }, { 0x4E18, 0xC7F0 }, { 0x4E19, 0xB1FB }, { 0x4E1A, 0xD2B5 }, { 0x4E1B, 0xB4D4 },
+	{ 0x4E1C, 0xB6AB }, { 0x4E1D, 0xCBBF }, { 0x4E1E, 0xD8A9 }, { 0x4E22, 0xB6AA }, { 0x4E24, 0xC1BD }, { 0x4E25, 0xD1CF }, { 0x4E27, 0xC9A5 }, { 0x4E28, 0xD8AD },
+	{ 0x4E2A, 0xB8F6 }, { 0x4E2B, 0xD1BE }, { 0x4E2C, 0xE3DC }, { 0x4E2D, 0xD6D0 }, { 0x4E30, 0xB7E1 }, { 0x4E32, 0xB4AE }, { 0x4E34, 0xC1D9 }, { 0x4E36, 0xD8BC },
+	{ 0x4E38, 0xCDE8 }, { 0x4E39, 0xB5A4 }, { 0x4E3A, 0xCEAA }, { 0x4E3B, 0xD6F7 }, { 0x4E3D, 0xC0F6 }, { 0x4E3E, 0xBED9 }, { 0x4E3F, 0xD8AF }, { 0x4E43, 0xC4CB },
+	{ 0x4E45, 0xBEC3 }, { 0x4E47, 0xD8B1 }, { 0x4E48, 0xC3B4 }, { 0x4E49, 0xD2E5 }, { 0x4E4B, 0xD6AE }, { 0x4E4C, 0xCEDA }, { 0x4E4D, 0xD5A7 }, { 0x4E4E, 0xBAF5 },
+	{ 0x4E4F, 0xB7A6 }, { 0x4E50, 0xC0D6 }, { 0x4E52, 0xC6B9 }, { 0x4E53, 0xC5D2 }, { 0x4E54, 0xC7C7 }, { 0x4E56, 0xB9D4 }, { 0x4E58, 0xB3CB }, { 0x4E59, 0xD2D2 },
+	{ 0x4E5C, 0xD8BF }, { 0x4E5D, 0xBEC5 }, { 0x4E5E, 0xC6F2 }, { 0x4E5F, 0xD2B2 }, { 0x4E60, 0xCFB0 }, { 0x4E61, 0xCFE7 }, { 0x4E66, 0xCAE9 }, { 0x4E69, 0xD8C0 },
+	{ 0x4E70, 0xC2F2 }, { 0x4E71, 0xC2D2 }, { 0x4E73, 0xC8E9 }, { 0x4E7E, 0xC7AC }, { 0x4E86, 0xC1CB }, { 0x4E88, 0xD3E8 }, { 0x4E89, 0xD5F9 }, { 0x4E8B, 0xCAC2 },
+	{ 0x4E8C, 0xB6FE }, { 0x4E8D, 0xD8A1 }, { 0x4E8E, 0xD3DA }, { 0x4E8F, 0xBFF7 }, { 0x4E91, 0xD4C6 }, { 0x4E92, 0xBBA5 }, { 0x4E93, 0xD8C1 }, { 0x4E94, 0xCEE5 },
+	{ 0x4E95, 0xBEAE }, { 0x4E98, 0xD8A8 }, { 0x4E9A, 0xD1C7 }, { 0x4E9B, 0xD0A9 }, { 0x4E9F, 0xD8BD }, { 0x4EA0, 0xD9EF }, { 0x4EA1, 0xCDF6 }, { 0x4EA2, 0xBFBA },
+	{ 0x4EA4, 0xBDBB }, { 0x4EA5, 0xBAA5 }, { 0x4EA6, 0xD2E0 }, { 0x4EA7, 0xB2FA }, { 0x4EA8, 0xBAE0 }, { 0x4EA9, 0xC4B6 }, { 0x4EAB, 0xCFED }, { 0x4EAC, 0xBEA9 },
+	{ 0x4EAD, 0xCDA4 }, { 0x4EAE, 0xC1C1 }, { 0x4EB2, 0xC7D7 }, { 0x4EB3, 0xD9F1 }, { 0x4EB5, 0xD9F4 }, { 0x4EBA, 0xC8CB }, { 0x4EBB, 0xD8E9 }, { 0x4EBF, 0xD2DA },
+	{ 0x4EC0, 0xCAB2 }, { 0x4EC1, 0xC8CA }, { 0x4EC2, 0xD8EC }, { 0x4EC3, 0xD8EA }, { 0x4EC4, 0xD8C6 }, { 0x4EC5, 0xBDF6 }, { 0x4EC6, 0xC6CD }, { 0x4EC7, 0xB3F0 },
+	{ 0x4EC9, 0xD8EB }, { 0x4ECA, 0xBDF1 }, { 0x4ECB, 0xBDE9 }, { 0x4ECD, 0xC8D4 }, { 0x4ECE, 0xB4D3 }, { 0x4ED1, 0xC2D8 }, { 0x4ED3, 0xB2D6 }, { 0x4ED4, 0xD7D0 },
+	{ 0x4ED5, 0xCACB }, { 0x4ED6, 0xCBFB }, { 0x4ED7, 0xD5CC }, { 0x4ED8, 0xB8B6 }, { 0x4ED9, 0xCFC9 }, { 0x4EDD, 0xD9DA }, { 0x4EDE, 0xD8F0 }, { 0x4EDF, 0xC7AA },
+	{ 0x4EE1, 0xD8EE }, { 0x4EE3, 0xB4FA }, { 0x4EE4, 0xC1EE }, { 0x4EE5, 0xD2D4 }, { 0x4EE8, 0xD8ED }, { 0x4EEA, 0xD2C7 }, { 0x4EEB, 0xD8EF }, { 0x4EEC, 0xC3C7 },
+	{ 0x4EF0, 0xD1F6 }, { 0x4EF2, 0xD6D9 }, { 0x4EF3, 0xD8F2 }, { 0x4EF5, 0xD8F5 }, { 0x4EF6, 0xBCFE }, { 0x4EF7, 0xBCDB }, { 0x4EFB, 0xC8CE }, { 0x4EFD, 0xB7DD },
+	{ 0x4EFF, 0xB7C2 }, { 0x4F01, 0xC6F3 }, { 0x4F09, 0xD8F8 }, { 0x4F0A, 0xD2C1 }, { 0x4F0D, 0xCEE9 }, { 0x4F0E, 0xBCBF }, { 0x4F0F, 0xB7FC }, { 0x4F10, 0xB7A5 },
+	{ 0x4F11, 0xD0DD }, { 0x4F17, 0xD6DA }, { 0x4F18, 0xD3C5 }, { 0x4F19, 0xBBEF }, { 0x4F1A, 0xBBE1 }, { 0x4F1B, 0xD8F1 }, { 0x4F1E, 0xC9A1 }, { 0x4F1F, 0xCEB0 },
+	{ 0x4F20, 0xB4AB }, { 0x4F22, 0xD8F3 }, { 0x4F24, 0xC9CB }, { 0x4F25, 0xD8F6 }, { 0x4F26, 0xC2D7 }, { 0x4F27, 0xD8F7 }, { 0x4F2A, 0xCEB1 }, { 0x4F2B, 0xD8F9 },
+	{ 0x4F2F, 0xB2AE }, { 0x4F30, 0xB9C0 }, { 0x4F32, 0xD9A3 }, { 0x4F34, 0xB0E9 }, { 0x4F36, 0xC1E6 }, { 0x4F38, 0xC9EC }, { 0x4F3A, 0xCBC5 }, { 0x4F3C, 0xCBC6 },
+	{ 0x4F3D, 0xD9A4 }, { 0x4F43, 0xB5E8 }, { 0x4F46, 0xB5AB }, { 0x4F4D, 0xCEBB }, { 0x4F4E, 0xB5CD }, { 0x4F4F, 0xD7A1 }, { 0x4F50, 0xD7F4 }, { 0x4F51, 0xD3D3 },
+	{ 0x4F53, 0xCCE5 }, { 0x4F55, 0xBACE }, { 0x4F57, 0xD9A2 }, { 0x4F58, 0xD9DC }, { 0x4F59, 0xD3E0 }, { 0x4F5A, 0xD8FD }, { 0x4F5B, 0xB7F0 }, { 0x4F5C, 0xD7F7 },
+	{ 0x4F5D, 0xD8FE }, { 0x4F5E, 0xD8FA }, { 0x4F5F, 0xD9A1 }, { 0x4F60, 0xC4E3 }, { 0x4F63, 0xD3B6 }, { 0x4F64, 0xD8F4 }, { 0x4F65, 0xD9DD }, { 0x4F67, 0xD8FB },
+	{ 0x4F69, 0xC5E5 }, { 0x4F6C, 0xC0D0 }, { 0x4F6F, 0xD1F0 }, { 0x4F70, 0xB0DB }, { 0x4F73, 0xBCD1 }, { 0x4F74, 0xD9A6 }, { 0x4F76, 0xD9A5 }, { 0x4F7B, 0xD9AC },
+	{ 0x4F7C, 0xD9AE }, { 0x4F7E, 0xD9AB }, { 0x4F7F, 0xCAB9 }, { 0x4F83, 0xD9A9 }, { 0x4F84, 0xD6B6 }, { 0x4F88, 0xB3DE }, { 0x4F89, 0xD9A8 }, { 0x4F8B, 0xC0FD },
+	{ 0x4F8D, 0xCACC }, { 0x4F8F, 0xD9AA }, { 0x4F91, 0xD9A7 }, { 0x4F94, 0xD9B0 }, { 0x4F97, 0xB6B1 }, { 0x4F9B, 0xB9A9 }, { 0x4F9D, 0xD2C0 }, { 0x4FA0, 0xCFC0 },
+	{ 0x4FA3, 0xC2C2 }, { 0x4FA5, 0xBDC4 }, { 0x4FA6, 0xD5EC }, { 0x4FA7, 0xB2E0 }, { 0x4FA8, 0xC7C8 }, { 0x4FA9, 0xBFEB }, { 0x4FAA, 0xD9AD }, { 0x4FAC, 0xD9AF },
+	{ 0x4FAE, 0xCEEA }, { 0x4FAF, 0xBAEE }, { 0x4FB5, 0xC7D6 }, { 0x4FBF, 0xB1E3 }, { 0x4FC3, 0xB4D9 }, { 0x4FC4, 0xB6ED }, { 0x4FC5, 0xD9B4 }, { 0x4FCA, 0xBFA1 },
+	{ 0x4FCE, 0xD9DE }, { 0x4FCF, 0xC7CE }, { 0x4FD0, 0xC0FE }, { 0x4FD1, 0xD9B8 }, { 0x4FD7, 0xCBD7 }, { 0x4FD8, 0xB7FD }, { 0x4FDA, 0xD9B5 }, { 0x4FDC, 0xD9B7 },
+	{ 0x4FDD, 0xB1A3 }, { 0x4FDE, 0xD3E1 }, { 0x4FDF, 0xD9B9 }, { 0x4FE1, 0xD0C5 }, { 0x4FE3, 0xD9B6 }, { 0x4FE6, 0xD9B1 }, { 0x4FE8, 0xD9B2 }, { 0x4FE9, 0xC1A9 },
+	{ 0x4FEA, 0xD9B3 }, { 0x4FED, 0xBCF3 }, { 0x4FEE, 0xD0DE }, { 0x4FEF, 0xB8A9 }, { 0x4FF1, 0xBEE3 }, { 0x4FF3, 0xD9BD }, { 0x4FF8, 0xD9BA }, { 0x4FFA, 0xB0B3 },
+	{ 0x4FFE, 0xD9C2 }, { 0x500C, 0xD9C4 }, { 0x500D, 0xB1B6 }, { 0x500F, 0xD9BF }, { 0x5012, 0xB5B9 }, { 0x5014, 0xBEF3 }, { 0x5018, 0xCCC8 }, { 0x5019, 0xBAF2 },
+	{ 0x501A, 0xD2D0 }, { 0x501C, 0xD9C3 }, { 0x501F, 0xBDE8 }, { 0x5021, 0xB3AB }, { 0x5025, 0xD9C5 }, { 0x5026, 0xBEEB }, { 0x5028, 0xD9C6 }, { 0x5029, 0xD9BB },
+	{ 0x502A, 0xC4DF }, { 0x502C, 0xD9BE }, { 0x502D, 0xD9C1 }, { 0x502E, 0xD9C0 }, { 0x503A, 0xD5AE }, { 0x503C, 0xD6B5 }, { 0x503E, 0xC7E3 }, { 0x5043, 0xD9C8 },
+	{ 0x5047, 0xBCD9 }, { 0x5048, 0xD9CA }, { 0x504C, 0xD9BC }, { 0x504E, 0xD9CB }, { 0x504F, 0xC6AB }, { 0x5055, 0xD9C9 }, { 0x505A, 0xD7F6 }, { 0x505C, 0xCDA3 },
+	{ 0x5065, 0xBDA1 }, { 0x506C, 0xD9CC }, { 0x5076, 0xC5BC }, { 0x5077, 0xCDB5 }, { 0x507B, 0xD9CD }, { 0x507E, 0xD9C7 }, { 0x507F, 0xB3A5 }, { 0x5080, 0xBFFE },
+	{ 0x5085, 0xB8B5 }, { 0x5088, 0xC0FC }, { 0x508D, 0xB0F8 }, { 0x50A3, 0xB4F6 }, { 0x50A5, 0xD9CE }, { 0x50A7, 0xD9CF }, { 0x50A8, 0xB4A2 }, { 0x50A9, 0xD9D0 },
+	{ 0x50AC, 0xB4DF }, { 0x50B2, 0xB0C1 }, { 0x50BA, 0xD9D1 }, { 0x50BB, 0xC9B5 }, { 0x50CF, 0xCFF1 }, { 0x50D6, 0xD9D2 }, { 0x50DA, 0xC1C5 }, { 0x50E6, 0xD9D6 },
+	{ 0x50E7, 0xC9AE }, { 0x50EC, 0xD9D5 }, { 0x50ED, 0xD9D4 }, { 0x50EE, 0xD9D7 }, { 0x50F3, 0xCBDB }, { 0x50F5, 0xBDA9 }, { 0x50FB, 0xC6A7 }, { 0x5106, 0xD9D3 },
+	{ 0x5107, 0xD9D8 }, { 0x510B, 0xD9D9 }, { 0x5112, 0xC8E5 }, { 0x5121, 0xC0DC }, { 0x513F, 0xB6F9 }, { 0x5140, 0xD8A3 }, { 0x5141, 0xD4CA }, { 0x5143, 0xD4AA },
+	{ 0x5144, 0xD0D6 }, { 0x5145, 0xB3E4 }, { 0x5146, 0xD5D7 }, { 0x5148, 0xCFC8 }, { 0x5149, 0xB9E2 }, { 0x514B, 0xBFCB }, { 0x514D, 0xC3E2 }, { 0x5151, 0xB6D2 },
+	{ 0x5154, 0xCDC3 }, { 0x5155, 0xD9EE }, { 0x5156, 0xD9F0 }, { 0x515A, 0xB5B3 }, { 0x515C, 0xB6B5 }, { 0x5162, 0xBEA4 }, { 0x5165, 0xC8EB }, { 0x5168, 0xC8AB },
+	{ 0x516B, 0xB0CB }, { 0x516C, 0xB9AB }, { 0x516D, 0xC1F9 }, { 0x516E, 0xD9E2 }, { 0x5170, 0xC0BC }, { 0x5171, 0xB9B2 }, { 0x5173, 0xB9D8 }, { 0x5174, 0xD0CB },
+	{ 0x5175, 0xB1F8 }, { 0x5176, 0xC6E4 }, { 0x5177, 0xBEDF }, { 0x5178, 0xB5E4 }, { 0x5179, 0xD7C8 }, { 0x517B, 0xD1F8 }, { 0x517C, 0xBCE6 }, { 0x517D, 0xCADE },
+	{ 0x5180, 0xBCBD }, { 0x5181, 0xD9E6 }, { 0x5182, 0xD8E7 }, { 0x5185, 0xC4DA }, { 0x5188, 0xB8D4 }, { 0x5189, 0xC8BD }, { 0x518C, 0xB2E1 }, { 0x518D, 0xD4D9 },
+	{ 0x5192, 0xC3B0 }, { 0x5195, 0xC3E1 }, { 0x5196, 0xDAA2 }, { 0x5197, 0xC8DF }, { 0x5199, 0xD0B4 }, { 0x519B, 0xBEFC }, { 0x519C, 0xC5A9 }, { 0x51A0, 0xB9DA },
+	{ 0x51A2, 0xDAA3 }, { 0x51A4, 0xD4A9 }, { 0x51A5, 0xDAA4 }, { 0x51AB, 0xD9FB }, { 0x51AC, 0xB6AC }, { 0x51AF, 0xB7EB }, { 0x51B0, 0xB1F9 }, { 0x51B1, 0xD9FC },
+	{ 0x51B2, 0xB3E5 }, { 0x51B3, 0xBEF6 }, { 0x51B5, 0xBFF6 }, { 0x51B6, 0xD2B1 }, { 0x51B7, 0xC0E4 }, { 0x51BB, 0xB6B3 }, { 0x51BC, 0xD9FE }, { 0x51BD, 0xD9FD },
+	{ 0x51C0, 0xBEBB }, { 0x51C4, 0xC6E0 }, { 0x51C6, 0xD7BC }, { 0x51C7, 0xDAA1 }, { 0x51C9, 0xC1B9 }, { 0x51CB, 0xB5F2 }, { 0x51CC, 0xC1E8 }, { 0x51CF, 0xBCF5 },
+	{ 0x51D1, 0xB4D5 }, { 0x51DB, 0xC1DD }, { 0x51DD, 0xC4FD }, { 0x51E0, 0xBCB8 }, { 0x51E1, 0xB7B2 }, { 0x51E4, 0xB7EF }, { 0x51EB, 0xD9EC }, { 0x51ED, 0xC6BE },
+	{ 0x51EF, 0xBFAD }, { 0x51F0, 0xBBCB }, { 0x51F3, 0xB5CA }, { 0x51F5, 0xDBC9 }, { 0x51F6, 0xD0D7 }, { 0x51F8, 0xCDB9 }, { 0x51F9, 0xB0BC }, { 0x51FA, 0xB3F6 },
+	{ 0x51FB, 0xBBF7 }, { 0x51FC, 0xDBCA }, { 0x51FD, 0xBAAF }, { 0x51FF, 0xD4E4 }, { 0x5200, 0xB5B6 }, { 0x5201, 0xB5F3 }, { 0x5202, 0xD8D6 }, { 0x5203, 0xC8D0 },
+	{ 0x5206, 0xB7D6 }, { 0x5207, 0xC7D0 }, { 0x5208, 0xD8D7 }, { 0x520A, 0xBFAF }, { 0x520D, 0xDBBB }, { 0x520E, 0xD8D8 }, { 0x5211, 0xD0CC }, { 0x5212, 0xBBAE },
+	{ 0x5216, 0xEBBE }, { 0x5217, 0xC1D0 }, { 0x5218, 0xC1F5 }, { 0x5219, 0xD4F2 }, { 0x521A, 0xB8D5 }, { 0x521B, 0xB4B4 }, { 0x521D, 0xB3F5 }, { 0x5220, 0xC9BE },
+	{ 0x5224, 0xC5D0 }, { 0x5228, 0xC5D9 }, { 0x5229, 0xC0FB }, { 0x522B, 0xB1F0 }, { 0x522D, 0xD8D9 }, { 0x522E, 0xB9CE }, { 0x5230, 0xB5BD }, { 0x5233, 0xD8DA },
+	{ 0x5236, 0xD6C6 }, { 0x5237, 0xCBA2 }, { 0x5238, 0xC8AF }, { 0x5239, 0xC9B2 }, { 0x523A, 0xB4CC }, { 0x523B, 0xBFCC }, { 0x523D, 0xB9F4 }, { 0x523F, 0xD8DB },
+	{ 0x5240, 0xD8DC }, { 0x5241, 0xB6E7 }, { 0x5242, 0xBCC1 }, { 0x5243, 0xCCEA }, { 0x524A, 0xCFF7 }, { 0x524C, 0xD8DD }, { 0x524D, 0xC7B0 }, { 0x5250, 0xB9D0 },
+	{ 0x5251, 0xBDA3 }, { 0x5254, 0xCCDE }, { 0x5256, 0xC6CA }, { 0x525C, 0xD8E0 }, { 0x525E, 0xD8DE }, { 0x5261, 0xD8DF }, { 0x5265, 0xB0FE }, { 0x5267, 0xBEE7 },
+	{ 0x5269, 0xCAA3 }, { 0x526A, 0xBCF4 }, { 0x526F, 0xB8B1 }, { 0x5272, 0xB8EE }, { 0x527D, 0xD8E2 }, { 0x527F, 0xBDCB }, { 0x5281, 0xD8E4 }, { 0x5282, 0xD8E3 },
+	{ 0x5288, 0xC5FC }, { 0x5290, 0xD8E5 }, { 0x5293, 0xD8E6 }, { 0x529B, 0xC1A6 }, { 0x529D, 0xC8B0 }, { 0x529E, 0xB0EC }, { 0x529F, 0xB9A6 }, { 0x52A0, 0xBCD3 },
+	{ 0x52A1, 0xCEF1 }, { 0x52A2, 0xDBBD }, { 0x52A3, 0xC1D3 }, { 0x52A8, 0xB6AF }, { 0x52A9, 0xD6FA }, { 0x52AA, 0xC5AC }, { 0x52AB, 0xBDD9 }, { 0x52AC, 0xDBBE },
+	{ 0x52AD, 0xDBBF }, { 0x52B1, 0xC0F8 }, { 0x52B2, 0xBEA2 }, { 0x52B3, 0xC0CD }, { 0x52BE, 0xDBC0 }, { 0x52BF, 0xCAC6 }, { 0x52C3, 0xB2AA }, { 0x52C7, 0xD3C2 },
+	{ 0x52C9, 0xC3E3 }, { 0x52CB, 0xD1AB }, { 0x52D0, 0xDBC2 }, { 0x52D2, 0xC0D5 }, { 0x52D6, 0xDBC3 }, { 0x52D8, 0xBFB1 }, { 0x52DF, 0xC4BC }, { 0x52E4, 0xC7DA },
+	{ 0x52F0, 0xDBC4 }, { 0x52F9, 0xD9E8 }, { 0x52FA, 0xC9D7 }, { 0x52FE, 0xB9B4 }, { 0x52FF, 0xCEF0 }, { 0x5300, 0xD4C8 }, { 0x5305, 0xB0FC }, { 0x5306, 0xB4D2 },
+	{ 0x5308, 0xD0D9 }, { 0x530D, 0xD9E9 }, { 0x530F, 0xDECB }, { 0x5310, 0xD9EB }, { 0x5315, 0xD8B0 }, { 0x5316, 0xBBAF }, { 0x5317, 0xB1B1 }, { 0x5319, 0xB3D7 },
+	{ 0x531A, 0xD8CE }, { 0x531D, 0xD4D1 }, { 0x5320, 0xBDB3 }, { 0x5321, 0xBFEF }, { 0x5323, 0xCFBB }, { 0x5326, 0xD8D0 }, { 0x532A, 0xB7CB }, { 0x532E, 0xD8D1 },
+	{ 0x5339, 0xC6A5 }, { 0x533A, 0xC7F8 }, { 0x533B, 0xD2BD }, { 0x533E, 0xD8D2 }, { 0x533F, 0xC4E4 }, { 0x5341, 0xCAAE }, { 0x5343, 0xC7A7 }, { 0x5345, 0xD8A6 },
+	{ 0x5347, 0xC9FD }, { 0x5348, 0xCEE7 }, { 0x5349, 0xBBDC }, { 0x534A, 0xB0EB }, { 0x534E, 0xBBAA }, { 0x534F, 0xD0AD }, { 0x5351, 0xB1B0 }, { 0x5352, 0xD7E4 },
+	{ 0x5353, 0xD7BF }, { 0x5355, 0xB5A5 }, { 0x5356, 0xC2F4 }, { 0x5357, 0xC4CF }, { 0x535A, 0xB2A9 }, { 0x535C, 0xB2B7 }, { 0x535E, 0xB1E5 }, { 0x535F, 0xDFB2 },
+	{ 0x5360, 0xD5BC }, { 0x5361, 0xBFA8 }, { 0x5362, 0xC2AC }, { 0x5363, 0xD8D5 }, { 0x5364, 0xC2B1 }, { 0x5366, 0xD8D4 }, { 0x5367, 0xCED4 }, { 0x5369, 0xDAE0 },
+	{ 0x536B, 0xCEC0 }, { 0x536E, 0xD8B4 }, { 0x536F, 0xC3AE }, { 0x5370, 0xD3A1 }, { 0x5371, 0xCEA3 }, { 0x5373, 0xBCB4 }, { 0x5374, 0xC8B4 }, { 0x5375, 0xC2D1 },
+	{ 0x5377, 0xBEED }, { 0x5378, 0xD0B6 }, { 0x537A, 0xDAE1 }, { 0x537F, 0xC7E4 }, { 0x5382, 0xB3A7 }, { 0x5384, 0xB6F2 }, { 0x5385, 0xCCFC }, { 0x5386, 0xC0FA },
+	{ 0x5389, 0xC0F7 }, { 0x538B, 0xD1B9 }, { 0x538C, 0xD1E1 }, { 0x538D, 0xD8C7 }, { 0x5395, 0xB2DE }, { 0x5398, 0xC0E5 }, { 0x539A, 0xBAF1 }, { 0x539D, 0xD8C8 },
+	{ 0x539F, 0xD4AD }, { 0x53A2, 0xCFE1 }, { 0x53A3, 0xD8C9 }, { 0x53A5, 0xD8CA }, { 0x53A6, 0xCFC3 }, { 0x53A8, 0xB3F8 }, { 0x53A9, 0xBEC7 }, { 0x53AE, 0xD8CB },
+	{ 0x53B6, 0xDBCC }, { 0x53BB, 0xC8A5 }, { 0x53BF, 0xCFD8 }, { 0x53C1, 0xC8FE }, { 0x53C2, 0xB2CE }, { 0x53C8, 0xD3D6 }, { 0x53C9, 0xB2E6 }, { 0x53CA, 0xBCB0 },
+	{ 0x53CB, 0xD3D1 }, { 0x53CC, 0xCBAB }, { 0x53CD, 0xB7B4 }, { 0x53D1, 0xB7A2 }, { 0x53D4, 0xCAE5 }, { 0x53D6, 0xC8A1 }, { 0x53D7, 0xCADC }, { 0x53D8, 0xB1E4 },
+	{ 0x53D9, 0xD0F0 }, { 0x53DB, 0xC5D1 }, { 0x53DF, 0xDBC5 }, { 0x53E0, 0xB5FE }, { 0x53E3, 0xBFDA }, { 0x53E4, 0xB9C5 }, { 0x53E5, 0xBEE4 }, { 0x53E6, 0xC1ED },
+	{ 0x53E8, 0xDFB6 }, { 0x53E9, 0xDFB5 }, { 0x53EA, 0xD6BB }, { 0x53EB, 0xBDD0 }, { 0x53EC, 0xD5D9 }, { 0x53ED, 0xB0C8 }, { 0x53EE, 0xB6A3 }, { 0x53EF, 0xBFC9 },
+	{ 0x53F0, 0xCCA8 }, { 0x53F1, 0xDFB3 }, { 0x53F2, 0xCAB7 }, { 0x53F3, 0xD3D2 }, { 0x53F5, 0xD8CF }, { 0x53F6, 0xD2B6 }, { 0x53F7, 0xBAC5 }, { 0x53F8, 0xCBBE },
+	{ 0x53F9, 0xCCBE }, { 0x53FB, 0xDFB7 }, { 0x53FC, 0xB5F0 }, { 0x53FD, 0xDFB4 }, { 0x5401, 0xD3F5 }, { 0x5403, 0xB3D4 }, { 0x5404, 0xB8F7 }, { 0x5406, 0xDFBA },
+	{ 0x5408, 0xBACF }, { 0x5409, 0xBCAA }, { 0x540A, 0xB5F5 }, { 0x540C, 0xCDAC }, { 0x540D, 0xC3FB }, { 0x540E, 0xBAF3 }, { 0x540F, 0xC0F4 }, { 0x5410, 0xCDC2 },
+	{ 0x5411, 0xCFF2 }, { 0x5412, 0xDFB8 }, { 0x5413, 0xCFC5 }, { 0x5415, 0xC2C0 }, { 0x5416, 0xDFB9 }, { 0x5417, 0xC2F0 }, { 0x541B, 0xBEFD }, { 0x541D, 0xC1DF },
+	{ 0x541E, 0xCDCC }, { 0x541F, 0xD2F7 }, { 0x5420, 0xB7CD }, { 0x5421, 0xDFC1 }, { 0x5423, 0xDFC4 }, { 0x5426, 0xB7F1 }, { 0x5427, 0xB0C9 }, { 0x5428, 0xB6D6 },
+	{ 0x5429, 0xB7D4 }, { 0x542B, 0xBAAC }, { 0x542C, 0xCCFD }, { 0x542D, 0xBFD4 }, { 0x542E, 0xCBB1 }, { 0x542F, 0xC6F4 }, { 0x5431, 0xD6A8 }, { 0x5432, 0xDFC5 },
+	{ 0x5434, 0xCEE2 }, { 0x5435, 0xB3B3 }, { 0x5438, 0xCEFC }, { 0x5439, 0xB4B5 }, { 0x543B, 0xCEC7 }, { 0x543C, 0xBAF0 }, { 0x543E, 0xCEE1 }, { 0x5440, 0xD1BD },
+	{ 0x5443, 0xDFC0 }, { 0x5446, 0xB4F4 }, { 0x5448, 0xB3CA }, { 0x544A, 0xB8E6 }, { 0x544B, 0xDFBB }, { 0x5450, 0xC4C5 }, { 0x5452, 0xDFBC }, { 0x5453, 0xDFBD },
+	{ 0x5454, 0xDFBE }, { 0x5455, 0xC5BB }, { 0x5456, 0xDFBF }, { 0x5457, 0xDFC2 }, { 0x5458, 0xD4B1 }, { 0x5459, 0xDFC3 }, { 0x545B, 0xC7BA }, { 0x545C, 0xCED8 },
+	{ 0x5462, 0xC4D8 }, { 0x5464, 0xDFCA }, { 0x5466, 0xDFCF }, { 0x5468, 0xD6DC }, { 0x5471, 0xDFC9 }, { 0x5472, 0xDFDA }, { 0x5473, 0xCEB6 }, { 0x5475, 0xBAC7 },
+	{ 0x5476, 0xDFCE }, { 0x5477, 0xDFC8 }, { 0x5478, 0xC5DE }, { 0x547B, 0xC9EB }, { 0x547C, 0xBAF4 }, { 0x547D, 0xC3FC }, { 0x5480, 0xBED7 }, { 0x5482, 0xDFC6 },
+	{ 0x5484, 0xDFCD }, { 0x5486, 0xC5D8 }, { 0x548B, 0xD5A6 }, { 0x548C, 0xBACD }, { 0x548E, 0xBECC }, { 0x548F, 0xD3BD }, { 0x5490, 0xB8C0 }, { 0x5492, 0xD6E4 },
+	{ 0x5494, 0xDFC7 }, { 0x5495, 0xB9BE }, { 0x5496, 0xBFA7 }, { 0x5499, 0xC1FC }, { 0x549A, 0xDFCB }, { 0x549B, 0xDFCC }, { 0x549D, 0xDFD0 }, { 0x54A3, 0xDFDB },
+	{ 0x54A4, 0xDFE5 }, { 0x54A6, 0xDFD7 }, { 0x54A7, 0xDFD6 }, { 0x54A8, 0xD7C9 }, { 0x54A9, 0xDFE3 }, { 0x54AA, 0xDFE4 }, { 0x54AB, 0xE5EB }, { 0x54AC, 0xD2A7 },
+	{ 0x54AD, 0xDFD2 }, { 0x54AF, 0xBFA9 }, { 0x54B1, 0xD4DB }, { 0x54B3, 0xBFC8 }, { 0x54B4, 0xDFD4 }, { 0x54B8, 0xCFCC }, { 0x54BB, 0xDFDD }, { 0x54BD, 0xD1CA },
+	{ 0x54BF, 0xDFDE }, { 0x54C0, 0xB0A7 }, { 0x54C1, 0xC6B7 }, { 0x54C2, 0xDFD3 }, { 0x54C4, 0xBAE5 }, { 0x54C6, 0xB6DF }, { 0x54C7, 0xCDDB }, { 0x54C8, 0xB9FE },
+	{ 0x54C9, 0xD4D5 }, { 0x54CC, 0xDFDF }, { 0x54CD, 0xCFEC }, { 0x54CE, 0xB0A5 }, { 0x54CF, 0xDFE7 }, { 0x54D0, 0xDFD1 }, { 0x54D1, 0xD1C6 }, { 0x54D2, 0xDFD5 },
+	{ 0x54D3, 0xDFD8 }, { 0x54D4, 0xDFD9 }, { 0x54D5, 0xDFDC }, { 0x54D7, 0xBBA9 }, { 0x54D9, 0xDFE0 }, { 0x54DA, 0xDFE1 }, { 0x54DC, 0xDFE2 }, { 0x54DD, 0xDFE6 },
+	{ 0x54DE, 0xDFE8 }, { 0x54DF, 0xD3B4 }, { 0x54E5, 0xB8E7 }, { 0x54E6, 0xC5B6 }, { 0x54E7, 0xDFEA }, { 0x54E8, 0xC9DA }, { 0x54E9, 0xC1A8 }, { 0x54EA, 0xC4C4 },
+	{ 0x54ED, 0xBFDE }, { 0x54EE, 0xCFF8 }, { 0x54F2, 0xD5DC }, { 0x54F3, 0xDFEE }, { 0x54FA, 0xB2B8 }, { 0x54FC, 0xBADF }, { 0x54FD, 0xDFEC }, { 0x54FF, 0xDBC1 },
+	{ 0x5501, 0xD1E4 }, { 0x5506, 0xCBF4 }, { 0x5507, 0xB4BD }, { 0x5509, 0xB0A6 }, { 0x550F, 0xDFF1 }, { 0x5510, 0xCCC6 }, { 0x5511, 0xDFF2 }, { 0x5514, 0xDFED },
+	{ 0x551B, 0xDFE9 }, { 0x5520, 0xDFEB }, { 0x5522, 0xDFEF }, { 0x5523, 0xDFF0 }, { 0x5524, 0xBBBD }, { 0x5527, 0xDFF3 }, { 0x552A, 0xDFF4 }, { 0x552C, 0xBBA3 },
+	{ 0x552E, 0xCADB }, { 0x552F, 0xCEA8 }, { 0x5530, 0xE0A7 }, { 0x5531, 0xB3AA }, { 0x5533, 0xE0A6 }, { 0x5537, 0xE0A1 }, { 0x553C, 0xDFFE }, { 0x553E, 0xCDD9 },
+	{ 0x553F, 0xDFFC }, { 0x5541, 0xDFFA }, { 0x5543, 0xBFD0 }, { 0x5544, 0xD7C4 }, { 0x5546, 0xC9CC }, { 0x5549, 0xDFF8 }, { 0x554A, 0xB0A1 }, { 0x5550, 0xDFFD },
+	{ 0x5555, 0xDFFB }, { 0x5556, 0xE0A2 }, { 0x555C, 0xE0A8 }, { 0x5561, 0xB7C8 }, { 0x5564, 0xC6A1 }, { 0x5565, 0xC9B6 }, { 0x5566, 0xC0B2 }, { 0x5567, 0xDFF5 },
+	{ 0x556A, 0xC5BE }, { 0x556C, 0xD8C4 }, { 0x556D, 0xDFF9 }, { 0x556E, 0xC4F6 }, { 0x5575, 0xE0A3 }, { 0x5576, 0xE0A4 }, { 0x5577, 0xE0A5 }, { 0x5578, 0xD0A5 },
+	{ 0x557B, 0xE0B4 }, { 0x557C, 0xCCE4 }, { 0x557E, 0xE0B1 }, { 0x5580, 0xBFA6 }, { 0x5581, 0xE0AF }, { 0x5582, 0xCEB9 }, { 0x5583, 0xE0AB }, { 0x5584, 0xC9C6 },
+	{ 0x5587, 0xC0AE }, { 0x5588, 0xE0AE }, { 0x5589, 0xBAED }, { 0x558A, 0xBAB0 }, { 0x558B, 0xE0A9 }, { 0x558F, 0xDFF6 }, { 0x5591, 0xE0B3 }, { 0x5594, 0xE0B8 },
+	{ 0x5598, 0xB4AD }, { 0x5599, 0xE0B9 }, { 0x559C, 0xCFB2 }, { 0x559D, 0xBAC8 }, { 0x559F, 0xE0B0 }, { 0x55A7, 0xD0FA }, { 0x55B1, 0xE0AC }, { 0x55B3, 0xD4FB },
+	{ 0x55B5, 0xDFF7 }, { 0x55B7, 0xC5E7 }, { 0x55B9, 0xE0AD }, { 0x55BB, 0xD3F7 }, { 0x55BD, 0xE0B6 }, { 0x55BE, 0xE0B7 }, { 0x55C4, 0xE0C4 }, { 0x55C5, 0xD0E1 },
+	{ 0x55C9, 0xE0BC }, { 0x55CC, 0xE0C9 }, { 0x55CD, 0xE0CA }, { 0x55D1, 0xE0BE }, { 0x55D2, 0xE0AA }, { 0x55D3, 0xC9A4 }, { 0x55D4, 0xE0C1 }, { 0x55D6, 0xE0B2 },
+	{ 0x55DC, 0xCAC8 }, { 0x55DD, 0xE0C3 }, { 0x55DF, 0xE0B5 }, { 0x55E1, 0xCECB }, { 0x55E3, 0xCBC3 }, { 0x55E4, 0xE0CD }, { 0x55E5, 0xE0C6 }, { 0x55E6, 0xE0C2 },
+	{ 0x55E8, 0xE0CB }, { 0x55EA, 0xE0BA }, { 0x55EB, 0xE0BF }, { 0x55EC, 0xE0C0 }, { 0x55EF, 0xE0C5 }, { 0x55F2, 0xE0C7 }, { 0x55F3, 0xE0C8 }, { 0x55F5, 0xE0CC },
+	{ 0x55F7, 0xE0BB }, { 0x55FD, 0xCBD4 }, { 0x55FE, 0xE0D5 }, { 0x5600, 0xE0D6 }, { 0x5601, 0xE0D2 }, { 0x5608, 0xE0D0 }, { 0x5609, 0xBCCE }, { 0x560C, 0xE0D1 },
+	{ 0x560E, 0xB8C2 }, { 0x560F, 0xD8C5 }, { 0x5618, 0xD0EA }, { 0x561B, 0xC2EF }, { 0x561E, 0xE0CF }, { 0x561F, 0xE0BD }, { 0x5623, 0xE0D4 }, { 0x5624, 0xE0D3 },
+	{ 0x5627, 0xE0D7 }, { 0x562C, 0xE0DC }, { 0x562D, 0xE0D8 }, { 0x5631, 0xD6F6 }, { 0x5632, 0xB3B0 }, { 0x5634, 0xD7EC }, { 0x5636, 0xCBBB }, { 0x5639, 0xE0DA },
+	{ 0x563B, 0xCEFB }, { 0x563F, 0xBAD9 }, { 0x564C, 0xE0E1 }, { 0x564D, 0xE0DD }, { 0x564E, 0xD2AD }, { 0x5654, 0xE0E2 }, { 0x5657, 0xE0DB }, { 0x5658, 0xE0D9 },
+	{ 0x5659, 0xE0DF }, { 0x565C, 0xE0E0 }, { 0x5662, 0xE0DE }, { 0x5664, 0xE0E4 }, { 0x5668, 0xC6F7 }, { 0x5669, 0xD8AC }, { 0x566A, 0xD4EB }, { 0x566B, 0xE0E6 },
+	{ 0x566C, 0xCAC9 }, { 0x5671, 0xE0E5 }, { 0x5676, 0xB8C1 }, { 0x567B, 0xE0E7 }, { 0x567C, 0xE0E8 }, { 0x5685, 0xE0E9 }, { 0x5686, 0xE0E3 }, { 0x568E, 0xBABF },
+	{ 0x568F, 0xCCE7 }, { 0x5693, 0xE0EA }, { 0x56A3, 0xCFF9 }, { 0x56AF, 0xE0EB }, { 0x56B7, 0xC8C2 }, { 0x56BC, 0xBDC0 }, { 0x56CA, 0xC4D2 }, { 0x56D4, 0xE0EC },
+	{ 0x56D7, 0xE0ED }, { 0x56DA, 0xC7F4 }, { 0x56DB, 0xCBC4 }, { 0x56DD, 0xE0EE }, { 0x56DE, 0xBBD8 }, { 0x56DF, 0xD8B6 }, { 0x56E0, 0xD2F2 }, { 0x56E1, 0xE0EF },
+	{ 0x56E2, 0xCDC5 }, { 0x56E4, 0xB6DA }, { 0x56EB, 0xE0F1 }, { 0x56ED, 0xD4B0 }, { 0x56F0, 0xC0A7 }, { 0x56F1, 0xB4D1 }, { 0x56F4, 0xCEA7 }, { 0x56F5, 0xE0F0 },
+	{ 0x56F9, 0xE0F2 }, { 0x56FA, 0xB9CC }, { 0x56FD, 0xB9FA }, { 0x56FE, 0xCDBC }, { 0x56FF, 0xE0F3 }, { 0x5703, 0xC6D4 }, { 0x5704, 0xE0F4 }, { 0x5706, 0xD4B2 },
+	{ 0x5708, 0xC8A6 }, { 0x5709, 0xE0F6 }, { 0x570A, 0xE0F5 }, { 0x571C, 0xE0F7 }, { 0x571F, 0xCDC1 }, { 0x5723, 0xCAA5 }, { 0x5728, 0xD4DA }, { 0x5729, 0xDBD7 },
+	{ 0x572A, 0xDBD9 }, { 0x572C, 0xDBD8 }, { 0x572D, 0xB9E7 }, { 0x572E, 0xDBDC }, { 0x572F, 0xDBDD }, { 0x5730, 0xB5D8 }, { 0x5733, 0xDBDA }, { 0x5739, 0xDBDB },
+	{ 0x573A, 0xB3A1 }, { 0x573B, 0xDBDF }, { 0x573E, 0xBBF8 }, { 0x5740, 0xD6B7 }, { 0x5742, 0xDBE0 }, { 0x5747, 0xBEF9 }, { 0x574A, 0xB7BB }, { 0x574C, 0xDBD0 },
+	{ 0x574D, 0xCCAE }, { 0x574E, 0xBFB2 }, { 0x574F, 0xBBB5 }, { 0x5750, 0xD7F8 }, { 0x5751, 0xBFD3 }, { 0x5757, 0xBFE9 }, { 0x575A, 0xBCE1 }, { 0x575B, 0xCCB3 },
+	{ 0x575C, 0xDBDE }, { 0x575D, 0xB0D3 }, { 0x575E, 0xCEEB }, { 0x575F, 0xB7D8 }, { 0x5760, 0xD7B9 }, { 0x5761, 0xC6C2 }, { 0x5764, 0xC0A4 }, { 0x5766, 0xCCB9 },
+	{ 0x5768, 0xDBE7 }, { 0x5769, 0xDBE1 }, { 0x576A, 0xC6BA }, { 0x576B, 0xDBE3 }, { 0x576D, 0xDBE8 }, { 0x576F, 0xC5F7 }, { 0x5773, 0xDBEA }, { 0x5776, 0xDBE9 },
+	{ 0x5777, 0xBFC0 }, { 0x577B, 0xDBE6 }, { 0x577C, 0xDBE5 }, { 0x5782, 0xB4B9 }, { 0x5783, 0xC0AC }, { 0x5784, 0xC2A2 }, { 0x5785, 0xDBE2 }, { 0x5786, 0xDBE4 },
+	{ 0x578B, 0xD0CD }, { 0x578C, 0xDBED }, { 0x5792, 0xC0DD }, { 0x5793, 0xDBF2 }, { 0x579B, 0xB6E2 }, { 0x57A0, 0xDBF3 }, { 0x57A1, 0xDBD2 }, { 0x57A2, 0xB9B8 },
+	{ 0x57A3, 0xD4AB }, { 0x57A4, 0xDBEC }, { 0x57A6, 0xBFD1 }, { 0x57A7, 0xDBF0 }, { 0x57A9, 0xDBD1 }, { 0x57AB, 0xB5E6 }, { 0x57AD, 0xDBEB }, { 0x57AE, 0xBFE5 },
+	{ 0x57B2, 0xDBEE }, { 0x57B4, 0xDBF1 }, { 0x57B8, 0xDBF9 }, { 0x57C2, 0xB9A1 }, { 0x57C3, 0xB0A3 }, { 0x57CB, 0xC2F1 }, { 0x57CE, 0xB3C7 }, { 0x57CF, 0xDBEF },
+	{ 0x57D2, 0xDBF8 }, { 0x57D4, 0xC6D2 }, { 0x57D5, 0xDBF4 }, { 0x57D8, 0xDBF5 }, { 0x57D9, 0xDBF7 }, { 0x57DA, 0xDBF6 }, { 0x57DD, 0xDBFE }, { 0x57DF, 0xD3F2 },
+	{ 0x57E0, 0xB2BA }, { 0x57E4, 0xDBFD }, { 0x57ED, 0xDCA4 }, { 0x57EF, 0xDBFB }, { 0x57F4, 0xDBFA }, { 0x57F8, 0xDBFC }, { 0x57F9, 0xC5E0 }, { 0x57FA, 0xBBF9 },
+	{ 0x57FD, 0xDCA3 }, { 0x5800, 0xDCA5 }, { 0x5802, 0xCCC3 }, { 0x5806, 0xB6D1 }, { 0x5807, 0xDDC0 }, { 0x580B, 0xDCA1 }, { 0x580D, 0xDCA2 }, { 0x5811, 0xC7B5 },
+	{ 0x5815, 0xB6E9 }, { 0x5819, 0xDCA7 }, { 0x581E, 0xDCA6 }, { 0x5820, 0xDCA9 }, { 0x5821, 0xB1A4 }, { 0x5824, 0xB5CC }, { 0x582A, 0xBFB0 }, { 0x5830, 0xD1DF },
+	{ 0x5835, 0xB6C2 }, { 0x5844, 0xDCA8 }, { 0x584C, 0xCBFA }, { 0x584D, 0xEBF3 }, { 0x5851, 0xCBDC }, { 0x5854, 0xCBFE }, { 0x5858, 0xCCC1 }, { 0x585E, 0xC8FB },
+	{ 0x5865, 0xDCAA }, { 0x586B, 0xCCEE }, { 0x586C, 0xDCAB }, { 0x587E, 0xDBD3 }, { 0x5880, 0xDCAF }, { 0x5881, 0xDCAC }, { 0x5883, 0xBEB3 }, { 0x5885, 0xCAFB },
+	{ 0x5889, 0xDCAD }, { 0x5892, 0xC9CA }, { 0x5893, 0xC4B9 }, { 0x5899, 0xC7BD }, { 0x589A, 0xDCAE }, { 0x589E, 0xD4F6 }, { 0x589F, 0xD0E6 }, { 0x58A8, 0xC4AB },
+	{ 0x58A9, 0xB6D5 }, { 0x58BC, 0xDBD4 }, { 0x58C1, 0xB1DA }, { 0x58C5, 0xDBD5 }, { 0x58D1, 0xDBD6 }, { 0x58D5, 0xBABE }, { 0x58E4, 0xC8C0 }, { 0x58EB, 0xCABF },
+	{ 0x58EC, 0xC8C9 }, { 0x58EE, 0xD7B3 }, { 0x58F0, 0xC9F9 }, { 0x58F3, 0xBFC7 }, { 0x58F6, 0xBAF8 }, { 0x58F9, 0xD2BC }, { 0x5902, 0xE2BA }, { 0x5904, 0xB4A6 },
+	{ 0x5907, 0xB1B8 }, { 0x590D, 0xB8B4 }, { 0x590F, 0xCFC4 }, { 0x5914, 0xD9E7 }, { 0x5915, 0xCFA6 }, { 0x5916, 0xCDE2 }, { 0x5919, 0xD9ED }, { 0x591A, 0xB6E0 },
+	{ 0x591C, 0xD2B9 }, { 0x591F, 0xB9BB }, { 0x5924, 0xE2B9 }, { 0x5925, 0xE2B7 }, { 0x5927, 0xB4F3 }, { 0x5929, 0xCCEC }, { 0x592A, 0xCCAB }, { 0x592B, 0xB7F2 },
+	{ 0x592D, 0xD8B2 }, { 0x592E, 0xD1EB }, { 0x592F, 0xBABB }, { 0x5931, 0xCAA7 }, { 0x5934, 0xCDB7 }, { 0x5937, 0xD2C4 }, { 0x5938, 0xBFE4 }, { 0x5939, 0xBCD0 },
+	{ 0x593A, 0xB6E1 }, { 0x593C, 0xDEC5 }, { 0x5941, 0xDEC6 }, { 0x5942, 0xDBBC }, { 0x5944, 0xD1D9 }, { 0x5947, 0xC6E6 }, { 0x5948, 0xC4CE }, { 0x5949, 0xB7EE },
+	{ 0x594B, 0xB7DC }, { 0x594E, 0xBFFC }, { 0x594F, 0xD7E0 }, { 0x5951, 0xC6F5 }, { 0x5954, 0xB1BC }, { 0x5955, 0xDEC8 }, { 0x5956, 0xBDB1 }, { 0x5957, 0xCCD7 },
+	{ 0x5958, 0xDECA }, { 0x595A, 0xDEC9 }, { 0x5960, 0xB5EC }, { 0x5962, 0xC9DD }, { 0x5965, 0xB0C2 }, { 0x5973, 0xC5AE }, { 0x5974, 0xC5AB }, { 0x5976, 0xC4CC },
+	{ 0x5978, 0xBCE9 }, { 0x5979, 0xCBFD }, { 0x597D, 0xBAC3 }, { 0x5981, 0xE5F9 }, { 0x5982, 0xC8E7 }, { 0x5983, 0xE5FA }, { 0x5984, 0xCDFD }, { 0x5986, 0xD7B1 },
+	{ 0x5987, 0xB8BE }, { 0x5988, 0xC2E8 }, { 0x598A, 0xC8D1 }, { 0x598D, 0xE5FB }, { 0x5992, 0xB6CA }, { 0x5993, 0xBCCB }, { 0x5996, 0xD1FD }, { 0x5997, 0xE6A1 },
+	{ 0x5999, 0xC3EE }, { 0x599E, 0xE6A4 }, { 0x59A3, 0xE5FE }, { 0x59A4, 0xE6A5 }, { 0x59A5, 0xCDD7 }, { 0x59A8, 0xB7C1 }, { 0x59A9, 0xE5FC }, { 0x59AA, 0xE5FD },
+	{ 0x59AB, 0xE6A3 }, { 0x59AE, 0xC4DD }, { 0x59AF, 0xE6A8 }, { 0x59B2, 0xE6A7 }, { 0x59B9, 0xC3C3 }, { 0x59BB, 0xC6DE }, { 0x59BE, 0xE6AA }, { 0x59C6, 0xC4B7 },
+	{ 0x59CA, 0xE6A2 }, { 0x59CB, 0xCABC }, { 0x59D0, 0xBDE3 }, { 0x59D1, 0xB9C3 }, { 0x59D2, 0xE6A6 }, { 0x59D3, 0xD0D5 }, { 0x59D4, 0xCEAF }, { 0x59D7, 0xE6A9 },
+	{ 0x59D8, 0xE6B0 }, { 0x59DA, 0xD2A6 }, { 0x59DC, 0xBDAA }, { 0x59DD, 0xE6AD }, { 0x59E3, 0xE6AF }, { 0x59E5, 0xC0D1 }, { 0x59E8, 0xD2CC }, { 0x59EC, 0xBCA7 },
+	{ 0x59F9, 0xE6B1 }, { 0x59FB, 0xD2F6 }, { 0x59FF, 0xD7CB }, { 0x5A01, 0xCDFE }, { 0x5A03, 0xCDDE }, { 0x5A04, 0xC2A6 }, { 0x5A05, 0xE6AB }, { 0x5A06, 0xE6AC },
+	{ 0x5A07, 0xBDBF }, { 0x5A08, 0xE6AE }, { 0x5A09, 0xE6B3 }, { 0x5A0C, 0xE6B2 }, { 0x5A11, 0xE6B6 }, { 0x5A13, 0xE6B8 }, { 0x5A18, 0xC4EF }, { 0x5A1C, 0xC4C8 },
+	{ 0x5A1F, 0xBEEA }, { 0x5A20, 0xC9EF }, { 0x5A23, 0xE6B7 }, { 0x5A25, 0xB6F0 }, { 0x5A29, 0xC3E4 }, { 0x5A31, 0xD3E9 }, { 0x5A32, 0xE6B4 }, { 0x5A34, 0xE6B5 },
+	{ 0x5A36, 0xC8A2 }, { 0x5A3C, 0xE6BD }, { 0x5A40, 0xE6B9 }, { 0x5A46, 0xC6C5 }, { 0x5A49, 0xCDF1 }, { 0x5A4A, 0xE6BB }, { 0x5A55, 0xE6BC }, { 0x5A5A, 0xBBE9 },
+	{ 0x5A62, 0xE6BE }, { 0x5A67, 0xE6BA }, { 0x5A6A, 0xC0B7 }, { 0x5A74, 0xD3A4 }, { 0x5A75, 0xE6BF }, { 0x5A76, 0xC9F4 }, { 0x5A77, 0xE6C3 }, { 0x5A7A, 0xE6C4 },
+	{ 0x5A7F, 0xD0F6 }, { 0x5A92, 0xC3BD }, { 0x5A9A, 0xC3C4 }, { 0x5A9B, 0xE6C2 }, { 0x5AAA, 0xE6C1 }, { 0x5AB2, 0xE6C7 }, { 0x5AB3, 0xCFB1 }, { 0x5AB5, 0xEBF4 },
+	{ 0x5AB8, 0xE6CA }, { 0x5ABE, 0xE6C5 }, { 0x5AC1, 0xBCDE }, { 0x5AC2, 0xC9A9 }, { 0x5AC9, 0xBCB5 }, { 0x5ACC, 0xCFD3 }, { 0x5AD2, 0xE6C8 }, { 0x5AD4, 0xE6C9 },
+	{ 0x5AD6, 0xE6CE }, { 0x5AD8, 0xE6D0 }, { 0x5ADC, 0xE6D1 }, { 0x5AE0, 0xE6CB }, { 0x5AE1, 0xB5D5 }, { 0x5AE3, 0xE6CC }, { 0x5AE6, 0xE6CF }, { 0x5AE9, 0xC4DB },
+	{ 0x5AEB, 0xE6C6 }, { 0x5AF1, 0xE6CD }, { 0x5B09, 0xE6D2 }, { 0x5B16, 0xE6D4 }, { 0x5B17, 0xE6D3 }, { 0x5B32, 0xE6D5 }, { 0x5B34, 0xD9F8 }, { 0x5B37, 0xE6D6 },
+	{ 0x5B40, 0xE6D7 }, { 0x5B50, 0xD7D3 }, { 0x5B51, 0xE6DD }, { 0x5B53, 0xE6DE }, { 0x5B54, 0xBFD7 }, { 0x5B55, 0xD4D0 }, { 0x5B57, 0xD7D6 }, { 0x5B58, 0xB4E6 },
+	{ 0x5B59, 0xCBEF }, { 0x5B5A, 0xE6DA }, { 0x5B5B, 0xD8C3 }, { 0x5B5C, 0xD7CE }, { 0x5B5D, 0xD0A2 }, { 0x5B5F, 0xC3CF }, { 0x5B62, 0xE6DF }, { 0x5B63, 0xBCBE },
+	{ 0x5B64, 0xB9C2 }, { 0x5B65, 0xE6DB }, { 0x5B66, 0xD1A7 }, { 0x5B69, 0xBAA2 }, { 0x5B6A, 0xC2CF }, { 0x5B6C, 0xD8AB }, { 0x5B70, 0xCAEB }, { 0x5B71, 0xE5EE },
+	{ 0x5B73, 0xE6DC }, { 0x5B75, 0xB7F5 }, { 0x5B7A, 0xC8E6 }, { 0x5B7D, 0xC4F5 }, { 0x5B80, 0xE5B2 }, { 0x5B81, 0xC4FE }, { 0x5B83, 0xCBFC }, { 0x5B84, 0xE5B3 },
+	{ 0x5B85, 0xD5AC }, { 0x5B87, 0xD3EE }, { 0x5B88, 0xCAD8 }, { 0x5B89, 0xB0B2 }, { 0x5B8B, 0xCBCE }, { 0x5B8C, 0xCDEA }, { 0x5B8F, 0xBAEA }, { 0x5B93, 0xE5B5 },
+	{ 0x5B95, 0xE5B4 }, { 0x5B97, 0xD7DA }, { 0x5B98, 0xB9D9 }, { 0x5B99, 0xD6E6 }, { 0x5B9A, 0xB6A8 }, { 0x5B9B, 0xCDF0 }, { 0x5B9C, 0xD2CB }, { 0x5B9D, 0xB1A6 },
+	{ 0x5B9E, 0xCAB5 }, { 0x5BA0, 0xB3E8 }, { 0x5BA1, 0xC9F3 }, { 0x5BA2, 0xBFCD }, { 0x5BA3, 0xD0FB }, { 0x5BA4, 0xCAD2 }, { 0x5BA5, 0xE5B6 }, { 0x5BA6, 0xBBC2 },
+	{ 0x5BAA, 0xCFDC }, { 0x5BAB, 0xB9AC }, { 0x5BB0, 0xD4D7 }, { 0x5BB3, 0xBAA6 }, { 0x5BB4, 0xD1E7 }, { 0x5BB5, 0xCFFC }, { 0x5BB6, 0xBCD2 }, { 0x5BB8, 0xE5B7 },
+	{ 0x5BB9, 0xC8DD }, { 0x5BBD, 0xBFED }, { 0x5BBE, 0xB1F6 }, { 0x5BBF, 0xCBDE }, { 0x5BC2, 0xBCC5 }, { 0x5BC4, 0xBCC4 }, { 0x5BC5, 0xD2FA }, { 0x5BC6, 0xC3DC },
+	{ 0x5BC7, 0xBFDC }, { 0x5BCC, 0xB8BB }, { 0x5BD0, 0xC3C2 }, { 0x5BD2, 0xBAAE }, { 0x5BD3, 0xD4A2 }, { 0x5BDD, 0xC7DE }, { 0x5BDE, 0xC4AF }, { 0x5BDF, 0xB2EC },
+	{ 0x5BE1, 0xB9D1 }, { 0x5BE4, 0xE5BB }, { 0x5BE5, 0xC1C8 }, { 0x5BE8, 0xD5AF }, { 0x5BEE, 0xE5BC }, { 0x5BF0, 0xE5BE }, { 0x5BF8, 0xB4E7 }, { 0x5BF9, 0xB6D4 },
+	{ 0x5BFA, 0xCBC2 }, { 0x5BFB, 0xD1B0 }, { 0x5BFC, 0xB5BC }, { 0x5BFF, 0xCAD9 }, { 0x5C01, 0xB7E2 }, { 0x5C04, 0xC9E4 }, { 0x5C06, 0xBDAB }, { 0x5C09, 0xCEBE },
+	{ 0x5C0A, 0xD7F0 }, { 0x5C0F, 0xD0A1 }, { 0x5C11, 0xC9D9 }, { 0x5C14, 0xB6FB }, { 0x5C15, 0xE6D8 }, { 0x5C16, 0xBCE2 }, { 0x5C18, 0xB3BE }, { 0x5C1A, 0xC9D0 },
+	{ 0x5C1C, 0xE6D9 }, { 0x5C1D, 0xB3A2 }, { 0x5C22, 0xDECC }, { 0x5C24, 0xD3C8 }, { 0x5C25, 0xDECD }, { 0x5C27, 0xD2A2 }, { 0x5C2C, 0xDECE }, { 0x5C31, 0xBECD },
+	{ 0x5C34, 0xDECF }, { 0x5C38, 0xCAAC }, { 0x5C39, 0xD2FC }, { 0x5C3A, 0xB3DF }, { 0x5C3B, 0xE5EA }, { 0x5C3C, 0xC4E1 }, { 0x5C3D, 0xBEA1 }, { 0x5C3E, 0xCEB2 },
+	{ 0x5C3F, 0xC4F2 }, { 0x5C40, 0xBED6 }, { 0x5C41, 0xC6A8 }, { 0x5C42, 0xB2E3 }, { 0x5C45, 0xBED3 }, { 0x5C48, 0xC7FC }, { 0x5C49, 0xCCEB }, { 0x5C4A, 0xBDEC },
+	{ 0x5C4B, 0xCEDD }, { 0x5C4E, 0xCABA }, { 0x5C4F, 0xC6C1 }, { 0x5C50, 0xE5EC }, { 0x5C51, 0xD0BC }, { 0x5C55, 0xD5B9 }, { 0x5C59, 0xE5ED }, { 0x5C5E, 0xCAF4 },
+	{ 0x5C60, 0xCDC0 }, { 0x5C61, 0xC2C5 }, { 0x5C63, 0xE5EF }, { 0x5C65, 0xC2C4 }, { 0x5C66, 0xE5F0 }, { 0x5C6E, 0xE5F8 }, { 0x5C6F, 0xCDCD }, { 0x5C71, 0xC9BD },
+	{ 0x5C79, 0xD2D9 }, { 0x5C7A, 0xE1A8 }, { 0x5C7F, 0xD3EC }, { 0x5C81, 0xCBEA }, { 0x5C82, 0xC6F1 }, { 0x5C88, 0xE1AC }, { 0x5C8C, 0xE1A7 }, { 0x5C8D, 0xE1A9 },
+	{ 0x5C90, 0xE1AA }, { 0x5C91, 0xE1AF }, { 0x5C94, 0xB2ED }, { 0x5C96, 0xE1AB }, { 0x5C97, 0xB8DA }, { 0x5C98, 0xE1AD }, { 0x5C99, 0xE1AE }, { 0x5C9A, 0xE1B0 },
+	{ 0x5C9B, 0xB5BA }, { 0x5C9C, 0xE1B1 }, { 0x5CA2, 0xE1B3 }, { 0x5CA3, 0xE1B8 }, { 0x5CA9, 0xD1D2 }, { 0x5CAB, 0xE1B6 }, { 0x5CAC, 0xE1B5 }, { 0x5CAD, 0xC1EB },
+	{ 0x5CB1, 0xE1B7 }, { 0x5CB3, 0xD4C0 }, { 0x5CB5, 0xE1B2 }, { 0x5CB7, 0xE1BA }, { 0x5CB8, 0xB0B6 }, { 0x5CBD, 0xE1B4 }, { 0x5CBF, 0xBFF9 }, { 0x5CC1, 0xE1B9 },
+	{ 0x5CC4, 0xE1BB }, { 0x5CCB, 0xE1BE }, { 0x5CD2, 0xE1BC }, { 0x5CD9, 0xD6C5 }, { 0x5CE1, 0xCFBF }, { 0x5CE4, 0xE1BD }, { 0x5CE5, 0xE1BF }, { 0x5CE6, 0xC2CD },
+	{ 0x5CE8, 0xB6EB }, { 0x5CEA, 0xD3F8 }, { 0x5CED, 0xC7CD }, { 0x5CF0, 0xB7E5 }, { 0x5CFB, 0xBEFE }, { 0x5D02, 0xE1C0 }, { 0x5D03, 0xE1C1 }, { 0x5D06, 0xE1C7 },
+	{ 0x5D07, 0xB3E7 }, { 0x5D0E, 0xC6E9 }, { 0x5D14, 0xB4DE }, { 0x5D16, 0xD1C2 }, { 0x5D1B, 0xE1C8 }, { 0x5D1E, 0xE1C6 }, { 0x5D24, 0xE1C5 }, { 0x5D26, 0xE1C3 },
+	{ 0x5D27, 0xE1C2 }, { 0x5D29, 0xB1C0 }, { 0x5D2D, 0xD5B8 }, { 0x5D2E, 0xE1C4 }, { 0x5D34, 0xE1CB }, { 0x5D3D, 0xE1CC }, { 0x5D3E, 0xE1CA }, { 0x5D47, 0xEFFA },
+	{ 0x5D4A, 0xE1D3 }, { 0x5D4B, 0xE1D2 }, { 0x5D4C, 0xC7B6 }, { 0x5D58, 0xE1C9 }, { 0x5D5B, 0xE1CE }, { 0x5D5D, 0xE1D0 }, { 0x5D69, 0xE1D4 }, { 0x5D6B, 0xE1D1 },
+	{ 0x5D6C, 0xE1CD }, { 0x5D6F, 0xE1CF }, { 0x5D74, 0xE1D5 }, { 0x5D82, 0xE1D6 }, { 0x5D99, 0xE1D7 }, { 0x5D9D, 0xE1D8 }, { 0x5DB7, 0xE1DA }, { 0x5DC5, 0xE1DB },
+	{ 0x5DCD, 0xCEA1 }, { 0x5DDB, 0xE7DD }, { 0x5DDD, 0xB4A8 }, { 0x5DDE, 0xD6DD }, { 0x5DE1, 0xD1B2 }, { 0x5DE2, 0xB3B2 }, { 0x5DE5, 0xB9A4 }, { 0x5DE6, 0xD7F3 },
+	{ 0x5DE7, 0xC7C9 }, { 0x5DE8, 0xBEDE }, { 0x5DE9, 0xB9AE }, { 0x5DEB, 0xCED7 }, { 0x5DEE, 0xB2EE }, { 0x5DEF, 0xDBCF }, { 0x5DF1, 0xBCBA }, { 0x5DF2, 0xD2D1 },
+	{ 0x5DF3, 0xCBC8 }, { 0x5DF4, 0xB0CD }, { 0x5DF7, 0xCFEF }, { 0x5DFD, 0xD9E3 }, { 0x5DFE, 0xBDED }, { 0x5E01, 0xB1D2 }, { 0x5E02, 0xCAD0 }, { 0x5E03, 0xB2BC },
+	{ 0x5E05, 0xCBA7 }, { 0x5E06, 0xB7AB }, { 0x5E08, 0xCAA6 }, { 0x5E0C, 0xCFA3 }, { 0x5E0F, 0xE0F8 }, { 0x5E10, 0xD5CA }, { 0x5E11, 0xE0FB }, { 0x5E14, 0xE0FA },
+	{ 0x5E15, 0xC5C1 }, { 0x5E16, 0xCCFB }, { 0x5E18, 0xC1B1 }, { 0x5E19, 0xE0F9 }, { 0x5E1A, 0xD6E3 }, { 0x5E1B, 0xB2AF }, { 0x5E1C, 0xD6C4 }, { 0x5E1D, 0xB5DB },
+	{ 0x5E26, 0xB4F8 }, { 0x5E27, 0xD6A1 }, { 0x5E2D, 0xCFAF }, { 0x5E2E, 0xB0EF }, { 0x5E31, 0xE0FC }, { 0x5E37, 0xE1A1 }, { 0x5E38, 0xB3A3 }, { 0x5E3B, 0xE0FD },
+	{ 0x5E3C, 0xE0FE }, { 0x5E3D, 0xC3B1 }, { 0x5E42, 0xC3DD }, { 0x5E44, 0xE1A2 }, { 0x5E45, 0xB7F9 }, { 0x5E4C, 0xBBCF }, { 0x5E54, 0xE1A3 }, { 0x5E55, 0xC4BB },
+	{ 0x5E5B, 0xE1A4 }, { 0x5E5E, 0xE1A5 }, { 0x5E61, 0xE1A6 }, { 0x5E62, 0xB4B1 }, { 0x5E72, 0xB8C9 }, { 0x5E73, 0xC6BD }, { 0x5E74, 0xC4EA }, { 0x5E76, 0xB2A2 },
+	{ 0x5E78, 0xD0D2 }, { 0x5E7A, 0xE7DB }, { 0x5E7B, 0xBBC3 }, { 0x5E7C, 0xD3D7 }, { 0x5E7D, 0xD3C4 }, { 0x5E7F, 0xB9E3 }, { 0x5E80, 0xE2CF }, { 0x5E84, 0xD7AF },
+	{ 0x5E86, 0xC7EC }, { 0x5E87, 0xB1D3 }, { 0x5E8A, 0xB4B2 }, { 0x5E8B, 0xE2D1 }, { 0x5E8F, 0xD0F2 }, { 0x5E90, 0xC2AE }, { 0x5E91, 0xE2D0 }, { 0x5E93, 0xBFE2 },
+	{ 0x5E94, 0xD3A6 }, { 0x5E95, 0xB5D7 }, { 0x5E96, 0xE2D2 }, { 0x5E97, 0xB5EA }, { 0x5E99, 0xC3ED }, { 0x5E9A, 0xB8FD }, { 0x5E9C, 0xB8AE }, { 0x5E9E, 0xC5D3 },
+	{ 0x5E9F, 0xB7CF }, { 0x5EA0, 0xE2D4 }, { 0x5EA5, 0xE2D3 }, { 0x5EA6, 0xB6C8 }, { 0x5EA7, 0xD7F9 }, { 0x5EAD, 0xCDA5 }, { 0x5EB3, 0xE2D8 }, { 0x5EB5, 0xE2D6 },
+	{ 0x5EB6, 0xCAFC }, { 0x5EB7, 0xBFB5 }, { 0x5EB8, 0xD3B9 }, { 0x5EB9, 0xE2D5 }, { 0x5EBE, 0xE2D7 }, { 0x5EC9, 0xC1AE }, { 0x5ECA, 0xC0C8 }, { 0x5ED1, 0xE2DB },
+	{ 0x5ED2, 0xE2DA }, { 0x5ED3, 0xC0AA }, { 0x5ED6, 0xC1CE }, { 0x5EDB, 0xE2DC }, { 0x5EE8, 0xE2DD }, { 0x5EEA, 0xE2DE }, { 0x5EF4, 0xDBC8 }, { 0x5EF6, 0xD1D3 },
+	{ 0x5EF7, 0xCDA2 }, { 0x5EFA, 0xBDA8 }, { 0x5EFE, 0xDEC3 }, { 0x5EFF, 0xD8A5 }, { 0x5F00, 0xBFAA }, { 0x5F01, 0xDBCD }, { 0x5F02, 0xD2EC }, { 0x5F03, 0xC6FA },
+	{ 0x5F04, 0xC5AA }, { 0x5F08, 0xDEC4 }, { 0x5F0A, 0xB1D7 }, { 0x5F0B, 0xDFAE }, { 0x5F0F, 0xCABD }, { 0x5F11, 0xDFB1 }, { 0x5F13, 0xB9AD }, { 0x5F15, 0xD2FD },
+	{ 0x5F17, 0xB8A5 }, { 0x5F18, 0xBAEB }, { 0x5F1B, 0xB3DA }, { 0x5F1F, 0xB5DC }, { 0x5F20, 0xD5C5 }, { 0x5F25, 0xC3D6 }, { 0x5F26, 0xCFD2 }, { 0x5F27, 0xBBA1 },
+	{ 0x5F29, 0xE5F3 }, { 0x5F2A, 0xE5F2 }, { 0x5F2D, 0xE5F4 }, { 0x5F2F, 0xCDE4 }, { 0x5F31, 0xC8F5 }, { 0x5F39, 0xB5AF }, { 0x5F3A, 0xC7BF }, { 0x5F3C, 0xE5F6 },
+	{ 0x5F40, 0xECB0 }, { 0x5F50, 0xE5E6 }, { 0x5F52, 0xB9E9 }, { 0x5F53, 0xB5B1 }, { 0x5F55, 0xC2BC }, { 0x5F56, 0xE5E8 }, { 0x5F57, 0xE5E7 }, { 0x5F58, 0xE5E9 },
+	{ 0x5F5D, 0xD2CD }, { 0x5F61, 0xE1EA }, { 0x5F62, 0xD0CE }, { 0x5F64, 0xCDAE }, { 0x5F66, 0xD1E5 }, { 0x5F69, 0xB2CA }, { 0x5F6A, 0xB1EB }, { 0x5F6C, 0xB1F2 },
+	{ 0x5F6D, 0xC5ED }, { 0x5F70, 0xD5C3 }, { 0x5F71, 0xD3B0 }, { 0x5F73, 0xE1DC }, { 0x5F77, 0xE1DD }, { 0x5F79, 0xD2DB }, { 0x5F7B, 0xB3B9 }, { 0x5F7C, 0xB1CB },
+	{ 0x5F80, 0xCDF9 }, { 0x5F81, 0xD5F7 }, { 0x5F82, 0xE1DE }, { 0x5F84, 0xBEB6 }, { 0x5F85, 0xB4FD }, { 0x5F87, 0xE1DF }, { 0x5F88, 0xBADC }, { 0x5F89, 0xE1E0 },
+	{ 0x5F8A, 0xBBB2 }, { 0x5F8B, 0xC2C9 }, { 0x5F8C, 0xE1E1 }, { 0x5F90, 0xD0EC }, { 0x5F92, 0xCDBD }, { 0x5F95, 0xE1E2 }, { 0x5F97, 0xB5C3 }, { 0x5F98, 0xC5C7 },
+	{ 0x5F99, 0xE1E3 }, { 0x5F9C, 0xE1E4 }, { 0x5FA1, 0xD3F9 }, { 0x5FA8, 0xE1E5 }, { 0x5FAA, 0xD1AD }, { 0x5FAD, 0xE1E6 }, { 0x5FAE, 0xCEA2 }, { 0x5FB5, 0xE1E7 },
+	{ 0x5FB7, 0xB5C2 }, { 0x5FBC, 0xE1E8 }, { 0x5FBD, 0xBBD5 }, { 0x5FC3, 0xD0C4 }, { 0x5FC4, 0xE2E0 }, { 0x5FC5, 0xB1D8 }, { 0x5FC6, 0xD2E4 }, { 0x5FC9, 0xE2E1 },
+	{ 0x5FCC, 0xBCC9 }, { 0x5FCD, 0xC8CC }, { 0x5FCF, 0xE2E3 }, { 0x5FD0, 0xECFE }, { 0x5FD1, 0xECFD }, { 0x5FD2, 0xDFAF }, { 0x5FD6, 0xE2E2 }, { 0x5FD7, 0xD6BE },
+	{ 0x5FD8, 0xCDFC }, { 0x5FD9, 0xC3A6 }, { 0x5FDD, 0xE3C3 }, { 0x5FE0, 0xD6D2 }, { 0x5FE1, 0xE2E7 }, { 0x5FE4, 0xE2E8 }, { 0x5FE7, 0xD3C7 }, { 0x5FEA, 0xE2EC },
+	{ 0x5FEB, 0xBFEC }, { 0x5FED, 0xE2ED }, { 0x5FEE, 0xE2E5 }, { 0x5FF1, 0xB3C0 }, { 0x5FF5, 0xC4EE }, { 0x5FF8, 0xE2EE }, { 0x5FFB, 0xD0C3 }, { 0x5FFD, 0xBAF6 },
+	{ 0x5FFE, 0xE2E9 }, { 0x5FFF, 0xB7DE }, { 0x6000, 0xBBB3 }, { 0x6001, 0xCCAC }, { 0x6002, 0xCBCB }, { 0x6003, 0xE2E4 }, { 0x6004, 0xE2E6 }, { 0x6005, 0xE2EA },
+	{ 0x6006, 0xE2EB }, { 0x600A, 0xE2F7 }, { 0x600D, 0xE2F4 }, { 0x600E, 0xD4F5 }, { 0x600F, 0xE2F3 }, { 0x6012, 0xC5AD }, { 0x6014, 0xD5FA }, { 0x6015, 0xC5C2 },
+	{ 0x6016, 0xB2C0 }, { 0x6019, 0xE2EF }, { 0x601B, 0xE2F2 }, { 0x601C, 0xC1AF }, { 0x601D, 0xCBBC }, { 0x6020, 0xB5A1 }, { 0x6021, 0xE2F9 }, { 0x6025, 0xBCB1 },
+	{ 0x6026, 0xE2F1 }, { 0x6027, 0xD0D4 }, { 0x6028, 0xD4B9 }, { 0x6029, 0xE2F5 }, { 0x602A, 0xB9D6 }, { 0x602B, 0xE2F6 }, { 0x602F, 0xC7D3 }, { 0x6035, 0xE2F0 },
+	{ 0x603B, 0xD7DC }, { 0x603C, 0xEDA1 }, { 0x603F, 0xE2F8 }, { 0x6041, 0xEDA5 }, { 0x6042, 0xE2FE }, { 0x6043, 0xCAD1 }, { 0x604B, 0xC1B5 }, { 0x604D, 0xBBD0 },
+	{ 0x6050, 0xBFD6 }, { 0x6052, 0xBAE3 }, { 0x6055, 0xCBA1 }, { 0x6059, 0xEDA6 }, { 0x605A, 0xEDA3 }, { 0x605D, 0xEDA2 }, { 0x6062, 0xBBD6 }, { 0x6063, 0xEDA7 },
+	{ 0x6064, 0xD0F4 }, { 0x6067, 0xEDA4 }, { 0x6068, 0xBADE }, { 0x6069, 0xB6F7 }, { 0x606A, 0xE3A1 }, { 0x606B, 0xB6B2 }, { 0x606C, 0xCCF1 }, { 0x606D, 0xB9A7 },
+	{ 0x606F, 0xCFA2 }, { 0x6070, 0xC7A1 }, { 0x6073, 0xBFD2 }, { 0x6076, 0xB6F1 }, { 0x6078, 0xE2FA }, { 0x6079, 0xE2FB }, { 0x607A, 0xE2FD }, { 0x607B, 0xE2FC },
+	{ 0x607C, 0xC4D5 }, { 0x607D, 0xE3A2 }, { 0x607F, 0xD3C1 }, { 0x6083, 0xE3A7 }, { 0x6084, 0xC7C4 }, { 0x6089, 0xCFA4 }, { 0x608C, 0xE3A9 }, { 0x608D, 0xBAB7 },
+	{ 0x6092, 0xE3A8 }, { 0x6094, 0xBBDA }, { 0x6096, 0xE3A3 }, { 0x609A, 0xE3A4 }, { 0x609B, 0xE3AA }, { 0x609D, 0xE3A6 }, { 0x609F, 0xCEF2 }, { 0x60A0, 0xD3C6 },
+	{ 0x60A3, 0xBBBC }, { 0x60A6, 0xD4C3 }, { 0x60A8, 0xC4FA }, { 0x60AB, 0xEDA8 }, { 0x60AC, 0xD0FC }, { 0x60AD, 0xE3A5 }, { 0x60AF, 0xC3F5 }, { 0x60B1, 0xE3AD },
+	{ 0x60B2, 0xB1AF }, { 0x60B4, 0xE3B2 }, { 0x60B8, 0xBCC2 }, { 0x60BB, 0xE3AC }, { 0x60BC, 0xB5BF }, { 0x60C5, 0xC7E9 }, { 0x60C6, 0xE3B0 }, { 0x60CA, 0xBEAA },
+	{ 0x60CB, 0xCDEF }, { 0x60D1, 0xBBF3 }, { 0x60D5, 0xCCE8 }, { 0x60D8, 0xE3AF }, { 0x60DA, 0xE3B1 }, { 0x60DC, 0xCFA7 }, { 0x60DD, 0xE3AE }, { 0x60DF, 0xCEA9 },
+	{ 0x60E0, 0xBBDD }, { 0x60E6, 0xB5EB }, { 0x60E7, 0xBEE5 }, { 0x60E8, 0xB2D2 }, { 0x60E9, 0xB3CD }, { 0x60EB, 0xB1B9 }, { 0x60EC, 0xE3AB }, { 0x60ED, 0xB2D1 },
+	{ 0x60EE, 0xB5AC }, { 0x60EF, 0xB9DF }, { 0x60F0, 0xB6E8 }, { 0x60F3, 0xCFEB }, { 0x60F4, 0xE3B7 }, { 0x60F6, 0xBBCC }, { 0x60F9, 0xC8C7 }, { 0x60FA, 0xD0CA },
+	{ 0x6100, 0xE3B8 }, { 0x6101, 0xB3EE }, { 0x6106, 0xEDA9 }, { 0x6108, 0xD3FA }, { 0x6109, 0xD3E4 }, { 0x610D, 0xEDAA }, { 0x610E, 0xE3B9 }, { 0x610F, 0xD2E2 },
+	{ 0x6115, 0xE3B5 }, { 0x611A, 0xD3DE }, { 0x611F, 0xB8D0 }, { 0x6120, 0xE3B3 }, { 0x6123, 0xE3B6 }, { 0x6124, 0xB7DF }, { 0x6126, 0xE3B4 }, { 0x6127, 0xC0A2 },
+	{ 0x612B, 0xE3BA }, { 0x613F, 0xD4B8 }, { 0x6148, 0xB4C8 }, { 0x614A, 0xE3BB }, { 0x614C, 0xBBC5 }, { 0x614E, 0xC9F7 }, { 0x6151, 0xC9E5 }, { 0x6155, 0xC4BD },
+	{ 0x615D, 0xEDAB }, { 0x6162, 0xC2FD }, { 0x6167, 0xBBDB }, { 0x6168, 0xBFAE }, { 0x6170, 0xCEBF }, { 0x6175, 0xE3BC }, { 0x6177, 0xBFB6 }, { 0x618B, 0xB1EF },
+	{ 0x618E, 0xD4F7 }, { 0x6194, 0xE3BE }, { 0x619D, 0xEDAD }, { 0x61A7, 0xE3BF }, { 0x61A8, 0xBAA9 }, { 0x61A9, 0xEDAC }, { 0x61AC, 0xE3BD }, { 0x61B7, 0xE3C0 },
+	{ 0x61BE, 0xBAB6 }, { 0x61C2, 0xB6AE }, { 0x61C8, 0xD0B8 }, { 0x61CA, 0xB0C3 }, { 0x61CB, 0xEDAE }, { 0x61D1, 0xEDAF }, { 0x61D2, 0xC0C1 }, { 0x61D4, 0xE3C1 },
+	{ 0x61E6, 0xC5B3 }, { 0x61F5, 0xE3C2 }, { 0x61FF, 0xDCB2 }, { 0x6206, 0xEDB0 }, { 0x6208, 0xB8EA }, { 0x620A, 0xCEEC }, { 0x620B, 0xEAA7 }, { 0x620C, 0xD0E7 },
+	{ 0x620D, 0xCAF9 }, { 0x620E, 0xC8D6 }, { 0x620F, 0xCFB7 }, { 0x6210, 0xB3C9 }, { 0x6211, 0xCED2 }, { 0x6212, 0xBDE4 }, { 0x6215, 0xE3DE }, { 0x6216, 0xBBF2 },
+	{ 0x6217, 0xEAA8 }, { 0x6218, 0xD5BD }, { 0x621A, 0xC6DD }, { 0x621B, 0xEAA9 }, { 0x621F, 0xEAAA }, { 0x6221, 0xEAAC }, { 0x6222, 0xEAAB }, { 0x6224, 0xEAAE },
+	{ 0x6225, 0xEAAD }, { 0x622A, 0xBDD8 }, { 0x622C, 0xEAAF }, { 0x622E, 0xC2BE }, { 0x6233, 0xB4C1 }, { 0x6234, 0xB4F7 }, { 0x6237, 0xBBA7 }, { 0x623D, 0xECE6 },
+	{ 0x623E, 0xECE5 }, { 0x623F, 0xB7BF }, { 0x6240, 0xCBF9 }, { 0x6241, 0xB1E2 }, { 0x6243, 0xECE7 }, { 0x6247, 0xC9C8 }, { 0x6248, 0xECE8 }, { 0x6249, 0xECE9 },
+	{ 0x624B, 0xCAD6 }, { 0x624C, 0xDED0 }, { 0x624D, 0xB2C5 }, { 0x624E, 0xD4FA }, { 0x6251, 0xC6CB }, { 0x6252, 0xB0C7 }, { 0x6253, 0xB4F2 }, { 0x6254, 0xC8D3 },
+	{ 0x6258, 0xCDD0 }, { 0x625B, 0xBFB8 }, { 0x6263, 0xBFDB }, { 0x6266, 0xC7A4 }, { 0x6267, 0xD6B4 }, { 0x6269, 0xC0A9 }, { 0x626A, 0xDED1 }, { 0x626B, 0xC9A8 },
+	{ 0x626C, 0xD1EF }, { 0x626D, 0xC5A4 }, { 0x626E, 0xB0E7 }, { 0x626F, 0xB3B6 }, { 0x6270, 0xC8C5 }, { 0x6273, 0xB0E2 }, { 0x6276, 0xB7F6 }, { 0x6279, 0xC5FA },
+	{ 0x627C, 0xB6F3 }, { 0x627E, 0xD5D2 }, { 0x627F, 0xB3D0 }, { 0x6280, 0xBCBC }, { 0x6284, 0xB3AD }, { 0x6289, 0xBEF1 }, { 0x628A, 0xB0D1 }, { 0x6291, 0xD2D6 },
+	{ 0x6292, 0xCAE3 }, { 0x6293, 0xD7A5 }, { 0x6295, 0xCDB6 }, { 0x6296, 0xB6B6 }, { 0x6297, 0xBFB9 }, { 0x6298, 0xD5DB }, { 0x629A, 0xB8A7 }, { 0x629B, 0xC5D7 },
+	{ 0x629F, 0xDED2 }, { 0x62A0, 0xBFD9 }, { 0x62A1, 0xC2D5 }, { 0x62A2, 0xC7C0 }, { 0x62A4, 0xBBA4 }, { 0x62A5, 0xB1A8 }, { 0x62A8, 0xC5EA }, { 0x62AB, 0xC5FB },
+	{ 0x62AC, 0xCCA7 }, { 0x62B1, 0xB1A7 }, { 0x62B5, 0xB5D6 }, { 0x62B9, 0xC4A8 }, { 0x62BB, 0xDED3 }, { 0x62BC, 0xD1BA }, { 0x62BD, 0xB3E9 }, { 0x62BF, 0xC3F2 },
+	{ 0x62C2, 0xB7F7 }, { 0x62C4, 0xD6F4 }, { 0x62C5, 0xB5A3 }, { 0x62C6, 0xB2F0 }, { 0x62C7, 0xC4B4 }, { 0x62C8, 0xC4E9 }, { 0x62C9, 0xC0AD }, { 0x62CA, 0xDED4 },
+	{ 0x62CC, 0xB0E8 }, { 0x62CD, 0xC5C4 }, { 0x62CE, 0xC1E0 }, { 0x62D0, 0xB9D5 }, { 0x62D2, 0xBEDC }, { 0x62D3, 0xCDD8 }, { 0x62D4, 0xB0CE }, { 0x62D6, 0xCDCF },
+	{ 0x62D7, 0xDED6 }, { 0x62D8, 0xBED0 }, { 0x62D9, 0xD7BE }, { 0x62DA, 0xDED5 }, { 0x62DB, 0xD5D0 }, { 0x62DC, 0xB0DD }, { 0x62DF, 0xC4E2 }, { 0x62E2, 0xC2A3 },
+	{ 0x62E3, 0xBCF0 }, { 0x62E5, 0xD3B5 }, { 0x62E6, 0xC0B9 }, { 0x62E7, 0xC5A1 }, { 0x62E8, 0xB2A6 }, { 0x62E9, 0xD4F1 }, { 0x62EC, 0xC0A8 }, { 0x62ED, 0xCAC3 },
+	{ 0x62EE, 0xDED7 }, { 0x62EF, 0xD5FC }, { 0x62F1, 0xB9B0 }, { 0x62F3, 0xC8AD }, { 0x62F4, 0xCBA9 }, { 0x62F6, 0xDED9 }, { 0x62F7, 0xBFBD }, { 0x62FC, 0xC6B4 },
+	{ 0x62FD, 0xD7A7 }, { 0x62FE, 0xCAB0 }, { 0x62FF, 0xC4C3 }, { 0x6301, 0xB3D6 }, { 0x6302, 0xB9D2 }, { 0x6307, 0xD6B8 }, { 0x6308, 0xEAFC }, { 0x6309, 0xB0B4 },
+	{ 0x630E, 0xBFE6 }, { 0x6311, 0xCCF4 }, { 0x6316, 0xCDDA }, { 0x631A, 0xD6BF }, { 0x631B, 0xC2CE }, { 0x631D, 0xCECE }, { 0x631E, 0xCCA2 }, { 0x631F, 0xD0AE },
+	{ 0x6320, 0xC4D3 }, { 0x6321, 0xB5B2 }, { 0x6322, 0xDED8 }, { 0x6323, 0xD5F5 }, { 0x6324, 0xBCB7 }, { 0x6325, 0xBBD3 }, { 0x6328, 0xB0A4 }, { 0x632A, 0xC5B2 },
+	{ 0x632B, 0xB4EC }, { 0x632F, 0xD5F1 }, { 0x6332, 0xEAFD }, { 0x6339, 0xDEDA }, { 0x633A, 0xCDA6 }, { 0x633D, 0xCDEC }, { 0x6342, 0xCEE6 }, { 0x6343, 0xDEDC },
+	{ 0x6345, 0xCDB1 }, { 0x6346, 0xC0A6 }, { 0x6349, 0xD7BD }, { 0x634B, 0xDEDB }, { 0x634C, 0xB0C6 }, { 0x634D, 0xBAB4 }, { 0x634E, 0xC9D3 }, { 0x634F, 0xC4F3 },
+	{ 0x6350, 0xBEE8 }, { 0x6355, 0xB2B6 }, { 0x635E, 0xC0CC }, { 0x635F, 0xCBF0 }, { 0x6361, 0xBCF1 }, { 0x6362, 0xBBBB }, { 0x6363, 0xB5B7 }, { 0x6367, 0xC5F5 },
+	{ 0x6369, 0xDEE6 }, { 0x636D, 0xDEE3 }, { 0x636E, 0xBEDD }, { 0x6371, 0xDEDF }, { 0x6376, 0xB4B7 }, { 0x6377, 0xBDDD }, { 0x637A, 0xDEE0 }, { 0x637B, 0xC4ED },
+	{ 0x6380, 0xCFC6 }, { 0x6382, 0xB5E0 }, { 0x6387, 0xB6DE }, { 0x6388, 0xCADA }, { 0x6389, 0xB5F4 }, { 0x638A, 0xDEE5 }, { 0x638C, 0xD5C6 }, { 0x638E, 0xDEE1 },
+	{ 0x638F, 0xCCCD }, { 0x6390, 0xC6FE }, { 0x6392, 0xC5C5 }, { 0x6396, 0xD2B4 }, { 0x6398, 0xBEF2 }, { 0x63A0, 0xC2D3 }, { 0x63A2, 0xCCBD }, { 0x63A3, 0xB3B8 },
+	{ 0x63A5, 0xBDD3 }, { 0x63A7, 0xBFD8 }, { 0x63A8, 0xCDC6 }, { 0x63A9, 0xD1DA }, { 0x63AA, 0xB4EB }, { 0x63AC, 0xDEE4 }, { 0x63AD, 0xDEDD }, { 0x63AE, 0xDEE7 },
+	{ 0x63B0, 0xEAFE }, { 0x63B3, 0xC2B0 }, { 0x63B4, 0xDEE2 }, { 0x63B7, 0xD6C0 }, { 0x63B8, 0xB5A7 }, { 0x63BA, 0xB2F4 }, { 0x63BC, 0xDEE8 }, { 0x63BE, 0xDEF2 },
+	{ 0x63C4, 0xDEED }, { 0x63C6, 0xDEF1 }, { 0x63C9, 0xC8E0 }, { 0x63CD, 0xD7E1 }, { 0x63CE, 0xDEEF }, { 0x63CF, 0xC3E8 }, { 0x63D0, 0xCCE1 }, { 0x63D2, 0xB2E5 },
+	{ 0x63D6, 0xD2BE }, { 0x63DE, 0xDEEE }, { 0x63E0, 0xDEEB }, { 0x63E1, 0xCED5 }, { 0x63E3, 0xB4A7 }, { 0x63E9, 0xBFAB }, { 0x63EA, 0xBEBE }, { 0x63ED, 0xBDD2 },
+	{ 0x63F2, 0xDEE9 }, { 0x63F4, 0xD4AE }, { 0x63F6, 0xDEDE }, { 0x63F8, 0xDEEA }, { 0x63FD, 0xC0BF }, { 0x63FF, 0xDEEC }, { 0x6400, 0xB2F3 }, { 0x6401, 0xB8E9 },
+	{ 0x6402, 0xC2A7 }, { 0x6405, 0xBDC1 }, { 0x640B, 0xDEF5 }, { 0x640C, 0xDEF8 }, { 0x640F, 0xB2AB }, { 0x6410, 0xB4A4 }, { 0x6413, 0xB4EA }, { 0x6414, 0xC9A6 },
+	{ 0x641B, 0xDEF6 }, { 0x641C, 0xCBD1 }, { 0x641E, 0xB8E3 }, { 0x6420, 0xDEF7 }, { 0x6421, 0xDEFA }, { 0x6426, 0xDEF9 }, { 0x642A, 0xCCC2 }, { 0x642C, 0xB0E1 },
+	{ 0x642D, 0xB4EE }, { 0x6434, 0xE5BA }, { 0x643A, 0xD0AF }, { 0x643D, 0xB2EB }, { 0x643F, 0xEBA1 }, { 0x6441, 0xDEF4 }, { 0x6444, 0xC9E3 }, { 0x6445, 0xDEF3 },
+	{ 0x6446, 0xB0DA }, { 0x6447, 0xD2A1 }, { 0x6448, 0xB1F7 }, { 0x644A, 0xCCAF }, { 0x6452, 0xDEF0 }, { 0x6454, 0xCBA4 }, { 0x6458, 0xD5AA }, { 0x645E, 0xDEFB },
+	{ 0x6467, 0xB4DD }, { 0x6469, 0xC4A6 }, { 0x646D, 0xDEFD }, { 0x6478, 0xC3FE }, { 0x6479, 0xC4A1 }, { 0x647A, 0xDFA1 }, { 0x6482, 0xC1CC }, { 0x6484, 0xDEFC },
+	{ 0x6485, 0xBEEF }, { 0x6487, 0xC6B2 }, { 0x6491, 0xB3C5 }, { 0x6492, 0xC8F6 }, { 0x6495, 0xCBBA }, { 0x6496, 0xDEFE }, { 0x6499, 0xDFA4 }, { 0x649E, 0xD7B2 },
+	{ 0x64A4, 0xB3B7 }, { 0x64A9, 0xC1C3 }, { 0x64AC, 0xC7CB }, { 0x64AD, 0xB2A5 }, { 0x64AE, 0xB4E9 }, { 0x64B0, 0xD7AB }, { 0x64B5, 0xC4EC }, { 0x64B7, 0xDFA2 },
+	{ 0x64B8, 0xDFA3 }, { 0x64BA, 0xDFA5 }, { 0x64BC, 0xBAB3 }, { 0x64C0, 0xDFA6 }, { 0x64C2, 0xC0DE }, { 0x64C5, 0xC9C3 }, { 0x64CD, 0xB2D9 }, { 0x64CE, 0xC7E6 },
+	{ 0x64D0, 0xDFA7 }, { 0x64D2, 0xC7DC }, { 0x64D7, 0xDFA8 }, { 0x64D8, 0xEBA2 }, { 0x64DE, 0xCBD3 }, { 0x64E2, 0xDFAA }, { 0x64E4, 0xDFA9 }, { 0x64E6, 0xB2C1 },
+	{ 0x6500, 0xC5CA }, { 0x6509, 0xDFAB }, { 0x6512, 0xD4DC }, { 0x6518, 0xC8C1 }, { 0x6525, 0xDFAC }, { 0x652B, 0xBEF0 }, { 0x652E, 0xDFAD }, { 0x652F, 0xD6A7 },
+	{ 0x6534, 0xEAB7 }, { 0x6535, 0xEBB6 }, { 0x6536, 0xCAD5 }, { 0x6538, 0xD8FC }, { 0x6539, 0xB8C4 }, { 0x653B, 0xB9A5 }, { 0x653E, 0xB7C5 }, { 0x653F, 0xD5FE },
+	{ 0x6545, 0xB9CA }, { 0x6548, 0xD0A7 }, { 0x6549, 0xF4CD }, { 0x654C, 0xB5D0 }, { 0x654F, 0xC3F4 }, { 0x6551, 0xBEC8 }, { 0x6555, 0xEBB7 }, { 0x6556, 0xB0BD },
+	{ 0x6559, 0xBDCC }, { 0x655B, 0xC1B2 }, { 0x655D, 0xB1D6 }, { 0x655E, 0xB3A8 }, { 0x6562, 0xB8D2 }, { 0x6563, 0xC9A2 }, { 0x6566, 0xB6D8 }, { 0x656B, 0xEBB8 },
+	{ 0x656C, 0xBEB4 }, { 0x6570, 0xCAFD }, { 0x6572, 0xC7C3 }, { 0x6574, 0xD5FB }, { 0x6577, 0xB7F3 }, { 0x6587, 0xCEC4 }, { 0x658B, 0xD5AB }, { 0x658C, 0xB1F3 },
+	{ 0x6590, 0xECB3 }, { 0x6591, 0xB0DF }, { 0x6593, 0xECB5 }, { 0x6597, 0xB6B7 }, { 0x6599, 0xC1CF }, { 0x659B, 0xF5FA }, { 0x659C, 0xD0B1 }, { 0x659F, 0xD5E5 },
+	{ 0x65A1, 0xCED3 }, { 0x65A4, 0xBDEF }, { 0x65A5, 0xB3E2 }, { 0x65A7, 0xB8AB }, { 0x65A9, 0xD5B6 }, { 0x65AB, 0xEDBD }, { 0x65AD, 0xB6CF }, { 0x65AF, 0xCBB9 },
+	{ 0x65B0, 0xD0C2 }, { 0x65B9, 0xB7BD }, { 0x65BC, 0xECB6 }, { 0x65BD, 0xCAA9 }, { 0x65C1, 0xC5D4 }, { 0x65C3, 0xECB9 }, { 0x65C4, 0xECB8 }, { 0x65C5, 0xC2C3 },
+	{ 0x65C6, 0xECB7 }, { 0x65CB, 0xD0FD }, { 0x65CC, 0xECBA }, { 0x65CE, 0xECBB }, { 0x65CF, 0xD7E5 }, { 0x65D2, 0xECBC }, { 0x65D6, 0xECBD }, { 0x65D7, 0xC6EC },
+	{ 0x65E0, 0xCEDE }, { 0x65E2, 0xBCC8 }, { 0x65E5, 0xC8D5 }, { 0x65E6, 0xB5A9 }, { 0x65E7, 0xBEC9 }, { 0x65E8, 0xD6BC }, { 0x65E9, 0xD4E7 }, { 0x65EC, 0xD1AE },
+	{ 0x65ED, 0xD0F1 }, { 0x65EE, 0xEAB8 }, { 0x65EF, 0xEAB9 }, { 0x65F0, 0xEABA }, { 0x65F1, 0xBAB5 }, { 0x65F6, 0xCAB1 }, { 0x65F7, 0xBFF5 }, { 0x65FA, 0xCDFA },
+	{ 0x6600, 0xEAC0 }, { 0x6602, 0xB0BA }, { 0x6603, 0xEABE }, { 0x6606, 0xC0A5 }, { 0x660A, 0xEABB }, { 0x660C, 0xB2FD }, { 0x660E, 0xC3F7 }, { 0x660F, 0xBBE8 },
+	{ 0x6613, 0xD2D7 }, { 0x6614, 0xCEF4 }, { 0x6615, 0xEABF }, { 0x6619, 0xEABC }, { 0x661D, 0xEAC3 }, { 0x661F, 0xD0C7 }, { 0x6620, 0xD3B3 }, { 0x6625, 0xB4BA },
+	{ 0x6627, 0xC3C1 }, { 0x6628, 0xD7F2 }, { 0x662D, 0xD5D1 }, { 0x662F, 0xCAC7 }, { 0x6631, 0xEAC5 }, { 0x6634, 0xEAC4 }, { 0x6635, 0xEAC7 }, { 0x6636, 0xEAC6 },
+	{ 0x663C, 0xD6E7 }, { 0x663E, 0xCFD4 }, { 0x6641, 0xEACB }, { 0x6643, 0xBBCE }, { 0x664B, 0xBDFA }, { 0x664C, 0xC9CE }, { 0x664F, 0xEACC }, { 0x6652, 0xC9B9 },
+	{ 0x6653, 0xCFFE }, { 0x6654, 0xEACA }, { 0x6655, 0xD4CE }, { 0x6656, 0xEACD }, { 0x6657, 0xEACF }, { 0x665A, 0xCDED }, { 0x665F, 0xEAC9 }, { 0x6661, 0xEACE },
+	{ 0x6664, 0xCEEE }, { 0x6666, 0xBBDE }, { 0x6668, 0xB3BF }, { 0x666E, 0xC6D5 }, { 0x666F, 0xBEB0 }, { 0x6670, 0xCEFA }, { 0x6674, 0xC7E7 }, { 0x6676, 0xBEA7 },
+	{ 0x6677, 0xEAD0 }, { 0x667A, 0xD6C7 }, { 0x667E, 0xC1C0 }, { 0x6682, 0xD4DD }, { 0x6684, 0xEAD1 }, { 0x6687, 0xCFBE }, { 0x668C, 0xEAD2 }, { 0x6691, 0xCAEE },
+	{ 0x6696, 0xC5AF }, { 0x6697, 0xB0B5 }, { 0x669D, 0xEAD4 }, { 0x66A7, 0xEAD3 }, { 0x66A8, 0xF4DF }, { 0x66AE, 0xC4BA }, { 0x66B4, 0xB1A9 }, { 0x66B9, 0xE5DF },
+	{ 0x66BE, 0xEAD5 }, { 0x66D9, 0xCAEF }, { 0x66DB, 0xEAD6 }, { 0x66DC, 0xEAD7 }, { 0x66DD, 0xC6D8 }, { 0x66E6, 0xEAD8 }, { 0x66E9, 0xEAD9 }, { 0x66F0, 0xD4BB },
+	{ 0x66F2, 0xC7FA }, { 0x66F3, 0xD2B7 }, { 0x66F4, 0xB8FC }, { 0x66F7, 0xEAC2 }, { 0x66F9, 0xB2DC }, { 0x66FC, 0xC2FC }, { 0x66FE, 0xD4F8 }, { 0x66FF, 0xCCE6 },
+	{ 0x6700, 0xD7EE }, { 0x6708, 0xD4C2 }, { 0x6709, 0xD3D0 }, { 0x670A, 0xEBC3 }, { 0x670B, 0xC5F3 }, { 0x670D, 0xB7FE }, { 0x6710, 0xEBD4 }, { 0x6714, 0xCBB7 },
+	{ 0x6715, 0xEBDE }, { 0x6717, 0xC0CA }, { 0x671B, 0xCDFB }, { 0x671D, 0xB3AF }, { 0x671F, 0xC6DA }, { 0x6726, 0xEBFC }, { 0x6728, 0xC4BE }, { 0x672A, 0xCEB4 },
+	{ 0x672B, 0xC4A9 }, { 0x672C, 0xB1BE }, { 0x672D, 0xD4FD }, { 0x672F, 0xCAF5 }, { 0x6731, 0xD6EC }, { 0x6734, 0xC6D3 }, { 0x6735, 0xB6E4 }, { 0x673A, 0xBBFA },
+	{ 0x673D, 0xD0E0 }, { 0x6740, 0xC9B1 }, { 0x6742, 0xD4D3 }, { 0x6743, 0xC8A8 }, { 0x6746, 0xB8CB }, { 0x6748, 0xE8BE }, { 0x6749, 0xC9BC }, { 0x674C, 0xE8BB },
+	{ 0x674E, 0xC0EE }, { 0x674F, 0xD0D3 }, { 0x6750, 0xB2C4 }, { 0x6751, 0xB4E5 }, { 0x6753, 0xE8BC }, { 0x6756, 0xD5C8 }, { 0x675C, 0xB6C5 }, { 0x675E, 0xE8BD },
+	{ 0x675F, 0xCAF8 }, { 0x6760, 0xB8DC }, { 0x6761, 0xCCF5 }, { 0x6765, 0xC0B4 }, { 0x6768, 0xD1EE }, { 0x6769, 0xE8BF }, { 0x676A, 0xE8C2 }, { 0x676D, 0xBABC },
+	{ 0x676F, 0xB1AD }, { 0x6770, 0xBDDC }, { 0x6772, 0xEABD }, { 0x6773, 0xE8C3 }, { 0x6775, 0xE8C6 }, { 0x6777, 0xE8CB }, { 0x677C, 0xE8CC }, { 0x677E, 0xCBC9 },
+	{ 0x677F, 0xB0E5 }, { 0x6781, 0xBCAB }, { 0x6784, 0xB9B9 }, { 0x6787, 0xE8C1 }, { 0x6789, 0xCDF7 }, { 0x678B, 0xE8CA }, { 0x6790, 0xCEF6 }, { 0x6795, 0xD5ED },
+	{ 0x6797, 0xC1D6 }, { 0x6798, 0xE8C4 }, { 0x679A, 0xC3B6 }, { 0x679C, 0xB9FB }, { 0x679D, 0xD6A6 }, { 0x679E, 0xE8C8 }, { 0x67A2, 0xCAE0 }, { 0x67A3, 0xD4E6 },
+	{ 0x67A5, 0xE8C0 }, { 0x67A7, 0xE8C5 }, { 0x67A8, 0xE8C7 }, { 0x67AA, 0xC7B9 }, { 0x67AB, 0xB7E3 }, { 0x67AD, 0xE8C9 }, { 0x67AF, 0xBFDD }, { 0x67B0, 0xE8D2 },
+	{ 0x67B3, 0xE8D7 }, { 0x67B5, 0xE8D5 }, { 0x67B6, 0xBCDC }, { 0x67B7, 0xBCCF }, { 0x67B8, 0xE8DB }, { 0x67C1, 0xE8DE }, { 0x67C3, 0xE8DA }, { 0x67C4, 0xB1FA },
+	{ 0x67CF, 0xB0D8 }, { 0x67D0, 0xC4B3 }, { 0x67D1, 0xB8CC }, { 0x67D2, 0xC6E2 }, { 0x67D3, 0xC8BE }, { 0x67D4, 0xC8E1 }, { 0x67D8, 0xE8CF }, { 0x67D9, 0xE8D4 },
+	{ 0x67DA, 0xE8D6 }, { 0x67DC, 0xB9F1 }, { 0x67DD, 0xE8D8 }, { 0x67DE, 0xD7F5 }, { 0x67E0, 0xC4FB }, { 0x67E2, 0xE8DC }, { 0x67E5, 0xB2E9 }, { 0x67E9, 0xE8D1 },
+	{ 0x67EC, 0xBCED }, { 0x67EF, 0xBFC2 }, { 0x67F0, 0xE8CD }, { 0x67F1, 0xD6F9 }, { 0x67F3, 0xC1F8 }, { 0x67F4, 0xB2F1 }, { 0x67FD, 0xE8DF }, { 0x67FF, 0xCAC1 },
+	{ 0x6800, 0xE8D9 }, { 0x6805, 0xD5A4 }, { 0x6807, 0xB1EA }, { 0x6808, 0xD5BB }, { 0x6809, 0xE8CE }, { 0x680A, 0xE8D0 }, { 0x680B, 0xB6B0 }, { 0x680C, 0xE8D3 },
+	{ 0x680E, 0xE8DD }, { 0x680F, 0xC0B8 }, { 0x6811, 0xCAF7 }, { 0x6813, 0xCBA8 }, { 0x6816, 0xC6DC }, { 0x6817, 0xC0F5 }, { 0x681D, 0xE8E9 }, { 0x6821, 0xD0A3 },
+	{ 0x6829, 0xE8F2 }, { 0x682A, 0xD6EA }, { 0x6832, 0xE8E0 }, { 0x6833, 0xE8E1 }, { 0x6837, 0xD1F9 }, { 0x6838, 0xBACB }, { 0x6839, 0xB8F9 }, { 0x683C, 0xB8F1 },
+	{ 0x683D, 0xD4D4 }, { 0x683E, 0xE8EF }, { 0x6840, 0xE8EE }, { 0x6841, 0xE8EC }, { 0x6842, 0xB9F0 }, { 0x6843, 0xCCD2 }, { 0x6844, 0xE8E6 }, { 0x6845, 0xCEA6 },
+	{ 0x6846, 0xBFF2 }, { 0x6848, 0xB0B8 }, { 0x6849, 0xE8F1 }, { 0x684A, 0xE8F0 }, { 0x684C, 0xD7C0 }, { 0x684E, 0xE8E4 }, { 0x6850, 0xCDA9 }, { 0x6851, 0xC9A3 },
+	{ 0x6853, 0xBBB8 }, { 0x6854, 0xBDDB }, { 0x6855, 0xE8EA }, { 0x6860, 0xE8E2 }, { 0x6861, 0xE8E3 }, { 0x6862, 0xE8E5 }, { 0x6863, 0xB5B5 }, { 0x6864, 0xE8E7 },
+	{ 0x6865, 0xC7C5 }, { 0x6866, 0xE8EB }, { 0x6867, 0xE8ED }, { 0x6868, 0xBDB0 }, { 0x6869, 0xD7AE }, { 0x686B, 0xE8F8 }, { 0x6874, 0xE8F5 }, { 0x6876, 0xCDB0 },
+	{ 0x6877, 0xE8F6 }, { 0x6881, 0xC1BA }, { 0x6883, 0xE8E8 }, { 0x6885, 0xC3B7 }, { 0x6886, 0xB0F0 }, { 0x688F, 0xE8F4 }, { 0x6893, 0xE8F7 }, { 0x6897, 0xB9A3 },
+	{ 0x68A2, 0xC9D2 }, { 0x68A6, 0xC3CE }, { 0x68A7, 0xCEE0 }, { 0x68A8, 0xC0E6 }, { 0x68AD, 0xCBF3 }, { 0x68AF, 0xCCDD }, { 0x68B0, 0xD0B5 }, { 0x68B3, 0xCAE1 },
+	{ 0x68B5, 0xE8F3 }, { 0x68C0, 0xBCEC }, { 0x68C2, 0xE8F9 }, { 0x68C9, 0xC3DE }, { 0x68CB, 0xC6E5 }, { 0x68CD, 0xB9F7 }, { 0x68D2, 0xB0F4 }, { 0x68D5, 0xD7D8 },
+	{ 0x68D8, 0xBCAC }, { 0x68DA, 0xC5EF }, { 0x68E0, 0xCCC4 }, { 0x68E3, 0xE9A6 }, { 0x68EE, 0xC9AD }, { 0x68F0, 0xE9A2 }, { 0x68F1, 0xC0E2 }, { 0x68F5, 0xBFC3 },
+	{ 0x68F9, 0xE8FE }, { 0x68FA, 0xB9D7 }, { 0x68FC, 0xE8FB }, { 0x6901, 0xE9A4 }, { 0x6905, 0xD2CE }, { 0x690B, 0xE9A3 }, { 0x690D, 0xD6B2 }, { 0x690E, 0xD7B5 },
+	{ 0x6910, 0xE9A7 }, { 0x6912, 0xBDB7 }, { 0x691F, 0xE8FC }, { 0x6920, 0xE8FD }, { 0x6924, 0xE9A1 }, { 0x692D, 0xCDD6 }, { 0x6930, 0xD2AC }, { 0x6934, 0xE9B2 },
+	{ 0x6939, 0xE9A9 }, { 0x693D, 0xB4AA }, { 0x693F, 0xB4BB }, { 0x6942, 0xE9AB }, { 0x6954, 0xD0A8 }, { 0x6957, 0xE9A5 }, { 0x695A, 0xB3FE }, { 0x695D, 0xE9AC },
+	{ 0x695E, 0xC0E3 }, { 0x6960, 0xE9AA }, { 0x6963, 0xE9B9 }, { 0x6966, 0xE9B8 }, { 0x696B, 0xE9AE }, { 0x696E, 0xE8FA }, { 0x6971, 0xE9A8 }, { 0x6977, 0xBFAC },
+	{ 0x6978, 0xE9B1 }, { 0x6979, 0xE9BA }, { 0x697C, 0xC2A5 }, { 0x6980, 0xE9AF }, { 0x6982, 0xB8C5 }, { 0x6984, 0xE9AD }, { 0x6986, 0xD3DC }, { 0x6987, 0xE9B4 },
+	{ 0x6988, 0xE9B5 }, { 0x6989, 0xE9B7 }, { 0x698D, 0xE9C7 }, { 0x6994, 0xC0C6 }, { 0x6995, 0xE9C5 }, { 0x6998, 0xE9B0 }, { 0x699B, 0xE9BB }, { 0x699C, 0xB0F1 },
+	{ 0x69A7, 0xE9BC }, { 0x69A8, 0xD5A5 }, { 0x69AB, 0xE9BE }, { 0x69AD, 0xE9BF }, { 0x69B1, 0xE9C1 }, { 0x69B4, 0xC1F1 }, { 0x69B7, 0xC8B6 }, { 0x69BB, 0xE9BD },
+	{ 0x69C1, 0xE9C2 }, { 0x69CA, 0xE9C3 }, { 0x69CC, 0xE9B3 }, { 0x69CE, 0xE9B6 }, { 0x69D0, 0xBBB1 }, { 0x69D4, 0xE9C0 }, { 0x69DB, 0xBCF7 }, { 0x69DF, 0xE9C4 },
+	{ 0x69E0, 0xE9C6 }, { 0x69ED, 0xE9CA }, { 0x69F2, 0xE9CE }, { 0x69FD, 0xB2DB }, { 0x69FF, 0xE9C8 }, { 0x6A0A, 0xB7AE }, { 0x6A17, 0xE9CB }, { 0x6A18, 0xE9CC },
+	{ 0x6A1F, 0xD5C1 }, { 0x6A21, 0xC4A3 }, { 0x6A28, 0xE9D8 }, { 0x6A2A, 0xBAE1 }, { 0x6A2F, 0xE9C9 }, { 0x6A31, 0xD3A3 }, { 0x6A35, 0xE9D4 }, { 0x6A3D, 0xE9D7 },
+	{ 0x6A3E, 0xE9D0 }, { 0x6A44, 0xE9CF }, { 0x6A47, 0xC7C1 }, { 0x6A50, 0xE9D2 }, { 0x6A58, 0xE9D9 }, { 0x6A59, 0xB3C8 }, { 0x6A5B, 0xE9D3 }, { 0x6A61, 0xCFF0 },
+	{ 0x6A65, 0xE9CD }, { 0x6A71, 0xB3F7 }, { 0x6A79, 0xE9D6 }, { 0x6A7C, 0xE9DA }, { 0x6A80, 0xCCB4 }, { 0x6A84, 0xCFAD }, { 0x6A8E, 0xE9D5 }, { 0x6A90, 0xE9DC },
+	{ 0x6A91, 0xE9DB }, { 0x6A97, 0xE9DE }, { 0x6AA0, 0xE9D1 }, { 0x6AA9, 0xE9DD }, { 0x6AAB, 0xE9DF }, { 0x6AAC, 0xC3CA }, { 0x6B20, 0xC7B7 }, { 0x6B21, 0xB4CE },
+	{ 0x6B22, 0xBBB6 }, { 0x6B23, 0xD0C0 }, { 0x6B24, 0xECA3 }, { 0x6B27, 0xC5B7 }, { 0x6B32, 0xD3FB }, { 0x6B37, 0xECA4 }, { 0x6B39, 0xECA5 }, { 0x6B3A, 0xC6DB },
+	{ 0x6B3E, 0xBFEE }, { 0x6B43, 0xECA6 }, { 0x6B46, 0xECA7 }, { 0x6B47, 0xD0AA }, { 0x6B49, 0xC7B8 }, { 0x6B4C, 0xB8E8 }, { 0x6B59, 0xECA8 }, { 0x6B62, 0xD6B9 },
+	{ 0x6B63, 0xD5FD }, { 0x6B64, 0xB4CB }, { 0x6B65, 0xB2BD }, { 0x6B66, 0xCEE4 }, { 0x6B67, 0xC6E7 }, { 0x6B6A, 0xCDE1 }, { 0x6B79, 0xB4F5 }, { 0x6B7B, 0xCBC0 },
+	{ 0x6B7C, 0xBCDF }, { 0x6B81, 0xE9E2 }, { 0x6B82, 0xE9E3 }, { 0x6B83, 0xD1EA }, { 0x6B84, 0xE9E5 }, { 0x6B86, 0xB4F9 }, { 0x6B87, 0xE9E4 }, { 0x6B89, 0xD1B3 },
+	{ 0x6B8A, 0xCAE2 }, { 0x6B8B, 0xB2D0 }, { 0x6B8D, 0xE9E8 }, { 0x6B92, 0xE9E6 }, { 0x6B93, 0xE9E7 }, { 0x6B96, 0xD6B3 }, { 0x6B9A, 0xE9E9 }, { 0x6B9B, 0xE9EA },
+	{ 0x6BA1, 0xE9EB }, { 0x6BAA, 0xE9EC }, { 0x6BB3, 0xECAF }, { 0x6BB4, 0xC5B9 }, { 0x6BB5, 0xB6CE }, { 0x6BB7, 0xD2F3 }, { 0x6BBF, 0xB5EE }, { 0x6BC1, 0xBBD9 },
+	{ 0x6BC2, 0xECB1 }, { 0x6BC5, 0xD2E3 }, { 0x6BCB, 0xCEE3 }, { 0x6BCD, 0xC4B8 }, { 0x6BCF, 0xC3BF }, { 0x6BD2, 0xB6BE }, { 0x6BD3, 0xD8B9 }, { 0x6BD4, 0xB1C8 },
+	{ 0x6BD5, 0xB1CF }, { 0x6BD6, 0xB1D1 }, { 0x6BD7, 0xC5FE }, { 0x6BD9, 0xB1D0 }, { 0x6BDB, 0xC3AB }, { 0x6BE1, 0xD5B1 }, { 0x6BEA, 0xEBA4 }, { 0x6BEB, 0xBAC1 },
+	{ 0x6BEF, 0xCCBA }, { 0x6BF3, 0xEBA5 }, { 0x6BF5, 0xEBA7 }, { 0x6BF9, 0xEBA8 }, { 0x6BFD, 0xEBA6 }, { 0x6C05, 0xEBA9 }, { 0x6C06, 0xEBAB }, { 0x6C07, 0xEBAA },
+	{ 0x6C0D, 0xEBAC }, { 0x6C0F, 0xCACF }, { 0x6C10, 0xD8B5 }, { 0x6C11, 0xC3F1 }, { 0x6C13, 0xC3A5 }, { 0x6C14, 0xC6F8 }, { 0x6C15, 0xEBAD }, { 0x6C16, 0xC4CA },
+	{ 0x6C18, 0xEBAE }, { 0x6C19, 0xEBAF }, { 0x6C1A, 0xEBB0 }, { 0x6C1B, 0xB7D5 }, { 0x6C1F, 0xB7FA }, { 0x6C21, 0xEBB1 }, { 0x6C22, 0xC7E2 }, { 0x6C24, 0xEBB3 },
+	{ 0x6C26, 0xBAA4 }, { 0x6C27, 0xD1F5 }, { 0x6C28, 0xB0B1 }, { 0x6C29, 0xEBB2 }, { 0x6C2A, 0xEBB4 }, { 0x6C2E, 0xB5AA }, { 0x6C2F, 0xC2C8 }, { 0x6C30, 0xC7E8 },
+	{ 0x6C32, 0xEBB5 }, { 0x6C34, 0xCBAE }, { 0x6C35, 0xE3DF }, { 0x6C38, 0xD3C0 }, { 0x6C3D, 0xD9DB }, { 0x6C40, 0xCDA1 }, { 0x6C41, 0xD6AD }, { 0x6C42, 0xC7F3 },
+	{ 0x6C46, 0xD9E0 }, { 0x6C47, 0xBBE3 }, { 0x6C49, 0xBABA }, { 0x6C4A, 0xE3E2 }, { 0x6C50, 0xCFAB }, { 0x6C54, 0xE3E0 }, { 0x6C55, 0xC9C7 }, { 0x6C57, 0xBAB9 },
+	{ 0x6C5B, 0xD1B4 }, { 0x6C5C, 0xE3E1 }, { 0x6C5D, 0xC8EA }, { 0x6C5E, 0xB9AF }, { 0x6C5F, 0xBDAD }, { 0x6C60, 0xB3D8 }, { 0x6C61, 0xCEDB }, { 0x6C64, 0xCCC0 },
+	{ 0x6C68, 0xE3E8 }, { 0x6C69, 0xE3E9 }, { 0x6C6A, 0xCDF4 }, { 0x6C70, 0xCCAD }, { 0x6C72, 0xBCB3 }, { 0x6C74, 0xE3EA }, { 0x6C76, 0xE3EB }, { 0x6C79, 0xD0DA },
+	{ 0x6C7D, 0xC6FB }, { 0x6C7E, 0xB7DA }, { 0x6C81, 0xC7DF }, { 0x6C82, 0xD2CA }, { 0x6C83, 0xCED6 }, { 0x6C85, 0xE3E4 }, { 0x6C86, 0xE3EC }, { 0x6C88, 0xC9F2 },
+	{ 0x6C89, 0xB3C1 }, { 0x6C8C, 0xE3E7 }, { 0x6C8F, 0xC6E3 }, { 0x6C90, 0xE3E5 }, { 0x6C93, 0xEDB3 }, { 0x6C94, 0xE3E6 }, { 0x6C99, 0xC9B3 }, { 0x6C9B, 0xC5E6 },
+	{ 0x6C9F, 0xB9B5 }, { 0x6CA1, 0xC3BB }, { 0x6CA3, 0xE3E3 }, { 0x6CA4, 0xC5BD }, { 0x6CA5, 0xC1A4 }, { 0x6CA6, 0xC2D9 }, { 0x6CA7, 0xB2D7 }, { 0x6CA9, 0xE3ED },
+	{ 0x6CAA, 0xBBA6 }, { 0x6CAB, 0xC4AD }, { 0x6CAD, 0xE3F0 }, { 0x6CAE, 0xBEDA }, { 0x6CB1, 0xE3FB }, { 0x6CB2, 0xE3F5 }, { 0x6CB3, 0xBAD3 }, { 0x6CB8, 0xB7D0 },
+	{ 0x6CB9, 0xD3CD }, { 0x6CBB, 0xD6CE }, { 0x6CBC, 0xD5D3 }, { 0x6CBD, 0xB9C1 }, { 0x6CBE, 0xD5B4 }, { 0x6CBF, 0xD1D8 }, { 0x6CC4, 0xD0B9 }, { 0x6CC5, 0xC7F6 },
+	{ 0x6CC9, 0xC8AA }, { 0x6CCA, 0xB2B4 }, { 0x6CCC, 0xC3DA }, { 0x6CD0, 0xE3EE }, { 0x6CD3, 0xE3FC }, { 0x6CD4, 0xE3EF }, { 0x6CD5, 0xB7A8 }, { 0x6CD6, 0xE3F7 },
+	{ 0x6CD7, 0xE3F4 }, { 0x6CDB, 0xB7BA }, { 0x6CDE, 0xC5A2 }, { 0x6CE0, 0xE3F6 }, { 0x6CE1, 0xC5DD }, { 0x6CE2, 0xB2A8 }, { 0x6CE3, 0xC6FC }, { 0x6CE5, 0xC4E0 },
+	{ 0x6CE8, 0xD7A2 }, { 0x6CEA, 0xC0E1 }, { 0x6CEB, 0xE3F9 }, { 0x6CEE, 0xE3FA }, { 0x6CEF, 0xE3FD }, { 0x6CF0, 0xCCA9 }, { 0x6CF1, 0xE3F3 }, { 0x6CF3, 0xD3BE },
+	{ 0x6CF5, 0xB1C3 }, { 0x6CF6, 0xEDB4 }, { 0x6CF7, 0xE3F1 }, { 0x6CF8, 0xE3F2 }, { 0x6CFA, 0xE3F8 }, { 0x6CFB, 0xD0BA }, { 0x6CFC, 0xC6C3 }, { 0x6CFD, 0xD4F3 },
+	{ 0x6CFE, 0xE3FE }, { 0x6D01, 0xBDE0 }, { 0x6D04, 0xE4A7 }, { 0x6D07, 0xE4A6 }, { 0x6D0B, 0xD1F3 }, { 0x6D0C, 0xE4A3 }, { 0x6D0E, 0xE4A9 }, { 0x6D12, 0xC8F7 },
+	{ 0x6D17, 0xCFB4 }, { 0x6D19, 0xE4A8 }, { 0x6D1A, 0xE4AE }, { 0x6D1B, 0xC2E5 }, { 0x6D1E, 0xB6B4 }, { 0x6D25, 0xBDF2 }, { 0x6D27, 0xE4A2 }, { 0x6D2A, 0xBAE9 },
+	{ 0x6D2B, 0xE4AA }, { 0x6D2E, 0xE4AC }, { 0x6D31, 0xB6FD }, { 0x6D32, 0xD6DE }, { 0x6D33, 0xE4B2 }, { 0x6D35, 0xE4AD }, { 0x6D39, 0xE4A1 }, { 0x6D3B, 0xBBEE },
+	{ 0x6D3C, 0xCDDD }, { 0x6D3D, 0xC7A2 }, { 0x6D3E, 0xC5C9 }, { 0x6D41, 0xC1F7 }, { 0x6D43, 0xE4A4 }, { 0x6D45, 0xC7B3 }, { 0x6D46, 0xBDAC }, { 0x6D47, 0xBDBD },
+	{ 0x6D48, 0xE4A5 }, { 0x6D4A, 0xD7C7 }, { 0x6D4B, 0xB2E2 }, { 0x6D4D, 0xE4AB }, { 0x6D4E, 0xBCC3 }, { 0x6D4F, 0xE4AF }, { 0x6D51, 0xBBEB }, { 0x6D52, 0xE4B0 },
+	{ 0x6D53, 0xC5A8 }, { 0x6D54, 0xE4B1 }, { 0x6D59, 0xD5E3 }, { 0x6D5A, 0xBFA3 }, { 0x6D5C, 0xE4BA }, { 0x6D5E, 0xE4B7 }, { 0x6D60, 0xE4BB }, { 0x6D63, 0xE4BD },
+	{ 0x6D66, 0xC6D6 }, { 0x6D69, 0xBAC6 }, { 0x6D6A, 0xC0CB }, { 0x6D6E, 0xB8A1 }, { 0x6D6F, 0xE4B4 }, { 0x6D74, 0xD4A1 }, { 0x6D77, 0xBAA3 }, { 0x6D78, 0xBDFE },
+	{ 0x6D7C, 0xE4BC }, { 0x6D82, 0xCDBF }, { 0x6D85, 0xC4F9 }, { 0x6D88, 0xCFFB }, { 0x6D89, 0xC9E6 }, { 0x6D8C, 0xD3BF }, { 0x6D8E, 0xCFD1 }, { 0x6D91, 0xE4B3 },
+	{ 0x6D93, 0xE4B8 }, { 0x6D94, 0xE4B9 }, { 0x6D95, 0xCCE9 }, { 0x6D9B, 0xCCCE }, { 0x6D9D, 0xC0D4 }, { 0x6D9E, 0xE4B5 }, { 0x6D9F, 0xC1B0 }, { 0x6DA0, 0xE4B6 },
+	{ 0x6DA1, 0xCED0 }, { 0x6DA3, 0xBBC1 }, { 0x6DA4, 0xB5D3 }, { 0x6DA6, 0xC8F3 }, { 0x6DA7, 0xBDA7 }, { 0x6DA8, 0xD5C7 }, { 0x6DA9, 0xC9AC }, { 0x6DAA, 0xB8A2 },
+	{ 0x6DAB, 0xE4CA }, { 0x6DAE, 0xE4CC }, { 0x6DAF, 0xD1C4 }, { 0x6DB2, 0xD2BA }, { 0x6DB5, 0xBAAD }, { 0x6DB8, 0xBAD4 }, { 0x6DBF, 0xE4C3 }, { 0x6DC0, 0xB5ED },
+	{ 0x6DC4, 0xD7CD }, { 0x6DC5, 0xE4C0 }, { 0x6DC6, 0xCFFD }, { 0x6DC7, 0xE4BF }, { 0x6DCB, 0xC1DC }, { 0x6DCC, 0xCCCA }, { 0x6DD1, 0xCAE7 }, { 0x6DD6, 0xC4D7 },
+	{ 0x6DD8, 0xCCD4 }, { 0x6DD9, 0xE4C8 }, { 0x6DDD, 0xE4C7 }, { 0x6DDE, 0xE4C1 }, { 0x6DE0, 0xE4C4 }, { 0x6DE1, 0xB5AD }, { 0x6DE4, 0xD3D9 }, { 0x6DE6, 0xE4C6 },
+	{ 0x6DEB, 0xD2F9 }, { 0x6DEC, 0xB4E3 }, { 0x6DEE, 0xBBB4 }, { 0x6DF1, 0xC9EE }, { 0x6DF3, 0xB4BE }, { 0x6DF7, 0xBBEC }, { 0x6DF9, 0xD1CD }, { 0x6DFB, 0xCCED },
+	{ 0x6DFC, 0xEDB5 }, { 0x6E05, 0xC7E5 }, { 0x6E0A, 0xD4A8 }, { 0x6E0C, 0xE4CB }, { 0x6E0D, 0xD7D5 }, { 0x6E0E, 0xE4C2 }, { 0x6E10, 0xBDA5 }, { 0x6E11, 0xE4C5 },
+	{ 0x6E14, 0xD3E6 }, { 0x6E16, 0xE4C9 }, { 0x6E17, 0xC9F8 }, { 0x6E1A, 0xE4BE }, { 0x6E1D, 0xD3E5 }, { 0x6E20, 0xC7FE }, { 0x6E21, 0xB6C9 }, { 0x6E23, 0xD4FC },
+	{ 0x6E24, 0xB2B3 }, { 0x6E25, 0xE4D7 }, { 0x6E29, 0xCEC2 }, { 0x6E2B, 0xE4CD }, { 0x6E2D, 0xCEBC }, { 0x6E2F, 0xB8DB }, { 0x6E32, 0xE4D6 }, { 0x6E34, 0xBFCA },
+	{ 0x6E38, 0xD3CE }, { 0x6E3A, 0xC3EC }, { 0x6E43, 0xC5C8 }, { 0x6E44, 0xE4D8 }, { 0x6E4D, 0xCDC4 }, { 0x6E4E, 0xE4CF }, { 0x6E53, 0xE4D4 }, { 0x6E54, 0xE4D5 },
+	{ 0x6E56, 0xBAFE }, { 0x6E58, 0xCFE6 }, { 0x6E5B, 0xD5BF }, { 0x6E5F, 0xE4D2 }, { 0x6E6B, 0xE4D0 }, { 0x6E6E, 0xE4CE }, { 0x6E7E, 0xCDE5 }, { 0x6E7F, 0xCAAA },
+	{ 0x6E83, 0xC0A3 }, { 0x6E85, 0xBDA6 }, { 0x6E86, 0xE4D3 }, { 0x6E89, 0xB8C8 }, { 0x6E8F, 0xE4E7 }, { 0x6E90, 0xD4B4 }, { 0x6E98, 0xE4DB }, { 0x6E9C, 0xC1EF },
+	{ 0x6E9F, 0xE4E9 }, { 0x6EA2, 0xD2E7 }, { 0x6EA5, 0xE4DF }, { 0x6EA7, 0xE4E0 }, { 0x6EAA, 0xCFAA }, { 0x6EAF, 0xCBDD }, { 0x6EB1, 0xE4DA }, { 0x6EB2, 0xE4D1 },
+	{ 0x6EB4, 0xE4E5 }, { 0x6EB6, 0xC8DC }, { 0x6EB7, 0xE4E3 }, { 0x6EBA, 0xC4E7 }, { 0x6EBB, 0xE4E2 }, { 0x6EBD, 0xE4E1 }, { 0x6EC1, 0xB3FC }, { 0x6EC2, 0xE4E8 },
+	{ 0x6EC7, 0xB5E1 }, { 0x6ECB, 0xD7CC }, { 0x6ECF, 0xE4E6 }, { 0x6ED1, 0xBBAC }, { 0x6ED3, 0xD7D2 }, { 0x6ED4, 0xCCCF }, { 0x6ED5, 0xEBF8 }, { 0x6ED7, 0xE4E4 },
+	{ 0x6EDA, 0xB9F6 }, { 0x6EDE, 0xD6CD }, { 0x6EDF, 0xE4D9 }, { 0x6EE0, 0xE4DC }, { 0x6EE1, 0xC2FA }, { 0x6EE2, 0xE4DE }, { 0x6EE4, 0xC2CB }, { 0x6EE5, 0xC0C4 },
+	{ 0x6EE6, 0xC2D0 }, { 0x6EE8, 0xB1F5 }, { 0x6EE9, 0xCCB2 }, { 0x6EF4, 0xB5CE }, { 0x6EF9, 0xE4EF }, { 0x6F02, 0xC6AF }, { 0x6F06, 0xC6E1 }, { 0x6F09, 0xE4F5 },
+	{ 0x6F0F, 0xC2A9 }, { 0x6F13, 0xC0EC }, { 0x6F14, 0xD1DD }, { 0x6F15, 0xE4EE }, { 0x6F20, 0xC4AE }, { 0x6F24, 0xE4ED }, { 0x6F29, 0xE4F6 }, { 0x6F2A, 0xE4F4 },
+	{ 0x6F2B, 0xC2FE }, { 0x6F2D, 0xE4DD }, { 0x6F2F, 0xE4F0 }, { 0x6F31, 0xCAFE }, { 0x6F33, 0xD5C4 }, { 0x6F36, 0xE4F1 }, { 0x6F3E, 0xD1FA }, { 0x6F46, 0xE4EB },
+	{ 0x6F47, 0xE4EC }, { 0x6F4B, 0xE4F2 }, { 0x6F4D, 0xCEAB }, { 0x6F58, 0xC5CB }, { 0x6F5C, 0xC7B1 }, { 0x6F5E, 0xC2BA }, { 0x6F62, 0xE4EA }, { 0x6F66, 0xC1CA },
+	{ 0x6F6D, 0xCCB6 }, { 0x6F6E, 0xB3B1 }, { 0x6F72, 0xE4FB }, { 0x6F74, 0xE4F3 }, { 0x6F78, 0xE4FA }, { 0x6F7A, 0xE4FD }, { 0x6F7C, 0xE4FC }, { 0x6F84, 0xB3CE },
+	{ 0x6F88, 0xB3BA }, { 0x6F89, 0xE4F7 }, { 0x6F8C, 0xE4F9 }, { 0x6F8D, 0xE4F8 }, { 0x6F8E, 0xC5EC }, { 0x6F9C, 0xC0BD }, { 0x6FA1, 0xD4E8 }, { 0x6FA7, 0xE5A2 },
+	{ 0x6FB3, 0xB0C4 }, { 0x6FB6, 0xE5A4 }, { 0x6FB9, 0xE5A3 }, { 0x6FC0, 0xBCA4 }, { 0x6FC2, 0xE5A5 }, { 0x6FC9, 0xE5A1 }, { 0x6FD1, 0xE4FE }, { 0x6FD2, 0xB1F4 },
+	{ 0x6FDE, 0xE5A8 }, { 0x6FE0, 0xE5A9 }, { 0x6FE1, 0xE5A6 }, { 0x6FEE, 0xE5A7 }, { 0x6FEF, 0xE5AA }, { 0x7011, 0xC6D9 }, { 0x701A, 0xE5AB }, { 0x701B, 0xE5AD },
+	{ 0x7023, 0xE5AC }, { 0x7035, 0xE5AF }, { 0x7039, 0xE5AE }, { 0x704C, 0xB9E0 }, { 0x704F, 0xE5B0 }, { 0x705E, 0xE5B1 }, { 0x706B, 0xBBF0 }, { 0x706C, 0xECE1 },
+	{ 0x706D, 0xC3F0 }, { 0x706F, 0xB5C6 }, { 0x7070, 0xBBD2 }, { 0x7075, 0xC1E9 }, { 0x7076, 0xD4EE }, { 0x7078, 0xBEC4 }, { 0x707C, 0xD7C6 }, { 0x707E, 0xD4D6 },
+	{ 0x707F, 0xB2D3 }, { 0x7080, 0xECBE }, { 0x7085, 0xEAC1 }, { 0x7089, 0xC2AF }, { 0x708A, 0xB4B6 }, { 0x708E, 0xD1D7 }, { 0x7092, 0xB3B4 }, { 0x7094, 0xC8B2 },
+	{ 0x7095, 0xBFBB }, { 0x7096, 0xECC0 }, { 0x7099, 0xD6CB }, { 0x709C, 0xECBF }, { 0x709D, 0xECC1 }, { 0x70AB, 0xECC5 }, { 0x70AC, 0xBEE6 }, { 0x70AD, 0xCCBF },
+	{ 0x70AE, 0xC5DA }, { 0x70AF, 0xBEBC }, { 0x70B1, 0xECC6 }, { 0x70B3, 0xB1FE }, { 0x70B7, 0xECC4 }, { 0x70B8, 0xD5A8 }, { 0x70B9, 0xB5E3 }, { 0x70BB, 0xECC2 },
+	{ 0x70BC, 0xC1B6 }, { 0x70BD, 0xB3E3 }, { 0x70C0, 0xECC3 }, { 0x70C1, 0xCBB8 }, { 0x70C2, 0xC0C3 }, { 0x70C3, 0xCCFE }, { 0x70C8, 0xC1D2 }, { 0x70CA, 0xECC8 },
+	{ 0x70D8, 0xBAE6 }, { 0x70D9, 0xC0D3 }, { 0x70DB, 0xD6F2 }, { 0x70DF, 0xD1CC }, { 0x70E4, 0xBFBE }, { 0x70E6, 0xB7B3 }, { 0x70E7, 0xC9D5 }, { 0x70E8, 0xECC7 },
+	{ 0x70E9, 0xBBE2 }, { 0x70EB, 0xCCCC }, { 0x70EC, 0xBDFD }, { 0x70ED, 0xC8C8 }, { 0x70EF, 0xCFA9 }, { 0x70F7, 0xCDE9 }, { 0x70F9, 0xC5EB }, { 0x70FD, 0xB7E9 },
+	{ 0x7109, 0xD1C9 }, { 0x710A, 0xBAB8 }, { 0x7110, 0xECC9 }, { 0x7113, 0xECCA }, { 0x7115, 0xBBC0 }, { 0x7116, 0xECCB }, { 0x7118, 0xECE2 }, { 0x7119, 0xB1BA },
+	{ 0x711A, 0xB7D9 }, { 0x7126, 0xBDB9 }, { 0x712F, 0xECCC }, { 0x7130, 0xD1E6 }, { 0x7131, 0xECCD }, { 0x7136, 0xC8BB }, { 0x7145, 0xECD1 }, { 0x714A, 0xECD3 },
+	{ 0x714C, 0xBBCD }, { 0x714E, 0xBCE5 }, { 0x715C, 0xECCF }, { 0x715E, 0xC9B7 }, { 0x7164, 0xC3BA }, { 0x7166, 0xECE3 }, { 0x7167, 0xD5D5 }, { 0x7168, 0xECD0 },
+	{ 0x716E, 0xD6F3 }, { 0x7172, 0xECD2 }, { 0x7173, 0xECCE }, { 0x7178, 0xECD4 }, { 0x717A, 0xECD5 }, { 0x717D, 0xC9BF }, { 0x7184, 0xCFA8 }, { 0x718A, 0xD0DC },
+	{ 0x718F, 0xD1AC }, { 0x7194, 0xC8DB }, { 0x7198, 0xECD6 }, { 0x7199, 0xCEF5 }, { 0x719F, 0xCAEC }, { 0x71A0, 0xECDA }, { 0x71A8, 0xECD9 }, { 0x71AC, 0xB0BE },
+	{ 0x71B3, 0xECD7 }, { 0x71B5, 0xECD8 }, { 0x71B9, 0xECE4 }, { 0x71C3, 0xC8BC }, { 0x71CE, 0xC1C7 }, { 0x71D4, 0xECDC }, { 0x71D5, 0xD1E0 }, { 0x71E0, 0xECDB },
+	{ 0x71E5, 0xD4EF }, { 0x71E7, 0xECDD }, { 0x71EE, 0xDBC6 }, { 0x71F9, 0xECDE }, { 0x7206, 0xB1AC }, { 0x721D, 0xECDF }, { 0x7228, 0xECE0 }, { 0x722A, 0xD7A6 },
+	{ 0x722C, 0xC5C0 }, { 0x7230, 0xEBBC }, { 0x7231, 0xB0AE }, { 0x7235, 0xBEF4 }, { 0x7236, 0xB8B8 }, { 0x7237, 0xD2AF }, { 0x7238, 0xB0D6 }, { 0x7239, 0xB5F9 },
+	{ 0x723B, 0xD8B3 }, { 0x723D, 0xCBAC }, { 0x723F, 0xE3DD }, { 0x7247, 0xC6AC }, { 0x7248, 0xB0E6 }, { 0x724C, 0xC5C6 }, { 0x724D, 0xEBB9 }, { 0x7252, 0xEBBA },
+	{ 0x7256, 0xEBBB }, { 0x7259, 0xD1C0 }, { 0x725B, 0xC5A3 }, { 0x725D, 0xEAF2 }, { 0x725F, 0xC4B2 }, { 0x7261, 0xC4B5 }, { 0x7262, 0xC0CE }, { 0x7266, 0xEAF3 },
+	{ 0x7267, 0xC4C1 }, { 0x7269, 0xCEEF }, { 0x726E, 0xEAF0 }, { 0x726F, 0xEAF4 }, { 0x7272, 0xC9FC }, { 0x7275, 0xC7A3 }, { 0x7279, 0xCCD8 }, { 0x727A, 0xCEFE },
+	{ 0x727E, 0xEAF5 }, { 0x727F, 0xEAF6 }, { 0x7280, 0xCFAC }, { 0x7281, 0xC0E7 }, { 0x7284, 0xEAF7 }, { 0x728A, 0xB6BF }, { 0x728B, 0xEAF8 }, { 0x728D, 0xEAF9 },
+	{ 0x728F, 0xEAFA }, { 0x7292, 0xEAFB }, { 0x729F, 0xEAF1 }, { 0x72AC, 0xC8AE }, { 0x72AD, 0xE1EB }, { 0x72AF, 0xB7B8 }, { 0x72B0, 0xE1EC }, { 0x72B4, 0xE1ED },
+	{ 0x72B6, 0xD7B4 }, { 0x72B7, 0xE1EE }, { 0x72B8, 0xE1EF }, { 0x72B9, 0xD3CC }, { 0x72C1, 0xE1F1 }, { 0x72C2, 0xBFF1 }, { 0x72C3, 0xE1F0 }, { 0x72C4, 0xB5D2 },
+	{ 0x72C8, 0xB1B7 }, { 0x72CD, 0xE1F3 }, { 0x72CE, 0xE1F2 }, { 0x72D0, 0xBAFC }, { 0x72D2, 0xE1F4 }, { 0x72D7, 0xB9B7 }, { 0x72D9, 0xBED1 }, { 0x72DE, 0xC4FC },
+	{ 0x72E0, 0xBADD }, { 0x72E1, 0xBDC6 }, { 0x72E8, 0xE1F5 }, { 0x72E9, 0xE1F7 }, { 0x72EC, 0xB6C0 }, { 0x72ED, 0xCFC1 }, { 0x72EE, 0xCAA8 }, { 0x72EF, 0xE1F6 },
+	{ 0x72F0, 0xD5F8 }, { 0x72F1, 0xD3FC }, { 0x72F2, 0xE1F8 }, { 0x72F3, 0xE1FC }, { 0x72F4, 0xE1F9 }, { 0x72F7, 0xE1FA }, { 0x72F8, 0xC0EA }, { 0x72FA, 0xE1FE },
+	{ 0x72FB, 0xE2A1 }, { 0x72FC, 0xC0C7 }, { 0x7301, 0xE1FB }, { 0x7303, 0xE1FD }, { 0x730A, 0xE2A5 }, { 0x730E, 0xC1D4 }, { 0x7313, 0xE2A3 }, { 0x7315, 0xE2A8 },
+	{ 0x7316, 0xB2FE }, { 0x7317, 0xE2A2 }, { 0x731B, 0xC3CD }, { 0x731C, 0xB2C2 }, { 0x731D, 0xE2A7 }, { 0x731E, 0xE2A6 }, { 0x7321, 0xE2A4 }, { 0x7322, 0xE2A9 },
+	{ 0x7325, 0xE2AB }, { 0x7329, 0xD0C9 }, { 0x732A, 0xD6ED }, { 0x732B, 0xC3A8 }, { 0x732C, 0xE2AC }, { 0x732E, 0xCFD7 }, { 0x7331, 0xE2AE }, { 0x7334, 0xBAEF },
+	{ 0x7337, 0xE9E0 }, { 0x7338, 0xE2AD }, { 0x7339, 0xE2AA }, { 0x733E, 0xBBAB }, { 0x733F, 0xD4B3 }, { 0x734D, 0xE2B0 }, { 0x7350, 0xE2AF }, { 0x7352, 0xE9E1 },
+	{ 0x7357, 0xE2B1 }, { 0x7360, 0xE2B2 }, { 0x736C, 0xE2B3 }, { 0x736D, 0xCCA1 }, { 0x736F, 0xE2B4 }, { 0x737E, 0xE2B5 }, { 0x7384, 0xD0FE }, { 0x7387, 0xC2CA },
+	{ 0x7389, 0xD3F1 }, { 0x738B, 0xCDF5 }, { 0x738E, 0xE7E0 }, { 0x7391, 0xE7E1 }, { 0x7396, 0xBEC1 }, { 0x739B, 0xC2EA }, { 0x739F, 0xE7E4 }, { 0x73A2, 0xE7E3 },
+	{ 0x73A9, 0xCDE6 }, { 0x73AB, 0xC3B5 }, { 0x73AE, 0xE7E2 }, { 0x73AF, 0xBBB7 }, { 0x73B0, 0xCFD6 }, { 0x73B2, 0xC1E1 }, { 0x73B3, 0xE7E9 }, { 0x73B7, 0xE7E8 },
+	{ 0x73BA, 0xE7F4 }, { 0x73BB, 0xB2A3 }, { 0x73C0, 0xE7EA }, { 0x73C2, 0xE7E6 }, { 0x73C8, 0xE7EC }, { 0x73C9, 0xE7EB }, { 0x73CA, 0xC9BA }, { 0x73CD, 0xD5E4 },
+	{ 0x73CF, 0xE7E5 }, { 0x73D0, 0xB7A9 }, { 0x73D1, 0xE7E7 }, { 0x73D9, 0xE7EE }, { 0x73DE, 0xE7F3 }, { 0x73E0, 0xD6E9 }, { 0x73E5, 0xE7ED }, { 0x73E7, 0xE7F2 },
+	{ 0x73E9, 0xE7F1 }, { 0x73ED, 0xB0E0 }, { 0x73F2, 0xE7F5 }, { 0x7403, 0xC7F2 }, { 0x7405, 0xC0C5 }, { 0x7406, 0xC0ED }, { 0x7409, 0xC1F0 }, { 0x740A, 0xE7F0 },
+	{ 0x740F, 0xE7F6 }, { 0x7410, 0xCBF6 }, { 0x741A, 0xE8A2 }, { 0x741B, 0xE8A1 }, { 0x7422, 0xD7C1 }, { 0x7425, 0xE7FA }, { 0x7426, 0xE7F9 }, { 0x7428, 0xE7FB },
+	{ 0x742A, 0xE7F7 }, { 0x742C, 0xE7FE }, { 0x742E, 0xE7FD }, { 0x7430, 0xE7FC }, { 0x7433, 0xC1D5 }, { 0x7434, 0xC7D9 }, { 0x7435, 0xC5FD }, { 0x7436, 0xC5C3 },
+	{ 0x743C, 0xC7ED }, { 0x7441, 0xE8A3 }, { 0x7455, 0xE8A6 }, { 0x7457, 0xE8A5 }, { 0x7459, 0xE8A7 }, { 0x745A, 0xBAF7 }, { 0x745B, 0xE7F8 }, { 0x745C, 0xE8A4 },
+	{ 0x745E, 0xC8F0 }, { 0x745F, 0xC9AA }, { 0x746D, 0xE8A9 }, { 0x7470, 0xB9E5 }, { 0x7476, 0xD1FE }, { 0x7477, 0xE8A8 }, { 0x747E, 0xE8AA }, { 0x7480, 0xE8AD },
+	{ 0x7481, 0xE8AE }, { 0x7483, 0xC1A7 }, { 0x7487, 0xE8AF }, { 0x748B, 0xE8B0 }, { 0x748E, 0xE8AC }, { 0x7490, 0xE8B4 }, { 0x749C, 0xE8AB }, { 0x749E, 0xE8B1 },
+	{ 0x74A7, 0xE8B5 }, { 0x74A8, 0xE8B2 }, { 0x74A9, 0xE8B3 }, { 0x74BA, 0xE8B7 }, { 0x74D2, 0xE8B6 }, { 0x74DC, 0xB9CF }, { 0x74DE, 0xF0AC }, { 0x74E0, 0xF0AD },
+	{ 0x74E2, 0xC6B0 }, { 0x74E3, 0xB0EA }, { 0x74E4, 0xC8BF }, { 0x74E6, 0xCDDF }, { 0x74EE, 0xCECD }, { 0x74EF, 0xEAB1 }, { 0x74F4, 0xEAB2 }, { 0x74F6, 0xC6BF },
+	{ 0x74F7, 0xB4C9 }, { 0x74FF, 0xEAB3 }, { 0x7504, 0xD5E7 }, { 0x750D, 0xDDF9 }, { 0x750F, 0xEAB4 }, { 0x7511, 0xEAB5 }, { 0x7513, 0xEAB6 }, { 0x7518, 0xB8CA },
+	{ 0x7519, 0xDFB0 }, { 0x751A, 0xC9F5 }, { 0x751C, 0xCCF0 }, { 0x751F, 0xC9FA }, { 0x7525, 0xC9FB }, { 0x7528, 0xD3C3 }, { 0x7529, 0xCBA6 }, { 0x752B, 0xB8A6 },
+	{ 0x752C, 0xF0AE }, { 0x752D, 0xB1C2 }, { 0x752F, 0xE5B8 }, { 0x7530, 0xCCEF }, { 0x7531, 0xD3C9 }, { 0x7532, 0xBCD7 }, { 0x7533, 0xC9EA }, { 0x7535, 0xB5E7 },
+	{ 0x7537, 0xC4D0 }, { 0x7538, 0xB5E9 }, { 0x753A, 0xEEAE }, { 0x753B, 0xBBAD }, { 0x753E, 0xE7DE }, { 0x7540, 0xEEAF }, { 0x7545, 0xB3A9 }, { 0x7548, 0xEEB2 },
+	{ 0x754B, 0xEEB1 }, { 0x754C, 0xBDE7 }, { 0x754E, 0xEEB0 }, { 0x754F, 0xCEB7 }, { 0x7554, 0xC5CF }, { 0x7559, 0xC1F4 }, { 0x755A, 0xDBCE }, { 0x755B, 0xEEB3 },
+	{ 0x755C, 0xD0F3 }, { 0x7565, 0xC2D4 }, { 0x7566, 0xC6E8 }, { 0x756A, 0xB7AC }, { 0x7572, 0xEEB4 }, { 0x7574, 0xB3EB }, { 0x7578, 0xBBFB }, { 0x7579, 0xEEB5 },
+	{ 0x757F, 0xE7DC }, { 0x7583, 0xEEB6 }, { 0x7586, 0xBDAE }, { 0x758B, 0xF1E2 }, { 0x758F, 0xCAE8 }, { 0x7591, 0xD2C9 }, { 0x7592, 0xF0DA }, { 0x7594, 0xF0DB },
+	{ 0x7596, 0xF0DC }, { 0x7597, 0xC1C6 }, { 0x7599, 0xB8ED }, { 0x759A, 0xBECE }, { 0x759D, 0xF0DE }, { 0x759F, 0xC5B1 }, { 0x75A0, 0xF0DD }, { 0x75A1, 0xD1F1 },
+	{ 0x75A3, 0xF0E0 }, { 0x75A4, 0xB0CC }, { 0x75A5, 0xBDEA }, { 0x75AB, 0xD2DF }, { 0x75AC, 0xF0DF }, { 0x75AE, 0xB4AF }, { 0x75AF, 0xB7E8 }, { 0x75B0, 0xF0E6 },
+	{ 0x75B1, 0xF0E5 }, { 0x75B2, 0xC6A3 }, { 0x75B3, 0xF0E1 }, { 0x75B4, 0xF0E2 }, { 0x75B5, 0xB4C3 }, { 0x75B8, 0xF0E3 }, { 0x75B9, 0xD5EE }, { 0x75BC, 0xCCDB },
+	{ 0x75BD, 0xBED2 }, { 0x75BE, 0xBCB2 }, { 0x75C2, 0xF0E8 }, { 0x75C3, 0xF0E7 }, { 0x75C4, 0xF0E4 }, { 0x75C5, 0xB2A1 }, { 0x75C7, 0xD6A2 }, { 0x75C8, 0xD3B8 },
+	{ 0x75C9, 0xBEB7 }, { 0x75CA, 0xC8AC }, { 0x75CD, 0xF0EA }, { 0x75D2, 0xD1F7 }, { 0x75D4, 0xD6CC }, { 0x75D5, 0xBADB }, { 0x75D6, 0xF0E9 }, { 0x75D8, 0xB6BB },
+	{ 0x75DB, 0xCDB4 }, { 0x75DE, 0xC6A6 }, { 0x75E2, 0xC1A1 }, { 0x75E3, 0xF0EB }, { 0x75E4, 0xF0EE }, { 0x75E6, 0xF0ED }, { 0x75E7, 0xF0F0 }, { 0x75E8, 0xF0EC },
+	{ 0x75EA, 0xBBBE }, { 0x75EB, 0xF0EF }, { 0x75F0, 0xCCB5 }, { 0x75F1, 0xF0F2 }, { 0x75F4, 0xB3D5 }, { 0x75F9, 0xB1D4 }, { 0x75FC, 0xF0F3 }, { 0x75FF, 0xF0F4 },
+	{ 0x7600, 0xF0F6 }, { 0x7601, 0xB4E1 }, { 0x7603, 0xF0F1 }, { 0x7605, 0xF0F7 }, { 0x760A, 0xF0FA }, { 0x760C, 0xF0F8 }, { 0x7610, 0xF0F5 }, { 0x7615, 0xF0FD },
+	{ 0x7617, 0xF0F9 }, { 0x7618, 0xF0FC }, { 0x7619, 0xF0FE }, { 0x761B, 0xF1A1 }, { 0x761F, 0xCEC1 }, { 0x7620, 0xF1A4 }, { 0x7622, 0xF1A3 }, { 0x7624, 0xC1F6 },
+	{ 0x7625, 0xF0FB }, { 0x7626, 0xCADD }, { 0x7629, 0xB4F1 }, { 0x762A, 0xB1F1 }, { 0x762B, 0xCCB1 }, { 0x762D, 0xF1A6 }, { 0x7630, 0xF1A7 }, { 0x7633, 0xF1AC },
+	{ 0x7634, 0xD5CE }, { 0x7635, 0xF1A9 }, { 0x7638, 0xC8B3 }, { 0x763C, 0xF1A2 }, { 0x763E, 0xF1AB }, { 0x763F, 0xF1A8 }, { 0x7640, 0xF1A5 }, { 0x7643, 0xF1AA },
+	{ 0x764C, 0xB0A9 }, { 0x764D, 0xF1AD }, { 0x7654, 0xF1AF }, { 0x7656, 0xF1B1 }, { 0x765C, 0xF1B0 }, { 0x765E, 0xF1AE }, { 0x7663, 0xD1A2 }, { 0x766B, 0xF1B2 },
+	{ 0x766F, 0xF1B3 }, { 0x7678, 0xB9EF }, { 0x767B, 0xB5C7 }, { 0x767D, 0xB0D7 }, { 0x767E, 0xB0D9 }, { 0x7682, 0xD4ED }, { 0x7684, 0xB5C4 }, { 0x7686, 0xBDD4 },
+	{ 0x7687, 0xBBCA }, { 0x7688, 0xF0A7 }, { 0x768B, 0xB8DE }, { 0x768E, 0xF0A8 }, { 0x7691, 0xB0A8 }, { 0x7693, 0xF0A9 }, { 0x7696, 0xCDEE }, { 0x7699, 0xF0AA },
+	{ 0x76A4, 0xF0AB }, { 0x76AE, 0xC6A4 }, { 0x76B1, 0xD6E5 }, { 0x76B2, 0xF1E4 }, { 0x76B4, 0xF1E5 }, { 0x76BF, 0xC3F3 }, { 0x76C2, 0xD3DB }, { 0x76C5, 0xD6D1 },
+	{ 0x76C6, 0xC5E8 }, { 0x76C8, 0xD3AF }, { 0x76CA, 0xD2E6 }, { 0x76CD, 0xEEC1 }, { 0x76CE, 0xB0BB }, { 0x76CF, 0xD5B5 }, { 0x76D0, 0xD1CE }, { 0x76D1, 0xBCE0 },
+	{ 0x76D2, 0xBAD0 }, { 0x76D4, 0xBFF8 }, { 0x76D6, 0xB8C7 }, { 0x76D7, 0xB5C1 }, { 0x76D8, 0xC5CC }, { 0x76DB, 0xCAA2 }, { 0x76DF, 0xC3CB }, { 0x76E5, 0xEEC2 },
+	{ 0x76EE, 0xC4BF }, { 0x76EF, 0xB6A2 }, { 0x76F1, 0xEDEC }, { 0x76F2, 0xC3A4 }, { 0x76F4, 0xD6B1 }, { 0x76F8, 0xCFE0 }, { 0x76F9, 0xEDEF }, { 0x76FC, 0xC5CE },
+	{ 0x76FE, 0xB6DC }, { 0x7701, 0xCAA1 }, { 0x7704, 0xEDED }, { 0x7707, 0xEDF0 }, { 0x7708, 0xEDF1 }, { 0x7709, 0xC3BC }, { 0x770B, 0xBFB4 }, { 0x770D, 0xEDEE },
+	{ 0x7719, 0xEDF4 }, { 0x771A, 0xEDF2 }, { 0x771F, 0xD5E6 }, { 0x7720, 0xC3DF }, { 0x7722, 0xEDF3 }, { 0x7726, 0xEDF6 }, { 0x7728, 0xD5A3 }, { 0x7729, 0xD1A3 },
+	{ 0x772D, 0xEDF5 }, { 0x772F, 0xC3D0 }, { 0x7735, 0xEDF7 }, { 0x7736, 0xBFF4 }, { 0x7737, 0xBEEC }, { 0x7738, 0xEDF8 }, { 0x773A, 0xCCF7 }, { 0x773C, 0xD1DB },
+	{ 0x7740, 0xD7C5 }, { 0x7741, 0xD5F6 }, { 0x7743, 0xEDFC }, { 0x7747, 0xEDFB }, { 0x7750, 0xEDF9 }, { 0x7751, 0xEDFA }, { 0x775A, 0xEDFD }, { 0x775B, 0xBEA6 },
+	{ 0x7761, 0xCBAF }, { 0x7762, 0xEEA1 }, { 0x7763, 0xB6BD }, { 0x7765, 0xEEA2 }, { 0x7766, 0xC4C0 }, { 0x7768, 0xEDFE }, { 0x776B, 0xBDDE }, { 0x776C, 0xB2C7 },
+	{ 0x7779, 0xB6C3 }, { 0x777D, 0xEEA5 }, { 0x777E, 0xD8BA }, { 0x777F, 0xEEA3 }, { 0x7780, 0xEEA6 }, { 0x7784, 0xC3E9 }, { 0x7785, 0xB3F2 }, { 0x778C, 0xEEA7 },
+	{ 0x778D, 0xEEA4 }, { 0x778E, 0xCFB9 }, { 0x7791, 0xEEA8 }, { 0x7792, 0xC2F7 }, { 0x779F, 0xEEA9 }, { 0x77A0, 0xEEAA }, { 0x77A2, 0xDEAB }, { 0x77A5, 0xC6B3 },
+	{ 0x77A7, 0xC7C6 }, { 0x77A9, 0xD6F5 }, { 0x77AA, 0xB5C9 }, { 0x77AC, 0xCBB2 }, { 0x77B0, 0xEEAB }, { 0x77B3, 0xCDAB }, { 0x77B5, 0xEEAC }, { 0x77BB, 0xD5B0 },
+	{ 0x77BD, 0xEEAD }, { 0x77BF, 0xF6C4 }, { 0x77CD, 0xDBC7 }, { 0x77D7, 0xB4A3 }, { 0x77DB, 0xC3AC }, { 0x77DC, 0xF1E6 }, { 0x77E2, 0xCAB8 }, { 0x77E3, 0xD2D3 },
+	{ 0x77E5, 0xD6AA }, { 0x77E7, 0xEFF2 }, { 0x77E9, 0xBED8 }, { 0x77EB, 0xBDC3 }, { 0x77EC, 0xEFF3 }, { 0x77ED, 0xB6CC }, { 0x77EE, 0xB0AB }, { 0x77F3, 0xCAAF },
+	{ 0x77F6, 0xEDB6 }, { 0x77F8, 0xEDB7 }, { 0x77FD, 0xCEF9 }, { 0x77FE, 0xB7AF }, { 0x77FF, 0xBFF3 }, { 0x7800, 0xEDB8 }, { 0x7801, 0xC2EB }, { 0x7802, 0xC9B0 },
+	{ 0x7809, 0xEDB9 }, { 0x780C, 0xC6F6 }, { 0x780D, 0xBFB3 }, { 0x7811, 0xEDBC }, { 0x7812, 0xC5F8 }, { 0x7814, 0xD1D0 }, { 0x7816, 0xD7A9 }, { 0x7817, 0xEDBA },
+	{ 0x7818, 0xEDBB }, { 0x781A, 0xD1E2 }, { 0x781C, 0xEDBF }, { 0x781D, 0xEDC0 }, { 0x781F, 0xEDC4 }, { 0x7823, 0xEDC8 }, { 0x7825, 0xEDC6 }, { 0x7826, 0xEDCE },
+	{ 0x7827, 0xD5E8 }, { 0x7829, 0xEDC9 }, { 0x782C, 0xEDC7 }, { 0x782D, 0xEDBE }, { 0x7830, 0xC5E9 }, { 0x7834, 0xC6C6 }, { 0x7837, 0xC9E9 }, { 0x7838, 0xD4D2 },
+	{ 0x7839, 0xEDC1 }, { 0x783A, 0xEDC2 }, { 0x783B, 0xEDC3 }, { 0x783C, 0xEDC5 }, { 0x783E, 0xC0F9 }, { 0x7840, 0xB4A1 }, { 0x7845, 0xB9E8 }, { 0x7847, 0xEDD0 },
+	{ 0x784C, 0xEDD1 }, { 0x784E, 0xEDCA }, { 0x7850, 0xEDCF }, { 0x7852, 0xCEF8 }, { 0x7855, 0xCBB6 }, { 0x7856, 0xEDCC }, { 0x7857, 0xEDCD }, { 0x785D, 0xCFF5 },
+	{ 0x786A, 0xEDD2 }, { 0x786B, 0xC1F2 }, { 0x786C, 0xD3B2 }, { 0x786D, 0xEDCB }, { 0x786E, 0xC8B7 }, { 0x7877, 0xBCEF }, { 0x787C, 0xC5F0 }, { 0x7887, 0xEDD6 },
+	{ 0x7889, 0xB5EF }, { 0x788C, 0xC2B5 }, { 0x788D, 0xB0AD }, { 0x788E, 0xCBE9 }, { 0x7891, 0xB1AE }, { 0x7893, 0xEDD4 }, { 0x7897, 0xCDEB }, { 0x7898, 0xB5E2 },
+	{ 0x789A, 0xEDD5 }, { 0x789B, 0xEDD3 }, { 0x789C, 0xEDD7 }, { 0x789F, 0xB5FA }, { 0x78A1, 0xEDD8 }, { 0x78A3, 0xEDD9 }, { 0x78A5, 0xEDDC }, { 0x78A7, 0xB1CC },
+	{ 0x78B0, 0xC5F6 }, { 0x78B1, 0xBCEE }, { 0x78B2, 0xEDDA }, { 0x78B3, 0xCCBC }, { 0x78B4, 0xB2EA }, { 0x78B9, 0xEDDB }, { 0x78BE, 0xC4EB }, { 0x78C1, 0xB4C5 },
+	{ 0x78C5, 0xB0F5 }, { 0x78C9, 0xEDDF }, { 0x78CA, 0xC0DA }, { 0x78CB, 0xB4E8 }, { 0x78D0, 0xC5CD }, { 0x78D4, 0xEDDD }, { 0x78D5, 0xBFC4 }, { 0x78D9, 0xEDDE },
+	{ 0x78E8, 0xC4A5 }, { 0x78EC, 0xEDE0 }, { 0x78F2, 0xEDE1 }, { 0x78F4, 0xEDE3 }, { 0x78F7, 0xC1D7 }, { 0x78FA, 0xBBC7 }, { 0x7901, 0xBDB8 }, { 0x7905, 0xEDE2 },
+	{ 0x7913, 0xEDE4 }, { 0x791E, 0xEDE6 }, { 0x7924, 0xEDE5 }, { 0x7934, 0xEDE7 }, { 0x793A, 0xCABE }, { 0x793B, 0xECEA }, { 0x793C, 0xC0F1 }, { 0x793E, 0xC9E7 },
+	{ 0x7940, 0xECEB }, { 0x7941, 0xC6EE }, { 0x7946, 0xECEC }, { 0x7948, 0xC6ED }, { 0x7949, 0xECED }, { 0x7953, 0xECF0 }, { 0x7956, 0xD7E6 }, { 0x7957, 0xECF3 },
+	{ 0x795A, 0xECF1 }, { 0x795B, 0xECEE }, { 0x795C, 0xECEF }, { 0x795D, 0xD7A3 }, { 0x795E, 0xC9F1 }, { 0x795F, 0xCBEE }, { 0x7960, 0xECF4 }, { 0x7962, 0xECF2 },
+	{ 0x7965, 0xCFE9 }, { 0x7967, 0xECF6 }, { 0x7968, 0xC6B1 }, { 0x796D, 0xBCC0 }, { 0x796F, 0xECF5 }, { 0x7977, 0xB5BB }, { 0x7978, 0xBBF6 }, { 0x797A, 0xECF7 },
+	{ 0x7980, 0xD9F7 }, { 0x7981, 0xBDFB }, { 0x7984, 0xC2BB }, { 0x7985, 0xECF8 }, { 0x798A, 0xECF9 }, { 0x798F, 0xB8A3 }, { 0x799A, 0xECFA }, { 0x79A7, 0xECFB },
+	{ 0x79B3, 0xECFC }, { 0x79B9, 0xD3ED }, { 0x79BA, 0xD8AE }, { 0x79BB, 0xC0EB }, { 0x79BD, 0xC7DD }, { 0x79BE, 0xBACC }, { 0x79C0, 0xD0E3 }, { 0x79C1, 0xCBBD },
+	{ 0x79C3, 0xCDBA }, { 0x79C6, 0xB8D1 }, { 0x79C9, 0xB1FC }, { 0x79CB, 0xC7EF }, { 0x79CD, 0xD6D6 }, { 0x79D1, 0xBFC6 }, { 0x79D2, 0xC3EB }, { 0x79D5, 0xEFF5 },
+	{ 0x79D8, 0xC3D8 }, { 0x79DF, 0xD7E2 }, { 0x79E3, 0xEFF7 }, { 0x79E4, 0xB3D3 }, { 0x79E6, 0xC7D8 }, { 0x79E7, 0xD1ED }, { 0x79E9, 0xD6C8 }, { 0x79EB, 0xEFF8 },
+	{ 0x79ED, 0xEFF6 }, { 0x79EF, 0xBBFD }, { 0x79F0, 0xB3C6 }, { 0x79F8, 0xBDD5 }, { 0x79FB, 0xD2C6 }, { 0x79FD, 0xBBE0 }, { 0x7A00, 0xCFA1 }, { 0x7A02, 0xEFFC },
+	{ 0x7A03, 0xEFFB }, { 0x7A06, 0xEFF9 }, { 0x7A0B, 0xB3CC }, { 0x7A0D, 0xC9D4 }, { 0x7A0E, 0xCBB0 }, { 0x7A14, 0xEFFE }, { 0x7A17, 0xB0DE }, { 0x7A1A, 0xD6C9 },
+	{ 0x7A1E, 0xEFFD }, { 0x7A20, 0xB3ED }, { 0x7A23, 0xF6D5 }, { 0x7A33, 0xCEC8 }, { 0x7A37, 0xF0A2 }, { 0x7A39, 0xF0A1 }, { 0x7A3B, 0xB5BE }, { 0x7A3C, 0xBCDA },
+	{ 0x7A3D, 0xBBFC }, { 0x7A3F, 0xB8E5 }, { 0x7A46, 0xC4C2 }, { 0x7A51, 0xF0A3 }, { 0x7A57, 0xCBEB }, { 0x7A70, 0xF0A6 }, { 0x7A74, 0xD1A8 }, { 0x7A76, 0xBEBF },
+	{ 0x7A77, 0xC7EE }, { 0x7A78, 0xF1B6 }, { 0x7A79, 0xF1B7 }, { 0x7A7A, 0xBFD5 }, { 0x7A7F, 0xB4A9 }, { 0x7A80, 0xF1B8 }, { 0x7A81, 0xCDBB }, { 0x7A83, 0xC7D4 },
+	{ 0x7A84, 0xD5AD }, { 0x7A86, 0xF1B9 }, { 0x7A88, 0xF1BA }, { 0x7A8D, 0xC7CF }, { 0x7A91, 0xD2A4 }, { 0x7A92, 0xD6CF }, { 0x7A95, 0xF1BB }, { 0x7A96, 0xBDD1 },
+	{ 0x7A97, 0xB4B0 }, { 0x7A98, 0xBEBD }, { 0x7A9C, 0xB4DC }, { 0x7A9D, 0xCED1 }, { 0x7A9F, 0xBFDF }, { 0x7AA0, 0xF1BD }, { 0x7AA5, 0xBFFA }, { 0x7AA6, 0xF1BC },
+	{ 0x7AA8, 0xF1BF }, { 0x7AAC, 0xF1BE }, { 0x7AAD, 0xF1C0 }, { 0x7AB3, 0xF1C1 }, { 0x7ABF, 0xC1FE }, { 0x7ACB, 0xC1A2 }, { 0x7AD6, 0xCAFA }, { 0x7AD9, 0xD5BE },
+	{ 0x7ADE, 0xBEBA }, { 0x7ADF, 0xBEB9 }, { 0x7AE0, 0xD5C2 }, { 0x7AE3, 0xBFA2 }, { 0x7AE5, 0xCDAF }, { 0x7AE6, 0xF1B5 }, { 0x7AED, 0xBDDF }, { 0x7AEF, 0xB6CB },
+	{ 0x7AF9, 0xD6F1 }, { 0x7AFA, 0xF3C3 }, { 0x7AFD, 0xF3C4 }, { 0x7AFF, 0xB8CD }, { 0x7B03, 0xF3C6 }, { 0x7B04, 0xF3C7 }, { 0x7B06, 0xB0CA }, { 0x7B08, 0xF3C5 },
+	{ 0x7B0A, 0xF3C9 }, { 0x7B0B, 0xCBF1 }, { 0x7B0F, 0xF3CB }, { 0x7B11, 0xD0A6 }, { 0x7B14, 0xB1CA }, { 0x7B15, 0xF3C8 }, { 0x7B19, 0xF3CF }, { 0x7B1B, 0xB5D1 },
+	{ 0x7B1E, 0xF3D7 }, { 0x7B20, 0xF3D2 }, { 0x7B24, 0xF3D4 }, { 0x7B25, 0xF3D3 }, { 0x7B26, 0xB7FB }, { 0x7B28, 0xB1BF }, { 0x7B2A, 0xF3CE }, { 0x7B2B, 0xF3CA },
+	{ 0x7B2C, 0xB5DA }, { 0x7B2E, 0xF3D0 }, { 0x7B31, 0xF3D1 }, { 0x7B33, 0xF3D5 }, { 0x7B38, 0xF3CD }, { 0x7B3A, 0xBCE3 }, { 0x7B3C, 0xC1FD }, { 0x7B3E, 0xF3D6 },
+	{ 0x7B45, 0xF3DA }, { 0x7B47, 0xF3CC }, { 0x7B49, 0xB5C8 }, { 0x7B4B, 0xBDEE }, { 0x7B4C, 0xF3DC }, { 0x7B4F, 0xB7A4 }, { 0x7B50, 0xBFF0 }, { 0x7B51, 0xD6FE },
+	{ 0x7B52, 0xCDB2 }, { 0x7B54, 0xB4F0 }, { 0x7B56, 0xB2DF }, { 0x7B58, 0xF3D8 }, { 0x7B5A, 0xF3D9 }, { 0x7B5B, 0xC9B8 }, { 0x7B5D, 0xF3DD }, { 0x7B60, 0xF3DE },
+	{ 0x7B62, 0xF3E1 }, { 0x7B6E, 0xF3DF }, { 0x7B71, 0xF3E3 }, { 0x7B72, 0xF3E2 }, { 0x7B75, 0xF3DB }, { 0x7B77, 0xBFEA }, { 0x7B79, 0xB3EF }, { 0x7B7B, 0xF3E0 },
+	{ 0x7B7E, 0xC7A9 }, { 0x7B80, 0xBCF2 }, { 0x7B85, 0xF3EB }, { 0x7B8D, 0xB9BF }, { 0x7B90, 0xF3E4 }, { 0x7B94, 0xB2AD }, { 0x7B95, 0xBBFE }, { 0x7B97, 0xCBE3 },
+	{ 0x7B9C, 0xF3ED }, { 0x7B9D, 0xF3E9 }, { 0x7BA1, 0xB9DC }, { 0x7BA2, 0xF3EE }, { 0x7BA6, 0xF3E5 }, { 0x7BA7, 0xF3E6 }, { 0x7BA8, 0xF3EA }, { 0x7BA9, 0xC2E1 },
+	{ 0x7BAA, 0xF3EC }, { 0x7BAB, 0xF3EF }, { 0x7BAC, 0xF3E8 }, { 0x7BAD, 0xBCFD }, { 0x7BB1, 0xCFE4 }, { 0x7BB4, 0xF3F0 }, { 0x7BB8, 0xF3E7 }, { 0x7BC1, 0xF3F2 },
+	{ 0x7BC6, 0xD7AD }, { 0x7BC7, 0xC6AA }, { 0x7BCC, 0xF3F3 }, { 0x7BD1, 0xF3F1 }, { 0x7BD3, 0xC2A8 }, { 0x7BD9, 0xB8DD }, { 0x7BDA, 0xF3F5 }, { 0x7BDD, 0xF3F4 },
+	{ 0x7BE1, 0xB4DB }, { 0x7BE5, 0xF3F6 }, { 0x7BE6, 0xF3F7 }, { 0x7BEA, 0xF3F8 }, { 0x7BEE, 0xC0BA }, { 0x7BF1, 0xC0E9 }, { 0x7BF7, 0xC5F1 }, { 0x7BFC, 0xF3FB },
+	{ 0x7BFE, 0xF3FA }, { 0x7C07, 0xB4D8 }, { 0x7C0B, 0xF3FE }, { 0x7C0C, 0xF3F9 }, { 0x7C0F, 0xF3FC }, { 0x7C16, 0xF3FD }, { 0x7C1F, 0xF4A1 }, { 0x7C26, 0xF4A3 },
+	{ 0x7C27, 0xBBC9 }, { 0x7C2A, 0xF4A2 }, { 0x7C38, 0xF4A4 }, { 0x7C3F, 0xB2BE }, { 0x7C40, 0xF4A6 }, { 0x7C41, 0xF4A5 }, { 0x7C4D, 0xBCAE }, { 0x7C73, 0xC3D7 },
+	{ 0x7C74, 0xD9E1 }, { 0x7C7B, 0xC0E0 }, { 0x7C7C, 0xF4CC }, { 0x7C7D, 0xD7D1 }, { 0x7C89, 0xB7DB }, { 0x7C91, 0xF4CE }, { 0x7C92, 0xC1A3 }, { 0x7C95, 0xC6C9 },
+	{ 0x7C97, 0xB4D6 }, { 0x7C98, 0xD5B3 }, { 0x7C9C, 0xF4D0 }, { 0x7C9D, 0xF4CF }, { 0x7C9E, 0xF4D1 }, { 0x7C9F, 0xCBDA }, { 0x7CA2, 0xF4D2 }, { 0x7CA4, 0xD4C1 },
+	{ 0x7CA5, 0xD6E0 }, { 0x7CAA, 0xB7E0 }, { 0x7CAE, 0xC1B8 }, { 0x7CB1, 0xC1BB }, { 0x7CB2, 0xF4D3 }, { 0x7CB3, 0xBEAC }, { 0x7CB9, 0xB4E2 }, { 0x7CBC, 0xF4D4 },
+	{ 0x7CBD, 0xF4D5 }, { 0x7CBE, 0xBEAB }, { 0x7CC1, 0xF4D6 }, { 0x7CC5, 0xF4DB }, { 0x7CC7, 0xF4D7 }, { 0x7CC8, 0xF4DA }, { 0x7CCA, 0xBAFD }, { 0x7CCC, 0xF4D8 },
+	{ 0x7CCD, 0xF4D9 }, { 0x7CD5, 0xB8E2 }, { 0x7CD6, 0xCCC7 }, { 0x7CD7, 0xF4DC }, { 0x7CD9, 0xB2DA }, { 0x7CDC, 0xC3D3 }, { 0x7CDF, 0xD4E3 }, { 0x7CE0, 0xBFB7 },
+	{ 0x7CE8, 0xF4DD }, { 0x7CEF, 0xC5B4 }, { 0x7CF8, 0xF4E9 }, { 0x7CFB, 0xCFB5 }, { 0x7D0A, 0xCEC9 }, { 0x7D20, 0xCBD8 }, { 0x7D22, 0xCBF7 }, { 0x7D27, 0xBDF4 },
+	{ 0x7D2B, 0xD7CF }, { 0x7D2F, 0xC0DB }, { 0x7D6E, 0xD0F5 }, { 0x7D77, 0xF4EA }, { 0x7DA6, 0xF4EB }, { 0x7DAE, 0xF4EC }, { 0x7E3B, 0xF7E3 }, { 0x7E41, 0xB7B1 },
+	{ 0x7E47, 0xF4ED }, { 0x7E82, 0xD7EB }, { 0x7E9B, 0xF4EE }, { 0x7E9F, 0xE6F9 }, { 0x7EA0, 0xBEC0 }, { 0x7EA1, 0xE6FA }, { 0x7EA2, 0xBAEC }, { 0x7EA3, 0xE6FB },
+	{ 0x7EA4, 0xCFCB }, { 0x7EA5, 0xE6FC }, { 0x7EA6, 0xD4BC }, { 0x7EA7, 0xBCB6 }, { 0x7EA8, 0xE6FD }, { 0x7EA9, 0xE6FE }, { 0x7EAA, 0xBCCD }, { 0x7EAB, 0xC8D2 },
+	{ 0x7EAC, 0xCEB3 }, { 0x7EAD, 0xE7A1 }, { 0x7EAF, 0xB4BF }, { 0x7EB0, 0xE7A2 }, { 0x7EB1, 0xC9B4 }, { 0x7EB2, 0xB8D9 }, { 0x7EB3, 0xC4C9 }, { 0x7EB5, 0xD7DD },
+	{ 0x7EB6, 0xC2DA }, { 0x7EB7, 0xB7D7 }, { 0x7EB8, 0xD6BD }, { 0x7EB9, 0xCEC6 }, { 0x7EBA, 0xB7C4 }, { 0x7EBD, 0xC5A6 }, { 0x7EBE, 0xE7A3 }, { 0x7EBF, 0xCFDF },
+	{ 0x7EC0, 0xE7A4 }, { 0x7EC1, 0xE7A5 }, { 0x7EC2, 0xE7A6 }, { 0x7EC3, 0xC1B7 }, { 0x7EC4, 0xD7E9 }, { 0x7EC5, 0xC9F0 }, { 0x7EC6, 0xCFB8 }, { 0x7EC7, 0xD6AF },
+	{ 0x7EC8, 0xD6D5 }, { 0x7EC9, 0xE7A7 }, { 0x7ECA, 0xB0ED }, { 0x7ECB, 0xE7A8 }, { 0x7ECC, 0xE7A9 }, { 0x7ECD, 0xC9DC }, { 0x7ECE, 0xD2EF }, { 0x7ECF, 0xBEAD },
+	{ 0x7ED0, 0xE7AA }, { 0x7ED1, 0xB0F3 }, { 0x7ED2, 0xC8DE }, { 0x7ED3, 0xBDE1 }, { 0x7ED4, 0xE7AB }, { 0x7ED5, 0xC8C6 }, { 0x7ED7, 0xE7AC }, { 0x7ED8, 0xBBE6 },
+	{ 0x7ED9, 0xB8F8 }, { 0x7EDA, 0xD1A4 }, { 0x7EDB, 0xE7AD }, { 0x7EDC, 0xC2E7 }, { 0x7EDD, 0xBEF8 }, { 0x7EDE, 0xBDCA }, { 0x7EDF, 0xCDB3 }, { 0x7EE0, 0xE7AE },
+	{ 0x7EE1, 0xE7AF }, { 0x7EE2, 0xBEEE }, { 0x7EE3, 0xD0E5 }, { 0x7EE5, 0xCBE7 }, { 0x7EE6, 0xCCD0 }, { 0x7EE7, 0xBCCC }, { 0x7EE8, 0xE7B0 }, { 0x7EE9, 0xBCA8 },
+	{ 0x7EEA, 0xD0F7 }, { 0x7EEB, 0xE7B1 }, { 0x7EED, 0xD0F8 }, { 0x7EEE, 0xE7B2 }, { 0x7EEF, 0xE7B3 }, { 0x7EF0, 0xB4C2 }, { 0x7EF1, 0xE7B4 }, { 0x7EF2, 0xE7B5 },
+	{ 0x7EF3, 0xC9FE }, { 0x7EF4, 0xCEAC }, { 0x7EF5, 0xC3E0 }, { 0x7EF6, 0xE7B7 }, { 0x7EF7, 0xB1C1 }, { 0x7EF8, 0xB3F1 }, { 0x7EFA, 0xE7B8 }, { 0x7EFB, 0xE7B9 },
+	{ 0x7EFC, 0xD7DB }, { 0x7EFD, 0xD5C0 }, { 0x7EFE, 0xE7BA }, { 0x7EFF, 0xC2CC }, { 0x7F00, 0xD7BA }, { 0x7F01, 0xE7BB }, { 0x7F02, 0xE7BC }, { 0x7F03, 0xE7BD },
+	{ 0x7F04, 0xBCEA }, { 0x7F05, 0xC3E5 }, { 0x7F06, 0xC0C2 }, { 0x7F07, 0xE7BE }, { 0x7F08, 0xE7BF }, { 0x7F09, 0xBCA9 }, { 0x7F0B, 0xE7C0 }, { 0x7F0C, 0xE7C1 },
+	{ 0x7F0D, 0xE7B6 }, { 0x7F0E, 0xB6D0 }, { 0x7F0F, 0xE7C2 }, { 0x7F11, 0xE7C3 }, { 0x7F12, 0xE7C4 }, { 0x7F13, 0xBBBA }, { 0x7F14, 0xB5DE }, { 0x7F15, 0xC2C6 },
+	{ 0x7F16, 0xB1E0 }, { 0x7F17, 0xE7C5 }, { 0x7F18, 0xD4B5 }, { 0x7F19, 0xE7C6 }, { 0x7F1A, 0xB8BF }, { 0x7F1B, 0xE7C8 }, { 0x7F1C, 0xE7C7 }, { 0x7F1D, 0xB7EC },
+	{ 0x7F1F, 0xE7C9 }, { 0x7F20, 0xB2F8 }, { 0x7F21, 0xE7CA }, { 0x7F22, 0xE7CB }, { 0x7F23, 0xE7CC }, { 0x7F24, 0xE7CD }, { 0x7F25, 0xE7CE }, { 0x7F26, 0xE7CF },
+	{ 0x7F27, 0xE7D0 }, { 0x7F28, 0xD3A7 }, { 0x7F29, 0xCBF5 }, { 0x7F2A, 0xE7D1 }, { 0x7F2B, 0xE7D2 }, { 0x7F2C, 0xE7D3 }, { 0x7F2D, 0xE7D4 }, { 0x7F2E, 0xC9C9 },
+	{ 0x7F2F, 0xE7D5 }, { 0x7F30, 0xE7D6 }, { 0x7F31, 0xE7D7 }, { 0x7F32, 0xE7D8 }, { 0x7F33, 0xE7D9 }, { 0x7F34, 0xBDC9 }, { 0x7F35, 0xE7DA }, { 0x7F36, 0xF3BE },
+	{ 0x7F38, 0xB8D7 }, { 0x7F3A, 0xC8B1 }, { 0x7F42, 0xF3BF }, { 0x7F44, 0xF3C0 }, { 0x7F45, 0xF3C1 }, { 0x7F50, 0xB9DE }, { 0x7F51, 0xCDF8 }, { 0x7F54, 0xD8E8 },
+	{ 0x7F55, 0xBAB1 }, { 0x7F57, 0xC2DE }, { 0x7F58, 0xEEB7 }, { 0x7F5A, 0xB7A3 }, { 0x7F5F, 0xEEB9 }, { 0x7F61, 0xEEB8 }, { 0x7F62, 0xB0D5 }, { 0x7F68, 0xEEBB },
+	{ 0x7F69, 0xD5D6 }, { 0x7F6A, 0xD7EF }, { 0x7F6E, 0xD6C3 }, { 0x7F71, 0xEEBD }, { 0x7F72, 0xCAF0 }, { 0x7F74, 0xEEBC }, { 0x7F79, 0xEEBE }, { 0x7F7E, 0xEEC0 },
+	{ 0x7F81, 0xEEBF }, { 0x7F8A, 0xD1F2 }, { 0x7F8C, 0xC7BC }, { 0x7F8E, 0xC3C0 }, { 0x7F94, 0xB8E1 }, { 0x7F9A, 0xC1E7 }, { 0x7F9D, 0xF4C6 }, { 0x7F9E, 0xD0DF },
+	{ 0x7F9F, 0xF4C7 }, { 0x7FA1, 0xCFDB }, { 0x7FA4, 0xC8BA }, { 0x7FA7, 0xF4C8 }, { 0x7FAF, 0xF4C9 }, { 0x7FB0, 0xF4CA }, { 0x7FB2, 0xF4CB }, { 0x7FB8, 0xD9FA },
+	{ 0x7FB9, 0xB8FE }, { 0x7FBC, 0xE5F1 }, { 0x7FBD, 0xD3F0 }, { 0x7FBF, 0xF4E0 }, { 0x7FC1, 0xCECC }, { 0x7FC5, 0xB3E1 }, { 0x7FCA, 0xF1B4 }, { 0x7FCC, 0xD2EE },
+	{ 0x7FCE, 0xF4E1 }, { 0x7FD4, 0xCFE8 }, { 0x7FD5, 0xF4E2 }, { 0x7FD8, 0xC7CC }, { 0x7FDF, 0xB5D4 }, { 0x7FE0, 0xB4E4 }, { 0x7FE1, 0xF4E4 }, { 0x7FE5, 0xF4E3 },
+	{ 0x7FE6, 0xF4E5 }, { 0x7FE9, 0xF4E6 }, { 0x7FEE, 0xF4E7 }, { 0x7FF0, 0xBAB2 }, { 0x7FF1, 0xB0BF }, { 0x7FF3, 0xF4E8 }, { 0x7FFB, 0xB7AD }, { 0x7FFC, 0xD2ED },
+	{ 0x8000, 0xD2AB }, { 0x8001, 0xC0CF }, { 0x8003, 0xBFBC }, { 0x8004, 0xEBA3 }, { 0x8005, 0xD5DF }, { 0x8006, 0xEAC8 }, { 0x800B, 0xF1F3 }, { 0x800C, 0xB6F8 },
+	{ 0x800D, 0xCBA3 }, { 0x8010, 0xC4CD }, { 0x8012, 0xF1E7 }, { 0x8014, 0xF1E8 }, { 0x8015, 0xB8FB }, { 0x8016, 0xF1E9 }, { 0x8017, 0xBAC4 }, { 0x8018, 0xD4C5 },
+	{ 0x8019, 0xB0D2 }, { 0x801C, 0xF1EA }, { 0x8020, 0xF1EB }, { 0x8022, 0xF1EC }, { 0x8025, 0xF1ED }, { 0x8026, 0xF1EE }, { 0x8027, 0xF1EF }, { 0x8028, 0xF1F1 },
+	{ 0x8029, 0xF1F0 }, { 0x802A, 0xC5D5 }, { 0x8031, 0xF1F2 }, { 0x8033, 0xB6FA }, { 0x8035, 0xF1F4 }, { 0x8036, 0xD2AE }, { 0x8037, 0xDEC7 }, { 0x8038, 0xCBCA },
+	{ 0x803B, 0xB3DC }, { 0x803D, 0xB5A2 }, { 0x803F, 0xB9A2 }, { 0x8042, 0xC4F4 }, { 0x8043, 0xF1F5 }, { 0x8046, 0xF1F6 }, { 0x804A, 0xC1C4 }, { 0x804B, 0xC1FB },
+	{ 0x804C, 0xD6B0 }, { 0x804D, 0xF1F7 }, { 0x8052, 0xF1F8 }, { 0x8054, 0xC1AA }, { 0x8058, 0xC6B8 }, { 0x805A, 0xBEDB }, { 0x8069, 0xF1F9 }, { 0x806A, 0xB4CF },
+	{ 0x8071, 0xF1FA }, { 0x807F, 0xEDB2 }, { 0x8080, 0xEDB1 }, { 0x8083, 0xCBE0 }, { 0x8084, 0xD2DE }, { 0x8086, 0xCBC1 }, { 0x8087, 0xD5D8 }, { 0x8089, 0xC8E2 },
+	{ 0x808B, 0xC0DF }, { 0x808C, 0xBCA1 }, { 0x8093, 0xEBC1 }, { 0x8096, 0xD0A4 }, { 0x8098, 0xD6E2 }, { 0x809A, 0xB6C7 }, { 0x809B, 0xB8D8 }, { 0x809C, 0xEBC0 },
+	{ 0x809D, 0xB8CE }, { 0x809F, 0xEBBF }, { 0x80A0, 0xB3A6 }, { 0x80A1, 0xB9C9 }, { 0x80A2, 0xD6AB }, { 0x80A4, 0xB7F4 }, { 0x80A5, 0xB7CA }, { 0x80A9, 0xBCE7 },
+	{ 0x80AA, 0xB7BE }, { 0x80AB, 0xEBC6 }, { 0x80AD, 0xEBC7 }, { 0x80AE, 0xB0B9 }, { 0x80AF, 0xBFCF }, { 0x80B1, 0xEBC5 }, { 0x80B2, 0xD3FD }, { 0x80B4, 0xEBC8 },
+	{ 0x80B7, 0xEBC9 }, { 0x80BA, 0xB7CE }, { 0x80BC, 0xEBC2 }, { 0x80BD, 0xEBC4 }, { 0x80BE, 0xC9F6 }, { 0x80BF, 0xD6D7 }, { 0x80C0, 0xD5CD }, { 0x80C1, 0xD0B2 },
+	{ 0x80C2, 0xEBCF }, { 0x80C3, 0xCEB8 }, { 0x80C4, 0xEBD0 }, { 0x80C6, 0xB5A8 }, { 0x80CC, 0xB1B3 }, { 0x80CD, 0xEBD2 }, { 0x80CE, 0xCCA5 }, { 0x80D6, 0xC5D6 },
+	{ 0x80D7, 0xEBD3 }, { 0x80D9, 0xEBD1 }, { 0x80DA, 0xC5DF }, { 0x80DB, 0xEBCE }, { 0x80DC, 0xCAA4 }, { 0x80DD, 0xEBD5 }, { 0x80DE, 0xB0FB }, { 0x80E1, 0xBAFA },
+	{ 0x80E4, 0xD8B7 }, { 0x80E5, 0xF1E3 }, { 0x80E7, 0xEBCA }, { 0x80E8, 0xEBCB }, { 0x80E9, 0xEBCC }, { 0x80EA, 0xEBCD }, { 0x80EB, 0xEBD6 }, { 0x80EC, 0xE6C0 },
+	{ 0x80ED, 0xEBD9 }, { 0x80EF, 0xBFE8 }, { 0x80F0, 0xD2C8 }, { 0x80F1, 0xEBD7 }, { 0x80F2, 0xEBDC }, { 0x80F3, 0xB8EC }, { 0x80F4, 0xEBD8 }, { 0x80F6, 0xBDBA },
+	{ 0x80F8, 0xD0D8 }, { 0x80FA, 0xB0B7 }, { 0x80FC, 0xEBDD }, { 0x80FD, 0xC4DC }, { 0x8102, 0xD6AC }, { 0x8106, 0xB4E0 }, { 0x8109, 0xC2F6 }, { 0x810A, 0xBCB9 },
+	{ 0x810D, 0xEBDA }, { 0x810E, 0xEBDB }, { 0x810F, 0xD4E0 }, { 0x8110, 0xC6EA }, { 0x8111, 0xC4D4 }, { 0x8112, 0xEBDF }, { 0x8113, 0xC5A7 }, { 0x8114, 0xD9F5 },
+	{ 0x8116, 0xB2B1 }, { 0x8118, 0xEBE4 }, { 0x811A, 0xBDC5 }, { 0x811E, 0xEBE2 }, { 0x812C, 0xEBE3 }, { 0x812F, 0xB8AC }, { 0x8131, 0xCDD1 }, { 0x8132, 0xEBE5 },
+	{ 0x8136, 0xEBE1 }, { 0x8138, 0xC1B3 }, { 0x813E, 0xC6A2 }, { 0x8146, 0xCCF3 }, { 0x8148, 0xEBE6 }, { 0x814A, 0xC0B0 }, { 0x814B, 0xD2B8 }, { 0x814C, 0xEBE7 },
+	{ 0x8150, 0xB8AF }, { 0x8151, 0xB8AD }, { 0x8153, 0xEBE8 }, { 0x8154, 0xC7BB }, { 0x8155, 0xCDF3 }, { 0x8159, 0xEBEA }, { 0x815A, 0xEBEB }, { 0x8160, 0xEBED },
+	{ 0x8165, 0xD0C8 }, { 0x8167, 0xEBF2 }, { 0x8169, 0xEBEE }, { 0x816D, 0xEBF1 }, { 0x816E, 0xC8F9 }, { 0x8170, 0xD1FC }, { 0x8171, 0xEBEC }, { 0x8174, 0xEBE9 },
+	{ 0x8179, 0xB8B9 }, { 0x817A, 0xCFD9 }, { 0x817B, 0xC4E5 }, { 0x817C, 0xEBEF }, { 0x817D, 0xEBF0 }, { 0x817E, 0xCCDA }, { 0x817F, 0xCDC8 }, { 0x8180, 0xB0F2 },
+	{ 0x8182, 0xEBF6 }, { 0x8188, 0xEBF5 }, { 0x818A, 0xB2B2 }, { 0x818F, 0xB8E0 }, { 0x8191, 0xEBF7 }, { 0x8198, 0xB1EC }, { 0x819B, 0xCCC5 }, { 0x819C, 0xC4A4 },
+	{ 0x819D, 0xCFA5 }, { 0x81A3, 0xEBF9 }, { 0x81A6, 0xECA2 }, { 0x81A8, 0xC5F2 }, { 0x81AA, 0xEBFA }, { 0x81B3, 0xC9C5 }, { 0x81BA, 0xE2DF }, { 0x81BB, 0xEBFE },
+	{ 0x81C0, 0xCDCE }, { 0x81C1, 0xECA1 }, { 0x81C2, 0xB1DB }, { 0x81C3, 0xD3B7 }, { 0x81C6, 0xD2DC }, { 0x81CA, 0xEBFD }, { 0x81CC, 0xEBFB }, { 0x81E3, 0xB3BC },
+	{ 0x81E7, 0xEAB0 }, { 0x81EA, 0xD7D4 }, { 0x81EC, 0xF4AB }, { 0x81ED, 0xB3F4 }, { 0x81F3, 0xD6C1 }, { 0x81F4, 0xD6C2 }, { 0x81FB, 0xD5E9 }, { 0x81FC, 0xBECA },
+	{ 0x81FE, 0xF4A7 }, { 0x8200, 0xD2A8 }, { 0x8201, 0xF4A8 }, { 0x8202, 0xF4A9 }, { 0x8204, 0xF4AA }, { 0x8205, 0xBECB }, { 0x8206, 0xD3DF }, { 0x820C, 0xC9E0 },
+	{ 0x820D, 0xC9E1 }, { 0x8210, 0xF3C2 }, { 0x8212, 0xCAE6 }, { 0x8214, 0xCCF2 }, { 0x821B, 0xE2B6 }, { 0x821C, 0xCBB4 }, { 0x821E, 0xCEE8 }, { 0x821F, 0xD6DB },
+	{ 0x8221, 0xF4AD }, { 0x8222, 0xF4AE }, { 0x8223, 0xF4AF }, { 0x8228, 0xF4B2 }, { 0x822A, 0xBABD }, { 0x822B, 0xF4B3 }, { 0x822C, 0xB0E3 }, { 0x822D, 0xF4B0 },
+	{ 0x822F, 0xF4B1 }, { 0x8230, 0xBDA2 }, { 0x8231, 0xB2D5 }, { 0x8233, 0xF4B6 }, { 0x8234, 0xF4B7 }, { 0x8235, 0xB6E6 }, { 0x8236, 0xB2B0 }, { 0x8237, 0xCFCF },
+	{ 0x8238, 0xF4B4 }, { 0x8239, 0xB4AC }, { 0x823B, 0xF4B5 }, { 0x823E, 0xF4B8 }, { 0x8244, 0xF4B9 }, { 0x8247, 0xCDA7 }, { 0x8249, 0xF4BA }, { 0x824B, 0xF4BB },
+	{ 0x824F, 0xF4BC }, { 0x8258, 0xCBD2 }, { 0x825A, 0xF4BD }, { 0x825F, 0xF4BE }, { 0x8268, 0xF4BF }, { 0x826E, 0xF4DE }, { 0x826F, 0xC1BC }, { 0x8270, 0xBCE8 },
+	{ 0x8272, 0xC9AB }, { 0x8273, 0xD1DE }, { 0x8274, 0xE5F5 }, { 0x8279, 0xDCB3 }, { 0x827A, 0xD2D5 }, { 0x827D, 0xDCB4 }, { 0x827E, 0xB0AC }, { 0x827F, 0xDCB5 },
+	{ 0x8282, 0xBDDA }, { 0x8284, 0xDCB9 }, { 0x8288, 0xD8C2 }, { 0x828A, 0xDCB7 }, { 0x828B, 0xD3F3 }, { 0x828D, 0xC9D6 }, { 0x828E, 0xDCBA }, { 0x828F, 0xDCB6 },
+	{ 0x8291, 0xDCBB }, { 0x8292, 0xC3A2 }, { 0x8297, 0xDCBC }, { 0x8298, 0xDCC5 }, { 0x8299, 0xDCBD }, { 0x829C, 0xCEDF }, { 0x829D, 0xD6A5 }, { 0x829F, 0xDCCF },
+	{ 0x82A1, 0xDCCD }, { 0x82A4, 0xDCD2 }, { 0x82A5, 0xBDE6 }, { 0x82A6, 0xC2AB }, { 0x82A8, 0xDCB8 }, { 0x82A9, 0xDCCB }, { 0x82AA, 0xDCCE }, { 0x82AB, 0xDCBE },
+	{ 0x82AC, 0xB7D2 }, { 0x82AD, 0xB0C5 }, { 0x82AE, 0xDCC7 }, { 0x82AF, 0xD0BE }, { 0x82B0, 0xDCC1 }, { 0x82B1, 0xBBA8 }, { 0x82B3, 0xB7BC }, { 0x82B4, 0xDCCC },
+	{ 0x82B7, 0xDCC6 }, { 0x82B8, 0xDCBF }, { 0x82B9, 0xC7DB }, { 0x82BD, 0xD1BF }, { 0x82BE, 0xDCC0 }, { 0x82C1, 0xDCCA }, { 0x82C4, 0xDCD0 }, { 0x82C7, 0xCEAD },
+	{ 0x82C8, 0xDCC2 }, { 0x82CA, 0xDCC3 }, { 0x82CB, 0xDCC8 }, { 0x82CC, 0xDCC9 }, { 0x82CD, 0xB2D4 }, { 0x82CE, 0xDCD1 }, { 0x82CF, 0xCBD5 }, { 0x82D1, 0xD4B7 },
+	{ 0x82D2, 0xDCDB }, { 0x82D3, 0xDCDF }, { 0x82D4, 0xCCA6 }, { 0x82D5, 0xDCE6 }, { 0x82D7, 0xC3E7 }, { 0x82D8, 0xDCDC }, { 0x82DB, 0xBFC1 }, { 0x82DC, 0xDCD9 },
+	{ 0x82DE, 0xB0FA }, { 0x82DF, 0xB9B6 }, { 0x82E0, 0xDCE5 }, { 0x82E1, 0xDCD3 }, { 0x82E3, 0xDCC4 }, { 0x82E4, 0xDCD6 }, { 0x82E5, 0xC8F4 }, { 0x82E6, 0xBFE0 },
+	{ 0x82EB, 0xC9BB }, { 0x82EF, 0xB1BD }, { 0x82F1, 0xD3A2 }, { 0x82F4, 0xDCDA }, { 0x82F7, 0xDCD5 }, { 0x82F9, 0xC6BB }, { 0x82FB, 0xDCDE }, { 0x8301, 0xD7C2 },
+	{ 0x8302, 0xC3AF }, { 0x8303, 0xB7B6 }, { 0x8304, 0xC7D1 }, { 0x8305, 0xC3A9 }, { 0x8306, 0xDCE2 }, { 0x8307, 0xDCD8 }, { 0x8308, 0xDCEB }, { 0x8309, 0xDCD4 },
+	{ 0x830C, 0xDCDD }, { 0x830E, 0xBEA5 }, { 0x830F, 0xDCD7 }, { 0x8311, 0xDCE0 }, { 0x8314, 0xDCE3 }, { 0x8315, 0xDCE4 }, { 0x8317, 0xDCF8 }, { 0x831A, 0xDCE1 },
+	{ 0x831B, 0xDDA2 }, { 0x831C, 0xDCE7 }, { 0x8327, 0xBCEB }, { 0x8328, 0xB4C4 }, { 0x832B, 0xC3A3 }, { 0x832C, 0xB2E7 }, { 0x832D, 0xDCFA }, { 0x832F, 0xDCF2 },
+	{ 0x8331, 0xDCEF }, { 0x8333, 0xDCFC }, { 0x8334, 0xDCEE }, { 0x8335, 0xD2F0 }, { 0x8336, 0xB2E8 }, { 0x8338, 0xC8D7 }, { 0x8339, 0xC8E3 }, { 0x833A, 0xDCFB },
+	{ 0x833C, 0xDCED }, { 0x8340, 0xDCF7 }, { 0x8343, 0xDCF5 }, { 0x8346, 0xBEA3 }, { 0x8347, 0xDCF4 }, { 0x8349, 0xB2DD }, { 0x834F, 0xDCF3 }, { 0x8350, 0xBCF6 },
+	{ 0x8351, 0xDCE8 }, { 0x8352, 0xBBC4 }, { 0x8354, 0xC0F3 }, { 0x835A, 0xBCD4 }, { 0x835B, 0xDCE9 }, { 0x835C, 0xDCEA }, { 0x835E, 0xDCF1 }, { 0x835F, 0xDCF6 },
+	{ 0x8360, 0xDCF9 }, { 0x8361, 0xB5B4 }, { 0x8363, 0xC8D9 }, { 0x8364, 0xBBE7 }, { 0x8365, 0xDCFE }, { 0x8366, 0xDCFD }, { 0x8367, 0xD3AB }, { 0x8368, 0xDDA1 },
+	{ 0x8369, 0xDDA3 }, { 0x836A, 0xDDA5 }, { 0x836B, 0xD2F1 }, { 0x836C, 0xDDA4 }, { 0x836D, 0xDDA6 }, { 0x836E, 0xDDA7 }, { 0x836F, 0xD2A9 }, { 0x8377, 0xBAC9 },
+	{ 0x8378, 0xDDA9 }, { 0x837B, 0xDDB6 }, { 0x837C, 0xDDB1 }, { 0x837D, 0xDDB4 }, { 0x8385, 0xDDB0 }, { 0x8386, 0xC6CE }, { 0x8389, 0xC0F2 }, { 0x838E, 0xC9AF },
+	{ 0x8392, 0xDCEC }, { 0x8393, 0xDDAE }, { 0x8398, 0xDDB7 }, { 0x839B, 0xDCF0 }, { 0x839C, 0xDDAF }, { 0x839E, 0xDDB8 }, { 0x83A0, 0xDDAC }, { 0x83A8, 0xDDB9 },
+	{ 0x83A9, 0xDDB3 }, { 0x83AA, 0xDDAD }, { 0x83AB, 0xC4AA }, { 0x83B0, 0xDDA8 }, { 0x83B1, 0xC0B3 }, { 0x83B2, 0xC1AB }, { 0x83B3, 0xDDAA }, { 0x83B4, 0xDDAB },
+	{ 0x83B6, 0xDDB2 }, { 0x83B7, 0xBBF1 }, { 0x83B8, 0xDDB5 }, { 0x83B9, 0xD3A8 }, { 0x83BA, 0xDDBA }, { 0x83BC, 0xDDBB }, { 0x83BD, 0xC3A7 }, { 0x83C0, 0xDDD2 },
+	{ 0x83C1, 0xDDBC }, { 0x83C5, 0xDDD1 }, { 0x83C7, 0xB9BD }, { 0x83CA, 0xBED5 }, { 0x83CC, 0xBEFA }, { 0x83CF, 0xBACA }, { 0x83D4, 0xDDCA }, { 0x83D6, 0xDDC5 },
+	{ 0x83D8, 0xDDBF }, { 0x83DC, 0xB2CB }, { 0x83DD, 0xDDC3 }, { 0x83DF, 0xDDCB }, { 0x83E0, 0xB2A4 }, { 0x83E1, 0xDDD5 }, { 0x83E5, 0xDDBE }, { 0x83E9, 0xC6D0 },
+	{ 0x83EA, 0xDDD0 }, { 0x83F0, 0xDDD4 }, { 0x83F1, 0xC1E2 }, { 0x83F2, 0xB7C6 }, { 0x83F8, 0xDDCE }, { 0x83F9, 0xDDCF }, { 0x83FD, 0xDDC4 }, { 0x8401, 0xDDBD },
+	{ 0x8403, 0xDDCD }, { 0x8404, 0xCCD1 }, { 0x8406, 0xDDC9 }, { 0x840B, 0xDDC2 }, { 0x840C, 0xC3C8 }, { 0x840D, 0xC6BC }, { 0x840E, 0xCEAE }, { 0x840F, 0xDDCC },
+	{ 0x8411, 0xDDC8 }, { 0x8418, 0xDDC1 }, { 0x841C, 0xDDC6 }, { 0x841D, 0xC2DC }, { 0x8424, 0xD3A9 }, { 0x8425, 0xD3AA }, { 0x8426, 0xDDD3 }, { 0x8427, 0xCFF4 },
+	{ 0x8428, 0xC8F8 }, { 0x8431, 0xDDE6 }, { 0x8438, 0xDDC7 }, { 0x843C, 0xDDE0 }, { 0x843D, 0xC2E4 }, { 0x8446, 0xDDE1 }, { 0x8451, 0xDDD7 }, { 0x8457, 0xD6F8 },
+	{ 0x8459, 0xDDD9 }, { 0x845A, 0xDDD8 }, { 0x845B, 0xB8F0 }, { 0x845C, 0xDDD6 }, { 0x8461, 0xC6CF }, { 0x8463, 0xB6AD }, { 0x8469, 0xDDE2 }, { 0x846B, 0xBAF9 },
+	{ 0x846C, 0xD4E1 }, { 0x846D, 0xDDE7 }, { 0x8471, 0xB4D0 }, { 0x8473, 0xDDDA }, { 0x8475, 0xBFFB }, { 0x8476, 0xDDE3 }, { 0x8478, 0xDDDF }, { 0x847A, 0xDDDD },
+	{ 0x8482, 0xB5D9 }, { 0x8487, 0xDDDB }, { 0x8488, 0xDDDC }, { 0x8489, 0xDDDE }, { 0x848B, 0xBDAF }, { 0x848C, 0xDDE4 }, { 0x848E, 0xDDE5 }, { 0x8497, 0xDDF5 },
+	{ 0x8499, 0xC3C9 }, { 0x849C, 0xCBE2 }, { 0x84A1, 0xDDF2 }, { 0x84AF, 0xD8E1 }, { 0x84B2, 0xC6D1 }, { 0x84B4, 0xDDF4 }, { 0x84B8, 0xD5F4 }, { 0x84B9, 0xDDF3 },
+	{ 0x84BA, 0xDDF0 }, { 0x84BD, 0xDDEC }, { 0x84BF, 0xDDEF }, { 0x84C1, 0xDDE8 }, { 0x84C4, 0xD0EE }, { 0x84C9, 0xC8D8 }, { 0x84CA, 0xDDEE }, { 0x84CD, 0xDDE9 },
+	{ 0x84D0, 0xDDEA }, { 0x84D1, 0xCBF2 }, { 0x84D3, 0xDDED }, { 0x84D6, 0xB1CD }, { 0x84DD, 0xC0B6 }, { 0x84DF, 0xBCBB }, { 0x84E0, 0xDDF1 }, { 0x84E3, 0xDDF7 },
+	{ 0x84E5, 0xDDF6 }, { 0x84E6, 0xDDEB }, { 0x84EC, 0xC5EE }, { 0x84F0, 0xDDFB }, { 0x84FC, 0xDEA4 }, { 0x84FF, 0xDEA3 }, { 0x850C, 0xDDF8 }, { 0x8511, 0xC3EF },
+	{ 0x8513, 0xC2FB }, { 0x8517, 0xD5E1 }, { 0x851A, 0xCEB5 }, { 0x851F, 0xDDFD }, { 0x8521, 0xB2CC }, { 0x852B, 0xC4E8 }, { 0x852C, 0xCADF }, { 0x8537, 0xC7BE },
+	{ 0x8538, 0xDDFA }, { 0x8539, 0xDDFC }, { 0x853A, 0xDDFE }, { 0x853B, 0xDEA2 }, { 0x853C, 0xB0AA }, { 0x853D, 0xB1CE }, { 0x8543, 0xDEAC }, { 0x8548, 0xDEA6 },
+	{ 0x8549, 0xBDB6 }, { 0x854A, 0xC8EF }, { 0x8556, 0xDEA1 }, { 0x8559, 0xDEA5 }, { 0x855E, 0xDEA9 }, { 0x8564, 0xDEA8 }, { 0x8568, 0xDEA7 }, { 0x8572, 0xDEAD },
+	{ 0x8574, 0xD4CC }, { 0x8579, 0xDEB3 }, { 0x857A, 0xDEAA }, { 0x857B, 0xDEAE }, { 0x857E, 0xC0D9 }, { 0x8584, 0xB1A1 }, { 0x8585, 0xDEB6 }, { 0x8587, 0xDEB1 },
+	{ 0x858F, 0xDEB2 }, { 0x859B, 0xD1A6 }, { 0x859C, 0xDEB5 }, { 0x85A4, 0xDEAF }, { 0x85A8, 0xDEB0 }, { 0x85AA, 0xD0BD }, { 0x85AE, 0xDEB4 }, { 0x85AF, 0xCAED },
+	{ 0x85B0, 0xDEB9 }, { 0x85B7, 0xDEB8 }, { 0x85B9, 0xDEB7 }, { 0x85C1, 0xDEBB }, { 0x85C9, 0xBDE5 }, { 0x85CF, 0xB2D8 }, { 0x85D0, 0xC3EA }, { 0x85D3, 0xDEBA },
+	{ 0x85D5, 0xC5BA }, { 0x85DC, 0xDEBC }, { 0x85E4, 0xCCD9 }, { 0x85E9, 0xB7AA }, { 0x85FB, 0xD4E5 }, { 0x85FF, 0xDEBD }, { 0x8605, 0xDEBF }, { 0x8611, 0xC4A2 },
+	{ 0x8616, 0xDEC1 }, { 0x8627, 0xDEBE }, { 0x8629, 0xDEC0 }, { 0x8638, 0xD5BA }, { 0x863C, 0xDEC2 }, { 0x864D, 0xF2AE }, { 0x864E, 0xBBA2 }, { 0x864F, 0xC2B2 },
+	{ 0x8650, 0xC5B0 }, { 0x8651, 0xC2C7 }, { 0x8654, 0xF2AF }, { 0x865A, 0xD0E9 }, { 0x865E, 0xD3DD }, { 0x8662, 0xEBBD }, { 0x866B, 0xB3E6 }, { 0x866C, 0xF2B0 },
+	{ 0x866E, 0xF2B1 }, { 0x8671, 0xCAAD }, { 0x8679, 0xBAE7 }, { 0x867A, 0xF2B3 }, { 0x867B, 0xF2B5 }, { 0x867C, 0xF2B4 }, { 0x867D, 0xCBE4 }, { 0x867E, 0xCFBA },
+	{ 0x867F, 0xF2B2 }, { 0x8680, 0xCAB4 }, { 0x8681, 0xD2CF }, { 0x8682, 0xC2EC }, { 0x868A, 0xCEC3 }, { 0x868B, 0xF2B8 }, { 0x868C, 0xB0F6 }, { 0x868D, 0xF2B7 },
+	{ 0x8693, 0xF2BE }, { 0x8695, 0xB2CF }, { 0x869C, 0xD1C1 }, { 0x869D, 0xF2BA }, { 0x86A3, 0xF2BC }, { 0x86A4, 0xD4E9 }, { 0x86A7, 0xF2BB }, { 0x86A8, 0xF2B6 },
+	{ 0x86A9, 0xF2BF }, { 0x86AA, 0xF2BD }, { 0x86AC, 0xF2B9 }, { 0x86AF, 0xF2C7 }, { 0x86B0, 0xF2C4 }, { 0x86B1, 0xF2C6 }, { 0x86B4, 0xF2CA }, { 0x86B5, 0xF2C2 },
+	{ 0x86B6, 0xF2C0 }, { 0x86BA, 0xF2C5 }, { 0x86C0, 0xD6FB }, { 0x86C4, 0xF2C1 }, { 0x86C6, 0xC7F9 }, { 0x86C7, 0xC9DF }, { 0x86C9, 0xF2C8 }, { 0x86CA, 0xB9C6 },
+	{ 0x86CB, 0xB5B0 }, { 0x86CE, 0xF2C3 }, { 0x86CF, 0xF2C9 }, { 0x86D0, 0xF2D0 }, { 0x86D1, 0xF2D6 }, { 0x86D4, 0xBBD7 }, { 0x86D8, 0xF2D5 }, { 0x86D9, 0xCDDC },
+	{ 0x86DB, 0xD6EB }, { 0x86DE, 0xF2D2 }, { 0x86DF, 0xF2D4 }, { 0x86E4, 0xB8F2 }, { 0x86E9, 0xF2CB }, { 0x86ED, 0xF2CE }, { 0x86EE, 0xC2F9 }, { 0x86F0, 0xD5DD },
+	{ 0x86F1, 0xF2CC }, { 0x86F2, 0xF2CD }, { 0x86F3, 0xF2CF }, { 0x86F4, 0xF2D3 }, { 0x86F8, 0xF2D9 }, { 0x86F9, 0xD3BC }, { 0x86FE, 0xB6EA }, { 0x8700, 0xCAF1 },
+	{ 0x8702, 0xB7E4 }, { 0x8703, 0xF2D7 }, { 0x8707, 0xF2D8 }, { 0x8708, 0xF2DA }, { 0x8709, 0xF2DD }, { 0x870A, 0xF2DB }, { 0x870D, 0xF2DC }, { 0x8712, 0xD1D1 },
+	{ 0x8713, 0xF2D1 }, { 0x8715, 0xCDC9 }, { 0x8717, 0xCECF }, { 0x8718, 0xD6A9 }, { 0x871A, 0xF2E3 }, { 0x871C, 0xC3DB }, { 0x871E, 0xF2E0 }, { 0x8721, 0xC0AF },
+	{ 0x8722, 0xF2EC }, { 0x8723, 0xF2DE }, { 0x8725, 0xF2E1 }, { 0x8729, 0xF2E8 }, { 0x872E, 0xF2E2 }, { 0x8731, 0xF2E7 }, { 0x8734, 0xF2E6 }, { 0x8737, 0xF2E9 },
+	{ 0x873B, 0xF2DF }, { 0x873E, 0xF2E4 }, { 0x873F, 0xF2EA }, { 0x8747, 0xD3AC }, { 0x8748, 0xF2E5 }, { 0x8749, 0xB2F5 }, { 0x874C, 0xF2F2 }, { 0x874E, 0xD0AB },
+	{ 0x8753, 0xF2F5 }, { 0x8757, 0xBBC8 }, { 0x8759, 0xF2F9 }, { 0x8760, 0xF2F0 }, { 0x8763, 0xF2F6 }, { 0x8764, 0xF2F8 }, { 0x8765, 0xF2FA }, { 0x876E, 0xF2F3 },
+	{ 0x8770, 0xF2F1 }, { 0x8774, 0xBAFB }, { 0x8776, 0xB5FB }, { 0x877B, 0xF2EF }, { 0x877C, 0xF2F7 }, { 0x877D, 0xF2ED }, { 0x877E, 0xF2EE }, { 0x8782, 0xF2EB },
+	{ 0x8783, 0xF3A6 }, { 0x8785, 0xF3A3 }, { 0x8788, 0xF3A2 }, { 0x878B, 0xF2F4 }, { 0x878D, 0xC8DA }, { 0x8793, 0xF2FB }, { 0x8797, 0xF3A5 }, { 0x879F, 0xC3F8 },
+	{ 0x87A8, 0xF2FD }, { 0x87AB, 0xF3A7 }, { 0x87AC, 0xF3A9 }, { 0x87AD, 0xF3A4 }, { 0x87AF, 0xF2FC }, { 0x87B3, 0xF3AB }, { 0x87B5, 0xF3AA }, { 0x87BA, 0xC2DD },
+	{ 0x87BD, 0xF3AE }, { 0x87C0, 0xF3B0 }, { 0x87C6, 0xF3A1 }, { 0x87CA, 0xF3B1 }, { 0x87CB, 0xF3AC }, { 0x87D1, 0xF3AF }, { 0x87D2, 0xF2FE }, { 0x87D3, 0xF3AD },
+	{ 0x87DB, 0xF3B2 }, { 0x87E0, 0xF3B4 }, { 0x87E5, 0xF3A8 }, { 0x87EA, 0xF3B3 }, { 0x87EE, 0xF3B5 }, { 0x87F9, 0xD0B7 }, { 0x87FE, 0xF3B8 }, { 0x8803, 0xD9F9 },
+	{ 0x880A, 0xF3B9 }, { 0x8813, 0xF3B7 }, { 0x8815, 0xC8E4 }, { 0x8816, 0xF3B6 }, { 0x881B, 0xF3BA }, { 0x8821, 0xF3BB }, { 0x8822, 0xB4C0 }, { 0x8832, 0xEEC3 },
+	{ 0x8839, 0xF3BC }, { 0x883C, 0xF3BD }, { 0x8840, 0xD1AA }, { 0x8844, 0xF4AC }, { 0x8845, 0xD0C6 }, { 0x884C, 0xD0D0 }, { 0x884D, 0xD1DC }, { 0x8854, 0xCFCE },
+	{ 0x8857, 0xBDD6 }, { 0x8859, 0xD1C3 }, { 0x8861, 0xBAE2 }, { 0x8862, 0xE1E9 }, { 0x8863, 0xD2C2 }, { 0x8864, 0xF1C2 }, { 0x8865, 0xB2B9 }, { 0x8868, 0xB1ED },
+	{ 0x8869, 0xF1C3 }, { 0x886B, 0xC9C0 }, { 0x886C, 0xB3C4 }, { 0x886E, 0xD9F2 }, { 0x8870, 0xCBA5 }, { 0x8872, 0xF1C4 }, { 0x8877, 0xD6D4 }, { 0x887D, 0xF1C5 },
+	{ 0x887E, 0xF4C0 }, { 0x887F, 0xF1C6 }, { 0x8881, 0xD4AC }, { 0x8882, 0xF1C7 }, { 0x8884, 0xB0C0 }, { 0x8885, 0xF4C1 }, { 0x8888, 0xF4C2 }, { 0x888B, 0xB4FC },
+	{ 0x888D, 0xC5DB }, { 0x8892, 0xCCBB }, { 0x8896, 0xD0E4 }, { 0x889C, 0xCDE0 }, { 0x88A2, 0xF1C8 }, { 0x88A4, 0xD9F3 }, { 0x88AB, 0xB1BB }, { 0x88AD, 0xCFAE },
+	{ 0x88B1, 0xB8A4 }, { 0x88B7, 0xF1CA }, { 0x88BC, 0xF1CB }, { 0x88C1, 0xB2C3 }, { 0x88C2, 0xC1D1 }, { 0x88C5, 0xD7B0 }, { 0x88C6, 0xF1C9 }, { 0x88C9, 0xF1CC },
+	{ 0x88CE, 0xF1CE }, { 0x88D2, 0xD9F6 }, { 0x88D4, 0xD2E1 }, { 0x88D5, 0xD4A3 }, { 0x88D8, 0xF4C3 }, { 0x88D9, 0xC8B9 }, { 0x88DF, 0xF4C4 }, { 0x88E2, 0xF1CD },
+	{ 0x88E3, 0xF1CF }, { 0x88E4, 0xBFE3 }, { 0x88E5, 0xF1D0 }, { 0x88E8, 0xF1D4 }, { 0x88F0, 0xF1D6 }, { 0x88F1, 0xF1D1 }, { 0x88F3, 0xC9D1 }, { 0x88F4, 0xC5E1 },
+	{ 0x88F8, 0xC2E3 }, { 0x88F9, 0xB9FC }, { 0x88FC, 0xF1D3 }, { 0x88FE, 0xF1D5 }, { 0x8902, 0xB9D3 }, { 0x890A, 0xF1DB }, { 0x8910, 0xBAD6 }, { 0x8912, 0xB0FD },
+	{ 0x8913, 0xF1D9 }, { 0x8919, 0xF1D8 }, { 0x891A, 0xF1D2 }, { 0x891B, 0xF1DA }, { 0x8921, 0xF1D7 }, { 0x8925, 0xC8EC }, { 0x892A, 0xCDCA }, { 0x892B, 0xF1DD },
+	{ 0x8930, 0xE5BD }, { 0x8934, 0xF1DC }, { 0x8936, 0xF1DE }, { 0x8941, 0xF1DF }, { 0x8944, 0xCFE5 }, { 0x895E, 0xF4C5 }, { 0x895F, 0xBDF3 }, { 0x8966, 0xF1E0 },
+	{ 0x897B, 0xF1E1 }, { 0x897F, 0xCEF7 }, { 0x8981, 0xD2AA }, { 0x8983, 0xF1FB }, { 0x8986, 0xB8B2 }, { 0x89C1, 0xBCFB }, { 0x89C2, 0xB9DB }, { 0x89C4, 0xB9E6 },
+	{ 0x89C5, 0xC3D9 }, { 0x89C6, 0xCAD3 }, { 0x89C7, 0xEAE8 }, { 0x89C8, 0xC0C0 }, { 0x89C9, 0xBEF5 }, { 0x89CA, 0xEAE9 }, { 0x89CB, 0xEAEA }, { 0x89CC, 0xEAEB },
+	{ 0x89CE, 0xEAEC }, { 0x89CF, 0xEAED }, { 0x89D0, 0xEAEE }, { 0x89D1, 0xEAEF }, { 0x89D2, 0xBDC7 }, { 0x89D6, 0xF5FB }, { 0x89DA, 0xF5FD }, { 0x89DC, 0xF5FE },
+	{ 0x89DE, 0xF5FC }, { 0x89E3, 0xBDE2 }, { 0x89E5, 0xF6A1 }, { 0x89E6, 0xB4A5 }, { 0x89EB, 0xF6A2 }, { 0x89EF, 0xF6A3 }, { 0x89F3, 0xECB2 }, { 0x8A00, 0xD1D4 },
+	{ 0x8A07, 0xD9EA }, { 0x8A3E, 0xF6A4 }, { 0x8A48, 0xEEBA }, { 0x8A79, 0xD5B2 }, { 0x8A89, 0xD3FE }, { 0x8A8A, 0xCCDC }, { 0x8A93, 0xCAC4 }, { 0x8B07, 0xE5C0 },
+	{ 0x8B26, 0xF6A5 }, { 0x8B66, 0xBEAF }, { 0x8B6C, 0xC6A9 }, { 0x8BA0, 0xDAA5 }, { 0x8BA1, 0xBCC6 }, { 0x8BA2, 0xB6A9 }, { 0x8BA3, 0xB8BC }, { 0x8BA4, 0xC8CF },
+	{ 0x8BA5, 0xBCA5 }, { 0x8BA6, 0xDAA6 }, { 0x8BA7, 0xDAA7 }, { 0x8BA8, 0xCCD6 }, { 0x8BA9, 0xC8C3 }, { 0x8BAA, 0xDAA8 }, { 0x8BAB, 0xC6FD }, { 0x8BAD, 0xD1B5 },
+	{ 0x8BAE, 0xD2E9 }, { 0x8BAF, 0xD1B6 }, { 0x8BB0, 0xBCC7 }, { 0x8BB2, 0xBDB2 }, { 0x8BB3, 0xBBE4 }, { 0x8BB4, 0xDAA9 }, { 0x8BB5, 0xDAAA }, { 0x8BB6, 0xD1C8 },
+	{ 0x8BB7, 0xDAAB }, { 0x8BB8, 0xD0ED }, { 0x8BB9, 0xB6EF }, { 0x8BBA, 0xC2DB }, { 0x8BBC, 0xCBCF }, { 0x8BBD, 0xB7ED }, { 0x8BBE, 0xC9E8 }, { 0x8BBF, 0xB7C3 },
+	{ 0x8BC0, 0xBEF7 }, { 0x8BC1, 0xD6A4 }, { 0x8BC2, 0xDAAC }, { 0x8BC3, 0xDAAD }, { 0x8BC4, 0xC6C0 }, { 0x8BC5, 0xD7E7 }, { 0x8BC6, 0xCAB6 }, { 0x8BC8, 0xD5A9 },
+	{ 0x8BC9, 0xCBDF }, { 0x8BCA, 0xD5EF }, { 0x8BCB, 0xDAAE }, { 0x8BCC, 0xD6DF }, { 0x8BCD, 0xB4CA }, { 0x8BCE, 0xDAB0 }, { 0x8BCF, 0xDAAF }, { 0x8BD1, 0xD2EB },
+	{ 0x8BD2, 0xDAB1 }, { 0x8BD3, 0xDAB2 }, { 0x8BD4, 0xDAB3 }, { 0x8BD5, 0xCAD4 }, { 0x8BD6, 0xDAB4 }, { 0x8BD7, 0xCAAB }, { 0x8BD8, 0xDAB5 }, { 0x8BD9, 0xDAB6 },
+	{ 0x8BDA, 0xB3CF }, { 0x8BDB, 0xD6EF }, { 0x8BDC, 0xDAB7 }, { 0x8BDD, 0xBBB0 }, { 0x8BDE, 0xB5AE }, { 0x8BDF, 0xDAB8 }, { 0x8BE0, 0xDAB9 }, { 0x8BE1, 0xB9EE },
+	{ 0x8BE2, 0xD1AF }, { 0x8BE3, 0xD2E8 }, { 0x8BE4, 0xDABA }, { 0x8BE5, 0xB8C3 }, { 0x8BE6, 0xCFEA }, { 0x8BE7, 0xB2EF }, { 0x8BE8, 0xDABB }, { 0x8BE9, 0xDABC },
+	{ 0x8BEB, 0xBDEB }, { 0x8BEC, 0xCEDC }, { 0x8BED, 0xD3EF }, { 0x8BEE, 0xDABD }, { 0x8BEF, 0xCEF3 }, { 0x8BF0, 0xDABE }, { 0x8BF1, 0xD3D5 }, { 0x8BF2, 0xBBE5 },
+	{ 0x8BF3, 0xDABF }, { 0x8BF4, 0xCBB5 }, { 0x8BF5, 0xCBD0 }, { 0x8BF6, 0xDAC0 }, { 0x8BF7, 0xC7EB }, { 0x8BF8, 0xD6EE }, { 0x8BF9, 0xDAC1 }, { 0x8BFA, 0xC5B5 },
+	{ 0x8BFB, 0xB6C1 }, { 0x8BFC, 0xDAC2 }, { 0x8BFD, 0xB7CC }, { 0x8BFE, 0xBFCE }, { 0x8BFF, 0xDAC3 }, { 0x8C00, 0xDAC4 }, { 0x8C01, 0xCBAD }, { 0x8C02, 0xDAC5 },
+	{ 0x8C03, 0xB5F7 }, { 0x8C04, 0xDAC6 }, { 0x8C05, 0xC1C2 }, { 0x8C06, 0xD7BB }, { 0x8C07, 0xDAC7 }, { 0x8C08, 0xCCB8 }, { 0x8C0A, 0xD2EA }, { 0x8C0B, 0xC4B1 },
+	{ 0x8C0C, 0xDAC8 }, { 0x8C0D, 0xB5FD }, { 0x8C0E, 0xBBD1 }, { 0x8C0F, 0xDAC9 }, { 0x8C10, 0xD0B3 }, { 0x8C11, 0xDACA }, { 0x8C12, 0xDACB }, { 0x8C13, 0xCEBD },
+	{ 0x8C14, 0xDACC }, { 0x8C15, 0xDACD }, { 0x8C16, 0xDACE }, { 0x8C17, 0xB2F7 }, { 0x8C18, 0xDAD1 }, { 0x8C19, 0xDACF }, { 0x8C1A, 0xD1E8 }, { 0x8C1B, 0xDAD0 },
+	{ 0x8C1C, 0xC3D5 }, { 0x8C1D, 0xDAD2 }, { 0x8C1F, 0xDAD3 }, { 0x8C20, 0xDAD4 }, { 0x8C21, 0xDAD5 }, { 0x8C22, 0xD0BB }, { 0x8C23, 0xD2A5 }, { 0x8C24, 0xB0F9 },
+	{ 0x8C25, 0xDAD6 }, { 0x8C26, 0xC7AB }, { 0x8C27, 0xDAD7 }, { 0x8C28, 0xBDF7 }, { 0x8C29, 0xC3A1 }, { 0x8C2A, 0xDAD8 }, { 0x8C2B, 0xDAD9 }, { 0x8C2C, 0xC3FD },
+	{ 0x8C2D, 0xCCB7 }, { 0x8C2E, 0xDADA }, { 0x8C2F, 0xDADB }, { 0x8C30, 0xC0BE }, { 0x8C31, 0xC6D7 }, { 0x8C32, 0xDADC }, { 0x8C33, 0xDADD }, { 0x8C34, 0xC7B4 },
+	{ 0x8C35, 0xDADE }, { 0x8C36, 0xDADF }, { 0x8C37, 0xB9C8 }, { 0x8C41, 0xBBED }, { 0x8C46, 0xB6B9 }, { 0x8C47, 0xF4F8 }, { 0x8C49, 0xF4F9 }, { 0x8C4C, 0xCDE3 },
+	{ 0x8C55, 0xF5B9 }, { 0x8C5A, 0xEBE0 }, { 0x8C61, 0xCFF3 }, { 0x8C62, 0xBBBF }, { 0x8C6A, 0xBAC0 }, { 0x8C6B, 0xD4A5 }, { 0x8C73, 0xE1D9 }, { 0x8C78, 0xF5F4 },
+	{ 0x8C79, 0xB1AA }, { 0x8C7A, 0xB2F2 }, { 0x8C82, 0xF5F5 }, { 0x8C85, 0xF5F7 }, { 0x8C89, 0xBAD1 }, { 0x8C8A, 0xF5F6 }, { 0x8C8C, 0xC3B2 }, { 0x8C94, 0xF5F9 },
+	{ 0x8C98, 0xF5F8 }, { 0x8D1D, 0xB1B4 }, { 0x8D1E, 0xD5EA }, { 0x8D1F, 0xB8BA }, { 0x8D21, 0xB9B1 }, { 0x8D22, 0xB2C6 }, { 0x8D23, 0xD4F0 }, { 0x8D24, 0xCFCD },
+	{ 0x8D25, 0xB0DC }, { 0x8D26, 0xD5CB }, { 0x8D27, 0xBBF5 }, { 0x8D28, 0xD6CA }, { 0x8D29, 0xB7B7 }, { 0x8D2A, 0xCCB0 }, { 0x8D2B, 0xC6B6 }, { 0x8D2C, 0xB1E1 },
+	{ 0x8D2D, 0xB9BA }, { 0x8D2E, 0xD6FC }, { 0x8D2F, 0xB9E1 }, { 0x8D30, 0xB7A1 }, { 0x8D31, 0xBCFA }, { 0x8D32, 0xEADA }, { 0x8D33, 0xEADB }, { 0x8D34, 0xCCF9 },
+	{ 0x8D35, 0xB9F3 }, { 0x8D36, 0xEADC }, { 0x8D37, 0xB4FB }, { 0x8D38, 0xC3B3 }, { 0x8D39, 0xB7D1 }, { 0x8D3A, 0xBAD8 }, { 0x8D3B, 0xEADD }, { 0x8D3C, 0xD4F4 },
+	{ 0x8D3D, 0xEADE }, { 0x8D3E, 0xBCD6 }, { 0x8D3F, 0xBBDF }, { 0x8D40, 0xEADF }, { 0x8D41, 0xC1DE }, { 0x8D42, 0xC2B8 }, { 0x8D43, 0xD4DF }, { 0x8D44, 0xD7CA },
+	{ 0x8D45, 0xEAE0 }, { 0x8D46, 0xEAE1 }, { 0x8D47, 0xEAE4 }, { 0x8D48, 0xEAE2 }, { 0x8D49, 0xEAE3 }, { 0x8D4A, 0xC9DE }, { 0x8D4B, 0xB8B3 }, { 0x8D4C, 0xB6C4 },
+	{ 0x8D4D, 0xEAE5 }, { 0x8D4E, 0xCAEA }, { 0x8D4F, 0xC9CD }, { 0x8D50, 0xB4CD }, { 0x8D53, 0xE2D9 }, { 0x8D54, 0xC5E2 }, { 0x8D55, 0xEAE6 }, { 0x8D56, 0xC0B5 },
+	{ 0x8D58, 0xD7B8 }, { 0x8D59, 0xEAE7 }, { 0x8D5A, 0xD7AC }, { 0x8D5B, 0xC8FC }, { 0x8D5C, 0xD8D3 }, { 0x8D5D, 0xD8CD }, { 0x8D5E, 0xD4DE }, { 0x8D60, 0xD4F9 },
+	{ 0x8D61, 0xC9C4 }, { 0x8D62, 0xD3AE }, { 0x8D63, 0xB8D3 }, { 0x8D64, 0xB3E0 }, { 0x8D66, 0xC9E2 }, { 0x8D67, 0xF4F6 }, { 0x8D6B, 0xBAD5 }, { 0x8D6D, 0xF4F7 },
+	{ 0x8D70, 0xD7DF }, { 0x8D73, 0xF4F1 }, { 0x8D74, 0xB8B0 }, { 0x8D75, 0xD5D4 }, { 0x8D76, 0xB8CF }, { 0x8D77, 0xC6F0 }, { 0x8D81, 0xB3C3 }, { 0x8D84, 0xF4F2 },
+	{ 0x8D85, 0xB3AC }, { 0x8D8A, 0xD4BD }, { 0x8D8B, 0xC7F7 }, { 0x8D91, 0xF4F4 }, { 0x8D94, 0xF4F3 }, { 0x8D9F, 0xCCCB }, { 0x8DA3, 0xC8A4 }, { 0x8DB1, 0xF4F5 },
+	{ 0x8DB3, 0xD7E3 }, { 0x8DB4, 0xC5BF }, { 0x8DB5, 0xF5C0 }, { 0x8DB8, 0xF5BB }, { 0x8DBA, 0xF5C3 }, { 0x8DBC, 0xF5C2 }, { 0x8DBE, 0xD6BA }, { 0x8DBF, 0xF5C1 },
+	{ 0x8DC3, 0xD4BE }, { 0x8DC4, 0xF5C4 }, { 0x8DC6, 0xF5CC }, { 0x8DCB, 0xB0CF }, { 0x8DCC, 0xB5F8 }, { 0x8DCE, 0xF5C9 }, { 0x8DCF, 0xF5CA }, { 0x8DD1, 0xC5DC },
+	{ 0x8DD6, 0xF5C5 }, { 0x8DD7, 0xF5C6 }, { 0x8DDA, 0xF5C7 }, { 0x8DDB, 0xF5CB }, { 0x8DDD, 0xBEE0 }, { 0x8DDE, 0xF5C8 }, { 0x8DDF, 0xB8FA }, { 0x8DE3, 0xF5D0 },
+	{ 0x8DE4, 0xF5D3 }, { 0x8DE8, 0xBFE7 }, { 0x8DEA, 0xB9F2 }, { 0x8DEB, 0xF5BC }, { 0x8DEC, 0xF5CD }, { 0x8DEF, 0xC2B7 }, { 0x8DF3, 0xCCF8 }, { 0x8DF5, 0xBCF9 },
+	{ 0x8DF7, 0xF5CE }, { 0x8DF8, 0xF5CF }, { 0x8DF9, 0xF5D1 }, { 0x8DFA, 0xB6E5 }, { 0x8DFB, 0xF5D2 }, { 0x8DFD, 0xF5D5 }, { 0x8E05, 0xF5BD }, { 0x8E09, 0xF5D4 },
+	{ 0x8E0A, 0xD3BB }, { 0x8E0C, 0xB3EC }, { 0x8E0F, 0xCCA4 }, { 0x8E14, 0xF5D6 }, { 0x8E1D, 0xF5D7 }, { 0x8E1E, 0xBEE1 }, { 0x8E1F, 0xF5D8 }, { 0x8E22, 0xCCDF },
+	{ 0x8E23, 0xF5DB }, { 0x8E29, 0xB2C8 }, { 0x8E2A, 0xD7D9 }, { 0x8E2C, 0xF5D9 }, { 0x8E2E, 0xF5DA }, { 0x8E2F, 0xF5DC }, { 0x8E31, 0xF5E2 }, { 0x8E35, 0xF5E0 },
+	{ 0x8E39, 0xF5DF }, { 0x8E3A, 0xF5DD }, { 0x8E3D, 0xF5E1 }, { 0x8E40, 0xF5DE }, { 0x8E41, 0xF5E4 }, { 0x8E42, 0xF5E5 }, { 0x8E44, 0xCCE3 }, { 0x8E47, 0xE5BF },
+	{ 0x8E48, 0xB5B8 }, { 0x8E49, 0xF5E3 }, { 0x8E4A, 0xF5E8 }, { 0x8E4B, 0xCCA3 }, { 0x8E51, 0xF5E6 }, { 0x8E52, 0xF5E7 }, { 0x8E59, 0xF5BE }, { 0x8E66, 0xB1C4 },
+	{ 0x8E69, 0xF5BF }, { 0x8E6C, 0xB5C5 }, { 0x8E6D, 0xB2E4 }, { 0x8E6F, 0xF5EC }, { 0x8E70, 0xF5E9 }, { 0x8E72, 0xB6D7 }, { 0x8E74, 0xF5ED }, { 0x8E76, 0xF5EA },
+	{ 0x8E7C, 0xF5EB }, { 0x8E7F, 0xB4DA }, { 0x8E81, 0xD4EA }, { 0x8E85, 0xF5EE }, { 0x8E87, 0xB3F9 }, { 0x8E8F, 0xF5EF }, { 0x8E90, 0xF5F1 }, { 0x8E94, 0xF5F0 },
+	{ 0x8E9C, 0xF5F2 }, { 0x8E9E, 0xF5F3 }, { 0x8EAB, 0xC9ED }, { 0x8EAC, 0xB9AA }, { 0x8EAF, 0xC7FB }, { 0x8EB2, 0xB6E3 }, { 0x8EBA, 0xCCC9 }, { 0x8ECE, 0xEAA6 },
+	{ 0x8F66, 0xB3B5 }, { 0x8F67, 0xD4FE }, { 0x8F68, 0xB9EC }, { 0x8F69, 0xD0F9 }, { 0x8F6B, 0xE9ED }, { 0x8F6C, 0xD7AA }, { 0x8F6D, 0xE9EE }, { 0x8F6E, 0xC2D6 },
+	{ 0x8F6F, 0xC8ED }, { 0x8F70, 0xBAE4 }, { 0x8F71, 0xE9EF }, { 0x8F72, 0xE9F0 }, { 0x8F73, 0xE9F1 }, { 0x8F74, 0xD6E1 }, { 0x8F75, 0xE9F2 }, { 0x8F76, 0xE9F3 },
+	{ 0x8F77, 0xE9F5 }, { 0x8F78, 0xE9F4 }, { 0x8F79, 0xE9F6 }, { 0x8F7A, 0xE9F7 }, { 0x8F7B, 0xC7E1 }, { 0x8F7C, 0xE9F8 }, { 0x8F7D, 0xD4D8 }, { 0x8F7E, 0xE9F9 },
+	{ 0x8F7F, 0xBDCE }, { 0x8F81, 0xE9FA }, { 0x8F82, 0xE9FB }, { 0x8F83, 0xBDCF }, { 0x8F84, 0xE9FC }, { 0x8F85, 0xB8A8 }, { 0x8F86, 0xC1BE }, { 0x8F87, 0xE9FD },
+	{ 0x8F88, 0xB1B2 }, { 0x8F89, 0xBBD4 }, { 0x8F8A, 0xB9F5 }, { 0x8F8B, 0xE9FE }, { 0x8F8D, 0xEAA1 }, { 0x8F8E, 0xEAA2 }, { 0x8F8F, 0xEAA3 }, { 0x8F90, 0xB7F8 },
+	{ 0x8F91, 0xBCAD }, { 0x8F93, 0xCAE4 }, { 0x8F94, 0xE0CE }, { 0x8F95, 0xD4AF }, { 0x8F96, 0xCFBD }, { 0x8F97, 0xD5B7 }, { 0x8F98, 0xEAA4 }, { 0x8F99, 0xD5DE },
+	{ 0x8F9A, 0xEAA5 }, { 0x8F9B, 0xD0C1 }, { 0x8F9C, 0xB9BC }, { 0x8F9E, 0xB4C7 }, { 0x8F9F, 0xB1D9 }, { 0x8FA3, 0xC0B1 }, { 0x8FA8, 0xB1E6 }, { 0x8FA9, 0xB1E7 },
+	{ 0x8FAB, 0xB1E8 }, { 0x8FB0, 0xB3BD }, { 0x8FB1, 0xC8E8 }, { 0x8FB6, 0xE5C1 }, { 0x8FB9, 0xB1DF }, { 0x8FBD, 0xC1C9 }, { 0x8FBE, 0xB4EF }, { 0x8FC1, 0xC7A8 },
+	{ 0x8FC2, 0xD3D8 }, { 0x8FC4, 0xC6F9 }, { 0x8FC5, 0xD1B8 }, { 0x8FC7, 0xB9FD }, { 0x8FC8, 0xC2F5 }, { 0x8FCE, 0xD3AD }, { 0x8FD0, 0xD4CB }, { 0x8FD1, 0xBDFC },
+	{ 0x8FD3, 0xE5C2 }, { 0x8FD4, 0xB7B5 }, { 0x8FD5, 0xE5C3 }, { 0x8FD8, 0xBBB9 }, { 0x8FD9, 0xD5E2 }, { 0x8FDB, 0xBDF8 }, { 0x8FDC, 0xD4B6 }, { 0x8FDD, 0xCEA5 },
+	{ 0x8FDE, 0xC1AC }, { 0x8FDF, 0xB3D9 }, { 0x8FE2, 0xCCF6 }, { 0x8FE4, 0xE5C6 }, { 0x8FE5, 0xE5C4 }, { 0x8FE6, 0xE5C8 }, { 0x8FE8, 0xE5CA }, { 0x8FE9, 0xE5C7 },
+	{ 0x8FEA, 0xB5CF }, { 0x8FEB, 0xC6C8 }, { 0x8FED, 0xB5FC }, { 0x8FEE, 0xE5C5 }, { 0x8FF0, 0xCAF6 }, { 0x8FF3, 0xE5C9 }, { 0x8FF7, 0xC3D4 }, { 0x8FF8, 0xB1C5 },
+	{ 0x8FF9, 0xBCA3 }, { 0x8FFD, 0xD7B7 }, { 0x9000, 0xCDCB }, { 0x9001, 0xCBCD }, { 0x9002, 0xCACA }, { 0x9003, 0xCCD3 }, { 0x9004, 0xE5CC }, { 0x9005, 0xE5CB },
+	{ 0x9006, 0xC4E6 }, { 0x9009, 0xD1A1 }, { 0x900A, 0xD1B7 }, { 0x900B, 0xE5CD }, { 0x900D, 0xE5D0 }, { 0x900F, 0xCDB8 }, { 0x9010, 0xD6F0 }, { 0x9011, 0xE5CF },
+	{ 0x9012, 0xB5DD }, { 0x9014, 0xCDBE }, { 0x9016, 0xE5D1 }, { 0x9017, 0xB6BA }, { 0x901A, 0xCDA8 }, { 0x901B, 0xB9E4 }, { 0x901D, 0xCAC5 }, { 0x901E, 0xB3D1 },
+	{ 0x901F, 0xCBD9 }, { 0x9020, 0xD4EC }, { 0x9021, 0xE5D2 }, { 0x9022, 0xB7EA }, { 0x9026, 0xE5CE }, { 0x902D, 0xE5D5 }, { 0x902E, 0xB4FE }, { 0x902F, 0xE5D6 },
+	{ 0x9035, 0xE5D3 }, { 0x9036, 0xE5D4 }, { 0x9038, 0xD2DD }, { 0x903B, 0xC2DF }, { 0x903C, 0xB1C6 }, { 0x903E, 0xD3E2 }, { 0x9041, 0xB6DD }, { 0x9042, 0xCBEC },
+	{ 0x9044, 0xE5D7 }, { 0x9047, 0xD3F6 }, { 0x904D, 0xB1E9 }, { 0x904F, 0xB6F4 }, { 0x9050, 0xE5DA }, { 0x9051, 0xE5D8 }, { 0x9052, 0xE5D9 }, { 0x9053, 0xB5C0 },
+	{ 0x9057, 0xD2C5 }, { 0x9058, 0xE5DC }, { 0x905B, 0xE5DE }, { 0x9062, 0xE5DD }, { 0x9063, 0xC7B2 }, { 0x9065, 0xD2A3 }, { 0x9068, 0xE5DB }, { 0x906D, 0xD4E2 },
+	{ 0x906E, 0xD5DA }, { 0x9074, 0xE5E0 }, { 0x9075, 0xD7F1 }, { 0x907D, 0xE5E1 }, { 0x907F, 0xB1DC }, { 0x9080, 0xD1FB }, { 0x9082, 0xE5E2 }, { 0x9083, 0xE5E4 },
+	{ 0x9088, 0xE5E3 }, { 0x908B, 0xE5E5 }, { 0x9091, 0xD2D8 }, { 0x9093, 0xB5CB }, { 0x9095, 0xE7DF }, { 0x9097, 0xDAF5 }, { 0x9099, 0xDAF8 }, { 0x909B, 0xDAF6 },
+	{ 0x909D, 0xDAF7 }, { 0x90A1, 0xDAFA }, { 0x90A2, 0xD0CF }, { 0x90A3, 0xC4C7 }, { 0x90A6, 0xB0EE }, { 0x90AA, 0xD0B0 }, { 0x90AC, 0xDAF9 }, { 0x90AE, 0xD3CA },
+	{ 0x90AF, 0xBAAA }, { 0x90B0, 0xDBA2 }, { 0x90B1, 0xC7F1 }, { 0x90B3, 0xDAFC }, { 0x90B4, 0xDAFB }, { 0x90B5, 0xC9DB }, { 0x90B6, 0xDAFD }, { 0x90B8, 0xDBA1 },
+	{ 0x90B9, 0xD7DE }, { 0x90BA, 0xDAFE }, { 0x90BB, 0xC1DA }, { 0x90BE, 0xDBA5 }, { 0x90C1, 0xD3F4 }, { 0x90C4, 0xDBA7 }, { 0x90C5, 0xDBA4 }, { 0x90C7, 0xDBA8 },
+	{ 0x90CA, 0xBDBC }, { 0x90CE, 0xC0C9 }, { 0x90CF, 0xDBA3 }, { 0x90D0, 0xDBA6 }, { 0x90D1, 0xD6A3 }, { 0x90D3, 0xDBA9 }, { 0x90D7, 0xDBAD }, { 0x90DB, 0xDBAE },
+	{ 0x90DC, 0xDBAC }, { 0x90DD, 0xBAC2 }, { 0x90E1, 0xBFA4 }, { 0x90E2, 0xDBAB }, { 0x90E6, 0xDBAA }, { 0x90E7, 0xD4C7 }, { 0x90E8, 0xB2BF }, { 0x90EB, 0xDBAF },
+	{ 0x90ED, 0xB9F9 }, { 0x90EF, 0xDBB0 }, { 0x90F4, 0xB3BB }, { 0x90F8, 0xB5A6 }, { 0x90FD, 0xB6BC }, { 0x90FE, 0xDBB1 }, { 0x9102, 0xB6F5 }, { 0x9104, 0xDBB2 },
+	{ 0x9119, 0xB1C9 }, { 0x911E, 0xDBB4 }, { 0x9122, 0xDBB3 }, { 0x9123, 0xDBB5 }, { 0x912F, 0xDBB7 }, { 0x9131, 0xDBB6 }, { 0x9139, 0xDBB8 }, { 0x9143, 0xDBB9 },
+	{ 0x9146, 0xDBBA }, { 0x9149, 0xD3CF }, { 0x914A, 0xF4FA }, { 0x914B, 0xC7F5 }, { 0x914C, 0xD7C3 }, { 0x914D, 0xC5E4 }, { 0x914E, 0xF4FC }, { 0x914F, 0xF4FD },
+	{ 0x9150, 0xF4FB }, { 0x9152, 0xBEC6 }, { 0x9157, 0xD0EF }, { 0x915A, 0xB7D3 }, { 0x915D, 0xD4CD }, { 0x915E, 0xCCAA }, { 0x9161, 0xF5A2 }, { 0x9162, 0xF5A1 },
+	{ 0x9163, 0xBAA8 }, { 0x9164, 0xF4FE }, { 0x9165, 0xCBD6 }, { 0x9169, 0xF5A4 }, { 0x916A, 0xC0D2 }, { 0x916C, 0xB3EA }, { 0x916E, 0xCDAA }, { 0x916F, 0xF5A5 },
+	{ 0x9170, 0xF5A3 }, { 0x9171, 0xBDB4 }, { 0x9172, 0xF5A8 }, { 0x9174, 0xF5A9 }, { 0x9175, 0xBDCD }, { 0x9176, 0xC3B8 }, { 0x9177, 0xBFE1 }, { 0x9178, 0xCBE1 },
+	{ 0x9179, 0xF5AA }, { 0x917D, 0xF5A6 }, { 0x917E, 0xF5A7 }, { 0x917F, 0xC4F0 }, { 0x9185, 0xF5AC }, { 0x9187, 0xB4BC }, { 0x9189, 0xD7ED }, { 0x918B, 0xB4D7 },
+	{ 0x918C, 0xF5AB }, { 0x918D, 0xF5AE }, { 0x9190, 0xF5AD }, { 0x9191, 0xF5AF }, { 0x9192, 0xD0D1 }, { 0x919A, 0xC3D1 }, { 0x919B, 0xC8A9 }, { 0x91A2, 0xF5B0 },
+	{ 0x91A3, 0xF5B1 }, { 0x91AA, 0xF5B2 }, { 0x91AD, 0xF5B3 }, { 0x91AE, 0xF5B4 }, { 0x91AF, 0xF5B5 }, { 0x91B4, 0xF5B7 }, { 0x91B5, 0xF5B6 }, { 0x91BA, 0xF5B8 },
+	{ 0x91C7, 0xB2C9 }, { 0x91C9, 0xD3D4 }, { 0x91CA, 0xCACD }, { 0x91CC, 0xC0EF }, { 0x91CD, 0xD6D8 }, { 0x91CE, 0xD2B0 }, { 0x91CF, 0xC1BF }, { 0x91D1, 0xBDF0 },
+	{ 0x91DC, 0xB8AA }, { 0x9274, 0xBCF8 }, { 0x928E, 0xF6C6 }, { 0x92AE, 0xF6C7 }, { 0x92C8, 0xF6C8 }, { 0x933E, 0xF6C9 }, { 0x936A, 0xF6CA }, { 0x938F, 0xF6CC },
+	{ 0x93CA, 0xF6CB }, { 0x93D6, 0xF7E9 }, { 0x943E, 0xF6CD }, { 0x946B, 0xF6CE }, { 0x9485, 0xEEC4 }, { 0x9486, 0xEEC5 }, { 0x9487, 0xEEC6 }, { 0x9488, 0xD5EB },
+	{ 0x9489, 0xB6A4 }, { 0x948A, 0xEEC8 }, { 0x948B, 0xEEC7 }, { 0x948C, 0xEEC9 }, { 0x948D, 0xEECA }, { 0x948E, 0xC7A5 }, { 0x948F, 0xEECB }, { 0x9490, 0xEECC },
+	{ 0x9492, 0xB7B0 }, { 0x9493, 0xB5F6 }, { 0x9494, 0xEECD }, { 0x9495, 0xEECF }, { 0x9497, 0xEECE }, { 0x9499, 0xB8C6 }, { 0x949A, 0xEED0 }, { 0x949B, 0xEED1 },
+	{ 0x949C, 0xEED2 }, { 0x949D, 0xB6DB }, { 0x949E, 0xB3AE }, { 0x949F, 0xD6D3 }, { 0x94A0, 0xC4C6 }, { 0x94A1, 0xB1B5 }, { 0x94A2, 0xB8D6 }, { 0x94A3, 0xEED3 },
+	{ 0x94A4, 0xEED4 }, { 0x94A5, 0xD4BF }, { 0x94A6, 0xC7D5 }, { 0x94A7, 0xBEFB }, { 0x94A8, 0xCED9 }, { 0x94A9, 0xB9B3 }, { 0x94AA, 0xEED6 }, { 0x94AB, 0xEED5 },
+	{ 0x94AC, 0xEED8 }, { 0x94AD, 0xEED7 }, { 0x94AE, 0xC5A5 }, { 0x94AF, 0xEED9 }, { 0x94B0, 0xEEDA }, { 0x94B1, 0xC7AE }, { 0x94B2, 0xEEDB }, { 0x94B3, 0xC7AF },
+	{ 0x94B4, 0xEEDC }, { 0x94B5, 0xB2A7 }, { 0x94B6, 0xEEDD }, { 0x94B7, 0xEEDE }, { 0x94B8, 0xEEDF }, { 0x94B9, 0xEEE0 }, { 0x94BA, 0xEEE1 }, { 0x94BB, 0xD7EA },
+	{ 0x94BC, 0xEEE2 }, { 0x94BD, 0xEEE3 }, { 0x94BE, 0xBCD8 }, { 0x94BF, 0xEEE4 }, { 0x94C0, 0xD3CB }, { 0x94C1, 0xCCFA }, { 0x94C2, 0xB2AC }, { 0x94C3, 0xC1E5 },
+	{ 0x94C4, 0xEEE5 }, { 0x94C5, 0xC7A6 }, { 0x94C6, 0xC3AD }, { 0x94C8, 0xEEE6 }, { 0x94C9, 0xEEE7 }, { 0x94CA, 0xEEE8 }, { 0x94CB, 0xEEE9 }, { 0x94CC, 0xEEEA },
+	{ 0x94CD, 0xEEEB }, { 0x94CE, 0xEEEC }, { 0x94D0, 0xEEED }, { 0x94D1, 0xEEEE }, { 0x94D2, 0xEEEF }, { 0x94D5, 0xEEF0 }, { 0x94D6, 0xEEF1 }, { 0x94D7, 0xEEF2 },
+	{ 0x94D8, 0xEEF4 }, { 0x94D9, 0xEEF3 }, { 0x94DB, 0xEEF5 }, { 0x94DC, 0xCDAD }, { 0x94DD, 0xC2C1 }, { 0x94DE, 0xEEF6 }, { 0x94DF, 0xEEF7 }, { 0x94E0, 0xEEF8 },
+	{ 0x94E1, 0xD5A1 }, { 0x94E2, 0xEEF9 }, { 0x94E3, 0xCFB3 }, { 0x94E4, 0xEEFA }, { 0x94E5, 0xEEFB }, { 0x94E7, 0xEEFC }, { 0x94E8, 0xEEFD }, { 0x94E9, 0xEFA1 },
+	{ 0x94EA, 0xEEFE }, { 0x94EB, 0xEFA2 }, { 0x94EC, 0xB8F5 }, { 0x94ED, 0xC3FA }, { 0x94EE, 0xEFA3 }, { 0x94EF, 0xEFA4 }, { 0x94F0, 0xBDC2 }, { 0x94F1, 0xD2BF },
+	{ 0x94F2, 0xB2F9 }, { 0x94F3, 0xEFA5 }, { 0x94F4, 0xEFA6 }, { 0x94F5, 0xEFA7 }, { 0x94F6, 0xD2F8 }, { 0x94F7, 0xEFA8 }, { 0x94F8, 0xD6FD }, { 0x94F9, 0xEFA9 },
+	{ 0x94FA, 0xC6CC }, { 0x94FC, 0xEFAA }, { 0x94FD, 0xEFAB }, { 0x94FE, 0xC1B4 }, { 0x94FF, 0xEFAC }, { 0x9500, 0xCFFA }, { 0x9501, 0xCBF8 }, { 0x9502, 0xEFAE },
+	{ 0x9503, 0xEFAD }, { 0x9504, 0xB3FA }, { 0x9505, 0xB9F8 }, { 0x9506, 0xEFAF }, { 0x9507, 0xEFB0 }, { 0x9508, 0xD0E2 }, { 0x9509, 0xEFB1 }, { 0x950A, 0xEFB2 },
+	{ 0x950B, 0xB7E6 }, { 0x950C, 0xD0BF }, { 0x950D, 0xEFB3 }, { 0x950E, 0xEFB4 }, { 0x950F, 0xEFB5 }, { 0x9510, 0xC8F1 }, { 0x9511, 0xCCE0 }, { 0x9512, 0xEFB6 },
+	{ 0x9513, 0xEFB7 }, { 0x9514, 0xEFB8 }, { 0x9515, 0xEFB9 }, { 0x9516, 0xEFBA }, { 0x9517, 0xD5E0 }, { 0x9518, 0xEFBB }, { 0x9519, 0xB4ED }, { 0x951A, 0xC3AA },
+	{ 0x951B, 0xEFBC }, { 0x951D, 0xEFBD }, { 0x951E, 0xEFBE }, { 0x951F, 0xEFBF }, { 0x9521, 0xCEFD }, { 0x9522, 0xEFC0 }, { 0x9523, 0xC2E0 }, { 0x9524, 0xB4B8 },
+	{ 0x9525, 0xD7B6 }, { 0x9526, 0xBDF5 }, { 0x9528, 0xCFC7 }, { 0x9529, 0xEFC3 }, { 0x952A, 0xEFC1 }, { 0x952B, 0xEFC2 }, { 0x952C, 0xEFC4 }, { 0x952D, 0xB6A7 },
+	{ 0x952E, 0xBCFC }, { 0x952F, 0xBEE2 }, { 0x9530, 0xC3CC }, { 0x9531, 0xEFC5 }, { 0x9532, 0xEFC6 }, { 0x9534, 0xEFC7 }, { 0x9535, 0xEFCF }, { 0x9536, 0xEFC8 },
+	{ 0x9537, 0xEFC9 }, { 0x9538, 0xEFCA }, { 0x9539, 0xC7C2 }, { 0x953A, 0xEFF1 }, { 0x953B, 0xB6CD }, { 0x953C, 0xEFCB }, { 0x953E, 0xEFCC }, { 0x953F, 0xEFCD },
+	{ 0x9540, 0xB6C6 }, { 0x9541, 0xC3BE }, { 0x9542, 0xEFCE }, { 0x9544, 0xEFD0 }, { 0x9545, 0xEFD1 }, { 0x9546, 0xEFD2 }, { 0x9547, 0xD5F2 }, { 0x9549, 0xEFD3 },
+	{ 0x954A, 0xC4F7 }, { 0x954C, 0xEFD4 }, { 0x954D, 0xC4F8 }, { 0x954E, 0xEFD5 }, { 0x954F, 0xEFD6 }, { 0x9550, 0xB8E4 }, { 0x9551, 0xB0F7 }, { 0x9552, 0xEFD7 },
+	{ 0x9553, 0xEFD8 }, { 0x9554, 0xEFD9 }, { 0x9556, 0xEFDA }, { 0x9557, 0xEFDB }, { 0x9558, 0xEFDC }, { 0x9559, 0xEFDD }, { 0x955B, 0xEFDE }, { 0x955C, 0xBEB5 },
+	{ 0x955D, 0xEFE1 }, { 0x955E, 0xEFDF }, { 0x955F, 0xEFE0 }, { 0x9561, 0xEFE2 }, { 0x9562, 0xEFE3 }, { 0x9563, 0xC1CD }, { 0x9564, 0xEFE4 }, { 0x9565, 0xEFE5 },
+	{ 0x9566, 0xEFE6 }, { 0x9567, 0xEFE7 }, { 0x9568, 0xEFE8 }, { 0x9569, 0xEFE9 }, { 0x956A, 0xEFEA }, { 0x956B, 0xEFEB }, { 0x956C, 0xEFEC }, { 0x956D, 0xC0D8 },
+	{ 0x956F, 0xEFED }, { 0x9570, 0xC1AD }, { 0x9571, 0xEFEE }, { 0x9572, 0xEFEF }, { 0x9573, 0xEFF0 }, { 0x9576, 0xCFE2 }, { 0x957F, 0xB3A4 }, { 0x95E8, 0xC3C5 },
+	{ 0x95E9, 0xE3C5 }, { 0x95EA, 0xC9C1 }, { 0x95EB, 0xE3C6 }, { 0x95ED, 0xB1D5 }, { 0x95EE, 0xCECA }, { 0x95EF, 0xB4B3 }, { 0x95F0, 0xC8F2 }, { 0x95F1, 0xE3C7 },
+	{ 0x95F2, 0xCFD0 }, { 0x95F3, 0xE3C8 }, { 0x95F4, 0xBCE4 }, { 0x95F5, 0xE3C9 }, { 0x95F6, 0xE3CA }, { 0x95F7, 0xC3C6 }, { 0x95F8, 0xD5A2 }, { 0x95F9, 0xC4D6 },
+	{ 0x95FA, 0xB9EB }, { 0x95FB, 0xCEC5 }, { 0x95FC, 0xE3CB }, { 0x95FD, 0xC3F6 }, { 0x95FE, 0xE3CC }, { 0x9600, 0xB7A7 }, { 0x9601, 0xB8F3 }, { 0x9602, 0xBAD2 },
+	{ 0x9603, 0xE3CD }, { 0x9604, 0xE3CE }, { 0x9605, 0xD4C4 }, { 0x9606, 0xE3CF }, { 0x9608, 0xE3D0 }, { 0x9609, 0xD1CB }, { 0x960A, 0xE3D1 }, { 0x960B, 0xE3D2 },
+	{ 0x960C, 0xE3D3 }, { 0x960D, 0xE3D4 }, { 0x960E, 0xD1D6 }, { 0x960F, 0xE3D5 }, { 0x9610, 0xB2FB }, { 0x9611, 0xC0BB }, { 0x9612, 0xE3D6 }, { 0x9614, 0xC0AB },
+	{ 0x9615, 0xE3D7 }, { 0x9616, 0xE3D8 }, { 0x9617, 0xE3D9 }, { 0x9619, 0xE3DA }, { 0x961A, 0xE3DB }, { 0x961C, 0xB8B7 }, { 0x961D, 0xDAE2 }, { 0x961F, 0xB6D3 },
+	{ 0x9621, 0xDAE4 }, { 0x9622, 0xDAE3 }, { 0x962A, 0xDAE6 }, { 0x962E, 0xC8EE }, { 0x9631, 0xDAE5 }, { 0x9632, 0xB7C0 }, { 0x9633, 0xD1F4 }, { 0x9634, 0xD2F5 },
+	{ 0x9635, 0xD5F3 }, { 0x9636, 0xBDD7 }, { 0x963B, 0xD7E8 }, { 0x963C, 0xDAE8 }, { 0x963D, 0xDAE7 }, { 0x963F, 0xB0A2 }, { 0x9640, 0xCDD3 }, { 0x9642, 0xDAE9 },
+	{ 0x9644, 0xB8BD }, { 0x9645, 0xBCCA }, { 0x9646, 0xC2BD }, { 0x9647, 0xC2A4 }, { 0x9648, 0xB3C2 }, { 0x9649, 0xDAEA }, { 0x964B, 0xC2AA }, { 0x964C, 0xC4B0 },
+	{ 0x964D, 0xBDB5 }, { 0x9650, 0xCFDE }, { 0x9654, 0xDAEB }, { 0x9655, 0xC9C2 }, { 0x965B, 0xB1DD }, { 0x965F, 0xDAEC }, { 0x9661, 0xB6B8 }, { 0x9662, 0xD4BA },
+	{ 0x9664, 0xB3FD }, { 0x9667, 0xDAED }, { 0x9668, 0xD4C9 }, { 0x9669, 0xCFD5 }, { 0x966A, 0xC5E3 }, { 0x966C, 0xDAEE }, { 0x9672, 0xDAEF }, { 0x9674, 0xDAF0 },
+	{ 0x9675, 0xC1EA }, { 0x9676, 0xCCD5 }, { 0x9677, 0xCFDD }, { 0x9685, 0xD3E7 }, { 0x9686, 0xC2A1 }, { 0x9688, 0xDAF1 }, { 0x968B, 0xCBE5 }, { 0x968D, 0xDAF2 },
+	{ 0x968F, 0xCBE6 }, { 0x9690, 0xD2FE }, { 0x9694, 0xB8F4 }, { 0x9697, 0xDAF3 }, { 0x9698, 0xB0AF }, { 0x9699, 0xCFB6 }, { 0x969C, 0xD5CF }, { 0x96A7, 0xCBED },
+	{ 0x96B0, 0xDAF4 }, { 0x96B3, 0xE3C4 }, { 0x96B6, 0xC1A5 }, { 0x96B9, 0xF6BF }, { 0x96BC, 0xF6C0 }, { 0x96BD, 0xF6C1 }, { 0x96BE, 0xC4D1 }, { 0x96C0, 0xC8B8 },
+	{ 0x96C1, 0xD1E3 }, { 0x96C4, 0xD0DB }, { 0x96C5, 0xD1C5 }, { 0x96C6, 0xBCAF }, { 0x96C7, 0xB9CD }, { 0x96C9, 0xEFF4 }, { 0x96CC, 0xB4C6 }, { 0x96CD, 0xD3BA },
+	{ 0x96CE, 0xF6C2 }, { 0x96CF, 0xB3FB }, { 0x96D2, 0xF6C3 }, { 0x96D5, 0xB5F1 }, { 0x96E0, 0xF6C5 }, { 0x96E8, 0xD3EA }, { 0x96E9, 0xF6A7 }, { 0x96EA, 0xD1A9 },
+	{ 0x96EF, 0xF6A9 }, { 0x96F3, 0xF6A8 }, { 0x96F6, 0xC1E3 }, { 0x96F7, 0xC0D7 }, { 0x96F9, 0xB1A2 }, { 0x96FE, 0xCEED }, { 0x9700, 0xD0E8 }, { 0x9701, 0xF6AB },
+	{ 0x9704, 0xCFF6 }, { 0x9706, 0xF6AA }, { 0x9707, 0xD5F0 }, { 0x9708, 0xF6AC }, { 0x9709, 0xC3B9 }, { 0x970D, 0xBBF4 }, { 0x970E, 0xF6AE }, { 0x970F, 0xF6AD },
+	{ 0x9713, 0xC4DE }, { 0x9716, 0xC1D8 }, { 0x971C, 0xCBAA }, { 0x971E, 0xCFBC }, { 0x972A, 0xF6AF }, { 0x972D, 0xF6B0 }, { 0x9730, 0xF6B1 }, { 0x9732, 0xC2B6 },
+	{ 0x9738, 0xB0D4 }, { 0x9739, 0xC5F9 }, { 0x973E, 0xF6B2 }, { 0x9752, 0xC7E0 }, { 0x9753, 0xF6A6 }, { 0x9756, 0xBEB8 }, { 0x9759, 0xBEB2 }, { 0x975B, 0xB5E5 },
+	{ 0x975E, 0xB7C7 }, { 0x9760, 0xBFBF }, { 0x9761, 0xC3D2 }, { 0x9762, 0xC3E6 }, { 0x9765, 0xD8CC }, { 0x9769, 0xB8EF }, { 0x9773, 0xBDF9 }, { 0x9774, 0xD1A5 },
+	{ 0x9776, 0xB0D0 }, { 0x977C, 0xF7B0 }, { 0x9785, 0xF7B1 }, { 0x978B, 0xD0AC }, { 0x978D, 0xB0B0 }, { 0x9791, 0xF7B2 }, { 0x9792, 0xF7B3 }, { 0x9794, 0xF7B4 },
+	{ 0x9798, 0xC7CA }, { 0x97A0, 0xBECF }, { 0x97A3, 0xF7B7 }, { 0x97AB, 0xF7B6 }, { 0x97AD, 0xB1DE }, { 0x97AF, 0xF7B5 }, { 0x97B2, 0xF7B8 }, { 0x97B4, 0xF7B9 },
+	{ 0x97E6, 0xCEA4 }, { 0x97E7, 0xC8CD }, { 0x97E9, 0xBAAB }, { 0x97EA, 0xE8B8 }, { 0x97EB, 0xE8B9 }, { 0x97EC, 0xE8BA }, { 0x97ED, 0xBEC2 }, { 0x97F3, 0xD2F4 },
+	{ 0x97F5, 0xD4CF }, { 0x97F6, 0xC9D8 }, { 0x9875, 0xD2B3 }, { 0x9876, 0xB6A5 }, { 0x9877, 0xC7EA }, { 0x9878, 0xF1FC }, { 0x9879, 0xCFEE }, { 0x987A, 0xCBB3 },
+	{ 0x987B, 0xD0EB }, { 0x987C, 0xE7EF }, { 0x987D, 0xCDE7 }, { 0x987E, 0xB9CB }, { 0x987F, 0xB6D9 }, { 0x9880, 0xF1FD }, { 0x9881, 0xB0E4 }, { 0x9882, 0xCBCC },
+	{ 0x9883, 0xF1FE }, { 0x9884, 0xD4A4 }, { 0x9885, 0xC2AD }, { 0x9886, 0xC1EC }, { 0x9887, 0xC6C4 }, { 0x9888, 0xBEB1 }, { 0x9889, 0xF2A1 }, { 0x988A, 0xBCD5 },
+	{ 0x988C, 0xF2A2 }, { 0x988D, 0xF2A3 }, { 0x988F, 0xF2A4 }, { 0x9890, 0xD2C3 }, { 0x9891, 0xC6B5 }, { 0x9893, 0xCDC7 }, { 0x9894, 0xF2A5 }, { 0x9896, 0xD3B1 },
+	{ 0x9897, 0xBFC5 }, { 0x9898, 0xCCE2 }, { 0x989A, 0xF2A6 }, { 0x989B, 0xF2A7 }, { 0x989C, 0xD1D5 }, { 0x989D, 0xB6EE }, { 0x989E, 0xF2A8 }, { 0x989F, 0xF2A9 },
+	{ 0x98A0, 0xB5DF }, { 0x98A1, 0xF2AA }, { 0x98A2, 0xF2AB }, { 0x98A4, 0xB2FC }, { 0x98A5, 0xF2AC }, { 0x98A6, 0xF2AD }, { 0x98A7, 0xC8A7 }, { 0x98CE, 0xB7E7 },
+	{ 0x98D1, 0xECA9 }, { 0x98D2, 0xECAA }, { 0x98D3, 0xECAB }, { 0x98D5, 0xECAC }, { 0x98D8, 0xC6AE }, { 0x98D9, 0xECAD }, { 0x98DA, 0xECAE }, { 0x98DE, 0xB7C9 },
+	{ 0x98DF, 0xCAB3 }, { 0x98E7, 0xE2B8 }, { 0x98E8, 0xF7CF }, { 0x990D, 0xF7D0 }, { 0x9910, 0xB2CD }, { 0x992E, 0xF7D1 }, { 0x9954, 0xF7D3 }, { 0x9955, 0xF7D2 },
+	{ 0x9963, 0xE2BB }, { 0x9965, 0xBCA2 }, { 0x9967, 0xE2BC }, { 0x9968, 0xE2BD }, { 0x9969, 0xE2BE }, { 0x996A, 0xE2BF }, { 0x996B, 0xE2C0 }, { 0x996C, 0xE2C1 },
+	{ 0x996D, 0xB7B9 }, { 0x996E, 0xD2FB }, { 0x996F, 0xBDA4 }, { 0x9970, 0xCACE }, { 0x9971, 0xB1A5 }, { 0x9972, 0xCBC7 }, { 0x9974, 0xE2C2 }, { 0x9975, 0xB6FC },
+	{ 0x9976, 0xC8C4 }, { 0x9977, 0xE2C3 }, { 0x997A, 0xBDC8 }, { 0x997C, 0xB1FD }, { 0x997D, 0xE2C4 }, { 0x997F, 0xB6F6 }, { 0x9980, 0xE2C5 }, { 0x9981, 0xC4D9 },
+	{ 0x9984, 0xE2C6 }, { 0x9985, 0xCFDA }, { 0x9986, 0xB9DD }, { 0x9987, 0xE2C7 }, { 0x9988, 0xC0A1 }, { 0x998A, 0xE2C8 }, { 0x998B, 0xB2F6 }, { 0x998D, 0xE2C9 },
+	{ 0x998F, 0xC1F3 }, { 0x9990, 0xE2CA }, { 0x9991, 0xE2CB }, { 0x9992, 0xC2F8 }, { 0x9993, 0xE2CC }, { 0x9994, 0xE2CD }, { 0x9995, 0xE2CE }, { 0x9996, 0xCAD7 },
+	{ 0x9997, 0xD8B8 }, { 0x9998, 0xD9E5 }, { 0x9999, 0xCFE3 }, { 0x99A5, 0xF0A5 }, { 0x99A8, 0xDCB0 }, { 0x9A6C, 0xC2ED }, { 0x9A6D, 0xD4A6 }, { 0x9A6E, 0xCDD4 },
+	{ 0x9A6F, 0xD1B1 }, { 0x9A70, 0xB3DB }, { 0x9A71, 0xC7FD }, { 0x9A73, 0xB2B5 }, { 0x9A74, 0xC2BF }, { 0x9A75, 0xE6E0 }, { 0x9A76, 0xCABB }, { 0x9A77, 0xE6E1 },
+	{ 0x9A78, 0xE6E2 }, { 0x9A79, 0xBED4 }, { 0x9A7A, 0xE6E3 }, { 0x9A7B, 0xD7A4 }, { 0x9A7C, 0xCDD5 }, { 0x9A7D, 0xE6E5 }, { 0x9A7E, 0xBCDD }, { 0x9A7F, 0xE6E4 },
+	{ 0x9A80, 0xE6E6 }, { 0x9A81, 0xE6E7 }, { 0x9A82, 0xC2EE }, { 0x9A84, 0xBDBE }, { 0x9A85, 0xE6E8 }, { 0x9A86, 0xC2E6 }, { 0x9A87, 0xBAA7 }, { 0x9A88, 0xE6E9 },
+	{ 0x9A8A, 0xE6EA }, { 0x9A8B, 0xB3D2 }, { 0x9A8C, 0xD1E9 }, { 0x9A8F, 0xBFA5 }, { 0x9A90, 0xE6EB }, { 0x9A91, 0xC6EF }, { 0x9A92, 0xE6EC }, { 0x9A93, 0xE6ED },
+	{ 0x9A96, 0xE6EE }, { 0x9A97, 0xC6AD }, { 0x9A98, 0xE6EF }, { 0x9A9A, 0xC9A7 }, { 0x9A9B, 0xE6F0 }, { 0x9A9C, 0xE6F1 }, { 0x9A9D, 0xE6F2 }, { 0x9A9E, 0xE5B9 },
+	{ 0x9A9F, 0xE6F3 }, { 0x9AA0, 0xE6F4 }, { 0x9AA1, 0xC2E2 }, { 0x9AA2, 0xE6F5 }, { 0x9AA3, 0xE6F6 }, { 0x9AA4, 0xD6E8 }, { 0x9AA5, 0xE6F7 }, { 0x9AA7, 0xE6F8 },
+	{ 0x9AA8, 0xB9C7 }, { 0x9AB0, 0xF7BB }, { 0x9AB1, 0xF7BA }, { 0x9AB6, 0xF7BE }, { 0x9AB7, 0xF7BC }, { 0x9AB8, 0xBAA1 }, { 0x9ABA, 0xF7BF }, { 0x9ABC, 0xF7C0 },
+	{ 0x9AC0, 0xF7C2 }, { 0x9AC1, 0xF7C1 }, { 0x9AC2, 0xF7C4 }, { 0x9AC5, 0xF7C3 }, { 0x9ACB, 0xF7C5 }, { 0x9ACC, 0xF7C6 }, { 0x9AD1, 0xF7C7 }, { 0x9AD3, 0xCBE8 },
+	{ 0x9AD8, 0xB8DF }, { 0x9ADF, 0xF7D4 }, { 0x9AE1, 0xF7D5 }, { 0x9AE6, 0xF7D6 }, { 0x9AEB, 0xF7D8 }, { 0x9AED, 0xF7DA }, { 0x9AEF, 0xF7D7 }, { 0x9AF9, 0xF7DB },
+	{ 0x9AFB, 0xF7D9 }, { 0x9B03, 0xD7D7 }, { 0x9B08, 0xF7DC }, { 0x9B0F, 0xF7DD }, { 0x9B13, 0xF7DE }, { 0x9B1F, 0xF7DF }, { 0x9B23, 0xF7E0 }, { 0x9B2F, 0xDBCB },
+	{ 0x9B32, 0xD8AA }, { 0x9B3B, 0xE5F7 }, { 0x9B3C, 0xB9ED }, { 0x9B41, 0xBFFD }, { 0x9B42, 0xBBEA }, { 0x9B43, 0xF7C9 }, { 0x9B44, 0xC6C7 }, { 0x9B45, 0xF7C8 },
+	{ 0x9B47, 0xF7CA }, { 0x9B48, 0xF7CC }, { 0x9B49, 0xF7CB }, { 0x9B4D, 0xF7CD }, { 0x9B4F, 0xCEBA }, { 0x9B51, 0xF7CE }, { 0x9B54, 0xC4A7 }, { 0x9C7C, 0xD3E3 },
+	{ 0x9C7F, 0xF6CF }, { 0x9C81, 0xC2B3 }, { 0x9C82, 0xF6D0 }, { 0x9C85, 0xF6D1 }, { 0x9C86, 0xF6D2 }, { 0x9C87, 0xF6D3 }, { 0x9C88, 0xF6D4 }, { 0x9C8B, 0xF6D6 },
+	{ 0x9C8D, 0xB1AB }, { 0x9C8E, 0xF6D7 }, { 0x9C90, 0xF6D8 }, { 0x9C91, 0xF6D9 }, { 0x9C92, 0xF6DA }, { 0x9C94, 0xF6DB }, { 0x9C95, 0xF6DC }, { 0x9C9A, 0xF6DD },
+	{ 0x9C9B, 0xF6DE }, { 0x9C9C, 0xCFCA }, { 0x9C9E, 0xF6DF }, { 0x9C9F, 0xF6E0 }, { 0x9CA0, 0xF6E1 }, { 0x9CA1, 0xF6E2 }, { 0x9CA2, 0xF6E3 }, { 0x9CA3, 0xF6E4 },
+	{ 0x9CA4, 0xC0F0 }, { 0x9CA5, 0xF6E5 }, { 0x9CA6, 0xF6E6 }, { 0x9CA7, 0xF6E7 }, { 0x9CA8, 0xF6E8 }, { 0x9CA9, 0xF6E9 }, { 0x9CAB, 0xF6EA }, { 0x9CAD, 0xF6EB },
+	{ 0x9CAE, 0xF6EC }, { 0x9CB0, 0xF6ED }, { 0x9CB1, 0xF6EE }, { 0x9CB2, 0xF6EF }, { 0x9CB3, 0xF6F0 }, { 0x9CB4, 0xF6F1 }, { 0x9CB5, 0xF6F2 }, { 0x9CB6, 0xF6F3 },
+	{ 0x9CB7, 0xF6F4 }, { 0x9CB8, 0xBEA8 }, { 0x9CBA, 0xF6F5 }, { 0x9CBB, 0xF6F6 }, { 0x9CBC, 0xF6F7 }, { 0x9CBD, 0xF6F8 }, { 0x9CC3, 0xC8FA }, { 0x9CC4, 0xF6F9 },
+	{ 0x9CC5, 0xF6FA }, { 0x9CC6, 0xF6FB }, { 0x9CC7, 0xF6FC }, { 0x9CCA, 0xF6FD }, { 0x9CCB, 0xF6FE }, { 0x9CCC, 0xF7A1 }, { 0x9CCD, 0xF7A2 }, { 0x9CCE, 0xF7A3 },
+	{ 0x9CCF, 0xF7A4 }, { 0x9CD0, 0xF7A5 }, { 0x9CD3, 0xF7A6 }, { 0x9CD4, 0xF7A7 }, { 0x9CD5, 0xF7A8 }, { 0x9CD6, 0xB1EE }, { 0x9CD7, 0xF7A9 }, { 0x9CD8, 0xF7AA },
+	{ 0x9CD9, 0xF7AB }, { 0x9CDC, 0xF7AC }, { 0x9CDD, 0xF7AD }, { 0x9CDE, 0xC1DB }, { 0x9CDF, 0xF7AE }, { 0x9CE2, 0xF7AF }, { 0x9E1F, 0xC4F1 }, { 0x9E20, 0xF0AF },
+	{ 0x9E21, 0xBCA6 }, { 0x9E22, 0xF0B0 }, { 0x9E23, 0xC3F9 }, { 0x9E25, 0xC5B8 }, { 0x9E26, 0xD1BB }, { 0x9E28, 0xF0B1 }, { 0x9E29, 0xF0B2 }, { 0x9E2A, 0xF0B3 },
+	{ 0x9E2B, 0xF0B4 }, { 0x9E2C, 0xF0B5 }, { 0x9E2D, 0xD1BC }, { 0x9E2F, 0xD1EC }, { 0x9E31, 0xF0B7 }, { 0x9E32, 0xF0B6 }, { 0x9E33, 0xD4A7 }, { 0x9E35, 0xCDD2 },
+	{ 0x9E36, 0xF0B8 }, { 0x9E37, 0xF0BA }, { 0x9E38, 0xF0B9 }, { 0x9E39, 0xF0BB }, { 0x9E3A, 0xF0BC }, { 0x9E3D, 0xB8EB }, { 0x9E3E, 0xF0BD }, { 0x9E3F, 0xBAE8 },
+	{ 0x9E41, 0xF0BE }, { 0x9E42, 0xF0BF }, { 0x9E43, 0xBEE9 }, { 0x9E44, 0xF0C0 }, { 0x9E45, 0xB6EC }, { 0x9E46, 0xF0C1 }, { 0x9E47, 0xF0C2 }, { 0x9E48, 0xF0C3 },
+	{ 0x9E49, 0xF0C4 }, { 0x9E4A, 0xC8B5 }, { 0x9E4B, 0xF0C5 }, { 0x9E4C, 0xF0C6 }, { 0x9E4E, 0xF0C7 }, { 0x9E4F, 0xC5F4 }, { 0x9E51, 0xF0C8 }, { 0x9E55, 0xF0C9 },
+	{ 0x9E57, 0xF0CA }, { 0x9E58, 0xF7BD }, { 0x9E5A, 0xF0CB }, { 0x9E5B, 0xF0CC }, { 0x9E5C, 0xF0CD }, { 0x9E5E, 0xF0CE }, { 0x9E63, 0xF0CF }, { 0x9E64, 0xBAD7 },
+	{ 0x9E66, 0xF0D0 }, { 0x9E67, 0xF0D1 }, { 0x9E68, 0xF0D2 }, { 0x9E69, 0xF0D3 }, { 0x9E6A, 0xF0D4 }, { 0x9E6B, 0xF0D5 }, { 0x9E6C, 0xF0D6 }, { 0x9E6D, 0xF0D8 },
+	{ 0x9E70, 0xD3A5 }, { 0x9E71, 0xF0D7 }, { 0x9E73, 0xF0D9 }, { 0x9E7E, 0xF5BA }, { 0x9E7F, 0xC2B9 }, { 0x9E82, 0xF7E4 }, { 0x9E87, 0xF7E5 }, { 0x9E88, 0xF7E6 },
+	{ 0x9E8B, 0xF7E7 }, { 0x9E92, 0xF7E8 }, { 0x9E93, 0xC2B4 }, { 0x9E9D, 0xF7EA }, { 0x9E9F, 0xF7EB }, { 0x9EA6, 0xC2F3 }, { 0x9EB4, 0xF4F0 }, { 0x9EB8, 0xF4EF },
+	{ 0x9EBB, 0xC2E9 }, { 0x9EBD, 0xF7E1 }, { 0x9EBE, 0xF7E2 }, { 0x9EC4, 0xBBC6 }, { 0x9EC9, 0xD9E4 }, { 0x9ECD, 0xCAF2 }, { 0x9ECE, 0xC0E8 }, { 0x9ECF, 0xF0A4 },
+	{ 0x9ED1, 0xBADA }, { 0x9ED4, 0xC7AD }, { 0x9ED8, 0xC4AC }, { 0x9EDB, 0xF7EC }, { 0x9EDC, 0xF7ED }, { 0x9EDD, 0xF7EE }, { 0x9EDF, 0xF7F0 }, { 0x9EE0, 0xF7EF },
+	{ 0x9EE2, 0xF7F1 }, { 0x9EE5, 0xF7F4 }, { 0x9EE7, 0xF7F3 }, { 0x9EE9, 0xF7F2 }, { 0x9EEA, 0xF7F5 }, { 0x9EEF, 0xF7F6 }, { 0x9EF9, 0xEDE9 }, { 0x9EFB, 0xEDEA },
+	{ 0x9EFC, 0xEDEB }, { 0x9EFE, 0xF6BC }, { 0x9F0B, 0xF6BD }, { 0x9F0D, 0xF6BE }, { 0x9F0E, 0xB6A6 }, { 0x9F10, 0xD8BE }, { 0x9F13, 0xB9C4 }, { 0x9F17, 0xD8BB },
+	{ 0x9F19, 0xDCB1 }, { 0x9F20, 0xCAF3 }, { 0x9F22, 0xF7F7 }, { 0x9F2C, 0xF7F8 }, { 0x9F2F, 0xF7F9 }, { 0x9F37, 0xF7FB }, { 0x9F39, 0xF7FA }, { 0x9F3B, 0xB1C7 },
+	{ 0x9F3D, 0xF7FC }, { 0x9F3E, 0xF7FD }, { 0x9F44, 0xF7FE }, { 0x9F50, 0xC6EB }, { 0x9F51, 0xECB4 }, { 0x9F7F, 0xB3DD }, { 0x9F80, 0xF6B3 }, { 0x9F83, 0xF6B4 },
+	{ 0x9F84, 0xC1E4 }, { 0x9F85, 0xF6B5 }, { 0x9F86, 0xF6B6 }, { 0x9F87, 0xF6B7 }, { 0x9F88, 0xF6B8 }, { 0x9F89, 0xF6B9 }, { 0x9F8A, 0xF6BA }, { 0x9F8B, 0xC8A3 },
+	{ 0x9F8C, 0xF6BB }, { 0x9F99, 0xC1FA }, { 0x9F9A, 0xB9A8 }, { 0x9F9B, 0xEDE8 }, { 0x9F9F, 0xB9EA }, { 0x9FA0, 0xD9DF }, { 0xF880, 0x0081 }, { 0xF881, 0x0082 },
+	{ 0xFE31, 0xA6F2 }, { 0xFE33, 0xA6F4 }, { 0xFE34, 0xA6F5 }, { 0xFE35, 0xA6E0 }, { 0xFE36, 0xA6E1 }, { 0xFE37, 0xA6F0 }, { 0xFE38, 0xA6F1 }, { 0xFE39, 0xA6E2 },
+	{ 0xFE3A, 0xA6E3 }, { 0xFE3B, 0xA6EE }, { 0xFE3C, 0xA6EF }, { 0xFE3D, 0xA6E6 }, { 0xFE3E, 0xA6E7 }, { 0xFE3F, 0xA6E4 }, { 0xFE40, 0xA6E5 }, { 0xFE41, 0xA6E8 },
+	{ 0xFE42, 0xA6E9 }, { 0xFE43, 0xA6EA }, { 0xFE44, 0xA6EB }, { 0xFF01, 0xA3A1 }, { 0xFF02, 0xA3A2 }, { 0xFF03, 0xA3A3 }, { 0xFF04, 0xA1E7 }, { 0xFF05, 0xA3A5 },
+	{ 0xFF06, 0xA3A6 }, { 0xFF07, 0xA3A7 }, { 0xFF08, 0xA3A8 }, { 0xFF09, 0xA3A9 }, { 0xFF0A, 0xA3AA }, { 0xFF0B, 0xA3AB }, { 0xFF0C, 0xA3AC }, { 0xFF0D, 0xA3AD },
+	{ 0xFF0E, 0xA3AE }, { 0xFF0F, 0xA3AF }, { 0xFF10, 0xA3B0 }, { 0xFF11, 0xA3B1 }, { 0xFF12, 0xA3B2 }, { 0xFF13, 0xA3B3 }, { 0xFF14, 0xA3B4 }, { 0xFF15, 0xA3B5 },
+	{ 0xFF16, 0xA3B6 }, { 0xFF17, 0xA3B7 }, { 0xFF18, 0xA3B8 }, { 0xFF19, 0xA3B9 }, { 0xFF1A, 0xA3BA }, { 0xFF1B, 0xA3BB }, { 0xFF1C, 0xA3BC }, { 0xFF1D, 0xA3BD },
+	{ 0xFF1E, 0xA3BE }, { 0xFF1F, 0xA3BF }, { 0xFF20, 0xA3C0 }, { 0xFF21, 0xA3C1 }, { 0xFF22, 0xA3C2 }, { 0xFF23, 0xA3C3 }, { 0xFF24, 0xA3C4 }, { 0xFF25, 0xA3C5 },
+	{ 0xFF26, 0xA3C6 }, { 0xFF27, 0xA3C7 }, { 0xFF28, 0xA3C8 }, { 0xFF29, 0xA3C9 }, { 0xFF2A, 0xA3CA }, { 0xFF2B, 0xA3CB }, { 0xFF2C, 0xA3CC }, { 0xFF2D, 0xA3CD },
+	{ 0xFF2E, 0xA3CE }, { 0xFF2F, 0xA3CF }, { 0xFF30, 0xA3D0 }, { 0xFF31, 0xA3D1 }, { 0xFF32, 0xA3D2 }, { 0xFF33, 0xA3D3 }, { 0xFF34, 0xA3D4 }, { 0xFF35, 0xA3D5 },
+	{ 0xFF36, 0xA3D6 }, { 0xFF37, 0xA3D7 }, { 0xFF38, 0xA3D8 }, { 0xFF39, 0xA3D9 }, { 0xFF3A, 0xA3DA }, { 0xFF3B, 0xA3DB }, { 0xFF3C, 0xA3DC }, { 0xFF3D, 0xA3DD },
+	{ 0xFF3E, 0xA3DE }, { 0xFF3F, 0xA3DF }, { 0xFF40, 0xA3E0 }, { 0xFF41, 0xA3E1 }, { 0xFF42, 0xA3E2 }, { 0xFF43, 0xA3E3 }, { 0xFF44, 0xA3E4 }, { 0xFF45, 0xA3E5 },
+	{ 0xFF46, 0xA3E6 }, { 0xFF47, 0xA3E7 }, { 0xFF48, 0xA3E8 }, { 0xFF49, 0xA3E9 }, { 0xFF4A, 0xA3EA }, { 0xFF4B, 0xA3EB }, { 0xFF4C, 0xA3EC }, { 0xFF4D, 0xA3ED },
+	{ 0xFF4E, 0xA3EE }, { 0xFF4F, 0xA3EF }, { 0xFF50, 0xA3F0 }, { 0xFF51, 0xA3F1 }, { 0xFF52, 0xA3F2 }, { 0xFF53, 0xA3F3 }, { 0xFF54, 0xA3F4 }, { 0xFF55, 0xA3F5 },
+	{ 0xFF56, 0xA3F6 }, { 0xFF57, 0xA3F7 }, { 0xFF58, 0xA3F8 }, { 0xFF59, 0xA3F9 }, { 0xFF5A, 0xA3FA }, { 0xFF5B, 0xA3FB }, { 0xFF5C, 0xA3FC }, { 0xFF5D, 0xA3FD },
 };
 
 
diff --git a/Encodings/src/MacChineseTradEncoding.cpp b/Encodings/src/MacChineseTradEncoding.cpp
index f16f8e1f0..4ddc78152 100644
--- a/Encodings/src/MacChineseTradEncoding.cpp
+++ b/Encodings/src/MacChineseTradEncoding.cpp
@@ -25,3408 +25,3408 @@ const char* MacChineseTradEncoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap MacChineseTradEncoding::_charMap = 
+const TextEncoding::CharacterMap MacChineseTradEncoding::_charMap =
 {
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
-	    -1, 0xF880, 0xF881, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	0x00A0,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -1, 0x00A9, 0x2122, 0x2026, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1,
+	    -1, 0xF880, 0xF881, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	0x00A0,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -1, 0x00A9, 0x2122, 0x2026,
 };
 
 
 const DoubleByteEncoding::Mapping MacChineseTradEncoding::_mappingTable[] = {
-	{ 0xA140, 0x3000 }, { 0xA141, 0xFF0C }, { 0xA142, 0x3001 }, { 0xA143, 0x3002 }, { 0xA144, 0xFF0E }, { 0xA145, 0x00B7 }, { 0xA146, 0xFF1B }, { 0xA147, 0xFF1A }, 
-	{ 0xA148, 0xFF1F }, { 0xA149, 0xFF01 }, { 0xA14A, 0xFE30 }, { 0xA14B, 0x22EF }, { 0xA14C, 0x2025 }, { 0xA155, 0xFF5C }, { 0xA156, 0x2013 }, { 0xA157, 0xFE31 }, 
-	{ 0xA158, 0x2014 }, { 0xA159, 0xFE33 }, { 0xA15B, 0xFE34 }, { 0xA15C, 0xFE4F }, { 0xA15D, 0xFF08 }, { 0xA15E, 0xFF09 }, { 0xA15F, 0xFE35 }, { 0xA160, 0xFE36 }, 
-	{ 0xA161, 0xFF5B }, { 0xA162, 0xFF5D }, { 0xA163, 0xFE37 }, { 0xA164, 0xFE38 }, { 0xA165, 0x3014 }, { 0xA166, 0x3015 }, { 0xA167, 0xFE39 }, { 0xA168, 0xFE3A }, 
-	{ 0xA169, 0x3010 }, { 0xA16A, 0x3011 }, { 0xA16B, 0xFE3B }, { 0xA16C, 0xFE3C }, { 0xA16D, 0x300A }, { 0xA16E, 0x300B }, { 0xA16F, 0xFE3D }, { 0xA170, 0xFE3E }, 
-	{ 0xA171, 0x3008 }, { 0xA172, 0x3009 }, { 0xA173, 0xFE3F }, { 0xA174, 0xFE40 }, { 0xA175, 0x300C }, { 0xA176, 0x300D }, { 0xA177, 0xFE41 }, { 0xA178, 0xFE42 }, 
-	{ 0xA179, 0x300E }, { 0xA17A, 0x300F }, { 0xA17B, 0xFE43 }, { 0xA17C, 0xFE44 }, { 0xA1A5, 0x2018 }, { 0xA1A6, 0x2019 }, { 0xA1A7, 0x201C }, { 0xA1A8, 0x201D }, 
-	{ 0xA1A9, 0x301D }, { 0xA1AA, 0x301E }, { 0xA1AB, 0x2035 }, { 0xA1AC, 0x2032 }, { 0xA1AD, 0xFF03 }, { 0xA1AE, 0xFF06 }, { 0xA1AF, 0xFF0A }, { 0xA1B0, 0x203B }, 
-	{ 0xA1B1, 0x00A7 }, { 0xA1B2, 0x3003 }, { 0xA1B3, 0x25CB }, { 0xA1B4, 0x25CF }, { 0xA1B5, 0x25B3 }, { 0xA1B6, 0x25B2 }, { 0xA1B7, 0x25CE }, { 0xA1B8, 0x2606 }, 
-	{ 0xA1B9, 0x2605 }, { 0xA1BA, 0x25C7 }, { 0xA1BB, 0x25C6 }, { 0xA1BC, 0x25A1 }, { 0xA1BD, 0x25A0 }, { 0xA1BE, 0x25BD }, { 0xA1BF, 0x25BC }, { 0xA1C0, 0x32A3 }, 
-	{ 0xA1C1, 0x2105 }, { 0xA1C2, 0x203E }, { 0xA1C4, 0xFF3F }, { 0xA1C6, 0xFE49 }, { 0xA1C7, 0xFE4A }, { 0xA1C8, 0xFE4D }, { 0xA1C9, 0xFE4E }, { 0xA1CA, 0xFE4B }, 
-	{ 0xA1CC, 0xFE5F }, { 0xA1CD, 0xFE60 }, { 0xA1CE, 0xFE61 }, { 0xA1CF, 0xFF0B }, { 0xA1D0, 0xFF0D }, { 0xA1D1, 0x00D7 }, { 0xA1D2, 0x00F7 }, { 0xA1D3, 0x00B1 }, 
-	{ 0xA1D4, 0x221A }, { 0xA1D5, 0xFF1C }, { 0xA1D6, 0xFF1E }, { 0xA1D7, 0xFF1D }, { 0xA1D8, 0x2266 }, { 0xA1D9, 0x2267 }, { 0xA1DA, 0x2260 }, { 0xA1DB, 0x221E }, 
-	{ 0xA1DC, 0x2252 }, { 0xA1DD, 0x2261 }, { 0xA1DE, 0xFE62 }, { 0xA1DF, 0xFE63 }, { 0xA1E0, 0xFE64 }, { 0xA1E1, 0xFE65 }, { 0xA1E2, 0xFE66 }, { 0xA1E3, 0x223C }, 
-	{ 0xA1E4, 0x2229 }, { 0xA1E5, 0x222A }, { 0xA1E6, 0x22A5 }, { 0xA1E7, 0x2220 }, { 0xA1E8, 0x221F }, { 0xA1E9, 0x22BF }, { 0xA1EA, 0x33D2 }, { 0xA1EB, 0x33D1 }, 
-	{ 0xA1EC, 0x222B }, { 0xA1ED, 0x222E }, { 0xA1EE, 0x2235 }, { 0xA1EF, 0x2234 }, { 0xA1F0, 0x2640 }, { 0xA1F1, 0x2642 }, { 0xA1F2, 0x2295 }, { 0xA1F3, 0x2609 }, 
-	{ 0xA1F4, 0x2191 }, { 0xA1F5, 0x2193 }, { 0xA1F6, 0x2190 }, { 0xA1F7, 0x2192 }, { 0xA1F8, 0x2196 }, { 0xA1F9, 0x2197 }, { 0xA1FA, 0x2199 }, { 0xA1FB, 0x2198 }, 
-	{ 0xA1FC, 0x2225 }, { 0xA1FD, 0x2223 }, { 0xA241, 0xFF0F }, { 0xA242, 0xFF3C }, { 0xA243, 0xFF04 }, { 0xA244, 0x00A5 }, { 0xA245, 0x3012 }, { 0xA246, 0x00A2 }, 
-	{ 0xA247, 0x00A3 }, { 0xA248, 0xFF05 }, { 0xA249, 0xFF20 }, { 0xA24A, 0x2103 }, { 0xA24B, 0x2109 }, { 0xA24C, 0xFE69 }, { 0xA24D, 0xFE6A }, { 0xA24E, 0xFE6B }, 
-	{ 0xA24F, 0x33D5 }, { 0xA250, 0x339C }, { 0xA251, 0x339D }, { 0xA252, 0x339E }, { 0xA253, 0x33CE }, { 0xA254, 0x33A1 }, { 0xA255, 0x338E }, { 0xA256, 0x338F }, 
-	{ 0xA257, 0x33C4 }, { 0xA258, 0x00B0 }, { 0xA259, 0x5159 }, { 0xA25A, 0x515B }, { 0xA25B, 0x515E }, { 0xA25C, 0x515D }, { 0xA25D, 0x5161 }, { 0xA25E, 0x5163 }, 
-	{ 0xA25F, 0x55E7 }, { 0xA260, 0x74E9 }, { 0xA261, 0x7CCE }, { 0xA262, 0x2581 }, { 0xA263, 0x2582 }, { 0xA264, 0x2583 }, { 0xA265, 0x2584 }, { 0xA266, 0x2585 }, 
-	{ 0xA267, 0x2586 }, { 0xA268, 0x2587 }, { 0xA269, 0x2588 }, { 0xA26A, 0x258F }, { 0xA26B, 0x258E }, { 0xA26C, 0x258D }, { 0xA26D, 0x258C }, { 0xA26E, 0x258B }, 
-	{ 0xA26F, 0x258A }, { 0xA270, 0x2589 }, { 0xA271, 0x253C }, { 0xA272, 0x2534 }, { 0xA273, 0x252C }, { 0xA274, 0x2524 }, { 0xA275, 0x251C }, { 0xA276, 0x2594 }, 
-	{ 0xA277, 0x2500 }, { 0xA278, 0x2502 }, { 0xA27A, 0x250C }, { 0xA27B, 0x2510 }, { 0xA27C, 0x2514 }, { 0xA27D, 0x2518 }, { 0xA27E, 0x256D }, { 0xA2A1, 0x256E }, 
-	{ 0xA2A2, 0x2570 }, { 0xA2A3, 0x256F }, { 0xA2A4, 0x2550 }, { 0xA2A5, 0x255E }, { 0xA2A6, 0x256A }, { 0xA2A7, 0x2561 }, { 0xA2A8, 0x25E2 }, { 0xA2A9, 0x25E3 }, 
-	{ 0xA2AA, 0x25E5 }, { 0xA2AB, 0x25E4 }, { 0xA2AC, 0x2571 }, { 0xA2AD, 0x2572 }, { 0xA2AE, 0x2573 }, { 0xA2AF, 0xFF10 }, { 0xA2B0, 0xFF11 }, { 0xA2B1, 0xFF12 }, 
-	{ 0xA2B2, 0xFF13 }, { 0xA2B3, 0xFF14 }, { 0xA2B4, 0xFF15 }, { 0xA2B5, 0xFF16 }, { 0xA2B6, 0xFF17 }, { 0xA2B7, 0xFF18 }, { 0xA2B8, 0xFF19 }, { 0xA2B9, 0x2160 }, 
-	{ 0xA2BA, 0x2161 }, { 0xA2BB, 0x2162 }, { 0xA2BC, 0x2163 }, { 0xA2BD, 0x2164 }, { 0xA2BE, 0x2165 }, { 0xA2BF, 0x2166 }, { 0xA2C0, 0x2167 }, { 0xA2C1, 0x2168 }, 
-	{ 0xA2C2, 0x2169 }, { 0xA2C3, 0x3021 }, { 0xA2C4, 0x3022 }, { 0xA2C5, 0x3023 }, { 0xA2C6, 0x3024 }, { 0xA2C7, 0x3025 }, { 0xA2C8, 0x3026 }, { 0xA2C9, 0x3027 }, 
-	{ 0xA2CA, 0x3028 }, { 0xA2CB, 0x3029 }, { 0xA2CD, 0x5344 }, { 0xA2CF, 0xFF21 }, { 0xA2D0, 0xFF22 }, { 0xA2D1, 0xFF23 }, { 0xA2D2, 0xFF24 }, { 0xA2D3, 0xFF25 }, 
-	{ 0xA2D4, 0xFF26 }, { 0xA2D5, 0xFF27 }, { 0xA2D6, 0xFF28 }, { 0xA2D7, 0xFF29 }, { 0xA2D8, 0xFF2A }, { 0xA2D9, 0xFF2B }, { 0xA2DA, 0xFF2C }, { 0xA2DB, 0xFF2D }, 
-	{ 0xA2DC, 0xFF2E }, { 0xA2DD, 0xFF2F }, { 0xA2DE, 0xFF30 }, { 0xA2DF, 0xFF31 }, { 0xA2E0, 0xFF32 }, { 0xA2E1, 0xFF33 }, { 0xA2E2, 0xFF34 }, { 0xA2E3, 0xFF35 }, 
-	{ 0xA2E4, 0xFF36 }, { 0xA2E5, 0xFF37 }, { 0xA2E6, 0xFF38 }, { 0xA2E7, 0xFF39 }, { 0xA2E8, 0xFF3A }, { 0xA2E9, 0xFF41 }, { 0xA2EA, 0xFF42 }, { 0xA2EB, 0xFF43 }, 
-	{ 0xA2EC, 0xFF44 }, { 0xA2ED, 0xFF45 }, { 0xA2EE, 0xFF46 }, { 0xA2EF, 0xFF47 }, { 0xA2F0, 0xFF48 }, { 0xA2F1, 0xFF49 }, { 0xA2F2, 0xFF4A }, { 0xA2F3, 0xFF4B }, 
-	{ 0xA2F4, 0xFF4C }, { 0xA2F5, 0xFF4D }, { 0xA2F6, 0xFF4E }, { 0xA2F7, 0xFF4F }, { 0xA2F8, 0xFF50 }, { 0xA2F9, 0xFF51 }, { 0xA2FA, 0xFF52 }, { 0xA2FB, 0xFF53 }, 
-	{ 0xA2FC, 0xFF54 }, { 0xA2FD, 0xFF55 }, { 0xA2FE, 0xFF56 }, { 0xA340, 0xFF57 }, { 0xA341, 0xFF58 }, { 0xA342, 0xFF59 }, { 0xA343, 0xFF5A }, { 0xA344, 0x0391 }, 
-	{ 0xA345, 0x0392 }, { 0xA346, 0x0393 }, { 0xA347, 0x0394 }, { 0xA348, 0x0395 }, { 0xA349, 0x0396 }, { 0xA34A, 0x0397 }, { 0xA34B, 0x0398 }, { 0xA34C, 0x0399 }, 
-	{ 0xA34D, 0x039A }, { 0xA34E, 0x039B }, { 0xA34F, 0x039C }, { 0xA350, 0x039D }, { 0xA351, 0x039E }, { 0xA352, 0x039F }, { 0xA353, 0x03A0 }, { 0xA354, 0x03A1 }, 
-	{ 0xA355, 0x03A3 }, { 0xA356, 0x03A4 }, { 0xA357, 0x03A5 }, { 0xA358, 0x03A6 }, { 0xA359, 0x03A7 }, { 0xA35A, 0x03A8 }, { 0xA35B, 0x03A9 }, { 0xA35C, 0x03B1 }, 
-	{ 0xA35D, 0x03B2 }, { 0xA35E, 0x03B3 }, { 0xA35F, 0x03B4 }, { 0xA360, 0x03B5 }, { 0xA361, 0x03B6 }, { 0xA362, 0x03B7 }, { 0xA363, 0x03B8 }, { 0xA364, 0x03B9 }, 
-	{ 0xA365, 0x03BA }, { 0xA366, 0x03BB }, { 0xA367, 0x03BC }, { 0xA368, 0x03BD }, { 0xA369, 0x03BE }, { 0xA36A, 0x03BF }, { 0xA36B, 0x03C0 }, { 0xA36C, 0x03C1 }, 
-	{ 0xA36D, 0x03C3 }, { 0xA36E, 0x03C4 }, { 0xA36F, 0x03C5 }, { 0xA370, 0x03C6 }, { 0xA371, 0x03C7 }, { 0xA372, 0x03C8 }, { 0xA373, 0x03C9 }, { 0xA374, 0x3105 }, 
-	{ 0xA375, 0x3106 }, { 0xA376, 0x3107 }, { 0xA377, 0x3108 }, { 0xA378, 0x3109 }, { 0xA379, 0x310A }, { 0xA37A, 0x310B }, { 0xA37B, 0x310C }, { 0xA37C, 0x310D }, 
-	{ 0xA37D, 0x310E }, { 0xA37E, 0x310F }, { 0xA3A1, 0x3110 }, { 0xA3A2, 0x3111 }, { 0xA3A3, 0x3112 }, { 0xA3A4, 0x3113 }, { 0xA3A5, 0x3114 }, { 0xA3A6, 0x3115 }, 
-	{ 0xA3A7, 0x3116 }, { 0xA3A8, 0x3117 }, { 0xA3A9, 0x3118 }, { 0xA3AA, 0x3119 }, { 0xA3AB, 0x311A }, { 0xA3AC, 0x311B }, { 0xA3AD, 0x311C }, { 0xA3AE, 0x311D }, 
-	{ 0xA3AF, 0x311E }, { 0xA3B0, 0x311F }, { 0xA3B1, 0x3120 }, { 0xA3B2, 0x3121 }, { 0xA3B3, 0x3122 }, { 0xA3B4, 0x3123 }, { 0xA3B5, 0x3124 }, { 0xA3B6, 0x3125 }, 
-	{ 0xA3B7, 0x3126 }, { 0xA3B8, 0x3127 }, { 0xA3B9, 0x3128 }, { 0xA3BA, 0x3129 }, { 0xA3BB, 0x02D9 }, { 0xA3BC, 0x02C9 }, { 0xA3BD, 0x02CA }, { 0xA3BE, 0x02C7 }, 
-	{ 0xA3BF, 0x02CB }, { 0xA440, 0x4E00 }, { 0xA441, 0x4E59 }, { 0xA442, 0x4E01 }, { 0xA443, 0x4E03 }, { 0xA444, 0x4E43 }, { 0xA445, 0x4E5D }, { 0xA446, 0x4E86 }, 
-	{ 0xA447, 0x4E8C }, { 0xA448, 0x4EBA }, { 0xA449, 0x513F }, { 0xA44A, 0x5165 }, { 0xA44B, 0x516B }, { 0xA44C, 0x51E0 }, { 0xA44D, 0x5200 }, { 0xA44E, 0x5201 }, 
-	{ 0xA44F, 0x529B }, { 0xA450, 0x5315 }, { 0xA451, 0x5341 }, { 0xA452, 0x535C }, { 0xA453, 0x53C8 }, { 0xA454, 0x4E09 }, { 0xA455, 0x4E0B }, { 0xA456, 0x4E08 }, 
-	{ 0xA457, 0x4E0A }, { 0xA458, 0x4E2B }, { 0xA459, 0x4E38 }, { 0xA45A, 0x51E1 }, { 0xA45B, 0x4E45 }, { 0xA45C, 0x4E48 }, { 0xA45D, 0x4E5F }, { 0xA45E, 0x4E5E }, 
-	{ 0xA45F, 0x4E8E }, { 0xA460, 0x4EA1 }, { 0xA461, 0x5140 }, { 0xA462, 0x5203 }, { 0xA463, 0x52FA }, { 0xA464, 0x5343 }, { 0xA465, 0x53C9 }, { 0xA466, 0x53E3 }, 
-	{ 0xA467, 0x571F }, { 0xA468, 0x58EB }, { 0xA469, 0x5915 }, { 0xA46A, 0x5927 }, { 0xA46B, 0x5973 }, { 0xA46C, 0x5B50 }, { 0xA46D, 0x5B51 }, { 0xA46E, 0x5B53 }, 
-	{ 0xA46F, 0x5BF8 }, { 0xA470, 0x5C0F }, { 0xA471, 0x5C22 }, { 0xA472, 0x5C38 }, { 0xA473, 0x5C71 }, { 0xA474, 0x5DDD }, { 0xA475, 0x5DE5 }, { 0xA476, 0x5DF1 }, 
-	{ 0xA477, 0x5DF2 }, { 0xA478, 0x5DF3 }, { 0xA479, 0x5DFE }, { 0xA47A, 0x5E72 }, { 0xA47B, 0x5EFE }, { 0xA47C, 0x5F0B }, { 0xA47D, 0x5F13 }, { 0xA47E, 0x624D }, 
-	{ 0xA4A1, 0x4E11 }, { 0xA4A2, 0x4E10 }, { 0xA4A3, 0x4E0D }, { 0xA4A4, 0x4E2D }, { 0xA4A5, 0x4E30 }, { 0xA4A6, 0x4E39 }, { 0xA4A7, 0x4E4B }, { 0xA4A8, 0x5C39 }, 
-	{ 0xA4A9, 0x4E88 }, { 0xA4AA, 0x4E91 }, { 0xA4AB, 0x4E95 }, { 0xA4AC, 0x4E92 }, { 0xA4AD, 0x4E94 }, { 0xA4AE, 0x4EA2 }, { 0xA4AF, 0x4EC1 }, { 0xA4B0, 0x4EC0 }, 
-	{ 0xA4B1, 0x4EC3 }, { 0xA4B2, 0x4EC6 }, { 0xA4B3, 0x4EC7 }, { 0xA4B4, 0x4ECD }, { 0xA4B5, 0x4ECA }, { 0xA4B6, 0x4ECB }, { 0xA4B7, 0x4EC4 }, { 0xA4B8, 0x5143 }, 
-	{ 0xA4B9, 0x5141 }, { 0xA4BA, 0x5167 }, { 0xA4BB, 0x516D }, { 0xA4BC, 0x516E }, { 0xA4BD, 0x516C }, { 0xA4BE, 0x5197 }, { 0xA4BF, 0x51F6 }, { 0xA4C0, 0x5206 }, 
-	{ 0xA4C1, 0x5207 }, { 0xA4C2, 0x5208 }, { 0xA4C3, 0x52FB }, { 0xA4C4, 0x52FE }, { 0xA4C5, 0x52FF }, { 0xA4C6, 0x5316 }, { 0xA4C7, 0x5339 }, { 0xA4C8, 0x5348 }, 
-	{ 0xA4C9, 0x5347 }, { 0xA4CA, 0x5345 }, { 0xA4CB, 0x535E }, { 0xA4CC, 0x5384 }, { 0xA4CD, 0x53CB }, { 0xA4CE, 0x53CA }, { 0xA4CF, 0x53CD }, { 0xA4D0, 0x58EC }, 
-	{ 0xA4D1, 0x5929 }, { 0xA4D2, 0x592B }, { 0xA4D3, 0x592A }, { 0xA4D4, 0x592D }, { 0xA4D5, 0x5B54 }, { 0xA4D6, 0x5C11 }, { 0xA4D7, 0x5C24 }, { 0xA4D8, 0x5C3A }, 
-	{ 0xA4D9, 0x5C6F }, { 0xA4DA, 0x5DF4 }, { 0xA4DB, 0x5E7B }, { 0xA4DC, 0x5EFF }, { 0xA4DD, 0x5F14 }, { 0xA4DE, 0x5F15 }, { 0xA4DF, 0x5FC3 }, { 0xA4E0, 0x6208 }, 
-	{ 0xA4E1, 0x6236 }, { 0xA4E2, 0x624B }, { 0xA4E3, 0x624E }, { 0xA4E4, 0x652F }, { 0xA4E5, 0x6587 }, { 0xA4E6, 0x6597 }, { 0xA4E7, 0x65A4 }, { 0xA4E8, 0x65B9 }, 
-	{ 0xA4E9, 0x65E5 }, { 0xA4EA, 0x66F0 }, { 0xA4EB, 0x6708 }, { 0xA4EC, 0x6728 }, { 0xA4ED, 0x6B20 }, { 0xA4EE, 0x6B62 }, { 0xA4EF, 0x6B79 }, { 0xA4F0, 0x6BCB }, 
-	{ 0xA4F1, 0x6BD4 }, { 0xA4F2, 0x6BDB }, { 0xA4F3, 0x6C0F }, { 0xA4F4, 0x6C34 }, { 0xA4F5, 0x706B }, { 0xA4F6, 0x722A }, { 0xA4F7, 0x7236 }, { 0xA4F8, 0x723B }, 
-	{ 0xA4F9, 0x7247 }, { 0xA4FA, 0x7259 }, { 0xA4FB, 0x725B }, { 0xA4FC, 0x72AC }, { 0xA4FD, 0x738B }, { 0xA4FE, 0x4E19 }, { 0xA540, 0x4E16 }, { 0xA541, 0x4E15 }, 
-	{ 0xA542, 0x4E14 }, { 0xA543, 0x4E18 }, { 0xA544, 0x4E3B }, { 0xA545, 0x4E4D }, { 0xA546, 0x4E4F }, { 0xA547, 0x4E4E }, { 0xA548, 0x4EE5 }, { 0xA549, 0x4ED8 }, 
-	{ 0xA54A, 0x4ED4 }, { 0xA54B, 0x4ED5 }, { 0xA54C, 0x4ED6 }, { 0xA54D, 0x4ED7 }, { 0xA54E, 0x4EE3 }, { 0xA54F, 0x4EE4 }, { 0xA550, 0x4ED9 }, { 0xA551, 0x4EDE }, 
-	{ 0xA552, 0x5145 }, { 0xA553, 0x5144 }, { 0xA554, 0x5189 }, { 0xA555, 0x518A }, { 0xA556, 0x51AC }, { 0xA557, 0x51F9 }, { 0xA558, 0x51FA }, { 0xA559, 0x51F8 }, 
-	{ 0xA55A, 0x520A }, { 0xA55B, 0x52A0 }, { 0xA55C, 0x529F }, { 0xA55D, 0x5305 }, { 0xA55E, 0x5306 }, { 0xA55F, 0x5317 }, { 0xA560, 0x531D }, { 0xA561, 0x4EDF }, 
-	{ 0xA562, 0x534A }, { 0xA563, 0x5349 }, { 0xA564, 0x5361 }, { 0xA565, 0x5360 }, { 0xA566, 0x536F }, { 0xA567, 0x536E }, { 0xA568, 0x53BB }, { 0xA569, 0x53EF }, 
-	{ 0xA56A, 0x53E4 }, { 0xA56B, 0x53F3 }, { 0xA56C, 0x53EC }, { 0xA56D, 0x53EE }, { 0xA56E, 0x53E9 }, { 0xA56F, 0x53E8 }, { 0xA570, 0x53FC }, { 0xA571, 0x53F8 }, 
-	{ 0xA572, 0x53F5 }, { 0xA573, 0x53EB }, { 0xA574, 0x53E6 }, { 0xA575, 0x53EA }, { 0xA576, 0x53F2 }, { 0xA577, 0x53F1 }, { 0xA578, 0x53F0 }, { 0xA579, 0x53E5 }, 
-	{ 0xA57A, 0x53ED }, { 0xA57B, 0x53FB }, { 0xA57C, 0x56DB }, { 0xA57D, 0x56DA }, { 0xA57E, 0x5916 }, { 0xA5A1, 0x592E }, { 0xA5A2, 0x5931 }, { 0xA5A3, 0x5974 }, 
-	{ 0xA5A4, 0x5976 }, { 0xA5A5, 0x5B55 }, { 0xA5A6, 0x5B83 }, { 0xA5A7, 0x5C3C }, { 0xA5A8, 0x5DE8 }, { 0xA5A9, 0x5DE7 }, { 0xA5AA, 0x5DE6 }, { 0xA5AB, 0x5E02 }, 
-	{ 0xA5AC, 0x5E03 }, { 0xA5AD, 0x5E73 }, { 0xA5AE, 0x5E7C }, { 0xA5AF, 0x5F01 }, { 0xA5B0, 0x5F18 }, { 0xA5B1, 0x5F17 }, { 0xA5B2, 0x5FC5 }, { 0xA5B3, 0x620A }, 
-	{ 0xA5B4, 0x6253 }, { 0xA5B5, 0x6254 }, { 0xA5B6, 0x6252 }, { 0xA5B7, 0x6251 }, { 0xA5B8, 0x65A5 }, { 0xA5B9, 0x65E6 }, { 0xA5BA, 0x672E }, { 0xA5BB, 0x672C }, 
-	{ 0xA5BC, 0x672A }, { 0xA5BD, 0x672B }, { 0xA5BE, 0x672D }, { 0xA5BF, 0x6B63 }, { 0xA5C0, 0x6BCD }, { 0xA5C1, 0x6C11 }, { 0xA5C2, 0x6C10 }, { 0xA5C3, 0x6C38 }, 
-	{ 0xA5C4, 0x6C41 }, { 0xA5C5, 0x6C40 }, { 0xA5C6, 0x6C3E }, { 0xA5C7, 0x72AF }, { 0xA5C8, 0x7384 }, { 0xA5C9, 0x7389 }, { 0xA5CA, 0x74DC }, { 0xA5CB, 0x74E6 }, 
-	{ 0xA5CC, 0x7518 }, { 0xA5CD, 0x751F }, { 0xA5CE, 0x7528 }, { 0xA5CF, 0x7529 }, { 0xA5D0, 0x7530 }, { 0xA5D1, 0x7531 }, { 0xA5D2, 0x7532 }, { 0xA5D3, 0x7533 }, 
-	{ 0xA5D4, 0x758B }, { 0xA5D5, 0x767D }, { 0xA5D6, 0x76AE }, { 0xA5D7, 0x76BF }, { 0xA5D8, 0x76EE }, { 0xA5D9, 0x77DB }, { 0xA5DA, 0x77E2 }, { 0xA5DB, 0x77F3 }, 
-	{ 0xA5DC, 0x793A }, { 0xA5DD, 0x79BE }, { 0xA5DE, 0x7A74 }, { 0xA5DF, 0x7ACB }, { 0xA5E0, 0x4E1E }, { 0xA5E1, 0x4E1F }, { 0xA5E2, 0x4E52 }, { 0xA5E3, 0x4E53 }, 
-	{ 0xA5E4, 0x4E69 }, { 0xA5E5, 0x4E99 }, { 0xA5E6, 0x4EA4 }, { 0xA5E7, 0x4EA6 }, { 0xA5E8, 0x4EA5 }, { 0xA5E9, 0x4EFF }, { 0xA5EA, 0x4F09 }, { 0xA5EB, 0x4F19 }, 
-	{ 0xA5EC, 0x4F0A }, { 0xA5ED, 0x4F15 }, { 0xA5EE, 0x4F0D }, { 0xA5EF, 0x4F10 }, { 0xA5F0, 0x4F11 }, { 0xA5F1, 0x4F0F }, { 0xA5F2, 0x4EF2 }, { 0xA5F3, 0x4EF6 }, 
-	{ 0xA5F4, 0x4EFB }, { 0xA5F5, 0x4EF0 }, { 0xA5F6, 0x4EF3 }, { 0xA5F7, 0x4EFD }, { 0xA5F8, 0x4F01 }, { 0xA5F9, 0x4F0B }, { 0xA5FA, 0x5149 }, { 0xA5FB, 0x5147 }, 
-	{ 0xA5FC, 0x5146 }, { 0xA5FD, 0x5148 }, { 0xA5FE, 0x5168 }, { 0xA640, 0x5171 }, { 0xA641, 0x518D }, { 0xA642, 0x51B0 }, { 0xA643, 0x5217 }, { 0xA644, 0x5211 }, 
-	{ 0xA645, 0x5212 }, { 0xA646, 0x520E }, { 0xA647, 0x5216 }, { 0xA648, 0x52A3 }, { 0xA649, 0x5308 }, { 0xA64A, 0x5321 }, { 0xA64B, 0x5320 }, { 0xA64C, 0x5370 }, 
-	{ 0xA64D, 0x5371 }, { 0xA64E, 0x5409 }, { 0xA64F, 0x540F }, { 0xA650, 0x540C }, { 0xA651, 0x540A }, { 0xA652, 0x5410 }, { 0xA653, 0x5401 }, { 0xA654, 0x540B }, 
-	{ 0xA655, 0x5404 }, { 0xA656, 0x5411 }, { 0xA657, 0x540D }, { 0xA658, 0x5408 }, { 0xA659, 0x5403 }, { 0xA65A, 0x540E }, { 0xA65B, 0x5406 }, { 0xA65C, 0x5412 }, 
-	{ 0xA65D, 0x56E0 }, { 0xA65E, 0x56DE }, { 0xA65F, 0x56DD }, { 0xA660, 0x5733 }, { 0xA661, 0x5730 }, { 0xA662, 0x5728 }, { 0xA663, 0x572D }, { 0xA664, 0x572C }, 
-	{ 0xA665, 0x572F }, { 0xA666, 0x5729 }, { 0xA667, 0x5919 }, { 0xA668, 0x591A }, { 0xA669, 0x5937 }, { 0xA66A, 0x5938 }, { 0xA66B, 0x5984 }, { 0xA66C, 0x5978 }, 
-	{ 0xA66D, 0x5983 }, { 0xA66E, 0x597D }, { 0xA66F, 0x5979 }, { 0xA670, 0x5982 }, { 0xA671, 0x5981 }, { 0xA672, 0x5B57 }, { 0xA673, 0x5B58 }, { 0xA674, 0x5B87 }, 
-	{ 0xA675, 0x5B88 }, { 0xA676, 0x5B85 }, { 0xA677, 0x5B89 }, { 0xA678, 0x5BFA }, { 0xA679, 0x5C16 }, { 0xA67A, 0x5C79 }, { 0xA67B, 0x5DDE }, { 0xA67C, 0x5E06 }, 
-	{ 0xA67D, 0x5E76 }, { 0xA67E, 0x5E74 }, { 0xA6A1, 0x5F0F }, { 0xA6A2, 0x5F1B }, { 0xA6A3, 0x5FD9 }, { 0xA6A4, 0x5FD6 }, { 0xA6A5, 0x620E }, { 0xA6A6, 0x620C }, 
-	{ 0xA6A7, 0x620D }, { 0xA6A8, 0x6210 }, { 0xA6A9, 0x6263 }, { 0xA6AA, 0x625B }, { 0xA6AB, 0x6258 }, { 0xA6AC, 0x6536 }, { 0xA6AD, 0x65E9 }, { 0xA6AE, 0x65E8 }, 
-	{ 0xA6AF, 0x65EC }, { 0xA6B0, 0x65ED }, { 0xA6B1, 0x66F2 }, { 0xA6B2, 0x66F3 }, { 0xA6B3, 0x6709 }, { 0xA6B4, 0x673D }, { 0xA6B5, 0x6734 }, { 0xA6B6, 0x6731 }, 
-	{ 0xA6B7, 0x6735 }, { 0xA6B8, 0x6B21 }, { 0xA6B9, 0x6B64 }, { 0xA6BA, 0x6B7B }, { 0xA6BB, 0x6C16 }, { 0xA6BC, 0x6C5D }, { 0xA6BD, 0x6C57 }, { 0xA6BE, 0x6C59 }, 
-	{ 0xA6BF, 0x6C5F }, { 0xA6C0, 0x6C60 }, { 0xA6C1, 0x6C50 }, { 0xA6C2, 0x6C55 }, { 0xA6C3, 0x6C61 }, { 0xA6C4, 0x6C5B }, { 0xA6C5, 0x6C4D }, { 0xA6C6, 0x6C4E }, 
-	{ 0xA6C7, 0x7070 }, { 0xA6C8, 0x725F }, { 0xA6C9, 0x725D }, { 0xA6CA, 0x767E }, { 0xA6CB, 0x7AF9 }, { 0xA6CC, 0x7C73 }, { 0xA6CD, 0x7CF8 }, { 0xA6CE, 0x7F36 }, 
-	{ 0xA6CF, 0x7F8A }, { 0xA6D0, 0x7FBD }, { 0xA6D1, 0x8001 }, { 0xA6D2, 0x8003 }, { 0xA6D3, 0x800C }, { 0xA6D4, 0x8012 }, { 0xA6D5, 0x8033 }, { 0xA6D6, 0x807F }, 
-	{ 0xA6D7, 0x8089 }, { 0xA6D8, 0x808B }, { 0xA6D9, 0x808C }, { 0xA6DA, 0x81E3 }, { 0xA6DB, 0x81EA }, { 0xA6DC, 0x81F3 }, { 0xA6DD, 0x81FC }, { 0xA6DE, 0x820C }, 
-	{ 0xA6DF, 0x821B }, { 0xA6E0, 0x821F }, { 0xA6E1, 0x826E }, { 0xA6E2, 0x8272 }, { 0xA6E3, 0x827E }, { 0xA6E4, 0x866B }, { 0xA6E5, 0x8840 }, { 0xA6E6, 0x884C }, 
-	{ 0xA6E7, 0x8863 }, { 0xA6E8, 0x897F }, { 0xA6E9, 0x9621 }, { 0xA6EA, 0x4E32 }, { 0xA6EB, 0x4EA8 }, { 0xA6EC, 0x4F4D }, { 0xA6ED, 0x4F4F }, { 0xA6EE, 0x4F47 }, 
-	{ 0xA6EF, 0x4F57 }, { 0xA6F0, 0x4F5E }, { 0xA6F1, 0x4F34 }, { 0xA6F2, 0x4F5B }, { 0xA6F3, 0x4F55 }, { 0xA6F4, 0x4F30 }, { 0xA6F5, 0x4F50 }, { 0xA6F6, 0x4F51 }, 
-	{ 0xA6F7, 0x4F3D }, { 0xA6F8, 0x4F3A }, { 0xA6F9, 0x4F38 }, { 0xA6FA, 0x4F43 }, { 0xA6FB, 0x4F54 }, { 0xA6FC, 0x4F3C }, { 0xA6FD, 0x4F46 }, { 0xA6FE, 0x4F63 }, 
-	{ 0xA740, 0x4F5C }, { 0xA741, 0x4F60 }, { 0xA742, 0x4F2F }, { 0xA743, 0x4F4E }, { 0xA744, 0x4F36 }, { 0xA745, 0x4F59 }, { 0xA746, 0x4F5D }, { 0xA747, 0x4F48 }, 
-	{ 0xA748, 0x4F5A }, { 0xA749, 0x514C }, { 0xA74A, 0x514B }, { 0xA74B, 0x514D }, { 0xA74C, 0x5175 }, { 0xA74D, 0x51B6 }, { 0xA74E, 0x51B7 }, { 0xA74F, 0x5225 }, 
-	{ 0xA750, 0x5224 }, { 0xA751, 0x5229 }, { 0xA752, 0x522A }, { 0xA753, 0x5228 }, { 0xA754, 0x52AB }, { 0xA755, 0x52A9 }, { 0xA756, 0x52AA }, { 0xA757, 0x52AC }, 
-	{ 0xA758, 0x5323 }, { 0xA759, 0x5373 }, { 0xA75A, 0x5375 }, { 0xA75B, 0x541D }, { 0xA75C, 0x542D }, { 0xA75D, 0x541E }, { 0xA75E, 0x543E }, { 0xA75F, 0x5426 }, 
-	{ 0xA760, 0x544E }, { 0xA761, 0x5427 }, { 0xA762, 0x5446 }, { 0xA763, 0x5443 }, { 0xA764, 0x5433 }, { 0xA765, 0x5448 }, { 0xA766, 0x5442 }, { 0xA767, 0x541B }, 
-	{ 0xA768, 0x5429 }, { 0xA769, 0x544A }, { 0xA76A, 0x5439 }, { 0xA76B, 0x543B }, { 0xA76C, 0x5438 }, { 0xA76D, 0x542E }, { 0xA76E, 0x5435 }, { 0xA76F, 0x5436 }, 
-	{ 0xA770, 0x5420 }, { 0xA771, 0x543C }, { 0xA772, 0x5440 }, { 0xA773, 0x5431 }, { 0xA774, 0x542B }, { 0xA775, 0x541F }, { 0xA776, 0x542C }, { 0xA777, 0x56EA }, 
-	{ 0xA778, 0x56F0 }, { 0xA779, 0x56E4 }, { 0xA77A, 0x56EB }, { 0xA77B, 0x574A }, { 0xA77C, 0x5751 }, { 0xA77D, 0x5740 }, { 0xA77E, 0x574D }, { 0xA7A1, 0x5747 }, 
-	{ 0xA7A2, 0x574E }, { 0xA7A3, 0x573E }, { 0xA7A4, 0x5750 }, { 0xA7A5, 0x574F }, { 0xA7A6, 0x573B }, { 0xA7A7, 0x58EF }, { 0xA7A8, 0x593E }, { 0xA7A9, 0x599D }, 
-	{ 0xA7AA, 0x5992 }, { 0xA7AB, 0x59A8 }, { 0xA7AC, 0x599E }, { 0xA7AD, 0x59A3 }, { 0xA7AE, 0x5999 }, { 0xA7AF, 0x5996 }, { 0xA7B0, 0x598D }, { 0xA7B1, 0x59A4 }, 
-	{ 0xA7B2, 0x5993 }, { 0xA7B3, 0x598A }, { 0xA7B4, 0x59A5 }, { 0xA7B5, 0x5B5D }, { 0xA7B6, 0x5B5C }, { 0xA7B7, 0x5B5A }, { 0xA7B8, 0x5B5B }, { 0xA7B9, 0x5B8C }, 
-	{ 0xA7BA, 0x5B8B }, { 0xA7BB, 0x5B8F }, { 0xA7BC, 0x5C2C }, { 0xA7BD, 0x5C40 }, { 0xA7BE, 0x5C41 }, { 0xA7BF, 0x5C3F }, { 0xA7C0, 0x5C3E }, { 0xA7C1, 0x5C90 }, 
-	{ 0xA7C2, 0x5C91 }, { 0xA7C3, 0x5C94 }, { 0xA7C4, 0x5C8C }, { 0xA7C5, 0x5DEB }, { 0xA7C6, 0x5E0C }, { 0xA7C7, 0x5E8F }, { 0xA7C8, 0x5E87 }, { 0xA7C9, 0x5E8A }, 
-	{ 0xA7CA, 0x5EF7 }, { 0xA7CB, 0x5F04 }, { 0xA7CC, 0x5F1F }, { 0xA7CD, 0x5F64 }, { 0xA7CE, 0x5F62 }, { 0xA7CF, 0x5F77 }, { 0xA7D0, 0x5F79 }, { 0xA7D1, 0x5FD8 }, 
-	{ 0xA7D2, 0x5FCC }, { 0xA7D3, 0x5FD7 }, { 0xA7D4, 0x5FCD }, { 0xA7D5, 0x5FF1 }, { 0xA7D6, 0x5FEB }, { 0xA7D7, 0x5FF8 }, { 0xA7D8, 0x5FEA }, { 0xA7D9, 0x6212 }, 
-	{ 0xA7DA, 0x6211 }, { 0xA7DB, 0x6284 }, { 0xA7DC, 0x6297 }, { 0xA7DD, 0x6296 }, { 0xA7DE, 0x6280 }, { 0xA7DF, 0x6276 }, { 0xA7E0, 0x6289 }, { 0xA7E1, 0x626D }, 
-	{ 0xA7E2, 0x628A }, { 0xA7E3, 0x627C }, { 0xA7E4, 0x627E }, { 0xA7E5, 0x6279 }, { 0xA7E6, 0x6273 }, { 0xA7E7, 0x6292 }, { 0xA7E8, 0x626F }, { 0xA7E9, 0x6298 }, 
-	{ 0xA7EA, 0x626E }, { 0xA7EB, 0x6295 }, { 0xA7EC, 0x6293 }, { 0xA7ED, 0x6291 }, { 0xA7EE, 0x6286 }, { 0xA7EF, 0x6539 }, { 0xA7F0, 0x653B }, { 0xA7F1, 0x6538 }, 
-	{ 0xA7F2, 0x65F1 }, { 0xA7F3, 0x66F4 }, { 0xA7F4, 0x675F }, { 0xA7F5, 0x674E }, { 0xA7F6, 0x674F }, { 0xA7F7, 0x6750 }, { 0xA7F8, 0x6751 }, { 0xA7F9, 0x675C }, 
-	{ 0xA7FA, 0x6756 }, { 0xA7FB, 0x675E }, { 0xA7FC, 0x6749 }, { 0xA7FD, 0x6746 }, { 0xA7FE, 0x6760 }, { 0xA840, 0x6753 }, { 0xA841, 0x6757 }, { 0xA842, 0x6B65 }, 
-	{ 0xA843, 0x6BCF }, { 0xA844, 0x6C42 }, { 0xA845, 0x6C5E }, { 0xA846, 0x6C99 }, { 0xA847, 0x6C81 }, { 0xA848, 0x6C88 }, { 0xA849, 0x6C89 }, { 0xA84A, 0x6C85 }, 
-	{ 0xA84B, 0x6C9B }, { 0xA84C, 0x6C6A }, { 0xA84D, 0x6C7A }, { 0xA84E, 0x6C90 }, { 0xA84F, 0x6C70 }, { 0xA850, 0x6C8C }, { 0xA851, 0x6C68 }, { 0xA852, 0x6C96 }, 
-	{ 0xA853, 0x6C92 }, { 0xA854, 0x6C7D }, { 0xA855, 0x6C83 }, { 0xA856, 0x6C72 }, { 0xA857, 0x6C7E }, { 0xA858, 0x6C74 }, { 0xA859, 0x6C86 }, { 0xA85A, 0x6C76 }, 
-	{ 0xA85B, 0x6C8D }, { 0xA85C, 0x6C94 }, { 0xA85D, 0x6C98 }, { 0xA85E, 0x6C82 }, { 0xA85F, 0x7076 }, { 0xA860, 0x707C }, { 0xA861, 0x707D }, { 0xA862, 0x7078 }, 
-	{ 0xA863, 0x7262 }, { 0xA864, 0x7261 }, { 0xA865, 0x7260 }, { 0xA866, 0x72C4 }, { 0xA867, 0x72C2 }, { 0xA868, 0x7396 }, { 0xA869, 0x752C }, { 0xA86A, 0x752B }, 
-	{ 0xA86B, 0x7537 }, { 0xA86C, 0x7538 }, { 0xA86D, 0x7682 }, { 0xA86E, 0x76EF }, { 0xA86F, 0x77E3 }, { 0xA870, 0x79C1 }, { 0xA871, 0x79C0 }, { 0xA872, 0x79BF }, 
-	{ 0xA873, 0x7A76 }, { 0xA874, 0x7CFB }, { 0xA875, 0x7F55 }, { 0xA876, 0x8096 }, { 0xA877, 0x8093 }, { 0xA878, 0x809D }, { 0xA879, 0x8098 }, { 0xA87A, 0x809B }, 
-	{ 0xA87B, 0x809A }, { 0xA87C, 0x80B2 }, { 0xA87D, 0x826F }, { 0xA87E, 0x8292 }, { 0xA8A1, 0x828B }, { 0xA8A2, 0x828D }, { 0xA8A3, 0x898B }, { 0xA8A4, 0x89D2 }, 
-	{ 0xA8A5, 0x8A00 }, { 0xA8A6, 0x8C37 }, { 0xA8A7, 0x8C46 }, { 0xA8A8, 0x8C55 }, { 0xA8A9, 0x8C9D }, { 0xA8AA, 0x8D64 }, { 0xA8AB, 0x8D70 }, { 0xA8AC, 0x8DB3 }, 
-	{ 0xA8AD, 0x8EAB }, { 0xA8AE, 0x8ECA }, { 0xA8AF, 0x8F9B }, { 0xA8B0, 0x8FB0 }, { 0xA8B1, 0x8FC2 }, { 0xA8B2, 0x8FC6 }, { 0xA8B3, 0x8FC5 }, { 0xA8B4, 0x8FC4 }, 
-	{ 0xA8B5, 0x5DE1 }, { 0xA8B6, 0x9091 }, { 0xA8B7, 0x90A2 }, { 0xA8B8, 0x90AA }, { 0xA8B9, 0x90A6 }, { 0xA8BA, 0x90A3 }, { 0xA8BB, 0x9149 }, { 0xA8BC, 0x91C6 }, 
-	{ 0xA8BD, 0x91CC }, { 0xA8BE, 0x9632 }, { 0xA8BF, 0x962E }, { 0xA8C0, 0x9631 }, { 0xA8C1, 0x962A }, { 0xA8C2, 0x962C }, { 0xA8C3, 0x4E26 }, { 0xA8C4, 0x4E56 }, 
-	{ 0xA8C5, 0x4E73 }, { 0xA8C6, 0x4E8B }, { 0xA8C7, 0x4E9B }, { 0xA8C8, 0x4E9E }, { 0xA8C9, 0x4EAB }, { 0xA8CA, 0x4EAC }, { 0xA8CB, 0x4F6F }, { 0xA8CC, 0x4F9D }, 
-	{ 0xA8CD, 0x4F8D }, { 0xA8CE, 0x4F73 }, { 0xA8CF, 0x4F7F }, { 0xA8D0, 0x4F6C }, { 0xA8D1, 0x4F9B }, { 0xA8D2, 0x4F8B }, { 0xA8D3, 0x4F86 }, { 0xA8D4, 0x4F83 }, 
-	{ 0xA8D5, 0x4F70 }, { 0xA8D6, 0x4F75 }, { 0xA8D7, 0x4F88 }, { 0xA8D8, 0x4F69 }, { 0xA8D9, 0x4F7B }, { 0xA8DA, 0x4F96 }, { 0xA8DB, 0x4F7E }, { 0xA8DC, 0x4F8F }, 
-	{ 0xA8DD, 0x4F91 }, { 0xA8DE, 0x4F7A }, { 0xA8DF, 0x5154 }, { 0xA8E0, 0x5152 }, { 0xA8E1, 0x5155 }, { 0xA8E2, 0x5169 }, { 0xA8E3, 0x5177 }, { 0xA8E4, 0x5176 }, 
-	{ 0xA8E5, 0x5178 }, { 0xA8E6, 0x51BD }, { 0xA8E7, 0x51FD }, { 0xA8E8, 0x523B }, { 0xA8E9, 0x5238 }, { 0xA8EA, 0x5237 }, { 0xA8EB, 0x523A }, { 0xA8EC, 0x5230 }, 
-	{ 0xA8ED, 0x522E }, { 0xA8EE, 0x5236 }, { 0xA8EF, 0x5241 }, { 0xA8F0, 0x52BE }, { 0xA8F1, 0x52BB }, { 0xA8F2, 0x5352 }, { 0xA8F3, 0x5354 }, { 0xA8F4, 0x5353 }, 
-	{ 0xA8F5, 0x5351 }, { 0xA8F6, 0x5366 }, { 0xA8F7, 0x5377 }, { 0xA8F8, 0x5378 }, { 0xA8F9, 0x5379 }, { 0xA8FA, 0x53D6 }, { 0xA8FB, 0x53D4 }, { 0xA8FC, 0x53D7 }, 
-	{ 0xA8FD, 0x5473 }, { 0xA8FE, 0x5475 }, { 0xA940, 0x5496 }, { 0xA941, 0x5478 }, { 0xA942, 0x5495 }, { 0xA943, 0x5480 }, { 0xA944, 0x547B }, { 0xA945, 0x5477 }, 
-	{ 0xA946, 0x5484 }, { 0xA947, 0x5492 }, { 0xA948, 0x5486 }, { 0xA949, 0x547C }, { 0xA94A, 0x5490 }, { 0xA94B, 0x5471 }, { 0xA94C, 0x5476 }, { 0xA94D, 0x548C }, 
-	{ 0xA94E, 0x549A }, { 0xA94F, 0x5462 }, { 0xA950, 0x5468 }, { 0xA951, 0x548B }, { 0xA952, 0x547D }, { 0xA953, 0x548E }, { 0xA954, 0x56FA }, { 0xA955, 0x5783 }, 
-	{ 0xA956, 0x5777 }, { 0xA957, 0x576A }, { 0xA958, 0x5769 }, { 0xA959, 0x5761 }, { 0xA95A, 0x5766 }, { 0xA95B, 0x5764 }, { 0xA95C, 0x577C }, { 0xA95D, 0x591C }, 
-	{ 0xA95E, 0x5949 }, { 0xA95F, 0x5947 }, { 0xA960, 0x5948 }, { 0xA961, 0x5944 }, { 0xA962, 0x5954 }, { 0xA963, 0x59BE }, { 0xA964, 0x59BB }, { 0xA965, 0x59D4 }, 
-	{ 0xA966, 0x59B9 }, { 0xA967, 0x59AE }, { 0xA968, 0x59D1 }, { 0xA969, 0x59C6 }, { 0xA96A, 0x59D0 }, { 0xA96B, 0x59CD }, { 0xA96C, 0x59CB }, { 0xA96D, 0x59D3 }, 
-	{ 0xA96E, 0x59CA }, { 0xA96F, 0x59AF }, { 0xA970, 0x59B3 }, { 0xA971, 0x59D2 }, { 0xA972, 0x59C5 }, { 0xA973, 0x5B5F }, { 0xA974, 0x5B64 }, { 0xA975, 0x5B63 }, 
-	{ 0xA976, 0x5B97 }, { 0xA977, 0x5B9A }, { 0xA978, 0x5B98 }, { 0xA979, 0x5B9C }, { 0xA97A, 0x5B99 }, { 0xA97B, 0x5B9B }, { 0xA97C, 0x5C1A }, { 0xA97D, 0x5C48 }, 
-	{ 0xA97E, 0x5C45 }, { 0xA9A1, 0x5C46 }, { 0xA9A2, 0x5CB7 }, { 0xA9A3, 0x5CA1 }, { 0xA9A4, 0x5CB8 }, { 0xA9A5, 0x5CA9 }, { 0xA9A6, 0x5CAB }, { 0xA9A7, 0x5CB1 }, 
-	{ 0xA9A8, 0x5CB3 }, { 0xA9A9, 0x5E18 }, { 0xA9AA, 0x5E1A }, { 0xA9AB, 0x5E16 }, { 0xA9AC, 0x5E15 }, { 0xA9AD, 0x5E1B }, { 0xA9AE, 0x5E11 }, { 0xA9AF, 0x5E78 }, 
-	{ 0xA9B0, 0x5E9A }, { 0xA9B1, 0x5E97 }, { 0xA9B2, 0x5E9C }, { 0xA9B3, 0x5E95 }, { 0xA9B4, 0x5E96 }, { 0xA9B5, 0x5EF6 }, { 0xA9B6, 0x5F26 }, { 0xA9B7, 0x5F27 }, 
-	{ 0xA9B8, 0x5F29 }, { 0xA9B9, 0x5F80 }, { 0xA9BA, 0x5F81 }, { 0xA9BB, 0x5F7F }, { 0xA9BC, 0x5F7C }, { 0xA9BD, 0x5FDD }, { 0xA9BE, 0x5FE0 }, { 0xA9BF, 0x5FFD }, 
-	{ 0xA9C0, 0x5FF5 }, { 0xA9C1, 0x5FFF }, { 0xA9C2, 0x600F }, { 0xA9C3, 0x6014 }, { 0xA9C4, 0x602F }, { 0xA9C5, 0x6035 }, { 0xA9C6, 0x6016 }, { 0xA9C7, 0x602A }, 
-	{ 0xA9C8, 0x6015 }, { 0xA9C9, 0x6021 }, { 0xA9CA, 0x6027 }, { 0xA9CB, 0x6029 }, { 0xA9CC, 0x602B }, { 0xA9CD, 0x601B }, { 0xA9CE, 0x6216 }, { 0xA9CF, 0x6215 }, 
-	{ 0xA9D0, 0x623F }, { 0xA9D1, 0x623E }, { 0xA9D2, 0x6240 }, { 0xA9D3, 0x627F }, { 0xA9D4, 0x62C9 }, { 0xA9D5, 0x62CC }, { 0xA9D6, 0x62C4 }, { 0xA9D7, 0x62BF }, 
-	{ 0xA9D8, 0x62C2 }, { 0xA9D9, 0x62B9 }, { 0xA9DA, 0x62D2 }, { 0xA9DB, 0x62DB }, { 0xA9DC, 0x62AB }, { 0xA9DD, 0x62D3 }, { 0xA9DE, 0x62D4 }, { 0xA9DF, 0x62CB }, 
-	{ 0xA9E0, 0x62C8 }, { 0xA9E1, 0x62A8 }, { 0xA9E2, 0x62BD }, { 0xA9E3, 0x62BC }, { 0xA9E4, 0x62D0 }, { 0xA9E5, 0x62D9 }, { 0xA9E6, 0x62C7 }, { 0xA9E7, 0x62CD }, 
-	{ 0xA9E8, 0x62B5 }, { 0xA9E9, 0x62DA }, { 0xA9EA, 0x62B1 }, { 0xA9EB, 0x62D8 }, { 0xA9EC, 0x62D6 }, { 0xA9ED, 0x62D7 }, { 0xA9EE, 0x62C6 }, { 0xA9EF, 0x62AC }, 
-	{ 0xA9F0, 0x62CE }, { 0xA9F1, 0x653E }, { 0xA9F2, 0x65A7 }, { 0xA9F3, 0x65BC }, { 0xA9F4, 0x65FA }, { 0xA9F5, 0x6614 }, { 0xA9F6, 0x6613 }, { 0xA9F7, 0x660C }, 
-	{ 0xA9F8, 0x6606 }, { 0xA9F9, 0x6602 }, { 0xA9FA, 0x660E }, { 0xA9FB, 0x6600 }, { 0xA9FC, 0x660F }, { 0xA9FD, 0x6615 }, { 0xA9FE, 0x660A }, { 0xAA40, 0x6607 }, 
-	{ 0xAA41, 0x670D }, { 0xAA42, 0x670B }, { 0xAA43, 0x676D }, { 0xAA44, 0x678B }, { 0xAA45, 0x6795 }, { 0xAA46, 0x6771 }, { 0xAA47, 0x679C }, { 0xAA48, 0x6773 }, 
-	{ 0xAA49, 0x6777 }, { 0xAA4A, 0x6787 }, { 0xAA4B, 0x679D }, { 0xAA4C, 0x6797 }, { 0xAA4D, 0x676F }, { 0xAA4E, 0x6770 }, { 0xAA4F, 0x677F }, { 0xAA50, 0x6789 }, 
-	{ 0xAA51, 0x677E }, { 0xAA52, 0x6790 }, { 0xAA53, 0x6775 }, { 0xAA54, 0x679A }, { 0xAA55, 0x6793 }, { 0xAA56, 0x677C }, { 0xAA57, 0x676A }, { 0xAA58, 0x6772 }, 
-	{ 0xAA59, 0x6B23 }, { 0xAA5A, 0x6B66 }, { 0xAA5B, 0x6B67 }, { 0xAA5C, 0x6B7F }, { 0xAA5D, 0x6C13 }, { 0xAA5E, 0x6C1B }, { 0xAA5F, 0x6CE3 }, { 0xAA60, 0x6CE8 }, 
-	{ 0xAA61, 0x6CF3 }, { 0xAA62, 0x6CB1 }, { 0xAA63, 0x6CCC }, { 0xAA64, 0x6CE5 }, { 0xAA65, 0x6CB3 }, { 0xAA66, 0x6CBD }, { 0xAA67, 0x6CBE }, { 0xAA68, 0x6CBC }, 
-	{ 0xAA69, 0x6CE2 }, { 0xAA6A, 0x6CAB }, { 0xAA6B, 0x6CD5 }, { 0xAA6C, 0x6CD3 }, { 0xAA6D, 0x6CB8 }, { 0xAA6E, 0x6CC4 }, { 0xAA6F, 0x6CB9 }, { 0xAA70, 0x6CC1 }, 
-	{ 0xAA71, 0x6CAE }, { 0xAA72, 0x6CD7 }, { 0xAA73, 0x6CC5 }, { 0xAA74, 0x6CF1 }, { 0xAA75, 0x6CBF }, { 0xAA76, 0x6CBB }, { 0xAA77, 0x6CE1 }, { 0xAA78, 0x6CDB }, 
-	{ 0xAA79, 0x6CCA }, { 0xAA7A, 0x6CAC }, { 0xAA7B, 0x6CEF }, { 0xAA7C, 0x6CDC }, { 0xAA7D, 0x6CD6 }, { 0xAA7E, 0x6CE0 }, { 0xAAA1, 0x7095 }, { 0xAAA2, 0x708E }, 
-	{ 0xAAA3, 0x7092 }, { 0xAAA4, 0x708A }, { 0xAAA5, 0x7099 }, { 0xAAA6, 0x722C }, { 0xAAA7, 0x722D }, { 0xAAA8, 0x7238 }, { 0xAAA9, 0x7248 }, { 0xAAAA, 0x7267 }, 
-	{ 0xAAAB, 0x7269 }, { 0xAAAC, 0x72C0 }, { 0xAAAD, 0x72CE }, { 0xAAAE, 0x72D9 }, { 0xAAAF, 0x72D7 }, { 0xAAB0, 0x72D0 }, { 0xAAB1, 0x73A9 }, { 0xAAB2, 0x73A8 }, 
-	{ 0xAAB3, 0x739F }, { 0xAAB4, 0x73AB }, { 0xAAB5, 0x73A5 }, { 0xAAB6, 0x753D }, { 0xAAB7, 0x759D }, { 0xAAB8, 0x7599 }, { 0xAAB9, 0x759A }, { 0xAABA, 0x7684 }, 
-	{ 0xAABB, 0x76C2 }, { 0xAABC, 0x76F2 }, { 0xAABD, 0x76F4 }, { 0xAABE, 0x77E5 }, { 0xAABF, 0x77FD }, { 0xAAC0, 0x793E }, { 0xAAC1, 0x7940 }, { 0xAAC2, 0x7941 }, 
-	{ 0xAAC3, 0x79C9 }, { 0xAAC4, 0x79C8 }, { 0xAAC5, 0x7A7A }, { 0xAAC6, 0x7A79 }, { 0xAAC7, 0x7AFA }, { 0xAAC8, 0x7CFE }, { 0xAAC9, 0x7F54 }, { 0xAACA, 0x7F8C }, 
-	{ 0xAACB, 0x7F8B }, { 0xAACC, 0x8005 }, { 0xAACD, 0x80BA }, { 0xAACE, 0x80A5 }, { 0xAACF, 0x80A2 }, { 0xAAD0, 0x80B1 }, { 0xAAD1, 0x80A1 }, { 0xAAD2, 0x80AB }, 
-	{ 0xAAD3, 0x80A9 }, { 0xAAD4, 0x80B4 }, { 0xAAD5, 0x80AA }, { 0xAAD6, 0x80AF }, { 0xAAD7, 0x81E5 }, { 0xAAD8, 0x81FE }, { 0xAAD9, 0x820D }, { 0xAADA, 0x82B3 }, 
-	{ 0xAADB, 0x829D }, { 0xAADC, 0x8299 }, { 0xAADD, 0x82AD }, { 0xAADE, 0x82BD }, { 0xAADF, 0x829F }, { 0xAAE0, 0x82B9 }, { 0xAAE1, 0x82B1 }, { 0xAAE2, 0x82AC }, 
-	{ 0xAAE3, 0x82A5 }, { 0xAAE4, 0x82AF }, { 0xAAE5, 0x82B8 }, { 0xAAE6, 0x82A3 }, { 0xAAE7, 0x82B0 }, { 0xAAE8, 0x82BE }, { 0xAAE9, 0x82B7 }, { 0xAAEA, 0x864E }, 
-	{ 0xAAEB, 0x8671 }, { 0xAAEC, 0x521D }, { 0xAAED, 0x8868 }, { 0xAAEE, 0x8ECB }, { 0xAAEF, 0x8FCE }, { 0xAAF0, 0x8FD4 }, { 0xAAF1, 0x8FD1 }, { 0xAAF2, 0x90B5 }, 
-	{ 0xAAF3, 0x90B8 }, { 0xAAF4, 0x90B1 }, { 0xAAF5, 0x90B6 }, { 0xAAF6, 0x91C7 }, { 0xAAF7, 0x91D1 }, { 0xAAF8, 0x9577 }, { 0xAAF9, 0x9580 }, { 0xAAFA, 0x961C }, 
-	{ 0xAAFB, 0x9640 }, { 0xAAFC, 0x963F }, { 0xAAFD, 0x963B }, { 0xAAFE, 0x9644 }, { 0xAB40, 0x9642 }, { 0xAB41, 0x96B9 }, { 0xAB42, 0x96E8 }, { 0xAB43, 0x9752 }, 
-	{ 0xAB44, 0x975E }, { 0xAB45, 0x4E9F }, { 0xAB46, 0x4EAD }, { 0xAB47, 0x4EAE }, { 0xAB48, 0x4FE1 }, { 0xAB49, 0x4FB5 }, { 0xAB4A, 0x4FAF }, { 0xAB4B, 0x4FBF }, 
-	{ 0xAB4C, 0x4FE0 }, { 0xAB4D, 0x4FD1 }, { 0xAB4E, 0x4FCF }, { 0xAB4F, 0x4FDD }, { 0xAB50, 0x4FC3 }, { 0xAB51, 0x4FB6 }, { 0xAB52, 0x4FD8 }, { 0xAB53, 0x4FDF }, 
-	{ 0xAB54, 0x4FCA }, { 0xAB55, 0x4FD7 }, { 0xAB56, 0x4FAE }, { 0xAB57, 0x4FD0 }, { 0xAB58, 0x4FC4 }, { 0xAB59, 0x4FC2 }, { 0xAB5A, 0x4FDA }, { 0xAB5B, 0x4FCE }, 
-	{ 0xAB5C, 0x4FDE }, { 0xAB5D, 0x4FB7 }, { 0xAB5E, 0x5157 }, { 0xAB5F, 0x5192 }, { 0xAB60, 0x5191 }, { 0xAB61, 0x51A0 }, { 0xAB62, 0x524E }, { 0xAB63, 0x5243 }, 
-	{ 0xAB64, 0x524A }, { 0xAB65, 0x524D }, { 0xAB66, 0x524C }, { 0xAB67, 0x524B }, { 0xAB68, 0x5247 }, { 0xAB69, 0x52C7 }, { 0xAB6A, 0x52C9 }, { 0xAB6B, 0x52C3 }, 
-	{ 0xAB6C, 0x52C1 }, { 0xAB6D, 0x530D }, { 0xAB6E, 0x5357 }, { 0xAB6F, 0x537B }, { 0xAB70, 0x539A }, { 0xAB71, 0x53DB }, { 0xAB72, 0x54AC }, { 0xAB73, 0x54C0 }, 
-	{ 0xAB74, 0x54A8 }, { 0xAB75, 0x54CE }, { 0xAB76, 0x54C9 }, { 0xAB77, 0x54B8 }, { 0xAB78, 0x54A6 }, { 0xAB79, 0x54B3 }, { 0xAB7A, 0x54C7 }, { 0xAB7B, 0x54C2 }, 
-	{ 0xAB7C, 0x54BD }, { 0xAB7D, 0x54AA }, { 0xAB7E, 0x54C1 }, { 0xABA1, 0x54C4 }, { 0xABA2, 0x54C8 }, { 0xABA3, 0x54AF }, { 0xABA4, 0x54AB }, { 0xABA5, 0x54B1 }, 
-	{ 0xABA6, 0x54BB }, { 0xABA7, 0x54A9 }, { 0xABA8, 0x54A7 }, { 0xABA9, 0x54BF }, { 0xABAA, 0x56FF }, { 0xABAB, 0x5782 }, { 0xABAC, 0x578B }, { 0xABAD, 0x57A0 }, 
-	{ 0xABAE, 0x57A3 }, { 0xABAF, 0x57A2 }, { 0xABB0, 0x57CE }, { 0xABB1, 0x57AE }, { 0xABB2, 0x5793 }, { 0xABB3, 0x5955 }, { 0xABB4, 0x5951 }, { 0xABB5, 0x594F }, 
-	{ 0xABB6, 0x594E }, { 0xABB7, 0x5950 }, { 0xABB8, 0x59DC }, { 0xABB9, 0x59D8 }, { 0xABBA, 0x59FF }, { 0xABBB, 0x59E3 }, { 0xABBC, 0x59E8 }, { 0xABBD, 0x5A03 }, 
-	{ 0xABBE, 0x59E5 }, { 0xABBF, 0x59EA }, { 0xABC0, 0x59DA }, { 0xABC1, 0x59E6 }, { 0xABC2, 0x5A01 }, { 0xABC3, 0x59FB }, { 0xABC4, 0x5B69 }, { 0xABC5, 0x5BA3 }, 
-	{ 0xABC6, 0x5BA6 }, { 0xABC7, 0x5BA4 }, { 0xABC8, 0x5BA2 }, { 0xABC9, 0x5BA5 }, { 0xABCA, 0x5C01 }, { 0xABCB, 0x5C4E }, { 0xABCC, 0x5C4F }, { 0xABCD, 0x5C4D }, 
-	{ 0xABCE, 0x5C4B }, { 0xABCF, 0x5CD9 }, { 0xABD0, 0x5CD2 }, { 0xABD1, 0x5DF7 }, { 0xABD2, 0x5E1D }, { 0xABD3, 0x5E25 }, { 0xABD4, 0x5E1F }, { 0xABD5, 0x5E7D }, 
-	{ 0xABD6, 0x5EA0 }, { 0xABD7, 0x5EA6 }, { 0xABD8, 0x5EFA }, { 0xABD9, 0x5F08 }, { 0xABDA, 0x5F2D }, { 0xABDB, 0x5F65 }, { 0xABDC, 0x5F88 }, { 0xABDD, 0x5F85 }, 
-	{ 0xABDE, 0x5F8A }, { 0xABDF, 0x5F8B }, { 0xABE0, 0x5F87 }, { 0xABE1, 0x5F8C }, { 0xABE2, 0x5F89 }, { 0xABE3, 0x6012 }, { 0xABE4, 0x601D }, { 0xABE5, 0x6020 }, 
-	{ 0xABE6, 0x6025 }, { 0xABE7, 0x600E }, { 0xABE8, 0x6028 }, { 0xABE9, 0x604D }, { 0xABEA, 0x6070 }, { 0xABEB, 0x6068 }, { 0xABEC, 0x6062 }, { 0xABED, 0x6046 }, 
-	{ 0xABEE, 0x6043 }, { 0xABEF, 0x606C }, { 0xABF0, 0x606B }, { 0xABF1, 0x606A }, { 0xABF2, 0x6064 }, { 0xABF3, 0x6241 }, { 0xABF4, 0x62DC }, { 0xABF5, 0x6316 }, 
-	{ 0xABF6, 0x6309 }, { 0xABF7, 0x62FC }, { 0xABF8, 0x62ED }, { 0xABF9, 0x6301 }, { 0xABFA, 0x62EE }, { 0xABFB, 0x62FD }, { 0xABFC, 0x6307 }, { 0xABFD, 0x62F1 }, 
-	{ 0xABFE, 0x62F7 }, { 0xAC40, 0x62EF }, { 0xAC41, 0x62EC }, { 0xAC42, 0x62FE }, { 0xAC43, 0x62F4 }, { 0xAC44, 0x6311 }, { 0xAC45, 0x6302 }, { 0xAC46, 0x653F }, 
-	{ 0xAC47, 0x6545 }, { 0xAC48, 0x65AB }, { 0xAC49, 0x65BD }, { 0xAC4A, 0x65E2 }, { 0xAC4B, 0x6625 }, { 0xAC4C, 0x662D }, { 0xAC4D, 0x6620 }, { 0xAC4E, 0x6627 }, 
-	{ 0xAC4F, 0x662F }, { 0xAC50, 0x661F }, { 0xAC51, 0x6628 }, { 0xAC52, 0x6631 }, { 0xAC53, 0x6624 }, { 0xAC54, 0x66F7 }, { 0xAC55, 0x67FF }, { 0xAC56, 0x67D3 }, 
-	{ 0xAC57, 0x67F1 }, { 0xAC58, 0x67D4 }, { 0xAC59, 0x67D0 }, { 0xAC5A, 0x67EC }, { 0xAC5B, 0x67B6 }, { 0xAC5C, 0x67AF }, { 0xAC5D, 0x67F5 }, { 0xAC5E, 0x67E9 }, 
-	{ 0xAC5F, 0x67EF }, { 0xAC60, 0x67C4 }, { 0xAC61, 0x67D1 }, { 0xAC62, 0x67B4 }, { 0xAC63, 0x67DA }, { 0xAC64, 0x67E5 }, { 0xAC65, 0x67B8 }, { 0xAC66, 0x67CF }, 
-	{ 0xAC67, 0x67DE }, { 0xAC68, 0x67F3 }, { 0xAC69, 0x67B0 }, { 0xAC6A, 0x67D9 }, { 0xAC6B, 0x67E2 }, { 0xAC6C, 0x67DD }, { 0xAC6D, 0x67D2 }, { 0xAC6E, 0x6B6A }, 
-	{ 0xAC6F, 0x6B83 }, { 0xAC70, 0x6B86 }, { 0xAC71, 0x6BB5 }, { 0xAC72, 0x6BD2 }, { 0xAC73, 0x6BD7 }, { 0xAC74, 0x6C1F }, { 0xAC75, 0x6CC9 }, { 0xAC76, 0x6D0B }, 
-	{ 0xAC77, 0x6D32 }, { 0xAC78, 0x6D2A }, { 0xAC79, 0x6D41 }, { 0xAC7A, 0x6D25 }, { 0xAC7B, 0x6D0C }, { 0xAC7C, 0x6D31 }, { 0xAC7D, 0x6D1E }, { 0xAC7E, 0x6D17 }, 
-	{ 0xACA1, 0x6D3B }, { 0xACA2, 0x6D3D }, { 0xACA3, 0x6D3E }, { 0xACA4, 0x6D36 }, { 0xACA5, 0x6D1B }, { 0xACA6, 0x6CF5 }, { 0xACA7, 0x6D39 }, { 0xACA8, 0x6D27 }, 
-	{ 0xACA9, 0x6D38 }, { 0xACAA, 0x6D29 }, { 0xACAB, 0x6D2E }, { 0xACAC, 0x6D35 }, { 0xACAD, 0x6D0E }, { 0xACAE, 0x6D2B }, { 0xACAF, 0x70AB }, { 0xACB0, 0x70BA }, 
-	{ 0xACB1, 0x70B3 }, { 0xACB2, 0x70AC }, { 0xACB3, 0x70AF }, { 0xACB4, 0x70AD }, { 0xACB5, 0x70B8 }, { 0xACB6, 0x70AE }, { 0xACB7, 0x70A4 }, { 0xACB8, 0x7230 }, 
-	{ 0xACB9, 0x7272 }, { 0xACBA, 0x726F }, { 0xACBB, 0x7274 }, { 0xACBC, 0x72E9 }, { 0xACBD, 0x72E0 }, { 0xACBE, 0x72E1 }, { 0xACBF, 0x73B7 }, { 0xACC0, 0x73CA }, 
-	{ 0xACC1, 0x73BB }, { 0xACC2, 0x73B2 }, { 0xACC3, 0x73CD }, { 0xACC4, 0x73C0 }, { 0xACC5, 0x73B3 }, { 0xACC6, 0x751A }, { 0xACC7, 0x752D }, { 0xACC8, 0x754F }, 
-	{ 0xACC9, 0x754C }, { 0xACCA, 0x754E }, { 0xACCB, 0x754B }, { 0xACCC, 0x75AB }, { 0xACCD, 0x75A4 }, { 0xACCE, 0x75A5 }, { 0xACCF, 0x75A2 }, { 0xACD0, 0x75A3 }, 
-	{ 0xACD1, 0x7678 }, { 0xACD2, 0x7686 }, { 0xACD3, 0x7687 }, { 0xACD4, 0x7688 }, { 0xACD5, 0x76C8 }, { 0xACD6, 0x76C6 }, { 0xACD7, 0x76C3 }, { 0xACD8, 0x76C5 }, 
-	{ 0xACD9, 0x7701 }, { 0xACDA, 0x76F9 }, { 0xACDB, 0x76F8 }, { 0xACDC, 0x7709 }, { 0xACDD, 0x770B }, { 0xACDE, 0x76FE }, { 0xACDF, 0x76FC }, { 0xACE0, 0x7707 }, 
-	{ 0xACE1, 0x77DC }, { 0xACE2, 0x7802 }, { 0xACE3, 0x7814 }, { 0xACE4, 0x780C }, { 0xACE5, 0x780D }, { 0xACE6, 0x7946 }, { 0xACE7, 0x7949 }, { 0xACE8, 0x7948 }, 
-	{ 0xACE9, 0x7947 }, { 0xACEA, 0x79B9 }, { 0xACEB, 0x79BA }, { 0xACEC, 0x79D1 }, { 0xACED, 0x79D2 }, { 0xACEE, 0x79CB }, { 0xACEF, 0x7A7F }, { 0xACF0, 0x7A81 }, 
-	{ 0xACF1, 0x7AFF }, { 0xACF2, 0x7AFD }, { 0xACF3, 0x7C7D }, { 0xACF4, 0x7D02 }, { 0xACF5, 0x7D05 }, { 0xACF6, 0x7D00 }, { 0xACF7, 0x7D09 }, { 0xACF8, 0x7D07 }, 
-	{ 0xACF9, 0x7D04 }, { 0xACFA, 0x7D06 }, { 0xACFB, 0x7F38 }, { 0xACFC, 0x7F8E }, { 0xACFD, 0x7FBF }, { 0xACFE, 0x8004 }, { 0xAD40, 0x8010 }, { 0xAD41, 0x800D }, 
-	{ 0xAD42, 0x8011 }, { 0xAD43, 0x8036 }, { 0xAD44, 0x80D6 }, { 0xAD45, 0x80E5 }, { 0xAD46, 0x80DA }, { 0xAD47, 0x80C3 }, { 0xAD48, 0x80C4 }, { 0xAD49, 0x80CC }, 
-	{ 0xAD4A, 0x80E1 }, { 0xAD4B, 0x80DB }, { 0xAD4C, 0x80CE }, { 0xAD4D, 0x80DE }, { 0xAD4E, 0x80E4 }, { 0xAD4F, 0x80DD }, { 0xAD50, 0x81F4 }, { 0xAD51, 0x8222 }, 
-	{ 0xAD52, 0x82E7 }, { 0xAD53, 0x8303 }, { 0xAD54, 0x8305 }, { 0xAD55, 0x82E3 }, { 0xAD56, 0x82DB }, { 0xAD57, 0x82E6 }, { 0xAD58, 0x8304 }, { 0xAD59, 0x82E5 }, 
-	{ 0xAD5A, 0x8302 }, { 0xAD5B, 0x8309 }, { 0xAD5C, 0x82D2 }, { 0xAD5D, 0x82D7 }, { 0xAD5E, 0x82F1 }, { 0xAD5F, 0x8301 }, { 0xAD60, 0x82DC }, { 0xAD61, 0x82D4 }, 
-	{ 0xAD62, 0x82D1 }, { 0xAD63, 0x82DE }, { 0xAD64, 0x82D3 }, { 0xAD65, 0x82DF }, { 0xAD66, 0x82EF }, { 0xAD67, 0x8306 }, { 0xAD68, 0x8650 }, { 0xAD69, 0x8679 }, 
-	{ 0xAD6A, 0x867B }, { 0xAD6B, 0x867A }, { 0xAD6C, 0x884D }, { 0xAD6D, 0x886B }, { 0xAD6E, 0x8981 }, { 0xAD6F, 0x89D4 }, { 0xAD70, 0x8A08 }, { 0xAD71, 0x8A02 }, 
-	{ 0xAD72, 0x8A03 }, { 0xAD73, 0x8C9E }, { 0xAD74, 0x8CA0 }, { 0xAD75, 0x8D74 }, { 0xAD76, 0x8D73 }, { 0xAD77, 0x8DB4 }, { 0xAD78, 0x8ECD }, { 0xAD79, 0x8ECC }, 
-	{ 0xAD7A, 0x8FF0 }, { 0xAD7B, 0x8FE6 }, { 0xAD7C, 0x8FE2 }, { 0xAD7D, 0x8FEA }, { 0xAD7E, 0x8FE5 }, { 0xADA1, 0x8FED }, { 0xADA2, 0x8FEB }, { 0xADA3, 0x8FE4 }, 
-	{ 0xADA4, 0x8FE8 }, { 0xADA5, 0x90CA }, { 0xADA6, 0x90CE }, { 0xADA7, 0x90C1 }, { 0xADA8, 0x90C3 }, { 0xADA9, 0x914B }, { 0xADAA, 0x914A }, { 0xADAB, 0x91CD }, 
-	{ 0xADAC, 0x9582 }, { 0xADAD, 0x9650 }, { 0xADAE, 0x964B }, { 0xADAF, 0x964C }, { 0xADB0, 0x964D }, { 0xADB1, 0x9762 }, { 0xADB2, 0x9769 }, { 0xADB3, 0x97CB }, 
-	{ 0xADB4, 0x97ED }, { 0xADB5, 0x97F3 }, { 0xADB6, 0x9801 }, { 0xADB7, 0x98A8 }, { 0xADB8, 0x98DB }, { 0xADB9, 0x98DF }, { 0xADBA, 0x9996 }, { 0xADBB, 0x9999 }, 
-	{ 0xADBC, 0x4E58 }, { 0xADBD, 0x4EB3 }, { 0xADBE, 0x500C }, { 0xADBF, 0x500D }, { 0xADC0, 0x5023 }, { 0xADC1, 0x4FEF }, { 0xADC2, 0x5026 }, { 0xADC3, 0x5025 }, 
-	{ 0xADC4, 0x4FF8 }, { 0xADC5, 0x5029 }, { 0xADC6, 0x5016 }, { 0xADC7, 0x5006 }, { 0xADC8, 0x503C }, { 0xADC9, 0x501F }, { 0xADCA, 0x501A }, { 0xADCB, 0x5012 }, 
-	{ 0xADCC, 0x5011 }, { 0xADCD, 0x4FFA }, { 0xADCE, 0x5000 }, { 0xADCF, 0x5014 }, { 0xADD0, 0x5028 }, { 0xADD1, 0x4FF1 }, { 0xADD2, 0x5021 }, { 0xADD3, 0x500B }, 
-	{ 0xADD4, 0x5019 }, { 0xADD5, 0x5018 }, { 0xADD6, 0x4FF3 }, { 0xADD7, 0x4FEE }, { 0xADD8, 0x502D }, { 0xADD9, 0x502A }, { 0xADDA, 0x4FFE }, { 0xADDB, 0x502B }, 
-	{ 0xADDC, 0x5009 }, { 0xADDD, 0x517C }, { 0xADDE, 0x51A4 }, { 0xADDF, 0x51A5 }, { 0xADE0, 0x51A2 }, { 0xADE1, 0x51CD }, { 0xADE2, 0x51CC }, { 0xADE3, 0x51C6 }, 
-	{ 0xADE4, 0x51CB }, { 0xADE5, 0x5256 }, { 0xADE6, 0x525C }, { 0xADE7, 0x5254 }, { 0xADE8, 0x525B }, { 0xADE9, 0x525D }, { 0xADEA, 0x532A }, { 0xADEB, 0x537F }, 
-	{ 0xADEC, 0x539F }, { 0xADED, 0x539D }, { 0xADEE, 0x53DF }, { 0xADEF, 0x54E8 }, { 0xADF0, 0x5510 }, { 0xADF1, 0x5501 }, { 0xADF2, 0x5537 }, { 0xADF3, 0x54FC }, 
-	{ 0xADF4, 0x54E5 }, { 0xADF5, 0x54F2 }, { 0xADF6, 0x5506 }, { 0xADF7, 0x54FA }, { 0xADF8, 0x5514 }, { 0xADF9, 0x54E9 }, { 0xADFA, 0x54ED }, { 0xADFB, 0x54E1 }, 
-	{ 0xADFC, 0x5509 }, { 0xADFD, 0x54EE }, { 0xADFE, 0x54EA }, { 0xAE40, 0x54E6 }, { 0xAE41, 0x5527 }, { 0xAE42, 0x5507 }, { 0xAE43, 0x54FD }, { 0xAE44, 0x550F }, 
-	{ 0xAE45, 0x5703 }, { 0xAE46, 0x5704 }, { 0xAE47, 0x57C2 }, { 0xAE48, 0x57D4 }, { 0xAE49, 0x57CB }, { 0xAE4A, 0x57C3 }, { 0xAE4B, 0x5809 }, { 0xAE4C, 0x590F }, 
-	{ 0xAE4D, 0x5957 }, { 0xAE4E, 0x5958 }, { 0xAE4F, 0x595A }, { 0xAE50, 0x5A11 }, { 0xAE51, 0x5A18 }, { 0xAE52, 0x5A1C }, { 0xAE53, 0x5A1F }, { 0xAE54, 0x5A1B }, 
-	{ 0xAE55, 0x5A13 }, { 0xAE56, 0x59EC }, { 0xAE57, 0x5A20 }, { 0xAE58, 0x5A23 }, { 0xAE59, 0x5A29 }, { 0xAE5A, 0x5A25 }, { 0xAE5B, 0x5A0C }, { 0xAE5C, 0x5A09 }, 
-	{ 0xAE5D, 0x5B6B }, { 0xAE5E, 0x5C58 }, { 0xAE5F, 0x5BB0 }, { 0xAE60, 0x5BB3 }, { 0xAE61, 0x5BB6 }, { 0xAE62, 0x5BB4 }, { 0xAE63, 0x5BAE }, { 0xAE64, 0x5BB5 }, 
-	{ 0xAE65, 0x5BB9 }, { 0xAE66, 0x5BB8 }, { 0xAE67, 0x5C04 }, { 0xAE68, 0x5C51 }, { 0xAE69, 0x5C55 }, { 0xAE6A, 0x5C50 }, { 0xAE6B, 0x5CED }, { 0xAE6C, 0x5CFD }, 
-	{ 0xAE6D, 0x5CFB }, { 0xAE6E, 0x5CEA }, { 0xAE6F, 0x5CE8 }, { 0xAE70, 0x5CF0 }, { 0xAE71, 0x5CF6 }, { 0xAE72, 0x5D01 }, { 0xAE73, 0x5CF4 }, { 0xAE74, 0x5DEE }, 
-	{ 0xAE75, 0x5E2D }, { 0xAE76, 0x5E2B }, { 0xAE77, 0x5EAB }, { 0xAE78, 0x5EAD }, { 0xAE79, 0x5EA7 }, { 0xAE7A, 0x5F31 }, { 0xAE7B, 0x5F92 }, { 0xAE7C, 0x5F91 }, 
-	{ 0xAE7D, 0x5F90 }, { 0xAE7E, 0x6059 }, { 0xAEA1, 0x6063 }, { 0xAEA2, 0x6065 }, { 0xAEA3, 0x6050 }, { 0xAEA4, 0x6055 }, { 0xAEA5, 0x606D }, { 0xAEA6, 0x6069 }, 
-	{ 0xAEA7, 0x606F }, { 0xAEA8, 0x6084 }, { 0xAEA9, 0x609F }, { 0xAEAA, 0x609A }, { 0xAEAB, 0x608D }, { 0xAEAC, 0x6094 }, { 0xAEAD, 0x608C }, { 0xAEAE, 0x6085 }, 
-	{ 0xAEAF, 0x6096 }, { 0xAEB0, 0x6247 }, { 0xAEB1, 0x62F3 }, { 0xAEB2, 0x6308 }, { 0xAEB3, 0x62FF }, { 0xAEB4, 0x634E }, { 0xAEB5, 0x633E }, { 0xAEB6, 0x632F }, 
-	{ 0xAEB7, 0x6355 }, { 0xAEB8, 0x6342 }, { 0xAEB9, 0x6346 }, { 0xAEBA, 0x634F }, { 0xAEBB, 0x6349 }, { 0xAEBC, 0x633A }, { 0xAEBD, 0x6350 }, { 0xAEBE, 0x633D }, 
-	{ 0xAEBF, 0x632A }, { 0xAEC0, 0x632B }, { 0xAEC1, 0x6328 }, { 0xAEC2, 0x634D }, { 0xAEC3, 0x634C }, { 0xAEC4, 0x6548 }, { 0xAEC5, 0x6549 }, { 0xAEC6, 0x6599 }, 
-	{ 0xAEC7, 0x65C1 }, { 0xAEC8, 0x65C5 }, { 0xAEC9, 0x6642 }, { 0xAECA, 0x6649 }, { 0xAECB, 0x664F }, { 0xAECC, 0x6643 }, { 0xAECD, 0x6652 }, { 0xAECE, 0x664C }, 
-	{ 0xAECF, 0x6645 }, { 0xAED0, 0x6641 }, { 0xAED1, 0x66F8 }, { 0xAED2, 0x6714 }, { 0xAED3, 0x6715 }, { 0xAED4, 0x6717 }, { 0xAED5, 0x6821 }, { 0xAED6, 0x6838 }, 
-	{ 0xAED7, 0x6848 }, { 0xAED8, 0x6846 }, { 0xAED9, 0x6853 }, { 0xAEDA, 0x6839 }, { 0xAEDB, 0x6842 }, { 0xAEDC, 0x6854 }, { 0xAEDD, 0x6829 }, { 0xAEDE, 0x68B3 }, 
-	{ 0xAEDF, 0x6817 }, { 0xAEE0, 0x684C }, { 0xAEE1, 0x6851 }, { 0xAEE2, 0x683D }, { 0xAEE3, 0x67F4 }, { 0xAEE4, 0x6850 }, { 0xAEE5, 0x6840 }, { 0xAEE6, 0x683C }, 
-	{ 0xAEE7, 0x6843 }, { 0xAEE8, 0x682A }, { 0xAEE9, 0x6845 }, { 0xAEEA, 0x6813 }, { 0xAEEB, 0x6818 }, { 0xAEEC, 0x6841 }, { 0xAEED, 0x6B8A }, { 0xAEEE, 0x6B89 }, 
-	{ 0xAEEF, 0x6BB7 }, { 0xAEF0, 0x6C23 }, { 0xAEF1, 0x6C27 }, { 0xAEF2, 0x6C28 }, { 0xAEF3, 0x6C26 }, { 0xAEF4, 0x6C24 }, { 0xAEF5, 0x6CF0 }, { 0xAEF6, 0x6D6A }, 
-	{ 0xAEF7, 0x6D95 }, { 0xAEF8, 0x6D88 }, { 0xAEF9, 0x6D87 }, { 0xAEFA, 0x6D66 }, { 0xAEFB, 0x6D78 }, { 0xAEFC, 0x6D77 }, { 0xAEFD, 0x6D59 }, { 0xAEFE, 0x6D93 }, 
-	{ 0xAF40, 0x6D6C }, { 0xAF41, 0x6D89 }, { 0xAF42, 0x6D6E }, { 0xAF43, 0x6D5A }, { 0xAF44, 0x6D74 }, { 0xAF45, 0x6D69 }, { 0xAF46, 0x6D8C }, { 0xAF47, 0x6D8A }, 
-	{ 0xAF48, 0x6D79 }, { 0xAF49, 0x6D85 }, { 0xAF4A, 0x6D65 }, { 0xAF4B, 0x6D94 }, { 0xAF4C, 0x70CA }, { 0xAF4D, 0x70D8 }, { 0xAF4E, 0x70E4 }, { 0xAF4F, 0x70D9 }, 
-	{ 0xAF50, 0x70C8 }, { 0xAF51, 0x70CF }, { 0xAF52, 0x7239 }, { 0xAF53, 0x7279 }, { 0xAF54, 0x72FC }, { 0xAF55, 0x72F9 }, { 0xAF56, 0x72FD }, { 0xAF57, 0x72F8 }, 
-	{ 0xAF58, 0x72F7 }, { 0xAF59, 0x7386 }, { 0xAF5A, 0x73ED }, { 0xAF5B, 0x7409 }, { 0xAF5C, 0x73EE }, { 0xAF5D, 0x73E0 }, { 0xAF5E, 0x73EA }, { 0xAF5F, 0x73DE }, 
-	{ 0xAF60, 0x7554 }, { 0xAF61, 0x755D }, { 0xAF62, 0x755C }, { 0xAF63, 0x755A }, { 0xAF64, 0x7559 }, { 0xAF65, 0x75BE }, { 0xAF66, 0x75C5 }, { 0xAF67, 0x75C7 }, 
-	{ 0xAF68, 0x75B2 }, { 0xAF69, 0x75B3 }, { 0xAF6A, 0x75BD }, { 0xAF6B, 0x75BC }, { 0xAF6C, 0x75B9 }, { 0xAF6D, 0x75C2 }, { 0xAF6E, 0x75B8 }, { 0xAF6F, 0x768B }, 
-	{ 0xAF70, 0x76B0 }, { 0xAF71, 0x76CA }, { 0xAF72, 0x76CD }, { 0xAF73, 0x76CE }, { 0xAF74, 0x7729 }, { 0xAF75, 0x771F }, { 0xAF76, 0x7720 }, { 0xAF77, 0x7728 }, 
-	{ 0xAF78, 0x77E9 }, { 0xAF79, 0x7830 }, { 0xAF7A, 0x7827 }, { 0xAF7B, 0x7838 }, { 0xAF7C, 0x781D }, { 0xAF7D, 0x7834 }, { 0xAF7E, 0x7837 }, { 0xAFA1, 0x7825 }, 
-	{ 0xAFA2, 0x782D }, { 0xAFA3, 0x7820 }, { 0xAFA4, 0x781F }, { 0xAFA5, 0x7832 }, { 0xAFA6, 0x7955 }, { 0xAFA7, 0x7950 }, { 0xAFA8, 0x7960 }, { 0xAFA9, 0x795F }, 
-	{ 0xAFAA, 0x7956 }, { 0xAFAB, 0x795E }, { 0xAFAC, 0x795D }, { 0xAFAD, 0x7957 }, { 0xAFAE, 0x795A }, { 0xAFAF, 0x79E4 }, { 0xAFB0, 0x79E3 }, { 0xAFB1, 0x79E7 }, 
-	{ 0xAFB2, 0x79DF }, { 0xAFB3, 0x79E6 }, { 0xAFB4, 0x79E9 }, { 0xAFB5, 0x79D8 }, { 0xAFB6, 0x7A84 }, { 0xAFB7, 0x7A88 }, { 0xAFB8, 0x7AD9 }, { 0xAFB9, 0x7B06 }, 
-	{ 0xAFBA, 0x7B11 }, { 0xAFBB, 0x7C89 }, { 0xAFBC, 0x7D21 }, { 0xAFBD, 0x7D17 }, { 0xAFBE, 0x7D0B }, { 0xAFBF, 0x7D0A }, { 0xAFC0, 0x7D20 }, { 0xAFC1, 0x7D22 }, 
-	{ 0xAFC2, 0x7D14 }, { 0xAFC3, 0x7D10 }, { 0xAFC4, 0x7D15 }, { 0xAFC5, 0x7D1A }, { 0xAFC6, 0x7D1C }, { 0xAFC7, 0x7D0D }, { 0xAFC8, 0x7D19 }, { 0xAFC9, 0x7D1B }, 
-	{ 0xAFCA, 0x7F3A }, { 0xAFCB, 0x7F5F }, { 0xAFCC, 0x7F94 }, { 0xAFCD, 0x7FC5 }, { 0xAFCE, 0x7FC1 }, { 0xAFCF, 0x8006 }, { 0xAFD0, 0x8018 }, { 0xAFD1, 0x8015 }, 
-	{ 0xAFD2, 0x8019 }, { 0xAFD3, 0x8017 }, { 0xAFD4, 0x803D }, { 0xAFD5, 0x803F }, { 0xAFD6, 0x80F1 }, { 0xAFD7, 0x8102 }, { 0xAFD8, 0x80F0 }, { 0xAFD9, 0x8105 }, 
-	{ 0xAFDA, 0x80ED }, { 0xAFDB, 0x80F4 }, { 0xAFDC, 0x8106 }, { 0xAFDD, 0x80F8 }, { 0xAFDE, 0x80F3 }, { 0xAFDF, 0x8108 }, { 0xAFE0, 0x80FD }, { 0xAFE1, 0x810A }, 
-	{ 0xAFE2, 0x80FC }, { 0xAFE3, 0x80EF }, { 0xAFE4, 0x81ED }, { 0xAFE5, 0x81EC }, { 0xAFE6, 0x8200 }, { 0xAFE7, 0x8210 }, { 0xAFE8, 0x822A }, { 0xAFE9, 0x822B }, 
-	{ 0xAFEA, 0x8228 }, { 0xAFEB, 0x822C }, { 0xAFEC, 0x82BB }, { 0xAFED, 0x832B }, { 0xAFEE, 0x8352 }, { 0xAFEF, 0x8354 }, { 0xAFF0, 0x834A }, { 0xAFF1, 0x8338 }, 
-	{ 0xAFF2, 0x8350 }, { 0xAFF3, 0x8349 }, { 0xAFF4, 0x8335 }, { 0xAFF5, 0x8334 }, { 0xAFF6, 0x834F }, { 0xAFF7, 0x8332 }, { 0xAFF8, 0x8339 }, { 0xAFF9, 0x8336 }, 
-	{ 0xAFFA, 0x8317 }, { 0xAFFB, 0x8340 }, { 0xAFFC, 0x8331 }, { 0xAFFD, 0x8328 }, { 0xAFFE, 0x8343 }, { 0xB040, 0x8654 }, { 0xB041, 0x868A }, { 0xB042, 0x86AA }, 
-	{ 0xB043, 0x8693 }, { 0xB044, 0x86A4 }, { 0xB045, 0x86A9 }, { 0xB046, 0x868C }, { 0xB047, 0x86A3 }, { 0xB048, 0x869C }, { 0xB049, 0x8870 }, { 0xB04A, 0x8877 }, 
-	{ 0xB04B, 0x8881 }, { 0xB04C, 0x8882 }, { 0xB04D, 0x887D }, { 0xB04E, 0x8879 }, { 0xB04F, 0x8A18 }, { 0xB050, 0x8A10 }, { 0xB051, 0x8A0E }, { 0xB052, 0x8A0C }, 
-	{ 0xB053, 0x8A15 }, { 0xB054, 0x8A0A }, { 0xB055, 0x8A17 }, { 0xB056, 0x8A13 }, { 0xB057, 0x8A16 }, { 0xB058, 0x8A0F }, { 0xB059, 0x8A11 }, { 0xB05A, 0x8C48 }, 
-	{ 0xB05B, 0x8C7A }, { 0xB05C, 0x8C79 }, { 0xB05D, 0x8CA1 }, { 0xB05E, 0x8CA2 }, { 0xB05F, 0x8D77 }, { 0xB060, 0x8EAC }, { 0xB061, 0x8ED2 }, { 0xB062, 0x8ED4 }, 
-	{ 0xB063, 0x8ECF }, { 0xB064, 0x8FB1 }, { 0xB065, 0x9001 }, { 0xB066, 0x9006 }, { 0xB067, 0x8FF7 }, { 0xB068, 0x9000 }, { 0xB069, 0x8FFA }, { 0xB06A, 0x8FF4 }, 
-	{ 0xB06B, 0x9003 }, { 0xB06C, 0x8FFD }, { 0xB06D, 0x9005 }, { 0xB06E, 0x8FF8 }, { 0xB06F, 0x9095 }, { 0xB070, 0x90E1 }, { 0xB071, 0x90DD }, { 0xB072, 0x90E2 }, 
-	{ 0xB073, 0x9152 }, { 0xB074, 0x914D }, { 0xB075, 0x914C }, { 0xB076, 0x91D8 }, { 0xB077, 0x91DD }, { 0xB078, 0x91D7 }, { 0xB079, 0x91DC }, { 0xB07A, 0x91D9 }, 
-	{ 0xB07B, 0x9583 }, { 0xB07C, 0x9662 }, { 0xB07D, 0x9663 }, { 0xB07E, 0x9661 }, { 0xB0A1, 0x965B }, { 0xB0A2, 0x965D }, { 0xB0A3, 0x9664 }, { 0xB0A4, 0x9658 }, 
-	{ 0xB0A5, 0x965E }, { 0xB0A6, 0x96BB }, { 0xB0A7, 0x98E2 }, { 0xB0A8, 0x99AC }, { 0xB0A9, 0x9AA8 }, { 0xB0AA, 0x9AD8 }, { 0xB0AB, 0x9B25 }, { 0xB0AC, 0x9B32 }, 
-	{ 0xB0AD, 0x9B3C }, { 0xB0AE, 0x4E7E }, { 0xB0AF, 0x507A }, { 0xB0B0, 0x507D }, { 0xB0B1, 0x505C }, { 0xB0B2, 0x5047 }, { 0xB0B3, 0x5043 }, { 0xB0B4, 0x504C }, 
-	{ 0xB0B5, 0x505A }, { 0xB0B6, 0x5049 }, { 0xB0B7, 0x5065 }, { 0xB0B8, 0x5076 }, { 0xB0B9, 0x504E }, { 0xB0BA, 0x5055 }, { 0xB0BB, 0x5075 }, { 0xB0BC, 0x5074 }, 
-	{ 0xB0BD, 0x5077 }, { 0xB0BE, 0x504F }, { 0xB0BF, 0x500F }, { 0xB0C0, 0x506F }, { 0xB0C1, 0x506D }, { 0xB0C2, 0x515C }, { 0xB0C3, 0x5195 }, { 0xB0C4, 0x51F0 }, 
-	{ 0xB0C5, 0x526A }, { 0xB0C6, 0x526F }, { 0xB0C7, 0x52D2 }, { 0xB0C8, 0x52D9 }, { 0xB0C9, 0x52D8 }, { 0xB0CA, 0x52D5 }, { 0xB0CB, 0x5310 }, { 0xB0CC, 0x530F }, 
-	{ 0xB0CD, 0x5319 }, { 0xB0CE, 0x533F }, { 0xB0CF, 0x5340 }, { 0xB0D0, 0x533E }, { 0xB0D1, 0x53C3 }, { 0xB0D2, 0x66FC }, { 0xB0D3, 0x5546 }, { 0xB0D4, 0x556A }, 
-	{ 0xB0D5, 0x5566 }, { 0xB0D6, 0x5544 }, { 0xB0D7, 0x555E }, { 0xB0D8, 0x5561 }, { 0xB0D9, 0x5543 }, { 0xB0DA, 0x554A }, { 0xB0DB, 0x5531 }, { 0xB0DC, 0x5556 }, 
-	{ 0xB0DD, 0x554F }, { 0xB0DE, 0x5555 }, { 0xB0DF, 0x552F }, { 0xB0E0, 0x5564 }, { 0xB0E1, 0x5538 }, { 0xB0E2, 0x552E }, { 0xB0E3, 0x555C }, { 0xB0E4, 0x552C }, 
-	{ 0xB0E5, 0x5563 }, { 0xB0E6, 0x5533 }, { 0xB0E7, 0x5541 }, { 0xB0E8, 0x5557 }, { 0xB0E9, 0x5708 }, { 0xB0EA, 0x570B }, { 0xB0EB, 0x5709 }, { 0xB0EC, 0x57DF }, 
-	{ 0xB0ED, 0x5805 }, { 0xB0EE, 0x580A }, { 0xB0EF, 0x5806 }, { 0xB0F0, 0x57E0 }, { 0xB0F1, 0x57E4 }, { 0xB0F2, 0x57FA }, { 0xB0F3, 0x5802 }, { 0xB0F4, 0x5835 }, 
-	{ 0xB0F5, 0x57F7 }, { 0xB0F6, 0x57F9 }, { 0xB0F7, 0x5920 }, { 0xB0F8, 0x5962 }, { 0xB0F9, 0x5A36 }, { 0xB0FA, 0x5A41 }, { 0xB0FB, 0x5A49 }, { 0xB0FC, 0x5A66 }, 
-	{ 0xB0FD, 0x5A6A }, { 0xB0FE, 0x5A40 }, { 0xB140, 0x5A3C }, { 0xB141, 0x5A62 }, { 0xB142, 0x5A5A }, { 0xB143, 0x5A46 }, { 0xB144, 0x5A4A }, { 0xB145, 0x5B70 }, 
-	{ 0xB146, 0x5BC7 }, { 0xB147, 0x5BC5 }, { 0xB148, 0x5BC4 }, { 0xB149, 0x5BC2 }, { 0xB14A, 0x5BBF }, { 0xB14B, 0x5BC6 }, { 0xB14C, 0x5C09 }, { 0xB14D, 0x5C08 }, 
-	{ 0xB14E, 0x5C07 }, { 0xB14F, 0x5C60 }, { 0xB150, 0x5C5C }, { 0xB151, 0x5C5D }, { 0xB152, 0x5D07 }, { 0xB153, 0x5D06 }, { 0xB154, 0x5D0E }, { 0xB155, 0x5D1B }, 
-	{ 0xB156, 0x5D16 }, { 0xB157, 0x5D22 }, { 0xB158, 0x5D11 }, { 0xB159, 0x5D29 }, { 0xB15A, 0x5D14 }, { 0xB15B, 0x5D19 }, { 0xB15C, 0x5D24 }, { 0xB15D, 0x5D27 }, 
-	{ 0xB15E, 0x5D17 }, { 0xB15F, 0x5DE2 }, { 0xB160, 0x5E38 }, { 0xB161, 0x5E36 }, { 0xB162, 0x5E33 }, { 0xB163, 0x5E37 }, { 0xB164, 0x5EB7 }, { 0xB165, 0x5EB8 }, 
-	{ 0xB166, 0x5EB6 }, { 0xB167, 0x5EB5 }, { 0xB168, 0x5EBE }, { 0xB169, 0x5F35 }, { 0xB16A, 0x5F37 }, { 0xB16B, 0x5F57 }, { 0xB16C, 0x5F6C }, { 0xB16D, 0x5F69 }, 
-	{ 0xB16E, 0x5F6B }, { 0xB16F, 0x5F97 }, { 0xB170, 0x5F99 }, { 0xB171, 0x5F9E }, { 0xB172, 0x5F98 }, { 0xB173, 0x5FA1 }, { 0xB174, 0x5FA0 }, { 0xB175, 0x5F9C }, 
-	{ 0xB176, 0x607F }, { 0xB177, 0x60A3 }, { 0xB178, 0x6089 }, { 0xB179, 0x60A0 }, { 0xB17A, 0x60A8 }, { 0xB17B, 0x60CB }, { 0xB17C, 0x60B4 }, { 0xB17D, 0x60E6 }, 
-	{ 0xB17E, 0x60BD }, { 0xB1A1, 0x60C5 }, { 0xB1A2, 0x60BB }, { 0xB1A3, 0x60B5 }, { 0xB1A4, 0x60DC }, { 0xB1A5, 0x60BC }, { 0xB1A6, 0x60D8 }, { 0xB1A7, 0x60D5 }, 
-	{ 0xB1A8, 0x60C6 }, { 0xB1A9, 0x60DF }, { 0xB1AA, 0x60B8 }, { 0xB1AB, 0x60DA }, { 0xB1AC, 0x60C7 }, { 0xB1AD, 0x621A }, { 0xB1AE, 0x621B }, { 0xB1AF, 0x6248 }, 
-	{ 0xB1B0, 0x63A0 }, { 0xB1B1, 0x63A7 }, { 0xB1B2, 0x6372 }, { 0xB1B3, 0x6396 }, { 0xB1B4, 0x63A2 }, { 0xB1B5, 0x63A5 }, { 0xB1B6, 0x6377 }, { 0xB1B7, 0x6367 }, 
-	{ 0xB1B8, 0x6398 }, { 0xB1B9, 0x63AA }, { 0xB1BA, 0x6371 }, { 0xB1BB, 0x63A9 }, { 0xB1BC, 0x6389 }, { 0xB1BD, 0x6383 }, { 0xB1BE, 0x639B }, { 0xB1BF, 0x636B }, 
-	{ 0xB1C0, 0x63A8 }, { 0xB1C1, 0x6384 }, { 0xB1C2, 0x6388 }, { 0xB1C3, 0x6399 }, { 0xB1C4, 0x63A1 }, { 0xB1C5, 0x63AC }, { 0xB1C6, 0x6392 }, { 0xB1C7, 0x638F }, 
-	{ 0xB1C8, 0x6380 }, { 0xB1C9, 0x637B }, { 0xB1CA, 0x6369 }, { 0xB1CB, 0x6368 }, { 0xB1CC, 0x637A }, { 0xB1CD, 0x655D }, { 0xB1CE, 0x6556 }, { 0xB1CF, 0x6551 }, 
-	{ 0xB1D0, 0x6559 }, { 0xB1D1, 0x6557 }, { 0xB1D2, 0x555F }, { 0xB1D3, 0x654F }, { 0xB1D4, 0x6558 }, { 0xB1D5, 0x6555 }, { 0xB1D6, 0x6554 }, { 0xB1D7, 0x659C }, 
-	{ 0xB1D8, 0x659B }, { 0xB1D9, 0x65AC }, { 0xB1DA, 0x65CF }, { 0xB1DB, 0x65CB }, { 0xB1DC, 0x65CC }, { 0xB1DD, 0x65CE }, { 0xB1DE, 0x665D }, { 0xB1DF, 0x665A }, 
-	{ 0xB1E0, 0x6664 }, { 0xB1E1, 0x6668 }, { 0xB1E2, 0x6666 }, { 0xB1E3, 0x665E }, { 0xB1E4, 0x66F9 }, { 0xB1E5, 0x52D7 }, { 0xB1E6, 0x671B }, { 0xB1E7, 0x6881 }, 
-	{ 0xB1E8, 0x68AF }, { 0xB1E9, 0x68A2 }, { 0xB1EA, 0x6893 }, { 0xB1EB, 0x68B5 }, { 0xB1EC, 0x687F }, { 0xB1ED, 0x6876 }, { 0xB1EE, 0x68B1 }, { 0xB1EF, 0x68A7 }, 
-	{ 0xB1F0, 0x6897 }, { 0xB1F1, 0x68B0 }, { 0xB1F2, 0x6883 }, { 0xB1F3, 0x68C4 }, { 0xB1F4, 0x68AD }, { 0xB1F5, 0x6886 }, { 0xB1F6, 0x6885 }, { 0xB1F7, 0x6894 }, 
-	{ 0xB1F8, 0x689D }, { 0xB1F9, 0x68A8 }, { 0xB1FA, 0x689F }, { 0xB1FB, 0x68A1 }, { 0xB1FC, 0x6882 }, { 0xB1FD, 0x6B32 }, { 0xB1FE, 0x6BBA }, { 0xB240, 0x6BEB }, 
-	{ 0xB241, 0x6BEC }, { 0xB242, 0x6C2B }, { 0xB243, 0x6D8E }, { 0xB244, 0x6DBC }, { 0xB245, 0x6DF3 }, { 0xB246, 0x6DD9 }, { 0xB247, 0x6DB2 }, { 0xB248, 0x6DE1 }, 
-	{ 0xB249, 0x6DCC }, { 0xB24A, 0x6DE4 }, { 0xB24B, 0x6DFB }, { 0xB24C, 0x6DFA }, { 0xB24D, 0x6E05 }, { 0xB24E, 0x6DC7 }, { 0xB24F, 0x6DCB }, { 0xB250, 0x6DAF }, 
-	{ 0xB251, 0x6DD1 }, { 0xB252, 0x6DAE }, { 0xB253, 0x6DDE }, { 0xB254, 0x6DF9 }, { 0xB255, 0x6DB8 }, { 0xB256, 0x6DF7 }, { 0xB257, 0x6DF5 }, { 0xB258, 0x6DC5 }, 
-	{ 0xB259, 0x6DD2 }, { 0xB25A, 0x6E1A }, { 0xB25B, 0x6DB5 }, { 0xB25C, 0x6DDA }, { 0xB25D, 0x6DEB }, { 0xB25E, 0x6DD8 }, { 0xB25F, 0x6DEA }, { 0xB260, 0x6DF1 }, 
-	{ 0xB261, 0x6DEE }, { 0xB262, 0x6DE8 }, { 0xB263, 0x6DC6 }, { 0xB264, 0x6DC4 }, { 0xB265, 0x6DAA }, { 0xB266, 0x6DEC }, { 0xB267, 0x6DBF }, { 0xB268, 0x6DE6 }, 
-	{ 0xB269, 0x70F9 }, { 0xB26A, 0x7109 }, { 0xB26B, 0x710A }, { 0xB26C, 0x70FD }, { 0xB26D, 0x70EF }, { 0xB26E, 0x723D }, { 0xB26F, 0x727D }, { 0xB270, 0x7281 }, 
-	{ 0xB271, 0x731C }, { 0xB272, 0x731B }, { 0xB273, 0x7316 }, { 0xB274, 0x7313 }, { 0xB275, 0x7319 }, { 0xB276, 0x7387 }, { 0xB277, 0x7405 }, { 0xB278, 0x740A }, 
-	{ 0xB279, 0x7403 }, { 0xB27A, 0x7406 }, { 0xB27B, 0x73FE }, { 0xB27C, 0x740D }, { 0xB27D, 0x74E0 }, { 0xB27E, 0x74F6 }, { 0xB2A1, 0x74F7 }, { 0xB2A2, 0x751C }, 
-	{ 0xB2A3, 0x7522 }, { 0xB2A4, 0x7565 }, { 0xB2A5, 0x7566 }, { 0xB2A6, 0x7562 }, { 0xB2A7, 0x7570 }, { 0xB2A8, 0x758F }, { 0xB2A9, 0x75D4 }, { 0xB2AA, 0x75D5 }, 
-	{ 0xB2AB, 0x75B5 }, { 0xB2AC, 0x75CA }, { 0xB2AD, 0x75CD }, { 0xB2AE, 0x768E }, { 0xB2AF, 0x76D4 }, { 0xB2B0, 0x76D2 }, { 0xB2B1, 0x76DB }, { 0xB2B2, 0x7737 }, 
-	{ 0xB2B3, 0x773E }, { 0xB2B4, 0x773C }, { 0xB2B5, 0x7736 }, { 0xB2B6, 0x7738 }, { 0xB2B7, 0x773A }, { 0xB2B8, 0x786B }, { 0xB2B9, 0x7843 }, { 0xB2BA, 0x784E }, 
-	{ 0xB2BB, 0x7965 }, { 0xB2BC, 0x7968 }, { 0xB2BD, 0x796D }, { 0xB2BE, 0x79FB }, { 0xB2BF, 0x7A92 }, { 0xB2C0, 0x7A95 }, { 0xB2C1, 0x7B20 }, { 0xB2C2, 0x7B28 }, 
-	{ 0xB2C3, 0x7B1B }, { 0xB2C4, 0x7B2C }, { 0xB2C5, 0x7B26 }, { 0xB2C6, 0x7B19 }, { 0xB2C7, 0x7B1E }, { 0xB2C8, 0x7B2E }, { 0xB2C9, 0x7C92 }, { 0xB2CA, 0x7C97 }, 
-	{ 0xB2CB, 0x7C95 }, { 0xB2CC, 0x7D46 }, { 0xB2CD, 0x7D43 }, { 0xB2CE, 0x7D71 }, { 0xB2CF, 0x7D2E }, { 0xB2D0, 0x7D39 }, { 0xB2D1, 0x7D3C }, { 0xB2D2, 0x7D40 }, 
-	{ 0xB2D3, 0x7D30 }, { 0xB2D4, 0x7D33 }, { 0xB2D5, 0x7D44 }, { 0xB2D6, 0x7D2F }, { 0xB2D7, 0x7D42 }, { 0xB2D8, 0x7D32 }, { 0xB2D9, 0x7D31 }, { 0xB2DA, 0x7F3D }, 
-	{ 0xB2DB, 0x7F9E }, { 0xB2DC, 0x7F9A }, { 0xB2DD, 0x7FCC }, { 0xB2DE, 0x7FCE }, { 0xB2DF, 0x7FD2 }, { 0xB2E0, 0x801C }, { 0xB2E1, 0x804A }, { 0xB2E2, 0x8046 }, 
-	{ 0xB2E3, 0x812F }, { 0xB2E4, 0x8116 }, { 0xB2E5, 0x8123 }, { 0xB2E6, 0x812B }, { 0xB2E7, 0x8129 }, { 0xB2E8, 0x8130 }, { 0xB2E9, 0x8124 }, { 0xB2EA, 0x8202 }, 
-	{ 0xB2EB, 0x8235 }, { 0xB2EC, 0x8237 }, { 0xB2ED, 0x8236 }, { 0xB2EE, 0x8239 }, { 0xB2EF, 0x838E }, { 0xB2F0, 0x839E }, { 0xB2F1, 0x8398 }, { 0xB2F2, 0x8378 }, 
-	{ 0xB2F3, 0x83A2 }, { 0xB2F4, 0x8396 }, { 0xB2F5, 0x83BD }, { 0xB2F6, 0x83AB }, { 0xB2F7, 0x8392 }, { 0xB2F8, 0x838A }, { 0xB2F9, 0x8393 }, { 0xB2FA, 0x8389 }, 
-	{ 0xB2FB, 0x83A0 }, { 0xB2FC, 0x8377 }, { 0xB2FD, 0x837B }, { 0xB2FE, 0x837C }, { 0xB340, 0x8386 }, { 0xB341, 0x83A7 }, { 0xB342, 0x8655 }, { 0xB343, 0x5F6A }, 
-	{ 0xB344, 0x86C7 }, { 0xB345, 0x86C0 }, { 0xB346, 0x86B6 }, { 0xB347, 0x86C4 }, { 0xB348, 0x86B5 }, { 0xB349, 0x86C6 }, { 0xB34A, 0x86CB }, { 0xB34B, 0x86B1 }, 
-	{ 0xB34C, 0x86AF }, { 0xB34D, 0x86C9 }, { 0xB34E, 0x8853 }, { 0xB34F, 0x889E }, { 0xB350, 0x8888 }, { 0xB351, 0x88AB }, { 0xB352, 0x8892 }, { 0xB353, 0x8896 }, 
-	{ 0xB354, 0x888D }, { 0xB355, 0x888B }, { 0xB356, 0x8993 }, { 0xB357, 0x898F }, { 0xB358, 0x8A2A }, { 0xB359, 0x8A1D }, { 0xB35A, 0x8A23 }, { 0xB35B, 0x8A25 }, 
-	{ 0xB35C, 0x8A31 }, { 0xB35D, 0x8A2D }, { 0xB35E, 0x8A1F }, { 0xB35F, 0x8A1B }, { 0xB360, 0x8A22 }, { 0xB361, 0x8C49 }, { 0xB362, 0x8C5A }, { 0xB363, 0x8CA9 }, 
-	{ 0xB364, 0x8CAC }, { 0xB365, 0x8CAB }, { 0xB366, 0x8CA8 }, { 0xB367, 0x8CAA }, { 0xB368, 0x8CA7 }, { 0xB369, 0x8D67 }, { 0xB36A, 0x8D66 }, { 0xB36B, 0x8DBE }, 
-	{ 0xB36C, 0x8DBA }, { 0xB36D, 0x8EDB }, { 0xB36E, 0x8EDF }, { 0xB36F, 0x9019 }, { 0xB370, 0x900D }, { 0xB371, 0x901A }, { 0xB372, 0x9017 }, { 0xB373, 0x9023 }, 
-	{ 0xB374, 0x901F }, { 0xB375, 0x901D }, { 0xB376, 0x9010 }, { 0xB377, 0x9015 }, { 0xB378, 0x901E }, { 0xB379, 0x9020 }, { 0xB37A, 0x900F }, { 0xB37B, 0x9022 }, 
-	{ 0xB37C, 0x9016 }, { 0xB37D, 0x901B }, { 0xB37E, 0x9014 }, { 0xB3A1, 0x90E8 }, { 0xB3A2, 0x90ED }, { 0xB3A3, 0x90FD }, { 0xB3A4, 0x9157 }, { 0xB3A5, 0x91CE }, 
-	{ 0xB3A6, 0x91F5 }, { 0xB3A7, 0x91E6 }, { 0xB3A8, 0x91E3 }, { 0xB3A9, 0x91E7 }, { 0xB3AA, 0x91ED }, { 0xB3AB, 0x91E9 }, { 0xB3AC, 0x9589 }, { 0xB3AD, 0x966A }, 
-	{ 0xB3AE, 0x9675 }, { 0xB3AF, 0x9673 }, { 0xB3B0, 0x9678 }, { 0xB3B1, 0x9670 }, { 0xB3B2, 0x9674 }, { 0xB3B3, 0x9676 }, { 0xB3B4, 0x9677 }, { 0xB3B5, 0x966C }, 
-	{ 0xB3B6, 0x96C0 }, { 0xB3B7, 0x96EA }, { 0xB3B8, 0x96E9 }, { 0xB3B9, 0x7AE0 }, { 0xB3BA, 0x7ADF }, { 0xB3BB, 0x9802 }, { 0xB3BC, 0x9803 }, { 0xB3BD, 0x9B5A }, 
-	{ 0xB3BE, 0x9CE5 }, { 0xB3BF, 0x9E75 }, { 0xB3C0, 0x9E7F }, { 0xB3C1, 0x9EA5 }, { 0xB3C2, 0x9EBB }, { 0xB3C3, 0x50A2 }, { 0xB3C4, 0x508D }, { 0xB3C5, 0x5085 }, 
-	{ 0xB3C6, 0x5099 }, { 0xB3C7, 0x5091 }, { 0xB3C8, 0x5080 }, { 0xB3C9, 0x5096 }, { 0xB3CA, 0x5098 }, { 0xB3CB, 0x509A }, { 0xB3CC, 0x6700 }, { 0xB3CD, 0x51F1 }, 
-	{ 0xB3CE, 0x5272 }, { 0xB3CF, 0x5274 }, { 0xB3D0, 0x5275 }, { 0xB3D1, 0x5269 }, { 0xB3D2, 0x52DE }, { 0xB3D3, 0x52DD }, { 0xB3D4, 0x52DB }, { 0xB3D5, 0x535A }, 
-	{ 0xB3D6, 0x53A5 }, { 0xB3D7, 0x557B }, { 0xB3D8, 0x5580 }, { 0xB3D9, 0x55A7 }, { 0xB3DA, 0x557C }, { 0xB3DB, 0x558A }, { 0xB3DC, 0x559D }, { 0xB3DD, 0x5598 }, 
-	{ 0xB3DE, 0x5582 }, { 0xB3DF, 0x559C }, { 0xB3E0, 0x55AA }, { 0xB3E1, 0x5594 }, { 0xB3E2, 0x5587 }, { 0xB3E3, 0x558B }, { 0xB3E4, 0x5583 }, { 0xB3E5, 0x55B3 }, 
-	{ 0xB3E6, 0x55AE }, { 0xB3E7, 0x559F }, { 0xB3E8, 0x553E }, { 0xB3E9, 0x55B2 }, { 0xB3EA, 0x559A }, { 0xB3EB, 0x55BB }, { 0xB3EC, 0x55AC }, { 0xB3ED, 0x55B1 }, 
-	{ 0xB3EE, 0x557E }, { 0xB3EF, 0x5589 }, { 0xB3F0, 0x55AB }, { 0xB3F1, 0x5599 }, { 0xB3F2, 0x570D }, { 0xB3F3, 0x582F }, { 0xB3F4, 0x582A }, { 0xB3F5, 0x5834 }, 
-	{ 0xB3F6, 0x5824 }, { 0xB3F7, 0x5830 }, { 0xB3F8, 0x5831 }, { 0xB3F9, 0x5821 }, { 0xB3FA, 0x581D }, { 0xB3FB, 0x5820 }, { 0xB3FC, 0x58F9 }, { 0xB3FD, 0x58FA }, 
-	{ 0xB3FE, 0x5960 }, { 0xB440, 0x5A77 }, { 0xB441, 0x5A9A }, { 0xB442, 0x5A7F }, { 0xB443, 0x5A92 }, { 0xB444, 0x5A9B }, { 0xB445, 0x5AA7 }, { 0xB446, 0x5B73 }, 
-	{ 0xB447, 0x5B71 }, { 0xB448, 0x5BD2 }, { 0xB449, 0x5BCC }, { 0xB44A, 0x5BD3 }, { 0xB44B, 0x5BD0 }, { 0xB44C, 0x5C0A }, { 0xB44D, 0x5C0B }, { 0xB44E, 0x5C31 }, 
-	{ 0xB44F, 0x5D4C }, { 0xB450, 0x5D50 }, { 0xB451, 0x5D34 }, { 0xB452, 0x5D47 }, { 0xB453, 0x5DFD }, { 0xB454, 0x5E45 }, { 0xB455, 0x5E3D }, { 0xB456, 0x5E40 }, 
-	{ 0xB457, 0x5E43 }, { 0xB458, 0x5E7E }, { 0xB459, 0x5ECA }, { 0xB45A, 0x5EC1 }, { 0xB45B, 0x5EC2 }, { 0xB45C, 0x5EC4 }, { 0xB45D, 0x5F3C }, { 0xB45E, 0x5F6D }, 
-	{ 0xB45F, 0x5FA9 }, { 0xB460, 0x5FAA }, { 0xB461, 0x5FA8 }, { 0xB462, 0x60D1 }, { 0xB463, 0x60E1 }, { 0xB464, 0x60B2 }, { 0xB465, 0x60B6 }, { 0xB466, 0x60E0 }, 
-	{ 0xB467, 0x611C }, { 0xB468, 0x6123 }, { 0xB469, 0x60FA }, { 0xB46A, 0x6115 }, { 0xB46B, 0x60F0 }, { 0xB46C, 0x60FB }, { 0xB46D, 0x60F4 }, { 0xB46E, 0x6168 }, 
-	{ 0xB46F, 0x60F1 }, { 0xB470, 0x610E }, { 0xB471, 0x60F6 }, { 0xB472, 0x6109 }, { 0xB473, 0x6100 }, { 0xB474, 0x6112 }, { 0xB475, 0x621F }, { 0xB476, 0x6249 }, 
-	{ 0xB477, 0x63A3 }, { 0xB478, 0x638C }, { 0xB479, 0x63CF }, { 0xB47A, 0x63C0 }, { 0xB47B, 0x63E9 }, { 0xB47C, 0x63C9 }, { 0xB47D, 0x63C6 }, { 0xB47E, 0x63CD }, 
-	{ 0xB4A1, 0x63D2 }, { 0xB4A2, 0x63E3 }, { 0xB4A3, 0x63D0 }, { 0xB4A4, 0x63E1 }, { 0xB4A5, 0x63D6 }, { 0xB4A6, 0x63ED }, { 0xB4A7, 0x63EE }, { 0xB4A8, 0x6376 }, 
-	{ 0xB4A9, 0x63F4 }, { 0xB4AA, 0x63EA }, { 0xB4AB, 0x63DB }, { 0xB4AC, 0x6452 }, { 0xB4AD, 0x63DA }, { 0xB4AE, 0x63F9 }, { 0xB4AF, 0x655E }, { 0xB4B0, 0x6566 }, 
-	{ 0xB4B1, 0x6562 }, { 0xB4B2, 0x6563 }, { 0xB4B3, 0x6591 }, { 0xB4B4, 0x6590 }, { 0xB4B5, 0x65AF }, { 0xB4B6, 0x666E }, { 0xB4B7, 0x6670 }, { 0xB4B8, 0x6674 }, 
-	{ 0xB4B9, 0x6676 }, { 0xB4BA, 0x666F }, { 0xB4BB, 0x6691 }, { 0xB4BC, 0x667A }, { 0xB4BD, 0x667E }, { 0xB4BE, 0x6677 }, { 0xB4BF, 0x66FE }, { 0xB4C0, 0x66FF }, 
-	{ 0xB4C1, 0x671F }, { 0xB4C2, 0x671D }, { 0xB4C3, 0x68FA }, { 0xB4C4, 0x68D5 }, { 0xB4C5, 0x68E0 }, { 0xB4C6, 0x68D8 }, { 0xB4C7, 0x68D7 }, { 0xB4C8, 0x6905 }, 
-	{ 0xB4C9, 0x68DF }, { 0xB4CA, 0x68F5 }, { 0xB4CB, 0x68EE }, { 0xB4CC, 0x68E7 }, { 0xB4CD, 0x68F9 }, { 0xB4CE, 0x68D2 }, { 0xB4CF, 0x68F2 }, { 0xB4D0, 0x68E3 }, 
-	{ 0xB4D1, 0x68CB }, { 0xB4D2, 0x68CD }, { 0xB4D3, 0x690D }, { 0xB4D4, 0x6912 }, { 0xB4D5, 0x690E }, { 0xB4D6, 0x68C9 }, { 0xB4D7, 0x68DA }, { 0xB4D8, 0x696E }, 
-	{ 0xB4D9, 0x68FB }, { 0xB4DA, 0x6B3E }, { 0xB4DB, 0x6B3A }, { 0xB4DC, 0x6B3D }, { 0xB4DD, 0x6B98 }, { 0xB4DE, 0x6B96 }, { 0xB4DF, 0x6BBC }, { 0xB4E0, 0x6BEF }, 
-	{ 0xB4E1, 0x6C2E }, { 0xB4E2, 0x6C2F }, { 0xB4E3, 0x6C2C }, { 0xB4E4, 0x6E2F }, { 0xB4E5, 0x6E38 }, { 0xB4E6, 0x6E54 }, { 0xB4E7, 0x6E21 }, { 0xB4E8, 0x6E32 }, 
-	{ 0xB4E9, 0x6E67 }, { 0xB4EA, 0x6E4A }, { 0xB4EB, 0x6E20 }, { 0xB4EC, 0x6E25 }, { 0xB4ED, 0x6E23 }, { 0xB4EE, 0x6E1B }, { 0xB4EF, 0x6E5B }, { 0xB4F0, 0x6E58 }, 
-	{ 0xB4F1, 0x6E24 }, { 0xB4F2, 0x6E56 }, { 0xB4F3, 0x6E6E }, { 0xB4F4, 0x6E2D }, { 0xB4F5, 0x6E26 }, { 0xB4F6, 0x6E6F }, { 0xB4F7, 0x6E34 }, { 0xB4F8, 0x6E4D }, 
-	{ 0xB4F9, 0x6E3A }, { 0xB4FA, 0x6E2C }, { 0xB4FB, 0x6E43 }, { 0xB4FC, 0x6E1D }, { 0xB4FD, 0x6E3E }, { 0xB4FE, 0x6ECB }, { 0xB540, 0x6E89 }, { 0xB541, 0x6E19 }, 
-	{ 0xB542, 0x6E4E }, { 0xB543, 0x6E63 }, { 0xB544, 0x6E44 }, { 0xB545, 0x6E72 }, { 0xB546, 0x6E69 }, { 0xB547, 0x6E5F }, { 0xB548, 0x7119 }, { 0xB549, 0x711A }, 
-	{ 0xB54A, 0x7126 }, { 0xB54B, 0x7130 }, { 0xB54C, 0x7121 }, { 0xB54D, 0x7136 }, { 0xB54E, 0x716E }, { 0xB54F, 0x711C }, { 0xB550, 0x724C }, { 0xB551, 0x7284 }, 
-	{ 0xB552, 0x7280 }, { 0xB553, 0x7336 }, { 0xB554, 0x7325 }, { 0xB555, 0x7334 }, { 0xB556, 0x7329 }, { 0xB557, 0x743A }, { 0xB558, 0x742A }, { 0xB559, 0x7433 }, 
-	{ 0xB55A, 0x7422 }, { 0xB55B, 0x7425 }, { 0xB55C, 0x7435 }, { 0xB55D, 0x7436 }, { 0xB55E, 0x7434 }, { 0xB55F, 0x742F }, { 0xB560, 0x741B }, { 0xB561, 0x7426 }, 
-	{ 0xB562, 0x7428 }, { 0xB563, 0x7525 }, { 0xB564, 0x7526 }, { 0xB565, 0x756B }, { 0xB566, 0x756A }, { 0xB567, 0x75E2 }, { 0xB568, 0x75DB }, { 0xB569, 0x75E3 }, 
-	{ 0xB56A, 0x75D9 }, { 0xB56B, 0x75D8 }, { 0xB56C, 0x75DE }, { 0xB56D, 0x75E0 }, { 0xB56E, 0x767B }, { 0xB56F, 0x767C }, { 0xB570, 0x7696 }, { 0xB571, 0x7693 }, 
-	{ 0xB572, 0x76B4 }, { 0xB573, 0x76DC }, { 0xB574, 0x774F }, { 0xB575, 0x77ED }, { 0xB576, 0x785D }, { 0xB577, 0x786C }, { 0xB578, 0x786F }, { 0xB579, 0x7A0D }, 
-	{ 0xB57A, 0x7A08 }, { 0xB57B, 0x7A0B }, { 0xB57C, 0x7A05 }, { 0xB57D, 0x7A00 }, { 0xB57E, 0x7A98 }, { 0xB5A1, 0x7A97 }, { 0xB5A2, 0x7A96 }, { 0xB5A3, 0x7AE5 }, 
-	{ 0xB5A4, 0x7AE3 }, { 0xB5A5, 0x7B49 }, { 0xB5A6, 0x7B56 }, { 0xB5A7, 0x7B46 }, { 0xB5A8, 0x7B50 }, { 0xB5A9, 0x7B52 }, { 0xB5AA, 0x7B54 }, { 0xB5AB, 0x7B4D }, 
-	{ 0xB5AC, 0x7B4B }, { 0xB5AD, 0x7B4F }, { 0xB5AE, 0x7B51 }, { 0xB5AF, 0x7C9F }, { 0xB5B0, 0x7CA5 }, { 0xB5B1, 0x7D5E }, { 0xB5B2, 0x7D50 }, { 0xB5B3, 0x7D68 }, 
-	{ 0xB5B4, 0x7D55 }, { 0xB5B5, 0x7D2B }, { 0xB5B6, 0x7D6E }, { 0xB5B7, 0x7D72 }, { 0xB5B8, 0x7D61 }, { 0xB5B9, 0x7D66 }, { 0xB5BA, 0x7D62 }, { 0xB5BB, 0x7D70 }, 
-	{ 0xB5BC, 0x7D73 }, { 0xB5BD, 0x5584 }, { 0xB5BE, 0x7FD4 }, { 0xB5BF, 0x7FD5 }, { 0xB5C0, 0x800B }, { 0xB5C1, 0x8052 }, { 0xB5C2, 0x8085 }, { 0xB5C3, 0x8155 }, 
-	{ 0xB5C4, 0x8154 }, { 0xB5C5, 0x814B }, { 0xB5C6, 0x8151 }, { 0xB5C7, 0x814E }, { 0xB5C8, 0x8139 }, { 0xB5C9, 0x8146 }, { 0xB5CA, 0x813E }, { 0xB5CB, 0x814C }, 
-	{ 0xB5CC, 0x8153 }, { 0xB5CD, 0x8174 }, { 0xB5CE, 0x8212 }, { 0xB5CF, 0x821C }, { 0xB5D0, 0x83E9 }, { 0xB5D1, 0x8403 }, { 0xB5D2, 0x83F8 }, { 0xB5D3, 0x840D }, 
-	{ 0xB5D4, 0x83E0 }, { 0xB5D5, 0x83C5 }, { 0xB5D6, 0x840B }, { 0xB5D7, 0x83C1 }, { 0xB5D8, 0x83EF }, { 0xB5D9, 0x83F1 }, { 0xB5DA, 0x83F4 }, { 0xB5DB, 0x8457 }, 
-	{ 0xB5DC, 0x840A }, { 0xB5DD, 0x83F0 }, { 0xB5DE, 0x840C }, { 0xB5DF, 0x83CC }, { 0xB5E0, 0x83FD }, { 0xB5E1, 0x83F2 }, { 0xB5E2, 0x83CA }, { 0xB5E3, 0x8438 }, 
-	{ 0xB5E4, 0x840E }, { 0xB5E5, 0x8404 }, { 0xB5E6, 0x83DC }, { 0xB5E7, 0x8407 }, { 0xB5E8, 0x83D4 }, { 0xB5E9, 0x83DF }, { 0xB5EA, 0x865B }, { 0xB5EB, 0x86DF }, 
-	{ 0xB5EC, 0x86D9 }, { 0xB5ED, 0x86ED }, { 0xB5EE, 0x86D4 }, { 0xB5EF, 0x86DB }, { 0xB5F0, 0x86E4 }, { 0xB5F1, 0x86D0 }, { 0xB5F2, 0x86DE }, { 0xB5F3, 0x8857 }, 
-	{ 0xB5F4, 0x88C1 }, { 0xB5F5, 0x88C2 }, { 0xB5F6, 0x88B1 }, { 0xB5F7, 0x8983 }, { 0xB5F8, 0x8996 }, { 0xB5F9, 0x8A3B }, { 0xB5FA, 0x8A60 }, { 0xB5FB, 0x8A55 }, 
-	{ 0xB5FC, 0x8A5E }, { 0xB5FD, 0x8A3C }, { 0xB5FE, 0x8A41 }, { 0xB640, 0x8A54 }, { 0xB641, 0x8A5B }, { 0xB642, 0x8A50 }, { 0xB643, 0x8A46 }, { 0xB644, 0x8A34 }, 
-	{ 0xB645, 0x8A3A }, { 0xB646, 0x8A36 }, { 0xB647, 0x8A56 }, { 0xB648, 0x8C61 }, { 0xB649, 0x8C82 }, { 0xB64A, 0x8CAF }, { 0xB64B, 0x8CBC }, { 0xB64C, 0x8CB3 }, 
-	{ 0xB64D, 0x8CBD }, { 0xB64E, 0x8CC1 }, { 0xB64F, 0x8CBB }, { 0xB650, 0x8CC0 }, { 0xB651, 0x8CB4 }, { 0xB652, 0x8CB7 }, { 0xB653, 0x8CB6 }, { 0xB654, 0x8CBF }, 
-	{ 0xB655, 0x8CB8 }, { 0xB656, 0x8D8A }, { 0xB657, 0x8D85 }, { 0xB658, 0x8D81 }, { 0xB659, 0x8DCE }, { 0xB65A, 0x8DDD }, { 0xB65B, 0x8DCB }, { 0xB65C, 0x8DDA }, 
-	{ 0xB65D, 0x8DD1 }, { 0xB65E, 0x8DCC }, { 0xB65F, 0x8DDB }, { 0xB660, 0x8DC6 }, { 0xB661, 0x8EFB }, { 0xB662, 0x8EF8 }, { 0xB663, 0x8EFC }, { 0xB664, 0x8F9C }, 
-	{ 0xB665, 0x902E }, { 0xB666, 0x9035 }, { 0xB667, 0x9031 }, { 0xB668, 0x9038 }, { 0xB669, 0x9032 }, { 0xB66A, 0x9036 }, { 0xB66B, 0x9102 }, { 0xB66C, 0x90F5 }, 
-	{ 0xB66D, 0x9109 }, { 0xB66E, 0x90FE }, { 0xB66F, 0x9163 }, { 0xB670, 0x9165 }, { 0xB671, 0x91CF }, { 0xB672, 0x9214 }, { 0xB673, 0x9215 }, { 0xB674, 0x9223 }, 
-	{ 0xB675, 0x9209 }, { 0xB676, 0x921E }, { 0xB677, 0x920D }, { 0xB678, 0x9210 }, { 0xB679, 0x9207 }, { 0xB67A, 0x9211 }, { 0xB67B, 0x9594 }, { 0xB67C, 0x958F }, 
-	{ 0xB67D, 0x958B }, { 0xB67E, 0x9591 }, { 0xB6A1, 0x9593 }, { 0xB6A2, 0x9592 }, { 0xB6A3, 0x958E }, { 0xB6A4, 0x968A }, { 0xB6A5, 0x968E }, { 0xB6A6, 0x968B }, 
-	{ 0xB6A7, 0x967D }, { 0xB6A8, 0x9685 }, { 0xB6A9, 0x9686 }, { 0xB6AA, 0x968D }, { 0xB6AB, 0x9672 }, { 0xB6AC, 0x9684 }, { 0xB6AD, 0x96C1 }, { 0xB6AE, 0x96C5 }, 
-	{ 0xB6AF, 0x96C4 }, { 0xB6B0, 0x96C6 }, { 0xB6B1, 0x96C7 }, { 0xB6B2, 0x96EF }, { 0xB6B3, 0x96F2 }, { 0xB6B4, 0x97CC }, { 0xB6B5, 0x9805 }, { 0xB6B6, 0x9806 }, 
-	{ 0xB6B7, 0x9808 }, { 0xB6B8, 0x98E7 }, { 0xB6B9, 0x98EA }, { 0xB6BA, 0x98EF }, { 0xB6BB, 0x98E9 }, { 0xB6BC, 0x98F2 }, { 0xB6BD, 0x98ED }, { 0xB6BE, 0x99AE }, 
-	{ 0xB6BF, 0x99AD }, { 0xB6C0, 0x9EC3 }, { 0xB6C1, 0x9ECD }, { 0xB6C2, 0x9ED1 }, { 0xB6C3, 0x4E82 }, { 0xB6C4, 0x50AD }, { 0xB6C5, 0x50B5 }, { 0xB6C6, 0x50B2 }, 
-	{ 0xB6C7, 0x50B3 }, { 0xB6C8, 0x50C5 }, { 0xB6C9, 0x50BE }, { 0xB6CA, 0x50AC }, { 0xB6CB, 0x50B7 }, { 0xB6CC, 0x50BB }, { 0xB6CD, 0x50AF }, { 0xB6CE, 0x50C7 }, 
-	{ 0xB6CF, 0x527F }, { 0xB6D0, 0x5277 }, { 0xB6D1, 0x527D }, { 0xB6D2, 0x52DF }, { 0xB6D3, 0x52E6 }, { 0xB6D4, 0x52E4 }, { 0xB6D5, 0x52E2 }, { 0xB6D6, 0x52E3 }, 
-	{ 0xB6D7, 0x532F }, { 0xB6D8, 0x55DF }, { 0xB6D9, 0x55E8 }, { 0xB6DA, 0x55D3 }, { 0xB6DB, 0x55E6 }, { 0xB6DC, 0x55CE }, { 0xB6DD, 0x55DC }, { 0xB6DE, 0x55C7 }, 
-	{ 0xB6DF, 0x55D1 }, { 0xB6E0, 0x55E3 }, { 0xB6E1, 0x55E4 }, { 0xB6E2, 0x55EF }, { 0xB6E3, 0x55DA }, { 0xB6E4, 0x55E1 }, { 0xB6E5, 0x55C5 }, { 0xB6E6, 0x55C6 }, 
-	{ 0xB6E7, 0x55E5 }, { 0xB6E8, 0x55C9 }, { 0xB6E9, 0x5712 }, { 0xB6EA, 0x5713 }, { 0xB6EB, 0x585E }, { 0xB6EC, 0x5851 }, { 0xB6ED, 0x5858 }, { 0xB6EE, 0x5857 }, 
-	{ 0xB6EF, 0x585A }, { 0xB6F0, 0x5854 }, { 0xB6F1, 0x586B }, { 0xB6F2, 0x584C }, { 0xB6F3, 0x586D }, { 0xB6F4, 0x584A }, { 0xB6F5, 0x5862 }, { 0xB6F6, 0x5852 }, 
-	{ 0xB6F7, 0x584B }, { 0xB6F8, 0x5967 }, { 0xB6F9, 0x5AC1 }, { 0xB6FA, 0x5AC9 }, { 0xB6FB, 0x5ACC }, { 0xB6FC, 0x5ABE }, { 0xB6FD, 0x5ABD }, { 0xB6FE, 0x5ABC }, 
-	{ 0xB740, 0x5AB3 }, { 0xB741, 0x5AC2 }, { 0xB742, 0x5AB2 }, { 0xB743, 0x5D69 }, { 0xB744, 0x5D6F }, { 0xB745, 0x5E4C }, { 0xB746, 0x5E79 }, { 0xB747, 0x5EC9 }, 
-	{ 0xB748, 0x5EC8 }, { 0xB749, 0x5F12 }, { 0xB74A, 0x5F59 }, { 0xB74B, 0x5FAC }, { 0xB74C, 0x5FAE }, { 0xB74D, 0x611A }, { 0xB74E, 0x610F }, { 0xB74F, 0x6148 }, 
-	{ 0xB750, 0x611F }, { 0xB751, 0x60F3 }, { 0xB752, 0x611B }, { 0xB753, 0x60F9 }, { 0xB754, 0x6101 }, { 0xB755, 0x6108 }, { 0xB756, 0x614E }, { 0xB757, 0x614C }, 
-	{ 0xB758, 0x6144 }, { 0xB759, 0x614D }, { 0xB75A, 0x613E }, { 0xB75B, 0x6134 }, { 0xB75C, 0x6127 }, { 0xB75D, 0x610D }, { 0xB75E, 0x6106 }, { 0xB75F, 0x6137 }, 
-	{ 0xB760, 0x6221 }, { 0xB761, 0x6222 }, { 0xB762, 0x6413 }, { 0xB763, 0x643E }, { 0xB764, 0x641E }, { 0xB765, 0x642A }, { 0xB766, 0x642D }, { 0xB767, 0x643D }, 
-	{ 0xB768, 0x642C }, { 0xB769, 0x640F }, { 0xB76A, 0x641C }, { 0xB76B, 0x6414 }, { 0xB76C, 0x640D }, { 0xB76D, 0x6436 }, { 0xB76E, 0x6416 }, { 0xB76F, 0x6417 }, 
-	{ 0xB770, 0x6406 }, { 0xB771, 0x656C }, { 0xB772, 0x659F }, { 0xB773, 0x65B0 }, { 0xB774, 0x6697 }, { 0xB775, 0x6689 }, { 0xB776, 0x6687 }, { 0xB777, 0x6688 }, 
-	{ 0xB778, 0x6696 }, { 0xB779, 0x6684 }, { 0xB77A, 0x6698 }, { 0xB77B, 0x668D }, { 0xB77C, 0x6703 }, { 0xB77D, 0x6994 }, { 0xB77E, 0x696D }, { 0xB7A1, 0x695A }, 
-	{ 0xB7A2, 0x6977 }, { 0xB7A3, 0x6960 }, { 0xB7A4, 0x6954 }, { 0xB7A5, 0x6975 }, { 0xB7A6, 0x6930 }, { 0xB7A7, 0x6982 }, { 0xB7A8, 0x694A }, { 0xB7A9, 0x6968 }, 
-	{ 0xB7AA, 0x696B }, { 0xB7AB, 0x695E }, { 0xB7AC, 0x6953 }, { 0xB7AD, 0x6979 }, { 0xB7AE, 0x6986 }, { 0xB7AF, 0x695D }, { 0xB7B0, 0x6963 }, { 0xB7B1, 0x695B }, 
-	{ 0xB7B2, 0x6B47 }, { 0xB7B3, 0x6B72 }, { 0xB7B4, 0x6BC0 }, { 0xB7B5, 0x6BBF }, { 0xB7B6, 0x6BD3 }, { 0xB7B7, 0x6BFD }, { 0xB7B8, 0x6EA2 }, { 0xB7B9, 0x6EAF }, 
-	{ 0xB7BA, 0x6ED3 }, { 0xB7BB, 0x6EB6 }, { 0xB7BC, 0x6EC2 }, { 0xB7BD, 0x6E90 }, { 0xB7BE, 0x6E9D }, { 0xB7BF, 0x6EC7 }, { 0xB7C0, 0x6EC5 }, { 0xB7C1, 0x6EA5 }, 
-	{ 0xB7C2, 0x6E98 }, { 0xB7C3, 0x6EBC }, { 0xB7C4, 0x6EBA }, { 0xB7C5, 0x6EAB }, { 0xB7C6, 0x6ED1 }, { 0xB7C7, 0x6E96 }, { 0xB7C8, 0x6E9C }, { 0xB7C9, 0x6EC4 }, 
-	{ 0xB7CA, 0x6ED4 }, { 0xB7CB, 0x6EAA }, { 0xB7CC, 0x6EA7 }, { 0xB7CD, 0x6EB4 }, { 0xB7CE, 0x714E }, { 0xB7CF, 0x7159 }, { 0xB7D0, 0x7169 }, { 0xB7D1, 0x7164 }, 
-	{ 0xB7D2, 0x7149 }, { 0xB7D3, 0x7167 }, { 0xB7D4, 0x715C }, { 0xB7D5, 0x716C }, { 0xB7D6, 0x7166 }, { 0xB7D7, 0x714C }, { 0xB7D8, 0x7165 }, { 0xB7D9, 0x715E }, 
-	{ 0xB7DA, 0x7146 }, { 0xB7DB, 0x7168 }, { 0xB7DC, 0x7156 }, { 0xB7DD, 0x723A }, { 0xB7DE, 0x7252 }, { 0xB7DF, 0x7337 }, { 0xB7E0, 0x7345 }, { 0xB7E1, 0x733F }, 
-	{ 0xB7E2, 0x733E }, { 0xB7E3, 0x746F }, { 0xB7E4, 0x745A }, { 0xB7E5, 0x7455 }, { 0xB7E6, 0x745F }, { 0xB7E7, 0x745E }, { 0xB7E8, 0x7441 }, { 0xB7E9, 0x743F }, 
-	{ 0xB7EA, 0x7459 }, { 0xB7EB, 0x745B }, { 0xB7EC, 0x745C }, { 0xB7ED, 0x7576 }, { 0xB7EE, 0x7578 }, { 0xB7EF, 0x7600 }, { 0xB7F0, 0x75F0 }, { 0xB7F1, 0x7601 }, 
-	{ 0xB7F2, 0x75F2 }, { 0xB7F3, 0x75F1 }, { 0xB7F4, 0x75FA }, { 0xB7F5, 0x75FF }, { 0xB7F6, 0x75F4 }, { 0xB7F7, 0x75F3 }, { 0xB7F8, 0x76DE }, { 0xB7F9, 0x76DF }, 
-	{ 0xB7FA, 0x775B }, { 0xB7FB, 0x776B }, { 0xB7FC, 0x7766 }, { 0xB7FD, 0x775E }, { 0xB7FE, 0x7763 }, { 0xB840, 0x7779 }, { 0xB841, 0x776A }, { 0xB842, 0x776C }, 
-	{ 0xB843, 0x775C }, { 0xB844, 0x7765 }, { 0xB845, 0x7768 }, { 0xB846, 0x7762 }, { 0xB847, 0x77EE }, { 0xB848, 0x788E }, { 0xB849, 0x78B0 }, { 0xB84A, 0x7897 }, 
-	{ 0xB84B, 0x7898 }, { 0xB84C, 0x788C }, { 0xB84D, 0x7889 }, { 0xB84E, 0x787C }, { 0xB84F, 0x7891 }, { 0xB850, 0x7893 }, { 0xB851, 0x787F }, { 0xB852, 0x797A }, 
-	{ 0xB853, 0x797F }, { 0xB854, 0x7981 }, { 0xB855, 0x842C }, { 0xB856, 0x79BD }, { 0xB857, 0x7A1C }, { 0xB858, 0x7A1A }, { 0xB859, 0x7A20 }, { 0xB85A, 0x7A14 }, 
-	{ 0xB85B, 0x7A1F }, { 0xB85C, 0x7A1E }, { 0xB85D, 0x7A9F }, { 0xB85E, 0x7AA0 }, { 0xB85F, 0x7B77 }, { 0xB860, 0x7BC0 }, { 0xB861, 0x7B60 }, { 0xB862, 0x7B6E }, 
-	{ 0xB863, 0x7B67 }, { 0xB864, 0x7CB1 }, { 0xB865, 0x7CB3 }, { 0xB866, 0x7CB5 }, { 0xB867, 0x7D93 }, { 0xB868, 0x7D79 }, { 0xB869, 0x7D91 }, { 0xB86A, 0x7D81 }, 
-	{ 0xB86B, 0x7D8F }, { 0xB86C, 0x7D5B }, { 0xB86D, 0x7F6E }, { 0xB86E, 0x7F69 }, { 0xB86F, 0x7F6A }, { 0xB870, 0x7F72 }, { 0xB871, 0x7FA9 }, { 0xB872, 0x7FA8 }, 
-	{ 0xB873, 0x7FA4 }, { 0xB874, 0x8056 }, { 0xB875, 0x8058 }, { 0xB876, 0x8086 }, { 0xB877, 0x8084 }, { 0xB878, 0x8171 }, { 0xB879, 0x8170 }, { 0xB87A, 0x8178 }, 
-	{ 0xB87B, 0x8165 }, { 0xB87C, 0x816E }, { 0xB87D, 0x8173 }, { 0xB87E, 0x816B }, { 0xB8A1, 0x8179 }, { 0xB8A2, 0x817A }, { 0xB8A3, 0x8166 }, { 0xB8A4, 0x8205 }, 
-	{ 0xB8A5, 0x8247 }, { 0xB8A6, 0x8482 }, { 0xB8A7, 0x8477 }, { 0xB8A8, 0x843D }, { 0xB8A9, 0x8431 }, { 0xB8AA, 0x8475 }, { 0xB8AB, 0x8466 }, { 0xB8AC, 0x846B }, 
-	{ 0xB8AD, 0x8449 }, { 0xB8AE, 0x846C }, { 0xB8AF, 0x845B }, { 0xB8B0, 0x843C }, { 0xB8B1, 0x8435 }, { 0xB8B2, 0x8461 }, { 0xB8B3, 0x8463 }, { 0xB8B4, 0x8469 }, 
-	{ 0xB8B5, 0x846D }, { 0xB8B6, 0x8446 }, { 0xB8B7, 0x865E }, { 0xB8B8, 0x865C }, { 0xB8B9, 0x865F }, { 0xB8BA, 0x86F9 }, { 0xB8BB, 0x8713 }, { 0xB8BC, 0x8708 }, 
-	{ 0xB8BD, 0x8707 }, { 0xB8BE, 0x8700 }, { 0xB8BF, 0x86FE }, { 0xB8C0, 0x86FB }, { 0xB8C1, 0x8702 }, { 0xB8C2, 0x8703 }, { 0xB8C3, 0x8706 }, { 0xB8C4, 0x870A }, 
-	{ 0xB8C5, 0x8859 }, { 0xB8C6, 0x88DF }, { 0xB8C7, 0x88D4 }, { 0xB8C8, 0x88D9 }, { 0xB8C9, 0x88DC }, { 0xB8CA, 0x88D8 }, { 0xB8CB, 0x88DD }, { 0xB8CC, 0x88E1 }, 
-	{ 0xB8CD, 0x88CA }, { 0xB8CE, 0x88D5 }, { 0xB8CF, 0x88D2 }, { 0xB8D0, 0x899C }, { 0xB8D1, 0x89E3 }, { 0xB8D2, 0x8A6B }, { 0xB8D3, 0x8A72 }, { 0xB8D4, 0x8A73 }, 
-	{ 0xB8D5, 0x8A66 }, { 0xB8D6, 0x8A69 }, { 0xB8D7, 0x8A70 }, { 0xB8D8, 0x8A87 }, { 0xB8D9, 0x8A7C }, { 0xB8DA, 0x8A63 }, { 0xB8DB, 0x8AA0 }, { 0xB8DC, 0x8A71 }, 
-	{ 0xB8DD, 0x8A85 }, { 0xB8DE, 0x8A6D }, { 0xB8DF, 0x8A62 }, { 0xB8E0, 0x8A6E }, { 0xB8E1, 0x8A6C }, { 0xB8E2, 0x8A79 }, { 0xB8E3, 0x8A7B }, { 0xB8E4, 0x8A3E }, 
-	{ 0xB8E5, 0x8A68 }, { 0xB8E6, 0x8C62 }, { 0xB8E7, 0x8C8A }, { 0xB8E8, 0x8C89 }, { 0xB8E9, 0x8CCA }, { 0xB8EA, 0x8CC7 }, { 0xB8EB, 0x8CC8 }, { 0xB8EC, 0x8CC4 }, 
-	{ 0xB8ED, 0x8CB2 }, { 0xB8EE, 0x8CC3 }, { 0xB8EF, 0x8CC2 }, { 0xB8F0, 0x8CC5 }, { 0xB8F1, 0x8DE1 }, { 0xB8F2, 0x8DDF }, { 0xB8F3, 0x8DE8 }, { 0xB8F4, 0x8DEF }, 
-	{ 0xB8F5, 0x8DF3 }, { 0xB8F6, 0x8DFA }, { 0xB8F7, 0x8DEA }, { 0xB8F8, 0x8DE4 }, { 0xB8F9, 0x8DE6 }, { 0xB8FA, 0x8EB2 }, { 0xB8FB, 0x8F03 }, { 0xB8FC, 0x8F09 }, 
-	{ 0xB8FD, 0x8EFE }, { 0xB8FE, 0x8F0A }, { 0xB940, 0x8F9F }, { 0xB941, 0x8FB2 }, { 0xB942, 0x904B }, { 0xB943, 0x904A }, { 0xB944, 0x9053 }, { 0xB945, 0x9042 }, 
-	{ 0xB946, 0x9054 }, { 0xB947, 0x903C }, { 0xB948, 0x9055 }, { 0xB949, 0x9050 }, { 0xB94A, 0x9047 }, { 0xB94B, 0x904F }, { 0xB94C, 0x904E }, { 0xB94D, 0x904D }, 
-	{ 0xB94E, 0x9051 }, { 0xB94F, 0x903E }, { 0xB950, 0x9041 }, { 0xB951, 0x9112 }, { 0xB952, 0x9117 }, { 0xB953, 0x916C }, { 0xB954, 0x916A }, { 0xB955, 0x9169 }, 
-	{ 0xB956, 0x91C9 }, { 0xB957, 0x9237 }, { 0xB958, 0x9257 }, { 0xB959, 0x9238 }, { 0xB95A, 0x923D }, { 0xB95B, 0x9240 }, { 0xB95C, 0x923E }, { 0xB95D, 0x925B }, 
-	{ 0xB95E, 0x924B }, { 0xB95F, 0x9264 }, { 0xB960, 0x9251 }, { 0xB961, 0x9234 }, { 0xB962, 0x9249 }, { 0xB963, 0x924D }, { 0xB964, 0x9245 }, { 0xB965, 0x9239 }, 
-	{ 0xB966, 0x923F }, { 0xB967, 0x925A }, { 0xB968, 0x9598 }, { 0xB969, 0x9698 }, { 0xB96A, 0x9694 }, { 0xB96B, 0x9695 }, { 0xB96C, 0x96CD }, { 0xB96D, 0x96CB }, 
-	{ 0xB96E, 0x96C9 }, { 0xB96F, 0x96CA }, { 0xB970, 0x96F7 }, { 0xB971, 0x96FB }, { 0xB972, 0x96F9 }, { 0xB973, 0x96F6 }, { 0xB974, 0x9756 }, { 0xB975, 0x9774 }, 
-	{ 0xB976, 0x9776 }, { 0xB977, 0x9810 }, { 0xB978, 0x9811 }, { 0xB979, 0x9813 }, { 0xB97A, 0x980A }, { 0xB97B, 0x9812 }, { 0xB97C, 0x980C }, { 0xB97D, 0x98FC }, 
-	{ 0xB97E, 0x98F4 }, { 0xB9A1, 0x98FD }, { 0xB9A2, 0x98FE }, { 0xB9A3, 0x99B3 }, { 0xB9A4, 0x99B1 }, { 0xB9A5, 0x99B4 }, { 0xB9A6, 0x9AE1 }, { 0xB9A7, 0x9CE9 }, 
-	{ 0xB9A8, 0x9E82 }, { 0xB9A9, 0x9F0E }, { 0xB9AA, 0x9F13 }, { 0xB9AB, 0x9F20 }, { 0xB9AC, 0x50E7 }, { 0xB9AD, 0x50EE }, { 0xB9AE, 0x50E5 }, { 0xB9AF, 0x50D6 }, 
-	{ 0xB9B0, 0x50ED }, { 0xB9B1, 0x50DA }, { 0xB9B2, 0x50D5 }, { 0xB9B3, 0x50CF }, { 0xB9B4, 0x50D1 }, { 0xB9B5, 0x50F1 }, { 0xB9B6, 0x50CE }, { 0xB9B7, 0x50E9 }, 
-	{ 0xB9B8, 0x5162 }, { 0xB9B9, 0x51F3 }, { 0xB9BA, 0x5283 }, { 0xB9BB, 0x5282 }, { 0xB9BC, 0x5331 }, { 0xB9BD, 0x53AD }, { 0xB9BE, 0x55FE }, { 0xB9BF, 0x5600 }, 
-	{ 0xB9C0, 0x561B }, { 0xB9C1, 0x5617 }, { 0xB9C2, 0x55FD }, { 0xB9C3, 0x5614 }, { 0xB9C4, 0x5606 }, { 0xB9C5, 0x5609 }, { 0xB9C6, 0x560D }, { 0xB9C7, 0x560E }, 
-	{ 0xB9C8, 0x55F7 }, { 0xB9C9, 0x5616 }, { 0xB9CA, 0x561F }, { 0xB9CB, 0x5608 }, { 0xB9CC, 0x5610 }, { 0xB9CD, 0x55F6 }, { 0xB9CE, 0x5718 }, { 0xB9CF, 0x5716 }, 
-	{ 0xB9D0, 0x5875 }, { 0xB9D1, 0x587E }, { 0xB9D2, 0x5883 }, { 0xB9D3, 0x5893 }, { 0xB9D4, 0x588A }, { 0xB9D5, 0x5879 }, { 0xB9D6, 0x5885 }, { 0xB9D7, 0x587D }, 
-	{ 0xB9D8, 0x58FD }, { 0xB9D9, 0x5925 }, { 0xB9DA, 0x5922 }, { 0xB9DB, 0x5924 }, { 0xB9DC, 0x596A }, { 0xB9DD, 0x5969 }, { 0xB9DE, 0x5AE1 }, { 0xB9DF, 0x5AE6 }, 
-	{ 0xB9E0, 0x5AE9 }, { 0xB9E1, 0x5AD7 }, { 0xB9E2, 0x5AD6 }, { 0xB9E3, 0x5AD8 }, { 0xB9E4, 0x5AE3 }, { 0xB9E5, 0x5B75 }, { 0xB9E6, 0x5BDE }, { 0xB9E7, 0x5BE7 }, 
-	{ 0xB9E8, 0x5BE1 }, { 0xB9E9, 0x5BE5 }, { 0xB9EA, 0x5BE6 }, { 0xB9EB, 0x5BE8 }, { 0xB9EC, 0x5BE2 }, { 0xB9ED, 0x5BE4 }, { 0xB9EE, 0x5BDF }, { 0xB9EF, 0x5C0D }, 
-	{ 0xB9F0, 0x5C62 }, { 0xB9F1, 0x5D84 }, { 0xB9F2, 0x5D87 }, { 0xB9F3, 0x5E5B }, { 0xB9F4, 0x5E63 }, { 0xB9F5, 0x5E55 }, { 0xB9F6, 0x5E57 }, { 0xB9F7, 0x5E54 }, 
-	{ 0xB9F8, 0x5ED3 }, { 0xB9F9, 0x5ED6 }, { 0xB9FA, 0x5F0A }, { 0xB9FB, 0x5F46 }, { 0xB9FC, 0x5F70 }, { 0xB9FD, 0x5FB9 }, { 0xB9FE, 0x6147 }, { 0xBA40, 0x613F }, 
-	{ 0xBA41, 0x614B }, { 0xBA42, 0x6177 }, { 0xBA43, 0x6162 }, { 0xBA44, 0x6163 }, { 0xBA45, 0x615F }, { 0xBA46, 0x615A }, { 0xBA47, 0x6158 }, { 0xBA48, 0x6175 }, 
-	{ 0xBA49, 0x622A }, { 0xBA4A, 0x6487 }, { 0xBA4B, 0x6458 }, { 0xBA4C, 0x6454 }, { 0xBA4D, 0x64A4 }, { 0xBA4E, 0x6478 }, { 0xBA4F, 0x645F }, { 0xBA50, 0x647A }, 
-	{ 0xBA51, 0x6451 }, { 0xBA52, 0x6467 }, { 0xBA53, 0x6434 }, { 0xBA54, 0x646D }, { 0xBA55, 0x647B }, { 0xBA56, 0x6572 }, { 0xBA57, 0x65A1 }, { 0xBA58, 0x65D7 }, 
-	{ 0xBA59, 0x65D6 }, { 0xBA5A, 0x66A2 }, { 0xBA5B, 0x66A8 }, { 0xBA5C, 0x669D }, { 0xBA5D, 0x699C }, { 0xBA5E, 0x69A8 }, { 0xBA5F, 0x6995 }, { 0xBA60, 0x69C1 }, 
-	{ 0xBA61, 0x69AE }, { 0xBA62, 0x69D3 }, { 0xBA63, 0x69CB }, { 0xBA64, 0x699B }, { 0xBA65, 0x69B7 }, { 0xBA66, 0x69BB }, { 0xBA67, 0x69AB }, { 0xBA68, 0x69B4 }, 
-	{ 0xBA69, 0x69D0 }, { 0xBA6A, 0x69CD }, { 0xBA6B, 0x69AD }, { 0xBA6C, 0x69CC }, { 0xBA6D, 0x69A6 }, { 0xBA6E, 0x69C3 }, { 0xBA6F, 0x69A3 }, { 0xBA70, 0x6B49 }, 
-	{ 0xBA71, 0x6B4C }, { 0xBA72, 0x6C33 }, { 0xBA73, 0x6F33 }, { 0xBA74, 0x6F14 }, { 0xBA75, 0x6EFE }, { 0xBA76, 0x6F13 }, { 0xBA77, 0x6EF4 }, { 0xBA78, 0x6F29 }, 
-	{ 0xBA79, 0x6F3E }, { 0xBA7A, 0x6F20 }, { 0xBA7B, 0x6F2C }, { 0xBA7C, 0x6F0F }, { 0xBA7D, 0x6F02 }, { 0xBA7E, 0x6F22 }, { 0xBAA1, 0x6EFF }, { 0xBAA2, 0x6EEF }, 
-	{ 0xBAA3, 0x6F06 }, { 0xBAA4, 0x6F31 }, { 0xBAA5, 0x6F38 }, { 0xBAA6, 0x6F32 }, { 0xBAA7, 0x6F23 }, { 0xBAA8, 0x6F15 }, { 0xBAA9, 0x6F2B }, { 0xBAAA, 0x6F2F }, 
-	{ 0xBAAB, 0x6F88 }, { 0xBAAC, 0x6F2A }, { 0xBAAD, 0x6EEC }, { 0xBAAE, 0x6F01 }, { 0xBAAF, 0x6EF2 }, { 0xBAB0, 0x6ECC }, { 0xBAB1, 0x6EF7 }, { 0xBAB2, 0x7194 }, 
-	{ 0xBAB3, 0x7199 }, { 0xBAB4, 0x717D }, { 0xBAB5, 0x718A }, { 0xBAB6, 0x7184 }, { 0xBAB7, 0x7192 }, { 0xBAB8, 0x723E }, { 0xBAB9, 0x7292 }, { 0xBABA, 0x7296 }, 
-	{ 0xBABB, 0x7344 }, { 0xBABC, 0x7350 }, { 0xBABD, 0x7464 }, { 0xBABE, 0x7463 }, { 0xBABF, 0x746A }, { 0xBAC0, 0x7470 }, { 0xBAC1, 0x746D }, { 0xBAC2, 0x7504 }, 
-	{ 0xBAC3, 0x7591 }, { 0xBAC4, 0x7627 }, { 0xBAC5, 0x760D }, { 0xBAC6, 0x760B }, { 0xBAC7, 0x7609 }, { 0xBAC8, 0x7613 }, { 0xBAC9, 0x76E1 }, { 0xBACA, 0x76E3 }, 
-	{ 0xBACB, 0x7784 }, { 0xBACC, 0x777D }, { 0xBACD, 0x777F }, { 0xBACE, 0x7761 }, { 0xBACF, 0x78C1 }, { 0xBAD0, 0x789F }, { 0xBAD1, 0x78A7 }, { 0xBAD2, 0x78B3 }, 
-	{ 0xBAD3, 0x78A9 }, { 0xBAD4, 0x78A3 }, { 0xBAD5, 0x798E }, { 0xBAD6, 0x798F }, { 0xBAD7, 0x798D }, { 0xBAD8, 0x7A2E }, { 0xBAD9, 0x7A31 }, { 0xBADA, 0x7AAA }, 
-	{ 0xBADB, 0x7AA9 }, { 0xBADC, 0x7AED }, { 0xBADD, 0x7AEF }, { 0xBADE, 0x7BA1 }, { 0xBADF, 0x7B95 }, { 0xBAE0, 0x7B8B }, { 0xBAE1, 0x7B75 }, { 0xBAE2, 0x7B97 }, 
-	{ 0xBAE3, 0x7B9D }, { 0xBAE4, 0x7B94 }, { 0xBAE5, 0x7B8F }, { 0xBAE6, 0x7BB8 }, { 0xBAE7, 0x7B87 }, { 0xBAE8, 0x7B84 }, { 0xBAE9, 0x7CB9 }, { 0xBAEA, 0x7CBD }, 
-	{ 0xBAEB, 0x7CBE }, { 0xBAEC, 0x7DBB }, { 0xBAED, 0x7DB0 }, { 0xBAEE, 0x7D9C }, { 0xBAEF, 0x7DBD }, { 0xBAF0, 0x7DBE }, { 0xBAF1, 0x7DA0 }, { 0xBAF2, 0x7DCA }, 
-	{ 0xBAF3, 0x7DB4 }, { 0xBAF4, 0x7DB2 }, { 0xBAF5, 0x7DB1 }, { 0xBAF6, 0x7DBA }, { 0xBAF7, 0x7DA2 }, { 0xBAF8, 0x7DBF }, { 0xBAF9, 0x7DB5 }, { 0xBAFA, 0x7DB8 }, 
-	{ 0xBAFB, 0x7DAD }, { 0xBAFC, 0x7DD2 }, { 0xBAFD, 0x7DC7 }, { 0xBAFE, 0x7DAC }, { 0xBB40, 0x7F70 }, { 0xBB41, 0x7FE0 }, { 0xBB42, 0x7FE1 }, { 0xBB43, 0x7FDF }, 
-	{ 0xBB44, 0x805E }, { 0xBB45, 0x805A }, { 0xBB46, 0x8087 }, { 0xBB47, 0x8150 }, { 0xBB48, 0x8180 }, { 0xBB49, 0x818F }, { 0xBB4A, 0x8188 }, { 0xBB4B, 0x818A }, 
-	{ 0xBB4C, 0x817F }, { 0xBB4D, 0x8182 }, { 0xBB4E, 0x81E7 }, { 0xBB4F, 0x81FA }, { 0xBB50, 0x8207 }, { 0xBB51, 0x8214 }, { 0xBB52, 0x821E }, { 0xBB53, 0x824B }, 
-	{ 0xBB54, 0x84C9 }, { 0xBB55, 0x84BF }, { 0xBB56, 0x84C6 }, { 0xBB57, 0x84C4 }, { 0xBB58, 0x8499 }, { 0xBB59, 0x849E }, { 0xBB5A, 0x84B2 }, { 0xBB5B, 0x849C }, 
-	{ 0xBB5C, 0x84CB }, { 0xBB5D, 0x84B8 }, { 0xBB5E, 0x84C0 }, { 0xBB5F, 0x84D3 }, { 0xBB60, 0x8490 }, { 0xBB61, 0x84BC }, { 0xBB62, 0x84D1 }, { 0xBB63, 0x84CA }, 
-	{ 0xBB64, 0x873F }, { 0xBB65, 0x871C }, { 0xBB66, 0x873B }, { 0xBB67, 0x8722 }, { 0xBB68, 0x8725 }, { 0xBB69, 0x8734 }, { 0xBB6A, 0x8718 }, { 0xBB6B, 0x8755 }, 
-	{ 0xBB6C, 0x8737 }, { 0xBB6D, 0x8729 }, { 0xBB6E, 0x88F3 }, { 0xBB6F, 0x8902 }, { 0xBB70, 0x88F4 }, { 0xBB71, 0x88F9 }, { 0xBB72, 0x88F8 }, { 0xBB73, 0x88FD }, 
-	{ 0xBB74, 0x88E8 }, { 0xBB75, 0x891A }, { 0xBB76, 0x88EF }, { 0xBB77, 0x8AA6 }, { 0xBB78, 0x8A8C }, { 0xBB79, 0x8A9E }, { 0xBB7A, 0x8AA3 }, { 0xBB7B, 0x8A8D }, 
-	{ 0xBB7C, 0x8AA1 }, { 0xBB7D, 0x8A93 }, { 0xBB7E, 0x8AA4 }, { 0xBBA1, 0x8AAA }, { 0xBBA2, 0x8AA5 }, { 0xBBA3, 0x8AA8 }, { 0xBBA4, 0x8A98 }, { 0xBBA5, 0x8A91 }, 
-	{ 0xBBA6, 0x8A9A }, { 0xBBA7, 0x8AA7 }, { 0xBBA8, 0x8C6A }, { 0xBBA9, 0x8C8D }, { 0xBBAA, 0x8C8C }, { 0xBBAB, 0x8CD3 }, { 0xBBAC, 0x8CD1 }, { 0xBBAD, 0x8CD2 }, 
-	{ 0xBBAE, 0x8D6B }, { 0xBBAF, 0x8D99 }, { 0xBBB0, 0x8D95 }, { 0xBBB1, 0x8DFC }, { 0xBBB2, 0x8F14 }, { 0xBBB3, 0x8F12 }, { 0xBBB4, 0x8F15 }, { 0xBBB5, 0x8F13 }, 
-	{ 0xBBB6, 0x8FA3 }, { 0xBBB7, 0x9060 }, { 0xBBB8, 0x9058 }, { 0xBBB9, 0x905C }, { 0xBBBA, 0x9063 }, { 0xBBBB, 0x9059 }, { 0xBBBC, 0x905E }, { 0xBBBD, 0x9062 }, 
-	{ 0xBBBE, 0x905D }, { 0xBBBF, 0x905B }, { 0xBBC0, 0x9119 }, { 0xBBC1, 0x9118 }, { 0xBBC2, 0x911E }, { 0xBBC3, 0x9175 }, { 0xBBC4, 0x9178 }, { 0xBBC5, 0x9177 }, 
-	{ 0xBBC6, 0x9174 }, { 0xBBC7, 0x9278 }, { 0xBBC8, 0x9280 }, { 0xBBC9, 0x9285 }, { 0xBBCA, 0x9298 }, { 0xBBCB, 0x9296 }, { 0xBBCC, 0x927B }, { 0xBBCD, 0x9293 }, 
-	{ 0xBBCE, 0x929C }, { 0xBBCF, 0x92A8 }, { 0xBBD0, 0x927C }, { 0xBBD1, 0x9291 }, { 0xBBD2, 0x95A1 }, { 0xBBD3, 0x95A8 }, { 0xBBD4, 0x95A9 }, { 0xBBD5, 0x95A3 }, 
-	{ 0xBBD6, 0x95A5 }, { 0xBBD7, 0x95A4 }, { 0xBBD8, 0x9699 }, { 0xBBD9, 0x969C }, { 0xBBDA, 0x969B }, { 0xBBDB, 0x96CC }, { 0xBBDC, 0x96D2 }, { 0xBBDD, 0x9700 }, 
-	{ 0xBBDE, 0x977C }, { 0xBBDF, 0x9785 }, { 0xBBE0, 0x97F6 }, { 0xBBE1, 0x9817 }, { 0xBBE2, 0x9818 }, { 0xBBE3, 0x98AF }, { 0xBBE4, 0x98B1 }, { 0xBBE5, 0x9903 }, 
-	{ 0xBBE6, 0x9905 }, { 0xBBE7, 0x990C }, { 0xBBE8, 0x9909 }, { 0xBBE9, 0x99C1 }, { 0xBBEA, 0x9AAF }, { 0xBBEB, 0x9AB0 }, { 0xBBEC, 0x9AE6 }, { 0xBBED, 0x9B41 }, 
-	{ 0xBBEE, 0x9B42 }, { 0xBBEF, 0x9CF4 }, { 0xBBF0, 0x9CF6 }, { 0xBBF1, 0x9CF3 }, { 0xBBF2, 0x9EBC }, { 0xBBF3, 0x9F3B }, { 0xBBF4, 0x9F4A }, { 0xBBF5, 0x5104 }, 
-	{ 0xBBF6, 0x5100 }, { 0xBBF7, 0x50FB }, { 0xBBF8, 0x50F5 }, { 0xBBF9, 0x50F9 }, { 0xBBFA, 0x5102 }, { 0xBBFB, 0x5108 }, { 0xBBFC, 0x5109 }, { 0xBBFD, 0x5105 }, 
-	{ 0xBBFE, 0x51DC }, { 0xBC40, 0x5287 }, { 0xBC41, 0x5288 }, { 0xBC42, 0x5289 }, { 0xBC43, 0x528D }, { 0xBC44, 0x528A }, { 0xBC45, 0x52F0 }, { 0xBC46, 0x53B2 }, 
-	{ 0xBC47, 0x562E }, { 0xBC48, 0x563B }, { 0xBC49, 0x5639 }, { 0xBC4A, 0x5632 }, { 0xBC4B, 0x563F }, { 0xBC4C, 0x5634 }, { 0xBC4D, 0x5629 }, { 0xBC4E, 0x5653 }, 
-	{ 0xBC4F, 0x564E }, { 0xBC50, 0x5657 }, { 0xBC51, 0x5674 }, { 0xBC52, 0x5636 }, { 0xBC53, 0x562F }, { 0xBC54, 0x5630 }, { 0xBC55, 0x5880 }, { 0xBC56, 0x589F }, 
-	{ 0xBC57, 0x589E }, { 0xBC58, 0x58B3 }, { 0xBC59, 0x589C }, { 0xBC5A, 0x58AE }, { 0xBC5B, 0x58A9 }, { 0xBC5C, 0x58A6 }, { 0xBC5D, 0x596D }, { 0xBC5E, 0x5B09 }, 
-	{ 0xBC5F, 0x5AFB }, { 0xBC60, 0x5B0B }, { 0xBC61, 0x5AF5 }, { 0xBC62, 0x5B0C }, { 0xBC63, 0x5B08 }, { 0xBC64, 0x5BEE }, { 0xBC65, 0x5BEC }, { 0xBC66, 0x5BE9 }, 
-	{ 0xBC67, 0x5BEB }, { 0xBC68, 0x5C64 }, { 0xBC69, 0x5C65 }, { 0xBC6A, 0x5D9D }, { 0xBC6B, 0x5D94 }, { 0xBC6C, 0x5E62 }, { 0xBC6D, 0x5E5F }, { 0xBC6E, 0x5E61 }, 
-	{ 0xBC6F, 0x5EE2 }, { 0xBC70, 0x5EDA }, { 0xBC71, 0x5EDF }, { 0xBC72, 0x5EDD }, { 0xBC73, 0x5EE3 }, { 0xBC74, 0x5EE0 }, { 0xBC75, 0x5F48 }, { 0xBC76, 0x5F71 }, 
-	{ 0xBC77, 0x5FB7 }, { 0xBC78, 0x5FB5 }, { 0xBC79, 0x6176 }, { 0xBC7A, 0x6167 }, { 0xBC7B, 0x616E }, { 0xBC7C, 0x615D }, { 0xBC7D, 0x6155 }, { 0xBC7E, 0x6182 }, 
-	{ 0xBCA1, 0x617C }, { 0xBCA2, 0x6170 }, { 0xBCA3, 0x616B }, { 0xBCA4, 0x617E }, { 0xBCA5, 0x61A7 }, { 0xBCA6, 0x6190 }, { 0xBCA7, 0x61AB }, { 0xBCA8, 0x618E }, 
-	{ 0xBCA9, 0x61AC }, { 0xBCAA, 0x619A }, { 0xBCAB, 0x61A4 }, { 0xBCAC, 0x6194 }, { 0xBCAD, 0x61AE }, { 0xBCAE, 0x622E }, { 0xBCAF, 0x6469 }, { 0xBCB0, 0x646F }, 
-	{ 0xBCB1, 0x6479 }, { 0xBCB2, 0x649E }, { 0xBCB3, 0x64B2 }, { 0xBCB4, 0x6488 }, { 0xBCB5, 0x6490 }, { 0xBCB6, 0x64B0 }, { 0xBCB7, 0x64A5 }, { 0xBCB8, 0x6493 }, 
-	{ 0xBCB9, 0x6495 }, { 0xBCBA, 0x64A9 }, { 0xBCBB, 0x6492 }, { 0xBCBC, 0x64AE }, { 0xBCBD, 0x64AD }, { 0xBCBE, 0x64AB }, { 0xBCBF, 0x649A }, { 0xBCC0, 0x64AC }, 
-	{ 0xBCC1, 0x6499 }, { 0xBCC2, 0x64A2 }, { 0xBCC3, 0x64B3 }, { 0xBCC4, 0x6575 }, { 0xBCC5, 0x6577 }, { 0xBCC6, 0x6578 }, { 0xBCC7, 0x66AE }, { 0xBCC8, 0x66AB }, 
-	{ 0xBCC9, 0x66B4 }, { 0xBCCA, 0x66B1 }, { 0xBCCB, 0x6A23 }, { 0xBCCC, 0x6A1F }, { 0xBCCD, 0x69E8 }, { 0xBCCE, 0x6A01 }, { 0xBCCF, 0x6A1E }, { 0xBCD0, 0x6A19 }, 
-	{ 0xBCD1, 0x69FD }, { 0xBCD2, 0x6A21 }, { 0xBCD3, 0x6A13 }, { 0xBCD4, 0x6A0A }, { 0xBCD5, 0x69F3 }, { 0xBCD6, 0x6A02 }, { 0xBCD7, 0x6A05 }, { 0xBCD8, 0x69ED }, 
-	{ 0xBCD9, 0x6A11 }, { 0xBCDA, 0x6B50 }, { 0xBCDB, 0x6B4E }, { 0xBCDC, 0x6BA4 }, { 0xBCDD, 0x6BC5 }, { 0xBCDE, 0x6BC6 }, { 0xBCDF, 0x6F3F }, { 0xBCE0, 0x6F7C }, 
-	{ 0xBCE1, 0x6F84 }, { 0xBCE2, 0x6F51 }, { 0xBCE3, 0x6F66 }, { 0xBCE4, 0x6F54 }, { 0xBCE5, 0x6F86 }, { 0xBCE6, 0x6F6D }, { 0xBCE7, 0x6F5B }, { 0xBCE8, 0x6F78 }, 
-	{ 0xBCE9, 0x6F6E }, { 0xBCEA, 0x6F8E }, { 0xBCEB, 0x6F7A }, { 0xBCEC, 0x6F70 }, { 0xBCED, 0x6F64 }, { 0xBCEE, 0x6F97 }, { 0xBCEF, 0x6F58 }, { 0xBCF0, 0x6ED5 }, 
-	{ 0xBCF1, 0x6F6F }, { 0xBCF2, 0x6F60 }, { 0xBCF3, 0x6F5F }, { 0xBCF4, 0x719F }, { 0xBCF5, 0x71AC }, { 0xBCF6, 0x71B1 }, { 0xBCF7, 0x71A8 }, { 0xBCF8, 0x7256 }, 
-	{ 0xBCF9, 0x729B }, { 0xBCFA, 0x734E }, { 0xBCFB, 0x7357 }, { 0xBCFC, 0x7469 }, { 0xBCFD, 0x748B }, { 0xBCFE, 0x7483 }, { 0xBD40, 0x747E }, { 0xBD41, 0x7480 }, 
-	{ 0xBD42, 0x757F }, { 0xBD43, 0x7620 }, { 0xBD44, 0x7629 }, { 0xBD45, 0x761F }, { 0xBD46, 0x7624 }, { 0xBD47, 0x7626 }, { 0xBD48, 0x7621 }, { 0xBD49, 0x7622 }, 
-	{ 0xBD4A, 0x769A }, { 0xBD4B, 0x76BA }, { 0xBD4C, 0x76E4 }, { 0xBD4D, 0x778E }, { 0xBD4E, 0x7787 }, { 0xBD4F, 0x778C }, { 0xBD50, 0x7791 }, { 0xBD51, 0x778B }, 
-	{ 0xBD52, 0x78CB }, { 0xBD53, 0x78C5 }, { 0xBD54, 0x78BA }, { 0xBD55, 0x78CA }, { 0xBD56, 0x78BE }, { 0xBD57, 0x78D5 }, { 0xBD58, 0x78BC }, { 0xBD59, 0x78D0 }, 
-	{ 0xBD5A, 0x7A3F }, { 0xBD5B, 0x7A3C }, { 0xBD5C, 0x7A40 }, { 0xBD5D, 0x7A3D }, { 0xBD5E, 0x7A37 }, { 0xBD5F, 0x7A3B }, { 0xBD60, 0x7AAF }, { 0xBD61, 0x7AAE }, 
-	{ 0xBD62, 0x7BAD }, { 0xBD63, 0x7BB1 }, { 0xBD64, 0x7BC4 }, { 0xBD65, 0x7BB4 }, { 0xBD66, 0x7BC6 }, { 0xBD67, 0x7BC7 }, { 0xBD68, 0x7BC1 }, { 0xBD69, 0x7BA0 }, 
-	{ 0xBD6A, 0x7BCC }, { 0xBD6B, 0x7CCA }, { 0xBD6C, 0x7DE0 }, { 0xBD6D, 0x7DF4 }, { 0xBD6E, 0x7DEF }, { 0xBD6F, 0x7DFB }, { 0xBD70, 0x7DD8 }, { 0xBD71, 0x7DEC }, 
-	{ 0xBD72, 0x7DDD }, { 0xBD73, 0x7DE8 }, { 0xBD74, 0x7DE3 }, { 0xBD75, 0x7DDA }, { 0xBD76, 0x7DDE }, { 0xBD77, 0x7DE9 }, { 0xBD78, 0x7D9E }, { 0xBD79, 0x7DD9 }, 
-	{ 0xBD7A, 0x7DF2 }, { 0xBD7B, 0x7DF9 }, { 0xBD7C, 0x7F75 }, { 0xBD7D, 0x7F77 }, { 0xBD7E, 0x7FAF }, { 0xBDA1, 0x7FE9 }, { 0xBDA2, 0x8026 }, { 0xBDA3, 0x819B }, 
-	{ 0xBDA4, 0x819C }, { 0xBDA5, 0x819D }, { 0xBDA6, 0x81A0 }, { 0xBDA7, 0x819A }, { 0xBDA8, 0x8198 }, { 0xBDA9, 0x8517 }, { 0xBDAA, 0x853D }, { 0xBDAB, 0x851A }, 
-	{ 0xBDAC, 0x84EE }, { 0xBDAD, 0x852C }, { 0xBDAE, 0x852D }, { 0xBDAF, 0x8513 }, { 0xBDB0, 0x8511 }, { 0xBDB1, 0x8523 }, { 0xBDB2, 0x8521 }, { 0xBDB3, 0x8514 }, 
-	{ 0xBDB4, 0x84EC }, { 0xBDB5, 0x8525 }, { 0xBDB6, 0x84FF }, { 0xBDB7, 0x8506 }, { 0xBDB8, 0x8782 }, { 0xBDB9, 0x8774 }, { 0xBDBA, 0x8776 }, { 0xBDBB, 0x8760 }, 
-	{ 0xBDBC, 0x8766 }, { 0xBDBD, 0x8778 }, { 0xBDBE, 0x8768 }, { 0xBDBF, 0x8759 }, { 0xBDC0, 0x8757 }, { 0xBDC1, 0x874C }, { 0xBDC2, 0x8753 }, { 0xBDC3, 0x885B }, 
-	{ 0xBDC4, 0x885D }, { 0xBDC5, 0x8910 }, { 0xBDC6, 0x8907 }, { 0xBDC7, 0x8912 }, { 0xBDC8, 0x8913 }, { 0xBDC9, 0x8915 }, { 0xBDCA, 0x890A }, { 0xBDCB, 0x8ABC }, 
-	{ 0xBDCC, 0x8AD2 }, { 0xBDCD, 0x8AC7 }, { 0xBDCE, 0x8AC4 }, { 0xBDCF, 0x8A95 }, { 0xBDD0, 0x8ACB }, { 0xBDD1, 0x8AF8 }, { 0xBDD2, 0x8AB2 }, { 0xBDD3, 0x8AC9 }, 
-	{ 0xBDD4, 0x8AC2 }, { 0xBDD5, 0x8ABF }, { 0xBDD6, 0x8AB0 }, { 0xBDD7, 0x8AD6 }, { 0xBDD8, 0x8ACD }, { 0xBDD9, 0x8AB6 }, { 0xBDDA, 0x8AB9 }, { 0xBDDB, 0x8ADB }, 
-	{ 0xBDDC, 0x8C4C }, { 0xBDDD, 0x8C4E }, { 0xBDDE, 0x8C6C }, { 0xBDDF, 0x8CE0 }, { 0xBDE0, 0x8CDE }, { 0xBDE1, 0x8CE6 }, { 0xBDE2, 0x8CE4 }, { 0xBDE3, 0x8CEC }, 
-	{ 0xBDE4, 0x8CED }, { 0xBDE5, 0x8CE2 }, { 0xBDE6, 0x8CE3 }, { 0xBDE7, 0x8CDC }, { 0xBDE8, 0x8CEA }, { 0xBDE9, 0x8CE1 }, { 0xBDEA, 0x8D6D }, { 0xBDEB, 0x8D9F }, 
-	{ 0xBDEC, 0x8DA3 }, { 0xBDED, 0x8E2B }, { 0xBDEE, 0x8E10 }, { 0xBDEF, 0x8E1D }, { 0xBDF0, 0x8E22 }, { 0xBDF1, 0x8E0F }, { 0xBDF2, 0x8E29 }, { 0xBDF3, 0x8E1F }, 
-	{ 0xBDF4, 0x8E21 }, { 0xBDF5, 0x8E1E }, { 0xBDF6, 0x8EBA }, { 0xBDF7, 0x8F1D }, { 0xBDF8, 0x8F1B }, { 0xBDF9, 0x8F1F }, { 0xBDFA, 0x8F29 }, { 0xBDFB, 0x8F26 }, 
-	{ 0xBDFC, 0x8F2A }, { 0xBDFD, 0x8F1C }, { 0xBDFE, 0x8F1E }, { 0xBE40, 0x8F25 }, { 0xBE41, 0x9069 }, { 0xBE42, 0x906E }, { 0xBE43, 0x9068 }, { 0xBE44, 0x906D }, 
-	{ 0xBE45, 0x9077 }, { 0xBE46, 0x9130 }, { 0xBE47, 0x912D }, { 0xBE48, 0x9127 }, { 0xBE49, 0x9131 }, { 0xBE4A, 0x9187 }, { 0xBE4B, 0x9189 }, { 0xBE4C, 0x918B }, 
-	{ 0xBE4D, 0x9183 }, { 0xBE4E, 0x92C5 }, { 0xBE4F, 0x92BB }, { 0xBE50, 0x92B7 }, { 0xBE51, 0x92EA }, { 0xBE52, 0x92AC }, { 0xBE53, 0x92E4 }, { 0xBE54, 0x92C1 }, 
-	{ 0xBE55, 0x92B3 }, { 0xBE56, 0x92BC }, { 0xBE57, 0x92D2 }, { 0xBE58, 0x92C7 }, { 0xBE59, 0x92F0 }, { 0xBE5A, 0x92B2 }, { 0xBE5B, 0x95AD }, { 0xBE5C, 0x95B1 }, 
-	{ 0xBE5D, 0x9704 }, { 0xBE5E, 0x9706 }, { 0xBE5F, 0x9707 }, { 0xBE60, 0x9709 }, { 0xBE61, 0x9760 }, { 0xBE62, 0x978D }, { 0xBE63, 0x978B }, { 0xBE64, 0x978F }, 
-	{ 0xBE65, 0x9821 }, { 0xBE66, 0x982B }, { 0xBE67, 0x981C }, { 0xBE68, 0x98B3 }, { 0xBE69, 0x990A }, { 0xBE6A, 0x9913 }, { 0xBE6B, 0x9912 }, { 0xBE6C, 0x9918 }, 
-	{ 0xBE6D, 0x99DD }, { 0xBE6E, 0x99D0 }, { 0xBE6F, 0x99DF }, { 0xBE70, 0x99DB }, { 0xBE71, 0x99D1 }, { 0xBE72, 0x99D5 }, { 0xBE73, 0x99D2 }, { 0xBE74, 0x99D9 }, 
-	{ 0xBE75, 0x9AB7 }, { 0xBE76, 0x9AEE }, { 0xBE77, 0x9AEF }, { 0xBE78, 0x9B27 }, { 0xBE79, 0x9B45 }, { 0xBE7A, 0x9B44 }, { 0xBE7B, 0x9B77 }, { 0xBE7C, 0x9B6F }, 
-	{ 0xBE7D, 0x9D06 }, { 0xBE7E, 0x9D09 }, { 0xBEA1, 0x9D03 }, { 0xBEA2, 0x9EA9 }, { 0xBEA3, 0x9EBE }, { 0xBEA4, 0x9ECE }, { 0xBEA5, 0x58A8 }, { 0xBEA6, 0x9F52 }, 
-	{ 0xBEA7, 0x5112 }, { 0xBEA8, 0x5118 }, { 0xBEA9, 0x5114 }, { 0xBEAA, 0x5110 }, { 0xBEAB, 0x5115 }, { 0xBEAC, 0x5180 }, { 0xBEAD, 0x51AA }, { 0xBEAE, 0x51DD }, 
-	{ 0xBEAF, 0x5291 }, { 0xBEB0, 0x5293 }, { 0xBEB1, 0x52F3 }, { 0xBEB2, 0x5659 }, { 0xBEB3, 0x566B }, { 0xBEB4, 0x5679 }, { 0xBEB5, 0x5669 }, { 0xBEB6, 0x5664 }, 
-	{ 0xBEB7, 0x5678 }, { 0xBEB8, 0x566A }, { 0xBEB9, 0x5668 }, { 0xBEBA, 0x5665 }, { 0xBEBB, 0x5671 }, { 0xBEBC, 0x566F }, { 0xBEBD, 0x566C }, { 0xBEBE, 0x5662 }, 
-	{ 0xBEBF, 0x5676 }, { 0xBEC0, 0x58C1 }, { 0xBEC1, 0x58BE }, { 0xBEC2, 0x58C7 }, { 0xBEC3, 0x58C5 }, { 0xBEC4, 0x596E }, { 0xBEC5, 0x5B1D }, { 0xBEC6, 0x5B34 }, 
-	{ 0xBEC7, 0x5B78 }, { 0xBEC8, 0x5BF0 }, { 0xBEC9, 0x5C0E }, { 0xBECA, 0x5F4A }, { 0xBECB, 0x61B2 }, { 0xBECC, 0x6191 }, { 0xBECD, 0x61A9 }, { 0xBECE, 0x618A }, 
-	{ 0xBECF, 0x61CD }, { 0xBED0, 0x61B6 }, { 0xBED1, 0x61BE }, { 0xBED2, 0x61CA }, { 0xBED3, 0x61C8 }, { 0xBED4, 0x6230 }, { 0xBED5, 0x64C5 }, { 0xBED6, 0x64C1 }, 
-	{ 0xBED7, 0x64CB }, { 0xBED8, 0x64BB }, { 0xBED9, 0x64BC }, { 0xBEDA, 0x64DA }, { 0xBEDB, 0x64C4 }, { 0xBEDC, 0x64C7 }, { 0xBEDD, 0x64C2 }, { 0xBEDE, 0x64CD }, 
-	{ 0xBEDF, 0x64BF }, { 0xBEE0, 0x64D2 }, { 0xBEE1, 0x64D4 }, { 0xBEE2, 0x64BE }, { 0xBEE3, 0x6574 }, { 0xBEE4, 0x66C6 }, { 0xBEE5, 0x66C9 }, { 0xBEE6, 0x66B9 }, 
-	{ 0xBEE7, 0x66C4 }, { 0xBEE8, 0x66C7 }, { 0xBEE9, 0x66B8 }, { 0xBEEA, 0x6A3D }, { 0xBEEB, 0x6A38 }, { 0xBEEC, 0x6A3A }, { 0xBEED, 0x6A59 }, { 0xBEEE, 0x6A6B }, 
-	{ 0xBEEF, 0x6A58 }, { 0xBEF0, 0x6A39 }, { 0xBEF1, 0x6A44 }, { 0xBEF2, 0x6A62 }, { 0xBEF3, 0x6A61 }, { 0xBEF4, 0x6A4B }, { 0xBEF5, 0x6A47 }, { 0xBEF6, 0x6A35 }, 
-	{ 0xBEF7, 0x6A5F }, { 0xBEF8, 0x6A48 }, { 0xBEF9, 0x6B59 }, { 0xBEFA, 0x6B77 }, { 0xBEFB, 0x6C05 }, { 0xBEFC, 0x6FC2 }, { 0xBEFD, 0x6FB1 }, { 0xBEFE, 0x6FA1 }, 
-	{ 0xBF40, 0x6FC3 }, { 0xBF41, 0x6FA4 }, { 0xBF42, 0x6FC1 }, { 0xBF43, 0x6FA7 }, { 0xBF44, 0x6FB3 }, { 0xBF45, 0x6FC0 }, { 0xBF46, 0x6FB9 }, { 0xBF47, 0x6FB6 }, 
-	{ 0xBF48, 0x6FA6 }, { 0xBF49, 0x6FA0 }, { 0xBF4A, 0x6FB4 }, { 0xBF4B, 0x71BE }, { 0xBF4C, 0x71C9 }, { 0xBF4D, 0x71D0 }, { 0xBF4E, 0x71D2 }, { 0xBF4F, 0x71C8 }, 
-	{ 0xBF50, 0x71D5 }, { 0xBF51, 0x71B9 }, { 0xBF52, 0x71CE }, { 0xBF53, 0x71D9 }, { 0xBF54, 0x71DC }, { 0xBF55, 0x71C3 }, { 0xBF56, 0x71C4 }, { 0xBF57, 0x7368 }, 
-	{ 0xBF58, 0x749C }, { 0xBF59, 0x74A3 }, { 0xBF5A, 0x7498 }, { 0xBF5B, 0x749F }, { 0xBF5C, 0x749E }, { 0xBF5D, 0x74E2 }, { 0xBF5E, 0x750C }, { 0xBF5F, 0x750D }, 
-	{ 0xBF60, 0x7634 }, { 0xBF61, 0x7638 }, { 0xBF62, 0x763A }, { 0xBF63, 0x76E7 }, { 0xBF64, 0x76E5 }, { 0xBF65, 0x77A0 }, { 0xBF66, 0x779E }, { 0xBF67, 0x779F }, 
-	{ 0xBF68, 0x77A5 }, { 0xBF69, 0x78E8 }, { 0xBF6A, 0x78DA }, { 0xBF6B, 0x78EC }, { 0xBF6C, 0x78E7 }, { 0xBF6D, 0x79A6 }, { 0xBF6E, 0x7A4D }, { 0xBF6F, 0x7A4E }, 
-	{ 0xBF70, 0x7A46 }, { 0xBF71, 0x7A4C }, { 0xBF72, 0x7A4B }, { 0xBF73, 0x7ABA }, { 0xBF74, 0x7BD9 }, { 0xBF75, 0x7C11 }, { 0xBF76, 0x7BC9 }, { 0xBF77, 0x7BE4 }, 
-	{ 0xBF78, 0x7BDB }, { 0xBF79, 0x7BE1 }, { 0xBF7A, 0x7BE9 }, { 0xBF7B, 0x7BE6 }, { 0xBF7C, 0x7CD5 }, { 0xBF7D, 0x7CD6 }, { 0xBF7E, 0x7E0A }, { 0xBFA1, 0x7E11 }, 
-	{ 0xBFA2, 0x7E08 }, { 0xBFA3, 0x7E1B }, { 0xBFA4, 0x7E23 }, { 0xBFA5, 0x7E1E }, { 0xBFA6, 0x7E1D }, { 0xBFA7, 0x7E09 }, { 0xBFA8, 0x7E10 }, { 0xBFA9, 0x7F79 }, 
-	{ 0xBFAA, 0x7FB2 }, { 0xBFAB, 0x7FF0 }, { 0xBFAC, 0x7FF1 }, { 0xBFAD, 0x7FEE }, { 0xBFAE, 0x8028 }, { 0xBFAF, 0x81B3 }, { 0xBFB0, 0x81A9 }, { 0xBFB1, 0x81A8 }, 
-	{ 0xBFB2, 0x81FB }, { 0xBFB3, 0x8208 }, { 0xBFB4, 0x8258 }, { 0xBFB5, 0x8259 }, { 0xBFB6, 0x854A }, { 0xBFB7, 0x8559 }, { 0xBFB8, 0x8548 }, { 0xBFB9, 0x8568 }, 
-	{ 0xBFBA, 0x8569 }, { 0xBFBB, 0x8543 }, { 0xBFBC, 0x8549 }, { 0xBFBD, 0x856D }, { 0xBFBE, 0x856A }, { 0xBFBF, 0x855E }, { 0xBFC0, 0x8783 }, { 0xBFC1, 0x879F }, 
-	{ 0xBFC2, 0x879E }, { 0xBFC3, 0x87A2 }, { 0xBFC4, 0x878D }, { 0xBFC5, 0x8861 }, { 0xBFC6, 0x892A }, { 0xBFC7, 0x8932 }, { 0xBFC8, 0x8925 }, { 0xBFC9, 0x892B }, 
-	{ 0xBFCA, 0x8921 }, { 0xBFCB, 0x89AA }, { 0xBFCC, 0x89A6 }, { 0xBFCD, 0x8AE6 }, { 0xBFCE, 0x8AFA }, { 0xBFCF, 0x8AEB }, { 0xBFD0, 0x8AF1 }, { 0xBFD1, 0x8B00 }, 
-	{ 0xBFD2, 0x8ADC }, { 0xBFD3, 0x8AE7 }, { 0xBFD4, 0x8AEE }, { 0xBFD5, 0x8AFE }, { 0xBFD6, 0x8B01 }, { 0xBFD7, 0x8B02 }, { 0xBFD8, 0x8AF7 }, { 0xBFD9, 0x8AED }, 
-	{ 0xBFDA, 0x8AF3 }, { 0xBFDB, 0x8AF6 }, { 0xBFDC, 0x8AFC }, { 0xBFDD, 0x8C6B }, { 0xBFDE, 0x8C6D }, { 0xBFDF, 0x8C93 }, { 0xBFE0, 0x8CF4 }, { 0xBFE1, 0x8E44 }, 
-	{ 0xBFE2, 0x8E31 }, { 0xBFE3, 0x8E34 }, { 0xBFE4, 0x8E42 }, { 0xBFE5, 0x8E39 }, { 0xBFE6, 0x8E35 }, { 0xBFE7, 0x8F3B }, { 0xBFE8, 0x8F2F }, { 0xBFE9, 0x8F38 }, 
-	{ 0xBFEA, 0x8F33 }, { 0xBFEB, 0x8FA8 }, { 0xBFEC, 0x8FA6 }, { 0xBFED, 0x9075 }, { 0xBFEE, 0x9074 }, { 0xBFEF, 0x9078 }, { 0xBFF0, 0x9072 }, { 0xBFF1, 0x907C }, 
-	{ 0xBFF2, 0x907A }, { 0xBFF3, 0x9134 }, { 0xBFF4, 0x9192 }, { 0xBFF5, 0x9320 }, { 0xBFF6, 0x9336 }, { 0xBFF7, 0x92F8 }, { 0xBFF8, 0x9333 }, { 0xBFF9, 0x932F }, 
-	{ 0xBFFA, 0x9322 }, { 0xBFFB, 0x92FC }, { 0xBFFC, 0x932B }, { 0xBFFD, 0x9304 }, { 0xBFFE, 0x931A }, { 0xC040, 0x9310 }, { 0xC041, 0x9326 }, { 0xC042, 0x9321 }, 
-	{ 0xC043, 0x9315 }, { 0xC044, 0x932E }, { 0xC045, 0x9319 }, { 0xC046, 0x95BB }, { 0xC047, 0x96A7 }, { 0xC048, 0x96A8 }, { 0xC049, 0x96AA }, { 0xC04A, 0x96D5 }, 
-	{ 0xC04B, 0x970E }, { 0xC04C, 0x9711 }, { 0xC04D, 0x9716 }, { 0xC04E, 0x970D }, { 0xC04F, 0x9713 }, { 0xC050, 0x970F }, { 0xC051, 0x975B }, { 0xC052, 0x975C }, 
-	{ 0xC053, 0x9766 }, { 0xC054, 0x9798 }, { 0xC055, 0x9830 }, { 0xC056, 0x9838 }, { 0xC057, 0x983B }, { 0xC058, 0x9837 }, { 0xC059, 0x982D }, { 0xC05A, 0x9839 }, 
-	{ 0xC05B, 0x9824 }, { 0xC05C, 0x9910 }, { 0xC05D, 0x9928 }, { 0xC05E, 0x991E }, { 0xC05F, 0x991B }, { 0xC060, 0x9921 }, { 0xC061, 0x991A }, { 0xC062, 0x99ED }, 
-	{ 0xC063, 0x99E2 }, { 0xC064, 0x99F1 }, { 0xC065, 0x9AB8 }, { 0xC066, 0x9ABC }, { 0xC067, 0x9AFB }, { 0xC068, 0x9AED }, { 0xC069, 0x9B28 }, { 0xC06A, 0x9B91 }, 
-	{ 0xC06B, 0x9D15 }, { 0xC06C, 0x9D23 }, { 0xC06D, 0x9D26 }, { 0xC06E, 0x9D28 }, { 0xC06F, 0x9D12 }, { 0xC070, 0x9D1B }, { 0xC071, 0x9ED8 }, { 0xC072, 0x9ED4 }, 
-	{ 0xC073, 0x9F8D }, { 0xC074, 0x9F9C }, { 0xC075, 0x512A }, { 0xC076, 0x511F }, { 0xC077, 0x5121 }, { 0xC078, 0x5132 }, { 0xC079, 0x52F5 }, { 0xC07A, 0x568E }, 
-	{ 0xC07B, 0x5680 }, { 0xC07C, 0x5690 }, { 0xC07D, 0x5685 }, { 0xC07E, 0x5687 }, { 0xC0A1, 0x568F }, { 0xC0A2, 0x58D5 }, { 0xC0A3, 0x58D3 }, { 0xC0A4, 0x58D1 }, 
-	{ 0xC0A5, 0x58CE }, { 0xC0A6, 0x5B30 }, { 0xC0A7, 0x5B2A }, { 0xC0A8, 0x5B24 }, { 0xC0A9, 0x5B7A }, { 0xC0AA, 0x5C37 }, { 0xC0AB, 0x5C68 }, { 0xC0AC, 0x5DBC }, 
-	{ 0xC0AD, 0x5DBA }, { 0xC0AE, 0x5DBD }, { 0xC0AF, 0x5DB8 }, { 0xC0B0, 0x5E6B }, { 0xC0B1, 0x5F4C }, { 0xC0B2, 0x5FBD }, { 0xC0B3, 0x61C9 }, { 0xC0B4, 0x61C2 }, 
-	{ 0xC0B5, 0x61C7 }, { 0xC0B6, 0x61E6 }, { 0xC0B7, 0x61CB }, { 0xC0B8, 0x6232 }, { 0xC0B9, 0x6234 }, { 0xC0BA, 0x64CE }, { 0xC0BB, 0x64CA }, { 0xC0BC, 0x64D8 }, 
-	{ 0xC0BD, 0x64E0 }, { 0xC0BE, 0x64F0 }, { 0xC0BF, 0x64E6 }, { 0xC0C0, 0x64EC }, { 0xC0C1, 0x64F1 }, { 0xC0C2, 0x64E2 }, { 0xC0C3, 0x64ED }, { 0xC0C4, 0x6582 }, 
-	{ 0xC0C5, 0x6583 }, { 0xC0C6, 0x66D9 }, { 0xC0C7, 0x66D6 }, { 0xC0C8, 0x6A80 }, { 0xC0C9, 0x6A94 }, { 0xC0CA, 0x6A84 }, { 0xC0CB, 0x6AA2 }, { 0xC0CC, 0x6A9C }, 
-	{ 0xC0CD, 0x6ADB }, { 0xC0CE, 0x6AA3 }, { 0xC0CF, 0x6A7E }, { 0xC0D0, 0x6A97 }, { 0xC0D1, 0x6A90 }, { 0xC0D2, 0x6AA0 }, { 0xC0D3, 0x6B5C }, { 0xC0D4, 0x6BAE }, 
-	{ 0xC0D5, 0x6BDA }, { 0xC0D6, 0x6C08 }, { 0xC0D7, 0x6FD8 }, { 0xC0D8, 0x6FF1 }, { 0xC0D9, 0x6FDF }, { 0xC0DA, 0x6FE0 }, { 0xC0DB, 0x6FDB }, { 0xC0DC, 0x6FE4 }, 
-	{ 0xC0DD, 0x6FEB }, { 0xC0DE, 0x6FEF }, { 0xC0DF, 0x6F80 }, { 0xC0E0, 0x6FEC }, { 0xC0E1, 0x6FE1 }, { 0xC0E2, 0x6FE9 }, { 0xC0E3, 0x6FD5 }, { 0xC0E4, 0x6FEE }, 
-	{ 0xC0E5, 0x6FF0 }, { 0xC0E6, 0x71E7 }, { 0xC0E7, 0x71DF }, { 0xC0E8, 0x71EE }, { 0xC0E9, 0x71E6 }, { 0xC0EA, 0x71E5 }, { 0xC0EB, 0x71ED }, { 0xC0EC, 0x71EC }, 
-	{ 0xC0ED, 0x71F4 }, { 0xC0EE, 0x71E0 }, { 0xC0EF, 0x7235 }, { 0xC0F0, 0x7246 }, { 0xC0F1, 0x7370 }, { 0xC0F2, 0x7372 }, { 0xC0F3, 0x74A9 }, { 0xC0F4, 0x74B0 }, 
-	{ 0xC0F5, 0x74A6 }, { 0xC0F6, 0x74A8 }, { 0xC0F7, 0x7646 }, { 0xC0F8, 0x7642 }, { 0xC0F9, 0x764C }, { 0xC0FA, 0x76EA }, { 0xC0FB, 0x77B3 }, { 0xC0FC, 0x77AA }, 
-	{ 0xC0FD, 0x77B0 }, { 0xC0FE, 0x77AC }, { 0xC140, 0x77A7 }, { 0xC141, 0x77AD }, { 0xC142, 0x77EF }, { 0xC143, 0x78F7 }, { 0xC144, 0x78FA }, { 0xC145, 0x78F4 }, 
-	{ 0xC146, 0x78EF }, { 0xC147, 0x7901 }, { 0xC148, 0x79A7 }, { 0xC149, 0x79AA }, { 0xC14A, 0x7A57 }, { 0xC14B, 0x7ABF }, { 0xC14C, 0x7C07 }, { 0xC14D, 0x7C0D }, 
-	{ 0xC14E, 0x7BFE }, { 0xC14F, 0x7BF7 }, { 0xC150, 0x7C0C }, { 0xC151, 0x7BE0 }, { 0xC152, 0x7CE0 }, { 0xC153, 0x7CDC }, { 0xC154, 0x7CDE }, { 0xC155, 0x7CE2 }, 
-	{ 0xC156, 0x7CDF }, { 0xC157, 0x7CD9 }, { 0xC158, 0x7CDD }, { 0xC159, 0x7E2E }, { 0xC15A, 0x7E3E }, { 0xC15B, 0x7E46 }, { 0xC15C, 0x7E37 }, { 0xC15D, 0x7E32 }, 
-	{ 0xC15E, 0x7E43 }, { 0xC15F, 0x7E2B }, { 0xC160, 0x7E3D }, { 0xC161, 0x7E31 }, { 0xC162, 0x7E45 }, { 0xC163, 0x7E41 }, { 0xC164, 0x7E34 }, { 0xC165, 0x7E39 }, 
-	{ 0xC166, 0x7E48 }, { 0xC167, 0x7E35 }, { 0xC168, 0x7E3F }, { 0xC169, 0x7E2F }, { 0xC16A, 0x7F44 }, { 0xC16B, 0x7FF3 }, { 0xC16C, 0x7FFC }, { 0xC16D, 0x8071 }, 
-	{ 0xC16E, 0x8072 }, { 0xC16F, 0x8070 }, { 0xC170, 0x806F }, { 0xC171, 0x8073 }, { 0xC172, 0x81C6 }, { 0xC173, 0x81C3 }, { 0xC174, 0x81BA }, { 0xC175, 0x81C2 }, 
-	{ 0xC176, 0x81C0 }, { 0xC177, 0x81BF }, { 0xC178, 0x81BD }, { 0xC179, 0x81C9 }, { 0xC17A, 0x81BE }, { 0xC17B, 0x81E8 }, { 0xC17C, 0x8209 }, { 0xC17D, 0x8271 }, 
-	{ 0xC17E, 0x85AA }, { 0xC1A1, 0x8584 }, { 0xC1A2, 0x857E }, { 0xC1A3, 0x859C }, { 0xC1A4, 0x8591 }, { 0xC1A5, 0x8594 }, { 0xC1A6, 0x85AF }, { 0xC1A7, 0x859B }, 
-	{ 0xC1A8, 0x8587 }, { 0xC1A9, 0x85A8 }, { 0xC1AA, 0x858A }, { 0xC1AB, 0x8667 }, { 0xC1AC, 0x87C0 }, { 0xC1AD, 0x87D1 }, { 0xC1AE, 0x87B3 }, { 0xC1AF, 0x87D2 }, 
-	{ 0xC1B0, 0x87C6 }, { 0xC1B1, 0x87AB }, { 0xC1B2, 0x87BB }, { 0xC1B3, 0x87BA }, { 0xC1B4, 0x87C8 }, { 0xC1B5, 0x87CB }, { 0xC1B6, 0x893B }, { 0xC1B7, 0x8936 }, 
-	{ 0xC1B8, 0x8944 }, { 0xC1B9, 0x8938 }, { 0xC1BA, 0x893D }, { 0xC1BB, 0x89AC }, { 0xC1BC, 0x8B0E }, { 0xC1BD, 0x8B17 }, { 0xC1BE, 0x8B19 }, { 0xC1BF, 0x8B1B }, 
-	{ 0xC1C0, 0x8B0A }, { 0xC1C1, 0x8B20 }, { 0xC1C2, 0x8B1D }, { 0xC1C3, 0x8B04 }, { 0xC1C4, 0x8B10 }, { 0xC1C5, 0x8C41 }, { 0xC1C6, 0x8C3F }, { 0xC1C7, 0x8C73 }, 
-	{ 0xC1C8, 0x8CFA }, { 0xC1C9, 0x8CFD }, { 0xC1CA, 0x8CFC }, { 0xC1CB, 0x8CF8 }, { 0xC1CC, 0x8CFB }, { 0xC1CD, 0x8DA8 }, { 0xC1CE, 0x8E49 }, { 0xC1CF, 0x8E4B }, 
-	{ 0xC1D0, 0x8E48 }, { 0xC1D1, 0x8E4A }, { 0xC1D2, 0x8F44 }, { 0xC1D3, 0x8F3E }, { 0xC1D4, 0x8F42 }, { 0xC1D5, 0x8F45 }, { 0xC1D6, 0x8F3F }, { 0xC1D7, 0x907F }, 
-	{ 0xC1D8, 0x907D }, { 0xC1D9, 0x9084 }, { 0xC1DA, 0x9081 }, { 0xC1DB, 0x9082 }, { 0xC1DC, 0x9080 }, { 0xC1DD, 0x9139 }, { 0xC1DE, 0x91A3 }, { 0xC1DF, 0x919E }, 
-	{ 0xC1E0, 0x919C }, { 0xC1E1, 0x934D }, { 0xC1E2, 0x9382 }, { 0xC1E3, 0x9328 }, { 0xC1E4, 0x9375 }, { 0xC1E5, 0x934A }, { 0xC1E6, 0x9365 }, { 0xC1E7, 0x934B }, 
-	{ 0xC1E8, 0x9318 }, { 0xC1E9, 0x937E }, { 0xC1EA, 0x936C }, { 0xC1EB, 0x935B }, { 0xC1EC, 0x9370 }, { 0xC1ED, 0x935A }, { 0xC1EE, 0x9354 }, { 0xC1EF, 0x95CA }, 
-	{ 0xC1F0, 0x95CB }, { 0xC1F1, 0x95CC }, { 0xC1F2, 0x95C8 }, { 0xC1F3, 0x95C6 }, { 0xC1F4, 0x96B1 }, { 0xC1F5, 0x96B8 }, { 0xC1F6, 0x96D6 }, { 0xC1F7, 0x971C }, 
-	{ 0xC1F8, 0x971E }, { 0xC1F9, 0x97A0 }, { 0xC1FA, 0x97D3 }, { 0xC1FB, 0x9846 }, { 0xC1FC, 0x98B6 }, { 0xC1FD, 0x9935 }, { 0xC1FE, 0x9A01 }, { 0xC240, 0x99FF }, 
-	{ 0xC241, 0x9BAE }, { 0xC242, 0x9BAB }, { 0xC243, 0x9BAA }, { 0xC244, 0x9BAD }, { 0xC245, 0x9D3B }, { 0xC246, 0x9D3F }, { 0xC247, 0x9E8B }, { 0xC248, 0x9ECF }, 
-	{ 0xC249, 0x9EDE }, { 0xC24A, 0x9EDC }, { 0xC24B, 0x9EDD }, { 0xC24C, 0x9EDB }, { 0xC24D, 0x9F3E }, { 0xC24E, 0x9F4B }, { 0xC24F, 0x53E2 }, { 0xC250, 0x5695 }, 
-	{ 0xC251, 0x56AE }, { 0xC252, 0x58D9 }, { 0xC253, 0x58D8 }, { 0xC254, 0x5B38 }, { 0xC255, 0x5F5D }, { 0xC256, 0x61E3 }, { 0xC257, 0x6233 }, { 0xC258, 0x64F4 }, 
-	{ 0xC259, 0x64F2 }, { 0xC25A, 0x64FE }, { 0xC25B, 0x6506 }, { 0xC25C, 0x64FA }, { 0xC25D, 0x64FB }, { 0xC25E, 0x64F7 }, { 0xC25F, 0x65B7 }, { 0xC260, 0x66DC }, 
-	{ 0xC261, 0x6726 }, { 0xC262, 0x6AB3 }, { 0xC263, 0x6AAC }, { 0xC264, 0x6AC3 }, { 0xC265, 0x6ABB }, { 0xC266, 0x6AB8 }, { 0xC267, 0x6AC2 }, { 0xC268, 0x6AAE }, 
-	{ 0xC269, 0x6AAF }, { 0xC26A, 0x6B5F }, { 0xC26B, 0x6B78 }, { 0xC26C, 0x6BAF }, { 0xC26D, 0x7009 }, { 0xC26E, 0x700B }, { 0xC26F, 0x6FFE }, { 0xC270, 0x7006 }, 
-	{ 0xC271, 0x6FFA }, { 0xC272, 0x7011 }, { 0xC273, 0x700F }, { 0xC274, 0x71FB }, { 0xC275, 0x71FC }, { 0xC276, 0x71FE }, { 0xC277, 0x71F8 }, { 0xC278, 0x7377 }, 
-	{ 0xC279, 0x7375 }, { 0xC27A, 0x74A7 }, { 0xC27B, 0x74BF }, { 0xC27C, 0x7515 }, { 0xC27D, 0x7656 }, { 0xC27E, 0x7658 }, { 0xC2A1, 0x7652 }, { 0xC2A2, 0x77BD }, 
-	{ 0xC2A3, 0x77BF }, { 0xC2A4, 0x77BB }, { 0xC2A5, 0x77BC }, { 0xC2A6, 0x790E }, { 0xC2A7, 0x79AE }, { 0xC2A8, 0x7A61 }, { 0xC2A9, 0x7A62 }, { 0xC2AA, 0x7A60 }, 
-	{ 0xC2AB, 0x7AC4 }, { 0xC2AC, 0x7AC5 }, { 0xC2AD, 0x7C2B }, { 0xC2AE, 0x7C27 }, { 0xC2AF, 0x7C2A }, { 0xC2B0, 0x7C1E }, { 0xC2B1, 0x7C23 }, { 0xC2B2, 0x7C21 }, 
-	{ 0xC2B3, 0x7CE7 }, { 0xC2B4, 0x7E54 }, { 0xC2B5, 0x7E55 }, { 0xC2B6, 0x7E5E }, { 0xC2B7, 0x7E5A }, { 0xC2B8, 0x7E61 }, { 0xC2B9, 0x7E52 }, { 0xC2BA, 0x7E59 }, 
-	{ 0xC2BB, 0x7F48 }, { 0xC2BC, 0x7FF9 }, { 0xC2BD, 0x7FFB }, { 0xC2BE, 0x8077 }, { 0xC2BF, 0x8076 }, { 0xC2C0, 0x81CD }, { 0xC2C1, 0x81CF }, { 0xC2C2, 0x820A }, 
-	{ 0xC2C3, 0x85CF }, { 0xC2C4, 0x85A9 }, { 0xC2C5, 0x85CD }, { 0xC2C6, 0x85D0 }, { 0xC2C7, 0x85C9 }, { 0xC2C8, 0x85B0 }, { 0xC2C9, 0x85BA }, { 0xC2CA, 0x85B9 }, 
-	{ 0xC2CB, 0x85A6 }, { 0xC2CC, 0x87EF }, { 0xC2CD, 0x87EC }, { 0xC2CE, 0x87F2 }, { 0xC2CF, 0x87E0 }, { 0xC2D0, 0x8986 }, { 0xC2D1, 0x89B2 }, { 0xC2D2, 0x89F4 }, 
-	{ 0xC2D3, 0x8B28 }, { 0xC2D4, 0x8B39 }, { 0xC2D5, 0x8B2C }, { 0xC2D6, 0x8B2B }, { 0xC2D7, 0x8C50 }, { 0xC2D8, 0x8D05 }, { 0xC2D9, 0x8E59 }, { 0xC2DA, 0x8E63 }, 
-	{ 0xC2DB, 0x8E66 }, { 0xC2DC, 0x8E64 }, { 0xC2DD, 0x8E5F }, { 0xC2DE, 0x8E55 }, { 0xC2DF, 0x8EC0 }, { 0xC2E0, 0x8F49 }, { 0xC2E1, 0x8F4D }, { 0xC2E2, 0x9087 }, 
-	{ 0xC2E3, 0x9083 }, { 0xC2E4, 0x9088 }, { 0xC2E5, 0x91AB }, { 0xC2E6, 0x91AC }, { 0xC2E7, 0x91D0 }, { 0xC2E8, 0x9394 }, { 0xC2E9, 0x938A }, { 0xC2EA, 0x9396 }, 
-	{ 0xC2EB, 0x93A2 }, { 0xC2EC, 0x93B3 }, { 0xC2ED, 0x93AE }, { 0xC2EE, 0x93AC }, { 0xC2EF, 0x93B0 }, { 0xC2F0, 0x9398 }, { 0xC2F1, 0x939A }, { 0xC2F2, 0x9397 }, 
-	{ 0xC2F3, 0x95D4 }, { 0xC2F4, 0x95D6 }, { 0xC2F5, 0x95D0 }, { 0xC2F6, 0x95D5 }, { 0xC2F7, 0x96E2 }, { 0xC2F8, 0x96DC }, { 0xC2F9, 0x96D9 }, { 0xC2FA, 0x96DB }, 
-	{ 0xC2FB, 0x96DE }, { 0xC2FC, 0x9724 }, { 0xC2FD, 0x97A3 }, { 0xC2FE, 0x97A6 }, { 0xC340, 0x97AD }, { 0xC341, 0x97F9 }, { 0xC342, 0x984D }, { 0xC343, 0x984F }, 
-	{ 0xC344, 0x984C }, { 0xC345, 0x984E }, { 0xC346, 0x9853 }, { 0xC347, 0x98BA }, { 0xC348, 0x993E }, { 0xC349, 0x993F }, { 0xC34A, 0x993D }, { 0xC34B, 0x992E }, 
-	{ 0xC34C, 0x99A5 }, { 0xC34D, 0x9A0E }, { 0xC34E, 0x9AC1 }, { 0xC34F, 0x9B03 }, { 0xC350, 0x9B06 }, { 0xC351, 0x9B4F }, { 0xC352, 0x9B4E }, { 0xC353, 0x9B4D }, 
-	{ 0xC354, 0x9BCA }, { 0xC355, 0x9BC9 }, { 0xC356, 0x9BFD }, { 0xC357, 0x9BC8 }, { 0xC358, 0x9BC0 }, { 0xC359, 0x9D51 }, { 0xC35A, 0x9D5D }, { 0xC35B, 0x9D60 }, 
-	{ 0xC35C, 0x9EE0 }, { 0xC35D, 0x9F15 }, { 0xC35E, 0x9F2C }, { 0xC35F, 0x5133 }, { 0xC360, 0x56A5 }, { 0xC361, 0x58DE }, { 0xC362, 0x58DF }, { 0xC363, 0x58E2 }, 
-	{ 0xC364, 0x5BF5 }, { 0xC365, 0x9F90 }, { 0xC366, 0x5EEC }, { 0xC367, 0x61F2 }, { 0xC368, 0x61F7 }, { 0xC369, 0x61F6 }, { 0xC36A, 0x61F5 }, { 0xC36B, 0x6500 }, 
-	{ 0xC36C, 0x650F }, { 0xC36D, 0x66E0 }, { 0xC36E, 0x66DD }, { 0xC36F, 0x6AE5 }, { 0xC370, 0x6ADD }, { 0xC371, 0x6ADA }, { 0xC372, 0x6AD3 }, { 0xC373, 0x701B }, 
-	{ 0xC374, 0x701F }, { 0xC375, 0x7028 }, { 0xC376, 0x701A }, { 0xC377, 0x701D }, { 0xC378, 0x7015 }, { 0xC379, 0x7018 }, { 0xC37A, 0x7206 }, { 0xC37B, 0x720D }, 
-	{ 0xC37C, 0x7258 }, { 0xC37D, 0x72A2 }, { 0xC37E, 0x7378 }, { 0xC3A1, 0x737A }, { 0xC3A2, 0x74BD }, { 0xC3A3, 0x74CA }, { 0xC3A4, 0x74E3 }, { 0xC3A5, 0x7587 }, 
-	{ 0xC3A6, 0x7586 }, { 0xC3A7, 0x765F }, { 0xC3A8, 0x7661 }, { 0xC3A9, 0x77C7 }, { 0xC3AA, 0x7919 }, { 0xC3AB, 0x79B1 }, { 0xC3AC, 0x7A6B }, { 0xC3AD, 0x7A69 }, 
-	{ 0xC3AE, 0x7C3E }, { 0xC3AF, 0x7C3F }, { 0xC3B0, 0x7C38 }, { 0xC3B1, 0x7C3D }, { 0xC3B2, 0x7C37 }, { 0xC3B3, 0x7C40 }, { 0xC3B4, 0x7E6B }, { 0xC3B5, 0x7E6D }, 
-	{ 0xC3B6, 0x7E79 }, { 0xC3B7, 0x7E69 }, { 0xC3B8, 0x7E6A }, { 0xC3B9, 0x7F85 }, { 0xC3BA, 0x7E73 }, { 0xC3BB, 0x7FB6 }, { 0xC3BC, 0x7FB9 }, { 0xC3BD, 0x7FB8 }, 
-	{ 0xC3BE, 0x81D8 }, { 0xC3BF, 0x85E9 }, { 0xC3C0, 0x85DD }, { 0xC3C1, 0x85EA }, { 0xC3C2, 0x85D5 }, { 0xC3C3, 0x85E4 }, { 0xC3C4, 0x85E5 }, { 0xC3C5, 0x85F7 }, 
-	{ 0xC3C6, 0x87FB }, { 0xC3C7, 0x8805 }, { 0xC3C8, 0x880D }, { 0xC3C9, 0x87F9 }, { 0xC3CA, 0x87FE }, { 0xC3CB, 0x8960 }, { 0xC3CC, 0x895F }, { 0xC3CD, 0x8956 }, 
-	{ 0xC3CE, 0x895E }, { 0xC3CF, 0x8B41 }, { 0xC3D0, 0x8B5C }, { 0xC3D1, 0x8B58 }, { 0xC3D2, 0x8B49 }, { 0xC3D3, 0x8B5A }, { 0xC3D4, 0x8B4E }, { 0xC3D5, 0x8B4F }, 
-	{ 0xC3D6, 0x8B46 }, { 0xC3D7, 0x8B59 }, { 0xC3D8, 0x8D08 }, { 0xC3D9, 0x8D0A }, { 0xC3DA, 0x8E7C }, { 0xC3DB, 0x8E72 }, { 0xC3DC, 0x8E87 }, { 0xC3DD, 0x8E76 }, 
-	{ 0xC3DE, 0x8E6C }, { 0xC3DF, 0x8E7A }, { 0xC3E0, 0x8E74 }, { 0xC3E1, 0x8F54 }, { 0xC3E2, 0x8F4E }, { 0xC3E3, 0x8FAD }, { 0xC3E4, 0x908A }, { 0xC3E5, 0x908B }, 
-	{ 0xC3E6, 0x91B1 }, { 0xC3E7, 0x91AE }, { 0xC3E8, 0x93E1 }, { 0xC3E9, 0x93D1 }, { 0xC3EA, 0x93DF }, { 0xC3EB, 0x93C3 }, { 0xC3EC, 0x93C8 }, { 0xC3ED, 0x93DC }, 
-	{ 0xC3EE, 0x93DD }, { 0xC3EF, 0x93D6 }, { 0xC3F0, 0x93E2 }, { 0xC3F1, 0x93CD }, { 0xC3F2, 0x93D8 }, { 0xC3F3, 0x93E4 }, { 0xC3F4, 0x93D7 }, { 0xC3F5, 0x93E8 }, 
-	{ 0xC3F6, 0x95DC }, { 0xC3F7, 0x96B4 }, { 0xC3F8, 0x96E3 }, { 0xC3F9, 0x972A }, { 0xC3FA, 0x9727 }, { 0xC3FB, 0x9761 }, { 0xC3FC, 0x97DC }, { 0xC3FD, 0x97FB }, 
-	{ 0xC3FE, 0x985E }, { 0xC440, 0x9858 }, { 0xC441, 0x985B }, { 0xC442, 0x98BC }, { 0xC443, 0x9945 }, { 0xC444, 0x9949 }, { 0xC445, 0x9A16 }, { 0xC446, 0x9A19 }, 
-	{ 0xC447, 0x9B0D }, { 0xC448, 0x9BE8 }, { 0xC449, 0x9BE7 }, { 0xC44A, 0x9BD6 }, { 0xC44B, 0x9BDB }, { 0xC44C, 0x9D89 }, { 0xC44D, 0x9D61 }, { 0xC44E, 0x9D72 }, 
-	{ 0xC44F, 0x9D6A }, { 0xC450, 0x9D6C }, { 0xC451, 0x9E92 }, { 0xC452, 0x9E97 }, { 0xC453, 0x9E93 }, { 0xC454, 0x9EB4 }, { 0xC455, 0x52F8 }, { 0xC456, 0x56A8 }, 
-	{ 0xC457, 0x56B7 }, { 0xC458, 0x56B6 }, { 0xC459, 0x56B4 }, { 0xC45A, 0x56BC }, { 0xC45B, 0x58E4 }, { 0xC45C, 0x5B40 }, { 0xC45D, 0x5B43 }, { 0xC45E, 0x5B7D }, 
-	{ 0xC45F, 0x5BF6 }, { 0xC460, 0x5DC9 }, { 0xC461, 0x61F8 }, { 0xC462, 0x61FA }, { 0xC463, 0x6518 }, { 0xC464, 0x6514 }, { 0xC465, 0x6519 }, { 0xC466, 0x66E6 }, 
-	{ 0xC467, 0x6727 }, { 0xC468, 0x6AEC }, { 0xC469, 0x703E }, { 0xC46A, 0x7030 }, { 0xC46B, 0x7032 }, { 0xC46C, 0x7210 }, { 0xC46D, 0x737B }, { 0xC46E, 0x74CF }, 
-	{ 0xC46F, 0x7662 }, { 0xC470, 0x7665 }, { 0xC471, 0x7926 }, { 0xC472, 0x792A }, { 0xC473, 0x792C }, { 0xC474, 0x792B }, { 0xC475, 0x7AC7 }, { 0xC476, 0x7AF6 }, 
-	{ 0xC477, 0x7C4C }, { 0xC478, 0x7C43 }, { 0xC479, 0x7C4D }, { 0xC47A, 0x7CEF }, { 0xC47B, 0x7CF0 }, { 0xC47C, 0x8FAE }, { 0xC47D, 0x7E7D }, { 0xC47E, 0x7E7C }, 
-	{ 0xC4A1, 0x7E82 }, { 0xC4A2, 0x7F4C }, { 0xC4A3, 0x8000 }, { 0xC4A4, 0x81DA }, { 0xC4A5, 0x8266 }, { 0xC4A6, 0x85FB }, { 0xC4A7, 0x85F9 }, { 0xC4A8, 0x8611 }, 
-	{ 0xC4A9, 0x85FA }, { 0xC4AA, 0x8606 }, { 0xC4AB, 0x860B }, { 0xC4AC, 0x8607 }, { 0xC4AD, 0x860A }, { 0xC4AE, 0x8814 }, { 0xC4AF, 0x8815 }, { 0xC4B0, 0x8964 }, 
-	{ 0xC4B1, 0x89BA }, { 0xC4B2, 0x89F8 }, { 0xC4B3, 0x8B70 }, { 0xC4B4, 0x8B6C }, { 0xC4B5, 0x8B66 }, { 0xC4B6, 0x8B6F }, { 0xC4B7, 0x8B5F }, { 0xC4B8, 0x8B6B }, 
-	{ 0xC4B9, 0x8D0F }, { 0xC4BA, 0x8D0D }, { 0xC4BB, 0x8E89 }, { 0xC4BC, 0x8E81 }, { 0xC4BD, 0x8E85 }, { 0xC4BE, 0x8E82 }, { 0xC4BF, 0x91B4 }, { 0xC4C0, 0x91CB }, 
-	{ 0xC4C1, 0x9418 }, { 0xC4C2, 0x9403 }, { 0xC4C3, 0x93FD }, { 0xC4C4, 0x95E1 }, { 0xC4C5, 0x9730 }, { 0xC4C6, 0x98C4 }, { 0xC4C7, 0x9952 }, { 0xC4C8, 0x9951 }, 
-	{ 0xC4C9, 0x99A8 }, { 0xC4CA, 0x9A2B }, { 0xC4CB, 0x9A30 }, { 0xC4CC, 0x9A37 }, { 0xC4CD, 0x9A35 }, { 0xC4CE, 0x9C13 }, { 0xC4CF, 0x9C0D }, { 0xC4D0, 0x9E79 }, 
-	{ 0xC4D1, 0x9EB5 }, { 0xC4D2, 0x9EE8 }, { 0xC4D3, 0x9F2F }, { 0xC4D4, 0x9F5F }, { 0xC4D5, 0x9F63 }, { 0xC4D6, 0x9F61 }, { 0xC4D7, 0x5137 }, { 0xC4D8, 0x5138 }, 
-	{ 0xC4D9, 0x56C1 }, { 0xC4DA, 0x56C0 }, { 0xC4DB, 0x56C2 }, { 0xC4DC, 0x5914 }, { 0xC4DD, 0x5C6C }, { 0xC4DE, 0x5DCD }, { 0xC4DF, 0x61FC }, { 0xC4E0, 0x61FE }, 
-	{ 0xC4E1, 0x651D }, { 0xC4E2, 0x651C }, { 0xC4E3, 0x6595 }, { 0xC4E4, 0x66E9 }, { 0xC4E5, 0x6AFB }, { 0xC4E6, 0x6B04 }, { 0xC4E7, 0x6AFA }, { 0xC4E8, 0x6BB2 }, 
-	{ 0xC4E9, 0x704C }, { 0xC4EA, 0x721B }, { 0xC4EB, 0x72A7 }, { 0xC4EC, 0x74D6 }, { 0xC4ED, 0x74D4 }, { 0xC4EE, 0x7669 }, { 0xC4EF, 0x77D3 }, { 0xC4F0, 0x7C50 }, 
-	{ 0xC4F1, 0x7E8F }, { 0xC4F2, 0x7E8C }, { 0xC4F3, 0x7FBC }, { 0xC4F4, 0x8617 }, { 0xC4F5, 0x862D }, { 0xC4F6, 0x861A }, { 0xC4F7, 0x8823 }, { 0xC4F8, 0x8822 }, 
-	{ 0xC4F9, 0x8821 }, { 0xC4FA, 0x881F }, { 0xC4FB, 0x896A }, { 0xC4FC, 0x896C }, { 0xC4FD, 0x89BD }, { 0xC4FE, 0x8B74 }, { 0xC540, 0x8B77 }, { 0xC541, 0x8B7D }, 
-	{ 0xC542, 0x8D13 }, { 0xC543, 0x8E8A }, { 0xC544, 0x8E8D }, { 0xC545, 0x8E8B }, { 0xC546, 0x8F5F }, { 0xC547, 0x8FAF }, { 0xC548, 0x91BA }, { 0xC549, 0x942E }, 
-	{ 0xC54A, 0x9433 }, { 0xC54B, 0x9435 }, { 0xC54C, 0x943A }, { 0xC54D, 0x9438 }, { 0xC54E, 0x9432 }, { 0xC54F, 0x942B }, { 0xC550, 0x95E2 }, { 0xC551, 0x9738 }, 
-	{ 0xC552, 0x9739 }, { 0xC553, 0x9732 }, { 0xC554, 0x97FF }, { 0xC555, 0x9867 }, { 0xC556, 0x9865 }, { 0xC557, 0x9957 }, { 0xC558, 0x9A45 }, { 0xC559, 0x9A43 }, 
-	{ 0xC55A, 0x9A40 }, { 0xC55B, 0x9A3E }, { 0xC55C, 0x9ACF }, { 0xC55D, 0x9B54 }, { 0xC55E, 0x9B51 }, { 0xC55F, 0x9C2D }, { 0xC560, 0x9C25 }, { 0xC561, 0x9DAF }, 
-	{ 0xC562, 0x9DB4 }, { 0xC563, 0x9DC2 }, { 0xC564, 0x9DB8 }, { 0xC565, 0x9E9D }, { 0xC566, 0x9EEF }, { 0xC567, 0x9F19 }, { 0xC568, 0x9F5C }, { 0xC569, 0x9F66 }, 
-	{ 0xC56A, 0x9F67 }, { 0xC56B, 0x513C }, { 0xC56C, 0x513B }, { 0xC56D, 0x56C8 }, { 0xC56E, 0x56CA }, { 0xC56F, 0x56C9 }, { 0xC570, 0x5B7F }, { 0xC571, 0x5DD4 }, 
-	{ 0xC572, 0x5DD2 }, { 0xC573, 0x5F4E }, { 0xC574, 0x61FF }, { 0xC575, 0x6524 }, { 0xC576, 0x6B0A }, { 0xC577, 0x6B61 }, { 0xC578, 0x7051 }, { 0xC579, 0x7058 }, 
-	{ 0xC57A, 0x7380 }, { 0xC57B, 0x74E4 }, { 0xC57C, 0x758A }, { 0xC57D, 0x766E }, { 0xC57E, 0x766C }, { 0xC5A1, 0x79B3 }, { 0xC5A2, 0x7C60 }, { 0xC5A3, 0x7C5F }, 
-	{ 0xC5A4, 0x807E }, { 0xC5A5, 0x807D }, { 0xC5A6, 0x81DF }, { 0xC5A7, 0x8972 }, { 0xC5A8, 0x896F }, { 0xC5A9, 0x89FC }, { 0xC5AA, 0x8B80 }, { 0xC5AB, 0x8D16 }, 
-	{ 0xC5AC, 0x8D17 }, { 0xC5AD, 0x8E91 }, { 0xC5AE, 0x8E93 }, { 0xC5AF, 0x8F61 }, { 0xC5B0, 0x9148 }, { 0xC5B1, 0x9444 }, { 0xC5B2, 0x9451 }, { 0xC5B3, 0x9452 }, 
-	{ 0xC5B4, 0x973D }, { 0xC5B5, 0x973E }, { 0xC5B6, 0x97C3 }, { 0xC5B7, 0x97C1 }, { 0xC5B8, 0x986B }, { 0xC5B9, 0x9955 }, { 0xC5BA, 0x9A55 }, { 0xC5BB, 0x9A4D }, 
-	{ 0xC5BC, 0x9AD2 }, { 0xC5BD, 0x9B1A }, { 0xC5BE, 0x9C49 }, { 0xC5BF, 0x9C31 }, { 0xC5C0, 0x9C3E }, { 0xC5C1, 0x9C3B }, { 0xC5C2, 0x9DD3 }, { 0xC5C3, 0x9DD7 }, 
-	{ 0xC5C4, 0x9F34 }, { 0xC5C5, 0x9F6C }, { 0xC5C6, 0x9F6A }, { 0xC5C7, 0x9F94 }, { 0xC5C8, 0x56CC }, { 0xC5C9, 0x5DD6 }, { 0xC5CA, 0x6200 }, { 0xC5CB, 0x6523 }, 
-	{ 0xC5CC, 0x652B }, { 0xC5CD, 0x652A }, { 0xC5CE, 0x66EC }, { 0xC5CF, 0x6B10 }, { 0xC5D0, 0x74DA }, { 0xC5D1, 0x7ACA }, { 0xC5D2, 0x7C64 }, { 0xC5D3, 0x7C63 }, 
-	{ 0xC5D4, 0x7C65 }, { 0xC5D5, 0x7E93 }, { 0xC5D6, 0x7E96 }, { 0xC5D7, 0x7E94 }, { 0xC5D8, 0x81E2 }, { 0xC5D9, 0x8638 }, { 0xC5DA, 0x863F }, { 0xC5DB, 0x8831 }, 
-	{ 0xC5DC, 0x8B8A }, { 0xC5DD, 0x9090 }, { 0xC5DE, 0x908F }, { 0xC5DF, 0x9463 }, { 0xC5E0, 0x9460 }, { 0xC5E1, 0x9464 }, { 0xC5E2, 0x9768 }, { 0xC5E3, 0x986F }, 
-	{ 0xC5E4, 0x995C }, { 0xC5E5, 0x9A5A }, { 0xC5E6, 0x9A5B }, { 0xC5E7, 0x9A57 }, { 0xC5E8, 0x9AD3 }, { 0xC5E9, 0x9AD4 }, { 0xC5EA, 0x9AD1 }, { 0xC5EB, 0x9C54 }, 
-	{ 0xC5EC, 0x9C57 }, { 0xC5ED, 0x9C56 }, { 0xC5EE, 0x9DE5 }, { 0xC5EF, 0x9E9F }, { 0xC5F0, 0x9EF4 }, { 0xC5F1, 0x56D1 }, { 0xC5F2, 0x58E9 }, { 0xC5F3, 0x652C }, 
-	{ 0xC5F4, 0x705E }, { 0xC5F5, 0x7671 }, { 0xC5F6, 0x7672 }, { 0xC5F7, 0x77D7 }, { 0xC5F8, 0x7F50 }, { 0xC5F9, 0x7F88 }, { 0xC5FA, 0x8836 }, { 0xC5FB, 0x8839 }, 
-	{ 0xC5FC, 0x8862 }, { 0xC5FD, 0x8B93 }, { 0xC5FE, 0x8B92 }, { 0xC640, 0x8B96 }, { 0xC641, 0x8277 }, { 0xC642, 0x8D1B }, { 0xC643, 0x91C0 }, { 0xC644, 0x946A }, 
-	{ 0xC645, 0x9742 }, { 0xC646, 0x9748 }, { 0xC647, 0x9744 }, { 0xC648, 0x97C6 }, { 0xC649, 0x9870 }, { 0xC64A, 0x9A5F }, { 0xC64B, 0x9B22 }, { 0xC64C, 0x9B58 }, 
-	{ 0xC64D, 0x9C5F }, { 0xC64E, 0x9DF9 }, { 0xC64F, 0x9DFA }, { 0xC650, 0x9E7C }, { 0xC651, 0x9E7D }, { 0xC652, 0x9F07 }, { 0xC653, 0x9F77 }, { 0xC654, 0x9F72 }, 
-	{ 0xC655, 0x5EF3 }, { 0xC656, 0x6B16 }, { 0xC657, 0x7063 }, { 0xC658, 0x7C6C }, { 0xC659, 0x7C6E }, { 0xC65A, 0x883B }, { 0xC65B, 0x89C0 }, { 0xC65C, 0x8EA1 }, 
-	{ 0xC65D, 0x91C1 }, { 0xC65E, 0x9472 }, { 0xC65F, 0x9470 }, { 0xC660, 0x9871 }, { 0xC661, 0x995E }, { 0xC662, 0x9AD6 }, { 0xC663, 0x9B23 }, { 0xC664, 0x9ECC }, 
-	{ 0xC665, 0x7064 }, { 0xC666, 0x77DA }, { 0xC667, 0x8B9A }, { 0xC668, 0x9477 }, { 0xC669, 0x97C9 }, { 0xC66A, 0x9A62 }, { 0xC66B, 0x9A65 }, { 0xC66C, 0x7E9C }, 
-	{ 0xC66D, 0x8B9C }, { 0xC66E, 0x8EAA }, { 0xC66F, 0x91C5 }, { 0xC670, 0x947D }, { 0xC671, 0x947E }, { 0xC672, 0x947C }, { 0xC673, 0x9C77 }, { 0xC674, 0x9C78 }, 
-	{ 0xC675, 0x9EF7 }, { 0xC676, 0x8C54 }, { 0xC677, 0x947F }, { 0xC678, 0x9E1A }, { 0xC679, 0x7228 }, { 0xC67A, 0x9A6A }, { 0xC67B, 0x9B31 }, { 0xC67C, 0x9E1B }, 
-	{ 0xC67D, 0x9E1E }, { 0xC67E, 0x7C72 }, { 0xC940, 0x4E42 }, { 0xC941, 0x4E5C }, { 0xC942, 0x51F5 }, { 0xC943, 0x531A }, { 0xC944, 0x5382 }, { 0xC945, 0x4E07 }, 
-	{ 0xC946, 0x4E0C }, { 0xC947, 0x4E47 }, { 0xC948, 0x4E8D }, { 0xC949, 0x56D7 }, { 0xC94A, 0xFA0C }, { 0xC94B, 0x5C6E }, { 0xC94C, 0x5F73 }, { 0xC94D, 0x4E0F }, 
-	{ 0xC94E, 0x5187 }, { 0xC94F, 0x4E0E }, { 0xC950, 0x4E2E }, { 0xC951, 0x4E93 }, { 0xC952, 0x4EC2 }, { 0xC953, 0x4EC9 }, { 0xC954, 0x4EC8 }, { 0xC955, 0x5198 }, 
-	{ 0xC956, 0x52FC }, { 0xC957, 0x536C }, { 0xC958, 0x53B9 }, { 0xC959, 0x5720 }, { 0xC95A, 0x5903 }, { 0xC95B, 0x592C }, { 0xC95C, 0x5C10 }, { 0xC95D, 0x5DFF }, 
-	{ 0xC95E, 0x65E1 }, { 0xC95F, 0x6BB3 }, { 0xC960, 0x6BCC }, { 0xC961, 0x6C14 }, { 0xC962, 0x723F }, { 0xC963, 0x4E31 }, { 0xC964, 0x4E3C }, { 0xC965, 0x4EE8 }, 
-	{ 0xC966, 0x4EDC }, { 0xC967, 0x4EE9 }, { 0xC968, 0x4EE1 }, { 0xC969, 0x4EDD }, { 0xC96A, 0x4EDA }, { 0xC96B, 0x520C }, { 0xC96C, 0x531C }, { 0xC96D, 0x534C }, 
-	{ 0xC96E, 0x5722 }, { 0xC96F, 0x5723 }, { 0xC970, 0x5917 }, { 0xC971, 0x592F }, { 0xC972, 0x5B81 }, { 0xC973, 0x5B84 }, { 0xC974, 0x5C12 }, { 0xC975, 0x5C3B }, 
-	{ 0xC976, 0x5C74 }, { 0xC977, 0x5C73 }, { 0xC978, 0x5E04 }, { 0xC979, 0x5E80 }, { 0xC97A, 0x5E82 }, { 0xC97B, 0x5FC9 }, { 0xC97C, 0x6209 }, { 0xC97D, 0x6250 }, 
-	{ 0xC97E, 0x6C15 }, { 0xC9A1, 0x6C36 }, { 0xC9A2, 0x6C43 }, { 0xC9A3, 0x6C3F }, { 0xC9A4, 0x6C3B }, { 0xC9A5, 0x72AE }, { 0xC9A6, 0x72B0 }, { 0xC9A7, 0x738A }, 
-	{ 0xC9A8, 0x79B8 }, { 0xC9A9, 0x808A }, { 0xC9AA, 0x961E }, { 0xC9AB, 0x4F0E }, { 0xC9AC, 0x4F18 }, { 0xC9AD, 0x4F2C }, { 0xC9AE, 0x4EF5 }, { 0xC9AF, 0x4F14 }, 
-	{ 0xC9B0, 0x4EF1 }, { 0xC9B1, 0x4F00 }, { 0xC9B2, 0x4EF7 }, { 0xC9B3, 0x4F08 }, { 0xC9B4, 0x4F1D }, { 0xC9B5, 0x4F02 }, { 0xC9B6, 0x4F05 }, { 0xC9B7, 0x4F22 }, 
-	{ 0xC9B8, 0x4F13 }, { 0xC9B9, 0x4F04 }, { 0xC9BA, 0x4EF4 }, { 0xC9BB, 0x4F12 }, { 0xC9BC, 0x51B1 }, { 0xC9BD, 0x5213 }, { 0xC9BE, 0x5209 }, { 0xC9BF, 0x5210 }, 
-	{ 0xC9C0, 0x52A6 }, { 0xC9C1, 0x5322 }, { 0xC9C2, 0x531F }, { 0xC9C3, 0x534D }, { 0xC9C4, 0x538A }, { 0xC9C5, 0x5407 }, { 0xC9C6, 0x56E1 }, { 0xC9C7, 0x56DF }, 
-	{ 0xC9C8, 0x572E }, { 0xC9C9, 0x572A }, { 0xC9CA, 0x5734 }, { 0xC9CB, 0x593C }, { 0xC9CC, 0x5980 }, { 0xC9CD, 0x597C }, { 0xC9CE, 0x5985 }, { 0xC9CF, 0x597B }, 
-	{ 0xC9D0, 0x597E }, { 0xC9D1, 0x5977 }, { 0xC9D2, 0x597F }, { 0xC9D3, 0x5B56 }, { 0xC9D4, 0x5C15 }, { 0xC9D5, 0x5C25 }, { 0xC9D6, 0x5C7C }, { 0xC9D7, 0x5C7A }, 
-	{ 0xC9D8, 0x5C7B }, { 0xC9D9, 0x5C7E }, { 0xC9DA, 0x5DDF }, { 0xC9DB, 0x5E75 }, { 0xC9DC, 0x5E84 }, { 0xC9DD, 0x5F02 }, { 0xC9DE, 0x5F1A }, { 0xC9DF, 0x5F74 }, 
-	{ 0xC9E0, 0x5FD5 }, { 0xC9E1, 0x5FD4 }, { 0xC9E2, 0x5FCF }, { 0xC9E3, 0x625C }, { 0xC9E4, 0x625E }, { 0xC9E5, 0x6264 }, { 0xC9E6, 0x6261 }, { 0xC9E7, 0x6266 }, 
-	{ 0xC9E8, 0x6262 }, { 0xC9E9, 0x6259 }, { 0xC9EA, 0x6260 }, { 0xC9EB, 0x625A }, { 0xC9EC, 0x6265 }, { 0xC9ED, 0x65EF }, { 0xC9EE, 0x65EE }, { 0xC9EF, 0x673E }, 
-	{ 0xC9F0, 0x6739 }, { 0xC9F1, 0x6738 }, { 0xC9F2, 0x673B }, { 0xC9F3, 0x673A }, { 0xC9F4, 0x673F }, { 0xC9F5, 0x673C }, { 0xC9F6, 0x6733 }, { 0xC9F7, 0x6C18 }, 
-	{ 0xC9F8, 0x6C46 }, { 0xC9F9, 0x6C52 }, { 0xC9FA, 0x6C5C }, { 0xC9FB, 0x6C4F }, { 0xC9FC, 0x6C4A }, { 0xC9FD, 0x6C54 }, { 0xC9FE, 0x6C4B }, { 0xCA40, 0x6C4C }, 
-	{ 0xCA41, 0x7071 }, { 0xCA42, 0x725E }, { 0xCA43, 0x72B4 }, { 0xCA44, 0x72B5 }, { 0xCA45, 0x738E }, { 0xCA46, 0x752A }, { 0xCA47, 0x767F }, { 0xCA48, 0x7A75 }, 
-	{ 0xCA49, 0x7F51 }, { 0xCA4A, 0x8278 }, { 0xCA4B, 0x827C }, { 0xCA4C, 0x8280 }, { 0xCA4D, 0x827D }, { 0xCA4E, 0x827F }, { 0xCA4F, 0x864D }, { 0xCA50, 0x897E }, 
-	{ 0xCA51, 0x9099 }, { 0xCA52, 0x9097 }, { 0xCA53, 0x9098 }, { 0xCA54, 0x909B }, { 0xCA55, 0x9094 }, { 0xCA56, 0x9622 }, { 0xCA57, 0x9624 }, { 0xCA58, 0x9620 }, 
-	{ 0xCA59, 0x9623 }, { 0xCA5A, 0x4F56 }, { 0xCA5B, 0x4F3B }, { 0xCA5C, 0x4F62 }, { 0xCA5D, 0x4F49 }, { 0xCA5E, 0x4F53 }, { 0xCA5F, 0x4F64 }, { 0xCA60, 0x4F3E }, 
-	{ 0xCA61, 0x4F67 }, { 0xCA62, 0x4F52 }, { 0xCA63, 0x4F5F }, { 0xCA64, 0x4F41 }, { 0xCA65, 0x4F58 }, { 0xCA66, 0x4F2D }, { 0xCA67, 0x4F33 }, { 0xCA68, 0x4F3F }, 
-	{ 0xCA69, 0x4F61 }, { 0xCA6A, 0x518F }, { 0xCA6B, 0x51B9 }, { 0xCA6C, 0x521C }, { 0xCA6D, 0x521E }, { 0xCA6E, 0x5221 }, { 0xCA6F, 0x52AD }, { 0xCA70, 0x52AE }, 
-	{ 0xCA71, 0x5309 }, { 0xCA72, 0x5363 }, { 0xCA73, 0x5372 }, { 0xCA74, 0x538E }, { 0xCA75, 0x538F }, { 0xCA76, 0x5430 }, { 0xCA77, 0x5437 }, { 0xCA78, 0x542A }, 
-	{ 0xCA79, 0x5454 }, { 0xCA7A, 0x5445 }, { 0xCA7B, 0x5419 }, { 0xCA7C, 0x541C }, { 0xCA7D, 0x5425 }, { 0xCA7E, 0x5418 }, { 0xCAA1, 0x543D }, { 0xCAA2, 0x544F }, 
-	{ 0xCAA3, 0x5441 }, { 0xCAA4, 0x5428 }, { 0xCAA5, 0x5424 }, { 0xCAA6, 0x5447 }, { 0xCAA7, 0x56EE }, { 0xCAA8, 0x56E7 }, { 0xCAA9, 0x56E5 }, { 0xCAAA, 0x5741 }, 
-	{ 0xCAAB, 0x5745 }, { 0xCAAC, 0x574C }, { 0xCAAD, 0x5749 }, { 0xCAAE, 0x574B }, { 0xCAAF, 0x5752 }, { 0xCAB0, 0x5906 }, { 0xCAB1, 0x5940 }, { 0xCAB2, 0x59A6 }, 
-	{ 0xCAB3, 0x5998 }, { 0xCAB4, 0x59A0 }, { 0xCAB5, 0x5997 }, { 0xCAB6, 0x598E }, { 0xCAB7, 0x59A2 }, { 0xCAB8, 0x5990 }, { 0xCAB9, 0x598F }, { 0xCABA, 0x59A7 }, 
-	{ 0xCABB, 0x59A1 }, { 0xCABC, 0x5B8E }, { 0xCABD, 0x5B92 }, { 0xCABE, 0x5C28 }, { 0xCABF, 0x5C2A }, { 0xCAC0, 0x5C8D }, { 0xCAC1, 0x5C8F }, { 0xCAC2, 0x5C88 }, 
-	{ 0xCAC3, 0x5C8B }, { 0xCAC4, 0x5C89 }, { 0xCAC5, 0x5C92 }, { 0xCAC6, 0x5C8A }, { 0xCAC7, 0x5C86 }, { 0xCAC8, 0x5C93 }, { 0xCAC9, 0x5C95 }, { 0xCACA, 0x5DE0 }, 
-	{ 0xCACB, 0x5E0A }, { 0xCACC, 0x5E0E }, { 0xCACD, 0x5E8B }, { 0xCACE, 0x5E89 }, { 0xCACF, 0x5E8C }, { 0xCAD0, 0x5E88 }, { 0xCAD1, 0x5E8D }, { 0xCAD2, 0x5F05 }, 
-	{ 0xCAD3, 0x5F1D }, { 0xCAD4, 0x5F78 }, { 0xCAD5, 0x5F76 }, { 0xCAD6, 0x5FD2 }, { 0xCAD7, 0x5FD1 }, { 0xCAD8, 0x5FD0 }, { 0xCAD9, 0x5FED }, { 0xCADA, 0x5FE8 }, 
-	{ 0xCADB, 0x5FEE }, { 0xCADC, 0x5FF3 }, { 0xCADD, 0x5FE1 }, { 0xCADE, 0x5FE4 }, { 0xCADF, 0x5FE3 }, { 0xCAE0, 0x5FFA }, { 0xCAE1, 0x5FEF }, { 0xCAE2, 0x5FF7 }, 
-	{ 0xCAE3, 0x5FFB }, { 0xCAE4, 0x6000 }, { 0xCAE5, 0x5FF4 }, { 0xCAE6, 0x623A }, { 0xCAE7, 0x6283 }, { 0xCAE8, 0x628C }, { 0xCAE9, 0x628E }, { 0xCAEA, 0x628F }, 
-	{ 0xCAEB, 0x6294 }, { 0xCAEC, 0x6287 }, { 0xCAED, 0x6271 }, { 0xCAEE, 0x627B }, { 0xCAEF, 0x627A }, { 0xCAF0, 0x6270 }, { 0xCAF1, 0x6281 }, { 0xCAF2, 0x6288 }, 
-	{ 0xCAF3, 0x6277 }, { 0xCAF4, 0x627D }, { 0xCAF5, 0x6272 }, { 0xCAF6, 0x6274 }, { 0xCAF7, 0x6537 }, { 0xCAF8, 0x65F0 }, { 0xCAF9, 0x65F4 }, { 0xCAFA, 0x65F3 }, 
-	{ 0xCAFB, 0x65F2 }, { 0xCAFC, 0x65F5 }, { 0xCAFD, 0x6745 }, { 0xCAFE, 0x6747 }, { 0xCB40, 0x6759 }, { 0xCB41, 0x6755 }, { 0xCB42, 0x674C }, { 0xCB43, 0x6748 }, 
-	{ 0xCB44, 0x675D }, { 0xCB45, 0x674D }, { 0xCB46, 0x675A }, { 0xCB47, 0x674B }, { 0xCB48, 0x6BD0 }, { 0xCB49, 0x6C19 }, { 0xCB4A, 0x6C1A }, { 0xCB4B, 0x6C78 }, 
-	{ 0xCB4C, 0x6C67 }, { 0xCB4D, 0x6C6B }, { 0xCB4E, 0x6C84 }, { 0xCB4F, 0x6C8B }, { 0xCB50, 0x6C8F }, { 0xCB51, 0x6C71 }, { 0xCB52, 0x6C6F }, { 0xCB53, 0x6C69 }, 
-	{ 0xCB54, 0x6C9A }, { 0xCB55, 0x6C6D }, { 0xCB56, 0x6C87 }, { 0xCB57, 0x6C95 }, { 0xCB58, 0x6C9C }, { 0xCB59, 0x6C66 }, { 0xCB5A, 0x6C73 }, { 0xCB5B, 0x6C65 }, 
-	{ 0xCB5C, 0x6C7B }, { 0xCB5D, 0x6C8E }, { 0xCB5E, 0x7074 }, { 0xCB5F, 0x707A }, { 0xCB60, 0x7263 }, { 0xCB61, 0x72BF }, { 0xCB62, 0x72BD }, { 0xCB63, 0x72C3 }, 
-	{ 0xCB64, 0x72C6 }, { 0xCB65, 0x72C1 }, { 0xCB66, 0x72BA }, { 0xCB67, 0x72C5 }, { 0xCB68, 0x7395 }, { 0xCB69, 0x7397 }, { 0xCB6A, 0x7393 }, { 0xCB6B, 0x7394 }, 
-	{ 0xCB6C, 0x7392 }, { 0xCB6D, 0x753A }, { 0xCB6E, 0x7539 }, { 0xCB6F, 0x7594 }, { 0xCB70, 0x7595 }, { 0xCB71, 0x7681 }, { 0xCB72, 0x793D }, { 0xCB73, 0x8034 }, 
-	{ 0xCB74, 0x8095 }, { 0xCB75, 0x8099 }, { 0xCB76, 0x8090 }, { 0xCB77, 0x8092 }, { 0xCB78, 0x809C }, { 0xCB79, 0x8290 }, { 0xCB7A, 0x828F }, { 0xCB7B, 0x8285 }, 
-	{ 0xCB7C, 0x828E }, { 0xCB7D, 0x8291 }, { 0xCB7E, 0x8293 }, { 0xCBA1, 0x828A }, { 0xCBA2, 0x8283 }, { 0xCBA3, 0x8284 }, { 0xCBA4, 0x8C78 }, { 0xCBA5, 0x8FC9 }, 
-	{ 0xCBA6, 0x8FBF }, { 0xCBA7, 0x909F }, { 0xCBA8, 0x90A1 }, { 0xCBA9, 0x90A5 }, { 0xCBAA, 0x909E }, { 0xCBAB, 0x90A7 }, { 0xCBAC, 0x90A0 }, { 0xCBAD, 0x9630 }, 
-	{ 0xCBAE, 0x9628 }, { 0xCBAF, 0x962F }, { 0xCBB0, 0x962D }, { 0xCBB1, 0x4E33 }, { 0xCBB2, 0x4F98 }, { 0xCBB3, 0x4F7C }, { 0xCBB4, 0x4F85 }, { 0xCBB5, 0x4F7D }, 
-	{ 0xCBB6, 0x4F80 }, { 0xCBB7, 0x4F87 }, { 0xCBB8, 0x4F76 }, { 0xCBB9, 0x4F74 }, { 0xCBBA, 0x4F89 }, { 0xCBBB, 0x4F84 }, { 0xCBBC, 0x4F77 }, { 0xCBBD, 0x4F4C }, 
-	{ 0xCBBE, 0x4F97 }, { 0xCBBF, 0x4F6A }, { 0xCBC0, 0x4F9A }, { 0xCBC1, 0x4F79 }, { 0xCBC2, 0x4F81 }, { 0xCBC3, 0x4F78 }, { 0xCBC4, 0x4F90 }, { 0xCBC5, 0x4F9C }, 
-	{ 0xCBC6, 0x4F94 }, { 0xCBC7, 0x4F9E }, { 0xCBC8, 0x4F92 }, { 0xCBC9, 0x4F82 }, { 0xCBCA, 0x4F95 }, { 0xCBCB, 0x4F6B }, { 0xCBCC, 0x4F6E }, { 0xCBCD, 0x519E }, 
-	{ 0xCBCE, 0x51BC }, { 0xCBCF, 0x51BE }, { 0xCBD0, 0x5235 }, { 0xCBD1, 0x5232 }, { 0xCBD2, 0x5233 }, { 0xCBD3, 0x5246 }, { 0xCBD4, 0x5231 }, { 0xCBD5, 0x52BC }, 
-	{ 0xCBD6, 0x530A }, { 0xCBD7, 0x530B }, { 0xCBD8, 0x533C }, { 0xCBD9, 0x5392 }, { 0xCBDA, 0x5394 }, { 0xCBDB, 0x5487 }, { 0xCBDC, 0x547F }, { 0xCBDD, 0x5481 }, 
-	{ 0xCBDE, 0x5491 }, { 0xCBDF, 0x5482 }, { 0xCBE0, 0x5488 }, { 0xCBE1, 0x546B }, { 0xCBE2, 0x547A }, { 0xCBE3, 0x547E }, { 0xCBE4, 0x5465 }, { 0xCBE5, 0x546C }, 
-	{ 0xCBE6, 0x5474 }, { 0xCBE7, 0x5466 }, { 0xCBE8, 0x548D }, { 0xCBE9, 0x546F }, { 0xCBEA, 0x5461 }, { 0xCBEB, 0x5460 }, { 0xCBEC, 0x5498 }, { 0xCBED, 0x5463 }, 
-	{ 0xCBEE, 0x5467 }, { 0xCBEF, 0x5464 }, { 0xCBF0, 0x56F7 }, { 0xCBF1, 0x56F9 }, { 0xCBF2, 0x576F }, { 0xCBF3, 0x5772 }, { 0xCBF4, 0x576D }, { 0xCBF5, 0x576B }, 
-	{ 0xCBF6, 0x5771 }, { 0xCBF7, 0x5770 }, { 0xCBF8, 0x5776 }, { 0xCBF9, 0x5780 }, { 0xCBFA, 0x5775 }, { 0xCBFB, 0x577B }, { 0xCBFC, 0x5773 }, { 0xCBFD, 0x5774 }, 
-	{ 0xCBFE, 0x5762 }, { 0xCC40, 0x5768 }, { 0xCC41, 0x577D }, { 0xCC42, 0x590C }, { 0xCC43, 0x5945 }, { 0xCC44, 0x59B5 }, { 0xCC45, 0x59BA }, { 0xCC46, 0x59CF }, 
-	{ 0xCC47, 0x59CE }, { 0xCC48, 0x59B2 }, { 0xCC49, 0x59CC }, { 0xCC4A, 0x59C1 }, { 0xCC4B, 0x59B6 }, { 0xCC4C, 0x59BC }, { 0xCC4D, 0x59C3 }, { 0xCC4E, 0x59D6 }, 
-	{ 0xCC4F, 0x59B1 }, { 0xCC50, 0x59BD }, { 0xCC51, 0x59C0 }, { 0xCC52, 0x59C8 }, { 0xCC53, 0x59B4 }, { 0xCC54, 0x59C7 }, { 0xCC55, 0x5B62 }, { 0xCC56, 0x5B65 }, 
-	{ 0xCC57, 0x5B93 }, { 0xCC58, 0x5B95 }, { 0xCC59, 0x5C44 }, { 0xCC5A, 0x5C47 }, { 0xCC5B, 0x5CAE }, { 0xCC5C, 0x5CA4 }, { 0xCC5D, 0x5CA0 }, { 0xCC5E, 0x5CB5 }, 
-	{ 0xCC5F, 0x5CAF }, { 0xCC60, 0x5CA8 }, { 0xCC61, 0x5CAC }, { 0xCC62, 0x5C9F }, { 0xCC63, 0x5CA3 }, { 0xCC64, 0x5CAD }, { 0xCC65, 0x5CA2 }, { 0xCC66, 0x5CAA }, 
-	{ 0xCC67, 0x5CA7 }, { 0xCC68, 0x5C9D }, { 0xCC69, 0x5CA5 }, { 0xCC6A, 0x5CB6 }, { 0xCC6B, 0x5CB0 }, { 0xCC6C, 0x5CA6 }, { 0xCC6D, 0x5E17 }, { 0xCC6E, 0x5E14 }, 
-	{ 0xCC6F, 0x5E19 }, { 0xCC70, 0x5F28 }, { 0xCC71, 0x5F22 }, { 0xCC72, 0x5F23 }, { 0xCC73, 0x5F24 }, { 0xCC74, 0x5F54 }, { 0xCC75, 0x5F82 }, { 0xCC76, 0x5F7E }, 
-	{ 0xCC77, 0x5F7D }, { 0xCC78, 0x5FDE }, { 0xCC79, 0x5FE5 }, { 0xCC7A, 0x602D }, { 0xCC7B, 0x6026 }, { 0xCC7C, 0x6019 }, { 0xCC7D, 0x6032 }, { 0xCC7E, 0x600B }, 
-	{ 0xCCA1, 0x6034 }, { 0xCCA2, 0x600A }, { 0xCCA3, 0x6017 }, { 0xCCA4, 0x6033 }, { 0xCCA5, 0x601A }, { 0xCCA6, 0x601E }, { 0xCCA7, 0x602C }, { 0xCCA8, 0x6022 }, 
-	{ 0xCCA9, 0x600D }, { 0xCCAA, 0x6010 }, { 0xCCAB, 0x602E }, { 0xCCAC, 0x6013 }, { 0xCCAD, 0x6011 }, { 0xCCAE, 0x600C }, { 0xCCAF, 0x6009 }, { 0xCCB0, 0x601C }, 
-	{ 0xCCB1, 0x6214 }, { 0xCCB2, 0x623D }, { 0xCCB3, 0x62AD }, { 0xCCB4, 0x62B4 }, { 0xCCB5, 0x62D1 }, { 0xCCB6, 0x62BE }, { 0xCCB7, 0x62AA }, { 0xCCB8, 0x62B6 }, 
-	{ 0xCCB9, 0x62CA }, { 0xCCBA, 0x62AE }, { 0xCCBB, 0x62B3 }, { 0xCCBC, 0x62AF }, { 0xCCBD, 0x62BB }, { 0xCCBE, 0x62A9 }, { 0xCCBF, 0x62B0 }, { 0xCCC0, 0x62B8 }, 
-	{ 0xCCC1, 0x653D }, { 0xCCC2, 0x65A8 }, { 0xCCC3, 0x65BB }, { 0xCCC4, 0x6609 }, { 0xCCC5, 0x65FC }, { 0xCCC6, 0x6604 }, { 0xCCC7, 0x6612 }, { 0xCCC8, 0x6608 }, 
-	{ 0xCCC9, 0x65FB }, { 0xCCCA, 0x6603 }, { 0xCCCB, 0x660B }, { 0xCCCC, 0x660D }, { 0xCCCD, 0x6605 }, { 0xCCCE, 0x65FD }, { 0xCCCF, 0x6611 }, { 0xCCD0, 0x6610 }, 
-	{ 0xCCD1, 0x66F6 }, { 0xCCD2, 0x670A }, { 0xCCD3, 0x6785 }, { 0xCCD4, 0x676C }, { 0xCCD5, 0x678E }, { 0xCCD6, 0x6792 }, { 0xCCD7, 0x6776 }, { 0xCCD8, 0x677B }, 
-	{ 0xCCD9, 0x6798 }, { 0xCCDA, 0x6786 }, { 0xCCDB, 0x6784 }, { 0xCCDC, 0x6774 }, { 0xCCDD, 0x678D }, { 0xCCDE, 0x678C }, { 0xCCDF, 0x677A }, { 0xCCE0, 0x679F }, 
-	{ 0xCCE1, 0x6791 }, { 0xCCE2, 0x6799 }, { 0xCCE3, 0x6783 }, { 0xCCE4, 0x677D }, { 0xCCE5, 0x6781 }, { 0xCCE6, 0x6778 }, { 0xCCE7, 0x6779 }, { 0xCCE8, 0x6794 }, 
-	{ 0xCCE9, 0x6B25 }, { 0xCCEA, 0x6B80 }, { 0xCCEB, 0x6B7E }, { 0xCCEC, 0x6BDE }, { 0xCCED, 0x6C1D }, { 0xCCEE, 0x6C93 }, { 0xCCEF, 0x6CEC }, { 0xCCF0, 0x6CEB }, 
-	{ 0xCCF1, 0x6CEE }, { 0xCCF2, 0x6CD9 }, { 0xCCF3, 0x6CB6 }, { 0xCCF4, 0x6CD4 }, { 0xCCF5, 0x6CAD }, { 0xCCF6, 0x6CE7 }, { 0xCCF7, 0x6CB7 }, { 0xCCF8, 0x6CD0 }, 
-	{ 0xCCF9, 0x6CC2 }, { 0xCCFA, 0x6CBA }, { 0xCCFB, 0x6CC3 }, { 0xCCFC, 0x6CC6 }, { 0xCCFD, 0x6CED }, { 0xCCFE, 0x6CF2 }, { 0xCD40, 0x6CD2 }, { 0xCD41, 0x6CDD }, 
-	{ 0xCD42, 0x6CB4 }, { 0xCD43, 0x6C8A }, { 0xCD44, 0x6C9D }, { 0xCD45, 0x6C80 }, { 0xCD46, 0x6CDE }, { 0xCD47, 0x6CC0 }, { 0xCD48, 0x6D30 }, { 0xCD49, 0x6CCD }, 
-	{ 0xCD4A, 0x6CC7 }, { 0xCD4B, 0x6CB0 }, { 0xCD4C, 0x6CF9 }, { 0xCD4D, 0x6CCF }, { 0xCD4E, 0x6CE9 }, { 0xCD4F, 0x6CD1 }, { 0xCD50, 0x7094 }, { 0xCD51, 0x7098 }, 
-	{ 0xCD52, 0x7085 }, { 0xCD53, 0x7093 }, { 0xCD54, 0x7086 }, { 0xCD55, 0x7084 }, { 0xCD56, 0x7091 }, { 0xCD57, 0x7096 }, { 0xCD58, 0x7082 }, { 0xCD59, 0x709A }, 
-	{ 0xCD5A, 0x7083 }, { 0xCD5B, 0x726A }, { 0xCD5C, 0x72D6 }, { 0xCD5D, 0x72CB }, { 0xCD5E, 0x72D8 }, { 0xCD5F, 0x72C9 }, { 0xCD60, 0x72DC }, { 0xCD61, 0x72D2 }, 
-	{ 0xCD62, 0x72D4 }, { 0xCD63, 0x72DA }, { 0xCD64, 0x72CC }, { 0xCD65, 0x72D1 }, { 0xCD66, 0x73A4 }, { 0xCD67, 0x73A1 }, { 0xCD68, 0x73AD }, { 0xCD69, 0x73A6 }, 
-	{ 0xCD6A, 0x73A2 }, { 0xCD6B, 0x73A0 }, { 0xCD6C, 0x73AC }, { 0xCD6D, 0x739D }, { 0xCD6E, 0x74DD }, { 0xCD6F, 0x74E8 }, { 0xCD70, 0x753F }, { 0xCD71, 0x7540 }, 
-	{ 0xCD72, 0x753E }, { 0xCD73, 0x758C }, { 0xCD74, 0x7598 }, { 0xCD75, 0x76AF }, { 0xCD76, 0x76F3 }, { 0xCD77, 0x76F1 }, { 0xCD78, 0x76F0 }, { 0xCD79, 0x76F5 }, 
-	{ 0xCD7A, 0x77F8 }, { 0xCD7B, 0x77FC }, { 0xCD7C, 0x77F9 }, { 0xCD7D, 0x77FB }, { 0xCD7E, 0x77FA }, { 0xCDA1, 0x77F7 }, { 0xCDA2, 0x7942 }, { 0xCDA3, 0x793F }, 
-	{ 0xCDA4, 0x79C5 }, { 0xCDA5, 0x7A78 }, { 0xCDA6, 0x7A7B }, { 0xCDA7, 0x7AFB }, { 0xCDA8, 0x7C75 }, { 0xCDA9, 0x7CFD }, { 0xCDAA, 0x8035 }, { 0xCDAB, 0x808F }, 
-	{ 0xCDAC, 0x80AE }, { 0xCDAD, 0x80A3 }, { 0xCDAE, 0x80B8 }, { 0xCDAF, 0x80B5 }, { 0xCDB0, 0x80AD }, { 0xCDB1, 0x8220 }, { 0xCDB2, 0x82A0 }, { 0xCDB3, 0x82C0 }, 
-	{ 0xCDB4, 0x82AB }, { 0xCDB5, 0x829A }, { 0xCDB6, 0x8298 }, { 0xCDB7, 0x829B }, { 0xCDB8, 0x82B5 }, { 0xCDB9, 0x82A7 }, { 0xCDBA, 0x82AE }, { 0xCDBB, 0x82BC }, 
-	{ 0xCDBC, 0x829E }, { 0xCDBD, 0x82BA }, { 0xCDBE, 0x82B4 }, { 0xCDBF, 0x82A8 }, { 0xCDC0, 0x82A1 }, { 0xCDC1, 0x82A9 }, { 0xCDC2, 0x82C2 }, { 0xCDC3, 0x82A4 }, 
-	{ 0xCDC4, 0x82C3 }, { 0xCDC5, 0x82B6 }, { 0xCDC6, 0x82A2 }, { 0xCDC7, 0x8670 }, { 0xCDC8, 0x866F }, { 0xCDC9, 0x866D }, { 0xCDCA, 0x866E }, { 0xCDCB, 0x8C56 }, 
-	{ 0xCDCC, 0x8FD2 }, { 0xCDCD, 0x8FCB }, { 0xCDCE, 0x8FD3 }, { 0xCDCF, 0x8FCD }, { 0xCDD0, 0x8FD6 }, { 0xCDD1, 0x8FD5 }, { 0xCDD2, 0x8FD7 }, { 0xCDD3, 0x90B2 }, 
-	{ 0xCDD4, 0x90B4 }, { 0xCDD5, 0x90AF }, { 0xCDD6, 0x90B3 }, { 0xCDD7, 0x90B0 }, { 0xCDD8, 0x9639 }, { 0xCDD9, 0x963D }, { 0xCDDA, 0x963C }, { 0xCDDB, 0x963A }, 
-	{ 0xCDDC, 0x9643 }, { 0xCDDD, 0x4FCD }, { 0xCDDE, 0x4FC5 }, { 0xCDDF, 0x4FD3 }, { 0xCDE0, 0x4FB2 }, { 0xCDE1, 0x4FC9 }, { 0xCDE2, 0x4FCB }, { 0xCDE3, 0x4FC1 }, 
-	{ 0xCDE4, 0x4FD4 }, { 0xCDE5, 0x4FDC }, { 0xCDE6, 0x4FD9 }, { 0xCDE7, 0x4FBB }, { 0xCDE8, 0x4FB3 }, { 0xCDE9, 0x4FDB }, { 0xCDEA, 0x4FC7 }, { 0xCDEB, 0x4FD6 }, 
-	{ 0xCDEC, 0x4FBA }, { 0xCDED, 0x4FC0 }, { 0xCDEE, 0x4FB9 }, { 0xCDEF, 0x4FEC }, { 0xCDF0, 0x5244 }, { 0xCDF1, 0x5249 }, { 0xCDF2, 0x52C0 }, { 0xCDF3, 0x52C2 }, 
-	{ 0xCDF4, 0x533D }, { 0xCDF5, 0x537C }, { 0xCDF6, 0x5397 }, { 0xCDF7, 0x5396 }, { 0xCDF8, 0x5399 }, { 0xCDF9, 0x5398 }, { 0xCDFA, 0x54BA }, { 0xCDFB, 0x54A1 }, 
-	{ 0xCDFC, 0x54AD }, { 0xCDFD, 0x54A5 }, { 0xCDFE, 0x54CF }, { 0xCE40, 0x54C3 }, { 0xCE41, 0x830D }, { 0xCE42, 0x54B7 }, { 0xCE43, 0x54AE }, { 0xCE44, 0x54D6 }, 
-	{ 0xCE45, 0x54B6 }, { 0xCE46, 0x54C5 }, { 0xCE47, 0x54C6 }, { 0xCE48, 0x54A0 }, { 0xCE49, 0x5470 }, { 0xCE4A, 0x54BC }, { 0xCE4B, 0x54A2 }, { 0xCE4C, 0x54BE }, 
-	{ 0xCE4D, 0x5472 }, { 0xCE4E, 0x54DE }, { 0xCE4F, 0x54B0 }, { 0xCE50, 0x57B5 }, { 0xCE51, 0x579E }, { 0xCE52, 0x579F }, { 0xCE53, 0x57A4 }, { 0xCE54, 0x578C }, 
-	{ 0xCE55, 0x5797 }, { 0xCE56, 0x579D }, { 0xCE57, 0x579B }, { 0xCE58, 0x5794 }, { 0xCE59, 0x5798 }, { 0xCE5A, 0x578F }, { 0xCE5B, 0x5799 }, { 0xCE5C, 0x57A5 }, 
-	{ 0xCE5D, 0x579A }, { 0xCE5E, 0x5795 }, { 0xCE5F, 0x58F4 }, { 0xCE60, 0x590D }, { 0xCE61, 0x5953 }, { 0xCE62, 0x59E1 }, { 0xCE63, 0x59DE }, { 0xCE64, 0x59EE }, 
-	{ 0xCE65, 0x5A00 }, { 0xCE66, 0x59F1 }, { 0xCE67, 0x59DD }, { 0xCE68, 0x59FA }, { 0xCE69, 0x59FD }, { 0xCE6A, 0x59FC }, { 0xCE6B, 0x59F6 }, { 0xCE6C, 0x59E4 }, 
-	{ 0xCE6D, 0x59F2 }, { 0xCE6E, 0x59F7 }, { 0xCE6F, 0x59DB }, { 0xCE70, 0x59E9 }, { 0xCE71, 0x59F3 }, { 0xCE72, 0x59F5 }, { 0xCE73, 0x59E0 }, { 0xCE74, 0x59FE }, 
-	{ 0xCE75, 0x59F4 }, { 0xCE76, 0x59ED }, { 0xCE77, 0x5BA8 }, { 0xCE78, 0x5C4C }, { 0xCE79, 0x5CD0 }, { 0xCE7A, 0x5CD8 }, { 0xCE7B, 0x5CCC }, { 0xCE7C, 0x5CD7 }, 
-	{ 0xCE7D, 0x5CCB }, { 0xCE7E, 0x5CDB }, { 0xCEA1, 0x5CDE }, { 0xCEA2, 0x5CDA }, { 0xCEA3, 0x5CC9 }, { 0xCEA4, 0x5CC7 }, { 0xCEA5, 0x5CCA }, { 0xCEA6, 0x5CD6 }, 
-	{ 0xCEA7, 0x5CD3 }, { 0xCEA8, 0x5CD4 }, { 0xCEA9, 0x5CCF }, { 0xCEAA, 0x5CC8 }, { 0xCEAB, 0x5CC6 }, { 0xCEAC, 0x5CCE }, { 0xCEAD, 0x5CDF }, { 0xCEAE, 0x5CF8 }, 
-	{ 0xCEAF, 0x5DF9 }, { 0xCEB0, 0x5E21 }, { 0xCEB1, 0x5E22 }, { 0xCEB2, 0x5E23 }, { 0xCEB3, 0x5E20 }, { 0xCEB4, 0x5E24 }, { 0xCEB5, 0x5EB0 }, { 0xCEB6, 0x5EA4 }, 
-	{ 0xCEB7, 0x5EA2 }, { 0xCEB8, 0x5E9B }, { 0xCEB9, 0x5EA3 }, { 0xCEBA, 0x5EA5 }, { 0xCEBB, 0x5F07 }, { 0xCEBC, 0x5F2E }, { 0xCEBD, 0x5F56 }, { 0xCEBE, 0x5F86 }, 
-	{ 0xCEBF, 0x6037 }, { 0xCEC0, 0x6039 }, { 0xCEC1, 0x6054 }, { 0xCEC2, 0x6072 }, { 0xCEC3, 0x605E }, { 0xCEC4, 0x6045 }, { 0xCEC5, 0x6053 }, { 0xCEC6, 0x6047 }, 
-	{ 0xCEC7, 0x6049 }, { 0xCEC8, 0x605B }, { 0xCEC9, 0x604C }, { 0xCECA, 0x6040 }, { 0xCECB, 0x6042 }, { 0xCECC, 0x605F }, { 0xCECD, 0x6024 }, { 0xCECE, 0x6044 }, 
-	{ 0xCECF, 0x6058 }, { 0xCED0, 0x6066 }, { 0xCED1, 0x606E }, { 0xCED2, 0x6242 }, { 0xCED3, 0x6243 }, { 0xCED4, 0x62CF }, { 0xCED5, 0x630D }, { 0xCED6, 0x630B }, 
-	{ 0xCED7, 0x62F5 }, { 0xCED8, 0x630E }, { 0xCED9, 0x6303 }, { 0xCEDA, 0x62EB }, { 0xCEDB, 0x62F9 }, { 0xCEDC, 0x630F }, { 0xCEDD, 0x630C }, { 0xCEDE, 0x62F8 }, 
-	{ 0xCEDF, 0x62F6 }, { 0xCEE0, 0x6300 }, { 0xCEE1, 0x6313 }, { 0xCEE2, 0x6314 }, { 0xCEE3, 0x62FA }, { 0xCEE4, 0x6315 }, { 0xCEE5, 0x62FB }, { 0xCEE6, 0x62F0 }, 
-	{ 0xCEE7, 0x6541 }, { 0xCEE8, 0x6543 }, { 0xCEE9, 0x65AA }, { 0xCEEA, 0x65BF }, { 0xCEEB, 0x6636 }, { 0xCEEC, 0x6621 }, { 0xCEED, 0x6632 }, { 0xCEEE, 0x6635 }, 
-	{ 0xCEEF, 0x661C }, { 0xCEF0, 0x6626 }, { 0xCEF1, 0x6622 }, { 0xCEF2, 0x6633 }, { 0xCEF3, 0x662B }, { 0xCEF4, 0x663A }, { 0xCEF5, 0x661D }, { 0xCEF6, 0x6634 }, 
-	{ 0xCEF7, 0x6639 }, { 0xCEF8, 0x662E }, { 0xCEF9, 0x670F }, { 0xCEFA, 0x6710 }, { 0xCEFB, 0x67C1 }, { 0xCEFC, 0x67F2 }, { 0xCEFD, 0x67C8 }, { 0xCEFE, 0x67BA }, 
-	{ 0xCF40, 0x67DC }, { 0xCF41, 0x67BB }, { 0xCF42, 0x67F8 }, { 0xCF43, 0x67D8 }, { 0xCF44, 0x67C0 }, { 0xCF45, 0x67B7 }, { 0xCF46, 0x67C5 }, { 0xCF47, 0x67EB }, 
-	{ 0xCF48, 0x67E4 }, { 0xCF49, 0x67DF }, { 0xCF4A, 0x67B5 }, { 0xCF4B, 0x67CD }, { 0xCF4C, 0x67B3 }, { 0xCF4D, 0x67F7 }, { 0xCF4E, 0x67F6 }, { 0xCF4F, 0x67EE }, 
-	{ 0xCF50, 0x67E3 }, { 0xCF51, 0x67C2 }, { 0xCF52, 0x67B9 }, { 0xCF53, 0x67CE }, { 0xCF54, 0x67E7 }, { 0xCF55, 0x67F0 }, { 0xCF56, 0x67B2 }, { 0xCF57, 0x67FC }, 
-	{ 0xCF58, 0x67C6 }, { 0xCF59, 0x67ED }, { 0xCF5A, 0x67CC }, { 0xCF5B, 0x67AE }, { 0xCF5C, 0x67E6 }, { 0xCF5D, 0x67DB }, { 0xCF5E, 0x67FA }, { 0xCF5F, 0x67C9 }, 
-	{ 0xCF60, 0x67CA }, { 0xCF61, 0x67C3 }, { 0xCF62, 0x67EA }, { 0xCF63, 0x67CB }, { 0xCF64, 0x6B28 }, { 0xCF65, 0x6B82 }, { 0xCF66, 0x6B84 }, { 0xCF67, 0x6BB6 }, 
-	{ 0xCF68, 0x6BD6 }, { 0xCF69, 0x6BD8 }, { 0xCF6A, 0x6BE0 }, { 0xCF6B, 0x6C20 }, { 0xCF6C, 0x6C21 }, { 0xCF6D, 0x6D28 }, { 0xCF6E, 0x6D34 }, { 0xCF6F, 0x6D2D }, 
-	{ 0xCF70, 0x6D1F }, { 0xCF71, 0x6D3C }, { 0xCF72, 0x6D3F }, { 0xCF73, 0x6D12 }, { 0xCF74, 0x6D0A }, { 0xCF75, 0x6CDA }, { 0xCF76, 0x6D33 }, { 0xCF77, 0x6D04 }, 
-	{ 0xCF78, 0x6D19 }, { 0xCF79, 0x6D3A }, { 0xCF7A, 0x6D1A }, { 0xCF7B, 0x6D11 }, { 0xCF7C, 0x6D00 }, { 0xCF7D, 0x6D1D }, { 0xCF7E, 0x6D42 }, { 0xCFA1, 0x6D01 }, 
-	{ 0xCFA2, 0x6D18 }, { 0xCFA3, 0x6D37 }, { 0xCFA4, 0x6D03 }, { 0xCFA5, 0x6D0F }, { 0xCFA6, 0x6D40 }, { 0xCFA7, 0x6D07 }, { 0xCFA8, 0x6D20 }, { 0xCFA9, 0x6D2C }, 
-	{ 0xCFAA, 0x6D08 }, { 0xCFAB, 0x6D22 }, { 0xCFAC, 0x6D09 }, { 0xCFAD, 0x6D10 }, { 0xCFAE, 0x70B7 }, { 0xCFAF, 0x709F }, { 0xCFB0, 0x70BE }, { 0xCFB1, 0x70B1 }, 
-	{ 0xCFB2, 0x70B0 }, { 0xCFB3, 0x70A1 }, { 0xCFB4, 0x70B4 }, { 0xCFB5, 0x70B5 }, { 0xCFB6, 0x70A9 }, { 0xCFB7, 0x7241 }, { 0xCFB8, 0x7249 }, { 0xCFB9, 0x724A }, 
-	{ 0xCFBA, 0x726C }, { 0xCFBB, 0x7270 }, { 0xCFBC, 0x7273 }, { 0xCFBD, 0x726E }, { 0xCFBE, 0x72CA }, { 0xCFBF, 0x72E4 }, { 0xCFC0, 0x72E8 }, { 0xCFC1, 0x72EB }, 
-	{ 0xCFC2, 0x72DF }, { 0xCFC3, 0x72EA }, { 0xCFC4, 0x72E6 }, { 0xCFC5, 0x72E3 }, { 0xCFC6, 0x7385 }, { 0xCFC7, 0x73CC }, { 0xCFC8, 0x73C2 }, { 0xCFC9, 0x73C8 }, 
-	{ 0xCFCA, 0x73C5 }, { 0xCFCB, 0x73B9 }, { 0xCFCC, 0x73B6 }, { 0xCFCD, 0x73B5 }, { 0xCFCE, 0x73B4 }, { 0xCFCF, 0x73EB }, { 0xCFD0, 0x73BF }, { 0xCFD1, 0x73C7 }, 
-	{ 0xCFD2, 0x73BE }, { 0xCFD3, 0x73C3 }, { 0xCFD4, 0x73C6 }, { 0xCFD5, 0x73B8 }, { 0xCFD6, 0x73CB }, { 0xCFD7, 0x74EC }, { 0xCFD8, 0x74EE }, { 0xCFD9, 0x752E }, 
-	{ 0xCFDA, 0x7547 }, { 0xCFDB, 0x7548 }, { 0xCFDC, 0x75A7 }, { 0xCFDD, 0x75AA }, { 0xCFDE, 0x7679 }, { 0xCFDF, 0x76C4 }, { 0xCFE0, 0x7708 }, { 0xCFE1, 0x7703 }, 
-	{ 0xCFE2, 0x7704 }, { 0xCFE3, 0x7705 }, { 0xCFE4, 0x770A }, { 0xCFE5, 0x76F7 }, { 0xCFE6, 0x76FB }, { 0xCFE7, 0x76FA }, { 0xCFE8, 0x77E7 }, { 0xCFE9, 0x77E8 }, 
-	{ 0xCFEA, 0x7806 }, { 0xCFEB, 0x7811 }, { 0xCFEC, 0x7812 }, { 0xCFED, 0x7805 }, { 0xCFEE, 0x7810 }, { 0xCFEF, 0x780F }, { 0xCFF0, 0x780E }, { 0xCFF1, 0x7809 }, 
-	{ 0xCFF2, 0x7803 }, { 0xCFF3, 0x7813 }, { 0xCFF4, 0x794A }, { 0xCFF5, 0x794C }, { 0xCFF6, 0x794B }, { 0xCFF7, 0x7945 }, { 0xCFF8, 0x7944 }, { 0xCFF9, 0x79D5 }, 
-	{ 0xCFFA, 0x79CD }, { 0xCFFB, 0x79CF }, { 0xCFFC, 0x79D6 }, { 0xCFFD, 0x79CE }, { 0xCFFE, 0x7A80 }, { 0xD040, 0x7A7E }, { 0xD041, 0x7AD1 }, { 0xD042, 0x7B00 }, 
-	{ 0xD043, 0x7B01 }, { 0xD044, 0x7C7A }, { 0xD045, 0x7C78 }, { 0xD046, 0x7C79 }, { 0xD047, 0x7C7F }, { 0xD048, 0x7C80 }, { 0xD049, 0x7C81 }, { 0xD04A, 0x7D03 }, 
-	{ 0xD04B, 0x7D08 }, { 0xD04C, 0x7D01 }, { 0xD04D, 0x7F58 }, { 0xD04E, 0x7F91 }, { 0xD04F, 0x7F8D }, { 0xD050, 0x7FBE }, { 0xD051, 0x8007 }, { 0xD052, 0x800E }, 
-	{ 0xD053, 0x800F }, { 0xD054, 0x8014 }, { 0xD055, 0x8037 }, { 0xD056, 0x80D8 }, { 0xD057, 0x80C7 }, { 0xD058, 0x80E0 }, { 0xD059, 0x80D1 }, { 0xD05A, 0x80C8 }, 
-	{ 0xD05B, 0x80C2 }, { 0xD05C, 0x80D0 }, { 0xD05D, 0x80C5 }, { 0xD05E, 0x80E3 }, { 0xD05F, 0x80D9 }, { 0xD060, 0x80DC }, { 0xD061, 0x80CA }, { 0xD062, 0x80D5 }, 
-	{ 0xD063, 0x80C9 }, { 0xD064, 0x80CF }, { 0xD065, 0x80D7 }, { 0xD066, 0x80E6 }, { 0xD067, 0x80CD }, { 0xD068, 0x81FF }, { 0xD069, 0x8221 }, { 0xD06A, 0x8294 }, 
-	{ 0xD06B, 0x82D9 }, { 0xD06C, 0x82FE }, { 0xD06D, 0x82F9 }, { 0xD06E, 0x8307 }, { 0xD06F, 0x82E8 }, { 0xD070, 0x8300 }, { 0xD071, 0x82D5 }, { 0xD072, 0x833A }, 
-	{ 0xD073, 0x82EB }, { 0xD074, 0x82D6 }, { 0xD075, 0x82F4 }, { 0xD076, 0x82EC }, { 0xD077, 0x82E1 }, { 0xD078, 0x82F2 }, { 0xD079, 0x82F5 }, { 0xD07A, 0x830C }, 
-	{ 0xD07B, 0x82FB }, { 0xD07C, 0x82F6 }, { 0xD07D, 0x82F0 }, { 0xD07E, 0x82EA }, { 0xD0A1, 0x82E4 }, { 0xD0A2, 0x82E0 }, { 0xD0A3, 0x82FA }, { 0xD0A4, 0x82F3 }, 
-	{ 0xD0A5, 0x82ED }, { 0xD0A6, 0x8677 }, { 0xD0A7, 0x8674 }, { 0xD0A8, 0x867C }, { 0xD0A9, 0x8673 }, { 0xD0AA, 0x8841 }, { 0xD0AB, 0x884E }, { 0xD0AC, 0x8867 }, 
-	{ 0xD0AD, 0x886A }, { 0xD0AE, 0x8869 }, { 0xD0AF, 0x89D3 }, { 0xD0B0, 0x8A04 }, { 0xD0B1, 0x8A07 }, { 0xD0B2, 0x8D72 }, { 0xD0B3, 0x8FE3 }, { 0xD0B4, 0x8FE1 }, 
-	{ 0xD0B5, 0x8FEE }, { 0xD0B6, 0x8FE0 }, { 0xD0B7, 0x90F1 }, { 0xD0B8, 0x90BD }, { 0xD0B9, 0x90BF }, { 0xD0BA, 0x90D5 }, { 0xD0BB, 0x90C5 }, { 0xD0BC, 0x90BE }, 
-	{ 0xD0BD, 0x90C7 }, { 0xD0BE, 0x90CB }, { 0xD0BF, 0x90C8 }, { 0xD0C0, 0x91D4 }, { 0xD0C1, 0x91D3 }, { 0xD0C2, 0x9654 }, { 0xD0C3, 0x964F }, { 0xD0C4, 0x9651 }, 
-	{ 0xD0C5, 0x9653 }, { 0xD0C6, 0x964A }, { 0xD0C7, 0x964E }, { 0xD0C8, 0x501E }, { 0xD0C9, 0x5005 }, { 0xD0CA, 0x5007 }, { 0xD0CB, 0x5013 }, { 0xD0CC, 0x5022 }, 
-	{ 0xD0CD, 0x5030 }, { 0xD0CE, 0x501B }, { 0xD0CF, 0x4FF5 }, { 0xD0D0, 0x4FF4 }, { 0xD0D1, 0x5033 }, { 0xD0D2, 0x5037 }, { 0xD0D3, 0x502C }, { 0xD0D4, 0x4FF6 }, 
-	{ 0xD0D5, 0x4FF7 }, { 0xD0D6, 0x5017 }, { 0xD0D7, 0x501C }, { 0xD0D8, 0x5020 }, { 0xD0D9, 0x5027 }, { 0xD0DA, 0x5035 }, { 0xD0DB, 0x502F }, { 0xD0DC, 0x5031 }, 
-	{ 0xD0DD, 0x500E }, { 0xD0DE, 0x515A }, { 0xD0DF, 0x5194 }, { 0xD0E0, 0x5193 }, { 0xD0E1, 0x51CA }, { 0xD0E2, 0x51C4 }, { 0xD0E3, 0x51C5 }, { 0xD0E4, 0x51C8 }, 
-	{ 0xD0E5, 0x51CE }, { 0xD0E6, 0x5261 }, { 0xD0E7, 0x525A }, { 0xD0E8, 0x5252 }, { 0xD0E9, 0x525E }, { 0xD0EA, 0x525F }, { 0xD0EB, 0x5255 }, { 0xD0EC, 0x5262 }, 
-	{ 0xD0ED, 0x52CD }, { 0xD0EE, 0x530E }, { 0xD0EF, 0x539E }, { 0xD0F0, 0x5526 }, { 0xD0F1, 0x54E2 }, { 0xD0F2, 0x5517 }, { 0xD0F3, 0x5512 }, { 0xD0F4, 0x54E7 }, 
-	{ 0xD0F5, 0x54F3 }, { 0xD0F6, 0x54E4 }, { 0xD0F7, 0x551A }, { 0xD0F8, 0x54FF }, { 0xD0F9, 0x5504 }, { 0xD0FA, 0x5508 }, { 0xD0FB, 0x54EB }, { 0xD0FC, 0x5511 }, 
-	{ 0xD0FD, 0x5505 }, { 0xD0FE, 0x54F1 }, { 0xD140, 0x550A }, { 0xD141, 0x54FB }, { 0xD142, 0x54F7 }, { 0xD143, 0x54F8 }, { 0xD144, 0x54E0 }, { 0xD145, 0x550E }, 
-	{ 0xD146, 0x5503 }, { 0xD147, 0x550B }, { 0xD148, 0x5701 }, { 0xD149, 0x5702 }, { 0xD14A, 0x57CC }, { 0xD14B, 0x5832 }, { 0xD14C, 0x57D5 }, { 0xD14D, 0x57D2 }, 
-	{ 0xD14E, 0x57BA }, { 0xD14F, 0x57C6 }, { 0xD150, 0x57BD }, { 0xD151, 0x57BC }, { 0xD152, 0x57B8 }, { 0xD153, 0x57B6 }, { 0xD154, 0x57BF }, { 0xD155, 0x57C7 }, 
-	{ 0xD156, 0x57D0 }, { 0xD157, 0x57B9 }, { 0xD158, 0x57C1 }, { 0xD159, 0x590E }, { 0xD15A, 0x594A }, { 0xD15B, 0x5A19 }, { 0xD15C, 0x5A16 }, { 0xD15D, 0x5A2D }, 
-	{ 0xD15E, 0x5A2E }, { 0xD15F, 0x5A15 }, { 0xD160, 0x5A0F }, { 0xD161, 0x5A17 }, { 0xD162, 0x5A0A }, { 0xD163, 0x5A1E }, { 0xD164, 0x5A33 }, { 0xD165, 0x5B6C }, 
-	{ 0xD166, 0x5BA7 }, { 0xD167, 0x5BAD }, { 0xD168, 0x5BAC }, { 0xD169, 0x5C03 }, { 0xD16A, 0x5C56 }, { 0xD16B, 0x5C54 }, { 0xD16C, 0x5CEC }, { 0xD16D, 0x5CFF }, 
-	{ 0xD16E, 0x5CEE }, { 0xD16F, 0x5CF1 }, { 0xD170, 0x5CF7 }, { 0xD171, 0x5D00 }, { 0xD172, 0x5CF9 }, { 0xD173, 0x5E29 }, { 0xD174, 0x5E28 }, { 0xD175, 0x5EA8 }, 
-	{ 0xD176, 0x5EAE }, { 0xD177, 0x5EAA }, { 0xD178, 0x5EAC }, { 0xD179, 0x5F33 }, { 0xD17A, 0x5F30 }, { 0xD17B, 0x5F67 }, { 0xD17C, 0x605D }, { 0xD17D, 0x605A }, 
-	{ 0xD17E, 0x6067 }, { 0xD1A1, 0x6041 }, { 0xD1A2, 0x60A2 }, { 0xD1A3, 0x6088 }, { 0xD1A4, 0x6080 }, { 0xD1A5, 0x6092 }, { 0xD1A6, 0x6081 }, { 0xD1A7, 0x609D }, 
-	{ 0xD1A8, 0x6083 }, { 0xD1A9, 0x6095 }, { 0xD1AA, 0x609B }, { 0xD1AB, 0x6097 }, { 0xD1AC, 0x6087 }, { 0xD1AD, 0x609C }, { 0xD1AE, 0x608E }, { 0xD1AF, 0x6219 }, 
-	{ 0xD1B0, 0x6246 }, { 0xD1B1, 0x62F2 }, { 0xD1B2, 0x6310 }, { 0xD1B3, 0x6356 }, { 0xD1B4, 0x632C }, { 0xD1B5, 0x6344 }, { 0xD1B6, 0x6345 }, { 0xD1B7, 0x6336 }, 
-	{ 0xD1B8, 0x6343 }, { 0xD1B9, 0x63E4 }, { 0xD1BA, 0x6339 }, { 0xD1BB, 0x634B }, { 0xD1BC, 0x634A }, { 0xD1BD, 0x633C }, { 0xD1BE, 0x6329 }, { 0xD1BF, 0x6341 }, 
-	{ 0xD1C0, 0x6334 }, { 0xD1C1, 0x6358 }, { 0xD1C2, 0x6354 }, { 0xD1C3, 0x6359 }, { 0xD1C4, 0x632D }, { 0xD1C5, 0x6347 }, { 0xD1C6, 0x6333 }, { 0xD1C7, 0x635A }, 
-	{ 0xD1C8, 0x6351 }, { 0xD1C9, 0x6338 }, { 0xD1CA, 0x6357 }, { 0xD1CB, 0x6340 }, { 0xD1CC, 0x6348 }, { 0xD1CD, 0x654A }, { 0xD1CE, 0x6546 }, { 0xD1CF, 0x65C6 }, 
-	{ 0xD1D0, 0x65C3 }, { 0xD1D1, 0x65C4 }, { 0xD1D2, 0x65C2 }, { 0xD1D3, 0x664A }, { 0xD1D4, 0x665F }, { 0xD1D5, 0x6647 }, { 0xD1D6, 0x6651 }, { 0xD1D7, 0x6712 }, 
-	{ 0xD1D8, 0x6713 }, { 0xD1D9, 0x681F }, { 0xD1DA, 0x681A }, { 0xD1DB, 0x6849 }, { 0xD1DC, 0x6832 }, { 0xD1DD, 0x6833 }, { 0xD1DE, 0x683B }, { 0xD1DF, 0x684B }, 
-	{ 0xD1E0, 0x684F }, { 0xD1E1, 0x6816 }, { 0xD1E2, 0x6831 }, { 0xD1E3, 0x681C }, { 0xD1E4, 0x6835 }, { 0xD1E5, 0x682B }, { 0xD1E6, 0x682D }, { 0xD1E7, 0x682F }, 
-	{ 0xD1E8, 0x684E }, { 0xD1E9, 0x6844 }, { 0xD1EA, 0x6834 }, { 0xD1EB, 0x681D }, { 0xD1EC, 0x6812 }, { 0xD1ED, 0x6814 }, { 0xD1EE, 0x6826 }, { 0xD1EF, 0x6828 }, 
-	{ 0xD1F0, 0x682E }, { 0xD1F1, 0x684D }, { 0xD1F2, 0x683A }, { 0xD1F3, 0x6825 }, { 0xD1F4, 0x6820 }, { 0xD1F5, 0x6B2C }, { 0xD1F6, 0x6B2F }, { 0xD1F7, 0x6B2D }, 
-	{ 0xD1F8, 0x6B31 }, { 0xD1F9, 0x6B34 }, { 0xD1FA, 0x6B6D }, { 0xD1FB, 0x8082 }, { 0xD1FC, 0x6B88 }, { 0xD1FD, 0x6BE6 }, { 0xD1FE, 0x6BE4 }, { 0xD240, 0x6BE8 }, 
-	{ 0xD241, 0x6BE3 }, { 0xD242, 0x6BE2 }, { 0xD243, 0x6BE7 }, { 0xD244, 0x6C25 }, { 0xD245, 0x6D7A }, { 0xD246, 0x6D63 }, { 0xD247, 0x6D64 }, { 0xD248, 0x6D76 }, 
-	{ 0xD249, 0x6D0D }, { 0xD24A, 0x6D61 }, { 0xD24B, 0x6D92 }, { 0xD24C, 0x6D58 }, { 0xD24D, 0x6D62 }, { 0xD24E, 0x6D6D }, { 0xD24F, 0x6D6F }, { 0xD250, 0x6D91 }, 
-	{ 0xD251, 0x6D8D }, { 0xD252, 0x6DEF }, { 0xD253, 0x6D7F }, { 0xD254, 0x6D86 }, { 0xD255, 0x6D5E }, { 0xD256, 0x6D67 }, { 0xD257, 0x6D60 }, { 0xD258, 0x6D97 }, 
-	{ 0xD259, 0x6D70 }, { 0xD25A, 0x6D7C }, { 0xD25B, 0x6D5F }, { 0xD25C, 0x6D82 }, { 0xD25D, 0x6D98 }, { 0xD25E, 0x6D2F }, { 0xD25F, 0x6D68 }, { 0xD260, 0x6D8B }, 
-	{ 0xD261, 0x6D7E }, { 0xD262, 0x6D80 }, { 0xD263, 0x6D84 }, { 0xD264, 0x6D16 }, { 0xD265, 0x6D83 }, { 0xD266, 0x6D7B }, { 0xD267, 0x6D7D }, { 0xD268, 0x6D75 }, 
-	{ 0xD269, 0x6D90 }, { 0xD26A, 0x70DC }, { 0xD26B, 0x70D3 }, { 0xD26C, 0x70D1 }, { 0xD26D, 0x70DD }, { 0xD26E, 0x70CB }, { 0xD26F, 0x7F39 }, { 0xD270, 0x70E2 }, 
-	{ 0xD271, 0x70D7 }, { 0xD272, 0x70D2 }, { 0xD273, 0x70DE }, { 0xD274, 0x70E0 }, { 0xD275, 0x70D4 }, { 0xD276, 0x70CD }, { 0xD277, 0x70C5 }, { 0xD278, 0x70C6 }, 
-	{ 0xD279, 0x70C7 }, { 0xD27A, 0x70DA }, { 0xD27B, 0x70CE }, { 0xD27C, 0x70E1 }, { 0xD27D, 0x7242 }, { 0xD27E, 0x7278 }, { 0xD2A1, 0x7277 }, { 0xD2A2, 0x7276 }, 
-	{ 0xD2A3, 0x7300 }, { 0xD2A4, 0x72FA }, { 0xD2A5, 0x72F4 }, { 0xD2A6, 0x72FE }, { 0xD2A7, 0x72F6 }, { 0xD2A8, 0x72F3 }, { 0xD2A9, 0x72FB }, { 0xD2AA, 0x7301 }, 
-	{ 0xD2AB, 0x73D3 }, { 0xD2AC, 0x73D9 }, { 0xD2AD, 0x73E5 }, { 0xD2AE, 0x73D6 }, { 0xD2AF, 0x73BC }, { 0xD2B0, 0x73E7 }, { 0xD2B1, 0x73E3 }, { 0xD2B2, 0x73E9 }, 
-	{ 0xD2B3, 0x73DC }, { 0xD2B4, 0x73D2 }, { 0xD2B5, 0x73DB }, { 0xD2B6, 0x73D4 }, { 0xD2B7, 0x73DD }, { 0xD2B8, 0x73DA }, { 0xD2B9, 0x73D7 }, { 0xD2BA, 0x73D8 }, 
-	{ 0xD2BB, 0x73E8 }, { 0xD2BC, 0x74DE }, { 0xD2BD, 0x74DF }, { 0xD2BE, 0x74F4 }, { 0xD2BF, 0x74F5 }, { 0xD2C0, 0x7521 }, { 0xD2C1, 0x755B }, { 0xD2C2, 0x755F }, 
-	{ 0xD2C3, 0x75B0 }, { 0xD2C4, 0x75C1 }, { 0xD2C5, 0x75BB }, { 0xD2C6, 0x75C4 }, { 0xD2C7, 0x75C0 }, { 0xD2C8, 0x75BF }, { 0xD2C9, 0x75B6 }, { 0xD2CA, 0x75BA }, 
-	{ 0xD2CB, 0x768A }, { 0xD2CC, 0x76C9 }, { 0xD2CD, 0x771D }, { 0xD2CE, 0x771B }, { 0xD2CF, 0x7710 }, { 0xD2D0, 0x7713 }, { 0xD2D1, 0x7712 }, { 0xD2D2, 0x7723 }, 
-	{ 0xD2D3, 0x7711 }, { 0xD2D4, 0x7715 }, { 0xD2D5, 0x7719 }, { 0xD2D6, 0x771A }, { 0xD2D7, 0x7722 }, { 0xD2D8, 0x7727 }, { 0xD2D9, 0x7823 }, { 0xD2DA, 0x782C }, 
-	{ 0xD2DB, 0x7822 }, { 0xD2DC, 0x7835 }, { 0xD2DD, 0x782F }, { 0xD2DE, 0x7828 }, { 0xD2DF, 0x782E }, { 0xD2E0, 0x782B }, { 0xD2E1, 0x7821 }, { 0xD2E2, 0x7829 }, 
-	{ 0xD2E3, 0x7833 }, { 0xD2E4, 0x782A }, { 0xD2E5, 0x7831 }, { 0xD2E6, 0x7954 }, { 0xD2E7, 0x795B }, { 0xD2E8, 0x794F }, { 0xD2E9, 0x795C }, { 0xD2EA, 0x7953 }, 
-	{ 0xD2EB, 0x7952 }, { 0xD2EC, 0x7951 }, { 0xD2ED, 0x79EB }, { 0xD2EE, 0x79EC }, { 0xD2EF, 0x79E0 }, { 0xD2F0, 0x79EE }, { 0xD2F1, 0x79ED }, { 0xD2F2, 0x79EA }, 
-	{ 0xD2F3, 0x79DC }, { 0xD2F4, 0x79DE }, { 0xD2F5, 0x79DD }, { 0xD2F6, 0x7A86 }, { 0xD2F7, 0x7A89 }, { 0xD2F8, 0x7A85 }, { 0xD2F9, 0x7A8B }, { 0xD2FA, 0x7A8C }, 
-	{ 0xD2FB, 0x7A8A }, { 0xD2FC, 0x7A87 }, { 0xD2FD, 0x7AD8 }, { 0xD2FE, 0x7B10 }, { 0xD340, 0x7B04 }, { 0xD341, 0x7B13 }, { 0xD342, 0x7B05 }, { 0xD343, 0x7B0F }, 
-	{ 0xD344, 0x7B08 }, { 0xD345, 0x7B0A }, { 0xD346, 0x7B0E }, { 0xD347, 0x7B09 }, { 0xD348, 0x7B12 }, { 0xD349, 0x7C84 }, { 0xD34A, 0x7C91 }, { 0xD34B, 0x7C8A }, 
-	{ 0xD34C, 0x7C8C }, { 0xD34D, 0x7C88 }, { 0xD34E, 0x7C8D }, { 0xD34F, 0x7C85 }, { 0xD350, 0x7D1E }, { 0xD351, 0x7D1D }, { 0xD352, 0x7D11 }, { 0xD353, 0x7D0E }, 
-	{ 0xD354, 0x7D18 }, { 0xD355, 0x7D16 }, { 0xD356, 0x7D13 }, { 0xD357, 0x7D1F }, { 0xD358, 0x7D12 }, { 0xD359, 0x7D0F }, { 0xD35A, 0x7D0C }, { 0xD35B, 0x7F5C }, 
-	{ 0xD35C, 0x7F61 }, { 0xD35D, 0x7F5E }, { 0xD35E, 0x7F60 }, { 0xD35F, 0x7F5D }, { 0xD360, 0x7F5B }, { 0xD361, 0x7F96 }, { 0xD362, 0x7F92 }, { 0xD363, 0x7FC3 }, 
-	{ 0xD364, 0x7FC2 }, { 0xD365, 0x7FC0 }, { 0xD366, 0x8016 }, { 0xD367, 0x803E }, { 0xD368, 0x8039 }, { 0xD369, 0x80FA }, { 0xD36A, 0x80F2 }, { 0xD36B, 0x80F9 }, 
-	{ 0xD36C, 0x80F5 }, { 0xD36D, 0x8101 }, { 0xD36E, 0x80FB }, { 0xD36F, 0x8100 }, { 0xD370, 0x8201 }, { 0xD371, 0x822F }, { 0xD372, 0x8225 }, { 0xD373, 0x8333 }, 
-	{ 0xD374, 0x832D }, { 0xD375, 0x8344 }, { 0xD376, 0x8319 }, { 0xD377, 0x8351 }, { 0xD378, 0x8325 }, { 0xD379, 0x8356 }, { 0xD37A, 0x833F }, { 0xD37B, 0x8341 }, 
-	{ 0xD37C, 0x8326 }, { 0xD37D, 0x831C }, { 0xD37E, 0x8322 }, { 0xD3A1, 0x8342 }, { 0xD3A2, 0x834E }, { 0xD3A3, 0x831B }, { 0xD3A4, 0x832A }, { 0xD3A5, 0x8308 }, 
-	{ 0xD3A6, 0x833C }, { 0xD3A7, 0x834D }, { 0xD3A8, 0x8316 }, { 0xD3A9, 0x8324 }, { 0xD3AA, 0x8320 }, { 0xD3AB, 0x8337 }, { 0xD3AC, 0x832F }, { 0xD3AD, 0x8329 }, 
-	{ 0xD3AE, 0x8347 }, { 0xD3AF, 0x8345 }, { 0xD3B0, 0x834C }, { 0xD3B1, 0x8353 }, { 0xD3B2, 0x831E }, { 0xD3B3, 0x832C }, { 0xD3B4, 0x834B }, { 0xD3B5, 0x8327 }, 
-	{ 0xD3B6, 0x8348 }, { 0xD3B7, 0x8653 }, { 0xD3B8, 0x8652 }, { 0xD3B9, 0x86A2 }, { 0xD3BA, 0x86A8 }, { 0xD3BB, 0x8696 }, { 0xD3BC, 0x868D }, { 0xD3BD, 0x8691 }, 
-	{ 0xD3BE, 0x869E }, { 0xD3BF, 0x8687 }, { 0xD3C0, 0x8697 }, { 0xD3C1, 0x8686 }, { 0xD3C2, 0x868B }, { 0xD3C3, 0x869A }, { 0xD3C4, 0x8685 }, { 0xD3C5, 0x86A5 }, 
-	{ 0xD3C6, 0x8699 }, { 0xD3C7, 0x86A1 }, { 0xD3C8, 0x86A7 }, { 0xD3C9, 0x8695 }, { 0xD3CA, 0x8698 }, { 0xD3CB, 0x868E }, { 0xD3CC, 0x869D }, { 0xD3CD, 0x8690 }, 
-	{ 0xD3CE, 0x8694 }, { 0xD3CF, 0x8843 }, { 0xD3D0, 0x8844 }, { 0xD3D1, 0x886D }, { 0xD3D2, 0x8875 }, { 0xD3D3, 0x8876 }, { 0xD3D4, 0x8872 }, { 0xD3D5, 0x8880 }, 
-	{ 0xD3D6, 0x8871 }, { 0xD3D7, 0x887F }, { 0xD3D8, 0x886F }, { 0xD3D9, 0x8883 }, { 0xD3DA, 0x887E }, { 0xD3DB, 0x8874 }, { 0xD3DC, 0x887C }, { 0xD3DD, 0x8A12 }, 
-	{ 0xD3DE, 0x8C47 }, { 0xD3DF, 0x8C57 }, { 0xD3E0, 0x8C7B }, { 0xD3E1, 0x8CA4 }, { 0xD3E2, 0x8CA3 }, { 0xD3E3, 0x8D76 }, { 0xD3E4, 0x8D78 }, { 0xD3E5, 0x8DB5 }, 
-	{ 0xD3E6, 0x8DB7 }, { 0xD3E7, 0x8DB6 }, { 0xD3E8, 0x8ED1 }, { 0xD3E9, 0x8ED3 }, { 0xD3EA, 0x8FFE }, { 0xD3EB, 0x8FF5 }, { 0xD3EC, 0x9002 }, { 0xD3ED, 0x8FFF }, 
-	{ 0xD3EE, 0x8FFB }, { 0xD3EF, 0x9004 }, { 0xD3F0, 0x8FFC }, { 0xD3F1, 0x8FF6 }, { 0xD3F2, 0x90D6 }, { 0xD3F3, 0x90E0 }, { 0xD3F4, 0x90D9 }, { 0xD3F5, 0x90DA }, 
-	{ 0xD3F6, 0x90E3 }, { 0xD3F7, 0x90DF }, { 0xD3F8, 0x90E5 }, { 0xD3F9, 0x90D8 }, { 0xD3FA, 0x90DB }, { 0xD3FB, 0x90D7 }, { 0xD3FC, 0x90DC }, { 0xD3FD, 0x90E4 }, 
-	{ 0xD3FE, 0x9150 }, { 0xD440, 0x914E }, { 0xD441, 0x914F }, { 0xD442, 0x91D5 }, { 0xD443, 0x91E2 }, { 0xD444, 0x91DA }, { 0xD445, 0x965C }, { 0xD446, 0x965F }, 
-	{ 0xD447, 0x96BC }, { 0xD448, 0x98E3 }, { 0xD449, 0x9ADF }, { 0xD44A, 0x9B2F }, { 0xD44B, 0x4E7F }, { 0xD44C, 0x5070 }, { 0xD44D, 0x506A }, { 0xD44E, 0x5061 }, 
-	{ 0xD44F, 0x505E }, { 0xD450, 0x5060 }, { 0xD451, 0x5053 }, { 0xD452, 0x504B }, { 0xD453, 0x505D }, { 0xD454, 0x5072 }, { 0xD455, 0x5048 }, { 0xD456, 0x504D }, 
-	{ 0xD457, 0x5041 }, { 0xD458, 0x505B }, { 0xD459, 0x504A }, { 0xD45A, 0x5062 }, { 0xD45B, 0x5015 }, { 0xD45C, 0x5045 }, { 0xD45D, 0x505F }, { 0xD45E, 0x5069 }, 
-	{ 0xD45F, 0x506B }, { 0xD460, 0x5063 }, { 0xD461, 0x5064 }, { 0xD462, 0x5046 }, { 0xD463, 0x5040 }, { 0xD464, 0x506E }, { 0xD465, 0x5073 }, { 0xD466, 0x5057 }, 
-	{ 0xD467, 0x5051 }, { 0xD468, 0x51D0 }, { 0xD469, 0x526B }, { 0xD46A, 0x526D }, { 0xD46B, 0x526C }, { 0xD46C, 0x526E }, { 0xD46D, 0x52D6 }, { 0xD46E, 0x52D3 }, 
-	{ 0xD46F, 0x532D }, { 0xD470, 0x539C }, { 0xD471, 0x5575 }, { 0xD472, 0x5576 }, { 0xD473, 0x553C }, { 0xD474, 0x554D }, { 0xD475, 0x5550 }, { 0xD476, 0x5534 }, 
-	{ 0xD477, 0x552A }, { 0xD478, 0x5551 }, { 0xD479, 0x5562 }, { 0xD47A, 0x5536 }, { 0xD47B, 0x5535 }, { 0xD47C, 0x5530 }, { 0xD47D, 0x5552 }, { 0xD47E, 0x5545 }, 
-	{ 0xD4A1, 0x550C }, { 0xD4A2, 0x5532 }, { 0xD4A3, 0x5565 }, { 0xD4A4, 0x554E }, { 0xD4A5, 0x5539 }, { 0xD4A6, 0x5548 }, { 0xD4A7, 0x552D }, { 0xD4A8, 0x553B }, 
-	{ 0xD4A9, 0x5540 }, { 0xD4AA, 0x554B }, { 0xD4AB, 0x570A }, { 0xD4AC, 0x5707 }, { 0xD4AD, 0x57FB }, { 0xD4AE, 0x5814 }, { 0xD4AF, 0x57E2 }, { 0xD4B0, 0x57F6 }, 
-	{ 0xD4B1, 0x57DC }, { 0xD4B2, 0x57F4 }, { 0xD4B3, 0x5800 }, { 0xD4B4, 0x57ED }, { 0xD4B5, 0x57FD }, { 0xD4B6, 0x5808 }, { 0xD4B7, 0x57F8 }, { 0xD4B8, 0x580B }, 
-	{ 0xD4B9, 0x57F3 }, { 0xD4BA, 0x57CF }, { 0xD4BB, 0x5807 }, { 0xD4BC, 0x57EE }, { 0xD4BD, 0x57E3 }, { 0xD4BE, 0x57F2 }, { 0xD4BF, 0x57E5 }, { 0xD4C0, 0x57EC }, 
-	{ 0xD4C1, 0x57E1 }, { 0xD4C2, 0x580E }, { 0xD4C3, 0x57FC }, { 0xD4C4, 0x5810 }, { 0xD4C5, 0x57E7 }, { 0xD4C6, 0x5801 }, { 0xD4C7, 0x580C }, { 0xD4C8, 0x57F1 }, 
-	{ 0xD4C9, 0x57E9 }, { 0xD4CA, 0x57F0 }, { 0xD4CB, 0x580D }, { 0xD4CC, 0x5804 }, { 0xD4CD, 0x595C }, { 0xD4CE, 0x5A60 }, { 0xD4CF, 0x5A58 }, { 0xD4D0, 0x5A55 }, 
-	{ 0xD4D1, 0x5A67 }, { 0xD4D2, 0x5A5E }, { 0xD4D3, 0x5A38 }, { 0xD4D4, 0x5A35 }, { 0xD4D5, 0x5A6D }, { 0xD4D6, 0x5A50 }, { 0xD4D7, 0x5A5F }, { 0xD4D8, 0x5A65 }, 
-	{ 0xD4D9, 0x5A6C }, { 0xD4DA, 0x5A53 }, { 0xD4DB, 0x5A64 }, { 0xD4DC, 0x5A57 }, { 0xD4DD, 0x5A43 }, { 0xD4DE, 0x5A5D }, { 0xD4DF, 0x5A52 }, { 0xD4E0, 0x5A44 }, 
-	{ 0xD4E1, 0x5A5B }, { 0xD4E2, 0x5A48 }, { 0xD4E3, 0x5A8E }, { 0xD4E4, 0x5A3E }, { 0xD4E5, 0x5A4D }, { 0xD4E6, 0x5A39 }, { 0xD4E7, 0x5A4C }, { 0xD4E8, 0x5A70 }, 
-	{ 0xD4E9, 0x5A69 }, { 0xD4EA, 0x5A47 }, { 0xD4EB, 0x5A51 }, { 0xD4EC, 0x5A56 }, { 0xD4ED, 0x5A42 }, { 0xD4EE, 0x5A5C }, { 0xD4EF, 0x5B72 }, { 0xD4F0, 0x5B6E }, 
-	{ 0xD4F1, 0x5BC1 }, { 0xD4F2, 0x5BC0 }, { 0xD4F3, 0x5C59 }, { 0xD4F4, 0x5D1E }, { 0xD4F5, 0x5D0B }, { 0xD4F6, 0x5D1D }, { 0xD4F7, 0x5D1A }, { 0xD4F8, 0x5D20 }, 
-	{ 0xD4F9, 0x5D0C }, { 0xD4FA, 0x5D28 }, { 0xD4FB, 0x5D0D }, { 0xD4FC, 0x5D26 }, { 0xD4FD, 0x5D25 }, { 0xD4FE, 0x5D0F }, { 0xD540, 0x5D30 }, { 0xD541, 0x5D12 }, 
-	{ 0xD542, 0x5D23 }, { 0xD543, 0x5D1F }, { 0xD544, 0x5D2E }, { 0xD545, 0x5E3E }, { 0xD546, 0x5E34 }, { 0xD547, 0x5EB1 }, { 0xD548, 0x5EB4 }, { 0xD549, 0x5EB9 }, 
-	{ 0xD54A, 0x5EB2 }, { 0xD54B, 0x5EB3 }, { 0xD54C, 0x5F36 }, { 0xD54D, 0x5F38 }, { 0xD54E, 0x5F9B }, { 0xD54F, 0x5F96 }, { 0xD550, 0x5F9F }, { 0xD551, 0x608A }, 
-	{ 0xD552, 0x6090 }, { 0xD553, 0x6086 }, { 0xD554, 0x60BE }, { 0xD555, 0x60B0 }, { 0xD556, 0x60BA }, { 0xD557, 0x60D3 }, { 0xD558, 0x60D4 }, { 0xD559, 0x60CF }, 
-	{ 0xD55A, 0x60E4 }, { 0xD55B, 0x60D9 }, { 0xD55C, 0x60DD }, { 0xD55D, 0x60C8 }, { 0xD55E, 0x60B1 }, { 0xD55F, 0x60DB }, { 0xD560, 0x60B7 }, { 0xD561, 0x60CA }, 
-	{ 0xD562, 0x60BF }, { 0xD563, 0x60C3 }, { 0xD564, 0x60CD }, { 0xD565, 0x60C0 }, { 0xD566, 0x6332 }, { 0xD567, 0x6365 }, { 0xD568, 0x638A }, { 0xD569, 0x6382 }, 
-	{ 0xD56A, 0x637D }, { 0xD56B, 0x63BD }, { 0xD56C, 0x639E }, { 0xD56D, 0x63AD }, { 0xD56E, 0x639D }, { 0xD56F, 0x6397 }, { 0xD570, 0x63AB }, { 0xD571, 0x638E }, 
-	{ 0xD572, 0x636F }, { 0xD573, 0x6387 }, { 0xD574, 0x6390 }, { 0xD575, 0x636E }, { 0xD576, 0x63AF }, { 0xD577, 0x6375 }, { 0xD578, 0x639C }, { 0xD579, 0x636D }, 
-	{ 0xD57A, 0x63AE }, { 0xD57B, 0x637C }, { 0xD57C, 0x63A4 }, { 0xD57D, 0x633B }, { 0xD57E, 0x639F }, { 0xD5A1, 0x6378 }, { 0xD5A2, 0x6385 }, { 0xD5A3, 0x6381 }, 
-	{ 0xD5A4, 0x6391 }, { 0xD5A5, 0x638D }, { 0xD5A6, 0x6370 }, { 0xD5A7, 0x6553 }, { 0xD5A8, 0x65CD }, { 0xD5A9, 0x6665 }, { 0xD5AA, 0x6661 }, { 0xD5AB, 0x665B }, 
-	{ 0xD5AC, 0x6659 }, { 0xD5AD, 0x665C }, { 0xD5AE, 0x6662 }, { 0xD5AF, 0x6718 }, { 0xD5B0, 0x6879 }, { 0xD5B1, 0x6887 }, { 0xD5B2, 0x6890 }, { 0xD5B3, 0x689C }, 
-	{ 0xD5B4, 0x686D }, { 0xD5B5, 0x686E }, { 0xD5B6, 0x68AE }, { 0xD5B7, 0x68AB }, { 0xD5B8, 0x6956 }, { 0xD5B9, 0x686F }, { 0xD5BA, 0x68A3 }, { 0xD5BB, 0x68AC }, 
-	{ 0xD5BC, 0x68A9 }, { 0xD5BD, 0x6875 }, { 0xD5BE, 0x6874 }, { 0xD5BF, 0x68B2 }, { 0xD5C0, 0x688F }, { 0xD5C1, 0x6877 }, { 0xD5C2, 0x6892 }, { 0xD5C3, 0x687C }, 
-	{ 0xD5C4, 0x686B }, { 0xD5C5, 0x6872 }, { 0xD5C6, 0x68AA }, { 0xD5C7, 0x6880 }, { 0xD5C8, 0x6871 }, { 0xD5C9, 0x687E }, { 0xD5CA, 0x689B }, { 0xD5CB, 0x6896 }, 
-	{ 0xD5CC, 0x688B }, { 0xD5CD, 0x68A0 }, { 0xD5CE, 0x6889 }, { 0xD5CF, 0x68A4 }, { 0xD5D0, 0x6878 }, { 0xD5D1, 0x687B }, { 0xD5D2, 0x6891 }, { 0xD5D3, 0x688C }, 
-	{ 0xD5D4, 0x688A }, { 0xD5D5, 0x687D }, { 0xD5D6, 0x6B36 }, { 0xD5D7, 0x6B33 }, { 0xD5D8, 0x6B37 }, { 0xD5D9, 0x6B38 }, { 0xD5DA, 0x6B91 }, { 0xD5DB, 0x6B8F }, 
-	{ 0xD5DC, 0x6B8D }, { 0xD5DD, 0x6B8E }, { 0xD5DE, 0x6B8C }, { 0xD5DF, 0x6C2A }, { 0xD5E0, 0x6DC0 }, { 0xD5E1, 0x6DAB }, { 0xD5E2, 0x6DB4 }, { 0xD5E3, 0x6DB3 }, 
-	{ 0xD5E4, 0x6E74 }, { 0xD5E5, 0x6DAC }, { 0xD5E6, 0x6DE9 }, { 0xD5E7, 0x6DE2 }, { 0xD5E8, 0x6DB7 }, { 0xD5E9, 0x6DF6 }, { 0xD5EA, 0x6DD4 }, { 0xD5EB, 0x6E00 }, 
-	{ 0xD5EC, 0x6DC8 }, { 0xD5ED, 0x6DE0 }, { 0xD5EE, 0x6DDF }, { 0xD5EF, 0x6DD6 }, { 0xD5F0, 0x6DBE }, { 0xD5F1, 0x6DE5 }, { 0xD5F2, 0x6DDC }, { 0xD5F3, 0x6DDD }, 
-	{ 0xD5F4, 0x6DDB }, { 0xD5F5, 0x6DF4 }, { 0xD5F6, 0x6DCA }, { 0xD5F7, 0x6DBD }, { 0xD5F8, 0x6DED }, { 0xD5F9, 0x6DF0 }, { 0xD5FA, 0x6DBA }, { 0xD5FB, 0x6DD5 }, 
-	{ 0xD5FC, 0x6DC2 }, { 0xD5FD, 0x6DCF }, { 0xD5FE, 0x6DC9 }, { 0xD640, 0x6DD0 }, { 0xD641, 0x6DF2 }, { 0xD642, 0x6DD3 }, { 0xD643, 0x6DFD }, { 0xD644, 0x6DD7 }, 
-	{ 0xD645, 0x6DCD }, { 0xD646, 0x6DE3 }, { 0xD647, 0x6DBB }, { 0xD648, 0x70FA }, { 0xD649, 0x710D }, { 0xD64A, 0x70F7 }, { 0xD64B, 0x7117 }, { 0xD64C, 0x70F4 }, 
-	{ 0xD64D, 0x710C }, { 0xD64E, 0x70F0 }, { 0xD64F, 0x7104 }, { 0xD650, 0x70F3 }, { 0xD651, 0x7110 }, { 0xD652, 0x70FC }, { 0xD653, 0x70FF }, { 0xD654, 0x7106 }, 
-	{ 0xD655, 0x7113 }, { 0xD656, 0x7100 }, { 0xD657, 0x70F8 }, { 0xD658, 0x70F6 }, { 0xD659, 0x710B }, { 0xD65A, 0x7102 }, { 0xD65B, 0x710E }, { 0xD65C, 0x727E }, 
-	{ 0xD65D, 0x727B }, { 0xD65E, 0x727C }, { 0xD65F, 0x727F }, { 0xD660, 0x731D }, { 0xD661, 0x7317 }, { 0xD662, 0x7307 }, { 0xD663, 0x7311 }, { 0xD664, 0x7318 }, 
-	{ 0xD665, 0x730A }, { 0xD666, 0x7308 }, { 0xD667, 0x72FF }, { 0xD668, 0x730F }, { 0xD669, 0x731E }, { 0xD66A, 0x7388 }, { 0xD66B, 0x73F6 }, { 0xD66C, 0x73F8 }, 
-	{ 0xD66D, 0x73F5 }, { 0xD66E, 0x7404 }, { 0xD66F, 0x7401 }, { 0xD670, 0x73FD }, { 0xD671, 0x7407 }, { 0xD672, 0x7400 }, { 0xD673, 0x73FA }, { 0xD674, 0x73FC }, 
-	{ 0xD675, 0x73FF }, { 0xD676, 0x740C }, { 0xD677, 0x740B }, { 0xD678, 0x73F4 }, { 0xD679, 0x7408 }, { 0xD67A, 0x7564 }, { 0xD67B, 0x7563 }, { 0xD67C, 0x75CE }, 
-	{ 0xD67D, 0x75D2 }, { 0xD67E, 0x75CF }, { 0xD6A1, 0x75CB }, { 0xD6A2, 0x75CC }, { 0xD6A3, 0x75D1 }, { 0xD6A4, 0x75D0 }, { 0xD6A5, 0x768F }, { 0xD6A6, 0x7689 }, 
-	{ 0xD6A7, 0x76D3 }, { 0xD6A8, 0x7739 }, { 0xD6A9, 0x772F }, { 0xD6AA, 0x772D }, { 0xD6AB, 0x7731 }, { 0xD6AC, 0x7732 }, { 0xD6AD, 0x7734 }, { 0xD6AE, 0x7733 }, 
-	{ 0xD6AF, 0x773D }, { 0xD6B0, 0x7725 }, { 0xD6B1, 0x773B }, { 0xD6B2, 0x7735 }, { 0xD6B3, 0x7848 }, { 0xD6B4, 0x7852 }, { 0xD6B5, 0x7849 }, { 0xD6B6, 0x784D }, 
-	{ 0xD6B7, 0x784A }, { 0xD6B8, 0x784C }, { 0xD6B9, 0x7826 }, { 0xD6BA, 0x7845 }, { 0xD6BB, 0x7850 }, { 0xD6BC, 0x7964 }, { 0xD6BD, 0x7967 }, { 0xD6BE, 0x7969 }, 
-	{ 0xD6BF, 0x796A }, { 0xD6C0, 0x7963 }, { 0xD6C1, 0x796B }, { 0xD6C2, 0x7961 }, { 0xD6C3, 0x79BB }, { 0xD6C4, 0x79FA }, { 0xD6C5, 0x79F8 }, { 0xD6C6, 0x79F6 }, 
-	{ 0xD6C7, 0x79F7 }, { 0xD6C8, 0x7A8F }, { 0xD6C9, 0x7A94 }, { 0xD6CA, 0x7A90 }, { 0xD6CB, 0x7B35 }, { 0xD6CC, 0x7B47 }, { 0xD6CD, 0x7B34 }, { 0xD6CE, 0x7B25 }, 
-	{ 0xD6CF, 0x7B30 }, { 0xD6D0, 0x7B22 }, { 0xD6D1, 0x7B24 }, { 0xD6D2, 0x7B33 }, { 0xD6D3, 0x7B18 }, { 0xD6D4, 0x7B2A }, { 0xD6D5, 0x7B1D }, { 0xD6D6, 0x7B31 }, 
-	{ 0xD6D7, 0x7B2B }, { 0xD6D8, 0x7B2D }, { 0xD6D9, 0x7B2F }, { 0xD6DA, 0x7B32 }, { 0xD6DB, 0x7B38 }, { 0xD6DC, 0x7B1A }, { 0xD6DD, 0x7B23 }, { 0xD6DE, 0x7C94 }, 
-	{ 0xD6DF, 0x7C98 }, { 0xD6E0, 0x7C96 }, { 0xD6E1, 0x7CA3 }, { 0xD6E2, 0x7D35 }, { 0xD6E3, 0x7D3D }, { 0xD6E4, 0x7D38 }, { 0xD6E5, 0x7D36 }, { 0xD6E6, 0x7D3A }, 
-	{ 0xD6E7, 0x7D45 }, { 0xD6E8, 0x7D2C }, { 0xD6E9, 0x7D29 }, { 0xD6EA, 0x7D41 }, { 0xD6EB, 0x7D47 }, { 0xD6EC, 0x7D3E }, { 0xD6ED, 0x7D3F }, { 0xD6EE, 0x7D4A }, 
-	{ 0xD6EF, 0x7D3B }, { 0xD6F0, 0x7D28 }, { 0xD6F1, 0x7F63 }, { 0xD6F2, 0x7F95 }, { 0xD6F3, 0x7F9C }, { 0xD6F4, 0x7F9D }, { 0xD6F5, 0x7F9B }, { 0xD6F6, 0x7FCA }, 
-	{ 0xD6F7, 0x7FCB }, { 0xD6F8, 0x7FCD }, { 0xD6F9, 0x7FD0 }, { 0xD6FA, 0x7FD1 }, { 0xD6FB, 0x7FC7 }, { 0xD6FC, 0x7FCF }, { 0xD6FD, 0x7FC9 }, { 0xD6FE, 0x801F }, 
-	{ 0xD740, 0x801E }, { 0xD741, 0x801B }, { 0xD742, 0x8047 }, { 0xD743, 0x8043 }, { 0xD744, 0x8048 }, { 0xD745, 0x8118 }, { 0xD746, 0x8125 }, { 0xD747, 0x8119 }, 
-	{ 0xD748, 0x811B }, { 0xD749, 0x812D }, { 0xD74A, 0x811F }, { 0xD74B, 0x812C }, { 0xD74C, 0x811E }, { 0xD74D, 0x8121 }, { 0xD74E, 0x8115 }, { 0xD74F, 0x8127 }, 
-	{ 0xD750, 0x811D }, { 0xD751, 0x8122 }, { 0xD752, 0x8211 }, { 0xD753, 0x8238 }, { 0xD754, 0x8233 }, { 0xD755, 0x823A }, { 0xD756, 0x8234 }, { 0xD757, 0x8232 }, 
-	{ 0xD758, 0x8274 }, { 0xD759, 0x8390 }, { 0xD75A, 0x83A3 }, { 0xD75B, 0x83A8 }, { 0xD75C, 0x838D }, { 0xD75D, 0x837A }, { 0xD75E, 0x8373 }, { 0xD75F, 0x83A4 }, 
-	{ 0xD760, 0x8374 }, { 0xD761, 0x838F }, { 0xD762, 0x8381 }, { 0xD763, 0x8395 }, { 0xD764, 0x8399 }, { 0xD765, 0x8375 }, { 0xD766, 0x8394 }, { 0xD767, 0x83A9 }, 
-	{ 0xD768, 0x837D }, { 0xD769, 0x8383 }, { 0xD76A, 0x838C }, { 0xD76B, 0x839D }, { 0xD76C, 0x839B }, { 0xD76D, 0x83AA }, { 0xD76E, 0x838B }, { 0xD76F, 0x837E }, 
-	{ 0xD770, 0x83A5 }, { 0xD771, 0x83AF }, { 0xD772, 0x8388 }, { 0xD773, 0x8397 }, { 0xD774, 0x83B0 }, { 0xD775, 0x837F }, { 0xD776, 0x83A6 }, { 0xD777, 0x8387 }, 
-	{ 0xD778, 0x83AE }, { 0xD779, 0x8376 }, { 0xD77A, 0x839A }, { 0xD77B, 0x8659 }, { 0xD77C, 0x8656 }, { 0xD77D, 0x86BF }, { 0xD77E, 0x86B7 }, { 0xD7A1, 0x86C2 }, 
-	{ 0xD7A2, 0x86C1 }, { 0xD7A3, 0x86C5 }, { 0xD7A4, 0x86BA }, { 0xD7A5, 0x86B0 }, { 0xD7A6, 0x86C8 }, { 0xD7A7, 0x86B9 }, { 0xD7A8, 0x86B3 }, { 0xD7A9, 0x86B8 }, 
-	{ 0xD7AA, 0x86CC }, { 0xD7AB, 0x86B4 }, { 0xD7AC, 0x86BB }, { 0xD7AD, 0x86BC }, { 0xD7AE, 0x86C3 }, { 0xD7AF, 0x86BD }, { 0xD7B0, 0x86BE }, { 0xD7B1, 0x8852 }, 
-	{ 0xD7B2, 0x8889 }, { 0xD7B3, 0x8895 }, { 0xD7B4, 0x88A8 }, { 0xD7B5, 0x88A2 }, { 0xD7B6, 0x88AA }, { 0xD7B7, 0x889A }, { 0xD7B8, 0x8891 }, { 0xD7B9, 0x88A1 }, 
-	{ 0xD7BA, 0x889F }, { 0xD7BB, 0x8898 }, { 0xD7BC, 0x88A7 }, { 0xD7BD, 0x8899 }, { 0xD7BE, 0x889B }, { 0xD7BF, 0x8897 }, { 0xD7C0, 0x88A4 }, { 0xD7C1, 0x88AC }, 
-	{ 0xD7C2, 0x888C }, { 0xD7C3, 0x8893 }, { 0xD7C4, 0x888E }, { 0xD7C5, 0x8982 }, { 0xD7C6, 0x89D6 }, { 0xD7C7, 0x89D9 }, { 0xD7C8, 0x89D5 }, { 0xD7C9, 0x8A30 }, 
-	{ 0xD7CA, 0x8A27 }, { 0xD7CB, 0x8A2C }, { 0xD7CC, 0x8A1E }, { 0xD7CD, 0x8C39 }, { 0xD7CE, 0x8C3B }, { 0xD7CF, 0x8C5C }, { 0xD7D0, 0x8C5D }, { 0xD7D1, 0x8C7D }, 
-	{ 0xD7D2, 0x8CA5 }, { 0xD7D3, 0x8D7D }, { 0xD7D4, 0x8D7B }, { 0xD7D5, 0x8D79 }, { 0xD7D6, 0x8DBC }, { 0xD7D7, 0x8DC2 }, { 0xD7D8, 0x8DB9 }, { 0xD7D9, 0x8DBF }, 
-	{ 0xD7DA, 0x8DC1 }, { 0xD7DB, 0x8ED8 }, { 0xD7DC, 0x8EDE }, { 0xD7DD, 0x8EDD }, { 0xD7DE, 0x8EDC }, { 0xD7DF, 0x8ED7 }, { 0xD7E0, 0x8EE0 }, { 0xD7E1, 0x8EE1 }, 
-	{ 0xD7E2, 0x9024 }, { 0xD7E3, 0x900B }, { 0xD7E4, 0x9011 }, { 0xD7E5, 0x901C }, { 0xD7E6, 0x900C }, { 0xD7E7, 0x9021 }, { 0xD7E8, 0x90EF }, { 0xD7E9, 0x90EA }, 
-	{ 0xD7EA, 0x90F0 }, { 0xD7EB, 0x90F4 }, { 0xD7EC, 0x90F2 }, { 0xD7ED, 0x90F3 }, { 0xD7EE, 0x90D4 }, { 0xD7EF, 0x90EB }, { 0xD7F0, 0x90EC }, { 0xD7F1, 0x90E9 }, 
-	{ 0xD7F2, 0x9156 }, { 0xD7F3, 0x9158 }, { 0xD7F4, 0x915A }, { 0xD7F5, 0x9153 }, { 0xD7F6, 0x9155 }, { 0xD7F7, 0x91EC }, { 0xD7F8, 0x91F4 }, { 0xD7F9, 0x91F1 }, 
-	{ 0xD7FA, 0x91F3 }, { 0xD7FB, 0x91F8 }, { 0xD7FC, 0x91E4 }, { 0xD7FD, 0x91F9 }, { 0xD7FE, 0x91EA }, { 0xD840, 0x91EB }, { 0xD841, 0x91F7 }, { 0xD842, 0x91E8 }, 
-	{ 0xD843, 0x91EE }, { 0xD844, 0x957A }, { 0xD845, 0x9586 }, { 0xD846, 0x9588 }, { 0xD847, 0x967C }, { 0xD848, 0x966D }, { 0xD849, 0x966B }, { 0xD84A, 0x9671 }, 
-	{ 0xD84B, 0x966F }, { 0xD84C, 0x96BF }, { 0xD84D, 0x976A }, { 0xD84E, 0x9804 }, { 0xD84F, 0x98E5 }, { 0xD850, 0x9997 }, { 0xD851, 0x509B }, { 0xD852, 0x5095 }, 
-	{ 0xD853, 0x5094 }, { 0xD854, 0x509E }, { 0xD855, 0x508B }, { 0xD856, 0x50A3 }, { 0xD857, 0x5083 }, { 0xD858, 0x508C }, { 0xD859, 0x508E }, { 0xD85A, 0x509D }, 
-	{ 0xD85B, 0x5068 }, { 0xD85C, 0x509C }, { 0xD85D, 0x5092 }, { 0xD85E, 0x5082 }, { 0xD85F, 0x5087 }, { 0xD860, 0x515F }, { 0xD861, 0x51D4 }, { 0xD862, 0x5312 }, 
-	{ 0xD863, 0x5311 }, { 0xD864, 0x53A4 }, { 0xD865, 0x53A7 }, { 0xD866, 0x5591 }, { 0xD867, 0x55A8 }, { 0xD868, 0x55A5 }, { 0xD869, 0x55AD }, { 0xD86A, 0x5577 }, 
-	{ 0xD86B, 0x5645 }, { 0xD86C, 0x55A2 }, { 0xD86D, 0x5593 }, { 0xD86E, 0x5588 }, { 0xD86F, 0x558F }, { 0xD870, 0x55B5 }, { 0xD871, 0x5581 }, { 0xD872, 0x55A3 }, 
-	{ 0xD873, 0x5592 }, { 0xD874, 0x55A4 }, { 0xD875, 0x557D }, { 0xD876, 0x558C }, { 0xD877, 0x55A6 }, { 0xD878, 0x557F }, { 0xD879, 0x5595 }, { 0xD87A, 0x55A1 }, 
-	{ 0xD87B, 0x558E }, { 0xD87C, 0x570C }, { 0xD87D, 0x5829 }, { 0xD87E, 0x5837 }, { 0xD8A1, 0x5819 }, { 0xD8A2, 0x581E }, { 0xD8A3, 0x5827 }, { 0xD8A4, 0x5823 }, 
-	{ 0xD8A5, 0x5828 }, { 0xD8A6, 0x57F5 }, { 0xD8A7, 0x5848 }, { 0xD8A8, 0x5825 }, { 0xD8A9, 0x581C }, { 0xD8AA, 0x581B }, { 0xD8AB, 0x5833 }, { 0xD8AC, 0x583F }, 
-	{ 0xD8AD, 0x5836 }, { 0xD8AE, 0x582E }, { 0xD8AF, 0x5839 }, { 0xD8B0, 0x5838 }, { 0xD8B1, 0x582D }, { 0xD8B2, 0x582C }, { 0xD8B3, 0x583B }, { 0xD8B4, 0x5961 }, 
-	{ 0xD8B5, 0x5AAF }, { 0xD8B6, 0x5A94 }, { 0xD8B7, 0x5A9F }, { 0xD8B8, 0x5A7A }, { 0xD8B9, 0x5AA2 }, { 0xD8BA, 0x5A9E }, { 0xD8BB, 0x5A78 }, { 0xD8BC, 0x5AA6 }, 
-	{ 0xD8BD, 0x5A7C }, { 0xD8BE, 0x5AA5 }, { 0xD8BF, 0x5AAC }, { 0xD8C0, 0x5A95 }, { 0xD8C1, 0x5AAE }, { 0xD8C2, 0x5A37 }, { 0xD8C3, 0x5A84 }, { 0xD8C4, 0x5A8A }, 
-	{ 0xD8C5, 0x5A97 }, { 0xD8C6, 0x5A83 }, { 0xD8C7, 0x5A8B }, { 0xD8C8, 0x5AA9 }, { 0xD8C9, 0x5A7B }, { 0xD8CA, 0x5A7D }, { 0xD8CB, 0x5A8C }, { 0xD8CC, 0x5A9C }, 
-	{ 0xD8CD, 0x5A8F }, { 0xD8CE, 0x5A93 }, { 0xD8CF, 0x5A9D }, { 0xD8D0, 0x5BEA }, { 0xD8D1, 0x5BCD }, { 0xD8D2, 0x5BCB }, { 0xD8D3, 0x5BD4 }, { 0xD8D4, 0x5BD1 }, 
-	{ 0xD8D5, 0x5BCA }, { 0xD8D6, 0x5BCE }, { 0xD8D7, 0x5C0C }, { 0xD8D8, 0x5C30 }, { 0xD8D9, 0x5D37 }, { 0xD8DA, 0x5D43 }, { 0xD8DB, 0x5D6B }, { 0xD8DC, 0x5D41 }, 
-	{ 0xD8DD, 0x5D4B }, { 0xD8DE, 0x5D3F }, { 0xD8DF, 0x5D35 }, { 0xD8E0, 0x5D51 }, { 0xD8E1, 0x5D4E }, { 0xD8E2, 0x5D55 }, { 0xD8E3, 0x5D33 }, { 0xD8E4, 0x5D3A }, 
-	{ 0xD8E5, 0x5D52 }, { 0xD8E6, 0x5D3D }, { 0xD8E7, 0x5D31 }, { 0xD8E8, 0x5D59 }, { 0xD8E9, 0x5D42 }, { 0xD8EA, 0x5D39 }, { 0xD8EB, 0x5D49 }, { 0xD8EC, 0x5D38 }, 
-	{ 0xD8ED, 0x5D3C }, { 0xD8EE, 0x5D32 }, { 0xD8EF, 0x5D36 }, { 0xD8F0, 0x5D40 }, { 0xD8F1, 0x5D45 }, { 0xD8F2, 0x5E44 }, { 0xD8F3, 0x5E41 }, { 0xD8F4, 0x5F58 }, 
-	{ 0xD8F5, 0x5FA6 }, { 0xD8F6, 0x5FA5 }, { 0xD8F7, 0x5FAB }, { 0xD8F8, 0x60C9 }, { 0xD8F9, 0x60B9 }, { 0xD8FA, 0x60CC }, { 0xD8FB, 0x60E2 }, { 0xD8FC, 0x60CE }, 
-	{ 0xD8FD, 0x60C4 }, { 0xD8FE, 0x6114 }, { 0xD940, 0x60F2 }, { 0xD941, 0x610A }, { 0xD942, 0x6116 }, { 0xD943, 0x6105 }, { 0xD944, 0x60F5 }, { 0xD945, 0x6113 }, 
-	{ 0xD946, 0x60F8 }, { 0xD947, 0x60FC }, { 0xD948, 0x60FE }, { 0xD949, 0x60C1 }, { 0xD94A, 0x6103 }, { 0xD94B, 0x6118 }, { 0xD94C, 0x611D }, { 0xD94D, 0x6110 }, 
-	{ 0xD94E, 0x60FF }, { 0xD94F, 0x6104 }, { 0xD950, 0x610B }, { 0xD951, 0x624A }, { 0xD952, 0x6394 }, { 0xD953, 0x63B1 }, { 0xD954, 0x63B0 }, { 0xD955, 0x63CE }, 
-	{ 0xD956, 0x63E5 }, { 0xD957, 0x63E8 }, { 0xD958, 0x63EF }, { 0xD959, 0x63C3 }, { 0xD95A, 0x649D }, { 0xD95B, 0x63F3 }, { 0xD95C, 0x63CA }, { 0xD95D, 0x63E0 }, 
-	{ 0xD95E, 0x63F6 }, { 0xD95F, 0x63D5 }, { 0xD960, 0x63F2 }, { 0xD961, 0x63F5 }, { 0xD962, 0x6461 }, { 0xD963, 0x63DF }, { 0xD964, 0x63BE }, { 0xD965, 0x63DD }, 
-	{ 0xD966, 0x63DC }, { 0xD967, 0x63C4 }, { 0xD968, 0x63D8 }, { 0xD969, 0x63D3 }, { 0xD96A, 0x63C2 }, { 0xD96B, 0x63C7 }, { 0xD96C, 0x63CC }, { 0xD96D, 0x63CB }, 
-	{ 0xD96E, 0x63C8 }, { 0xD96F, 0x63F0 }, { 0xD970, 0x63D7 }, { 0xD971, 0x63D9 }, { 0xD972, 0x6532 }, { 0xD973, 0x6567 }, { 0xD974, 0x656A }, { 0xD975, 0x6564 }, 
-	{ 0xD976, 0x655C }, { 0xD977, 0x6568 }, { 0xD978, 0x6565 }, { 0xD979, 0x658C }, { 0xD97A, 0x659D }, { 0xD97B, 0x659E }, { 0xD97C, 0x65AE }, { 0xD97D, 0x65D0 }, 
-	{ 0xD97E, 0x65D2 }, { 0xD9A1, 0x667C }, { 0xD9A2, 0x666C }, { 0xD9A3, 0x667B }, { 0xD9A4, 0x6680 }, { 0xD9A5, 0x6671 }, { 0xD9A6, 0x6679 }, { 0xD9A7, 0x666A }, 
-	{ 0xD9A8, 0x6672 }, { 0xD9A9, 0x6701 }, { 0xD9AA, 0x690C }, { 0xD9AB, 0x68D3 }, { 0xD9AC, 0x6904 }, { 0xD9AD, 0x68DC }, { 0xD9AE, 0x692A }, { 0xD9AF, 0x68EC }, 
-	{ 0xD9B0, 0x68EA }, { 0xD9B1, 0x68F1 }, { 0xD9B2, 0x690F }, { 0xD9B3, 0x68D6 }, { 0xD9B4, 0x68F7 }, { 0xD9B5, 0x68EB }, { 0xD9B6, 0x68E4 }, { 0xD9B7, 0x68F6 }, 
-	{ 0xD9B8, 0x6913 }, { 0xD9B9, 0x6910 }, { 0xD9BA, 0x68F3 }, { 0xD9BB, 0x68E1 }, { 0xD9BC, 0x6907 }, { 0xD9BD, 0x68CC }, { 0xD9BE, 0x6908 }, { 0xD9BF, 0x6970 }, 
-	{ 0xD9C0, 0x68B4 }, { 0xD9C1, 0x6911 }, { 0xD9C2, 0x68EF }, { 0xD9C3, 0x68C6 }, { 0xD9C4, 0x6914 }, { 0xD9C5, 0x68F8 }, { 0xD9C6, 0x68D0 }, { 0xD9C7, 0x68FD }, 
-	{ 0xD9C8, 0x68FC }, { 0xD9C9, 0x68E8 }, { 0xD9CA, 0x690B }, { 0xD9CB, 0x690A }, { 0xD9CC, 0x6917 }, { 0xD9CD, 0x68CE }, { 0xD9CE, 0x68C8 }, { 0xD9CF, 0x68DD }, 
-	{ 0xD9D0, 0x68DE }, { 0xD9D1, 0x68E6 }, { 0xD9D2, 0x68F4 }, { 0xD9D3, 0x68D1 }, { 0xD9D4, 0x6906 }, { 0xD9D5, 0x68D4 }, { 0xD9D6, 0x68E9 }, { 0xD9D7, 0x6915 }, 
-	{ 0xD9D8, 0x6925 }, { 0xD9D9, 0x68C7 }, { 0xD9DA, 0x6B39 }, { 0xD9DB, 0x6B3B }, { 0xD9DC, 0x6B3F }, { 0xD9DD, 0x6B3C }, { 0xD9DE, 0x6B94 }, { 0xD9DF, 0x6B97 }, 
-	{ 0xD9E0, 0x6B99 }, { 0xD9E1, 0x6B95 }, { 0xD9E2, 0x6BBD }, { 0xD9E3, 0x6BF0 }, { 0xD9E4, 0x6BF2 }, { 0xD9E5, 0x6BF3 }, { 0xD9E6, 0x6C30 }, { 0xD9E7, 0x6DFC }, 
-	{ 0xD9E8, 0x6E46 }, { 0xD9E9, 0x6E47 }, { 0xD9EA, 0x6E1F }, { 0xD9EB, 0x6E49 }, { 0xD9EC, 0x6E88 }, { 0xD9ED, 0x6E3C }, { 0xD9EE, 0x6E3D }, { 0xD9EF, 0x6E45 }, 
-	{ 0xD9F0, 0x6E62 }, { 0xD9F1, 0x6E2B }, { 0xD9F2, 0x6E3F }, { 0xD9F3, 0x6E41 }, { 0xD9F4, 0x6E5D }, { 0xD9F5, 0x6E73 }, { 0xD9F6, 0x6E1C }, { 0xD9F7, 0x6E33 }, 
-	{ 0xD9F8, 0x6E4B }, { 0xD9F9, 0x6E40 }, { 0xD9FA, 0x6E51 }, { 0xD9FB, 0x6E3B }, { 0xD9FC, 0x6E03 }, { 0xD9FD, 0x6E2E }, { 0xD9FE, 0x6E5E }, { 0xDA40, 0x6E68 }, 
-	{ 0xDA41, 0x6E5C }, { 0xDA42, 0x6E61 }, { 0xDA43, 0x6E31 }, { 0xDA44, 0x6E28 }, { 0xDA45, 0x6E60 }, { 0xDA46, 0x6E71 }, { 0xDA47, 0x6E6B }, { 0xDA48, 0x6E39 }, 
-	{ 0xDA49, 0x6E22 }, { 0xDA4A, 0x6E30 }, { 0xDA4B, 0x6E53 }, { 0xDA4C, 0x6E65 }, { 0xDA4D, 0x6E27 }, { 0xDA4E, 0x6E78 }, { 0xDA4F, 0x6E64 }, { 0xDA50, 0x6E77 }, 
-	{ 0xDA51, 0x6E55 }, { 0xDA52, 0x6E79 }, { 0xDA53, 0x6E52 }, { 0xDA54, 0x6E66 }, { 0xDA55, 0x6E35 }, { 0xDA56, 0x6E36 }, { 0xDA57, 0x6E5A }, { 0xDA58, 0x7120 }, 
-	{ 0xDA59, 0x711E }, { 0xDA5A, 0x712F }, { 0xDA5B, 0x70FB }, { 0xDA5C, 0x712E }, { 0xDA5D, 0x7131 }, { 0xDA5E, 0x7123 }, { 0xDA5F, 0x7125 }, { 0xDA60, 0x7122 }, 
-	{ 0xDA61, 0x7132 }, { 0xDA62, 0x711F }, { 0xDA63, 0x7128 }, { 0xDA64, 0x713A }, { 0xDA65, 0x711B }, { 0xDA66, 0x724B }, { 0xDA67, 0x725A }, { 0xDA68, 0x7288 }, 
-	{ 0xDA69, 0x7289 }, { 0xDA6A, 0x7286 }, { 0xDA6B, 0x7285 }, { 0xDA6C, 0x728B }, { 0xDA6D, 0x7312 }, { 0xDA6E, 0x730B }, { 0xDA6F, 0x7330 }, { 0xDA70, 0x7322 }, 
-	{ 0xDA71, 0x7331 }, { 0xDA72, 0x7333 }, { 0xDA73, 0x7327 }, { 0xDA74, 0x7332 }, { 0xDA75, 0x732D }, { 0xDA76, 0x7326 }, { 0xDA77, 0x7323 }, { 0xDA78, 0x7335 }, 
-	{ 0xDA79, 0x730C }, { 0xDA7A, 0x742E }, { 0xDA7B, 0x742C }, { 0xDA7C, 0x7430 }, { 0xDA7D, 0x742B }, { 0xDA7E, 0x7416 }, { 0xDAA1, 0x741A }, { 0xDAA2, 0x7421 }, 
-	{ 0xDAA3, 0x742D }, { 0xDAA4, 0x7431 }, { 0xDAA5, 0x7424 }, { 0xDAA6, 0x7423 }, { 0xDAA7, 0x741D }, { 0xDAA8, 0x7429 }, { 0xDAA9, 0x7420 }, { 0xDAAA, 0x7432 }, 
-	{ 0xDAAB, 0x74FB }, { 0xDAAC, 0x752F }, { 0xDAAD, 0x756F }, { 0xDAAE, 0x756C }, { 0xDAAF, 0x75E7 }, { 0xDAB0, 0x75DA }, { 0xDAB1, 0x75E1 }, { 0xDAB2, 0x75E6 }, 
-	{ 0xDAB3, 0x75DD }, { 0xDAB4, 0x75DF }, { 0xDAB5, 0x75E4 }, { 0xDAB6, 0x75D7 }, { 0xDAB7, 0x7695 }, { 0xDAB8, 0x7692 }, { 0xDAB9, 0x76DA }, { 0xDABA, 0x7746 }, 
-	{ 0xDABB, 0x7747 }, { 0xDABC, 0x7744 }, { 0xDABD, 0x774D }, { 0xDABE, 0x7745 }, { 0xDABF, 0x774A }, { 0xDAC0, 0x774E }, { 0xDAC1, 0x774B }, { 0xDAC2, 0x774C }, 
-	{ 0xDAC3, 0x77DE }, { 0xDAC4, 0x77EC }, { 0xDAC5, 0x7860 }, { 0xDAC6, 0x7864 }, { 0xDAC7, 0x7865 }, { 0xDAC8, 0x785C }, { 0xDAC9, 0x786D }, { 0xDACA, 0x7871 }, 
-	{ 0xDACB, 0x786A }, { 0xDACC, 0x786E }, { 0xDACD, 0x7870 }, { 0xDACE, 0x7869 }, { 0xDACF, 0x7868 }, { 0xDAD0, 0x785E }, { 0xDAD1, 0x7862 }, { 0xDAD2, 0x7974 }, 
-	{ 0xDAD3, 0x7973 }, { 0xDAD4, 0x7972 }, { 0xDAD5, 0x7970 }, { 0xDAD6, 0x7A02 }, { 0xDAD7, 0x7A0A }, { 0xDAD8, 0x7A03 }, { 0xDAD9, 0x7A0C }, { 0xDADA, 0x7A04 }, 
-	{ 0xDADB, 0x7A99 }, { 0xDADC, 0x7AE6 }, { 0xDADD, 0x7AE4 }, { 0xDADE, 0x7B4A }, { 0xDADF, 0x7B3B }, { 0xDAE0, 0x7B44 }, { 0xDAE1, 0x7B48 }, { 0xDAE2, 0x7B4C }, 
-	{ 0xDAE3, 0x7B4E }, { 0xDAE4, 0x7B40 }, { 0xDAE5, 0x7B58 }, { 0xDAE6, 0x7B45 }, { 0xDAE7, 0x7CA2 }, { 0xDAE8, 0x7C9E }, { 0xDAE9, 0x7CA8 }, { 0xDAEA, 0x7CA1 }, 
-	{ 0xDAEB, 0x7D58 }, { 0xDAEC, 0x7D6F }, { 0xDAED, 0x7D63 }, { 0xDAEE, 0x7D53 }, { 0xDAEF, 0x7D56 }, { 0xDAF0, 0x7D67 }, { 0xDAF1, 0x7D6A }, { 0xDAF2, 0x7D4F }, 
-	{ 0xDAF3, 0x7D6D }, { 0xDAF4, 0x7D5C }, { 0xDAF5, 0x7D6B }, { 0xDAF6, 0x7D52 }, { 0xDAF7, 0x7D54 }, { 0xDAF8, 0x7D69 }, { 0xDAF9, 0x7D51 }, { 0xDAFA, 0x7D5F }, 
-	{ 0xDAFB, 0x7D4E }, { 0xDAFC, 0x7F3E }, { 0xDAFD, 0x7F3F }, { 0xDAFE, 0x7F65 }, { 0xDB40, 0x7F66 }, { 0xDB41, 0x7FA2 }, { 0xDB42, 0x7FA0 }, { 0xDB43, 0x7FA1 }, 
-	{ 0xDB44, 0x7FD7 }, { 0xDB45, 0x8051 }, { 0xDB46, 0x804F }, { 0xDB47, 0x8050 }, { 0xDB48, 0x80FE }, { 0xDB49, 0x80D4 }, { 0xDB4A, 0x8143 }, { 0xDB4B, 0x814A }, 
-	{ 0xDB4C, 0x8152 }, { 0xDB4D, 0x814F }, { 0xDB4E, 0x8147 }, { 0xDB4F, 0x813D }, { 0xDB50, 0x814D }, { 0xDB51, 0x813A }, { 0xDB52, 0x81E6 }, { 0xDB53, 0x81EE }, 
-	{ 0xDB54, 0x81F7 }, { 0xDB55, 0x81F8 }, { 0xDB56, 0x81F9 }, { 0xDB57, 0x8204 }, { 0xDB58, 0x823C }, { 0xDB59, 0x823D }, { 0xDB5A, 0x823F }, { 0xDB5B, 0x8275 }, 
-	{ 0xDB5C, 0x833B }, { 0xDB5D, 0x83CF }, { 0xDB5E, 0x83F9 }, { 0xDB5F, 0x8423 }, { 0xDB60, 0x83C0 }, { 0xDB61, 0x83E8 }, { 0xDB62, 0x8412 }, { 0xDB63, 0x83E7 }, 
-	{ 0xDB64, 0x83E4 }, { 0xDB65, 0x83FC }, { 0xDB66, 0x83F6 }, { 0xDB67, 0x8410 }, { 0xDB68, 0x83C6 }, { 0xDB69, 0x83C8 }, { 0xDB6A, 0x83EB }, { 0xDB6B, 0x83E3 }, 
-	{ 0xDB6C, 0x83BF }, { 0xDB6D, 0x8401 }, { 0xDB6E, 0x83DD }, { 0xDB6F, 0x83E5 }, { 0xDB70, 0x83D8 }, { 0xDB71, 0x83FF }, { 0xDB72, 0x83E1 }, { 0xDB73, 0x83CB }, 
-	{ 0xDB74, 0x83CE }, { 0xDB75, 0x83D6 }, { 0xDB76, 0x83F5 }, { 0xDB77, 0x83C9 }, { 0xDB78, 0x8409 }, { 0xDB79, 0x840F }, { 0xDB7A, 0x83DE }, { 0xDB7B, 0x8411 }, 
-	{ 0xDB7C, 0x8406 }, { 0xDB7D, 0x83C2 }, { 0xDB7E, 0x83F3 }, { 0xDBA1, 0x83D5 }, { 0xDBA2, 0x83FA }, { 0xDBA3, 0x83C7 }, { 0xDBA4, 0x83D1 }, { 0xDBA5, 0x83EA }, 
-	{ 0xDBA6, 0x8413 }, { 0xDBA7, 0x83C3 }, { 0xDBA8, 0x83EC }, { 0xDBA9, 0x83EE }, { 0xDBAA, 0x83C4 }, { 0xDBAB, 0x83FB }, { 0xDBAC, 0x83D7 }, { 0xDBAD, 0x83E2 }, 
-	{ 0xDBAE, 0x841B }, { 0xDBAF, 0x83DB }, { 0xDBB0, 0x83FE }, { 0xDBB1, 0x86D8 }, { 0xDBB2, 0x86E2 }, { 0xDBB3, 0x86E6 }, { 0xDBB4, 0x86D3 }, { 0xDBB5, 0x86E3 }, 
-	{ 0xDBB6, 0x86DA }, { 0xDBB7, 0x86EA }, { 0xDBB8, 0x86DD }, { 0xDBB9, 0x86EB }, { 0xDBBA, 0x86DC }, { 0xDBBB, 0x86EC }, { 0xDBBC, 0x86E9 }, { 0xDBBD, 0x86D7 }, 
-	{ 0xDBBE, 0x86E8 }, { 0xDBBF, 0x86D1 }, { 0xDBC0, 0x8848 }, { 0xDBC1, 0x8856 }, { 0xDBC2, 0x8855 }, { 0xDBC3, 0x88BA }, { 0xDBC4, 0x88D7 }, { 0xDBC5, 0x88B9 }, 
-	{ 0xDBC6, 0x88B8 }, { 0xDBC7, 0x88C0 }, { 0xDBC8, 0x88BE }, { 0xDBC9, 0x88B6 }, { 0xDBCA, 0x88BC }, { 0xDBCB, 0x88B7 }, { 0xDBCC, 0x88BD }, { 0xDBCD, 0x88B2 }, 
-	{ 0xDBCE, 0x8901 }, { 0xDBCF, 0x88C9 }, { 0xDBD0, 0x8995 }, { 0xDBD1, 0x8998 }, { 0xDBD2, 0x8997 }, { 0xDBD3, 0x89DD }, { 0xDBD4, 0x89DA }, { 0xDBD5, 0x89DB }, 
-	{ 0xDBD6, 0x8A4E }, { 0xDBD7, 0x8A4D }, { 0xDBD8, 0x8A39 }, { 0xDBD9, 0x8A59 }, { 0xDBDA, 0x8A40 }, { 0xDBDB, 0x8A57 }, { 0xDBDC, 0x8A58 }, { 0xDBDD, 0x8A44 }, 
-	{ 0xDBDE, 0x8A45 }, { 0xDBDF, 0x8A52 }, { 0xDBE0, 0x8A48 }, { 0xDBE1, 0x8A51 }, { 0xDBE2, 0x8A4A }, { 0xDBE3, 0x8A4C }, { 0xDBE4, 0x8A4F }, { 0xDBE5, 0x8C5F }, 
-	{ 0xDBE6, 0x8C81 }, { 0xDBE7, 0x8C80 }, { 0xDBE8, 0x8CBA }, { 0xDBE9, 0x8CBE }, { 0xDBEA, 0x8CB0 }, { 0xDBEB, 0x8CB9 }, { 0xDBEC, 0x8CB5 }, { 0xDBED, 0x8D84 }, 
-	{ 0xDBEE, 0x8D80 }, { 0xDBEF, 0x8D89 }, { 0xDBF0, 0x8DD8 }, { 0xDBF1, 0x8DD3 }, { 0xDBF2, 0x8DCD }, { 0xDBF3, 0x8DC7 }, { 0xDBF4, 0x8DD6 }, { 0xDBF5, 0x8DDC }, 
-	{ 0xDBF6, 0x8DCF }, { 0xDBF7, 0x8DD5 }, { 0xDBF8, 0x8DD9 }, { 0xDBF9, 0x8DC8 }, { 0xDBFA, 0x8DD7 }, { 0xDBFB, 0x8DC5 }, { 0xDBFC, 0x8EEF }, { 0xDBFD, 0x8EF7 }, 
-	{ 0xDBFE, 0x8EFA }, { 0xDC40, 0x8EF9 }, { 0xDC41, 0x8EE6 }, { 0xDC42, 0x8EEE }, { 0xDC43, 0x8EE5 }, { 0xDC44, 0x8EF5 }, { 0xDC45, 0x8EE7 }, { 0xDC46, 0x8EE8 }, 
-	{ 0xDC47, 0x8EF6 }, { 0xDC48, 0x8EEB }, { 0xDC49, 0x8EF1 }, { 0xDC4A, 0x8EEC }, { 0xDC4B, 0x8EF4 }, { 0xDC4C, 0x8EE9 }, { 0xDC4D, 0x902D }, { 0xDC4E, 0x9034 }, 
-	{ 0xDC4F, 0x902F }, { 0xDC50, 0x9106 }, { 0xDC51, 0x912C }, { 0xDC52, 0x9104 }, { 0xDC53, 0x90FF }, { 0xDC54, 0x90FC }, { 0xDC55, 0x9108 }, { 0xDC56, 0x90F9 }, 
-	{ 0xDC57, 0x90FB }, { 0xDC58, 0x9101 }, { 0xDC59, 0x9100 }, { 0xDC5A, 0x9107 }, { 0xDC5B, 0x9105 }, { 0xDC5C, 0x9103 }, { 0xDC5D, 0x9161 }, { 0xDC5E, 0x9164 }, 
-	{ 0xDC5F, 0x915F }, { 0xDC60, 0x9162 }, { 0xDC61, 0x9160 }, { 0xDC62, 0x9201 }, { 0xDC63, 0x920A }, { 0xDC64, 0x9225 }, { 0xDC65, 0x9203 }, { 0xDC66, 0x921A }, 
-	{ 0xDC67, 0x9226 }, { 0xDC68, 0x920F }, { 0xDC69, 0x920C }, { 0xDC6A, 0x9200 }, { 0xDC6B, 0x9212 }, { 0xDC6C, 0x91FF }, { 0xDC6D, 0x91FD }, { 0xDC6E, 0x9206 }, 
-	{ 0xDC6F, 0x9204 }, { 0xDC70, 0x9227 }, { 0xDC71, 0x9202 }, { 0xDC72, 0x921C }, { 0xDC73, 0x9224 }, { 0xDC74, 0x9219 }, { 0xDC75, 0x9217 }, { 0xDC76, 0x9205 }, 
-	{ 0xDC77, 0x9216 }, { 0xDC78, 0x957B }, { 0xDC79, 0x958D }, { 0xDC7A, 0x958C }, { 0xDC7B, 0x9590 }, { 0xDC7C, 0x9687 }, { 0xDC7D, 0x967E }, { 0xDC7E, 0x9688 }, 
-	{ 0xDCA1, 0x9689 }, { 0xDCA2, 0x9683 }, { 0xDCA3, 0x9680 }, { 0xDCA4, 0x96C2 }, { 0xDCA5, 0x96C8 }, { 0xDCA6, 0x96C3 }, { 0xDCA7, 0x96F1 }, { 0xDCA8, 0x96F0 }, 
-	{ 0xDCA9, 0x976C }, { 0xDCAA, 0x9770 }, { 0xDCAB, 0x976E }, { 0xDCAC, 0x9807 }, { 0xDCAD, 0x98A9 }, { 0xDCAE, 0x98EB }, { 0xDCAF, 0x9CE6 }, { 0xDCB0, 0x9EF9 }, 
-	{ 0xDCB1, 0x4E83 }, { 0xDCB2, 0x4E84 }, { 0xDCB3, 0x4EB6 }, { 0xDCB4, 0x50BD }, { 0xDCB5, 0x50BF }, { 0xDCB6, 0x50C6 }, { 0xDCB7, 0x50AE }, { 0xDCB8, 0x50C4 }, 
-	{ 0xDCB9, 0x50CA }, { 0xDCBA, 0x50B4 }, { 0xDCBB, 0x50C8 }, { 0xDCBC, 0x50C2 }, { 0xDCBD, 0x50B0 }, { 0xDCBE, 0x50C1 }, { 0xDCBF, 0x50BA }, { 0xDCC0, 0x50B1 }, 
-	{ 0xDCC1, 0x50CB }, { 0xDCC2, 0x50C9 }, { 0xDCC3, 0x50B6 }, { 0xDCC4, 0x50B8 }, { 0xDCC5, 0x51D7 }, { 0xDCC6, 0x527A }, { 0xDCC7, 0x5278 }, { 0xDCC8, 0x527B }, 
-	{ 0xDCC9, 0x527C }, { 0xDCCA, 0x55C3 }, { 0xDCCB, 0x55DB }, { 0xDCCC, 0x55CC }, { 0xDCCD, 0x55D0 }, { 0xDCCE, 0x55CB }, { 0xDCCF, 0x55CA }, { 0xDCD0, 0x55DD }, 
-	{ 0xDCD1, 0x55C0 }, { 0xDCD2, 0x55D4 }, { 0xDCD3, 0x55C4 }, { 0xDCD4, 0x55E9 }, { 0xDCD5, 0x55BF }, { 0xDCD6, 0x55D2 }, { 0xDCD7, 0x558D }, { 0xDCD8, 0x55CF }, 
-	{ 0xDCD9, 0x55D5 }, { 0xDCDA, 0x55E2 }, { 0xDCDB, 0x55D6 }, { 0xDCDC, 0x55C8 }, { 0xDCDD, 0x55F2 }, { 0xDCDE, 0x55CD }, { 0xDCDF, 0x55D9 }, { 0xDCE0, 0x55C2 }, 
-	{ 0xDCE1, 0x5714 }, { 0xDCE2, 0x5853 }, { 0xDCE3, 0x5868 }, { 0xDCE4, 0x5864 }, { 0xDCE5, 0x584F }, { 0xDCE6, 0x584D }, { 0xDCE7, 0x5849 }, { 0xDCE8, 0x586F }, 
-	{ 0xDCE9, 0x5855 }, { 0xDCEA, 0x584E }, { 0xDCEB, 0x585D }, { 0xDCEC, 0x5859 }, { 0xDCED, 0x5865 }, { 0xDCEE, 0x585B }, { 0xDCEF, 0x583D }, { 0xDCF0, 0x5863 }, 
-	{ 0xDCF1, 0x5871 }, { 0xDCF2, 0x58FC }, { 0xDCF3, 0x5AC7 }, { 0xDCF4, 0x5AC4 }, { 0xDCF5, 0x5ACB }, { 0xDCF6, 0x5ABA }, { 0xDCF7, 0x5AB8 }, { 0xDCF8, 0x5AB1 }, 
-	{ 0xDCF9, 0x5AB5 }, { 0xDCFA, 0x5AB0 }, { 0xDCFB, 0x5ABF }, { 0xDCFC, 0x5AC8 }, { 0xDCFD, 0x5ABB }, { 0xDCFE, 0x5AC6 }, { 0xDD40, 0x5AB7 }, { 0xDD41, 0x5AC0 }, 
-	{ 0xDD42, 0x5ACA }, { 0xDD43, 0x5AB4 }, { 0xDD44, 0x5AB6 }, { 0xDD45, 0x5ACD }, { 0xDD46, 0x5AB9 }, { 0xDD47, 0x5A90 }, { 0xDD48, 0x5BD6 }, { 0xDD49, 0x5BD8 }, 
-	{ 0xDD4A, 0x5BD9 }, { 0xDD4B, 0x5C1F }, { 0xDD4C, 0x5C33 }, { 0xDD4D, 0x5D71 }, { 0xDD4E, 0x5D63 }, { 0xDD4F, 0x5D4A }, { 0xDD50, 0x5D65 }, { 0xDD51, 0x5D72 }, 
-	{ 0xDD52, 0x5D6C }, { 0xDD53, 0x5D5E }, { 0xDD54, 0x5D68 }, { 0xDD55, 0x5D67 }, { 0xDD56, 0x5D62 }, { 0xDD57, 0x5DF0 }, { 0xDD58, 0x5E4F }, { 0xDD59, 0x5E4E }, 
-	{ 0xDD5A, 0x5E4A }, { 0xDD5B, 0x5E4D }, { 0xDD5C, 0x5E4B }, { 0xDD5D, 0x5EC5 }, { 0xDD5E, 0x5ECC }, { 0xDD5F, 0x5EC6 }, { 0xDD60, 0x5ECB }, { 0xDD61, 0x5EC7 }, 
-	{ 0xDD62, 0x5F40 }, { 0xDD63, 0x5FAF }, { 0xDD64, 0x5FAD }, { 0xDD65, 0x60F7 }, { 0xDD66, 0x6149 }, { 0xDD67, 0x614A }, { 0xDD68, 0x612B }, { 0xDD69, 0x6145 }, 
-	{ 0xDD6A, 0x6136 }, { 0xDD6B, 0x6132 }, { 0xDD6C, 0x612E }, { 0xDD6D, 0x6146 }, { 0xDD6E, 0x612F }, { 0xDD6F, 0x614F }, { 0xDD70, 0x6129 }, { 0xDD71, 0x6140 }, 
-	{ 0xDD72, 0x6220 }, { 0xDD73, 0x9168 }, { 0xDD74, 0x6223 }, { 0xDD75, 0x6225 }, { 0xDD76, 0x6224 }, { 0xDD77, 0x63C5 }, { 0xDD78, 0x63F1 }, { 0xDD79, 0x63EB }, 
-	{ 0xDD7A, 0x6410 }, { 0xDD7B, 0x6412 }, { 0xDD7C, 0x6409 }, { 0xDD7D, 0x6420 }, { 0xDD7E, 0x6424 }, { 0xDDA1, 0x6433 }, { 0xDDA2, 0x6443 }, { 0xDDA3, 0x641F }, 
-	{ 0xDDA4, 0x6415 }, { 0xDDA5, 0x6418 }, { 0xDDA6, 0x6439 }, { 0xDDA7, 0x6437 }, { 0xDDA8, 0x6422 }, { 0xDDA9, 0x6423 }, { 0xDDAA, 0x640C }, { 0xDDAB, 0x6426 }, 
-	{ 0xDDAC, 0x6430 }, { 0xDDAD, 0x6428 }, { 0xDDAE, 0x6441 }, { 0xDDAF, 0x6435 }, { 0xDDB0, 0x642F }, { 0xDDB1, 0x640A }, { 0xDDB2, 0x641A }, { 0xDDB3, 0x6440 }, 
-	{ 0xDDB4, 0x6425 }, { 0xDDB5, 0x6427 }, { 0xDDB6, 0x640B }, { 0xDDB7, 0x63E7 }, { 0xDDB8, 0x641B }, { 0xDDB9, 0x642E }, { 0xDDBA, 0x6421 }, { 0xDDBB, 0x640E }, 
-	{ 0xDDBC, 0x656F }, { 0xDDBD, 0x6592 }, { 0xDDBE, 0x65D3 }, { 0xDDBF, 0x6686 }, { 0xDDC0, 0x668C }, { 0xDDC1, 0x6695 }, { 0xDDC2, 0x6690 }, { 0xDDC3, 0x668B }, 
-	{ 0xDDC4, 0x668A }, { 0xDDC5, 0x6699 }, { 0xDDC6, 0x6694 }, { 0xDDC7, 0x6678 }, { 0xDDC8, 0x6720 }, { 0xDDC9, 0x6966 }, { 0xDDCA, 0x695F }, { 0xDDCB, 0x6938 }, 
-	{ 0xDDCC, 0x694E }, { 0xDDCD, 0x6962 }, { 0xDDCE, 0x6971 }, { 0xDDCF, 0x693F }, { 0xDDD0, 0x6945 }, { 0xDDD1, 0x696A }, { 0xDDD2, 0x6939 }, { 0xDDD3, 0x6942 }, 
-	{ 0xDDD4, 0x6957 }, { 0xDDD5, 0x6959 }, { 0xDDD6, 0x697A }, { 0xDDD7, 0x6948 }, { 0xDDD8, 0x6949 }, { 0xDDD9, 0x6935 }, { 0xDDDA, 0x696C }, { 0xDDDB, 0x6933 }, 
-	{ 0xDDDC, 0x693D }, { 0xDDDD, 0x6965 }, { 0xDDDE, 0x68F0 }, { 0xDDDF, 0x6978 }, { 0xDDE0, 0x6934 }, { 0xDDE1, 0x6969 }, { 0xDDE2, 0x6940 }, { 0xDDE3, 0x696F }, 
-	{ 0xDDE4, 0x6944 }, { 0xDDE5, 0x6976 }, { 0xDDE6, 0x6958 }, { 0xDDE7, 0x6941 }, { 0xDDE8, 0x6974 }, { 0xDDE9, 0x694C }, { 0xDDEA, 0x693B }, { 0xDDEB, 0x694B }, 
-	{ 0xDDEC, 0x6937 }, { 0xDDED, 0x695C }, { 0xDDEE, 0x694F }, { 0xDDEF, 0x6951 }, { 0xDDF0, 0x6932 }, { 0xDDF1, 0x6952 }, { 0xDDF2, 0x692F }, { 0xDDF3, 0x697B }, 
-	{ 0xDDF4, 0x693C }, { 0xDDF5, 0x6B46 }, { 0xDDF6, 0x6B45 }, { 0xDDF7, 0x6B43 }, { 0xDDF8, 0x6B42 }, { 0xDDF9, 0x6B48 }, { 0xDDFA, 0x6B41 }, { 0xDDFB, 0x6B9B }, 
-	{ 0xDDFC, 0xFA0D }, { 0xDDFD, 0x6BFB }, { 0xDDFE, 0x6BFC }, { 0xDE40, 0x6BF9 }, { 0xDE41, 0x6BF7 }, { 0xDE42, 0x6BF8 }, { 0xDE43, 0x6E9B }, { 0xDE44, 0x6ED6 }, 
-	{ 0xDE45, 0x6EC8 }, { 0xDE46, 0x6E8F }, { 0xDE47, 0x6EC0 }, { 0xDE48, 0x6E9F }, { 0xDE49, 0x6E93 }, { 0xDE4A, 0x6E94 }, { 0xDE4B, 0x6EA0 }, { 0xDE4C, 0x6EB1 }, 
-	{ 0xDE4D, 0x6EB9 }, { 0xDE4E, 0x6EC6 }, { 0xDE4F, 0x6ED2 }, { 0xDE50, 0x6EBD }, { 0xDE51, 0x6EC1 }, { 0xDE52, 0x6E9E }, { 0xDE53, 0x6EC9 }, { 0xDE54, 0x6EB7 }, 
-	{ 0xDE55, 0x6EB0 }, { 0xDE56, 0x6ECD }, { 0xDE57, 0x6EA6 }, { 0xDE58, 0x6ECF }, { 0xDE59, 0x6EB2 }, { 0xDE5A, 0x6EBE }, { 0xDE5B, 0x6EC3 }, { 0xDE5C, 0x6EDC }, 
-	{ 0xDE5D, 0x6ED8 }, { 0xDE5E, 0x6E99 }, { 0xDE5F, 0x6E92 }, { 0xDE60, 0x6E8E }, { 0xDE61, 0x6E8D }, { 0xDE62, 0x6EA4 }, { 0xDE63, 0x6EA1 }, { 0xDE64, 0x6EBF }, 
-	{ 0xDE65, 0x6EB3 }, { 0xDE66, 0x6ED0 }, { 0xDE67, 0x6ECA }, { 0xDE68, 0x6E97 }, { 0xDE69, 0x6EAE }, { 0xDE6A, 0x6EA3 }, { 0xDE6B, 0x7147 }, { 0xDE6C, 0x7154 }, 
-	{ 0xDE6D, 0x7152 }, { 0xDE6E, 0x7163 }, { 0xDE6F, 0x7160 }, { 0xDE70, 0x7141 }, { 0xDE71, 0x715D }, { 0xDE72, 0x7162 }, { 0xDE73, 0x7172 }, { 0xDE74, 0x7178 }, 
-	{ 0xDE75, 0x716A }, { 0xDE76, 0x7161 }, { 0xDE77, 0x7142 }, { 0xDE78, 0x7158 }, { 0xDE79, 0x7143 }, { 0xDE7A, 0x714B }, { 0xDE7B, 0x7170 }, { 0xDE7C, 0x715F }, 
-	{ 0xDE7D, 0x7150 }, { 0xDE7E, 0x7153 }, { 0xDEA1, 0x7144 }, { 0xDEA2, 0x714D }, { 0xDEA3, 0x715A }, { 0xDEA4, 0x724F }, { 0xDEA5, 0x728D }, { 0xDEA6, 0x728C }, 
-	{ 0xDEA7, 0x7291 }, { 0xDEA8, 0x7290 }, { 0xDEA9, 0x728E }, { 0xDEAA, 0x733C }, { 0xDEAB, 0x7342 }, { 0xDEAC, 0x733B }, { 0xDEAD, 0x733A }, { 0xDEAE, 0x7340 }, 
-	{ 0xDEAF, 0x734A }, { 0xDEB0, 0x7349 }, { 0xDEB1, 0x7444 }, { 0xDEB2, 0x744A }, { 0xDEB3, 0x744B }, { 0xDEB4, 0x7452 }, { 0xDEB5, 0x7451 }, { 0xDEB6, 0x7457 }, 
-	{ 0xDEB7, 0x7440 }, { 0xDEB8, 0x744F }, { 0xDEB9, 0x7450 }, { 0xDEBA, 0x744E }, { 0xDEBB, 0x7442 }, { 0xDEBC, 0x7446 }, { 0xDEBD, 0x744D }, { 0xDEBE, 0x7454 }, 
-	{ 0xDEBF, 0x74E1 }, { 0xDEC0, 0x74FF }, { 0xDEC1, 0x74FE }, { 0xDEC2, 0x74FD }, { 0xDEC3, 0x751D }, { 0xDEC4, 0x7579 }, { 0xDEC5, 0x7577 }, { 0xDEC6, 0x6983 }, 
-	{ 0xDEC7, 0x75EF }, { 0xDEC8, 0x760F }, { 0xDEC9, 0x7603 }, { 0xDECA, 0x75F7 }, { 0xDECB, 0x75FE }, { 0xDECC, 0x75FC }, { 0xDECD, 0x75F9 }, { 0xDECE, 0x75F8 }, 
-	{ 0xDECF, 0x7610 }, { 0xDED0, 0x75FB }, { 0xDED1, 0x75F6 }, { 0xDED2, 0x75ED }, { 0xDED3, 0x75F5 }, { 0xDED4, 0x75FD }, { 0xDED5, 0x7699 }, { 0xDED6, 0x76B5 }, 
-	{ 0xDED7, 0x76DD }, { 0xDED8, 0x7755 }, { 0xDED9, 0x775F }, { 0xDEDA, 0x7760 }, { 0xDEDB, 0x7752 }, { 0xDEDC, 0x7756 }, { 0xDEDD, 0x775A }, { 0xDEDE, 0x7769 }, 
-	{ 0xDEDF, 0x7767 }, { 0xDEE0, 0x7754 }, { 0xDEE1, 0x7759 }, { 0xDEE2, 0x776D }, { 0xDEE3, 0x77E0 }, { 0xDEE4, 0x7887 }, { 0xDEE5, 0x789A }, { 0xDEE6, 0x7894 }, 
-	{ 0xDEE7, 0x788F }, { 0xDEE8, 0x7884 }, { 0xDEE9, 0x7895 }, { 0xDEEA, 0x7885 }, { 0xDEEB, 0x7886 }, { 0xDEEC, 0x78A1 }, { 0xDEED, 0x7883 }, { 0xDEEE, 0x7879 }, 
-	{ 0xDEEF, 0x7899 }, { 0xDEF0, 0x7880 }, { 0xDEF1, 0x7896 }, { 0xDEF2, 0x787B }, { 0xDEF3, 0x797C }, { 0xDEF4, 0x7982 }, { 0xDEF5, 0x797D }, { 0xDEF6, 0x7979 }, 
-	{ 0xDEF7, 0x7A11 }, { 0xDEF8, 0x7A18 }, { 0xDEF9, 0x7A19 }, { 0xDEFA, 0x7A12 }, { 0xDEFB, 0x7A17 }, { 0xDEFC, 0x7A15 }, { 0xDEFD, 0x7A22 }, { 0xDEFE, 0x7A13 }, 
-	{ 0xDF40, 0x7A1B }, { 0xDF41, 0x7A10 }, { 0xDF42, 0x7AA3 }, { 0xDF43, 0x7AA2 }, { 0xDF44, 0x7A9E }, { 0xDF45, 0x7AEB }, { 0xDF46, 0x7B66 }, { 0xDF47, 0x7B64 }, 
-	{ 0xDF48, 0x7B6D }, { 0xDF49, 0x7B74 }, { 0xDF4A, 0x7B69 }, { 0xDF4B, 0x7B72 }, { 0xDF4C, 0x7B65 }, { 0xDF4D, 0x7B73 }, { 0xDF4E, 0x7B71 }, { 0xDF4F, 0x7B70 }, 
-	{ 0xDF50, 0x7B61 }, { 0xDF51, 0x7B78 }, { 0xDF52, 0x7B76 }, { 0xDF53, 0x7B63 }, { 0xDF54, 0x7CB2 }, { 0xDF55, 0x7CB4 }, { 0xDF56, 0x7CAF }, { 0xDF57, 0x7D88 }, 
-	{ 0xDF58, 0x7D86 }, { 0xDF59, 0x7D80 }, { 0xDF5A, 0x7D8D }, { 0xDF5B, 0x7D7F }, { 0xDF5C, 0x7D85 }, { 0xDF5D, 0x7D7A }, { 0xDF5E, 0x7D8E }, { 0xDF5F, 0x7D7B }, 
-	{ 0xDF60, 0x7D83 }, { 0xDF61, 0x7D7C }, { 0xDF62, 0x7D8C }, { 0xDF63, 0x7D94 }, { 0xDF64, 0x7D84 }, { 0xDF65, 0x7D7D }, { 0xDF66, 0x7D92 }, { 0xDF67, 0x7F6D }, 
-	{ 0xDF68, 0x7F6B }, { 0xDF69, 0x7F67 }, { 0xDF6A, 0x7F68 }, { 0xDF6B, 0x7F6C }, { 0xDF6C, 0x7FA6 }, { 0xDF6D, 0x7FA5 }, { 0xDF6E, 0x7FA7 }, { 0xDF6F, 0x7FDB }, 
-	{ 0xDF70, 0x7FDC }, { 0xDF71, 0x8021 }, { 0xDF72, 0x8164 }, { 0xDF73, 0x8160 }, { 0xDF74, 0x8177 }, { 0xDF75, 0x815C }, { 0xDF76, 0x8169 }, { 0xDF77, 0x815B }, 
-	{ 0xDF78, 0x8162 }, { 0xDF79, 0x8172 }, { 0xDF7A, 0x6721 }, { 0xDF7B, 0x815E }, { 0xDF7C, 0x8176 }, { 0xDF7D, 0x8167 }, { 0xDF7E, 0x816F }, { 0xDFA1, 0x8144 }, 
-	{ 0xDFA2, 0x8161 }, { 0xDFA3, 0x821D }, { 0xDFA4, 0x8249 }, { 0xDFA5, 0x8244 }, { 0xDFA6, 0x8240 }, { 0xDFA7, 0x8242 }, { 0xDFA8, 0x8245 }, { 0xDFA9, 0x84F1 }, 
-	{ 0xDFAA, 0x843F }, { 0xDFAB, 0x8456 }, { 0xDFAC, 0x8476 }, { 0xDFAD, 0x8479 }, { 0xDFAE, 0x848F }, { 0xDFAF, 0x848D }, { 0xDFB0, 0x8465 }, { 0xDFB1, 0x8451 }, 
-	{ 0xDFB2, 0x8440 }, { 0xDFB3, 0x8486 }, { 0xDFB4, 0x8467 }, { 0xDFB5, 0x8430 }, { 0xDFB6, 0x844D }, { 0xDFB7, 0x847D }, { 0xDFB8, 0x845A }, { 0xDFB9, 0x8459 }, 
-	{ 0xDFBA, 0x8474 }, { 0xDFBB, 0x8473 }, { 0xDFBC, 0x845D }, { 0xDFBD, 0x8507 }, { 0xDFBE, 0x845E }, { 0xDFBF, 0x8437 }, { 0xDFC0, 0x843A }, { 0xDFC1, 0x8434 }, 
-	{ 0xDFC2, 0x847A }, { 0xDFC3, 0x8443 }, { 0xDFC4, 0x8478 }, { 0xDFC5, 0x8432 }, { 0xDFC6, 0x8445 }, { 0xDFC7, 0x8429 }, { 0xDFC8, 0x83D9 }, { 0xDFC9, 0x844B }, 
-	{ 0xDFCA, 0x842F }, { 0xDFCB, 0x8442 }, { 0xDFCC, 0x842D }, { 0xDFCD, 0x845F }, { 0xDFCE, 0x8470 }, { 0xDFCF, 0x8439 }, { 0xDFD0, 0x844E }, { 0xDFD1, 0x844C }, 
-	{ 0xDFD2, 0x8452 }, { 0xDFD3, 0x846F }, { 0xDFD4, 0x84C5 }, { 0xDFD5, 0x848E }, { 0xDFD6, 0x843B }, { 0xDFD7, 0x8447 }, { 0xDFD8, 0x8436 }, { 0xDFD9, 0x8433 }, 
-	{ 0xDFDA, 0x8468 }, { 0xDFDB, 0x847E }, { 0xDFDC, 0x8444 }, { 0xDFDD, 0x842B }, { 0xDFDE, 0x8460 }, { 0xDFDF, 0x8454 }, { 0xDFE0, 0x846E }, { 0xDFE1, 0x8450 }, 
-	{ 0xDFE2, 0x870B }, { 0xDFE3, 0x8704 }, { 0xDFE4, 0x86F7 }, { 0xDFE5, 0x870C }, { 0xDFE6, 0x86FA }, { 0xDFE7, 0x86D6 }, { 0xDFE8, 0x86F5 }, { 0xDFE9, 0x874D }, 
-	{ 0xDFEA, 0x86F8 }, { 0xDFEB, 0x870E }, { 0xDFEC, 0x8709 }, { 0xDFED, 0x8701 }, { 0xDFEE, 0x86F6 }, { 0xDFEF, 0x870D }, { 0xDFF0, 0x8705 }, { 0xDFF1, 0x88D6 }, 
-	{ 0xDFF2, 0x88CB }, { 0xDFF3, 0x88CD }, { 0xDFF4, 0x88CE }, { 0xDFF5, 0x88DE }, { 0xDFF6, 0x88DB }, { 0xDFF7, 0x88DA }, { 0xDFF8, 0x88CC }, { 0xDFF9, 0x88D0 }, 
-	{ 0xDFFA, 0x8985 }, { 0xDFFB, 0x899B }, { 0xDFFC, 0x89DF }, { 0xDFFD, 0x89E5 }, { 0xDFFE, 0x89E4 }, { 0xE040, 0x89E1 }, { 0xE041, 0x89E0 }, { 0xE042, 0x89E2 }, 
-	{ 0xE043, 0x89DC }, { 0xE044, 0x89E6 }, { 0xE045, 0x8A76 }, { 0xE046, 0x8A86 }, { 0xE047, 0x8A7F }, { 0xE048, 0x8A61 }, { 0xE049, 0x8A3F }, { 0xE04A, 0x8A77 }, 
-	{ 0xE04B, 0x8A82 }, { 0xE04C, 0x8A84 }, { 0xE04D, 0x8A75 }, { 0xE04E, 0x8A83 }, { 0xE04F, 0x8A81 }, { 0xE050, 0x8A74 }, { 0xE051, 0x8A7A }, { 0xE052, 0x8C3C }, 
-	{ 0xE053, 0x8C4B }, { 0xE054, 0x8C4A }, { 0xE055, 0x8C65 }, { 0xE056, 0x8C64 }, { 0xE057, 0x8C66 }, { 0xE058, 0x8C86 }, { 0xE059, 0x8C84 }, { 0xE05A, 0x8C85 }, 
-	{ 0xE05B, 0x8CCC }, { 0xE05C, 0x8D68 }, { 0xE05D, 0x8D69 }, { 0xE05E, 0x8D91 }, { 0xE05F, 0x8D8C }, { 0xE060, 0x8D8E }, { 0xE061, 0x8D8F }, { 0xE062, 0x8D8D }, 
-	{ 0xE063, 0x8D93 }, { 0xE064, 0x8D94 }, { 0xE065, 0x8D90 }, { 0xE066, 0x8D92 }, { 0xE067, 0x8DF0 }, { 0xE068, 0x8DE0 }, { 0xE069, 0x8DEC }, { 0xE06A, 0x8DF1 }, 
-	{ 0xE06B, 0x8DEE }, { 0xE06C, 0x8DD0 }, { 0xE06D, 0x8DE9 }, { 0xE06E, 0x8DE3 }, { 0xE06F, 0x8DE2 }, { 0xE070, 0x8DE7 }, { 0xE071, 0x8DF2 }, { 0xE072, 0x8DEB }, 
-	{ 0xE073, 0x8DF4 }, { 0xE074, 0x8F06 }, { 0xE075, 0x8EFF }, { 0xE076, 0x8F01 }, { 0xE077, 0x8F00 }, { 0xE078, 0x8F05 }, { 0xE079, 0x8F07 }, { 0xE07A, 0x8F08 }, 
-	{ 0xE07B, 0x8F02 }, { 0xE07C, 0x8F0B }, { 0xE07D, 0x9052 }, { 0xE07E, 0x903F }, { 0xE0A1, 0x9044 }, { 0xE0A2, 0x9049 }, { 0xE0A3, 0x903D }, { 0xE0A4, 0x9110 }, 
-	{ 0xE0A5, 0x910D }, { 0xE0A6, 0x910F }, { 0xE0A7, 0x9111 }, { 0xE0A8, 0x9116 }, { 0xE0A9, 0x9114 }, { 0xE0AA, 0x910B }, { 0xE0AB, 0x910E }, { 0xE0AC, 0x916E }, 
-	{ 0xE0AD, 0x916F }, { 0xE0AE, 0x9248 }, { 0xE0AF, 0x9252 }, { 0xE0B0, 0x9230 }, { 0xE0B1, 0x923A }, { 0xE0B2, 0x9266 }, { 0xE0B3, 0x9233 }, { 0xE0B4, 0x9265 }, 
-	{ 0xE0B5, 0x925E }, { 0xE0B6, 0x9283 }, { 0xE0B7, 0x922E }, { 0xE0B8, 0x924A }, { 0xE0B9, 0x9246 }, { 0xE0BA, 0x926D }, { 0xE0BB, 0x926C }, { 0xE0BC, 0x924F }, 
-	{ 0xE0BD, 0x9260 }, { 0xE0BE, 0x9267 }, { 0xE0BF, 0x926F }, { 0xE0C0, 0x9236 }, { 0xE0C1, 0x9261 }, { 0xE0C2, 0x9270 }, { 0xE0C3, 0x9231 }, { 0xE0C4, 0x9254 }, 
-	{ 0xE0C5, 0x9263 }, { 0xE0C6, 0x9250 }, { 0xE0C7, 0x9272 }, { 0xE0C8, 0x924E }, { 0xE0C9, 0x9253 }, { 0xE0CA, 0x924C }, { 0xE0CB, 0x9256 }, { 0xE0CC, 0x9232 }, 
-	{ 0xE0CD, 0x959F }, { 0xE0CE, 0x959C }, { 0xE0CF, 0x959E }, { 0xE0D0, 0x959B }, { 0xE0D1, 0x9692 }, { 0xE0D2, 0x9693 }, { 0xE0D3, 0x9691 }, { 0xE0D4, 0x9697 }, 
-	{ 0xE0D5, 0x96CE }, { 0xE0D6, 0x96FA }, { 0xE0D7, 0x96FD }, { 0xE0D8, 0x96F8 }, { 0xE0D9, 0x96F5 }, { 0xE0DA, 0x9773 }, { 0xE0DB, 0x9777 }, { 0xE0DC, 0x9778 }, 
-	{ 0xE0DD, 0x9772 }, { 0xE0DE, 0x980F }, { 0xE0DF, 0x980D }, { 0xE0E0, 0x980E }, { 0xE0E1, 0x98AC }, { 0xE0E2, 0x98F6 }, { 0xE0E3, 0x98F9 }, { 0xE0E4, 0x99AF }, 
-	{ 0xE0E5, 0x99B2 }, { 0xE0E6, 0x99B0 }, { 0xE0E7, 0x99B5 }, { 0xE0E8, 0x9AAD }, { 0xE0E9, 0x9AAB }, { 0xE0EA, 0x9B5B }, { 0xE0EB, 0x9CEA }, { 0xE0EC, 0x9CED }, 
-	{ 0xE0ED, 0x9CE7 }, { 0xE0EE, 0x9E80 }, { 0xE0EF, 0x9EFD }, { 0xE0F0, 0x50E6 }, { 0xE0F1, 0x50D4 }, { 0xE0F2, 0x50D7 }, { 0xE0F3, 0x50E8 }, { 0xE0F4, 0x50F3 }, 
-	{ 0xE0F5, 0x50DB }, { 0xE0F6, 0x50EA }, { 0xE0F7, 0x50DD }, { 0xE0F8, 0x50E4 }, { 0xE0F9, 0x50D3 }, { 0xE0FA, 0x50EC }, { 0xE0FB, 0x50F0 }, { 0xE0FC, 0x50EF }, 
-	{ 0xE0FD, 0x50E3 }, { 0xE0FE, 0x50E0 }, { 0xE140, 0x51D8 }, { 0xE141, 0x5280 }, { 0xE142, 0x5281 }, { 0xE143, 0x52E9 }, { 0xE144, 0x52EB }, { 0xE145, 0x5330 }, 
-	{ 0xE146, 0x53AC }, { 0xE147, 0x5627 }, { 0xE148, 0x5615 }, { 0xE149, 0x560C }, { 0xE14A, 0x5612 }, { 0xE14B, 0x55FC }, { 0xE14C, 0x560F }, { 0xE14D, 0x561C }, 
-	{ 0xE14E, 0x5601 }, { 0xE14F, 0x5613 }, { 0xE150, 0x5602 }, { 0xE151, 0x55FA }, { 0xE152, 0x561D }, { 0xE153, 0x5604 }, { 0xE154, 0x55FF }, { 0xE155, 0x55F9 }, 
-	{ 0xE156, 0x5889 }, { 0xE157, 0x587C }, { 0xE158, 0x5890 }, { 0xE159, 0x5898 }, { 0xE15A, 0x5886 }, { 0xE15B, 0x5881 }, { 0xE15C, 0x587F }, { 0xE15D, 0x5874 }, 
-	{ 0xE15E, 0x588B }, { 0xE15F, 0x587A }, { 0xE160, 0x5887 }, { 0xE161, 0x5891 }, { 0xE162, 0x588E }, { 0xE163, 0x5876 }, { 0xE164, 0x5882 }, { 0xE165, 0x5888 }, 
-	{ 0xE166, 0x587B }, { 0xE167, 0x5894 }, { 0xE168, 0x588F }, { 0xE169, 0x58FE }, { 0xE16A, 0x596B }, { 0xE16B, 0x5ADC }, { 0xE16C, 0x5AEE }, { 0xE16D, 0x5AE5 }, 
-	{ 0xE16E, 0x5AD5 }, { 0xE16F, 0x5AEA }, { 0xE170, 0x5ADA }, { 0xE171, 0x5AED }, { 0xE172, 0x5AEB }, { 0xE173, 0x5AF3 }, { 0xE174, 0x5AE2 }, { 0xE175, 0x5AE0 }, 
-	{ 0xE176, 0x5ADB }, { 0xE177, 0x5AEC }, { 0xE178, 0x5ADE }, { 0xE179, 0x5ADD }, { 0xE17A, 0x5AD9 }, { 0xE17B, 0x5AE8 }, { 0xE17C, 0x5ADF }, { 0xE17D, 0x5B77 }, 
-	{ 0xE17E, 0x5BE0 }, { 0xE1A1, 0x5BE3 }, { 0xE1A2, 0x5C63 }, { 0xE1A3, 0x5D82 }, { 0xE1A4, 0x5D80 }, { 0xE1A5, 0x5D7D }, { 0xE1A6, 0x5D86 }, { 0xE1A7, 0x5D7A }, 
-	{ 0xE1A8, 0x5D81 }, { 0xE1A9, 0x5D77 }, { 0xE1AA, 0x5D8A }, { 0xE1AB, 0x5D89 }, { 0xE1AC, 0x5D88 }, { 0xE1AD, 0x5D7E }, { 0xE1AE, 0x5D7C }, { 0xE1AF, 0x5D8D }, 
-	{ 0xE1B0, 0x5D79 }, { 0xE1B1, 0x5D7F }, { 0xE1B2, 0x5E58 }, { 0xE1B3, 0x5E59 }, { 0xE1B4, 0x5E53 }, { 0xE1B5, 0x5ED8 }, { 0xE1B6, 0x5ED1 }, { 0xE1B7, 0x5ED7 }, 
-	{ 0xE1B8, 0x5ECE }, { 0xE1B9, 0x5EDC }, { 0xE1BA, 0x5ED5 }, { 0xE1BB, 0x5ED9 }, { 0xE1BC, 0x5ED2 }, { 0xE1BD, 0x5ED4 }, { 0xE1BE, 0x5F44 }, { 0xE1BF, 0x5F43 }, 
-	{ 0xE1C0, 0x5F6F }, { 0xE1C1, 0x5FB6 }, { 0xE1C2, 0x612C }, { 0xE1C3, 0x6128 }, { 0xE1C4, 0x6141 }, { 0xE1C5, 0x615E }, { 0xE1C6, 0x6171 }, { 0xE1C7, 0x6173 }, 
-	{ 0xE1C8, 0x6152 }, { 0xE1C9, 0x6153 }, { 0xE1CA, 0x6172 }, { 0xE1CB, 0x616C }, { 0xE1CC, 0x6180 }, { 0xE1CD, 0x6174 }, { 0xE1CE, 0x6154 }, { 0xE1CF, 0x617A }, 
-	{ 0xE1D0, 0x615B }, { 0xE1D1, 0x6165 }, { 0xE1D2, 0x613B }, { 0xE1D3, 0x616A }, { 0xE1D4, 0x6161 }, { 0xE1D5, 0x6156 }, { 0xE1D6, 0x6229 }, { 0xE1D7, 0x6227 }, 
-	{ 0xE1D8, 0x622B }, { 0xE1D9, 0x642B }, { 0xE1DA, 0x644D }, { 0xE1DB, 0x645B }, { 0xE1DC, 0x645D }, { 0xE1DD, 0x6474 }, { 0xE1DE, 0x6476 }, { 0xE1DF, 0x6472 }, 
-	{ 0xE1E0, 0x6473 }, { 0xE1E1, 0x647D }, { 0xE1E2, 0x6475 }, { 0xE1E3, 0x6466 }, { 0xE1E4, 0x64A6 }, { 0xE1E5, 0x644E }, { 0xE1E6, 0x6482 }, { 0xE1E7, 0x645E }, 
-	{ 0xE1E8, 0x645C }, { 0xE1E9, 0x644B }, { 0xE1EA, 0x6453 }, { 0xE1EB, 0x6460 }, { 0xE1EC, 0x6450 }, { 0xE1ED, 0x647F }, { 0xE1EE, 0x643F }, { 0xE1EF, 0x646C }, 
-	{ 0xE1F0, 0x646B }, { 0xE1F1, 0x6459 }, { 0xE1F2, 0x6465 }, { 0xE1F3, 0x6477 }, { 0xE1F4, 0x6573 }, { 0xE1F5, 0x65A0 }, { 0xE1F6, 0x66A1 }, { 0xE1F7, 0x66A0 }, 
-	{ 0xE1F8, 0x669F }, { 0xE1F9, 0x6705 }, { 0xE1FA, 0x6704 }, { 0xE1FB, 0x6722 }, { 0xE1FC, 0x69B1 }, { 0xE1FD, 0x69B6 }, { 0xE1FE, 0x69C9 }, { 0xE240, 0x69A0 }, 
-	{ 0xE241, 0x69CE }, { 0xE242, 0x6996 }, { 0xE243, 0x69B0 }, { 0xE244, 0x69AC }, { 0xE245, 0x69BC }, { 0xE246, 0x6991 }, { 0xE247, 0x6999 }, { 0xE248, 0x698E }, 
-	{ 0xE249, 0x69A7 }, { 0xE24A, 0x698D }, { 0xE24B, 0x69A9 }, { 0xE24C, 0x69BE }, { 0xE24D, 0x69AF }, { 0xE24E, 0x69BF }, { 0xE24F, 0x69C4 }, { 0xE250, 0x69BD }, 
-	{ 0xE251, 0x69A4 }, { 0xE252, 0x69D4 }, { 0xE253, 0x69B9 }, { 0xE254, 0x69CA }, { 0xE255, 0x699A }, { 0xE256, 0x69CF }, { 0xE257, 0x69B3 }, { 0xE258, 0x6993 }, 
-	{ 0xE259, 0x69AA }, { 0xE25A, 0x69A1 }, { 0xE25B, 0x699E }, { 0xE25C, 0x69D9 }, { 0xE25D, 0x6997 }, { 0xE25E, 0x6990 }, { 0xE25F, 0x69C2 }, { 0xE260, 0x69B5 }, 
-	{ 0xE261, 0x69A5 }, { 0xE262, 0x69C6 }, { 0xE263, 0x6B4A }, { 0xE264, 0x6B4D }, { 0xE265, 0x6B4B }, { 0xE266, 0x6B9E }, { 0xE267, 0x6B9F }, { 0xE268, 0x6BA0 }, 
-	{ 0xE269, 0x6BC3 }, { 0xE26A, 0x6BC4 }, { 0xE26B, 0x6BFE }, { 0xE26C, 0x6ECE }, { 0xE26D, 0x6EF5 }, { 0xE26E, 0x6EF1 }, { 0xE26F, 0x6F03 }, { 0xE270, 0x6F25 }, 
-	{ 0xE271, 0x6EF8 }, { 0xE272, 0x6F37 }, { 0xE273, 0x6EFB }, { 0xE274, 0x6F2E }, { 0xE275, 0x6F09 }, { 0xE276, 0x6F4E }, { 0xE277, 0x6F19 }, { 0xE278, 0x6F1A }, 
-	{ 0xE279, 0x6F27 }, { 0xE27A, 0x6F18 }, { 0xE27B, 0x6F3B }, { 0xE27C, 0x6F12 }, { 0xE27D, 0x6EED }, { 0xE27E, 0x6F0A }, { 0xE2A1, 0x6F36 }, { 0xE2A2, 0x6F73 }, 
-	{ 0xE2A3, 0x6EF9 }, { 0xE2A4, 0x6EEE }, { 0xE2A5, 0x6F2D }, { 0xE2A6, 0x6F40 }, { 0xE2A7, 0x6F30 }, { 0xE2A8, 0x6F3C }, { 0xE2A9, 0x6F35 }, { 0xE2AA, 0x6EEB }, 
-	{ 0xE2AB, 0x6F07 }, { 0xE2AC, 0x6F0E }, { 0xE2AD, 0x6F43 }, { 0xE2AE, 0x6F05 }, { 0xE2AF, 0x6EFD }, { 0xE2B0, 0x6EF6 }, { 0xE2B1, 0x6F39 }, { 0xE2B2, 0x6F1C }, 
-	{ 0xE2B3, 0x6EFC }, { 0xE2B4, 0x6F3A }, { 0xE2B5, 0x6F1F }, { 0xE2B6, 0x6F0D }, { 0xE2B7, 0x6F1E }, { 0xE2B8, 0x6F08 }, { 0xE2B9, 0x6F21 }, { 0xE2BA, 0x7187 }, 
-	{ 0xE2BB, 0x7190 }, { 0xE2BC, 0x7189 }, { 0xE2BD, 0x7180 }, { 0xE2BE, 0x7185 }, { 0xE2BF, 0x7182 }, { 0xE2C0, 0x718F }, { 0xE2C1, 0x717B }, { 0xE2C2, 0x7186 }, 
-	{ 0xE2C3, 0x7181 }, { 0xE2C4, 0x7197 }, { 0xE2C5, 0x7244 }, { 0xE2C6, 0x7253 }, { 0xE2C7, 0x7297 }, { 0xE2C8, 0x7295 }, { 0xE2C9, 0x7293 }, { 0xE2CA, 0x7343 }, 
-	{ 0xE2CB, 0x734D }, { 0xE2CC, 0x7351 }, { 0xE2CD, 0x734C }, { 0xE2CE, 0x7462 }, { 0xE2CF, 0x7473 }, { 0xE2D0, 0x7471 }, { 0xE2D1, 0x7475 }, { 0xE2D2, 0x7472 }, 
-	{ 0xE2D3, 0x7467 }, { 0xE2D4, 0x746E }, { 0xE2D5, 0x7500 }, { 0xE2D6, 0x7502 }, { 0xE2D7, 0x7503 }, { 0xE2D8, 0x757D }, { 0xE2D9, 0x7590 }, { 0xE2DA, 0x7616 }, 
-	{ 0xE2DB, 0x7608 }, { 0xE2DC, 0x760C }, { 0xE2DD, 0x7615 }, { 0xE2DE, 0x7611 }, { 0xE2DF, 0x760A }, { 0xE2E0, 0x7614 }, { 0xE2E1, 0x76B8 }, { 0xE2E2, 0x7781 }, 
-	{ 0xE2E3, 0x777C }, { 0xE2E4, 0x7785 }, { 0xE2E5, 0x7782 }, { 0xE2E6, 0x776E }, { 0xE2E7, 0x7780 }, { 0xE2E8, 0x776F }, { 0xE2E9, 0x777E }, { 0xE2EA, 0x7783 }, 
-	{ 0xE2EB, 0x78B2 }, { 0xE2EC, 0x78AA }, { 0xE2ED, 0x78B4 }, { 0xE2EE, 0x78AD }, { 0xE2EF, 0x78A8 }, { 0xE2F0, 0x787E }, { 0xE2F1, 0x78AB }, { 0xE2F2, 0x789E }, 
-	{ 0xE2F3, 0x78A5 }, { 0xE2F4, 0x78A0 }, { 0xE2F5, 0x78AC }, { 0xE2F6, 0x78A2 }, { 0xE2F7, 0x78A4 }, { 0xE2F8, 0x7998 }, { 0xE2F9, 0x798A }, { 0xE2FA, 0x798B }, 
-	{ 0xE2FB, 0x7996 }, { 0xE2FC, 0x7995 }, { 0xE2FD, 0x7994 }, { 0xE2FE, 0x7993 }, { 0xE340, 0x7997 }, { 0xE341, 0x7988 }, { 0xE342, 0x7992 }, { 0xE343, 0x7990 }, 
-	{ 0xE344, 0x7A2B }, { 0xE345, 0x7A4A }, { 0xE346, 0x7A30 }, { 0xE347, 0x7A2F }, { 0xE348, 0x7A28 }, { 0xE349, 0x7A26 }, { 0xE34A, 0x7AA8 }, { 0xE34B, 0x7AAB }, 
-	{ 0xE34C, 0x7AAC }, { 0xE34D, 0x7AEE }, { 0xE34E, 0x7B88 }, { 0xE34F, 0x7B9C }, { 0xE350, 0x7B8A }, { 0xE351, 0x7B91 }, { 0xE352, 0x7B90 }, { 0xE353, 0x7B96 }, 
-	{ 0xE354, 0x7B8D }, { 0xE355, 0x7B8C }, { 0xE356, 0x7B9B }, { 0xE357, 0x7B8E }, { 0xE358, 0x7B85 }, { 0xE359, 0x7B98 }, { 0xE35A, 0x5284 }, { 0xE35B, 0x7B99 }, 
-	{ 0xE35C, 0x7BA4 }, { 0xE35D, 0x7B82 }, { 0xE35E, 0x7CBB }, { 0xE35F, 0x7CBF }, { 0xE360, 0x7CBC }, { 0xE361, 0x7CBA }, { 0xE362, 0x7DA7 }, { 0xE363, 0x7DB7 }, 
-	{ 0xE364, 0x7DC2 }, { 0xE365, 0x7DA3 }, { 0xE366, 0x7DAA }, { 0xE367, 0x7DC1 }, { 0xE368, 0x7DC0 }, { 0xE369, 0x7DC5 }, { 0xE36A, 0x7D9D }, { 0xE36B, 0x7DCE }, 
-	{ 0xE36C, 0x7DC4 }, { 0xE36D, 0x7DC6 }, { 0xE36E, 0x7DCB }, { 0xE36F, 0x7DCC }, { 0xE370, 0x7DAF }, { 0xE371, 0x7DB9 }, { 0xE372, 0x7D96 }, { 0xE373, 0x7DBC }, 
-	{ 0xE374, 0x7D9F }, { 0xE375, 0x7DA6 }, { 0xE376, 0x7DAE }, { 0xE377, 0x7DA9 }, { 0xE378, 0x7DA1 }, { 0xE379, 0x7DC9 }, { 0xE37A, 0x7F73 }, { 0xE37B, 0x7FE2 }, 
-	{ 0xE37C, 0x7FE3 }, { 0xE37D, 0x7FE5 }, { 0xE37E, 0x7FDE }, { 0xE3A1, 0x8024 }, { 0xE3A2, 0x805D }, { 0xE3A3, 0x805C }, { 0xE3A4, 0x8189 }, { 0xE3A5, 0x8186 }, 
-	{ 0xE3A6, 0x8183 }, { 0xE3A7, 0x8187 }, { 0xE3A8, 0x818D }, { 0xE3A9, 0x818C }, { 0xE3AA, 0x818B }, { 0xE3AB, 0x8215 }, { 0xE3AC, 0x8497 }, { 0xE3AD, 0x84A4 }, 
-	{ 0xE3AE, 0x84A1 }, { 0xE3AF, 0x849F }, { 0xE3B0, 0x84BA }, { 0xE3B1, 0x84CE }, { 0xE3B2, 0x84C2 }, { 0xE3B3, 0x84AC }, { 0xE3B4, 0x84AE }, { 0xE3B5, 0x84AB }, 
-	{ 0xE3B6, 0x84B9 }, { 0xE3B7, 0x84B4 }, { 0xE3B8, 0x84C1 }, { 0xE3B9, 0x84CD }, { 0xE3BA, 0x84AA }, { 0xE3BB, 0x849A }, { 0xE3BC, 0x84B1 }, { 0xE3BD, 0x84D0 }, 
-	{ 0xE3BE, 0x849D }, { 0xE3BF, 0x84A7 }, { 0xE3C0, 0x84BB }, { 0xE3C1, 0x84A2 }, { 0xE3C2, 0x8494 }, { 0xE3C3, 0x84C7 }, { 0xE3C4, 0x84CC }, { 0xE3C5, 0x849B }, 
-	{ 0xE3C6, 0x84A9 }, { 0xE3C7, 0x84AF }, { 0xE3C8, 0x84A8 }, { 0xE3C9, 0x84D6 }, { 0xE3CA, 0x8498 }, { 0xE3CB, 0x84B6 }, { 0xE3CC, 0x84CF }, { 0xE3CD, 0x84A0 }, 
-	{ 0xE3CE, 0x84D7 }, { 0xE3CF, 0x84D4 }, { 0xE3D0, 0x84D2 }, { 0xE3D1, 0x84DB }, { 0xE3D2, 0x84B0 }, { 0xE3D3, 0x8491 }, { 0xE3D4, 0x8661 }, { 0xE3D5, 0x8733 }, 
-	{ 0xE3D6, 0x8723 }, { 0xE3D7, 0x8728 }, { 0xE3D8, 0x876B }, { 0xE3D9, 0x8740 }, { 0xE3DA, 0x872E }, { 0xE3DB, 0x871E }, { 0xE3DC, 0x8721 }, { 0xE3DD, 0x8719 }, 
-	{ 0xE3DE, 0x871B }, { 0xE3DF, 0x8743 }, { 0xE3E0, 0x872C }, { 0xE3E1, 0x8741 }, { 0xE3E2, 0x873E }, { 0xE3E3, 0x8746 }, { 0xE3E4, 0x8720 }, { 0xE3E5, 0x8732 }, 
-	{ 0xE3E6, 0x872A }, { 0xE3E7, 0x872D }, { 0xE3E8, 0x873C }, { 0xE3E9, 0x8712 }, { 0xE3EA, 0x873A }, { 0xE3EB, 0x8731 }, { 0xE3EC, 0x8735 }, { 0xE3ED, 0x8742 }, 
-	{ 0xE3EE, 0x8726 }, { 0xE3EF, 0x8727 }, { 0xE3F0, 0x8738 }, { 0xE3F1, 0x8724 }, { 0xE3F2, 0x871A }, { 0xE3F3, 0x8730 }, { 0xE3F4, 0x8711 }, { 0xE3F5, 0x88F7 }, 
-	{ 0xE3F6, 0x88E7 }, { 0xE3F7, 0x88F1 }, { 0xE3F8, 0x88F2 }, { 0xE3F9, 0x88FA }, { 0xE3FA, 0x88FE }, { 0xE3FB, 0x88EE }, { 0xE3FC, 0x88FC }, { 0xE3FD, 0x88F6 }, 
-	{ 0xE3FE, 0x88FB }, { 0xE440, 0x88F0 }, { 0xE441, 0x88EC }, { 0xE442, 0x88EB }, { 0xE443, 0x899D }, { 0xE444, 0x89A1 }, { 0xE445, 0x899F }, { 0xE446, 0x899E }, 
-	{ 0xE447, 0x89E9 }, { 0xE448, 0x89EB }, { 0xE449, 0x89E8 }, { 0xE44A, 0x8AAB }, { 0xE44B, 0x8A99 }, { 0xE44C, 0x8A8B }, { 0xE44D, 0x8A92 }, { 0xE44E, 0x8A8F }, 
-	{ 0xE44F, 0x8A96 }, { 0xE450, 0x8C3D }, { 0xE451, 0x8C68 }, { 0xE452, 0x8C69 }, { 0xE453, 0x8CD5 }, { 0xE454, 0x8CCF }, { 0xE455, 0x8CD7 }, { 0xE456, 0x8D96 }, 
-	{ 0xE457, 0x8E09 }, { 0xE458, 0x8E02 }, { 0xE459, 0x8DFF }, { 0xE45A, 0x8E0D }, { 0xE45B, 0x8DFD }, { 0xE45C, 0x8E0A }, { 0xE45D, 0x8E03 }, { 0xE45E, 0x8E07 }, 
-	{ 0xE45F, 0x8E06 }, { 0xE460, 0x8E05 }, { 0xE461, 0x8DFE }, { 0xE462, 0x8E00 }, { 0xE463, 0x8E04 }, { 0xE464, 0x8F10 }, { 0xE465, 0x8F11 }, { 0xE466, 0x8F0E }, 
-	{ 0xE467, 0x8F0D }, { 0xE468, 0x9123 }, { 0xE469, 0x911C }, { 0xE46A, 0x9120 }, { 0xE46B, 0x9122 }, { 0xE46C, 0x911F }, { 0xE46D, 0x911D }, { 0xE46E, 0x911A }, 
-	{ 0xE46F, 0x9124 }, { 0xE470, 0x9121 }, { 0xE471, 0x911B }, { 0xE472, 0x917A }, { 0xE473, 0x9172 }, { 0xE474, 0x9179 }, { 0xE475, 0x9173 }, { 0xE476, 0x92A5 }, 
-	{ 0xE477, 0x92A4 }, { 0xE478, 0x9276 }, { 0xE479, 0x929B }, { 0xE47A, 0x927A }, { 0xE47B, 0x92A0 }, { 0xE47C, 0x9294 }, { 0xE47D, 0x92AA }, { 0xE47E, 0x928D }, 
-	{ 0xE4A1, 0x92A6 }, { 0xE4A2, 0x929A }, { 0xE4A3, 0x92AB }, { 0xE4A4, 0x9279 }, { 0xE4A5, 0x9297 }, { 0xE4A6, 0x927F }, { 0xE4A7, 0x92A3 }, { 0xE4A8, 0x92EE }, 
-	{ 0xE4A9, 0x928E }, { 0xE4AA, 0x9282 }, { 0xE4AB, 0x9295 }, { 0xE4AC, 0x92A2 }, { 0xE4AD, 0x927D }, { 0xE4AE, 0x9288 }, { 0xE4AF, 0x92A1 }, { 0xE4B0, 0x928A }, 
-	{ 0xE4B1, 0x9286 }, { 0xE4B2, 0x928C }, { 0xE4B3, 0x9299 }, { 0xE4B4, 0x92A7 }, { 0xE4B5, 0x927E }, { 0xE4B6, 0x9287 }, { 0xE4B7, 0x92A9 }, { 0xE4B8, 0x929D }, 
-	{ 0xE4B9, 0x928B }, { 0xE4BA, 0x922D }, { 0xE4BB, 0x969E }, { 0xE4BC, 0x96A1 }, { 0xE4BD, 0x96FF }, { 0xE4BE, 0x9758 }, { 0xE4BF, 0x977D }, { 0xE4C0, 0x977A }, 
-	{ 0xE4C1, 0x977E }, { 0xE4C2, 0x9783 }, { 0xE4C3, 0x9780 }, { 0xE4C4, 0x9782 }, { 0xE4C5, 0x977B }, { 0xE4C6, 0x9784 }, { 0xE4C7, 0x9781 }, { 0xE4C8, 0x977F }, 
-	{ 0xE4C9, 0x97CE }, { 0xE4CA, 0x97CD }, { 0xE4CB, 0x9816 }, { 0xE4CC, 0x98AD }, { 0xE4CD, 0x98AE }, { 0xE4CE, 0x9902 }, { 0xE4CF, 0x9900 }, { 0xE4D0, 0x9907 }, 
-	{ 0xE4D1, 0x999D }, { 0xE4D2, 0x999C }, { 0xE4D3, 0x99C3 }, { 0xE4D4, 0x99B9 }, { 0xE4D5, 0x99BB }, { 0xE4D6, 0x99BA }, { 0xE4D7, 0x99C2 }, { 0xE4D8, 0x99BD }, 
-	{ 0xE4D9, 0x99C7 }, { 0xE4DA, 0x9AB1 }, { 0xE4DB, 0x9AE3 }, { 0xE4DC, 0x9AE7 }, { 0xE4DD, 0x9B3E }, { 0xE4DE, 0x9B3F }, { 0xE4DF, 0x9B60 }, { 0xE4E0, 0x9B61 }, 
-	{ 0xE4E1, 0x9B5F }, { 0xE4E2, 0x9CF1 }, { 0xE4E3, 0x9CF2 }, { 0xE4E4, 0x9CF5 }, { 0xE4E5, 0x9EA7 }, { 0xE4E6, 0x50FF }, { 0xE4E7, 0x5103 }, { 0xE4E8, 0x5130 }, 
-	{ 0xE4E9, 0x50F8 }, { 0xE4EA, 0x5106 }, { 0xE4EB, 0x5107 }, { 0xE4EC, 0x50F6 }, { 0xE4ED, 0x50FE }, { 0xE4EE, 0x510B }, { 0xE4EF, 0x510C }, { 0xE4F0, 0x50FD }, 
-	{ 0xE4F1, 0x510A }, { 0xE4F2, 0x528B }, { 0xE4F3, 0x528C }, { 0xE4F4, 0x52F1 }, { 0xE4F5, 0x52EF }, { 0xE4F6, 0x5648 }, { 0xE4F7, 0x5642 }, { 0xE4F8, 0x564C }, 
-	{ 0xE4F9, 0x5635 }, { 0xE4FA, 0x5641 }, { 0xE4FB, 0x564A }, { 0xE4FC, 0x5649 }, { 0xE4FD, 0x5646 }, { 0xE4FE, 0x5658 }, { 0xE540, 0x565A }, { 0xE541, 0x5640 }, 
-	{ 0xE542, 0x5633 }, { 0xE543, 0x563D }, { 0xE544, 0x562C }, { 0xE545, 0x563E }, { 0xE546, 0x5638 }, { 0xE547, 0x562A }, { 0xE548, 0x563A }, { 0xE549, 0x571A }, 
-	{ 0xE54A, 0x58AB }, { 0xE54B, 0x589D }, { 0xE54C, 0x58B1 }, { 0xE54D, 0x58A0 }, { 0xE54E, 0x58A3 }, { 0xE54F, 0x58AF }, { 0xE550, 0x58AC }, { 0xE551, 0x58A5 }, 
-	{ 0xE552, 0x58A1 }, { 0xE553, 0x58FF }, { 0xE554, 0x5AFF }, { 0xE555, 0x5AF4 }, { 0xE556, 0x5AFD }, { 0xE557, 0x5AF7 }, { 0xE558, 0x5AF6 }, { 0xE559, 0x5B03 }, 
-	{ 0xE55A, 0x5AF8 }, { 0xE55B, 0x5B02 }, { 0xE55C, 0x5AF9 }, { 0xE55D, 0x5B01 }, { 0xE55E, 0x5B07 }, { 0xE55F, 0x5B05 }, { 0xE560, 0x5B0F }, { 0xE561, 0x5C67 }, 
-	{ 0xE562, 0x5D99 }, { 0xE563, 0x5D97 }, { 0xE564, 0x5D9F }, { 0xE565, 0x5D92 }, { 0xE566, 0x5DA2 }, { 0xE567, 0x5D93 }, { 0xE568, 0x5D95 }, { 0xE569, 0x5DA0 }, 
-	{ 0xE56A, 0x5D9C }, { 0xE56B, 0x5DA1 }, { 0xE56C, 0x5D9A }, { 0xE56D, 0x5D9E }, { 0xE56E, 0x5E69 }, { 0xE56F, 0x5E5D }, { 0xE570, 0x5E60 }, { 0xE571, 0x5E5C }, 
-	{ 0xE572, 0x7DF3 }, { 0xE573, 0x5EDB }, { 0xE574, 0x5EDE }, { 0xE575, 0x5EE1 }, { 0xE576, 0x5F49 }, { 0xE577, 0x5FB2 }, { 0xE578, 0x618B }, { 0xE579, 0x6183 }, 
-	{ 0xE57A, 0x6179 }, { 0xE57B, 0x61B1 }, { 0xE57C, 0x61B0 }, { 0xE57D, 0x61A2 }, { 0xE57E, 0x6189 }, { 0xE5A1, 0x619B }, { 0xE5A2, 0x6193 }, { 0xE5A3, 0x61AF }, 
-	{ 0xE5A4, 0x61AD }, { 0xE5A5, 0x619F }, { 0xE5A6, 0x6192 }, { 0xE5A7, 0x61AA }, { 0xE5A8, 0x61A1 }, { 0xE5A9, 0x618D }, { 0xE5AA, 0x6166 }, { 0xE5AB, 0x61B3 }, 
-	{ 0xE5AC, 0x622D }, { 0xE5AD, 0x646E }, { 0xE5AE, 0x6470 }, { 0xE5AF, 0x6496 }, { 0xE5B0, 0x64A0 }, { 0xE5B1, 0x6485 }, { 0xE5B2, 0x6497 }, { 0xE5B3, 0x649C }, 
-	{ 0xE5B4, 0x648F }, { 0xE5B5, 0x648B }, { 0xE5B6, 0x648A }, { 0xE5B7, 0x648C }, { 0xE5B8, 0x64A3 }, { 0xE5B9, 0x649F }, { 0xE5BA, 0x6468 }, { 0xE5BB, 0x64B1 }, 
-	{ 0xE5BC, 0x6498 }, { 0xE5BD, 0x6576 }, { 0xE5BE, 0x657A }, { 0xE5BF, 0x6579 }, { 0xE5C0, 0x657B }, { 0xE5C1, 0x65B2 }, { 0xE5C2, 0x65B3 }, { 0xE5C3, 0x66B5 }, 
-	{ 0xE5C4, 0x66B0 }, { 0xE5C5, 0x66A9 }, { 0xE5C6, 0x66B2 }, { 0xE5C7, 0x66B7 }, { 0xE5C8, 0x66AA }, { 0xE5C9, 0x66AF }, { 0xE5CA, 0x6A00 }, { 0xE5CB, 0x6A06 }, 
-	{ 0xE5CC, 0x6A17 }, { 0xE5CD, 0x69E5 }, { 0xE5CE, 0x69F8 }, { 0xE5CF, 0x6A15 }, { 0xE5D0, 0x69F1 }, { 0xE5D1, 0x69E4 }, { 0xE5D2, 0x6A20 }, { 0xE5D3, 0x69FF }, 
-	{ 0xE5D4, 0x69EC }, { 0xE5D5, 0x69E2 }, { 0xE5D6, 0x6A1B }, { 0xE5D7, 0x6A1D }, { 0xE5D8, 0x69FE }, { 0xE5D9, 0x6A27 }, { 0xE5DA, 0x69F2 }, { 0xE5DB, 0x69EE }, 
-	{ 0xE5DC, 0x6A14 }, { 0xE5DD, 0x69F7 }, { 0xE5DE, 0x69E7 }, { 0xE5DF, 0x6A40 }, { 0xE5E0, 0x6A08 }, { 0xE5E1, 0x69E6 }, { 0xE5E2, 0x69FB }, { 0xE5E3, 0x6A0D }, 
-	{ 0xE5E4, 0x69FC }, { 0xE5E5, 0x69EB }, { 0xE5E6, 0x6A09 }, { 0xE5E7, 0x6A04 }, { 0xE5E8, 0x6A18 }, { 0xE5E9, 0x6A25 }, { 0xE5EA, 0x6A0F }, { 0xE5EB, 0x69F6 }, 
-	{ 0xE5EC, 0x6A26 }, { 0xE5ED, 0x6A07 }, { 0xE5EE, 0x69F4 }, { 0xE5EF, 0x6A16 }, { 0xE5F0, 0x6B51 }, { 0xE5F1, 0x6BA5 }, { 0xE5F2, 0x6BA3 }, { 0xE5F3, 0x6BA2 }, 
-	{ 0xE5F4, 0x6BA6 }, { 0xE5F5, 0x6C01 }, { 0xE5F6, 0x6C00 }, { 0xE5F7, 0x6BFF }, { 0xE5F8, 0x6C02 }, { 0xE5F9, 0x6F41 }, { 0xE5FA, 0x6F26 }, { 0xE5FB, 0x6F7E }, 
-	{ 0xE5FC, 0x6F87 }, { 0xE5FD, 0x6FC6 }, { 0xE5FE, 0x6F92 }, { 0xE640, 0x6F8D }, { 0xE641, 0x6F89 }, { 0xE642, 0x6F8C }, { 0xE643, 0x6F62 }, { 0xE644, 0x6F4F }, 
-	{ 0xE645, 0x6F85 }, { 0xE646, 0x6F5A }, { 0xE647, 0x6F96 }, { 0xE648, 0x6F76 }, { 0xE649, 0x6F6C }, { 0xE64A, 0x6F82 }, { 0xE64B, 0x6F55 }, { 0xE64C, 0x6F72 }, 
-	{ 0xE64D, 0x6F52 }, { 0xE64E, 0x6F50 }, { 0xE64F, 0x6F57 }, { 0xE650, 0x6F94 }, { 0xE651, 0x6F93 }, { 0xE652, 0x6F5D }, { 0xE653, 0x6F00 }, { 0xE654, 0x6F61 }, 
-	{ 0xE655, 0x6F6B }, { 0xE656, 0x6F7D }, { 0xE657, 0x6F67 }, { 0xE658, 0x6F90 }, { 0xE659, 0x6F53 }, { 0xE65A, 0x6F8B }, { 0xE65B, 0x6F69 }, { 0xE65C, 0x6F7F }, 
-	{ 0xE65D, 0x6F95 }, { 0xE65E, 0x6F63 }, { 0xE65F, 0x6F77 }, { 0xE660, 0x6F6A }, { 0xE661, 0x6F7B }, { 0xE662, 0x71B2 }, { 0xE663, 0x71AF }, { 0xE664, 0x719B }, 
-	{ 0xE665, 0x71B0 }, { 0xE666, 0x71A0 }, { 0xE667, 0x719A }, { 0xE668, 0x71A9 }, { 0xE669, 0x71B5 }, { 0xE66A, 0x719D }, { 0xE66B, 0x71A5 }, { 0xE66C, 0x719E }, 
-	{ 0xE66D, 0x71A4 }, { 0xE66E, 0x71A1 }, { 0xE66F, 0x71AA }, { 0xE670, 0x719C }, { 0xE671, 0x71A7 }, { 0xE672, 0x71B3 }, { 0xE673, 0x7298 }, { 0xE674, 0x729A }, 
-	{ 0xE675, 0x7358 }, { 0xE676, 0x7352 }, { 0xE677, 0x735E }, { 0xE678, 0x735F }, { 0xE679, 0x7360 }, { 0xE67A, 0x735D }, { 0xE67B, 0x735B }, { 0xE67C, 0x7361 }, 
-	{ 0xE67D, 0x735A }, { 0xE67E, 0x7359 }, { 0xE6A1, 0x7362 }, { 0xE6A2, 0x7487 }, { 0xE6A3, 0x7489 }, { 0xE6A4, 0x748A }, { 0xE6A5, 0x7486 }, { 0xE6A6, 0x7481 }, 
-	{ 0xE6A7, 0x747D }, { 0xE6A8, 0x7485 }, { 0xE6A9, 0x7488 }, { 0xE6AA, 0x747C }, { 0xE6AB, 0x7479 }, { 0xE6AC, 0x7508 }, { 0xE6AD, 0x7507 }, { 0xE6AE, 0x757E }, 
-	{ 0xE6AF, 0x7625 }, { 0xE6B0, 0x761E }, { 0xE6B1, 0x7619 }, { 0xE6B2, 0x761D }, { 0xE6B3, 0x761C }, { 0xE6B4, 0x7623 }, { 0xE6B5, 0x761A }, { 0xE6B6, 0x7628 }, 
-	{ 0xE6B7, 0x761B }, { 0xE6B8, 0x769C }, { 0xE6B9, 0x769D }, { 0xE6BA, 0x769E }, { 0xE6BB, 0x769B }, { 0xE6BC, 0x778D }, { 0xE6BD, 0x778F }, { 0xE6BE, 0x7789 }, 
-	{ 0xE6BF, 0x7788 }, { 0xE6C0, 0x78CD }, { 0xE6C1, 0x78BB }, { 0xE6C2, 0x78CF }, { 0xE6C3, 0x78CC }, { 0xE6C4, 0x78D1 }, { 0xE6C5, 0x78CE }, { 0xE6C6, 0x78D4 }, 
-	{ 0xE6C7, 0x78C8 }, { 0xE6C8, 0x78C3 }, { 0xE6C9, 0x78C4 }, { 0xE6CA, 0x78C9 }, { 0xE6CB, 0x799A }, { 0xE6CC, 0x79A1 }, { 0xE6CD, 0x79A0 }, { 0xE6CE, 0x799C }, 
-	{ 0xE6CF, 0x79A2 }, { 0xE6D0, 0x799B }, { 0xE6D1, 0x6B76 }, { 0xE6D2, 0x7A39 }, { 0xE6D3, 0x7AB2 }, { 0xE6D4, 0x7AB4 }, { 0xE6D5, 0x7AB3 }, { 0xE6D6, 0x7BB7 }, 
-	{ 0xE6D7, 0x7BCB }, { 0xE6D8, 0x7BBE }, { 0xE6D9, 0x7BAC }, { 0xE6DA, 0x7BCE }, { 0xE6DB, 0x7BAF }, { 0xE6DC, 0x7BB9 }, { 0xE6DD, 0x7BCA }, { 0xE6DE, 0x7BB5 }, 
-	{ 0xE6DF, 0x7CC5 }, { 0xE6E0, 0x7CC8 }, { 0xE6E1, 0x7CCC }, { 0xE6E2, 0x7CCB }, { 0xE6E3, 0x7DF7 }, { 0xE6E4, 0x7DDB }, { 0xE6E5, 0x7DEA }, { 0xE6E6, 0x7DE7 }, 
-	{ 0xE6E7, 0x7DD7 }, { 0xE6E8, 0x7DE1 }, { 0xE6E9, 0x7E03 }, { 0xE6EA, 0x7DFA }, { 0xE6EB, 0x7DE6 }, { 0xE6EC, 0x7DF6 }, { 0xE6ED, 0x7DF1 }, { 0xE6EE, 0x7DF0 }, 
-	{ 0xE6EF, 0x7DEE }, { 0xE6F0, 0x7DDF }, { 0xE6F1, 0x7F76 }, { 0xE6F2, 0x7FAC }, { 0xE6F3, 0x7FB0 }, { 0xE6F4, 0x7FAD }, { 0xE6F5, 0x7FED }, { 0xE6F6, 0x7FEB }, 
-	{ 0xE6F7, 0x7FEA }, { 0xE6F8, 0x7FEC }, { 0xE6F9, 0x7FE6 }, { 0xE6FA, 0x7FE8 }, { 0xE6FB, 0x8064 }, { 0xE6FC, 0x8067 }, { 0xE6FD, 0x81A3 }, { 0xE6FE, 0x819F }, 
-	{ 0xE740, 0x819E }, { 0xE741, 0x8195 }, { 0xE742, 0x81A2 }, { 0xE743, 0x8199 }, { 0xE744, 0x8197 }, { 0xE745, 0x8216 }, { 0xE746, 0x824F }, { 0xE747, 0x8253 }, 
-	{ 0xE748, 0x8252 }, { 0xE749, 0x8250 }, { 0xE74A, 0x824E }, { 0xE74B, 0x8251 }, { 0xE74C, 0x8524 }, { 0xE74D, 0x853B }, { 0xE74E, 0x850F }, { 0xE74F, 0x8500 }, 
-	{ 0xE750, 0x8529 }, { 0xE751, 0x850E }, { 0xE752, 0x8509 }, { 0xE753, 0x850D }, { 0xE754, 0x851F }, { 0xE755, 0x850A }, { 0xE756, 0x8527 }, { 0xE757, 0x851C }, 
-	{ 0xE758, 0x84FB }, { 0xE759, 0x852B }, { 0xE75A, 0x84FA }, { 0xE75B, 0x8508 }, { 0xE75C, 0x850C }, { 0xE75D, 0x84F4 }, { 0xE75E, 0x852A }, { 0xE75F, 0x84F2 }, 
-	{ 0xE760, 0x8515 }, { 0xE761, 0x84F7 }, { 0xE762, 0x84EB }, { 0xE763, 0x84F3 }, { 0xE764, 0x84FC }, { 0xE765, 0x8512 }, { 0xE766, 0x84EA }, { 0xE767, 0x84E9 }, 
-	{ 0xE768, 0x8516 }, { 0xE769, 0x84FE }, { 0xE76A, 0x8528 }, { 0xE76B, 0x851D }, { 0xE76C, 0x852E }, { 0xE76D, 0x8502 }, { 0xE76E, 0x84FD }, { 0xE76F, 0x851E }, 
-	{ 0xE770, 0x84F6 }, { 0xE771, 0x8531 }, { 0xE772, 0x8526 }, { 0xE773, 0x84E7 }, { 0xE774, 0x84E8 }, { 0xE775, 0x84F0 }, { 0xE776, 0x84EF }, { 0xE777, 0x84F9 }, 
-	{ 0xE778, 0x8518 }, { 0xE779, 0x8520 }, { 0xE77A, 0x8530 }, { 0xE77B, 0x850B }, { 0xE77C, 0x8519 }, { 0xE77D, 0x852F }, { 0xE77E, 0x8662 }, { 0xE7A1, 0x8756 }, 
-	{ 0xE7A2, 0x8763 }, { 0xE7A3, 0x8764 }, { 0xE7A4, 0x8777 }, { 0xE7A5, 0x87E1 }, { 0xE7A6, 0x8773 }, { 0xE7A7, 0x8758 }, { 0xE7A8, 0x8754 }, { 0xE7A9, 0x875B }, 
-	{ 0xE7AA, 0x8752 }, { 0xE7AB, 0x8761 }, { 0xE7AC, 0x875A }, { 0xE7AD, 0x8751 }, { 0xE7AE, 0x875E }, { 0xE7AF, 0x876D }, { 0xE7B0, 0x876A }, { 0xE7B1, 0x8750 }, 
-	{ 0xE7B2, 0x874E }, { 0xE7B3, 0x875F }, { 0xE7B4, 0x875D }, { 0xE7B5, 0x876F }, { 0xE7B6, 0x876C }, { 0xE7B7, 0x877A }, { 0xE7B8, 0x876E }, { 0xE7B9, 0x875C }, 
-	{ 0xE7BA, 0x8765 }, { 0xE7BB, 0x874F }, { 0xE7BC, 0x877B }, { 0xE7BD, 0x8775 }, { 0xE7BE, 0x8762 }, { 0xE7BF, 0x8767 }, { 0xE7C0, 0x8769 }, { 0xE7C1, 0x885A }, 
-	{ 0xE7C2, 0x8905 }, { 0xE7C3, 0x890C }, { 0xE7C4, 0x8914 }, { 0xE7C5, 0x890B }, { 0xE7C6, 0x8917 }, { 0xE7C7, 0x8918 }, { 0xE7C8, 0x8919 }, { 0xE7C9, 0x8906 }, 
-	{ 0xE7CA, 0x8916 }, { 0xE7CB, 0x8911 }, { 0xE7CC, 0x890E }, { 0xE7CD, 0x8909 }, { 0xE7CE, 0x89A2 }, { 0xE7CF, 0x89A4 }, { 0xE7D0, 0x89A3 }, { 0xE7D1, 0x89ED }, 
-	{ 0xE7D2, 0x89F0 }, { 0xE7D3, 0x89EC }, { 0xE7D4, 0x8ACF }, { 0xE7D5, 0x8AC6 }, { 0xE7D6, 0x8AB8 }, { 0xE7D7, 0x8AD3 }, { 0xE7D8, 0x8AD1 }, { 0xE7D9, 0x8AD4 }, 
-	{ 0xE7DA, 0x8AD5 }, { 0xE7DB, 0x8ABB }, { 0xE7DC, 0x8AD7 }, { 0xE7DD, 0x8ABE }, { 0xE7DE, 0x8AC0 }, { 0xE7DF, 0x8AC5 }, { 0xE7E0, 0x8AD8 }, { 0xE7E1, 0x8AC3 }, 
-	{ 0xE7E2, 0x8ABA }, { 0xE7E3, 0x8ABD }, { 0xE7E4, 0x8AD9 }, { 0xE7E5, 0x8C3E }, { 0xE7E6, 0x8C4D }, { 0xE7E7, 0x8C8F }, { 0xE7E8, 0x8CE5 }, { 0xE7E9, 0x8CDF }, 
-	{ 0xE7EA, 0x8CD9 }, { 0xE7EB, 0x8CE8 }, { 0xE7EC, 0x8CDA }, { 0xE7ED, 0x8CDD }, { 0xE7EE, 0x8CE7 }, { 0xE7EF, 0x8DA0 }, { 0xE7F0, 0x8D9C }, { 0xE7F1, 0x8DA1 }, 
-	{ 0xE7F2, 0x8D9B }, { 0xE7F3, 0x8E20 }, { 0xE7F4, 0x8E23 }, { 0xE7F5, 0x8E25 }, { 0xE7F6, 0x8E24 }, { 0xE7F7, 0x8E2E }, { 0xE7F8, 0x8E15 }, { 0xE7F9, 0x8E1B }, 
-	{ 0xE7FA, 0x8E16 }, { 0xE7FB, 0x8E11 }, { 0xE7FC, 0x8E19 }, { 0xE7FD, 0x8E26 }, { 0xE7FE, 0x8E27 }, { 0xE840, 0x8E14 }, { 0xE841, 0x8E12 }, { 0xE842, 0x8E18 }, 
-	{ 0xE843, 0x8E13 }, { 0xE844, 0x8E1C }, { 0xE845, 0x8E17 }, { 0xE846, 0x8E1A }, { 0xE847, 0x8F2C }, { 0xE848, 0x8F24 }, { 0xE849, 0x8F18 }, { 0xE84A, 0x8F1A }, 
-	{ 0xE84B, 0x8F20 }, { 0xE84C, 0x8F23 }, { 0xE84D, 0x8F16 }, { 0xE84E, 0x8F17 }, { 0xE84F, 0x9073 }, { 0xE850, 0x9070 }, { 0xE851, 0x906F }, { 0xE852, 0x9067 }, 
-	{ 0xE853, 0x906B }, { 0xE854, 0x912F }, { 0xE855, 0x912B }, { 0xE856, 0x9129 }, { 0xE857, 0x912A }, { 0xE858, 0x9132 }, { 0xE859, 0x9126 }, { 0xE85A, 0x912E }, 
-	{ 0xE85B, 0x9185 }, { 0xE85C, 0x9186 }, { 0xE85D, 0x918A }, { 0xE85E, 0x9181 }, { 0xE85F, 0x9182 }, { 0xE860, 0x9184 }, { 0xE861, 0x9180 }, { 0xE862, 0x92D0 }, 
-	{ 0xE863, 0x92C3 }, { 0xE864, 0x92C4 }, { 0xE865, 0x92C0 }, { 0xE866, 0x92D9 }, { 0xE867, 0x92B6 }, { 0xE868, 0x92CF }, { 0xE869, 0x92F1 }, { 0xE86A, 0x92DF }, 
-	{ 0xE86B, 0x92D8 }, { 0xE86C, 0x92E9 }, { 0xE86D, 0x92D7 }, { 0xE86E, 0x92DD }, { 0xE86F, 0x92CC }, { 0xE870, 0x92EF }, { 0xE871, 0x92C2 }, { 0xE872, 0x92E8 }, 
-	{ 0xE873, 0x92CA }, { 0xE874, 0x92C8 }, { 0xE875, 0x92CE }, { 0xE876, 0x92E6 }, { 0xE877, 0x92CD }, { 0xE878, 0x92D5 }, { 0xE879, 0x92C9 }, { 0xE87A, 0x92E0 }, 
-	{ 0xE87B, 0x92DE }, { 0xE87C, 0x92E7 }, { 0xE87D, 0x92D1 }, { 0xE87E, 0x92D3 }, { 0xE8A1, 0x92B5 }, { 0xE8A2, 0x92E1 }, { 0xE8A3, 0x92C6 }, { 0xE8A4, 0x92B4 }, 
-	{ 0xE8A5, 0x957C }, { 0xE8A6, 0x95AC }, { 0xE8A7, 0x95AB }, { 0xE8A8, 0x95AE }, { 0xE8A9, 0x95B0 }, { 0xE8AA, 0x96A4 }, { 0xE8AB, 0x96A2 }, { 0xE8AC, 0x96D3 }, 
-	{ 0xE8AD, 0x9705 }, { 0xE8AE, 0x9708 }, { 0xE8AF, 0x9702 }, { 0xE8B0, 0x975A }, { 0xE8B1, 0x978A }, { 0xE8B2, 0x978E }, { 0xE8B3, 0x9788 }, { 0xE8B4, 0x97D0 }, 
-	{ 0xE8B5, 0x97CF }, { 0xE8B6, 0x981E }, { 0xE8B7, 0x981D }, { 0xE8B8, 0x9826 }, { 0xE8B9, 0x9829 }, { 0xE8BA, 0x9828 }, { 0xE8BB, 0x9820 }, { 0xE8BC, 0x981B }, 
-	{ 0xE8BD, 0x9827 }, { 0xE8BE, 0x98B2 }, { 0xE8BF, 0x9908 }, { 0xE8C0, 0x98FA }, { 0xE8C1, 0x9911 }, { 0xE8C2, 0x9914 }, { 0xE8C3, 0x9916 }, { 0xE8C4, 0x9917 }, 
-	{ 0xE8C5, 0x9915 }, { 0xE8C6, 0x99DC }, { 0xE8C7, 0x99CD }, { 0xE8C8, 0x99CF }, { 0xE8C9, 0x99D3 }, { 0xE8CA, 0x99D4 }, { 0xE8CB, 0x99CE }, { 0xE8CC, 0x99C9 }, 
-	{ 0xE8CD, 0x99D6 }, { 0xE8CE, 0x99D8 }, { 0xE8CF, 0x99CB }, { 0xE8D0, 0x99D7 }, { 0xE8D1, 0x99CC }, { 0xE8D2, 0x9AB3 }, { 0xE8D3, 0x9AEC }, { 0xE8D4, 0x9AEB }, 
-	{ 0xE8D5, 0x9AF3 }, { 0xE8D6, 0x9AF2 }, { 0xE8D7, 0x9AF1 }, { 0xE8D8, 0x9B46 }, { 0xE8D9, 0x9B43 }, { 0xE8DA, 0x9B67 }, { 0xE8DB, 0x9B74 }, { 0xE8DC, 0x9B71 }, 
-	{ 0xE8DD, 0x9B66 }, { 0xE8DE, 0x9B76 }, { 0xE8DF, 0x9B75 }, { 0xE8E0, 0x9B70 }, { 0xE8E1, 0x9B68 }, { 0xE8E2, 0x9B64 }, { 0xE8E3, 0x9B6C }, { 0xE8E4, 0x9CFC }, 
-	{ 0xE8E5, 0x9CFA }, { 0xE8E6, 0x9CFD }, { 0xE8E7, 0x9CFF }, { 0xE8E8, 0x9CF7 }, { 0xE8E9, 0x9D07 }, { 0xE8EA, 0x9D00 }, { 0xE8EB, 0x9CF9 }, { 0xE8EC, 0x9CFB }, 
-	{ 0xE8ED, 0x9D08 }, { 0xE8EE, 0x9D05 }, { 0xE8EF, 0x9D04 }, { 0xE8F0, 0x9E83 }, { 0xE8F1, 0x9ED3 }, { 0xE8F2, 0x9F0F }, { 0xE8F3, 0x9F10 }, { 0xE8F4, 0x511C }, 
-	{ 0xE8F5, 0x5113 }, { 0xE8F6, 0x5117 }, { 0xE8F7, 0x511A }, { 0xE8F8, 0x5111 }, { 0xE8F9, 0x51DE }, { 0xE8FA, 0x5334 }, { 0xE8FB, 0x53E1 }, { 0xE8FC, 0x5670 }, 
-	{ 0xE8FD, 0x5660 }, { 0xE8FE, 0x566E }, { 0xE940, 0x5673 }, { 0xE941, 0x5666 }, { 0xE942, 0x5663 }, { 0xE943, 0x566D }, { 0xE944, 0x5672 }, { 0xE945, 0x565E }, 
-	{ 0xE946, 0x5677 }, { 0xE947, 0x571C }, { 0xE948, 0x571B }, { 0xE949, 0x58C8 }, { 0xE94A, 0x58BD }, { 0xE94B, 0x58C9 }, { 0xE94C, 0x58BF }, { 0xE94D, 0x58BA }, 
-	{ 0xE94E, 0x58C2 }, { 0xE94F, 0x58BC }, { 0xE950, 0x58C6 }, { 0xE951, 0x5B17 }, { 0xE952, 0x5B19 }, { 0xE953, 0x5B1B }, { 0xE954, 0x5B21 }, { 0xE955, 0x5B14 }, 
-	{ 0xE956, 0x5B13 }, { 0xE957, 0x5B10 }, { 0xE958, 0x5B16 }, { 0xE959, 0x5B28 }, { 0xE95A, 0x5B1A }, { 0xE95B, 0x5B20 }, { 0xE95C, 0x5B1E }, { 0xE95D, 0x5BEF }, 
-	{ 0xE95E, 0x5DAC }, { 0xE95F, 0x5DB1 }, { 0xE960, 0x5DA9 }, { 0xE961, 0x5DA7 }, { 0xE962, 0x5DB5 }, { 0xE963, 0x5DB0 }, { 0xE964, 0x5DAE }, { 0xE965, 0x5DAA }, 
-	{ 0xE966, 0x5DA8 }, { 0xE967, 0x5DB2 }, { 0xE968, 0x5DAD }, { 0xE969, 0x5DAF }, { 0xE96A, 0x5DB4 }, { 0xE96B, 0x5E67 }, { 0xE96C, 0x5E68 }, { 0xE96D, 0x5E66 }, 
-	{ 0xE96E, 0x5E6F }, { 0xE96F, 0x5EE9 }, { 0xE970, 0x5EE7 }, { 0xE971, 0x5EE6 }, { 0xE972, 0x5EE8 }, { 0xE973, 0x5EE5 }, { 0xE974, 0x5F4B }, { 0xE975, 0x5FBC }, 
-	{ 0xE976, 0x619D }, { 0xE977, 0x61A8 }, { 0xE978, 0x6196 }, { 0xE979, 0x61C5 }, { 0xE97A, 0x61B4 }, { 0xE97B, 0x61C6 }, { 0xE97C, 0x61C1 }, { 0xE97D, 0x61CC }, 
-	{ 0xE97E, 0x61BA }, { 0xE9A1, 0x61BF }, { 0xE9A2, 0x61B8 }, { 0xE9A3, 0x618C }, { 0xE9A4, 0x64D7 }, { 0xE9A5, 0x64D6 }, { 0xE9A6, 0x64D0 }, { 0xE9A7, 0x64CF }, 
-	{ 0xE9A8, 0x64C9 }, { 0xE9A9, 0x64BD }, { 0xE9AA, 0x6489 }, { 0xE9AB, 0x64C3 }, { 0xE9AC, 0x64DB }, { 0xE9AD, 0x64F3 }, { 0xE9AE, 0x64D9 }, { 0xE9AF, 0x6533 }, 
-	{ 0xE9B0, 0x657F }, { 0xE9B1, 0x657C }, { 0xE9B2, 0x65A2 }, { 0xE9B3, 0x66C8 }, { 0xE9B4, 0x66BE }, { 0xE9B5, 0x66C0 }, { 0xE9B6, 0x66CA }, { 0xE9B7, 0x66CB }, 
-	{ 0xE9B8, 0x66CF }, { 0xE9B9, 0x66BD }, { 0xE9BA, 0x66BB }, { 0xE9BB, 0x66BA }, { 0xE9BC, 0x66CC }, { 0xE9BD, 0x6723 }, { 0xE9BE, 0x6A34 }, { 0xE9BF, 0x6A66 }, 
-	{ 0xE9C0, 0x6A49 }, { 0xE9C1, 0x6A67 }, { 0xE9C2, 0x6A32 }, { 0xE9C3, 0x6A68 }, { 0xE9C4, 0x6A3E }, { 0xE9C5, 0x6A5D }, { 0xE9C6, 0x6A6D }, { 0xE9C7, 0x6A76 }, 
-	{ 0xE9C8, 0x6A5B }, { 0xE9C9, 0x6A51 }, { 0xE9CA, 0x6A28 }, { 0xE9CB, 0x6A5A }, { 0xE9CC, 0x6A3B }, { 0xE9CD, 0x6A3F }, { 0xE9CE, 0x6A41 }, { 0xE9CF, 0x6A6A }, 
-	{ 0xE9D0, 0x6A64 }, { 0xE9D1, 0x6A50 }, { 0xE9D2, 0x6A4F }, { 0xE9D3, 0x6A54 }, { 0xE9D4, 0x6A6F }, { 0xE9D5, 0x6A69 }, { 0xE9D6, 0x6A60 }, { 0xE9D7, 0x6A3C }, 
-	{ 0xE9D8, 0x6A5E }, { 0xE9D9, 0x6A56 }, { 0xE9DA, 0x6A55 }, { 0xE9DB, 0x6A4D }, { 0xE9DC, 0x6A4E }, { 0xE9DD, 0x6A46 }, { 0xE9DE, 0x6B55 }, { 0xE9DF, 0x6B54 }, 
-	{ 0xE9E0, 0x6B56 }, { 0xE9E1, 0x6BA7 }, { 0xE9E2, 0x6BAA }, { 0xE9E3, 0x6BAB }, { 0xE9E4, 0x6BC8 }, { 0xE9E5, 0x6BC7 }, { 0xE9E6, 0x6C04 }, { 0xE9E7, 0x6C03 }, 
-	{ 0xE9E8, 0x6C06 }, { 0xE9E9, 0x6FAD }, { 0xE9EA, 0x6FCB }, { 0xE9EB, 0x6FA3 }, { 0xE9EC, 0x6FC7 }, { 0xE9ED, 0x6FBC }, { 0xE9EE, 0x6FCE }, { 0xE9EF, 0x6FC8 }, 
-	{ 0xE9F0, 0x6F5E }, { 0xE9F1, 0x6FC4 }, { 0xE9F2, 0x6FBD }, { 0xE9F3, 0x6F9E }, { 0xE9F4, 0x6FCA }, { 0xE9F5, 0x6FA8 }, { 0xE9F6, 0x7004 }, { 0xE9F7, 0x6FA5 }, 
-	{ 0xE9F8, 0x6FAE }, { 0xE9F9, 0x6FBA }, { 0xE9FA, 0x6FAC }, { 0xE9FB, 0x6FAA }, { 0xE9FC, 0x6FCF }, { 0xE9FD, 0x6FBF }, { 0xE9FE, 0x6FB8 }, { 0xEA40, 0x6FA2 }, 
-	{ 0xEA41, 0x6FC9 }, { 0xEA42, 0x6FAB }, { 0xEA43, 0x6FCD }, { 0xEA44, 0x6FAF }, { 0xEA45, 0x6FB2 }, { 0xEA46, 0x6FB0 }, { 0xEA47, 0x71C5 }, { 0xEA48, 0x71C2 }, 
-	{ 0xEA49, 0x71BF }, { 0xEA4A, 0x71B8 }, { 0xEA4B, 0x71D6 }, { 0xEA4C, 0x71C0 }, { 0xEA4D, 0x71C1 }, { 0xEA4E, 0x71CB }, { 0xEA4F, 0x71D4 }, { 0xEA50, 0x71CA }, 
-	{ 0xEA51, 0x71C7 }, { 0xEA52, 0x71CF }, { 0xEA53, 0x71BD }, { 0xEA54, 0x71D8 }, { 0xEA55, 0x71BC }, { 0xEA56, 0x71C6 }, { 0xEA57, 0x71DA }, { 0xEA58, 0x71DB }, 
-	{ 0xEA59, 0x729D }, { 0xEA5A, 0x729E }, { 0xEA5B, 0x7369 }, { 0xEA5C, 0x7366 }, { 0xEA5D, 0x7367 }, { 0xEA5E, 0x736C }, { 0xEA5F, 0x7365 }, { 0xEA60, 0x736B }, 
-	{ 0xEA61, 0x736A }, { 0xEA62, 0x747F }, { 0xEA63, 0x749A }, { 0xEA64, 0x74A0 }, { 0xEA65, 0x7494 }, { 0xEA66, 0x7492 }, { 0xEA67, 0x7495 }, { 0xEA68, 0x74A1 }, 
-	{ 0xEA69, 0x750B }, { 0xEA6A, 0x7580 }, { 0xEA6B, 0x762F }, { 0xEA6C, 0x762D }, { 0xEA6D, 0x7631 }, { 0xEA6E, 0x763D }, { 0xEA6F, 0x7633 }, { 0xEA70, 0x763C }, 
-	{ 0xEA71, 0x7635 }, { 0xEA72, 0x7632 }, { 0xEA73, 0x7630 }, { 0xEA74, 0x76BB }, { 0xEA75, 0x76E6 }, { 0xEA76, 0x779A }, { 0xEA77, 0x779D }, { 0xEA78, 0x77A1 }, 
-	{ 0xEA79, 0x779C }, { 0xEA7A, 0x779B }, { 0xEA7B, 0x77A2 }, { 0xEA7C, 0x77A3 }, { 0xEA7D, 0x7795 }, { 0xEA7E, 0x7799 }, { 0xEAA1, 0x7797 }, { 0xEAA2, 0x78DD }, 
-	{ 0xEAA3, 0x78E9 }, { 0xEAA4, 0x78E5 }, { 0xEAA5, 0x78EA }, { 0xEAA6, 0x78DE }, { 0xEAA7, 0x78E3 }, { 0xEAA8, 0x78DB }, { 0xEAA9, 0x78E1 }, { 0xEAAA, 0x78E2 }, 
-	{ 0xEAAB, 0x78ED }, { 0xEAAC, 0x78DF }, { 0xEAAD, 0x78E0 }, { 0xEAAE, 0x79A4 }, { 0xEAAF, 0x7A44 }, { 0xEAB0, 0x7A48 }, { 0xEAB1, 0x7A47 }, { 0xEAB2, 0x7AB6 }, 
-	{ 0xEAB3, 0x7AB8 }, { 0xEAB4, 0x7AB5 }, { 0xEAB5, 0x7AB1 }, { 0xEAB6, 0x7AB7 }, { 0xEAB7, 0x7BDE }, { 0xEAB8, 0x7BE3 }, { 0xEAB9, 0x7BE7 }, { 0xEABA, 0x7BDD }, 
-	{ 0xEABB, 0x7BD5 }, { 0xEABC, 0x7BE5 }, { 0xEABD, 0x7BDA }, { 0xEABE, 0x7BE8 }, { 0xEABF, 0x7BF9 }, { 0xEAC0, 0x7BD4 }, { 0xEAC1, 0x7BEA }, { 0xEAC2, 0x7BE2 }, 
-	{ 0xEAC3, 0x7BDC }, { 0xEAC4, 0x7BEB }, { 0xEAC5, 0x7BD8 }, { 0xEAC6, 0x7BDF }, { 0xEAC7, 0x7CD2 }, { 0xEAC8, 0x7CD4 }, { 0xEAC9, 0x7CD7 }, { 0xEACA, 0x7CD0 }, 
-	{ 0xEACB, 0x7CD1 }, { 0xEACC, 0x7E12 }, { 0xEACD, 0x7E21 }, { 0xEACE, 0x7E17 }, { 0xEACF, 0x7E0C }, { 0xEAD0, 0x7E1F }, { 0xEAD1, 0x7E20 }, { 0xEAD2, 0x7E13 }, 
-	{ 0xEAD3, 0x7E0E }, { 0xEAD4, 0x7E1C }, { 0xEAD5, 0x7E15 }, { 0xEAD6, 0x7E1A }, { 0xEAD7, 0x7E22 }, { 0xEAD8, 0x7E0B }, { 0xEAD9, 0x7E0F }, { 0xEADA, 0x7E16 }, 
-	{ 0xEADB, 0x7E0D }, { 0xEADC, 0x7E14 }, { 0xEADD, 0x7E25 }, { 0xEADE, 0x7E24 }, { 0xEADF, 0x7F43 }, { 0xEAE0, 0x7F7B }, { 0xEAE1, 0x7F7C }, { 0xEAE2, 0x7F7A }, 
-	{ 0xEAE3, 0x7FB1 }, { 0xEAE4, 0x7FEF }, { 0xEAE5, 0x802A }, { 0xEAE6, 0x8029 }, { 0xEAE7, 0x806C }, { 0xEAE8, 0x81B1 }, { 0xEAE9, 0x81A6 }, { 0xEAEA, 0x81AE }, 
-	{ 0xEAEB, 0x81B9 }, { 0xEAEC, 0x81B5 }, { 0xEAED, 0x81AB }, { 0xEAEE, 0x81B0 }, { 0xEAEF, 0x81AC }, { 0xEAF0, 0x81B4 }, { 0xEAF1, 0x81B2 }, { 0xEAF2, 0x81B7 }, 
-	{ 0xEAF3, 0x81A7 }, { 0xEAF4, 0x81F2 }, { 0xEAF5, 0x8255 }, { 0xEAF6, 0x8256 }, { 0xEAF7, 0x8257 }, { 0xEAF8, 0x8556 }, { 0xEAF9, 0x8545 }, { 0xEAFA, 0x856B }, 
-	{ 0xEAFB, 0x854D }, { 0xEAFC, 0x8553 }, { 0xEAFD, 0x8561 }, { 0xEAFE, 0x8558 }, { 0xEB40, 0x8540 }, { 0xEB41, 0x8546 }, { 0xEB42, 0x8564 }, { 0xEB43, 0x8541 }, 
-	{ 0xEB44, 0x8562 }, { 0xEB45, 0x8544 }, { 0xEB46, 0x8551 }, { 0xEB47, 0x8547 }, { 0xEB48, 0x8563 }, { 0xEB49, 0x853E }, { 0xEB4A, 0x855B }, { 0xEB4B, 0x8571 }, 
-	{ 0xEB4C, 0x854E }, { 0xEB4D, 0x856E }, { 0xEB4E, 0x8575 }, { 0xEB4F, 0x8555 }, { 0xEB50, 0x8567 }, { 0xEB51, 0x8560 }, { 0xEB52, 0x858C }, { 0xEB53, 0x8566 }, 
-	{ 0xEB54, 0x855D }, { 0xEB55, 0x8554 }, { 0xEB56, 0x8565 }, { 0xEB57, 0x856C }, { 0xEB58, 0x8663 }, { 0xEB59, 0x8665 }, { 0xEB5A, 0x8664 }, { 0xEB5B, 0x879B }, 
-	{ 0xEB5C, 0x878F }, { 0xEB5D, 0x8797 }, { 0xEB5E, 0x8793 }, { 0xEB5F, 0x8792 }, { 0xEB60, 0x8788 }, { 0xEB61, 0x8781 }, { 0xEB62, 0x8796 }, { 0xEB63, 0x8798 }, 
-	{ 0xEB64, 0x8779 }, { 0xEB65, 0x8787 }, { 0xEB66, 0x87A3 }, { 0xEB67, 0x8785 }, { 0xEB68, 0x8790 }, { 0xEB69, 0x8791 }, { 0xEB6A, 0x879D }, { 0xEB6B, 0x8784 }, 
-	{ 0xEB6C, 0x8794 }, { 0xEB6D, 0x879C }, { 0xEB6E, 0x879A }, { 0xEB6F, 0x8789 }, { 0xEB70, 0x891E }, { 0xEB71, 0x8926 }, { 0xEB72, 0x8930 }, { 0xEB73, 0x892D }, 
-	{ 0xEB74, 0x892E }, { 0xEB75, 0x8927 }, { 0xEB76, 0x8931 }, { 0xEB77, 0x8922 }, { 0xEB78, 0x8929 }, { 0xEB79, 0x8923 }, { 0xEB7A, 0x892F }, { 0xEB7B, 0x892C }, 
-	{ 0xEB7C, 0x891F }, { 0xEB7D, 0x89F1 }, { 0xEB7E, 0x8AE0 }, { 0xEBA1, 0x8AE2 }, { 0xEBA2, 0x8AF2 }, { 0xEBA3, 0x8AF4 }, { 0xEBA4, 0x8AF5 }, { 0xEBA5, 0x8ADD }, 
-	{ 0xEBA6, 0x8B14 }, { 0xEBA7, 0x8AE4 }, { 0xEBA8, 0x8ADF }, { 0xEBA9, 0x8AF0 }, { 0xEBAA, 0x8AC8 }, { 0xEBAB, 0x8ADE }, { 0xEBAC, 0x8AE1 }, { 0xEBAD, 0x8AE8 }, 
-	{ 0xEBAE, 0x8AFF }, { 0xEBAF, 0x8AEF }, { 0xEBB0, 0x8AFB }, { 0xEBB1, 0x8C91 }, { 0xEBB2, 0x8C92 }, { 0xEBB3, 0x8C90 }, { 0xEBB4, 0x8CF5 }, { 0xEBB5, 0x8CEE }, 
-	{ 0xEBB6, 0x8CF1 }, { 0xEBB7, 0x8CF0 }, { 0xEBB8, 0x8CF3 }, { 0xEBB9, 0x8D6C }, { 0xEBBA, 0x8D6E }, { 0xEBBB, 0x8DA5 }, { 0xEBBC, 0x8DA7 }, { 0xEBBD, 0x8E33 }, 
-	{ 0xEBBE, 0x8E3E }, { 0xEBBF, 0x8E38 }, { 0xEBC0, 0x8E40 }, { 0xEBC1, 0x8E45 }, { 0xEBC2, 0x8E36 }, { 0xEBC3, 0x8E3C }, { 0xEBC4, 0x8E3D }, { 0xEBC5, 0x8E41 }, 
-	{ 0xEBC6, 0x8E30 }, { 0xEBC7, 0x8E3F }, { 0xEBC8, 0x8EBD }, { 0xEBC9, 0x8F36 }, { 0xEBCA, 0x8F2E }, { 0xEBCB, 0x8F35 }, { 0xEBCC, 0x8F32 }, { 0xEBCD, 0x8F39 }, 
-	{ 0xEBCE, 0x8F37 }, { 0xEBCF, 0x8F34 }, { 0xEBD0, 0x9076 }, { 0xEBD1, 0x9079 }, { 0xEBD2, 0x907B }, { 0xEBD3, 0x9086 }, { 0xEBD4, 0x90FA }, { 0xEBD5, 0x9133 }, 
-	{ 0xEBD6, 0x9135 }, { 0xEBD7, 0x9136 }, { 0xEBD8, 0x9193 }, { 0xEBD9, 0x9190 }, { 0xEBDA, 0x9191 }, { 0xEBDB, 0x918D }, { 0xEBDC, 0x918F }, { 0xEBDD, 0x9327 }, 
-	{ 0xEBDE, 0x931E }, { 0xEBDF, 0x9308 }, { 0xEBE0, 0x931F }, { 0xEBE1, 0x9306 }, { 0xEBE2, 0x930F }, { 0xEBE3, 0x937A }, { 0xEBE4, 0x9338 }, { 0xEBE5, 0x933C }, 
-	{ 0xEBE6, 0x931B }, { 0xEBE7, 0x9323 }, { 0xEBE8, 0x9312 }, { 0xEBE9, 0x9301 }, { 0xEBEA, 0x9346 }, { 0xEBEB, 0x932D }, { 0xEBEC, 0x930E }, { 0xEBED, 0x930D }, 
-	{ 0xEBEE, 0x92CB }, { 0xEBEF, 0x931D }, { 0xEBF0, 0x92FA }, { 0xEBF1, 0x9325 }, { 0xEBF2, 0x9313 }, { 0xEBF3, 0x92F9 }, { 0xEBF4, 0x92F7 }, { 0xEBF5, 0x9334 }, 
-	{ 0xEBF6, 0x9302 }, { 0xEBF7, 0x9324 }, { 0xEBF8, 0x92FF }, { 0xEBF9, 0x9329 }, { 0xEBFA, 0x9339 }, { 0xEBFB, 0x9335 }, { 0xEBFC, 0x932A }, { 0xEBFD, 0x9314 }, 
-	{ 0xEBFE, 0x930C }, { 0xEC40, 0x930B }, { 0xEC41, 0x92FE }, { 0xEC42, 0x9309 }, { 0xEC43, 0x9300 }, { 0xEC44, 0x92FB }, { 0xEC45, 0x9316 }, { 0xEC46, 0x95BC }, 
-	{ 0xEC47, 0x95CD }, { 0xEC48, 0x95BE }, { 0xEC49, 0x95B9 }, { 0xEC4A, 0x95BA }, { 0xEC4B, 0x95B6 }, { 0xEC4C, 0x95BF }, { 0xEC4D, 0x95B5 }, { 0xEC4E, 0x95BD }, 
-	{ 0xEC4F, 0x96A9 }, { 0xEC50, 0x96D4 }, { 0xEC51, 0x970B }, { 0xEC52, 0x9712 }, { 0xEC53, 0x9710 }, { 0xEC54, 0x9799 }, { 0xEC55, 0x9797 }, { 0xEC56, 0x9794 }, 
-	{ 0xEC57, 0x97F0 }, { 0xEC58, 0x97F8 }, { 0xEC59, 0x9835 }, { 0xEC5A, 0x982F }, { 0xEC5B, 0x9832 }, { 0xEC5C, 0x9924 }, { 0xEC5D, 0x991F }, { 0xEC5E, 0x9927 }, 
-	{ 0xEC5F, 0x9929 }, { 0xEC60, 0x999E }, { 0xEC61, 0x99EE }, { 0xEC62, 0x99EC }, { 0xEC63, 0x99E5 }, { 0xEC64, 0x99E4 }, { 0xEC65, 0x99F0 }, { 0xEC66, 0x99E3 }, 
-	{ 0xEC67, 0x99EA }, { 0xEC68, 0x99E9 }, { 0xEC69, 0x99E7 }, { 0xEC6A, 0x9AB9 }, { 0xEC6B, 0x9ABF }, { 0xEC6C, 0x9AB4 }, { 0xEC6D, 0x9ABB }, { 0xEC6E, 0x9AF6 }, 
-	{ 0xEC6F, 0x9AFA }, { 0xEC70, 0x9AF9 }, { 0xEC71, 0x9AF7 }, { 0xEC72, 0x9B33 }, { 0xEC73, 0x9B80 }, { 0xEC74, 0x9B85 }, { 0xEC75, 0x9B87 }, { 0xEC76, 0x9B7C }, 
-	{ 0xEC77, 0x9B7E }, { 0xEC78, 0x9B7B }, { 0xEC79, 0x9B82 }, { 0xEC7A, 0x9B93 }, { 0xEC7B, 0x9B92 }, { 0xEC7C, 0x9B90 }, { 0xEC7D, 0x9B7A }, { 0xEC7E, 0x9B95 }, 
-	{ 0xECA1, 0x9B7D }, { 0xECA2, 0x9B88 }, { 0xECA3, 0x9D25 }, { 0xECA4, 0x9D17 }, { 0xECA5, 0x9D20 }, { 0xECA6, 0x9D1E }, { 0xECA7, 0x9D14 }, { 0xECA8, 0x9D29 }, 
-	{ 0xECA9, 0x9D1D }, { 0xECAA, 0x9D18 }, { 0xECAB, 0x9D22 }, { 0xECAC, 0x9D10 }, { 0xECAD, 0x9D19 }, { 0xECAE, 0x9D1F }, { 0xECAF, 0x9E88 }, { 0xECB0, 0x9E86 }, 
-	{ 0xECB1, 0x9E87 }, { 0xECB2, 0x9EAE }, { 0xECB3, 0x9EAD }, { 0xECB4, 0x9ED5 }, { 0xECB5, 0x9ED6 }, { 0xECB6, 0x9EFA }, { 0xECB7, 0x9F12 }, { 0xECB8, 0x9F3D }, 
-	{ 0xECB9, 0x5126 }, { 0xECBA, 0x5125 }, { 0xECBB, 0x5122 }, { 0xECBC, 0x5124 }, { 0xECBD, 0x5120 }, { 0xECBE, 0x5129 }, { 0xECBF, 0x52F4 }, { 0xECC0, 0x5693 }, 
-	{ 0xECC1, 0x568C }, { 0xECC2, 0x568D }, { 0xECC3, 0x5686 }, { 0xECC4, 0x5684 }, { 0xECC5, 0x5683 }, { 0xECC6, 0x567E }, { 0xECC7, 0x5682 }, { 0xECC8, 0x567F }, 
-	{ 0xECC9, 0x5681 }, { 0xECCA, 0x58D6 }, { 0xECCB, 0x58D4 }, { 0xECCC, 0x58CF }, { 0xECCD, 0x58D2 }, { 0xECCE, 0x5B2D }, { 0xECCF, 0x5B25 }, { 0xECD0, 0x5B32 }, 
-	{ 0xECD1, 0x5B23 }, { 0xECD2, 0x5B2C }, { 0xECD3, 0x5B27 }, { 0xECD4, 0x5B26 }, { 0xECD5, 0x5B2F }, { 0xECD6, 0x5B2E }, { 0xECD7, 0x5B7B }, { 0xECD8, 0x5BF1 }, 
-	{ 0xECD9, 0x5BF2 }, { 0xECDA, 0x5DB7 }, { 0xECDB, 0x5E6C }, { 0xECDC, 0x5E6A }, { 0xECDD, 0x5FBE }, { 0xECDE, 0x5FBB }, { 0xECDF, 0x61C3 }, { 0xECE0, 0x61B5 }, 
-	{ 0xECE1, 0x61BC }, { 0xECE2, 0x61E7 }, { 0xECE3, 0x61E0 }, { 0xECE4, 0x61E5 }, { 0xECE5, 0x61E4 }, { 0xECE6, 0x61E8 }, { 0xECE7, 0x61DE }, { 0xECE8, 0x64EF }, 
-	{ 0xECE9, 0x64E9 }, { 0xECEA, 0x64E3 }, { 0xECEB, 0x64EB }, { 0xECEC, 0x64E4 }, { 0xECED, 0x64E8 }, { 0xECEE, 0x6581 }, { 0xECEF, 0x6580 }, { 0xECF0, 0x65B6 }, 
-	{ 0xECF1, 0x65DA }, { 0xECF2, 0x66D2 }, { 0xECF3, 0x6A8D }, { 0xECF4, 0x6A96 }, { 0xECF5, 0x6A81 }, { 0xECF6, 0x6AA5 }, { 0xECF7, 0x6A89 }, { 0xECF8, 0x6A9F }, 
-	{ 0xECF9, 0x6A9B }, { 0xECFA, 0x6AA1 }, { 0xECFB, 0x6A9E }, { 0xECFC, 0x6A87 }, { 0xECFD, 0x6A93 }, { 0xECFE, 0x6A8E }, { 0xED40, 0x6A95 }, { 0xED41, 0x6A83 }, 
-	{ 0xED42, 0x6AA8 }, { 0xED43, 0x6AA4 }, { 0xED44, 0x6A91 }, { 0xED45, 0x6A7F }, { 0xED46, 0x6AA6 }, { 0xED47, 0x6A9A }, { 0xED48, 0x6A85 }, { 0xED49, 0x6A8C }, 
-	{ 0xED4A, 0x6A92 }, { 0xED4B, 0x6B5B }, { 0xED4C, 0x6BAD }, { 0xED4D, 0x6C09 }, { 0xED4E, 0x6FCC }, { 0xED4F, 0x6FA9 }, { 0xED50, 0x6FF4 }, { 0xED51, 0x6FD4 }, 
-	{ 0xED52, 0x6FE3 }, { 0xED53, 0x6FDC }, { 0xED54, 0x6FED }, { 0xED55, 0x6FE7 }, { 0xED56, 0x6FE6 }, { 0xED57, 0x6FDE }, { 0xED58, 0x6FF2 }, { 0xED59, 0x6FDD }, 
-	{ 0xED5A, 0x6FE2 }, { 0xED5B, 0x6FE8 }, { 0xED5C, 0x71E1 }, { 0xED5D, 0x71F1 }, { 0xED5E, 0x71E8 }, { 0xED5F, 0x71F2 }, { 0xED60, 0x71E4 }, { 0xED61, 0x71F0 }, 
-	{ 0xED62, 0x71E2 }, { 0xED63, 0x7373 }, { 0xED64, 0x736E }, { 0xED65, 0x736F }, { 0xED66, 0x7497 }, { 0xED67, 0x74B2 }, { 0xED68, 0x74AB }, { 0xED69, 0x7490 }, 
-	{ 0xED6A, 0x74AA }, { 0xED6B, 0x74AD }, { 0xED6C, 0x74B1 }, { 0xED6D, 0x74A5 }, { 0xED6E, 0x74AF }, { 0xED6F, 0x7510 }, { 0xED70, 0x7511 }, { 0xED71, 0x7512 }, 
-	{ 0xED72, 0x750F }, { 0xED73, 0x7584 }, { 0xED74, 0x7643 }, { 0xED75, 0x7648 }, { 0xED76, 0x7649 }, { 0xED77, 0x7647 }, { 0xED78, 0x76A4 }, { 0xED79, 0x76E9 }, 
-	{ 0xED7A, 0x77B5 }, { 0xED7B, 0x77AB }, { 0xED7C, 0x77B2 }, { 0xED7D, 0x77B7 }, { 0xED7E, 0x77B6 }, { 0xEDA1, 0x77B4 }, { 0xEDA2, 0x77B1 }, { 0xEDA3, 0x77A8 }, 
-	{ 0xEDA4, 0x77F0 }, { 0xEDA5, 0x78F3 }, { 0xEDA6, 0x78FD }, { 0xEDA7, 0x7902 }, { 0xEDA8, 0x78FB }, { 0xEDA9, 0x78FC }, { 0xEDAA, 0x78F2 }, { 0xEDAB, 0x7905 }, 
-	{ 0xEDAC, 0x78F9 }, { 0xEDAD, 0x78FE }, { 0xEDAE, 0x7904 }, { 0xEDAF, 0x79AB }, { 0xEDB0, 0x79A8 }, { 0xEDB1, 0x7A5C }, { 0xEDB2, 0x7A5B }, { 0xEDB3, 0x7A56 }, 
-	{ 0xEDB4, 0x7A58 }, { 0xEDB5, 0x7A54 }, { 0xEDB6, 0x7A5A }, { 0xEDB7, 0x7ABE }, { 0xEDB8, 0x7AC0 }, { 0xEDB9, 0x7AC1 }, { 0xEDBA, 0x7C05 }, { 0xEDBB, 0x7C0F }, 
-	{ 0xEDBC, 0x7BF2 }, { 0xEDBD, 0x7C00 }, { 0xEDBE, 0x7BFF }, { 0xEDBF, 0x7BFB }, { 0xEDC0, 0x7C0E }, { 0xEDC1, 0x7BF4 }, { 0xEDC2, 0x7C0B }, { 0xEDC3, 0x7BF3 }, 
-	{ 0xEDC4, 0x7C02 }, { 0xEDC5, 0x7C09 }, { 0xEDC6, 0x7C03 }, { 0xEDC7, 0x7C01 }, { 0xEDC8, 0x7BF8 }, { 0xEDC9, 0x7BFD }, { 0xEDCA, 0x7C06 }, { 0xEDCB, 0x7BF0 }, 
-	{ 0xEDCC, 0x7BF1 }, { 0xEDCD, 0x7C10 }, { 0xEDCE, 0x7C0A }, { 0xEDCF, 0x7CE8 }, { 0xEDD0, 0x7E2D }, { 0xEDD1, 0x7E3C }, { 0xEDD2, 0x7E42 }, { 0xEDD3, 0x7E33 }, 
-	{ 0xEDD4, 0x9848 }, { 0xEDD5, 0x7E38 }, { 0xEDD6, 0x7E2A }, { 0xEDD7, 0x7E49 }, { 0xEDD8, 0x7E40 }, { 0xEDD9, 0x7E47 }, { 0xEDDA, 0x7E29 }, { 0xEDDB, 0x7E4C }, 
-	{ 0xEDDC, 0x7E30 }, { 0xEDDD, 0x7E3B }, { 0xEDDE, 0x7E36 }, { 0xEDDF, 0x7E44 }, { 0xEDE0, 0x7E3A }, { 0xEDE1, 0x7F45 }, { 0xEDE2, 0x7F7F }, { 0xEDE3, 0x7F7E }, 
-	{ 0xEDE4, 0x7F7D }, { 0xEDE5, 0x7FF4 }, { 0xEDE6, 0x7FF2 }, { 0xEDE7, 0x802C }, { 0xEDE8, 0x81BB }, { 0xEDE9, 0x81C4 }, { 0xEDEA, 0x81CC }, { 0xEDEB, 0x81CA }, 
-	{ 0xEDEC, 0x81C5 }, { 0xEDED, 0x81C7 }, { 0xEDEE, 0x81BC }, { 0xEDEF, 0x81E9 }, { 0xEDF0, 0x825B }, { 0xEDF1, 0x825A }, { 0xEDF2, 0x825C }, { 0xEDF3, 0x8583 }, 
-	{ 0xEDF4, 0x8580 }, { 0xEDF5, 0x858F }, { 0xEDF6, 0x85A7 }, { 0xEDF7, 0x8595 }, { 0xEDF8, 0x85A0 }, { 0xEDF9, 0x858B }, { 0xEDFA, 0x85A3 }, { 0xEDFB, 0x857B }, 
-	{ 0xEDFC, 0x85A4 }, { 0xEDFD, 0x859A }, { 0xEDFE, 0x859E }, { 0xEE40, 0x8577 }, { 0xEE41, 0x857C }, { 0xEE42, 0x8589 }, { 0xEE43, 0x85A1 }, { 0xEE44, 0x857A }, 
-	{ 0xEE45, 0x8578 }, { 0xEE46, 0x8557 }, { 0xEE47, 0x858E }, { 0xEE48, 0x8596 }, { 0xEE49, 0x8586 }, { 0xEE4A, 0x858D }, { 0xEE4B, 0x8599 }, { 0xEE4C, 0x859D }, 
-	{ 0xEE4D, 0x8581 }, { 0xEE4E, 0x85A2 }, { 0xEE4F, 0x8582 }, { 0xEE50, 0x8588 }, { 0xEE51, 0x8585 }, { 0xEE52, 0x8579 }, { 0xEE53, 0x8576 }, { 0xEE54, 0x8598 }, 
-	{ 0xEE55, 0x8590 }, { 0xEE56, 0x859F }, { 0xEE57, 0x8668 }, { 0xEE58, 0x87BE }, { 0xEE59, 0x87AA }, { 0xEE5A, 0x87AD }, { 0xEE5B, 0x87C5 }, { 0xEE5C, 0x87B0 }, 
-	{ 0xEE5D, 0x87AC }, { 0xEE5E, 0x87B9 }, { 0xEE5F, 0x87B5 }, { 0xEE60, 0x87BC }, { 0xEE61, 0x87AE }, { 0xEE62, 0x87C9 }, { 0xEE63, 0x87C3 }, { 0xEE64, 0x87C2 }, 
-	{ 0xEE65, 0x87CC }, { 0xEE66, 0x87B7 }, { 0xEE67, 0x87AF }, { 0xEE68, 0x87C4 }, { 0xEE69, 0x87CA }, { 0xEE6A, 0x87B4 }, { 0xEE6B, 0x87B6 }, { 0xEE6C, 0x87BF }, 
-	{ 0xEE6D, 0x87B8 }, { 0xEE6E, 0x87BD }, { 0xEE6F, 0x87DE }, { 0xEE70, 0x87B2 }, { 0xEE71, 0x8935 }, { 0xEE72, 0x8933 }, { 0xEE73, 0x893C }, { 0xEE74, 0x893E }, 
-	{ 0xEE75, 0x8941 }, { 0xEE76, 0x8952 }, { 0xEE77, 0x8937 }, { 0xEE78, 0x8942 }, { 0xEE79, 0x89AD }, { 0xEE7A, 0x89AF }, { 0xEE7B, 0x89AE }, { 0xEE7C, 0x89F2 }, 
-	{ 0xEE7D, 0x89F3 }, { 0xEE7E, 0x8B1E }, { 0xEEA1, 0x8B18 }, { 0xEEA2, 0x8B16 }, { 0xEEA3, 0x8B11 }, { 0xEEA4, 0x8B05 }, { 0xEEA5, 0x8B0B }, { 0xEEA6, 0x8B22 }, 
-	{ 0xEEA7, 0x8B0F }, { 0xEEA8, 0x8B12 }, { 0xEEA9, 0x8B15 }, { 0xEEAA, 0x8B07 }, { 0xEEAB, 0x8B0D }, { 0xEEAC, 0x8B08 }, { 0xEEAD, 0x8B06 }, { 0xEEAE, 0x8B1C }, 
-	{ 0xEEAF, 0x8B13 }, { 0xEEB0, 0x8B1A }, { 0xEEB1, 0x8C4F }, { 0xEEB2, 0x8C70 }, { 0xEEB3, 0x8C72 }, { 0xEEB4, 0x8C71 }, { 0xEEB5, 0x8C6F }, { 0xEEB6, 0x8C95 }, 
-	{ 0xEEB7, 0x8C94 }, { 0xEEB8, 0x8CF9 }, { 0xEEB9, 0x8D6F }, { 0xEEBA, 0x8E4E }, { 0xEEBB, 0x8E4D }, { 0xEEBC, 0x8E53 }, { 0xEEBD, 0x8E50 }, { 0xEEBE, 0x8E4C }, 
-	{ 0xEEBF, 0x8E47 }, { 0xEEC0, 0x8F43 }, { 0xEEC1, 0x8F40 }, { 0xEEC2, 0x9085 }, { 0xEEC3, 0x907E }, { 0xEEC4, 0x9138 }, { 0xEEC5, 0x919A }, { 0xEEC6, 0x91A2 }, 
-	{ 0xEEC7, 0x919B }, { 0xEEC8, 0x9199 }, { 0xEEC9, 0x919F }, { 0xEECA, 0x91A1 }, { 0xEECB, 0x919D }, { 0xEECC, 0x91A0 }, { 0xEECD, 0x93A1 }, { 0xEECE, 0x9383 }, 
-	{ 0xEECF, 0x93AF }, { 0xEED0, 0x9364 }, { 0xEED1, 0x9356 }, { 0xEED2, 0x9347 }, { 0xEED3, 0x937C }, { 0xEED4, 0x9358 }, { 0xEED5, 0x935C }, { 0xEED6, 0x9376 }, 
-	{ 0xEED7, 0x9349 }, { 0xEED8, 0x9350 }, { 0xEED9, 0x9351 }, { 0xEEDA, 0x9360 }, { 0xEEDB, 0x936D }, { 0xEEDC, 0x938F }, { 0xEEDD, 0x934C }, { 0xEEDE, 0x936A }, 
-	{ 0xEEDF, 0x9379 }, { 0xEEE0, 0x9357 }, { 0xEEE1, 0x9355 }, { 0xEEE2, 0x9352 }, { 0xEEE3, 0x934F }, { 0xEEE4, 0x9371 }, { 0xEEE5, 0x9377 }, { 0xEEE6, 0x937B }, 
-	{ 0xEEE7, 0x9361 }, { 0xEEE8, 0x935E }, { 0xEEE9, 0x9363 }, { 0xEEEA, 0x9367 }, { 0xEEEB, 0x9380 }, { 0xEEEC, 0x934E }, { 0xEEED, 0x9359 }, { 0xEEEE, 0x95C7 }, 
-	{ 0xEEEF, 0x95C0 }, { 0xEEF0, 0x95C9 }, { 0xEEF1, 0x95C3 }, { 0xEEF2, 0x95C5 }, { 0xEEF3, 0x95B7 }, { 0xEEF4, 0x96AE }, { 0xEEF5, 0x96B0 }, { 0xEEF6, 0x96AC }, 
-	{ 0xEEF7, 0x9720 }, { 0xEEF8, 0x971F }, { 0xEEF9, 0x9718 }, { 0xEEFA, 0x971D }, { 0xEEFB, 0x9719 }, { 0xEEFC, 0x979A }, { 0xEEFD, 0x97A1 }, { 0xEEFE, 0x979C }, 
-	{ 0xEF40, 0x979E }, { 0xEF41, 0x979D }, { 0xEF42, 0x97D5 }, { 0xEF43, 0x97D4 }, { 0xEF44, 0x97F1 }, { 0xEF45, 0x9841 }, { 0xEF46, 0x9844 }, { 0xEF47, 0x984A }, 
-	{ 0xEF48, 0x9849 }, { 0xEF49, 0x9845 }, { 0xEF4A, 0x9843 }, { 0xEF4B, 0x9925 }, { 0xEF4C, 0x992B }, { 0xEF4D, 0x992C }, { 0xEF4E, 0x992A }, { 0xEF4F, 0x9933 }, 
-	{ 0xEF50, 0x9932 }, { 0xEF51, 0x992F }, { 0xEF52, 0x992D }, { 0xEF53, 0x9931 }, { 0xEF54, 0x9930 }, { 0xEF55, 0x9998 }, { 0xEF56, 0x99A3 }, { 0xEF57, 0x99A1 }, 
-	{ 0xEF58, 0x9A02 }, { 0xEF59, 0x99FA }, { 0xEF5A, 0x99F4 }, { 0xEF5B, 0x99F7 }, { 0xEF5C, 0x99F9 }, { 0xEF5D, 0x99F8 }, { 0xEF5E, 0x99F6 }, { 0xEF5F, 0x99FB }, 
-	{ 0xEF60, 0x99FD }, { 0xEF61, 0x99FE }, { 0xEF62, 0x99FC }, { 0xEF63, 0x9A03 }, { 0xEF64, 0x9ABE }, { 0xEF65, 0x9AFE }, { 0xEF66, 0x9AFD }, { 0xEF67, 0x9B01 }, 
-	{ 0xEF68, 0x9AFC }, { 0xEF69, 0x9B48 }, { 0xEF6A, 0x9B9A }, { 0xEF6B, 0x9BA8 }, { 0xEF6C, 0x9B9E }, { 0xEF6D, 0x9B9B }, { 0xEF6E, 0x9BA6 }, { 0xEF6F, 0x9BA1 }, 
-	{ 0xEF70, 0x9BA5 }, { 0xEF71, 0x9BA4 }, { 0xEF72, 0x9B86 }, { 0xEF73, 0x9BA2 }, { 0xEF74, 0x9BA0 }, { 0xEF75, 0x9BAF }, { 0xEF76, 0x9D33 }, { 0xEF77, 0x9D41 }, 
-	{ 0xEF78, 0x9D67 }, { 0xEF79, 0x9D36 }, { 0xEF7A, 0x9D2E }, { 0xEF7B, 0x9D2F }, { 0xEF7C, 0x9D31 }, { 0xEF7D, 0x9D38 }, { 0xEF7E, 0x9D30 }, { 0xEFA1, 0x9D45 }, 
-	{ 0xEFA2, 0x9D42 }, { 0xEFA3, 0x9D43 }, { 0xEFA4, 0x9D3E }, { 0xEFA5, 0x9D37 }, { 0xEFA6, 0x9D40 }, { 0xEFA7, 0x9D3D }, { 0xEFA8, 0x7FF5 }, { 0xEFA9, 0x9D2D }, 
-	{ 0xEFAA, 0x9E8A }, { 0xEFAB, 0x9E89 }, { 0xEFAC, 0x9E8D }, { 0xEFAD, 0x9EB0 }, { 0xEFAE, 0x9EC8 }, { 0xEFAF, 0x9EDA }, { 0xEFB0, 0x9EFB }, { 0xEFB1, 0x9EFF }, 
-	{ 0xEFB2, 0x9F24 }, { 0xEFB3, 0x9F23 }, { 0xEFB4, 0x9F22 }, { 0xEFB5, 0x9F54 }, { 0xEFB6, 0x9FA0 }, { 0xEFB7, 0x5131 }, { 0xEFB8, 0x512D }, { 0xEFB9, 0x512E }, 
-	{ 0xEFBA, 0x5698 }, { 0xEFBB, 0x569C }, { 0xEFBC, 0x5697 }, { 0xEFBD, 0x569A }, { 0xEFBE, 0x569D }, { 0xEFBF, 0x5699 }, { 0xEFC0, 0x5970 }, { 0xEFC1, 0x5B3C }, 
-	{ 0xEFC2, 0x5C69 }, { 0xEFC3, 0x5C6A }, { 0xEFC4, 0x5DC0 }, { 0xEFC5, 0x5E6D }, { 0xEFC6, 0x5E6E }, { 0xEFC7, 0x61D8 }, { 0xEFC8, 0x61DF }, { 0xEFC9, 0x61ED }, 
-	{ 0xEFCA, 0x61EE }, { 0xEFCB, 0x61F1 }, { 0xEFCC, 0x61EA }, { 0xEFCD, 0x61F0 }, { 0xEFCE, 0x61EB }, { 0xEFCF, 0x61D6 }, { 0xEFD0, 0x61E9 }, { 0xEFD1, 0x64FF }, 
-	{ 0xEFD2, 0x6504 }, { 0xEFD3, 0x64FD }, { 0xEFD4, 0x64F8 }, { 0xEFD5, 0x6501 }, { 0xEFD6, 0x6503 }, { 0xEFD7, 0x64FC }, { 0xEFD8, 0x6594 }, { 0xEFD9, 0x65DB }, 
-	{ 0xEFDA, 0x66DA }, { 0xEFDB, 0x66DB }, { 0xEFDC, 0x66D8 }, { 0xEFDD, 0x6AC5 }, { 0xEFDE, 0x6AB9 }, { 0xEFDF, 0x6ABD }, { 0xEFE0, 0x6AE1 }, { 0xEFE1, 0x6AC6 }, 
-	{ 0xEFE2, 0x6ABA }, { 0xEFE3, 0x6AB6 }, { 0xEFE4, 0x6AB7 }, { 0xEFE5, 0x6AC7 }, { 0xEFE6, 0x6AB4 }, { 0xEFE7, 0x6AAD }, { 0xEFE8, 0x6B5E }, { 0xEFE9, 0x6BC9 }, 
-	{ 0xEFEA, 0x6C0B }, { 0xEFEB, 0x7007 }, { 0xEFEC, 0x700C }, { 0xEFED, 0x700D }, { 0xEFEE, 0x7001 }, { 0xEFEF, 0x7005 }, { 0xEFF0, 0x7014 }, { 0xEFF1, 0x700E }, 
-	{ 0xEFF2, 0x6FFF }, { 0xEFF3, 0x7000 }, { 0xEFF4, 0x6FFB }, { 0xEFF5, 0x7026 }, { 0xEFF6, 0x6FFC }, { 0xEFF7, 0x6FF7 }, { 0xEFF8, 0x700A }, { 0xEFF9, 0x7201 }, 
-	{ 0xEFFA, 0x71FF }, { 0xEFFB, 0x71F9 }, { 0xEFFC, 0x7203 }, { 0xEFFD, 0x71FD }, { 0xEFFE, 0x7376 }, { 0xF040, 0x74B8 }, { 0xF041, 0x74C0 }, { 0xF042, 0x74B5 }, 
-	{ 0xF043, 0x74C1 }, { 0xF044, 0x74BE }, { 0xF045, 0x74B6 }, { 0xF046, 0x74BB }, { 0xF047, 0x74C2 }, { 0xF048, 0x7514 }, { 0xF049, 0x7513 }, { 0xF04A, 0x765C }, 
-	{ 0xF04B, 0x7664 }, { 0xF04C, 0x7659 }, { 0xF04D, 0x7650 }, { 0xF04E, 0x7653 }, { 0xF04F, 0x7657 }, { 0xF050, 0x765A }, { 0xF051, 0x76A6 }, { 0xF052, 0x76BD }, 
-	{ 0xF053, 0x76EC }, { 0xF054, 0x77C2 }, { 0xF055, 0x77BA }, { 0xF056, 0x78FF }, { 0xF057, 0x790C }, { 0xF058, 0x7913 }, { 0xF059, 0x7914 }, { 0xF05A, 0x7909 }, 
-	{ 0xF05B, 0x7910 }, { 0xF05C, 0x7912 }, { 0xF05D, 0x7911 }, { 0xF05E, 0x79AD }, { 0xF05F, 0x79AC }, { 0xF060, 0x7A5F }, { 0xF061, 0x7C1C }, { 0xF062, 0x7C29 }, 
-	{ 0xF063, 0x7C19 }, { 0xF064, 0x7C20 }, { 0xF065, 0x7C1F }, { 0xF066, 0x7C2D }, { 0xF067, 0x7C1D }, { 0xF068, 0x7C26 }, { 0xF069, 0x7C28 }, { 0xF06A, 0x7C22 }, 
-	{ 0xF06B, 0x7C25 }, { 0xF06C, 0x7C30 }, { 0xF06D, 0x7E5C }, { 0xF06E, 0x7E50 }, { 0xF06F, 0x7E56 }, { 0xF070, 0x7E63 }, { 0xF071, 0x7E58 }, { 0xF072, 0x7E62 }, 
-	{ 0xF073, 0x7E5F }, { 0xF074, 0x7E51 }, { 0xF075, 0x7E60 }, { 0xF076, 0x7E57 }, { 0xF077, 0x7E53 }, { 0xF078, 0x7FB5 }, { 0xF079, 0x7FB3 }, { 0xF07A, 0x7FF7 }, 
-	{ 0xF07B, 0x7FF8 }, { 0xF07C, 0x8075 }, { 0xF07D, 0x81D1 }, { 0xF07E, 0x81D2 }, { 0xF0A1, 0x81D0 }, { 0xF0A2, 0x825F }, { 0xF0A3, 0x825E }, { 0xF0A4, 0x85B4 }, 
-	{ 0xF0A5, 0x85C6 }, { 0xF0A6, 0x85C0 }, { 0xF0A7, 0x85C3 }, { 0xF0A8, 0x85C2 }, { 0xF0A9, 0x85B3 }, { 0xF0AA, 0x85B5 }, { 0xF0AB, 0x85BD }, { 0xF0AC, 0x85C7 }, 
-	{ 0xF0AD, 0x85C4 }, { 0xF0AE, 0x85BF }, { 0xF0AF, 0x85CB }, { 0xF0B0, 0x85CE }, { 0xF0B1, 0x85C8 }, { 0xF0B2, 0x85C5 }, { 0xF0B3, 0x85B1 }, { 0xF0B4, 0x85B6 }, 
-	{ 0xF0B5, 0x85D2 }, { 0xF0B6, 0x8624 }, { 0xF0B7, 0x85B8 }, { 0xF0B8, 0x85B7 }, { 0xF0B9, 0x85BE }, { 0xF0BA, 0x8669 }, { 0xF0BB, 0x87E7 }, { 0xF0BC, 0x87E6 }, 
-	{ 0xF0BD, 0x87E2 }, { 0xF0BE, 0x87DB }, { 0xF0BF, 0x87EB }, { 0xF0C0, 0x87EA }, { 0xF0C1, 0x87E5 }, { 0xF0C2, 0x87DF }, { 0xF0C3, 0x87F3 }, { 0xF0C4, 0x87E4 }, 
-	{ 0xF0C5, 0x87D4 }, { 0xF0C6, 0x87DC }, { 0xF0C7, 0x87D3 }, { 0xF0C8, 0x87ED }, { 0xF0C9, 0x87D8 }, { 0xF0CA, 0x87E3 }, { 0xF0CB, 0x87A4 }, { 0xF0CC, 0x87D7 }, 
-	{ 0xF0CD, 0x87D9 }, { 0xF0CE, 0x8801 }, { 0xF0CF, 0x87F4 }, { 0xF0D0, 0x87E8 }, { 0xF0D1, 0x87DD }, { 0xF0D2, 0x8953 }, { 0xF0D3, 0x894B }, { 0xF0D4, 0x894F }, 
-	{ 0xF0D5, 0x894C }, { 0xF0D6, 0x8946 }, { 0xF0D7, 0x8950 }, { 0xF0D8, 0x8951 }, { 0xF0D9, 0x8949 }, { 0xF0DA, 0x8B2A }, { 0xF0DB, 0x8B27 }, { 0xF0DC, 0x8B23 }, 
-	{ 0xF0DD, 0x8B33 }, { 0xF0DE, 0x8B30 }, { 0xF0DF, 0x8B35 }, { 0xF0E0, 0x8B47 }, { 0xF0E1, 0x8B2F }, { 0xF0E2, 0x8B3C }, { 0xF0E3, 0x8B3E }, { 0xF0E4, 0x8B31 }, 
-	{ 0xF0E5, 0x8B25 }, { 0xF0E6, 0x8B37 }, { 0xF0E7, 0x8B26 }, { 0xF0E8, 0x8B36 }, { 0xF0E9, 0x8B2E }, { 0xF0EA, 0x8B24 }, { 0xF0EB, 0x8B3B }, { 0xF0EC, 0x8B3D }, 
-	{ 0xF0ED, 0x8B3A }, { 0xF0EE, 0x8C42 }, { 0xF0EF, 0x8C75 }, { 0xF0F0, 0x8C99 }, { 0xF0F1, 0x8C98 }, { 0xF0F2, 0x8C97 }, { 0xF0F3, 0x8CFE }, { 0xF0F4, 0x8D04 }, 
-	{ 0xF0F5, 0x8D02 }, { 0xF0F6, 0x8D00 }, { 0xF0F7, 0x8E5C }, { 0xF0F8, 0x8E62 }, { 0xF0F9, 0x8E60 }, { 0xF0FA, 0x8E57 }, { 0xF0FB, 0x8E56 }, { 0xF0FC, 0x8E5E }, 
-	{ 0xF0FD, 0x8E65 }, { 0xF0FE, 0x8E67 }, { 0xF140, 0x8E5B }, { 0xF141, 0x8E5A }, { 0xF142, 0x8E61 }, { 0xF143, 0x8E5D }, { 0xF144, 0x8E69 }, { 0xF145, 0x8E54 }, 
-	{ 0xF146, 0x8F46 }, { 0xF147, 0x8F47 }, { 0xF148, 0x8F48 }, { 0xF149, 0x8F4B }, { 0xF14A, 0x9128 }, { 0xF14B, 0x913A }, { 0xF14C, 0x913B }, { 0xF14D, 0x913E }, 
-	{ 0xF14E, 0x91A8 }, { 0xF14F, 0x91A5 }, { 0xF150, 0x91A7 }, { 0xF151, 0x91AF }, { 0xF152, 0x91AA }, { 0xF153, 0x93B5 }, { 0xF154, 0x938C }, { 0xF155, 0x9392 }, 
-	{ 0xF156, 0x93B7 }, { 0xF157, 0x939B }, { 0xF158, 0x939D }, { 0xF159, 0x9389 }, { 0xF15A, 0x93A7 }, { 0xF15B, 0x938E }, { 0xF15C, 0x93AA }, { 0xF15D, 0x939E }, 
-	{ 0xF15E, 0x93A6 }, { 0xF15F, 0x9395 }, { 0xF160, 0x9388 }, { 0xF161, 0x9399 }, { 0xF162, 0x939F }, { 0xF163, 0x938D }, { 0xF164, 0x93B1 }, { 0xF165, 0x9391 }, 
-	{ 0xF166, 0x93B2 }, { 0xF167, 0x93A4 }, { 0xF168, 0x93A8 }, { 0xF169, 0x93B4 }, { 0xF16A, 0x93A3 }, { 0xF16B, 0x93A5 }, { 0xF16C, 0x95D2 }, { 0xF16D, 0x95D3 }, 
-	{ 0xF16E, 0x95D1 }, { 0xF16F, 0x96B3 }, { 0xF170, 0x96D7 }, { 0xF171, 0x96DA }, { 0xF172, 0x5DC2 }, { 0xF173, 0x96DF }, { 0xF174, 0x96D8 }, { 0xF175, 0x96DD }, 
-	{ 0xF176, 0x9723 }, { 0xF177, 0x9722 }, { 0xF178, 0x9725 }, { 0xF179, 0x97AC }, { 0xF17A, 0x97AE }, { 0xF17B, 0x97A8 }, { 0xF17C, 0x97AB }, { 0xF17D, 0x97A4 }, 
-	{ 0xF17E, 0x97AA }, { 0xF1A1, 0x97A2 }, { 0xF1A2, 0x97A5 }, { 0xF1A3, 0x97D7 }, { 0xF1A4, 0x97D9 }, { 0xF1A5, 0x97D6 }, { 0xF1A6, 0x97D8 }, { 0xF1A7, 0x97FA }, 
-	{ 0xF1A8, 0x9850 }, { 0xF1A9, 0x9851 }, { 0xF1AA, 0x9852 }, { 0xF1AB, 0x98B8 }, { 0xF1AC, 0x9941 }, { 0xF1AD, 0x993C }, { 0xF1AE, 0x993A }, { 0xF1AF, 0x9A0F }, 
-	{ 0xF1B0, 0x9A0B }, { 0xF1B1, 0x9A09 }, { 0xF1B2, 0x9A0D }, { 0xF1B3, 0x9A04 }, { 0xF1B4, 0x9A11 }, { 0xF1B5, 0x9A0A }, { 0xF1B6, 0x9A05 }, { 0xF1B7, 0x9A07 }, 
-	{ 0xF1B8, 0x9A06 }, { 0xF1B9, 0x9AC0 }, { 0xF1BA, 0x9ADC }, { 0xF1BB, 0x9B08 }, { 0xF1BC, 0x9B04 }, { 0xF1BD, 0x9B05 }, { 0xF1BE, 0x9B29 }, { 0xF1BF, 0x9B35 }, 
-	{ 0xF1C0, 0x9B4A }, { 0xF1C1, 0x9B4C }, { 0xF1C2, 0x9B4B }, { 0xF1C3, 0x9BC7 }, { 0xF1C4, 0x9BC6 }, { 0xF1C5, 0x9BC3 }, { 0xF1C6, 0x9BBF }, { 0xF1C7, 0x9BC1 }, 
-	{ 0xF1C8, 0x9BB5 }, { 0xF1C9, 0x9BB8 }, { 0xF1CA, 0x9BD3 }, { 0xF1CB, 0x9BB6 }, { 0xF1CC, 0x9BC4 }, { 0xF1CD, 0x9BB9 }, { 0xF1CE, 0x9BBD }, { 0xF1CF, 0x9D5C }, 
-	{ 0xF1D0, 0x9D53 }, { 0xF1D1, 0x9D4F }, { 0xF1D2, 0x9D4A }, { 0xF1D3, 0x9D5B }, { 0xF1D4, 0x9D4B }, { 0xF1D5, 0x9D59 }, { 0xF1D6, 0x9D56 }, { 0xF1D7, 0x9D4C }, 
-	{ 0xF1D8, 0x9D57 }, { 0xF1D9, 0x9D52 }, { 0xF1DA, 0x9D54 }, { 0xF1DB, 0x9D5F }, { 0xF1DC, 0x9D58 }, { 0xF1DD, 0x9D5A }, { 0xF1DE, 0x9E8E }, { 0xF1DF, 0x9E8C }, 
-	{ 0xF1E0, 0x9EDF }, { 0xF1E1, 0x9F01 }, { 0xF1E2, 0x9F00 }, { 0xF1E3, 0x9F16 }, { 0xF1E4, 0x9F25 }, { 0xF1E5, 0x9F2B }, { 0xF1E6, 0x9F2A }, { 0xF1E7, 0x9F29 }, 
-	{ 0xF1E8, 0x9F28 }, { 0xF1E9, 0x9F4C }, { 0xF1EA, 0x9F55 }, { 0xF1EB, 0x5134 }, { 0xF1EC, 0x5135 }, { 0xF1ED, 0x5296 }, { 0xF1EE, 0x52F7 }, { 0xF1EF, 0x53B4 }, 
-	{ 0xF1F0, 0x56AB }, { 0xF1F1, 0x56AD }, { 0xF1F2, 0x56A6 }, { 0xF1F3, 0x56A7 }, { 0xF1F4, 0x56AA }, { 0xF1F5, 0x56AC }, { 0xF1F6, 0x58DA }, { 0xF1F7, 0x58DD }, 
-	{ 0xF1F8, 0x58DB }, { 0xF1F9, 0x5912 }, { 0xF1FA, 0x5B3D }, { 0xF1FB, 0x5B3E }, { 0xF1FC, 0x5B3F }, { 0xF1FD, 0x5DC3 }, { 0xF1FE, 0x5E70 }, { 0xF240, 0x5FBF }, 
-	{ 0xF241, 0x61FB }, { 0xF242, 0x6507 }, { 0xF243, 0x6510 }, { 0xF244, 0x650D }, { 0xF245, 0x6509 }, { 0xF246, 0x650C }, { 0xF247, 0x650E }, { 0xF248, 0x6584 }, 
-	{ 0xF249, 0x65DE }, { 0xF24A, 0x65DD }, { 0xF24B, 0x66DE }, { 0xF24C, 0x6AE7 }, { 0xF24D, 0x6AE0 }, { 0xF24E, 0x6ACC }, { 0xF24F, 0x6AD1 }, { 0xF250, 0x6AD9 }, 
-	{ 0xF251, 0x6ACB }, { 0xF252, 0x6ADF }, { 0xF253, 0x6ADC }, { 0xF254, 0x6AD0 }, { 0xF255, 0x6AEB }, { 0xF256, 0x6ACF }, { 0xF257, 0x6ACD }, { 0xF258, 0x6ADE }, 
-	{ 0xF259, 0x6B60 }, { 0xF25A, 0x6BB0 }, { 0xF25B, 0x6C0C }, { 0xF25C, 0x7019 }, { 0xF25D, 0x7027 }, { 0xF25E, 0x7020 }, { 0xF25F, 0x7016 }, { 0xF260, 0x702B }, 
-	{ 0xF261, 0x7021 }, { 0xF262, 0x7022 }, { 0xF263, 0x7023 }, { 0xF264, 0x7029 }, { 0xF265, 0x7017 }, { 0xF266, 0x7024 }, { 0xF267, 0x701C }, { 0xF268, 0x702A }, 
-	{ 0xF269, 0x720C }, { 0xF26A, 0x720A }, { 0xF26B, 0x7207 }, { 0xF26C, 0x7202 }, { 0xF26D, 0x7205 }, { 0xF26E, 0x72A5 }, { 0xF26F, 0x72A6 }, { 0xF270, 0x72A4 }, 
-	{ 0xF271, 0x72A3 }, { 0xF272, 0x72A1 }, { 0xF273, 0x74CB }, { 0xF274, 0x74C5 }, { 0xF275, 0x74B7 }, { 0xF276, 0x74C3 }, { 0xF277, 0x7516 }, { 0xF278, 0x7660 }, 
-	{ 0xF279, 0x77C9 }, { 0xF27A, 0x77CA }, { 0xF27B, 0x77C4 }, { 0xF27C, 0x77F1 }, { 0xF27D, 0x791D }, { 0xF27E, 0x791B }, { 0xF2A1, 0x7921 }, { 0xF2A2, 0x791C }, 
-	{ 0xF2A3, 0x7917 }, { 0xF2A4, 0x791E }, { 0xF2A5, 0x79B0 }, { 0xF2A6, 0x7A67 }, { 0xF2A7, 0x7A68 }, { 0xF2A8, 0x7C33 }, { 0xF2A9, 0x7C3C }, { 0xF2AA, 0x7C39 }, 
-	{ 0xF2AB, 0x7C2C }, { 0xF2AC, 0x7C3B }, { 0xF2AD, 0x7CEC }, { 0xF2AE, 0x7CEA }, { 0xF2AF, 0x7E76 }, { 0xF2B0, 0x7E75 }, { 0xF2B1, 0x7E78 }, { 0xF2B2, 0x7E70 }, 
-	{ 0xF2B3, 0x7E77 }, { 0xF2B4, 0x7E6F }, { 0xF2B5, 0x7E7A }, { 0xF2B6, 0x7E72 }, { 0xF2B7, 0x7E74 }, { 0xF2B8, 0x7E68 }, { 0xF2B9, 0x7F4B }, { 0xF2BA, 0x7F4A }, 
-	{ 0xF2BB, 0x7F83 }, { 0xF2BC, 0x7F86 }, { 0xF2BD, 0x7FB7 }, { 0xF2BE, 0x7FFD }, { 0xF2BF, 0x7FFE }, { 0xF2C0, 0x8078 }, { 0xF2C1, 0x81D7 }, { 0xF2C2, 0x81D5 }, 
-	{ 0xF2C3, 0x8264 }, { 0xF2C4, 0x8261 }, { 0xF2C5, 0x8263 }, { 0xF2C6, 0x85EB }, { 0xF2C7, 0x85F1 }, { 0xF2C8, 0x85ED }, { 0xF2C9, 0x85D9 }, { 0xF2CA, 0x85E1 }, 
-	{ 0xF2CB, 0x85E8 }, { 0xF2CC, 0x85DA }, { 0xF2CD, 0x85D7 }, { 0xF2CE, 0x85EC }, { 0xF2CF, 0x85F2 }, { 0xF2D0, 0x85F8 }, { 0xF2D1, 0x85D8 }, { 0xF2D2, 0x85DF }, 
-	{ 0xF2D3, 0x85E3 }, { 0xF2D4, 0x85DC }, { 0xF2D5, 0x85D1 }, { 0xF2D6, 0x85F0 }, { 0xF2D7, 0x85E6 }, { 0xF2D8, 0x85EF }, { 0xF2D9, 0x85DE }, { 0xF2DA, 0x85E2 }, 
-	{ 0xF2DB, 0x8800 }, { 0xF2DC, 0x87FA }, { 0xF2DD, 0x8803 }, { 0xF2DE, 0x87F6 }, { 0xF2DF, 0x87F7 }, { 0xF2E0, 0x8809 }, { 0xF2E1, 0x880C }, { 0xF2E2, 0x880B }, 
-	{ 0xF2E3, 0x8806 }, { 0xF2E4, 0x87FC }, { 0xF2E5, 0x8808 }, { 0xF2E6, 0x87FF }, { 0xF2E7, 0x880A }, { 0xF2E8, 0x8802 }, { 0xF2E9, 0x8962 }, { 0xF2EA, 0x895A }, 
-	{ 0xF2EB, 0x895B }, { 0xF2EC, 0x8957 }, { 0xF2ED, 0x8961 }, { 0xF2EE, 0x895C }, { 0xF2EF, 0x8958 }, { 0xF2F0, 0x895D }, { 0xF2F1, 0x8959 }, { 0xF2F2, 0x8988 }, 
-	{ 0xF2F3, 0x89B7 }, { 0xF2F4, 0x89B6 }, { 0xF2F5, 0x89F6 }, { 0xF2F6, 0x8B50 }, { 0xF2F7, 0x8B48 }, { 0xF2F8, 0x8B4A }, { 0xF2F9, 0x8B40 }, { 0xF2FA, 0x8B53 }, 
-	{ 0xF2FB, 0x8B56 }, { 0xF2FC, 0x8B54 }, { 0xF2FD, 0x8B4B }, { 0xF2FE, 0x8B55 }, { 0xF340, 0x8B51 }, { 0xF341, 0x8B42 }, { 0xF342, 0x8B52 }, { 0xF343, 0x8B57 }, 
-	{ 0xF344, 0x8C43 }, { 0xF345, 0x8C77 }, { 0xF346, 0x8C76 }, { 0xF347, 0x8C9A }, { 0xF348, 0x8D06 }, { 0xF349, 0x8D07 }, { 0xF34A, 0x8D09 }, { 0xF34B, 0x8DAC }, 
-	{ 0xF34C, 0x8DAA }, { 0xF34D, 0x8DAD }, { 0xF34E, 0x8DAB }, { 0xF34F, 0x8E6D }, { 0xF350, 0x8E78 }, { 0xF351, 0x8E73 }, { 0xF352, 0x8E6A }, { 0xF353, 0x8E6F }, 
-	{ 0xF354, 0x8E7B }, { 0xF355, 0x8EC2 }, { 0xF356, 0x8F52 }, { 0xF357, 0x8F51 }, { 0xF358, 0x8F4F }, { 0xF359, 0x8F50 }, { 0xF35A, 0x8F53 }, { 0xF35B, 0x8FB4 }, 
-	{ 0xF35C, 0x9140 }, { 0xF35D, 0x913F }, { 0xF35E, 0x91B0 }, { 0xF35F, 0x91AD }, { 0xF360, 0x93DE }, { 0xF361, 0x93C7 }, { 0xF362, 0x93CF }, { 0xF363, 0x93C2 }, 
-	{ 0xF364, 0x93DA }, { 0xF365, 0x93D0 }, { 0xF366, 0x93F9 }, { 0xF367, 0x93EC }, { 0xF368, 0x93CC }, { 0xF369, 0x93D9 }, { 0xF36A, 0x93A9 }, { 0xF36B, 0x93E6 }, 
-	{ 0xF36C, 0x93CA }, { 0xF36D, 0x93D4 }, { 0xF36E, 0x93EE }, { 0xF36F, 0x93E3 }, { 0xF370, 0x93D5 }, { 0xF371, 0x93C4 }, { 0xF372, 0x93CE }, { 0xF373, 0x93C0 }, 
-	{ 0xF374, 0x93D2 }, { 0xF375, 0x93E7 }, { 0xF376, 0x957D }, { 0xF377, 0x95DA }, { 0xF378, 0x95DB }, { 0xF379, 0x96E1 }, { 0xF37A, 0x9729 }, { 0xF37B, 0x972B }, 
-	{ 0xF37C, 0x972C }, { 0xF37D, 0x9728 }, { 0xF37E, 0x9726 }, { 0xF3A1, 0x97B3 }, { 0xF3A2, 0x97B7 }, { 0xF3A3, 0x97B6 }, { 0xF3A4, 0x97DD }, { 0xF3A5, 0x97DE }, 
-	{ 0xF3A6, 0x97DF }, { 0xF3A7, 0x985C }, { 0xF3A8, 0x9859 }, { 0xF3A9, 0x985D }, { 0xF3AA, 0x9857 }, { 0xF3AB, 0x98BF }, { 0xF3AC, 0x98BD }, { 0xF3AD, 0x98BB }, 
-	{ 0xF3AE, 0x98BE }, { 0xF3AF, 0x9948 }, { 0xF3B0, 0x9947 }, { 0xF3B1, 0x9943 }, { 0xF3B2, 0x99A6 }, { 0xF3B3, 0x99A7 }, { 0xF3B4, 0x9A1A }, { 0xF3B5, 0x9A15 }, 
-	{ 0xF3B6, 0x9A25 }, { 0xF3B7, 0x9A1D }, { 0xF3B8, 0x9A24 }, { 0xF3B9, 0x9A1B }, { 0xF3BA, 0x9A22 }, { 0xF3BB, 0x9A20 }, { 0xF3BC, 0x9A27 }, { 0xF3BD, 0x9A23 }, 
-	{ 0xF3BE, 0x9A1E }, { 0xF3BF, 0x9A1C }, { 0xF3C0, 0x9A14 }, { 0xF3C1, 0x9AC2 }, { 0xF3C2, 0x9B0B }, { 0xF3C3, 0x9B0A }, { 0xF3C4, 0x9B0E }, { 0xF3C5, 0x9B0C }, 
-	{ 0xF3C6, 0x9B37 }, { 0xF3C7, 0x9BEA }, { 0xF3C8, 0x9BEB }, { 0xF3C9, 0x9BE0 }, { 0xF3CA, 0x9BDE }, { 0xF3CB, 0x9BE4 }, { 0xF3CC, 0x9BE6 }, { 0xF3CD, 0x9BE2 }, 
-	{ 0xF3CE, 0x9BF0 }, { 0xF3CF, 0x9BD4 }, { 0xF3D0, 0x9BD7 }, { 0xF3D1, 0x9BEC }, { 0xF3D2, 0x9BDC }, { 0xF3D3, 0x9BD9 }, { 0xF3D4, 0x9BE5 }, { 0xF3D5, 0x9BD5 }, 
-	{ 0xF3D6, 0x9BE1 }, { 0xF3D7, 0x9BDA }, { 0xF3D8, 0x9D77 }, { 0xF3D9, 0x9D81 }, { 0xF3DA, 0x9D8A }, { 0xF3DB, 0x9D84 }, { 0xF3DC, 0x9D88 }, { 0xF3DD, 0x9D71 }, 
-	{ 0xF3DE, 0x9D80 }, { 0xF3DF, 0x9D78 }, { 0xF3E0, 0x9D86 }, { 0xF3E1, 0x9D8B }, { 0xF3E2, 0x9D8C }, { 0xF3E3, 0x9D7D }, { 0xF3E4, 0x9D6B }, { 0xF3E5, 0x9D74 }, 
-	{ 0xF3E6, 0x9D75 }, { 0xF3E7, 0x9D70 }, { 0xF3E8, 0x9D69 }, { 0xF3E9, 0x9D85 }, { 0xF3EA, 0x9D73 }, { 0xF3EB, 0x9D7B }, { 0xF3EC, 0x9D82 }, { 0xF3ED, 0x9D6F }, 
-	{ 0xF3EE, 0x9D79 }, { 0xF3EF, 0x9D7F }, { 0xF3F0, 0x9D87 }, { 0xF3F1, 0x9D68 }, { 0xF3F2, 0x9E94 }, { 0xF3F3, 0x9E91 }, { 0xF3F4, 0x9EC0 }, { 0xF3F5, 0x9EFC }, 
-	{ 0xF3F6, 0x9F2D }, { 0xF3F7, 0x9F40 }, { 0xF3F8, 0x9F41 }, { 0xF3F9, 0x9F4D }, { 0xF3FA, 0x9F56 }, { 0xF3FB, 0x9F57 }, { 0xF3FC, 0x9F58 }, { 0xF3FD, 0x5337 }, 
-	{ 0xF3FE, 0x56B2 }, { 0xF440, 0x56B5 }, { 0xF441, 0x56B3 }, { 0xF442, 0x58E3 }, { 0xF443, 0x5B45 }, { 0xF444, 0x5DC6 }, { 0xF445, 0x5DC7 }, { 0xF446, 0x5EEE }, 
-	{ 0xF447, 0x5EEF }, { 0xF448, 0x5FC0 }, { 0xF449, 0x5FC1 }, { 0xF44A, 0x61F9 }, { 0xF44B, 0x6517 }, { 0xF44C, 0x6516 }, { 0xF44D, 0x6515 }, { 0xF44E, 0x6513 }, 
-	{ 0xF44F, 0x65DF }, { 0xF450, 0x66E8 }, { 0xF451, 0x66E3 }, { 0xF452, 0x66E4 }, { 0xF453, 0x6AF3 }, { 0xF454, 0x6AF0 }, { 0xF455, 0x6AEA }, { 0xF456, 0x6AE8 }, 
-	{ 0xF457, 0x6AF9 }, { 0xF458, 0x6AF1 }, { 0xF459, 0x6AEE }, { 0xF45A, 0x6AEF }, { 0xF45B, 0x703C }, { 0xF45C, 0x7035 }, { 0xF45D, 0x702F }, { 0xF45E, 0x7037 }, 
-	{ 0xF45F, 0x7034 }, { 0xF460, 0x7031 }, { 0xF461, 0x7042 }, { 0xF462, 0x7038 }, { 0xF463, 0x703F }, { 0xF464, 0x703A }, { 0xF465, 0x7039 }, { 0xF466, 0x7040 }, 
-	{ 0xF467, 0x703B }, { 0xF468, 0x7033 }, { 0xF469, 0x7041 }, { 0xF46A, 0x7213 }, { 0xF46B, 0x7214 }, { 0xF46C, 0x72A8 }, { 0xF46D, 0x737D }, { 0xF46E, 0x737C }, 
-	{ 0xF46F, 0x74BA }, { 0xF470, 0x76AB }, { 0xF471, 0x76AA }, { 0xF472, 0x76BE }, { 0xF473, 0x76ED }, { 0xF474, 0x77CC }, { 0xF475, 0x77CE }, { 0xF476, 0x77CF }, 
-	{ 0xF477, 0x77CD }, { 0xF478, 0x77F2 }, { 0xF479, 0x7925 }, { 0xF47A, 0x7923 }, { 0xF47B, 0x7927 }, { 0xF47C, 0x7928 }, { 0xF47D, 0x7924 }, { 0xF47E, 0x7929 }, 
-	{ 0xF4A1, 0x79B2 }, { 0xF4A2, 0x7A6E }, { 0xF4A3, 0x7A6C }, { 0xF4A4, 0x7A6D }, { 0xF4A5, 0x7AF7 }, { 0xF4A6, 0x7C49 }, { 0xF4A7, 0x7C48 }, { 0xF4A8, 0x7C4A }, 
-	{ 0xF4A9, 0x7C47 }, { 0xF4AA, 0x7C45 }, { 0xF4AB, 0x7CEE }, { 0xF4AC, 0x7E7B }, { 0xF4AD, 0x7E7E }, { 0xF4AE, 0x7E81 }, { 0xF4AF, 0x7E80 }, { 0xF4B0, 0x7FBA }, 
-	{ 0xF4B1, 0x7FFF }, { 0xF4B2, 0x8079 }, { 0xF4B3, 0x81DB }, { 0xF4B4, 0x81D9 }, { 0xF4B5, 0x820B }, { 0xF4B6, 0x8268 }, { 0xF4B7, 0x8269 }, { 0xF4B8, 0x8622 }, 
-	{ 0xF4B9, 0x85FF }, { 0xF4BA, 0x8601 }, { 0xF4BB, 0x85FE }, { 0xF4BC, 0x861B }, { 0xF4BD, 0x8600 }, { 0xF4BE, 0x85F6 }, { 0xF4BF, 0x8604 }, { 0xF4C0, 0x8609 }, 
-	{ 0xF4C1, 0x8605 }, { 0xF4C2, 0x860C }, { 0xF4C3, 0x85FD }, { 0xF4C4, 0x8819 }, { 0xF4C5, 0x8810 }, { 0xF4C6, 0x8811 }, { 0xF4C7, 0x8817 }, { 0xF4C8, 0x8813 }, 
-	{ 0xF4C9, 0x8816 }, { 0xF4CA, 0x8963 }, { 0xF4CB, 0x8966 }, { 0xF4CC, 0x89B9 }, { 0xF4CD, 0x89F7 }, { 0xF4CE, 0x8B60 }, { 0xF4CF, 0x8B6A }, { 0xF4D0, 0x8B5D }, 
-	{ 0xF4D1, 0x8B68 }, { 0xF4D2, 0x8B63 }, { 0xF4D3, 0x8B65 }, { 0xF4D4, 0x8B67 }, { 0xF4D5, 0x8B6D }, { 0xF4D6, 0x8DAE }, { 0xF4D7, 0x8E86 }, { 0xF4D8, 0x8E88 }, 
-	{ 0xF4D9, 0x8E84 }, { 0xF4DA, 0x8F59 }, { 0xF4DB, 0x8F56 }, { 0xF4DC, 0x8F57 }, { 0xF4DD, 0x8F55 }, { 0xF4DE, 0x8F58 }, { 0xF4DF, 0x8F5A }, { 0xF4E0, 0x908D }, 
-	{ 0xF4E1, 0x9143 }, { 0xF4E2, 0x9141 }, { 0xF4E3, 0x91B7 }, { 0xF4E4, 0x91B5 }, { 0xF4E5, 0x91B2 }, { 0xF4E6, 0x91B3 }, { 0xF4E7, 0x940B }, { 0xF4E8, 0x9413 }, 
-	{ 0xF4E9, 0x93FB }, { 0xF4EA, 0x9420 }, { 0xF4EB, 0x940F }, { 0xF4EC, 0x9414 }, { 0xF4ED, 0x93FE }, { 0xF4EE, 0x9415 }, { 0xF4EF, 0x9410 }, { 0xF4F0, 0x9428 }, 
-	{ 0xF4F1, 0x9419 }, { 0xF4F2, 0x940D }, { 0xF4F3, 0x93F5 }, { 0xF4F4, 0x9400 }, { 0xF4F5, 0x93F7 }, { 0xF4F6, 0x9407 }, { 0xF4F7, 0x940E }, { 0xF4F8, 0x9416 }, 
-	{ 0xF4F9, 0x9412 }, { 0xF4FA, 0x93FA }, { 0xF4FB, 0x9409 }, { 0xF4FC, 0x93F8 }, { 0xF4FD, 0x940A }, { 0xF4FE, 0x93FF }, { 0xF540, 0x93FC }, { 0xF541, 0x940C }, 
-	{ 0xF542, 0x93F6 }, { 0xF543, 0x9411 }, { 0xF544, 0x9406 }, { 0xF545, 0x95DE }, { 0xF546, 0x95E0 }, { 0xF547, 0x95DF }, { 0xF548, 0x972E }, { 0xF549, 0x972F }, 
-	{ 0xF54A, 0x97B9 }, { 0xF54B, 0x97BB }, { 0xF54C, 0x97FD }, { 0xF54D, 0x97FE }, { 0xF54E, 0x9860 }, { 0xF54F, 0x9862 }, { 0xF550, 0x9863 }, { 0xF551, 0x985F }, 
-	{ 0xF552, 0x98C1 }, { 0xF553, 0x98C2 }, { 0xF554, 0x9950 }, { 0xF555, 0x994E }, { 0xF556, 0x9959 }, { 0xF557, 0x994C }, { 0xF558, 0x994B }, { 0xF559, 0x9953 }, 
-	{ 0xF55A, 0x9A32 }, { 0xF55B, 0x9A34 }, { 0xF55C, 0x9A31 }, { 0xF55D, 0x9A2C }, { 0xF55E, 0x9A2A }, { 0xF55F, 0x9A36 }, { 0xF560, 0x9A29 }, { 0xF561, 0x9A2E }, 
-	{ 0xF562, 0x9A38 }, { 0xF563, 0x9A2D }, { 0xF564, 0x9AC7 }, { 0xF565, 0x9ACA }, { 0xF566, 0x9AC6 }, { 0xF567, 0x9B10 }, { 0xF568, 0x9B12 }, { 0xF569, 0x9B11 }, 
-	{ 0xF56A, 0x9C0B }, { 0xF56B, 0x9C08 }, { 0xF56C, 0x9BF7 }, { 0xF56D, 0x9C05 }, { 0xF56E, 0x9C12 }, { 0xF56F, 0x9BF8 }, { 0xF570, 0x9C40 }, { 0xF571, 0x9C07 }, 
-	{ 0xF572, 0x9C0E }, { 0xF573, 0x9C06 }, { 0xF574, 0x9C17 }, { 0xF575, 0x9C14 }, { 0xF576, 0x9C09 }, { 0xF577, 0x9D9F }, { 0xF578, 0x9D99 }, { 0xF579, 0x9DA4 }, 
-	{ 0xF57A, 0x9D9D }, { 0xF57B, 0x9D92 }, { 0xF57C, 0x9D98 }, { 0xF57D, 0x9D90 }, { 0xF57E, 0x9D9B }, { 0xF5A1, 0x9DA0 }, { 0xF5A2, 0x9D94 }, { 0xF5A3, 0x9D9C }, 
-	{ 0xF5A4, 0x9DAA }, { 0xF5A5, 0x9D97 }, { 0xF5A6, 0x9DA1 }, { 0xF5A7, 0x9D9A }, { 0xF5A8, 0x9DA2 }, { 0xF5A9, 0x9DA8 }, { 0xF5AA, 0x9D9E }, { 0xF5AB, 0x9DA3 }, 
-	{ 0xF5AC, 0x9DBF }, { 0xF5AD, 0x9DA9 }, { 0xF5AE, 0x9D96 }, { 0xF5AF, 0x9DA6 }, { 0xF5B0, 0x9DA7 }, { 0xF5B1, 0x9E99 }, { 0xF5B2, 0x9E9B }, { 0xF5B3, 0x9E9A }, 
-	{ 0xF5B4, 0x9EE5 }, { 0xF5B5, 0x9EE4 }, { 0xF5B6, 0x9EE7 }, { 0xF5B7, 0x9EE6 }, { 0xF5B8, 0x9F30 }, { 0xF5B9, 0x9F2E }, { 0xF5BA, 0x9F5B }, { 0xF5BB, 0x9F60 }, 
-	{ 0xF5BC, 0x9F5E }, { 0xF5BD, 0x9F5D }, { 0xF5BE, 0x9F59 }, { 0xF5BF, 0x9F91 }, { 0xF5C0, 0x513A }, { 0xF5C1, 0x5139 }, { 0xF5C2, 0x5298 }, { 0xF5C3, 0x5297 }, 
-	{ 0xF5C4, 0x56C3 }, { 0xF5C5, 0x56BD }, { 0xF5C6, 0x56BE }, { 0xF5C7, 0x5B48 }, { 0xF5C8, 0x5B47 }, { 0xF5C9, 0x5DCB }, { 0xF5CA, 0x5DCF }, { 0xF5CB, 0x5EF1 }, 
-	{ 0xF5CC, 0x61FD }, { 0xF5CD, 0x651B }, { 0xF5CE, 0x6B02 }, { 0xF5CF, 0x6AFC }, { 0xF5D0, 0x6B03 }, { 0xF5D1, 0x6AF8 }, { 0xF5D2, 0x6B00 }, { 0xF5D3, 0x7043 }, 
-	{ 0xF5D4, 0x7044 }, { 0xF5D5, 0x704A }, { 0xF5D6, 0x7048 }, { 0xF5D7, 0x7049 }, { 0xF5D8, 0x7045 }, { 0xF5D9, 0x7046 }, { 0xF5DA, 0x721D }, { 0xF5DB, 0x721A }, 
-	{ 0xF5DC, 0x7219 }, { 0xF5DD, 0x737E }, { 0xF5DE, 0x7517 }, { 0xF5DF, 0x766A }, { 0xF5E0, 0x77D0 }, { 0xF5E1, 0x792D }, { 0xF5E2, 0x7931 }, { 0xF5E3, 0x792F }, 
-	{ 0xF5E4, 0x7C54 }, { 0xF5E5, 0x7C53 }, { 0xF5E6, 0x7CF2 }, { 0xF5E7, 0x7E8A }, { 0xF5E8, 0x7E87 }, { 0xF5E9, 0x7E88 }, { 0xF5EA, 0x7E8B }, { 0xF5EB, 0x7E86 }, 
-	{ 0xF5EC, 0x7E8D }, { 0xF5ED, 0x7F4D }, { 0xF5EE, 0x7FBB }, { 0xF5EF, 0x8030 }, { 0xF5F0, 0x81DD }, { 0xF5F1, 0x8618 }, { 0xF5F2, 0x862A }, { 0xF5F3, 0x8626 }, 
-	{ 0xF5F4, 0x861F }, { 0xF5F5, 0x8623 }, { 0xF5F6, 0x861C }, { 0xF5F7, 0x8619 }, { 0xF5F8, 0x8627 }, { 0xF5F9, 0x862E }, { 0xF5FA, 0x8621 }, { 0xF5FB, 0x8620 }, 
-	{ 0xF5FC, 0x8629 }, { 0xF5FD, 0x861E }, { 0xF5FE, 0x8625 }, { 0xF640, 0x8829 }, { 0xF641, 0x881D }, { 0xF642, 0x881B }, { 0xF643, 0x8820 }, { 0xF644, 0x8824 }, 
-	{ 0xF645, 0x881C }, { 0xF646, 0x882B }, { 0xF647, 0x884A }, { 0xF648, 0x896D }, { 0xF649, 0x8969 }, { 0xF64A, 0x896E }, { 0xF64B, 0x896B }, { 0xF64C, 0x89FA }, 
-	{ 0xF64D, 0x8B79 }, { 0xF64E, 0x8B78 }, { 0xF64F, 0x8B45 }, { 0xF650, 0x8B7A }, { 0xF651, 0x8B7B }, { 0xF652, 0x8D10 }, { 0xF653, 0x8D14 }, { 0xF654, 0x8DAF }, 
-	{ 0xF655, 0x8E8E }, { 0xF656, 0x8E8C }, { 0xF657, 0x8F5E }, { 0xF658, 0x8F5B }, { 0xF659, 0x8F5D }, { 0xF65A, 0x9146 }, { 0xF65B, 0x9144 }, { 0xF65C, 0x9145 }, 
-	{ 0xF65D, 0x91B9 }, { 0xF65E, 0x943F }, { 0xF65F, 0x943B }, { 0xF660, 0x9436 }, { 0xF661, 0x9429 }, { 0xF662, 0x943D }, { 0xF663, 0x943C }, { 0xF664, 0x9430 }, 
-	{ 0xF665, 0x9439 }, { 0xF666, 0x942A }, { 0xF667, 0x9437 }, { 0xF668, 0x942C }, { 0xF669, 0x9440 }, { 0xF66A, 0x9431 }, { 0xF66B, 0x95E5 }, { 0xF66C, 0x95E4 }, 
-	{ 0xF66D, 0x95E3 }, { 0xF66E, 0x9735 }, { 0xF66F, 0x973A }, { 0xF670, 0x97BF }, { 0xF671, 0x97E1 }, { 0xF672, 0x9864 }, { 0xF673, 0x98C9 }, { 0xF674, 0x98C6 }, 
-	{ 0xF675, 0x98C0 }, { 0xF676, 0x9958 }, { 0xF677, 0x9956 }, { 0xF678, 0x9A39 }, { 0xF679, 0x9A3D }, { 0xF67A, 0x9A46 }, { 0xF67B, 0x9A44 }, { 0xF67C, 0x9A42 }, 
-	{ 0xF67D, 0x9A41 }, { 0xF67E, 0x9A3A }, { 0xF6A1, 0x9A3F }, { 0xF6A2, 0x9ACD }, { 0xF6A3, 0x9B15 }, { 0xF6A4, 0x9B17 }, { 0xF6A5, 0x9B18 }, { 0xF6A6, 0x9B16 }, 
-	{ 0xF6A7, 0x9B3A }, { 0xF6A8, 0x9B52 }, { 0xF6A9, 0x9C2B }, { 0xF6AA, 0x9C1D }, { 0xF6AB, 0x9C1C }, { 0xF6AC, 0x9C2C }, { 0xF6AD, 0x9C23 }, { 0xF6AE, 0x9C28 }, 
-	{ 0xF6AF, 0x9C29 }, { 0xF6B0, 0x9C24 }, { 0xF6B1, 0x9C21 }, { 0xF6B2, 0x9DB7 }, { 0xF6B3, 0x9DB6 }, { 0xF6B4, 0x9DBC }, { 0xF6B5, 0x9DC1 }, { 0xF6B6, 0x9DC7 }, 
-	{ 0xF6B7, 0x9DCA }, { 0xF6B8, 0x9DCF }, { 0xF6B9, 0x9DBE }, { 0xF6BA, 0x9DC5 }, { 0xF6BB, 0x9DC3 }, { 0xF6BC, 0x9DBB }, { 0xF6BD, 0x9DB5 }, { 0xF6BE, 0x9DCE }, 
-	{ 0xF6BF, 0x9DB9 }, { 0xF6C0, 0x9DBA }, { 0xF6C1, 0x9DAC }, { 0xF6C2, 0x9DC8 }, { 0xF6C3, 0x9DB1 }, { 0xF6C4, 0x9DAD }, { 0xF6C5, 0x9DCC }, { 0xF6C6, 0x9DB3 }, 
-	{ 0xF6C7, 0x9DCD }, { 0xF6C8, 0x9DB2 }, { 0xF6C9, 0x9E7A }, { 0xF6CA, 0x9E9C }, { 0xF6CB, 0x9EEB }, { 0xF6CC, 0x9EEE }, { 0xF6CD, 0x9EED }, { 0xF6CE, 0x9F1B }, 
-	{ 0xF6CF, 0x9F18 }, { 0xF6D0, 0x9F1A }, { 0xF6D1, 0x9F31 }, { 0xF6D2, 0x9F4E }, { 0xF6D3, 0x9F65 }, { 0xF6D4, 0x9F64 }, { 0xF6D5, 0x9F92 }, { 0xF6D6, 0x4EB9 }, 
-	{ 0xF6D7, 0x56C6 }, { 0xF6D8, 0x56C5 }, { 0xF6D9, 0x56CB }, { 0xF6DA, 0x5971 }, { 0xF6DB, 0x5B4B }, { 0xF6DC, 0x5B4C }, { 0xF6DD, 0x5DD5 }, { 0xF6DE, 0x5DD1 }, 
-	{ 0xF6DF, 0x5EF2 }, { 0xF6E0, 0x6521 }, { 0xF6E1, 0x6520 }, { 0xF6E2, 0x6526 }, { 0xF6E3, 0x6522 }, { 0xF6E4, 0x6B0B }, { 0xF6E5, 0x6B08 }, { 0xF6E6, 0x6B09 }, 
-	{ 0xF6E7, 0x6C0D }, { 0xF6E8, 0x7055 }, { 0xF6E9, 0x7056 }, { 0xF6EA, 0x7057 }, { 0xF6EB, 0x7052 }, { 0xF6EC, 0x721E }, { 0xF6ED, 0x721F }, { 0xF6EE, 0x72A9 }, 
-	{ 0xF6EF, 0x737F }, { 0xF6F0, 0x74D8 }, { 0xF6F1, 0x74D5 }, { 0xF6F2, 0x74D9 }, { 0xF6F3, 0x74D7 }, { 0xF6F4, 0x766D }, { 0xF6F5, 0x76AD }, { 0xF6F6, 0x7935 }, 
-	{ 0xF6F7, 0x79B4 }, { 0xF6F8, 0x7A70 }, { 0xF6F9, 0x7A71 }, { 0xF6FA, 0x7C57 }, { 0xF6FB, 0x7C5C }, { 0xF6FC, 0x7C59 }, { 0xF6FD, 0x7C5B }, { 0xF6FE, 0x7C5A }, 
-	{ 0xF740, 0x7CF4 }, { 0xF741, 0x7CF1 }, { 0xF742, 0x7E91 }, { 0xF743, 0x7F4F }, { 0xF744, 0x7F87 }, { 0xF745, 0x81DE }, { 0xF746, 0x826B }, { 0xF747, 0x8634 }, 
-	{ 0xF748, 0x8635 }, { 0xF749, 0x8633 }, { 0xF74A, 0x862C }, { 0xF74B, 0x8632 }, { 0xF74C, 0x8636 }, { 0xF74D, 0x882C }, { 0xF74E, 0x8828 }, { 0xF74F, 0x8826 }, 
-	{ 0xF750, 0x882A }, { 0xF751, 0x8825 }, { 0xF752, 0x8971 }, { 0xF753, 0x89BF }, { 0xF754, 0x89BE }, { 0xF755, 0x89FB }, { 0xF756, 0x8B7E }, { 0xF757, 0x8B84 }, 
-	{ 0xF758, 0x8B82 }, { 0xF759, 0x8B86 }, { 0xF75A, 0x8B85 }, { 0xF75B, 0x8B7F }, { 0xF75C, 0x8D15 }, { 0xF75D, 0x8E95 }, { 0xF75E, 0x8E94 }, { 0xF75F, 0x8E9A }, 
-	{ 0xF760, 0x8E92 }, { 0xF761, 0x8E90 }, { 0xF762, 0x8E96 }, { 0xF763, 0x8E97 }, { 0xF764, 0x8F60 }, { 0xF765, 0x8F62 }, { 0xF766, 0x9147 }, { 0xF767, 0x944C }, 
-	{ 0xF768, 0x9450 }, { 0xF769, 0x944A }, { 0xF76A, 0x944B }, { 0xF76B, 0x944F }, { 0xF76C, 0x9447 }, { 0xF76D, 0x9445 }, { 0xF76E, 0x9448 }, { 0xF76F, 0x9449 }, 
-	{ 0xF770, 0x9446 }, { 0xF771, 0x973F }, { 0xF772, 0x97E3 }, { 0xF773, 0x986A }, { 0xF774, 0x9869 }, { 0xF775, 0x98CB }, { 0xF776, 0x9954 }, { 0xF777, 0x995B }, 
-	{ 0xF778, 0x9A4E }, { 0xF779, 0x9A53 }, { 0xF77A, 0x9A54 }, { 0xF77B, 0x9A4C }, { 0xF77C, 0x9A4F }, { 0xF77D, 0x9A48 }, { 0xF77E, 0x9A4A }, { 0xF7A1, 0x9A49 }, 
-	{ 0xF7A2, 0x9A52 }, { 0xF7A3, 0x9A50 }, { 0xF7A4, 0x9AD0 }, { 0xF7A5, 0x9B19 }, { 0xF7A6, 0x9B2B }, { 0xF7A7, 0x9B3B }, { 0xF7A8, 0x9B56 }, { 0xF7A9, 0x9B55 }, 
-	{ 0xF7AA, 0x9C46 }, { 0xF7AB, 0x9C48 }, { 0xF7AC, 0x9C3F }, { 0xF7AD, 0x9C44 }, { 0xF7AE, 0x9C39 }, { 0xF7AF, 0x9C33 }, { 0xF7B0, 0x9C41 }, { 0xF7B1, 0x9C3C }, 
-	{ 0xF7B2, 0x9C37 }, { 0xF7B3, 0x9C34 }, { 0xF7B4, 0x9C32 }, { 0xF7B5, 0x9C3D }, { 0xF7B6, 0x9C36 }, { 0xF7B7, 0x9DDB }, { 0xF7B8, 0x9DD2 }, { 0xF7B9, 0x9DDE }, 
-	{ 0xF7BA, 0x9DDA }, { 0xF7BB, 0x9DCB }, { 0xF7BC, 0x9DD0 }, { 0xF7BD, 0x9DDC }, { 0xF7BE, 0x9DD1 }, { 0xF7BF, 0x9DDF }, { 0xF7C0, 0x9DE9 }, { 0xF7C1, 0x9DD9 }, 
-	{ 0xF7C2, 0x9DD8 }, { 0xF7C3, 0x9DD6 }, { 0xF7C4, 0x9DF5 }, { 0xF7C5, 0x9DD5 }, { 0xF7C6, 0x9DDD }, { 0xF7C7, 0x9EB6 }, { 0xF7C8, 0x9EF0 }, { 0xF7C9, 0x9F35 }, 
-	{ 0xF7CA, 0x9F33 }, { 0xF7CB, 0x9F32 }, { 0xF7CC, 0x9F42 }, { 0xF7CD, 0x9F6B }, { 0xF7CE, 0x9F95 }, { 0xF7CF, 0x9FA2 }, { 0xF7D0, 0x513D }, { 0xF7D1, 0x5299 }, 
-	{ 0xF7D2, 0x58E8 }, { 0xF7D3, 0x58E7 }, { 0xF7D4, 0x5972 }, { 0xF7D5, 0x5B4D }, { 0xF7D6, 0x5DD8 }, { 0xF7D7, 0x882F }, { 0xF7D8, 0x5F4F }, { 0xF7D9, 0x6201 }, 
-	{ 0xF7DA, 0x6203 }, { 0xF7DB, 0x6204 }, { 0xF7DC, 0x6529 }, { 0xF7DD, 0x6525 }, { 0xF7DE, 0x6596 }, { 0xF7DF, 0x66EB }, { 0xF7E0, 0x6B11 }, { 0xF7E1, 0x6B12 }, 
-	{ 0xF7E2, 0x6B0F }, { 0xF7E3, 0x6BCA }, { 0xF7E4, 0x705B }, { 0xF7E5, 0x705A }, { 0xF7E6, 0x7222 }, { 0xF7E7, 0x7382 }, { 0xF7E8, 0x7381 }, { 0xF7E9, 0x7383 }, 
-	{ 0xF7EA, 0x7670 }, { 0xF7EB, 0x77D4 }, { 0xF7EC, 0x7C67 }, { 0xF7ED, 0x7C66 }, { 0xF7EE, 0x7E95 }, { 0xF7EF, 0x826C }, { 0xF7F0, 0x863A }, { 0xF7F1, 0x8640 }, 
-	{ 0xF7F2, 0x8639 }, { 0xF7F3, 0x863C }, { 0xF7F4, 0x8631 }, { 0xF7F5, 0x863B }, { 0xF7F6, 0x863E }, { 0xF7F7, 0x8830 }, { 0xF7F8, 0x8832 }, { 0xF7F9, 0x882E }, 
-	{ 0xF7FA, 0x8833 }, { 0xF7FB, 0x8976 }, { 0xF7FC, 0x8974 }, { 0xF7FD, 0x8973 }, { 0xF7FE, 0x89FE }, { 0xF840, 0x8B8C }, { 0xF841, 0x8B8E }, { 0xF842, 0x8B8B }, 
-	{ 0xF843, 0x8B88 }, { 0xF844, 0x8C45 }, { 0xF845, 0x8D19 }, { 0xF846, 0x8E98 }, { 0xF847, 0x8F64 }, { 0xF848, 0x8F63 }, { 0xF849, 0x91BC }, { 0xF84A, 0x9462 }, 
-	{ 0xF84B, 0x9455 }, { 0xF84C, 0x945D }, { 0xF84D, 0x9457 }, { 0xF84E, 0x945E }, { 0xF84F, 0x97C4 }, { 0xF850, 0x97C5 }, { 0xF851, 0x9800 }, { 0xF852, 0x9A56 }, 
-	{ 0xF853, 0x9A59 }, { 0xF854, 0x9B1E }, { 0xF855, 0x9B1F }, { 0xF856, 0x9B20 }, { 0xF857, 0x9C52 }, { 0xF858, 0x9C58 }, { 0xF859, 0x9C50 }, { 0xF85A, 0x9C4A }, 
-	{ 0xF85B, 0x9C4D }, { 0xF85C, 0x9C4B }, { 0xF85D, 0x9C55 }, { 0xF85E, 0x9C59 }, { 0xF85F, 0x9C4C }, { 0xF860, 0x9C4E }, { 0xF861, 0x9DFB }, { 0xF862, 0x9DF7 }, 
-	{ 0xF863, 0x9DEF }, { 0xF864, 0x9DE3 }, { 0xF865, 0x9DEB }, { 0xF866, 0x9DF8 }, { 0xF867, 0x9DE4 }, { 0xF868, 0x9DF6 }, { 0xF869, 0x9DE1 }, { 0xF86A, 0x9DEE }, 
-	{ 0xF86B, 0x9DE6 }, { 0xF86C, 0x9DF2 }, { 0xF86D, 0x9DF0 }, { 0xF86E, 0x9DE2 }, { 0xF86F, 0x9DEC }, { 0xF870, 0x9DF4 }, { 0xF871, 0x9DF3 }, { 0xF872, 0x9DE8 }, 
-	{ 0xF873, 0x9DED }, { 0xF874, 0x9EC2 }, { 0xF875, 0x9ED0 }, { 0xF876, 0x9EF2 }, { 0xF877, 0x9EF3 }, { 0xF878, 0x9F06 }, { 0xF879, 0x9F1C }, { 0xF87A, 0x9F38 }, 
-	{ 0xF87B, 0x9F37 }, { 0xF87C, 0x9F36 }, { 0xF87D, 0x9F43 }, { 0xF87E, 0x9F4F }, { 0xF8A1, 0x9F71 }, { 0xF8A2, 0x9F70 }, { 0xF8A3, 0x9F6E }, { 0xF8A4, 0x9F6F }, 
-	{ 0xF8A5, 0x56D3 }, { 0xF8A6, 0x56CD }, { 0xF8A7, 0x5B4E }, { 0xF8A8, 0x5C6D }, { 0xF8A9, 0x652D }, { 0xF8AA, 0x66ED }, { 0xF8AB, 0x66EE }, { 0xF8AC, 0x6B13 }, 
-	{ 0xF8AD, 0x705F }, { 0xF8AE, 0x7061 }, { 0xF8AF, 0x705D }, { 0xF8B0, 0x7060 }, { 0xF8B1, 0x7223 }, { 0xF8B2, 0x74DB }, { 0xF8B3, 0x74E5 }, { 0xF8B4, 0x77D5 }, 
-	{ 0xF8B5, 0x7938 }, { 0xF8B6, 0x79B7 }, { 0xF8B7, 0x79B6 }, { 0xF8B8, 0x7C6A }, { 0xF8B9, 0x7E97 }, { 0xF8BA, 0x7F89 }, { 0xF8BB, 0x826D }, { 0xF8BC, 0x8643 }, 
-	{ 0xF8BD, 0x8838 }, { 0xF8BE, 0x8837 }, { 0xF8BF, 0x8835 }, { 0xF8C0, 0x884B }, { 0xF8C1, 0x8B94 }, { 0xF8C2, 0x8B95 }, { 0xF8C3, 0x8E9E }, { 0xF8C4, 0x8E9F }, 
-	{ 0xF8C5, 0x8EA0 }, { 0xF8C6, 0x8E9D }, { 0xF8C7, 0x91BE }, { 0xF8C8, 0x91BD }, { 0xF8C9, 0x91C2 }, { 0xF8CA, 0x946B }, { 0xF8CB, 0x9468 }, { 0xF8CC, 0x9469 }, 
-	{ 0xF8CD, 0x96E5 }, { 0xF8CE, 0x9746 }, { 0xF8CF, 0x9743 }, { 0xF8D0, 0x9747 }, { 0xF8D1, 0x97C7 }, { 0xF8D2, 0x97E5 }, { 0xF8D3, 0x9A5E }, { 0xF8D4, 0x9AD5 }, 
-	{ 0xF8D5, 0x9B59 }, { 0xF8D6, 0x9C63 }, { 0xF8D7, 0x9C67 }, { 0xF8D8, 0x9C66 }, { 0xF8D9, 0x9C62 }, { 0xF8DA, 0x9C5E }, { 0xF8DB, 0x9C60 }, { 0xF8DC, 0x9E02 }, 
-	{ 0xF8DD, 0x9DFE }, { 0xF8DE, 0x9E07 }, { 0xF8DF, 0x9E03 }, { 0xF8E0, 0x9E06 }, { 0xF8E1, 0x9E05 }, { 0xF8E2, 0x9E00 }, { 0xF8E3, 0x9E01 }, { 0xF8E4, 0x9E09 }, 
-	{ 0xF8E5, 0x9DFF }, { 0xF8E6, 0x9DFD }, { 0xF8E7, 0x9E04 }, { 0xF8E8, 0x9EA0 }, { 0xF8E9, 0x9F1E }, { 0xF8EA, 0x9F46 }, { 0xF8EB, 0x9F74 }, { 0xF8EC, 0x9F75 }, 
-	{ 0xF8ED, 0x9F76 }, { 0xF8EE, 0x56D4 }, { 0xF8EF, 0x652E }, { 0xF8F0, 0x65B8 }, { 0xF8F1, 0x6B18 }, { 0xF8F2, 0x6B19 }, { 0xF8F3, 0x6B17 }, { 0xF8F4, 0x6B1A }, 
-	{ 0xF8F5, 0x7062 }, { 0xF8F6, 0x7226 }, { 0xF8F7, 0x72AA }, { 0xF8F8, 0x77D8 }, { 0xF8F9, 0x77D9 }, { 0xF8FA, 0x7939 }, { 0xF8FB, 0x7C69 }, { 0xF8FC, 0x7C6B }, 
-	{ 0xF8FD, 0x7CF6 }, { 0xF8FE, 0x7E9A }, { 0xF940, 0x7E98 }, { 0xF941, 0x7E9B }, { 0xF942, 0x7E99 }, { 0xF943, 0x81E0 }, { 0xF944, 0x81E1 }, { 0xF945, 0x8646 }, 
-	{ 0xF946, 0x8647 }, { 0xF947, 0x8648 }, { 0xF948, 0x8979 }, { 0xF949, 0x897A }, { 0xF94A, 0x897C }, { 0xF94B, 0x897B }, { 0xF94C, 0x89FF }, { 0xF94D, 0x8B98 }, 
-	{ 0xF94E, 0x8B99 }, { 0xF94F, 0x8EA5 }, { 0xF950, 0x8EA4 }, { 0xF951, 0x8EA3 }, { 0xF952, 0x946E }, { 0xF953, 0x946D }, { 0xF954, 0x946F }, { 0xF955, 0x9471 }, 
-	{ 0xF956, 0x9473 }, { 0xF957, 0x9749 }, { 0xF958, 0x9872 }, { 0xF959, 0x995F }, { 0xF95A, 0x9C68 }, { 0xF95B, 0x9C6E }, { 0xF95C, 0x9C6D }, { 0xF95D, 0x9E0B }, 
-	{ 0xF95E, 0x9E0D }, { 0xF95F, 0x9E10 }, { 0xF960, 0x9E0F }, { 0xF961, 0x9E12 }, { 0xF962, 0x9E11 }, { 0xF963, 0x9EA1 }, { 0xF964, 0x9EF5 }, { 0xF965, 0x9F09 }, 
-	{ 0xF966, 0x9F47 }, { 0xF967, 0x9F78 }, { 0xF968, 0x9F7B }, { 0xF969, 0x9F7A }, { 0xF96A, 0x9F79 }, { 0xF96B, 0x571E }, { 0xF96C, 0x7066 }, { 0xF96D, 0x7C6F }, 
-	{ 0xF96E, 0x883C }, { 0xF96F, 0x8DB2 }, { 0xF970, 0x8EA6 }, { 0xF971, 0x91C3 }, { 0xF972, 0x9474 }, { 0xF973, 0x9478 }, { 0xF974, 0x9476 }, { 0xF975, 0x9475 }, 
-	{ 0xF976, 0x9A60 }, { 0xF977, 0x9C74 }, { 0xF978, 0x9C73 }, { 0xF979, 0x9C71 }, { 0xF97A, 0x9C75 }, { 0xF97B, 0x9E14 }, { 0xF97C, 0x9E13 }, { 0xF97D, 0x9EF6 }, 
-	{ 0xF97E, 0x9F0A }, { 0xF9A1, 0x9FA4 }, { 0xF9A2, 0x7068 }, { 0xF9A3, 0x7065 }, { 0xF9A4, 0x7CF7 }, { 0xF9A5, 0x866A }, { 0xF9A6, 0x883E }, { 0xF9A7, 0x883D }, 
-	{ 0xF9A8, 0x883F }, { 0xF9A9, 0x8B9E }, { 0xF9AA, 0x8C9C }, { 0xF9AB, 0x8EA9 }, { 0xF9AC, 0x8EC9 }, { 0xF9AD, 0x974B }, { 0xF9AE, 0x9873 }, { 0xF9AF, 0x9874 }, 
-	{ 0xF9B0, 0x98CC }, { 0xF9B1, 0x9961 }, { 0xF9B2, 0x99AB }, { 0xF9B3, 0x9A64 }, { 0xF9B4, 0x9A66 }, { 0xF9B5, 0x9A67 }, { 0xF9B6, 0x9B24 }, { 0xF9B7, 0x9E15 }, 
-	{ 0xF9B8, 0x9E17 }, { 0xF9B9, 0x9F48 }, { 0xF9BA, 0x6207 }, { 0xF9BB, 0x6B1E }, { 0xF9BC, 0x7227 }, { 0xF9BD, 0x864C }, { 0xF9BE, 0x8EA8 }, { 0xF9BF, 0x9482 }, 
-	{ 0xF9C0, 0x9480 }, { 0xF9C1, 0x9481 }, { 0xF9C2, 0x9A69 }, { 0xF9C3, 0x9A68 }, { 0xF9C4, 0x9B2E }, { 0xF9C5, 0x9E19 }, { 0xF9C6, 0x7229 }, { 0xF9C7, 0x864B }, 
-	{ 0xF9C8, 0x8B9F }, { 0xF9C9, 0x9483 }, { 0xF9CA, 0x9C79 }, { 0xF9CB, 0x9EB7 }, { 0xF9CC, 0x7675 }, { 0xF9CD, 0x9A6B }, { 0xF9CE, 0x9C7A }, { 0xF9CF, 0x9E1D }, 
-	{ 0xF9D0, 0x7069 }, { 0xF9D1, 0x706A }, { 0xF9D2, 0x9EA4 }, { 0xF9D3, 0x9F7E }, { 0xF9D4, 0x9F49 }, { 0xF9D5, 0x9F98 }, 
+	{ 0xA140, 0x3000 }, { 0xA141, 0xFF0C }, { 0xA142, 0x3001 }, { 0xA143, 0x3002 }, { 0xA144, 0xFF0E }, { 0xA145, 0x00B7 }, { 0xA146, 0xFF1B }, { 0xA147, 0xFF1A },
+	{ 0xA148, 0xFF1F }, { 0xA149, 0xFF01 }, { 0xA14A, 0xFE30 }, { 0xA14B, 0x22EF }, { 0xA14C, 0x2025 }, { 0xA155, 0xFF5C }, { 0xA156, 0x2013 }, { 0xA157, 0xFE31 },
+	{ 0xA158, 0x2014 }, { 0xA159, 0xFE33 }, { 0xA15B, 0xFE34 }, { 0xA15C, 0xFE4F }, { 0xA15D, 0xFF08 }, { 0xA15E, 0xFF09 }, { 0xA15F, 0xFE35 }, { 0xA160, 0xFE36 },
+	{ 0xA161, 0xFF5B }, { 0xA162, 0xFF5D }, { 0xA163, 0xFE37 }, { 0xA164, 0xFE38 }, { 0xA165, 0x3014 }, { 0xA166, 0x3015 }, { 0xA167, 0xFE39 }, { 0xA168, 0xFE3A },
+	{ 0xA169, 0x3010 }, { 0xA16A, 0x3011 }, { 0xA16B, 0xFE3B }, { 0xA16C, 0xFE3C }, { 0xA16D, 0x300A }, { 0xA16E, 0x300B }, { 0xA16F, 0xFE3D }, { 0xA170, 0xFE3E },
+	{ 0xA171, 0x3008 }, { 0xA172, 0x3009 }, { 0xA173, 0xFE3F }, { 0xA174, 0xFE40 }, { 0xA175, 0x300C }, { 0xA176, 0x300D }, { 0xA177, 0xFE41 }, { 0xA178, 0xFE42 },
+	{ 0xA179, 0x300E }, { 0xA17A, 0x300F }, { 0xA17B, 0xFE43 }, { 0xA17C, 0xFE44 }, { 0xA1A5, 0x2018 }, { 0xA1A6, 0x2019 }, { 0xA1A7, 0x201C }, { 0xA1A8, 0x201D },
+	{ 0xA1A9, 0x301D }, { 0xA1AA, 0x301E }, { 0xA1AB, 0x2035 }, { 0xA1AC, 0x2032 }, { 0xA1AD, 0xFF03 }, { 0xA1AE, 0xFF06 }, { 0xA1AF, 0xFF0A }, { 0xA1B0, 0x203B },
+	{ 0xA1B1, 0x00A7 }, { 0xA1B2, 0x3003 }, { 0xA1B3, 0x25CB }, { 0xA1B4, 0x25CF }, { 0xA1B5, 0x25B3 }, { 0xA1B6, 0x25B2 }, { 0xA1B7, 0x25CE }, { 0xA1B8, 0x2606 },
+	{ 0xA1B9, 0x2605 }, { 0xA1BA, 0x25C7 }, { 0xA1BB, 0x25C6 }, { 0xA1BC, 0x25A1 }, { 0xA1BD, 0x25A0 }, { 0xA1BE, 0x25BD }, { 0xA1BF, 0x25BC }, { 0xA1C0, 0x32A3 },
+	{ 0xA1C1, 0x2105 }, { 0xA1C2, 0x203E }, { 0xA1C4, 0xFF3F }, { 0xA1C6, 0xFE49 }, { 0xA1C7, 0xFE4A }, { 0xA1C8, 0xFE4D }, { 0xA1C9, 0xFE4E }, { 0xA1CA, 0xFE4B },
+	{ 0xA1CC, 0xFE5F }, { 0xA1CD, 0xFE60 }, { 0xA1CE, 0xFE61 }, { 0xA1CF, 0xFF0B }, { 0xA1D0, 0xFF0D }, { 0xA1D1, 0x00D7 }, { 0xA1D2, 0x00F7 }, { 0xA1D3, 0x00B1 },
+	{ 0xA1D4, 0x221A }, { 0xA1D5, 0xFF1C }, { 0xA1D6, 0xFF1E }, { 0xA1D7, 0xFF1D }, { 0xA1D8, 0x2266 }, { 0xA1D9, 0x2267 }, { 0xA1DA, 0x2260 }, { 0xA1DB, 0x221E },
+	{ 0xA1DC, 0x2252 }, { 0xA1DD, 0x2261 }, { 0xA1DE, 0xFE62 }, { 0xA1DF, 0xFE63 }, { 0xA1E0, 0xFE64 }, { 0xA1E1, 0xFE65 }, { 0xA1E2, 0xFE66 }, { 0xA1E3, 0x223C },
+	{ 0xA1E4, 0x2229 }, { 0xA1E5, 0x222A }, { 0xA1E6, 0x22A5 }, { 0xA1E7, 0x2220 }, { 0xA1E8, 0x221F }, { 0xA1E9, 0x22BF }, { 0xA1EA, 0x33D2 }, { 0xA1EB, 0x33D1 },
+	{ 0xA1EC, 0x222B }, { 0xA1ED, 0x222E }, { 0xA1EE, 0x2235 }, { 0xA1EF, 0x2234 }, { 0xA1F0, 0x2640 }, { 0xA1F1, 0x2642 }, { 0xA1F2, 0x2295 }, { 0xA1F3, 0x2609 },
+	{ 0xA1F4, 0x2191 }, { 0xA1F5, 0x2193 }, { 0xA1F6, 0x2190 }, { 0xA1F7, 0x2192 }, { 0xA1F8, 0x2196 }, { 0xA1F9, 0x2197 }, { 0xA1FA, 0x2199 }, { 0xA1FB, 0x2198 },
+	{ 0xA1FC, 0x2225 }, { 0xA1FD, 0x2223 }, { 0xA241, 0xFF0F }, { 0xA242, 0xFF3C }, { 0xA243, 0xFF04 }, { 0xA244, 0x00A5 }, { 0xA245, 0x3012 }, { 0xA246, 0x00A2 },
+	{ 0xA247, 0x00A3 }, { 0xA248, 0xFF05 }, { 0xA249, 0xFF20 }, { 0xA24A, 0x2103 }, { 0xA24B, 0x2109 }, { 0xA24C, 0xFE69 }, { 0xA24D, 0xFE6A }, { 0xA24E, 0xFE6B },
+	{ 0xA24F, 0x33D5 }, { 0xA250, 0x339C }, { 0xA251, 0x339D }, { 0xA252, 0x339E }, { 0xA253, 0x33CE }, { 0xA254, 0x33A1 }, { 0xA255, 0x338E }, { 0xA256, 0x338F },
+	{ 0xA257, 0x33C4 }, { 0xA258, 0x00B0 }, { 0xA259, 0x5159 }, { 0xA25A, 0x515B }, { 0xA25B, 0x515E }, { 0xA25C, 0x515D }, { 0xA25D, 0x5161 }, { 0xA25E, 0x5163 },
+	{ 0xA25F, 0x55E7 }, { 0xA260, 0x74E9 }, { 0xA261, 0x7CCE }, { 0xA262, 0x2581 }, { 0xA263, 0x2582 }, { 0xA264, 0x2583 }, { 0xA265, 0x2584 }, { 0xA266, 0x2585 },
+	{ 0xA267, 0x2586 }, { 0xA268, 0x2587 }, { 0xA269, 0x2588 }, { 0xA26A, 0x258F }, { 0xA26B, 0x258E }, { 0xA26C, 0x258D }, { 0xA26D, 0x258C }, { 0xA26E, 0x258B },
+	{ 0xA26F, 0x258A }, { 0xA270, 0x2589 }, { 0xA271, 0x253C }, { 0xA272, 0x2534 }, { 0xA273, 0x252C }, { 0xA274, 0x2524 }, { 0xA275, 0x251C }, { 0xA276, 0x2594 },
+	{ 0xA277, 0x2500 }, { 0xA278, 0x2502 }, { 0xA27A, 0x250C }, { 0xA27B, 0x2510 }, { 0xA27C, 0x2514 }, { 0xA27D, 0x2518 }, { 0xA27E, 0x256D }, { 0xA2A1, 0x256E },
+	{ 0xA2A2, 0x2570 }, { 0xA2A3, 0x256F }, { 0xA2A4, 0x2550 }, { 0xA2A5, 0x255E }, { 0xA2A6, 0x256A }, { 0xA2A7, 0x2561 }, { 0xA2A8, 0x25E2 }, { 0xA2A9, 0x25E3 },
+	{ 0xA2AA, 0x25E5 }, { 0xA2AB, 0x25E4 }, { 0xA2AC, 0x2571 }, { 0xA2AD, 0x2572 }, { 0xA2AE, 0x2573 }, { 0xA2AF, 0xFF10 }, { 0xA2B0, 0xFF11 }, { 0xA2B1, 0xFF12 },
+	{ 0xA2B2, 0xFF13 }, { 0xA2B3, 0xFF14 }, { 0xA2B4, 0xFF15 }, { 0xA2B5, 0xFF16 }, { 0xA2B6, 0xFF17 }, { 0xA2B7, 0xFF18 }, { 0xA2B8, 0xFF19 }, { 0xA2B9, 0x2160 },
+	{ 0xA2BA, 0x2161 }, { 0xA2BB, 0x2162 }, { 0xA2BC, 0x2163 }, { 0xA2BD, 0x2164 }, { 0xA2BE, 0x2165 }, { 0xA2BF, 0x2166 }, { 0xA2C0, 0x2167 }, { 0xA2C1, 0x2168 },
+	{ 0xA2C2, 0x2169 }, { 0xA2C3, 0x3021 }, { 0xA2C4, 0x3022 }, { 0xA2C5, 0x3023 }, { 0xA2C6, 0x3024 }, { 0xA2C7, 0x3025 }, { 0xA2C8, 0x3026 }, { 0xA2C9, 0x3027 },
+	{ 0xA2CA, 0x3028 }, { 0xA2CB, 0x3029 }, { 0xA2CD, 0x5344 }, { 0xA2CF, 0xFF21 }, { 0xA2D0, 0xFF22 }, { 0xA2D1, 0xFF23 }, { 0xA2D2, 0xFF24 }, { 0xA2D3, 0xFF25 },
+	{ 0xA2D4, 0xFF26 }, { 0xA2D5, 0xFF27 }, { 0xA2D6, 0xFF28 }, { 0xA2D7, 0xFF29 }, { 0xA2D8, 0xFF2A }, { 0xA2D9, 0xFF2B }, { 0xA2DA, 0xFF2C }, { 0xA2DB, 0xFF2D },
+	{ 0xA2DC, 0xFF2E }, { 0xA2DD, 0xFF2F }, { 0xA2DE, 0xFF30 }, { 0xA2DF, 0xFF31 }, { 0xA2E0, 0xFF32 }, { 0xA2E1, 0xFF33 }, { 0xA2E2, 0xFF34 }, { 0xA2E3, 0xFF35 },
+	{ 0xA2E4, 0xFF36 }, { 0xA2E5, 0xFF37 }, { 0xA2E6, 0xFF38 }, { 0xA2E7, 0xFF39 }, { 0xA2E8, 0xFF3A }, { 0xA2E9, 0xFF41 }, { 0xA2EA, 0xFF42 }, { 0xA2EB, 0xFF43 },
+	{ 0xA2EC, 0xFF44 }, { 0xA2ED, 0xFF45 }, { 0xA2EE, 0xFF46 }, { 0xA2EF, 0xFF47 }, { 0xA2F0, 0xFF48 }, { 0xA2F1, 0xFF49 }, { 0xA2F2, 0xFF4A }, { 0xA2F3, 0xFF4B },
+	{ 0xA2F4, 0xFF4C }, { 0xA2F5, 0xFF4D }, { 0xA2F6, 0xFF4E }, { 0xA2F7, 0xFF4F }, { 0xA2F8, 0xFF50 }, { 0xA2F9, 0xFF51 }, { 0xA2FA, 0xFF52 }, { 0xA2FB, 0xFF53 },
+	{ 0xA2FC, 0xFF54 }, { 0xA2FD, 0xFF55 }, { 0xA2FE, 0xFF56 }, { 0xA340, 0xFF57 }, { 0xA341, 0xFF58 }, { 0xA342, 0xFF59 }, { 0xA343, 0xFF5A }, { 0xA344, 0x0391 },
+	{ 0xA345, 0x0392 }, { 0xA346, 0x0393 }, { 0xA347, 0x0394 }, { 0xA348, 0x0395 }, { 0xA349, 0x0396 }, { 0xA34A, 0x0397 }, { 0xA34B, 0x0398 }, { 0xA34C, 0x0399 },
+	{ 0xA34D, 0x039A }, { 0xA34E, 0x039B }, { 0xA34F, 0x039C }, { 0xA350, 0x039D }, { 0xA351, 0x039E }, { 0xA352, 0x039F }, { 0xA353, 0x03A0 }, { 0xA354, 0x03A1 },
+	{ 0xA355, 0x03A3 }, { 0xA356, 0x03A4 }, { 0xA357, 0x03A5 }, { 0xA358, 0x03A6 }, { 0xA359, 0x03A7 }, { 0xA35A, 0x03A8 }, { 0xA35B, 0x03A9 }, { 0xA35C, 0x03B1 },
+	{ 0xA35D, 0x03B2 }, { 0xA35E, 0x03B3 }, { 0xA35F, 0x03B4 }, { 0xA360, 0x03B5 }, { 0xA361, 0x03B6 }, { 0xA362, 0x03B7 }, { 0xA363, 0x03B8 }, { 0xA364, 0x03B9 },
+	{ 0xA365, 0x03BA }, { 0xA366, 0x03BB }, { 0xA367, 0x03BC }, { 0xA368, 0x03BD }, { 0xA369, 0x03BE }, { 0xA36A, 0x03BF }, { 0xA36B, 0x03C0 }, { 0xA36C, 0x03C1 },
+	{ 0xA36D, 0x03C3 }, { 0xA36E, 0x03C4 }, { 0xA36F, 0x03C5 }, { 0xA370, 0x03C6 }, { 0xA371, 0x03C7 }, { 0xA372, 0x03C8 }, { 0xA373, 0x03C9 }, { 0xA374, 0x3105 },
+	{ 0xA375, 0x3106 }, { 0xA376, 0x3107 }, { 0xA377, 0x3108 }, { 0xA378, 0x3109 }, { 0xA379, 0x310A }, { 0xA37A, 0x310B }, { 0xA37B, 0x310C }, { 0xA37C, 0x310D },
+	{ 0xA37D, 0x310E }, { 0xA37E, 0x310F }, { 0xA3A1, 0x3110 }, { 0xA3A2, 0x3111 }, { 0xA3A3, 0x3112 }, { 0xA3A4, 0x3113 }, { 0xA3A5, 0x3114 }, { 0xA3A6, 0x3115 },
+	{ 0xA3A7, 0x3116 }, { 0xA3A8, 0x3117 }, { 0xA3A9, 0x3118 }, { 0xA3AA, 0x3119 }, { 0xA3AB, 0x311A }, { 0xA3AC, 0x311B }, { 0xA3AD, 0x311C }, { 0xA3AE, 0x311D },
+	{ 0xA3AF, 0x311E }, { 0xA3B0, 0x311F }, { 0xA3B1, 0x3120 }, { 0xA3B2, 0x3121 }, { 0xA3B3, 0x3122 }, { 0xA3B4, 0x3123 }, { 0xA3B5, 0x3124 }, { 0xA3B6, 0x3125 },
+	{ 0xA3B7, 0x3126 }, { 0xA3B8, 0x3127 }, { 0xA3B9, 0x3128 }, { 0xA3BA, 0x3129 }, { 0xA3BB, 0x02D9 }, { 0xA3BC, 0x02C9 }, { 0xA3BD, 0x02CA }, { 0xA3BE, 0x02C7 },
+	{ 0xA3BF, 0x02CB }, { 0xA440, 0x4E00 }, { 0xA441, 0x4E59 }, { 0xA442, 0x4E01 }, { 0xA443, 0x4E03 }, { 0xA444, 0x4E43 }, { 0xA445, 0x4E5D }, { 0xA446, 0x4E86 },
+	{ 0xA447, 0x4E8C }, { 0xA448, 0x4EBA }, { 0xA449, 0x513F }, { 0xA44A, 0x5165 }, { 0xA44B, 0x516B }, { 0xA44C, 0x51E0 }, { 0xA44D, 0x5200 }, { 0xA44E, 0x5201 },
+	{ 0xA44F, 0x529B }, { 0xA450, 0x5315 }, { 0xA451, 0x5341 }, { 0xA452, 0x535C }, { 0xA453, 0x53C8 }, { 0xA454, 0x4E09 }, { 0xA455, 0x4E0B }, { 0xA456, 0x4E08 },
+	{ 0xA457, 0x4E0A }, { 0xA458, 0x4E2B }, { 0xA459, 0x4E38 }, { 0xA45A, 0x51E1 }, { 0xA45B, 0x4E45 }, { 0xA45C, 0x4E48 }, { 0xA45D, 0x4E5F }, { 0xA45E, 0x4E5E },
+	{ 0xA45F, 0x4E8E }, { 0xA460, 0x4EA1 }, { 0xA461, 0x5140 }, { 0xA462, 0x5203 }, { 0xA463, 0x52FA }, { 0xA464, 0x5343 }, { 0xA465, 0x53C9 }, { 0xA466, 0x53E3 },
+	{ 0xA467, 0x571F }, { 0xA468, 0x58EB }, { 0xA469, 0x5915 }, { 0xA46A, 0x5927 }, { 0xA46B, 0x5973 }, { 0xA46C, 0x5B50 }, { 0xA46D, 0x5B51 }, { 0xA46E, 0x5B53 },
+	{ 0xA46F, 0x5BF8 }, { 0xA470, 0x5C0F }, { 0xA471, 0x5C22 }, { 0xA472, 0x5C38 }, { 0xA473, 0x5C71 }, { 0xA474, 0x5DDD }, { 0xA475, 0x5DE5 }, { 0xA476, 0x5DF1 },
+	{ 0xA477, 0x5DF2 }, { 0xA478, 0x5DF3 }, { 0xA479, 0x5DFE }, { 0xA47A, 0x5E72 }, { 0xA47B, 0x5EFE }, { 0xA47C, 0x5F0B }, { 0xA47D, 0x5F13 }, { 0xA47E, 0x624D },
+	{ 0xA4A1, 0x4E11 }, { 0xA4A2, 0x4E10 }, { 0xA4A3, 0x4E0D }, { 0xA4A4, 0x4E2D }, { 0xA4A5, 0x4E30 }, { 0xA4A6, 0x4E39 }, { 0xA4A7, 0x4E4B }, { 0xA4A8, 0x5C39 },
+	{ 0xA4A9, 0x4E88 }, { 0xA4AA, 0x4E91 }, { 0xA4AB, 0x4E95 }, { 0xA4AC, 0x4E92 }, { 0xA4AD, 0x4E94 }, { 0xA4AE, 0x4EA2 }, { 0xA4AF, 0x4EC1 }, { 0xA4B0, 0x4EC0 },
+	{ 0xA4B1, 0x4EC3 }, { 0xA4B2, 0x4EC6 }, { 0xA4B3, 0x4EC7 }, { 0xA4B4, 0x4ECD }, { 0xA4B5, 0x4ECA }, { 0xA4B6, 0x4ECB }, { 0xA4B7, 0x4EC4 }, { 0xA4B8, 0x5143 },
+	{ 0xA4B9, 0x5141 }, { 0xA4BA, 0x5167 }, { 0xA4BB, 0x516D }, { 0xA4BC, 0x516E }, { 0xA4BD, 0x516C }, { 0xA4BE, 0x5197 }, { 0xA4BF, 0x51F6 }, { 0xA4C0, 0x5206 },
+	{ 0xA4C1, 0x5207 }, { 0xA4C2, 0x5208 }, { 0xA4C3, 0x52FB }, { 0xA4C4, 0x52FE }, { 0xA4C5, 0x52FF }, { 0xA4C6, 0x5316 }, { 0xA4C7, 0x5339 }, { 0xA4C8, 0x5348 },
+	{ 0xA4C9, 0x5347 }, { 0xA4CA, 0x5345 }, { 0xA4CB, 0x535E }, { 0xA4CC, 0x5384 }, { 0xA4CD, 0x53CB }, { 0xA4CE, 0x53CA }, { 0xA4CF, 0x53CD }, { 0xA4D0, 0x58EC },
+	{ 0xA4D1, 0x5929 }, { 0xA4D2, 0x592B }, { 0xA4D3, 0x592A }, { 0xA4D4, 0x592D }, { 0xA4D5, 0x5B54 }, { 0xA4D6, 0x5C11 }, { 0xA4D7, 0x5C24 }, { 0xA4D8, 0x5C3A },
+	{ 0xA4D9, 0x5C6F }, { 0xA4DA, 0x5DF4 }, { 0xA4DB, 0x5E7B }, { 0xA4DC, 0x5EFF }, { 0xA4DD, 0x5F14 }, { 0xA4DE, 0x5F15 }, { 0xA4DF, 0x5FC3 }, { 0xA4E0, 0x6208 },
+	{ 0xA4E1, 0x6236 }, { 0xA4E2, 0x624B }, { 0xA4E3, 0x624E }, { 0xA4E4, 0x652F }, { 0xA4E5, 0x6587 }, { 0xA4E6, 0x6597 }, { 0xA4E7, 0x65A4 }, { 0xA4E8, 0x65B9 },
+	{ 0xA4E9, 0x65E5 }, { 0xA4EA, 0x66F0 }, { 0xA4EB, 0x6708 }, { 0xA4EC, 0x6728 }, { 0xA4ED, 0x6B20 }, { 0xA4EE, 0x6B62 }, { 0xA4EF, 0x6B79 }, { 0xA4F0, 0x6BCB },
+	{ 0xA4F1, 0x6BD4 }, { 0xA4F2, 0x6BDB }, { 0xA4F3, 0x6C0F }, { 0xA4F4, 0x6C34 }, { 0xA4F5, 0x706B }, { 0xA4F6, 0x722A }, { 0xA4F7, 0x7236 }, { 0xA4F8, 0x723B },
+	{ 0xA4F9, 0x7247 }, { 0xA4FA, 0x7259 }, { 0xA4FB, 0x725B }, { 0xA4FC, 0x72AC }, { 0xA4FD, 0x738B }, { 0xA4FE, 0x4E19 }, { 0xA540, 0x4E16 }, { 0xA541, 0x4E15 },
+	{ 0xA542, 0x4E14 }, { 0xA543, 0x4E18 }, { 0xA544, 0x4E3B }, { 0xA545, 0x4E4D }, { 0xA546, 0x4E4F }, { 0xA547, 0x4E4E }, { 0xA548, 0x4EE5 }, { 0xA549, 0x4ED8 },
+	{ 0xA54A, 0x4ED4 }, { 0xA54B, 0x4ED5 }, { 0xA54C, 0x4ED6 }, { 0xA54D, 0x4ED7 }, { 0xA54E, 0x4EE3 }, { 0xA54F, 0x4EE4 }, { 0xA550, 0x4ED9 }, { 0xA551, 0x4EDE },
+	{ 0xA552, 0x5145 }, { 0xA553, 0x5144 }, { 0xA554, 0x5189 }, { 0xA555, 0x518A }, { 0xA556, 0x51AC }, { 0xA557, 0x51F9 }, { 0xA558, 0x51FA }, { 0xA559, 0x51F8 },
+	{ 0xA55A, 0x520A }, { 0xA55B, 0x52A0 }, { 0xA55C, 0x529F }, { 0xA55D, 0x5305 }, { 0xA55E, 0x5306 }, { 0xA55F, 0x5317 }, { 0xA560, 0x531D }, { 0xA561, 0x4EDF },
+	{ 0xA562, 0x534A }, { 0xA563, 0x5349 }, { 0xA564, 0x5361 }, { 0xA565, 0x5360 }, { 0xA566, 0x536F }, { 0xA567, 0x536E }, { 0xA568, 0x53BB }, { 0xA569, 0x53EF },
+	{ 0xA56A, 0x53E4 }, { 0xA56B, 0x53F3 }, { 0xA56C, 0x53EC }, { 0xA56D, 0x53EE }, { 0xA56E, 0x53E9 }, { 0xA56F, 0x53E8 }, { 0xA570, 0x53FC }, { 0xA571, 0x53F8 },
+	{ 0xA572, 0x53F5 }, { 0xA573, 0x53EB }, { 0xA574, 0x53E6 }, { 0xA575, 0x53EA }, { 0xA576, 0x53F2 }, { 0xA577, 0x53F1 }, { 0xA578, 0x53F0 }, { 0xA579, 0x53E5 },
+	{ 0xA57A, 0x53ED }, { 0xA57B, 0x53FB }, { 0xA57C, 0x56DB }, { 0xA57D, 0x56DA }, { 0xA57E, 0x5916 }, { 0xA5A1, 0x592E }, { 0xA5A2, 0x5931 }, { 0xA5A3, 0x5974 },
+	{ 0xA5A4, 0x5976 }, { 0xA5A5, 0x5B55 }, { 0xA5A6, 0x5B83 }, { 0xA5A7, 0x5C3C }, { 0xA5A8, 0x5DE8 }, { 0xA5A9, 0x5DE7 }, { 0xA5AA, 0x5DE6 }, { 0xA5AB, 0x5E02 },
+	{ 0xA5AC, 0x5E03 }, { 0xA5AD, 0x5E73 }, { 0xA5AE, 0x5E7C }, { 0xA5AF, 0x5F01 }, { 0xA5B0, 0x5F18 }, { 0xA5B1, 0x5F17 }, { 0xA5B2, 0x5FC5 }, { 0xA5B3, 0x620A },
+	{ 0xA5B4, 0x6253 }, { 0xA5B5, 0x6254 }, { 0xA5B6, 0x6252 }, { 0xA5B7, 0x6251 }, { 0xA5B8, 0x65A5 }, { 0xA5B9, 0x65E6 }, { 0xA5BA, 0x672E }, { 0xA5BB, 0x672C },
+	{ 0xA5BC, 0x672A }, { 0xA5BD, 0x672B }, { 0xA5BE, 0x672D }, { 0xA5BF, 0x6B63 }, { 0xA5C0, 0x6BCD }, { 0xA5C1, 0x6C11 }, { 0xA5C2, 0x6C10 }, { 0xA5C3, 0x6C38 },
+	{ 0xA5C4, 0x6C41 }, { 0xA5C5, 0x6C40 }, { 0xA5C6, 0x6C3E }, { 0xA5C7, 0x72AF }, { 0xA5C8, 0x7384 }, { 0xA5C9, 0x7389 }, { 0xA5CA, 0x74DC }, { 0xA5CB, 0x74E6 },
+	{ 0xA5CC, 0x7518 }, { 0xA5CD, 0x751F }, { 0xA5CE, 0x7528 }, { 0xA5CF, 0x7529 }, { 0xA5D0, 0x7530 }, { 0xA5D1, 0x7531 }, { 0xA5D2, 0x7532 }, { 0xA5D3, 0x7533 },
+	{ 0xA5D4, 0x758B }, { 0xA5D5, 0x767D }, { 0xA5D6, 0x76AE }, { 0xA5D7, 0x76BF }, { 0xA5D8, 0x76EE }, { 0xA5D9, 0x77DB }, { 0xA5DA, 0x77E2 }, { 0xA5DB, 0x77F3 },
+	{ 0xA5DC, 0x793A }, { 0xA5DD, 0x79BE }, { 0xA5DE, 0x7A74 }, { 0xA5DF, 0x7ACB }, { 0xA5E0, 0x4E1E }, { 0xA5E1, 0x4E1F }, { 0xA5E2, 0x4E52 }, { 0xA5E3, 0x4E53 },
+	{ 0xA5E4, 0x4E69 }, { 0xA5E5, 0x4E99 }, { 0xA5E6, 0x4EA4 }, { 0xA5E7, 0x4EA6 }, { 0xA5E8, 0x4EA5 }, { 0xA5E9, 0x4EFF }, { 0xA5EA, 0x4F09 }, { 0xA5EB, 0x4F19 },
+	{ 0xA5EC, 0x4F0A }, { 0xA5ED, 0x4F15 }, { 0xA5EE, 0x4F0D }, { 0xA5EF, 0x4F10 }, { 0xA5F0, 0x4F11 }, { 0xA5F1, 0x4F0F }, { 0xA5F2, 0x4EF2 }, { 0xA5F3, 0x4EF6 },
+	{ 0xA5F4, 0x4EFB }, { 0xA5F5, 0x4EF0 }, { 0xA5F6, 0x4EF3 }, { 0xA5F7, 0x4EFD }, { 0xA5F8, 0x4F01 }, { 0xA5F9, 0x4F0B }, { 0xA5FA, 0x5149 }, { 0xA5FB, 0x5147 },
+	{ 0xA5FC, 0x5146 }, { 0xA5FD, 0x5148 }, { 0xA5FE, 0x5168 }, { 0xA640, 0x5171 }, { 0xA641, 0x518D }, { 0xA642, 0x51B0 }, { 0xA643, 0x5217 }, { 0xA644, 0x5211 },
+	{ 0xA645, 0x5212 }, { 0xA646, 0x520E }, { 0xA647, 0x5216 }, { 0xA648, 0x52A3 }, { 0xA649, 0x5308 }, { 0xA64A, 0x5321 }, { 0xA64B, 0x5320 }, { 0xA64C, 0x5370 },
+	{ 0xA64D, 0x5371 }, { 0xA64E, 0x5409 }, { 0xA64F, 0x540F }, { 0xA650, 0x540C }, { 0xA651, 0x540A }, { 0xA652, 0x5410 }, { 0xA653, 0x5401 }, { 0xA654, 0x540B },
+	{ 0xA655, 0x5404 }, { 0xA656, 0x5411 }, { 0xA657, 0x540D }, { 0xA658, 0x5408 }, { 0xA659, 0x5403 }, { 0xA65A, 0x540E }, { 0xA65B, 0x5406 }, { 0xA65C, 0x5412 },
+	{ 0xA65D, 0x56E0 }, { 0xA65E, 0x56DE }, { 0xA65F, 0x56DD }, { 0xA660, 0x5733 }, { 0xA661, 0x5730 }, { 0xA662, 0x5728 }, { 0xA663, 0x572D }, { 0xA664, 0x572C },
+	{ 0xA665, 0x572F }, { 0xA666, 0x5729 }, { 0xA667, 0x5919 }, { 0xA668, 0x591A }, { 0xA669, 0x5937 }, { 0xA66A, 0x5938 }, { 0xA66B, 0x5984 }, { 0xA66C, 0x5978 },
+	{ 0xA66D, 0x5983 }, { 0xA66E, 0x597D }, { 0xA66F, 0x5979 }, { 0xA670, 0x5982 }, { 0xA671, 0x5981 }, { 0xA672, 0x5B57 }, { 0xA673, 0x5B58 }, { 0xA674, 0x5B87 },
+	{ 0xA675, 0x5B88 }, { 0xA676, 0x5B85 }, { 0xA677, 0x5B89 }, { 0xA678, 0x5BFA }, { 0xA679, 0x5C16 }, { 0xA67A, 0x5C79 }, { 0xA67B, 0x5DDE }, { 0xA67C, 0x5E06 },
+	{ 0xA67D, 0x5E76 }, { 0xA67E, 0x5E74 }, { 0xA6A1, 0x5F0F }, { 0xA6A2, 0x5F1B }, { 0xA6A3, 0x5FD9 }, { 0xA6A4, 0x5FD6 }, { 0xA6A5, 0x620E }, { 0xA6A6, 0x620C },
+	{ 0xA6A7, 0x620D }, { 0xA6A8, 0x6210 }, { 0xA6A9, 0x6263 }, { 0xA6AA, 0x625B }, { 0xA6AB, 0x6258 }, { 0xA6AC, 0x6536 }, { 0xA6AD, 0x65E9 }, { 0xA6AE, 0x65E8 },
+	{ 0xA6AF, 0x65EC }, { 0xA6B0, 0x65ED }, { 0xA6B1, 0x66F2 }, { 0xA6B2, 0x66F3 }, { 0xA6B3, 0x6709 }, { 0xA6B4, 0x673D }, { 0xA6B5, 0x6734 }, { 0xA6B6, 0x6731 },
+	{ 0xA6B7, 0x6735 }, { 0xA6B8, 0x6B21 }, { 0xA6B9, 0x6B64 }, { 0xA6BA, 0x6B7B }, { 0xA6BB, 0x6C16 }, { 0xA6BC, 0x6C5D }, { 0xA6BD, 0x6C57 }, { 0xA6BE, 0x6C59 },
+	{ 0xA6BF, 0x6C5F }, { 0xA6C0, 0x6C60 }, { 0xA6C1, 0x6C50 }, { 0xA6C2, 0x6C55 }, { 0xA6C3, 0x6C61 }, { 0xA6C4, 0x6C5B }, { 0xA6C5, 0x6C4D }, { 0xA6C6, 0x6C4E },
+	{ 0xA6C7, 0x7070 }, { 0xA6C8, 0x725F }, { 0xA6C9, 0x725D }, { 0xA6CA, 0x767E }, { 0xA6CB, 0x7AF9 }, { 0xA6CC, 0x7C73 }, { 0xA6CD, 0x7CF8 }, { 0xA6CE, 0x7F36 },
+	{ 0xA6CF, 0x7F8A }, { 0xA6D0, 0x7FBD }, { 0xA6D1, 0x8001 }, { 0xA6D2, 0x8003 }, { 0xA6D3, 0x800C }, { 0xA6D4, 0x8012 }, { 0xA6D5, 0x8033 }, { 0xA6D6, 0x807F },
+	{ 0xA6D7, 0x8089 }, { 0xA6D8, 0x808B }, { 0xA6D9, 0x808C }, { 0xA6DA, 0x81E3 }, { 0xA6DB, 0x81EA }, { 0xA6DC, 0x81F3 }, { 0xA6DD, 0x81FC }, { 0xA6DE, 0x820C },
+	{ 0xA6DF, 0x821B }, { 0xA6E0, 0x821F }, { 0xA6E1, 0x826E }, { 0xA6E2, 0x8272 }, { 0xA6E3, 0x827E }, { 0xA6E4, 0x866B }, { 0xA6E5, 0x8840 }, { 0xA6E6, 0x884C },
+	{ 0xA6E7, 0x8863 }, { 0xA6E8, 0x897F }, { 0xA6E9, 0x9621 }, { 0xA6EA, 0x4E32 }, { 0xA6EB, 0x4EA8 }, { 0xA6EC, 0x4F4D }, { 0xA6ED, 0x4F4F }, { 0xA6EE, 0x4F47 },
+	{ 0xA6EF, 0x4F57 }, { 0xA6F0, 0x4F5E }, { 0xA6F1, 0x4F34 }, { 0xA6F2, 0x4F5B }, { 0xA6F3, 0x4F55 }, { 0xA6F4, 0x4F30 }, { 0xA6F5, 0x4F50 }, { 0xA6F6, 0x4F51 },
+	{ 0xA6F7, 0x4F3D }, { 0xA6F8, 0x4F3A }, { 0xA6F9, 0x4F38 }, { 0xA6FA, 0x4F43 }, { 0xA6FB, 0x4F54 }, { 0xA6FC, 0x4F3C }, { 0xA6FD, 0x4F46 }, { 0xA6FE, 0x4F63 },
+	{ 0xA740, 0x4F5C }, { 0xA741, 0x4F60 }, { 0xA742, 0x4F2F }, { 0xA743, 0x4F4E }, { 0xA744, 0x4F36 }, { 0xA745, 0x4F59 }, { 0xA746, 0x4F5D }, { 0xA747, 0x4F48 },
+	{ 0xA748, 0x4F5A }, { 0xA749, 0x514C }, { 0xA74A, 0x514B }, { 0xA74B, 0x514D }, { 0xA74C, 0x5175 }, { 0xA74D, 0x51B6 }, { 0xA74E, 0x51B7 }, { 0xA74F, 0x5225 },
+	{ 0xA750, 0x5224 }, { 0xA751, 0x5229 }, { 0xA752, 0x522A }, { 0xA753, 0x5228 }, { 0xA754, 0x52AB }, { 0xA755, 0x52A9 }, { 0xA756, 0x52AA }, { 0xA757, 0x52AC },
+	{ 0xA758, 0x5323 }, { 0xA759, 0x5373 }, { 0xA75A, 0x5375 }, { 0xA75B, 0x541D }, { 0xA75C, 0x542D }, { 0xA75D, 0x541E }, { 0xA75E, 0x543E }, { 0xA75F, 0x5426 },
+	{ 0xA760, 0x544E }, { 0xA761, 0x5427 }, { 0xA762, 0x5446 }, { 0xA763, 0x5443 }, { 0xA764, 0x5433 }, { 0xA765, 0x5448 }, { 0xA766, 0x5442 }, { 0xA767, 0x541B },
+	{ 0xA768, 0x5429 }, { 0xA769, 0x544A }, { 0xA76A, 0x5439 }, { 0xA76B, 0x543B }, { 0xA76C, 0x5438 }, { 0xA76D, 0x542E }, { 0xA76E, 0x5435 }, { 0xA76F, 0x5436 },
+	{ 0xA770, 0x5420 }, { 0xA771, 0x543C }, { 0xA772, 0x5440 }, { 0xA773, 0x5431 }, { 0xA774, 0x542B }, { 0xA775, 0x541F }, { 0xA776, 0x542C }, { 0xA777, 0x56EA },
+	{ 0xA778, 0x56F0 }, { 0xA779, 0x56E4 }, { 0xA77A, 0x56EB }, { 0xA77B, 0x574A }, { 0xA77C, 0x5751 }, { 0xA77D, 0x5740 }, { 0xA77E, 0x574D }, { 0xA7A1, 0x5747 },
+	{ 0xA7A2, 0x574E }, { 0xA7A3, 0x573E }, { 0xA7A4, 0x5750 }, { 0xA7A5, 0x574F }, { 0xA7A6, 0x573B }, { 0xA7A7, 0x58EF }, { 0xA7A8, 0x593E }, { 0xA7A9, 0x599D },
+	{ 0xA7AA, 0x5992 }, { 0xA7AB, 0x59A8 }, { 0xA7AC, 0x599E }, { 0xA7AD, 0x59A3 }, { 0xA7AE, 0x5999 }, { 0xA7AF, 0x5996 }, { 0xA7B0, 0x598D }, { 0xA7B1, 0x59A4 },
+	{ 0xA7B2, 0x5993 }, { 0xA7B3, 0x598A }, { 0xA7B4, 0x59A5 }, { 0xA7B5, 0x5B5D }, { 0xA7B6, 0x5B5C }, { 0xA7B7, 0x5B5A }, { 0xA7B8, 0x5B5B }, { 0xA7B9, 0x5B8C },
+	{ 0xA7BA, 0x5B8B }, { 0xA7BB, 0x5B8F }, { 0xA7BC, 0x5C2C }, { 0xA7BD, 0x5C40 }, { 0xA7BE, 0x5C41 }, { 0xA7BF, 0x5C3F }, { 0xA7C0, 0x5C3E }, { 0xA7C1, 0x5C90 },
+	{ 0xA7C2, 0x5C91 }, { 0xA7C3, 0x5C94 }, { 0xA7C4, 0x5C8C }, { 0xA7C5, 0x5DEB }, { 0xA7C6, 0x5E0C }, { 0xA7C7, 0x5E8F }, { 0xA7C8, 0x5E87 }, { 0xA7C9, 0x5E8A },
+	{ 0xA7CA, 0x5EF7 }, { 0xA7CB, 0x5F04 }, { 0xA7CC, 0x5F1F }, { 0xA7CD, 0x5F64 }, { 0xA7CE, 0x5F62 }, { 0xA7CF, 0x5F77 }, { 0xA7D0, 0x5F79 }, { 0xA7D1, 0x5FD8 },
+	{ 0xA7D2, 0x5FCC }, { 0xA7D3, 0x5FD7 }, { 0xA7D4, 0x5FCD }, { 0xA7D5, 0x5FF1 }, { 0xA7D6, 0x5FEB }, { 0xA7D7, 0x5FF8 }, { 0xA7D8, 0x5FEA }, { 0xA7D9, 0x6212 },
+	{ 0xA7DA, 0x6211 }, { 0xA7DB, 0x6284 }, { 0xA7DC, 0x6297 }, { 0xA7DD, 0x6296 }, { 0xA7DE, 0x6280 }, { 0xA7DF, 0x6276 }, { 0xA7E0, 0x6289 }, { 0xA7E1, 0x626D },
+	{ 0xA7E2, 0x628A }, { 0xA7E3, 0x627C }, { 0xA7E4, 0x627E }, { 0xA7E5, 0x6279 }, { 0xA7E6, 0x6273 }, { 0xA7E7, 0x6292 }, { 0xA7E8, 0x626F }, { 0xA7E9, 0x6298 },
+	{ 0xA7EA, 0x626E }, { 0xA7EB, 0x6295 }, { 0xA7EC, 0x6293 }, { 0xA7ED, 0x6291 }, { 0xA7EE, 0x6286 }, { 0xA7EF, 0x6539 }, { 0xA7F0, 0x653B }, { 0xA7F1, 0x6538 },
+	{ 0xA7F2, 0x65F1 }, { 0xA7F3, 0x66F4 }, { 0xA7F4, 0x675F }, { 0xA7F5, 0x674E }, { 0xA7F6, 0x674F }, { 0xA7F7, 0x6750 }, { 0xA7F8, 0x6751 }, { 0xA7F9, 0x675C },
+	{ 0xA7FA, 0x6756 }, { 0xA7FB, 0x675E }, { 0xA7FC, 0x6749 }, { 0xA7FD, 0x6746 }, { 0xA7FE, 0x6760 }, { 0xA840, 0x6753 }, { 0xA841, 0x6757 }, { 0xA842, 0x6B65 },
+	{ 0xA843, 0x6BCF }, { 0xA844, 0x6C42 }, { 0xA845, 0x6C5E }, { 0xA846, 0x6C99 }, { 0xA847, 0x6C81 }, { 0xA848, 0x6C88 }, { 0xA849, 0x6C89 }, { 0xA84A, 0x6C85 },
+	{ 0xA84B, 0x6C9B }, { 0xA84C, 0x6C6A }, { 0xA84D, 0x6C7A }, { 0xA84E, 0x6C90 }, { 0xA84F, 0x6C70 }, { 0xA850, 0x6C8C }, { 0xA851, 0x6C68 }, { 0xA852, 0x6C96 },
+	{ 0xA853, 0x6C92 }, { 0xA854, 0x6C7D }, { 0xA855, 0x6C83 }, { 0xA856, 0x6C72 }, { 0xA857, 0x6C7E }, { 0xA858, 0x6C74 }, { 0xA859, 0x6C86 }, { 0xA85A, 0x6C76 },
+	{ 0xA85B, 0x6C8D }, { 0xA85C, 0x6C94 }, { 0xA85D, 0x6C98 }, { 0xA85E, 0x6C82 }, { 0xA85F, 0x7076 }, { 0xA860, 0x707C }, { 0xA861, 0x707D }, { 0xA862, 0x7078 },
+	{ 0xA863, 0x7262 }, { 0xA864, 0x7261 }, { 0xA865, 0x7260 }, { 0xA866, 0x72C4 }, { 0xA867, 0x72C2 }, { 0xA868, 0x7396 }, { 0xA869, 0x752C }, { 0xA86A, 0x752B },
+	{ 0xA86B, 0x7537 }, { 0xA86C, 0x7538 }, { 0xA86D, 0x7682 }, { 0xA86E, 0x76EF }, { 0xA86F, 0x77E3 }, { 0xA870, 0x79C1 }, { 0xA871, 0x79C0 }, { 0xA872, 0x79BF },
+	{ 0xA873, 0x7A76 }, { 0xA874, 0x7CFB }, { 0xA875, 0x7F55 }, { 0xA876, 0x8096 }, { 0xA877, 0x8093 }, { 0xA878, 0x809D }, { 0xA879, 0x8098 }, { 0xA87A, 0x809B },
+	{ 0xA87B, 0x809A }, { 0xA87C, 0x80B2 }, { 0xA87D, 0x826F }, { 0xA87E, 0x8292 }, { 0xA8A1, 0x828B }, { 0xA8A2, 0x828D }, { 0xA8A3, 0x898B }, { 0xA8A4, 0x89D2 },
+	{ 0xA8A5, 0x8A00 }, { 0xA8A6, 0x8C37 }, { 0xA8A7, 0x8C46 }, { 0xA8A8, 0x8C55 }, { 0xA8A9, 0x8C9D }, { 0xA8AA, 0x8D64 }, { 0xA8AB, 0x8D70 }, { 0xA8AC, 0x8DB3 },
+	{ 0xA8AD, 0x8EAB }, { 0xA8AE, 0x8ECA }, { 0xA8AF, 0x8F9B }, { 0xA8B0, 0x8FB0 }, { 0xA8B1, 0x8FC2 }, { 0xA8B2, 0x8FC6 }, { 0xA8B3, 0x8FC5 }, { 0xA8B4, 0x8FC4 },
+	{ 0xA8B5, 0x5DE1 }, { 0xA8B6, 0x9091 }, { 0xA8B7, 0x90A2 }, { 0xA8B8, 0x90AA }, { 0xA8B9, 0x90A6 }, { 0xA8BA, 0x90A3 }, { 0xA8BB, 0x9149 }, { 0xA8BC, 0x91C6 },
+	{ 0xA8BD, 0x91CC }, { 0xA8BE, 0x9632 }, { 0xA8BF, 0x962E }, { 0xA8C0, 0x9631 }, { 0xA8C1, 0x962A }, { 0xA8C2, 0x962C }, { 0xA8C3, 0x4E26 }, { 0xA8C4, 0x4E56 },
+	{ 0xA8C5, 0x4E73 }, { 0xA8C6, 0x4E8B }, { 0xA8C7, 0x4E9B }, { 0xA8C8, 0x4E9E }, { 0xA8C9, 0x4EAB }, { 0xA8CA, 0x4EAC }, { 0xA8CB, 0x4F6F }, { 0xA8CC, 0x4F9D },
+	{ 0xA8CD, 0x4F8D }, { 0xA8CE, 0x4F73 }, { 0xA8CF, 0x4F7F }, { 0xA8D0, 0x4F6C }, { 0xA8D1, 0x4F9B }, { 0xA8D2, 0x4F8B }, { 0xA8D3, 0x4F86 }, { 0xA8D4, 0x4F83 },
+	{ 0xA8D5, 0x4F70 }, { 0xA8D6, 0x4F75 }, { 0xA8D7, 0x4F88 }, { 0xA8D8, 0x4F69 }, { 0xA8D9, 0x4F7B }, { 0xA8DA, 0x4F96 }, { 0xA8DB, 0x4F7E }, { 0xA8DC, 0x4F8F },
+	{ 0xA8DD, 0x4F91 }, { 0xA8DE, 0x4F7A }, { 0xA8DF, 0x5154 }, { 0xA8E0, 0x5152 }, { 0xA8E1, 0x5155 }, { 0xA8E2, 0x5169 }, { 0xA8E3, 0x5177 }, { 0xA8E4, 0x5176 },
+	{ 0xA8E5, 0x5178 }, { 0xA8E6, 0x51BD }, { 0xA8E7, 0x51FD }, { 0xA8E8, 0x523B }, { 0xA8E9, 0x5238 }, { 0xA8EA, 0x5237 }, { 0xA8EB, 0x523A }, { 0xA8EC, 0x5230 },
+	{ 0xA8ED, 0x522E }, { 0xA8EE, 0x5236 }, { 0xA8EF, 0x5241 }, { 0xA8F0, 0x52BE }, { 0xA8F1, 0x52BB }, { 0xA8F2, 0x5352 }, { 0xA8F3, 0x5354 }, { 0xA8F4, 0x5353 },
+	{ 0xA8F5, 0x5351 }, { 0xA8F6, 0x5366 }, { 0xA8F7, 0x5377 }, { 0xA8F8, 0x5378 }, { 0xA8F9, 0x5379 }, { 0xA8FA, 0x53D6 }, { 0xA8FB, 0x53D4 }, { 0xA8FC, 0x53D7 },
+	{ 0xA8FD, 0x5473 }, { 0xA8FE, 0x5475 }, { 0xA940, 0x5496 }, { 0xA941, 0x5478 }, { 0xA942, 0x5495 }, { 0xA943, 0x5480 }, { 0xA944, 0x547B }, { 0xA945, 0x5477 },
+	{ 0xA946, 0x5484 }, { 0xA947, 0x5492 }, { 0xA948, 0x5486 }, { 0xA949, 0x547C }, { 0xA94A, 0x5490 }, { 0xA94B, 0x5471 }, { 0xA94C, 0x5476 }, { 0xA94D, 0x548C },
+	{ 0xA94E, 0x549A }, { 0xA94F, 0x5462 }, { 0xA950, 0x5468 }, { 0xA951, 0x548B }, { 0xA952, 0x547D }, { 0xA953, 0x548E }, { 0xA954, 0x56FA }, { 0xA955, 0x5783 },
+	{ 0xA956, 0x5777 }, { 0xA957, 0x576A }, { 0xA958, 0x5769 }, { 0xA959, 0x5761 }, { 0xA95A, 0x5766 }, { 0xA95B, 0x5764 }, { 0xA95C, 0x577C }, { 0xA95D, 0x591C },
+	{ 0xA95E, 0x5949 }, { 0xA95F, 0x5947 }, { 0xA960, 0x5948 }, { 0xA961, 0x5944 }, { 0xA962, 0x5954 }, { 0xA963, 0x59BE }, { 0xA964, 0x59BB }, { 0xA965, 0x59D4 },
+	{ 0xA966, 0x59B9 }, { 0xA967, 0x59AE }, { 0xA968, 0x59D1 }, { 0xA969, 0x59C6 }, { 0xA96A, 0x59D0 }, { 0xA96B, 0x59CD }, { 0xA96C, 0x59CB }, { 0xA96D, 0x59D3 },
+	{ 0xA96E, 0x59CA }, { 0xA96F, 0x59AF }, { 0xA970, 0x59B3 }, { 0xA971, 0x59D2 }, { 0xA972, 0x59C5 }, { 0xA973, 0x5B5F }, { 0xA974, 0x5B64 }, { 0xA975, 0x5B63 },
+	{ 0xA976, 0x5B97 }, { 0xA977, 0x5B9A }, { 0xA978, 0x5B98 }, { 0xA979, 0x5B9C }, { 0xA97A, 0x5B99 }, { 0xA97B, 0x5B9B }, { 0xA97C, 0x5C1A }, { 0xA97D, 0x5C48 },
+	{ 0xA97E, 0x5C45 }, { 0xA9A1, 0x5C46 }, { 0xA9A2, 0x5CB7 }, { 0xA9A3, 0x5CA1 }, { 0xA9A4, 0x5CB8 }, { 0xA9A5, 0x5CA9 }, { 0xA9A6, 0x5CAB }, { 0xA9A7, 0x5CB1 },
+	{ 0xA9A8, 0x5CB3 }, { 0xA9A9, 0x5E18 }, { 0xA9AA, 0x5E1A }, { 0xA9AB, 0x5E16 }, { 0xA9AC, 0x5E15 }, { 0xA9AD, 0x5E1B }, { 0xA9AE, 0x5E11 }, { 0xA9AF, 0x5E78 },
+	{ 0xA9B0, 0x5E9A }, { 0xA9B1, 0x5E97 }, { 0xA9B2, 0x5E9C }, { 0xA9B3, 0x5E95 }, { 0xA9B4, 0x5E96 }, { 0xA9B5, 0x5EF6 }, { 0xA9B6, 0x5F26 }, { 0xA9B7, 0x5F27 },
+	{ 0xA9B8, 0x5F29 }, { 0xA9B9, 0x5F80 }, { 0xA9BA, 0x5F81 }, { 0xA9BB, 0x5F7F }, { 0xA9BC, 0x5F7C }, { 0xA9BD, 0x5FDD }, { 0xA9BE, 0x5FE0 }, { 0xA9BF, 0x5FFD },
+	{ 0xA9C0, 0x5FF5 }, { 0xA9C1, 0x5FFF }, { 0xA9C2, 0x600F }, { 0xA9C3, 0x6014 }, { 0xA9C4, 0x602F }, { 0xA9C5, 0x6035 }, { 0xA9C6, 0x6016 }, { 0xA9C7, 0x602A },
+	{ 0xA9C8, 0x6015 }, { 0xA9C9, 0x6021 }, { 0xA9CA, 0x6027 }, { 0xA9CB, 0x6029 }, { 0xA9CC, 0x602B }, { 0xA9CD, 0x601B }, { 0xA9CE, 0x6216 }, { 0xA9CF, 0x6215 },
+	{ 0xA9D0, 0x623F }, { 0xA9D1, 0x623E }, { 0xA9D2, 0x6240 }, { 0xA9D3, 0x627F }, { 0xA9D4, 0x62C9 }, { 0xA9D5, 0x62CC }, { 0xA9D6, 0x62C4 }, { 0xA9D7, 0x62BF },
+	{ 0xA9D8, 0x62C2 }, { 0xA9D9, 0x62B9 }, { 0xA9DA, 0x62D2 }, { 0xA9DB, 0x62DB }, { 0xA9DC, 0x62AB }, { 0xA9DD, 0x62D3 }, { 0xA9DE, 0x62D4 }, { 0xA9DF, 0x62CB },
+	{ 0xA9E0, 0x62C8 }, { 0xA9E1, 0x62A8 }, { 0xA9E2, 0x62BD }, { 0xA9E3, 0x62BC }, { 0xA9E4, 0x62D0 }, { 0xA9E5, 0x62D9 }, { 0xA9E6, 0x62C7 }, { 0xA9E7, 0x62CD },
+	{ 0xA9E8, 0x62B5 }, { 0xA9E9, 0x62DA }, { 0xA9EA, 0x62B1 }, { 0xA9EB, 0x62D8 }, { 0xA9EC, 0x62D6 }, { 0xA9ED, 0x62D7 }, { 0xA9EE, 0x62C6 }, { 0xA9EF, 0x62AC },
+	{ 0xA9F0, 0x62CE }, { 0xA9F1, 0x653E }, { 0xA9F2, 0x65A7 }, { 0xA9F3, 0x65BC }, { 0xA9F4, 0x65FA }, { 0xA9F5, 0x6614 }, { 0xA9F6, 0x6613 }, { 0xA9F7, 0x660C },
+	{ 0xA9F8, 0x6606 }, { 0xA9F9, 0x6602 }, { 0xA9FA, 0x660E }, { 0xA9FB, 0x6600 }, { 0xA9FC, 0x660F }, { 0xA9FD, 0x6615 }, { 0xA9FE, 0x660A }, { 0xAA40, 0x6607 },
+	{ 0xAA41, 0x670D }, { 0xAA42, 0x670B }, { 0xAA43, 0x676D }, { 0xAA44, 0x678B }, { 0xAA45, 0x6795 }, { 0xAA46, 0x6771 }, { 0xAA47, 0x679C }, { 0xAA48, 0x6773 },
+	{ 0xAA49, 0x6777 }, { 0xAA4A, 0x6787 }, { 0xAA4B, 0x679D }, { 0xAA4C, 0x6797 }, { 0xAA4D, 0x676F }, { 0xAA4E, 0x6770 }, { 0xAA4F, 0x677F }, { 0xAA50, 0x6789 },
+	{ 0xAA51, 0x677E }, { 0xAA52, 0x6790 }, { 0xAA53, 0x6775 }, { 0xAA54, 0x679A }, { 0xAA55, 0x6793 }, { 0xAA56, 0x677C }, { 0xAA57, 0x676A }, { 0xAA58, 0x6772 },
+	{ 0xAA59, 0x6B23 }, { 0xAA5A, 0x6B66 }, { 0xAA5B, 0x6B67 }, { 0xAA5C, 0x6B7F }, { 0xAA5D, 0x6C13 }, { 0xAA5E, 0x6C1B }, { 0xAA5F, 0x6CE3 }, { 0xAA60, 0x6CE8 },
+	{ 0xAA61, 0x6CF3 }, { 0xAA62, 0x6CB1 }, { 0xAA63, 0x6CCC }, { 0xAA64, 0x6CE5 }, { 0xAA65, 0x6CB3 }, { 0xAA66, 0x6CBD }, { 0xAA67, 0x6CBE }, { 0xAA68, 0x6CBC },
+	{ 0xAA69, 0x6CE2 }, { 0xAA6A, 0x6CAB }, { 0xAA6B, 0x6CD5 }, { 0xAA6C, 0x6CD3 }, { 0xAA6D, 0x6CB8 }, { 0xAA6E, 0x6CC4 }, { 0xAA6F, 0x6CB9 }, { 0xAA70, 0x6CC1 },
+	{ 0xAA71, 0x6CAE }, { 0xAA72, 0x6CD7 }, { 0xAA73, 0x6CC5 }, { 0xAA74, 0x6CF1 }, { 0xAA75, 0x6CBF }, { 0xAA76, 0x6CBB }, { 0xAA77, 0x6CE1 }, { 0xAA78, 0x6CDB },
+	{ 0xAA79, 0x6CCA }, { 0xAA7A, 0x6CAC }, { 0xAA7B, 0x6CEF }, { 0xAA7C, 0x6CDC }, { 0xAA7D, 0x6CD6 }, { 0xAA7E, 0x6CE0 }, { 0xAAA1, 0x7095 }, { 0xAAA2, 0x708E },
+	{ 0xAAA3, 0x7092 }, { 0xAAA4, 0x708A }, { 0xAAA5, 0x7099 }, { 0xAAA6, 0x722C }, { 0xAAA7, 0x722D }, { 0xAAA8, 0x7238 }, { 0xAAA9, 0x7248 }, { 0xAAAA, 0x7267 },
+	{ 0xAAAB, 0x7269 }, { 0xAAAC, 0x72C0 }, { 0xAAAD, 0x72CE }, { 0xAAAE, 0x72D9 }, { 0xAAAF, 0x72D7 }, { 0xAAB0, 0x72D0 }, { 0xAAB1, 0x73A9 }, { 0xAAB2, 0x73A8 },
+	{ 0xAAB3, 0x739F }, { 0xAAB4, 0x73AB }, { 0xAAB5, 0x73A5 }, { 0xAAB6, 0x753D }, { 0xAAB7, 0x759D }, { 0xAAB8, 0x7599 }, { 0xAAB9, 0x759A }, { 0xAABA, 0x7684 },
+	{ 0xAABB, 0x76C2 }, { 0xAABC, 0x76F2 }, { 0xAABD, 0x76F4 }, { 0xAABE, 0x77E5 }, { 0xAABF, 0x77FD }, { 0xAAC0, 0x793E }, { 0xAAC1, 0x7940 }, { 0xAAC2, 0x7941 },
+	{ 0xAAC3, 0x79C9 }, { 0xAAC4, 0x79C8 }, { 0xAAC5, 0x7A7A }, { 0xAAC6, 0x7A79 }, { 0xAAC7, 0x7AFA }, { 0xAAC8, 0x7CFE }, { 0xAAC9, 0x7F54 }, { 0xAACA, 0x7F8C },
+	{ 0xAACB, 0x7F8B }, { 0xAACC, 0x8005 }, { 0xAACD, 0x80BA }, { 0xAACE, 0x80A5 }, { 0xAACF, 0x80A2 }, { 0xAAD0, 0x80B1 }, { 0xAAD1, 0x80A1 }, { 0xAAD2, 0x80AB },
+	{ 0xAAD3, 0x80A9 }, { 0xAAD4, 0x80B4 }, { 0xAAD5, 0x80AA }, { 0xAAD6, 0x80AF }, { 0xAAD7, 0x81E5 }, { 0xAAD8, 0x81FE }, { 0xAAD9, 0x820D }, { 0xAADA, 0x82B3 },
+	{ 0xAADB, 0x829D }, { 0xAADC, 0x8299 }, { 0xAADD, 0x82AD }, { 0xAADE, 0x82BD }, { 0xAADF, 0x829F }, { 0xAAE0, 0x82B9 }, { 0xAAE1, 0x82B1 }, { 0xAAE2, 0x82AC },
+	{ 0xAAE3, 0x82A5 }, { 0xAAE4, 0x82AF }, { 0xAAE5, 0x82B8 }, { 0xAAE6, 0x82A3 }, { 0xAAE7, 0x82B0 }, { 0xAAE8, 0x82BE }, { 0xAAE9, 0x82B7 }, { 0xAAEA, 0x864E },
+	{ 0xAAEB, 0x8671 }, { 0xAAEC, 0x521D }, { 0xAAED, 0x8868 }, { 0xAAEE, 0x8ECB }, { 0xAAEF, 0x8FCE }, { 0xAAF0, 0x8FD4 }, { 0xAAF1, 0x8FD1 }, { 0xAAF2, 0x90B5 },
+	{ 0xAAF3, 0x90B8 }, { 0xAAF4, 0x90B1 }, { 0xAAF5, 0x90B6 }, { 0xAAF6, 0x91C7 }, { 0xAAF7, 0x91D1 }, { 0xAAF8, 0x9577 }, { 0xAAF9, 0x9580 }, { 0xAAFA, 0x961C },
+	{ 0xAAFB, 0x9640 }, { 0xAAFC, 0x963F }, { 0xAAFD, 0x963B }, { 0xAAFE, 0x9644 }, { 0xAB40, 0x9642 }, { 0xAB41, 0x96B9 }, { 0xAB42, 0x96E8 }, { 0xAB43, 0x9752 },
+	{ 0xAB44, 0x975E }, { 0xAB45, 0x4E9F }, { 0xAB46, 0x4EAD }, { 0xAB47, 0x4EAE }, { 0xAB48, 0x4FE1 }, { 0xAB49, 0x4FB5 }, { 0xAB4A, 0x4FAF }, { 0xAB4B, 0x4FBF },
+	{ 0xAB4C, 0x4FE0 }, { 0xAB4D, 0x4FD1 }, { 0xAB4E, 0x4FCF }, { 0xAB4F, 0x4FDD }, { 0xAB50, 0x4FC3 }, { 0xAB51, 0x4FB6 }, { 0xAB52, 0x4FD8 }, { 0xAB53, 0x4FDF },
+	{ 0xAB54, 0x4FCA }, { 0xAB55, 0x4FD7 }, { 0xAB56, 0x4FAE }, { 0xAB57, 0x4FD0 }, { 0xAB58, 0x4FC4 }, { 0xAB59, 0x4FC2 }, { 0xAB5A, 0x4FDA }, { 0xAB5B, 0x4FCE },
+	{ 0xAB5C, 0x4FDE }, { 0xAB5D, 0x4FB7 }, { 0xAB5E, 0x5157 }, { 0xAB5F, 0x5192 }, { 0xAB60, 0x5191 }, { 0xAB61, 0x51A0 }, { 0xAB62, 0x524E }, { 0xAB63, 0x5243 },
+	{ 0xAB64, 0x524A }, { 0xAB65, 0x524D }, { 0xAB66, 0x524C }, { 0xAB67, 0x524B }, { 0xAB68, 0x5247 }, { 0xAB69, 0x52C7 }, { 0xAB6A, 0x52C9 }, { 0xAB6B, 0x52C3 },
+	{ 0xAB6C, 0x52C1 }, { 0xAB6D, 0x530D }, { 0xAB6E, 0x5357 }, { 0xAB6F, 0x537B }, { 0xAB70, 0x539A }, { 0xAB71, 0x53DB }, { 0xAB72, 0x54AC }, { 0xAB73, 0x54C0 },
+	{ 0xAB74, 0x54A8 }, { 0xAB75, 0x54CE }, { 0xAB76, 0x54C9 }, { 0xAB77, 0x54B8 }, { 0xAB78, 0x54A6 }, { 0xAB79, 0x54B3 }, { 0xAB7A, 0x54C7 }, { 0xAB7B, 0x54C2 },
+	{ 0xAB7C, 0x54BD }, { 0xAB7D, 0x54AA }, { 0xAB7E, 0x54C1 }, { 0xABA1, 0x54C4 }, { 0xABA2, 0x54C8 }, { 0xABA3, 0x54AF }, { 0xABA4, 0x54AB }, { 0xABA5, 0x54B1 },
+	{ 0xABA6, 0x54BB }, { 0xABA7, 0x54A9 }, { 0xABA8, 0x54A7 }, { 0xABA9, 0x54BF }, { 0xABAA, 0x56FF }, { 0xABAB, 0x5782 }, { 0xABAC, 0x578B }, { 0xABAD, 0x57A0 },
+	{ 0xABAE, 0x57A3 }, { 0xABAF, 0x57A2 }, { 0xABB0, 0x57CE }, { 0xABB1, 0x57AE }, { 0xABB2, 0x5793 }, { 0xABB3, 0x5955 }, { 0xABB4, 0x5951 }, { 0xABB5, 0x594F },
+	{ 0xABB6, 0x594E }, { 0xABB7, 0x5950 }, { 0xABB8, 0x59DC }, { 0xABB9, 0x59D8 }, { 0xABBA, 0x59FF }, { 0xABBB, 0x59E3 }, { 0xABBC, 0x59E8 }, { 0xABBD, 0x5A03 },
+	{ 0xABBE, 0x59E5 }, { 0xABBF, 0x59EA }, { 0xABC0, 0x59DA }, { 0xABC1, 0x59E6 }, { 0xABC2, 0x5A01 }, { 0xABC3, 0x59FB }, { 0xABC4, 0x5B69 }, { 0xABC5, 0x5BA3 },
+	{ 0xABC6, 0x5BA6 }, { 0xABC7, 0x5BA4 }, { 0xABC8, 0x5BA2 }, { 0xABC9, 0x5BA5 }, { 0xABCA, 0x5C01 }, { 0xABCB, 0x5C4E }, { 0xABCC, 0x5C4F }, { 0xABCD, 0x5C4D },
+	{ 0xABCE, 0x5C4B }, { 0xABCF, 0x5CD9 }, { 0xABD0, 0x5CD2 }, { 0xABD1, 0x5DF7 }, { 0xABD2, 0x5E1D }, { 0xABD3, 0x5E25 }, { 0xABD4, 0x5E1F }, { 0xABD5, 0x5E7D },
+	{ 0xABD6, 0x5EA0 }, { 0xABD7, 0x5EA6 }, { 0xABD8, 0x5EFA }, { 0xABD9, 0x5F08 }, { 0xABDA, 0x5F2D }, { 0xABDB, 0x5F65 }, { 0xABDC, 0x5F88 }, { 0xABDD, 0x5F85 },
+	{ 0xABDE, 0x5F8A }, { 0xABDF, 0x5F8B }, { 0xABE0, 0x5F87 }, { 0xABE1, 0x5F8C }, { 0xABE2, 0x5F89 }, { 0xABE3, 0x6012 }, { 0xABE4, 0x601D }, { 0xABE5, 0x6020 },
+	{ 0xABE6, 0x6025 }, { 0xABE7, 0x600E }, { 0xABE8, 0x6028 }, { 0xABE9, 0x604D }, { 0xABEA, 0x6070 }, { 0xABEB, 0x6068 }, { 0xABEC, 0x6062 }, { 0xABED, 0x6046 },
+	{ 0xABEE, 0x6043 }, { 0xABEF, 0x606C }, { 0xABF0, 0x606B }, { 0xABF1, 0x606A }, { 0xABF2, 0x6064 }, { 0xABF3, 0x6241 }, { 0xABF4, 0x62DC }, { 0xABF5, 0x6316 },
+	{ 0xABF6, 0x6309 }, { 0xABF7, 0x62FC }, { 0xABF8, 0x62ED }, { 0xABF9, 0x6301 }, { 0xABFA, 0x62EE }, { 0xABFB, 0x62FD }, { 0xABFC, 0x6307 }, { 0xABFD, 0x62F1 },
+	{ 0xABFE, 0x62F7 }, { 0xAC40, 0x62EF }, { 0xAC41, 0x62EC }, { 0xAC42, 0x62FE }, { 0xAC43, 0x62F4 }, { 0xAC44, 0x6311 }, { 0xAC45, 0x6302 }, { 0xAC46, 0x653F },
+	{ 0xAC47, 0x6545 }, { 0xAC48, 0x65AB }, { 0xAC49, 0x65BD }, { 0xAC4A, 0x65E2 }, { 0xAC4B, 0x6625 }, { 0xAC4C, 0x662D }, { 0xAC4D, 0x6620 }, { 0xAC4E, 0x6627 },
+	{ 0xAC4F, 0x662F }, { 0xAC50, 0x661F }, { 0xAC51, 0x6628 }, { 0xAC52, 0x6631 }, { 0xAC53, 0x6624 }, { 0xAC54, 0x66F7 }, { 0xAC55, 0x67FF }, { 0xAC56, 0x67D3 },
+	{ 0xAC57, 0x67F1 }, { 0xAC58, 0x67D4 }, { 0xAC59, 0x67D0 }, { 0xAC5A, 0x67EC }, { 0xAC5B, 0x67B6 }, { 0xAC5C, 0x67AF }, { 0xAC5D, 0x67F5 }, { 0xAC5E, 0x67E9 },
+	{ 0xAC5F, 0x67EF }, { 0xAC60, 0x67C4 }, { 0xAC61, 0x67D1 }, { 0xAC62, 0x67B4 }, { 0xAC63, 0x67DA }, { 0xAC64, 0x67E5 }, { 0xAC65, 0x67B8 }, { 0xAC66, 0x67CF },
+	{ 0xAC67, 0x67DE }, { 0xAC68, 0x67F3 }, { 0xAC69, 0x67B0 }, { 0xAC6A, 0x67D9 }, { 0xAC6B, 0x67E2 }, { 0xAC6C, 0x67DD }, { 0xAC6D, 0x67D2 }, { 0xAC6E, 0x6B6A },
+	{ 0xAC6F, 0x6B83 }, { 0xAC70, 0x6B86 }, { 0xAC71, 0x6BB5 }, { 0xAC72, 0x6BD2 }, { 0xAC73, 0x6BD7 }, { 0xAC74, 0x6C1F }, { 0xAC75, 0x6CC9 }, { 0xAC76, 0x6D0B },
+	{ 0xAC77, 0x6D32 }, { 0xAC78, 0x6D2A }, { 0xAC79, 0x6D41 }, { 0xAC7A, 0x6D25 }, { 0xAC7B, 0x6D0C }, { 0xAC7C, 0x6D31 }, { 0xAC7D, 0x6D1E }, { 0xAC7E, 0x6D17 },
+	{ 0xACA1, 0x6D3B }, { 0xACA2, 0x6D3D }, { 0xACA3, 0x6D3E }, { 0xACA4, 0x6D36 }, { 0xACA5, 0x6D1B }, { 0xACA6, 0x6CF5 }, { 0xACA7, 0x6D39 }, { 0xACA8, 0x6D27 },
+	{ 0xACA9, 0x6D38 }, { 0xACAA, 0x6D29 }, { 0xACAB, 0x6D2E }, { 0xACAC, 0x6D35 }, { 0xACAD, 0x6D0E }, { 0xACAE, 0x6D2B }, { 0xACAF, 0x70AB }, { 0xACB0, 0x70BA },
+	{ 0xACB1, 0x70B3 }, { 0xACB2, 0x70AC }, { 0xACB3, 0x70AF }, { 0xACB4, 0x70AD }, { 0xACB5, 0x70B8 }, { 0xACB6, 0x70AE }, { 0xACB7, 0x70A4 }, { 0xACB8, 0x7230 },
+	{ 0xACB9, 0x7272 }, { 0xACBA, 0x726F }, { 0xACBB, 0x7274 }, { 0xACBC, 0x72E9 }, { 0xACBD, 0x72E0 }, { 0xACBE, 0x72E1 }, { 0xACBF, 0x73B7 }, { 0xACC0, 0x73CA },
+	{ 0xACC1, 0x73BB }, { 0xACC2, 0x73B2 }, { 0xACC3, 0x73CD }, { 0xACC4, 0x73C0 }, { 0xACC5, 0x73B3 }, { 0xACC6, 0x751A }, { 0xACC7, 0x752D }, { 0xACC8, 0x754F },
+	{ 0xACC9, 0x754C }, { 0xACCA, 0x754E }, { 0xACCB, 0x754B }, { 0xACCC, 0x75AB }, { 0xACCD, 0x75A4 }, { 0xACCE, 0x75A5 }, { 0xACCF, 0x75A2 }, { 0xACD0, 0x75A3 },
+	{ 0xACD1, 0x7678 }, { 0xACD2, 0x7686 }, { 0xACD3, 0x7687 }, { 0xACD4, 0x7688 }, { 0xACD5, 0x76C8 }, { 0xACD6, 0x76C6 }, { 0xACD7, 0x76C3 }, { 0xACD8, 0x76C5 },
+	{ 0xACD9, 0x7701 }, { 0xACDA, 0x76F9 }, { 0xACDB, 0x76F8 }, { 0xACDC, 0x7709 }, { 0xACDD, 0x770B }, { 0xACDE, 0x76FE }, { 0xACDF, 0x76FC }, { 0xACE0, 0x7707 },
+	{ 0xACE1, 0x77DC }, { 0xACE2, 0x7802 }, { 0xACE3, 0x7814 }, { 0xACE4, 0x780C }, { 0xACE5, 0x780D }, { 0xACE6, 0x7946 }, { 0xACE7, 0x7949 }, { 0xACE8, 0x7948 },
+	{ 0xACE9, 0x7947 }, { 0xACEA, 0x79B9 }, { 0xACEB, 0x79BA }, { 0xACEC, 0x79D1 }, { 0xACED, 0x79D2 }, { 0xACEE, 0x79CB }, { 0xACEF, 0x7A7F }, { 0xACF0, 0x7A81 },
+	{ 0xACF1, 0x7AFF }, { 0xACF2, 0x7AFD }, { 0xACF3, 0x7C7D }, { 0xACF4, 0x7D02 }, { 0xACF5, 0x7D05 }, { 0xACF6, 0x7D00 }, { 0xACF7, 0x7D09 }, { 0xACF8, 0x7D07 },
+	{ 0xACF9, 0x7D04 }, { 0xACFA, 0x7D06 }, { 0xACFB, 0x7F38 }, { 0xACFC, 0x7F8E }, { 0xACFD, 0x7FBF }, { 0xACFE, 0x8004 }, { 0xAD40, 0x8010 }, { 0xAD41, 0x800D },
+	{ 0xAD42, 0x8011 }, { 0xAD43, 0x8036 }, { 0xAD44, 0x80D6 }, { 0xAD45, 0x80E5 }, { 0xAD46, 0x80DA }, { 0xAD47, 0x80C3 }, { 0xAD48, 0x80C4 }, { 0xAD49, 0x80CC },
+	{ 0xAD4A, 0x80E1 }, { 0xAD4B, 0x80DB }, { 0xAD4C, 0x80CE }, { 0xAD4D, 0x80DE }, { 0xAD4E, 0x80E4 }, { 0xAD4F, 0x80DD }, { 0xAD50, 0x81F4 }, { 0xAD51, 0x8222 },
+	{ 0xAD52, 0x82E7 }, { 0xAD53, 0x8303 }, { 0xAD54, 0x8305 }, { 0xAD55, 0x82E3 }, { 0xAD56, 0x82DB }, { 0xAD57, 0x82E6 }, { 0xAD58, 0x8304 }, { 0xAD59, 0x82E5 },
+	{ 0xAD5A, 0x8302 }, { 0xAD5B, 0x8309 }, { 0xAD5C, 0x82D2 }, { 0xAD5D, 0x82D7 }, { 0xAD5E, 0x82F1 }, { 0xAD5F, 0x8301 }, { 0xAD60, 0x82DC }, { 0xAD61, 0x82D4 },
+	{ 0xAD62, 0x82D1 }, { 0xAD63, 0x82DE }, { 0xAD64, 0x82D3 }, { 0xAD65, 0x82DF }, { 0xAD66, 0x82EF }, { 0xAD67, 0x8306 }, { 0xAD68, 0x8650 }, { 0xAD69, 0x8679 },
+	{ 0xAD6A, 0x867B }, { 0xAD6B, 0x867A }, { 0xAD6C, 0x884D }, { 0xAD6D, 0x886B }, { 0xAD6E, 0x8981 }, { 0xAD6F, 0x89D4 }, { 0xAD70, 0x8A08 }, { 0xAD71, 0x8A02 },
+	{ 0xAD72, 0x8A03 }, { 0xAD73, 0x8C9E }, { 0xAD74, 0x8CA0 }, { 0xAD75, 0x8D74 }, { 0xAD76, 0x8D73 }, { 0xAD77, 0x8DB4 }, { 0xAD78, 0x8ECD }, { 0xAD79, 0x8ECC },
+	{ 0xAD7A, 0x8FF0 }, { 0xAD7B, 0x8FE6 }, { 0xAD7C, 0x8FE2 }, { 0xAD7D, 0x8FEA }, { 0xAD7E, 0x8FE5 }, { 0xADA1, 0x8FED }, { 0xADA2, 0x8FEB }, { 0xADA3, 0x8FE4 },
+	{ 0xADA4, 0x8FE8 }, { 0xADA5, 0x90CA }, { 0xADA6, 0x90CE }, { 0xADA7, 0x90C1 }, { 0xADA8, 0x90C3 }, { 0xADA9, 0x914B }, { 0xADAA, 0x914A }, { 0xADAB, 0x91CD },
+	{ 0xADAC, 0x9582 }, { 0xADAD, 0x9650 }, { 0xADAE, 0x964B }, { 0xADAF, 0x964C }, { 0xADB0, 0x964D }, { 0xADB1, 0x9762 }, { 0xADB2, 0x9769 }, { 0xADB3, 0x97CB },
+	{ 0xADB4, 0x97ED }, { 0xADB5, 0x97F3 }, { 0xADB6, 0x9801 }, { 0xADB7, 0x98A8 }, { 0xADB8, 0x98DB }, { 0xADB9, 0x98DF }, { 0xADBA, 0x9996 }, { 0xADBB, 0x9999 },
+	{ 0xADBC, 0x4E58 }, { 0xADBD, 0x4EB3 }, { 0xADBE, 0x500C }, { 0xADBF, 0x500D }, { 0xADC0, 0x5023 }, { 0xADC1, 0x4FEF }, { 0xADC2, 0x5026 }, { 0xADC3, 0x5025 },
+	{ 0xADC4, 0x4FF8 }, { 0xADC5, 0x5029 }, { 0xADC6, 0x5016 }, { 0xADC7, 0x5006 }, { 0xADC8, 0x503C }, { 0xADC9, 0x501F }, { 0xADCA, 0x501A }, { 0xADCB, 0x5012 },
+	{ 0xADCC, 0x5011 }, { 0xADCD, 0x4FFA }, { 0xADCE, 0x5000 }, { 0xADCF, 0x5014 }, { 0xADD0, 0x5028 }, { 0xADD1, 0x4FF1 }, { 0xADD2, 0x5021 }, { 0xADD3, 0x500B },
+	{ 0xADD4, 0x5019 }, { 0xADD5, 0x5018 }, { 0xADD6, 0x4FF3 }, { 0xADD7, 0x4FEE }, { 0xADD8, 0x502D }, { 0xADD9, 0x502A }, { 0xADDA, 0x4FFE }, { 0xADDB, 0x502B },
+	{ 0xADDC, 0x5009 }, { 0xADDD, 0x517C }, { 0xADDE, 0x51A4 }, { 0xADDF, 0x51A5 }, { 0xADE0, 0x51A2 }, { 0xADE1, 0x51CD }, { 0xADE2, 0x51CC }, { 0xADE3, 0x51C6 },
+	{ 0xADE4, 0x51CB }, { 0xADE5, 0x5256 }, { 0xADE6, 0x525C }, { 0xADE7, 0x5254 }, { 0xADE8, 0x525B }, { 0xADE9, 0x525D }, { 0xADEA, 0x532A }, { 0xADEB, 0x537F },
+	{ 0xADEC, 0x539F }, { 0xADED, 0x539D }, { 0xADEE, 0x53DF }, { 0xADEF, 0x54E8 }, { 0xADF0, 0x5510 }, { 0xADF1, 0x5501 }, { 0xADF2, 0x5537 }, { 0xADF3, 0x54FC },
+	{ 0xADF4, 0x54E5 }, { 0xADF5, 0x54F2 }, { 0xADF6, 0x5506 }, { 0xADF7, 0x54FA }, { 0xADF8, 0x5514 }, { 0xADF9, 0x54E9 }, { 0xADFA, 0x54ED }, { 0xADFB, 0x54E1 },
+	{ 0xADFC, 0x5509 }, { 0xADFD, 0x54EE }, { 0xADFE, 0x54EA }, { 0xAE40, 0x54E6 }, { 0xAE41, 0x5527 }, { 0xAE42, 0x5507 }, { 0xAE43, 0x54FD }, { 0xAE44, 0x550F },
+	{ 0xAE45, 0x5703 }, { 0xAE46, 0x5704 }, { 0xAE47, 0x57C2 }, { 0xAE48, 0x57D4 }, { 0xAE49, 0x57CB }, { 0xAE4A, 0x57C3 }, { 0xAE4B, 0x5809 }, { 0xAE4C, 0x590F },
+	{ 0xAE4D, 0x5957 }, { 0xAE4E, 0x5958 }, { 0xAE4F, 0x595A }, { 0xAE50, 0x5A11 }, { 0xAE51, 0x5A18 }, { 0xAE52, 0x5A1C }, { 0xAE53, 0x5A1F }, { 0xAE54, 0x5A1B },
+	{ 0xAE55, 0x5A13 }, { 0xAE56, 0x59EC }, { 0xAE57, 0x5A20 }, { 0xAE58, 0x5A23 }, { 0xAE59, 0x5A29 }, { 0xAE5A, 0x5A25 }, { 0xAE5B, 0x5A0C }, { 0xAE5C, 0x5A09 },
+	{ 0xAE5D, 0x5B6B }, { 0xAE5E, 0x5C58 }, { 0xAE5F, 0x5BB0 }, { 0xAE60, 0x5BB3 }, { 0xAE61, 0x5BB6 }, { 0xAE62, 0x5BB4 }, { 0xAE63, 0x5BAE }, { 0xAE64, 0x5BB5 },
+	{ 0xAE65, 0x5BB9 }, { 0xAE66, 0x5BB8 }, { 0xAE67, 0x5C04 }, { 0xAE68, 0x5C51 }, { 0xAE69, 0x5C55 }, { 0xAE6A, 0x5C50 }, { 0xAE6B, 0x5CED }, { 0xAE6C, 0x5CFD },
+	{ 0xAE6D, 0x5CFB }, { 0xAE6E, 0x5CEA }, { 0xAE6F, 0x5CE8 }, { 0xAE70, 0x5CF0 }, { 0xAE71, 0x5CF6 }, { 0xAE72, 0x5D01 }, { 0xAE73, 0x5CF4 }, { 0xAE74, 0x5DEE },
+	{ 0xAE75, 0x5E2D }, { 0xAE76, 0x5E2B }, { 0xAE77, 0x5EAB }, { 0xAE78, 0x5EAD }, { 0xAE79, 0x5EA7 }, { 0xAE7A, 0x5F31 }, { 0xAE7B, 0x5F92 }, { 0xAE7C, 0x5F91 },
+	{ 0xAE7D, 0x5F90 }, { 0xAE7E, 0x6059 }, { 0xAEA1, 0x6063 }, { 0xAEA2, 0x6065 }, { 0xAEA3, 0x6050 }, { 0xAEA4, 0x6055 }, { 0xAEA5, 0x606D }, { 0xAEA6, 0x6069 },
+	{ 0xAEA7, 0x606F }, { 0xAEA8, 0x6084 }, { 0xAEA9, 0x609F }, { 0xAEAA, 0x609A }, { 0xAEAB, 0x608D }, { 0xAEAC, 0x6094 }, { 0xAEAD, 0x608C }, { 0xAEAE, 0x6085 },
+	{ 0xAEAF, 0x6096 }, { 0xAEB0, 0x6247 }, { 0xAEB1, 0x62F3 }, { 0xAEB2, 0x6308 }, { 0xAEB3, 0x62FF }, { 0xAEB4, 0x634E }, { 0xAEB5, 0x633E }, { 0xAEB6, 0x632F },
+	{ 0xAEB7, 0x6355 }, { 0xAEB8, 0x6342 }, { 0xAEB9, 0x6346 }, { 0xAEBA, 0x634F }, { 0xAEBB, 0x6349 }, { 0xAEBC, 0x633A }, { 0xAEBD, 0x6350 }, { 0xAEBE, 0x633D },
+	{ 0xAEBF, 0x632A }, { 0xAEC0, 0x632B }, { 0xAEC1, 0x6328 }, { 0xAEC2, 0x634D }, { 0xAEC3, 0x634C }, { 0xAEC4, 0x6548 }, { 0xAEC5, 0x6549 }, { 0xAEC6, 0x6599 },
+	{ 0xAEC7, 0x65C1 }, { 0xAEC8, 0x65C5 }, { 0xAEC9, 0x6642 }, { 0xAECA, 0x6649 }, { 0xAECB, 0x664F }, { 0xAECC, 0x6643 }, { 0xAECD, 0x6652 }, { 0xAECE, 0x664C },
+	{ 0xAECF, 0x6645 }, { 0xAED0, 0x6641 }, { 0xAED1, 0x66F8 }, { 0xAED2, 0x6714 }, { 0xAED3, 0x6715 }, { 0xAED4, 0x6717 }, { 0xAED5, 0x6821 }, { 0xAED6, 0x6838 },
+	{ 0xAED7, 0x6848 }, { 0xAED8, 0x6846 }, { 0xAED9, 0x6853 }, { 0xAEDA, 0x6839 }, { 0xAEDB, 0x6842 }, { 0xAEDC, 0x6854 }, { 0xAEDD, 0x6829 }, { 0xAEDE, 0x68B3 },
+	{ 0xAEDF, 0x6817 }, { 0xAEE0, 0x684C }, { 0xAEE1, 0x6851 }, { 0xAEE2, 0x683D }, { 0xAEE3, 0x67F4 }, { 0xAEE4, 0x6850 }, { 0xAEE5, 0x6840 }, { 0xAEE6, 0x683C },
+	{ 0xAEE7, 0x6843 }, { 0xAEE8, 0x682A }, { 0xAEE9, 0x6845 }, { 0xAEEA, 0x6813 }, { 0xAEEB, 0x6818 }, { 0xAEEC, 0x6841 }, { 0xAEED, 0x6B8A }, { 0xAEEE, 0x6B89 },
+	{ 0xAEEF, 0x6BB7 }, { 0xAEF0, 0x6C23 }, { 0xAEF1, 0x6C27 }, { 0xAEF2, 0x6C28 }, { 0xAEF3, 0x6C26 }, { 0xAEF4, 0x6C24 }, { 0xAEF5, 0x6CF0 }, { 0xAEF6, 0x6D6A },
+	{ 0xAEF7, 0x6D95 }, { 0xAEF8, 0x6D88 }, { 0xAEF9, 0x6D87 }, { 0xAEFA, 0x6D66 }, { 0xAEFB, 0x6D78 }, { 0xAEFC, 0x6D77 }, { 0xAEFD, 0x6D59 }, { 0xAEFE, 0x6D93 },
+	{ 0xAF40, 0x6D6C }, { 0xAF41, 0x6D89 }, { 0xAF42, 0x6D6E }, { 0xAF43, 0x6D5A }, { 0xAF44, 0x6D74 }, { 0xAF45, 0x6D69 }, { 0xAF46, 0x6D8C }, { 0xAF47, 0x6D8A },
+	{ 0xAF48, 0x6D79 }, { 0xAF49, 0x6D85 }, { 0xAF4A, 0x6D65 }, { 0xAF4B, 0x6D94 }, { 0xAF4C, 0x70CA }, { 0xAF4D, 0x70D8 }, { 0xAF4E, 0x70E4 }, { 0xAF4F, 0x70D9 },
+	{ 0xAF50, 0x70C8 }, { 0xAF51, 0x70CF }, { 0xAF52, 0x7239 }, { 0xAF53, 0x7279 }, { 0xAF54, 0x72FC }, { 0xAF55, 0x72F9 }, { 0xAF56, 0x72FD }, { 0xAF57, 0x72F8 },
+	{ 0xAF58, 0x72F7 }, { 0xAF59, 0x7386 }, { 0xAF5A, 0x73ED }, { 0xAF5B, 0x7409 }, { 0xAF5C, 0x73EE }, { 0xAF5D, 0x73E0 }, { 0xAF5E, 0x73EA }, { 0xAF5F, 0x73DE },
+	{ 0xAF60, 0x7554 }, { 0xAF61, 0x755D }, { 0xAF62, 0x755C }, { 0xAF63, 0x755A }, { 0xAF64, 0x7559 }, { 0xAF65, 0x75BE }, { 0xAF66, 0x75C5 }, { 0xAF67, 0x75C7 },
+	{ 0xAF68, 0x75B2 }, { 0xAF69, 0x75B3 }, { 0xAF6A, 0x75BD }, { 0xAF6B, 0x75BC }, { 0xAF6C, 0x75B9 }, { 0xAF6D, 0x75C2 }, { 0xAF6E, 0x75B8 }, { 0xAF6F, 0x768B },
+	{ 0xAF70, 0x76B0 }, { 0xAF71, 0x76CA }, { 0xAF72, 0x76CD }, { 0xAF73, 0x76CE }, { 0xAF74, 0x7729 }, { 0xAF75, 0x771F }, { 0xAF76, 0x7720 }, { 0xAF77, 0x7728 },
+	{ 0xAF78, 0x77E9 }, { 0xAF79, 0x7830 }, { 0xAF7A, 0x7827 }, { 0xAF7B, 0x7838 }, { 0xAF7C, 0x781D }, { 0xAF7D, 0x7834 }, { 0xAF7E, 0x7837 }, { 0xAFA1, 0x7825 },
+	{ 0xAFA2, 0x782D }, { 0xAFA3, 0x7820 }, { 0xAFA4, 0x781F }, { 0xAFA5, 0x7832 }, { 0xAFA6, 0x7955 }, { 0xAFA7, 0x7950 }, { 0xAFA8, 0x7960 }, { 0xAFA9, 0x795F },
+	{ 0xAFAA, 0x7956 }, { 0xAFAB, 0x795E }, { 0xAFAC, 0x795D }, { 0xAFAD, 0x7957 }, { 0xAFAE, 0x795A }, { 0xAFAF, 0x79E4 }, { 0xAFB0, 0x79E3 }, { 0xAFB1, 0x79E7 },
+	{ 0xAFB2, 0x79DF }, { 0xAFB3, 0x79E6 }, { 0xAFB4, 0x79E9 }, { 0xAFB5, 0x79D8 }, { 0xAFB6, 0x7A84 }, { 0xAFB7, 0x7A88 }, { 0xAFB8, 0x7AD9 }, { 0xAFB9, 0x7B06 },
+	{ 0xAFBA, 0x7B11 }, { 0xAFBB, 0x7C89 }, { 0xAFBC, 0x7D21 }, { 0xAFBD, 0x7D17 }, { 0xAFBE, 0x7D0B }, { 0xAFBF, 0x7D0A }, { 0xAFC0, 0x7D20 }, { 0xAFC1, 0x7D22 },
+	{ 0xAFC2, 0x7D14 }, { 0xAFC3, 0x7D10 }, { 0xAFC4, 0x7D15 }, { 0xAFC5, 0x7D1A }, { 0xAFC6, 0x7D1C }, { 0xAFC7, 0x7D0D }, { 0xAFC8, 0x7D19 }, { 0xAFC9, 0x7D1B },
+	{ 0xAFCA, 0x7F3A }, { 0xAFCB, 0x7F5F }, { 0xAFCC, 0x7F94 }, { 0xAFCD, 0x7FC5 }, { 0xAFCE, 0x7FC1 }, { 0xAFCF, 0x8006 }, { 0xAFD0, 0x8018 }, { 0xAFD1, 0x8015 },
+	{ 0xAFD2, 0x8019 }, { 0xAFD3, 0x8017 }, { 0xAFD4, 0x803D }, { 0xAFD5, 0x803F }, { 0xAFD6, 0x80F1 }, { 0xAFD7, 0x8102 }, { 0xAFD8, 0x80F0 }, { 0xAFD9, 0x8105 },
+	{ 0xAFDA, 0x80ED }, { 0xAFDB, 0x80F4 }, { 0xAFDC, 0x8106 }, { 0xAFDD, 0x80F8 }, { 0xAFDE, 0x80F3 }, { 0xAFDF, 0x8108 }, { 0xAFE0, 0x80FD }, { 0xAFE1, 0x810A },
+	{ 0xAFE2, 0x80FC }, { 0xAFE3, 0x80EF }, { 0xAFE4, 0x81ED }, { 0xAFE5, 0x81EC }, { 0xAFE6, 0x8200 }, { 0xAFE7, 0x8210 }, { 0xAFE8, 0x822A }, { 0xAFE9, 0x822B },
+	{ 0xAFEA, 0x8228 }, { 0xAFEB, 0x822C }, { 0xAFEC, 0x82BB }, { 0xAFED, 0x832B }, { 0xAFEE, 0x8352 }, { 0xAFEF, 0x8354 }, { 0xAFF0, 0x834A }, { 0xAFF1, 0x8338 },
+	{ 0xAFF2, 0x8350 }, { 0xAFF3, 0x8349 }, { 0xAFF4, 0x8335 }, { 0xAFF5, 0x8334 }, { 0xAFF6, 0x834F }, { 0xAFF7, 0x8332 }, { 0xAFF8, 0x8339 }, { 0xAFF9, 0x8336 },
+	{ 0xAFFA, 0x8317 }, { 0xAFFB, 0x8340 }, { 0xAFFC, 0x8331 }, { 0xAFFD, 0x8328 }, { 0xAFFE, 0x8343 }, { 0xB040, 0x8654 }, { 0xB041, 0x868A }, { 0xB042, 0x86AA },
+	{ 0xB043, 0x8693 }, { 0xB044, 0x86A4 }, { 0xB045, 0x86A9 }, { 0xB046, 0x868C }, { 0xB047, 0x86A3 }, { 0xB048, 0x869C }, { 0xB049, 0x8870 }, { 0xB04A, 0x8877 },
+	{ 0xB04B, 0x8881 }, { 0xB04C, 0x8882 }, { 0xB04D, 0x887D }, { 0xB04E, 0x8879 }, { 0xB04F, 0x8A18 }, { 0xB050, 0x8A10 }, { 0xB051, 0x8A0E }, { 0xB052, 0x8A0C },
+	{ 0xB053, 0x8A15 }, { 0xB054, 0x8A0A }, { 0xB055, 0x8A17 }, { 0xB056, 0x8A13 }, { 0xB057, 0x8A16 }, { 0xB058, 0x8A0F }, { 0xB059, 0x8A11 }, { 0xB05A, 0x8C48 },
+	{ 0xB05B, 0x8C7A }, { 0xB05C, 0x8C79 }, { 0xB05D, 0x8CA1 }, { 0xB05E, 0x8CA2 }, { 0xB05F, 0x8D77 }, { 0xB060, 0x8EAC }, { 0xB061, 0x8ED2 }, { 0xB062, 0x8ED4 },
+	{ 0xB063, 0x8ECF }, { 0xB064, 0x8FB1 }, { 0xB065, 0x9001 }, { 0xB066, 0x9006 }, { 0xB067, 0x8FF7 }, { 0xB068, 0x9000 }, { 0xB069, 0x8FFA }, { 0xB06A, 0x8FF4 },
+	{ 0xB06B, 0x9003 }, { 0xB06C, 0x8FFD }, { 0xB06D, 0x9005 }, { 0xB06E, 0x8FF8 }, { 0xB06F, 0x9095 }, { 0xB070, 0x90E1 }, { 0xB071, 0x90DD }, { 0xB072, 0x90E2 },
+	{ 0xB073, 0x9152 }, { 0xB074, 0x914D }, { 0xB075, 0x914C }, { 0xB076, 0x91D8 }, { 0xB077, 0x91DD }, { 0xB078, 0x91D7 }, { 0xB079, 0x91DC }, { 0xB07A, 0x91D9 },
+	{ 0xB07B, 0x9583 }, { 0xB07C, 0x9662 }, { 0xB07D, 0x9663 }, { 0xB07E, 0x9661 }, { 0xB0A1, 0x965B }, { 0xB0A2, 0x965D }, { 0xB0A3, 0x9664 }, { 0xB0A4, 0x9658 },
+	{ 0xB0A5, 0x965E }, { 0xB0A6, 0x96BB }, { 0xB0A7, 0x98E2 }, { 0xB0A8, 0x99AC }, { 0xB0A9, 0x9AA8 }, { 0xB0AA, 0x9AD8 }, { 0xB0AB, 0x9B25 }, { 0xB0AC, 0x9B32 },
+	{ 0xB0AD, 0x9B3C }, { 0xB0AE, 0x4E7E }, { 0xB0AF, 0x507A }, { 0xB0B0, 0x507D }, { 0xB0B1, 0x505C }, { 0xB0B2, 0x5047 }, { 0xB0B3, 0x5043 }, { 0xB0B4, 0x504C },
+	{ 0xB0B5, 0x505A }, { 0xB0B6, 0x5049 }, { 0xB0B7, 0x5065 }, { 0xB0B8, 0x5076 }, { 0xB0B9, 0x504E }, { 0xB0BA, 0x5055 }, { 0xB0BB, 0x5075 }, { 0xB0BC, 0x5074 },
+	{ 0xB0BD, 0x5077 }, { 0xB0BE, 0x504F }, { 0xB0BF, 0x500F }, { 0xB0C0, 0x506F }, { 0xB0C1, 0x506D }, { 0xB0C2, 0x515C }, { 0xB0C3, 0x5195 }, { 0xB0C4, 0x51F0 },
+	{ 0xB0C5, 0x526A }, { 0xB0C6, 0x526F }, { 0xB0C7, 0x52D2 }, { 0xB0C8, 0x52D9 }, { 0xB0C9, 0x52D8 }, { 0xB0CA, 0x52D5 }, { 0xB0CB, 0x5310 }, { 0xB0CC, 0x530F },
+	{ 0xB0CD, 0x5319 }, { 0xB0CE, 0x533F }, { 0xB0CF, 0x5340 }, { 0xB0D0, 0x533E }, { 0xB0D1, 0x53C3 }, { 0xB0D2, 0x66FC }, { 0xB0D3, 0x5546 }, { 0xB0D4, 0x556A },
+	{ 0xB0D5, 0x5566 }, { 0xB0D6, 0x5544 }, { 0xB0D7, 0x555E }, { 0xB0D8, 0x5561 }, { 0xB0D9, 0x5543 }, { 0xB0DA, 0x554A }, { 0xB0DB, 0x5531 }, { 0xB0DC, 0x5556 },
+	{ 0xB0DD, 0x554F }, { 0xB0DE, 0x5555 }, { 0xB0DF, 0x552F }, { 0xB0E0, 0x5564 }, { 0xB0E1, 0x5538 }, { 0xB0E2, 0x552E }, { 0xB0E3, 0x555C }, { 0xB0E4, 0x552C },
+	{ 0xB0E5, 0x5563 }, { 0xB0E6, 0x5533 }, { 0xB0E7, 0x5541 }, { 0xB0E8, 0x5557 }, { 0xB0E9, 0x5708 }, { 0xB0EA, 0x570B }, { 0xB0EB, 0x5709 }, { 0xB0EC, 0x57DF },
+	{ 0xB0ED, 0x5805 }, { 0xB0EE, 0x580A }, { 0xB0EF, 0x5806 }, { 0xB0F0, 0x57E0 }, { 0xB0F1, 0x57E4 }, { 0xB0F2, 0x57FA }, { 0xB0F3, 0x5802 }, { 0xB0F4, 0x5835 },
+	{ 0xB0F5, 0x57F7 }, { 0xB0F6, 0x57F9 }, { 0xB0F7, 0x5920 }, { 0xB0F8, 0x5962 }, { 0xB0F9, 0x5A36 }, { 0xB0FA, 0x5A41 }, { 0xB0FB, 0x5A49 }, { 0xB0FC, 0x5A66 },
+	{ 0xB0FD, 0x5A6A }, { 0xB0FE, 0x5A40 }, { 0xB140, 0x5A3C }, { 0xB141, 0x5A62 }, { 0xB142, 0x5A5A }, { 0xB143, 0x5A46 }, { 0xB144, 0x5A4A }, { 0xB145, 0x5B70 },
+	{ 0xB146, 0x5BC7 }, { 0xB147, 0x5BC5 }, { 0xB148, 0x5BC4 }, { 0xB149, 0x5BC2 }, { 0xB14A, 0x5BBF }, { 0xB14B, 0x5BC6 }, { 0xB14C, 0x5C09 }, { 0xB14D, 0x5C08 },
+	{ 0xB14E, 0x5C07 }, { 0xB14F, 0x5C60 }, { 0xB150, 0x5C5C }, { 0xB151, 0x5C5D }, { 0xB152, 0x5D07 }, { 0xB153, 0x5D06 }, { 0xB154, 0x5D0E }, { 0xB155, 0x5D1B },
+	{ 0xB156, 0x5D16 }, { 0xB157, 0x5D22 }, { 0xB158, 0x5D11 }, { 0xB159, 0x5D29 }, { 0xB15A, 0x5D14 }, { 0xB15B, 0x5D19 }, { 0xB15C, 0x5D24 }, { 0xB15D, 0x5D27 },
+	{ 0xB15E, 0x5D17 }, { 0xB15F, 0x5DE2 }, { 0xB160, 0x5E38 }, { 0xB161, 0x5E36 }, { 0xB162, 0x5E33 }, { 0xB163, 0x5E37 }, { 0xB164, 0x5EB7 }, { 0xB165, 0x5EB8 },
+	{ 0xB166, 0x5EB6 }, { 0xB167, 0x5EB5 }, { 0xB168, 0x5EBE }, { 0xB169, 0x5F35 }, { 0xB16A, 0x5F37 }, { 0xB16B, 0x5F57 }, { 0xB16C, 0x5F6C }, { 0xB16D, 0x5F69 },
+	{ 0xB16E, 0x5F6B }, { 0xB16F, 0x5F97 }, { 0xB170, 0x5F99 }, { 0xB171, 0x5F9E }, { 0xB172, 0x5F98 }, { 0xB173, 0x5FA1 }, { 0xB174, 0x5FA0 }, { 0xB175, 0x5F9C },
+	{ 0xB176, 0x607F }, { 0xB177, 0x60A3 }, { 0xB178, 0x6089 }, { 0xB179, 0x60A0 }, { 0xB17A, 0x60A8 }, { 0xB17B, 0x60CB }, { 0xB17C, 0x60B4 }, { 0xB17D, 0x60E6 },
+	{ 0xB17E, 0x60BD }, { 0xB1A1, 0x60C5 }, { 0xB1A2, 0x60BB }, { 0xB1A3, 0x60B5 }, { 0xB1A4, 0x60DC }, { 0xB1A5, 0x60BC }, { 0xB1A6, 0x60D8 }, { 0xB1A7, 0x60D5 },
+	{ 0xB1A8, 0x60C6 }, { 0xB1A9, 0x60DF }, { 0xB1AA, 0x60B8 }, { 0xB1AB, 0x60DA }, { 0xB1AC, 0x60C7 }, { 0xB1AD, 0x621A }, { 0xB1AE, 0x621B }, { 0xB1AF, 0x6248 },
+	{ 0xB1B0, 0x63A0 }, { 0xB1B1, 0x63A7 }, { 0xB1B2, 0x6372 }, { 0xB1B3, 0x6396 }, { 0xB1B4, 0x63A2 }, { 0xB1B5, 0x63A5 }, { 0xB1B6, 0x6377 }, { 0xB1B7, 0x6367 },
+	{ 0xB1B8, 0x6398 }, { 0xB1B9, 0x63AA }, { 0xB1BA, 0x6371 }, { 0xB1BB, 0x63A9 }, { 0xB1BC, 0x6389 }, { 0xB1BD, 0x6383 }, { 0xB1BE, 0x639B }, { 0xB1BF, 0x636B },
+	{ 0xB1C0, 0x63A8 }, { 0xB1C1, 0x6384 }, { 0xB1C2, 0x6388 }, { 0xB1C3, 0x6399 }, { 0xB1C4, 0x63A1 }, { 0xB1C5, 0x63AC }, { 0xB1C6, 0x6392 }, { 0xB1C7, 0x638F },
+	{ 0xB1C8, 0x6380 }, { 0xB1C9, 0x637B }, { 0xB1CA, 0x6369 }, { 0xB1CB, 0x6368 }, { 0xB1CC, 0x637A }, { 0xB1CD, 0x655D }, { 0xB1CE, 0x6556 }, { 0xB1CF, 0x6551 },
+	{ 0xB1D0, 0x6559 }, { 0xB1D1, 0x6557 }, { 0xB1D2, 0x555F }, { 0xB1D3, 0x654F }, { 0xB1D4, 0x6558 }, { 0xB1D5, 0x6555 }, { 0xB1D6, 0x6554 }, { 0xB1D7, 0x659C },
+	{ 0xB1D8, 0x659B }, { 0xB1D9, 0x65AC }, { 0xB1DA, 0x65CF }, { 0xB1DB, 0x65CB }, { 0xB1DC, 0x65CC }, { 0xB1DD, 0x65CE }, { 0xB1DE, 0x665D }, { 0xB1DF, 0x665A },
+	{ 0xB1E0, 0x6664 }, { 0xB1E1, 0x6668 }, { 0xB1E2, 0x6666 }, { 0xB1E3, 0x665E }, { 0xB1E4, 0x66F9 }, { 0xB1E5, 0x52D7 }, { 0xB1E6, 0x671B }, { 0xB1E7, 0x6881 },
+	{ 0xB1E8, 0x68AF }, { 0xB1E9, 0x68A2 }, { 0xB1EA, 0x6893 }, { 0xB1EB, 0x68B5 }, { 0xB1EC, 0x687F }, { 0xB1ED, 0x6876 }, { 0xB1EE, 0x68B1 }, { 0xB1EF, 0x68A7 },
+	{ 0xB1F0, 0x6897 }, { 0xB1F1, 0x68B0 }, { 0xB1F2, 0x6883 }, { 0xB1F3, 0x68C4 }, { 0xB1F4, 0x68AD }, { 0xB1F5, 0x6886 }, { 0xB1F6, 0x6885 }, { 0xB1F7, 0x6894 },
+	{ 0xB1F8, 0x689D }, { 0xB1F9, 0x68A8 }, { 0xB1FA, 0x689F }, { 0xB1FB, 0x68A1 }, { 0xB1FC, 0x6882 }, { 0xB1FD, 0x6B32 }, { 0xB1FE, 0x6BBA }, { 0xB240, 0x6BEB },
+	{ 0xB241, 0x6BEC }, { 0xB242, 0x6C2B }, { 0xB243, 0x6D8E }, { 0xB244, 0x6DBC }, { 0xB245, 0x6DF3 }, { 0xB246, 0x6DD9 }, { 0xB247, 0x6DB2 }, { 0xB248, 0x6DE1 },
+	{ 0xB249, 0x6DCC }, { 0xB24A, 0x6DE4 }, { 0xB24B, 0x6DFB }, { 0xB24C, 0x6DFA }, { 0xB24D, 0x6E05 }, { 0xB24E, 0x6DC7 }, { 0xB24F, 0x6DCB }, { 0xB250, 0x6DAF },
+	{ 0xB251, 0x6DD1 }, { 0xB252, 0x6DAE }, { 0xB253, 0x6DDE }, { 0xB254, 0x6DF9 }, { 0xB255, 0x6DB8 }, { 0xB256, 0x6DF7 }, { 0xB257, 0x6DF5 }, { 0xB258, 0x6DC5 },
+	{ 0xB259, 0x6DD2 }, { 0xB25A, 0x6E1A }, { 0xB25B, 0x6DB5 }, { 0xB25C, 0x6DDA }, { 0xB25D, 0x6DEB }, { 0xB25E, 0x6DD8 }, { 0xB25F, 0x6DEA }, { 0xB260, 0x6DF1 },
+	{ 0xB261, 0x6DEE }, { 0xB262, 0x6DE8 }, { 0xB263, 0x6DC6 }, { 0xB264, 0x6DC4 }, { 0xB265, 0x6DAA }, { 0xB266, 0x6DEC }, { 0xB267, 0x6DBF }, { 0xB268, 0x6DE6 },
+	{ 0xB269, 0x70F9 }, { 0xB26A, 0x7109 }, { 0xB26B, 0x710A }, { 0xB26C, 0x70FD }, { 0xB26D, 0x70EF }, { 0xB26E, 0x723D }, { 0xB26F, 0x727D }, { 0xB270, 0x7281 },
+	{ 0xB271, 0x731C }, { 0xB272, 0x731B }, { 0xB273, 0x7316 }, { 0xB274, 0x7313 }, { 0xB275, 0x7319 }, { 0xB276, 0x7387 }, { 0xB277, 0x7405 }, { 0xB278, 0x740A },
+	{ 0xB279, 0x7403 }, { 0xB27A, 0x7406 }, { 0xB27B, 0x73FE }, { 0xB27C, 0x740D }, { 0xB27D, 0x74E0 }, { 0xB27E, 0x74F6 }, { 0xB2A1, 0x74F7 }, { 0xB2A2, 0x751C },
+	{ 0xB2A3, 0x7522 }, { 0xB2A4, 0x7565 }, { 0xB2A5, 0x7566 }, { 0xB2A6, 0x7562 }, { 0xB2A7, 0x7570 }, { 0xB2A8, 0x758F }, { 0xB2A9, 0x75D4 }, { 0xB2AA, 0x75D5 },
+	{ 0xB2AB, 0x75B5 }, { 0xB2AC, 0x75CA }, { 0xB2AD, 0x75CD }, { 0xB2AE, 0x768E }, { 0xB2AF, 0x76D4 }, { 0xB2B0, 0x76D2 }, { 0xB2B1, 0x76DB }, { 0xB2B2, 0x7737 },
+	{ 0xB2B3, 0x773E }, { 0xB2B4, 0x773C }, { 0xB2B5, 0x7736 }, { 0xB2B6, 0x7738 }, { 0xB2B7, 0x773A }, { 0xB2B8, 0x786B }, { 0xB2B9, 0x7843 }, { 0xB2BA, 0x784E },
+	{ 0xB2BB, 0x7965 }, { 0xB2BC, 0x7968 }, { 0xB2BD, 0x796D }, { 0xB2BE, 0x79FB }, { 0xB2BF, 0x7A92 }, { 0xB2C0, 0x7A95 }, { 0xB2C1, 0x7B20 }, { 0xB2C2, 0x7B28 },
+	{ 0xB2C3, 0x7B1B }, { 0xB2C4, 0x7B2C }, { 0xB2C5, 0x7B26 }, { 0xB2C6, 0x7B19 }, { 0xB2C7, 0x7B1E }, { 0xB2C8, 0x7B2E }, { 0xB2C9, 0x7C92 }, { 0xB2CA, 0x7C97 },
+	{ 0xB2CB, 0x7C95 }, { 0xB2CC, 0x7D46 }, { 0xB2CD, 0x7D43 }, { 0xB2CE, 0x7D71 }, { 0xB2CF, 0x7D2E }, { 0xB2D0, 0x7D39 }, { 0xB2D1, 0x7D3C }, { 0xB2D2, 0x7D40 },
+	{ 0xB2D3, 0x7D30 }, { 0xB2D4, 0x7D33 }, { 0xB2D5, 0x7D44 }, { 0xB2D6, 0x7D2F }, { 0xB2D7, 0x7D42 }, { 0xB2D8, 0x7D32 }, { 0xB2D9, 0x7D31 }, { 0xB2DA, 0x7F3D },
+	{ 0xB2DB, 0x7F9E }, { 0xB2DC, 0x7F9A }, { 0xB2DD, 0x7FCC }, { 0xB2DE, 0x7FCE }, { 0xB2DF, 0x7FD2 }, { 0xB2E0, 0x801C }, { 0xB2E1, 0x804A }, { 0xB2E2, 0x8046 },
+	{ 0xB2E3, 0x812F }, { 0xB2E4, 0x8116 }, { 0xB2E5, 0x8123 }, { 0xB2E6, 0x812B }, { 0xB2E7, 0x8129 }, { 0xB2E8, 0x8130 }, { 0xB2E9, 0x8124 }, { 0xB2EA, 0x8202 },
+	{ 0xB2EB, 0x8235 }, { 0xB2EC, 0x8237 }, { 0xB2ED, 0x8236 }, { 0xB2EE, 0x8239 }, { 0xB2EF, 0x838E }, { 0xB2F0, 0x839E }, { 0xB2F1, 0x8398 }, { 0xB2F2, 0x8378 },
+	{ 0xB2F3, 0x83A2 }, { 0xB2F4, 0x8396 }, { 0xB2F5, 0x83BD }, { 0xB2F6, 0x83AB }, { 0xB2F7, 0x8392 }, { 0xB2F8, 0x838A }, { 0xB2F9, 0x8393 }, { 0xB2FA, 0x8389 },
+	{ 0xB2FB, 0x83A0 }, { 0xB2FC, 0x8377 }, { 0xB2FD, 0x837B }, { 0xB2FE, 0x837C }, { 0xB340, 0x8386 }, { 0xB341, 0x83A7 }, { 0xB342, 0x8655 }, { 0xB343, 0x5F6A },
+	{ 0xB344, 0x86C7 }, { 0xB345, 0x86C0 }, { 0xB346, 0x86B6 }, { 0xB347, 0x86C4 }, { 0xB348, 0x86B5 }, { 0xB349, 0x86C6 }, { 0xB34A, 0x86CB }, { 0xB34B, 0x86B1 },
+	{ 0xB34C, 0x86AF }, { 0xB34D, 0x86C9 }, { 0xB34E, 0x8853 }, { 0xB34F, 0x889E }, { 0xB350, 0x8888 }, { 0xB351, 0x88AB }, { 0xB352, 0x8892 }, { 0xB353, 0x8896 },
+	{ 0xB354, 0x888D }, { 0xB355, 0x888B }, { 0xB356, 0x8993 }, { 0xB357, 0x898F }, { 0xB358, 0x8A2A }, { 0xB359, 0x8A1D }, { 0xB35A, 0x8A23 }, { 0xB35B, 0x8A25 },
+	{ 0xB35C, 0x8A31 }, { 0xB35D, 0x8A2D }, { 0xB35E, 0x8A1F }, { 0xB35F, 0x8A1B }, { 0xB360, 0x8A22 }, { 0xB361, 0x8C49 }, { 0xB362, 0x8C5A }, { 0xB363, 0x8CA9 },
+	{ 0xB364, 0x8CAC }, { 0xB365, 0x8CAB }, { 0xB366, 0x8CA8 }, { 0xB367, 0x8CAA }, { 0xB368, 0x8CA7 }, { 0xB369, 0x8D67 }, { 0xB36A, 0x8D66 }, { 0xB36B, 0x8DBE },
+	{ 0xB36C, 0x8DBA }, { 0xB36D, 0x8EDB }, { 0xB36E, 0x8EDF }, { 0xB36F, 0x9019 }, { 0xB370, 0x900D }, { 0xB371, 0x901A }, { 0xB372, 0x9017 }, { 0xB373, 0x9023 },
+	{ 0xB374, 0x901F }, { 0xB375, 0x901D }, { 0xB376, 0x9010 }, { 0xB377, 0x9015 }, { 0xB378, 0x901E }, { 0xB379, 0x9020 }, { 0xB37A, 0x900F }, { 0xB37B, 0x9022 },
+	{ 0xB37C, 0x9016 }, { 0xB37D, 0x901B }, { 0xB37E, 0x9014 }, { 0xB3A1, 0x90E8 }, { 0xB3A2, 0x90ED }, { 0xB3A3, 0x90FD }, { 0xB3A4, 0x9157 }, { 0xB3A5, 0x91CE },
+	{ 0xB3A6, 0x91F5 }, { 0xB3A7, 0x91E6 }, { 0xB3A8, 0x91E3 }, { 0xB3A9, 0x91E7 }, { 0xB3AA, 0x91ED }, { 0xB3AB, 0x91E9 }, { 0xB3AC, 0x9589 }, { 0xB3AD, 0x966A },
+	{ 0xB3AE, 0x9675 }, { 0xB3AF, 0x9673 }, { 0xB3B0, 0x9678 }, { 0xB3B1, 0x9670 }, { 0xB3B2, 0x9674 }, { 0xB3B3, 0x9676 }, { 0xB3B4, 0x9677 }, { 0xB3B5, 0x966C },
+	{ 0xB3B6, 0x96C0 }, { 0xB3B7, 0x96EA }, { 0xB3B8, 0x96E9 }, { 0xB3B9, 0x7AE0 }, { 0xB3BA, 0x7ADF }, { 0xB3BB, 0x9802 }, { 0xB3BC, 0x9803 }, { 0xB3BD, 0x9B5A },
+	{ 0xB3BE, 0x9CE5 }, { 0xB3BF, 0x9E75 }, { 0xB3C0, 0x9E7F }, { 0xB3C1, 0x9EA5 }, { 0xB3C2, 0x9EBB }, { 0xB3C3, 0x50A2 }, { 0xB3C4, 0x508D }, { 0xB3C5, 0x5085 },
+	{ 0xB3C6, 0x5099 }, { 0xB3C7, 0x5091 }, { 0xB3C8, 0x5080 }, { 0xB3C9, 0x5096 }, { 0xB3CA, 0x5098 }, { 0xB3CB, 0x509A }, { 0xB3CC, 0x6700 }, { 0xB3CD, 0x51F1 },
+	{ 0xB3CE, 0x5272 }, { 0xB3CF, 0x5274 }, { 0xB3D0, 0x5275 }, { 0xB3D1, 0x5269 }, { 0xB3D2, 0x52DE }, { 0xB3D3, 0x52DD }, { 0xB3D4, 0x52DB }, { 0xB3D5, 0x535A },
+	{ 0xB3D6, 0x53A5 }, { 0xB3D7, 0x557B }, { 0xB3D8, 0x5580 }, { 0xB3D9, 0x55A7 }, { 0xB3DA, 0x557C }, { 0xB3DB, 0x558A }, { 0xB3DC, 0x559D }, { 0xB3DD, 0x5598 },
+	{ 0xB3DE, 0x5582 }, { 0xB3DF, 0x559C }, { 0xB3E0, 0x55AA }, { 0xB3E1, 0x5594 }, { 0xB3E2, 0x5587 }, { 0xB3E3, 0x558B }, { 0xB3E4, 0x5583 }, { 0xB3E5, 0x55B3 },
+	{ 0xB3E6, 0x55AE }, { 0xB3E7, 0x559F }, { 0xB3E8, 0x553E }, { 0xB3E9, 0x55B2 }, { 0xB3EA, 0x559A }, { 0xB3EB, 0x55BB }, { 0xB3EC, 0x55AC }, { 0xB3ED, 0x55B1 },
+	{ 0xB3EE, 0x557E }, { 0xB3EF, 0x5589 }, { 0xB3F0, 0x55AB }, { 0xB3F1, 0x5599 }, { 0xB3F2, 0x570D }, { 0xB3F3, 0x582F }, { 0xB3F4, 0x582A }, { 0xB3F5, 0x5834 },
+	{ 0xB3F6, 0x5824 }, { 0xB3F7, 0x5830 }, { 0xB3F8, 0x5831 }, { 0xB3F9, 0x5821 }, { 0xB3FA, 0x581D }, { 0xB3FB, 0x5820 }, { 0xB3FC, 0x58F9 }, { 0xB3FD, 0x58FA },
+	{ 0xB3FE, 0x5960 }, { 0xB440, 0x5A77 }, { 0xB441, 0x5A9A }, { 0xB442, 0x5A7F }, { 0xB443, 0x5A92 }, { 0xB444, 0x5A9B }, { 0xB445, 0x5AA7 }, { 0xB446, 0x5B73 },
+	{ 0xB447, 0x5B71 }, { 0xB448, 0x5BD2 }, { 0xB449, 0x5BCC }, { 0xB44A, 0x5BD3 }, { 0xB44B, 0x5BD0 }, { 0xB44C, 0x5C0A }, { 0xB44D, 0x5C0B }, { 0xB44E, 0x5C31 },
+	{ 0xB44F, 0x5D4C }, { 0xB450, 0x5D50 }, { 0xB451, 0x5D34 }, { 0xB452, 0x5D47 }, { 0xB453, 0x5DFD }, { 0xB454, 0x5E45 }, { 0xB455, 0x5E3D }, { 0xB456, 0x5E40 },
+	{ 0xB457, 0x5E43 }, { 0xB458, 0x5E7E }, { 0xB459, 0x5ECA }, { 0xB45A, 0x5EC1 }, { 0xB45B, 0x5EC2 }, { 0xB45C, 0x5EC4 }, { 0xB45D, 0x5F3C }, { 0xB45E, 0x5F6D },
+	{ 0xB45F, 0x5FA9 }, { 0xB460, 0x5FAA }, { 0xB461, 0x5FA8 }, { 0xB462, 0x60D1 }, { 0xB463, 0x60E1 }, { 0xB464, 0x60B2 }, { 0xB465, 0x60B6 }, { 0xB466, 0x60E0 },
+	{ 0xB467, 0x611C }, { 0xB468, 0x6123 }, { 0xB469, 0x60FA }, { 0xB46A, 0x6115 }, { 0xB46B, 0x60F0 }, { 0xB46C, 0x60FB }, { 0xB46D, 0x60F4 }, { 0xB46E, 0x6168 },
+	{ 0xB46F, 0x60F1 }, { 0xB470, 0x610E }, { 0xB471, 0x60F6 }, { 0xB472, 0x6109 }, { 0xB473, 0x6100 }, { 0xB474, 0x6112 }, { 0xB475, 0x621F }, { 0xB476, 0x6249 },
+	{ 0xB477, 0x63A3 }, { 0xB478, 0x638C }, { 0xB479, 0x63CF }, { 0xB47A, 0x63C0 }, { 0xB47B, 0x63E9 }, { 0xB47C, 0x63C9 }, { 0xB47D, 0x63C6 }, { 0xB47E, 0x63CD },
+	{ 0xB4A1, 0x63D2 }, { 0xB4A2, 0x63E3 }, { 0xB4A3, 0x63D0 }, { 0xB4A4, 0x63E1 }, { 0xB4A5, 0x63D6 }, { 0xB4A6, 0x63ED }, { 0xB4A7, 0x63EE }, { 0xB4A8, 0x6376 },
+	{ 0xB4A9, 0x63F4 }, { 0xB4AA, 0x63EA }, { 0xB4AB, 0x63DB }, { 0xB4AC, 0x6452 }, { 0xB4AD, 0x63DA }, { 0xB4AE, 0x63F9 }, { 0xB4AF, 0x655E }, { 0xB4B0, 0x6566 },
+	{ 0xB4B1, 0x6562 }, { 0xB4B2, 0x6563 }, { 0xB4B3, 0x6591 }, { 0xB4B4, 0x6590 }, { 0xB4B5, 0x65AF }, { 0xB4B6, 0x666E }, { 0xB4B7, 0x6670 }, { 0xB4B8, 0x6674 },
+	{ 0xB4B9, 0x6676 }, { 0xB4BA, 0x666F }, { 0xB4BB, 0x6691 }, { 0xB4BC, 0x667A }, { 0xB4BD, 0x667E }, { 0xB4BE, 0x6677 }, { 0xB4BF, 0x66FE }, { 0xB4C0, 0x66FF },
+	{ 0xB4C1, 0x671F }, { 0xB4C2, 0x671D }, { 0xB4C3, 0x68FA }, { 0xB4C4, 0x68D5 }, { 0xB4C5, 0x68E0 }, { 0xB4C6, 0x68D8 }, { 0xB4C7, 0x68D7 }, { 0xB4C8, 0x6905 },
+	{ 0xB4C9, 0x68DF }, { 0xB4CA, 0x68F5 }, { 0xB4CB, 0x68EE }, { 0xB4CC, 0x68E7 }, { 0xB4CD, 0x68F9 }, { 0xB4CE, 0x68D2 }, { 0xB4CF, 0x68F2 }, { 0xB4D0, 0x68E3 },
+	{ 0xB4D1, 0x68CB }, { 0xB4D2, 0x68CD }, { 0xB4D3, 0x690D }, { 0xB4D4, 0x6912 }, { 0xB4D5, 0x690E }, { 0xB4D6, 0x68C9 }, { 0xB4D7, 0x68DA }, { 0xB4D8, 0x696E },
+	{ 0xB4D9, 0x68FB }, { 0xB4DA, 0x6B3E }, { 0xB4DB, 0x6B3A }, { 0xB4DC, 0x6B3D }, { 0xB4DD, 0x6B98 }, { 0xB4DE, 0x6B96 }, { 0xB4DF, 0x6BBC }, { 0xB4E0, 0x6BEF },
+	{ 0xB4E1, 0x6C2E }, { 0xB4E2, 0x6C2F }, { 0xB4E3, 0x6C2C }, { 0xB4E4, 0x6E2F }, { 0xB4E5, 0x6E38 }, { 0xB4E6, 0x6E54 }, { 0xB4E7, 0x6E21 }, { 0xB4E8, 0x6E32 },
+	{ 0xB4E9, 0x6E67 }, { 0xB4EA, 0x6E4A }, { 0xB4EB, 0x6E20 }, { 0xB4EC, 0x6E25 }, { 0xB4ED, 0x6E23 }, { 0xB4EE, 0x6E1B }, { 0xB4EF, 0x6E5B }, { 0xB4F0, 0x6E58 },
+	{ 0xB4F1, 0x6E24 }, { 0xB4F2, 0x6E56 }, { 0xB4F3, 0x6E6E }, { 0xB4F4, 0x6E2D }, { 0xB4F5, 0x6E26 }, { 0xB4F6, 0x6E6F }, { 0xB4F7, 0x6E34 }, { 0xB4F8, 0x6E4D },
+	{ 0xB4F9, 0x6E3A }, { 0xB4FA, 0x6E2C }, { 0xB4FB, 0x6E43 }, { 0xB4FC, 0x6E1D }, { 0xB4FD, 0x6E3E }, { 0xB4FE, 0x6ECB }, { 0xB540, 0x6E89 }, { 0xB541, 0x6E19 },
+	{ 0xB542, 0x6E4E }, { 0xB543, 0x6E63 }, { 0xB544, 0x6E44 }, { 0xB545, 0x6E72 }, { 0xB546, 0x6E69 }, { 0xB547, 0x6E5F }, { 0xB548, 0x7119 }, { 0xB549, 0x711A },
+	{ 0xB54A, 0x7126 }, { 0xB54B, 0x7130 }, { 0xB54C, 0x7121 }, { 0xB54D, 0x7136 }, { 0xB54E, 0x716E }, { 0xB54F, 0x711C }, { 0xB550, 0x724C }, { 0xB551, 0x7284 },
+	{ 0xB552, 0x7280 }, { 0xB553, 0x7336 }, { 0xB554, 0x7325 }, { 0xB555, 0x7334 }, { 0xB556, 0x7329 }, { 0xB557, 0x743A }, { 0xB558, 0x742A }, { 0xB559, 0x7433 },
+	{ 0xB55A, 0x7422 }, { 0xB55B, 0x7425 }, { 0xB55C, 0x7435 }, { 0xB55D, 0x7436 }, { 0xB55E, 0x7434 }, { 0xB55F, 0x742F }, { 0xB560, 0x741B }, { 0xB561, 0x7426 },
+	{ 0xB562, 0x7428 }, { 0xB563, 0x7525 }, { 0xB564, 0x7526 }, { 0xB565, 0x756B }, { 0xB566, 0x756A }, { 0xB567, 0x75E2 }, { 0xB568, 0x75DB }, { 0xB569, 0x75E3 },
+	{ 0xB56A, 0x75D9 }, { 0xB56B, 0x75D8 }, { 0xB56C, 0x75DE }, { 0xB56D, 0x75E0 }, { 0xB56E, 0x767B }, { 0xB56F, 0x767C }, { 0xB570, 0x7696 }, { 0xB571, 0x7693 },
+	{ 0xB572, 0x76B4 }, { 0xB573, 0x76DC }, { 0xB574, 0x774F }, { 0xB575, 0x77ED }, { 0xB576, 0x785D }, { 0xB577, 0x786C }, { 0xB578, 0x786F }, { 0xB579, 0x7A0D },
+	{ 0xB57A, 0x7A08 }, { 0xB57B, 0x7A0B }, { 0xB57C, 0x7A05 }, { 0xB57D, 0x7A00 }, { 0xB57E, 0x7A98 }, { 0xB5A1, 0x7A97 }, { 0xB5A2, 0x7A96 }, { 0xB5A3, 0x7AE5 },
+	{ 0xB5A4, 0x7AE3 }, { 0xB5A5, 0x7B49 }, { 0xB5A6, 0x7B56 }, { 0xB5A7, 0x7B46 }, { 0xB5A8, 0x7B50 }, { 0xB5A9, 0x7B52 }, { 0xB5AA, 0x7B54 }, { 0xB5AB, 0x7B4D },
+	{ 0xB5AC, 0x7B4B }, { 0xB5AD, 0x7B4F }, { 0xB5AE, 0x7B51 }, { 0xB5AF, 0x7C9F }, { 0xB5B0, 0x7CA5 }, { 0xB5B1, 0x7D5E }, { 0xB5B2, 0x7D50 }, { 0xB5B3, 0x7D68 },
+	{ 0xB5B4, 0x7D55 }, { 0xB5B5, 0x7D2B }, { 0xB5B6, 0x7D6E }, { 0xB5B7, 0x7D72 }, { 0xB5B8, 0x7D61 }, { 0xB5B9, 0x7D66 }, { 0xB5BA, 0x7D62 }, { 0xB5BB, 0x7D70 },
+	{ 0xB5BC, 0x7D73 }, { 0xB5BD, 0x5584 }, { 0xB5BE, 0x7FD4 }, { 0xB5BF, 0x7FD5 }, { 0xB5C0, 0x800B }, { 0xB5C1, 0x8052 }, { 0xB5C2, 0x8085 }, { 0xB5C3, 0x8155 },
+	{ 0xB5C4, 0x8154 }, { 0xB5C5, 0x814B }, { 0xB5C6, 0x8151 }, { 0xB5C7, 0x814E }, { 0xB5C8, 0x8139 }, { 0xB5C9, 0x8146 }, { 0xB5CA, 0x813E }, { 0xB5CB, 0x814C },
+	{ 0xB5CC, 0x8153 }, { 0xB5CD, 0x8174 }, { 0xB5CE, 0x8212 }, { 0xB5CF, 0x821C }, { 0xB5D0, 0x83E9 }, { 0xB5D1, 0x8403 }, { 0xB5D2, 0x83F8 }, { 0xB5D3, 0x840D },
+	{ 0xB5D4, 0x83E0 }, { 0xB5D5, 0x83C5 }, { 0xB5D6, 0x840B }, { 0xB5D7, 0x83C1 }, { 0xB5D8, 0x83EF }, { 0xB5D9, 0x83F1 }, { 0xB5DA, 0x83F4 }, { 0xB5DB, 0x8457 },
+	{ 0xB5DC, 0x840A }, { 0xB5DD, 0x83F0 }, { 0xB5DE, 0x840C }, { 0xB5DF, 0x83CC }, { 0xB5E0, 0x83FD }, { 0xB5E1, 0x83F2 }, { 0xB5E2, 0x83CA }, { 0xB5E3, 0x8438 },
+	{ 0xB5E4, 0x840E }, { 0xB5E5, 0x8404 }, { 0xB5E6, 0x83DC }, { 0xB5E7, 0x8407 }, { 0xB5E8, 0x83D4 }, { 0xB5E9, 0x83DF }, { 0xB5EA, 0x865B }, { 0xB5EB, 0x86DF },
+	{ 0xB5EC, 0x86D9 }, { 0xB5ED, 0x86ED }, { 0xB5EE, 0x86D4 }, { 0xB5EF, 0x86DB }, { 0xB5F0, 0x86E4 }, { 0xB5F1, 0x86D0 }, { 0xB5F2, 0x86DE }, { 0xB5F3, 0x8857 },
+	{ 0xB5F4, 0x88C1 }, { 0xB5F5, 0x88C2 }, { 0xB5F6, 0x88B1 }, { 0xB5F7, 0x8983 }, { 0xB5F8, 0x8996 }, { 0xB5F9, 0x8A3B }, { 0xB5FA, 0x8A60 }, { 0xB5FB, 0x8A55 },
+	{ 0xB5FC, 0x8A5E }, { 0xB5FD, 0x8A3C }, { 0xB5FE, 0x8A41 }, { 0xB640, 0x8A54 }, { 0xB641, 0x8A5B }, { 0xB642, 0x8A50 }, { 0xB643, 0x8A46 }, { 0xB644, 0x8A34 },
+	{ 0xB645, 0x8A3A }, { 0xB646, 0x8A36 }, { 0xB647, 0x8A56 }, { 0xB648, 0x8C61 }, { 0xB649, 0x8C82 }, { 0xB64A, 0x8CAF }, { 0xB64B, 0x8CBC }, { 0xB64C, 0x8CB3 },
+	{ 0xB64D, 0x8CBD }, { 0xB64E, 0x8CC1 }, { 0xB64F, 0x8CBB }, { 0xB650, 0x8CC0 }, { 0xB651, 0x8CB4 }, { 0xB652, 0x8CB7 }, { 0xB653, 0x8CB6 }, { 0xB654, 0x8CBF },
+	{ 0xB655, 0x8CB8 }, { 0xB656, 0x8D8A }, { 0xB657, 0x8D85 }, { 0xB658, 0x8D81 }, { 0xB659, 0x8DCE }, { 0xB65A, 0x8DDD }, { 0xB65B, 0x8DCB }, { 0xB65C, 0x8DDA },
+	{ 0xB65D, 0x8DD1 }, { 0xB65E, 0x8DCC }, { 0xB65F, 0x8DDB }, { 0xB660, 0x8DC6 }, { 0xB661, 0x8EFB }, { 0xB662, 0x8EF8 }, { 0xB663, 0x8EFC }, { 0xB664, 0x8F9C },
+	{ 0xB665, 0x902E }, { 0xB666, 0x9035 }, { 0xB667, 0x9031 }, { 0xB668, 0x9038 }, { 0xB669, 0x9032 }, { 0xB66A, 0x9036 }, { 0xB66B, 0x9102 }, { 0xB66C, 0x90F5 },
+	{ 0xB66D, 0x9109 }, { 0xB66E, 0x90FE }, { 0xB66F, 0x9163 }, { 0xB670, 0x9165 }, { 0xB671, 0x91CF }, { 0xB672, 0x9214 }, { 0xB673, 0x9215 }, { 0xB674, 0x9223 },
+	{ 0xB675, 0x9209 }, { 0xB676, 0x921E }, { 0xB677, 0x920D }, { 0xB678, 0x9210 }, { 0xB679, 0x9207 }, { 0xB67A, 0x9211 }, { 0xB67B, 0x9594 }, { 0xB67C, 0x958F },
+	{ 0xB67D, 0x958B }, { 0xB67E, 0x9591 }, { 0xB6A1, 0x9593 }, { 0xB6A2, 0x9592 }, { 0xB6A3, 0x958E }, { 0xB6A4, 0x968A }, { 0xB6A5, 0x968E }, { 0xB6A6, 0x968B },
+	{ 0xB6A7, 0x967D }, { 0xB6A8, 0x9685 }, { 0xB6A9, 0x9686 }, { 0xB6AA, 0x968D }, { 0xB6AB, 0x9672 }, { 0xB6AC, 0x9684 }, { 0xB6AD, 0x96C1 }, { 0xB6AE, 0x96C5 },
+	{ 0xB6AF, 0x96C4 }, { 0xB6B0, 0x96C6 }, { 0xB6B1, 0x96C7 }, { 0xB6B2, 0x96EF }, { 0xB6B3, 0x96F2 }, { 0xB6B4, 0x97CC }, { 0xB6B5, 0x9805 }, { 0xB6B6, 0x9806 },
+	{ 0xB6B7, 0x9808 }, { 0xB6B8, 0x98E7 }, { 0xB6B9, 0x98EA }, { 0xB6BA, 0x98EF }, { 0xB6BB, 0x98E9 }, { 0xB6BC, 0x98F2 }, { 0xB6BD, 0x98ED }, { 0xB6BE, 0x99AE },
+	{ 0xB6BF, 0x99AD }, { 0xB6C0, 0x9EC3 }, { 0xB6C1, 0x9ECD }, { 0xB6C2, 0x9ED1 }, { 0xB6C3, 0x4E82 }, { 0xB6C4, 0x50AD }, { 0xB6C5, 0x50B5 }, { 0xB6C6, 0x50B2 },
+	{ 0xB6C7, 0x50B3 }, { 0xB6C8, 0x50C5 }, { 0xB6C9, 0x50BE }, { 0xB6CA, 0x50AC }, { 0xB6CB, 0x50B7 }, { 0xB6CC, 0x50BB }, { 0xB6CD, 0x50AF }, { 0xB6CE, 0x50C7 },
+	{ 0xB6CF, 0x527F }, { 0xB6D0, 0x5277 }, { 0xB6D1, 0x527D }, { 0xB6D2, 0x52DF }, { 0xB6D3, 0x52E6 }, { 0xB6D4, 0x52E4 }, { 0xB6D5, 0x52E2 }, { 0xB6D6, 0x52E3 },
+	{ 0xB6D7, 0x532F }, { 0xB6D8, 0x55DF }, { 0xB6D9, 0x55E8 }, { 0xB6DA, 0x55D3 }, { 0xB6DB, 0x55E6 }, { 0xB6DC, 0x55CE }, { 0xB6DD, 0x55DC }, { 0xB6DE, 0x55C7 },
+	{ 0xB6DF, 0x55D1 }, { 0xB6E0, 0x55E3 }, { 0xB6E1, 0x55E4 }, { 0xB6E2, 0x55EF }, { 0xB6E3, 0x55DA }, { 0xB6E4, 0x55E1 }, { 0xB6E5, 0x55C5 }, { 0xB6E6, 0x55C6 },
+	{ 0xB6E7, 0x55E5 }, { 0xB6E8, 0x55C9 }, { 0xB6E9, 0x5712 }, { 0xB6EA, 0x5713 }, { 0xB6EB, 0x585E }, { 0xB6EC, 0x5851 }, { 0xB6ED, 0x5858 }, { 0xB6EE, 0x5857 },
+	{ 0xB6EF, 0x585A }, { 0xB6F0, 0x5854 }, { 0xB6F1, 0x586B }, { 0xB6F2, 0x584C }, { 0xB6F3, 0x586D }, { 0xB6F4, 0x584A }, { 0xB6F5, 0x5862 }, { 0xB6F6, 0x5852 },
+	{ 0xB6F7, 0x584B }, { 0xB6F8, 0x5967 }, { 0xB6F9, 0x5AC1 }, { 0xB6FA, 0x5AC9 }, { 0xB6FB, 0x5ACC }, { 0xB6FC, 0x5ABE }, { 0xB6FD, 0x5ABD }, { 0xB6FE, 0x5ABC },
+	{ 0xB740, 0x5AB3 }, { 0xB741, 0x5AC2 }, { 0xB742, 0x5AB2 }, { 0xB743, 0x5D69 }, { 0xB744, 0x5D6F }, { 0xB745, 0x5E4C }, { 0xB746, 0x5E79 }, { 0xB747, 0x5EC9 },
+	{ 0xB748, 0x5EC8 }, { 0xB749, 0x5F12 }, { 0xB74A, 0x5F59 }, { 0xB74B, 0x5FAC }, { 0xB74C, 0x5FAE }, { 0xB74D, 0x611A }, { 0xB74E, 0x610F }, { 0xB74F, 0x6148 },
+	{ 0xB750, 0x611F }, { 0xB751, 0x60F3 }, { 0xB752, 0x611B }, { 0xB753, 0x60F9 }, { 0xB754, 0x6101 }, { 0xB755, 0x6108 }, { 0xB756, 0x614E }, { 0xB757, 0x614C },
+	{ 0xB758, 0x6144 }, { 0xB759, 0x614D }, { 0xB75A, 0x613E }, { 0xB75B, 0x6134 }, { 0xB75C, 0x6127 }, { 0xB75D, 0x610D }, { 0xB75E, 0x6106 }, { 0xB75F, 0x6137 },
+	{ 0xB760, 0x6221 }, { 0xB761, 0x6222 }, { 0xB762, 0x6413 }, { 0xB763, 0x643E }, { 0xB764, 0x641E }, { 0xB765, 0x642A }, { 0xB766, 0x642D }, { 0xB767, 0x643D },
+	{ 0xB768, 0x642C }, { 0xB769, 0x640F }, { 0xB76A, 0x641C }, { 0xB76B, 0x6414 }, { 0xB76C, 0x640D }, { 0xB76D, 0x6436 }, { 0xB76E, 0x6416 }, { 0xB76F, 0x6417 },
+	{ 0xB770, 0x6406 }, { 0xB771, 0x656C }, { 0xB772, 0x659F }, { 0xB773, 0x65B0 }, { 0xB774, 0x6697 }, { 0xB775, 0x6689 }, { 0xB776, 0x6687 }, { 0xB777, 0x6688 },
+	{ 0xB778, 0x6696 }, { 0xB779, 0x6684 }, { 0xB77A, 0x6698 }, { 0xB77B, 0x668D }, { 0xB77C, 0x6703 }, { 0xB77D, 0x6994 }, { 0xB77E, 0x696D }, { 0xB7A1, 0x695A },
+	{ 0xB7A2, 0x6977 }, { 0xB7A3, 0x6960 }, { 0xB7A4, 0x6954 }, { 0xB7A5, 0x6975 }, { 0xB7A6, 0x6930 }, { 0xB7A7, 0x6982 }, { 0xB7A8, 0x694A }, { 0xB7A9, 0x6968 },
+	{ 0xB7AA, 0x696B }, { 0xB7AB, 0x695E }, { 0xB7AC, 0x6953 }, { 0xB7AD, 0x6979 }, { 0xB7AE, 0x6986 }, { 0xB7AF, 0x695D }, { 0xB7B0, 0x6963 }, { 0xB7B1, 0x695B },
+	{ 0xB7B2, 0x6B47 }, { 0xB7B3, 0x6B72 }, { 0xB7B4, 0x6BC0 }, { 0xB7B5, 0x6BBF }, { 0xB7B6, 0x6BD3 }, { 0xB7B7, 0x6BFD }, { 0xB7B8, 0x6EA2 }, { 0xB7B9, 0x6EAF },
+	{ 0xB7BA, 0x6ED3 }, { 0xB7BB, 0x6EB6 }, { 0xB7BC, 0x6EC2 }, { 0xB7BD, 0x6E90 }, { 0xB7BE, 0x6E9D }, { 0xB7BF, 0x6EC7 }, { 0xB7C0, 0x6EC5 }, { 0xB7C1, 0x6EA5 },
+	{ 0xB7C2, 0x6E98 }, { 0xB7C3, 0x6EBC }, { 0xB7C4, 0x6EBA }, { 0xB7C5, 0x6EAB }, { 0xB7C6, 0x6ED1 }, { 0xB7C7, 0x6E96 }, { 0xB7C8, 0x6E9C }, { 0xB7C9, 0x6EC4 },
+	{ 0xB7CA, 0x6ED4 }, { 0xB7CB, 0x6EAA }, { 0xB7CC, 0x6EA7 }, { 0xB7CD, 0x6EB4 }, { 0xB7CE, 0x714E }, { 0xB7CF, 0x7159 }, { 0xB7D0, 0x7169 }, { 0xB7D1, 0x7164 },
+	{ 0xB7D2, 0x7149 }, { 0xB7D3, 0x7167 }, { 0xB7D4, 0x715C }, { 0xB7D5, 0x716C }, { 0xB7D6, 0x7166 }, { 0xB7D7, 0x714C }, { 0xB7D8, 0x7165 }, { 0xB7D9, 0x715E },
+	{ 0xB7DA, 0x7146 }, { 0xB7DB, 0x7168 }, { 0xB7DC, 0x7156 }, { 0xB7DD, 0x723A }, { 0xB7DE, 0x7252 }, { 0xB7DF, 0x7337 }, { 0xB7E0, 0x7345 }, { 0xB7E1, 0x733F },
+	{ 0xB7E2, 0x733E }, { 0xB7E3, 0x746F }, { 0xB7E4, 0x745A }, { 0xB7E5, 0x7455 }, { 0xB7E6, 0x745F }, { 0xB7E7, 0x745E }, { 0xB7E8, 0x7441 }, { 0xB7E9, 0x743F },
+	{ 0xB7EA, 0x7459 }, { 0xB7EB, 0x745B }, { 0xB7EC, 0x745C }, { 0xB7ED, 0x7576 }, { 0xB7EE, 0x7578 }, { 0xB7EF, 0x7600 }, { 0xB7F0, 0x75F0 }, { 0xB7F1, 0x7601 },
+	{ 0xB7F2, 0x75F2 }, { 0xB7F3, 0x75F1 }, { 0xB7F4, 0x75FA }, { 0xB7F5, 0x75FF }, { 0xB7F6, 0x75F4 }, { 0xB7F7, 0x75F3 }, { 0xB7F8, 0x76DE }, { 0xB7F9, 0x76DF },
+	{ 0xB7FA, 0x775B }, { 0xB7FB, 0x776B }, { 0xB7FC, 0x7766 }, { 0xB7FD, 0x775E }, { 0xB7FE, 0x7763 }, { 0xB840, 0x7779 }, { 0xB841, 0x776A }, { 0xB842, 0x776C },
+	{ 0xB843, 0x775C }, { 0xB844, 0x7765 }, { 0xB845, 0x7768 }, { 0xB846, 0x7762 }, { 0xB847, 0x77EE }, { 0xB848, 0x788E }, { 0xB849, 0x78B0 }, { 0xB84A, 0x7897 },
+	{ 0xB84B, 0x7898 }, { 0xB84C, 0x788C }, { 0xB84D, 0x7889 }, { 0xB84E, 0x787C }, { 0xB84F, 0x7891 }, { 0xB850, 0x7893 }, { 0xB851, 0x787F }, { 0xB852, 0x797A },
+	{ 0xB853, 0x797F }, { 0xB854, 0x7981 }, { 0xB855, 0x842C }, { 0xB856, 0x79BD }, { 0xB857, 0x7A1C }, { 0xB858, 0x7A1A }, { 0xB859, 0x7A20 }, { 0xB85A, 0x7A14 },
+	{ 0xB85B, 0x7A1F }, { 0xB85C, 0x7A1E }, { 0xB85D, 0x7A9F }, { 0xB85E, 0x7AA0 }, { 0xB85F, 0x7B77 }, { 0xB860, 0x7BC0 }, { 0xB861, 0x7B60 }, { 0xB862, 0x7B6E },
+	{ 0xB863, 0x7B67 }, { 0xB864, 0x7CB1 }, { 0xB865, 0x7CB3 }, { 0xB866, 0x7CB5 }, { 0xB867, 0x7D93 }, { 0xB868, 0x7D79 }, { 0xB869, 0x7D91 }, { 0xB86A, 0x7D81 },
+	{ 0xB86B, 0x7D8F }, { 0xB86C, 0x7D5B }, { 0xB86D, 0x7F6E }, { 0xB86E, 0x7F69 }, { 0xB86F, 0x7F6A }, { 0xB870, 0x7F72 }, { 0xB871, 0x7FA9 }, { 0xB872, 0x7FA8 },
+	{ 0xB873, 0x7FA4 }, { 0xB874, 0x8056 }, { 0xB875, 0x8058 }, { 0xB876, 0x8086 }, { 0xB877, 0x8084 }, { 0xB878, 0x8171 }, { 0xB879, 0x8170 }, { 0xB87A, 0x8178 },
+	{ 0xB87B, 0x8165 }, { 0xB87C, 0x816E }, { 0xB87D, 0x8173 }, { 0xB87E, 0x816B }, { 0xB8A1, 0x8179 }, { 0xB8A2, 0x817A }, { 0xB8A3, 0x8166 }, { 0xB8A4, 0x8205 },
+	{ 0xB8A5, 0x8247 }, { 0xB8A6, 0x8482 }, { 0xB8A7, 0x8477 }, { 0xB8A8, 0x843D }, { 0xB8A9, 0x8431 }, { 0xB8AA, 0x8475 }, { 0xB8AB, 0x8466 }, { 0xB8AC, 0x846B },
+	{ 0xB8AD, 0x8449 }, { 0xB8AE, 0x846C }, { 0xB8AF, 0x845B }, { 0xB8B0, 0x843C }, { 0xB8B1, 0x8435 }, { 0xB8B2, 0x8461 }, { 0xB8B3, 0x8463 }, { 0xB8B4, 0x8469 },
+	{ 0xB8B5, 0x846D }, { 0xB8B6, 0x8446 }, { 0xB8B7, 0x865E }, { 0xB8B8, 0x865C }, { 0xB8B9, 0x865F }, { 0xB8BA, 0x86F9 }, { 0xB8BB, 0x8713 }, { 0xB8BC, 0x8708 },
+	{ 0xB8BD, 0x8707 }, { 0xB8BE, 0x8700 }, { 0xB8BF, 0x86FE }, { 0xB8C0, 0x86FB }, { 0xB8C1, 0x8702 }, { 0xB8C2, 0x8703 }, { 0xB8C3, 0x8706 }, { 0xB8C4, 0x870A },
+	{ 0xB8C5, 0x8859 }, { 0xB8C6, 0x88DF }, { 0xB8C7, 0x88D4 }, { 0xB8C8, 0x88D9 }, { 0xB8C9, 0x88DC }, { 0xB8CA, 0x88D8 }, { 0xB8CB, 0x88DD }, { 0xB8CC, 0x88E1 },
+	{ 0xB8CD, 0x88CA }, { 0xB8CE, 0x88D5 }, { 0xB8CF, 0x88D2 }, { 0xB8D0, 0x899C }, { 0xB8D1, 0x89E3 }, { 0xB8D2, 0x8A6B }, { 0xB8D3, 0x8A72 }, { 0xB8D4, 0x8A73 },
+	{ 0xB8D5, 0x8A66 }, { 0xB8D6, 0x8A69 }, { 0xB8D7, 0x8A70 }, { 0xB8D8, 0x8A87 }, { 0xB8D9, 0x8A7C }, { 0xB8DA, 0x8A63 }, { 0xB8DB, 0x8AA0 }, { 0xB8DC, 0x8A71 },
+	{ 0xB8DD, 0x8A85 }, { 0xB8DE, 0x8A6D }, { 0xB8DF, 0x8A62 }, { 0xB8E0, 0x8A6E }, { 0xB8E1, 0x8A6C }, { 0xB8E2, 0x8A79 }, { 0xB8E3, 0x8A7B }, { 0xB8E4, 0x8A3E },
+	{ 0xB8E5, 0x8A68 }, { 0xB8E6, 0x8C62 }, { 0xB8E7, 0x8C8A }, { 0xB8E8, 0x8C89 }, { 0xB8E9, 0x8CCA }, { 0xB8EA, 0x8CC7 }, { 0xB8EB, 0x8CC8 }, { 0xB8EC, 0x8CC4 },
+	{ 0xB8ED, 0x8CB2 }, { 0xB8EE, 0x8CC3 }, { 0xB8EF, 0x8CC2 }, { 0xB8F0, 0x8CC5 }, { 0xB8F1, 0x8DE1 }, { 0xB8F2, 0x8DDF }, { 0xB8F3, 0x8DE8 }, { 0xB8F4, 0x8DEF },
+	{ 0xB8F5, 0x8DF3 }, { 0xB8F6, 0x8DFA }, { 0xB8F7, 0x8DEA }, { 0xB8F8, 0x8DE4 }, { 0xB8F9, 0x8DE6 }, { 0xB8FA, 0x8EB2 }, { 0xB8FB, 0x8F03 }, { 0xB8FC, 0x8F09 },
+	{ 0xB8FD, 0x8EFE }, { 0xB8FE, 0x8F0A }, { 0xB940, 0x8F9F }, { 0xB941, 0x8FB2 }, { 0xB942, 0x904B }, { 0xB943, 0x904A }, { 0xB944, 0x9053 }, { 0xB945, 0x9042 },
+	{ 0xB946, 0x9054 }, { 0xB947, 0x903C }, { 0xB948, 0x9055 }, { 0xB949, 0x9050 }, { 0xB94A, 0x9047 }, { 0xB94B, 0x904F }, { 0xB94C, 0x904E }, { 0xB94D, 0x904D },
+	{ 0xB94E, 0x9051 }, { 0xB94F, 0x903E }, { 0xB950, 0x9041 }, { 0xB951, 0x9112 }, { 0xB952, 0x9117 }, { 0xB953, 0x916C }, { 0xB954, 0x916A }, { 0xB955, 0x9169 },
+	{ 0xB956, 0x91C9 }, { 0xB957, 0x9237 }, { 0xB958, 0x9257 }, { 0xB959, 0x9238 }, { 0xB95A, 0x923D }, { 0xB95B, 0x9240 }, { 0xB95C, 0x923E }, { 0xB95D, 0x925B },
+	{ 0xB95E, 0x924B }, { 0xB95F, 0x9264 }, { 0xB960, 0x9251 }, { 0xB961, 0x9234 }, { 0xB962, 0x9249 }, { 0xB963, 0x924D }, { 0xB964, 0x9245 }, { 0xB965, 0x9239 },
+	{ 0xB966, 0x923F }, { 0xB967, 0x925A }, { 0xB968, 0x9598 }, { 0xB969, 0x9698 }, { 0xB96A, 0x9694 }, { 0xB96B, 0x9695 }, { 0xB96C, 0x96CD }, { 0xB96D, 0x96CB },
+	{ 0xB96E, 0x96C9 }, { 0xB96F, 0x96CA }, { 0xB970, 0x96F7 }, { 0xB971, 0x96FB }, { 0xB972, 0x96F9 }, { 0xB973, 0x96F6 }, { 0xB974, 0x9756 }, { 0xB975, 0x9774 },
+	{ 0xB976, 0x9776 }, { 0xB977, 0x9810 }, { 0xB978, 0x9811 }, { 0xB979, 0x9813 }, { 0xB97A, 0x980A }, { 0xB97B, 0x9812 }, { 0xB97C, 0x980C }, { 0xB97D, 0x98FC },
+	{ 0xB97E, 0x98F4 }, { 0xB9A1, 0x98FD }, { 0xB9A2, 0x98FE }, { 0xB9A3, 0x99B3 }, { 0xB9A4, 0x99B1 }, { 0xB9A5, 0x99B4 }, { 0xB9A6, 0x9AE1 }, { 0xB9A7, 0x9CE9 },
+	{ 0xB9A8, 0x9E82 }, { 0xB9A9, 0x9F0E }, { 0xB9AA, 0x9F13 }, { 0xB9AB, 0x9F20 }, { 0xB9AC, 0x50E7 }, { 0xB9AD, 0x50EE }, { 0xB9AE, 0x50E5 }, { 0xB9AF, 0x50D6 },
+	{ 0xB9B0, 0x50ED }, { 0xB9B1, 0x50DA }, { 0xB9B2, 0x50D5 }, { 0xB9B3, 0x50CF }, { 0xB9B4, 0x50D1 }, { 0xB9B5, 0x50F1 }, { 0xB9B6, 0x50CE }, { 0xB9B7, 0x50E9 },
+	{ 0xB9B8, 0x5162 }, { 0xB9B9, 0x51F3 }, { 0xB9BA, 0x5283 }, { 0xB9BB, 0x5282 }, { 0xB9BC, 0x5331 }, { 0xB9BD, 0x53AD }, { 0xB9BE, 0x55FE }, { 0xB9BF, 0x5600 },
+	{ 0xB9C0, 0x561B }, { 0xB9C1, 0x5617 }, { 0xB9C2, 0x55FD }, { 0xB9C3, 0x5614 }, { 0xB9C4, 0x5606 }, { 0xB9C5, 0x5609 }, { 0xB9C6, 0x560D }, { 0xB9C7, 0x560E },
+	{ 0xB9C8, 0x55F7 }, { 0xB9C9, 0x5616 }, { 0xB9CA, 0x561F }, { 0xB9CB, 0x5608 }, { 0xB9CC, 0x5610 }, { 0xB9CD, 0x55F6 }, { 0xB9CE, 0x5718 }, { 0xB9CF, 0x5716 },
+	{ 0xB9D0, 0x5875 }, { 0xB9D1, 0x587E }, { 0xB9D2, 0x5883 }, { 0xB9D3, 0x5893 }, { 0xB9D4, 0x588A }, { 0xB9D5, 0x5879 }, { 0xB9D6, 0x5885 }, { 0xB9D7, 0x587D },
+	{ 0xB9D8, 0x58FD }, { 0xB9D9, 0x5925 }, { 0xB9DA, 0x5922 }, { 0xB9DB, 0x5924 }, { 0xB9DC, 0x596A }, { 0xB9DD, 0x5969 }, { 0xB9DE, 0x5AE1 }, { 0xB9DF, 0x5AE6 },
+	{ 0xB9E0, 0x5AE9 }, { 0xB9E1, 0x5AD7 }, { 0xB9E2, 0x5AD6 }, { 0xB9E3, 0x5AD8 }, { 0xB9E4, 0x5AE3 }, { 0xB9E5, 0x5B75 }, { 0xB9E6, 0x5BDE }, { 0xB9E7, 0x5BE7 },
+	{ 0xB9E8, 0x5BE1 }, { 0xB9E9, 0x5BE5 }, { 0xB9EA, 0x5BE6 }, { 0xB9EB, 0x5BE8 }, { 0xB9EC, 0x5BE2 }, { 0xB9ED, 0x5BE4 }, { 0xB9EE, 0x5BDF }, { 0xB9EF, 0x5C0D },
+	{ 0xB9F0, 0x5C62 }, { 0xB9F1, 0x5D84 }, { 0xB9F2, 0x5D87 }, { 0xB9F3, 0x5E5B }, { 0xB9F4, 0x5E63 }, { 0xB9F5, 0x5E55 }, { 0xB9F6, 0x5E57 }, { 0xB9F7, 0x5E54 },
+	{ 0xB9F8, 0x5ED3 }, { 0xB9F9, 0x5ED6 }, { 0xB9FA, 0x5F0A }, { 0xB9FB, 0x5F46 }, { 0xB9FC, 0x5F70 }, { 0xB9FD, 0x5FB9 }, { 0xB9FE, 0x6147 }, { 0xBA40, 0x613F },
+	{ 0xBA41, 0x614B }, { 0xBA42, 0x6177 }, { 0xBA43, 0x6162 }, { 0xBA44, 0x6163 }, { 0xBA45, 0x615F }, { 0xBA46, 0x615A }, { 0xBA47, 0x6158 }, { 0xBA48, 0x6175 },
+	{ 0xBA49, 0x622A }, { 0xBA4A, 0x6487 }, { 0xBA4B, 0x6458 }, { 0xBA4C, 0x6454 }, { 0xBA4D, 0x64A4 }, { 0xBA4E, 0x6478 }, { 0xBA4F, 0x645F }, { 0xBA50, 0x647A },
+	{ 0xBA51, 0x6451 }, { 0xBA52, 0x6467 }, { 0xBA53, 0x6434 }, { 0xBA54, 0x646D }, { 0xBA55, 0x647B }, { 0xBA56, 0x6572 }, { 0xBA57, 0x65A1 }, { 0xBA58, 0x65D7 },
+	{ 0xBA59, 0x65D6 }, { 0xBA5A, 0x66A2 }, { 0xBA5B, 0x66A8 }, { 0xBA5C, 0x669D }, { 0xBA5D, 0x699C }, { 0xBA5E, 0x69A8 }, { 0xBA5F, 0x6995 }, { 0xBA60, 0x69C1 },
+	{ 0xBA61, 0x69AE }, { 0xBA62, 0x69D3 }, { 0xBA63, 0x69CB }, { 0xBA64, 0x699B }, { 0xBA65, 0x69B7 }, { 0xBA66, 0x69BB }, { 0xBA67, 0x69AB }, { 0xBA68, 0x69B4 },
+	{ 0xBA69, 0x69D0 }, { 0xBA6A, 0x69CD }, { 0xBA6B, 0x69AD }, { 0xBA6C, 0x69CC }, { 0xBA6D, 0x69A6 }, { 0xBA6E, 0x69C3 }, { 0xBA6F, 0x69A3 }, { 0xBA70, 0x6B49 },
+	{ 0xBA71, 0x6B4C }, { 0xBA72, 0x6C33 }, { 0xBA73, 0x6F33 }, { 0xBA74, 0x6F14 }, { 0xBA75, 0x6EFE }, { 0xBA76, 0x6F13 }, { 0xBA77, 0x6EF4 }, { 0xBA78, 0x6F29 },
+	{ 0xBA79, 0x6F3E }, { 0xBA7A, 0x6F20 }, { 0xBA7B, 0x6F2C }, { 0xBA7C, 0x6F0F }, { 0xBA7D, 0x6F02 }, { 0xBA7E, 0x6F22 }, { 0xBAA1, 0x6EFF }, { 0xBAA2, 0x6EEF },
+	{ 0xBAA3, 0x6F06 }, { 0xBAA4, 0x6F31 }, { 0xBAA5, 0x6F38 }, { 0xBAA6, 0x6F32 }, { 0xBAA7, 0x6F23 }, { 0xBAA8, 0x6F15 }, { 0xBAA9, 0x6F2B }, { 0xBAAA, 0x6F2F },
+	{ 0xBAAB, 0x6F88 }, { 0xBAAC, 0x6F2A }, { 0xBAAD, 0x6EEC }, { 0xBAAE, 0x6F01 }, { 0xBAAF, 0x6EF2 }, { 0xBAB0, 0x6ECC }, { 0xBAB1, 0x6EF7 }, { 0xBAB2, 0x7194 },
+	{ 0xBAB3, 0x7199 }, { 0xBAB4, 0x717D }, { 0xBAB5, 0x718A }, { 0xBAB6, 0x7184 }, { 0xBAB7, 0x7192 }, { 0xBAB8, 0x723E }, { 0xBAB9, 0x7292 }, { 0xBABA, 0x7296 },
+	{ 0xBABB, 0x7344 }, { 0xBABC, 0x7350 }, { 0xBABD, 0x7464 }, { 0xBABE, 0x7463 }, { 0xBABF, 0x746A }, { 0xBAC0, 0x7470 }, { 0xBAC1, 0x746D }, { 0xBAC2, 0x7504 },
+	{ 0xBAC3, 0x7591 }, { 0xBAC4, 0x7627 }, { 0xBAC5, 0x760D }, { 0xBAC6, 0x760B }, { 0xBAC7, 0x7609 }, { 0xBAC8, 0x7613 }, { 0xBAC9, 0x76E1 }, { 0xBACA, 0x76E3 },
+	{ 0xBACB, 0x7784 }, { 0xBACC, 0x777D }, { 0xBACD, 0x777F }, { 0xBACE, 0x7761 }, { 0xBACF, 0x78C1 }, { 0xBAD0, 0x789F }, { 0xBAD1, 0x78A7 }, { 0xBAD2, 0x78B3 },
+	{ 0xBAD3, 0x78A9 }, { 0xBAD4, 0x78A3 }, { 0xBAD5, 0x798E }, { 0xBAD6, 0x798F }, { 0xBAD7, 0x798D }, { 0xBAD8, 0x7A2E }, { 0xBAD9, 0x7A31 }, { 0xBADA, 0x7AAA },
+	{ 0xBADB, 0x7AA9 }, { 0xBADC, 0x7AED }, { 0xBADD, 0x7AEF }, { 0xBADE, 0x7BA1 }, { 0xBADF, 0x7B95 }, { 0xBAE0, 0x7B8B }, { 0xBAE1, 0x7B75 }, { 0xBAE2, 0x7B97 },
+	{ 0xBAE3, 0x7B9D }, { 0xBAE4, 0x7B94 }, { 0xBAE5, 0x7B8F }, { 0xBAE6, 0x7BB8 }, { 0xBAE7, 0x7B87 }, { 0xBAE8, 0x7B84 }, { 0xBAE9, 0x7CB9 }, { 0xBAEA, 0x7CBD },
+	{ 0xBAEB, 0x7CBE }, { 0xBAEC, 0x7DBB }, { 0xBAED, 0x7DB0 }, { 0xBAEE, 0x7D9C }, { 0xBAEF, 0x7DBD }, { 0xBAF0, 0x7DBE }, { 0xBAF1, 0x7DA0 }, { 0xBAF2, 0x7DCA },
+	{ 0xBAF3, 0x7DB4 }, { 0xBAF4, 0x7DB2 }, { 0xBAF5, 0x7DB1 }, { 0xBAF6, 0x7DBA }, { 0xBAF7, 0x7DA2 }, { 0xBAF8, 0x7DBF }, { 0xBAF9, 0x7DB5 }, { 0xBAFA, 0x7DB8 },
+	{ 0xBAFB, 0x7DAD }, { 0xBAFC, 0x7DD2 }, { 0xBAFD, 0x7DC7 }, { 0xBAFE, 0x7DAC }, { 0xBB40, 0x7F70 }, { 0xBB41, 0x7FE0 }, { 0xBB42, 0x7FE1 }, { 0xBB43, 0x7FDF },
+	{ 0xBB44, 0x805E }, { 0xBB45, 0x805A }, { 0xBB46, 0x8087 }, { 0xBB47, 0x8150 }, { 0xBB48, 0x8180 }, { 0xBB49, 0x818F }, { 0xBB4A, 0x8188 }, { 0xBB4B, 0x818A },
+	{ 0xBB4C, 0x817F }, { 0xBB4D, 0x8182 }, { 0xBB4E, 0x81E7 }, { 0xBB4F, 0x81FA }, { 0xBB50, 0x8207 }, { 0xBB51, 0x8214 }, { 0xBB52, 0x821E }, { 0xBB53, 0x824B },
+	{ 0xBB54, 0x84C9 }, { 0xBB55, 0x84BF }, { 0xBB56, 0x84C6 }, { 0xBB57, 0x84C4 }, { 0xBB58, 0x8499 }, { 0xBB59, 0x849E }, { 0xBB5A, 0x84B2 }, { 0xBB5B, 0x849C },
+	{ 0xBB5C, 0x84CB }, { 0xBB5D, 0x84B8 }, { 0xBB5E, 0x84C0 }, { 0xBB5F, 0x84D3 }, { 0xBB60, 0x8490 }, { 0xBB61, 0x84BC }, { 0xBB62, 0x84D1 }, { 0xBB63, 0x84CA },
+	{ 0xBB64, 0x873F }, { 0xBB65, 0x871C }, { 0xBB66, 0x873B }, { 0xBB67, 0x8722 }, { 0xBB68, 0x8725 }, { 0xBB69, 0x8734 }, { 0xBB6A, 0x8718 }, { 0xBB6B, 0x8755 },
+	{ 0xBB6C, 0x8737 }, { 0xBB6D, 0x8729 }, { 0xBB6E, 0x88F3 }, { 0xBB6F, 0x8902 }, { 0xBB70, 0x88F4 }, { 0xBB71, 0x88F9 }, { 0xBB72, 0x88F8 }, { 0xBB73, 0x88FD },
+	{ 0xBB74, 0x88E8 }, { 0xBB75, 0x891A }, { 0xBB76, 0x88EF }, { 0xBB77, 0x8AA6 }, { 0xBB78, 0x8A8C }, { 0xBB79, 0x8A9E }, { 0xBB7A, 0x8AA3 }, { 0xBB7B, 0x8A8D },
+	{ 0xBB7C, 0x8AA1 }, { 0xBB7D, 0x8A93 }, { 0xBB7E, 0x8AA4 }, { 0xBBA1, 0x8AAA }, { 0xBBA2, 0x8AA5 }, { 0xBBA3, 0x8AA8 }, { 0xBBA4, 0x8A98 }, { 0xBBA5, 0x8A91 },
+	{ 0xBBA6, 0x8A9A }, { 0xBBA7, 0x8AA7 }, { 0xBBA8, 0x8C6A }, { 0xBBA9, 0x8C8D }, { 0xBBAA, 0x8C8C }, { 0xBBAB, 0x8CD3 }, { 0xBBAC, 0x8CD1 }, { 0xBBAD, 0x8CD2 },
+	{ 0xBBAE, 0x8D6B }, { 0xBBAF, 0x8D99 }, { 0xBBB0, 0x8D95 }, { 0xBBB1, 0x8DFC }, { 0xBBB2, 0x8F14 }, { 0xBBB3, 0x8F12 }, { 0xBBB4, 0x8F15 }, { 0xBBB5, 0x8F13 },
+	{ 0xBBB6, 0x8FA3 }, { 0xBBB7, 0x9060 }, { 0xBBB8, 0x9058 }, { 0xBBB9, 0x905C }, { 0xBBBA, 0x9063 }, { 0xBBBB, 0x9059 }, { 0xBBBC, 0x905E }, { 0xBBBD, 0x9062 },
+	{ 0xBBBE, 0x905D }, { 0xBBBF, 0x905B }, { 0xBBC0, 0x9119 }, { 0xBBC1, 0x9118 }, { 0xBBC2, 0x911E }, { 0xBBC3, 0x9175 }, { 0xBBC4, 0x9178 }, { 0xBBC5, 0x9177 },
+	{ 0xBBC6, 0x9174 }, { 0xBBC7, 0x9278 }, { 0xBBC8, 0x9280 }, { 0xBBC9, 0x9285 }, { 0xBBCA, 0x9298 }, { 0xBBCB, 0x9296 }, { 0xBBCC, 0x927B }, { 0xBBCD, 0x9293 },
+	{ 0xBBCE, 0x929C }, { 0xBBCF, 0x92A8 }, { 0xBBD0, 0x927C }, { 0xBBD1, 0x9291 }, { 0xBBD2, 0x95A1 }, { 0xBBD3, 0x95A8 }, { 0xBBD4, 0x95A9 }, { 0xBBD5, 0x95A3 },
+	{ 0xBBD6, 0x95A5 }, { 0xBBD7, 0x95A4 }, { 0xBBD8, 0x9699 }, { 0xBBD9, 0x969C }, { 0xBBDA, 0x969B }, { 0xBBDB, 0x96CC }, { 0xBBDC, 0x96D2 }, { 0xBBDD, 0x9700 },
+	{ 0xBBDE, 0x977C }, { 0xBBDF, 0x9785 }, { 0xBBE0, 0x97F6 }, { 0xBBE1, 0x9817 }, { 0xBBE2, 0x9818 }, { 0xBBE3, 0x98AF }, { 0xBBE4, 0x98B1 }, { 0xBBE5, 0x9903 },
+	{ 0xBBE6, 0x9905 }, { 0xBBE7, 0x990C }, { 0xBBE8, 0x9909 }, { 0xBBE9, 0x99C1 }, { 0xBBEA, 0x9AAF }, { 0xBBEB, 0x9AB0 }, { 0xBBEC, 0x9AE6 }, { 0xBBED, 0x9B41 },
+	{ 0xBBEE, 0x9B42 }, { 0xBBEF, 0x9CF4 }, { 0xBBF0, 0x9CF6 }, { 0xBBF1, 0x9CF3 }, { 0xBBF2, 0x9EBC }, { 0xBBF3, 0x9F3B }, { 0xBBF4, 0x9F4A }, { 0xBBF5, 0x5104 },
+	{ 0xBBF6, 0x5100 }, { 0xBBF7, 0x50FB }, { 0xBBF8, 0x50F5 }, { 0xBBF9, 0x50F9 }, { 0xBBFA, 0x5102 }, { 0xBBFB, 0x5108 }, { 0xBBFC, 0x5109 }, { 0xBBFD, 0x5105 },
+	{ 0xBBFE, 0x51DC }, { 0xBC40, 0x5287 }, { 0xBC41, 0x5288 }, { 0xBC42, 0x5289 }, { 0xBC43, 0x528D }, { 0xBC44, 0x528A }, { 0xBC45, 0x52F0 }, { 0xBC46, 0x53B2 },
+	{ 0xBC47, 0x562E }, { 0xBC48, 0x563B }, { 0xBC49, 0x5639 }, { 0xBC4A, 0x5632 }, { 0xBC4B, 0x563F }, { 0xBC4C, 0x5634 }, { 0xBC4D, 0x5629 }, { 0xBC4E, 0x5653 },
+	{ 0xBC4F, 0x564E }, { 0xBC50, 0x5657 }, { 0xBC51, 0x5674 }, { 0xBC52, 0x5636 }, { 0xBC53, 0x562F }, { 0xBC54, 0x5630 }, { 0xBC55, 0x5880 }, { 0xBC56, 0x589F },
+	{ 0xBC57, 0x589E }, { 0xBC58, 0x58B3 }, { 0xBC59, 0x589C }, { 0xBC5A, 0x58AE }, { 0xBC5B, 0x58A9 }, { 0xBC5C, 0x58A6 }, { 0xBC5D, 0x596D }, { 0xBC5E, 0x5B09 },
+	{ 0xBC5F, 0x5AFB }, { 0xBC60, 0x5B0B }, { 0xBC61, 0x5AF5 }, { 0xBC62, 0x5B0C }, { 0xBC63, 0x5B08 }, { 0xBC64, 0x5BEE }, { 0xBC65, 0x5BEC }, { 0xBC66, 0x5BE9 },
+	{ 0xBC67, 0x5BEB }, { 0xBC68, 0x5C64 }, { 0xBC69, 0x5C65 }, { 0xBC6A, 0x5D9D }, { 0xBC6B, 0x5D94 }, { 0xBC6C, 0x5E62 }, { 0xBC6D, 0x5E5F }, { 0xBC6E, 0x5E61 },
+	{ 0xBC6F, 0x5EE2 }, { 0xBC70, 0x5EDA }, { 0xBC71, 0x5EDF }, { 0xBC72, 0x5EDD }, { 0xBC73, 0x5EE3 }, { 0xBC74, 0x5EE0 }, { 0xBC75, 0x5F48 }, { 0xBC76, 0x5F71 },
+	{ 0xBC77, 0x5FB7 }, { 0xBC78, 0x5FB5 }, { 0xBC79, 0x6176 }, { 0xBC7A, 0x6167 }, { 0xBC7B, 0x616E }, { 0xBC7C, 0x615D }, { 0xBC7D, 0x6155 }, { 0xBC7E, 0x6182 },
+	{ 0xBCA1, 0x617C }, { 0xBCA2, 0x6170 }, { 0xBCA3, 0x616B }, { 0xBCA4, 0x617E }, { 0xBCA5, 0x61A7 }, { 0xBCA6, 0x6190 }, { 0xBCA7, 0x61AB }, { 0xBCA8, 0x618E },
+	{ 0xBCA9, 0x61AC }, { 0xBCAA, 0x619A }, { 0xBCAB, 0x61A4 }, { 0xBCAC, 0x6194 }, { 0xBCAD, 0x61AE }, { 0xBCAE, 0x622E }, { 0xBCAF, 0x6469 }, { 0xBCB0, 0x646F },
+	{ 0xBCB1, 0x6479 }, { 0xBCB2, 0x649E }, { 0xBCB3, 0x64B2 }, { 0xBCB4, 0x6488 }, { 0xBCB5, 0x6490 }, { 0xBCB6, 0x64B0 }, { 0xBCB7, 0x64A5 }, { 0xBCB8, 0x6493 },
+	{ 0xBCB9, 0x6495 }, { 0xBCBA, 0x64A9 }, { 0xBCBB, 0x6492 }, { 0xBCBC, 0x64AE }, { 0xBCBD, 0x64AD }, { 0xBCBE, 0x64AB }, { 0xBCBF, 0x649A }, { 0xBCC0, 0x64AC },
+	{ 0xBCC1, 0x6499 }, { 0xBCC2, 0x64A2 }, { 0xBCC3, 0x64B3 }, { 0xBCC4, 0x6575 }, { 0xBCC5, 0x6577 }, { 0xBCC6, 0x6578 }, { 0xBCC7, 0x66AE }, { 0xBCC8, 0x66AB },
+	{ 0xBCC9, 0x66B4 }, { 0xBCCA, 0x66B1 }, { 0xBCCB, 0x6A23 }, { 0xBCCC, 0x6A1F }, { 0xBCCD, 0x69E8 }, { 0xBCCE, 0x6A01 }, { 0xBCCF, 0x6A1E }, { 0xBCD0, 0x6A19 },
+	{ 0xBCD1, 0x69FD }, { 0xBCD2, 0x6A21 }, { 0xBCD3, 0x6A13 }, { 0xBCD4, 0x6A0A }, { 0xBCD5, 0x69F3 }, { 0xBCD6, 0x6A02 }, { 0xBCD7, 0x6A05 }, { 0xBCD8, 0x69ED },
+	{ 0xBCD9, 0x6A11 }, { 0xBCDA, 0x6B50 }, { 0xBCDB, 0x6B4E }, { 0xBCDC, 0x6BA4 }, { 0xBCDD, 0x6BC5 }, { 0xBCDE, 0x6BC6 }, { 0xBCDF, 0x6F3F }, { 0xBCE0, 0x6F7C },
+	{ 0xBCE1, 0x6F84 }, { 0xBCE2, 0x6F51 }, { 0xBCE3, 0x6F66 }, { 0xBCE4, 0x6F54 }, { 0xBCE5, 0x6F86 }, { 0xBCE6, 0x6F6D }, { 0xBCE7, 0x6F5B }, { 0xBCE8, 0x6F78 },
+	{ 0xBCE9, 0x6F6E }, { 0xBCEA, 0x6F8E }, { 0xBCEB, 0x6F7A }, { 0xBCEC, 0x6F70 }, { 0xBCED, 0x6F64 }, { 0xBCEE, 0x6F97 }, { 0xBCEF, 0x6F58 }, { 0xBCF0, 0x6ED5 },
+	{ 0xBCF1, 0x6F6F }, { 0xBCF2, 0x6F60 }, { 0xBCF3, 0x6F5F }, { 0xBCF4, 0x719F }, { 0xBCF5, 0x71AC }, { 0xBCF6, 0x71B1 }, { 0xBCF7, 0x71A8 }, { 0xBCF8, 0x7256 },
+	{ 0xBCF9, 0x729B }, { 0xBCFA, 0x734E }, { 0xBCFB, 0x7357 }, { 0xBCFC, 0x7469 }, { 0xBCFD, 0x748B }, { 0xBCFE, 0x7483 }, { 0xBD40, 0x747E }, { 0xBD41, 0x7480 },
+	{ 0xBD42, 0x757F }, { 0xBD43, 0x7620 }, { 0xBD44, 0x7629 }, { 0xBD45, 0x761F }, { 0xBD46, 0x7624 }, { 0xBD47, 0x7626 }, { 0xBD48, 0x7621 }, { 0xBD49, 0x7622 },
+	{ 0xBD4A, 0x769A }, { 0xBD4B, 0x76BA }, { 0xBD4C, 0x76E4 }, { 0xBD4D, 0x778E }, { 0xBD4E, 0x7787 }, { 0xBD4F, 0x778C }, { 0xBD50, 0x7791 }, { 0xBD51, 0x778B },
+	{ 0xBD52, 0x78CB }, { 0xBD53, 0x78C5 }, { 0xBD54, 0x78BA }, { 0xBD55, 0x78CA }, { 0xBD56, 0x78BE }, { 0xBD57, 0x78D5 }, { 0xBD58, 0x78BC }, { 0xBD59, 0x78D0 },
+	{ 0xBD5A, 0x7A3F }, { 0xBD5B, 0x7A3C }, { 0xBD5C, 0x7A40 }, { 0xBD5D, 0x7A3D }, { 0xBD5E, 0x7A37 }, { 0xBD5F, 0x7A3B }, { 0xBD60, 0x7AAF }, { 0xBD61, 0x7AAE },
+	{ 0xBD62, 0x7BAD }, { 0xBD63, 0x7BB1 }, { 0xBD64, 0x7BC4 }, { 0xBD65, 0x7BB4 }, { 0xBD66, 0x7BC6 }, { 0xBD67, 0x7BC7 }, { 0xBD68, 0x7BC1 }, { 0xBD69, 0x7BA0 },
+	{ 0xBD6A, 0x7BCC }, { 0xBD6B, 0x7CCA }, { 0xBD6C, 0x7DE0 }, { 0xBD6D, 0x7DF4 }, { 0xBD6E, 0x7DEF }, { 0xBD6F, 0x7DFB }, { 0xBD70, 0x7DD8 }, { 0xBD71, 0x7DEC },
+	{ 0xBD72, 0x7DDD }, { 0xBD73, 0x7DE8 }, { 0xBD74, 0x7DE3 }, { 0xBD75, 0x7DDA }, { 0xBD76, 0x7DDE }, { 0xBD77, 0x7DE9 }, { 0xBD78, 0x7D9E }, { 0xBD79, 0x7DD9 },
+	{ 0xBD7A, 0x7DF2 }, { 0xBD7B, 0x7DF9 }, { 0xBD7C, 0x7F75 }, { 0xBD7D, 0x7F77 }, { 0xBD7E, 0x7FAF }, { 0xBDA1, 0x7FE9 }, { 0xBDA2, 0x8026 }, { 0xBDA3, 0x819B },
+	{ 0xBDA4, 0x819C }, { 0xBDA5, 0x819D }, { 0xBDA6, 0x81A0 }, { 0xBDA7, 0x819A }, { 0xBDA8, 0x8198 }, { 0xBDA9, 0x8517 }, { 0xBDAA, 0x853D }, { 0xBDAB, 0x851A },
+	{ 0xBDAC, 0x84EE }, { 0xBDAD, 0x852C }, { 0xBDAE, 0x852D }, { 0xBDAF, 0x8513 }, { 0xBDB0, 0x8511 }, { 0xBDB1, 0x8523 }, { 0xBDB2, 0x8521 }, { 0xBDB3, 0x8514 },
+	{ 0xBDB4, 0x84EC }, { 0xBDB5, 0x8525 }, { 0xBDB6, 0x84FF }, { 0xBDB7, 0x8506 }, { 0xBDB8, 0x8782 }, { 0xBDB9, 0x8774 }, { 0xBDBA, 0x8776 }, { 0xBDBB, 0x8760 },
+	{ 0xBDBC, 0x8766 }, { 0xBDBD, 0x8778 }, { 0xBDBE, 0x8768 }, { 0xBDBF, 0x8759 }, { 0xBDC0, 0x8757 }, { 0xBDC1, 0x874C }, { 0xBDC2, 0x8753 }, { 0xBDC3, 0x885B },
+	{ 0xBDC4, 0x885D }, { 0xBDC5, 0x8910 }, { 0xBDC6, 0x8907 }, { 0xBDC7, 0x8912 }, { 0xBDC8, 0x8913 }, { 0xBDC9, 0x8915 }, { 0xBDCA, 0x890A }, { 0xBDCB, 0x8ABC },
+	{ 0xBDCC, 0x8AD2 }, { 0xBDCD, 0x8AC7 }, { 0xBDCE, 0x8AC4 }, { 0xBDCF, 0x8A95 }, { 0xBDD0, 0x8ACB }, { 0xBDD1, 0x8AF8 }, { 0xBDD2, 0x8AB2 }, { 0xBDD3, 0x8AC9 },
+	{ 0xBDD4, 0x8AC2 }, { 0xBDD5, 0x8ABF }, { 0xBDD6, 0x8AB0 }, { 0xBDD7, 0x8AD6 }, { 0xBDD8, 0x8ACD }, { 0xBDD9, 0x8AB6 }, { 0xBDDA, 0x8AB9 }, { 0xBDDB, 0x8ADB },
+	{ 0xBDDC, 0x8C4C }, { 0xBDDD, 0x8C4E }, { 0xBDDE, 0x8C6C }, { 0xBDDF, 0x8CE0 }, { 0xBDE0, 0x8CDE }, { 0xBDE1, 0x8CE6 }, { 0xBDE2, 0x8CE4 }, { 0xBDE3, 0x8CEC },
+	{ 0xBDE4, 0x8CED }, { 0xBDE5, 0x8CE2 }, { 0xBDE6, 0x8CE3 }, { 0xBDE7, 0x8CDC }, { 0xBDE8, 0x8CEA }, { 0xBDE9, 0x8CE1 }, { 0xBDEA, 0x8D6D }, { 0xBDEB, 0x8D9F },
+	{ 0xBDEC, 0x8DA3 }, { 0xBDED, 0x8E2B }, { 0xBDEE, 0x8E10 }, { 0xBDEF, 0x8E1D }, { 0xBDF0, 0x8E22 }, { 0xBDF1, 0x8E0F }, { 0xBDF2, 0x8E29 }, { 0xBDF3, 0x8E1F },
+	{ 0xBDF4, 0x8E21 }, { 0xBDF5, 0x8E1E }, { 0xBDF6, 0x8EBA }, { 0xBDF7, 0x8F1D }, { 0xBDF8, 0x8F1B }, { 0xBDF9, 0x8F1F }, { 0xBDFA, 0x8F29 }, { 0xBDFB, 0x8F26 },
+	{ 0xBDFC, 0x8F2A }, { 0xBDFD, 0x8F1C }, { 0xBDFE, 0x8F1E }, { 0xBE40, 0x8F25 }, { 0xBE41, 0x9069 }, { 0xBE42, 0x906E }, { 0xBE43, 0x9068 }, { 0xBE44, 0x906D },
+	{ 0xBE45, 0x9077 }, { 0xBE46, 0x9130 }, { 0xBE47, 0x912D }, { 0xBE48, 0x9127 }, { 0xBE49, 0x9131 }, { 0xBE4A, 0x9187 }, { 0xBE4B, 0x9189 }, { 0xBE4C, 0x918B },
+	{ 0xBE4D, 0x9183 }, { 0xBE4E, 0x92C5 }, { 0xBE4F, 0x92BB }, { 0xBE50, 0x92B7 }, { 0xBE51, 0x92EA }, { 0xBE52, 0x92AC }, { 0xBE53, 0x92E4 }, { 0xBE54, 0x92C1 },
+	{ 0xBE55, 0x92B3 }, { 0xBE56, 0x92BC }, { 0xBE57, 0x92D2 }, { 0xBE58, 0x92C7 }, { 0xBE59, 0x92F0 }, { 0xBE5A, 0x92B2 }, { 0xBE5B, 0x95AD }, { 0xBE5C, 0x95B1 },
+	{ 0xBE5D, 0x9704 }, { 0xBE5E, 0x9706 }, { 0xBE5F, 0x9707 }, { 0xBE60, 0x9709 }, { 0xBE61, 0x9760 }, { 0xBE62, 0x978D }, { 0xBE63, 0x978B }, { 0xBE64, 0x978F },
+	{ 0xBE65, 0x9821 }, { 0xBE66, 0x982B }, { 0xBE67, 0x981C }, { 0xBE68, 0x98B3 }, { 0xBE69, 0x990A }, { 0xBE6A, 0x9913 }, { 0xBE6B, 0x9912 }, { 0xBE6C, 0x9918 },
+	{ 0xBE6D, 0x99DD }, { 0xBE6E, 0x99D0 }, { 0xBE6F, 0x99DF }, { 0xBE70, 0x99DB }, { 0xBE71, 0x99D1 }, { 0xBE72, 0x99D5 }, { 0xBE73, 0x99D2 }, { 0xBE74, 0x99D9 },
+	{ 0xBE75, 0x9AB7 }, { 0xBE76, 0x9AEE }, { 0xBE77, 0x9AEF }, { 0xBE78, 0x9B27 }, { 0xBE79, 0x9B45 }, { 0xBE7A, 0x9B44 }, { 0xBE7B, 0x9B77 }, { 0xBE7C, 0x9B6F },
+	{ 0xBE7D, 0x9D06 }, { 0xBE7E, 0x9D09 }, { 0xBEA1, 0x9D03 }, { 0xBEA2, 0x9EA9 }, { 0xBEA3, 0x9EBE }, { 0xBEA4, 0x9ECE }, { 0xBEA5, 0x58A8 }, { 0xBEA6, 0x9F52 },
+	{ 0xBEA7, 0x5112 }, { 0xBEA8, 0x5118 }, { 0xBEA9, 0x5114 }, { 0xBEAA, 0x5110 }, { 0xBEAB, 0x5115 }, { 0xBEAC, 0x5180 }, { 0xBEAD, 0x51AA }, { 0xBEAE, 0x51DD },
+	{ 0xBEAF, 0x5291 }, { 0xBEB0, 0x5293 }, { 0xBEB1, 0x52F3 }, { 0xBEB2, 0x5659 }, { 0xBEB3, 0x566B }, { 0xBEB4, 0x5679 }, { 0xBEB5, 0x5669 }, { 0xBEB6, 0x5664 },
+	{ 0xBEB7, 0x5678 }, { 0xBEB8, 0x566A }, { 0xBEB9, 0x5668 }, { 0xBEBA, 0x5665 }, { 0xBEBB, 0x5671 }, { 0xBEBC, 0x566F }, { 0xBEBD, 0x566C }, { 0xBEBE, 0x5662 },
+	{ 0xBEBF, 0x5676 }, { 0xBEC0, 0x58C1 }, { 0xBEC1, 0x58BE }, { 0xBEC2, 0x58C7 }, { 0xBEC3, 0x58C5 }, { 0xBEC4, 0x596E }, { 0xBEC5, 0x5B1D }, { 0xBEC6, 0x5B34 },
+	{ 0xBEC7, 0x5B78 }, { 0xBEC8, 0x5BF0 }, { 0xBEC9, 0x5C0E }, { 0xBECA, 0x5F4A }, { 0xBECB, 0x61B2 }, { 0xBECC, 0x6191 }, { 0xBECD, 0x61A9 }, { 0xBECE, 0x618A },
+	{ 0xBECF, 0x61CD }, { 0xBED0, 0x61B6 }, { 0xBED1, 0x61BE }, { 0xBED2, 0x61CA }, { 0xBED3, 0x61C8 }, { 0xBED4, 0x6230 }, { 0xBED5, 0x64C5 }, { 0xBED6, 0x64C1 },
+	{ 0xBED7, 0x64CB }, { 0xBED8, 0x64BB }, { 0xBED9, 0x64BC }, { 0xBEDA, 0x64DA }, { 0xBEDB, 0x64C4 }, { 0xBEDC, 0x64C7 }, { 0xBEDD, 0x64C2 }, { 0xBEDE, 0x64CD },
+	{ 0xBEDF, 0x64BF }, { 0xBEE0, 0x64D2 }, { 0xBEE1, 0x64D4 }, { 0xBEE2, 0x64BE }, { 0xBEE3, 0x6574 }, { 0xBEE4, 0x66C6 }, { 0xBEE5, 0x66C9 }, { 0xBEE6, 0x66B9 },
+	{ 0xBEE7, 0x66C4 }, { 0xBEE8, 0x66C7 }, { 0xBEE9, 0x66B8 }, { 0xBEEA, 0x6A3D }, { 0xBEEB, 0x6A38 }, { 0xBEEC, 0x6A3A }, { 0xBEED, 0x6A59 }, { 0xBEEE, 0x6A6B },
+	{ 0xBEEF, 0x6A58 }, { 0xBEF0, 0x6A39 }, { 0xBEF1, 0x6A44 }, { 0xBEF2, 0x6A62 }, { 0xBEF3, 0x6A61 }, { 0xBEF4, 0x6A4B }, { 0xBEF5, 0x6A47 }, { 0xBEF6, 0x6A35 },
+	{ 0xBEF7, 0x6A5F }, { 0xBEF8, 0x6A48 }, { 0xBEF9, 0x6B59 }, { 0xBEFA, 0x6B77 }, { 0xBEFB, 0x6C05 }, { 0xBEFC, 0x6FC2 }, { 0xBEFD, 0x6FB1 }, { 0xBEFE, 0x6FA1 },
+	{ 0xBF40, 0x6FC3 }, { 0xBF41, 0x6FA4 }, { 0xBF42, 0x6FC1 }, { 0xBF43, 0x6FA7 }, { 0xBF44, 0x6FB3 }, { 0xBF45, 0x6FC0 }, { 0xBF46, 0x6FB9 }, { 0xBF47, 0x6FB6 },
+	{ 0xBF48, 0x6FA6 }, { 0xBF49, 0x6FA0 }, { 0xBF4A, 0x6FB4 }, { 0xBF4B, 0x71BE }, { 0xBF4C, 0x71C9 }, { 0xBF4D, 0x71D0 }, { 0xBF4E, 0x71D2 }, { 0xBF4F, 0x71C8 },
+	{ 0xBF50, 0x71D5 }, { 0xBF51, 0x71B9 }, { 0xBF52, 0x71CE }, { 0xBF53, 0x71D9 }, { 0xBF54, 0x71DC }, { 0xBF55, 0x71C3 }, { 0xBF56, 0x71C4 }, { 0xBF57, 0x7368 },
+	{ 0xBF58, 0x749C }, { 0xBF59, 0x74A3 }, { 0xBF5A, 0x7498 }, { 0xBF5B, 0x749F }, { 0xBF5C, 0x749E }, { 0xBF5D, 0x74E2 }, { 0xBF5E, 0x750C }, { 0xBF5F, 0x750D },
+	{ 0xBF60, 0x7634 }, { 0xBF61, 0x7638 }, { 0xBF62, 0x763A }, { 0xBF63, 0x76E7 }, { 0xBF64, 0x76E5 }, { 0xBF65, 0x77A0 }, { 0xBF66, 0x779E }, { 0xBF67, 0x779F },
+	{ 0xBF68, 0x77A5 }, { 0xBF69, 0x78E8 }, { 0xBF6A, 0x78DA }, { 0xBF6B, 0x78EC }, { 0xBF6C, 0x78E7 }, { 0xBF6D, 0x79A6 }, { 0xBF6E, 0x7A4D }, { 0xBF6F, 0x7A4E },
+	{ 0xBF70, 0x7A46 }, { 0xBF71, 0x7A4C }, { 0xBF72, 0x7A4B }, { 0xBF73, 0x7ABA }, { 0xBF74, 0x7BD9 }, { 0xBF75, 0x7C11 }, { 0xBF76, 0x7BC9 }, { 0xBF77, 0x7BE4 },
+	{ 0xBF78, 0x7BDB }, { 0xBF79, 0x7BE1 }, { 0xBF7A, 0x7BE9 }, { 0xBF7B, 0x7BE6 }, { 0xBF7C, 0x7CD5 }, { 0xBF7D, 0x7CD6 }, { 0xBF7E, 0x7E0A }, { 0xBFA1, 0x7E11 },
+	{ 0xBFA2, 0x7E08 }, { 0xBFA3, 0x7E1B }, { 0xBFA4, 0x7E23 }, { 0xBFA5, 0x7E1E }, { 0xBFA6, 0x7E1D }, { 0xBFA7, 0x7E09 }, { 0xBFA8, 0x7E10 }, { 0xBFA9, 0x7F79 },
+	{ 0xBFAA, 0x7FB2 }, { 0xBFAB, 0x7FF0 }, { 0xBFAC, 0x7FF1 }, { 0xBFAD, 0x7FEE }, { 0xBFAE, 0x8028 }, { 0xBFAF, 0x81B3 }, { 0xBFB0, 0x81A9 }, { 0xBFB1, 0x81A8 },
+	{ 0xBFB2, 0x81FB }, { 0xBFB3, 0x8208 }, { 0xBFB4, 0x8258 }, { 0xBFB5, 0x8259 }, { 0xBFB6, 0x854A }, { 0xBFB7, 0x8559 }, { 0xBFB8, 0x8548 }, { 0xBFB9, 0x8568 },
+	{ 0xBFBA, 0x8569 }, { 0xBFBB, 0x8543 }, { 0xBFBC, 0x8549 }, { 0xBFBD, 0x856D }, { 0xBFBE, 0x856A }, { 0xBFBF, 0x855E }, { 0xBFC0, 0x8783 }, { 0xBFC1, 0x879F },
+	{ 0xBFC2, 0x879E }, { 0xBFC3, 0x87A2 }, { 0xBFC4, 0x878D }, { 0xBFC5, 0x8861 }, { 0xBFC6, 0x892A }, { 0xBFC7, 0x8932 }, { 0xBFC8, 0x8925 }, { 0xBFC9, 0x892B },
+	{ 0xBFCA, 0x8921 }, { 0xBFCB, 0x89AA }, { 0xBFCC, 0x89A6 }, { 0xBFCD, 0x8AE6 }, { 0xBFCE, 0x8AFA }, { 0xBFCF, 0x8AEB }, { 0xBFD0, 0x8AF1 }, { 0xBFD1, 0x8B00 },
+	{ 0xBFD2, 0x8ADC }, { 0xBFD3, 0x8AE7 }, { 0xBFD4, 0x8AEE }, { 0xBFD5, 0x8AFE }, { 0xBFD6, 0x8B01 }, { 0xBFD7, 0x8B02 }, { 0xBFD8, 0x8AF7 }, { 0xBFD9, 0x8AED },
+	{ 0xBFDA, 0x8AF3 }, { 0xBFDB, 0x8AF6 }, { 0xBFDC, 0x8AFC }, { 0xBFDD, 0x8C6B }, { 0xBFDE, 0x8C6D }, { 0xBFDF, 0x8C93 }, { 0xBFE0, 0x8CF4 }, { 0xBFE1, 0x8E44 },
+	{ 0xBFE2, 0x8E31 }, { 0xBFE3, 0x8E34 }, { 0xBFE4, 0x8E42 }, { 0xBFE5, 0x8E39 }, { 0xBFE6, 0x8E35 }, { 0xBFE7, 0x8F3B }, { 0xBFE8, 0x8F2F }, { 0xBFE9, 0x8F38 },
+	{ 0xBFEA, 0x8F33 }, { 0xBFEB, 0x8FA8 }, { 0xBFEC, 0x8FA6 }, { 0xBFED, 0x9075 }, { 0xBFEE, 0x9074 }, { 0xBFEF, 0x9078 }, { 0xBFF0, 0x9072 }, { 0xBFF1, 0x907C },
+	{ 0xBFF2, 0x907A }, { 0xBFF3, 0x9134 }, { 0xBFF4, 0x9192 }, { 0xBFF5, 0x9320 }, { 0xBFF6, 0x9336 }, { 0xBFF7, 0x92F8 }, { 0xBFF8, 0x9333 }, { 0xBFF9, 0x932F },
+	{ 0xBFFA, 0x9322 }, { 0xBFFB, 0x92FC }, { 0xBFFC, 0x932B }, { 0xBFFD, 0x9304 }, { 0xBFFE, 0x931A }, { 0xC040, 0x9310 }, { 0xC041, 0x9326 }, { 0xC042, 0x9321 },
+	{ 0xC043, 0x9315 }, { 0xC044, 0x932E }, { 0xC045, 0x9319 }, { 0xC046, 0x95BB }, { 0xC047, 0x96A7 }, { 0xC048, 0x96A8 }, { 0xC049, 0x96AA }, { 0xC04A, 0x96D5 },
+	{ 0xC04B, 0x970E }, { 0xC04C, 0x9711 }, { 0xC04D, 0x9716 }, { 0xC04E, 0x970D }, { 0xC04F, 0x9713 }, { 0xC050, 0x970F }, { 0xC051, 0x975B }, { 0xC052, 0x975C },
+	{ 0xC053, 0x9766 }, { 0xC054, 0x9798 }, { 0xC055, 0x9830 }, { 0xC056, 0x9838 }, { 0xC057, 0x983B }, { 0xC058, 0x9837 }, { 0xC059, 0x982D }, { 0xC05A, 0x9839 },
+	{ 0xC05B, 0x9824 }, { 0xC05C, 0x9910 }, { 0xC05D, 0x9928 }, { 0xC05E, 0x991E }, { 0xC05F, 0x991B }, { 0xC060, 0x9921 }, { 0xC061, 0x991A }, { 0xC062, 0x99ED },
+	{ 0xC063, 0x99E2 }, { 0xC064, 0x99F1 }, { 0xC065, 0x9AB8 }, { 0xC066, 0x9ABC }, { 0xC067, 0x9AFB }, { 0xC068, 0x9AED }, { 0xC069, 0x9B28 }, { 0xC06A, 0x9B91 },
+	{ 0xC06B, 0x9D15 }, { 0xC06C, 0x9D23 }, { 0xC06D, 0x9D26 }, { 0xC06E, 0x9D28 }, { 0xC06F, 0x9D12 }, { 0xC070, 0x9D1B }, { 0xC071, 0x9ED8 }, { 0xC072, 0x9ED4 },
+	{ 0xC073, 0x9F8D }, { 0xC074, 0x9F9C }, { 0xC075, 0x512A }, { 0xC076, 0x511F }, { 0xC077, 0x5121 }, { 0xC078, 0x5132 }, { 0xC079, 0x52F5 }, { 0xC07A, 0x568E },
+	{ 0xC07B, 0x5680 }, { 0xC07C, 0x5690 }, { 0xC07D, 0x5685 }, { 0xC07E, 0x5687 }, { 0xC0A1, 0x568F }, { 0xC0A2, 0x58D5 }, { 0xC0A3, 0x58D3 }, { 0xC0A4, 0x58D1 },
+	{ 0xC0A5, 0x58CE }, { 0xC0A6, 0x5B30 }, { 0xC0A7, 0x5B2A }, { 0xC0A8, 0x5B24 }, { 0xC0A9, 0x5B7A }, { 0xC0AA, 0x5C37 }, { 0xC0AB, 0x5C68 }, { 0xC0AC, 0x5DBC },
+	{ 0xC0AD, 0x5DBA }, { 0xC0AE, 0x5DBD }, { 0xC0AF, 0x5DB8 }, { 0xC0B0, 0x5E6B }, { 0xC0B1, 0x5F4C }, { 0xC0B2, 0x5FBD }, { 0xC0B3, 0x61C9 }, { 0xC0B4, 0x61C2 },
+	{ 0xC0B5, 0x61C7 }, { 0xC0B6, 0x61E6 }, { 0xC0B7, 0x61CB }, { 0xC0B8, 0x6232 }, { 0xC0B9, 0x6234 }, { 0xC0BA, 0x64CE }, { 0xC0BB, 0x64CA }, { 0xC0BC, 0x64D8 },
+	{ 0xC0BD, 0x64E0 }, { 0xC0BE, 0x64F0 }, { 0xC0BF, 0x64E6 }, { 0xC0C0, 0x64EC }, { 0xC0C1, 0x64F1 }, { 0xC0C2, 0x64E2 }, { 0xC0C3, 0x64ED }, { 0xC0C4, 0x6582 },
+	{ 0xC0C5, 0x6583 }, { 0xC0C6, 0x66D9 }, { 0xC0C7, 0x66D6 }, { 0xC0C8, 0x6A80 }, { 0xC0C9, 0x6A94 }, { 0xC0CA, 0x6A84 }, { 0xC0CB, 0x6AA2 }, { 0xC0CC, 0x6A9C },
+	{ 0xC0CD, 0x6ADB }, { 0xC0CE, 0x6AA3 }, { 0xC0CF, 0x6A7E }, { 0xC0D0, 0x6A97 }, { 0xC0D1, 0x6A90 }, { 0xC0D2, 0x6AA0 }, { 0xC0D3, 0x6B5C }, { 0xC0D4, 0x6BAE },
+	{ 0xC0D5, 0x6BDA }, { 0xC0D6, 0x6C08 }, { 0xC0D7, 0x6FD8 }, { 0xC0D8, 0x6FF1 }, { 0xC0D9, 0x6FDF }, { 0xC0DA, 0x6FE0 }, { 0xC0DB, 0x6FDB }, { 0xC0DC, 0x6FE4 },
+	{ 0xC0DD, 0x6FEB }, { 0xC0DE, 0x6FEF }, { 0xC0DF, 0x6F80 }, { 0xC0E0, 0x6FEC }, { 0xC0E1, 0x6FE1 }, { 0xC0E2, 0x6FE9 }, { 0xC0E3, 0x6FD5 }, { 0xC0E4, 0x6FEE },
+	{ 0xC0E5, 0x6FF0 }, { 0xC0E6, 0x71E7 }, { 0xC0E7, 0x71DF }, { 0xC0E8, 0x71EE }, { 0xC0E9, 0x71E6 }, { 0xC0EA, 0x71E5 }, { 0xC0EB, 0x71ED }, { 0xC0EC, 0x71EC },
+	{ 0xC0ED, 0x71F4 }, { 0xC0EE, 0x71E0 }, { 0xC0EF, 0x7235 }, { 0xC0F0, 0x7246 }, { 0xC0F1, 0x7370 }, { 0xC0F2, 0x7372 }, { 0xC0F3, 0x74A9 }, { 0xC0F4, 0x74B0 },
+	{ 0xC0F5, 0x74A6 }, { 0xC0F6, 0x74A8 }, { 0xC0F7, 0x7646 }, { 0xC0F8, 0x7642 }, { 0xC0F9, 0x764C }, { 0xC0FA, 0x76EA }, { 0xC0FB, 0x77B3 }, { 0xC0FC, 0x77AA },
+	{ 0xC0FD, 0x77B0 }, { 0xC0FE, 0x77AC }, { 0xC140, 0x77A7 }, { 0xC141, 0x77AD }, { 0xC142, 0x77EF }, { 0xC143, 0x78F7 }, { 0xC144, 0x78FA }, { 0xC145, 0x78F4 },
+	{ 0xC146, 0x78EF }, { 0xC147, 0x7901 }, { 0xC148, 0x79A7 }, { 0xC149, 0x79AA }, { 0xC14A, 0x7A57 }, { 0xC14B, 0x7ABF }, { 0xC14C, 0x7C07 }, { 0xC14D, 0x7C0D },
+	{ 0xC14E, 0x7BFE }, { 0xC14F, 0x7BF7 }, { 0xC150, 0x7C0C }, { 0xC151, 0x7BE0 }, { 0xC152, 0x7CE0 }, { 0xC153, 0x7CDC }, { 0xC154, 0x7CDE }, { 0xC155, 0x7CE2 },
+	{ 0xC156, 0x7CDF }, { 0xC157, 0x7CD9 }, { 0xC158, 0x7CDD }, { 0xC159, 0x7E2E }, { 0xC15A, 0x7E3E }, { 0xC15B, 0x7E46 }, { 0xC15C, 0x7E37 }, { 0xC15D, 0x7E32 },
+	{ 0xC15E, 0x7E43 }, { 0xC15F, 0x7E2B }, { 0xC160, 0x7E3D }, { 0xC161, 0x7E31 }, { 0xC162, 0x7E45 }, { 0xC163, 0x7E41 }, { 0xC164, 0x7E34 }, { 0xC165, 0x7E39 },
+	{ 0xC166, 0x7E48 }, { 0xC167, 0x7E35 }, { 0xC168, 0x7E3F }, { 0xC169, 0x7E2F }, { 0xC16A, 0x7F44 }, { 0xC16B, 0x7FF3 }, { 0xC16C, 0x7FFC }, { 0xC16D, 0x8071 },
+	{ 0xC16E, 0x8072 }, { 0xC16F, 0x8070 }, { 0xC170, 0x806F }, { 0xC171, 0x8073 }, { 0xC172, 0x81C6 }, { 0xC173, 0x81C3 }, { 0xC174, 0x81BA }, { 0xC175, 0x81C2 },
+	{ 0xC176, 0x81C0 }, { 0xC177, 0x81BF }, { 0xC178, 0x81BD }, { 0xC179, 0x81C9 }, { 0xC17A, 0x81BE }, { 0xC17B, 0x81E8 }, { 0xC17C, 0x8209 }, { 0xC17D, 0x8271 },
+	{ 0xC17E, 0x85AA }, { 0xC1A1, 0x8584 }, { 0xC1A2, 0x857E }, { 0xC1A3, 0x859C }, { 0xC1A4, 0x8591 }, { 0xC1A5, 0x8594 }, { 0xC1A6, 0x85AF }, { 0xC1A7, 0x859B },
+	{ 0xC1A8, 0x8587 }, { 0xC1A9, 0x85A8 }, { 0xC1AA, 0x858A }, { 0xC1AB, 0x8667 }, { 0xC1AC, 0x87C0 }, { 0xC1AD, 0x87D1 }, { 0xC1AE, 0x87B3 }, { 0xC1AF, 0x87D2 },
+	{ 0xC1B0, 0x87C6 }, { 0xC1B1, 0x87AB }, { 0xC1B2, 0x87BB }, { 0xC1B3, 0x87BA }, { 0xC1B4, 0x87C8 }, { 0xC1B5, 0x87CB }, { 0xC1B6, 0x893B }, { 0xC1B7, 0x8936 },
+	{ 0xC1B8, 0x8944 }, { 0xC1B9, 0x8938 }, { 0xC1BA, 0x893D }, { 0xC1BB, 0x89AC }, { 0xC1BC, 0x8B0E }, { 0xC1BD, 0x8B17 }, { 0xC1BE, 0x8B19 }, { 0xC1BF, 0x8B1B },
+	{ 0xC1C0, 0x8B0A }, { 0xC1C1, 0x8B20 }, { 0xC1C2, 0x8B1D }, { 0xC1C3, 0x8B04 }, { 0xC1C4, 0x8B10 }, { 0xC1C5, 0x8C41 }, { 0xC1C6, 0x8C3F }, { 0xC1C7, 0x8C73 },
+	{ 0xC1C8, 0x8CFA }, { 0xC1C9, 0x8CFD }, { 0xC1CA, 0x8CFC }, { 0xC1CB, 0x8CF8 }, { 0xC1CC, 0x8CFB }, { 0xC1CD, 0x8DA8 }, { 0xC1CE, 0x8E49 }, { 0xC1CF, 0x8E4B },
+	{ 0xC1D0, 0x8E48 }, { 0xC1D1, 0x8E4A }, { 0xC1D2, 0x8F44 }, { 0xC1D3, 0x8F3E }, { 0xC1D4, 0x8F42 }, { 0xC1D5, 0x8F45 }, { 0xC1D6, 0x8F3F }, { 0xC1D7, 0x907F },
+	{ 0xC1D8, 0x907D }, { 0xC1D9, 0x9084 }, { 0xC1DA, 0x9081 }, { 0xC1DB, 0x9082 }, { 0xC1DC, 0x9080 }, { 0xC1DD, 0x9139 }, { 0xC1DE, 0x91A3 }, { 0xC1DF, 0x919E },
+	{ 0xC1E0, 0x919C }, { 0xC1E1, 0x934D }, { 0xC1E2, 0x9382 }, { 0xC1E3, 0x9328 }, { 0xC1E4, 0x9375 }, { 0xC1E5, 0x934A }, { 0xC1E6, 0x9365 }, { 0xC1E7, 0x934B },
+	{ 0xC1E8, 0x9318 }, { 0xC1E9, 0x937E }, { 0xC1EA, 0x936C }, { 0xC1EB, 0x935B }, { 0xC1EC, 0x9370 }, { 0xC1ED, 0x935A }, { 0xC1EE, 0x9354 }, { 0xC1EF, 0x95CA },
+	{ 0xC1F0, 0x95CB }, { 0xC1F1, 0x95CC }, { 0xC1F2, 0x95C8 }, { 0xC1F3, 0x95C6 }, { 0xC1F4, 0x96B1 }, { 0xC1F5, 0x96B8 }, { 0xC1F6, 0x96D6 }, { 0xC1F7, 0x971C },
+	{ 0xC1F8, 0x971E }, { 0xC1F9, 0x97A0 }, { 0xC1FA, 0x97D3 }, { 0xC1FB, 0x9846 }, { 0xC1FC, 0x98B6 }, { 0xC1FD, 0x9935 }, { 0xC1FE, 0x9A01 }, { 0xC240, 0x99FF },
+	{ 0xC241, 0x9BAE }, { 0xC242, 0x9BAB }, { 0xC243, 0x9BAA }, { 0xC244, 0x9BAD }, { 0xC245, 0x9D3B }, { 0xC246, 0x9D3F }, { 0xC247, 0x9E8B }, { 0xC248, 0x9ECF },
+	{ 0xC249, 0x9EDE }, { 0xC24A, 0x9EDC }, { 0xC24B, 0x9EDD }, { 0xC24C, 0x9EDB }, { 0xC24D, 0x9F3E }, { 0xC24E, 0x9F4B }, { 0xC24F, 0x53E2 }, { 0xC250, 0x5695 },
+	{ 0xC251, 0x56AE }, { 0xC252, 0x58D9 }, { 0xC253, 0x58D8 }, { 0xC254, 0x5B38 }, { 0xC255, 0x5F5D }, { 0xC256, 0x61E3 }, { 0xC257, 0x6233 }, { 0xC258, 0x64F4 },
+	{ 0xC259, 0x64F2 }, { 0xC25A, 0x64FE }, { 0xC25B, 0x6506 }, { 0xC25C, 0x64FA }, { 0xC25D, 0x64FB }, { 0xC25E, 0x64F7 }, { 0xC25F, 0x65B7 }, { 0xC260, 0x66DC },
+	{ 0xC261, 0x6726 }, { 0xC262, 0x6AB3 }, { 0xC263, 0x6AAC }, { 0xC264, 0x6AC3 }, { 0xC265, 0x6ABB }, { 0xC266, 0x6AB8 }, { 0xC267, 0x6AC2 }, { 0xC268, 0x6AAE },
+	{ 0xC269, 0x6AAF }, { 0xC26A, 0x6B5F }, { 0xC26B, 0x6B78 }, { 0xC26C, 0x6BAF }, { 0xC26D, 0x7009 }, { 0xC26E, 0x700B }, { 0xC26F, 0x6FFE }, { 0xC270, 0x7006 },
+	{ 0xC271, 0x6FFA }, { 0xC272, 0x7011 }, { 0xC273, 0x700F }, { 0xC274, 0x71FB }, { 0xC275, 0x71FC }, { 0xC276, 0x71FE }, { 0xC277, 0x71F8 }, { 0xC278, 0x7377 },
+	{ 0xC279, 0x7375 }, { 0xC27A, 0x74A7 }, { 0xC27B, 0x74BF }, { 0xC27C, 0x7515 }, { 0xC27D, 0x7656 }, { 0xC27E, 0x7658 }, { 0xC2A1, 0x7652 }, { 0xC2A2, 0x77BD },
+	{ 0xC2A3, 0x77BF }, { 0xC2A4, 0x77BB }, { 0xC2A5, 0x77BC }, { 0xC2A6, 0x790E }, { 0xC2A7, 0x79AE }, { 0xC2A8, 0x7A61 }, { 0xC2A9, 0x7A62 }, { 0xC2AA, 0x7A60 },
+	{ 0xC2AB, 0x7AC4 }, { 0xC2AC, 0x7AC5 }, { 0xC2AD, 0x7C2B }, { 0xC2AE, 0x7C27 }, { 0xC2AF, 0x7C2A }, { 0xC2B0, 0x7C1E }, { 0xC2B1, 0x7C23 }, { 0xC2B2, 0x7C21 },
+	{ 0xC2B3, 0x7CE7 }, { 0xC2B4, 0x7E54 }, { 0xC2B5, 0x7E55 }, { 0xC2B6, 0x7E5E }, { 0xC2B7, 0x7E5A }, { 0xC2B8, 0x7E61 }, { 0xC2B9, 0x7E52 }, { 0xC2BA, 0x7E59 },
+	{ 0xC2BB, 0x7F48 }, { 0xC2BC, 0x7FF9 }, { 0xC2BD, 0x7FFB }, { 0xC2BE, 0x8077 }, { 0xC2BF, 0x8076 }, { 0xC2C0, 0x81CD }, { 0xC2C1, 0x81CF }, { 0xC2C2, 0x820A },
+	{ 0xC2C3, 0x85CF }, { 0xC2C4, 0x85A9 }, { 0xC2C5, 0x85CD }, { 0xC2C6, 0x85D0 }, { 0xC2C7, 0x85C9 }, { 0xC2C8, 0x85B0 }, { 0xC2C9, 0x85BA }, { 0xC2CA, 0x85B9 },
+	{ 0xC2CB, 0x85A6 }, { 0xC2CC, 0x87EF }, { 0xC2CD, 0x87EC }, { 0xC2CE, 0x87F2 }, { 0xC2CF, 0x87E0 }, { 0xC2D0, 0x8986 }, { 0xC2D1, 0x89B2 }, { 0xC2D2, 0x89F4 },
+	{ 0xC2D3, 0x8B28 }, { 0xC2D4, 0x8B39 }, { 0xC2D5, 0x8B2C }, { 0xC2D6, 0x8B2B }, { 0xC2D7, 0x8C50 }, { 0xC2D8, 0x8D05 }, { 0xC2D9, 0x8E59 }, { 0xC2DA, 0x8E63 },
+	{ 0xC2DB, 0x8E66 }, { 0xC2DC, 0x8E64 }, { 0xC2DD, 0x8E5F }, { 0xC2DE, 0x8E55 }, { 0xC2DF, 0x8EC0 }, { 0xC2E0, 0x8F49 }, { 0xC2E1, 0x8F4D }, { 0xC2E2, 0x9087 },
+	{ 0xC2E3, 0x9083 }, { 0xC2E4, 0x9088 }, { 0xC2E5, 0x91AB }, { 0xC2E6, 0x91AC }, { 0xC2E7, 0x91D0 }, { 0xC2E8, 0x9394 }, { 0xC2E9, 0x938A }, { 0xC2EA, 0x9396 },
+	{ 0xC2EB, 0x93A2 }, { 0xC2EC, 0x93B3 }, { 0xC2ED, 0x93AE }, { 0xC2EE, 0x93AC }, { 0xC2EF, 0x93B0 }, { 0xC2F0, 0x9398 }, { 0xC2F1, 0x939A }, { 0xC2F2, 0x9397 },
+	{ 0xC2F3, 0x95D4 }, { 0xC2F4, 0x95D6 }, { 0xC2F5, 0x95D0 }, { 0xC2F6, 0x95D5 }, { 0xC2F7, 0x96E2 }, { 0xC2F8, 0x96DC }, { 0xC2F9, 0x96D9 }, { 0xC2FA, 0x96DB },
+	{ 0xC2FB, 0x96DE }, { 0xC2FC, 0x9724 }, { 0xC2FD, 0x97A3 }, { 0xC2FE, 0x97A6 }, { 0xC340, 0x97AD }, { 0xC341, 0x97F9 }, { 0xC342, 0x984D }, { 0xC343, 0x984F },
+	{ 0xC344, 0x984C }, { 0xC345, 0x984E }, { 0xC346, 0x9853 }, { 0xC347, 0x98BA }, { 0xC348, 0x993E }, { 0xC349, 0x993F }, { 0xC34A, 0x993D }, { 0xC34B, 0x992E },
+	{ 0xC34C, 0x99A5 }, { 0xC34D, 0x9A0E }, { 0xC34E, 0x9AC1 }, { 0xC34F, 0x9B03 }, { 0xC350, 0x9B06 }, { 0xC351, 0x9B4F }, { 0xC352, 0x9B4E }, { 0xC353, 0x9B4D },
+	{ 0xC354, 0x9BCA }, { 0xC355, 0x9BC9 }, { 0xC356, 0x9BFD }, { 0xC357, 0x9BC8 }, { 0xC358, 0x9BC0 }, { 0xC359, 0x9D51 }, { 0xC35A, 0x9D5D }, { 0xC35B, 0x9D60 },
+	{ 0xC35C, 0x9EE0 }, { 0xC35D, 0x9F15 }, { 0xC35E, 0x9F2C }, { 0xC35F, 0x5133 }, { 0xC360, 0x56A5 }, { 0xC361, 0x58DE }, { 0xC362, 0x58DF }, { 0xC363, 0x58E2 },
+	{ 0xC364, 0x5BF5 }, { 0xC365, 0x9F90 }, { 0xC366, 0x5EEC }, { 0xC367, 0x61F2 }, { 0xC368, 0x61F7 }, { 0xC369, 0x61F6 }, { 0xC36A, 0x61F5 }, { 0xC36B, 0x6500 },
+	{ 0xC36C, 0x650F }, { 0xC36D, 0x66E0 }, { 0xC36E, 0x66DD }, { 0xC36F, 0x6AE5 }, { 0xC370, 0x6ADD }, { 0xC371, 0x6ADA }, { 0xC372, 0x6AD3 }, { 0xC373, 0x701B },
+	{ 0xC374, 0x701F }, { 0xC375, 0x7028 }, { 0xC376, 0x701A }, { 0xC377, 0x701D }, { 0xC378, 0x7015 }, { 0xC379, 0x7018 }, { 0xC37A, 0x7206 }, { 0xC37B, 0x720D },
+	{ 0xC37C, 0x7258 }, { 0xC37D, 0x72A2 }, { 0xC37E, 0x7378 }, { 0xC3A1, 0x737A }, { 0xC3A2, 0x74BD }, { 0xC3A3, 0x74CA }, { 0xC3A4, 0x74E3 }, { 0xC3A5, 0x7587 },
+	{ 0xC3A6, 0x7586 }, { 0xC3A7, 0x765F }, { 0xC3A8, 0x7661 }, { 0xC3A9, 0x77C7 }, { 0xC3AA, 0x7919 }, { 0xC3AB, 0x79B1 }, { 0xC3AC, 0x7A6B }, { 0xC3AD, 0x7A69 },
+	{ 0xC3AE, 0x7C3E }, { 0xC3AF, 0x7C3F }, { 0xC3B0, 0x7C38 }, { 0xC3B1, 0x7C3D }, { 0xC3B2, 0x7C37 }, { 0xC3B3, 0x7C40 }, { 0xC3B4, 0x7E6B }, { 0xC3B5, 0x7E6D },
+	{ 0xC3B6, 0x7E79 }, { 0xC3B7, 0x7E69 }, { 0xC3B8, 0x7E6A }, { 0xC3B9, 0x7F85 }, { 0xC3BA, 0x7E73 }, { 0xC3BB, 0x7FB6 }, { 0xC3BC, 0x7FB9 }, { 0xC3BD, 0x7FB8 },
+	{ 0xC3BE, 0x81D8 }, { 0xC3BF, 0x85E9 }, { 0xC3C0, 0x85DD }, { 0xC3C1, 0x85EA }, { 0xC3C2, 0x85D5 }, { 0xC3C3, 0x85E4 }, { 0xC3C4, 0x85E5 }, { 0xC3C5, 0x85F7 },
+	{ 0xC3C6, 0x87FB }, { 0xC3C7, 0x8805 }, { 0xC3C8, 0x880D }, { 0xC3C9, 0x87F9 }, { 0xC3CA, 0x87FE }, { 0xC3CB, 0x8960 }, { 0xC3CC, 0x895F }, { 0xC3CD, 0x8956 },
+	{ 0xC3CE, 0x895E }, { 0xC3CF, 0x8B41 }, { 0xC3D0, 0x8B5C }, { 0xC3D1, 0x8B58 }, { 0xC3D2, 0x8B49 }, { 0xC3D3, 0x8B5A }, { 0xC3D4, 0x8B4E }, { 0xC3D5, 0x8B4F },
+	{ 0xC3D6, 0x8B46 }, { 0xC3D7, 0x8B59 }, { 0xC3D8, 0x8D08 }, { 0xC3D9, 0x8D0A }, { 0xC3DA, 0x8E7C }, { 0xC3DB, 0x8E72 }, { 0xC3DC, 0x8E87 }, { 0xC3DD, 0x8E76 },
+	{ 0xC3DE, 0x8E6C }, { 0xC3DF, 0x8E7A }, { 0xC3E0, 0x8E74 }, { 0xC3E1, 0x8F54 }, { 0xC3E2, 0x8F4E }, { 0xC3E3, 0x8FAD }, { 0xC3E4, 0x908A }, { 0xC3E5, 0x908B },
+	{ 0xC3E6, 0x91B1 }, { 0xC3E7, 0x91AE }, { 0xC3E8, 0x93E1 }, { 0xC3E9, 0x93D1 }, { 0xC3EA, 0x93DF }, { 0xC3EB, 0x93C3 }, { 0xC3EC, 0x93C8 }, { 0xC3ED, 0x93DC },
+	{ 0xC3EE, 0x93DD }, { 0xC3EF, 0x93D6 }, { 0xC3F0, 0x93E2 }, { 0xC3F1, 0x93CD }, { 0xC3F2, 0x93D8 }, { 0xC3F3, 0x93E4 }, { 0xC3F4, 0x93D7 }, { 0xC3F5, 0x93E8 },
+	{ 0xC3F6, 0x95DC }, { 0xC3F7, 0x96B4 }, { 0xC3F8, 0x96E3 }, { 0xC3F9, 0x972A }, { 0xC3FA, 0x9727 }, { 0xC3FB, 0x9761 }, { 0xC3FC, 0x97DC }, { 0xC3FD, 0x97FB },
+	{ 0xC3FE, 0x985E }, { 0xC440, 0x9858 }, { 0xC441, 0x985B }, { 0xC442, 0x98BC }, { 0xC443, 0x9945 }, { 0xC444, 0x9949 }, { 0xC445, 0x9A16 }, { 0xC446, 0x9A19 },
+	{ 0xC447, 0x9B0D }, { 0xC448, 0x9BE8 }, { 0xC449, 0x9BE7 }, { 0xC44A, 0x9BD6 }, { 0xC44B, 0x9BDB }, { 0xC44C, 0x9D89 }, { 0xC44D, 0x9D61 }, { 0xC44E, 0x9D72 },
+	{ 0xC44F, 0x9D6A }, { 0xC450, 0x9D6C }, { 0xC451, 0x9E92 }, { 0xC452, 0x9E97 }, { 0xC453, 0x9E93 }, { 0xC454, 0x9EB4 }, { 0xC455, 0x52F8 }, { 0xC456, 0x56A8 },
+	{ 0xC457, 0x56B7 }, { 0xC458, 0x56B6 }, { 0xC459, 0x56B4 }, { 0xC45A, 0x56BC }, { 0xC45B, 0x58E4 }, { 0xC45C, 0x5B40 }, { 0xC45D, 0x5B43 }, { 0xC45E, 0x5B7D },
+	{ 0xC45F, 0x5BF6 }, { 0xC460, 0x5DC9 }, { 0xC461, 0x61F8 }, { 0xC462, 0x61FA }, { 0xC463, 0x6518 }, { 0xC464, 0x6514 }, { 0xC465, 0x6519 }, { 0xC466, 0x66E6 },
+	{ 0xC467, 0x6727 }, { 0xC468, 0x6AEC }, { 0xC469, 0x703E }, { 0xC46A, 0x7030 }, { 0xC46B, 0x7032 }, { 0xC46C, 0x7210 }, { 0xC46D, 0x737B }, { 0xC46E, 0x74CF },
+	{ 0xC46F, 0x7662 }, { 0xC470, 0x7665 }, { 0xC471, 0x7926 }, { 0xC472, 0x792A }, { 0xC473, 0x792C }, { 0xC474, 0x792B }, { 0xC475, 0x7AC7 }, { 0xC476, 0x7AF6 },
+	{ 0xC477, 0x7C4C }, { 0xC478, 0x7C43 }, { 0xC479, 0x7C4D }, { 0xC47A, 0x7CEF }, { 0xC47B, 0x7CF0 }, { 0xC47C, 0x8FAE }, { 0xC47D, 0x7E7D }, { 0xC47E, 0x7E7C },
+	{ 0xC4A1, 0x7E82 }, { 0xC4A2, 0x7F4C }, { 0xC4A3, 0x8000 }, { 0xC4A4, 0x81DA }, { 0xC4A5, 0x8266 }, { 0xC4A6, 0x85FB }, { 0xC4A7, 0x85F9 }, { 0xC4A8, 0x8611 },
+	{ 0xC4A9, 0x85FA }, { 0xC4AA, 0x8606 }, { 0xC4AB, 0x860B }, { 0xC4AC, 0x8607 }, { 0xC4AD, 0x860A }, { 0xC4AE, 0x8814 }, { 0xC4AF, 0x8815 }, { 0xC4B0, 0x8964 },
+	{ 0xC4B1, 0x89BA }, { 0xC4B2, 0x89F8 }, { 0xC4B3, 0x8B70 }, { 0xC4B4, 0x8B6C }, { 0xC4B5, 0x8B66 }, { 0xC4B6, 0x8B6F }, { 0xC4B7, 0x8B5F }, { 0xC4B8, 0x8B6B },
+	{ 0xC4B9, 0x8D0F }, { 0xC4BA, 0x8D0D }, { 0xC4BB, 0x8E89 }, { 0xC4BC, 0x8E81 }, { 0xC4BD, 0x8E85 }, { 0xC4BE, 0x8E82 }, { 0xC4BF, 0x91B4 }, { 0xC4C0, 0x91CB },
+	{ 0xC4C1, 0x9418 }, { 0xC4C2, 0x9403 }, { 0xC4C3, 0x93FD }, { 0xC4C4, 0x95E1 }, { 0xC4C5, 0x9730 }, { 0xC4C6, 0x98C4 }, { 0xC4C7, 0x9952 }, { 0xC4C8, 0x9951 },
+	{ 0xC4C9, 0x99A8 }, { 0xC4CA, 0x9A2B }, { 0xC4CB, 0x9A30 }, { 0xC4CC, 0x9A37 }, { 0xC4CD, 0x9A35 }, { 0xC4CE, 0x9C13 }, { 0xC4CF, 0x9C0D }, { 0xC4D0, 0x9E79 },
+	{ 0xC4D1, 0x9EB5 }, { 0xC4D2, 0x9EE8 }, { 0xC4D3, 0x9F2F }, { 0xC4D4, 0x9F5F }, { 0xC4D5, 0x9F63 }, { 0xC4D6, 0x9F61 }, { 0xC4D7, 0x5137 }, { 0xC4D8, 0x5138 },
+	{ 0xC4D9, 0x56C1 }, { 0xC4DA, 0x56C0 }, { 0xC4DB, 0x56C2 }, { 0xC4DC, 0x5914 }, { 0xC4DD, 0x5C6C }, { 0xC4DE, 0x5DCD }, { 0xC4DF, 0x61FC }, { 0xC4E0, 0x61FE },
+	{ 0xC4E1, 0x651D }, { 0xC4E2, 0x651C }, { 0xC4E3, 0x6595 }, { 0xC4E4, 0x66E9 }, { 0xC4E5, 0x6AFB }, { 0xC4E6, 0x6B04 }, { 0xC4E7, 0x6AFA }, { 0xC4E8, 0x6BB2 },
+	{ 0xC4E9, 0x704C }, { 0xC4EA, 0x721B }, { 0xC4EB, 0x72A7 }, { 0xC4EC, 0x74D6 }, { 0xC4ED, 0x74D4 }, { 0xC4EE, 0x7669 }, { 0xC4EF, 0x77D3 }, { 0xC4F0, 0x7C50 },
+	{ 0xC4F1, 0x7E8F }, { 0xC4F2, 0x7E8C }, { 0xC4F3, 0x7FBC }, { 0xC4F4, 0x8617 }, { 0xC4F5, 0x862D }, { 0xC4F6, 0x861A }, { 0xC4F7, 0x8823 }, { 0xC4F8, 0x8822 },
+	{ 0xC4F9, 0x8821 }, { 0xC4FA, 0x881F }, { 0xC4FB, 0x896A }, { 0xC4FC, 0x896C }, { 0xC4FD, 0x89BD }, { 0xC4FE, 0x8B74 }, { 0xC540, 0x8B77 }, { 0xC541, 0x8B7D },
+	{ 0xC542, 0x8D13 }, { 0xC543, 0x8E8A }, { 0xC544, 0x8E8D }, { 0xC545, 0x8E8B }, { 0xC546, 0x8F5F }, { 0xC547, 0x8FAF }, { 0xC548, 0x91BA }, { 0xC549, 0x942E },
+	{ 0xC54A, 0x9433 }, { 0xC54B, 0x9435 }, { 0xC54C, 0x943A }, { 0xC54D, 0x9438 }, { 0xC54E, 0x9432 }, { 0xC54F, 0x942B }, { 0xC550, 0x95E2 }, { 0xC551, 0x9738 },
+	{ 0xC552, 0x9739 }, { 0xC553, 0x9732 }, { 0xC554, 0x97FF }, { 0xC555, 0x9867 }, { 0xC556, 0x9865 }, { 0xC557, 0x9957 }, { 0xC558, 0x9A45 }, { 0xC559, 0x9A43 },
+	{ 0xC55A, 0x9A40 }, { 0xC55B, 0x9A3E }, { 0xC55C, 0x9ACF }, { 0xC55D, 0x9B54 }, { 0xC55E, 0x9B51 }, { 0xC55F, 0x9C2D }, { 0xC560, 0x9C25 }, { 0xC561, 0x9DAF },
+	{ 0xC562, 0x9DB4 }, { 0xC563, 0x9DC2 }, { 0xC564, 0x9DB8 }, { 0xC565, 0x9E9D }, { 0xC566, 0x9EEF }, { 0xC567, 0x9F19 }, { 0xC568, 0x9F5C }, { 0xC569, 0x9F66 },
+	{ 0xC56A, 0x9F67 }, { 0xC56B, 0x513C }, { 0xC56C, 0x513B }, { 0xC56D, 0x56C8 }, { 0xC56E, 0x56CA }, { 0xC56F, 0x56C9 }, { 0xC570, 0x5B7F }, { 0xC571, 0x5DD4 },
+	{ 0xC572, 0x5DD2 }, { 0xC573, 0x5F4E }, { 0xC574, 0x61FF }, { 0xC575, 0x6524 }, { 0xC576, 0x6B0A }, { 0xC577, 0x6B61 }, { 0xC578, 0x7051 }, { 0xC579, 0x7058 },
+	{ 0xC57A, 0x7380 }, { 0xC57B, 0x74E4 }, { 0xC57C, 0x758A }, { 0xC57D, 0x766E }, { 0xC57E, 0x766C }, { 0xC5A1, 0x79B3 }, { 0xC5A2, 0x7C60 }, { 0xC5A3, 0x7C5F },
+	{ 0xC5A4, 0x807E }, { 0xC5A5, 0x807D }, { 0xC5A6, 0x81DF }, { 0xC5A7, 0x8972 }, { 0xC5A8, 0x896F }, { 0xC5A9, 0x89FC }, { 0xC5AA, 0x8B80 }, { 0xC5AB, 0x8D16 },
+	{ 0xC5AC, 0x8D17 }, { 0xC5AD, 0x8E91 }, { 0xC5AE, 0x8E93 }, { 0xC5AF, 0x8F61 }, { 0xC5B0, 0x9148 }, { 0xC5B1, 0x9444 }, { 0xC5B2, 0x9451 }, { 0xC5B3, 0x9452 },
+	{ 0xC5B4, 0x973D }, { 0xC5B5, 0x973E }, { 0xC5B6, 0x97C3 }, { 0xC5B7, 0x97C1 }, { 0xC5B8, 0x986B }, { 0xC5B9, 0x9955 }, { 0xC5BA, 0x9A55 }, { 0xC5BB, 0x9A4D },
+	{ 0xC5BC, 0x9AD2 }, { 0xC5BD, 0x9B1A }, { 0xC5BE, 0x9C49 }, { 0xC5BF, 0x9C31 }, { 0xC5C0, 0x9C3E }, { 0xC5C1, 0x9C3B }, { 0xC5C2, 0x9DD3 }, { 0xC5C3, 0x9DD7 },
+	{ 0xC5C4, 0x9F34 }, { 0xC5C5, 0x9F6C }, { 0xC5C6, 0x9F6A }, { 0xC5C7, 0x9F94 }, { 0xC5C8, 0x56CC }, { 0xC5C9, 0x5DD6 }, { 0xC5CA, 0x6200 }, { 0xC5CB, 0x6523 },
+	{ 0xC5CC, 0x652B }, { 0xC5CD, 0x652A }, { 0xC5CE, 0x66EC }, { 0xC5CF, 0x6B10 }, { 0xC5D0, 0x74DA }, { 0xC5D1, 0x7ACA }, { 0xC5D2, 0x7C64 }, { 0xC5D3, 0x7C63 },
+	{ 0xC5D4, 0x7C65 }, { 0xC5D5, 0x7E93 }, { 0xC5D6, 0x7E96 }, { 0xC5D7, 0x7E94 }, { 0xC5D8, 0x81E2 }, { 0xC5D9, 0x8638 }, { 0xC5DA, 0x863F }, { 0xC5DB, 0x8831 },
+	{ 0xC5DC, 0x8B8A }, { 0xC5DD, 0x9090 }, { 0xC5DE, 0x908F }, { 0xC5DF, 0x9463 }, { 0xC5E0, 0x9460 }, { 0xC5E1, 0x9464 }, { 0xC5E2, 0x9768 }, { 0xC5E3, 0x986F },
+	{ 0xC5E4, 0x995C }, { 0xC5E5, 0x9A5A }, { 0xC5E6, 0x9A5B }, { 0xC5E7, 0x9A57 }, { 0xC5E8, 0x9AD3 }, { 0xC5E9, 0x9AD4 }, { 0xC5EA, 0x9AD1 }, { 0xC5EB, 0x9C54 },
+	{ 0xC5EC, 0x9C57 }, { 0xC5ED, 0x9C56 }, { 0xC5EE, 0x9DE5 }, { 0xC5EF, 0x9E9F }, { 0xC5F0, 0x9EF4 }, { 0xC5F1, 0x56D1 }, { 0xC5F2, 0x58E9 }, { 0xC5F3, 0x652C },
+	{ 0xC5F4, 0x705E }, { 0xC5F5, 0x7671 }, { 0xC5F6, 0x7672 }, { 0xC5F7, 0x77D7 }, { 0xC5F8, 0x7F50 }, { 0xC5F9, 0x7F88 }, { 0xC5FA, 0x8836 }, { 0xC5FB, 0x8839 },
+	{ 0xC5FC, 0x8862 }, { 0xC5FD, 0x8B93 }, { 0xC5FE, 0x8B92 }, { 0xC640, 0x8B96 }, { 0xC641, 0x8277 }, { 0xC642, 0x8D1B }, { 0xC643, 0x91C0 }, { 0xC644, 0x946A },
+	{ 0xC645, 0x9742 }, { 0xC646, 0x9748 }, { 0xC647, 0x9744 }, { 0xC648, 0x97C6 }, { 0xC649, 0x9870 }, { 0xC64A, 0x9A5F }, { 0xC64B, 0x9B22 }, { 0xC64C, 0x9B58 },
+	{ 0xC64D, 0x9C5F }, { 0xC64E, 0x9DF9 }, { 0xC64F, 0x9DFA }, { 0xC650, 0x9E7C }, { 0xC651, 0x9E7D }, { 0xC652, 0x9F07 }, { 0xC653, 0x9F77 }, { 0xC654, 0x9F72 },
+	{ 0xC655, 0x5EF3 }, { 0xC656, 0x6B16 }, { 0xC657, 0x7063 }, { 0xC658, 0x7C6C }, { 0xC659, 0x7C6E }, { 0xC65A, 0x883B }, { 0xC65B, 0x89C0 }, { 0xC65C, 0x8EA1 },
+	{ 0xC65D, 0x91C1 }, { 0xC65E, 0x9472 }, { 0xC65F, 0x9470 }, { 0xC660, 0x9871 }, { 0xC661, 0x995E }, { 0xC662, 0x9AD6 }, { 0xC663, 0x9B23 }, { 0xC664, 0x9ECC },
+	{ 0xC665, 0x7064 }, { 0xC666, 0x77DA }, { 0xC667, 0x8B9A }, { 0xC668, 0x9477 }, { 0xC669, 0x97C9 }, { 0xC66A, 0x9A62 }, { 0xC66B, 0x9A65 }, { 0xC66C, 0x7E9C },
+	{ 0xC66D, 0x8B9C }, { 0xC66E, 0x8EAA }, { 0xC66F, 0x91C5 }, { 0xC670, 0x947D }, { 0xC671, 0x947E }, { 0xC672, 0x947C }, { 0xC673, 0x9C77 }, { 0xC674, 0x9C78 },
+	{ 0xC675, 0x9EF7 }, { 0xC676, 0x8C54 }, { 0xC677, 0x947F }, { 0xC678, 0x9E1A }, { 0xC679, 0x7228 }, { 0xC67A, 0x9A6A }, { 0xC67B, 0x9B31 }, { 0xC67C, 0x9E1B },
+	{ 0xC67D, 0x9E1E }, { 0xC67E, 0x7C72 }, { 0xC940, 0x4E42 }, { 0xC941, 0x4E5C }, { 0xC942, 0x51F5 }, { 0xC943, 0x531A }, { 0xC944, 0x5382 }, { 0xC945, 0x4E07 },
+	{ 0xC946, 0x4E0C }, { 0xC947, 0x4E47 }, { 0xC948, 0x4E8D }, { 0xC949, 0x56D7 }, { 0xC94A, 0xFA0C }, { 0xC94B, 0x5C6E }, { 0xC94C, 0x5F73 }, { 0xC94D, 0x4E0F },
+	{ 0xC94E, 0x5187 }, { 0xC94F, 0x4E0E }, { 0xC950, 0x4E2E }, { 0xC951, 0x4E93 }, { 0xC952, 0x4EC2 }, { 0xC953, 0x4EC9 }, { 0xC954, 0x4EC8 }, { 0xC955, 0x5198 },
+	{ 0xC956, 0x52FC }, { 0xC957, 0x536C }, { 0xC958, 0x53B9 }, { 0xC959, 0x5720 }, { 0xC95A, 0x5903 }, { 0xC95B, 0x592C }, { 0xC95C, 0x5C10 }, { 0xC95D, 0x5DFF },
+	{ 0xC95E, 0x65E1 }, { 0xC95F, 0x6BB3 }, { 0xC960, 0x6BCC }, { 0xC961, 0x6C14 }, { 0xC962, 0x723F }, { 0xC963, 0x4E31 }, { 0xC964, 0x4E3C }, { 0xC965, 0x4EE8 },
+	{ 0xC966, 0x4EDC }, { 0xC967, 0x4EE9 }, { 0xC968, 0x4EE1 }, { 0xC969, 0x4EDD }, { 0xC96A, 0x4EDA }, { 0xC96B, 0x520C }, { 0xC96C, 0x531C }, { 0xC96D, 0x534C },
+	{ 0xC96E, 0x5722 }, { 0xC96F, 0x5723 }, { 0xC970, 0x5917 }, { 0xC971, 0x592F }, { 0xC972, 0x5B81 }, { 0xC973, 0x5B84 }, { 0xC974, 0x5C12 }, { 0xC975, 0x5C3B },
+	{ 0xC976, 0x5C74 }, { 0xC977, 0x5C73 }, { 0xC978, 0x5E04 }, { 0xC979, 0x5E80 }, { 0xC97A, 0x5E82 }, { 0xC97B, 0x5FC9 }, { 0xC97C, 0x6209 }, { 0xC97D, 0x6250 },
+	{ 0xC97E, 0x6C15 }, { 0xC9A1, 0x6C36 }, { 0xC9A2, 0x6C43 }, { 0xC9A3, 0x6C3F }, { 0xC9A4, 0x6C3B }, { 0xC9A5, 0x72AE }, { 0xC9A6, 0x72B0 }, { 0xC9A7, 0x738A },
+	{ 0xC9A8, 0x79B8 }, { 0xC9A9, 0x808A }, { 0xC9AA, 0x961E }, { 0xC9AB, 0x4F0E }, { 0xC9AC, 0x4F18 }, { 0xC9AD, 0x4F2C }, { 0xC9AE, 0x4EF5 }, { 0xC9AF, 0x4F14 },
+	{ 0xC9B0, 0x4EF1 }, { 0xC9B1, 0x4F00 }, { 0xC9B2, 0x4EF7 }, { 0xC9B3, 0x4F08 }, { 0xC9B4, 0x4F1D }, { 0xC9B5, 0x4F02 }, { 0xC9B6, 0x4F05 }, { 0xC9B7, 0x4F22 },
+	{ 0xC9B8, 0x4F13 }, { 0xC9B9, 0x4F04 }, { 0xC9BA, 0x4EF4 }, { 0xC9BB, 0x4F12 }, { 0xC9BC, 0x51B1 }, { 0xC9BD, 0x5213 }, { 0xC9BE, 0x5209 }, { 0xC9BF, 0x5210 },
+	{ 0xC9C0, 0x52A6 }, { 0xC9C1, 0x5322 }, { 0xC9C2, 0x531F }, { 0xC9C3, 0x534D }, { 0xC9C4, 0x538A }, { 0xC9C5, 0x5407 }, { 0xC9C6, 0x56E1 }, { 0xC9C7, 0x56DF },
+	{ 0xC9C8, 0x572E }, { 0xC9C9, 0x572A }, { 0xC9CA, 0x5734 }, { 0xC9CB, 0x593C }, { 0xC9CC, 0x5980 }, { 0xC9CD, 0x597C }, { 0xC9CE, 0x5985 }, { 0xC9CF, 0x597B },
+	{ 0xC9D0, 0x597E }, { 0xC9D1, 0x5977 }, { 0xC9D2, 0x597F }, { 0xC9D3, 0x5B56 }, { 0xC9D4, 0x5C15 }, { 0xC9D5, 0x5C25 }, { 0xC9D6, 0x5C7C }, { 0xC9D7, 0x5C7A },
+	{ 0xC9D8, 0x5C7B }, { 0xC9D9, 0x5C7E }, { 0xC9DA, 0x5DDF }, { 0xC9DB, 0x5E75 }, { 0xC9DC, 0x5E84 }, { 0xC9DD, 0x5F02 }, { 0xC9DE, 0x5F1A }, { 0xC9DF, 0x5F74 },
+	{ 0xC9E0, 0x5FD5 }, { 0xC9E1, 0x5FD4 }, { 0xC9E2, 0x5FCF }, { 0xC9E3, 0x625C }, { 0xC9E4, 0x625E }, { 0xC9E5, 0x6264 }, { 0xC9E6, 0x6261 }, { 0xC9E7, 0x6266 },
+	{ 0xC9E8, 0x6262 }, { 0xC9E9, 0x6259 }, { 0xC9EA, 0x6260 }, { 0xC9EB, 0x625A }, { 0xC9EC, 0x6265 }, { 0xC9ED, 0x65EF }, { 0xC9EE, 0x65EE }, { 0xC9EF, 0x673E },
+	{ 0xC9F0, 0x6739 }, { 0xC9F1, 0x6738 }, { 0xC9F2, 0x673B }, { 0xC9F3, 0x673A }, { 0xC9F4, 0x673F }, { 0xC9F5, 0x673C }, { 0xC9F6, 0x6733 }, { 0xC9F7, 0x6C18 },
+	{ 0xC9F8, 0x6C46 }, { 0xC9F9, 0x6C52 }, { 0xC9FA, 0x6C5C }, { 0xC9FB, 0x6C4F }, { 0xC9FC, 0x6C4A }, { 0xC9FD, 0x6C54 }, { 0xC9FE, 0x6C4B }, { 0xCA40, 0x6C4C },
+	{ 0xCA41, 0x7071 }, { 0xCA42, 0x725E }, { 0xCA43, 0x72B4 }, { 0xCA44, 0x72B5 }, { 0xCA45, 0x738E }, { 0xCA46, 0x752A }, { 0xCA47, 0x767F }, { 0xCA48, 0x7A75 },
+	{ 0xCA49, 0x7F51 }, { 0xCA4A, 0x8278 }, { 0xCA4B, 0x827C }, { 0xCA4C, 0x8280 }, { 0xCA4D, 0x827D }, { 0xCA4E, 0x827F }, { 0xCA4F, 0x864D }, { 0xCA50, 0x897E },
+	{ 0xCA51, 0x9099 }, { 0xCA52, 0x9097 }, { 0xCA53, 0x9098 }, { 0xCA54, 0x909B }, { 0xCA55, 0x9094 }, { 0xCA56, 0x9622 }, { 0xCA57, 0x9624 }, { 0xCA58, 0x9620 },
+	{ 0xCA59, 0x9623 }, { 0xCA5A, 0x4F56 }, { 0xCA5B, 0x4F3B }, { 0xCA5C, 0x4F62 }, { 0xCA5D, 0x4F49 }, { 0xCA5E, 0x4F53 }, { 0xCA5F, 0x4F64 }, { 0xCA60, 0x4F3E },
+	{ 0xCA61, 0x4F67 }, { 0xCA62, 0x4F52 }, { 0xCA63, 0x4F5F }, { 0xCA64, 0x4F41 }, { 0xCA65, 0x4F58 }, { 0xCA66, 0x4F2D }, { 0xCA67, 0x4F33 }, { 0xCA68, 0x4F3F },
+	{ 0xCA69, 0x4F61 }, { 0xCA6A, 0x518F }, { 0xCA6B, 0x51B9 }, { 0xCA6C, 0x521C }, { 0xCA6D, 0x521E }, { 0xCA6E, 0x5221 }, { 0xCA6F, 0x52AD }, { 0xCA70, 0x52AE },
+	{ 0xCA71, 0x5309 }, { 0xCA72, 0x5363 }, { 0xCA73, 0x5372 }, { 0xCA74, 0x538E }, { 0xCA75, 0x538F }, { 0xCA76, 0x5430 }, { 0xCA77, 0x5437 }, { 0xCA78, 0x542A },
+	{ 0xCA79, 0x5454 }, { 0xCA7A, 0x5445 }, { 0xCA7B, 0x5419 }, { 0xCA7C, 0x541C }, { 0xCA7D, 0x5425 }, { 0xCA7E, 0x5418 }, { 0xCAA1, 0x543D }, { 0xCAA2, 0x544F },
+	{ 0xCAA3, 0x5441 }, { 0xCAA4, 0x5428 }, { 0xCAA5, 0x5424 }, { 0xCAA6, 0x5447 }, { 0xCAA7, 0x56EE }, { 0xCAA8, 0x56E7 }, { 0xCAA9, 0x56E5 }, { 0xCAAA, 0x5741 },
+	{ 0xCAAB, 0x5745 }, { 0xCAAC, 0x574C }, { 0xCAAD, 0x5749 }, { 0xCAAE, 0x574B }, { 0xCAAF, 0x5752 }, { 0xCAB0, 0x5906 }, { 0xCAB1, 0x5940 }, { 0xCAB2, 0x59A6 },
+	{ 0xCAB3, 0x5998 }, { 0xCAB4, 0x59A0 }, { 0xCAB5, 0x5997 }, { 0xCAB6, 0x598E }, { 0xCAB7, 0x59A2 }, { 0xCAB8, 0x5990 }, { 0xCAB9, 0x598F }, { 0xCABA, 0x59A7 },
+	{ 0xCABB, 0x59A1 }, { 0xCABC, 0x5B8E }, { 0xCABD, 0x5B92 }, { 0xCABE, 0x5C28 }, { 0xCABF, 0x5C2A }, { 0xCAC0, 0x5C8D }, { 0xCAC1, 0x5C8F }, { 0xCAC2, 0x5C88 },
+	{ 0xCAC3, 0x5C8B }, { 0xCAC4, 0x5C89 }, { 0xCAC5, 0x5C92 }, { 0xCAC6, 0x5C8A }, { 0xCAC7, 0x5C86 }, { 0xCAC8, 0x5C93 }, { 0xCAC9, 0x5C95 }, { 0xCACA, 0x5DE0 },
+	{ 0xCACB, 0x5E0A }, { 0xCACC, 0x5E0E }, { 0xCACD, 0x5E8B }, { 0xCACE, 0x5E89 }, { 0xCACF, 0x5E8C }, { 0xCAD0, 0x5E88 }, { 0xCAD1, 0x5E8D }, { 0xCAD2, 0x5F05 },
+	{ 0xCAD3, 0x5F1D }, { 0xCAD4, 0x5F78 }, { 0xCAD5, 0x5F76 }, { 0xCAD6, 0x5FD2 }, { 0xCAD7, 0x5FD1 }, { 0xCAD8, 0x5FD0 }, { 0xCAD9, 0x5FED }, { 0xCADA, 0x5FE8 },
+	{ 0xCADB, 0x5FEE }, { 0xCADC, 0x5FF3 }, { 0xCADD, 0x5FE1 }, { 0xCADE, 0x5FE4 }, { 0xCADF, 0x5FE3 }, { 0xCAE0, 0x5FFA }, { 0xCAE1, 0x5FEF }, { 0xCAE2, 0x5FF7 },
+	{ 0xCAE3, 0x5FFB }, { 0xCAE4, 0x6000 }, { 0xCAE5, 0x5FF4 }, { 0xCAE6, 0x623A }, { 0xCAE7, 0x6283 }, { 0xCAE8, 0x628C }, { 0xCAE9, 0x628E }, { 0xCAEA, 0x628F },
+	{ 0xCAEB, 0x6294 }, { 0xCAEC, 0x6287 }, { 0xCAED, 0x6271 }, { 0xCAEE, 0x627B }, { 0xCAEF, 0x627A }, { 0xCAF0, 0x6270 }, { 0xCAF1, 0x6281 }, { 0xCAF2, 0x6288 },
+	{ 0xCAF3, 0x6277 }, { 0xCAF4, 0x627D }, { 0xCAF5, 0x6272 }, { 0xCAF6, 0x6274 }, { 0xCAF7, 0x6537 }, { 0xCAF8, 0x65F0 }, { 0xCAF9, 0x65F4 }, { 0xCAFA, 0x65F3 },
+	{ 0xCAFB, 0x65F2 }, { 0xCAFC, 0x65F5 }, { 0xCAFD, 0x6745 }, { 0xCAFE, 0x6747 }, { 0xCB40, 0x6759 }, { 0xCB41, 0x6755 }, { 0xCB42, 0x674C }, { 0xCB43, 0x6748 },
+	{ 0xCB44, 0x675D }, { 0xCB45, 0x674D }, { 0xCB46, 0x675A }, { 0xCB47, 0x674B }, { 0xCB48, 0x6BD0 }, { 0xCB49, 0x6C19 }, { 0xCB4A, 0x6C1A }, { 0xCB4B, 0x6C78 },
+	{ 0xCB4C, 0x6C67 }, { 0xCB4D, 0x6C6B }, { 0xCB4E, 0x6C84 }, { 0xCB4F, 0x6C8B }, { 0xCB50, 0x6C8F }, { 0xCB51, 0x6C71 }, { 0xCB52, 0x6C6F }, { 0xCB53, 0x6C69 },
+	{ 0xCB54, 0x6C9A }, { 0xCB55, 0x6C6D }, { 0xCB56, 0x6C87 }, { 0xCB57, 0x6C95 }, { 0xCB58, 0x6C9C }, { 0xCB59, 0x6C66 }, { 0xCB5A, 0x6C73 }, { 0xCB5B, 0x6C65 },
+	{ 0xCB5C, 0x6C7B }, { 0xCB5D, 0x6C8E }, { 0xCB5E, 0x7074 }, { 0xCB5F, 0x707A }, { 0xCB60, 0x7263 }, { 0xCB61, 0x72BF }, { 0xCB62, 0x72BD }, { 0xCB63, 0x72C3 },
+	{ 0xCB64, 0x72C6 }, { 0xCB65, 0x72C1 }, { 0xCB66, 0x72BA }, { 0xCB67, 0x72C5 }, { 0xCB68, 0x7395 }, { 0xCB69, 0x7397 }, { 0xCB6A, 0x7393 }, { 0xCB6B, 0x7394 },
+	{ 0xCB6C, 0x7392 }, { 0xCB6D, 0x753A }, { 0xCB6E, 0x7539 }, { 0xCB6F, 0x7594 }, { 0xCB70, 0x7595 }, { 0xCB71, 0x7681 }, { 0xCB72, 0x793D }, { 0xCB73, 0x8034 },
+	{ 0xCB74, 0x8095 }, { 0xCB75, 0x8099 }, { 0xCB76, 0x8090 }, { 0xCB77, 0x8092 }, { 0xCB78, 0x809C }, { 0xCB79, 0x8290 }, { 0xCB7A, 0x828F }, { 0xCB7B, 0x8285 },
+	{ 0xCB7C, 0x828E }, { 0xCB7D, 0x8291 }, { 0xCB7E, 0x8293 }, { 0xCBA1, 0x828A }, { 0xCBA2, 0x8283 }, { 0xCBA3, 0x8284 }, { 0xCBA4, 0x8C78 }, { 0xCBA5, 0x8FC9 },
+	{ 0xCBA6, 0x8FBF }, { 0xCBA7, 0x909F }, { 0xCBA8, 0x90A1 }, { 0xCBA9, 0x90A5 }, { 0xCBAA, 0x909E }, { 0xCBAB, 0x90A7 }, { 0xCBAC, 0x90A0 }, { 0xCBAD, 0x9630 },
+	{ 0xCBAE, 0x9628 }, { 0xCBAF, 0x962F }, { 0xCBB0, 0x962D }, { 0xCBB1, 0x4E33 }, { 0xCBB2, 0x4F98 }, { 0xCBB3, 0x4F7C }, { 0xCBB4, 0x4F85 }, { 0xCBB5, 0x4F7D },
+	{ 0xCBB6, 0x4F80 }, { 0xCBB7, 0x4F87 }, { 0xCBB8, 0x4F76 }, { 0xCBB9, 0x4F74 }, { 0xCBBA, 0x4F89 }, { 0xCBBB, 0x4F84 }, { 0xCBBC, 0x4F77 }, { 0xCBBD, 0x4F4C },
+	{ 0xCBBE, 0x4F97 }, { 0xCBBF, 0x4F6A }, { 0xCBC0, 0x4F9A }, { 0xCBC1, 0x4F79 }, { 0xCBC2, 0x4F81 }, { 0xCBC3, 0x4F78 }, { 0xCBC4, 0x4F90 }, { 0xCBC5, 0x4F9C },
+	{ 0xCBC6, 0x4F94 }, { 0xCBC7, 0x4F9E }, { 0xCBC8, 0x4F92 }, { 0xCBC9, 0x4F82 }, { 0xCBCA, 0x4F95 }, { 0xCBCB, 0x4F6B }, { 0xCBCC, 0x4F6E }, { 0xCBCD, 0x519E },
+	{ 0xCBCE, 0x51BC }, { 0xCBCF, 0x51BE }, { 0xCBD0, 0x5235 }, { 0xCBD1, 0x5232 }, { 0xCBD2, 0x5233 }, { 0xCBD3, 0x5246 }, { 0xCBD4, 0x5231 }, { 0xCBD5, 0x52BC },
+	{ 0xCBD6, 0x530A }, { 0xCBD7, 0x530B }, { 0xCBD8, 0x533C }, { 0xCBD9, 0x5392 }, { 0xCBDA, 0x5394 }, { 0xCBDB, 0x5487 }, { 0xCBDC, 0x547F }, { 0xCBDD, 0x5481 },
+	{ 0xCBDE, 0x5491 }, { 0xCBDF, 0x5482 }, { 0xCBE0, 0x5488 }, { 0xCBE1, 0x546B }, { 0xCBE2, 0x547A }, { 0xCBE3, 0x547E }, { 0xCBE4, 0x5465 }, { 0xCBE5, 0x546C },
+	{ 0xCBE6, 0x5474 }, { 0xCBE7, 0x5466 }, { 0xCBE8, 0x548D }, { 0xCBE9, 0x546F }, { 0xCBEA, 0x5461 }, { 0xCBEB, 0x5460 }, { 0xCBEC, 0x5498 }, { 0xCBED, 0x5463 },
+	{ 0xCBEE, 0x5467 }, { 0xCBEF, 0x5464 }, { 0xCBF0, 0x56F7 }, { 0xCBF1, 0x56F9 }, { 0xCBF2, 0x576F }, { 0xCBF3, 0x5772 }, { 0xCBF4, 0x576D }, { 0xCBF5, 0x576B },
+	{ 0xCBF6, 0x5771 }, { 0xCBF7, 0x5770 }, { 0xCBF8, 0x5776 }, { 0xCBF9, 0x5780 }, { 0xCBFA, 0x5775 }, { 0xCBFB, 0x577B }, { 0xCBFC, 0x5773 }, { 0xCBFD, 0x5774 },
+	{ 0xCBFE, 0x5762 }, { 0xCC40, 0x5768 }, { 0xCC41, 0x577D }, { 0xCC42, 0x590C }, { 0xCC43, 0x5945 }, { 0xCC44, 0x59B5 }, { 0xCC45, 0x59BA }, { 0xCC46, 0x59CF },
+	{ 0xCC47, 0x59CE }, { 0xCC48, 0x59B2 }, { 0xCC49, 0x59CC }, { 0xCC4A, 0x59C1 }, { 0xCC4B, 0x59B6 }, { 0xCC4C, 0x59BC }, { 0xCC4D, 0x59C3 }, { 0xCC4E, 0x59D6 },
+	{ 0xCC4F, 0x59B1 }, { 0xCC50, 0x59BD }, { 0xCC51, 0x59C0 }, { 0xCC52, 0x59C8 }, { 0xCC53, 0x59B4 }, { 0xCC54, 0x59C7 }, { 0xCC55, 0x5B62 }, { 0xCC56, 0x5B65 },
+	{ 0xCC57, 0x5B93 }, { 0xCC58, 0x5B95 }, { 0xCC59, 0x5C44 }, { 0xCC5A, 0x5C47 }, { 0xCC5B, 0x5CAE }, { 0xCC5C, 0x5CA4 }, { 0xCC5D, 0x5CA0 }, { 0xCC5E, 0x5CB5 },
+	{ 0xCC5F, 0x5CAF }, { 0xCC60, 0x5CA8 }, { 0xCC61, 0x5CAC }, { 0xCC62, 0x5C9F }, { 0xCC63, 0x5CA3 }, { 0xCC64, 0x5CAD }, { 0xCC65, 0x5CA2 }, { 0xCC66, 0x5CAA },
+	{ 0xCC67, 0x5CA7 }, { 0xCC68, 0x5C9D }, { 0xCC69, 0x5CA5 }, { 0xCC6A, 0x5CB6 }, { 0xCC6B, 0x5CB0 }, { 0xCC6C, 0x5CA6 }, { 0xCC6D, 0x5E17 }, { 0xCC6E, 0x5E14 },
+	{ 0xCC6F, 0x5E19 }, { 0xCC70, 0x5F28 }, { 0xCC71, 0x5F22 }, { 0xCC72, 0x5F23 }, { 0xCC73, 0x5F24 }, { 0xCC74, 0x5F54 }, { 0xCC75, 0x5F82 }, { 0xCC76, 0x5F7E },
+	{ 0xCC77, 0x5F7D }, { 0xCC78, 0x5FDE }, { 0xCC79, 0x5FE5 }, { 0xCC7A, 0x602D }, { 0xCC7B, 0x6026 }, { 0xCC7C, 0x6019 }, { 0xCC7D, 0x6032 }, { 0xCC7E, 0x600B },
+	{ 0xCCA1, 0x6034 }, { 0xCCA2, 0x600A }, { 0xCCA3, 0x6017 }, { 0xCCA4, 0x6033 }, { 0xCCA5, 0x601A }, { 0xCCA6, 0x601E }, { 0xCCA7, 0x602C }, { 0xCCA8, 0x6022 },
+	{ 0xCCA9, 0x600D }, { 0xCCAA, 0x6010 }, { 0xCCAB, 0x602E }, { 0xCCAC, 0x6013 }, { 0xCCAD, 0x6011 }, { 0xCCAE, 0x600C }, { 0xCCAF, 0x6009 }, { 0xCCB0, 0x601C },
+	{ 0xCCB1, 0x6214 }, { 0xCCB2, 0x623D }, { 0xCCB3, 0x62AD }, { 0xCCB4, 0x62B4 }, { 0xCCB5, 0x62D1 }, { 0xCCB6, 0x62BE }, { 0xCCB7, 0x62AA }, { 0xCCB8, 0x62B6 },
+	{ 0xCCB9, 0x62CA }, { 0xCCBA, 0x62AE }, { 0xCCBB, 0x62B3 }, { 0xCCBC, 0x62AF }, { 0xCCBD, 0x62BB }, { 0xCCBE, 0x62A9 }, { 0xCCBF, 0x62B0 }, { 0xCCC0, 0x62B8 },
+	{ 0xCCC1, 0x653D }, { 0xCCC2, 0x65A8 }, { 0xCCC3, 0x65BB }, { 0xCCC4, 0x6609 }, { 0xCCC5, 0x65FC }, { 0xCCC6, 0x6604 }, { 0xCCC7, 0x6612 }, { 0xCCC8, 0x6608 },
+	{ 0xCCC9, 0x65FB }, { 0xCCCA, 0x6603 }, { 0xCCCB, 0x660B }, { 0xCCCC, 0x660D }, { 0xCCCD, 0x6605 }, { 0xCCCE, 0x65FD }, { 0xCCCF, 0x6611 }, { 0xCCD0, 0x6610 },
+	{ 0xCCD1, 0x66F6 }, { 0xCCD2, 0x670A }, { 0xCCD3, 0x6785 }, { 0xCCD4, 0x676C }, { 0xCCD5, 0x678E }, { 0xCCD6, 0x6792 }, { 0xCCD7, 0x6776 }, { 0xCCD8, 0x677B },
+	{ 0xCCD9, 0x6798 }, { 0xCCDA, 0x6786 }, { 0xCCDB, 0x6784 }, { 0xCCDC, 0x6774 }, { 0xCCDD, 0x678D }, { 0xCCDE, 0x678C }, { 0xCCDF, 0x677A }, { 0xCCE0, 0x679F },
+	{ 0xCCE1, 0x6791 }, { 0xCCE2, 0x6799 }, { 0xCCE3, 0x6783 }, { 0xCCE4, 0x677D }, { 0xCCE5, 0x6781 }, { 0xCCE6, 0x6778 }, { 0xCCE7, 0x6779 }, { 0xCCE8, 0x6794 },
+	{ 0xCCE9, 0x6B25 }, { 0xCCEA, 0x6B80 }, { 0xCCEB, 0x6B7E }, { 0xCCEC, 0x6BDE }, { 0xCCED, 0x6C1D }, { 0xCCEE, 0x6C93 }, { 0xCCEF, 0x6CEC }, { 0xCCF0, 0x6CEB },
+	{ 0xCCF1, 0x6CEE }, { 0xCCF2, 0x6CD9 }, { 0xCCF3, 0x6CB6 }, { 0xCCF4, 0x6CD4 }, { 0xCCF5, 0x6CAD }, { 0xCCF6, 0x6CE7 }, { 0xCCF7, 0x6CB7 }, { 0xCCF8, 0x6CD0 },
+	{ 0xCCF9, 0x6CC2 }, { 0xCCFA, 0x6CBA }, { 0xCCFB, 0x6CC3 }, { 0xCCFC, 0x6CC6 }, { 0xCCFD, 0x6CED }, { 0xCCFE, 0x6CF2 }, { 0xCD40, 0x6CD2 }, { 0xCD41, 0x6CDD },
+	{ 0xCD42, 0x6CB4 }, { 0xCD43, 0x6C8A }, { 0xCD44, 0x6C9D }, { 0xCD45, 0x6C80 }, { 0xCD46, 0x6CDE }, { 0xCD47, 0x6CC0 }, { 0xCD48, 0x6D30 }, { 0xCD49, 0x6CCD },
+	{ 0xCD4A, 0x6CC7 }, { 0xCD4B, 0x6CB0 }, { 0xCD4C, 0x6CF9 }, { 0xCD4D, 0x6CCF }, { 0xCD4E, 0x6CE9 }, { 0xCD4F, 0x6CD1 }, { 0xCD50, 0x7094 }, { 0xCD51, 0x7098 },
+	{ 0xCD52, 0x7085 }, { 0xCD53, 0x7093 }, { 0xCD54, 0x7086 }, { 0xCD55, 0x7084 }, { 0xCD56, 0x7091 }, { 0xCD57, 0x7096 }, { 0xCD58, 0x7082 }, { 0xCD59, 0x709A },
+	{ 0xCD5A, 0x7083 }, { 0xCD5B, 0x726A }, { 0xCD5C, 0x72D6 }, { 0xCD5D, 0x72CB }, { 0xCD5E, 0x72D8 }, { 0xCD5F, 0x72C9 }, { 0xCD60, 0x72DC }, { 0xCD61, 0x72D2 },
+	{ 0xCD62, 0x72D4 }, { 0xCD63, 0x72DA }, { 0xCD64, 0x72CC }, { 0xCD65, 0x72D1 }, { 0xCD66, 0x73A4 }, { 0xCD67, 0x73A1 }, { 0xCD68, 0x73AD }, { 0xCD69, 0x73A6 },
+	{ 0xCD6A, 0x73A2 }, { 0xCD6B, 0x73A0 }, { 0xCD6C, 0x73AC }, { 0xCD6D, 0x739D }, { 0xCD6E, 0x74DD }, { 0xCD6F, 0x74E8 }, { 0xCD70, 0x753F }, { 0xCD71, 0x7540 },
+	{ 0xCD72, 0x753E }, { 0xCD73, 0x758C }, { 0xCD74, 0x7598 }, { 0xCD75, 0x76AF }, { 0xCD76, 0x76F3 }, { 0xCD77, 0x76F1 }, { 0xCD78, 0x76F0 }, { 0xCD79, 0x76F5 },
+	{ 0xCD7A, 0x77F8 }, { 0xCD7B, 0x77FC }, { 0xCD7C, 0x77F9 }, { 0xCD7D, 0x77FB }, { 0xCD7E, 0x77FA }, { 0xCDA1, 0x77F7 }, { 0xCDA2, 0x7942 }, { 0xCDA3, 0x793F },
+	{ 0xCDA4, 0x79C5 }, { 0xCDA5, 0x7A78 }, { 0xCDA6, 0x7A7B }, { 0xCDA7, 0x7AFB }, { 0xCDA8, 0x7C75 }, { 0xCDA9, 0x7CFD }, { 0xCDAA, 0x8035 }, { 0xCDAB, 0x808F },
+	{ 0xCDAC, 0x80AE }, { 0xCDAD, 0x80A3 }, { 0xCDAE, 0x80B8 }, { 0xCDAF, 0x80B5 }, { 0xCDB0, 0x80AD }, { 0xCDB1, 0x8220 }, { 0xCDB2, 0x82A0 }, { 0xCDB3, 0x82C0 },
+	{ 0xCDB4, 0x82AB }, { 0xCDB5, 0x829A }, { 0xCDB6, 0x8298 }, { 0xCDB7, 0x829B }, { 0xCDB8, 0x82B5 }, { 0xCDB9, 0x82A7 }, { 0xCDBA, 0x82AE }, { 0xCDBB, 0x82BC },
+	{ 0xCDBC, 0x829E }, { 0xCDBD, 0x82BA }, { 0xCDBE, 0x82B4 }, { 0xCDBF, 0x82A8 }, { 0xCDC0, 0x82A1 }, { 0xCDC1, 0x82A9 }, { 0xCDC2, 0x82C2 }, { 0xCDC3, 0x82A4 },
+	{ 0xCDC4, 0x82C3 }, { 0xCDC5, 0x82B6 }, { 0xCDC6, 0x82A2 }, { 0xCDC7, 0x8670 }, { 0xCDC8, 0x866F }, { 0xCDC9, 0x866D }, { 0xCDCA, 0x866E }, { 0xCDCB, 0x8C56 },
+	{ 0xCDCC, 0x8FD2 }, { 0xCDCD, 0x8FCB }, { 0xCDCE, 0x8FD3 }, { 0xCDCF, 0x8FCD }, { 0xCDD0, 0x8FD6 }, { 0xCDD1, 0x8FD5 }, { 0xCDD2, 0x8FD7 }, { 0xCDD3, 0x90B2 },
+	{ 0xCDD4, 0x90B4 }, { 0xCDD5, 0x90AF }, { 0xCDD6, 0x90B3 }, { 0xCDD7, 0x90B0 }, { 0xCDD8, 0x9639 }, { 0xCDD9, 0x963D }, { 0xCDDA, 0x963C }, { 0xCDDB, 0x963A },
+	{ 0xCDDC, 0x9643 }, { 0xCDDD, 0x4FCD }, { 0xCDDE, 0x4FC5 }, { 0xCDDF, 0x4FD3 }, { 0xCDE0, 0x4FB2 }, { 0xCDE1, 0x4FC9 }, { 0xCDE2, 0x4FCB }, { 0xCDE3, 0x4FC1 },
+	{ 0xCDE4, 0x4FD4 }, { 0xCDE5, 0x4FDC }, { 0xCDE6, 0x4FD9 }, { 0xCDE7, 0x4FBB }, { 0xCDE8, 0x4FB3 }, { 0xCDE9, 0x4FDB }, { 0xCDEA, 0x4FC7 }, { 0xCDEB, 0x4FD6 },
+	{ 0xCDEC, 0x4FBA }, { 0xCDED, 0x4FC0 }, { 0xCDEE, 0x4FB9 }, { 0xCDEF, 0x4FEC }, { 0xCDF0, 0x5244 }, { 0xCDF1, 0x5249 }, { 0xCDF2, 0x52C0 }, { 0xCDF3, 0x52C2 },
+	{ 0xCDF4, 0x533D }, { 0xCDF5, 0x537C }, { 0xCDF6, 0x5397 }, { 0xCDF7, 0x5396 }, { 0xCDF8, 0x5399 }, { 0xCDF9, 0x5398 }, { 0xCDFA, 0x54BA }, { 0xCDFB, 0x54A1 },
+	{ 0xCDFC, 0x54AD }, { 0xCDFD, 0x54A5 }, { 0xCDFE, 0x54CF }, { 0xCE40, 0x54C3 }, { 0xCE41, 0x830D }, { 0xCE42, 0x54B7 }, { 0xCE43, 0x54AE }, { 0xCE44, 0x54D6 },
+	{ 0xCE45, 0x54B6 }, { 0xCE46, 0x54C5 }, { 0xCE47, 0x54C6 }, { 0xCE48, 0x54A0 }, { 0xCE49, 0x5470 }, { 0xCE4A, 0x54BC }, { 0xCE4B, 0x54A2 }, { 0xCE4C, 0x54BE },
+	{ 0xCE4D, 0x5472 }, { 0xCE4E, 0x54DE }, { 0xCE4F, 0x54B0 }, { 0xCE50, 0x57B5 }, { 0xCE51, 0x579E }, { 0xCE52, 0x579F }, { 0xCE53, 0x57A4 }, { 0xCE54, 0x578C },
+	{ 0xCE55, 0x5797 }, { 0xCE56, 0x579D }, { 0xCE57, 0x579B }, { 0xCE58, 0x5794 }, { 0xCE59, 0x5798 }, { 0xCE5A, 0x578F }, { 0xCE5B, 0x5799 }, { 0xCE5C, 0x57A5 },
+	{ 0xCE5D, 0x579A }, { 0xCE5E, 0x5795 }, { 0xCE5F, 0x58F4 }, { 0xCE60, 0x590D }, { 0xCE61, 0x5953 }, { 0xCE62, 0x59E1 }, { 0xCE63, 0x59DE }, { 0xCE64, 0x59EE },
+	{ 0xCE65, 0x5A00 }, { 0xCE66, 0x59F1 }, { 0xCE67, 0x59DD }, { 0xCE68, 0x59FA }, { 0xCE69, 0x59FD }, { 0xCE6A, 0x59FC }, { 0xCE6B, 0x59F6 }, { 0xCE6C, 0x59E4 },
+	{ 0xCE6D, 0x59F2 }, { 0xCE6E, 0x59F7 }, { 0xCE6F, 0x59DB }, { 0xCE70, 0x59E9 }, { 0xCE71, 0x59F3 }, { 0xCE72, 0x59F5 }, { 0xCE73, 0x59E0 }, { 0xCE74, 0x59FE },
+	{ 0xCE75, 0x59F4 }, { 0xCE76, 0x59ED }, { 0xCE77, 0x5BA8 }, { 0xCE78, 0x5C4C }, { 0xCE79, 0x5CD0 }, { 0xCE7A, 0x5CD8 }, { 0xCE7B, 0x5CCC }, { 0xCE7C, 0x5CD7 },
+	{ 0xCE7D, 0x5CCB }, { 0xCE7E, 0x5CDB }, { 0xCEA1, 0x5CDE }, { 0xCEA2, 0x5CDA }, { 0xCEA3, 0x5CC9 }, { 0xCEA4, 0x5CC7 }, { 0xCEA5, 0x5CCA }, { 0xCEA6, 0x5CD6 },
+	{ 0xCEA7, 0x5CD3 }, { 0xCEA8, 0x5CD4 }, { 0xCEA9, 0x5CCF }, { 0xCEAA, 0x5CC8 }, { 0xCEAB, 0x5CC6 }, { 0xCEAC, 0x5CCE }, { 0xCEAD, 0x5CDF }, { 0xCEAE, 0x5CF8 },
+	{ 0xCEAF, 0x5DF9 }, { 0xCEB0, 0x5E21 }, { 0xCEB1, 0x5E22 }, { 0xCEB2, 0x5E23 }, { 0xCEB3, 0x5E20 }, { 0xCEB4, 0x5E24 }, { 0xCEB5, 0x5EB0 }, { 0xCEB6, 0x5EA4 },
+	{ 0xCEB7, 0x5EA2 }, { 0xCEB8, 0x5E9B }, { 0xCEB9, 0x5EA3 }, { 0xCEBA, 0x5EA5 }, { 0xCEBB, 0x5F07 }, { 0xCEBC, 0x5F2E }, { 0xCEBD, 0x5F56 }, { 0xCEBE, 0x5F86 },
+	{ 0xCEBF, 0x6037 }, { 0xCEC0, 0x6039 }, { 0xCEC1, 0x6054 }, { 0xCEC2, 0x6072 }, { 0xCEC3, 0x605E }, { 0xCEC4, 0x6045 }, { 0xCEC5, 0x6053 }, { 0xCEC6, 0x6047 },
+	{ 0xCEC7, 0x6049 }, { 0xCEC8, 0x605B }, { 0xCEC9, 0x604C }, { 0xCECA, 0x6040 }, { 0xCECB, 0x6042 }, { 0xCECC, 0x605F }, { 0xCECD, 0x6024 }, { 0xCECE, 0x6044 },
+	{ 0xCECF, 0x6058 }, { 0xCED0, 0x6066 }, { 0xCED1, 0x606E }, { 0xCED2, 0x6242 }, { 0xCED3, 0x6243 }, { 0xCED4, 0x62CF }, { 0xCED5, 0x630D }, { 0xCED6, 0x630B },
+	{ 0xCED7, 0x62F5 }, { 0xCED8, 0x630E }, { 0xCED9, 0x6303 }, { 0xCEDA, 0x62EB }, { 0xCEDB, 0x62F9 }, { 0xCEDC, 0x630F }, { 0xCEDD, 0x630C }, { 0xCEDE, 0x62F8 },
+	{ 0xCEDF, 0x62F6 }, { 0xCEE0, 0x6300 }, { 0xCEE1, 0x6313 }, { 0xCEE2, 0x6314 }, { 0xCEE3, 0x62FA }, { 0xCEE4, 0x6315 }, { 0xCEE5, 0x62FB }, { 0xCEE6, 0x62F0 },
+	{ 0xCEE7, 0x6541 }, { 0xCEE8, 0x6543 }, { 0xCEE9, 0x65AA }, { 0xCEEA, 0x65BF }, { 0xCEEB, 0x6636 }, { 0xCEEC, 0x6621 }, { 0xCEED, 0x6632 }, { 0xCEEE, 0x6635 },
+	{ 0xCEEF, 0x661C }, { 0xCEF0, 0x6626 }, { 0xCEF1, 0x6622 }, { 0xCEF2, 0x6633 }, { 0xCEF3, 0x662B }, { 0xCEF4, 0x663A }, { 0xCEF5, 0x661D }, { 0xCEF6, 0x6634 },
+	{ 0xCEF7, 0x6639 }, { 0xCEF8, 0x662E }, { 0xCEF9, 0x670F }, { 0xCEFA, 0x6710 }, { 0xCEFB, 0x67C1 }, { 0xCEFC, 0x67F2 }, { 0xCEFD, 0x67C8 }, { 0xCEFE, 0x67BA },
+	{ 0xCF40, 0x67DC }, { 0xCF41, 0x67BB }, { 0xCF42, 0x67F8 }, { 0xCF43, 0x67D8 }, { 0xCF44, 0x67C0 }, { 0xCF45, 0x67B7 }, { 0xCF46, 0x67C5 }, { 0xCF47, 0x67EB },
+	{ 0xCF48, 0x67E4 }, { 0xCF49, 0x67DF }, { 0xCF4A, 0x67B5 }, { 0xCF4B, 0x67CD }, { 0xCF4C, 0x67B3 }, { 0xCF4D, 0x67F7 }, { 0xCF4E, 0x67F6 }, { 0xCF4F, 0x67EE },
+	{ 0xCF50, 0x67E3 }, { 0xCF51, 0x67C2 }, { 0xCF52, 0x67B9 }, { 0xCF53, 0x67CE }, { 0xCF54, 0x67E7 }, { 0xCF55, 0x67F0 }, { 0xCF56, 0x67B2 }, { 0xCF57, 0x67FC },
+	{ 0xCF58, 0x67C6 }, { 0xCF59, 0x67ED }, { 0xCF5A, 0x67CC }, { 0xCF5B, 0x67AE }, { 0xCF5C, 0x67E6 }, { 0xCF5D, 0x67DB }, { 0xCF5E, 0x67FA }, { 0xCF5F, 0x67C9 },
+	{ 0xCF60, 0x67CA }, { 0xCF61, 0x67C3 }, { 0xCF62, 0x67EA }, { 0xCF63, 0x67CB }, { 0xCF64, 0x6B28 }, { 0xCF65, 0x6B82 }, { 0xCF66, 0x6B84 }, { 0xCF67, 0x6BB6 },
+	{ 0xCF68, 0x6BD6 }, { 0xCF69, 0x6BD8 }, { 0xCF6A, 0x6BE0 }, { 0xCF6B, 0x6C20 }, { 0xCF6C, 0x6C21 }, { 0xCF6D, 0x6D28 }, { 0xCF6E, 0x6D34 }, { 0xCF6F, 0x6D2D },
+	{ 0xCF70, 0x6D1F }, { 0xCF71, 0x6D3C }, { 0xCF72, 0x6D3F }, { 0xCF73, 0x6D12 }, { 0xCF74, 0x6D0A }, { 0xCF75, 0x6CDA }, { 0xCF76, 0x6D33 }, { 0xCF77, 0x6D04 },
+	{ 0xCF78, 0x6D19 }, { 0xCF79, 0x6D3A }, { 0xCF7A, 0x6D1A }, { 0xCF7B, 0x6D11 }, { 0xCF7C, 0x6D00 }, { 0xCF7D, 0x6D1D }, { 0xCF7E, 0x6D42 }, { 0xCFA1, 0x6D01 },
+	{ 0xCFA2, 0x6D18 }, { 0xCFA3, 0x6D37 }, { 0xCFA4, 0x6D03 }, { 0xCFA5, 0x6D0F }, { 0xCFA6, 0x6D40 }, { 0xCFA7, 0x6D07 }, { 0xCFA8, 0x6D20 }, { 0xCFA9, 0x6D2C },
+	{ 0xCFAA, 0x6D08 }, { 0xCFAB, 0x6D22 }, { 0xCFAC, 0x6D09 }, { 0xCFAD, 0x6D10 }, { 0xCFAE, 0x70B7 }, { 0xCFAF, 0x709F }, { 0xCFB0, 0x70BE }, { 0xCFB1, 0x70B1 },
+	{ 0xCFB2, 0x70B0 }, { 0xCFB3, 0x70A1 }, { 0xCFB4, 0x70B4 }, { 0xCFB5, 0x70B5 }, { 0xCFB6, 0x70A9 }, { 0xCFB7, 0x7241 }, { 0xCFB8, 0x7249 }, { 0xCFB9, 0x724A },
+	{ 0xCFBA, 0x726C }, { 0xCFBB, 0x7270 }, { 0xCFBC, 0x7273 }, { 0xCFBD, 0x726E }, { 0xCFBE, 0x72CA }, { 0xCFBF, 0x72E4 }, { 0xCFC0, 0x72E8 }, { 0xCFC1, 0x72EB },
+	{ 0xCFC2, 0x72DF }, { 0xCFC3, 0x72EA }, { 0xCFC4, 0x72E6 }, { 0xCFC5, 0x72E3 }, { 0xCFC6, 0x7385 }, { 0xCFC7, 0x73CC }, { 0xCFC8, 0x73C2 }, { 0xCFC9, 0x73C8 },
+	{ 0xCFCA, 0x73C5 }, { 0xCFCB, 0x73B9 }, { 0xCFCC, 0x73B6 }, { 0xCFCD, 0x73B5 }, { 0xCFCE, 0x73B4 }, { 0xCFCF, 0x73EB }, { 0xCFD0, 0x73BF }, { 0xCFD1, 0x73C7 },
+	{ 0xCFD2, 0x73BE }, { 0xCFD3, 0x73C3 }, { 0xCFD4, 0x73C6 }, { 0xCFD5, 0x73B8 }, { 0xCFD6, 0x73CB }, { 0xCFD7, 0x74EC }, { 0xCFD8, 0x74EE }, { 0xCFD9, 0x752E },
+	{ 0xCFDA, 0x7547 }, { 0xCFDB, 0x7548 }, { 0xCFDC, 0x75A7 }, { 0xCFDD, 0x75AA }, { 0xCFDE, 0x7679 }, { 0xCFDF, 0x76C4 }, { 0xCFE0, 0x7708 }, { 0xCFE1, 0x7703 },
+	{ 0xCFE2, 0x7704 }, { 0xCFE3, 0x7705 }, { 0xCFE4, 0x770A }, { 0xCFE5, 0x76F7 }, { 0xCFE6, 0x76FB }, { 0xCFE7, 0x76FA }, { 0xCFE8, 0x77E7 }, { 0xCFE9, 0x77E8 },
+	{ 0xCFEA, 0x7806 }, { 0xCFEB, 0x7811 }, { 0xCFEC, 0x7812 }, { 0xCFED, 0x7805 }, { 0xCFEE, 0x7810 }, { 0xCFEF, 0x780F }, { 0xCFF0, 0x780E }, { 0xCFF1, 0x7809 },
+	{ 0xCFF2, 0x7803 }, { 0xCFF3, 0x7813 }, { 0xCFF4, 0x794A }, { 0xCFF5, 0x794C }, { 0xCFF6, 0x794B }, { 0xCFF7, 0x7945 }, { 0xCFF8, 0x7944 }, { 0xCFF9, 0x79D5 },
+	{ 0xCFFA, 0x79CD }, { 0xCFFB, 0x79CF }, { 0xCFFC, 0x79D6 }, { 0xCFFD, 0x79CE }, { 0xCFFE, 0x7A80 }, { 0xD040, 0x7A7E }, { 0xD041, 0x7AD1 }, { 0xD042, 0x7B00 },
+	{ 0xD043, 0x7B01 }, { 0xD044, 0x7C7A }, { 0xD045, 0x7C78 }, { 0xD046, 0x7C79 }, { 0xD047, 0x7C7F }, { 0xD048, 0x7C80 }, { 0xD049, 0x7C81 }, { 0xD04A, 0x7D03 },
+	{ 0xD04B, 0x7D08 }, { 0xD04C, 0x7D01 }, { 0xD04D, 0x7F58 }, { 0xD04E, 0x7F91 }, { 0xD04F, 0x7F8D }, { 0xD050, 0x7FBE }, { 0xD051, 0x8007 }, { 0xD052, 0x800E },
+	{ 0xD053, 0x800F }, { 0xD054, 0x8014 }, { 0xD055, 0x8037 }, { 0xD056, 0x80D8 }, { 0xD057, 0x80C7 }, { 0xD058, 0x80E0 }, { 0xD059, 0x80D1 }, { 0xD05A, 0x80C8 },
+	{ 0xD05B, 0x80C2 }, { 0xD05C, 0x80D0 }, { 0xD05D, 0x80C5 }, { 0xD05E, 0x80E3 }, { 0xD05F, 0x80D9 }, { 0xD060, 0x80DC }, { 0xD061, 0x80CA }, { 0xD062, 0x80D5 },
+	{ 0xD063, 0x80C9 }, { 0xD064, 0x80CF }, { 0xD065, 0x80D7 }, { 0xD066, 0x80E6 }, { 0xD067, 0x80CD }, { 0xD068, 0x81FF }, { 0xD069, 0x8221 }, { 0xD06A, 0x8294 },
+	{ 0xD06B, 0x82D9 }, { 0xD06C, 0x82FE }, { 0xD06D, 0x82F9 }, { 0xD06E, 0x8307 }, { 0xD06F, 0x82E8 }, { 0xD070, 0x8300 }, { 0xD071, 0x82D5 }, { 0xD072, 0x833A },
+	{ 0xD073, 0x82EB }, { 0xD074, 0x82D6 }, { 0xD075, 0x82F4 }, { 0xD076, 0x82EC }, { 0xD077, 0x82E1 }, { 0xD078, 0x82F2 }, { 0xD079, 0x82F5 }, { 0xD07A, 0x830C },
+	{ 0xD07B, 0x82FB }, { 0xD07C, 0x82F6 }, { 0xD07D, 0x82F0 }, { 0xD07E, 0x82EA }, { 0xD0A1, 0x82E4 }, { 0xD0A2, 0x82E0 }, { 0xD0A3, 0x82FA }, { 0xD0A4, 0x82F3 },
+	{ 0xD0A5, 0x82ED }, { 0xD0A6, 0x8677 }, { 0xD0A7, 0x8674 }, { 0xD0A8, 0x867C }, { 0xD0A9, 0x8673 }, { 0xD0AA, 0x8841 }, { 0xD0AB, 0x884E }, { 0xD0AC, 0x8867 },
+	{ 0xD0AD, 0x886A }, { 0xD0AE, 0x8869 }, { 0xD0AF, 0x89D3 }, { 0xD0B0, 0x8A04 }, { 0xD0B1, 0x8A07 }, { 0xD0B2, 0x8D72 }, { 0xD0B3, 0x8FE3 }, { 0xD0B4, 0x8FE1 },
+	{ 0xD0B5, 0x8FEE }, { 0xD0B6, 0x8FE0 }, { 0xD0B7, 0x90F1 }, { 0xD0B8, 0x90BD }, { 0xD0B9, 0x90BF }, { 0xD0BA, 0x90D5 }, { 0xD0BB, 0x90C5 }, { 0xD0BC, 0x90BE },
+	{ 0xD0BD, 0x90C7 }, { 0xD0BE, 0x90CB }, { 0xD0BF, 0x90C8 }, { 0xD0C0, 0x91D4 }, { 0xD0C1, 0x91D3 }, { 0xD0C2, 0x9654 }, { 0xD0C3, 0x964F }, { 0xD0C4, 0x9651 },
+	{ 0xD0C5, 0x9653 }, { 0xD0C6, 0x964A }, { 0xD0C7, 0x964E }, { 0xD0C8, 0x501E }, { 0xD0C9, 0x5005 }, { 0xD0CA, 0x5007 }, { 0xD0CB, 0x5013 }, { 0xD0CC, 0x5022 },
+	{ 0xD0CD, 0x5030 }, { 0xD0CE, 0x501B }, { 0xD0CF, 0x4FF5 }, { 0xD0D0, 0x4FF4 }, { 0xD0D1, 0x5033 }, { 0xD0D2, 0x5037 }, { 0xD0D3, 0x502C }, { 0xD0D4, 0x4FF6 },
+	{ 0xD0D5, 0x4FF7 }, { 0xD0D6, 0x5017 }, { 0xD0D7, 0x501C }, { 0xD0D8, 0x5020 }, { 0xD0D9, 0x5027 }, { 0xD0DA, 0x5035 }, { 0xD0DB, 0x502F }, { 0xD0DC, 0x5031 },
+	{ 0xD0DD, 0x500E }, { 0xD0DE, 0x515A }, { 0xD0DF, 0x5194 }, { 0xD0E0, 0x5193 }, { 0xD0E1, 0x51CA }, { 0xD0E2, 0x51C4 }, { 0xD0E3, 0x51C5 }, { 0xD0E4, 0x51C8 },
+	{ 0xD0E5, 0x51CE }, { 0xD0E6, 0x5261 }, { 0xD0E7, 0x525A }, { 0xD0E8, 0x5252 }, { 0xD0E9, 0x525E }, { 0xD0EA, 0x525F }, { 0xD0EB, 0x5255 }, { 0xD0EC, 0x5262 },
+	{ 0xD0ED, 0x52CD }, { 0xD0EE, 0x530E }, { 0xD0EF, 0x539E }, { 0xD0F0, 0x5526 }, { 0xD0F1, 0x54E2 }, { 0xD0F2, 0x5517 }, { 0xD0F3, 0x5512 }, { 0xD0F4, 0x54E7 },
+	{ 0xD0F5, 0x54F3 }, { 0xD0F6, 0x54E4 }, { 0xD0F7, 0x551A }, { 0xD0F8, 0x54FF }, { 0xD0F9, 0x5504 }, { 0xD0FA, 0x5508 }, { 0xD0FB, 0x54EB }, { 0xD0FC, 0x5511 },
+	{ 0xD0FD, 0x5505 }, { 0xD0FE, 0x54F1 }, { 0xD140, 0x550A }, { 0xD141, 0x54FB }, { 0xD142, 0x54F7 }, { 0xD143, 0x54F8 }, { 0xD144, 0x54E0 }, { 0xD145, 0x550E },
+	{ 0xD146, 0x5503 }, { 0xD147, 0x550B }, { 0xD148, 0x5701 }, { 0xD149, 0x5702 }, { 0xD14A, 0x57CC }, { 0xD14B, 0x5832 }, { 0xD14C, 0x57D5 }, { 0xD14D, 0x57D2 },
+	{ 0xD14E, 0x57BA }, { 0xD14F, 0x57C6 }, { 0xD150, 0x57BD }, { 0xD151, 0x57BC }, { 0xD152, 0x57B8 }, { 0xD153, 0x57B6 }, { 0xD154, 0x57BF }, { 0xD155, 0x57C7 },
+	{ 0xD156, 0x57D0 }, { 0xD157, 0x57B9 }, { 0xD158, 0x57C1 }, { 0xD159, 0x590E }, { 0xD15A, 0x594A }, { 0xD15B, 0x5A19 }, { 0xD15C, 0x5A16 }, { 0xD15D, 0x5A2D },
+	{ 0xD15E, 0x5A2E }, { 0xD15F, 0x5A15 }, { 0xD160, 0x5A0F }, { 0xD161, 0x5A17 }, { 0xD162, 0x5A0A }, { 0xD163, 0x5A1E }, { 0xD164, 0x5A33 }, { 0xD165, 0x5B6C },
+	{ 0xD166, 0x5BA7 }, { 0xD167, 0x5BAD }, { 0xD168, 0x5BAC }, { 0xD169, 0x5C03 }, { 0xD16A, 0x5C56 }, { 0xD16B, 0x5C54 }, { 0xD16C, 0x5CEC }, { 0xD16D, 0x5CFF },
+	{ 0xD16E, 0x5CEE }, { 0xD16F, 0x5CF1 }, { 0xD170, 0x5CF7 }, { 0xD171, 0x5D00 }, { 0xD172, 0x5CF9 }, { 0xD173, 0x5E29 }, { 0xD174, 0x5E28 }, { 0xD175, 0x5EA8 },
+	{ 0xD176, 0x5EAE }, { 0xD177, 0x5EAA }, { 0xD178, 0x5EAC }, { 0xD179, 0x5F33 }, { 0xD17A, 0x5F30 }, { 0xD17B, 0x5F67 }, { 0xD17C, 0x605D }, { 0xD17D, 0x605A },
+	{ 0xD17E, 0x6067 }, { 0xD1A1, 0x6041 }, { 0xD1A2, 0x60A2 }, { 0xD1A3, 0x6088 }, { 0xD1A4, 0x6080 }, { 0xD1A5, 0x6092 }, { 0xD1A6, 0x6081 }, { 0xD1A7, 0x609D },
+	{ 0xD1A8, 0x6083 }, { 0xD1A9, 0x6095 }, { 0xD1AA, 0x609B }, { 0xD1AB, 0x6097 }, { 0xD1AC, 0x6087 }, { 0xD1AD, 0x609C }, { 0xD1AE, 0x608E }, { 0xD1AF, 0x6219 },
+	{ 0xD1B0, 0x6246 }, { 0xD1B1, 0x62F2 }, { 0xD1B2, 0x6310 }, { 0xD1B3, 0x6356 }, { 0xD1B4, 0x632C }, { 0xD1B5, 0x6344 }, { 0xD1B6, 0x6345 }, { 0xD1B7, 0x6336 },
+	{ 0xD1B8, 0x6343 }, { 0xD1B9, 0x63E4 }, { 0xD1BA, 0x6339 }, { 0xD1BB, 0x634B }, { 0xD1BC, 0x634A }, { 0xD1BD, 0x633C }, { 0xD1BE, 0x6329 }, { 0xD1BF, 0x6341 },
+	{ 0xD1C0, 0x6334 }, { 0xD1C1, 0x6358 }, { 0xD1C2, 0x6354 }, { 0xD1C3, 0x6359 }, { 0xD1C4, 0x632D }, { 0xD1C5, 0x6347 }, { 0xD1C6, 0x6333 }, { 0xD1C7, 0x635A },
+	{ 0xD1C8, 0x6351 }, { 0xD1C9, 0x6338 }, { 0xD1CA, 0x6357 }, { 0xD1CB, 0x6340 }, { 0xD1CC, 0x6348 }, { 0xD1CD, 0x654A }, { 0xD1CE, 0x6546 }, { 0xD1CF, 0x65C6 },
+	{ 0xD1D0, 0x65C3 }, { 0xD1D1, 0x65C4 }, { 0xD1D2, 0x65C2 }, { 0xD1D3, 0x664A }, { 0xD1D4, 0x665F }, { 0xD1D5, 0x6647 }, { 0xD1D6, 0x6651 }, { 0xD1D7, 0x6712 },
+	{ 0xD1D8, 0x6713 }, { 0xD1D9, 0x681F }, { 0xD1DA, 0x681A }, { 0xD1DB, 0x6849 }, { 0xD1DC, 0x6832 }, { 0xD1DD, 0x6833 }, { 0xD1DE, 0x683B }, { 0xD1DF, 0x684B },
+	{ 0xD1E0, 0x684F }, { 0xD1E1, 0x6816 }, { 0xD1E2, 0x6831 }, { 0xD1E3, 0x681C }, { 0xD1E4, 0x6835 }, { 0xD1E5, 0x682B }, { 0xD1E6, 0x682D }, { 0xD1E7, 0x682F },
+	{ 0xD1E8, 0x684E }, { 0xD1E9, 0x6844 }, { 0xD1EA, 0x6834 }, { 0xD1EB, 0x681D }, { 0xD1EC, 0x6812 }, { 0xD1ED, 0x6814 }, { 0xD1EE, 0x6826 }, { 0xD1EF, 0x6828 },
+	{ 0xD1F0, 0x682E }, { 0xD1F1, 0x684D }, { 0xD1F2, 0x683A }, { 0xD1F3, 0x6825 }, { 0xD1F4, 0x6820 }, { 0xD1F5, 0x6B2C }, { 0xD1F6, 0x6B2F }, { 0xD1F7, 0x6B2D },
+	{ 0xD1F8, 0x6B31 }, { 0xD1F9, 0x6B34 }, { 0xD1FA, 0x6B6D }, { 0xD1FB, 0x8082 }, { 0xD1FC, 0x6B88 }, { 0xD1FD, 0x6BE6 }, { 0xD1FE, 0x6BE4 }, { 0xD240, 0x6BE8 },
+	{ 0xD241, 0x6BE3 }, { 0xD242, 0x6BE2 }, { 0xD243, 0x6BE7 }, { 0xD244, 0x6C25 }, { 0xD245, 0x6D7A }, { 0xD246, 0x6D63 }, { 0xD247, 0x6D64 }, { 0xD248, 0x6D76 },
+	{ 0xD249, 0x6D0D }, { 0xD24A, 0x6D61 }, { 0xD24B, 0x6D92 }, { 0xD24C, 0x6D58 }, { 0xD24D, 0x6D62 }, { 0xD24E, 0x6D6D }, { 0xD24F, 0x6D6F }, { 0xD250, 0x6D91 },
+	{ 0xD251, 0x6D8D }, { 0xD252, 0x6DEF }, { 0xD253, 0x6D7F }, { 0xD254, 0x6D86 }, { 0xD255, 0x6D5E }, { 0xD256, 0x6D67 }, { 0xD257, 0x6D60 }, { 0xD258, 0x6D97 },
+	{ 0xD259, 0x6D70 }, { 0xD25A, 0x6D7C }, { 0xD25B, 0x6D5F }, { 0xD25C, 0x6D82 }, { 0xD25D, 0x6D98 }, { 0xD25E, 0x6D2F }, { 0xD25F, 0x6D68 }, { 0xD260, 0x6D8B },
+	{ 0xD261, 0x6D7E }, { 0xD262, 0x6D80 }, { 0xD263, 0x6D84 }, { 0xD264, 0x6D16 }, { 0xD265, 0x6D83 }, { 0xD266, 0x6D7B }, { 0xD267, 0x6D7D }, { 0xD268, 0x6D75 },
+	{ 0xD269, 0x6D90 }, { 0xD26A, 0x70DC }, { 0xD26B, 0x70D3 }, { 0xD26C, 0x70D1 }, { 0xD26D, 0x70DD }, { 0xD26E, 0x70CB }, { 0xD26F, 0x7F39 }, { 0xD270, 0x70E2 },
+	{ 0xD271, 0x70D7 }, { 0xD272, 0x70D2 }, { 0xD273, 0x70DE }, { 0xD274, 0x70E0 }, { 0xD275, 0x70D4 }, { 0xD276, 0x70CD }, { 0xD277, 0x70C5 }, { 0xD278, 0x70C6 },
+	{ 0xD279, 0x70C7 }, { 0xD27A, 0x70DA }, { 0xD27B, 0x70CE }, { 0xD27C, 0x70E1 }, { 0xD27D, 0x7242 }, { 0xD27E, 0x7278 }, { 0xD2A1, 0x7277 }, { 0xD2A2, 0x7276 },
+	{ 0xD2A3, 0x7300 }, { 0xD2A4, 0x72FA }, { 0xD2A5, 0x72F4 }, { 0xD2A6, 0x72FE }, { 0xD2A7, 0x72F6 }, { 0xD2A8, 0x72F3 }, { 0xD2A9, 0x72FB }, { 0xD2AA, 0x7301 },
+	{ 0xD2AB, 0x73D3 }, { 0xD2AC, 0x73D9 }, { 0xD2AD, 0x73E5 }, { 0xD2AE, 0x73D6 }, { 0xD2AF, 0x73BC }, { 0xD2B0, 0x73E7 }, { 0xD2B1, 0x73E3 }, { 0xD2B2, 0x73E9 },
+	{ 0xD2B3, 0x73DC }, { 0xD2B4, 0x73D2 }, { 0xD2B5, 0x73DB }, { 0xD2B6, 0x73D4 }, { 0xD2B7, 0x73DD }, { 0xD2B8, 0x73DA }, { 0xD2B9, 0x73D7 }, { 0xD2BA, 0x73D8 },
+	{ 0xD2BB, 0x73E8 }, { 0xD2BC, 0x74DE }, { 0xD2BD, 0x74DF }, { 0xD2BE, 0x74F4 }, { 0xD2BF, 0x74F5 }, { 0xD2C0, 0x7521 }, { 0xD2C1, 0x755B }, { 0xD2C2, 0x755F },
+	{ 0xD2C3, 0x75B0 }, { 0xD2C4, 0x75C1 }, { 0xD2C5, 0x75BB }, { 0xD2C6, 0x75C4 }, { 0xD2C7, 0x75C0 }, { 0xD2C8, 0x75BF }, { 0xD2C9, 0x75B6 }, { 0xD2CA, 0x75BA },
+	{ 0xD2CB, 0x768A }, { 0xD2CC, 0x76C9 }, { 0xD2CD, 0x771D }, { 0xD2CE, 0x771B }, { 0xD2CF, 0x7710 }, { 0xD2D0, 0x7713 }, { 0xD2D1, 0x7712 }, { 0xD2D2, 0x7723 },
+	{ 0xD2D3, 0x7711 }, { 0xD2D4, 0x7715 }, { 0xD2D5, 0x7719 }, { 0xD2D6, 0x771A }, { 0xD2D7, 0x7722 }, { 0xD2D8, 0x7727 }, { 0xD2D9, 0x7823 }, { 0xD2DA, 0x782C },
+	{ 0xD2DB, 0x7822 }, { 0xD2DC, 0x7835 }, { 0xD2DD, 0x782F }, { 0xD2DE, 0x7828 }, { 0xD2DF, 0x782E }, { 0xD2E0, 0x782B }, { 0xD2E1, 0x7821 }, { 0xD2E2, 0x7829 },
+	{ 0xD2E3, 0x7833 }, { 0xD2E4, 0x782A }, { 0xD2E5, 0x7831 }, { 0xD2E6, 0x7954 }, { 0xD2E7, 0x795B }, { 0xD2E8, 0x794F }, { 0xD2E9, 0x795C }, { 0xD2EA, 0x7953 },
+	{ 0xD2EB, 0x7952 }, { 0xD2EC, 0x7951 }, { 0xD2ED, 0x79EB }, { 0xD2EE, 0x79EC }, { 0xD2EF, 0x79E0 }, { 0xD2F0, 0x79EE }, { 0xD2F1, 0x79ED }, { 0xD2F2, 0x79EA },
+	{ 0xD2F3, 0x79DC }, { 0xD2F4, 0x79DE }, { 0xD2F5, 0x79DD }, { 0xD2F6, 0x7A86 }, { 0xD2F7, 0x7A89 }, { 0xD2F8, 0x7A85 }, { 0xD2F9, 0x7A8B }, { 0xD2FA, 0x7A8C },
+	{ 0xD2FB, 0x7A8A }, { 0xD2FC, 0x7A87 }, { 0xD2FD, 0x7AD8 }, { 0xD2FE, 0x7B10 }, { 0xD340, 0x7B04 }, { 0xD341, 0x7B13 }, { 0xD342, 0x7B05 }, { 0xD343, 0x7B0F },
+	{ 0xD344, 0x7B08 }, { 0xD345, 0x7B0A }, { 0xD346, 0x7B0E }, { 0xD347, 0x7B09 }, { 0xD348, 0x7B12 }, { 0xD349, 0x7C84 }, { 0xD34A, 0x7C91 }, { 0xD34B, 0x7C8A },
+	{ 0xD34C, 0x7C8C }, { 0xD34D, 0x7C88 }, { 0xD34E, 0x7C8D }, { 0xD34F, 0x7C85 }, { 0xD350, 0x7D1E }, { 0xD351, 0x7D1D }, { 0xD352, 0x7D11 }, { 0xD353, 0x7D0E },
+	{ 0xD354, 0x7D18 }, { 0xD355, 0x7D16 }, { 0xD356, 0x7D13 }, { 0xD357, 0x7D1F }, { 0xD358, 0x7D12 }, { 0xD359, 0x7D0F }, { 0xD35A, 0x7D0C }, { 0xD35B, 0x7F5C },
+	{ 0xD35C, 0x7F61 }, { 0xD35D, 0x7F5E }, { 0xD35E, 0x7F60 }, { 0xD35F, 0x7F5D }, { 0xD360, 0x7F5B }, { 0xD361, 0x7F96 }, { 0xD362, 0x7F92 }, { 0xD363, 0x7FC3 },
+	{ 0xD364, 0x7FC2 }, { 0xD365, 0x7FC0 }, { 0xD366, 0x8016 }, { 0xD367, 0x803E }, { 0xD368, 0x8039 }, { 0xD369, 0x80FA }, { 0xD36A, 0x80F2 }, { 0xD36B, 0x80F9 },
+	{ 0xD36C, 0x80F5 }, { 0xD36D, 0x8101 }, { 0xD36E, 0x80FB }, { 0xD36F, 0x8100 }, { 0xD370, 0x8201 }, { 0xD371, 0x822F }, { 0xD372, 0x8225 }, { 0xD373, 0x8333 },
+	{ 0xD374, 0x832D }, { 0xD375, 0x8344 }, { 0xD376, 0x8319 }, { 0xD377, 0x8351 }, { 0xD378, 0x8325 }, { 0xD379, 0x8356 }, { 0xD37A, 0x833F }, { 0xD37B, 0x8341 },
+	{ 0xD37C, 0x8326 }, { 0xD37D, 0x831C }, { 0xD37E, 0x8322 }, { 0xD3A1, 0x8342 }, { 0xD3A2, 0x834E }, { 0xD3A3, 0x831B }, { 0xD3A4, 0x832A }, { 0xD3A5, 0x8308 },
+	{ 0xD3A6, 0x833C }, { 0xD3A7, 0x834D }, { 0xD3A8, 0x8316 }, { 0xD3A9, 0x8324 }, { 0xD3AA, 0x8320 }, { 0xD3AB, 0x8337 }, { 0xD3AC, 0x832F }, { 0xD3AD, 0x8329 },
+	{ 0xD3AE, 0x8347 }, { 0xD3AF, 0x8345 }, { 0xD3B0, 0x834C }, { 0xD3B1, 0x8353 }, { 0xD3B2, 0x831E }, { 0xD3B3, 0x832C }, { 0xD3B4, 0x834B }, { 0xD3B5, 0x8327 },
+	{ 0xD3B6, 0x8348 }, { 0xD3B7, 0x8653 }, { 0xD3B8, 0x8652 }, { 0xD3B9, 0x86A2 }, { 0xD3BA, 0x86A8 }, { 0xD3BB, 0x8696 }, { 0xD3BC, 0x868D }, { 0xD3BD, 0x8691 },
+	{ 0xD3BE, 0x869E }, { 0xD3BF, 0x8687 }, { 0xD3C0, 0x8697 }, { 0xD3C1, 0x8686 }, { 0xD3C2, 0x868B }, { 0xD3C3, 0x869A }, { 0xD3C4, 0x8685 }, { 0xD3C5, 0x86A5 },
+	{ 0xD3C6, 0x8699 }, { 0xD3C7, 0x86A1 }, { 0xD3C8, 0x86A7 }, { 0xD3C9, 0x8695 }, { 0xD3CA, 0x8698 }, { 0xD3CB, 0x868E }, { 0xD3CC, 0x869D }, { 0xD3CD, 0x8690 },
+	{ 0xD3CE, 0x8694 }, { 0xD3CF, 0x8843 }, { 0xD3D0, 0x8844 }, { 0xD3D1, 0x886D }, { 0xD3D2, 0x8875 }, { 0xD3D3, 0x8876 }, { 0xD3D4, 0x8872 }, { 0xD3D5, 0x8880 },
+	{ 0xD3D6, 0x8871 }, { 0xD3D7, 0x887F }, { 0xD3D8, 0x886F }, { 0xD3D9, 0x8883 }, { 0xD3DA, 0x887E }, { 0xD3DB, 0x8874 }, { 0xD3DC, 0x887C }, { 0xD3DD, 0x8A12 },
+	{ 0xD3DE, 0x8C47 }, { 0xD3DF, 0x8C57 }, { 0xD3E0, 0x8C7B }, { 0xD3E1, 0x8CA4 }, { 0xD3E2, 0x8CA3 }, { 0xD3E3, 0x8D76 }, { 0xD3E4, 0x8D78 }, { 0xD3E5, 0x8DB5 },
+	{ 0xD3E6, 0x8DB7 }, { 0xD3E7, 0x8DB6 }, { 0xD3E8, 0x8ED1 }, { 0xD3E9, 0x8ED3 }, { 0xD3EA, 0x8FFE }, { 0xD3EB, 0x8FF5 }, { 0xD3EC, 0x9002 }, { 0xD3ED, 0x8FFF },
+	{ 0xD3EE, 0x8FFB }, { 0xD3EF, 0x9004 }, { 0xD3F0, 0x8FFC }, { 0xD3F1, 0x8FF6 }, { 0xD3F2, 0x90D6 }, { 0xD3F3, 0x90E0 }, { 0xD3F4, 0x90D9 }, { 0xD3F5, 0x90DA },
+	{ 0xD3F6, 0x90E3 }, { 0xD3F7, 0x90DF }, { 0xD3F8, 0x90E5 }, { 0xD3F9, 0x90D8 }, { 0xD3FA, 0x90DB }, { 0xD3FB, 0x90D7 }, { 0xD3FC, 0x90DC }, { 0xD3FD, 0x90E4 },
+	{ 0xD3FE, 0x9150 }, { 0xD440, 0x914E }, { 0xD441, 0x914F }, { 0xD442, 0x91D5 }, { 0xD443, 0x91E2 }, { 0xD444, 0x91DA }, { 0xD445, 0x965C }, { 0xD446, 0x965F },
+	{ 0xD447, 0x96BC }, { 0xD448, 0x98E3 }, { 0xD449, 0x9ADF }, { 0xD44A, 0x9B2F }, { 0xD44B, 0x4E7F }, { 0xD44C, 0x5070 }, { 0xD44D, 0x506A }, { 0xD44E, 0x5061 },
+	{ 0xD44F, 0x505E }, { 0xD450, 0x5060 }, { 0xD451, 0x5053 }, { 0xD452, 0x504B }, { 0xD453, 0x505D }, { 0xD454, 0x5072 }, { 0xD455, 0x5048 }, { 0xD456, 0x504D },
+	{ 0xD457, 0x5041 }, { 0xD458, 0x505B }, { 0xD459, 0x504A }, { 0xD45A, 0x5062 }, { 0xD45B, 0x5015 }, { 0xD45C, 0x5045 }, { 0xD45D, 0x505F }, { 0xD45E, 0x5069 },
+	{ 0xD45F, 0x506B }, { 0xD460, 0x5063 }, { 0xD461, 0x5064 }, { 0xD462, 0x5046 }, { 0xD463, 0x5040 }, { 0xD464, 0x506E }, { 0xD465, 0x5073 }, { 0xD466, 0x5057 },
+	{ 0xD467, 0x5051 }, { 0xD468, 0x51D0 }, { 0xD469, 0x526B }, { 0xD46A, 0x526D }, { 0xD46B, 0x526C }, { 0xD46C, 0x526E }, { 0xD46D, 0x52D6 }, { 0xD46E, 0x52D3 },
+	{ 0xD46F, 0x532D }, { 0xD470, 0x539C }, { 0xD471, 0x5575 }, { 0xD472, 0x5576 }, { 0xD473, 0x553C }, { 0xD474, 0x554D }, { 0xD475, 0x5550 }, { 0xD476, 0x5534 },
+	{ 0xD477, 0x552A }, { 0xD478, 0x5551 }, { 0xD479, 0x5562 }, { 0xD47A, 0x5536 }, { 0xD47B, 0x5535 }, { 0xD47C, 0x5530 }, { 0xD47D, 0x5552 }, { 0xD47E, 0x5545 },
+	{ 0xD4A1, 0x550C }, { 0xD4A2, 0x5532 }, { 0xD4A3, 0x5565 }, { 0xD4A4, 0x554E }, { 0xD4A5, 0x5539 }, { 0xD4A6, 0x5548 }, { 0xD4A7, 0x552D }, { 0xD4A8, 0x553B },
+	{ 0xD4A9, 0x5540 }, { 0xD4AA, 0x554B }, { 0xD4AB, 0x570A }, { 0xD4AC, 0x5707 }, { 0xD4AD, 0x57FB }, { 0xD4AE, 0x5814 }, { 0xD4AF, 0x57E2 }, { 0xD4B0, 0x57F6 },
+	{ 0xD4B1, 0x57DC }, { 0xD4B2, 0x57F4 }, { 0xD4B3, 0x5800 }, { 0xD4B4, 0x57ED }, { 0xD4B5, 0x57FD }, { 0xD4B6, 0x5808 }, { 0xD4B7, 0x57F8 }, { 0xD4B8, 0x580B },
+	{ 0xD4B9, 0x57F3 }, { 0xD4BA, 0x57CF }, { 0xD4BB, 0x5807 }, { 0xD4BC, 0x57EE }, { 0xD4BD, 0x57E3 }, { 0xD4BE, 0x57F2 }, { 0xD4BF, 0x57E5 }, { 0xD4C0, 0x57EC },
+	{ 0xD4C1, 0x57E1 }, { 0xD4C2, 0x580E }, { 0xD4C3, 0x57FC }, { 0xD4C4, 0x5810 }, { 0xD4C5, 0x57E7 }, { 0xD4C6, 0x5801 }, { 0xD4C7, 0x580C }, { 0xD4C8, 0x57F1 },
+	{ 0xD4C9, 0x57E9 }, { 0xD4CA, 0x57F0 }, { 0xD4CB, 0x580D }, { 0xD4CC, 0x5804 }, { 0xD4CD, 0x595C }, { 0xD4CE, 0x5A60 }, { 0xD4CF, 0x5A58 }, { 0xD4D0, 0x5A55 },
+	{ 0xD4D1, 0x5A67 }, { 0xD4D2, 0x5A5E }, { 0xD4D3, 0x5A38 }, { 0xD4D4, 0x5A35 }, { 0xD4D5, 0x5A6D }, { 0xD4D6, 0x5A50 }, { 0xD4D7, 0x5A5F }, { 0xD4D8, 0x5A65 },
+	{ 0xD4D9, 0x5A6C }, { 0xD4DA, 0x5A53 }, { 0xD4DB, 0x5A64 }, { 0xD4DC, 0x5A57 }, { 0xD4DD, 0x5A43 }, { 0xD4DE, 0x5A5D }, { 0xD4DF, 0x5A52 }, { 0xD4E0, 0x5A44 },
+	{ 0xD4E1, 0x5A5B }, { 0xD4E2, 0x5A48 }, { 0xD4E3, 0x5A8E }, { 0xD4E4, 0x5A3E }, { 0xD4E5, 0x5A4D }, { 0xD4E6, 0x5A39 }, { 0xD4E7, 0x5A4C }, { 0xD4E8, 0x5A70 },
+	{ 0xD4E9, 0x5A69 }, { 0xD4EA, 0x5A47 }, { 0xD4EB, 0x5A51 }, { 0xD4EC, 0x5A56 }, { 0xD4ED, 0x5A42 }, { 0xD4EE, 0x5A5C }, { 0xD4EF, 0x5B72 }, { 0xD4F0, 0x5B6E },
+	{ 0xD4F1, 0x5BC1 }, { 0xD4F2, 0x5BC0 }, { 0xD4F3, 0x5C59 }, { 0xD4F4, 0x5D1E }, { 0xD4F5, 0x5D0B }, { 0xD4F6, 0x5D1D }, { 0xD4F7, 0x5D1A }, { 0xD4F8, 0x5D20 },
+	{ 0xD4F9, 0x5D0C }, { 0xD4FA, 0x5D28 }, { 0xD4FB, 0x5D0D }, { 0xD4FC, 0x5D26 }, { 0xD4FD, 0x5D25 }, { 0xD4FE, 0x5D0F }, { 0xD540, 0x5D30 }, { 0xD541, 0x5D12 },
+	{ 0xD542, 0x5D23 }, { 0xD543, 0x5D1F }, { 0xD544, 0x5D2E }, { 0xD545, 0x5E3E }, { 0xD546, 0x5E34 }, { 0xD547, 0x5EB1 }, { 0xD548, 0x5EB4 }, { 0xD549, 0x5EB9 },
+	{ 0xD54A, 0x5EB2 }, { 0xD54B, 0x5EB3 }, { 0xD54C, 0x5F36 }, { 0xD54D, 0x5F38 }, { 0xD54E, 0x5F9B }, { 0xD54F, 0x5F96 }, { 0xD550, 0x5F9F }, { 0xD551, 0x608A },
+	{ 0xD552, 0x6090 }, { 0xD553, 0x6086 }, { 0xD554, 0x60BE }, { 0xD555, 0x60B0 }, { 0xD556, 0x60BA }, { 0xD557, 0x60D3 }, { 0xD558, 0x60D4 }, { 0xD559, 0x60CF },
+	{ 0xD55A, 0x60E4 }, { 0xD55B, 0x60D9 }, { 0xD55C, 0x60DD }, { 0xD55D, 0x60C8 }, { 0xD55E, 0x60B1 }, { 0xD55F, 0x60DB }, { 0xD560, 0x60B7 }, { 0xD561, 0x60CA },
+	{ 0xD562, 0x60BF }, { 0xD563, 0x60C3 }, { 0xD564, 0x60CD }, { 0xD565, 0x60C0 }, { 0xD566, 0x6332 }, { 0xD567, 0x6365 }, { 0xD568, 0x638A }, { 0xD569, 0x6382 },
+	{ 0xD56A, 0x637D }, { 0xD56B, 0x63BD }, { 0xD56C, 0x639E }, { 0xD56D, 0x63AD }, { 0xD56E, 0x639D }, { 0xD56F, 0x6397 }, { 0xD570, 0x63AB }, { 0xD571, 0x638E },
+	{ 0xD572, 0x636F }, { 0xD573, 0x6387 }, { 0xD574, 0x6390 }, { 0xD575, 0x636E }, { 0xD576, 0x63AF }, { 0xD577, 0x6375 }, { 0xD578, 0x639C }, { 0xD579, 0x636D },
+	{ 0xD57A, 0x63AE }, { 0xD57B, 0x637C }, { 0xD57C, 0x63A4 }, { 0xD57D, 0x633B }, { 0xD57E, 0x639F }, { 0xD5A1, 0x6378 }, { 0xD5A2, 0x6385 }, { 0xD5A3, 0x6381 },
+	{ 0xD5A4, 0x6391 }, { 0xD5A5, 0x638D }, { 0xD5A6, 0x6370 }, { 0xD5A7, 0x6553 }, { 0xD5A8, 0x65CD }, { 0xD5A9, 0x6665 }, { 0xD5AA, 0x6661 }, { 0xD5AB, 0x665B },
+	{ 0xD5AC, 0x6659 }, { 0xD5AD, 0x665C }, { 0xD5AE, 0x6662 }, { 0xD5AF, 0x6718 }, { 0xD5B0, 0x6879 }, { 0xD5B1, 0x6887 }, { 0xD5B2, 0x6890 }, { 0xD5B3, 0x689C },
+	{ 0xD5B4, 0x686D }, { 0xD5B5, 0x686E }, { 0xD5B6, 0x68AE }, { 0xD5B7, 0x68AB }, { 0xD5B8, 0x6956 }, { 0xD5B9, 0x686F }, { 0xD5BA, 0x68A3 }, { 0xD5BB, 0x68AC },
+	{ 0xD5BC, 0x68A9 }, { 0xD5BD, 0x6875 }, { 0xD5BE, 0x6874 }, { 0xD5BF, 0x68B2 }, { 0xD5C0, 0x688F }, { 0xD5C1, 0x6877 }, { 0xD5C2, 0x6892 }, { 0xD5C3, 0x687C },
+	{ 0xD5C4, 0x686B }, { 0xD5C5, 0x6872 }, { 0xD5C6, 0x68AA }, { 0xD5C7, 0x6880 }, { 0xD5C8, 0x6871 }, { 0xD5C9, 0x687E }, { 0xD5CA, 0x689B }, { 0xD5CB, 0x6896 },
+	{ 0xD5CC, 0x688B }, { 0xD5CD, 0x68A0 }, { 0xD5CE, 0x6889 }, { 0xD5CF, 0x68A4 }, { 0xD5D0, 0x6878 }, { 0xD5D1, 0x687B }, { 0xD5D2, 0x6891 }, { 0xD5D3, 0x688C },
+	{ 0xD5D4, 0x688A }, { 0xD5D5, 0x687D }, { 0xD5D6, 0x6B36 }, { 0xD5D7, 0x6B33 }, { 0xD5D8, 0x6B37 }, { 0xD5D9, 0x6B38 }, { 0xD5DA, 0x6B91 }, { 0xD5DB, 0x6B8F },
+	{ 0xD5DC, 0x6B8D }, { 0xD5DD, 0x6B8E }, { 0xD5DE, 0x6B8C }, { 0xD5DF, 0x6C2A }, { 0xD5E0, 0x6DC0 }, { 0xD5E1, 0x6DAB }, { 0xD5E2, 0x6DB4 }, { 0xD5E3, 0x6DB3 },
+	{ 0xD5E4, 0x6E74 }, { 0xD5E5, 0x6DAC }, { 0xD5E6, 0x6DE9 }, { 0xD5E7, 0x6DE2 }, { 0xD5E8, 0x6DB7 }, { 0xD5E9, 0x6DF6 }, { 0xD5EA, 0x6DD4 }, { 0xD5EB, 0x6E00 },
+	{ 0xD5EC, 0x6DC8 }, { 0xD5ED, 0x6DE0 }, { 0xD5EE, 0x6DDF }, { 0xD5EF, 0x6DD6 }, { 0xD5F0, 0x6DBE }, { 0xD5F1, 0x6DE5 }, { 0xD5F2, 0x6DDC }, { 0xD5F3, 0x6DDD },
+	{ 0xD5F4, 0x6DDB }, { 0xD5F5, 0x6DF4 }, { 0xD5F6, 0x6DCA }, { 0xD5F7, 0x6DBD }, { 0xD5F8, 0x6DED }, { 0xD5F9, 0x6DF0 }, { 0xD5FA, 0x6DBA }, { 0xD5FB, 0x6DD5 },
+	{ 0xD5FC, 0x6DC2 }, { 0xD5FD, 0x6DCF }, { 0xD5FE, 0x6DC9 }, { 0xD640, 0x6DD0 }, { 0xD641, 0x6DF2 }, { 0xD642, 0x6DD3 }, { 0xD643, 0x6DFD }, { 0xD644, 0x6DD7 },
+	{ 0xD645, 0x6DCD }, { 0xD646, 0x6DE3 }, { 0xD647, 0x6DBB }, { 0xD648, 0x70FA }, { 0xD649, 0x710D }, { 0xD64A, 0x70F7 }, { 0xD64B, 0x7117 }, { 0xD64C, 0x70F4 },
+	{ 0xD64D, 0x710C }, { 0xD64E, 0x70F0 }, { 0xD64F, 0x7104 }, { 0xD650, 0x70F3 }, { 0xD651, 0x7110 }, { 0xD652, 0x70FC }, { 0xD653, 0x70FF }, { 0xD654, 0x7106 },
+	{ 0xD655, 0x7113 }, { 0xD656, 0x7100 }, { 0xD657, 0x70F8 }, { 0xD658, 0x70F6 }, { 0xD659, 0x710B }, { 0xD65A, 0x7102 }, { 0xD65B, 0x710E }, { 0xD65C, 0x727E },
+	{ 0xD65D, 0x727B }, { 0xD65E, 0x727C }, { 0xD65F, 0x727F }, { 0xD660, 0x731D }, { 0xD661, 0x7317 }, { 0xD662, 0x7307 }, { 0xD663, 0x7311 }, { 0xD664, 0x7318 },
+	{ 0xD665, 0x730A }, { 0xD666, 0x7308 }, { 0xD667, 0x72FF }, { 0xD668, 0x730F }, { 0xD669, 0x731E }, { 0xD66A, 0x7388 }, { 0xD66B, 0x73F6 }, { 0xD66C, 0x73F8 },
+	{ 0xD66D, 0x73F5 }, { 0xD66E, 0x7404 }, { 0xD66F, 0x7401 }, { 0xD670, 0x73FD }, { 0xD671, 0x7407 }, { 0xD672, 0x7400 }, { 0xD673, 0x73FA }, { 0xD674, 0x73FC },
+	{ 0xD675, 0x73FF }, { 0xD676, 0x740C }, { 0xD677, 0x740B }, { 0xD678, 0x73F4 }, { 0xD679, 0x7408 }, { 0xD67A, 0x7564 }, { 0xD67B, 0x7563 }, { 0xD67C, 0x75CE },
+	{ 0xD67D, 0x75D2 }, { 0xD67E, 0x75CF }, { 0xD6A1, 0x75CB }, { 0xD6A2, 0x75CC }, { 0xD6A3, 0x75D1 }, { 0xD6A4, 0x75D0 }, { 0xD6A5, 0x768F }, { 0xD6A6, 0x7689 },
+	{ 0xD6A7, 0x76D3 }, { 0xD6A8, 0x7739 }, { 0xD6A9, 0x772F }, { 0xD6AA, 0x772D }, { 0xD6AB, 0x7731 }, { 0xD6AC, 0x7732 }, { 0xD6AD, 0x7734 }, { 0xD6AE, 0x7733 },
+	{ 0xD6AF, 0x773D }, { 0xD6B0, 0x7725 }, { 0xD6B1, 0x773B }, { 0xD6B2, 0x7735 }, { 0xD6B3, 0x7848 }, { 0xD6B4, 0x7852 }, { 0xD6B5, 0x7849 }, { 0xD6B6, 0x784D },
+	{ 0xD6B7, 0x784A }, { 0xD6B8, 0x784C }, { 0xD6B9, 0x7826 }, { 0xD6BA, 0x7845 }, { 0xD6BB, 0x7850 }, { 0xD6BC, 0x7964 }, { 0xD6BD, 0x7967 }, { 0xD6BE, 0x7969 },
+	{ 0xD6BF, 0x796A }, { 0xD6C0, 0x7963 }, { 0xD6C1, 0x796B }, { 0xD6C2, 0x7961 }, { 0xD6C3, 0x79BB }, { 0xD6C4, 0x79FA }, { 0xD6C5, 0x79F8 }, { 0xD6C6, 0x79F6 },
+	{ 0xD6C7, 0x79F7 }, { 0xD6C8, 0x7A8F }, { 0xD6C9, 0x7A94 }, { 0xD6CA, 0x7A90 }, { 0xD6CB, 0x7B35 }, { 0xD6CC, 0x7B47 }, { 0xD6CD, 0x7B34 }, { 0xD6CE, 0x7B25 },
+	{ 0xD6CF, 0x7B30 }, { 0xD6D0, 0x7B22 }, { 0xD6D1, 0x7B24 }, { 0xD6D2, 0x7B33 }, { 0xD6D3, 0x7B18 }, { 0xD6D4, 0x7B2A }, { 0xD6D5, 0x7B1D }, { 0xD6D6, 0x7B31 },
+	{ 0xD6D7, 0x7B2B }, { 0xD6D8, 0x7B2D }, { 0xD6D9, 0x7B2F }, { 0xD6DA, 0x7B32 }, { 0xD6DB, 0x7B38 }, { 0xD6DC, 0x7B1A }, { 0xD6DD, 0x7B23 }, { 0xD6DE, 0x7C94 },
+	{ 0xD6DF, 0x7C98 }, { 0xD6E0, 0x7C96 }, { 0xD6E1, 0x7CA3 }, { 0xD6E2, 0x7D35 }, { 0xD6E3, 0x7D3D }, { 0xD6E4, 0x7D38 }, { 0xD6E5, 0x7D36 }, { 0xD6E6, 0x7D3A },
+	{ 0xD6E7, 0x7D45 }, { 0xD6E8, 0x7D2C }, { 0xD6E9, 0x7D29 }, { 0xD6EA, 0x7D41 }, { 0xD6EB, 0x7D47 }, { 0xD6EC, 0x7D3E }, { 0xD6ED, 0x7D3F }, { 0xD6EE, 0x7D4A },
+	{ 0xD6EF, 0x7D3B }, { 0xD6F0, 0x7D28 }, { 0xD6F1, 0x7F63 }, { 0xD6F2, 0x7F95 }, { 0xD6F3, 0x7F9C }, { 0xD6F4, 0x7F9D }, { 0xD6F5, 0x7F9B }, { 0xD6F6, 0x7FCA },
+	{ 0xD6F7, 0x7FCB }, { 0xD6F8, 0x7FCD }, { 0xD6F9, 0x7FD0 }, { 0xD6FA, 0x7FD1 }, { 0xD6FB, 0x7FC7 }, { 0xD6FC, 0x7FCF }, { 0xD6FD, 0x7FC9 }, { 0xD6FE, 0x801F },
+	{ 0xD740, 0x801E }, { 0xD741, 0x801B }, { 0xD742, 0x8047 }, { 0xD743, 0x8043 }, { 0xD744, 0x8048 }, { 0xD745, 0x8118 }, { 0xD746, 0x8125 }, { 0xD747, 0x8119 },
+	{ 0xD748, 0x811B }, { 0xD749, 0x812D }, { 0xD74A, 0x811F }, { 0xD74B, 0x812C }, { 0xD74C, 0x811E }, { 0xD74D, 0x8121 }, { 0xD74E, 0x8115 }, { 0xD74F, 0x8127 },
+	{ 0xD750, 0x811D }, { 0xD751, 0x8122 }, { 0xD752, 0x8211 }, { 0xD753, 0x8238 }, { 0xD754, 0x8233 }, { 0xD755, 0x823A }, { 0xD756, 0x8234 }, { 0xD757, 0x8232 },
+	{ 0xD758, 0x8274 }, { 0xD759, 0x8390 }, { 0xD75A, 0x83A3 }, { 0xD75B, 0x83A8 }, { 0xD75C, 0x838D }, { 0xD75D, 0x837A }, { 0xD75E, 0x8373 }, { 0xD75F, 0x83A4 },
+	{ 0xD760, 0x8374 }, { 0xD761, 0x838F }, { 0xD762, 0x8381 }, { 0xD763, 0x8395 }, { 0xD764, 0x8399 }, { 0xD765, 0x8375 }, { 0xD766, 0x8394 }, { 0xD767, 0x83A9 },
+	{ 0xD768, 0x837D }, { 0xD769, 0x8383 }, { 0xD76A, 0x838C }, { 0xD76B, 0x839D }, { 0xD76C, 0x839B }, { 0xD76D, 0x83AA }, { 0xD76E, 0x838B }, { 0xD76F, 0x837E },
+	{ 0xD770, 0x83A5 }, { 0xD771, 0x83AF }, { 0xD772, 0x8388 }, { 0xD773, 0x8397 }, { 0xD774, 0x83B0 }, { 0xD775, 0x837F }, { 0xD776, 0x83A6 }, { 0xD777, 0x8387 },
+	{ 0xD778, 0x83AE }, { 0xD779, 0x8376 }, { 0xD77A, 0x839A }, { 0xD77B, 0x8659 }, { 0xD77C, 0x8656 }, { 0xD77D, 0x86BF }, { 0xD77E, 0x86B7 }, { 0xD7A1, 0x86C2 },
+	{ 0xD7A2, 0x86C1 }, { 0xD7A3, 0x86C5 }, { 0xD7A4, 0x86BA }, { 0xD7A5, 0x86B0 }, { 0xD7A6, 0x86C8 }, { 0xD7A7, 0x86B9 }, { 0xD7A8, 0x86B3 }, { 0xD7A9, 0x86B8 },
+	{ 0xD7AA, 0x86CC }, { 0xD7AB, 0x86B4 }, { 0xD7AC, 0x86BB }, { 0xD7AD, 0x86BC }, { 0xD7AE, 0x86C3 }, { 0xD7AF, 0x86BD }, { 0xD7B0, 0x86BE }, { 0xD7B1, 0x8852 },
+	{ 0xD7B2, 0x8889 }, { 0xD7B3, 0x8895 }, { 0xD7B4, 0x88A8 }, { 0xD7B5, 0x88A2 }, { 0xD7B6, 0x88AA }, { 0xD7B7, 0x889A }, { 0xD7B8, 0x8891 }, { 0xD7B9, 0x88A1 },
+	{ 0xD7BA, 0x889F }, { 0xD7BB, 0x8898 }, { 0xD7BC, 0x88A7 }, { 0xD7BD, 0x8899 }, { 0xD7BE, 0x889B }, { 0xD7BF, 0x8897 }, { 0xD7C0, 0x88A4 }, { 0xD7C1, 0x88AC },
+	{ 0xD7C2, 0x888C }, { 0xD7C3, 0x8893 }, { 0xD7C4, 0x888E }, { 0xD7C5, 0x8982 }, { 0xD7C6, 0x89D6 }, { 0xD7C7, 0x89D9 }, { 0xD7C8, 0x89D5 }, { 0xD7C9, 0x8A30 },
+	{ 0xD7CA, 0x8A27 }, { 0xD7CB, 0x8A2C }, { 0xD7CC, 0x8A1E }, { 0xD7CD, 0x8C39 }, { 0xD7CE, 0x8C3B }, { 0xD7CF, 0x8C5C }, { 0xD7D0, 0x8C5D }, { 0xD7D1, 0x8C7D },
+	{ 0xD7D2, 0x8CA5 }, { 0xD7D3, 0x8D7D }, { 0xD7D4, 0x8D7B }, { 0xD7D5, 0x8D79 }, { 0xD7D6, 0x8DBC }, { 0xD7D7, 0x8DC2 }, { 0xD7D8, 0x8DB9 }, { 0xD7D9, 0x8DBF },
+	{ 0xD7DA, 0x8DC1 }, { 0xD7DB, 0x8ED8 }, { 0xD7DC, 0x8EDE }, { 0xD7DD, 0x8EDD }, { 0xD7DE, 0x8EDC }, { 0xD7DF, 0x8ED7 }, { 0xD7E0, 0x8EE0 }, { 0xD7E1, 0x8EE1 },
+	{ 0xD7E2, 0x9024 }, { 0xD7E3, 0x900B }, { 0xD7E4, 0x9011 }, { 0xD7E5, 0x901C }, { 0xD7E6, 0x900C }, { 0xD7E7, 0x9021 }, { 0xD7E8, 0x90EF }, { 0xD7E9, 0x90EA },
+	{ 0xD7EA, 0x90F0 }, { 0xD7EB, 0x90F4 }, { 0xD7EC, 0x90F2 }, { 0xD7ED, 0x90F3 }, { 0xD7EE, 0x90D4 }, { 0xD7EF, 0x90EB }, { 0xD7F0, 0x90EC }, { 0xD7F1, 0x90E9 },
+	{ 0xD7F2, 0x9156 }, { 0xD7F3, 0x9158 }, { 0xD7F4, 0x915A }, { 0xD7F5, 0x9153 }, { 0xD7F6, 0x9155 }, { 0xD7F7, 0x91EC }, { 0xD7F8, 0x91F4 }, { 0xD7F9, 0x91F1 },
+	{ 0xD7FA, 0x91F3 }, { 0xD7FB, 0x91F8 }, { 0xD7FC, 0x91E4 }, { 0xD7FD, 0x91F9 }, { 0xD7FE, 0x91EA }, { 0xD840, 0x91EB }, { 0xD841, 0x91F7 }, { 0xD842, 0x91E8 },
+	{ 0xD843, 0x91EE }, { 0xD844, 0x957A }, { 0xD845, 0x9586 }, { 0xD846, 0x9588 }, { 0xD847, 0x967C }, { 0xD848, 0x966D }, { 0xD849, 0x966B }, { 0xD84A, 0x9671 },
+	{ 0xD84B, 0x966F }, { 0xD84C, 0x96BF }, { 0xD84D, 0x976A }, { 0xD84E, 0x9804 }, { 0xD84F, 0x98E5 }, { 0xD850, 0x9997 }, { 0xD851, 0x509B }, { 0xD852, 0x5095 },
+	{ 0xD853, 0x5094 }, { 0xD854, 0x509E }, { 0xD855, 0x508B }, { 0xD856, 0x50A3 }, { 0xD857, 0x5083 }, { 0xD858, 0x508C }, { 0xD859, 0x508E }, { 0xD85A, 0x509D },
+	{ 0xD85B, 0x5068 }, { 0xD85C, 0x509C }, { 0xD85D, 0x5092 }, { 0xD85E, 0x5082 }, { 0xD85F, 0x5087 }, { 0xD860, 0x515F }, { 0xD861, 0x51D4 }, { 0xD862, 0x5312 },
+	{ 0xD863, 0x5311 }, { 0xD864, 0x53A4 }, { 0xD865, 0x53A7 }, { 0xD866, 0x5591 }, { 0xD867, 0x55A8 }, { 0xD868, 0x55A5 }, { 0xD869, 0x55AD }, { 0xD86A, 0x5577 },
+	{ 0xD86B, 0x5645 }, { 0xD86C, 0x55A2 }, { 0xD86D, 0x5593 }, { 0xD86E, 0x5588 }, { 0xD86F, 0x558F }, { 0xD870, 0x55B5 }, { 0xD871, 0x5581 }, { 0xD872, 0x55A3 },
+	{ 0xD873, 0x5592 }, { 0xD874, 0x55A4 }, { 0xD875, 0x557D }, { 0xD876, 0x558C }, { 0xD877, 0x55A6 }, { 0xD878, 0x557F }, { 0xD879, 0x5595 }, { 0xD87A, 0x55A1 },
+	{ 0xD87B, 0x558E }, { 0xD87C, 0x570C }, { 0xD87D, 0x5829 }, { 0xD87E, 0x5837 }, { 0xD8A1, 0x5819 }, { 0xD8A2, 0x581E }, { 0xD8A3, 0x5827 }, { 0xD8A4, 0x5823 },
+	{ 0xD8A5, 0x5828 }, { 0xD8A6, 0x57F5 }, { 0xD8A7, 0x5848 }, { 0xD8A8, 0x5825 }, { 0xD8A9, 0x581C }, { 0xD8AA, 0x581B }, { 0xD8AB, 0x5833 }, { 0xD8AC, 0x583F },
+	{ 0xD8AD, 0x5836 }, { 0xD8AE, 0x582E }, { 0xD8AF, 0x5839 }, { 0xD8B0, 0x5838 }, { 0xD8B1, 0x582D }, { 0xD8B2, 0x582C }, { 0xD8B3, 0x583B }, { 0xD8B4, 0x5961 },
+	{ 0xD8B5, 0x5AAF }, { 0xD8B6, 0x5A94 }, { 0xD8B7, 0x5A9F }, { 0xD8B8, 0x5A7A }, { 0xD8B9, 0x5AA2 }, { 0xD8BA, 0x5A9E }, { 0xD8BB, 0x5A78 }, { 0xD8BC, 0x5AA6 },
+	{ 0xD8BD, 0x5A7C }, { 0xD8BE, 0x5AA5 }, { 0xD8BF, 0x5AAC }, { 0xD8C0, 0x5A95 }, { 0xD8C1, 0x5AAE }, { 0xD8C2, 0x5A37 }, { 0xD8C3, 0x5A84 }, { 0xD8C4, 0x5A8A },
+	{ 0xD8C5, 0x5A97 }, { 0xD8C6, 0x5A83 }, { 0xD8C7, 0x5A8B }, { 0xD8C8, 0x5AA9 }, { 0xD8C9, 0x5A7B }, { 0xD8CA, 0x5A7D }, { 0xD8CB, 0x5A8C }, { 0xD8CC, 0x5A9C },
+	{ 0xD8CD, 0x5A8F }, { 0xD8CE, 0x5A93 }, { 0xD8CF, 0x5A9D }, { 0xD8D0, 0x5BEA }, { 0xD8D1, 0x5BCD }, { 0xD8D2, 0x5BCB }, { 0xD8D3, 0x5BD4 }, { 0xD8D4, 0x5BD1 },
+	{ 0xD8D5, 0x5BCA }, { 0xD8D6, 0x5BCE }, { 0xD8D7, 0x5C0C }, { 0xD8D8, 0x5C30 }, { 0xD8D9, 0x5D37 }, { 0xD8DA, 0x5D43 }, { 0xD8DB, 0x5D6B }, { 0xD8DC, 0x5D41 },
+	{ 0xD8DD, 0x5D4B }, { 0xD8DE, 0x5D3F }, { 0xD8DF, 0x5D35 }, { 0xD8E0, 0x5D51 }, { 0xD8E1, 0x5D4E }, { 0xD8E2, 0x5D55 }, { 0xD8E3, 0x5D33 }, { 0xD8E4, 0x5D3A },
+	{ 0xD8E5, 0x5D52 }, { 0xD8E6, 0x5D3D }, { 0xD8E7, 0x5D31 }, { 0xD8E8, 0x5D59 }, { 0xD8E9, 0x5D42 }, { 0xD8EA, 0x5D39 }, { 0xD8EB, 0x5D49 }, { 0xD8EC, 0x5D38 },
+	{ 0xD8ED, 0x5D3C }, { 0xD8EE, 0x5D32 }, { 0xD8EF, 0x5D36 }, { 0xD8F0, 0x5D40 }, { 0xD8F1, 0x5D45 }, { 0xD8F2, 0x5E44 }, { 0xD8F3, 0x5E41 }, { 0xD8F4, 0x5F58 },
+	{ 0xD8F5, 0x5FA6 }, { 0xD8F6, 0x5FA5 }, { 0xD8F7, 0x5FAB }, { 0xD8F8, 0x60C9 }, { 0xD8F9, 0x60B9 }, { 0xD8FA, 0x60CC }, { 0xD8FB, 0x60E2 }, { 0xD8FC, 0x60CE },
+	{ 0xD8FD, 0x60C4 }, { 0xD8FE, 0x6114 }, { 0xD940, 0x60F2 }, { 0xD941, 0x610A }, { 0xD942, 0x6116 }, { 0xD943, 0x6105 }, { 0xD944, 0x60F5 }, { 0xD945, 0x6113 },
+	{ 0xD946, 0x60F8 }, { 0xD947, 0x60FC }, { 0xD948, 0x60FE }, { 0xD949, 0x60C1 }, { 0xD94A, 0x6103 }, { 0xD94B, 0x6118 }, { 0xD94C, 0x611D }, { 0xD94D, 0x6110 },
+	{ 0xD94E, 0x60FF }, { 0xD94F, 0x6104 }, { 0xD950, 0x610B }, { 0xD951, 0x624A }, { 0xD952, 0x6394 }, { 0xD953, 0x63B1 }, { 0xD954, 0x63B0 }, { 0xD955, 0x63CE },
+	{ 0xD956, 0x63E5 }, { 0xD957, 0x63E8 }, { 0xD958, 0x63EF }, { 0xD959, 0x63C3 }, { 0xD95A, 0x649D }, { 0xD95B, 0x63F3 }, { 0xD95C, 0x63CA }, { 0xD95D, 0x63E0 },
+	{ 0xD95E, 0x63F6 }, { 0xD95F, 0x63D5 }, { 0xD960, 0x63F2 }, { 0xD961, 0x63F5 }, { 0xD962, 0x6461 }, { 0xD963, 0x63DF }, { 0xD964, 0x63BE }, { 0xD965, 0x63DD },
+	{ 0xD966, 0x63DC }, { 0xD967, 0x63C4 }, { 0xD968, 0x63D8 }, { 0xD969, 0x63D3 }, { 0xD96A, 0x63C2 }, { 0xD96B, 0x63C7 }, { 0xD96C, 0x63CC }, { 0xD96D, 0x63CB },
+	{ 0xD96E, 0x63C8 }, { 0xD96F, 0x63F0 }, { 0xD970, 0x63D7 }, { 0xD971, 0x63D9 }, { 0xD972, 0x6532 }, { 0xD973, 0x6567 }, { 0xD974, 0x656A }, { 0xD975, 0x6564 },
+	{ 0xD976, 0x655C }, { 0xD977, 0x6568 }, { 0xD978, 0x6565 }, { 0xD979, 0x658C }, { 0xD97A, 0x659D }, { 0xD97B, 0x659E }, { 0xD97C, 0x65AE }, { 0xD97D, 0x65D0 },
+	{ 0xD97E, 0x65D2 }, { 0xD9A1, 0x667C }, { 0xD9A2, 0x666C }, { 0xD9A3, 0x667B }, { 0xD9A4, 0x6680 }, { 0xD9A5, 0x6671 }, { 0xD9A6, 0x6679 }, { 0xD9A7, 0x666A },
+	{ 0xD9A8, 0x6672 }, { 0xD9A9, 0x6701 }, { 0xD9AA, 0x690C }, { 0xD9AB, 0x68D3 }, { 0xD9AC, 0x6904 }, { 0xD9AD, 0x68DC }, { 0xD9AE, 0x692A }, { 0xD9AF, 0x68EC },
+	{ 0xD9B0, 0x68EA }, { 0xD9B1, 0x68F1 }, { 0xD9B2, 0x690F }, { 0xD9B3, 0x68D6 }, { 0xD9B4, 0x68F7 }, { 0xD9B5, 0x68EB }, { 0xD9B6, 0x68E4 }, { 0xD9B7, 0x68F6 },
+	{ 0xD9B8, 0x6913 }, { 0xD9B9, 0x6910 }, { 0xD9BA, 0x68F3 }, { 0xD9BB, 0x68E1 }, { 0xD9BC, 0x6907 }, { 0xD9BD, 0x68CC }, { 0xD9BE, 0x6908 }, { 0xD9BF, 0x6970 },
+	{ 0xD9C0, 0x68B4 }, { 0xD9C1, 0x6911 }, { 0xD9C2, 0x68EF }, { 0xD9C3, 0x68C6 }, { 0xD9C4, 0x6914 }, { 0xD9C5, 0x68F8 }, { 0xD9C6, 0x68D0 }, { 0xD9C7, 0x68FD },
+	{ 0xD9C8, 0x68FC }, { 0xD9C9, 0x68E8 }, { 0xD9CA, 0x690B }, { 0xD9CB, 0x690A }, { 0xD9CC, 0x6917 }, { 0xD9CD, 0x68CE }, { 0xD9CE, 0x68C8 }, { 0xD9CF, 0x68DD },
+	{ 0xD9D0, 0x68DE }, { 0xD9D1, 0x68E6 }, { 0xD9D2, 0x68F4 }, { 0xD9D3, 0x68D1 }, { 0xD9D4, 0x6906 }, { 0xD9D5, 0x68D4 }, { 0xD9D6, 0x68E9 }, { 0xD9D7, 0x6915 },
+	{ 0xD9D8, 0x6925 }, { 0xD9D9, 0x68C7 }, { 0xD9DA, 0x6B39 }, { 0xD9DB, 0x6B3B }, { 0xD9DC, 0x6B3F }, { 0xD9DD, 0x6B3C }, { 0xD9DE, 0x6B94 }, { 0xD9DF, 0x6B97 },
+	{ 0xD9E0, 0x6B99 }, { 0xD9E1, 0x6B95 }, { 0xD9E2, 0x6BBD }, { 0xD9E3, 0x6BF0 }, { 0xD9E4, 0x6BF2 }, { 0xD9E5, 0x6BF3 }, { 0xD9E6, 0x6C30 }, { 0xD9E7, 0x6DFC },
+	{ 0xD9E8, 0x6E46 }, { 0xD9E9, 0x6E47 }, { 0xD9EA, 0x6E1F }, { 0xD9EB, 0x6E49 }, { 0xD9EC, 0x6E88 }, { 0xD9ED, 0x6E3C }, { 0xD9EE, 0x6E3D }, { 0xD9EF, 0x6E45 },
+	{ 0xD9F0, 0x6E62 }, { 0xD9F1, 0x6E2B }, { 0xD9F2, 0x6E3F }, { 0xD9F3, 0x6E41 }, { 0xD9F4, 0x6E5D }, { 0xD9F5, 0x6E73 }, { 0xD9F6, 0x6E1C }, { 0xD9F7, 0x6E33 },
+	{ 0xD9F8, 0x6E4B }, { 0xD9F9, 0x6E40 }, { 0xD9FA, 0x6E51 }, { 0xD9FB, 0x6E3B }, { 0xD9FC, 0x6E03 }, { 0xD9FD, 0x6E2E }, { 0xD9FE, 0x6E5E }, { 0xDA40, 0x6E68 },
+	{ 0xDA41, 0x6E5C }, { 0xDA42, 0x6E61 }, { 0xDA43, 0x6E31 }, { 0xDA44, 0x6E28 }, { 0xDA45, 0x6E60 }, { 0xDA46, 0x6E71 }, { 0xDA47, 0x6E6B }, { 0xDA48, 0x6E39 },
+	{ 0xDA49, 0x6E22 }, { 0xDA4A, 0x6E30 }, { 0xDA4B, 0x6E53 }, { 0xDA4C, 0x6E65 }, { 0xDA4D, 0x6E27 }, { 0xDA4E, 0x6E78 }, { 0xDA4F, 0x6E64 }, { 0xDA50, 0x6E77 },
+	{ 0xDA51, 0x6E55 }, { 0xDA52, 0x6E79 }, { 0xDA53, 0x6E52 }, { 0xDA54, 0x6E66 }, { 0xDA55, 0x6E35 }, { 0xDA56, 0x6E36 }, { 0xDA57, 0x6E5A }, { 0xDA58, 0x7120 },
+	{ 0xDA59, 0x711E }, { 0xDA5A, 0x712F }, { 0xDA5B, 0x70FB }, { 0xDA5C, 0x712E }, { 0xDA5D, 0x7131 }, { 0xDA5E, 0x7123 }, { 0xDA5F, 0x7125 }, { 0xDA60, 0x7122 },
+	{ 0xDA61, 0x7132 }, { 0xDA62, 0x711F }, { 0xDA63, 0x7128 }, { 0xDA64, 0x713A }, { 0xDA65, 0x711B }, { 0xDA66, 0x724B }, { 0xDA67, 0x725A }, { 0xDA68, 0x7288 },
+	{ 0xDA69, 0x7289 }, { 0xDA6A, 0x7286 }, { 0xDA6B, 0x7285 }, { 0xDA6C, 0x728B }, { 0xDA6D, 0x7312 }, { 0xDA6E, 0x730B }, { 0xDA6F, 0x7330 }, { 0xDA70, 0x7322 },
+	{ 0xDA71, 0x7331 }, { 0xDA72, 0x7333 }, { 0xDA73, 0x7327 }, { 0xDA74, 0x7332 }, { 0xDA75, 0x732D }, { 0xDA76, 0x7326 }, { 0xDA77, 0x7323 }, { 0xDA78, 0x7335 },
+	{ 0xDA79, 0x730C }, { 0xDA7A, 0x742E }, { 0xDA7B, 0x742C }, { 0xDA7C, 0x7430 }, { 0xDA7D, 0x742B }, { 0xDA7E, 0x7416 }, { 0xDAA1, 0x741A }, { 0xDAA2, 0x7421 },
+	{ 0xDAA3, 0x742D }, { 0xDAA4, 0x7431 }, { 0xDAA5, 0x7424 }, { 0xDAA6, 0x7423 }, { 0xDAA7, 0x741D }, { 0xDAA8, 0x7429 }, { 0xDAA9, 0x7420 }, { 0xDAAA, 0x7432 },
+	{ 0xDAAB, 0x74FB }, { 0xDAAC, 0x752F }, { 0xDAAD, 0x756F }, { 0xDAAE, 0x756C }, { 0xDAAF, 0x75E7 }, { 0xDAB0, 0x75DA }, { 0xDAB1, 0x75E1 }, { 0xDAB2, 0x75E6 },
+	{ 0xDAB3, 0x75DD }, { 0xDAB4, 0x75DF }, { 0xDAB5, 0x75E4 }, { 0xDAB6, 0x75D7 }, { 0xDAB7, 0x7695 }, { 0xDAB8, 0x7692 }, { 0xDAB9, 0x76DA }, { 0xDABA, 0x7746 },
+	{ 0xDABB, 0x7747 }, { 0xDABC, 0x7744 }, { 0xDABD, 0x774D }, { 0xDABE, 0x7745 }, { 0xDABF, 0x774A }, { 0xDAC0, 0x774E }, { 0xDAC1, 0x774B }, { 0xDAC2, 0x774C },
+	{ 0xDAC3, 0x77DE }, { 0xDAC4, 0x77EC }, { 0xDAC5, 0x7860 }, { 0xDAC6, 0x7864 }, { 0xDAC7, 0x7865 }, { 0xDAC8, 0x785C }, { 0xDAC9, 0x786D }, { 0xDACA, 0x7871 },
+	{ 0xDACB, 0x786A }, { 0xDACC, 0x786E }, { 0xDACD, 0x7870 }, { 0xDACE, 0x7869 }, { 0xDACF, 0x7868 }, { 0xDAD0, 0x785E }, { 0xDAD1, 0x7862 }, { 0xDAD2, 0x7974 },
+	{ 0xDAD3, 0x7973 }, { 0xDAD4, 0x7972 }, { 0xDAD5, 0x7970 }, { 0xDAD6, 0x7A02 }, { 0xDAD7, 0x7A0A }, { 0xDAD8, 0x7A03 }, { 0xDAD9, 0x7A0C }, { 0xDADA, 0x7A04 },
+	{ 0xDADB, 0x7A99 }, { 0xDADC, 0x7AE6 }, { 0xDADD, 0x7AE4 }, { 0xDADE, 0x7B4A }, { 0xDADF, 0x7B3B }, { 0xDAE0, 0x7B44 }, { 0xDAE1, 0x7B48 }, { 0xDAE2, 0x7B4C },
+	{ 0xDAE3, 0x7B4E }, { 0xDAE4, 0x7B40 }, { 0xDAE5, 0x7B58 }, { 0xDAE6, 0x7B45 }, { 0xDAE7, 0x7CA2 }, { 0xDAE8, 0x7C9E }, { 0xDAE9, 0x7CA8 }, { 0xDAEA, 0x7CA1 },
+	{ 0xDAEB, 0x7D58 }, { 0xDAEC, 0x7D6F }, { 0xDAED, 0x7D63 }, { 0xDAEE, 0x7D53 }, { 0xDAEF, 0x7D56 }, { 0xDAF0, 0x7D67 }, { 0xDAF1, 0x7D6A }, { 0xDAF2, 0x7D4F },
+	{ 0xDAF3, 0x7D6D }, { 0xDAF4, 0x7D5C }, { 0xDAF5, 0x7D6B }, { 0xDAF6, 0x7D52 }, { 0xDAF7, 0x7D54 }, { 0xDAF8, 0x7D69 }, { 0xDAF9, 0x7D51 }, { 0xDAFA, 0x7D5F },
+	{ 0xDAFB, 0x7D4E }, { 0xDAFC, 0x7F3E }, { 0xDAFD, 0x7F3F }, { 0xDAFE, 0x7F65 }, { 0xDB40, 0x7F66 }, { 0xDB41, 0x7FA2 }, { 0xDB42, 0x7FA0 }, { 0xDB43, 0x7FA1 },
+	{ 0xDB44, 0x7FD7 }, { 0xDB45, 0x8051 }, { 0xDB46, 0x804F }, { 0xDB47, 0x8050 }, { 0xDB48, 0x80FE }, { 0xDB49, 0x80D4 }, { 0xDB4A, 0x8143 }, { 0xDB4B, 0x814A },
+	{ 0xDB4C, 0x8152 }, { 0xDB4D, 0x814F }, { 0xDB4E, 0x8147 }, { 0xDB4F, 0x813D }, { 0xDB50, 0x814D }, { 0xDB51, 0x813A }, { 0xDB52, 0x81E6 }, { 0xDB53, 0x81EE },
+	{ 0xDB54, 0x81F7 }, { 0xDB55, 0x81F8 }, { 0xDB56, 0x81F9 }, { 0xDB57, 0x8204 }, { 0xDB58, 0x823C }, { 0xDB59, 0x823D }, { 0xDB5A, 0x823F }, { 0xDB5B, 0x8275 },
+	{ 0xDB5C, 0x833B }, { 0xDB5D, 0x83CF }, { 0xDB5E, 0x83F9 }, { 0xDB5F, 0x8423 }, { 0xDB60, 0x83C0 }, { 0xDB61, 0x83E8 }, { 0xDB62, 0x8412 }, { 0xDB63, 0x83E7 },
+	{ 0xDB64, 0x83E4 }, { 0xDB65, 0x83FC }, { 0xDB66, 0x83F6 }, { 0xDB67, 0x8410 }, { 0xDB68, 0x83C6 }, { 0xDB69, 0x83C8 }, { 0xDB6A, 0x83EB }, { 0xDB6B, 0x83E3 },
+	{ 0xDB6C, 0x83BF }, { 0xDB6D, 0x8401 }, { 0xDB6E, 0x83DD }, { 0xDB6F, 0x83E5 }, { 0xDB70, 0x83D8 }, { 0xDB71, 0x83FF }, { 0xDB72, 0x83E1 }, { 0xDB73, 0x83CB },
+	{ 0xDB74, 0x83CE }, { 0xDB75, 0x83D6 }, { 0xDB76, 0x83F5 }, { 0xDB77, 0x83C9 }, { 0xDB78, 0x8409 }, { 0xDB79, 0x840F }, { 0xDB7A, 0x83DE }, { 0xDB7B, 0x8411 },
+	{ 0xDB7C, 0x8406 }, { 0xDB7D, 0x83C2 }, { 0xDB7E, 0x83F3 }, { 0xDBA1, 0x83D5 }, { 0xDBA2, 0x83FA }, { 0xDBA3, 0x83C7 }, { 0xDBA4, 0x83D1 }, { 0xDBA5, 0x83EA },
+	{ 0xDBA6, 0x8413 }, { 0xDBA7, 0x83C3 }, { 0xDBA8, 0x83EC }, { 0xDBA9, 0x83EE }, { 0xDBAA, 0x83C4 }, { 0xDBAB, 0x83FB }, { 0xDBAC, 0x83D7 }, { 0xDBAD, 0x83E2 },
+	{ 0xDBAE, 0x841B }, { 0xDBAF, 0x83DB }, { 0xDBB0, 0x83FE }, { 0xDBB1, 0x86D8 }, { 0xDBB2, 0x86E2 }, { 0xDBB3, 0x86E6 }, { 0xDBB4, 0x86D3 }, { 0xDBB5, 0x86E3 },
+	{ 0xDBB6, 0x86DA }, { 0xDBB7, 0x86EA }, { 0xDBB8, 0x86DD }, { 0xDBB9, 0x86EB }, { 0xDBBA, 0x86DC }, { 0xDBBB, 0x86EC }, { 0xDBBC, 0x86E9 }, { 0xDBBD, 0x86D7 },
+	{ 0xDBBE, 0x86E8 }, { 0xDBBF, 0x86D1 }, { 0xDBC0, 0x8848 }, { 0xDBC1, 0x8856 }, { 0xDBC2, 0x8855 }, { 0xDBC3, 0x88BA }, { 0xDBC4, 0x88D7 }, { 0xDBC5, 0x88B9 },
+	{ 0xDBC6, 0x88B8 }, { 0xDBC7, 0x88C0 }, { 0xDBC8, 0x88BE }, { 0xDBC9, 0x88B6 }, { 0xDBCA, 0x88BC }, { 0xDBCB, 0x88B7 }, { 0xDBCC, 0x88BD }, { 0xDBCD, 0x88B2 },
+	{ 0xDBCE, 0x8901 }, { 0xDBCF, 0x88C9 }, { 0xDBD0, 0x8995 }, { 0xDBD1, 0x8998 }, { 0xDBD2, 0x8997 }, { 0xDBD3, 0x89DD }, { 0xDBD4, 0x89DA }, { 0xDBD5, 0x89DB },
+	{ 0xDBD6, 0x8A4E }, { 0xDBD7, 0x8A4D }, { 0xDBD8, 0x8A39 }, { 0xDBD9, 0x8A59 }, { 0xDBDA, 0x8A40 }, { 0xDBDB, 0x8A57 }, { 0xDBDC, 0x8A58 }, { 0xDBDD, 0x8A44 },
+	{ 0xDBDE, 0x8A45 }, { 0xDBDF, 0x8A52 }, { 0xDBE0, 0x8A48 }, { 0xDBE1, 0x8A51 }, { 0xDBE2, 0x8A4A }, { 0xDBE3, 0x8A4C }, { 0xDBE4, 0x8A4F }, { 0xDBE5, 0x8C5F },
+	{ 0xDBE6, 0x8C81 }, { 0xDBE7, 0x8C80 }, { 0xDBE8, 0x8CBA }, { 0xDBE9, 0x8CBE }, { 0xDBEA, 0x8CB0 }, { 0xDBEB, 0x8CB9 }, { 0xDBEC, 0x8CB5 }, { 0xDBED, 0x8D84 },
+	{ 0xDBEE, 0x8D80 }, { 0xDBEF, 0x8D89 }, { 0xDBF0, 0x8DD8 }, { 0xDBF1, 0x8DD3 }, { 0xDBF2, 0x8DCD }, { 0xDBF3, 0x8DC7 }, { 0xDBF4, 0x8DD6 }, { 0xDBF5, 0x8DDC },
+	{ 0xDBF6, 0x8DCF }, { 0xDBF7, 0x8DD5 }, { 0xDBF8, 0x8DD9 }, { 0xDBF9, 0x8DC8 }, { 0xDBFA, 0x8DD7 }, { 0xDBFB, 0x8DC5 }, { 0xDBFC, 0x8EEF }, { 0xDBFD, 0x8EF7 },
+	{ 0xDBFE, 0x8EFA }, { 0xDC40, 0x8EF9 }, { 0xDC41, 0x8EE6 }, { 0xDC42, 0x8EEE }, { 0xDC43, 0x8EE5 }, { 0xDC44, 0x8EF5 }, { 0xDC45, 0x8EE7 }, { 0xDC46, 0x8EE8 },
+	{ 0xDC47, 0x8EF6 }, { 0xDC48, 0x8EEB }, { 0xDC49, 0x8EF1 }, { 0xDC4A, 0x8EEC }, { 0xDC4B, 0x8EF4 }, { 0xDC4C, 0x8EE9 }, { 0xDC4D, 0x902D }, { 0xDC4E, 0x9034 },
+	{ 0xDC4F, 0x902F }, { 0xDC50, 0x9106 }, { 0xDC51, 0x912C }, { 0xDC52, 0x9104 }, { 0xDC53, 0x90FF }, { 0xDC54, 0x90FC }, { 0xDC55, 0x9108 }, { 0xDC56, 0x90F9 },
+	{ 0xDC57, 0x90FB }, { 0xDC58, 0x9101 }, { 0xDC59, 0x9100 }, { 0xDC5A, 0x9107 }, { 0xDC5B, 0x9105 }, { 0xDC5C, 0x9103 }, { 0xDC5D, 0x9161 }, { 0xDC5E, 0x9164 },
+	{ 0xDC5F, 0x915F }, { 0xDC60, 0x9162 }, { 0xDC61, 0x9160 }, { 0xDC62, 0x9201 }, { 0xDC63, 0x920A }, { 0xDC64, 0x9225 }, { 0xDC65, 0x9203 }, { 0xDC66, 0x921A },
+	{ 0xDC67, 0x9226 }, { 0xDC68, 0x920F }, { 0xDC69, 0x920C }, { 0xDC6A, 0x9200 }, { 0xDC6B, 0x9212 }, { 0xDC6C, 0x91FF }, { 0xDC6D, 0x91FD }, { 0xDC6E, 0x9206 },
+	{ 0xDC6F, 0x9204 }, { 0xDC70, 0x9227 }, { 0xDC71, 0x9202 }, { 0xDC72, 0x921C }, { 0xDC73, 0x9224 }, { 0xDC74, 0x9219 }, { 0xDC75, 0x9217 }, { 0xDC76, 0x9205 },
+	{ 0xDC77, 0x9216 }, { 0xDC78, 0x957B }, { 0xDC79, 0x958D }, { 0xDC7A, 0x958C }, { 0xDC7B, 0x9590 }, { 0xDC7C, 0x9687 }, { 0xDC7D, 0x967E }, { 0xDC7E, 0x9688 },
+	{ 0xDCA1, 0x9689 }, { 0xDCA2, 0x9683 }, { 0xDCA3, 0x9680 }, { 0xDCA4, 0x96C2 }, { 0xDCA5, 0x96C8 }, { 0xDCA6, 0x96C3 }, { 0xDCA7, 0x96F1 }, { 0xDCA8, 0x96F0 },
+	{ 0xDCA9, 0x976C }, { 0xDCAA, 0x9770 }, { 0xDCAB, 0x976E }, { 0xDCAC, 0x9807 }, { 0xDCAD, 0x98A9 }, { 0xDCAE, 0x98EB }, { 0xDCAF, 0x9CE6 }, { 0xDCB0, 0x9EF9 },
+	{ 0xDCB1, 0x4E83 }, { 0xDCB2, 0x4E84 }, { 0xDCB3, 0x4EB6 }, { 0xDCB4, 0x50BD }, { 0xDCB5, 0x50BF }, { 0xDCB6, 0x50C6 }, { 0xDCB7, 0x50AE }, { 0xDCB8, 0x50C4 },
+	{ 0xDCB9, 0x50CA }, { 0xDCBA, 0x50B4 }, { 0xDCBB, 0x50C8 }, { 0xDCBC, 0x50C2 }, { 0xDCBD, 0x50B0 }, { 0xDCBE, 0x50C1 }, { 0xDCBF, 0x50BA }, { 0xDCC0, 0x50B1 },
+	{ 0xDCC1, 0x50CB }, { 0xDCC2, 0x50C9 }, { 0xDCC3, 0x50B6 }, { 0xDCC4, 0x50B8 }, { 0xDCC5, 0x51D7 }, { 0xDCC6, 0x527A }, { 0xDCC7, 0x5278 }, { 0xDCC8, 0x527B },
+	{ 0xDCC9, 0x527C }, { 0xDCCA, 0x55C3 }, { 0xDCCB, 0x55DB }, { 0xDCCC, 0x55CC }, { 0xDCCD, 0x55D0 }, { 0xDCCE, 0x55CB }, { 0xDCCF, 0x55CA }, { 0xDCD0, 0x55DD },
+	{ 0xDCD1, 0x55C0 }, { 0xDCD2, 0x55D4 }, { 0xDCD3, 0x55C4 }, { 0xDCD4, 0x55E9 }, { 0xDCD5, 0x55BF }, { 0xDCD6, 0x55D2 }, { 0xDCD7, 0x558D }, { 0xDCD8, 0x55CF },
+	{ 0xDCD9, 0x55D5 }, { 0xDCDA, 0x55E2 }, { 0xDCDB, 0x55D6 }, { 0xDCDC, 0x55C8 }, { 0xDCDD, 0x55F2 }, { 0xDCDE, 0x55CD }, { 0xDCDF, 0x55D9 }, { 0xDCE0, 0x55C2 },
+	{ 0xDCE1, 0x5714 }, { 0xDCE2, 0x5853 }, { 0xDCE3, 0x5868 }, { 0xDCE4, 0x5864 }, { 0xDCE5, 0x584F }, { 0xDCE6, 0x584D }, { 0xDCE7, 0x5849 }, { 0xDCE8, 0x586F },
+	{ 0xDCE9, 0x5855 }, { 0xDCEA, 0x584E }, { 0xDCEB, 0x585D }, { 0xDCEC, 0x5859 }, { 0xDCED, 0x5865 }, { 0xDCEE, 0x585B }, { 0xDCEF, 0x583D }, { 0xDCF0, 0x5863 },
+	{ 0xDCF1, 0x5871 }, { 0xDCF2, 0x58FC }, { 0xDCF3, 0x5AC7 }, { 0xDCF4, 0x5AC4 }, { 0xDCF5, 0x5ACB }, { 0xDCF6, 0x5ABA }, { 0xDCF7, 0x5AB8 }, { 0xDCF8, 0x5AB1 },
+	{ 0xDCF9, 0x5AB5 }, { 0xDCFA, 0x5AB0 }, { 0xDCFB, 0x5ABF }, { 0xDCFC, 0x5AC8 }, { 0xDCFD, 0x5ABB }, { 0xDCFE, 0x5AC6 }, { 0xDD40, 0x5AB7 }, { 0xDD41, 0x5AC0 },
+	{ 0xDD42, 0x5ACA }, { 0xDD43, 0x5AB4 }, { 0xDD44, 0x5AB6 }, { 0xDD45, 0x5ACD }, { 0xDD46, 0x5AB9 }, { 0xDD47, 0x5A90 }, { 0xDD48, 0x5BD6 }, { 0xDD49, 0x5BD8 },
+	{ 0xDD4A, 0x5BD9 }, { 0xDD4B, 0x5C1F }, { 0xDD4C, 0x5C33 }, { 0xDD4D, 0x5D71 }, { 0xDD4E, 0x5D63 }, { 0xDD4F, 0x5D4A }, { 0xDD50, 0x5D65 }, { 0xDD51, 0x5D72 },
+	{ 0xDD52, 0x5D6C }, { 0xDD53, 0x5D5E }, { 0xDD54, 0x5D68 }, { 0xDD55, 0x5D67 }, { 0xDD56, 0x5D62 }, { 0xDD57, 0x5DF0 }, { 0xDD58, 0x5E4F }, { 0xDD59, 0x5E4E },
+	{ 0xDD5A, 0x5E4A }, { 0xDD5B, 0x5E4D }, { 0xDD5C, 0x5E4B }, { 0xDD5D, 0x5EC5 }, { 0xDD5E, 0x5ECC }, { 0xDD5F, 0x5EC6 }, { 0xDD60, 0x5ECB }, { 0xDD61, 0x5EC7 },
+	{ 0xDD62, 0x5F40 }, { 0xDD63, 0x5FAF }, { 0xDD64, 0x5FAD }, { 0xDD65, 0x60F7 }, { 0xDD66, 0x6149 }, { 0xDD67, 0x614A }, { 0xDD68, 0x612B }, { 0xDD69, 0x6145 },
+	{ 0xDD6A, 0x6136 }, { 0xDD6B, 0x6132 }, { 0xDD6C, 0x612E }, { 0xDD6D, 0x6146 }, { 0xDD6E, 0x612F }, { 0xDD6F, 0x614F }, { 0xDD70, 0x6129 }, { 0xDD71, 0x6140 },
+	{ 0xDD72, 0x6220 }, { 0xDD73, 0x9168 }, { 0xDD74, 0x6223 }, { 0xDD75, 0x6225 }, { 0xDD76, 0x6224 }, { 0xDD77, 0x63C5 }, { 0xDD78, 0x63F1 }, { 0xDD79, 0x63EB },
+	{ 0xDD7A, 0x6410 }, { 0xDD7B, 0x6412 }, { 0xDD7C, 0x6409 }, { 0xDD7D, 0x6420 }, { 0xDD7E, 0x6424 }, { 0xDDA1, 0x6433 }, { 0xDDA2, 0x6443 }, { 0xDDA3, 0x641F },
+	{ 0xDDA4, 0x6415 }, { 0xDDA5, 0x6418 }, { 0xDDA6, 0x6439 }, { 0xDDA7, 0x6437 }, { 0xDDA8, 0x6422 }, { 0xDDA9, 0x6423 }, { 0xDDAA, 0x640C }, { 0xDDAB, 0x6426 },
+	{ 0xDDAC, 0x6430 }, { 0xDDAD, 0x6428 }, { 0xDDAE, 0x6441 }, { 0xDDAF, 0x6435 }, { 0xDDB0, 0x642F }, { 0xDDB1, 0x640A }, { 0xDDB2, 0x641A }, { 0xDDB3, 0x6440 },
+	{ 0xDDB4, 0x6425 }, { 0xDDB5, 0x6427 }, { 0xDDB6, 0x640B }, { 0xDDB7, 0x63E7 }, { 0xDDB8, 0x641B }, { 0xDDB9, 0x642E }, { 0xDDBA, 0x6421 }, { 0xDDBB, 0x640E },
+	{ 0xDDBC, 0x656F }, { 0xDDBD, 0x6592 }, { 0xDDBE, 0x65D3 }, { 0xDDBF, 0x6686 }, { 0xDDC0, 0x668C }, { 0xDDC1, 0x6695 }, { 0xDDC2, 0x6690 }, { 0xDDC3, 0x668B },
+	{ 0xDDC4, 0x668A }, { 0xDDC5, 0x6699 }, { 0xDDC6, 0x6694 }, { 0xDDC7, 0x6678 }, { 0xDDC8, 0x6720 }, { 0xDDC9, 0x6966 }, { 0xDDCA, 0x695F }, { 0xDDCB, 0x6938 },
+	{ 0xDDCC, 0x694E }, { 0xDDCD, 0x6962 }, { 0xDDCE, 0x6971 }, { 0xDDCF, 0x693F }, { 0xDDD0, 0x6945 }, { 0xDDD1, 0x696A }, { 0xDDD2, 0x6939 }, { 0xDDD3, 0x6942 },
+	{ 0xDDD4, 0x6957 }, { 0xDDD5, 0x6959 }, { 0xDDD6, 0x697A }, { 0xDDD7, 0x6948 }, { 0xDDD8, 0x6949 }, { 0xDDD9, 0x6935 }, { 0xDDDA, 0x696C }, { 0xDDDB, 0x6933 },
+	{ 0xDDDC, 0x693D }, { 0xDDDD, 0x6965 }, { 0xDDDE, 0x68F0 }, { 0xDDDF, 0x6978 }, { 0xDDE0, 0x6934 }, { 0xDDE1, 0x6969 }, { 0xDDE2, 0x6940 }, { 0xDDE3, 0x696F },
+	{ 0xDDE4, 0x6944 }, { 0xDDE5, 0x6976 }, { 0xDDE6, 0x6958 }, { 0xDDE7, 0x6941 }, { 0xDDE8, 0x6974 }, { 0xDDE9, 0x694C }, { 0xDDEA, 0x693B }, { 0xDDEB, 0x694B },
+	{ 0xDDEC, 0x6937 }, { 0xDDED, 0x695C }, { 0xDDEE, 0x694F }, { 0xDDEF, 0x6951 }, { 0xDDF0, 0x6932 }, { 0xDDF1, 0x6952 }, { 0xDDF2, 0x692F }, { 0xDDF3, 0x697B },
+	{ 0xDDF4, 0x693C }, { 0xDDF5, 0x6B46 }, { 0xDDF6, 0x6B45 }, { 0xDDF7, 0x6B43 }, { 0xDDF8, 0x6B42 }, { 0xDDF9, 0x6B48 }, { 0xDDFA, 0x6B41 }, { 0xDDFB, 0x6B9B },
+	{ 0xDDFC, 0xFA0D }, { 0xDDFD, 0x6BFB }, { 0xDDFE, 0x6BFC }, { 0xDE40, 0x6BF9 }, { 0xDE41, 0x6BF7 }, { 0xDE42, 0x6BF8 }, { 0xDE43, 0x6E9B }, { 0xDE44, 0x6ED6 },
+	{ 0xDE45, 0x6EC8 }, { 0xDE46, 0x6E8F }, { 0xDE47, 0x6EC0 }, { 0xDE48, 0x6E9F }, { 0xDE49, 0x6E93 }, { 0xDE4A, 0x6E94 }, { 0xDE4B, 0x6EA0 }, { 0xDE4C, 0x6EB1 },
+	{ 0xDE4D, 0x6EB9 }, { 0xDE4E, 0x6EC6 }, { 0xDE4F, 0x6ED2 }, { 0xDE50, 0x6EBD }, { 0xDE51, 0x6EC1 }, { 0xDE52, 0x6E9E }, { 0xDE53, 0x6EC9 }, { 0xDE54, 0x6EB7 },
+	{ 0xDE55, 0x6EB0 }, { 0xDE56, 0x6ECD }, { 0xDE57, 0x6EA6 }, { 0xDE58, 0x6ECF }, { 0xDE59, 0x6EB2 }, { 0xDE5A, 0x6EBE }, { 0xDE5B, 0x6EC3 }, { 0xDE5C, 0x6EDC },
+	{ 0xDE5D, 0x6ED8 }, { 0xDE5E, 0x6E99 }, { 0xDE5F, 0x6E92 }, { 0xDE60, 0x6E8E }, { 0xDE61, 0x6E8D }, { 0xDE62, 0x6EA4 }, { 0xDE63, 0x6EA1 }, { 0xDE64, 0x6EBF },
+	{ 0xDE65, 0x6EB3 }, { 0xDE66, 0x6ED0 }, { 0xDE67, 0x6ECA }, { 0xDE68, 0x6E97 }, { 0xDE69, 0x6EAE }, { 0xDE6A, 0x6EA3 }, { 0xDE6B, 0x7147 }, { 0xDE6C, 0x7154 },
+	{ 0xDE6D, 0x7152 }, { 0xDE6E, 0x7163 }, { 0xDE6F, 0x7160 }, { 0xDE70, 0x7141 }, { 0xDE71, 0x715D }, { 0xDE72, 0x7162 }, { 0xDE73, 0x7172 }, { 0xDE74, 0x7178 },
+	{ 0xDE75, 0x716A }, { 0xDE76, 0x7161 }, { 0xDE77, 0x7142 }, { 0xDE78, 0x7158 }, { 0xDE79, 0x7143 }, { 0xDE7A, 0x714B }, { 0xDE7B, 0x7170 }, { 0xDE7C, 0x715F },
+	{ 0xDE7D, 0x7150 }, { 0xDE7E, 0x7153 }, { 0xDEA1, 0x7144 }, { 0xDEA2, 0x714D }, { 0xDEA3, 0x715A }, { 0xDEA4, 0x724F }, { 0xDEA5, 0x728D }, { 0xDEA6, 0x728C },
+	{ 0xDEA7, 0x7291 }, { 0xDEA8, 0x7290 }, { 0xDEA9, 0x728E }, { 0xDEAA, 0x733C }, { 0xDEAB, 0x7342 }, { 0xDEAC, 0x733B }, { 0xDEAD, 0x733A }, { 0xDEAE, 0x7340 },
+	{ 0xDEAF, 0x734A }, { 0xDEB0, 0x7349 }, { 0xDEB1, 0x7444 }, { 0xDEB2, 0x744A }, { 0xDEB3, 0x744B }, { 0xDEB4, 0x7452 }, { 0xDEB5, 0x7451 }, { 0xDEB6, 0x7457 },
+	{ 0xDEB7, 0x7440 }, { 0xDEB8, 0x744F }, { 0xDEB9, 0x7450 }, { 0xDEBA, 0x744E }, { 0xDEBB, 0x7442 }, { 0xDEBC, 0x7446 }, { 0xDEBD, 0x744D }, { 0xDEBE, 0x7454 },
+	{ 0xDEBF, 0x74E1 }, { 0xDEC0, 0x74FF }, { 0xDEC1, 0x74FE }, { 0xDEC2, 0x74FD }, { 0xDEC3, 0x751D }, { 0xDEC4, 0x7579 }, { 0xDEC5, 0x7577 }, { 0xDEC6, 0x6983 },
+	{ 0xDEC7, 0x75EF }, { 0xDEC8, 0x760F }, { 0xDEC9, 0x7603 }, { 0xDECA, 0x75F7 }, { 0xDECB, 0x75FE }, { 0xDECC, 0x75FC }, { 0xDECD, 0x75F9 }, { 0xDECE, 0x75F8 },
+	{ 0xDECF, 0x7610 }, { 0xDED0, 0x75FB }, { 0xDED1, 0x75F6 }, { 0xDED2, 0x75ED }, { 0xDED3, 0x75F5 }, { 0xDED4, 0x75FD }, { 0xDED5, 0x7699 }, { 0xDED6, 0x76B5 },
+	{ 0xDED7, 0x76DD }, { 0xDED8, 0x7755 }, { 0xDED9, 0x775F }, { 0xDEDA, 0x7760 }, { 0xDEDB, 0x7752 }, { 0xDEDC, 0x7756 }, { 0xDEDD, 0x775A }, { 0xDEDE, 0x7769 },
+	{ 0xDEDF, 0x7767 }, { 0xDEE0, 0x7754 }, { 0xDEE1, 0x7759 }, { 0xDEE2, 0x776D }, { 0xDEE3, 0x77E0 }, { 0xDEE4, 0x7887 }, { 0xDEE5, 0x789A }, { 0xDEE6, 0x7894 },
+	{ 0xDEE7, 0x788F }, { 0xDEE8, 0x7884 }, { 0xDEE9, 0x7895 }, { 0xDEEA, 0x7885 }, { 0xDEEB, 0x7886 }, { 0xDEEC, 0x78A1 }, { 0xDEED, 0x7883 }, { 0xDEEE, 0x7879 },
+	{ 0xDEEF, 0x7899 }, { 0xDEF0, 0x7880 }, { 0xDEF1, 0x7896 }, { 0xDEF2, 0x787B }, { 0xDEF3, 0x797C }, { 0xDEF4, 0x7982 }, { 0xDEF5, 0x797D }, { 0xDEF6, 0x7979 },
+	{ 0xDEF7, 0x7A11 }, { 0xDEF8, 0x7A18 }, { 0xDEF9, 0x7A19 }, { 0xDEFA, 0x7A12 }, { 0xDEFB, 0x7A17 }, { 0xDEFC, 0x7A15 }, { 0xDEFD, 0x7A22 }, { 0xDEFE, 0x7A13 },
+	{ 0xDF40, 0x7A1B }, { 0xDF41, 0x7A10 }, { 0xDF42, 0x7AA3 }, { 0xDF43, 0x7AA2 }, { 0xDF44, 0x7A9E }, { 0xDF45, 0x7AEB }, { 0xDF46, 0x7B66 }, { 0xDF47, 0x7B64 },
+	{ 0xDF48, 0x7B6D }, { 0xDF49, 0x7B74 }, { 0xDF4A, 0x7B69 }, { 0xDF4B, 0x7B72 }, { 0xDF4C, 0x7B65 }, { 0xDF4D, 0x7B73 }, { 0xDF4E, 0x7B71 }, { 0xDF4F, 0x7B70 },
+	{ 0xDF50, 0x7B61 }, { 0xDF51, 0x7B78 }, { 0xDF52, 0x7B76 }, { 0xDF53, 0x7B63 }, { 0xDF54, 0x7CB2 }, { 0xDF55, 0x7CB4 }, { 0xDF56, 0x7CAF }, { 0xDF57, 0x7D88 },
+	{ 0xDF58, 0x7D86 }, { 0xDF59, 0x7D80 }, { 0xDF5A, 0x7D8D }, { 0xDF5B, 0x7D7F }, { 0xDF5C, 0x7D85 }, { 0xDF5D, 0x7D7A }, { 0xDF5E, 0x7D8E }, { 0xDF5F, 0x7D7B },
+	{ 0xDF60, 0x7D83 }, { 0xDF61, 0x7D7C }, { 0xDF62, 0x7D8C }, { 0xDF63, 0x7D94 }, { 0xDF64, 0x7D84 }, { 0xDF65, 0x7D7D }, { 0xDF66, 0x7D92 }, { 0xDF67, 0x7F6D },
+	{ 0xDF68, 0x7F6B }, { 0xDF69, 0x7F67 }, { 0xDF6A, 0x7F68 }, { 0xDF6B, 0x7F6C }, { 0xDF6C, 0x7FA6 }, { 0xDF6D, 0x7FA5 }, { 0xDF6E, 0x7FA7 }, { 0xDF6F, 0x7FDB },
+	{ 0xDF70, 0x7FDC }, { 0xDF71, 0x8021 }, { 0xDF72, 0x8164 }, { 0xDF73, 0x8160 }, { 0xDF74, 0x8177 }, { 0xDF75, 0x815C }, { 0xDF76, 0x8169 }, { 0xDF77, 0x815B },
+	{ 0xDF78, 0x8162 }, { 0xDF79, 0x8172 }, { 0xDF7A, 0x6721 }, { 0xDF7B, 0x815E }, { 0xDF7C, 0x8176 }, { 0xDF7D, 0x8167 }, { 0xDF7E, 0x816F }, { 0xDFA1, 0x8144 },
+	{ 0xDFA2, 0x8161 }, { 0xDFA3, 0x821D }, { 0xDFA4, 0x8249 }, { 0xDFA5, 0x8244 }, { 0xDFA6, 0x8240 }, { 0xDFA7, 0x8242 }, { 0xDFA8, 0x8245 }, { 0xDFA9, 0x84F1 },
+	{ 0xDFAA, 0x843F }, { 0xDFAB, 0x8456 }, { 0xDFAC, 0x8476 }, { 0xDFAD, 0x8479 }, { 0xDFAE, 0x848F }, { 0xDFAF, 0x848D }, { 0xDFB0, 0x8465 }, { 0xDFB1, 0x8451 },
+	{ 0xDFB2, 0x8440 }, { 0xDFB3, 0x8486 }, { 0xDFB4, 0x8467 }, { 0xDFB5, 0x8430 }, { 0xDFB6, 0x844D }, { 0xDFB7, 0x847D }, { 0xDFB8, 0x845A }, { 0xDFB9, 0x8459 },
+	{ 0xDFBA, 0x8474 }, { 0xDFBB, 0x8473 }, { 0xDFBC, 0x845D }, { 0xDFBD, 0x8507 }, { 0xDFBE, 0x845E }, { 0xDFBF, 0x8437 }, { 0xDFC0, 0x843A }, { 0xDFC1, 0x8434 },
+	{ 0xDFC2, 0x847A }, { 0xDFC3, 0x8443 }, { 0xDFC4, 0x8478 }, { 0xDFC5, 0x8432 }, { 0xDFC6, 0x8445 }, { 0xDFC7, 0x8429 }, { 0xDFC8, 0x83D9 }, { 0xDFC9, 0x844B },
+	{ 0xDFCA, 0x842F }, { 0xDFCB, 0x8442 }, { 0xDFCC, 0x842D }, { 0xDFCD, 0x845F }, { 0xDFCE, 0x8470 }, { 0xDFCF, 0x8439 }, { 0xDFD0, 0x844E }, { 0xDFD1, 0x844C },
+	{ 0xDFD2, 0x8452 }, { 0xDFD3, 0x846F }, { 0xDFD4, 0x84C5 }, { 0xDFD5, 0x848E }, { 0xDFD6, 0x843B }, { 0xDFD7, 0x8447 }, { 0xDFD8, 0x8436 }, { 0xDFD9, 0x8433 },
+	{ 0xDFDA, 0x8468 }, { 0xDFDB, 0x847E }, { 0xDFDC, 0x8444 }, { 0xDFDD, 0x842B }, { 0xDFDE, 0x8460 }, { 0xDFDF, 0x8454 }, { 0xDFE0, 0x846E }, { 0xDFE1, 0x8450 },
+	{ 0xDFE2, 0x870B }, { 0xDFE3, 0x8704 }, { 0xDFE4, 0x86F7 }, { 0xDFE5, 0x870C }, { 0xDFE6, 0x86FA }, { 0xDFE7, 0x86D6 }, { 0xDFE8, 0x86F5 }, { 0xDFE9, 0x874D },
+	{ 0xDFEA, 0x86F8 }, { 0xDFEB, 0x870E }, { 0xDFEC, 0x8709 }, { 0xDFED, 0x8701 }, { 0xDFEE, 0x86F6 }, { 0xDFEF, 0x870D }, { 0xDFF0, 0x8705 }, { 0xDFF1, 0x88D6 },
+	{ 0xDFF2, 0x88CB }, { 0xDFF3, 0x88CD }, { 0xDFF4, 0x88CE }, { 0xDFF5, 0x88DE }, { 0xDFF6, 0x88DB }, { 0xDFF7, 0x88DA }, { 0xDFF8, 0x88CC }, { 0xDFF9, 0x88D0 },
+	{ 0xDFFA, 0x8985 }, { 0xDFFB, 0x899B }, { 0xDFFC, 0x89DF }, { 0xDFFD, 0x89E5 }, { 0xDFFE, 0x89E4 }, { 0xE040, 0x89E1 }, { 0xE041, 0x89E0 }, { 0xE042, 0x89E2 },
+	{ 0xE043, 0x89DC }, { 0xE044, 0x89E6 }, { 0xE045, 0x8A76 }, { 0xE046, 0x8A86 }, { 0xE047, 0x8A7F }, { 0xE048, 0x8A61 }, { 0xE049, 0x8A3F }, { 0xE04A, 0x8A77 },
+	{ 0xE04B, 0x8A82 }, { 0xE04C, 0x8A84 }, { 0xE04D, 0x8A75 }, { 0xE04E, 0x8A83 }, { 0xE04F, 0x8A81 }, { 0xE050, 0x8A74 }, { 0xE051, 0x8A7A }, { 0xE052, 0x8C3C },
+	{ 0xE053, 0x8C4B }, { 0xE054, 0x8C4A }, { 0xE055, 0x8C65 }, { 0xE056, 0x8C64 }, { 0xE057, 0x8C66 }, { 0xE058, 0x8C86 }, { 0xE059, 0x8C84 }, { 0xE05A, 0x8C85 },
+	{ 0xE05B, 0x8CCC }, { 0xE05C, 0x8D68 }, { 0xE05D, 0x8D69 }, { 0xE05E, 0x8D91 }, { 0xE05F, 0x8D8C }, { 0xE060, 0x8D8E }, { 0xE061, 0x8D8F }, { 0xE062, 0x8D8D },
+	{ 0xE063, 0x8D93 }, { 0xE064, 0x8D94 }, { 0xE065, 0x8D90 }, { 0xE066, 0x8D92 }, { 0xE067, 0x8DF0 }, { 0xE068, 0x8DE0 }, { 0xE069, 0x8DEC }, { 0xE06A, 0x8DF1 },
+	{ 0xE06B, 0x8DEE }, { 0xE06C, 0x8DD0 }, { 0xE06D, 0x8DE9 }, { 0xE06E, 0x8DE3 }, { 0xE06F, 0x8DE2 }, { 0xE070, 0x8DE7 }, { 0xE071, 0x8DF2 }, { 0xE072, 0x8DEB },
+	{ 0xE073, 0x8DF4 }, { 0xE074, 0x8F06 }, { 0xE075, 0x8EFF }, { 0xE076, 0x8F01 }, { 0xE077, 0x8F00 }, { 0xE078, 0x8F05 }, { 0xE079, 0x8F07 }, { 0xE07A, 0x8F08 },
+	{ 0xE07B, 0x8F02 }, { 0xE07C, 0x8F0B }, { 0xE07D, 0x9052 }, { 0xE07E, 0x903F }, { 0xE0A1, 0x9044 }, { 0xE0A2, 0x9049 }, { 0xE0A3, 0x903D }, { 0xE0A4, 0x9110 },
+	{ 0xE0A5, 0x910D }, { 0xE0A6, 0x910F }, { 0xE0A7, 0x9111 }, { 0xE0A8, 0x9116 }, { 0xE0A9, 0x9114 }, { 0xE0AA, 0x910B }, { 0xE0AB, 0x910E }, { 0xE0AC, 0x916E },
+	{ 0xE0AD, 0x916F }, { 0xE0AE, 0x9248 }, { 0xE0AF, 0x9252 }, { 0xE0B0, 0x9230 }, { 0xE0B1, 0x923A }, { 0xE0B2, 0x9266 }, { 0xE0B3, 0x9233 }, { 0xE0B4, 0x9265 },
+	{ 0xE0B5, 0x925E }, { 0xE0B6, 0x9283 }, { 0xE0B7, 0x922E }, { 0xE0B8, 0x924A }, { 0xE0B9, 0x9246 }, { 0xE0BA, 0x926D }, { 0xE0BB, 0x926C }, { 0xE0BC, 0x924F },
+	{ 0xE0BD, 0x9260 }, { 0xE0BE, 0x9267 }, { 0xE0BF, 0x926F }, { 0xE0C0, 0x9236 }, { 0xE0C1, 0x9261 }, { 0xE0C2, 0x9270 }, { 0xE0C3, 0x9231 }, { 0xE0C4, 0x9254 },
+	{ 0xE0C5, 0x9263 }, { 0xE0C6, 0x9250 }, { 0xE0C7, 0x9272 }, { 0xE0C8, 0x924E }, { 0xE0C9, 0x9253 }, { 0xE0CA, 0x924C }, { 0xE0CB, 0x9256 }, { 0xE0CC, 0x9232 },
+	{ 0xE0CD, 0x959F }, { 0xE0CE, 0x959C }, { 0xE0CF, 0x959E }, { 0xE0D0, 0x959B }, { 0xE0D1, 0x9692 }, { 0xE0D2, 0x9693 }, { 0xE0D3, 0x9691 }, { 0xE0D4, 0x9697 },
+	{ 0xE0D5, 0x96CE }, { 0xE0D6, 0x96FA }, { 0xE0D7, 0x96FD }, { 0xE0D8, 0x96F8 }, { 0xE0D9, 0x96F5 }, { 0xE0DA, 0x9773 }, { 0xE0DB, 0x9777 }, { 0xE0DC, 0x9778 },
+	{ 0xE0DD, 0x9772 }, { 0xE0DE, 0x980F }, { 0xE0DF, 0x980D }, { 0xE0E0, 0x980E }, { 0xE0E1, 0x98AC }, { 0xE0E2, 0x98F6 }, { 0xE0E3, 0x98F9 }, { 0xE0E4, 0x99AF },
+	{ 0xE0E5, 0x99B2 }, { 0xE0E6, 0x99B0 }, { 0xE0E7, 0x99B5 }, { 0xE0E8, 0x9AAD }, { 0xE0E9, 0x9AAB }, { 0xE0EA, 0x9B5B }, { 0xE0EB, 0x9CEA }, { 0xE0EC, 0x9CED },
+	{ 0xE0ED, 0x9CE7 }, { 0xE0EE, 0x9E80 }, { 0xE0EF, 0x9EFD }, { 0xE0F0, 0x50E6 }, { 0xE0F1, 0x50D4 }, { 0xE0F2, 0x50D7 }, { 0xE0F3, 0x50E8 }, { 0xE0F4, 0x50F3 },
+	{ 0xE0F5, 0x50DB }, { 0xE0F6, 0x50EA }, { 0xE0F7, 0x50DD }, { 0xE0F8, 0x50E4 }, { 0xE0F9, 0x50D3 }, { 0xE0FA, 0x50EC }, { 0xE0FB, 0x50F0 }, { 0xE0FC, 0x50EF },
+	{ 0xE0FD, 0x50E3 }, { 0xE0FE, 0x50E0 }, { 0xE140, 0x51D8 }, { 0xE141, 0x5280 }, { 0xE142, 0x5281 }, { 0xE143, 0x52E9 }, { 0xE144, 0x52EB }, { 0xE145, 0x5330 },
+	{ 0xE146, 0x53AC }, { 0xE147, 0x5627 }, { 0xE148, 0x5615 }, { 0xE149, 0x560C }, { 0xE14A, 0x5612 }, { 0xE14B, 0x55FC }, { 0xE14C, 0x560F }, { 0xE14D, 0x561C },
+	{ 0xE14E, 0x5601 }, { 0xE14F, 0x5613 }, { 0xE150, 0x5602 }, { 0xE151, 0x55FA }, { 0xE152, 0x561D }, { 0xE153, 0x5604 }, { 0xE154, 0x55FF }, { 0xE155, 0x55F9 },
+	{ 0xE156, 0x5889 }, { 0xE157, 0x587C }, { 0xE158, 0x5890 }, { 0xE159, 0x5898 }, { 0xE15A, 0x5886 }, { 0xE15B, 0x5881 }, { 0xE15C, 0x587F }, { 0xE15D, 0x5874 },
+	{ 0xE15E, 0x588B }, { 0xE15F, 0x587A }, { 0xE160, 0x5887 }, { 0xE161, 0x5891 }, { 0xE162, 0x588E }, { 0xE163, 0x5876 }, { 0xE164, 0x5882 }, { 0xE165, 0x5888 },
+	{ 0xE166, 0x587B }, { 0xE167, 0x5894 }, { 0xE168, 0x588F }, { 0xE169, 0x58FE }, { 0xE16A, 0x596B }, { 0xE16B, 0x5ADC }, { 0xE16C, 0x5AEE }, { 0xE16D, 0x5AE5 },
+	{ 0xE16E, 0x5AD5 }, { 0xE16F, 0x5AEA }, { 0xE170, 0x5ADA }, { 0xE171, 0x5AED }, { 0xE172, 0x5AEB }, { 0xE173, 0x5AF3 }, { 0xE174, 0x5AE2 }, { 0xE175, 0x5AE0 },
+	{ 0xE176, 0x5ADB }, { 0xE177, 0x5AEC }, { 0xE178, 0x5ADE }, { 0xE179, 0x5ADD }, { 0xE17A, 0x5AD9 }, { 0xE17B, 0x5AE8 }, { 0xE17C, 0x5ADF }, { 0xE17D, 0x5B77 },
+	{ 0xE17E, 0x5BE0 }, { 0xE1A1, 0x5BE3 }, { 0xE1A2, 0x5C63 }, { 0xE1A3, 0x5D82 }, { 0xE1A4, 0x5D80 }, { 0xE1A5, 0x5D7D }, { 0xE1A6, 0x5D86 }, { 0xE1A7, 0x5D7A },
+	{ 0xE1A8, 0x5D81 }, { 0xE1A9, 0x5D77 }, { 0xE1AA, 0x5D8A }, { 0xE1AB, 0x5D89 }, { 0xE1AC, 0x5D88 }, { 0xE1AD, 0x5D7E }, { 0xE1AE, 0x5D7C }, { 0xE1AF, 0x5D8D },
+	{ 0xE1B0, 0x5D79 }, { 0xE1B1, 0x5D7F }, { 0xE1B2, 0x5E58 }, { 0xE1B3, 0x5E59 }, { 0xE1B4, 0x5E53 }, { 0xE1B5, 0x5ED8 }, { 0xE1B6, 0x5ED1 }, { 0xE1B7, 0x5ED7 },
+	{ 0xE1B8, 0x5ECE }, { 0xE1B9, 0x5EDC }, { 0xE1BA, 0x5ED5 }, { 0xE1BB, 0x5ED9 }, { 0xE1BC, 0x5ED2 }, { 0xE1BD, 0x5ED4 }, { 0xE1BE, 0x5F44 }, { 0xE1BF, 0x5F43 },
+	{ 0xE1C0, 0x5F6F }, { 0xE1C1, 0x5FB6 }, { 0xE1C2, 0x612C }, { 0xE1C3, 0x6128 }, { 0xE1C4, 0x6141 }, { 0xE1C5, 0x615E }, { 0xE1C6, 0x6171 }, { 0xE1C7, 0x6173 },
+	{ 0xE1C8, 0x6152 }, { 0xE1C9, 0x6153 }, { 0xE1CA, 0x6172 }, { 0xE1CB, 0x616C }, { 0xE1CC, 0x6180 }, { 0xE1CD, 0x6174 }, { 0xE1CE, 0x6154 }, { 0xE1CF, 0x617A },
+	{ 0xE1D0, 0x615B }, { 0xE1D1, 0x6165 }, { 0xE1D2, 0x613B }, { 0xE1D3, 0x616A }, { 0xE1D4, 0x6161 }, { 0xE1D5, 0x6156 }, { 0xE1D6, 0x6229 }, { 0xE1D7, 0x6227 },
+	{ 0xE1D8, 0x622B }, { 0xE1D9, 0x642B }, { 0xE1DA, 0x644D }, { 0xE1DB, 0x645B }, { 0xE1DC, 0x645D }, { 0xE1DD, 0x6474 }, { 0xE1DE, 0x6476 }, { 0xE1DF, 0x6472 },
+	{ 0xE1E0, 0x6473 }, { 0xE1E1, 0x647D }, { 0xE1E2, 0x6475 }, { 0xE1E3, 0x6466 }, { 0xE1E4, 0x64A6 }, { 0xE1E5, 0x644E }, { 0xE1E6, 0x6482 }, { 0xE1E7, 0x645E },
+	{ 0xE1E8, 0x645C }, { 0xE1E9, 0x644B }, { 0xE1EA, 0x6453 }, { 0xE1EB, 0x6460 }, { 0xE1EC, 0x6450 }, { 0xE1ED, 0x647F }, { 0xE1EE, 0x643F }, { 0xE1EF, 0x646C },
+	{ 0xE1F0, 0x646B }, { 0xE1F1, 0x6459 }, { 0xE1F2, 0x6465 }, { 0xE1F3, 0x6477 }, { 0xE1F4, 0x6573 }, { 0xE1F5, 0x65A0 }, { 0xE1F6, 0x66A1 }, { 0xE1F7, 0x66A0 },
+	{ 0xE1F8, 0x669F }, { 0xE1F9, 0x6705 }, { 0xE1FA, 0x6704 }, { 0xE1FB, 0x6722 }, { 0xE1FC, 0x69B1 }, { 0xE1FD, 0x69B6 }, { 0xE1FE, 0x69C9 }, { 0xE240, 0x69A0 },
+	{ 0xE241, 0x69CE }, { 0xE242, 0x6996 }, { 0xE243, 0x69B0 }, { 0xE244, 0x69AC }, { 0xE245, 0x69BC }, { 0xE246, 0x6991 }, { 0xE247, 0x6999 }, { 0xE248, 0x698E },
+	{ 0xE249, 0x69A7 }, { 0xE24A, 0x698D }, { 0xE24B, 0x69A9 }, { 0xE24C, 0x69BE }, { 0xE24D, 0x69AF }, { 0xE24E, 0x69BF }, { 0xE24F, 0x69C4 }, { 0xE250, 0x69BD },
+	{ 0xE251, 0x69A4 }, { 0xE252, 0x69D4 }, { 0xE253, 0x69B9 }, { 0xE254, 0x69CA }, { 0xE255, 0x699A }, { 0xE256, 0x69CF }, { 0xE257, 0x69B3 }, { 0xE258, 0x6993 },
+	{ 0xE259, 0x69AA }, { 0xE25A, 0x69A1 }, { 0xE25B, 0x699E }, { 0xE25C, 0x69D9 }, { 0xE25D, 0x6997 }, { 0xE25E, 0x6990 }, { 0xE25F, 0x69C2 }, { 0xE260, 0x69B5 },
+	{ 0xE261, 0x69A5 }, { 0xE262, 0x69C6 }, { 0xE263, 0x6B4A }, { 0xE264, 0x6B4D }, { 0xE265, 0x6B4B }, { 0xE266, 0x6B9E }, { 0xE267, 0x6B9F }, { 0xE268, 0x6BA0 },
+	{ 0xE269, 0x6BC3 }, { 0xE26A, 0x6BC4 }, { 0xE26B, 0x6BFE }, { 0xE26C, 0x6ECE }, { 0xE26D, 0x6EF5 }, { 0xE26E, 0x6EF1 }, { 0xE26F, 0x6F03 }, { 0xE270, 0x6F25 },
+	{ 0xE271, 0x6EF8 }, { 0xE272, 0x6F37 }, { 0xE273, 0x6EFB }, { 0xE274, 0x6F2E }, { 0xE275, 0x6F09 }, { 0xE276, 0x6F4E }, { 0xE277, 0x6F19 }, { 0xE278, 0x6F1A },
+	{ 0xE279, 0x6F27 }, { 0xE27A, 0x6F18 }, { 0xE27B, 0x6F3B }, { 0xE27C, 0x6F12 }, { 0xE27D, 0x6EED }, { 0xE27E, 0x6F0A }, { 0xE2A1, 0x6F36 }, { 0xE2A2, 0x6F73 },
+	{ 0xE2A3, 0x6EF9 }, { 0xE2A4, 0x6EEE }, { 0xE2A5, 0x6F2D }, { 0xE2A6, 0x6F40 }, { 0xE2A7, 0x6F30 }, { 0xE2A8, 0x6F3C }, { 0xE2A9, 0x6F35 }, { 0xE2AA, 0x6EEB },
+	{ 0xE2AB, 0x6F07 }, { 0xE2AC, 0x6F0E }, { 0xE2AD, 0x6F43 }, { 0xE2AE, 0x6F05 }, { 0xE2AF, 0x6EFD }, { 0xE2B0, 0x6EF6 }, { 0xE2B1, 0x6F39 }, { 0xE2B2, 0x6F1C },
+	{ 0xE2B3, 0x6EFC }, { 0xE2B4, 0x6F3A }, { 0xE2B5, 0x6F1F }, { 0xE2B6, 0x6F0D }, { 0xE2B7, 0x6F1E }, { 0xE2B8, 0x6F08 }, { 0xE2B9, 0x6F21 }, { 0xE2BA, 0x7187 },
+	{ 0xE2BB, 0x7190 }, { 0xE2BC, 0x7189 }, { 0xE2BD, 0x7180 }, { 0xE2BE, 0x7185 }, { 0xE2BF, 0x7182 }, { 0xE2C0, 0x718F }, { 0xE2C1, 0x717B }, { 0xE2C2, 0x7186 },
+	{ 0xE2C3, 0x7181 }, { 0xE2C4, 0x7197 }, { 0xE2C5, 0x7244 }, { 0xE2C6, 0x7253 }, { 0xE2C7, 0x7297 }, { 0xE2C8, 0x7295 }, { 0xE2C9, 0x7293 }, { 0xE2CA, 0x7343 },
+	{ 0xE2CB, 0x734D }, { 0xE2CC, 0x7351 }, { 0xE2CD, 0x734C }, { 0xE2CE, 0x7462 }, { 0xE2CF, 0x7473 }, { 0xE2D0, 0x7471 }, { 0xE2D1, 0x7475 }, { 0xE2D2, 0x7472 },
+	{ 0xE2D3, 0x7467 }, { 0xE2D4, 0x746E }, { 0xE2D5, 0x7500 }, { 0xE2D6, 0x7502 }, { 0xE2D7, 0x7503 }, { 0xE2D8, 0x757D }, { 0xE2D9, 0x7590 }, { 0xE2DA, 0x7616 },
+	{ 0xE2DB, 0x7608 }, { 0xE2DC, 0x760C }, { 0xE2DD, 0x7615 }, { 0xE2DE, 0x7611 }, { 0xE2DF, 0x760A }, { 0xE2E0, 0x7614 }, { 0xE2E1, 0x76B8 }, { 0xE2E2, 0x7781 },
+	{ 0xE2E3, 0x777C }, { 0xE2E4, 0x7785 }, { 0xE2E5, 0x7782 }, { 0xE2E6, 0x776E }, { 0xE2E7, 0x7780 }, { 0xE2E8, 0x776F }, { 0xE2E9, 0x777E }, { 0xE2EA, 0x7783 },
+	{ 0xE2EB, 0x78B2 }, { 0xE2EC, 0x78AA }, { 0xE2ED, 0x78B4 }, { 0xE2EE, 0x78AD }, { 0xE2EF, 0x78A8 }, { 0xE2F0, 0x787E }, { 0xE2F1, 0x78AB }, { 0xE2F2, 0x789E },
+	{ 0xE2F3, 0x78A5 }, { 0xE2F4, 0x78A0 }, { 0xE2F5, 0x78AC }, { 0xE2F6, 0x78A2 }, { 0xE2F7, 0x78A4 }, { 0xE2F8, 0x7998 }, { 0xE2F9, 0x798A }, { 0xE2FA, 0x798B },
+	{ 0xE2FB, 0x7996 }, { 0xE2FC, 0x7995 }, { 0xE2FD, 0x7994 }, { 0xE2FE, 0x7993 }, { 0xE340, 0x7997 }, { 0xE341, 0x7988 }, { 0xE342, 0x7992 }, { 0xE343, 0x7990 },
+	{ 0xE344, 0x7A2B }, { 0xE345, 0x7A4A }, { 0xE346, 0x7A30 }, { 0xE347, 0x7A2F }, { 0xE348, 0x7A28 }, { 0xE349, 0x7A26 }, { 0xE34A, 0x7AA8 }, { 0xE34B, 0x7AAB },
+	{ 0xE34C, 0x7AAC }, { 0xE34D, 0x7AEE }, { 0xE34E, 0x7B88 }, { 0xE34F, 0x7B9C }, { 0xE350, 0x7B8A }, { 0xE351, 0x7B91 }, { 0xE352, 0x7B90 }, { 0xE353, 0x7B96 },
+	{ 0xE354, 0x7B8D }, { 0xE355, 0x7B8C }, { 0xE356, 0x7B9B }, { 0xE357, 0x7B8E }, { 0xE358, 0x7B85 }, { 0xE359, 0x7B98 }, { 0xE35A, 0x5284 }, { 0xE35B, 0x7B99 },
+	{ 0xE35C, 0x7BA4 }, { 0xE35D, 0x7B82 }, { 0xE35E, 0x7CBB }, { 0xE35F, 0x7CBF }, { 0xE360, 0x7CBC }, { 0xE361, 0x7CBA }, { 0xE362, 0x7DA7 }, { 0xE363, 0x7DB7 },
+	{ 0xE364, 0x7DC2 }, { 0xE365, 0x7DA3 }, { 0xE366, 0x7DAA }, { 0xE367, 0x7DC1 }, { 0xE368, 0x7DC0 }, { 0xE369, 0x7DC5 }, { 0xE36A, 0x7D9D }, { 0xE36B, 0x7DCE },
+	{ 0xE36C, 0x7DC4 }, { 0xE36D, 0x7DC6 }, { 0xE36E, 0x7DCB }, { 0xE36F, 0x7DCC }, { 0xE370, 0x7DAF }, { 0xE371, 0x7DB9 }, { 0xE372, 0x7D96 }, { 0xE373, 0x7DBC },
+	{ 0xE374, 0x7D9F }, { 0xE375, 0x7DA6 }, { 0xE376, 0x7DAE }, { 0xE377, 0x7DA9 }, { 0xE378, 0x7DA1 }, { 0xE379, 0x7DC9 }, { 0xE37A, 0x7F73 }, { 0xE37B, 0x7FE2 },
+	{ 0xE37C, 0x7FE3 }, { 0xE37D, 0x7FE5 }, { 0xE37E, 0x7FDE }, { 0xE3A1, 0x8024 }, { 0xE3A2, 0x805D }, { 0xE3A3, 0x805C }, { 0xE3A4, 0x8189 }, { 0xE3A5, 0x8186 },
+	{ 0xE3A6, 0x8183 }, { 0xE3A7, 0x8187 }, { 0xE3A8, 0x818D }, { 0xE3A9, 0x818C }, { 0xE3AA, 0x818B }, { 0xE3AB, 0x8215 }, { 0xE3AC, 0x8497 }, { 0xE3AD, 0x84A4 },
+	{ 0xE3AE, 0x84A1 }, { 0xE3AF, 0x849F }, { 0xE3B0, 0x84BA }, { 0xE3B1, 0x84CE }, { 0xE3B2, 0x84C2 }, { 0xE3B3, 0x84AC }, { 0xE3B4, 0x84AE }, { 0xE3B5, 0x84AB },
+	{ 0xE3B6, 0x84B9 }, { 0xE3B7, 0x84B4 }, { 0xE3B8, 0x84C1 }, { 0xE3B9, 0x84CD }, { 0xE3BA, 0x84AA }, { 0xE3BB, 0x849A }, { 0xE3BC, 0x84B1 }, { 0xE3BD, 0x84D0 },
+	{ 0xE3BE, 0x849D }, { 0xE3BF, 0x84A7 }, { 0xE3C0, 0x84BB }, { 0xE3C1, 0x84A2 }, { 0xE3C2, 0x8494 }, { 0xE3C3, 0x84C7 }, { 0xE3C4, 0x84CC }, { 0xE3C5, 0x849B },
+	{ 0xE3C6, 0x84A9 }, { 0xE3C7, 0x84AF }, { 0xE3C8, 0x84A8 }, { 0xE3C9, 0x84D6 }, { 0xE3CA, 0x8498 }, { 0xE3CB, 0x84B6 }, { 0xE3CC, 0x84CF }, { 0xE3CD, 0x84A0 },
+	{ 0xE3CE, 0x84D7 }, { 0xE3CF, 0x84D4 }, { 0xE3D0, 0x84D2 }, { 0xE3D1, 0x84DB }, { 0xE3D2, 0x84B0 }, { 0xE3D3, 0x8491 }, { 0xE3D4, 0x8661 }, { 0xE3D5, 0x8733 },
+	{ 0xE3D6, 0x8723 }, { 0xE3D7, 0x8728 }, { 0xE3D8, 0x876B }, { 0xE3D9, 0x8740 }, { 0xE3DA, 0x872E }, { 0xE3DB, 0x871E }, { 0xE3DC, 0x8721 }, { 0xE3DD, 0x8719 },
+	{ 0xE3DE, 0x871B }, { 0xE3DF, 0x8743 }, { 0xE3E0, 0x872C }, { 0xE3E1, 0x8741 }, { 0xE3E2, 0x873E }, { 0xE3E3, 0x8746 }, { 0xE3E4, 0x8720 }, { 0xE3E5, 0x8732 },
+	{ 0xE3E6, 0x872A }, { 0xE3E7, 0x872D }, { 0xE3E8, 0x873C }, { 0xE3E9, 0x8712 }, { 0xE3EA, 0x873A }, { 0xE3EB, 0x8731 }, { 0xE3EC, 0x8735 }, { 0xE3ED, 0x8742 },
+	{ 0xE3EE, 0x8726 }, { 0xE3EF, 0x8727 }, { 0xE3F0, 0x8738 }, { 0xE3F1, 0x8724 }, { 0xE3F2, 0x871A }, { 0xE3F3, 0x8730 }, { 0xE3F4, 0x8711 }, { 0xE3F5, 0x88F7 },
+	{ 0xE3F6, 0x88E7 }, { 0xE3F7, 0x88F1 }, { 0xE3F8, 0x88F2 }, { 0xE3F9, 0x88FA }, { 0xE3FA, 0x88FE }, { 0xE3FB, 0x88EE }, { 0xE3FC, 0x88FC }, { 0xE3FD, 0x88F6 },
+	{ 0xE3FE, 0x88FB }, { 0xE440, 0x88F0 }, { 0xE441, 0x88EC }, { 0xE442, 0x88EB }, { 0xE443, 0x899D }, { 0xE444, 0x89A1 }, { 0xE445, 0x899F }, { 0xE446, 0x899E },
+	{ 0xE447, 0x89E9 }, { 0xE448, 0x89EB }, { 0xE449, 0x89E8 }, { 0xE44A, 0x8AAB }, { 0xE44B, 0x8A99 }, { 0xE44C, 0x8A8B }, { 0xE44D, 0x8A92 }, { 0xE44E, 0x8A8F },
+	{ 0xE44F, 0x8A96 }, { 0xE450, 0x8C3D }, { 0xE451, 0x8C68 }, { 0xE452, 0x8C69 }, { 0xE453, 0x8CD5 }, { 0xE454, 0x8CCF }, { 0xE455, 0x8CD7 }, { 0xE456, 0x8D96 },
+	{ 0xE457, 0x8E09 }, { 0xE458, 0x8E02 }, { 0xE459, 0x8DFF }, { 0xE45A, 0x8E0D }, { 0xE45B, 0x8DFD }, { 0xE45C, 0x8E0A }, { 0xE45D, 0x8E03 }, { 0xE45E, 0x8E07 },
+	{ 0xE45F, 0x8E06 }, { 0xE460, 0x8E05 }, { 0xE461, 0x8DFE }, { 0xE462, 0x8E00 }, { 0xE463, 0x8E04 }, { 0xE464, 0x8F10 }, { 0xE465, 0x8F11 }, { 0xE466, 0x8F0E },
+	{ 0xE467, 0x8F0D }, { 0xE468, 0x9123 }, { 0xE469, 0x911C }, { 0xE46A, 0x9120 }, { 0xE46B, 0x9122 }, { 0xE46C, 0x911F }, { 0xE46D, 0x911D }, { 0xE46E, 0x911A },
+	{ 0xE46F, 0x9124 }, { 0xE470, 0x9121 }, { 0xE471, 0x911B }, { 0xE472, 0x917A }, { 0xE473, 0x9172 }, { 0xE474, 0x9179 }, { 0xE475, 0x9173 }, { 0xE476, 0x92A5 },
+	{ 0xE477, 0x92A4 }, { 0xE478, 0x9276 }, { 0xE479, 0x929B }, { 0xE47A, 0x927A }, { 0xE47B, 0x92A0 }, { 0xE47C, 0x9294 }, { 0xE47D, 0x92AA }, { 0xE47E, 0x928D },
+	{ 0xE4A1, 0x92A6 }, { 0xE4A2, 0x929A }, { 0xE4A3, 0x92AB }, { 0xE4A4, 0x9279 }, { 0xE4A5, 0x9297 }, { 0xE4A6, 0x927F }, { 0xE4A7, 0x92A3 }, { 0xE4A8, 0x92EE },
+	{ 0xE4A9, 0x928E }, { 0xE4AA, 0x9282 }, { 0xE4AB, 0x9295 }, { 0xE4AC, 0x92A2 }, { 0xE4AD, 0x927D }, { 0xE4AE, 0x9288 }, { 0xE4AF, 0x92A1 }, { 0xE4B0, 0x928A },
+	{ 0xE4B1, 0x9286 }, { 0xE4B2, 0x928C }, { 0xE4B3, 0x9299 }, { 0xE4B4, 0x92A7 }, { 0xE4B5, 0x927E }, { 0xE4B6, 0x9287 }, { 0xE4B7, 0x92A9 }, { 0xE4B8, 0x929D },
+	{ 0xE4B9, 0x928B }, { 0xE4BA, 0x922D }, { 0xE4BB, 0x969E }, { 0xE4BC, 0x96A1 }, { 0xE4BD, 0x96FF }, { 0xE4BE, 0x9758 }, { 0xE4BF, 0x977D }, { 0xE4C0, 0x977A },
+	{ 0xE4C1, 0x977E }, { 0xE4C2, 0x9783 }, { 0xE4C3, 0x9780 }, { 0xE4C4, 0x9782 }, { 0xE4C5, 0x977B }, { 0xE4C6, 0x9784 }, { 0xE4C7, 0x9781 }, { 0xE4C8, 0x977F },
+	{ 0xE4C9, 0x97CE }, { 0xE4CA, 0x97CD }, { 0xE4CB, 0x9816 }, { 0xE4CC, 0x98AD }, { 0xE4CD, 0x98AE }, { 0xE4CE, 0x9902 }, { 0xE4CF, 0x9900 }, { 0xE4D0, 0x9907 },
+	{ 0xE4D1, 0x999D }, { 0xE4D2, 0x999C }, { 0xE4D3, 0x99C3 }, { 0xE4D4, 0x99B9 }, { 0xE4D5, 0x99BB }, { 0xE4D6, 0x99BA }, { 0xE4D7, 0x99C2 }, { 0xE4D8, 0x99BD },
+	{ 0xE4D9, 0x99C7 }, { 0xE4DA, 0x9AB1 }, { 0xE4DB, 0x9AE3 }, { 0xE4DC, 0x9AE7 }, { 0xE4DD, 0x9B3E }, { 0xE4DE, 0x9B3F }, { 0xE4DF, 0x9B60 }, { 0xE4E0, 0x9B61 },
+	{ 0xE4E1, 0x9B5F }, { 0xE4E2, 0x9CF1 }, { 0xE4E3, 0x9CF2 }, { 0xE4E4, 0x9CF5 }, { 0xE4E5, 0x9EA7 }, { 0xE4E6, 0x50FF }, { 0xE4E7, 0x5103 }, { 0xE4E8, 0x5130 },
+	{ 0xE4E9, 0x50F8 }, { 0xE4EA, 0x5106 }, { 0xE4EB, 0x5107 }, { 0xE4EC, 0x50F6 }, { 0xE4ED, 0x50FE }, { 0xE4EE, 0x510B }, { 0xE4EF, 0x510C }, { 0xE4F0, 0x50FD },
+	{ 0xE4F1, 0x510A }, { 0xE4F2, 0x528B }, { 0xE4F3, 0x528C }, { 0xE4F4, 0x52F1 }, { 0xE4F5, 0x52EF }, { 0xE4F6, 0x5648 }, { 0xE4F7, 0x5642 }, { 0xE4F8, 0x564C },
+	{ 0xE4F9, 0x5635 }, { 0xE4FA, 0x5641 }, { 0xE4FB, 0x564A }, { 0xE4FC, 0x5649 }, { 0xE4FD, 0x5646 }, { 0xE4FE, 0x5658 }, { 0xE540, 0x565A }, { 0xE541, 0x5640 },
+	{ 0xE542, 0x5633 }, { 0xE543, 0x563D }, { 0xE544, 0x562C }, { 0xE545, 0x563E }, { 0xE546, 0x5638 }, { 0xE547, 0x562A }, { 0xE548, 0x563A }, { 0xE549, 0x571A },
+	{ 0xE54A, 0x58AB }, { 0xE54B, 0x589D }, { 0xE54C, 0x58B1 }, { 0xE54D, 0x58A0 }, { 0xE54E, 0x58A3 }, { 0xE54F, 0x58AF }, { 0xE550, 0x58AC }, { 0xE551, 0x58A5 },
+	{ 0xE552, 0x58A1 }, { 0xE553, 0x58FF }, { 0xE554, 0x5AFF }, { 0xE555, 0x5AF4 }, { 0xE556, 0x5AFD }, { 0xE557, 0x5AF7 }, { 0xE558, 0x5AF6 }, { 0xE559, 0x5B03 },
+	{ 0xE55A, 0x5AF8 }, { 0xE55B, 0x5B02 }, { 0xE55C, 0x5AF9 }, { 0xE55D, 0x5B01 }, { 0xE55E, 0x5B07 }, { 0xE55F, 0x5B05 }, { 0xE560, 0x5B0F }, { 0xE561, 0x5C67 },
+	{ 0xE562, 0x5D99 }, { 0xE563, 0x5D97 }, { 0xE564, 0x5D9F }, { 0xE565, 0x5D92 }, { 0xE566, 0x5DA2 }, { 0xE567, 0x5D93 }, { 0xE568, 0x5D95 }, { 0xE569, 0x5DA0 },
+	{ 0xE56A, 0x5D9C }, { 0xE56B, 0x5DA1 }, { 0xE56C, 0x5D9A }, { 0xE56D, 0x5D9E }, { 0xE56E, 0x5E69 }, { 0xE56F, 0x5E5D }, { 0xE570, 0x5E60 }, { 0xE571, 0x5E5C },
+	{ 0xE572, 0x7DF3 }, { 0xE573, 0x5EDB }, { 0xE574, 0x5EDE }, { 0xE575, 0x5EE1 }, { 0xE576, 0x5F49 }, { 0xE577, 0x5FB2 }, { 0xE578, 0x618B }, { 0xE579, 0x6183 },
+	{ 0xE57A, 0x6179 }, { 0xE57B, 0x61B1 }, { 0xE57C, 0x61B0 }, { 0xE57D, 0x61A2 }, { 0xE57E, 0x6189 }, { 0xE5A1, 0x619B }, { 0xE5A2, 0x6193 }, { 0xE5A3, 0x61AF },
+	{ 0xE5A4, 0x61AD }, { 0xE5A5, 0x619F }, { 0xE5A6, 0x6192 }, { 0xE5A7, 0x61AA }, { 0xE5A8, 0x61A1 }, { 0xE5A9, 0x618D }, { 0xE5AA, 0x6166 }, { 0xE5AB, 0x61B3 },
+	{ 0xE5AC, 0x622D }, { 0xE5AD, 0x646E }, { 0xE5AE, 0x6470 }, { 0xE5AF, 0x6496 }, { 0xE5B0, 0x64A0 }, { 0xE5B1, 0x6485 }, { 0xE5B2, 0x6497 }, { 0xE5B3, 0x649C },
+	{ 0xE5B4, 0x648F }, { 0xE5B5, 0x648B }, { 0xE5B6, 0x648A }, { 0xE5B7, 0x648C }, { 0xE5B8, 0x64A3 }, { 0xE5B9, 0x649F }, { 0xE5BA, 0x6468 }, { 0xE5BB, 0x64B1 },
+	{ 0xE5BC, 0x6498 }, { 0xE5BD, 0x6576 }, { 0xE5BE, 0x657A }, { 0xE5BF, 0x6579 }, { 0xE5C0, 0x657B }, { 0xE5C1, 0x65B2 }, { 0xE5C2, 0x65B3 }, { 0xE5C3, 0x66B5 },
+	{ 0xE5C4, 0x66B0 }, { 0xE5C5, 0x66A9 }, { 0xE5C6, 0x66B2 }, { 0xE5C7, 0x66B7 }, { 0xE5C8, 0x66AA }, { 0xE5C9, 0x66AF }, { 0xE5CA, 0x6A00 }, { 0xE5CB, 0x6A06 },
+	{ 0xE5CC, 0x6A17 }, { 0xE5CD, 0x69E5 }, { 0xE5CE, 0x69F8 }, { 0xE5CF, 0x6A15 }, { 0xE5D0, 0x69F1 }, { 0xE5D1, 0x69E4 }, { 0xE5D2, 0x6A20 }, { 0xE5D3, 0x69FF },
+	{ 0xE5D4, 0x69EC }, { 0xE5D5, 0x69E2 }, { 0xE5D6, 0x6A1B }, { 0xE5D7, 0x6A1D }, { 0xE5D8, 0x69FE }, { 0xE5D9, 0x6A27 }, { 0xE5DA, 0x69F2 }, { 0xE5DB, 0x69EE },
+	{ 0xE5DC, 0x6A14 }, { 0xE5DD, 0x69F7 }, { 0xE5DE, 0x69E7 }, { 0xE5DF, 0x6A40 }, { 0xE5E0, 0x6A08 }, { 0xE5E1, 0x69E6 }, { 0xE5E2, 0x69FB }, { 0xE5E3, 0x6A0D },
+	{ 0xE5E4, 0x69FC }, { 0xE5E5, 0x69EB }, { 0xE5E6, 0x6A09 }, { 0xE5E7, 0x6A04 }, { 0xE5E8, 0x6A18 }, { 0xE5E9, 0x6A25 }, { 0xE5EA, 0x6A0F }, { 0xE5EB, 0x69F6 },
+	{ 0xE5EC, 0x6A26 }, { 0xE5ED, 0x6A07 }, { 0xE5EE, 0x69F4 }, { 0xE5EF, 0x6A16 }, { 0xE5F0, 0x6B51 }, { 0xE5F1, 0x6BA5 }, { 0xE5F2, 0x6BA3 }, { 0xE5F3, 0x6BA2 },
+	{ 0xE5F4, 0x6BA6 }, { 0xE5F5, 0x6C01 }, { 0xE5F6, 0x6C00 }, { 0xE5F7, 0x6BFF }, { 0xE5F8, 0x6C02 }, { 0xE5F9, 0x6F41 }, { 0xE5FA, 0x6F26 }, { 0xE5FB, 0x6F7E },
+	{ 0xE5FC, 0x6F87 }, { 0xE5FD, 0x6FC6 }, { 0xE5FE, 0x6F92 }, { 0xE640, 0x6F8D }, { 0xE641, 0x6F89 }, { 0xE642, 0x6F8C }, { 0xE643, 0x6F62 }, { 0xE644, 0x6F4F },
+	{ 0xE645, 0x6F85 }, { 0xE646, 0x6F5A }, { 0xE647, 0x6F96 }, { 0xE648, 0x6F76 }, { 0xE649, 0x6F6C }, { 0xE64A, 0x6F82 }, { 0xE64B, 0x6F55 }, { 0xE64C, 0x6F72 },
+	{ 0xE64D, 0x6F52 }, { 0xE64E, 0x6F50 }, { 0xE64F, 0x6F57 }, { 0xE650, 0x6F94 }, { 0xE651, 0x6F93 }, { 0xE652, 0x6F5D }, { 0xE653, 0x6F00 }, { 0xE654, 0x6F61 },
+	{ 0xE655, 0x6F6B }, { 0xE656, 0x6F7D }, { 0xE657, 0x6F67 }, { 0xE658, 0x6F90 }, { 0xE659, 0x6F53 }, { 0xE65A, 0x6F8B }, { 0xE65B, 0x6F69 }, { 0xE65C, 0x6F7F },
+	{ 0xE65D, 0x6F95 }, { 0xE65E, 0x6F63 }, { 0xE65F, 0x6F77 }, { 0xE660, 0x6F6A }, { 0xE661, 0x6F7B }, { 0xE662, 0x71B2 }, { 0xE663, 0x71AF }, { 0xE664, 0x719B },
+	{ 0xE665, 0x71B0 }, { 0xE666, 0x71A0 }, { 0xE667, 0x719A }, { 0xE668, 0x71A9 }, { 0xE669, 0x71B5 }, { 0xE66A, 0x719D }, { 0xE66B, 0x71A5 }, { 0xE66C, 0x719E },
+	{ 0xE66D, 0x71A4 }, { 0xE66E, 0x71A1 }, { 0xE66F, 0x71AA }, { 0xE670, 0x719C }, { 0xE671, 0x71A7 }, { 0xE672, 0x71B3 }, { 0xE673, 0x7298 }, { 0xE674, 0x729A },
+	{ 0xE675, 0x7358 }, { 0xE676, 0x7352 }, { 0xE677, 0x735E }, { 0xE678, 0x735F }, { 0xE679, 0x7360 }, { 0xE67A, 0x735D }, { 0xE67B, 0x735B }, { 0xE67C, 0x7361 },
+	{ 0xE67D, 0x735A }, { 0xE67E, 0x7359 }, { 0xE6A1, 0x7362 }, { 0xE6A2, 0x7487 }, { 0xE6A3, 0x7489 }, { 0xE6A4, 0x748A }, { 0xE6A5, 0x7486 }, { 0xE6A6, 0x7481 },
+	{ 0xE6A7, 0x747D }, { 0xE6A8, 0x7485 }, { 0xE6A9, 0x7488 }, { 0xE6AA, 0x747C }, { 0xE6AB, 0x7479 }, { 0xE6AC, 0x7508 }, { 0xE6AD, 0x7507 }, { 0xE6AE, 0x757E },
+	{ 0xE6AF, 0x7625 }, { 0xE6B0, 0x761E }, { 0xE6B1, 0x7619 }, { 0xE6B2, 0x761D }, { 0xE6B3, 0x761C }, { 0xE6B4, 0x7623 }, { 0xE6B5, 0x761A }, { 0xE6B6, 0x7628 },
+	{ 0xE6B7, 0x761B }, { 0xE6B8, 0x769C }, { 0xE6B9, 0x769D }, { 0xE6BA, 0x769E }, { 0xE6BB, 0x769B }, { 0xE6BC, 0x778D }, { 0xE6BD, 0x778F }, { 0xE6BE, 0x7789 },
+	{ 0xE6BF, 0x7788 }, { 0xE6C0, 0x78CD }, { 0xE6C1, 0x78BB }, { 0xE6C2, 0x78CF }, { 0xE6C3, 0x78CC }, { 0xE6C4, 0x78D1 }, { 0xE6C5, 0x78CE }, { 0xE6C6, 0x78D4 },
+	{ 0xE6C7, 0x78C8 }, { 0xE6C8, 0x78C3 }, { 0xE6C9, 0x78C4 }, { 0xE6CA, 0x78C9 }, { 0xE6CB, 0x799A }, { 0xE6CC, 0x79A1 }, { 0xE6CD, 0x79A0 }, { 0xE6CE, 0x799C },
+	{ 0xE6CF, 0x79A2 }, { 0xE6D0, 0x799B }, { 0xE6D1, 0x6B76 }, { 0xE6D2, 0x7A39 }, { 0xE6D3, 0x7AB2 }, { 0xE6D4, 0x7AB4 }, { 0xE6D5, 0x7AB3 }, { 0xE6D6, 0x7BB7 },
+	{ 0xE6D7, 0x7BCB }, { 0xE6D8, 0x7BBE }, { 0xE6D9, 0x7BAC }, { 0xE6DA, 0x7BCE }, { 0xE6DB, 0x7BAF }, { 0xE6DC, 0x7BB9 }, { 0xE6DD, 0x7BCA }, { 0xE6DE, 0x7BB5 },
+	{ 0xE6DF, 0x7CC5 }, { 0xE6E0, 0x7CC8 }, { 0xE6E1, 0x7CCC }, { 0xE6E2, 0x7CCB }, { 0xE6E3, 0x7DF7 }, { 0xE6E4, 0x7DDB }, { 0xE6E5, 0x7DEA }, { 0xE6E6, 0x7DE7 },
+	{ 0xE6E7, 0x7DD7 }, { 0xE6E8, 0x7DE1 }, { 0xE6E9, 0x7E03 }, { 0xE6EA, 0x7DFA }, { 0xE6EB, 0x7DE6 }, { 0xE6EC, 0x7DF6 }, { 0xE6ED, 0x7DF1 }, { 0xE6EE, 0x7DF0 },
+	{ 0xE6EF, 0x7DEE }, { 0xE6F0, 0x7DDF }, { 0xE6F1, 0x7F76 }, { 0xE6F2, 0x7FAC }, { 0xE6F3, 0x7FB0 }, { 0xE6F4, 0x7FAD }, { 0xE6F5, 0x7FED }, { 0xE6F6, 0x7FEB },
+	{ 0xE6F7, 0x7FEA }, { 0xE6F8, 0x7FEC }, { 0xE6F9, 0x7FE6 }, { 0xE6FA, 0x7FE8 }, { 0xE6FB, 0x8064 }, { 0xE6FC, 0x8067 }, { 0xE6FD, 0x81A3 }, { 0xE6FE, 0x819F },
+	{ 0xE740, 0x819E }, { 0xE741, 0x8195 }, { 0xE742, 0x81A2 }, { 0xE743, 0x8199 }, { 0xE744, 0x8197 }, { 0xE745, 0x8216 }, { 0xE746, 0x824F }, { 0xE747, 0x8253 },
+	{ 0xE748, 0x8252 }, { 0xE749, 0x8250 }, { 0xE74A, 0x824E }, { 0xE74B, 0x8251 }, { 0xE74C, 0x8524 }, { 0xE74D, 0x853B }, { 0xE74E, 0x850F }, { 0xE74F, 0x8500 },
+	{ 0xE750, 0x8529 }, { 0xE751, 0x850E }, { 0xE752, 0x8509 }, { 0xE753, 0x850D }, { 0xE754, 0x851F }, { 0xE755, 0x850A }, { 0xE756, 0x8527 }, { 0xE757, 0x851C },
+	{ 0xE758, 0x84FB }, { 0xE759, 0x852B }, { 0xE75A, 0x84FA }, { 0xE75B, 0x8508 }, { 0xE75C, 0x850C }, { 0xE75D, 0x84F4 }, { 0xE75E, 0x852A }, { 0xE75F, 0x84F2 },
+	{ 0xE760, 0x8515 }, { 0xE761, 0x84F7 }, { 0xE762, 0x84EB }, { 0xE763, 0x84F3 }, { 0xE764, 0x84FC }, { 0xE765, 0x8512 }, { 0xE766, 0x84EA }, { 0xE767, 0x84E9 },
+	{ 0xE768, 0x8516 }, { 0xE769, 0x84FE }, { 0xE76A, 0x8528 }, { 0xE76B, 0x851D }, { 0xE76C, 0x852E }, { 0xE76D, 0x8502 }, { 0xE76E, 0x84FD }, { 0xE76F, 0x851E },
+	{ 0xE770, 0x84F6 }, { 0xE771, 0x8531 }, { 0xE772, 0x8526 }, { 0xE773, 0x84E7 }, { 0xE774, 0x84E8 }, { 0xE775, 0x84F0 }, { 0xE776, 0x84EF }, { 0xE777, 0x84F9 },
+	{ 0xE778, 0x8518 }, { 0xE779, 0x8520 }, { 0xE77A, 0x8530 }, { 0xE77B, 0x850B }, { 0xE77C, 0x8519 }, { 0xE77D, 0x852F }, { 0xE77E, 0x8662 }, { 0xE7A1, 0x8756 },
+	{ 0xE7A2, 0x8763 }, { 0xE7A3, 0x8764 }, { 0xE7A4, 0x8777 }, { 0xE7A5, 0x87E1 }, { 0xE7A6, 0x8773 }, { 0xE7A7, 0x8758 }, { 0xE7A8, 0x8754 }, { 0xE7A9, 0x875B },
+	{ 0xE7AA, 0x8752 }, { 0xE7AB, 0x8761 }, { 0xE7AC, 0x875A }, { 0xE7AD, 0x8751 }, { 0xE7AE, 0x875E }, { 0xE7AF, 0x876D }, { 0xE7B0, 0x876A }, { 0xE7B1, 0x8750 },
+	{ 0xE7B2, 0x874E }, { 0xE7B3, 0x875F }, { 0xE7B4, 0x875D }, { 0xE7B5, 0x876F }, { 0xE7B6, 0x876C }, { 0xE7B7, 0x877A }, { 0xE7B8, 0x876E }, { 0xE7B9, 0x875C },
+	{ 0xE7BA, 0x8765 }, { 0xE7BB, 0x874F }, { 0xE7BC, 0x877B }, { 0xE7BD, 0x8775 }, { 0xE7BE, 0x8762 }, { 0xE7BF, 0x8767 }, { 0xE7C0, 0x8769 }, { 0xE7C1, 0x885A },
+	{ 0xE7C2, 0x8905 }, { 0xE7C3, 0x890C }, { 0xE7C4, 0x8914 }, { 0xE7C5, 0x890B }, { 0xE7C6, 0x8917 }, { 0xE7C7, 0x8918 }, { 0xE7C8, 0x8919 }, { 0xE7C9, 0x8906 },
+	{ 0xE7CA, 0x8916 }, { 0xE7CB, 0x8911 }, { 0xE7CC, 0x890E }, { 0xE7CD, 0x8909 }, { 0xE7CE, 0x89A2 }, { 0xE7CF, 0x89A4 }, { 0xE7D0, 0x89A3 }, { 0xE7D1, 0x89ED },
+	{ 0xE7D2, 0x89F0 }, { 0xE7D3, 0x89EC }, { 0xE7D4, 0x8ACF }, { 0xE7D5, 0x8AC6 }, { 0xE7D6, 0x8AB8 }, { 0xE7D7, 0x8AD3 }, { 0xE7D8, 0x8AD1 }, { 0xE7D9, 0x8AD4 },
+	{ 0xE7DA, 0x8AD5 }, { 0xE7DB, 0x8ABB }, { 0xE7DC, 0x8AD7 }, { 0xE7DD, 0x8ABE }, { 0xE7DE, 0x8AC0 }, { 0xE7DF, 0x8AC5 }, { 0xE7E0, 0x8AD8 }, { 0xE7E1, 0x8AC3 },
+	{ 0xE7E2, 0x8ABA }, { 0xE7E3, 0x8ABD }, { 0xE7E4, 0x8AD9 }, { 0xE7E5, 0x8C3E }, { 0xE7E6, 0x8C4D }, { 0xE7E7, 0x8C8F }, { 0xE7E8, 0x8CE5 }, { 0xE7E9, 0x8CDF },
+	{ 0xE7EA, 0x8CD9 }, { 0xE7EB, 0x8CE8 }, { 0xE7EC, 0x8CDA }, { 0xE7ED, 0x8CDD }, { 0xE7EE, 0x8CE7 }, { 0xE7EF, 0x8DA0 }, { 0xE7F0, 0x8D9C }, { 0xE7F1, 0x8DA1 },
+	{ 0xE7F2, 0x8D9B }, { 0xE7F3, 0x8E20 }, { 0xE7F4, 0x8E23 }, { 0xE7F5, 0x8E25 }, { 0xE7F6, 0x8E24 }, { 0xE7F7, 0x8E2E }, { 0xE7F8, 0x8E15 }, { 0xE7F9, 0x8E1B },
+	{ 0xE7FA, 0x8E16 }, { 0xE7FB, 0x8E11 }, { 0xE7FC, 0x8E19 }, { 0xE7FD, 0x8E26 }, { 0xE7FE, 0x8E27 }, { 0xE840, 0x8E14 }, { 0xE841, 0x8E12 }, { 0xE842, 0x8E18 },
+	{ 0xE843, 0x8E13 }, { 0xE844, 0x8E1C }, { 0xE845, 0x8E17 }, { 0xE846, 0x8E1A }, { 0xE847, 0x8F2C }, { 0xE848, 0x8F24 }, { 0xE849, 0x8F18 }, { 0xE84A, 0x8F1A },
+	{ 0xE84B, 0x8F20 }, { 0xE84C, 0x8F23 }, { 0xE84D, 0x8F16 }, { 0xE84E, 0x8F17 }, { 0xE84F, 0x9073 }, { 0xE850, 0x9070 }, { 0xE851, 0x906F }, { 0xE852, 0x9067 },
+	{ 0xE853, 0x906B }, { 0xE854, 0x912F }, { 0xE855, 0x912B }, { 0xE856, 0x9129 }, { 0xE857, 0x912A }, { 0xE858, 0x9132 }, { 0xE859, 0x9126 }, { 0xE85A, 0x912E },
+	{ 0xE85B, 0x9185 }, { 0xE85C, 0x9186 }, { 0xE85D, 0x918A }, { 0xE85E, 0x9181 }, { 0xE85F, 0x9182 }, { 0xE860, 0x9184 }, { 0xE861, 0x9180 }, { 0xE862, 0x92D0 },
+	{ 0xE863, 0x92C3 }, { 0xE864, 0x92C4 }, { 0xE865, 0x92C0 }, { 0xE866, 0x92D9 }, { 0xE867, 0x92B6 }, { 0xE868, 0x92CF }, { 0xE869, 0x92F1 }, { 0xE86A, 0x92DF },
+	{ 0xE86B, 0x92D8 }, { 0xE86C, 0x92E9 }, { 0xE86D, 0x92D7 }, { 0xE86E, 0x92DD }, { 0xE86F, 0x92CC }, { 0xE870, 0x92EF }, { 0xE871, 0x92C2 }, { 0xE872, 0x92E8 },
+	{ 0xE873, 0x92CA }, { 0xE874, 0x92C8 }, { 0xE875, 0x92CE }, { 0xE876, 0x92E6 }, { 0xE877, 0x92CD }, { 0xE878, 0x92D5 }, { 0xE879, 0x92C9 }, { 0xE87A, 0x92E0 },
+	{ 0xE87B, 0x92DE }, { 0xE87C, 0x92E7 }, { 0xE87D, 0x92D1 }, { 0xE87E, 0x92D3 }, { 0xE8A1, 0x92B5 }, { 0xE8A2, 0x92E1 }, { 0xE8A3, 0x92C6 }, { 0xE8A4, 0x92B4 },
+	{ 0xE8A5, 0x957C }, { 0xE8A6, 0x95AC }, { 0xE8A7, 0x95AB }, { 0xE8A8, 0x95AE }, { 0xE8A9, 0x95B0 }, { 0xE8AA, 0x96A4 }, { 0xE8AB, 0x96A2 }, { 0xE8AC, 0x96D3 },
+	{ 0xE8AD, 0x9705 }, { 0xE8AE, 0x9708 }, { 0xE8AF, 0x9702 }, { 0xE8B0, 0x975A }, { 0xE8B1, 0x978A }, { 0xE8B2, 0x978E }, { 0xE8B3, 0x9788 }, { 0xE8B4, 0x97D0 },
+	{ 0xE8B5, 0x97CF }, { 0xE8B6, 0x981E }, { 0xE8B7, 0x981D }, { 0xE8B8, 0x9826 }, { 0xE8B9, 0x9829 }, { 0xE8BA, 0x9828 }, { 0xE8BB, 0x9820 }, { 0xE8BC, 0x981B },
+	{ 0xE8BD, 0x9827 }, { 0xE8BE, 0x98B2 }, { 0xE8BF, 0x9908 }, { 0xE8C0, 0x98FA }, { 0xE8C1, 0x9911 }, { 0xE8C2, 0x9914 }, { 0xE8C3, 0x9916 }, { 0xE8C4, 0x9917 },
+	{ 0xE8C5, 0x9915 }, { 0xE8C6, 0x99DC }, { 0xE8C7, 0x99CD }, { 0xE8C8, 0x99CF }, { 0xE8C9, 0x99D3 }, { 0xE8CA, 0x99D4 }, { 0xE8CB, 0x99CE }, { 0xE8CC, 0x99C9 },
+	{ 0xE8CD, 0x99D6 }, { 0xE8CE, 0x99D8 }, { 0xE8CF, 0x99CB }, { 0xE8D0, 0x99D7 }, { 0xE8D1, 0x99CC }, { 0xE8D2, 0x9AB3 }, { 0xE8D3, 0x9AEC }, { 0xE8D4, 0x9AEB },
+	{ 0xE8D5, 0x9AF3 }, { 0xE8D6, 0x9AF2 }, { 0xE8D7, 0x9AF1 }, { 0xE8D8, 0x9B46 }, { 0xE8D9, 0x9B43 }, { 0xE8DA, 0x9B67 }, { 0xE8DB, 0x9B74 }, { 0xE8DC, 0x9B71 },
+	{ 0xE8DD, 0x9B66 }, { 0xE8DE, 0x9B76 }, { 0xE8DF, 0x9B75 }, { 0xE8E0, 0x9B70 }, { 0xE8E1, 0x9B68 }, { 0xE8E2, 0x9B64 }, { 0xE8E3, 0x9B6C }, { 0xE8E4, 0x9CFC },
+	{ 0xE8E5, 0x9CFA }, { 0xE8E6, 0x9CFD }, { 0xE8E7, 0x9CFF }, { 0xE8E8, 0x9CF7 }, { 0xE8E9, 0x9D07 }, { 0xE8EA, 0x9D00 }, { 0xE8EB, 0x9CF9 }, { 0xE8EC, 0x9CFB },
+	{ 0xE8ED, 0x9D08 }, { 0xE8EE, 0x9D05 }, { 0xE8EF, 0x9D04 }, { 0xE8F0, 0x9E83 }, { 0xE8F1, 0x9ED3 }, { 0xE8F2, 0x9F0F }, { 0xE8F3, 0x9F10 }, { 0xE8F4, 0x511C },
+	{ 0xE8F5, 0x5113 }, { 0xE8F6, 0x5117 }, { 0xE8F7, 0x511A }, { 0xE8F8, 0x5111 }, { 0xE8F9, 0x51DE }, { 0xE8FA, 0x5334 }, { 0xE8FB, 0x53E1 }, { 0xE8FC, 0x5670 },
+	{ 0xE8FD, 0x5660 }, { 0xE8FE, 0x566E }, { 0xE940, 0x5673 }, { 0xE941, 0x5666 }, { 0xE942, 0x5663 }, { 0xE943, 0x566D }, { 0xE944, 0x5672 }, { 0xE945, 0x565E },
+	{ 0xE946, 0x5677 }, { 0xE947, 0x571C }, { 0xE948, 0x571B }, { 0xE949, 0x58C8 }, { 0xE94A, 0x58BD }, { 0xE94B, 0x58C9 }, { 0xE94C, 0x58BF }, { 0xE94D, 0x58BA },
+	{ 0xE94E, 0x58C2 }, { 0xE94F, 0x58BC }, { 0xE950, 0x58C6 }, { 0xE951, 0x5B17 }, { 0xE952, 0x5B19 }, { 0xE953, 0x5B1B }, { 0xE954, 0x5B21 }, { 0xE955, 0x5B14 },
+	{ 0xE956, 0x5B13 }, { 0xE957, 0x5B10 }, { 0xE958, 0x5B16 }, { 0xE959, 0x5B28 }, { 0xE95A, 0x5B1A }, { 0xE95B, 0x5B20 }, { 0xE95C, 0x5B1E }, { 0xE95D, 0x5BEF },
+	{ 0xE95E, 0x5DAC }, { 0xE95F, 0x5DB1 }, { 0xE960, 0x5DA9 }, { 0xE961, 0x5DA7 }, { 0xE962, 0x5DB5 }, { 0xE963, 0x5DB0 }, { 0xE964, 0x5DAE }, { 0xE965, 0x5DAA },
+	{ 0xE966, 0x5DA8 }, { 0xE967, 0x5DB2 }, { 0xE968, 0x5DAD }, { 0xE969, 0x5DAF }, { 0xE96A, 0x5DB4 }, { 0xE96B, 0x5E67 }, { 0xE96C, 0x5E68 }, { 0xE96D, 0x5E66 },
+	{ 0xE96E, 0x5E6F }, { 0xE96F, 0x5EE9 }, { 0xE970, 0x5EE7 }, { 0xE971, 0x5EE6 }, { 0xE972, 0x5EE8 }, { 0xE973, 0x5EE5 }, { 0xE974, 0x5F4B }, { 0xE975, 0x5FBC },
+	{ 0xE976, 0x619D }, { 0xE977, 0x61A8 }, { 0xE978, 0x6196 }, { 0xE979, 0x61C5 }, { 0xE97A, 0x61B4 }, { 0xE97B, 0x61C6 }, { 0xE97C, 0x61C1 }, { 0xE97D, 0x61CC },
+	{ 0xE97E, 0x61BA }, { 0xE9A1, 0x61BF }, { 0xE9A2, 0x61B8 }, { 0xE9A3, 0x618C }, { 0xE9A4, 0x64D7 }, { 0xE9A5, 0x64D6 }, { 0xE9A6, 0x64D0 }, { 0xE9A7, 0x64CF },
+	{ 0xE9A8, 0x64C9 }, { 0xE9A9, 0x64BD }, { 0xE9AA, 0x6489 }, { 0xE9AB, 0x64C3 }, { 0xE9AC, 0x64DB }, { 0xE9AD, 0x64F3 }, { 0xE9AE, 0x64D9 }, { 0xE9AF, 0x6533 },
+	{ 0xE9B0, 0x657F }, { 0xE9B1, 0x657C }, { 0xE9B2, 0x65A2 }, { 0xE9B3, 0x66C8 }, { 0xE9B4, 0x66BE }, { 0xE9B5, 0x66C0 }, { 0xE9B6, 0x66CA }, { 0xE9B7, 0x66CB },
+	{ 0xE9B8, 0x66CF }, { 0xE9B9, 0x66BD }, { 0xE9BA, 0x66BB }, { 0xE9BB, 0x66BA }, { 0xE9BC, 0x66CC }, { 0xE9BD, 0x6723 }, { 0xE9BE, 0x6A34 }, { 0xE9BF, 0x6A66 },
+	{ 0xE9C0, 0x6A49 }, { 0xE9C1, 0x6A67 }, { 0xE9C2, 0x6A32 }, { 0xE9C3, 0x6A68 }, { 0xE9C4, 0x6A3E }, { 0xE9C5, 0x6A5D }, { 0xE9C6, 0x6A6D }, { 0xE9C7, 0x6A76 },
+	{ 0xE9C8, 0x6A5B }, { 0xE9C9, 0x6A51 }, { 0xE9CA, 0x6A28 }, { 0xE9CB, 0x6A5A }, { 0xE9CC, 0x6A3B }, { 0xE9CD, 0x6A3F }, { 0xE9CE, 0x6A41 }, { 0xE9CF, 0x6A6A },
+	{ 0xE9D0, 0x6A64 }, { 0xE9D1, 0x6A50 }, { 0xE9D2, 0x6A4F }, { 0xE9D3, 0x6A54 }, { 0xE9D4, 0x6A6F }, { 0xE9D5, 0x6A69 }, { 0xE9D6, 0x6A60 }, { 0xE9D7, 0x6A3C },
+	{ 0xE9D8, 0x6A5E }, { 0xE9D9, 0x6A56 }, { 0xE9DA, 0x6A55 }, { 0xE9DB, 0x6A4D }, { 0xE9DC, 0x6A4E }, { 0xE9DD, 0x6A46 }, { 0xE9DE, 0x6B55 }, { 0xE9DF, 0x6B54 },
+	{ 0xE9E0, 0x6B56 }, { 0xE9E1, 0x6BA7 }, { 0xE9E2, 0x6BAA }, { 0xE9E3, 0x6BAB }, { 0xE9E4, 0x6BC8 }, { 0xE9E5, 0x6BC7 }, { 0xE9E6, 0x6C04 }, { 0xE9E7, 0x6C03 },
+	{ 0xE9E8, 0x6C06 }, { 0xE9E9, 0x6FAD }, { 0xE9EA, 0x6FCB }, { 0xE9EB, 0x6FA3 }, { 0xE9EC, 0x6FC7 }, { 0xE9ED, 0x6FBC }, { 0xE9EE, 0x6FCE }, { 0xE9EF, 0x6FC8 },
+	{ 0xE9F0, 0x6F5E }, { 0xE9F1, 0x6FC4 }, { 0xE9F2, 0x6FBD }, { 0xE9F3, 0x6F9E }, { 0xE9F4, 0x6FCA }, { 0xE9F5, 0x6FA8 }, { 0xE9F6, 0x7004 }, { 0xE9F7, 0x6FA5 },
+	{ 0xE9F8, 0x6FAE }, { 0xE9F9, 0x6FBA }, { 0xE9FA, 0x6FAC }, { 0xE9FB, 0x6FAA }, { 0xE9FC, 0x6FCF }, { 0xE9FD, 0x6FBF }, { 0xE9FE, 0x6FB8 }, { 0xEA40, 0x6FA2 },
+	{ 0xEA41, 0x6FC9 }, { 0xEA42, 0x6FAB }, { 0xEA43, 0x6FCD }, { 0xEA44, 0x6FAF }, { 0xEA45, 0x6FB2 }, { 0xEA46, 0x6FB0 }, { 0xEA47, 0x71C5 }, { 0xEA48, 0x71C2 },
+	{ 0xEA49, 0x71BF }, { 0xEA4A, 0x71B8 }, { 0xEA4B, 0x71D6 }, { 0xEA4C, 0x71C0 }, { 0xEA4D, 0x71C1 }, { 0xEA4E, 0x71CB }, { 0xEA4F, 0x71D4 }, { 0xEA50, 0x71CA },
+	{ 0xEA51, 0x71C7 }, { 0xEA52, 0x71CF }, { 0xEA53, 0x71BD }, { 0xEA54, 0x71D8 }, { 0xEA55, 0x71BC }, { 0xEA56, 0x71C6 }, { 0xEA57, 0x71DA }, { 0xEA58, 0x71DB },
+	{ 0xEA59, 0x729D }, { 0xEA5A, 0x729E }, { 0xEA5B, 0x7369 }, { 0xEA5C, 0x7366 }, { 0xEA5D, 0x7367 }, { 0xEA5E, 0x736C }, { 0xEA5F, 0x7365 }, { 0xEA60, 0x736B },
+	{ 0xEA61, 0x736A }, { 0xEA62, 0x747F }, { 0xEA63, 0x749A }, { 0xEA64, 0x74A0 }, { 0xEA65, 0x7494 }, { 0xEA66, 0x7492 }, { 0xEA67, 0x7495 }, { 0xEA68, 0x74A1 },
+	{ 0xEA69, 0x750B }, { 0xEA6A, 0x7580 }, { 0xEA6B, 0x762F }, { 0xEA6C, 0x762D }, { 0xEA6D, 0x7631 }, { 0xEA6E, 0x763D }, { 0xEA6F, 0x7633 }, { 0xEA70, 0x763C },
+	{ 0xEA71, 0x7635 }, { 0xEA72, 0x7632 }, { 0xEA73, 0x7630 }, { 0xEA74, 0x76BB }, { 0xEA75, 0x76E6 }, { 0xEA76, 0x779A }, { 0xEA77, 0x779D }, { 0xEA78, 0x77A1 },
+	{ 0xEA79, 0x779C }, { 0xEA7A, 0x779B }, { 0xEA7B, 0x77A2 }, { 0xEA7C, 0x77A3 }, { 0xEA7D, 0x7795 }, { 0xEA7E, 0x7799 }, { 0xEAA1, 0x7797 }, { 0xEAA2, 0x78DD },
+	{ 0xEAA3, 0x78E9 }, { 0xEAA4, 0x78E5 }, { 0xEAA5, 0x78EA }, { 0xEAA6, 0x78DE }, { 0xEAA7, 0x78E3 }, { 0xEAA8, 0x78DB }, { 0xEAA9, 0x78E1 }, { 0xEAAA, 0x78E2 },
+	{ 0xEAAB, 0x78ED }, { 0xEAAC, 0x78DF }, { 0xEAAD, 0x78E0 }, { 0xEAAE, 0x79A4 }, { 0xEAAF, 0x7A44 }, { 0xEAB0, 0x7A48 }, { 0xEAB1, 0x7A47 }, { 0xEAB2, 0x7AB6 },
+	{ 0xEAB3, 0x7AB8 }, { 0xEAB4, 0x7AB5 }, { 0xEAB5, 0x7AB1 }, { 0xEAB6, 0x7AB7 }, { 0xEAB7, 0x7BDE }, { 0xEAB8, 0x7BE3 }, { 0xEAB9, 0x7BE7 }, { 0xEABA, 0x7BDD },
+	{ 0xEABB, 0x7BD5 }, { 0xEABC, 0x7BE5 }, { 0xEABD, 0x7BDA }, { 0xEABE, 0x7BE8 }, { 0xEABF, 0x7BF9 }, { 0xEAC0, 0x7BD4 }, { 0xEAC1, 0x7BEA }, { 0xEAC2, 0x7BE2 },
+	{ 0xEAC3, 0x7BDC }, { 0xEAC4, 0x7BEB }, { 0xEAC5, 0x7BD8 }, { 0xEAC6, 0x7BDF }, { 0xEAC7, 0x7CD2 }, { 0xEAC8, 0x7CD4 }, { 0xEAC9, 0x7CD7 }, { 0xEACA, 0x7CD0 },
+	{ 0xEACB, 0x7CD1 }, { 0xEACC, 0x7E12 }, { 0xEACD, 0x7E21 }, { 0xEACE, 0x7E17 }, { 0xEACF, 0x7E0C }, { 0xEAD0, 0x7E1F }, { 0xEAD1, 0x7E20 }, { 0xEAD2, 0x7E13 },
+	{ 0xEAD3, 0x7E0E }, { 0xEAD4, 0x7E1C }, { 0xEAD5, 0x7E15 }, { 0xEAD6, 0x7E1A }, { 0xEAD7, 0x7E22 }, { 0xEAD8, 0x7E0B }, { 0xEAD9, 0x7E0F }, { 0xEADA, 0x7E16 },
+	{ 0xEADB, 0x7E0D }, { 0xEADC, 0x7E14 }, { 0xEADD, 0x7E25 }, { 0xEADE, 0x7E24 }, { 0xEADF, 0x7F43 }, { 0xEAE0, 0x7F7B }, { 0xEAE1, 0x7F7C }, { 0xEAE2, 0x7F7A },
+	{ 0xEAE3, 0x7FB1 }, { 0xEAE4, 0x7FEF }, { 0xEAE5, 0x802A }, { 0xEAE6, 0x8029 }, { 0xEAE7, 0x806C }, { 0xEAE8, 0x81B1 }, { 0xEAE9, 0x81A6 }, { 0xEAEA, 0x81AE },
+	{ 0xEAEB, 0x81B9 }, { 0xEAEC, 0x81B5 }, { 0xEAED, 0x81AB }, { 0xEAEE, 0x81B0 }, { 0xEAEF, 0x81AC }, { 0xEAF0, 0x81B4 }, { 0xEAF1, 0x81B2 }, { 0xEAF2, 0x81B7 },
+	{ 0xEAF3, 0x81A7 }, { 0xEAF4, 0x81F2 }, { 0xEAF5, 0x8255 }, { 0xEAF6, 0x8256 }, { 0xEAF7, 0x8257 }, { 0xEAF8, 0x8556 }, { 0xEAF9, 0x8545 }, { 0xEAFA, 0x856B },
+	{ 0xEAFB, 0x854D }, { 0xEAFC, 0x8553 }, { 0xEAFD, 0x8561 }, { 0xEAFE, 0x8558 }, { 0xEB40, 0x8540 }, { 0xEB41, 0x8546 }, { 0xEB42, 0x8564 }, { 0xEB43, 0x8541 },
+	{ 0xEB44, 0x8562 }, { 0xEB45, 0x8544 }, { 0xEB46, 0x8551 }, { 0xEB47, 0x8547 }, { 0xEB48, 0x8563 }, { 0xEB49, 0x853E }, { 0xEB4A, 0x855B }, { 0xEB4B, 0x8571 },
+	{ 0xEB4C, 0x854E }, { 0xEB4D, 0x856E }, { 0xEB4E, 0x8575 }, { 0xEB4F, 0x8555 }, { 0xEB50, 0x8567 }, { 0xEB51, 0x8560 }, { 0xEB52, 0x858C }, { 0xEB53, 0x8566 },
+	{ 0xEB54, 0x855D }, { 0xEB55, 0x8554 }, { 0xEB56, 0x8565 }, { 0xEB57, 0x856C }, { 0xEB58, 0x8663 }, { 0xEB59, 0x8665 }, { 0xEB5A, 0x8664 }, { 0xEB5B, 0x879B },
+	{ 0xEB5C, 0x878F }, { 0xEB5D, 0x8797 }, { 0xEB5E, 0x8793 }, { 0xEB5F, 0x8792 }, { 0xEB60, 0x8788 }, { 0xEB61, 0x8781 }, { 0xEB62, 0x8796 }, { 0xEB63, 0x8798 },
+	{ 0xEB64, 0x8779 }, { 0xEB65, 0x8787 }, { 0xEB66, 0x87A3 }, { 0xEB67, 0x8785 }, { 0xEB68, 0x8790 }, { 0xEB69, 0x8791 }, { 0xEB6A, 0x879D }, { 0xEB6B, 0x8784 },
+	{ 0xEB6C, 0x8794 }, { 0xEB6D, 0x879C }, { 0xEB6E, 0x879A }, { 0xEB6F, 0x8789 }, { 0xEB70, 0x891E }, { 0xEB71, 0x8926 }, { 0xEB72, 0x8930 }, { 0xEB73, 0x892D },
+	{ 0xEB74, 0x892E }, { 0xEB75, 0x8927 }, { 0xEB76, 0x8931 }, { 0xEB77, 0x8922 }, { 0xEB78, 0x8929 }, { 0xEB79, 0x8923 }, { 0xEB7A, 0x892F }, { 0xEB7B, 0x892C },
+	{ 0xEB7C, 0x891F }, { 0xEB7D, 0x89F1 }, { 0xEB7E, 0x8AE0 }, { 0xEBA1, 0x8AE2 }, { 0xEBA2, 0x8AF2 }, { 0xEBA3, 0x8AF4 }, { 0xEBA4, 0x8AF5 }, { 0xEBA5, 0x8ADD },
+	{ 0xEBA6, 0x8B14 }, { 0xEBA7, 0x8AE4 }, { 0xEBA8, 0x8ADF }, { 0xEBA9, 0x8AF0 }, { 0xEBAA, 0x8AC8 }, { 0xEBAB, 0x8ADE }, { 0xEBAC, 0x8AE1 }, { 0xEBAD, 0x8AE8 },
+	{ 0xEBAE, 0x8AFF }, { 0xEBAF, 0x8AEF }, { 0xEBB0, 0x8AFB }, { 0xEBB1, 0x8C91 }, { 0xEBB2, 0x8C92 }, { 0xEBB3, 0x8C90 }, { 0xEBB4, 0x8CF5 }, { 0xEBB5, 0x8CEE },
+	{ 0xEBB6, 0x8CF1 }, { 0xEBB7, 0x8CF0 }, { 0xEBB8, 0x8CF3 }, { 0xEBB9, 0x8D6C }, { 0xEBBA, 0x8D6E }, { 0xEBBB, 0x8DA5 }, { 0xEBBC, 0x8DA7 }, { 0xEBBD, 0x8E33 },
+	{ 0xEBBE, 0x8E3E }, { 0xEBBF, 0x8E38 }, { 0xEBC0, 0x8E40 }, { 0xEBC1, 0x8E45 }, { 0xEBC2, 0x8E36 }, { 0xEBC3, 0x8E3C }, { 0xEBC4, 0x8E3D }, { 0xEBC5, 0x8E41 },
+	{ 0xEBC6, 0x8E30 }, { 0xEBC7, 0x8E3F }, { 0xEBC8, 0x8EBD }, { 0xEBC9, 0x8F36 }, { 0xEBCA, 0x8F2E }, { 0xEBCB, 0x8F35 }, { 0xEBCC, 0x8F32 }, { 0xEBCD, 0x8F39 },
+	{ 0xEBCE, 0x8F37 }, { 0xEBCF, 0x8F34 }, { 0xEBD0, 0x9076 }, { 0xEBD1, 0x9079 }, { 0xEBD2, 0x907B }, { 0xEBD3, 0x9086 }, { 0xEBD4, 0x90FA }, { 0xEBD5, 0x9133 },
+	{ 0xEBD6, 0x9135 }, { 0xEBD7, 0x9136 }, { 0xEBD8, 0x9193 }, { 0xEBD9, 0x9190 }, { 0xEBDA, 0x9191 }, { 0xEBDB, 0x918D }, { 0xEBDC, 0x918F }, { 0xEBDD, 0x9327 },
+	{ 0xEBDE, 0x931E }, { 0xEBDF, 0x9308 }, { 0xEBE0, 0x931F }, { 0xEBE1, 0x9306 }, { 0xEBE2, 0x930F }, { 0xEBE3, 0x937A }, { 0xEBE4, 0x9338 }, { 0xEBE5, 0x933C },
+	{ 0xEBE6, 0x931B }, { 0xEBE7, 0x9323 }, { 0xEBE8, 0x9312 }, { 0xEBE9, 0x9301 }, { 0xEBEA, 0x9346 }, { 0xEBEB, 0x932D }, { 0xEBEC, 0x930E }, { 0xEBED, 0x930D },
+	{ 0xEBEE, 0x92CB }, { 0xEBEF, 0x931D }, { 0xEBF0, 0x92FA }, { 0xEBF1, 0x9325 }, { 0xEBF2, 0x9313 }, { 0xEBF3, 0x92F9 }, { 0xEBF4, 0x92F7 }, { 0xEBF5, 0x9334 },
+	{ 0xEBF6, 0x9302 }, { 0xEBF7, 0x9324 }, { 0xEBF8, 0x92FF }, { 0xEBF9, 0x9329 }, { 0xEBFA, 0x9339 }, { 0xEBFB, 0x9335 }, { 0xEBFC, 0x932A }, { 0xEBFD, 0x9314 },
+	{ 0xEBFE, 0x930C }, { 0xEC40, 0x930B }, { 0xEC41, 0x92FE }, { 0xEC42, 0x9309 }, { 0xEC43, 0x9300 }, { 0xEC44, 0x92FB }, { 0xEC45, 0x9316 }, { 0xEC46, 0x95BC },
+	{ 0xEC47, 0x95CD }, { 0xEC48, 0x95BE }, { 0xEC49, 0x95B9 }, { 0xEC4A, 0x95BA }, { 0xEC4B, 0x95B6 }, { 0xEC4C, 0x95BF }, { 0xEC4D, 0x95B5 }, { 0xEC4E, 0x95BD },
+	{ 0xEC4F, 0x96A9 }, { 0xEC50, 0x96D4 }, { 0xEC51, 0x970B }, { 0xEC52, 0x9712 }, { 0xEC53, 0x9710 }, { 0xEC54, 0x9799 }, { 0xEC55, 0x9797 }, { 0xEC56, 0x9794 },
+	{ 0xEC57, 0x97F0 }, { 0xEC58, 0x97F8 }, { 0xEC59, 0x9835 }, { 0xEC5A, 0x982F }, { 0xEC5B, 0x9832 }, { 0xEC5C, 0x9924 }, { 0xEC5D, 0x991F }, { 0xEC5E, 0x9927 },
+	{ 0xEC5F, 0x9929 }, { 0xEC60, 0x999E }, { 0xEC61, 0x99EE }, { 0xEC62, 0x99EC }, { 0xEC63, 0x99E5 }, { 0xEC64, 0x99E4 }, { 0xEC65, 0x99F0 }, { 0xEC66, 0x99E3 },
+	{ 0xEC67, 0x99EA }, { 0xEC68, 0x99E9 }, { 0xEC69, 0x99E7 }, { 0xEC6A, 0x9AB9 }, { 0xEC6B, 0x9ABF }, { 0xEC6C, 0x9AB4 }, { 0xEC6D, 0x9ABB }, { 0xEC6E, 0x9AF6 },
+	{ 0xEC6F, 0x9AFA }, { 0xEC70, 0x9AF9 }, { 0xEC71, 0x9AF7 }, { 0xEC72, 0x9B33 }, { 0xEC73, 0x9B80 }, { 0xEC74, 0x9B85 }, { 0xEC75, 0x9B87 }, { 0xEC76, 0x9B7C },
+	{ 0xEC77, 0x9B7E }, { 0xEC78, 0x9B7B }, { 0xEC79, 0x9B82 }, { 0xEC7A, 0x9B93 }, { 0xEC7B, 0x9B92 }, { 0xEC7C, 0x9B90 }, { 0xEC7D, 0x9B7A }, { 0xEC7E, 0x9B95 },
+	{ 0xECA1, 0x9B7D }, { 0xECA2, 0x9B88 }, { 0xECA3, 0x9D25 }, { 0xECA4, 0x9D17 }, { 0xECA5, 0x9D20 }, { 0xECA6, 0x9D1E }, { 0xECA7, 0x9D14 }, { 0xECA8, 0x9D29 },
+	{ 0xECA9, 0x9D1D }, { 0xECAA, 0x9D18 }, { 0xECAB, 0x9D22 }, { 0xECAC, 0x9D10 }, { 0xECAD, 0x9D19 }, { 0xECAE, 0x9D1F }, { 0xECAF, 0x9E88 }, { 0xECB0, 0x9E86 },
+	{ 0xECB1, 0x9E87 }, { 0xECB2, 0x9EAE }, { 0xECB3, 0x9EAD }, { 0xECB4, 0x9ED5 }, { 0xECB5, 0x9ED6 }, { 0xECB6, 0x9EFA }, { 0xECB7, 0x9F12 }, { 0xECB8, 0x9F3D },
+	{ 0xECB9, 0x5126 }, { 0xECBA, 0x5125 }, { 0xECBB, 0x5122 }, { 0xECBC, 0x5124 }, { 0xECBD, 0x5120 }, { 0xECBE, 0x5129 }, { 0xECBF, 0x52F4 }, { 0xECC0, 0x5693 },
+	{ 0xECC1, 0x568C }, { 0xECC2, 0x568D }, { 0xECC3, 0x5686 }, { 0xECC4, 0x5684 }, { 0xECC5, 0x5683 }, { 0xECC6, 0x567E }, { 0xECC7, 0x5682 }, { 0xECC8, 0x567F },
+	{ 0xECC9, 0x5681 }, { 0xECCA, 0x58D6 }, { 0xECCB, 0x58D4 }, { 0xECCC, 0x58CF }, { 0xECCD, 0x58D2 }, { 0xECCE, 0x5B2D }, { 0xECCF, 0x5B25 }, { 0xECD0, 0x5B32 },
+	{ 0xECD1, 0x5B23 }, { 0xECD2, 0x5B2C }, { 0xECD3, 0x5B27 }, { 0xECD4, 0x5B26 }, { 0xECD5, 0x5B2F }, { 0xECD6, 0x5B2E }, { 0xECD7, 0x5B7B }, { 0xECD8, 0x5BF1 },
+	{ 0xECD9, 0x5BF2 }, { 0xECDA, 0x5DB7 }, { 0xECDB, 0x5E6C }, { 0xECDC, 0x5E6A }, { 0xECDD, 0x5FBE }, { 0xECDE, 0x5FBB }, { 0xECDF, 0x61C3 }, { 0xECE0, 0x61B5 },
+	{ 0xECE1, 0x61BC }, { 0xECE2, 0x61E7 }, { 0xECE3, 0x61E0 }, { 0xECE4, 0x61E5 }, { 0xECE5, 0x61E4 }, { 0xECE6, 0x61E8 }, { 0xECE7, 0x61DE }, { 0xECE8, 0x64EF },
+	{ 0xECE9, 0x64E9 }, { 0xECEA, 0x64E3 }, { 0xECEB, 0x64EB }, { 0xECEC, 0x64E4 }, { 0xECED, 0x64E8 }, { 0xECEE, 0x6581 }, { 0xECEF, 0x6580 }, { 0xECF0, 0x65B6 },
+	{ 0xECF1, 0x65DA }, { 0xECF2, 0x66D2 }, { 0xECF3, 0x6A8D }, { 0xECF4, 0x6A96 }, { 0xECF5, 0x6A81 }, { 0xECF6, 0x6AA5 }, { 0xECF7, 0x6A89 }, { 0xECF8, 0x6A9F },
+	{ 0xECF9, 0x6A9B }, { 0xECFA, 0x6AA1 }, { 0xECFB, 0x6A9E }, { 0xECFC, 0x6A87 }, { 0xECFD, 0x6A93 }, { 0xECFE, 0x6A8E }, { 0xED40, 0x6A95 }, { 0xED41, 0x6A83 },
+	{ 0xED42, 0x6AA8 }, { 0xED43, 0x6AA4 }, { 0xED44, 0x6A91 }, { 0xED45, 0x6A7F }, { 0xED46, 0x6AA6 }, { 0xED47, 0x6A9A }, { 0xED48, 0x6A85 }, { 0xED49, 0x6A8C },
+	{ 0xED4A, 0x6A92 }, { 0xED4B, 0x6B5B }, { 0xED4C, 0x6BAD }, { 0xED4D, 0x6C09 }, { 0xED4E, 0x6FCC }, { 0xED4F, 0x6FA9 }, { 0xED50, 0x6FF4 }, { 0xED51, 0x6FD4 },
+	{ 0xED52, 0x6FE3 }, { 0xED53, 0x6FDC }, { 0xED54, 0x6FED }, { 0xED55, 0x6FE7 }, { 0xED56, 0x6FE6 }, { 0xED57, 0x6FDE }, { 0xED58, 0x6FF2 }, { 0xED59, 0x6FDD },
+	{ 0xED5A, 0x6FE2 }, { 0xED5B, 0x6FE8 }, { 0xED5C, 0x71E1 }, { 0xED5D, 0x71F1 }, { 0xED5E, 0x71E8 }, { 0xED5F, 0x71F2 }, { 0xED60, 0x71E4 }, { 0xED61, 0x71F0 },
+	{ 0xED62, 0x71E2 }, { 0xED63, 0x7373 }, { 0xED64, 0x736E }, { 0xED65, 0x736F }, { 0xED66, 0x7497 }, { 0xED67, 0x74B2 }, { 0xED68, 0x74AB }, { 0xED69, 0x7490 },
+	{ 0xED6A, 0x74AA }, { 0xED6B, 0x74AD }, { 0xED6C, 0x74B1 }, { 0xED6D, 0x74A5 }, { 0xED6E, 0x74AF }, { 0xED6F, 0x7510 }, { 0xED70, 0x7511 }, { 0xED71, 0x7512 },
+	{ 0xED72, 0x750F }, { 0xED73, 0x7584 }, { 0xED74, 0x7643 }, { 0xED75, 0x7648 }, { 0xED76, 0x7649 }, { 0xED77, 0x7647 }, { 0xED78, 0x76A4 }, { 0xED79, 0x76E9 },
+	{ 0xED7A, 0x77B5 }, { 0xED7B, 0x77AB }, { 0xED7C, 0x77B2 }, { 0xED7D, 0x77B7 }, { 0xED7E, 0x77B6 }, { 0xEDA1, 0x77B4 }, { 0xEDA2, 0x77B1 }, { 0xEDA3, 0x77A8 },
+	{ 0xEDA4, 0x77F0 }, { 0xEDA5, 0x78F3 }, { 0xEDA6, 0x78FD }, { 0xEDA7, 0x7902 }, { 0xEDA8, 0x78FB }, { 0xEDA9, 0x78FC }, { 0xEDAA, 0x78F2 }, { 0xEDAB, 0x7905 },
+	{ 0xEDAC, 0x78F9 }, { 0xEDAD, 0x78FE }, { 0xEDAE, 0x7904 }, { 0xEDAF, 0x79AB }, { 0xEDB0, 0x79A8 }, { 0xEDB1, 0x7A5C }, { 0xEDB2, 0x7A5B }, { 0xEDB3, 0x7A56 },
+	{ 0xEDB4, 0x7A58 }, { 0xEDB5, 0x7A54 }, { 0xEDB6, 0x7A5A }, { 0xEDB7, 0x7ABE }, { 0xEDB8, 0x7AC0 }, { 0xEDB9, 0x7AC1 }, { 0xEDBA, 0x7C05 }, { 0xEDBB, 0x7C0F },
+	{ 0xEDBC, 0x7BF2 }, { 0xEDBD, 0x7C00 }, { 0xEDBE, 0x7BFF }, { 0xEDBF, 0x7BFB }, { 0xEDC0, 0x7C0E }, { 0xEDC1, 0x7BF4 }, { 0xEDC2, 0x7C0B }, { 0xEDC3, 0x7BF3 },
+	{ 0xEDC4, 0x7C02 }, { 0xEDC5, 0x7C09 }, { 0xEDC6, 0x7C03 }, { 0xEDC7, 0x7C01 }, { 0xEDC8, 0x7BF8 }, { 0xEDC9, 0x7BFD }, { 0xEDCA, 0x7C06 }, { 0xEDCB, 0x7BF0 },
+	{ 0xEDCC, 0x7BF1 }, { 0xEDCD, 0x7C10 }, { 0xEDCE, 0x7C0A }, { 0xEDCF, 0x7CE8 }, { 0xEDD0, 0x7E2D }, { 0xEDD1, 0x7E3C }, { 0xEDD2, 0x7E42 }, { 0xEDD3, 0x7E33 },
+	{ 0xEDD4, 0x9848 }, { 0xEDD5, 0x7E38 }, { 0xEDD6, 0x7E2A }, { 0xEDD7, 0x7E49 }, { 0xEDD8, 0x7E40 }, { 0xEDD9, 0x7E47 }, { 0xEDDA, 0x7E29 }, { 0xEDDB, 0x7E4C },
+	{ 0xEDDC, 0x7E30 }, { 0xEDDD, 0x7E3B }, { 0xEDDE, 0x7E36 }, { 0xEDDF, 0x7E44 }, { 0xEDE0, 0x7E3A }, { 0xEDE1, 0x7F45 }, { 0xEDE2, 0x7F7F }, { 0xEDE3, 0x7F7E },
+	{ 0xEDE4, 0x7F7D }, { 0xEDE5, 0x7FF4 }, { 0xEDE6, 0x7FF2 }, { 0xEDE7, 0x802C }, { 0xEDE8, 0x81BB }, { 0xEDE9, 0x81C4 }, { 0xEDEA, 0x81CC }, { 0xEDEB, 0x81CA },
+	{ 0xEDEC, 0x81C5 }, { 0xEDED, 0x81C7 }, { 0xEDEE, 0x81BC }, { 0xEDEF, 0x81E9 }, { 0xEDF0, 0x825B }, { 0xEDF1, 0x825A }, { 0xEDF2, 0x825C }, { 0xEDF3, 0x8583 },
+	{ 0xEDF4, 0x8580 }, { 0xEDF5, 0x858F }, { 0xEDF6, 0x85A7 }, { 0xEDF7, 0x8595 }, { 0xEDF8, 0x85A0 }, { 0xEDF9, 0x858B }, { 0xEDFA, 0x85A3 }, { 0xEDFB, 0x857B },
+	{ 0xEDFC, 0x85A4 }, { 0xEDFD, 0x859A }, { 0xEDFE, 0x859E }, { 0xEE40, 0x8577 }, { 0xEE41, 0x857C }, { 0xEE42, 0x8589 }, { 0xEE43, 0x85A1 }, { 0xEE44, 0x857A },
+	{ 0xEE45, 0x8578 }, { 0xEE46, 0x8557 }, { 0xEE47, 0x858E }, { 0xEE48, 0x8596 }, { 0xEE49, 0x8586 }, { 0xEE4A, 0x858D }, { 0xEE4B, 0x8599 }, { 0xEE4C, 0x859D },
+	{ 0xEE4D, 0x8581 }, { 0xEE4E, 0x85A2 }, { 0xEE4F, 0x8582 }, { 0xEE50, 0x8588 }, { 0xEE51, 0x8585 }, { 0xEE52, 0x8579 }, { 0xEE53, 0x8576 }, { 0xEE54, 0x8598 },
+	{ 0xEE55, 0x8590 }, { 0xEE56, 0x859F }, { 0xEE57, 0x8668 }, { 0xEE58, 0x87BE }, { 0xEE59, 0x87AA }, { 0xEE5A, 0x87AD }, { 0xEE5B, 0x87C5 }, { 0xEE5C, 0x87B0 },
+	{ 0xEE5D, 0x87AC }, { 0xEE5E, 0x87B9 }, { 0xEE5F, 0x87B5 }, { 0xEE60, 0x87BC }, { 0xEE61, 0x87AE }, { 0xEE62, 0x87C9 }, { 0xEE63, 0x87C3 }, { 0xEE64, 0x87C2 },
+	{ 0xEE65, 0x87CC }, { 0xEE66, 0x87B7 }, { 0xEE67, 0x87AF }, { 0xEE68, 0x87C4 }, { 0xEE69, 0x87CA }, { 0xEE6A, 0x87B4 }, { 0xEE6B, 0x87B6 }, { 0xEE6C, 0x87BF },
+	{ 0xEE6D, 0x87B8 }, { 0xEE6E, 0x87BD }, { 0xEE6F, 0x87DE }, { 0xEE70, 0x87B2 }, { 0xEE71, 0x8935 }, { 0xEE72, 0x8933 }, { 0xEE73, 0x893C }, { 0xEE74, 0x893E },
+	{ 0xEE75, 0x8941 }, { 0xEE76, 0x8952 }, { 0xEE77, 0x8937 }, { 0xEE78, 0x8942 }, { 0xEE79, 0x89AD }, { 0xEE7A, 0x89AF }, { 0xEE7B, 0x89AE }, { 0xEE7C, 0x89F2 },
+	{ 0xEE7D, 0x89F3 }, { 0xEE7E, 0x8B1E }, { 0xEEA1, 0x8B18 }, { 0xEEA2, 0x8B16 }, { 0xEEA3, 0x8B11 }, { 0xEEA4, 0x8B05 }, { 0xEEA5, 0x8B0B }, { 0xEEA6, 0x8B22 },
+	{ 0xEEA7, 0x8B0F }, { 0xEEA8, 0x8B12 }, { 0xEEA9, 0x8B15 }, { 0xEEAA, 0x8B07 }, { 0xEEAB, 0x8B0D }, { 0xEEAC, 0x8B08 }, { 0xEEAD, 0x8B06 }, { 0xEEAE, 0x8B1C },
+	{ 0xEEAF, 0x8B13 }, { 0xEEB0, 0x8B1A }, { 0xEEB1, 0x8C4F }, { 0xEEB2, 0x8C70 }, { 0xEEB3, 0x8C72 }, { 0xEEB4, 0x8C71 }, { 0xEEB5, 0x8C6F }, { 0xEEB6, 0x8C95 },
+	{ 0xEEB7, 0x8C94 }, { 0xEEB8, 0x8CF9 }, { 0xEEB9, 0x8D6F }, { 0xEEBA, 0x8E4E }, { 0xEEBB, 0x8E4D }, { 0xEEBC, 0x8E53 }, { 0xEEBD, 0x8E50 }, { 0xEEBE, 0x8E4C },
+	{ 0xEEBF, 0x8E47 }, { 0xEEC0, 0x8F43 }, { 0xEEC1, 0x8F40 }, { 0xEEC2, 0x9085 }, { 0xEEC3, 0x907E }, { 0xEEC4, 0x9138 }, { 0xEEC5, 0x919A }, { 0xEEC6, 0x91A2 },
+	{ 0xEEC7, 0x919B }, { 0xEEC8, 0x9199 }, { 0xEEC9, 0x919F }, { 0xEECA, 0x91A1 }, { 0xEECB, 0x919D }, { 0xEECC, 0x91A0 }, { 0xEECD, 0x93A1 }, { 0xEECE, 0x9383 },
+	{ 0xEECF, 0x93AF }, { 0xEED0, 0x9364 }, { 0xEED1, 0x9356 }, { 0xEED2, 0x9347 }, { 0xEED3, 0x937C }, { 0xEED4, 0x9358 }, { 0xEED5, 0x935C }, { 0xEED6, 0x9376 },
+	{ 0xEED7, 0x9349 }, { 0xEED8, 0x9350 }, { 0xEED9, 0x9351 }, { 0xEEDA, 0x9360 }, { 0xEEDB, 0x936D }, { 0xEEDC, 0x938F }, { 0xEEDD, 0x934C }, { 0xEEDE, 0x936A },
+	{ 0xEEDF, 0x9379 }, { 0xEEE0, 0x9357 }, { 0xEEE1, 0x9355 }, { 0xEEE2, 0x9352 }, { 0xEEE3, 0x934F }, { 0xEEE4, 0x9371 }, { 0xEEE5, 0x9377 }, { 0xEEE6, 0x937B },
+	{ 0xEEE7, 0x9361 }, { 0xEEE8, 0x935E }, { 0xEEE9, 0x9363 }, { 0xEEEA, 0x9367 }, { 0xEEEB, 0x9380 }, { 0xEEEC, 0x934E }, { 0xEEED, 0x9359 }, { 0xEEEE, 0x95C7 },
+	{ 0xEEEF, 0x95C0 }, { 0xEEF0, 0x95C9 }, { 0xEEF1, 0x95C3 }, { 0xEEF2, 0x95C5 }, { 0xEEF3, 0x95B7 }, { 0xEEF4, 0x96AE }, { 0xEEF5, 0x96B0 }, { 0xEEF6, 0x96AC },
+	{ 0xEEF7, 0x9720 }, { 0xEEF8, 0x971F }, { 0xEEF9, 0x9718 }, { 0xEEFA, 0x971D }, { 0xEEFB, 0x9719 }, { 0xEEFC, 0x979A }, { 0xEEFD, 0x97A1 }, { 0xEEFE, 0x979C },
+	{ 0xEF40, 0x979E }, { 0xEF41, 0x979D }, { 0xEF42, 0x97D5 }, { 0xEF43, 0x97D4 }, { 0xEF44, 0x97F1 }, { 0xEF45, 0x9841 }, { 0xEF46, 0x9844 }, { 0xEF47, 0x984A },
+	{ 0xEF48, 0x9849 }, { 0xEF49, 0x9845 }, { 0xEF4A, 0x9843 }, { 0xEF4B, 0x9925 }, { 0xEF4C, 0x992B }, { 0xEF4D, 0x992C }, { 0xEF4E, 0x992A }, { 0xEF4F, 0x9933 },
+	{ 0xEF50, 0x9932 }, { 0xEF51, 0x992F }, { 0xEF52, 0x992D }, { 0xEF53, 0x9931 }, { 0xEF54, 0x9930 }, { 0xEF55, 0x9998 }, { 0xEF56, 0x99A3 }, { 0xEF57, 0x99A1 },
+	{ 0xEF58, 0x9A02 }, { 0xEF59, 0x99FA }, { 0xEF5A, 0x99F4 }, { 0xEF5B, 0x99F7 }, { 0xEF5C, 0x99F9 }, { 0xEF5D, 0x99F8 }, { 0xEF5E, 0x99F6 }, { 0xEF5F, 0x99FB },
+	{ 0xEF60, 0x99FD }, { 0xEF61, 0x99FE }, { 0xEF62, 0x99FC }, { 0xEF63, 0x9A03 }, { 0xEF64, 0x9ABE }, { 0xEF65, 0x9AFE }, { 0xEF66, 0x9AFD }, { 0xEF67, 0x9B01 },
+	{ 0xEF68, 0x9AFC }, { 0xEF69, 0x9B48 }, { 0xEF6A, 0x9B9A }, { 0xEF6B, 0x9BA8 }, { 0xEF6C, 0x9B9E }, { 0xEF6D, 0x9B9B }, { 0xEF6E, 0x9BA6 }, { 0xEF6F, 0x9BA1 },
+	{ 0xEF70, 0x9BA5 }, { 0xEF71, 0x9BA4 }, { 0xEF72, 0x9B86 }, { 0xEF73, 0x9BA2 }, { 0xEF74, 0x9BA0 }, { 0xEF75, 0x9BAF }, { 0xEF76, 0x9D33 }, { 0xEF77, 0x9D41 },
+	{ 0xEF78, 0x9D67 }, { 0xEF79, 0x9D36 }, { 0xEF7A, 0x9D2E }, { 0xEF7B, 0x9D2F }, { 0xEF7C, 0x9D31 }, { 0xEF7D, 0x9D38 }, { 0xEF7E, 0x9D30 }, { 0xEFA1, 0x9D45 },
+	{ 0xEFA2, 0x9D42 }, { 0xEFA3, 0x9D43 }, { 0xEFA4, 0x9D3E }, { 0xEFA5, 0x9D37 }, { 0xEFA6, 0x9D40 }, { 0xEFA7, 0x9D3D }, { 0xEFA8, 0x7FF5 }, { 0xEFA9, 0x9D2D },
+	{ 0xEFAA, 0x9E8A }, { 0xEFAB, 0x9E89 }, { 0xEFAC, 0x9E8D }, { 0xEFAD, 0x9EB0 }, { 0xEFAE, 0x9EC8 }, { 0xEFAF, 0x9EDA }, { 0xEFB0, 0x9EFB }, { 0xEFB1, 0x9EFF },
+	{ 0xEFB2, 0x9F24 }, { 0xEFB3, 0x9F23 }, { 0xEFB4, 0x9F22 }, { 0xEFB5, 0x9F54 }, { 0xEFB6, 0x9FA0 }, { 0xEFB7, 0x5131 }, { 0xEFB8, 0x512D }, { 0xEFB9, 0x512E },
+	{ 0xEFBA, 0x5698 }, { 0xEFBB, 0x569C }, { 0xEFBC, 0x5697 }, { 0xEFBD, 0x569A }, { 0xEFBE, 0x569D }, { 0xEFBF, 0x5699 }, { 0xEFC0, 0x5970 }, { 0xEFC1, 0x5B3C },
+	{ 0xEFC2, 0x5C69 }, { 0xEFC3, 0x5C6A }, { 0xEFC4, 0x5DC0 }, { 0xEFC5, 0x5E6D }, { 0xEFC6, 0x5E6E }, { 0xEFC7, 0x61D8 }, { 0xEFC8, 0x61DF }, { 0xEFC9, 0x61ED },
+	{ 0xEFCA, 0x61EE }, { 0xEFCB, 0x61F1 }, { 0xEFCC, 0x61EA }, { 0xEFCD, 0x61F0 }, { 0xEFCE, 0x61EB }, { 0xEFCF, 0x61D6 }, { 0xEFD0, 0x61E9 }, { 0xEFD1, 0x64FF },
+	{ 0xEFD2, 0x6504 }, { 0xEFD3, 0x64FD }, { 0xEFD4, 0x64F8 }, { 0xEFD5, 0x6501 }, { 0xEFD6, 0x6503 }, { 0xEFD7, 0x64FC }, { 0xEFD8, 0x6594 }, { 0xEFD9, 0x65DB },
+	{ 0xEFDA, 0x66DA }, { 0xEFDB, 0x66DB }, { 0xEFDC, 0x66D8 }, { 0xEFDD, 0x6AC5 }, { 0xEFDE, 0x6AB9 }, { 0xEFDF, 0x6ABD }, { 0xEFE0, 0x6AE1 }, { 0xEFE1, 0x6AC6 },
+	{ 0xEFE2, 0x6ABA }, { 0xEFE3, 0x6AB6 }, { 0xEFE4, 0x6AB7 }, { 0xEFE5, 0x6AC7 }, { 0xEFE6, 0x6AB4 }, { 0xEFE7, 0x6AAD }, { 0xEFE8, 0x6B5E }, { 0xEFE9, 0x6BC9 },
+	{ 0xEFEA, 0x6C0B }, { 0xEFEB, 0x7007 }, { 0xEFEC, 0x700C }, { 0xEFED, 0x700D }, { 0xEFEE, 0x7001 }, { 0xEFEF, 0x7005 }, { 0xEFF0, 0x7014 }, { 0xEFF1, 0x700E },
+	{ 0xEFF2, 0x6FFF }, { 0xEFF3, 0x7000 }, { 0xEFF4, 0x6FFB }, { 0xEFF5, 0x7026 }, { 0xEFF6, 0x6FFC }, { 0xEFF7, 0x6FF7 }, { 0xEFF8, 0x700A }, { 0xEFF9, 0x7201 },
+	{ 0xEFFA, 0x71FF }, { 0xEFFB, 0x71F9 }, { 0xEFFC, 0x7203 }, { 0xEFFD, 0x71FD }, { 0xEFFE, 0x7376 }, { 0xF040, 0x74B8 }, { 0xF041, 0x74C0 }, { 0xF042, 0x74B5 },
+	{ 0xF043, 0x74C1 }, { 0xF044, 0x74BE }, { 0xF045, 0x74B6 }, { 0xF046, 0x74BB }, { 0xF047, 0x74C2 }, { 0xF048, 0x7514 }, { 0xF049, 0x7513 }, { 0xF04A, 0x765C },
+	{ 0xF04B, 0x7664 }, { 0xF04C, 0x7659 }, { 0xF04D, 0x7650 }, { 0xF04E, 0x7653 }, { 0xF04F, 0x7657 }, { 0xF050, 0x765A }, { 0xF051, 0x76A6 }, { 0xF052, 0x76BD },
+	{ 0xF053, 0x76EC }, { 0xF054, 0x77C2 }, { 0xF055, 0x77BA }, { 0xF056, 0x78FF }, { 0xF057, 0x790C }, { 0xF058, 0x7913 }, { 0xF059, 0x7914 }, { 0xF05A, 0x7909 },
+	{ 0xF05B, 0x7910 }, { 0xF05C, 0x7912 }, { 0xF05D, 0x7911 }, { 0xF05E, 0x79AD }, { 0xF05F, 0x79AC }, { 0xF060, 0x7A5F }, { 0xF061, 0x7C1C }, { 0xF062, 0x7C29 },
+	{ 0xF063, 0x7C19 }, { 0xF064, 0x7C20 }, { 0xF065, 0x7C1F }, { 0xF066, 0x7C2D }, { 0xF067, 0x7C1D }, { 0xF068, 0x7C26 }, { 0xF069, 0x7C28 }, { 0xF06A, 0x7C22 },
+	{ 0xF06B, 0x7C25 }, { 0xF06C, 0x7C30 }, { 0xF06D, 0x7E5C }, { 0xF06E, 0x7E50 }, { 0xF06F, 0x7E56 }, { 0xF070, 0x7E63 }, { 0xF071, 0x7E58 }, { 0xF072, 0x7E62 },
+	{ 0xF073, 0x7E5F }, { 0xF074, 0x7E51 }, { 0xF075, 0x7E60 }, { 0xF076, 0x7E57 }, { 0xF077, 0x7E53 }, { 0xF078, 0x7FB5 }, { 0xF079, 0x7FB3 }, { 0xF07A, 0x7FF7 },
+	{ 0xF07B, 0x7FF8 }, { 0xF07C, 0x8075 }, { 0xF07D, 0x81D1 }, { 0xF07E, 0x81D2 }, { 0xF0A1, 0x81D0 }, { 0xF0A2, 0x825F }, { 0xF0A3, 0x825E }, { 0xF0A4, 0x85B4 },
+	{ 0xF0A5, 0x85C6 }, { 0xF0A6, 0x85C0 }, { 0xF0A7, 0x85C3 }, { 0xF0A8, 0x85C2 }, { 0xF0A9, 0x85B3 }, { 0xF0AA, 0x85B5 }, { 0xF0AB, 0x85BD }, { 0xF0AC, 0x85C7 },
+	{ 0xF0AD, 0x85C4 }, { 0xF0AE, 0x85BF }, { 0xF0AF, 0x85CB }, { 0xF0B0, 0x85CE }, { 0xF0B1, 0x85C8 }, { 0xF0B2, 0x85C5 }, { 0xF0B3, 0x85B1 }, { 0xF0B4, 0x85B6 },
+	{ 0xF0B5, 0x85D2 }, { 0xF0B6, 0x8624 }, { 0xF0B7, 0x85B8 }, { 0xF0B8, 0x85B7 }, { 0xF0B9, 0x85BE }, { 0xF0BA, 0x8669 }, { 0xF0BB, 0x87E7 }, { 0xF0BC, 0x87E6 },
+	{ 0xF0BD, 0x87E2 }, { 0xF0BE, 0x87DB }, { 0xF0BF, 0x87EB }, { 0xF0C0, 0x87EA }, { 0xF0C1, 0x87E5 }, { 0xF0C2, 0x87DF }, { 0xF0C3, 0x87F3 }, { 0xF0C4, 0x87E4 },
+	{ 0xF0C5, 0x87D4 }, { 0xF0C6, 0x87DC }, { 0xF0C7, 0x87D3 }, { 0xF0C8, 0x87ED }, { 0xF0C9, 0x87D8 }, { 0xF0CA, 0x87E3 }, { 0xF0CB, 0x87A4 }, { 0xF0CC, 0x87D7 },
+	{ 0xF0CD, 0x87D9 }, { 0xF0CE, 0x8801 }, { 0xF0CF, 0x87F4 }, { 0xF0D0, 0x87E8 }, { 0xF0D1, 0x87DD }, { 0xF0D2, 0x8953 }, { 0xF0D3, 0x894B }, { 0xF0D4, 0x894F },
+	{ 0xF0D5, 0x894C }, { 0xF0D6, 0x8946 }, { 0xF0D7, 0x8950 }, { 0xF0D8, 0x8951 }, { 0xF0D9, 0x8949 }, { 0xF0DA, 0x8B2A }, { 0xF0DB, 0x8B27 }, { 0xF0DC, 0x8B23 },
+	{ 0xF0DD, 0x8B33 }, { 0xF0DE, 0x8B30 }, { 0xF0DF, 0x8B35 }, { 0xF0E0, 0x8B47 }, { 0xF0E1, 0x8B2F }, { 0xF0E2, 0x8B3C }, { 0xF0E3, 0x8B3E }, { 0xF0E4, 0x8B31 },
+	{ 0xF0E5, 0x8B25 }, { 0xF0E6, 0x8B37 }, { 0xF0E7, 0x8B26 }, { 0xF0E8, 0x8B36 }, { 0xF0E9, 0x8B2E }, { 0xF0EA, 0x8B24 }, { 0xF0EB, 0x8B3B }, { 0xF0EC, 0x8B3D },
+	{ 0xF0ED, 0x8B3A }, { 0xF0EE, 0x8C42 }, { 0xF0EF, 0x8C75 }, { 0xF0F0, 0x8C99 }, { 0xF0F1, 0x8C98 }, { 0xF0F2, 0x8C97 }, { 0xF0F3, 0x8CFE }, { 0xF0F4, 0x8D04 },
+	{ 0xF0F5, 0x8D02 }, { 0xF0F6, 0x8D00 }, { 0xF0F7, 0x8E5C }, { 0xF0F8, 0x8E62 }, { 0xF0F9, 0x8E60 }, { 0xF0FA, 0x8E57 }, { 0xF0FB, 0x8E56 }, { 0xF0FC, 0x8E5E },
+	{ 0xF0FD, 0x8E65 }, { 0xF0FE, 0x8E67 }, { 0xF140, 0x8E5B }, { 0xF141, 0x8E5A }, { 0xF142, 0x8E61 }, { 0xF143, 0x8E5D }, { 0xF144, 0x8E69 }, { 0xF145, 0x8E54 },
+	{ 0xF146, 0x8F46 }, { 0xF147, 0x8F47 }, { 0xF148, 0x8F48 }, { 0xF149, 0x8F4B }, { 0xF14A, 0x9128 }, { 0xF14B, 0x913A }, { 0xF14C, 0x913B }, { 0xF14D, 0x913E },
+	{ 0xF14E, 0x91A8 }, { 0xF14F, 0x91A5 }, { 0xF150, 0x91A7 }, { 0xF151, 0x91AF }, { 0xF152, 0x91AA }, { 0xF153, 0x93B5 }, { 0xF154, 0x938C }, { 0xF155, 0x9392 },
+	{ 0xF156, 0x93B7 }, { 0xF157, 0x939B }, { 0xF158, 0x939D }, { 0xF159, 0x9389 }, { 0xF15A, 0x93A7 }, { 0xF15B, 0x938E }, { 0xF15C, 0x93AA }, { 0xF15D, 0x939E },
+	{ 0xF15E, 0x93A6 }, { 0xF15F, 0x9395 }, { 0xF160, 0x9388 }, { 0xF161, 0x9399 }, { 0xF162, 0x939F }, { 0xF163, 0x938D }, { 0xF164, 0x93B1 }, { 0xF165, 0x9391 },
+	{ 0xF166, 0x93B2 }, { 0xF167, 0x93A4 }, { 0xF168, 0x93A8 }, { 0xF169, 0x93B4 }, { 0xF16A, 0x93A3 }, { 0xF16B, 0x93A5 }, { 0xF16C, 0x95D2 }, { 0xF16D, 0x95D3 },
+	{ 0xF16E, 0x95D1 }, { 0xF16F, 0x96B3 }, { 0xF170, 0x96D7 }, { 0xF171, 0x96DA }, { 0xF172, 0x5DC2 }, { 0xF173, 0x96DF }, { 0xF174, 0x96D8 }, { 0xF175, 0x96DD },
+	{ 0xF176, 0x9723 }, { 0xF177, 0x9722 }, { 0xF178, 0x9725 }, { 0xF179, 0x97AC }, { 0xF17A, 0x97AE }, { 0xF17B, 0x97A8 }, { 0xF17C, 0x97AB }, { 0xF17D, 0x97A4 },
+	{ 0xF17E, 0x97AA }, { 0xF1A1, 0x97A2 }, { 0xF1A2, 0x97A5 }, { 0xF1A3, 0x97D7 }, { 0xF1A4, 0x97D9 }, { 0xF1A5, 0x97D6 }, { 0xF1A6, 0x97D8 }, { 0xF1A7, 0x97FA },
+	{ 0xF1A8, 0x9850 }, { 0xF1A9, 0x9851 }, { 0xF1AA, 0x9852 }, { 0xF1AB, 0x98B8 }, { 0xF1AC, 0x9941 }, { 0xF1AD, 0x993C }, { 0xF1AE, 0x993A }, { 0xF1AF, 0x9A0F },
+	{ 0xF1B0, 0x9A0B }, { 0xF1B1, 0x9A09 }, { 0xF1B2, 0x9A0D }, { 0xF1B3, 0x9A04 }, { 0xF1B4, 0x9A11 }, { 0xF1B5, 0x9A0A }, { 0xF1B6, 0x9A05 }, { 0xF1B7, 0x9A07 },
+	{ 0xF1B8, 0x9A06 }, { 0xF1B9, 0x9AC0 }, { 0xF1BA, 0x9ADC }, { 0xF1BB, 0x9B08 }, { 0xF1BC, 0x9B04 }, { 0xF1BD, 0x9B05 }, { 0xF1BE, 0x9B29 }, { 0xF1BF, 0x9B35 },
+	{ 0xF1C0, 0x9B4A }, { 0xF1C1, 0x9B4C }, { 0xF1C2, 0x9B4B }, { 0xF1C3, 0x9BC7 }, { 0xF1C4, 0x9BC6 }, { 0xF1C5, 0x9BC3 }, { 0xF1C6, 0x9BBF }, { 0xF1C7, 0x9BC1 },
+	{ 0xF1C8, 0x9BB5 }, { 0xF1C9, 0x9BB8 }, { 0xF1CA, 0x9BD3 }, { 0xF1CB, 0x9BB6 }, { 0xF1CC, 0x9BC4 }, { 0xF1CD, 0x9BB9 }, { 0xF1CE, 0x9BBD }, { 0xF1CF, 0x9D5C },
+	{ 0xF1D0, 0x9D53 }, { 0xF1D1, 0x9D4F }, { 0xF1D2, 0x9D4A }, { 0xF1D3, 0x9D5B }, { 0xF1D4, 0x9D4B }, { 0xF1D5, 0x9D59 }, { 0xF1D6, 0x9D56 }, { 0xF1D7, 0x9D4C },
+	{ 0xF1D8, 0x9D57 }, { 0xF1D9, 0x9D52 }, { 0xF1DA, 0x9D54 }, { 0xF1DB, 0x9D5F }, { 0xF1DC, 0x9D58 }, { 0xF1DD, 0x9D5A }, { 0xF1DE, 0x9E8E }, { 0xF1DF, 0x9E8C },
+	{ 0xF1E0, 0x9EDF }, { 0xF1E1, 0x9F01 }, { 0xF1E2, 0x9F00 }, { 0xF1E3, 0x9F16 }, { 0xF1E4, 0x9F25 }, { 0xF1E5, 0x9F2B }, { 0xF1E6, 0x9F2A }, { 0xF1E7, 0x9F29 },
+	{ 0xF1E8, 0x9F28 }, { 0xF1E9, 0x9F4C }, { 0xF1EA, 0x9F55 }, { 0xF1EB, 0x5134 }, { 0xF1EC, 0x5135 }, { 0xF1ED, 0x5296 }, { 0xF1EE, 0x52F7 }, { 0xF1EF, 0x53B4 },
+	{ 0xF1F0, 0x56AB }, { 0xF1F1, 0x56AD }, { 0xF1F2, 0x56A6 }, { 0xF1F3, 0x56A7 }, { 0xF1F4, 0x56AA }, { 0xF1F5, 0x56AC }, { 0xF1F6, 0x58DA }, { 0xF1F7, 0x58DD },
+	{ 0xF1F8, 0x58DB }, { 0xF1F9, 0x5912 }, { 0xF1FA, 0x5B3D }, { 0xF1FB, 0x5B3E }, { 0xF1FC, 0x5B3F }, { 0xF1FD, 0x5DC3 }, { 0xF1FE, 0x5E70 }, { 0xF240, 0x5FBF },
+	{ 0xF241, 0x61FB }, { 0xF242, 0x6507 }, { 0xF243, 0x6510 }, { 0xF244, 0x650D }, { 0xF245, 0x6509 }, { 0xF246, 0x650C }, { 0xF247, 0x650E }, { 0xF248, 0x6584 },
+	{ 0xF249, 0x65DE }, { 0xF24A, 0x65DD }, { 0xF24B, 0x66DE }, { 0xF24C, 0x6AE7 }, { 0xF24D, 0x6AE0 }, { 0xF24E, 0x6ACC }, { 0xF24F, 0x6AD1 }, { 0xF250, 0x6AD9 },
+	{ 0xF251, 0x6ACB }, { 0xF252, 0x6ADF }, { 0xF253, 0x6ADC }, { 0xF254, 0x6AD0 }, { 0xF255, 0x6AEB }, { 0xF256, 0x6ACF }, { 0xF257, 0x6ACD }, { 0xF258, 0x6ADE },
+	{ 0xF259, 0x6B60 }, { 0xF25A, 0x6BB0 }, { 0xF25B, 0x6C0C }, { 0xF25C, 0x7019 }, { 0xF25D, 0x7027 }, { 0xF25E, 0x7020 }, { 0xF25F, 0x7016 }, { 0xF260, 0x702B },
+	{ 0xF261, 0x7021 }, { 0xF262, 0x7022 }, { 0xF263, 0x7023 }, { 0xF264, 0x7029 }, { 0xF265, 0x7017 }, { 0xF266, 0x7024 }, { 0xF267, 0x701C }, { 0xF268, 0x702A },
+	{ 0xF269, 0x720C }, { 0xF26A, 0x720A }, { 0xF26B, 0x7207 }, { 0xF26C, 0x7202 }, { 0xF26D, 0x7205 }, { 0xF26E, 0x72A5 }, { 0xF26F, 0x72A6 }, { 0xF270, 0x72A4 },
+	{ 0xF271, 0x72A3 }, { 0xF272, 0x72A1 }, { 0xF273, 0x74CB }, { 0xF274, 0x74C5 }, { 0xF275, 0x74B7 }, { 0xF276, 0x74C3 }, { 0xF277, 0x7516 }, { 0xF278, 0x7660 },
+	{ 0xF279, 0x77C9 }, { 0xF27A, 0x77CA }, { 0xF27B, 0x77C4 }, { 0xF27C, 0x77F1 }, { 0xF27D, 0x791D }, { 0xF27E, 0x791B }, { 0xF2A1, 0x7921 }, { 0xF2A2, 0x791C },
+	{ 0xF2A3, 0x7917 }, { 0xF2A4, 0x791E }, { 0xF2A5, 0x79B0 }, { 0xF2A6, 0x7A67 }, { 0xF2A7, 0x7A68 }, { 0xF2A8, 0x7C33 }, { 0xF2A9, 0x7C3C }, { 0xF2AA, 0x7C39 },
+	{ 0xF2AB, 0x7C2C }, { 0xF2AC, 0x7C3B }, { 0xF2AD, 0x7CEC }, { 0xF2AE, 0x7CEA }, { 0xF2AF, 0x7E76 }, { 0xF2B0, 0x7E75 }, { 0xF2B1, 0x7E78 }, { 0xF2B2, 0x7E70 },
+	{ 0xF2B3, 0x7E77 }, { 0xF2B4, 0x7E6F }, { 0xF2B5, 0x7E7A }, { 0xF2B6, 0x7E72 }, { 0xF2B7, 0x7E74 }, { 0xF2B8, 0x7E68 }, { 0xF2B9, 0x7F4B }, { 0xF2BA, 0x7F4A },
+	{ 0xF2BB, 0x7F83 }, { 0xF2BC, 0x7F86 }, { 0xF2BD, 0x7FB7 }, { 0xF2BE, 0x7FFD }, { 0xF2BF, 0x7FFE }, { 0xF2C0, 0x8078 }, { 0xF2C1, 0x81D7 }, { 0xF2C2, 0x81D5 },
+	{ 0xF2C3, 0x8264 }, { 0xF2C4, 0x8261 }, { 0xF2C5, 0x8263 }, { 0xF2C6, 0x85EB }, { 0xF2C7, 0x85F1 }, { 0xF2C8, 0x85ED }, { 0xF2C9, 0x85D9 }, { 0xF2CA, 0x85E1 },
+	{ 0xF2CB, 0x85E8 }, { 0xF2CC, 0x85DA }, { 0xF2CD, 0x85D7 }, { 0xF2CE, 0x85EC }, { 0xF2CF, 0x85F2 }, { 0xF2D0, 0x85F8 }, { 0xF2D1, 0x85D8 }, { 0xF2D2, 0x85DF },
+	{ 0xF2D3, 0x85E3 }, { 0xF2D4, 0x85DC }, { 0xF2D5, 0x85D1 }, { 0xF2D6, 0x85F0 }, { 0xF2D7, 0x85E6 }, { 0xF2D8, 0x85EF }, { 0xF2D9, 0x85DE }, { 0xF2DA, 0x85E2 },
+	{ 0xF2DB, 0x8800 }, { 0xF2DC, 0x87FA }, { 0xF2DD, 0x8803 }, { 0xF2DE, 0x87F6 }, { 0xF2DF, 0x87F7 }, { 0xF2E0, 0x8809 }, { 0xF2E1, 0x880C }, { 0xF2E2, 0x880B },
+	{ 0xF2E3, 0x8806 }, { 0xF2E4, 0x87FC }, { 0xF2E5, 0x8808 }, { 0xF2E6, 0x87FF }, { 0xF2E7, 0x880A }, { 0xF2E8, 0x8802 }, { 0xF2E9, 0x8962 }, { 0xF2EA, 0x895A },
+	{ 0xF2EB, 0x895B }, { 0xF2EC, 0x8957 }, { 0xF2ED, 0x8961 }, { 0xF2EE, 0x895C }, { 0xF2EF, 0x8958 }, { 0xF2F0, 0x895D }, { 0xF2F1, 0x8959 }, { 0xF2F2, 0x8988 },
+	{ 0xF2F3, 0x89B7 }, { 0xF2F4, 0x89B6 }, { 0xF2F5, 0x89F6 }, { 0xF2F6, 0x8B50 }, { 0xF2F7, 0x8B48 }, { 0xF2F8, 0x8B4A }, { 0xF2F9, 0x8B40 }, { 0xF2FA, 0x8B53 },
+	{ 0xF2FB, 0x8B56 }, { 0xF2FC, 0x8B54 }, { 0xF2FD, 0x8B4B }, { 0xF2FE, 0x8B55 }, { 0xF340, 0x8B51 }, { 0xF341, 0x8B42 }, { 0xF342, 0x8B52 }, { 0xF343, 0x8B57 },
+	{ 0xF344, 0x8C43 }, { 0xF345, 0x8C77 }, { 0xF346, 0x8C76 }, { 0xF347, 0x8C9A }, { 0xF348, 0x8D06 }, { 0xF349, 0x8D07 }, { 0xF34A, 0x8D09 }, { 0xF34B, 0x8DAC },
+	{ 0xF34C, 0x8DAA }, { 0xF34D, 0x8DAD }, { 0xF34E, 0x8DAB }, { 0xF34F, 0x8E6D }, { 0xF350, 0x8E78 }, { 0xF351, 0x8E73 }, { 0xF352, 0x8E6A }, { 0xF353, 0x8E6F },
+	{ 0xF354, 0x8E7B }, { 0xF355, 0x8EC2 }, { 0xF356, 0x8F52 }, { 0xF357, 0x8F51 }, { 0xF358, 0x8F4F }, { 0xF359, 0x8F50 }, { 0xF35A, 0x8F53 }, { 0xF35B, 0x8FB4 },
+	{ 0xF35C, 0x9140 }, { 0xF35D, 0x913F }, { 0xF35E, 0x91B0 }, { 0xF35F, 0x91AD }, { 0xF360, 0x93DE }, { 0xF361, 0x93C7 }, { 0xF362, 0x93CF }, { 0xF363, 0x93C2 },
+	{ 0xF364, 0x93DA }, { 0xF365, 0x93D0 }, { 0xF366, 0x93F9 }, { 0xF367, 0x93EC }, { 0xF368, 0x93CC }, { 0xF369, 0x93D9 }, { 0xF36A, 0x93A9 }, { 0xF36B, 0x93E6 },
+	{ 0xF36C, 0x93CA }, { 0xF36D, 0x93D4 }, { 0xF36E, 0x93EE }, { 0xF36F, 0x93E3 }, { 0xF370, 0x93D5 }, { 0xF371, 0x93C4 }, { 0xF372, 0x93CE }, { 0xF373, 0x93C0 },
+	{ 0xF374, 0x93D2 }, { 0xF375, 0x93E7 }, { 0xF376, 0x957D }, { 0xF377, 0x95DA }, { 0xF378, 0x95DB }, { 0xF379, 0x96E1 }, { 0xF37A, 0x9729 }, { 0xF37B, 0x972B },
+	{ 0xF37C, 0x972C }, { 0xF37D, 0x9728 }, { 0xF37E, 0x9726 }, { 0xF3A1, 0x97B3 }, { 0xF3A2, 0x97B7 }, { 0xF3A3, 0x97B6 }, { 0xF3A4, 0x97DD }, { 0xF3A5, 0x97DE },
+	{ 0xF3A6, 0x97DF }, { 0xF3A7, 0x985C }, { 0xF3A8, 0x9859 }, { 0xF3A9, 0x985D }, { 0xF3AA, 0x9857 }, { 0xF3AB, 0x98BF }, { 0xF3AC, 0x98BD }, { 0xF3AD, 0x98BB },
+	{ 0xF3AE, 0x98BE }, { 0xF3AF, 0x9948 }, { 0xF3B0, 0x9947 }, { 0xF3B1, 0x9943 }, { 0xF3B2, 0x99A6 }, { 0xF3B3, 0x99A7 }, { 0xF3B4, 0x9A1A }, { 0xF3B5, 0x9A15 },
+	{ 0xF3B6, 0x9A25 }, { 0xF3B7, 0x9A1D }, { 0xF3B8, 0x9A24 }, { 0xF3B9, 0x9A1B }, { 0xF3BA, 0x9A22 }, { 0xF3BB, 0x9A20 }, { 0xF3BC, 0x9A27 }, { 0xF3BD, 0x9A23 },
+	{ 0xF3BE, 0x9A1E }, { 0xF3BF, 0x9A1C }, { 0xF3C0, 0x9A14 }, { 0xF3C1, 0x9AC2 }, { 0xF3C2, 0x9B0B }, { 0xF3C3, 0x9B0A }, { 0xF3C4, 0x9B0E }, { 0xF3C5, 0x9B0C },
+	{ 0xF3C6, 0x9B37 }, { 0xF3C7, 0x9BEA }, { 0xF3C8, 0x9BEB }, { 0xF3C9, 0x9BE0 }, { 0xF3CA, 0x9BDE }, { 0xF3CB, 0x9BE4 }, { 0xF3CC, 0x9BE6 }, { 0xF3CD, 0x9BE2 },
+	{ 0xF3CE, 0x9BF0 }, { 0xF3CF, 0x9BD4 }, { 0xF3D0, 0x9BD7 }, { 0xF3D1, 0x9BEC }, { 0xF3D2, 0x9BDC }, { 0xF3D3, 0x9BD9 }, { 0xF3D4, 0x9BE5 }, { 0xF3D5, 0x9BD5 },
+	{ 0xF3D6, 0x9BE1 }, { 0xF3D7, 0x9BDA }, { 0xF3D8, 0x9D77 }, { 0xF3D9, 0x9D81 }, { 0xF3DA, 0x9D8A }, { 0xF3DB, 0x9D84 }, { 0xF3DC, 0x9D88 }, { 0xF3DD, 0x9D71 },
+	{ 0xF3DE, 0x9D80 }, { 0xF3DF, 0x9D78 }, { 0xF3E0, 0x9D86 }, { 0xF3E1, 0x9D8B }, { 0xF3E2, 0x9D8C }, { 0xF3E3, 0x9D7D }, { 0xF3E4, 0x9D6B }, { 0xF3E5, 0x9D74 },
+	{ 0xF3E6, 0x9D75 }, { 0xF3E7, 0x9D70 }, { 0xF3E8, 0x9D69 }, { 0xF3E9, 0x9D85 }, { 0xF3EA, 0x9D73 }, { 0xF3EB, 0x9D7B }, { 0xF3EC, 0x9D82 }, { 0xF3ED, 0x9D6F },
+	{ 0xF3EE, 0x9D79 }, { 0xF3EF, 0x9D7F }, { 0xF3F0, 0x9D87 }, { 0xF3F1, 0x9D68 }, { 0xF3F2, 0x9E94 }, { 0xF3F3, 0x9E91 }, { 0xF3F4, 0x9EC0 }, { 0xF3F5, 0x9EFC },
+	{ 0xF3F6, 0x9F2D }, { 0xF3F7, 0x9F40 }, { 0xF3F8, 0x9F41 }, { 0xF3F9, 0x9F4D }, { 0xF3FA, 0x9F56 }, { 0xF3FB, 0x9F57 }, { 0xF3FC, 0x9F58 }, { 0xF3FD, 0x5337 },
+	{ 0xF3FE, 0x56B2 }, { 0xF440, 0x56B5 }, { 0xF441, 0x56B3 }, { 0xF442, 0x58E3 }, { 0xF443, 0x5B45 }, { 0xF444, 0x5DC6 }, { 0xF445, 0x5DC7 }, { 0xF446, 0x5EEE },
+	{ 0xF447, 0x5EEF }, { 0xF448, 0x5FC0 }, { 0xF449, 0x5FC1 }, { 0xF44A, 0x61F9 }, { 0xF44B, 0x6517 }, { 0xF44C, 0x6516 }, { 0xF44D, 0x6515 }, { 0xF44E, 0x6513 },
+	{ 0xF44F, 0x65DF }, { 0xF450, 0x66E8 }, { 0xF451, 0x66E3 }, { 0xF452, 0x66E4 }, { 0xF453, 0x6AF3 }, { 0xF454, 0x6AF0 }, { 0xF455, 0x6AEA }, { 0xF456, 0x6AE8 },
+	{ 0xF457, 0x6AF9 }, { 0xF458, 0x6AF1 }, { 0xF459, 0x6AEE }, { 0xF45A, 0x6AEF }, { 0xF45B, 0x703C }, { 0xF45C, 0x7035 }, { 0xF45D, 0x702F }, { 0xF45E, 0x7037 },
+	{ 0xF45F, 0x7034 }, { 0xF460, 0x7031 }, { 0xF461, 0x7042 }, { 0xF462, 0x7038 }, { 0xF463, 0x703F }, { 0xF464, 0x703A }, { 0xF465, 0x7039 }, { 0xF466, 0x7040 },
+	{ 0xF467, 0x703B }, { 0xF468, 0x7033 }, { 0xF469, 0x7041 }, { 0xF46A, 0x7213 }, { 0xF46B, 0x7214 }, { 0xF46C, 0x72A8 }, { 0xF46D, 0x737D }, { 0xF46E, 0x737C },
+	{ 0xF46F, 0x74BA }, { 0xF470, 0x76AB }, { 0xF471, 0x76AA }, { 0xF472, 0x76BE }, { 0xF473, 0x76ED }, { 0xF474, 0x77CC }, { 0xF475, 0x77CE }, { 0xF476, 0x77CF },
+	{ 0xF477, 0x77CD }, { 0xF478, 0x77F2 }, { 0xF479, 0x7925 }, { 0xF47A, 0x7923 }, { 0xF47B, 0x7927 }, { 0xF47C, 0x7928 }, { 0xF47D, 0x7924 }, { 0xF47E, 0x7929 },
+	{ 0xF4A1, 0x79B2 }, { 0xF4A2, 0x7A6E }, { 0xF4A3, 0x7A6C }, { 0xF4A4, 0x7A6D }, { 0xF4A5, 0x7AF7 }, { 0xF4A6, 0x7C49 }, { 0xF4A7, 0x7C48 }, { 0xF4A8, 0x7C4A },
+	{ 0xF4A9, 0x7C47 }, { 0xF4AA, 0x7C45 }, { 0xF4AB, 0x7CEE }, { 0xF4AC, 0x7E7B }, { 0xF4AD, 0x7E7E }, { 0xF4AE, 0x7E81 }, { 0xF4AF, 0x7E80 }, { 0xF4B0, 0x7FBA },
+	{ 0xF4B1, 0x7FFF }, { 0xF4B2, 0x8079 }, { 0xF4B3, 0x81DB }, { 0xF4B4, 0x81D9 }, { 0xF4B5, 0x820B }, { 0xF4B6, 0x8268 }, { 0xF4B7, 0x8269 }, { 0xF4B8, 0x8622 },
+	{ 0xF4B9, 0x85FF }, { 0xF4BA, 0x8601 }, { 0xF4BB, 0x85FE }, { 0xF4BC, 0x861B }, { 0xF4BD, 0x8600 }, { 0xF4BE, 0x85F6 }, { 0xF4BF, 0x8604 }, { 0xF4C0, 0x8609 },
+	{ 0xF4C1, 0x8605 }, { 0xF4C2, 0x860C }, { 0xF4C3, 0x85FD }, { 0xF4C4, 0x8819 }, { 0xF4C5, 0x8810 }, { 0xF4C6, 0x8811 }, { 0xF4C7, 0x8817 }, { 0xF4C8, 0x8813 },
+	{ 0xF4C9, 0x8816 }, { 0xF4CA, 0x8963 }, { 0xF4CB, 0x8966 }, { 0xF4CC, 0x89B9 }, { 0xF4CD, 0x89F7 }, { 0xF4CE, 0x8B60 }, { 0xF4CF, 0x8B6A }, { 0xF4D0, 0x8B5D },
+	{ 0xF4D1, 0x8B68 }, { 0xF4D2, 0x8B63 }, { 0xF4D3, 0x8B65 }, { 0xF4D4, 0x8B67 }, { 0xF4D5, 0x8B6D }, { 0xF4D6, 0x8DAE }, { 0xF4D7, 0x8E86 }, { 0xF4D8, 0x8E88 },
+	{ 0xF4D9, 0x8E84 }, { 0xF4DA, 0x8F59 }, { 0xF4DB, 0x8F56 }, { 0xF4DC, 0x8F57 }, { 0xF4DD, 0x8F55 }, { 0xF4DE, 0x8F58 }, { 0xF4DF, 0x8F5A }, { 0xF4E0, 0x908D },
+	{ 0xF4E1, 0x9143 }, { 0xF4E2, 0x9141 }, { 0xF4E3, 0x91B7 }, { 0xF4E4, 0x91B5 }, { 0xF4E5, 0x91B2 }, { 0xF4E6, 0x91B3 }, { 0xF4E7, 0x940B }, { 0xF4E8, 0x9413 },
+	{ 0xF4E9, 0x93FB }, { 0xF4EA, 0x9420 }, { 0xF4EB, 0x940F }, { 0xF4EC, 0x9414 }, { 0xF4ED, 0x93FE }, { 0xF4EE, 0x9415 }, { 0xF4EF, 0x9410 }, { 0xF4F0, 0x9428 },
+	{ 0xF4F1, 0x9419 }, { 0xF4F2, 0x940D }, { 0xF4F3, 0x93F5 }, { 0xF4F4, 0x9400 }, { 0xF4F5, 0x93F7 }, { 0xF4F6, 0x9407 }, { 0xF4F7, 0x940E }, { 0xF4F8, 0x9416 },
+	{ 0xF4F9, 0x9412 }, { 0xF4FA, 0x93FA }, { 0xF4FB, 0x9409 }, { 0xF4FC, 0x93F8 }, { 0xF4FD, 0x940A }, { 0xF4FE, 0x93FF }, { 0xF540, 0x93FC }, { 0xF541, 0x940C },
+	{ 0xF542, 0x93F6 }, { 0xF543, 0x9411 }, { 0xF544, 0x9406 }, { 0xF545, 0x95DE }, { 0xF546, 0x95E0 }, { 0xF547, 0x95DF }, { 0xF548, 0x972E }, { 0xF549, 0x972F },
+	{ 0xF54A, 0x97B9 }, { 0xF54B, 0x97BB }, { 0xF54C, 0x97FD }, { 0xF54D, 0x97FE }, { 0xF54E, 0x9860 }, { 0xF54F, 0x9862 }, { 0xF550, 0x9863 }, { 0xF551, 0x985F },
+	{ 0xF552, 0x98C1 }, { 0xF553, 0x98C2 }, { 0xF554, 0x9950 }, { 0xF555, 0x994E }, { 0xF556, 0x9959 }, { 0xF557, 0x994C }, { 0xF558, 0x994B }, { 0xF559, 0x9953 },
+	{ 0xF55A, 0x9A32 }, { 0xF55B, 0x9A34 }, { 0xF55C, 0x9A31 }, { 0xF55D, 0x9A2C }, { 0xF55E, 0x9A2A }, { 0xF55F, 0x9A36 }, { 0xF560, 0x9A29 }, { 0xF561, 0x9A2E },
+	{ 0xF562, 0x9A38 }, { 0xF563, 0x9A2D }, { 0xF564, 0x9AC7 }, { 0xF565, 0x9ACA }, { 0xF566, 0x9AC6 }, { 0xF567, 0x9B10 }, { 0xF568, 0x9B12 }, { 0xF569, 0x9B11 },
+	{ 0xF56A, 0x9C0B }, { 0xF56B, 0x9C08 }, { 0xF56C, 0x9BF7 }, { 0xF56D, 0x9C05 }, { 0xF56E, 0x9C12 }, { 0xF56F, 0x9BF8 }, { 0xF570, 0x9C40 }, { 0xF571, 0x9C07 },
+	{ 0xF572, 0x9C0E }, { 0xF573, 0x9C06 }, { 0xF574, 0x9C17 }, { 0xF575, 0x9C14 }, { 0xF576, 0x9C09 }, { 0xF577, 0x9D9F }, { 0xF578, 0x9D99 }, { 0xF579, 0x9DA4 },
+	{ 0xF57A, 0x9D9D }, { 0xF57B, 0x9D92 }, { 0xF57C, 0x9D98 }, { 0xF57D, 0x9D90 }, { 0xF57E, 0x9D9B }, { 0xF5A1, 0x9DA0 }, { 0xF5A2, 0x9D94 }, { 0xF5A3, 0x9D9C },
+	{ 0xF5A4, 0x9DAA }, { 0xF5A5, 0x9D97 }, { 0xF5A6, 0x9DA1 }, { 0xF5A7, 0x9D9A }, { 0xF5A8, 0x9DA2 }, { 0xF5A9, 0x9DA8 }, { 0xF5AA, 0x9D9E }, { 0xF5AB, 0x9DA3 },
+	{ 0xF5AC, 0x9DBF }, { 0xF5AD, 0x9DA9 }, { 0xF5AE, 0x9D96 }, { 0xF5AF, 0x9DA6 }, { 0xF5B0, 0x9DA7 }, { 0xF5B1, 0x9E99 }, { 0xF5B2, 0x9E9B }, { 0xF5B3, 0x9E9A },
+	{ 0xF5B4, 0x9EE5 }, { 0xF5B5, 0x9EE4 }, { 0xF5B6, 0x9EE7 }, { 0xF5B7, 0x9EE6 }, { 0xF5B8, 0x9F30 }, { 0xF5B9, 0x9F2E }, { 0xF5BA, 0x9F5B }, { 0xF5BB, 0x9F60 },
+	{ 0xF5BC, 0x9F5E }, { 0xF5BD, 0x9F5D }, { 0xF5BE, 0x9F59 }, { 0xF5BF, 0x9F91 }, { 0xF5C0, 0x513A }, { 0xF5C1, 0x5139 }, { 0xF5C2, 0x5298 }, { 0xF5C3, 0x5297 },
+	{ 0xF5C4, 0x56C3 }, { 0xF5C5, 0x56BD }, { 0xF5C6, 0x56BE }, { 0xF5C7, 0x5B48 }, { 0xF5C8, 0x5B47 }, { 0xF5C9, 0x5DCB }, { 0xF5CA, 0x5DCF }, { 0xF5CB, 0x5EF1 },
+	{ 0xF5CC, 0x61FD }, { 0xF5CD, 0x651B }, { 0xF5CE, 0x6B02 }, { 0xF5CF, 0x6AFC }, { 0xF5D0, 0x6B03 }, { 0xF5D1, 0x6AF8 }, { 0xF5D2, 0x6B00 }, { 0xF5D3, 0x7043 },
+	{ 0xF5D4, 0x7044 }, { 0xF5D5, 0x704A }, { 0xF5D6, 0x7048 }, { 0xF5D7, 0x7049 }, { 0xF5D8, 0x7045 }, { 0xF5D9, 0x7046 }, { 0xF5DA, 0x721D }, { 0xF5DB, 0x721A },
+	{ 0xF5DC, 0x7219 }, { 0xF5DD, 0x737E }, { 0xF5DE, 0x7517 }, { 0xF5DF, 0x766A }, { 0xF5E0, 0x77D0 }, { 0xF5E1, 0x792D }, { 0xF5E2, 0x7931 }, { 0xF5E3, 0x792F },
+	{ 0xF5E4, 0x7C54 }, { 0xF5E5, 0x7C53 }, { 0xF5E6, 0x7CF2 }, { 0xF5E7, 0x7E8A }, { 0xF5E8, 0x7E87 }, { 0xF5E9, 0x7E88 }, { 0xF5EA, 0x7E8B }, { 0xF5EB, 0x7E86 },
+	{ 0xF5EC, 0x7E8D }, { 0xF5ED, 0x7F4D }, { 0xF5EE, 0x7FBB }, { 0xF5EF, 0x8030 }, { 0xF5F0, 0x81DD }, { 0xF5F1, 0x8618 }, { 0xF5F2, 0x862A }, { 0xF5F3, 0x8626 },
+	{ 0xF5F4, 0x861F }, { 0xF5F5, 0x8623 }, { 0xF5F6, 0x861C }, { 0xF5F7, 0x8619 }, { 0xF5F8, 0x8627 }, { 0xF5F9, 0x862E }, { 0xF5FA, 0x8621 }, { 0xF5FB, 0x8620 },
+	{ 0xF5FC, 0x8629 }, { 0xF5FD, 0x861E }, { 0xF5FE, 0x8625 }, { 0xF640, 0x8829 }, { 0xF641, 0x881D }, { 0xF642, 0x881B }, { 0xF643, 0x8820 }, { 0xF644, 0x8824 },
+	{ 0xF645, 0x881C }, { 0xF646, 0x882B }, { 0xF647, 0x884A }, { 0xF648, 0x896D }, { 0xF649, 0x8969 }, { 0xF64A, 0x896E }, { 0xF64B, 0x896B }, { 0xF64C, 0x89FA },
+	{ 0xF64D, 0x8B79 }, { 0xF64E, 0x8B78 }, { 0xF64F, 0x8B45 }, { 0xF650, 0x8B7A }, { 0xF651, 0x8B7B }, { 0xF652, 0x8D10 }, { 0xF653, 0x8D14 }, { 0xF654, 0x8DAF },
+	{ 0xF655, 0x8E8E }, { 0xF656, 0x8E8C }, { 0xF657, 0x8F5E }, { 0xF658, 0x8F5B }, { 0xF659, 0x8F5D }, { 0xF65A, 0x9146 }, { 0xF65B, 0x9144 }, { 0xF65C, 0x9145 },
+	{ 0xF65D, 0x91B9 }, { 0xF65E, 0x943F }, { 0xF65F, 0x943B }, { 0xF660, 0x9436 }, { 0xF661, 0x9429 }, { 0xF662, 0x943D }, { 0xF663, 0x943C }, { 0xF664, 0x9430 },
+	{ 0xF665, 0x9439 }, { 0xF666, 0x942A }, { 0xF667, 0x9437 }, { 0xF668, 0x942C }, { 0xF669, 0x9440 }, { 0xF66A, 0x9431 }, { 0xF66B, 0x95E5 }, { 0xF66C, 0x95E4 },
+	{ 0xF66D, 0x95E3 }, { 0xF66E, 0x9735 }, { 0xF66F, 0x973A }, { 0xF670, 0x97BF }, { 0xF671, 0x97E1 }, { 0xF672, 0x9864 }, { 0xF673, 0x98C9 }, { 0xF674, 0x98C6 },
+	{ 0xF675, 0x98C0 }, { 0xF676, 0x9958 }, { 0xF677, 0x9956 }, { 0xF678, 0x9A39 }, { 0xF679, 0x9A3D }, { 0xF67A, 0x9A46 }, { 0xF67B, 0x9A44 }, { 0xF67C, 0x9A42 },
+	{ 0xF67D, 0x9A41 }, { 0xF67E, 0x9A3A }, { 0xF6A1, 0x9A3F }, { 0xF6A2, 0x9ACD }, { 0xF6A3, 0x9B15 }, { 0xF6A4, 0x9B17 }, { 0xF6A5, 0x9B18 }, { 0xF6A6, 0x9B16 },
+	{ 0xF6A7, 0x9B3A }, { 0xF6A8, 0x9B52 }, { 0xF6A9, 0x9C2B }, { 0xF6AA, 0x9C1D }, { 0xF6AB, 0x9C1C }, { 0xF6AC, 0x9C2C }, { 0xF6AD, 0x9C23 }, { 0xF6AE, 0x9C28 },
+	{ 0xF6AF, 0x9C29 }, { 0xF6B0, 0x9C24 }, { 0xF6B1, 0x9C21 }, { 0xF6B2, 0x9DB7 }, { 0xF6B3, 0x9DB6 }, { 0xF6B4, 0x9DBC }, { 0xF6B5, 0x9DC1 }, { 0xF6B6, 0x9DC7 },
+	{ 0xF6B7, 0x9DCA }, { 0xF6B8, 0x9DCF }, { 0xF6B9, 0x9DBE }, { 0xF6BA, 0x9DC5 }, { 0xF6BB, 0x9DC3 }, { 0xF6BC, 0x9DBB }, { 0xF6BD, 0x9DB5 }, { 0xF6BE, 0x9DCE },
+	{ 0xF6BF, 0x9DB9 }, { 0xF6C0, 0x9DBA }, { 0xF6C1, 0x9DAC }, { 0xF6C2, 0x9DC8 }, { 0xF6C3, 0x9DB1 }, { 0xF6C4, 0x9DAD }, { 0xF6C5, 0x9DCC }, { 0xF6C6, 0x9DB3 },
+	{ 0xF6C7, 0x9DCD }, { 0xF6C8, 0x9DB2 }, { 0xF6C9, 0x9E7A }, { 0xF6CA, 0x9E9C }, { 0xF6CB, 0x9EEB }, { 0xF6CC, 0x9EEE }, { 0xF6CD, 0x9EED }, { 0xF6CE, 0x9F1B },
+	{ 0xF6CF, 0x9F18 }, { 0xF6D0, 0x9F1A }, { 0xF6D1, 0x9F31 }, { 0xF6D2, 0x9F4E }, { 0xF6D3, 0x9F65 }, { 0xF6D4, 0x9F64 }, { 0xF6D5, 0x9F92 }, { 0xF6D6, 0x4EB9 },
+	{ 0xF6D7, 0x56C6 }, { 0xF6D8, 0x56C5 }, { 0xF6D9, 0x56CB }, { 0xF6DA, 0x5971 }, { 0xF6DB, 0x5B4B }, { 0xF6DC, 0x5B4C }, { 0xF6DD, 0x5DD5 }, { 0xF6DE, 0x5DD1 },
+	{ 0xF6DF, 0x5EF2 }, { 0xF6E0, 0x6521 }, { 0xF6E1, 0x6520 }, { 0xF6E2, 0x6526 }, { 0xF6E3, 0x6522 }, { 0xF6E4, 0x6B0B }, { 0xF6E5, 0x6B08 }, { 0xF6E6, 0x6B09 },
+	{ 0xF6E7, 0x6C0D }, { 0xF6E8, 0x7055 }, { 0xF6E9, 0x7056 }, { 0xF6EA, 0x7057 }, { 0xF6EB, 0x7052 }, { 0xF6EC, 0x721E }, { 0xF6ED, 0x721F }, { 0xF6EE, 0x72A9 },
+	{ 0xF6EF, 0x737F }, { 0xF6F0, 0x74D8 }, { 0xF6F1, 0x74D5 }, { 0xF6F2, 0x74D9 }, { 0xF6F3, 0x74D7 }, { 0xF6F4, 0x766D }, { 0xF6F5, 0x76AD }, { 0xF6F6, 0x7935 },
+	{ 0xF6F7, 0x79B4 }, { 0xF6F8, 0x7A70 }, { 0xF6F9, 0x7A71 }, { 0xF6FA, 0x7C57 }, { 0xF6FB, 0x7C5C }, { 0xF6FC, 0x7C59 }, { 0xF6FD, 0x7C5B }, { 0xF6FE, 0x7C5A },
+	{ 0xF740, 0x7CF4 }, { 0xF741, 0x7CF1 }, { 0xF742, 0x7E91 }, { 0xF743, 0x7F4F }, { 0xF744, 0x7F87 }, { 0xF745, 0x81DE }, { 0xF746, 0x826B }, { 0xF747, 0x8634 },
+	{ 0xF748, 0x8635 }, { 0xF749, 0x8633 }, { 0xF74A, 0x862C }, { 0xF74B, 0x8632 }, { 0xF74C, 0x8636 }, { 0xF74D, 0x882C }, { 0xF74E, 0x8828 }, { 0xF74F, 0x8826 },
+	{ 0xF750, 0x882A }, { 0xF751, 0x8825 }, { 0xF752, 0x8971 }, { 0xF753, 0x89BF }, { 0xF754, 0x89BE }, { 0xF755, 0x89FB }, { 0xF756, 0x8B7E }, { 0xF757, 0x8B84 },
+	{ 0xF758, 0x8B82 }, { 0xF759, 0x8B86 }, { 0xF75A, 0x8B85 }, { 0xF75B, 0x8B7F }, { 0xF75C, 0x8D15 }, { 0xF75D, 0x8E95 }, { 0xF75E, 0x8E94 }, { 0xF75F, 0x8E9A },
+	{ 0xF760, 0x8E92 }, { 0xF761, 0x8E90 }, { 0xF762, 0x8E96 }, { 0xF763, 0x8E97 }, { 0xF764, 0x8F60 }, { 0xF765, 0x8F62 }, { 0xF766, 0x9147 }, { 0xF767, 0x944C },
+	{ 0xF768, 0x9450 }, { 0xF769, 0x944A }, { 0xF76A, 0x944B }, { 0xF76B, 0x944F }, { 0xF76C, 0x9447 }, { 0xF76D, 0x9445 }, { 0xF76E, 0x9448 }, { 0xF76F, 0x9449 },
+	{ 0xF770, 0x9446 }, { 0xF771, 0x973F }, { 0xF772, 0x97E3 }, { 0xF773, 0x986A }, { 0xF774, 0x9869 }, { 0xF775, 0x98CB }, { 0xF776, 0x9954 }, { 0xF777, 0x995B },
+	{ 0xF778, 0x9A4E }, { 0xF779, 0x9A53 }, { 0xF77A, 0x9A54 }, { 0xF77B, 0x9A4C }, { 0xF77C, 0x9A4F }, { 0xF77D, 0x9A48 }, { 0xF77E, 0x9A4A }, { 0xF7A1, 0x9A49 },
+	{ 0xF7A2, 0x9A52 }, { 0xF7A3, 0x9A50 }, { 0xF7A4, 0x9AD0 }, { 0xF7A5, 0x9B19 }, { 0xF7A6, 0x9B2B }, { 0xF7A7, 0x9B3B }, { 0xF7A8, 0x9B56 }, { 0xF7A9, 0x9B55 },
+	{ 0xF7AA, 0x9C46 }, { 0xF7AB, 0x9C48 }, { 0xF7AC, 0x9C3F }, { 0xF7AD, 0x9C44 }, { 0xF7AE, 0x9C39 }, { 0xF7AF, 0x9C33 }, { 0xF7B0, 0x9C41 }, { 0xF7B1, 0x9C3C },
+	{ 0xF7B2, 0x9C37 }, { 0xF7B3, 0x9C34 }, { 0xF7B4, 0x9C32 }, { 0xF7B5, 0x9C3D }, { 0xF7B6, 0x9C36 }, { 0xF7B7, 0x9DDB }, { 0xF7B8, 0x9DD2 }, { 0xF7B9, 0x9DDE },
+	{ 0xF7BA, 0x9DDA }, { 0xF7BB, 0x9DCB }, { 0xF7BC, 0x9DD0 }, { 0xF7BD, 0x9DDC }, { 0xF7BE, 0x9DD1 }, { 0xF7BF, 0x9DDF }, { 0xF7C0, 0x9DE9 }, { 0xF7C1, 0x9DD9 },
+	{ 0xF7C2, 0x9DD8 }, { 0xF7C3, 0x9DD6 }, { 0xF7C4, 0x9DF5 }, { 0xF7C5, 0x9DD5 }, { 0xF7C6, 0x9DDD }, { 0xF7C7, 0x9EB6 }, { 0xF7C8, 0x9EF0 }, { 0xF7C9, 0x9F35 },
+	{ 0xF7CA, 0x9F33 }, { 0xF7CB, 0x9F32 }, { 0xF7CC, 0x9F42 }, { 0xF7CD, 0x9F6B }, { 0xF7CE, 0x9F95 }, { 0xF7CF, 0x9FA2 }, { 0xF7D0, 0x513D }, { 0xF7D1, 0x5299 },
+	{ 0xF7D2, 0x58E8 }, { 0xF7D3, 0x58E7 }, { 0xF7D4, 0x5972 }, { 0xF7D5, 0x5B4D }, { 0xF7D6, 0x5DD8 }, { 0xF7D7, 0x882F }, { 0xF7D8, 0x5F4F }, { 0xF7D9, 0x6201 },
+	{ 0xF7DA, 0x6203 }, { 0xF7DB, 0x6204 }, { 0xF7DC, 0x6529 }, { 0xF7DD, 0x6525 }, { 0xF7DE, 0x6596 }, { 0xF7DF, 0x66EB }, { 0xF7E0, 0x6B11 }, { 0xF7E1, 0x6B12 },
+	{ 0xF7E2, 0x6B0F }, { 0xF7E3, 0x6BCA }, { 0xF7E4, 0x705B }, { 0xF7E5, 0x705A }, { 0xF7E6, 0x7222 }, { 0xF7E7, 0x7382 }, { 0xF7E8, 0x7381 }, { 0xF7E9, 0x7383 },
+	{ 0xF7EA, 0x7670 }, { 0xF7EB, 0x77D4 }, { 0xF7EC, 0x7C67 }, { 0xF7ED, 0x7C66 }, { 0xF7EE, 0x7E95 }, { 0xF7EF, 0x826C }, { 0xF7F0, 0x863A }, { 0xF7F1, 0x8640 },
+	{ 0xF7F2, 0x8639 }, { 0xF7F3, 0x863C }, { 0xF7F4, 0x8631 }, { 0xF7F5, 0x863B }, { 0xF7F6, 0x863E }, { 0xF7F7, 0x8830 }, { 0xF7F8, 0x8832 }, { 0xF7F9, 0x882E },
+	{ 0xF7FA, 0x8833 }, { 0xF7FB, 0x8976 }, { 0xF7FC, 0x8974 }, { 0xF7FD, 0x8973 }, { 0xF7FE, 0x89FE }, { 0xF840, 0x8B8C }, { 0xF841, 0x8B8E }, { 0xF842, 0x8B8B },
+	{ 0xF843, 0x8B88 }, { 0xF844, 0x8C45 }, { 0xF845, 0x8D19 }, { 0xF846, 0x8E98 }, { 0xF847, 0x8F64 }, { 0xF848, 0x8F63 }, { 0xF849, 0x91BC }, { 0xF84A, 0x9462 },
+	{ 0xF84B, 0x9455 }, { 0xF84C, 0x945D }, { 0xF84D, 0x9457 }, { 0xF84E, 0x945E }, { 0xF84F, 0x97C4 }, { 0xF850, 0x97C5 }, { 0xF851, 0x9800 }, { 0xF852, 0x9A56 },
+	{ 0xF853, 0x9A59 }, { 0xF854, 0x9B1E }, { 0xF855, 0x9B1F }, { 0xF856, 0x9B20 }, { 0xF857, 0x9C52 }, { 0xF858, 0x9C58 }, { 0xF859, 0x9C50 }, { 0xF85A, 0x9C4A },
+	{ 0xF85B, 0x9C4D }, { 0xF85C, 0x9C4B }, { 0xF85D, 0x9C55 }, { 0xF85E, 0x9C59 }, { 0xF85F, 0x9C4C }, { 0xF860, 0x9C4E }, { 0xF861, 0x9DFB }, { 0xF862, 0x9DF7 },
+	{ 0xF863, 0x9DEF }, { 0xF864, 0x9DE3 }, { 0xF865, 0x9DEB }, { 0xF866, 0x9DF8 }, { 0xF867, 0x9DE4 }, { 0xF868, 0x9DF6 }, { 0xF869, 0x9DE1 }, { 0xF86A, 0x9DEE },
+	{ 0xF86B, 0x9DE6 }, { 0xF86C, 0x9DF2 }, { 0xF86D, 0x9DF0 }, { 0xF86E, 0x9DE2 }, { 0xF86F, 0x9DEC }, { 0xF870, 0x9DF4 }, { 0xF871, 0x9DF3 }, { 0xF872, 0x9DE8 },
+	{ 0xF873, 0x9DED }, { 0xF874, 0x9EC2 }, { 0xF875, 0x9ED0 }, { 0xF876, 0x9EF2 }, { 0xF877, 0x9EF3 }, { 0xF878, 0x9F06 }, { 0xF879, 0x9F1C }, { 0xF87A, 0x9F38 },
+	{ 0xF87B, 0x9F37 }, { 0xF87C, 0x9F36 }, { 0xF87D, 0x9F43 }, { 0xF87E, 0x9F4F }, { 0xF8A1, 0x9F71 }, { 0xF8A2, 0x9F70 }, { 0xF8A3, 0x9F6E }, { 0xF8A4, 0x9F6F },
+	{ 0xF8A5, 0x56D3 }, { 0xF8A6, 0x56CD }, { 0xF8A7, 0x5B4E }, { 0xF8A8, 0x5C6D }, { 0xF8A9, 0x652D }, { 0xF8AA, 0x66ED }, { 0xF8AB, 0x66EE }, { 0xF8AC, 0x6B13 },
+	{ 0xF8AD, 0x705F }, { 0xF8AE, 0x7061 }, { 0xF8AF, 0x705D }, { 0xF8B0, 0x7060 }, { 0xF8B1, 0x7223 }, { 0xF8B2, 0x74DB }, { 0xF8B3, 0x74E5 }, { 0xF8B4, 0x77D5 },
+	{ 0xF8B5, 0x7938 }, { 0xF8B6, 0x79B7 }, { 0xF8B7, 0x79B6 }, { 0xF8B8, 0x7C6A }, { 0xF8B9, 0x7E97 }, { 0xF8BA, 0x7F89 }, { 0xF8BB, 0x826D }, { 0xF8BC, 0x8643 },
+	{ 0xF8BD, 0x8838 }, { 0xF8BE, 0x8837 }, { 0xF8BF, 0x8835 }, { 0xF8C0, 0x884B }, { 0xF8C1, 0x8B94 }, { 0xF8C2, 0x8B95 }, { 0xF8C3, 0x8E9E }, { 0xF8C4, 0x8E9F },
+	{ 0xF8C5, 0x8EA0 }, { 0xF8C6, 0x8E9D }, { 0xF8C7, 0x91BE }, { 0xF8C8, 0x91BD }, { 0xF8C9, 0x91C2 }, { 0xF8CA, 0x946B }, { 0xF8CB, 0x9468 }, { 0xF8CC, 0x9469 },
+	{ 0xF8CD, 0x96E5 }, { 0xF8CE, 0x9746 }, { 0xF8CF, 0x9743 }, { 0xF8D0, 0x9747 }, { 0xF8D1, 0x97C7 }, { 0xF8D2, 0x97E5 }, { 0xF8D3, 0x9A5E }, { 0xF8D4, 0x9AD5 },
+	{ 0xF8D5, 0x9B59 }, { 0xF8D6, 0x9C63 }, { 0xF8D7, 0x9C67 }, { 0xF8D8, 0x9C66 }, { 0xF8D9, 0x9C62 }, { 0xF8DA, 0x9C5E }, { 0xF8DB, 0x9C60 }, { 0xF8DC, 0x9E02 },
+	{ 0xF8DD, 0x9DFE }, { 0xF8DE, 0x9E07 }, { 0xF8DF, 0x9E03 }, { 0xF8E0, 0x9E06 }, { 0xF8E1, 0x9E05 }, { 0xF8E2, 0x9E00 }, { 0xF8E3, 0x9E01 }, { 0xF8E4, 0x9E09 },
+	{ 0xF8E5, 0x9DFF }, { 0xF8E6, 0x9DFD }, { 0xF8E7, 0x9E04 }, { 0xF8E8, 0x9EA0 }, { 0xF8E9, 0x9F1E }, { 0xF8EA, 0x9F46 }, { 0xF8EB, 0x9F74 }, { 0xF8EC, 0x9F75 },
+	{ 0xF8ED, 0x9F76 }, { 0xF8EE, 0x56D4 }, { 0xF8EF, 0x652E }, { 0xF8F0, 0x65B8 }, { 0xF8F1, 0x6B18 }, { 0xF8F2, 0x6B19 }, { 0xF8F3, 0x6B17 }, { 0xF8F4, 0x6B1A },
+	{ 0xF8F5, 0x7062 }, { 0xF8F6, 0x7226 }, { 0xF8F7, 0x72AA }, { 0xF8F8, 0x77D8 }, { 0xF8F9, 0x77D9 }, { 0xF8FA, 0x7939 }, { 0xF8FB, 0x7C69 }, { 0xF8FC, 0x7C6B },
+	{ 0xF8FD, 0x7CF6 }, { 0xF8FE, 0x7E9A }, { 0xF940, 0x7E98 }, { 0xF941, 0x7E9B }, { 0xF942, 0x7E99 }, { 0xF943, 0x81E0 }, { 0xF944, 0x81E1 }, { 0xF945, 0x8646 },
+	{ 0xF946, 0x8647 }, { 0xF947, 0x8648 }, { 0xF948, 0x8979 }, { 0xF949, 0x897A }, { 0xF94A, 0x897C }, { 0xF94B, 0x897B }, { 0xF94C, 0x89FF }, { 0xF94D, 0x8B98 },
+	{ 0xF94E, 0x8B99 }, { 0xF94F, 0x8EA5 }, { 0xF950, 0x8EA4 }, { 0xF951, 0x8EA3 }, { 0xF952, 0x946E }, { 0xF953, 0x946D }, { 0xF954, 0x946F }, { 0xF955, 0x9471 },
+	{ 0xF956, 0x9473 }, { 0xF957, 0x9749 }, { 0xF958, 0x9872 }, { 0xF959, 0x995F }, { 0xF95A, 0x9C68 }, { 0xF95B, 0x9C6E }, { 0xF95C, 0x9C6D }, { 0xF95D, 0x9E0B },
+	{ 0xF95E, 0x9E0D }, { 0xF95F, 0x9E10 }, { 0xF960, 0x9E0F }, { 0xF961, 0x9E12 }, { 0xF962, 0x9E11 }, { 0xF963, 0x9EA1 }, { 0xF964, 0x9EF5 }, { 0xF965, 0x9F09 },
+	{ 0xF966, 0x9F47 }, { 0xF967, 0x9F78 }, { 0xF968, 0x9F7B }, { 0xF969, 0x9F7A }, { 0xF96A, 0x9F79 }, { 0xF96B, 0x571E }, { 0xF96C, 0x7066 }, { 0xF96D, 0x7C6F },
+	{ 0xF96E, 0x883C }, { 0xF96F, 0x8DB2 }, { 0xF970, 0x8EA6 }, { 0xF971, 0x91C3 }, { 0xF972, 0x9474 }, { 0xF973, 0x9478 }, { 0xF974, 0x9476 }, { 0xF975, 0x9475 },
+	{ 0xF976, 0x9A60 }, { 0xF977, 0x9C74 }, { 0xF978, 0x9C73 }, { 0xF979, 0x9C71 }, { 0xF97A, 0x9C75 }, { 0xF97B, 0x9E14 }, { 0xF97C, 0x9E13 }, { 0xF97D, 0x9EF6 },
+	{ 0xF97E, 0x9F0A }, { 0xF9A1, 0x9FA4 }, { 0xF9A2, 0x7068 }, { 0xF9A3, 0x7065 }, { 0xF9A4, 0x7CF7 }, { 0xF9A5, 0x866A }, { 0xF9A6, 0x883E }, { 0xF9A7, 0x883D },
+	{ 0xF9A8, 0x883F }, { 0xF9A9, 0x8B9E }, { 0xF9AA, 0x8C9C }, { 0xF9AB, 0x8EA9 }, { 0xF9AC, 0x8EC9 }, { 0xF9AD, 0x974B }, { 0xF9AE, 0x9873 }, { 0xF9AF, 0x9874 },
+	{ 0xF9B0, 0x98CC }, { 0xF9B1, 0x9961 }, { 0xF9B2, 0x99AB }, { 0xF9B3, 0x9A64 }, { 0xF9B4, 0x9A66 }, { 0xF9B5, 0x9A67 }, { 0xF9B6, 0x9B24 }, { 0xF9B7, 0x9E15 },
+	{ 0xF9B8, 0x9E17 }, { 0xF9B9, 0x9F48 }, { 0xF9BA, 0x6207 }, { 0xF9BB, 0x6B1E }, { 0xF9BC, 0x7227 }, { 0xF9BD, 0x864C }, { 0xF9BE, 0x8EA8 }, { 0xF9BF, 0x9482 },
+	{ 0xF9C0, 0x9480 }, { 0xF9C1, 0x9481 }, { 0xF9C2, 0x9A69 }, { 0xF9C3, 0x9A68 }, { 0xF9C4, 0x9B2E }, { 0xF9C5, 0x9E19 }, { 0xF9C6, 0x7229 }, { 0xF9C7, 0x864B },
+	{ 0xF9C8, 0x8B9F }, { 0xF9C9, 0x9483 }, { 0xF9CA, 0x9C79 }, { 0xF9CB, 0x9EB7 }, { 0xF9CC, 0x7675 }, { 0xF9CD, 0x9A6B }, { 0xF9CE, 0x9C7A }, { 0xF9CF, 0x9E1D },
+	{ 0xF9D0, 0x7069 }, { 0xF9D1, 0x706A }, { 0xF9D2, 0x9EA4 }, { 0xF9D3, 0x9F7E }, { 0xF9D4, 0x9F49 }, { 0xF9D5, 0x9F98 },
 };
 
 
 const DoubleByteEncoding::Mapping MacChineseTradEncoding::_reverseMappingTable[] = {
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x0083, 0x0083 }, 
-	{ 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, { 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, 
-	{ 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, { 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, 
-	{ 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, { 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, 
-	{ 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, { 0x00A0, 0x00A0 }, { 0x00A2, 0xA246 }, { 0x00A3, 0xA247 }, { 0x00A5, 0xA244 }, 
-	{ 0x00A7, 0xA1B1 }, { 0x00A9, 0x00FD }, { 0x00B0, 0xA258 }, { 0x00B1, 0xA1D3 }, { 0x00B7, 0xA145 }, { 0x00D7, 0xA1D1 }, { 0x00F7, 0xA1D2 }, { 0x02C7, 0xA3BE }, 
-	{ 0x02C9, 0xA3BC }, { 0x02CA, 0xA3BD }, { 0x02CB, 0xA3BF }, { 0x02D9, 0xA3BB }, { 0x0391, 0xA344 }, { 0x0392, 0xA345 }, { 0x0393, 0xA346 }, { 0x0394, 0xA347 }, 
-	{ 0x0395, 0xA348 }, { 0x0396, 0xA349 }, { 0x0397, 0xA34A }, { 0x0398, 0xA34B }, { 0x0399, 0xA34C }, { 0x039A, 0xA34D }, { 0x039B, 0xA34E }, { 0x039C, 0xA34F }, 
-	{ 0x039D, 0xA350 }, { 0x039E, 0xA351 }, { 0x039F, 0xA352 }, { 0x03A0, 0xA353 }, { 0x03A1, 0xA354 }, { 0x03A3, 0xA355 }, { 0x03A4, 0xA356 }, { 0x03A5, 0xA357 }, 
-	{ 0x03A6, 0xA358 }, { 0x03A7, 0xA359 }, { 0x03A8, 0xA35A }, { 0x03A9, 0xA35B }, { 0x03B1, 0xA35C }, { 0x03B2, 0xA35D }, { 0x03B3, 0xA35E }, { 0x03B4, 0xA35F }, 
-	{ 0x03B5, 0xA360 }, { 0x03B6, 0xA361 }, { 0x03B7, 0xA362 }, { 0x03B8, 0xA363 }, { 0x03B9, 0xA364 }, { 0x03BA, 0xA365 }, { 0x03BB, 0xA366 }, { 0x03BC, 0xA367 }, 
-	{ 0x03BD, 0xA368 }, { 0x03BE, 0xA369 }, { 0x03BF, 0xA36A }, { 0x03C0, 0xA36B }, { 0x03C1, 0xA36C }, { 0x03C3, 0xA36D }, { 0x03C4, 0xA36E }, { 0x03C5, 0xA36F }, 
-	{ 0x03C6, 0xA370 }, { 0x03C7, 0xA371 }, { 0x03C8, 0xA372 }, { 0x03C9, 0xA373 }, { 0x2013, 0xA156 }, { 0x2014, 0xA158 }, { 0x2018, 0xA1A5 }, { 0x2019, 0xA1A6 }, 
-	{ 0x201C, 0xA1A7 }, { 0x201D, 0xA1A8 }, { 0x2025, 0xA14C }, { 0x2026, 0x00FF }, { 0x2032, 0xA1AC }, { 0x2035, 0xA1AB }, { 0x203B, 0xA1B0 }, { 0x203E, 0xA1C2 }, 
-	{ 0x2103, 0xA24A }, { 0x2105, 0xA1C1 }, { 0x2109, 0xA24B }, { 0x2122, 0x00FE }, { 0x2160, 0xA2B9 }, { 0x2161, 0xA2BA }, { 0x2162, 0xA2BB }, { 0x2163, 0xA2BC }, 
-	{ 0x2164, 0xA2BD }, { 0x2165, 0xA2BE }, { 0x2166, 0xA2BF }, { 0x2167, 0xA2C0 }, { 0x2168, 0xA2C1 }, { 0x2169, 0xA2C2 }, { 0x2190, 0xA1F6 }, { 0x2191, 0xA1F4 }, 
-	{ 0x2192, 0xA1F7 }, { 0x2193, 0xA1F5 }, { 0x2196, 0xA1F8 }, { 0x2197, 0xA1F9 }, { 0x2198, 0xA1FB }, { 0x2199, 0xA1FA }, { 0x221A, 0xA1D4 }, { 0x221E, 0xA1DB }, 
-	{ 0x221F, 0xA1E8 }, { 0x2220, 0xA1E7 }, { 0x2223, 0xA1FD }, { 0x2225, 0xA1FC }, { 0x2229, 0xA1E4 }, { 0x222A, 0xA1E5 }, { 0x222B, 0xA1EC }, { 0x222E, 0xA1ED }, 
-	{ 0x2234, 0xA1EF }, { 0x2235, 0xA1EE }, { 0x223C, 0xA1E3 }, { 0x2252, 0xA1DC }, { 0x2260, 0xA1DA }, { 0x2261, 0xA1DD }, { 0x2266, 0xA1D8 }, { 0x2267, 0xA1D9 }, 
-	{ 0x2295, 0xA1F2 }, { 0x22A5, 0xA1E6 }, { 0x22BF, 0xA1E9 }, { 0x22EF, 0xA14B }, { 0x2500, 0xA277 }, { 0x2502, 0xA278 }, { 0x250C, 0xA27A }, { 0x2510, 0xA27B }, 
-	{ 0x2514, 0xA27C }, { 0x2518, 0xA27D }, { 0x251C, 0xA275 }, { 0x2524, 0xA274 }, { 0x252C, 0xA273 }, { 0x2534, 0xA272 }, { 0x253C, 0xA271 }, { 0x2550, 0xA2A4 }, 
-	{ 0x255E, 0xA2A5 }, { 0x2561, 0xA2A7 }, { 0x256A, 0xA2A6 }, { 0x256D, 0xA27E }, { 0x256E, 0xA2A1 }, { 0x256F, 0xA2A3 }, { 0x2570, 0xA2A2 }, { 0x2571, 0xA2AC }, 
-	{ 0x2572, 0xA2AD }, { 0x2573, 0xA2AE }, { 0x2581, 0xA262 }, { 0x2582, 0xA263 }, { 0x2583, 0xA264 }, { 0x2584, 0xA265 }, { 0x2585, 0xA266 }, { 0x2586, 0xA267 }, 
-	{ 0x2587, 0xA268 }, { 0x2588, 0xA269 }, { 0x2589, 0xA270 }, { 0x258A, 0xA26F }, { 0x258B, 0xA26E }, { 0x258C, 0xA26D }, { 0x258D, 0xA26C }, { 0x258E, 0xA26B }, 
-	{ 0x258F, 0xA26A }, { 0x2594, 0xA276 }, { 0x25A0, 0xA1BD }, { 0x25A1, 0xA1BC }, { 0x25B2, 0xA1B6 }, { 0x25B3, 0xA1B5 }, { 0x25BC, 0xA1BF }, { 0x25BD, 0xA1BE }, 
-	{ 0x25C6, 0xA1BB }, { 0x25C7, 0xA1BA }, { 0x25CB, 0xA1B3 }, { 0x25CE, 0xA1B7 }, { 0x25CF, 0xA1B4 }, { 0x25E2, 0xA2A8 }, { 0x25E3, 0xA2A9 }, { 0x25E4, 0xA2AB }, 
-	{ 0x25E5, 0xA2AA }, { 0x2605, 0xA1B9 }, { 0x2606, 0xA1B8 }, { 0x2609, 0xA1F3 }, { 0x2640, 0xA1F0 }, { 0x2642, 0xA1F1 }, { 0x3000, 0xA140 }, { 0x3001, 0xA142 }, 
-	{ 0x3002, 0xA143 }, { 0x3003, 0xA1B2 }, { 0x3008, 0xA171 }, { 0x3009, 0xA172 }, { 0x300A, 0xA16D }, { 0x300B, 0xA16E }, { 0x300C, 0xA175 }, { 0x300D, 0xA176 }, 
-	{ 0x300E, 0xA179 }, { 0x300F, 0xA17A }, { 0x3010, 0xA169 }, { 0x3011, 0xA16A }, { 0x3012, 0xA245 }, { 0x3014, 0xA165 }, { 0x3015, 0xA166 }, { 0x301D, 0xA1A9 }, 
-	{ 0x301E, 0xA1AA }, { 0x3021, 0xA2C3 }, { 0x3022, 0xA2C4 }, { 0x3023, 0xA2C5 }, { 0x3024, 0xA2C6 }, { 0x3025, 0xA2C7 }, { 0x3026, 0xA2C8 }, { 0x3027, 0xA2C9 }, 
-	{ 0x3028, 0xA2CA }, { 0x3029, 0xA2CB }, { 0x3105, 0xA374 }, { 0x3106, 0xA375 }, { 0x3107, 0xA376 }, { 0x3108, 0xA377 }, { 0x3109, 0xA378 }, { 0x310A, 0xA379 }, 
-	{ 0x310B, 0xA37A }, { 0x310C, 0xA37B }, { 0x310D, 0xA37C }, { 0x310E, 0xA37D }, { 0x310F, 0xA37E }, { 0x3110, 0xA3A1 }, { 0x3111, 0xA3A2 }, { 0x3112, 0xA3A3 }, 
-	{ 0x3113, 0xA3A4 }, { 0x3114, 0xA3A5 }, { 0x3115, 0xA3A6 }, { 0x3116, 0xA3A7 }, { 0x3117, 0xA3A8 }, { 0x3118, 0xA3A9 }, { 0x3119, 0xA3AA }, { 0x311A, 0xA3AB }, 
-	{ 0x311B, 0xA3AC }, { 0x311C, 0xA3AD }, { 0x311D, 0xA3AE }, { 0x311E, 0xA3AF }, { 0x311F, 0xA3B0 }, { 0x3120, 0xA3B1 }, { 0x3121, 0xA3B2 }, { 0x3122, 0xA3B3 }, 
-	{ 0x3123, 0xA3B4 }, { 0x3124, 0xA3B5 }, { 0x3125, 0xA3B6 }, { 0x3126, 0xA3B7 }, { 0x3127, 0xA3B8 }, { 0x3128, 0xA3B9 }, { 0x3129, 0xA3BA }, { 0x32A3, 0xA1C0 }, 
-	{ 0x338E, 0xA255 }, { 0x338F, 0xA256 }, { 0x339C, 0xA250 }, { 0x339D, 0xA251 }, { 0x339E, 0xA252 }, { 0x33A1, 0xA254 }, { 0x33C4, 0xA257 }, { 0x33CE, 0xA253 }, 
-	{ 0x33D1, 0xA1EB }, { 0x33D2, 0xA1EA }, { 0x33D5, 0xA24F }, { 0x4E00, 0xA440 }, { 0x4E01, 0xA442 }, { 0x4E03, 0xA443 }, { 0x4E07, 0xC945 }, { 0x4E08, 0xA456 }, 
-	{ 0x4E09, 0xA454 }, { 0x4E0A, 0xA457 }, { 0x4E0B, 0xA455 }, { 0x4E0C, 0xC946 }, { 0x4E0D, 0xA4A3 }, { 0x4E0E, 0xC94F }, { 0x4E0F, 0xC94D }, { 0x4E10, 0xA4A2 }, 
-	{ 0x4E11, 0xA4A1 }, { 0x4E14, 0xA542 }, { 0x4E15, 0xA541 }, { 0x4E16, 0xA540 }, { 0x4E18, 0xA543 }, { 0x4E19, 0xA4FE }, { 0x4E1E, 0xA5E0 }, { 0x4E1F, 0xA5E1 }, 
-	{ 0x4E26, 0xA8C3 }, { 0x4E2B, 0xA458 }, { 0x4E2D, 0xA4A4 }, { 0x4E2E, 0xC950 }, { 0x4E30, 0xA4A5 }, { 0x4E31, 0xC963 }, { 0x4E32, 0xA6EA }, { 0x4E33, 0xCBB1 }, 
-	{ 0x4E38, 0xA459 }, { 0x4E39, 0xA4A6 }, { 0x4E3B, 0xA544 }, { 0x4E3C, 0xC964 }, { 0x4E42, 0xC940 }, { 0x4E43, 0xA444 }, { 0x4E45, 0xA45B }, { 0x4E47, 0xC947 }, 
-	{ 0x4E48, 0xA45C }, { 0x4E4B, 0xA4A7 }, { 0x4E4D, 0xA545 }, { 0x4E4E, 0xA547 }, { 0x4E4F, 0xA546 }, { 0x4E52, 0xA5E2 }, { 0x4E53, 0xA5E3 }, { 0x4E56, 0xA8C4 }, 
-	{ 0x4E58, 0xADBC }, { 0x4E59, 0xA441 }, { 0x4E5C, 0xC941 }, { 0x4E5D, 0xA445 }, { 0x4E5E, 0xA45E }, { 0x4E5F, 0xA45D }, { 0x4E69, 0xA5E4 }, { 0x4E73, 0xA8C5 }, 
-	{ 0x4E7E, 0xB0AE }, { 0x4E7F, 0xD44B }, { 0x4E82, 0xB6C3 }, { 0x4E83, 0xDCB1 }, { 0x4E84, 0xDCB2 }, { 0x4E86, 0xA446 }, { 0x4E88, 0xA4A9 }, { 0x4E8B, 0xA8C6 }, 
-	{ 0x4E8C, 0xA447 }, { 0x4E8D, 0xC948 }, { 0x4E8E, 0xA45F }, { 0x4E91, 0xA4AA }, { 0x4E92, 0xA4AC }, { 0x4E93, 0xC951 }, { 0x4E94, 0xA4AD }, { 0x4E95, 0xA4AB }, 
-	{ 0x4E99, 0xA5E5 }, { 0x4E9B, 0xA8C7 }, { 0x4E9E, 0xA8C8 }, { 0x4E9F, 0xAB45 }, { 0x4EA1, 0xA460 }, { 0x4EA2, 0xA4AE }, { 0x4EA4, 0xA5E6 }, { 0x4EA5, 0xA5E8 }, 
-	{ 0x4EA6, 0xA5E7 }, { 0x4EA8, 0xA6EB }, { 0x4EAB, 0xA8C9 }, { 0x4EAC, 0xA8CA }, { 0x4EAD, 0xAB46 }, { 0x4EAE, 0xAB47 }, { 0x4EB3, 0xADBD }, { 0x4EB6, 0xDCB3 }, 
-	{ 0x4EB9, 0xF6D6 }, { 0x4EBA, 0xA448 }, { 0x4EC0, 0xA4B0 }, { 0x4EC1, 0xA4AF }, { 0x4EC2, 0xC952 }, { 0x4EC3, 0xA4B1 }, { 0x4EC4, 0xA4B7 }, { 0x4EC6, 0xA4B2 }, 
-	{ 0x4EC7, 0xA4B3 }, { 0x4EC8, 0xC954 }, { 0x4EC9, 0xC953 }, { 0x4ECA, 0xA4B5 }, { 0x4ECB, 0xA4B6 }, { 0x4ECD, 0xA4B4 }, { 0x4ED4, 0xA54A }, { 0x4ED5, 0xA54B }, 
-	{ 0x4ED6, 0xA54C }, { 0x4ED7, 0xA54D }, { 0x4ED8, 0xA549 }, { 0x4ED9, 0xA550 }, { 0x4EDA, 0xC96A }, { 0x4EDC, 0xC966 }, { 0x4EDD, 0xC969 }, { 0x4EDE, 0xA551 }, 
-	{ 0x4EDF, 0xA561 }, { 0x4EE1, 0xC968 }, { 0x4EE3, 0xA54E }, { 0x4EE4, 0xA54F }, { 0x4EE5, 0xA548 }, { 0x4EE8, 0xC965 }, { 0x4EE9, 0xC967 }, { 0x4EF0, 0xA5F5 }, 
-	{ 0x4EF1, 0xC9B0 }, { 0x4EF2, 0xA5F2 }, { 0x4EF3, 0xA5F6 }, { 0x4EF4, 0xC9BA }, { 0x4EF5, 0xC9AE }, { 0x4EF6, 0xA5F3 }, { 0x4EF7, 0xC9B2 }, { 0x4EFB, 0xA5F4 }, 
-	{ 0x4EFD, 0xA5F7 }, { 0x4EFF, 0xA5E9 }, { 0x4F00, 0xC9B1 }, { 0x4F01, 0xA5F8 }, { 0x4F02, 0xC9B5 }, { 0x4F04, 0xC9B9 }, { 0x4F05, 0xC9B6 }, { 0x4F08, 0xC9B3 }, 
-	{ 0x4F09, 0xA5EA }, { 0x4F0A, 0xA5EC }, { 0x4F0B, 0xA5F9 }, { 0x4F0D, 0xA5EE }, { 0x4F0E, 0xC9AB }, { 0x4F0F, 0xA5F1 }, { 0x4F10, 0xA5EF }, { 0x4F11, 0xA5F0 }, 
-	{ 0x4F12, 0xC9BB }, { 0x4F13, 0xC9B8 }, { 0x4F14, 0xC9AF }, { 0x4F15, 0xA5ED }, { 0x4F18, 0xC9AC }, { 0x4F19, 0xA5EB }, { 0x4F1D, 0xC9B4 }, { 0x4F22, 0xC9B7 }, 
-	{ 0x4F2C, 0xC9AD }, { 0x4F2D, 0xCA66 }, { 0x4F2F, 0xA742 }, { 0x4F30, 0xA6F4 }, { 0x4F33, 0xCA67 }, { 0x4F34, 0xA6F1 }, { 0x4F36, 0xA744 }, { 0x4F38, 0xA6F9 }, 
-	{ 0x4F3A, 0xA6F8 }, { 0x4F3B, 0xCA5B }, { 0x4F3C, 0xA6FC }, { 0x4F3D, 0xA6F7 }, { 0x4F3E, 0xCA60 }, { 0x4F3F, 0xCA68 }, { 0x4F41, 0xCA64 }, { 0x4F43, 0xA6FA }, 
-	{ 0x4F46, 0xA6FD }, { 0x4F47, 0xA6EE }, { 0x4F48, 0xA747 }, { 0x4F49, 0xCA5D }, { 0x4F4C, 0xCBBD }, { 0x4F4D, 0xA6EC }, { 0x4F4E, 0xA743 }, { 0x4F4F, 0xA6ED }, 
-	{ 0x4F50, 0xA6F5 }, { 0x4F51, 0xA6F6 }, { 0x4F52, 0xCA62 }, { 0x4F53, 0xCA5E }, { 0x4F54, 0xA6FB }, { 0x4F55, 0xA6F3 }, { 0x4F56, 0xCA5A }, { 0x4F57, 0xA6EF }, 
-	{ 0x4F58, 0xCA65 }, { 0x4F59, 0xA745 }, { 0x4F5A, 0xA748 }, { 0x4F5B, 0xA6F2 }, { 0x4F5C, 0xA740 }, { 0x4F5D, 0xA746 }, { 0x4F5E, 0xA6F0 }, { 0x4F5F, 0xCA63 }, 
-	{ 0x4F60, 0xA741 }, { 0x4F61, 0xCA69 }, { 0x4F62, 0xCA5C }, { 0x4F63, 0xA6FE }, { 0x4F64, 0xCA5F }, { 0x4F67, 0xCA61 }, { 0x4F69, 0xA8D8 }, { 0x4F6A, 0xCBBF }, 
-	{ 0x4F6B, 0xCBCB }, { 0x4F6C, 0xA8D0 }, { 0x4F6E, 0xCBCC }, { 0x4F6F, 0xA8CB }, { 0x4F70, 0xA8D5 }, { 0x4F73, 0xA8CE }, { 0x4F74, 0xCBB9 }, { 0x4F75, 0xA8D6 }, 
-	{ 0x4F76, 0xCBB8 }, { 0x4F77, 0xCBBC }, { 0x4F78, 0xCBC3 }, { 0x4F79, 0xCBC1 }, { 0x4F7A, 0xA8DE }, { 0x4F7B, 0xA8D9 }, { 0x4F7C, 0xCBB3 }, { 0x4F7D, 0xCBB5 }, 
-	{ 0x4F7E, 0xA8DB }, { 0x4F7F, 0xA8CF }, { 0x4F80, 0xCBB6 }, { 0x4F81, 0xCBC2 }, { 0x4F82, 0xCBC9 }, { 0x4F83, 0xA8D4 }, { 0x4F84, 0xCBBB }, { 0x4F85, 0xCBB4 }, 
-	{ 0x4F86, 0xA8D3 }, { 0x4F87, 0xCBB7 }, { 0x4F88, 0xA8D7 }, { 0x4F89, 0xCBBA }, { 0x4F8B, 0xA8D2 }, { 0x4F8D, 0xA8CD }, { 0x4F8F, 0xA8DC }, { 0x4F90, 0xCBC4 }, 
-	{ 0x4F91, 0xA8DD }, { 0x4F92, 0xCBC8 }, { 0x4F94, 0xCBC6 }, { 0x4F95, 0xCBCA }, { 0x4F96, 0xA8DA }, { 0x4F97, 0xCBBE }, { 0x4F98, 0xCBB2 }, { 0x4F9A, 0xCBC0 }, 
-	{ 0x4F9B, 0xA8D1 }, { 0x4F9C, 0xCBC5 }, { 0x4F9D, 0xA8CC }, { 0x4F9E, 0xCBC7 }, { 0x4FAE, 0xAB56 }, { 0x4FAF, 0xAB4A }, { 0x4FB2, 0xCDE0 }, { 0x4FB3, 0xCDE8 }, 
-	{ 0x4FB5, 0xAB49 }, { 0x4FB6, 0xAB51 }, { 0x4FB7, 0xAB5D }, { 0x4FB9, 0xCDEE }, { 0x4FBA, 0xCDEC }, { 0x4FBB, 0xCDE7 }, { 0x4FBF, 0xAB4B }, { 0x4FC0, 0xCDED }, 
-	{ 0x4FC1, 0xCDE3 }, { 0x4FC2, 0xAB59 }, { 0x4FC3, 0xAB50 }, { 0x4FC4, 0xAB58 }, { 0x4FC5, 0xCDDE }, { 0x4FC7, 0xCDEA }, { 0x4FC9, 0xCDE1 }, { 0x4FCA, 0xAB54 }, 
-	{ 0x4FCB, 0xCDE2 }, { 0x4FCD, 0xCDDD }, { 0x4FCE, 0xAB5B }, { 0x4FCF, 0xAB4E }, { 0x4FD0, 0xAB57 }, { 0x4FD1, 0xAB4D }, { 0x4FD3, 0xCDDF }, { 0x4FD4, 0xCDE4 }, 
-	{ 0x4FD6, 0xCDEB }, { 0x4FD7, 0xAB55 }, { 0x4FD8, 0xAB52 }, { 0x4FD9, 0xCDE6 }, { 0x4FDA, 0xAB5A }, { 0x4FDB, 0xCDE9 }, { 0x4FDC, 0xCDE5 }, { 0x4FDD, 0xAB4F }, 
-	{ 0x4FDE, 0xAB5C }, { 0x4FDF, 0xAB53 }, { 0x4FE0, 0xAB4C }, { 0x4FE1, 0xAB48 }, { 0x4FEC, 0xCDEF }, { 0x4FEE, 0xADD7 }, { 0x4FEF, 0xADC1 }, { 0x4FF1, 0xADD1 }, 
-	{ 0x4FF3, 0xADD6 }, { 0x4FF4, 0xD0D0 }, { 0x4FF5, 0xD0CF }, { 0x4FF6, 0xD0D4 }, { 0x4FF7, 0xD0D5 }, { 0x4FF8, 0xADC4 }, { 0x4FFA, 0xADCD }, { 0x4FFE, 0xADDA }, 
-	{ 0x5000, 0xADCE }, { 0x5005, 0xD0C9 }, { 0x5006, 0xADC7 }, { 0x5007, 0xD0CA }, { 0x5009, 0xADDC }, { 0x500B, 0xADD3 }, { 0x500C, 0xADBE }, { 0x500D, 0xADBF }, 
-	{ 0x500E, 0xD0DD }, { 0x500F, 0xB0BF }, { 0x5011, 0xADCC }, { 0x5012, 0xADCB }, { 0x5013, 0xD0CB }, { 0x5014, 0xADCF }, { 0x5015, 0xD45B }, { 0x5016, 0xADC6 }, 
-	{ 0x5017, 0xD0D6 }, { 0x5018, 0xADD5 }, { 0x5019, 0xADD4 }, { 0x501A, 0xADCA }, { 0x501B, 0xD0CE }, { 0x501C, 0xD0D7 }, { 0x501E, 0xD0C8 }, { 0x501F, 0xADC9 }, 
-	{ 0x5020, 0xD0D8 }, { 0x5021, 0xADD2 }, { 0x5022, 0xD0CC }, { 0x5023, 0xADC0 }, { 0x5025, 0xADC3 }, { 0x5026, 0xADC2 }, { 0x5027, 0xD0D9 }, { 0x5028, 0xADD0 }, 
-	{ 0x5029, 0xADC5 }, { 0x502A, 0xADD9 }, { 0x502B, 0xADDB }, { 0x502C, 0xD0D3 }, { 0x502D, 0xADD8 }, { 0x502F, 0xD0DB }, { 0x5030, 0xD0CD }, { 0x5031, 0xD0DC }, 
-	{ 0x5033, 0xD0D1 }, { 0x5035, 0xD0DA }, { 0x5037, 0xD0D2 }, { 0x503C, 0xADC8 }, { 0x5040, 0xD463 }, { 0x5041, 0xD457 }, { 0x5043, 0xB0B3 }, { 0x5045, 0xD45C }, 
-	{ 0x5046, 0xD462 }, { 0x5047, 0xB0B2 }, { 0x5048, 0xD455 }, { 0x5049, 0xB0B6 }, { 0x504A, 0xD459 }, { 0x504B, 0xD452 }, { 0x504C, 0xB0B4 }, { 0x504D, 0xD456 }, 
-	{ 0x504E, 0xB0B9 }, { 0x504F, 0xB0BE }, { 0x5051, 0xD467 }, { 0x5053, 0xD451 }, { 0x5055, 0xB0BA }, { 0x5057, 0xD466 }, { 0x505A, 0xB0B5 }, { 0x505B, 0xD458 }, 
-	{ 0x505C, 0xB0B1 }, { 0x505D, 0xD453 }, { 0x505E, 0xD44F }, { 0x505F, 0xD45D }, { 0x5060, 0xD450 }, { 0x5061, 0xD44E }, { 0x5062, 0xD45A }, { 0x5063, 0xD460 }, 
-	{ 0x5064, 0xD461 }, { 0x5065, 0xB0B7 }, { 0x5068, 0xD85B }, { 0x5069, 0xD45E }, { 0x506A, 0xD44D }, { 0x506B, 0xD45F }, { 0x506D, 0xB0C1 }, { 0x506E, 0xD464 }, 
-	{ 0x506F, 0xB0C0 }, { 0x5070, 0xD44C }, { 0x5072, 0xD454 }, { 0x5073, 0xD465 }, { 0x5074, 0xB0BC }, { 0x5075, 0xB0BB }, { 0x5076, 0xB0B8 }, { 0x5077, 0xB0BD }, 
-	{ 0x507A, 0xB0AF }, { 0x507D, 0xB0B0 }, { 0x5080, 0xB3C8 }, { 0x5082, 0xD85E }, { 0x5083, 0xD857 }, { 0x5085, 0xB3C5 }, { 0x5087, 0xD85F }, { 0x508B, 0xD855 }, 
-	{ 0x508C, 0xD858 }, { 0x508D, 0xB3C4 }, { 0x508E, 0xD859 }, { 0x5091, 0xB3C7 }, { 0x5092, 0xD85D }, { 0x5094, 0xD853 }, { 0x5095, 0xD852 }, { 0x5096, 0xB3C9 }, 
-	{ 0x5098, 0xB3CA }, { 0x5099, 0xB3C6 }, { 0x509A, 0xB3CB }, { 0x509B, 0xD851 }, { 0x509C, 0xD85C }, { 0x509D, 0xD85A }, { 0x509E, 0xD854 }, { 0x50A2, 0xB3C3 }, 
-	{ 0x50A3, 0xD856 }, { 0x50AC, 0xB6CA }, { 0x50AD, 0xB6C4 }, { 0x50AE, 0xDCB7 }, { 0x50AF, 0xB6CD }, { 0x50B0, 0xDCBD }, { 0x50B1, 0xDCC0 }, { 0x50B2, 0xB6C6 }, 
-	{ 0x50B3, 0xB6C7 }, { 0x50B4, 0xDCBA }, { 0x50B5, 0xB6C5 }, { 0x50B6, 0xDCC3 }, { 0x50B7, 0xB6CB }, { 0x50B8, 0xDCC4 }, { 0x50BA, 0xDCBF }, { 0x50BB, 0xB6CC }, 
-	{ 0x50BD, 0xDCB4 }, { 0x50BE, 0xB6C9 }, { 0x50BF, 0xDCB5 }, { 0x50C1, 0xDCBE }, { 0x50C2, 0xDCBC }, { 0x50C4, 0xDCB8 }, { 0x50C5, 0xB6C8 }, { 0x50C6, 0xDCB6 }, 
-	{ 0x50C7, 0xB6CE }, { 0x50C8, 0xDCBB }, { 0x50C9, 0xDCC2 }, { 0x50CA, 0xDCB9 }, { 0x50CB, 0xDCC1 }, { 0x50CE, 0xB9B6 }, { 0x50CF, 0xB9B3 }, { 0x50D1, 0xB9B4 }, 
-	{ 0x50D3, 0xE0F9 }, { 0x50D4, 0xE0F1 }, { 0x50D5, 0xB9B2 }, { 0x50D6, 0xB9AF }, { 0x50D7, 0xE0F2 }, { 0x50DA, 0xB9B1 }, { 0x50DB, 0xE0F5 }, { 0x50DD, 0xE0F7 }, 
-	{ 0x50E0, 0xE0FE }, { 0x50E3, 0xE0FD }, { 0x50E4, 0xE0F8 }, { 0x50E5, 0xB9AE }, { 0x50E6, 0xE0F0 }, { 0x50E7, 0xB9AC }, { 0x50E8, 0xE0F3 }, { 0x50E9, 0xB9B7 }, 
-	{ 0x50EA, 0xE0F6 }, { 0x50EC, 0xE0FA }, { 0x50ED, 0xB9B0 }, { 0x50EE, 0xB9AD }, { 0x50EF, 0xE0FC }, { 0x50F0, 0xE0FB }, { 0x50F1, 0xB9B5 }, { 0x50F3, 0xE0F4 }, 
-	{ 0x50F5, 0xBBF8 }, { 0x50F6, 0xE4EC }, { 0x50F8, 0xE4E9 }, { 0x50F9, 0xBBF9 }, { 0x50FB, 0xBBF7 }, { 0x50FD, 0xE4F0 }, { 0x50FE, 0xE4ED }, { 0x50FF, 0xE4E6 }, 
-	{ 0x5100, 0xBBF6 }, { 0x5102, 0xBBFA }, { 0x5103, 0xE4E7 }, { 0x5104, 0xBBF5 }, { 0x5105, 0xBBFD }, { 0x5106, 0xE4EA }, { 0x5107, 0xE4EB }, { 0x5108, 0xBBFB }, 
-	{ 0x5109, 0xBBFC }, { 0x510A, 0xE4F1 }, { 0x510B, 0xE4EE }, { 0x510C, 0xE4EF }, { 0x5110, 0xBEAA }, { 0x5111, 0xE8F8 }, { 0x5112, 0xBEA7 }, { 0x5113, 0xE8F5 }, 
-	{ 0x5114, 0xBEA9 }, { 0x5115, 0xBEAB }, { 0x5117, 0xE8F6 }, { 0x5118, 0xBEA8 }, { 0x511A, 0xE8F7 }, { 0x511C, 0xE8F4 }, { 0x511F, 0xC076 }, { 0x5120, 0xECBD }, 
-	{ 0x5121, 0xC077 }, { 0x5122, 0xECBB }, { 0x5124, 0xECBC }, { 0x5125, 0xECBA }, { 0x5126, 0xECB9 }, { 0x5129, 0xECBE }, { 0x512A, 0xC075 }, { 0x512D, 0xEFB8 }, 
-	{ 0x512E, 0xEFB9 }, { 0x5130, 0xE4E8 }, { 0x5131, 0xEFB7 }, { 0x5132, 0xC078 }, { 0x5133, 0xC35F }, { 0x5134, 0xF1EB }, { 0x5135, 0xF1EC }, { 0x5137, 0xC4D7 }, 
-	{ 0x5138, 0xC4D8 }, { 0x5139, 0xF5C1 }, { 0x513A, 0xF5C0 }, { 0x513B, 0xC56C }, { 0x513C, 0xC56B }, { 0x513D, 0xF7D0 }, { 0x513F, 0xA449 }, { 0x5140, 0xA461 }, 
-	{ 0x5141, 0xA4B9 }, { 0x5143, 0xA4B8 }, { 0x5144, 0xA553 }, { 0x5145, 0xA552 }, { 0x5146, 0xA5FC }, { 0x5147, 0xA5FB }, { 0x5148, 0xA5FD }, { 0x5149, 0xA5FA }, 
-	{ 0x514B, 0xA74A }, { 0x514C, 0xA749 }, { 0x514D, 0xA74B }, { 0x5152, 0xA8E0 }, { 0x5154, 0xA8DF }, { 0x5155, 0xA8E1 }, { 0x5157, 0xAB5E }, { 0x5159, 0xA259 }, 
-	{ 0x515A, 0xD0DE }, { 0x515B, 0xA25A }, { 0x515C, 0xB0C2 }, { 0x515D, 0xA25C }, { 0x515E, 0xA25B }, { 0x515F, 0xD860 }, { 0x5161, 0xA25D }, { 0x5162, 0xB9B8 }, 
-	{ 0x5163, 0xA25E }, { 0x5165, 0xA44A }, { 0x5167, 0xA4BA }, { 0x5168, 0xA5FE }, { 0x5169, 0xA8E2 }, { 0x516B, 0xA44B }, { 0x516C, 0xA4BD }, { 0x516D, 0xA4BB }, 
-	{ 0x516E, 0xA4BC }, { 0x5171, 0xA640 }, { 0x5175, 0xA74C }, { 0x5176, 0xA8E4 }, { 0x5177, 0xA8E3 }, { 0x5178, 0xA8E5 }, { 0x517C, 0xADDD }, { 0x5180, 0xBEAC }, 
-	{ 0x5187, 0xC94E }, { 0x5189, 0xA554 }, { 0x518A, 0xA555 }, { 0x518D, 0xA641 }, { 0x518F, 0xCA6A }, { 0x5191, 0xAB60 }, { 0x5192, 0xAB5F }, { 0x5193, 0xD0E0 }, 
-	{ 0x5194, 0xD0DF }, { 0x5195, 0xB0C3 }, { 0x5197, 0xA4BE }, { 0x5198, 0xC955 }, { 0x519E, 0xCBCD }, { 0x51A0, 0xAB61 }, { 0x51A2, 0xADE0 }, { 0x51A4, 0xADDE }, 
-	{ 0x51A5, 0xADDF }, { 0x51AA, 0xBEAD }, { 0x51AC, 0xA556 }, { 0x51B0, 0xA642 }, { 0x51B1, 0xC9BC }, { 0x51B6, 0xA74D }, { 0x51B7, 0xA74E }, { 0x51B9, 0xCA6B }, 
-	{ 0x51BC, 0xCBCE }, { 0x51BD, 0xA8E6 }, { 0x51BE, 0xCBCF }, { 0x51C4, 0xD0E2 }, { 0x51C5, 0xD0E3 }, { 0x51C6, 0xADE3 }, { 0x51C8, 0xD0E4 }, { 0x51CA, 0xD0E1 }, 
-	{ 0x51CB, 0xADE4 }, { 0x51CC, 0xADE2 }, { 0x51CD, 0xADE1 }, { 0x51CE, 0xD0E5 }, { 0x51D0, 0xD468 }, { 0x51D4, 0xD861 }, { 0x51D7, 0xDCC5 }, { 0x51D8, 0xE140 }, 
-	{ 0x51DC, 0xBBFE }, { 0x51DD, 0xBEAE }, { 0x51DE, 0xE8F9 }, { 0x51E0, 0xA44C }, { 0x51E1, 0xA45A }, { 0x51F0, 0xB0C4 }, { 0x51F1, 0xB3CD }, { 0x51F3, 0xB9B9 }, 
-	{ 0x51F5, 0xC942 }, { 0x51F6, 0xA4BF }, { 0x51F8, 0xA559 }, { 0x51F9, 0xA557 }, { 0x51FA, 0xA558 }, { 0x51FD, 0xA8E7 }, { 0x5200, 0xA44D }, { 0x5201, 0xA44E }, 
-	{ 0x5203, 0xA462 }, { 0x5206, 0xA4C0 }, { 0x5207, 0xA4C1 }, { 0x5208, 0xA4C2 }, { 0x5209, 0xC9BE }, { 0x520A, 0xA55A }, { 0x520C, 0xC96B }, { 0x520E, 0xA646 }, 
-	{ 0x5210, 0xC9BF }, { 0x5211, 0xA644 }, { 0x5212, 0xA645 }, { 0x5213, 0xC9BD }, { 0x5216, 0xA647 }, { 0x5217, 0xA643 }, { 0x521C, 0xCA6C }, { 0x521D, 0xAAEC }, 
-	{ 0x521E, 0xCA6D }, { 0x5221, 0xCA6E }, { 0x5224, 0xA750 }, { 0x5225, 0xA74F }, { 0x5228, 0xA753 }, { 0x5229, 0xA751 }, { 0x522A, 0xA752 }, { 0x522E, 0xA8ED }, 
-	{ 0x5230, 0xA8EC }, { 0x5231, 0xCBD4 }, { 0x5232, 0xCBD1 }, { 0x5233, 0xCBD2 }, { 0x5235, 0xCBD0 }, { 0x5236, 0xA8EE }, { 0x5237, 0xA8EA }, { 0x5238, 0xA8E9 }, 
-	{ 0x523A, 0xA8EB }, { 0x523B, 0xA8E8 }, { 0x5241, 0xA8EF }, { 0x5243, 0xAB63 }, { 0x5244, 0xCDF0 }, { 0x5246, 0xCBD3 }, { 0x5247, 0xAB68 }, { 0x5249, 0xCDF1 }, 
-	{ 0x524A, 0xAB64 }, { 0x524B, 0xAB67 }, { 0x524C, 0xAB66 }, { 0x524D, 0xAB65 }, { 0x524E, 0xAB62 }, { 0x5252, 0xD0E8 }, { 0x5254, 0xADE7 }, { 0x5255, 0xD0EB }, 
-	{ 0x5256, 0xADE5 }, { 0x525A, 0xD0E7 }, { 0x525B, 0xADE8 }, { 0x525C, 0xADE6 }, { 0x525D, 0xADE9 }, { 0x525E, 0xD0E9 }, { 0x525F, 0xD0EA }, { 0x5261, 0xD0E6 }, 
-	{ 0x5262, 0xD0EC }, { 0x5269, 0xB3D1 }, { 0x526A, 0xB0C5 }, { 0x526B, 0xD469 }, { 0x526C, 0xD46B }, { 0x526D, 0xD46A }, { 0x526E, 0xD46C }, { 0x526F, 0xB0C6 }, 
-	{ 0x5272, 0xB3CE }, { 0x5274, 0xB3CF }, { 0x5275, 0xB3D0 }, { 0x5277, 0xB6D0 }, { 0x5278, 0xDCC7 }, { 0x527A, 0xDCC6 }, { 0x527B, 0xDCC8 }, { 0x527C, 0xDCC9 }, 
-	{ 0x527D, 0xB6D1 }, { 0x527F, 0xB6CF }, { 0x5280, 0xE141 }, { 0x5281, 0xE142 }, { 0x5282, 0xB9BB }, { 0x5283, 0xB9BA }, { 0x5284, 0xE35A }, { 0x5287, 0xBC40 }, 
-	{ 0x5288, 0xBC41 }, { 0x5289, 0xBC42 }, { 0x528A, 0xBC44 }, { 0x528B, 0xE4F2 }, { 0x528C, 0xE4F3 }, { 0x528D, 0xBC43 }, { 0x5291, 0xBEAF }, { 0x5293, 0xBEB0 }, 
-	{ 0x5296, 0xF1ED }, { 0x5297, 0xF5C3 }, { 0x5298, 0xF5C2 }, { 0x5299, 0xF7D1 }, { 0x529B, 0xA44F }, { 0x529F, 0xA55C }, { 0x52A0, 0xA55B }, { 0x52A3, 0xA648 }, 
-	{ 0x52A6, 0xC9C0 }, { 0x52A9, 0xA755 }, { 0x52AA, 0xA756 }, { 0x52AB, 0xA754 }, { 0x52AC, 0xA757 }, { 0x52AD, 0xCA6F }, { 0x52AE, 0xCA70 }, { 0x52BB, 0xA8F1 }, 
-	{ 0x52BC, 0xCBD5 }, { 0x52BE, 0xA8F0 }, { 0x52C0, 0xCDF2 }, { 0x52C1, 0xAB6C }, { 0x52C2, 0xCDF3 }, { 0x52C3, 0xAB6B }, { 0x52C7, 0xAB69 }, { 0x52C9, 0xAB6A }, 
-	{ 0x52CD, 0xD0ED }, { 0x52D2, 0xB0C7 }, { 0x52D3, 0xD46E }, { 0x52D5, 0xB0CA }, { 0x52D6, 0xD46D }, { 0x52D7, 0xB1E5 }, { 0x52D8, 0xB0C9 }, { 0x52D9, 0xB0C8 }, 
-	{ 0x52DB, 0xB3D4 }, { 0x52DD, 0xB3D3 }, { 0x52DE, 0xB3D2 }, { 0x52DF, 0xB6D2 }, { 0x52E2, 0xB6D5 }, { 0x52E3, 0xB6D6 }, { 0x52E4, 0xB6D4 }, { 0x52E6, 0xB6D3 }, 
-	{ 0x52E9, 0xE143 }, { 0x52EB, 0xE144 }, { 0x52EF, 0xE4F5 }, { 0x52F0, 0xBC45 }, { 0x52F1, 0xE4F4 }, { 0x52F3, 0xBEB1 }, { 0x52F4, 0xECBF }, { 0x52F5, 0xC079 }, 
-	{ 0x52F7, 0xF1EE }, { 0x52F8, 0xC455 }, { 0x52FA, 0xA463 }, { 0x52FB, 0xA4C3 }, { 0x52FC, 0xC956 }, { 0x52FE, 0xA4C4 }, { 0x52FF, 0xA4C5 }, { 0x5305, 0xA55D }, 
-	{ 0x5306, 0xA55E }, { 0x5308, 0xA649 }, { 0x5309, 0xCA71 }, { 0x530A, 0xCBD6 }, { 0x530B, 0xCBD7 }, { 0x530D, 0xAB6D }, { 0x530E, 0xD0EE }, { 0x530F, 0xB0CC }, 
-	{ 0x5310, 0xB0CB }, { 0x5311, 0xD863 }, { 0x5312, 0xD862 }, { 0x5315, 0xA450 }, { 0x5316, 0xA4C6 }, { 0x5317, 0xA55F }, { 0x5319, 0xB0CD }, { 0x531A, 0xC943 }, 
-	{ 0x531C, 0xC96C }, { 0x531D, 0xA560 }, { 0x531F, 0xC9C2 }, { 0x5320, 0xA64B }, { 0x5321, 0xA64A }, { 0x5322, 0xC9C1 }, { 0x5323, 0xA758 }, { 0x532A, 0xADEA }, 
-	{ 0x532D, 0xD46F }, { 0x532F, 0xB6D7 }, { 0x5330, 0xE145 }, { 0x5331, 0xB9BC }, { 0x5334, 0xE8FA }, { 0x5337, 0xF3FD }, { 0x5339, 0xA4C7 }, { 0x533C, 0xCBD8 }, 
-	{ 0x533D, 0xCDF4 }, { 0x533E, 0xB0D0 }, { 0x533F, 0xB0CE }, { 0x5340, 0xB0CF }, { 0x5341, 0xA451 }, { 0x5343, 0xA464 }, { 0x5344, 0xA2CD }, { 0x5345, 0xA4CA }, 
-	{ 0x5347, 0xA4C9 }, { 0x5348, 0xA4C8 }, { 0x5349, 0xA563 }, { 0x534A, 0xA562 }, { 0x534C, 0xC96D }, { 0x534D, 0xC9C3 }, { 0x5351, 0xA8F5 }, { 0x5352, 0xA8F2 }, 
-	{ 0x5353, 0xA8F4 }, { 0x5354, 0xA8F3 }, { 0x5357, 0xAB6E }, { 0x535A, 0xB3D5 }, { 0x535C, 0xA452 }, { 0x535E, 0xA4CB }, { 0x5360, 0xA565 }, { 0x5361, 0xA564 }, 
-	{ 0x5363, 0xCA72 }, { 0x5366, 0xA8F6 }, { 0x536C, 0xC957 }, { 0x536E, 0xA567 }, { 0x536F, 0xA566 }, { 0x5370, 0xA64C }, { 0x5371, 0xA64D }, { 0x5372, 0xCA73 }, 
-	{ 0x5373, 0xA759 }, { 0x5375, 0xA75A }, { 0x5377, 0xA8F7 }, { 0x5378, 0xA8F8 }, { 0x5379, 0xA8F9 }, { 0x537B, 0xAB6F }, { 0x537C, 0xCDF5 }, { 0x537F, 0xADEB }, 
-	{ 0x5382, 0xC944 }, { 0x5384, 0xA4CC }, { 0x538A, 0xC9C4 }, { 0x538E, 0xCA74 }, { 0x538F, 0xCA75 }, { 0x5392, 0xCBD9 }, { 0x5394, 0xCBDA }, { 0x5396, 0xCDF7 }, 
-	{ 0x5397, 0xCDF6 }, { 0x5398, 0xCDF9 }, { 0x5399, 0xCDF8 }, { 0x539A, 0xAB70 }, { 0x539C, 0xD470 }, { 0x539D, 0xADED }, { 0x539E, 0xD0EF }, { 0x539F, 0xADEC }, 
-	{ 0x53A4, 0xD864 }, { 0x53A5, 0xB3D6 }, { 0x53A7, 0xD865 }, { 0x53AC, 0xE146 }, { 0x53AD, 0xB9BD }, { 0x53B2, 0xBC46 }, { 0x53B4, 0xF1EF }, { 0x53B9, 0xC958 }, 
-	{ 0x53BB, 0xA568 }, { 0x53C3, 0xB0D1 }, { 0x53C8, 0xA453 }, { 0x53C9, 0xA465 }, { 0x53CA, 0xA4CE }, { 0x53CB, 0xA4CD }, { 0x53CD, 0xA4CF }, { 0x53D4, 0xA8FB }, 
-	{ 0x53D6, 0xA8FA }, { 0x53D7, 0xA8FC }, { 0x53DB, 0xAB71 }, { 0x53DF, 0xADEE }, { 0x53E1, 0xE8FB }, { 0x53E2, 0xC24F }, { 0x53E3, 0xA466 }, { 0x53E4, 0xA56A }, 
-	{ 0x53E5, 0xA579 }, { 0x53E6, 0xA574 }, { 0x53E8, 0xA56F }, { 0x53E9, 0xA56E }, { 0x53EA, 0xA575 }, { 0x53EB, 0xA573 }, { 0x53EC, 0xA56C }, { 0x53ED, 0xA57A }, 
-	{ 0x53EE, 0xA56D }, { 0x53EF, 0xA569 }, { 0x53F0, 0xA578 }, { 0x53F1, 0xA577 }, { 0x53F2, 0xA576 }, { 0x53F3, 0xA56B }, { 0x53F5, 0xA572 }, { 0x53F8, 0xA571 }, 
-	{ 0x53FB, 0xA57B }, { 0x53FC, 0xA570 }, { 0x5401, 0xA653 }, { 0x5403, 0xA659 }, { 0x5404, 0xA655 }, { 0x5406, 0xA65B }, { 0x5407, 0xC9C5 }, { 0x5408, 0xA658 }, 
-	{ 0x5409, 0xA64E }, { 0x540A, 0xA651 }, { 0x540B, 0xA654 }, { 0x540C, 0xA650 }, { 0x540D, 0xA657 }, { 0x540E, 0xA65A }, { 0x540F, 0xA64F }, { 0x5410, 0xA652 }, 
-	{ 0x5411, 0xA656 }, { 0x5412, 0xA65C }, { 0x5418, 0xCA7E }, { 0x5419, 0xCA7B }, { 0x541B, 0xA767 }, { 0x541C, 0xCA7C }, { 0x541D, 0xA75B }, { 0x541E, 0xA75D }, 
-	{ 0x541F, 0xA775 }, { 0x5420, 0xA770 }, { 0x5424, 0xCAA5 }, { 0x5425, 0xCA7D }, { 0x5426, 0xA75F }, { 0x5427, 0xA761 }, { 0x5428, 0xCAA4 }, { 0x5429, 0xA768 }, 
-	{ 0x542A, 0xCA78 }, { 0x542B, 0xA774 }, { 0x542C, 0xA776 }, { 0x542D, 0xA75C }, { 0x542E, 0xA76D }, { 0x5430, 0xCA76 }, { 0x5431, 0xA773 }, { 0x5433, 0xA764 }, 
-	{ 0x5435, 0xA76E }, { 0x5436, 0xA76F }, { 0x5437, 0xCA77 }, { 0x5438, 0xA76C }, { 0x5439, 0xA76A }, { 0x543B, 0xA76B }, { 0x543C, 0xA771 }, { 0x543D, 0xCAA1 }, 
-	{ 0x543E, 0xA75E }, { 0x5440, 0xA772 }, { 0x5441, 0xCAA3 }, { 0x5442, 0xA766 }, { 0x5443, 0xA763 }, { 0x5445, 0xCA7A }, { 0x5446, 0xA762 }, { 0x5447, 0xCAA6 }, 
-	{ 0x5448, 0xA765 }, { 0x544A, 0xA769 }, { 0x544E, 0xA760 }, { 0x544F, 0xCAA2 }, { 0x5454, 0xCA79 }, { 0x5460, 0xCBEB }, { 0x5461, 0xCBEA }, { 0x5462, 0xA94F }, 
-	{ 0x5463, 0xCBED }, { 0x5464, 0xCBEF }, { 0x5465, 0xCBE4 }, { 0x5466, 0xCBE7 }, { 0x5467, 0xCBEE }, { 0x5468, 0xA950 }, { 0x546B, 0xCBE1 }, { 0x546C, 0xCBE5 }, 
-	{ 0x546F, 0xCBE9 }, { 0x5470, 0xCE49 }, { 0x5471, 0xA94B }, { 0x5472, 0xCE4D }, { 0x5473, 0xA8FD }, { 0x5474, 0xCBE6 }, { 0x5475, 0xA8FE }, { 0x5476, 0xA94C }, 
-	{ 0x5477, 0xA945 }, { 0x5478, 0xA941 }, { 0x547A, 0xCBE2 }, { 0x547B, 0xA944 }, { 0x547C, 0xA949 }, { 0x547D, 0xA952 }, { 0x547E, 0xCBE3 }, { 0x547F, 0xCBDC }, 
-	{ 0x5480, 0xA943 }, { 0x5481, 0xCBDD }, { 0x5482, 0xCBDF }, { 0x5484, 0xA946 }, { 0x5486, 0xA948 }, { 0x5487, 0xCBDB }, { 0x5488, 0xCBE0 }, { 0x548B, 0xA951 }, 
-	{ 0x548C, 0xA94D }, { 0x548D, 0xCBE8 }, { 0x548E, 0xA953 }, { 0x5490, 0xA94A }, { 0x5491, 0xCBDE }, { 0x5492, 0xA947 }, { 0x5495, 0xA942 }, { 0x5496, 0xA940 }, 
-	{ 0x5498, 0xCBEC }, { 0x549A, 0xA94E }, { 0x54A0, 0xCE48 }, { 0x54A1, 0xCDFB }, { 0x54A2, 0xCE4B }, { 0x54A5, 0xCDFD }, { 0x54A6, 0xAB78 }, { 0x54A7, 0xABA8 }, 
-	{ 0x54A8, 0xAB74 }, { 0x54A9, 0xABA7 }, { 0x54AA, 0xAB7D }, { 0x54AB, 0xABA4 }, { 0x54AC, 0xAB72 }, { 0x54AD, 0xCDFC }, { 0x54AE, 0xCE43 }, { 0x54AF, 0xABA3 }, 
-	{ 0x54B0, 0xCE4F }, { 0x54B1, 0xABA5 }, { 0x54B3, 0xAB79 }, { 0x54B6, 0xCE45 }, { 0x54B7, 0xCE42 }, { 0x54B8, 0xAB77 }, { 0x54BA, 0xCDFA }, { 0x54BB, 0xABA6 }, 
-	{ 0x54BC, 0xCE4A }, { 0x54BD, 0xAB7C }, { 0x54BE, 0xCE4C }, { 0x54BF, 0xABA9 }, { 0x54C0, 0xAB73 }, { 0x54C1, 0xAB7E }, { 0x54C2, 0xAB7B }, { 0x54C3, 0xCE40 }, 
-	{ 0x54C4, 0xABA1 }, { 0x54C5, 0xCE46 }, { 0x54C6, 0xCE47 }, { 0x54C7, 0xAB7A }, { 0x54C8, 0xABA2 }, { 0x54C9, 0xAB76 }, { 0x54CE, 0xAB75 }, { 0x54CF, 0xCDFE }, 
-	{ 0x54D6, 0xCE44 }, { 0x54DE, 0xCE4E }, { 0x54E0, 0xD144 }, { 0x54E1, 0xADFB }, { 0x54E2, 0xD0F1 }, { 0x54E4, 0xD0F6 }, { 0x54E5, 0xADF4 }, { 0x54E6, 0xAE40 }, 
-	{ 0x54E7, 0xD0F4 }, { 0x54E8, 0xADEF }, { 0x54E9, 0xADF9 }, { 0x54EA, 0xADFE }, { 0x54EB, 0xD0FB }, { 0x54ED, 0xADFA }, { 0x54EE, 0xADFD }, { 0x54F1, 0xD0FE }, 
-	{ 0x54F2, 0xADF5 }, { 0x54F3, 0xD0F5 }, { 0x54F7, 0xD142 }, { 0x54F8, 0xD143 }, { 0x54FA, 0xADF7 }, { 0x54FB, 0xD141 }, { 0x54FC, 0xADF3 }, { 0x54FD, 0xAE43 }, 
-	{ 0x54FF, 0xD0F8 }, { 0x5501, 0xADF1 }, { 0x5503, 0xD146 }, { 0x5504, 0xD0F9 }, { 0x5505, 0xD0FD }, { 0x5506, 0xADF6 }, { 0x5507, 0xAE42 }, { 0x5508, 0xD0FA }, 
-	{ 0x5509, 0xADFC }, { 0x550A, 0xD140 }, { 0x550B, 0xD147 }, { 0x550C, 0xD4A1 }, { 0x550E, 0xD145 }, { 0x550F, 0xAE44 }, { 0x5510, 0xADF0 }, { 0x5511, 0xD0FC }, 
-	{ 0x5512, 0xD0F3 }, { 0x5514, 0xADF8 }, { 0x5517, 0xD0F2 }, { 0x551A, 0xD0F7 }, { 0x5526, 0xD0F0 }, { 0x5527, 0xAE41 }, { 0x552A, 0xD477 }, { 0x552C, 0xB0E4 }, 
-	{ 0x552D, 0xD4A7 }, { 0x552E, 0xB0E2 }, { 0x552F, 0xB0DF }, { 0x5530, 0xD47C }, { 0x5531, 0xB0DB }, { 0x5532, 0xD4A2 }, { 0x5533, 0xB0E6 }, { 0x5534, 0xD476 }, 
-	{ 0x5535, 0xD47B }, { 0x5536, 0xD47A }, { 0x5537, 0xADF2 }, { 0x5538, 0xB0E1 }, { 0x5539, 0xD4A5 }, { 0x553B, 0xD4A8 }, { 0x553C, 0xD473 }, { 0x553E, 0xB3E8 }, 
-	{ 0x5540, 0xD4A9 }, { 0x5541, 0xB0E7 }, { 0x5543, 0xB0D9 }, { 0x5544, 0xB0D6 }, { 0x5545, 0xD47E }, { 0x5546, 0xB0D3 }, { 0x5548, 0xD4A6 }, { 0x554A, 0xB0DA }, 
-	{ 0x554B, 0xD4AA }, { 0x554D, 0xD474 }, { 0x554E, 0xD4A4 }, { 0x554F, 0xB0DD }, { 0x5550, 0xD475 }, { 0x5551, 0xD478 }, { 0x5552, 0xD47D }, { 0x5555, 0xB0DE }, 
-	{ 0x5556, 0xB0DC }, { 0x5557, 0xB0E8 }, { 0x555C, 0xB0E3 }, { 0x555E, 0xB0D7 }, { 0x555F, 0xB1D2 }, { 0x5561, 0xB0D8 }, { 0x5562, 0xD479 }, { 0x5563, 0xB0E5 }, 
-	{ 0x5564, 0xB0E0 }, { 0x5565, 0xD4A3 }, { 0x5566, 0xB0D5 }, { 0x556A, 0xB0D4 }, { 0x5575, 0xD471 }, { 0x5576, 0xD472 }, { 0x5577, 0xD86A }, { 0x557B, 0xB3D7 }, 
-	{ 0x557C, 0xB3DA }, { 0x557D, 0xD875 }, { 0x557E, 0xB3EE }, { 0x557F, 0xD878 }, { 0x5580, 0xB3D8 }, { 0x5581, 0xD871 }, { 0x5582, 0xB3DE }, { 0x5583, 0xB3E4 }, 
-	{ 0x5584, 0xB5BD }, { 0x5587, 0xB3E2 }, { 0x5588, 0xD86E }, { 0x5589, 0xB3EF }, { 0x558A, 0xB3DB }, { 0x558B, 0xB3E3 }, { 0x558C, 0xD876 }, { 0x558D, 0xDCD7 }, 
-	{ 0x558E, 0xD87B }, { 0x558F, 0xD86F }, { 0x5591, 0xD866 }, { 0x5592, 0xD873 }, { 0x5593, 0xD86D }, { 0x5594, 0xB3E1 }, { 0x5595, 0xD879 }, { 0x5598, 0xB3DD }, 
-	{ 0x5599, 0xB3F1 }, { 0x559A, 0xB3EA }, { 0x559C, 0xB3DF }, { 0x559D, 0xB3DC }, { 0x559F, 0xB3E7 }, { 0x55A1, 0xD87A }, { 0x55A2, 0xD86C }, { 0x55A3, 0xD872 }, 
-	{ 0x55A4, 0xD874 }, { 0x55A5, 0xD868 }, { 0x55A6, 0xD877 }, { 0x55A7, 0xB3D9 }, { 0x55A8, 0xD867 }, { 0x55AA, 0xB3E0 }, { 0x55AB, 0xB3F0 }, { 0x55AC, 0xB3EC }, 
-	{ 0x55AD, 0xD869 }, { 0x55AE, 0xB3E6 }, { 0x55B1, 0xB3ED }, { 0x55B2, 0xB3E9 }, { 0x55B3, 0xB3E5 }, { 0x55B5, 0xD870 }, { 0x55BB, 0xB3EB }, { 0x55BF, 0xDCD5 }, 
-	{ 0x55C0, 0xDCD1 }, { 0x55C2, 0xDCE0 }, { 0x55C3, 0xDCCA }, { 0x55C4, 0xDCD3 }, { 0x55C5, 0xB6E5 }, { 0x55C6, 0xB6E6 }, { 0x55C7, 0xB6DE }, { 0x55C8, 0xDCDC }, 
-	{ 0x55C9, 0xB6E8 }, { 0x55CA, 0xDCCF }, { 0x55CB, 0xDCCE }, { 0x55CC, 0xDCCC }, { 0x55CD, 0xDCDE }, { 0x55CE, 0xB6DC }, { 0x55CF, 0xDCD8 }, { 0x55D0, 0xDCCD }, 
-	{ 0x55D1, 0xB6DF }, { 0x55D2, 0xDCD6 }, { 0x55D3, 0xB6DA }, { 0x55D4, 0xDCD2 }, { 0x55D5, 0xDCD9 }, { 0x55D6, 0xDCDB }, { 0x55D9, 0xDCDF }, { 0x55DA, 0xB6E3 }, 
-	{ 0x55DB, 0xDCCB }, { 0x55DC, 0xB6DD }, { 0x55DD, 0xDCD0 }, { 0x55DF, 0xB6D8 }, { 0x55E1, 0xB6E4 }, { 0x55E2, 0xDCDA }, { 0x55E3, 0xB6E0 }, { 0x55E4, 0xB6E1 }, 
-	{ 0x55E5, 0xB6E7 }, { 0x55E6, 0xB6DB }, { 0x55E7, 0xA25F }, { 0x55E8, 0xB6D9 }, { 0x55E9, 0xDCD4 }, { 0x55EF, 0xB6E2 }, { 0x55F2, 0xDCDD }, { 0x55F6, 0xB9CD }, 
-	{ 0x55F7, 0xB9C8 }, { 0x55F9, 0xE155 }, { 0x55FA, 0xE151 }, { 0x55FC, 0xE14B }, { 0x55FD, 0xB9C2 }, { 0x55FE, 0xB9BE }, { 0x55FF, 0xE154 }, { 0x5600, 0xB9BF }, 
-	{ 0x5601, 0xE14E }, { 0x5602, 0xE150 }, { 0x5604, 0xE153 }, { 0x5606, 0xB9C4 }, { 0x5608, 0xB9CB }, { 0x5609, 0xB9C5 }, { 0x560C, 0xE149 }, { 0x560D, 0xB9C6 }, 
-	{ 0x560E, 0xB9C7 }, { 0x560F, 0xE14C }, { 0x5610, 0xB9CC }, { 0x5612, 0xE14A }, { 0x5613, 0xE14F }, { 0x5614, 0xB9C3 }, { 0x5615, 0xE148 }, { 0x5616, 0xB9C9 }, 
-	{ 0x5617, 0xB9C1 }, { 0x561B, 0xB9C0 }, { 0x561C, 0xE14D }, { 0x561D, 0xE152 }, { 0x561F, 0xB9CA }, { 0x5627, 0xE147 }, { 0x5629, 0xBC4D }, { 0x562A, 0xE547 }, 
-	{ 0x562C, 0xE544 }, { 0x562E, 0xBC47 }, { 0x562F, 0xBC53 }, { 0x5630, 0xBC54 }, { 0x5632, 0xBC4A }, { 0x5633, 0xE542 }, { 0x5634, 0xBC4C }, { 0x5635, 0xE4F9 }, 
-	{ 0x5636, 0xBC52 }, { 0x5638, 0xE546 }, { 0x5639, 0xBC49 }, { 0x563A, 0xE548 }, { 0x563B, 0xBC48 }, { 0x563D, 0xE543 }, { 0x563E, 0xE545 }, { 0x563F, 0xBC4B }, 
-	{ 0x5640, 0xE541 }, { 0x5641, 0xE4FA }, { 0x5642, 0xE4F7 }, { 0x5645, 0xD86B }, { 0x5646, 0xE4FD }, { 0x5648, 0xE4F6 }, { 0x5649, 0xE4FC }, { 0x564A, 0xE4FB }, 
-	{ 0x564C, 0xE4F8 }, { 0x564E, 0xBC4F }, { 0x5653, 0xBC4E }, { 0x5657, 0xBC50 }, { 0x5658, 0xE4FE }, { 0x5659, 0xBEB2 }, { 0x565A, 0xE540 }, { 0x565E, 0xE945 }, 
-	{ 0x5660, 0xE8FD }, { 0x5662, 0xBEBE }, { 0x5663, 0xE942 }, { 0x5664, 0xBEB6 }, { 0x5665, 0xBEBA }, { 0x5666, 0xE941 }, { 0x5668, 0xBEB9 }, { 0x5669, 0xBEB5 }, 
-	{ 0x566A, 0xBEB8 }, { 0x566B, 0xBEB3 }, { 0x566C, 0xBEBD }, { 0x566D, 0xE943 }, { 0x566E, 0xE8FE }, { 0x566F, 0xBEBC }, { 0x5670, 0xE8FC }, { 0x5671, 0xBEBB }, 
-	{ 0x5672, 0xE944 }, { 0x5673, 0xE940 }, { 0x5674, 0xBC51 }, { 0x5676, 0xBEBF }, { 0x5677, 0xE946 }, { 0x5678, 0xBEB7 }, { 0x5679, 0xBEB4 }, { 0x567E, 0xECC6 }, 
-	{ 0x567F, 0xECC8 }, { 0x5680, 0xC07B }, { 0x5681, 0xECC9 }, { 0x5682, 0xECC7 }, { 0x5683, 0xECC5 }, { 0x5684, 0xECC4 }, { 0x5685, 0xC07D }, { 0x5686, 0xECC3 }, 
-	{ 0x5687, 0xC07E }, { 0x568C, 0xECC1 }, { 0x568D, 0xECC2 }, { 0x568E, 0xC07A }, { 0x568F, 0xC0A1 }, { 0x5690, 0xC07C }, { 0x5693, 0xECC0 }, { 0x5695, 0xC250 }, 
-	{ 0x5697, 0xEFBC }, { 0x5698, 0xEFBA }, { 0x5699, 0xEFBF }, { 0x569A, 0xEFBD }, { 0x569C, 0xEFBB }, { 0x569D, 0xEFBE }, { 0x56A5, 0xC360 }, { 0x56A6, 0xF1F2 }, 
-	{ 0x56A7, 0xF1F3 }, { 0x56A8, 0xC456 }, { 0x56AA, 0xF1F4 }, { 0x56AB, 0xF1F0 }, { 0x56AC, 0xF1F5 }, { 0x56AD, 0xF1F1 }, { 0x56AE, 0xC251 }, { 0x56B2, 0xF3FE }, 
-	{ 0x56B3, 0xF441 }, { 0x56B4, 0xC459 }, { 0x56B5, 0xF440 }, { 0x56B6, 0xC458 }, { 0x56B7, 0xC457 }, { 0x56BC, 0xC45A }, { 0x56BD, 0xF5C5 }, { 0x56BE, 0xF5C6 }, 
-	{ 0x56C0, 0xC4DA }, { 0x56C1, 0xC4D9 }, { 0x56C2, 0xC4DB }, { 0x56C3, 0xF5C4 }, { 0x56C5, 0xF6D8 }, { 0x56C6, 0xF6D7 }, { 0x56C8, 0xC56D }, { 0x56C9, 0xC56F }, 
-	{ 0x56CA, 0xC56E }, { 0x56CB, 0xF6D9 }, { 0x56CC, 0xC5C8 }, { 0x56CD, 0xF8A6 }, { 0x56D1, 0xC5F1 }, { 0x56D3, 0xF8A5 }, { 0x56D4, 0xF8EE }, { 0x56D7, 0xC949 }, 
-	{ 0x56DA, 0xA57D }, { 0x56DB, 0xA57C }, { 0x56DD, 0xA65F }, { 0x56DE, 0xA65E }, { 0x56DF, 0xC9C7 }, { 0x56E0, 0xA65D }, { 0x56E1, 0xC9C6 }, { 0x56E4, 0xA779 }, 
-	{ 0x56E5, 0xCAA9 }, { 0x56E7, 0xCAA8 }, { 0x56EA, 0xA777 }, { 0x56EB, 0xA77A }, { 0x56EE, 0xCAA7 }, { 0x56F0, 0xA778 }, { 0x56F7, 0xCBF0 }, { 0x56F9, 0xCBF1 }, 
-	{ 0x56FA, 0xA954 }, { 0x56FF, 0xABAA }, { 0x5701, 0xD148 }, { 0x5702, 0xD149 }, { 0x5703, 0xAE45 }, { 0x5704, 0xAE46 }, { 0x5707, 0xD4AC }, { 0x5708, 0xB0E9 }, 
-	{ 0x5709, 0xB0EB }, { 0x570A, 0xD4AB }, { 0x570B, 0xB0EA }, { 0x570C, 0xD87C }, { 0x570D, 0xB3F2 }, { 0x5712, 0xB6E9 }, { 0x5713, 0xB6EA }, { 0x5714, 0xDCE1 }, 
-	{ 0x5716, 0xB9CF }, { 0x5718, 0xB9CE }, { 0x571A, 0xE549 }, { 0x571B, 0xE948 }, { 0x571C, 0xE947 }, { 0x571E, 0xF96B }, { 0x571F, 0xA467 }, { 0x5720, 0xC959 }, 
-	{ 0x5722, 0xC96E }, { 0x5723, 0xC96F }, { 0x5728, 0xA662 }, { 0x5729, 0xA666 }, { 0x572A, 0xC9C9 }, { 0x572C, 0xA664 }, { 0x572D, 0xA663 }, { 0x572E, 0xC9C8 }, 
-	{ 0x572F, 0xA665 }, { 0x5730, 0xA661 }, { 0x5733, 0xA660 }, { 0x5734, 0xC9CA }, { 0x573B, 0xA7A6 }, { 0x573E, 0xA7A3 }, { 0x5740, 0xA77D }, { 0x5741, 0xCAAA }, 
-	{ 0x5745, 0xCAAB }, { 0x5747, 0xA7A1 }, { 0x5749, 0xCAAD }, { 0x574A, 0xA77B }, { 0x574B, 0xCAAE }, { 0x574C, 0xCAAC }, { 0x574D, 0xA77E }, { 0x574E, 0xA7A2 }, 
-	{ 0x574F, 0xA7A5 }, { 0x5750, 0xA7A4 }, { 0x5751, 0xA77C }, { 0x5752, 0xCAAF }, { 0x5761, 0xA959 }, { 0x5762, 0xCBFE }, { 0x5764, 0xA95B }, { 0x5766, 0xA95A }, 
-	{ 0x5768, 0xCC40 }, { 0x5769, 0xA958 }, { 0x576A, 0xA957 }, { 0x576B, 0xCBF5 }, { 0x576D, 0xCBF4 }, { 0x576F, 0xCBF2 }, { 0x5770, 0xCBF7 }, { 0x5771, 0xCBF6 }, 
-	{ 0x5772, 0xCBF3 }, { 0x5773, 0xCBFC }, { 0x5774, 0xCBFD }, { 0x5775, 0xCBFA }, { 0x5776, 0xCBF8 }, { 0x5777, 0xA956 }, { 0x577B, 0xCBFB }, { 0x577C, 0xA95C }, 
-	{ 0x577D, 0xCC41 }, { 0x5780, 0xCBF9 }, { 0x5782, 0xABAB }, { 0x5783, 0xA955 }, { 0x578B, 0xABAC }, { 0x578C, 0xCE54 }, { 0x578F, 0xCE5A }, { 0x5793, 0xABB2 }, 
-	{ 0x5794, 0xCE58 }, { 0x5795, 0xCE5E }, { 0x5797, 0xCE55 }, { 0x5798, 0xCE59 }, { 0x5799, 0xCE5B }, { 0x579A, 0xCE5D }, { 0x579B, 0xCE57 }, { 0x579D, 0xCE56 }, 
-	{ 0x579E, 0xCE51 }, { 0x579F, 0xCE52 }, { 0x57A0, 0xABAD }, { 0x57A2, 0xABAF }, { 0x57A3, 0xABAE }, { 0x57A4, 0xCE53 }, { 0x57A5, 0xCE5C }, { 0x57AE, 0xABB1 }, 
-	{ 0x57B5, 0xCE50 }, { 0x57B6, 0xD153 }, { 0x57B8, 0xD152 }, { 0x57B9, 0xD157 }, { 0x57BA, 0xD14E }, { 0x57BC, 0xD151 }, { 0x57BD, 0xD150 }, { 0x57BF, 0xD154 }, 
-	{ 0x57C1, 0xD158 }, { 0x57C2, 0xAE47 }, { 0x57C3, 0xAE4A }, { 0x57C6, 0xD14F }, { 0x57C7, 0xD155 }, { 0x57CB, 0xAE49 }, { 0x57CC, 0xD14A }, { 0x57CE, 0xABB0 }, 
-	{ 0x57CF, 0xD4BA }, { 0x57D0, 0xD156 }, { 0x57D2, 0xD14D }, { 0x57D4, 0xAE48 }, { 0x57D5, 0xD14C }, { 0x57DC, 0xD4B1 }, { 0x57DF, 0xB0EC }, { 0x57E0, 0xB0F0 }, 
-	{ 0x57E1, 0xD4C1 }, { 0x57E2, 0xD4AF }, { 0x57E3, 0xD4BD }, { 0x57E4, 0xB0F1 }, { 0x57E5, 0xD4BF }, { 0x57E7, 0xD4C5 }, { 0x57E9, 0xD4C9 }, { 0x57EC, 0xD4C0 }, 
-	{ 0x57ED, 0xD4B4 }, { 0x57EE, 0xD4BC }, { 0x57F0, 0xD4CA }, { 0x57F1, 0xD4C8 }, { 0x57F2, 0xD4BE }, { 0x57F3, 0xD4B9 }, { 0x57F4, 0xD4B2 }, { 0x57F5, 0xD8A6 }, 
-	{ 0x57F6, 0xD4B0 }, { 0x57F7, 0xB0F5 }, { 0x57F8, 0xD4B7 }, { 0x57F9, 0xB0F6 }, { 0x57FA, 0xB0F2 }, { 0x57FB, 0xD4AD }, { 0x57FC, 0xD4C3 }, { 0x57FD, 0xD4B5 }, 
-	{ 0x5800, 0xD4B3 }, { 0x5801, 0xD4C6 }, { 0x5802, 0xB0F3 }, { 0x5804, 0xD4CC }, { 0x5805, 0xB0ED }, { 0x5806, 0xB0EF }, { 0x5807, 0xD4BB }, { 0x5808, 0xD4B6 }, 
-	{ 0x5809, 0xAE4B }, { 0x580A, 0xB0EE }, { 0x580B, 0xD4B8 }, { 0x580C, 0xD4C7 }, { 0x580D, 0xD4CB }, { 0x580E, 0xD4C2 }, { 0x5810, 0xD4C4 }, { 0x5814, 0xD4AE }, 
-	{ 0x5819, 0xD8A1 }, { 0x581B, 0xD8AA }, { 0x581C, 0xD8A9 }, { 0x581D, 0xB3FA }, { 0x581E, 0xD8A2 }, { 0x5820, 0xB3FB }, { 0x5821, 0xB3F9 }, { 0x5823, 0xD8A4 }, 
-	{ 0x5824, 0xB3F6 }, { 0x5825, 0xD8A8 }, { 0x5827, 0xD8A3 }, { 0x5828, 0xD8A5 }, { 0x5829, 0xD87D }, { 0x582A, 0xB3F4 }, { 0x582C, 0xD8B2 }, { 0x582D, 0xD8B1 }, 
-	{ 0x582E, 0xD8AE }, { 0x582F, 0xB3F3 }, { 0x5830, 0xB3F7 }, { 0x5831, 0xB3F8 }, { 0x5832, 0xD14B }, { 0x5833, 0xD8AB }, { 0x5834, 0xB3F5 }, { 0x5835, 0xB0F4 }, 
-	{ 0x5836, 0xD8AD }, { 0x5837, 0xD87E }, { 0x5838, 0xD8B0 }, { 0x5839, 0xD8AF }, { 0x583B, 0xD8B3 }, { 0x583D, 0xDCEF }, { 0x583F, 0xD8AC }, { 0x5848, 0xD8A7 }, 
-	{ 0x5849, 0xDCE7 }, { 0x584A, 0xB6F4 }, { 0x584B, 0xB6F7 }, { 0x584C, 0xB6F2 }, { 0x584D, 0xDCE6 }, { 0x584E, 0xDCEA }, { 0x584F, 0xDCE5 }, { 0x5851, 0xB6EC }, 
-	{ 0x5852, 0xB6F6 }, { 0x5853, 0xDCE2 }, { 0x5854, 0xB6F0 }, { 0x5855, 0xDCE9 }, { 0x5857, 0xB6EE }, { 0x5858, 0xB6ED }, { 0x5859, 0xDCEC }, { 0x585A, 0xB6EF }, 
-	{ 0x585B, 0xDCEE }, { 0x585D, 0xDCEB }, { 0x585E, 0xB6EB }, { 0x5862, 0xB6F5 }, { 0x5863, 0xDCF0 }, { 0x5864, 0xDCE4 }, { 0x5865, 0xDCED }, { 0x5868, 0xDCE3 }, 
-	{ 0x586B, 0xB6F1 }, { 0x586D, 0xB6F3 }, { 0x586F, 0xDCE8 }, { 0x5871, 0xDCF1 }, { 0x5874, 0xE15D }, { 0x5875, 0xB9D0 }, { 0x5876, 0xE163 }, { 0x5879, 0xB9D5 }, 
-	{ 0x587A, 0xE15F }, { 0x587B, 0xE166 }, { 0x587C, 0xE157 }, { 0x587D, 0xB9D7 }, { 0x587E, 0xB9D1 }, { 0x587F, 0xE15C }, { 0x5880, 0xBC55 }, { 0x5881, 0xE15B }, 
-	{ 0x5882, 0xE164 }, { 0x5883, 0xB9D2 }, { 0x5885, 0xB9D6 }, { 0x5886, 0xE15A }, { 0x5887, 0xE160 }, { 0x5888, 0xE165 }, { 0x5889, 0xE156 }, { 0x588A, 0xB9D4 }, 
-	{ 0x588B, 0xE15E }, { 0x588E, 0xE162 }, { 0x588F, 0xE168 }, { 0x5890, 0xE158 }, { 0x5891, 0xE161 }, { 0x5893, 0xB9D3 }, { 0x5894, 0xE167 }, { 0x5898, 0xE159 }, 
-	{ 0x589C, 0xBC59 }, { 0x589D, 0xE54B }, { 0x589E, 0xBC57 }, { 0x589F, 0xBC56 }, { 0x58A0, 0xE54D }, { 0x58A1, 0xE552 }, { 0x58A3, 0xE54E }, { 0x58A5, 0xE551 }, 
-	{ 0x58A6, 0xBC5C }, { 0x58A8, 0xBEA5 }, { 0x58A9, 0xBC5B }, { 0x58AB, 0xE54A }, { 0x58AC, 0xE550 }, { 0x58AE, 0xBC5A }, { 0x58AF, 0xE54F }, { 0x58B1, 0xE54C }, 
-	{ 0x58B3, 0xBC58 }, { 0x58BA, 0xE94D }, { 0x58BC, 0xE94F }, { 0x58BD, 0xE94A }, { 0x58BE, 0xBEC1 }, { 0x58BF, 0xE94C }, { 0x58C1, 0xBEC0 }, { 0x58C2, 0xE94E }, 
-	{ 0x58C5, 0xBEC3 }, { 0x58C6, 0xE950 }, { 0x58C7, 0xBEC2 }, { 0x58C8, 0xE949 }, { 0x58C9, 0xE94B }, { 0x58CE, 0xC0A5 }, { 0x58CF, 0xECCC }, { 0x58D1, 0xC0A4 }, 
-	{ 0x58D2, 0xECCD }, { 0x58D3, 0xC0A3 }, { 0x58D4, 0xECCB }, { 0x58D5, 0xC0A2 }, { 0x58D6, 0xECCA }, { 0x58D8, 0xC253 }, { 0x58D9, 0xC252 }, { 0x58DA, 0xF1F6 }, 
-	{ 0x58DB, 0xF1F8 }, { 0x58DD, 0xF1F7 }, { 0x58DE, 0xC361 }, { 0x58DF, 0xC362 }, { 0x58E2, 0xC363 }, { 0x58E3, 0xF442 }, { 0x58E4, 0xC45B }, { 0x58E7, 0xF7D3 }, 
-	{ 0x58E8, 0xF7D2 }, { 0x58E9, 0xC5F2 }, { 0x58EB, 0xA468 }, { 0x58EC, 0xA4D0 }, { 0x58EF, 0xA7A7 }, { 0x58F4, 0xCE5F }, { 0x58F9, 0xB3FC }, { 0x58FA, 0xB3FD }, 
-	{ 0x58FC, 0xDCF2 }, { 0x58FD, 0xB9D8 }, { 0x58FE, 0xE169 }, { 0x58FF, 0xE553 }, { 0x5903, 0xC95A }, { 0x5906, 0xCAB0 }, { 0x590C, 0xCC42 }, { 0x590D, 0xCE60 }, 
-	{ 0x590E, 0xD159 }, { 0x590F, 0xAE4C }, { 0x5912, 0xF1F9 }, { 0x5914, 0xC4DC }, { 0x5915, 0xA469 }, { 0x5916, 0xA57E }, { 0x5917, 0xC970 }, { 0x5919, 0xA667 }, 
-	{ 0x591A, 0xA668 }, { 0x591C, 0xA95D }, { 0x5920, 0xB0F7 }, { 0x5922, 0xB9DA }, { 0x5924, 0xB9DB }, { 0x5925, 0xB9D9 }, { 0x5927, 0xA46A }, { 0x5929, 0xA4D1 }, 
-	{ 0x592A, 0xA4D3 }, { 0x592B, 0xA4D2 }, { 0x592C, 0xC95B }, { 0x592D, 0xA4D4 }, { 0x592E, 0xA5A1 }, { 0x592F, 0xC971 }, { 0x5931, 0xA5A2 }, { 0x5937, 0xA669 }, 
-	{ 0x5938, 0xA66A }, { 0x593C, 0xC9CB }, { 0x593E, 0xA7A8 }, { 0x5940, 0xCAB1 }, { 0x5944, 0xA961 }, { 0x5945, 0xCC43 }, { 0x5947, 0xA95F }, { 0x5948, 0xA960 }, 
-	{ 0x5949, 0xA95E }, { 0x594A, 0xD15A }, { 0x594E, 0xABB6 }, { 0x594F, 0xABB5 }, { 0x5950, 0xABB7 }, { 0x5951, 0xABB4 }, { 0x5953, 0xCE61 }, { 0x5954, 0xA962 }, 
-	{ 0x5955, 0xABB3 }, { 0x5957, 0xAE4D }, { 0x5958, 0xAE4E }, { 0x595A, 0xAE4F }, { 0x595C, 0xD4CD }, { 0x5960, 0xB3FE }, { 0x5961, 0xD8B4 }, { 0x5962, 0xB0F8 }, 
-	{ 0x5967, 0xB6F8 }, { 0x5969, 0xB9DD }, { 0x596A, 0xB9DC }, { 0x596B, 0xE16A }, { 0x596D, 0xBC5D }, { 0x596E, 0xBEC4 }, { 0x5970, 0xEFC0 }, { 0x5971, 0xF6DA }, 
-	{ 0x5972, 0xF7D4 }, { 0x5973, 0xA46B }, { 0x5974, 0xA5A3 }, { 0x5976, 0xA5A4 }, { 0x5977, 0xC9D1 }, { 0x5978, 0xA66C }, { 0x5979, 0xA66F }, { 0x597B, 0xC9CF }, 
-	{ 0x597C, 0xC9CD }, { 0x597D, 0xA66E }, { 0x597E, 0xC9D0 }, { 0x597F, 0xC9D2 }, { 0x5980, 0xC9CC }, { 0x5981, 0xA671 }, { 0x5982, 0xA670 }, { 0x5983, 0xA66D }, 
-	{ 0x5984, 0xA66B }, { 0x5985, 0xC9CE }, { 0x598A, 0xA7B3 }, { 0x598D, 0xA7B0 }, { 0x598E, 0xCAB6 }, { 0x598F, 0xCAB9 }, { 0x5990, 0xCAB8 }, { 0x5992, 0xA7AA }, 
-	{ 0x5993, 0xA7B2 }, { 0x5996, 0xA7AF }, { 0x5997, 0xCAB5 }, { 0x5998, 0xCAB3 }, { 0x5999, 0xA7AE }, { 0x599D, 0xA7A9 }, { 0x599E, 0xA7AC }, { 0x59A0, 0xCAB4 }, 
-	{ 0x59A1, 0xCABB }, { 0x59A2, 0xCAB7 }, { 0x59A3, 0xA7AD }, { 0x59A4, 0xA7B1 }, { 0x59A5, 0xA7B4 }, { 0x59A6, 0xCAB2 }, { 0x59A7, 0xCABA }, { 0x59A8, 0xA7AB }, 
-	{ 0x59AE, 0xA967 }, { 0x59AF, 0xA96F }, { 0x59B1, 0xCC4F }, { 0x59B2, 0xCC48 }, { 0x59B3, 0xA970 }, { 0x59B4, 0xCC53 }, { 0x59B5, 0xCC44 }, { 0x59B6, 0xCC4B }, 
-	{ 0x59B9, 0xA966 }, { 0x59BA, 0xCC45 }, { 0x59BB, 0xA964 }, { 0x59BC, 0xCC4C }, { 0x59BD, 0xCC50 }, { 0x59BE, 0xA963 }, { 0x59C0, 0xCC51 }, { 0x59C1, 0xCC4A }, 
-	{ 0x59C3, 0xCC4D }, { 0x59C5, 0xA972 }, { 0x59C6, 0xA969 }, { 0x59C7, 0xCC54 }, { 0x59C8, 0xCC52 }, { 0x59CA, 0xA96E }, { 0x59CB, 0xA96C }, { 0x59CC, 0xCC49 }, 
-	{ 0x59CD, 0xA96B }, { 0x59CE, 0xCC47 }, { 0x59CF, 0xCC46 }, { 0x59D0, 0xA96A }, { 0x59D1, 0xA968 }, { 0x59D2, 0xA971 }, { 0x59D3, 0xA96D }, { 0x59D4, 0xA965 }, 
-	{ 0x59D6, 0xCC4E }, { 0x59D8, 0xABB9 }, { 0x59DA, 0xABC0 }, { 0x59DB, 0xCE6F }, { 0x59DC, 0xABB8 }, { 0x59DD, 0xCE67 }, { 0x59DE, 0xCE63 }, { 0x59E0, 0xCE73 }, 
-	{ 0x59E1, 0xCE62 }, { 0x59E3, 0xABBB }, { 0x59E4, 0xCE6C }, { 0x59E5, 0xABBE }, { 0x59E6, 0xABC1 }, { 0x59E8, 0xABBC }, { 0x59E9, 0xCE70 }, { 0x59EA, 0xABBF }, 
-	{ 0x59EC, 0xAE56 }, { 0x59ED, 0xCE76 }, { 0x59EE, 0xCE64 }, { 0x59F1, 0xCE66 }, { 0x59F2, 0xCE6D }, { 0x59F3, 0xCE71 }, { 0x59F4, 0xCE75 }, { 0x59F5, 0xCE72 }, 
-	{ 0x59F6, 0xCE6B }, { 0x59F7, 0xCE6E }, { 0x59FA, 0xCE68 }, { 0x59FB, 0xABC3 }, { 0x59FC, 0xCE6A }, { 0x59FD, 0xCE69 }, { 0x59FE, 0xCE74 }, { 0x59FF, 0xABBA }, 
-	{ 0x5A00, 0xCE65 }, { 0x5A01, 0xABC2 }, { 0x5A03, 0xABBD }, { 0x5A09, 0xAE5C }, { 0x5A0A, 0xD162 }, { 0x5A0C, 0xAE5B }, { 0x5A0F, 0xD160 }, { 0x5A11, 0xAE50 }, 
-	{ 0x5A13, 0xAE55 }, { 0x5A15, 0xD15F }, { 0x5A16, 0xD15C }, { 0x5A17, 0xD161 }, { 0x5A18, 0xAE51 }, { 0x5A19, 0xD15B }, { 0x5A1B, 0xAE54 }, { 0x5A1C, 0xAE52 }, 
-	{ 0x5A1E, 0xD163 }, { 0x5A1F, 0xAE53 }, { 0x5A20, 0xAE57 }, { 0x5A23, 0xAE58 }, { 0x5A25, 0xAE5A }, { 0x5A29, 0xAE59 }, { 0x5A2D, 0xD15D }, { 0x5A2E, 0xD15E }, 
-	{ 0x5A33, 0xD164 }, { 0x5A35, 0xD4D4 }, { 0x5A36, 0xB0F9 }, { 0x5A37, 0xD8C2 }, { 0x5A38, 0xD4D3 }, { 0x5A39, 0xD4E6 }, { 0x5A3C, 0xB140 }, { 0x5A3E, 0xD4E4 }, 
-	{ 0x5A40, 0xB0FE }, { 0x5A41, 0xB0FA }, { 0x5A42, 0xD4ED }, { 0x5A43, 0xD4DD }, { 0x5A44, 0xD4E0 }, { 0x5A46, 0xB143 }, { 0x5A47, 0xD4EA }, { 0x5A48, 0xD4E2 }, 
-	{ 0x5A49, 0xB0FB }, { 0x5A4A, 0xB144 }, { 0x5A4C, 0xD4E7 }, { 0x5A4D, 0xD4E5 }, { 0x5A50, 0xD4D6 }, { 0x5A51, 0xD4EB }, { 0x5A52, 0xD4DF }, { 0x5A53, 0xD4DA }, 
-	{ 0x5A55, 0xD4D0 }, { 0x5A56, 0xD4EC }, { 0x5A57, 0xD4DC }, { 0x5A58, 0xD4CF }, { 0x5A5A, 0xB142 }, { 0x5A5B, 0xD4E1 }, { 0x5A5C, 0xD4EE }, { 0x5A5D, 0xD4DE }, 
-	{ 0x5A5E, 0xD4D2 }, { 0x5A5F, 0xD4D7 }, { 0x5A60, 0xD4CE }, { 0x5A62, 0xB141 }, { 0x5A64, 0xD4DB }, { 0x5A65, 0xD4D8 }, { 0x5A66, 0xB0FC }, { 0x5A67, 0xD4D1 }, 
-	{ 0x5A69, 0xD4E9 }, { 0x5A6A, 0xB0FD }, { 0x5A6C, 0xD4D9 }, { 0x5A6D, 0xD4D5 }, { 0x5A70, 0xD4E8 }, { 0x5A77, 0xB440 }, { 0x5A78, 0xD8BB }, { 0x5A7A, 0xD8B8 }, 
-	{ 0x5A7B, 0xD8C9 }, { 0x5A7C, 0xD8BD }, { 0x5A7D, 0xD8CA }, { 0x5A7F, 0xB442 }, { 0x5A83, 0xD8C6 }, { 0x5A84, 0xD8C3 }, { 0x5A8A, 0xD8C4 }, { 0x5A8B, 0xD8C7 }, 
-	{ 0x5A8C, 0xD8CB }, { 0x5A8E, 0xD4E3 }, { 0x5A8F, 0xD8CD }, { 0x5A90, 0xDD47 }, { 0x5A92, 0xB443 }, { 0x5A93, 0xD8CE }, { 0x5A94, 0xD8B6 }, { 0x5A95, 0xD8C0 }, 
-	{ 0x5A97, 0xD8C5 }, { 0x5A9A, 0xB441 }, { 0x5A9B, 0xB444 }, { 0x5A9C, 0xD8CC }, { 0x5A9D, 0xD8CF }, { 0x5A9E, 0xD8BA }, { 0x5A9F, 0xD8B7 }, { 0x5AA2, 0xD8B9 }, 
-	{ 0x5AA5, 0xD8BE }, { 0x5AA6, 0xD8BC }, { 0x5AA7, 0xB445 }, { 0x5AA9, 0xD8C8 }, { 0x5AAC, 0xD8BF }, { 0x5AAE, 0xD8C1 }, { 0x5AAF, 0xD8B5 }, { 0x5AB0, 0xDCFA }, 
-	{ 0x5AB1, 0xDCF8 }, { 0x5AB2, 0xB742 }, { 0x5AB3, 0xB740 }, { 0x5AB4, 0xDD43 }, { 0x5AB5, 0xDCF9 }, { 0x5AB6, 0xDD44 }, { 0x5AB7, 0xDD40 }, { 0x5AB8, 0xDCF7 }, 
-	{ 0x5AB9, 0xDD46 }, { 0x5ABA, 0xDCF6 }, { 0x5ABB, 0xDCFD }, { 0x5ABC, 0xB6FE }, { 0x5ABD, 0xB6FD }, { 0x5ABE, 0xB6FC }, { 0x5ABF, 0xDCFB }, { 0x5AC0, 0xDD41 }, 
-	{ 0x5AC1, 0xB6F9 }, { 0x5AC2, 0xB741 }, { 0x5AC4, 0xDCF4 }, { 0x5AC6, 0xDCFE }, { 0x5AC7, 0xDCF3 }, { 0x5AC8, 0xDCFC }, { 0x5AC9, 0xB6FA }, { 0x5ACA, 0xDD42 }, 
-	{ 0x5ACB, 0xDCF5 }, { 0x5ACC, 0xB6FB }, { 0x5ACD, 0xDD45 }, { 0x5AD5, 0xE16E }, { 0x5AD6, 0xB9E2 }, { 0x5AD7, 0xB9E1 }, { 0x5AD8, 0xB9E3 }, { 0x5AD9, 0xE17A }, 
-	{ 0x5ADA, 0xE170 }, { 0x5ADB, 0xE176 }, { 0x5ADC, 0xE16B }, { 0x5ADD, 0xE179 }, { 0x5ADE, 0xE178 }, { 0x5ADF, 0xE17C }, { 0x5AE0, 0xE175 }, { 0x5AE1, 0xB9DE }, 
-	{ 0x5AE2, 0xE174 }, { 0x5AE3, 0xB9E4 }, { 0x5AE5, 0xE16D }, { 0x5AE6, 0xB9DF }, { 0x5AE8, 0xE17B }, { 0x5AE9, 0xB9E0 }, { 0x5AEA, 0xE16F }, { 0x5AEB, 0xE172 }, 
-	{ 0x5AEC, 0xE177 }, { 0x5AED, 0xE171 }, { 0x5AEE, 0xE16C }, { 0x5AF3, 0xE173 }, { 0x5AF4, 0xE555 }, { 0x5AF5, 0xBC61 }, { 0x5AF6, 0xE558 }, { 0x5AF7, 0xE557 }, 
-	{ 0x5AF8, 0xE55A }, { 0x5AF9, 0xE55C }, { 0x5AFB, 0xBC5F }, { 0x5AFD, 0xE556 }, { 0x5AFF, 0xE554 }, { 0x5B01, 0xE55D }, { 0x5B02, 0xE55B }, { 0x5B03, 0xE559 }, 
-	{ 0x5B05, 0xE55F }, { 0x5B07, 0xE55E }, { 0x5B08, 0xBC63 }, { 0x5B09, 0xBC5E }, { 0x5B0B, 0xBC60 }, { 0x5B0C, 0xBC62 }, { 0x5B0F, 0xE560 }, { 0x5B10, 0xE957 }, 
-	{ 0x5B13, 0xE956 }, { 0x5B14, 0xE955 }, { 0x5B16, 0xE958 }, { 0x5B17, 0xE951 }, { 0x5B19, 0xE952 }, { 0x5B1A, 0xE95A }, { 0x5B1B, 0xE953 }, { 0x5B1D, 0xBEC5 }, 
-	{ 0x5B1E, 0xE95C }, { 0x5B20, 0xE95B }, { 0x5B21, 0xE954 }, { 0x5B23, 0xECD1 }, { 0x5B24, 0xC0A8 }, { 0x5B25, 0xECCF }, { 0x5B26, 0xECD4 }, { 0x5B27, 0xECD3 }, 
-	{ 0x5B28, 0xE959 }, { 0x5B2A, 0xC0A7 }, { 0x5B2C, 0xECD2 }, { 0x5B2D, 0xECCE }, { 0x5B2E, 0xECD6 }, { 0x5B2F, 0xECD5 }, { 0x5B30, 0xC0A6 }, { 0x5B32, 0xECD0 }, 
-	{ 0x5B34, 0xBEC6 }, { 0x5B38, 0xC254 }, { 0x5B3C, 0xEFC1 }, { 0x5B3D, 0xF1FA }, { 0x5B3E, 0xF1FB }, { 0x5B3F, 0xF1FC }, { 0x5B40, 0xC45C }, { 0x5B43, 0xC45D }, 
-	{ 0x5B45, 0xF443 }, { 0x5B47, 0xF5C8 }, { 0x5B48, 0xF5C7 }, { 0x5B4B, 0xF6DB }, { 0x5B4C, 0xF6DC }, { 0x5B4D, 0xF7D5 }, { 0x5B4E, 0xF8A7 }, { 0x5B50, 0xA46C }, 
-	{ 0x5B51, 0xA46D }, { 0x5B53, 0xA46E }, { 0x5B54, 0xA4D5 }, { 0x5B55, 0xA5A5 }, { 0x5B56, 0xC9D3 }, { 0x5B57, 0xA672 }, { 0x5B58, 0xA673 }, { 0x5B5A, 0xA7B7 }, 
-	{ 0x5B5B, 0xA7B8 }, { 0x5B5C, 0xA7B6 }, { 0x5B5D, 0xA7B5 }, { 0x5B5F, 0xA973 }, { 0x5B62, 0xCC55 }, { 0x5B63, 0xA975 }, { 0x5B64, 0xA974 }, { 0x5B65, 0xCC56 }, 
-	{ 0x5B69, 0xABC4 }, { 0x5B6B, 0xAE5D }, { 0x5B6C, 0xD165 }, { 0x5B6E, 0xD4F0 }, { 0x5B70, 0xB145 }, { 0x5B71, 0xB447 }, { 0x5B72, 0xD4EF }, { 0x5B73, 0xB446 }, 
-	{ 0x5B75, 0xB9E5 }, { 0x5B77, 0xE17D }, { 0x5B78, 0xBEC7 }, { 0x5B7A, 0xC0A9 }, { 0x5B7B, 0xECD7 }, { 0x5B7D, 0xC45E }, { 0x5B7F, 0xC570 }, { 0x5B81, 0xC972 }, 
-	{ 0x5B83, 0xA5A6 }, { 0x5B84, 0xC973 }, { 0x5B85, 0xA676 }, { 0x5B87, 0xA674 }, { 0x5B88, 0xA675 }, { 0x5B89, 0xA677 }, { 0x5B8B, 0xA7BA }, { 0x5B8C, 0xA7B9 }, 
-	{ 0x5B8E, 0xCABC }, { 0x5B8F, 0xA7BB }, { 0x5B92, 0xCABD }, { 0x5B93, 0xCC57 }, { 0x5B95, 0xCC58 }, { 0x5B97, 0xA976 }, { 0x5B98, 0xA978 }, { 0x5B99, 0xA97A }, 
-	{ 0x5B9A, 0xA977 }, { 0x5B9B, 0xA97B }, { 0x5B9C, 0xA979 }, { 0x5BA2, 0xABC8 }, { 0x5BA3, 0xABC5 }, { 0x5BA4, 0xABC7 }, { 0x5BA5, 0xABC9 }, { 0x5BA6, 0xABC6 }, 
-	{ 0x5BA7, 0xD166 }, { 0x5BA8, 0xCE77 }, { 0x5BAC, 0xD168 }, { 0x5BAD, 0xD167 }, { 0x5BAE, 0xAE63 }, { 0x5BB0, 0xAE5F }, { 0x5BB3, 0xAE60 }, { 0x5BB4, 0xAE62 }, 
-	{ 0x5BB5, 0xAE64 }, { 0x5BB6, 0xAE61 }, { 0x5BB8, 0xAE66 }, { 0x5BB9, 0xAE65 }, { 0x5BBF, 0xB14A }, { 0x5BC0, 0xD4F2 }, { 0x5BC1, 0xD4F1 }, { 0x5BC2, 0xB149 }, 
-	{ 0x5BC4, 0xB148 }, { 0x5BC5, 0xB147 }, { 0x5BC6, 0xB14B }, { 0x5BC7, 0xB146 }, { 0x5BCA, 0xD8D5 }, { 0x5BCB, 0xD8D2 }, { 0x5BCC, 0xB449 }, { 0x5BCD, 0xD8D1 }, 
-	{ 0x5BCE, 0xD8D6 }, { 0x5BD0, 0xB44B }, { 0x5BD1, 0xD8D4 }, { 0x5BD2, 0xB448 }, { 0x5BD3, 0xB44A }, { 0x5BD4, 0xD8D3 }, { 0x5BD6, 0xDD48 }, { 0x5BD8, 0xDD49 }, 
-	{ 0x5BD9, 0xDD4A }, { 0x5BDE, 0xB9E6 }, { 0x5BDF, 0xB9EE }, { 0x5BE0, 0xE17E }, { 0x5BE1, 0xB9E8 }, { 0x5BE2, 0xB9EC }, { 0x5BE3, 0xE1A1 }, { 0x5BE4, 0xB9ED }, 
-	{ 0x5BE5, 0xB9E9 }, { 0x5BE6, 0xB9EA }, { 0x5BE7, 0xB9E7 }, { 0x5BE8, 0xB9EB }, { 0x5BE9, 0xBC66 }, { 0x5BEA, 0xD8D0 }, { 0x5BEB, 0xBC67 }, { 0x5BEC, 0xBC65 }, 
-	{ 0x5BEE, 0xBC64 }, { 0x5BEF, 0xE95D }, { 0x5BF0, 0xBEC8 }, { 0x5BF1, 0xECD8 }, { 0x5BF2, 0xECD9 }, { 0x5BF5, 0xC364 }, { 0x5BF6, 0xC45F }, { 0x5BF8, 0xA46F }, 
-	{ 0x5BFA, 0xA678 }, { 0x5C01, 0xABCA }, { 0x5C03, 0xD169 }, { 0x5C04, 0xAE67 }, { 0x5C07, 0xB14E }, { 0x5C08, 0xB14D }, { 0x5C09, 0xB14C }, { 0x5C0A, 0xB44C }, 
-	{ 0x5C0B, 0xB44D }, { 0x5C0C, 0xD8D7 }, { 0x5C0D, 0xB9EF }, { 0x5C0E, 0xBEC9 }, { 0x5C0F, 0xA470 }, { 0x5C10, 0xC95C }, { 0x5C11, 0xA4D6 }, { 0x5C12, 0xC974 }, 
-	{ 0x5C15, 0xC9D4 }, { 0x5C16, 0xA679 }, { 0x5C1A, 0xA97C }, { 0x5C1F, 0xDD4B }, { 0x5C22, 0xA471 }, { 0x5C24, 0xA4D7 }, { 0x5C25, 0xC9D5 }, { 0x5C28, 0xCABE }, 
-	{ 0x5C2A, 0xCABF }, { 0x5C2C, 0xA7BC }, { 0x5C30, 0xD8D8 }, { 0x5C31, 0xB44E }, { 0x5C33, 0xDD4C }, { 0x5C37, 0xC0AA }, { 0x5C38, 0xA472 }, { 0x5C39, 0xA4A8 }, 
-	{ 0x5C3A, 0xA4D8 }, { 0x5C3B, 0xC975 }, { 0x5C3C, 0xA5A7 }, { 0x5C3E, 0xA7C0 }, { 0x5C3F, 0xA7BF }, { 0x5C40, 0xA7BD }, { 0x5C41, 0xA7BE }, { 0x5C44, 0xCC59 }, 
-	{ 0x5C45, 0xA97E }, { 0x5C46, 0xA9A1 }, { 0x5C47, 0xCC5A }, { 0x5C48, 0xA97D }, { 0x5C4B, 0xABCE }, { 0x5C4C, 0xCE78 }, { 0x5C4D, 0xABCD }, { 0x5C4E, 0xABCB }, 
-	{ 0x5C4F, 0xABCC }, { 0x5C50, 0xAE6A }, { 0x5C51, 0xAE68 }, { 0x5C54, 0xD16B }, { 0x5C55, 0xAE69 }, { 0x5C56, 0xD16A }, { 0x5C58, 0xAE5E }, { 0x5C59, 0xD4F3 }, 
-	{ 0x5C5C, 0xB150 }, { 0x5C5D, 0xB151 }, { 0x5C60, 0xB14F }, { 0x5C62, 0xB9F0 }, { 0x5C63, 0xE1A2 }, { 0x5C64, 0xBC68 }, { 0x5C65, 0xBC69 }, { 0x5C67, 0xE561 }, 
-	{ 0x5C68, 0xC0AB }, { 0x5C69, 0xEFC2 }, { 0x5C6A, 0xEFC3 }, { 0x5C6C, 0xC4DD }, { 0x5C6D, 0xF8A8 }, { 0x5C6E, 0xC94B }, { 0x5C6F, 0xA4D9 }, { 0x5C71, 0xA473 }, 
-	{ 0x5C73, 0xC977 }, { 0x5C74, 0xC976 }, { 0x5C79, 0xA67A }, { 0x5C7A, 0xC9D7 }, { 0x5C7B, 0xC9D8 }, { 0x5C7C, 0xC9D6 }, { 0x5C7E, 0xC9D9 }, { 0x5C86, 0xCAC7 }, 
-	{ 0x5C88, 0xCAC2 }, { 0x5C89, 0xCAC4 }, { 0x5C8A, 0xCAC6 }, { 0x5C8B, 0xCAC3 }, { 0x5C8C, 0xA7C4 }, { 0x5C8D, 0xCAC0 }, { 0x5C8F, 0xCAC1 }, { 0x5C90, 0xA7C1 }, 
-	{ 0x5C91, 0xA7C2 }, { 0x5C92, 0xCAC5 }, { 0x5C93, 0xCAC8 }, { 0x5C94, 0xA7C3 }, { 0x5C95, 0xCAC9 }, { 0x5C9D, 0xCC68 }, { 0x5C9F, 0xCC62 }, { 0x5CA0, 0xCC5D }, 
-	{ 0x5CA1, 0xA9A3 }, { 0x5CA2, 0xCC65 }, { 0x5CA3, 0xCC63 }, { 0x5CA4, 0xCC5C }, { 0x5CA5, 0xCC69 }, { 0x5CA6, 0xCC6C }, { 0x5CA7, 0xCC67 }, { 0x5CA8, 0xCC60 }, 
-	{ 0x5CA9, 0xA9A5 }, { 0x5CAA, 0xCC66 }, { 0x5CAB, 0xA9A6 }, { 0x5CAC, 0xCC61 }, { 0x5CAD, 0xCC64 }, { 0x5CAE, 0xCC5B }, { 0x5CAF, 0xCC5F }, { 0x5CB0, 0xCC6B }, 
-	{ 0x5CB1, 0xA9A7 }, { 0x5CB3, 0xA9A8 }, { 0x5CB5, 0xCC5E }, { 0x5CB6, 0xCC6A }, { 0x5CB7, 0xA9A2 }, { 0x5CB8, 0xA9A4 }, { 0x5CC6, 0xCEAB }, { 0x5CC7, 0xCEA4 }, 
-	{ 0x5CC8, 0xCEAA }, { 0x5CC9, 0xCEA3 }, { 0x5CCA, 0xCEA5 }, { 0x5CCB, 0xCE7D }, { 0x5CCC, 0xCE7B }, { 0x5CCE, 0xCEAC }, { 0x5CCF, 0xCEA9 }, { 0x5CD0, 0xCE79 }, 
-	{ 0x5CD2, 0xABD0 }, { 0x5CD3, 0xCEA7 }, { 0x5CD4, 0xCEA8 }, { 0x5CD6, 0xCEA6 }, { 0x5CD7, 0xCE7C }, { 0x5CD8, 0xCE7A }, { 0x5CD9, 0xABCF }, { 0x5CDA, 0xCEA2 }, 
-	{ 0x5CDB, 0xCE7E }, { 0x5CDE, 0xCEA1 }, { 0x5CDF, 0xCEAD }, { 0x5CE8, 0xAE6F }, { 0x5CEA, 0xAE6E }, { 0x5CEC, 0xD16C }, { 0x5CED, 0xAE6B }, { 0x5CEE, 0xD16E }, 
-	{ 0x5CF0, 0xAE70 }, { 0x5CF1, 0xD16F }, { 0x5CF4, 0xAE73 }, { 0x5CF6, 0xAE71 }, { 0x5CF7, 0xD170 }, { 0x5CF8, 0xCEAE }, { 0x5CF9, 0xD172 }, { 0x5CFB, 0xAE6D }, 
-	{ 0x5CFD, 0xAE6C }, { 0x5CFF, 0xD16D }, { 0x5D00, 0xD171 }, { 0x5D01, 0xAE72 }, { 0x5D06, 0xB153 }, { 0x5D07, 0xB152 }, { 0x5D0B, 0xD4F5 }, { 0x5D0C, 0xD4F9 }, 
-	{ 0x5D0D, 0xD4FB }, { 0x5D0E, 0xB154 }, { 0x5D0F, 0xD4FE }, { 0x5D11, 0xB158 }, { 0x5D12, 0xD541 }, { 0x5D14, 0xB15A }, { 0x5D16, 0xB156 }, { 0x5D17, 0xB15E }, 
-	{ 0x5D19, 0xB15B }, { 0x5D1A, 0xD4F7 }, { 0x5D1B, 0xB155 }, { 0x5D1D, 0xD4F6 }, { 0x5D1E, 0xD4F4 }, { 0x5D1F, 0xD543 }, { 0x5D20, 0xD4F8 }, { 0x5D22, 0xB157 }, 
-	{ 0x5D23, 0xD542 }, { 0x5D24, 0xB15C }, { 0x5D25, 0xD4FD }, { 0x5D26, 0xD4FC }, { 0x5D27, 0xB15D }, { 0x5D28, 0xD4FA }, { 0x5D29, 0xB159 }, { 0x5D2E, 0xD544 }, 
-	{ 0x5D30, 0xD540 }, { 0x5D31, 0xD8E7 }, { 0x5D32, 0xD8EE }, { 0x5D33, 0xD8E3 }, { 0x5D34, 0xB451 }, { 0x5D35, 0xD8DF }, { 0x5D36, 0xD8EF }, { 0x5D37, 0xD8D9 }, 
-	{ 0x5D38, 0xD8EC }, { 0x5D39, 0xD8EA }, { 0x5D3A, 0xD8E4 }, { 0x5D3C, 0xD8ED }, { 0x5D3D, 0xD8E6 }, { 0x5D3F, 0xD8DE }, { 0x5D40, 0xD8F0 }, { 0x5D41, 0xD8DC }, 
-	{ 0x5D42, 0xD8E9 }, { 0x5D43, 0xD8DA }, { 0x5D45, 0xD8F1 }, { 0x5D47, 0xB452 }, { 0x5D49, 0xD8EB }, { 0x5D4A, 0xDD4F }, { 0x5D4B, 0xD8DD }, { 0x5D4C, 0xB44F }, 
-	{ 0x5D4E, 0xD8E1 }, { 0x5D50, 0xB450 }, { 0x5D51, 0xD8E0 }, { 0x5D52, 0xD8E5 }, { 0x5D55, 0xD8E2 }, { 0x5D59, 0xD8E8 }, { 0x5D5E, 0xDD53 }, { 0x5D62, 0xDD56 }, 
-	{ 0x5D63, 0xDD4E }, { 0x5D65, 0xDD50 }, { 0x5D67, 0xDD55 }, { 0x5D68, 0xDD54 }, { 0x5D69, 0xB743 }, { 0x5D6B, 0xD8DB }, { 0x5D6C, 0xDD52 }, { 0x5D6F, 0xB744 }, 
-	{ 0x5D71, 0xDD4D }, { 0x5D72, 0xDD51 }, { 0x5D77, 0xE1A9 }, { 0x5D79, 0xE1B0 }, { 0x5D7A, 0xE1A7 }, { 0x5D7C, 0xE1AE }, { 0x5D7D, 0xE1A5 }, { 0x5D7E, 0xE1AD }, 
-	{ 0x5D7F, 0xE1B1 }, { 0x5D80, 0xE1A4 }, { 0x5D81, 0xE1A8 }, { 0x5D82, 0xE1A3 }, { 0x5D84, 0xB9F1 }, { 0x5D86, 0xE1A6 }, { 0x5D87, 0xB9F2 }, { 0x5D88, 0xE1AC }, 
-	{ 0x5D89, 0xE1AB }, { 0x5D8A, 0xE1AA }, { 0x5D8D, 0xE1AF }, { 0x5D92, 0xE565 }, { 0x5D93, 0xE567 }, { 0x5D94, 0xBC6B }, { 0x5D95, 0xE568 }, { 0x5D97, 0xE563 }, 
-	{ 0x5D99, 0xE562 }, { 0x5D9A, 0xE56C }, { 0x5D9C, 0xE56A }, { 0x5D9D, 0xBC6A }, { 0x5D9E, 0xE56D }, { 0x5D9F, 0xE564 }, { 0x5DA0, 0xE569 }, { 0x5DA1, 0xE56B }, 
-	{ 0x5DA2, 0xE566 }, { 0x5DA7, 0xE961 }, { 0x5DA8, 0xE966 }, { 0x5DA9, 0xE960 }, { 0x5DAA, 0xE965 }, { 0x5DAC, 0xE95E }, { 0x5DAD, 0xE968 }, { 0x5DAE, 0xE964 }, 
-	{ 0x5DAF, 0xE969 }, { 0x5DB0, 0xE963 }, { 0x5DB1, 0xE95F }, { 0x5DB2, 0xE967 }, { 0x5DB4, 0xE96A }, { 0x5DB5, 0xE962 }, { 0x5DB7, 0xECDA }, { 0x5DB8, 0xC0AF }, 
-	{ 0x5DBA, 0xC0AD }, { 0x5DBC, 0xC0AC }, { 0x5DBD, 0xC0AE }, { 0x5DC0, 0xEFC4 }, { 0x5DC2, 0xF172 }, { 0x5DC3, 0xF1FD }, { 0x5DC6, 0xF444 }, { 0x5DC7, 0xF445 }, 
-	{ 0x5DC9, 0xC460 }, { 0x5DCB, 0xF5C9 }, { 0x5DCD, 0xC4DE }, { 0x5DCF, 0xF5CA }, { 0x5DD1, 0xF6DE }, { 0x5DD2, 0xC572 }, { 0x5DD4, 0xC571 }, { 0x5DD5, 0xF6DD }, 
-	{ 0x5DD6, 0xC5C9 }, { 0x5DD8, 0xF7D6 }, { 0x5DDD, 0xA474 }, { 0x5DDE, 0xA67B }, { 0x5DDF, 0xC9DA }, { 0x5DE0, 0xCACA }, { 0x5DE1, 0xA8B5 }, { 0x5DE2, 0xB15F }, 
-	{ 0x5DE5, 0xA475 }, { 0x5DE6, 0xA5AA }, { 0x5DE7, 0xA5A9 }, { 0x5DE8, 0xA5A8 }, { 0x5DEB, 0xA7C5 }, { 0x5DEE, 0xAE74 }, { 0x5DF0, 0xDD57 }, { 0x5DF1, 0xA476 }, 
-	{ 0x5DF2, 0xA477 }, { 0x5DF3, 0xA478 }, { 0x5DF4, 0xA4DA }, { 0x5DF7, 0xABD1 }, { 0x5DF9, 0xCEAF }, { 0x5DFD, 0xB453 }, { 0x5DFE, 0xA479 }, { 0x5DFF, 0xC95D }, 
-	{ 0x5E02, 0xA5AB }, { 0x5E03, 0xA5AC }, { 0x5E04, 0xC978 }, { 0x5E06, 0xA67C }, { 0x5E0A, 0xCACB }, { 0x5E0C, 0xA7C6 }, { 0x5E0E, 0xCACC }, { 0x5E11, 0xA9AE }, 
-	{ 0x5E14, 0xCC6E }, { 0x5E15, 0xA9AC }, { 0x5E16, 0xA9AB }, { 0x5E17, 0xCC6D }, { 0x5E18, 0xA9A9 }, { 0x5E19, 0xCC6F }, { 0x5E1A, 0xA9AA }, { 0x5E1B, 0xA9AD }, 
-	{ 0x5E1D, 0xABD2 }, { 0x5E1F, 0xABD4 }, { 0x5E20, 0xCEB3 }, { 0x5E21, 0xCEB0 }, { 0x5E22, 0xCEB1 }, { 0x5E23, 0xCEB2 }, { 0x5E24, 0xCEB4 }, { 0x5E25, 0xABD3 }, 
-	{ 0x5E28, 0xD174 }, { 0x5E29, 0xD173 }, { 0x5E2B, 0xAE76 }, { 0x5E2D, 0xAE75 }, { 0x5E33, 0xB162 }, { 0x5E34, 0xD546 }, { 0x5E36, 0xB161 }, { 0x5E37, 0xB163 }, 
-	{ 0x5E38, 0xB160 }, { 0x5E3D, 0xB455 }, { 0x5E3E, 0xD545 }, { 0x5E40, 0xB456 }, { 0x5E41, 0xD8F3 }, { 0x5E43, 0xB457 }, { 0x5E44, 0xD8F2 }, { 0x5E45, 0xB454 }, 
-	{ 0x5E4A, 0xDD5A }, { 0x5E4B, 0xDD5C }, { 0x5E4C, 0xB745 }, { 0x5E4D, 0xDD5B }, { 0x5E4E, 0xDD59 }, { 0x5E4F, 0xDD58 }, { 0x5E53, 0xE1B4 }, { 0x5E54, 0xB9F7 }, 
-	{ 0x5E55, 0xB9F5 }, { 0x5E57, 0xB9F6 }, { 0x5E58, 0xE1B2 }, { 0x5E59, 0xE1B3 }, { 0x5E5B, 0xB9F3 }, { 0x5E5C, 0xE571 }, { 0x5E5D, 0xE56F }, { 0x5E5F, 0xBC6D }, 
-	{ 0x5E60, 0xE570 }, { 0x5E61, 0xBC6E }, { 0x5E62, 0xBC6C }, { 0x5E63, 0xB9F4 }, { 0x5E66, 0xE96D }, { 0x5E67, 0xE96B }, { 0x5E68, 0xE96C }, { 0x5E69, 0xE56E }, 
-	{ 0x5E6A, 0xECDC }, { 0x5E6B, 0xC0B0 }, { 0x5E6C, 0xECDB }, { 0x5E6D, 0xEFC5 }, { 0x5E6E, 0xEFC6 }, { 0x5E6F, 0xE96E }, { 0x5E70, 0xF1FE }, { 0x5E72, 0xA47A }, 
-	{ 0x5E73, 0xA5AD }, { 0x5E74, 0xA67E }, { 0x5E75, 0xC9DB }, { 0x5E76, 0xA67D }, { 0x5E78, 0xA9AF }, { 0x5E79, 0xB746 }, { 0x5E7B, 0xA4DB }, { 0x5E7C, 0xA5AE }, 
-	{ 0x5E7D, 0xABD5 }, { 0x5E7E, 0xB458 }, { 0x5E80, 0xC979 }, { 0x5E82, 0xC97A }, { 0x5E84, 0xC9DC }, { 0x5E87, 0xA7C8 }, { 0x5E88, 0xCAD0 }, { 0x5E89, 0xCACE }, 
-	{ 0x5E8A, 0xA7C9 }, { 0x5E8B, 0xCACD }, { 0x5E8C, 0xCACF }, { 0x5E8D, 0xCAD1 }, { 0x5E8F, 0xA7C7 }, { 0x5E95, 0xA9B3 }, { 0x5E96, 0xA9B4 }, { 0x5E97, 0xA9B1 }, 
-	{ 0x5E9A, 0xA9B0 }, { 0x5E9B, 0xCEB8 }, { 0x5E9C, 0xA9B2 }, { 0x5EA0, 0xABD6 }, { 0x5EA2, 0xCEB7 }, { 0x5EA3, 0xCEB9 }, { 0x5EA4, 0xCEB6 }, { 0x5EA5, 0xCEBA }, 
-	{ 0x5EA6, 0xABD7 }, { 0x5EA7, 0xAE79 }, { 0x5EA8, 0xD175 }, { 0x5EAA, 0xD177 }, { 0x5EAB, 0xAE77 }, { 0x5EAC, 0xD178 }, { 0x5EAD, 0xAE78 }, { 0x5EAE, 0xD176 }, 
-	{ 0x5EB0, 0xCEB5 }, { 0x5EB1, 0xD547 }, { 0x5EB2, 0xD54A }, { 0x5EB3, 0xD54B }, { 0x5EB4, 0xD548 }, { 0x5EB5, 0xB167 }, { 0x5EB6, 0xB166 }, { 0x5EB7, 0xB164 }, 
-	{ 0x5EB8, 0xB165 }, { 0x5EB9, 0xD549 }, { 0x5EBE, 0xB168 }, { 0x5EC1, 0xB45A }, { 0x5EC2, 0xB45B }, { 0x5EC4, 0xB45C }, { 0x5EC5, 0xDD5D }, { 0x5EC6, 0xDD5F }, 
-	{ 0x5EC7, 0xDD61 }, { 0x5EC8, 0xB748 }, { 0x5EC9, 0xB747 }, { 0x5ECA, 0xB459 }, { 0x5ECB, 0xDD60 }, { 0x5ECC, 0xDD5E }, { 0x5ECE, 0xE1B8 }, { 0x5ED1, 0xE1B6 }, 
-	{ 0x5ED2, 0xE1BC }, { 0x5ED3, 0xB9F8 }, { 0x5ED4, 0xE1BD }, { 0x5ED5, 0xE1BA }, { 0x5ED6, 0xB9F9 }, { 0x5ED7, 0xE1B7 }, { 0x5ED8, 0xE1B5 }, { 0x5ED9, 0xE1BB }, 
-	{ 0x5EDA, 0xBC70 }, { 0x5EDB, 0xE573 }, { 0x5EDC, 0xE1B9 }, { 0x5EDD, 0xBC72 }, { 0x5EDE, 0xE574 }, { 0x5EDF, 0xBC71 }, { 0x5EE0, 0xBC74 }, { 0x5EE1, 0xE575 }, 
-	{ 0x5EE2, 0xBC6F }, { 0x5EE3, 0xBC73 }, { 0x5EE5, 0xE973 }, { 0x5EE6, 0xE971 }, { 0x5EE7, 0xE970 }, { 0x5EE8, 0xE972 }, { 0x5EE9, 0xE96F }, { 0x5EEC, 0xC366 }, 
-	{ 0x5EEE, 0xF446 }, { 0x5EEF, 0xF447 }, { 0x5EF1, 0xF5CB }, { 0x5EF2, 0xF6DF }, { 0x5EF3, 0xC655 }, { 0x5EF6, 0xA9B5 }, { 0x5EF7, 0xA7CA }, { 0x5EFA, 0xABD8 }, 
-	{ 0x5EFE, 0xA47B }, { 0x5EFF, 0xA4DC }, { 0x5F01, 0xA5AF }, { 0x5F02, 0xC9DD }, { 0x5F04, 0xA7CB }, { 0x5F05, 0xCAD2 }, { 0x5F07, 0xCEBB }, { 0x5F08, 0xABD9 }, 
-	{ 0x5F0A, 0xB9FA }, { 0x5F0B, 0xA47C }, { 0x5F0F, 0xA6A1 }, { 0x5F12, 0xB749 }, { 0x5F13, 0xA47D }, { 0x5F14, 0xA4DD }, { 0x5F15, 0xA4DE }, { 0x5F17, 0xA5B1 }, 
-	{ 0x5F18, 0xA5B0 }, { 0x5F1A, 0xC9DE }, { 0x5F1B, 0xA6A2 }, { 0x5F1D, 0xCAD3 }, { 0x5F1F, 0xA7CC }, { 0x5F22, 0xCC71 }, { 0x5F23, 0xCC72 }, { 0x5F24, 0xCC73 }, 
-	{ 0x5F26, 0xA9B6 }, { 0x5F27, 0xA9B7 }, { 0x5F28, 0xCC70 }, { 0x5F29, 0xA9B8 }, { 0x5F2D, 0xABDA }, { 0x5F2E, 0xCEBC }, { 0x5F30, 0xD17A }, { 0x5F31, 0xAE7A }, 
-	{ 0x5F33, 0xD179 }, { 0x5F35, 0xB169 }, { 0x5F36, 0xD54C }, { 0x5F37, 0xB16A }, { 0x5F38, 0xD54D }, { 0x5F3C, 0xB45D }, { 0x5F40, 0xDD62 }, { 0x5F43, 0xE1BF }, 
-	{ 0x5F44, 0xE1BE }, { 0x5F46, 0xB9FB }, { 0x5F48, 0xBC75 }, { 0x5F49, 0xE576 }, { 0x5F4A, 0xBECA }, { 0x5F4B, 0xE974 }, { 0x5F4C, 0xC0B1 }, { 0x5F4E, 0xC573 }, 
-	{ 0x5F4F, 0xF7D8 }, { 0x5F54, 0xCC74 }, { 0x5F56, 0xCEBD }, { 0x5F57, 0xB16B }, { 0x5F58, 0xD8F4 }, { 0x5F59, 0xB74A }, { 0x5F5D, 0xC255 }, { 0x5F62, 0xA7CE }, 
-	{ 0x5F64, 0xA7CD }, { 0x5F65, 0xABDB }, { 0x5F67, 0xD17B }, { 0x5F69, 0xB16D }, { 0x5F6A, 0xB343 }, { 0x5F6B, 0xB16E }, { 0x5F6C, 0xB16C }, { 0x5F6D, 0xB45E }, 
-	{ 0x5F6F, 0xE1C0 }, { 0x5F70, 0xB9FC }, { 0x5F71, 0xBC76 }, { 0x5F73, 0xC94C }, { 0x5F74, 0xC9DF }, { 0x5F76, 0xCAD5 }, { 0x5F77, 0xA7CF }, { 0x5F78, 0xCAD4 }, 
-	{ 0x5F79, 0xA7D0 }, { 0x5F7C, 0xA9BC }, { 0x5F7D, 0xCC77 }, { 0x5F7E, 0xCC76 }, { 0x5F7F, 0xA9BB }, { 0x5F80, 0xA9B9 }, { 0x5F81, 0xA9BA }, { 0x5F82, 0xCC75 }, 
-	{ 0x5F85, 0xABDD }, { 0x5F86, 0xCEBE }, { 0x5F87, 0xABE0 }, { 0x5F88, 0xABDC }, { 0x5F89, 0xABE2 }, { 0x5F8A, 0xABDE }, { 0x5F8B, 0xABDF }, { 0x5F8C, 0xABE1 }, 
-	{ 0x5F90, 0xAE7D }, { 0x5F91, 0xAE7C }, { 0x5F92, 0xAE7B }, { 0x5F96, 0xD54F }, { 0x5F97, 0xB16F }, { 0x5F98, 0xB172 }, { 0x5F99, 0xB170 }, { 0x5F9B, 0xD54E }, 
-	{ 0x5F9C, 0xB175 }, { 0x5F9E, 0xB171 }, { 0x5F9F, 0xD550 }, { 0x5FA0, 0xB174 }, { 0x5FA1, 0xB173 }, { 0x5FA5, 0xD8F6 }, { 0x5FA6, 0xD8F5 }, { 0x5FA8, 0xB461 }, 
-	{ 0x5FA9, 0xB45F }, { 0x5FAA, 0xB460 }, { 0x5FAB, 0xD8F7 }, { 0x5FAC, 0xB74B }, { 0x5FAD, 0xDD64 }, { 0x5FAE, 0xB74C }, { 0x5FAF, 0xDD63 }, { 0x5FB2, 0xE577 }, 
-	{ 0x5FB5, 0xBC78 }, { 0x5FB6, 0xE1C1 }, { 0x5FB7, 0xBC77 }, { 0x5FB9, 0xB9FD }, { 0x5FBB, 0xECDE }, { 0x5FBC, 0xE975 }, { 0x5FBD, 0xC0B2 }, { 0x5FBE, 0xECDD }, 
-	{ 0x5FBF, 0xF240 }, { 0x5FC0, 0xF448 }, { 0x5FC1, 0xF449 }, { 0x5FC3, 0xA4DF }, { 0x5FC5, 0xA5B2 }, { 0x5FC9, 0xC97B }, { 0x5FCC, 0xA7D2 }, { 0x5FCD, 0xA7D4 }, 
-	{ 0x5FCF, 0xC9E2 }, { 0x5FD0, 0xCAD8 }, { 0x5FD1, 0xCAD7 }, { 0x5FD2, 0xCAD6 }, { 0x5FD4, 0xC9E1 }, { 0x5FD5, 0xC9E0 }, { 0x5FD6, 0xA6A4 }, { 0x5FD7, 0xA7D3 }, 
-	{ 0x5FD8, 0xA7D1 }, { 0x5FD9, 0xA6A3 }, { 0x5FDD, 0xA9BD }, { 0x5FDE, 0xCC78 }, { 0x5FE0, 0xA9BE }, { 0x5FE1, 0xCADD }, { 0x5FE3, 0xCADF }, { 0x5FE4, 0xCADE }, 
-	{ 0x5FE5, 0xCC79 }, { 0x5FE8, 0xCADA }, { 0x5FEA, 0xA7D8 }, { 0x5FEB, 0xA7D6 }, { 0x5FED, 0xCAD9 }, { 0x5FEE, 0xCADB }, { 0x5FEF, 0xCAE1 }, { 0x5FF1, 0xA7D5 }, 
-	{ 0x5FF3, 0xCADC }, { 0x5FF4, 0xCAE5 }, { 0x5FF5, 0xA9C0 }, { 0x5FF7, 0xCAE2 }, { 0x5FF8, 0xA7D7 }, { 0x5FFA, 0xCAE0 }, { 0x5FFB, 0xCAE3 }, { 0x5FFD, 0xA9BF }, 
-	{ 0x5FFF, 0xA9C1 }, { 0x6000, 0xCAE4 }, { 0x6009, 0xCCAF }, { 0x600A, 0xCCA2 }, { 0x600B, 0xCC7E }, { 0x600C, 0xCCAE }, { 0x600D, 0xCCA9 }, { 0x600E, 0xABE7 }, 
-	{ 0x600F, 0xA9C2 }, { 0x6010, 0xCCAA }, { 0x6011, 0xCCAD }, { 0x6012, 0xABE3 }, { 0x6013, 0xCCAC }, { 0x6014, 0xA9C3 }, { 0x6015, 0xA9C8 }, { 0x6016, 0xA9C6 }, 
-	{ 0x6017, 0xCCA3 }, { 0x6019, 0xCC7C }, { 0x601A, 0xCCA5 }, { 0x601B, 0xA9CD }, { 0x601C, 0xCCB0 }, { 0x601D, 0xABE4 }, { 0x601E, 0xCCA6 }, { 0x6020, 0xABE5 }, 
-	{ 0x6021, 0xA9C9 }, { 0x6022, 0xCCA8 }, { 0x6024, 0xCECD }, { 0x6025, 0xABE6 }, { 0x6026, 0xCC7B }, { 0x6027, 0xA9CA }, { 0x6028, 0xABE8 }, { 0x6029, 0xA9CB }, 
-	{ 0x602A, 0xA9C7 }, { 0x602B, 0xA9CC }, { 0x602C, 0xCCA7 }, { 0x602D, 0xCC7A }, { 0x602E, 0xCCAB }, { 0x602F, 0xA9C4 }, { 0x6032, 0xCC7D }, { 0x6033, 0xCCA4 }, 
-	{ 0x6034, 0xCCA1 }, { 0x6035, 0xA9C5 }, { 0x6037, 0xCEBF }, { 0x6039, 0xCEC0 }, { 0x6040, 0xCECA }, { 0x6041, 0xD1A1 }, { 0x6042, 0xCECB }, { 0x6043, 0xABEE }, 
-	{ 0x6044, 0xCECE }, { 0x6045, 0xCEC4 }, { 0x6046, 0xABED }, { 0x6047, 0xCEC6 }, { 0x6049, 0xCEC7 }, { 0x604C, 0xCEC9 }, { 0x604D, 0xABE9 }, { 0x6050, 0xAEA3 }, 
-	{ 0x6053, 0xCEC5 }, { 0x6054, 0xCEC1 }, { 0x6055, 0xAEA4 }, { 0x6058, 0xCECF }, { 0x6059, 0xAE7E }, { 0x605A, 0xD17D }, { 0x605B, 0xCEC8 }, { 0x605D, 0xD17C }, 
-	{ 0x605E, 0xCEC3 }, { 0x605F, 0xCECC }, { 0x6062, 0xABEC }, { 0x6063, 0xAEA1 }, { 0x6064, 0xABF2 }, { 0x6065, 0xAEA2 }, { 0x6066, 0xCED0 }, { 0x6067, 0xD17E }, 
-	{ 0x6068, 0xABEB }, { 0x6069, 0xAEA6 }, { 0x606A, 0xABF1 }, { 0x606B, 0xABF0 }, { 0x606C, 0xABEF }, { 0x606D, 0xAEA5 }, { 0x606E, 0xCED1 }, { 0x606F, 0xAEA7 }, 
-	{ 0x6070, 0xABEA }, { 0x6072, 0xCEC2 }, { 0x607F, 0xB176 }, { 0x6080, 0xD1A4 }, { 0x6081, 0xD1A6 }, { 0x6083, 0xD1A8 }, { 0x6084, 0xAEA8 }, { 0x6085, 0xAEAE }, 
-	{ 0x6086, 0xD553 }, { 0x6087, 0xD1AC }, { 0x6088, 0xD1A3 }, { 0x6089, 0xB178 }, { 0x608A, 0xD551 }, { 0x608C, 0xAEAD }, { 0x608D, 0xAEAB }, { 0x608E, 0xD1AE }, 
-	{ 0x6090, 0xD552 }, { 0x6092, 0xD1A5 }, { 0x6094, 0xAEAC }, { 0x6095, 0xD1A9 }, { 0x6096, 0xAEAF }, { 0x6097, 0xD1AB }, { 0x609A, 0xAEAA }, { 0x609B, 0xD1AA }, 
-	{ 0x609C, 0xD1AD }, { 0x609D, 0xD1A7 }, { 0x609F, 0xAEA9 }, { 0x60A0, 0xB179 }, { 0x60A2, 0xD1A2 }, { 0x60A3, 0xB177 }, { 0x60A8, 0xB17A }, { 0x60B0, 0xD555 }, 
-	{ 0x60B1, 0xD55E }, { 0x60B2, 0xB464 }, { 0x60B4, 0xB17C }, { 0x60B5, 0xB1A3 }, { 0x60B6, 0xB465 }, { 0x60B7, 0xD560 }, { 0x60B8, 0xB1AA }, { 0x60B9, 0xD8F9 }, 
-	{ 0x60BA, 0xD556 }, { 0x60BB, 0xB1A2 }, { 0x60BC, 0xB1A5 }, { 0x60BD, 0xB17E }, { 0x60BE, 0xD554 }, { 0x60BF, 0xD562 }, { 0x60C0, 0xD565 }, { 0x60C1, 0xD949 }, 
-	{ 0x60C3, 0xD563 }, { 0x60C4, 0xD8FD }, { 0x60C5, 0xB1A1 }, { 0x60C6, 0xB1A8 }, { 0x60C7, 0xB1AC }, { 0x60C8, 0xD55D }, { 0x60C9, 0xD8F8 }, { 0x60CA, 0xD561 }, 
-	{ 0x60CB, 0xB17B }, { 0x60CC, 0xD8FA }, { 0x60CD, 0xD564 }, { 0x60CE, 0xD8FC }, { 0x60CF, 0xD559 }, { 0x60D1, 0xB462 }, { 0x60D3, 0xD557 }, { 0x60D4, 0xD558 }, 
-	{ 0x60D5, 0xB1A7 }, { 0x60D8, 0xB1A6 }, { 0x60D9, 0xD55B }, { 0x60DA, 0xB1AB }, { 0x60DB, 0xD55F }, { 0x60DC, 0xB1A4 }, { 0x60DD, 0xD55C }, { 0x60DF, 0xB1A9 }, 
-	{ 0x60E0, 0xB466 }, { 0x60E1, 0xB463 }, { 0x60E2, 0xD8FB }, { 0x60E4, 0xD55A }, { 0x60E6, 0xB17D }, { 0x60F0, 0xB46B }, { 0x60F1, 0xB46F }, { 0x60F2, 0xD940 }, 
-	{ 0x60F3, 0xB751 }, { 0x60F4, 0xB46D }, { 0x60F5, 0xD944 }, { 0x60F6, 0xB471 }, { 0x60F7, 0xDD65 }, { 0x60F8, 0xD946 }, { 0x60F9, 0xB753 }, { 0x60FA, 0xB469 }, 
-	{ 0x60FB, 0xB46C }, { 0x60FC, 0xD947 }, { 0x60FE, 0xD948 }, { 0x60FF, 0xD94E }, { 0x6100, 0xB473 }, { 0x6101, 0xB754 }, { 0x6103, 0xD94A }, { 0x6104, 0xD94F }, 
-	{ 0x6105, 0xD943 }, { 0x6106, 0xB75E }, { 0x6108, 0xB755 }, { 0x6109, 0xB472 }, { 0x610A, 0xD941 }, { 0x610B, 0xD950 }, { 0x610D, 0xB75D }, { 0x610E, 0xB470 }, 
-	{ 0x610F, 0xB74E }, { 0x6110, 0xD94D }, { 0x6112, 0xB474 }, { 0x6113, 0xD945 }, { 0x6114, 0xD8FE }, { 0x6115, 0xB46A }, { 0x6116, 0xD942 }, { 0x6118, 0xD94B }, 
-	{ 0x611A, 0xB74D }, { 0x611B, 0xB752 }, { 0x611C, 0xB467 }, { 0x611D, 0xD94C }, { 0x611F, 0xB750 }, { 0x6123, 0xB468 }, { 0x6127, 0xB75C }, { 0x6128, 0xE1C3 }, 
-	{ 0x6129, 0xDD70 }, { 0x612B, 0xDD68 }, { 0x612C, 0xE1C2 }, { 0x612E, 0xDD6C }, { 0x612F, 0xDD6E }, { 0x6132, 0xDD6B }, { 0x6134, 0xB75B }, { 0x6136, 0xDD6A }, 
-	{ 0x6137, 0xB75F }, { 0x613B, 0xE1D2 }, { 0x613E, 0xB75A }, { 0x613F, 0xBA40 }, { 0x6140, 0xDD71 }, { 0x6141, 0xE1C4 }, { 0x6144, 0xB758 }, { 0x6145, 0xDD69 }, 
-	{ 0x6146, 0xDD6D }, { 0x6147, 0xB9FE }, { 0x6148, 0xB74F }, { 0x6149, 0xDD66 }, { 0x614A, 0xDD67 }, { 0x614B, 0xBA41 }, { 0x614C, 0xB757 }, { 0x614D, 0xB759 }, 
-	{ 0x614E, 0xB756 }, { 0x614F, 0xDD6F }, { 0x6152, 0xE1C8 }, { 0x6153, 0xE1C9 }, { 0x6154, 0xE1CE }, { 0x6155, 0xBC7D }, { 0x6156, 0xE1D5 }, { 0x6158, 0xBA47 }, 
-	{ 0x615A, 0xBA46 }, { 0x615B, 0xE1D0 }, { 0x615D, 0xBC7C }, { 0x615E, 0xE1C5 }, { 0x615F, 0xBA45 }, { 0x6161, 0xE1D4 }, { 0x6162, 0xBA43 }, { 0x6163, 0xBA44 }, 
-	{ 0x6165, 0xE1D1 }, { 0x6166, 0xE5AA }, { 0x6167, 0xBC7A }, { 0x6168, 0xB46E }, { 0x616A, 0xE1D3 }, { 0x616B, 0xBCA3 }, { 0x616C, 0xE1CB }, { 0x616E, 0xBC7B }, 
-	{ 0x6170, 0xBCA2 }, { 0x6171, 0xE1C6 }, { 0x6172, 0xE1CA }, { 0x6173, 0xE1C7 }, { 0x6174, 0xE1CD }, { 0x6175, 0xBA48 }, { 0x6176, 0xBC79 }, { 0x6177, 0xBA42 }, 
-	{ 0x6179, 0xE57A }, { 0x617A, 0xE1CF }, { 0x617C, 0xBCA1 }, { 0x617E, 0xBCA4 }, { 0x6180, 0xE1CC }, { 0x6182, 0xBC7E }, { 0x6183, 0xE579 }, { 0x6189, 0xE57E }, 
-	{ 0x618A, 0xBECE }, { 0x618B, 0xE578 }, { 0x618C, 0xE9A3 }, { 0x618D, 0xE5A9 }, { 0x618E, 0xBCA8 }, { 0x6190, 0xBCA6 }, { 0x6191, 0xBECC }, { 0x6192, 0xE5A6 }, 
-	{ 0x6193, 0xE5A2 }, { 0x6194, 0xBCAC }, { 0x6196, 0xE978 }, { 0x619A, 0xBCAA }, { 0x619B, 0xE5A1 }, { 0x619D, 0xE976 }, { 0x619F, 0xE5A5 }, { 0x61A1, 0xE5A8 }, 
-	{ 0x61A2, 0xE57D }, { 0x61A4, 0xBCAB }, { 0x61A7, 0xBCA5 }, { 0x61A8, 0xE977 }, { 0x61A9, 0xBECD }, { 0x61AA, 0xE5A7 }, { 0x61AB, 0xBCA7 }, { 0x61AC, 0xBCA9 }, 
-	{ 0x61AD, 0xE5A4 }, { 0x61AE, 0xBCAD }, { 0x61AF, 0xE5A3 }, { 0x61B0, 0xE57C }, { 0x61B1, 0xE57B }, { 0x61B2, 0xBECB }, { 0x61B3, 0xE5AB }, { 0x61B4, 0xE97A }, 
-	{ 0x61B5, 0xECE0 }, { 0x61B6, 0xBED0 }, { 0x61B8, 0xE9A2 }, { 0x61BA, 0xE97E }, { 0x61BC, 0xECE1 }, { 0x61BE, 0xBED1 }, { 0x61BF, 0xE9A1 }, { 0x61C1, 0xE97C }, 
-	{ 0x61C2, 0xC0B4 }, { 0x61C3, 0xECDF }, { 0x61C5, 0xE979 }, { 0x61C6, 0xE97B }, { 0x61C7, 0xC0B5 }, { 0x61C8, 0xBED3 }, { 0x61C9, 0xC0B3 }, { 0x61CA, 0xBED2 }, 
-	{ 0x61CB, 0xC0B7 }, { 0x61CC, 0xE97D }, { 0x61CD, 0xBECF }, { 0x61D6, 0xEFCF }, { 0x61D8, 0xEFC7 }, { 0x61DE, 0xECE7 }, { 0x61DF, 0xEFC8 }, { 0x61E0, 0xECE3 }, 
-	{ 0x61E3, 0xC256 }, { 0x61E4, 0xECE5 }, { 0x61E5, 0xECE4 }, { 0x61E6, 0xC0B6 }, { 0x61E7, 0xECE2 }, { 0x61E8, 0xECE6 }, { 0x61E9, 0xEFD0 }, { 0x61EA, 0xEFCC }, 
-	{ 0x61EB, 0xEFCE }, { 0x61ED, 0xEFC9 }, { 0x61EE, 0xEFCA }, { 0x61F0, 0xEFCD }, { 0x61F1, 0xEFCB }, { 0x61F2, 0xC367 }, { 0x61F5, 0xC36A }, { 0x61F6, 0xC369 }, 
-	{ 0x61F7, 0xC368 }, { 0x61F8, 0xC461 }, { 0x61F9, 0xF44A }, { 0x61FA, 0xC462 }, { 0x61FB, 0xF241 }, { 0x61FC, 0xC4DF }, { 0x61FD, 0xF5CC }, { 0x61FE, 0xC4E0 }, 
-	{ 0x61FF, 0xC574 }, { 0x6200, 0xC5CA }, { 0x6201, 0xF7D9 }, { 0x6203, 0xF7DA }, { 0x6204, 0xF7DB }, { 0x6207, 0xF9BA }, { 0x6208, 0xA4E0 }, { 0x6209, 0xC97C }, 
-	{ 0x620A, 0xA5B3 }, { 0x620C, 0xA6A6 }, { 0x620D, 0xA6A7 }, { 0x620E, 0xA6A5 }, { 0x6210, 0xA6A8 }, { 0x6211, 0xA7DA }, { 0x6212, 0xA7D9 }, { 0x6214, 0xCCB1 }, 
-	{ 0x6215, 0xA9CF }, { 0x6216, 0xA9CE }, { 0x6219, 0xD1AF }, { 0x621A, 0xB1AD }, { 0x621B, 0xB1AE }, { 0x621F, 0xB475 }, { 0x6220, 0xDD72 }, { 0x6221, 0xB760 }, 
-	{ 0x6222, 0xB761 }, { 0x6223, 0xDD74 }, { 0x6224, 0xDD76 }, { 0x6225, 0xDD75 }, { 0x6227, 0xE1D7 }, { 0x6229, 0xE1D6 }, { 0x622A, 0xBA49 }, { 0x622B, 0xE1D8 }, 
-	{ 0x622D, 0xE5AC }, { 0x622E, 0xBCAE }, { 0x6230, 0xBED4 }, { 0x6232, 0xC0B8 }, { 0x6233, 0xC257 }, { 0x6234, 0xC0B9 }, { 0x6236, 0xA4E1 }, { 0x623A, 0xCAE6 }, 
-	{ 0x623D, 0xCCB2 }, { 0x623E, 0xA9D1 }, { 0x623F, 0xA9D0 }, { 0x6240, 0xA9D2 }, { 0x6241, 0xABF3 }, { 0x6242, 0xCED2 }, { 0x6243, 0xCED3 }, { 0x6246, 0xD1B0 }, 
-	{ 0x6247, 0xAEB0 }, { 0x6248, 0xB1AF }, { 0x6249, 0xB476 }, { 0x624A, 0xD951 }, { 0x624B, 0xA4E2 }, { 0x624D, 0xA47E }, { 0x624E, 0xA4E3 }, { 0x6250, 0xC97D }, 
-	{ 0x6251, 0xA5B7 }, { 0x6252, 0xA5B6 }, { 0x6253, 0xA5B4 }, { 0x6254, 0xA5B5 }, { 0x6258, 0xA6AB }, { 0x6259, 0xC9E9 }, { 0x625A, 0xC9EB }, { 0x625B, 0xA6AA }, 
-	{ 0x625C, 0xC9E3 }, { 0x625E, 0xC9E4 }, { 0x6260, 0xC9EA }, { 0x6261, 0xC9E6 }, { 0x6262, 0xC9E8 }, { 0x6263, 0xA6A9 }, { 0x6264, 0xC9E5 }, { 0x6265, 0xC9EC }, 
-	{ 0x6266, 0xC9E7 }, { 0x626D, 0xA7E1 }, { 0x626E, 0xA7EA }, { 0x626F, 0xA7E8 }, { 0x6270, 0xCAF0 }, { 0x6271, 0xCAED }, { 0x6272, 0xCAF5 }, { 0x6273, 0xA7E6 }, 
-	{ 0x6274, 0xCAF6 }, { 0x6276, 0xA7DF }, { 0x6277, 0xCAF3 }, { 0x6279, 0xA7E5 }, { 0x627A, 0xCAEF }, { 0x627B, 0xCAEE }, { 0x627C, 0xA7E3 }, { 0x627D, 0xCAF4 }, 
-	{ 0x627E, 0xA7E4 }, { 0x627F, 0xA9D3 }, { 0x6280, 0xA7DE }, { 0x6281, 0xCAF1 }, { 0x6283, 0xCAE7 }, { 0x6284, 0xA7DB }, { 0x6286, 0xA7EE }, { 0x6287, 0xCAEC }, 
-	{ 0x6288, 0xCAF2 }, { 0x6289, 0xA7E0 }, { 0x628A, 0xA7E2 }, { 0x628C, 0xCAE8 }, { 0x628E, 0xCAE9 }, { 0x628F, 0xCAEA }, { 0x6291, 0xA7ED }, { 0x6292, 0xA7E7 }, 
-	{ 0x6293, 0xA7EC }, { 0x6294, 0xCAEB }, { 0x6295, 0xA7EB }, { 0x6296, 0xA7DD }, { 0x6297, 0xA7DC }, { 0x6298, 0xA7E9 }, { 0x62A8, 0xA9E1 }, { 0x62A9, 0xCCBE }, 
-	{ 0x62AA, 0xCCB7 }, { 0x62AB, 0xA9DC }, { 0x62AC, 0xA9EF }, { 0x62AD, 0xCCB3 }, { 0x62AE, 0xCCBA }, { 0x62AF, 0xCCBC }, { 0x62B0, 0xCCBF }, { 0x62B1, 0xA9EA }, 
-	{ 0x62B3, 0xCCBB }, { 0x62B4, 0xCCB4 }, { 0x62B5, 0xA9E8 }, { 0x62B6, 0xCCB8 }, { 0x62B8, 0xCCC0 }, { 0x62B9, 0xA9D9 }, { 0x62BB, 0xCCBD }, { 0x62BC, 0xA9E3 }, 
-	{ 0x62BD, 0xA9E2 }, { 0x62BE, 0xCCB6 }, { 0x62BF, 0xA9D7 }, { 0x62C2, 0xA9D8 }, { 0x62C4, 0xA9D6 }, { 0x62C6, 0xA9EE }, { 0x62C7, 0xA9E6 }, { 0x62C8, 0xA9E0 }, 
-	{ 0x62C9, 0xA9D4 }, { 0x62CA, 0xCCB9 }, { 0x62CB, 0xA9DF }, { 0x62CC, 0xA9D5 }, { 0x62CD, 0xA9E7 }, { 0x62CE, 0xA9F0 }, { 0x62CF, 0xCED4 }, { 0x62D0, 0xA9E4 }, 
-	{ 0x62D1, 0xCCB5 }, { 0x62D2, 0xA9DA }, { 0x62D3, 0xA9DD }, { 0x62D4, 0xA9DE }, { 0x62D6, 0xA9EC }, { 0x62D7, 0xA9ED }, { 0x62D8, 0xA9EB }, { 0x62D9, 0xA9E5 }, 
-	{ 0x62DA, 0xA9E9 }, { 0x62DB, 0xA9DB }, { 0x62DC, 0xABF4 }, { 0x62EB, 0xCEDA }, { 0x62EC, 0xAC41 }, { 0x62ED, 0xABF8 }, { 0x62EE, 0xABFA }, { 0x62EF, 0xAC40 }, 
-	{ 0x62F0, 0xCEE6 }, { 0x62F1, 0xABFD }, { 0x62F2, 0xD1B1 }, { 0x62F3, 0xAEB1 }, { 0x62F4, 0xAC43 }, { 0x62F5, 0xCED7 }, { 0x62F6, 0xCEDF }, { 0x62F7, 0xABFE }, 
-	{ 0x62F8, 0xCEDE }, { 0x62F9, 0xCEDB }, { 0x62FA, 0xCEE3 }, { 0x62FB, 0xCEE5 }, { 0x62FC, 0xABF7 }, { 0x62FD, 0xABFB }, { 0x62FE, 0xAC42 }, { 0x62FF, 0xAEB3 }, 
-	{ 0x6300, 0xCEE0 }, { 0x6301, 0xABF9 }, { 0x6302, 0xAC45 }, { 0x6303, 0xCED9 }, { 0x6307, 0xABFC }, { 0x6308, 0xAEB2 }, { 0x6309, 0xABF6 }, { 0x630B, 0xCED6 }, 
-	{ 0x630C, 0xCEDD }, { 0x630D, 0xCED5 }, { 0x630E, 0xCED8 }, { 0x630F, 0xCEDC }, { 0x6310, 0xD1B2 }, { 0x6311, 0xAC44 }, { 0x6313, 0xCEE1 }, { 0x6314, 0xCEE2 }, 
-	{ 0x6315, 0xCEE4 }, { 0x6316, 0xABF5 }, { 0x6328, 0xAEC1 }, { 0x6329, 0xD1BE }, { 0x632A, 0xAEBF }, { 0x632B, 0xAEC0 }, { 0x632C, 0xD1B4 }, { 0x632D, 0xD1C4 }, 
-	{ 0x632F, 0xAEB6 }, { 0x6332, 0xD566 }, { 0x6333, 0xD1C6 }, { 0x6334, 0xD1C0 }, { 0x6336, 0xD1B7 }, { 0x6338, 0xD1C9 }, { 0x6339, 0xD1BA }, { 0x633A, 0xAEBC }, 
-	{ 0x633B, 0xD57D }, { 0x633C, 0xD1BD }, { 0x633D, 0xAEBE }, { 0x633E, 0xAEB5 }, { 0x6340, 0xD1CB }, { 0x6341, 0xD1BF }, { 0x6342, 0xAEB8 }, { 0x6343, 0xD1B8 }, 
-	{ 0x6344, 0xD1B5 }, { 0x6345, 0xD1B6 }, { 0x6346, 0xAEB9 }, { 0x6347, 0xD1C5 }, { 0x6348, 0xD1CC }, { 0x6349, 0xAEBB }, { 0x634A, 0xD1BC }, { 0x634B, 0xD1BB }, 
-	{ 0x634C, 0xAEC3 }, { 0x634D, 0xAEC2 }, { 0x634E, 0xAEB4 }, { 0x634F, 0xAEBA }, { 0x6350, 0xAEBD }, { 0x6351, 0xD1C8 }, { 0x6354, 0xD1C2 }, { 0x6355, 0xAEB7 }, 
-	{ 0x6356, 0xD1B3 }, { 0x6357, 0xD1CA }, { 0x6358, 0xD1C1 }, { 0x6359, 0xD1C3 }, { 0x635A, 0xD1C7 }, { 0x6365, 0xD567 }, { 0x6367, 0xB1B7 }, { 0x6368, 0xB1CB }, 
-	{ 0x6369, 0xB1CA }, { 0x636B, 0xB1BF }, { 0x636D, 0xD579 }, { 0x636E, 0xD575 }, { 0x636F, 0xD572 }, { 0x6370, 0xD5A6 }, { 0x6371, 0xB1BA }, { 0x6372, 0xB1B2 }, 
-	{ 0x6375, 0xD577 }, { 0x6376, 0xB4A8 }, { 0x6377, 0xB1B6 }, { 0x6378, 0xD5A1 }, { 0x637A, 0xB1CC }, { 0x637B, 0xB1C9 }, { 0x637C, 0xD57B }, { 0x637D, 0xD56A }, 
-	{ 0x6380, 0xB1C8 }, { 0x6381, 0xD5A3 }, { 0x6382, 0xD569 }, { 0x6383, 0xB1BD }, { 0x6384, 0xB1C1 }, { 0x6385, 0xD5A2 }, { 0x6387, 0xD573 }, { 0x6388, 0xB1C2 }, 
-	{ 0x6389, 0xB1BC }, { 0x638A, 0xD568 }, { 0x638C, 0xB478 }, { 0x638D, 0xD5A5 }, { 0x638E, 0xD571 }, { 0x638F, 0xB1C7 }, { 0x6390, 0xD574 }, { 0x6391, 0xD5A4 }, 
-	{ 0x6392, 0xB1C6 }, { 0x6394, 0xD952 }, { 0x6396, 0xB1B3 }, { 0x6397, 0xD56F }, { 0x6398, 0xB1B8 }, { 0x6399, 0xB1C3 }, { 0x639B, 0xB1BE }, { 0x639C, 0xD578 }, 
-	{ 0x639D, 0xD56E }, { 0x639E, 0xD56C }, { 0x639F, 0xD57E }, { 0x63A0, 0xB1B0 }, { 0x63A1, 0xB1C4 }, { 0x63A2, 0xB1B4 }, { 0x63A3, 0xB477 }, { 0x63A4, 0xD57C }, 
-	{ 0x63A5, 0xB1B5 }, { 0x63A7, 0xB1B1 }, { 0x63A8, 0xB1C0 }, { 0x63A9, 0xB1BB }, { 0x63AA, 0xB1B9 }, { 0x63AB, 0xD570 }, { 0x63AC, 0xB1C5 }, { 0x63AD, 0xD56D }, 
-	{ 0x63AE, 0xD57A }, { 0x63AF, 0xD576 }, { 0x63B0, 0xD954 }, { 0x63B1, 0xD953 }, { 0x63BD, 0xD56B }, { 0x63BE, 0xD964 }, { 0x63C0, 0xB47A }, { 0x63C2, 0xD96A }, 
-	{ 0x63C3, 0xD959 }, { 0x63C4, 0xD967 }, { 0x63C5, 0xDD77 }, { 0x63C6, 0xB47D }, { 0x63C7, 0xD96B }, { 0x63C8, 0xD96E }, { 0x63C9, 0xB47C }, { 0x63CA, 0xD95C }, 
-	{ 0x63CB, 0xD96D }, { 0x63CC, 0xD96C }, { 0x63CD, 0xB47E }, { 0x63CE, 0xD955 }, { 0x63CF, 0xB479 }, { 0x63D0, 0xB4A3 }, { 0x63D2, 0xB4A1 }, { 0x63D3, 0xD969 }, 
-	{ 0x63D5, 0xD95F }, { 0x63D6, 0xB4A5 }, { 0x63D7, 0xD970 }, { 0x63D8, 0xD968 }, { 0x63D9, 0xD971 }, { 0x63DA, 0xB4AD }, { 0x63DB, 0xB4AB }, { 0x63DC, 0xD966 }, 
-	{ 0x63DD, 0xD965 }, { 0x63DF, 0xD963 }, { 0x63E0, 0xD95D }, { 0x63E1, 0xB4A4 }, { 0x63E3, 0xB4A2 }, { 0x63E4, 0xD1B9 }, { 0x63E5, 0xD956 }, { 0x63E7, 0xDDB7 }, 
-	{ 0x63E8, 0xD957 }, { 0x63E9, 0xB47B }, { 0x63EA, 0xB4AA }, { 0x63EB, 0xDD79 }, { 0x63ED, 0xB4A6 }, { 0x63EE, 0xB4A7 }, { 0x63EF, 0xD958 }, { 0x63F0, 0xD96F }, 
-	{ 0x63F1, 0xDD78 }, { 0x63F2, 0xD960 }, { 0x63F3, 0xD95B }, { 0x63F4, 0xB4A9 }, { 0x63F5, 0xD961 }, { 0x63F6, 0xD95E }, { 0x63F9, 0xB4AE }, { 0x6406, 0xB770 }, 
-	{ 0x6409, 0xDD7C }, { 0x640A, 0xDDB1 }, { 0x640B, 0xDDB6 }, { 0x640C, 0xDDAA }, { 0x640D, 0xB76C }, { 0x640E, 0xDDBB }, { 0x640F, 0xB769 }, { 0x6410, 0xDD7A }, 
-	{ 0x6412, 0xDD7B }, { 0x6413, 0xB762 }, { 0x6414, 0xB76B }, { 0x6415, 0xDDA4 }, { 0x6416, 0xB76E }, { 0x6417, 0xB76F }, { 0x6418, 0xDDA5 }, { 0x641A, 0xDDB2 }, 
-	{ 0x641B, 0xDDB8 }, { 0x641C, 0xB76A }, { 0x641E, 0xB764 }, { 0x641F, 0xDDA3 }, { 0x6420, 0xDD7D }, { 0x6421, 0xDDBA }, { 0x6422, 0xDDA8 }, { 0x6423, 0xDDA9 }, 
-	{ 0x6424, 0xDD7E }, { 0x6425, 0xDDB4 }, { 0x6426, 0xDDAB }, { 0x6427, 0xDDB5 }, { 0x6428, 0xDDAD }, { 0x642A, 0xB765 }, { 0x642B, 0xE1D9 }, { 0x642C, 0xB768 }, 
-	{ 0x642D, 0xB766 }, { 0x642E, 0xDDB9 }, { 0x642F, 0xDDB0 }, { 0x6430, 0xDDAC }, { 0x6433, 0xDDA1 }, { 0x6434, 0xBA53 }, { 0x6435, 0xDDAF }, { 0x6436, 0xB76D }, 
-	{ 0x6437, 0xDDA7 }, { 0x6439, 0xDDA6 }, { 0x643D, 0xB767 }, { 0x643E, 0xB763 }, { 0x643F, 0xE1EE }, { 0x6440, 0xDDB3 }, { 0x6441, 0xDDAE }, { 0x6443, 0xDDA2 }, 
-	{ 0x644B, 0xE1E9 }, { 0x644D, 0xE1DA }, { 0x644E, 0xE1E5 }, { 0x6450, 0xE1EC }, { 0x6451, 0xBA51 }, { 0x6452, 0xB4AC }, { 0x6453, 0xE1EA }, { 0x6454, 0xBA4C }, 
-	{ 0x6458, 0xBA4B }, { 0x6459, 0xE1F1 }, { 0x645B, 0xE1DB }, { 0x645C, 0xE1E8 }, { 0x645D, 0xE1DC }, { 0x645E, 0xE1E7 }, { 0x645F, 0xBA4F }, { 0x6460, 0xE1EB }, 
-	{ 0x6461, 0xD962 }, { 0x6465, 0xE1F2 }, { 0x6466, 0xE1E3 }, { 0x6467, 0xBA52 }, { 0x6468, 0xE5BA }, { 0x6469, 0xBCAF }, { 0x646B, 0xE1F0 }, { 0x646C, 0xE1EF }, 
-	{ 0x646D, 0xBA54 }, { 0x646E, 0xE5AD }, { 0x646F, 0xBCB0 }, { 0x6470, 0xE5AE }, { 0x6472, 0xE1DF }, { 0x6473, 0xE1E0 }, { 0x6474, 0xE1DD }, { 0x6475, 0xE1E2 }, 
-	{ 0x6476, 0xE1DE }, { 0x6477, 0xE1F3 }, { 0x6478, 0xBA4E }, { 0x6479, 0xBCB1 }, { 0x647A, 0xBA50 }, { 0x647B, 0xBA55 }, { 0x647D, 0xE1E1 }, { 0x647F, 0xE1ED }, 
-	{ 0x6482, 0xE1E6 }, { 0x6485, 0xE5B1 }, { 0x6487, 0xBA4A }, { 0x6488, 0xBCB4 }, { 0x6489, 0xE9AA }, { 0x648A, 0xE5B6 }, { 0x648B, 0xE5B5 }, { 0x648C, 0xE5B7 }, 
-	{ 0x648F, 0xE5B4 }, { 0x6490, 0xBCB5 }, { 0x6492, 0xBCBB }, { 0x6493, 0xBCB8 }, { 0x6495, 0xBCB9 }, { 0x6496, 0xE5AF }, { 0x6497, 0xE5B2 }, { 0x6498, 0xE5BC }, 
-	{ 0x6499, 0xBCC1 }, { 0x649A, 0xBCBF }, { 0x649C, 0xE5B3 }, { 0x649D, 0xD95A }, { 0x649E, 0xBCB2 }, { 0x649F, 0xE5B9 }, { 0x64A0, 0xE5B0 }, { 0x64A2, 0xBCC2 }, 
-	{ 0x64A3, 0xE5B8 }, { 0x64A4, 0xBA4D }, { 0x64A5, 0xBCB7 }, { 0x64A6, 0xE1E4 }, { 0x64A9, 0xBCBA }, { 0x64AB, 0xBCBE }, { 0x64AC, 0xBCC0 }, { 0x64AD, 0xBCBD }, 
-	{ 0x64AE, 0xBCBC }, { 0x64B0, 0xBCB6 }, { 0x64B1, 0xE5BB }, { 0x64B2, 0xBCB3 }, { 0x64B3, 0xBCC3 }, { 0x64BB, 0xBED8 }, { 0x64BC, 0xBED9 }, { 0x64BD, 0xE9A9 }, 
-	{ 0x64BE, 0xBEE2 }, { 0x64BF, 0xBEDF }, { 0x64C1, 0xBED6 }, { 0x64C2, 0xBEDD }, { 0x64C3, 0xE9AB }, { 0x64C4, 0xBEDB }, { 0x64C5, 0xBED5 }, { 0x64C7, 0xBEDC }, 
-	{ 0x64C9, 0xE9A8 }, { 0x64CA, 0xC0BB }, { 0x64CB, 0xBED7 }, { 0x64CD, 0xBEDE }, { 0x64CE, 0xC0BA }, { 0x64CF, 0xE9A7 }, { 0x64D0, 0xE9A6 }, { 0x64D2, 0xBEE0 }, 
-	{ 0x64D4, 0xBEE1 }, { 0x64D6, 0xE9A5 }, { 0x64D7, 0xE9A4 }, { 0x64D8, 0xC0BC }, { 0x64D9, 0xE9AE }, { 0x64DA, 0xBEDA }, { 0x64DB, 0xE9AC }, { 0x64E0, 0xC0BD }, 
-	{ 0x64E2, 0xC0C2 }, { 0x64E3, 0xECEA }, { 0x64E4, 0xECEC }, { 0x64E6, 0xC0BF }, { 0x64E8, 0xECED }, { 0x64E9, 0xECE9 }, { 0x64EB, 0xECEB }, { 0x64EC, 0xC0C0 }, 
-	{ 0x64ED, 0xC0C3 }, { 0x64EF, 0xECE8 }, { 0x64F0, 0xC0BE }, { 0x64F1, 0xC0C1 }, { 0x64F2, 0xC259 }, { 0x64F3, 0xE9AD }, { 0x64F4, 0xC258 }, { 0x64F7, 0xC25E }, 
-	{ 0x64F8, 0xEFD4 }, { 0x64FA, 0xC25C }, { 0x64FB, 0xC25D }, { 0x64FC, 0xEFD7 }, { 0x64FD, 0xEFD3 }, { 0x64FE, 0xC25A }, { 0x64FF, 0xEFD1 }, { 0x6500, 0xC36B }, 
-	{ 0x6501, 0xEFD5 }, { 0x6503, 0xEFD6 }, { 0x6504, 0xEFD2 }, { 0x6506, 0xC25B }, { 0x6507, 0xF242 }, { 0x6509, 0xF245 }, { 0x650C, 0xF246 }, { 0x650D, 0xF244 }, 
-	{ 0x650E, 0xF247 }, { 0x650F, 0xC36C }, { 0x6510, 0xF243 }, { 0x6513, 0xF44E }, { 0x6514, 0xC464 }, { 0x6515, 0xF44D }, { 0x6516, 0xF44C }, { 0x6517, 0xF44B }, 
-	{ 0x6518, 0xC463 }, { 0x6519, 0xC465 }, { 0x651B, 0xF5CD }, { 0x651C, 0xC4E2 }, { 0x651D, 0xC4E1 }, { 0x6520, 0xF6E1 }, { 0x6521, 0xF6E0 }, { 0x6522, 0xF6E3 }, 
-	{ 0x6523, 0xC5CB }, { 0x6524, 0xC575 }, { 0x6525, 0xF7DD }, { 0x6526, 0xF6E2 }, { 0x6529, 0xF7DC }, { 0x652A, 0xC5CD }, { 0x652B, 0xC5CC }, { 0x652C, 0xC5F3 }, 
-	{ 0x652D, 0xF8A9 }, { 0x652E, 0xF8EF }, { 0x652F, 0xA4E4 }, { 0x6532, 0xD972 }, { 0x6533, 0xE9AF }, { 0x6536, 0xA6AC }, { 0x6537, 0xCAF7 }, { 0x6538, 0xA7F1 }, 
-	{ 0x6539, 0xA7EF }, { 0x653B, 0xA7F0 }, { 0x653D, 0xCCC1 }, { 0x653E, 0xA9F1 }, { 0x653F, 0xAC46 }, { 0x6541, 0xCEE7 }, { 0x6543, 0xCEE8 }, { 0x6545, 0xAC47 }, 
-	{ 0x6546, 0xD1CE }, { 0x6548, 0xAEC4 }, { 0x6549, 0xAEC5 }, { 0x654A, 0xD1CD }, { 0x654F, 0xB1D3 }, { 0x6551, 0xB1CF }, { 0x6553, 0xD5A7 }, { 0x6554, 0xB1D6 }, 
-	{ 0x6555, 0xB1D5 }, { 0x6556, 0xB1CE }, { 0x6557, 0xB1D1 }, { 0x6558, 0xB1D4 }, { 0x6559, 0xB1D0 }, { 0x655C, 0xD976 }, { 0x655D, 0xB1CD }, { 0x655E, 0xB4AF }, 
-	{ 0x6562, 0xB4B1 }, { 0x6563, 0xB4B2 }, { 0x6564, 0xD975 }, { 0x6565, 0xD978 }, { 0x6566, 0xB4B0 }, { 0x6567, 0xD973 }, { 0x6568, 0xD977 }, { 0x656A, 0xD974 }, 
-	{ 0x656C, 0xB771 }, { 0x656F, 0xDDBC }, { 0x6572, 0xBA56 }, { 0x6573, 0xE1F4 }, { 0x6574, 0xBEE3 }, { 0x6575, 0xBCC4 }, { 0x6576, 0xE5BD }, { 0x6577, 0xBCC5 }, 
-	{ 0x6578, 0xBCC6 }, { 0x6579, 0xE5BF }, { 0x657A, 0xE5BE }, { 0x657B, 0xE5C0 }, { 0x657C, 0xE9B1 }, { 0x657F, 0xE9B0 }, { 0x6580, 0xECEF }, { 0x6581, 0xECEE }, 
-	{ 0x6582, 0xC0C4 }, { 0x6583, 0xC0C5 }, { 0x6584, 0xF248 }, { 0x6587, 0xA4E5 }, { 0x658C, 0xD979 }, { 0x6590, 0xB4B4 }, { 0x6591, 0xB4B3 }, { 0x6592, 0xDDBD }, 
-	{ 0x6594, 0xEFD8 }, { 0x6595, 0xC4E3 }, { 0x6596, 0xF7DE }, { 0x6597, 0xA4E6 }, { 0x6599, 0xAEC6 }, { 0x659B, 0xB1D8 }, { 0x659C, 0xB1D7 }, { 0x659D, 0xD97A }, 
-	{ 0x659E, 0xD97B }, { 0x659F, 0xB772 }, { 0x65A0, 0xE1F5 }, { 0x65A1, 0xBA57 }, { 0x65A2, 0xE9B2 }, { 0x65A4, 0xA4E7 }, { 0x65A5, 0xA5B8 }, { 0x65A7, 0xA9F2 }, 
-	{ 0x65A8, 0xCCC2 }, { 0x65AA, 0xCEE9 }, { 0x65AB, 0xAC48 }, { 0x65AC, 0xB1D9 }, { 0x65AE, 0xD97C }, { 0x65AF, 0xB4B5 }, { 0x65B0, 0xB773 }, { 0x65B2, 0xE5C1 }, 
-	{ 0x65B3, 0xE5C2 }, { 0x65B6, 0xECF0 }, { 0x65B7, 0xC25F }, { 0x65B8, 0xF8F0 }, { 0x65B9, 0xA4E8 }, { 0x65BB, 0xCCC3 }, { 0x65BC, 0xA9F3 }, { 0x65BD, 0xAC49 }, 
-	{ 0x65BF, 0xCEEA }, { 0x65C1, 0xAEC7 }, { 0x65C2, 0xD1D2 }, { 0x65C3, 0xD1D0 }, { 0x65C4, 0xD1D1 }, { 0x65C5, 0xAEC8 }, { 0x65C6, 0xD1CF }, { 0x65CB, 0xB1DB }, 
-	{ 0x65CC, 0xB1DC }, { 0x65CD, 0xD5A8 }, { 0x65CE, 0xB1DD }, { 0x65CF, 0xB1DA }, { 0x65D0, 0xD97D }, { 0x65D2, 0xD97E }, { 0x65D3, 0xDDBE }, { 0x65D6, 0xBA59 }, 
-	{ 0x65D7, 0xBA58 }, { 0x65DA, 0xECF1 }, { 0x65DB, 0xEFD9 }, { 0x65DD, 0xF24A }, { 0x65DE, 0xF249 }, { 0x65DF, 0xF44F }, { 0x65E1, 0xC95E }, { 0x65E2, 0xAC4A }, 
-	{ 0x65E5, 0xA4E9 }, { 0x65E6, 0xA5B9 }, { 0x65E8, 0xA6AE }, { 0x65E9, 0xA6AD }, { 0x65EC, 0xA6AF }, { 0x65ED, 0xA6B0 }, { 0x65EE, 0xC9EE }, { 0x65EF, 0xC9ED }, 
-	{ 0x65F0, 0xCAF8 }, { 0x65F1, 0xA7F2 }, { 0x65F2, 0xCAFB }, { 0x65F3, 0xCAFA }, { 0x65F4, 0xCAF9 }, { 0x65F5, 0xCAFC }, { 0x65FA, 0xA9F4 }, { 0x65FB, 0xCCC9 }, 
-	{ 0x65FC, 0xCCC5 }, { 0x65FD, 0xCCCE }, { 0x6600, 0xA9FB }, { 0x6602, 0xA9F9 }, { 0x6603, 0xCCCA }, { 0x6604, 0xCCC6 }, { 0x6605, 0xCCCD }, { 0x6606, 0xA9F8 }, 
-	{ 0x6607, 0xAA40 }, { 0x6608, 0xCCC8 }, { 0x6609, 0xCCC4 }, { 0x660A, 0xA9FE }, { 0x660B, 0xCCCB }, { 0x660C, 0xA9F7 }, { 0x660D, 0xCCCC }, { 0x660E, 0xA9FA }, 
-	{ 0x660F, 0xA9FC }, { 0x6610, 0xCCD0 }, { 0x6611, 0xCCCF }, { 0x6612, 0xCCC7 }, { 0x6613, 0xA9F6 }, { 0x6614, 0xA9F5 }, { 0x6615, 0xA9FD }, { 0x661C, 0xCEEF }, 
-	{ 0x661D, 0xCEF5 }, { 0x661F, 0xAC50 }, { 0x6620, 0xAC4D }, { 0x6621, 0xCEEC }, { 0x6622, 0xCEF1 }, { 0x6624, 0xAC53 }, { 0x6625, 0xAC4B }, { 0x6626, 0xCEF0 }, 
-	{ 0x6627, 0xAC4E }, { 0x6628, 0xAC51 }, { 0x662B, 0xCEF3 }, { 0x662D, 0xAC4C }, { 0x662E, 0xCEF8 }, { 0x662F, 0xAC4F }, { 0x6631, 0xAC52 }, { 0x6632, 0xCEED }, 
-	{ 0x6633, 0xCEF2 }, { 0x6634, 0xCEF6 }, { 0x6635, 0xCEEE }, { 0x6636, 0xCEEB }, { 0x6639, 0xCEF7 }, { 0x663A, 0xCEF4 }, { 0x6641, 0xAED0 }, { 0x6642, 0xAEC9 }, 
-	{ 0x6643, 0xAECC }, { 0x6645, 0xAECF }, { 0x6647, 0xD1D5 }, { 0x6649, 0xAECA }, { 0x664A, 0xD1D3 }, { 0x664C, 0xAECE }, { 0x664F, 0xAECB }, { 0x6651, 0xD1D6 }, 
-	{ 0x6652, 0xAECD }, { 0x6659, 0xD5AC }, { 0x665A, 0xB1DF }, { 0x665B, 0xD5AB }, { 0x665C, 0xD5AD }, { 0x665D, 0xB1DE }, { 0x665E, 0xB1E3 }, { 0x665F, 0xD1D4 }, 
-	{ 0x6661, 0xD5AA }, { 0x6662, 0xD5AE }, { 0x6664, 0xB1E0 }, { 0x6665, 0xD5A9 }, { 0x6666, 0xB1E2 }, { 0x6668, 0xB1E1 }, { 0x666A, 0xD9A7 }, { 0x666C, 0xD9A2 }, 
-	{ 0x666E, 0xB4B6 }, { 0x666F, 0xB4BA }, { 0x6670, 0xB4B7 }, { 0x6671, 0xD9A5 }, { 0x6672, 0xD9A8 }, { 0x6674, 0xB4B8 }, { 0x6676, 0xB4B9 }, { 0x6677, 0xB4BE }, 
-	{ 0x6678, 0xDDC7 }, { 0x6679, 0xD9A6 }, { 0x667A, 0xB4BC }, { 0x667B, 0xD9A3 }, { 0x667C, 0xD9A1 }, { 0x667E, 0xB4BD }, { 0x6680, 0xD9A4 }, { 0x6684, 0xB779 }, 
-	{ 0x6686, 0xDDBF }, { 0x6687, 0xB776 }, { 0x6688, 0xB777 }, { 0x6689, 0xB775 }, { 0x668A, 0xDDC4 }, { 0x668B, 0xDDC3 }, { 0x668C, 0xDDC0 }, { 0x668D, 0xB77B }, 
-	{ 0x6690, 0xDDC2 }, { 0x6691, 0xB4BB }, { 0x6694, 0xDDC6 }, { 0x6695, 0xDDC1 }, { 0x6696, 0xB778 }, { 0x6697, 0xB774 }, { 0x6698, 0xB77A }, { 0x6699, 0xDDC5 }, 
-	{ 0x669D, 0xBA5C }, { 0x669F, 0xE1F8 }, { 0x66A0, 0xE1F7 }, { 0x66A1, 0xE1F6 }, { 0x66A2, 0xBA5A }, { 0x66A8, 0xBA5B }, { 0x66A9, 0xE5C5 }, { 0x66AA, 0xE5C8 }, 
-	{ 0x66AB, 0xBCC8 }, { 0x66AE, 0xBCC7 }, { 0x66AF, 0xE5C9 }, { 0x66B0, 0xE5C4 }, { 0x66B1, 0xBCCA }, { 0x66B2, 0xE5C6 }, { 0x66B4, 0xBCC9 }, { 0x66B5, 0xE5C3 }, 
-	{ 0x66B7, 0xE5C7 }, { 0x66B8, 0xBEE9 }, { 0x66B9, 0xBEE6 }, { 0x66BA, 0xE9BB }, { 0x66BB, 0xE9BA }, { 0x66BD, 0xE9B9 }, { 0x66BE, 0xE9B4 }, { 0x66C0, 0xE9B5 }, 
-	{ 0x66C4, 0xBEE7 }, { 0x66C6, 0xBEE4 }, { 0x66C7, 0xBEE8 }, { 0x66C8, 0xE9B3 }, { 0x66C9, 0xBEE5 }, { 0x66CA, 0xE9B6 }, { 0x66CB, 0xE9B7 }, { 0x66CC, 0xE9BC }, 
-	{ 0x66CF, 0xE9B8 }, { 0x66D2, 0xECF2 }, { 0x66D6, 0xC0C7 }, { 0x66D8, 0xEFDC }, { 0x66D9, 0xC0C6 }, { 0x66DA, 0xEFDA }, { 0x66DB, 0xEFDB }, { 0x66DC, 0xC260 }, 
-	{ 0x66DD, 0xC36E }, { 0x66DE, 0xF24B }, { 0x66E0, 0xC36D }, { 0x66E3, 0xF451 }, { 0x66E4, 0xF452 }, { 0x66E6, 0xC466 }, { 0x66E8, 0xF450 }, { 0x66E9, 0xC4E4 }, 
-	{ 0x66EB, 0xF7DF }, { 0x66EC, 0xC5CE }, { 0x66ED, 0xF8AA }, { 0x66EE, 0xF8AB }, { 0x66F0, 0xA4EA }, { 0x66F2, 0xA6B1 }, { 0x66F3, 0xA6B2 }, { 0x66F4, 0xA7F3 }, 
-	{ 0x66F6, 0xCCD1 }, { 0x66F7, 0xAC54 }, { 0x66F8, 0xAED1 }, { 0x66F9, 0xB1E4 }, { 0x66FC, 0xB0D2 }, { 0x66FE, 0xB4BF }, { 0x66FF, 0xB4C0 }, { 0x6700, 0xB3CC }, 
-	{ 0x6701, 0xD9A9 }, { 0x6703, 0xB77C }, { 0x6704, 0xE1FA }, { 0x6705, 0xE1F9 }, { 0x6708, 0xA4EB }, { 0x6709, 0xA6B3 }, { 0x670A, 0xCCD2 }, { 0x670B, 0xAA42 }, 
-	{ 0x670D, 0xAA41 }, { 0x670F, 0xCEF9 }, { 0x6710, 0xCEFA }, { 0x6712, 0xD1D7 }, { 0x6713, 0xD1D8 }, { 0x6714, 0xAED2 }, { 0x6715, 0xAED3 }, { 0x6717, 0xAED4 }, 
-	{ 0x6718, 0xD5AF }, { 0x671B, 0xB1E6 }, { 0x671D, 0xB4C2 }, { 0x671F, 0xB4C1 }, { 0x6720, 0xDDC8 }, { 0x6721, 0xDF7A }, { 0x6722, 0xE1FB }, { 0x6723, 0xE9BD }, 
-	{ 0x6726, 0xC261 }, { 0x6727, 0xC467 }, { 0x6728, 0xA4EC }, { 0x672A, 0xA5BC }, { 0x672B, 0xA5BD }, { 0x672C, 0xA5BB }, { 0x672D, 0xA5BE }, { 0x672E, 0xA5BA }, 
-	{ 0x6731, 0xA6B6 }, { 0x6733, 0xC9F6 }, { 0x6734, 0xA6B5 }, { 0x6735, 0xA6B7 }, { 0x6738, 0xC9F1 }, { 0x6739, 0xC9F0 }, { 0x673A, 0xC9F3 }, { 0x673B, 0xC9F2 }, 
-	{ 0x673C, 0xC9F5 }, { 0x673D, 0xA6B4 }, { 0x673E, 0xC9EF }, { 0x673F, 0xC9F4 }, { 0x6745, 0xCAFD }, { 0x6746, 0xA7FD }, { 0x6747, 0xCAFE }, { 0x6748, 0xCB43 }, 
-	{ 0x6749, 0xA7FC }, { 0x674B, 0xCB47 }, { 0x674C, 0xCB42 }, { 0x674D, 0xCB45 }, { 0x674E, 0xA7F5 }, { 0x674F, 0xA7F6 }, { 0x6750, 0xA7F7 }, { 0x6751, 0xA7F8 }, 
-	{ 0x6753, 0xA840 }, { 0x6755, 0xCB41 }, { 0x6756, 0xA7FA }, { 0x6757, 0xA841 }, { 0x6759, 0xCB40 }, { 0x675A, 0xCB46 }, { 0x675C, 0xA7F9 }, { 0x675D, 0xCB44 }, 
-	{ 0x675E, 0xA7FB }, { 0x675F, 0xA7F4 }, { 0x6760, 0xA7FE }, { 0x676A, 0xAA57 }, { 0x676C, 0xCCD4 }, { 0x676D, 0xAA43 }, { 0x676F, 0xAA4D }, { 0x6770, 0xAA4E }, 
-	{ 0x6771, 0xAA46 }, { 0x6772, 0xAA58 }, { 0x6773, 0xAA48 }, { 0x6774, 0xCCDC }, { 0x6775, 0xAA53 }, { 0x6776, 0xCCD7 }, { 0x6777, 0xAA49 }, { 0x6778, 0xCCE6 }, 
-	{ 0x6779, 0xCCE7 }, { 0x677A, 0xCCDF }, { 0x677B, 0xCCD8 }, { 0x677C, 0xAA56 }, { 0x677D, 0xCCE4 }, { 0x677E, 0xAA51 }, { 0x677F, 0xAA4F }, { 0x6781, 0xCCE5 }, 
-	{ 0x6783, 0xCCE3 }, { 0x6784, 0xCCDB }, { 0x6785, 0xCCD3 }, { 0x6786, 0xCCDA }, { 0x6787, 0xAA4A }, { 0x6789, 0xAA50 }, { 0x678B, 0xAA44 }, { 0x678C, 0xCCDE }, 
-	{ 0x678D, 0xCCDD }, { 0x678E, 0xCCD5 }, { 0x6790, 0xAA52 }, { 0x6791, 0xCCE1 }, { 0x6792, 0xCCD6 }, { 0x6793, 0xAA55 }, { 0x6794, 0xCCE8 }, { 0x6795, 0xAA45 }, 
-	{ 0x6797, 0xAA4C }, { 0x6798, 0xCCD9 }, { 0x6799, 0xCCE2 }, { 0x679A, 0xAA54 }, { 0x679C, 0xAA47 }, { 0x679D, 0xAA4B }, { 0x679F, 0xCCE0 }, { 0x67AE, 0xCF5B }, 
-	{ 0x67AF, 0xAC5C }, { 0x67B0, 0xAC69 }, { 0x67B2, 0xCF56 }, { 0x67B3, 0xCF4C }, { 0x67B4, 0xAC62 }, { 0x67B5, 0xCF4A }, { 0x67B6, 0xAC5B }, { 0x67B7, 0xCF45 }, 
-	{ 0x67B8, 0xAC65 }, { 0x67B9, 0xCF52 }, { 0x67BA, 0xCEFE }, { 0x67BB, 0xCF41 }, { 0x67C0, 0xCF44 }, { 0x67C1, 0xCEFB }, { 0x67C2, 0xCF51 }, { 0x67C3, 0xCF61 }, 
-	{ 0x67C4, 0xAC60 }, { 0x67C5, 0xCF46 }, { 0x67C6, 0xCF58 }, { 0x67C8, 0xCEFD }, { 0x67C9, 0xCF5F }, { 0x67CA, 0xCF60 }, { 0x67CB, 0xCF63 }, { 0x67CC, 0xCF5A }, 
-	{ 0x67CD, 0xCF4B }, { 0x67CE, 0xCF53 }, { 0x67CF, 0xAC66 }, { 0x67D0, 0xAC59 }, { 0x67D1, 0xAC61 }, { 0x67D2, 0xAC6D }, { 0x67D3, 0xAC56 }, { 0x67D4, 0xAC58 }, 
-	{ 0x67D8, 0xCF43 }, { 0x67D9, 0xAC6A }, { 0x67DA, 0xAC63 }, { 0x67DB, 0xCF5D }, { 0x67DC, 0xCF40 }, { 0x67DD, 0xAC6C }, { 0x67DE, 0xAC67 }, { 0x67DF, 0xCF49 }, 
-	{ 0x67E2, 0xAC6B }, { 0x67E3, 0xCF50 }, { 0x67E4, 0xCF48 }, { 0x67E5, 0xAC64 }, { 0x67E6, 0xCF5C }, { 0x67E7, 0xCF54 }, { 0x67E9, 0xAC5E }, { 0x67EA, 0xCF62 }, 
-	{ 0x67EB, 0xCF47 }, { 0x67EC, 0xAC5A }, { 0x67ED, 0xCF59 }, { 0x67EE, 0xCF4F }, { 0x67EF, 0xAC5F }, { 0x67F0, 0xCF55 }, { 0x67F1, 0xAC57 }, { 0x67F2, 0xCEFC }, 
-	{ 0x67F3, 0xAC68 }, { 0x67F4, 0xAEE3 }, { 0x67F5, 0xAC5D }, { 0x67F6, 0xCF4E }, { 0x67F7, 0xCF4D }, { 0x67F8, 0xCF42 }, { 0x67FA, 0xCF5E }, { 0x67FC, 0xCF57 }, 
-	{ 0x67FF, 0xAC55 }, { 0x6812, 0xD1EC }, { 0x6813, 0xAEEA }, { 0x6814, 0xD1ED }, { 0x6816, 0xD1E1 }, { 0x6817, 0xAEDF }, { 0x6818, 0xAEEB }, { 0x681A, 0xD1DA }, 
-	{ 0x681C, 0xD1E3 }, { 0x681D, 0xD1EB }, { 0x681F, 0xD1D9 }, { 0x6820, 0xD1F4 }, { 0x6821, 0xAED5 }, { 0x6825, 0xD1F3 }, { 0x6826, 0xD1EE }, { 0x6828, 0xD1EF }, 
-	{ 0x6829, 0xAEDD }, { 0x682A, 0xAEE8 }, { 0x682B, 0xD1E5 }, { 0x682D, 0xD1E6 }, { 0x682E, 0xD1F0 }, { 0x682F, 0xD1E7 }, { 0x6831, 0xD1E2 }, { 0x6832, 0xD1DC }, 
-	{ 0x6833, 0xD1DD }, { 0x6834, 0xD1EA }, { 0x6835, 0xD1E4 }, { 0x6838, 0xAED6 }, { 0x6839, 0xAEDA }, { 0x683A, 0xD1F2 }, { 0x683B, 0xD1DE }, { 0x683C, 0xAEE6 }, 
-	{ 0x683D, 0xAEE2 }, { 0x6840, 0xAEE5 }, { 0x6841, 0xAEEC }, { 0x6842, 0xAEDB }, { 0x6843, 0xAEE7 }, { 0x6844, 0xD1E9 }, { 0x6845, 0xAEE9 }, { 0x6846, 0xAED8 }, 
-	{ 0x6848, 0xAED7 }, { 0x6849, 0xD1DB }, { 0x684B, 0xD1DF }, { 0x684C, 0xAEE0 }, { 0x684D, 0xD1F1 }, { 0x684E, 0xD1E8 }, { 0x684F, 0xD1E0 }, { 0x6850, 0xAEE4 }, 
-	{ 0x6851, 0xAEE1 }, { 0x6853, 0xAED9 }, { 0x6854, 0xAEDC }, { 0x686B, 0xD5C4 }, { 0x686D, 0xD5B4 }, { 0x686E, 0xD5B5 }, { 0x686F, 0xD5B9 }, { 0x6871, 0xD5C8 }, 
-	{ 0x6872, 0xD5C5 }, { 0x6874, 0xD5BE }, { 0x6875, 0xD5BD }, { 0x6876, 0xB1ED }, { 0x6877, 0xD5C1 }, { 0x6878, 0xD5D0 }, { 0x6879, 0xD5B0 }, { 0x687B, 0xD5D1 }, 
-	{ 0x687C, 0xD5C3 }, { 0x687D, 0xD5D5 }, { 0x687E, 0xD5C9 }, { 0x687F, 0xB1EC }, { 0x6880, 0xD5C7 }, { 0x6881, 0xB1E7 }, { 0x6882, 0xB1FC }, { 0x6883, 0xB1F2 }, 
-	{ 0x6885, 0xB1F6 }, { 0x6886, 0xB1F5 }, { 0x6887, 0xD5B1 }, { 0x6889, 0xD5CE }, { 0x688A, 0xD5D4 }, { 0x688B, 0xD5CC }, { 0x688C, 0xD5D3 }, { 0x688F, 0xD5C0 }, 
-	{ 0x6890, 0xD5B2 }, { 0x6891, 0xD5D2 }, { 0x6892, 0xD5C2 }, { 0x6893, 0xB1EA }, { 0x6894, 0xB1F7 }, { 0x6896, 0xD5CB }, { 0x6897, 0xB1F0 }, { 0x689B, 0xD5CA }, 
-	{ 0x689C, 0xD5B3 }, { 0x689D, 0xB1F8 }, { 0x689F, 0xB1FA }, { 0x68A0, 0xD5CD }, { 0x68A1, 0xB1FB }, { 0x68A2, 0xB1E9 }, { 0x68A3, 0xD5BA }, { 0x68A4, 0xD5CF }, 
-	{ 0x68A7, 0xB1EF }, { 0x68A8, 0xB1F9 }, { 0x68A9, 0xD5BC }, { 0x68AA, 0xD5C6 }, { 0x68AB, 0xD5B7 }, { 0x68AC, 0xD5BB }, { 0x68AD, 0xB1F4 }, { 0x68AE, 0xD5B6 }, 
-	{ 0x68AF, 0xB1E8 }, { 0x68B0, 0xB1F1 }, { 0x68B1, 0xB1EE }, { 0x68B2, 0xD5BF }, { 0x68B3, 0xAEDE }, { 0x68B4, 0xD9C0 }, { 0x68B5, 0xB1EB }, { 0x68C4, 0xB1F3 }, 
-	{ 0x68C6, 0xD9C3 }, { 0x68C7, 0xD9D9 }, { 0x68C8, 0xD9CE }, { 0x68C9, 0xB4D6 }, { 0x68CB, 0xB4D1 }, { 0x68CC, 0xD9BD }, { 0x68CD, 0xB4D2 }, { 0x68CE, 0xD9CD }, 
-	{ 0x68D0, 0xD9C6 }, { 0x68D1, 0xD9D3 }, { 0x68D2, 0xB4CE }, { 0x68D3, 0xD9AB }, { 0x68D4, 0xD9D5 }, { 0x68D5, 0xB4C4 }, { 0x68D6, 0xD9B3 }, { 0x68D7, 0xB4C7 }, 
-	{ 0x68D8, 0xB4C6 }, { 0x68DA, 0xB4D7 }, { 0x68DC, 0xD9AD }, { 0x68DD, 0xD9CF }, { 0x68DE, 0xD9D0 }, { 0x68DF, 0xB4C9 }, { 0x68E0, 0xB4C5 }, { 0x68E1, 0xD9BB }, 
-	{ 0x68E3, 0xB4D0 }, { 0x68E4, 0xD9B6 }, { 0x68E6, 0xD9D1 }, { 0x68E7, 0xB4CC }, { 0x68E8, 0xD9C9 }, { 0x68E9, 0xD9D6 }, { 0x68EA, 0xD9B0 }, { 0x68EB, 0xD9B5 }, 
-	{ 0x68EC, 0xD9AF }, { 0x68EE, 0xB4CB }, { 0x68EF, 0xD9C2 }, { 0x68F0, 0xDDDE }, { 0x68F1, 0xD9B1 }, { 0x68F2, 0xB4CF }, { 0x68F3, 0xD9BA }, { 0x68F4, 0xD9D2 }, 
-	{ 0x68F5, 0xB4CA }, { 0x68F6, 0xD9B7 }, { 0x68F7, 0xD9B4 }, { 0x68F8, 0xD9C5 }, { 0x68F9, 0xB4CD }, { 0x68FA, 0xB4C3 }, { 0x68FB, 0xB4D9 }, { 0x68FC, 0xD9C8 }, 
-	{ 0x68FD, 0xD9C7 }, { 0x6904, 0xD9AC }, { 0x6905, 0xB4C8 }, { 0x6906, 0xD9D4 }, { 0x6907, 0xD9BC }, { 0x6908, 0xD9BE }, { 0x690A, 0xD9CB }, { 0x690B, 0xD9CA }, 
-	{ 0x690C, 0xD9AA }, { 0x690D, 0xB4D3 }, { 0x690E, 0xB4D5 }, { 0x690F, 0xD9B2 }, { 0x6910, 0xD9B9 }, { 0x6911, 0xD9C1 }, { 0x6912, 0xB4D4 }, { 0x6913, 0xD9B8 }, 
-	{ 0x6914, 0xD9C4 }, { 0x6915, 0xD9D7 }, { 0x6917, 0xD9CC }, { 0x6925, 0xD9D8 }, { 0x692A, 0xD9AE }, { 0x692F, 0xDDF2 }, { 0x6930, 0xB7A6 }, { 0x6932, 0xDDF0 }, 
-	{ 0x6933, 0xDDDB }, { 0x6934, 0xDDE0 }, { 0x6935, 0xDDD9 }, { 0x6937, 0xDDEC }, { 0x6938, 0xDDCB }, { 0x6939, 0xDDD2 }, { 0x693B, 0xDDEA }, { 0x693C, 0xDDF4 }, 
-	{ 0x693D, 0xDDDC }, { 0x693F, 0xDDCF }, { 0x6940, 0xDDE2 }, { 0x6941, 0xDDE7 }, { 0x6942, 0xDDD3 }, { 0x6944, 0xDDE4 }, { 0x6945, 0xDDD0 }, { 0x6948, 0xDDD7 }, 
-	{ 0x6949, 0xDDD8 }, { 0x694A, 0xB7A8 }, { 0x694B, 0xDDEB }, { 0x694C, 0xDDE9 }, { 0x694E, 0xDDCC }, { 0x694F, 0xDDEE }, { 0x6951, 0xDDEF }, { 0x6952, 0xDDF1 }, 
-	{ 0x6953, 0xB7AC }, { 0x6954, 0xB7A4 }, { 0x6956, 0xD5B8 }, { 0x6957, 0xDDD4 }, { 0x6958, 0xDDE6 }, { 0x6959, 0xDDD5 }, { 0x695A, 0xB7A1 }, { 0x695B, 0xB7B1 }, 
-	{ 0x695C, 0xDDED }, { 0x695D, 0xB7AF }, { 0x695E, 0xB7AB }, { 0x695F, 0xDDCA }, { 0x6960, 0xB7A3 }, { 0x6962, 0xDDCD }, { 0x6963, 0xB7B0 }, { 0x6965, 0xDDDD }, 
-	{ 0x6966, 0xDDC9 }, { 0x6968, 0xB7A9 }, { 0x6969, 0xDDE1 }, { 0x696A, 0xDDD1 }, { 0x696B, 0xB7AA }, { 0x696C, 0xDDDA }, { 0x696D, 0xB77E }, { 0x696E, 0xB4D8 }, 
-	{ 0x696F, 0xDDE3 }, { 0x6970, 0xD9BF }, { 0x6971, 0xDDCE }, { 0x6974, 0xDDE8 }, { 0x6975, 0xB7A5 }, { 0x6976, 0xDDE5 }, { 0x6977, 0xB7A2 }, { 0x6978, 0xDDDF }, 
-	{ 0x6979, 0xB7AD }, { 0x697A, 0xDDD6 }, { 0x697B, 0xDDF3 }, { 0x6982, 0xB7A7 }, { 0x6983, 0xDEC6 }, { 0x6986, 0xB7AE }, { 0x698D, 0xE24A }, { 0x698E, 0xE248 }, 
-	{ 0x6990, 0xE25E }, { 0x6991, 0xE246 }, { 0x6993, 0xE258 }, { 0x6994, 0xB77D }, { 0x6995, 0xBA5F }, { 0x6996, 0xE242 }, { 0x6997, 0xE25D }, { 0x6999, 0xE247 }, 
-	{ 0x699A, 0xE255 }, { 0x699B, 0xBA64 }, { 0x699C, 0xBA5D }, { 0x699E, 0xE25B }, { 0x69A0, 0xE240 }, { 0x69A1, 0xE25A }, { 0x69A3, 0xBA6F }, { 0x69A4, 0xE251 }, 
-	{ 0x69A5, 0xE261 }, { 0x69A6, 0xBA6D }, { 0x69A7, 0xE249 }, { 0x69A8, 0xBA5E }, { 0x69A9, 0xE24B }, { 0x69AA, 0xE259 }, { 0x69AB, 0xBA67 }, { 0x69AC, 0xE244 }, 
-	{ 0x69AD, 0xBA6B }, { 0x69AE, 0xBA61 }, { 0x69AF, 0xE24D }, { 0x69B0, 0xE243 }, { 0x69B1, 0xE1FC }, { 0x69B3, 0xE257 }, { 0x69B4, 0xBA68 }, { 0x69B5, 0xE260 }, 
-	{ 0x69B6, 0xE1FD }, { 0x69B7, 0xBA65 }, { 0x69B9, 0xE253 }, { 0x69BB, 0xBA66 }, { 0x69BC, 0xE245 }, { 0x69BD, 0xE250 }, { 0x69BE, 0xE24C }, { 0x69BF, 0xE24E }, 
-	{ 0x69C1, 0xBA60 }, { 0x69C2, 0xE25F }, { 0x69C3, 0xBA6E }, { 0x69C4, 0xE24F }, { 0x69C6, 0xE262 }, { 0x69C9, 0xE1FE }, { 0x69CA, 0xE254 }, { 0x69CB, 0xBA63 }, 
-	{ 0x69CC, 0xBA6C }, { 0x69CD, 0xBA6A }, { 0x69CE, 0xE241 }, { 0x69CF, 0xE256 }, { 0x69D0, 0xBA69 }, { 0x69D3, 0xBA62 }, { 0x69D4, 0xE252 }, { 0x69D9, 0xE25C }, 
-	{ 0x69E2, 0xE5D5 }, { 0x69E4, 0xE5D1 }, { 0x69E5, 0xE5CD }, { 0x69E6, 0xE5E1 }, { 0x69E7, 0xE5DE }, { 0x69E8, 0xBCCD }, { 0x69EB, 0xE5E5 }, { 0x69EC, 0xE5D4 }, 
-	{ 0x69ED, 0xBCD8 }, { 0x69EE, 0xE5DB }, { 0x69F1, 0xE5D0 }, { 0x69F2, 0xE5DA }, { 0x69F3, 0xBCD5 }, { 0x69F4, 0xE5EE }, { 0x69F6, 0xE5EB }, { 0x69F7, 0xE5DD }, 
-	{ 0x69F8, 0xE5CE }, { 0x69FB, 0xE5E2 }, { 0x69FC, 0xE5E4 }, { 0x69FD, 0xBCD1 }, { 0x69FE, 0xE5D8 }, { 0x69FF, 0xE5D3 }, { 0x6A00, 0xE5CA }, { 0x6A01, 0xBCCE }, 
-	{ 0x6A02, 0xBCD6 }, { 0x6A04, 0xE5E7 }, { 0x6A05, 0xBCD7 }, { 0x6A06, 0xE5CB }, { 0x6A07, 0xE5ED }, { 0x6A08, 0xE5E0 }, { 0x6A09, 0xE5E6 }, { 0x6A0A, 0xBCD4 }, 
-	{ 0x6A0D, 0xE5E3 }, { 0x6A0F, 0xE5EA }, { 0x6A11, 0xBCD9 }, { 0x6A13, 0xBCD3 }, { 0x6A14, 0xE5DC }, { 0x6A15, 0xE5CF }, { 0x6A16, 0xE5EF }, { 0x6A17, 0xE5CC }, 
-	{ 0x6A18, 0xE5E8 }, { 0x6A19, 0xBCD0 }, { 0x6A1B, 0xE5D6 }, { 0x6A1D, 0xE5D7 }, { 0x6A1E, 0xBCCF }, { 0x6A1F, 0xBCCC }, { 0x6A20, 0xE5D2 }, { 0x6A21, 0xBCD2 }, 
-	{ 0x6A23, 0xBCCB }, { 0x6A25, 0xE5E9 }, { 0x6A26, 0xE5EC }, { 0x6A27, 0xE5D9 }, { 0x6A28, 0xE9CA }, { 0x6A32, 0xE9C2 }, { 0x6A34, 0xE9BE }, { 0x6A35, 0xBEF6 }, 
-	{ 0x6A38, 0xBEEB }, { 0x6A39, 0xBEF0 }, { 0x6A3A, 0xBEEC }, { 0x6A3B, 0xE9CC }, { 0x6A3C, 0xE9D7 }, { 0x6A3D, 0xBEEA }, { 0x6A3E, 0xE9C4 }, { 0x6A3F, 0xE9CD }, 
-	{ 0x6A40, 0xE5DF }, { 0x6A41, 0xE9CE }, { 0x6A44, 0xBEF1 }, { 0x6A46, 0xE9DD }, { 0x6A47, 0xBEF5 }, { 0x6A48, 0xBEF8 }, { 0x6A49, 0xE9C0 }, { 0x6A4B, 0xBEF4 }, 
-	{ 0x6A4D, 0xE9DB }, { 0x6A4E, 0xE9DC }, { 0x6A4F, 0xE9D2 }, { 0x6A50, 0xE9D1 }, { 0x6A51, 0xE9C9 }, { 0x6A54, 0xE9D3 }, { 0x6A55, 0xE9DA }, { 0x6A56, 0xE9D9 }, 
-	{ 0x6A58, 0xBEEF }, { 0x6A59, 0xBEED }, { 0x6A5A, 0xE9CB }, { 0x6A5B, 0xE9C8 }, { 0x6A5D, 0xE9C5 }, { 0x6A5E, 0xE9D8 }, { 0x6A5F, 0xBEF7 }, { 0x6A60, 0xE9D6 }, 
-	{ 0x6A61, 0xBEF3 }, { 0x6A62, 0xBEF2 }, { 0x6A64, 0xE9D0 }, { 0x6A66, 0xE9BF }, { 0x6A67, 0xE9C1 }, { 0x6A68, 0xE9C3 }, { 0x6A69, 0xE9D5 }, { 0x6A6A, 0xE9CF }, 
-	{ 0x6A6B, 0xBEEE }, { 0x6A6D, 0xE9C6 }, { 0x6A6F, 0xE9D4 }, { 0x6A76, 0xE9C7 }, { 0x6A7E, 0xC0CF }, { 0x6A7F, 0xED45 }, { 0x6A80, 0xC0C8 }, { 0x6A81, 0xECF5 }, 
-	{ 0x6A83, 0xED41 }, { 0x6A84, 0xC0CA }, { 0x6A85, 0xED48 }, { 0x6A87, 0xECFC }, { 0x6A89, 0xECF7 }, { 0x6A8C, 0xED49 }, { 0x6A8D, 0xECF3 }, { 0x6A8E, 0xECFE }, 
-	{ 0x6A90, 0xC0D1 }, { 0x6A91, 0xED44 }, { 0x6A92, 0xED4A }, { 0x6A93, 0xECFD }, { 0x6A94, 0xC0C9 }, { 0x6A95, 0xED40 }, { 0x6A96, 0xECF4 }, { 0x6A97, 0xC0D0 }, 
-	{ 0x6A9A, 0xED47 }, { 0x6A9B, 0xECF9 }, { 0x6A9C, 0xC0CC }, { 0x6A9E, 0xECFB }, { 0x6A9F, 0xECF8 }, { 0x6AA0, 0xC0D2 }, { 0x6AA1, 0xECFA }, { 0x6AA2, 0xC0CB }, 
-	{ 0x6AA3, 0xC0CE }, { 0x6AA4, 0xED43 }, { 0x6AA5, 0xECF6 }, { 0x6AA6, 0xED46 }, { 0x6AA8, 0xED42 }, { 0x6AAC, 0xC263 }, { 0x6AAD, 0xEFE7 }, { 0x6AAE, 0xC268 }, 
-	{ 0x6AAF, 0xC269 }, { 0x6AB3, 0xC262 }, { 0x6AB4, 0xEFE6 }, { 0x6AB6, 0xEFE3 }, { 0x6AB7, 0xEFE4 }, { 0x6AB8, 0xC266 }, { 0x6AB9, 0xEFDE }, { 0x6ABA, 0xEFE2 }, 
-	{ 0x6ABB, 0xC265 }, { 0x6ABD, 0xEFDF }, { 0x6AC2, 0xC267 }, { 0x6AC3, 0xC264 }, { 0x6AC5, 0xEFDD }, { 0x6AC6, 0xEFE1 }, { 0x6AC7, 0xEFE5 }, { 0x6ACB, 0xF251 }, 
-	{ 0x6ACC, 0xF24E }, { 0x6ACD, 0xF257 }, { 0x6ACF, 0xF256 }, { 0x6AD0, 0xF254 }, { 0x6AD1, 0xF24F }, { 0x6AD3, 0xC372 }, { 0x6AD9, 0xF250 }, { 0x6ADA, 0xC371 }, 
-	{ 0x6ADB, 0xC0CD }, { 0x6ADC, 0xF253 }, { 0x6ADD, 0xC370 }, { 0x6ADE, 0xF258 }, { 0x6ADF, 0xF252 }, { 0x6AE0, 0xF24D }, { 0x6AE1, 0xEFE0 }, { 0x6AE5, 0xC36F }, 
-	{ 0x6AE7, 0xF24C }, { 0x6AE8, 0xF456 }, { 0x6AEA, 0xF455 }, { 0x6AEB, 0xF255 }, { 0x6AEC, 0xC468 }, { 0x6AEE, 0xF459 }, { 0x6AEF, 0xF45A }, { 0x6AF0, 0xF454 }, 
-	{ 0x6AF1, 0xF458 }, { 0x6AF3, 0xF453 }, { 0x6AF8, 0xF5D1 }, { 0x6AF9, 0xF457 }, { 0x6AFA, 0xC4E7 }, { 0x6AFB, 0xC4E5 }, { 0x6AFC, 0xF5CF }, { 0x6B00, 0xF5D2 }, 
-	{ 0x6B02, 0xF5CE }, { 0x6B03, 0xF5D0 }, { 0x6B04, 0xC4E6 }, { 0x6B08, 0xF6E5 }, { 0x6B09, 0xF6E6 }, { 0x6B0A, 0xC576 }, { 0x6B0B, 0xF6E4 }, { 0x6B0F, 0xF7E2 }, 
-	{ 0x6B10, 0xC5CF }, { 0x6B11, 0xF7E0 }, { 0x6B12, 0xF7E1 }, { 0x6B13, 0xF8AC }, { 0x6B16, 0xC656 }, { 0x6B17, 0xF8F3 }, { 0x6B18, 0xF8F1 }, { 0x6B19, 0xF8F2 }, 
-	{ 0x6B1A, 0xF8F4 }, { 0x6B1E, 0xF9BB }, { 0x6B20, 0xA4ED }, { 0x6B21, 0xA6B8 }, { 0x6B23, 0xAA59 }, { 0x6B25, 0xCCE9 }, { 0x6B28, 0xCF64 }, { 0x6B2C, 0xD1F5 }, 
-	{ 0x6B2D, 0xD1F7 }, { 0x6B2F, 0xD1F6 }, { 0x6B31, 0xD1F8 }, { 0x6B32, 0xB1FD }, { 0x6B33, 0xD5D7 }, { 0x6B34, 0xD1F9 }, { 0x6B36, 0xD5D6 }, { 0x6B37, 0xD5D8 }, 
-	{ 0x6B38, 0xD5D9 }, { 0x6B39, 0xD9DA }, { 0x6B3A, 0xB4DB }, { 0x6B3B, 0xD9DB }, { 0x6B3C, 0xD9DD }, { 0x6B3D, 0xB4DC }, { 0x6B3E, 0xB4DA }, { 0x6B3F, 0xD9DC }, 
-	{ 0x6B41, 0xDDFA }, { 0x6B42, 0xDDF8 }, { 0x6B43, 0xDDF7 }, { 0x6B45, 0xDDF6 }, { 0x6B46, 0xDDF5 }, { 0x6B47, 0xB7B2 }, { 0x6B48, 0xDDF9 }, { 0x6B49, 0xBA70 }, 
-	{ 0x6B4A, 0xE263 }, { 0x6B4B, 0xE265 }, { 0x6B4C, 0xBA71 }, { 0x6B4D, 0xE264 }, { 0x6B4E, 0xBCDB }, { 0x6B50, 0xBCDA }, { 0x6B51, 0xE5F0 }, { 0x6B54, 0xE9DF }, 
-	{ 0x6B55, 0xE9DE }, { 0x6B56, 0xE9E0 }, { 0x6B59, 0xBEF9 }, { 0x6B5B, 0xED4B }, { 0x6B5C, 0xC0D3 }, { 0x6B5E, 0xEFE8 }, { 0x6B5F, 0xC26A }, { 0x6B60, 0xF259 }, 
-	{ 0x6B61, 0xC577 }, { 0x6B62, 0xA4EE }, { 0x6B63, 0xA5BF }, { 0x6B64, 0xA6B9 }, { 0x6B65, 0xA842 }, { 0x6B66, 0xAA5A }, { 0x6B67, 0xAA5B }, { 0x6B6A, 0xAC6E }, 
-	{ 0x6B6D, 0xD1FA }, { 0x6B72, 0xB7B3 }, { 0x6B76, 0xE6D1 }, { 0x6B77, 0xBEFA }, { 0x6B78, 0xC26B }, { 0x6B79, 0xA4EF }, { 0x6B7B, 0xA6BA }, { 0x6B7E, 0xCCEB }, 
-	{ 0x6B7F, 0xAA5C }, { 0x6B80, 0xCCEA }, { 0x6B82, 0xCF65 }, { 0x6B83, 0xAC6F }, { 0x6B84, 0xCF66 }, { 0x6B86, 0xAC70 }, { 0x6B88, 0xD1FC }, { 0x6B89, 0xAEEE }, 
-	{ 0x6B8A, 0xAEED }, { 0x6B8C, 0xD5DE }, { 0x6B8D, 0xD5DC }, { 0x6B8E, 0xD5DD }, { 0x6B8F, 0xD5DB }, { 0x6B91, 0xD5DA }, { 0x6B94, 0xD9DE }, { 0x6B95, 0xD9E1 }, 
-	{ 0x6B96, 0xB4DE }, { 0x6B97, 0xD9DF }, { 0x6B98, 0xB4DD }, { 0x6B99, 0xD9E0 }, { 0x6B9B, 0xDDFB }, { 0x6B9E, 0xE266 }, { 0x6B9F, 0xE267 }, { 0x6BA0, 0xE268 }, 
-	{ 0x6BA2, 0xE5F3 }, { 0x6BA3, 0xE5F2 }, { 0x6BA4, 0xBCDC }, { 0x6BA5, 0xE5F1 }, { 0x6BA6, 0xE5F4 }, { 0x6BA7, 0xE9E1 }, { 0x6BAA, 0xE9E2 }, { 0x6BAB, 0xE9E3 }, 
-	{ 0x6BAD, 0xED4C }, { 0x6BAE, 0xC0D4 }, { 0x6BAF, 0xC26C }, { 0x6BB0, 0xF25A }, { 0x6BB2, 0xC4E8 }, { 0x6BB3, 0xC95F }, { 0x6BB5, 0xAC71 }, { 0x6BB6, 0xCF67 }, 
-	{ 0x6BB7, 0xAEEF }, { 0x6BBA, 0xB1FE }, { 0x6BBC, 0xB4DF }, { 0x6BBD, 0xD9E2 }, { 0x6BBF, 0xB7B5 }, { 0x6BC0, 0xB7B4 }, { 0x6BC3, 0xE269 }, { 0x6BC4, 0xE26A }, 
-	{ 0x6BC5, 0xBCDD }, { 0x6BC6, 0xBCDE }, { 0x6BC7, 0xE9E5 }, { 0x6BC8, 0xE9E4 }, { 0x6BC9, 0xEFE9 }, { 0x6BCA, 0xF7E3 }, { 0x6BCB, 0xA4F0 }, { 0x6BCC, 0xC960 }, 
-	{ 0x6BCD, 0xA5C0 }, { 0x6BCF, 0xA843 }, { 0x6BD0, 0xCB48 }, { 0x6BD2, 0xAC72 }, { 0x6BD3, 0xB7B6 }, { 0x6BD4, 0xA4F1 }, { 0x6BD6, 0xCF68 }, { 0x6BD7, 0xAC73 }, 
-	{ 0x6BD8, 0xCF69 }, { 0x6BDA, 0xC0D5 }, { 0x6BDB, 0xA4F2 }, { 0x6BDE, 0xCCEC }, { 0x6BE0, 0xCF6A }, { 0x6BE2, 0xD242 }, { 0x6BE3, 0xD241 }, { 0x6BE4, 0xD1FE }, 
-	{ 0x6BE6, 0xD1FD }, { 0x6BE7, 0xD243 }, { 0x6BE8, 0xD240 }, { 0x6BEB, 0xB240 }, { 0x6BEC, 0xB241 }, { 0x6BEF, 0xB4E0 }, { 0x6BF0, 0xD9E3 }, { 0x6BF2, 0xD9E4 }, 
-	{ 0x6BF3, 0xD9E5 }, { 0x6BF7, 0xDE41 }, { 0x6BF8, 0xDE42 }, { 0x6BF9, 0xDE40 }, { 0x6BFB, 0xDDFD }, { 0x6BFC, 0xDDFE }, { 0x6BFD, 0xB7B7 }, { 0x6BFE, 0xE26B }, 
-	{ 0x6BFF, 0xE5F7 }, { 0x6C00, 0xE5F6 }, { 0x6C01, 0xE5F5 }, { 0x6C02, 0xE5F8 }, { 0x6C03, 0xE9E7 }, { 0x6C04, 0xE9E6 }, { 0x6C05, 0xBEFB }, { 0x6C06, 0xE9E8 }, 
-	{ 0x6C08, 0xC0D6 }, { 0x6C09, 0xED4D }, { 0x6C0B, 0xEFEA }, { 0x6C0C, 0xF25B }, { 0x6C0D, 0xF6E7 }, { 0x6C0F, 0xA4F3 }, { 0x6C10, 0xA5C2 }, { 0x6C11, 0xA5C1 }, 
-	{ 0x6C13, 0xAA5D }, { 0x6C14, 0xC961 }, { 0x6C15, 0xC97E }, { 0x6C16, 0xA6BB }, { 0x6C18, 0xC9F7 }, { 0x6C19, 0xCB49 }, { 0x6C1A, 0xCB4A }, { 0x6C1B, 0xAA5E }, 
-	{ 0x6C1D, 0xCCED }, { 0x6C1F, 0xAC74 }, { 0x6C20, 0xCF6B }, { 0x6C21, 0xCF6C }, { 0x6C23, 0xAEF0 }, { 0x6C24, 0xAEF4 }, { 0x6C25, 0xD244 }, { 0x6C26, 0xAEF3 }, 
-	{ 0x6C27, 0xAEF1 }, { 0x6C28, 0xAEF2 }, { 0x6C2A, 0xD5DF }, { 0x6C2B, 0xB242 }, { 0x6C2C, 0xB4E3 }, { 0x6C2E, 0xB4E1 }, { 0x6C2F, 0xB4E2 }, { 0x6C30, 0xD9E6 }, 
-	{ 0x6C33, 0xBA72 }, { 0x6C34, 0xA4F4 }, { 0x6C36, 0xC9A1 }, { 0x6C38, 0xA5C3 }, { 0x6C3B, 0xC9A4 }, { 0x6C3E, 0xA5C6 }, { 0x6C3F, 0xC9A3 }, { 0x6C40, 0xA5C5 }, 
-	{ 0x6C41, 0xA5C4 }, { 0x6C42, 0xA844 }, { 0x6C43, 0xC9A2 }, { 0x6C46, 0xC9F8 }, { 0x6C4A, 0xC9FC }, { 0x6C4B, 0xC9FE }, { 0x6C4C, 0xCA40 }, { 0x6C4D, 0xA6C5 }, 
-	{ 0x6C4E, 0xA6C6 }, { 0x6C4F, 0xC9FB }, { 0x6C50, 0xA6C1 }, { 0x6C52, 0xC9F9 }, { 0x6C54, 0xC9FD }, { 0x6C55, 0xA6C2 }, { 0x6C57, 0xA6BD }, { 0x6C59, 0xA6BE }, 
-	{ 0x6C5B, 0xA6C4 }, { 0x6C5C, 0xC9FA }, { 0x6C5D, 0xA6BC }, { 0x6C5E, 0xA845 }, { 0x6C5F, 0xA6BF }, { 0x6C60, 0xA6C0 }, { 0x6C61, 0xA6C3 }, { 0x6C65, 0xCB5B }, 
-	{ 0x6C66, 0xCB59 }, { 0x6C67, 0xCB4C }, { 0x6C68, 0xA851 }, { 0x6C69, 0xCB53 }, { 0x6C6A, 0xA84C }, { 0x6C6B, 0xCB4D }, { 0x6C6D, 0xCB55 }, { 0x6C6F, 0xCB52 }, 
-	{ 0x6C70, 0xA84F }, { 0x6C71, 0xCB51 }, { 0x6C72, 0xA856 }, { 0x6C73, 0xCB5A }, { 0x6C74, 0xA858 }, { 0x6C76, 0xA85A }, { 0x6C78, 0xCB4B }, { 0x6C7A, 0xA84D }, 
-	{ 0x6C7B, 0xCB5C }, { 0x6C7D, 0xA854 }, { 0x6C7E, 0xA857 }, { 0x6C80, 0xCD45 }, { 0x6C81, 0xA847 }, { 0x6C82, 0xA85E }, { 0x6C83, 0xA855 }, { 0x6C84, 0xCB4E }, 
-	{ 0x6C85, 0xA84A }, { 0x6C86, 0xA859 }, { 0x6C87, 0xCB56 }, { 0x6C88, 0xA848 }, { 0x6C89, 0xA849 }, { 0x6C8A, 0xCD43 }, { 0x6C8B, 0xCB4F }, { 0x6C8C, 0xA850 }, 
-	{ 0x6C8D, 0xA85B }, { 0x6C8E, 0xCB5D }, { 0x6C8F, 0xCB50 }, { 0x6C90, 0xA84E }, { 0x6C92, 0xA853 }, { 0x6C93, 0xCCEE }, { 0x6C94, 0xA85C }, { 0x6C95, 0xCB57 }, 
-	{ 0x6C96, 0xA852 }, { 0x6C98, 0xA85D }, { 0x6C99, 0xA846 }, { 0x6C9A, 0xCB54 }, { 0x6C9B, 0xA84B }, { 0x6C9C, 0xCB58 }, { 0x6C9D, 0xCD44 }, { 0x6CAB, 0xAA6A }, 
-	{ 0x6CAC, 0xAA7A }, { 0x6CAD, 0xCCF5 }, { 0x6CAE, 0xAA71 }, { 0x6CB0, 0xCD4B }, { 0x6CB1, 0xAA62 }, { 0x6CB3, 0xAA65 }, { 0x6CB4, 0xCD42 }, { 0x6CB6, 0xCCF3 }, 
-	{ 0x6CB7, 0xCCF7 }, { 0x6CB8, 0xAA6D }, { 0x6CB9, 0xAA6F }, { 0x6CBA, 0xCCFA }, { 0x6CBB, 0xAA76 }, { 0x6CBC, 0xAA68 }, { 0x6CBD, 0xAA66 }, { 0x6CBE, 0xAA67 }, 
-	{ 0x6CBF, 0xAA75 }, { 0x6CC0, 0xCD47 }, { 0x6CC1, 0xAA70 }, { 0x6CC2, 0xCCF9 }, { 0x6CC3, 0xCCFB }, { 0x6CC4, 0xAA6E }, { 0x6CC5, 0xAA73 }, { 0x6CC6, 0xCCFC }, 
-	{ 0x6CC7, 0xCD4A }, { 0x6CC9, 0xAC75 }, { 0x6CCA, 0xAA79 }, { 0x6CCC, 0xAA63 }, { 0x6CCD, 0xCD49 }, { 0x6CCF, 0xCD4D }, { 0x6CD0, 0xCCF8 }, { 0x6CD1, 0xCD4F }, 
-	{ 0x6CD2, 0xCD40 }, { 0x6CD3, 0xAA6C }, { 0x6CD4, 0xCCF4 }, { 0x6CD5, 0xAA6B }, { 0x6CD6, 0xAA7D }, { 0x6CD7, 0xAA72 }, { 0x6CD9, 0xCCF2 }, { 0x6CDA, 0xCF75 }, 
-	{ 0x6CDB, 0xAA78 }, { 0x6CDC, 0xAA7C }, { 0x6CDD, 0xCD41 }, { 0x6CDE, 0xCD46 }, { 0x6CE0, 0xAA7E }, { 0x6CE1, 0xAA77 }, { 0x6CE2, 0xAA69 }, { 0x6CE3, 0xAA5F }, 
-	{ 0x6CE5, 0xAA64 }, { 0x6CE7, 0xCCF6 }, { 0x6CE8, 0xAA60 }, { 0x6CE9, 0xCD4E }, { 0x6CEB, 0xCCF0 }, { 0x6CEC, 0xCCEF }, { 0x6CED, 0xCCFD }, { 0x6CEE, 0xCCF1 }, 
-	{ 0x6CEF, 0xAA7B }, { 0x6CF0, 0xAEF5 }, { 0x6CF1, 0xAA74 }, { 0x6CF2, 0xCCFE }, { 0x6CF3, 0xAA61 }, { 0x6CF5, 0xACA6 }, { 0x6CF9, 0xCD4C }, { 0x6D00, 0xCF7C }, 
-	{ 0x6D01, 0xCFA1 }, { 0x6D03, 0xCFA4 }, { 0x6D04, 0xCF77 }, { 0x6D07, 0xCFA7 }, { 0x6D08, 0xCFAA }, { 0x6D09, 0xCFAC }, { 0x6D0A, 0xCF74 }, { 0x6D0B, 0xAC76 }, 
-	{ 0x6D0C, 0xAC7B }, { 0x6D0D, 0xD249 }, { 0x6D0E, 0xACAD }, { 0x6D0F, 0xCFA5 }, { 0x6D10, 0xCFAD }, { 0x6D11, 0xCF7B }, { 0x6D12, 0xCF73 }, { 0x6D16, 0xD264 }, 
-	{ 0x6D17, 0xAC7E }, { 0x6D18, 0xCFA2 }, { 0x6D19, 0xCF78 }, { 0x6D1A, 0xCF7A }, { 0x6D1B, 0xACA5 }, { 0x6D1D, 0xCF7D }, { 0x6D1E, 0xAC7D }, { 0x6D1F, 0xCF70 }, 
-	{ 0x6D20, 0xCFA8 }, { 0x6D22, 0xCFAB }, { 0x6D25, 0xAC7A }, { 0x6D27, 0xACA8 }, { 0x6D28, 0xCF6D }, { 0x6D29, 0xACAA }, { 0x6D2A, 0xAC78 }, { 0x6D2B, 0xACAE }, 
-	{ 0x6D2C, 0xCFA9 }, { 0x6D2D, 0xCF6F }, { 0x6D2E, 0xACAB }, { 0x6D2F, 0xD25E }, { 0x6D30, 0xCD48 }, { 0x6D31, 0xAC7C }, { 0x6D32, 0xAC77 }, { 0x6D33, 0xCF76 }, 
-	{ 0x6D34, 0xCF6E }, { 0x6D35, 0xACAC }, { 0x6D36, 0xACA4 }, { 0x6D37, 0xCFA3 }, { 0x6D38, 0xACA9 }, { 0x6D39, 0xACA7 }, { 0x6D3A, 0xCF79 }, { 0x6D3B, 0xACA1 }, 
-	{ 0x6D3C, 0xCF71 }, { 0x6D3D, 0xACA2 }, { 0x6D3E, 0xACA3 }, { 0x6D3F, 0xCF72 }, { 0x6D40, 0xCFA6 }, { 0x6D41, 0xAC79 }, { 0x6D42, 0xCF7E }, { 0x6D58, 0xD24C }, 
-	{ 0x6D59, 0xAEFD }, { 0x6D5A, 0xAF43 }, { 0x6D5E, 0xD255 }, { 0x6D5F, 0xD25B }, { 0x6D60, 0xD257 }, { 0x6D61, 0xD24A }, { 0x6D62, 0xD24D }, { 0x6D63, 0xD246 }, 
-	{ 0x6D64, 0xD247 }, { 0x6D65, 0xAF4A }, { 0x6D66, 0xAEFA }, { 0x6D67, 0xD256 }, { 0x6D68, 0xD25F }, { 0x6D69, 0xAF45 }, { 0x6D6A, 0xAEF6 }, { 0x6D6C, 0xAF40 }, 
-	{ 0x6D6D, 0xD24E }, { 0x6D6E, 0xAF42 }, { 0x6D6F, 0xD24F }, { 0x6D70, 0xD259 }, { 0x6D74, 0xAF44 }, { 0x6D75, 0xD268 }, { 0x6D76, 0xD248 }, { 0x6D77, 0xAEFC }, 
-	{ 0x6D78, 0xAEFB }, { 0x6D79, 0xAF48 }, { 0x6D7A, 0xD245 }, { 0x6D7B, 0xD266 }, { 0x6D7C, 0xD25A }, { 0x6D7D, 0xD267 }, { 0x6D7E, 0xD261 }, { 0x6D7F, 0xD253 }, 
-	{ 0x6D80, 0xD262 }, { 0x6D82, 0xD25C }, { 0x6D83, 0xD265 }, { 0x6D84, 0xD263 }, { 0x6D85, 0xAF49 }, { 0x6D86, 0xD254 }, { 0x6D87, 0xAEF9 }, { 0x6D88, 0xAEF8 }, 
-	{ 0x6D89, 0xAF41 }, { 0x6D8A, 0xAF47 }, { 0x6D8B, 0xD260 }, { 0x6D8C, 0xAF46 }, { 0x6D8D, 0xD251 }, { 0x6D8E, 0xB243 }, { 0x6D90, 0xD269 }, { 0x6D91, 0xD250 }, 
-	{ 0x6D92, 0xD24B }, { 0x6D93, 0xAEFE }, { 0x6D94, 0xAF4B }, { 0x6D95, 0xAEF7 }, { 0x6D97, 0xD258 }, { 0x6D98, 0xD25D }, { 0x6DAA, 0xB265 }, { 0x6DAB, 0xD5E1 }, 
-	{ 0x6DAC, 0xD5E5 }, { 0x6DAE, 0xB252 }, { 0x6DAF, 0xB250 }, { 0x6DB2, 0xB247 }, { 0x6DB3, 0xD5E3 }, { 0x6DB4, 0xD5E2 }, { 0x6DB5, 0xB25B }, { 0x6DB7, 0xD5E8 }, 
-	{ 0x6DB8, 0xB255 }, { 0x6DBA, 0xD5FA }, { 0x6DBB, 0xD647 }, { 0x6DBC, 0xB244 }, { 0x6DBD, 0xD5F7 }, { 0x6DBE, 0xD5F0 }, { 0x6DBF, 0xB267 }, { 0x6DC0, 0xD5E0 }, 
-	{ 0x6DC2, 0xD5FC }, { 0x6DC4, 0xB264 }, { 0x6DC5, 0xB258 }, { 0x6DC6, 0xB263 }, { 0x6DC7, 0xB24E }, { 0x6DC8, 0xD5EC }, { 0x6DC9, 0xD5FE }, { 0x6DCA, 0xD5F6 }, 
-	{ 0x6DCB, 0xB24F }, { 0x6DCC, 0xB249 }, { 0x6DCD, 0xD645 }, { 0x6DCF, 0xD5FD }, { 0x6DD0, 0xD640 }, { 0x6DD1, 0xB251 }, { 0x6DD2, 0xB259 }, { 0x6DD3, 0xD642 }, 
-	{ 0x6DD4, 0xD5EA }, { 0x6DD5, 0xD5FB }, { 0x6DD6, 0xD5EF }, { 0x6DD7, 0xD644 }, { 0x6DD8, 0xB25E }, { 0x6DD9, 0xB246 }, { 0x6DDA, 0xB25C }, { 0x6DDB, 0xD5F4 }, 
-	{ 0x6DDC, 0xD5F2 }, { 0x6DDD, 0xD5F3 }, { 0x6DDE, 0xB253 }, { 0x6DDF, 0xD5EE }, { 0x6DE0, 0xD5ED }, { 0x6DE1, 0xB248 }, { 0x6DE2, 0xD5E7 }, { 0x6DE3, 0xD646 }, 
-	{ 0x6DE4, 0xB24A }, { 0x6DE5, 0xD5F1 }, { 0x6DE6, 0xB268 }, { 0x6DE8, 0xB262 }, { 0x6DE9, 0xD5E6 }, { 0x6DEA, 0xB25F }, { 0x6DEB, 0xB25D }, { 0x6DEC, 0xB266 }, 
-	{ 0x6DED, 0xD5F8 }, { 0x6DEE, 0xB261 }, { 0x6DEF, 0xD252 }, { 0x6DF0, 0xD5F9 }, { 0x6DF1, 0xB260 }, { 0x6DF2, 0xD641 }, { 0x6DF3, 0xB245 }, { 0x6DF4, 0xD5F5 }, 
-	{ 0x6DF5, 0xB257 }, { 0x6DF6, 0xD5E9 }, { 0x6DF7, 0xB256 }, { 0x6DF9, 0xB254 }, { 0x6DFA, 0xB24C }, { 0x6DFB, 0xB24B }, { 0x6DFC, 0xD9E7 }, { 0x6DFD, 0xD643 }, 
-	{ 0x6E00, 0xD5EB }, { 0x6E03, 0xD9FC }, { 0x6E05, 0xB24D }, { 0x6E19, 0xB541 }, { 0x6E1A, 0xB25A }, { 0x6E1B, 0xB4EE }, { 0x6E1C, 0xD9F6 }, { 0x6E1D, 0xB4FC }, 
-	{ 0x6E1F, 0xD9EA }, { 0x6E20, 0xB4EB }, { 0x6E21, 0xB4E7 }, { 0x6E22, 0xDA49 }, { 0x6E23, 0xB4ED }, { 0x6E24, 0xB4F1 }, { 0x6E25, 0xB4EC }, { 0x6E26, 0xB4F5 }, 
-	{ 0x6E27, 0xDA4D }, { 0x6E28, 0xDA44 }, { 0x6E2B, 0xD9F1 }, { 0x6E2C, 0xB4FA }, { 0x6E2D, 0xB4F4 }, { 0x6E2E, 0xD9FD }, { 0x6E2F, 0xB4E4 }, { 0x6E30, 0xDA4A }, 
-	{ 0x6E31, 0xDA43 }, { 0x6E32, 0xB4E8 }, { 0x6E33, 0xD9F7 }, { 0x6E34, 0xB4F7 }, { 0x6E35, 0xDA55 }, { 0x6E36, 0xDA56 }, { 0x6E38, 0xB4E5 }, { 0x6E39, 0xDA48 }, 
-	{ 0x6E3A, 0xB4F9 }, { 0x6E3B, 0xD9FB }, { 0x6E3C, 0xD9ED }, { 0x6E3D, 0xD9EE }, { 0x6E3E, 0xB4FD }, { 0x6E3F, 0xD9F2 }, { 0x6E40, 0xD9F9 }, { 0x6E41, 0xD9F3 }, 
-	{ 0x6E43, 0xB4FB }, { 0x6E44, 0xB544 }, { 0x6E45, 0xD9EF }, { 0x6E46, 0xD9E8 }, { 0x6E47, 0xD9E9 }, { 0x6E49, 0xD9EB }, { 0x6E4A, 0xB4EA }, { 0x6E4B, 0xD9F8 }, 
-	{ 0x6E4D, 0xB4F8 }, { 0x6E4E, 0xB542 }, { 0x6E51, 0xD9FA }, { 0x6E52, 0xDA53 }, { 0x6E53, 0xDA4B }, { 0x6E54, 0xB4E6 }, { 0x6E55, 0xDA51 }, { 0x6E56, 0xB4F2 }, 
-	{ 0x6E58, 0xB4F0 }, { 0x6E5A, 0xDA57 }, { 0x6E5B, 0xB4EF }, { 0x6E5C, 0xDA41 }, { 0x6E5D, 0xD9F4 }, { 0x6E5E, 0xD9FE }, { 0x6E5F, 0xB547 }, { 0x6E60, 0xDA45 }, 
-	{ 0x6E61, 0xDA42 }, { 0x6E62, 0xD9F0 }, { 0x6E63, 0xB543 }, { 0x6E64, 0xDA4F }, { 0x6E65, 0xDA4C }, { 0x6E66, 0xDA54 }, { 0x6E67, 0xB4E9 }, { 0x6E68, 0xDA40 }, 
-	{ 0x6E69, 0xB546 }, { 0x6E6B, 0xDA47 }, { 0x6E6E, 0xB4F3 }, { 0x6E6F, 0xB4F6 }, { 0x6E71, 0xDA46 }, { 0x6E72, 0xB545 }, { 0x6E73, 0xD9F5 }, { 0x6E74, 0xD5E4 }, 
-	{ 0x6E77, 0xDA50 }, { 0x6E78, 0xDA4E }, { 0x6E79, 0xDA52 }, { 0x6E88, 0xD9EC }, { 0x6E89, 0xB540 }, { 0x6E8D, 0xDE61 }, { 0x6E8E, 0xDE60 }, { 0x6E8F, 0xDE46 }, 
-	{ 0x6E90, 0xB7BD }, { 0x6E92, 0xDE5F }, { 0x6E93, 0xDE49 }, { 0x6E94, 0xDE4A }, { 0x6E96, 0xB7C7 }, { 0x6E97, 0xDE68 }, { 0x6E98, 0xB7C2 }, { 0x6E99, 0xDE5E }, 
-	{ 0x6E9B, 0xDE43 }, { 0x6E9C, 0xB7C8 }, { 0x6E9D, 0xB7BE }, { 0x6E9E, 0xDE52 }, { 0x6E9F, 0xDE48 }, { 0x6EA0, 0xDE4B }, { 0x6EA1, 0xDE63 }, { 0x6EA2, 0xB7B8 }, 
-	{ 0x6EA3, 0xDE6A }, { 0x6EA4, 0xDE62 }, { 0x6EA5, 0xB7C1 }, { 0x6EA6, 0xDE57 }, { 0x6EA7, 0xB7CC }, { 0x6EAA, 0xB7CB }, { 0x6EAB, 0xB7C5 }, { 0x6EAE, 0xDE69 }, 
-	{ 0x6EAF, 0xB7B9 }, { 0x6EB0, 0xDE55 }, { 0x6EB1, 0xDE4C }, { 0x6EB2, 0xDE59 }, { 0x6EB3, 0xDE65 }, { 0x6EB4, 0xB7CD }, { 0x6EB6, 0xB7BB }, { 0x6EB7, 0xDE54 }, 
-	{ 0x6EB9, 0xDE4D }, { 0x6EBA, 0xB7C4 }, { 0x6EBC, 0xB7C3 }, { 0x6EBD, 0xDE50 }, { 0x6EBE, 0xDE5A }, { 0x6EBF, 0xDE64 }, { 0x6EC0, 0xDE47 }, { 0x6EC1, 0xDE51 }, 
-	{ 0x6EC2, 0xB7BC }, { 0x6EC3, 0xDE5B }, { 0x6EC4, 0xB7C9 }, { 0x6EC5, 0xB7C0 }, { 0x6EC6, 0xDE4E }, { 0x6EC7, 0xB7BF }, { 0x6EC8, 0xDE45 }, { 0x6EC9, 0xDE53 }, 
-	{ 0x6ECA, 0xDE67 }, { 0x6ECB, 0xB4FE }, { 0x6ECC, 0xBAB0 }, { 0x6ECD, 0xDE56 }, { 0x6ECE, 0xE26C }, { 0x6ECF, 0xDE58 }, { 0x6ED0, 0xDE66 }, { 0x6ED1, 0xB7C6 }, 
-	{ 0x6ED2, 0xDE4F }, { 0x6ED3, 0xB7BA }, { 0x6ED4, 0xB7CA }, { 0x6ED5, 0xBCF0 }, { 0x6ED6, 0xDE44 }, { 0x6ED8, 0xDE5D }, { 0x6EDC, 0xDE5C }, { 0x6EEB, 0xE2AA }, 
-	{ 0x6EEC, 0xBAAD }, { 0x6EED, 0xE27D }, { 0x6EEE, 0xE2A4 }, { 0x6EEF, 0xBAA2 }, { 0x6EF1, 0xE26E }, { 0x6EF2, 0xBAAF }, { 0x6EF4, 0xBA77 }, { 0x6EF5, 0xE26D }, 
-	{ 0x6EF6, 0xE2B0 }, { 0x6EF7, 0xBAB1 }, { 0x6EF8, 0xE271 }, { 0x6EF9, 0xE2A3 }, { 0x6EFB, 0xE273 }, { 0x6EFC, 0xE2B3 }, { 0x6EFD, 0xE2AF }, { 0x6EFE, 0xBA75 }, 
-	{ 0x6EFF, 0xBAA1 }, { 0x6F00, 0xE653 }, { 0x6F01, 0xBAAE }, { 0x6F02, 0xBA7D }, { 0x6F03, 0xE26F }, { 0x6F05, 0xE2AE }, { 0x6F06, 0xBAA3 }, { 0x6F07, 0xE2AB }, 
-	{ 0x6F08, 0xE2B8 }, { 0x6F09, 0xE275 }, { 0x6F0A, 0xE27E }, { 0x6F0D, 0xE2B6 }, { 0x6F0E, 0xE2AC }, { 0x6F0F, 0xBA7C }, { 0x6F12, 0xE27C }, { 0x6F13, 0xBA76 }, 
-	{ 0x6F14, 0xBA74 }, { 0x6F15, 0xBAA8 }, { 0x6F18, 0xE27A }, { 0x6F19, 0xE277 }, { 0x6F1A, 0xE278 }, { 0x6F1C, 0xE2B2 }, { 0x6F1E, 0xE2B7 }, { 0x6F1F, 0xE2B5 }, 
-	{ 0x6F20, 0xBA7A }, { 0x6F21, 0xE2B9 }, { 0x6F22, 0xBA7E }, { 0x6F23, 0xBAA7 }, { 0x6F25, 0xE270 }, { 0x6F26, 0xE5FA }, { 0x6F27, 0xE279 }, { 0x6F29, 0xBA78 }, 
-	{ 0x6F2A, 0xBAAC }, { 0x6F2B, 0xBAA9 }, { 0x6F2C, 0xBA7B }, { 0x6F2D, 0xE2A5 }, { 0x6F2E, 0xE274 }, { 0x6F2F, 0xBAAA }, { 0x6F30, 0xE2A7 }, { 0x6F31, 0xBAA4 }, 
-	{ 0x6F32, 0xBAA6 }, { 0x6F33, 0xBA73 }, { 0x6F35, 0xE2A9 }, { 0x6F36, 0xE2A1 }, { 0x6F37, 0xE272 }, { 0x6F38, 0xBAA5 }, { 0x6F39, 0xE2B1 }, { 0x6F3A, 0xE2B4 }, 
-	{ 0x6F3B, 0xE27B }, { 0x6F3C, 0xE2A8 }, { 0x6F3E, 0xBA79 }, { 0x6F3F, 0xBCDF }, { 0x6F40, 0xE2A6 }, { 0x6F41, 0xE5F9 }, { 0x6F43, 0xE2AD }, { 0x6F4E, 0xE276 }, 
-	{ 0x6F4F, 0xE644 }, { 0x6F50, 0xE64E }, { 0x6F51, 0xBCE2 }, { 0x6F52, 0xE64D }, { 0x6F53, 0xE659 }, { 0x6F54, 0xBCE4 }, { 0x6F55, 0xE64B }, { 0x6F57, 0xE64F }, 
-	{ 0x6F58, 0xBCEF }, { 0x6F5A, 0xE646 }, { 0x6F5B, 0xBCE7 }, { 0x6F5D, 0xE652 }, { 0x6F5E, 0xE9F0 }, { 0x6F5F, 0xBCF3 }, { 0x6F60, 0xBCF2 }, { 0x6F61, 0xE654 }, 
-	{ 0x6F62, 0xE643 }, { 0x6F63, 0xE65E }, { 0x6F64, 0xBCED }, { 0x6F66, 0xBCE3 }, { 0x6F67, 0xE657 }, { 0x6F69, 0xE65B }, { 0x6F6A, 0xE660 }, { 0x6F6B, 0xE655 }, 
-	{ 0x6F6C, 0xE649 }, { 0x6F6D, 0xBCE6 }, { 0x6F6E, 0xBCE9 }, { 0x6F6F, 0xBCF1 }, { 0x6F70, 0xBCEC }, { 0x6F72, 0xE64C }, { 0x6F73, 0xE2A2 }, { 0x6F76, 0xE648 }, 
-	{ 0x6F77, 0xE65F }, { 0x6F78, 0xBCE8 }, { 0x6F7A, 0xBCEB }, { 0x6F7B, 0xE661 }, { 0x6F7C, 0xBCE0 }, { 0x6F7D, 0xE656 }, { 0x6F7E, 0xE5FB }, { 0x6F7F, 0xE65C }, 
-	{ 0x6F80, 0xC0DF }, { 0x6F82, 0xE64A }, { 0x6F84, 0xBCE1 }, { 0x6F85, 0xE645 }, { 0x6F86, 0xBCE5 }, { 0x6F87, 0xE5FC }, { 0x6F88, 0xBAAB }, { 0x6F89, 0xE641 }, 
-	{ 0x6F8B, 0xE65A }, { 0x6F8C, 0xE642 }, { 0x6F8D, 0xE640 }, { 0x6F8E, 0xBCEA }, { 0x6F90, 0xE658 }, { 0x6F92, 0xE5FE }, { 0x6F93, 0xE651 }, { 0x6F94, 0xE650 }, 
-	{ 0x6F95, 0xE65D }, { 0x6F96, 0xE647 }, { 0x6F97, 0xBCEE }, { 0x6F9E, 0xE9F3 }, { 0x6FA0, 0xBF49 }, { 0x6FA1, 0xBEFE }, { 0x6FA2, 0xEA40 }, { 0x6FA3, 0xE9EB }, 
-	{ 0x6FA4, 0xBF41 }, { 0x6FA5, 0xE9F7 }, { 0x6FA6, 0xBF48 }, { 0x6FA7, 0xBF43 }, { 0x6FA8, 0xE9F5 }, { 0x6FA9, 0xED4F }, { 0x6FAA, 0xE9FB }, { 0x6FAB, 0xEA42 }, 
-	{ 0x6FAC, 0xE9FA }, { 0x6FAD, 0xE9E9 }, { 0x6FAE, 0xE9F8 }, { 0x6FAF, 0xEA44 }, { 0x6FB0, 0xEA46 }, { 0x6FB1, 0xBEFD }, { 0x6FB2, 0xEA45 }, { 0x6FB3, 0xBF44 }, 
-	{ 0x6FB4, 0xBF4A }, { 0x6FB6, 0xBF47 }, { 0x6FB8, 0xE9FE }, { 0x6FB9, 0xBF46 }, { 0x6FBA, 0xE9F9 }, { 0x6FBC, 0xE9ED }, { 0x6FBD, 0xE9F2 }, { 0x6FBF, 0xE9FD }, 
-	{ 0x6FC0, 0xBF45 }, { 0x6FC1, 0xBF42 }, { 0x6FC2, 0xBEFC }, { 0x6FC3, 0xBF40 }, { 0x6FC4, 0xE9F1 }, { 0x6FC6, 0xE5FD }, { 0x6FC7, 0xE9EC }, { 0x6FC8, 0xE9EF }, 
-	{ 0x6FC9, 0xEA41 }, { 0x6FCA, 0xE9F4 }, { 0x6FCB, 0xE9EA }, { 0x6FCC, 0xED4E }, { 0x6FCD, 0xEA43 }, { 0x6FCE, 0xE9EE }, { 0x6FCF, 0xE9FC }, { 0x6FD4, 0xED51 }, 
-	{ 0x6FD5, 0xC0E3 }, { 0x6FD8, 0xC0D7 }, { 0x6FDB, 0xC0DB }, { 0x6FDC, 0xED53 }, { 0x6FDD, 0xED59 }, { 0x6FDE, 0xED57 }, { 0x6FDF, 0xC0D9 }, { 0x6FE0, 0xC0DA }, 
-	{ 0x6FE1, 0xC0E1 }, { 0x6FE2, 0xED5A }, { 0x6FE3, 0xED52 }, { 0x6FE4, 0xC0DC }, { 0x6FE6, 0xED56 }, { 0x6FE7, 0xED55 }, { 0x6FE8, 0xED5B }, { 0x6FE9, 0xC0E2 }, 
-	{ 0x6FEB, 0xC0DD }, { 0x6FEC, 0xC0E0 }, { 0x6FED, 0xED54 }, { 0x6FEE, 0xC0E4 }, { 0x6FEF, 0xC0DE }, { 0x6FF0, 0xC0E5 }, { 0x6FF1, 0xC0D8 }, { 0x6FF2, 0xED58 }, 
-	{ 0x6FF4, 0xED50 }, { 0x6FF7, 0xEFF7 }, { 0x6FFA, 0xC271 }, { 0x6FFB, 0xEFF4 }, { 0x6FFC, 0xEFF6 }, { 0x6FFE, 0xC26F }, { 0x6FFF, 0xEFF2 }, { 0x7000, 0xEFF3 }, 
-	{ 0x7001, 0xEFEE }, { 0x7004, 0xE9F6 }, { 0x7005, 0xEFEF }, { 0x7006, 0xC270 }, { 0x7007, 0xEFEB }, { 0x7009, 0xC26D }, { 0x700A, 0xEFF8 }, { 0x700B, 0xC26E }, 
-	{ 0x700C, 0xEFEC }, { 0x700D, 0xEFED }, { 0x700E, 0xEFF1 }, { 0x700F, 0xC273 }, { 0x7011, 0xC272 }, { 0x7014, 0xEFF0 }, { 0x7015, 0xC378 }, { 0x7016, 0xF25F }, 
-	{ 0x7017, 0xF265 }, { 0x7018, 0xC379 }, { 0x7019, 0xF25C }, { 0x701A, 0xC376 }, { 0x701B, 0xC373 }, { 0x701C, 0xF267 }, { 0x701D, 0xC377 }, { 0x701F, 0xC374 }, 
-	{ 0x7020, 0xF25E }, { 0x7021, 0xF261 }, { 0x7022, 0xF262 }, { 0x7023, 0xF263 }, { 0x7024, 0xF266 }, { 0x7026, 0xEFF5 }, { 0x7027, 0xF25D }, { 0x7028, 0xC375 }, 
-	{ 0x7029, 0xF264 }, { 0x702A, 0xF268 }, { 0x702B, 0xF260 }, { 0x702F, 0xF45D }, { 0x7030, 0xC46A }, { 0x7031, 0xF460 }, { 0x7032, 0xC46B }, { 0x7033, 0xF468 }, 
-	{ 0x7034, 0xF45F }, { 0x7035, 0xF45C }, { 0x7037, 0xF45E }, { 0x7038, 0xF462 }, { 0x7039, 0xF465 }, { 0x703A, 0xF464 }, { 0x703B, 0xF467 }, { 0x703C, 0xF45B }, 
-	{ 0x703E, 0xC469 }, { 0x703F, 0xF463 }, { 0x7040, 0xF466 }, { 0x7041, 0xF469 }, { 0x7042, 0xF461 }, { 0x7043, 0xF5D3 }, { 0x7044, 0xF5D4 }, { 0x7045, 0xF5D8 }, 
-	{ 0x7046, 0xF5D9 }, { 0x7048, 0xF5D6 }, { 0x7049, 0xF5D7 }, { 0x704A, 0xF5D5 }, { 0x704C, 0xC4E9 }, { 0x7051, 0xC578 }, { 0x7052, 0xF6EB }, { 0x7055, 0xF6E8 }, 
-	{ 0x7056, 0xF6E9 }, { 0x7057, 0xF6EA }, { 0x7058, 0xC579 }, { 0x705A, 0xF7E5 }, { 0x705B, 0xF7E4 }, { 0x705D, 0xF8AF }, { 0x705E, 0xC5F4 }, { 0x705F, 0xF8AD }, 
-	{ 0x7060, 0xF8B0 }, { 0x7061, 0xF8AE }, { 0x7062, 0xF8F5 }, { 0x7063, 0xC657 }, { 0x7064, 0xC665 }, { 0x7065, 0xF9A3 }, { 0x7066, 0xF96C }, { 0x7068, 0xF9A2 }, 
-	{ 0x7069, 0xF9D0 }, { 0x706A, 0xF9D1 }, { 0x706B, 0xA4F5 }, { 0x7070, 0xA6C7 }, { 0x7071, 0xCA41 }, { 0x7074, 0xCB5E }, { 0x7076, 0xA85F }, { 0x7078, 0xA862 }, 
-	{ 0x707A, 0xCB5F }, { 0x707C, 0xA860 }, { 0x707D, 0xA861 }, { 0x7082, 0xCD58 }, { 0x7083, 0xCD5A }, { 0x7084, 0xCD55 }, { 0x7085, 0xCD52 }, { 0x7086, 0xCD54 }, 
-	{ 0x708A, 0xAAA4 }, { 0x708E, 0xAAA2 }, { 0x7091, 0xCD56 }, { 0x7092, 0xAAA3 }, { 0x7093, 0xCD53 }, { 0x7094, 0xCD50 }, { 0x7095, 0xAAA1 }, { 0x7096, 0xCD57 }, 
-	{ 0x7098, 0xCD51 }, { 0x7099, 0xAAA5 }, { 0x709A, 0xCD59 }, { 0x709F, 0xCFAF }, { 0x70A1, 0xCFB3 }, { 0x70A4, 0xACB7 }, { 0x70A9, 0xCFB6 }, { 0x70AB, 0xACAF }, 
-	{ 0x70AC, 0xACB2 }, { 0x70AD, 0xACB4 }, { 0x70AE, 0xACB6 }, { 0x70AF, 0xACB3 }, { 0x70B0, 0xCFB2 }, { 0x70B1, 0xCFB1 }, { 0x70B3, 0xACB1 }, { 0x70B4, 0xCFB4 }, 
-	{ 0x70B5, 0xCFB5 }, { 0x70B7, 0xCFAE }, { 0x70B8, 0xACB5 }, { 0x70BA, 0xACB0 }, { 0x70BE, 0xCFB0 }, { 0x70C5, 0xD277 }, { 0x70C6, 0xD278 }, { 0x70C7, 0xD279 }, 
-	{ 0x70C8, 0xAF50 }, { 0x70CA, 0xAF4C }, { 0x70CB, 0xD26E }, { 0x70CD, 0xD276 }, { 0x70CE, 0xD27B }, { 0x70CF, 0xAF51 }, { 0x70D1, 0xD26C }, { 0x70D2, 0xD272 }, 
-	{ 0x70D3, 0xD26B }, { 0x70D4, 0xD275 }, { 0x70D7, 0xD271 }, { 0x70D8, 0xAF4D }, { 0x70D9, 0xAF4F }, { 0x70DA, 0xD27A }, { 0x70DC, 0xD26A }, { 0x70DD, 0xD26D }, 
-	{ 0x70DE, 0xD273 }, { 0x70E0, 0xD274 }, { 0x70E1, 0xD27C }, { 0x70E2, 0xD270 }, { 0x70E4, 0xAF4E }, { 0x70EF, 0xB26D }, { 0x70F0, 0xD64E }, { 0x70F3, 0xD650 }, 
-	{ 0x70F4, 0xD64C }, { 0x70F6, 0xD658 }, { 0x70F7, 0xD64A }, { 0x70F8, 0xD657 }, { 0x70F9, 0xB269 }, { 0x70FA, 0xD648 }, { 0x70FB, 0xDA5B }, { 0x70FC, 0xD652 }, 
-	{ 0x70FD, 0xB26C }, { 0x70FF, 0xD653 }, { 0x7100, 0xD656 }, { 0x7102, 0xD65A }, { 0x7104, 0xD64F }, { 0x7106, 0xD654 }, { 0x7109, 0xB26A }, { 0x710A, 0xB26B }, 
-	{ 0x710B, 0xD659 }, { 0x710C, 0xD64D }, { 0x710D, 0xD649 }, { 0x710E, 0xD65B }, { 0x7110, 0xD651 }, { 0x7113, 0xD655 }, { 0x7117, 0xD64B }, { 0x7119, 0xB548 }, 
-	{ 0x711A, 0xB549 }, { 0x711B, 0xDA65 }, { 0x711C, 0xB54F }, { 0x711E, 0xDA59 }, { 0x711F, 0xDA62 }, { 0x7120, 0xDA58 }, { 0x7121, 0xB54C }, { 0x7122, 0xDA60 }, 
-	{ 0x7123, 0xDA5E }, { 0x7125, 0xDA5F }, { 0x7126, 0xB54A }, { 0x7128, 0xDA63 }, { 0x712E, 0xDA5C }, { 0x712F, 0xDA5A }, { 0x7130, 0xB54B }, { 0x7131, 0xDA5D }, 
-	{ 0x7132, 0xDA61 }, { 0x7136, 0xB54D }, { 0x713A, 0xDA64 }, { 0x7141, 0xDE70 }, { 0x7142, 0xDE77 }, { 0x7143, 0xDE79 }, { 0x7144, 0xDEA1 }, { 0x7146, 0xB7DA }, 
-	{ 0x7147, 0xDE6B }, { 0x7149, 0xB7D2 }, { 0x714B, 0xDE7A }, { 0x714C, 0xB7D7 }, { 0x714D, 0xDEA2 }, { 0x714E, 0xB7CE }, { 0x7150, 0xDE7D }, { 0x7152, 0xDE6D }, 
-	{ 0x7153, 0xDE7E }, { 0x7154, 0xDE6C }, { 0x7156, 0xB7DC }, { 0x7158, 0xDE78 }, { 0x7159, 0xB7CF }, { 0x715A, 0xDEA3 }, { 0x715C, 0xB7D4 }, { 0x715D, 0xDE71 }, 
-	{ 0x715E, 0xB7D9 }, { 0x715F, 0xDE7C }, { 0x7160, 0xDE6F }, { 0x7161, 0xDE76 }, { 0x7162, 0xDE72 }, { 0x7163, 0xDE6E }, { 0x7164, 0xB7D1 }, { 0x7165, 0xB7D8 }, 
-	{ 0x7166, 0xB7D6 }, { 0x7167, 0xB7D3 }, { 0x7168, 0xB7DB }, { 0x7169, 0xB7D0 }, { 0x716A, 0xDE75 }, { 0x716C, 0xB7D5 }, { 0x716E, 0xB54E }, { 0x7170, 0xDE7B }, 
-	{ 0x7172, 0xDE73 }, { 0x7178, 0xDE74 }, { 0x717B, 0xE2C1 }, { 0x717D, 0xBAB4 }, { 0x7180, 0xE2BD }, { 0x7181, 0xE2C3 }, { 0x7182, 0xE2BF }, { 0x7184, 0xBAB6 }, 
-	{ 0x7185, 0xE2BE }, { 0x7186, 0xE2C2 }, { 0x7187, 0xE2BA }, { 0x7189, 0xE2BC }, { 0x718A, 0xBAB5 }, { 0x718F, 0xE2C0 }, { 0x7190, 0xE2BB }, { 0x7192, 0xBAB7 }, 
-	{ 0x7194, 0xBAB2 }, { 0x7197, 0xE2C4 }, { 0x7199, 0xBAB3 }, { 0x719A, 0xE667 }, { 0x719B, 0xE664 }, { 0x719C, 0xE670 }, { 0x719D, 0xE66A }, { 0x719E, 0xE66C }, 
-	{ 0x719F, 0xBCF4 }, { 0x71A0, 0xE666 }, { 0x71A1, 0xE66E }, { 0x71A4, 0xE66D }, { 0x71A5, 0xE66B }, { 0x71A7, 0xE671 }, { 0x71A8, 0xBCF7 }, { 0x71A9, 0xE668 }, 
-	{ 0x71AA, 0xE66F }, { 0x71AC, 0xBCF5 }, { 0x71AF, 0xE663 }, { 0x71B0, 0xE665 }, { 0x71B1, 0xBCF6 }, { 0x71B2, 0xE662 }, { 0x71B3, 0xE672 }, { 0x71B5, 0xE669 }, 
-	{ 0x71B8, 0xEA4A }, { 0x71B9, 0xBF51 }, { 0x71BC, 0xEA55 }, { 0x71BD, 0xEA53 }, { 0x71BE, 0xBF4B }, { 0x71BF, 0xEA49 }, { 0x71C0, 0xEA4C }, { 0x71C1, 0xEA4D }, 
-	{ 0x71C2, 0xEA48 }, { 0x71C3, 0xBF55 }, { 0x71C4, 0xBF56 }, { 0x71C5, 0xEA47 }, { 0x71C6, 0xEA56 }, { 0x71C7, 0xEA51 }, { 0x71C8, 0xBF4F }, { 0x71C9, 0xBF4C }, 
-	{ 0x71CA, 0xEA50 }, { 0x71CB, 0xEA4E }, { 0x71CE, 0xBF52 }, { 0x71CF, 0xEA52 }, { 0x71D0, 0xBF4D }, { 0x71D2, 0xBF4E }, { 0x71D4, 0xEA4F }, { 0x71D5, 0xBF50 }, 
-	{ 0x71D6, 0xEA4B }, { 0x71D8, 0xEA54 }, { 0x71D9, 0xBF53 }, { 0x71DA, 0xEA57 }, { 0x71DB, 0xEA58 }, { 0x71DC, 0xBF54 }, { 0x71DF, 0xC0E7 }, { 0x71E0, 0xC0EE }, 
-	{ 0x71E1, 0xED5C }, { 0x71E2, 0xED62 }, { 0x71E4, 0xED60 }, { 0x71E5, 0xC0EA }, { 0x71E6, 0xC0E9 }, { 0x71E7, 0xC0E6 }, { 0x71E8, 0xED5E }, { 0x71EC, 0xC0EC }, 
-	{ 0x71ED, 0xC0EB }, { 0x71EE, 0xC0E8 }, { 0x71F0, 0xED61 }, { 0x71F1, 0xED5D }, { 0x71F2, 0xED5F }, { 0x71F4, 0xC0ED }, { 0x71F8, 0xC277 }, { 0x71F9, 0xEFFB }, 
-	{ 0x71FB, 0xC274 }, { 0x71FC, 0xC275 }, { 0x71FD, 0xEFFD }, { 0x71FE, 0xC276 }, { 0x71FF, 0xEFFA }, { 0x7201, 0xEFF9 }, { 0x7202, 0xF26C }, { 0x7203, 0xEFFC }, 
-	{ 0x7205, 0xF26D }, { 0x7206, 0xC37A }, { 0x7207, 0xF26B }, { 0x720A, 0xF26A }, { 0x720C, 0xF269 }, { 0x720D, 0xC37B }, { 0x7210, 0xC46C }, { 0x7213, 0xF46A }, 
-	{ 0x7214, 0xF46B }, { 0x7219, 0xF5DC }, { 0x721A, 0xF5DB }, { 0x721B, 0xC4EA }, { 0x721D, 0xF5DA }, { 0x721E, 0xF6EC }, { 0x721F, 0xF6ED }, { 0x7222, 0xF7E6 }, 
-	{ 0x7223, 0xF8B1 }, { 0x7226, 0xF8F6 }, { 0x7227, 0xF9BC }, { 0x7228, 0xC679 }, { 0x7229, 0xF9C6 }, { 0x722A, 0xA4F6 }, { 0x722C, 0xAAA6 }, { 0x722D, 0xAAA7 }, 
-	{ 0x7230, 0xACB8 }, { 0x7235, 0xC0EF }, { 0x7236, 0xA4F7 }, { 0x7238, 0xAAA8 }, { 0x7239, 0xAF52 }, { 0x723A, 0xB7DD }, { 0x723B, 0xA4F8 }, { 0x723D, 0xB26E }, 
-	{ 0x723E, 0xBAB8 }, { 0x723F, 0xC962 }, { 0x7241, 0xCFB7 }, { 0x7242, 0xD27D }, { 0x7244, 0xE2C5 }, { 0x7246, 0xC0F0 }, { 0x7247, 0xA4F9 }, { 0x7248, 0xAAA9 }, 
-	{ 0x7249, 0xCFB8 }, { 0x724A, 0xCFB9 }, { 0x724B, 0xDA66 }, { 0x724C, 0xB550 }, { 0x724F, 0xDEA4 }, { 0x7252, 0xB7DE }, { 0x7253, 0xE2C6 }, { 0x7256, 0xBCF8 }, 
-	{ 0x7258, 0xC37C }, { 0x7259, 0xA4FA }, { 0x725A, 0xDA67 }, { 0x725B, 0xA4FB }, { 0x725D, 0xA6C9 }, { 0x725E, 0xCA42 }, { 0x725F, 0xA6C8 }, { 0x7260, 0xA865 }, 
-	{ 0x7261, 0xA864 }, { 0x7262, 0xA863 }, { 0x7263, 0xCB60 }, { 0x7267, 0xAAAA }, { 0x7269, 0xAAAB }, { 0x726A, 0xCD5B }, { 0x726C, 0xCFBA }, { 0x726E, 0xCFBD }, 
-	{ 0x726F, 0xACBA }, { 0x7270, 0xCFBB }, { 0x7272, 0xACB9 }, { 0x7273, 0xCFBC }, { 0x7274, 0xACBB }, { 0x7276, 0xD2A2 }, { 0x7277, 0xD2A1 }, { 0x7278, 0xD27E }, 
-	{ 0x7279, 0xAF53 }, { 0x727B, 0xD65D }, { 0x727C, 0xD65E }, { 0x727D, 0xB26F }, { 0x727E, 0xD65C }, { 0x727F, 0xD65F }, { 0x7280, 0xB552 }, { 0x7281, 0xB270 }, 
-	{ 0x7284, 0xB551 }, { 0x7285, 0xDA6B }, { 0x7286, 0xDA6A }, { 0x7288, 0xDA68 }, { 0x7289, 0xDA69 }, { 0x728B, 0xDA6C }, { 0x728C, 0xDEA6 }, { 0x728D, 0xDEA5 }, 
-	{ 0x728E, 0xDEA9 }, { 0x7290, 0xDEA8 }, { 0x7291, 0xDEA7 }, { 0x7292, 0xBAB9 }, { 0x7293, 0xE2C9 }, { 0x7295, 0xE2C8 }, { 0x7296, 0xBABA }, { 0x7297, 0xE2C7 }, 
-	{ 0x7298, 0xE673 }, { 0x729A, 0xE674 }, { 0x729B, 0xBCF9 }, { 0x729D, 0xEA59 }, { 0x729E, 0xEA5A }, { 0x72A1, 0xF272 }, { 0x72A2, 0xC37D }, { 0x72A3, 0xF271 }, 
-	{ 0x72A4, 0xF270 }, { 0x72A5, 0xF26E }, { 0x72A6, 0xF26F }, { 0x72A7, 0xC4EB }, { 0x72A8, 0xF46C }, { 0x72A9, 0xF6EE }, { 0x72AA, 0xF8F7 }, { 0x72AC, 0xA4FC }, 
-	{ 0x72AE, 0xC9A5 }, { 0x72AF, 0xA5C7 }, { 0x72B0, 0xC9A6 }, { 0x72B4, 0xCA43 }, { 0x72B5, 0xCA44 }, { 0x72BA, 0xCB66 }, { 0x72BD, 0xCB62 }, { 0x72BF, 0xCB61 }, 
-	{ 0x72C0, 0xAAAC }, { 0x72C1, 0xCB65 }, { 0x72C2, 0xA867 }, { 0x72C3, 0xCB63 }, { 0x72C4, 0xA866 }, { 0x72C5, 0xCB67 }, { 0x72C6, 0xCB64 }, { 0x72C9, 0xCD5F }, 
-	{ 0x72CA, 0xCFBE }, { 0x72CB, 0xCD5D }, { 0x72CC, 0xCD64 }, { 0x72CE, 0xAAAD }, { 0x72D0, 0xAAB0 }, { 0x72D1, 0xCD65 }, { 0x72D2, 0xCD61 }, { 0x72D4, 0xCD62 }, 
-	{ 0x72D6, 0xCD5C }, { 0x72D7, 0xAAAF }, { 0x72D8, 0xCD5E }, { 0x72D9, 0xAAAE }, { 0x72DA, 0xCD63 }, { 0x72DC, 0xCD60 }, { 0x72DF, 0xCFC2 }, { 0x72E0, 0xACBD }, 
-	{ 0x72E1, 0xACBE }, { 0x72E3, 0xCFC5 }, { 0x72E4, 0xCFBF }, { 0x72E6, 0xCFC4 }, { 0x72E8, 0xCFC0 }, { 0x72E9, 0xACBC }, { 0x72EA, 0xCFC3 }, { 0x72EB, 0xCFC1 }, 
-	{ 0x72F3, 0xD2A8 }, { 0x72F4, 0xD2A5 }, { 0x72F6, 0xD2A7 }, { 0x72F7, 0xAF58 }, { 0x72F8, 0xAF57 }, { 0x72F9, 0xAF55 }, { 0x72FA, 0xD2A4 }, { 0x72FB, 0xD2A9 }, 
-	{ 0x72FC, 0xAF54 }, { 0x72FD, 0xAF56 }, { 0x72FE, 0xD2A6 }, { 0x72FF, 0xD667 }, { 0x7300, 0xD2A3 }, { 0x7301, 0xD2AA }, { 0x7307, 0xD662 }, { 0x7308, 0xD666 }, 
-	{ 0x730A, 0xD665 }, { 0x730B, 0xDA6E }, { 0x730C, 0xDA79 }, { 0x730F, 0xD668 }, { 0x7311, 0xD663 }, { 0x7312, 0xDA6D }, { 0x7313, 0xB274 }, { 0x7316, 0xB273 }, 
-	{ 0x7317, 0xD661 }, { 0x7318, 0xD664 }, { 0x7319, 0xB275 }, { 0x731B, 0xB272 }, { 0x731C, 0xB271 }, { 0x731D, 0xD660 }, { 0x731E, 0xD669 }, { 0x7322, 0xDA70 }, 
-	{ 0x7323, 0xDA77 }, { 0x7325, 0xB554 }, { 0x7326, 0xDA76 }, { 0x7327, 0xDA73 }, { 0x7329, 0xB556 }, { 0x732D, 0xDA75 }, { 0x7330, 0xDA6F }, { 0x7331, 0xDA71 }, 
-	{ 0x7332, 0xDA74 }, { 0x7333, 0xDA72 }, { 0x7334, 0xB555 }, { 0x7335, 0xDA78 }, { 0x7336, 0xB553 }, { 0x7337, 0xB7DF }, { 0x733A, 0xDEAD }, { 0x733B, 0xDEAC }, 
-	{ 0x733C, 0xDEAA }, { 0x733E, 0xB7E2 }, { 0x733F, 0xB7E1 }, { 0x7340, 0xDEAE }, { 0x7342, 0xDEAB }, { 0x7343, 0xE2CA }, { 0x7344, 0xBABB }, { 0x7345, 0xB7E0 }, 
-	{ 0x7349, 0xDEB0 }, { 0x734A, 0xDEAF }, { 0x734C, 0xE2CD }, { 0x734D, 0xE2CB }, { 0x734E, 0xBCFA }, { 0x7350, 0xBABC }, { 0x7351, 0xE2CC }, { 0x7352, 0xE676 }, 
-	{ 0x7357, 0xBCFB }, { 0x7358, 0xE675 }, { 0x7359, 0xE67E }, { 0x735A, 0xE67D }, { 0x735B, 0xE67B }, { 0x735D, 0xE67A }, { 0x735E, 0xE677 }, { 0x735F, 0xE678 }, 
-	{ 0x7360, 0xE679 }, { 0x7361, 0xE67C }, { 0x7362, 0xE6A1 }, { 0x7365, 0xEA5F }, { 0x7366, 0xEA5C }, { 0x7367, 0xEA5D }, { 0x7368, 0xBF57 }, { 0x7369, 0xEA5B }, 
-	{ 0x736A, 0xEA61 }, { 0x736B, 0xEA60 }, { 0x736C, 0xEA5E }, { 0x736E, 0xED64 }, { 0x736F, 0xED65 }, { 0x7370, 0xC0F1 }, { 0x7372, 0xC0F2 }, { 0x7373, 0xED63 }, 
-	{ 0x7375, 0xC279 }, { 0x7376, 0xEFFE }, { 0x7377, 0xC278 }, { 0x7378, 0xC37E }, { 0x737A, 0xC3A1 }, { 0x737B, 0xC46D }, { 0x737C, 0xF46E }, { 0x737D, 0xF46D }, 
-	{ 0x737E, 0xF5DD }, { 0x737F, 0xF6EF }, { 0x7380, 0xC57A }, { 0x7381, 0xF7E8 }, { 0x7382, 0xF7E7 }, { 0x7383, 0xF7E9 }, { 0x7384, 0xA5C8 }, { 0x7385, 0xCFC6 }, 
-	{ 0x7386, 0xAF59 }, { 0x7387, 0xB276 }, { 0x7388, 0xD66A }, { 0x7389, 0xA5C9 }, { 0x738A, 0xC9A7 }, { 0x738B, 0xA4FD }, { 0x738E, 0xCA45 }, { 0x7392, 0xCB6C }, 
-	{ 0x7393, 0xCB6A }, { 0x7394, 0xCB6B }, { 0x7395, 0xCB68 }, { 0x7396, 0xA868 }, { 0x7397, 0xCB69 }, { 0x739D, 0xCD6D }, { 0x739F, 0xAAB3 }, { 0x73A0, 0xCD6B }, 
-	{ 0x73A1, 0xCD67 }, { 0x73A2, 0xCD6A }, { 0x73A4, 0xCD66 }, { 0x73A5, 0xAAB5 }, { 0x73A6, 0xCD69 }, { 0x73A8, 0xAAB2 }, { 0x73A9, 0xAAB1 }, { 0x73AB, 0xAAB4 }, 
-	{ 0x73AC, 0xCD6C }, { 0x73AD, 0xCD68 }, { 0x73B2, 0xACC2 }, { 0x73B3, 0xACC5 }, { 0x73B4, 0xCFCE }, { 0x73B5, 0xCFCD }, { 0x73B6, 0xCFCC }, { 0x73B7, 0xACBF }, 
-	{ 0x73B8, 0xCFD5 }, { 0x73B9, 0xCFCB }, { 0x73BB, 0xACC1 }, { 0x73BC, 0xD2AF }, { 0x73BE, 0xCFD2 }, { 0x73BF, 0xCFD0 }, { 0x73C0, 0xACC4 }, { 0x73C2, 0xCFC8 }, 
-	{ 0x73C3, 0xCFD3 }, { 0x73C5, 0xCFCA }, { 0x73C6, 0xCFD4 }, { 0x73C7, 0xCFD1 }, { 0x73C8, 0xCFC9 }, { 0x73CA, 0xACC0 }, { 0x73CB, 0xCFD6 }, { 0x73CC, 0xCFC7 }, 
-	{ 0x73CD, 0xACC3 }, { 0x73D2, 0xD2B4 }, { 0x73D3, 0xD2AB }, { 0x73D4, 0xD2B6 }, { 0x73D6, 0xD2AE }, { 0x73D7, 0xD2B9 }, { 0x73D8, 0xD2BA }, { 0x73D9, 0xD2AC }, 
-	{ 0x73DA, 0xD2B8 }, { 0x73DB, 0xD2B5 }, { 0x73DC, 0xD2B3 }, { 0x73DD, 0xD2B7 }, { 0x73DE, 0xAF5F }, { 0x73E0, 0xAF5D }, { 0x73E3, 0xD2B1 }, { 0x73E5, 0xD2AD }, 
-	{ 0x73E7, 0xD2B0 }, { 0x73E8, 0xD2BB }, { 0x73E9, 0xD2B2 }, { 0x73EA, 0xAF5E }, { 0x73EB, 0xCFCF }, { 0x73ED, 0xAF5A }, { 0x73EE, 0xAF5C }, { 0x73F4, 0xD678 }, 
-	{ 0x73F5, 0xD66D }, { 0x73F6, 0xD66B }, { 0x73F8, 0xD66C }, { 0x73FA, 0xD673 }, { 0x73FC, 0xD674 }, { 0x73FD, 0xD670 }, { 0x73FE, 0xB27B }, { 0x73FF, 0xD675 }, 
-	{ 0x7400, 0xD672 }, { 0x7401, 0xD66F }, { 0x7403, 0xB279 }, { 0x7404, 0xD66E }, { 0x7405, 0xB277 }, { 0x7406, 0xB27A }, { 0x7407, 0xD671 }, { 0x7408, 0xD679 }, 
-	{ 0x7409, 0xAF5B }, { 0x740A, 0xB278 }, { 0x740B, 0xD677 }, { 0x740C, 0xD676 }, { 0x740D, 0xB27C }, { 0x7416, 0xDA7E }, { 0x741A, 0xDAA1 }, { 0x741B, 0xB560 }, 
-	{ 0x741D, 0xDAA7 }, { 0x7420, 0xDAA9 }, { 0x7421, 0xDAA2 }, { 0x7422, 0xB55A }, { 0x7423, 0xDAA6 }, { 0x7424, 0xDAA5 }, { 0x7425, 0xB55B }, { 0x7426, 0xB561 }, 
-	{ 0x7428, 0xB562 }, { 0x7429, 0xDAA8 }, { 0x742A, 0xB558 }, { 0x742B, 0xDA7D }, { 0x742C, 0xDA7B }, { 0x742D, 0xDAA3 }, { 0x742E, 0xDA7A }, { 0x742F, 0xB55F }, 
-	{ 0x7430, 0xDA7C }, { 0x7431, 0xDAA4 }, { 0x7432, 0xDAAA }, { 0x7433, 0xB559 }, { 0x7434, 0xB55E }, { 0x7435, 0xB55C }, { 0x7436, 0xB55D }, { 0x743A, 0xB557 }, 
-	{ 0x743F, 0xB7E9 }, { 0x7440, 0xDEB7 }, { 0x7441, 0xB7E8 }, { 0x7442, 0xDEBB }, { 0x7444, 0xDEB1 }, { 0x7446, 0xDEBC }, { 0x744A, 0xDEB2 }, { 0x744B, 0xDEB3 }, 
-	{ 0x744D, 0xDEBD }, { 0x744E, 0xDEBA }, { 0x744F, 0xDEB8 }, { 0x7450, 0xDEB9 }, { 0x7451, 0xDEB5 }, { 0x7452, 0xDEB4 }, { 0x7454, 0xDEBE }, { 0x7455, 0xB7E5 }, 
-	{ 0x7457, 0xDEB6 }, { 0x7459, 0xB7EA }, { 0x745A, 0xB7E4 }, { 0x745B, 0xB7EB }, { 0x745C, 0xB7EC }, { 0x745E, 0xB7E7 }, { 0x745F, 0xB7E6 }, { 0x7462, 0xE2CE }, 
-	{ 0x7463, 0xBABE }, { 0x7464, 0xBABD }, { 0x7467, 0xE2D3 }, { 0x7469, 0xBCFC }, { 0x746A, 0xBABF }, { 0x746D, 0xBAC1 }, { 0x746E, 0xE2D4 }, { 0x746F, 0xB7E3 }, 
-	{ 0x7470, 0xBAC0 }, { 0x7471, 0xE2D0 }, { 0x7472, 0xE2D2 }, { 0x7473, 0xE2CF }, { 0x7475, 0xE2D1 }, { 0x7479, 0xE6AB }, { 0x747C, 0xE6AA }, { 0x747D, 0xE6A7 }, 
-	{ 0x747E, 0xBD40 }, { 0x747F, 0xEA62 }, { 0x7480, 0xBD41 }, { 0x7481, 0xE6A6 }, { 0x7483, 0xBCFE }, { 0x7485, 0xE6A8 }, { 0x7486, 0xE6A5 }, { 0x7487, 0xE6A2 }, 
-	{ 0x7488, 0xE6A9 }, { 0x7489, 0xE6A3 }, { 0x748A, 0xE6A4 }, { 0x748B, 0xBCFD }, { 0x7490, 0xED69 }, { 0x7492, 0xEA66 }, { 0x7494, 0xEA65 }, { 0x7495, 0xEA67 }, 
-	{ 0x7497, 0xED66 }, { 0x7498, 0xBF5A }, { 0x749A, 0xEA63 }, { 0x749C, 0xBF58 }, { 0x749E, 0xBF5C }, { 0x749F, 0xBF5B }, { 0x74A0, 0xEA64 }, { 0x74A1, 0xEA68 }, 
-	{ 0x74A3, 0xBF59 }, { 0x74A5, 0xED6D }, { 0x74A6, 0xC0F5 }, { 0x74A7, 0xC27A }, { 0x74A8, 0xC0F6 }, { 0x74A9, 0xC0F3 }, { 0x74AA, 0xED6A }, { 0x74AB, 0xED68 }, 
-	{ 0x74AD, 0xED6B }, { 0x74AF, 0xED6E }, { 0x74B0, 0xC0F4 }, { 0x74B1, 0xED6C }, { 0x74B2, 0xED67 }, { 0x74B5, 0xF042 }, { 0x74B6, 0xF045 }, { 0x74B7, 0xF275 }, 
-	{ 0x74B8, 0xF040 }, { 0x74BA, 0xF46F }, { 0x74BB, 0xF046 }, { 0x74BD, 0xC3A2 }, { 0x74BE, 0xF044 }, { 0x74BF, 0xC27B }, { 0x74C0, 0xF041 }, { 0x74C1, 0xF043 }, 
-	{ 0x74C2, 0xF047 }, { 0x74C3, 0xF276 }, { 0x74C5, 0xF274 }, { 0x74CA, 0xC3A3 }, { 0x74CB, 0xF273 }, { 0x74CF, 0xC46E }, { 0x74D4, 0xC4ED }, { 0x74D5, 0xF6F1 }, 
-	{ 0x74D6, 0xC4EC }, { 0x74D7, 0xF6F3 }, { 0x74D8, 0xF6F0 }, { 0x74D9, 0xF6F2 }, { 0x74DA, 0xC5D0 }, { 0x74DB, 0xF8B2 }, { 0x74DC, 0xA5CA }, { 0x74DD, 0xCD6E }, 
-	{ 0x74DE, 0xD2BC }, { 0x74DF, 0xD2BD }, { 0x74E0, 0xB27D }, { 0x74E1, 0xDEBF }, { 0x74E2, 0xBF5D }, { 0x74E3, 0xC3A4 }, { 0x74E4, 0xC57B }, { 0x74E5, 0xF8B3 }, 
-	{ 0x74E6, 0xA5CB }, { 0x74E8, 0xCD6F }, { 0x74E9, 0xA260 }, { 0x74EC, 0xCFD7 }, { 0x74EE, 0xCFD8 }, { 0x74F4, 0xD2BE }, { 0x74F5, 0xD2BF }, { 0x74F6, 0xB27E }, 
-	{ 0x74F7, 0xB2A1 }, { 0x74FB, 0xDAAB }, { 0x74FD, 0xDEC2 }, { 0x74FE, 0xDEC1 }, { 0x74FF, 0xDEC0 }, { 0x7500, 0xE2D5 }, { 0x7502, 0xE2D6 }, { 0x7503, 0xE2D7 }, 
-	{ 0x7504, 0xBAC2 }, { 0x7507, 0xE6AD }, { 0x7508, 0xE6AC }, { 0x750B, 0xEA69 }, { 0x750C, 0xBF5E }, { 0x750D, 0xBF5F }, { 0x750F, 0xED72 }, { 0x7510, 0xED6F }, 
-	{ 0x7511, 0xED70 }, { 0x7512, 0xED71 }, { 0x7513, 0xF049 }, { 0x7514, 0xF048 }, { 0x7515, 0xC27C }, { 0x7516, 0xF277 }, { 0x7517, 0xF5DE }, { 0x7518, 0xA5CC }, 
-	{ 0x751A, 0xACC6 }, { 0x751C, 0xB2A2 }, { 0x751D, 0xDEC3 }, { 0x751F, 0xA5CD }, { 0x7521, 0xD2C0 }, { 0x7522, 0xB2A3 }, { 0x7525, 0xB563 }, { 0x7526, 0xB564 }, 
-	{ 0x7528, 0xA5CE }, { 0x7529, 0xA5CF }, { 0x752A, 0xCA46 }, { 0x752B, 0xA86A }, { 0x752C, 0xA869 }, { 0x752D, 0xACC7 }, { 0x752E, 0xCFD9 }, { 0x752F, 0xDAAC }, 
-	{ 0x7530, 0xA5D0 }, { 0x7531, 0xA5D1 }, { 0x7532, 0xA5D2 }, { 0x7533, 0xA5D3 }, { 0x7537, 0xA86B }, { 0x7538, 0xA86C }, { 0x7539, 0xCB6E }, { 0x753A, 0xCB6D }, 
-	{ 0x753D, 0xAAB6 }, { 0x753E, 0xCD72 }, { 0x753F, 0xCD70 }, { 0x7540, 0xCD71 }, { 0x7547, 0xCFDA }, { 0x7548, 0xCFDB }, { 0x754B, 0xACCB }, { 0x754C, 0xACC9 }, 
-	{ 0x754E, 0xACCA }, { 0x754F, 0xACC8 }, { 0x7554, 0xAF60 }, { 0x7559, 0xAF64 }, { 0x755A, 0xAF63 }, { 0x755B, 0xD2C1 }, { 0x755C, 0xAF62 }, { 0x755D, 0xAF61 }, 
-	{ 0x755F, 0xD2C2 }, { 0x7562, 0xB2A6 }, { 0x7563, 0xD67B }, { 0x7564, 0xD67A }, { 0x7565, 0xB2A4 }, { 0x7566, 0xB2A5 }, { 0x756A, 0xB566 }, { 0x756B, 0xB565 }, 
-	{ 0x756C, 0xDAAE }, { 0x756F, 0xDAAD }, { 0x7570, 0xB2A7 }, { 0x7576, 0xB7ED }, { 0x7577, 0xDEC5 }, { 0x7578, 0xB7EE }, { 0x7579, 0xDEC4 }, { 0x757D, 0xE2D8 }, 
-	{ 0x757E, 0xE6AE }, { 0x757F, 0xBD42 }, { 0x7580, 0xEA6A }, { 0x7584, 0xED73 }, { 0x7586, 0xC3A6 }, { 0x7587, 0xC3A5 }, { 0x758A, 0xC57C }, { 0x758B, 0xA5D4 }, 
-	{ 0x758C, 0xCD73 }, { 0x758F, 0xB2A8 }, { 0x7590, 0xE2D9 }, { 0x7591, 0xBAC3 }, { 0x7594, 0xCB6F }, { 0x7595, 0xCB70 }, { 0x7598, 0xCD74 }, { 0x7599, 0xAAB8 }, 
-	{ 0x759A, 0xAAB9 }, { 0x759D, 0xAAB7 }, { 0x75A2, 0xACCF }, { 0x75A3, 0xACD0 }, { 0x75A4, 0xACCD }, { 0x75A5, 0xACCE }, { 0x75A7, 0xCFDC }, { 0x75AA, 0xCFDD }, 
-	{ 0x75AB, 0xACCC }, { 0x75B0, 0xD2C3 }, { 0x75B2, 0xAF68 }, { 0x75B3, 0xAF69 }, { 0x75B5, 0xB2AB }, { 0x75B6, 0xD2C9 }, { 0x75B8, 0xAF6E }, { 0x75B9, 0xAF6C }, 
-	{ 0x75BA, 0xD2CA }, { 0x75BB, 0xD2C5 }, { 0x75BC, 0xAF6B }, { 0x75BD, 0xAF6A }, { 0x75BE, 0xAF65 }, { 0x75BF, 0xD2C8 }, { 0x75C0, 0xD2C7 }, { 0x75C1, 0xD2C4 }, 
-	{ 0x75C2, 0xAF6D }, { 0x75C4, 0xD2C6 }, { 0x75C5, 0xAF66 }, { 0x75C7, 0xAF67 }, { 0x75CA, 0xB2AC }, { 0x75CB, 0xD6A1 }, { 0x75CC, 0xD6A2 }, { 0x75CD, 0xB2AD }, 
-	{ 0x75CE, 0xD67C }, { 0x75CF, 0xD67E }, { 0x75D0, 0xD6A4 }, { 0x75D1, 0xD6A3 }, { 0x75D2, 0xD67D }, { 0x75D4, 0xB2A9 }, { 0x75D5, 0xB2AA }, { 0x75D7, 0xDAB6 }, 
-	{ 0x75D8, 0xB56B }, { 0x75D9, 0xB56A }, { 0x75DA, 0xDAB0 }, { 0x75DB, 0xB568 }, { 0x75DD, 0xDAB3 }, { 0x75DE, 0xB56C }, { 0x75DF, 0xDAB4 }, { 0x75E0, 0xB56D }, 
-	{ 0x75E1, 0xDAB1 }, { 0x75E2, 0xB567 }, { 0x75E3, 0xB569 }, { 0x75E4, 0xDAB5 }, { 0x75E6, 0xDAB2 }, { 0x75E7, 0xDAAF }, { 0x75ED, 0xDED2 }, { 0x75EF, 0xDEC7 }, 
-	{ 0x75F0, 0xB7F0 }, { 0x75F1, 0xB7F3 }, { 0x75F2, 0xB7F2 }, { 0x75F3, 0xB7F7 }, { 0x75F4, 0xB7F6 }, { 0x75F5, 0xDED3 }, { 0x75F6, 0xDED1 }, { 0x75F7, 0xDECA }, 
-	{ 0x75F8, 0xDECE }, { 0x75F9, 0xDECD }, { 0x75FA, 0xB7F4 }, { 0x75FB, 0xDED0 }, { 0x75FC, 0xDECC }, { 0x75FD, 0xDED4 }, { 0x75FE, 0xDECB }, { 0x75FF, 0xB7F5 }, 
-	{ 0x7600, 0xB7EF }, { 0x7601, 0xB7F1 }, { 0x7603, 0xDEC9 }, { 0x7608, 0xE2DB }, { 0x7609, 0xBAC7 }, { 0x760A, 0xE2DF }, { 0x760B, 0xBAC6 }, { 0x760C, 0xE2DC }, 
-	{ 0x760D, 0xBAC5 }, { 0x760F, 0xDEC8 }, { 0x7610, 0xDECF }, { 0x7611, 0xE2DE }, { 0x7613, 0xBAC8 }, { 0x7614, 0xE2E0 }, { 0x7615, 0xE2DD }, { 0x7616, 0xE2DA }, 
-	{ 0x7619, 0xE6B1 }, { 0x761A, 0xE6B5 }, { 0x761B, 0xE6B7 }, { 0x761C, 0xE6B3 }, { 0x761D, 0xE6B2 }, { 0x761E, 0xE6B0 }, { 0x761F, 0xBD45 }, { 0x7620, 0xBD43 }, 
-	{ 0x7621, 0xBD48 }, { 0x7622, 0xBD49 }, { 0x7623, 0xE6B4 }, { 0x7624, 0xBD46 }, { 0x7625, 0xE6AF }, { 0x7626, 0xBD47 }, { 0x7627, 0xBAC4 }, { 0x7628, 0xE6B6 }, 
-	{ 0x7629, 0xBD44 }, { 0x762D, 0xEA6C }, { 0x762F, 0xEA6B }, { 0x7630, 0xEA73 }, { 0x7631, 0xEA6D }, { 0x7632, 0xEA72 }, { 0x7633, 0xEA6F }, { 0x7634, 0xBF60 }, 
-	{ 0x7635, 0xEA71 }, { 0x7638, 0xBF61 }, { 0x763A, 0xBF62 }, { 0x763C, 0xEA70 }, { 0x763D, 0xEA6E }, { 0x7642, 0xC0F8 }, { 0x7643, 0xED74 }, { 0x7646, 0xC0F7 }, 
-	{ 0x7647, 0xED77 }, { 0x7648, 0xED75 }, { 0x7649, 0xED76 }, { 0x764C, 0xC0F9 }, { 0x7650, 0xF04D }, { 0x7652, 0xC2A1 }, { 0x7653, 0xF04E }, { 0x7656, 0xC27D }, 
-	{ 0x7657, 0xF04F }, { 0x7658, 0xC27E }, { 0x7659, 0xF04C }, { 0x765A, 0xF050 }, { 0x765C, 0xF04A }, { 0x765F, 0xC3A7 }, { 0x7660, 0xF278 }, { 0x7661, 0xC3A8 }, 
-	{ 0x7662, 0xC46F }, { 0x7664, 0xF04B }, { 0x7665, 0xC470 }, { 0x7669, 0xC4EE }, { 0x766A, 0xF5DF }, { 0x766C, 0xC57E }, { 0x766D, 0xF6F4 }, { 0x766E, 0xC57D }, 
-	{ 0x7670, 0xF7EA }, { 0x7671, 0xC5F5 }, { 0x7672, 0xC5F6 }, { 0x7675, 0xF9CC }, { 0x7678, 0xACD1 }, { 0x7679, 0xCFDE }, { 0x767B, 0xB56E }, { 0x767C, 0xB56F }, 
-	{ 0x767D, 0xA5D5 }, { 0x767E, 0xA6CA }, { 0x767F, 0xCA47 }, { 0x7681, 0xCB71 }, { 0x7682, 0xA86D }, { 0x7684, 0xAABA }, { 0x7686, 0xACD2 }, { 0x7687, 0xACD3 }, 
-	{ 0x7688, 0xACD4 }, { 0x7689, 0xD6A6 }, { 0x768A, 0xD2CB }, { 0x768B, 0xAF6F }, { 0x768E, 0xB2AE }, { 0x768F, 0xD6A5 }, { 0x7692, 0xDAB8 }, { 0x7693, 0xB571 }, 
-	{ 0x7695, 0xDAB7 }, { 0x7696, 0xB570 }, { 0x7699, 0xDED5 }, { 0x769A, 0xBD4A }, { 0x769B, 0xE6BB }, { 0x769C, 0xE6B8 }, { 0x769D, 0xE6B9 }, { 0x769E, 0xE6BA }, 
-	{ 0x76A4, 0xED78 }, { 0x76A6, 0xF051 }, { 0x76AA, 0xF471 }, { 0x76AB, 0xF470 }, { 0x76AD, 0xF6F5 }, { 0x76AE, 0xA5D6 }, { 0x76AF, 0xCD75 }, { 0x76B0, 0xAF70 }, 
-	{ 0x76B4, 0xB572 }, { 0x76B5, 0xDED6 }, { 0x76B8, 0xE2E1 }, { 0x76BA, 0xBD4B }, { 0x76BB, 0xEA74 }, { 0x76BD, 0xF052 }, { 0x76BE, 0xF472 }, { 0x76BF, 0xA5D7 }, 
-	{ 0x76C2, 0xAABB }, { 0x76C3, 0xACD7 }, { 0x76C4, 0xCFDF }, { 0x76C5, 0xACD8 }, { 0x76C6, 0xACD6 }, { 0x76C8, 0xACD5 }, { 0x76C9, 0xD2CC }, { 0x76CA, 0xAF71 }, 
-	{ 0x76CD, 0xAF72 }, { 0x76CE, 0xAF73 }, { 0x76D2, 0xB2B0 }, { 0x76D3, 0xD6A7 }, { 0x76D4, 0xB2AF }, { 0x76DA, 0xDAB9 }, { 0x76DB, 0xB2B1 }, { 0x76DC, 0xB573 }, 
-	{ 0x76DD, 0xDED7 }, { 0x76DE, 0xB7F8 }, { 0x76DF, 0xB7F9 }, { 0x76E1, 0xBAC9 }, { 0x76E3, 0xBACA }, { 0x76E4, 0xBD4C }, { 0x76E5, 0xBF64 }, { 0x76E6, 0xEA75 }, 
-	{ 0x76E7, 0xBF63 }, { 0x76E9, 0xED79 }, { 0x76EA, 0xC0FA }, { 0x76EC, 0xF053 }, { 0x76ED, 0xF473 }, { 0x76EE, 0xA5D8 }, { 0x76EF, 0xA86E }, { 0x76F0, 0xCD78 }, 
-	{ 0x76F1, 0xCD77 }, { 0x76F2, 0xAABC }, { 0x76F3, 0xCD76 }, { 0x76F4, 0xAABD }, { 0x76F5, 0xCD79 }, { 0x76F7, 0xCFE5 }, { 0x76F8, 0xACDB }, { 0x76F9, 0xACDA }, 
-	{ 0x76FA, 0xCFE7 }, { 0x76FB, 0xCFE6 }, { 0x76FC, 0xACDF }, { 0x76FE, 0xACDE }, { 0x7701, 0xACD9 }, { 0x7703, 0xCFE1 }, { 0x7704, 0xCFE2 }, { 0x7705, 0xCFE3 }, 
-	{ 0x7707, 0xACE0 }, { 0x7708, 0xCFE0 }, { 0x7709, 0xACDC }, { 0x770A, 0xCFE4 }, { 0x770B, 0xACDD }, { 0x7710, 0xD2CF }, { 0x7711, 0xD2D3 }, { 0x7712, 0xD2D1 }, 
-	{ 0x7713, 0xD2D0 }, { 0x7715, 0xD2D4 }, { 0x7719, 0xD2D5 }, { 0x771A, 0xD2D6 }, { 0x771B, 0xD2CE }, { 0x771D, 0xD2CD }, { 0x771F, 0xAF75 }, { 0x7720, 0xAF76 }, 
-	{ 0x7722, 0xD2D7 }, { 0x7723, 0xD2D2 }, { 0x7725, 0xD6B0 }, { 0x7727, 0xD2D8 }, { 0x7728, 0xAF77 }, { 0x7729, 0xAF74 }, { 0x772D, 0xD6AA }, { 0x772F, 0xD6A9 }, 
-	{ 0x7731, 0xD6AB }, { 0x7732, 0xD6AC }, { 0x7733, 0xD6AE }, { 0x7734, 0xD6AD }, { 0x7735, 0xD6B2 }, { 0x7736, 0xB2B5 }, { 0x7737, 0xB2B2 }, { 0x7738, 0xB2B6 }, 
-	{ 0x7739, 0xD6A8 }, { 0x773A, 0xB2B7 }, { 0x773B, 0xD6B1 }, { 0x773C, 0xB2B4 }, { 0x773D, 0xD6AF }, { 0x773E, 0xB2B3 }, { 0x7744, 0xDABC }, { 0x7745, 0xDABE }, 
-	{ 0x7746, 0xDABA }, { 0x7747, 0xDABB }, { 0x774A, 0xDABF }, { 0x774B, 0xDAC1 }, { 0x774C, 0xDAC2 }, { 0x774D, 0xDABD }, { 0x774E, 0xDAC0 }, { 0x774F, 0xB574 }, 
-	{ 0x7752, 0xDEDB }, { 0x7754, 0xDEE0 }, { 0x7755, 0xDED8 }, { 0x7756, 0xDEDC }, { 0x7759, 0xDEE1 }, { 0x775A, 0xDEDD }, { 0x775B, 0xB7FA }, { 0x775C, 0xB843 }, 
-	{ 0x775E, 0xB7FD }, { 0x775F, 0xDED9 }, { 0x7760, 0xDEDA }, { 0x7761, 0xBACE }, { 0x7762, 0xB846 }, { 0x7763, 0xB7FE }, { 0x7765, 0xB844 }, { 0x7766, 0xB7FC }, 
-	{ 0x7767, 0xDEDF }, { 0x7768, 0xB845 }, { 0x7769, 0xDEDE }, { 0x776A, 0xB841 }, { 0x776B, 0xB7FB }, { 0x776C, 0xB842 }, { 0x776D, 0xDEE2 }, { 0x776E, 0xE2E6 }, 
-	{ 0x776F, 0xE2E8 }, { 0x7779, 0xB840 }, { 0x777C, 0xE2E3 }, { 0x777D, 0xBACC }, { 0x777E, 0xE2E9 }, { 0x777F, 0xBACD }, { 0x7780, 0xE2E7 }, { 0x7781, 0xE2E2 }, 
-	{ 0x7782, 0xE2E5 }, { 0x7783, 0xE2EA }, { 0x7784, 0xBACB }, { 0x7785, 0xE2E4 }, { 0x7787, 0xBD4E }, { 0x7788, 0xE6BF }, { 0x7789, 0xE6BE }, { 0x778B, 0xBD51 }, 
-	{ 0x778C, 0xBD4F }, { 0x778D, 0xE6BC }, { 0x778E, 0xBD4D }, { 0x778F, 0xE6BD }, { 0x7791, 0xBD50 }, { 0x7795, 0xEA7D }, { 0x7797, 0xEAA1 }, { 0x7799, 0xEA7E }, 
-	{ 0x779A, 0xEA76 }, { 0x779B, 0xEA7A }, { 0x779C, 0xEA79 }, { 0x779D, 0xEA77 }, { 0x779E, 0xBF66 }, { 0x779F, 0xBF67 }, { 0x77A0, 0xBF65 }, { 0x77A1, 0xEA78 }, 
-	{ 0x77A2, 0xEA7B }, { 0x77A3, 0xEA7C }, { 0x77A5, 0xBF68 }, { 0x77A7, 0xC140 }, { 0x77A8, 0xEDA3 }, { 0x77AA, 0xC0FC }, { 0x77AB, 0xED7B }, { 0x77AC, 0xC0FE }, 
-	{ 0x77AD, 0xC141 }, { 0x77B0, 0xC0FD }, { 0x77B1, 0xEDA2 }, { 0x77B2, 0xED7C }, { 0x77B3, 0xC0FB }, { 0x77B4, 0xEDA1 }, { 0x77B5, 0xED7A }, { 0x77B6, 0xED7E }, 
-	{ 0x77B7, 0xED7D }, { 0x77BA, 0xF055 }, { 0x77BB, 0xC2A4 }, { 0x77BC, 0xC2A5 }, { 0x77BD, 0xC2A2 }, { 0x77BF, 0xC2A3 }, { 0x77C2, 0xF054 }, { 0x77C4, 0xF27B }, 
-	{ 0x77C7, 0xC3A9 }, { 0x77C9, 0xF279 }, { 0x77CA, 0xF27A }, { 0x77CC, 0xF474 }, { 0x77CD, 0xF477 }, { 0x77CE, 0xF475 }, { 0x77CF, 0xF476 }, { 0x77D0, 0xF5E0 }, 
-	{ 0x77D3, 0xC4EF }, { 0x77D4, 0xF7EB }, { 0x77D5, 0xF8B4 }, { 0x77D7, 0xC5F7 }, { 0x77D8, 0xF8F8 }, { 0x77D9, 0xF8F9 }, { 0x77DA, 0xC666 }, { 0x77DB, 0xA5D9 }, 
-	{ 0x77DC, 0xACE1 }, { 0x77DE, 0xDAC3 }, { 0x77E0, 0xDEE3 }, { 0x77E2, 0xA5DA }, { 0x77E3, 0xA86F }, { 0x77E5, 0xAABE }, { 0x77E7, 0xCFE8 }, { 0x77E8, 0xCFE9 }, 
-	{ 0x77E9, 0xAF78 }, { 0x77EC, 0xDAC4 }, { 0x77ED, 0xB575 }, { 0x77EE, 0xB847 }, { 0x77EF, 0xC142 }, { 0x77F0, 0xEDA4 }, { 0x77F1, 0xF27C }, { 0x77F2, 0xF478 }, 
-	{ 0x77F3, 0xA5DB }, { 0x77F7, 0xCDA1 }, { 0x77F8, 0xCD7A }, { 0x77F9, 0xCD7C }, { 0x77FA, 0xCD7E }, { 0x77FB, 0xCD7D }, { 0x77FC, 0xCD7B }, { 0x77FD, 0xAABF }, 
-	{ 0x7802, 0xACE2 }, { 0x7803, 0xCFF2 }, { 0x7805, 0xCFED }, { 0x7806, 0xCFEA }, { 0x7809, 0xCFF1 }, { 0x780C, 0xACE4 }, { 0x780D, 0xACE5 }, { 0x780E, 0xCFF0 }, 
-	{ 0x780F, 0xCFEF }, { 0x7810, 0xCFEE }, { 0x7811, 0xCFEB }, { 0x7812, 0xCFEC }, { 0x7813, 0xCFF3 }, { 0x7814, 0xACE3 }, { 0x781D, 0xAF7C }, { 0x781F, 0xAFA4 }, 
-	{ 0x7820, 0xAFA3 }, { 0x7821, 0xD2E1 }, { 0x7822, 0xD2DB }, { 0x7823, 0xD2D9 }, { 0x7825, 0xAFA1 }, { 0x7826, 0xD6B9 }, { 0x7827, 0xAF7A }, { 0x7828, 0xD2DE }, 
-	{ 0x7829, 0xD2E2 }, { 0x782A, 0xD2E4 }, { 0x782B, 0xD2E0 }, { 0x782C, 0xD2DA }, { 0x782D, 0xAFA2 }, { 0x782E, 0xD2DF }, { 0x782F, 0xD2DD }, { 0x7830, 0xAF79 }, 
-	{ 0x7831, 0xD2E5 }, { 0x7832, 0xAFA5 }, { 0x7833, 0xD2E3 }, { 0x7834, 0xAF7D }, { 0x7835, 0xD2DC }, { 0x7837, 0xAF7E }, { 0x7838, 0xAF7B }, { 0x7843, 0xB2B9 }, 
-	{ 0x7845, 0xD6BA }, { 0x7848, 0xD6B3 }, { 0x7849, 0xD6B5 }, { 0x784A, 0xD6B7 }, { 0x784C, 0xD6B8 }, { 0x784D, 0xD6B6 }, { 0x784E, 0xB2BA }, { 0x7850, 0xD6BB }, 
-	{ 0x7852, 0xD6B4 }, { 0x785C, 0xDAC8 }, { 0x785D, 0xB576 }, { 0x785E, 0xDAD0 }, { 0x7860, 0xDAC5 }, { 0x7862, 0xDAD1 }, { 0x7864, 0xDAC6 }, { 0x7865, 0xDAC7 }, 
-	{ 0x7868, 0xDACF }, { 0x7869, 0xDACE }, { 0x786A, 0xDACB }, { 0x786B, 0xB2B8 }, { 0x786C, 0xB577 }, { 0x786D, 0xDAC9 }, { 0x786E, 0xDACC }, { 0x786F, 0xB578 }, 
-	{ 0x7870, 0xDACD }, { 0x7871, 0xDACA }, { 0x7879, 0xDEEE }, { 0x787B, 0xDEF2 }, { 0x787C, 0xB84E }, { 0x787E, 0xE2F0 }, { 0x787F, 0xB851 }, { 0x7880, 0xDEF0 }, 
-	{ 0x7883, 0xDEED }, { 0x7884, 0xDEE8 }, { 0x7885, 0xDEEA }, { 0x7886, 0xDEEB }, { 0x7887, 0xDEE4 }, { 0x7889, 0xB84D }, { 0x788C, 0xB84C }, { 0x788E, 0xB848 }, 
-	{ 0x788F, 0xDEE7 }, { 0x7891, 0xB84F }, { 0x7893, 0xB850 }, { 0x7894, 0xDEE6 }, { 0x7895, 0xDEE9 }, { 0x7896, 0xDEF1 }, { 0x7897, 0xB84A }, { 0x7898, 0xB84B }, 
-	{ 0x7899, 0xDEEF }, { 0x789A, 0xDEE5 }, { 0x789E, 0xE2F2 }, { 0x789F, 0xBAD0 }, { 0x78A0, 0xE2F4 }, { 0x78A1, 0xDEEC }, { 0x78A2, 0xE2F6 }, { 0x78A3, 0xBAD4 }, 
-	{ 0x78A4, 0xE2F7 }, { 0x78A5, 0xE2F3 }, { 0x78A7, 0xBAD1 }, { 0x78A8, 0xE2EF }, { 0x78A9, 0xBAD3 }, { 0x78AA, 0xE2EC }, { 0x78AB, 0xE2F1 }, { 0x78AC, 0xE2F5 }, 
-	{ 0x78AD, 0xE2EE }, { 0x78B0, 0xB849 }, { 0x78B2, 0xE2EB }, { 0x78B3, 0xBAD2 }, { 0x78B4, 0xE2ED }, { 0x78BA, 0xBD54 }, { 0x78BB, 0xE6C1 }, { 0x78BC, 0xBD58 }, 
-	{ 0x78BE, 0xBD56 }, { 0x78C1, 0xBACF }, { 0x78C3, 0xE6C8 }, { 0x78C4, 0xE6C9 }, { 0x78C5, 0xBD53 }, { 0x78C8, 0xE6C7 }, { 0x78C9, 0xE6CA }, { 0x78CA, 0xBD55 }, 
-	{ 0x78CB, 0xBD52 }, { 0x78CC, 0xE6C3 }, { 0x78CD, 0xE6C0 }, { 0x78CE, 0xE6C5 }, { 0x78CF, 0xE6C2 }, { 0x78D0, 0xBD59 }, { 0x78D1, 0xE6C4 }, { 0x78D4, 0xE6C6 }, 
-	{ 0x78D5, 0xBD57 }, { 0x78DA, 0xBF6A }, { 0x78DB, 0xEAA8 }, { 0x78DD, 0xEAA2 }, { 0x78DE, 0xEAA6 }, { 0x78DF, 0xEAAC }, { 0x78E0, 0xEAAD }, { 0x78E1, 0xEAA9 }, 
-	{ 0x78E2, 0xEAAA }, { 0x78E3, 0xEAA7 }, { 0x78E5, 0xEAA4 }, { 0x78E7, 0xBF6C }, { 0x78E8, 0xBF69 }, { 0x78E9, 0xEAA3 }, { 0x78EA, 0xEAA5 }, { 0x78EC, 0xBF6B }, 
-	{ 0x78ED, 0xEAAB }, { 0x78EF, 0xC146 }, { 0x78F2, 0xEDAA }, { 0x78F3, 0xEDA5 }, { 0x78F4, 0xC145 }, { 0x78F7, 0xC143 }, { 0x78F9, 0xEDAC }, { 0x78FA, 0xC144 }, 
-	{ 0x78FB, 0xEDA8 }, { 0x78FC, 0xEDA9 }, { 0x78FD, 0xEDA6 }, { 0x78FE, 0xEDAD }, { 0x78FF, 0xF056 }, { 0x7901, 0xC147 }, { 0x7902, 0xEDA7 }, { 0x7904, 0xEDAE }, 
-	{ 0x7905, 0xEDAB }, { 0x7909, 0xF05A }, { 0x790C, 0xF057 }, { 0x790E, 0xC2A6 }, { 0x7910, 0xF05B }, { 0x7911, 0xF05D }, { 0x7912, 0xF05C }, { 0x7913, 0xF058 }, 
-	{ 0x7914, 0xF059 }, { 0x7917, 0xF2A3 }, { 0x7919, 0xC3AA }, { 0x791B, 0xF27E }, { 0x791C, 0xF2A2 }, { 0x791D, 0xF27D }, { 0x791E, 0xF2A4 }, { 0x7921, 0xF2A1 }, 
-	{ 0x7923, 0xF47A }, { 0x7924, 0xF47D }, { 0x7925, 0xF479 }, { 0x7926, 0xC471 }, { 0x7927, 0xF47B }, { 0x7928, 0xF47C }, { 0x7929, 0xF47E }, { 0x792A, 0xC472 }, 
-	{ 0x792B, 0xC474 }, { 0x792C, 0xC473 }, { 0x792D, 0xF5E1 }, { 0x792F, 0xF5E3 }, { 0x7931, 0xF5E2 }, { 0x7935, 0xF6F6 }, { 0x7938, 0xF8B5 }, { 0x7939, 0xF8FA }, 
-	{ 0x793A, 0xA5DC }, { 0x793D, 0xCB72 }, { 0x793E, 0xAAC0 }, { 0x793F, 0xCDA3 }, { 0x7940, 0xAAC1 }, { 0x7941, 0xAAC2 }, { 0x7942, 0xCDA2 }, { 0x7944, 0xCFF8 }, 
-	{ 0x7945, 0xCFF7 }, { 0x7946, 0xACE6 }, { 0x7947, 0xACE9 }, { 0x7948, 0xACE8 }, { 0x7949, 0xACE7 }, { 0x794A, 0xCFF4 }, { 0x794B, 0xCFF6 }, { 0x794C, 0xCFF5 }, 
-	{ 0x794F, 0xD2E8 }, { 0x7950, 0xAFA7 }, { 0x7951, 0xD2EC }, { 0x7952, 0xD2EB }, { 0x7953, 0xD2EA }, { 0x7954, 0xD2E6 }, { 0x7955, 0xAFA6 }, { 0x7956, 0xAFAA }, 
-	{ 0x7957, 0xAFAD }, { 0x795A, 0xAFAE }, { 0x795B, 0xD2E7 }, { 0x795C, 0xD2E9 }, { 0x795D, 0xAFAC }, { 0x795E, 0xAFAB }, { 0x795F, 0xAFA9 }, { 0x7960, 0xAFA8 }, 
-	{ 0x7961, 0xD6C2 }, { 0x7963, 0xD6C0 }, { 0x7964, 0xD6BC }, { 0x7965, 0xB2BB }, { 0x7967, 0xD6BD }, { 0x7968, 0xB2BC }, { 0x7969, 0xD6BE }, { 0x796A, 0xD6BF }, 
-	{ 0x796B, 0xD6C1 }, { 0x796D, 0xB2BD }, { 0x7970, 0xDAD5 }, { 0x7972, 0xDAD4 }, { 0x7973, 0xDAD3 }, { 0x7974, 0xDAD2 }, { 0x7979, 0xDEF6 }, { 0x797A, 0xB852 }, 
-	{ 0x797C, 0xDEF3 }, { 0x797D, 0xDEF5 }, { 0x797F, 0xB853 }, { 0x7981, 0xB854 }, { 0x7982, 0xDEF4 }, { 0x7988, 0xE341 }, { 0x798A, 0xE2F9 }, { 0x798B, 0xE2FA }, 
-	{ 0x798D, 0xBAD7 }, { 0x798E, 0xBAD5 }, { 0x798F, 0xBAD6 }, { 0x7990, 0xE343 }, { 0x7992, 0xE342 }, { 0x7993, 0xE2FE }, { 0x7994, 0xE2FD }, { 0x7995, 0xE2FC }, 
-	{ 0x7996, 0xE2FB }, { 0x7997, 0xE340 }, { 0x7998, 0xE2F8 }, { 0x799A, 0xE6CB }, { 0x799B, 0xE6D0 }, { 0x799C, 0xE6CE }, { 0x79A0, 0xE6CD }, { 0x79A1, 0xE6CC }, 
-	{ 0x79A2, 0xE6CF }, { 0x79A4, 0xEAAE }, { 0x79A6, 0xBF6D }, { 0x79A7, 0xC148 }, { 0x79A8, 0xEDB0 }, { 0x79AA, 0xC149 }, { 0x79AB, 0xEDAF }, { 0x79AC, 0xF05F }, 
-	{ 0x79AD, 0xF05E }, { 0x79AE, 0xC2A7 }, { 0x79B0, 0xF2A5 }, { 0x79B1, 0xC3AB }, { 0x79B2, 0xF4A1 }, { 0x79B3, 0xC5A1 }, { 0x79B4, 0xF6F7 }, { 0x79B6, 0xF8B7 }, 
-	{ 0x79B7, 0xF8B6 }, { 0x79B8, 0xC9A8 }, { 0x79B9, 0xACEA }, { 0x79BA, 0xACEB }, { 0x79BB, 0xD6C3 }, { 0x79BD, 0xB856 }, { 0x79BE, 0xA5DD }, { 0x79BF, 0xA872 }, 
-	{ 0x79C0, 0xA871 }, { 0x79C1, 0xA870 }, { 0x79C5, 0xCDA4 }, { 0x79C8, 0xAAC4 }, { 0x79C9, 0xAAC3 }, { 0x79CB, 0xACEE }, { 0x79CD, 0xCFFA }, { 0x79CE, 0xCFFD }, 
-	{ 0x79CF, 0xCFFB }, { 0x79D1, 0xACEC }, { 0x79D2, 0xACED }, { 0x79D5, 0xCFF9 }, { 0x79D6, 0xCFFC }, { 0x79D8, 0xAFB5 }, { 0x79DC, 0xD2F3 }, { 0x79DD, 0xD2F5 }, 
-	{ 0x79DE, 0xD2F4 }, { 0x79DF, 0xAFB2 }, { 0x79E0, 0xD2EF }, { 0x79E3, 0xAFB0 }, { 0x79E4, 0xAFAF }, { 0x79E6, 0xAFB3 }, { 0x79E7, 0xAFB1 }, { 0x79E9, 0xAFB4 }, 
-	{ 0x79EA, 0xD2F2 }, { 0x79EB, 0xD2ED }, { 0x79EC, 0xD2EE }, { 0x79ED, 0xD2F1 }, { 0x79EE, 0xD2F0 }, { 0x79F6, 0xD6C6 }, { 0x79F7, 0xD6C7 }, { 0x79F8, 0xD6C5 }, 
-	{ 0x79FA, 0xD6C4 }, { 0x79FB, 0xB2BE }, { 0x7A00, 0xB57D }, { 0x7A02, 0xDAD6 }, { 0x7A03, 0xDAD8 }, { 0x7A04, 0xDADA }, { 0x7A05, 0xB57C }, { 0x7A08, 0xB57A }, 
-	{ 0x7A0A, 0xDAD7 }, { 0x7A0B, 0xB57B }, { 0x7A0C, 0xDAD9 }, { 0x7A0D, 0xB579 }, { 0x7A10, 0xDF41 }, { 0x7A11, 0xDEF7 }, { 0x7A12, 0xDEFA }, { 0x7A13, 0xDEFE }, 
-	{ 0x7A14, 0xB85A }, { 0x7A15, 0xDEFC }, { 0x7A17, 0xDEFB }, { 0x7A18, 0xDEF8 }, { 0x7A19, 0xDEF9 }, { 0x7A1A, 0xB858 }, { 0x7A1B, 0xDF40 }, { 0x7A1C, 0xB857 }, 
-	{ 0x7A1E, 0xB85C }, { 0x7A1F, 0xB85B }, { 0x7A20, 0xB859 }, { 0x7A22, 0xDEFD }, { 0x7A26, 0xE349 }, { 0x7A28, 0xE348 }, { 0x7A2B, 0xE344 }, { 0x7A2E, 0xBAD8 }, 
-	{ 0x7A2F, 0xE347 }, { 0x7A30, 0xE346 }, { 0x7A31, 0xBAD9 }, { 0x7A37, 0xBD5E }, { 0x7A39, 0xE6D2 }, { 0x7A3B, 0xBD5F }, { 0x7A3C, 0xBD5B }, { 0x7A3D, 0xBD5D }, 
-	{ 0x7A3F, 0xBD5A }, { 0x7A40, 0xBD5C }, { 0x7A44, 0xEAAF }, { 0x7A46, 0xBF70 }, { 0x7A47, 0xEAB1 }, { 0x7A48, 0xEAB0 }, { 0x7A4A, 0xE345 }, { 0x7A4B, 0xBF72 }, 
-	{ 0x7A4C, 0xBF71 }, { 0x7A4D, 0xBF6E }, { 0x7A4E, 0xBF6F }, { 0x7A54, 0xEDB5 }, { 0x7A56, 0xEDB3 }, { 0x7A57, 0xC14A }, { 0x7A58, 0xEDB4 }, { 0x7A5A, 0xEDB6 }, 
-	{ 0x7A5B, 0xEDB2 }, { 0x7A5C, 0xEDB1 }, { 0x7A5F, 0xF060 }, { 0x7A60, 0xC2AA }, { 0x7A61, 0xC2A8 }, { 0x7A62, 0xC2A9 }, { 0x7A67, 0xF2A6 }, { 0x7A68, 0xF2A7 }, 
-	{ 0x7A69, 0xC3AD }, { 0x7A6B, 0xC3AC }, { 0x7A6C, 0xF4A3 }, { 0x7A6D, 0xF4A4 }, { 0x7A6E, 0xF4A2 }, { 0x7A70, 0xF6F8 }, { 0x7A71, 0xF6F9 }, { 0x7A74, 0xA5DE }, 
-	{ 0x7A75, 0xCA48 }, { 0x7A76, 0xA873 }, { 0x7A78, 0xCDA5 }, { 0x7A79, 0xAAC6 }, { 0x7A7A, 0xAAC5 }, { 0x7A7B, 0xCDA6 }, { 0x7A7E, 0xD040 }, { 0x7A7F, 0xACEF }, 
-	{ 0x7A80, 0xCFFE }, { 0x7A81, 0xACF0 }, { 0x7A84, 0xAFB6 }, { 0x7A85, 0xD2F8 }, { 0x7A86, 0xD2F6 }, { 0x7A87, 0xD2FC }, { 0x7A88, 0xAFB7 }, { 0x7A89, 0xD2F7 }, 
-	{ 0x7A8A, 0xD2FB }, { 0x7A8B, 0xD2F9 }, { 0x7A8C, 0xD2FA }, { 0x7A8F, 0xD6C8 }, { 0x7A90, 0xD6CA }, { 0x7A92, 0xB2BF }, { 0x7A94, 0xD6C9 }, { 0x7A95, 0xB2C0 }, 
-	{ 0x7A96, 0xB5A2 }, { 0x7A97, 0xB5A1 }, { 0x7A98, 0xB57E }, { 0x7A99, 0xDADB }, { 0x7A9E, 0xDF44 }, { 0x7A9F, 0xB85D }, { 0x7AA0, 0xB85E }, { 0x7AA2, 0xDF43 }, 
-	{ 0x7AA3, 0xDF42 }, { 0x7AA8, 0xE34A }, { 0x7AA9, 0xBADB }, { 0x7AAA, 0xBADA }, { 0x7AAB, 0xE34B }, { 0x7AAC, 0xE34C }, { 0x7AAE, 0xBD61 }, { 0x7AAF, 0xBD60 }, 
-	{ 0x7AB1, 0xEAB5 }, { 0x7AB2, 0xE6D3 }, { 0x7AB3, 0xE6D5 }, { 0x7AB4, 0xE6D4 }, { 0x7AB5, 0xEAB4 }, { 0x7AB6, 0xEAB2 }, { 0x7AB7, 0xEAB6 }, { 0x7AB8, 0xEAB3 }, 
-	{ 0x7ABA, 0xBF73 }, { 0x7ABE, 0xEDB7 }, { 0x7ABF, 0xC14B }, { 0x7AC0, 0xEDB8 }, { 0x7AC1, 0xEDB9 }, { 0x7AC4, 0xC2AB }, { 0x7AC5, 0xC2AC }, { 0x7AC7, 0xC475 }, 
-	{ 0x7ACA, 0xC5D1 }, { 0x7ACB, 0xA5DF }, { 0x7AD1, 0xD041 }, { 0x7AD8, 0xD2FD }, { 0x7AD9, 0xAFB8 }, { 0x7ADF, 0xB3BA }, { 0x7AE0, 0xB3B9 }, { 0x7AE3, 0xB5A4 }, 
-	{ 0x7AE4, 0xDADD }, { 0x7AE5, 0xB5A3 }, { 0x7AE6, 0xDADC }, { 0x7AEB, 0xDF45 }, { 0x7AED, 0xBADC }, { 0x7AEE, 0xE34D }, { 0x7AEF, 0xBADD }, { 0x7AF6, 0xC476 }, 
-	{ 0x7AF7, 0xF4A5 }, { 0x7AF9, 0xA6CB }, { 0x7AFA, 0xAAC7 }, { 0x7AFB, 0xCDA7 }, { 0x7AFD, 0xACF2 }, { 0x7AFF, 0xACF1 }, { 0x7B00, 0xD042 }, { 0x7B01, 0xD043 }, 
-	{ 0x7B04, 0xD340 }, { 0x7B05, 0xD342 }, { 0x7B06, 0xAFB9 }, { 0x7B08, 0xD344 }, { 0x7B09, 0xD347 }, { 0x7B0A, 0xD345 }, { 0x7B0E, 0xD346 }, { 0x7B0F, 0xD343 }, 
-	{ 0x7B10, 0xD2FE }, { 0x7B11, 0xAFBA }, { 0x7B12, 0xD348 }, { 0x7B13, 0xD341 }, { 0x7B18, 0xD6D3 }, { 0x7B19, 0xB2C6 }, { 0x7B1A, 0xD6DC }, { 0x7B1B, 0xB2C3 }, 
-	{ 0x7B1D, 0xD6D5 }, { 0x7B1E, 0xB2C7 }, { 0x7B20, 0xB2C1 }, { 0x7B22, 0xD6D0 }, { 0x7B23, 0xD6DD }, { 0x7B24, 0xD6D1 }, { 0x7B25, 0xD6CE }, { 0x7B26, 0xB2C5 }, 
-	{ 0x7B28, 0xB2C2 }, { 0x7B2A, 0xD6D4 }, { 0x7B2B, 0xD6D7 }, { 0x7B2C, 0xB2C4 }, { 0x7B2D, 0xD6D8 }, { 0x7B2E, 0xB2C8 }, { 0x7B2F, 0xD6D9 }, { 0x7B30, 0xD6CF }, 
-	{ 0x7B31, 0xD6D6 }, { 0x7B32, 0xD6DA }, { 0x7B33, 0xD6D2 }, { 0x7B34, 0xD6CD }, { 0x7B35, 0xD6CB }, { 0x7B38, 0xD6DB }, { 0x7B3B, 0xDADF }, { 0x7B40, 0xDAE4 }, 
-	{ 0x7B44, 0xDAE0 }, { 0x7B45, 0xDAE6 }, { 0x7B46, 0xB5A7 }, { 0x7B47, 0xD6CC }, { 0x7B48, 0xDAE1 }, { 0x7B49, 0xB5A5 }, { 0x7B4A, 0xDADE }, { 0x7B4B, 0xB5AC }, 
-	{ 0x7B4C, 0xDAE2 }, { 0x7B4D, 0xB5AB }, { 0x7B4E, 0xDAE3 }, { 0x7B4F, 0xB5AD }, { 0x7B50, 0xB5A8 }, { 0x7B51, 0xB5AE }, { 0x7B52, 0xB5A9 }, { 0x7B54, 0xB5AA }, 
-	{ 0x7B56, 0xB5A6 }, { 0x7B58, 0xDAE5 }, { 0x7B60, 0xB861 }, { 0x7B61, 0xDF50 }, { 0x7B63, 0xDF53 }, { 0x7B64, 0xDF47 }, { 0x7B65, 0xDF4C }, { 0x7B66, 0xDF46 }, 
-	{ 0x7B67, 0xB863 }, { 0x7B69, 0xDF4A }, { 0x7B6D, 0xDF48 }, { 0x7B6E, 0xB862 }, { 0x7B70, 0xDF4F }, { 0x7B71, 0xDF4E }, { 0x7B72, 0xDF4B }, { 0x7B73, 0xDF4D }, 
-	{ 0x7B74, 0xDF49 }, { 0x7B75, 0xBAE1 }, { 0x7B76, 0xDF52 }, { 0x7B77, 0xB85F }, { 0x7B78, 0xDF51 }, { 0x7B82, 0xE35D }, { 0x7B84, 0xBAE8 }, { 0x7B85, 0xE358 }, 
-	{ 0x7B87, 0xBAE7 }, { 0x7B88, 0xE34E }, { 0x7B8A, 0xE350 }, { 0x7B8B, 0xBAE0 }, { 0x7B8C, 0xE355 }, { 0x7B8D, 0xE354 }, { 0x7B8E, 0xE357 }, { 0x7B8F, 0xBAE5 }, 
-	{ 0x7B90, 0xE352 }, { 0x7B91, 0xE351 }, { 0x7B94, 0xBAE4 }, { 0x7B95, 0xBADF }, { 0x7B96, 0xE353 }, { 0x7B97, 0xBAE2 }, { 0x7B98, 0xE359 }, { 0x7B99, 0xE35B }, 
-	{ 0x7B9B, 0xE356 }, { 0x7B9C, 0xE34F }, { 0x7B9D, 0xBAE3 }, { 0x7BA0, 0xBD69 }, { 0x7BA1, 0xBADE }, { 0x7BA4, 0xE35C }, { 0x7BAC, 0xE6D9 }, { 0x7BAD, 0xBD62 }, 
-	{ 0x7BAF, 0xE6DB }, { 0x7BB1, 0xBD63 }, { 0x7BB4, 0xBD65 }, { 0x7BB5, 0xE6DE }, { 0x7BB7, 0xE6D6 }, { 0x7BB8, 0xBAE6 }, { 0x7BB9, 0xE6DC }, { 0x7BBE, 0xE6D8 }, 
-	{ 0x7BC0, 0xB860 }, { 0x7BC1, 0xBD68 }, { 0x7BC4, 0xBD64 }, { 0x7BC6, 0xBD66 }, { 0x7BC7, 0xBD67 }, { 0x7BC9, 0xBF76 }, { 0x7BCA, 0xE6DD }, { 0x7BCB, 0xE6D7 }, 
-	{ 0x7BCC, 0xBD6A }, { 0x7BCE, 0xE6DA }, { 0x7BD4, 0xEAC0 }, { 0x7BD5, 0xEABB }, { 0x7BD8, 0xEAC5 }, { 0x7BD9, 0xBF74 }, { 0x7BDA, 0xEABD }, { 0x7BDB, 0xBF78 }, 
-	{ 0x7BDC, 0xEAC3 }, { 0x7BDD, 0xEABA }, { 0x7BDE, 0xEAB7 }, { 0x7BDF, 0xEAC6 }, { 0x7BE0, 0xC151 }, { 0x7BE1, 0xBF79 }, { 0x7BE2, 0xEAC2 }, { 0x7BE3, 0xEAB8 }, 
-	{ 0x7BE4, 0xBF77 }, { 0x7BE5, 0xEABC }, { 0x7BE6, 0xBF7B }, { 0x7BE7, 0xEAB9 }, { 0x7BE8, 0xEABE }, { 0x7BE9, 0xBF7A }, { 0x7BEA, 0xEAC1 }, { 0x7BEB, 0xEAC4 }, 
-	{ 0x7BF0, 0xEDCB }, { 0x7BF1, 0xEDCC }, { 0x7BF2, 0xEDBC }, { 0x7BF3, 0xEDC3 }, { 0x7BF4, 0xEDC1 }, { 0x7BF7, 0xC14F }, { 0x7BF8, 0xEDC8 }, { 0x7BF9, 0xEABF }, 
-	{ 0x7BFB, 0xEDBF }, { 0x7BFD, 0xEDC9 }, { 0x7BFE, 0xC14E }, { 0x7BFF, 0xEDBE }, { 0x7C00, 0xEDBD }, { 0x7C01, 0xEDC7 }, { 0x7C02, 0xEDC4 }, { 0x7C03, 0xEDC6 }, 
-	{ 0x7C05, 0xEDBA }, { 0x7C06, 0xEDCA }, { 0x7C07, 0xC14C }, { 0x7C09, 0xEDC5 }, { 0x7C0A, 0xEDCE }, { 0x7C0B, 0xEDC2 }, { 0x7C0C, 0xC150 }, { 0x7C0D, 0xC14D }, 
-	{ 0x7C0E, 0xEDC0 }, { 0x7C0F, 0xEDBB }, { 0x7C10, 0xEDCD }, { 0x7C11, 0xBF75 }, { 0x7C19, 0xF063 }, { 0x7C1C, 0xF061 }, { 0x7C1D, 0xF067 }, { 0x7C1E, 0xC2B0 }, 
-	{ 0x7C1F, 0xF065 }, { 0x7C20, 0xF064 }, { 0x7C21, 0xC2B2 }, { 0x7C22, 0xF06A }, { 0x7C23, 0xC2B1 }, { 0x7C25, 0xF06B }, { 0x7C26, 0xF068 }, { 0x7C27, 0xC2AE }, 
-	{ 0x7C28, 0xF069 }, { 0x7C29, 0xF062 }, { 0x7C2A, 0xC2AF }, { 0x7C2B, 0xC2AD }, { 0x7C2C, 0xF2AB }, { 0x7C2D, 0xF066 }, { 0x7C30, 0xF06C }, { 0x7C33, 0xF2A8 }, 
-	{ 0x7C37, 0xC3B2 }, { 0x7C38, 0xC3B0 }, { 0x7C39, 0xF2AA }, { 0x7C3B, 0xF2AC }, { 0x7C3C, 0xF2A9 }, { 0x7C3D, 0xC3B1 }, { 0x7C3E, 0xC3AE }, { 0x7C3F, 0xC3AF }, 
-	{ 0x7C40, 0xC3B3 }, { 0x7C43, 0xC478 }, { 0x7C45, 0xF4AA }, { 0x7C47, 0xF4A9 }, { 0x7C48, 0xF4A7 }, { 0x7C49, 0xF4A6 }, { 0x7C4A, 0xF4A8 }, { 0x7C4C, 0xC477 }, 
-	{ 0x7C4D, 0xC479 }, { 0x7C50, 0xC4F0 }, { 0x7C53, 0xF5E5 }, { 0x7C54, 0xF5E4 }, { 0x7C57, 0xF6FA }, { 0x7C59, 0xF6FC }, { 0x7C5A, 0xF6FE }, { 0x7C5B, 0xF6FD }, 
-	{ 0x7C5C, 0xF6FB }, { 0x7C5F, 0xC5A3 }, { 0x7C60, 0xC5A2 }, { 0x7C63, 0xC5D3 }, { 0x7C64, 0xC5D2 }, { 0x7C65, 0xC5D4 }, { 0x7C66, 0xF7ED }, { 0x7C67, 0xF7EC }, 
-	{ 0x7C69, 0xF8FB }, { 0x7C6A, 0xF8B8 }, { 0x7C6B, 0xF8FC }, { 0x7C6C, 0xC658 }, { 0x7C6E, 0xC659 }, { 0x7C6F, 0xF96D }, { 0x7C72, 0xC67E }, { 0x7C73, 0xA6CC }, 
-	{ 0x7C75, 0xCDA8 }, { 0x7C78, 0xD045 }, { 0x7C79, 0xD046 }, { 0x7C7A, 0xD044 }, { 0x7C7D, 0xACF3 }, { 0x7C7F, 0xD047 }, { 0x7C80, 0xD048 }, { 0x7C81, 0xD049 }, 
-	{ 0x7C84, 0xD349 }, { 0x7C85, 0xD34F }, { 0x7C88, 0xD34D }, { 0x7C89, 0xAFBB }, { 0x7C8A, 0xD34B }, { 0x7C8C, 0xD34C }, { 0x7C8D, 0xD34E }, { 0x7C91, 0xD34A }, 
-	{ 0x7C92, 0xB2C9 }, { 0x7C94, 0xD6DE }, { 0x7C95, 0xB2CB }, { 0x7C96, 0xD6E0 }, { 0x7C97, 0xB2CA }, { 0x7C98, 0xD6DF }, { 0x7C9E, 0xDAE8 }, { 0x7C9F, 0xB5AF }, 
-	{ 0x7CA1, 0xDAEA }, { 0x7CA2, 0xDAE7 }, { 0x7CA3, 0xD6E1 }, { 0x7CA5, 0xB5B0 }, { 0x7CA8, 0xDAE9 }, { 0x7CAF, 0xDF56 }, { 0x7CB1, 0xB864 }, { 0x7CB2, 0xDF54 }, 
-	{ 0x7CB3, 0xB865 }, { 0x7CB4, 0xDF55 }, { 0x7CB5, 0xB866 }, { 0x7CB9, 0xBAE9 }, { 0x7CBA, 0xE361 }, { 0x7CBB, 0xE35E }, { 0x7CBC, 0xE360 }, { 0x7CBD, 0xBAEA }, 
-	{ 0x7CBE, 0xBAEB }, { 0x7CBF, 0xE35F }, { 0x7CC5, 0xE6DF }, { 0x7CC8, 0xE6E0 }, { 0x7CCA, 0xBD6B }, { 0x7CCB, 0xE6E2 }, { 0x7CCC, 0xE6E1 }, { 0x7CCE, 0xA261 }, 
-	{ 0x7CD0, 0xEACA }, { 0x7CD1, 0xEACB }, { 0x7CD2, 0xEAC7 }, { 0x7CD4, 0xEAC8 }, { 0x7CD5, 0xBF7C }, { 0x7CD6, 0xBF7D }, { 0x7CD7, 0xEAC9 }, { 0x7CD9, 0xC157 }, 
-	{ 0x7CDC, 0xC153 }, { 0x7CDD, 0xC158 }, { 0x7CDE, 0xC154 }, { 0x7CDF, 0xC156 }, { 0x7CE0, 0xC152 }, { 0x7CE2, 0xC155 }, { 0x7CE7, 0xC2B3 }, { 0x7CE8, 0xEDCF }, 
-	{ 0x7CEA, 0xF2AE }, { 0x7CEC, 0xF2AD }, { 0x7CEE, 0xF4AB }, { 0x7CEF, 0xC47A }, { 0x7CF0, 0xC47B }, { 0x7CF1, 0xF741 }, { 0x7CF2, 0xF5E6 }, { 0x7CF4, 0xF740 }, 
-	{ 0x7CF6, 0xF8FD }, { 0x7CF7, 0xF9A4 }, { 0x7CF8, 0xA6CD }, { 0x7CFB, 0xA874 }, { 0x7CFD, 0xCDA9 }, { 0x7CFE, 0xAAC8 }, { 0x7D00, 0xACF6 }, { 0x7D01, 0xD04C }, 
-	{ 0x7D02, 0xACF4 }, { 0x7D03, 0xD04A }, { 0x7D04, 0xACF9 }, { 0x7D05, 0xACF5 }, { 0x7D06, 0xACFA }, { 0x7D07, 0xACF8 }, { 0x7D08, 0xD04B }, { 0x7D09, 0xACF7 }, 
-	{ 0x7D0A, 0xAFBF }, { 0x7D0B, 0xAFBE }, { 0x7D0C, 0xD35A }, { 0x7D0D, 0xAFC7 }, { 0x7D0E, 0xD353 }, { 0x7D0F, 0xD359 }, { 0x7D10, 0xAFC3 }, { 0x7D11, 0xD352 }, 
-	{ 0x7D12, 0xD358 }, { 0x7D13, 0xD356 }, { 0x7D14, 0xAFC2 }, { 0x7D15, 0xAFC4 }, { 0x7D16, 0xD355 }, { 0x7D17, 0xAFBD }, { 0x7D18, 0xD354 }, { 0x7D19, 0xAFC8 }, 
-	{ 0x7D1A, 0xAFC5 }, { 0x7D1B, 0xAFC9 }, { 0x7D1C, 0xAFC6 }, { 0x7D1D, 0xD351 }, { 0x7D1E, 0xD350 }, { 0x7D1F, 0xD357 }, { 0x7D20, 0xAFC0 }, { 0x7D21, 0xAFBC }, 
-	{ 0x7D22, 0xAFC1 }, { 0x7D28, 0xD6F0 }, { 0x7D29, 0xD6E9 }, { 0x7D2B, 0xB5B5 }, { 0x7D2C, 0xD6E8 }, { 0x7D2E, 0xB2CF }, { 0x7D2F, 0xB2D6 }, { 0x7D30, 0xB2D3 }, 
-	{ 0x7D31, 0xB2D9 }, { 0x7D32, 0xB2D8 }, { 0x7D33, 0xB2D4 }, { 0x7D35, 0xD6E2 }, { 0x7D36, 0xD6E5 }, { 0x7D38, 0xD6E4 }, { 0x7D39, 0xB2D0 }, { 0x7D3A, 0xD6E6 }, 
-	{ 0x7D3B, 0xD6EF }, { 0x7D3C, 0xB2D1 }, { 0x7D3D, 0xD6E3 }, { 0x7D3E, 0xD6EC }, { 0x7D3F, 0xD6ED }, { 0x7D40, 0xB2D2 }, { 0x7D41, 0xD6EA }, { 0x7D42, 0xB2D7 }, 
-	{ 0x7D43, 0xB2CD }, { 0x7D44, 0xB2D5 }, { 0x7D45, 0xD6E7 }, { 0x7D46, 0xB2CC }, { 0x7D47, 0xD6EB }, { 0x7D4A, 0xD6EE }, { 0x7D4E, 0xDAFB }, { 0x7D4F, 0xDAF2 }, 
-	{ 0x7D50, 0xB5B2 }, { 0x7D51, 0xDAF9 }, { 0x7D52, 0xDAF6 }, { 0x7D53, 0xDAEE }, { 0x7D54, 0xDAF7 }, { 0x7D55, 0xB5B4 }, { 0x7D56, 0xDAEF }, { 0x7D58, 0xDAEB }, 
-	{ 0x7D5B, 0xB86C }, { 0x7D5C, 0xDAF4 }, { 0x7D5E, 0xB5B1 }, { 0x7D5F, 0xDAFA }, { 0x7D61, 0xB5B8 }, { 0x7D62, 0xB5BA }, { 0x7D63, 0xDAED }, { 0x7D66, 0xB5B9 }, 
-	{ 0x7D67, 0xDAF0 }, { 0x7D68, 0xB5B3 }, { 0x7D69, 0xDAF8 }, { 0x7D6A, 0xDAF1 }, { 0x7D6B, 0xDAF5 }, { 0x7D6D, 0xDAF3 }, { 0x7D6E, 0xB5B6 }, { 0x7D6F, 0xDAEC }, 
-	{ 0x7D70, 0xB5BB }, { 0x7D71, 0xB2CE }, { 0x7D72, 0xB5B7 }, { 0x7D73, 0xB5BC }, { 0x7D79, 0xB868 }, { 0x7D7A, 0xDF5D }, { 0x7D7B, 0xDF5F }, { 0x7D7C, 0xDF61 }, 
-	{ 0x7D7D, 0xDF65 }, { 0x7D7F, 0xDF5B }, { 0x7D80, 0xDF59 }, { 0x7D81, 0xB86A }, { 0x7D83, 0xDF60 }, { 0x7D84, 0xDF64 }, { 0x7D85, 0xDF5C }, { 0x7D86, 0xDF58 }, 
-	{ 0x7D88, 0xDF57 }, { 0x7D8C, 0xDF62 }, { 0x7D8D, 0xDF5A }, { 0x7D8E, 0xDF5E }, { 0x7D8F, 0xB86B }, { 0x7D91, 0xB869 }, { 0x7D92, 0xDF66 }, { 0x7D93, 0xB867 }, 
-	{ 0x7D94, 0xDF63 }, { 0x7D96, 0xE372 }, { 0x7D9C, 0xBAEE }, { 0x7D9D, 0xE36A }, { 0x7D9E, 0xBD78 }, { 0x7D9F, 0xE374 }, { 0x7DA0, 0xBAF1 }, { 0x7DA1, 0xE378 }, 
-	{ 0x7DA2, 0xBAF7 }, { 0x7DA3, 0xE365 }, { 0x7DA6, 0xE375 }, { 0x7DA7, 0xE362 }, { 0x7DA9, 0xE377 }, { 0x7DAA, 0xE366 }, { 0x7DAC, 0xBAFE }, { 0x7DAD, 0xBAFB }, 
-	{ 0x7DAE, 0xE376 }, { 0x7DAF, 0xE370 }, { 0x7DB0, 0xBAED }, { 0x7DB1, 0xBAF5 }, { 0x7DB2, 0xBAF4 }, { 0x7DB4, 0xBAF3 }, { 0x7DB5, 0xBAF9 }, { 0x7DB7, 0xE363 }, 
-	{ 0x7DB8, 0xBAFA }, { 0x7DB9, 0xE371 }, { 0x7DBA, 0xBAF6 }, { 0x7DBB, 0xBAEC }, { 0x7DBC, 0xE373 }, { 0x7DBD, 0xBAEF }, { 0x7DBE, 0xBAF0 }, { 0x7DBF, 0xBAF8 }, 
-	{ 0x7DC0, 0xE368 }, { 0x7DC1, 0xE367 }, { 0x7DC2, 0xE364 }, { 0x7DC4, 0xE36C }, { 0x7DC5, 0xE369 }, { 0x7DC6, 0xE36D }, { 0x7DC7, 0xBAFD }, { 0x7DC9, 0xE379 }, 
-	{ 0x7DCA, 0xBAF2 }, { 0x7DCB, 0xE36E }, { 0x7DCC, 0xE36F }, { 0x7DCE, 0xE36B }, { 0x7DD2, 0xBAFC }, { 0x7DD7, 0xE6E7 }, { 0x7DD8, 0xBD70 }, { 0x7DD9, 0xBD79 }, 
-	{ 0x7DDA, 0xBD75 }, { 0x7DDB, 0xE6E4 }, { 0x7DDD, 0xBD72 }, { 0x7DDE, 0xBD76 }, { 0x7DDF, 0xE6F0 }, { 0x7DE0, 0xBD6C }, { 0x7DE1, 0xE6E8 }, { 0x7DE3, 0xBD74 }, 
-	{ 0x7DE6, 0xE6EB }, { 0x7DE7, 0xE6E6 }, { 0x7DE8, 0xBD73 }, { 0x7DE9, 0xBD77 }, { 0x7DEA, 0xE6E5 }, { 0x7DEC, 0xBD71 }, { 0x7DEE, 0xE6EF }, { 0x7DEF, 0xBD6E }, 
-	{ 0x7DF0, 0xE6EE }, { 0x7DF1, 0xE6ED }, { 0x7DF2, 0xBD7A }, { 0x7DF3, 0xE572 }, { 0x7DF4, 0xBD6D }, { 0x7DF6, 0xE6EC }, { 0x7DF7, 0xE6E3 }, { 0x7DF9, 0xBD7B }, 
-	{ 0x7DFA, 0xE6EA }, { 0x7DFB, 0xBD6F }, { 0x7E03, 0xE6E9 }, { 0x7E08, 0xBFA2 }, { 0x7E09, 0xBFA7 }, { 0x7E0A, 0xBF7E }, { 0x7E0B, 0xEAD8 }, { 0x7E0C, 0xEACF }, 
-	{ 0x7E0D, 0xEADB }, { 0x7E0E, 0xEAD3 }, { 0x7E0F, 0xEAD9 }, { 0x7E10, 0xBFA8 }, { 0x7E11, 0xBFA1 }, { 0x7E12, 0xEACC }, { 0x7E13, 0xEAD2 }, { 0x7E14, 0xEADC }, 
-	{ 0x7E15, 0xEAD5 }, { 0x7E16, 0xEADA }, { 0x7E17, 0xEACE }, { 0x7E1A, 0xEAD6 }, { 0x7E1B, 0xBFA3 }, { 0x7E1C, 0xEAD4 }, { 0x7E1D, 0xBFA6 }, { 0x7E1E, 0xBFA5 }, 
-	{ 0x7E1F, 0xEAD0 }, { 0x7E20, 0xEAD1 }, { 0x7E21, 0xEACD }, { 0x7E22, 0xEAD7 }, { 0x7E23, 0xBFA4 }, { 0x7E24, 0xEADE }, { 0x7E25, 0xEADD }, { 0x7E29, 0xEDDA }, 
-	{ 0x7E2A, 0xEDD6 }, { 0x7E2B, 0xC15F }, { 0x7E2D, 0xEDD0 }, { 0x7E2E, 0xC159 }, { 0x7E2F, 0xC169 }, { 0x7E30, 0xEDDC }, { 0x7E31, 0xC161 }, { 0x7E32, 0xC15D }, 
-	{ 0x7E33, 0xEDD3 }, { 0x7E34, 0xC164 }, { 0x7E35, 0xC167 }, { 0x7E36, 0xEDDE }, { 0x7E37, 0xC15C }, { 0x7E38, 0xEDD5 }, { 0x7E39, 0xC165 }, { 0x7E3A, 0xEDE0 }, 
-	{ 0x7E3B, 0xEDDD }, { 0x7E3C, 0xEDD1 }, { 0x7E3D, 0xC160 }, { 0x7E3E, 0xC15A }, { 0x7E3F, 0xC168 }, { 0x7E40, 0xEDD8 }, { 0x7E41, 0xC163 }, { 0x7E42, 0xEDD2 }, 
-	{ 0x7E43, 0xC15E }, { 0x7E44, 0xEDDF }, { 0x7E45, 0xC162 }, { 0x7E46, 0xC15B }, { 0x7E47, 0xEDD9 }, { 0x7E48, 0xC166 }, { 0x7E49, 0xEDD7 }, { 0x7E4C, 0xEDDB }, 
-	{ 0x7E50, 0xF06E }, { 0x7E51, 0xF074 }, { 0x7E52, 0xC2B9 }, { 0x7E53, 0xF077 }, { 0x7E54, 0xC2B4 }, { 0x7E55, 0xC2B5 }, { 0x7E56, 0xF06F }, { 0x7E57, 0xF076 }, 
-	{ 0x7E58, 0xF071 }, { 0x7E59, 0xC2BA }, { 0x7E5A, 0xC2B7 }, { 0x7E5C, 0xF06D }, { 0x7E5E, 0xC2B6 }, { 0x7E5F, 0xF073 }, { 0x7E60, 0xF075 }, { 0x7E61, 0xC2B8 }, 
-	{ 0x7E62, 0xF072 }, { 0x7E63, 0xF070 }, { 0x7E68, 0xF2B8 }, { 0x7E69, 0xC3B7 }, { 0x7E6A, 0xC3B8 }, { 0x7E6B, 0xC3B4 }, { 0x7E6D, 0xC3B5 }, { 0x7E6F, 0xF2B4 }, 
-	{ 0x7E70, 0xF2B2 }, { 0x7E72, 0xF2B6 }, { 0x7E73, 0xC3BA }, { 0x7E74, 0xF2B7 }, { 0x7E75, 0xF2B0 }, { 0x7E76, 0xF2AF }, { 0x7E77, 0xF2B3 }, { 0x7E78, 0xF2B1 }, 
-	{ 0x7E79, 0xC3B6 }, { 0x7E7A, 0xF2B5 }, { 0x7E7B, 0xF4AC }, { 0x7E7C, 0xC47E }, { 0x7E7D, 0xC47D }, { 0x7E7E, 0xF4AD }, { 0x7E80, 0xF4AF }, { 0x7E81, 0xF4AE }, 
-	{ 0x7E82, 0xC4A1 }, { 0x7E86, 0xF5EB }, { 0x7E87, 0xF5E8 }, { 0x7E88, 0xF5E9 }, { 0x7E8A, 0xF5E7 }, { 0x7E8B, 0xF5EA }, { 0x7E8C, 0xC4F2 }, { 0x7E8D, 0xF5EC }, 
-	{ 0x7E8F, 0xC4F1 }, { 0x7E91, 0xF742 }, { 0x7E93, 0xC5D5 }, { 0x7E94, 0xC5D7 }, { 0x7E95, 0xF7EE }, { 0x7E96, 0xC5D6 }, { 0x7E97, 0xF8B9 }, { 0x7E98, 0xF940 }, 
-	{ 0x7E99, 0xF942 }, { 0x7E9A, 0xF8FE }, { 0x7E9B, 0xF941 }, { 0x7E9C, 0xC66C }, { 0x7F36, 0xA6CE }, { 0x7F38, 0xACFB }, { 0x7F39, 0xD26F }, { 0x7F3A, 0xAFCA }, 
-	{ 0x7F3D, 0xB2DA }, { 0x7F3E, 0xDAFC }, { 0x7F3F, 0xDAFD }, { 0x7F43, 0xEADF }, { 0x7F44, 0xC16A }, { 0x7F45, 0xEDE1 }, { 0x7F48, 0xC2BB }, { 0x7F4A, 0xF2BA }, 
-	{ 0x7F4B, 0xF2B9 }, { 0x7F4C, 0xC4A2 }, { 0x7F4D, 0xF5ED }, { 0x7F4F, 0xF743 }, { 0x7F50, 0xC5F8 }, { 0x7F51, 0xCA49 }, { 0x7F54, 0xAAC9 }, { 0x7F55, 0xA875 }, 
-	{ 0x7F58, 0xD04D }, { 0x7F5B, 0xD360 }, { 0x7F5C, 0xD35B }, { 0x7F5D, 0xD35F }, { 0x7F5E, 0xD35D }, { 0x7F5F, 0xAFCB }, { 0x7F60, 0xD35E }, { 0x7F61, 0xD35C }, 
-	{ 0x7F63, 0xD6F1 }, { 0x7F65, 0xDAFE }, { 0x7F66, 0xDB40 }, { 0x7F67, 0xDF69 }, { 0x7F68, 0xDF6A }, { 0x7F69, 0xB86E }, { 0x7F6A, 0xB86F }, { 0x7F6B, 0xDF68 }, 
-	{ 0x7F6C, 0xDF6B }, { 0x7F6D, 0xDF67 }, { 0x7F6E, 0xB86D }, { 0x7F70, 0xBB40 }, { 0x7F72, 0xB870 }, { 0x7F73, 0xE37A }, { 0x7F75, 0xBD7C }, { 0x7F76, 0xE6F1 }, 
-	{ 0x7F77, 0xBD7D }, { 0x7F79, 0xBFA9 }, { 0x7F7A, 0xEAE2 }, { 0x7F7B, 0xEAE0 }, { 0x7F7C, 0xEAE1 }, { 0x7F7D, 0xEDE4 }, { 0x7F7E, 0xEDE3 }, { 0x7F7F, 0xEDE2 }, 
-	{ 0x7F83, 0xF2BB }, { 0x7F85, 0xC3B9 }, { 0x7F86, 0xF2BC }, { 0x7F87, 0xF744 }, { 0x7F88, 0xC5F9 }, { 0x7F89, 0xF8BA }, { 0x7F8A, 0xA6CF }, { 0x7F8B, 0xAACB }, 
-	{ 0x7F8C, 0xAACA }, { 0x7F8D, 0xD04F }, { 0x7F8E, 0xACFC }, { 0x7F91, 0xD04E }, { 0x7F92, 0xD362 }, { 0x7F94, 0xAFCC }, { 0x7F95, 0xD6F2 }, { 0x7F96, 0xD361 }, 
-	{ 0x7F9A, 0xB2DC }, { 0x7F9B, 0xD6F5 }, { 0x7F9C, 0xD6F3 }, { 0x7F9D, 0xD6F4 }, { 0x7F9E, 0xB2DB }, { 0x7FA0, 0xDB42 }, { 0x7FA1, 0xDB43 }, { 0x7FA2, 0xDB41 }, 
-	{ 0x7FA4, 0xB873 }, { 0x7FA5, 0xDF6D }, { 0x7FA6, 0xDF6C }, { 0x7FA7, 0xDF6E }, { 0x7FA8, 0xB872 }, { 0x7FA9, 0xB871 }, { 0x7FAC, 0xE6F2 }, { 0x7FAD, 0xE6F4 }, 
-	{ 0x7FAF, 0xBD7E }, { 0x7FB0, 0xE6F3 }, { 0x7FB1, 0xEAE3 }, { 0x7FB2, 0xBFAA }, { 0x7FB3, 0xF079 }, { 0x7FB5, 0xF078 }, { 0x7FB6, 0xC3BB }, { 0x7FB7, 0xF2BD }, 
-	{ 0x7FB8, 0xC3BD }, { 0x7FB9, 0xC3BC }, { 0x7FBA, 0xF4B0 }, { 0x7FBB, 0xF5EE }, { 0x7FBC, 0xC4F3 }, { 0x7FBD, 0xA6D0 }, { 0x7FBE, 0xD050 }, { 0x7FBF, 0xACFD }, 
-	{ 0x7FC0, 0xD365 }, { 0x7FC1, 0xAFCE }, { 0x7FC2, 0xD364 }, { 0x7FC3, 0xD363 }, { 0x7FC5, 0xAFCD }, { 0x7FC7, 0xD6FB }, { 0x7FC9, 0xD6FD }, { 0x7FCA, 0xD6F6 }, 
-	{ 0x7FCB, 0xD6F7 }, { 0x7FCC, 0xB2DD }, { 0x7FCD, 0xD6F8 }, { 0x7FCE, 0xB2DE }, { 0x7FCF, 0xD6FC }, { 0x7FD0, 0xD6F9 }, { 0x7FD1, 0xD6FA }, { 0x7FD2, 0xB2DF }, 
-	{ 0x7FD4, 0xB5BE }, { 0x7FD5, 0xB5BF }, { 0x7FD7, 0xDB44 }, { 0x7FDB, 0xDF6F }, { 0x7FDC, 0xDF70 }, { 0x7FDE, 0xE37E }, { 0x7FDF, 0xBB43 }, { 0x7FE0, 0xBB41 }, 
-	{ 0x7FE1, 0xBB42 }, { 0x7FE2, 0xE37B }, { 0x7FE3, 0xE37C }, { 0x7FE5, 0xE37D }, { 0x7FE6, 0xE6F9 }, { 0x7FE8, 0xE6FA }, { 0x7FE9, 0xBDA1 }, { 0x7FEA, 0xE6F7 }, 
-	{ 0x7FEB, 0xE6F6 }, { 0x7FEC, 0xE6F8 }, { 0x7FED, 0xE6F5 }, { 0x7FEE, 0xBFAD }, { 0x7FEF, 0xEAE4 }, { 0x7FF0, 0xBFAB }, { 0x7FF1, 0xBFAC }, { 0x7FF2, 0xEDE6 }, 
-	{ 0x7FF3, 0xC16B }, { 0x7FF4, 0xEDE5 }, { 0x7FF5, 0xEFA8 }, { 0x7FF7, 0xF07A }, { 0x7FF8, 0xF07B }, { 0x7FF9, 0xC2BC }, { 0x7FFB, 0xC2BD }, { 0x7FFC, 0xC16C }, 
-	{ 0x7FFD, 0xF2BE }, { 0x7FFE, 0xF2BF }, { 0x7FFF, 0xF4B1 }, { 0x8000, 0xC4A3 }, { 0x8001, 0xA6D1 }, { 0x8003, 0xA6D2 }, { 0x8004, 0xACFE }, { 0x8005, 0xAACC }, 
-	{ 0x8006, 0xAFCF }, { 0x8007, 0xD051 }, { 0x800B, 0xB5C0 }, { 0x800C, 0xA6D3 }, { 0x800D, 0xAD41 }, { 0x800E, 0xD052 }, { 0x800F, 0xD053 }, { 0x8010, 0xAD40 }, 
-	{ 0x8011, 0xAD42 }, { 0x8012, 0xA6D4 }, { 0x8014, 0xD054 }, { 0x8015, 0xAFD1 }, { 0x8016, 0xD366 }, { 0x8017, 0xAFD3 }, { 0x8018, 0xAFD0 }, { 0x8019, 0xAFD2 }, 
-	{ 0x801B, 0xD741 }, { 0x801C, 0xB2E0 }, { 0x801E, 0xD740 }, { 0x801F, 0xD6FE }, { 0x8021, 0xDF71 }, { 0x8024, 0xE3A1 }, { 0x8026, 0xBDA2 }, { 0x8028, 0xBFAE }, 
-	{ 0x8029, 0xEAE6 }, { 0x802A, 0xEAE5 }, { 0x802C, 0xEDE7 }, { 0x8030, 0xF5EF }, { 0x8033, 0xA6D5 }, { 0x8034, 0xCB73 }, { 0x8035, 0xCDAA }, { 0x8036, 0xAD43 }, 
-	{ 0x8037, 0xD055 }, { 0x8039, 0xD368 }, { 0x803D, 0xAFD4 }, { 0x803E, 0xD367 }, { 0x803F, 0xAFD5 }, { 0x8043, 0xD743 }, { 0x8046, 0xB2E2 }, { 0x8047, 0xD742 }, 
-	{ 0x8048, 0xD744 }, { 0x804A, 0xB2E1 }, { 0x804F, 0xDB46 }, { 0x8050, 0xDB47 }, { 0x8051, 0xDB45 }, { 0x8052, 0xB5C1 }, { 0x8056, 0xB874 }, { 0x8058, 0xB875 }, 
-	{ 0x805A, 0xBB45 }, { 0x805C, 0xE3A3 }, { 0x805D, 0xE3A2 }, { 0x805E, 0xBB44 }, { 0x8064, 0xE6FB }, { 0x8067, 0xE6FC }, { 0x806C, 0xEAE7 }, { 0x806F, 0xC170 }, 
-	{ 0x8070, 0xC16F }, { 0x8071, 0xC16D }, { 0x8072, 0xC16E }, { 0x8073, 0xC171 }, { 0x8075, 0xF07C }, { 0x8076, 0xC2BF }, { 0x8077, 0xC2BE }, { 0x8078, 0xF2C0 }, 
-	{ 0x8079, 0xF4B2 }, { 0x807D, 0xC5A5 }, { 0x807E, 0xC5A4 }, { 0x807F, 0xA6D6 }, { 0x8082, 0xD1FB }, { 0x8084, 0xB877 }, { 0x8085, 0xB5C2 }, { 0x8086, 0xB876 }, 
-	{ 0x8087, 0xBB46 }, { 0x8089, 0xA6D7 }, { 0x808A, 0xC9A9 }, { 0x808B, 0xA6D8 }, { 0x808C, 0xA6D9 }, { 0x808F, 0xCDAB }, { 0x8090, 0xCB76 }, { 0x8092, 0xCB77 }, 
-	{ 0x8093, 0xA877 }, { 0x8095, 0xCB74 }, { 0x8096, 0xA876 }, { 0x8098, 0xA879 }, { 0x8099, 0xCB75 }, { 0x809A, 0xA87B }, { 0x809B, 0xA87A }, { 0x809C, 0xCB78 }, 
-	{ 0x809D, 0xA878 }, { 0x80A1, 0xAAD1 }, { 0x80A2, 0xAACF }, { 0x80A3, 0xCDAD }, { 0x80A5, 0xAACE }, { 0x80A9, 0xAAD3 }, { 0x80AA, 0xAAD5 }, { 0x80AB, 0xAAD2 }, 
-	{ 0x80AD, 0xCDB0 }, { 0x80AE, 0xCDAC }, { 0x80AF, 0xAAD6 }, { 0x80B1, 0xAAD0 }, { 0x80B2, 0xA87C }, { 0x80B4, 0xAAD4 }, { 0x80B5, 0xCDAF }, { 0x80B8, 0xCDAE }, 
-	{ 0x80BA, 0xAACD }, { 0x80C2, 0xD05B }, { 0x80C3, 0xAD47 }, { 0x80C4, 0xAD48 }, { 0x80C5, 0xD05D }, { 0x80C7, 0xD057 }, { 0x80C8, 0xD05A }, { 0x80C9, 0xD063 }, 
-	{ 0x80CA, 0xD061 }, { 0x80CC, 0xAD49 }, { 0x80CD, 0xD067 }, { 0x80CE, 0xAD4C }, { 0x80CF, 0xD064 }, { 0x80D0, 0xD05C }, { 0x80D1, 0xD059 }, { 0x80D4, 0xDB49 }, 
-	{ 0x80D5, 0xD062 }, { 0x80D6, 0xAD44 }, { 0x80D7, 0xD065 }, { 0x80D8, 0xD056 }, { 0x80D9, 0xD05F }, { 0x80DA, 0xAD46 }, { 0x80DB, 0xAD4B }, { 0x80DC, 0xD060 }, 
-	{ 0x80DD, 0xAD4F }, { 0x80DE, 0xAD4D }, { 0x80E0, 0xD058 }, { 0x80E1, 0xAD4A }, { 0x80E3, 0xD05E }, { 0x80E4, 0xAD4E }, { 0x80E5, 0xAD45 }, { 0x80E6, 0xD066 }, 
-	{ 0x80ED, 0xAFDA }, { 0x80EF, 0xAFE3 }, { 0x80F0, 0xAFD8 }, { 0x80F1, 0xAFD6 }, { 0x80F2, 0xD36A }, { 0x80F3, 0xAFDE }, { 0x80F4, 0xAFDB }, { 0x80F5, 0xD36C }, 
-	{ 0x80F8, 0xAFDD }, { 0x80F9, 0xD36B }, { 0x80FA, 0xD369 }, { 0x80FB, 0xD36E }, { 0x80FC, 0xAFE2 }, { 0x80FD, 0xAFE0 }, { 0x80FE, 0xDB48 }, { 0x8100, 0xD36F }, 
-	{ 0x8101, 0xD36D }, { 0x8102, 0xAFD7 }, { 0x8105, 0xAFD9 }, { 0x8106, 0xAFDC }, { 0x8108, 0xAFDF }, { 0x810A, 0xAFE1 }, { 0x8115, 0xD74E }, { 0x8116, 0xB2E4 }, 
-	{ 0x8118, 0xD745 }, { 0x8119, 0xD747 }, { 0x811B, 0xD748 }, { 0x811D, 0xD750 }, { 0x811E, 0xD74C }, { 0x811F, 0xD74A }, { 0x8121, 0xD74D }, { 0x8122, 0xD751 }, 
-	{ 0x8123, 0xB2E5 }, { 0x8124, 0xB2E9 }, { 0x8125, 0xD746 }, { 0x8127, 0xD74F }, { 0x8129, 0xB2E7 }, { 0x812B, 0xB2E6 }, { 0x812C, 0xD74B }, { 0x812D, 0xD749 }, 
-	{ 0x812F, 0xB2E3 }, { 0x8130, 0xB2E8 }, { 0x8139, 0xB5C8 }, { 0x813A, 0xDB51 }, { 0x813D, 0xDB4F }, { 0x813E, 0xB5CA }, { 0x8143, 0xDB4A }, { 0x8144, 0xDFA1 }, 
-	{ 0x8146, 0xB5C9 }, { 0x8147, 0xDB4E }, { 0x814A, 0xDB4B }, { 0x814B, 0xB5C5 }, { 0x814C, 0xB5CB }, { 0x814D, 0xDB50 }, { 0x814E, 0xB5C7 }, { 0x814F, 0xDB4D }, 
-	{ 0x8150, 0xBB47 }, { 0x8151, 0xB5C6 }, { 0x8152, 0xDB4C }, { 0x8153, 0xB5CC }, { 0x8154, 0xB5C4 }, { 0x8155, 0xB5C3 }, { 0x815B, 0xDF77 }, { 0x815C, 0xDF75 }, 
-	{ 0x815E, 0xDF7B }, { 0x8160, 0xDF73 }, { 0x8161, 0xDFA2 }, { 0x8162, 0xDF78 }, { 0x8164, 0xDF72 }, { 0x8165, 0xB87B }, { 0x8166, 0xB8A3 }, { 0x8167, 0xDF7D }, 
-	{ 0x8169, 0xDF76 }, { 0x816B, 0xB87E }, { 0x816E, 0xB87C }, { 0x816F, 0xDF7E }, { 0x8170, 0xB879 }, { 0x8171, 0xB878 }, { 0x8172, 0xDF79 }, { 0x8173, 0xB87D }, 
-	{ 0x8174, 0xB5CD }, { 0x8176, 0xDF7C }, { 0x8177, 0xDF74 }, { 0x8178, 0xB87A }, { 0x8179, 0xB8A1 }, { 0x817A, 0xB8A2 }, { 0x817F, 0xBB4C }, { 0x8180, 0xBB48 }, 
-	{ 0x8182, 0xBB4D }, { 0x8183, 0xE3A6 }, { 0x8186, 0xE3A5 }, { 0x8187, 0xE3A7 }, { 0x8188, 0xBB4A }, { 0x8189, 0xE3A4 }, { 0x818A, 0xBB4B }, { 0x818B, 0xE3AA }, 
-	{ 0x818C, 0xE3A9 }, { 0x818D, 0xE3A8 }, { 0x818F, 0xBB49 }, { 0x8195, 0xE741 }, { 0x8197, 0xE744 }, { 0x8198, 0xBDA8 }, { 0x8199, 0xE743 }, { 0x819A, 0xBDA7 }, 
-	{ 0x819B, 0xBDA3 }, { 0x819C, 0xBDA4 }, { 0x819D, 0xBDA5 }, { 0x819E, 0xE740 }, { 0x819F, 0xE6FE }, { 0x81A0, 0xBDA6 }, { 0x81A2, 0xE742 }, { 0x81A3, 0xE6FD }, 
-	{ 0x81A6, 0xEAE9 }, { 0x81A7, 0xEAF3 }, { 0x81A8, 0xBFB1 }, { 0x81A9, 0xBFB0 }, { 0x81AB, 0xEAED }, { 0x81AC, 0xEAEF }, { 0x81AE, 0xEAEA }, { 0x81B0, 0xEAEE }, 
-	{ 0x81B1, 0xEAE8 }, { 0x81B2, 0xEAF1 }, { 0x81B3, 0xBFAF }, { 0x81B4, 0xEAF0 }, { 0x81B5, 0xEAEC }, { 0x81B7, 0xEAF2 }, { 0x81B9, 0xEAEB }, { 0x81BA, 0xC174 }, 
-	{ 0x81BB, 0xEDE8 }, { 0x81BC, 0xEDEE }, { 0x81BD, 0xC178 }, { 0x81BE, 0xC17A }, { 0x81BF, 0xC177 }, { 0x81C0, 0xC176 }, { 0x81C2, 0xC175 }, { 0x81C3, 0xC173 }, 
-	{ 0x81C4, 0xEDE9 }, { 0x81C5, 0xEDEC }, { 0x81C6, 0xC172 }, { 0x81C7, 0xEDED }, { 0x81C9, 0xC179 }, { 0x81CA, 0xEDEB }, { 0x81CC, 0xEDEA }, { 0x81CD, 0xC2C0 }, 
-	{ 0x81CF, 0xC2C1 }, { 0x81D0, 0xF0A1 }, { 0x81D1, 0xF07D }, { 0x81D2, 0xF07E }, { 0x81D5, 0xF2C2 }, { 0x81D7, 0xF2C1 }, { 0x81D8, 0xC3BE }, { 0x81D9, 0xF4B4 }, 
-	{ 0x81DA, 0xC4A4 }, { 0x81DB, 0xF4B3 }, { 0x81DD, 0xF5F0 }, { 0x81DE, 0xF745 }, { 0x81DF, 0xC5A6 }, { 0x81E0, 0xF943 }, { 0x81E1, 0xF944 }, { 0x81E2, 0xC5D8 }, 
-	{ 0x81E3, 0xA6DA }, { 0x81E5, 0xAAD7 }, { 0x81E6, 0xDB52 }, { 0x81E7, 0xBB4E }, { 0x81E8, 0xC17B }, { 0x81E9, 0xEDEF }, { 0x81EA, 0xA6DB }, { 0x81EC, 0xAFE5 }, 
-	{ 0x81ED, 0xAFE4 }, { 0x81EE, 0xDB53 }, { 0x81F2, 0xEAF4 }, { 0x81F3, 0xA6DC }, { 0x81F4, 0xAD50 }, { 0x81F7, 0xDB54 }, { 0x81F8, 0xDB55 }, { 0x81F9, 0xDB56 }, 
-	{ 0x81FA, 0xBB4F }, { 0x81FB, 0xBFB2 }, { 0x81FC, 0xA6DD }, { 0x81FE, 0xAAD8 }, { 0x81FF, 0xD068 }, { 0x8200, 0xAFE6 }, { 0x8201, 0xD370 }, { 0x8202, 0xB2EA }, 
-	{ 0x8204, 0xDB57 }, { 0x8205, 0xB8A4 }, { 0x8207, 0xBB50 }, { 0x8208, 0xBFB3 }, { 0x8209, 0xC17C }, { 0x820A, 0xC2C2 }, { 0x820B, 0xF4B5 }, { 0x820C, 0xA6DE }, 
-	{ 0x820D, 0xAAD9 }, { 0x8210, 0xAFE7 }, { 0x8211, 0xD752 }, { 0x8212, 0xB5CE }, { 0x8214, 0xBB51 }, { 0x8215, 0xE3AB }, { 0x8216, 0xE745 }, { 0x821B, 0xA6DF }, 
-	{ 0x821C, 0xB5CF }, { 0x821D, 0xDFA3 }, { 0x821E, 0xBB52 }, { 0x821F, 0xA6E0 }, { 0x8220, 0xCDB1 }, { 0x8221, 0xD069 }, { 0x8222, 0xAD51 }, { 0x8225, 0xD372 }, 
-	{ 0x8228, 0xAFEA }, { 0x822A, 0xAFE8 }, { 0x822B, 0xAFE9 }, { 0x822C, 0xAFEB }, { 0x822F, 0xD371 }, { 0x8232, 0xD757 }, { 0x8233, 0xD754 }, { 0x8234, 0xD756 }, 
-	{ 0x8235, 0xB2EB }, { 0x8236, 0xB2ED }, { 0x8237, 0xB2EC }, { 0x8238, 0xD753 }, { 0x8239, 0xB2EE }, { 0x823A, 0xD755 }, { 0x823C, 0xDB58 }, { 0x823D, 0xDB59 }, 
-	{ 0x823F, 0xDB5A }, { 0x8240, 0xDFA6 }, { 0x8242, 0xDFA7 }, { 0x8244, 0xDFA5 }, { 0x8245, 0xDFA8 }, { 0x8247, 0xB8A5 }, { 0x8249, 0xDFA4 }, { 0x824B, 0xBB53 }, 
-	{ 0x824E, 0xE74A }, { 0x824F, 0xE746 }, { 0x8250, 0xE749 }, { 0x8251, 0xE74B }, { 0x8252, 0xE748 }, { 0x8253, 0xE747 }, { 0x8255, 0xEAF5 }, { 0x8256, 0xEAF6 }, 
-	{ 0x8257, 0xEAF7 }, { 0x8258, 0xBFB4 }, { 0x8259, 0xBFB5 }, { 0x825A, 0xEDF1 }, { 0x825B, 0xEDF0 }, { 0x825C, 0xEDF2 }, { 0x825E, 0xF0A3 }, { 0x825F, 0xF0A2 }, 
-	{ 0x8261, 0xF2C4 }, { 0x8263, 0xF2C5 }, { 0x8264, 0xF2C3 }, { 0x8266, 0xC4A5 }, { 0x8268, 0xF4B6 }, { 0x8269, 0xF4B7 }, { 0x826B, 0xF746 }, { 0x826C, 0xF7EF }, 
-	{ 0x826D, 0xF8BB }, { 0x826E, 0xA6E1 }, { 0x826F, 0xA87D }, { 0x8271, 0xC17D }, { 0x8272, 0xA6E2 }, { 0x8274, 0xD758 }, { 0x8275, 0xDB5B }, { 0x8277, 0xC641 }, 
-	{ 0x8278, 0xCA4A }, { 0x827C, 0xCA4B }, { 0x827D, 0xCA4D }, { 0x827E, 0xA6E3 }, { 0x827F, 0xCA4E }, { 0x8280, 0xCA4C }, { 0x8283, 0xCBA2 }, { 0x8284, 0xCBA3 }, 
-	{ 0x8285, 0xCB7B }, { 0x828A, 0xCBA1 }, { 0x828B, 0xA8A1 }, { 0x828D, 0xA8A2 }, { 0x828E, 0xCB7C }, { 0x828F, 0xCB7A }, { 0x8290, 0xCB79 }, { 0x8291, 0xCB7D }, 
-	{ 0x8292, 0xA87E }, { 0x8293, 0xCB7E }, { 0x8294, 0xD06A }, { 0x8298, 0xCDB6 }, { 0x8299, 0xAADC }, { 0x829A, 0xCDB5 }, { 0x829B, 0xCDB7 }, { 0x829D, 0xAADB }, 
-	{ 0x829E, 0xCDBC }, { 0x829F, 0xAADF }, { 0x82A0, 0xCDB2 }, { 0x82A1, 0xCDC0 }, { 0x82A2, 0xCDC6 }, { 0x82A3, 0xAAE6 }, { 0x82A4, 0xCDC3 }, { 0x82A5, 0xAAE3 }, 
-	{ 0x82A7, 0xCDB9 }, { 0x82A8, 0xCDBF }, { 0x82A9, 0xCDC1 }, { 0x82AB, 0xCDB4 }, { 0x82AC, 0xAAE2 }, { 0x82AD, 0xAADD }, { 0x82AE, 0xCDBA }, { 0x82AF, 0xAAE4 }, 
-	{ 0x82B0, 0xAAE7 }, { 0x82B1, 0xAAE1 }, { 0x82B3, 0xAADA }, { 0x82B4, 0xCDBE }, { 0x82B5, 0xCDB8 }, { 0x82B6, 0xCDC5 }, { 0x82B7, 0xAAE9 }, { 0x82B8, 0xAAE5 }, 
-	{ 0x82B9, 0xAAE0 }, { 0x82BA, 0xCDBD }, { 0x82BB, 0xAFEC }, { 0x82BC, 0xCDBB }, { 0x82BD, 0xAADE }, { 0x82BE, 0xAAE8 }, { 0x82C0, 0xCDB3 }, { 0x82C2, 0xCDC2 }, 
-	{ 0x82C3, 0xCDC4 }, { 0x82D1, 0xAD62 }, { 0x82D2, 0xAD5C }, { 0x82D3, 0xAD64 }, { 0x82D4, 0xAD61 }, { 0x82D5, 0xD071 }, { 0x82D6, 0xD074 }, { 0x82D7, 0xAD5D }, 
-	{ 0x82D9, 0xD06B }, { 0x82DB, 0xAD56 }, { 0x82DC, 0xAD60 }, { 0x82DE, 0xAD63 }, { 0x82DF, 0xAD65 }, { 0x82E0, 0xD0A2 }, { 0x82E1, 0xD077 }, { 0x82E3, 0xAD55 }, 
-	{ 0x82E4, 0xD0A1 }, { 0x82E5, 0xAD59 }, { 0x82E6, 0xAD57 }, { 0x82E7, 0xAD52 }, { 0x82E8, 0xD06F }, { 0x82EA, 0xD07E }, { 0x82EB, 0xD073 }, { 0x82EC, 0xD076 }, 
-	{ 0x82ED, 0xD0A5 }, { 0x82EF, 0xAD66 }, { 0x82F0, 0xD07D }, { 0x82F1, 0xAD5E }, { 0x82F2, 0xD078 }, { 0x82F3, 0xD0A4 }, { 0x82F4, 0xD075 }, { 0x82F5, 0xD079 }, 
-	{ 0x82F6, 0xD07C }, { 0x82F9, 0xD06D }, { 0x82FA, 0xD0A3 }, { 0x82FB, 0xD07B }, { 0x82FE, 0xD06C }, { 0x8300, 0xD070 }, { 0x8301, 0xAD5F }, { 0x8302, 0xAD5A }, 
-	{ 0x8303, 0xAD53 }, { 0x8304, 0xAD58 }, { 0x8305, 0xAD54 }, { 0x8306, 0xAD67 }, { 0x8307, 0xD06E }, { 0x8308, 0xD3A5 }, { 0x8309, 0xAD5B }, { 0x830C, 0xD07A }, 
-	{ 0x830D, 0xCE41 }, { 0x8316, 0xD3A8 }, { 0x8317, 0xAFFA }, { 0x8319, 0xD376 }, { 0x831B, 0xD3A3 }, { 0x831C, 0xD37D }, { 0x831E, 0xD3B2 }, { 0x8320, 0xD3AA }, 
-	{ 0x8322, 0xD37E }, { 0x8324, 0xD3A9 }, { 0x8325, 0xD378 }, { 0x8326, 0xD37C }, { 0x8327, 0xD3B5 }, { 0x8328, 0xAFFD }, { 0x8329, 0xD3AD }, { 0x832A, 0xD3A4 }, 
-	{ 0x832B, 0xAFED }, { 0x832C, 0xD3B3 }, { 0x832D, 0xD374 }, { 0x832F, 0xD3AC }, { 0x8331, 0xAFFC }, { 0x8332, 0xAFF7 }, { 0x8333, 0xD373 }, { 0x8334, 0xAFF5 }, 
-	{ 0x8335, 0xAFF4 }, { 0x8336, 0xAFF9 }, { 0x8337, 0xD3AB }, { 0x8338, 0xAFF1 }, { 0x8339, 0xAFF8 }, { 0x833A, 0xD072 }, { 0x833B, 0xDB5C }, { 0x833C, 0xD3A6 }, 
-	{ 0x833F, 0xD37A }, { 0x8340, 0xAFFB }, { 0x8341, 0xD37B }, { 0x8342, 0xD3A1 }, { 0x8343, 0xAFFE }, { 0x8344, 0xD375 }, { 0x8345, 0xD3AF }, { 0x8347, 0xD3AE }, 
-	{ 0x8348, 0xD3B6 }, { 0x8349, 0xAFF3 }, { 0x834A, 0xAFF0 }, { 0x834B, 0xD3B4 }, { 0x834C, 0xD3B0 }, { 0x834D, 0xD3A7 }, { 0x834E, 0xD3A2 }, { 0x834F, 0xAFF6 }, 
-	{ 0x8350, 0xAFF2 }, { 0x8351, 0xD377 }, { 0x8352, 0xAFEE }, { 0x8353, 0xD3B1 }, { 0x8354, 0xAFEF }, { 0x8356, 0xD379 }, { 0x8373, 0xD75E }, { 0x8374, 0xD760 }, 
-	{ 0x8375, 0xD765 }, { 0x8376, 0xD779 }, { 0x8377, 0xB2FC }, { 0x8378, 0xB2F2 }, { 0x837A, 0xD75D }, { 0x837B, 0xB2FD }, { 0x837C, 0xB2FE }, { 0x837D, 0xD768 }, 
-	{ 0x837E, 0xD76F }, { 0x837F, 0xD775 }, { 0x8381, 0xD762 }, { 0x8383, 0xD769 }, { 0x8386, 0xB340 }, { 0x8387, 0xD777 }, { 0x8388, 0xD772 }, { 0x8389, 0xB2FA }, 
-	{ 0x838A, 0xB2F8 }, { 0x838B, 0xD76E }, { 0x838C, 0xD76A }, { 0x838D, 0xD75C }, { 0x838E, 0xB2EF }, { 0x838F, 0xD761 }, { 0x8390, 0xD759 }, { 0x8392, 0xB2F7 }, 
-	{ 0x8393, 0xB2F9 }, { 0x8394, 0xD766 }, { 0x8395, 0xD763 }, { 0x8396, 0xB2F4 }, { 0x8397, 0xD773 }, { 0x8398, 0xB2F1 }, { 0x8399, 0xD764 }, { 0x839A, 0xD77A }, 
-	{ 0x839B, 0xD76C }, { 0x839D, 0xD76B }, { 0x839E, 0xB2F0 }, { 0x83A0, 0xB2FB }, { 0x83A2, 0xB2F3 }, { 0x83A3, 0xD75A }, { 0x83A4, 0xD75F }, { 0x83A5, 0xD770 }, 
-	{ 0x83A6, 0xD776 }, { 0x83A7, 0xB341 }, { 0x83A8, 0xD75B }, { 0x83A9, 0xD767 }, { 0x83AA, 0xD76D }, { 0x83AB, 0xB2F6 }, { 0x83AE, 0xD778 }, { 0x83AF, 0xD771 }, 
-	{ 0x83B0, 0xD774 }, { 0x83BD, 0xB2F5 }, { 0x83BF, 0xDB6C }, { 0x83C0, 0xDB60 }, { 0x83C1, 0xB5D7 }, { 0x83C2, 0xDB7D }, { 0x83C3, 0xDBA7 }, { 0x83C4, 0xDBAA }, 
-	{ 0x83C5, 0xB5D5 }, { 0x83C6, 0xDB68 }, { 0x83C7, 0xDBA3 }, { 0x83C8, 0xDB69 }, { 0x83C9, 0xDB77 }, { 0x83CA, 0xB5E2 }, { 0x83CB, 0xDB73 }, { 0x83CC, 0xB5DF }, 
-	{ 0x83CE, 0xDB74 }, { 0x83CF, 0xDB5D }, { 0x83D1, 0xDBA4 }, { 0x83D4, 0xB5E8 }, { 0x83D5, 0xDBA1 }, { 0x83D6, 0xDB75 }, { 0x83D7, 0xDBAC }, { 0x83D8, 0xDB70 }, 
-	{ 0x83D9, 0xDFC8 }, { 0x83DB, 0xDBAF }, { 0x83DC, 0xB5E6 }, { 0x83DD, 0xDB6E }, { 0x83DE, 0xDB7A }, { 0x83DF, 0xB5E9 }, { 0x83E0, 0xB5D4 }, { 0x83E1, 0xDB72 }, 
-	{ 0x83E2, 0xDBAD }, { 0x83E3, 0xDB6B }, { 0x83E4, 0xDB64 }, { 0x83E5, 0xDB6F }, { 0x83E7, 0xDB63 }, { 0x83E8, 0xDB61 }, { 0x83E9, 0xB5D0 }, { 0x83EA, 0xDBA5 }, 
-	{ 0x83EB, 0xDB6A }, { 0x83EC, 0xDBA8 }, { 0x83EE, 0xDBA9 }, { 0x83EF, 0xB5D8 }, { 0x83F0, 0xB5DD }, { 0x83F1, 0xB5D9 }, { 0x83F2, 0xB5E1 }, { 0x83F3, 0xDB7E }, 
-	{ 0x83F4, 0xB5DA }, { 0x83F5, 0xDB76 }, { 0x83F6, 0xDB66 }, { 0x83F8, 0xB5D2 }, { 0x83F9, 0xDB5E }, { 0x83FA, 0xDBA2 }, { 0x83FB, 0xDBAB }, { 0x83FC, 0xDB65 }, 
-	{ 0x83FD, 0xB5E0 }, { 0x83FE, 0xDBB0 }, { 0x83FF, 0xDB71 }, { 0x8401, 0xDB6D }, { 0x8403, 0xB5D1 }, { 0x8404, 0xB5E5 }, { 0x8406, 0xDB7C }, { 0x8407, 0xB5E7 }, 
-	{ 0x8409, 0xDB78 }, { 0x840A, 0xB5DC }, { 0x840B, 0xB5D6 }, { 0x840C, 0xB5DE }, { 0x840D, 0xB5D3 }, { 0x840E, 0xB5E4 }, { 0x840F, 0xDB79 }, { 0x8410, 0xDB67 }, 
-	{ 0x8411, 0xDB7B }, { 0x8412, 0xDB62 }, { 0x8413, 0xDBA6 }, { 0x841B, 0xDBAE }, { 0x8423, 0xDB5F }, { 0x8429, 0xDFC7 }, { 0x842B, 0xDFDD }, { 0x842C, 0xB855 }, 
-	{ 0x842D, 0xDFCC }, { 0x842F, 0xDFCA }, { 0x8430, 0xDFB5 }, { 0x8431, 0xB8A9 }, { 0x8432, 0xDFC5 }, { 0x8433, 0xDFD9 }, { 0x8434, 0xDFC1 }, { 0x8435, 0xB8B1 }, 
-	{ 0x8436, 0xDFD8 }, { 0x8437, 0xDFBF }, { 0x8438, 0xB5E3 }, { 0x8439, 0xDFCF }, { 0x843A, 0xDFC0 }, { 0x843B, 0xDFD6 }, { 0x843C, 0xB8B0 }, { 0x843D, 0xB8A8 }, 
-	{ 0x843F, 0xDFAA }, { 0x8440, 0xDFB2 }, { 0x8442, 0xDFCB }, { 0x8443, 0xDFC3 }, { 0x8444, 0xDFDC }, { 0x8445, 0xDFC6 }, { 0x8446, 0xB8B6 }, { 0x8447, 0xDFD7 }, 
-	{ 0x8449, 0xB8AD }, { 0x844B, 0xDFC9 }, { 0x844C, 0xDFD1 }, { 0x844D, 0xDFB6 }, { 0x844E, 0xDFD0 }, { 0x8450, 0xDFE1 }, { 0x8451, 0xDFB1 }, { 0x8452, 0xDFD2 }, 
-	{ 0x8454, 0xDFDF }, { 0x8456, 0xDFAB }, { 0x8457, 0xB5DB }, { 0x8459, 0xDFB9 }, { 0x845A, 0xDFB8 }, { 0x845B, 0xB8AF }, { 0x845D, 0xDFBC }, { 0x845E, 0xDFBE }, 
-	{ 0x845F, 0xDFCD }, { 0x8460, 0xDFDE }, { 0x8461, 0xB8B2 }, { 0x8463, 0xB8B3 }, { 0x8465, 0xDFB0 }, { 0x8466, 0xB8AB }, { 0x8467, 0xDFB4 }, { 0x8468, 0xDFDA }, 
-	{ 0x8469, 0xB8B4 }, { 0x846B, 0xB8AC }, { 0x846C, 0xB8AE }, { 0x846D, 0xB8B5 }, { 0x846E, 0xDFE0 }, { 0x846F, 0xDFD3 }, { 0x8470, 0xDFCE }, { 0x8473, 0xDFBB }, 
-	{ 0x8474, 0xDFBA }, { 0x8475, 0xB8AA }, { 0x8476, 0xDFAC }, { 0x8477, 0xB8A7 }, { 0x8478, 0xDFC4 }, { 0x8479, 0xDFAD }, { 0x847A, 0xDFC2 }, { 0x847D, 0xDFB7 }, 
-	{ 0x847E, 0xDFDB }, { 0x8482, 0xB8A6 }, { 0x8486, 0xDFB3 }, { 0x848D, 0xDFAF }, { 0x848E, 0xDFD5 }, { 0x848F, 0xDFAE }, { 0x8490, 0xBB60 }, { 0x8491, 0xE3D3 }, 
-	{ 0x8494, 0xE3C2 }, { 0x8497, 0xE3AC }, { 0x8498, 0xE3CA }, { 0x8499, 0xBB58 }, { 0x849A, 0xE3BB }, { 0x849B, 0xE3C5 }, { 0x849C, 0xBB5B }, { 0x849D, 0xE3BE }, 
-	{ 0x849E, 0xBB59 }, { 0x849F, 0xE3AF }, { 0x84A0, 0xE3CD }, { 0x84A1, 0xE3AE }, { 0x84A2, 0xE3C1 }, { 0x84A4, 0xE3AD }, { 0x84A7, 0xE3BF }, { 0x84A8, 0xE3C8 }, 
-	{ 0x84A9, 0xE3C6 }, { 0x84AA, 0xE3BA }, { 0x84AB, 0xE3B5 }, { 0x84AC, 0xE3B3 }, { 0x84AE, 0xE3B4 }, { 0x84AF, 0xE3C7 }, { 0x84B0, 0xE3D2 }, { 0x84B1, 0xE3BC }, 
-	{ 0x84B2, 0xBB5A }, { 0x84B4, 0xE3B7 }, { 0x84B6, 0xE3CB }, { 0x84B8, 0xBB5D }, { 0x84B9, 0xE3B6 }, { 0x84BA, 0xE3B0 }, { 0x84BB, 0xE3C0 }, { 0x84BC, 0xBB61 }, 
-	{ 0x84BF, 0xBB55 }, { 0x84C0, 0xBB5E }, { 0x84C1, 0xE3B8 }, { 0x84C2, 0xE3B2 }, { 0x84C4, 0xBB57 }, { 0x84C5, 0xDFD4 }, { 0x84C6, 0xBB56 }, { 0x84C7, 0xE3C3 }, 
-	{ 0x84C9, 0xBB54 }, { 0x84CA, 0xBB63 }, { 0x84CB, 0xBB5C }, { 0x84CC, 0xE3C4 }, { 0x84CD, 0xE3B9 }, { 0x84CE, 0xE3B1 }, { 0x84CF, 0xE3CC }, { 0x84D0, 0xE3BD }, 
-	{ 0x84D1, 0xBB62 }, { 0x84D2, 0xE3D0 }, { 0x84D3, 0xBB5F }, { 0x84D4, 0xE3CF }, { 0x84D6, 0xE3C9 }, { 0x84D7, 0xE3CE }, { 0x84DB, 0xE3D1 }, { 0x84E7, 0xE773 }, 
-	{ 0x84E8, 0xE774 }, { 0x84E9, 0xE767 }, { 0x84EA, 0xE766 }, { 0x84EB, 0xE762 }, { 0x84EC, 0xBDB4 }, { 0x84EE, 0xBDAC }, { 0x84EF, 0xE776 }, { 0x84F0, 0xE775 }, 
-	{ 0x84F1, 0xDFA9 }, { 0x84F2, 0xE75F }, { 0x84F3, 0xE763 }, { 0x84F4, 0xE75D }, { 0x84F6, 0xE770 }, { 0x84F7, 0xE761 }, { 0x84F9, 0xE777 }, { 0x84FA, 0xE75A }, 
-	{ 0x84FB, 0xE758 }, { 0x84FC, 0xE764 }, { 0x84FD, 0xE76E }, { 0x84FE, 0xE769 }, { 0x84FF, 0xBDB6 }, { 0x8500, 0xE74F }, { 0x8502, 0xE76D }, { 0x8506, 0xBDB7 }, 
-	{ 0x8507, 0xDFBD }, { 0x8508, 0xE75B }, { 0x8509, 0xE752 }, { 0x850A, 0xE755 }, { 0x850B, 0xE77B }, { 0x850C, 0xE75C }, { 0x850D, 0xE753 }, { 0x850E, 0xE751 }, 
-	{ 0x850F, 0xE74E }, { 0x8511, 0xBDB0 }, { 0x8512, 0xE765 }, { 0x8513, 0xBDAF }, { 0x8514, 0xBDB3 }, { 0x8515, 0xE760 }, { 0x8516, 0xE768 }, { 0x8517, 0xBDA9 }, 
-	{ 0x8518, 0xE778 }, { 0x8519, 0xE77C }, { 0x851A, 0xBDAB }, { 0x851C, 0xE757 }, { 0x851D, 0xE76B }, { 0x851E, 0xE76F }, { 0x851F, 0xE754 }, { 0x8520, 0xE779 }, 
-	{ 0x8521, 0xBDB2 }, { 0x8523, 0xBDB1 }, { 0x8524, 0xE74C }, { 0x8525, 0xBDB5 }, { 0x8526, 0xE772 }, { 0x8527, 0xE756 }, { 0x8528, 0xE76A }, { 0x8529, 0xE750 }, 
-	{ 0x852A, 0xE75E }, { 0x852B, 0xE759 }, { 0x852C, 0xBDAD }, { 0x852D, 0xBDAE }, { 0x852E, 0xE76C }, { 0x852F, 0xE77D }, { 0x8530, 0xE77A }, { 0x8531, 0xE771 }, 
-	{ 0x853B, 0xE74D }, { 0x853D, 0xBDAA }, { 0x853E, 0xEB49 }, { 0x8540, 0xEB40 }, { 0x8541, 0xEB43 }, { 0x8543, 0xBFBB }, { 0x8544, 0xEB45 }, { 0x8545, 0xEAF9 }, 
-	{ 0x8546, 0xEB41 }, { 0x8547, 0xEB47 }, { 0x8548, 0xBFB8 }, { 0x8549, 0xBFBC }, { 0x854A, 0xBFB6 }, { 0x854D, 0xEAFB }, { 0x854E, 0xEB4C }, { 0x8551, 0xEB46 }, 
-	{ 0x8553, 0xEAFC }, { 0x8554, 0xEB55 }, { 0x8555, 0xEB4F }, { 0x8556, 0xEAF8 }, { 0x8557, 0xEE46 }, { 0x8558, 0xEAFE }, { 0x8559, 0xBFB7 }, { 0x855B, 0xEB4A }, 
-	{ 0x855D, 0xEB54 }, { 0x855E, 0xBFBF }, { 0x8560, 0xEB51 }, { 0x8561, 0xEAFD }, { 0x8562, 0xEB44 }, { 0x8563, 0xEB48 }, { 0x8564, 0xEB42 }, { 0x8565, 0xEB56 }, 
-	{ 0x8566, 0xEB53 }, { 0x8567, 0xEB50 }, { 0x8568, 0xBFB9 }, { 0x8569, 0xBFBA }, { 0x856A, 0xBFBE }, { 0x856B, 0xEAFA }, { 0x856C, 0xEB57 }, { 0x856D, 0xBFBD }, 
-	{ 0x856E, 0xEB4D }, { 0x8571, 0xEB4B }, { 0x8575, 0xEB4E }, { 0x8576, 0xEE53 }, { 0x8577, 0xEE40 }, { 0x8578, 0xEE45 }, { 0x8579, 0xEE52 }, { 0x857A, 0xEE44 }, 
-	{ 0x857B, 0xEDFB }, { 0x857C, 0xEE41 }, { 0x857E, 0xC1A2 }, { 0x8580, 0xEDF4 }, { 0x8581, 0xEE4D }, { 0x8582, 0xEE4F }, { 0x8583, 0xEDF3 }, { 0x8584, 0xC1A1 }, 
-	{ 0x8585, 0xEE51 }, { 0x8586, 0xEE49 }, { 0x8587, 0xC1A8 }, { 0x8588, 0xEE50 }, { 0x8589, 0xEE42 }, { 0x858A, 0xC1AA }, { 0x858B, 0xEDF9 }, { 0x858C, 0xEB52 }, 
-	{ 0x858D, 0xEE4A }, { 0x858E, 0xEE47 }, { 0x858F, 0xEDF5 }, { 0x8590, 0xEE55 }, { 0x8591, 0xC1A4 }, { 0x8594, 0xC1A5 }, { 0x8595, 0xEDF7 }, { 0x8596, 0xEE48 }, 
-	{ 0x8598, 0xEE54 }, { 0x8599, 0xEE4B }, { 0x859A, 0xEDFD }, { 0x859B, 0xC1A7 }, { 0x859C, 0xC1A3 }, { 0x859D, 0xEE4C }, { 0x859E, 0xEDFE }, { 0x859F, 0xEE56 }, 
-	{ 0x85A0, 0xEDF8 }, { 0x85A1, 0xEE43 }, { 0x85A2, 0xEE4E }, { 0x85A3, 0xEDFA }, { 0x85A4, 0xEDFC }, { 0x85A6, 0xC2CB }, { 0x85A7, 0xEDF6 }, { 0x85A8, 0xC1A9 }, 
-	{ 0x85A9, 0xC2C4 }, { 0x85AA, 0xC17E }, { 0x85AF, 0xC1A6 }, { 0x85B0, 0xC2C8 }, { 0x85B1, 0xF0B3 }, { 0x85B3, 0xF0A9 }, { 0x85B4, 0xF0A4 }, { 0x85B5, 0xF0AA }, 
-	{ 0x85B6, 0xF0B4 }, { 0x85B7, 0xF0B8 }, { 0x85B8, 0xF0B7 }, { 0x85B9, 0xC2CA }, { 0x85BA, 0xC2C9 }, { 0x85BD, 0xF0AB }, { 0x85BE, 0xF0B9 }, { 0x85BF, 0xF0AE }, 
-	{ 0x85C0, 0xF0A6 }, { 0x85C2, 0xF0A8 }, { 0x85C3, 0xF0A7 }, { 0x85C4, 0xF0AD }, { 0x85C5, 0xF0B2 }, { 0x85C6, 0xF0A5 }, { 0x85C7, 0xF0AC }, { 0x85C8, 0xF0B1 }, 
-	{ 0x85C9, 0xC2C7 }, { 0x85CB, 0xF0AF }, { 0x85CD, 0xC2C5 }, { 0x85CE, 0xF0B0 }, { 0x85CF, 0xC2C3 }, { 0x85D0, 0xC2C6 }, { 0x85D1, 0xF2D5 }, { 0x85D2, 0xF0B5 }, 
-	{ 0x85D5, 0xC3C2 }, { 0x85D7, 0xF2CD }, { 0x85D8, 0xF2D1 }, { 0x85D9, 0xF2C9 }, { 0x85DA, 0xF2CC }, { 0x85DC, 0xF2D4 }, { 0x85DD, 0xC3C0 }, { 0x85DE, 0xF2D9 }, 
-	{ 0x85DF, 0xF2D2 }, { 0x85E1, 0xF2CA }, { 0x85E2, 0xF2DA }, { 0x85E3, 0xF2D3 }, { 0x85E4, 0xC3C3 }, { 0x85E5, 0xC3C4 }, { 0x85E6, 0xF2D7 }, { 0x85E8, 0xF2CB }, 
-	{ 0x85E9, 0xC3BF }, { 0x85EA, 0xC3C1 }, { 0x85EB, 0xF2C6 }, { 0x85EC, 0xF2CE }, { 0x85ED, 0xF2C8 }, { 0x85EF, 0xF2D8 }, { 0x85F0, 0xF2D6 }, { 0x85F1, 0xF2C7 }, 
-	{ 0x85F2, 0xF2CF }, { 0x85F6, 0xF4BE }, { 0x85F7, 0xC3C5 }, { 0x85F8, 0xF2D0 }, { 0x85F9, 0xC4A7 }, { 0x85FA, 0xC4A9 }, { 0x85FB, 0xC4A6 }, { 0x85FD, 0xF4C3 }, 
-	{ 0x85FE, 0xF4BB }, { 0x85FF, 0xF4B9 }, { 0x8600, 0xF4BD }, { 0x8601, 0xF4BA }, { 0x8604, 0xF4BF }, { 0x8605, 0xF4C1 }, { 0x8606, 0xC4AA }, { 0x8607, 0xC4AC }, 
-	{ 0x8609, 0xF4C0 }, { 0x860A, 0xC4AD }, { 0x860B, 0xC4AB }, { 0x860C, 0xF4C2 }, { 0x8611, 0xC4A8 }, { 0x8617, 0xC4F4 }, { 0x8618, 0xF5F1 }, { 0x8619, 0xF5F7 }, 
-	{ 0x861A, 0xC4F6 }, { 0x861B, 0xF4BC }, { 0x861C, 0xF5F6 }, { 0x861E, 0xF5FD }, { 0x861F, 0xF5F4 }, { 0x8620, 0xF5FB }, { 0x8621, 0xF5FA }, { 0x8622, 0xF4B8 }, 
-	{ 0x8623, 0xF5F5 }, { 0x8624, 0xF0B6 }, { 0x8625, 0xF5FE }, { 0x8626, 0xF5F3 }, { 0x8627, 0xF5F8 }, { 0x8629, 0xF5FC }, { 0x862A, 0xF5F2 }, { 0x862C, 0xF74A }, 
-	{ 0x862D, 0xC4F5 }, { 0x862E, 0xF5F9 }, { 0x8631, 0xF7F4 }, { 0x8632, 0xF74B }, { 0x8633, 0xF749 }, { 0x8634, 0xF747 }, { 0x8635, 0xF748 }, { 0x8636, 0xF74C }, 
-	{ 0x8638, 0xC5D9 }, { 0x8639, 0xF7F2 }, { 0x863A, 0xF7F0 }, { 0x863B, 0xF7F5 }, { 0x863C, 0xF7F3 }, { 0x863E, 0xF7F6 }, { 0x863F, 0xC5DA }, { 0x8640, 0xF7F1 }, 
-	{ 0x8643, 0xF8BC }, { 0x8646, 0xF945 }, { 0x8647, 0xF946 }, { 0x8648, 0xF947 }, { 0x864B, 0xF9C7 }, { 0x864C, 0xF9BD }, { 0x864D, 0xCA4F }, { 0x864E, 0xAAEA }, 
-	{ 0x8650, 0xAD68 }, { 0x8652, 0xD3B8 }, { 0x8653, 0xD3B7 }, { 0x8654, 0xB040 }, { 0x8655, 0xB342 }, { 0x8656, 0xD77C }, { 0x8659, 0xD77B }, { 0x865B, 0xB5EA }, 
-	{ 0x865C, 0xB8B8 }, { 0x865E, 0xB8B7 }, { 0x865F, 0xB8B9 }, { 0x8661, 0xE3D4 }, { 0x8662, 0xE77E }, { 0x8663, 0xEB58 }, { 0x8664, 0xEB5A }, { 0x8665, 0xEB59 }, 
-	{ 0x8667, 0xC1AB }, { 0x8668, 0xEE57 }, { 0x8669, 0xF0BA }, { 0x866A, 0xF9A5 }, { 0x866B, 0xA6E4 }, { 0x866D, 0xCDC9 }, { 0x866E, 0xCDCA }, { 0x866F, 0xCDC8 }, 
-	{ 0x8670, 0xCDC7 }, { 0x8671, 0xAAEB }, { 0x8673, 0xD0A9 }, { 0x8674, 0xD0A7 }, { 0x8677, 0xD0A6 }, { 0x8679, 0xAD69 }, { 0x867A, 0xAD6B }, { 0x867B, 0xAD6A }, 
-	{ 0x867C, 0xD0A8 }, { 0x8685, 0xD3C4 }, { 0x8686, 0xD3C1 }, { 0x8687, 0xD3BF }, { 0x868A, 0xB041 }, { 0x868B, 0xD3C2 }, { 0x868C, 0xB046 }, { 0x868D, 0xD3BC }, 
-	{ 0x868E, 0xD3CB }, { 0x8690, 0xD3CD }, { 0x8691, 0xD3BD }, { 0x8693, 0xB043 }, { 0x8694, 0xD3CE }, { 0x8695, 0xD3C9 }, { 0x8696, 0xD3BB }, { 0x8697, 0xD3C0 }, 
-	{ 0x8698, 0xD3CA }, { 0x8699, 0xD3C6 }, { 0x869A, 0xD3C3 }, { 0x869C, 0xB048 }, { 0x869D, 0xD3CC }, { 0x869E, 0xD3BE }, { 0x86A1, 0xD3C7 }, { 0x86A2, 0xD3B9 }, 
-	{ 0x86A3, 0xB047 }, { 0x86A4, 0xB044 }, { 0x86A5, 0xD3C5 }, { 0x86A7, 0xD3C8 }, { 0x86A8, 0xD3BA }, { 0x86A9, 0xB045 }, { 0x86AA, 0xB042 }, { 0x86AF, 0xB34C }, 
-	{ 0x86B0, 0xD7A5 }, { 0x86B1, 0xB34B }, { 0x86B3, 0xD7A8 }, { 0x86B4, 0xD7AB }, { 0x86B5, 0xB348 }, { 0x86B6, 0xB346 }, { 0x86B7, 0xD77E }, { 0x86B8, 0xD7A9 }, 
-	{ 0x86B9, 0xD7A7 }, { 0x86BA, 0xD7A4 }, { 0x86BB, 0xD7AC }, { 0x86BC, 0xD7AD }, { 0x86BD, 0xD7AF }, { 0x86BE, 0xD7B0 }, { 0x86BF, 0xD77D }, { 0x86C0, 0xB345 }, 
-	{ 0x86C1, 0xD7A2 }, { 0x86C2, 0xD7A1 }, { 0x86C3, 0xD7AE }, { 0x86C4, 0xB347 }, { 0x86C5, 0xD7A3 }, { 0x86C6, 0xB349 }, { 0x86C7, 0xB344 }, { 0x86C8, 0xD7A6 }, 
-	{ 0x86C9, 0xB34D }, { 0x86CB, 0xB34A }, { 0x86CC, 0xD7AA }, { 0x86D0, 0xB5F1 }, { 0x86D1, 0xDBBF }, { 0x86D3, 0xDBB4 }, { 0x86D4, 0xB5EE }, { 0x86D6, 0xDFE7 }, 
-	{ 0x86D7, 0xDBBD }, { 0x86D8, 0xDBB1 }, { 0x86D9, 0xB5EC }, { 0x86DA, 0xDBB6 }, { 0x86DB, 0xB5EF }, { 0x86DC, 0xDBBA }, { 0x86DD, 0xDBB8 }, { 0x86DE, 0xB5F2 }, 
-	{ 0x86DF, 0xB5EB }, { 0x86E2, 0xDBB2 }, { 0x86E3, 0xDBB5 }, { 0x86E4, 0xB5F0 }, { 0x86E6, 0xDBB3 }, { 0x86E8, 0xDBBE }, { 0x86E9, 0xDBBC }, { 0x86EA, 0xDBB7 }, 
-	{ 0x86EB, 0xDBB9 }, { 0x86EC, 0xDBBB }, { 0x86ED, 0xB5ED }, { 0x86F5, 0xDFE8 }, { 0x86F6, 0xDFEE }, { 0x86F7, 0xDFE4 }, { 0x86F8, 0xDFEA }, { 0x86F9, 0xB8BA }, 
-	{ 0x86FA, 0xDFE6 }, { 0x86FB, 0xB8C0 }, { 0x86FE, 0xB8BF }, { 0x8700, 0xB8BE }, { 0x8701, 0xDFED }, { 0x8702, 0xB8C1 }, { 0x8703, 0xB8C2 }, { 0x8704, 0xDFE3 }, 
-	{ 0x8705, 0xDFF0 }, { 0x8706, 0xB8C3 }, { 0x8707, 0xB8BD }, { 0x8708, 0xB8BC }, { 0x8709, 0xDFEC }, { 0x870A, 0xB8C4 }, { 0x870B, 0xDFE2 }, { 0x870C, 0xDFE5 }, 
-	{ 0x870D, 0xDFEF }, { 0x870E, 0xDFEB }, { 0x8711, 0xE3F4 }, { 0x8712, 0xE3E9 }, { 0x8713, 0xB8BB }, { 0x8718, 0xBB6A }, { 0x8719, 0xE3DD }, { 0x871A, 0xE3F2 }, 
-	{ 0x871B, 0xE3DE }, { 0x871C, 0xBB65 }, { 0x871E, 0xE3DB }, { 0x8720, 0xE3E4 }, { 0x8721, 0xE3DC }, { 0x8722, 0xBB67 }, { 0x8723, 0xE3D6 }, { 0x8724, 0xE3F1 }, 
-	{ 0x8725, 0xBB68 }, { 0x8726, 0xE3EE }, { 0x8727, 0xE3EF }, { 0x8728, 0xE3D7 }, { 0x8729, 0xBB6D }, { 0x872A, 0xE3E6 }, { 0x872C, 0xE3E0 }, { 0x872D, 0xE3E7 }, 
-	{ 0x872E, 0xE3DA }, { 0x8730, 0xE3F3 }, { 0x8731, 0xE3EB }, { 0x8732, 0xE3E5 }, { 0x8733, 0xE3D5 }, { 0x8734, 0xBB69 }, { 0x8735, 0xE3EC }, { 0x8737, 0xBB6C }, 
-	{ 0x8738, 0xE3F0 }, { 0x873A, 0xE3EA }, { 0x873B, 0xBB66 }, { 0x873C, 0xE3E8 }, { 0x873E, 0xE3E2 }, { 0x873F, 0xBB64 }, { 0x8740, 0xE3D9 }, { 0x8741, 0xE3E1 }, 
-	{ 0x8742, 0xE3ED }, { 0x8743, 0xE3DF }, { 0x8746, 0xE3E3 }, { 0x874C, 0xBDC1 }, { 0x874D, 0xDFE9 }, { 0x874E, 0xE7B2 }, { 0x874F, 0xE7BB }, { 0x8750, 0xE7B1 }, 
-	{ 0x8751, 0xE7AD }, { 0x8752, 0xE7AA }, { 0x8753, 0xBDC2 }, { 0x8754, 0xE7A8 }, { 0x8755, 0xBB6B }, { 0x8756, 0xE7A1 }, { 0x8757, 0xBDC0 }, { 0x8758, 0xE7A7 }, 
-	{ 0x8759, 0xBDBF }, { 0x875A, 0xE7AC }, { 0x875B, 0xE7A9 }, { 0x875C, 0xE7B9 }, { 0x875D, 0xE7B4 }, { 0x875E, 0xE7AE }, { 0x875F, 0xE7B3 }, { 0x8760, 0xBDBB }, 
-	{ 0x8761, 0xE7AB }, { 0x8762, 0xE7BE }, { 0x8763, 0xE7A2 }, { 0x8764, 0xE7A3 }, { 0x8765, 0xE7BA }, { 0x8766, 0xBDBC }, { 0x8767, 0xE7BF }, { 0x8768, 0xBDBE }, 
-	{ 0x8769, 0xE7C0 }, { 0x876A, 0xE7B0 }, { 0x876B, 0xE3D8 }, { 0x876C, 0xE7B6 }, { 0x876D, 0xE7AF }, { 0x876E, 0xE7B8 }, { 0x876F, 0xE7B5 }, { 0x8773, 0xE7A6 }, 
-	{ 0x8774, 0xBDB9 }, { 0x8775, 0xE7BD }, { 0x8776, 0xBDBA }, { 0x8777, 0xE7A4 }, { 0x8778, 0xBDBD }, { 0x8779, 0xEB64 }, { 0x877A, 0xE7B7 }, { 0x877B, 0xE7BC }, 
-	{ 0x8781, 0xEB61 }, { 0x8782, 0xBDB8 }, { 0x8783, 0xBFC0 }, { 0x8784, 0xEB6B }, { 0x8785, 0xEB67 }, { 0x8787, 0xEB65 }, { 0x8788, 0xEB60 }, { 0x8789, 0xEB6F }, 
-	{ 0x878D, 0xBFC4 }, { 0x878F, 0xEB5C }, { 0x8790, 0xEB68 }, { 0x8791, 0xEB69 }, { 0x8792, 0xEB5F }, { 0x8793, 0xEB5E }, { 0x8794, 0xEB6C }, { 0x8796, 0xEB62 }, 
-	{ 0x8797, 0xEB5D }, { 0x8798, 0xEB63 }, { 0x879A, 0xEB6E }, { 0x879B, 0xEB5B }, { 0x879C, 0xEB6D }, { 0x879D, 0xEB6A }, { 0x879E, 0xBFC2 }, { 0x879F, 0xBFC1 }, 
-	{ 0x87A2, 0xBFC3 }, { 0x87A3, 0xEB66 }, { 0x87A4, 0xF0CB }, { 0x87AA, 0xEE59 }, { 0x87AB, 0xC1B1 }, { 0x87AC, 0xEE5D }, { 0x87AD, 0xEE5A }, { 0x87AE, 0xEE61 }, 
-	{ 0x87AF, 0xEE67 }, { 0x87B0, 0xEE5C }, { 0x87B2, 0xEE70 }, { 0x87B3, 0xC1AE }, { 0x87B4, 0xEE6A }, { 0x87B5, 0xEE5F }, { 0x87B6, 0xEE6B }, { 0x87B7, 0xEE66 }, 
-	{ 0x87B8, 0xEE6D }, { 0x87B9, 0xEE5E }, { 0x87BA, 0xC1B3 }, { 0x87BB, 0xC1B2 }, { 0x87BC, 0xEE60 }, { 0x87BD, 0xEE6E }, { 0x87BE, 0xEE58 }, { 0x87BF, 0xEE6C }, 
-	{ 0x87C0, 0xC1AC }, { 0x87C2, 0xEE64 }, { 0x87C3, 0xEE63 }, { 0x87C4, 0xEE68 }, { 0x87C5, 0xEE5B }, { 0x87C6, 0xC1B0 }, { 0x87C8, 0xC1B4 }, { 0x87C9, 0xEE62 }, 
-	{ 0x87CA, 0xEE69 }, { 0x87CB, 0xC1B5 }, { 0x87CC, 0xEE65 }, { 0x87D1, 0xC1AD }, { 0x87D2, 0xC1AF }, { 0x87D3, 0xF0C7 }, { 0x87D4, 0xF0C5 }, { 0x87D7, 0xF0CC }, 
-	{ 0x87D8, 0xF0C9 }, { 0x87D9, 0xF0CD }, { 0x87DB, 0xF0BE }, { 0x87DC, 0xF0C6 }, { 0x87DD, 0xF0D1 }, { 0x87DE, 0xEE6F }, { 0x87DF, 0xF0C2 }, { 0x87E0, 0xC2CF }, 
-	{ 0x87E1, 0xE7A5 }, { 0x87E2, 0xF0BD }, { 0x87E3, 0xF0CA }, { 0x87E4, 0xF0C4 }, { 0x87E5, 0xF0C1 }, { 0x87E6, 0xF0BC }, { 0x87E7, 0xF0BB }, { 0x87E8, 0xF0D0 }, 
-	{ 0x87EA, 0xF0C0 }, { 0x87EB, 0xF0BF }, { 0x87EC, 0xC2CD }, { 0x87ED, 0xF0C8 }, { 0x87EF, 0xC2CC }, { 0x87F2, 0xC2CE }, { 0x87F3, 0xF0C3 }, { 0x87F4, 0xF0CF }, 
-	{ 0x87F6, 0xF2DE }, { 0x87F7, 0xF2DF }, { 0x87F9, 0xC3C9 }, { 0x87FA, 0xF2DC }, { 0x87FB, 0xC3C6 }, { 0x87FC, 0xF2E4 }, { 0x87FE, 0xC3CA }, { 0x87FF, 0xF2E6 }, 
-	{ 0x8800, 0xF2DB }, { 0x8801, 0xF0CE }, { 0x8802, 0xF2E8 }, { 0x8803, 0xF2DD }, { 0x8805, 0xC3C7 }, { 0x8806, 0xF2E3 }, { 0x8808, 0xF2E5 }, { 0x8809, 0xF2E0 }, 
-	{ 0x880A, 0xF2E7 }, { 0x880B, 0xF2E2 }, { 0x880C, 0xF2E1 }, { 0x880D, 0xC3C8 }, { 0x8810, 0xF4C5 }, { 0x8811, 0xF4C6 }, { 0x8813, 0xF4C8 }, { 0x8814, 0xC4AE }, 
-	{ 0x8815, 0xC4AF }, { 0x8816, 0xF4C9 }, { 0x8817, 0xF4C7 }, { 0x8819, 0xF4C4 }, { 0x881B, 0xF642 }, { 0x881C, 0xF645 }, { 0x881D, 0xF641 }, { 0x881F, 0xC4FA }, 
-	{ 0x8820, 0xF643 }, { 0x8821, 0xC4F9 }, { 0x8822, 0xC4F8 }, { 0x8823, 0xC4F7 }, { 0x8824, 0xF644 }, { 0x8825, 0xF751 }, { 0x8826, 0xF74F }, { 0x8828, 0xF74E }, 
-	{ 0x8829, 0xF640 }, { 0x882A, 0xF750 }, { 0x882B, 0xF646 }, { 0x882C, 0xF74D }, { 0x882E, 0xF7F9 }, { 0x882F, 0xF7D7 }, { 0x8830, 0xF7F7 }, { 0x8831, 0xC5DB }, 
-	{ 0x8832, 0xF7F8 }, { 0x8833, 0xF7FA }, { 0x8835, 0xF8BF }, { 0x8836, 0xC5FA }, { 0x8837, 0xF8BE }, { 0x8838, 0xF8BD }, { 0x8839, 0xC5FB }, { 0x883B, 0xC65A }, 
-	{ 0x883C, 0xF96E }, { 0x883D, 0xF9A7 }, { 0x883E, 0xF9A6 }, { 0x883F, 0xF9A8 }, { 0x8840, 0xA6E5 }, { 0x8841, 0xD0AA }, { 0x8843, 0xD3CF }, { 0x8844, 0xD3D0 }, 
-	{ 0x8848, 0xDBC0 }, { 0x884A, 0xF647 }, { 0x884B, 0xF8C0 }, { 0x884C, 0xA6E6 }, { 0x884D, 0xAD6C }, { 0x884E, 0xD0AB }, { 0x8852, 0xD7B1 }, { 0x8853, 0xB34E }, 
-	{ 0x8855, 0xDBC2 }, { 0x8856, 0xDBC1 }, { 0x8857, 0xB5F3 }, { 0x8859, 0xB8C5 }, { 0x885A, 0xE7C1 }, { 0x885B, 0xBDC3 }, { 0x885D, 0xBDC4 }, { 0x8861, 0xBFC5 }, 
-	{ 0x8862, 0xC5FC }, { 0x8863, 0xA6E7 }, { 0x8867, 0xD0AC }, { 0x8868, 0xAAED }, { 0x8869, 0xD0AE }, { 0x886A, 0xD0AD }, { 0x886B, 0xAD6D }, { 0x886D, 0xD3D1 }, 
-	{ 0x886F, 0xD3D8 }, { 0x8870, 0xB049 }, { 0x8871, 0xD3D6 }, { 0x8872, 0xD3D4 }, { 0x8874, 0xD3DB }, { 0x8875, 0xD3D2 }, { 0x8876, 0xD3D3 }, { 0x8877, 0xB04A }, 
-	{ 0x8879, 0xB04E }, { 0x887C, 0xD3DC }, { 0x887D, 0xB04D }, { 0x887E, 0xD3DA }, { 0x887F, 0xD3D7 }, { 0x8880, 0xD3D5 }, { 0x8881, 0xB04B }, { 0x8882, 0xB04C }, 
-	{ 0x8883, 0xD3D9 }, { 0x8888, 0xB350 }, { 0x8889, 0xD7B2 }, { 0x888B, 0xB355 }, { 0x888C, 0xD7C2 }, { 0x888D, 0xB354 }, { 0x888E, 0xD7C4 }, { 0x8891, 0xD7B8 }, 
-	{ 0x8892, 0xB352 }, { 0x8893, 0xD7C3 }, { 0x8895, 0xD7B3 }, { 0x8896, 0xB353 }, { 0x8897, 0xD7BF }, { 0x8898, 0xD7BB }, { 0x8899, 0xD7BD }, { 0x889A, 0xD7B7 }, 
-	{ 0x889B, 0xD7BE }, { 0x889E, 0xB34F }, { 0x889F, 0xD7BA }, { 0x88A1, 0xD7B9 }, { 0x88A2, 0xD7B5 }, { 0x88A4, 0xD7C0 }, { 0x88A7, 0xD7BC }, { 0x88A8, 0xD7B4 }, 
-	{ 0x88AA, 0xD7B6 }, { 0x88AB, 0xB351 }, { 0x88AC, 0xD7C1 }, { 0x88B1, 0xB5F6 }, { 0x88B2, 0xDBCD }, { 0x88B6, 0xDBC9 }, { 0x88B7, 0xDBCB }, { 0x88B8, 0xDBC6 }, 
-	{ 0x88B9, 0xDBC5 }, { 0x88BA, 0xDBC3 }, { 0x88BC, 0xDBCA }, { 0x88BD, 0xDBCC }, { 0x88BE, 0xDBC8 }, { 0x88C0, 0xDBC7 }, { 0x88C1, 0xB5F4 }, { 0x88C2, 0xB5F5 }, 
-	{ 0x88C9, 0xDBCF }, { 0x88CA, 0xB8CD }, { 0x88CB, 0xDFF2 }, { 0x88CC, 0xDFF8 }, { 0x88CD, 0xDFF3 }, { 0x88CE, 0xDFF4 }, { 0x88D0, 0xDFF9 }, { 0x88D2, 0xB8CF }, 
-	{ 0x88D4, 0xB8C7 }, { 0x88D5, 0xB8CE }, { 0x88D6, 0xDFF1 }, { 0x88D7, 0xDBC4 }, { 0x88D8, 0xB8CA }, { 0x88D9, 0xB8C8 }, { 0x88DA, 0xDFF7 }, { 0x88DB, 0xDFF6 }, 
-	{ 0x88DC, 0xB8C9 }, { 0x88DD, 0xB8CB }, { 0x88DE, 0xDFF5 }, { 0x88DF, 0xB8C6 }, { 0x88E1, 0xB8CC }, { 0x88E7, 0xE3F6 }, { 0x88E8, 0xBB74 }, { 0x88EB, 0xE442 }, 
-	{ 0x88EC, 0xE441 }, { 0x88EE, 0xE3FB }, { 0x88EF, 0xBB76 }, { 0x88F0, 0xE440 }, { 0x88F1, 0xE3F7 }, { 0x88F2, 0xE3F8 }, { 0x88F3, 0xBB6E }, { 0x88F4, 0xBB70 }, 
-	{ 0x88F6, 0xE3FD }, { 0x88F7, 0xE3F5 }, { 0x88F8, 0xBB72 }, { 0x88F9, 0xBB71 }, { 0x88FA, 0xE3F9 }, { 0x88FB, 0xE3FE }, { 0x88FC, 0xE3FC }, { 0x88FD, 0xBB73 }, 
-	{ 0x88FE, 0xE3FA }, { 0x8901, 0xDBCE }, { 0x8902, 0xBB6F }, { 0x8905, 0xE7C2 }, { 0x8906, 0xE7C9 }, { 0x8907, 0xBDC6 }, { 0x8909, 0xE7CD }, { 0x890A, 0xBDCA }, 
-	{ 0x890B, 0xE7C5 }, { 0x890C, 0xE7C3 }, { 0x890E, 0xE7CC }, { 0x8910, 0xBDC5 }, { 0x8911, 0xE7CB }, { 0x8912, 0xBDC7 }, { 0x8913, 0xBDC8 }, { 0x8914, 0xE7C4 }, 
-	{ 0x8915, 0xBDC9 }, { 0x8916, 0xE7CA }, { 0x8917, 0xE7C6 }, { 0x8918, 0xE7C7 }, { 0x8919, 0xE7C8 }, { 0x891A, 0xBB75 }, { 0x891E, 0xEB70 }, { 0x891F, 0xEB7C }, 
-	{ 0x8921, 0xBFCA }, { 0x8922, 0xEB77 }, { 0x8923, 0xEB79 }, { 0x8925, 0xBFC8 }, { 0x8926, 0xEB71 }, { 0x8927, 0xEB75 }, { 0x8929, 0xEB78 }, { 0x892A, 0xBFC6 }, 
-	{ 0x892B, 0xBFC9 }, { 0x892C, 0xEB7B }, { 0x892D, 0xEB73 }, { 0x892E, 0xEB74 }, { 0x892F, 0xEB7A }, { 0x8930, 0xEB72 }, { 0x8931, 0xEB76 }, { 0x8932, 0xBFC7 }, 
-	{ 0x8933, 0xEE72 }, { 0x8935, 0xEE71 }, { 0x8936, 0xC1B7 }, { 0x8937, 0xEE77 }, { 0x8938, 0xC1B9 }, { 0x893B, 0xC1B6 }, { 0x893C, 0xEE73 }, { 0x893D, 0xC1BA }, 
-	{ 0x893E, 0xEE74 }, { 0x8941, 0xEE75 }, { 0x8942, 0xEE78 }, { 0x8944, 0xC1B8 }, { 0x8946, 0xF0D6 }, { 0x8949, 0xF0D9 }, { 0x894B, 0xF0D3 }, { 0x894C, 0xF0D5 }, 
-	{ 0x894F, 0xF0D4 }, { 0x8950, 0xF0D7 }, { 0x8951, 0xF0D8 }, { 0x8952, 0xEE76 }, { 0x8953, 0xF0D2 }, { 0x8956, 0xC3CD }, { 0x8957, 0xF2EC }, { 0x8958, 0xF2EF }, 
-	{ 0x8959, 0xF2F1 }, { 0x895A, 0xF2EA }, { 0x895B, 0xF2EB }, { 0x895C, 0xF2EE }, { 0x895D, 0xF2F0 }, { 0x895E, 0xC3CE }, { 0x895F, 0xC3CC }, { 0x8960, 0xC3CB }, 
-	{ 0x8961, 0xF2ED }, { 0x8962, 0xF2E9 }, { 0x8963, 0xF4CA }, { 0x8964, 0xC4B0 }, { 0x8966, 0xF4CB }, { 0x8969, 0xF649 }, { 0x896A, 0xC4FB }, { 0x896B, 0xF64B }, 
-	{ 0x896C, 0xC4FC }, { 0x896D, 0xF648 }, { 0x896E, 0xF64A }, { 0x896F, 0xC5A8 }, { 0x8971, 0xF752 }, { 0x8972, 0xC5A7 }, { 0x8973, 0xF7FD }, { 0x8974, 0xF7FC }, 
-	{ 0x8976, 0xF7FB }, { 0x8979, 0xF948 }, { 0x897A, 0xF949 }, { 0x897B, 0xF94B }, { 0x897C, 0xF94A }, { 0x897E, 0xCA50 }, { 0x897F, 0xA6E8 }, { 0x8981, 0xAD6E }, 
-	{ 0x8982, 0xD7C5 }, { 0x8983, 0xB5F7 }, { 0x8985, 0xDFFA }, { 0x8986, 0xC2D0 }, { 0x8988, 0xF2F2 }, { 0x898B, 0xA8A3 }, { 0x898F, 0xB357 }, { 0x8993, 0xB356 }, 
-	{ 0x8995, 0xDBD0 }, { 0x8996, 0xB5F8 }, { 0x8997, 0xDBD2 }, { 0x8998, 0xDBD1 }, { 0x899B, 0xDFFB }, { 0x899C, 0xB8D0 }, { 0x899D, 0xE443 }, { 0x899E, 0xE446 }, 
-	{ 0x899F, 0xE445 }, { 0x89A1, 0xE444 }, { 0x89A2, 0xE7CE }, { 0x89A3, 0xE7D0 }, { 0x89A4, 0xE7CF }, { 0x89A6, 0xBFCC }, { 0x89AA, 0xBFCB }, { 0x89AC, 0xC1BB }, 
-	{ 0x89AD, 0xEE79 }, { 0x89AE, 0xEE7B }, { 0x89AF, 0xEE7A }, { 0x89B2, 0xC2D1 }, { 0x89B6, 0xF2F4 }, { 0x89B7, 0xF2F3 }, { 0x89B9, 0xF4CC }, { 0x89BA, 0xC4B1 }, 
-	{ 0x89BD, 0xC4FD }, { 0x89BE, 0xF754 }, { 0x89BF, 0xF753 }, { 0x89C0, 0xC65B }, { 0x89D2, 0xA8A4 }, { 0x89D3, 0xD0AF }, { 0x89D4, 0xAD6F }, { 0x89D5, 0xD7C8 }, 
-	{ 0x89D6, 0xD7C6 }, { 0x89D9, 0xD7C7 }, { 0x89DA, 0xDBD4 }, { 0x89DB, 0xDBD5 }, { 0x89DC, 0xE043 }, { 0x89DD, 0xDBD3 }, { 0x89DF, 0xDFFC }, { 0x89E0, 0xE041 }, 
-	{ 0x89E1, 0xE040 }, { 0x89E2, 0xE042 }, { 0x89E3, 0xB8D1 }, { 0x89E4, 0xDFFE }, { 0x89E5, 0xDFFD }, { 0x89E6, 0xE044 }, { 0x89E8, 0xE449 }, { 0x89E9, 0xE447 }, 
-	{ 0x89EB, 0xE448 }, { 0x89EC, 0xE7D3 }, { 0x89ED, 0xE7D1 }, { 0x89F0, 0xE7D2 }, { 0x89F1, 0xEB7D }, { 0x89F2, 0xEE7C }, { 0x89F3, 0xEE7D }, { 0x89F4, 0xC2D2 }, 
-	{ 0x89F6, 0xF2F5 }, { 0x89F7, 0xF4CD }, { 0x89F8, 0xC4B2 }, { 0x89FA, 0xF64C }, { 0x89FB, 0xF755 }, { 0x89FC, 0xC5A9 }, { 0x89FE, 0xF7FE }, { 0x89FF, 0xF94C }, 
-	{ 0x8A00, 0xA8A5 }, { 0x8A02, 0xAD71 }, { 0x8A03, 0xAD72 }, { 0x8A04, 0xD0B0 }, { 0x8A07, 0xD0B1 }, { 0x8A08, 0xAD70 }, { 0x8A0A, 0xB054 }, { 0x8A0C, 0xB052 }, 
-	{ 0x8A0E, 0xB051 }, { 0x8A0F, 0xB058 }, { 0x8A10, 0xB050 }, { 0x8A11, 0xB059 }, { 0x8A12, 0xD3DD }, { 0x8A13, 0xB056 }, { 0x8A15, 0xB053 }, { 0x8A16, 0xB057 }, 
-	{ 0x8A17, 0xB055 }, { 0x8A18, 0xB04F }, { 0x8A1B, 0xB35F }, { 0x8A1D, 0xB359 }, { 0x8A1E, 0xD7CC }, { 0x8A1F, 0xB35E }, { 0x8A22, 0xB360 }, { 0x8A23, 0xB35A }, 
-	{ 0x8A25, 0xB35B }, { 0x8A27, 0xD7CA }, { 0x8A2A, 0xB358 }, { 0x8A2C, 0xD7CB }, { 0x8A2D, 0xB35D }, { 0x8A30, 0xD7C9 }, { 0x8A31, 0xB35C }, { 0x8A34, 0xB644 }, 
-	{ 0x8A36, 0xB646 }, { 0x8A39, 0xDBD8 }, { 0x8A3A, 0xB645 }, { 0x8A3B, 0xB5F9 }, { 0x8A3C, 0xB5FD }, { 0x8A3E, 0xB8E4 }, { 0x8A3F, 0xE049 }, { 0x8A40, 0xDBDA }, 
-	{ 0x8A41, 0xB5FE }, { 0x8A44, 0xDBDD }, { 0x8A45, 0xDBDE }, { 0x8A46, 0xB643 }, { 0x8A48, 0xDBE0 }, { 0x8A4A, 0xDBE2 }, { 0x8A4C, 0xDBE3 }, { 0x8A4D, 0xDBD7 }, 
-	{ 0x8A4E, 0xDBD6 }, { 0x8A4F, 0xDBE4 }, { 0x8A50, 0xB642 }, { 0x8A51, 0xDBE1 }, { 0x8A52, 0xDBDF }, { 0x8A54, 0xB640 }, { 0x8A55, 0xB5FB }, { 0x8A56, 0xB647 }, 
-	{ 0x8A57, 0xDBDB }, { 0x8A58, 0xDBDC }, { 0x8A59, 0xDBD9 }, { 0x8A5B, 0xB641 }, { 0x8A5E, 0xB5FC }, { 0x8A60, 0xB5FA }, { 0x8A61, 0xE048 }, { 0x8A62, 0xB8DF }, 
-	{ 0x8A63, 0xB8DA }, { 0x8A66, 0xB8D5 }, { 0x8A68, 0xB8E5 }, { 0x8A69, 0xB8D6 }, { 0x8A6B, 0xB8D2 }, { 0x8A6C, 0xB8E1 }, { 0x8A6D, 0xB8DE }, { 0x8A6E, 0xB8E0 }, 
-	{ 0x8A70, 0xB8D7 }, { 0x8A71, 0xB8DC }, { 0x8A72, 0xB8D3 }, { 0x8A73, 0xB8D4 }, { 0x8A74, 0xE050 }, { 0x8A75, 0xE04D }, { 0x8A76, 0xE045 }, { 0x8A77, 0xE04A }, 
-	{ 0x8A79, 0xB8E2 }, { 0x8A7A, 0xE051 }, { 0x8A7B, 0xB8E3 }, { 0x8A7C, 0xB8D9 }, { 0x8A7F, 0xE047 }, { 0x8A81, 0xE04F }, { 0x8A82, 0xE04B }, { 0x8A83, 0xE04E }, 
-	{ 0x8A84, 0xE04C }, { 0x8A85, 0xB8DD }, { 0x8A86, 0xE046 }, { 0x8A87, 0xB8D8 }, { 0x8A8B, 0xE44C }, { 0x8A8C, 0xBB78 }, { 0x8A8D, 0xBB7B }, { 0x8A8F, 0xE44E }, 
-	{ 0x8A91, 0xBBA5 }, { 0x8A92, 0xE44D }, { 0x8A93, 0xBB7D }, { 0x8A95, 0xBDCF }, { 0x8A96, 0xE44F }, { 0x8A98, 0xBBA4 }, { 0x8A99, 0xE44B }, { 0x8A9A, 0xBBA6 }, 
-	{ 0x8A9E, 0xBB79 }, { 0x8AA0, 0xB8DB }, { 0x8AA1, 0xBB7C }, { 0x8AA3, 0xBB7A }, { 0x8AA4, 0xBB7E }, { 0x8AA5, 0xBBA2 }, { 0x8AA6, 0xBB77 }, { 0x8AA7, 0xBBA7 }, 
-	{ 0x8AA8, 0xBBA3 }, { 0x8AAA, 0xBBA1 }, { 0x8AAB, 0xE44A }, { 0x8AB0, 0xBDD6 }, { 0x8AB2, 0xBDD2 }, { 0x8AB6, 0xBDD9 }, { 0x8AB8, 0xE7D6 }, { 0x8AB9, 0xBDDA }, 
-	{ 0x8ABA, 0xE7E2 }, { 0x8ABB, 0xE7DB }, { 0x8ABC, 0xBDCB }, { 0x8ABD, 0xE7E3 }, { 0x8ABE, 0xE7DD }, { 0x8ABF, 0xBDD5 }, { 0x8AC0, 0xE7DE }, { 0x8AC2, 0xBDD4 }, 
-	{ 0x8AC3, 0xE7E1 }, { 0x8AC4, 0xBDCE }, { 0x8AC5, 0xE7DF }, { 0x8AC6, 0xE7D5 }, { 0x8AC7, 0xBDCD }, { 0x8AC8, 0xEBAA }, { 0x8AC9, 0xBDD3 }, { 0x8ACB, 0xBDD0 }, 
-	{ 0x8ACD, 0xBDD8 }, { 0x8ACF, 0xE7D4 }, { 0x8AD1, 0xE7D8 }, { 0x8AD2, 0xBDCC }, { 0x8AD3, 0xE7D7 }, { 0x8AD4, 0xE7D9 }, { 0x8AD5, 0xE7DA }, { 0x8AD6, 0xBDD7 }, 
-	{ 0x8AD7, 0xE7DC }, { 0x8AD8, 0xE7E0 }, { 0x8AD9, 0xE7E4 }, { 0x8ADB, 0xBDDB }, { 0x8ADC, 0xBFD2 }, { 0x8ADD, 0xEBA5 }, { 0x8ADE, 0xEBAB }, { 0x8ADF, 0xEBA8 }, 
-	{ 0x8AE0, 0xEB7E }, { 0x8AE1, 0xEBAC }, { 0x8AE2, 0xEBA1 }, { 0x8AE4, 0xEBA7 }, { 0x8AE6, 0xBFCD }, { 0x8AE7, 0xBFD3 }, { 0x8AE8, 0xEBAD }, { 0x8AEB, 0xBFCF }, 
-	{ 0x8AED, 0xBFD9 }, { 0x8AEE, 0xBFD4 }, { 0x8AEF, 0xEBAF }, { 0x8AF0, 0xEBA9 }, { 0x8AF1, 0xBFD0 }, { 0x8AF2, 0xEBA2 }, { 0x8AF3, 0xBFDA }, { 0x8AF4, 0xEBA3 }, 
-	{ 0x8AF5, 0xEBA4 }, { 0x8AF6, 0xBFDB }, { 0x8AF7, 0xBFD8 }, { 0x8AF8, 0xBDD1 }, { 0x8AFA, 0xBFCE }, { 0x8AFB, 0xEBB0 }, { 0x8AFC, 0xBFDC }, { 0x8AFE, 0xBFD5 }, 
-	{ 0x8AFF, 0xEBAE }, { 0x8B00, 0xBFD1 }, { 0x8B01, 0xBFD6 }, { 0x8B02, 0xBFD7 }, { 0x8B04, 0xC1C3 }, { 0x8B05, 0xEEA4 }, { 0x8B06, 0xEEAD }, { 0x8B07, 0xEEAA }, 
-	{ 0x8B08, 0xEEAC }, { 0x8B0A, 0xC1C0 }, { 0x8B0B, 0xEEA5 }, { 0x8B0D, 0xEEAB }, { 0x8B0E, 0xC1BC }, { 0x8B0F, 0xEEA7 }, { 0x8B10, 0xC1C4 }, { 0x8B11, 0xEEA3 }, 
-	{ 0x8B12, 0xEEA8 }, { 0x8B13, 0xEEAF }, { 0x8B14, 0xEBA6 }, { 0x8B15, 0xEEA9 }, { 0x8B16, 0xEEA2 }, { 0x8B17, 0xC1BD }, { 0x8B18, 0xEEA1 }, { 0x8B19, 0xC1BE }, 
-	{ 0x8B1A, 0xEEB0 }, { 0x8B1B, 0xC1BF }, { 0x8B1C, 0xEEAE }, { 0x8B1D, 0xC1C2 }, { 0x8B1E, 0xEE7E }, { 0x8B20, 0xC1C1 }, { 0x8B22, 0xEEA6 }, { 0x8B23, 0xF0DC }, 
-	{ 0x8B24, 0xF0EA }, { 0x8B25, 0xF0E5 }, { 0x8B26, 0xF0E7 }, { 0x8B27, 0xF0DB }, { 0x8B28, 0xC2D3 }, { 0x8B2A, 0xF0DA }, { 0x8B2B, 0xC2D6 }, { 0x8B2C, 0xC2D5 }, 
-	{ 0x8B2E, 0xF0E9 }, { 0x8B2F, 0xF0E1 }, { 0x8B30, 0xF0DE }, { 0x8B31, 0xF0E4 }, { 0x8B33, 0xF0DD }, { 0x8B35, 0xF0DF }, { 0x8B36, 0xF0E8 }, { 0x8B37, 0xF0E6 }, 
-	{ 0x8B39, 0xC2D4 }, { 0x8B3A, 0xF0ED }, { 0x8B3B, 0xF0EB }, { 0x8B3C, 0xF0E2 }, { 0x8B3D, 0xF0EC }, { 0x8B3E, 0xF0E3 }, { 0x8B40, 0xF2F9 }, { 0x8B41, 0xC3CF }, 
-	{ 0x8B42, 0xF341 }, { 0x8B45, 0xF64F }, { 0x8B46, 0xC3D6 }, { 0x8B47, 0xF0E0 }, { 0x8B48, 0xF2F7 }, { 0x8B49, 0xC3D2 }, { 0x8B4A, 0xF2F8 }, { 0x8B4B, 0xF2FD }, 
-	{ 0x8B4E, 0xC3D4 }, { 0x8B4F, 0xC3D5 }, { 0x8B50, 0xF2F6 }, { 0x8B51, 0xF340 }, { 0x8B52, 0xF342 }, { 0x8B53, 0xF2FA }, { 0x8B54, 0xF2FC }, { 0x8B55, 0xF2FE }, 
-	{ 0x8B56, 0xF2FB }, { 0x8B57, 0xF343 }, { 0x8B58, 0xC3D1 }, { 0x8B59, 0xC3D7 }, { 0x8B5A, 0xC3D3 }, { 0x8B5C, 0xC3D0 }, { 0x8B5D, 0xF4D0 }, { 0x8B5F, 0xC4B7 }, 
-	{ 0x8B60, 0xF4CE }, { 0x8B63, 0xF4D2 }, { 0x8B65, 0xF4D3 }, { 0x8B66, 0xC4B5 }, { 0x8B67, 0xF4D4 }, { 0x8B68, 0xF4D1 }, { 0x8B6A, 0xF4CF }, { 0x8B6B, 0xC4B8 }, 
-	{ 0x8B6C, 0xC4B4 }, { 0x8B6D, 0xF4D5 }, { 0x8B6F, 0xC4B6 }, { 0x8B70, 0xC4B3 }, { 0x8B74, 0xC4FE }, { 0x8B77, 0xC540 }, { 0x8B78, 0xF64E }, { 0x8B79, 0xF64D }, 
-	{ 0x8B7A, 0xF650 }, { 0x8B7B, 0xF651 }, { 0x8B7D, 0xC541 }, { 0x8B7E, 0xF756 }, { 0x8B7F, 0xF75B }, { 0x8B80, 0xC5AA }, { 0x8B82, 0xF758 }, { 0x8B84, 0xF757 }, 
-	{ 0x8B85, 0xF75A }, { 0x8B86, 0xF759 }, { 0x8B88, 0xF843 }, { 0x8B8A, 0xC5DC }, { 0x8B8B, 0xF842 }, { 0x8B8C, 0xF840 }, { 0x8B8E, 0xF841 }, { 0x8B92, 0xC5FE }, 
-	{ 0x8B93, 0xC5FD }, { 0x8B94, 0xF8C1 }, { 0x8B95, 0xF8C2 }, { 0x8B96, 0xC640 }, { 0x8B98, 0xF94D }, { 0x8B99, 0xF94E }, { 0x8B9A, 0xC667 }, { 0x8B9C, 0xC66D }, 
-	{ 0x8B9E, 0xF9A9 }, { 0x8B9F, 0xF9C8 }, { 0x8C37, 0xA8A6 }, { 0x8C39, 0xD7CD }, { 0x8C3B, 0xD7CE }, { 0x8C3C, 0xE052 }, { 0x8C3D, 0xE450 }, { 0x8C3E, 0xE7E5 }, 
-	{ 0x8C3F, 0xC1C6 }, { 0x8C41, 0xC1C5 }, { 0x8C42, 0xF0EE }, { 0x8C43, 0xF344 }, { 0x8C45, 0xF844 }, { 0x8C46, 0xA8A7 }, { 0x8C47, 0xD3DE }, { 0x8C48, 0xB05A }, 
-	{ 0x8C49, 0xB361 }, { 0x8C4A, 0xE054 }, { 0x8C4B, 0xE053 }, { 0x8C4C, 0xBDDC }, { 0x8C4D, 0xE7E6 }, { 0x8C4E, 0xBDDD }, { 0x8C4F, 0xEEB1 }, { 0x8C50, 0xC2D7 }, 
-	{ 0x8C54, 0xC676 }, { 0x8C55, 0xA8A8 }, { 0x8C56, 0xCDCB }, { 0x8C57, 0xD3DF }, { 0x8C5A, 0xB362 }, { 0x8C5C, 0xD7CF }, { 0x8C5D, 0xD7D0 }, { 0x8C5F, 0xDBE5 }, 
-	{ 0x8C61, 0xB648 }, { 0x8C62, 0xB8E6 }, { 0x8C64, 0xE056 }, { 0x8C65, 0xE055 }, { 0x8C66, 0xE057 }, { 0x8C68, 0xE451 }, { 0x8C69, 0xE452 }, { 0x8C6A, 0xBBA8 }, 
-	{ 0x8C6B, 0xBFDD }, { 0x8C6C, 0xBDDE }, { 0x8C6D, 0xBFDE }, { 0x8C6F, 0xEEB5 }, { 0x8C70, 0xEEB2 }, { 0x8C71, 0xEEB4 }, { 0x8C72, 0xEEB3 }, { 0x8C73, 0xC1C7 }, 
-	{ 0x8C75, 0xF0EF }, { 0x8C76, 0xF346 }, { 0x8C77, 0xF345 }, { 0x8C78, 0xCBA4 }, { 0x8C79, 0xB05C }, { 0x8C7A, 0xB05B }, { 0x8C7B, 0xD3E0 }, { 0x8C7D, 0xD7D1 }, 
-	{ 0x8C80, 0xDBE7 }, { 0x8C81, 0xDBE6 }, { 0x8C82, 0xB649 }, { 0x8C84, 0xE059 }, { 0x8C85, 0xE05A }, { 0x8C86, 0xE058 }, { 0x8C89, 0xB8E8 }, { 0x8C8A, 0xB8E7 }, 
-	{ 0x8C8C, 0xBBAA }, { 0x8C8D, 0xBBA9 }, { 0x8C8F, 0xE7E7 }, { 0x8C90, 0xEBB3 }, { 0x8C91, 0xEBB1 }, { 0x8C92, 0xEBB2 }, { 0x8C93, 0xBFDF }, { 0x8C94, 0xEEB7 }, 
-	{ 0x8C95, 0xEEB6 }, { 0x8C97, 0xF0F2 }, { 0x8C98, 0xF0F1 }, { 0x8C99, 0xF0F0 }, { 0x8C9A, 0xF347 }, { 0x8C9C, 0xF9AA }, { 0x8C9D, 0xA8A9 }, { 0x8C9E, 0xAD73 }, 
-	{ 0x8CA0, 0xAD74 }, { 0x8CA1, 0xB05D }, { 0x8CA2, 0xB05E }, { 0x8CA3, 0xD3E2 }, { 0x8CA4, 0xD3E1 }, { 0x8CA5, 0xD7D2 }, { 0x8CA7, 0xB368 }, { 0x8CA8, 0xB366 }, 
-	{ 0x8CA9, 0xB363 }, { 0x8CAA, 0xB367 }, { 0x8CAB, 0xB365 }, { 0x8CAC, 0xB364 }, { 0x8CAF, 0xB64A }, { 0x8CB0, 0xDBEA }, { 0x8CB2, 0xB8ED }, { 0x8CB3, 0xB64C }, 
-	{ 0x8CB4, 0xB651 }, { 0x8CB5, 0xDBEC }, { 0x8CB6, 0xB653 }, { 0x8CB7, 0xB652 }, { 0x8CB8, 0xB655 }, { 0x8CB9, 0xDBEB }, { 0x8CBA, 0xDBE8 }, { 0x8CBB, 0xB64F }, 
-	{ 0x8CBC, 0xB64B }, { 0x8CBD, 0xB64D }, { 0x8CBE, 0xDBE9 }, { 0x8CBF, 0xB654 }, { 0x8CC0, 0xB650 }, { 0x8CC1, 0xB64E }, { 0x8CC2, 0xB8EF }, { 0x8CC3, 0xB8EE }, 
-	{ 0x8CC4, 0xB8EC }, { 0x8CC5, 0xB8F0 }, { 0x8CC7, 0xB8EA }, { 0x8CC8, 0xB8EB }, { 0x8CCA, 0xB8E9 }, { 0x8CCC, 0xE05B }, { 0x8CCF, 0xE454 }, { 0x8CD1, 0xBBAC }, 
-	{ 0x8CD2, 0xBBAD }, { 0x8CD3, 0xBBAB }, { 0x8CD5, 0xE453 }, { 0x8CD7, 0xE455 }, { 0x8CD9, 0xE7EA }, { 0x8CDA, 0xE7EC }, { 0x8CDC, 0xBDE7 }, { 0x8CDD, 0xE7ED }, 
-	{ 0x8CDE, 0xBDE0 }, { 0x8CDF, 0xE7E9 }, { 0x8CE0, 0xBDDF }, { 0x8CE1, 0xBDE9 }, { 0x8CE2, 0xBDE5 }, { 0x8CE3, 0xBDE6 }, { 0x8CE4, 0xBDE2 }, { 0x8CE5, 0xE7E8 }, 
-	{ 0x8CE6, 0xBDE1 }, { 0x8CE7, 0xE7EE }, { 0x8CE8, 0xE7EB }, { 0x8CEA, 0xBDE8 }, { 0x8CEC, 0xBDE3 }, { 0x8CED, 0xBDE4 }, { 0x8CEE, 0xEBB5 }, { 0x8CF0, 0xEBB7 }, 
-	{ 0x8CF1, 0xEBB6 }, { 0x8CF3, 0xEBB8 }, { 0x8CF4, 0xBFE0 }, { 0x8CF5, 0xEBB4 }, { 0x8CF8, 0xC1CB }, { 0x8CF9, 0xEEB8 }, { 0x8CFA, 0xC1C8 }, { 0x8CFB, 0xC1CC }, 
-	{ 0x8CFC, 0xC1CA }, { 0x8CFD, 0xC1C9 }, { 0x8CFE, 0xF0F3 }, { 0x8D00, 0xF0F6 }, { 0x8D02, 0xF0F5 }, { 0x8D04, 0xF0F4 }, { 0x8D05, 0xC2D8 }, { 0x8D06, 0xF348 }, 
-	{ 0x8D07, 0xF349 }, { 0x8D08, 0xC3D8 }, { 0x8D09, 0xF34A }, { 0x8D0A, 0xC3D9 }, { 0x8D0D, 0xC4BA }, { 0x8D0F, 0xC4B9 }, { 0x8D10, 0xF652 }, { 0x8D13, 0xC542 }, 
-	{ 0x8D14, 0xF653 }, { 0x8D15, 0xF75C }, { 0x8D16, 0xC5AB }, { 0x8D17, 0xC5AC }, { 0x8D19, 0xF845 }, { 0x8D1B, 0xC642 }, { 0x8D64, 0xA8AA }, { 0x8D66, 0xB36A }, 
-	{ 0x8D67, 0xB369 }, { 0x8D68, 0xE05C }, { 0x8D69, 0xE05D }, { 0x8D6B, 0xBBAE }, { 0x8D6C, 0xEBB9 }, { 0x8D6D, 0xBDEA }, { 0x8D6E, 0xEBBA }, { 0x8D6F, 0xEEB9 }, 
-	{ 0x8D70, 0xA8AB }, { 0x8D72, 0xD0B2 }, { 0x8D73, 0xAD76 }, { 0x8D74, 0xAD75 }, { 0x8D76, 0xD3E3 }, { 0x8D77, 0xB05F }, { 0x8D78, 0xD3E4 }, { 0x8D79, 0xD7D5 }, 
-	{ 0x8D7B, 0xD7D4 }, { 0x8D7D, 0xD7D3 }, { 0x8D80, 0xDBEE }, { 0x8D81, 0xB658 }, { 0x8D84, 0xDBED }, { 0x8D85, 0xB657 }, { 0x8D89, 0xDBEF }, { 0x8D8A, 0xB656 }, 
-	{ 0x8D8C, 0xE05F }, { 0x8D8D, 0xE062 }, { 0x8D8E, 0xE060 }, { 0x8D8F, 0xE061 }, { 0x8D90, 0xE065 }, { 0x8D91, 0xE05E }, { 0x8D92, 0xE066 }, { 0x8D93, 0xE063 }, 
-	{ 0x8D94, 0xE064 }, { 0x8D95, 0xBBB0 }, { 0x8D96, 0xE456 }, { 0x8D99, 0xBBAF }, { 0x8D9B, 0xE7F2 }, { 0x8D9C, 0xE7F0 }, { 0x8D9F, 0xBDEB }, { 0x8DA0, 0xE7EF }, 
-	{ 0x8DA1, 0xE7F1 }, { 0x8DA3, 0xBDEC }, { 0x8DA5, 0xEBBB }, { 0x8DA7, 0xEBBC }, { 0x8DA8, 0xC1CD }, { 0x8DAA, 0xF34C }, { 0x8DAB, 0xF34E }, { 0x8DAC, 0xF34B }, 
-	{ 0x8DAD, 0xF34D }, { 0x8DAE, 0xF4D6 }, { 0x8DAF, 0xF654 }, { 0x8DB2, 0xF96F }, { 0x8DB3, 0xA8AC }, { 0x8DB4, 0xAD77 }, { 0x8DB5, 0xD3E5 }, { 0x8DB6, 0xD3E7 }, 
-	{ 0x8DB7, 0xD3E6 }, { 0x8DB9, 0xD7D8 }, { 0x8DBA, 0xB36C }, { 0x8DBC, 0xD7D6 }, { 0x8DBE, 0xB36B }, { 0x8DBF, 0xD7D9 }, { 0x8DC1, 0xD7DA }, { 0x8DC2, 0xD7D7 }, 
-	{ 0x8DC5, 0xDBFB }, { 0x8DC6, 0xB660 }, { 0x8DC7, 0xDBF3 }, { 0x8DC8, 0xDBF9 }, { 0x8DCB, 0xB65B }, { 0x8DCC, 0xB65E }, { 0x8DCD, 0xDBF2 }, { 0x8DCE, 0xB659 }, 
-	{ 0x8DCF, 0xDBF6 }, { 0x8DD0, 0xE06C }, { 0x8DD1, 0xB65D }, { 0x8DD3, 0xDBF1 }, { 0x8DD5, 0xDBF7 }, { 0x8DD6, 0xDBF4 }, { 0x8DD7, 0xDBFA }, { 0x8DD8, 0xDBF0 }, 
-	{ 0x8DD9, 0xDBF8 }, { 0x8DDA, 0xB65C }, { 0x8DDB, 0xB65F }, { 0x8DDC, 0xDBF5 }, { 0x8DDD, 0xB65A }, { 0x8DDF, 0xB8F2 }, { 0x8DE0, 0xE068 }, { 0x8DE1, 0xB8F1 }, 
-	{ 0x8DE2, 0xE06F }, { 0x8DE3, 0xE06E }, { 0x8DE4, 0xB8F8 }, { 0x8DE6, 0xB8F9 }, { 0x8DE7, 0xE070 }, { 0x8DE8, 0xB8F3 }, { 0x8DE9, 0xE06D }, { 0x8DEA, 0xB8F7 }, 
-	{ 0x8DEB, 0xE072 }, { 0x8DEC, 0xE069 }, { 0x8DEE, 0xE06B }, { 0x8DEF, 0xB8F4 }, { 0x8DF0, 0xE067 }, { 0x8DF1, 0xE06A }, { 0x8DF2, 0xE071 }, { 0x8DF3, 0xB8F5 }, 
-	{ 0x8DF4, 0xE073 }, { 0x8DFA, 0xB8F6 }, { 0x8DFC, 0xBBB1 }, { 0x8DFD, 0xE45B }, { 0x8DFE, 0xE461 }, { 0x8DFF, 0xE459 }, { 0x8E00, 0xE462 }, { 0x8E02, 0xE458 }, 
-	{ 0x8E03, 0xE45D }, { 0x8E04, 0xE463 }, { 0x8E05, 0xE460 }, { 0x8E06, 0xE45F }, { 0x8E07, 0xE45E }, { 0x8E09, 0xE457 }, { 0x8E0A, 0xE45C }, { 0x8E0D, 0xE45A }, 
-	{ 0x8E0F, 0xBDF1 }, { 0x8E10, 0xBDEE }, { 0x8E11, 0xE7FB }, { 0x8E12, 0xE841 }, { 0x8E13, 0xE843 }, { 0x8E14, 0xE840 }, { 0x8E15, 0xE7F8 }, { 0x8E16, 0xE7FA }, 
-	{ 0x8E17, 0xE845 }, { 0x8E18, 0xE842 }, { 0x8E19, 0xE7FC }, { 0x8E1A, 0xE846 }, { 0x8E1B, 0xE7F9 }, { 0x8E1C, 0xE844 }, { 0x8E1D, 0xBDEF }, { 0x8E1E, 0xBDF5 }, 
-	{ 0x8E1F, 0xBDF3 }, { 0x8E20, 0xE7F3 }, { 0x8E21, 0xBDF4 }, { 0x8E22, 0xBDF0 }, { 0x8E23, 0xE7F4 }, { 0x8E24, 0xE7F6 }, { 0x8E25, 0xE7F5 }, { 0x8E26, 0xE7FD }, 
-	{ 0x8E27, 0xE7FE }, { 0x8E29, 0xBDF2 }, { 0x8E2B, 0xBDED }, { 0x8E2E, 0xE7F7 }, { 0x8E30, 0xEBC6 }, { 0x8E31, 0xBFE2 }, { 0x8E33, 0xEBBD }, { 0x8E34, 0xBFE3 }, 
-	{ 0x8E35, 0xBFE6 }, { 0x8E36, 0xEBC2 }, { 0x8E38, 0xEBBF }, { 0x8E39, 0xBFE5 }, { 0x8E3C, 0xEBC3 }, { 0x8E3D, 0xEBC4 }, { 0x8E3E, 0xEBBE }, { 0x8E3F, 0xEBC7 }, 
-	{ 0x8E40, 0xEBC0 }, { 0x8E41, 0xEBC5 }, { 0x8E42, 0xBFE4 }, { 0x8E44, 0xBFE1 }, { 0x8E45, 0xEBC1 }, { 0x8E47, 0xEEBF }, { 0x8E48, 0xC1D0 }, { 0x8E49, 0xC1CE }, 
-	{ 0x8E4A, 0xC1D1 }, { 0x8E4B, 0xC1CF }, { 0x8E4C, 0xEEBE }, { 0x8E4D, 0xEEBB }, { 0x8E4E, 0xEEBA }, { 0x8E50, 0xEEBD }, { 0x8E53, 0xEEBC }, { 0x8E54, 0xF145 }, 
-	{ 0x8E55, 0xC2DE }, { 0x8E56, 0xF0FB }, { 0x8E57, 0xF0FA }, { 0x8E59, 0xC2D9 }, { 0x8E5A, 0xF141 }, { 0x8E5B, 0xF140 }, { 0x8E5C, 0xF0F7 }, { 0x8E5D, 0xF143 }, 
-	{ 0x8E5E, 0xF0FC }, { 0x8E5F, 0xC2DD }, { 0x8E60, 0xF0F9 }, { 0x8E61, 0xF142 }, { 0x8E62, 0xF0F8 }, { 0x8E63, 0xC2DA }, { 0x8E64, 0xC2DC }, { 0x8E65, 0xF0FD }, 
-	{ 0x8E66, 0xC2DB }, { 0x8E67, 0xF0FE }, { 0x8E69, 0xF144 }, { 0x8E6A, 0xF352 }, { 0x8E6C, 0xC3DE }, { 0x8E6D, 0xF34F }, { 0x8E6F, 0xF353 }, { 0x8E72, 0xC3DB }, 
-	{ 0x8E73, 0xF351 }, { 0x8E74, 0xC3E0 }, { 0x8E76, 0xC3DD }, { 0x8E78, 0xF350 }, { 0x8E7A, 0xC3DF }, { 0x8E7B, 0xF354 }, { 0x8E7C, 0xC3DA }, { 0x8E81, 0xC4BC }, 
-	{ 0x8E82, 0xC4BE }, { 0x8E84, 0xF4D9 }, { 0x8E85, 0xC4BD }, { 0x8E86, 0xF4D7 }, { 0x8E87, 0xC3DC }, { 0x8E88, 0xF4D8 }, { 0x8E89, 0xC4BB }, { 0x8E8A, 0xC543 }, 
-	{ 0x8E8B, 0xC545 }, { 0x8E8C, 0xF656 }, { 0x8E8D, 0xC544 }, { 0x8E8E, 0xF655 }, { 0x8E90, 0xF761 }, { 0x8E91, 0xC5AD }, { 0x8E92, 0xF760 }, { 0x8E93, 0xC5AE }, 
-	{ 0x8E94, 0xF75E }, { 0x8E95, 0xF75D }, { 0x8E96, 0xF762 }, { 0x8E97, 0xF763 }, { 0x8E98, 0xF846 }, { 0x8E9A, 0xF75F }, { 0x8E9D, 0xF8C6 }, { 0x8E9E, 0xF8C3 }, 
-	{ 0x8E9F, 0xF8C4 }, { 0x8EA0, 0xF8C5 }, { 0x8EA1, 0xC65C }, { 0x8EA3, 0xF951 }, { 0x8EA4, 0xF950 }, { 0x8EA5, 0xF94F }, { 0x8EA6, 0xF970 }, { 0x8EA8, 0xF9BE }, 
-	{ 0x8EA9, 0xF9AB }, { 0x8EAA, 0xC66E }, { 0x8EAB, 0xA8AD }, { 0x8EAC, 0xB060 }, { 0x8EB2, 0xB8FA }, { 0x8EBA, 0xBDF6 }, { 0x8EBD, 0xEBC8 }, { 0x8EC0, 0xC2DF }, 
-	{ 0x8EC2, 0xF355 }, { 0x8EC9, 0xF9AC }, { 0x8ECA, 0xA8AE }, { 0x8ECB, 0xAAEE }, { 0x8ECC, 0xAD79 }, { 0x8ECD, 0xAD78 }, { 0x8ECF, 0xB063 }, { 0x8ED1, 0xD3E8 }, 
-	{ 0x8ED2, 0xB061 }, { 0x8ED3, 0xD3E9 }, { 0x8ED4, 0xB062 }, { 0x8ED7, 0xD7DF }, { 0x8ED8, 0xD7DB }, { 0x8EDB, 0xB36D }, { 0x8EDC, 0xD7DE }, { 0x8EDD, 0xD7DD }, 
-	{ 0x8EDE, 0xD7DC }, { 0x8EDF, 0xB36E }, { 0x8EE0, 0xD7E0 }, { 0x8EE1, 0xD7E1 }, { 0x8EE5, 0xDC43 }, { 0x8EE6, 0xDC41 }, { 0x8EE7, 0xDC45 }, { 0x8EE8, 0xDC46 }, 
-	{ 0x8EE9, 0xDC4C }, { 0x8EEB, 0xDC48 }, { 0x8EEC, 0xDC4A }, { 0x8EEE, 0xDC42 }, { 0x8EEF, 0xDBFC }, { 0x8EF1, 0xDC49 }, { 0x8EF4, 0xDC4B }, { 0x8EF5, 0xDC44 }, 
-	{ 0x8EF6, 0xDC47 }, { 0x8EF7, 0xDBFD }, { 0x8EF8, 0xB662 }, { 0x8EF9, 0xDC40 }, { 0x8EFA, 0xDBFE }, { 0x8EFB, 0xB661 }, { 0x8EFC, 0xB663 }, { 0x8EFE, 0xB8FD }, 
-	{ 0x8EFF, 0xE075 }, { 0x8F00, 0xE077 }, { 0x8F01, 0xE076 }, { 0x8F02, 0xE07B }, { 0x8F03, 0xB8FB }, { 0x8F05, 0xE078 }, { 0x8F06, 0xE074 }, { 0x8F07, 0xE079 }, 
-	{ 0x8F08, 0xE07A }, { 0x8F09, 0xB8FC }, { 0x8F0A, 0xB8FE }, { 0x8F0B, 0xE07C }, { 0x8F0D, 0xE467 }, { 0x8F0E, 0xE466 }, { 0x8F10, 0xE464 }, { 0x8F11, 0xE465 }, 
-	{ 0x8F12, 0xBBB3 }, { 0x8F13, 0xBBB5 }, { 0x8F14, 0xBBB2 }, { 0x8F15, 0xBBB4 }, { 0x8F16, 0xE84D }, { 0x8F17, 0xE84E }, { 0x8F18, 0xE849 }, { 0x8F1A, 0xE84A }, 
-	{ 0x8F1B, 0xBDF8 }, { 0x8F1C, 0xBDFD }, { 0x8F1D, 0xBDF7 }, { 0x8F1E, 0xBDFE }, { 0x8F1F, 0xBDF9 }, { 0x8F20, 0xE84B }, { 0x8F23, 0xE84C }, { 0x8F24, 0xE848 }, 
-	{ 0x8F25, 0xBE40 }, { 0x8F26, 0xBDFB }, { 0x8F29, 0xBDFA }, { 0x8F2A, 0xBDFC }, { 0x8F2C, 0xE847 }, { 0x8F2E, 0xEBCA }, { 0x8F2F, 0xBFE8 }, { 0x8F32, 0xEBCC }, 
-	{ 0x8F33, 0xBFEA }, { 0x8F34, 0xEBCF }, { 0x8F35, 0xEBCB }, { 0x8F36, 0xEBC9 }, { 0x8F37, 0xEBCE }, { 0x8F38, 0xBFE9 }, { 0x8F39, 0xEBCD }, { 0x8F3B, 0xBFE7 }, 
-	{ 0x8F3E, 0xC1D3 }, { 0x8F3F, 0xC1D6 }, { 0x8F40, 0xEEC1 }, { 0x8F42, 0xC1D4 }, { 0x8F43, 0xEEC0 }, { 0x8F44, 0xC1D2 }, { 0x8F45, 0xC1D5 }, { 0x8F46, 0xF146 }, 
-	{ 0x8F47, 0xF147 }, { 0x8F48, 0xF148 }, { 0x8F49, 0xC2E0 }, { 0x8F4B, 0xF149 }, { 0x8F4D, 0xC2E1 }, { 0x8F4E, 0xC3E2 }, { 0x8F4F, 0xF358 }, { 0x8F50, 0xF359 }, 
-	{ 0x8F51, 0xF357 }, { 0x8F52, 0xF356 }, { 0x8F53, 0xF35A }, { 0x8F54, 0xC3E1 }, { 0x8F55, 0xF4DD }, { 0x8F56, 0xF4DB }, { 0x8F57, 0xF4DC }, { 0x8F58, 0xF4DE }, 
-	{ 0x8F59, 0xF4DA }, { 0x8F5A, 0xF4DF }, { 0x8F5B, 0xF658 }, { 0x8F5D, 0xF659 }, { 0x8F5E, 0xF657 }, { 0x8F5F, 0xC546 }, { 0x8F60, 0xF764 }, { 0x8F61, 0xC5AF }, 
-	{ 0x8F62, 0xF765 }, { 0x8F63, 0xF848 }, { 0x8F64, 0xF847 }, { 0x8F9B, 0xA8AF }, { 0x8F9C, 0xB664 }, { 0x8F9F, 0xB940 }, { 0x8FA3, 0xBBB6 }, { 0x8FA6, 0xBFEC }, 
-	{ 0x8FA8, 0xBFEB }, { 0x8FAD, 0xC3E3 }, { 0x8FAE, 0xC47C }, { 0x8FAF, 0xC547 }, { 0x8FB0, 0xA8B0 }, { 0x8FB1, 0xB064 }, { 0x8FB2, 0xB941 }, { 0x8FB4, 0xF35B }, 
-	{ 0x8FBF, 0xCBA6 }, { 0x8FC2, 0xA8B1 }, { 0x8FC4, 0xA8B4 }, { 0x8FC5, 0xA8B3 }, { 0x8FC6, 0xA8B2 }, { 0x8FC9, 0xCBA5 }, { 0x8FCB, 0xCDCD }, { 0x8FCD, 0xCDCF }, 
-	{ 0x8FCE, 0xAAEF }, { 0x8FD1, 0xAAF1 }, { 0x8FD2, 0xCDCC }, { 0x8FD3, 0xCDCE }, { 0x8FD4, 0xAAF0 }, { 0x8FD5, 0xCDD1 }, { 0x8FD6, 0xCDD0 }, { 0x8FD7, 0xCDD2 }, 
-	{ 0x8FE0, 0xD0B6 }, { 0x8FE1, 0xD0B4 }, { 0x8FE2, 0xAD7C }, { 0x8FE3, 0xD0B3 }, { 0x8FE4, 0xADA3 }, { 0x8FE5, 0xAD7E }, { 0x8FE6, 0xAD7B }, { 0x8FE8, 0xADA4 }, 
-	{ 0x8FEA, 0xAD7D }, { 0x8FEB, 0xADA2 }, { 0x8FED, 0xADA1 }, { 0x8FEE, 0xD0B5 }, { 0x8FF0, 0xAD7A }, { 0x8FF4, 0xB06A }, { 0x8FF5, 0xD3EB }, { 0x8FF6, 0xD3F1 }, 
-	{ 0x8FF7, 0xB067 }, { 0x8FF8, 0xB06E }, { 0x8FFA, 0xB069 }, { 0x8FFB, 0xD3EE }, { 0x8FFC, 0xD3F0 }, { 0x8FFD, 0xB06C }, { 0x8FFE, 0xD3EA }, { 0x8FFF, 0xD3ED }, 
-	{ 0x9000, 0xB068 }, { 0x9001, 0xB065 }, { 0x9002, 0xD3EC }, { 0x9003, 0xB06B }, { 0x9004, 0xD3EF }, { 0x9005, 0xB06D }, { 0x9006, 0xB066 }, { 0x900B, 0xD7E3 }, 
-	{ 0x900C, 0xD7E6 }, { 0x900D, 0xB370 }, { 0x900F, 0xB37A }, { 0x9010, 0xB376 }, { 0x9011, 0xD7E4 }, { 0x9014, 0xB37E }, { 0x9015, 0xB377 }, { 0x9016, 0xB37C }, 
-	{ 0x9017, 0xB372 }, { 0x9019, 0xB36F }, { 0x901A, 0xB371 }, { 0x901B, 0xB37D }, { 0x901C, 0xD7E5 }, { 0x901D, 0xB375 }, { 0x901E, 0xB378 }, { 0x901F, 0xB374 }, 
-	{ 0x9020, 0xB379 }, { 0x9021, 0xD7E7 }, { 0x9022, 0xB37B }, { 0x9023, 0xB373 }, { 0x9024, 0xD7E2 }, { 0x902D, 0xDC4D }, { 0x902E, 0xB665 }, { 0x902F, 0xDC4F }, 
-	{ 0x9031, 0xB667 }, { 0x9032, 0xB669 }, { 0x9034, 0xDC4E }, { 0x9035, 0xB666 }, { 0x9036, 0xB66A }, { 0x9038, 0xB668 }, { 0x903C, 0xB947 }, { 0x903D, 0xE0A3 }, 
-	{ 0x903E, 0xB94F }, { 0x903F, 0xE07E }, { 0x9041, 0xB950 }, { 0x9042, 0xB945 }, { 0x9044, 0xE0A1 }, { 0x9047, 0xB94A }, { 0x9049, 0xE0A2 }, { 0x904A, 0xB943 }, 
-	{ 0x904B, 0xB942 }, { 0x904D, 0xB94D }, { 0x904E, 0xB94C }, { 0x904F, 0xB94B }, { 0x9050, 0xB949 }, { 0x9051, 0xB94E }, { 0x9052, 0xE07D }, { 0x9053, 0xB944 }, 
-	{ 0x9054, 0xB946 }, { 0x9055, 0xB948 }, { 0x9058, 0xBBB8 }, { 0x9059, 0xBBBB }, { 0x905B, 0xBBBF }, { 0x905C, 0xBBB9 }, { 0x905D, 0xBBBE }, { 0x905E, 0xBBBC }, 
-	{ 0x9060, 0xBBB7 }, { 0x9062, 0xBBBD }, { 0x9063, 0xBBBA }, { 0x9067, 0xE852 }, { 0x9068, 0xBE43 }, { 0x9069, 0xBE41 }, { 0x906B, 0xE853 }, { 0x906D, 0xBE44 }, 
-	{ 0x906E, 0xBE42 }, { 0x906F, 0xE851 }, { 0x9070, 0xE850 }, { 0x9072, 0xBFF0 }, { 0x9073, 0xE84F }, { 0x9074, 0xBFEE }, { 0x9075, 0xBFED }, { 0x9076, 0xEBD0 }, 
-	{ 0x9077, 0xBE45 }, { 0x9078, 0xBFEF }, { 0x9079, 0xEBD1 }, { 0x907A, 0xBFF2 }, { 0x907B, 0xEBD2 }, { 0x907C, 0xBFF1 }, { 0x907D, 0xC1D8 }, { 0x907E, 0xEEC3 }, 
-	{ 0x907F, 0xC1D7 }, { 0x9080, 0xC1DC }, { 0x9081, 0xC1DA }, { 0x9082, 0xC1DB }, { 0x9083, 0xC2E3 }, { 0x9084, 0xC1D9 }, { 0x9085, 0xEEC2 }, { 0x9086, 0xEBD3 }, 
-	{ 0x9087, 0xC2E2 }, { 0x9088, 0xC2E4 }, { 0x908A, 0xC3E4 }, { 0x908B, 0xC3E5 }, { 0x908D, 0xF4E0 }, { 0x908F, 0xC5DE }, { 0x9090, 0xC5DD }, { 0x9091, 0xA8B6 }, 
-	{ 0x9094, 0xCA55 }, { 0x9095, 0xB06F }, { 0x9097, 0xCA52 }, { 0x9098, 0xCA53 }, { 0x9099, 0xCA51 }, { 0x909B, 0xCA54 }, { 0x909E, 0xCBAA }, { 0x909F, 0xCBA7 }, 
-	{ 0x90A0, 0xCBAC }, { 0x90A1, 0xCBA8 }, { 0x90A2, 0xA8B7 }, { 0x90A3, 0xA8BA }, { 0x90A5, 0xCBA9 }, { 0x90A6, 0xA8B9 }, { 0x90A7, 0xCBAB }, { 0x90AA, 0xA8B8 }, 
-	{ 0x90AF, 0xCDD5 }, { 0x90B0, 0xCDD7 }, { 0x90B1, 0xAAF4 }, { 0x90B2, 0xCDD3 }, { 0x90B3, 0xCDD6 }, { 0x90B4, 0xCDD4 }, { 0x90B5, 0xAAF2 }, { 0x90B6, 0xAAF5 }, 
-	{ 0x90B8, 0xAAF3 }, { 0x90BD, 0xD0B8 }, { 0x90BE, 0xD0BC }, { 0x90BF, 0xD0B9 }, { 0x90C1, 0xADA7 }, { 0x90C3, 0xADA8 }, { 0x90C5, 0xD0BB }, { 0x90C7, 0xD0BD }, 
-	{ 0x90C8, 0xD0BF }, { 0x90CA, 0xADA5 }, { 0x90CB, 0xD0BE }, { 0x90CE, 0xADA6 }, { 0x90D4, 0xD7EE }, { 0x90D5, 0xD0BA }, { 0x90D6, 0xD3F2 }, { 0x90D7, 0xD3FB }, 
-	{ 0x90D8, 0xD3F9 }, { 0x90D9, 0xD3F4 }, { 0x90DA, 0xD3F5 }, { 0x90DB, 0xD3FA }, { 0x90DC, 0xD3FC }, { 0x90DD, 0xB071 }, { 0x90DF, 0xD3F7 }, { 0x90E0, 0xD3F3 }, 
-	{ 0x90E1, 0xB070 }, { 0x90E2, 0xB072 }, { 0x90E3, 0xD3F6 }, { 0x90E4, 0xD3FD }, { 0x90E5, 0xD3F8 }, { 0x90E8, 0xB3A1 }, { 0x90E9, 0xD7F1 }, { 0x90EA, 0xD7E9 }, 
-	{ 0x90EB, 0xD7EF }, { 0x90EC, 0xD7F0 }, { 0x90ED, 0xB3A2 }, { 0x90EF, 0xD7E8 }, { 0x90F0, 0xD7EA }, { 0x90F1, 0xD0B7 }, { 0x90F2, 0xD7EC }, { 0x90F3, 0xD7ED }, 
-	{ 0x90F4, 0xD7EB }, { 0x90F5, 0xB66C }, { 0x90F9, 0xDC56 }, { 0x90FA, 0xEBD4 }, { 0x90FB, 0xDC57 }, { 0x90FC, 0xDC54 }, { 0x90FD, 0xB3A3 }, { 0x90FE, 0xB66E }, 
-	{ 0x90FF, 0xDC53 }, { 0x9100, 0xDC59 }, { 0x9101, 0xDC58 }, { 0x9102, 0xB66B }, { 0x9103, 0xDC5C }, { 0x9104, 0xDC52 }, { 0x9105, 0xDC5B }, { 0x9106, 0xDC50 }, 
-	{ 0x9107, 0xDC5A }, { 0x9108, 0xDC55 }, { 0x9109, 0xB66D }, { 0x910B, 0xE0AA }, { 0x910D, 0xE0A5 }, { 0x910E, 0xE0AB }, { 0x910F, 0xE0A6 }, { 0x9110, 0xE0A4 }, 
-	{ 0x9111, 0xE0A7 }, { 0x9112, 0xB951 }, { 0x9114, 0xE0A9 }, { 0x9116, 0xE0A8 }, { 0x9117, 0xB952 }, { 0x9118, 0xBBC1 }, { 0x9119, 0xBBC0 }, { 0x911A, 0xE46E }, 
-	{ 0x911B, 0xE471 }, { 0x911C, 0xE469 }, { 0x911D, 0xE46D }, { 0x911E, 0xBBC2 }, { 0x911F, 0xE46C }, { 0x9120, 0xE46A }, { 0x9121, 0xE470 }, { 0x9122, 0xE46B }, 
-	{ 0x9123, 0xE468 }, { 0x9124, 0xE46F }, { 0x9126, 0xE859 }, { 0x9127, 0xBE48 }, { 0x9128, 0xF14A }, { 0x9129, 0xE856 }, { 0x912A, 0xE857 }, { 0x912B, 0xE855 }, 
-	{ 0x912C, 0xDC51 }, { 0x912D, 0xBE47 }, { 0x912E, 0xE85A }, { 0x912F, 0xE854 }, { 0x9130, 0xBE46 }, { 0x9131, 0xBE49 }, { 0x9132, 0xE858 }, { 0x9133, 0xEBD5 }, 
-	{ 0x9134, 0xBFF3 }, { 0x9135, 0xEBD6 }, { 0x9136, 0xEBD7 }, { 0x9138, 0xEEC4 }, { 0x9139, 0xC1DD }, { 0x913A, 0xF14B }, { 0x913B, 0xF14C }, { 0x913E, 0xF14D }, 
-	{ 0x913F, 0xF35D }, { 0x9140, 0xF35C }, { 0x9141, 0xF4E2 }, { 0x9143, 0xF4E1 }, { 0x9144, 0xF65B }, { 0x9145, 0xF65C }, { 0x9146, 0xF65A }, { 0x9147, 0xF766 }, 
-	{ 0x9148, 0xC5B0 }, { 0x9149, 0xA8BB }, { 0x914A, 0xADAA }, { 0x914B, 0xADA9 }, { 0x914C, 0xB075 }, { 0x914D, 0xB074 }, { 0x914E, 0xD440 }, { 0x914F, 0xD441 }, 
-	{ 0x9150, 0xD3FE }, { 0x9152, 0xB073 }, { 0x9153, 0xD7F5 }, { 0x9155, 0xD7F6 }, { 0x9156, 0xD7F2 }, { 0x9157, 0xB3A4 }, { 0x9158, 0xD7F3 }, { 0x915A, 0xD7F4 }, 
-	{ 0x915F, 0xDC5F }, { 0x9160, 0xDC61 }, { 0x9161, 0xDC5D }, { 0x9162, 0xDC60 }, { 0x9163, 0xB66F }, { 0x9164, 0xDC5E }, { 0x9165, 0xB670 }, { 0x9168, 0xDD73 }, 
-	{ 0x9169, 0xB955 }, { 0x916A, 0xB954 }, { 0x916C, 0xB953 }, { 0x916E, 0xE0AC }, { 0x916F, 0xE0AD }, { 0x9172, 0xE473 }, { 0x9173, 0xE475 }, { 0x9174, 0xBBC6 }, 
-	{ 0x9175, 0xBBC3 }, { 0x9177, 0xBBC5 }, { 0x9178, 0xBBC4 }, { 0x9179, 0xE474 }, { 0x917A, 0xE472 }, { 0x9180, 0xE861 }, { 0x9181, 0xE85E }, { 0x9182, 0xE85F }, 
-	{ 0x9183, 0xBE4D }, { 0x9184, 0xE860 }, { 0x9185, 0xE85B }, { 0x9186, 0xE85C }, { 0x9187, 0xBE4A }, { 0x9189, 0xBE4B }, { 0x918A, 0xE85D }, { 0x918B, 0xBE4C }, 
-	{ 0x918D, 0xEBDB }, { 0x918F, 0xEBDC }, { 0x9190, 0xEBD9 }, { 0x9191, 0xEBDA }, { 0x9192, 0xBFF4 }, { 0x9193, 0xEBD8 }, { 0x9199, 0xEEC8 }, { 0x919A, 0xEEC5 }, 
-	{ 0x919B, 0xEEC7 }, { 0x919C, 0xC1E0 }, { 0x919D, 0xEECB }, { 0x919E, 0xC1DF }, { 0x919F, 0xEEC9 }, { 0x91A0, 0xEECC }, { 0x91A1, 0xEECA }, { 0x91A2, 0xEEC6 }, 
-	{ 0x91A3, 0xC1DE }, { 0x91A5, 0xF14F }, { 0x91A7, 0xF150 }, { 0x91A8, 0xF14E }, { 0x91AA, 0xF152 }, { 0x91AB, 0xC2E5 }, { 0x91AC, 0xC2E6 }, { 0x91AD, 0xF35F }, 
-	{ 0x91AE, 0xC3E7 }, { 0x91AF, 0xF151 }, { 0x91B0, 0xF35E }, { 0x91B1, 0xC3E6 }, { 0x91B2, 0xF4E5 }, { 0x91B3, 0xF4E6 }, { 0x91B4, 0xC4BF }, { 0x91B5, 0xF4E4 }, 
-	{ 0x91B7, 0xF4E3 }, { 0x91B9, 0xF65D }, { 0x91BA, 0xC548 }, { 0x91BC, 0xF849 }, { 0x91BD, 0xF8C8 }, { 0x91BE, 0xF8C7 }, { 0x91C0, 0xC643 }, { 0x91C1, 0xC65D }, 
-	{ 0x91C2, 0xF8C9 }, { 0x91C3, 0xF971 }, { 0x91C5, 0xC66F }, { 0x91C6, 0xA8BC }, { 0x91C7, 0xAAF6 }, { 0x91C9, 0xB956 }, { 0x91CB, 0xC4C0 }, { 0x91CC, 0xA8BD }, 
-	{ 0x91CD, 0xADAB }, { 0x91CE, 0xB3A5 }, { 0x91CF, 0xB671 }, { 0x91D0, 0xC2E7 }, { 0x91D1, 0xAAF7 }, { 0x91D3, 0xD0C1 }, { 0x91D4, 0xD0C0 }, { 0x91D5, 0xD442 }, 
-	{ 0x91D7, 0xB078 }, { 0x91D8, 0xB076 }, { 0x91D9, 0xB07A }, { 0x91DA, 0xD444 }, { 0x91DC, 0xB079 }, { 0x91DD, 0xB077 }, { 0x91E2, 0xD443 }, { 0x91E3, 0xB3A8 }, 
-	{ 0x91E4, 0xD7FC }, { 0x91E6, 0xB3A7 }, { 0x91E7, 0xB3A9 }, { 0x91E8, 0xD842 }, { 0x91E9, 0xB3AB }, { 0x91EA, 0xD7FE }, { 0x91EB, 0xD840 }, { 0x91EC, 0xD7F7 }, 
-	{ 0x91ED, 0xB3AA }, { 0x91EE, 0xD843 }, { 0x91F1, 0xD7F9 }, { 0x91F3, 0xD7FA }, { 0x91F4, 0xD7F8 }, { 0x91F5, 0xB3A6 }, { 0x91F7, 0xD841 }, { 0x91F8, 0xD7FB }, 
-	{ 0x91F9, 0xD7FD }, { 0x91FD, 0xDC6D }, { 0x91FF, 0xDC6C }, { 0x9200, 0xDC6A }, { 0x9201, 0xDC62 }, { 0x9202, 0xDC71 }, { 0x9203, 0xDC65 }, { 0x9204, 0xDC6F }, 
-	{ 0x9205, 0xDC76 }, { 0x9206, 0xDC6E }, { 0x9207, 0xB679 }, { 0x9209, 0xB675 }, { 0x920A, 0xDC63 }, { 0x920C, 0xDC69 }, { 0x920D, 0xB677 }, { 0x920F, 0xDC68 }, 
-	{ 0x9210, 0xB678 }, { 0x9211, 0xB67A }, { 0x9212, 0xDC6B }, { 0x9214, 0xB672 }, { 0x9215, 0xB673 }, { 0x9216, 0xDC77 }, { 0x9217, 0xDC75 }, { 0x9219, 0xDC74 }, 
-	{ 0x921A, 0xDC66 }, { 0x921C, 0xDC72 }, { 0x921E, 0xB676 }, { 0x9223, 0xB674 }, { 0x9224, 0xDC73 }, { 0x9225, 0xDC64 }, { 0x9226, 0xDC67 }, { 0x9227, 0xDC70 }, 
-	{ 0x922D, 0xE4BA }, { 0x922E, 0xE0B7 }, { 0x9230, 0xE0B0 }, { 0x9231, 0xE0C3 }, { 0x9232, 0xE0CC }, { 0x9233, 0xE0B3 }, { 0x9234, 0xB961 }, { 0x9236, 0xE0C0 }, 
-	{ 0x9237, 0xB957 }, { 0x9238, 0xB959 }, { 0x9239, 0xB965 }, { 0x923A, 0xE0B1 }, { 0x923D, 0xB95A }, { 0x923E, 0xB95C }, { 0x923F, 0xB966 }, { 0x9240, 0xB95B }, 
-	{ 0x9245, 0xB964 }, { 0x9246, 0xE0B9 }, { 0x9248, 0xE0AE }, { 0x9249, 0xB962 }, { 0x924A, 0xE0B8 }, { 0x924B, 0xB95E }, { 0x924C, 0xE0CA }, { 0x924D, 0xB963 }, 
-	{ 0x924E, 0xE0C8 }, { 0x924F, 0xE0BC }, { 0x9250, 0xE0C6 }, { 0x9251, 0xB960 }, { 0x9252, 0xE0AF }, { 0x9253, 0xE0C9 }, { 0x9254, 0xE0C4 }, { 0x9256, 0xE0CB }, 
-	{ 0x9257, 0xB958 }, { 0x925A, 0xB967 }, { 0x925B, 0xB95D }, { 0x925E, 0xE0B5 }, { 0x9260, 0xE0BD }, { 0x9261, 0xE0C1 }, { 0x9263, 0xE0C5 }, { 0x9264, 0xB95F }, 
-	{ 0x9265, 0xE0B4 }, { 0x9266, 0xE0B2 }, { 0x9267, 0xE0BE }, { 0x926C, 0xE0BB }, { 0x926D, 0xE0BA }, { 0x926F, 0xE0BF }, { 0x9270, 0xE0C2 }, { 0x9272, 0xE0C7 }, 
-	{ 0x9276, 0xE478 }, { 0x9278, 0xBBC7 }, { 0x9279, 0xE4A4 }, { 0x927A, 0xE47A }, { 0x927B, 0xBBCC }, { 0x927C, 0xBBD0 }, { 0x927D, 0xE4AD }, { 0x927E, 0xE4B5 }, 
-	{ 0x927F, 0xE4A6 }, { 0x9280, 0xBBC8 }, { 0x9282, 0xE4AA }, { 0x9283, 0xE0B6 }, { 0x9285, 0xBBC9 }, { 0x9286, 0xE4B1 }, { 0x9287, 0xE4B6 }, { 0x9288, 0xE4AE }, 
-	{ 0x928A, 0xE4B0 }, { 0x928B, 0xE4B9 }, { 0x928C, 0xE4B2 }, { 0x928D, 0xE47E }, { 0x928E, 0xE4A9 }, { 0x9291, 0xBBD1 }, { 0x9293, 0xBBCD }, { 0x9294, 0xE47C }, 
-	{ 0x9295, 0xE4AB }, { 0x9296, 0xBBCB }, { 0x9297, 0xE4A5 }, { 0x9298, 0xBBCA }, { 0x9299, 0xE4B3 }, { 0x929A, 0xE4A2 }, { 0x929B, 0xE479 }, { 0x929C, 0xBBCE }, 
-	{ 0x929D, 0xE4B8 }, { 0x92A0, 0xE47B }, { 0x92A1, 0xE4AF }, { 0x92A2, 0xE4AC }, { 0x92A3, 0xE4A7 }, { 0x92A4, 0xE477 }, { 0x92A5, 0xE476 }, { 0x92A6, 0xE4A1 }, 
-	{ 0x92A7, 0xE4B4 }, { 0x92A8, 0xBBCF }, { 0x92A9, 0xE4B7 }, { 0x92AA, 0xE47D }, { 0x92AB, 0xE4A3 }, { 0x92AC, 0xBE52 }, { 0x92B2, 0xBE5A }, { 0x92B3, 0xBE55 }, 
-	{ 0x92B4, 0xE8A4 }, { 0x92B5, 0xE8A1 }, { 0x92B6, 0xE867 }, { 0x92B7, 0xBE50 }, { 0x92BB, 0xBE4F }, { 0x92BC, 0xBE56 }, { 0x92C0, 0xE865 }, { 0x92C1, 0xBE54 }, 
-	{ 0x92C2, 0xE871 }, { 0x92C3, 0xE863 }, { 0x92C4, 0xE864 }, { 0x92C5, 0xBE4E }, { 0x92C6, 0xE8A3 }, { 0x92C7, 0xBE58 }, { 0x92C8, 0xE874 }, { 0x92C9, 0xE879 }, 
-	{ 0x92CA, 0xE873 }, { 0x92CB, 0xEBEE }, { 0x92CC, 0xE86F }, { 0x92CD, 0xE877 }, { 0x92CE, 0xE875 }, { 0x92CF, 0xE868 }, { 0x92D0, 0xE862 }, { 0x92D1, 0xE87D }, 
-	{ 0x92D2, 0xBE57 }, { 0x92D3, 0xE87E }, { 0x92D5, 0xE878 }, { 0x92D7, 0xE86D }, { 0x92D8, 0xE86B }, { 0x92D9, 0xE866 }, { 0x92DD, 0xE86E }, { 0x92DE, 0xE87B }, 
-	{ 0x92DF, 0xE86A }, { 0x92E0, 0xE87A }, { 0x92E1, 0xE8A2 }, { 0x92E4, 0xBE53 }, { 0x92E6, 0xE876 }, { 0x92E7, 0xE87C }, { 0x92E8, 0xE872 }, { 0x92E9, 0xE86C }, 
-	{ 0x92EA, 0xBE51 }, { 0x92EE, 0xE4A8 }, { 0x92EF, 0xE870 }, { 0x92F0, 0xBE59 }, { 0x92F1, 0xE869 }, { 0x92F7, 0xEBF4 }, { 0x92F8, 0xBFF7 }, { 0x92F9, 0xEBF3 }, 
-	{ 0x92FA, 0xEBF0 }, { 0x92FB, 0xEC44 }, { 0x92FC, 0xBFFB }, { 0x92FE, 0xEC41 }, { 0x92FF, 0xEBF8 }, { 0x9300, 0xEC43 }, { 0x9301, 0xEBE9 }, { 0x9302, 0xEBF6 }, 
-	{ 0x9304, 0xBFFD }, { 0x9306, 0xEBE1 }, { 0x9308, 0xEBDF }, { 0x9309, 0xEC42 }, { 0x930B, 0xEC40 }, { 0x930C, 0xEBFE }, { 0x930D, 0xEBED }, { 0x930E, 0xEBEC }, 
-	{ 0x930F, 0xEBE2 }, { 0x9310, 0xC040 }, { 0x9312, 0xEBE8 }, { 0x9313, 0xEBF2 }, { 0x9314, 0xEBFD }, { 0x9315, 0xC043 }, { 0x9316, 0xEC45 }, { 0x9318, 0xC1E8 }, 
-	{ 0x9319, 0xC045 }, { 0x931A, 0xBFFE }, { 0x931B, 0xEBE6 }, { 0x931D, 0xEBEF }, { 0x931E, 0xEBDE }, { 0x931F, 0xEBE0 }, { 0x9320, 0xBFF5 }, { 0x9321, 0xC042 }, 
-	{ 0x9322, 0xBFFA }, { 0x9323, 0xEBE7 }, { 0x9324, 0xEBF7 }, { 0x9325, 0xEBF1 }, { 0x9326, 0xC041 }, { 0x9327, 0xEBDD }, { 0x9328, 0xC1E3 }, { 0x9329, 0xEBF9 }, 
-	{ 0x932A, 0xEBFC }, { 0x932B, 0xBFFC }, { 0x932D, 0xEBEB }, { 0x932E, 0xC044 }, { 0x932F, 0xBFF9 }, { 0x9333, 0xBFF8 }, { 0x9334, 0xEBF5 }, { 0x9335, 0xEBFB }, 
-	{ 0x9336, 0xBFF6 }, { 0x9338, 0xEBE4 }, { 0x9339, 0xEBFA }, { 0x933C, 0xEBE5 }, { 0x9346, 0xEBEA }, { 0x9347, 0xEED2 }, { 0x9349, 0xEED7 }, { 0x934A, 0xC1E5 }, 
-	{ 0x934B, 0xC1E7 }, { 0x934C, 0xEEDD }, { 0x934D, 0xC1E1 }, { 0x934E, 0xEEEC }, { 0x934F, 0xEEE3 }, { 0x9350, 0xEED8 }, { 0x9351, 0xEED9 }, { 0x9352, 0xEEE2 }, 
-	{ 0x9354, 0xC1EE }, { 0x9355, 0xEEE1 }, { 0x9356, 0xEED1 }, { 0x9357, 0xEEE0 }, { 0x9358, 0xEED4 }, { 0x9359, 0xEEED }, { 0x935A, 0xC1ED }, { 0x935B, 0xC1EB }, 
-	{ 0x935C, 0xEED5 }, { 0x935E, 0xEEE8 }, { 0x9360, 0xEEDA }, { 0x9361, 0xEEE7 }, { 0x9363, 0xEEE9 }, { 0x9364, 0xEED0 }, { 0x9365, 0xC1E6 }, { 0x9367, 0xEEEA }, 
-	{ 0x936A, 0xEEDE }, { 0x936C, 0xC1EA }, { 0x936D, 0xEEDB }, { 0x9370, 0xC1EC }, { 0x9371, 0xEEE4 }, { 0x9375, 0xC1E4 }, { 0x9376, 0xEED6 }, { 0x9377, 0xEEE5 }, 
-	{ 0x9379, 0xEEDF }, { 0x937A, 0xEBE3 }, { 0x937B, 0xEEE6 }, { 0x937C, 0xEED3 }, { 0x937E, 0xC1E9 }, { 0x9380, 0xEEEB }, { 0x9382, 0xC1E2 }, { 0x9383, 0xEECE }, 
-	{ 0x9388, 0xF160 }, { 0x9389, 0xF159 }, { 0x938A, 0xC2E9 }, { 0x938C, 0xF154 }, { 0x938D, 0xF163 }, { 0x938E, 0xF15B }, { 0x938F, 0xEEDC }, { 0x9391, 0xF165 }, 
-	{ 0x9392, 0xF155 }, { 0x9394, 0xC2E8 }, { 0x9395, 0xF15F }, { 0x9396, 0xC2EA }, { 0x9397, 0xC2F2 }, { 0x9398, 0xC2F0 }, { 0x9399, 0xF161 }, { 0x939A, 0xC2F1 }, 
-	{ 0x939B, 0xF157 }, { 0x939D, 0xF158 }, { 0x939E, 0xF15D }, { 0x939F, 0xF162 }, { 0x93A1, 0xEECD }, { 0x93A2, 0xC2EB }, { 0x93A3, 0xF16A }, { 0x93A4, 0xF167 }, 
-	{ 0x93A5, 0xF16B }, { 0x93A6, 0xF15E }, { 0x93A7, 0xF15A }, { 0x93A8, 0xF168 }, { 0x93A9, 0xF36A }, { 0x93AA, 0xF15C }, { 0x93AC, 0xC2EE }, { 0x93AE, 0xC2ED }, 
-	{ 0x93AF, 0xEECF }, { 0x93B0, 0xC2EF }, { 0x93B1, 0xF164 }, { 0x93B2, 0xF166 }, { 0x93B3, 0xC2EC }, { 0x93B4, 0xF169 }, { 0x93B5, 0xF153 }, { 0x93B7, 0xF156 }, 
-	{ 0x93C0, 0xF373 }, { 0x93C2, 0xF363 }, { 0x93C3, 0xC3EB }, { 0x93C4, 0xF371 }, { 0x93C7, 0xF361 }, { 0x93C8, 0xC3EC }, { 0x93CA, 0xF36C }, { 0x93CC, 0xF368 }, 
-	{ 0x93CD, 0xC3F1 }, { 0x93CE, 0xF372 }, { 0x93CF, 0xF362 }, { 0x93D0, 0xF365 }, { 0x93D1, 0xC3E9 }, { 0x93D2, 0xF374 }, { 0x93D4, 0xF36D }, { 0x93D5, 0xF370 }, 
-	{ 0x93D6, 0xC3EF }, { 0x93D7, 0xC3F4 }, { 0x93D8, 0xC3F2 }, { 0x93D9, 0xF369 }, { 0x93DA, 0xF364 }, { 0x93DC, 0xC3ED }, { 0x93DD, 0xC3EE }, { 0x93DE, 0xF360 }, 
-	{ 0x93DF, 0xC3EA }, { 0x93E1, 0xC3E8 }, { 0x93E2, 0xC3F0 }, { 0x93E3, 0xF36F }, { 0x93E4, 0xC3F3 }, { 0x93E6, 0xF36B }, { 0x93E7, 0xF375 }, { 0x93E8, 0xC3F5 }, 
-	{ 0x93EC, 0xF367 }, { 0x93EE, 0xF36E }, { 0x93F5, 0xF4F3 }, { 0x93F6, 0xF542 }, { 0x93F7, 0xF4F5 }, { 0x93F8, 0xF4FC }, { 0x93F9, 0xF366 }, { 0x93FA, 0xF4FA }, 
-	{ 0x93FB, 0xF4E9 }, { 0x93FC, 0xF540 }, { 0x93FD, 0xC4C3 }, { 0x93FE, 0xF4ED }, { 0x93FF, 0xF4FE }, { 0x9400, 0xF4F4 }, { 0x9403, 0xC4C2 }, { 0x9406, 0xF544 }, 
-	{ 0x9407, 0xF4F6 }, { 0x9409, 0xF4FB }, { 0x940A, 0xF4FD }, { 0x940B, 0xF4E7 }, { 0x940C, 0xF541 }, { 0x940D, 0xF4F2 }, { 0x940E, 0xF4F7 }, { 0x940F, 0xF4EB }, 
-	{ 0x9410, 0xF4EF }, { 0x9411, 0xF543 }, { 0x9412, 0xF4F9 }, { 0x9413, 0xF4E8 }, { 0x9414, 0xF4EC }, { 0x9415, 0xF4EE }, { 0x9416, 0xF4F8 }, { 0x9418, 0xC4C1 }, 
-	{ 0x9419, 0xF4F1 }, { 0x9420, 0xF4EA }, { 0x9428, 0xF4F0 }, { 0x9429, 0xF661 }, { 0x942A, 0xF666 }, { 0x942B, 0xC54F }, { 0x942C, 0xF668 }, { 0x942E, 0xC549 }, 
-	{ 0x9430, 0xF664 }, { 0x9431, 0xF66A }, { 0x9432, 0xC54E }, { 0x9433, 0xC54A }, { 0x9435, 0xC54B }, { 0x9436, 0xF660 }, { 0x9437, 0xF667 }, { 0x9438, 0xC54D }, 
-	{ 0x9439, 0xF665 }, { 0x943A, 0xC54C }, { 0x943B, 0xF65F }, { 0x943C, 0xF663 }, { 0x943D, 0xF662 }, { 0x943F, 0xF65E }, { 0x9440, 0xF669 }, { 0x9444, 0xC5B1 }, 
-	{ 0x9445, 0xF76D }, { 0x9446, 0xF770 }, { 0x9447, 0xF76C }, { 0x9448, 0xF76E }, { 0x9449, 0xF76F }, { 0x944A, 0xF769 }, { 0x944B, 0xF76A }, { 0x944C, 0xF767 }, 
-	{ 0x944F, 0xF76B }, { 0x9450, 0xF768 }, { 0x9451, 0xC5B2 }, { 0x9452, 0xC5B3 }, { 0x9455, 0xF84B }, { 0x9457, 0xF84D }, { 0x945D, 0xF84C }, { 0x945E, 0xF84E }, 
-	{ 0x9460, 0xC5E0 }, { 0x9462, 0xF84A }, { 0x9463, 0xC5DF }, { 0x9464, 0xC5E1 }, { 0x9468, 0xF8CB }, { 0x9469, 0xF8CC }, { 0x946A, 0xC644 }, { 0x946B, 0xF8CA }, 
-	{ 0x946D, 0xF953 }, { 0x946E, 0xF952 }, { 0x946F, 0xF954 }, { 0x9470, 0xC65F }, { 0x9471, 0xF955 }, { 0x9472, 0xC65E }, { 0x9473, 0xF956 }, { 0x9474, 0xF972 }, 
-	{ 0x9475, 0xF975 }, { 0x9476, 0xF974 }, { 0x9477, 0xC668 }, { 0x9478, 0xF973 }, { 0x947C, 0xC672 }, { 0x947D, 0xC670 }, { 0x947E, 0xC671 }, { 0x947F, 0xC677 }, 
-	{ 0x9480, 0xF9C0 }, { 0x9481, 0xF9C1 }, { 0x9482, 0xF9BF }, { 0x9483, 0xF9C9 }, { 0x9577, 0xAAF8 }, { 0x957A, 0xD844 }, { 0x957B, 0xDC78 }, { 0x957C, 0xE8A5 }, 
-	{ 0x957D, 0xF376 }, { 0x9580, 0xAAF9 }, { 0x9582, 0xADAC }, { 0x9583, 0xB07B }, { 0x9586, 0xD845 }, { 0x9588, 0xD846 }, { 0x9589, 0xB3AC }, { 0x958B, 0xB67D }, 
-	{ 0x958C, 0xDC7A }, { 0x958D, 0xDC79 }, { 0x958E, 0xB6A3 }, { 0x958F, 0xB67C }, { 0x9590, 0xDC7B }, { 0x9591, 0xB67E }, { 0x9592, 0xB6A2 }, { 0x9593, 0xB6A1 }, 
-	{ 0x9594, 0xB67B }, { 0x9598, 0xB968 }, { 0x959B, 0xE0D0 }, { 0x959C, 0xE0CE }, { 0x959E, 0xE0CF }, { 0x959F, 0xE0CD }, { 0x95A1, 0xBBD2 }, { 0x95A3, 0xBBD5 }, 
-	{ 0x95A4, 0xBBD7 }, { 0x95A5, 0xBBD6 }, { 0x95A8, 0xBBD3 }, { 0x95A9, 0xBBD4 }, { 0x95AB, 0xE8A7 }, { 0x95AC, 0xE8A6 }, { 0x95AD, 0xBE5B }, { 0x95AE, 0xE8A8 }, 
-	{ 0x95B0, 0xE8A9 }, { 0x95B1, 0xBE5C }, { 0x95B5, 0xEC4D }, { 0x95B6, 0xEC4B }, { 0x95B7, 0xEEF3 }, { 0x95B9, 0xEC49 }, { 0x95BA, 0xEC4A }, { 0x95BB, 0xC046 }, 
-	{ 0x95BC, 0xEC46 }, { 0x95BD, 0xEC4E }, { 0x95BE, 0xEC48 }, { 0x95BF, 0xEC4C }, { 0x95C0, 0xEEEF }, { 0x95C3, 0xEEF1 }, { 0x95C5, 0xEEF2 }, { 0x95C6, 0xC1F3 }, 
-	{ 0x95C7, 0xEEEE }, { 0x95C8, 0xC1F2 }, { 0x95C9, 0xEEF0 }, { 0x95CA, 0xC1EF }, { 0x95CB, 0xC1F0 }, { 0x95CC, 0xC1F1 }, { 0x95CD, 0xEC47 }, { 0x95D0, 0xC2F5 }, 
-	{ 0x95D1, 0xF16E }, { 0x95D2, 0xF16C }, { 0x95D3, 0xF16D }, { 0x95D4, 0xC2F3 }, { 0x95D5, 0xC2F6 }, { 0x95D6, 0xC2F4 }, { 0x95DA, 0xF377 }, { 0x95DB, 0xF378 }, 
-	{ 0x95DC, 0xC3F6 }, { 0x95DE, 0xF545 }, { 0x95DF, 0xF547 }, { 0x95E0, 0xF546 }, { 0x95E1, 0xC4C4 }, { 0x95E2, 0xC550 }, { 0x95E3, 0xF66D }, { 0x95E4, 0xF66C }, 
-	{ 0x95E5, 0xF66B }, { 0x961C, 0xAAFA }, { 0x961E, 0xC9AA }, { 0x9620, 0xCA58 }, { 0x9621, 0xA6E9 }, { 0x9622, 0xCA56 }, { 0x9623, 0xCA59 }, { 0x9624, 0xCA57 }, 
-	{ 0x9628, 0xCBAE }, { 0x962A, 0xA8C1 }, { 0x962C, 0xA8C2 }, { 0x962D, 0xCBB0 }, { 0x962E, 0xA8BF }, { 0x962F, 0xCBAF }, { 0x9630, 0xCBAD }, { 0x9631, 0xA8C0 }, 
-	{ 0x9632, 0xA8BE }, { 0x9639, 0xCDD8 }, { 0x963A, 0xCDDB }, { 0x963B, 0xAAFD }, { 0x963C, 0xCDDA }, { 0x963D, 0xCDD9 }, { 0x963F, 0xAAFC }, { 0x9640, 0xAAFB }, 
-	{ 0x9642, 0xAB40 }, { 0x9643, 0xCDDC }, { 0x9644, 0xAAFE }, { 0x964A, 0xD0C6 }, { 0x964B, 0xADAE }, { 0x964C, 0xADAF }, { 0x964D, 0xADB0 }, { 0x964E, 0xD0C7 }, 
-	{ 0x964F, 0xD0C3 }, { 0x9650, 0xADAD }, { 0x9651, 0xD0C4 }, { 0x9653, 0xD0C5 }, { 0x9654, 0xD0C2 }, { 0x9658, 0xB0A4 }, { 0x965B, 0xB0A1 }, { 0x965C, 0xD445 }, 
-	{ 0x965D, 0xB0A2 }, { 0x965E, 0xB0A5 }, { 0x965F, 0xD446 }, { 0x9661, 0xB07E }, { 0x9662, 0xB07C }, { 0x9663, 0xB07D }, { 0x9664, 0xB0A3 }, { 0x966A, 0xB3AD }, 
-	{ 0x966B, 0xD849 }, { 0x966C, 0xB3B5 }, { 0x966D, 0xD848 }, { 0x966F, 0xD84B }, { 0x9670, 0xB3B1 }, { 0x9671, 0xD84A }, { 0x9672, 0xB6AB }, { 0x9673, 0xB3AF }, 
-	{ 0x9674, 0xB3B2 }, { 0x9675, 0xB3AE }, { 0x9676, 0xB3B3 }, { 0x9677, 0xB3B4 }, { 0x9678, 0xB3B0 }, { 0x967C, 0xD847 }, { 0x967D, 0xB6A7 }, { 0x967E, 0xDC7D }, 
-	{ 0x9680, 0xDCA3 }, { 0x9683, 0xDCA2 }, { 0x9684, 0xB6AC }, { 0x9685, 0xB6A8 }, { 0x9686, 0xB6A9 }, { 0x9687, 0xDC7C }, { 0x9688, 0xDC7E }, { 0x9689, 0xDCA1 }, 
-	{ 0x968A, 0xB6A4 }, { 0x968B, 0xB6A6 }, { 0x968D, 0xB6AA }, { 0x968E, 0xB6A5 }, { 0x9691, 0xE0D3 }, { 0x9692, 0xE0D1 }, { 0x9693, 0xE0D2 }, { 0x9694, 0xB96A }, 
-	{ 0x9695, 0xB96B }, { 0x9697, 0xE0D4 }, { 0x9698, 0xB969 }, { 0x9699, 0xBBD8 }, { 0x969B, 0xBBDA }, { 0x969C, 0xBBD9 }, { 0x969E, 0xE4BB }, { 0x96A1, 0xE4BC }, 
-	{ 0x96A2, 0xE8AB }, { 0x96A4, 0xE8AA }, { 0x96A7, 0xC047 }, { 0x96A8, 0xC048 }, { 0x96A9, 0xEC4F }, { 0x96AA, 0xC049 }, { 0x96AC, 0xEEF6 }, { 0x96AE, 0xEEF4 }, 
-	{ 0x96B0, 0xEEF5 }, { 0x96B1, 0xC1F4 }, { 0x96B3, 0xF16F }, { 0x96B4, 0xC3F7 }, { 0x96B8, 0xC1F5 }, { 0x96B9, 0xAB41 }, { 0x96BB, 0xB0A6 }, { 0x96BC, 0xD447 }, 
-	{ 0x96BF, 0xD84C }, { 0x96C0, 0xB3B6 }, { 0x96C1, 0xB6AD }, { 0x96C2, 0xDCA4 }, { 0x96C3, 0xDCA6 }, { 0x96C4, 0xB6AF }, { 0x96C5, 0xB6AE }, { 0x96C6, 0xB6B0 }, 
-	{ 0x96C7, 0xB6B1 }, { 0x96C8, 0xDCA5 }, { 0x96C9, 0xB96E }, { 0x96CA, 0xB96F }, { 0x96CB, 0xB96D }, { 0x96CC, 0xBBDB }, { 0x96CD, 0xB96C }, { 0x96CE, 0xE0D5 }, 
-	{ 0x96D2, 0xBBDC }, { 0x96D3, 0xE8AC }, { 0x96D4, 0xEC50 }, { 0x96D5, 0xC04A }, { 0x96D6, 0xC1F6 }, { 0x96D7, 0xF170 }, { 0x96D8, 0xF174 }, { 0x96D9, 0xC2F9 }, 
-	{ 0x96DA, 0xF171 }, { 0x96DB, 0xC2FA }, { 0x96DC, 0xC2F8 }, { 0x96DD, 0xF175 }, { 0x96DE, 0xC2FB }, { 0x96DF, 0xF173 }, { 0x96E1, 0xF379 }, { 0x96E2, 0xC2F7 }, 
-	{ 0x96E3, 0xC3F8 }, { 0x96E5, 0xF8CD }, { 0x96E8, 0xAB42 }, { 0x96E9, 0xB3B8 }, { 0x96EA, 0xB3B7 }, { 0x96EF, 0xB6B2 }, { 0x96F0, 0xDCA8 }, { 0x96F1, 0xDCA7 }, 
-	{ 0x96F2, 0xB6B3 }, { 0x96F5, 0xE0D9 }, { 0x96F6, 0xB973 }, { 0x96F7, 0xB970 }, { 0x96F8, 0xE0D8 }, { 0x96F9, 0xB972 }, { 0x96FA, 0xE0D6 }, { 0x96FB, 0xB971 }, 
-	{ 0x96FD, 0xE0D7 }, { 0x96FF, 0xE4BD }, { 0x9700, 0xBBDD }, { 0x9702, 0xE8AF }, { 0x9704, 0xBE5D }, { 0x9705, 0xE8AD }, { 0x9706, 0xBE5E }, { 0x9707, 0xBE5F }, 
-	{ 0x9708, 0xE8AE }, { 0x9709, 0xBE60 }, { 0x970B, 0xEC51 }, { 0x970D, 0xC04E }, { 0x970E, 0xC04B }, { 0x970F, 0xC050 }, { 0x9710, 0xEC53 }, { 0x9711, 0xC04C }, 
-	{ 0x9712, 0xEC52 }, { 0x9713, 0xC04F }, { 0x9716, 0xC04D }, { 0x9718, 0xEEF9 }, { 0x9719, 0xEEFB }, { 0x971C, 0xC1F7 }, { 0x971D, 0xEEFA }, { 0x971E, 0xC1F8 }, 
-	{ 0x971F, 0xEEF8 }, { 0x9720, 0xEEF7 }, { 0x9722, 0xF177 }, { 0x9723, 0xF176 }, { 0x9724, 0xC2FC }, { 0x9725, 0xF178 }, { 0x9726, 0xF37E }, { 0x9727, 0xC3FA }, 
-	{ 0x9728, 0xF37D }, { 0x9729, 0xF37A }, { 0x972A, 0xC3F9 }, { 0x972B, 0xF37B }, { 0x972C, 0xF37C }, { 0x972E, 0xF548 }, { 0x972F, 0xF549 }, { 0x9730, 0xC4C5 }, 
-	{ 0x9732, 0xC553 }, { 0x9735, 0xF66E }, { 0x9738, 0xC551 }, { 0x9739, 0xC552 }, { 0x973A, 0xF66F }, { 0x973D, 0xC5B4 }, { 0x973E, 0xC5B5 }, { 0x973F, 0xF771 }, 
-	{ 0x9742, 0xC645 }, { 0x9743, 0xF8CF }, { 0x9744, 0xC647 }, { 0x9746, 0xF8CE }, { 0x9747, 0xF8D0 }, { 0x9748, 0xC646 }, { 0x9749, 0xF957 }, { 0x974B, 0xF9AD }, 
-	{ 0x9752, 0xAB43 }, { 0x9756, 0xB974 }, { 0x9758, 0xE4BE }, { 0x975A, 0xE8B0 }, { 0x975B, 0xC051 }, { 0x975C, 0xC052 }, { 0x975E, 0xAB44 }, { 0x9760, 0xBE61 }, 
-	{ 0x9761, 0xC3FB }, { 0x9762, 0xADB1 }, { 0x9766, 0xC053 }, { 0x9768, 0xC5E2 }, { 0x9769, 0xADB2 }, { 0x976A, 0xD84D }, { 0x976C, 0xDCA9 }, { 0x976E, 0xDCAB }, 
-	{ 0x9770, 0xDCAA }, { 0x9772, 0xE0DD }, { 0x9773, 0xE0DA }, { 0x9774, 0xB975 }, { 0x9776, 0xB976 }, { 0x9777, 0xE0DB }, { 0x9778, 0xE0DC }, { 0x977A, 0xE4C0 }, 
-	{ 0x977B, 0xE4C5 }, { 0x977C, 0xBBDE }, { 0x977D, 0xE4BF }, { 0x977E, 0xE4C1 }, { 0x977F, 0xE4C8 }, { 0x9780, 0xE4C3 }, { 0x9781, 0xE4C7 }, { 0x9782, 0xE4C4 }, 
-	{ 0x9783, 0xE4C2 }, { 0x9784, 0xE4C6 }, { 0x9785, 0xBBDF }, { 0x9788, 0xE8B3 }, { 0x978A, 0xE8B1 }, { 0x978B, 0xBE63 }, { 0x978D, 0xBE62 }, { 0x978E, 0xE8B2 }, 
-	{ 0x978F, 0xBE64 }, { 0x9794, 0xEC56 }, { 0x9797, 0xEC55 }, { 0x9798, 0xC054 }, { 0x9799, 0xEC54 }, { 0x979A, 0xEEFC }, { 0x979C, 0xEEFE }, { 0x979D, 0xEF41 }, 
-	{ 0x979E, 0xEF40 }, { 0x97A0, 0xC1F9 }, { 0x97A1, 0xEEFD }, { 0x97A2, 0xF1A1 }, { 0x97A3, 0xC2FD }, { 0x97A4, 0xF17D }, { 0x97A5, 0xF1A2 }, { 0x97A6, 0xC2FE }, 
-	{ 0x97A8, 0xF17B }, { 0x97AA, 0xF17E }, { 0x97AB, 0xF17C }, { 0x97AC, 0xF179 }, { 0x97AD, 0xC340 }, { 0x97AE, 0xF17A }, { 0x97B3, 0xF3A1 }, { 0x97B6, 0xF3A3 }, 
-	{ 0x97B7, 0xF3A2 }, { 0x97B9, 0xF54A }, { 0x97BB, 0xF54B }, { 0x97BF, 0xF670 }, { 0x97C1, 0xC5B7 }, { 0x97C3, 0xC5B6 }, { 0x97C4, 0xF84F }, { 0x97C5, 0xF850 }, 
-	{ 0x97C6, 0xC648 }, { 0x97C7, 0xF8D1 }, { 0x97C9, 0xC669 }, { 0x97CB, 0xADB3 }, { 0x97CC, 0xB6B4 }, { 0x97CD, 0xE4CA }, { 0x97CE, 0xE4C9 }, { 0x97CF, 0xE8B5 }, 
-	{ 0x97D0, 0xE8B4 }, { 0x97D3, 0xC1FA }, { 0x97D4, 0xEF43 }, { 0x97D5, 0xEF42 }, { 0x97D6, 0xF1A5 }, { 0x97D7, 0xF1A3 }, { 0x97D8, 0xF1A6 }, { 0x97D9, 0xF1A4 }, 
-	{ 0x97DC, 0xC3FC }, { 0x97DD, 0xF3A4 }, { 0x97DE, 0xF3A5 }, { 0x97DF, 0xF3A6 }, { 0x97E1, 0xF671 }, { 0x97E3, 0xF772 }, { 0x97E5, 0xF8D2 }, { 0x97ED, 0xADB4 }, 
-	{ 0x97F0, 0xEC57 }, { 0x97F1, 0xEF44 }, { 0x97F3, 0xADB5 }, { 0x97F6, 0xBBE0 }, { 0x97F8, 0xEC58 }, { 0x97F9, 0xC341 }, { 0x97FA, 0xF1A7 }, { 0x97FB, 0xC3FD }, 
-	{ 0x97FD, 0xF54C }, { 0x97FE, 0xF54D }, { 0x97FF, 0xC554 }, { 0x9800, 0xF851 }, { 0x9801, 0xADB6 }, { 0x9802, 0xB3BB }, { 0x9803, 0xB3BC }, { 0x9804, 0xD84E }, 
-	{ 0x9805, 0xB6B5 }, { 0x9806, 0xB6B6 }, { 0x9807, 0xDCAC }, { 0x9808, 0xB6B7 }, { 0x980A, 0xB97A }, { 0x980C, 0xB97C }, { 0x980D, 0xE0DF }, { 0x980E, 0xE0E0 }, 
-	{ 0x980F, 0xE0DE }, { 0x9810, 0xB977 }, { 0x9811, 0xB978 }, { 0x9812, 0xB97B }, { 0x9813, 0xB979 }, { 0x9816, 0xE4CB }, { 0x9817, 0xBBE1 }, { 0x9818, 0xBBE2 }, 
-	{ 0x981B, 0xE8BC }, { 0x981C, 0xBE67 }, { 0x981D, 0xE8B7 }, { 0x981E, 0xE8B6 }, { 0x9820, 0xE8BB }, { 0x9821, 0xBE65 }, { 0x9824, 0xC05B }, { 0x9826, 0xE8B8 }, 
-	{ 0x9827, 0xE8BD }, { 0x9828, 0xE8BA }, { 0x9829, 0xE8B9 }, { 0x982B, 0xBE66 }, { 0x982D, 0xC059 }, { 0x982F, 0xEC5A }, { 0x9830, 0xC055 }, { 0x9832, 0xEC5B }, 
-	{ 0x9835, 0xEC59 }, { 0x9837, 0xC058 }, { 0x9838, 0xC056 }, { 0x9839, 0xC05A }, { 0x983B, 0xC057 }, { 0x9841, 0xEF45 }, { 0x9843, 0xEF4A }, { 0x9844, 0xEF46 }, 
-	{ 0x9845, 0xEF49 }, { 0x9846, 0xC1FB }, { 0x9848, 0xEDD4 }, { 0x9849, 0xEF48 }, { 0x984A, 0xEF47 }, { 0x984C, 0xC344 }, { 0x984D, 0xC342 }, { 0x984E, 0xC345 }, 
-	{ 0x984F, 0xC343 }, { 0x9850, 0xF1A8 }, { 0x9851, 0xF1A9 }, { 0x9852, 0xF1AA }, { 0x9853, 0xC346 }, { 0x9857, 0xF3AA }, { 0x9858, 0xC440 }, { 0x9859, 0xF3A8 }, 
-	{ 0x985B, 0xC441 }, { 0x985C, 0xF3A7 }, { 0x985D, 0xF3A9 }, { 0x985E, 0xC3FE }, { 0x985F, 0xF551 }, { 0x9860, 0xF54E }, { 0x9862, 0xF54F }, { 0x9863, 0xF550 }, 
-	{ 0x9864, 0xF672 }, { 0x9865, 0xC556 }, { 0x9867, 0xC555 }, { 0x9869, 0xF774 }, { 0x986A, 0xF773 }, { 0x986B, 0xC5B8 }, { 0x986F, 0xC5E3 }, { 0x9870, 0xC649 }, 
-	{ 0x9871, 0xC660 }, { 0x9872, 0xF958 }, { 0x9873, 0xF9AE }, { 0x9874, 0xF9AF }, { 0x98A8, 0xADB7 }, { 0x98A9, 0xDCAD }, { 0x98AC, 0xE0E1 }, { 0x98AD, 0xE4CC }, 
-	{ 0x98AE, 0xE4CD }, { 0x98AF, 0xBBE3 }, { 0x98B1, 0xBBE4 }, { 0x98B2, 0xE8BE }, { 0x98B3, 0xBE68 }, { 0x98B6, 0xC1FC }, { 0x98B8, 0xF1AB }, { 0x98BA, 0xC347 }, 
-	{ 0x98BB, 0xF3AD }, { 0x98BC, 0xC442 }, { 0x98BD, 0xF3AC }, { 0x98BE, 0xF3AE }, { 0x98BF, 0xF3AB }, { 0x98C0, 0xF675 }, { 0x98C1, 0xF552 }, { 0x98C2, 0xF553 }, 
-	{ 0x98C4, 0xC4C6 }, { 0x98C6, 0xF674 }, { 0x98C9, 0xF673 }, { 0x98CB, 0xF775 }, { 0x98CC, 0xF9B0 }, { 0x98DB, 0xADB8 }, { 0x98DF, 0xADB9 }, { 0x98E2, 0xB0A7 }, 
-	{ 0x98E3, 0xD448 }, { 0x98E5, 0xD84F }, { 0x98E7, 0xB6B8 }, { 0x98E9, 0xB6BB }, { 0x98EA, 0xB6B9 }, { 0x98EB, 0xDCAE }, { 0x98ED, 0xB6BD }, { 0x98EF, 0xB6BA }, 
-	{ 0x98F2, 0xB6BC }, { 0x98F4, 0xB97E }, { 0x98F6, 0xE0E2 }, { 0x98F9, 0xE0E3 }, { 0x98FA, 0xE8C0 }, { 0x98FC, 0xB97D }, { 0x98FD, 0xB9A1 }, { 0x98FE, 0xB9A2 }, 
-	{ 0x9900, 0xE4CF }, { 0x9902, 0xE4CE }, { 0x9903, 0xBBE5 }, { 0x9905, 0xBBE6 }, { 0x9907, 0xE4D0 }, { 0x9908, 0xE8BF }, { 0x9909, 0xBBE8 }, { 0x990A, 0xBE69 }, 
-	{ 0x990C, 0xBBE7 }, { 0x9910, 0xC05C }, { 0x9911, 0xE8C1 }, { 0x9912, 0xBE6B }, { 0x9913, 0xBE6A }, { 0x9914, 0xE8C2 }, { 0x9915, 0xE8C5 }, { 0x9916, 0xE8C3 }, 
-	{ 0x9917, 0xE8C4 }, { 0x9918, 0xBE6C }, { 0x991A, 0xC061 }, { 0x991B, 0xC05F }, { 0x991E, 0xC05E }, { 0x991F, 0xEC5D }, { 0x9921, 0xC060 }, { 0x9924, 0xEC5C }, 
-	{ 0x9925, 0xEF4B }, { 0x9927, 0xEC5E }, { 0x9928, 0xC05D }, { 0x9929, 0xEC5F }, { 0x992A, 0xEF4E }, { 0x992B, 0xEF4C }, { 0x992C, 0xEF4D }, { 0x992D, 0xEF52 }, 
-	{ 0x992E, 0xC34B }, { 0x992F, 0xEF51 }, { 0x9930, 0xEF54 }, { 0x9931, 0xEF53 }, { 0x9932, 0xEF50 }, { 0x9933, 0xEF4F }, { 0x9935, 0xC1FD }, { 0x993A, 0xF1AE }, 
-	{ 0x993C, 0xF1AD }, { 0x993D, 0xC34A }, { 0x993E, 0xC348 }, { 0x993F, 0xC349 }, { 0x9941, 0xF1AC }, { 0x9943, 0xF3B1 }, { 0x9945, 0xC443 }, { 0x9947, 0xF3B0 }, 
-	{ 0x9948, 0xF3AF }, { 0x9949, 0xC444 }, { 0x994B, 0xF558 }, { 0x994C, 0xF557 }, { 0x994E, 0xF555 }, { 0x9950, 0xF554 }, { 0x9951, 0xC4C8 }, { 0x9952, 0xC4C7 }, 
-	{ 0x9953, 0xF559 }, { 0x9954, 0xF776 }, { 0x9955, 0xC5B9 }, { 0x9956, 0xF677 }, { 0x9957, 0xC557 }, { 0x9958, 0xF676 }, { 0x9959, 0xF556 }, { 0x995B, 0xF777 }, 
-	{ 0x995C, 0xC5E4 }, { 0x995E, 0xC661 }, { 0x995F, 0xF959 }, { 0x9961, 0xF9B1 }, { 0x9996, 0xADBA }, { 0x9997, 0xD850 }, { 0x9998, 0xEF55 }, { 0x9999, 0xADBB }, 
-	{ 0x999C, 0xE4D2 }, { 0x999D, 0xE4D1 }, { 0x999E, 0xEC60 }, { 0x99A1, 0xEF57 }, { 0x99A3, 0xEF56 }, { 0x99A5, 0xC34C }, { 0x99A6, 0xF3B2 }, { 0x99A7, 0xF3B3 }, 
-	{ 0x99A8, 0xC4C9 }, { 0x99AB, 0xF9B2 }, { 0x99AC, 0xB0A8 }, { 0x99AD, 0xB6BF }, { 0x99AE, 0xB6BE }, { 0x99AF, 0xE0E4 }, { 0x99B0, 0xE0E6 }, { 0x99B1, 0xB9A4 }, 
-	{ 0x99B2, 0xE0E5 }, { 0x99B3, 0xB9A3 }, { 0x99B4, 0xB9A5 }, { 0x99B5, 0xE0E7 }, { 0x99B9, 0xE4D4 }, { 0x99BA, 0xE4D6 }, { 0x99BB, 0xE4D5 }, { 0x99BD, 0xE4D8 }, 
-	{ 0x99C1, 0xBBE9 }, { 0x99C2, 0xE4D7 }, { 0x99C3, 0xE4D3 }, { 0x99C7, 0xE4D9 }, { 0x99C9, 0xE8CC }, { 0x99CB, 0xE8CF }, { 0x99CC, 0xE8D1 }, { 0x99CD, 0xE8C7 }, 
-	{ 0x99CE, 0xE8CB }, { 0x99CF, 0xE8C8 }, { 0x99D0, 0xBE6E }, { 0x99D1, 0xBE71 }, { 0x99D2, 0xBE73 }, { 0x99D3, 0xE8C9 }, { 0x99D4, 0xE8CA }, { 0x99D5, 0xBE72 }, 
-	{ 0x99D6, 0xE8CD }, { 0x99D7, 0xE8D0 }, { 0x99D8, 0xE8CE }, { 0x99D9, 0xBE74 }, { 0x99DB, 0xBE70 }, { 0x99DC, 0xE8C6 }, { 0x99DD, 0xBE6D }, { 0x99DF, 0xBE6F }, 
-	{ 0x99E2, 0xC063 }, { 0x99E3, 0xEC66 }, { 0x99E4, 0xEC64 }, { 0x99E5, 0xEC63 }, { 0x99E7, 0xEC69 }, { 0x99E9, 0xEC68 }, { 0x99EA, 0xEC67 }, { 0x99EC, 0xEC62 }, 
-	{ 0x99ED, 0xC062 }, { 0x99EE, 0xEC61 }, { 0x99F0, 0xEC65 }, { 0x99F1, 0xC064 }, { 0x99F4, 0xEF5A }, { 0x99F6, 0xEF5E }, { 0x99F7, 0xEF5B }, { 0x99F8, 0xEF5D }, 
-	{ 0x99F9, 0xEF5C }, { 0x99FA, 0xEF59 }, { 0x99FB, 0xEF5F }, { 0x99FC, 0xEF62 }, { 0x99FD, 0xEF60 }, { 0x99FE, 0xEF61 }, { 0x99FF, 0xC240 }, { 0x9A01, 0xC1FE }, 
-	{ 0x9A02, 0xEF58 }, { 0x9A03, 0xEF63 }, { 0x9A04, 0xF1B3 }, { 0x9A05, 0xF1B6 }, { 0x9A06, 0xF1B8 }, { 0x9A07, 0xF1B7 }, { 0x9A09, 0xF1B1 }, { 0x9A0A, 0xF1B5 }, 
-	{ 0x9A0B, 0xF1B0 }, { 0x9A0D, 0xF1B2 }, { 0x9A0E, 0xC34D }, { 0x9A0F, 0xF1AF }, { 0x9A11, 0xF1B4 }, { 0x9A14, 0xF3C0 }, { 0x9A15, 0xF3B5 }, { 0x9A16, 0xC445 }, 
-	{ 0x9A19, 0xC446 }, { 0x9A1A, 0xF3B4 }, { 0x9A1B, 0xF3B9 }, { 0x9A1C, 0xF3BF }, { 0x9A1D, 0xF3B7 }, { 0x9A1E, 0xF3BE }, { 0x9A20, 0xF3BB }, { 0x9A22, 0xF3BA }, 
-	{ 0x9A23, 0xF3BD }, { 0x9A24, 0xF3B8 }, { 0x9A25, 0xF3B6 }, { 0x9A27, 0xF3BC }, { 0x9A29, 0xF560 }, { 0x9A2A, 0xF55E }, { 0x9A2B, 0xC4CA }, { 0x9A2C, 0xF55D }, 
-	{ 0x9A2D, 0xF563 }, { 0x9A2E, 0xF561 }, { 0x9A30, 0xC4CB }, { 0x9A31, 0xF55C }, { 0x9A32, 0xF55A }, { 0x9A34, 0xF55B }, { 0x9A35, 0xC4CD }, { 0x9A36, 0xF55F }, 
-	{ 0x9A37, 0xC4CC }, { 0x9A38, 0xF562 }, { 0x9A39, 0xF678 }, { 0x9A3A, 0xF67E }, { 0x9A3D, 0xF679 }, { 0x9A3E, 0xC55B }, { 0x9A3F, 0xF6A1 }, { 0x9A40, 0xC55A }, 
-	{ 0x9A41, 0xF67D }, { 0x9A42, 0xF67C }, { 0x9A43, 0xC559 }, { 0x9A44, 0xF67B }, { 0x9A45, 0xC558 }, { 0x9A46, 0xF67A }, { 0x9A48, 0xF77D }, { 0x9A49, 0xF7A1 }, 
-	{ 0x9A4A, 0xF77E }, { 0x9A4C, 0xF77B }, { 0x9A4D, 0xC5BB }, { 0x9A4E, 0xF778 }, { 0x9A4F, 0xF77C }, { 0x9A50, 0xF7A3 }, { 0x9A52, 0xF7A2 }, { 0x9A53, 0xF779 }, 
-	{ 0x9A54, 0xF77A }, { 0x9A55, 0xC5BA }, { 0x9A56, 0xF852 }, { 0x9A57, 0xC5E7 }, { 0x9A59, 0xF853 }, { 0x9A5A, 0xC5E5 }, { 0x9A5B, 0xC5E6 }, { 0x9A5E, 0xF8D3 }, 
-	{ 0x9A5F, 0xC64A }, { 0x9A60, 0xF976 }, { 0x9A62, 0xC66A }, { 0x9A64, 0xF9B3 }, { 0x9A65, 0xC66B }, { 0x9A66, 0xF9B4 }, { 0x9A67, 0xF9B5 }, { 0x9A68, 0xF9C3 }, 
-	{ 0x9A69, 0xF9C2 }, { 0x9A6A, 0xC67A }, { 0x9A6B, 0xF9CD }, { 0x9AA8, 0xB0A9 }, { 0x9AAB, 0xE0E9 }, { 0x9AAD, 0xE0E8 }, { 0x9AAF, 0xBBEA }, { 0x9AB0, 0xBBEB }, 
-	{ 0x9AB1, 0xE4DA }, { 0x9AB3, 0xE8D2 }, { 0x9AB4, 0xEC6C }, { 0x9AB7, 0xBE75 }, { 0x9AB8, 0xC065 }, { 0x9AB9, 0xEC6A }, { 0x9ABB, 0xEC6D }, { 0x9ABC, 0xC066 }, 
-	{ 0x9ABE, 0xEF64 }, { 0x9ABF, 0xEC6B }, { 0x9AC0, 0xF1B9 }, { 0x9AC1, 0xC34E }, { 0x9AC2, 0xF3C1 }, { 0x9AC6, 0xF566 }, { 0x9AC7, 0xF564 }, { 0x9ACA, 0xF565 }, 
-	{ 0x9ACD, 0xF6A2 }, { 0x9ACF, 0xC55C }, { 0x9AD0, 0xF7A4 }, { 0x9AD1, 0xC5EA }, { 0x9AD2, 0xC5BC }, { 0x9AD3, 0xC5E8 }, { 0x9AD4, 0xC5E9 }, { 0x9AD5, 0xF8D4 }, 
-	{ 0x9AD6, 0xC662 }, { 0x9AD8, 0xB0AA }, { 0x9ADC, 0xF1BA }, { 0x9ADF, 0xD449 }, { 0x9AE1, 0xB9A6 }, { 0x9AE3, 0xE4DB }, { 0x9AE6, 0xBBEC }, { 0x9AE7, 0xE4DC }, 
-	{ 0x9AEB, 0xE8D4 }, { 0x9AEC, 0xE8D3 }, { 0x9AED, 0xC068 }, { 0x9AEE, 0xBE76 }, { 0x9AEF, 0xBE77 }, { 0x9AF1, 0xE8D7 }, { 0x9AF2, 0xE8D6 }, { 0x9AF3, 0xE8D5 }, 
-	{ 0x9AF6, 0xEC6E }, { 0x9AF7, 0xEC71 }, { 0x9AF9, 0xEC70 }, { 0x9AFA, 0xEC6F }, { 0x9AFB, 0xC067 }, { 0x9AFC, 0xEF68 }, { 0x9AFD, 0xEF66 }, { 0x9AFE, 0xEF65 }, 
-	{ 0x9B01, 0xEF67 }, { 0x9B03, 0xC34F }, { 0x9B04, 0xF1BC }, { 0x9B05, 0xF1BD }, { 0x9B06, 0xC350 }, { 0x9B08, 0xF1BB }, { 0x9B0A, 0xF3C3 }, { 0x9B0B, 0xF3C2 }, 
-	{ 0x9B0C, 0xF3C5 }, { 0x9B0D, 0xC447 }, { 0x9B0E, 0xF3C4 }, { 0x9B10, 0xF567 }, { 0x9B11, 0xF569 }, { 0x9B12, 0xF568 }, { 0x9B15, 0xF6A3 }, { 0x9B16, 0xF6A6 }, 
-	{ 0x9B17, 0xF6A4 }, { 0x9B18, 0xF6A5 }, { 0x9B19, 0xF7A5 }, { 0x9B1A, 0xC5BD }, { 0x9B1E, 0xF854 }, { 0x9B1F, 0xF855 }, { 0x9B20, 0xF856 }, { 0x9B22, 0xC64B }, 
-	{ 0x9B23, 0xC663 }, { 0x9B24, 0xF9B6 }, { 0x9B25, 0xB0AB }, { 0x9B27, 0xBE78 }, { 0x9B28, 0xC069 }, { 0x9B29, 0xF1BE }, { 0x9B2B, 0xF7A6 }, { 0x9B2E, 0xF9C4 }, 
-	{ 0x9B2F, 0xD44A }, { 0x9B31, 0xC67B }, { 0x9B32, 0xB0AC }, { 0x9B33, 0xEC72 }, { 0x9B35, 0xF1BF }, { 0x9B37, 0xF3C6 }, { 0x9B3A, 0xF6A7 }, { 0x9B3B, 0xF7A7 }, 
-	{ 0x9B3C, 0xB0AD }, { 0x9B3E, 0xE4DD }, { 0x9B3F, 0xE4DE }, { 0x9B41, 0xBBED }, { 0x9B42, 0xBBEE }, { 0x9B43, 0xE8D9 }, { 0x9B44, 0xBE7A }, { 0x9B45, 0xBE79 }, 
-	{ 0x9B46, 0xE8D8 }, { 0x9B48, 0xEF69 }, { 0x9B4A, 0xF1C0 }, { 0x9B4B, 0xF1C2 }, { 0x9B4C, 0xF1C1 }, { 0x9B4D, 0xC353 }, { 0x9B4E, 0xC352 }, { 0x9B4F, 0xC351 }, 
-	{ 0x9B51, 0xC55E }, { 0x9B52, 0xF6A8 }, { 0x9B54, 0xC55D }, { 0x9B55, 0xF7A9 }, { 0x9B56, 0xF7A8 }, { 0x9B58, 0xC64C }, { 0x9B59, 0xF8D5 }, { 0x9B5A, 0xB3BD }, 
-	{ 0x9B5B, 0xE0EA }, { 0x9B5F, 0xE4E1 }, { 0x9B60, 0xE4DF }, { 0x9B61, 0xE4E0 }, { 0x9B64, 0xE8E2 }, { 0x9B66, 0xE8DD }, { 0x9B67, 0xE8DA }, { 0x9B68, 0xE8E1 }, 
-	{ 0x9B6C, 0xE8E3 }, { 0x9B6F, 0xBE7C }, { 0x9B70, 0xE8E0 }, { 0x9B71, 0xE8DC }, { 0x9B74, 0xE8DB }, { 0x9B75, 0xE8DF }, { 0x9B76, 0xE8DE }, { 0x9B77, 0xBE7B }, 
-	{ 0x9B7A, 0xEC7D }, { 0x9B7B, 0xEC78 }, { 0x9B7C, 0xEC76 }, { 0x9B7D, 0xECA1 }, { 0x9B7E, 0xEC77 }, { 0x9B80, 0xEC73 }, { 0x9B82, 0xEC79 }, { 0x9B85, 0xEC74 }, 
-	{ 0x9B86, 0xEF72 }, { 0x9B87, 0xEC75 }, { 0x9B88, 0xECA2 }, { 0x9B90, 0xEC7C }, { 0x9B91, 0xC06A }, { 0x9B92, 0xEC7B }, { 0x9B93, 0xEC7A }, { 0x9B95, 0xEC7E }, 
-	{ 0x9B9A, 0xEF6A }, { 0x9B9B, 0xEF6D }, { 0x9B9E, 0xEF6C }, { 0x9BA0, 0xEF74 }, { 0x9BA1, 0xEF6F }, { 0x9BA2, 0xEF73 }, { 0x9BA4, 0xEF71 }, { 0x9BA5, 0xEF70 }, 
-	{ 0x9BA6, 0xEF6E }, { 0x9BA8, 0xEF6B }, { 0x9BAA, 0xC243 }, { 0x9BAB, 0xC242 }, { 0x9BAD, 0xC244 }, { 0x9BAE, 0xC241 }, { 0x9BAF, 0xEF75 }, { 0x9BB5, 0xF1C8 }, 
-	{ 0x9BB6, 0xF1CB }, { 0x9BB8, 0xF1C9 }, { 0x9BB9, 0xF1CD }, { 0x9BBD, 0xF1CE }, { 0x9BBF, 0xF1C6 }, { 0x9BC0, 0xC358 }, { 0x9BC1, 0xF1C7 }, { 0x9BC3, 0xF1C5 }, 
-	{ 0x9BC4, 0xF1CC }, { 0x9BC6, 0xF1C4 }, { 0x9BC7, 0xF1C3 }, { 0x9BC8, 0xC357 }, { 0x9BC9, 0xC355 }, { 0x9BCA, 0xC354 }, { 0x9BD3, 0xF1CA }, { 0x9BD4, 0xF3CF }, 
-	{ 0x9BD5, 0xF3D5 }, { 0x9BD6, 0xC44A }, { 0x9BD7, 0xF3D0 }, { 0x9BD9, 0xF3D3 }, { 0x9BDA, 0xF3D7 }, { 0x9BDB, 0xC44B }, { 0x9BDC, 0xF3D2 }, { 0x9BDE, 0xF3CA }, 
-	{ 0x9BE0, 0xF3C9 }, { 0x9BE1, 0xF3D6 }, { 0x9BE2, 0xF3CD }, { 0x9BE4, 0xF3CB }, { 0x9BE5, 0xF3D4 }, { 0x9BE6, 0xF3CC }, { 0x9BE7, 0xC449 }, { 0x9BE8, 0xC448 }, 
-	{ 0x9BEA, 0xF3C7 }, { 0x9BEB, 0xF3C8 }, { 0x9BEC, 0xF3D1 }, { 0x9BF0, 0xF3CE }, { 0x9BF7, 0xF56C }, { 0x9BF8, 0xF56F }, { 0x9BFD, 0xC356 }, { 0x9C05, 0xF56D }, 
-	{ 0x9C06, 0xF573 }, { 0x9C07, 0xF571 }, { 0x9C08, 0xF56B }, { 0x9C09, 0xF576 }, { 0x9C0B, 0xF56A }, { 0x9C0D, 0xC4CF }, { 0x9C0E, 0xF572 }, { 0x9C12, 0xF56E }, 
-	{ 0x9C13, 0xC4CE }, { 0x9C14, 0xF575 }, { 0x9C17, 0xF574 }, { 0x9C1C, 0xF6AB }, { 0x9C1D, 0xF6AA }, { 0x9C21, 0xF6B1 }, { 0x9C23, 0xF6AD }, { 0x9C24, 0xF6B0 }, 
-	{ 0x9C25, 0xC560 }, { 0x9C28, 0xF6AE }, { 0x9C29, 0xF6AF }, { 0x9C2B, 0xF6A9 }, { 0x9C2C, 0xF6AC }, { 0x9C2D, 0xC55F }, { 0x9C31, 0xC5BF }, { 0x9C32, 0xF7B4 }, 
-	{ 0x9C33, 0xF7AF }, { 0x9C34, 0xF7B3 }, { 0x9C36, 0xF7B6 }, { 0x9C37, 0xF7B2 }, { 0x9C39, 0xF7AE }, { 0x9C3B, 0xC5C1 }, { 0x9C3C, 0xF7B1 }, { 0x9C3D, 0xF7B5 }, 
-	{ 0x9C3E, 0xC5C0 }, { 0x9C3F, 0xF7AC }, { 0x9C40, 0xF570 }, { 0x9C41, 0xF7B0 }, { 0x9C44, 0xF7AD }, { 0x9C46, 0xF7AA }, { 0x9C48, 0xF7AB }, { 0x9C49, 0xC5BE }, 
-	{ 0x9C4A, 0xF85A }, { 0x9C4B, 0xF85C }, { 0x9C4C, 0xF85F }, { 0x9C4D, 0xF85B }, { 0x9C4E, 0xF860 }, { 0x9C50, 0xF859 }, { 0x9C52, 0xF857 }, { 0x9C54, 0xC5EB }, 
-	{ 0x9C55, 0xF85D }, { 0x9C56, 0xC5ED }, { 0x9C57, 0xC5EC }, { 0x9C58, 0xF858 }, { 0x9C59, 0xF85E }, { 0x9C5E, 0xF8DA }, { 0x9C5F, 0xC64D }, { 0x9C60, 0xF8DB }, 
-	{ 0x9C62, 0xF8D9 }, { 0x9C63, 0xF8D6 }, { 0x9C66, 0xF8D8 }, { 0x9C67, 0xF8D7 }, { 0x9C68, 0xF95A }, { 0x9C6D, 0xF95C }, { 0x9C6E, 0xF95B }, { 0x9C71, 0xF979 }, 
-	{ 0x9C73, 0xF978 }, { 0x9C74, 0xF977 }, { 0x9C75, 0xF97A }, { 0x9C77, 0xC673 }, { 0x9C78, 0xC674 }, { 0x9C79, 0xF9CA }, { 0x9C7A, 0xF9CE }, { 0x9CE5, 0xB3BE }, 
-	{ 0x9CE6, 0xDCAF }, { 0x9CE7, 0xE0ED }, { 0x9CE9, 0xB9A7 }, { 0x9CEA, 0xE0EB }, { 0x9CED, 0xE0EC }, { 0x9CF1, 0xE4E2 }, { 0x9CF2, 0xE4E3 }, { 0x9CF3, 0xBBF1 }, 
-	{ 0x9CF4, 0xBBEF }, { 0x9CF5, 0xE4E4 }, { 0x9CF6, 0xBBF0 }, { 0x9CF7, 0xE8E8 }, { 0x9CF9, 0xE8EB }, { 0x9CFA, 0xE8E5 }, { 0x9CFB, 0xE8EC }, { 0x9CFC, 0xE8E4 }, 
-	{ 0x9CFD, 0xE8E6 }, { 0x9CFF, 0xE8E7 }, { 0x9D00, 0xE8EA }, { 0x9D03, 0xBEA1 }, { 0x9D04, 0xE8EF }, { 0x9D05, 0xE8EE }, { 0x9D06, 0xBE7D }, { 0x9D07, 0xE8E9 }, 
-	{ 0x9D08, 0xE8ED }, { 0x9D09, 0xBE7E }, { 0x9D10, 0xECAC }, { 0x9D12, 0xC06F }, { 0x9D14, 0xECA7 }, { 0x9D15, 0xC06B }, { 0x9D17, 0xECA4 }, { 0x9D18, 0xECAA }, 
-	{ 0x9D19, 0xECAD }, { 0x9D1B, 0xC070 }, { 0x9D1D, 0xECA9 }, { 0x9D1E, 0xECA6 }, { 0x9D1F, 0xECAE }, { 0x9D20, 0xECA5 }, { 0x9D22, 0xECAB }, { 0x9D23, 0xC06C }, 
-	{ 0x9D25, 0xECA3 }, { 0x9D26, 0xC06D }, { 0x9D28, 0xC06E }, { 0x9D29, 0xECA8 }, { 0x9D2D, 0xEFA9 }, { 0x9D2E, 0xEF7A }, { 0x9D2F, 0xEF7B }, { 0x9D30, 0xEF7E }, 
-	{ 0x9D31, 0xEF7C }, { 0x9D33, 0xEF76 }, { 0x9D36, 0xEF79 }, { 0x9D37, 0xEFA5 }, { 0x9D38, 0xEF7D }, { 0x9D3B, 0xC245 }, { 0x9D3D, 0xEFA7 }, { 0x9D3E, 0xEFA4 }, 
-	{ 0x9D3F, 0xC246 }, { 0x9D40, 0xEFA6 }, { 0x9D41, 0xEF77 }, { 0x9D42, 0xEFA2 }, { 0x9D43, 0xEFA3 }, { 0x9D45, 0xEFA1 }, { 0x9D4A, 0xF1D2 }, { 0x9D4B, 0xF1D4 }, 
-	{ 0x9D4C, 0xF1D7 }, { 0x9D4F, 0xF1D1 }, { 0x9D51, 0xC359 }, { 0x9D52, 0xF1D9 }, { 0x9D53, 0xF1D0 }, { 0x9D54, 0xF1DA }, { 0x9D56, 0xF1D6 }, { 0x9D57, 0xF1D8 }, 
-	{ 0x9D58, 0xF1DC }, { 0x9D59, 0xF1D5 }, { 0x9D5A, 0xF1DD }, { 0x9D5B, 0xF1D3 }, { 0x9D5C, 0xF1CF }, { 0x9D5D, 0xC35A }, { 0x9D5F, 0xF1DB }, { 0x9D60, 0xC35B }, 
-	{ 0x9D61, 0xC44D }, { 0x9D67, 0xEF78 }, { 0x9D68, 0xF3F1 }, { 0x9D69, 0xF3E8 }, { 0x9D6A, 0xC44F }, { 0x9D6B, 0xF3E4 }, { 0x9D6C, 0xC450 }, { 0x9D6F, 0xF3ED }, 
-	{ 0x9D70, 0xF3E7 }, { 0x9D71, 0xF3DD }, { 0x9D72, 0xC44E }, { 0x9D73, 0xF3EA }, { 0x9D74, 0xF3E5 }, { 0x9D75, 0xF3E6 }, { 0x9D77, 0xF3D8 }, { 0x9D78, 0xF3DF }, 
-	{ 0x9D79, 0xF3EE }, { 0x9D7B, 0xF3EB }, { 0x9D7D, 0xF3E3 }, { 0x9D7F, 0xF3EF }, { 0x9D80, 0xF3DE }, { 0x9D81, 0xF3D9 }, { 0x9D82, 0xF3EC }, { 0x9D84, 0xF3DB }, 
-	{ 0x9D85, 0xF3E9 }, { 0x9D86, 0xF3E0 }, { 0x9D87, 0xF3F0 }, { 0x9D88, 0xF3DC }, { 0x9D89, 0xC44C }, { 0x9D8A, 0xF3DA }, { 0x9D8B, 0xF3E1 }, { 0x9D8C, 0xF3E2 }, 
-	{ 0x9D90, 0xF57D }, { 0x9D92, 0xF57B }, { 0x9D94, 0xF5A2 }, { 0x9D96, 0xF5AE }, { 0x9D97, 0xF5A5 }, { 0x9D98, 0xF57C }, { 0x9D99, 0xF578 }, { 0x9D9A, 0xF5A7 }, 
-	{ 0x9D9B, 0xF57E }, { 0x9D9C, 0xF5A3 }, { 0x9D9D, 0xF57A }, { 0x9D9E, 0xF5AA }, { 0x9D9F, 0xF577 }, { 0x9DA0, 0xF5A1 }, { 0x9DA1, 0xF5A6 }, { 0x9DA2, 0xF5A8 }, 
-	{ 0x9DA3, 0xF5AB }, { 0x9DA4, 0xF579 }, { 0x9DA6, 0xF5AF }, { 0x9DA7, 0xF5B0 }, { 0x9DA8, 0xF5A9 }, { 0x9DA9, 0xF5AD }, { 0x9DAA, 0xF5A4 }, { 0x9DAC, 0xF6C1 }, 
-	{ 0x9DAD, 0xF6C4 }, { 0x9DAF, 0xC561 }, { 0x9DB1, 0xF6C3 }, { 0x9DB2, 0xF6C8 }, { 0x9DB3, 0xF6C6 }, { 0x9DB4, 0xC562 }, { 0x9DB5, 0xF6BD }, { 0x9DB6, 0xF6B3 }, 
-	{ 0x9DB7, 0xF6B2 }, { 0x9DB8, 0xC564 }, { 0x9DB9, 0xF6BF }, { 0x9DBA, 0xF6C0 }, { 0x9DBB, 0xF6BC }, { 0x9DBC, 0xF6B4 }, { 0x9DBE, 0xF6B9 }, { 0x9DBF, 0xF5AC }, 
-	{ 0x9DC1, 0xF6B5 }, { 0x9DC2, 0xC563 }, { 0x9DC3, 0xF6BB }, { 0x9DC5, 0xF6BA }, { 0x9DC7, 0xF6B6 }, { 0x9DC8, 0xF6C2 }, { 0x9DCA, 0xF6B7 }, { 0x9DCB, 0xF7BB }, 
-	{ 0x9DCC, 0xF6C5 }, { 0x9DCD, 0xF6C7 }, { 0x9DCE, 0xF6BE }, { 0x9DCF, 0xF6B8 }, { 0x9DD0, 0xF7BC }, { 0x9DD1, 0xF7BE }, { 0x9DD2, 0xF7B8 }, { 0x9DD3, 0xC5C2 }, 
-	{ 0x9DD5, 0xF7C5 }, { 0x9DD6, 0xF7C3 }, { 0x9DD7, 0xC5C3 }, { 0x9DD8, 0xF7C2 }, { 0x9DD9, 0xF7C1 }, { 0x9DDA, 0xF7BA }, { 0x9DDB, 0xF7B7 }, { 0x9DDC, 0xF7BD }, 
-	{ 0x9DDD, 0xF7C6 }, { 0x9DDE, 0xF7B9 }, { 0x9DDF, 0xF7BF }, { 0x9DE1, 0xF869 }, { 0x9DE2, 0xF86E }, { 0x9DE3, 0xF864 }, { 0x9DE4, 0xF867 }, { 0x9DE5, 0xC5EE }, 
-	{ 0x9DE6, 0xF86B }, { 0x9DE8, 0xF872 }, { 0x9DE9, 0xF7C0 }, { 0x9DEB, 0xF865 }, { 0x9DEC, 0xF86F }, { 0x9DED, 0xF873 }, { 0x9DEE, 0xF86A }, { 0x9DEF, 0xF863 }, 
-	{ 0x9DF0, 0xF86D }, { 0x9DF2, 0xF86C }, { 0x9DF3, 0xF871 }, { 0x9DF4, 0xF870 }, { 0x9DF5, 0xF7C4 }, { 0x9DF6, 0xF868 }, { 0x9DF7, 0xF862 }, { 0x9DF8, 0xF866 }, 
-	{ 0x9DF9, 0xC64E }, { 0x9DFA, 0xC64F }, { 0x9DFB, 0xF861 }, { 0x9DFD, 0xF8E6 }, { 0x9DFE, 0xF8DD }, { 0x9DFF, 0xF8E5 }, { 0x9E00, 0xF8E2 }, { 0x9E01, 0xF8E3 }, 
-	{ 0x9E02, 0xF8DC }, { 0x9E03, 0xF8DF }, { 0x9E04, 0xF8E7 }, { 0x9E05, 0xF8E1 }, { 0x9E06, 0xF8E0 }, { 0x9E07, 0xF8DE }, { 0x9E09, 0xF8E4 }, { 0x9E0B, 0xF95D }, 
-	{ 0x9E0D, 0xF95E }, { 0x9E0F, 0xF960 }, { 0x9E10, 0xF95F }, { 0x9E11, 0xF962 }, { 0x9E12, 0xF961 }, { 0x9E13, 0xF97C }, { 0x9E14, 0xF97B }, { 0x9E15, 0xF9B7 }, 
-	{ 0x9E17, 0xF9B8 }, { 0x9E19, 0xF9C5 }, { 0x9E1A, 0xC678 }, { 0x9E1B, 0xC67C }, { 0x9E1D, 0xF9CF }, { 0x9E1E, 0xC67D }, { 0x9E75, 0xB3BF }, { 0x9E79, 0xC4D0 }, 
-	{ 0x9E7A, 0xF6C9 }, { 0x9E7C, 0xC650 }, { 0x9E7D, 0xC651 }, { 0x9E7F, 0xB3C0 }, { 0x9E80, 0xE0EE }, { 0x9E82, 0xB9A8 }, { 0x9E83, 0xE8F0 }, { 0x9E86, 0xECB0 }, 
-	{ 0x9E87, 0xECB1 }, { 0x9E88, 0xECAF }, { 0x9E89, 0xEFAB }, { 0x9E8A, 0xEFAA }, { 0x9E8B, 0xC247 }, { 0x9E8C, 0xF1DF }, { 0x9E8D, 0xEFAC }, { 0x9E8E, 0xF1DE }, 
-	{ 0x9E91, 0xF3F3 }, { 0x9E92, 0xC451 }, { 0x9E93, 0xC453 }, { 0x9E94, 0xF3F2 }, { 0x9E97, 0xC452 }, { 0x9E99, 0xF5B1 }, { 0x9E9A, 0xF5B3 }, { 0x9E9B, 0xF5B2 }, 
-	{ 0x9E9C, 0xF6CA }, { 0x9E9D, 0xC565 }, { 0x9E9F, 0xC5EF }, { 0x9EA0, 0xF8E8 }, { 0x9EA1, 0xF963 }, { 0x9EA4, 0xF9D2 }, { 0x9EA5, 0xB3C1 }, { 0x9EA7, 0xE4E5 }, 
-	{ 0x9EA9, 0xBEA2 }, { 0x9EAD, 0xECB3 }, { 0x9EAE, 0xECB2 }, { 0x9EB0, 0xEFAD }, { 0x9EB4, 0xC454 }, { 0x9EB5, 0xC4D1 }, { 0x9EB6, 0xF7C7 }, { 0x9EB7, 0xF9CB }, 
-	{ 0x9EBB, 0xB3C2 }, { 0x9EBC, 0xBBF2 }, { 0x9EBE, 0xBEA3 }, { 0x9EC0, 0xF3F4 }, { 0x9EC2, 0xF874 }, { 0x9EC3, 0xB6C0 }, { 0x9EC8, 0xEFAE }, { 0x9ECC, 0xC664 }, 
-	{ 0x9ECD, 0xB6C1 }, { 0x9ECE, 0xBEA4 }, { 0x9ECF, 0xC248 }, { 0x9ED0, 0xF875 }, { 0x9ED1, 0xB6C2 }, { 0x9ED3, 0xE8F1 }, { 0x9ED4, 0xC072 }, { 0x9ED5, 0xECB4 }, 
-	{ 0x9ED6, 0xECB5 }, { 0x9ED8, 0xC071 }, { 0x9EDA, 0xEFAF }, { 0x9EDB, 0xC24C }, { 0x9EDC, 0xC24A }, { 0x9EDD, 0xC24B }, { 0x9EDE, 0xC249 }, { 0x9EDF, 0xF1E0 }, 
-	{ 0x9EE0, 0xC35C }, { 0x9EE4, 0xF5B5 }, { 0x9EE5, 0xF5B4 }, { 0x9EE6, 0xF5B7 }, { 0x9EE7, 0xF5B6 }, { 0x9EE8, 0xC4D2 }, { 0x9EEB, 0xF6CB }, { 0x9EED, 0xF6CD }, 
-	{ 0x9EEE, 0xF6CC }, { 0x9EEF, 0xC566 }, { 0x9EF0, 0xF7C8 }, { 0x9EF2, 0xF876 }, { 0x9EF3, 0xF877 }, { 0x9EF4, 0xC5F0 }, { 0x9EF5, 0xF964 }, { 0x9EF6, 0xF97D }, 
-	{ 0x9EF7, 0xC675 }, { 0x9EF9, 0xDCB0 }, { 0x9EFA, 0xECB6 }, { 0x9EFB, 0xEFB0 }, { 0x9EFC, 0xF3F5 }, { 0x9EFD, 0xE0EF }, { 0x9EFF, 0xEFB1 }, { 0x9F00, 0xF1E2 }, 
-	{ 0x9F01, 0xF1E1 }, { 0x9F06, 0xF878 }, { 0x9F07, 0xC652 }, { 0x9F09, 0xF965 }, { 0x9F0A, 0xF97E }, { 0x9F0E, 0xB9A9 }, { 0x9F0F, 0xE8F2 }, { 0x9F10, 0xE8F3 }, 
-	{ 0x9F12, 0xECB7 }, { 0x9F13, 0xB9AA }, { 0x9F15, 0xC35D }, { 0x9F16, 0xF1E3 }, { 0x9F18, 0xF6CF }, { 0x9F19, 0xC567 }, { 0x9F1A, 0xF6D0 }, { 0x9F1B, 0xF6CE }, 
-	{ 0x9F1C, 0xF879 }, { 0x9F1E, 0xF8E9 }, { 0x9F20, 0xB9AB }, { 0x9F22, 0xEFB4 }, { 0x9F23, 0xEFB3 }, { 0x9F24, 0xEFB2 }, { 0x9F25, 0xF1E4 }, { 0x9F28, 0xF1E8 }, 
-	{ 0x9F29, 0xF1E7 }, { 0x9F2A, 0xF1E6 }, { 0x9F2B, 0xF1E5 }, { 0x9F2C, 0xC35E }, { 0x9F2D, 0xF3F6 }, { 0x9F2E, 0xF5B9 }, { 0x9F2F, 0xC4D3 }, { 0x9F30, 0xF5B8 }, 
-	{ 0x9F31, 0xF6D1 }, { 0x9F32, 0xF7CB }, { 0x9F33, 0xF7CA }, { 0x9F34, 0xC5C4 }, { 0x9F35, 0xF7C9 }, { 0x9F36, 0xF87C }, { 0x9F37, 0xF87B }, { 0x9F38, 0xF87A }, 
-	{ 0x9F3B, 0xBBF3 }, { 0x9F3D, 0xECB8 }, { 0x9F3E, 0xC24D }, { 0x9F40, 0xF3F7 }, { 0x9F41, 0xF3F8 }, { 0x9F42, 0xF7CC }, { 0x9F43, 0xF87D }, { 0x9F46, 0xF8EA }, 
-	{ 0x9F47, 0xF966 }, { 0x9F48, 0xF9B9 }, { 0x9F49, 0xF9D4 }, { 0x9F4A, 0xBBF4 }, { 0x9F4B, 0xC24E }, { 0x9F4C, 0xF1E9 }, { 0x9F4D, 0xF3F9 }, { 0x9F4E, 0xF6D2 }, 
-	{ 0x9F4F, 0xF87E }, { 0x9F52, 0xBEA6 }, { 0x9F54, 0xEFB5 }, { 0x9F55, 0xF1EA }, { 0x9F56, 0xF3FA }, { 0x9F57, 0xF3FB }, { 0x9F58, 0xF3FC }, { 0x9F59, 0xF5BE }, 
-	{ 0x9F5B, 0xF5BA }, { 0x9F5C, 0xC568 }, { 0x9F5D, 0xF5BD }, { 0x9F5E, 0xF5BC }, { 0x9F5F, 0xC4D4 }, { 0x9F60, 0xF5BB }, { 0x9F61, 0xC4D6 }, { 0x9F63, 0xC4D5 }, 
-	{ 0x9F64, 0xF6D4 }, { 0x9F65, 0xF6D3 }, { 0x9F66, 0xC569 }, { 0x9F67, 0xC56A }, { 0x9F6A, 0xC5C6 }, { 0x9F6B, 0xF7CD }, { 0x9F6C, 0xC5C5 }, { 0x9F6E, 0xF8A3 }, 
-	{ 0x9F6F, 0xF8A4 }, { 0x9F70, 0xF8A2 }, { 0x9F71, 0xF8A1 }, { 0x9F72, 0xC654 }, { 0x9F74, 0xF8EB }, { 0x9F75, 0xF8EC }, { 0x9F76, 0xF8ED }, { 0x9F77, 0xC653 }, 
-	{ 0x9F78, 0xF967 }, { 0x9F79, 0xF96A }, { 0x9F7A, 0xF969 }, { 0x9F7B, 0xF968 }, { 0x9F7E, 0xF9D3 }, { 0x9F8D, 0xC073 }, { 0x9F90, 0xC365 }, { 0x9F91, 0xF5BF }, 
-	{ 0x9F92, 0xF6D5 }, { 0x9F94, 0xC5C7 }, { 0x9F95, 0xF7CE }, { 0x9F98, 0xF9D5 }, { 0x9F9C, 0xC074 }, { 0x9FA0, 0xEFB6 }, { 0x9FA2, 0xF7CF }, { 0x9FA4, 0xF9A1 }, 
-	{ 0xF880, 0x0081 }, { 0xF881, 0x0082 }, { 0xFA0C, 0xC94A }, { 0xFA0D, 0xDDFC }, { 0xFE30, 0xA14A }, { 0xFE31, 0xA157 }, { 0xFE33, 0xA159 }, { 0xFE34, 0xA15B }, 
-	{ 0xFE35, 0xA15F }, { 0xFE36, 0xA160 }, { 0xFE37, 0xA163 }, { 0xFE38, 0xA164 }, { 0xFE39, 0xA167 }, { 0xFE3A, 0xA168 }, { 0xFE3B, 0xA16B }, { 0xFE3C, 0xA16C }, 
-	{ 0xFE3D, 0xA16F }, { 0xFE3E, 0xA170 }, { 0xFE3F, 0xA173 }, { 0xFE40, 0xA174 }, { 0xFE41, 0xA177 }, { 0xFE42, 0xA178 }, { 0xFE43, 0xA17B }, { 0xFE44, 0xA17C }, 
-	{ 0xFE49, 0xA1C6 }, { 0xFE4A, 0xA1C7 }, { 0xFE4B, 0xA1CA }, { 0xFE4D, 0xA1C8 }, { 0xFE4E, 0xA1C9 }, { 0xFE4F, 0xA15C }, { 0xFE5F, 0xA1CC }, { 0xFE60, 0xA1CD }, 
-	{ 0xFE61, 0xA1CE }, { 0xFE62, 0xA1DE }, { 0xFE63, 0xA1DF }, { 0xFE64, 0xA1E0 }, { 0xFE65, 0xA1E1 }, { 0xFE66, 0xA1E2 }, { 0xFE69, 0xA24C }, { 0xFE6A, 0xA24D }, 
-	{ 0xFE6B, 0xA24E }, { 0xFF01, 0xA149 }, { 0xFF03, 0xA1AD }, { 0xFF04, 0xA243 }, { 0xFF05, 0xA248 }, { 0xFF06, 0xA1AE }, { 0xFF08, 0xA15D }, { 0xFF09, 0xA15E }, 
-	{ 0xFF0A, 0xA1AF }, { 0xFF0B, 0xA1CF }, { 0xFF0C, 0xA141 }, { 0xFF0D, 0xA1D0 }, { 0xFF0E, 0xA144 }, { 0xFF0F, 0xA241 }, { 0xFF10, 0xA2AF }, { 0xFF11, 0xA2B0 }, 
-	{ 0xFF12, 0xA2B1 }, { 0xFF13, 0xA2B2 }, { 0xFF14, 0xA2B3 }, { 0xFF15, 0xA2B4 }, { 0xFF16, 0xA2B5 }, { 0xFF17, 0xA2B6 }, { 0xFF18, 0xA2B7 }, { 0xFF19, 0xA2B8 }, 
-	{ 0xFF1A, 0xA147 }, { 0xFF1B, 0xA146 }, { 0xFF1C, 0xA1D5 }, { 0xFF1D, 0xA1D7 }, { 0xFF1E, 0xA1D6 }, { 0xFF1F, 0xA148 }, { 0xFF20, 0xA249 }, { 0xFF21, 0xA2CF }, 
-	{ 0xFF22, 0xA2D0 }, { 0xFF23, 0xA2D1 }, { 0xFF24, 0xA2D2 }, { 0xFF25, 0xA2D3 }, { 0xFF26, 0xA2D4 }, { 0xFF27, 0xA2D5 }, { 0xFF28, 0xA2D6 }, { 0xFF29, 0xA2D7 }, 
-	{ 0xFF2A, 0xA2D8 }, { 0xFF2B, 0xA2D9 }, { 0xFF2C, 0xA2DA }, { 0xFF2D, 0xA2DB }, { 0xFF2E, 0xA2DC }, { 0xFF2F, 0xA2DD }, { 0xFF30, 0xA2DE }, { 0xFF31, 0xA2DF }, 
-	{ 0xFF32, 0xA2E0 }, { 0xFF33, 0xA2E1 }, { 0xFF34, 0xA2E2 }, { 0xFF35, 0xA2E3 }, { 0xFF36, 0xA2E4 }, { 0xFF37, 0xA2E5 }, { 0xFF38, 0xA2E6 }, { 0xFF39, 0xA2E7 }, 
-	{ 0xFF3A, 0xA2E8 }, { 0xFF3C, 0xA242 }, { 0xFF3F, 0xA1C4 }, { 0xFF41, 0xA2E9 }, { 0xFF42, 0xA2EA }, { 0xFF43, 0xA2EB }, { 0xFF44, 0xA2EC }, { 0xFF45, 0xA2ED }, 
-	{ 0xFF46, 0xA2EE }, { 0xFF47, 0xA2EF }, { 0xFF48, 0xA2F0 }, { 0xFF49, 0xA2F1 }, { 0xFF4A, 0xA2F2 }, { 0xFF4B, 0xA2F3 }, { 0xFF4C, 0xA2F4 }, { 0xFF4D, 0xA2F5 }, 
-	{ 0xFF4E, 0xA2F6 }, { 0xFF4F, 0xA2F7 }, { 0xFF50, 0xA2F8 }, { 0xFF51, 0xA2F9 }, { 0xFF52, 0xA2FA }, { 0xFF53, 0xA2FB }, { 0xFF54, 0xA2FC }, { 0xFF55, 0xA2FD }, 
-	{ 0xFF56, 0xA2FE }, { 0xFF57, 0xA340 }, { 0xFF58, 0xA341 }, { 0xFF59, 0xA342 }, { 0xFF5A, 0xA343 }, { 0xFF5B, 0xA161 }, { 0xFF5C, 0xA155 }, { 0xFF5D, 0xA162 }, 
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x0083, 0x0083 },
+	{ 0x0084, 0x0084 }, { 0x0085, 0x0085 }, { 0x0086, 0x0086 }, { 0x0087, 0x0087 }, { 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B },
+	{ 0x008C, 0x008C }, { 0x008D, 0x008D }, { 0x008E, 0x008E }, { 0x008F, 0x008F }, { 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 },
+	{ 0x0094, 0x0094 }, { 0x0095, 0x0095 }, { 0x0096, 0x0096 }, { 0x0097, 0x0097 }, { 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B },
+	{ 0x009C, 0x009C }, { 0x009D, 0x009D }, { 0x009E, 0x009E }, { 0x009F, 0x009F }, { 0x00A0, 0x00A0 }, { 0x00A2, 0xA246 }, { 0x00A3, 0xA247 }, { 0x00A5, 0xA244 },
+	{ 0x00A7, 0xA1B1 }, { 0x00A9, 0x00FD }, { 0x00B0, 0xA258 }, { 0x00B1, 0xA1D3 }, { 0x00B7, 0xA145 }, { 0x00D7, 0xA1D1 }, { 0x00F7, 0xA1D2 }, { 0x02C7, 0xA3BE },
+	{ 0x02C9, 0xA3BC }, { 0x02CA, 0xA3BD }, { 0x02CB, 0xA3BF }, { 0x02D9, 0xA3BB }, { 0x0391, 0xA344 }, { 0x0392, 0xA345 }, { 0x0393, 0xA346 }, { 0x0394, 0xA347 },
+	{ 0x0395, 0xA348 }, { 0x0396, 0xA349 }, { 0x0397, 0xA34A }, { 0x0398, 0xA34B }, { 0x0399, 0xA34C }, { 0x039A, 0xA34D }, { 0x039B, 0xA34E }, { 0x039C, 0xA34F },
+	{ 0x039D, 0xA350 }, { 0x039E, 0xA351 }, { 0x039F, 0xA352 }, { 0x03A0, 0xA353 }, { 0x03A1, 0xA354 }, { 0x03A3, 0xA355 }, { 0x03A4, 0xA356 }, { 0x03A5, 0xA357 },
+	{ 0x03A6, 0xA358 }, { 0x03A7, 0xA359 }, { 0x03A8, 0xA35A }, { 0x03A9, 0xA35B }, { 0x03B1, 0xA35C }, { 0x03B2, 0xA35D }, { 0x03B3, 0xA35E }, { 0x03B4, 0xA35F },
+	{ 0x03B5, 0xA360 }, { 0x03B6, 0xA361 }, { 0x03B7, 0xA362 }, { 0x03B8, 0xA363 }, { 0x03B9, 0xA364 }, { 0x03BA, 0xA365 }, { 0x03BB, 0xA366 }, { 0x03BC, 0xA367 },
+	{ 0x03BD, 0xA368 }, { 0x03BE, 0xA369 }, { 0x03BF, 0xA36A }, { 0x03C0, 0xA36B }, { 0x03C1, 0xA36C }, { 0x03C3, 0xA36D }, { 0x03C4, 0xA36E }, { 0x03C5, 0xA36F },
+	{ 0x03C6, 0xA370 }, { 0x03C7, 0xA371 }, { 0x03C8, 0xA372 }, { 0x03C9, 0xA373 }, { 0x2013, 0xA156 }, { 0x2014, 0xA158 }, { 0x2018, 0xA1A5 }, { 0x2019, 0xA1A6 },
+	{ 0x201C, 0xA1A7 }, { 0x201D, 0xA1A8 }, { 0x2025, 0xA14C }, { 0x2026, 0x00FF }, { 0x2032, 0xA1AC }, { 0x2035, 0xA1AB }, { 0x203B, 0xA1B0 }, { 0x203E, 0xA1C2 },
+	{ 0x2103, 0xA24A }, { 0x2105, 0xA1C1 }, { 0x2109, 0xA24B }, { 0x2122, 0x00FE }, { 0x2160, 0xA2B9 }, { 0x2161, 0xA2BA }, { 0x2162, 0xA2BB }, { 0x2163, 0xA2BC },
+	{ 0x2164, 0xA2BD }, { 0x2165, 0xA2BE }, { 0x2166, 0xA2BF }, { 0x2167, 0xA2C0 }, { 0x2168, 0xA2C1 }, { 0x2169, 0xA2C2 }, { 0x2190, 0xA1F6 }, { 0x2191, 0xA1F4 },
+	{ 0x2192, 0xA1F7 }, { 0x2193, 0xA1F5 }, { 0x2196, 0xA1F8 }, { 0x2197, 0xA1F9 }, { 0x2198, 0xA1FB }, { 0x2199, 0xA1FA }, { 0x221A, 0xA1D4 }, { 0x221E, 0xA1DB },
+	{ 0x221F, 0xA1E8 }, { 0x2220, 0xA1E7 }, { 0x2223, 0xA1FD }, { 0x2225, 0xA1FC }, { 0x2229, 0xA1E4 }, { 0x222A, 0xA1E5 }, { 0x222B, 0xA1EC }, { 0x222E, 0xA1ED },
+	{ 0x2234, 0xA1EF }, { 0x2235, 0xA1EE }, { 0x223C, 0xA1E3 }, { 0x2252, 0xA1DC }, { 0x2260, 0xA1DA }, { 0x2261, 0xA1DD }, { 0x2266, 0xA1D8 }, { 0x2267, 0xA1D9 },
+	{ 0x2295, 0xA1F2 }, { 0x22A5, 0xA1E6 }, { 0x22BF, 0xA1E9 }, { 0x22EF, 0xA14B }, { 0x2500, 0xA277 }, { 0x2502, 0xA278 }, { 0x250C, 0xA27A }, { 0x2510, 0xA27B },
+	{ 0x2514, 0xA27C }, { 0x2518, 0xA27D }, { 0x251C, 0xA275 }, { 0x2524, 0xA274 }, { 0x252C, 0xA273 }, { 0x2534, 0xA272 }, { 0x253C, 0xA271 }, { 0x2550, 0xA2A4 },
+	{ 0x255E, 0xA2A5 }, { 0x2561, 0xA2A7 }, { 0x256A, 0xA2A6 }, { 0x256D, 0xA27E }, { 0x256E, 0xA2A1 }, { 0x256F, 0xA2A3 }, { 0x2570, 0xA2A2 }, { 0x2571, 0xA2AC },
+	{ 0x2572, 0xA2AD }, { 0x2573, 0xA2AE }, { 0x2581, 0xA262 }, { 0x2582, 0xA263 }, { 0x2583, 0xA264 }, { 0x2584, 0xA265 }, { 0x2585, 0xA266 }, { 0x2586, 0xA267 },
+	{ 0x2587, 0xA268 }, { 0x2588, 0xA269 }, { 0x2589, 0xA270 }, { 0x258A, 0xA26F }, { 0x258B, 0xA26E }, { 0x258C, 0xA26D }, { 0x258D, 0xA26C }, { 0x258E, 0xA26B },
+	{ 0x258F, 0xA26A }, { 0x2594, 0xA276 }, { 0x25A0, 0xA1BD }, { 0x25A1, 0xA1BC }, { 0x25B2, 0xA1B6 }, { 0x25B3, 0xA1B5 }, { 0x25BC, 0xA1BF }, { 0x25BD, 0xA1BE },
+	{ 0x25C6, 0xA1BB }, { 0x25C7, 0xA1BA }, { 0x25CB, 0xA1B3 }, { 0x25CE, 0xA1B7 }, { 0x25CF, 0xA1B4 }, { 0x25E2, 0xA2A8 }, { 0x25E3, 0xA2A9 }, { 0x25E4, 0xA2AB },
+	{ 0x25E5, 0xA2AA }, { 0x2605, 0xA1B9 }, { 0x2606, 0xA1B8 }, { 0x2609, 0xA1F3 }, { 0x2640, 0xA1F0 }, { 0x2642, 0xA1F1 }, { 0x3000, 0xA140 }, { 0x3001, 0xA142 },
+	{ 0x3002, 0xA143 }, { 0x3003, 0xA1B2 }, { 0x3008, 0xA171 }, { 0x3009, 0xA172 }, { 0x300A, 0xA16D }, { 0x300B, 0xA16E }, { 0x300C, 0xA175 }, { 0x300D, 0xA176 },
+	{ 0x300E, 0xA179 }, { 0x300F, 0xA17A }, { 0x3010, 0xA169 }, { 0x3011, 0xA16A }, { 0x3012, 0xA245 }, { 0x3014, 0xA165 }, { 0x3015, 0xA166 }, { 0x301D, 0xA1A9 },
+	{ 0x301E, 0xA1AA }, { 0x3021, 0xA2C3 }, { 0x3022, 0xA2C4 }, { 0x3023, 0xA2C5 }, { 0x3024, 0xA2C6 }, { 0x3025, 0xA2C7 }, { 0x3026, 0xA2C8 }, { 0x3027, 0xA2C9 },
+	{ 0x3028, 0xA2CA }, { 0x3029, 0xA2CB }, { 0x3105, 0xA374 }, { 0x3106, 0xA375 }, { 0x3107, 0xA376 }, { 0x3108, 0xA377 }, { 0x3109, 0xA378 }, { 0x310A, 0xA379 },
+	{ 0x310B, 0xA37A }, { 0x310C, 0xA37B }, { 0x310D, 0xA37C }, { 0x310E, 0xA37D }, { 0x310F, 0xA37E }, { 0x3110, 0xA3A1 }, { 0x3111, 0xA3A2 }, { 0x3112, 0xA3A3 },
+	{ 0x3113, 0xA3A4 }, { 0x3114, 0xA3A5 }, { 0x3115, 0xA3A6 }, { 0x3116, 0xA3A7 }, { 0x3117, 0xA3A8 }, { 0x3118, 0xA3A9 }, { 0x3119, 0xA3AA }, { 0x311A, 0xA3AB },
+	{ 0x311B, 0xA3AC }, { 0x311C, 0xA3AD }, { 0x311D, 0xA3AE }, { 0x311E, 0xA3AF }, { 0x311F, 0xA3B0 }, { 0x3120, 0xA3B1 }, { 0x3121, 0xA3B2 }, { 0x3122, 0xA3B3 },
+	{ 0x3123, 0xA3B4 }, { 0x3124, 0xA3B5 }, { 0x3125, 0xA3B6 }, { 0x3126, 0xA3B7 }, { 0x3127, 0xA3B8 }, { 0x3128, 0xA3B9 }, { 0x3129, 0xA3BA }, { 0x32A3, 0xA1C0 },
+	{ 0x338E, 0xA255 }, { 0x338F, 0xA256 }, { 0x339C, 0xA250 }, { 0x339D, 0xA251 }, { 0x339E, 0xA252 }, { 0x33A1, 0xA254 }, { 0x33C4, 0xA257 }, { 0x33CE, 0xA253 },
+	{ 0x33D1, 0xA1EB }, { 0x33D2, 0xA1EA }, { 0x33D5, 0xA24F }, { 0x4E00, 0xA440 }, { 0x4E01, 0xA442 }, { 0x4E03, 0xA443 }, { 0x4E07, 0xC945 }, { 0x4E08, 0xA456 },
+	{ 0x4E09, 0xA454 }, { 0x4E0A, 0xA457 }, { 0x4E0B, 0xA455 }, { 0x4E0C, 0xC946 }, { 0x4E0D, 0xA4A3 }, { 0x4E0E, 0xC94F }, { 0x4E0F, 0xC94D }, { 0x4E10, 0xA4A2 },
+	{ 0x4E11, 0xA4A1 }, { 0x4E14, 0xA542 }, { 0x4E15, 0xA541 }, { 0x4E16, 0xA540 }, { 0x4E18, 0xA543 }, { 0x4E19, 0xA4FE }, { 0x4E1E, 0xA5E0 }, { 0x4E1F, 0xA5E1 },
+	{ 0x4E26, 0xA8C3 }, { 0x4E2B, 0xA458 }, { 0x4E2D, 0xA4A4 }, { 0x4E2E, 0xC950 }, { 0x4E30, 0xA4A5 }, { 0x4E31, 0xC963 }, { 0x4E32, 0xA6EA }, { 0x4E33, 0xCBB1 },
+	{ 0x4E38, 0xA459 }, { 0x4E39, 0xA4A6 }, { 0x4E3B, 0xA544 }, { 0x4E3C, 0xC964 }, { 0x4E42, 0xC940 }, { 0x4E43, 0xA444 }, { 0x4E45, 0xA45B }, { 0x4E47, 0xC947 },
+	{ 0x4E48, 0xA45C }, { 0x4E4B, 0xA4A7 }, { 0x4E4D, 0xA545 }, { 0x4E4E, 0xA547 }, { 0x4E4F, 0xA546 }, { 0x4E52, 0xA5E2 }, { 0x4E53, 0xA5E3 }, { 0x4E56, 0xA8C4 },
+	{ 0x4E58, 0xADBC }, { 0x4E59, 0xA441 }, { 0x4E5C, 0xC941 }, { 0x4E5D, 0xA445 }, { 0x4E5E, 0xA45E }, { 0x4E5F, 0xA45D }, { 0x4E69, 0xA5E4 }, { 0x4E73, 0xA8C5 },
+	{ 0x4E7E, 0xB0AE }, { 0x4E7F, 0xD44B }, { 0x4E82, 0xB6C3 }, { 0x4E83, 0xDCB1 }, { 0x4E84, 0xDCB2 }, { 0x4E86, 0xA446 }, { 0x4E88, 0xA4A9 }, { 0x4E8B, 0xA8C6 },
+	{ 0x4E8C, 0xA447 }, { 0x4E8D, 0xC948 }, { 0x4E8E, 0xA45F }, { 0x4E91, 0xA4AA }, { 0x4E92, 0xA4AC }, { 0x4E93, 0xC951 }, { 0x4E94, 0xA4AD }, { 0x4E95, 0xA4AB },
+	{ 0x4E99, 0xA5E5 }, { 0x4E9B, 0xA8C7 }, { 0x4E9E, 0xA8C8 }, { 0x4E9F, 0xAB45 }, { 0x4EA1, 0xA460 }, { 0x4EA2, 0xA4AE }, { 0x4EA4, 0xA5E6 }, { 0x4EA5, 0xA5E8 },
+	{ 0x4EA6, 0xA5E7 }, { 0x4EA8, 0xA6EB }, { 0x4EAB, 0xA8C9 }, { 0x4EAC, 0xA8CA }, { 0x4EAD, 0xAB46 }, { 0x4EAE, 0xAB47 }, { 0x4EB3, 0xADBD }, { 0x4EB6, 0xDCB3 },
+	{ 0x4EB9, 0xF6D6 }, { 0x4EBA, 0xA448 }, { 0x4EC0, 0xA4B0 }, { 0x4EC1, 0xA4AF }, { 0x4EC2, 0xC952 }, { 0x4EC3, 0xA4B1 }, { 0x4EC4, 0xA4B7 }, { 0x4EC6, 0xA4B2 },
+	{ 0x4EC7, 0xA4B3 }, { 0x4EC8, 0xC954 }, { 0x4EC9, 0xC953 }, { 0x4ECA, 0xA4B5 }, { 0x4ECB, 0xA4B6 }, { 0x4ECD, 0xA4B4 }, { 0x4ED4, 0xA54A }, { 0x4ED5, 0xA54B },
+	{ 0x4ED6, 0xA54C }, { 0x4ED7, 0xA54D }, { 0x4ED8, 0xA549 }, { 0x4ED9, 0xA550 }, { 0x4EDA, 0xC96A }, { 0x4EDC, 0xC966 }, { 0x4EDD, 0xC969 }, { 0x4EDE, 0xA551 },
+	{ 0x4EDF, 0xA561 }, { 0x4EE1, 0xC968 }, { 0x4EE3, 0xA54E }, { 0x4EE4, 0xA54F }, { 0x4EE5, 0xA548 }, { 0x4EE8, 0xC965 }, { 0x4EE9, 0xC967 }, { 0x4EF0, 0xA5F5 },
+	{ 0x4EF1, 0xC9B0 }, { 0x4EF2, 0xA5F2 }, { 0x4EF3, 0xA5F6 }, { 0x4EF4, 0xC9BA }, { 0x4EF5, 0xC9AE }, { 0x4EF6, 0xA5F3 }, { 0x4EF7, 0xC9B2 }, { 0x4EFB, 0xA5F4 },
+	{ 0x4EFD, 0xA5F7 }, { 0x4EFF, 0xA5E9 }, { 0x4F00, 0xC9B1 }, { 0x4F01, 0xA5F8 }, { 0x4F02, 0xC9B5 }, { 0x4F04, 0xC9B9 }, { 0x4F05, 0xC9B6 }, { 0x4F08, 0xC9B3 },
+	{ 0x4F09, 0xA5EA }, { 0x4F0A, 0xA5EC }, { 0x4F0B, 0xA5F9 }, { 0x4F0D, 0xA5EE }, { 0x4F0E, 0xC9AB }, { 0x4F0F, 0xA5F1 }, { 0x4F10, 0xA5EF }, { 0x4F11, 0xA5F0 },
+	{ 0x4F12, 0xC9BB }, { 0x4F13, 0xC9B8 }, { 0x4F14, 0xC9AF }, { 0x4F15, 0xA5ED }, { 0x4F18, 0xC9AC }, { 0x4F19, 0xA5EB }, { 0x4F1D, 0xC9B4 }, { 0x4F22, 0xC9B7 },
+	{ 0x4F2C, 0xC9AD }, { 0x4F2D, 0xCA66 }, { 0x4F2F, 0xA742 }, { 0x4F30, 0xA6F4 }, { 0x4F33, 0xCA67 }, { 0x4F34, 0xA6F1 }, { 0x4F36, 0xA744 }, { 0x4F38, 0xA6F9 },
+	{ 0x4F3A, 0xA6F8 }, { 0x4F3B, 0xCA5B }, { 0x4F3C, 0xA6FC }, { 0x4F3D, 0xA6F7 }, { 0x4F3E, 0xCA60 }, { 0x4F3F, 0xCA68 }, { 0x4F41, 0xCA64 }, { 0x4F43, 0xA6FA },
+	{ 0x4F46, 0xA6FD }, { 0x4F47, 0xA6EE }, { 0x4F48, 0xA747 }, { 0x4F49, 0xCA5D }, { 0x4F4C, 0xCBBD }, { 0x4F4D, 0xA6EC }, { 0x4F4E, 0xA743 }, { 0x4F4F, 0xA6ED },
+	{ 0x4F50, 0xA6F5 }, { 0x4F51, 0xA6F6 }, { 0x4F52, 0xCA62 }, { 0x4F53, 0xCA5E }, { 0x4F54, 0xA6FB }, { 0x4F55, 0xA6F3 }, { 0x4F56, 0xCA5A }, { 0x4F57, 0xA6EF },
+	{ 0x4F58, 0xCA65 }, { 0x4F59, 0xA745 }, { 0x4F5A, 0xA748 }, { 0x4F5B, 0xA6F2 }, { 0x4F5C, 0xA740 }, { 0x4F5D, 0xA746 }, { 0x4F5E, 0xA6F0 }, { 0x4F5F, 0xCA63 },
+	{ 0x4F60, 0xA741 }, { 0x4F61, 0xCA69 }, { 0x4F62, 0xCA5C }, { 0x4F63, 0xA6FE }, { 0x4F64, 0xCA5F }, { 0x4F67, 0xCA61 }, { 0x4F69, 0xA8D8 }, { 0x4F6A, 0xCBBF },
+	{ 0x4F6B, 0xCBCB }, { 0x4F6C, 0xA8D0 }, { 0x4F6E, 0xCBCC }, { 0x4F6F, 0xA8CB }, { 0x4F70, 0xA8D5 }, { 0x4F73, 0xA8CE }, { 0x4F74, 0xCBB9 }, { 0x4F75, 0xA8D6 },
+	{ 0x4F76, 0xCBB8 }, { 0x4F77, 0xCBBC }, { 0x4F78, 0xCBC3 }, { 0x4F79, 0xCBC1 }, { 0x4F7A, 0xA8DE }, { 0x4F7B, 0xA8D9 }, { 0x4F7C, 0xCBB3 }, { 0x4F7D, 0xCBB5 },
+	{ 0x4F7E, 0xA8DB }, { 0x4F7F, 0xA8CF }, { 0x4F80, 0xCBB6 }, { 0x4F81, 0xCBC2 }, { 0x4F82, 0xCBC9 }, { 0x4F83, 0xA8D4 }, { 0x4F84, 0xCBBB }, { 0x4F85, 0xCBB4 },
+	{ 0x4F86, 0xA8D3 }, { 0x4F87, 0xCBB7 }, { 0x4F88, 0xA8D7 }, { 0x4F89, 0xCBBA }, { 0x4F8B, 0xA8D2 }, { 0x4F8D, 0xA8CD }, { 0x4F8F, 0xA8DC }, { 0x4F90, 0xCBC4 },
+	{ 0x4F91, 0xA8DD }, { 0x4F92, 0xCBC8 }, { 0x4F94, 0xCBC6 }, { 0x4F95, 0xCBCA }, { 0x4F96, 0xA8DA }, { 0x4F97, 0xCBBE }, { 0x4F98, 0xCBB2 }, { 0x4F9A, 0xCBC0 },
+	{ 0x4F9B, 0xA8D1 }, { 0x4F9C, 0xCBC5 }, { 0x4F9D, 0xA8CC }, { 0x4F9E, 0xCBC7 }, { 0x4FAE, 0xAB56 }, { 0x4FAF, 0xAB4A }, { 0x4FB2, 0xCDE0 }, { 0x4FB3, 0xCDE8 },
+	{ 0x4FB5, 0xAB49 }, { 0x4FB6, 0xAB51 }, { 0x4FB7, 0xAB5D }, { 0x4FB9, 0xCDEE }, { 0x4FBA, 0xCDEC }, { 0x4FBB, 0xCDE7 }, { 0x4FBF, 0xAB4B }, { 0x4FC0, 0xCDED },
+	{ 0x4FC1, 0xCDE3 }, { 0x4FC2, 0xAB59 }, { 0x4FC3, 0xAB50 }, { 0x4FC4, 0xAB58 }, { 0x4FC5, 0xCDDE }, { 0x4FC7, 0xCDEA }, { 0x4FC9, 0xCDE1 }, { 0x4FCA, 0xAB54 },
+	{ 0x4FCB, 0xCDE2 }, { 0x4FCD, 0xCDDD }, { 0x4FCE, 0xAB5B }, { 0x4FCF, 0xAB4E }, { 0x4FD0, 0xAB57 }, { 0x4FD1, 0xAB4D }, { 0x4FD3, 0xCDDF }, { 0x4FD4, 0xCDE4 },
+	{ 0x4FD6, 0xCDEB }, { 0x4FD7, 0xAB55 }, { 0x4FD8, 0xAB52 }, { 0x4FD9, 0xCDE6 }, { 0x4FDA, 0xAB5A }, { 0x4FDB, 0xCDE9 }, { 0x4FDC, 0xCDE5 }, { 0x4FDD, 0xAB4F },
+	{ 0x4FDE, 0xAB5C }, { 0x4FDF, 0xAB53 }, { 0x4FE0, 0xAB4C }, { 0x4FE1, 0xAB48 }, { 0x4FEC, 0xCDEF }, { 0x4FEE, 0xADD7 }, { 0x4FEF, 0xADC1 }, { 0x4FF1, 0xADD1 },
+	{ 0x4FF3, 0xADD6 }, { 0x4FF4, 0xD0D0 }, { 0x4FF5, 0xD0CF }, { 0x4FF6, 0xD0D4 }, { 0x4FF7, 0xD0D5 }, { 0x4FF8, 0xADC4 }, { 0x4FFA, 0xADCD }, { 0x4FFE, 0xADDA },
+	{ 0x5000, 0xADCE }, { 0x5005, 0xD0C9 }, { 0x5006, 0xADC7 }, { 0x5007, 0xD0CA }, { 0x5009, 0xADDC }, { 0x500B, 0xADD3 }, { 0x500C, 0xADBE }, { 0x500D, 0xADBF },
+	{ 0x500E, 0xD0DD }, { 0x500F, 0xB0BF }, { 0x5011, 0xADCC }, { 0x5012, 0xADCB }, { 0x5013, 0xD0CB }, { 0x5014, 0xADCF }, { 0x5015, 0xD45B }, { 0x5016, 0xADC6 },
+	{ 0x5017, 0xD0D6 }, { 0x5018, 0xADD5 }, { 0x5019, 0xADD4 }, { 0x501A, 0xADCA }, { 0x501B, 0xD0CE }, { 0x501C, 0xD0D7 }, { 0x501E, 0xD0C8 }, { 0x501F, 0xADC9 },
+	{ 0x5020, 0xD0D8 }, { 0x5021, 0xADD2 }, { 0x5022, 0xD0CC }, { 0x5023, 0xADC0 }, { 0x5025, 0xADC3 }, { 0x5026, 0xADC2 }, { 0x5027, 0xD0D9 }, { 0x5028, 0xADD0 },
+	{ 0x5029, 0xADC5 }, { 0x502A, 0xADD9 }, { 0x502B, 0xADDB }, { 0x502C, 0xD0D3 }, { 0x502D, 0xADD8 }, { 0x502F, 0xD0DB }, { 0x5030, 0xD0CD }, { 0x5031, 0xD0DC },
+	{ 0x5033, 0xD0D1 }, { 0x5035, 0xD0DA }, { 0x5037, 0xD0D2 }, { 0x503C, 0xADC8 }, { 0x5040, 0xD463 }, { 0x5041, 0xD457 }, { 0x5043, 0xB0B3 }, { 0x5045, 0xD45C },
+	{ 0x5046, 0xD462 }, { 0x5047, 0xB0B2 }, { 0x5048, 0xD455 }, { 0x5049, 0xB0B6 }, { 0x504A, 0xD459 }, { 0x504B, 0xD452 }, { 0x504C, 0xB0B4 }, { 0x504D, 0xD456 },
+	{ 0x504E, 0xB0B9 }, { 0x504F, 0xB0BE }, { 0x5051, 0xD467 }, { 0x5053, 0xD451 }, { 0x5055, 0xB0BA }, { 0x5057, 0xD466 }, { 0x505A, 0xB0B5 }, { 0x505B, 0xD458 },
+	{ 0x505C, 0xB0B1 }, { 0x505D, 0xD453 }, { 0x505E, 0xD44F }, { 0x505F, 0xD45D }, { 0x5060, 0xD450 }, { 0x5061, 0xD44E }, { 0x5062, 0xD45A }, { 0x5063, 0xD460 },
+	{ 0x5064, 0xD461 }, { 0x5065, 0xB0B7 }, { 0x5068, 0xD85B }, { 0x5069, 0xD45E }, { 0x506A, 0xD44D }, { 0x506B, 0xD45F }, { 0x506D, 0xB0C1 }, { 0x506E, 0xD464 },
+	{ 0x506F, 0xB0C0 }, { 0x5070, 0xD44C }, { 0x5072, 0xD454 }, { 0x5073, 0xD465 }, { 0x5074, 0xB0BC }, { 0x5075, 0xB0BB }, { 0x5076, 0xB0B8 }, { 0x5077, 0xB0BD },
+	{ 0x507A, 0xB0AF }, { 0x507D, 0xB0B0 }, { 0x5080, 0xB3C8 }, { 0x5082, 0xD85E }, { 0x5083, 0xD857 }, { 0x5085, 0xB3C5 }, { 0x5087, 0xD85F }, { 0x508B, 0xD855 },
+	{ 0x508C, 0xD858 }, { 0x508D, 0xB3C4 }, { 0x508E, 0xD859 }, { 0x5091, 0xB3C7 }, { 0x5092, 0xD85D }, { 0x5094, 0xD853 }, { 0x5095, 0xD852 }, { 0x5096, 0xB3C9 },
+	{ 0x5098, 0xB3CA }, { 0x5099, 0xB3C6 }, { 0x509A, 0xB3CB }, { 0x509B, 0xD851 }, { 0x509C, 0xD85C }, { 0x509D, 0xD85A }, { 0x509E, 0xD854 }, { 0x50A2, 0xB3C3 },
+	{ 0x50A3, 0xD856 }, { 0x50AC, 0xB6CA }, { 0x50AD, 0xB6C4 }, { 0x50AE, 0xDCB7 }, { 0x50AF, 0xB6CD }, { 0x50B0, 0xDCBD }, { 0x50B1, 0xDCC0 }, { 0x50B2, 0xB6C6 },
+	{ 0x50B3, 0xB6C7 }, { 0x50B4, 0xDCBA }, { 0x50B5, 0xB6C5 }, { 0x50B6, 0xDCC3 }, { 0x50B7, 0xB6CB }, { 0x50B8, 0xDCC4 }, { 0x50BA, 0xDCBF }, { 0x50BB, 0xB6CC },
+	{ 0x50BD, 0xDCB4 }, { 0x50BE, 0xB6C9 }, { 0x50BF, 0xDCB5 }, { 0x50C1, 0xDCBE }, { 0x50C2, 0xDCBC }, { 0x50C4, 0xDCB8 }, { 0x50C5, 0xB6C8 }, { 0x50C6, 0xDCB6 },
+	{ 0x50C7, 0xB6CE }, { 0x50C8, 0xDCBB }, { 0x50C9, 0xDCC2 }, { 0x50CA, 0xDCB9 }, { 0x50CB, 0xDCC1 }, { 0x50CE, 0xB9B6 }, { 0x50CF, 0xB9B3 }, { 0x50D1, 0xB9B4 },
+	{ 0x50D3, 0xE0F9 }, { 0x50D4, 0xE0F1 }, { 0x50D5, 0xB9B2 }, { 0x50D6, 0xB9AF }, { 0x50D7, 0xE0F2 }, { 0x50DA, 0xB9B1 }, { 0x50DB, 0xE0F5 }, { 0x50DD, 0xE0F7 },
+	{ 0x50E0, 0xE0FE }, { 0x50E3, 0xE0FD }, { 0x50E4, 0xE0F8 }, { 0x50E5, 0xB9AE }, { 0x50E6, 0xE0F0 }, { 0x50E7, 0xB9AC }, { 0x50E8, 0xE0F3 }, { 0x50E9, 0xB9B7 },
+	{ 0x50EA, 0xE0F6 }, { 0x50EC, 0xE0FA }, { 0x50ED, 0xB9B0 }, { 0x50EE, 0xB9AD }, { 0x50EF, 0xE0FC }, { 0x50F0, 0xE0FB }, { 0x50F1, 0xB9B5 }, { 0x50F3, 0xE0F4 },
+	{ 0x50F5, 0xBBF8 }, { 0x50F6, 0xE4EC }, { 0x50F8, 0xE4E9 }, { 0x50F9, 0xBBF9 }, { 0x50FB, 0xBBF7 }, { 0x50FD, 0xE4F0 }, { 0x50FE, 0xE4ED }, { 0x50FF, 0xE4E6 },
+	{ 0x5100, 0xBBF6 }, { 0x5102, 0xBBFA }, { 0x5103, 0xE4E7 }, { 0x5104, 0xBBF5 }, { 0x5105, 0xBBFD }, { 0x5106, 0xE4EA }, { 0x5107, 0xE4EB }, { 0x5108, 0xBBFB },
+	{ 0x5109, 0xBBFC }, { 0x510A, 0xE4F1 }, { 0x510B, 0xE4EE }, { 0x510C, 0xE4EF }, { 0x5110, 0xBEAA }, { 0x5111, 0xE8F8 }, { 0x5112, 0xBEA7 }, { 0x5113, 0xE8F5 },
+	{ 0x5114, 0xBEA9 }, { 0x5115, 0xBEAB }, { 0x5117, 0xE8F6 }, { 0x5118, 0xBEA8 }, { 0x511A, 0xE8F7 }, { 0x511C, 0xE8F4 }, { 0x511F, 0xC076 }, { 0x5120, 0xECBD },
+	{ 0x5121, 0xC077 }, { 0x5122, 0xECBB }, { 0x5124, 0xECBC }, { 0x5125, 0xECBA }, { 0x5126, 0xECB9 }, { 0x5129, 0xECBE }, { 0x512A, 0xC075 }, { 0x512D, 0xEFB8 },
+	{ 0x512E, 0xEFB9 }, { 0x5130, 0xE4E8 }, { 0x5131, 0xEFB7 }, { 0x5132, 0xC078 }, { 0x5133, 0xC35F }, { 0x5134, 0xF1EB }, { 0x5135, 0xF1EC }, { 0x5137, 0xC4D7 },
+	{ 0x5138, 0xC4D8 }, { 0x5139, 0xF5C1 }, { 0x513A, 0xF5C0 }, { 0x513B, 0xC56C }, { 0x513C, 0xC56B }, { 0x513D, 0xF7D0 }, { 0x513F, 0xA449 }, { 0x5140, 0xA461 },
+	{ 0x5141, 0xA4B9 }, { 0x5143, 0xA4B8 }, { 0x5144, 0xA553 }, { 0x5145, 0xA552 }, { 0x5146, 0xA5FC }, { 0x5147, 0xA5FB }, { 0x5148, 0xA5FD }, { 0x5149, 0xA5FA },
+	{ 0x514B, 0xA74A }, { 0x514C, 0xA749 }, { 0x514D, 0xA74B }, { 0x5152, 0xA8E0 }, { 0x5154, 0xA8DF }, { 0x5155, 0xA8E1 }, { 0x5157, 0xAB5E }, { 0x5159, 0xA259 },
+	{ 0x515A, 0xD0DE }, { 0x515B, 0xA25A }, { 0x515C, 0xB0C2 }, { 0x515D, 0xA25C }, { 0x515E, 0xA25B }, { 0x515F, 0xD860 }, { 0x5161, 0xA25D }, { 0x5162, 0xB9B8 },
+	{ 0x5163, 0xA25E }, { 0x5165, 0xA44A }, { 0x5167, 0xA4BA }, { 0x5168, 0xA5FE }, { 0x5169, 0xA8E2 }, { 0x516B, 0xA44B }, { 0x516C, 0xA4BD }, { 0x516D, 0xA4BB },
+	{ 0x516E, 0xA4BC }, { 0x5171, 0xA640 }, { 0x5175, 0xA74C }, { 0x5176, 0xA8E4 }, { 0x5177, 0xA8E3 }, { 0x5178, 0xA8E5 }, { 0x517C, 0xADDD }, { 0x5180, 0xBEAC },
+	{ 0x5187, 0xC94E }, { 0x5189, 0xA554 }, { 0x518A, 0xA555 }, { 0x518D, 0xA641 }, { 0x518F, 0xCA6A }, { 0x5191, 0xAB60 }, { 0x5192, 0xAB5F }, { 0x5193, 0xD0E0 },
+	{ 0x5194, 0xD0DF }, { 0x5195, 0xB0C3 }, { 0x5197, 0xA4BE }, { 0x5198, 0xC955 }, { 0x519E, 0xCBCD }, { 0x51A0, 0xAB61 }, { 0x51A2, 0xADE0 }, { 0x51A4, 0xADDE },
+	{ 0x51A5, 0xADDF }, { 0x51AA, 0xBEAD }, { 0x51AC, 0xA556 }, { 0x51B0, 0xA642 }, { 0x51B1, 0xC9BC }, { 0x51B6, 0xA74D }, { 0x51B7, 0xA74E }, { 0x51B9, 0xCA6B },
+	{ 0x51BC, 0xCBCE }, { 0x51BD, 0xA8E6 }, { 0x51BE, 0xCBCF }, { 0x51C4, 0xD0E2 }, { 0x51C5, 0xD0E3 }, { 0x51C6, 0xADE3 }, { 0x51C8, 0xD0E4 }, { 0x51CA, 0xD0E1 },
+	{ 0x51CB, 0xADE4 }, { 0x51CC, 0xADE2 }, { 0x51CD, 0xADE1 }, { 0x51CE, 0xD0E5 }, { 0x51D0, 0xD468 }, { 0x51D4, 0xD861 }, { 0x51D7, 0xDCC5 }, { 0x51D8, 0xE140 },
+	{ 0x51DC, 0xBBFE }, { 0x51DD, 0xBEAE }, { 0x51DE, 0xE8F9 }, { 0x51E0, 0xA44C }, { 0x51E1, 0xA45A }, { 0x51F0, 0xB0C4 }, { 0x51F1, 0xB3CD }, { 0x51F3, 0xB9B9 },
+	{ 0x51F5, 0xC942 }, { 0x51F6, 0xA4BF }, { 0x51F8, 0xA559 }, { 0x51F9, 0xA557 }, { 0x51FA, 0xA558 }, { 0x51FD, 0xA8E7 }, { 0x5200, 0xA44D }, { 0x5201, 0xA44E },
+	{ 0x5203, 0xA462 }, { 0x5206, 0xA4C0 }, { 0x5207, 0xA4C1 }, { 0x5208, 0xA4C2 }, { 0x5209, 0xC9BE }, { 0x520A, 0xA55A }, { 0x520C, 0xC96B }, { 0x520E, 0xA646 },
+	{ 0x5210, 0xC9BF }, { 0x5211, 0xA644 }, { 0x5212, 0xA645 }, { 0x5213, 0xC9BD }, { 0x5216, 0xA647 }, { 0x5217, 0xA643 }, { 0x521C, 0xCA6C }, { 0x521D, 0xAAEC },
+	{ 0x521E, 0xCA6D }, { 0x5221, 0xCA6E }, { 0x5224, 0xA750 }, { 0x5225, 0xA74F }, { 0x5228, 0xA753 }, { 0x5229, 0xA751 }, { 0x522A, 0xA752 }, { 0x522E, 0xA8ED },
+	{ 0x5230, 0xA8EC }, { 0x5231, 0xCBD4 }, { 0x5232, 0xCBD1 }, { 0x5233, 0xCBD2 }, { 0x5235, 0xCBD0 }, { 0x5236, 0xA8EE }, { 0x5237, 0xA8EA }, { 0x5238, 0xA8E9 },
+	{ 0x523A, 0xA8EB }, { 0x523B, 0xA8E8 }, { 0x5241, 0xA8EF }, { 0x5243, 0xAB63 }, { 0x5244, 0xCDF0 }, { 0x5246, 0xCBD3 }, { 0x5247, 0xAB68 }, { 0x5249, 0xCDF1 },
+	{ 0x524A, 0xAB64 }, { 0x524B, 0xAB67 }, { 0x524C, 0xAB66 }, { 0x524D, 0xAB65 }, { 0x524E, 0xAB62 }, { 0x5252, 0xD0E8 }, { 0x5254, 0xADE7 }, { 0x5255, 0xD0EB },
+	{ 0x5256, 0xADE5 }, { 0x525A, 0xD0E7 }, { 0x525B, 0xADE8 }, { 0x525C, 0xADE6 }, { 0x525D, 0xADE9 }, { 0x525E, 0xD0E9 }, { 0x525F, 0xD0EA }, { 0x5261, 0xD0E6 },
+	{ 0x5262, 0xD0EC }, { 0x5269, 0xB3D1 }, { 0x526A, 0xB0C5 }, { 0x526B, 0xD469 }, { 0x526C, 0xD46B }, { 0x526D, 0xD46A }, { 0x526E, 0xD46C }, { 0x526F, 0xB0C6 },
+	{ 0x5272, 0xB3CE }, { 0x5274, 0xB3CF }, { 0x5275, 0xB3D0 }, { 0x5277, 0xB6D0 }, { 0x5278, 0xDCC7 }, { 0x527A, 0xDCC6 }, { 0x527B, 0xDCC8 }, { 0x527C, 0xDCC9 },
+	{ 0x527D, 0xB6D1 }, { 0x527F, 0xB6CF }, { 0x5280, 0xE141 }, { 0x5281, 0xE142 }, { 0x5282, 0xB9BB }, { 0x5283, 0xB9BA }, { 0x5284, 0xE35A }, { 0x5287, 0xBC40 },
+	{ 0x5288, 0xBC41 }, { 0x5289, 0xBC42 }, { 0x528A, 0xBC44 }, { 0x528B, 0xE4F2 }, { 0x528C, 0xE4F3 }, { 0x528D, 0xBC43 }, { 0x5291, 0xBEAF }, { 0x5293, 0xBEB0 },
+	{ 0x5296, 0xF1ED }, { 0x5297, 0xF5C3 }, { 0x5298, 0xF5C2 }, { 0x5299, 0xF7D1 }, { 0x529B, 0xA44F }, { 0x529F, 0xA55C }, { 0x52A0, 0xA55B }, { 0x52A3, 0xA648 },
+	{ 0x52A6, 0xC9C0 }, { 0x52A9, 0xA755 }, { 0x52AA, 0xA756 }, { 0x52AB, 0xA754 }, { 0x52AC, 0xA757 }, { 0x52AD, 0xCA6F }, { 0x52AE, 0xCA70 }, { 0x52BB, 0xA8F1 },
+	{ 0x52BC, 0xCBD5 }, { 0x52BE, 0xA8F0 }, { 0x52C0, 0xCDF2 }, { 0x52C1, 0xAB6C }, { 0x52C2, 0xCDF3 }, { 0x52C3, 0xAB6B }, { 0x52C7, 0xAB69 }, { 0x52C9, 0xAB6A },
+	{ 0x52CD, 0xD0ED }, { 0x52D2, 0xB0C7 }, { 0x52D3, 0xD46E }, { 0x52D5, 0xB0CA }, { 0x52D6, 0xD46D }, { 0x52D7, 0xB1E5 }, { 0x52D8, 0xB0C9 }, { 0x52D9, 0xB0C8 },
+	{ 0x52DB, 0xB3D4 }, { 0x52DD, 0xB3D3 }, { 0x52DE, 0xB3D2 }, { 0x52DF, 0xB6D2 }, { 0x52E2, 0xB6D5 }, { 0x52E3, 0xB6D6 }, { 0x52E4, 0xB6D4 }, { 0x52E6, 0xB6D3 },
+	{ 0x52E9, 0xE143 }, { 0x52EB, 0xE144 }, { 0x52EF, 0xE4F5 }, { 0x52F0, 0xBC45 }, { 0x52F1, 0xE4F4 }, { 0x52F3, 0xBEB1 }, { 0x52F4, 0xECBF }, { 0x52F5, 0xC079 },
+	{ 0x52F7, 0xF1EE }, { 0x52F8, 0xC455 }, { 0x52FA, 0xA463 }, { 0x52FB, 0xA4C3 }, { 0x52FC, 0xC956 }, { 0x52FE, 0xA4C4 }, { 0x52FF, 0xA4C5 }, { 0x5305, 0xA55D },
+	{ 0x5306, 0xA55E }, { 0x5308, 0xA649 }, { 0x5309, 0xCA71 }, { 0x530A, 0xCBD6 }, { 0x530B, 0xCBD7 }, { 0x530D, 0xAB6D }, { 0x530E, 0xD0EE }, { 0x530F, 0xB0CC },
+	{ 0x5310, 0xB0CB }, { 0x5311, 0xD863 }, { 0x5312, 0xD862 }, { 0x5315, 0xA450 }, { 0x5316, 0xA4C6 }, { 0x5317, 0xA55F }, { 0x5319, 0xB0CD }, { 0x531A, 0xC943 },
+	{ 0x531C, 0xC96C }, { 0x531D, 0xA560 }, { 0x531F, 0xC9C2 }, { 0x5320, 0xA64B }, { 0x5321, 0xA64A }, { 0x5322, 0xC9C1 }, { 0x5323, 0xA758 }, { 0x532A, 0xADEA },
+	{ 0x532D, 0xD46F }, { 0x532F, 0xB6D7 }, { 0x5330, 0xE145 }, { 0x5331, 0xB9BC }, { 0x5334, 0xE8FA }, { 0x5337, 0xF3FD }, { 0x5339, 0xA4C7 }, { 0x533C, 0xCBD8 },
+	{ 0x533D, 0xCDF4 }, { 0x533E, 0xB0D0 }, { 0x533F, 0xB0CE }, { 0x5340, 0xB0CF }, { 0x5341, 0xA451 }, { 0x5343, 0xA464 }, { 0x5344, 0xA2CD }, { 0x5345, 0xA4CA },
+	{ 0x5347, 0xA4C9 }, { 0x5348, 0xA4C8 }, { 0x5349, 0xA563 }, { 0x534A, 0xA562 }, { 0x534C, 0xC96D }, { 0x534D, 0xC9C3 }, { 0x5351, 0xA8F5 }, { 0x5352, 0xA8F2 },
+	{ 0x5353, 0xA8F4 }, { 0x5354, 0xA8F3 }, { 0x5357, 0xAB6E }, { 0x535A, 0xB3D5 }, { 0x535C, 0xA452 }, { 0x535E, 0xA4CB }, { 0x5360, 0xA565 }, { 0x5361, 0xA564 },
+	{ 0x5363, 0xCA72 }, { 0x5366, 0xA8F6 }, { 0x536C, 0xC957 }, { 0x536E, 0xA567 }, { 0x536F, 0xA566 }, { 0x5370, 0xA64C }, { 0x5371, 0xA64D }, { 0x5372, 0xCA73 },
+	{ 0x5373, 0xA759 }, { 0x5375, 0xA75A }, { 0x5377, 0xA8F7 }, { 0x5378, 0xA8F8 }, { 0x5379, 0xA8F9 }, { 0x537B, 0xAB6F }, { 0x537C, 0xCDF5 }, { 0x537F, 0xADEB },
+	{ 0x5382, 0xC944 }, { 0x5384, 0xA4CC }, { 0x538A, 0xC9C4 }, { 0x538E, 0xCA74 }, { 0x538F, 0xCA75 }, { 0x5392, 0xCBD9 }, { 0x5394, 0xCBDA }, { 0x5396, 0xCDF7 },
+	{ 0x5397, 0xCDF6 }, { 0x5398, 0xCDF9 }, { 0x5399, 0xCDF8 }, { 0x539A, 0xAB70 }, { 0x539C, 0xD470 }, { 0x539D, 0xADED }, { 0x539E, 0xD0EF }, { 0x539F, 0xADEC },
+	{ 0x53A4, 0xD864 }, { 0x53A5, 0xB3D6 }, { 0x53A7, 0xD865 }, { 0x53AC, 0xE146 }, { 0x53AD, 0xB9BD }, { 0x53B2, 0xBC46 }, { 0x53B4, 0xF1EF }, { 0x53B9, 0xC958 },
+	{ 0x53BB, 0xA568 }, { 0x53C3, 0xB0D1 }, { 0x53C8, 0xA453 }, { 0x53C9, 0xA465 }, { 0x53CA, 0xA4CE }, { 0x53CB, 0xA4CD }, { 0x53CD, 0xA4CF }, { 0x53D4, 0xA8FB },
+	{ 0x53D6, 0xA8FA }, { 0x53D7, 0xA8FC }, { 0x53DB, 0xAB71 }, { 0x53DF, 0xADEE }, { 0x53E1, 0xE8FB }, { 0x53E2, 0xC24F }, { 0x53E3, 0xA466 }, { 0x53E4, 0xA56A },
+	{ 0x53E5, 0xA579 }, { 0x53E6, 0xA574 }, { 0x53E8, 0xA56F }, { 0x53E9, 0xA56E }, { 0x53EA, 0xA575 }, { 0x53EB, 0xA573 }, { 0x53EC, 0xA56C }, { 0x53ED, 0xA57A },
+	{ 0x53EE, 0xA56D }, { 0x53EF, 0xA569 }, { 0x53F0, 0xA578 }, { 0x53F1, 0xA577 }, { 0x53F2, 0xA576 }, { 0x53F3, 0xA56B }, { 0x53F5, 0xA572 }, { 0x53F8, 0xA571 },
+	{ 0x53FB, 0xA57B }, { 0x53FC, 0xA570 }, { 0x5401, 0xA653 }, { 0x5403, 0xA659 }, { 0x5404, 0xA655 }, { 0x5406, 0xA65B }, { 0x5407, 0xC9C5 }, { 0x5408, 0xA658 },
+	{ 0x5409, 0xA64E }, { 0x540A, 0xA651 }, { 0x540B, 0xA654 }, { 0x540C, 0xA650 }, { 0x540D, 0xA657 }, { 0x540E, 0xA65A }, { 0x540F, 0xA64F }, { 0x5410, 0xA652 },
+	{ 0x5411, 0xA656 }, { 0x5412, 0xA65C }, { 0x5418, 0xCA7E }, { 0x5419, 0xCA7B }, { 0x541B, 0xA767 }, { 0x541C, 0xCA7C }, { 0x541D, 0xA75B }, { 0x541E, 0xA75D },
+	{ 0x541F, 0xA775 }, { 0x5420, 0xA770 }, { 0x5424, 0xCAA5 }, { 0x5425, 0xCA7D }, { 0x5426, 0xA75F }, { 0x5427, 0xA761 }, { 0x5428, 0xCAA4 }, { 0x5429, 0xA768 },
+	{ 0x542A, 0xCA78 }, { 0x542B, 0xA774 }, { 0x542C, 0xA776 }, { 0x542D, 0xA75C }, { 0x542E, 0xA76D }, { 0x5430, 0xCA76 }, { 0x5431, 0xA773 }, { 0x5433, 0xA764 },
+	{ 0x5435, 0xA76E }, { 0x5436, 0xA76F }, { 0x5437, 0xCA77 }, { 0x5438, 0xA76C }, { 0x5439, 0xA76A }, { 0x543B, 0xA76B }, { 0x543C, 0xA771 }, { 0x543D, 0xCAA1 },
+	{ 0x543E, 0xA75E }, { 0x5440, 0xA772 }, { 0x5441, 0xCAA3 }, { 0x5442, 0xA766 }, { 0x5443, 0xA763 }, { 0x5445, 0xCA7A }, { 0x5446, 0xA762 }, { 0x5447, 0xCAA6 },
+	{ 0x5448, 0xA765 }, { 0x544A, 0xA769 }, { 0x544E, 0xA760 }, { 0x544F, 0xCAA2 }, { 0x5454, 0xCA79 }, { 0x5460, 0xCBEB }, { 0x5461, 0xCBEA }, { 0x5462, 0xA94F },
+	{ 0x5463, 0xCBED }, { 0x5464, 0xCBEF }, { 0x5465, 0xCBE4 }, { 0x5466, 0xCBE7 }, { 0x5467, 0xCBEE }, { 0x5468, 0xA950 }, { 0x546B, 0xCBE1 }, { 0x546C, 0xCBE5 },
+	{ 0x546F, 0xCBE9 }, { 0x5470, 0xCE49 }, { 0x5471, 0xA94B }, { 0x5472, 0xCE4D }, { 0x5473, 0xA8FD }, { 0x5474, 0xCBE6 }, { 0x5475, 0xA8FE }, { 0x5476, 0xA94C },
+	{ 0x5477, 0xA945 }, { 0x5478, 0xA941 }, { 0x547A, 0xCBE2 }, { 0x547B, 0xA944 }, { 0x547C, 0xA949 }, { 0x547D, 0xA952 }, { 0x547E, 0xCBE3 }, { 0x547F, 0xCBDC },
+	{ 0x5480, 0xA943 }, { 0x5481, 0xCBDD }, { 0x5482, 0xCBDF }, { 0x5484, 0xA946 }, { 0x5486, 0xA948 }, { 0x5487, 0xCBDB }, { 0x5488, 0xCBE0 }, { 0x548B, 0xA951 },
+	{ 0x548C, 0xA94D }, { 0x548D, 0xCBE8 }, { 0x548E, 0xA953 }, { 0x5490, 0xA94A }, { 0x5491, 0xCBDE }, { 0x5492, 0xA947 }, { 0x5495, 0xA942 }, { 0x5496, 0xA940 },
+	{ 0x5498, 0xCBEC }, { 0x549A, 0xA94E }, { 0x54A0, 0xCE48 }, { 0x54A1, 0xCDFB }, { 0x54A2, 0xCE4B }, { 0x54A5, 0xCDFD }, { 0x54A6, 0xAB78 }, { 0x54A7, 0xABA8 },
+	{ 0x54A8, 0xAB74 }, { 0x54A9, 0xABA7 }, { 0x54AA, 0xAB7D }, { 0x54AB, 0xABA4 }, { 0x54AC, 0xAB72 }, { 0x54AD, 0xCDFC }, { 0x54AE, 0xCE43 }, { 0x54AF, 0xABA3 },
+	{ 0x54B0, 0xCE4F }, { 0x54B1, 0xABA5 }, { 0x54B3, 0xAB79 }, { 0x54B6, 0xCE45 }, { 0x54B7, 0xCE42 }, { 0x54B8, 0xAB77 }, { 0x54BA, 0xCDFA }, { 0x54BB, 0xABA6 },
+	{ 0x54BC, 0xCE4A }, { 0x54BD, 0xAB7C }, { 0x54BE, 0xCE4C }, { 0x54BF, 0xABA9 }, { 0x54C0, 0xAB73 }, { 0x54C1, 0xAB7E }, { 0x54C2, 0xAB7B }, { 0x54C3, 0xCE40 },
+	{ 0x54C4, 0xABA1 }, { 0x54C5, 0xCE46 }, { 0x54C6, 0xCE47 }, { 0x54C7, 0xAB7A }, { 0x54C8, 0xABA2 }, { 0x54C9, 0xAB76 }, { 0x54CE, 0xAB75 }, { 0x54CF, 0xCDFE },
+	{ 0x54D6, 0xCE44 }, { 0x54DE, 0xCE4E }, { 0x54E0, 0xD144 }, { 0x54E1, 0xADFB }, { 0x54E2, 0xD0F1 }, { 0x54E4, 0xD0F6 }, { 0x54E5, 0xADF4 }, { 0x54E6, 0xAE40 },
+	{ 0x54E7, 0xD0F4 }, { 0x54E8, 0xADEF }, { 0x54E9, 0xADF9 }, { 0x54EA, 0xADFE }, { 0x54EB, 0xD0FB }, { 0x54ED, 0xADFA }, { 0x54EE, 0xADFD }, { 0x54F1, 0xD0FE },
+	{ 0x54F2, 0xADF5 }, { 0x54F3, 0xD0F5 }, { 0x54F7, 0xD142 }, { 0x54F8, 0xD143 }, { 0x54FA, 0xADF7 }, { 0x54FB, 0xD141 }, { 0x54FC, 0xADF3 }, { 0x54FD, 0xAE43 },
+	{ 0x54FF, 0xD0F8 }, { 0x5501, 0xADF1 }, { 0x5503, 0xD146 }, { 0x5504, 0xD0F9 }, { 0x5505, 0xD0FD }, { 0x5506, 0xADF6 }, { 0x5507, 0xAE42 }, { 0x5508, 0xD0FA },
+	{ 0x5509, 0xADFC }, { 0x550A, 0xD140 }, { 0x550B, 0xD147 }, { 0x550C, 0xD4A1 }, { 0x550E, 0xD145 }, { 0x550F, 0xAE44 }, { 0x5510, 0xADF0 }, { 0x5511, 0xD0FC },
+	{ 0x5512, 0xD0F3 }, { 0x5514, 0xADF8 }, { 0x5517, 0xD0F2 }, { 0x551A, 0xD0F7 }, { 0x5526, 0xD0F0 }, { 0x5527, 0xAE41 }, { 0x552A, 0xD477 }, { 0x552C, 0xB0E4 },
+	{ 0x552D, 0xD4A7 }, { 0x552E, 0xB0E2 }, { 0x552F, 0xB0DF }, { 0x5530, 0xD47C }, { 0x5531, 0xB0DB }, { 0x5532, 0xD4A2 }, { 0x5533, 0xB0E6 }, { 0x5534, 0xD476 },
+	{ 0x5535, 0xD47B }, { 0x5536, 0xD47A }, { 0x5537, 0xADF2 }, { 0x5538, 0xB0E1 }, { 0x5539, 0xD4A5 }, { 0x553B, 0xD4A8 }, { 0x553C, 0xD473 }, { 0x553E, 0xB3E8 },
+	{ 0x5540, 0xD4A9 }, { 0x5541, 0xB0E7 }, { 0x5543, 0xB0D9 }, { 0x5544, 0xB0D6 }, { 0x5545, 0xD47E }, { 0x5546, 0xB0D3 }, { 0x5548, 0xD4A6 }, { 0x554A, 0xB0DA },
+	{ 0x554B, 0xD4AA }, { 0x554D, 0xD474 }, { 0x554E, 0xD4A4 }, { 0x554F, 0xB0DD }, { 0x5550, 0xD475 }, { 0x5551, 0xD478 }, { 0x5552, 0xD47D }, { 0x5555, 0xB0DE },
+	{ 0x5556, 0xB0DC }, { 0x5557, 0xB0E8 }, { 0x555C, 0xB0E3 }, { 0x555E, 0xB0D7 }, { 0x555F, 0xB1D2 }, { 0x5561, 0xB0D8 }, { 0x5562, 0xD479 }, { 0x5563, 0xB0E5 },
+	{ 0x5564, 0xB0E0 }, { 0x5565, 0xD4A3 }, { 0x5566, 0xB0D5 }, { 0x556A, 0xB0D4 }, { 0x5575, 0xD471 }, { 0x5576, 0xD472 }, { 0x5577, 0xD86A }, { 0x557B, 0xB3D7 },
+	{ 0x557C, 0xB3DA }, { 0x557D, 0xD875 }, { 0x557E, 0xB3EE }, { 0x557F, 0xD878 }, { 0x5580, 0xB3D8 }, { 0x5581, 0xD871 }, { 0x5582, 0xB3DE }, { 0x5583, 0xB3E4 },
+	{ 0x5584, 0xB5BD }, { 0x5587, 0xB3E2 }, { 0x5588, 0xD86E }, { 0x5589, 0xB3EF }, { 0x558A, 0xB3DB }, { 0x558B, 0xB3E3 }, { 0x558C, 0xD876 }, { 0x558D, 0xDCD7 },
+	{ 0x558E, 0xD87B }, { 0x558F, 0xD86F }, { 0x5591, 0xD866 }, { 0x5592, 0xD873 }, { 0x5593, 0xD86D }, { 0x5594, 0xB3E1 }, { 0x5595, 0xD879 }, { 0x5598, 0xB3DD },
+	{ 0x5599, 0xB3F1 }, { 0x559A, 0xB3EA }, { 0x559C, 0xB3DF }, { 0x559D, 0xB3DC }, { 0x559F, 0xB3E7 }, { 0x55A1, 0xD87A }, { 0x55A2, 0xD86C }, { 0x55A3, 0xD872 },
+	{ 0x55A4, 0xD874 }, { 0x55A5, 0xD868 }, { 0x55A6, 0xD877 }, { 0x55A7, 0xB3D9 }, { 0x55A8, 0xD867 }, { 0x55AA, 0xB3E0 }, { 0x55AB, 0xB3F0 }, { 0x55AC, 0xB3EC },
+	{ 0x55AD, 0xD869 }, { 0x55AE, 0xB3E6 }, { 0x55B1, 0xB3ED }, { 0x55B2, 0xB3E9 }, { 0x55B3, 0xB3E5 }, { 0x55B5, 0xD870 }, { 0x55BB, 0xB3EB }, { 0x55BF, 0xDCD5 },
+	{ 0x55C0, 0xDCD1 }, { 0x55C2, 0xDCE0 }, { 0x55C3, 0xDCCA }, { 0x55C4, 0xDCD3 }, { 0x55C5, 0xB6E5 }, { 0x55C6, 0xB6E6 }, { 0x55C7, 0xB6DE }, { 0x55C8, 0xDCDC },
+	{ 0x55C9, 0xB6E8 }, { 0x55CA, 0xDCCF }, { 0x55CB, 0xDCCE }, { 0x55CC, 0xDCCC }, { 0x55CD, 0xDCDE }, { 0x55CE, 0xB6DC }, { 0x55CF, 0xDCD8 }, { 0x55D0, 0xDCCD },
+	{ 0x55D1, 0xB6DF }, { 0x55D2, 0xDCD6 }, { 0x55D3, 0xB6DA }, { 0x55D4, 0xDCD2 }, { 0x55D5, 0xDCD9 }, { 0x55D6, 0xDCDB }, { 0x55D9, 0xDCDF }, { 0x55DA, 0xB6E3 },
+	{ 0x55DB, 0xDCCB }, { 0x55DC, 0xB6DD }, { 0x55DD, 0xDCD0 }, { 0x55DF, 0xB6D8 }, { 0x55E1, 0xB6E4 }, { 0x55E2, 0xDCDA }, { 0x55E3, 0xB6E0 }, { 0x55E4, 0xB6E1 },
+	{ 0x55E5, 0xB6E7 }, { 0x55E6, 0xB6DB }, { 0x55E7, 0xA25F }, { 0x55E8, 0xB6D9 }, { 0x55E9, 0xDCD4 }, { 0x55EF, 0xB6E2 }, { 0x55F2, 0xDCDD }, { 0x55F6, 0xB9CD },
+	{ 0x55F7, 0xB9C8 }, { 0x55F9, 0xE155 }, { 0x55FA, 0xE151 }, { 0x55FC, 0xE14B }, { 0x55FD, 0xB9C2 }, { 0x55FE, 0xB9BE }, { 0x55FF, 0xE154 }, { 0x5600, 0xB9BF },
+	{ 0x5601, 0xE14E }, { 0x5602, 0xE150 }, { 0x5604, 0xE153 }, { 0x5606, 0xB9C4 }, { 0x5608, 0xB9CB }, { 0x5609, 0xB9C5 }, { 0x560C, 0xE149 }, { 0x560D, 0xB9C6 },
+	{ 0x560E, 0xB9C7 }, { 0x560F, 0xE14C }, { 0x5610, 0xB9CC }, { 0x5612, 0xE14A }, { 0x5613, 0xE14F }, { 0x5614, 0xB9C3 }, { 0x5615, 0xE148 }, { 0x5616, 0xB9C9 },
+	{ 0x5617, 0xB9C1 }, { 0x561B, 0xB9C0 }, { 0x561C, 0xE14D }, { 0x561D, 0xE152 }, { 0x561F, 0xB9CA }, { 0x5627, 0xE147 }, { 0x5629, 0xBC4D }, { 0x562A, 0xE547 },
+	{ 0x562C, 0xE544 }, { 0x562E, 0xBC47 }, { 0x562F, 0xBC53 }, { 0x5630, 0xBC54 }, { 0x5632, 0xBC4A }, { 0x5633, 0xE542 }, { 0x5634, 0xBC4C }, { 0x5635, 0xE4F9 },
+	{ 0x5636, 0xBC52 }, { 0x5638, 0xE546 }, { 0x5639, 0xBC49 }, { 0x563A, 0xE548 }, { 0x563B, 0xBC48 }, { 0x563D, 0xE543 }, { 0x563E, 0xE545 }, { 0x563F, 0xBC4B },
+	{ 0x5640, 0xE541 }, { 0x5641, 0xE4FA }, { 0x5642, 0xE4F7 }, { 0x5645, 0xD86B }, { 0x5646, 0xE4FD }, { 0x5648, 0xE4F6 }, { 0x5649, 0xE4FC }, { 0x564A, 0xE4FB },
+	{ 0x564C, 0xE4F8 }, { 0x564E, 0xBC4F }, { 0x5653, 0xBC4E }, { 0x5657, 0xBC50 }, { 0x5658, 0xE4FE }, { 0x5659, 0xBEB2 }, { 0x565A, 0xE540 }, { 0x565E, 0xE945 },
+	{ 0x5660, 0xE8FD }, { 0x5662, 0xBEBE }, { 0x5663, 0xE942 }, { 0x5664, 0xBEB6 }, { 0x5665, 0xBEBA }, { 0x5666, 0xE941 }, { 0x5668, 0xBEB9 }, { 0x5669, 0xBEB5 },
+	{ 0x566A, 0xBEB8 }, { 0x566B, 0xBEB3 }, { 0x566C, 0xBEBD }, { 0x566D, 0xE943 }, { 0x566E, 0xE8FE }, { 0x566F, 0xBEBC }, { 0x5670, 0xE8FC }, { 0x5671, 0xBEBB },
+	{ 0x5672, 0xE944 }, { 0x5673, 0xE940 }, { 0x5674, 0xBC51 }, { 0x5676, 0xBEBF }, { 0x5677, 0xE946 }, { 0x5678, 0xBEB7 }, { 0x5679, 0xBEB4 }, { 0x567E, 0xECC6 },
+	{ 0x567F, 0xECC8 }, { 0x5680, 0xC07B }, { 0x5681, 0xECC9 }, { 0x5682, 0xECC7 }, { 0x5683, 0xECC5 }, { 0x5684, 0xECC4 }, { 0x5685, 0xC07D }, { 0x5686, 0xECC3 },
+	{ 0x5687, 0xC07E }, { 0x568C, 0xECC1 }, { 0x568D, 0xECC2 }, { 0x568E, 0xC07A }, { 0x568F, 0xC0A1 }, { 0x5690, 0xC07C }, { 0x5693, 0xECC0 }, { 0x5695, 0xC250 },
+	{ 0x5697, 0xEFBC }, { 0x5698, 0xEFBA }, { 0x5699, 0xEFBF }, { 0x569A, 0xEFBD }, { 0x569C, 0xEFBB }, { 0x569D, 0xEFBE }, { 0x56A5, 0xC360 }, { 0x56A6, 0xF1F2 },
+	{ 0x56A7, 0xF1F3 }, { 0x56A8, 0xC456 }, { 0x56AA, 0xF1F4 }, { 0x56AB, 0xF1F0 }, { 0x56AC, 0xF1F5 }, { 0x56AD, 0xF1F1 }, { 0x56AE, 0xC251 }, { 0x56B2, 0xF3FE },
+	{ 0x56B3, 0xF441 }, { 0x56B4, 0xC459 }, { 0x56B5, 0xF440 }, { 0x56B6, 0xC458 }, { 0x56B7, 0xC457 }, { 0x56BC, 0xC45A }, { 0x56BD, 0xF5C5 }, { 0x56BE, 0xF5C6 },
+	{ 0x56C0, 0xC4DA }, { 0x56C1, 0xC4D9 }, { 0x56C2, 0xC4DB }, { 0x56C3, 0xF5C4 }, { 0x56C5, 0xF6D8 }, { 0x56C6, 0xF6D7 }, { 0x56C8, 0xC56D }, { 0x56C9, 0xC56F },
+	{ 0x56CA, 0xC56E }, { 0x56CB, 0xF6D9 }, { 0x56CC, 0xC5C8 }, { 0x56CD, 0xF8A6 }, { 0x56D1, 0xC5F1 }, { 0x56D3, 0xF8A5 }, { 0x56D4, 0xF8EE }, { 0x56D7, 0xC949 },
+	{ 0x56DA, 0xA57D }, { 0x56DB, 0xA57C }, { 0x56DD, 0xA65F }, { 0x56DE, 0xA65E }, { 0x56DF, 0xC9C7 }, { 0x56E0, 0xA65D }, { 0x56E1, 0xC9C6 }, { 0x56E4, 0xA779 },
+	{ 0x56E5, 0xCAA9 }, { 0x56E7, 0xCAA8 }, { 0x56EA, 0xA777 }, { 0x56EB, 0xA77A }, { 0x56EE, 0xCAA7 }, { 0x56F0, 0xA778 }, { 0x56F7, 0xCBF0 }, { 0x56F9, 0xCBF1 },
+	{ 0x56FA, 0xA954 }, { 0x56FF, 0xABAA }, { 0x5701, 0xD148 }, { 0x5702, 0xD149 }, { 0x5703, 0xAE45 }, { 0x5704, 0xAE46 }, { 0x5707, 0xD4AC }, { 0x5708, 0xB0E9 },
+	{ 0x5709, 0xB0EB }, { 0x570A, 0xD4AB }, { 0x570B, 0xB0EA }, { 0x570C, 0xD87C }, { 0x570D, 0xB3F2 }, { 0x5712, 0xB6E9 }, { 0x5713, 0xB6EA }, { 0x5714, 0xDCE1 },
+	{ 0x5716, 0xB9CF }, { 0x5718, 0xB9CE }, { 0x571A, 0xE549 }, { 0x571B, 0xE948 }, { 0x571C, 0xE947 }, { 0x571E, 0xF96B }, { 0x571F, 0xA467 }, { 0x5720, 0xC959 },
+	{ 0x5722, 0xC96E }, { 0x5723, 0xC96F }, { 0x5728, 0xA662 }, { 0x5729, 0xA666 }, { 0x572A, 0xC9C9 }, { 0x572C, 0xA664 }, { 0x572D, 0xA663 }, { 0x572E, 0xC9C8 },
+	{ 0x572F, 0xA665 }, { 0x5730, 0xA661 }, { 0x5733, 0xA660 }, { 0x5734, 0xC9CA }, { 0x573B, 0xA7A6 }, { 0x573E, 0xA7A3 }, { 0x5740, 0xA77D }, { 0x5741, 0xCAAA },
+	{ 0x5745, 0xCAAB }, { 0x5747, 0xA7A1 }, { 0x5749, 0xCAAD }, { 0x574A, 0xA77B }, { 0x574B, 0xCAAE }, { 0x574C, 0xCAAC }, { 0x574D, 0xA77E }, { 0x574E, 0xA7A2 },
+	{ 0x574F, 0xA7A5 }, { 0x5750, 0xA7A4 }, { 0x5751, 0xA77C }, { 0x5752, 0xCAAF }, { 0x5761, 0xA959 }, { 0x5762, 0xCBFE }, { 0x5764, 0xA95B }, { 0x5766, 0xA95A },
+	{ 0x5768, 0xCC40 }, { 0x5769, 0xA958 }, { 0x576A, 0xA957 }, { 0x576B, 0xCBF5 }, { 0x576D, 0xCBF4 }, { 0x576F, 0xCBF2 }, { 0x5770, 0xCBF7 }, { 0x5771, 0xCBF6 },
+	{ 0x5772, 0xCBF3 }, { 0x5773, 0xCBFC }, { 0x5774, 0xCBFD }, { 0x5775, 0xCBFA }, { 0x5776, 0xCBF8 }, { 0x5777, 0xA956 }, { 0x577B, 0xCBFB }, { 0x577C, 0xA95C },
+	{ 0x577D, 0xCC41 }, { 0x5780, 0xCBF9 }, { 0x5782, 0xABAB }, { 0x5783, 0xA955 }, { 0x578B, 0xABAC }, { 0x578C, 0xCE54 }, { 0x578F, 0xCE5A }, { 0x5793, 0xABB2 },
+	{ 0x5794, 0xCE58 }, { 0x5795, 0xCE5E }, { 0x5797, 0xCE55 }, { 0x5798, 0xCE59 }, { 0x5799, 0xCE5B }, { 0x579A, 0xCE5D }, { 0x579B, 0xCE57 }, { 0x579D, 0xCE56 },
+	{ 0x579E, 0xCE51 }, { 0x579F, 0xCE52 }, { 0x57A0, 0xABAD }, { 0x57A2, 0xABAF }, { 0x57A3, 0xABAE }, { 0x57A4, 0xCE53 }, { 0x57A5, 0xCE5C }, { 0x57AE, 0xABB1 },
+	{ 0x57B5, 0xCE50 }, { 0x57B6, 0xD153 }, { 0x57B8, 0xD152 }, { 0x57B9, 0xD157 }, { 0x57BA, 0xD14E }, { 0x57BC, 0xD151 }, { 0x57BD, 0xD150 }, { 0x57BF, 0xD154 },
+	{ 0x57C1, 0xD158 }, { 0x57C2, 0xAE47 }, { 0x57C3, 0xAE4A }, { 0x57C6, 0xD14F }, { 0x57C7, 0xD155 }, { 0x57CB, 0xAE49 }, { 0x57CC, 0xD14A }, { 0x57CE, 0xABB0 },
+	{ 0x57CF, 0xD4BA }, { 0x57D0, 0xD156 }, { 0x57D2, 0xD14D }, { 0x57D4, 0xAE48 }, { 0x57D5, 0xD14C }, { 0x57DC, 0xD4B1 }, { 0x57DF, 0xB0EC }, { 0x57E0, 0xB0F0 },
+	{ 0x57E1, 0xD4C1 }, { 0x57E2, 0xD4AF }, { 0x57E3, 0xD4BD }, { 0x57E4, 0xB0F1 }, { 0x57E5, 0xD4BF }, { 0x57E7, 0xD4C5 }, { 0x57E9, 0xD4C9 }, { 0x57EC, 0xD4C0 },
+	{ 0x57ED, 0xD4B4 }, { 0x57EE, 0xD4BC }, { 0x57F0, 0xD4CA }, { 0x57F1, 0xD4C8 }, { 0x57F2, 0xD4BE }, { 0x57F3, 0xD4B9 }, { 0x57F4, 0xD4B2 }, { 0x57F5, 0xD8A6 },
+	{ 0x57F6, 0xD4B0 }, { 0x57F7, 0xB0F5 }, { 0x57F8, 0xD4B7 }, { 0x57F9, 0xB0F6 }, { 0x57FA, 0xB0F2 }, { 0x57FB, 0xD4AD }, { 0x57FC, 0xD4C3 }, { 0x57FD, 0xD4B5 },
+	{ 0x5800, 0xD4B3 }, { 0x5801, 0xD4C6 }, { 0x5802, 0xB0F3 }, { 0x5804, 0xD4CC }, { 0x5805, 0xB0ED }, { 0x5806, 0xB0EF }, { 0x5807, 0xD4BB }, { 0x5808, 0xD4B6 },
+	{ 0x5809, 0xAE4B }, { 0x580A, 0xB0EE }, { 0x580B, 0xD4B8 }, { 0x580C, 0xD4C7 }, { 0x580D, 0xD4CB }, { 0x580E, 0xD4C2 }, { 0x5810, 0xD4C4 }, { 0x5814, 0xD4AE },
+	{ 0x5819, 0xD8A1 }, { 0x581B, 0xD8AA }, { 0x581C, 0xD8A9 }, { 0x581D, 0xB3FA }, { 0x581E, 0xD8A2 }, { 0x5820, 0xB3FB }, { 0x5821, 0xB3F9 }, { 0x5823, 0xD8A4 },
+	{ 0x5824, 0xB3F6 }, { 0x5825, 0xD8A8 }, { 0x5827, 0xD8A3 }, { 0x5828, 0xD8A5 }, { 0x5829, 0xD87D }, { 0x582A, 0xB3F4 }, { 0x582C, 0xD8B2 }, { 0x582D, 0xD8B1 },
+	{ 0x582E, 0xD8AE }, { 0x582F, 0xB3F3 }, { 0x5830, 0xB3F7 }, { 0x5831, 0xB3F8 }, { 0x5832, 0xD14B }, { 0x5833, 0xD8AB }, { 0x5834, 0xB3F5 }, { 0x5835, 0xB0F4 },
+	{ 0x5836, 0xD8AD }, { 0x5837, 0xD87E }, { 0x5838, 0xD8B0 }, { 0x5839, 0xD8AF }, { 0x583B, 0xD8B3 }, { 0x583D, 0xDCEF }, { 0x583F, 0xD8AC }, { 0x5848, 0xD8A7 },
+	{ 0x5849, 0xDCE7 }, { 0x584A, 0xB6F4 }, { 0x584B, 0xB6F7 }, { 0x584C, 0xB6F2 }, { 0x584D, 0xDCE6 }, { 0x584E, 0xDCEA }, { 0x584F, 0xDCE5 }, { 0x5851, 0xB6EC },
+	{ 0x5852, 0xB6F6 }, { 0x5853, 0xDCE2 }, { 0x5854, 0xB6F0 }, { 0x5855, 0xDCE9 }, { 0x5857, 0xB6EE }, { 0x5858, 0xB6ED }, { 0x5859, 0xDCEC }, { 0x585A, 0xB6EF },
+	{ 0x585B, 0xDCEE }, { 0x585D, 0xDCEB }, { 0x585E, 0xB6EB }, { 0x5862, 0xB6F5 }, { 0x5863, 0xDCF0 }, { 0x5864, 0xDCE4 }, { 0x5865, 0xDCED }, { 0x5868, 0xDCE3 },
+	{ 0x586B, 0xB6F1 }, { 0x586D, 0xB6F3 }, { 0x586F, 0xDCE8 }, { 0x5871, 0xDCF1 }, { 0x5874, 0xE15D }, { 0x5875, 0xB9D0 }, { 0x5876, 0xE163 }, { 0x5879, 0xB9D5 },
+	{ 0x587A, 0xE15F }, { 0x587B, 0xE166 }, { 0x587C, 0xE157 }, { 0x587D, 0xB9D7 }, { 0x587E, 0xB9D1 }, { 0x587F, 0xE15C }, { 0x5880, 0xBC55 }, { 0x5881, 0xE15B },
+	{ 0x5882, 0xE164 }, { 0x5883, 0xB9D2 }, { 0x5885, 0xB9D6 }, { 0x5886, 0xE15A }, { 0x5887, 0xE160 }, { 0x5888, 0xE165 }, { 0x5889, 0xE156 }, { 0x588A, 0xB9D4 },
+	{ 0x588B, 0xE15E }, { 0x588E, 0xE162 }, { 0x588F, 0xE168 }, { 0x5890, 0xE158 }, { 0x5891, 0xE161 }, { 0x5893, 0xB9D3 }, { 0x5894, 0xE167 }, { 0x5898, 0xE159 },
+	{ 0x589C, 0xBC59 }, { 0x589D, 0xE54B }, { 0x589E, 0xBC57 }, { 0x589F, 0xBC56 }, { 0x58A0, 0xE54D }, { 0x58A1, 0xE552 }, { 0x58A3, 0xE54E }, { 0x58A5, 0xE551 },
+	{ 0x58A6, 0xBC5C }, { 0x58A8, 0xBEA5 }, { 0x58A9, 0xBC5B }, { 0x58AB, 0xE54A }, { 0x58AC, 0xE550 }, { 0x58AE, 0xBC5A }, { 0x58AF, 0xE54F }, { 0x58B1, 0xE54C },
+	{ 0x58B3, 0xBC58 }, { 0x58BA, 0xE94D }, { 0x58BC, 0xE94F }, { 0x58BD, 0xE94A }, { 0x58BE, 0xBEC1 }, { 0x58BF, 0xE94C }, { 0x58C1, 0xBEC0 }, { 0x58C2, 0xE94E },
+	{ 0x58C5, 0xBEC3 }, { 0x58C6, 0xE950 }, { 0x58C7, 0xBEC2 }, { 0x58C8, 0xE949 }, { 0x58C9, 0xE94B }, { 0x58CE, 0xC0A5 }, { 0x58CF, 0xECCC }, { 0x58D1, 0xC0A4 },
+	{ 0x58D2, 0xECCD }, { 0x58D3, 0xC0A3 }, { 0x58D4, 0xECCB }, { 0x58D5, 0xC0A2 }, { 0x58D6, 0xECCA }, { 0x58D8, 0xC253 }, { 0x58D9, 0xC252 }, { 0x58DA, 0xF1F6 },
+	{ 0x58DB, 0xF1F8 }, { 0x58DD, 0xF1F7 }, { 0x58DE, 0xC361 }, { 0x58DF, 0xC362 }, { 0x58E2, 0xC363 }, { 0x58E3, 0xF442 }, { 0x58E4, 0xC45B }, { 0x58E7, 0xF7D3 },
+	{ 0x58E8, 0xF7D2 }, { 0x58E9, 0xC5F2 }, { 0x58EB, 0xA468 }, { 0x58EC, 0xA4D0 }, { 0x58EF, 0xA7A7 }, { 0x58F4, 0xCE5F }, { 0x58F9, 0xB3FC }, { 0x58FA, 0xB3FD },
+	{ 0x58FC, 0xDCF2 }, { 0x58FD, 0xB9D8 }, { 0x58FE, 0xE169 }, { 0x58FF, 0xE553 }, { 0x5903, 0xC95A }, { 0x5906, 0xCAB0 }, { 0x590C, 0xCC42 }, { 0x590D, 0xCE60 },
+	{ 0x590E, 0xD159 }, { 0x590F, 0xAE4C }, { 0x5912, 0xF1F9 }, { 0x5914, 0xC4DC }, { 0x5915, 0xA469 }, { 0x5916, 0xA57E }, { 0x5917, 0xC970 }, { 0x5919, 0xA667 },
+	{ 0x591A, 0xA668 }, { 0x591C, 0xA95D }, { 0x5920, 0xB0F7 }, { 0x5922, 0xB9DA }, { 0x5924, 0xB9DB }, { 0x5925, 0xB9D9 }, { 0x5927, 0xA46A }, { 0x5929, 0xA4D1 },
+	{ 0x592A, 0xA4D3 }, { 0x592B, 0xA4D2 }, { 0x592C, 0xC95B }, { 0x592D, 0xA4D4 }, { 0x592E, 0xA5A1 }, { 0x592F, 0xC971 }, { 0x5931, 0xA5A2 }, { 0x5937, 0xA669 },
+	{ 0x5938, 0xA66A }, { 0x593C, 0xC9CB }, { 0x593E, 0xA7A8 }, { 0x5940, 0xCAB1 }, { 0x5944, 0xA961 }, { 0x5945, 0xCC43 }, { 0x5947, 0xA95F }, { 0x5948, 0xA960 },
+	{ 0x5949, 0xA95E }, { 0x594A, 0xD15A }, { 0x594E, 0xABB6 }, { 0x594F, 0xABB5 }, { 0x5950, 0xABB7 }, { 0x5951, 0xABB4 }, { 0x5953, 0xCE61 }, { 0x5954, 0xA962 },
+	{ 0x5955, 0xABB3 }, { 0x5957, 0xAE4D }, { 0x5958, 0xAE4E }, { 0x595A, 0xAE4F }, { 0x595C, 0xD4CD }, { 0x5960, 0xB3FE }, { 0x5961, 0xD8B4 }, { 0x5962, 0xB0F8 },
+	{ 0x5967, 0xB6F8 }, { 0x5969, 0xB9DD }, { 0x596A, 0xB9DC }, { 0x596B, 0xE16A }, { 0x596D, 0xBC5D }, { 0x596E, 0xBEC4 }, { 0x5970, 0xEFC0 }, { 0x5971, 0xF6DA },
+	{ 0x5972, 0xF7D4 }, { 0x5973, 0xA46B }, { 0x5974, 0xA5A3 }, { 0x5976, 0xA5A4 }, { 0x5977, 0xC9D1 }, { 0x5978, 0xA66C }, { 0x5979, 0xA66F }, { 0x597B, 0xC9CF },
+	{ 0x597C, 0xC9CD }, { 0x597D, 0xA66E }, { 0x597E, 0xC9D0 }, { 0x597F, 0xC9D2 }, { 0x5980, 0xC9CC }, { 0x5981, 0xA671 }, { 0x5982, 0xA670 }, { 0x5983, 0xA66D },
+	{ 0x5984, 0xA66B }, { 0x5985, 0xC9CE }, { 0x598A, 0xA7B3 }, { 0x598D, 0xA7B0 }, { 0x598E, 0xCAB6 }, { 0x598F, 0xCAB9 }, { 0x5990, 0xCAB8 }, { 0x5992, 0xA7AA },
+	{ 0x5993, 0xA7B2 }, { 0x5996, 0xA7AF }, { 0x5997, 0xCAB5 }, { 0x5998, 0xCAB3 }, { 0x5999, 0xA7AE }, { 0x599D, 0xA7A9 }, { 0x599E, 0xA7AC }, { 0x59A0, 0xCAB4 },
+	{ 0x59A1, 0xCABB }, { 0x59A2, 0xCAB7 }, { 0x59A3, 0xA7AD }, { 0x59A4, 0xA7B1 }, { 0x59A5, 0xA7B4 }, { 0x59A6, 0xCAB2 }, { 0x59A7, 0xCABA }, { 0x59A8, 0xA7AB },
+	{ 0x59AE, 0xA967 }, { 0x59AF, 0xA96F }, { 0x59B1, 0xCC4F }, { 0x59B2, 0xCC48 }, { 0x59B3, 0xA970 }, { 0x59B4, 0xCC53 }, { 0x59B5, 0xCC44 }, { 0x59B6, 0xCC4B },
+	{ 0x59B9, 0xA966 }, { 0x59BA, 0xCC45 }, { 0x59BB, 0xA964 }, { 0x59BC, 0xCC4C }, { 0x59BD, 0xCC50 }, { 0x59BE, 0xA963 }, { 0x59C0, 0xCC51 }, { 0x59C1, 0xCC4A },
+	{ 0x59C3, 0xCC4D }, { 0x59C5, 0xA972 }, { 0x59C6, 0xA969 }, { 0x59C7, 0xCC54 }, { 0x59C8, 0xCC52 }, { 0x59CA, 0xA96E }, { 0x59CB, 0xA96C }, { 0x59CC, 0xCC49 },
+	{ 0x59CD, 0xA96B }, { 0x59CE, 0xCC47 }, { 0x59CF, 0xCC46 }, { 0x59D0, 0xA96A }, { 0x59D1, 0xA968 }, { 0x59D2, 0xA971 }, { 0x59D3, 0xA96D }, { 0x59D4, 0xA965 },
+	{ 0x59D6, 0xCC4E }, { 0x59D8, 0xABB9 }, { 0x59DA, 0xABC0 }, { 0x59DB, 0xCE6F }, { 0x59DC, 0xABB8 }, { 0x59DD, 0xCE67 }, { 0x59DE, 0xCE63 }, { 0x59E0, 0xCE73 },
+	{ 0x59E1, 0xCE62 }, { 0x59E3, 0xABBB }, { 0x59E4, 0xCE6C }, { 0x59E5, 0xABBE }, { 0x59E6, 0xABC1 }, { 0x59E8, 0xABBC }, { 0x59E9, 0xCE70 }, { 0x59EA, 0xABBF },
+	{ 0x59EC, 0xAE56 }, { 0x59ED, 0xCE76 }, { 0x59EE, 0xCE64 }, { 0x59F1, 0xCE66 }, { 0x59F2, 0xCE6D }, { 0x59F3, 0xCE71 }, { 0x59F4, 0xCE75 }, { 0x59F5, 0xCE72 },
+	{ 0x59F6, 0xCE6B }, { 0x59F7, 0xCE6E }, { 0x59FA, 0xCE68 }, { 0x59FB, 0xABC3 }, { 0x59FC, 0xCE6A }, { 0x59FD, 0xCE69 }, { 0x59FE, 0xCE74 }, { 0x59FF, 0xABBA },
+	{ 0x5A00, 0xCE65 }, { 0x5A01, 0xABC2 }, { 0x5A03, 0xABBD }, { 0x5A09, 0xAE5C }, { 0x5A0A, 0xD162 }, { 0x5A0C, 0xAE5B }, { 0x5A0F, 0xD160 }, { 0x5A11, 0xAE50 },
+	{ 0x5A13, 0xAE55 }, { 0x5A15, 0xD15F }, { 0x5A16, 0xD15C }, { 0x5A17, 0xD161 }, { 0x5A18, 0xAE51 }, { 0x5A19, 0xD15B }, { 0x5A1B, 0xAE54 }, { 0x5A1C, 0xAE52 },
+	{ 0x5A1E, 0xD163 }, { 0x5A1F, 0xAE53 }, { 0x5A20, 0xAE57 }, { 0x5A23, 0xAE58 }, { 0x5A25, 0xAE5A }, { 0x5A29, 0xAE59 }, { 0x5A2D, 0xD15D }, { 0x5A2E, 0xD15E },
+	{ 0x5A33, 0xD164 }, { 0x5A35, 0xD4D4 }, { 0x5A36, 0xB0F9 }, { 0x5A37, 0xD8C2 }, { 0x5A38, 0xD4D3 }, { 0x5A39, 0xD4E6 }, { 0x5A3C, 0xB140 }, { 0x5A3E, 0xD4E4 },
+	{ 0x5A40, 0xB0FE }, { 0x5A41, 0xB0FA }, { 0x5A42, 0xD4ED }, { 0x5A43, 0xD4DD }, { 0x5A44, 0xD4E0 }, { 0x5A46, 0xB143 }, { 0x5A47, 0xD4EA }, { 0x5A48, 0xD4E2 },
+	{ 0x5A49, 0xB0FB }, { 0x5A4A, 0xB144 }, { 0x5A4C, 0xD4E7 }, { 0x5A4D, 0xD4E5 }, { 0x5A50, 0xD4D6 }, { 0x5A51, 0xD4EB }, { 0x5A52, 0xD4DF }, { 0x5A53, 0xD4DA },
+	{ 0x5A55, 0xD4D0 }, { 0x5A56, 0xD4EC }, { 0x5A57, 0xD4DC }, { 0x5A58, 0xD4CF }, { 0x5A5A, 0xB142 }, { 0x5A5B, 0xD4E1 }, { 0x5A5C, 0xD4EE }, { 0x5A5D, 0xD4DE },
+	{ 0x5A5E, 0xD4D2 }, { 0x5A5F, 0xD4D7 }, { 0x5A60, 0xD4CE }, { 0x5A62, 0xB141 }, { 0x5A64, 0xD4DB }, { 0x5A65, 0xD4D8 }, { 0x5A66, 0xB0FC }, { 0x5A67, 0xD4D1 },
+	{ 0x5A69, 0xD4E9 }, { 0x5A6A, 0xB0FD }, { 0x5A6C, 0xD4D9 }, { 0x5A6D, 0xD4D5 }, { 0x5A70, 0xD4E8 }, { 0x5A77, 0xB440 }, { 0x5A78, 0xD8BB }, { 0x5A7A, 0xD8B8 },
+	{ 0x5A7B, 0xD8C9 }, { 0x5A7C, 0xD8BD }, { 0x5A7D, 0xD8CA }, { 0x5A7F, 0xB442 }, { 0x5A83, 0xD8C6 }, { 0x5A84, 0xD8C3 }, { 0x5A8A, 0xD8C4 }, { 0x5A8B, 0xD8C7 },
+	{ 0x5A8C, 0xD8CB }, { 0x5A8E, 0xD4E3 }, { 0x5A8F, 0xD8CD }, { 0x5A90, 0xDD47 }, { 0x5A92, 0xB443 }, { 0x5A93, 0xD8CE }, { 0x5A94, 0xD8B6 }, { 0x5A95, 0xD8C0 },
+	{ 0x5A97, 0xD8C5 }, { 0x5A9A, 0xB441 }, { 0x5A9B, 0xB444 }, { 0x5A9C, 0xD8CC }, { 0x5A9D, 0xD8CF }, { 0x5A9E, 0xD8BA }, { 0x5A9F, 0xD8B7 }, { 0x5AA2, 0xD8B9 },
+	{ 0x5AA5, 0xD8BE }, { 0x5AA6, 0xD8BC }, { 0x5AA7, 0xB445 }, { 0x5AA9, 0xD8C8 }, { 0x5AAC, 0xD8BF }, { 0x5AAE, 0xD8C1 }, { 0x5AAF, 0xD8B5 }, { 0x5AB0, 0xDCFA },
+	{ 0x5AB1, 0xDCF8 }, { 0x5AB2, 0xB742 }, { 0x5AB3, 0xB740 }, { 0x5AB4, 0xDD43 }, { 0x5AB5, 0xDCF9 }, { 0x5AB6, 0xDD44 }, { 0x5AB7, 0xDD40 }, { 0x5AB8, 0xDCF7 },
+	{ 0x5AB9, 0xDD46 }, { 0x5ABA, 0xDCF6 }, { 0x5ABB, 0xDCFD }, { 0x5ABC, 0xB6FE }, { 0x5ABD, 0xB6FD }, { 0x5ABE, 0xB6FC }, { 0x5ABF, 0xDCFB }, { 0x5AC0, 0xDD41 },
+	{ 0x5AC1, 0xB6F9 }, { 0x5AC2, 0xB741 }, { 0x5AC4, 0xDCF4 }, { 0x5AC6, 0xDCFE }, { 0x5AC7, 0xDCF3 }, { 0x5AC8, 0xDCFC }, { 0x5AC9, 0xB6FA }, { 0x5ACA, 0xDD42 },
+	{ 0x5ACB, 0xDCF5 }, { 0x5ACC, 0xB6FB }, { 0x5ACD, 0xDD45 }, { 0x5AD5, 0xE16E }, { 0x5AD6, 0xB9E2 }, { 0x5AD7, 0xB9E1 }, { 0x5AD8, 0xB9E3 }, { 0x5AD9, 0xE17A },
+	{ 0x5ADA, 0xE170 }, { 0x5ADB, 0xE176 }, { 0x5ADC, 0xE16B }, { 0x5ADD, 0xE179 }, { 0x5ADE, 0xE178 }, { 0x5ADF, 0xE17C }, { 0x5AE0, 0xE175 }, { 0x5AE1, 0xB9DE },
+	{ 0x5AE2, 0xE174 }, { 0x5AE3, 0xB9E4 }, { 0x5AE5, 0xE16D }, { 0x5AE6, 0xB9DF }, { 0x5AE8, 0xE17B }, { 0x5AE9, 0xB9E0 }, { 0x5AEA, 0xE16F }, { 0x5AEB, 0xE172 },
+	{ 0x5AEC, 0xE177 }, { 0x5AED, 0xE171 }, { 0x5AEE, 0xE16C }, { 0x5AF3, 0xE173 }, { 0x5AF4, 0xE555 }, { 0x5AF5, 0xBC61 }, { 0x5AF6, 0xE558 }, { 0x5AF7, 0xE557 },
+	{ 0x5AF8, 0xE55A }, { 0x5AF9, 0xE55C }, { 0x5AFB, 0xBC5F }, { 0x5AFD, 0xE556 }, { 0x5AFF, 0xE554 }, { 0x5B01, 0xE55D }, { 0x5B02, 0xE55B }, { 0x5B03, 0xE559 },
+	{ 0x5B05, 0xE55F }, { 0x5B07, 0xE55E }, { 0x5B08, 0xBC63 }, { 0x5B09, 0xBC5E }, { 0x5B0B, 0xBC60 }, { 0x5B0C, 0xBC62 }, { 0x5B0F, 0xE560 }, { 0x5B10, 0xE957 },
+	{ 0x5B13, 0xE956 }, { 0x5B14, 0xE955 }, { 0x5B16, 0xE958 }, { 0x5B17, 0xE951 }, { 0x5B19, 0xE952 }, { 0x5B1A, 0xE95A }, { 0x5B1B, 0xE953 }, { 0x5B1D, 0xBEC5 },
+	{ 0x5B1E, 0xE95C }, { 0x5B20, 0xE95B }, { 0x5B21, 0xE954 }, { 0x5B23, 0xECD1 }, { 0x5B24, 0xC0A8 }, { 0x5B25, 0xECCF }, { 0x5B26, 0xECD4 }, { 0x5B27, 0xECD3 },
+	{ 0x5B28, 0xE959 }, { 0x5B2A, 0xC0A7 }, { 0x5B2C, 0xECD2 }, { 0x5B2D, 0xECCE }, { 0x5B2E, 0xECD6 }, { 0x5B2F, 0xECD5 }, { 0x5B30, 0xC0A6 }, { 0x5B32, 0xECD0 },
+	{ 0x5B34, 0xBEC6 }, { 0x5B38, 0xC254 }, { 0x5B3C, 0xEFC1 }, { 0x5B3D, 0xF1FA }, { 0x5B3E, 0xF1FB }, { 0x5B3F, 0xF1FC }, { 0x5B40, 0xC45C }, { 0x5B43, 0xC45D },
+	{ 0x5B45, 0xF443 }, { 0x5B47, 0xF5C8 }, { 0x5B48, 0xF5C7 }, { 0x5B4B, 0xF6DB }, { 0x5B4C, 0xF6DC }, { 0x5B4D, 0xF7D5 }, { 0x5B4E, 0xF8A7 }, { 0x5B50, 0xA46C },
+	{ 0x5B51, 0xA46D }, { 0x5B53, 0xA46E }, { 0x5B54, 0xA4D5 }, { 0x5B55, 0xA5A5 }, { 0x5B56, 0xC9D3 }, { 0x5B57, 0xA672 }, { 0x5B58, 0xA673 }, { 0x5B5A, 0xA7B7 },
+	{ 0x5B5B, 0xA7B8 }, { 0x5B5C, 0xA7B6 }, { 0x5B5D, 0xA7B5 }, { 0x5B5F, 0xA973 }, { 0x5B62, 0xCC55 }, { 0x5B63, 0xA975 }, { 0x5B64, 0xA974 }, { 0x5B65, 0xCC56 },
+	{ 0x5B69, 0xABC4 }, { 0x5B6B, 0xAE5D }, { 0x5B6C, 0xD165 }, { 0x5B6E, 0xD4F0 }, { 0x5B70, 0xB145 }, { 0x5B71, 0xB447 }, { 0x5B72, 0xD4EF }, { 0x5B73, 0xB446 },
+	{ 0x5B75, 0xB9E5 }, { 0x5B77, 0xE17D }, { 0x5B78, 0xBEC7 }, { 0x5B7A, 0xC0A9 }, { 0x5B7B, 0xECD7 }, { 0x5B7D, 0xC45E }, { 0x5B7F, 0xC570 }, { 0x5B81, 0xC972 },
+	{ 0x5B83, 0xA5A6 }, { 0x5B84, 0xC973 }, { 0x5B85, 0xA676 }, { 0x5B87, 0xA674 }, { 0x5B88, 0xA675 }, { 0x5B89, 0xA677 }, { 0x5B8B, 0xA7BA }, { 0x5B8C, 0xA7B9 },
+	{ 0x5B8E, 0xCABC }, { 0x5B8F, 0xA7BB }, { 0x5B92, 0xCABD }, { 0x5B93, 0xCC57 }, { 0x5B95, 0xCC58 }, { 0x5B97, 0xA976 }, { 0x5B98, 0xA978 }, { 0x5B99, 0xA97A },
+	{ 0x5B9A, 0xA977 }, { 0x5B9B, 0xA97B }, { 0x5B9C, 0xA979 }, { 0x5BA2, 0xABC8 }, { 0x5BA3, 0xABC5 }, { 0x5BA4, 0xABC7 }, { 0x5BA5, 0xABC9 }, { 0x5BA6, 0xABC6 },
+	{ 0x5BA7, 0xD166 }, { 0x5BA8, 0xCE77 }, { 0x5BAC, 0xD168 }, { 0x5BAD, 0xD167 }, { 0x5BAE, 0xAE63 }, { 0x5BB0, 0xAE5F }, { 0x5BB3, 0xAE60 }, { 0x5BB4, 0xAE62 },
+	{ 0x5BB5, 0xAE64 }, { 0x5BB6, 0xAE61 }, { 0x5BB8, 0xAE66 }, { 0x5BB9, 0xAE65 }, { 0x5BBF, 0xB14A }, { 0x5BC0, 0xD4F2 }, { 0x5BC1, 0xD4F1 }, { 0x5BC2, 0xB149 },
+	{ 0x5BC4, 0xB148 }, { 0x5BC5, 0xB147 }, { 0x5BC6, 0xB14B }, { 0x5BC7, 0xB146 }, { 0x5BCA, 0xD8D5 }, { 0x5BCB, 0xD8D2 }, { 0x5BCC, 0xB449 }, { 0x5BCD, 0xD8D1 },
+	{ 0x5BCE, 0xD8D6 }, { 0x5BD0, 0xB44B }, { 0x5BD1, 0xD8D4 }, { 0x5BD2, 0xB448 }, { 0x5BD3, 0xB44A }, { 0x5BD4, 0xD8D3 }, { 0x5BD6, 0xDD48 }, { 0x5BD8, 0xDD49 },
+	{ 0x5BD9, 0xDD4A }, { 0x5BDE, 0xB9E6 }, { 0x5BDF, 0xB9EE }, { 0x5BE0, 0xE17E }, { 0x5BE1, 0xB9E8 }, { 0x5BE2, 0xB9EC }, { 0x5BE3, 0xE1A1 }, { 0x5BE4, 0xB9ED },
+	{ 0x5BE5, 0xB9E9 }, { 0x5BE6, 0xB9EA }, { 0x5BE7, 0xB9E7 }, { 0x5BE8, 0xB9EB }, { 0x5BE9, 0xBC66 }, { 0x5BEA, 0xD8D0 }, { 0x5BEB, 0xBC67 }, { 0x5BEC, 0xBC65 },
+	{ 0x5BEE, 0xBC64 }, { 0x5BEF, 0xE95D }, { 0x5BF0, 0xBEC8 }, { 0x5BF1, 0xECD8 }, { 0x5BF2, 0xECD9 }, { 0x5BF5, 0xC364 }, { 0x5BF6, 0xC45F }, { 0x5BF8, 0xA46F },
+	{ 0x5BFA, 0xA678 }, { 0x5C01, 0xABCA }, { 0x5C03, 0xD169 }, { 0x5C04, 0xAE67 }, { 0x5C07, 0xB14E }, { 0x5C08, 0xB14D }, { 0x5C09, 0xB14C }, { 0x5C0A, 0xB44C },
+	{ 0x5C0B, 0xB44D }, { 0x5C0C, 0xD8D7 }, { 0x5C0D, 0xB9EF }, { 0x5C0E, 0xBEC9 }, { 0x5C0F, 0xA470 }, { 0x5C10, 0xC95C }, { 0x5C11, 0xA4D6 }, { 0x5C12, 0xC974 },
+	{ 0x5C15, 0xC9D4 }, { 0x5C16, 0xA679 }, { 0x5C1A, 0xA97C }, { 0x5C1F, 0xDD4B }, { 0x5C22, 0xA471 }, { 0x5C24, 0xA4D7 }, { 0x5C25, 0xC9D5 }, { 0x5C28, 0xCABE },
+	{ 0x5C2A, 0xCABF }, { 0x5C2C, 0xA7BC }, { 0x5C30, 0xD8D8 }, { 0x5C31, 0xB44E }, { 0x5C33, 0xDD4C }, { 0x5C37, 0xC0AA }, { 0x5C38, 0xA472 }, { 0x5C39, 0xA4A8 },
+	{ 0x5C3A, 0xA4D8 }, { 0x5C3B, 0xC975 }, { 0x5C3C, 0xA5A7 }, { 0x5C3E, 0xA7C0 }, { 0x5C3F, 0xA7BF }, { 0x5C40, 0xA7BD }, { 0x5C41, 0xA7BE }, { 0x5C44, 0xCC59 },
+	{ 0x5C45, 0xA97E }, { 0x5C46, 0xA9A1 }, { 0x5C47, 0xCC5A }, { 0x5C48, 0xA97D }, { 0x5C4B, 0xABCE }, { 0x5C4C, 0xCE78 }, { 0x5C4D, 0xABCD }, { 0x5C4E, 0xABCB },
+	{ 0x5C4F, 0xABCC }, { 0x5C50, 0xAE6A }, { 0x5C51, 0xAE68 }, { 0x5C54, 0xD16B }, { 0x5C55, 0xAE69 }, { 0x5C56, 0xD16A }, { 0x5C58, 0xAE5E }, { 0x5C59, 0xD4F3 },
+	{ 0x5C5C, 0xB150 }, { 0x5C5D, 0xB151 }, { 0x5C60, 0xB14F }, { 0x5C62, 0xB9F0 }, { 0x5C63, 0xE1A2 }, { 0x5C64, 0xBC68 }, { 0x5C65, 0xBC69 }, { 0x5C67, 0xE561 },
+	{ 0x5C68, 0xC0AB }, { 0x5C69, 0xEFC2 }, { 0x5C6A, 0xEFC3 }, { 0x5C6C, 0xC4DD }, { 0x5C6D, 0xF8A8 }, { 0x5C6E, 0xC94B }, { 0x5C6F, 0xA4D9 }, { 0x5C71, 0xA473 },
+	{ 0x5C73, 0xC977 }, { 0x5C74, 0xC976 }, { 0x5C79, 0xA67A }, { 0x5C7A, 0xC9D7 }, { 0x5C7B, 0xC9D8 }, { 0x5C7C, 0xC9D6 }, { 0x5C7E, 0xC9D9 }, { 0x5C86, 0xCAC7 },
+	{ 0x5C88, 0xCAC2 }, { 0x5C89, 0xCAC4 }, { 0x5C8A, 0xCAC6 }, { 0x5C8B, 0xCAC3 }, { 0x5C8C, 0xA7C4 }, { 0x5C8D, 0xCAC0 }, { 0x5C8F, 0xCAC1 }, { 0x5C90, 0xA7C1 },
+	{ 0x5C91, 0xA7C2 }, { 0x5C92, 0xCAC5 }, { 0x5C93, 0xCAC8 }, { 0x5C94, 0xA7C3 }, { 0x5C95, 0xCAC9 }, { 0x5C9D, 0xCC68 }, { 0x5C9F, 0xCC62 }, { 0x5CA0, 0xCC5D },
+	{ 0x5CA1, 0xA9A3 }, { 0x5CA2, 0xCC65 }, { 0x5CA3, 0xCC63 }, { 0x5CA4, 0xCC5C }, { 0x5CA5, 0xCC69 }, { 0x5CA6, 0xCC6C }, { 0x5CA7, 0xCC67 }, { 0x5CA8, 0xCC60 },
+	{ 0x5CA9, 0xA9A5 }, { 0x5CAA, 0xCC66 }, { 0x5CAB, 0xA9A6 }, { 0x5CAC, 0xCC61 }, { 0x5CAD, 0xCC64 }, { 0x5CAE, 0xCC5B }, { 0x5CAF, 0xCC5F }, { 0x5CB0, 0xCC6B },
+	{ 0x5CB1, 0xA9A7 }, { 0x5CB3, 0xA9A8 }, { 0x5CB5, 0xCC5E }, { 0x5CB6, 0xCC6A }, { 0x5CB7, 0xA9A2 }, { 0x5CB8, 0xA9A4 }, { 0x5CC6, 0xCEAB }, { 0x5CC7, 0xCEA4 },
+	{ 0x5CC8, 0xCEAA }, { 0x5CC9, 0xCEA3 }, { 0x5CCA, 0xCEA5 }, { 0x5CCB, 0xCE7D }, { 0x5CCC, 0xCE7B }, { 0x5CCE, 0xCEAC }, { 0x5CCF, 0xCEA9 }, { 0x5CD0, 0xCE79 },
+	{ 0x5CD2, 0xABD0 }, { 0x5CD3, 0xCEA7 }, { 0x5CD4, 0xCEA8 }, { 0x5CD6, 0xCEA6 }, { 0x5CD7, 0xCE7C }, { 0x5CD8, 0xCE7A }, { 0x5CD9, 0xABCF }, { 0x5CDA, 0xCEA2 },
+	{ 0x5CDB, 0xCE7E }, { 0x5CDE, 0xCEA1 }, { 0x5CDF, 0xCEAD }, { 0x5CE8, 0xAE6F }, { 0x5CEA, 0xAE6E }, { 0x5CEC, 0xD16C }, { 0x5CED, 0xAE6B }, { 0x5CEE, 0xD16E },
+	{ 0x5CF0, 0xAE70 }, { 0x5CF1, 0xD16F }, { 0x5CF4, 0xAE73 }, { 0x5CF6, 0xAE71 }, { 0x5CF7, 0xD170 }, { 0x5CF8, 0xCEAE }, { 0x5CF9, 0xD172 }, { 0x5CFB, 0xAE6D },
+	{ 0x5CFD, 0xAE6C }, { 0x5CFF, 0xD16D }, { 0x5D00, 0xD171 }, { 0x5D01, 0xAE72 }, { 0x5D06, 0xB153 }, { 0x5D07, 0xB152 }, { 0x5D0B, 0xD4F5 }, { 0x5D0C, 0xD4F9 },
+	{ 0x5D0D, 0xD4FB }, { 0x5D0E, 0xB154 }, { 0x5D0F, 0xD4FE }, { 0x5D11, 0xB158 }, { 0x5D12, 0xD541 }, { 0x5D14, 0xB15A }, { 0x5D16, 0xB156 }, { 0x5D17, 0xB15E },
+	{ 0x5D19, 0xB15B }, { 0x5D1A, 0xD4F7 }, { 0x5D1B, 0xB155 }, { 0x5D1D, 0xD4F6 }, { 0x5D1E, 0xD4F4 }, { 0x5D1F, 0xD543 }, { 0x5D20, 0xD4F8 }, { 0x5D22, 0xB157 },
+	{ 0x5D23, 0xD542 }, { 0x5D24, 0xB15C }, { 0x5D25, 0xD4FD }, { 0x5D26, 0xD4FC }, { 0x5D27, 0xB15D }, { 0x5D28, 0xD4FA }, { 0x5D29, 0xB159 }, { 0x5D2E, 0xD544 },
+	{ 0x5D30, 0xD540 }, { 0x5D31, 0xD8E7 }, { 0x5D32, 0xD8EE }, { 0x5D33, 0xD8E3 }, { 0x5D34, 0xB451 }, { 0x5D35, 0xD8DF }, { 0x5D36, 0xD8EF }, { 0x5D37, 0xD8D9 },
+	{ 0x5D38, 0xD8EC }, { 0x5D39, 0xD8EA }, { 0x5D3A, 0xD8E4 }, { 0x5D3C, 0xD8ED }, { 0x5D3D, 0xD8E6 }, { 0x5D3F, 0xD8DE }, { 0x5D40, 0xD8F0 }, { 0x5D41, 0xD8DC },
+	{ 0x5D42, 0xD8E9 }, { 0x5D43, 0xD8DA }, { 0x5D45, 0xD8F1 }, { 0x5D47, 0xB452 }, { 0x5D49, 0xD8EB }, { 0x5D4A, 0xDD4F }, { 0x5D4B, 0xD8DD }, { 0x5D4C, 0xB44F },
+	{ 0x5D4E, 0xD8E1 }, { 0x5D50, 0xB450 }, { 0x5D51, 0xD8E0 }, { 0x5D52, 0xD8E5 }, { 0x5D55, 0xD8E2 }, { 0x5D59, 0xD8E8 }, { 0x5D5E, 0xDD53 }, { 0x5D62, 0xDD56 },
+	{ 0x5D63, 0xDD4E }, { 0x5D65, 0xDD50 }, { 0x5D67, 0xDD55 }, { 0x5D68, 0xDD54 }, { 0x5D69, 0xB743 }, { 0x5D6B, 0xD8DB }, { 0x5D6C, 0xDD52 }, { 0x5D6F, 0xB744 },
+	{ 0x5D71, 0xDD4D }, { 0x5D72, 0xDD51 }, { 0x5D77, 0xE1A9 }, { 0x5D79, 0xE1B0 }, { 0x5D7A, 0xE1A7 }, { 0x5D7C, 0xE1AE }, { 0x5D7D, 0xE1A5 }, { 0x5D7E, 0xE1AD },
+	{ 0x5D7F, 0xE1B1 }, { 0x5D80, 0xE1A4 }, { 0x5D81, 0xE1A8 }, { 0x5D82, 0xE1A3 }, { 0x5D84, 0xB9F1 }, { 0x5D86, 0xE1A6 }, { 0x5D87, 0xB9F2 }, { 0x5D88, 0xE1AC },
+	{ 0x5D89, 0xE1AB }, { 0x5D8A, 0xE1AA }, { 0x5D8D, 0xE1AF }, { 0x5D92, 0xE565 }, { 0x5D93, 0xE567 }, { 0x5D94, 0xBC6B }, { 0x5D95, 0xE568 }, { 0x5D97, 0xE563 },
+	{ 0x5D99, 0xE562 }, { 0x5D9A, 0xE56C }, { 0x5D9C, 0xE56A }, { 0x5D9D, 0xBC6A }, { 0x5D9E, 0xE56D }, { 0x5D9F, 0xE564 }, { 0x5DA0, 0xE569 }, { 0x5DA1, 0xE56B },
+	{ 0x5DA2, 0xE566 }, { 0x5DA7, 0xE961 }, { 0x5DA8, 0xE966 }, { 0x5DA9, 0xE960 }, { 0x5DAA, 0xE965 }, { 0x5DAC, 0xE95E }, { 0x5DAD, 0xE968 }, { 0x5DAE, 0xE964 },
+	{ 0x5DAF, 0xE969 }, { 0x5DB0, 0xE963 }, { 0x5DB1, 0xE95F }, { 0x5DB2, 0xE967 }, { 0x5DB4, 0xE96A }, { 0x5DB5, 0xE962 }, { 0x5DB7, 0xECDA }, { 0x5DB8, 0xC0AF },
+	{ 0x5DBA, 0xC0AD }, { 0x5DBC, 0xC0AC }, { 0x5DBD, 0xC0AE }, { 0x5DC0, 0xEFC4 }, { 0x5DC2, 0xF172 }, { 0x5DC3, 0xF1FD }, { 0x5DC6, 0xF444 }, { 0x5DC7, 0xF445 },
+	{ 0x5DC9, 0xC460 }, { 0x5DCB, 0xF5C9 }, { 0x5DCD, 0xC4DE }, { 0x5DCF, 0xF5CA }, { 0x5DD1, 0xF6DE }, { 0x5DD2, 0xC572 }, { 0x5DD4, 0xC571 }, { 0x5DD5, 0xF6DD },
+	{ 0x5DD6, 0xC5C9 }, { 0x5DD8, 0xF7D6 }, { 0x5DDD, 0xA474 }, { 0x5DDE, 0xA67B }, { 0x5DDF, 0xC9DA }, { 0x5DE0, 0xCACA }, { 0x5DE1, 0xA8B5 }, { 0x5DE2, 0xB15F },
+	{ 0x5DE5, 0xA475 }, { 0x5DE6, 0xA5AA }, { 0x5DE7, 0xA5A9 }, { 0x5DE8, 0xA5A8 }, { 0x5DEB, 0xA7C5 }, { 0x5DEE, 0xAE74 }, { 0x5DF0, 0xDD57 }, { 0x5DF1, 0xA476 },
+	{ 0x5DF2, 0xA477 }, { 0x5DF3, 0xA478 }, { 0x5DF4, 0xA4DA }, { 0x5DF7, 0xABD1 }, { 0x5DF9, 0xCEAF }, { 0x5DFD, 0xB453 }, { 0x5DFE, 0xA479 }, { 0x5DFF, 0xC95D },
+	{ 0x5E02, 0xA5AB }, { 0x5E03, 0xA5AC }, { 0x5E04, 0xC978 }, { 0x5E06, 0xA67C }, { 0x5E0A, 0xCACB }, { 0x5E0C, 0xA7C6 }, { 0x5E0E, 0xCACC }, { 0x5E11, 0xA9AE },
+	{ 0x5E14, 0xCC6E }, { 0x5E15, 0xA9AC }, { 0x5E16, 0xA9AB }, { 0x5E17, 0xCC6D }, { 0x5E18, 0xA9A9 }, { 0x5E19, 0xCC6F }, { 0x5E1A, 0xA9AA }, { 0x5E1B, 0xA9AD },
+	{ 0x5E1D, 0xABD2 }, { 0x5E1F, 0xABD4 }, { 0x5E20, 0xCEB3 }, { 0x5E21, 0xCEB0 }, { 0x5E22, 0xCEB1 }, { 0x5E23, 0xCEB2 }, { 0x5E24, 0xCEB4 }, { 0x5E25, 0xABD3 },
+	{ 0x5E28, 0xD174 }, { 0x5E29, 0xD173 }, { 0x5E2B, 0xAE76 }, { 0x5E2D, 0xAE75 }, { 0x5E33, 0xB162 }, { 0x5E34, 0xD546 }, { 0x5E36, 0xB161 }, { 0x5E37, 0xB163 },
+	{ 0x5E38, 0xB160 }, { 0x5E3D, 0xB455 }, { 0x5E3E, 0xD545 }, { 0x5E40, 0xB456 }, { 0x5E41, 0xD8F3 }, { 0x5E43, 0xB457 }, { 0x5E44, 0xD8F2 }, { 0x5E45, 0xB454 },
+	{ 0x5E4A, 0xDD5A }, { 0x5E4B, 0xDD5C }, { 0x5E4C, 0xB745 }, { 0x5E4D, 0xDD5B }, { 0x5E4E, 0xDD59 }, { 0x5E4F, 0xDD58 }, { 0x5E53, 0xE1B4 }, { 0x5E54, 0xB9F7 },
+	{ 0x5E55, 0xB9F5 }, { 0x5E57, 0xB9F6 }, { 0x5E58, 0xE1B2 }, { 0x5E59, 0xE1B3 }, { 0x5E5B, 0xB9F3 }, { 0x5E5C, 0xE571 }, { 0x5E5D, 0xE56F }, { 0x5E5F, 0xBC6D },
+	{ 0x5E60, 0xE570 }, { 0x5E61, 0xBC6E }, { 0x5E62, 0xBC6C }, { 0x5E63, 0xB9F4 }, { 0x5E66, 0xE96D }, { 0x5E67, 0xE96B }, { 0x5E68, 0xE96C }, { 0x5E69, 0xE56E },
+	{ 0x5E6A, 0xECDC }, { 0x5E6B, 0xC0B0 }, { 0x5E6C, 0xECDB }, { 0x5E6D, 0xEFC5 }, { 0x5E6E, 0xEFC6 }, { 0x5E6F, 0xE96E }, { 0x5E70, 0xF1FE }, { 0x5E72, 0xA47A },
+	{ 0x5E73, 0xA5AD }, { 0x5E74, 0xA67E }, { 0x5E75, 0xC9DB }, { 0x5E76, 0xA67D }, { 0x5E78, 0xA9AF }, { 0x5E79, 0xB746 }, { 0x5E7B, 0xA4DB }, { 0x5E7C, 0xA5AE },
+	{ 0x5E7D, 0xABD5 }, { 0x5E7E, 0xB458 }, { 0x5E80, 0xC979 }, { 0x5E82, 0xC97A }, { 0x5E84, 0xC9DC }, { 0x5E87, 0xA7C8 }, { 0x5E88, 0xCAD0 }, { 0x5E89, 0xCACE },
+	{ 0x5E8A, 0xA7C9 }, { 0x5E8B, 0xCACD }, { 0x5E8C, 0xCACF }, { 0x5E8D, 0xCAD1 }, { 0x5E8F, 0xA7C7 }, { 0x5E95, 0xA9B3 }, { 0x5E96, 0xA9B4 }, { 0x5E97, 0xA9B1 },
+	{ 0x5E9A, 0xA9B0 }, { 0x5E9B, 0xCEB8 }, { 0x5E9C, 0xA9B2 }, { 0x5EA0, 0xABD6 }, { 0x5EA2, 0xCEB7 }, { 0x5EA3, 0xCEB9 }, { 0x5EA4, 0xCEB6 }, { 0x5EA5, 0xCEBA },
+	{ 0x5EA6, 0xABD7 }, { 0x5EA7, 0xAE79 }, { 0x5EA8, 0xD175 }, { 0x5EAA, 0xD177 }, { 0x5EAB, 0xAE77 }, { 0x5EAC, 0xD178 }, { 0x5EAD, 0xAE78 }, { 0x5EAE, 0xD176 },
+	{ 0x5EB0, 0xCEB5 }, { 0x5EB1, 0xD547 }, { 0x5EB2, 0xD54A }, { 0x5EB3, 0xD54B }, { 0x5EB4, 0xD548 }, { 0x5EB5, 0xB167 }, { 0x5EB6, 0xB166 }, { 0x5EB7, 0xB164 },
+	{ 0x5EB8, 0xB165 }, { 0x5EB9, 0xD549 }, { 0x5EBE, 0xB168 }, { 0x5EC1, 0xB45A }, { 0x5EC2, 0xB45B }, { 0x5EC4, 0xB45C }, { 0x5EC5, 0xDD5D }, { 0x5EC6, 0xDD5F },
+	{ 0x5EC7, 0xDD61 }, { 0x5EC8, 0xB748 }, { 0x5EC9, 0xB747 }, { 0x5ECA, 0xB459 }, { 0x5ECB, 0xDD60 }, { 0x5ECC, 0xDD5E }, { 0x5ECE, 0xE1B8 }, { 0x5ED1, 0xE1B6 },
+	{ 0x5ED2, 0xE1BC }, { 0x5ED3, 0xB9F8 }, { 0x5ED4, 0xE1BD }, { 0x5ED5, 0xE1BA }, { 0x5ED6, 0xB9F9 }, { 0x5ED7, 0xE1B7 }, { 0x5ED8, 0xE1B5 }, { 0x5ED9, 0xE1BB },
+	{ 0x5EDA, 0xBC70 }, { 0x5EDB, 0xE573 }, { 0x5EDC, 0xE1B9 }, { 0x5EDD, 0xBC72 }, { 0x5EDE, 0xE574 }, { 0x5EDF, 0xBC71 }, { 0x5EE0, 0xBC74 }, { 0x5EE1, 0xE575 },
+	{ 0x5EE2, 0xBC6F }, { 0x5EE3, 0xBC73 }, { 0x5EE5, 0xE973 }, { 0x5EE6, 0xE971 }, { 0x5EE7, 0xE970 }, { 0x5EE8, 0xE972 }, { 0x5EE9, 0xE96F }, { 0x5EEC, 0xC366 },
+	{ 0x5EEE, 0xF446 }, { 0x5EEF, 0xF447 }, { 0x5EF1, 0xF5CB }, { 0x5EF2, 0xF6DF }, { 0x5EF3, 0xC655 }, { 0x5EF6, 0xA9B5 }, { 0x5EF7, 0xA7CA }, { 0x5EFA, 0xABD8 },
+	{ 0x5EFE, 0xA47B }, { 0x5EFF, 0xA4DC }, { 0x5F01, 0xA5AF }, { 0x5F02, 0xC9DD }, { 0x5F04, 0xA7CB }, { 0x5F05, 0xCAD2 }, { 0x5F07, 0xCEBB }, { 0x5F08, 0xABD9 },
+	{ 0x5F0A, 0xB9FA }, { 0x5F0B, 0xA47C }, { 0x5F0F, 0xA6A1 }, { 0x5F12, 0xB749 }, { 0x5F13, 0xA47D }, { 0x5F14, 0xA4DD }, { 0x5F15, 0xA4DE }, { 0x5F17, 0xA5B1 },
+	{ 0x5F18, 0xA5B0 }, { 0x5F1A, 0xC9DE }, { 0x5F1B, 0xA6A2 }, { 0x5F1D, 0xCAD3 }, { 0x5F1F, 0xA7CC }, { 0x5F22, 0xCC71 }, { 0x5F23, 0xCC72 }, { 0x5F24, 0xCC73 },
+	{ 0x5F26, 0xA9B6 }, { 0x5F27, 0xA9B7 }, { 0x5F28, 0xCC70 }, { 0x5F29, 0xA9B8 }, { 0x5F2D, 0xABDA }, { 0x5F2E, 0xCEBC }, { 0x5F30, 0xD17A }, { 0x5F31, 0xAE7A },
+	{ 0x5F33, 0xD179 }, { 0x5F35, 0xB169 }, { 0x5F36, 0xD54C }, { 0x5F37, 0xB16A }, { 0x5F38, 0xD54D }, { 0x5F3C, 0xB45D }, { 0x5F40, 0xDD62 }, { 0x5F43, 0xE1BF },
+	{ 0x5F44, 0xE1BE }, { 0x5F46, 0xB9FB }, { 0x5F48, 0xBC75 }, { 0x5F49, 0xE576 }, { 0x5F4A, 0xBECA }, { 0x5F4B, 0xE974 }, { 0x5F4C, 0xC0B1 }, { 0x5F4E, 0xC573 },
+	{ 0x5F4F, 0xF7D8 }, { 0x5F54, 0xCC74 }, { 0x5F56, 0xCEBD }, { 0x5F57, 0xB16B }, { 0x5F58, 0xD8F4 }, { 0x5F59, 0xB74A }, { 0x5F5D, 0xC255 }, { 0x5F62, 0xA7CE },
+	{ 0x5F64, 0xA7CD }, { 0x5F65, 0xABDB }, { 0x5F67, 0xD17B }, { 0x5F69, 0xB16D }, { 0x5F6A, 0xB343 }, { 0x5F6B, 0xB16E }, { 0x5F6C, 0xB16C }, { 0x5F6D, 0xB45E },
+	{ 0x5F6F, 0xE1C0 }, { 0x5F70, 0xB9FC }, { 0x5F71, 0xBC76 }, { 0x5F73, 0xC94C }, { 0x5F74, 0xC9DF }, { 0x5F76, 0xCAD5 }, { 0x5F77, 0xA7CF }, { 0x5F78, 0xCAD4 },
+	{ 0x5F79, 0xA7D0 }, { 0x5F7C, 0xA9BC }, { 0x5F7D, 0xCC77 }, { 0x5F7E, 0xCC76 }, { 0x5F7F, 0xA9BB }, { 0x5F80, 0xA9B9 }, { 0x5F81, 0xA9BA }, { 0x5F82, 0xCC75 },
+	{ 0x5F85, 0xABDD }, { 0x5F86, 0xCEBE }, { 0x5F87, 0xABE0 }, { 0x5F88, 0xABDC }, { 0x5F89, 0xABE2 }, { 0x5F8A, 0xABDE }, { 0x5F8B, 0xABDF }, { 0x5F8C, 0xABE1 },
+	{ 0x5F90, 0xAE7D }, { 0x5F91, 0xAE7C }, { 0x5F92, 0xAE7B }, { 0x5F96, 0xD54F }, { 0x5F97, 0xB16F }, { 0x5F98, 0xB172 }, { 0x5F99, 0xB170 }, { 0x5F9B, 0xD54E },
+	{ 0x5F9C, 0xB175 }, { 0x5F9E, 0xB171 }, { 0x5F9F, 0xD550 }, { 0x5FA0, 0xB174 }, { 0x5FA1, 0xB173 }, { 0x5FA5, 0xD8F6 }, { 0x5FA6, 0xD8F5 }, { 0x5FA8, 0xB461 },
+	{ 0x5FA9, 0xB45F }, { 0x5FAA, 0xB460 }, { 0x5FAB, 0xD8F7 }, { 0x5FAC, 0xB74B }, { 0x5FAD, 0xDD64 }, { 0x5FAE, 0xB74C }, { 0x5FAF, 0xDD63 }, { 0x5FB2, 0xE577 },
+	{ 0x5FB5, 0xBC78 }, { 0x5FB6, 0xE1C1 }, { 0x5FB7, 0xBC77 }, { 0x5FB9, 0xB9FD }, { 0x5FBB, 0xECDE }, { 0x5FBC, 0xE975 }, { 0x5FBD, 0xC0B2 }, { 0x5FBE, 0xECDD },
+	{ 0x5FBF, 0xF240 }, { 0x5FC0, 0xF448 }, { 0x5FC1, 0xF449 }, { 0x5FC3, 0xA4DF }, { 0x5FC5, 0xA5B2 }, { 0x5FC9, 0xC97B }, { 0x5FCC, 0xA7D2 }, { 0x5FCD, 0xA7D4 },
+	{ 0x5FCF, 0xC9E2 }, { 0x5FD0, 0xCAD8 }, { 0x5FD1, 0xCAD7 }, { 0x5FD2, 0xCAD6 }, { 0x5FD4, 0xC9E1 }, { 0x5FD5, 0xC9E0 }, { 0x5FD6, 0xA6A4 }, { 0x5FD7, 0xA7D3 },
+	{ 0x5FD8, 0xA7D1 }, { 0x5FD9, 0xA6A3 }, { 0x5FDD, 0xA9BD }, { 0x5FDE, 0xCC78 }, { 0x5FE0, 0xA9BE }, { 0x5FE1, 0xCADD }, { 0x5FE3, 0xCADF }, { 0x5FE4, 0xCADE },
+	{ 0x5FE5, 0xCC79 }, { 0x5FE8, 0xCADA }, { 0x5FEA, 0xA7D8 }, { 0x5FEB, 0xA7D6 }, { 0x5FED, 0xCAD9 }, { 0x5FEE, 0xCADB }, { 0x5FEF, 0xCAE1 }, { 0x5FF1, 0xA7D5 },
+	{ 0x5FF3, 0xCADC }, { 0x5FF4, 0xCAE5 }, { 0x5FF5, 0xA9C0 }, { 0x5FF7, 0xCAE2 }, { 0x5FF8, 0xA7D7 }, { 0x5FFA, 0xCAE0 }, { 0x5FFB, 0xCAE3 }, { 0x5FFD, 0xA9BF },
+	{ 0x5FFF, 0xA9C1 }, { 0x6000, 0xCAE4 }, { 0x6009, 0xCCAF }, { 0x600A, 0xCCA2 }, { 0x600B, 0xCC7E }, { 0x600C, 0xCCAE }, { 0x600D, 0xCCA9 }, { 0x600E, 0xABE7 },
+	{ 0x600F, 0xA9C2 }, { 0x6010, 0xCCAA }, { 0x6011, 0xCCAD }, { 0x6012, 0xABE3 }, { 0x6013, 0xCCAC }, { 0x6014, 0xA9C3 }, { 0x6015, 0xA9C8 }, { 0x6016, 0xA9C6 },
+	{ 0x6017, 0xCCA3 }, { 0x6019, 0xCC7C }, { 0x601A, 0xCCA5 }, { 0x601B, 0xA9CD }, { 0x601C, 0xCCB0 }, { 0x601D, 0xABE4 }, { 0x601E, 0xCCA6 }, { 0x6020, 0xABE5 },
+	{ 0x6021, 0xA9C9 }, { 0x6022, 0xCCA8 }, { 0x6024, 0xCECD }, { 0x6025, 0xABE6 }, { 0x6026, 0xCC7B }, { 0x6027, 0xA9CA }, { 0x6028, 0xABE8 }, { 0x6029, 0xA9CB },
+	{ 0x602A, 0xA9C7 }, { 0x602B, 0xA9CC }, { 0x602C, 0xCCA7 }, { 0x602D, 0xCC7A }, { 0x602E, 0xCCAB }, { 0x602F, 0xA9C4 }, { 0x6032, 0xCC7D }, { 0x6033, 0xCCA4 },
+	{ 0x6034, 0xCCA1 }, { 0x6035, 0xA9C5 }, { 0x6037, 0xCEBF }, { 0x6039, 0xCEC0 }, { 0x6040, 0xCECA }, { 0x6041, 0xD1A1 }, { 0x6042, 0xCECB }, { 0x6043, 0xABEE },
+	{ 0x6044, 0xCECE }, { 0x6045, 0xCEC4 }, { 0x6046, 0xABED }, { 0x6047, 0xCEC6 }, { 0x6049, 0xCEC7 }, { 0x604C, 0xCEC9 }, { 0x604D, 0xABE9 }, { 0x6050, 0xAEA3 },
+	{ 0x6053, 0xCEC5 }, { 0x6054, 0xCEC1 }, { 0x6055, 0xAEA4 }, { 0x6058, 0xCECF }, { 0x6059, 0xAE7E }, { 0x605A, 0xD17D }, { 0x605B, 0xCEC8 }, { 0x605D, 0xD17C },
+	{ 0x605E, 0xCEC3 }, { 0x605F, 0xCECC }, { 0x6062, 0xABEC }, { 0x6063, 0xAEA1 }, { 0x6064, 0xABF2 }, { 0x6065, 0xAEA2 }, { 0x6066, 0xCED0 }, { 0x6067, 0xD17E },
+	{ 0x6068, 0xABEB }, { 0x6069, 0xAEA6 }, { 0x606A, 0xABF1 }, { 0x606B, 0xABF0 }, { 0x606C, 0xABEF }, { 0x606D, 0xAEA5 }, { 0x606E, 0xCED1 }, { 0x606F, 0xAEA7 },
+	{ 0x6070, 0xABEA }, { 0x6072, 0xCEC2 }, { 0x607F, 0xB176 }, { 0x6080, 0xD1A4 }, { 0x6081, 0xD1A6 }, { 0x6083, 0xD1A8 }, { 0x6084, 0xAEA8 }, { 0x6085, 0xAEAE },
+	{ 0x6086, 0xD553 }, { 0x6087, 0xD1AC }, { 0x6088, 0xD1A3 }, { 0x6089, 0xB178 }, { 0x608A, 0xD551 }, { 0x608C, 0xAEAD }, { 0x608D, 0xAEAB }, { 0x608E, 0xD1AE },
+	{ 0x6090, 0xD552 }, { 0x6092, 0xD1A5 }, { 0x6094, 0xAEAC }, { 0x6095, 0xD1A9 }, { 0x6096, 0xAEAF }, { 0x6097, 0xD1AB }, { 0x609A, 0xAEAA }, { 0x609B, 0xD1AA },
+	{ 0x609C, 0xD1AD }, { 0x609D, 0xD1A7 }, { 0x609F, 0xAEA9 }, { 0x60A0, 0xB179 }, { 0x60A2, 0xD1A2 }, { 0x60A3, 0xB177 }, { 0x60A8, 0xB17A }, { 0x60B0, 0xD555 },
+	{ 0x60B1, 0xD55E }, { 0x60B2, 0xB464 }, { 0x60B4, 0xB17C }, { 0x60B5, 0xB1A3 }, { 0x60B6, 0xB465 }, { 0x60B7, 0xD560 }, { 0x60B8, 0xB1AA }, { 0x60B9, 0xD8F9 },
+	{ 0x60BA, 0xD556 }, { 0x60BB, 0xB1A2 }, { 0x60BC, 0xB1A5 }, { 0x60BD, 0xB17E }, { 0x60BE, 0xD554 }, { 0x60BF, 0xD562 }, { 0x60C0, 0xD565 }, { 0x60C1, 0xD949 },
+	{ 0x60C3, 0xD563 }, { 0x60C4, 0xD8FD }, { 0x60C5, 0xB1A1 }, { 0x60C6, 0xB1A8 }, { 0x60C7, 0xB1AC }, { 0x60C8, 0xD55D }, { 0x60C9, 0xD8F8 }, { 0x60CA, 0xD561 },
+	{ 0x60CB, 0xB17B }, { 0x60CC, 0xD8FA }, { 0x60CD, 0xD564 }, { 0x60CE, 0xD8FC }, { 0x60CF, 0xD559 }, { 0x60D1, 0xB462 }, { 0x60D3, 0xD557 }, { 0x60D4, 0xD558 },
+	{ 0x60D5, 0xB1A7 }, { 0x60D8, 0xB1A6 }, { 0x60D9, 0xD55B }, { 0x60DA, 0xB1AB }, { 0x60DB, 0xD55F }, { 0x60DC, 0xB1A4 }, { 0x60DD, 0xD55C }, { 0x60DF, 0xB1A9 },
+	{ 0x60E0, 0xB466 }, { 0x60E1, 0xB463 }, { 0x60E2, 0xD8FB }, { 0x60E4, 0xD55A }, { 0x60E6, 0xB17D }, { 0x60F0, 0xB46B }, { 0x60F1, 0xB46F }, { 0x60F2, 0xD940 },
+	{ 0x60F3, 0xB751 }, { 0x60F4, 0xB46D }, { 0x60F5, 0xD944 }, { 0x60F6, 0xB471 }, { 0x60F7, 0xDD65 }, { 0x60F8, 0xD946 }, { 0x60F9, 0xB753 }, { 0x60FA, 0xB469 },
+	{ 0x60FB, 0xB46C }, { 0x60FC, 0xD947 }, { 0x60FE, 0xD948 }, { 0x60FF, 0xD94E }, { 0x6100, 0xB473 }, { 0x6101, 0xB754 }, { 0x6103, 0xD94A }, { 0x6104, 0xD94F },
+	{ 0x6105, 0xD943 }, { 0x6106, 0xB75E }, { 0x6108, 0xB755 }, { 0x6109, 0xB472 }, { 0x610A, 0xD941 }, { 0x610B, 0xD950 }, { 0x610D, 0xB75D }, { 0x610E, 0xB470 },
+	{ 0x610F, 0xB74E }, { 0x6110, 0xD94D }, { 0x6112, 0xB474 }, { 0x6113, 0xD945 }, { 0x6114, 0xD8FE }, { 0x6115, 0xB46A }, { 0x6116, 0xD942 }, { 0x6118, 0xD94B },
+	{ 0x611A, 0xB74D }, { 0x611B, 0xB752 }, { 0x611C, 0xB467 }, { 0x611D, 0xD94C }, { 0x611F, 0xB750 }, { 0x6123, 0xB468 }, { 0x6127, 0xB75C }, { 0x6128, 0xE1C3 },
+	{ 0x6129, 0xDD70 }, { 0x612B, 0xDD68 }, { 0x612C, 0xE1C2 }, { 0x612E, 0xDD6C }, { 0x612F, 0xDD6E }, { 0x6132, 0xDD6B }, { 0x6134, 0xB75B }, { 0x6136, 0xDD6A },
+	{ 0x6137, 0xB75F }, { 0x613B, 0xE1D2 }, { 0x613E, 0xB75A }, { 0x613F, 0xBA40 }, { 0x6140, 0xDD71 }, { 0x6141, 0xE1C4 }, { 0x6144, 0xB758 }, { 0x6145, 0xDD69 },
+	{ 0x6146, 0xDD6D }, { 0x6147, 0xB9FE }, { 0x6148, 0xB74F }, { 0x6149, 0xDD66 }, { 0x614A, 0xDD67 }, { 0x614B, 0xBA41 }, { 0x614C, 0xB757 }, { 0x614D, 0xB759 },
+	{ 0x614E, 0xB756 }, { 0x614F, 0xDD6F }, { 0x6152, 0xE1C8 }, { 0x6153, 0xE1C9 }, { 0x6154, 0xE1CE }, { 0x6155, 0xBC7D }, { 0x6156, 0xE1D5 }, { 0x6158, 0xBA47 },
+	{ 0x615A, 0xBA46 }, { 0x615B, 0xE1D0 }, { 0x615D, 0xBC7C }, { 0x615E, 0xE1C5 }, { 0x615F, 0xBA45 }, { 0x6161, 0xE1D4 }, { 0x6162, 0xBA43 }, { 0x6163, 0xBA44 },
+	{ 0x6165, 0xE1D1 }, { 0x6166, 0xE5AA }, { 0x6167, 0xBC7A }, { 0x6168, 0xB46E }, { 0x616A, 0xE1D3 }, { 0x616B, 0xBCA3 }, { 0x616C, 0xE1CB }, { 0x616E, 0xBC7B },
+	{ 0x6170, 0xBCA2 }, { 0x6171, 0xE1C6 }, { 0x6172, 0xE1CA }, { 0x6173, 0xE1C7 }, { 0x6174, 0xE1CD }, { 0x6175, 0xBA48 }, { 0x6176, 0xBC79 }, { 0x6177, 0xBA42 },
+	{ 0x6179, 0xE57A }, { 0x617A, 0xE1CF }, { 0x617C, 0xBCA1 }, { 0x617E, 0xBCA4 }, { 0x6180, 0xE1CC }, { 0x6182, 0xBC7E }, { 0x6183, 0xE579 }, { 0x6189, 0xE57E },
+	{ 0x618A, 0xBECE }, { 0x618B, 0xE578 }, { 0x618C, 0xE9A3 }, { 0x618D, 0xE5A9 }, { 0x618E, 0xBCA8 }, { 0x6190, 0xBCA6 }, { 0x6191, 0xBECC }, { 0x6192, 0xE5A6 },
+	{ 0x6193, 0xE5A2 }, { 0x6194, 0xBCAC }, { 0x6196, 0xE978 }, { 0x619A, 0xBCAA }, { 0x619B, 0xE5A1 }, { 0x619D, 0xE976 }, { 0x619F, 0xE5A5 }, { 0x61A1, 0xE5A8 },
+	{ 0x61A2, 0xE57D }, { 0x61A4, 0xBCAB }, { 0x61A7, 0xBCA5 }, { 0x61A8, 0xE977 }, { 0x61A9, 0xBECD }, { 0x61AA, 0xE5A7 }, { 0x61AB, 0xBCA7 }, { 0x61AC, 0xBCA9 },
+	{ 0x61AD, 0xE5A4 }, { 0x61AE, 0xBCAD }, { 0x61AF, 0xE5A3 }, { 0x61B0, 0xE57C }, { 0x61B1, 0xE57B }, { 0x61B2, 0xBECB }, { 0x61B3, 0xE5AB }, { 0x61B4, 0xE97A },
+	{ 0x61B5, 0xECE0 }, { 0x61B6, 0xBED0 }, { 0x61B8, 0xE9A2 }, { 0x61BA, 0xE97E }, { 0x61BC, 0xECE1 }, { 0x61BE, 0xBED1 }, { 0x61BF, 0xE9A1 }, { 0x61C1, 0xE97C },
+	{ 0x61C2, 0xC0B4 }, { 0x61C3, 0xECDF }, { 0x61C5, 0xE979 }, { 0x61C6, 0xE97B }, { 0x61C7, 0xC0B5 }, { 0x61C8, 0xBED3 }, { 0x61C9, 0xC0B3 }, { 0x61CA, 0xBED2 },
+	{ 0x61CB, 0xC0B7 }, { 0x61CC, 0xE97D }, { 0x61CD, 0xBECF }, { 0x61D6, 0xEFCF }, { 0x61D8, 0xEFC7 }, { 0x61DE, 0xECE7 }, { 0x61DF, 0xEFC8 }, { 0x61E0, 0xECE3 },
+	{ 0x61E3, 0xC256 }, { 0x61E4, 0xECE5 }, { 0x61E5, 0xECE4 }, { 0x61E6, 0xC0B6 }, { 0x61E7, 0xECE2 }, { 0x61E8, 0xECE6 }, { 0x61E9, 0xEFD0 }, { 0x61EA, 0xEFCC },
+	{ 0x61EB, 0xEFCE }, { 0x61ED, 0xEFC9 }, { 0x61EE, 0xEFCA }, { 0x61F0, 0xEFCD }, { 0x61F1, 0xEFCB }, { 0x61F2, 0xC367 }, { 0x61F5, 0xC36A }, { 0x61F6, 0xC369 },
+	{ 0x61F7, 0xC368 }, { 0x61F8, 0xC461 }, { 0x61F9, 0xF44A }, { 0x61FA, 0xC462 }, { 0x61FB, 0xF241 }, { 0x61FC, 0xC4DF }, { 0x61FD, 0xF5CC }, { 0x61FE, 0xC4E0 },
+	{ 0x61FF, 0xC574 }, { 0x6200, 0xC5CA }, { 0x6201, 0xF7D9 }, { 0x6203, 0xF7DA }, { 0x6204, 0xF7DB }, { 0x6207, 0xF9BA }, { 0x6208, 0xA4E0 }, { 0x6209, 0xC97C },
+	{ 0x620A, 0xA5B3 }, { 0x620C, 0xA6A6 }, { 0x620D, 0xA6A7 }, { 0x620E, 0xA6A5 }, { 0x6210, 0xA6A8 }, { 0x6211, 0xA7DA }, { 0x6212, 0xA7D9 }, { 0x6214, 0xCCB1 },
+	{ 0x6215, 0xA9CF }, { 0x6216, 0xA9CE }, { 0x6219, 0xD1AF }, { 0x621A, 0xB1AD }, { 0x621B, 0xB1AE }, { 0x621F, 0xB475 }, { 0x6220, 0xDD72 }, { 0x6221, 0xB760 },
+	{ 0x6222, 0xB761 }, { 0x6223, 0xDD74 }, { 0x6224, 0xDD76 }, { 0x6225, 0xDD75 }, { 0x6227, 0xE1D7 }, { 0x6229, 0xE1D6 }, { 0x622A, 0xBA49 }, { 0x622B, 0xE1D8 },
+	{ 0x622D, 0xE5AC }, { 0x622E, 0xBCAE }, { 0x6230, 0xBED4 }, { 0x6232, 0xC0B8 }, { 0x6233, 0xC257 }, { 0x6234, 0xC0B9 }, { 0x6236, 0xA4E1 }, { 0x623A, 0xCAE6 },
+	{ 0x623D, 0xCCB2 }, { 0x623E, 0xA9D1 }, { 0x623F, 0xA9D0 }, { 0x6240, 0xA9D2 }, { 0x6241, 0xABF3 }, { 0x6242, 0xCED2 }, { 0x6243, 0xCED3 }, { 0x6246, 0xD1B0 },
+	{ 0x6247, 0xAEB0 }, { 0x6248, 0xB1AF }, { 0x6249, 0xB476 }, { 0x624A, 0xD951 }, { 0x624B, 0xA4E2 }, { 0x624D, 0xA47E }, { 0x624E, 0xA4E3 }, { 0x6250, 0xC97D },
+	{ 0x6251, 0xA5B7 }, { 0x6252, 0xA5B6 }, { 0x6253, 0xA5B4 }, { 0x6254, 0xA5B5 }, { 0x6258, 0xA6AB }, { 0x6259, 0xC9E9 }, { 0x625A, 0xC9EB }, { 0x625B, 0xA6AA },
+	{ 0x625C, 0xC9E3 }, { 0x625E, 0xC9E4 }, { 0x6260, 0xC9EA }, { 0x6261, 0xC9E6 }, { 0x6262, 0xC9E8 }, { 0x6263, 0xA6A9 }, { 0x6264, 0xC9E5 }, { 0x6265, 0xC9EC },
+	{ 0x6266, 0xC9E7 }, { 0x626D, 0xA7E1 }, { 0x626E, 0xA7EA }, { 0x626F, 0xA7E8 }, { 0x6270, 0xCAF0 }, { 0x6271, 0xCAED }, { 0x6272, 0xCAF5 }, { 0x6273, 0xA7E6 },
+	{ 0x6274, 0xCAF6 }, { 0x6276, 0xA7DF }, { 0x6277, 0xCAF3 }, { 0x6279, 0xA7E5 }, { 0x627A, 0xCAEF }, { 0x627B, 0xCAEE }, { 0x627C, 0xA7E3 }, { 0x627D, 0xCAF4 },
+	{ 0x627E, 0xA7E4 }, { 0x627F, 0xA9D3 }, { 0x6280, 0xA7DE }, { 0x6281, 0xCAF1 }, { 0x6283, 0xCAE7 }, { 0x6284, 0xA7DB }, { 0x6286, 0xA7EE }, { 0x6287, 0xCAEC },
+	{ 0x6288, 0xCAF2 }, { 0x6289, 0xA7E0 }, { 0x628A, 0xA7E2 }, { 0x628C, 0xCAE8 }, { 0x628E, 0xCAE9 }, { 0x628F, 0xCAEA }, { 0x6291, 0xA7ED }, { 0x6292, 0xA7E7 },
+	{ 0x6293, 0xA7EC }, { 0x6294, 0xCAEB }, { 0x6295, 0xA7EB }, { 0x6296, 0xA7DD }, { 0x6297, 0xA7DC }, { 0x6298, 0xA7E9 }, { 0x62A8, 0xA9E1 }, { 0x62A9, 0xCCBE },
+	{ 0x62AA, 0xCCB7 }, { 0x62AB, 0xA9DC }, { 0x62AC, 0xA9EF }, { 0x62AD, 0xCCB3 }, { 0x62AE, 0xCCBA }, { 0x62AF, 0xCCBC }, { 0x62B0, 0xCCBF }, { 0x62B1, 0xA9EA },
+	{ 0x62B3, 0xCCBB }, { 0x62B4, 0xCCB4 }, { 0x62B5, 0xA9E8 }, { 0x62B6, 0xCCB8 }, { 0x62B8, 0xCCC0 }, { 0x62B9, 0xA9D9 }, { 0x62BB, 0xCCBD }, { 0x62BC, 0xA9E3 },
+	{ 0x62BD, 0xA9E2 }, { 0x62BE, 0xCCB6 }, { 0x62BF, 0xA9D7 }, { 0x62C2, 0xA9D8 }, { 0x62C4, 0xA9D6 }, { 0x62C6, 0xA9EE }, { 0x62C7, 0xA9E6 }, { 0x62C8, 0xA9E0 },
+	{ 0x62C9, 0xA9D4 }, { 0x62CA, 0xCCB9 }, { 0x62CB, 0xA9DF }, { 0x62CC, 0xA9D5 }, { 0x62CD, 0xA9E7 }, { 0x62CE, 0xA9F0 }, { 0x62CF, 0xCED4 }, { 0x62D0, 0xA9E4 },
+	{ 0x62D1, 0xCCB5 }, { 0x62D2, 0xA9DA }, { 0x62D3, 0xA9DD }, { 0x62D4, 0xA9DE }, { 0x62D6, 0xA9EC }, { 0x62D7, 0xA9ED }, { 0x62D8, 0xA9EB }, { 0x62D9, 0xA9E5 },
+	{ 0x62DA, 0xA9E9 }, { 0x62DB, 0xA9DB }, { 0x62DC, 0xABF4 }, { 0x62EB, 0xCEDA }, { 0x62EC, 0xAC41 }, { 0x62ED, 0xABF8 }, { 0x62EE, 0xABFA }, { 0x62EF, 0xAC40 },
+	{ 0x62F0, 0xCEE6 }, { 0x62F1, 0xABFD }, { 0x62F2, 0xD1B1 }, { 0x62F3, 0xAEB1 }, { 0x62F4, 0xAC43 }, { 0x62F5, 0xCED7 }, { 0x62F6, 0xCEDF }, { 0x62F7, 0xABFE },
+	{ 0x62F8, 0xCEDE }, { 0x62F9, 0xCEDB }, { 0x62FA, 0xCEE3 }, { 0x62FB, 0xCEE5 }, { 0x62FC, 0xABF7 }, { 0x62FD, 0xABFB }, { 0x62FE, 0xAC42 }, { 0x62FF, 0xAEB3 },
+	{ 0x6300, 0xCEE0 }, { 0x6301, 0xABF9 }, { 0x6302, 0xAC45 }, { 0x6303, 0xCED9 }, { 0x6307, 0xABFC }, { 0x6308, 0xAEB2 }, { 0x6309, 0xABF6 }, { 0x630B, 0xCED6 },
+	{ 0x630C, 0xCEDD }, { 0x630D, 0xCED5 }, { 0x630E, 0xCED8 }, { 0x630F, 0xCEDC }, { 0x6310, 0xD1B2 }, { 0x6311, 0xAC44 }, { 0x6313, 0xCEE1 }, { 0x6314, 0xCEE2 },
+	{ 0x6315, 0xCEE4 }, { 0x6316, 0xABF5 }, { 0x6328, 0xAEC1 }, { 0x6329, 0xD1BE }, { 0x632A, 0xAEBF }, { 0x632B, 0xAEC0 }, { 0x632C, 0xD1B4 }, { 0x632D, 0xD1C4 },
+	{ 0x632F, 0xAEB6 }, { 0x6332, 0xD566 }, { 0x6333, 0xD1C6 }, { 0x6334, 0xD1C0 }, { 0x6336, 0xD1B7 }, { 0x6338, 0xD1C9 }, { 0x6339, 0xD1BA }, { 0x633A, 0xAEBC },
+	{ 0x633B, 0xD57D }, { 0x633C, 0xD1BD }, { 0x633D, 0xAEBE }, { 0x633E, 0xAEB5 }, { 0x6340, 0xD1CB }, { 0x6341, 0xD1BF }, { 0x6342, 0xAEB8 }, { 0x6343, 0xD1B8 },
+	{ 0x6344, 0xD1B5 }, { 0x6345, 0xD1B6 }, { 0x6346, 0xAEB9 }, { 0x6347, 0xD1C5 }, { 0x6348, 0xD1CC }, { 0x6349, 0xAEBB }, { 0x634A, 0xD1BC }, { 0x634B, 0xD1BB },
+	{ 0x634C, 0xAEC3 }, { 0x634D, 0xAEC2 }, { 0x634E, 0xAEB4 }, { 0x634F, 0xAEBA }, { 0x6350, 0xAEBD }, { 0x6351, 0xD1C8 }, { 0x6354, 0xD1C2 }, { 0x6355, 0xAEB7 },
+	{ 0x6356, 0xD1B3 }, { 0x6357, 0xD1CA }, { 0x6358, 0xD1C1 }, { 0x6359, 0xD1C3 }, { 0x635A, 0xD1C7 }, { 0x6365, 0xD567 }, { 0x6367, 0xB1B7 }, { 0x6368, 0xB1CB },
+	{ 0x6369, 0xB1CA }, { 0x636B, 0xB1BF }, { 0x636D, 0xD579 }, { 0x636E, 0xD575 }, { 0x636F, 0xD572 }, { 0x6370, 0xD5A6 }, { 0x6371, 0xB1BA }, { 0x6372, 0xB1B2 },
+	{ 0x6375, 0xD577 }, { 0x6376, 0xB4A8 }, { 0x6377, 0xB1B6 }, { 0x6378, 0xD5A1 }, { 0x637A, 0xB1CC }, { 0x637B, 0xB1C9 }, { 0x637C, 0xD57B }, { 0x637D, 0xD56A },
+	{ 0x6380, 0xB1C8 }, { 0x6381, 0xD5A3 }, { 0x6382, 0xD569 }, { 0x6383, 0xB1BD }, { 0x6384, 0xB1C1 }, { 0x6385, 0xD5A2 }, { 0x6387, 0xD573 }, { 0x6388, 0xB1C2 },
+	{ 0x6389, 0xB1BC }, { 0x638A, 0xD568 }, { 0x638C, 0xB478 }, { 0x638D, 0xD5A5 }, { 0x638E, 0xD571 }, { 0x638F, 0xB1C7 }, { 0x6390, 0xD574 }, { 0x6391, 0xD5A4 },
+	{ 0x6392, 0xB1C6 }, { 0x6394, 0xD952 }, { 0x6396, 0xB1B3 }, { 0x6397, 0xD56F }, { 0x6398, 0xB1B8 }, { 0x6399, 0xB1C3 }, { 0x639B, 0xB1BE }, { 0x639C, 0xD578 },
+	{ 0x639D, 0xD56E }, { 0x639E, 0xD56C }, { 0x639F, 0xD57E }, { 0x63A0, 0xB1B0 }, { 0x63A1, 0xB1C4 }, { 0x63A2, 0xB1B4 }, { 0x63A3, 0xB477 }, { 0x63A4, 0xD57C },
+	{ 0x63A5, 0xB1B5 }, { 0x63A7, 0xB1B1 }, { 0x63A8, 0xB1C0 }, { 0x63A9, 0xB1BB }, { 0x63AA, 0xB1B9 }, { 0x63AB, 0xD570 }, { 0x63AC, 0xB1C5 }, { 0x63AD, 0xD56D },
+	{ 0x63AE, 0xD57A }, { 0x63AF, 0xD576 }, { 0x63B0, 0xD954 }, { 0x63B1, 0xD953 }, { 0x63BD, 0xD56B }, { 0x63BE, 0xD964 }, { 0x63C0, 0xB47A }, { 0x63C2, 0xD96A },
+	{ 0x63C3, 0xD959 }, { 0x63C4, 0xD967 }, { 0x63C5, 0xDD77 }, { 0x63C6, 0xB47D }, { 0x63C7, 0xD96B }, { 0x63C8, 0xD96E }, { 0x63C9, 0xB47C }, { 0x63CA, 0xD95C },
+	{ 0x63CB, 0xD96D }, { 0x63CC, 0xD96C }, { 0x63CD, 0xB47E }, { 0x63CE, 0xD955 }, { 0x63CF, 0xB479 }, { 0x63D0, 0xB4A3 }, { 0x63D2, 0xB4A1 }, { 0x63D3, 0xD969 },
+	{ 0x63D5, 0xD95F }, { 0x63D6, 0xB4A5 }, { 0x63D7, 0xD970 }, { 0x63D8, 0xD968 }, { 0x63D9, 0xD971 }, { 0x63DA, 0xB4AD }, { 0x63DB, 0xB4AB }, { 0x63DC, 0xD966 },
+	{ 0x63DD, 0xD965 }, { 0x63DF, 0xD963 }, { 0x63E0, 0xD95D }, { 0x63E1, 0xB4A4 }, { 0x63E3, 0xB4A2 }, { 0x63E4, 0xD1B9 }, { 0x63E5, 0xD956 }, { 0x63E7, 0xDDB7 },
+	{ 0x63E8, 0xD957 }, { 0x63E9, 0xB47B }, { 0x63EA, 0xB4AA }, { 0x63EB, 0xDD79 }, { 0x63ED, 0xB4A6 }, { 0x63EE, 0xB4A7 }, { 0x63EF, 0xD958 }, { 0x63F0, 0xD96F },
+	{ 0x63F1, 0xDD78 }, { 0x63F2, 0xD960 }, { 0x63F3, 0xD95B }, { 0x63F4, 0xB4A9 }, { 0x63F5, 0xD961 }, { 0x63F6, 0xD95E }, { 0x63F9, 0xB4AE }, { 0x6406, 0xB770 },
+	{ 0x6409, 0xDD7C }, { 0x640A, 0xDDB1 }, { 0x640B, 0xDDB6 }, { 0x640C, 0xDDAA }, { 0x640D, 0xB76C }, { 0x640E, 0xDDBB }, { 0x640F, 0xB769 }, { 0x6410, 0xDD7A },
+	{ 0x6412, 0xDD7B }, { 0x6413, 0xB762 }, { 0x6414, 0xB76B }, { 0x6415, 0xDDA4 }, { 0x6416, 0xB76E }, { 0x6417, 0xB76F }, { 0x6418, 0xDDA5 }, { 0x641A, 0xDDB2 },
+	{ 0x641B, 0xDDB8 }, { 0x641C, 0xB76A }, { 0x641E, 0xB764 }, { 0x641F, 0xDDA3 }, { 0x6420, 0xDD7D }, { 0x6421, 0xDDBA }, { 0x6422, 0xDDA8 }, { 0x6423, 0xDDA9 },
+	{ 0x6424, 0xDD7E }, { 0x6425, 0xDDB4 }, { 0x6426, 0xDDAB }, { 0x6427, 0xDDB5 }, { 0x6428, 0xDDAD }, { 0x642A, 0xB765 }, { 0x642B, 0xE1D9 }, { 0x642C, 0xB768 },
+	{ 0x642D, 0xB766 }, { 0x642E, 0xDDB9 }, { 0x642F, 0xDDB0 }, { 0x6430, 0xDDAC }, { 0x6433, 0xDDA1 }, { 0x6434, 0xBA53 }, { 0x6435, 0xDDAF }, { 0x6436, 0xB76D },
+	{ 0x6437, 0xDDA7 }, { 0x6439, 0xDDA6 }, { 0x643D, 0xB767 }, { 0x643E, 0xB763 }, { 0x643F, 0xE1EE }, { 0x6440, 0xDDB3 }, { 0x6441, 0xDDAE }, { 0x6443, 0xDDA2 },
+	{ 0x644B, 0xE1E9 }, { 0x644D, 0xE1DA }, { 0x644E, 0xE1E5 }, { 0x6450, 0xE1EC }, { 0x6451, 0xBA51 }, { 0x6452, 0xB4AC }, { 0x6453, 0xE1EA }, { 0x6454, 0xBA4C },
+	{ 0x6458, 0xBA4B }, { 0x6459, 0xE1F1 }, { 0x645B, 0xE1DB }, { 0x645C, 0xE1E8 }, { 0x645D, 0xE1DC }, { 0x645E, 0xE1E7 }, { 0x645F, 0xBA4F }, { 0x6460, 0xE1EB },
+	{ 0x6461, 0xD962 }, { 0x6465, 0xE1F2 }, { 0x6466, 0xE1E3 }, { 0x6467, 0xBA52 }, { 0x6468, 0xE5BA }, { 0x6469, 0xBCAF }, { 0x646B, 0xE1F0 }, { 0x646C, 0xE1EF },
+	{ 0x646D, 0xBA54 }, { 0x646E, 0xE5AD }, { 0x646F, 0xBCB0 }, { 0x6470, 0xE5AE }, { 0x6472, 0xE1DF }, { 0x6473, 0xE1E0 }, { 0x6474, 0xE1DD }, { 0x6475, 0xE1E2 },
+	{ 0x6476, 0xE1DE }, { 0x6477, 0xE1F3 }, { 0x6478, 0xBA4E }, { 0x6479, 0xBCB1 }, { 0x647A, 0xBA50 }, { 0x647B, 0xBA55 }, { 0x647D, 0xE1E1 }, { 0x647F, 0xE1ED },
+	{ 0x6482, 0xE1E6 }, { 0x6485, 0xE5B1 }, { 0x6487, 0xBA4A }, { 0x6488, 0xBCB4 }, { 0x6489, 0xE9AA }, { 0x648A, 0xE5B6 }, { 0x648B, 0xE5B5 }, { 0x648C, 0xE5B7 },
+	{ 0x648F, 0xE5B4 }, { 0x6490, 0xBCB5 }, { 0x6492, 0xBCBB }, { 0x6493, 0xBCB8 }, { 0x6495, 0xBCB9 }, { 0x6496, 0xE5AF }, { 0x6497, 0xE5B2 }, { 0x6498, 0xE5BC },
+	{ 0x6499, 0xBCC1 }, { 0x649A, 0xBCBF }, { 0x649C, 0xE5B3 }, { 0x649D, 0xD95A }, { 0x649E, 0xBCB2 }, { 0x649F, 0xE5B9 }, { 0x64A0, 0xE5B0 }, { 0x64A2, 0xBCC2 },
+	{ 0x64A3, 0xE5B8 }, { 0x64A4, 0xBA4D }, { 0x64A5, 0xBCB7 }, { 0x64A6, 0xE1E4 }, { 0x64A9, 0xBCBA }, { 0x64AB, 0xBCBE }, { 0x64AC, 0xBCC0 }, { 0x64AD, 0xBCBD },
+	{ 0x64AE, 0xBCBC }, { 0x64B0, 0xBCB6 }, { 0x64B1, 0xE5BB }, { 0x64B2, 0xBCB3 }, { 0x64B3, 0xBCC3 }, { 0x64BB, 0xBED8 }, { 0x64BC, 0xBED9 }, { 0x64BD, 0xE9A9 },
+	{ 0x64BE, 0xBEE2 }, { 0x64BF, 0xBEDF }, { 0x64C1, 0xBED6 }, { 0x64C2, 0xBEDD }, { 0x64C3, 0xE9AB }, { 0x64C4, 0xBEDB }, { 0x64C5, 0xBED5 }, { 0x64C7, 0xBEDC },
+	{ 0x64C9, 0xE9A8 }, { 0x64CA, 0xC0BB }, { 0x64CB, 0xBED7 }, { 0x64CD, 0xBEDE }, { 0x64CE, 0xC0BA }, { 0x64CF, 0xE9A7 }, { 0x64D0, 0xE9A6 }, { 0x64D2, 0xBEE0 },
+	{ 0x64D4, 0xBEE1 }, { 0x64D6, 0xE9A5 }, { 0x64D7, 0xE9A4 }, { 0x64D8, 0xC0BC }, { 0x64D9, 0xE9AE }, { 0x64DA, 0xBEDA }, { 0x64DB, 0xE9AC }, { 0x64E0, 0xC0BD },
+	{ 0x64E2, 0xC0C2 }, { 0x64E3, 0xECEA }, { 0x64E4, 0xECEC }, { 0x64E6, 0xC0BF }, { 0x64E8, 0xECED }, { 0x64E9, 0xECE9 }, { 0x64EB, 0xECEB }, { 0x64EC, 0xC0C0 },
+	{ 0x64ED, 0xC0C3 }, { 0x64EF, 0xECE8 }, { 0x64F0, 0xC0BE }, { 0x64F1, 0xC0C1 }, { 0x64F2, 0xC259 }, { 0x64F3, 0xE9AD }, { 0x64F4, 0xC258 }, { 0x64F7, 0xC25E },
+	{ 0x64F8, 0xEFD4 }, { 0x64FA, 0xC25C }, { 0x64FB, 0xC25D }, { 0x64FC, 0xEFD7 }, { 0x64FD, 0xEFD3 }, { 0x64FE, 0xC25A }, { 0x64FF, 0xEFD1 }, { 0x6500, 0xC36B },
+	{ 0x6501, 0xEFD5 }, { 0x6503, 0xEFD6 }, { 0x6504, 0xEFD2 }, { 0x6506, 0xC25B }, { 0x6507, 0xF242 }, { 0x6509, 0xF245 }, { 0x650C, 0xF246 }, { 0x650D, 0xF244 },
+	{ 0x650E, 0xF247 }, { 0x650F, 0xC36C }, { 0x6510, 0xF243 }, { 0x6513, 0xF44E }, { 0x6514, 0xC464 }, { 0x6515, 0xF44D }, { 0x6516, 0xF44C }, { 0x6517, 0xF44B },
+	{ 0x6518, 0xC463 }, { 0x6519, 0xC465 }, { 0x651B, 0xF5CD }, { 0x651C, 0xC4E2 }, { 0x651D, 0xC4E1 }, { 0x6520, 0xF6E1 }, { 0x6521, 0xF6E0 }, { 0x6522, 0xF6E3 },
+	{ 0x6523, 0xC5CB }, { 0x6524, 0xC575 }, { 0x6525, 0xF7DD }, { 0x6526, 0xF6E2 }, { 0x6529, 0xF7DC }, { 0x652A, 0xC5CD }, { 0x652B, 0xC5CC }, { 0x652C, 0xC5F3 },
+	{ 0x652D, 0xF8A9 }, { 0x652E, 0xF8EF }, { 0x652F, 0xA4E4 }, { 0x6532, 0xD972 }, { 0x6533, 0xE9AF }, { 0x6536, 0xA6AC }, { 0x6537, 0xCAF7 }, { 0x6538, 0xA7F1 },
+	{ 0x6539, 0xA7EF }, { 0x653B, 0xA7F0 }, { 0x653D, 0xCCC1 }, { 0x653E, 0xA9F1 }, { 0x653F, 0xAC46 }, { 0x6541, 0xCEE7 }, { 0x6543, 0xCEE8 }, { 0x6545, 0xAC47 },
+	{ 0x6546, 0xD1CE }, { 0x6548, 0xAEC4 }, { 0x6549, 0xAEC5 }, { 0x654A, 0xD1CD }, { 0x654F, 0xB1D3 }, { 0x6551, 0xB1CF }, { 0x6553, 0xD5A7 }, { 0x6554, 0xB1D6 },
+	{ 0x6555, 0xB1D5 }, { 0x6556, 0xB1CE }, { 0x6557, 0xB1D1 }, { 0x6558, 0xB1D4 }, { 0x6559, 0xB1D0 }, { 0x655C, 0xD976 }, { 0x655D, 0xB1CD }, { 0x655E, 0xB4AF },
+	{ 0x6562, 0xB4B1 }, { 0x6563, 0xB4B2 }, { 0x6564, 0xD975 }, { 0x6565, 0xD978 }, { 0x6566, 0xB4B0 }, { 0x6567, 0xD973 }, { 0x6568, 0xD977 }, { 0x656A, 0xD974 },
+	{ 0x656C, 0xB771 }, { 0x656F, 0xDDBC }, { 0x6572, 0xBA56 }, { 0x6573, 0xE1F4 }, { 0x6574, 0xBEE3 }, { 0x6575, 0xBCC4 }, { 0x6576, 0xE5BD }, { 0x6577, 0xBCC5 },
+	{ 0x6578, 0xBCC6 }, { 0x6579, 0xE5BF }, { 0x657A, 0xE5BE }, { 0x657B, 0xE5C0 }, { 0x657C, 0xE9B1 }, { 0x657F, 0xE9B0 }, { 0x6580, 0xECEF }, { 0x6581, 0xECEE },
+	{ 0x6582, 0xC0C4 }, { 0x6583, 0xC0C5 }, { 0x6584, 0xF248 }, { 0x6587, 0xA4E5 }, { 0x658C, 0xD979 }, { 0x6590, 0xB4B4 }, { 0x6591, 0xB4B3 }, { 0x6592, 0xDDBD },
+	{ 0x6594, 0xEFD8 }, { 0x6595, 0xC4E3 }, { 0x6596, 0xF7DE }, { 0x6597, 0xA4E6 }, { 0x6599, 0xAEC6 }, { 0x659B, 0xB1D8 }, { 0x659C, 0xB1D7 }, { 0x659D, 0xD97A },
+	{ 0x659E, 0xD97B }, { 0x659F, 0xB772 }, { 0x65A0, 0xE1F5 }, { 0x65A1, 0xBA57 }, { 0x65A2, 0xE9B2 }, { 0x65A4, 0xA4E7 }, { 0x65A5, 0xA5B8 }, { 0x65A7, 0xA9F2 },
+	{ 0x65A8, 0xCCC2 }, { 0x65AA, 0xCEE9 }, { 0x65AB, 0xAC48 }, { 0x65AC, 0xB1D9 }, { 0x65AE, 0xD97C }, { 0x65AF, 0xB4B5 }, { 0x65B0, 0xB773 }, { 0x65B2, 0xE5C1 },
+	{ 0x65B3, 0xE5C2 }, { 0x65B6, 0xECF0 }, { 0x65B7, 0xC25F }, { 0x65B8, 0xF8F0 }, { 0x65B9, 0xA4E8 }, { 0x65BB, 0xCCC3 }, { 0x65BC, 0xA9F3 }, { 0x65BD, 0xAC49 },
+	{ 0x65BF, 0xCEEA }, { 0x65C1, 0xAEC7 }, { 0x65C2, 0xD1D2 }, { 0x65C3, 0xD1D0 }, { 0x65C4, 0xD1D1 }, { 0x65C5, 0xAEC8 }, { 0x65C6, 0xD1CF }, { 0x65CB, 0xB1DB },
+	{ 0x65CC, 0xB1DC }, { 0x65CD, 0xD5A8 }, { 0x65CE, 0xB1DD }, { 0x65CF, 0xB1DA }, { 0x65D0, 0xD97D }, { 0x65D2, 0xD97E }, { 0x65D3, 0xDDBE }, { 0x65D6, 0xBA59 },
+	{ 0x65D7, 0xBA58 }, { 0x65DA, 0xECF1 }, { 0x65DB, 0xEFD9 }, { 0x65DD, 0xF24A }, { 0x65DE, 0xF249 }, { 0x65DF, 0xF44F }, { 0x65E1, 0xC95E }, { 0x65E2, 0xAC4A },
+	{ 0x65E5, 0xA4E9 }, { 0x65E6, 0xA5B9 }, { 0x65E8, 0xA6AE }, { 0x65E9, 0xA6AD }, { 0x65EC, 0xA6AF }, { 0x65ED, 0xA6B0 }, { 0x65EE, 0xC9EE }, { 0x65EF, 0xC9ED },
+	{ 0x65F0, 0xCAF8 }, { 0x65F1, 0xA7F2 }, { 0x65F2, 0xCAFB }, { 0x65F3, 0xCAFA }, { 0x65F4, 0xCAF9 }, { 0x65F5, 0xCAFC }, { 0x65FA, 0xA9F4 }, { 0x65FB, 0xCCC9 },
+	{ 0x65FC, 0xCCC5 }, { 0x65FD, 0xCCCE }, { 0x6600, 0xA9FB }, { 0x6602, 0xA9F9 }, { 0x6603, 0xCCCA }, { 0x6604, 0xCCC6 }, { 0x6605, 0xCCCD }, { 0x6606, 0xA9F8 },
+	{ 0x6607, 0xAA40 }, { 0x6608, 0xCCC8 }, { 0x6609, 0xCCC4 }, { 0x660A, 0xA9FE }, { 0x660B, 0xCCCB }, { 0x660C, 0xA9F7 }, { 0x660D, 0xCCCC }, { 0x660E, 0xA9FA },
+	{ 0x660F, 0xA9FC }, { 0x6610, 0xCCD0 }, { 0x6611, 0xCCCF }, { 0x6612, 0xCCC7 }, { 0x6613, 0xA9F6 }, { 0x6614, 0xA9F5 }, { 0x6615, 0xA9FD }, { 0x661C, 0xCEEF },
+	{ 0x661D, 0xCEF5 }, { 0x661F, 0xAC50 }, { 0x6620, 0xAC4D }, { 0x6621, 0xCEEC }, { 0x6622, 0xCEF1 }, { 0x6624, 0xAC53 }, { 0x6625, 0xAC4B }, { 0x6626, 0xCEF0 },
+	{ 0x6627, 0xAC4E }, { 0x6628, 0xAC51 }, { 0x662B, 0xCEF3 }, { 0x662D, 0xAC4C }, { 0x662E, 0xCEF8 }, { 0x662F, 0xAC4F }, { 0x6631, 0xAC52 }, { 0x6632, 0xCEED },
+	{ 0x6633, 0xCEF2 }, { 0x6634, 0xCEF6 }, { 0x6635, 0xCEEE }, { 0x6636, 0xCEEB }, { 0x6639, 0xCEF7 }, { 0x663A, 0xCEF4 }, { 0x6641, 0xAED0 }, { 0x6642, 0xAEC9 },
+	{ 0x6643, 0xAECC }, { 0x6645, 0xAECF }, { 0x6647, 0xD1D5 }, { 0x6649, 0xAECA }, { 0x664A, 0xD1D3 }, { 0x664C, 0xAECE }, { 0x664F, 0xAECB }, { 0x6651, 0xD1D6 },
+	{ 0x6652, 0xAECD }, { 0x6659, 0xD5AC }, { 0x665A, 0xB1DF }, { 0x665B, 0xD5AB }, { 0x665C, 0xD5AD }, { 0x665D, 0xB1DE }, { 0x665E, 0xB1E3 }, { 0x665F, 0xD1D4 },
+	{ 0x6661, 0xD5AA }, { 0x6662, 0xD5AE }, { 0x6664, 0xB1E0 }, { 0x6665, 0xD5A9 }, { 0x6666, 0xB1E2 }, { 0x6668, 0xB1E1 }, { 0x666A, 0xD9A7 }, { 0x666C, 0xD9A2 },
+	{ 0x666E, 0xB4B6 }, { 0x666F, 0xB4BA }, { 0x6670, 0xB4B7 }, { 0x6671, 0xD9A5 }, { 0x6672, 0xD9A8 }, { 0x6674, 0xB4B8 }, { 0x6676, 0xB4B9 }, { 0x6677, 0xB4BE },
+	{ 0x6678, 0xDDC7 }, { 0x6679, 0xD9A6 }, { 0x667A, 0xB4BC }, { 0x667B, 0xD9A3 }, { 0x667C, 0xD9A1 }, { 0x667E, 0xB4BD }, { 0x6680, 0xD9A4 }, { 0x6684, 0xB779 },
+	{ 0x6686, 0xDDBF }, { 0x6687, 0xB776 }, { 0x6688, 0xB777 }, { 0x6689, 0xB775 }, { 0x668A, 0xDDC4 }, { 0x668B, 0xDDC3 }, { 0x668C, 0xDDC0 }, { 0x668D, 0xB77B },
+	{ 0x6690, 0xDDC2 }, { 0x6691, 0xB4BB }, { 0x6694, 0xDDC6 }, { 0x6695, 0xDDC1 }, { 0x6696, 0xB778 }, { 0x6697, 0xB774 }, { 0x6698, 0xB77A }, { 0x6699, 0xDDC5 },
+	{ 0x669D, 0xBA5C }, { 0x669F, 0xE1F8 }, { 0x66A0, 0xE1F7 }, { 0x66A1, 0xE1F6 }, { 0x66A2, 0xBA5A }, { 0x66A8, 0xBA5B }, { 0x66A9, 0xE5C5 }, { 0x66AA, 0xE5C8 },
+	{ 0x66AB, 0xBCC8 }, { 0x66AE, 0xBCC7 }, { 0x66AF, 0xE5C9 }, { 0x66B0, 0xE5C4 }, { 0x66B1, 0xBCCA }, { 0x66B2, 0xE5C6 }, { 0x66B4, 0xBCC9 }, { 0x66B5, 0xE5C3 },
+	{ 0x66B7, 0xE5C7 }, { 0x66B8, 0xBEE9 }, { 0x66B9, 0xBEE6 }, { 0x66BA, 0xE9BB }, { 0x66BB, 0xE9BA }, { 0x66BD, 0xE9B9 }, { 0x66BE, 0xE9B4 }, { 0x66C0, 0xE9B5 },
+	{ 0x66C4, 0xBEE7 }, { 0x66C6, 0xBEE4 }, { 0x66C7, 0xBEE8 }, { 0x66C8, 0xE9B3 }, { 0x66C9, 0xBEE5 }, { 0x66CA, 0xE9B6 }, { 0x66CB, 0xE9B7 }, { 0x66CC, 0xE9BC },
+	{ 0x66CF, 0xE9B8 }, { 0x66D2, 0xECF2 }, { 0x66D6, 0xC0C7 }, { 0x66D8, 0xEFDC }, { 0x66D9, 0xC0C6 }, { 0x66DA, 0xEFDA }, { 0x66DB, 0xEFDB }, { 0x66DC, 0xC260 },
+	{ 0x66DD, 0xC36E }, { 0x66DE, 0xF24B }, { 0x66E0, 0xC36D }, { 0x66E3, 0xF451 }, { 0x66E4, 0xF452 }, { 0x66E6, 0xC466 }, { 0x66E8, 0xF450 }, { 0x66E9, 0xC4E4 },
+	{ 0x66EB, 0xF7DF }, { 0x66EC, 0xC5CE }, { 0x66ED, 0xF8AA }, { 0x66EE, 0xF8AB }, { 0x66F0, 0xA4EA }, { 0x66F2, 0xA6B1 }, { 0x66F3, 0xA6B2 }, { 0x66F4, 0xA7F3 },
+	{ 0x66F6, 0xCCD1 }, { 0x66F7, 0xAC54 }, { 0x66F8, 0xAED1 }, { 0x66F9, 0xB1E4 }, { 0x66FC, 0xB0D2 }, { 0x66FE, 0xB4BF }, { 0x66FF, 0xB4C0 }, { 0x6700, 0xB3CC },
+	{ 0x6701, 0xD9A9 }, { 0x6703, 0xB77C }, { 0x6704, 0xE1FA }, { 0x6705, 0xE1F9 }, { 0x6708, 0xA4EB }, { 0x6709, 0xA6B3 }, { 0x670A, 0xCCD2 }, { 0x670B, 0xAA42 },
+	{ 0x670D, 0xAA41 }, { 0x670F, 0xCEF9 }, { 0x6710, 0xCEFA }, { 0x6712, 0xD1D7 }, { 0x6713, 0xD1D8 }, { 0x6714, 0xAED2 }, { 0x6715, 0xAED3 }, { 0x6717, 0xAED4 },
+	{ 0x6718, 0xD5AF }, { 0x671B, 0xB1E6 }, { 0x671D, 0xB4C2 }, { 0x671F, 0xB4C1 }, { 0x6720, 0xDDC8 }, { 0x6721, 0xDF7A }, { 0x6722, 0xE1FB }, { 0x6723, 0xE9BD },
+	{ 0x6726, 0xC261 }, { 0x6727, 0xC467 }, { 0x6728, 0xA4EC }, { 0x672A, 0xA5BC }, { 0x672B, 0xA5BD }, { 0x672C, 0xA5BB }, { 0x672D, 0xA5BE }, { 0x672E, 0xA5BA },
+	{ 0x6731, 0xA6B6 }, { 0x6733, 0xC9F6 }, { 0x6734, 0xA6B5 }, { 0x6735, 0xA6B7 }, { 0x6738, 0xC9F1 }, { 0x6739, 0xC9F0 }, { 0x673A, 0xC9F3 }, { 0x673B, 0xC9F2 },
+	{ 0x673C, 0xC9F5 }, { 0x673D, 0xA6B4 }, { 0x673E, 0xC9EF }, { 0x673F, 0xC9F4 }, { 0x6745, 0xCAFD }, { 0x6746, 0xA7FD }, { 0x6747, 0xCAFE }, { 0x6748, 0xCB43 },
+	{ 0x6749, 0xA7FC }, { 0x674B, 0xCB47 }, { 0x674C, 0xCB42 }, { 0x674D, 0xCB45 }, { 0x674E, 0xA7F5 }, { 0x674F, 0xA7F6 }, { 0x6750, 0xA7F7 }, { 0x6751, 0xA7F8 },
+	{ 0x6753, 0xA840 }, { 0x6755, 0xCB41 }, { 0x6756, 0xA7FA }, { 0x6757, 0xA841 }, { 0x6759, 0xCB40 }, { 0x675A, 0xCB46 }, { 0x675C, 0xA7F9 }, { 0x675D, 0xCB44 },
+	{ 0x675E, 0xA7FB }, { 0x675F, 0xA7F4 }, { 0x6760, 0xA7FE }, { 0x676A, 0xAA57 }, { 0x676C, 0xCCD4 }, { 0x676D, 0xAA43 }, { 0x676F, 0xAA4D }, { 0x6770, 0xAA4E },
+	{ 0x6771, 0xAA46 }, { 0x6772, 0xAA58 }, { 0x6773, 0xAA48 }, { 0x6774, 0xCCDC }, { 0x6775, 0xAA53 }, { 0x6776, 0xCCD7 }, { 0x6777, 0xAA49 }, { 0x6778, 0xCCE6 },
+	{ 0x6779, 0xCCE7 }, { 0x677A, 0xCCDF }, { 0x677B, 0xCCD8 }, { 0x677C, 0xAA56 }, { 0x677D, 0xCCE4 }, { 0x677E, 0xAA51 }, { 0x677F, 0xAA4F }, { 0x6781, 0xCCE5 },
+	{ 0x6783, 0xCCE3 }, { 0x6784, 0xCCDB }, { 0x6785, 0xCCD3 }, { 0x6786, 0xCCDA }, { 0x6787, 0xAA4A }, { 0x6789, 0xAA50 }, { 0x678B, 0xAA44 }, { 0x678C, 0xCCDE },
+	{ 0x678D, 0xCCDD }, { 0x678E, 0xCCD5 }, { 0x6790, 0xAA52 }, { 0x6791, 0xCCE1 }, { 0x6792, 0xCCD6 }, { 0x6793, 0xAA55 }, { 0x6794, 0xCCE8 }, { 0x6795, 0xAA45 },
+	{ 0x6797, 0xAA4C }, { 0x6798, 0xCCD9 }, { 0x6799, 0xCCE2 }, { 0x679A, 0xAA54 }, { 0x679C, 0xAA47 }, { 0x679D, 0xAA4B }, { 0x679F, 0xCCE0 }, { 0x67AE, 0xCF5B },
+	{ 0x67AF, 0xAC5C }, { 0x67B0, 0xAC69 }, { 0x67B2, 0xCF56 }, { 0x67B3, 0xCF4C }, { 0x67B4, 0xAC62 }, { 0x67B5, 0xCF4A }, { 0x67B6, 0xAC5B }, { 0x67B7, 0xCF45 },
+	{ 0x67B8, 0xAC65 }, { 0x67B9, 0xCF52 }, { 0x67BA, 0xCEFE }, { 0x67BB, 0xCF41 }, { 0x67C0, 0xCF44 }, { 0x67C1, 0xCEFB }, { 0x67C2, 0xCF51 }, { 0x67C3, 0xCF61 },
+	{ 0x67C4, 0xAC60 }, { 0x67C5, 0xCF46 }, { 0x67C6, 0xCF58 }, { 0x67C8, 0xCEFD }, { 0x67C9, 0xCF5F }, { 0x67CA, 0xCF60 }, { 0x67CB, 0xCF63 }, { 0x67CC, 0xCF5A },
+	{ 0x67CD, 0xCF4B }, { 0x67CE, 0xCF53 }, { 0x67CF, 0xAC66 }, { 0x67D0, 0xAC59 }, { 0x67D1, 0xAC61 }, { 0x67D2, 0xAC6D }, { 0x67D3, 0xAC56 }, { 0x67D4, 0xAC58 },
+	{ 0x67D8, 0xCF43 }, { 0x67D9, 0xAC6A }, { 0x67DA, 0xAC63 }, { 0x67DB, 0xCF5D }, { 0x67DC, 0xCF40 }, { 0x67DD, 0xAC6C }, { 0x67DE, 0xAC67 }, { 0x67DF, 0xCF49 },
+	{ 0x67E2, 0xAC6B }, { 0x67E3, 0xCF50 }, { 0x67E4, 0xCF48 }, { 0x67E5, 0xAC64 }, { 0x67E6, 0xCF5C }, { 0x67E7, 0xCF54 }, { 0x67E9, 0xAC5E }, { 0x67EA, 0xCF62 },
+	{ 0x67EB, 0xCF47 }, { 0x67EC, 0xAC5A }, { 0x67ED, 0xCF59 }, { 0x67EE, 0xCF4F }, { 0x67EF, 0xAC5F }, { 0x67F0, 0xCF55 }, { 0x67F1, 0xAC57 }, { 0x67F2, 0xCEFC },
+	{ 0x67F3, 0xAC68 }, { 0x67F4, 0xAEE3 }, { 0x67F5, 0xAC5D }, { 0x67F6, 0xCF4E }, { 0x67F7, 0xCF4D }, { 0x67F8, 0xCF42 }, { 0x67FA, 0xCF5E }, { 0x67FC, 0xCF57 },
+	{ 0x67FF, 0xAC55 }, { 0x6812, 0xD1EC }, { 0x6813, 0xAEEA }, { 0x6814, 0xD1ED }, { 0x6816, 0xD1E1 }, { 0x6817, 0xAEDF }, { 0x6818, 0xAEEB }, { 0x681A, 0xD1DA },
+	{ 0x681C, 0xD1E3 }, { 0x681D, 0xD1EB }, { 0x681F, 0xD1D9 }, { 0x6820, 0xD1F4 }, { 0x6821, 0xAED5 }, { 0x6825, 0xD1F3 }, { 0x6826, 0xD1EE }, { 0x6828, 0xD1EF },
+	{ 0x6829, 0xAEDD }, { 0x682A, 0xAEE8 }, { 0x682B, 0xD1E5 }, { 0x682D, 0xD1E6 }, { 0x682E, 0xD1F0 }, { 0x682F, 0xD1E7 }, { 0x6831, 0xD1E2 }, { 0x6832, 0xD1DC },
+	{ 0x6833, 0xD1DD }, { 0x6834, 0xD1EA }, { 0x6835, 0xD1E4 }, { 0x6838, 0xAED6 }, { 0x6839, 0xAEDA }, { 0x683A, 0xD1F2 }, { 0x683B, 0xD1DE }, { 0x683C, 0xAEE6 },
+	{ 0x683D, 0xAEE2 }, { 0x6840, 0xAEE5 }, { 0x6841, 0xAEEC }, { 0x6842, 0xAEDB }, { 0x6843, 0xAEE7 }, { 0x6844, 0xD1E9 }, { 0x6845, 0xAEE9 }, { 0x6846, 0xAED8 },
+	{ 0x6848, 0xAED7 }, { 0x6849, 0xD1DB }, { 0x684B, 0xD1DF }, { 0x684C, 0xAEE0 }, { 0x684D, 0xD1F1 }, { 0x684E, 0xD1E8 }, { 0x684F, 0xD1E0 }, { 0x6850, 0xAEE4 },
+	{ 0x6851, 0xAEE1 }, { 0x6853, 0xAED9 }, { 0x6854, 0xAEDC }, { 0x686B, 0xD5C4 }, { 0x686D, 0xD5B4 }, { 0x686E, 0xD5B5 }, { 0x686F, 0xD5B9 }, { 0x6871, 0xD5C8 },
+	{ 0x6872, 0xD5C5 }, { 0x6874, 0xD5BE }, { 0x6875, 0xD5BD }, { 0x6876, 0xB1ED }, { 0x6877, 0xD5C1 }, { 0x6878, 0xD5D0 }, { 0x6879, 0xD5B0 }, { 0x687B, 0xD5D1 },
+	{ 0x687C, 0xD5C3 }, { 0x687D, 0xD5D5 }, { 0x687E, 0xD5C9 }, { 0x687F, 0xB1EC }, { 0x6880, 0xD5C7 }, { 0x6881, 0xB1E7 }, { 0x6882, 0xB1FC }, { 0x6883, 0xB1F2 },
+	{ 0x6885, 0xB1F6 }, { 0x6886, 0xB1F5 }, { 0x6887, 0xD5B1 }, { 0x6889, 0xD5CE }, { 0x688A, 0xD5D4 }, { 0x688B, 0xD5CC }, { 0x688C, 0xD5D3 }, { 0x688F, 0xD5C0 },
+	{ 0x6890, 0xD5B2 }, { 0x6891, 0xD5D2 }, { 0x6892, 0xD5C2 }, { 0x6893, 0xB1EA }, { 0x6894, 0xB1F7 }, { 0x6896, 0xD5CB }, { 0x6897, 0xB1F0 }, { 0x689B, 0xD5CA },
+	{ 0x689C, 0xD5B3 }, { 0x689D, 0xB1F8 }, { 0x689F, 0xB1FA }, { 0x68A0, 0xD5CD }, { 0x68A1, 0xB1FB }, { 0x68A2, 0xB1E9 }, { 0x68A3, 0xD5BA }, { 0x68A4, 0xD5CF },
+	{ 0x68A7, 0xB1EF }, { 0x68A8, 0xB1F9 }, { 0x68A9, 0xD5BC }, { 0x68AA, 0xD5C6 }, { 0x68AB, 0xD5B7 }, { 0x68AC, 0xD5BB }, { 0x68AD, 0xB1F4 }, { 0x68AE, 0xD5B6 },
+	{ 0x68AF, 0xB1E8 }, { 0x68B0, 0xB1F1 }, { 0x68B1, 0xB1EE }, { 0x68B2, 0xD5BF }, { 0x68B3, 0xAEDE }, { 0x68B4, 0xD9C0 }, { 0x68B5, 0xB1EB }, { 0x68C4, 0xB1F3 },
+	{ 0x68C6, 0xD9C3 }, { 0x68C7, 0xD9D9 }, { 0x68C8, 0xD9CE }, { 0x68C9, 0xB4D6 }, { 0x68CB, 0xB4D1 }, { 0x68CC, 0xD9BD }, { 0x68CD, 0xB4D2 }, { 0x68CE, 0xD9CD },
+	{ 0x68D0, 0xD9C6 }, { 0x68D1, 0xD9D3 }, { 0x68D2, 0xB4CE }, { 0x68D3, 0xD9AB }, { 0x68D4, 0xD9D5 }, { 0x68D5, 0xB4C4 }, { 0x68D6, 0xD9B3 }, { 0x68D7, 0xB4C7 },
+	{ 0x68D8, 0xB4C6 }, { 0x68DA, 0xB4D7 }, { 0x68DC, 0xD9AD }, { 0x68DD, 0xD9CF }, { 0x68DE, 0xD9D0 }, { 0x68DF, 0xB4C9 }, { 0x68E0, 0xB4C5 }, { 0x68E1, 0xD9BB },
+	{ 0x68E3, 0xB4D0 }, { 0x68E4, 0xD9B6 }, { 0x68E6, 0xD9D1 }, { 0x68E7, 0xB4CC }, { 0x68E8, 0xD9C9 }, { 0x68E9, 0xD9D6 }, { 0x68EA, 0xD9B0 }, { 0x68EB, 0xD9B5 },
+	{ 0x68EC, 0xD9AF }, { 0x68EE, 0xB4CB }, { 0x68EF, 0xD9C2 }, { 0x68F0, 0xDDDE }, { 0x68F1, 0xD9B1 }, { 0x68F2, 0xB4CF }, { 0x68F3, 0xD9BA }, { 0x68F4, 0xD9D2 },
+	{ 0x68F5, 0xB4CA }, { 0x68F6, 0xD9B7 }, { 0x68F7, 0xD9B4 }, { 0x68F8, 0xD9C5 }, { 0x68F9, 0xB4CD }, { 0x68FA, 0xB4C3 }, { 0x68FB, 0xB4D9 }, { 0x68FC, 0xD9C8 },
+	{ 0x68FD, 0xD9C7 }, { 0x6904, 0xD9AC }, { 0x6905, 0xB4C8 }, { 0x6906, 0xD9D4 }, { 0x6907, 0xD9BC }, { 0x6908, 0xD9BE }, { 0x690A, 0xD9CB }, { 0x690B, 0xD9CA },
+	{ 0x690C, 0xD9AA }, { 0x690D, 0xB4D3 }, { 0x690E, 0xB4D5 }, { 0x690F, 0xD9B2 }, { 0x6910, 0xD9B9 }, { 0x6911, 0xD9C1 }, { 0x6912, 0xB4D4 }, { 0x6913, 0xD9B8 },
+	{ 0x6914, 0xD9C4 }, { 0x6915, 0xD9D7 }, { 0x6917, 0xD9CC }, { 0x6925, 0xD9D8 }, { 0x692A, 0xD9AE }, { 0x692F, 0xDDF2 }, { 0x6930, 0xB7A6 }, { 0x6932, 0xDDF0 },
+	{ 0x6933, 0xDDDB }, { 0x6934, 0xDDE0 }, { 0x6935, 0xDDD9 }, { 0x6937, 0xDDEC }, { 0x6938, 0xDDCB }, { 0x6939, 0xDDD2 }, { 0x693B, 0xDDEA }, { 0x693C, 0xDDF4 },
+	{ 0x693D, 0xDDDC }, { 0x693F, 0xDDCF }, { 0x6940, 0xDDE2 }, { 0x6941, 0xDDE7 }, { 0x6942, 0xDDD3 }, { 0x6944, 0xDDE4 }, { 0x6945, 0xDDD0 }, { 0x6948, 0xDDD7 },
+	{ 0x6949, 0xDDD8 }, { 0x694A, 0xB7A8 }, { 0x694B, 0xDDEB }, { 0x694C, 0xDDE9 }, { 0x694E, 0xDDCC }, { 0x694F, 0xDDEE }, { 0x6951, 0xDDEF }, { 0x6952, 0xDDF1 },
+	{ 0x6953, 0xB7AC }, { 0x6954, 0xB7A4 }, { 0x6956, 0xD5B8 }, { 0x6957, 0xDDD4 }, { 0x6958, 0xDDE6 }, { 0x6959, 0xDDD5 }, { 0x695A, 0xB7A1 }, { 0x695B, 0xB7B1 },
+	{ 0x695C, 0xDDED }, { 0x695D, 0xB7AF }, { 0x695E, 0xB7AB }, { 0x695F, 0xDDCA }, { 0x6960, 0xB7A3 }, { 0x6962, 0xDDCD }, { 0x6963, 0xB7B0 }, { 0x6965, 0xDDDD },
+	{ 0x6966, 0xDDC9 }, { 0x6968, 0xB7A9 }, { 0x6969, 0xDDE1 }, { 0x696A, 0xDDD1 }, { 0x696B, 0xB7AA }, { 0x696C, 0xDDDA }, { 0x696D, 0xB77E }, { 0x696E, 0xB4D8 },
+	{ 0x696F, 0xDDE3 }, { 0x6970, 0xD9BF }, { 0x6971, 0xDDCE }, { 0x6974, 0xDDE8 }, { 0x6975, 0xB7A5 }, { 0x6976, 0xDDE5 }, { 0x6977, 0xB7A2 }, { 0x6978, 0xDDDF },
+	{ 0x6979, 0xB7AD }, { 0x697A, 0xDDD6 }, { 0x697B, 0xDDF3 }, { 0x6982, 0xB7A7 }, { 0x6983, 0xDEC6 }, { 0x6986, 0xB7AE }, { 0x698D, 0xE24A }, { 0x698E, 0xE248 },
+	{ 0x6990, 0xE25E }, { 0x6991, 0xE246 }, { 0x6993, 0xE258 }, { 0x6994, 0xB77D }, { 0x6995, 0xBA5F }, { 0x6996, 0xE242 }, { 0x6997, 0xE25D }, { 0x6999, 0xE247 },
+	{ 0x699A, 0xE255 }, { 0x699B, 0xBA64 }, { 0x699C, 0xBA5D }, { 0x699E, 0xE25B }, { 0x69A0, 0xE240 }, { 0x69A1, 0xE25A }, { 0x69A3, 0xBA6F }, { 0x69A4, 0xE251 },
+	{ 0x69A5, 0xE261 }, { 0x69A6, 0xBA6D }, { 0x69A7, 0xE249 }, { 0x69A8, 0xBA5E }, { 0x69A9, 0xE24B }, { 0x69AA, 0xE259 }, { 0x69AB, 0xBA67 }, { 0x69AC, 0xE244 },
+	{ 0x69AD, 0xBA6B }, { 0x69AE, 0xBA61 }, { 0x69AF, 0xE24D }, { 0x69B0, 0xE243 }, { 0x69B1, 0xE1FC }, { 0x69B3, 0xE257 }, { 0x69B4, 0xBA68 }, { 0x69B5, 0xE260 },
+	{ 0x69B6, 0xE1FD }, { 0x69B7, 0xBA65 }, { 0x69B9, 0xE253 }, { 0x69BB, 0xBA66 }, { 0x69BC, 0xE245 }, { 0x69BD, 0xE250 }, { 0x69BE, 0xE24C }, { 0x69BF, 0xE24E },
+	{ 0x69C1, 0xBA60 }, { 0x69C2, 0xE25F }, { 0x69C3, 0xBA6E }, { 0x69C4, 0xE24F }, { 0x69C6, 0xE262 }, { 0x69C9, 0xE1FE }, { 0x69CA, 0xE254 }, { 0x69CB, 0xBA63 },
+	{ 0x69CC, 0xBA6C }, { 0x69CD, 0xBA6A }, { 0x69CE, 0xE241 }, { 0x69CF, 0xE256 }, { 0x69D0, 0xBA69 }, { 0x69D3, 0xBA62 }, { 0x69D4, 0xE252 }, { 0x69D9, 0xE25C },
+	{ 0x69E2, 0xE5D5 }, { 0x69E4, 0xE5D1 }, { 0x69E5, 0xE5CD }, { 0x69E6, 0xE5E1 }, { 0x69E7, 0xE5DE }, { 0x69E8, 0xBCCD }, { 0x69EB, 0xE5E5 }, { 0x69EC, 0xE5D4 },
+	{ 0x69ED, 0xBCD8 }, { 0x69EE, 0xE5DB }, { 0x69F1, 0xE5D0 }, { 0x69F2, 0xE5DA }, { 0x69F3, 0xBCD5 }, { 0x69F4, 0xE5EE }, { 0x69F6, 0xE5EB }, { 0x69F7, 0xE5DD },
+	{ 0x69F8, 0xE5CE }, { 0x69FB, 0xE5E2 }, { 0x69FC, 0xE5E4 }, { 0x69FD, 0xBCD1 }, { 0x69FE, 0xE5D8 }, { 0x69FF, 0xE5D3 }, { 0x6A00, 0xE5CA }, { 0x6A01, 0xBCCE },
+	{ 0x6A02, 0xBCD6 }, { 0x6A04, 0xE5E7 }, { 0x6A05, 0xBCD7 }, { 0x6A06, 0xE5CB }, { 0x6A07, 0xE5ED }, { 0x6A08, 0xE5E0 }, { 0x6A09, 0xE5E6 }, { 0x6A0A, 0xBCD4 },
+	{ 0x6A0D, 0xE5E3 }, { 0x6A0F, 0xE5EA }, { 0x6A11, 0xBCD9 }, { 0x6A13, 0xBCD3 }, { 0x6A14, 0xE5DC }, { 0x6A15, 0xE5CF }, { 0x6A16, 0xE5EF }, { 0x6A17, 0xE5CC },
+	{ 0x6A18, 0xE5E8 }, { 0x6A19, 0xBCD0 }, { 0x6A1B, 0xE5D6 }, { 0x6A1D, 0xE5D7 }, { 0x6A1E, 0xBCCF }, { 0x6A1F, 0xBCCC }, { 0x6A20, 0xE5D2 }, { 0x6A21, 0xBCD2 },
+	{ 0x6A23, 0xBCCB }, { 0x6A25, 0xE5E9 }, { 0x6A26, 0xE5EC }, { 0x6A27, 0xE5D9 }, { 0x6A28, 0xE9CA }, { 0x6A32, 0xE9C2 }, { 0x6A34, 0xE9BE }, { 0x6A35, 0xBEF6 },
+	{ 0x6A38, 0xBEEB }, { 0x6A39, 0xBEF0 }, { 0x6A3A, 0xBEEC }, { 0x6A3B, 0xE9CC }, { 0x6A3C, 0xE9D7 }, { 0x6A3D, 0xBEEA }, { 0x6A3E, 0xE9C4 }, { 0x6A3F, 0xE9CD },
+	{ 0x6A40, 0xE5DF }, { 0x6A41, 0xE9CE }, { 0x6A44, 0xBEF1 }, { 0x6A46, 0xE9DD }, { 0x6A47, 0xBEF5 }, { 0x6A48, 0xBEF8 }, { 0x6A49, 0xE9C0 }, { 0x6A4B, 0xBEF4 },
+	{ 0x6A4D, 0xE9DB }, { 0x6A4E, 0xE9DC }, { 0x6A4F, 0xE9D2 }, { 0x6A50, 0xE9D1 }, { 0x6A51, 0xE9C9 }, { 0x6A54, 0xE9D3 }, { 0x6A55, 0xE9DA }, { 0x6A56, 0xE9D9 },
+	{ 0x6A58, 0xBEEF }, { 0x6A59, 0xBEED }, { 0x6A5A, 0xE9CB }, { 0x6A5B, 0xE9C8 }, { 0x6A5D, 0xE9C5 }, { 0x6A5E, 0xE9D8 }, { 0x6A5F, 0xBEF7 }, { 0x6A60, 0xE9D6 },
+	{ 0x6A61, 0xBEF3 }, { 0x6A62, 0xBEF2 }, { 0x6A64, 0xE9D0 }, { 0x6A66, 0xE9BF }, { 0x6A67, 0xE9C1 }, { 0x6A68, 0xE9C3 }, { 0x6A69, 0xE9D5 }, { 0x6A6A, 0xE9CF },
+	{ 0x6A6B, 0xBEEE }, { 0x6A6D, 0xE9C6 }, { 0x6A6F, 0xE9D4 }, { 0x6A76, 0xE9C7 }, { 0x6A7E, 0xC0CF }, { 0x6A7F, 0xED45 }, { 0x6A80, 0xC0C8 }, { 0x6A81, 0xECF5 },
+	{ 0x6A83, 0xED41 }, { 0x6A84, 0xC0CA }, { 0x6A85, 0xED48 }, { 0x6A87, 0xECFC }, { 0x6A89, 0xECF7 }, { 0x6A8C, 0xED49 }, { 0x6A8D, 0xECF3 }, { 0x6A8E, 0xECFE },
+	{ 0x6A90, 0xC0D1 }, { 0x6A91, 0xED44 }, { 0x6A92, 0xED4A }, { 0x6A93, 0xECFD }, { 0x6A94, 0xC0C9 }, { 0x6A95, 0xED40 }, { 0x6A96, 0xECF4 }, { 0x6A97, 0xC0D0 },
+	{ 0x6A9A, 0xED47 }, { 0x6A9B, 0xECF9 }, { 0x6A9C, 0xC0CC }, { 0x6A9E, 0xECFB }, { 0x6A9F, 0xECF8 }, { 0x6AA0, 0xC0D2 }, { 0x6AA1, 0xECFA }, { 0x6AA2, 0xC0CB },
+	{ 0x6AA3, 0xC0CE }, { 0x6AA4, 0xED43 }, { 0x6AA5, 0xECF6 }, { 0x6AA6, 0xED46 }, { 0x6AA8, 0xED42 }, { 0x6AAC, 0xC263 }, { 0x6AAD, 0xEFE7 }, { 0x6AAE, 0xC268 },
+	{ 0x6AAF, 0xC269 }, { 0x6AB3, 0xC262 }, { 0x6AB4, 0xEFE6 }, { 0x6AB6, 0xEFE3 }, { 0x6AB7, 0xEFE4 }, { 0x6AB8, 0xC266 }, { 0x6AB9, 0xEFDE }, { 0x6ABA, 0xEFE2 },
+	{ 0x6ABB, 0xC265 }, { 0x6ABD, 0xEFDF }, { 0x6AC2, 0xC267 }, { 0x6AC3, 0xC264 }, { 0x6AC5, 0xEFDD }, { 0x6AC6, 0xEFE1 }, { 0x6AC7, 0xEFE5 }, { 0x6ACB, 0xF251 },
+	{ 0x6ACC, 0xF24E }, { 0x6ACD, 0xF257 }, { 0x6ACF, 0xF256 }, { 0x6AD0, 0xF254 }, { 0x6AD1, 0xF24F }, { 0x6AD3, 0xC372 }, { 0x6AD9, 0xF250 }, { 0x6ADA, 0xC371 },
+	{ 0x6ADB, 0xC0CD }, { 0x6ADC, 0xF253 }, { 0x6ADD, 0xC370 }, { 0x6ADE, 0xF258 }, { 0x6ADF, 0xF252 }, { 0x6AE0, 0xF24D }, { 0x6AE1, 0xEFE0 }, { 0x6AE5, 0xC36F },
+	{ 0x6AE7, 0xF24C }, { 0x6AE8, 0xF456 }, { 0x6AEA, 0xF455 }, { 0x6AEB, 0xF255 }, { 0x6AEC, 0xC468 }, { 0x6AEE, 0xF459 }, { 0x6AEF, 0xF45A }, { 0x6AF0, 0xF454 },
+	{ 0x6AF1, 0xF458 }, { 0x6AF3, 0xF453 }, { 0x6AF8, 0xF5D1 }, { 0x6AF9, 0xF457 }, { 0x6AFA, 0xC4E7 }, { 0x6AFB, 0xC4E5 }, { 0x6AFC, 0xF5CF }, { 0x6B00, 0xF5D2 },
+	{ 0x6B02, 0xF5CE }, { 0x6B03, 0xF5D0 }, { 0x6B04, 0xC4E6 }, { 0x6B08, 0xF6E5 }, { 0x6B09, 0xF6E6 }, { 0x6B0A, 0xC576 }, { 0x6B0B, 0xF6E4 }, { 0x6B0F, 0xF7E2 },
+	{ 0x6B10, 0xC5CF }, { 0x6B11, 0xF7E0 }, { 0x6B12, 0xF7E1 }, { 0x6B13, 0xF8AC }, { 0x6B16, 0xC656 }, { 0x6B17, 0xF8F3 }, { 0x6B18, 0xF8F1 }, { 0x6B19, 0xF8F2 },
+	{ 0x6B1A, 0xF8F4 }, { 0x6B1E, 0xF9BB }, { 0x6B20, 0xA4ED }, { 0x6B21, 0xA6B8 }, { 0x6B23, 0xAA59 }, { 0x6B25, 0xCCE9 }, { 0x6B28, 0xCF64 }, { 0x6B2C, 0xD1F5 },
+	{ 0x6B2D, 0xD1F7 }, { 0x6B2F, 0xD1F6 }, { 0x6B31, 0xD1F8 }, { 0x6B32, 0xB1FD }, { 0x6B33, 0xD5D7 }, { 0x6B34, 0xD1F9 }, { 0x6B36, 0xD5D6 }, { 0x6B37, 0xD5D8 },
+	{ 0x6B38, 0xD5D9 }, { 0x6B39, 0xD9DA }, { 0x6B3A, 0xB4DB }, { 0x6B3B, 0xD9DB }, { 0x6B3C, 0xD9DD }, { 0x6B3D, 0xB4DC }, { 0x6B3E, 0xB4DA }, { 0x6B3F, 0xD9DC },
+	{ 0x6B41, 0xDDFA }, { 0x6B42, 0xDDF8 }, { 0x6B43, 0xDDF7 }, { 0x6B45, 0xDDF6 }, { 0x6B46, 0xDDF5 }, { 0x6B47, 0xB7B2 }, { 0x6B48, 0xDDF9 }, { 0x6B49, 0xBA70 },
+	{ 0x6B4A, 0xE263 }, { 0x6B4B, 0xE265 }, { 0x6B4C, 0xBA71 }, { 0x6B4D, 0xE264 }, { 0x6B4E, 0xBCDB }, { 0x6B50, 0xBCDA }, { 0x6B51, 0xE5F0 }, { 0x6B54, 0xE9DF },
+	{ 0x6B55, 0xE9DE }, { 0x6B56, 0xE9E0 }, { 0x6B59, 0xBEF9 }, { 0x6B5B, 0xED4B }, { 0x6B5C, 0xC0D3 }, { 0x6B5E, 0xEFE8 }, { 0x6B5F, 0xC26A }, { 0x6B60, 0xF259 },
+	{ 0x6B61, 0xC577 }, { 0x6B62, 0xA4EE }, { 0x6B63, 0xA5BF }, { 0x6B64, 0xA6B9 }, { 0x6B65, 0xA842 }, { 0x6B66, 0xAA5A }, { 0x6B67, 0xAA5B }, { 0x6B6A, 0xAC6E },
+	{ 0x6B6D, 0xD1FA }, { 0x6B72, 0xB7B3 }, { 0x6B76, 0xE6D1 }, { 0x6B77, 0xBEFA }, { 0x6B78, 0xC26B }, { 0x6B79, 0xA4EF }, { 0x6B7B, 0xA6BA }, { 0x6B7E, 0xCCEB },
+	{ 0x6B7F, 0xAA5C }, { 0x6B80, 0xCCEA }, { 0x6B82, 0xCF65 }, { 0x6B83, 0xAC6F }, { 0x6B84, 0xCF66 }, { 0x6B86, 0xAC70 }, { 0x6B88, 0xD1FC }, { 0x6B89, 0xAEEE },
+	{ 0x6B8A, 0xAEED }, { 0x6B8C, 0xD5DE }, { 0x6B8D, 0xD5DC }, { 0x6B8E, 0xD5DD }, { 0x6B8F, 0xD5DB }, { 0x6B91, 0xD5DA }, { 0x6B94, 0xD9DE }, { 0x6B95, 0xD9E1 },
+	{ 0x6B96, 0xB4DE }, { 0x6B97, 0xD9DF }, { 0x6B98, 0xB4DD }, { 0x6B99, 0xD9E0 }, { 0x6B9B, 0xDDFB }, { 0x6B9E, 0xE266 }, { 0x6B9F, 0xE267 }, { 0x6BA0, 0xE268 },
+	{ 0x6BA2, 0xE5F3 }, { 0x6BA3, 0xE5F2 }, { 0x6BA4, 0xBCDC }, { 0x6BA5, 0xE5F1 }, { 0x6BA6, 0xE5F4 }, { 0x6BA7, 0xE9E1 }, { 0x6BAA, 0xE9E2 }, { 0x6BAB, 0xE9E3 },
+	{ 0x6BAD, 0xED4C }, { 0x6BAE, 0xC0D4 }, { 0x6BAF, 0xC26C }, { 0x6BB0, 0xF25A }, { 0x6BB2, 0xC4E8 }, { 0x6BB3, 0xC95F }, { 0x6BB5, 0xAC71 }, { 0x6BB6, 0xCF67 },
+	{ 0x6BB7, 0xAEEF }, { 0x6BBA, 0xB1FE }, { 0x6BBC, 0xB4DF }, { 0x6BBD, 0xD9E2 }, { 0x6BBF, 0xB7B5 }, { 0x6BC0, 0xB7B4 }, { 0x6BC3, 0xE269 }, { 0x6BC4, 0xE26A },
+	{ 0x6BC5, 0xBCDD }, { 0x6BC6, 0xBCDE }, { 0x6BC7, 0xE9E5 }, { 0x6BC8, 0xE9E4 }, { 0x6BC9, 0xEFE9 }, { 0x6BCA, 0xF7E3 }, { 0x6BCB, 0xA4F0 }, { 0x6BCC, 0xC960 },
+	{ 0x6BCD, 0xA5C0 }, { 0x6BCF, 0xA843 }, { 0x6BD0, 0xCB48 }, { 0x6BD2, 0xAC72 }, { 0x6BD3, 0xB7B6 }, { 0x6BD4, 0xA4F1 }, { 0x6BD6, 0xCF68 }, { 0x6BD7, 0xAC73 },
+	{ 0x6BD8, 0xCF69 }, { 0x6BDA, 0xC0D5 }, { 0x6BDB, 0xA4F2 }, { 0x6BDE, 0xCCEC }, { 0x6BE0, 0xCF6A }, { 0x6BE2, 0xD242 }, { 0x6BE3, 0xD241 }, { 0x6BE4, 0xD1FE },
+	{ 0x6BE6, 0xD1FD }, { 0x6BE7, 0xD243 }, { 0x6BE8, 0xD240 }, { 0x6BEB, 0xB240 }, { 0x6BEC, 0xB241 }, { 0x6BEF, 0xB4E0 }, { 0x6BF0, 0xD9E3 }, { 0x6BF2, 0xD9E4 },
+	{ 0x6BF3, 0xD9E5 }, { 0x6BF7, 0xDE41 }, { 0x6BF8, 0xDE42 }, { 0x6BF9, 0xDE40 }, { 0x6BFB, 0xDDFD }, { 0x6BFC, 0xDDFE }, { 0x6BFD, 0xB7B7 }, { 0x6BFE, 0xE26B },
+	{ 0x6BFF, 0xE5F7 }, { 0x6C00, 0xE5F6 }, { 0x6C01, 0xE5F5 }, { 0x6C02, 0xE5F8 }, { 0x6C03, 0xE9E7 }, { 0x6C04, 0xE9E6 }, { 0x6C05, 0xBEFB }, { 0x6C06, 0xE9E8 },
+	{ 0x6C08, 0xC0D6 }, { 0x6C09, 0xED4D }, { 0x6C0B, 0xEFEA }, { 0x6C0C, 0xF25B }, { 0x6C0D, 0xF6E7 }, { 0x6C0F, 0xA4F3 }, { 0x6C10, 0xA5C2 }, { 0x6C11, 0xA5C1 },
+	{ 0x6C13, 0xAA5D }, { 0x6C14, 0xC961 }, { 0x6C15, 0xC97E }, { 0x6C16, 0xA6BB }, { 0x6C18, 0xC9F7 }, { 0x6C19, 0xCB49 }, { 0x6C1A, 0xCB4A }, { 0x6C1B, 0xAA5E },
+	{ 0x6C1D, 0xCCED }, { 0x6C1F, 0xAC74 }, { 0x6C20, 0xCF6B }, { 0x6C21, 0xCF6C }, { 0x6C23, 0xAEF0 }, { 0x6C24, 0xAEF4 }, { 0x6C25, 0xD244 }, { 0x6C26, 0xAEF3 },
+	{ 0x6C27, 0xAEF1 }, { 0x6C28, 0xAEF2 }, { 0x6C2A, 0xD5DF }, { 0x6C2B, 0xB242 }, { 0x6C2C, 0xB4E3 }, { 0x6C2E, 0xB4E1 }, { 0x6C2F, 0xB4E2 }, { 0x6C30, 0xD9E6 },
+	{ 0x6C33, 0xBA72 }, { 0x6C34, 0xA4F4 }, { 0x6C36, 0xC9A1 }, { 0x6C38, 0xA5C3 }, { 0x6C3B, 0xC9A4 }, { 0x6C3E, 0xA5C6 }, { 0x6C3F, 0xC9A3 }, { 0x6C40, 0xA5C5 },
+	{ 0x6C41, 0xA5C4 }, { 0x6C42, 0xA844 }, { 0x6C43, 0xC9A2 }, { 0x6C46, 0xC9F8 }, { 0x6C4A, 0xC9FC }, { 0x6C4B, 0xC9FE }, { 0x6C4C, 0xCA40 }, { 0x6C4D, 0xA6C5 },
+	{ 0x6C4E, 0xA6C6 }, { 0x6C4F, 0xC9FB }, { 0x6C50, 0xA6C1 }, { 0x6C52, 0xC9F9 }, { 0x6C54, 0xC9FD }, { 0x6C55, 0xA6C2 }, { 0x6C57, 0xA6BD }, { 0x6C59, 0xA6BE },
+	{ 0x6C5B, 0xA6C4 }, { 0x6C5C, 0xC9FA }, { 0x6C5D, 0xA6BC }, { 0x6C5E, 0xA845 }, { 0x6C5F, 0xA6BF }, { 0x6C60, 0xA6C0 }, { 0x6C61, 0xA6C3 }, { 0x6C65, 0xCB5B },
+	{ 0x6C66, 0xCB59 }, { 0x6C67, 0xCB4C }, { 0x6C68, 0xA851 }, { 0x6C69, 0xCB53 }, { 0x6C6A, 0xA84C }, { 0x6C6B, 0xCB4D }, { 0x6C6D, 0xCB55 }, { 0x6C6F, 0xCB52 },
+	{ 0x6C70, 0xA84F }, { 0x6C71, 0xCB51 }, { 0x6C72, 0xA856 }, { 0x6C73, 0xCB5A }, { 0x6C74, 0xA858 }, { 0x6C76, 0xA85A }, { 0x6C78, 0xCB4B }, { 0x6C7A, 0xA84D },
+	{ 0x6C7B, 0xCB5C }, { 0x6C7D, 0xA854 }, { 0x6C7E, 0xA857 }, { 0x6C80, 0xCD45 }, { 0x6C81, 0xA847 }, { 0x6C82, 0xA85E }, { 0x6C83, 0xA855 }, { 0x6C84, 0xCB4E },
+	{ 0x6C85, 0xA84A }, { 0x6C86, 0xA859 }, { 0x6C87, 0xCB56 }, { 0x6C88, 0xA848 }, { 0x6C89, 0xA849 }, { 0x6C8A, 0xCD43 }, { 0x6C8B, 0xCB4F }, { 0x6C8C, 0xA850 },
+	{ 0x6C8D, 0xA85B }, { 0x6C8E, 0xCB5D }, { 0x6C8F, 0xCB50 }, { 0x6C90, 0xA84E }, { 0x6C92, 0xA853 }, { 0x6C93, 0xCCEE }, { 0x6C94, 0xA85C }, { 0x6C95, 0xCB57 },
+	{ 0x6C96, 0xA852 }, { 0x6C98, 0xA85D }, { 0x6C99, 0xA846 }, { 0x6C9A, 0xCB54 }, { 0x6C9B, 0xA84B }, { 0x6C9C, 0xCB58 }, { 0x6C9D, 0xCD44 }, { 0x6CAB, 0xAA6A },
+	{ 0x6CAC, 0xAA7A }, { 0x6CAD, 0xCCF5 }, { 0x6CAE, 0xAA71 }, { 0x6CB0, 0xCD4B }, { 0x6CB1, 0xAA62 }, { 0x6CB3, 0xAA65 }, { 0x6CB4, 0xCD42 }, { 0x6CB6, 0xCCF3 },
+	{ 0x6CB7, 0xCCF7 }, { 0x6CB8, 0xAA6D }, { 0x6CB9, 0xAA6F }, { 0x6CBA, 0xCCFA }, { 0x6CBB, 0xAA76 }, { 0x6CBC, 0xAA68 }, { 0x6CBD, 0xAA66 }, { 0x6CBE, 0xAA67 },
+	{ 0x6CBF, 0xAA75 }, { 0x6CC0, 0xCD47 }, { 0x6CC1, 0xAA70 }, { 0x6CC2, 0xCCF9 }, { 0x6CC3, 0xCCFB }, { 0x6CC4, 0xAA6E }, { 0x6CC5, 0xAA73 }, { 0x6CC6, 0xCCFC },
+	{ 0x6CC7, 0xCD4A }, { 0x6CC9, 0xAC75 }, { 0x6CCA, 0xAA79 }, { 0x6CCC, 0xAA63 }, { 0x6CCD, 0xCD49 }, { 0x6CCF, 0xCD4D }, { 0x6CD0, 0xCCF8 }, { 0x6CD1, 0xCD4F },
+	{ 0x6CD2, 0xCD40 }, { 0x6CD3, 0xAA6C }, { 0x6CD4, 0xCCF4 }, { 0x6CD5, 0xAA6B }, { 0x6CD6, 0xAA7D }, { 0x6CD7, 0xAA72 }, { 0x6CD9, 0xCCF2 }, { 0x6CDA, 0xCF75 },
+	{ 0x6CDB, 0xAA78 }, { 0x6CDC, 0xAA7C }, { 0x6CDD, 0xCD41 }, { 0x6CDE, 0xCD46 }, { 0x6CE0, 0xAA7E }, { 0x6CE1, 0xAA77 }, { 0x6CE2, 0xAA69 }, { 0x6CE3, 0xAA5F },
+	{ 0x6CE5, 0xAA64 }, { 0x6CE7, 0xCCF6 }, { 0x6CE8, 0xAA60 }, { 0x6CE9, 0xCD4E }, { 0x6CEB, 0xCCF0 }, { 0x6CEC, 0xCCEF }, { 0x6CED, 0xCCFD }, { 0x6CEE, 0xCCF1 },
+	{ 0x6CEF, 0xAA7B }, { 0x6CF0, 0xAEF5 }, { 0x6CF1, 0xAA74 }, { 0x6CF2, 0xCCFE }, { 0x6CF3, 0xAA61 }, { 0x6CF5, 0xACA6 }, { 0x6CF9, 0xCD4C }, { 0x6D00, 0xCF7C },
+	{ 0x6D01, 0xCFA1 }, { 0x6D03, 0xCFA4 }, { 0x6D04, 0xCF77 }, { 0x6D07, 0xCFA7 }, { 0x6D08, 0xCFAA }, { 0x6D09, 0xCFAC }, { 0x6D0A, 0xCF74 }, { 0x6D0B, 0xAC76 },
+	{ 0x6D0C, 0xAC7B }, { 0x6D0D, 0xD249 }, { 0x6D0E, 0xACAD }, { 0x6D0F, 0xCFA5 }, { 0x6D10, 0xCFAD }, { 0x6D11, 0xCF7B }, { 0x6D12, 0xCF73 }, { 0x6D16, 0xD264 },
+	{ 0x6D17, 0xAC7E }, { 0x6D18, 0xCFA2 }, { 0x6D19, 0xCF78 }, { 0x6D1A, 0xCF7A }, { 0x6D1B, 0xACA5 }, { 0x6D1D, 0xCF7D }, { 0x6D1E, 0xAC7D }, { 0x6D1F, 0xCF70 },
+	{ 0x6D20, 0xCFA8 }, { 0x6D22, 0xCFAB }, { 0x6D25, 0xAC7A }, { 0x6D27, 0xACA8 }, { 0x6D28, 0xCF6D }, { 0x6D29, 0xACAA }, { 0x6D2A, 0xAC78 }, { 0x6D2B, 0xACAE },
+	{ 0x6D2C, 0xCFA9 }, { 0x6D2D, 0xCF6F }, { 0x6D2E, 0xACAB }, { 0x6D2F, 0xD25E }, { 0x6D30, 0xCD48 }, { 0x6D31, 0xAC7C }, { 0x6D32, 0xAC77 }, { 0x6D33, 0xCF76 },
+	{ 0x6D34, 0xCF6E }, { 0x6D35, 0xACAC }, { 0x6D36, 0xACA4 }, { 0x6D37, 0xCFA3 }, { 0x6D38, 0xACA9 }, { 0x6D39, 0xACA7 }, { 0x6D3A, 0xCF79 }, { 0x6D3B, 0xACA1 },
+	{ 0x6D3C, 0xCF71 }, { 0x6D3D, 0xACA2 }, { 0x6D3E, 0xACA3 }, { 0x6D3F, 0xCF72 }, { 0x6D40, 0xCFA6 }, { 0x6D41, 0xAC79 }, { 0x6D42, 0xCF7E }, { 0x6D58, 0xD24C },
+	{ 0x6D59, 0xAEFD }, { 0x6D5A, 0xAF43 }, { 0x6D5E, 0xD255 }, { 0x6D5F, 0xD25B }, { 0x6D60, 0xD257 }, { 0x6D61, 0xD24A }, { 0x6D62, 0xD24D }, { 0x6D63, 0xD246 },
+	{ 0x6D64, 0xD247 }, { 0x6D65, 0xAF4A }, { 0x6D66, 0xAEFA }, { 0x6D67, 0xD256 }, { 0x6D68, 0xD25F }, { 0x6D69, 0xAF45 }, { 0x6D6A, 0xAEF6 }, { 0x6D6C, 0xAF40 },
+	{ 0x6D6D, 0xD24E }, { 0x6D6E, 0xAF42 }, { 0x6D6F, 0xD24F }, { 0x6D70, 0xD259 }, { 0x6D74, 0xAF44 }, { 0x6D75, 0xD268 }, { 0x6D76, 0xD248 }, { 0x6D77, 0xAEFC },
+	{ 0x6D78, 0xAEFB }, { 0x6D79, 0xAF48 }, { 0x6D7A, 0xD245 }, { 0x6D7B, 0xD266 }, { 0x6D7C, 0xD25A }, { 0x6D7D, 0xD267 }, { 0x6D7E, 0xD261 }, { 0x6D7F, 0xD253 },
+	{ 0x6D80, 0xD262 }, { 0x6D82, 0xD25C }, { 0x6D83, 0xD265 }, { 0x6D84, 0xD263 }, { 0x6D85, 0xAF49 }, { 0x6D86, 0xD254 }, { 0x6D87, 0xAEF9 }, { 0x6D88, 0xAEF8 },
+	{ 0x6D89, 0xAF41 }, { 0x6D8A, 0xAF47 }, { 0x6D8B, 0xD260 }, { 0x6D8C, 0xAF46 }, { 0x6D8D, 0xD251 }, { 0x6D8E, 0xB243 }, { 0x6D90, 0xD269 }, { 0x6D91, 0xD250 },
+	{ 0x6D92, 0xD24B }, { 0x6D93, 0xAEFE }, { 0x6D94, 0xAF4B }, { 0x6D95, 0xAEF7 }, { 0x6D97, 0xD258 }, { 0x6D98, 0xD25D }, { 0x6DAA, 0xB265 }, { 0x6DAB, 0xD5E1 },
+	{ 0x6DAC, 0xD5E5 }, { 0x6DAE, 0xB252 }, { 0x6DAF, 0xB250 }, { 0x6DB2, 0xB247 }, { 0x6DB3, 0xD5E3 }, { 0x6DB4, 0xD5E2 }, { 0x6DB5, 0xB25B }, { 0x6DB7, 0xD5E8 },
+	{ 0x6DB8, 0xB255 }, { 0x6DBA, 0xD5FA }, { 0x6DBB, 0xD647 }, { 0x6DBC, 0xB244 }, { 0x6DBD, 0xD5F7 }, { 0x6DBE, 0xD5F0 }, { 0x6DBF, 0xB267 }, { 0x6DC0, 0xD5E0 },
+	{ 0x6DC2, 0xD5FC }, { 0x6DC4, 0xB264 }, { 0x6DC5, 0xB258 }, { 0x6DC6, 0xB263 }, { 0x6DC7, 0xB24E }, { 0x6DC8, 0xD5EC }, { 0x6DC9, 0xD5FE }, { 0x6DCA, 0xD5F6 },
+	{ 0x6DCB, 0xB24F }, { 0x6DCC, 0xB249 }, { 0x6DCD, 0xD645 }, { 0x6DCF, 0xD5FD }, { 0x6DD0, 0xD640 }, { 0x6DD1, 0xB251 }, { 0x6DD2, 0xB259 }, { 0x6DD3, 0xD642 },
+	{ 0x6DD4, 0xD5EA }, { 0x6DD5, 0xD5FB }, { 0x6DD6, 0xD5EF }, { 0x6DD7, 0xD644 }, { 0x6DD8, 0xB25E }, { 0x6DD9, 0xB246 }, { 0x6DDA, 0xB25C }, { 0x6DDB, 0xD5F4 },
+	{ 0x6DDC, 0xD5F2 }, { 0x6DDD, 0xD5F3 }, { 0x6DDE, 0xB253 }, { 0x6DDF, 0xD5EE }, { 0x6DE0, 0xD5ED }, { 0x6DE1, 0xB248 }, { 0x6DE2, 0xD5E7 }, { 0x6DE3, 0xD646 },
+	{ 0x6DE4, 0xB24A }, { 0x6DE5, 0xD5F1 }, { 0x6DE6, 0xB268 }, { 0x6DE8, 0xB262 }, { 0x6DE9, 0xD5E6 }, { 0x6DEA, 0xB25F }, { 0x6DEB, 0xB25D }, { 0x6DEC, 0xB266 },
+	{ 0x6DED, 0xD5F8 }, { 0x6DEE, 0xB261 }, { 0x6DEF, 0xD252 }, { 0x6DF0, 0xD5F9 }, { 0x6DF1, 0xB260 }, { 0x6DF2, 0xD641 }, { 0x6DF3, 0xB245 }, { 0x6DF4, 0xD5F5 },
+	{ 0x6DF5, 0xB257 }, { 0x6DF6, 0xD5E9 }, { 0x6DF7, 0xB256 }, { 0x6DF9, 0xB254 }, { 0x6DFA, 0xB24C }, { 0x6DFB, 0xB24B }, { 0x6DFC, 0xD9E7 }, { 0x6DFD, 0xD643 },
+	{ 0x6E00, 0xD5EB }, { 0x6E03, 0xD9FC }, { 0x6E05, 0xB24D }, { 0x6E19, 0xB541 }, { 0x6E1A, 0xB25A }, { 0x6E1B, 0xB4EE }, { 0x6E1C, 0xD9F6 }, { 0x6E1D, 0xB4FC },
+	{ 0x6E1F, 0xD9EA }, { 0x6E20, 0xB4EB }, { 0x6E21, 0xB4E7 }, { 0x6E22, 0xDA49 }, { 0x6E23, 0xB4ED }, { 0x6E24, 0xB4F1 }, { 0x6E25, 0xB4EC }, { 0x6E26, 0xB4F5 },
+	{ 0x6E27, 0xDA4D }, { 0x6E28, 0xDA44 }, { 0x6E2B, 0xD9F1 }, { 0x6E2C, 0xB4FA }, { 0x6E2D, 0xB4F4 }, { 0x6E2E, 0xD9FD }, { 0x6E2F, 0xB4E4 }, { 0x6E30, 0xDA4A },
+	{ 0x6E31, 0xDA43 }, { 0x6E32, 0xB4E8 }, { 0x6E33, 0xD9F7 }, { 0x6E34, 0xB4F7 }, { 0x6E35, 0xDA55 }, { 0x6E36, 0xDA56 }, { 0x6E38, 0xB4E5 }, { 0x6E39, 0xDA48 },
+	{ 0x6E3A, 0xB4F9 }, { 0x6E3B, 0xD9FB }, { 0x6E3C, 0xD9ED }, { 0x6E3D, 0xD9EE }, { 0x6E3E, 0xB4FD }, { 0x6E3F, 0xD9F2 }, { 0x6E40, 0xD9F9 }, { 0x6E41, 0xD9F3 },
+	{ 0x6E43, 0xB4FB }, { 0x6E44, 0xB544 }, { 0x6E45, 0xD9EF }, { 0x6E46, 0xD9E8 }, { 0x6E47, 0xD9E9 }, { 0x6E49, 0xD9EB }, { 0x6E4A, 0xB4EA }, { 0x6E4B, 0xD9F8 },
+	{ 0x6E4D, 0xB4F8 }, { 0x6E4E, 0xB542 }, { 0x6E51, 0xD9FA }, { 0x6E52, 0xDA53 }, { 0x6E53, 0xDA4B }, { 0x6E54, 0xB4E6 }, { 0x6E55, 0xDA51 }, { 0x6E56, 0xB4F2 },
+	{ 0x6E58, 0xB4F0 }, { 0x6E5A, 0xDA57 }, { 0x6E5B, 0xB4EF }, { 0x6E5C, 0xDA41 }, { 0x6E5D, 0xD9F4 }, { 0x6E5E, 0xD9FE }, { 0x6E5F, 0xB547 }, { 0x6E60, 0xDA45 },
+	{ 0x6E61, 0xDA42 }, { 0x6E62, 0xD9F0 }, { 0x6E63, 0xB543 }, { 0x6E64, 0xDA4F }, { 0x6E65, 0xDA4C }, { 0x6E66, 0xDA54 }, { 0x6E67, 0xB4E9 }, { 0x6E68, 0xDA40 },
+	{ 0x6E69, 0xB546 }, { 0x6E6B, 0xDA47 }, { 0x6E6E, 0xB4F3 }, { 0x6E6F, 0xB4F6 }, { 0x6E71, 0xDA46 }, { 0x6E72, 0xB545 }, { 0x6E73, 0xD9F5 }, { 0x6E74, 0xD5E4 },
+	{ 0x6E77, 0xDA50 }, { 0x6E78, 0xDA4E }, { 0x6E79, 0xDA52 }, { 0x6E88, 0xD9EC }, { 0x6E89, 0xB540 }, { 0x6E8D, 0xDE61 }, { 0x6E8E, 0xDE60 }, { 0x6E8F, 0xDE46 },
+	{ 0x6E90, 0xB7BD }, { 0x6E92, 0xDE5F }, { 0x6E93, 0xDE49 }, { 0x6E94, 0xDE4A }, { 0x6E96, 0xB7C7 }, { 0x6E97, 0xDE68 }, { 0x6E98, 0xB7C2 }, { 0x6E99, 0xDE5E },
+	{ 0x6E9B, 0xDE43 }, { 0x6E9C, 0xB7C8 }, { 0x6E9D, 0xB7BE }, { 0x6E9E, 0xDE52 }, { 0x6E9F, 0xDE48 }, { 0x6EA0, 0xDE4B }, { 0x6EA1, 0xDE63 }, { 0x6EA2, 0xB7B8 },
+	{ 0x6EA3, 0xDE6A }, { 0x6EA4, 0xDE62 }, { 0x6EA5, 0xB7C1 }, { 0x6EA6, 0xDE57 }, { 0x6EA7, 0xB7CC }, { 0x6EAA, 0xB7CB }, { 0x6EAB, 0xB7C5 }, { 0x6EAE, 0xDE69 },
+	{ 0x6EAF, 0xB7B9 }, { 0x6EB0, 0xDE55 }, { 0x6EB1, 0xDE4C }, { 0x6EB2, 0xDE59 }, { 0x6EB3, 0xDE65 }, { 0x6EB4, 0xB7CD }, { 0x6EB6, 0xB7BB }, { 0x6EB7, 0xDE54 },
+	{ 0x6EB9, 0xDE4D }, { 0x6EBA, 0xB7C4 }, { 0x6EBC, 0xB7C3 }, { 0x6EBD, 0xDE50 }, { 0x6EBE, 0xDE5A }, { 0x6EBF, 0xDE64 }, { 0x6EC0, 0xDE47 }, { 0x6EC1, 0xDE51 },
+	{ 0x6EC2, 0xB7BC }, { 0x6EC3, 0xDE5B }, { 0x6EC4, 0xB7C9 }, { 0x6EC5, 0xB7C0 }, { 0x6EC6, 0xDE4E }, { 0x6EC7, 0xB7BF }, { 0x6EC8, 0xDE45 }, { 0x6EC9, 0xDE53 },
+	{ 0x6ECA, 0xDE67 }, { 0x6ECB, 0xB4FE }, { 0x6ECC, 0xBAB0 }, { 0x6ECD, 0xDE56 }, { 0x6ECE, 0xE26C }, { 0x6ECF, 0xDE58 }, { 0x6ED0, 0xDE66 }, { 0x6ED1, 0xB7C6 },
+	{ 0x6ED2, 0xDE4F }, { 0x6ED3, 0xB7BA }, { 0x6ED4, 0xB7CA }, { 0x6ED5, 0xBCF0 }, { 0x6ED6, 0xDE44 }, { 0x6ED8, 0xDE5D }, { 0x6EDC, 0xDE5C }, { 0x6EEB, 0xE2AA },
+	{ 0x6EEC, 0xBAAD }, { 0x6EED, 0xE27D }, { 0x6EEE, 0xE2A4 }, { 0x6EEF, 0xBAA2 }, { 0x6EF1, 0xE26E }, { 0x6EF2, 0xBAAF }, { 0x6EF4, 0xBA77 }, { 0x6EF5, 0xE26D },
+	{ 0x6EF6, 0xE2B0 }, { 0x6EF7, 0xBAB1 }, { 0x6EF8, 0xE271 }, { 0x6EF9, 0xE2A3 }, { 0x6EFB, 0xE273 }, { 0x6EFC, 0xE2B3 }, { 0x6EFD, 0xE2AF }, { 0x6EFE, 0xBA75 },
+	{ 0x6EFF, 0xBAA1 }, { 0x6F00, 0xE653 }, { 0x6F01, 0xBAAE }, { 0x6F02, 0xBA7D }, { 0x6F03, 0xE26F }, { 0x6F05, 0xE2AE }, { 0x6F06, 0xBAA3 }, { 0x6F07, 0xE2AB },
+	{ 0x6F08, 0xE2B8 }, { 0x6F09, 0xE275 }, { 0x6F0A, 0xE27E }, { 0x6F0D, 0xE2B6 }, { 0x6F0E, 0xE2AC }, { 0x6F0F, 0xBA7C }, { 0x6F12, 0xE27C }, { 0x6F13, 0xBA76 },
+	{ 0x6F14, 0xBA74 }, { 0x6F15, 0xBAA8 }, { 0x6F18, 0xE27A }, { 0x6F19, 0xE277 }, { 0x6F1A, 0xE278 }, { 0x6F1C, 0xE2B2 }, { 0x6F1E, 0xE2B7 }, { 0x6F1F, 0xE2B5 },
+	{ 0x6F20, 0xBA7A }, { 0x6F21, 0xE2B9 }, { 0x6F22, 0xBA7E }, { 0x6F23, 0xBAA7 }, { 0x6F25, 0xE270 }, { 0x6F26, 0xE5FA }, { 0x6F27, 0xE279 }, { 0x6F29, 0xBA78 },
+	{ 0x6F2A, 0xBAAC }, { 0x6F2B, 0xBAA9 }, { 0x6F2C, 0xBA7B }, { 0x6F2D, 0xE2A5 }, { 0x6F2E, 0xE274 }, { 0x6F2F, 0xBAAA }, { 0x6F30, 0xE2A7 }, { 0x6F31, 0xBAA4 },
+	{ 0x6F32, 0xBAA6 }, { 0x6F33, 0xBA73 }, { 0x6F35, 0xE2A9 }, { 0x6F36, 0xE2A1 }, { 0x6F37, 0xE272 }, { 0x6F38, 0xBAA5 }, { 0x6F39, 0xE2B1 }, { 0x6F3A, 0xE2B4 },
+	{ 0x6F3B, 0xE27B }, { 0x6F3C, 0xE2A8 }, { 0x6F3E, 0xBA79 }, { 0x6F3F, 0xBCDF }, { 0x6F40, 0xE2A6 }, { 0x6F41, 0xE5F9 }, { 0x6F43, 0xE2AD }, { 0x6F4E, 0xE276 },
+	{ 0x6F4F, 0xE644 }, { 0x6F50, 0xE64E }, { 0x6F51, 0xBCE2 }, { 0x6F52, 0xE64D }, { 0x6F53, 0xE659 }, { 0x6F54, 0xBCE4 }, { 0x6F55, 0xE64B }, { 0x6F57, 0xE64F },
+	{ 0x6F58, 0xBCEF }, { 0x6F5A, 0xE646 }, { 0x6F5B, 0xBCE7 }, { 0x6F5D, 0xE652 }, { 0x6F5E, 0xE9F0 }, { 0x6F5F, 0xBCF3 }, { 0x6F60, 0xBCF2 }, { 0x6F61, 0xE654 },
+	{ 0x6F62, 0xE643 }, { 0x6F63, 0xE65E }, { 0x6F64, 0xBCED }, { 0x6F66, 0xBCE3 }, { 0x6F67, 0xE657 }, { 0x6F69, 0xE65B }, { 0x6F6A, 0xE660 }, { 0x6F6B, 0xE655 },
+	{ 0x6F6C, 0xE649 }, { 0x6F6D, 0xBCE6 }, { 0x6F6E, 0xBCE9 }, { 0x6F6F, 0xBCF1 }, { 0x6F70, 0xBCEC }, { 0x6F72, 0xE64C }, { 0x6F73, 0xE2A2 }, { 0x6F76, 0xE648 },
+	{ 0x6F77, 0xE65F }, { 0x6F78, 0xBCE8 }, { 0x6F7A, 0xBCEB }, { 0x6F7B, 0xE661 }, { 0x6F7C, 0xBCE0 }, { 0x6F7D, 0xE656 }, { 0x6F7E, 0xE5FB }, { 0x6F7F, 0xE65C },
+	{ 0x6F80, 0xC0DF }, { 0x6F82, 0xE64A }, { 0x6F84, 0xBCE1 }, { 0x6F85, 0xE645 }, { 0x6F86, 0xBCE5 }, { 0x6F87, 0xE5FC }, { 0x6F88, 0xBAAB }, { 0x6F89, 0xE641 },
+	{ 0x6F8B, 0xE65A }, { 0x6F8C, 0xE642 }, { 0x6F8D, 0xE640 }, { 0x6F8E, 0xBCEA }, { 0x6F90, 0xE658 }, { 0x6F92, 0xE5FE }, { 0x6F93, 0xE651 }, { 0x6F94, 0xE650 },
+	{ 0x6F95, 0xE65D }, { 0x6F96, 0xE647 }, { 0x6F97, 0xBCEE }, { 0x6F9E, 0xE9F3 }, { 0x6FA0, 0xBF49 }, { 0x6FA1, 0xBEFE }, { 0x6FA2, 0xEA40 }, { 0x6FA3, 0xE9EB },
+	{ 0x6FA4, 0xBF41 }, { 0x6FA5, 0xE9F7 }, { 0x6FA6, 0xBF48 }, { 0x6FA7, 0xBF43 }, { 0x6FA8, 0xE9F5 }, { 0x6FA9, 0xED4F }, { 0x6FAA, 0xE9FB }, { 0x6FAB, 0xEA42 },
+	{ 0x6FAC, 0xE9FA }, { 0x6FAD, 0xE9E9 }, { 0x6FAE, 0xE9F8 }, { 0x6FAF, 0xEA44 }, { 0x6FB0, 0xEA46 }, { 0x6FB1, 0xBEFD }, { 0x6FB2, 0xEA45 }, { 0x6FB3, 0xBF44 },
+	{ 0x6FB4, 0xBF4A }, { 0x6FB6, 0xBF47 }, { 0x6FB8, 0xE9FE }, { 0x6FB9, 0xBF46 }, { 0x6FBA, 0xE9F9 }, { 0x6FBC, 0xE9ED }, { 0x6FBD, 0xE9F2 }, { 0x6FBF, 0xE9FD },
+	{ 0x6FC0, 0xBF45 }, { 0x6FC1, 0xBF42 }, { 0x6FC2, 0xBEFC }, { 0x6FC3, 0xBF40 }, { 0x6FC4, 0xE9F1 }, { 0x6FC6, 0xE5FD }, { 0x6FC7, 0xE9EC }, { 0x6FC8, 0xE9EF },
+	{ 0x6FC9, 0xEA41 }, { 0x6FCA, 0xE9F4 }, { 0x6FCB, 0xE9EA }, { 0x6FCC, 0xED4E }, { 0x6FCD, 0xEA43 }, { 0x6FCE, 0xE9EE }, { 0x6FCF, 0xE9FC }, { 0x6FD4, 0xED51 },
+	{ 0x6FD5, 0xC0E3 }, { 0x6FD8, 0xC0D7 }, { 0x6FDB, 0xC0DB }, { 0x6FDC, 0xED53 }, { 0x6FDD, 0xED59 }, { 0x6FDE, 0xED57 }, { 0x6FDF, 0xC0D9 }, { 0x6FE0, 0xC0DA },
+	{ 0x6FE1, 0xC0E1 }, { 0x6FE2, 0xED5A }, { 0x6FE3, 0xED52 }, { 0x6FE4, 0xC0DC }, { 0x6FE6, 0xED56 }, { 0x6FE7, 0xED55 }, { 0x6FE8, 0xED5B }, { 0x6FE9, 0xC0E2 },
+	{ 0x6FEB, 0xC0DD }, { 0x6FEC, 0xC0E0 }, { 0x6FED, 0xED54 }, { 0x6FEE, 0xC0E4 }, { 0x6FEF, 0xC0DE }, { 0x6FF0, 0xC0E5 }, { 0x6FF1, 0xC0D8 }, { 0x6FF2, 0xED58 },
+	{ 0x6FF4, 0xED50 }, { 0x6FF7, 0xEFF7 }, { 0x6FFA, 0xC271 }, { 0x6FFB, 0xEFF4 }, { 0x6FFC, 0xEFF6 }, { 0x6FFE, 0xC26F }, { 0x6FFF, 0xEFF2 }, { 0x7000, 0xEFF3 },
+	{ 0x7001, 0xEFEE }, { 0x7004, 0xE9F6 }, { 0x7005, 0xEFEF }, { 0x7006, 0xC270 }, { 0x7007, 0xEFEB }, { 0x7009, 0xC26D }, { 0x700A, 0xEFF8 }, { 0x700B, 0xC26E },
+	{ 0x700C, 0xEFEC }, { 0x700D, 0xEFED }, { 0x700E, 0xEFF1 }, { 0x700F, 0xC273 }, { 0x7011, 0xC272 }, { 0x7014, 0xEFF0 }, { 0x7015, 0xC378 }, { 0x7016, 0xF25F },
+	{ 0x7017, 0xF265 }, { 0x7018, 0xC379 }, { 0x7019, 0xF25C }, { 0x701A, 0xC376 }, { 0x701B, 0xC373 }, { 0x701C, 0xF267 }, { 0x701D, 0xC377 }, { 0x701F, 0xC374 },
+	{ 0x7020, 0xF25E }, { 0x7021, 0xF261 }, { 0x7022, 0xF262 }, { 0x7023, 0xF263 }, { 0x7024, 0xF266 }, { 0x7026, 0xEFF5 }, { 0x7027, 0xF25D }, { 0x7028, 0xC375 },
+	{ 0x7029, 0xF264 }, { 0x702A, 0xF268 }, { 0x702B, 0xF260 }, { 0x702F, 0xF45D }, { 0x7030, 0xC46A }, { 0x7031, 0xF460 }, { 0x7032, 0xC46B }, { 0x7033, 0xF468 },
+	{ 0x7034, 0xF45F }, { 0x7035, 0xF45C }, { 0x7037, 0xF45E }, { 0x7038, 0xF462 }, { 0x7039, 0xF465 }, { 0x703A, 0xF464 }, { 0x703B, 0xF467 }, { 0x703C, 0xF45B },
+	{ 0x703E, 0xC469 }, { 0x703F, 0xF463 }, { 0x7040, 0xF466 }, { 0x7041, 0xF469 }, { 0x7042, 0xF461 }, { 0x7043, 0xF5D3 }, { 0x7044, 0xF5D4 }, { 0x7045, 0xF5D8 },
+	{ 0x7046, 0xF5D9 }, { 0x7048, 0xF5D6 }, { 0x7049, 0xF5D7 }, { 0x704A, 0xF5D5 }, { 0x704C, 0xC4E9 }, { 0x7051, 0xC578 }, { 0x7052, 0xF6EB }, { 0x7055, 0xF6E8 },
+	{ 0x7056, 0xF6E9 }, { 0x7057, 0xF6EA }, { 0x7058, 0xC579 }, { 0x705A, 0xF7E5 }, { 0x705B, 0xF7E4 }, { 0x705D, 0xF8AF }, { 0x705E, 0xC5F4 }, { 0x705F, 0xF8AD },
+	{ 0x7060, 0xF8B0 }, { 0x7061, 0xF8AE }, { 0x7062, 0xF8F5 }, { 0x7063, 0xC657 }, { 0x7064, 0xC665 }, { 0x7065, 0xF9A3 }, { 0x7066, 0xF96C }, { 0x7068, 0xF9A2 },
+	{ 0x7069, 0xF9D0 }, { 0x706A, 0xF9D1 }, { 0x706B, 0xA4F5 }, { 0x7070, 0xA6C7 }, { 0x7071, 0xCA41 }, { 0x7074, 0xCB5E }, { 0x7076, 0xA85F }, { 0x7078, 0xA862 },
+	{ 0x707A, 0xCB5F }, { 0x707C, 0xA860 }, { 0x707D, 0xA861 }, { 0x7082, 0xCD58 }, { 0x7083, 0xCD5A }, { 0x7084, 0xCD55 }, { 0x7085, 0xCD52 }, { 0x7086, 0xCD54 },
+	{ 0x708A, 0xAAA4 }, { 0x708E, 0xAAA2 }, { 0x7091, 0xCD56 }, { 0x7092, 0xAAA3 }, { 0x7093, 0xCD53 }, { 0x7094, 0xCD50 }, { 0x7095, 0xAAA1 }, { 0x7096, 0xCD57 },
+	{ 0x7098, 0xCD51 }, { 0x7099, 0xAAA5 }, { 0x709A, 0xCD59 }, { 0x709F, 0xCFAF }, { 0x70A1, 0xCFB3 }, { 0x70A4, 0xACB7 }, { 0x70A9, 0xCFB6 }, { 0x70AB, 0xACAF },
+	{ 0x70AC, 0xACB2 }, { 0x70AD, 0xACB4 }, { 0x70AE, 0xACB6 }, { 0x70AF, 0xACB3 }, { 0x70B0, 0xCFB2 }, { 0x70B1, 0xCFB1 }, { 0x70B3, 0xACB1 }, { 0x70B4, 0xCFB4 },
+	{ 0x70B5, 0xCFB5 }, { 0x70B7, 0xCFAE }, { 0x70B8, 0xACB5 }, { 0x70BA, 0xACB0 }, { 0x70BE, 0xCFB0 }, { 0x70C5, 0xD277 }, { 0x70C6, 0xD278 }, { 0x70C7, 0xD279 },
+	{ 0x70C8, 0xAF50 }, { 0x70CA, 0xAF4C }, { 0x70CB, 0xD26E }, { 0x70CD, 0xD276 }, { 0x70CE, 0xD27B }, { 0x70CF, 0xAF51 }, { 0x70D1, 0xD26C }, { 0x70D2, 0xD272 },
+	{ 0x70D3, 0xD26B }, { 0x70D4, 0xD275 }, { 0x70D7, 0xD271 }, { 0x70D8, 0xAF4D }, { 0x70D9, 0xAF4F }, { 0x70DA, 0xD27A }, { 0x70DC, 0xD26A }, { 0x70DD, 0xD26D },
+	{ 0x70DE, 0xD273 }, { 0x70E0, 0xD274 }, { 0x70E1, 0xD27C }, { 0x70E2, 0xD270 }, { 0x70E4, 0xAF4E }, { 0x70EF, 0xB26D }, { 0x70F0, 0xD64E }, { 0x70F3, 0xD650 },
+	{ 0x70F4, 0xD64C }, { 0x70F6, 0xD658 }, { 0x70F7, 0xD64A }, { 0x70F8, 0xD657 }, { 0x70F9, 0xB269 }, { 0x70FA, 0xD648 }, { 0x70FB, 0xDA5B }, { 0x70FC, 0xD652 },
+	{ 0x70FD, 0xB26C }, { 0x70FF, 0xD653 }, { 0x7100, 0xD656 }, { 0x7102, 0xD65A }, { 0x7104, 0xD64F }, { 0x7106, 0xD654 }, { 0x7109, 0xB26A }, { 0x710A, 0xB26B },
+	{ 0x710B, 0xD659 }, { 0x710C, 0xD64D }, { 0x710D, 0xD649 }, { 0x710E, 0xD65B }, { 0x7110, 0xD651 }, { 0x7113, 0xD655 }, { 0x7117, 0xD64B }, { 0x7119, 0xB548 },
+	{ 0x711A, 0xB549 }, { 0x711B, 0xDA65 }, { 0x711C, 0xB54F }, { 0x711E, 0xDA59 }, { 0x711F, 0xDA62 }, { 0x7120, 0xDA58 }, { 0x7121, 0xB54C }, { 0x7122, 0xDA60 },
+	{ 0x7123, 0xDA5E }, { 0x7125, 0xDA5F }, { 0x7126, 0xB54A }, { 0x7128, 0xDA63 }, { 0x712E, 0xDA5C }, { 0x712F, 0xDA5A }, { 0x7130, 0xB54B }, { 0x7131, 0xDA5D },
+	{ 0x7132, 0xDA61 }, { 0x7136, 0xB54D }, { 0x713A, 0xDA64 }, { 0x7141, 0xDE70 }, { 0x7142, 0xDE77 }, { 0x7143, 0xDE79 }, { 0x7144, 0xDEA1 }, { 0x7146, 0xB7DA },
+	{ 0x7147, 0xDE6B }, { 0x7149, 0xB7D2 }, { 0x714B, 0xDE7A }, { 0x714C, 0xB7D7 }, { 0x714D, 0xDEA2 }, { 0x714E, 0xB7CE }, { 0x7150, 0xDE7D }, { 0x7152, 0xDE6D },
+	{ 0x7153, 0xDE7E }, { 0x7154, 0xDE6C }, { 0x7156, 0xB7DC }, { 0x7158, 0xDE78 }, { 0x7159, 0xB7CF }, { 0x715A, 0xDEA3 }, { 0x715C, 0xB7D4 }, { 0x715D, 0xDE71 },
+	{ 0x715E, 0xB7D9 }, { 0x715F, 0xDE7C }, { 0x7160, 0xDE6F }, { 0x7161, 0xDE76 }, { 0x7162, 0xDE72 }, { 0x7163, 0xDE6E }, { 0x7164, 0xB7D1 }, { 0x7165, 0xB7D8 },
+	{ 0x7166, 0xB7D6 }, { 0x7167, 0xB7D3 }, { 0x7168, 0xB7DB }, { 0x7169, 0xB7D0 }, { 0x716A, 0xDE75 }, { 0x716C, 0xB7D5 }, { 0x716E, 0xB54E }, { 0x7170, 0xDE7B },
+	{ 0x7172, 0xDE73 }, { 0x7178, 0xDE74 }, { 0x717B, 0xE2C1 }, { 0x717D, 0xBAB4 }, { 0x7180, 0xE2BD }, { 0x7181, 0xE2C3 }, { 0x7182, 0xE2BF }, { 0x7184, 0xBAB6 },
+	{ 0x7185, 0xE2BE }, { 0x7186, 0xE2C2 }, { 0x7187, 0xE2BA }, { 0x7189, 0xE2BC }, { 0x718A, 0xBAB5 }, { 0x718F, 0xE2C0 }, { 0x7190, 0xE2BB }, { 0x7192, 0xBAB7 },
+	{ 0x7194, 0xBAB2 }, { 0x7197, 0xE2C4 }, { 0x7199, 0xBAB3 }, { 0x719A, 0xE667 }, { 0x719B, 0xE664 }, { 0x719C, 0xE670 }, { 0x719D, 0xE66A }, { 0x719E, 0xE66C },
+	{ 0x719F, 0xBCF4 }, { 0x71A0, 0xE666 }, { 0x71A1, 0xE66E }, { 0x71A4, 0xE66D }, { 0x71A5, 0xE66B }, { 0x71A7, 0xE671 }, { 0x71A8, 0xBCF7 }, { 0x71A9, 0xE668 },
+	{ 0x71AA, 0xE66F }, { 0x71AC, 0xBCF5 }, { 0x71AF, 0xE663 }, { 0x71B0, 0xE665 }, { 0x71B1, 0xBCF6 }, { 0x71B2, 0xE662 }, { 0x71B3, 0xE672 }, { 0x71B5, 0xE669 },
+	{ 0x71B8, 0xEA4A }, { 0x71B9, 0xBF51 }, { 0x71BC, 0xEA55 }, { 0x71BD, 0xEA53 }, { 0x71BE, 0xBF4B }, { 0x71BF, 0xEA49 }, { 0x71C0, 0xEA4C }, { 0x71C1, 0xEA4D },
+	{ 0x71C2, 0xEA48 }, { 0x71C3, 0xBF55 }, { 0x71C4, 0xBF56 }, { 0x71C5, 0xEA47 }, { 0x71C6, 0xEA56 }, { 0x71C7, 0xEA51 }, { 0x71C8, 0xBF4F }, { 0x71C9, 0xBF4C },
+	{ 0x71CA, 0xEA50 }, { 0x71CB, 0xEA4E }, { 0x71CE, 0xBF52 }, { 0x71CF, 0xEA52 }, { 0x71D0, 0xBF4D }, { 0x71D2, 0xBF4E }, { 0x71D4, 0xEA4F }, { 0x71D5, 0xBF50 },
+	{ 0x71D6, 0xEA4B }, { 0x71D8, 0xEA54 }, { 0x71D9, 0xBF53 }, { 0x71DA, 0xEA57 }, { 0x71DB, 0xEA58 }, { 0x71DC, 0xBF54 }, { 0x71DF, 0xC0E7 }, { 0x71E0, 0xC0EE },
+	{ 0x71E1, 0xED5C }, { 0x71E2, 0xED62 }, { 0x71E4, 0xED60 }, { 0x71E5, 0xC0EA }, { 0x71E6, 0xC0E9 }, { 0x71E7, 0xC0E6 }, { 0x71E8, 0xED5E }, { 0x71EC, 0xC0EC },
+	{ 0x71ED, 0xC0EB }, { 0x71EE, 0xC0E8 }, { 0x71F0, 0xED61 }, { 0x71F1, 0xED5D }, { 0x71F2, 0xED5F }, { 0x71F4, 0xC0ED }, { 0x71F8, 0xC277 }, { 0x71F9, 0xEFFB },
+	{ 0x71FB, 0xC274 }, { 0x71FC, 0xC275 }, { 0x71FD, 0xEFFD }, { 0x71FE, 0xC276 }, { 0x71FF, 0xEFFA }, { 0x7201, 0xEFF9 }, { 0x7202, 0xF26C }, { 0x7203, 0xEFFC },
+	{ 0x7205, 0xF26D }, { 0x7206, 0xC37A }, { 0x7207, 0xF26B }, { 0x720A, 0xF26A }, { 0x720C, 0xF269 }, { 0x720D, 0xC37B }, { 0x7210, 0xC46C }, { 0x7213, 0xF46A },
+	{ 0x7214, 0xF46B }, { 0x7219, 0xF5DC }, { 0x721A, 0xF5DB }, { 0x721B, 0xC4EA }, { 0x721D, 0xF5DA }, { 0x721E, 0xF6EC }, { 0x721F, 0xF6ED }, { 0x7222, 0xF7E6 },
+	{ 0x7223, 0xF8B1 }, { 0x7226, 0xF8F6 }, { 0x7227, 0xF9BC }, { 0x7228, 0xC679 }, { 0x7229, 0xF9C6 }, { 0x722A, 0xA4F6 }, { 0x722C, 0xAAA6 }, { 0x722D, 0xAAA7 },
+	{ 0x7230, 0xACB8 }, { 0x7235, 0xC0EF }, { 0x7236, 0xA4F7 }, { 0x7238, 0xAAA8 }, { 0x7239, 0xAF52 }, { 0x723A, 0xB7DD }, { 0x723B, 0xA4F8 }, { 0x723D, 0xB26E },
+	{ 0x723E, 0xBAB8 }, { 0x723F, 0xC962 }, { 0x7241, 0xCFB7 }, { 0x7242, 0xD27D }, { 0x7244, 0xE2C5 }, { 0x7246, 0xC0F0 }, { 0x7247, 0xA4F9 }, { 0x7248, 0xAAA9 },
+	{ 0x7249, 0xCFB8 }, { 0x724A, 0xCFB9 }, { 0x724B, 0xDA66 }, { 0x724C, 0xB550 }, { 0x724F, 0xDEA4 }, { 0x7252, 0xB7DE }, { 0x7253, 0xE2C6 }, { 0x7256, 0xBCF8 },
+	{ 0x7258, 0xC37C }, { 0x7259, 0xA4FA }, { 0x725A, 0xDA67 }, { 0x725B, 0xA4FB }, { 0x725D, 0xA6C9 }, { 0x725E, 0xCA42 }, { 0x725F, 0xA6C8 }, { 0x7260, 0xA865 },
+	{ 0x7261, 0xA864 }, { 0x7262, 0xA863 }, { 0x7263, 0xCB60 }, { 0x7267, 0xAAAA }, { 0x7269, 0xAAAB }, { 0x726A, 0xCD5B }, { 0x726C, 0xCFBA }, { 0x726E, 0xCFBD },
+	{ 0x726F, 0xACBA }, { 0x7270, 0xCFBB }, { 0x7272, 0xACB9 }, { 0x7273, 0xCFBC }, { 0x7274, 0xACBB }, { 0x7276, 0xD2A2 }, { 0x7277, 0xD2A1 }, { 0x7278, 0xD27E },
+	{ 0x7279, 0xAF53 }, { 0x727B, 0xD65D }, { 0x727C, 0xD65E }, { 0x727D, 0xB26F }, { 0x727E, 0xD65C }, { 0x727F, 0xD65F }, { 0x7280, 0xB552 }, { 0x7281, 0xB270 },
+	{ 0x7284, 0xB551 }, { 0x7285, 0xDA6B }, { 0x7286, 0xDA6A }, { 0x7288, 0xDA68 }, { 0x7289, 0xDA69 }, { 0x728B, 0xDA6C }, { 0x728C, 0xDEA6 }, { 0x728D, 0xDEA5 },
+	{ 0x728E, 0xDEA9 }, { 0x7290, 0xDEA8 }, { 0x7291, 0xDEA7 }, { 0x7292, 0xBAB9 }, { 0x7293, 0xE2C9 }, { 0x7295, 0xE2C8 }, { 0x7296, 0xBABA }, { 0x7297, 0xE2C7 },
+	{ 0x7298, 0xE673 }, { 0x729A, 0xE674 }, { 0x729B, 0xBCF9 }, { 0x729D, 0xEA59 }, { 0x729E, 0xEA5A }, { 0x72A1, 0xF272 }, { 0x72A2, 0xC37D }, { 0x72A3, 0xF271 },
+	{ 0x72A4, 0xF270 }, { 0x72A5, 0xF26E }, { 0x72A6, 0xF26F }, { 0x72A7, 0xC4EB }, { 0x72A8, 0xF46C }, { 0x72A9, 0xF6EE }, { 0x72AA, 0xF8F7 }, { 0x72AC, 0xA4FC },
+	{ 0x72AE, 0xC9A5 }, { 0x72AF, 0xA5C7 }, { 0x72B0, 0xC9A6 }, { 0x72B4, 0xCA43 }, { 0x72B5, 0xCA44 }, { 0x72BA, 0xCB66 }, { 0x72BD, 0xCB62 }, { 0x72BF, 0xCB61 },
+	{ 0x72C0, 0xAAAC }, { 0x72C1, 0xCB65 }, { 0x72C2, 0xA867 }, { 0x72C3, 0xCB63 }, { 0x72C4, 0xA866 }, { 0x72C5, 0xCB67 }, { 0x72C6, 0xCB64 }, { 0x72C9, 0xCD5F },
+	{ 0x72CA, 0xCFBE }, { 0x72CB, 0xCD5D }, { 0x72CC, 0xCD64 }, { 0x72CE, 0xAAAD }, { 0x72D0, 0xAAB0 }, { 0x72D1, 0xCD65 }, { 0x72D2, 0xCD61 }, { 0x72D4, 0xCD62 },
+	{ 0x72D6, 0xCD5C }, { 0x72D7, 0xAAAF }, { 0x72D8, 0xCD5E }, { 0x72D9, 0xAAAE }, { 0x72DA, 0xCD63 }, { 0x72DC, 0xCD60 }, { 0x72DF, 0xCFC2 }, { 0x72E0, 0xACBD },
+	{ 0x72E1, 0xACBE }, { 0x72E3, 0xCFC5 }, { 0x72E4, 0xCFBF }, { 0x72E6, 0xCFC4 }, { 0x72E8, 0xCFC0 }, { 0x72E9, 0xACBC }, { 0x72EA, 0xCFC3 }, { 0x72EB, 0xCFC1 },
+	{ 0x72F3, 0xD2A8 }, { 0x72F4, 0xD2A5 }, { 0x72F6, 0xD2A7 }, { 0x72F7, 0xAF58 }, { 0x72F8, 0xAF57 }, { 0x72F9, 0xAF55 }, { 0x72FA, 0xD2A4 }, { 0x72FB, 0xD2A9 },
+	{ 0x72FC, 0xAF54 }, { 0x72FD, 0xAF56 }, { 0x72FE, 0xD2A6 }, { 0x72FF, 0xD667 }, { 0x7300, 0xD2A3 }, { 0x7301, 0xD2AA }, { 0x7307, 0xD662 }, { 0x7308, 0xD666 },
+	{ 0x730A, 0xD665 }, { 0x730B, 0xDA6E }, { 0x730C, 0xDA79 }, { 0x730F, 0xD668 }, { 0x7311, 0xD663 }, { 0x7312, 0xDA6D }, { 0x7313, 0xB274 }, { 0x7316, 0xB273 },
+	{ 0x7317, 0xD661 }, { 0x7318, 0xD664 }, { 0x7319, 0xB275 }, { 0x731B, 0xB272 }, { 0x731C, 0xB271 }, { 0x731D, 0xD660 }, { 0x731E, 0xD669 }, { 0x7322, 0xDA70 },
+	{ 0x7323, 0xDA77 }, { 0x7325, 0xB554 }, { 0x7326, 0xDA76 }, { 0x7327, 0xDA73 }, { 0x7329, 0xB556 }, { 0x732D, 0xDA75 }, { 0x7330, 0xDA6F }, { 0x7331, 0xDA71 },
+	{ 0x7332, 0xDA74 }, { 0x7333, 0xDA72 }, { 0x7334, 0xB555 }, { 0x7335, 0xDA78 }, { 0x7336, 0xB553 }, { 0x7337, 0xB7DF }, { 0x733A, 0xDEAD }, { 0x733B, 0xDEAC },
+	{ 0x733C, 0xDEAA }, { 0x733E, 0xB7E2 }, { 0x733F, 0xB7E1 }, { 0x7340, 0xDEAE }, { 0x7342, 0xDEAB }, { 0x7343, 0xE2CA }, { 0x7344, 0xBABB }, { 0x7345, 0xB7E0 },
+	{ 0x7349, 0xDEB0 }, { 0x734A, 0xDEAF }, { 0x734C, 0xE2CD }, { 0x734D, 0xE2CB }, { 0x734E, 0xBCFA }, { 0x7350, 0xBABC }, { 0x7351, 0xE2CC }, { 0x7352, 0xE676 },
+	{ 0x7357, 0xBCFB }, { 0x7358, 0xE675 }, { 0x7359, 0xE67E }, { 0x735A, 0xE67D }, { 0x735B, 0xE67B }, { 0x735D, 0xE67A }, { 0x735E, 0xE677 }, { 0x735F, 0xE678 },
+	{ 0x7360, 0xE679 }, { 0x7361, 0xE67C }, { 0x7362, 0xE6A1 }, { 0x7365, 0xEA5F }, { 0x7366, 0xEA5C }, { 0x7367, 0xEA5D }, { 0x7368, 0xBF57 }, { 0x7369, 0xEA5B },
+	{ 0x736A, 0xEA61 }, { 0x736B, 0xEA60 }, { 0x736C, 0xEA5E }, { 0x736E, 0xED64 }, { 0x736F, 0xED65 }, { 0x7370, 0xC0F1 }, { 0x7372, 0xC0F2 }, { 0x7373, 0xED63 },
+	{ 0x7375, 0xC279 }, { 0x7376, 0xEFFE }, { 0x7377, 0xC278 }, { 0x7378, 0xC37E }, { 0x737A, 0xC3A1 }, { 0x737B, 0xC46D }, { 0x737C, 0xF46E }, { 0x737D, 0xF46D },
+	{ 0x737E, 0xF5DD }, { 0x737F, 0xF6EF }, { 0x7380, 0xC57A }, { 0x7381, 0xF7E8 }, { 0x7382, 0xF7E7 }, { 0x7383, 0xF7E9 }, { 0x7384, 0xA5C8 }, { 0x7385, 0xCFC6 },
+	{ 0x7386, 0xAF59 }, { 0x7387, 0xB276 }, { 0x7388, 0xD66A }, { 0x7389, 0xA5C9 }, { 0x738A, 0xC9A7 }, { 0x738B, 0xA4FD }, { 0x738E, 0xCA45 }, { 0x7392, 0xCB6C },
+	{ 0x7393, 0xCB6A }, { 0x7394, 0xCB6B }, { 0x7395, 0xCB68 }, { 0x7396, 0xA868 }, { 0x7397, 0xCB69 }, { 0x739D, 0xCD6D }, { 0x739F, 0xAAB3 }, { 0x73A0, 0xCD6B },
+	{ 0x73A1, 0xCD67 }, { 0x73A2, 0xCD6A }, { 0x73A4, 0xCD66 }, { 0x73A5, 0xAAB5 }, { 0x73A6, 0xCD69 }, { 0x73A8, 0xAAB2 }, { 0x73A9, 0xAAB1 }, { 0x73AB, 0xAAB4 },
+	{ 0x73AC, 0xCD6C }, { 0x73AD, 0xCD68 }, { 0x73B2, 0xACC2 }, { 0x73B3, 0xACC5 }, { 0x73B4, 0xCFCE }, { 0x73B5, 0xCFCD }, { 0x73B6, 0xCFCC }, { 0x73B7, 0xACBF },
+	{ 0x73B8, 0xCFD5 }, { 0x73B9, 0xCFCB }, { 0x73BB, 0xACC1 }, { 0x73BC, 0xD2AF }, { 0x73BE, 0xCFD2 }, { 0x73BF, 0xCFD0 }, { 0x73C0, 0xACC4 }, { 0x73C2, 0xCFC8 },
+	{ 0x73C3, 0xCFD3 }, { 0x73C5, 0xCFCA }, { 0x73C6, 0xCFD4 }, { 0x73C7, 0xCFD1 }, { 0x73C8, 0xCFC9 }, { 0x73CA, 0xACC0 }, { 0x73CB, 0xCFD6 }, { 0x73CC, 0xCFC7 },
+	{ 0x73CD, 0xACC3 }, { 0x73D2, 0xD2B4 }, { 0x73D3, 0xD2AB }, { 0x73D4, 0xD2B6 }, { 0x73D6, 0xD2AE }, { 0x73D7, 0xD2B9 }, { 0x73D8, 0xD2BA }, { 0x73D9, 0xD2AC },
+	{ 0x73DA, 0xD2B8 }, { 0x73DB, 0xD2B5 }, { 0x73DC, 0xD2B3 }, { 0x73DD, 0xD2B7 }, { 0x73DE, 0xAF5F }, { 0x73E0, 0xAF5D }, { 0x73E3, 0xD2B1 }, { 0x73E5, 0xD2AD },
+	{ 0x73E7, 0xD2B0 }, { 0x73E8, 0xD2BB }, { 0x73E9, 0xD2B2 }, { 0x73EA, 0xAF5E }, { 0x73EB, 0xCFCF }, { 0x73ED, 0xAF5A }, { 0x73EE, 0xAF5C }, { 0x73F4, 0xD678 },
+	{ 0x73F5, 0xD66D }, { 0x73F6, 0xD66B }, { 0x73F8, 0xD66C }, { 0x73FA, 0xD673 }, { 0x73FC, 0xD674 }, { 0x73FD, 0xD670 }, { 0x73FE, 0xB27B }, { 0x73FF, 0xD675 },
+	{ 0x7400, 0xD672 }, { 0x7401, 0xD66F }, { 0x7403, 0xB279 }, { 0x7404, 0xD66E }, { 0x7405, 0xB277 }, { 0x7406, 0xB27A }, { 0x7407, 0xD671 }, { 0x7408, 0xD679 },
+	{ 0x7409, 0xAF5B }, { 0x740A, 0xB278 }, { 0x740B, 0xD677 }, { 0x740C, 0xD676 }, { 0x740D, 0xB27C }, { 0x7416, 0xDA7E }, { 0x741A, 0xDAA1 }, { 0x741B, 0xB560 },
+	{ 0x741D, 0xDAA7 }, { 0x7420, 0xDAA9 }, { 0x7421, 0xDAA2 }, { 0x7422, 0xB55A }, { 0x7423, 0xDAA6 }, { 0x7424, 0xDAA5 }, { 0x7425, 0xB55B }, { 0x7426, 0xB561 },
+	{ 0x7428, 0xB562 }, { 0x7429, 0xDAA8 }, { 0x742A, 0xB558 }, { 0x742B, 0xDA7D }, { 0x742C, 0xDA7B }, { 0x742D, 0xDAA3 }, { 0x742E, 0xDA7A }, { 0x742F, 0xB55F },
+	{ 0x7430, 0xDA7C }, { 0x7431, 0xDAA4 }, { 0x7432, 0xDAAA }, { 0x7433, 0xB559 }, { 0x7434, 0xB55E }, { 0x7435, 0xB55C }, { 0x7436, 0xB55D }, { 0x743A, 0xB557 },
+	{ 0x743F, 0xB7E9 }, { 0x7440, 0xDEB7 }, { 0x7441, 0xB7E8 }, { 0x7442, 0xDEBB }, { 0x7444, 0xDEB1 }, { 0x7446, 0xDEBC }, { 0x744A, 0xDEB2 }, { 0x744B, 0xDEB3 },
+	{ 0x744D, 0xDEBD }, { 0x744E, 0xDEBA }, { 0x744F, 0xDEB8 }, { 0x7450, 0xDEB9 }, { 0x7451, 0xDEB5 }, { 0x7452, 0xDEB4 }, { 0x7454, 0xDEBE }, { 0x7455, 0xB7E5 },
+	{ 0x7457, 0xDEB6 }, { 0x7459, 0xB7EA }, { 0x745A, 0xB7E4 }, { 0x745B, 0xB7EB }, { 0x745C, 0xB7EC }, { 0x745E, 0xB7E7 }, { 0x745F, 0xB7E6 }, { 0x7462, 0xE2CE },
+	{ 0x7463, 0xBABE }, { 0x7464, 0xBABD }, { 0x7467, 0xE2D3 }, { 0x7469, 0xBCFC }, { 0x746A, 0xBABF }, { 0x746D, 0xBAC1 }, { 0x746E, 0xE2D4 }, { 0x746F, 0xB7E3 },
+	{ 0x7470, 0xBAC0 }, { 0x7471, 0xE2D0 }, { 0x7472, 0xE2D2 }, { 0x7473, 0xE2CF }, { 0x7475, 0xE2D1 }, { 0x7479, 0xE6AB }, { 0x747C, 0xE6AA }, { 0x747D, 0xE6A7 },
+	{ 0x747E, 0xBD40 }, { 0x747F, 0xEA62 }, { 0x7480, 0xBD41 }, { 0x7481, 0xE6A6 }, { 0x7483, 0xBCFE }, { 0x7485, 0xE6A8 }, { 0x7486, 0xE6A5 }, { 0x7487, 0xE6A2 },
+	{ 0x7488, 0xE6A9 }, { 0x7489, 0xE6A3 }, { 0x748A, 0xE6A4 }, { 0x748B, 0xBCFD }, { 0x7490, 0xED69 }, { 0x7492, 0xEA66 }, { 0x7494, 0xEA65 }, { 0x7495, 0xEA67 },
+	{ 0x7497, 0xED66 }, { 0x7498, 0xBF5A }, { 0x749A, 0xEA63 }, { 0x749C, 0xBF58 }, { 0x749E, 0xBF5C }, { 0x749F, 0xBF5B }, { 0x74A0, 0xEA64 }, { 0x74A1, 0xEA68 },
+	{ 0x74A3, 0xBF59 }, { 0x74A5, 0xED6D }, { 0x74A6, 0xC0F5 }, { 0x74A7, 0xC27A }, { 0x74A8, 0xC0F6 }, { 0x74A9, 0xC0F3 }, { 0x74AA, 0xED6A }, { 0x74AB, 0xED68 },
+	{ 0x74AD, 0xED6B }, { 0x74AF, 0xED6E }, { 0x74B0, 0xC0F4 }, { 0x74B1, 0xED6C }, { 0x74B2, 0xED67 }, { 0x74B5, 0xF042 }, { 0x74B6, 0xF045 }, { 0x74B7, 0xF275 },
+	{ 0x74B8, 0xF040 }, { 0x74BA, 0xF46F }, { 0x74BB, 0xF046 }, { 0x74BD, 0xC3A2 }, { 0x74BE, 0xF044 }, { 0x74BF, 0xC27B }, { 0x74C0, 0xF041 }, { 0x74C1, 0xF043 },
+	{ 0x74C2, 0xF047 }, { 0x74C3, 0xF276 }, { 0x74C5, 0xF274 }, { 0x74CA, 0xC3A3 }, { 0x74CB, 0xF273 }, { 0x74CF, 0xC46E }, { 0x74D4, 0xC4ED }, { 0x74D5, 0xF6F1 },
+	{ 0x74D6, 0xC4EC }, { 0x74D7, 0xF6F3 }, { 0x74D8, 0xF6F0 }, { 0x74D9, 0xF6F2 }, { 0x74DA, 0xC5D0 }, { 0x74DB, 0xF8B2 }, { 0x74DC, 0xA5CA }, { 0x74DD, 0xCD6E },
+	{ 0x74DE, 0xD2BC }, { 0x74DF, 0xD2BD }, { 0x74E0, 0xB27D }, { 0x74E1, 0xDEBF }, { 0x74E2, 0xBF5D }, { 0x74E3, 0xC3A4 }, { 0x74E4, 0xC57B }, { 0x74E5, 0xF8B3 },
+	{ 0x74E6, 0xA5CB }, { 0x74E8, 0xCD6F }, { 0x74E9, 0xA260 }, { 0x74EC, 0xCFD7 }, { 0x74EE, 0xCFD8 }, { 0x74F4, 0xD2BE }, { 0x74F5, 0xD2BF }, { 0x74F6, 0xB27E },
+	{ 0x74F7, 0xB2A1 }, { 0x74FB, 0xDAAB }, { 0x74FD, 0xDEC2 }, { 0x74FE, 0xDEC1 }, { 0x74FF, 0xDEC0 }, { 0x7500, 0xE2D5 }, { 0x7502, 0xE2D6 }, { 0x7503, 0xE2D7 },
+	{ 0x7504, 0xBAC2 }, { 0x7507, 0xE6AD }, { 0x7508, 0xE6AC }, { 0x750B, 0xEA69 }, { 0x750C, 0xBF5E }, { 0x750D, 0xBF5F }, { 0x750F, 0xED72 }, { 0x7510, 0xED6F },
+	{ 0x7511, 0xED70 }, { 0x7512, 0xED71 }, { 0x7513, 0xF049 }, { 0x7514, 0xF048 }, { 0x7515, 0xC27C }, { 0x7516, 0xF277 }, { 0x7517, 0xF5DE }, { 0x7518, 0xA5CC },
+	{ 0x751A, 0xACC6 }, { 0x751C, 0xB2A2 }, { 0x751D, 0xDEC3 }, { 0x751F, 0xA5CD }, { 0x7521, 0xD2C0 }, { 0x7522, 0xB2A3 }, { 0x7525, 0xB563 }, { 0x7526, 0xB564 },
+	{ 0x7528, 0xA5CE }, { 0x7529, 0xA5CF }, { 0x752A, 0xCA46 }, { 0x752B, 0xA86A }, { 0x752C, 0xA869 }, { 0x752D, 0xACC7 }, { 0x752E, 0xCFD9 }, { 0x752F, 0xDAAC },
+	{ 0x7530, 0xA5D0 }, { 0x7531, 0xA5D1 }, { 0x7532, 0xA5D2 }, { 0x7533, 0xA5D3 }, { 0x7537, 0xA86B }, { 0x7538, 0xA86C }, { 0x7539, 0xCB6E }, { 0x753A, 0xCB6D },
+	{ 0x753D, 0xAAB6 }, { 0x753E, 0xCD72 }, { 0x753F, 0xCD70 }, { 0x7540, 0xCD71 }, { 0x7547, 0xCFDA }, { 0x7548, 0xCFDB }, { 0x754B, 0xACCB }, { 0x754C, 0xACC9 },
+	{ 0x754E, 0xACCA }, { 0x754F, 0xACC8 }, { 0x7554, 0xAF60 }, { 0x7559, 0xAF64 }, { 0x755A, 0xAF63 }, { 0x755B, 0xD2C1 }, { 0x755C, 0xAF62 }, { 0x755D, 0xAF61 },
+	{ 0x755F, 0xD2C2 }, { 0x7562, 0xB2A6 }, { 0x7563, 0xD67B }, { 0x7564, 0xD67A }, { 0x7565, 0xB2A4 }, { 0x7566, 0xB2A5 }, { 0x756A, 0xB566 }, { 0x756B, 0xB565 },
+	{ 0x756C, 0xDAAE }, { 0x756F, 0xDAAD }, { 0x7570, 0xB2A7 }, { 0x7576, 0xB7ED }, { 0x7577, 0xDEC5 }, { 0x7578, 0xB7EE }, { 0x7579, 0xDEC4 }, { 0x757D, 0xE2D8 },
+	{ 0x757E, 0xE6AE }, { 0x757F, 0xBD42 }, { 0x7580, 0xEA6A }, { 0x7584, 0xED73 }, { 0x7586, 0xC3A6 }, { 0x7587, 0xC3A5 }, { 0x758A, 0xC57C }, { 0x758B, 0xA5D4 },
+	{ 0x758C, 0xCD73 }, { 0x758F, 0xB2A8 }, { 0x7590, 0xE2D9 }, { 0x7591, 0xBAC3 }, { 0x7594, 0xCB6F }, { 0x7595, 0xCB70 }, { 0x7598, 0xCD74 }, { 0x7599, 0xAAB8 },
+	{ 0x759A, 0xAAB9 }, { 0x759D, 0xAAB7 }, { 0x75A2, 0xACCF }, { 0x75A3, 0xACD0 }, { 0x75A4, 0xACCD }, { 0x75A5, 0xACCE }, { 0x75A7, 0xCFDC }, { 0x75AA, 0xCFDD },
+	{ 0x75AB, 0xACCC }, { 0x75B0, 0xD2C3 }, { 0x75B2, 0xAF68 }, { 0x75B3, 0xAF69 }, { 0x75B5, 0xB2AB }, { 0x75B6, 0xD2C9 }, { 0x75B8, 0xAF6E }, { 0x75B9, 0xAF6C },
+	{ 0x75BA, 0xD2CA }, { 0x75BB, 0xD2C5 }, { 0x75BC, 0xAF6B }, { 0x75BD, 0xAF6A }, { 0x75BE, 0xAF65 }, { 0x75BF, 0xD2C8 }, { 0x75C0, 0xD2C7 }, { 0x75C1, 0xD2C4 },
+	{ 0x75C2, 0xAF6D }, { 0x75C4, 0xD2C6 }, { 0x75C5, 0xAF66 }, { 0x75C7, 0xAF67 }, { 0x75CA, 0xB2AC }, { 0x75CB, 0xD6A1 }, { 0x75CC, 0xD6A2 }, { 0x75CD, 0xB2AD },
+	{ 0x75CE, 0xD67C }, { 0x75CF, 0xD67E }, { 0x75D0, 0xD6A4 }, { 0x75D1, 0xD6A3 }, { 0x75D2, 0xD67D }, { 0x75D4, 0xB2A9 }, { 0x75D5, 0xB2AA }, { 0x75D7, 0xDAB6 },
+	{ 0x75D8, 0xB56B }, { 0x75D9, 0xB56A }, { 0x75DA, 0xDAB0 }, { 0x75DB, 0xB568 }, { 0x75DD, 0xDAB3 }, { 0x75DE, 0xB56C }, { 0x75DF, 0xDAB4 }, { 0x75E0, 0xB56D },
+	{ 0x75E1, 0xDAB1 }, { 0x75E2, 0xB567 }, { 0x75E3, 0xB569 }, { 0x75E4, 0xDAB5 }, { 0x75E6, 0xDAB2 }, { 0x75E7, 0xDAAF }, { 0x75ED, 0xDED2 }, { 0x75EF, 0xDEC7 },
+	{ 0x75F0, 0xB7F0 }, { 0x75F1, 0xB7F3 }, { 0x75F2, 0xB7F2 }, { 0x75F3, 0xB7F7 }, { 0x75F4, 0xB7F6 }, { 0x75F5, 0xDED3 }, { 0x75F6, 0xDED1 }, { 0x75F7, 0xDECA },
+	{ 0x75F8, 0xDECE }, { 0x75F9, 0xDECD }, { 0x75FA, 0xB7F4 }, { 0x75FB, 0xDED0 }, { 0x75FC, 0xDECC }, { 0x75FD, 0xDED4 }, { 0x75FE, 0xDECB }, { 0x75FF, 0xB7F5 },
+	{ 0x7600, 0xB7EF }, { 0x7601, 0xB7F1 }, { 0x7603, 0xDEC9 }, { 0x7608, 0xE2DB }, { 0x7609, 0xBAC7 }, { 0x760A, 0xE2DF }, { 0x760B, 0xBAC6 }, { 0x760C, 0xE2DC },
+	{ 0x760D, 0xBAC5 }, { 0x760F, 0xDEC8 }, { 0x7610, 0xDECF }, { 0x7611, 0xE2DE }, { 0x7613, 0xBAC8 }, { 0x7614, 0xE2E0 }, { 0x7615, 0xE2DD }, { 0x7616, 0xE2DA },
+	{ 0x7619, 0xE6B1 }, { 0x761A, 0xE6B5 }, { 0x761B, 0xE6B7 }, { 0x761C, 0xE6B3 }, { 0x761D, 0xE6B2 }, { 0x761E, 0xE6B0 }, { 0x761F, 0xBD45 }, { 0x7620, 0xBD43 },
+	{ 0x7621, 0xBD48 }, { 0x7622, 0xBD49 }, { 0x7623, 0xE6B4 }, { 0x7624, 0xBD46 }, { 0x7625, 0xE6AF }, { 0x7626, 0xBD47 }, { 0x7627, 0xBAC4 }, { 0x7628, 0xE6B6 },
+	{ 0x7629, 0xBD44 }, { 0x762D, 0xEA6C }, { 0x762F, 0xEA6B }, { 0x7630, 0xEA73 }, { 0x7631, 0xEA6D }, { 0x7632, 0xEA72 }, { 0x7633, 0xEA6F }, { 0x7634, 0xBF60 },
+	{ 0x7635, 0xEA71 }, { 0x7638, 0xBF61 }, { 0x763A, 0xBF62 }, { 0x763C, 0xEA70 }, { 0x763D, 0xEA6E }, { 0x7642, 0xC0F8 }, { 0x7643, 0xED74 }, { 0x7646, 0xC0F7 },
+	{ 0x7647, 0xED77 }, { 0x7648, 0xED75 }, { 0x7649, 0xED76 }, { 0x764C, 0xC0F9 }, { 0x7650, 0xF04D }, { 0x7652, 0xC2A1 }, { 0x7653, 0xF04E }, { 0x7656, 0xC27D },
+	{ 0x7657, 0xF04F }, { 0x7658, 0xC27E }, { 0x7659, 0xF04C }, { 0x765A, 0xF050 }, { 0x765C, 0xF04A }, { 0x765F, 0xC3A7 }, { 0x7660, 0xF278 }, { 0x7661, 0xC3A8 },
+	{ 0x7662, 0xC46F }, { 0x7664, 0xF04B }, { 0x7665, 0xC470 }, { 0x7669, 0xC4EE }, { 0x766A, 0xF5DF }, { 0x766C, 0xC57E }, { 0x766D, 0xF6F4 }, { 0x766E, 0xC57D },
+	{ 0x7670, 0xF7EA }, { 0x7671, 0xC5F5 }, { 0x7672, 0xC5F6 }, { 0x7675, 0xF9CC }, { 0x7678, 0xACD1 }, { 0x7679, 0xCFDE }, { 0x767B, 0xB56E }, { 0x767C, 0xB56F },
+	{ 0x767D, 0xA5D5 }, { 0x767E, 0xA6CA }, { 0x767F, 0xCA47 }, { 0x7681, 0xCB71 }, { 0x7682, 0xA86D }, { 0x7684, 0xAABA }, { 0x7686, 0xACD2 }, { 0x7687, 0xACD3 },
+	{ 0x7688, 0xACD4 }, { 0x7689, 0xD6A6 }, { 0x768A, 0xD2CB }, { 0x768B, 0xAF6F }, { 0x768E, 0xB2AE }, { 0x768F, 0xD6A5 }, { 0x7692, 0xDAB8 }, { 0x7693, 0xB571 },
+	{ 0x7695, 0xDAB7 }, { 0x7696, 0xB570 }, { 0x7699, 0xDED5 }, { 0x769A, 0xBD4A }, { 0x769B, 0xE6BB }, { 0x769C, 0xE6B8 }, { 0x769D, 0xE6B9 }, { 0x769E, 0xE6BA },
+	{ 0x76A4, 0xED78 }, { 0x76A6, 0xF051 }, { 0x76AA, 0xF471 }, { 0x76AB, 0xF470 }, { 0x76AD, 0xF6F5 }, { 0x76AE, 0xA5D6 }, { 0x76AF, 0xCD75 }, { 0x76B0, 0xAF70 },
+	{ 0x76B4, 0xB572 }, { 0x76B5, 0xDED6 }, { 0x76B8, 0xE2E1 }, { 0x76BA, 0xBD4B }, { 0x76BB, 0xEA74 }, { 0x76BD, 0xF052 }, { 0x76BE, 0xF472 }, { 0x76BF, 0xA5D7 },
+	{ 0x76C2, 0xAABB }, { 0x76C3, 0xACD7 }, { 0x76C4, 0xCFDF }, { 0x76C5, 0xACD8 }, { 0x76C6, 0xACD6 }, { 0x76C8, 0xACD5 }, { 0x76C9, 0xD2CC }, { 0x76CA, 0xAF71 },
+	{ 0x76CD, 0xAF72 }, { 0x76CE, 0xAF73 }, { 0x76D2, 0xB2B0 }, { 0x76D3, 0xD6A7 }, { 0x76D4, 0xB2AF }, { 0x76DA, 0xDAB9 }, { 0x76DB, 0xB2B1 }, { 0x76DC, 0xB573 },
+	{ 0x76DD, 0xDED7 }, { 0x76DE, 0xB7F8 }, { 0x76DF, 0xB7F9 }, { 0x76E1, 0xBAC9 }, { 0x76E3, 0xBACA }, { 0x76E4, 0xBD4C }, { 0x76E5, 0xBF64 }, { 0x76E6, 0xEA75 },
+	{ 0x76E7, 0xBF63 }, { 0x76E9, 0xED79 }, { 0x76EA, 0xC0FA }, { 0x76EC, 0xF053 }, { 0x76ED, 0xF473 }, { 0x76EE, 0xA5D8 }, { 0x76EF, 0xA86E }, { 0x76F0, 0xCD78 },
+	{ 0x76F1, 0xCD77 }, { 0x76F2, 0xAABC }, { 0x76F3, 0xCD76 }, { 0x76F4, 0xAABD }, { 0x76F5, 0xCD79 }, { 0x76F7, 0xCFE5 }, { 0x76F8, 0xACDB }, { 0x76F9, 0xACDA },
+	{ 0x76FA, 0xCFE7 }, { 0x76FB, 0xCFE6 }, { 0x76FC, 0xACDF }, { 0x76FE, 0xACDE }, { 0x7701, 0xACD9 }, { 0x7703, 0xCFE1 }, { 0x7704, 0xCFE2 }, { 0x7705, 0xCFE3 },
+	{ 0x7707, 0xACE0 }, { 0x7708, 0xCFE0 }, { 0x7709, 0xACDC }, { 0x770A, 0xCFE4 }, { 0x770B, 0xACDD }, { 0x7710, 0xD2CF }, { 0x7711, 0xD2D3 }, { 0x7712, 0xD2D1 },
+	{ 0x7713, 0xD2D0 }, { 0x7715, 0xD2D4 }, { 0x7719, 0xD2D5 }, { 0x771A, 0xD2D6 }, { 0x771B, 0xD2CE }, { 0x771D, 0xD2CD }, { 0x771F, 0xAF75 }, { 0x7720, 0xAF76 },
+	{ 0x7722, 0xD2D7 }, { 0x7723, 0xD2D2 }, { 0x7725, 0xD6B0 }, { 0x7727, 0xD2D8 }, { 0x7728, 0xAF77 }, { 0x7729, 0xAF74 }, { 0x772D, 0xD6AA }, { 0x772F, 0xD6A9 },
+	{ 0x7731, 0xD6AB }, { 0x7732, 0xD6AC }, { 0x7733, 0xD6AE }, { 0x7734, 0xD6AD }, { 0x7735, 0xD6B2 }, { 0x7736, 0xB2B5 }, { 0x7737, 0xB2B2 }, { 0x7738, 0xB2B6 },
+	{ 0x7739, 0xD6A8 }, { 0x773A, 0xB2B7 }, { 0x773B, 0xD6B1 }, { 0x773C, 0xB2B4 }, { 0x773D, 0xD6AF }, { 0x773E, 0xB2B3 }, { 0x7744, 0xDABC }, { 0x7745, 0xDABE },
+	{ 0x7746, 0xDABA }, { 0x7747, 0xDABB }, { 0x774A, 0xDABF }, { 0x774B, 0xDAC1 }, { 0x774C, 0xDAC2 }, { 0x774D, 0xDABD }, { 0x774E, 0xDAC0 }, { 0x774F, 0xB574 },
+	{ 0x7752, 0xDEDB }, { 0x7754, 0xDEE0 }, { 0x7755, 0xDED8 }, { 0x7756, 0xDEDC }, { 0x7759, 0xDEE1 }, { 0x775A, 0xDEDD }, { 0x775B, 0xB7FA }, { 0x775C, 0xB843 },
+	{ 0x775E, 0xB7FD }, { 0x775F, 0xDED9 }, { 0x7760, 0xDEDA }, { 0x7761, 0xBACE }, { 0x7762, 0xB846 }, { 0x7763, 0xB7FE }, { 0x7765, 0xB844 }, { 0x7766, 0xB7FC },
+	{ 0x7767, 0xDEDF }, { 0x7768, 0xB845 }, { 0x7769, 0xDEDE }, { 0x776A, 0xB841 }, { 0x776B, 0xB7FB }, { 0x776C, 0xB842 }, { 0x776D, 0xDEE2 }, { 0x776E, 0xE2E6 },
+	{ 0x776F, 0xE2E8 }, { 0x7779, 0xB840 }, { 0x777C, 0xE2E3 }, { 0x777D, 0xBACC }, { 0x777E, 0xE2E9 }, { 0x777F, 0xBACD }, { 0x7780, 0xE2E7 }, { 0x7781, 0xE2E2 },
+	{ 0x7782, 0xE2E5 }, { 0x7783, 0xE2EA }, { 0x7784, 0xBACB }, { 0x7785, 0xE2E4 }, { 0x7787, 0xBD4E }, { 0x7788, 0xE6BF }, { 0x7789, 0xE6BE }, { 0x778B, 0xBD51 },
+	{ 0x778C, 0xBD4F }, { 0x778D, 0xE6BC }, { 0x778E, 0xBD4D }, { 0x778F, 0xE6BD }, { 0x7791, 0xBD50 }, { 0x7795, 0xEA7D }, { 0x7797, 0xEAA1 }, { 0x7799, 0xEA7E },
+	{ 0x779A, 0xEA76 }, { 0x779B, 0xEA7A }, { 0x779C, 0xEA79 }, { 0x779D, 0xEA77 }, { 0x779E, 0xBF66 }, { 0x779F, 0xBF67 }, { 0x77A0, 0xBF65 }, { 0x77A1, 0xEA78 },
+	{ 0x77A2, 0xEA7B }, { 0x77A3, 0xEA7C }, { 0x77A5, 0xBF68 }, { 0x77A7, 0xC140 }, { 0x77A8, 0xEDA3 }, { 0x77AA, 0xC0FC }, { 0x77AB, 0xED7B }, { 0x77AC, 0xC0FE },
+	{ 0x77AD, 0xC141 }, { 0x77B0, 0xC0FD }, { 0x77B1, 0xEDA2 }, { 0x77B2, 0xED7C }, { 0x77B3, 0xC0FB }, { 0x77B4, 0xEDA1 }, { 0x77B5, 0xED7A }, { 0x77B6, 0xED7E },
+	{ 0x77B7, 0xED7D }, { 0x77BA, 0xF055 }, { 0x77BB, 0xC2A4 }, { 0x77BC, 0xC2A5 }, { 0x77BD, 0xC2A2 }, { 0x77BF, 0xC2A3 }, { 0x77C2, 0xF054 }, { 0x77C4, 0xF27B },
+	{ 0x77C7, 0xC3A9 }, { 0x77C9, 0xF279 }, { 0x77CA, 0xF27A }, { 0x77CC, 0xF474 }, { 0x77CD, 0xF477 }, { 0x77CE, 0xF475 }, { 0x77CF, 0xF476 }, { 0x77D0, 0xF5E0 },
+	{ 0x77D3, 0xC4EF }, { 0x77D4, 0xF7EB }, { 0x77D5, 0xF8B4 }, { 0x77D7, 0xC5F7 }, { 0x77D8, 0xF8F8 }, { 0x77D9, 0xF8F9 }, { 0x77DA, 0xC666 }, { 0x77DB, 0xA5D9 },
+	{ 0x77DC, 0xACE1 }, { 0x77DE, 0xDAC3 }, { 0x77E0, 0xDEE3 }, { 0x77E2, 0xA5DA }, { 0x77E3, 0xA86F }, { 0x77E5, 0xAABE }, { 0x77E7, 0xCFE8 }, { 0x77E8, 0xCFE9 },
+	{ 0x77E9, 0xAF78 }, { 0x77EC, 0xDAC4 }, { 0x77ED, 0xB575 }, { 0x77EE, 0xB847 }, { 0x77EF, 0xC142 }, { 0x77F0, 0xEDA4 }, { 0x77F1, 0xF27C }, { 0x77F2, 0xF478 },
+	{ 0x77F3, 0xA5DB }, { 0x77F7, 0xCDA1 }, { 0x77F8, 0xCD7A }, { 0x77F9, 0xCD7C }, { 0x77FA, 0xCD7E }, { 0x77FB, 0xCD7D }, { 0x77FC, 0xCD7B }, { 0x77FD, 0xAABF },
+	{ 0x7802, 0xACE2 }, { 0x7803, 0xCFF2 }, { 0x7805, 0xCFED }, { 0x7806, 0xCFEA }, { 0x7809, 0xCFF1 }, { 0x780C, 0xACE4 }, { 0x780D, 0xACE5 }, { 0x780E, 0xCFF0 },
+	{ 0x780F, 0xCFEF }, { 0x7810, 0xCFEE }, { 0x7811, 0xCFEB }, { 0x7812, 0xCFEC }, { 0x7813, 0xCFF3 }, { 0x7814, 0xACE3 }, { 0x781D, 0xAF7C }, { 0x781F, 0xAFA4 },
+	{ 0x7820, 0xAFA3 }, { 0x7821, 0xD2E1 }, { 0x7822, 0xD2DB }, { 0x7823, 0xD2D9 }, { 0x7825, 0xAFA1 }, { 0x7826, 0xD6B9 }, { 0x7827, 0xAF7A }, { 0x7828, 0xD2DE },
+	{ 0x7829, 0xD2E2 }, { 0x782A, 0xD2E4 }, { 0x782B, 0xD2E0 }, { 0x782C, 0xD2DA }, { 0x782D, 0xAFA2 }, { 0x782E, 0xD2DF }, { 0x782F, 0xD2DD }, { 0x7830, 0xAF79 },
+	{ 0x7831, 0xD2E5 }, { 0x7832, 0xAFA5 }, { 0x7833, 0xD2E3 }, { 0x7834, 0xAF7D }, { 0x7835, 0xD2DC }, { 0x7837, 0xAF7E }, { 0x7838, 0xAF7B }, { 0x7843, 0xB2B9 },
+	{ 0x7845, 0xD6BA }, { 0x7848, 0xD6B3 }, { 0x7849, 0xD6B5 }, { 0x784A, 0xD6B7 }, { 0x784C, 0xD6B8 }, { 0x784D, 0xD6B6 }, { 0x784E, 0xB2BA }, { 0x7850, 0xD6BB },
+	{ 0x7852, 0xD6B4 }, { 0x785C, 0xDAC8 }, { 0x785D, 0xB576 }, { 0x785E, 0xDAD0 }, { 0x7860, 0xDAC5 }, { 0x7862, 0xDAD1 }, { 0x7864, 0xDAC6 }, { 0x7865, 0xDAC7 },
+	{ 0x7868, 0xDACF }, { 0x7869, 0xDACE }, { 0x786A, 0xDACB }, { 0x786B, 0xB2B8 }, { 0x786C, 0xB577 }, { 0x786D, 0xDAC9 }, { 0x786E, 0xDACC }, { 0x786F, 0xB578 },
+	{ 0x7870, 0xDACD }, { 0x7871, 0xDACA }, { 0x7879, 0xDEEE }, { 0x787B, 0xDEF2 }, { 0x787C, 0xB84E }, { 0x787E, 0xE2F0 }, { 0x787F, 0xB851 }, { 0x7880, 0xDEF0 },
+	{ 0x7883, 0xDEED }, { 0x7884, 0xDEE8 }, { 0x7885, 0xDEEA }, { 0x7886, 0xDEEB }, { 0x7887, 0xDEE4 }, { 0x7889, 0xB84D }, { 0x788C, 0xB84C }, { 0x788E, 0xB848 },
+	{ 0x788F, 0xDEE7 }, { 0x7891, 0xB84F }, { 0x7893, 0xB850 }, { 0x7894, 0xDEE6 }, { 0x7895, 0xDEE9 }, { 0x7896, 0xDEF1 }, { 0x7897, 0xB84A }, { 0x7898, 0xB84B },
+	{ 0x7899, 0xDEEF }, { 0x789A, 0xDEE5 }, { 0x789E, 0xE2F2 }, { 0x789F, 0xBAD0 }, { 0x78A0, 0xE2F4 }, { 0x78A1, 0xDEEC }, { 0x78A2, 0xE2F6 }, { 0x78A3, 0xBAD4 },
+	{ 0x78A4, 0xE2F7 }, { 0x78A5, 0xE2F3 }, { 0x78A7, 0xBAD1 }, { 0x78A8, 0xE2EF }, { 0x78A9, 0xBAD3 }, { 0x78AA, 0xE2EC }, { 0x78AB, 0xE2F1 }, { 0x78AC, 0xE2F5 },
+	{ 0x78AD, 0xE2EE }, { 0x78B0, 0xB849 }, { 0x78B2, 0xE2EB }, { 0x78B3, 0xBAD2 }, { 0x78B4, 0xE2ED }, { 0x78BA, 0xBD54 }, { 0x78BB, 0xE6C1 }, { 0x78BC, 0xBD58 },
+	{ 0x78BE, 0xBD56 }, { 0x78C1, 0xBACF }, { 0x78C3, 0xE6C8 }, { 0x78C4, 0xE6C9 }, { 0x78C5, 0xBD53 }, { 0x78C8, 0xE6C7 }, { 0x78C9, 0xE6CA }, { 0x78CA, 0xBD55 },
+	{ 0x78CB, 0xBD52 }, { 0x78CC, 0xE6C3 }, { 0x78CD, 0xE6C0 }, { 0x78CE, 0xE6C5 }, { 0x78CF, 0xE6C2 }, { 0x78D0, 0xBD59 }, { 0x78D1, 0xE6C4 }, { 0x78D4, 0xE6C6 },
+	{ 0x78D5, 0xBD57 }, { 0x78DA, 0xBF6A }, { 0x78DB, 0xEAA8 }, { 0x78DD, 0xEAA2 }, { 0x78DE, 0xEAA6 }, { 0x78DF, 0xEAAC }, { 0x78E0, 0xEAAD }, { 0x78E1, 0xEAA9 },
+	{ 0x78E2, 0xEAAA }, { 0x78E3, 0xEAA7 }, { 0x78E5, 0xEAA4 }, { 0x78E7, 0xBF6C }, { 0x78E8, 0xBF69 }, { 0x78E9, 0xEAA3 }, { 0x78EA, 0xEAA5 }, { 0x78EC, 0xBF6B },
+	{ 0x78ED, 0xEAAB }, { 0x78EF, 0xC146 }, { 0x78F2, 0xEDAA }, { 0x78F3, 0xEDA5 }, { 0x78F4, 0xC145 }, { 0x78F7, 0xC143 }, { 0x78F9, 0xEDAC }, { 0x78FA, 0xC144 },
+	{ 0x78FB, 0xEDA8 }, { 0x78FC, 0xEDA9 }, { 0x78FD, 0xEDA6 }, { 0x78FE, 0xEDAD }, { 0x78FF, 0xF056 }, { 0x7901, 0xC147 }, { 0x7902, 0xEDA7 }, { 0x7904, 0xEDAE },
+	{ 0x7905, 0xEDAB }, { 0x7909, 0xF05A }, { 0x790C, 0xF057 }, { 0x790E, 0xC2A6 }, { 0x7910, 0xF05B }, { 0x7911, 0xF05D }, { 0x7912, 0xF05C }, { 0x7913, 0xF058 },
+	{ 0x7914, 0xF059 }, { 0x7917, 0xF2A3 }, { 0x7919, 0xC3AA }, { 0x791B, 0xF27E }, { 0x791C, 0xF2A2 }, { 0x791D, 0xF27D }, { 0x791E, 0xF2A4 }, { 0x7921, 0xF2A1 },
+	{ 0x7923, 0xF47A }, { 0x7924, 0xF47D }, { 0x7925, 0xF479 }, { 0x7926, 0xC471 }, { 0x7927, 0xF47B }, { 0x7928, 0xF47C }, { 0x7929, 0xF47E }, { 0x792A, 0xC472 },
+	{ 0x792B, 0xC474 }, { 0x792C, 0xC473 }, { 0x792D, 0xF5E1 }, { 0x792F, 0xF5E3 }, { 0x7931, 0xF5E2 }, { 0x7935, 0xF6F6 }, { 0x7938, 0xF8B5 }, { 0x7939, 0xF8FA },
+	{ 0x793A, 0xA5DC }, { 0x793D, 0xCB72 }, { 0x793E, 0xAAC0 }, { 0x793F, 0xCDA3 }, { 0x7940, 0xAAC1 }, { 0x7941, 0xAAC2 }, { 0x7942, 0xCDA2 }, { 0x7944, 0xCFF8 },
+	{ 0x7945, 0xCFF7 }, { 0x7946, 0xACE6 }, { 0x7947, 0xACE9 }, { 0x7948, 0xACE8 }, { 0x7949, 0xACE7 }, { 0x794A, 0xCFF4 }, { 0x794B, 0xCFF6 }, { 0x794C, 0xCFF5 },
+	{ 0x794F, 0xD2E8 }, { 0x7950, 0xAFA7 }, { 0x7951, 0xD2EC }, { 0x7952, 0xD2EB }, { 0x7953, 0xD2EA }, { 0x7954, 0xD2E6 }, { 0x7955, 0xAFA6 }, { 0x7956, 0xAFAA },
+	{ 0x7957, 0xAFAD }, { 0x795A, 0xAFAE }, { 0x795B, 0xD2E7 }, { 0x795C, 0xD2E9 }, { 0x795D, 0xAFAC }, { 0x795E, 0xAFAB }, { 0x795F, 0xAFA9 }, { 0x7960, 0xAFA8 },
+	{ 0x7961, 0xD6C2 }, { 0x7963, 0xD6C0 }, { 0x7964, 0xD6BC }, { 0x7965, 0xB2BB }, { 0x7967, 0xD6BD }, { 0x7968, 0xB2BC }, { 0x7969, 0xD6BE }, { 0x796A, 0xD6BF },
+	{ 0x796B, 0xD6C1 }, { 0x796D, 0xB2BD }, { 0x7970, 0xDAD5 }, { 0x7972, 0xDAD4 }, { 0x7973, 0xDAD3 }, { 0x7974, 0xDAD2 }, { 0x7979, 0xDEF6 }, { 0x797A, 0xB852 },
+	{ 0x797C, 0xDEF3 }, { 0x797D, 0xDEF5 }, { 0x797F, 0xB853 }, { 0x7981, 0xB854 }, { 0x7982, 0xDEF4 }, { 0x7988, 0xE341 }, { 0x798A, 0xE2F9 }, { 0x798B, 0xE2FA },
+	{ 0x798D, 0xBAD7 }, { 0x798E, 0xBAD5 }, { 0x798F, 0xBAD6 }, { 0x7990, 0xE343 }, { 0x7992, 0xE342 }, { 0x7993, 0xE2FE }, { 0x7994, 0xE2FD }, { 0x7995, 0xE2FC },
+	{ 0x7996, 0xE2FB }, { 0x7997, 0xE340 }, { 0x7998, 0xE2F8 }, { 0x799A, 0xE6CB }, { 0x799B, 0xE6D0 }, { 0x799C, 0xE6CE }, { 0x79A0, 0xE6CD }, { 0x79A1, 0xE6CC },
+	{ 0x79A2, 0xE6CF }, { 0x79A4, 0xEAAE }, { 0x79A6, 0xBF6D }, { 0x79A7, 0xC148 }, { 0x79A8, 0xEDB0 }, { 0x79AA, 0xC149 }, { 0x79AB, 0xEDAF }, { 0x79AC, 0xF05F },
+	{ 0x79AD, 0xF05E }, { 0x79AE, 0xC2A7 }, { 0x79B0, 0xF2A5 }, { 0x79B1, 0xC3AB }, { 0x79B2, 0xF4A1 }, { 0x79B3, 0xC5A1 }, { 0x79B4, 0xF6F7 }, { 0x79B6, 0xF8B7 },
+	{ 0x79B7, 0xF8B6 }, { 0x79B8, 0xC9A8 }, { 0x79B9, 0xACEA }, { 0x79BA, 0xACEB }, { 0x79BB, 0xD6C3 }, { 0x79BD, 0xB856 }, { 0x79BE, 0xA5DD }, { 0x79BF, 0xA872 },
+	{ 0x79C0, 0xA871 }, { 0x79C1, 0xA870 }, { 0x79C5, 0xCDA4 }, { 0x79C8, 0xAAC4 }, { 0x79C9, 0xAAC3 }, { 0x79CB, 0xACEE }, { 0x79CD, 0xCFFA }, { 0x79CE, 0xCFFD },
+	{ 0x79CF, 0xCFFB }, { 0x79D1, 0xACEC }, { 0x79D2, 0xACED }, { 0x79D5, 0xCFF9 }, { 0x79D6, 0xCFFC }, { 0x79D8, 0xAFB5 }, { 0x79DC, 0xD2F3 }, { 0x79DD, 0xD2F5 },
+	{ 0x79DE, 0xD2F4 }, { 0x79DF, 0xAFB2 }, { 0x79E0, 0xD2EF }, { 0x79E3, 0xAFB0 }, { 0x79E4, 0xAFAF }, { 0x79E6, 0xAFB3 }, { 0x79E7, 0xAFB1 }, { 0x79E9, 0xAFB4 },
+	{ 0x79EA, 0xD2F2 }, { 0x79EB, 0xD2ED }, { 0x79EC, 0xD2EE }, { 0x79ED, 0xD2F1 }, { 0x79EE, 0xD2F0 }, { 0x79F6, 0xD6C6 }, { 0x79F7, 0xD6C7 }, { 0x79F8, 0xD6C5 },
+	{ 0x79FA, 0xD6C4 }, { 0x79FB, 0xB2BE }, { 0x7A00, 0xB57D }, { 0x7A02, 0xDAD6 }, { 0x7A03, 0xDAD8 }, { 0x7A04, 0xDADA }, { 0x7A05, 0xB57C }, { 0x7A08, 0xB57A },
+	{ 0x7A0A, 0xDAD7 }, { 0x7A0B, 0xB57B }, { 0x7A0C, 0xDAD9 }, { 0x7A0D, 0xB579 }, { 0x7A10, 0xDF41 }, { 0x7A11, 0xDEF7 }, { 0x7A12, 0xDEFA }, { 0x7A13, 0xDEFE },
+	{ 0x7A14, 0xB85A }, { 0x7A15, 0xDEFC }, { 0x7A17, 0xDEFB }, { 0x7A18, 0xDEF8 }, { 0x7A19, 0xDEF9 }, { 0x7A1A, 0xB858 }, { 0x7A1B, 0xDF40 }, { 0x7A1C, 0xB857 },
+	{ 0x7A1E, 0xB85C }, { 0x7A1F, 0xB85B }, { 0x7A20, 0xB859 }, { 0x7A22, 0xDEFD }, { 0x7A26, 0xE349 }, { 0x7A28, 0xE348 }, { 0x7A2B, 0xE344 }, { 0x7A2E, 0xBAD8 },
+	{ 0x7A2F, 0xE347 }, { 0x7A30, 0xE346 }, { 0x7A31, 0xBAD9 }, { 0x7A37, 0xBD5E }, { 0x7A39, 0xE6D2 }, { 0x7A3B, 0xBD5F }, { 0x7A3C, 0xBD5B }, { 0x7A3D, 0xBD5D },
+	{ 0x7A3F, 0xBD5A }, { 0x7A40, 0xBD5C }, { 0x7A44, 0xEAAF }, { 0x7A46, 0xBF70 }, { 0x7A47, 0xEAB1 }, { 0x7A48, 0xEAB0 }, { 0x7A4A, 0xE345 }, { 0x7A4B, 0xBF72 },
+	{ 0x7A4C, 0xBF71 }, { 0x7A4D, 0xBF6E }, { 0x7A4E, 0xBF6F }, { 0x7A54, 0xEDB5 }, { 0x7A56, 0xEDB3 }, { 0x7A57, 0xC14A }, { 0x7A58, 0xEDB4 }, { 0x7A5A, 0xEDB6 },
+	{ 0x7A5B, 0xEDB2 }, { 0x7A5C, 0xEDB1 }, { 0x7A5F, 0xF060 }, { 0x7A60, 0xC2AA }, { 0x7A61, 0xC2A8 }, { 0x7A62, 0xC2A9 }, { 0x7A67, 0xF2A6 }, { 0x7A68, 0xF2A7 },
+	{ 0x7A69, 0xC3AD }, { 0x7A6B, 0xC3AC }, { 0x7A6C, 0xF4A3 }, { 0x7A6D, 0xF4A4 }, { 0x7A6E, 0xF4A2 }, { 0x7A70, 0xF6F8 }, { 0x7A71, 0xF6F9 }, { 0x7A74, 0xA5DE },
+	{ 0x7A75, 0xCA48 }, { 0x7A76, 0xA873 }, { 0x7A78, 0xCDA5 }, { 0x7A79, 0xAAC6 }, { 0x7A7A, 0xAAC5 }, { 0x7A7B, 0xCDA6 }, { 0x7A7E, 0xD040 }, { 0x7A7F, 0xACEF },
+	{ 0x7A80, 0xCFFE }, { 0x7A81, 0xACF0 }, { 0x7A84, 0xAFB6 }, { 0x7A85, 0xD2F8 }, { 0x7A86, 0xD2F6 }, { 0x7A87, 0xD2FC }, { 0x7A88, 0xAFB7 }, { 0x7A89, 0xD2F7 },
+	{ 0x7A8A, 0xD2FB }, { 0x7A8B, 0xD2F9 }, { 0x7A8C, 0xD2FA }, { 0x7A8F, 0xD6C8 }, { 0x7A90, 0xD6CA }, { 0x7A92, 0xB2BF }, { 0x7A94, 0xD6C9 }, { 0x7A95, 0xB2C0 },
+	{ 0x7A96, 0xB5A2 }, { 0x7A97, 0xB5A1 }, { 0x7A98, 0xB57E }, { 0x7A99, 0xDADB }, { 0x7A9E, 0xDF44 }, { 0x7A9F, 0xB85D }, { 0x7AA0, 0xB85E }, { 0x7AA2, 0xDF43 },
+	{ 0x7AA3, 0xDF42 }, { 0x7AA8, 0xE34A }, { 0x7AA9, 0xBADB }, { 0x7AAA, 0xBADA }, { 0x7AAB, 0xE34B }, { 0x7AAC, 0xE34C }, { 0x7AAE, 0xBD61 }, { 0x7AAF, 0xBD60 },
+	{ 0x7AB1, 0xEAB5 }, { 0x7AB2, 0xE6D3 }, { 0x7AB3, 0xE6D5 }, { 0x7AB4, 0xE6D4 }, { 0x7AB5, 0xEAB4 }, { 0x7AB6, 0xEAB2 }, { 0x7AB7, 0xEAB6 }, { 0x7AB8, 0xEAB3 },
+	{ 0x7ABA, 0xBF73 }, { 0x7ABE, 0xEDB7 }, { 0x7ABF, 0xC14B }, { 0x7AC0, 0xEDB8 }, { 0x7AC1, 0xEDB9 }, { 0x7AC4, 0xC2AB }, { 0x7AC5, 0xC2AC }, { 0x7AC7, 0xC475 },
+	{ 0x7ACA, 0xC5D1 }, { 0x7ACB, 0xA5DF }, { 0x7AD1, 0xD041 }, { 0x7AD8, 0xD2FD }, { 0x7AD9, 0xAFB8 }, { 0x7ADF, 0xB3BA }, { 0x7AE0, 0xB3B9 }, { 0x7AE3, 0xB5A4 },
+	{ 0x7AE4, 0xDADD }, { 0x7AE5, 0xB5A3 }, { 0x7AE6, 0xDADC }, { 0x7AEB, 0xDF45 }, { 0x7AED, 0xBADC }, { 0x7AEE, 0xE34D }, { 0x7AEF, 0xBADD }, { 0x7AF6, 0xC476 },
+	{ 0x7AF7, 0xF4A5 }, { 0x7AF9, 0xA6CB }, { 0x7AFA, 0xAAC7 }, { 0x7AFB, 0xCDA7 }, { 0x7AFD, 0xACF2 }, { 0x7AFF, 0xACF1 }, { 0x7B00, 0xD042 }, { 0x7B01, 0xD043 },
+	{ 0x7B04, 0xD340 }, { 0x7B05, 0xD342 }, { 0x7B06, 0xAFB9 }, { 0x7B08, 0xD344 }, { 0x7B09, 0xD347 }, { 0x7B0A, 0xD345 }, { 0x7B0E, 0xD346 }, { 0x7B0F, 0xD343 },
+	{ 0x7B10, 0xD2FE }, { 0x7B11, 0xAFBA }, { 0x7B12, 0xD348 }, { 0x7B13, 0xD341 }, { 0x7B18, 0xD6D3 }, { 0x7B19, 0xB2C6 }, { 0x7B1A, 0xD6DC }, { 0x7B1B, 0xB2C3 },
+	{ 0x7B1D, 0xD6D5 }, { 0x7B1E, 0xB2C7 }, { 0x7B20, 0xB2C1 }, { 0x7B22, 0xD6D0 }, { 0x7B23, 0xD6DD }, { 0x7B24, 0xD6D1 }, { 0x7B25, 0xD6CE }, { 0x7B26, 0xB2C5 },
+	{ 0x7B28, 0xB2C2 }, { 0x7B2A, 0xD6D4 }, { 0x7B2B, 0xD6D7 }, { 0x7B2C, 0xB2C4 }, { 0x7B2D, 0xD6D8 }, { 0x7B2E, 0xB2C8 }, { 0x7B2F, 0xD6D9 }, { 0x7B30, 0xD6CF },
+	{ 0x7B31, 0xD6D6 }, { 0x7B32, 0xD6DA }, { 0x7B33, 0xD6D2 }, { 0x7B34, 0xD6CD }, { 0x7B35, 0xD6CB }, { 0x7B38, 0xD6DB }, { 0x7B3B, 0xDADF }, { 0x7B40, 0xDAE4 },
+	{ 0x7B44, 0xDAE0 }, { 0x7B45, 0xDAE6 }, { 0x7B46, 0xB5A7 }, { 0x7B47, 0xD6CC }, { 0x7B48, 0xDAE1 }, { 0x7B49, 0xB5A5 }, { 0x7B4A, 0xDADE }, { 0x7B4B, 0xB5AC },
+	{ 0x7B4C, 0xDAE2 }, { 0x7B4D, 0xB5AB }, { 0x7B4E, 0xDAE3 }, { 0x7B4F, 0xB5AD }, { 0x7B50, 0xB5A8 }, { 0x7B51, 0xB5AE }, { 0x7B52, 0xB5A9 }, { 0x7B54, 0xB5AA },
+	{ 0x7B56, 0xB5A6 }, { 0x7B58, 0xDAE5 }, { 0x7B60, 0xB861 }, { 0x7B61, 0xDF50 }, { 0x7B63, 0xDF53 }, { 0x7B64, 0xDF47 }, { 0x7B65, 0xDF4C }, { 0x7B66, 0xDF46 },
+	{ 0x7B67, 0xB863 }, { 0x7B69, 0xDF4A }, { 0x7B6D, 0xDF48 }, { 0x7B6E, 0xB862 }, { 0x7B70, 0xDF4F }, { 0x7B71, 0xDF4E }, { 0x7B72, 0xDF4B }, { 0x7B73, 0xDF4D },
+	{ 0x7B74, 0xDF49 }, { 0x7B75, 0xBAE1 }, { 0x7B76, 0xDF52 }, { 0x7B77, 0xB85F }, { 0x7B78, 0xDF51 }, { 0x7B82, 0xE35D }, { 0x7B84, 0xBAE8 }, { 0x7B85, 0xE358 },
+	{ 0x7B87, 0xBAE7 }, { 0x7B88, 0xE34E }, { 0x7B8A, 0xE350 }, { 0x7B8B, 0xBAE0 }, { 0x7B8C, 0xE355 }, { 0x7B8D, 0xE354 }, { 0x7B8E, 0xE357 }, { 0x7B8F, 0xBAE5 },
+	{ 0x7B90, 0xE352 }, { 0x7B91, 0xE351 }, { 0x7B94, 0xBAE4 }, { 0x7B95, 0xBADF }, { 0x7B96, 0xE353 }, { 0x7B97, 0xBAE2 }, { 0x7B98, 0xE359 }, { 0x7B99, 0xE35B },
+	{ 0x7B9B, 0xE356 }, { 0x7B9C, 0xE34F }, { 0x7B9D, 0xBAE3 }, { 0x7BA0, 0xBD69 }, { 0x7BA1, 0xBADE }, { 0x7BA4, 0xE35C }, { 0x7BAC, 0xE6D9 }, { 0x7BAD, 0xBD62 },
+	{ 0x7BAF, 0xE6DB }, { 0x7BB1, 0xBD63 }, { 0x7BB4, 0xBD65 }, { 0x7BB5, 0xE6DE }, { 0x7BB7, 0xE6D6 }, { 0x7BB8, 0xBAE6 }, { 0x7BB9, 0xE6DC }, { 0x7BBE, 0xE6D8 },
+	{ 0x7BC0, 0xB860 }, { 0x7BC1, 0xBD68 }, { 0x7BC4, 0xBD64 }, { 0x7BC6, 0xBD66 }, { 0x7BC7, 0xBD67 }, { 0x7BC9, 0xBF76 }, { 0x7BCA, 0xE6DD }, { 0x7BCB, 0xE6D7 },
+	{ 0x7BCC, 0xBD6A }, { 0x7BCE, 0xE6DA }, { 0x7BD4, 0xEAC0 }, { 0x7BD5, 0xEABB }, { 0x7BD8, 0xEAC5 }, { 0x7BD9, 0xBF74 }, { 0x7BDA, 0xEABD }, { 0x7BDB, 0xBF78 },
+	{ 0x7BDC, 0xEAC3 }, { 0x7BDD, 0xEABA }, { 0x7BDE, 0xEAB7 }, { 0x7BDF, 0xEAC6 }, { 0x7BE0, 0xC151 }, { 0x7BE1, 0xBF79 }, { 0x7BE2, 0xEAC2 }, { 0x7BE3, 0xEAB8 },
+	{ 0x7BE4, 0xBF77 }, { 0x7BE5, 0xEABC }, { 0x7BE6, 0xBF7B }, { 0x7BE7, 0xEAB9 }, { 0x7BE8, 0xEABE }, { 0x7BE9, 0xBF7A }, { 0x7BEA, 0xEAC1 }, { 0x7BEB, 0xEAC4 },
+	{ 0x7BF0, 0xEDCB }, { 0x7BF1, 0xEDCC }, { 0x7BF2, 0xEDBC }, { 0x7BF3, 0xEDC3 }, { 0x7BF4, 0xEDC1 }, { 0x7BF7, 0xC14F }, { 0x7BF8, 0xEDC8 }, { 0x7BF9, 0xEABF },
+	{ 0x7BFB, 0xEDBF }, { 0x7BFD, 0xEDC9 }, { 0x7BFE, 0xC14E }, { 0x7BFF, 0xEDBE }, { 0x7C00, 0xEDBD }, { 0x7C01, 0xEDC7 }, { 0x7C02, 0xEDC4 }, { 0x7C03, 0xEDC6 },
+	{ 0x7C05, 0xEDBA }, { 0x7C06, 0xEDCA }, { 0x7C07, 0xC14C }, { 0x7C09, 0xEDC5 }, { 0x7C0A, 0xEDCE }, { 0x7C0B, 0xEDC2 }, { 0x7C0C, 0xC150 }, { 0x7C0D, 0xC14D },
+	{ 0x7C0E, 0xEDC0 }, { 0x7C0F, 0xEDBB }, { 0x7C10, 0xEDCD }, { 0x7C11, 0xBF75 }, { 0x7C19, 0xF063 }, { 0x7C1C, 0xF061 }, { 0x7C1D, 0xF067 }, { 0x7C1E, 0xC2B0 },
+	{ 0x7C1F, 0xF065 }, { 0x7C20, 0xF064 }, { 0x7C21, 0xC2B2 }, { 0x7C22, 0xF06A }, { 0x7C23, 0xC2B1 }, { 0x7C25, 0xF06B }, { 0x7C26, 0xF068 }, { 0x7C27, 0xC2AE },
+	{ 0x7C28, 0xF069 }, { 0x7C29, 0xF062 }, { 0x7C2A, 0xC2AF }, { 0x7C2B, 0xC2AD }, { 0x7C2C, 0xF2AB }, { 0x7C2D, 0xF066 }, { 0x7C30, 0xF06C }, { 0x7C33, 0xF2A8 },
+	{ 0x7C37, 0xC3B2 }, { 0x7C38, 0xC3B0 }, { 0x7C39, 0xF2AA }, { 0x7C3B, 0xF2AC }, { 0x7C3C, 0xF2A9 }, { 0x7C3D, 0xC3B1 }, { 0x7C3E, 0xC3AE }, { 0x7C3F, 0xC3AF },
+	{ 0x7C40, 0xC3B3 }, { 0x7C43, 0xC478 }, { 0x7C45, 0xF4AA }, { 0x7C47, 0xF4A9 }, { 0x7C48, 0xF4A7 }, { 0x7C49, 0xF4A6 }, { 0x7C4A, 0xF4A8 }, { 0x7C4C, 0xC477 },
+	{ 0x7C4D, 0xC479 }, { 0x7C50, 0xC4F0 }, { 0x7C53, 0xF5E5 }, { 0x7C54, 0xF5E4 }, { 0x7C57, 0xF6FA }, { 0x7C59, 0xF6FC }, { 0x7C5A, 0xF6FE }, { 0x7C5B, 0xF6FD },
+	{ 0x7C5C, 0xF6FB }, { 0x7C5F, 0xC5A3 }, { 0x7C60, 0xC5A2 }, { 0x7C63, 0xC5D3 }, { 0x7C64, 0xC5D2 }, { 0x7C65, 0xC5D4 }, { 0x7C66, 0xF7ED }, { 0x7C67, 0xF7EC },
+	{ 0x7C69, 0xF8FB }, { 0x7C6A, 0xF8B8 }, { 0x7C6B, 0xF8FC }, { 0x7C6C, 0xC658 }, { 0x7C6E, 0xC659 }, { 0x7C6F, 0xF96D }, { 0x7C72, 0xC67E }, { 0x7C73, 0xA6CC },
+	{ 0x7C75, 0xCDA8 }, { 0x7C78, 0xD045 }, { 0x7C79, 0xD046 }, { 0x7C7A, 0xD044 }, { 0x7C7D, 0xACF3 }, { 0x7C7F, 0xD047 }, { 0x7C80, 0xD048 }, { 0x7C81, 0xD049 },
+	{ 0x7C84, 0xD349 }, { 0x7C85, 0xD34F }, { 0x7C88, 0xD34D }, { 0x7C89, 0xAFBB }, { 0x7C8A, 0xD34B }, { 0x7C8C, 0xD34C }, { 0x7C8D, 0xD34E }, { 0x7C91, 0xD34A },
+	{ 0x7C92, 0xB2C9 }, { 0x7C94, 0xD6DE }, { 0x7C95, 0xB2CB }, { 0x7C96, 0xD6E0 }, { 0x7C97, 0xB2CA }, { 0x7C98, 0xD6DF }, { 0x7C9E, 0xDAE8 }, { 0x7C9F, 0xB5AF },
+	{ 0x7CA1, 0xDAEA }, { 0x7CA2, 0xDAE7 }, { 0x7CA3, 0xD6E1 }, { 0x7CA5, 0xB5B0 }, { 0x7CA8, 0xDAE9 }, { 0x7CAF, 0xDF56 }, { 0x7CB1, 0xB864 }, { 0x7CB2, 0xDF54 },
+	{ 0x7CB3, 0xB865 }, { 0x7CB4, 0xDF55 }, { 0x7CB5, 0xB866 }, { 0x7CB9, 0xBAE9 }, { 0x7CBA, 0xE361 }, { 0x7CBB, 0xE35E }, { 0x7CBC, 0xE360 }, { 0x7CBD, 0xBAEA },
+	{ 0x7CBE, 0xBAEB }, { 0x7CBF, 0xE35F }, { 0x7CC5, 0xE6DF }, { 0x7CC8, 0xE6E0 }, { 0x7CCA, 0xBD6B }, { 0x7CCB, 0xE6E2 }, { 0x7CCC, 0xE6E1 }, { 0x7CCE, 0xA261 },
+	{ 0x7CD0, 0xEACA }, { 0x7CD1, 0xEACB }, { 0x7CD2, 0xEAC7 }, { 0x7CD4, 0xEAC8 }, { 0x7CD5, 0xBF7C }, { 0x7CD6, 0xBF7D }, { 0x7CD7, 0xEAC9 }, { 0x7CD9, 0xC157 },
+	{ 0x7CDC, 0xC153 }, { 0x7CDD, 0xC158 }, { 0x7CDE, 0xC154 }, { 0x7CDF, 0xC156 }, { 0x7CE0, 0xC152 }, { 0x7CE2, 0xC155 }, { 0x7CE7, 0xC2B3 }, { 0x7CE8, 0xEDCF },
+	{ 0x7CEA, 0xF2AE }, { 0x7CEC, 0xF2AD }, { 0x7CEE, 0xF4AB }, { 0x7CEF, 0xC47A }, { 0x7CF0, 0xC47B }, { 0x7CF1, 0xF741 }, { 0x7CF2, 0xF5E6 }, { 0x7CF4, 0xF740 },
+	{ 0x7CF6, 0xF8FD }, { 0x7CF7, 0xF9A4 }, { 0x7CF8, 0xA6CD }, { 0x7CFB, 0xA874 }, { 0x7CFD, 0xCDA9 }, { 0x7CFE, 0xAAC8 }, { 0x7D00, 0xACF6 }, { 0x7D01, 0xD04C },
+	{ 0x7D02, 0xACF4 }, { 0x7D03, 0xD04A }, { 0x7D04, 0xACF9 }, { 0x7D05, 0xACF5 }, { 0x7D06, 0xACFA }, { 0x7D07, 0xACF8 }, { 0x7D08, 0xD04B }, { 0x7D09, 0xACF7 },
+	{ 0x7D0A, 0xAFBF }, { 0x7D0B, 0xAFBE }, { 0x7D0C, 0xD35A }, { 0x7D0D, 0xAFC7 }, { 0x7D0E, 0xD353 }, { 0x7D0F, 0xD359 }, { 0x7D10, 0xAFC3 }, { 0x7D11, 0xD352 },
+	{ 0x7D12, 0xD358 }, { 0x7D13, 0xD356 }, { 0x7D14, 0xAFC2 }, { 0x7D15, 0xAFC4 }, { 0x7D16, 0xD355 }, { 0x7D17, 0xAFBD }, { 0x7D18, 0xD354 }, { 0x7D19, 0xAFC8 },
+	{ 0x7D1A, 0xAFC5 }, { 0x7D1B, 0xAFC9 }, { 0x7D1C, 0xAFC6 }, { 0x7D1D, 0xD351 }, { 0x7D1E, 0xD350 }, { 0x7D1F, 0xD357 }, { 0x7D20, 0xAFC0 }, { 0x7D21, 0xAFBC },
+	{ 0x7D22, 0xAFC1 }, { 0x7D28, 0xD6F0 }, { 0x7D29, 0xD6E9 }, { 0x7D2B, 0xB5B5 }, { 0x7D2C, 0xD6E8 }, { 0x7D2E, 0xB2CF }, { 0x7D2F, 0xB2D6 }, { 0x7D30, 0xB2D3 },
+	{ 0x7D31, 0xB2D9 }, { 0x7D32, 0xB2D8 }, { 0x7D33, 0xB2D4 }, { 0x7D35, 0xD6E2 }, { 0x7D36, 0xD6E5 }, { 0x7D38, 0xD6E4 }, { 0x7D39, 0xB2D0 }, { 0x7D3A, 0xD6E6 },
+	{ 0x7D3B, 0xD6EF }, { 0x7D3C, 0xB2D1 }, { 0x7D3D, 0xD6E3 }, { 0x7D3E, 0xD6EC }, { 0x7D3F, 0xD6ED }, { 0x7D40, 0xB2D2 }, { 0x7D41, 0xD6EA }, { 0x7D42, 0xB2D7 },
+	{ 0x7D43, 0xB2CD }, { 0x7D44, 0xB2D5 }, { 0x7D45, 0xD6E7 }, { 0x7D46, 0xB2CC }, { 0x7D47, 0xD6EB }, { 0x7D4A, 0xD6EE }, { 0x7D4E, 0xDAFB }, { 0x7D4F, 0xDAF2 },
+	{ 0x7D50, 0xB5B2 }, { 0x7D51, 0xDAF9 }, { 0x7D52, 0xDAF6 }, { 0x7D53, 0xDAEE }, { 0x7D54, 0xDAF7 }, { 0x7D55, 0xB5B4 }, { 0x7D56, 0xDAEF }, { 0x7D58, 0xDAEB },
+	{ 0x7D5B, 0xB86C }, { 0x7D5C, 0xDAF4 }, { 0x7D5E, 0xB5B1 }, { 0x7D5F, 0xDAFA }, { 0x7D61, 0xB5B8 }, { 0x7D62, 0xB5BA }, { 0x7D63, 0xDAED }, { 0x7D66, 0xB5B9 },
+	{ 0x7D67, 0xDAF0 }, { 0x7D68, 0xB5B3 }, { 0x7D69, 0xDAF8 }, { 0x7D6A, 0xDAF1 }, { 0x7D6B, 0xDAF5 }, { 0x7D6D, 0xDAF3 }, { 0x7D6E, 0xB5B6 }, { 0x7D6F, 0xDAEC },
+	{ 0x7D70, 0xB5BB }, { 0x7D71, 0xB2CE }, { 0x7D72, 0xB5B7 }, { 0x7D73, 0xB5BC }, { 0x7D79, 0xB868 }, { 0x7D7A, 0xDF5D }, { 0x7D7B, 0xDF5F }, { 0x7D7C, 0xDF61 },
+	{ 0x7D7D, 0xDF65 }, { 0x7D7F, 0xDF5B }, { 0x7D80, 0xDF59 }, { 0x7D81, 0xB86A }, { 0x7D83, 0xDF60 }, { 0x7D84, 0xDF64 }, { 0x7D85, 0xDF5C }, { 0x7D86, 0xDF58 },
+	{ 0x7D88, 0xDF57 }, { 0x7D8C, 0xDF62 }, { 0x7D8D, 0xDF5A }, { 0x7D8E, 0xDF5E }, { 0x7D8F, 0xB86B }, { 0x7D91, 0xB869 }, { 0x7D92, 0xDF66 }, { 0x7D93, 0xB867 },
+	{ 0x7D94, 0xDF63 }, { 0x7D96, 0xE372 }, { 0x7D9C, 0xBAEE }, { 0x7D9D, 0xE36A }, { 0x7D9E, 0xBD78 }, { 0x7D9F, 0xE374 }, { 0x7DA0, 0xBAF1 }, { 0x7DA1, 0xE378 },
+	{ 0x7DA2, 0xBAF7 }, { 0x7DA3, 0xE365 }, { 0x7DA6, 0xE375 }, { 0x7DA7, 0xE362 }, { 0x7DA9, 0xE377 }, { 0x7DAA, 0xE366 }, { 0x7DAC, 0xBAFE }, { 0x7DAD, 0xBAFB },
+	{ 0x7DAE, 0xE376 }, { 0x7DAF, 0xE370 }, { 0x7DB0, 0xBAED }, { 0x7DB1, 0xBAF5 }, { 0x7DB2, 0xBAF4 }, { 0x7DB4, 0xBAF3 }, { 0x7DB5, 0xBAF9 }, { 0x7DB7, 0xE363 },
+	{ 0x7DB8, 0xBAFA }, { 0x7DB9, 0xE371 }, { 0x7DBA, 0xBAF6 }, { 0x7DBB, 0xBAEC }, { 0x7DBC, 0xE373 }, { 0x7DBD, 0xBAEF }, { 0x7DBE, 0xBAF0 }, { 0x7DBF, 0xBAF8 },
+	{ 0x7DC0, 0xE368 }, { 0x7DC1, 0xE367 }, { 0x7DC2, 0xE364 }, { 0x7DC4, 0xE36C }, { 0x7DC5, 0xE369 }, { 0x7DC6, 0xE36D }, { 0x7DC7, 0xBAFD }, { 0x7DC9, 0xE379 },
+	{ 0x7DCA, 0xBAF2 }, { 0x7DCB, 0xE36E }, { 0x7DCC, 0xE36F }, { 0x7DCE, 0xE36B }, { 0x7DD2, 0xBAFC }, { 0x7DD7, 0xE6E7 }, { 0x7DD8, 0xBD70 }, { 0x7DD9, 0xBD79 },
+	{ 0x7DDA, 0xBD75 }, { 0x7DDB, 0xE6E4 }, { 0x7DDD, 0xBD72 }, { 0x7DDE, 0xBD76 }, { 0x7DDF, 0xE6F0 }, { 0x7DE0, 0xBD6C }, { 0x7DE1, 0xE6E8 }, { 0x7DE3, 0xBD74 },
+	{ 0x7DE6, 0xE6EB }, { 0x7DE7, 0xE6E6 }, { 0x7DE8, 0xBD73 }, { 0x7DE9, 0xBD77 }, { 0x7DEA, 0xE6E5 }, { 0x7DEC, 0xBD71 }, { 0x7DEE, 0xE6EF }, { 0x7DEF, 0xBD6E },
+	{ 0x7DF0, 0xE6EE }, { 0x7DF1, 0xE6ED }, { 0x7DF2, 0xBD7A }, { 0x7DF3, 0xE572 }, { 0x7DF4, 0xBD6D }, { 0x7DF6, 0xE6EC }, { 0x7DF7, 0xE6E3 }, { 0x7DF9, 0xBD7B },
+	{ 0x7DFA, 0xE6EA }, { 0x7DFB, 0xBD6F }, { 0x7E03, 0xE6E9 }, { 0x7E08, 0xBFA2 }, { 0x7E09, 0xBFA7 }, { 0x7E0A, 0xBF7E }, { 0x7E0B, 0xEAD8 }, { 0x7E0C, 0xEACF },
+	{ 0x7E0D, 0xEADB }, { 0x7E0E, 0xEAD3 }, { 0x7E0F, 0xEAD9 }, { 0x7E10, 0xBFA8 }, { 0x7E11, 0xBFA1 }, { 0x7E12, 0xEACC }, { 0x7E13, 0xEAD2 }, { 0x7E14, 0xEADC },
+	{ 0x7E15, 0xEAD5 }, { 0x7E16, 0xEADA }, { 0x7E17, 0xEACE }, { 0x7E1A, 0xEAD6 }, { 0x7E1B, 0xBFA3 }, { 0x7E1C, 0xEAD4 }, { 0x7E1D, 0xBFA6 }, { 0x7E1E, 0xBFA5 },
+	{ 0x7E1F, 0xEAD0 }, { 0x7E20, 0xEAD1 }, { 0x7E21, 0xEACD }, { 0x7E22, 0xEAD7 }, { 0x7E23, 0xBFA4 }, { 0x7E24, 0xEADE }, { 0x7E25, 0xEADD }, { 0x7E29, 0xEDDA },
+	{ 0x7E2A, 0xEDD6 }, { 0x7E2B, 0xC15F }, { 0x7E2D, 0xEDD0 }, { 0x7E2E, 0xC159 }, { 0x7E2F, 0xC169 }, { 0x7E30, 0xEDDC }, { 0x7E31, 0xC161 }, { 0x7E32, 0xC15D },
+	{ 0x7E33, 0xEDD3 }, { 0x7E34, 0xC164 }, { 0x7E35, 0xC167 }, { 0x7E36, 0xEDDE }, { 0x7E37, 0xC15C }, { 0x7E38, 0xEDD5 }, { 0x7E39, 0xC165 }, { 0x7E3A, 0xEDE0 },
+	{ 0x7E3B, 0xEDDD }, { 0x7E3C, 0xEDD1 }, { 0x7E3D, 0xC160 }, { 0x7E3E, 0xC15A }, { 0x7E3F, 0xC168 }, { 0x7E40, 0xEDD8 }, { 0x7E41, 0xC163 }, { 0x7E42, 0xEDD2 },
+	{ 0x7E43, 0xC15E }, { 0x7E44, 0xEDDF }, { 0x7E45, 0xC162 }, { 0x7E46, 0xC15B }, { 0x7E47, 0xEDD9 }, { 0x7E48, 0xC166 }, { 0x7E49, 0xEDD7 }, { 0x7E4C, 0xEDDB },
+	{ 0x7E50, 0xF06E }, { 0x7E51, 0xF074 }, { 0x7E52, 0xC2B9 }, { 0x7E53, 0xF077 }, { 0x7E54, 0xC2B4 }, { 0x7E55, 0xC2B5 }, { 0x7E56, 0xF06F }, { 0x7E57, 0xF076 },
+	{ 0x7E58, 0xF071 }, { 0x7E59, 0xC2BA }, { 0x7E5A, 0xC2B7 }, { 0x7E5C, 0xF06D }, { 0x7E5E, 0xC2B6 }, { 0x7E5F, 0xF073 }, { 0x7E60, 0xF075 }, { 0x7E61, 0xC2B8 },
+	{ 0x7E62, 0xF072 }, { 0x7E63, 0xF070 }, { 0x7E68, 0xF2B8 }, { 0x7E69, 0xC3B7 }, { 0x7E6A, 0xC3B8 }, { 0x7E6B, 0xC3B4 }, { 0x7E6D, 0xC3B5 }, { 0x7E6F, 0xF2B4 },
+	{ 0x7E70, 0xF2B2 }, { 0x7E72, 0xF2B6 }, { 0x7E73, 0xC3BA }, { 0x7E74, 0xF2B7 }, { 0x7E75, 0xF2B0 }, { 0x7E76, 0xF2AF }, { 0x7E77, 0xF2B3 }, { 0x7E78, 0xF2B1 },
+	{ 0x7E79, 0xC3B6 }, { 0x7E7A, 0xF2B5 }, { 0x7E7B, 0xF4AC }, { 0x7E7C, 0xC47E }, { 0x7E7D, 0xC47D }, { 0x7E7E, 0xF4AD }, { 0x7E80, 0xF4AF }, { 0x7E81, 0xF4AE },
+	{ 0x7E82, 0xC4A1 }, { 0x7E86, 0xF5EB }, { 0x7E87, 0xF5E8 }, { 0x7E88, 0xF5E9 }, { 0x7E8A, 0xF5E7 }, { 0x7E8B, 0xF5EA }, { 0x7E8C, 0xC4F2 }, { 0x7E8D, 0xF5EC },
+	{ 0x7E8F, 0xC4F1 }, { 0x7E91, 0xF742 }, { 0x7E93, 0xC5D5 }, { 0x7E94, 0xC5D7 }, { 0x7E95, 0xF7EE }, { 0x7E96, 0xC5D6 }, { 0x7E97, 0xF8B9 }, { 0x7E98, 0xF940 },
+	{ 0x7E99, 0xF942 }, { 0x7E9A, 0xF8FE }, { 0x7E9B, 0xF941 }, { 0x7E9C, 0xC66C }, { 0x7F36, 0xA6CE }, { 0x7F38, 0xACFB }, { 0x7F39, 0xD26F }, { 0x7F3A, 0xAFCA },
+	{ 0x7F3D, 0xB2DA }, { 0x7F3E, 0xDAFC }, { 0x7F3F, 0xDAFD }, { 0x7F43, 0xEADF }, { 0x7F44, 0xC16A }, { 0x7F45, 0xEDE1 }, { 0x7F48, 0xC2BB }, { 0x7F4A, 0xF2BA },
+	{ 0x7F4B, 0xF2B9 }, { 0x7F4C, 0xC4A2 }, { 0x7F4D, 0xF5ED }, { 0x7F4F, 0xF743 }, { 0x7F50, 0xC5F8 }, { 0x7F51, 0xCA49 }, { 0x7F54, 0xAAC9 }, { 0x7F55, 0xA875 },
+	{ 0x7F58, 0xD04D }, { 0x7F5B, 0xD360 }, { 0x7F5C, 0xD35B }, { 0x7F5D, 0xD35F }, { 0x7F5E, 0xD35D }, { 0x7F5F, 0xAFCB }, { 0x7F60, 0xD35E }, { 0x7F61, 0xD35C },
+	{ 0x7F63, 0xD6F1 }, { 0x7F65, 0xDAFE }, { 0x7F66, 0xDB40 }, { 0x7F67, 0xDF69 }, { 0x7F68, 0xDF6A }, { 0x7F69, 0xB86E }, { 0x7F6A, 0xB86F }, { 0x7F6B, 0xDF68 },
+	{ 0x7F6C, 0xDF6B }, { 0x7F6D, 0xDF67 }, { 0x7F6E, 0xB86D }, { 0x7F70, 0xBB40 }, { 0x7F72, 0xB870 }, { 0x7F73, 0xE37A }, { 0x7F75, 0xBD7C }, { 0x7F76, 0xE6F1 },
+	{ 0x7F77, 0xBD7D }, { 0x7F79, 0xBFA9 }, { 0x7F7A, 0xEAE2 }, { 0x7F7B, 0xEAE0 }, { 0x7F7C, 0xEAE1 }, { 0x7F7D, 0xEDE4 }, { 0x7F7E, 0xEDE3 }, { 0x7F7F, 0xEDE2 },
+	{ 0x7F83, 0xF2BB }, { 0x7F85, 0xC3B9 }, { 0x7F86, 0xF2BC }, { 0x7F87, 0xF744 }, { 0x7F88, 0xC5F9 }, { 0x7F89, 0xF8BA }, { 0x7F8A, 0xA6CF }, { 0x7F8B, 0xAACB },
+	{ 0x7F8C, 0xAACA }, { 0x7F8D, 0xD04F }, { 0x7F8E, 0xACFC }, { 0x7F91, 0xD04E }, { 0x7F92, 0xD362 }, { 0x7F94, 0xAFCC }, { 0x7F95, 0xD6F2 }, { 0x7F96, 0xD361 },
+	{ 0x7F9A, 0xB2DC }, { 0x7F9B, 0xD6F5 }, { 0x7F9C, 0xD6F3 }, { 0x7F9D, 0xD6F4 }, { 0x7F9E, 0xB2DB }, { 0x7FA0, 0xDB42 }, { 0x7FA1, 0xDB43 }, { 0x7FA2, 0xDB41 },
+	{ 0x7FA4, 0xB873 }, { 0x7FA5, 0xDF6D }, { 0x7FA6, 0xDF6C }, { 0x7FA7, 0xDF6E }, { 0x7FA8, 0xB872 }, { 0x7FA9, 0xB871 }, { 0x7FAC, 0xE6F2 }, { 0x7FAD, 0xE6F4 },
+	{ 0x7FAF, 0xBD7E }, { 0x7FB0, 0xE6F3 }, { 0x7FB1, 0xEAE3 }, { 0x7FB2, 0xBFAA }, { 0x7FB3, 0xF079 }, { 0x7FB5, 0xF078 }, { 0x7FB6, 0xC3BB }, { 0x7FB7, 0xF2BD },
+	{ 0x7FB8, 0xC3BD }, { 0x7FB9, 0xC3BC }, { 0x7FBA, 0xF4B0 }, { 0x7FBB, 0xF5EE }, { 0x7FBC, 0xC4F3 }, { 0x7FBD, 0xA6D0 }, { 0x7FBE, 0xD050 }, { 0x7FBF, 0xACFD },
+	{ 0x7FC0, 0xD365 }, { 0x7FC1, 0xAFCE }, { 0x7FC2, 0xD364 }, { 0x7FC3, 0xD363 }, { 0x7FC5, 0xAFCD }, { 0x7FC7, 0xD6FB }, { 0x7FC9, 0xD6FD }, { 0x7FCA, 0xD6F6 },
+	{ 0x7FCB, 0xD6F7 }, { 0x7FCC, 0xB2DD }, { 0x7FCD, 0xD6F8 }, { 0x7FCE, 0xB2DE }, { 0x7FCF, 0xD6FC }, { 0x7FD0, 0xD6F9 }, { 0x7FD1, 0xD6FA }, { 0x7FD2, 0xB2DF },
+	{ 0x7FD4, 0xB5BE }, { 0x7FD5, 0xB5BF }, { 0x7FD7, 0xDB44 }, { 0x7FDB, 0xDF6F }, { 0x7FDC, 0xDF70 }, { 0x7FDE, 0xE37E }, { 0x7FDF, 0xBB43 }, { 0x7FE0, 0xBB41 },
+	{ 0x7FE1, 0xBB42 }, { 0x7FE2, 0xE37B }, { 0x7FE3, 0xE37C }, { 0x7FE5, 0xE37D }, { 0x7FE6, 0xE6F9 }, { 0x7FE8, 0xE6FA }, { 0x7FE9, 0xBDA1 }, { 0x7FEA, 0xE6F7 },
+	{ 0x7FEB, 0xE6F6 }, { 0x7FEC, 0xE6F8 }, { 0x7FED, 0xE6F5 }, { 0x7FEE, 0xBFAD }, { 0x7FEF, 0xEAE4 }, { 0x7FF0, 0xBFAB }, { 0x7FF1, 0xBFAC }, { 0x7FF2, 0xEDE6 },
+	{ 0x7FF3, 0xC16B }, { 0x7FF4, 0xEDE5 }, { 0x7FF5, 0xEFA8 }, { 0x7FF7, 0xF07A }, { 0x7FF8, 0xF07B }, { 0x7FF9, 0xC2BC }, { 0x7FFB, 0xC2BD }, { 0x7FFC, 0xC16C },
+	{ 0x7FFD, 0xF2BE }, { 0x7FFE, 0xF2BF }, { 0x7FFF, 0xF4B1 }, { 0x8000, 0xC4A3 }, { 0x8001, 0xA6D1 }, { 0x8003, 0xA6D2 }, { 0x8004, 0xACFE }, { 0x8005, 0xAACC },
+	{ 0x8006, 0xAFCF }, { 0x8007, 0xD051 }, { 0x800B, 0xB5C0 }, { 0x800C, 0xA6D3 }, { 0x800D, 0xAD41 }, { 0x800E, 0xD052 }, { 0x800F, 0xD053 }, { 0x8010, 0xAD40 },
+	{ 0x8011, 0xAD42 }, { 0x8012, 0xA6D4 }, { 0x8014, 0xD054 }, { 0x8015, 0xAFD1 }, { 0x8016, 0xD366 }, { 0x8017, 0xAFD3 }, { 0x8018, 0xAFD0 }, { 0x8019, 0xAFD2 },
+	{ 0x801B, 0xD741 }, { 0x801C, 0xB2E0 }, { 0x801E, 0xD740 }, { 0x801F, 0xD6FE }, { 0x8021, 0xDF71 }, { 0x8024, 0xE3A1 }, { 0x8026, 0xBDA2 }, { 0x8028, 0xBFAE },
+	{ 0x8029, 0xEAE6 }, { 0x802A, 0xEAE5 }, { 0x802C, 0xEDE7 }, { 0x8030, 0xF5EF }, { 0x8033, 0xA6D5 }, { 0x8034, 0xCB73 }, { 0x8035, 0xCDAA }, { 0x8036, 0xAD43 },
+	{ 0x8037, 0xD055 }, { 0x8039, 0xD368 }, { 0x803D, 0xAFD4 }, { 0x803E, 0xD367 }, { 0x803F, 0xAFD5 }, { 0x8043, 0xD743 }, { 0x8046, 0xB2E2 }, { 0x8047, 0xD742 },
+	{ 0x8048, 0xD744 }, { 0x804A, 0xB2E1 }, { 0x804F, 0xDB46 }, { 0x8050, 0xDB47 }, { 0x8051, 0xDB45 }, { 0x8052, 0xB5C1 }, { 0x8056, 0xB874 }, { 0x8058, 0xB875 },
+	{ 0x805A, 0xBB45 }, { 0x805C, 0xE3A3 }, { 0x805D, 0xE3A2 }, { 0x805E, 0xBB44 }, { 0x8064, 0xE6FB }, { 0x8067, 0xE6FC }, { 0x806C, 0xEAE7 }, { 0x806F, 0xC170 },
+	{ 0x8070, 0xC16F }, { 0x8071, 0xC16D }, { 0x8072, 0xC16E }, { 0x8073, 0xC171 }, { 0x8075, 0xF07C }, { 0x8076, 0xC2BF }, { 0x8077, 0xC2BE }, { 0x8078, 0xF2C0 },
+	{ 0x8079, 0xF4B2 }, { 0x807D, 0xC5A5 }, { 0x807E, 0xC5A4 }, { 0x807F, 0xA6D6 }, { 0x8082, 0xD1FB }, { 0x8084, 0xB877 }, { 0x8085, 0xB5C2 }, { 0x8086, 0xB876 },
+	{ 0x8087, 0xBB46 }, { 0x8089, 0xA6D7 }, { 0x808A, 0xC9A9 }, { 0x808B, 0xA6D8 }, { 0x808C, 0xA6D9 }, { 0x808F, 0xCDAB }, { 0x8090, 0xCB76 }, { 0x8092, 0xCB77 },
+	{ 0x8093, 0xA877 }, { 0x8095, 0xCB74 }, { 0x8096, 0xA876 }, { 0x8098, 0xA879 }, { 0x8099, 0xCB75 }, { 0x809A, 0xA87B }, { 0x809B, 0xA87A }, { 0x809C, 0xCB78 },
+	{ 0x809D, 0xA878 }, { 0x80A1, 0xAAD1 }, { 0x80A2, 0xAACF }, { 0x80A3, 0xCDAD }, { 0x80A5, 0xAACE }, { 0x80A9, 0xAAD3 }, { 0x80AA, 0xAAD5 }, { 0x80AB, 0xAAD2 },
+	{ 0x80AD, 0xCDB0 }, { 0x80AE, 0xCDAC }, { 0x80AF, 0xAAD6 }, { 0x80B1, 0xAAD0 }, { 0x80B2, 0xA87C }, { 0x80B4, 0xAAD4 }, { 0x80B5, 0xCDAF }, { 0x80B8, 0xCDAE },
+	{ 0x80BA, 0xAACD }, { 0x80C2, 0xD05B }, { 0x80C3, 0xAD47 }, { 0x80C4, 0xAD48 }, { 0x80C5, 0xD05D }, { 0x80C7, 0xD057 }, { 0x80C8, 0xD05A }, { 0x80C9, 0xD063 },
+	{ 0x80CA, 0xD061 }, { 0x80CC, 0xAD49 }, { 0x80CD, 0xD067 }, { 0x80CE, 0xAD4C }, { 0x80CF, 0xD064 }, { 0x80D0, 0xD05C }, { 0x80D1, 0xD059 }, { 0x80D4, 0xDB49 },
+	{ 0x80D5, 0xD062 }, { 0x80D6, 0xAD44 }, { 0x80D7, 0xD065 }, { 0x80D8, 0xD056 }, { 0x80D9, 0xD05F }, { 0x80DA, 0xAD46 }, { 0x80DB, 0xAD4B }, { 0x80DC, 0xD060 },
+	{ 0x80DD, 0xAD4F }, { 0x80DE, 0xAD4D }, { 0x80E0, 0xD058 }, { 0x80E1, 0xAD4A }, { 0x80E3, 0xD05E }, { 0x80E4, 0xAD4E }, { 0x80E5, 0xAD45 }, { 0x80E6, 0xD066 },
+	{ 0x80ED, 0xAFDA }, { 0x80EF, 0xAFE3 }, { 0x80F0, 0xAFD8 }, { 0x80F1, 0xAFD6 }, { 0x80F2, 0xD36A }, { 0x80F3, 0xAFDE }, { 0x80F4, 0xAFDB }, { 0x80F5, 0xD36C },
+	{ 0x80F8, 0xAFDD }, { 0x80F9, 0xD36B }, { 0x80FA, 0xD369 }, { 0x80FB, 0xD36E }, { 0x80FC, 0xAFE2 }, { 0x80FD, 0xAFE0 }, { 0x80FE, 0xDB48 }, { 0x8100, 0xD36F },
+	{ 0x8101, 0xD36D }, { 0x8102, 0xAFD7 }, { 0x8105, 0xAFD9 }, { 0x8106, 0xAFDC }, { 0x8108, 0xAFDF }, { 0x810A, 0xAFE1 }, { 0x8115, 0xD74E }, { 0x8116, 0xB2E4 },
+	{ 0x8118, 0xD745 }, { 0x8119, 0xD747 }, { 0x811B, 0xD748 }, { 0x811D, 0xD750 }, { 0x811E, 0xD74C }, { 0x811F, 0xD74A }, { 0x8121, 0xD74D }, { 0x8122, 0xD751 },
+	{ 0x8123, 0xB2E5 }, { 0x8124, 0xB2E9 }, { 0x8125, 0xD746 }, { 0x8127, 0xD74F }, { 0x8129, 0xB2E7 }, { 0x812B, 0xB2E6 }, { 0x812C, 0xD74B }, { 0x812D, 0xD749 },
+	{ 0x812F, 0xB2E3 }, { 0x8130, 0xB2E8 }, { 0x8139, 0xB5C8 }, { 0x813A, 0xDB51 }, { 0x813D, 0xDB4F }, { 0x813E, 0xB5CA }, { 0x8143, 0xDB4A }, { 0x8144, 0xDFA1 },
+	{ 0x8146, 0xB5C9 }, { 0x8147, 0xDB4E }, { 0x814A, 0xDB4B }, { 0x814B, 0xB5C5 }, { 0x814C, 0xB5CB }, { 0x814D, 0xDB50 }, { 0x814E, 0xB5C7 }, { 0x814F, 0xDB4D },
+	{ 0x8150, 0xBB47 }, { 0x8151, 0xB5C6 }, { 0x8152, 0xDB4C }, { 0x8153, 0xB5CC }, { 0x8154, 0xB5C4 }, { 0x8155, 0xB5C3 }, { 0x815B, 0xDF77 }, { 0x815C, 0xDF75 },
+	{ 0x815E, 0xDF7B }, { 0x8160, 0xDF73 }, { 0x8161, 0xDFA2 }, { 0x8162, 0xDF78 }, { 0x8164, 0xDF72 }, { 0x8165, 0xB87B }, { 0x8166, 0xB8A3 }, { 0x8167, 0xDF7D },
+	{ 0x8169, 0xDF76 }, { 0x816B, 0xB87E }, { 0x816E, 0xB87C }, { 0x816F, 0xDF7E }, { 0x8170, 0xB879 }, { 0x8171, 0xB878 }, { 0x8172, 0xDF79 }, { 0x8173, 0xB87D },
+	{ 0x8174, 0xB5CD }, { 0x8176, 0xDF7C }, { 0x8177, 0xDF74 }, { 0x8178, 0xB87A }, { 0x8179, 0xB8A1 }, { 0x817A, 0xB8A2 }, { 0x817F, 0xBB4C }, { 0x8180, 0xBB48 },
+	{ 0x8182, 0xBB4D }, { 0x8183, 0xE3A6 }, { 0x8186, 0xE3A5 }, { 0x8187, 0xE3A7 }, { 0x8188, 0xBB4A }, { 0x8189, 0xE3A4 }, { 0x818A, 0xBB4B }, { 0x818B, 0xE3AA },
+	{ 0x818C, 0xE3A9 }, { 0x818D, 0xE3A8 }, { 0x818F, 0xBB49 }, { 0x8195, 0xE741 }, { 0x8197, 0xE744 }, { 0x8198, 0xBDA8 }, { 0x8199, 0xE743 }, { 0x819A, 0xBDA7 },
+	{ 0x819B, 0xBDA3 }, { 0x819C, 0xBDA4 }, { 0x819D, 0xBDA5 }, { 0x819E, 0xE740 }, { 0x819F, 0xE6FE }, { 0x81A0, 0xBDA6 }, { 0x81A2, 0xE742 }, { 0x81A3, 0xE6FD },
+	{ 0x81A6, 0xEAE9 }, { 0x81A7, 0xEAF3 }, { 0x81A8, 0xBFB1 }, { 0x81A9, 0xBFB0 }, { 0x81AB, 0xEAED }, { 0x81AC, 0xEAEF }, { 0x81AE, 0xEAEA }, { 0x81B0, 0xEAEE },
+	{ 0x81B1, 0xEAE8 }, { 0x81B2, 0xEAF1 }, { 0x81B3, 0xBFAF }, { 0x81B4, 0xEAF0 }, { 0x81B5, 0xEAEC }, { 0x81B7, 0xEAF2 }, { 0x81B9, 0xEAEB }, { 0x81BA, 0xC174 },
+	{ 0x81BB, 0xEDE8 }, { 0x81BC, 0xEDEE }, { 0x81BD, 0xC178 }, { 0x81BE, 0xC17A }, { 0x81BF, 0xC177 }, { 0x81C0, 0xC176 }, { 0x81C2, 0xC175 }, { 0x81C3, 0xC173 },
+	{ 0x81C4, 0xEDE9 }, { 0x81C5, 0xEDEC }, { 0x81C6, 0xC172 }, { 0x81C7, 0xEDED }, { 0x81C9, 0xC179 }, { 0x81CA, 0xEDEB }, { 0x81CC, 0xEDEA }, { 0x81CD, 0xC2C0 },
+	{ 0x81CF, 0xC2C1 }, { 0x81D0, 0xF0A1 }, { 0x81D1, 0xF07D }, { 0x81D2, 0xF07E }, { 0x81D5, 0xF2C2 }, { 0x81D7, 0xF2C1 }, { 0x81D8, 0xC3BE }, { 0x81D9, 0xF4B4 },
+	{ 0x81DA, 0xC4A4 }, { 0x81DB, 0xF4B3 }, { 0x81DD, 0xF5F0 }, { 0x81DE, 0xF745 }, { 0x81DF, 0xC5A6 }, { 0x81E0, 0xF943 }, { 0x81E1, 0xF944 }, { 0x81E2, 0xC5D8 },
+	{ 0x81E3, 0xA6DA }, { 0x81E5, 0xAAD7 }, { 0x81E6, 0xDB52 }, { 0x81E7, 0xBB4E }, { 0x81E8, 0xC17B }, { 0x81E9, 0xEDEF }, { 0x81EA, 0xA6DB }, { 0x81EC, 0xAFE5 },
+	{ 0x81ED, 0xAFE4 }, { 0x81EE, 0xDB53 }, { 0x81F2, 0xEAF4 }, { 0x81F3, 0xA6DC }, { 0x81F4, 0xAD50 }, { 0x81F7, 0xDB54 }, { 0x81F8, 0xDB55 }, { 0x81F9, 0xDB56 },
+	{ 0x81FA, 0xBB4F }, { 0x81FB, 0xBFB2 }, { 0x81FC, 0xA6DD }, { 0x81FE, 0xAAD8 }, { 0x81FF, 0xD068 }, { 0x8200, 0xAFE6 }, { 0x8201, 0xD370 }, { 0x8202, 0xB2EA },
+	{ 0x8204, 0xDB57 }, { 0x8205, 0xB8A4 }, { 0x8207, 0xBB50 }, { 0x8208, 0xBFB3 }, { 0x8209, 0xC17C }, { 0x820A, 0xC2C2 }, { 0x820B, 0xF4B5 }, { 0x820C, 0xA6DE },
+	{ 0x820D, 0xAAD9 }, { 0x8210, 0xAFE7 }, { 0x8211, 0xD752 }, { 0x8212, 0xB5CE }, { 0x8214, 0xBB51 }, { 0x8215, 0xE3AB }, { 0x8216, 0xE745 }, { 0x821B, 0xA6DF },
+	{ 0x821C, 0xB5CF }, { 0x821D, 0xDFA3 }, { 0x821E, 0xBB52 }, { 0x821F, 0xA6E0 }, { 0x8220, 0xCDB1 }, { 0x8221, 0xD069 }, { 0x8222, 0xAD51 }, { 0x8225, 0xD372 },
+	{ 0x8228, 0xAFEA }, { 0x822A, 0xAFE8 }, { 0x822B, 0xAFE9 }, { 0x822C, 0xAFEB }, { 0x822F, 0xD371 }, { 0x8232, 0xD757 }, { 0x8233, 0xD754 }, { 0x8234, 0xD756 },
+	{ 0x8235, 0xB2EB }, { 0x8236, 0xB2ED }, { 0x8237, 0xB2EC }, { 0x8238, 0xD753 }, { 0x8239, 0xB2EE }, { 0x823A, 0xD755 }, { 0x823C, 0xDB58 }, { 0x823D, 0xDB59 },
+	{ 0x823F, 0xDB5A }, { 0x8240, 0xDFA6 }, { 0x8242, 0xDFA7 }, { 0x8244, 0xDFA5 }, { 0x8245, 0xDFA8 }, { 0x8247, 0xB8A5 }, { 0x8249, 0xDFA4 }, { 0x824B, 0xBB53 },
+	{ 0x824E, 0xE74A }, { 0x824F, 0xE746 }, { 0x8250, 0xE749 }, { 0x8251, 0xE74B }, { 0x8252, 0xE748 }, { 0x8253, 0xE747 }, { 0x8255, 0xEAF5 }, { 0x8256, 0xEAF6 },
+	{ 0x8257, 0xEAF7 }, { 0x8258, 0xBFB4 }, { 0x8259, 0xBFB5 }, { 0x825A, 0xEDF1 }, { 0x825B, 0xEDF0 }, { 0x825C, 0xEDF2 }, { 0x825E, 0xF0A3 }, { 0x825F, 0xF0A2 },
+	{ 0x8261, 0xF2C4 }, { 0x8263, 0xF2C5 }, { 0x8264, 0xF2C3 }, { 0x8266, 0xC4A5 }, { 0x8268, 0xF4B6 }, { 0x8269, 0xF4B7 }, { 0x826B, 0xF746 }, { 0x826C, 0xF7EF },
+	{ 0x826D, 0xF8BB }, { 0x826E, 0xA6E1 }, { 0x826F, 0xA87D }, { 0x8271, 0xC17D }, { 0x8272, 0xA6E2 }, { 0x8274, 0xD758 }, { 0x8275, 0xDB5B }, { 0x8277, 0xC641 },
+	{ 0x8278, 0xCA4A }, { 0x827C, 0xCA4B }, { 0x827D, 0xCA4D }, { 0x827E, 0xA6E3 }, { 0x827F, 0xCA4E }, { 0x8280, 0xCA4C }, { 0x8283, 0xCBA2 }, { 0x8284, 0xCBA3 },
+	{ 0x8285, 0xCB7B }, { 0x828A, 0xCBA1 }, { 0x828B, 0xA8A1 }, { 0x828D, 0xA8A2 }, { 0x828E, 0xCB7C }, { 0x828F, 0xCB7A }, { 0x8290, 0xCB79 }, { 0x8291, 0xCB7D },
+	{ 0x8292, 0xA87E }, { 0x8293, 0xCB7E }, { 0x8294, 0xD06A }, { 0x8298, 0xCDB6 }, { 0x8299, 0xAADC }, { 0x829A, 0xCDB5 }, { 0x829B, 0xCDB7 }, { 0x829D, 0xAADB },
+	{ 0x829E, 0xCDBC }, { 0x829F, 0xAADF }, { 0x82A0, 0xCDB2 }, { 0x82A1, 0xCDC0 }, { 0x82A2, 0xCDC6 }, { 0x82A3, 0xAAE6 }, { 0x82A4, 0xCDC3 }, { 0x82A5, 0xAAE3 },
+	{ 0x82A7, 0xCDB9 }, { 0x82A8, 0xCDBF }, { 0x82A9, 0xCDC1 }, { 0x82AB, 0xCDB4 }, { 0x82AC, 0xAAE2 }, { 0x82AD, 0xAADD }, { 0x82AE, 0xCDBA }, { 0x82AF, 0xAAE4 },
+	{ 0x82B0, 0xAAE7 }, { 0x82B1, 0xAAE1 }, { 0x82B3, 0xAADA }, { 0x82B4, 0xCDBE }, { 0x82B5, 0xCDB8 }, { 0x82B6, 0xCDC5 }, { 0x82B7, 0xAAE9 }, { 0x82B8, 0xAAE5 },
+	{ 0x82B9, 0xAAE0 }, { 0x82BA, 0xCDBD }, { 0x82BB, 0xAFEC }, { 0x82BC, 0xCDBB }, { 0x82BD, 0xAADE }, { 0x82BE, 0xAAE8 }, { 0x82C0, 0xCDB3 }, { 0x82C2, 0xCDC2 },
+	{ 0x82C3, 0xCDC4 }, { 0x82D1, 0xAD62 }, { 0x82D2, 0xAD5C }, { 0x82D3, 0xAD64 }, { 0x82D4, 0xAD61 }, { 0x82D5, 0xD071 }, { 0x82D6, 0xD074 }, { 0x82D7, 0xAD5D },
+	{ 0x82D9, 0xD06B }, { 0x82DB, 0xAD56 }, { 0x82DC, 0xAD60 }, { 0x82DE, 0xAD63 }, { 0x82DF, 0xAD65 }, { 0x82E0, 0xD0A2 }, { 0x82E1, 0xD077 }, { 0x82E3, 0xAD55 },
+	{ 0x82E4, 0xD0A1 }, { 0x82E5, 0xAD59 }, { 0x82E6, 0xAD57 }, { 0x82E7, 0xAD52 }, { 0x82E8, 0xD06F }, { 0x82EA, 0xD07E }, { 0x82EB, 0xD073 }, { 0x82EC, 0xD076 },
+	{ 0x82ED, 0xD0A5 }, { 0x82EF, 0xAD66 }, { 0x82F0, 0xD07D }, { 0x82F1, 0xAD5E }, { 0x82F2, 0xD078 }, { 0x82F3, 0xD0A4 }, { 0x82F4, 0xD075 }, { 0x82F5, 0xD079 },
+	{ 0x82F6, 0xD07C }, { 0x82F9, 0xD06D }, { 0x82FA, 0xD0A3 }, { 0x82FB, 0xD07B }, { 0x82FE, 0xD06C }, { 0x8300, 0xD070 }, { 0x8301, 0xAD5F }, { 0x8302, 0xAD5A },
+	{ 0x8303, 0xAD53 }, { 0x8304, 0xAD58 }, { 0x8305, 0xAD54 }, { 0x8306, 0xAD67 }, { 0x8307, 0xD06E }, { 0x8308, 0xD3A5 }, { 0x8309, 0xAD5B }, { 0x830C, 0xD07A },
+	{ 0x830D, 0xCE41 }, { 0x8316, 0xD3A8 }, { 0x8317, 0xAFFA }, { 0x8319, 0xD376 }, { 0x831B, 0xD3A3 }, { 0x831C, 0xD37D }, { 0x831E, 0xD3B2 }, { 0x8320, 0xD3AA },
+	{ 0x8322, 0xD37E }, { 0x8324, 0xD3A9 }, { 0x8325, 0xD378 }, { 0x8326, 0xD37C }, { 0x8327, 0xD3B5 }, { 0x8328, 0xAFFD }, { 0x8329, 0xD3AD }, { 0x832A, 0xD3A4 },
+	{ 0x832B, 0xAFED }, { 0x832C, 0xD3B3 }, { 0x832D, 0xD374 }, { 0x832F, 0xD3AC }, { 0x8331, 0xAFFC }, { 0x8332, 0xAFF7 }, { 0x8333, 0xD373 }, { 0x8334, 0xAFF5 },
+	{ 0x8335, 0xAFF4 }, { 0x8336, 0xAFF9 }, { 0x8337, 0xD3AB }, { 0x8338, 0xAFF1 }, { 0x8339, 0xAFF8 }, { 0x833A, 0xD072 }, { 0x833B, 0xDB5C }, { 0x833C, 0xD3A6 },
+	{ 0x833F, 0xD37A }, { 0x8340, 0xAFFB }, { 0x8341, 0xD37B }, { 0x8342, 0xD3A1 }, { 0x8343, 0xAFFE }, { 0x8344, 0xD375 }, { 0x8345, 0xD3AF }, { 0x8347, 0xD3AE },
+	{ 0x8348, 0xD3B6 }, { 0x8349, 0xAFF3 }, { 0x834A, 0xAFF0 }, { 0x834B, 0xD3B4 }, { 0x834C, 0xD3B0 }, { 0x834D, 0xD3A7 }, { 0x834E, 0xD3A2 }, { 0x834F, 0xAFF6 },
+	{ 0x8350, 0xAFF2 }, { 0x8351, 0xD377 }, { 0x8352, 0xAFEE }, { 0x8353, 0xD3B1 }, { 0x8354, 0xAFEF }, { 0x8356, 0xD379 }, { 0x8373, 0xD75E }, { 0x8374, 0xD760 },
+	{ 0x8375, 0xD765 }, { 0x8376, 0xD779 }, { 0x8377, 0xB2FC }, { 0x8378, 0xB2F2 }, { 0x837A, 0xD75D }, { 0x837B, 0xB2FD }, { 0x837C, 0xB2FE }, { 0x837D, 0xD768 },
+	{ 0x837E, 0xD76F }, { 0x837F, 0xD775 }, { 0x8381, 0xD762 }, { 0x8383, 0xD769 }, { 0x8386, 0xB340 }, { 0x8387, 0xD777 }, { 0x8388, 0xD772 }, { 0x8389, 0xB2FA },
+	{ 0x838A, 0xB2F8 }, { 0x838B, 0xD76E }, { 0x838C, 0xD76A }, { 0x838D, 0xD75C }, { 0x838E, 0xB2EF }, { 0x838F, 0xD761 }, { 0x8390, 0xD759 }, { 0x8392, 0xB2F7 },
+	{ 0x8393, 0xB2F9 }, { 0x8394, 0xD766 }, { 0x8395, 0xD763 }, { 0x8396, 0xB2F4 }, { 0x8397, 0xD773 }, { 0x8398, 0xB2F1 }, { 0x8399, 0xD764 }, { 0x839A, 0xD77A },
+	{ 0x839B, 0xD76C }, { 0x839D, 0xD76B }, { 0x839E, 0xB2F0 }, { 0x83A0, 0xB2FB }, { 0x83A2, 0xB2F3 }, { 0x83A3, 0xD75A }, { 0x83A4, 0xD75F }, { 0x83A5, 0xD770 },
+	{ 0x83A6, 0xD776 }, { 0x83A7, 0xB341 }, { 0x83A8, 0xD75B }, { 0x83A9, 0xD767 }, { 0x83AA, 0xD76D }, { 0x83AB, 0xB2F6 }, { 0x83AE, 0xD778 }, { 0x83AF, 0xD771 },
+	{ 0x83B0, 0xD774 }, { 0x83BD, 0xB2F5 }, { 0x83BF, 0xDB6C }, { 0x83C0, 0xDB60 }, { 0x83C1, 0xB5D7 }, { 0x83C2, 0xDB7D }, { 0x83C3, 0xDBA7 }, { 0x83C4, 0xDBAA },
+	{ 0x83C5, 0xB5D5 }, { 0x83C6, 0xDB68 }, { 0x83C7, 0xDBA3 }, { 0x83C8, 0xDB69 }, { 0x83C9, 0xDB77 }, { 0x83CA, 0xB5E2 }, { 0x83CB, 0xDB73 }, { 0x83CC, 0xB5DF },
+	{ 0x83CE, 0xDB74 }, { 0x83CF, 0xDB5D }, { 0x83D1, 0xDBA4 }, { 0x83D4, 0xB5E8 }, { 0x83D5, 0xDBA1 }, { 0x83D6, 0xDB75 }, { 0x83D7, 0xDBAC }, { 0x83D8, 0xDB70 },
+	{ 0x83D9, 0xDFC8 }, { 0x83DB, 0xDBAF }, { 0x83DC, 0xB5E6 }, { 0x83DD, 0xDB6E }, { 0x83DE, 0xDB7A }, { 0x83DF, 0xB5E9 }, { 0x83E0, 0xB5D4 }, { 0x83E1, 0xDB72 },
+	{ 0x83E2, 0xDBAD }, { 0x83E3, 0xDB6B }, { 0x83E4, 0xDB64 }, { 0x83E5, 0xDB6F }, { 0x83E7, 0xDB63 }, { 0x83E8, 0xDB61 }, { 0x83E9, 0xB5D0 }, { 0x83EA, 0xDBA5 },
+	{ 0x83EB, 0xDB6A }, { 0x83EC, 0xDBA8 }, { 0x83EE, 0xDBA9 }, { 0x83EF, 0xB5D8 }, { 0x83F0, 0xB5DD }, { 0x83F1, 0xB5D9 }, { 0x83F2, 0xB5E1 }, { 0x83F3, 0xDB7E },
+	{ 0x83F4, 0xB5DA }, { 0x83F5, 0xDB76 }, { 0x83F6, 0xDB66 }, { 0x83F8, 0xB5D2 }, { 0x83F9, 0xDB5E }, { 0x83FA, 0xDBA2 }, { 0x83FB, 0xDBAB }, { 0x83FC, 0xDB65 },
+	{ 0x83FD, 0xB5E0 }, { 0x83FE, 0xDBB0 }, { 0x83FF, 0xDB71 }, { 0x8401, 0xDB6D }, { 0x8403, 0xB5D1 }, { 0x8404, 0xB5E5 }, { 0x8406, 0xDB7C }, { 0x8407, 0xB5E7 },
+	{ 0x8409, 0xDB78 }, { 0x840A, 0xB5DC }, { 0x840B, 0xB5D6 }, { 0x840C, 0xB5DE }, { 0x840D, 0xB5D3 }, { 0x840E, 0xB5E4 }, { 0x840F, 0xDB79 }, { 0x8410, 0xDB67 },
+	{ 0x8411, 0xDB7B }, { 0x8412, 0xDB62 }, { 0x8413, 0xDBA6 }, { 0x841B, 0xDBAE }, { 0x8423, 0xDB5F }, { 0x8429, 0xDFC7 }, { 0x842B, 0xDFDD }, { 0x842C, 0xB855 },
+	{ 0x842D, 0xDFCC }, { 0x842F, 0xDFCA }, { 0x8430, 0xDFB5 }, { 0x8431, 0xB8A9 }, { 0x8432, 0xDFC5 }, { 0x8433, 0xDFD9 }, { 0x8434, 0xDFC1 }, { 0x8435, 0xB8B1 },
+	{ 0x8436, 0xDFD8 }, { 0x8437, 0xDFBF }, { 0x8438, 0xB5E3 }, { 0x8439, 0xDFCF }, { 0x843A, 0xDFC0 }, { 0x843B, 0xDFD6 }, { 0x843C, 0xB8B0 }, { 0x843D, 0xB8A8 },
+	{ 0x843F, 0xDFAA }, { 0x8440, 0xDFB2 }, { 0x8442, 0xDFCB }, { 0x8443, 0xDFC3 }, { 0x8444, 0xDFDC }, { 0x8445, 0xDFC6 }, { 0x8446, 0xB8B6 }, { 0x8447, 0xDFD7 },
+	{ 0x8449, 0xB8AD }, { 0x844B, 0xDFC9 }, { 0x844C, 0xDFD1 }, { 0x844D, 0xDFB6 }, { 0x844E, 0xDFD0 }, { 0x8450, 0xDFE1 }, { 0x8451, 0xDFB1 }, { 0x8452, 0xDFD2 },
+	{ 0x8454, 0xDFDF }, { 0x8456, 0xDFAB }, { 0x8457, 0xB5DB }, { 0x8459, 0xDFB9 }, { 0x845A, 0xDFB8 }, { 0x845B, 0xB8AF }, { 0x845D, 0xDFBC }, { 0x845E, 0xDFBE },
+	{ 0x845F, 0xDFCD }, { 0x8460, 0xDFDE }, { 0x8461, 0xB8B2 }, { 0x8463, 0xB8B3 }, { 0x8465, 0xDFB0 }, { 0x8466, 0xB8AB }, { 0x8467, 0xDFB4 }, { 0x8468, 0xDFDA },
+	{ 0x8469, 0xB8B4 }, { 0x846B, 0xB8AC }, { 0x846C, 0xB8AE }, { 0x846D, 0xB8B5 }, { 0x846E, 0xDFE0 }, { 0x846F, 0xDFD3 }, { 0x8470, 0xDFCE }, { 0x8473, 0xDFBB },
+	{ 0x8474, 0xDFBA }, { 0x8475, 0xB8AA }, { 0x8476, 0xDFAC }, { 0x8477, 0xB8A7 }, { 0x8478, 0xDFC4 }, { 0x8479, 0xDFAD }, { 0x847A, 0xDFC2 }, { 0x847D, 0xDFB7 },
+	{ 0x847E, 0xDFDB }, { 0x8482, 0xB8A6 }, { 0x8486, 0xDFB3 }, { 0x848D, 0xDFAF }, { 0x848E, 0xDFD5 }, { 0x848F, 0xDFAE }, { 0x8490, 0xBB60 }, { 0x8491, 0xE3D3 },
+	{ 0x8494, 0xE3C2 }, { 0x8497, 0xE3AC }, { 0x8498, 0xE3CA }, { 0x8499, 0xBB58 }, { 0x849A, 0xE3BB }, { 0x849B, 0xE3C5 }, { 0x849C, 0xBB5B }, { 0x849D, 0xE3BE },
+	{ 0x849E, 0xBB59 }, { 0x849F, 0xE3AF }, { 0x84A0, 0xE3CD }, { 0x84A1, 0xE3AE }, { 0x84A2, 0xE3C1 }, { 0x84A4, 0xE3AD }, { 0x84A7, 0xE3BF }, { 0x84A8, 0xE3C8 },
+	{ 0x84A9, 0xE3C6 }, { 0x84AA, 0xE3BA }, { 0x84AB, 0xE3B5 }, { 0x84AC, 0xE3B3 }, { 0x84AE, 0xE3B4 }, { 0x84AF, 0xE3C7 }, { 0x84B0, 0xE3D2 }, { 0x84B1, 0xE3BC },
+	{ 0x84B2, 0xBB5A }, { 0x84B4, 0xE3B7 }, { 0x84B6, 0xE3CB }, { 0x84B8, 0xBB5D }, { 0x84B9, 0xE3B6 }, { 0x84BA, 0xE3B0 }, { 0x84BB, 0xE3C0 }, { 0x84BC, 0xBB61 },
+	{ 0x84BF, 0xBB55 }, { 0x84C0, 0xBB5E }, { 0x84C1, 0xE3B8 }, { 0x84C2, 0xE3B2 }, { 0x84C4, 0xBB57 }, { 0x84C5, 0xDFD4 }, { 0x84C6, 0xBB56 }, { 0x84C7, 0xE3C3 },
+	{ 0x84C9, 0xBB54 }, { 0x84CA, 0xBB63 }, { 0x84CB, 0xBB5C }, { 0x84CC, 0xE3C4 }, { 0x84CD, 0xE3B9 }, { 0x84CE, 0xE3B1 }, { 0x84CF, 0xE3CC }, { 0x84D0, 0xE3BD },
+	{ 0x84D1, 0xBB62 }, { 0x84D2, 0xE3D0 }, { 0x84D3, 0xBB5F }, { 0x84D4, 0xE3CF }, { 0x84D6, 0xE3C9 }, { 0x84D7, 0xE3CE }, { 0x84DB, 0xE3D1 }, { 0x84E7, 0xE773 },
+	{ 0x84E8, 0xE774 }, { 0x84E9, 0xE767 }, { 0x84EA, 0xE766 }, { 0x84EB, 0xE762 }, { 0x84EC, 0xBDB4 }, { 0x84EE, 0xBDAC }, { 0x84EF, 0xE776 }, { 0x84F0, 0xE775 },
+	{ 0x84F1, 0xDFA9 }, { 0x84F2, 0xE75F }, { 0x84F3, 0xE763 }, { 0x84F4, 0xE75D }, { 0x84F6, 0xE770 }, { 0x84F7, 0xE761 }, { 0x84F9, 0xE777 }, { 0x84FA, 0xE75A },
+	{ 0x84FB, 0xE758 }, { 0x84FC, 0xE764 }, { 0x84FD, 0xE76E }, { 0x84FE, 0xE769 }, { 0x84FF, 0xBDB6 }, { 0x8500, 0xE74F }, { 0x8502, 0xE76D }, { 0x8506, 0xBDB7 },
+	{ 0x8507, 0xDFBD }, { 0x8508, 0xE75B }, { 0x8509, 0xE752 }, { 0x850A, 0xE755 }, { 0x850B, 0xE77B }, { 0x850C, 0xE75C }, { 0x850D, 0xE753 }, { 0x850E, 0xE751 },
+	{ 0x850F, 0xE74E }, { 0x8511, 0xBDB0 }, { 0x8512, 0xE765 }, { 0x8513, 0xBDAF }, { 0x8514, 0xBDB3 }, { 0x8515, 0xE760 }, { 0x8516, 0xE768 }, { 0x8517, 0xBDA9 },
+	{ 0x8518, 0xE778 }, { 0x8519, 0xE77C }, { 0x851A, 0xBDAB }, { 0x851C, 0xE757 }, { 0x851D, 0xE76B }, { 0x851E, 0xE76F }, { 0x851F, 0xE754 }, { 0x8520, 0xE779 },
+	{ 0x8521, 0xBDB2 }, { 0x8523, 0xBDB1 }, { 0x8524, 0xE74C }, { 0x8525, 0xBDB5 }, { 0x8526, 0xE772 }, { 0x8527, 0xE756 }, { 0x8528, 0xE76A }, { 0x8529, 0xE750 },
+	{ 0x852A, 0xE75E }, { 0x852B, 0xE759 }, { 0x852C, 0xBDAD }, { 0x852D, 0xBDAE }, { 0x852E, 0xE76C }, { 0x852F, 0xE77D }, { 0x8530, 0xE77A }, { 0x8531, 0xE771 },
+	{ 0x853B, 0xE74D }, { 0x853D, 0xBDAA }, { 0x853E, 0xEB49 }, { 0x8540, 0xEB40 }, { 0x8541, 0xEB43 }, { 0x8543, 0xBFBB }, { 0x8544, 0xEB45 }, { 0x8545, 0xEAF9 },
+	{ 0x8546, 0xEB41 }, { 0x8547, 0xEB47 }, { 0x8548, 0xBFB8 }, { 0x8549, 0xBFBC }, { 0x854A, 0xBFB6 }, { 0x854D, 0xEAFB }, { 0x854E, 0xEB4C }, { 0x8551, 0xEB46 },
+	{ 0x8553, 0xEAFC }, { 0x8554, 0xEB55 }, { 0x8555, 0xEB4F }, { 0x8556, 0xEAF8 }, { 0x8557, 0xEE46 }, { 0x8558, 0xEAFE }, { 0x8559, 0xBFB7 }, { 0x855B, 0xEB4A },
+	{ 0x855D, 0xEB54 }, { 0x855E, 0xBFBF }, { 0x8560, 0xEB51 }, { 0x8561, 0xEAFD }, { 0x8562, 0xEB44 }, { 0x8563, 0xEB48 }, { 0x8564, 0xEB42 }, { 0x8565, 0xEB56 },
+	{ 0x8566, 0xEB53 }, { 0x8567, 0xEB50 }, { 0x8568, 0xBFB9 }, { 0x8569, 0xBFBA }, { 0x856A, 0xBFBE }, { 0x856B, 0xEAFA }, { 0x856C, 0xEB57 }, { 0x856D, 0xBFBD },
+	{ 0x856E, 0xEB4D }, { 0x8571, 0xEB4B }, { 0x8575, 0xEB4E }, { 0x8576, 0xEE53 }, { 0x8577, 0xEE40 }, { 0x8578, 0xEE45 }, { 0x8579, 0xEE52 }, { 0x857A, 0xEE44 },
+	{ 0x857B, 0xEDFB }, { 0x857C, 0xEE41 }, { 0x857E, 0xC1A2 }, { 0x8580, 0xEDF4 }, { 0x8581, 0xEE4D }, { 0x8582, 0xEE4F }, { 0x8583, 0xEDF3 }, { 0x8584, 0xC1A1 },
+	{ 0x8585, 0xEE51 }, { 0x8586, 0xEE49 }, { 0x8587, 0xC1A8 }, { 0x8588, 0xEE50 }, { 0x8589, 0xEE42 }, { 0x858A, 0xC1AA }, { 0x858B, 0xEDF9 }, { 0x858C, 0xEB52 },
+	{ 0x858D, 0xEE4A }, { 0x858E, 0xEE47 }, { 0x858F, 0xEDF5 }, { 0x8590, 0xEE55 }, { 0x8591, 0xC1A4 }, { 0x8594, 0xC1A5 }, { 0x8595, 0xEDF7 }, { 0x8596, 0xEE48 },
+	{ 0x8598, 0xEE54 }, { 0x8599, 0xEE4B }, { 0x859A, 0xEDFD }, { 0x859B, 0xC1A7 }, { 0x859C, 0xC1A3 }, { 0x859D, 0xEE4C }, { 0x859E, 0xEDFE }, { 0x859F, 0xEE56 },
+	{ 0x85A0, 0xEDF8 }, { 0x85A1, 0xEE43 }, { 0x85A2, 0xEE4E }, { 0x85A3, 0xEDFA }, { 0x85A4, 0xEDFC }, { 0x85A6, 0xC2CB }, { 0x85A7, 0xEDF6 }, { 0x85A8, 0xC1A9 },
+	{ 0x85A9, 0xC2C4 }, { 0x85AA, 0xC17E }, { 0x85AF, 0xC1A6 }, { 0x85B0, 0xC2C8 }, { 0x85B1, 0xF0B3 }, { 0x85B3, 0xF0A9 }, { 0x85B4, 0xF0A4 }, { 0x85B5, 0xF0AA },
+	{ 0x85B6, 0xF0B4 }, { 0x85B7, 0xF0B8 }, { 0x85B8, 0xF0B7 }, { 0x85B9, 0xC2CA }, { 0x85BA, 0xC2C9 }, { 0x85BD, 0xF0AB }, { 0x85BE, 0xF0B9 }, { 0x85BF, 0xF0AE },
+	{ 0x85C0, 0xF0A6 }, { 0x85C2, 0xF0A8 }, { 0x85C3, 0xF0A7 }, { 0x85C4, 0xF0AD }, { 0x85C5, 0xF0B2 }, { 0x85C6, 0xF0A5 }, { 0x85C7, 0xF0AC }, { 0x85C8, 0xF0B1 },
+	{ 0x85C9, 0xC2C7 }, { 0x85CB, 0xF0AF }, { 0x85CD, 0xC2C5 }, { 0x85CE, 0xF0B0 }, { 0x85CF, 0xC2C3 }, { 0x85D0, 0xC2C6 }, { 0x85D1, 0xF2D5 }, { 0x85D2, 0xF0B5 },
+	{ 0x85D5, 0xC3C2 }, { 0x85D7, 0xF2CD }, { 0x85D8, 0xF2D1 }, { 0x85D9, 0xF2C9 }, { 0x85DA, 0xF2CC }, { 0x85DC, 0xF2D4 }, { 0x85DD, 0xC3C0 }, { 0x85DE, 0xF2D9 },
+	{ 0x85DF, 0xF2D2 }, { 0x85E1, 0xF2CA }, { 0x85E2, 0xF2DA }, { 0x85E3, 0xF2D3 }, { 0x85E4, 0xC3C3 }, { 0x85E5, 0xC3C4 }, { 0x85E6, 0xF2D7 }, { 0x85E8, 0xF2CB },
+	{ 0x85E9, 0xC3BF }, { 0x85EA, 0xC3C1 }, { 0x85EB, 0xF2C6 }, { 0x85EC, 0xF2CE }, { 0x85ED, 0xF2C8 }, { 0x85EF, 0xF2D8 }, { 0x85F0, 0xF2D6 }, { 0x85F1, 0xF2C7 },
+	{ 0x85F2, 0xF2CF }, { 0x85F6, 0xF4BE }, { 0x85F7, 0xC3C5 }, { 0x85F8, 0xF2D0 }, { 0x85F9, 0xC4A7 }, { 0x85FA, 0xC4A9 }, { 0x85FB, 0xC4A6 }, { 0x85FD, 0xF4C3 },
+	{ 0x85FE, 0xF4BB }, { 0x85FF, 0xF4B9 }, { 0x8600, 0xF4BD }, { 0x8601, 0xF4BA }, { 0x8604, 0xF4BF }, { 0x8605, 0xF4C1 }, { 0x8606, 0xC4AA }, { 0x8607, 0xC4AC },
+	{ 0x8609, 0xF4C0 }, { 0x860A, 0xC4AD }, { 0x860B, 0xC4AB }, { 0x860C, 0xF4C2 }, { 0x8611, 0xC4A8 }, { 0x8617, 0xC4F4 }, { 0x8618, 0xF5F1 }, { 0x8619, 0xF5F7 },
+	{ 0x861A, 0xC4F6 }, { 0x861B, 0xF4BC }, { 0x861C, 0xF5F6 }, { 0x861E, 0xF5FD }, { 0x861F, 0xF5F4 }, { 0x8620, 0xF5FB }, { 0x8621, 0xF5FA }, { 0x8622, 0xF4B8 },
+	{ 0x8623, 0xF5F5 }, { 0x8624, 0xF0B6 }, { 0x8625, 0xF5FE }, { 0x8626, 0xF5F3 }, { 0x8627, 0xF5F8 }, { 0x8629, 0xF5FC }, { 0x862A, 0xF5F2 }, { 0x862C, 0xF74A },
+	{ 0x862D, 0xC4F5 }, { 0x862E, 0xF5F9 }, { 0x8631, 0xF7F4 }, { 0x8632, 0xF74B }, { 0x8633, 0xF749 }, { 0x8634, 0xF747 }, { 0x8635, 0xF748 }, { 0x8636, 0xF74C },
+	{ 0x8638, 0xC5D9 }, { 0x8639, 0xF7F2 }, { 0x863A, 0xF7F0 }, { 0x863B, 0xF7F5 }, { 0x863C, 0xF7F3 }, { 0x863E, 0xF7F6 }, { 0x863F, 0xC5DA }, { 0x8640, 0xF7F1 },
+	{ 0x8643, 0xF8BC }, { 0x8646, 0xF945 }, { 0x8647, 0xF946 }, { 0x8648, 0xF947 }, { 0x864B, 0xF9C7 }, { 0x864C, 0xF9BD }, { 0x864D, 0xCA4F }, { 0x864E, 0xAAEA },
+	{ 0x8650, 0xAD68 }, { 0x8652, 0xD3B8 }, { 0x8653, 0xD3B7 }, { 0x8654, 0xB040 }, { 0x8655, 0xB342 }, { 0x8656, 0xD77C }, { 0x8659, 0xD77B }, { 0x865B, 0xB5EA },
+	{ 0x865C, 0xB8B8 }, { 0x865E, 0xB8B7 }, { 0x865F, 0xB8B9 }, { 0x8661, 0xE3D4 }, { 0x8662, 0xE77E }, { 0x8663, 0xEB58 }, { 0x8664, 0xEB5A }, { 0x8665, 0xEB59 },
+	{ 0x8667, 0xC1AB }, { 0x8668, 0xEE57 }, { 0x8669, 0xF0BA }, { 0x866A, 0xF9A5 }, { 0x866B, 0xA6E4 }, { 0x866D, 0xCDC9 }, { 0x866E, 0xCDCA }, { 0x866F, 0xCDC8 },
+	{ 0x8670, 0xCDC7 }, { 0x8671, 0xAAEB }, { 0x8673, 0xD0A9 }, { 0x8674, 0xD0A7 }, { 0x8677, 0xD0A6 }, { 0x8679, 0xAD69 }, { 0x867A, 0xAD6B }, { 0x867B, 0xAD6A },
+	{ 0x867C, 0xD0A8 }, { 0x8685, 0xD3C4 }, { 0x8686, 0xD3C1 }, { 0x8687, 0xD3BF }, { 0x868A, 0xB041 }, { 0x868B, 0xD3C2 }, { 0x868C, 0xB046 }, { 0x868D, 0xD3BC },
+	{ 0x868E, 0xD3CB }, { 0x8690, 0xD3CD }, { 0x8691, 0xD3BD }, { 0x8693, 0xB043 }, { 0x8694, 0xD3CE }, { 0x8695, 0xD3C9 }, { 0x8696, 0xD3BB }, { 0x8697, 0xD3C0 },
+	{ 0x8698, 0xD3CA }, { 0x8699, 0xD3C6 }, { 0x869A, 0xD3C3 }, { 0x869C, 0xB048 }, { 0x869D, 0xD3CC }, { 0x869E, 0xD3BE }, { 0x86A1, 0xD3C7 }, { 0x86A2, 0xD3B9 },
+	{ 0x86A3, 0xB047 }, { 0x86A4, 0xB044 }, { 0x86A5, 0xD3C5 }, { 0x86A7, 0xD3C8 }, { 0x86A8, 0xD3BA }, { 0x86A9, 0xB045 }, { 0x86AA, 0xB042 }, { 0x86AF, 0xB34C },
+	{ 0x86B0, 0xD7A5 }, { 0x86B1, 0xB34B }, { 0x86B3, 0xD7A8 }, { 0x86B4, 0xD7AB }, { 0x86B5, 0xB348 }, { 0x86B6, 0xB346 }, { 0x86B7, 0xD77E }, { 0x86B8, 0xD7A9 },
+	{ 0x86B9, 0xD7A7 }, { 0x86BA, 0xD7A4 }, { 0x86BB, 0xD7AC }, { 0x86BC, 0xD7AD }, { 0x86BD, 0xD7AF }, { 0x86BE, 0xD7B0 }, { 0x86BF, 0xD77D }, { 0x86C0, 0xB345 },
+	{ 0x86C1, 0xD7A2 }, { 0x86C2, 0xD7A1 }, { 0x86C3, 0xD7AE }, { 0x86C4, 0xB347 }, { 0x86C5, 0xD7A3 }, { 0x86C6, 0xB349 }, { 0x86C7, 0xB344 }, { 0x86C8, 0xD7A6 },
+	{ 0x86C9, 0xB34D }, { 0x86CB, 0xB34A }, { 0x86CC, 0xD7AA }, { 0x86D0, 0xB5F1 }, { 0x86D1, 0xDBBF }, { 0x86D3, 0xDBB4 }, { 0x86D4, 0xB5EE }, { 0x86D6, 0xDFE7 },
+	{ 0x86D7, 0xDBBD }, { 0x86D8, 0xDBB1 }, { 0x86D9, 0xB5EC }, { 0x86DA, 0xDBB6 }, { 0x86DB, 0xB5EF }, { 0x86DC, 0xDBBA }, { 0x86DD, 0xDBB8 }, { 0x86DE, 0xB5F2 },
+	{ 0x86DF, 0xB5EB }, { 0x86E2, 0xDBB2 }, { 0x86E3, 0xDBB5 }, { 0x86E4, 0xB5F0 }, { 0x86E6, 0xDBB3 }, { 0x86E8, 0xDBBE }, { 0x86E9, 0xDBBC }, { 0x86EA, 0xDBB7 },
+	{ 0x86EB, 0xDBB9 }, { 0x86EC, 0xDBBB }, { 0x86ED, 0xB5ED }, { 0x86F5, 0xDFE8 }, { 0x86F6, 0xDFEE }, { 0x86F7, 0xDFE4 }, { 0x86F8, 0xDFEA }, { 0x86F9, 0xB8BA },
+	{ 0x86FA, 0xDFE6 }, { 0x86FB, 0xB8C0 }, { 0x86FE, 0xB8BF }, { 0x8700, 0xB8BE }, { 0x8701, 0xDFED }, { 0x8702, 0xB8C1 }, { 0x8703, 0xB8C2 }, { 0x8704, 0xDFE3 },
+	{ 0x8705, 0xDFF0 }, { 0x8706, 0xB8C3 }, { 0x8707, 0xB8BD }, { 0x8708, 0xB8BC }, { 0x8709, 0xDFEC }, { 0x870A, 0xB8C4 }, { 0x870B, 0xDFE2 }, { 0x870C, 0xDFE5 },
+	{ 0x870D, 0xDFEF }, { 0x870E, 0xDFEB }, { 0x8711, 0xE3F4 }, { 0x8712, 0xE3E9 }, { 0x8713, 0xB8BB }, { 0x8718, 0xBB6A }, { 0x8719, 0xE3DD }, { 0x871A, 0xE3F2 },
+	{ 0x871B, 0xE3DE }, { 0x871C, 0xBB65 }, { 0x871E, 0xE3DB }, { 0x8720, 0xE3E4 }, { 0x8721, 0xE3DC }, { 0x8722, 0xBB67 }, { 0x8723, 0xE3D6 }, { 0x8724, 0xE3F1 },
+	{ 0x8725, 0xBB68 }, { 0x8726, 0xE3EE }, { 0x8727, 0xE3EF }, { 0x8728, 0xE3D7 }, { 0x8729, 0xBB6D }, { 0x872A, 0xE3E6 }, { 0x872C, 0xE3E0 }, { 0x872D, 0xE3E7 },
+	{ 0x872E, 0xE3DA }, { 0x8730, 0xE3F3 }, { 0x8731, 0xE3EB }, { 0x8732, 0xE3E5 }, { 0x8733, 0xE3D5 }, { 0x8734, 0xBB69 }, { 0x8735, 0xE3EC }, { 0x8737, 0xBB6C },
+	{ 0x8738, 0xE3F0 }, { 0x873A, 0xE3EA }, { 0x873B, 0xBB66 }, { 0x873C, 0xE3E8 }, { 0x873E, 0xE3E2 }, { 0x873F, 0xBB64 }, { 0x8740, 0xE3D9 }, { 0x8741, 0xE3E1 },
+	{ 0x8742, 0xE3ED }, { 0x8743, 0xE3DF }, { 0x8746, 0xE3E3 }, { 0x874C, 0xBDC1 }, { 0x874D, 0xDFE9 }, { 0x874E, 0xE7B2 }, { 0x874F, 0xE7BB }, { 0x8750, 0xE7B1 },
+	{ 0x8751, 0xE7AD }, { 0x8752, 0xE7AA }, { 0x8753, 0xBDC2 }, { 0x8754, 0xE7A8 }, { 0x8755, 0xBB6B }, { 0x8756, 0xE7A1 }, { 0x8757, 0xBDC0 }, { 0x8758, 0xE7A7 },
+	{ 0x8759, 0xBDBF }, { 0x875A, 0xE7AC }, { 0x875B, 0xE7A9 }, { 0x875C, 0xE7B9 }, { 0x875D, 0xE7B4 }, { 0x875E, 0xE7AE }, { 0x875F, 0xE7B3 }, { 0x8760, 0xBDBB },
+	{ 0x8761, 0xE7AB }, { 0x8762, 0xE7BE }, { 0x8763, 0xE7A2 }, { 0x8764, 0xE7A3 }, { 0x8765, 0xE7BA }, { 0x8766, 0xBDBC }, { 0x8767, 0xE7BF }, { 0x8768, 0xBDBE },
+	{ 0x8769, 0xE7C0 }, { 0x876A, 0xE7B0 }, { 0x876B, 0xE3D8 }, { 0x876C, 0xE7B6 }, { 0x876D, 0xE7AF }, { 0x876E, 0xE7B8 }, { 0x876F, 0xE7B5 }, { 0x8773, 0xE7A6 },
+	{ 0x8774, 0xBDB9 }, { 0x8775, 0xE7BD }, { 0x8776, 0xBDBA }, { 0x8777, 0xE7A4 }, { 0x8778, 0xBDBD }, { 0x8779, 0xEB64 }, { 0x877A, 0xE7B7 }, { 0x877B, 0xE7BC },
+	{ 0x8781, 0xEB61 }, { 0x8782, 0xBDB8 }, { 0x8783, 0xBFC0 }, { 0x8784, 0xEB6B }, { 0x8785, 0xEB67 }, { 0x8787, 0xEB65 }, { 0x8788, 0xEB60 }, { 0x8789, 0xEB6F },
+	{ 0x878D, 0xBFC4 }, { 0x878F, 0xEB5C }, { 0x8790, 0xEB68 }, { 0x8791, 0xEB69 }, { 0x8792, 0xEB5F }, { 0x8793, 0xEB5E }, { 0x8794, 0xEB6C }, { 0x8796, 0xEB62 },
+	{ 0x8797, 0xEB5D }, { 0x8798, 0xEB63 }, { 0x879A, 0xEB6E }, { 0x879B, 0xEB5B }, { 0x879C, 0xEB6D }, { 0x879D, 0xEB6A }, { 0x879E, 0xBFC2 }, { 0x879F, 0xBFC1 },
+	{ 0x87A2, 0xBFC3 }, { 0x87A3, 0xEB66 }, { 0x87A4, 0xF0CB }, { 0x87AA, 0xEE59 }, { 0x87AB, 0xC1B1 }, { 0x87AC, 0xEE5D }, { 0x87AD, 0xEE5A }, { 0x87AE, 0xEE61 },
+	{ 0x87AF, 0xEE67 }, { 0x87B0, 0xEE5C }, { 0x87B2, 0xEE70 }, { 0x87B3, 0xC1AE }, { 0x87B4, 0xEE6A }, { 0x87B5, 0xEE5F }, { 0x87B6, 0xEE6B }, { 0x87B7, 0xEE66 },
+	{ 0x87B8, 0xEE6D }, { 0x87B9, 0xEE5E }, { 0x87BA, 0xC1B3 }, { 0x87BB, 0xC1B2 }, { 0x87BC, 0xEE60 }, { 0x87BD, 0xEE6E }, { 0x87BE, 0xEE58 }, { 0x87BF, 0xEE6C },
+	{ 0x87C0, 0xC1AC }, { 0x87C2, 0xEE64 }, { 0x87C3, 0xEE63 }, { 0x87C4, 0xEE68 }, { 0x87C5, 0xEE5B }, { 0x87C6, 0xC1B0 }, { 0x87C8, 0xC1B4 }, { 0x87C9, 0xEE62 },
+	{ 0x87CA, 0xEE69 }, { 0x87CB, 0xC1B5 }, { 0x87CC, 0xEE65 }, { 0x87D1, 0xC1AD }, { 0x87D2, 0xC1AF }, { 0x87D3, 0xF0C7 }, { 0x87D4, 0xF0C5 }, { 0x87D7, 0xF0CC },
+	{ 0x87D8, 0xF0C9 }, { 0x87D9, 0xF0CD }, { 0x87DB, 0xF0BE }, { 0x87DC, 0xF0C6 }, { 0x87DD, 0xF0D1 }, { 0x87DE, 0xEE6F }, { 0x87DF, 0xF0C2 }, { 0x87E0, 0xC2CF },
+	{ 0x87E1, 0xE7A5 }, { 0x87E2, 0xF0BD }, { 0x87E3, 0xF0CA }, { 0x87E4, 0xF0C4 }, { 0x87E5, 0xF0C1 }, { 0x87E6, 0xF0BC }, { 0x87E7, 0xF0BB }, { 0x87E8, 0xF0D0 },
+	{ 0x87EA, 0xF0C0 }, { 0x87EB, 0xF0BF }, { 0x87EC, 0xC2CD }, { 0x87ED, 0xF0C8 }, { 0x87EF, 0xC2CC }, { 0x87F2, 0xC2CE }, { 0x87F3, 0xF0C3 }, { 0x87F4, 0xF0CF },
+	{ 0x87F6, 0xF2DE }, { 0x87F7, 0xF2DF }, { 0x87F9, 0xC3C9 }, { 0x87FA, 0xF2DC }, { 0x87FB, 0xC3C6 }, { 0x87FC, 0xF2E4 }, { 0x87FE, 0xC3CA }, { 0x87FF, 0xF2E6 },
+	{ 0x8800, 0xF2DB }, { 0x8801, 0xF0CE }, { 0x8802, 0xF2E8 }, { 0x8803, 0xF2DD }, { 0x8805, 0xC3C7 }, { 0x8806, 0xF2E3 }, { 0x8808, 0xF2E5 }, { 0x8809, 0xF2E0 },
+	{ 0x880A, 0xF2E7 }, { 0x880B, 0xF2E2 }, { 0x880C, 0xF2E1 }, { 0x880D, 0xC3C8 }, { 0x8810, 0xF4C5 }, { 0x8811, 0xF4C6 }, { 0x8813, 0xF4C8 }, { 0x8814, 0xC4AE },
+	{ 0x8815, 0xC4AF }, { 0x8816, 0xF4C9 }, { 0x8817, 0xF4C7 }, { 0x8819, 0xF4C4 }, { 0x881B, 0xF642 }, { 0x881C, 0xF645 }, { 0x881D, 0xF641 }, { 0x881F, 0xC4FA },
+	{ 0x8820, 0xF643 }, { 0x8821, 0xC4F9 }, { 0x8822, 0xC4F8 }, { 0x8823, 0xC4F7 }, { 0x8824, 0xF644 }, { 0x8825, 0xF751 }, { 0x8826, 0xF74F }, { 0x8828, 0xF74E },
+	{ 0x8829, 0xF640 }, { 0x882A, 0xF750 }, { 0x882B, 0xF646 }, { 0x882C, 0xF74D }, { 0x882E, 0xF7F9 }, { 0x882F, 0xF7D7 }, { 0x8830, 0xF7F7 }, { 0x8831, 0xC5DB },
+	{ 0x8832, 0xF7F8 }, { 0x8833, 0xF7FA }, { 0x8835, 0xF8BF }, { 0x8836, 0xC5FA }, { 0x8837, 0xF8BE }, { 0x8838, 0xF8BD }, { 0x8839, 0xC5FB }, { 0x883B, 0xC65A },
+	{ 0x883C, 0xF96E }, { 0x883D, 0xF9A7 }, { 0x883E, 0xF9A6 }, { 0x883F, 0xF9A8 }, { 0x8840, 0xA6E5 }, { 0x8841, 0xD0AA }, { 0x8843, 0xD3CF }, { 0x8844, 0xD3D0 },
+	{ 0x8848, 0xDBC0 }, { 0x884A, 0xF647 }, { 0x884B, 0xF8C0 }, { 0x884C, 0xA6E6 }, { 0x884D, 0xAD6C }, { 0x884E, 0xD0AB }, { 0x8852, 0xD7B1 }, { 0x8853, 0xB34E },
+	{ 0x8855, 0xDBC2 }, { 0x8856, 0xDBC1 }, { 0x8857, 0xB5F3 }, { 0x8859, 0xB8C5 }, { 0x885A, 0xE7C1 }, { 0x885B, 0xBDC3 }, { 0x885D, 0xBDC4 }, { 0x8861, 0xBFC5 },
+	{ 0x8862, 0xC5FC }, { 0x8863, 0xA6E7 }, { 0x8867, 0xD0AC }, { 0x8868, 0xAAED }, { 0x8869, 0xD0AE }, { 0x886A, 0xD0AD }, { 0x886B, 0xAD6D }, { 0x886D, 0xD3D1 },
+	{ 0x886F, 0xD3D8 }, { 0x8870, 0xB049 }, { 0x8871, 0xD3D6 }, { 0x8872, 0xD3D4 }, { 0x8874, 0xD3DB }, { 0x8875, 0xD3D2 }, { 0x8876, 0xD3D3 }, { 0x8877, 0xB04A },
+	{ 0x8879, 0xB04E }, { 0x887C, 0xD3DC }, { 0x887D, 0xB04D }, { 0x887E, 0xD3DA }, { 0x887F, 0xD3D7 }, { 0x8880, 0xD3D5 }, { 0x8881, 0xB04B }, { 0x8882, 0xB04C },
+	{ 0x8883, 0xD3D9 }, { 0x8888, 0xB350 }, { 0x8889, 0xD7B2 }, { 0x888B, 0xB355 }, { 0x888C, 0xD7C2 }, { 0x888D, 0xB354 }, { 0x888E, 0xD7C4 }, { 0x8891, 0xD7B8 },
+	{ 0x8892, 0xB352 }, { 0x8893, 0xD7C3 }, { 0x8895, 0xD7B3 }, { 0x8896, 0xB353 }, { 0x8897, 0xD7BF }, { 0x8898, 0xD7BB }, { 0x8899, 0xD7BD }, { 0x889A, 0xD7B7 },
+	{ 0x889B, 0xD7BE }, { 0x889E, 0xB34F }, { 0x889F, 0xD7BA }, { 0x88A1, 0xD7B9 }, { 0x88A2, 0xD7B5 }, { 0x88A4, 0xD7C0 }, { 0x88A7, 0xD7BC }, { 0x88A8, 0xD7B4 },
+	{ 0x88AA, 0xD7B6 }, { 0x88AB, 0xB351 }, { 0x88AC, 0xD7C1 }, { 0x88B1, 0xB5F6 }, { 0x88B2, 0xDBCD }, { 0x88B6, 0xDBC9 }, { 0x88B7, 0xDBCB }, { 0x88B8, 0xDBC6 },
+	{ 0x88B9, 0xDBC5 }, { 0x88BA, 0xDBC3 }, { 0x88BC, 0xDBCA }, { 0x88BD, 0xDBCC }, { 0x88BE, 0xDBC8 }, { 0x88C0, 0xDBC7 }, { 0x88C1, 0xB5F4 }, { 0x88C2, 0xB5F5 },
+	{ 0x88C9, 0xDBCF }, { 0x88CA, 0xB8CD }, { 0x88CB, 0xDFF2 }, { 0x88CC, 0xDFF8 }, { 0x88CD, 0xDFF3 }, { 0x88CE, 0xDFF4 }, { 0x88D0, 0xDFF9 }, { 0x88D2, 0xB8CF },
+	{ 0x88D4, 0xB8C7 }, { 0x88D5, 0xB8CE }, { 0x88D6, 0xDFF1 }, { 0x88D7, 0xDBC4 }, { 0x88D8, 0xB8CA }, { 0x88D9, 0xB8C8 }, { 0x88DA, 0xDFF7 }, { 0x88DB, 0xDFF6 },
+	{ 0x88DC, 0xB8C9 }, { 0x88DD, 0xB8CB }, { 0x88DE, 0xDFF5 }, { 0x88DF, 0xB8C6 }, { 0x88E1, 0xB8CC }, { 0x88E7, 0xE3F6 }, { 0x88E8, 0xBB74 }, { 0x88EB, 0xE442 },
+	{ 0x88EC, 0xE441 }, { 0x88EE, 0xE3FB }, { 0x88EF, 0xBB76 }, { 0x88F0, 0xE440 }, { 0x88F1, 0xE3F7 }, { 0x88F2, 0xE3F8 }, { 0x88F3, 0xBB6E }, { 0x88F4, 0xBB70 },
+	{ 0x88F6, 0xE3FD }, { 0x88F7, 0xE3F5 }, { 0x88F8, 0xBB72 }, { 0x88F9, 0xBB71 }, { 0x88FA, 0xE3F9 }, { 0x88FB, 0xE3FE }, { 0x88FC, 0xE3FC }, { 0x88FD, 0xBB73 },
+	{ 0x88FE, 0xE3FA }, { 0x8901, 0xDBCE }, { 0x8902, 0xBB6F }, { 0x8905, 0xE7C2 }, { 0x8906, 0xE7C9 }, { 0x8907, 0xBDC6 }, { 0x8909, 0xE7CD }, { 0x890A, 0xBDCA },
+	{ 0x890B, 0xE7C5 }, { 0x890C, 0xE7C3 }, { 0x890E, 0xE7CC }, { 0x8910, 0xBDC5 }, { 0x8911, 0xE7CB }, { 0x8912, 0xBDC7 }, { 0x8913, 0xBDC8 }, { 0x8914, 0xE7C4 },
+	{ 0x8915, 0xBDC9 }, { 0x8916, 0xE7CA }, { 0x8917, 0xE7C6 }, { 0x8918, 0xE7C7 }, { 0x8919, 0xE7C8 }, { 0x891A, 0xBB75 }, { 0x891E, 0xEB70 }, { 0x891F, 0xEB7C },
+	{ 0x8921, 0xBFCA }, { 0x8922, 0xEB77 }, { 0x8923, 0xEB79 }, { 0x8925, 0xBFC8 }, { 0x8926, 0xEB71 }, { 0x8927, 0xEB75 }, { 0x8929, 0xEB78 }, { 0x892A, 0xBFC6 },
+	{ 0x892B, 0xBFC9 }, { 0x892C, 0xEB7B }, { 0x892D, 0xEB73 }, { 0x892E, 0xEB74 }, { 0x892F, 0xEB7A }, { 0x8930, 0xEB72 }, { 0x8931, 0xEB76 }, { 0x8932, 0xBFC7 },
+	{ 0x8933, 0xEE72 }, { 0x8935, 0xEE71 }, { 0x8936, 0xC1B7 }, { 0x8937, 0xEE77 }, { 0x8938, 0xC1B9 }, { 0x893B, 0xC1B6 }, { 0x893C, 0xEE73 }, { 0x893D, 0xC1BA },
+	{ 0x893E, 0xEE74 }, { 0x8941, 0xEE75 }, { 0x8942, 0xEE78 }, { 0x8944, 0xC1B8 }, { 0x8946, 0xF0D6 }, { 0x8949, 0xF0D9 }, { 0x894B, 0xF0D3 }, { 0x894C, 0xF0D5 },
+	{ 0x894F, 0xF0D4 }, { 0x8950, 0xF0D7 }, { 0x8951, 0xF0D8 }, { 0x8952, 0xEE76 }, { 0x8953, 0xF0D2 }, { 0x8956, 0xC3CD }, { 0x8957, 0xF2EC }, { 0x8958, 0xF2EF },
+	{ 0x8959, 0xF2F1 }, { 0x895A, 0xF2EA }, { 0x895B, 0xF2EB }, { 0x895C, 0xF2EE }, { 0x895D, 0xF2F0 }, { 0x895E, 0xC3CE }, { 0x895F, 0xC3CC }, { 0x8960, 0xC3CB },
+	{ 0x8961, 0xF2ED }, { 0x8962, 0xF2E9 }, { 0x8963, 0xF4CA }, { 0x8964, 0xC4B0 }, { 0x8966, 0xF4CB }, { 0x8969, 0xF649 }, { 0x896A, 0xC4FB }, { 0x896B, 0xF64B },
+	{ 0x896C, 0xC4FC }, { 0x896D, 0xF648 }, { 0x896E, 0xF64A }, { 0x896F, 0xC5A8 }, { 0x8971, 0xF752 }, { 0x8972, 0xC5A7 }, { 0x8973, 0xF7FD }, { 0x8974, 0xF7FC },
+	{ 0x8976, 0xF7FB }, { 0x8979, 0xF948 }, { 0x897A, 0xF949 }, { 0x897B, 0xF94B }, { 0x897C, 0xF94A }, { 0x897E, 0xCA50 }, { 0x897F, 0xA6E8 }, { 0x8981, 0xAD6E },
+	{ 0x8982, 0xD7C5 }, { 0x8983, 0xB5F7 }, { 0x8985, 0xDFFA }, { 0x8986, 0xC2D0 }, { 0x8988, 0xF2F2 }, { 0x898B, 0xA8A3 }, { 0x898F, 0xB357 }, { 0x8993, 0xB356 },
+	{ 0x8995, 0xDBD0 }, { 0x8996, 0xB5F8 }, { 0x8997, 0xDBD2 }, { 0x8998, 0xDBD1 }, { 0x899B, 0xDFFB }, { 0x899C, 0xB8D0 }, { 0x899D, 0xE443 }, { 0x899E, 0xE446 },
+	{ 0x899F, 0xE445 }, { 0x89A1, 0xE444 }, { 0x89A2, 0xE7CE }, { 0x89A3, 0xE7D0 }, { 0x89A4, 0xE7CF }, { 0x89A6, 0xBFCC }, { 0x89AA, 0xBFCB }, { 0x89AC, 0xC1BB },
+	{ 0x89AD, 0xEE79 }, { 0x89AE, 0xEE7B }, { 0x89AF, 0xEE7A }, { 0x89B2, 0xC2D1 }, { 0x89B6, 0xF2F4 }, { 0x89B7, 0xF2F3 }, { 0x89B9, 0xF4CC }, { 0x89BA, 0xC4B1 },
+	{ 0x89BD, 0xC4FD }, { 0x89BE, 0xF754 }, { 0x89BF, 0xF753 }, { 0x89C0, 0xC65B }, { 0x89D2, 0xA8A4 }, { 0x89D3, 0xD0AF }, { 0x89D4, 0xAD6F }, { 0x89D5, 0xD7C8 },
+	{ 0x89D6, 0xD7C6 }, { 0x89D9, 0xD7C7 }, { 0x89DA, 0xDBD4 }, { 0x89DB, 0xDBD5 }, { 0x89DC, 0xE043 }, { 0x89DD, 0xDBD3 }, { 0x89DF, 0xDFFC }, { 0x89E0, 0xE041 },
+	{ 0x89E1, 0xE040 }, { 0x89E2, 0xE042 }, { 0x89E3, 0xB8D1 }, { 0x89E4, 0xDFFE }, { 0x89E5, 0xDFFD }, { 0x89E6, 0xE044 }, { 0x89E8, 0xE449 }, { 0x89E9, 0xE447 },
+	{ 0x89EB, 0xE448 }, { 0x89EC, 0xE7D3 }, { 0x89ED, 0xE7D1 }, { 0x89F0, 0xE7D2 }, { 0x89F1, 0xEB7D }, { 0x89F2, 0xEE7C }, { 0x89F3, 0xEE7D }, { 0x89F4, 0xC2D2 },
+	{ 0x89F6, 0xF2F5 }, { 0x89F7, 0xF4CD }, { 0x89F8, 0xC4B2 }, { 0x89FA, 0xF64C }, { 0x89FB, 0xF755 }, { 0x89FC, 0xC5A9 }, { 0x89FE, 0xF7FE }, { 0x89FF, 0xF94C },
+	{ 0x8A00, 0xA8A5 }, { 0x8A02, 0xAD71 }, { 0x8A03, 0xAD72 }, { 0x8A04, 0xD0B0 }, { 0x8A07, 0xD0B1 }, { 0x8A08, 0xAD70 }, { 0x8A0A, 0xB054 }, { 0x8A0C, 0xB052 },
+	{ 0x8A0E, 0xB051 }, { 0x8A0F, 0xB058 }, { 0x8A10, 0xB050 }, { 0x8A11, 0xB059 }, { 0x8A12, 0xD3DD }, { 0x8A13, 0xB056 }, { 0x8A15, 0xB053 }, { 0x8A16, 0xB057 },
+	{ 0x8A17, 0xB055 }, { 0x8A18, 0xB04F }, { 0x8A1B, 0xB35F }, { 0x8A1D, 0xB359 }, { 0x8A1E, 0xD7CC }, { 0x8A1F, 0xB35E }, { 0x8A22, 0xB360 }, { 0x8A23, 0xB35A },
+	{ 0x8A25, 0xB35B }, { 0x8A27, 0xD7CA }, { 0x8A2A, 0xB358 }, { 0x8A2C, 0xD7CB }, { 0x8A2D, 0xB35D }, { 0x8A30, 0xD7C9 }, { 0x8A31, 0xB35C }, { 0x8A34, 0xB644 },
+	{ 0x8A36, 0xB646 }, { 0x8A39, 0xDBD8 }, { 0x8A3A, 0xB645 }, { 0x8A3B, 0xB5F9 }, { 0x8A3C, 0xB5FD }, { 0x8A3E, 0xB8E4 }, { 0x8A3F, 0xE049 }, { 0x8A40, 0xDBDA },
+	{ 0x8A41, 0xB5FE }, { 0x8A44, 0xDBDD }, { 0x8A45, 0xDBDE }, { 0x8A46, 0xB643 }, { 0x8A48, 0xDBE0 }, { 0x8A4A, 0xDBE2 }, { 0x8A4C, 0xDBE3 }, { 0x8A4D, 0xDBD7 },
+	{ 0x8A4E, 0xDBD6 }, { 0x8A4F, 0xDBE4 }, { 0x8A50, 0xB642 }, { 0x8A51, 0xDBE1 }, { 0x8A52, 0xDBDF }, { 0x8A54, 0xB640 }, { 0x8A55, 0xB5FB }, { 0x8A56, 0xB647 },
+	{ 0x8A57, 0xDBDB }, { 0x8A58, 0xDBDC }, { 0x8A59, 0xDBD9 }, { 0x8A5B, 0xB641 }, { 0x8A5E, 0xB5FC }, { 0x8A60, 0xB5FA }, { 0x8A61, 0xE048 }, { 0x8A62, 0xB8DF },
+	{ 0x8A63, 0xB8DA }, { 0x8A66, 0xB8D5 }, { 0x8A68, 0xB8E5 }, { 0x8A69, 0xB8D6 }, { 0x8A6B, 0xB8D2 }, { 0x8A6C, 0xB8E1 }, { 0x8A6D, 0xB8DE }, { 0x8A6E, 0xB8E0 },
+	{ 0x8A70, 0xB8D7 }, { 0x8A71, 0xB8DC }, { 0x8A72, 0xB8D3 }, { 0x8A73, 0xB8D4 }, { 0x8A74, 0xE050 }, { 0x8A75, 0xE04D }, { 0x8A76, 0xE045 }, { 0x8A77, 0xE04A },
+	{ 0x8A79, 0xB8E2 }, { 0x8A7A, 0xE051 }, { 0x8A7B, 0xB8E3 }, { 0x8A7C, 0xB8D9 }, { 0x8A7F, 0xE047 }, { 0x8A81, 0xE04F }, { 0x8A82, 0xE04B }, { 0x8A83, 0xE04E },
+	{ 0x8A84, 0xE04C }, { 0x8A85, 0xB8DD }, { 0x8A86, 0xE046 }, { 0x8A87, 0xB8D8 }, { 0x8A8B, 0xE44C }, { 0x8A8C, 0xBB78 }, { 0x8A8D, 0xBB7B }, { 0x8A8F, 0xE44E },
+	{ 0x8A91, 0xBBA5 }, { 0x8A92, 0xE44D }, { 0x8A93, 0xBB7D }, { 0x8A95, 0xBDCF }, { 0x8A96, 0xE44F }, { 0x8A98, 0xBBA4 }, { 0x8A99, 0xE44B }, { 0x8A9A, 0xBBA6 },
+	{ 0x8A9E, 0xBB79 }, { 0x8AA0, 0xB8DB }, { 0x8AA1, 0xBB7C }, { 0x8AA3, 0xBB7A }, { 0x8AA4, 0xBB7E }, { 0x8AA5, 0xBBA2 }, { 0x8AA6, 0xBB77 }, { 0x8AA7, 0xBBA7 },
+	{ 0x8AA8, 0xBBA3 }, { 0x8AAA, 0xBBA1 }, { 0x8AAB, 0xE44A }, { 0x8AB0, 0xBDD6 }, { 0x8AB2, 0xBDD2 }, { 0x8AB6, 0xBDD9 }, { 0x8AB8, 0xE7D6 }, { 0x8AB9, 0xBDDA },
+	{ 0x8ABA, 0xE7E2 }, { 0x8ABB, 0xE7DB }, { 0x8ABC, 0xBDCB }, { 0x8ABD, 0xE7E3 }, { 0x8ABE, 0xE7DD }, { 0x8ABF, 0xBDD5 }, { 0x8AC0, 0xE7DE }, { 0x8AC2, 0xBDD4 },
+	{ 0x8AC3, 0xE7E1 }, { 0x8AC4, 0xBDCE }, { 0x8AC5, 0xE7DF }, { 0x8AC6, 0xE7D5 }, { 0x8AC7, 0xBDCD }, { 0x8AC8, 0xEBAA }, { 0x8AC9, 0xBDD3 }, { 0x8ACB, 0xBDD0 },
+	{ 0x8ACD, 0xBDD8 }, { 0x8ACF, 0xE7D4 }, { 0x8AD1, 0xE7D8 }, { 0x8AD2, 0xBDCC }, { 0x8AD3, 0xE7D7 }, { 0x8AD4, 0xE7D9 }, { 0x8AD5, 0xE7DA }, { 0x8AD6, 0xBDD7 },
+	{ 0x8AD7, 0xE7DC }, { 0x8AD8, 0xE7E0 }, { 0x8AD9, 0xE7E4 }, { 0x8ADB, 0xBDDB }, { 0x8ADC, 0xBFD2 }, { 0x8ADD, 0xEBA5 }, { 0x8ADE, 0xEBAB }, { 0x8ADF, 0xEBA8 },
+	{ 0x8AE0, 0xEB7E }, { 0x8AE1, 0xEBAC }, { 0x8AE2, 0xEBA1 }, { 0x8AE4, 0xEBA7 }, { 0x8AE6, 0xBFCD }, { 0x8AE7, 0xBFD3 }, { 0x8AE8, 0xEBAD }, { 0x8AEB, 0xBFCF },
+	{ 0x8AED, 0xBFD9 }, { 0x8AEE, 0xBFD4 }, { 0x8AEF, 0xEBAF }, { 0x8AF0, 0xEBA9 }, { 0x8AF1, 0xBFD0 }, { 0x8AF2, 0xEBA2 }, { 0x8AF3, 0xBFDA }, { 0x8AF4, 0xEBA3 },
+	{ 0x8AF5, 0xEBA4 }, { 0x8AF6, 0xBFDB }, { 0x8AF7, 0xBFD8 }, { 0x8AF8, 0xBDD1 }, { 0x8AFA, 0xBFCE }, { 0x8AFB, 0xEBB0 }, { 0x8AFC, 0xBFDC }, { 0x8AFE, 0xBFD5 },
+	{ 0x8AFF, 0xEBAE }, { 0x8B00, 0xBFD1 }, { 0x8B01, 0xBFD6 }, { 0x8B02, 0xBFD7 }, { 0x8B04, 0xC1C3 }, { 0x8B05, 0xEEA4 }, { 0x8B06, 0xEEAD }, { 0x8B07, 0xEEAA },
+	{ 0x8B08, 0xEEAC }, { 0x8B0A, 0xC1C0 }, { 0x8B0B, 0xEEA5 }, { 0x8B0D, 0xEEAB }, { 0x8B0E, 0xC1BC }, { 0x8B0F, 0xEEA7 }, { 0x8B10, 0xC1C4 }, { 0x8B11, 0xEEA3 },
+	{ 0x8B12, 0xEEA8 }, { 0x8B13, 0xEEAF }, { 0x8B14, 0xEBA6 }, { 0x8B15, 0xEEA9 }, { 0x8B16, 0xEEA2 }, { 0x8B17, 0xC1BD }, { 0x8B18, 0xEEA1 }, { 0x8B19, 0xC1BE },
+	{ 0x8B1A, 0xEEB0 }, { 0x8B1B, 0xC1BF }, { 0x8B1C, 0xEEAE }, { 0x8B1D, 0xC1C2 }, { 0x8B1E, 0xEE7E }, { 0x8B20, 0xC1C1 }, { 0x8B22, 0xEEA6 }, { 0x8B23, 0xF0DC },
+	{ 0x8B24, 0xF0EA }, { 0x8B25, 0xF0E5 }, { 0x8B26, 0xF0E7 }, { 0x8B27, 0xF0DB }, { 0x8B28, 0xC2D3 }, { 0x8B2A, 0xF0DA }, { 0x8B2B, 0xC2D6 }, { 0x8B2C, 0xC2D5 },
+	{ 0x8B2E, 0xF0E9 }, { 0x8B2F, 0xF0E1 }, { 0x8B30, 0xF0DE }, { 0x8B31, 0xF0E4 }, { 0x8B33, 0xF0DD }, { 0x8B35, 0xF0DF }, { 0x8B36, 0xF0E8 }, { 0x8B37, 0xF0E6 },
+	{ 0x8B39, 0xC2D4 }, { 0x8B3A, 0xF0ED }, { 0x8B3B, 0xF0EB }, { 0x8B3C, 0xF0E2 }, { 0x8B3D, 0xF0EC }, { 0x8B3E, 0xF0E3 }, { 0x8B40, 0xF2F9 }, { 0x8B41, 0xC3CF },
+	{ 0x8B42, 0xF341 }, { 0x8B45, 0xF64F }, { 0x8B46, 0xC3D6 }, { 0x8B47, 0xF0E0 }, { 0x8B48, 0xF2F7 }, { 0x8B49, 0xC3D2 }, { 0x8B4A, 0xF2F8 }, { 0x8B4B, 0xF2FD },
+	{ 0x8B4E, 0xC3D4 }, { 0x8B4F, 0xC3D5 }, { 0x8B50, 0xF2F6 }, { 0x8B51, 0xF340 }, { 0x8B52, 0xF342 }, { 0x8B53, 0xF2FA }, { 0x8B54, 0xF2FC }, { 0x8B55, 0xF2FE },
+	{ 0x8B56, 0xF2FB }, { 0x8B57, 0xF343 }, { 0x8B58, 0xC3D1 }, { 0x8B59, 0xC3D7 }, { 0x8B5A, 0xC3D3 }, { 0x8B5C, 0xC3D0 }, { 0x8B5D, 0xF4D0 }, { 0x8B5F, 0xC4B7 },
+	{ 0x8B60, 0xF4CE }, { 0x8B63, 0xF4D2 }, { 0x8B65, 0xF4D3 }, { 0x8B66, 0xC4B5 }, { 0x8B67, 0xF4D4 }, { 0x8B68, 0xF4D1 }, { 0x8B6A, 0xF4CF }, { 0x8B6B, 0xC4B8 },
+	{ 0x8B6C, 0xC4B4 }, { 0x8B6D, 0xF4D5 }, { 0x8B6F, 0xC4B6 }, { 0x8B70, 0xC4B3 }, { 0x8B74, 0xC4FE }, { 0x8B77, 0xC540 }, { 0x8B78, 0xF64E }, { 0x8B79, 0xF64D },
+	{ 0x8B7A, 0xF650 }, { 0x8B7B, 0xF651 }, { 0x8B7D, 0xC541 }, { 0x8B7E, 0xF756 }, { 0x8B7F, 0xF75B }, { 0x8B80, 0xC5AA }, { 0x8B82, 0xF758 }, { 0x8B84, 0xF757 },
+	{ 0x8B85, 0xF75A }, { 0x8B86, 0xF759 }, { 0x8B88, 0xF843 }, { 0x8B8A, 0xC5DC }, { 0x8B8B, 0xF842 }, { 0x8B8C, 0xF840 }, { 0x8B8E, 0xF841 }, { 0x8B92, 0xC5FE },
+	{ 0x8B93, 0xC5FD }, { 0x8B94, 0xF8C1 }, { 0x8B95, 0xF8C2 }, { 0x8B96, 0xC640 }, { 0x8B98, 0xF94D }, { 0x8B99, 0xF94E }, { 0x8B9A, 0xC667 }, { 0x8B9C, 0xC66D },
+	{ 0x8B9E, 0xF9A9 }, { 0x8B9F, 0xF9C8 }, { 0x8C37, 0xA8A6 }, { 0x8C39, 0xD7CD }, { 0x8C3B, 0xD7CE }, { 0x8C3C, 0xE052 }, { 0x8C3D, 0xE450 }, { 0x8C3E, 0xE7E5 },
+	{ 0x8C3F, 0xC1C6 }, { 0x8C41, 0xC1C5 }, { 0x8C42, 0xF0EE }, { 0x8C43, 0xF344 }, { 0x8C45, 0xF844 }, { 0x8C46, 0xA8A7 }, { 0x8C47, 0xD3DE }, { 0x8C48, 0xB05A },
+	{ 0x8C49, 0xB361 }, { 0x8C4A, 0xE054 }, { 0x8C4B, 0xE053 }, { 0x8C4C, 0xBDDC }, { 0x8C4D, 0xE7E6 }, { 0x8C4E, 0xBDDD }, { 0x8C4F, 0xEEB1 }, { 0x8C50, 0xC2D7 },
+	{ 0x8C54, 0xC676 }, { 0x8C55, 0xA8A8 }, { 0x8C56, 0xCDCB }, { 0x8C57, 0xD3DF }, { 0x8C5A, 0xB362 }, { 0x8C5C, 0xD7CF }, { 0x8C5D, 0xD7D0 }, { 0x8C5F, 0xDBE5 },
+	{ 0x8C61, 0xB648 }, { 0x8C62, 0xB8E6 }, { 0x8C64, 0xE056 }, { 0x8C65, 0xE055 }, { 0x8C66, 0xE057 }, { 0x8C68, 0xE451 }, { 0x8C69, 0xE452 }, { 0x8C6A, 0xBBA8 },
+	{ 0x8C6B, 0xBFDD }, { 0x8C6C, 0xBDDE }, { 0x8C6D, 0xBFDE }, { 0x8C6F, 0xEEB5 }, { 0x8C70, 0xEEB2 }, { 0x8C71, 0xEEB4 }, { 0x8C72, 0xEEB3 }, { 0x8C73, 0xC1C7 },
+	{ 0x8C75, 0xF0EF }, { 0x8C76, 0xF346 }, { 0x8C77, 0xF345 }, { 0x8C78, 0xCBA4 }, { 0x8C79, 0xB05C }, { 0x8C7A, 0xB05B }, { 0x8C7B, 0xD3E0 }, { 0x8C7D, 0xD7D1 },
+	{ 0x8C80, 0xDBE7 }, { 0x8C81, 0xDBE6 }, { 0x8C82, 0xB649 }, { 0x8C84, 0xE059 }, { 0x8C85, 0xE05A }, { 0x8C86, 0xE058 }, { 0x8C89, 0xB8E8 }, { 0x8C8A, 0xB8E7 },
+	{ 0x8C8C, 0xBBAA }, { 0x8C8D, 0xBBA9 }, { 0x8C8F, 0xE7E7 }, { 0x8C90, 0xEBB3 }, { 0x8C91, 0xEBB1 }, { 0x8C92, 0xEBB2 }, { 0x8C93, 0xBFDF }, { 0x8C94, 0xEEB7 },
+	{ 0x8C95, 0xEEB6 }, { 0x8C97, 0xF0F2 }, { 0x8C98, 0xF0F1 }, { 0x8C99, 0xF0F0 }, { 0x8C9A, 0xF347 }, { 0x8C9C, 0xF9AA }, { 0x8C9D, 0xA8A9 }, { 0x8C9E, 0xAD73 },
+	{ 0x8CA0, 0xAD74 }, { 0x8CA1, 0xB05D }, { 0x8CA2, 0xB05E }, { 0x8CA3, 0xD3E2 }, { 0x8CA4, 0xD3E1 }, { 0x8CA5, 0xD7D2 }, { 0x8CA7, 0xB368 }, { 0x8CA8, 0xB366 },
+	{ 0x8CA9, 0xB363 }, { 0x8CAA, 0xB367 }, { 0x8CAB, 0xB365 }, { 0x8CAC, 0xB364 }, { 0x8CAF, 0xB64A }, { 0x8CB0, 0xDBEA }, { 0x8CB2, 0xB8ED }, { 0x8CB3, 0xB64C },
+	{ 0x8CB4, 0xB651 }, { 0x8CB5, 0xDBEC }, { 0x8CB6, 0xB653 }, { 0x8CB7, 0xB652 }, { 0x8CB8, 0xB655 }, { 0x8CB9, 0xDBEB }, { 0x8CBA, 0xDBE8 }, { 0x8CBB, 0xB64F },
+	{ 0x8CBC, 0xB64B }, { 0x8CBD, 0xB64D }, { 0x8CBE, 0xDBE9 }, { 0x8CBF, 0xB654 }, { 0x8CC0, 0xB650 }, { 0x8CC1, 0xB64E }, { 0x8CC2, 0xB8EF }, { 0x8CC3, 0xB8EE },
+	{ 0x8CC4, 0xB8EC }, { 0x8CC5, 0xB8F0 }, { 0x8CC7, 0xB8EA }, { 0x8CC8, 0xB8EB }, { 0x8CCA, 0xB8E9 }, { 0x8CCC, 0xE05B }, { 0x8CCF, 0xE454 }, { 0x8CD1, 0xBBAC },
+	{ 0x8CD2, 0xBBAD }, { 0x8CD3, 0xBBAB }, { 0x8CD5, 0xE453 }, { 0x8CD7, 0xE455 }, { 0x8CD9, 0xE7EA }, { 0x8CDA, 0xE7EC }, { 0x8CDC, 0xBDE7 }, { 0x8CDD, 0xE7ED },
+	{ 0x8CDE, 0xBDE0 }, { 0x8CDF, 0xE7E9 }, { 0x8CE0, 0xBDDF }, { 0x8CE1, 0xBDE9 }, { 0x8CE2, 0xBDE5 }, { 0x8CE3, 0xBDE6 }, { 0x8CE4, 0xBDE2 }, { 0x8CE5, 0xE7E8 },
+	{ 0x8CE6, 0xBDE1 }, { 0x8CE7, 0xE7EE }, { 0x8CE8, 0xE7EB }, { 0x8CEA, 0xBDE8 }, { 0x8CEC, 0xBDE3 }, { 0x8CED, 0xBDE4 }, { 0x8CEE, 0xEBB5 }, { 0x8CF0, 0xEBB7 },
+	{ 0x8CF1, 0xEBB6 }, { 0x8CF3, 0xEBB8 }, { 0x8CF4, 0xBFE0 }, { 0x8CF5, 0xEBB4 }, { 0x8CF8, 0xC1CB }, { 0x8CF9, 0xEEB8 }, { 0x8CFA, 0xC1C8 }, { 0x8CFB, 0xC1CC },
+	{ 0x8CFC, 0xC1CA }, { 0x8CFD, 0xC1C9 }, { 0x8CFE, 0xF0F3 }, { 0x8D00, 0xF0F6 }, { 0x8D02, 0xF0F5 }, { 0x8D04, 0xF0F4 }, { 0x8D05, 0xC2D8 }, { 0x8D06, 0xF348 },
+	{ 0x8D07, 0xF349 }, { 0x8D08, 0xC3D8 }, { 0x8D09, 0xF34A }, { 0x8D0A, 0xC3D9 }, { 0x8D0D, 0xC4BA }, { 0x8D0F, 0xC4B9 }, { 0x8D10, 0xF652 }, { 0x8D13, 0xC542 },
+	{ 0x8D14, 0xF653 }, { 0x8D15, 0xF75C }, { 0x8D16, 0xC5AB }, { 0x8D17, 0xC5AC }, { 0x8D19, 0xF845 }, { 0x8D1B, 0xC642 }, { 0x8D64, 0xA8AA }, { 0x8D66, 0xB36A },
+	{ 0x8D67, 0xB369 }, { 0x8D68, 0xE05C }, { 0x8D69, 0xE05D }, { 0x8D6B, 0xBBAE }, { 0x8D6C, 0xEBB9 }, { 0x8D6D, 0xBDEA }, { 0x8D6E, 0xEBBA }, { 0x8D6F, 0xEEB9 },
+	{ 0x8D70, 0xA8AB }, { 0x8D72, 0xD0B2 }, { 0x8D73, 0xAD76 }, { 0x8D74, 0xAD75 }, { 0x8D76, 0xD3E3 }, { 0x8D77, 0xB05F }, { 0x8D78, 0xD3E4 }, { 0x8D79, 0xD7D5 },
+	{ 0x8D7B, 0xD7D4 }, { 0x8D7D, 0xD7D3 }, { 0x8D80, 0xDBEE }, { 0x8D81, 0xB658 }, { 0x8D84, 0xDBED }, { 0x8D85, 0xB657 }, { 0x8D89, 0xDBEF }, { 0x8D8A, 0xB656 },
+	{ 0x8D8C, 0xE05F }, { 0x8D8D, 0xE062 }, { 0x8D8E, 0xE060 }, { 0x8D8F, 0xE061 }, { 0x8D90, 0xE065 }, { 0x8D91, 0xE05E }, { 0x8D92, 0xE066 }, { 0x8D93, 0xE063 },
+	{ 0x8D94, 0xE064 }, { 0x8D95, 0xBBB0 }, { 0x8D96, 0xE456 }, { 0x8D99, 0xBBAF }, { 0x8D9B, 0xE7F2 }, { 0x8D9C, 0xE7F0 }, { 0x8D9F, 0xBDEB }, { 0x8DA0, 0xE7EF },
+	{ 0x8DA1, 0xE7F1 }, { 0x8DA3, 0xBDEC }, { 0x8DA5, 0xEBBB }, { 0x8DA7, 0xEBBC }, { 0x8DA8, 0xC1CD }, { 0x8DAA, 0xF34C }, { 0x8DAB, 0xF34E }, { 0x8DAC, 0xF34B },
+	{ 0x8DAD, 0xF34D }, { 0x8DAE, 0xF4D6 }, { 0x8DAF, 0xF654 }, { 0x8DB2, 0xF96F }, { 0x8DB3, 0xA8AC }, { 0x8DB4, 0xAD77 }, { 0x8DB5, 0xD3E5 }, { 0x8DB6, 0xD3E7 },
+	{ 0x8DB7, 0xD3E6 }, { 0x8DB9, 0xD7D8 }, { 0x8DBA, 0xB36C }, { 0x8DBC, 0xD7D6 }, { 0x8DBE, 0xB36B }, { 0x8DBF, 0xD7D9 }, { 0x8DC1, 0xD7DA }, { 0x8DC2, 0xD7D7 },
+	{ 0x8DC5, 0xDBFB }, { 0x8DC6, 0xB660 }, { 0x8DC7, 0xDBF3 }, { 0x8DC8, 0xDBF9 }, { 0x8DCB, 0xB65B }, { 0x8DCC, 0xB65E }, { 0x8DCD, 0xDBF2 }, { 0x8DCE, 0xB659 },
+	{ 0x8DCF, 0xDBF6 }, { 0x8DD0, 0xE06C }, { 0x8DD1, 0xB65D }, { 0x8DD3, 0xDBF1 }, { 0x8DD5, 0xDBF7 }, { 0x8DD6, 0xDBF4 }, { 0x8DD7, 0xDBFA }, { 0x8DD8, 0xDBF0 },
+	{ 0x8DD9, 0xDBF8 }, { 0x8DDA, 0xB65C }, { 0x8DDB, 0xB65F }, { 0x8DDC, 0xDBF5 }, { 0x8DDD, 0xB65A }, { 0x8DDF, 0xB8F2 }, { 0x8DE0, 0xE068 }, { 0x8DE1, 0xB8F1 },
+	{ 0x8DE2, 0xE06F }, { 0x8DE3, 0xE06E }, { 0x8DE4, 0xB8F8 }, { 0x8DE6, 0xB8F9 }, { 0x8DE7, 0xE070 }, { 0x8DE8, 0xB8F3 }, { 0x8DE9, 0xE06D }, { 0x8DEA, 0xB8F7 },
+	{ 0x8DEB, 0xE072 }, { 0x8DEC, 0xE069 }, { 0x8DEE, 0xE06B }, { 0x8DEF, 0xB8F4 }, { 0x8DF0, 0xE067 }, { 0x8DF1, 0xE06A }, { 0x8DF2, 0xE071 }, { 0x8DF3, 0xB8F5 },
+	{ 0x8DF4, 0xE073 }, { 0x8DFA, 0xB8F6 }, { 0x8DFC, 0xBBB1 }, { 0x8DFD, 0xE45B }, { 0x8DFE, 0xE461 }, { 0x8DFF, 0xE459 }, { 0x8E00, 0xE462 }, { 0x8E02, 0xE458 },
+	{ 0x8E03, 0xE45D }, { 0x8E04, 0xE463 }, { 0x8E05, 0xE460 }, { 0x8E06, 0xE45F }, { 0x8E07, 0xE45E }, { 0x8E09, 0xE457 }, { 0x8E0A, 0xE45C }, { 0x8E0D, 0xE45A },
+	{ 0x8E0F, 0xBDF1 }, { 0x8E10, 0xBDEE }, { 0x8E11, 0xE7FB }, { 0x8E12, 0xE841 }, { 0x8E13, 0xE843 }, { 0x8E14, 0xE840 }, { 0x8E15, 0xE7F8 }, { 0x8E16, 0xE7FA },
+	{ 0x8E17, 0xE845 }, { 0x8E18, 0xE842 }, { 0x8E19, 0xE7FC }, { 0x8E1A, 0xE846 }, { 0x8E1B, 0xE7F9 }, { 0x8E1C, 0xE844 }, { 0x8E1D, 0xBDEF }, { 0x8E1E, 0xBDF5 },
+	{ 0x8E1F, 0xBDF3 }, { 0x8E20, 0xE7F3 }, { 0x8E21, 0xBDF4 }, { 0x8E22, 0xBDF0 }, { 0x8E23, 0xE7F4 }, { 0x8E24, 0xE7F6 }, { 0x8E25, 0xE7F5 }, { 0x8E26, 0xE7FD },
+	{ 0x8E27, 0xE7FE }, { 0x8E29, 0xBDF2 }, { 0x8E2B, 0xBDED }, { 0x8E2E, 0xE7F7 }, { 0x8E30, 0xEBC6 }, { 0x8E31, 0xBFE2 }, { 0x8E33, 0xEBBD }, { 0x8E34, 0xBFE3 },
+	{ 0x8E35, 0xBFE6 }, { 0x8E36, 0xEBC2 }, { 0x8E38, 0xEBBF }, { 0x8E39, 0xBFE5 }, { 0x8E3C, 0xEBC3 }, { 0x8E3D, 0xEBC4 }, { 0x8E3E, 0xEBBE }, { 0x8E3F, 0xEBC7 },
+	{ 0x8E40, 0xEBC0 }, { 0x8E41, 0xEBC5 }, { 0x8E42, 0xBFE4 }, { 0x8E44, 0xBFE1 }, { 0x8E45, 0xEBC1 }, { 0x8E47, 0xEEBF }, { 0x8E48, 0xC1D0 }, { 0x8E49, 0xC1CE },
+	{ 0x8E4A, 0xC1D1 }, { 0x8E4B, 0xC1CF }, { 0x8E4C, 0xEEBE }, { 0x8E4D, 0xEEBB }, { 0x8E4E, 0xEEBA }, { 0x8E50, 0xEEBD }, { 0x8E53, 0xEEBC }, { 0x8E54, 0xF145 },
+	{ 0x8E55, 0xC2DE }, { 0x8E56, 0xF0FB }, { 0x8E57, 0xF0FA }, { 0x8E59, 0xC2D9 }, { 0x8E5A, 0xF141 }, { 0x8E5B, 0xF140 }, { 0x8E5C, 0xF0F7 }, { 0x8E5D, 0xF143 },
+	{ 0x8E5E, 0xF0FC }, { 0x8E5F, 0xC2DD }, { 0x8E60, 0xF0F9 }, { 0x8E61, 0xF142 }, { 0x8E62, 0xF0F8 }, { 0x8E63, 0xC2DA }, { 0x8E64, 0xC2DC }, { 0x8E65, 0xF0FD },
+	{ 0x8E66, 0xC2DB }, { 0x8E67, 0xF0FE }, { 0x8E69, 0xF144 }, { 0x8E6A, 0xF352 }, { 0x8E6C, 0xC3DE }, { 0x8E6D, 0xF34F }, { 0x8E6F, 0xF353 }, { 0x8E72, 0xC3DB },
+	{ 0x8E73, 0xF351 }, { 0x8E74, 0xC3E0 }, { 0x8E76, 0xC3DD }, { 0x8E78, 0xF350 }, { 0x8E7A, 0xC3DF }, { 0x8E7B, 0xF354 }, { 0x8E7C, 0xC3DA }, { 0x8E81, 0xC4BC },
+	{ 0x8E82, 0xC4BE }, { 0x8E84, 0xF4D9 }, { 0x8E85, 0xC4BD }, { 0x8E86, 0xF4D7 }, { 0x8E87, 0xC3DC }, { 0x8E88, 0xF4D8 }, { 0x8E89, 0xC4BB }, { 0x8E8A, 0xC543 },
+	{ 0x8E8B, 0xC545 }, { 0x8E8C, 0xF656 }, { 0x8E8D, 0xC544 }, { 0x8E8E, 0xF655 }, { 0x8E90, 0xF761 }, { 0x8E91, 0xC5AD }, { 0x8E92, 0xF760 }, { 0x8E93, 0xC5AE },
+	{ 0x8E94, 0xF75E }, { 0x8E95, 0xF75D }, { 0x8E96, 0xF762 }, { 0x8E97, 0xF763 }, { 0x8E98, 0xF846 }, { 0x8E9A, 0xF75F }, { 0x8E9D, 0xF8C6 }, { 0x8E9E, 0xF8C3 },
+	{ 0x8E9F, 0xF8C4 }, { 0x8EA0, 0xF8C5 }, { 0x8EA1, 0xC65C }, { 0x8EA3, 0xF951 }, { 0x8EA4, 0xF950 }, { 0x8EA5, 0xF94F }, { 0x8EA6, 0xF970 }, { 0x8EA8, 0xF9BE },
+	{ 0x8EA9, 0xF9AB }, { 0x8EAA, 0xC66E }, { 0x8EAB, 0xA8AD }, { 0x8EAC, 0xB060 }, { 0x8EB2, 0xB8FA }, { 0x8EBA, 0xBDF6 }, { 0x8EBD, 0xEBC8 }, { 0x8EC0, 0xC2DF },
+	{ 0x8EC2, 0xF355 }, { 0x8EC9, 0xF9AC }, { 0x8ECA, 0xA8AE }, { 0x8ECB, 0xAAEE }, { 0x8ECC, 0xAD79 }, { 0x8ECD, 0xAD78 }, { 0x8ECF, 0xB063 }, { 0x8ED1, 0xD3E8 },
+	{ 0x8ED2, 0xB061 }, { 0x8ED3, 0xD3E9 }, { 0x8ED4, 0xB062 }, { 0x8ED7, 0xD7DF }, { 0x8ED8, 0xD7DB }, { 0x8EDB, 0xB36D }, { 0x8EDC, 0xD7DE }, { 0x8EDD, 0xD7DD },
+	{ 0x8EDE, 0xD7DC }, { 0x8EDF, 0xB36E }, { 0x8EE0, 0xD7E0 }, { 0x8EE1, 0xD7E1 }, { 0x8EE5, 0xDC43 }, { 0x8EE6, 0xDC41 }, { 0x8EE7, 0xDC45 }, { 0x8EE8, 0xDC46 },
+	{ 0x8EE9, 0xDC4C }, { 0x8EEB, 0xDC48 }, { 0x8EEC, 0xDC4A }, { 0x8EEE, 0xDC42 }, { 0x8EEF, 0xDBFC }, { 0x8EF1, 0xDC49 }, { 0x8EF4, 0xDC4B }, { 0x8EF5, 0xDC44 },
+	{ 0x8EF6, 0xDC47 }, { 0x8EF7, 0xDBFD }, { 0x8EF8, 0xB662 }, { 0x8EF9, 0xDC40 }, { 0x8EFA, 0xDBFE }, { 0x8EFB, 0xB661 }, { 0x8EFC, 0xB663 }, { 0x8EFE, 0xB8FD },
+	{ 0x8EFF, 0xE075 }, { 0x8F00, 0xE077 }, { 0x8F01, 0xE076 }, { 0x8F02, 0xE07B }, { 0x8F03, 0xB8FB }, { 0x8F05, 0xE078 }, { 0x8F06, 0xE074 }, { 0x8F07, 0xE079 },
+	{ 0x8F08, 0xE07A }, { 0x8F09, 0xB8FC }, { 0x8F0A, 0xB8FE }, { 0x8F0B, 0xE07C }, { 0x8F0D, 0xE467 }, { 0x8F0E, 0xE466 }, { 0x8F10, 0xE464 }, { 0x8F11, 0xE465 },
+	{ 0x8F12, 0xBBB3 }, { 0x8F13, 0xBBB5 }, { 0x8F14, 0xBBB2 }, { 0x8F15, 0xBBB4 }, { 0x8F16, 0xE84D }, { 0x8F17, 0xE84E }, { 0x8F18, 0xE849 }, { 0x8F1A, 0xE84A },
+	{ 0x8F1B, 0xBDF8 }, { 0x8F1C, 0xBDFD }, { 0x8F1D, 0xBDF7 }, { 0x8F1E, 0xBDFE }, { 0x8F1F, 0xBDF9 }, { 0x8F20, 0xE84B }, { 0x8F23, 0xE84C }, { 0x8F24, 0xE848 },
+	{ 0x8F25, 0xBE40 }, { 0x8F26, 0xBDFB }, { 0x8F29, 0xBDFA }, { 0x8F2A, 0xBDFC }, { 0x8F2C, 0xE847 }, { 0x8F2E, 0xEBCA }, { 0x8F2F, 0xBFE8 }, { 0x8F32, 0xEBCC },
+	{ 0x8F33, 0xBFEA }, { 0x8F34, 0xEBCF }, { 0x8F35, 0xEBCB }, { 0x8F36, 0xEBC9 }, { 0x8F37, 0xEBCE }, { 0x8F38, 0xBFE9 }, { 0x8F39, 0xEBCD }, { 0x8F3B, 0xBFE7 },
+	{ 0x8F3E, 0xC1D3 }, { 0x8F3F, 0xC1D6 }, { 0x8F40, 0xEEC1 }, { 0x8F42, 0xC1D4 }, { 0x8F43, 0xEEC0 }, { 0x8F44, 0xC1D2 }, { 0x8F45, 0xC1D5 }, { 0x8F46, 0xF146 },
+	{ 0x8F47, 0xF147 }, { 0x8F48, 0xF148 }, { 0x8F49, 0xC2E0 }, { 0x8F4B, 0xF149 }, { 0x8F4D, 0xC2E1 }, { 0x8F4E, 0xC3E2 }, { 0x8F4F, 0xF358 }, { 0x8F50, 0xF359 },
+	{ 0x8F51, 0xF357 }, { 0x8F52, 0xF356 }, { 0x8F53, 0xF35A }, { 0x8F54, 0xC3E1 }, { 0x8F55, 0xF4DD }, { 0x8F56, 0xF4DB }, { 0x8F57, 0xF4DC }, { 0x8F58, 0xF4DE },
+	{ 0x8F59, 0xF4DA }, { 0x8F5A, 0xF4DF }, { 0x8F5B, 0xF658 }, { 0x8F5D, 0xF659 }, { 0x8F5E, 0xF657 }, { 0x8F5F, 0xC546 }, { 0x8F60, 0xF764 }, { 0x8F61, 0xC5AF },
+	{ 0x8F62, 0xF765 }, { 0x8F63, 0xF848 }, { 0x8F64, 0xF847 }, { 0x8F9B, 0xA8AF }, { 0x8F9C, 0xB664 }, { 0x8F9F, 0xB940 }, { 0x8FA3, 0xBBB6 }, { 0x8FA6, 0xBFEC },
+	{ 0x8FA8, 0xBFEB }, { 0x8FAD, 0xC3E3 }, { 0x8FAE, 0xC47C }, { 0x8FAF, 0xC547 }, { 0x8FB0, 0xA8B0 }, { 0x8FB1, 0xB064 }, { 0x8FB2, 0xB941 }, { 0x8FB4, 0xF35B },
+	{ 0x8FBF, 0xCBA6 }, { 0x8FC2, 0xA8B1 }, { 0x8FC4, 0xA8B4 }, { 0x8FC5, 0xA8B3 }, { 0x8FC6, 0xA8B2 }, { 0x8FC9, 0xCBA5 }, { 0x8FCB, 0xCDCD }, { 0x8FCD, 0xCDCF },
+	{ 0x8FCE, 0xAAEF }, { 0x8FD1, 0xAAF1 }, { 0x8FD2, 0xCDCC }, { 0x8FD3, 0xCDCE }, { 0x8FD4, 0xAAF0 }, { 0x8FD5, 0xCDD1 }, { 0x8FD6, 0xCDD0 }, { 0x8FD7, 0xCDD2 },
+	{ 0x8FE0, 0xD0B6 }, { 0x8FE1, 0xD0B4 }, { 0x8FE2, 0xAD7C }, { 0x8FE3, 0xD0B3 }, { 0x8FE4, 0xADA3 }, { 0x8FE5, 0xAD7E }, { 0x8FE6, 0xAD7B }, { 0x8FE8, 0xADA4 },
+	{ 0x8FEA, 0xAD7D }, { 0x8FEB, 0xADA2 }, { 0x8FED, 0xADA1 }, { 0x8FEE, 0xD0B5 }, { 0x8FF0, 0xAD7A }, { 0x8FF4, 0xB06A }, { 0x8FF5, 0xD3EB }, { 0x8FF6, 0xD3F1 },
+	{ 0x8FF7, 0xB067 }, { 0x8FF8, 0xB06E }, { 0x8FFA, 0xB069 }, { 0x8FFB, 0xD3EE }, { 0x8FFC, 0xD3F0 }, { 0x8FFD, 0xB06C }, { 0x8FFE, 0xD3EA }, { 0x8FFF, 0xD3ED },
+	{ 0x9000, 0xB068 }, { 0x9001, 0xB065 }, { 0x9002, 0xD3EC }, { 0x9003, 0xB06B }, { 0x9004, 0xD3EF }, { 0x9005, 0xB06D }, { 0x9006, 0xB066 }, { 0x900B, 0xD7E3 },
+	{ 0x900C, 0xD7E6 }, { 0x900D, 0xB370 }, { 0x900F, 0xB37A }, { 0x9010, 0xB376 }, { 0x9011, 0xD7E4 }, { 0x9014, 0xB37E }, { 0x9015, 0xB377 }, { 0x9016, 0xB37C },
+	{ 0x9017, 0xB372 }, { 0x9019, 0xB36F }, { 0x901A, 0xB371 }, { 0x901B, 0xB37D }, { 0x901C, 0xD7E5 }, { 0x901D, 0xB375 }, { 0x901E, 0xB378 }, { 0x901F, 0xB374 },
+	{ 0x9020, 0xB379 }, { 0x9021, 0xD7E7 }, { 0x9022, 0xB37B }, { 0x9023, 0xB373 }, { 0x9024, 0xD7E2 }, { 0x902D, 0xDC4D }, { 0x902E, 0xB665 }, { 0x902F, 0xDC4F },
+	{ 0x9031, 0xB667 }, { 0x9032, 0xB669 }, { 0x9034, 0xDC4E }, { 0x9035, 0xB666 }, { 0x9036, 0xB66A }, { 0x9038, 0xB668 }, { 0x903C, 0xB947 }, { 0x903D, 0xE0A3 },
+	{ 0x903E, 0xB94F }, { 0x903F, 0xE07E }, { 0x9041, 0xB950 }, { 0x9042, 0xB945 }, { 0x9044, 0xE0A1 }, { 0x9047, 0xB94A }, { 0x9049, 0xE0A2 }, { 0x904A, 0xB943 },
+	{ 0x904B, 0xB942 }, { 0x904D, 0xB94D }, { 0x904E, 0xB94C }, { 0x904F, 0xB94B }, { 0x9050, 0xB949 }, { 0x9051, 0xB94E }, { 0x9052, 0xE07D }, { 0x9053, 0xB944 },
+	{ 0x9054, 0xB946 }, { 0x9055, 0xB948 }, { 0x9058, 0xBBB8 }, { 0x9059, 0xBBBB }, { 0x905B, 0xBBBF }, { 0x905C, 0xBBB9 }, { 0x905D, 0xBBBE }, { 0x905E, 0xBBBC },
+	{ 0x9060, 0xBBB7 }, { 0x9062, 0xBBBD }, { 0x9063, 0xBBBA }, { 0x9067, 0xE852 }, { 0x9068, 0xBE43 }, { 0x9069, 0xBE41 }, { 0x906B, 0xE853 }, { 0x906D, 0xBE44 },
+	{ 0x906E, 0xBE42 }, { 0x906F, 0xE851 }, { 0x9070, 0xE850 }, { 0x9072, 0xBFF0 }, { 0x9073, 0xE84F }, { 0x9074, 0xBFEE }, { 0x9075, 0xBFED }, { 0x9076, 0xEBD0 },
+	{ 0x9077, 0xBE45 }, { 0x9078, 0xBFEF }, { 0x9079, 0xEBD1 }, { 0x907A, 0xBFF2 }, { 0x907B, 0xEBD2 }, { 0x907C, 0xBFF1 }, { 0x907D, 0xC1D8 }, { 0x907E, 0xEEC3 },
+	{ 0x907F, 0xC1D7 }, { 0x9080, 0xC1DC }, { 0x9081, 0xC1DA }, { 0x9082, 0xC1DB }, { 0x9083, 0xC2E3 }, { 0x9084, 0xC1D9 }, { 0x9085, 0xEEC2 }, { 0x9086, 0xEBD3 },
+	{ 0x9087, 0xC2E2 }, { 0x9088, 0xC2E4 }, { 0x908A, 0xC3E4 }, { 0x908B, 0xC3E5 }, { 0x908D, 0xF4E0 }, { 0x908F, 0xC5DE }, { 0x9090, 0xC5DD }, { 0x9091, 0xA8B6 },
+	{ 0x9094, 0xCA55 }, { 0x9095, 0xB06F }, { 0x9097, 0xCA52 }, { 0x9098, 0xCA53 }, { 0x9099, 0xCA51 }, { 0x909B, 0xCA54 }, { 0x909E, 0xCBAA }, { 0x909F, 0xCBA7 },
+	{ 0x90A0, 0xCBAC }, { 0x90A1, 0xCBA8 }, { 0x90A2, 0xA8B7 }, { 0x90A3, 0xA8BA }, { 0x90A5, 0xCBA9 }, { 0x90A6, 0xA8B9 }, { 0x90A7, 0xCBAB }, { 0x90AA, 0xA8B8 },
+	{ 0x90AF, 0xCDD5 }, { 0x90B0, 0xCDD7 }, { 0x90B1, 0xAAF4 }, { 0x90B2, 0xCDD3 }, { 0x90B3, 0xCDD6 }, { 0x90B4, 0xCDD4 }, { 0x90B5, 0xAAF2 }, { 0x90B6, 0xAAF5 },
+	{ 0x90B8, 0xAAF3 }, { 0x90BD, 0xD0B8 }, { 0x90BE, 0xD0BC }, { 0x90BF, 0xD0B9 }, { 0x90C1, 0xADA7 }, { 0x90C3, 0xADA8 }, { 0x90C5, 0xD0BB }, { 0x90C7, 0xD0BD },
+	{ 0x90C8, 0xD0BF }, { 0x90CA, 0xADA5 }, { 0x90CB, 0xD0BE }, { 0x90CE, 0xADA6 }, { 0x90D4, 0xD7EE }, { 0x90D5, 0xD0BA }, { 0x90D6, 0xD3F2 }, { 0x90D7, 0xD3FB },
+	{ 0x90D8, 0xD3F9 }, { 0x90D9, 0xD3F4 }, { 0x90DA, 0xD3F5 }, { 0x90DB, 0xD3FA }, { 0x90DC, 0xD3FC }, { 0x90DD, 0xB071 }, { 0x90DF, 0xD3F7 }, { 0x90E0, 0xD3F3 },
+	{ 0x90E1, 0xB070 }, { 0x90E2, 0xB072 }, { 0x90E3, 0xD3F6 }, { 0x90E4, 0xD3FD }, { 0x90E5, 0xD3F8 }, { 0x90E8, 0xB3A1 }, { 0x90E9, 0xD7F1 }, { 0x90EA, 0xD7E9 },
+	{ 0x90EB, 0xD7EF }, { 0x90EC, 0xD7F0 }, { 0x90ED, 0xB3A2 }, { 0x90EF, 0xD7E8 }, { 0x90F0, 0xD7EA }, { 0x90F1, 0xD0B7 }, { 0x90F2, 0xD7EC }, { 0x90F3, 0xD7ED },
+	{ 0x90F4, 0xD7EB }, { 0x90F5, 0xB66C }, { 0x90F9, 0xDC56 }, { 0x90FA, 0xEBD4 }, { 0x90FB, 0xDC57 }, { 0x90FC, 0xDC54 }, { 0x90FD, 0xB3A3 }, { 0x90FE, 0xB66E },
+	{ 0x90FF, 0xDC53 }, { 0x9100, 0xDC59 }, { 0x9101, 0xDC58 }, { 0x9102, 0xB66B }, { 0x9103, 0xDC5C }, { 0x9104, 0xDC52 }, { 0x9105, 0xDC5B }, { 0x9106, 0xDC50 },
+	{ 0x9107, 0xDC5A }, { 0x9108, 0xDC55 }, { 0x9109, 0xB66D }, { 0x910B, 0xE0AA }, { 0x910D, 0xE0A5 }, { 0x910E, 0xE0AB }, { 0x910F, 0xE0A6 }, { 0x9110, 0xE0A4 },
+	{ 0x9111, 0xE0A7 }, { 0x9112, 0xB951 }, { 0x9114, 0xE0A9 }, { 0x9116, 0xE0A8 }, { 0x9117, 0xB952 }, { 0x9118, 0xBBC1 }, { 0x9119, 0xBBC0 }, { 0x911A, 0xE46E },
+	{ 0x911B, 0xE471 }, { 0x911C, 0xE469 }, { 0x911D, 0xE46D }, { 0x911E, 0xBBC2 }, { 0x911F, 0xE46C }, { 0x9120, 0xE46A }, { 0x9121, 0xE470 }, { 0x9122, 0xE46B },
+	{ 0x9123, 0xE468 }, { 0x9124, 0xE46F }, { 0x9126, 0xE859 }, { 0x9127, 0xBE48 }, { 0x9128, 0xF14A }, { 0x9129, 0xE856 }, { 0x912A, 0xE857 }, { 0x912B, 0xE855 },
+	{ 0x912C, 0xDC51 }, { 0x912D, 0xBE47 }, { 0x912E, 0xE85A }, { 0x912F, 0xE854 }, { 0x9130, 0xBE46 }, { 0x9131, 0xBE49 }, { 0x9132, 0xE858 }, { 0x9133, 0xEBD5 },
+	{ 0x9134, 0xBFF3 }, { 0x9135, 0xEBD6 }, { 0x9136, 0xEBD7 }, { 0x9138, 0xEEC4 }, { 0x9139, 0xC1DD }, { 0x913A, 0xF14B }, { 0x913B, 0xF14C }, { 0x913E, 0xF14D },
+	{ 0x913F, 0xF35D }, { 0x9140, 0xF35C }, { 0x9141, 0xF4E2 }, { 0x9143, 0xF4E1 }, { 0x9144, 0xF65B }, { 0x9145, 0xF65C }, { 0x9146, 0xF65A }, { 0x9147, 0xF766 },
+	{ 0x9148, 0xC5B0 }, { 0x9149, 0xA8BB }, { 0x914A, 0xADAA }, { 0x914B, 0xADA9 }, { 0x914C, 0xB075 }, { 0x914D, 0xB074 }, { 0x914E, 0xD440 }, { 0x914F, 0xD441 },
+	{ 0x9150, 0xD3FE }, { 0x9152, 0xB073 }, { 0x9153, 0xD7F5 }, { 0x9155, 0xD7F6 }, { 0x9156, 0xD7F2 }, { 0x9157, 0xB3A4 }, { 0x9158, 0xD7F3 }, { 0x915A, 0xD7F4 },
+	{ 0x915F, 0xDC5F }, { 0x9160, 0xDC61 }, { 0x9161, 0xDC5D }, { 0x9162, 0xDC60 }, { 0x9163, 0xB66F }, { 0x9164, 0xDC5E }, { 0x9165, 0xB670 }, { 0x9168, 0xDD73 },
+	{ 0x9169, 0xB955 }, { 0x916A, 0xB954 }, { 0x916C, 0xB953 }, { 0x916E, 0xE0AC }, { 0x916F, 0xE0AD }, { 0x9172, 0xE473 }, { 0x9173, 0xE475 }, { 0x9174, 0xBBC6 },
+	{ 0x9175, 0xBBC3 }, { 0x9177, 0xBBC5 }, { 0x9178, 0xBBC4 }, { 0x9179, 0xE474 }, { 0x917A, 0xE472 }, { 0x9180, 0xE861 }, { 0x9181, 0xE85E }, { 0x9182, 0xE85F },
+	{ 0x9183, 0xBE4D }, { 0x9184, 0xE860 }, { 0x9185, 0xE85B }, { 0x9186, 0xE85C }, { 0x9187, 0xBE4A }, { 0x9189, 0xBE4B }, { 0x918A, 0xE85D }, { 0x918B, 0xBE4C },
+	{ 0x918D, 0xEBDB }, { 0x918F, 0xEBDC }, { 0x9190, 0xEBD9 }, { 0x9191, 0xEBDA }, { 0x9192, 0xBFF4 }, { 0x9193, 0xEBD8 }, { 0x9199, 0xEEC8 }, { 0x919A, 0xEEC5 },
+	{ 0x919B, 0xEEC7 }, { 0x919C, 0xC1E0 }, { 0x919D, 0xEECB }, { 0x919E, 0xC1DF }, { 0x919F, 0xEEC9 }, { 0x91A0, 0xEECC }, { 0x91A1, 0xEECA }, { 0x91A2, 0xEEC6 },
+	{ 0x91A3, 0xC1DE }, { 0x91A5, 0xF14F }, { 0x91A7, 0xF150 }, { 0x91A8, 0xF14E }, { 0x91AA, 0xF152 }, { 0x91AB, 0xC2E5 }, { 0x91AC, 0xC2E6 }, { 0x91AD, 0xF35F },
+	{ 0x91AE, 0xC3E7 }, { 0x91AF, 0xF151 }, { 0x91B0, 0xF35E }, { 0x91B1, 0xC3E6 }, { 0x91B2, 0xF4E5 }, { 0x91B3, 0xF4E6 }, { 0x91B4, 0xC4BF }, { 0x91B5, 0xF4E4 },
+	{ 0x91B7, 0xF4E3 }, { 0x91B9, 0xF65D }, { 0x91BA, 0xC548 }, { 0x91BC, 0xF849 }, { 0x91BD, 0xF8C8 }, { 0x91BE, 0xF8C7 }, { 0x91C0, 0xC643 }, { 0x91C1, 0xC65D },
+	{ 0x91C2, 0xF8C9 }, { 0x91C3, 0xF971 }, { 0x91C5, 0xC66F }, { 0x91C6, 0xA8BC }, { 0x91C7, 0xAAF6 }, { 0x91C9, 0xB956 }, { 0x91CB, 0xC4C0 }, { 0x91CC, 0xA8BD },
+	{ 0x91CD, 0xADAB }, { 0x91CE, 0xB3A5 }, { 0x91CF, 0xB671 }, { 0x91D0, 0xC2E7 }, { 0x91D1, 0xAAF7 }, { 0x91D3, 0xD0C1 }, { 0x91D4, 0xD0C0 }, { 0x91D5, 0xD442 },
+	{ 0x91D7, 0xB078 }, { 0x91D8, 0xB076 }, { 0x91D9, 0xB07A }, { 0x91DA, 0xD444 }, { 0x91DC, 0xB079 }, { 0x91DD, 0xB077 }, { 0x91E2, 0xD443 }, { 0x91E3, 0xB3A8 },
+	{ 0x91E4, 0xD7FC }, { 0x91E6, 0xB3A7 }, { 0x91E7, 0xB3A9 }, { 0x91E8, 0xD842 }, { 0x91E9, 0xB3AB }, { 0x91EA, 0xD7FE }, { 0x91EB, 0xD840 }, { 0x91EC, 0xD7F7 },
+	{ 0x91ED, 0xB3AA }, { 0x91EE, 0xD843 }, { 0x91F1, 0xD7F9 }, { 0x91F3, 0xD7FA }, { 0x91F4, 0xD7F8 }, { 0x91F5, 0xB3A6 }, { 0x91F7, 0xD841 }, { 0x91F8, 0xD7FB },
+	{ 0x91F9, 0xD7FD }, { 0x91FD, 0xDC6D }, { 0x91FF, 0xDC6C }, { 0x9200, 0xDC6A }, { 0x9201, 0xDC62 }, { 0x9202, 0xDC71 }, { 0x9203, 0xDC65 }, { 0x9204, 0xDC6F },
+	{ 0x9205, 0xDC76 }, { 0x9206, 0xDC6E }, { 0x9207, 0xB679 }, { 0x9209, 0xB675 }, { 0x920A, 0xDC63 }, { 0x920C, 0xDC69 }, { 0x920D, 0xB677 }, { 0x920F, 0xDC68 },
+	{ 0x9210, 0xB678 }, { 0x9211, 0xB67A }, { 0x9212, 0xDC6B }, { 0x9214, 0xB672 }, { 0x9215, 0xB673 }, { 0x9216, 0xDC77 }, { 0x9217, 0xDC75 }, { 0x9219, 0xDC74 },
+	{ 0x921A, 0xDC66 }, { 0x921C, 0xDC72 }, { 0x921E, 0xB676 }, { 0x9223, 0xB674 }, { 0x9224, 0xDC73 }, { 0x9225, 0xDC64 }, { 0x9226, 0xDC67 }, { 0x9227, 0xDC70 },
+	{ 0x922D, 0xE4BA }, { 0x922E, 0xE0B7 }, { 0x9230, 0xE0B0 }, { 0x9231, 0xE0C3 }, { 0x9232, 0xE0CC }, { 0x9233, 0xE0B3 }, { 0x9234, 0xB961 }, { 0x9236, 0xE0C0 },
+	{ 0x9237, 0xB957 }, { 0x9238, 0xB959 }, { 0x9239, 0xB965 }, { 0x923A, 0xE0B1 }, { 0x923D, 0xB95A }, { 0x923E, 0xB95C }, { 0x923F, 0xB966 }, { 0x9240, 0xB95B },
+	{ 0x9245, 0xB964 }, { 0x9246, 0xE0B9 }, { 0x9248, 0xE0AE }, { 0x9249, 0xB962 }, { 0x924A, 0xE0B8 }, { 0x924B, 0xB95E }, { 0x924C, 0xE0CA }, { 0x924D, 0xB963 },
+	{ 0x924E, 0xE0C8 }, { 0x924F, 0xE0BC }, { 0x9250, 0xE0C6 }, { 0x9251, 0xB960 }, { 0x9252, 0xE0AF }, { 0x9253, 0xE0C9 }, { 0x9254, 0xE0C4 }, { 0x9256, 0xE0CB },
+	{ 0x9257, 0xB958 }, { 0x925A, 0xB967 }, { 0x925B, 0xB95D }, { 0x925E, 0xE0B5 }, { 0x9260, 0xE0BD }, { 0x9261, 0xE0C1 }, { 0x9263, 0xE0C5 }, { 0x9264, 0xB95F },
+	{ 0x9265, 0xE0B4 }, { 0x9266, 0xE0B2 }, { 0x9267, 0xE0BE }, { 0x926C, 0xE0BB }, { 0x926D, 0xE0BA }, { 0x926F, 0xE0BF }, { 0x9270, 0xE0C2 }, { 0x9272, 0xE0C7 },
+	{ 0x9276, 0xE478 }, { 0x9278, 0xBBC7 }, { 0x9279, 0xE4A4 }, { 0x927A, 0xE47A }, { 0x927B, 0xBBCC }, { 0x927C, 0xBBD0 }, { 0x927D, 0xE4AD }, { 0x927E, 0xE4B5 },
+	{ 0x927F, 0xE4A6 }, { 0x9280, 0xBBC8 }, { 0x9282, 0xE4AA }, { 0x9283, 0xE0B6 }, { 0x9285, 0xBBC9 }, { 0x9286, 0xE4B1 }, { 0x9287, 0xE4B6 }, { 0x9288, 0xE4AE },
+	{ 0x928A, 0xE4B0 }, { 0x928B, 0xE4B9 }, { 0x928C, 0xE4B2 }, { 0x928D, 0xE47E }, { 0x928E, 0xE4A9 }, { 0x9291, 0xBBD1 }, { 0x9293, 0xBBCD }, { 0x9294, 0xE47C },
+	{ 0x9295, 0xE4AB }, { 0x9296, 0xBBCB }, { 0x9297, 0xE4A5 }, { 0x9298, 0xBBCA }, { 0x9299, 0xE4B3 }, { 0x929A, 0xE4A2 }, { 0x929B, 0xE479 }, { 0x929C, 0xBBCE },
+	{ 0x929D, 0xE4B8 }, { 0x92A0, 0xE47B }, { 0x92A1, 0xE4AF }, { 0x92A2, 0xE4AC }, { 0x92A3, 0xE4A7 }, { 0x92A4, 0xE477 }, { 0x92A5, 0xE476 }, { 0x92A6, 0xE4A1 },
+	{ 0x92A7, 0xE4B4 }, { 0x92A8, 0xBBCF }, { 0x92A9, 0xE4B7 }, { 0x92AA, 0xE47D }, { 0x92AB, 0xE4A3 }, { 0x92AC, 0xBE52 }, { 0x92B2, 0xBE5A }, { 0x92B3, 0xBE55 },
+	{ 0x92B4, 0xE8A4 }, { 0x92B5, 0xE8A1 }, { 0x92B6, 0xE867 }, { 0x92B7, 0xBE50 }, { 0x92BB, 0xBE4F }, { 0x92BC, 0xBE56 }, { 0x92C0, 0xE865 }, { 0x92C1, 0xBE54 },
+	{ 0x92C2, 0xE871 }, { 0x92C3, 0xE863 }, { 0x92C4, 0xE864 }, { 0x92C5, 0xBE4E }, { 0x92C6, 0xE8A3 }, { 0x92C7, 0xBE58 }, { 0x92C8, 0xE874 }, { 0x92C9, 0xE879 },
+	{ 0x92CA, 0xE873 }, { 0x92CB, 0xEBEE }, { 0x92CC, 0xE86F }, { 0x92CD, 0xE877 }, { 0x92CE, 0xE875 }, { 0x92CF, 0xE868 }, { 0x92D0, 0xE862 }, { 0x92D1, 0xE87D },
+	{ 0x92D2, 0xBE57 }, { 0x92D3, 0xE87E }, { 0x92D5, 0xE878 }, { 0x92D7, 0xE86D }, { 0x92D8, 0xE86B }, { 0x92D9, 0xE866 }, { 0x92DD, 0xE86E }, { 0x92DE, 0xE87B },
+	{ 0x92DF, 0xE86A }, { 0x92E0, 0xE87A }, { 0x92E1, 0xE8A2 }, { 0x92E4, 0xBE53 }, { 0x92E6, 0xE876 }, { 0x92E7, 0xE87C }, { 0x92E8, 0xE872 }, { 0x92E9, 0xE86C },
+	{ 0x92EA, 0xBE51 }, { 0x92EE, 0xE4A8 }, { 0x92EF, 0xE870 }, { 0x92F0, 0xBE59 }, { 0x92F1, 0xE869 }, { 0x92F7, 0xEBF4 }, { 0x92F8, 0xBFF7 }, { 0x92F9, 0xEBF3 },
+	{ 0x92FA, 0xEBF0 }, { 0x92FB, 0xEC44 }, { 0x92FC, 0xBFFB }, { 0x92FE, 0xEC41 }, { 0x92FF, 0xEBF8 }, { 0x9300, 0xEC43 }, { 0x9301, 0xEBE9 }, { 0x9302, 0xEBF6 },
+	{ 0x9304, 0xBFFD }, { 0x9306, 0xEBE1 }, { 0x9308, 0xEBDF }, { 0x9309, 0xEC42 }, { 0x930B, 0xEC40 }, { 0x930C, 0xEBFE }, { 0x930D, 0xEBED }, { 0x930E, 0xEBEC },
+	{ 0x930F, 0xEBE2 }, { 0x9310, 0xC040 }, { 0x9312, 0xEBE8 }, { 0x9313, 0xEBF2 }, { 0x9314, 0xEBFD }, { 0x9315, 0xC043 }, { 0x9316, 0xEC45 }, { 0x9318, 0xC1E8 },
+	{ 0x9319, 0xC045 }, { 0x931A, 0xBFFE }, { 0x931B, 0xEBE6 }, { 0x931D, 0xEBEF }, { 0x931E, 0xEBDE }, { 0x931F, 0xEBE0 }, { 0x9320, 0xBFF5 }, { 0x9321, 0xC042 },
+	{ 0x9322, 0xBFFA }, { 0x9323, 0xEBE7 }, { 0x9324, 0xEBF7 }, { 0x9325, 0xEBF1 }, { 0x9326, 0xC041 }, { 0x9327, 0xEBDD }, { 0x9328, 0xC1E3 }, { 0x9329, 0xEBF9 },
+	{ 0x932A, 0xEBFC }, { 0x932B, 0xBFFC }, { 0x932D, 0xEBEB }, { 0x932E, 0xC044 }, { 0x932F, 0xBFF9 }, { 0x9333, 0xBFF8 }, { 0x9334, 0xEBF5 }, { 0x9335, 0xEBFB },
+	{ 0x9336, 0xBFF6 }, { 0x9338, 0xEBE4 }, { 0x9339, 0xEBFA }, { 0x933C, 0xEBE5 }, { 0x9346, 0xEBEA }, { 0x9347, 0xEED2 }, { 0x9349, 0xEED7 }, { 0x934A, 0xC1E5 },
+	{ 0x934B, 0xC1E7 }, { 0x934C, 0xEEDD }, { 0x934D, 0xC1E1 }, { 0x934E, 0xEEEC }, { 0x934F, 0xEEE3 }, { 0x9350, 0xEED8 }, { 0x9351, 0xEED9 }, { 0x9352, 0xEEE2 },
+	{ 0x9354, 0xC1EE }, { 0x9355, 0xEEE1 }, { 0x9356, 0xEED1 }, { 0x9357, 0xEEE0 }, { 0x9358, 0xEED4 }, { 0x9359, 0xEEED }, { 0x935A, 0xC1ED }, { 0x935B, 0xC1EB },
+	{ 0x935C, 0xEED5 }, { 0x935E, 0xEEE8 }, { 0x9360, 0xEEDA }, { 0x9361, 0xEEE7 }, { 0x9363, 0xEEE9 }, { 0x9364, 0xEED0 }, { 0x9365, 0xC1E6 }, { 0x9367, 0xEEEA },
+	{ 0x936A, 0xEEDE }, { 0x936C, 0xC1EA }, { 0x936D, 0xEEDB }, { 0x9370, 0xC1EC }, { 0x9371, 0xEEE4 }, { 0x9375, 0xC1E4 }, { 0x9376, 0xEED6 }, { 0x9377, 0xEEE5 },
+	{ 0x9379, 0xEEDF }, { 0x937A, 0xEBE3 }, { 0x937B, 0xEEE6 }, { 0x937C, 0xEED3 }, { 0x937E, 0xC1E9 }, { 0x9380, 0xEEEB }, { 0x9382, 0xC1E2 }, { 0x9383, 0xEECE },
+	{ 0x9388, 0xF160 }, { 0x9389, 0xF159 }, { 0x938A, 0xC2E9 }, { 0x938C, 0xF154 }, { 0x938D, 0xF163 }, { 0x938E, 0xF15B }, { 0x938F, 0xEEDC }, { 0x9391, 0xF165 },
+	{ 0x9392, 0xF155 }, { 0x9394, 0xC2E8 }, { 0x9395, 0xF15F }, { 0x9396, 0xC2EA }, { 0x9397, 0xC2F2 }, { 0x9398, 0xC2F0 }, { 0x9399, 0xF161 }, { 0x939A, 0xC2F1 },
+	{ 0x939B, 0xF157 }, { 0x939D, 0xF158 }, { 0x939E, 0xF15D }, { 0x939F, 0xF162 }, { 0x93A1, 0xEECD }, { 0x93A2, 0xC2EB }, { 0x93A3, 0xF16A }, { 0x93A4, 0xF167 },
+	{ 0x93A5, 0xF16B }, { 0x93A6, 0xF15E }, { 0x93A7, 0xF15A }, { 0x93A8, 0xF168 }, { 0x93A9, 0xF36A }, { 0x93AA, 0xF15C }, { 0x93AC, 0xC2EE }, { 0x93AE, 0xC2ED },
+	{ 0x93AF, 0xEECF }, { 0x93B0, 0xC2EF }, { 0x93B1, 0xF164 }, { 0x93B2, 0xF166 }, { 0x93B3, 0xC2EC }, { 0x93B4, 0xF169 }, { 0x93B5, 0xF153 }, { 0x93B7, 0xF156 },
+	{ 0x93C0, 0xF373 }, { 0x93C2, 0xF363 }, { 0x93C3, 0xC3EB }, { 0x93C4, 0xF371 }, { 0x93C7, 0xF361 }, { 0x93C8, 0xC3EC }, { 0x93CA, 0xF36C }, { 0x93CC, 0xF368 },
+	{ 0x93CD, 0xC3F1 }, { 0x93CE, 0xF372 }, { 0x93CF, 0xF362 }, { 0x93D0, 0xF365 }, { 0x93D1, 0xC3E9 }, { 0x93D2, 0xF374 }, { 0x93D4, 0xF36D }, { 0x93D5, 0xF370 },
+	{ 0x93D6, 0xC3EF }, { 0x93D7, 0xC3F4 }, { 0x93D8, 0xC3F2 }, { 0x93D9, 0xF369 }, { 0x93DA, 0xF364 }, { 0x93DC, 0xC3ED }, { 0x93DD, 0xC3EE }, { 0x93DE, 0xF360 },
+	{ 0x93DF, 0xC3EA }, { 0x93E1, 0xC3E8 }, { 0x93E2, 0xC3F0 }, { 0x93E3, 0xF36F }, { 0x93E4, 0xC3F3 }, { 0x93E6, 0xF36B }, { 0x93E7, 0xF375 }, { 0x93E8, 0xC3F5 },
+	{ 0x93EC, 0xF367 }, { 0x93EE, 0xF36E }, { 0x93F5, 0xF4F3 }, { 0x93F6, 0xF542 }, { 0x93F7, 0xF4F5 }, { 0x93F8, 0xF4FC }, { 0x93F9, 0xF366 }, { 0x93FA, 0xF4FA },
+	{ 0x93FB, 0xF4E9 }, { 0x93FC, 0xF540 }, { 0x93FD, 0xC4C3 }, { 0x93FE, 0xF4ED }, { 0x93FF, 0xF4FE }, { 0x9400, 0xF4F4 }, { 0x9403, 0xC4C2 }, { 0x9406, 0xF544 },
+	{ 0x9407, 0xF4F6 }, { 0x9409, 0xF4FB }, { 0x940A, 0xF4FD }, { 0x940B, 0xF4E7 }, { 0x940C, 0xF541 }, { 0x940D, 0xF4F2 }, { 0x940E, 0xF4F7 }, { 0x940F, 0xF4EB },
+	{ 0x9410, 0xF4EF }, { 0x9411, 0xF543 }, { 0x9412, 0xF4F9 }, { 0x9413, 0xF4E8 }, { 0x9414, 0xF4EC }, { 0x9415, 0xF4EE }, { 0x9416, 0xF4F8 }, { 0x9418, 0xC4C1 },
+	{ 0x9419, 0xF4F1 }, { 0x9420, 0xF4EA }, { 0x9428, 0xF4F0 }, { 0x9429, 0xF661 }, { 0x942A, 0xF666 }, { 0x942B, 0xC54F }, { 0x942C, 0xF668 }, { 0x942E, 0xC549 },
+	{ 0x9430, 0xF664 }, { 0x9431, 0xF66A }, { 0x9432, 0xC54E }, { 0x9433, 0xC54A }, { 0x9435, 0xC54B }, { 0x9436, 0xF660 }, { 0x9437, 0xF667 }, { 0x9438, 0xC54D },
+	{ 0x9439, 0xF665 }, { 0x943A, 0xC54C }, { 0x943B, 0xF65F }, { 0x943C, 0xF663 }, { 0x943D, 0xF662 }, { 0x943F, 0xF65E }, { 0x9440, 0xF669 }, { 0x9444, 0xC5B1 },
+	{ 0x9445, 0xF76D }, { 0x9446, 0xF770 }, { 0x9447, 0xF76C }, { 0x9448, 0xF76E }, { 0x9449, 0xF76F }, { 0x944A, 0xF769 }, { 0x944B, 0xF76A }, { 0x944C, 0xF767 },
+	{ 0x944F, 0xF76B }, { 0x9450, 0xF768 }, { 0x9451, 0xC5B2 }, { 0x9452, 0xC5B3 }, { 0x9455, 0xF84B }, { 0x9457, 0xF84D }, { 0x945D, 0xF84C }, { 0x945E, 0xF84E },
+	{ 0x9460, 0xC5E0 }, { 0x9462, 0xF84A }, { 0x9463, 0xC5DF }, { 0x9464, 0xC5E1 }, { 0x9468, 0xF8CB }, { 0x9469, 0xF8CC }, { 0x946A, 0xC644 }, { 0x946B, 0xF8CA },
+	{ 0x946D, 0xF953 }, { 0x946E, 0xF952 }, { 0x946F, 0xF954 }, { 0x9470, 0xC65F }, { 0x9471, 0xF955 }, { 0x9472, 0xC65E }, { 0x9473, 0xF956 }, { 0x9474, 0xF972 },
+	{ 0x9475, 0xF975 }, { 0x9476, 0xF974 }, { 0x9477, 0xC668 }, { 0x9478, 0xF973 }, { 0x947C, 0xC672 }, { 0x947D, 0xC670 }, { 0x947E, 0xC671 }, { 0x947F, 0xC677 },
+	{ 0x9480, 0xF9C0 }, { 0x9481, 0xF9C1 }, { 0x9482, 0xF9BF }, { 0x9483, 0xF9C9 }, { 0x9577, 0xAAF8 }, { 0x957A, 0xD844 }, { 0x957B, 0xDC78 }, { 0x957C, 0xE8A5 },
+	{ 0x957D, 0xF376 }, { 0x9580, 0xAAF9 }, { 0x9582, 0xADAC }, { 0x9583, 0xB07B }, { 0x9586, 0xD845 }, { 0x9588, 0xD846 }, { 0x9589, 0xB3AC }, { 0x958B, 0xB67D },
+	{ 0x958C, 0xDC7A }, { 0x958D, 0xDC79 }, { 0x958E, 0xB6A3 }, { 0x958F, 0xB67C }, { 0x9590, 0xDC7B }, { 0x9591, 0xB67E }, { 0x9592, 0xB6A2 }, { 0x9593, 0xB6A1 },
+	{ 0x9594, 0xB67B }, { 0x9598, 0xB968 }, { 0x959B, 0xE0D0 }, { 0x959C, 0xE0CE }, { 0x959E, 0xE0CF }, { 0x959F, 0xE0CD }, { 0x95A1, 0xBBD2 }, { 0x95A3, 0xBBD5 },
+	{ 0x95A4, 0xBBD7 }, { 0x95A5, 0xBBD6 }, { 0x95A8, 0xBBD3 }, { 0x95A9, 0xBBD4 }, { 0x95AB, 0xE8A7 }, { 0x95AC, 0xE8A6 }, { 0x95AD, 0xBE5B }, { 0x95AE, 0xE8A8 },
+	{ 0x95B0, 0xE8A9 }, { 0x95B1, 0xBE5C }, { 0x95B5, 0xEC4D }, { 0x95B6, 0xEC4B }, { 0x95B7, 0xEEF3 }, { 0x95B9, 0xEC49 }, { 0x95BA, 0xEC4A }, { 0x95BB, 0xC046 },
+	{ 0x95BC, 0xEC46 }, { 0x95BD, 0xEC4E }, { 0x95BE, 0xEC48 }, { 0x95BF, 0xEC4C }, { 0x95C0, 0xEEEF }, { 0x95C3, 0xEEF1 }, { 0x95C5, 0xEEF2 }, { 0x95C6, 0xC1F3 },
+	{ 0x95C7, 0xEEEE }, { 0x95C8, 0xC1F2 }, { 0x95C9, 0xEEF0 }, { 0x95CA, 0xC1EF }, { 0x95CB, 0xC1F0 }, { 0x95CC, 0xC1F1 }, { 0x95CD, 0xEC47 }, { 0x95D0, 0xC2F5 },
+	{ 0x95D1, 0xF16E }, { 0x95D2, 0xF16C }, { 0x95D3, 0xF16D }, { 0x95D4, 0xC2F3 }, { 0x95D5, 0xC2F6 }, { 0x95D6, 0xC2F4 }, { 0x95DA, 0xF377 }, { 0x95DB, 0xF378 },
+	{ 0x95DC, 0xC3F6 }, { 0x95DE, 0xF545 }, { 0x95DF, 0xF547 }, { 0x95E0, 0xF546 }, { 0x95E1, 0xC4C4 }, { 0x95E2, 0xC550 }, { 0x95E3, 0xF66D }, { 0x95E4, 0xF66C },
+	{ 0x95E5, 0xF66B }, { 0x961C, 0xAAFA }, { 0x961E, 0xC9AA }, { 0x9620, 0xCA58 }, { 0x9621, 0xA6E9 }, { 0x9622, 0xCA56 }, { 0x9623, 0xCA59 }, { 0x9624, 0xCA57 },
+	{ 0x9628, 0xCBAE }, { 0x962A, 0xA8C1 }, { 0x962C, 0xA8C2 }, { 0x962D, 0xCBB0 }, { 0x962E, 0xA8BF }, { 0x962F, 0xCBAF }, { 0x9630, 0xCBAD }, { 0x9631, 0xA8C0 },
+	{ 0x9632, 0xA8BE }, { 0x9639, 0xCDD8 }, { 0x963A, 0xCDDB }, { 0x963B, 0xAAFD }, { 0x963C, 0xCDDA }, { 0x963D, 0xCDD9 }, { 0x963F, 0xAAFC }, { 0x9640, 0xAAFB },
+	{ 0x9642, 0xAB40 }, { 0x9643, 0xCDDC }, { 0x9644, 0xAAFE }, { 0x964A, 0xD0C6 }, { 0x964B, 0xADAE }, { 0x964C, 0xADAF }, { 0x964D, 0xADB0 }, { 0x964E, 0xD0C7 },
+	{ 0x964F, 0xD0C3 }, { 0x9650, 0xADAD }, { 0x9651, 0xD0C4 }, { 0x9653, 0xD0C5 }, { 0x9654, 0xD0C2 }, { 0x9658, 0xB0A4 }, { 0x965B, 0xB0A1 }, { 0x965C, 0xD445 },
+	{ 0x965D, 0xB0A2 }, { 0x965E, 0xB0A5 }, { 0x965F, 0xD446 }, { 0x9661, 0xB07E }, { 0x9662, 0xB07C }, { 0x9663, 0xB07D }, { 0x9664, 0xB0A3 }, { 0x966A, 0xB3AD },
+	{ 0x966B, 0xD849 }, { 0x966C, 0xB3B5 }, { 0x966D, 0xD848 }, { 0x966F, 0xD84B }, { 0x9670, 0xB3B1 }, { 0x9671, 0xD84A }, { 0x9672, 0xB6AB }, { 0x9673, 0xB3AF },
+	{ 0x9674, 0xB3B2 }, { 0x9675, 0xB3AE }, { 0x9676, 0xB3B3 }, { 0x9677, 0xB3B4 }, { 0x9678, 0xB3B0 }, { 0x967C, 0xD847 }, { 0x967D, 0xB6A7 }, { 0x967E, 0xDC7D },
+	{ 0x9680, 0xDCA3 }, { 0x9683, 0xDCA2 }, { 0x9684, 0xB6AC }, { 0x9685, 0xB6A8 }, { 0x9686, 0xB6A9 }, { 0x9687, 0xDC7C }, { 0x9688, 0xDC7E }, { 0x9689, 0xDCA1 },
+	{ 0x968A, 0xB6A4 }, { 0x968B, 0xB6A6 }, { 0x968D, 0xB6AA }, { 0x968E, 0xB6A5 }, { 0x9691, 0xE0D3 }, { 0x9692, 0xE0D1 }, { 0x9693, 0xE0D2 }, { 0x9694, 0xB96A },
+	{ 0x9695, 0xB96B }, { 0x9697, 0xE0D4 }, { 0x9698, 0xB969 }, { 0x9699, 0xBBD8 }, { 0x969B, 0xBBDA }, { 0x969C, 0xBBD9 }, { 0x969E, 0xE4BB }, { 0x96A1, 0xE4BC },
+	{ 0x96A2, 0xE8AB }, { 0x96A4, 0xE8AA }, { 0x96A7, 0xC047 }, { 0x96A8, 0xC048 }, { 0x96A9, 0xEC4F }, { 0x96AA, 0xC049 }, { 0x96AC, 0xEEF6 }, { 0x96AE, 0xEEF4 },
+	{ 0x96B0, 0xEEF5 }, { 0x96B1, 0xC1F4 }, { 0x96B3, 0xF16F }, { 0x96B4, 0xC3F7 }, { 0x96B8, 0xC1F5 }, { 0x96B9, 0xAB41 }, { 0x96BB, 0xB0A6 }, { 0x96BC, 0xD447 },
+	{ 0x96BF, 0xD84C }, { 0x96C0, 0xB3B6 }, { 0x96C1, 0xB6AD }, { 0x96C2, 0xDCA4 }, { 0x96C3, 0xDCA6 }, { 0x96C4, 0xB6AF }, { 0x96C5, 0xB6AE }, { 0x96C6, 0xB6B0 },
+	{ 0x96C7, 0xB6B1 }, { 0x96C8, 0xDCA5 }, { 0x96C9, 0xB96E }, { 0x96CA, 0xB96F }, { 0x96CB, 0xB96D }, { 0x96CC, 0xBBDB }, { 0x96CD, 0xB96C }, { 0x96CE, 0xE0D5 },
+	{ 0x96D2, 0xBBDC }, { 0x96D3, 0xE8AC }, { 0x96D4, 0xEC50 }, { 0x96D5, 0xC04A }, { 0x96D6, 0xC1F6 }, { 0x96D7, 0xF170 }, { 0x96D8, 0xF174 }, { 0x96D9, 0xC2F9 },
+	{ 0x96DA, 0xF171 }, { 0x96DB, 0xC2FA }, { 0x96DC, 0xC2F8 }, { 0x96DD, 0xF175 }, { 0x96DE, 0xC2FB }, { 0x96DF, 0xF173 }, { 0x96E1, 0xF379 }, { 0x96E2, 0xC2F7 },
+	{ 0x96E3, 0xC3F8 }, { 0x96E5, 0xF8CD }, { 0x96E8, 0xAB42 }, { 0x96E9, 0xB3B8 }, { 0x96EA, 0xB3B7 }, { 0x96EF, 0xB6B2 }, { 0x96F0, 0xDCA8 }, { 0x96F1, 0xDCA7 },
+	{ 0x96F2, 0xB6B3 }, { 0x96F5, 0xE0D9 }, { 0x96F6, 0xB973 }, { 0x96F7, 0xB970 }, { 0x96F8, 0xE0D8 }, { 0x96F9, 0xB972 }, { 0x96FA, 0xE0D6 }, { 0x96FB, 0xB971 },
+	{ 0x96FD, 0xE0D7 }, { 0x96FF, 0xE4BD }, { 0x9700, 0xBBDD }, { 0x9702, 0xE8AF }, { 0x9704, 0xBE5D }, { 0x9705, 0xE8AD }, { 0x9706, 0xBE5E }, { 0x9707, 0xBE5F },
+	{ 0x9708, 0xE8AE }, { 0x9709, 0xBE60 }, { 0x970B, 0xEC51 }, { 0x970D, 0xC04E }, { 0x970E, 0xC04B }, { 0x970F, 0xC050 }, { 0x9710, 0xEC53 }, { 0x9711, 0xC04C },
+	{ 0x9712, 0xEC52 }, { 0x9713, 0xC04F }, { 0x9716, 0xC04D }, { 0x9718, 0xEEF9 }, { 0x9719, 0xEEFB }, { 0x971C, 0xC1F7 }, { 0x971D, 0xEEFA }, { 0x971E, 0xC1F8 },
+	{ 0x971F, 0xEEF8 }, { 0x9720, 0xEEF7 }, { 0x9722, 0xF177 }, { 0x9723, 0xF176 }, { 0x9724, 0xC2FC }, { 0x9725, 0xF178 }, { 0x9726, 0xF37E }, { 0x9727, 0xC3FA },
+	{ 0x9728, 0xF37D }, { 0x9729, 0xF37A }, { 0x972A, 0xC3F9 }, { 0x972B, 0xF37B }, { 0x972C, 0xF37C }, { 0x972E, 0xF548 }, { 0x972F, 0xF549 }, { 0x9730, 0xC4C5 },
+	{ 0x9732, 0xC553 }, { 0x9735, 0xF66E }, { 0x9738, 0xC551 }, { 0x9739, 0xC552 }, { 0x973A, 0xF66F }, { 0x973D, 0xC5B4 }, { 0x973E, 0xC5B5 }, { 0x973F, 0xF771 },
+	{ 0x9742, 0xC645 }, { 0x9743, 0xF8CF }, { 0x9744, 0xC647 }, { 0x9746, 0xF8CE }, { 0x9747, 0xF8D0 }, { 0x9748, 0xC646 }, { 0x9749, 0xF957 }, { 0x974B, 0xF9AD },
+	{ 0x9752, 0xAB43 }, { 0x9756, 0xB974 }, { 0x9758, 0xE4BE }, { 0x975A, 0xE8B0 }, { 0x975B, 0xC051 }, { 0x975C, 0xC052 }, { 0x975E, 0xAB44 }, { 0x9760, 0xBE61 },
+	{ 0x9761, 0xC3FB }, { 0x9762, 0xADB1 }, { 0x9766, 0xC053 }, { 0x9768, 0xC5E2 }, { 0x9769, 0xADB2 }, { 0x976A, 0xD84D }, { 0x976C, 0xDCA9 }, { 0x976E, 0xDCAB },
+	{ 0x9770, 0xDCAA }, { 0x9772, 0xE0DD }, { 0x9773, 0xE0DA }, { 0x9774, 0xB975 }, { 0x9776, 0xB976 }, { 0x9777, 0xE0DB }, { 0x9778, 0xE0DC }, { 0x977A, 0xE4C0 },
+	{ 0x977B, 0xE4C5 }, { 0x977C, 0xBBDE }, { 0x977D, 0xE4BF }, { 0x977E, 0xE4C1 }, { 0x977F, 0xE4C8 }, { 0x9780, 0xE4C3 }, { 0x9781, 0xE4C7 }, { 0x9782, 0xE4C4 },
+	{ 0x9783, 0xE4C2 }, { 0x9784, 0xE4C6 }, { 0x9785, 0xBBDF }, { 0x9788, 0xE8B3 }, { 0x978A, 0xE8B1 }, { 0x978B, 0xBE63 }, { 0x978D, 0xBE62 }, { 0x978E, 0xE8B2 },
+	{ 0x978F, 0xBE64 }, { 0x9794, 0xEC56 }, { 0x9797, 0xEC55 }, { 0x9798, 0xC054 }, { 0x9799, 0xEC54 }, { 0x979A, 0xEEFC }, { 0x979C, 0xEEFE }, { 0x979D, 0xEF41 },
+	{ 0x979E, 0xEF40 }, { 0x97A0, 0xC1F9 }, { 0x97A1, 0xEEFD }, { 0x97A2, 0xF1A1 }, { 0x97A3, 0xC2FD }, { 0x97A4, 0xF17D }, { 0x97A5, 0xF1A2 }, { 0x97A6, 0xC2FE },
+	{ 0x97A8, 0xF17B }, { 0x97AA, 0xF17E }, { 0x97AB, 0xF17C }, { 0x97AC, 0xF179 }, { 0x97AD, 0xC340 }, { 0x97AE, 0xF17A }, { 0x97B3, 0xF3A1 }, { 0x97B6, 0xF3A3 },
+	{ 0x97B7, 0xF3A2 }, { 0x97B9, 0xF54A }, { 0x97BB, 0xF54B }, { 0x97BF, 0xF670 }, { 0x97C1, 0xC5B7 }, { 0x97C3, 0xC5B6 }, { 0x97C4, 0xF84F }, { 0x97C5, 0xF850 },
+	{ 0x97C6, 0xC648 }, { 0x97C7, 0xF8D1 }, { 0x97C9, 0xC669 }, { 0x97CB, 0xADB3 }, { 0x97CC, 0xB6B4 }, { 0x97CD, 0xE4CA }, { 0x97CE, 0xE4C9 }, { 0x97CF, 0xE8B5 },
+	{ 0x97D0, 0xE8B4 }, { 0x97D3, 0xC1FA }, { 0x97D4, 0xEF43 }, { 0x97D5, 0xEF42 }, { 0x97D6, 0xF1A5 }, { 0x97D7, 0xF1A3 }, { 0x97D8, 0xF1A6 }, { 0x97D9, 0xF1A4 },
+	{ 0x97DC, 0xC3FC }, { 0x97DD, 0xF3A4 }, { 0x97DE, 0xF3A5 }, { 0x97DF, 0xF3A6 }, { 0x97E1, 0xF671 }, { 0x97E3, 0xF772 }, { 0x97E5, 0xF8D2 }, { 0x97ED, 0xADB4 },
+	{ 0x97F0, 0xEC57 }, { 0x97F1, 0xEF44 }, { 0x97F3, 0xADB5 }, { 0x97F6, 0xBBE0 }, { 0x97F8, 0xEC58 }, { 0x97F9, 0xC341 }, { 0x97FA, 0xF1A7 }, { 0x97FB, 0xC3FD },
+	{ 0x97FD, 0xF54C }, { 0x97FE, 0xF54D }, { 0x97FF, 0xC554 }, { 0x9800, 0xF851 }, { 0x9801, 0xADB6 }, { 0x9802, 0xB3BB }, { 0x9803, 0xB3BC }, { 0x9804, 0xD84E },
+	{ 0x9805, 0xB6B5 }, { 0x9806, 0xB6B6 }, { 0x9807, 0xDCAC }, { 0x9808, 0xB6B7 }, { 0x980A, 0xB97A }, { 0x980C, 0xB97C }, { 0x980D, 0xE0DF }, { 0x980E, 0xE0E0 },
+	{ 0x980F, 0xE0DE }, { 0x9810, 0xB977 }, { 0x9811, 0xB978 }, { 0x9812, 0xB97B }, { 0x9813, 0xB979 }, { 0x9816, 0xE4CB }, { 0x9817, 0xBBE1 }, { 0x9818, 0xBBE2 },
+	{ 0x981B, 0xE8BC }, { 0x981C, 0xBE67 }, { 0x981D, 0xE8B7 }, { 0x981E, 0xE8B6 }, { 0x9820, 0xE8BB }, { 0x9821, 0xBE65 }, { 0x9824, 0xC05B }, { 0x9826, 0xE8B8 },
+	{ 0x9827, 0xE8BD }, { 0x9828, 0xE8BA }, { 0x9829, 0xE8B9 }, { 0x982B, 0xBE66 }, { 0x982D, 0xC059 }, { 0x982F, 0xEC5A }, { 0x9830, 0xC055 }, { 0x9832, 0xEC5B },
+	{ 0x9835, 0xEC59 }, { 0x9837, 0xC058 }, { 0x9838, 0xC056 }, { 0x9839, 0xC05A }, { 0x983B, 0xC057 }, { 0x9841, 0xEF45 }, { 0x9843, 0xEF4A }, { 0x9844, 0xEF46 },
+	{ 0x9845, 0xEF49 }, { 0x9846, 0xC1FB }, { 0x9848, 0xEDD4 }, { 0x9849, 0xEF48 }, { 0x984A, 0xEF47 }, { 0x984C, 0xC344 }, { 0x984D, 0xC342 }, { 0x984E, 0xC345 },
+	{ 0x984F, 0xC343 }, { 0x9850, 0xF1A8 }, { 0x9851, 0xF1A9 }, { 0x9852, 0xF1AA }, { 0x9853, 0xC346 }, { 0x9857, 0xF3AA }, { 0x9858, 0xC440 }, { 0x9859, 0xF3A8 },
+	{ 0x985B, 0xC441 }, { 0x985C, 0xF3A7 }, { 0x985D, 0xF3A9 }, { 0x985E, 0xC3FE }, { 0x985F, 0xF551 }, { 0x9860, 0xF54E }, { 0x9862, 0xF54F }, { 0x9863, 0xF550 },
+	{ 0x9864, 0xF672 }, { 0x9865, 0xC556 }, { 0x9867, 0xC555 }, { 0x9869, 0xF774 }, { 0x986A, 0xF773 }, { 0x986B, 0xC5B8 }, { 0x986F, 0xC5E3 }, { 0x9870, 0xC649 },
+	{ 0x9871, 0xC660 }, { 0x9872, 0xF958 }, { 0x9873, 0xF9AE }, { 0x9874, 0xF9AF }, { 0x98A8, 0xADB7 }, { 0x98A9, 0xDCAD }, { 0x98AC, 0xE0E1 }, { 0x98AD, 0xE4CC },
+	{ 0x98AE, 0xE4CD }, { 0x98AF, 0xBBE3 }, { 0x98B1, 0xBBE4 }, { 0x98B2, 0xE8BE }, { 0x98B3, 0xBE68 }, { 0x98B6, 0xC1FC }, { 0x98B8, 0xF1AB }, { 0x98BA, 0xC347 },
+	{ 0x98BB, 0xF3AD }, { 0x98BC, 0xC442 }, { 0x98BD, 0xF3AC }, { 0x98BE, 0xF3AE }, { 0x98BF, 0xF3AB }, { 0x98C0, 0xF675 }, { 0x98C1, 0xF552 }, { 0x98C2, 0xF553 },
+	{ 0x98C4, 0xC4C6 }, { 0x98C6, 0xF674 }, { 0x98C9, 0xF673 }, { 0x98CB, 0xF775 }, { 0x98CC, 0xF9B0 }, { 0x98DB, 0xADB8 }, { 0x98DF, 0xADB9 }, { 0x98E2, 0xB0A7 },
+	{ 0x98E3, 0xD448 }, { 0x98E5, 0xD84F }, { 0x98E7, 0xB6B8 }, { 0x98E9, 0xB6BB }, { 0x98EA, 0xB6B9 }, { 0x98EB, 0xDCAE }, { 0x98ED, 0xB6BD }, { 0x98EF, 0xB6BA },
+	{ 0x98F2, 0xB6BC }, { 0x98F4, 0xB97E }, { 0x98F6, 0xE0E2 }, { 0x98F9, 0xE0E3 }, { 0x98FA, 0xE8C0 }, { 0x98FC, 0xB97D }, { 0x98FD, 0xB9A1 }, { 0x98FE, 0xB9A2 },
+	{ 0x9900, 0xE4CF }, { 0x9902, 0xE4CE }, { 0x9903, 0xBBE5 }, { 0x9905, 0xBBE6 }, { 0x9907, 0xE4D0 }, { 0x9908, 0xE8BF }, { 0x9909, 0xBBE8 }, { 0x990A, 0xBE69 },
+	{ 0x990C, 0xBBE7 }, { 0x9910, 0xC05C }, { 0x9911, 0xE8C1 }, { 0x9912, 0xBE6B }, { 0x9913, 0xBE6A }, { 0x9914, 0xE8C2 }, { 0x9915, 0xE8C5 }, { 0x9916, 0xE8C3 },
+	{ 0x9917, 0xE8C4 }, { 0x9918, 0xBE6C }, { 0x991A, 0xC061 }, { 0x991B, 0xC05F }, { 0x991E, 0xC05E }, { 0x991F, 0xEC5D }, { 0x9921, 0xC060 }, { 0x9924, 0xEC5C },
+	{ 0x9925, 0xEF4B }, { 0x9927, 0xEC5E }, { 0x9928, 0xC05D }, { 0x9929, 0xEC5F }, { 0x992A, 0xEF4E }, { 0x992B, 0xEF4C }, { 0x992C, 0xEF4D }, { 0x992D, 0xEF52 },
+	{ 0x992E, 0xC34B }, { 0x992F, 0xEF51 }, { 0x9930, 0xEF54 }, { 0x9931, 0xEF53 }, { 0x9932, 0xEF50 }, { 0x9933, 0xEF4F }, { 0x9935, 0xC1FD }, { 0x993A, 0xF1AE },
+	{ 0x993C, 0xF1AD }, { 0x993D, 0xC34A }, { 0x993E, 0xC348 }, { 0x993F, 0xC349 }, { 0x9941, 0xF1AC }, { 0x9943, 0xF3B1 }, { 0x9945, 0xC443 }, { 0x9947, 0xF3B0 },
+	{ 0x9948, 0xF3AF }, { 0x9949, 0xC444 }, { 0x994B, 0xF558 }, { 0x994C, 0xF557 }, { 0x994E, 0xF555 }, { 0x9950, 0xF554 }, { 0x9951, 0xC4C8 }, { 0x9952, 0xC4C7 },
+	{ 0x9953, 0xF559 }, { 0x9954, 0xF776 }, { 0x9955, 0xC5B9 }, { 0x9956, 0xF677 }, { 0x9957, 0xC557 }, { 0x9958, 0xF676 }, { 0x9959, 0xF556 }, { 0x995B, 0xF777 },
+	{ 0x995C, 0xC5E4 }, { 0x995E, 0xC661 }, { 0x995F, 0xF959 }, { 0x9961, 0xF9B1 }, { 0x9996, 0xADBA }, { 0x9997, 0xD850 }, { 0x9998, 0xEF55 }, { 0x9999, 0xADBB },
+	{ 0x999C, 0xE4D2 }, { 0x999D, 0xE4D1 }, { 0x999E, 0xEC60 }, { 0x99A1, 0xEF57 }, { 0x99A3, 0xEF56 }, { 0x99A5, 0xC34C }, { 0x99A6, 0xF3B2 }, { 0x99A7, 0xF3B3 },
+	{ 0x99A8, 0xC4C9 }, { 0x99AB, 0xF9B2 }, { 0x99AC, 0xB0A8 }, { 0x99AD, 0xB6BF }, { 0x99AE, 0xB6BE }, { 0x99AF, 0xE0E4 }, { 0x99B0, 0xE0E6 }, { 0x99B1, 0xB9A4 },
+	{ 0x99B2, 0xE0E5 }, { 0x99B3, 0xB9A3 }, { 0x99B4, 0xB9A5 }, { 0x99B5, 0xE0E7 }, { 0x99B9, 0xE4D4 }, { 0x99BA, 0xE4D6 }, { 0x99BB, 0xE4D5 }, { 0x99BD, 0xE4D8 },
+	{ 0x99C1, 0xBBE9 }, { 0x99C2, 0xE4D7 }, { 0x99C3, 0xE4D3 }, { 0x99C7, 0xE4D9 }, { 0x99C9, 0xE8CC }, { 0x99CB, 0xE8CF }, { 0x99CC, 0xE8D1 }, { 0x99CD, 0xE8C7 },
+	{ 0x99CE, 0xE8CB }, { 0x99CF, 0xE8C8 }, { 0x99D0, 0xBE6E }, { 0x99D1, 0xBE71 }, { 0x99D2, 0xBE73 }, { 0x99D3, 0xE8C9 }, { 0x99D4, 0xE8CA }, { 0x99D5, 0xBE72 },
+	{ 0x99D6, 0xE8CD }, { 0x99D7, 0xE8D0 }, { 0x99D8, 0xE8CE }, { 0x99D9, 0xBE74 }, { 0x99DB, 0xBE70 }, { 0x99DC, 0xE8C6 }, { 0x99DD, 0xBE6D }, { 0x99DF, 0xBE6F },
+	{ 0x99E2, 0xC063 }, { 0x99E3, 0xEC66 }, { 0x99E4, 0xEC64 }, { 0x99E5, 0xEC63 }, { 0x99E7, 0xEC69 }, { 0x99E9, 0xEC68 }, { 0x99EA, 0xEC67 }, { 0x99EC, 0xEC62 },
+	{ 0x99ED, 0xC062 }, { 0x99EE, 0xEC61 }, { 0x99F0, 0xEC65 }, { 0x99F1, 0xC064 }, { 0x99F4, 0xEF5A }, { 0x99F6, 0xEF5E }, { 0x99F7, 0xEF5B }, { 0x99F8, 0xEF5D },
+	{ 0x99F9, 0xEF5C }, { 0x99FA, 0xEF59 }, { 0x99FB, 0xEF5F }, { 0x99FC, 0xEF62 }, { 0x99FD, 0xEF60 }, { 0x99FE, 0xEF61 }, { 0x99FF, 0xC240 }, { 0x9A01, 0xC1FE },
+	{ 0x9A02, 0xEF58 }, { 0x9A03, 0xEF63 }, { 0x9A04, 0xF1B3 }, { 0x9A05, 0xF1B6 }, { 0x9A06, 0xF1B8 }, { 0x9A07, 0xF1B7 }, { 0x9A09, 0xF1B1 }, { 0x9A0A, 0xF1B5 },
+	{ 0x9A0B, 0xF1B0 }, { 0x9A0D, 0xF1B2 }, { 0x9A0E, 0xC34D }, { 0x9A0F, 0xF1AF }, { 0x9A11, 0xF1B4 }, { 0x9A14, 0xF3C0 }, { 0x9A15, 0xF3B5 }, { 0x9A16, 0xC445 },
+	{ 0x9A19, 0xC446 }, { 0x9A1A, 0xF3B4 }, { 0x9A1B, 0xF3B9 }, { 0x9A1C, 0xF3BF }, { 0x9A1D, 0xF3B7 }, { 0x9A1E, 0xF3BE }, { 0x9A20, 0xF3BB }, { 0x9A22, 0xF3BA },
+	{ 0x9A23, 0xF3BD }, { 0x9A24, 0xF3B8 }, { 0x9A25, 0xF3B6 }, { 0x9A27, 0xF3BC }, { 0x9A29, 0xF560 }, { 0x9A2A, 0xF55E }, { 0x9A2B, 0xC4CA }, { 0x9A2C, 0xF55D },
+	{ 0x9A2D, 0xF563 }, { 0x9A2E, 0xF561 }, { 0x9A30, 0xC4CB }, { 0x9A31, 0xF55C }, { 0x9A32, 0xF55A }, { 0x9A34, 0xF55B }, { 0x9A35, 0xC4CD }, { 0x9A36, 0xF55F },
+	{ 0x9A37, 0xC4CC }, { 0x9A38, 0xF562 }, { 0x9A39, 0xF678 }, { 0x9A3A, 0xF67E }, { 0x9A3D, 0xF679 }, { 0x9A3E, 0xC55B }, { 0x9A3F, 0xF6A1 }, { 0x9A40, 0xC55A },
+	{ 0x9A41, 0xF67D }, { 0x9A42, 0xF67C }, { 0x9A43, 0xC559 }, { 0x9A44, 0xF67B }, { 0x9A45, 0xC558 }, { 0x9A46, 0xF67A }, { 0x9A48, 0xF77D }, { 0x9A49, 0xF7A1 },
+	{ 0x9A4A, 0xF77E }, { 0x9A4C, 0xF77B }, { 0x9A4D, 0xC5BB }, { 0x9A4E, 0xF778 }, { 0x9A4F, 0xF77C }, { 0x9A50, 0xF7A3 }, { 0x9A52, 0xF7A2 }, { 0x9A53, 0xF779 },
+	{ 0x9A54, 0xF77A }, { 0x9A55, 0xC5BA }, { 0x9A56, 0xF852 }, { 0x9A57, 0xC5E7 }, { 0x9A59, 0xF853 }, { 0x9A5A, 0xC5E5 }, { 0x9A5B, 0xC5E6 }, { 0x9A5E, 0xF8D3 },
+	{ 0x9A5F, 0xC64A }, { 0x9A60, 0xF976 }, { 0x9A62, 0xC66A }, { 0x9A64, 0xF9B3 }, { 0x9A65, 0xC66B }, { 0x9A66, 0xF9B4 }, { 0x9A67, 0xF9B5 }, { 0x9A68, 0xF9C3 },
+	{ 0x9A69, 0xF9C2 }, { 0x9A6A, 0xC67A }, { 0x9A6B, 0xF9CD }, { 0x9AA8, 0xB0A9 }, { 0x9AAB, 0xE0E9 }, { 0x9AAD, 0xE0E8 }, { 0x9AAF, 0xBBEA }, { 0x9AB0, 0xBBEB },
+	{ 0x9AB1, 0xE4DA }, { 0x9AB3, 0xE8D2 }, { 0x9AB4, 0xEC6C }, { 0x9AB7, 0xBE75 }, { 0x9AB8, 0xC065 }, { 0x9AB9, 0xEC6A }, { 0x9ABB, 0xEC6D }, { 0x9ABC, 0xC066 },
+	{ 0x9ABE, 0xEF64 }, { 0x9ABF, 0xEC6B }, { 0x9AC0, 0xF1B9 }, { 0x9AC1, 0xC34E }, { 0x9AC2, 0xF3C1 }, { 0x9AC6, 0xF566 }, { 0x9AC7, 0xF564 }, { 0x9ACA, 0xF565 },
+	{ 0x9ACD, 0xF6A2 }, { 0x9ACF, 0xC55C }, { 0x9AD0, 0xF7A4 }, { 0x9AD1, 0xC5EA }, { 0x9AD2, 0xC5BC }, { 0x9AD3, 0xC5E8 }, { 0x9AD4, 0xC5E9 }, { 0x9AD5, 0xF8D4 },
+	{ 0x9AD6, 0xC662 }, { 0x9AD8, 0xB0AA }, { 0x9ADC, 0xF1BA }, { 0x9ADF, 0xD449 }, { 0x9AE1, 0xB9A6 }, { 0x9AE3, 0xE4DB }, { 0x9AE6, 0xBBEC }, { 0x9AE7, 0xE4DC },
+	{ 0x9AEB, 0xE8D4 }, { 0x9AEC, 0xE8D3 }, { 0x9AED, 0xC068 }, { 0x9AEE, 0xBE76 }, { 0x9AEF, 0xBE77 }, { 0x9AF1, 0xE8D7 }, { 0x9AF2, 0xE8D6 }, { 0x9AF3, 0xE8D5 },
+	{ 0x9AF6, 0xEC6E }, { 0x9AF7, 0xEC71 }, { 0x9AF9, 0xEC70 }, { 0x9AFA, 0xEC6F }, { 0x9AFB, 0xC067 }, { 0x9AFC, 0xEF68 }, { 0x9AFD, 0xEF66 }, { 0x9AFE, 0xEF65 },
+	{ 0x9B01, 0xEF67 }, { 0x9B03, 0xC34F }, { 0x9B04, 0xF1BC }, { 0x9B05, 0xF1BD }, { 0x9B06, 0xC350 }, { 0x9B08, 0xF1BB }, { 0x9B0A, 0xF3C3 }, { 0x9B0B, 0xF3C2 },
+	{ 0x9B0C, 0xF3C5 }, { 0x9B0D, 0xC447 }, { 0x9B0E, 0xF3C4 }, { 0x9B10, 0xF567 }, { 0x9B11, 0xF569 }, { 0x9B12, 0xF568 }, { 0x9B15, 0xF6A3 }, { 0x9B16, 0xF6A6 },
+	{ 0x9B17, 0xF6A4 }, { 0x9B18, 0xF6A5 }, { 0x9B19, 0xF7A5 }, { 0x9B1A, 0xC5BD }, { 0x9B1E, 0xF854 }, { 0x9B1F, 0xF855 }, { 0x9B20, 0xF856 }, { 0x9B22, 0xC64B },
+	{ 0x9B23, 0xC663 }, { 0x9B24, 0xF9B6 }, { 0x9B25, 0xB0AB }, { 0x9B27, 0xBE78 }, { 0x9B28, 0xC069 }, { 0x9B29, 0xF1BE }, { 0x9B2B, 0xF7A6 }, { 0x9B2E, 0xF9C4 },
+	{ 0x9B2F, 0xD44A }, { 0x9B31, 0xC67B }, { 0x9B32, 0xB0AC }, { 0x9B33, 0xEC72 }, { 0x9B35, 0xF1BF }, { 0x9B37, 0xF3C6 }, { 0x9B3A, 0xF6A7 }, { 0x9B3B, 0xF7A7 },
+	{ 0x9B3C, 0xB0AD }, { 0x9B3E, 0xE4DD }, { 0x9B3F, 0xE4DE }, { 0x9B41, 0xBBED }, { 0x9B42, 0xBBEE }, { 0x9B43, 0xE8D9 }, { 0x9B44, 0xBE7A }, { 0x9B45, 0xBE79 },
+	{ 0x9B46, 0xE8D8 }, { 0x9B48, 0xEF69 }, { 0x9B4A, 0xF1C0 }, { 0x9B4B, 0xF1C2 }, { 0x9B4C, 0xF1C1 }, { 0x9B4D, 0xC353 }, { 0x9B4E, 0xC352 }, { 0x9B4F, 0xC351 },
+	{ 0x9B51, 0xC55E }, { 0x9B52, 0xF6A8 }, { 0x9B54, 0xC55D }, { 0x9B55, 0xF7A9 }, { 0x9B56, 0xF7A8 }, { 0x9B58, 0xC64C }, { 0x9B59, 0xF8D5 }, { 0x9B5A, 0xB3BD },
+	{ 0x9B5B, 0xE0EA }, { 0x9B5F, 0xE4E1 }, { 0x9B60, 0xE4DF }, { 0x9B61, 0xE4E0 }, { 0x9B64, 0xE8E2 }, { 0x9B66, 0xE8DD }, { 0x9B67, 0xE8DA }, { 0x9B68, 0xE8E1 },
+	{ 0x9B6C, 0xE8E3 }, { 0x9B6F, 0xBE7C }, { 0x9B70, 0xE8E0 }, { 0x9B71, 0xE8DC }, { 0x9B74, 0xE8DB }, { 0x9B75, 0xE8DF }, { 0x9B76, 0xE8DE }, { 0x9B77, 0xBE7B },
+	{ 0x9B7A, 0xEC7D }, { 0x9B7B, 0xEC78 }, { 0x9B7C, 0xEC76 }, { 0x9B7D, 0xECA1 }, { 0x9B7E, 0xEC77 }, { 0x9B80, 0xEC73 }, { 0x9B82, 0xEC79 }, { 0x9B85, 0xEC74 },
+	{ 0x9B86, 0xEF72 }, { 0x9B87, 0xEC75 }, { 0x9B88, 0xECA2 }, { 0x9B90, 0xEC7C }, { 0x9B91, 0xC06A }, { 0x9B92, 0xEC7B }, { 0x9B93, 0xEC7A }, { 0x9B95, 0xEC7E },
+	{ 0x9B9A, 0xEF6A }, { 0x9B9B, 0xEF6D }, { 0x9B9E, 0xEF6C }, { 0x9BA0, 0xEF74 }, { 0x9BA1, 0xEF6F }, { 0x9BA2, 0xEF73 }, { 0x9BA4, 0xEF71 }, { 0x9BA5, 0xEF70 },
+	{ 0x9BA6, 0xEF6E }, { 0x9BA8, 0xEF6B }, { 0x9BAA, 0xC243 }, { 0x9BAB, 0xC242 }, { 0x9BAD, 0xC244 }, { 0x9BAE, 0xC241 }, { 0x9BAF, 0xEF75 }, { 0x9BB5, 0xF1C8 },
+	{ 0x9BB6, 0xF1CB }, { 0x9BB8, 0xF1C9 }, { 0x9BB9, 0xF1CD }, { 0x9BBD, 0xF1CE }, { 0x9BBF, 0xF1C6 }, { 0x9BC0, 0xC358 }, { 0x9BC1, 0xF1C7 }, { 0x9BC3, 0xF1C5 },
+	{ 0x9BC4, 0xF1CC }, { 0x9BC6, 0xF1C4 }, { 0x9BC7, 0xF1C3 }, { 0x9BC8, 0xC357 }, { 0x9BC9, 0xC355 }, { 0x9BCA, 0xC354 }, { 0x9BD3, 0xF1CA }, { 0x9BD4, 0xF3CF },
+	{ 0x9BD5, 0xF3D5 }, { 0x9BD6, 0xC44A }, { 0x9BD7, 0xF3D0 }, { 0x9BD9, 0xF3D3 }, { 0x9BDA, 0xF3D7 }, { 0x9BDB, 0xC44B }, { 0x9BDC, 0xF3D2 }, { 0x9BDE, 0xF3CA },
+	{ 0x9BE0, 0xF3C9 }, { 0x9BE1, 0xF3D6 }, { 0x9BE2, 0xF3CD }, { 0x9BE4, 0xF3CB }, { 0x9BE5, 0xF3D4 }, { 0x9BE6, 0xF3CC }, { 0x9BE7, 0xC449 }, { 0x9BE8, 0xC448 },
+	{ 0x9BEA, 0xF3C7 }, { 0x9BEB, 0xF3C8 }, { 0x9BEC, 0xF3D1 }, { 0x9BF0, 0xF3CE }, { 0x9BF7, 0xF56C }, { 0x9BF8, 0xF56F }, { 0x9BFD, 0xC356 }, { 0x9C05, 0xF56D },
+	{ 0x9C06, 0xF573 }, { 0x9C07, 0xF571 }, { 0x9C08, 0xF56B }, { 0x9C09, 0xF576 }, { 0x9C0B, 0xF56A }, { 0x9C0D, 0xC4CF }, { 0x9C0E, 0xF572 }, { 0x9C12, 0xF56E },
+	{ 0x9C13, 0xC4CE }, { 0x9C14, 0xF575 }, { 0x9C17, 0xF574 }, { 0x9C1C, 0xF6AB }, { 0x9C1D, 0xF6AA }, { 0x9C21, 0xF6B1 }, { 0x9C23, 0xF6AD }, { 0x9C24, 0xF6B0 },
+	{ 0x9C25, 0xC560 }, { 0x9C28, 0xF6AE }, { 0x9C29, 0xF6AF }, { 0x9C2B, 0xF6A9 }, { 0x9C2C, 0xF6AC }, { 0x9C2D, 0xC55F }, { 0x9C31, 0xC5BF }, { 0x9C32, 0xF7B4 },
+	{ 0x9C33, 0xF7AF }, { 0x9C34, 0xF7B3 }, { 0x9C36, 0xF7B6 }, { 0x9C37, 0xF7B2 }, { 0x9C39, 0xF7AE }, { 0x9C3B, 0xC5C1 }, { 0x9C3C, 0xF7B1 }, { 0x9C3D, 0xF7B5 },
+	{ 0x9C3E, 0xC5C0 }, { 0x9C3F, 0xF7AC }, { 0x9C40, 0xF570 }, { 0x9C41, 0xF7B0 }, { 0x9C44, 0xF7AD }, { 0x9C46, 0xF7AA }, { 0x9C48, 0xF7AB }, { 0x9C49, 0xC5BE },
+	{ 0x9C4A, 0xF85A }, { 0x9C4B, 0xF85C }, { 0x9C4C, 0xF85F }, { 0x9C4D, 0xF85B }, { 0x9C4E, 0xF860 }, { 0x9C50, 0xF859 }, { 0x9C52, 0xF857 }, { 0x9C54, 0xC5EB },
+	{ 0x9C55, 0xF85D }, { 0x9C56, 0xC5ED }, { 0x9C57, 0xC5EC }, { 0x9C58, 0xF858 }, { 0x9C59, 0xF85E }, { 0x9C5E, 0xF8DA }, { 0x9C5F, 0xC64D }, { 0x9C60, 0xF8DB },
+	{ 0x9C62, 0xF8D9 }, { 0x9C63, 0xF8D6 }, { 0x9C66, 0xF8D8 }, { 0x9C67, 0xF8D7 }, { 0x9C68, 0xF95A }, { 0x9C6D, 0xF95C }, { 0x9C6E, 0xF95B }, { 0x9C71, 0xF979 },
+	{ 0x9C73, 0xF978 }, { 0x9C74, 0xF977 }, { 0x9C75, 0xF97A }, { 0x9C77, 0xC673 }, { 0x9C78, 0xC674 }, { 0x9C79, 0xF9CA }, { 0x9C7A, 0xF9CE }, { 0x9CE5, 0xB3BE },
+	{ 0x9CE6, 0xDCAF }, { 0x9CE7, 0xE0ED }, { 0x9CE9, 0xB9A7 }, { 0x9CEA, 0xE0EB }, { 0x9CED, 0xE0EC }, { 0x9CF1, 0xE4E2 }, { 0x9CF2, 0xE4E3 }, { 0x9CF3, 0xBBF1 },
+	{ 0x9CF4, 0xBBEF }, { 0x9CF5, 0xE4E4 }, { 0x9CF6, 0xBBF0 }, { 0x9CF7, 0xE8E8 }, { 0x9CF9, 0xE8EB }, { 0x9CFA, 0xE8E5 }, { 0x9CFB, 0xE8EC }, { 0x9CFC, 0xE8E4 },
+	{ 0x9CFD, 0xE8E6 }, { 0x9CFF, 0xE8E7 }, { 0x9D00, 0xE8EA }, { 0x9D03, 0xBEA1 }, { 0x9D04, 0xE8EF }, { 0x9D05, 0xE8EE }, { 0x9D06, 0xBE7D }, { 0x9D07, 0xE8E9 },
+	{ 0x9D08, 0xE8ED }, { 0x9D09, 0xBE7E }, { 0x9D10, 0xECAC }, { 0x9D12, 0xC06F }, { 0x9D14, 0xECA7 }, { 0x9D15, 0xC06B }, { 0x9D17, 0xECA4 }, { 0x9D18, 0xECAA },
+	{ 0x9D19, 0xECAD }, { 0x9D1B, 0xC070 }, { 0x9D1D, 0xECA9 }, { 0x9D1E, 0xECA6 }, { 0x9D1F, 0xECAE }, { 0x9D20, 0xECA5 }, { 0x9D22, 0xECAB }, { 0x9D23, 0xC06C },
+	{ 0x9D25, 0xECA3 }, { 0x9D26, 0xC06D }, { 0x9D28, 0xC06E }, { 0x9D29, 0xECA8 }, { 0x9D2D, 0xEFA9 }, { 0x9D2E, 0xEF7A }, { 0x9D2F, 0xEF7B }, { 0x9D30, 0xEF7E },
+	{ 0x9D31, 0xEF7C }, { 0x9D33, 0xEF76 }, { 0x9D36, 0xEF79 }, { 0x9D37, 0xEFA5 }, { 0x9D38, 0xEF7D }, { 0x9D3B, 0xC245 }, { 0x9D3D, 0xEFA7 }, { 0x9D3E, 0xEFA4 },
+	{ 0x9D3F, 0xC246 }, { 0x9D40, 0xEFA6 }, { 0x9D41, 0xEF77 }, { 0x9D42, 0xEFA2 }, { 0x9D43, 0xEFA3 }, { 0x9D45, 0xEFA1 }, { 0x9D4A, 0xF1D2 }, { 0x9D4B, 0xF1D4 },
+	{ 0x9D4C, 0xF1D7 }, { 0x9D4F, 0xF1D1 }, { 0x9D51, 0xC359 }, { 0x9D52, 0xF1D9 }, { 0x9D53, 0xF1D0 }, { 0x9D54, 0xF1DA }, { 0x9D56, 0xF1D6 }, { 0x9D57, 0xF1D8 },
+	{ 0x9D58, 0xF1DC }, { 0x9D59, 0xF1D5 }, { 0x9D5A, 0xF1DD }, { 0x9D5B, 0xF1D3 }, { 0x9D5C, 0xF1CF }, { 0x9D5D, 0xC35A }, { 0x9D5F, 0xF1DB }, { 0x9D60, 0xC35B },
+	{ 0x9D61, 0xC44D }, { 0x9D67, 0xEF78 }, { 0x9D68, 0xF3F1 }, { 0x9D69, 0xF3E8 }, { 0x9D6A, 0xC44F }, { 0x9D6B, 0xF3E4 }, { 0x9D6C, 0xC450 }, { 0x9D6F, 0xF3ED },
+	{ 0x9D70, 0xF3E7 }, { 0x9D71, 0xF3DD }, { 0x9D72, 0xC44E }, { 0x9D73, 0xF3EA }, { 0x9D74, 0xF3E5 }, { 0x9D75, 0xF3E6 }, { 0x9D77, 0xF3D8 }, { 0x9D78, 0xF3DF },
+	{ 0x9D79, 0xF3EE }, { 0x9D7B, 0xF3EB }, { 0x9D7D, 0xF3E3 }, { 0x9D7F, 0xF3EF }, { 0x9D80, 0xF3DE }, { 0x9D81, 0xF3D9 }, { 0x9D82, 0xF3EC }, { 0x9D84, 0xF3DB },
+	{ 0x9D85, 0xF3E9 }, { 0x9D86, 0xF3E0 }, { 0x9D87, 0xF3F0 }, { 0x9D88, 0xF3DC }, { 0x9D89, 0xC44C }, { 0x9D8A, 0xF3DA }, { 0x9D8B, 0xF3E1 }, { 0x9D8C, 0xF3E2 },
+	{ 0x9D90, 0xF57D }, { 0x9D92, 0xF57B }, { 0x9D94, 0xF5A2 }, { 0x9D96, 0xF5AE }, { 0x9D97, 0xF5A5 }, { 0x9D98, 0xF57C }, { 0x9D99, 0xF578 }, { 0x9D9A, 0xF5A7 },
+	{ 0x9D9B, 0xF57E }, { 0x9D9C, 0xF5A3 }, { 0x9D9D, 0xF57A }, { 0x9D9E, 0xF5AA }, { 0x9D9F, 0xF577 }, { 0x9DA0, 0xF5A1 }, { 0x9DA1, 0xF5A6 }, { 0x9DA2, 0xF5A8 },
+	{ 0x9DA3, 0xF5AB }, { 0x9DA4, 0xF579 }, { 0x9DA6, 0xF5AF }, { 0x9DA7, 0xF5B0 }, { 0x9DA8, 0xF5A9 }, { 0x9DA9, 0xF5AD }, { 0x9DAA, 0xF5A4 }, { 0x9DAC, 0xF6C1 },
+	{ 0x9DAD, 0xF6C4 }, { 0x9DAF, 0xC561 }, { 0x9DB1, 0xF6C3 }, { 0x9DB2, 0xF6C8 }, { 0x9DB3, 0xF6C6 }, { 0x9DB4, 0xC562 }, { 0x9DB5, 0xF6BD }, { 0x9DB6, 0xF6B3 },
+	{ 0x9DB7, 0xF6B2 }, { 0x9DB8, 0xC564 }, { 0x9DB9, 0xF6BF }, { 0x9DBA, 0xF6C0 }, { 0x9DBB, 0xF6BC }, { 0x9DBC, 0xF6B4 }, { 0x9DBE, 0xF6B9 }, { 0x9DBF, 0xF5AC },
+	{ 0x9DC1, 0xF6B5 }, { 0x9DC2, 0xC563 }, { 0x9DC3, 0xF6BB }, { 0x9DC5, 0xF6BA }, { 0x9DC7, 0xF6B6 }, { 0x9DC8, 0xF6C2 }, { 0x9DCA, 0xF6B7 }, { 0x9DCB, 0xF7BB },
+	{ 0x9DCC, 0xF6C5 }, { 0x9DCD, 0xF6C7 }, { 0x9DCE, 0xF6BE }, { 0x9DCF, 0xF6B8 }, { 0x9DD0, 0xF7BC }, { 0x9DD1, 0xF7BE }, { 0x9DD2, 0xF7B8 }, { 0x9DD3, 0xC5C2 },
+	{ 0x9DD5, 0xF7C5 }, { 0x9DD6, 0xF7C3 }, { 0x9DD7, 0xC5C3 }, { 0x9DD8, 0xF7C2 }, { 0x9DD9, 0xF7C1 }, { 0x9DDA, 0xF7BA }, { 0x9DDB, 0xF7B7 }, { 0x9DDC, 0xF7BD },
+	{ 0x9DDD, 0xF7C6 }, { 0x9DDE, 0xF7B9 }, { 0x9DDF, 0xF7BF }, { 0x9DE1, 0xF869 }, { 0x9DE2, 0xF86E }, { 0x9DE3, 0xF864 }, { 0x9DE4, 0xF867 }, { 0x9DE5, 0xC5EE },
+	{ 0x9DE6, 0xF86B }, { 0x9DE8, 0xF872 }, { 0x9DE9, 0xF7C0 }, { 0x9DEB, 0xF865 }, { 0x9DEC, 0xF86F }, { 0x9DED, 0xF873 }, { 0x9DEE, 0xF86A }, { 0x9DEF, 0xF863 },
+	{ 0x9DF0, 0xF86D }, { 0x9DF2, 0xF86C }, { 0x9DF3, 0xF871 }, { 0x9DF4, 0xF870 }, { 0x9DF5, 0xF7C4 }, { 0x9DF6, 0xF868 }, { 0x9DF7, 0xF862 }, { 0x9DF8, 0xF866 },
+	{ 0x9DF9, 0xC64E }, { 0x9DFA, 0xC64F }, { 0x9DFB, 0xF861 }, { 0x9DFD, 0xF8E6 }, { 0x9DFE, 0xF8DD }, { 0x9DFF, 0xF8E5 }, { 0x9E00, 0xF8E2 }, { 0x9E01, 0xF8E3 },
+	{ 0x9E02, 0xF8DC }, { 0x9E03, 0xF8DF }, { 0x9E04, 0xF8E7 }, { 0x9E05, 0xF8E1 }, { 0x9E06, 0xF8E0 }, { 0x9E07, 0xF8DE }, { 0x9E09, 0xF8E4 }, { 0x9E0B, 0xF95D },
+	{ 0x9E0D, 0xF95E }, { 0x9E0F, 0xF960 }, { 0x9E10, 0xF95F }, { 0x9E11, 0xF962 }, { 0x9E12, 0xF961 }, { 0x9E13, 0xF97C }, { 0x9E14, 0xF97B }, { 0x9E15, 0xF9B7 },
+	{ 0x9E17, 0xF9B8 }, { 0x9E19, 0xF9C5 }, { 0x9E1A, 0xC678 }, { 0x9E1B, 0xC67C }, { 0x9E1D, 0xF9CF }, { 0x9E1E, 0xC67D }, { 0x9E75, 0xB3BF }, { 0x9E79, 0xC4D0 },
+	{ 0x9E7A, 0xF6C9 }, { 0x9E7C, 0xC650 }, { 0x9E7D, 0xC651 }, { 0x9E7F, 0xB3C0 }, { 0x9E80, 0xE0EE }, { 0x9E82, 0xB9A8 }, { 0x9E83, 0xE8F0 }, { 0x9E86, 0xECB0 },
+	{ 0x9E87, 0xECB1 }, { 0x9E88, 0xECAF }, { 0x9E89, 0xEFAB }, { 0x9E8A, 0xEFAA }, { 0x9E8B, 0xC247 }, { 0x9E8C, 0xF1DF }, { 0x9E8D, 0xEFAC }, { 0x9E8E, 0xF1DE },
+	{ 0x9E91, 0xF3F3 }, { 0x9E92, 0xC451 }, { 0x9E93, 0xC453 }, { 0x9E94, 0xF3F2 }, { 0x9E97, 0xC452 }, { 0x9E99, 0xF5B1 }, { 0x9E9A, 0xF5B3 }, { 0x9E9B, 0xF5B2 },
+	{ 0x9E9C, 0xF6CA }, { 0x9E9D, 0xC565 }, { 0x9E9F, 0xC5EF }, { 0x9EA0, 0xF8E8 }, { 0x9EA1, 0xF963 }, { 0x9EA4, 0xF9D2 }, { 0x9EA5, 0xB3C1 }, { 0x9EA7, 0xE4E5 },
+	{ 0x9EA9, 0xBEA2 }, { 0x9EAD, 0xECB3 }, { 0x9EAE, 0xECB2 }, { 0x9EB0, 0xEFAD }, { 0x9EB4, 0xC454 }, { 0x9EB5, 0xC4D1 }, { 0x9EB6, 0xF7C7 }, { 0x9EB7, 0xF9CB },
+	{ 0x9EBB, 0xB3C2 }, { 0x9EBC, 0xBBF2 }, { 0x9EBE, 0xBEA3 }, { 0x9EC0, 0xF3F4 }, { 0x9EC2, 0xF874 }, { 0x9EC3, 0xB6C0 }, { 0x9EC8, 0xEFAE }, { 0x9ECC, 0xC664 },
+	{ 0x9ECD, 0xB6C1 }, { 0x9ECE, 0xBEA4 }, { 0x9ECF, 0xC248 }, { 0x9ED0, 0xF875 }, { 0x9ED1, 0xB6C2 }, { 0x9ED3, 0xE8F1 }, { 0x9ED4, 0xC072 }, { 0x9ED5, 0xECB4 },
+	{ 0x9ED6, 0xECB5 }, { 0x9ED8, 0xC071 }, { 0x9EDA, 0xEFAF }, { 0x9EDB, 0xC24C }, { 0x9EDC, 0xC24A }, { 0x9EDD, 0xC24B }, { 0x9EDE, 0xC249 }, { 0x9EDF, 0xF1E0 },
+	{ 0x9EE0, 0xC35C }, { 0x9EE4, 0xF5B5 }, { 0x9EE5, 0xF5B4 }, { 0x9EE6, 0xF5B7 }, { 0x9EE7, 0xF5B6 }, { 0x9EE8, 0xC4D2 }, { 0x9EEB, 0xF6CB }, { 0x9EED, 0xF6CD },
+	{ 0x9EEE, 0xF6CC }, { 0x9EEF, 0xC566 }, { 0x9EF0, 0xF7C8 }, { 0x9EF2, 0xF876 }, { 0x9EF3, 0xF877 }, { 0x9EF4, 0xC5F0 }, { 0x9EF5, 0xF964 }, { 0x9EF6, 0xF97D },
+	{ 0x9EF7, 0xC675 }, { 0x9EF9, 0xDCB0 }, { 0x9EFA, 0xECB6 }, { 0x9EFB, 0xEFB0 }, { 0x9EFC, 0xF3F5 }, { 0x9EFD, 0xE0EF }, { 0x9EFF, 0xEFB1 }, { 0x9F00, 0xF1E2 },
+	{ 0x9F01, 0xF1E1 }, { 0x9F06, 0xF878 }, { 0x9F07, 0xC652 }, { 0x9F09, 0xF965 }, { 0x9F0A, 0xF97E }, { 0x9F0E, 0xB9A9 }, { 0x9F0F, 0xE8F2 }, { 0x9F10, 0xE8F3 },
+	{ 0x9F12, 0xECB7 }, { 0x9F13, 0xB9AA }, { 0x9F15, 0xC35D }, { 0x9F16, 0xF1E3 }, { 0x9F18, 0xF6CF }, { 0x9F19, 0xC567 }, { 0x9F1A, 0xF6D0 }, { 0x9F1B, 0xF6CE },
+	{ 0x9F1C, 0xF879 }, { 0x9F1E, 0xF8E9 }, { 0x9F20, 0xB9AB }, { 0x9F22, 0xEFB4 }, { 0x9F23, 0xEFB3 }, { 0x9F24, 0xEFB2 }, { 0x9F25, 0xF1E4 }, { 0x9F28, 0xF1E8 },
+	{ 0x9F29, 0xF1E7 }, { 0x9F2A, 0xF1E6 }, { 0x9F2B, 0xF1E5 }, { 0x9F2C, 0xC35E }, { 0x9F2D, 0xF3F6 }, { 0x9F2E, 0xF5B9 }, { 0x9F2F, 0xC4D3 }, { 0x9F30, 0xF5B8 },
+	{ 0x9F31, 0xF6D1 }, { 0x9F32, 0xF7CB }, { 0x9F33, 0xF7CA }, { 0x9F34, 0xC5C4 }, { 0x9F35, 0xF7C9 }, { 0x9F36, 0xF87C }, { 0x9F37, 0xF87B }, { 0x9F38, 0xF87A },
+	{ 0x9F3B, 0xBBF3 }, { 0x9F3D, 0xECB8 }, { 0x9F3E, 0xC24D }, { 0x9F40, 0xF3F7 }, { 0x9F41, 0xF3F8 }, { 0x9F42, 0xF7CC }, { 0x9F43, 0xF87D }, { 0x9F46, 0xF8EA },
+	{ 0x9F47, 0xF966 }, { 0x9F48, 0xF9B9 }, { 0x9F49, 0xF9D4 }, { 0x9F4A, 0xBBF4 }, { 0x9F4B, 0xC24E }, { 0x9F4C, 0xF1E9 }, { 0x9F4D, 0xF3F9 }, { 0x9F4E, 0xF6D2 },
+	{ 0x9F4F, 0xF87E }, { 0x9F52, 0xBEA6 }, { 0x9F54, 0xEFB5 }, { 0x9F55, 0xF1EA }, { 0x9F56, 0xF3FA }, { 0x9F57, 0xF3FB }, { 0x9F58, 0xF3FC }, { 0x9F59, 0xF5BE },
+	{ 0x9F5B, 0xF5BA }, { 0x9F5C, 0xC568 }, { 0x9F5D, 0xF5BD }, { 0x9F5E, 0xF5BC }, { 0x9F5F, 0xC4D4 }, { 0x9F60, 0xF5BB }, { 0x9F61, 0xC4D6 }, { 0x9F63, 0xC4D5 },
+	{ 0x9F64, 0xF6D4 }, { 0x9F65, 0xF6D3 }, { 0x9F66, 0xC569 }, { 0x9F67, 0xC56A }, { 0x9F6A, 0xC5C6 }, { 0x9F6B, 0xF7CD }, { 0x9F6C, 0xC5C5 }, { 0x9F6E, 0xF8A3 },
+	{ 0x9F6F, 0xF8A4 }, { 0x9F70, 0xF8A2 }, { 0x9F71, 0xF8A1 }, { 0x9F72, 0xC654 }, { 0x9F74, 0xF8EB }, { 0x9F75, 0xF8EC }, { 0x9F76, 0xF8ED }, { 0x9F77, 0xC653 },
+	{ 0x9F78, 0xF967 }, { 0x9F79, 0xF96A }, { 0x9F7A, 0xF969 }, { 0x9F7B, 0xF968 }, { 0x9F7E, 0xF9D3 }, { 0x9F8D, 0xC073 }, { 0x9F90, 0xC365 }, { 0x9F91, 0xF5BF },
+	{ 0x9F92, 0xF6D5 }, { 0x9F94, 0xC5C7 }, { 0x9F95, 0xF7CE }, { 0x9F98, 0xF9D5 }, { 0x9F9C, 0xC074 }, { 0x9FA0, 0xEFB6 }, { 0x9FA2, 0xF7CF }, { 0x9FA4, 0xF9A1 },
+	{ 0xF880, 0x0081 }, { 0xF881, 0x0082 }, { 0xFA0C, 0xC94A }, { 0xFA0D, 0xDDFC }, { 0xFE30, 0xA14A }, { 0xFE31, 0xA157 }, { 0xFE33, 0xA159 }, { 0xFE34, 0xA15B },
+	{ 0xFE35, 0xA15F }, { 0xFE36, 0xA160 }, { 0xFE37, 0xA163 }, { 0xFE38, 0xA164 }, { 0xFE39, 0xA167 }, { 0xFE3A, 0xA168 }, { 0xFE3B, 0xA16B }, { 0xFE3C, 0xA16C },
+	{ 0xFE3D, 0xA16F }, { 0xFE3E, 0xA170 }, { 0xFE3F, 0xA173 }, { 0xFE40, 0xA174 }, { 0xFE41, 0xA177 }, { 0xFE42, 0xA178 }, { 0xFE43, 0xA17B }, { 0xFE44, 0xA17C },
+	{ 0xFE49, 0xA1C6 }, { 0xFE4A, 0xA1C7 }, { 0xFE4B, 0xA1CA }, { 0xFE4D, 0xA1C8 }, { 0xFE4E, 0xA1C9 }, { 0xFE4F, 0xA15C }, { 0xFE5F, 0xA1CC }, { 0xFE60, 0xA1CD },
+	{ 0xFE61, 0xA1CE }, { 0xFE62, 0xA1DE }, { 0xFE63, 0xA1DF }, { 0xFE64, 0xA1E0 }, { 0xFE65, 0xA1E1 }, { 0xFE66, 0xA1E2 }, { 0xFE69, 0xA24C }, { 0xFE6A, 0xA24D },
+	{ 0xFE6B, 0xA24E }, { 0xFF01, 0xA149 }, { 0xFF03, 0xA1AD }, { 0xFF04, 0xA243 }, { 0xFF05, 0xA248 }, { 0xFF06, 0xA1AE }, { 0xFF08, 0xA15D }, { 0xFF09, 0xA15E },
+	{ 0xFF0A, 0xA1AF }, { 0xFF0B, 0xA1CF }, { 0xFF0C, 0xA141 }, { 0xFF0D, 0xA1D0 }, { 0xFF0E, 0xA144 }, { 0xFF0F, 0xA241 }, { 0xFF10, 0xA2AF }, { 0xFF11, 0xA2B0 },
+	{ 0xFF12, 0xA2B1 }, { 0xFF13, 0xA2B2 }, { 0xFF14, 0xA2B3 }, { 0xFF15, 0xA2B4 }, { 0xFF16, 0xA2B5 }, { 0xFF17, 0xA2B6 }, { 0xFF18, 0xA2B7 }, { 0xFF19, 0xA2B8 },
+	{ 0xFF1A, 0xA147 }, { 0xFF1B, 0xA146 }, { 0xFF1C, 0xA1D5 }, { 0xFF1D, 0xA1D7 }, { 0xFF1E, 0xA1D6 }, { 0xFF1F, 0xA148 }, { 0xFF20, 0xA249 }, { 0xFF21, 0xA2CF },
+	{ 0xFF22, 0xA2D0 }, { 0xFF23, 0xA2D1 }, { 0xFF24, 0xA2D2 }, { 0xFF25, 0xA2D3 }, { 0xFF26, 0xA2D4 }, { 0xFF27, 0xA2D5 }, { 0xFF28, 0xA2D6 }, { 0xFF29, 0xA2D7 },
+	{ 0xFF2A, 0xA2D8 }, { 0xFF2B, 0xA2D9 }, { 0xFF2C, 0xA2DA }, { 0xFF2D, 0xA2DB }, { 0xFF2E, 0xA2DC }, { 0xFF2F, 0xA2DD }, { 0xFF30, 0xA2DE }, { 0xFF31, 0xA2DF },
+	{ 0xFF32, 0xA2E0 }, { 0xFF33, 0xA2E1 }, { 0xFF34, 0xA2E2 }, { 0xFF35, 0xA2E3 }, { 0xFF36, 0xA2E4 }, { 0xFF37, 0xA2E5 }, { 0xFF38, 0xA2E6 }, { 0xFF39, 0xA2E7 },
+	{ 0xFF3A, 0xA2E8 }, { 0xFF3C, 0xA242 }, { 0xFF3F, 0xA1C4 }, { 0xFF41, 0xA2E9 }, { 0xFF42, 0xA2EA }, { 0xFF43, 0xA2EB }, { 0xFF44, 0xA2EC }, { 0xFF45, 0xA2ED },
+	{ 0xFF46, 0xA2EE }, { 0xFF47, 0xA2EF }, { 0xFF48, 0xA2F0 }, { 0xFF49, 0xA2F1 }, { 0xFF4A, 0xA2F2 }, { 0xFF4B, 0xA2F3 }, { 0xFF4C, 0xA2F4 }, { 0xFF4D, 0xA2F5 },
+	{ 0xFF4E, 0xA2F6 }, { 0xFF4F, 0xA2F7 }, { 0xFF50, 0xA2F8 }, { 0xFF51, 0xA2F9 }, { 0xFF52, 0xA2FA }, { 0xFF53, 0xA2FB }, { 0xFF54, 0xA2FC }, { 0xFF55, 0xA2FD },
+	{ 0xFF56, 0xA2FE }, { 0xFF57, 0xA340 }, { 0xFF58, 0xA341 }, { 0xFF59, 0xA342 }, { 0xFF5A, 0xA343 }, { 0xFF5B, 0xA161 }, { 0xFF5C, 0xA155 }, { 0xFF5D, 0xA162 },
 };
 
 
diff --git a/Encodings/src/MacCyrillicEncoding.cpp b/Encodings/src/MacCyrillicEncoding.cpp
index 42a880f1f..b555ea80b 100644
--- a/Encodings/src/MacCyrillicEncoding.cpp
+++ b/Encodings/src/MacCyrillicEncoding.cpp
@@ -25,24 +25,24 @@ const char* MacCyrillicEncoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap MacCyrillicEncoding::_charMap = 
+const TextEncoding::CharacterMap MacCyrillicEncoding::_charMap =
 {
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
-	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 
-	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 
-	0x2020, 0x00B0, 0x0490, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x0406, 0x00AE, 0x00A9, 0x2122, 0x0402, 0x0452, 0x2260, 0x0403, 0x0453, 
-	0x221E, 0x00B1, 0x2264, 0x2265, 0x0456, 0x00B5, 0x0491, 0x0408, 0x0404, 0x0454, 0x0407, 0x0457, 0x0409, 0x0459, 0x040A, 0x045A, 
-	0x0458, 0x0405, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x040B, 0x045B, 0x040C, 0x045C, 0x0455, 
-	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x201E, 0x040E, 0x045E, 0x040F, 0x045F, 0x2116, 0x0401, 0x0451, 0x044F, 
-	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 
-	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x20AC, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1,
+	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+	0x2020, 0x00B0, 0x0490, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x0406, 0x00AE, 0x00A9, 0x2122, 0x0402, 0x0452, 0x2260, 0x0403, 0x0453,
+	0x221E, 0x00B1, 0x2264, 0x2265, 0x0456, 0x00B5, 0x0491, 0x0408, 0x0404, 0x0454, 0x0407, 0x0457, 0x0409, 0x0459, 0x040A, 0x045A,
+	0x0458, 0x0405, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x040B, 0x045B, 0x040C, 0x045C, 0x0455,
+	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x201E, 0x040E, 0x045E, 0x040F, 0x045F, 0x2116, 0x0401, 0x0451, 0x044F,
+	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x20AC,
 };
 
 
@@ -52,34 +52,34 @@ const DoubleByteEncoding::Mapping MacCyrillicEncoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping MacCyrillicEncoding::_reverseMappingTable[] = {
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00CA }, 
-	{ 0x00A3, 0x00A3 }, { 0x00A7, 0x00A4 }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00C7 }, { 0x00AC, 0x00C2 }, { 0x00AE, 0x00A8 }, { 0x00B0, 0x00A1 }, { 0x00B1, 0x00B1 }, 
-	{ 0x00B5, 0x00B5 }, { 0x00B6, 0x00A6 }, { 0x00BB, 0x00C8 }, { 0x00F7, 0x00D6 }, { 0x0192, 0x00C4 }, { 0x0401, 0x00DD }, { 0x0402, 0x00AB }, { 0x0403, 0x00AE }, 
-	{ 0x0404, 0x00B8 }, { 0x0405, 0x00C1 }, { 0x0406, 0x00A7 }, { 0x0407, 0x00BA }, { 0x0408, 0x00B7 }, { 0x0409, 0x00BC }, { 0x040A, 0x00BE }, { 0x040B, 0x00CB }, 
-	{ 0x040C, 0x00CD }, { 0x040E, 0x00D8 }, { 0x040F, 0x00DA }, { 0x0410, 0x0080 }, { 0x0411, 0x0081 }, { 0x0412, 0x0082 }, { 0x0413, 0x0083 }, { 0x0414, 0x0084 }, 
-	{ 0x0415, 0x0085 }, { 0x0416, 0x0086 }, { 0x0417, 0x0087 }, { 0x0418, 0x0088 }, { 0x0419, 0x0089 }, { 0x041A, 0x008A }, { 0x041B, 0x008B }, { 0x041C, 0x008C }, 
-	{ 0x041D, 0x008D }, { 0x041E, 0x008E }, { 0x041F, 0x008F }, { 0x0420, 0x0090 }, { 0x0421, 0x0091 }, { 0x0422, 0x0092 }, { 0x0423, 0x0093 }, { 0x0424, 0x0094 }, 
-	{ 0x0425, 0x0095 }, { 0x0426, 0x0096 }, { 0x0427, 0x0097 }, { 0x0428, 0x0098 }, { 0x0429, 0x0099 }, { 0x042A, 0x009A }, { 0x042B, 0x009B }, { 0x042C, 0x009C }, 
-	{ 0x042D, 0x009D }, { 0x042E, 0x009E }, { 0x042F, 0x009F }, { 0x0430, 0x00E0 }, { 0x0431, 0x00E1 }, { 0x0432, 0x00E2 }, { 0x0433, 0x00E3 }, { 0x0434, 0x00E4 }, 
-	{ 0x0435, 0x00E5 }, { 0x0436, 0x00E6 }, { 0x0437, 0x00E7 }, { 0x0438, 0x00E8 }, { 0x0439, 0x00E9 }, { 0x043A, 0x00EA }, { 0x043B, 0x00EB }, { 0x043C, 0x00EC }, 
-	{ 0x043D, 0x00ED }, { 0x043E, 0x00EE }, { 0x043F, 0x00EF }, { 0x0440, 0x00F0 }, { 0x0441, 0x00F1 }, { 0x0442, 0x00F2 }, { 0x0443, 0x00F3 }, { 0x0444, 0x00F4 }, 
-	{ 0x0445, 0x00F5 }, { 0x0446, 0x00F6 }, { 0x0447, 0x00F7 }, { 0x0448, 0x00F8 }, { 0x0449, 0x00F9 }, { 0x044A, 0x00FA }, { 0x044B, 0x00FB }, { 0x044C, 0x00FC }, 
-	{ 0x044D, 0x00FD }, { 0x044E, 0x00FE }, { 0x044F, 0x00DF }, { 0x0451, 0x00DE }, { 0x0452, 0x00AC }, { 0x0453, 0x00AF }, { 0x0454, 0x00B9 }, { 0x0455, 0x00CF }, 
-	{ 0x0456, 0x00B4 }, { 0x0457, 0x00BB }, { 0x0458, 0x00C0 }, { 0x0459, 0x00BD }, { 0x045A, 0x00BF }, { 0x045B, 0x00CC }, { 0x045C, 0x00CE }, { 0x045E, 0x00D9 }, 
-	{ 0x045F, 0x00DB }, { 0x0490, 0x00A2 }, { 0x0491, 0x00B6 }, { 0x2013, 0x00D0 }, { 0x2014, 0x00D1 }, { 0x2018, 0x00D4 }, { 0x2019, 0x00D5 }, { 0x201C, 0x00D2 }, 
-	{ 0x201D, 0x00D3 }, { 0x201E, 0x00D7 }, { 0x2020, 0x00A0 }, { 0x2022, 0x00A5 }, { 0x2026, 0x00C9 }, { 0x20AC, 0x00FF }, { 0x2116, 0x00DC }, { 0x2122, 0x00AA }, 
-	{ 0x2206, 0x00C6 }, { 0x221A, 0x00C3 }, { 0x221E, 0x00B0 }, { 0x2248, 0x00C5 }, { 0x2260, 0x00AD }, { 0x2264, 0x00B2 }, { 0x2265, 0x00B3 }, 
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00CA },
+	{ 0x00A3, 0x00A3 }, { 0x00A7, 0x00A4 }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00C7 }, { 0x00AC, 0x00C2 }, { 0x00AE, 0x00A8 }, { 0x00B0, 0x00A1 }, { 0x00B1, 0x00B1 },
+	{ 0x00B5, 0x00B5 }, { 0x00B6, 0x00A6 }, { 0x00BB, 0x00C8 }, { 0x00F7, 0x00D6 }, { 0x0192, 0x00C4 }, { 0x0401, 0x00DD }, { 0x0402, 0x00AB }, { 0x0403, 0x00AE },
+	{ 0x0404, 0x00B8 }, { 0x0405, 0x00C1 }, { 0x0406, 0x00A7 }, { 0x0407, 0x00BA }, { 0x0408, 0x00B7 }, { 0x0409, 0x00BC }, { 0x040A, 0x00BE }, { 0x040B, 0x00CB },
+	{ 0x040C, 0x00CD }, { 0x040E, 0x00D8 }, { 0x040F, 0x00DA }, { 0x0410, 0x0080 }, { 0x0411, 0x0081 }, { 0x0412, 0x0082 }, { 0x0413, 0x0083 }, { 0x0414, 0x0084 },
+	{ 0x0415, 0x0085 }, { 0x0416, 0x0086 }, { 0x0417, 0x0087 }, { 0x0418, 0x0088 }, { 0x0419, 0x0089 }, { 0x041A, 0x008A }, { 0x041B, 0x008B }, { 0x041C, 0x008C },
+	{ 0x041D, 0x008D }, { 0x041E, 0x008E }, { 0x041F, 0x008F }, { 0x0420, 0x0090 }, { 0x0421, 0x0091 }, { 0x0422, 0x0092 }, { 0x0423, 0x0093 }, { 0x0424, 0x0094 },
+	{ 0x0425, 0x0095 }, { 0x0426, 0x0096 }, { 0x0427, 0x0097 }, { 0x0428, 0x0098 }, { 0x0429, 0x0099 }, { 0x042A, 0x009A }, { 0x042B, 0x009B }, { 0x042C, 0x009C },
+	{ 0x042D, 0x009D }, { 0x042E, 0x009E }, { 0x042F, 0x009F }, { 0x0430, 0x00E0 }, { 0x0431, 0x00E1 }, { 0x0432, 0x00E2 }, { 0x0433, 0x00E3 }, { 0x0434, 0x00E4 },
+	{ 0x0435, 0x00E5 }, { 0x0436, 0x00E6 }, { 0x0437, 0x00E7 }, { 0x0438, 0x00E8 }, { 0x0439, 0x00E9 }, { 0x043A, 0x00EA }, { 0x043B, 0x00EB }, { 0x043C, 0x00EC },
+	{ 0x043D, 0x00ED }, { 0x043E, 0x00EE }, { 0x043F, 0x00EF }, { 0x0440, 0x00F0 }, { 0x0441, 0x00F1 }, { 0x0442, 0x00F2 }, { 0x0443, 0x00F3 }, { 0x0444, 0x00F4 },
+	{ 0x0445, 0x00F5 }, { 0x0446, 0x00F6 }, { 0x0447, 0x00F7 }, { 0x0448, 0x00F8 }, { 0x0449, 0x00F9 }, { 0x044A, 0x00FA }, { 0x044B, 0x00FB }, { 0x044C, 0x00FC },
+	{ 0x044D, 0x00FD }, { 0x044E, 0x00FE }, { 0x044F, 0x00DF }, { 0x0451, 0x00DE }, { 0x0452, 0x00AC }, { 0x0453, 0x00AF }, { 0x0454, 0x00B9 }, { 0x0455, 0x00CF },
+	{ 0x0456, 0x00B4 }, { 0x0457, 0x00BB }, { 0x0458, 0x00C0 }, { 0x0459, 0x00BD }, { 0x045A, 0x00BF }, { 0x045B, 0x00CC }, { 0x045C, 0x00CE }, { 0x045E, 0x00D9 },
+	{ 0x045F, 0x00DB }, { 0x0490, 0x00A2 }, { 0x0491, 0x00B6 }, { 0x2013, 0x00D0 }, { 0x2014, 0x00D1 }, { 0x2018, 0x00D4 }, { 0x2019, 0x00D5 }, { 0x201C, 0x00D2 },
+	{ 0x201D, 0x00D3 }, { 0x201E, 0x00D7 }, { 0x2020, 0x00A0 }, { 0x2022, 0x00A5 }, { 0x2026, 0x00C9 }, { 0x20AC, 0x00FF }, { 0x2116, 0x00DC }, { 0x2122, 0x00AA },
+	{ 0x2206, 0x00C6 }, { 0x221A, 0x00C3 }, { 0x221E, 0x00B0 }, { 0x2248, 0x00C5 }, { 0x2260, 0x00AD }, { 0x2264, 0x00B2 }, { 0x2265, 0x00B3 },
 };
 
 
diff --git a/Encodings/src/MacJapaneseEncoding.cpp b/Encodings/src/MacJapaneseEncoding.cpp
index f8ec55236..939417d97 100644
--- a/Encodings/src/MacJapaneseEncoding.cpp
+++ b/Encodings/src/MacJapaneseEncoding.cpp
@@ -25,1838 +25,1838 @@ const char* MacJapaneseEncoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap MacJapaneseEncoding::_charMap = 
+const TextEncoding::CharacterMap MacJapaneseEncoding::_charMap =
 {
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x00A5, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
-	0x005C,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	0x00A0, 0xFF61, 0xFF62, 0xFF63, 0xFF64, 0xFF65, 0xFF66, 0xFF67, 0xFF68, 0xFF69, 0xFF6A, 0xFF6B, 0xFF6C, 0xFF6D, 0xFF6E, 0xFF6F, 
-	0xFF70, 0xFF71, 0xFF72, 0xFF73, 0xFF74, 0xFF75, 0xFF76, 0xFF77, 0xFF78, 0xFF79, 0xFF7A, 0xFF7B, 0xFF7C, 0xFF7D, 0xFF7E, 0xFF7F, 
-	0xFF80, 0xFF81, 0xFF82, 0xFF83, 0xFF84, 0xFF85, 0xFF86, 0xFF87, 0xFF88, 0xFF89, 0xFF8A, 0xFF8B, 0xFF8C, 0xFF8D, 0xFF8E, 0xFF8F, 
-	0xFF90, 0xFF91, 0xFF92, 0xFF93, 0xFF94, 0xFF95, 0xFF96, 0xFF97, 0xFF98, 0xFF99, 0xFF9A, 0xFF9B, 0xFF9C, 0xFF9D, 0xFF9E, 0xFF9F, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 0x00A9, 0x2122,     -1, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x00A5, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1,
+	0x005C,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	0x00A0, 0xFF61, 0xFF62, 0xFF63, 0xFF64, 0xFF65, 0xFF66, 0xFF67, 0xFF68, 0xFF69, 0xFF6A, 0xFF6B, 0xFF6C, 0xFF6D, 0xFF6E, 0xFF6F,
+	0xFF70, 0xFF71, 0xFF72, 0xFF73, 0xFF74, 0xFF75, 0xFF76, 0xFF77, 0xFF78, 0xFF79, 0xFF7A, 0xFF7B, 0xFF7C, 0xFF7D, 0xFF7E, 0xFF7F,
+	0xFF80, 0xFF81, 0xFF82, 0xFF83, 0xFF84, 0xFF85, 0xFF86, 0xFF87, 0xFF88, 0xFF89, 0xFF8A, 0xFF8B, 0xFF8C, 0xFF8D, 0xFF8E, 0xFF8F,
+	0xFF90, 0xFF91, 0xFF92, 0xFF93, 0xFF94, 0xFF95, 0xFF96, 0xFF97, 0xFF98, 0xFF99, 0xFF9A, 0xFF9B, 0xFF9C, 0xFF9D, 0xFF9E, 0xFF9F,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 0x00A9, 0x2122,     -1,
 };
 
 
 const DoubleByteEncoding::Mapping MacJapaneseEncoding::_mappingTable[] = {
-	{ 0x8140, 0x3000 }, { 0x8141, 0x3001 }, { 0x8142, 0x3002 }, { 0x8143, 0xFF0C }, { 0x8144, 0xFF0E }, { 0x8145, 0x30FB }, { 0x8146, 0xFF1A }, { 0x8147, 0xFF1B }, 
-	{ 0x8148, 0xFF1F }, { 0x8149, 0xFF01 }, { 0x814A, 0x309B }, { 0x814B, 0x309C }, { 0x814C, 0x00B4 }, { 0x814D, 0xFF40 }, { 0x814E, 0x00A8 }, { 0x814F, 0xFF3E }, 
-	{ 0x8150, 0xFFE3 }, { 0x8151, 0xFF3F }, { 0x8152, 0x30FD }, { 0x8153, 0x30FE }, { 0x8154, 0x309D }, { 0x8155, 0x309E }, { 0x8156, 0x3003 }, { 0x8157, 0x4EDD }, 
-	{ 0x8158, 0x3005 }, { 0x8159, 0x3006 }, { 0x815A, 0x3007 }, { 0x815B, 0x30FC }, { 0x815C, 0x2014 }, { 0x815D, 0x2010 }, { 0x815E, 0xFF0F }, { 0x815F, 0xFF3C }, 
-	{ 0x8160, 0x301C }, { 0x8161, 0x2016 }, { 0x8162, 0xFF5C }, { 0x8163, 0x2026 }, { 0x8164, 0x2025 }, { 0x8165, 0x2018 }, { 0x8166, 0x2019 }, { 0x8167, 0x201C }, 
-	{ 0x8168, 0x201D }, { 0x8169, 0xFF08 }, { 0x816A, 0xFF09 }, { 0x816B, 0x3014 }, { 0x816C, 0x3015 }, { 0x816D, 0xFF3B }, { 0x816E, 0xFF3D }, { 0x816F, 0xFF5B }, 
-	{ 0x8170, 0xFF5D }, { 0x8171, 0x3008 }, { 0x8172, 0x3009 }, { 0x8173, 0x300A }, { 0x8174, 0x300B }, { 0x8175, 0x300C }, { 0x8176, 0x300D }, { 0x8177, 0x300E }, 
-	{ 0x8178, 0x300F }, { 0x8179, 0x3010 }, { 0x817A, 0x3011 }, { 0x817B, 0xFF0B }, { 0x817C, 0x2212 }, { 0x817D, 0x00B1 }, { 0x817E, 0x00D7 }, { 0x8180, 0x00F7 }, 
-	{ 0x8181, 0xFF1D }, { 0x8182, 0x2260 }, { 0x8183, 0xFF1C }, { 0x8184, 0xFF1E }, { 0x8185, 0x2266 }, { 0x8186, 0x2267 }, { 0x8187, 0x221E }, { 0x8188, 0x2234 }, 
-	{ 0x8189, 0x2642 }, { 0x818A, 0x2640 }, { 0x818B, 0x00B0 }, { 0x818C, 0x2032 }, { 0x818D, 0x2033 }, { 0x818E, 0x2103 }, { 0x818F, 0xFFE5 }, { 0x8190, 0xFF04 }, 
-	{ 0x8191, 0x00A2 }, { 0x8192, 0x00A3 }, { 0x8193, 0xFF05 }, { 0x8194, 0xFF03 }, { 0x8195, 0xFF06 }, { 0x8196, 0xFF0A }, { 0x8197, 0xFF20 }, { 0x8198, 0x00A7 }, 
-	{ 0x8199, 0x2606 }, { 0x819A, 0x2605 }, { 0x819B, 0x25CB }, { 0x819C, 0x25CF }, { 0x819D, 0x25CE }, { 0x819E, 0x25C7 }, { 0x819F, 0x25C6 }, { 0x81A0, 0x25A1 }, 
-	{ 0x81A1, 0x25A0 }, { 0x81A2, 0x25B3 }, { 0x81A3, 0x25B2 }, { 0x81A4, 0x25BD }, { 0x81A5, 0x25BC }, { 0x81A6, 0x203B }, { 0x81A7, 0x3012 }, { 0x81A8, 0x2192 }, 
-	{ 0x81A9, 0x2190 }, { 0x81AA, 0x2191 }, { 0x81AB, 0x2193 }, { 0x81AC, 0x3013 }, { 0x81B8, 0x2208 }, { 0x81B9, 0x220B }, { 0x81BA, 0x2286 }, { 0x81BB, 0x2287 }, 
-	{ 0x81BC, 0x2282 }, { 0x81BD, 0x2283 }, { 0x81BE, 0x222A }, { 0x81BF, 0x2229 }, { 0x81C8, 0x2227 }, { 0x81C9, 0x2228 }, { 0x81CA, 0x00AC }, { 0x81CB, 0x21D2 }, 
-	{ 0x81CC, 0x21D4 }, { 0x81CD, 0x2200 }, { 0x81CE, 0x2203 }, { 0x81DA, 0x2220 }, { 0x81DB, 0x22A5 }, { 0x81DC, 0x2312 }, { 0x81DD, 0x2202 }, { 0x81DE, 0x2207 }, 
-	{ 0x81DF, 0x2261 }, { 0x81E0, 0x2252 }, { 0x81E1, 0x226A }, { 0x81E2, 0x226B }, { 0x81E3, 0x221A }, { 0x81E4, 0x223D }, { 0x81E5, 0x221D }, { 0x81E6, 0x2235 }, 
-	{ 0x81E7, 0x222B }, { 0x81E8, 0x222C }, { 0x81F0, 0x212B }, { 0x81F1, 0x2030 }, { 0x81F2, 0x266F }, { 0x81F3, 0x266D }, { 0x81F4, 0x266A }, { 0x81F5, 0x2020 }, 
-	{ 0x81F6, 0x2021 }, { 0x81F7, 0x00B6 }, { 0x81FC, 0x25EF }, { 0x824F, 0xFF10 }, { 0x8250, 0xFF11 }, { 0x8251, 0xFF12 }, { 0x8252, 0xFF13 }, { 0x8253, 0xFF14 }, 
-	{ 0x8254, 0xFF15 }, { 0x8255, 0xFF16 }, { 0x8256, 0xFF17 }, { 0x8257, 0xFF18 }, { 0x8258, 0xFF19 }, { 0x8260, 0xFF21 }, { 0x8261, 0xFF22 }, { 0x8262, 0xFF23 }, 
-	{ 0x8263, 0xFF24 }, { 0x8264, 0xFF25 }, { 0x8265, 0xFF26 }, { 0x8266, 0xFF27 }, { 0x8267, 0xFF28 }, { 0x8268, 0xFF29 }, { 0x8269, 0xFF2A }, { 0x826A, 0xFF2B }, 
-	{ 0x826B, 0xFF2C }, { 0x826C, 0xFF2D }, { 0x826D, 0xFF2E }, { 0x826E, 0xFF2F }, { 0x826F, 0xFF30 }, { 0x8270, 0xFF31 }, { 0x8271, 0xFF32 }, { 0x8272, 0xFF33 }, 
-	{ 0x8273, 0xFF34 }, { 0x8274, 0xFF35 }, { 0x8275, 0xFF36 }, { 0x8276, 0xFF37 }, { 0x8277, 0xFF38 }, { 0x8278, 0xFF39 }, { 0x8279, 0xFF3A }, { 0x8281, 0xFF41 }, 
-	{ 0x8282, 0xFF42 }, { 0x8283, 0xFF43 }, { 0x8284, 0xFF44 }, { 0x8285, 0xFF45 }, { 0x8286, 0xFF46 }, { 0x8287, 0xFF47 }, { 0x8288, 0xFF48 }, { 0x8289, 0xFF49 }, 
-	{ 0x828A, 0xFF4A }, { 0x828B, 0xFF4B }, { 0x828C, 0xFF4C }, { 0x828D, 0xFF4D }, { 0x828E, 0xFF4E }, { 0x828F, 0xFF4F }, { 0x8290, 0xFF50 }, { 0x8291, 0xFF51 }, 
-	{ 0x8292, 0xFF52 }, { 0x8293, 0xFF53 }, { 0x8294, 0xFF54 }, { 0x8295, 0xFF55 }, { 0x8296, 0xFF56 }, { 0x8297, 0xFF57 }, { 0x8298, 0xFF58 }, { 0x8299, 0xFF59 }, 
-	{ 0x829A, 0xFF5A }, { 0x829F, 0x3041 }, { 0x82A0, 0x3042 }, { 0x82A1, 0x3043 }, { 0x82A2, 0x3044 }, { 0x82A3, 0x3045 }, { 0x82A4, 0x3046 }, { 0x82A5, 0x3047 }, 
-	{ 0x82A6, 0x3048 }, { 0x82A7, 0x3049 }, { 0x82A8, 0x304A }, { 0x82A9, 0x304B }, { 0x82AA, 0x304C }, { 0x82AB, 0x304D }, { 0x82AC, 0x304E }, { 0x82AD, 0x304F }, 
-	{ 0x82AE, 0x3050 }, { 0x82AF, 0x3051 }, { 0x82B0, 0x3052 }, { 0x82B1, 0x3053 }, { 0x82B2, 0x3054 }, { 0x82B3, 0x3055 }, { 0x82B4, 0x3056 }, { 0x82B5, 0x3057 }, 
-	{ 0x82B6, 0x3058 }, { 0x82B7, 0x3059 }, { 0x82B8, 0x305A }, { 0x82B9, 0x305B }, { 0x82BA, 0x305C }, { 0x82BB, 0x305D }, { 0x82BC, 0x305E }, { 0x82BD, 0x305F }, 
-	{ 0x82BE, 0x3060 }, { 0x82BF, 0x3061 }, { 0x82C0, 0x3062 }, { 0x82C1, 0x3063 }, { 0x82C2, 0x3064 }, { 0x82C3, 0x3065 }, { 0x82C4, 0x3066 }, { 0x82C5, 0x3067 }, 
-	{ 0x82C6, 0x3068 }, { 0x82C7, 0x3069 }, { 0x82C8, 0x306A }, { 0x82C9, 0x306B }, { 0x82CA, 0x306C }, { 0x82CB, 0x306D }, { 0x82CC, 0x306E }, { 0x82CD, 0x306F }, 
-	{ 0x82CE, 0x3070 }, { 0x82CF, 0x3071 }, { 0x82D0, 0x3072 }, { 0x82D1, 0x3073 }, { 0x82D2, 0x3074 }, { 0x82D3, 0x3075 }, { 0x82D4, 0x3076 }, { 0x82D5, 0x3077 }, 
-	{ 0x82D6, 0x3078 }, { 0x82D7, 0x3079 }, { 0x82D8, 0x307A }, { 0x82D9, 0x307B }, { 0x82DA, 0x307C }, { 0x82DB, 0x307D }, { 0x82DC, 0x307E }, { 0x82DD, 0x307F }, 
-	{ 0x82DE, 0x3080 }, { 0x82DF, 0x3081 }, { 0x82E0, 0x3082 }, { 0x82E1, 0x3083 }, { 0x82E2, 0x3084 }, { 0x82E3, 0x3085 }, { 0x82E4, 0x3086 }, { 0x82E5, 0x3087 }, 
-	{ 0x82E6, 0x3088 }, { 0x82E7, 0x3089 }, { 0x82E8, 0x308A }, { 0x82E9, 0x308B }, { 0x82EA, 0x308C }, { 0x82EB, 0x308D }, { 0x82EC, 0x308E }, { 0x82ED, 0x308F }, 
-	{ 0x82EE, 0x3090 }, { 0x82EF, 0x3091 }, { 0x82F0, 0x3092 }, { 0x82F1, 0x3093 }, { 0x8340, 0x30A1 }, { 0x8341, 0x30A2 }, { 0x8342, 0x30A3 }, { 0x8343, 0x30A4 }, 
-	{ 0x8344, 0x30A5 }, { 0x8345, 0x30A6 }, { 0x8346, 0x30A7 }, { 0x8347, 0x30A8 }, { 0x8348, 0x30A9 }, { 0x8349, 0x30AA }, { 0x834A, 0x30AB }, { 0x834B, 0x30AC }, 
-	{ 0x834C, 0x30AD }, { 0x834D, 0x30AE }, { 0x834E, 0x30AF }, { 0x834F, 0x30B0 }, { 0x8350, 0x30B1 }, { 0x8351, 0x30B2 }, { 0x8352, 0x30B3 }, { 0x8353, 0x30B4 }, 
-	{ 0x8354, 0x30B5 }, { 0x8355, 0x30B6 }, { 0x8356, 0x30B7 }, { 0x8357, 0x30B8 }, { 0x8358, 0x30B9 }, { 0x8359, 0x30BA }, { 0x835A, 0x30BB }, { 0x835B, 0x30BC }, 
-	{ 0x835C, 0x30BD }, { 0x835D, 0x30BE }, { 0x835E, 0x30BF }, { 0x835F, 0x30C0 }, { 0x8360, 0x30C1 }, { 0x8361, 0x30C2 }, { 0x8362, 0x30C3 }, { 0x8363, 0x30C4 }, 
-	{ 0x8364, 0x30C5 }, { 0x8365, 0x30C6 }, { 0x8366, 0x30C7 }, { 0x8367, 0x30C8 }, { 0x8368, 0x30C9 }, { 0x8369, 0x30CA }, { 0x836A, 0x30CB }, { 0x836B, 0x30CC }, 
-	{ 0x836C, 0x30CD }, { 0x836D, 0x30CE }, { 0x836E, 0x30CF }, { 0x836F, 0x30D0 }, { 0x8370, 0x30D1 }, { 0x8371, 0x30D2 }, { 0x8372, 0x30D3 }, { 0x8373, 0x30D4 }, 
-	{ 0x8374, 0x30D5 }, { 0x8375, 0x30D6 }, { 0x8376, 0x30D7 }, { 0x8377, 0x30D8 }, { 0x8378, 0x30D9 }, { 0x8379, 0x30DA }, { 0x837A, 0x30DB }, { 0x837B, 0x30DC }, 
-	{ 0x837C, 0x30DD }, { 0x837D, 0x30DE }, { 0x837E, 0x30DF }, { 0x8380, 0x30E0 }, { 0x8381, 0x30E1 }, { 0x8382, 0x30E2 }, { 0x8383, 0x30E3 }, { 0x8384, 0x30E4 }, 
-	{ 0x8385, 0x30E5 }, { 0x8386, 0x30E6 }, { 0x8387, 0x30E7 }, { 0x8388, 0x30E8 }, { 0x8389, 0x30E9 }, { 0x838A, 0x30EA }, { 0x838B, 0x30EB }, { 0x838C, 0x30EC }, 
-	{ 0x838D, 0x30ED }, { 0x838E, 0x30EE }, { 0x838F, 0x30EF }, { 0x8390, 0x30F0 }, { 0x8391, 0x30F1 }, { 0x8392, 0x30F2 }, { 0x8393, 0x30F3 }, { 0x8394, 0x30F4 }, 
-	{ 0x8395, 0x30F5 }, { 0x8396, 0x30F6 }, { 0x839F, 0x0391 }, { 0x83A0, 0x0392 }, { 0x83A1, 0x0393 }, { 0x83A2, 0x0394 }, { 0x83A3, 0x0395 }, { 0x83A4, 0x0396 }, 
-	{ 0x83A5, 0x0397 }, { 0x83A6, 0x0398 }, { 0x83A7, 0x0399 }, { 0x83A8, 0x039A }, { 0x83A9, 0x039B }, { 0x83AA, 0x039C }, { 0x83AB, 0x039D }, { 0x83AC, 0x039E }, 
-	{ 0x83AD, 0x039F }, { 0x83AE, 0x03A0 }, { 0x83AF, 0x03A1 }, { 0x83B0, 0x03A3 }, { 0x83B1, 0x03A4 }, { 0x83B2, 0x03A5 }, { 0x83B3, 0x03A6 }, { 0x83B4, 0x03A7 }, 
-	{ 0x83B5, 0x03A8 }, { 0x83B6, 0x03A9 }, { 0x83BF, 0x03B1 }, { 0x83C0, 0x03B2 }, { 0x83C1, 0x03B3 }, { 0x83C2, 0x03B4 }, { 0x83C3, 0x03B5 }, { 0x83C4, 0x03B6 }, 
-	{ 0x83C5, 0x03B7 }, { 0x83C6, 0x03B8 }, { 0x83C7, 0x03B9 }, { 0x83C8, 0x03BA }, { 0x83C9, 0x03BB }, { 0x83CA, 0x03BC }, { 0x83CB, 0x03BD }, { 0x83CC, 0x03BE }, 
-	{ 0x83CD, 0x03BF }, { 0x83CE, 0x03C0 }, { 0x83CF, 0x03C1 }, { 0x83D0, 0x03C3 }, { 0x83D1, 0x03C4 }, { 0x83D2, 0x03C5 }, { 0x83D3, 0x03C6 }, { 0x83D4, 0x03C7 }, 
-	{ 0x83D5, 0x03C8 }, { 0x83D6, 0x03C9 }, { 0x8440, 0x0410 }, { 0x8441, 0x0411 }, { 0x8442, 0x0412 }, { 0x8443, 0x0413 }, { 0x8444, 0x0414 }, { 0x8445, 0x0415 }, 
-	{ 0x8446, 0x0401 }, { 0x8447, 0x0416 }, { 0x8448, 0x0417 }, { 0x8449, 0x0418 }, { 0x844A, 0x0419 }, { 0x844B, 0x041A }, { 0x844C, 0x041B }, { 0x844D, 0x041C }, 
-	{ 0x844E, 0x041D }, { 0x844F, 0x041E }, { 0x8450, 0x041F }, { 0x8451, 0x0420 }, { 0x8452, 0x0421 }, { 0x8453, 0x0422 }, { 0x8454, 0x0423 }, { 0x8455, 0x0424 }, 
-	{ 0x8456, 0x0425 }, { 0x8457, 0x0426 }, { 0x8458, 0x0427 }, { 0x8459, 0x0428 }, { 0x845A, 0x0429 }, { 0x845B, 0x042A }, { 0x845C, 0x042B }, { 0x845D, 0x042C }, 
-	{ 0x845E, 0x042D }, { 0x845F, 0x042E }, { 0x8460, 0x042F }, { 0x8470, 0x0430 }, { 0x8471, 0x0431 }, { 0x8472, 0x0432 }, { 0x8473, 0x0433 }, { 0x8474, 0x0434 }, 
-	{ 0x8475, 0x0435 }, { 0x8476, 0x0451 }, { 0x8477, 0x0436 }, { 0x8478, 0x0437 }, { 0x8479, 0x0438 }, { 0x847A, 0x0439 }, { 0x847B, 0x043A }, { 0x847C, 0x043B }, 
-	{ 0x847D, 0x043C }, { 0x847E, 0x043D }, { 0x8480, 0x043E }, { 0x8481, 0x043F }, { 0x8482, 0x0440 }, { 0x8483, 0x0441 }, { 0x8484, 0x0442 }, { 0x8485, 0x0443 }, 
-	{ 0x8486, 0x0444 }, { 0x8487, 0x0445 }, { 0x8488, 0x0446 }, { 0x8489, 0x0447 }, { 0x848A, 0x0448 }, { 0x848B, 0x0449 }, { 0x848C, 0x044A }, { 0x848D, 0x044B }, 
-	{ 0x848E, 0x044C }, { 0x848F, 0x044D }, { 0x8490, 0x044E }, { 0x8491, 0x044F }, { 0x849F, 0x2500 }, { 0x84A0, 0x2502 }, { 0x84A1, 0x250C }, { 0x84A2, 0x2510 }, 
-	{ 0x84A3, 0x2518 }, { 0x84A4, 0x2514 }, { 0x84A5, 0x251C }, { 0x84A6, 0x252C }, { 0x84A7, 0x2524 }, { 0x84A8, 0x2534 }, { 0x84A9, 0x253C }, { 0x84AA, 0x2501 }, 
-	{ 0x84AB, 0x2503 }, { 0x84AC, 0x250F }, { 0x84AD, 0x2513 }, { 0x84AE, 0x251B }, { 0x84AF, 0x2517 }, { 0x84B0, 0x2523 }, { 0x84B1, 0x2533 }, { 0x84B2, 0x252B }, 
-	{ 0x84B3, 0x253B }, { 0x84B4, 0x254B }, { 0x84B5, 0x2520 }, { 0x84B6, 0x252F }, { 0x84B7, 0x2528 }, { 0x84B8, 0x2537 }, { 0x84B9, 0x253F }, { 0x84BA, 0x251D }, 
-	{ 0x84BB, 0x2530 }, { 0x84BC, 0x2525 }, { 0x84BD, 0x2538 }, { 0x84BE, 0x2542 }, { 0x8540, 0x2460 }, { 0x8541, 0x2461 }, { 0x8542, 0x2462 }, { 0x8543, 0x2463 }, 
-	{ 0x8544, 0x2464 }, { 0x8545, 0x2465 }, { 0x8546, 0x2466 }, { 0x8547, 0x2467 }, { 0x8548, 0x2468 }, { 0x8549, 0x2469 }, { 0x854A, 0x246A }, { 0x854B, 0x246B }, 
-	{ 0x854C, 0x246C }, { 0x854D, 0x246D }, { 0x854E, 0x246E }, { 0x854F, 0x246F }, { 0x8550, 0x2470 }, { 0x8551, 0x2471 }, { 0x8552, 0x2472 }, { 0x8553, 0x2473 }, 
-	{ 0x855E, 0x2474 }, { 0x855F, 0x2475 }, { 0x8560, 0x2476 }, { 0x8561, 0x2477 }, { 0x8562, 0x2478 }, { 0x8563, 0x2479 }, { 0x8564, 0x247A }, { 0x8565, 0x247B }, 
-	{ 0x8566, 0x247C }, { 0x8567, 0x247D }, { 0x8568, 0x247E }, { 0x8569, 0x247F }, { 0x856A, 0x2480 }, { 0x856B, 0x2481 }, { 0x856C, 0x2482 }, { 0x856D, 0x2483 }, 
-	{ 0x856E, 0x2484 }, { 0x856F, 0x2485 }, { 0x8570, 0x2486 }, { 0x8571, 0x2487 }, { 0x857C, 0x2776 }, { 0x857D, 0x2777 }, { 0x857E, 0x2778 }, { 0x8580, 0x2779 }, 
-	{ 0x8581, 0x277A }, { 0x8582, 0x277B }, { 0x8583, 0x277C }, { 0x8584, 0x277D }, { 0x8585, 0x277E }, { 0x8592, 0x2488 }, { 0x8593, 0x2489 }, { 0x8594, 0x248A }, 
-	{ 0x8595, 0x248B }, { 0x8596, 0x248C }, { 0x8597, 0x248D }, { 0x8598, 0x248E }, { 0x8599, 0x248F }, { 0x859A, 0x2490 }, { 0x859F, 0x2160 }, { 0x85A0, 0x2161 }, 
-	{ 0x85A1, 0x2162 }, { 0x85A2, 0x2163 }, { 0x85A3, 0x2164 }, { 0x85A4, 0x2165 }, { 0x85A5, 0x2166 }, { 0x85A6, 0x2167 }, { 0x85A7, 0x2168 }, { 0x85A8, 0x2169 }, 
-	{ 0x85A9, 0x216A }, { 0x85AA, 0x216B }, { 0x85B3, 0x2170 }, { 0x85B4, 0x2171 }, { 0x85B5, 0x2172 }, { 0x85B6, 0x2173 }, { 0x85B7, 0x2174 }, { 0x85B8, 0x2175 }, 
-	{ 0x85B9, 0x2176 }, { 0x85BA, 0x2177 }, { 0x85BB, 0x2178 }, { 0x85BC, 0x2179 }, { 0x85BD, 0x217A }, { 0x85BE, 0x217B }, { 0x85DB, 0x249C }, { 0x85DC, 0x249D }, 
-	{ 0x85DD, 0x249E }, { 0x85DE, 0x249F }, { 0x85DF, 0x24A0 }, { 0x85E0, 0x24A1 }, { 0x85E1, 0x24A2 }, { 0x85E2, 0x24A3 }, { 0x85E3, 0x24A4 }, { 0x85E4, 0x24A5 }, 
-	{ 0x85E5, 0x24A6 }, { 0x85E6, 0x24A7 }, { 0x85E7, 0x24A8 }, { 0x85E8, 0x24A9 }, { 0x85E9, 0x24AA }, { 0x85EA, 0x24AB }, { 0x85EB, 0x24AC }, { 0x85EC, 0x24AD }, 
-	{ 0x85ED, 0x24AE }, { 0x85EE, 0x24AF }, { 0x85EF, 0x24B0 }, { 0x85F0, 0x24B1 }, { 0x85F1, 0x24B2 }, { 0x85F2, 0x24B3 }, { 0x85F3, 0x24B4 }, { 0x85F4, 0x24B5 }, 
-	{ 0x8640, 0x339C }, { 0x8641, 0x339F }, { 0x8642, 0x339D }, { 0x8643, 0x33A0 }, { 0x8644, 0x33A4 }, { 0x8646, 0x33A1 }, { 0x8647, 0x33A5 }, { 0x8648, 0x339E }, 
-	{ 0x8649, 0x33A2 }, { 0x864A, 0x338E }, { 0x864C, 0x338F }, { 0x864D, 0x33C4 }, { 0x864E, 0x3396 }, { 0x864F, 0x3397 }, { 0x8650, 0x2113 }, { 0x8651, 0x3398 }, 
-	{ 0x8652, 0x33B3 }, { 0x8653, 0x33B2 }, { 0x8654, 0x33B1 }, { 0x8655, 0x33B0 }, { 0x8656, 0x2109 }, { 0x8657, 0x33D4 }, { 0x8658, 0x33CB }, { 0x8659, 0x3390 }, 
-	{ 0x865A, 0x3385 }, { 0x865B, 0x3386 }, { 0x865C, 0x3387 }, { 0x869B, 0x2116 }, { 0x869C, 0x33CD }, { 0x869D, 0x2121 }, { 0x869F, 0x2664 }, { 0x86A0, 0x2667 }, 
-	{ 0x86A1, 0x2661 }, { 0x86A2, 0x2662 }, { 0x86A3, 0x2660 }, { 0x86A4, 0x2663 }, { 0x86A5, 0x2665 }, { 0x86A6, 0x2666 }, { 0x86B3, 0x3020 }, { 0x86B4, 0x260E }, 
-	{ 0x86B5, 0x3004 }, { 0x86C7, 0x261E }, { 0x86C8, 0x261C }, { 0x86C9, 0x261D }, { 0x86CA, 0x261F }, { 0x86CB, 0x21C6 }, { 0x86CC, 0x21C4 }, { 0x86CD, 0x21C5 }, 
-	{ 0x86CF, 0x21E8 }, { 0x86D0, 0x21E6 }, { 0x86D1, 0x21E7 }, { 0x86D2, 0x21E9 }, { 0x8740, 0x3230 }, { 0x8741, 0x322A }, { 0x8742, 0x322B }, { 0x8743, 0x322C }, 
-	{ 0x8744, 0x322D }, { 0x8745, 0x322E }, { 0x8746, 0x322F }, { 0x8747, 0x3240 }, { 0x8748, 0x3237 }, { 0x8749, 0x3242 }, { 0x874A, 0x3243 }, { 0x874B, 0x3239 }, 
-	{ 0x874C, 0x323A }, { 0x874D, 0x3231 }, { 0x874E, 0x323E }, { 0x874F, 0x3234 }, { 0x8750, 0x3232 }, { 0x8751, 0x323B }, { 0x8752, 0x3236 }, { 0x8753, 0x3233 }, 
-	{ 0x8754, 0x3235 }, { 0x8755, 0x323C }, { 0x8756, 0x323D }, { 0x8757, 0x323F }, { 0x8758, 0x3238 }, { 0x8793, 0x32A4 }, { 0x8794, 0x32A5 }, { 0x8795, 0x32A6 }, 
-	{ 0x8796, 0x32A7 }, { 0x8797, 0x32A8 }, { 0x8798, 0x32A9 }, { 0x8799, 0x3296 }, { 0x879A, 0x329D }, { 0x879B, 0x3298 }, { 0x879C, 0x329E }, { 0x879E, 0x3299 }, 
-	{ 0x879F, 0x3349 }, { 0x87A0, 0x3322 }, { 0x87A1, 0x334D }, { 0x87A2, 0x3314 }, { 0x87A3, 0x3316 }, { 0x87A4, 0x3305 }, { 0x87A5, 0x3333 }, { 0x87A6, 0x334E }, 
-	{ 0x87A7, 0x3303 }, { 0x87A8, 0x3336 }, { 0x87A9, 0x3318 }, { 0x87AA, 0x3315 }, { 0x87AB, 0x3327 }, { 0x87AC, 0x3351 }, { 0x87AD, 0x334A }, { 0x87AE, 0x3339 }, 
-	{ 0x87AF, 0x3357 }, { 0x87B0, 0x330D }, { 0x87B1, 0x3342 }, { 0x87B2, 0x3323 }, { 0x87B3, 0x3326 }, { 0x87B4, 0x333B }, { 0x87B5, 0x332B }, { 0x87BD, 0x3300 }, 
-	{ 0x87BE, 0x331E }, { 0x87BF, 0x332A }, { 0x87C0, 0x3331 }, { 0x87C1, 0x3347 }, { 0x87E5, 0x337E }, { 0x87E6, 0x337D }, { 0x87E7, 0x337C }, { 0x87E8, 0x337B }, 
-	{ 0x87FA, 0x337F }, { 0x8840, 0x222E }, { 0x8841, 0x221F }, { 0x8842, 0x22BF }, { 0x8854, 0x301D }, { 0x8855, 0x301F }, { 0x8868, 0x3094 }, { 0x886A, 0x30F7 }, 
-	{ 0x886B, 0x30F8 }, { 0x886C, 0x30F9 }, { 0x886D, 0x30FA }, { 0x889F, 0x4E9C }, { 0x88A0, 0x5516 }, { 0x88A1, 0x5A03 }, { 0x88A2, 0x963F }, { 0x88A3, 0x54C0 }, 
-	{ 0x88A4, 0x611B }, { 0x88A5, 0x6328 }, { 0x88A6, 0x59F6 }, { 0x88A7, 0x9022 }, { 0x88A8, 0x8475 }, { 0x88A9, 0x831C }, { 0x88AA, 0x7A50 }, { 0x88AB, 0x60AA }, 
-	{ 0x88AC, 0x63E1 }, { 0x88AD, 0x6E25 }, { 0x88AE, 0x65ED }, { 0x88AF, 0x8466 }, { 0x88B0, 0x82A6 }, { 0x88B1, 0x9BF5 }, { 0x88B2, 0x6893 }, { 0x88B3, 0x5727 }, 
-	{ 0x88B4, 0x65A1 }, { 0x88B5, 0x6271 }, { 0x88B6, 0x5B9B }, { 0x88B7, 0x59D0 }, { 0x88B8, 0x867B }, { 0x88B9, 0x98F4 }, { 0x88BA, 0x7D62 }, { 0x88BB, 0x7DBE }, 
-	{ 0x88BC, 0x9B8E }, { 0x88BD, 0x6216 }, { 0x88BE, 0x7C9F }, { 0x88BF, 0x88B7 }, { 0x88C0, 0x5B89 }, { 0x88C1, 0x5EB5 }, { 0x88C2, 0x6309 }, { 0x88C3, 0x6697 }, 
-	{ 0x88C4, 0x6848 }, { 0x88C5, 0x95C7 }, { 0x88C6, 0x978D }, { 0x88C7, 0x674F }, { 0x88C8, 0x4EE5 }, { 0x88C9, 0x4F0A }, { 0x88CA, 0x4F4D }, { 0x88CB, 0x4F9D }, 
-	{ 0x88CC, 0x5049 }, { 0x88CD, 0x56F2 }, { 0x88CE, 0x5937 }, { 0x88CF, 0x59D4 }, { 0x88D0, 0x5A01 }, { 0x88D1, 0x5C09 }, { 0x88D2, 0x60DF }, { 0x88D3, 0x610F }, 
-	{ 0x88D4, 0x6170 }, { 0x88D5, 0x6613 }, { 0x88D6, 0x6905 }, { 0x88D7, 0x70BA }, { 0x88D8, 0x754F }, { 0x88D9, 0x7570 }, { 0x88DA, 0x79FB }, { 0x88DB, 0x7DAD }, 
-	{ 0x88DC, 0x7DEF }, { 0x88DD, 0x80C3 }, { 0x88DE, 0x840E }, { 0x88DF, 0x8863 }, { 0x88E0, 0x8B02 }, { 0x88E1, 0x9055 }, { 0x88E2, 0x907A }, { 0x88E3, 0x533B }, 
-	{ 0x88E4, 0x4E95 }, { 0x88E5, 0x4EA5 }, { 0x88E6, 0x57DF }, { 0x88E7, 0x80B2 }, { 0x88E8, 0x90C1 }, { 0x88E9, 0x78EF }, { 0x88EA, 0x4E00 }, { 0x88EB, 0x58F1 }, 
-	{ 0x88EC, 0x6EA2 }, { 0x88ED, 0x9038 }, { 0x88EE, 0x7A32 }, { 0x88EF, 0x8328 }, { 0x88F0, 0x828B }, { 0x88F1, 0x9C2F }, { 0x88F2, 0x5141 }, { 0x88F3, 0x5370 }, 
-	{ 0x88F4, 0x54BD }, { 0x88F5, 0x54E1 }, { 0x88F6, 0x56E0 }, { 0x88F7, 0x59FB }, { 0x88F8, 0x5F15 }, { 0x88F9, 0x98F2 }, { 0x88FA, 0x6DEB }, { 0x88FB, 0x80E4 }, 
-	{ 0x88FC, 0x852D }, { 0x8940, 0x9662 }, { 0x8941, 0x9670 }, { 0x8942, 0x96A0 }, { 0x8943, 0x97FB }, { 0x8944, 0x540B }, { 0x8945, 0x53F3 }, { 0x8946, 0x5B87 }, 
-	{ 0x8947, 0x70CF }, { 0x8948, 0x7FBD }, { 0x8949, 0x8FC2 }, { 0x894A, 0x96E8 }, { 0x894B, 0x536F }, { 0x894C, 0x9D5C }, { 0x894D, 0x7ABA }, { 0x894E, 0x4E11 }, 
-	{ 0x894F, 0x7893 }, { 0x8950, 0x81FC }, { 0x8951, 0x6E26 }, { 0x8952, 0x5618 }, { 0x8953, 0x5504 }, { 0x8954, 0x6B1D }, { 0x8955, 0x851A }, { 0x8956, 0x9C3B }, 
-	{ 0x8957, 0x59E5 }, { 0x8958, 0x53A9 }, { 0x8959, 0x6D66 }, { 0x895A, 0x74DC }, { 0x895B, 0x958F }, { 0x895C, 0x5642 }, { 0x895D, 0x4E91 }, { 0x895E, 0x904B }, 
-	{ 0x895F, 0x96F2 }, { 0x8960, 0x834F }, { 0x8961, 0x990C }, { 0x8962, 0x53E1 }, { 0x8963, 0x55B6 }, { 0x8964, 0x5B30 }, { 0x8965, 0x5F71 }, { 0x8966, 0x6620 }, 
-	{ 0x8967, 0x66F3 }, { 0x8968, 0x6804 }, { 0x8969, 0x6C38 }, { 0x896A, 0x6CF3 }, { 0x896B, 0x6D29 }, { 0x896C, 0x745B }, { 0x896D, 0x76C8 }, { 0x896E, 0x7A4E }, 
-	{ 0x896F, 0x9834 }, { 0x8970, 0x82F1 }, { 0x8971, 0x885B }, { 0x8972, 0x8A60 }, { 0x8973, 0x92ED }, { 0x8974, 0x6DB2 }, { 0x8975, 0x75AB }, { 0x8976, 0x76CA }, 
-	{ 0x8977, 0x99C5 }, { 0x8978, 0x60A6 }, { 0x8979, 0x8B01 }, { 0x897A, 0x8D8A }, { 0x897B, 0x95B2 }, { 0x897C, 0x698E }, { 0x897D, 0x53AD }, { 0x897E, 0x5186 }, 
-	{ 0x8980, 0x5712 }, { 0x8981, 0x5830 }, { 0x8982, 0x5944 }, { 0x8983, 0x5BB4 }, { 0x8984, 0x5EF6 }, { 0x8985, 0x6028 }, { 0x8986, 0x63A9 }, { 0x8987, 0x63F4 }, 
-	{ 0x8988, 0x6CBF }, { 0x8989, 0x6F14 }, { 0x898A, 0x708E }, { 0x898B, 0x7114 }, { 0x898C, 0x7159 }, { 0x898D, 0x71D5 }, { 0x898E, 0x733F }, { 0x898F, 0x7E01 }, 
-	{ 0x8990, 0x8276 }, { 0x8991, 0x82D1 }, { 0x8992, 0x8597 }, { 0x8993, 0x9060 }, { 0x8994, 0x925B }, { 0x8995, 0x9D1B }, { 0x8996, 0x5869 }, { 0x8997, 0x65BC }, 
-	{ 0x8998, 0x6C5A }, { 0x8999, 0x7525 }, { 0x899A, 0x51F9 }, { 0x899B, 0x592E }, { 0x899C, 0x5965 }, { 0x899D, 0x5F80 }, { 0x899E, 0x5FDC }, { 0x899F, 0x62BC }, 
-	{ 0x89A0, 0x65FA }, { 0x89A1, 0x6A2A }, { 0x89A2, 0x6B27 }, { 0x89A3, 0x6BB4 }, { 0x89A4, 0x738B }, { 0x89A5, 0x7FC1 }, { 0x89A6, 0x8956 }, { 0x89A7, 0x9D2C }, 
-	{ 0x89A8, 0x9D0E }, { 0x89A9, 0x9EC4 }, { 0x89AA, 0x5CA1 }, { 0x89AB, 0x6C96 }, { 0x89AC, 0x837B }, { 0x89AD, 0x5104 }, { 0x89AE, 0x5C4B }, { 0x89AF, 0x61B6 }, 
-	{ 0x89B0, 0x81C6 }, { 0x89B1, 0x6876 }, { 0x89B2, 0x7261 }, { 0x89B3, 0x4E59 }, { 0x89B4, 0x4FFA }, { 0x89B5, 0x5378 }, { 0x89B6, 0x6069 }, { 0x89B7, 0x6E29 }, 
-	{ 0x89B8, 0x7A4F }, { 0x89B9, 0x97F3 }, { 0x89BA, 0x4E0B }, { 0x89BB, 0x5316 }, { 0x89BC, 0x4EEE }, { 0x89BD, 0x4F55 }, { 0x89BE, 0x4F3D }, { 0x89BF, 0x4FA1 }, 
-	{ 0x89C0, 0x4F73 }, { 0x89C1, 0x52A0 }, { 0x89C2, 0x53EF }, { 0x89C3, 0x5609 }, { 0x89C4, 0x590F }, { 0x89C5, 0x5AC1 }, { 0x89C6, 0x5BB6 }, { 0x89C7, 0x5BE1 }, 
-	{ 0x89C8, 0x79D1 }, { 0x89C9, 0x6687 }, { 0x89CA, 0x679C }, { 0x89CB, 0x67B6 }, { 0x89CC, 0x6B4C }, { 0x89CD, 0x6CB3 }, { 0x89CE, 0x706B }, { 0x89CF, 0x73C2 }, 
-	{ 0x89D0, 0x798D }, { 0x89D1, 0x79BE }, { 0x89D2, 0x7A3C }, { 0x89D3, 0x7B87 }, { 0x89D4, 0x82B1 }, { 0x89D5, 0x82DB }, { 0x89D6, 0x8304 }, { 0x89D7, 0x8377 }, 
-	{ 0x89D8, 0x83EF }, { 0x89D9, 0x83D3 }, { 0x89DA, 0x8766 }, { 0x89DB, 0x8AB2 }, { 0x89DC, 0x5629 }, { 0x89DD, 0x8CA8 }, { 0x89DE, 0x8FE6 }, { 0x89DF, 0x904E }, 
-	{ 0x89E0, 0x971E }, { 0x89E1, 0x868A }, { 0x89E2, 0x4FC4 }, { 0x89E3, 0x5CE8 }, { 0x89E4, 0x6211 }, { 0x89E5, 0x7259 }, { 0x89E6, 0x753B }, { 0x89E7, 0x81E5 }, 
-	{ 0x89E8, 0x82BD }, { 0x89E9, 0x86FE }, { 0x89EA, 0x8CC0 }, { 0x89EB, 0x96C5 }, { 0x89EC, 0x9913 }, { 0x89ED, 0x99D5 }, { 0x89EE, 0x4ECB }, { 0x89EF, 0x4F1A }, 
-	{ 0x89F0, 0x89E3 }, { 0x89F1, 0x56DE }, { 0x89F2, 0x584A }, { 0x89F3, 0x58CA }, { 0x89F4, 0x5EFB }, { 0x89F5, 0x5FEB }, { 0x89F6, 0x602A }, { 0x89F7, 0x6094 }, 
-	{ 0x89F8, 0x6062 }, { 0x89F9, 0x61D0 }, { 0x89FA, 0x6212 }, { 0x89FB, 0x62D0 }, { 0x89FC, 0x6539 }, { 0x8A40, 0x9B41 }, { 0x8A41, 0x6666 }, { 0x8A42, 0x68B0 }, 
-	{ 0x8A43, 0x6D77 }, { 0x8A44, 0x7070 }, { 0x8A45, 0x754C }, { 0x8A46, 0x7686 }, { 0x8A47, 0x7D75 }, { 0x8A48, 0x82A5 }, { 0x8A49, 0x87F9 }, { 0x8A4A, 0x958B }, 
-	{ 0x8A4B, 0x968E }, { 0x8A4C, 0x8C9D }, { 0x8A4D, 0x51F1 }, { 0x8A4E, 0x52BE }, { 0x8A4F, 0x5916 }, { 0x8A50, 0x54B3 }, { 0x8A51, 0x5BB3 }, { 0x8A52, 0x5D16 }, 
-	{ 0x8A53, 0x6168 }, { 0x8A54, 0x6982 }, { 0x8A55, 0x6DAF }, { 0x8A56, 0x788D }, { 0x8A57, 0x84CB }, { 0x8A58, 0x8857 }, { 0x8A59, 0x8A72 }, { 0x8A5A, 0x93A7 }, 
-	{ 0x8A5B, 0x9AB8 }, { 0x8A5C, 0x6D6C }, { 0x8A5D, 0x99A8 }, { 0x8A5E, 0x86D9 }, { 0x8A5F, 0x57A3 }, { 0x8A60, 0x67FF }, { 0x8A61, 0x86CE }, { 0x8A62, 0x920E }, 
-	{ 0x8A63, 0x5283 }, { 0x8A64, 0x5687 }, { 0x8A65, 0x5404 }, { 0x8A66, 0x5ED3 }, { 0x8A67, 0x62E1 }, { 0x8A68, 0x64B9 }, { 0x8A69, 0x683C }, { 0x8A6A, 0x6838 }, 
-	{ 0x8A6B, 0x6BBB }, { 0x8A6C, 0x7372 }, { 0x8A6D, 0x78BA }, { 0x8A6E, 0x7A6B }, { 0x8A6F, 0x899A }, { 0x8A70, 0x89D2 }, { 0x8A71, 0x8D6B }, { 0x8A72, 0x8F03 }, 
-	{ 0x8A73, 0x90ED }, { 0x8A74, 0x95A3 }, { 0x8A75, 0x9694 }, { 0x8A76, 0x9769 }, { 0x8A77, 0x5B66 }, { 0x8A78, 0x5CB3 }, { 0x8A79, 0x697D }, { 0x8A7A, 0x984D }, 
-	{ 0x8A7B, 0x984E }, { 0x8A7C, 0x639B }, { 0x8A7D, 0x7B20 }, { 0x8A7E, 0x6A2B }, { 0x8A80, 0x6A7F }, { 0x8A81, 0x68B6 }, { 0x8A82, 0x9C0D }, { 0x8A83, 0x6F5F }, 
-	{ 0x8A84, 0x5272 }, { 0x8A85, 0x559D }, { 0x8A86, 0x6070 }, { 0x8A87, 0x62EC }, { 0x8A88, 0x6D3B }, { 0x8A89, 0x6E07 }, { 0x8A8A, 0x6ED1 }, { 0x8A8B, 0x845B }, 
-	{ 0x8A8C, 0x8910 }, { 0x8A8D, 0x8F44 }, { 0x8A8E, 0x4E14 }, { 0x8A8F, 0x9C39 }, { 0x8A90, 0x53F6 }, { 0x8A91, 0x691B }, { 0x8A92, 0x6A3A }, { 0x8A93, 0x9784 }, 
-	{ 0x8A94, 0x682A }, { 0x8A95, 0x515C }, { 0x8A96, 0x7AC3 }, { 0x8A97, 0x84B2 }, { 0x8A98, 0x91DC }, { 0x8A99, 0x938C }, { 0x8A9A, 0x565B }, { 0x8A9B, 0x9D28 }, 
-	{ 0x8A9C, 0x6822 }, { 0x8A9D, 0x8305 }, { 0x8A9E, 0x8431 }, { 0x8A9F, 0x7CA5 }, { 0x8AA0, 0x5208 }, { 0x8AA1, 0x82C5 }, { 0x8AA2, 0x74E6 }, { 0x8AA3, 0x4E7E }, 
-	{ 0x8AA4, 0x4F83 }, { 0x8AA5, 0x51A0 }, { 0x8AA6, 0x5BD2 }, { 0x8AA7, 0x520A }, { 0x8AA8, 0x52D8 }, { 0x8AA9, 0x52E7 }, { 0x8AAA, 0x5DFB }, { 0x8AAB, 0x559A }, 
-	{ 0x8AAC, 0x582A }, { 0x8AAD, 0x59E6 }, { 0x8AAE, 0x5B8C }, { 0x8AAF, 0x5B98 }, { 0x8AB0, 0x5BDB }, { 0x8AB1, 0x5E72 }, { 0x8AB2, 0x5E79 }, { 0x8AB3, 0x60A3 }, 
-	{ 0x8AB4, 0x611F }, { 0x8AB5, 0x6163 }, { 0x8AB6, 0x61BE }, { 0x8AB7, 0x63DB }, { 0x8AB8, 0x6562 }, { 0x8AB9, 0x67D1 }, { 0x8ABA, 0x6853 }, { 0x8ABB, 0x68FA }, 
-	{ 0x8ABC, 0x6B3E }, { 0x8ABD, 0x6B53 }, { 0x8ABE, 0x6C57 }, { 0x8ABF, 0x6F22 }, { 0x8AC0, 0x6F97 }, { 0x8AC1, 0x6F45 }, { 0x8AC2, 0x74B0 }, { 0x8AC3, 0x7518 }, 
-	{ 0x8AC4, 0x76E3 }, { 0x8AC5, 0x770B }, { 0x8AC6, 0x7AFF }, { 0x8AC7, 0x7BA1 }, { 0x8AC8, 0x7C21 }, { 0x8AC9, 0x7DE9 }, { 0x8ACA, 0x7F36 }, { 0x8ACB, 0x7FF0 }, 
-	{ 0x8ACC, 0x809D }, { 0x8ACD, 0x8266 }, { 0x8ACE, 0x839E }, { 0x8ACF, 0x89B3 }, { 0x8AD0, 0x8ACC }, { 0x8AD1, 0x8CAB }, { 0x8AD2, 0x9084 }, { 0x8AD3, 0x9451 }, 
-	{ 0x8AD4, 0x9593 }, { 0x8AD5, 0x9591 }, { 0x8AD6, 0x95A2 }, { 0x8AD7, 0x9665 }, { 0x8AD8, 0x97D3 }, { 0x8AD9, 0x9928 }, { 0x8ADA, 0x8218 }, { 0x8ADB, 0x4E38 }, 
-	{ 0x8ADC, 0x542B }, { 0x8ADD, 0x5CB8 }, { 0x8ADE, 0x5DCC }, { 0x8ADF, 0x73A9 }, { 0x8AE0, 0x764C }, { 0x8AE1, 0x773C }, { 0x8AE2, 0x5CA9 }, { 0x8AE3, 0x7FEB }, 
-	{ 0x8AE4, 0x8D0B }, { 0x8AE5, 0x96C1 }, { 0x8AE6, 0x9811 }, { 0x8AE7, 0x9854 }, { 0x8AE8, 0x9858 }, { 0x8AE9, 0x4F01 }, { 0x8AEA, 0x4F0E }, { 0x8AEB, 0x5371 }, 
-	{ 0x8AEC, 0x559C }, { 0x8AED, 0x5668 }, { 0x8AEE, 0x57FA }, { 0x8AEF, 0x5947 }, { 0x8AF0, 0x5B09 }, { 0x8AF1, 0x5BC4 }, { 0x8AF2, 0x5C90 }, { 0x8AF3, 0x5E0C }, 
-	{ 0x8AF4, 0x5E7E }, { 0x8AF5, 0x5FCC }, { 0x8AF6, 0x63EE }, { 0x8AF7, 0x673A }, { 0x8AF8, 0x65D7 }, { 0x8AF9, 0x65E2 }, { 0x8AFA, 0x671F }, { 0x8AFB, 0x68CB }, 
-	{ 0x8AFC, 0x68C4 }, { 0x8B40, 0x6A5F }, { 0x8B41, 0x5E30 }, { 0x8B42, 0x6BC5 }, { 0x8B43, 0x6C17 }, { 0x8B44, 0x6C7D }, { 0x8B45, 0x757F }, { 0x8B46, 0x7948 }, 
-	{ 0x8B47, 0x5B63 }, { 0x8B48, 0x7A00 }, { 0x8B49, 0x7D00 }, { 0x8B4A, 0x5FBD }, { 0x8B4B, 0x898F }, { 0x8B4C, 0x8A18 }, { 0x8B4D, 0x8CB4 }, { 0x8B4E, 0x8D77 }, 
-	{ 0x8B4F, 0x8ECC }, { 0x8B50, 0x8F1D }, { 0x8B51, 0x98E2 }, { 0x8B52, 0x9A0E }, { 0x8B53, 0x9B3C }, { 0x8B54, 0x4E80 }, { 0x8B55, 0x507D }, { 0x8B56, 0x5100 }, 
-	{ 0x8B57, 0x5993 }, { 0x8B58, 0x5B9C }, { 0x8B59, 0x622F }, { 0x8B5A, 0x6280 }, { 0x8B5B, 0x64EC }, { 0x8B5C, 0x6B3A }, { 0x8B5D, 0x72A0 }, { 0x8B5E, 0x7591 }, 
-	{ 0x8B5F, 0x7947 }, { 0x8B60, 0x7FA9 }, { 0x8B61, 0x87FB }, { 0x8B62, 0x8ABC }, { 0x8B63, 0x8B70 }, { 0x8B64, 0x63AC }, { 0x8B65, 0x83CA }, { 0x8B66, 0x97A0 }, 
-	{ 0x8B67, 0x5409 }, { 0x8B68, 0x5403 }, { 0x8B69, 0x55AB }, { 0x8B6A, 0x6854 }, { 0x8B6B, 0x6A58 }, { 0x8B6C, 0x8A70 }, { 0x8B6D, 0x7827 }, { 0x8B6E, 0x6775 }, 
-	{ 0x8B6F, 0x9ECD }, { 0x8B70, 0x5374 }, { 0x8B71, 0x5BA2 }, { 0x8B72, 0x811A }, { 0x8B73, 0x8650 }, { 0x8B74, 0x9006 }, { 0x8B75, 0x4E18 }, { 0x8B76, 0x4E45 }, 
-	{ 0x8B77, 0x4EC7 }, { 0x8B78, 0x4F11 }, { 0x8B79, 0x53CA }, { 0x8B7A, 0x5438 }, { 0x8B7B, 0x5BAE }, { 0x8B7C, 0x5F13 }, { 0x8B7D, 0x6025 }, { 0x8B7E, 0x6551 }, 
-	{ 0x8B80, 0x673D }, { 0x8B81, 0x6C42 }, { 0x8B82, 0x6C72 }, { 0x8B83, 0x6CE3 }, { 0x8B84, 0x7078 }, { 0x8B85, 0x7403 }, { 0x8B86, 0x7A76 }, { 0x8B87, 0x7AAE }, 
-	{ 0x8B88, 0x7B08 }, { 0x8B89, 0x7D1A }, { 0x8B8A, 0x7CFE }, { 0x8B8B, 0x7D66 }, { 0x8B8C, 0x65E7 }, { 0x8B8D, 0x725B }, { 0x8B8E, 0x53BB }, { 0x8B8F, 0x5C45 }, 
-	{ 0x8B90, 0x5DE8 }, { 0x8B91, 0x62D2 }, { 0x8B92, 0x62E0 }, { 0x8B93, 0x6319 }, { 0x8B94, 0x6E20 }, { 0x8B95, 0x865A }, { 0x8B96, 0x8A31 }, { 0x8B97, 0x8DDD }, 
-	{ 0x8B98, 0x92F8 }, { 0x8B99, 0x6F01 }, { 0x8B9A, 0x79A6 }, { 0x8B9B, 0x9B5A }, { 0x8B9C, 0x4EA8 }, { 0x8B9D, 0x4EAB }, { 0x8B9E, 0x4EAC }, { 0x8B9F, 0x4F9B }, 
-	{ 0x8BA0, 0x4FA0 }, { 0x8BA1, 0x50D1 }, { 0x8BA2, 0x5147 }, { 0x8BA3, 0x7AF6 }, { 0x8BA4, 0x5171 }, { 0x8BA5, 0x51F6 }, { 0x8BA6, 0x5354 }, { 0x8BA7, 0x5321 }, 
-	{ 0x8BA8, 0x537F }, { 0x8BA9, 0x53EB }, { 0x8BAA, 0x55AC }, { 0x8BAB, 0x5883 }, { 0x8BAC, 0x5CE1 }, { 0x8BAD, 0x5F37 }, { 0x8BAE, 0x5F4A }, { 0x8BAF, 0x602F }, 
-	{ 0x8BB0, 0x6050 }, { 0x8BB1, 0x606D }, { 0x8BB2, 0x631F }, { 0x8BB3, 0x6559 }, { 0x8BB4, 0x6A4B }, { 0x8BB5, 0x6CC1 }, { 0x8BB6, 0x72C2 }, { 0x8BB7, 0x72ED }, 
-	{ 0x8BB8, 0x77EF }, { 0x8BB9, 0x80F8 }, { 0x8BBA, 0x8105 }, { 0x8BBB, 0x8208 }, { 0x8BBC, 0x854E }, { 0x8BBD, 0x90F7 }, { 0x8BBE, 0x93E1 }, { 0x8BBF, 0x97FF }, 
-	{ 0x8BC0, 0x9957 }, { 0x8BC1, 0x9A5A }, { 0x8BC2, 0x4EF0 }, { 0x8BC3, 0x51DD }, { 0x8BC4, 0x5C2D }, { 0x8BC5, 0x6681 }, { 0x8BC6, 0x696D }, { 0x8BC7, 0x5C40 }, 
-	{ 0x8BC8, 0x66F2 }, { 0x8BC9, 0x6975 }, { 0x8BCA, 0x7389 }, { 0x8BCB, 0x6850 }, { 0x8BCC, 0x7C81 }, { 0x8BCD, 0x50C5 }, { 0x8BCE, 0x52E4 }, { 0x8BCF, 0x5747 }, 
-	{ 0x8BD0, 0x5DFE }, { 0x8BD1, 0x9326 }, { 0x8BD2, 0x65A4 }, { 0x8BD3, 0x6B23 }, { 0x8BD4, 0x6B3D }, { 0x8BD5, 0x7434 }, { 0x8BD6, 0x7981 }, { 0x8BD7, 0x79BD }, 
-	{ 0x8BD8, 0x7B4B }, { 0x8BD9, 0x7DCA }, { 0x8BDA, 0x82B9 }, { 0x8BDB, 0x83CC }, { 0x8BDC, 0x887F }, { 0x8BDD, 0x895F }, { 0x8BDE, 0x8B39 }, { 0x8BDF, 0x8FD1 }, 
-	{ 0x8BE0, 0x91D1 }, { 0x8BE1, 0x541F }, { 0x8BE2, 0x9280 }, { 0x8BE3, 0x4E5D }, { 0x8BE4, 0x5036 }, { 0x8BE5, 0x53E5 }, { 0x8BE6, 0x533A }, { 0x8BE7, 0x72D7 }, 
-	{ 0x8BE8, 0x7396 }, { 0x8BE9, 0x77E9 }, { 0x8BEA, 0x82E6 }, { 0x8BEB, 0x8EAF }, { 0x8BEC, 0x99C6 }, { 0x8BED, 0x99C8 }, { 0x8BEE, 0x99D2 }, { 0x8BEF, 0x5177 }, 
-	{ 0x8BF0, 0x611A }, { 0x8BF1, 0x865E }, { 0x8BF2, 0x55B0 }, { 0x8BF3, 0x7A7A }, { 0x8BF4, 0x5076 }, { 0x8BF5, 0x5BD3 }, { 0x8BF6, 0x9047 }, { 0x8BF7, 0x9685 }, 
-	{ 0x8BF8, 0x4E32 }, { 0x8BF9, 0x6ADB }, { 0x8BFA, 0x91E7 }, { 0x8BFB, 0x5C51 }, { 0x8BFC, 0x5C48 }, { 0x8C40, 0x6398 }, { 0x8C41, 0x7A9F }, { 0x8C42, 0x6C93 }, 
-	{ 0x8C43, 0x9774 }, { 0x8C44, 0x8F61 }, { 0x8C45, 0x7AAA }, { 0x8C46, 0x718A }, { 0x8C47, 0x9688 }, { 0x8C48, 0x7C82 }, { 0x8C49, 0x6817 }, { 0x8C4A, 0x7E70 }, 
-	{ 0x8C4B, 0x6851 }, { 0x8C4C, 0x936C }, { 0x8C4D, 0x52F2 }, { 0x8C4E, 0x541B }, { 0x8C4F, 0x85AB }, { 0x8C50, 0x8A13 }, { 0x8C51, 0x7FA4 }, { 0x8C52, 0x8ECD }, 
-	{ 0x8C53, 0x90E1 }, { 0x8C54, 0x5366 }, { 0x8C55, 0x8888 }, { 0x8C56, 0x7941 }, { 0x8C57, 0x4FC2 }, { 0x8C58, 0x50BE }, { 0x8C59, 0x5211 }, { 0x8C5A, 0x5144 }, 
-	{ 0x8C5B, 0x5553 }, { 0x8C5C, 0x572D }, { 0x8C5D, 0x73EA }, { 0x8C5E, 0x578B }, { 0x8C5F, 0x5951 }, { 0x8C60, 0x5F62 }, { 0x8C61, 0x5F84 }, { 0x8C62, 0x6075 }, 
-	{ 0x8C63, 0x6176 }, { 0x8C64, 0x6167 }, { 0x8C65, 0x61A9 }, { 0x8C66, 0x63B2 }, { 0x8C67, 0x643A }, { 0x8C68, 0x656C }, { 0x8C69, 0x666F }, { 0x8C6A, 0x6842 }, 
-	{ 0x8C6B, 0x6E13 }, { 0x8C6C, 0x7566 }, { 0x8C6D, 0x7A3D }, { 0x8C6E, 0x7CFB }, { 0x8C6F, 0x7D4C }, { 0x8C70, 0x7D99 }, { 0x8C71, 0x7E4B }, { 0x8C72, 0x7F6B }, 
-	{ 0x8C73, 0x830E }, { 0x8C74, 0x834A }, { 0x8C75, 0x86CD }, { 0x8C76, 0x8A08 }, { 0x8C77, 0x8A63 }, { 0x8C78, 0x8B66 }, { 0x8C79, 0x8EFD }, { 0x8C7A, 0x981A }, 
-	{ 0x8C7B, 0x9D8F }, { 0x8C7C, 0x82B8 }, { 0x8C7D, 0x8FCE }, { 0x8C7E, 0x9BE8 }, { 0x8C80, 0x5287 }, { 0x8C81, 0x621F }, { 0x8C82, 0x6483 }, { 0x8C83, 0x6FC0 }, 
-	{ 0x8C84, 0x9699 }, { 0x8C85, 0x6841 }, { 0x8C86, 0x5091 }, { 0x8C87, 0x6B20 }, { 0x8C88, 0x6C7A }, { 0x8C89, 0x6F54 }, { 0x8C8A, 0x7A74 }, { 0x8C8B, 0x7D50 }, 
-	{ 0x8C8C, 0x8840 }, { 0x8C8D, 0x8A23 }, { 0x8C8E, 0x6708 }, { 0x8C8F, 0x4EF6 }, { 0x8C90, 0x5039 }, { 0x8C91, 0x5026 }, { 0x8C92, 0x5065 }, { 0x8C93, 0x517C }, 
-	{ 0x8C94, 0x5238 }, { 0x8C95, 0x5263 }, { 0x8C96, 0x55A7 }, { 0x8C97, 0x570F }, { 0x8C98, 0x5805 }, { 0x8C99, 0x5ACC }, { 0x8C9A, 0x5EFA }, { 0x8C9B, 0x61B2 }, 
-	{ 0x8C9C, 0x61F8 }, { 0x8C9D, 0x62F3 }, { 0x8C9E, 0x6372 }, { 0x8C9F, 0x691C }, { 0x8CA0, 0x6A29 }, { 0x8CA1, 0x727D }, { 0x8CA2, 0x72AC }, { 0x8CA3, 0x732E }, 
-	{ 0x8CA4, 0x7814 }, { 0x8CA5, 0x786F }, { 0x8CA6, 0x7D79 }, { 0x8CA7, 0x770C }, { 0x8CA8, 0x80A9 }, { 0x8CA9, 0x898B }, { 0x8CAA, 0x8B19 }, { 0x8CAB, 0x8CE2 }, 
-	{ 0x8CAC, 0x8ED2 }, { 0x8CAD, 0x9063 }, { 0x8CAE, 0x9375 }, { 0x8CAF, 0x967A }, { 0x8CB0, 0x9855 }, { 0x8CB1, 0x9A13 }, { 0x8CB2, 0x9E78 }, { 0x8CB3, 0x5143 }, 
-	{ 0x8CB4, 0x539F }, { 0x8CB5, 0x53B3 }, { 0x8CB6, 0x5E7B }, { 0x8CB7, 0x5F26 }, { 0x8CB8, 0x6E1B }, { 0x8CB9, 0x6E90 }, { 0x8CBA, 0x7384 }, { 0x8CBB, 0x73FE }, 
-	{ 0x8CBC, 0x7D43 }, { 0x8CBD, 0x8237 }, { 0x8CBE, 0x8A00 }, { 0x8CBF, 0x8AFA }, { 0x8CC0, 0x9650 }, { 0x8CC1, 0x4E4E }, { 0x8CC2, 0x500B }, { 0x8CC3, 0x53E4 }, 
-	{ 0x8CC4, 0x547C }, { 0x8CC5, 0x56FA }, { 0x8CC6, 0x59D1 }, { 0x8CC7, 0x5B64 }, { 0x8CC8, 0x5DF1 }, { 0x8CC9, 0x5EAB }, { 0x8CCA, 0x5F27 }, { 0x8CCB, 0x6238 }, 
-	{ 0x8CCC, 0x6545 }, { 0x8CCD, 0x67AF }, { 0x8CCE, 0x6E56 }, { 0x8CCF, 0x72D0 }, { 0x8CD0, 0x7CCA }, { 0x8CD1, 0x88B4 }, { 0x8CD2, 0x80A1 }, { 0x8CD3, 0x80E1 }, 
-	{ 0x8CD4, 0x83F0 }, { 0x8CD5, 0x864E }, { 0x8CD6, 0x8A87 }, { 0x8CD7, 0x8DE8 }, { 0x8CD8, 0x9237 }, { 0x8CD9, 0x96C7 }, { 0x8CDA, 0x9867 }, { 0x8CDB, 0x9F13 }, 
-	{ 0x8CDC, 0x4E94 }, { 0x8CDD, 0x4E92 }, { 0x8CDE, 0x4F0D }, { 0x8CDF, 0x5348 }, { 0x8CE0, 0x5449 }, { 0x8CE1, 0x543E }, { 0x8CE2, 0x5A2F }, { 0x8CE3, 0x5F8C }, 
-	{ 0x8CE4, 0x5FA1 }, { 0x8CE5, 0x609F }, { 0x8CE6, 0x68A7 }, { 0x8CE7, 0x6A8E }, { 0x8CE8, 0x745A }, { 0x8CE9, 0x7881 }, { 0x8CEA, 0x8A9E }, { 0x8CEB, 0x8AA4 }, 
-	{ 0x8CEC, 0x8B77 }, { 0x8CED, 0x9190 }, { 0x8CEE, 0x4E5E }, { 0x8CEF, 0x9BC9 }, { 0x8CF0, 0x4EA4 }, { 0x8CF1, 0x4F7C }, { 0x8CF2, 0x4FAF }, { 0x8CF3, 0x5019 }, 
-	{ 0x8CF4, 0x5016 }, { 0x8CF5, 0x5149 }, { 0x8CF6, 0x516C }, { 0x8CF7, 0x529F }, { 0x8CF8, 0x52B9 }, { 0x8CF9, 0x52FE }, { 0x8CFA, 0x539A }, { 0x8CFB, 0x53E3 }, 
-	{ 0x8CFC, 0x5411 }, { 0x8D40, 0x540E }, { 0x8D41, 0x5589 }, { 0x8D42, 0x5751 }, { 0x8D43, 0x57A2 }, { 0x8D44, 0x597D }, { 0x8D45, 0x5B54 }, { 0x8D46, 0x5B5D }, 
-	{ 0x8D47, 0x5B8F }, { 0x8D48, 0x5DE5 }, { 0x8D49, 0x5DE7 }, { 0x8D4A, 0x5DF7 }, { 0x8D4B, 0x5E78 }, { 0x8D4C, 0x5E83 }, { 0x8D4D, 0x5E9A }, { 0x8D4E, 0x5EB7 }, 
-	{ 0x8D4F, 0x5F18 }, { 0x8D50, 0x6052 }, { 0x8D51, 0x614C }, { 0x8D52, 0x6297 }, { 0x8D53, 0x62D8 }, { 0x8D54, 0x63A7 }, { 0x8D55, 0x653B }, { 0x8D56, 0x6602 }, 
-	{ 0x8D57, 0x6643 }, { 0x8D58, 0x66F4 }, { 0x8D59, 0x676D }, { 0x8D5A, 0x6821 }, { 0x8D5B, 0x6897 }, { 0x8D5C, 0x69CB }, { 0x8D5D, 0x6C5F }, { 0x8D5E, 0x6D2A }, 
-	{ 0x8D5F, 0x6D69 }, { 0x8D60, 0x6E2F }, { 0x8D61, 0x6E9D }, { 0x8D62, 0x7532 }, { 0x8D63, 0x7687 }, { 0x8D64, 0x786C }, { 0x8D65, 0x7A3F }, { 0x8D66, 0x7CE0 }, 
-	{ 0x8D67, 0x7D05 }, { 0x8D68, 0x7D18 }, { 0x8D69, 0x7D5E }, { 0x8D6A, 0x7DB1 }, { 0x8D6B, 0x8015 }, { 0x8D6C, 0x8003 }, { 0x8D6D, 0x80AF }, { 0x8D6E, 0x80B1 }, 
-	{ 0x8D6F, 0x8154 }, { 0x8D70, 0x818F }, { 0x8D71, 0x822A }, { 0x8D72, 0x8352 }, { 0x8D73, 0x884C }, { 0x8D74, 0x8861 }, { 0x8D75, 0x8B1B }, { 0x8D76, 0x8CA2 }, 
-	{ 0x8D77, 0x8CFC }, { 0x8D78, 0x90CA }, { 0x8D79, 0x9175 }, { 0x8D7A, 0x9271 }, { 0x8D7B, 0x783F }, { 0x8D7C, 0x92FC }, { 0x8D7D, 0x95A4 }, { 0x8D7E, 0x964D }, 
-	{ 0x8D80, 0x9805 }, { 0x8D81, 0x9999 }, { 0x8D82, 0x9AD8 }, { 0x8D83, 0x9D3B }, { 0x8D84, 0x525B }, { 0x8D85, 0x52AB }, { 0x8D86, 0x53F7 }, { 0x8D87, 0x5408 }, 
-	{ 0x8D88, 0x58D5 }, { 0x8D89, 0x62F7 }, { 0x8D8A, 0x6FE0 }, { 0x8D8B, 0x8C6A }, { 0x8D8C, 0x8F5F }, { 0x8D8D, 0x9EB9 }, { 0x8D8E, 0x514B }, { 0x8D8F, 0x523B }, 
-	{ 0x8D90, 0x544A }, { 0x8D91, 0x56FD }, { 0x8D92, 0x7A40 }, { 0x8D93, 0x9177 }, { 0x8D94, 0x9D60 }, { 0x8D95, 0x9ED2 }, { 0x8D96, 0x7344 }, { 0x8D97, 0x6F09 }, 
-	{ 0x8D98, 0x8170 }, { 0x8D99, 0x7511 }, { 0x8D9A, 0x5FFD }, { 0x8D9B, 0x60DA }, { 0x8D9C, 0x9AA8 }, { 0x8D9D, 0x72DB }, { 0x8D9E, 0x8FBC }, { 0x8D9F, 0x6B64 }, 
-	{ 0x8DA0, 0x9803 }, { 0x8DA1, 0x4ECA }, { 0x8DA2, 0x56F0 }, { 0x8DA3, 0x5764 }, { 0x8DA4, 0x58BE }, { 0x8DA5, 0x5A5A }, { 0x8DA6, 0x6068 }, { 0x8DA7, 0x61C7 }, 
-	{ 0x8DA8, 0x660F }, { 0x8DA9, 0x6606 }, { 0x8DAA, 0x6839 }, { 0x8DAB, 0x68B1 }, { 0x8DAC, 0x6DF7 }, { 0x8DAD, 0x75D5 }, { 0x8DAE, 0x7D3A }, { 0x8DAF, 0x826E }, 
-	{ 0x8DB0, 0x9B42 }, { 0x8DB1, 0x4E9B }, { 0x8DB2, 0x4F50 }, { 0x8DB3, 0x53C9 }, { 0x8DB4, 0x5506 }, { 0x8DB5, 0x5D6F }, { 0x8DB6, 0x5DE6 }, { 0x8DB7, 0x5DEE }, 
-	{ 0x8DB8, 0x67FB }, { 0x8DB9, 0x6C99 }, { 0x8DBA, 0x7473 }, { 0x8DBB, 0x7802 }, { 0x8DBC, 0x8A50 }, { 0x8DBD, 0x9396 }, { 0x8DBE, 0x88DF }, { 0x8DBF, 0x5750 }, 
-	{ 0x8DC0, 0x5EA7 }, { 0x8DC1, 0x632B }, { 0x8DC2, 0x50B5 }, { 0x8DC3, 0x50AC }, { 0x8DC4, 0x518D }, { 0x8DC5, 0x6700 }, { 0x8DC6, 0x54C9 }, { 0x8DC7, 0x585E }, 
-	{ 0x8DC8, 0x59BB }, { 0x8DC9, 0x5BB0 }, { 0x8DCA, 0x5F69 }, { 0x8DCB, 0x624D }, { 0x8DCC, 0x63A1 }, { 0x8DCD, 0x683D }, { 0x8DCE, 0x6B73 }, { 0x8DCF, 0x6E08 }, 
-	{ 0x8DD0, 0x707D }, { 0x8DD1, 0x91C7 }, { 0x8DD2, 0x7280 }, { 0x8DD3, 0x7815 }, { 0x8DD4, 0x7826 }, { 0x8DD5, 0x796D }, { 0x8DD6, 0x658E }, { 0x8DD7, 0x7D30 }, 
-	{ 0x8DD8, 0x83DC }, { 0x8DD9, 0x88C1 }, { 0x8DDA, 0x8F09 }, { 0x8DDB, 0x969B }, { 0x8DDC, 0x5264 }, { 0x8DDD, 0x5728 }, { 0x8DDE, 0x6750 }, { 0x8DDF, 0x7F6A }, 
-	{ 0x8DE0, 0x8CA1 }, { 0x8DE1, 0x51B4 }, { 0x8DE2, 0x5742 }, { 0x8DE3, 0x962A }, { 0x8DE4, 0x583A }, { 0x8DE5, 0x698A }, { 0x8DE6, 0x80B4 }, { 0x8DE7, 0x54B2 }, 
-	{ 0x8DE8, 0x5D0E }, { 0x8DE9, 0x57FC }, { 0x8DEA, 0x7895 }, { 0x8DEB, 0x9DFA }, { 0x8DEC, 0x4F5C }, { 0x8DED, 0x524A }, { 0x8DEE, 0x548B }, { 0x8DEF, 0x643E }, 
-	{ 0x8DF0, 0x6628 }, { 0x8DF1, 0x6714 }, { 0x8DF2, 0x67F5 }, { 0x8DF3, 0x7A84 }, { 0x8DF4, 0x7B56 }, { 0x8DF5, 0x7D22 }, { 0x8DF6, 0x932F }, { 0x8DF7, 0x685C }, 
-	{ 0x8DF8, 0x9BAD }, { 0x8DF9, 0x7B39 }, { 0x8DFA, 0x5319 }, { 0x8DFB, 0x518A }, { 0x8DFC, 0x5237 }, { 0x8E40, 0x5BDF }, { 0x8E41, 0x62F6 }, { 0x8E42, 0x64AE }, 
-	{ 0x8E43, 0x64E6 }, { 0x8E44, 0x672D }, { 0x8E45, 0x6BBA }, { 0x8E46, 0x85A9 }, { 0x8E47, 0x96D1 }, { 0x8E48, 0x7690 }, { 0x8E49, 0x9BD6 }, { 0x8E4A, 0x634C }, 
-	{ 0x8E4B, 0x9306 }, { 0x8E4C, 0x9BAB }, { 0x8E4D, 0x76BF }, { 0x8E4E, 0x6652 }, { 0x8E4F, 0x4E09 }, { 0x8E50, 0x5098 }, { 0x8E51, 0x53C2 }, { 0x8E52, 0x5C71 }, 
-	{ 0x8E53, 0x60E8 }, { 0x8E54, 0x6492 }, { 0x8E55, 0x6563 }, { 0x8E56, 0x685F }, { 0x8E57, 0x71E6 }, { 0x8E58, 0x73CA }, { 0x8E59, 0x7523 }, { 0x8E5A, 0x7B97 }, 
-	{ 0x8E5B, 0x7E82 }, { 0x8E5C, 0x8695 }, { 0x8E5D, 0x8B83 }, { 0x8E5E, 0x8CDB }, { 0x8E5F, 0x9178 }, { 0x8E60, 0x9910 }, { 0x8E61, 0x65AC }, { 0x8E62, 0x66AB }, 
-	{ 0x8E63, 0x6B8B }, { 0x8E64, 0x4ED5 }, { 0x8E65, 0x4ED4 }, { 0x8E66, 0x4F3A }, { 0x8E67, 0x4F7F }, { 0x8E68, 0x523A }, { 0x8E69, 0x53F8 }, { 0x8E6A, 0x53F2 }, 
-	{ 0x8E6B, 0x55E3 }, { 0x8E6C, 0x56DB }, { 0x8E6D, 0x58EB }, { 0x8E6E, 0x59CB }, { 0x8E6F, 0x59C9 }, { 0x8E70, 0x59FF }, { 0x8E71, 0x5B50 }, { 0x8E72, 0x5C4D }, 
-	{ 0x8E73, 0x5E02 }, { 0x8E74, 0x5E2B }, { 0x8E75, 0x5FD7 }, { 0x8E76, 0x601D }, { 0x8E77, 0x6307 }, { 0x8E78, 0x652F }, { 0x8E79, 0x5B5C }, { 0x8E7A, 0x65AF }, 
-	{ 0x8E7B, 0x65BD }, { 0x8E7C, 0x65E8 }, { 0x8E7D, 0x679D }, { 0x8E7E, 0x6B62 }, { 0x8E80, 0x6B7B }, { 0x8E81, 0x6C0F }, { 0x8E82, 0x7345 }, { 0x8E83, 0x7949 }, 
-	{ 0x8E84, 0x79C1 }, { 0x8E85, 0x7CF8 }, { 0x8E86, 0x7D19 }, { 0x8E87, 0x7D2B }, { 0x8E88, 0x80A2 }, { 0x8E89, 0x8102 }, { 0x8E8A, 0x81F3 }, { 0x8E8B, 0x8996 }, 
-	{ 0x8E8C, 0x8A5E }, { 0x8E8D, 0x8A69 }, { 0x8E8E, 0x8A66 }, { 0x8E8F, 0x8A8C }, { 0x8E90, 0x8AEE }, { 0x8E91, 0x8CC7 }, { 0x8E92, 0x8CDC }, { 0x8E93, 0x96CC }, 
-	{ 0x8E94, 0x98FC }, { 0x8E95, 0x6B6F }, { 0x8E96, 0x4E8B }, { 0x8E97, 0x4F3C }, { 0x8E98, 0x4F8D }, { 0x8E99, 0x5150 }, { 0x8E9A, 0x5B57 }, { 0x8E9B, 0x5BFA }, 
-	{ 0x8E9C, 0x6148 }, { 0x8E9D, 0x6301 }, { 0x8E9E, 0x6642 }, { 0x8E9F, 0x6B21 }, { 0x8EA0, 0x6ECB }, { 0x8EA1, 0x6CBB }, { 0x8EA2, 0x723E }, { 0x8EA3, 0x74BD }, 
-	{ 0x8EA4, 0x75D4 }, { 0x8EA5, 0x78C1 }, { 0x8EA6, 0x793A }, { 0x8EA7, 0x800C }, { 0x8EA8, 0x8033 }, { 0x8EA9, 0x81EA }, { 0x8EAA, 0x8494 }, { 0x8EAB, 0x8F9E }, 
-	{ 0x8EAC, 0x6C50 }, { 0x8EAD, 0x9E7F }, { 0x8EAE, 0x5F0F }, { 0x8EAF, 0x8B58 }, { 0x8EB0, 0x9D2B }, { 0x8EB1, 0x7AFA }, { 0x8EB2, 0x8EF8 }, { 0x8EB3, 0x5B8D }, 
-	{ 0x8EB4, 0x96EB }, { 0x8EB5, 0x4E03 }, { 0x8EB6, 0x53F1 }, { 0x8EB7, 0x57F7 }, { 0x8EB8, 0x5931 }, { 0x8EB9, 0x5AC9 }, { 0x8EBA, 0x5BA4 }, { 0x8EBB, 0x6089 }, 
-	{ 0x8EBC, 0x6E7F }, { 0x8EBD, 0x6F06 }, { 0x8EBE, 0x75BE }, { 0x8EBF, 0x8CEA }, { 0x8EC0, 0x5B9F }, { 0x8EC1, 0x8500 }, { 0x8EC2, 0x7BE0 }, { 0x8EC3, 0x5072 }, 
-	{ 0x8EC4, 0x67F4 }, { 0x8EC5, 0x829D }, { 0x8EC6, 0x5C61 }, { 0x8EC7, 0x854A }, { 0x8EC8, 0x7E1E }, { 0x8EC9, 0x820E }, { 0x8ECA, 0x5199 }, { 0x8ECB, 0x5C04 }, 
-	{ 0x8ECC, 0x6368 }, { 0x8ECD, 0x8D66 }, { 0x8ECE, 0x659C }, { 0x8ECF, 0x716E }, { 0x8ED0, 0x793E }, { 0x8ED1, 0x7D17 }, { 0x8ED2, 0x8005 }, { 0x8ED3, 0x8B1D }, 
-	{ 0x8ED4, 0x8ECA }, { 0x8ED5, 0x906E }, { 0x8ED6, 0x86C7 }, { 0x8ED7, 0x90AA }, { 0x8ED8, 0x501F }, { 0x8ED9, 0x52FA }, { 0x8EDA, 0x5C3A }, { 0x8EDB, 0x6753 }, 
-	{ 0x8EDC, 0x707C }, { 0x8EDD, 0x7235 }, { 0x8EDE, 0x914C }, { 0x8EDF, 0x91C8 }, { 0x8EE0, 0x932B }, { 0x8EE1, 0x82E5 }, { 0x8EE2, 0x5BC2 }, { 0x8EE3, 0x5F31 }, 
-	{ 0x8EE4, 0x60F9 }, { 0x8EE5, 0x4E3B }, { 0x8EE6, 0x53D6 }, { 0x8EE7, 0x5B88 }, { 0x8EE8, 0x624B }, { 0x8EE9, 0x6731 }, { 0x8EEA, 0x6B8A }, { 0x8EEB, 0x72E9 }, 
-	{ 0x8EEC, 0x73E0 }, { 0x8EED, 0x7A2E }, { 0x8EEE, 0x816B }, { 0x8EEF, 0x8DA3 }, { 0x8EF0, 0x9152 }, { 0x8EF1, 0x9996 }, { 0x8EF2, 0x5112 }, { 0x8EF3, 0x53D7 }, 
-	{ 0x8EF4, 0x546A }, { 0x8EF5, 0x5BFF }, { 0x8EF6, 0x6388 }, { 0x8EF7, 0x6A39 }, { 0x8EF8, 0x7DAC }, { 0x8EF9, 0x9700 }, { 0x8EFA, 0x56DA }, { 0x8EFB, 0x53CE }, 
-	{ 0x8EFC, 0x5468 }, { 0x8F40, 0x5B97 }, { 0x8F41, 0x5C31 }, { 0x8F42, 0x5DDE }, { 0x8F43, 0x4FEE }, { 0x8F44, 0x6101 }, { 0x8F45, 0x62FE }, { 0x8F46, 0x6D32 }, 
-	{ 0x8F47, 0x79C0 }, { 0x8F48, 0x79CB }, { 0x8F49, 0x7D42 }, { 0x8F4A, 0x7E4D }, { 0x8F4B, 0x7FD2 }, { 0x8F4C, 0x81ED }, { 0x8F4D, 0x821F }, { 0x8F4E, 0x8490 }, 
-	{ 0x8F4F, 0x8846 }, { 0x8F50, 0x8972 }, { 0x8F51, 0x8B90 }, { 0x8F52, 0x8E74 }, { 0x8F53, 0x8F2F }, { 0x8F54, 0x9031 }, { 0x8F55, 0x914B }, { 0x8F56, 0x916C }, 
-	{ 0x8F57, 0x96C6 }, { 0x8F58, 0x919C }, { 0x8F59, 0x4EC0 }, { 0x8F5A, 0x4F4F }, { 0x8F5B, 0x5145 }, { 0x8F5C, 0x5341 }, { 0x8F5D, 0x5F93 }, { 0x8F5E, 0x620E }, 
-	{ 0x8F5F, 0x67D4 }, { 0x8F60, 0x6C41 }, { 0x8F61, 0x6E0B }, { 0x8F62, 0x7363 }, { 0x8F63, 0x7E26 }, { 0x8F64, 0x91CD }, { 0x8F65, 0x9283 }, { 0x8F66, 0x53D4 }, 
-	{ 0x8F67, 0x5919 }, { 0x8F68, 0x5BBF }, { 0x8F69, 0x6DD1 }, { 0x8F6A, 0x795D }, { 0x8F6B, 0x7E2E }, { 0x8F6C, 0x7C9B }, { 0x8F6D, 0x587E }, { 0x8F6E, 0x719F }, 
-	{ 0x8F6F, 0x51FA }, { 0x8F70, 0x8853 }, { 0x8F71, 0x8FF0 }, { 0x8F72, 0x4FCA }, { 0x8F73, 0x5CFB }, { 0x8F74, 0x6625 }, { 0x8F75, 0x77AC }, { 0x8F76, 0x7AE3 }, 
-	{ 0x8F77, 0x821C }, { 0x8F78, 0x99FF }, { 0x8F79, 0x51C6 }, { 0x8F7A, 0x5FAA }, { 0x8F7B, 0x65EC }, { 0x8F7C, 0x696F }, { 0x8F7D, 0x6B89 }, { 0x8F7E, 0x6DF3 }, 
-	{ 0x8F80, 0x6E96 }, { 0x8F81, 0x6F64 }, { 0x8F82, 0x76FE }, { 0x8F83, 0x7D14 }, { 0x8F84, 0x5DE1 }, { 0x8F85, 0x9075 }, { 0x8F86, 0x9187 }, { 0x8F87, 0x9806 }, 
-	{ 0x8F88, 0x51E6 }, { 0x8F89, 0x521D }, { 0x8F8A, 0x6240 }, { 0x8F8B, 0x6691 }, { 0x8F8C, 0x66D9 }, { 0x8F8D, 0x6E1A }, { 0x8F8E, 0x5EB6 }, { 0x8F8F, 0x7DD2 }, 
-	{ 0x8F90, 0x7F72 }, { 0x8F91, 0x66F8 }, { 0x8F92, 0x85AF }, { 0x8F93, 0x85F7 }, { 0x8F94, 0x8AF8 }, { 0x8F95, 0x52A9 }, { 0x8F96, 0x53D9 }, { 0x8F97, 0x5973 }, 
-	{ 0x8F98, 0x5E8F }, { 0x8F99, 0x5F90 }, { 0x8F9A, 0x6055 }, { 0x8F9B, 0x92E4 }, { 0x8F9C, 0x9664 }, { 0x8F9D, 0x50B7 }, { 0x8F9E, 0x511F }, { 0x8F9F, 0x52DD }, 
-	{ 0x8FA0, 0x5320 }, { 0x8FA1, 0x5347 }, { 0x8FA2, 0x53EC }, { 0x8FA3, 0x54E8 }, { 0x8FA4, 0x5546 }, { 0x8FA5, 0x5531 }, { 0x8FA6, 0x5617 }, { 0x8FA7, 0x5968 }, 
-	{ 0x8FA8, 0x59BE }, { 0x8FA9, 0x5A3C }, { 0x8FAA, 0x5BB5 }, { 0x8FAB, 0x5C06 }, { 0x8FAC, 0x5C0F }, { 0x8FAD, 0x5C11 }, { 0x8FAE, 0x5C1A }, { 0x8FAF, 0x5E84 }, 
-	{ 0x8FB0, 0x5E8A }, { 0x8FB1, 0x5EE0 }, { 0x8FB2, 0x5F70 }, { 0x8FB3, 0x627F }, { 0x8FB4, 0x6284 }, { 0x8FB5, 0x62DB }, { 0x8FB6, 0x638C }, { 0x8FB7, 0x6377 }, 
-	{ 0x8FB8, 0x6607 }, { 0x8FB9, 0x660C }, { 0x8FBA, 0x662D }, { 0x8FBB, 0x6676 }, { 0x8FBC, 0x677E }, { 0x8FBD, 0x68A2 }, { 0x8FBE, 0x6A1F }, { 0x8FBF, 0x6A35 }, 
-	{ 0x8FC0, 0x6CBC }, { 0x8FC1, 0x6D88 }, { 0x8FC2, 0x6E09 }, { 0x8FC3, 0x6E58 }, { 0x8FC4, 0x713C }, { 0x8FC5, 0x7126 }, { 0x8FC6, 0x7167 }, { 0x8FC7, 0x75C7 }, 
-	{ 0x8FC8, 0x7701 }, { 0x8FC9, 0x785D }, { 0x8FCA, 0x7901 }, { 0x8FCB, 0x7965 }, { 0x8FCC, 0x79F0 }, { 0x8FCD, 0x7AE0 }, { 0x8FCE, 0x7B11 }, { 0x8FCF, 0x7CA7 }, 
-	{ 0x8FD0, 0x7D39 }, { 0x8FD1, 0x8096 }, { 0x8FD2, 0x83D6 }, { 0x8FD3, 0x848B }, { 0x8FD4, 0x8549 }, { 0x8FD5, 0x885D }, { 0x8FD6, 0x88F3 }, { 0x8FD7, 0x8A1F }, 
-	{ 0x8FD8, 0x8A3C }, { 0x8FD9, 0x8A54 }, { 0x8FDA, 0x8A73 }, { 0x8FDB, 0x8C61 }, { 0x8FDC, 0x8CDE }, { 0x8FDD, 0x91A4 }, { 0x8FDE, 0x9266 }, { 0x8FDF, 0x937E }, 
-	{ 0x8FE0, 0x9418 }, { 0x8FE1, 0x969C }, { 0x8FE2, 0x9798 }, { 0x8FE3, 0x4E0A }, { 0x8FE4, 0x4E08 }, { 0x8FE5, 0x4E1E }, { 0x8FE6, 0x4E57 }, { 0x8FE7, 0x5197 }, 
-	{ 0x8FE8, 0x5270 }, { 0x8FE9, 0x57CE }, { 0x8FEA, 0x5834 }, { 0x8FEB, 0x58CC }, { 0x8FEC, 0x5B22 }, { 0x8FED, 0x5E38 }, { 0x8FEE, 0x60C5 }, { 0x8FEF, 0x64FE }, 
-	{ 0x8FF0, 0x6761 }, { 0x8FF1, 0x6756 }, { 0x8FF2, 0x6D44 }, { 0x8FF3, 0x72B6 }, { 0x8FF4, 0x7573 }, { 0x8FF5, 0x7A63 }, { 0x8FF6, 0x84B8 }, { 0x8FF7, 0x8B72 }, 
-	{ 0x8FF8, 0x91B8 }, { 0x8FF9, 0x9320 }, { 0x8FFA, 0x5631 }, { 0x8FFB, 0x57F4 }, { 0x8FFC, 0x98FE }, { 0x9040, 0x62ED }, { 0x9041, 0x690D }, { 0x9042, 0x6B96 }, 
-	{ 0x9043, 0x71ED }, { 0x9044, 0x7E54 }, { 0x9045, 0x8077 }, { 0x9046, 0x8272 }, { 0x9047, 0x89E6 }, { 0x9048, 0x98DF }, { 0x9049, 0x8755 }, { 0x904A, 0x8FB1 }, 
-	{ 0x904B, 0x5C3B }, { 0x904C, 0x4F38 }, { 0x904D, 0x4FE1 }, { 0x904E, 0x4FB5 }, { 0x904F, 0x5507 }, { 0x9050, 0x5A20 }, { 0x9051, 0x5BDD }, { 0x9052, 0x5BE9 }, 
-	{ 0x9053, 0x5FC3 }, { 0x9054, 0x614E }, { 0x9055, 0x632F }, { 0x9056, 0x65B0 }, { 0x9057, 0x664B }, { 0x9058, 0x68EE }, { 0x9059, 0x699B }, { 0x905A, 0x6D78 }, 
-	{ 0x905B, 0x6DF1 }, { 0x905C, 0x7533 }, { 0x905D, 0x75B9 }, { 0x905E, 0x771F }, { 0x905F, 0x795E }, { 0x9060, 0x79E6 }, { 0x9061, 0x7D33 }, { 0x9062, 0x81E3 }, 
-	{ 0x9063, 0x82AF }, { 0x9064, 0x85AA }, { 0x9065, 0x89AA }, { 0x9066, 0x8A3A }, { 0x9067, 0x8EAB }, { 0x9068, 0x8F9B }, { 0x9069, 0x9032 }, { 0x906A, 0x91DD }, 
-	{ 0x906B, 0x9707 }, { 0x906C, 0x4EBA }, { 0x906D, 0x4EC1 }, { 0x906E, 0x5203 }, { 0x906F, 0x5875 }, { 0x9070, 0x58EC }, { 0x9071, 0x5C0B }, { 0x9072, 0x751A }, 
-	{ 0x9073, 0x5C3D }, { 0x9074, 0x814E }, { 0x9075, 0x8A0A }, { 0x9076, 0x8FC5 }, { 0x9077, 0x9663 }, { 0x9078, 0x976D }, { 0x9079, 0x7B25 }, { 0x907A, 0x8ACF }, 
-	{ 0x907B, 0x9808 }, { 0x907C, 0x9162 }, { 0x907D, 0x56F3 }, { 0x907E, 0x53A8 }, { 0x9080, 0x9017 }, { 0x9081, 0x5439 }, { 0x9082, 0x5782 }, { 0x9083, 0x5E25 }, 
-	{ 0x9084, 0x63A8 }, { 0x9085, 0x6C34 }, { 0x9086, 0x708A }, { 0x9087, 0x7761 }, { 0x9088, 0x7C8B }, { 0x9089, 0x7FE0 }, { 0x908A, 0x8870 }, { 0x908B, 0x9042 }, 
-	{ 0x908C, 0x9154 }, { 0x908D, 0x9310 }, { 0x908E, 0x9318 }, { 0x908F, 0x968F }, { 0x9090, 0x745E }, { 0x9091, 0x9AC4 }, { 0x9092, 0x5D07 }, { 0x9093, 0x5D69 }, 
-	{ 0x9094, 0x6570 }, { 0x9095, 0x67A2 }, { 0x9096, 0x8DA8 }, { 0x9097, 0x96DB }, { 0x9098, 0x636E }, { 0x9099, 0x6749 }, { 0x909A, 0x6919 }, { 0x909B, 0x83C5 }, 
-	{ 0x909C, 0x9817 }, { 0x909D, 0x96C0 }, { 0x909E, 0x88FE }, { 0x909F, 0x6F84 }, { 0x90A0, 0x647A }, { 0x90A1, 0x5BF8 }, { 0x90A2, 0x4E16 }, { 0x90A3, 0x702C }, 
-	{ 0x90A4, 0x755D }, { 0x90A5, 0x662F }, { 0x90A6, 0x51C4 }, { 0x90A7, 0x5236 }, { 0x90A8, 0x52E2 }, { 0x90A9, 0x59D3 }, { 0x90AA, 0x5F81 }, { 0x90AB, 0x6027 }, 
-	{ 0x90AC, 0x6210 }, { 0x90AD, 0x653F }, { 0x90AE, 0x6574 }, { 0x90AF, 0x661F }, { 0x90B0, 0x6674 }, { 0x90B1, 0x68F2 }, { 0x90B2, 0x6816 }, { 0x90B3, 0x6B63 }, 
-	{ 0x90B4, 0x6E05 }, { 0x90B5, 0x7272 }, { 0x90B6, 0x751F }, { 0x90B7, 0x76DB }, { 0x90B8, 0x7CBE }, { 0x90B9, 0x8056 }, { 0x90BA, 0x58F0 }, { 0x90BB, 0x88FD }, 
-	{ 0x90BC, 0x897F }, { 0x90BD, 0x8AA0 }, { 0x90BE, 0x8A93 }, { 0x90BF, 0x8ACB }, { 0x90C0, 0x901D }, { 0x90C1, 0x9192 }, { 0x90C2, 0x9752 }, { 0x90C3, 0x9759 }, 
-	{ 0x90C4, 0x6589 }, { 0x90C5, 0x7A0E }, { 0x90C6, 0x8106 }, { 0x90C7, 0x96BB }, { 0x90C8, 0x5E2D }, { 0x90C9, 0x60DC }, { 0x90CA, 0x621A }, { 0x90CB, 0x65A5 }, 
-	{ 0x90CC, 0x6614 }, { 0x90CD, 0x6790 }, { 0x90CE, 0x77F3 }, { 0x90CF, 0x7A4D }, { 0x90D0, 0x7C4D }, { 0x90D1, 0x7E3E }, { 0x90D2, 0x810A }, { 0x90D3, 0x8CAC }, 
-	{ 0x90D4, 0x8D64 }, { 0x90D5, 0x8DE1 }, { 0x90D6, 0x8E5F }, { 0x90D7, 0x78A9 }, { 0x90D8, 0x5207 }, { 0x90D9, 0x62D9 }, { 0x90DA, 0x63A5 }, { 0x90DB, 0x6442 }, 
-	{ 0x90DC, 0x6298 }, { 0x90DD, 0x8A2D }, { 0x90DE, 0x7A83 }, { 0x90DF, 0x7BC0 }, { 0x90E0, 0x8AAC }, { 0x90E1, 0x96EA }, { 0x90E2, 0x7D76 }, { 0x90E3, 0x820C }, 
-	{ 0x90E4, 0x8749 }, { 0x90E5, 0x4ED9 }, { 0x90E6, 0x5148 }, { 0x90E7, 0x5343 }, { 0x90E8, 0x5360 }, { 0x90E9, 0x5BA3 }, { 0x90EA, 0x5C02 }, { 0x90EB, 0x5C16 }, 
-	{ 0x90EC, 0x5DDD }, { 0x90ED, 0x6226 }, { 0x90EE, 0x6247 }, { 0x90EF, 0x64B0 }, { 0x90F0, 0x6813 }, { 0x90F1, 0x6834 }, { 0x90F2, 0x6CC9 }, { 0x90F3, 0x6D45 }, 
-	{ 0x90F4, 0x6D17 }, { 0x90F5, 0x67D3 }, { 0x90F6, 0x6F5C }, { 0x90F7, 0x714E }, { 0x90F8, 0x717D }, { 0x90F9, 0x65CB }, { 0x90FA, 0x7A7F }, { 0x90FB, 0x7BAD }, 
-	{ 0x90FC, 0x7DDA }, { 0x9140, 0x7E4A }, { 0x9141, 0x7FA8 }, { 0x9142, 0x817A }, { 0x9143, 0x821B }, { 0x9144, 0x8239 }, { 0x9145, 0x85A6 }, { 0x9146, 0x8A6E }, 
-	{ 0x9147, 0x8CCE }, { 0x9148, 0x8DF5 }, { 0x9149, 0x9078 }, { 0x914A, 0x9077 }, { 0x914B, 0x92AD }, { 0x914C, 0x9291 }, { 0x914D, 0x9583 }, { 0x914E, 0x9BAE }, 
-	{ 0x914F, 0x524D }, { 0x9150, 0x5584 }, { 0x9151, 0x6F38 }, { 0x9152, 0x7136 }, { 0x9153, 0x5168 }, { 0x9154, 0x7985 }, { 0x9155, 0x7E55 }, { 0x9156, 0x81B3 }, 
-	{ 0x9157, 0x7CCE }, { 0x9158, 0x564C }, { 0x9159, 0x5851 }, { 0x915A, 0x5CA8 }, { 0x915B, 0x63AA }, { 0x915C, 0x66FE }, { 0x915D, 0x66FD }, { 0x915E, 0x695A }, 
-	{ 0x915F, 0x72D9 }, { 0x9160, 0x758F }, { 0x9161, 0x758E }, { 0x9162, 0x790E }, { 0x9163, 0x7956 }, { 0x9164, 0x79DF }, { 0x9165, 0x7C97 }, { 0x9166, 0x7D20 }, 
-	{ 0x9167, 0x7D44 }, { 0x9168, 0x8607 }, { 0x9169, 0x8A34 }, { 0x916A, 0x963B }, { 0x916B, 0x9061 }, { 0x916C, 0x9F20 }, { 0x916D, 0x50E7 }, { 0x916E, 0x5275 }, 
-	{ 0x916F, 0x53CC }, { 0x9170, 0x53E2 }, { 0x9171, 0x5009 }, { 0x9172, 0x55AA }, { 0x9173, 0x58EE }, { 0x9174, 0x594F }, { 0x9175, 0x723D }, { 0x9176, 0x5B8B }, 
-	{ 0x9177, 0x5C64 }, { 0x9178, 0x531D }, { 0x9179, 0x60E3 }, { 0x917A, 0x60F3 }, { 0x917B, 0x635C }, { 0x917C, 0x6383 }, { 0x917D, 0x633F }, { 0x917E, 0x63BB }, 
-	{ 0x9180, 0x64CD }, { 0x9181, 0x65E9 }, { 0x9182, 0x66F9 }, { 0x9183, 0x5DE3 }, { 0x9184, 0x69CD }, { 0x9185, 0x69FD }, { 0x9186, 0x6F15 }, { 0x9187, 0x71E5 }, 
-	{ 0x9188, 0x4E89 }, { 0x9189, 0x75E9 }, { 0x918A, 0x76F8 }, { 0x918B, 0x7A93 }, { 0x918C, 0x7CDF }, { 0x918D, 0x7DCF }, { 0x918E, 0x7D9C }, { 0x918F, 0x8061 }, 
-	{ 0x9190, 0x8349 }, { 0x9191, 0x8358 }, { 0x9192, 0x846C }, { 0x9193, 0x84BC }, { 0x9194, 0x85FB }, { 0x9195, 0x88C5 }, { 0x9196, 0x8D70 }, { 0x9197, 0x9001 }, 
-	{ 0x9198, 0x906D }, { 0x9199, 0x9397 }, { 0x919A, 0x971C }, { 0x919B, 0x9A12 }, { 0x919C, 0x50CF }, { 0x919D, 0x5897 }, { 0x919E, 0x618E }, { 0x919F, 0x81D3 }, 
-	{ 0x91A0, 0x8535 }, { 0x91A1, 0x8D08 }, { 0x91A2, 0x9020 }, { 0x91A3, 0x4FC3 }, { 0x91A4, 0x5074 }, { 0x91A5, 0x5247 }, { 0x91A6, 0x5373 }, { 0x91A7, 0x606F }, 
-	{ 0x91A8, 0x6349 }, { 0x91A9, 0x675F }, { 0x91AA, 0x6E2C }, { 0x91AB, 0x8DB3 }, { 0x91AC, 0x901F }, { 0x91AD, 0x4FD7 }, { 0x91AE, 0x5C5E }, { 0x91AF, 0x8CCA }, 
-	{ 0x91B0, 0x65CF }, { 0x91B1, 0x7D9A }, { 0x91B2, 0x5352 }, { 0x91B3, 0x8896 }, { 0x91B4, 0x5176 }, { 0x91B5, 0x63C3 }, { 0x91B6, 0x5B58 }, { 0x91B7, 0x5B6B }, 
-	{ 0x91B8, 0x5C0A }, { 0x91B9, 0x640D }, { 0x91BA, 0x6751 }, { 0x91BB, 0x905C }, { 0x91BC, 0x4ED6 }, { 0x91BD, 0x591A }, { 0x91BE, 0x592A }, { 0x91BF, 0x6C70 }, 
-	{ 0x91C0, 0x8A51 }, { 0x91C1, 0x553E }, { 0x91C2, 0x5815 }, { 0x91C3, 0x59A5 }, { 0x91C4, 0x60F0 }, { 0x91C5, 0x6253 }, { 0x91C6, 0x67C1 }, { 0x91C7, 0x8235 }, 
-	{ 0x91C8, 0x6955 }, { 0x91C9, 0x9640 }, { 0x91CA, 0x99C4 }, { 0x91CB, 0x9A28 }, { 0x91CC, 0x4F53 }, { 0x91CD, 0x5806 }, { 0x91CE, 0x5BFE }, { 0x91CF, 0x8010 }, 
-	{ 0x91D0, 0x5CB1 }, { 0x91D1, 0x5E2F }, { 0x91D2, 0x5F85 }, { 0x91D3, 0x6020 }, { 0x91D4, 0x614B }, { 0x91D5, 0x6234 }, { 0x91D6, 0x66FF }, { 0x91D7, 0x6CF0 }, 
-	{ 0x91D8, 0x6EDE }, { 0x91D9, 0x80CE }, { 0x91DA, 0x817F }, { 0x91DB, 0x82D4 }, { 0x91DC, 0x888B }, { 0x91DD, 0x8CB8 }, { 0x91DE, 0x9000 }, { 0x91DF, 0x902E }, 
-	{ 0x91E0, 0x968A }, { 0x91E1, 0x9EDB }, { 0x91E2, 0x9BDB }, { 0x91E3, 0x4EE3 }, { 0x91E4, 0x53F0 }, { 0x91E5, 0x5927 }, { 0x91E6, 0x7B2C }, { 0x91E7, 0x918D }, 
-	{ 0x91E8, 0x984C }, { 0x91E9, 0x9DF9 }, { 0x91EA, 0x6EDD }, { 0x91EB, 0x7027 }, { 0x91EC, 0x5353 }, { 0x91ED, 0x5544 }, { 0x91EE, 0x5B85 }, { 0x91EF, 0x6258 }, 
-	{ 0x91F0, 0x629E }, { 0x91F1, 0x62D3 }, { 0x91F2, 0x6CA2 }, { 0x91F3, 0x6FEF }, { 0x91F4, 0x7422 }, { 0x91F5, 0x8A17 }, { 0x91F6, 0x9438 }, { 0x91F7, 0x6FC1 }, 
-	{ 0x91F8, 0x8AFE }, { 0x91F9, 0x8338 }, { 0x91FA, 0x51E7 }, { 0x91FB, 0x86F8 }, { 0x91FC, 0x53EA }, { 0x9240, 0x53E9 }, { 0x9241, 0x4F46 }, { 0x9242, 0x9054 }, 
-	{ 0x9243, 0x8FB0 }, { 0x9244, 0x596A }, { 0x9245, 0x8131 }, { 0x9246, 0x5DFD }, { 0x9247, 0x7AEA }, { 0x9248, 0x8FBF }, { 0x9249, 0x68DA }, { 0x924A, 0x8C37 }, 
-	{ 0x924B, 0x72F8 }, { 0x924C, 0x9C48 }, { 0x924D, 0x6A3D }, { 0x924E, 0x8AB0 }, { 0x924F, 0x4E39 }, { 0x9250, 0x5358 }, { 0x9251, 0x5606 }, { 0x9252, 0x5766 }, 
-	{ 0x9253, 0x62C5 }, { 0x9254, 0x63A2 }, { 0x9255, 0x65E6 }, { 0x9256, 0x6B4E }, { 0x9257, 0x6DE1 }, { 0x9258, 0x6E5B }, { 0x9259, 0x70AD }, { 0x925A, 0x77ED }, 
-	{ 0x925B, 0x7AEF }, { 0x925C, 0x7BAA }, { 0x925D, 0x7DBB }, { 0x925E, 0x803D }, { 0x925F, 0x80C6 }, { 0x9260, 0x86CB }, { 0x9261, 0x8A95 }, { 0x9262, 0x935B }, 
-	{ 0x9263, 0x56E3 }, { 0x9264, 0x58C7 }, { 0x9265, 0x5F3E }, { 0x9266, 0x65AD }, { 0x9267, 0x6696 }, { 0x9268, 0x6A80 }, { 0x9269, 0x6BB5 }, { 0x926A, 0x7537 }, 
-	{ 0x926B, 0x8AC7 }, { 0x926C, 0x5024 }, { 0x926D, 0x77E5 }, { 0x926E, 0x5730 }, { 0x926F, 0x5F1B }, { 0x9270, 0x6065 }, { 0x9271, 0x667A }, { 0x9272, 0x6C60 }, 
-	{ 0x9273, 0x75F4 }, { 0x9274, 0x7A1A }, { 0x9275, 0x7F6E }, { 0x9276, 0x81F4 }, { 0x9277, 0x8718 }, { 0x9278, 0x9045 }, { 0x9279, 0x99B3 }, { 0x927A, 0x7BC9 }, 
-	{ 0x927B, 0x755C }, { 0x927C, 0x7AF9 }, { 0x927D, 0x7B51 }, { 0x927E, 0x84C4 }, { 0x9280, 0x9010 }, { 0x9281, 0x79E9 }, { 0x9282, 0x7A92 }, { 0x9283, 0x8336 }, 
-	{ 0x9284, 0x5AE1 }, { 0x9285, 0x7740 }, { 0x9286, 0x4E2D }, { 0x9287, 0x4EF2 }, { 0x9288, 0x5B99 }, { 0x9289, 0x5FE0 }, { 0x928A, 0x62BD }, { 0x928B, 0x663C }, 
-	{ 0x928C, 0x67F1 }, { 0x928D, 0x6CE8 }, { 0x928E, 0x866B }, { 0x928F, 0x8877 }, { 0x9290, 0x8A3B }, { 0x9291, 0x914E }, { 0x9292, 0x92F3 }, { 0x9293, 0x99D0 }, 
-	{ 0x9294, 0x6A17 }, { 0x9295, 0x7026 }, { 0x9296, 0x732A }, { 0x9297, 0x82E7 }, { 0x9298, 0x8457 }, { 0x9299, 0x8CAF }, { 0x929A, 0x4E01 }, { 0x929B, 0x5146 }, 
-	{ 0x929C, 0x51CB }, { 0x929D, 0x558B }, { 0x929E, 0x5BF5 }, { 0x929F, 0x5E16 }, { 0x92A0, 0x5E33 }, { 0x92A1, 0x5E81 }, { 0x92A2, 0x5F14 }, { 0x92A3, 0x5F35 }, 
-	{ 0x92A4, 0x5F6B }, { 0x92A5, 0x5FB4 }, { 0x92A6, 0x61F2 }, { 0x92A7, 0x6311 }, { 0x92A8, 0x66A2 }, { 0x92A9, 0x671D }, { 0x92AA, 0x6F6E }, { 0x92AB, 0x7252 }, 
-	{ 0x92AC, 0x753A }, { 0x92AD, 0x773A }, { 0x92AE, 0x8074 }, { 0x92AF, 0x8139 }, { 0x92B0, 0x8178 }, { 0x92B1, 0x8776 }, { 0x92B2, 0x8ABF }, { 0x92B3, 0x8ADC }, 
-	{ 0x92B4, 0x8D85 }, { 0x92B5, 0x8DF3 }, { 0x92B6, 0x929A }, { 0x92B7, 0x9577 }, { 0x92B8, 0x9802 }, { 0x92B9, 0x9CE5 }, { 0x92BA, 0x52C5 }, { 0x92BB, 0x6357 }, 
-	{ 0x92BC, 0x76F4 }, { 0x92BD, 0x6715 }, { 0x92BE, 0x6C88 }, { 0x92BF, 0x73CD }, { 0x92C0, 0x8CC3 }, { 0x92C1, 0x93AE }, { 0x92C2, 0x9673 }, { 0x92C3, 0x6D25 }, 
-	{ 0x92C4, 0x589C }, { 0x92C5, 0x690E }, { 0x92C6, 0x69CC }, { 0x92C7, 0x8FFD }, { 0x92C8, 0x939A }, { 0x92C9, 0x75DB }, { 0x92CA, 0x901A }, { 0x92CB, 0x585A }, 
-	{ 0x92CC, 0x6802 }, { 0x92CD, 0x63B4 }, { 0x92CE, 0x69FB }, { 0x92CF, 0x4F43 }, { 0x92D0, 0x6F2C }, { 0x92D1, 0x67D8 }, { 0x92D2, 0x8FBB }, { 0x92D3, 0x8526 }, 
-	{ 0x92D4, 0x7DB4 }, { 0x92D5, 0x9354 }, { 0x92D6, 0x693F }, { 0x92D7, 0x6F70 }, { 0x92D8, 0x576A }, { 0x92D9, 0x58F7 }, { 0x92DA, 0x5B2C }, { 0x92DB, 0x7D2C }, 
-	{ 0x92DC, 0x722A }, { 0x92DD, 0x540A }, { 0x92DE, 0x91E3 }, { 0x92DF, 0x9DB4 }, { 0x92E0, 0x4EAD }, { 0x92E1, 0x4F4E }, { 0x92E2, 0x505C }, { 0x92E3, 0x5075 }, 
-	{ 0x92E4, 0x5243 }, { 0x92E5, 0x8C9E }, { 0x92E6, 0x5448 }, { 0x92E7, 0x5824 }, { 0x92E8, 0x5B9A }, { 0x92E9, 0x5E1D }, { 0x92EA, 0x5E95 }, { 0x92EB, 0x5EAD }, 
-	{ 0x92EC, 0x5EF7 }, { 0x92ED, 0x5F1F }, { 0x92EE, 0x608C }, { 0x92EF, 0x62B5 }, { 0x92F0, 0x633A }, { 0x92F1, 0x63D0 }, { 0x92F2, 0x68AF }, { 0x92F3, 0x6C40 }, 
-	{ 0x92F4, 0x7887 }, { 0x92F5, 0x798E }, { 0x92F6, 0x7A0B }, { 0x92F7, 0x7DE0 }, { 0x92F8, 0x8247 }, { 0x92F9, 0x8A02 }, { 0x92FA, 0x8AE6 }, { 0x92FB, 0x8E44 }, 
-	{ 0x92FC, 0x9013 }, { 0x9340, 0x90B8 }, { 0x9341, 0x912D }, { 0x9342, 0x91D8 }, { 0x9343, 0x9F0E }, { 0x9344, 0x6CE5 }, { 0x9345, 0x6458 }, { 0x9346, 0x64E2 }, 
-	{ 0x9347, 0x6575 }, { 0x9348, 0x6EF4 }, { 0x9349, 0x7684 }, { 0x934A, 0x7B1B }, { 0x934B, 0x9069 }, { 0x934C, 0x93D1 }, { 0x934D, 0x6EBA }, { 0x934E, 0x54F2 }, 
-	{ 0x934F, 0x5FB9 }, { 0x9350, 0x64A4 }, { 0x9351, 0x8F4D }, { 0x9352, 0x8FED }, { 0x9353, 0x9244 }, { 0x9354, 0x5178 }, { 0x9355, 0x586B }, { 0x9356, 0x5929 }, 
-	{ 0x9357, 0x5C55 }, { 0x9358, 0x5E97 }, { 0x9359, 0x6DFB }, { 0x935A, 0x7E8F }, { 0x935B, 0x751C }, { 0x935C, 0x8CBC }, { 0x935D, 0x8EE2 }, { 0x935E, 0x985B }, 
-	{ 0x935F, 0x70B9 }, { 0x9360, 0x4F1D }, { 0x9361, 0x6BBF }, { 0x9362, 0x6FB1 }, { 0x9363, 0x7530 }, { 0x9364, 0x96FB }, { 0x9365, 0x514E }, { 0x9366, 0x5410 }, 
-	{ 0x9367, 0x5835 }, { 0x9368, 0x5857 }, { 0x9369, 0x59AC }, { 0x936A, 0x5C60 }, { 0x936B, 0x5F92 }, { 0x936C, 0x6597 }, { 0x936D, 0x675C }, { 0x936E, 0x6E21 }, 
-	{ 0x936F, 0x767B }, { 0x9370, 0x83DF }, { 0x9371, 0x8CED }, { 0x9372, 0x9014 }, { 0x9373, 0x90FD }, { 0x9374, 0x934D }, { 0x9375, 0x7825 }, { 0x9376, 0x783A }, 
-	{ 0x9377, 0x52AA }, { 0x9378, 0x5EA6 }, { 0x9379, 0x571F }, { 0x937A, 0x5974 }, { 0x937B, 0x6012 }, { 0x937C, 0x5012 }, { 0x937D, 0x515A }, { 0x937E, 0x51AC }, 
-	{ 0x9380, 0x51CD }, { 0x9381, 0x5200 }, { 0x9382, 0x5510 }, { 0x9383, 0x5854 }, { 0x9384, 0x5858 }, { 0x9385, 0x5957 }, { 0x9386, 0x5B95 }, { 0x9387, 0x5CF6 }, 
-	{ 0x9388, 0x5D8B }, { 0x9389, 0x60BC }, { 0x938A, 0x6295 }, { 0x938B, 0x642D }, { 0x938C, 0x6771 }, { 0x938D, 0x6843 }, { 0x938E, 0x68BC }, { 0x938F, 0x68DF }, 
-	{ 0x9390, 0x76D7 }, { 0x9391, 0x6DD8 }, { 0x9392, 0x6E6F }, { 0x9393, 0x6D9B }, { 0x9394, 0x706F }, { 0x9395, 0x71C8 }, { 0x9396, 0x5F53 }, { 0x9397, 0x75D8 }, 
-	{ 0x9398, 0x7977 }, { 0x9399, 0x7B49 }, { 0x939A, 0x7B54 }, { 0x939B, 0x7B52 }, { 0x939C, 0x7CD6 }, { 0x939D, 0x7D71 }, { 0x939E, 0x5230 }, { 0x939F, 0x8463 }, 
-	{ 0x93A0, 0x8569 }, { 0x93A1, 0x85E4 }, { 0x93A2, 0x8A0E }, { 0x93A3, 0x8B04 }, { 0x93A4, 0x8C46 }, { 0x93A5, 0x8E0F }, { 0x93A6, 0x9003 }, { 0x93A7, 0x900F }, 
-	{ 0x93A8, 0x9419 }, { 0x93A9, 0x9676 }, { 0x93AA, 0x982D }, { 0x93AB, 0x9A30 }, { 0x93AC, 0x95D8 }, { 0x93AD, 0x50CD }, { 0x93AE, 0x52D5 }, { 0x93AF, 0x540C }, 
-	{ 0x93B0, 0x5802 }, { 0x93B1, 0x5C0E }, { 0x93B2, 0x61A7 }, { 0x93B3, 0x649E }, { 0x93B4, 0x6D1E }, { 0x93B5, 0x77B3 }, { 0x93B6, 0x7AE5 }, { 0x93B7, 0x80F4 }, 
-	{ 0x93B8, 0x8404 }, { 0x93B9, 0x9053 }, { 0x93BA, 0x9285 }, { 0x93BB, 0x5CE0 }, { 0x93BC, 0x9D07 }, { 0x93BD, 0x533F }, { 0x93BE, 0x5F97 }, { 0x93BF, 0x5FB3 }, 
-	{ 0x93C0, 0x6D9C }, { 0x93C1, 0x7279 }, { 0x93C2, 0x7763 }, { 0x93C3, 0x79BF }, { 0x93C4, 0x7BE4 }, { 0x93C5, 0x6BD2 }, { 0x93C6, 0x72EC }, { 0x93C7, 0x8AAD }, 
-	{ 0x93C8, 0x6803 }, { 0x93C9, 0x6A61 }, { 0x93CA, 0x51F8 }, { 0x93CB, 0x7A81 }, { 0x93CC, 0x6934 }, { 0x93CD, 0x5C4A }, { 0x93CE, 0x9CF6 }, { 0x93CF, 0x82EB }, 
-	{ 0x93D0, 0x5BC5 }, { 0x93D1, 0x9149 }, { 0x93D2, 0x701E }, { 0x93D3, 0x5678 }, { 0x93D4, 0x5C6F }, { 0x93D5, 0x60C7 }, { 0x93D6, 0x6566 }, { 0x93D7, 0x6C8C }, 
-	{ 0x93D8, 0x8C5A }, { 0x93D9, 0x9041 }, { 0x93DA, 0x9813 }, { 0x93DB, 0x5451 }, { 0x93DC, 0x66C7 }, { 0x93DD, 0x920D }, { 0x93DE, 0x5948 }, { 0x93DF, 0x90A3 }, 
-	{ 0x93E0, 0x5185 }, { 0x93E1, 0x4E4D }, { 0x93E2, 0x51EA }, { 0x93E3, 0x8599 }, { 0x93E4, 0x8B0E }, { 0x93E5, 0x7058 }, { 0x93E6, 0x637A }, { 0x93E7, 0x934B }, 
-	{ 0x93E8, 0x6962 }, { 0x93E9, 0x99B4 }, { 0x93EA, 0x7E04 }, { 0x93EB, 0x7577 }, { 0x93EC, 0x5357 }, { 0x93ED, 0x6960 }, { 0x93EE, 0x8EDF }, { 0x93EF, 0x96E3 }, 
-	{ 0x93F0, 0x6C5D }, { 0x93F1, 0x4E8C }, { 0x93F2, 0x5C3C }, { 0x93F3, 0x5F10 }, { 0x93F4, 0x8FE9 }, { 0x93F5, 0x5302 }, { 0x93F6, 0x8CD1 }, { 0x93F7, 0x8089 }, 
-	{ 0x93F8, 0x8679 }, { 0x93F9, 0x5EFF }, { 0x93FA, 0x65E5 }, { 0x93FB, 0x4E73 }, { 0x93FC, 0x5165 }, { 0x9440, 0x5982 }, { 0x9441, 0x5C3F }, { 0x9442, 0x97EE }, 
-	{ 0x9443, 0x4EFB }, { 0x9444, 0x598A }, { 0x9445, 0x5FCD }, { 0x9446, 0x8A8D }, { 0x9447, 0x6FE1 }, { 0x9448, 0x79B0 }, { 0x9449, 0x7962 }, { 0x944A, 0x5BE7 }, 
-	{ 0x944B, 0x8471 }, { 0x944C, 0x732B }, { 0x944D, 0x71B1 }, { 0x944E, 0x5E74 }, { 0x944F, 0x5FF5 }, { 0x9450, 0x637B }, { 0x9451, 0x649A }, { 0x9452, 0x71C3 }, 
-	{ 0x9453, 0x7C98 }, { 0x9454, 0x4E43 }, { 0x9455, 0x5EFC }, { 0x9456, 0x4E4B }, { 0x9457, 0x57DC }, { 0x9458, 0x56A2 }, { 0x9459, 0x60A9 }, { 0x945A, 0x6FC3 }, 
-	{ 0x945B, 0x7D0D }, { 0x945C, 0x80FD }, { 0x945D, 0x8133 }, { 0x945E, 0x81BF }, { 0x945F, 0x8FB2 }, { 0x9460, 0x8997 }, { 0x9461, 0x86A4 }, { 0x9462, 0x5DF4 }, 
-	{ 0x9463, 0x628A }, { 0x9464, 0x64AD }, { 0x9465, 0x8987 }, { 0x9466, 0x6777 }, { 0x9467, 0x6CE2 }, { 0x9468, 0x6D3E }, { 0x9469, 0x7436 }, { 0x946A, 0x7834 }, 
-	{ 0x946B, 0x5A46 }, { 0x946C, 0x7F75 }, { 0x946D, 0x82AD }, { 0x946E, 0x99AC }, { 0x946F, 0x4FF3 }, { 0x9470, 0x5EC3 }, { 0x9471, 0x62DD }, { 0x9472, 0x6392 }, 
-	{ 0x9473, 0x6557 }, { 0x9474, 0x676F }, { 0x9475, 0x76C3 }, { 0x9476, 0x724C }, { 0x9477, 0x80CC }, { 0x9478, 0x80BA }, { 0x9479, 0x8F29 }, { 0x947A, 0x914D }, 
-	{ 0x947B, 0x500D }, { 0x947C, 0x57F9 }, { 0x947D, 0x5A92 }, { 0x947E, 0x6885 }, { 0x9480, 0x6973 }, { 0x9481, 0x7164 }, { 0x9482, 0x72FD }, { 0x9483, 0x8CB7 }, 
-	{ 0x9484, 0x58F2 }, { 0x9485, 0x8CE0 }, { 0x9486, 0x966A }, { 0x9487, 0x9019 }, { 0x9488, 0x877F }, { 0x9489, 0x79E4 }, { 0x948A, 0x77E7 }, { 0x948B, 0x8429 }, 
-	{ 0x948C, 0x4F2F }, { 0x948D, 0x5265 }, { 0x948E, 0x535A }, { 0x948F, 0x62CD }, { 0x9490, 0x67CF }, { 0x9491, 0x6CCA }, { 0x9492, 0x767D }, { 0x9493, 0x7B94 }, 
-	{ 0x9494, 0x7C95 }, { 0x9495, 0x8236 }, { 0x9496, 0x8584 }, { 0x9497, 0x8FEB }, { 0x9498, 0x66DD }, { 0x9499, 0x6F20 }, { 0x949A, 0x7206 }, { 0x949B, 0x7E1B }, 
-	{ 0x949C, 0x83AB }, { 0x949D, 0x99C1 }, { 0x949E, 0x9EA6 }, { 0x949F, 0x51FD }, { 0x94A0, 0x7BB1 }, { 0x94A1, 0x7872 }, { 0x94A2, 0x7BB8 }, { 0x94A3, 0x8087 }, 
-	{ 0x94A4, 0x7B48 }, { 0x94A5, 0x6AE8 }, { 0x94A6, 0x5E61 }, { 0x94A7, 0x808C }, { 0x94A8, 0x7551 }, { 0x94A9, 0x7560 }, { 0x94AA, 0x516B }, { 0x94AB, 0x9262 }, 
-	{ 0x94AC, 0x6E8C }, { 0x94AD, 0x767A }, { 0x94AE, 0x9197 }, { 0x94AF, 0x9AEA }, { 0x94B0, 0x4F10 }, { 0x94B1, 0x7F70 }, { 0x94B2, 0x629C }, { 0x94B3, 0x7B4F }, 
-	{ 0x94B4, 0x95A5 }, { 0x94B5, 0x9CE9 }, { 0x94B6, 0x567A }, { 0x94B7, 0x5859 }, { 0x94B8, 0x86E4 }, { 0x94B9, 0x96BC }, { 0x94BA, 0x4F34 }, { 0x94BB, 0x5224 }, 
-	{ 0x94BC, 0x534A }, { 0x94BD, 0x53CD }, { 0x94BE, 0x53DB }, { 0x94BF, 0x5E06 }, { 0x94C0, 0x642C }, { 0x94C1, 0x6591 }, { 0x94C2, 0x677F }, { 0x94C3, 0x6C3E }, 
-	{ 0x94C4, 0x6C4E }, { 0x94C5, 0x7248 }, { 0x94C6, 0x72AF }, { 0x94C7, 0x73ED }, { 0x94C8, 0x7554 }, { 0x94C9, 0x7E41 }, { 0x94CA, 0x822C }, { 0x94CB, 0x85E9 }, 
-	{ 0x94CC, 0x8CA9 }, { 0x94CD, 0x7BC4 }, { 0x94CE, 0x91C6 }, { 0x94CF, 0x7169 }, { 0x94D0, 0x9812 }, { 0x94D1, 0x98EF }, { 0x94D2, 0x633D }, { 0x94D3, 0x6669 }, 
-	{ 0x94D4, 0x756A }, { 0x94D5, 0x76E4 }, { 0x94D6, 0x78D0 }, { 0x94D7, 0x8543 }, { 0x94D8, 0x86EE }, { 0x94D9, 0x532A }, { 0x94DA, 0x5351 }, { 0x94DB, 0x5426 }, 
-	{ 0x94DC, 0x5983 }, { 0x94DD, 0x5E87 }, { 0x94DE, 0x5F7C }, { 0x94DF, 0x60B2 }, { 0x94E0, 0x6249 }, { 0x94E1, 0x6279 }, { 0x94E2, 0x62AB }, { 0x94E3, 0x6590 }, 
-	{ 0x94E4, 0x6BD4 }, { 0x94E5, 0x6CCC }, { 0x94E6, 0x75B2 }, { 0x94E7, 0x76AE }, { 0x94E8, 0x7891 }, { 0x94E9, 0x79D8 }, { 0x94EA, 0x7DCB }, { 0x94EB, 0x7F77 }, 
-	{ 0x94EC, 0x80A5 }, { 0x94ED, 0x88AB }, { 0x94EE, 0x8AB9 }, { 0x94EF, 0x8CBB }, { 0x94F0, 0x907F }, { 0x94F1, 0x975E }, { 0x94F2, 0x98DB }, { 0x94F3, 0x6A0B }, 
-	{ 0x94F4, 0x7C38 }, { 0x94F5, 0x5099 }, { 0x94F6, 0x5C3E }, { 0x94F7, 0x5FAE }, { 0x94F8, 0x6787 }, { 0x94F9, 0x6BD8 }, { 0x94FA, 0x7435 }, { 0x94FB, 0x7709 }, 
-	{ 0x94FC, 0x7F8E }, { 0x9540, 0x9F3B }, { 0x9541, 0x67CA }, { 0x9542, 0x7A17 }, { 0x9543, 0x5339 }, { 0x9544, 0x758B }, { 0x9545, 0x9AED }, { 0x9546, 0x5F66 }, 
-	{ 0x9547, 0x819D }, { 0x9548, 0x83F1 }, { 0x9549, 0x8098 }, { 0x954A, 0x5F3C }, { 0x954B, 0x5FC5 }, { 0x954C, 0x7562 }, { 0x954D, 0x7B46 }, { 0x954E, 0x903C }, 
-	{ 0x954F, 0x6867 }, { 0x9550, 0x59EB }, { 0x9551, 0x5A9B }, { 0x9552, 0x7D10 }, { 0x9553, 0x767E }, { 0x9554, 0x8B2C }, { 0x9555, 0x4FF5 }, { 0x9556, 0x5F6A }, 
-	{ 0x9557, 0x6A19 }, { 0x9558, 0x6C37 }, { 0x9559, 0x6F02 }, { 0x955A, 0x74E2 }, { 0x955B, 0x7968 }, { 0x955C, 0x8868 }, { 0x955D, 0x8A55 }, { 0x955E, 0x8C79 }, 
-	{ 0x955F, 0x5EDF }, { 0x9560, 0x63CF }, { 0x9561, 0x75C5 }, { 0x9562, 0x79D2 }, { 0x9563, 0x82D7 }, { 0x9564, 0x9328 }, { 0x9565, 0x92F2 }, { 0x9566, 0x849C }, 
-	{ 0x9567, 0x86ED }, { 0x9568, 0x9C2D }, { 0x9569, 0x54C1 }, { 0x956A, 0x5F6C }, { 0x956B, 0x658C }, { 0x956C, 0x6D5C }, { 0x956D, 0x7015 }, { 0x956E, 0x8CA7 }, 
-	{ 0x956F, 0x8CD3 }, { 0x9570, 0x983B }, { 0x9571, 0x654F }, { 0x9572, 0x74F6 }, { 0x9573, 0x4E0D }, { 0x9574, 0x4ED8 }, { 0x9575, 0x57E0 }, { 0x9576, 0x592B }, 
-	{ 0x9577, 0x5A66 }, { 0x9578, 0x5BCC }, { 0x9579, 0x51A8 }, { 0x957A, 0x5E03 }, { 0x957B, 0x5E9C }, { 0x957C, 0x6016 }, { 0x957D, 0x6276 }, { 0x957E, 0x6577 }, 
-	{ 0x9580, 0x65A7 }, { 0x9581, 0x666E }, { 0x9582, 0x6D6E }, { 0x9583, 0x7236 }, { 0x9584, 0x7B26 }, { 0x9585, 0x8150 }, { 0x9586, 0x819A }, { 0x9587, 0x8299 }, 
-	{ 0x9588, 0x8B5C }, { 0x9589, 0x8CA0 }, { 0x958A, 0x8CE6 }, { 0x958B, 0x8D74 }, { 0x958C, 0x961C }, { 0x958D, 0x9644 }, { 0x958E, 0x4FAE }, { 0x958F, 0x64AB }, 
-	{ 0x9590, 0x6B66 }, { 0x9591, 0x821E }, { 0x9592, 0x8461 }, { 0x9593, 0x856A }, { 0x9594, 0x90E8 }, { 0x9595, 0x5C01 }, { 0x9596, 0x6953 }, { 0x9597, 0x98A8 }, 
-	{ 0x9598, 0x847A }, { 0x9599, 0x8557 }, { 0x959A, 0x4F0F }, { 0x959B, 0x526F }, { 0x959C, 0x5FA9 }, { 0x959D, 0x5E45 }, { 0x959E, 0x670D }, { 0x959F, 0x798F }, 
-	{ 0x95A0, 0x8179 }, { 0x95A1, 0x8907 }, { 0x95A2, 0x8986 }, { 0x95A3, 0x6DF5 }, { 0x95A4, 0x5F17 }, { 0x95A5, 0x6255 }, { 0x95A6, 0x6CB8 }, { 0x95A7, 0x4ECF }, 
-	{ 0x95A8, 0x7269 }, { 0x95A9, 0x9B92 }, { 0x95AA, 0x5206 }, { 0x95AB, 0x543B }, { 0x95AC, 0x5674 }, { 0x95AD, 0x58B3 }, { 0x95AE, 0x61A4 }, { 0x95AF, 0x626E }, 
-	{ 0x95B0, 0x711A }, { 0x95B1, 0x596E }, { 0x95B2, 0x7C89 }, { 0x95B3, 0x7CDE }, { 0x95B4, 0x7D1B }, { 0x95B5, 0x96F0 }, { 0x95B6, 0x6587 }, { 0x95B7, 0x805E }, 
-	{ 0x95B8, 0x4E19 }, { 0x95B9, 0x4F75 }, { 0x95BA, 0x5175 }, { 0x95BB, 0x5840 }, { 0x95BC, 0x5E63 }, { 0x95BD, 0x5E73 }, { 0x95BE, 0x5F0A }, { 0x95BF, 0x67C4 }, 
-	{ 0x95C0, 0x4E26 }, { 0x95C1, 0x853D }, { 0x95C2, 0x9589 }, { 0x95C3, 0x965B }, { 0x95C4, 0x7C73 }, { 0x95C5, 0x9801 }, { 0x95C6, 0x50FB }, { 0x95C7, 0x58C1 }, 
-	{ 0x95C8, 0x7656 }, { 0x95C9, 0x78A7 }, { 0x95CA, 0x5225 }, { 0x95CB, 0x77A5 }, { 0x95CC, 0x8511 }, { 0x95CD, 0x7B86 }, { 0x95CE, 0x504F }, { 0x95CF, 0x5909 }, 
-	{ 0x95D0, 0x7247 }, { 0x95D1, 0x7BC7 }, { 0x95D2, 0x7DE8 }, { 0x95D3, 0x8FBA }, { 0x95D4, 0x8FD4 }, { 0x95D5, 0x904D }, { 0x95D6, 0x4FBF }, { 0x95D7, 0x52C9 }, 
-	{ 0x95D8, 0x5A29 }, { 0x95D9, 0x5F01 }, { 0x95DA, 0x97AD }, { 0x95DB, 0x4FDD }, { 0x95DC, 0x8217 }, { 0x95DD, 0x92EA }, { 0x95DE, 0x5703 }, { 0x95DF, 0x6355 }, 
-	{ 0x95E0, 0x6B69 }, { 0x95E1, 0x752B }, { 0x95E2, 0x88DC }, { 0x95E3, 0x8F14 }, { 0x95E4, 0x7A42 }, { 0x95E5, 0x52DF }, { 0x95E6, 0x5893 }, { 0x95E7, 0x6155 }, 
-	{ 0x95E8, 0x620A }, { 0x95E9, 0x66AE }, { 0x95EA, 0x6BCD }, { 0x95EB, 0x7C3F }, { 0x95EC, 0x83E9 }, { 0x95ED, 0x5023 }, { 0x95EE, 0x4FF8 }, { 0x95EF, 0x5305 }, 
-	{ 0x95F0, 0x5446 }, { 0x95F1, 0x5831 }, { 0x95F2, 0x5949 }, { 0x95F3, 0x5B9D }, { 0x95F4, 0x5CF0 }, { 0x95F5, 0x5CEF }, { 0x95F6, 0x5D29 }, { 0x95F7, 0x5E96 }, 
-	{ 0x95F8, 0x62B1 }, { 0x95F9, 0x6367 }, { 0x95FA, 0x653E }, { 0x95FB, 0x65B9 }, { 0x95FC, 0x670B }, { 0x9640, 0x6CD5 }, { 0x9641, 0x6CE1 }, { 0x9642, 0x70F9 }, 
-	{ 0x9643, 0x7832 }, { 0x9644, 0x7E2B }, { 0x9645, 0x80DE }, { 0x9646, 0x82B3 }, { 0x9647, 0x840C }, { 0x9648, 0x84EC }, { 0x9649, 0x8702 }, { 0x964A, 0x8912 }, 
-	{ 0x964B, 0x8A2A }, { 0x964C, 0x8C4A }, { 0x964D, 0x90A6 }, { 0x964E, 0x92D2 }, { 0x964F, 0x98FD }, { 0x9650, 0x9CF3 }, { 0x9651, 0x9D6C }, { 0x9652, 0x4E4F }, 
-	{ 0x9653, 0x4EA1 }, { 0x9654, 0x508D }, { 0x9655, 0x5256 }, { 0x9656, 0x574A }, { 0x9657, 0x59A8 }, { 0x9658, 0x5E3D }, { 0x9659, 0x5FD8 }, { 0x965A, 0x5FD9 }, 
-	{ 0x965B, 0x623F }, { 0x965C, 0x66B4 }, { 0x965D, 0x671B }, { 0x965E, 0x67D0 }, { 0x965F, 0x68D2 }, { 0x9660, 0x5192 }, { 0x9661, 0x7D21 }, { 0x9662, 0x80AA }, 
-	{ 0x9663, 0x81A8 }, { 0x9664, 0x8B00 }, { 0x9665, 0x8C8C }, { 0x9666, 0x8CBF }, { 0x9667, 0x927E }, { 0x9668, 0x9632 }, { 0x9669, 0x5420 }, { 0x966A, 0x982C }, 
-	{ 0x966B, 0x5317 }, { 0x966C, 0x50D5 }, { 0x966D, 0x535C }, { 0x966E, 0x58A8 }, { 0x966F, 0x64B2 }, { 0x9670, 0x6734 }, { 0x9671, 0x7267 }, { 0x9672, 0x7766 }, 
-	{ 0x9673, 0x7A46 }, { 0x9674, 0x91E6 }, { 0x9675, 0x52C3 }, { 0x9676, 0x6CA1 }, { 0x9677, 0x6B86 }, { 0x9678, 0x5800 }, { 0x9679, 0x5E4C }, { 0x967A, 0x5954 }, 
-	{ 0x967B, 0x672C }, { 0x967C, 0x7FFB }, { 0x967D, 0x51E1 }, { 0x967E, 0x76C6 }, { 0x9680, 0x6469 }, { 0x9681, 0x78E8 }, { 0x9682, 0x9B54 }, { 0x9683, 0x9EBB }, 
-	{ 0x9684, 0x57CB }, { 0x9685, 0x59B9 }, { 0x9686, 0x6627 }, { 0x9687, 0x679A }, { 0x9688, 0x6BCE }, { 0x9689, 0x54E9 }, { 0x968A, 0x69D9 }, { 0x968B, 0x5E55 }, 
-	{ 0x968C, 0x819C }, { 0x968D, 0x6795 }, { 0x968E, 0x9BAA }, { 0x968F, 0x67FE }, { 0x9690, 0x9C52 }, { 0x9691, 0x685D }, { 0x9692, 0x4EA6 }, { 0x9693, 0x4FE3 }, 
-	{ 0x9694, 0x53C8 }, { 0x9695, 0x62B9 }, { 0x9696, 0x672B }, { 0x9697, 0x6CAB }, { 0x9698, 0x8FC4 }, { 0x9699, 0x4FAD }, { 0x969A, 0x7E6D }, { 0x969B, 0x9EBF }, 
-	{ 0x969C, 0x4E07 }, { 0x969D, 0x6162 }, { 0x969E, 0x6E80 }, { 0x969F, 0x6F2B }, { 0x96A0, 0x8513 }, { 0x96A1, 0x5473 }, { 0x96A2, 0x672A }, { 0x96A3, 0x9B45 }, 
-	{ 0x96A4, 0x5DF3 }, { 0x96A5, 0x7B95 }, { 0x96A6, 0x5CAC }, { 0x96A7, 0x5BC6 }, { 0x96A8, 0x871C }, { 0x96A9, 0x6E4A }, { 0x96AA, 0x84D1 }, { 0x96AB, 0x7A14 }, 
-	{ 0x96AC, 0x8108 }, { 0x96AD, 0x5999 }, { 0x96AE, 0x7C8D }, { 0x96AF, 0x6C11 }, { 0x96B0, 0x7720 }, { 0x96B1, 0x52D9 }, { 0x96B2, 0x5922 }, { 0x96B3, 0x7121 }, 
-	{ 0x96B4, 0x725F }, { 0x96B5, 0x77DB }, { 0x96B6, 0x9727 }, { 0x96B7, 0x9D61 }, { 0x96B8, 0x690B }, { 0x96B9, 0x5A7F }, { 0x96BA, 0x5A18 }, { 0x96BB, 0x51A5 }, 
-	{ 0x96BC, 0x540D }, { 0x96BD, 0x547D }, { 0x96BE, 0x660E }, { 0x96BF, 0x76DF }, { 0x96C0, 0x8FF7 }, { 0x96C1, 0x9298 }, { 0x96C2, 0x9CF4 }, { 0x96C3, 0x59EA }, 
-	{ 0x96C4, 0x725D }, { 0x96C5, 0x6EC5 }, { 0x96C6, 0x514D }, { 0x96C7, 0x68C9 }, { 0x96C8, 0x7DBF }, { 0x96C9, 0x7DEC }, { 0x96CA, 0x9762 }, { 0x96CB, 0x9EBA }, 
-	{ 0x96CC, 0x6478 }, { 0x96CD, 0x6A21 }, { 0x96CE, 0x8302 }, { 0x96CF, 0x5984 }, { 0x96D0, 0x5B5F }, { 0x96D1, 0x6BDB }, { 0x96D2, 0x731B }, { 0x96D3, 0x76F2 }, 
-	{ 0x96D4, 0x7DB2 }, { 0x96D5, 0x8017 }, { 0x96D6, 0x8499 }, { 0x96D7, 0x5132 }, { 0x96D8, 0x6728 }, { 0x96D9, 0x9ED9 }, { 0x96DA, 0x76EE }, { 0x96DB, 0x6762 }, 
-	{ 0x96DC, 0x52FF }, { 0x96DD, 0x9905 }, { 0x96DE, 0x5C24 }, { 0x96DF, 0x623B }, { 0x96E0, 0x7C7E }, { 0x96E1, 0x8CB0 }, { 0x96E2, 0x554F }, { 0x96E3, 0x60B6 }, 
-	{ 0x96E4, 0x7D0B }, { 0x96E5, 0x9580 }, { 0x96E6, 0x5301 }, { 0x96E7, 0x4E5F }, { 0x96E8, 0x51B6 }, { 0x96E9, 0x591C }, { 0x96EA, 0x723A }, { 0x96EB, 0x8036 }, 
-	{ 0x96EC, 0x91CE }, { 0x96ED, 0x5F25 }, { 0x96EE, 0x77E2 }, { 0x96EF, 0x5384 }, { 0x96F0, 0x5F79 }, { 0x96F1, 0x7D04 }, { 0x96F2, 0x85AC }, { 0x96F3, 0x8A33 }, 
-	{ 0x96F4, 0x8E8D }, { 0x96F5, 0x9756 }, { 0x96F6, 0x67F3 }, { 0x96F7, 0x85AE }, { 0x96F8, 0x9453 }, { 0x96F9, 0x6109 }, { 0x96FA, 0x6108 }, { 0x96FB, 0x6CB9 }, 
-	{ 0x96FC, 0x7652 }, { 0x9740, 0x8AED }, { 0x9741, 0x8F38 }, { 0x9742, 0x552F }, { 0x9743, 0x4F51 }, { 0x9744, 0x512A }, { 0x9745, 0x52C7 }, { 0x9746, 0x53CB }, 
-	{ 0x9747, 0x5BA5 }, { 0x9748, 0x5E7D }, { 0x9749, 0x60A0 }, { 0x974A, 0x6182 }, { 0x974B, 0x63D6 }, { 0x974C, 0x6709 }, { 0x974D, 0x67DA }, { 0x974E, 0x6E67 }, 
-	{ 0x974F, 0x6D8C }, { 0x9750, 0x7336 }, { 0x9751, 0x7337 }, { 0x9752, 0x7531 }, { 0x9753, 0x7950 }, { 0x9754, 0x88D5 }, { 0x9755, 0x8A98 }, { 0x9756, 0x904A }, 
-	{ 0x9757, 0x9091 }, { 0x9758, 0x90F5 }, { 0x9759, 0x96C4 }, { 0x975A, 0x878D }, { 0x975B, 0x5915 }, { 0x975C, 0x4E88 }, { 0x975D, 0x4F59 }, { 0x975E, 0x4E0E }, 
-	{ 0x975F, 0x8A89 }, { 0x9760, 0x8F3F }, { 0x9761, 0x9810 }, { 0x9762, 0x50AD }, { 0x9763, 0x5E7C }, { 0x9764, 0x5996 }, { 0x9765, 0x5BB9 }, { 0x9766, 0x5EB8 }, 
-	{ 0x9767, 0x63DA }, { 0x9768, 0x63FA }, { 0x9769, 0x64C1 }, { 0x976A, 0x66DC }, { 0x976B, 0x694A }, { 0x976C, 0x69D8 }, { 0x976D, 0x6D0B }, { 0x976E, 0x6EB6 }, 
-	{ 0x976F, 0x7194 }, { 0x9770, 0x7528 }, { 0x9771, 0x7AAF }, { 0x9772, 0x7F8A }, { 0x9773, 0x8000 }, { 0x9774, 0x8449 }, { 0x9775, 0x84C9 }, { 0x9776, 0x8981 }, 
-	{ 0x9777, 0x8B21 }, { 0x9778, 0x8E0A }, { 0x9779, 0x9065 }, { 0x977A, 0x967D }, { 0x977B, 0x990A }, { 0x977C, 0x617E }, { 0x977D, 0x6291 }, { 0x977E, 0x6B32 }, 
-	{ 0x9780, 0x6C83 }, { 0x9781, 0x6D74 }, { 0x9782, 0x7FCC }, { 0x9783, 0x7FFC }, { 0x9784, 0x6DC0 }, { 0x9785, 0x7F85 }, { 0x9786, 0x87BA }, { 0x9787, 0x88F8 }, 
-	{ 0x9788, 0x6765 }, { 0x9789, 0x83B1 }, { 0x978A, 0x983C }, { 0x978B, 0x96F7 }, { 0x978C, 0x6D1B }, { 0x978D, 0x7D61 }, { 0x978E, 0x843D }, { 0x978F, 0x916A }, 
-	{ 0x9790, 0x4E71 }, { 0x9791, 0x5375 }, { 0x9792, 0x5D50 }, { 0x9793, 0x6B04 }, { 0x9794, 0x6FEB }, { 0x9795, 0x85CD }, { 0x9796, 0x862D }, { 0x9797, 0x89A7 }, 
-	{ 0x9798, 0x5229 }, { 0x9799, 0x540F }, { 0x979A, 0x5C65 }, { 0x979B, 0x674E }, { 0x979C, 0x68A8 }, { 0x979D, 0x7406 }, { 0x979E, 0x7483 }, { 0x979F, 0x75E2 }, 
-	{ 0x97A0, 0x88CF }, { 0x97A1, 0x88E1 }, { 0x97A2, 0x91CC }, { 0x97A3, 0x96E2 }, { 0x97A4, 0x9678 }, { 0x97A5, 0x5F8B }, { 0x97A6, 0x7387 }, { 0x97A7, 0x7ACB }, 
-	{ 0x97A8, 0x844E }, { 0x97A9, 0x63A0 }, { 0x97AA, 0x7565 }, { 0x97AB, 0x5289 }, { 0x97AC, 0x6D41 }, { 0x97AD, 0x6E9C }, { 0x97AE, 0x7409 }, { 0x97AF, 0x7559 }, 
-	{ 0x97B0, 0x786B }, { 0x97B1, 0x7C92 }, { 0x97B2, 0x9686 }, { 0x97B3, 0x7ADC }, { 0x97B4, 0x9F8D }, { 0x97B5, 0x4FB6 }, { 0x97B6, 0x616E }, { 0x97B7, 0x65C5 }, 
-	{ 0x97B8, 0x865C }, { 0x97B9, 0x4E86 }, { 0x97BA, 0x4EAE }, { 0x97BB, 0x50DA }, { 0x97BC, 0x4E21 }, { 0x97BD, 0x51CC }, { 0x97BE, 0x5BEE }, { 0x97BF, 0x6599 }, 
-	{ 0x97C0, 0x6881 }, { 0x97C1, 0x6DBC }, { 0x97C2, 0x731F }, { 0x97C3, 0x7642 }, { 0x97C4, 0x77AD }, { 0x97C5, 0x7A1C }, { 0x97C6, 0x7CE7 }, { 0x97C7, 0x826F }, 
-	{ 0x97C8, 0x8AD2 }, { 0x97C9, 0x907C }, { 0x97CA, 0x91CF }, { 0x97CB, 0x9675 }, { 0x97CC, 0x9818 }, { 0x97CD, 0x529B }, { 0x97CE, 0x7DD1 }, { 0x97CF, 0x502B }, 
-	{ 0x97D0, 0x5398 }, { 0x97D1, 0x6797 }, { 0x97D2, 0x6DCB }, { 0x97D3, 0x71D0 }, { 0x97D4, 0x7433 }, { 0x97D5, 0x81E8 }, { 0x97D6, 0x8F2A }, { 0x97D7, 0x96A3 }, 
-	{ 0x97D8, 0x9C57 }, { 0x97D9, 0x9E9F }, { 0x97DA, 0x7460 }, { 0x97DB, 0x5841 }, { 0x97DC, 0x6D99 }, { 0x97DD, 0x7D2F }, { 0x97DE, 0x985E }, { 0x97DF, 0x4EE4 }, 
-	{ 0x97E0, 0x4F36 }, { 0x97E1, 0x4F8B }, { 0x97E2, 0x51B7 }, { 0x97E3, 0x52B1 }, { 0x97E4, 0x5DBA }, { 0x97E5, 0x601C }, { 0x97E6, 0x73B2 }, { 0x97E7, 0x793C }, 
-	{ 0x97E8, 0x82D3 }, { 0x97E9, 0x9234 }, { 0x97EA, 0x96B7 }, { 0x97EB, 0x96F6 }, { 0x97EC, 0x970A }, { 0x97ED, 0x9E97 }, { 0x97EE, 0x9F62 }, { 0x97EF, 0x66A6 }, 
-	{ 0x97F0, 0x6B74 }, { 0x97F1, 0x5217 }, { 0x97F2, 0x52A3 }, { 0x97F3, 0x70C8 }, { 0x97F4, 0x88C2 }, { 0x97F5, 0x5EC9 }, { 0x97F6, 0x604B }, { 0x97F7, 0x6190 }, 
-	{ 0x97F8, 0x6F23 }, { 0x97F9, 0x7149 }, { 0x97FA, 0x7C3E }, { 0x97FB, 0x7DF4 }, { 0x97FC, 0x806F }, { 0x9840, 0x84EE }, { 0x9841, 0x9023 }, { 0x9842, 0x932C }, 
-	{ 0x9843, 0x5442 }, { 0x9844, 0x9B6F }, { 0x9845, 0x6AD3 }, { 0x9846, 0x7089 }, { 0x9847, 0x8CC2 }, { 0x9848, 0x8DEF }, { 0x9849, 0x9732 }, { 0x984A, 0x52B4 }, 
-	{ 0x984B, 0x5A41 }, { 0x984C, 0x5ECA }, { 0x984D, 0x5F04 }, { 0x984E, 0x6717 }, { 0x984F, 0x697C }, { 0x9850, 0x6994 }, { 0x9851, 0x6D6A }, { 0x9852, 0x6F0F }, 
-	{ 0x9853, 0x7262 }, { 0x9854, 0x72FC }, { 0x9855, 0x7BED }, { 0x9856, 0x8001 }, { 0x9857, 0x807E }, { 0x9858, 0x874B }, { 0x9859, 0x90CE }, { 0x985A, 0x516D }, 
-	{ 0x985B, 0x9E93 }, { 0x985C, 0x7984 }, { 0x985D, 0x808B }, { 0x985E, 0x9332 }, { 0x985F, 0x8AD6 }, { 0x9860, 0x502D }, { 0x9861, 0x548C }, { 0x9862, 0x8A71 }, 
-	{ 0x9863, 0x6B6A }, { 0x9864, 0x8CC4 }, { 0x9865, 0x8107 }, { 0x9866, 0x60D1 }, { 0x9867, 0x67A0 }, { 0x9868, 0x9DF2 }, { 0x9869, 0x4E99 }, { 0x986A, 0x4E98 }, 
-	{ 0x986B, 0x9C10 }, { 0x986C, 0x8A6B }, { 0x986D, 0x85C1 }, { 0x986E, 0x8568 }, { 0x986F, 0x6900 }, { 0x9870, 0x6E7E }, { 0x9871, 0x7897 }, { 0x9872, 0x8155 }, 
-	{ 0x989F, 0x5F0C }, { 0x98A0, 0x4E10 }, { 0x98A1, 0x4E15 }, { 0x98A2, 0x4E2A }, { 0x98A3, 0x4E31 }, { 0x98A4, 0x4E36 }, { 0x98A5, 0x4E3C }, { 0x98A6, 0x4E3F }, 
-	{ 0x98A7, 0x4E42 }, { 0x98A8, 0x4E56 }, { 0x98A9, 0x4E58 }, { 0x98AA, 0x4E82 }, { 0x98AB, 0x4E85 }, { 0x98AC, 0x8C6B }, { 0x98AD, 0x4E8A }, { 0x98AE, 0x8212 }, 
-	{ 0x98AF, 0x5F0D }, { 0x98B0, 0x4E8E }, { 0x98B1, 0x4E9E }, { 0x98B2, 0x4E9F }, { 0x98B3, 0x4EA0 }, { 0x98B4, 0x4EA2 }, { 0x98B5, 0x4EB0 }, { 0x98B6, 0x4EB3 }, 
-	{ 0x98B7, 0x4EB6 }, { 0x98B8, 0x4ECE }, { 0x98B9, 0x4ECD }, { 0x98BA, 0x4EC4 }, { 0x98BB, 0x4EC6 }, { 0x98BC, 0x4EC2 }, { 0x98BD, 0x4ED7 }, { 0x98BE, 0x4EDE }, 
-	{ 0x98BF, 0x4EED }, { 0x98C0, 0x4EDF }, { 0x98C1, 0x4EF7 }, { 0x98C2, 0x4F09 }, { 0x98C3, 0x4F5A }, { 0x98C4, 0x4F30 }, { 0x98C5, 0x4F5B }, { 0x98C6, 0x4F5D }, 
-	{ 0x98C7, 0x4F57 }, { 0x98C8, 0x4F47 }, { 0x98C9, 0x4F76 }, { 0x98CA, 0x4F88 }, { 0x98CB, 0x4F8F }, { 0x98CC, 0x4F98 }, { 0x98CD, 0x4F7B }, { 0x98CE, 0x4F69 }, 
-	{ 0x98CF, 0x4F70 }, { 0x98D0, 0x4F91 }, { 0x98D1, 0x4F6F }, { 0x98D2, 0x4F86 }, { 0x98D3, 0x4F96 }, { 0x98D4, 0x5118 }, { 0x98D5, 0x4FD4 }, { 0x98D6, 0x4FDF }, 
-	{ 0x98D7, 0x4FCE }, { 0x98D8, 0x4FD8 }, { 0x98D9, 0x4FDB }, { 0x98DA, 0x4FD1 }, { 0x98DB, 0x4FDA }, { 0x98DC, 0x4FD0 }, { 0x98DD, 0x4FE4 }, { 0x98DE, 0x4FE5 }, 
-	{ 0x98DF, 0x501A }, { 0x98E0, 0x5028 }, { 0x98E1, 0x5014 }, { 0x98E2, 0x502A }, { 0x98E3, 0x5025 }, { 0x98E4, 0x5005 }, { 0x98E5, 0x4F1C }, { 0x98E6, 0x4FF6 }, 
-	{ 0x98E7, 0x5021 }, { 0x98E8, 0x5029 }, { 0x98E9, 0x502C }, { 0x98EA, 0x4FFE }, { 0x98EB, 0x4FEF }, { 0x98EC, 0x5011 }, { 0x98ED, 0x5006 }, { 0x98EE, 0x5043 }, 
-	{ 0x98EF, 0x5047 }, { 0x98F0, 0x6703 }, { 0x98F1, 0x5055 }, { 0x98F2, 0x5050 }, { 0x98F3, 0x5048 }, { 0x98F4, 0x505A }, { 0x98F5, 0x5056 }, { 0x98F6, 0x506C }, 
-	{ 0x98F7, 0x5078 }, { 0x98F8, 0x5080 }, { 0x98F9, 0x509A }, { 0x98FA, 0x5085 }, { 0x98FB, 0x50B4 }, { 0x98FC, 0x50B2 }, { 0x9940, 0x50C9 }, { 0x9941, 0x50CA }, 
-	{ 0x9942, 0x50B3 }, { 0x9943, 0x50C2 }, { 0x9944, 0x50D6 }, { 0x9945, 0x50DE }, { 0x9946, 0x50E5 }, { 0x9947, 0x50ED }, { 0x9948, 0x50E3 }, { 0x9949, 0x50EE }, 
-	{ 0x994A, 0x50F9 }, { 0x994B, 0x50F5 }, { 0x994C, 0x5109 }, { 0x994D, 0x5101 }, { 0x994E, 0x5102 }, { 0x994F, 0x5116 }, { 0x9950, 0x5115 }, { 0x9951, 0x5114 }, 
-	{ 0x9952, 0x511A }, { 0x9953, 0x5121 }, { 0x9954, 0x513A }, { 0x9955, 0x5137 }, { 0x9956, 0x513C }, { 0x9957, 0x513B }, { 0x9958, 0x513F }, { 0x9959, 0x5140 }, 
-	{ 0x995A, 0x5152 }, { 0x995B, 0x514C }, { 0x995C, 0x5154 }, { 0x995D, 0x5162 }, { 0x995E, 0x7AF8 }, { 0x995F, 0x5169 }, { 0x9960, 0x516A }, { 0x9961, 0x516E }, 
-	{ 0x9962, 0x5180 }, { 0x9963, 0x5182 }, { 0x9964, 0x56D8 }, { 0x9965, 0x518C }, { 0x9966, 0x5189 }, { 0x9967, 0x518F }, { 0x9968, 0x5191 }, { 0x9969, 0x5193 }, 
-	{ 0x996A, 0x5195 }, { 0x996B, 0x5196 }, { 0x996C, 0x51A4 }, { 0x996D, 0x51A6 }, { 0x996E, 0x51A2 }, { 0x996F, 0x51A9 }, { 0x9970, 0x51AA }, { 0x9971, 0x51AB }, 
-	{ 0x9972, 0x51B3 }, { 0x9973, 0x51B1 }, { 0x9974, 0x51B2 }, { 0x9975, 0x51B0 }, { 0x9976, 0x51B5 }, { 0x9977, 0x51BD }, { 0x9978, 0x51C5 }, { 0x9979, 0x51C9 }, 
-	{ 0x997A, 0x51DB }, { 0x997B, 0x51E0 }, { 0x997C, 0x8655 }, { 0x997D, 0x51E9 }, { 0x997E, 0x51ED }, { 0x9980, 0x51F0 }, { 0x9981, 0x51F5 }, { 0x9982, 0x51FE }, 
-	{ 0x9983, 0x5204 }, { 0x9984, 0x520B }, { 0x9985, 0x5214 }, { 0x9986, 0x520E }, { 0x9987, 0x5227 }, { 0x9988, 0x522A }, { 0x9989, 0x522E }, { 0x998A, 0x5233 }, 
-	{ 0x998B, 0x5239 }, { 0x998C, 0x524F }, { 0x998D, 0x5244 }, { 0x998E, 0x524B }, { 0x998F, 0x524C }, { 0x9990, 0x525E }, { 0x9991, 0x5254 }, { 0x9992, 0x526A }, 
-	{ 0x9993, 0x5274 }, { 0x9994, 0x5269 }, { 0x9995, 0x5273 }, { 0x9996, 0x527F }, { 0x9997, 0x527D }, { 0x9998, 0x528D }, { 0x9999, 0x5294 }, { 0x999A, 0x5292 }, 
-	{ 0x999B, 0x5271 }, { 0x999C, 0x5288 }, { 0x999D, 0x5291 }, { 0x999E, 0x8FA8 }, { 0x999F, 0x8FA7 }, { 0x99A0, 0x52AC }, { 0x99A1, 0x52AD }, { 0x99A2, 0x52BC }, 
-	{ 0x99A3, 0x52B5 }, { 0x99A4, 0x52C1 }, { 0x99A5, 0x52CD }, { 0x99A6, 0x52D7 }, { 0x99A7, 0x52DE }, { 0x99A8, 0x52E3 }, { 0x99A9, 0x52E6 }, { 0x99AA, 0x98ED }, 
-	{ 0x99AB, 0x52E0 }, { 0x99AC, 0x52F3 }, { 0x99AD, 0x52F5 }, { 0x99AE, 0x52F8 }, { 0x99AF, 0x52F9 }, { 0x99B0, 0x5306 }, { 0x99B1, 0x5308 }, { 0x99B2, 0x7538 }, 
-	{ 0x99B3, 0x530D }, { 0x99B4, 0x5310 }, { 0x99B5, 0x530F }, { 0x99B6, 0x5315 }, { 0x99B7, 0x531A }, { 0x99B8, 0x5323 }, { 0x99B9, 0x532F }, { 0x99BA, 0x5331 }, 
-	{ 0x99BB, 0x5333 }, { 0x99BC, 0x5338 }, { 0x99BD, 0x5340 }, { 0x99BE, 0x5346 }, { 0x99BF, 0x5345 }, { 0x99C0, 0x4E17 }, { 0x99C1, 0x5349 }, { 0x99C2, 0x534D }, 
-	{ 0x99C3, 0x51D6 }, { 0x99C4, 0x535E }, { 0x99C5, 0x5369 }, { 0x99C6, 0x536E }, { 0x99C7, 0x5918 }, { 0x99C8, 0x537B }, { 0x99C9, 0x5377 }, { 0x99CA, 0x5382 }, 
-	{ 0x99CB, 0x5396 }, { 0x99CC, 0x53A0 }, { 0x99CD, 0x53A6 }, { 0x99CE, 0x53A5 }, { 0x99CF, 0x53AE }, { 0x99D0, 0x53B0 }, { 0x99D1, 0x53B6 }, { 0x99D2, 0x53C3 }, 
-	{ 0x99D3, 0x7C12 }, { 0x99D4, 0x96D9 }, { 0x99D5, 0x53DF }, { 0x99D6, 0x66FC }, { 0x99D7, 0x71EE }, { 0x99D8, 0x53EE }, { 0x99D9, 0x53E8 }, { 0x99DA, 0x53ED }, 
-	{ 0x99DB, 0x53FA }, { 0x99DC, 0x5401 }, { 0x99DD, 0x543D }, { 0x99DE, 0x5440 }, { 0x99DF, 0x542C }, { 0x99E0, 0x542D }, { 0x99E1, 0x543C }, { 0x99E2, 0x542E }, 
-	{ 0x99E3, 0x5436 }, { 0x99E4, 0x5429 }, { 0x99E5, 0x541D }, { 0x99E6, 0x544E }, { 0x99E7, 0x548F }, { 0x99E8, 0x5475 }, { 0x99E9, 0x548E }, { 0x99EA, 0x545F }, 
-	{ 0x99EB, 0x5471 }, { 0x99EC, 0x5477 }, { 0x99ED, 0x5470 }, { 0x99EE, 0x5492 }, { 0x99EF, 0x547B }, { 0x99F0, 0x5480 }, { 0x99F1, 0x5476 }, { 0x99F2, 0x5484 }, 
-	{ 0x99F3, 0x5490 }, { 0x99F4, 0x5486 }, { 0x99F5, 0x54C7 }, { 0x99F6, 0x54A2 }, { 0x99F7, 0x54B8 }, { 0x99F8, 0x54A5 }, { 0x99F9, 0x54AC }, { 0x99FA, 0x54C4 }, 
-	{ 0x99FB, 0x54C8 }, { 0x99FC, 0x54A8 }, { 0x9A40, 0x54AB }, { 0x9A41, 0x54C2 }, { 0x9A42, 0x54A4 }, { 0x9A43, 0x54BE }, { 0x9A44, 0x54BC }, { 0x9A45, 0x54D8 }, 
-	{ 0x9A46, 0x54E5 }, { 0x9A47, 0x54E6 }, { 0x9A48, 0x550F }, { 0x9A49, 0x5514 }, { 0x9A4A, 0x54FD }, { 0x9A4B, 0x54EE }, { 0x9A4C, 0x54ED }, { 0x9A4D, 0x54FA }, 
-	{ 0x9A4E, 0x54E2 }, { 0x9A4F, 0x5539 }, { 0x9A50, 0x5540 }, { 0x9A51, 0x5563 }, { 0x9A52, 0x554C }, { 0x9A53, 0x552E }, { 0x9A54, 0x555C }, { 0x9A55, 0x5545 }, 
-	{ 0x9A56, 0x5556 }, { 0x9A57, 0x5557 }, { 0x9A58, 0x5538 }, { 0x9A59, 0x5533 }, { 0x9A5A, 0x555D }, { 0x9A5B, 0x5599 }, { 0x9A5C, 0x5580 }, { 0x9A5D, 0x54AF }, 
-	{ 0x9A5E, 0x558A }, { 0x9A5F, 0x559F }, { 0x9A60, 0x557B }, { 0x9A61, 0x557E }, { 0x9A62, 0x5598 }, { 0x9A63, 0x559E }, { 0x9A64, 0x55AE }, { 0x9A65, 0x557C }, 
-	{ 0x9A66, 0x5583 }, { 0x9A67, 0x55A9 }, { 0x9A68, 0x5587 }, { 0x9A69, 0x55A8 }, { 0x9A6A, 0x55DA }, { 0x9A6B, 0x55C5 }, { 0x9A6C, 0x55DF }, { 0x9A6D, 0x55C4 }, 
-	{ 0x9A6E, 0x55DC }, { 0x9A6F, 0x55E4 }, { 0x9A70, 0x55D4 }, { 0x9A71, 0x5614 }, { 0x9A72, 0x55F7 }, { 0x9A73, 0x5616 }, { 0x9A74, 0x55FE }, { 0x9A75, 0x55FD }, 
-	{ 0x9A76, 0x561B }, { 0x9A77, 0x55F9 }, { 0x9A78, 0x564E }, { 0x9A79, 0x5650 }, { 0x9A7A, 0x71DF }, { 0x9A7B, 0x5634 }, { 0x9A7C, 0x5636 }, { 0x9A7D, 0x5632 }, 
-	{ 0x9A7E, 0x5638 }, { 0x9A80, 0x566B }, { 0x9A81, 0x5664 }, { 0x9A82, 0x562F }, { 0x9A83, 0x566C }, { 0x9A84, 0x566A }, { 0x9A85, 0x5686 }, { 0x9A86, 0x5680 }, 
-	{ 0x9A87, 0x568A }, { 0x9A88, 0x56A0 }, { 0x9A89, 0x5694 }, { 0x9A8A, 0x568F }, { 0x9A8B, 0x56A5 }, { 0x9A8C, 0x56AE }, { 0x9A8D, 0x56B6 }, { 0x9A8E, 0x56B4 }, 
-	{ 0x9A8F, 0x56C2 }, { 0x9A90, 0x56BC }, { 0x9A91, 0x56C1 }, { 0x9A92, 0x56C3 }, { 0x9A93, 0x56C0 }, { 0x9A94, 0x56C8 }, { 0x9A95, 0x56CE }, { 0x9A96, 0x56D1 }, 
-	{ 0x9A97, 0x56D3 }, { 0x9A98, 0x56D7 }, { 0x9A99, 0x56EE }, { 0x9A9A, 0x56F9 }, { 0x9A9B, 0x5700 }, { 0x9A9C, 0x56FF }, { 0x9A9D, 0x5704 }, { 0x9A9E, 0x5709 }, 
-	{ 0x9A9F, 0x5708 }, { 0x9AA0, 0x570B }, { 0x9AA1, 0x570D }, { 0x9AA2, 0x5713 }, { 0x9AA3, 0x5718 }, { 0x9AA4, 0x5716 }, { 0x9AA5, 0x55C7 }, { 0x9AA6, 0x571C }, 
-	{ 0x9AA7, 0x5726 }, { 0x9AA8, 0x5737 }, { 0x9AA9, 0x5738 }, { 0x9AAA, 0x574E }, { 0x9AAB, 0x573B }, { 0x9AAC, 0x5740 }, { 0x9AAD, 0x574F }, { 0x9AAE, 0x5769 }, 
-	{ 0x9AAF, 0x57C0 }, { 0x9AB0, 0x5788 }, { 0x9AB1, 0x5761 }, { 0x9AB2, 0x577F }, { 0x9AB3, 0x5789 }, { 0x9AB4, 0x5793 }, { 0x9AB5, 0x57A0 }, { 0x9AB6, 0x57B3 }, 
-	{ 0x9AB7, 0x57A4 }, { 0x9AB8, 0x57AA }, { 0x9AB9, 0x57B0 }, { 0x9ABA, 0x57C3 }, { 0x9ABB, 0x57C6 }, { 0x9ABC, 0x57D4 }, { 0x9ABD, 0x57D2 }, { 0x9ABE, 0x57D3 }, 
-	{ 0x9ABF, 0x580A }, { 0x9AC0, 0x57D6 }, { 0x9AC1, 0x57E3 }, { 0x9AC2, 0x580B }, { 0x9AC3, 0x5819 }, { 0x9AC4, 0x581D }, { 0x9AC5, 0x5872 }, { 0x9AC6, 0x5821 }, 
-	{ 0x9AC7, 0x5862 }, { 0x9AC8, 0x584B }, { 0x9AC9, 0x5870 }, { 0x9ACA, 0x6BC0 }, { 0x9ACB, 0x5852 }, { 0x9ACC, 0x583D }, { 0x9ACD, 0x5879 }, { 0x9ACE, 0x5885 }, 
-	{ 0x9ACF, 0x58B9 }, { 0x9AD0, 0x589F }, { 0x9AD1, 0x58AB }, { 0x9AD2, 0x58BA }, { 0x9AD3, 0x58DE }, { 0x9AD4, 0x58BB }, { 0x9AD5, 0x58B8 }, { 0x9AD6, 0x58AE }, 
-	{ 0x9AD7, 0x58C5 }, { 0x9AD8, 0x58D3 }, { 0x9AD9, 0x58D1 }, { 0x9ADA, 0x58D7 }, { 0x9ADB, 0x58D9 }, { 0x9ADC, 0x58D8 }, { 0x9ADD, 0x58E5 }, { 0x9ADE, 0x58DC }, 
-	{ 0x9ADF, 0x58E4 }, { 0x9AE0, 0x58DF }, { 0x9AE1, 0x58EF }, { 0x9AE2, 0x58FA }, { 0x9AE3, 0x58F9 }, { 0x9AE4, 0x58FB }, { 0x9AE5, 0x58FC }, { 0x9AE6, 0x58FD }, 
-	{ 0x9AE7, 0x5902 }, { 0x9AE8, 0x590A }, { 0x9AE9, 0x5910 }, { 0x9AEA, 0x591B }, { 0x9AEB, 0x68A6 }, { 0x9AEC, 0x5925 }, { 0x9AED, 0x592C }, { 0x9AEE, 0x592D }, 
-	{ 0x9AEF, 0x5932 }, { 0x9AF0, 0x5938 }, { 0x9AF1, 0x593E }, { 0x9AF2, 0x7AD2 }, { 0x9AF3, 0x5955 }, { 0x9AF4, 0x5950 }, { 0x9AF5, 0x594E }, { 0x9AF6, 0x595A }, 
-	{ 0x9AF7, 0x5958 }, { 0x9AF8, 0x5962 }, { 0x9AF9, 0x5960 }, { 0x9AFA, 0x5967 }, { 0x9AFB, 0x596C }, { 0x9AFC, 0x5969 }, { 0x9B40, 0x5978 }, { 0x9B41, 0x5981 }, 
-	{ 0x9B42, 0x599D }, { 0x9B43, 0x4F5E }, { 0x9B44, 0x4FAB }, { 0x9B45, 0x59A3 }, { 0x9B46, 0x59B2 }, { 0x9B47, 0x59C6 }, { 0x9B48, 0x59E8 }, { 0x9B49, 0x59DC }, 
-	{ 0x9B4A, 0x598D }, { 0x9B4B, 0x59D9 }, { 0x9B4C, 0x59DA }, { 0x9B4D, 0x5A25 }, { 0x9B4E, 0x5A1F }, { 0x9B4F, 0x5A11 }, { 0x9B50, 0x5A1C }, { 0x9B51, 0x5A09 }, 
-	{ 0x9B52, 0x5A1A }, { 0x9B53, 0x5A40 }, { 0x9B54, 0x5A6C }, { 0x9B55, 0x5A49 }, { 0x9B56, 0x5A35 }, { 0x9B57, 0x5A36 }, { 0x9B58, 0x5A62 }, { 0x9B59, 0x5A6A }, 
-	{ 0x9B5A, 0x5A9A }, { 0x9B5B, 0x5ABC }, { 0x9B5C, 0x5ABE }, { 0x9B5D, 0x5ACB }, { 0x9B5E, 0x5AC2 }, { 0x9B5F, 0x5ABD }, { 0x9B60, 0x5AE3 }, { 0x9B61, 0x5AD7 }, 
-	{ 0x9B62, 0x5AE6 }, { 0x9B63, 0x5AE9 }, { 0x9B64, 0x5AD6 }, { 0x9B65, 0x5AFA }, { 0x9B66, 0x5AFB }, { 0x9B67, 0x5B0C }, { 0x9B68, 0x5B0B }, { 0x9B69, 0x5B16 }, 
-	{ 0x9B6A, 0x5B32 }, { 0x9B6B, 0x5AD0 }, { 0x9B6C, 0x5B2A }, { 0x9B6D, 0x5B36 }, { 0x9B6E, 0x5B3E }, { 0x9B6F, 0x5B43 }, { 0x9B70, 0x5B45 }, { 0x9B71, 0x5B40 }, 
-	{ 0x9B72, 0x5B51 }, { 0x9B73, 0x5B55 }, { 0x9B74, 0x5B5A }, { 0x9B75, 0x5B5B }, { 0x9B76, 0x5B65 }, { 0x9B77, 0x5B69 }, { 0x9B78, 0x5B70 }, { 0x9B79, 0x5B73 }, 
-	{ 0x9B7A, 0x5B75 }, { 0x9B7B, 0x5B78 }, { 0x9B7C, 0x6588 }, { 0x9B7D, 0x5B7A }, { 0x9B7E, 0x5B80 }, { 0x9B80, 0x5B83 }, { 0x9B81, 0x5BA6 }, { 0x9B82, 0x5BB8 }, 
-	{ 0x9B83, 0x5BC3 }, { 0x9B84, 0x5BC7 }, { 0x9B85, 0x5BC9 }, { 0x9B86, 0x5BD4 }, { 0x9B87, 0x5BD0 }, { 0x9B88, 0x5BE4 }, { 0x9B89, 0x5BE6 }, { 0x9B8A, 0x5BE2 }, 
-	{ 0x9B8B, 0x5BDE }, { 0x9B8C, 0x5BE5 }, { 0x9B8D, 0x5BEB }, { 0x9B8E, 0x5BF0 }, { 0x9B8F, 0x5BF6 }, { 0x9B90, 0x5BF3 }, { 0x9B91, 0x5C05 }, { 0x9B92, 0x5C07 }, 
-	{ 0x9B93, 0x5C08 }, { 0x9B94, 0x5C0D }, { 0x9B95, 0x5C13 }, { 0x9B96, 0x5C20 }, { 0x9B97, 0x5C22 }, { 0x9B98, 0x5C28 }, { 0x9B99, 0x5C38 }, { 0x9B9A, 0x5C39 }, 
-	{ 0x9B9B, 0x5C41 }, { 0x9B9C, 0x5C46 }, { 0x9B9D, 0x5C4E }, { 0x9B9E, 0x5C53 }, { 0x9B9F, 0x5C50 }, { 0x9BA0, 0x5C4F }, { 0x9BA1, 0x5B71 }, { 0x9BA2, 0x5C6C }, 
-	{ 0x9BA3, 0x5C6E }, { 0x9BA4, 0x4E62 }, { 0x9BA5, 0x5C76 }, { 0x9BA6, 0x5C79 }, { 0x9BA7, 0x5C8C }, { 0x9BA8, 0x5C91 }, { 0x9BA9, 0x5C94 }, { 0x9BAA, 0x599B }, 
-	{ 0x9BAB, 0x5CAB }, { 0x9BAC, 0x5CBB }, { 0x9BAD, 0x5CB6 }, { 0x9BAE, 0x5CBC }, { 0x9BAF, 0x5CB7 }, { 0x9BB0, 0x5CC5 }, { 0x9BB1, 0x5CBE }, { 0x9BB2, 0x5CC7 }, 
-	{ 0x9BB3, 0x5CD9 }, { 0x9BB4, 0x5CE9 }, { 0x9BB5, 0x5CFD }, { 0x9BB6, 0x5CFA }, { 0x9BB7, 0x5CED }, { 0x9BB8, 0x5D8C }, { 0x9BB9, 0x5CEA }, { 0x9BBA, 0x5D0B }, 
-	{ 0x9BBB, 0x5D15 }, { 0x9BBC, 0x5D17 }, { 0x9BBD, 0x5D5C }, { 0x9BBE, 0x5D1F }, { 0x9BBF, 0x5D1B }, { 0x9BC0, 0x5D11 }, { 0x9BC1, 0x5D14 }, { 0x9BC2, 0x5D22 }, 
-	{ 0x9BC3, 0x5D1A }, { 0x9BC4, 0x5D19 }, { 0x9BC5, 0x5D18 }, { 0x9BC6, 0x5D4C }, { 0x9BC7, 0x5D52 }, { 0x9BC8, 0x5D4E }, { 0x9BC9, 0x5D4B }, { 0x9BCA, 0x5D6C }, 
-	{ 0x9BCB, 0x5D73 }, { 0x9BCC, 0x5D76 }, { 0x9BCD, 0x5D87 }, { 0x9BCE, 0x5D84 }, { 0x9BCF, 0x5D82 }, { 0x9BD0, 0x5DA2 }, { 0x9BD1, 0x5D9D }, { 0x9BD2, 0x5DAC }, 
-	{ 0x9BD3, 0x5DAE }, { 0x9BD4, 0x5DBD }, { 0x9BD5, 0x5D90 }, { 0x9BD6, 0x5DB7 }, { 0x9BD7, 0x5DBC }, { 0x9BD8, 0x5DC9 }, { 0x9BD9, 0x5DCD }, { 0x9BDA, 0x5DD3 }, 
-	{ 0x9BDB, 0x5DD2 }, { 0x9BDC, 0x5DD6 }, { 0x9BDD, 0x5DDB }, { 0x9BDE, 0x5DEB }, { 0x9BDF, 0x5DF2 }, { 0x9BE0, 0x5DF5 }, { 0x9BE1, 0x5E0B }, { 0x9BE2, 0x5E1A }, 
-	{ 0x9BE3, 0x5E19 }, { 0x9BE4, 0x5E11 }, { 0x9BE5, 0x5E1B }, { 0x9BE6, 0x5E36 }, { 0x9BE7, 0x5E37 }, { 0x9BE8, 0x5E44 }, { 0x9BE9, 0x5E43 }, { 0x9BEA, 0x5E40 }, 
-	{ 0x9BEB, 0x5E4E }, { 0x9BEC, 0x5E57 }, { 0x9BED, 0x5E54 }, { 0x9BEE, 0x5E5F }, { 0x9BEF, 0x5E62 }, { 0x9BF0, 0x5E64 }, { 0x9BF1, 0x5E47 }, { 0x9BF2, 0x5E75 }, 
-	{ 0x9BF3, 0x5E76 }, { 0x9BF4, 0x5E7A }, { 0x9BF5, 0x9EBC }, { 0x9BF6, 0x5E7F }, { 0x9BF7, 0x5EA0 }, { 0x9BF8, 0x5EC1 }, { 0x9BF9, 0x5EC2 }, { 0x9BFA, 0x5EC8 }, 
-	{ 0x9BFB, 0x5ED0 }, { 0x9BFC, 0x5ECF }, { 0x9C40, 0x5ED6 }, { 0x9C41, 0x5EE3 }, { 0x9C42, 0x5EDD }, { 0x9C43, 0x5EDA }, { 0x9C44, 0x5EDB }, { 0x9C45, 0x5EE2 }, 
-	{ 0x9C46, 0x5EE1 }, { 0x9C47, 0x5EE8 }, { 0x9C48, 0x5EE9 }, { 0x9C49, 0x5EEC }, { 0x9C4A, 0x5EF1 }, { 0x9C4B, 0x5EF3 }, { 0x9C4C, 0x5EF0 }, { 0x9C4D, 0x5EF4 }, 
-	{ 0x9C4E, 0x5EF8 }, { 0x9C4F, 0x5EFE }, { 0x9C50, 0x5F03 }, { 0x9C51, 0x5F09 }, { 0x9C52, 0x5F5D }, { 0x9C53, 0x5F5C }, { 0x9C54, 0x5F0B }, { 0x9C55, 0x5F11 }, 
-	{ 0x9C56, 0x5F16 }, { 0x9C57, 0x5F29 }, { 0x9C58, 0x5F2D }, { 0x9C59, 0x5F38 }, { 0x9C5A, 0x5F41 }, { 0x9C5B, 0x5F48 }, { 0x9C5C, 0x5F4C }, { 0x9C5D, 0x5F4E }, 
-	{ 0x9C5E, 0x5F2F }, { 0x9C5F, 0x5F51 }, { 0x9C60, 0x5F56 }, { 0x9C61, 0x5F57 }, { 0x9C62, 0x5F59 }, { 0x9C63, 0x5F61 }, { 0x9C64, 0x5F6D }, { 0x9C65, 0x5F73 }, 
-	{ 0x9C66, 0x5F77 }, { 0x9C67, 0x5F83 }, { 0x9C68, 0x5F82 }, { 0x9C69, 0x5F7F }, { 0x9C6A, 0x5F8A }, { 0x9C6B, 0x5F88 }, { 0x9C6C, 0x5F91 }, { 0x9C6D, 0x5F87 }, 
-	{ 0x9C6E, 0x5F9E }, { 0x9C6F, 0x5F99 }, { 0x9C70, 0x5F98 }, { 0x9C71, 0x5FA0 }, { 0x9C72, 0x5FA8 }, { 0x9C73, 0x5FAD }, { 0x9C74, 0x5FBC }, { 0x9C75, 0x5FD6 }, 
-	{ 0x9C76, 0x5FFB }, { 0x9C77, 0x5FE4 }, { 0x9C78, 0x5FF8 }, { 0x9C79, 0x5FF1 }, { 0x9C7A, 0x5FDD }, { 0x9C7B, 0x60B3 }, { 0x9C7C, 0x5FFF }, { 0x9C7D, 0x6021 }, 
-	{ 0x9C7E, 0x6060 }, { 0x9C80, 0x6019 }, { 0x9C81, 0x6010 }, { 0x9C82, 0x6029 }, { 0x9C83, 0x600E }, { 0x9C84, 0x6031 }, { 0x9C85, 0x601B }, { 0x9C86, 0x6015 }, 
-	{ 0x9C87, 0x602B }, { 0x9C88, 0x6026 }, { 0x9C89, 0x600F }, { 0x9C8A, 0x603A }, { 0x9C8B, 0x605A }, { 0x9C8C, 0x6041 }, { 0x9C8D, 0x606A }, { 0x9C8E, 0x6077 }, 
-	{ 0x9C8F, 0x605F }, { 0x9C90, 0x604A }, { 0x9C91, 0x6046 }, { 0x9C92, 0x604D }, { 0x9C93, 0x6063 }, { 0x9C94, 0x6043 }, { 0x9C95, 0x6064 }, { 0x9C96, 0x6042 }, 
-	{ 0x9C97, 0x606C }, { 0x9C98, 0x606B }, { 0x9C99, 0x6059 }, { 0x9C9A, 0x6081 }, { 0x9C9B, 0x608D }, { 0x9C9C, 0x60E7 }, { 0x9C9D, 0x6083 }, { 0x9C9E, 0x609A }, 
-	{ 0x9C9F, 0x6084 }, { 0x9CA0, 0x609B }, { 0x9CA1, 0x6096 }, { 0x9CA2, 0x6097 }, { 0x9CA3, 0x6092 }, { 0x9CA4, 0x60A7 }, { 0x9CA5, 0x608B }, { 0x9CA6, 0x60E1 }, 
-	{ 0x9CA7, 0x60B8 }, { 0x9CA8, 0x60E0 }, { 0x9CA9, 0x60D3 }, { 0x9CAA, 0x60B4 }, { 0x9CAB, 0x5FF0 }, { 0x9CAC, 0x60BD }, { 0x9CAD, 0x60C6 }, { 0x9CAE, 0x60B5 }, 
-	{ 0x9CAF, 0x60D8 }, { 0x9CB0, 0x614D }, { 0x9CB1, 0x6115 }, { 0x9CB2, 0x6106 }, { 0x9CB3, 0x60F6 }, { 0x9CB4, 0x60F7 }, { 0x9CB5, 0x6100 }, { 0x9CB6, 0x60F4 }, 
-	{ 0x9CB7, 0x60FA }, { 0x9CB8, 0x6103 }, { 0x9CB9, 0x6121 }, { 0x9CBA, 0x60FB }, { 0x9CBB, 0x60F1 }, { 0x9CBC, 0x610D }, { 0x9CBD, 0x610E }, { 0x9CBE, 0x6147 }, 
-	{ 0x9CBF, 0x613E }, { 0x9CC0, 0x6128 }, { 0x9CC1, 0x6127 }, { 0x9CC2, 0x614A }, { 0x9CC3, 0x613F }, { 0x9CC4, 0x613C }, { 0x9CC5, 0x612C }, { 0x9CC6, 0x6134 }, 
-	{ 0x9CC7, 0x613D }, { 0x9CC8, 0x6142 }, { 0x9CC9, 0x6144 }, { 0x9CCA, 0x6173 }, { 0x9CCB, 0x6177 }, { 0x9CCC, 0x6158 }, { 0x9CCD, 0x6159 }, { 0x9CCE, 0x615A }, 
-	{ 0x9CCF, 0x616B }, { 0x9CD0, 0x6174 }, { 0x9CD1, 0x616F }, { 0x9CD2, 0x6165 }, { 0x9CD3, 0x6171 }, { 0x9CD4, 0x615F }, { 0x9CD5, 0x615D }, { 0x9CD6, 0x6153 }, 
-	{ 0x9CD7, 0x6175 }, { 0x9CD8, 0x6199 }, { 0x9CD9, 0x6196 }, { 0x9CDA, 0x6187 }, { 0x9CDB, 0x61AC }, { 0x9CDC, 0x6194 }, { 0x9CDD, 0x619A }, { 0x9CDE, 0x618A }, 
-	{ 0x9CDF, 0x6191 }, { 0x9CE0, 0x61AB }, { 0x9CE1, 0x61AE }, { 0x9CE2, 0x61CC }, { 0x9CE3, 0x61CA }, { 0x9CE4, 0x61C9 }, { 0x9CE5, 0x61F7 }, { 0x9CE6, 0x61C8 }, 
-	{ 0x9CE7, 0x61C3 }, { 0x9CE8, 0x61C6 }, { 0x9CE9, 0x61BA }, { 0x9CEA, 0x61CB }, { 0x9CEB, 0x7F79 }, { 0x9CEC, 0x61CD }, { 0x9CED, 0x61E6 }, { 0x9CEE, 0x61E3 }, 
-	{ 0x9CEF, 0x61F6 }, { 0x9CF0, 0x61FA }, { 0x9CF1, 0x61F4 }, { 0x9CF2, 0x61FF }, { 0x9CF3, 0x61FD }, { 0x9CF4, 0x61FC }, { 0x9CF5, 0x61FE }, { 0x9CF6, 0x6200 }, 
-	{ 0x9CF7, 0x6208 }, { 0x9CF8, 0x6209 }, { 0x9CF9, 0x620D }, { 0x9CFA, 0x620C }, { 0x9CFB, 0x6214 }, { 0x9CFC, 0x621B }, { 0x9D40, 0x621E }, { 0x9D41, 0x6221 }, 
-	{ 0x9D42, 0x622A }, { 0x9D43, 0x622E }, { 0x9D44, 0x6230 }, { 0x9D45, 0x6232 }, { 0x9D46, 0x6233 }, { 0x9D47, 0x6241 }, { 0x9D48, 0x624E }, { 0x9D49, 0x625E }, 
-	{ 0x9D4A, 0x6263 }, { 0x9D4B, 0x625B }, { 0x9D4C, 0x6260 }, { 0x9D4D, 0x6268 }, { 0x9D4E, 0x627C }, { 0x9D4F, 0x6282 }, { 0x9D50, 0x6289 }, { 0x9D51, 0x627E }, 
-	{ 0x9D52, 0x6292 }, { 0x9D53, 0x6293 }, { 0x9D54, 0x6296 }, { 0x9D55, 0x62D4 }, { 0x9D56, 0x6283 }, { 0x9D57, 0x6294 }, { 0x9D58, 0x62D7 }, { 0x9D59, 0x62D1 }, 
-	{ 0x9D5A, 0x62BB }, { 0x9D5B, 0x62CF }, { 0x9D5C, 0x62FF }, { 0x9D5D, 0x62C6 }, { 0x9D5E, 0x64D4 }, { 0x9D5F, 0x62C8 }, { 0x9D60, 0x62DC }, { 0x9D61, 0x62CC }, 
-	{ 0x9D62, 0x62CA }, { 0x9D63, 0x62C2 }, { 0x9D64, 0x62C7 }, { 0x9D65, 0x629B }, { 0x9D66, 0x62C9 }, { 0x9D67, 0x630C }, { 0x9D68, 0x62EE }, { 0x9D69, 0x62F1 }, 
-	{ 0x9D6A, 0x6327 }, { 0x9D6B, 0x6302 }, { 0x9D6C, 0x6308 }, { 0x9D6D, 0x62EF }, { 0x9D6E, 0x62F5 }, { 0x9D6F, 0x6350 }, { 0x9D70, 0x633E }, { 0x9D71, 0x634D }, 
-	{ 0x9D72, 0x641C }, { 0x9D73, 0x634F }, { 0x9D74, 0x6396 }, { 0x9D75, 0x638E }, { 0x9D76, 0x6380 }, { 0x9D77, 0x63AB }, { 0x9D78, 0x6376 }, { 0x9D79, 0x63A3 }, 
-	{ 0x9D7A, 0x638F }, { 0x9D7B, 0x6389 }, { 0x9D7C, 0x639F }, { 0x9D7D, 0x63B5 }, { 0x9D7E, 0x636B }, { 0x9D80, 0x6369 }, { 0x9D81, 0x63BE }, { 0x9D82, 0x63E9 }, 
-	{ 0x9D83, 0x63C0 }, { 0x9D84, 0x63C6 }, { 0x9D85, 0x63E3 }, { 0x9D86, 0x63C9 }, { 0x9D87, 0x63D2 }, { 0x9D88, 0x63F6 }, { 0x9D89, 0x63C4 }, { 0x9D8A, 0x6416 }, 
-	{ 0x9D8B, 0x6434 }, { 0x9D8C, 0x6406 }, { 0x9D8D, 0x6413 }, { 0x9D8E, 0x6426 }, { 0x9D8F, 0x6436 }, { 0x9D90, 0x651D }, { 0x9D91, 0x6417 }, { 0x9D92, 0x6428 }, 
-	{ 0x9D93, 0x640F }, { 0x9D94, 0x6467 }, { 0x9D95, 0x646F }, { 0x9D96, 0x6476 }, { 0x9D97, 0x644E }, { 0x9D98, 0x652A }, { 0x9D99, 0x6495 }, { 0x9D9A, 0x6493 }, 
-	{ 0x9D9B, 0x64A5 }, { 0x9D9C, 0x64A9 }, { 0x9D9D, 0x6488 }, { 0x9D9E, 0x64BC }, { 0x9D9F, 0x64DA }, { 0x9DA0, 0x64D2 }, { 0x9DA1, 0x64C5 }, { 0x9DA2, 0x64C7 }, 
-	{ 0x9DA3, 0x64BB }, { 0x9DA4, 0x64D8 }, { 0x9DA5, 0x64C2 }, { 0x9DA6, 0x64F1 }, { 0x9DA7, 0x64E7 }, { 0x9DA8, 0x8209 }, { 0x9DA9, 0x64E0 }, { 0x9DAA, 0x64E1 }, 
-	{ 0x9DAB, 0x62AC }, { 0x9DAC, 0x64E3 }, { 0x9DAD, 0x64EF }, { 0x9DAE, 0x652C }, { 0x9DAF, 0x64F6 }, { 0x9DB0, 0x64F4 }, { 0x9DB1, 0x64F2 }, { 0x9DB2, 0x64FA }, 
-	{ 0x9DB3, 0x6500 }, { 0x9DB4, 0x64FD }, { 0x9DB5, 0x6518 }, { 0x9DB6, 0x651C }, { 0x9DB7, 0x6505 }, { 0x9DB8, 0x6524 }, { 0x9DB9, 0x6523 }, { 0x9DBA, 0x652B }, 
-	{ 0x9DBB, 0x6534 }, { 0x9DBC, 0x6535 }, { 0x9DBD, 0x6537 }, { 0x9DBE, 0x6536 }, { 0x9DBF, 0x6538 }, { 0x9DC0, 0x754B }, { 0x9DC1, 0x6548 }, { 0x9DC2, 0x6556 }, 
-	{ 0x9DC3, 0x6555 }, { 0x9DC4, 0x654D }, { 0x9DC5, 0x6558 }, { 0x9DC6, 0x655E }, { 0x9DC7, 0x655D }, { 0x9DC8, 0x6572 }, { 0x9DC9, 0x6578 }, { 0x9DCA, 0x6582 }, 
-	{ 0x9DCB, 0x6583 }, { 0x9DCC, 0x8B8A }, { 0x9DCD, 0x659B }, { 0x9DCE, 0x659F }, { 0x9DCF, 0x65AB }, { 0x9DD0, 0x65B7 }, { 0x9DD1, 0x65C3 }, { 0x9DD2, 0x65C6 }, 
-	{ 0x9DD3, 0x65C1 }, { 0x9DD4, 0x65C4 }, { 0x9DD5, 0x65CC }, { 0x9DD6, 0x65D2 }, { 0x9DD7, 0x65DB }, { 0x9DD8, 0x65D9 }, { 0x9DD9, 0x65E0 }, { 0x9DDA, 0x65E1 }, 
-	{ 0x9DDB, 0x65F1 }, { 0x9DDC, 0x6772 }, { 0x9DDD, 0x660A }, { 0x9DDE, 0x6603 }, { 0x9DDF, 0x65FB }, { 0x9DE0, 0x6773 }, { 0x9DE1, 0x6635 }, { 0x9DE2, 0x6636 }, 
-	{ 0x9DE3, 0x6634 }, { 0x9DE4, 0x661C }, { 0x9DE5, 0x664F }, { 0x9DE6, 0x6644 }, { 0x9DE7, 0x6649 }, { 0x9DE8, 0x6641 }, { 0x9DE9, 0x665E }, { 0x9DEA, 0x665D }, 
-	{ 0x9DEB, 0x6664 }, { 0x9DEC, 0x6667 }, { 0x9DED, 0x6668 }, { 0x9DEE, 0x665F }, { 0x9DEF, 0x6662 }, { 0x9DF0, 0x6670 }, { 0x9DF1, 0x6683 }, { 0x9DF2, 0x6688 }, 
-	{ 0x9DF3, 0x668E }, { 0x9DF4, 0x6689 }, { 0x9DF5, 0x6684 }, { 0x9DF6, 0x6698 }, { 0x9DF7, 0x669D }, { 0x9DF8, 0x66C1 }, { 0x9DF9, 0x66B9 }, { 0x9DFA, 0x66C9 }, 
-	{ 0x9DFB, 0x66BE }, { 0x9DFC, 0x66BC }, { 0x9E40, 0x66C4 }, { 0x9E41, 0x66B8 }, { 0x9E42, 0x66D6 }, { 0x9E43, 0x66DA }, { 0x9E44, 0x66E0 }, { 0x9E45, 0x663F }, 
-	{ 0x9E46, 0x66E6 }, { 0x9E47, 0x66E9 }, { 0x9E48, 0x66F0 }, { 0x9E49, 0x66F5 }, { 0x9E4A, 0x66F7 }, { 0x9E4B, 0x670F }, { 0x9E4C, 0x6716 }, { 0x9E4D, 0x671E }, 
-	{ 0x9E4E, 0x6726 }, { 0x9E4F, 0x6727 }, { 0x9E50, 0x9738 }, { 0x9E51, 0x672E }, { 0x9E52, 0x673F }, { 0x9E53, 0x6736 }, { 0x9E54, 0x6741 }, { 0x9E55, 0x6738 }, 
-	{ 0x9E56, 0x6737 }, { 0x9E57, 0x6746 }, { 0x9E58, 0x675E }, { 0x9E59, 0x6760 }, { 0x9E5A, 0x6759 }, { 0x9E5B, 0x6763 }, { 0x9E5C, 0x6764 }, { 0x9E5D, 0x6789 }, 
-	{ 0x9E5E, 0x6770 }, { 0x9E5F, 0x67A9 }, { 0x9E60, 0x677C }, { 0x9E61, 0x676A }, { 0x9E62, 0x678C }, { 0x9E63, 0x678B }, { 0x9E64, 0x67A6 }, { 0x9E65, 0x67A1 }, 
-	{ 0x9E66, 0x6785 }, { 0x9E67, 0x67B7 }, { 0x9E68, 0x67EF }, { 0x9E69, 0x67B4 }, { 0x9E6A, 0x67EC }, { 0x9E6B, 0x67B3 }, { 0x9E6C, 0x67E9 }, { 0x9E6D, 0x67B8 }, 
-	{ 0x9E6E, 0x67E4 }, { 0x9E6F, 0x67DE }, { 0x9E70, 0x67DD }, { 0x9E71, 0x67E2 }, { 0x9E72, 0x67EE }, { 0x9E73, 0x67B9 }, { 0x9E74, 0x67CE }, { 0x9E75, 0x67C6 }, 
-	{ 0x9E76, 0x67E7 }, { 0x9E77, 0x6A9C }, { 0x9E78, 0x681E }, { 0x9E79, 0x6846 }, { 0x9E7A, 0x6829 }, { 0x9E7B, 0x6840 }, { 0x9E7C, 0x684D }, { 0x9E7D, 0x6832 }, 
-	{ 0x9E7E, 0x684E }, { 0x9E80, 0x68B3 }, { 0x9E81, 0x682B }, { 0x9E82, 0x6859 }, { 0x9E83, 0x6863 }, { 0x9E84, 0x6877 }, { 0x9E85, 0x687F }, { 0x9E86, 0x689F }, 
-	{ 0x9E87, 0x688F }, { 0x9E88, 0x68AD }, { 0x9E89, 0x6894 }, { 0x9E8A, 0x689D }, { 0x9E8B, 0x689B }, { 0x9E8C, 0x6883 }, { 0x9E8D, 0x6AAE }, { 0x9E8E, 0x68B9 }, 
-	{ 0x9E8F, 0x6874 }, { 0x9E90, 0x68B5 }, { 0x9E91, 0x68A0 }, { 0x9E92, 0x68BA }, { 0x9E93, 0x690F }, { 0x9E94, 0x688D }, { 0x9E95, 0x687E }, { 0x9E96, 0x6901 }, 
-	{ 0x9E97, 0x68CA }, { 0x9E98, 0x6908 }, { 0x9E99, 0x68D8 }, { 0x9E9A, 0x6922 }, { 0x9E9B, 0x6926 }, { 0x9E9C, 0x68E1 }, { 0x9E9D, 0x690C }, { 0x9E9E, 0x68CD }, 
-	{ 0x9E9F, 0x68D4 }, { 0x9EA0, 0x68E7 }, { 0x9EA1, 0x68D5 }, { 0x9EA2, 0x6936 }, { 0x9EA3, 0x6912 }, { 0x9EA4, 0x6904 }, { 0x9EA5, 0x68D7 }, { 0x9EA6, 0x68E3 }, 
-	{ 0x9EA7, 0x6925 }, { 0x9EA8, 0x68F9 }, { 0x9EA9, 0x68E0 }, { 0x9EAA, 0x68EF }, { 0x9EAB, 0x6928 }, { 0x9EAC, 0x692A }, { 0x9EAD, 0x691A }, { 0x9EAE, 0x6923 }, 
-	{ 0x9EAF, 0x6921 }, { 0x9EB0, 0x68C6 }, { 0x9EB1, 0x6979 }, { 0x9EB2, 0x6977 }, { 0x9EB3, 0x695C }, { 0x9EB4, 0x6978 }, { 0x9EB5, 0x696B }, { 0x9EB6, 0x6954 }, 
-	{ 0x9EB7, 0x697E }, { 0x9EB8, 0x696E }, { 0x9EB9, 0x6939 }, { 0x9EBA, 0x6974 }, { 0x9EBB, 0x693D }, { 0x9EBC, 0x6959 }, { 0x9EBD, 0x6930 }, { 0x9EBE, 0x6961 }, 
-	{ 0x9EBF, 0x695E }, { 0x9EC0, 0x695D }, { 0x9EC1, 0x6981 }, { 0x9EC2, 0x696A }, { 0x9EC3, 0x69B2 }, { 0x9EC4, 0x69AE }, { 0x9EC5, 0x69D0 }, { 0x9EC6, 0x69BF }, 
-	{ 0x9EC7, 0x69C1 }, { 0x9EC8, 0x69D3 }, { 0x9EC9, 0x69BE }, { 0x9ECA, 0x69CE }, { 0x9ECB, 0x5BE8 }, { 0x9ECC, 0x69CA }, { 0x9ECD, 0x69DD }, { 0x9ECE, 0x69BB }, 
-	{ 0x9ECF, 0x69C3 }, { 0x9ED0, 0x69A7 }, { 0x9ED1, 0x6A2E }, { 0x9ED2, 0x6991 }, { 0x9ED3, 0x69A0 }, { 0x9ED4, 0x699C }, { 0x9ED5, 0x6995 }, { 0x9ED6, 0x69B4 }, 
-	{ 0x9ED7, 0x69DE }, { 0x9ED8, 0x69E8 }, { 0x9ED9, 0x6A02 }, { 0x9EDA, 0x6A1B }, { 0x9EDB, 0x69FF }, { 0x9EDC, 0x6B0A }, { 0x9EDD, 0x69F9 }, { 0x9EDE, 0x69F2 }, 
-	{ 0x9EDF, 0x69E7 }, { 0x9EE0, 0x6A05 }, { 0x9EE1, 0x69B1 }, { 0x9EE2, 0x6A1E }, { 0x9EE3, 0x69ED }, { 0x9EE4, 0x6A14 }, { 0x9EE5, 0x69EB }, { 0x9EE6, 0x6A0A }, 
-	{ 0x9EE7, 0x6A12 }, { 0x9EE8, 0x6AC1 }, { 0x9EE9, 0x6A23 }, { 0x9EEA, 0x6A13 }, { 0x9EEB, 0x6A44 }, { 0x9EEC, 0x6A0C }, { 0x9EED, 0x6A72 }, { 0x9EEE, 0x6A36 }, 
-	{ 0x9EEF, 0x6A78 }, { 0x9EF0, 0x6A47 }, { 0x9EF1, 0x6A62 }, { 0x9EF2, 0x6A59 }, { 0x9EF3, 0x6A66 }, { 0x9EF4, 0x6A48 }, { 0x9EF5, 0x6A38 }, { 0x9EF6, 0x6A22 }, 
-	{ 0x9EF7, 0x6A90 }, { 0x9EF8, 0x6A8D }, { 0x9EF9, 0x6AA0 }, { 0x9EFA, 0x6A84 }, { 0x9EFB, 0x6AA2 }, { 0x9EFC, 0x6AA3 }, { 0x9F40, 0x6A97 }, { 0x9F41, 0x8617 }, 
-	{ 0x9F42, 0x6ABB }, { 0x9F43, 0x6AC3 }, { 0x9F44, 0x6AC2 }, { 0x9F45, 0x6AB8 }, { 0x9F46, 0x6AB3 }, { 0x9F47, 0x6AAC }, { 0x9F48, 0x6ADE }, { 0x9F49, 0x6AD1 }, 
-	{ 0x9F4A, 0x6ADF }, { 0x9F4B, 0x6AAA }, { 0x9F4C, 0x6ADA }, { 0x9F4D, 0x6AEA }, { 0x9F4E, 0x6AFB }, { 0x9F4F, 0x6B05 }, { 0x9F50, 0x8616 }, { 0x9F51, 0x6AFA }, 
-	{ 0x9F52, 0x6B12 }, { 0x9F53, 0x6B16 }, { 0x9F54, 0x9B31 }, { 0x9F55, 0x6B1F }, { 0x9F56, 0x6B38 }, { 0x9F57, 0x6B37 }, { 0x9F58, 0x76DC }, { 0x9F59, 0x6B39 }, 
-	{ 0x9F5A, 0x98EE }, { 0x9F5B, 0x6B47 }, { 0x9F5C, 0x6B43 }, { 0x9F5D, 0x6B49 }, { 0x9F5E, 0x6B50 }, { 0x9F5F, 0x6B59 }, { 0x9F60, 0x6B54 }, { 0x9F61, 0x6B5B }, 
-	{ 0x9F62, 0x6B5F }, { 0x9F63, 0x6B61 }, { 0x9F64, 0x6B78 }, { 0x9F65, 0x6B79 }, { 0x9F66, 0x6B7F }, { 0x9F67, 0x6B80 }, { 0x9F68, 0x6B84 }, { 0x9F69, 0x6B83 }, 
-	{ 0x9F6A, 0x6B8D }, { 0x9F6B, 0x6B98 }, { 0x9F6C, 0x6B95 }, { 0x9F6D, 0x6B9E }, { 0x9F6E, 0x6BA4 }, { 0x9F6F, 0x6BAA }, { 0x9F70, 0x6BAB }, { 0x9F71, 0x6BAF }, 
-	{ 0x9F72, 0x6BB2 }, { 0x9F73, 0x6BB1 }, { 0x9F74, 0x6BB3 }, { 0x9F75, 0x6BB7 }, { 0x9F76, 0x6BBC }, { 0x9F77, 0x6BC6 }, { 0x9F78, 0x6BCB }, { 0x9F79, 0x6BD3 }, 
-	{ 0x9F7A, 0x6BDF }, { 0x9F7B, 0x6BEC }, { 0x9F7C, 0x6BEB }, { 0x9F7D, 0x6BF3 }, { 0x9F7E, 0x6BEF }, { 0x9F80, 0x9EBE }, { 0x9F81, 0x6C08 }, { 0x9F82, 0x6C13 }, 
-	{ 0x9F83, 0x6C14 }, { 0x9F84, 0x6C1B }, { 0x9F85, 0x6C24 }, { 0x9F86, 0x6C23 }, { 0x9F87, 0x6C5E }, { 0x9F88, 0x6C55 }, { 0x9F89, 0x6C62 }, { 0x9F8A, 0x6C6A }, 
-	{ 0x9F8B, 0x6C82 }, { 0x9F8C, 0x6C8D }, { 0x9F8D, 0x6C9A }, { 0x9F8E, 0x6C81 }, { 0x9F8F, 0x6C9B }, { 0x9F90, 0x6C7E }, { 0x9F91, 0x6C68 }, { 0x9F92, 0x6C73 }, 
-	{ 0x9F93, 0x6C92 }, { 0x9F94, 0x6C90 }, { 0x9F95, 0x6CC4 }, { 0x9F96, 0x6CF1 }, { 0x9F97, 0x6CD3 }, { 0x9F98, 0x6CBD }, { 0x9F99, 0x6CD7 }, { 0x9F9A, 0x6CC5 }, 
-	{ 0x9F9B, 0x6CDD }, { 0x9F9C, 0x6CAE }, { 0x9F9D, 0x6CB1 }, { 0x9F9E, 0x6CBE }, { 0x9F9F, 0x6CBA }, { 0x9FA0, 0x6CDB }, { 0x9FA1, 0x6CEF }, { 0x9FA2, 0x6CD9 }, 
-	{ 0x9FA3, 0x6CEA }, { 0x9FA4, 0x6D1F }, { 0x9FA5, 0x884D }, { 0x9FA6, 0x6D36 }, { 0x9FA7, 0x6D2B }, { 0x9FA8, 0x6D3D }, { 0x9FA9, 0x6D38 }, { 0x9FAA, 0x6D19 }, 
-	{ 0x9FAB, 0x6D35 }, { 0x9FAC, 0x6D33 }, { 0x9FAD, 0x6D12 }, { 0x9FAE, 0x6D0C }, { 0x9FAF, 0x6D63 }, { 0x9FB0, 0x6D93 }, { 0x9FB1, 0x6D64 }, { 0x9FB2, 0x6D5A }, 
-	{ 0x9FB3, 0x6D79 }, { 0x9FB4, 0x6D59 }, { 0x9FB5, 0x6D8E }, { 0x9FB6, 0x6D95 }, { 0x9FB7, 0x6FE4 }, { 0x9FB8, 0x6D85 }, { 0x9FB9, 0x6DF9 }, { 0x9FBA, 0x6E15 }, 
-	{ 0x9FBB, 0x6E0A }, { 0x9FBC, 0x6DB5 }, { 0x9FBD, 0x6DC7 }, { 0x9FBE, 0x6DE6 }, { 0x9FBF, 0x6DB8 }, { 0x9FC0, 0x6DC6 }, { 0x9FC1, 0x6DEC }, { 0x9FC2, 0x6DDE }, 
-	{ 0x9FC3, 0x6DCC }, { 0x9FC4, 0x6DE8 }, { 0x9FC5, 0x6DD2 }, { 0x9FC6, 0x6DC5 }, { 0x9FC7, 0x6DFA }, { 0x9FC8, 0x6DD9 }, { 0x9FC9, 0x6DE4 }, { 0x9FCA, 0x6DD5 }, 
-	{ 0x9FCB, 0x6DEA }, { 0x9FCC, 0x6DEE }, { 0x9FCD, 0x6E2D }, { 0x9FCE, 0x6E6E }, { 0x9FCF, 0x6E2E }, { 0x9FD0, 0x6E19 }, { 0x9FD1, 0x6E72 }, { 0x9FD2, 0x6E5F }, 
-	{ 0x9FD3, 0x6E3E }, { 0x9FD4, 0x6E23 }, { 0x9FD5, 0x6E6B }, { 0x9FD6, 0x6E2B }, { 0x9FD7, 0x6E76 }, { 0x9FD8, 0x6E4D }, { 0x9FD9, 0x6E1F }, { 0x9FDA, 0x6E43 }, 
-	{ 0x9FDB, 0x6E3A }, { 0x9FDC, 0x6E4E }, { 0x9FDD, 0x6E24 }, { 0x9FDE, 0x6EFF }, { 0x9FDF, 0x6E1D }, { 0x9FE0, 0x6E38 }, { 0x9FE1, 0x6E82 }, { 0x9FE2, 0x6EAA }, 
-	{ 0x9FE3, 0x6E98 }, { 0x9FE4, 0x6EC9 }, { 0x9FE5, 0x6EB7 }, { 0x9FE6, 0x6ED3 }, { 0x9FE7, 0x6EBD }, { 0x9FE8, 0x6EAF }, { 0x9FE9, 0x6EC4 }, { 0x9FEA, 0x6EB2 }, 
-	{ 0x9FEB, 0x6ED4 }, { 0x9FEC, 0x6ED5 }, { 0x9FED, 0x6E8F }, { 0x9FEE, 0x6EA5 }, { 0x9FEF, 0x6EC2 }, { 0x9FF0, 0x6E9F }, { 0x9FF1, 0x6F41 }, { 0x9FF2, 0x6F11 }, 
-	{ 0x9FF3, 0x704C }, { 0x9FF4, 0x6EEC }, { 0x9FF5, 0x6EF8 }, { 0x9FF6, 0x6EFE }, { 0x9FF7, 0x6F3F }, { 0x9FF8, 0x6EF2 }, { 0x9FF9, 0x6F31 }, { 0x9FFA, 0x6EEF }, 
-	{ 0x9FFB, 0x6F32 }, { 0x9FFC, 0x6ECC }, { 0xE040, 0x6F3E }, { 0xE041, 0x6F13 }, { 0xE042, 0x6EF7 }, { 0xE043, 0x6F86 }, { 0xE044, 0x6F7A }, { 0xE045, 0x6F78 }, 
-	{ 0xE046, 0x6F81 }, { 0xE047, 0x6F80 }, { 0xE048, 0x6F6F }, { 0xE049, 0x6F5B }, { 0xE04A, 0x6FF3 }, { 0xE04B, 0x6F6D }, { 0xE04C, 0x6F82 }, { 0xE04D, 0x6F7C }, 
-	{ 0xE04E, 0x6F58 }, { 0xE04F, 0x6F8E }, { 0xE050, 0x6F91 }, { 0xE051, 0x6FC2 }, { 0xE052, 0x6F66 }, { 0xE053, 0x6FB3 }, { 0xE054, 0x6FA3 }, { 0xE055, 0x6FA1 }, 
-	{ 0xE056, 0x6FA4 }, { 0xE057, 0x6FB9 }, { 0xE058, 0x6FC6 }, { 0xE059, 0x6FAA }, { 0xE05A, 0x6FDF }, { 0xE05B, 0x6FD5 }, { 0xE05C, 0x6FEC }, { 0xE05D, 0x6FD4 }, 
-	{ 0xE05E, 0x6FD8 }, { 0xE05F, 0x6FF1 }, { 0xE060, 0x6FEE }, { 0xE061, 0x6FDB }, { 0xE062, 0x7009 }, { 0xE063, 0x700B }, { 0xE064, 0x6FFA }, { 0xE065, 0x7011 }, 
-	{ 0xE066, 0x7001 }, { 0xE067, 0x700F }, { 0xE068, 0x6FFE }, { 0xE069, 0x701B }, { 0xE06A, 0x701A }, { 0xE06B, 0x6F74 }, { 0xE06C, 0x701D }, { 0xE06D, 0x7018 }, 
-	{ 0xE06E, 0x701F }, { 0xE06F, 0x7030 }, { 0xE070, 0x703E }, { 0xE071, 0x7032 }, { 0xE072, 0x7051 }, { 0xE073, 0x7063 }, { 0xE074, 0x7099 }, { 0xE075, 0x7092 }, 
-	{ 0xE076, 0x70AF }, { 0xE077, 0x70F1 }, { 0xE078, 0x70AC }, { 0xE079, 0x70B8 }, { 0xE07A, 0x70B3 }, { 0xE07B, 0x70AE }, { 0xE07C, 0x70DF }, { 0xE07D, 0x70CB }, 
-	{ 0xE07E, 0x70DD }, { 0xE080, 0x70D9 }, { 0xE081, 0x7109 }, { 0xE082, 0x70FD }, { 0xE083, 0x711C }, { 0xE084, 0x7119 }, { 0xE085, 0x7165 }, { 0xE086, 0x7155 }, 
-	{ 0xE087, 0x7188 }, { 0xE088, 0x7166 }, { 0xE089, 0x7162 }, { 0xE08A, 0x714C }, { 0xE08B, 0x7156 }, { 0xE08C, 0x716C }, { 0xE08D, 0x718F }, { 0xE08E, 0x71FB }, 
-	{ 0xE08F, 0x7184 }, { 0xE090, 0x7195 }, { 0xE091, 0x71A8 }, { 0xE092, 0x71AC }, { 0xE093, 0x71D7 }, { 0xE094, 0x71B9 }, { 0xE095, 0x71BE }, { 0xE096, 0x71D2 }, 
-	{ 0xE097, 0x71C9 }, { 0xE098, 0x71D4 }, { 0xE099, 0x71CE }, { 0xE09A, 0x71E0 }, { 0xE09B, 0x71EC }, { 0xE09C, 0x71E7 }, { 0xE09D, 0x71F5 }, { 0xE09E, 0x71FC }, 
-	{ 0xE09F, 0x71F9 }, { 0xE0A0, 0x71FF }, { 0xE0A1, 0x720D }, { 0xE0A2, 0x7210 }, { 0xE0A3, 0x721B }, { 0xE0A4, 0x7228 }, { 0xE0A5, 0x722D }, { 0xE0A6, 0x722C }, 
-	{ 0xE0A7, 0x7230 }, { 0xE0A8, 0x7232 }, { 0xE0A9, 0x723B }, { 0xE0AA, 0x723C }, { 0xE0AB, 0x723F }, { 0xE0AC, 0x7240 }, { 0xE0AD, 0x7246 }, { 0xE0AE, 0x724B }, 
-	{ 0xE0AF, 0x7258 }, { 0xE0B0, 0x7274 }, { 0xE0B1, 0x727E }, { 0xE0B2, 0x7282 }, { 0xE0B3, 0x7281 }, { 0xE0B4, 0x7287 }, { 0xE0B5, 0x7292 }, { 0xE0B6, 0x7296 }, 
-	{ 0xE0B7, 0x72A2 }, { 0xE0B8, 0x72A7 }, { 0xE0B9, 0x72B9 }, { 0xE0BA, 0x72B2 }, { 0xE0BB, 0x72C3 }, { 0xE0BC, 0x72C6 }, { 0xE0BD, 0x72C4 }, { 0xE0BE, 0x72CE }, 
-	{ 0xE0BF, 0x72D2 }, { 0xE0C0, 0x72E2 }, { 0xE0C1, 0x72E0 }, { 0xE0C2, 0x72E1 }, { 0xE0C3, 0x72F9 }, { 0xE0C4, 0x72F7 }, { 0xE0C5, 0x500F }, { 0xE0C6, 0x7317 }, 
-	{ 0xE0C7, 0x730A }, { 0xE0C8, 0x731C }, { 0xE0C9, 0x7316 }, { 0xE0CA, 0x731D }, { 0xE0CB, 0x7334 }, { 0xE0CC, 0x732F }, { 0xE0CD, 0x7329 }, { 0xE0CE, 0x7325 }, 
-	{ 0xE0CF, 0x733E }, { 0xE0D0, 0x734E }, { 0xE0D1, 0x734F }, { 0xE0D2, 0x9ED8 }, { 0xE0D3, 0x7357 }, { 0xE0D4, 0x736A }, { 0xE0D5, 0x7368 }, { 0xE0D6, 0x7370 }, 
-	{ 0xE0D7, 0x7378 }, { 0xE0D8, 0x7375 }, { 0xE0D9, 0x737B }, { 0xE0DA, 0x737A }, { 0xE0DB, 0x73C8 }, { 0xE0DC, 0x73B3 }, { 0xE0DD, 0x73CE }, { 0xE0DE, 0x73BB }, 
-	{ 0xE0DF, 0x73C0 }, { 0xE0E0, 0x73E5 }, { 0xE0E1, 0x73EE }, { 0xE0E2, 0x73DE }, { 0xE0E3, 0x74A2 }, { 0xE0E4, 0x7405 }, { 0xE0E5, 0x746F }, { 0xE0E6, 0x7425 }, 
-	{ 0xE0E7, 0x73F8 }, { 0xE0E8, 0x7432 }, { 0xE0E9, 0x743A }, { 0xE0EA, 0x7455 }, { 0xE0EB, 0x743F }, { 0xE0EC, 0x745F }, { 0xE0ED, 0x7459 }, { 0xE0EE, 0x7441 }, 
-	{ 0xE0EF, 0x745C }, { 0xE0F0, 0x7469 }, { 0xE0F1, 0x7470 }, { 0xE0F2, 0x7463 }, { 0xE0F3, 0x746A }, { 0xE0F4, 0x7476 }, { 0xE0F5, 0x747E }, { 0xE0F6, 0x748B }, 
-	{ 0xE0F7, 0x749E }, { 0xE0F8, 0x74A7 }, { 0xE0F9, 0x74CA }, { 0xE0FA, 0x74CF }, { 0xE0FB, 0x74D4 }, { 0xE0FC, 0x73F1 }, { 0xE140, 0x74E0 }, { 0xE141, 0x74E3 }, 
-	{ 0xE142, 0x74E7 }, { 0xE143, 0x74E9 }, { 0xE144, 0x74EE }, { 0xE145, 0x74F2 }, { 0xE146, 0x74F0 }, { 0xE147, 0x74F1 }, { 0xE148, 0x74F8 }, { 0xE149, 0x74F7 }, 
-	{ 0xE14A, 0x7504 }, { 0xE14B, 0x7503 }, { 0xE14C, 0x7505 }, { 0xE14D, 0x750C }, { 0xE14E, 0x750E }, { 0xE14F, 0x750D }, { 0xE150, 0x7515 }, { 0xE151, 0x7513 }, 
-	{ 0xE152, 0x751E }, { 0xE153, 0x7526 }, { 0xE154, 0x752C }, { 0xE155, 0x753C }, { 0xE156, 0x7544 }, { 0xE157, 0x754D }, { 0xE158, 0x754A }, { 0xE159, 0x7549 }, 
-	{ 0xE15A, 0x755B }, { 0xE15B, 0x7546 }, { 0xE15C, 0x755A }, { 0xE15D, 0x7569 }, { 0xE15E, 0x7564 }, { 0xE15F, 0x7567 }, { 0xE160, 0x756B }, { 0xE161, 0x756D }, 
-	{ 0xE162, 0x7578 }, { 0xE163, 0x7576 }, { 0xE164, 0x7586 }, { 0xE165, 0x7587 }, { 0xE166, 0x7574 }, { 0xE167, 0x758A }, { 0xE168, 0x7589 }, { 0xE169, 0x7582 }, 
-	{ 0xE16A, 0x7594 }, { 0xE16B, 0x759A }, { 0xE16C, 0x759D }, { 0xE16D, 0x75A5 }, { 0xE16E, 0x75A3 }, { 0xE16F, 0x75C2 }, { 0xE170, 0x75B3 }, { 0xE171, 0x75C3 }, 
-	{ 0xE172, 0x75B5 }, { 0xE173, 0x75BD }, { 0xE174, 0x75B8 }, { 0xE175, 0x75BC }, { 0xE176, 0x75B1 }, { 0xE177, 0x75CD }, { 0xE178, 0x75CA }, { 0xE179, 0x75D2 }, 
-	{ 0xE17A, 0x75D9 }, { 0xE17B, 0x75E3 }, { 0xE17C, 0x75DE }, { 0xE17D, 0x75FE }, { 0xE17E, 0x75FF }, { 0xE180, 0x75FC }, { 0xE181, 0x7601 }, { 0xE182, 0x75F0 }, 
-	{ 0xE183, 0x75FA }, { 0xE184, 0x75F2 }, { 0xE185, 0x75F3 }, { 0xE186, 0x760B }, { 0xE187, 0x760D }, { 0xE188, 0x7609 }, { 0xE189, 0x761F }, { 0xE18A, 0x7627 }, 
-	{ 0xE18B, 0x7620 }, { 0xE18C, 0x7621 }, { 0xE18D, 0x7622 }, { 0xE18E, 0x7624 }, { 0xE18F, 0x7634 }, { 0xE190, 0x7630 }, { 0xE191, 0x763B }, { 0xE192, 0x7647 }, 
-	{ 0xE193, 0x7648 }, { 0xE194, 0x7646 }, { 0xE195, 0x765C }, { 0xE196, 0x7658 }, { 0xE197, 0x7661 }, { 0xE198, 0x7662 }, { 0xE199, 0x7668 }, { 0xE19A, 0x7669 }, 
-	{ 0xE19B, 0x766A }, { 0xE19C, 0x7667 }, { 0xE19D, 0x766C }, { 0xE19E, 0x7670 }, { 0xE19F, 0x7672 }, { 0xE1A0, 0x7676 }, { 0xE1A1, 0x7678 }, { 0xE1A2, 0x767C }, 
-	{ 0xE1A3, 0x7680 }, { 0xE1A4, 0x7683 }, { 0xE1A5, 0x7688 }, { 0xE1A6, 0x768B }, { 0xE1A7, 0x768E }, { 0xE1A8, 0x7696 }, { 0xE1A9, 0x7693 }, { 0xE1AA, 0x7699 }, 
-	{ 0xE1AB, 0x769A }, { 0xE1AC, 0x76B0 }, { 0xE1AD, 0x76B4 }, { 0xE1AE, 0x76B8 }, { 0xE1AF, 0x76B9 }, { 0xE1B0, 0x76BA }, { 0xE1B1, 0x76C2 }, { 0xE1B2, 0x76CD }, 
-	{ 0xE1B3, 0x76D6 }, { 0xE1B4, 0x76D2 }, { 0xE1B5, 0x76DE }, { 0xE1B6, 0x76E1 }, { 0xE1B7, 0x76E5 }, { 0xE1B8, 0x76E7 }, { 0xE1B9, 0x76EA }, { 0xE1BA, 0x862F }, 
-	{ 0xE1BB, 0x76FB }, { 0xE1BC, 0x7708 }, { 0xE1BD, 0x7707 }, { 0xE1BE, 0x7704 }, { 0xE1BF, 0x7729 }, { 0xE1C0, 0x7724 }, { 0xE1C1, 0x771E }, { 0xE1C2, 0x7725 }, 
-	{ 0xE1C3, 0x7726 }, { 0xE1C4, 0x771B }, { 0xE1C5, 0x7737 }, { 0xE1C6, 0x7738 }, { 0xE1C7, 0x7747 }, { 0xE1C8, 0x775A }, { 0xE1C9, 0x7768 }, { 0xE1CA, 0x776B }, 
-	{ 0xE1CB, 0x775B }, { 0xE1CC, 0x7765 }, { 0xE1CD, 0x777F }, { 0xE1CE, 0x777E }, { 0xE1CF, 0x7779 }, { 0xE1D0, 0x778E }, { 0xE1D1, 0x778B }, { 0xE1D2, 0x7791 }, 
-	{ 0xE1D3, 0x77A0 }, { 0xE1D4, 0x779E }, { 0xE1D5, 0x77B0 }, { 0xE1D6, 0x77B6 }, { 0xE1D7, 0x77B9 }, { 0xE1D8, 0x77BF }, { 0xE1D9, 0x77BC }, { 0xE1DA, 0x77BD }, 
-	{ 0xE1DB, 0x77BB }, { 0xE1DC, 0x77C7 }, { 0xE1DD, 0x77CD }, { 0xE1DE, 0x77D7 }, { 0xE1DF, 0x77DA }, { 0xE1E0, 0x77DC }, { 0xE1E1, 0x77E3 }, { 0xE1E2, 0x77EE }, 
-	{ 0xE1E3, 0x77FC }, { 0xE1E4, 0x780C }, { 0xE1E5, 0x7812 }, { 0xE1E6, 0x7926 }, { 0xE1E7, 0x7820 }, { 0xE1E8, 0x792A }, { 0xE1E9, 0x7845 }, { 0xE1EA, 0x788E }, 
-	{ 0xE1EB, 0x7874 }, { 0xE1EC, 0x7886 }, { 0xE1ED, 0x787C }, { 0xE1EE, 0x789A }, { 0xE1EF, 0x788C }, { 0xE1F0, 0x78A3 }, { 0xE1F1, 0x78B5 }, { 0xE1F2, 0x78AA }, 
-	{ 0xE1F3, 0x78AF }, { 0xE1F4, 0x78D1 }, { 0xE1F5, 0x78C6 }, { 0xE1F6, 0x78CB }, { 0xE1F7, 0x78D4 }, { 0xE1F8, 0x78BE }, { 0xE1F9, 0x78BC }, { 0xE1FA, 0x78C5 }, 
-	{ 0xE1FB, 0x78CA }, { 0xE1FC, 0x78EC }, { 0xE240, 0x78E7 }, { 0xE241, 0x78DA }, { 0xE242, 0x78FD }, { 0xE243, 0x78F4 }, { 0xE244, 0x7907 }, { 0xE245, 0x7912 }, 
-	{ 0xE246, 0x7911 }, { 0xE247, 0x7919 }, { 0xE248, 0x792C }, { 0xE249, 0x792B }, { 0xE24A, 0x7940 }, { 0xE24B, 0x7960 }, { 0xE24C, 0x7957 }, { 0xE24D, 0x795F }, 
-	{ 0xE24E, 0x795A }, { 0xE24F, 0x7955 }, { 0xE250, 0x7953 }, { 0xE251, 0x797A }, { 0xE252, 0x797F }, { 0xE253, 0x798A }, { 0xE254, 0x799D }, { 0xE255, 0x79A7 }, 
-	{ 0xE256, 0x9F4B }, { 0xE257, 0x79AA }, { 0xE258, 0x79AE }, { 0xE259, 0x79B3 }, { 0xE25A, 0x79B9 }, { 0xE25B, 0x79BA }, { 0xE25C, 0x79C9 }, { 0xE25D, 0x79D5 }, 
-	{ 0xE25E, 0x79E7 }, { 0xE25F, 0x79EC }, { 0xE260, 0x79E1 }, { 0xE261, 0x79E3 }, { 0xE262, 0x7A08 }, { 0xE263, 0x7A0D }, { 0xE264, 0x7A18 }, { 0xE265, 0x7A19 }, 
-	{ 0xE266, 0x7A20 }, { 0xE267, 0x7A1F }, { 0xE268, 0x7980 }, { 0xE269, 0x7A31 }, { 0xE26A, 0x7A3B }, { 0xE26B, 0x7A3E }, { 0xE26C, 0x7A37 }, { 0xE26D, 0x7A43 }, 
-	{ 0xE26E, 0x7A57 }, { 0xE26F, 0x7A49 }, { 0xE270, 0x7A61 }, { 0xE271, 0x7A62 }, { 0xE272, 0x7A69 }, { 0xE273, 0x9F9D }, { 0xE274, 0x7A70 }, { 0xE275, 0x7A79 }, 
-	{ 0xE276, 0x7A7D }, { 0xE277, 0x7A88 }, { 0xE278, 0x7A97 }, { 0xE279, 0x7A95 }, { 0xE27A, 0x7A98 }, { 0xE27B, 0x7A96 }, { 0xE27C, 0x7AA9 }, { 0xE27D, 0x7AC8 }, 
-	{ 0xE27E, 0x7AB0 }, { 0xE280, 0x7AB6 }, { 0xE281, 0x7AC5 }, { 0xE282, 0x7AC4 }, { 0xE283, 0x7ABF }, { 0xE284, 0x9083 }, { 0xE285, 0x7AC7 }, { 0xE286, 0x7ACA }, 
-	{ 0xE287, 0x7ACD }, { 0xE288, 0x7ACF }, { 0xE289, 0x7AD5 }, { 0xE28A, 0x7AD3 }, { 0xE28B, 0x7AD9 }, { 0xE28C, 0x7ADA }, { 0xE28D, 0x7ADD }, { 0xE28E, 0x7AE1 }, 
-	{ 0xE28F, 0x7AE2 }, { 0xE290, 0x7AE6 }, { 0xE291, 0x7AED }, { 0xE292, 0x7AF0 }, { 0xE293, 0x7B02 }, { 0xE294, 0x7B0F }, { 0xE295, 0x7B0A }, { 0xE296, 0x7B06 }, 
-	{ 0xE297, 0x7B33 }, { 0xE298, 0x7B18 }, { 0xE299, 0x7B19 }, { 0xE29A, 0x7B1E }, { 0xE29B, 0x7B35 }, { 0xE29C, 0x7B28 }, { 0xE29D, 0x7B36 }, { 0xE29E, 0x7B50 }, 
-	{ 0xE29F, 0x7B7A }, { 0xE2A0, 0x7B04 }, { 0xE2A1, 0x7B4D }, { 0xE2A2, 0x7B0B }, { 0xE2A3, 0x7B4C }, { 0xE2A4, 0x7B45 }, { 0xE2A5, 0x7B75 }, { 0xE2A6, 0x7B65 }, 
-	{ 0xE2A7, 0x7B74 }, { 0xE2A8, 0x7B67 }, { 0xE2A9, 0x7B70 }, { 0xE2AA, 0x7B71 }, { 0xE2AB, 0x7B6C }, { 0xE2AC, 0x7B6E }, { 0xE2AD, 0x7B9D }, { 0xE2AE, 0x7B98 }, 
-	{ 0xE2AF, 0x7B9F }, { 0xE2B0, 0x7B8D }, { 0xE2B1, 0x7B9C }, { 0xE2B2, 0x7B9A }, { 0xE2B3, 0x7B8B }, { 0xE2B4, 0x7B92 }, { 0xE2B5, 0x7B8F }, { 0xE2B6, 0x7B5D }, 
-	{ 0xE2B7, 0x7B99 }, { 0xE2B8, 0x7BCB }, { 0xE2B9, 0x7BC1 }, { 0xE2BA, 0x7BCC }, { 0xE2BB, 0x7BCF }, { 0xE2BC, 0x7BB4 }, { 0xE2BD, 0x7BC6 }, { 0xE2BE, 0x7BDD }, 
-	{ 0xE2BF, 0x7BE9 }, { 0xE2C0, 0x7C11 }, { 0xE2C1, 0x7C14 }, { 0xE2C2, 0x7BE6 }, { 0xE2C3, 0x7BE5 }, { 0xE2C4, 0x7C60 }, { 0xE2C5, 0x7C00 }, { 0xE2C6, 0x7C07 }, 
-	{ 0xE2C7, 0x7C13 }, { 0xE2C8, 0x7BF3 }, { 0xE2C9, 0x7BF7 }, { 0xE2CA, 0x7C17 }, { 0xE2CB, 0x7C0D }, { 0xE2CC, 0x7BF6 }, { 0xE2CD, 0x7C23 }, { 0xE2CE, 0x7C27 }, 
-	{ 0xE2CF, 0x7C2A }, { 0xE2D0, 0x7C1F }, { 0xE2D1, 0x7C37 }, { 0xE2D2, 0x7C2B }, { 0xE2D3, 0x7C3D }, { 0xE2D4, 0x7C4C }, { 0xE2D5, 0x7C43 }, { 0xE2D6, 0x7C54 }, 
-	{ 0xE2D7, 0x7C4F }, { 0xE2D8, 0x7C40 }, { 0xE2D9, 0x7C50 }, { 0xE2DA, 0x7C58 }, { 0xE2DB, 0x7C5F }, { 0xE2DC, 0x7C64 }, { 0xE2DD, 0x7C56 }, { 0xE2DE, 0x7C65 }, 
-	{ 0xE2DF, 0x7C6C }, { 0xE2E0, 0x7C75 }, { 0xE2E1, 0x7C83 }, { 0xE2E2, 0x7C90 }, { 0xE2E3, 0x7CA4 }, { 0xE2E4, 0x7CAD }, { 0xE2E5, 0x7CA2 }, { 0xE2E6, 0x7CAB }, 
-	{ 0xE2E7, 0x7CA1 }, { 0xE2E8, 0x7CA8 }, { 0xE2E9, 0x7CB3 }, { 0xE2EA, 0x7CB2 }, { 0xE2EB, 0x7CB1 }, { 0xE2EC, 0x7CAE }, { 0xE2ED, 0x7CB9 }, { 0xE2EE, 0x7CBD }, 
-	{ 0xE2EF, 0x7CC0 }, { 0xE2F0, 0x7CC5 }, { 0xE2F1, 0x7CC2 }, { 0xE2F2, 0x7CD8 }, { 0xE2F3, 0x7CD2 }, { 0xE2F4, 0x7CDC }, { 0xE2F5, 0x7CE2 }, { 0xE2F6, 0x9B3B }, 
-	{ 0xE2F7, 0x7CEF }, { 0xE2F8, 0x7CF2 }, { 0xE2F9, 0x7CF4 }, { 0xE2FA, 0x7CF6 }, { 0xE2FB, 0x7CFA }, { 0xE2FC, 0x7D06 }, { 0xE340, 0x7D02 }, { 0xE341, 0x7D1C }, 
-	{ 0xE342, 0x7D15 }, { 0xE343, 0x7D0A }, { 0xE344, 0x7D45 }, { 0xE345, 0x7D4B }, { 0xE346, 0x7D2E }, { 0xE347, 0x7D32 }, { 0xE348, 0x7D3F }, { 0xE349, 0x7D35 }, 
-	{ 0xE34A, 0x7D46 }, { 0xE34B, 0x7D73 }, { 0xE34C, 0x7D56 }, { 0xE34D, 0x7D4E }, { 0xE34E, 0x7D72 }, { 0xE34F, 0x7D68 }, { 0xE350, 0x7D6E }, { 0xE351, 0x7D4F }, 
-	{ 0xE352, 0x7D63 }, { 0xE353, 0x7D93 }, { 0xE354, 0x7D89 }, { 0xE355, 0x7D5B }, { 0xE356, 0x7D8F }, { 0xE357, 0x7D7D }, { 0xE358, 0x7D9B }, { 0xE359, 0x7DBA }, 
-	{ 0xE35A, 0x7DAE }, { 0xE35B, 0x7DA3 }, { 0xE35C, 0x7DB5 }, { 0xE35D, 0x7DC7 }, { 0xE35E, 0x7DBD }, { 0xE35F, 0x7DAB }, { 0xE360, 0x7E3D }, { 0xE361, 0x7DA2 }, 
-	{ 0xE362, 0x7DAF }, { 0xE363, 0x7DDC }, { 0xE364, 0x7DB8 }, { 0xE365, 0x7D9F }, { 0xE366, 0x7DB0 }, { 0xE367, 0x7DD8 }, { 0xE368, 0x7DDD }, { 0xE369, 0x7DE4 }, 
-	{ 0xE36A, 0x7DDE }, { 0xE36B, 0x7DFB }, { 0xE36C, 0x7DF2 }, { 0xE36D, 0x7DE1 }, { 0xE36E, 0x7E05 }, { 0xE36F, 0x7E0A }, { 0xE370, 0x7E23 }, { 0xE371, 0x7E21 }, 
-	{ 0xE372, 0x7E12 }, { 0xE373, 0x7E31 }, { 0xE374, 0x7E1F }, { 0xE375, 0x7E09 }, { 0xE376, 0x7E0B }, { 0xE377, 0x7E22 }, { 0xE378, 0x7E46 }, { 0xE379, 0x7E66 }, 
-	{ 0xE37A, 0x7E3B }, { 0xE37B, 0x7E35 }, { 0xE37C, 0x7E39 }, { 0xE37D, 0x7E43 }, { 0xE37E, 0x7E37 }, { 0xE380, 0x7E32 }, { 0xE381, 0x7E3A }, { 0xE382, 0x7E67 }, 
-	{ 0xE383, 0x7E5D }, { 0xE384, 0x7E56 }, { 0xE385, 0x7E5E }, { 0xE386, 0x7E59 }, { 0xE387, 0x7E5A }, { 0xE388, 0x7E79 }, { 0xE389, 0x7E6A }, { 0xE38A, 0x7E69 }, 
-	{ 0xE38B, 0x7E7C }, { 0xE38C, 0x7E7B }, { 0xE38D, 0x7E83 }, { 0xE38E, 0x7DD5 }, { 0xE38F, 0x7E7D }, { 0xE390, 0x8FAE }, { 0xE391, 0x7E7F }, { 0xE392, 0x7E88 }, 
-	{ 0xE393, 0x7E89 }, { 0xE394, 0x7E8C }, { 0xE395, 0x7E92 }, { 0xE396, 0x7E90 }, { 0xE397, 0x7E93 }, { 0xE398, 0x7E94 }, { 0xE399, 0x7E96 }, { 0xE39A, 0x7E8E }, 
-	{ 0xE39B, 0x7E9B }, { 0xE39C, 0x7E9C }, { 0xE39D, 0x7F38 }, { 0xE39E, 0x7F3A }, { 0xE39F, 0x7F45 }, { 0xE3A0, 0x7F4C }, { 0xE3A1, 0x7F4D }, { 0xE3A2, 0x7F4E }, 
-	{ 0xE3A3, 0x7F50 }, { 0xE3A4, 0x7F51 }, { 0xE3A5, 0x7F55 }, { 0xE3A6, 0x7F54 }, { 0xE3A7, 0x7F58 }, { 0xE3A8, 0x7F5F }, { 0xE3A9, 0x7F60 }, { 0xE3AA, 0x7F68 }, 
-	{ 0xE3AB, 0x7F69 }, { 0xE3AC, 0x7F67 }, { 0xE3AD, 0x7F78 }, { 0xE3AE, 0x7F82 }, { 0xE3AF, 0x7F86 }, { 0xE3B0, 0x7F83 }, { 0xE3B1, 0x7F88 }, { 0xE3B2, 0x7F87 }, 
-	{ 0xE3B3, 0x7F8C }, { 0xE3B4, 0x7F94 }, { 0xE3B5, 0x7F9E }, { 0xE3B6, 0x7F9D }, { 0xE3B7, 0x7F9A }, { 0xE3B8, 0x7FA3 }, { 0xE3B9, 0x7FAF }, { 0xE3BA, 0x7FB2 }, 
-	{ 0xE3BB, 0x7FB9 }, { 0xE3BC, 0x7FAE }, { 0xE3BD, 0x7FB6 }, { 0xE3BE, 0x7FB8 }, { 0xE3BF, 0x8B71 }, { 0xE3C0, 0x7FC5 }, { 0xE3C1, 0x7FC6 }, { 0xE3C2, 0x7FCA }, 
-	{ 0xE3C3, 0x7FD5 }, { 0xE3C4, 0x7FD4 }, { 0xE3C5, 0x7FE1 }, { 0xE3C6, 0x7FE6 }, { 0xE3C7, 0x7FE9 }, { 0xE3C8, 0x7FF3 }, { 0xE3C9, 0x7FF9 }, { 0xE3CA, 0x98DC }, 
-	{ 0xE3CB, 0x8006 }, { 0xE3CC, 0x8004 }, { 0xE3CD, 0x800B }, { 0xE3CE, 0x8012 }, { 0xE3CF, 0x8018 }, { 0xE3D0, 0x8019 }, { 0xE3D1, 0x801C }, { 0xE3D2, 0x8021 }, 
-	{ 0xE3D3, 0x8028 }, { 0xE3D4, 0x803F }, { 0xE3D5, 0x803B }, { 0xE3D6, 0x804A }, { 0xE3D7, 0x8046 }, { 0xE3D8, 0x8052 }, { 0xE3D9, 0x8058 }, { 0xE3DA, 0x805A }, 
-	{ 0xE3DB, 0x805F }, { 0xE3DC, 0x8062 }, { 0xE3DD, 0x8068 }, { 0xE3DE, 0x8073 }, { 0xE3DF, 0x8072 }, { 0xE3E0, 0x8070 }, { 0xE3E1, 0x8076 }, { 0xE3E2, 0x8079 }, 
-	{ 0xE3E3, 0x807D }, { 0xE3E4, 0x807F }, { 0xE3E5, 0x8084 }, { 0xE3E6, 0x8086 }, { 0xE3E7, 0x8085 }, { 0xE3E8, 0x809B }, { 0xE3E9, 0x8093 }, { 0xE3EA, 0x809A }, 
-	{ 0xE3EB, 0x80AD }, { 0xE3EC, 0x5190 }, { 0xE3ED, 0x80AC }, { 0xE3EE, 0x80DB }, { 0xE3EF, 0x80E5 }, { 0xE3F0, 0x80D9 }, { 0xE3F1, 0x80DD }, { 0xE3F2, 0x80C4 }, 
-	{ 0xE3F3, 0x80DA }, { 0xE3F4, 0x80D6 }, { 0xE3F5, 0x8109 }, { 0xE3F6, 0x80EF }, { 0xE3F7, 0x80F1 }, { 0xE3F8, 0x811B }, { 0xE3F9, 0x8129 }, { 0xE3FA, 0x8123 }, 
-	{ 0xE3FB, 0x812F }, { 0xE3FC, 0x814B }, { 0xE440, 0x968B }, { 0xE441, 0x8146 }, { 0xE442, 0x813E }, { 0xE443, 0x8153 }, { 0xE444, 0x8151 }, { 0xE445, 0x80FC }, 
-	{ 0xE446, 0x8171 }, { 0xE447, 0x816E }, { 0xE448, 0x8165 }, { 0xE449, 0x8166 }, { 0xE44A, 0x8174 }, { 0xE44B, 0x8183 }, { 0xE44C, 0x8188 }, { 0xE44D, 0x818A }, 
-	{ 0xE44E, 0x8180 }, { 0xE44F, 0x8182 }, { 0xE450, 0x81A0 }, { 0xE451, 0x8195 }, { 0xE452, 0x81A4 }, { 0xE453, 0x81A3 }, { 0xE454, 0x815F }, { 0xE455, 0x8193 }, 
-	{ 0xE456, 0x81A9 }, { 0xE457, 0x81B0 }, { 0xE458, 0x81B5 }, { 0xE459, 0x81BE }, { 0xE45A, 0x81B8 }, { 0xE45B, 0x81BD }, { 0xE45C, 0x81C0 }, { 0xE45D, 0x81C2 }, 
-	{ 0xE45E, 0x81BA }, { 0xE45F, 0x81C9 }, { 0xE460, 0x81CD }, { 0xE461, 0x81D1 }, { 0xE462, 0x81D9 }, { 0xE463, 0x81D8 }, { 0xE464, 0x81C8 }, { 0xE465, 0x81DA }, 
-	{ 0xE466, 0x81DF }, { 0xE467, 0x81E0 }, { 0xE468, 0x81E7 }, { 0xE469, 0x81FA }, { 0xE46A, 0x81FB }, { 0xE46B, 0x81FE }, { 0xE46C, 0x8201 }, { 0xE46D, 0x8202 }, 
-	{ 0xE46E, 0x8205 }, { 0xE46F, 0x8207 }, { 0xE470, 0x820A }, { 0xE471, 0x820D }, { 0xE472, 0x8210 }, { 0xE473, 0x8216 }, { 0xE474, 0x8229 }, { 0xE475, 0x822B }, 
-	{ 0xE476, 0x8238 }, { 0xE477, 0x8233 }, { 0xE478, 0x8240 }, { 0xE479, 0x8259 }, { 0xE47A, 0x8258 }, { 0xE47B, 0x825D }, { 0xE47C, 0x825A }, { 0xE47D, 0x825F }, 
-	{ 0xE47E, 0x8264 }, { 0xE480, 0x8262 }, { 0xE481, 0x8268 }, { 0xE482, 0x826A }, { 0xE483, 0x826B }, { 0xE484, 0x822E }, { 0xE485, 0x8271 }, { 0xE486, 0x8277 }, 
-	{ 0xE487, 0x8278 }, { 0xE488, 0x827E }, { 0xE489, 0x828D }, { 0xE48A, 0x8292 }, { 0xE48B, 0x82AB }, { 0xE48C, 0x829F }, { 0xE48D, 0x82BB }, { 0xE48E, 0x82AC }, 
-	{ 0xE48F, 0x82E1 }, { 0xE490, 0x82E3 }, { 0xE491, 0x82DF }, { 0xE492, 0x82D2 }, { 0xE493, 0x82F4 }, { 0xE494, 0x82F3 }, { 0xE495, 0x82FA }, { 0xE496, 0x8393 }, 
-	{ 0xE497, 0x8303 }, { 0xE498, 0x82FB }, { 0xE499, 0x82F9 }, { 0xE49A, 0x82DE }, { 0xE49B, 0x8306 }, { 0xE49C, 0x82DC }, { 0xE49D, 0x8309 }, { 0xE49E, 0x82D9 }, 
-	{ 0xE49F, 0x8335 }, { 0xE4A0, 0x8334 }, { 0xE4A1, 0x8316 }, { 0xE4A2, 0x8332 }, { 0xE4A3, 0x8331 }, { 0xE4A4, 0x8340 }, { 0xE4A5, 0x8339 }, { 0xE4A6, 0x8350 }, 
-	{ 0xE4A7, 0x8345 }, { 0xE4A8, 0x832F }, { 0xE4A9, 0x832B }, { 0xE4AA, 0x8317 }, { 0xE4AB, 0x8318 }, { 0xE4AC, 0x8385 }, { 0xE4AD, 0x839A }, { 0xE4AE, 0x83AA }, 
-	{ 0xE4AF, 0x839F }, { 0xE4B0, 0x83A2 }, { 0xE4B1, 0x8396 }, { 0xE4B2, 0x8323 }, { 0xE4B3, 0x838E }, { 0xE4B4, 0x8387 }, { 0xE4B5, 0x838A }, { 0xE4B6, 0x837C }, 
-	{ 0xE4B7, 0x83B5 }, { 0xE4B8, 0x8373 }, { 0xE4B9, 0x8375 }, { 0xE4BA, 0x83A0 }, { 0xE4BB, 0x8389 }, { 0xE4BC, 0x83A8 }, { 0xE4BD, 0x83F4 }, { 0xE4BE, 0x8413 }, 
-	{ 0xE4BF, 0x83EB }, { 0xE4C0, 0x83CE }, { 0xE4C1, 0x83FD }, { 0xE4C2, 0x8403 }, { 0xE4C3, 0x83D8 }, { 0xE4C4, 0x840B }, { 0xE4C5, 0x83C1 }, { 0xE4C6, 0x83F7 }, 
-	{ 0xE4C7, 0x8407 }, { 0xE4C8, 0x83E0 }, { 0xE4C9, 0x83F2 }, { 0xE4CA, 0x840D }, { 0xE4CB, 0x8422 }, { 0xE4CC, 0x8420 }, { 0xE4CD, 0x83BD }, { 0xE4CE, 0x8438 }, 
-	{ 0xE4CF, 0x8506 }, { 0xE4D0, 0x83FB }, { 0xE4D1, 0x846D }, { 0xE4D2, 0x842A }, { 0xE4D3, 0x843C }, { 0xE4D4, 0x855A }, { 0xE4D5, 0x8484 }, { 0xE4D6, 0x8477 }, 
-	{ 0xE4D7, 0x846B }, { 0xE4D8, 0x84AD }, { 0xE4D9, 0x846E }, { 0xE4DA, 0x8482 }, { 0xE4DB, 0x8469 }, { 0xE4DC, 0x8446 }, { 0xE4DD, 0x842C }, { 0xE4DE, 0x846F }, 
-	{ 0xE4DF, 0x8479 }, { 0xE4E0, 0x8435 }, { 0xE4E1, 0x84CA }, { 0xE4E2, 0x8462 }, { 0xE4E3, 0x84B9 }, { 0xE4E4, 0x84BF }, { 0xE4E5, 0x849F }, { 0xE4E6, 0x84D9 }, 
-	{ 0xE4E7, 0x84CD }, { 0xE4E8, 0x84BB }, { 0xE4E9, 0x84DA }, { 0xE4EA, 0x84D0 }, { 0xE4EB, 0x84C1 }, { 0xE4EC, 0x84C6 }, { 0xE4ED, 0x84D6 }, { 0xE4EE, 0x84A1 }, 
-	{ 0xE4EF, 0x8521 }, { 0xE4F0, 0x84FF }, { 0xE4F1, 0x84F4 }, { 0xE4F2, 0x8517 }, { 0xE4F3, 0x8518 }, { 0xE4F4, 0x852C }, { 0xE4F5, 0x851F }, { 0xE4F6, 0x8515 }, 
-	{ 0xE4F7, 0x8514 }, { 0xE4F8, 0x84FC }, { 0xE4F9, 0x8540 }, { 0xE4FA, 0x8563 }, { 0xE4FB, 0x8558 }, { 0xE4FC, 0x8548 }, { 0xE540, 0x8541 }, { 0xE541, 0x8602 }, 
-	{ 0xE542, 0x854B }, { 0xE543, 0x8555 }, { 0xE544, 0x8580 }, { 0xE545, 0x85A4 }, { 0xE546, 0x8588 }, { 0xE547, 0x8591 }, { 0xE548, 0x858A }, { 0xE549, 0x85A8 }, 
-	{ 0xE54A, 0x856D }, { 0xE54B, 0x8594 }, { 0xE54C, 0x859B }, { 0xE54D, 0x85EA }, { 0xE54E, 0x8587 }, { 0xE54F, 0x859C }, { 0xE550, 0x8577 }, { 0xE551, 0x857E }, 
-	{ 0xE552, 0x8590 }, { 0xE553, 0x85C9 }, { 0xE554, 0x85BA }, { 0xE555, 0x85CF }, { 0xE556, 0x85B9 }, { 0xE557, 0x85D0 }, { 0xE558, 0x85D5 }, { 0xE559, 0x85DD }, 
-	{ 0xE55A, 0x85E5 }, { 0xE55B, 0x85DC }, { 0xE55C, 0x85F9 }, { 0xE55D, 0x860A }, { 0xE55E, 0x8613 }, { 0xE55F, 0x860B }, { 0xE560, 0x85FE }, { 0xE561, 0x85FA }, 
-	{ 0xE562, 0x8606 }, { 0xE563, 0x8622 }, { 0xE564, 0x861A }, { 0xE565, 0x8630 }, { 0xE566, 0x863F }, { 0xE567, 0x864D }, { 0xE568, 0x4E55 }, { 0xE569, 0x8654 }, 
-	{ 0xE56A, 0x865F }, { 0xE56B, 0x8667 }, { 0xE56C, 0x8671 }, { 0xE56D, 0x8693 }, { 0xE56E, 0x86A3 }, { 0xE56F, 0x86A9 }, { 0xE570, 0x86AA }, { 0xE571, 0x868B }, 
-	{ 0xE572, 0x868C }, { 0xE573, 0x86B6 }, { 0xE574, 0x86AF }, { 0xE575, 0x86C4 }, { 0xE576, 0x86C6 }, { 0xE577, 0x86B0 }, { 0xE578, 0x86C9 }, { 0xE579, 0x8823 }, 
-	{ 0xE57A, 0x86AB }, { 0xE57B, 0x86D4 }, { 0xE57C, 0x86DE }, { 0xE57D, 0x86E9 }, { 0xE57E, 0x86EC }, { 0xE580, 0x86DF }, { 0xE581, 0x86DB }, { 0xE582, 0x86EF }, 
-	{ 0xE583, 0x8712 }, { 0xE584, 0x8706 }, { 0xE585, 0x8708 }, { 0xE586, 0x8700 }, { 0xE587, 0x8703 }, { 0xE588, 0x86FB }, { 0xE589, 0x8711 }, { 0xE58A, 0x8709 }, 
-	{ 0xE58B, 0x870D }, { 0xE58C, 0x86F9 }, { 0xE58D, 0x870A }, { 0xE58E, 0x8734 }, { 0xE58F, 0x873F }, { 0xE590, 0x8737 }, { 0xE591, 0x873B }, { 0xE592, 0x8725 }, 
-	{ 0xE593, 0x8729 }, { 0xE594, 0x871A }, { 0xE595, 0x8760 }, { 0xE596, 0x875F }, { 0xE597, 0x8778 }, { 0xE598, 0x874C }, { 0xE599, 0x874E }, { 0xE59A, 0x8774 }, 
-	{ 0xE59B, 0x8757 }, { 0xE59C, 0x8768 }, { 0xE59D, 0x876E }, { 0xE59E, 0x8759 }, { 0xE59F, 0x8753 }, { 0xE5A0, 0x8763 }, { 0xE5A1, 0x876A }, { 0xE5A2, 0x8805 }, 
-	{ 0xE5A3, 0x87A2 }, { 0xE5A4, 0x879F }, { 0xE5A5, 0x8782 }, { 0xE5A6, 0x87AF }, { 0xE5A7, 0x87CB }, { 0xE5A8, 0x87BD }, { 0xE5A9, 0x87C0 }, { 0xE5AA, 0x87D0 }, 
-	{ 0xE5AB, 0x96D6 }, { 0xE5AC, 0x87AB }, { 0xE5AD, 0x87C4 }, { 0xE5AE, 0x87B3 }, { 0xE5AF, 0x87C7 }, { 0xE5B0, 0x87C6 }, { 0xE5B1, 0x87BB }, { 0xE5B2, 0x87EF }, 
-	{ 0xE5B3, 0x87F2 }, { 0xE5B4, 0x87E0 }, { 0xE5B5, 0x880F }, { 0xE5B6, 0x880D }, { 0xE5B7, 0x87FE }, { 0xE5B8, 0x87F6 }, { 0xE5B9, 0x87F7 }, { 0xE5BA, 0x880E }, 
-	{ 0xE5BB, 0x87D2 }, { 0xE5BC, 0x8811 }, { 0xE5BD, 0x8816 }, { 0xE5BE, 0x8815 }, { 0xE5BF, 0x8822 }, { 0xE5C0, 0x8821 }, { 0xE5C1, 0x8831 }, { 0xE5C2, 0x8836 }, 
-	{ 0xE5C3, 0x8839 }, { 0xE5C4, 0x8827 }, { 0xE5C5, 0x883B }, { 0xE5C6, 0x8844 }, { 0xE5C7, 0x8842 }, { 0xE5C8, 0x8852 }, { 0xE5C9, 0x8859 }, { 0xE5CA, 0x885E }, 
-	{ 0xE5CB, 0x8862 }, { 0xE5CC, 0x886B }, { 0xE5CD, 0x8881 }, { 0xE5CE, 0x887E }, { 0xE5CF, 0x889E }, { 0xE5D0, 0x8875 }, { 0xE5D1, 0x887D }, { 0xE5D2, 0x88B5 }, 
-	{ 0xE5D3, 0x8872 }, { 0xE5D4, 0x8882 }, { 0xE5D5, 0x8897 }, { 0xE5D6, 0x8892 }, { 0xE5D7, 0x88AE }, { 0xE5D8, 0x8899 }, { 0xE5D9, 0x88A2 }, { 0xE5DA, 0x888D }, 
-	{ 0xE5DB, 0x88A4 }, { 0xE5DC, 0x88B0 }, { 0xE5DD, 0x88BF }, { 0xE5DE, 0x88B1 }, { 0xE5DF, 0x88C3 }, { 0xE5E0, 0x88C4 }, { 0xE5E1, 0x88D4 }, { 0xE5E2, 0x88D8 }, 
-	{ 0xE5E3, 0x88D9 }, { 0xE5E4, 0x88DD }, { 0xE5E5, 0x88F9 }, { 0xE5E6, 0x8902 }, { 0xE5E7, 0x88FC }, { 0xE5E8, 0x88F4 }, { 0xE5E9, 0x88E8 }, { 0xE5EA, 0x88F2 }, 
-	{ 0xE5EB, 0x8904 }, { 0xE5EC, 0x890C }, { 0xE5ED, 0x890A }, { 0xE5EE, 0x8913 }, { 0xE5EF, 0x8943 }, { 0xE5F0, 0x891E }, { 0xE5F1, 0x8925 }, { 0xE5F2, 0x892A }, 
-	{ 0xE5F3, 0x892B }, { 0xE5F4, 0x8941 }, { 0xE5F5, 0x8944 }, { 0xE5F6, 0x893B }, { 0xE5F7, 0x8936 }, { 0xE5F8, 0x8938 }, { 0xE5F9, 0x894C }, { 0xE5FA, 0x891D }, 
-	{ 0xE5FB, 0x8960 }, { 0xE5FC, 0x895E }, { 0xE640, 0x8966 }, { 0xE641, 0x8964 }, { 0xE642, 0x896D }, { 0xE643, 0x896A }, { 0xE644, 0x896F }, { 0xE645, 0x8974 }, 
-	{ 0xE646, 0x8977 }, { 0xE647, 0x897E }, { 0xE648, 0x8983 }, { 0xE649, 0x8988 }, { 0xE64A, 0x898A }, { 0xE64B, 0x8993 }, { 0xE64C, 0x8998 }, { 0xE64D, 0x89A1 }, 
-	{ 0xE64E, 0x89A9 }, { 0xE64F, 0x89A6 }, { 0xE650, 0x89AC }, { 0xE651, 0x89AF }, { 0xE652, 0x89B2 }, { 0xE653, 0x89BA }, { 0xE654, 0x89BD }, { 0xE655, 0x89BF }, 
-	{ 0xE656, 0x89C0 }, { 0xE657, 0x89DA }, { 0xE658, 0x89DC }, { 0xE659, 0x89DD }, { 0xE65A, 0x89E7 }, { 0xE65B, 0x89F4 }, { 0xE65C, 0x89F8 }, { 0xE65D, 0x8A03 }, 
-	{ 0xE65E, 0x8A16 }, { 0xE65F, 0x8A10 }, { 0xE660, 0x8A0C }, { 0xE661, 0x8A1B }, { 0xE662, 0x8A1D }, { 0xE663, 0x8A25 }, { 0xE664, 0x8A36 }, { 0xE665, 0x8A41 }, 
-	{ 0xE666, 0x8A5B }, { 0xE667, 0x8A52 }, { 0xE668, 0x8A46 }, { 0xE669, 0x8A48 }, { 0xE66A, 0x8A7C }, { 0xE66B, 0x8A6D }, { 0xE66C, 0x8A6C }, { 0xE66D, 0x8A62 }, 
-	{ 0xE66E, 0x8A85 }, { 0xE66F, 0x8A82 }, { 0xE670, 0x8A84 }, { 0xE671, 0x8AA8 }, { 0xE672, 0x8AA1 }, { 0xE673, 0x8A91 }, { 0xE674, 0x8AA5 }, { 0xE675, 0x8AA6 }, 
-	{ 0xE676, 0x8A9A }, { 0xE677, 0x8AA3 }, { 0xE678, 0x8AC4 }, { 0xE679, 0x8ACD }, { 0xE67A, 0x8AC2 }, { 0xE67B, 0x8ADA }, { 0xE67C, 0x8AEB }, { 0xE67D, 0x8AF3 }, 
-	{ 0xE67E, 0x8AE7 }, { 0xE680, 0x8AE4 }, { 0xE681, 0x8AF1 }, { 0xE682, 0x8B14 }, { 0xE683, 0x8AE0 }, { 0xE684, 0x8AE2 }, { 0xE685, 0x8AF7 }, { 0xE686, 0x8ADE }, 
-	{ 0xE687, 0x8ADB }, { 0xE688, 0x8B0C }, { 0xE689, 0x8B07 }, { 0xE68A, 0x8B1A }, { 0xE68B, 0x8AE1 }, { 0xE68C, 0x8B16 }, { 0xE68D, 0x8B10 }, { 0xE68E, 0x8B17 }, 
-	{ 0xE68F, 0x8B20 }, { 0xE690, 0x8B33 }, { 0xE691, 0x97AB }, { 0xE692, 0x8B26 }, { 0xE693, 0x8B2B }, { 0xE694, 0x8B3E }, { 0xE695, 0x8B28 }, { 0xE696, 0x8B41 }, 
-	{ 0xE697, 0x8B4C }, { 0xE698, 0x8B4F }, { 0xE699, 0x8B4E }, { 0xE69A, 0x8B49 }, { 0xE69B, 0x8B56 }, { 0xE69C, 0x8B5B }, { 0xE69D, 0x8B5A }, { 0xE69E, 0x8B6B }, 
-	{ 0xE69F, 0x8B5F }, { 0xE6A0, 0x8B6C }, { 0xE6A1, 0x8B6F }, { 0xE6A2, 0x8B74 }, { 0xE6A3, 0x8B7D }, { 0xE6A4, 0x8B80 }, { 0xE6A5, 0x8B8C }, { 0xE6A6, 0x8B8E }, 
-	{ 0xE6A7, 0x8B92 }, { 0xE6A8, 0x8B93 }, { 0xE6A9, 0x8B96 }, { 0xE6AA, 0x8B99 }, { 0xE6AB, 0x8B9A }, { 0xE6AC, 0x8C3A }, { 0xE6AD, 0x8C41 }, { 0xE6AE, 0x8C3F }, 
-	{ 0xE6AF, 0x8C48 }, { 0xE6B0, 0x8C4C }, { 0xE6B1, 0x8C4E }, { 0xE6B2, 0x8C50 }, { 0xE6B3, 0x8C55 }, { 0xE6B4, 0x8C62 }, { 0xE6B5, 0x8C6C }, { 0xE6B6, 0x8C78 }, 
-	{ 0xE6B7, 0x8C7A }, { 0xE6B8, 0x8C82 }, { 0xE6B9, 0x8C89 }, { 0xE6BA, 0x8C85 }, { 0xE6BB, 0x8C8A }, { 0xE6BC, 0x8C8D }, { 0xE6BD, 0x8C8E }, { 0xE6BE, 0x8C94 }, 
-	{ 0xE6BF, 0x8C7C }, { 0xE6C0, 0x8C98 }, { 0xE6C1, 0x621D }, { 0xE6C2, 0x8CAD }, { 0xE6C3, 0x8CAA }, { 0xE6C4, 0x8CBD }, { 0xE6C5, 0x8CB2 }, { 0xE6C6, 0x8CB3 }, 
-	{ 0xE6C7, 0x8CAE }, { 0xE6C8, 0x8CB6 }, { 0xE6C9, 0x8CC8 }, { 0xE6CA, 0x8CC1 }, { 0xE6CB, 0x8CE4 }, { 0xE6CC, 0x8CE3 }, { 0xE6CD, 0x8CDA }, { 0xE6CE, 0x8CFD }, 
-	{ 0xE6CF, 0x8CFA }, { 0xE6D0, 0x8CFB }, { 0xE6D1, 0x8D04 }, { 0xE6D2, 0x8D05 }, { 0xE6D3, 0x8D0A }, { 0xE6D4, 0x8D07 }, { 0xE6D5, 0x8D0F }, { 0xE6D6, 0x8D0D }, 
-	{ 0xE6D7, 0x8D10 }, { 0xE6D8, 0x9F4E }, { 0xE6D9, 0x8D13 }, { 0xE6DA, 0x8CCD }, { 0xE6DB, 0x8D14 }, { 0xE6DC, 0x8D16 }, { 0xE6DD, 0x8D67 }, { 0xE6DE, 0x8D6D }, 
-	{ 0xE6DF, 0x8D71 }, { 0xE6E0, 0x8D73 }, { 0xE6E1, 0x8D81 }, { 0xE6E2, 0x8D99 }, { 0xE6E3, 0x8DC2 }, { 0xE6E4, 0x8DBE }, { 0xE6E5, 0x8DBA }, { 0xE6E6, 0x8DCF }, 
-	{ 0xE6E7, 0x8DDA }, { 0xE6E8, 0x8DD6 }, { 0xE6E9, 0x8DCC }, { 0xE6EA, 0x8DDB }, { 0xE6EB, 0x8DCB }, { 0xE6EC, 0x8DEA }, { 0xE6ED, 0x8DEB }, { 0xE6EE, 0x8DDF }, 
-	{ 0xE6EF, 0x8DE3 }, { 0xE6F0, 0x8DFC }, { 0xE6F1, 0x8E08 }, { 0xE6F2, 0x8E09 }, { 0xE6F3, 0x8DFF }, { 0xE6F4, 0x8E1D }, { 0xE6F5, 0x8E1E }, { 0xE6F6, 0x8E10 }, 
-	{ 0xE6F7, 0x8E1F }, { 0xE6F8, 0x8E42 }, { 0xE6F9, 0x8E35 }, { 0xE6FA, 0x8E30 }, { 0xE6FB, 0x8E34 }, { 0xE6FC, 0x8E4A }, { 0xE740, 0x8E47 }, { 0xE741, 0x8E49 }, 
-	{ 0xE742, 0x8E4C }, { 0xE743, 0x8E50 }, { 0xE744, 0x8E48 }, { 0xE745, 0x8E59 }, { 0xE746, 0x8E64 }, { 0xE747, 0x8E60 }, { 0xE748, 0x8E2A }, { 0xE749, 0x8E63 }, 
-	{ 0xE74A, 0x8E55 }, { 0xE74B, 0x8E76 }, { 0xE74C, 0x8E72 }, { 0xE74D, 0x8E7C }, { 0xE74E, 0x8E81 }, { 0xE74F, 0x8E87 }, { 0xE750, 0x8E85 }, { 0xE751, 0x8E84 }, 
-	{ 0xE752, 0x8E8B }, { 0xE753, 0x8E8A }, { 0xE754, 0x8E93 }, { 0xE755, 0x8E91 }, { 0xE756, 0x8E94 }, { 0xE757, 0x8E99 }, { 0xE758, 0x8EAA }, { 0xE759, 0x8EA1 }, 
-	{ 0xE75A, 0x8EAC }, { 0xE75B, 0x8EB0 }, { 0xE75C, 0x8EC6 }, { 0xE75D, 0x8EB1 }, { 0xE75E, 0x8EBE }, { 0xE75F, 0x8EC5 }, { 0xE760, 0x8EC8 }, { 0xE761, 0x8ECB }, 
-	{ 0xE762, 0x8EDB }, { 0xE763, 0x8EE3 }, { 0xE764, 0x8EFC }, { 0xE765, 0x8EFB }, { 0xE766, 0x8EEB }, { 0xE767, 0x8EFE }, { 0xE768, 0x8F0A }, { 0xE769, 0x8F05 }, 
-	{ 0xE76A, 0x8F15 }, { 0xE76B, 0x8F12 }, { 0xE76C, 0x8F19 }, { 0xE76D, 0x8F13 }, { 0xE76E, 0x8F1C }, { 0xE76F, 0x8F1F }, { 0xE770, 0x8F1B }, { 0xE771, 0x8F0C }, 
-	{ 0xE772, 0x8F26 }, { 0xE773, 0x8F33 }, { 0xE774, 0x8F3B }, { 0xE775, 0x8F39 }, { 0xE776, 0x8F45 }, { 0xE777, 0x8F42 }, { 0xE778, 0x8F3E }, { 0xE779, 0x8F4C }, 
-	{ 0xE77A, 0x8F49 }, { 0xE77B, 0x8F46 }, { 0xE77C, 0x8F4E }, { 0xE77D, 0x8F57 }, { 0xE77E, 0x8F5C }, { 0xE780, 0x8F62 }, { 0xE781, 0x8F63 }, { 0xE782, 0x8F64 }, 
-	{ 0xE783, 0x8F9C }, { 0xE784, 0x8F9F }, { 0xE785, 0x8FA3 }, { 0xE786, 0x8FAD }, { 0xE787, 0x8FAF }, { 0xE788, 0x8FB7 }, { 0xE789, 0x8FDA }, { 0xE78A, 0x8FE5 }, 
-	{ 0xE78B, 0x8FE2 }, { 0xE78C, 0x8FEA }, { 0xE78D, 0x8FEF }, { 0xE78E, 0x9087 }, { 0xE78F, 0x8FF4 }, { 0xE790, 0x9005 }, { 0xE791, 0x8FF9 }, { 0xE792, 0x8FFA }, 
-	{ 0xE793, 0x9011 }, { 0xE794, 0x9015 }, { 0xE795, 0x9021 }, { 0xE796, 0x900D }, { 0xE797, 0x901E }, { 0xE798, 0x9016 }, { 0xE799, 0x900B }, { 0xE79A, 0x9027 }, 
-	{ 0xE79B, 0x9036 }, { 0xE79C, 0x9035 }, { 0xE79D, 0x9039 }, { 0xE79E, 0x8FF8 }, { 0xE79F, 0x904F }, { 0xE7A0, 0x9050 }, { 0xE7A1, 0x9051 }, { 0xE7A2, 0x9052 }, 
-	{ 0xE7A3, 0x900E }, { 0xE7A4, 0x9049 }, { 0xE7A5, 0x903E }, { 0xE7A6, 0x9056 }, { 0xE7A7, 0x9058 }, { 0xE7A8, 0x905E }, { 0xE7A9, 0x9068 }, { 0xE7AA, 0x906F }, 
-	{ 0xE7AB, 0x9076 }, { 0xE7AC, 0x96A8 }, { 0xE7AD, 0x9072 }, { 0xE7AE, 0x9082 }, { 0xE7AF, 0x907D }, { 0xE7B0, 0x9081 }, { 0xE7B1, 0x9080 }, { 0xE7B2, 0x908A }, 
-	{ 0xE7B3, 0x9089 }, { 0xE7B4, 0x908F }, { 0xE7B5, 0x90A8 }, { 0xE7B6, 0x90AF }, { 0xE7B7, 0x90B1 }, { 0xE7B8, 0x90B5 }, { 0xE7B9, 0x90E2 }, { 0xE7BA, 0x90E4 }, 
-	{ 0xE7BB, 0x6248 }, { 0xE7BC, 0x90DB }, { 0xE7BD, 0x9102 }, { 0xE7BE, 0x9112 }, { 0xE7BF, 0x9119 }, { 0xE7C0, 0x9132 }, { 0xE7C1, 0x9130 }, { 0xE7C2, 0x914A }, 
-	{ 0xE7C3, 0x9156 }, { 0xE7C4, 0x9158 }, { 0xE7C5, 0x9163 }, { 0xE7C6, 0x9165 }, { 0xE7C7, 0x9169 }, { 0xE7C8, 0x9173 }, { 0xE7C9, 0x9172 }, { 0xE7CA, 0x918B }, 
-	{ 0xE7CB, 0x9189 }, { 0xE7CC, 0x9182 }, { 0xE7CD, 0x91A2 }, { 0xE7CE, 0x91AB }, { 0xE7CF, 0x91AF }, { 0xE7D0, 0x91AA }, { 0xE7D1, 0x91B5 }, { 0xE7D2, 0x91B4 }, 
-	{ 0xE7D3, 0x91BA }, { 0xE7D4, 0x91C0 }, { 0xE7D5, 0x91C1 }, { 0xE7D6, 0x91C9 }, { 0xE7D7, 0x91CB }, { 0xE7D8, 0x91D0 }, { 0xE7D9, 0x91D6 }, { 0xE7DA, 0x91DF }, 
-	{ 0xE7DB, 0x91E1 }, { 0xE7DC, 0x91DB }, { 0xE7DD, 0x91FC }, { 0xE7DE, 0x91F5 }, { 0xE7DF, 0x91F6 }, { 0xE7E0, 0x921E }, { 0xE7E1, 0x91FF }, { 0xE7E2, 0x9214 }, 
-	{ 0xE7E3, 0x922C }, { 0xE7E4, 0x9215 }, { 0xE7E5, 0x9211 }, { 0xE7E6, 0x925E }, { 0xE7E7, 0x9257 }, { 0xE7E8, 0x9245 }, { 0xE7E9, 0x9249 }, { 0xE7EA, 0x9264 }, 
-	{ 0xE7EB, 0x9248 }, { 0xE7EC, 0x9295 }, { 0xE7ED, 0x923F }, { 0xE7EE, 0x924B }, { 0xE7EF, 0x9250 }, { 0xE7F0, 0x929C }, { 0xE7F1, 0x9296 }, { 0xE7F2, 0x9293 }, 
-	{ 0xE7F3, 0x929B }, { 0xE7F4, 0x925A }, { 0xE7F5, 0x92CF }, { 0xE7F6, 0x92B9 }, { 0xE7F7, 0x92B7 }, { 0xE7F8, 0x92E9 }, { 0xE7F9, 0x930F }, { 0xE7FA, 0x92FA }, 
-	{ 0xE7FB, 0x9344 }, { 0xE7FC, 0x932E }, { 0xE840, 0x9319 }, { 0xE841, 0x9322 }, { 0xE842, 0x931A }, { 0xE843, 0x9323 }, { 0xE844, 0x933A }, { 0xE845, 0x9335 }, 
-	{ 0xE846, 0x933B }, { 0xE847, 0x935C }, { 0xE848, 0x9360 }, { 0xE849, 0x937C }, { 0xE84A, 0x936E }, { 0xE84B, 0x9356 }, { 0xE84C, 0x93B0 }, { 0xE84D, 0x93AC }, 
-	{ 0xE84E, 0x93AD }, { 0xE84F, 0x9394 }, { 0xE850, 0x93B9 }, { 0xE851, 0x93D6 }, { 0xE852, 0x93D7 }, { 0xE853, 0x93E8 }, { 0xE854, 0x93E5 }, { 0xE855, 0x93D8 }, 
-	{ 0xE856, 0x93C3 }, { 0xE857, 0x93DD }, { 0xE858, 0x93D0 }, { 0xE859, 0x93C8 }, { 0xE85A, 0x93E4 }, { 0xE85B, 0x941A }, { 0xE85C, 0x9414 }, { 0xE85D, 0x9413 }, 
-	{ 0xE85E, 0x9403 }, { 0xE85F, 0x9407 }, { 0xE860, 0x9410 }, { 0xE861, 0x9436 }, { 0xE862, 0x942B }, { 0xE863, 0x9435 }, { 0xE864, 0x9421 }, { 0xE865, 0x943A }, 
-	{ 0xE866, 0x9441 }, { 0xE867, 0x9452 }, { 0xE868, 0x9444 }, { 0xE869, 0x945B }, { 0xE86A, 0x9460 }, { 0xE86B, 0x9462 }, { 0xE86C, 0x945E }, { 0xE86D, 0x946A }, 
-	{ 0xE86E, 0x9229 }, { 0xE86F, 0x9470 }, { 0xE870, 0x9475 }, { 0xE871, 0x9477 }, { 0xE872, 0x947D }, { 0xE873, 0x945A }, { 0xE874, 0x947C }, { 0xE875, 0x947E }, 
-	{ 0xE876, 0x9481 }, { 0xE877, 0x947F }, { 0xE878, 0x9582 }, { 0xE879, 0x9587 }, { 0xE87A, 0x958A }, { 0xE87B, 0x9594 }, { 0xE87C, 0x9596 }, { 0xE87D, 0x9598 }, 
-	{ 0xE87E, 0x9599 }, { 0xE880, 0x95A0 }, { 0xE881, 0x95A8 }, { 0xE882, 0x95A7 }, { 0xE883, 0x95AD }, { 0xE884, 0x95BC }, { 0xE885, 0x95BB }, { 0xE886, 0x95B9 }, 
-	{ 0xE887, 0x95BE }, { 0xE888, 0x95CA }, { 0xE889, 0x6FF6 }, { 0xE88A, 0x95C3 }, { 0xE88B, 0x95CD }, { 0xE88C, 0x95CC }, { 0xE88D, 0x95D5 }, { 0xE88E, 0x95D4 }, 
-	{ 0xE88F, 0x95D6 }, { 0xE890, 0x95DC }, { 0xE891, 0x95E1 }, { 0xE892, 0x95E5 }, { 0xE893, 0x95E2 }, { 0xE894, 0x9621 }, { 0xE895, 0x9628 }, { 0xE896, 0x962E }, 
-	{ 0xE897, 0x962F }, { 0xE898, 0x9642 }, { 0xE899, 0x964C }, { 0xE89A, 0x964F }, { 0xE89B, 0x964B }, { 0xE89C, 0x9677 }, { 0xE89D, 0x965C }, { 0xE89E, 0x965E }, 
-	{ 0xE89F, 0x965D }, { 0xE8A0, 0x965F }, { 0xE8A1, 0x9666 }, { 0xE8A2, 0x9672 }, { 0xE8A3, 0x966C }, { 0xE8A4, 0x968D }, { 0xE8A5, 0x9698 }, { 0xE8A6, 0x9695 }, 
-	{ 0xE8A7, 0x9697 }, { 0xE8A8, 0x96AA }, { 0xE8A9, 0x96A7 }, { 0xE8AA, 0x96B1 }, { 0xE8AB, 0x96B2 }, { 0xE8AC, 0x96B0 }, { 0xE8AD, 0x96B4 }, { 0xE8AE, 0x96B6 }, 
-	{ 0xE8AF, 0x96B8 }, { 0xE8B0, 0x96B9 }, { 0xE8B1, 0x96CE }, { 0xE8B2, 0x96CB }, { 0xE8B3, 0x96C9 }, { 0xE8B4, 0x96CD }, { 0xE8B5, 0x894D }, { 0xE8B6, 0x96DC }, 
-	{ 0xE8B7, 0x970D }, { 0xE8B8, 0x96D5 }, { 0xE8B9, 0x96F9 }, { 0xE8BA, 0x9704 }, { 0xE8BB, 0x9706 }, { 0xE8BC, 0x9708 }, { 0xE8BD, 0x9713 }, { 0xE8BE, 0x970E }, 
-	{ 0xE8BF, 0x9711 }, { 0xE8C0, 0x970F }, { 0xE8C1, 0x9716 }, { 0xE8C2, 0x9719 }, { 0xE8C3, 0x9724 }, { 0xE8C4, 0x972A }, { 0xE8C5, 0x9730 }, { 0xE8C6, 0x9739 }, 
-	{ 0xE8C7, 0x973D }, { 0xE8C8, 0x973E }, { 0xE8C9, 0x9744 }, { 0xE8CA, 0x9746 }, { 0xE8CB, 0x9748 }, { 0xE8CC, 0x9742 }, { 0xE8CD, 0x9749 }, { 0xE8CE, 0x975C }, 
-	{ 0xE8CF, 0x9760 }, { 0xE8D0, 0x9764 }, { 0xE8D1, 0x9766 }, { 0xE8D2, 0x9768 }, { 0xE8D3, 0x52D2 }, { 0xE8D4, 0x976B }, { 0xE8D5, 0x9771 }, { 0xE8D6, 0x9779 }, 
-	{ 0xE8D7, 0x9785 }, { 0xE8D8, 0x977C }, { 0xE8D9, 0x9781 }, { 0xE8DA, 0x977A }, { 0xE8DB, 0x9786 }, { 0xE8DC, 0x978B }, { 0xE8DD, 0x978F }, { 0xE8DE, 0x9790 }, 
-	{ 0xE8DF, 0x979C }, { 0xE8E0, 0x97A8 }, { 0xE8E1, 0x97A6 }, { 0xE8E2, 0x97A3 }, { 0xE8E3, 0x97B3 }, { 0xE8E4, 0x97B4 }, { 0xE8E5, 0x97C3 }, { 0xE8E6, 0x97C6 }, 
-	{ 0xE8E7, 0x97C8 }, { 0xE8E8, 0x97CB }, { 0xE8E9, 0x97DC }, { 0xE8EA, 0x97ED }, { 0xE8EB, 0x9F4F }, { 0xE8EC, 0x97F2 }, { 0xE8ED, 0x7ADF }, { 0xE8EE, 0x97F6 }, 
-	{ 0xE8EF, 0x97F5 }, { 0xE8F0, 0x980F }, { 0xE8F1, 0x980C }, { 0xE8F2, 0x9838 }, { 0xE8F3, 0x9824 }, { 0xE8F4, 0x9821 }, { 0xE8F5, 0x9837 }, { 0xE8F6, 0x983D }, 
-	{ 0xE8F7, 0x9846 }, { 0xE8F8, 0x984F }, { 0xE8F9, 0x984B }, { 0xE8FA, 0x986B }, { 0xE8FB, 0x986F }, { 0xE8FC, 0x9870 }, { 0xE940, 0x9871 }, { 0xE941, 0x9874 }, 
-	{ 0xE942, 0x9873 }, { 0xE943, 0x98AA }, { 0xE944, 0x98AF }, { 0xE945, 0x98B1 }, { 0xE946, 0x98B6 }, { 0xE947, 0x98C4 }, { 0xE948, 0x98C3 }, { 0xE949, 0x98C6 }, 
-	{ 0xE94A, 0x98E9 }, { 0xE94B, 0x98EB }, { 0xE94C, 0x9903 }, { 0xE94D, 0x9909 }, { 0xE94E, 0x9912 }, { 0xE94F, 0x9914 }, { 0xE950, 0x9918 }, { 0xE951, 0x9921 }, 
-	{ 0xE952, 0x991D }, { 0xE953, 0x991E }, { 0xE954, 0x9924 }, { 0xE955, 0x9920 }, { 0xE956, 0x992C }, { 0xE957, 0x992E }, { 0xE958, 0x993D }, { 0xE959, 0x993E }, 
-	{ 0xE95A, 0x9942 }, { 0xE95B, 0x9949 }, { 0xE95C, 0x9945 }, { 0xE95D, 0x9950 }, { 0xE95E, 0x994B }, { 0xE95F, 0x9951 }, { 0xE960, 0x9952 }, { 0xE961, 0x994C }, 
-	{ 0xE962, 0x9955 }, { 0xE963, 0x9997 }, { 0xE964, 0x9998 }, { 0xE965, 0x99A5 }, { 0xE966, 0x99AD }, { 0xE967, 0x99AE }, { 0xE968, 0x99BC }, { 0xE969, 0x99DF }, 
-	{ 0xE96A, 0x99DB }, { 0xE96B, 0x99DD }, { 0xE96C, 0x99D8 }, { 0xE96D, 0x99D1 }, { 0xE96E, 0x99ED }, { 0xE96F, 0x99EE }, { 0xE970, 0x99F1 }, { 0xE971, 0x99F2 }, 
-	{ 0xE972, 0x99FB }, { 0xE973, 0x99F8 }, { 0xE974, 0x9A01 }, { 0xE975, 0x9A0F }, { 0xE976, 0x9A05 }, { 0xE977, 0x99E2 }, { 0xE978, 0x9A19 }, { 0xE979, 0x9A2B }, 
-	{ 0xE97A, 0x9A37 }, { 0xE97B, 0x9A45 }, { 0xE97C, 0x9A42 }, { 0xE97D, 0x9A40 }, { 0xE97E, 0x9A43 }, { 0xE980, 0x9A3E }, { 0xE981, 0x9A55 }, { 0xE982, 0x9A4D }, 
-	{ 0xE983, 0x9A5B }, { 0xE984, 0x9A57 }, { 0xE985, 0x9A5F }, { 0xE986, 0x9A62 }, { 0xE987, 0x9A65 }, { 0xE988, 0x9A64 }, { 0xE989, 0x9A69 }, { 0xE98A, 0x9A6B }, 
-	{ 0xE98B, 0x9A6A }, { 0xE98C, 0x9AAD }, { 0xE98D, 0x9AB0 }, { 0xE98E, 0x9ABC }, { 0xE98F, 0x9AC0 }, { 0xE990, 0x9ACF }, { 0xE991, 0x9AD1 }, { 0xE992, 0x9AD3 }, 
-	{ 0xE993, 0x9AD4 }, { 0xE994, 0x9ADE }, { 0xE995, 0x9ADF }, { 0xE996, 0x9AE2 }, { 0xE997, 0x9AE3 }, { 0xE998, 0x9AE6 }, { 0xE999, 0x9AEF }, { 0xE99A, 0x9AEB }, 
-	{ 0xE99B, 0x9AEE }, { 0xE99C, 0x9AF4 }, { 0xE99D, 0x9AF1 }, { 0xE99E, 0x9AF7 }, { 0xE99F, 0x9AFB }, { 0xE9A0, 0x9B06 }, { 0xE9A1, 0x9B18 }, { 0xE9A2, 0x9B1A }, 
-	{ 0xE9A3, 0x9B1F }, { 0xE9A4, 0x9B22 }, { 0xE9A5, 0x9B23 }, { 0xE9A6, 0x9B25 }, { 0xE9A7, 0x9B27 }, { 0xE9A8, 0x9B28 }, { 0xE9A9, 0x9B29 }, { 0xE9AA, 0x9B2A }, 
-	{ 0xE9AB, 0x9B2E }, { 0xE9AC, 0x9B2F }, { 0xE9AD, 0x9B32 }, { 0xE9AE, 0x9B44 }, { 0xE9AF, 0x9B43 }, { 0xE9B0, 0x9B4F }, { 0xE9B1, 0x9B4D }, { 0xE9B2, 0x9B4E }, 
-	{ 0xE9B3, 0x9B51 }, { 0xE9B4, 0x9B58 }, { 0xE9B5, 0x9B74 }, { 0xE9B6, 0x9B93 }, { 0xE9B7, 0x9B83 }, { 0xE9B8, 0x9B91 }, { 0xE9B9, 0x9B96 }, { 0xE9BA, 0x9B97 }, 
-	{ 0xE9BB, 0x9B9F }, { 0xE9BC, 0x9BA0 }, { 0xE9BD, 0x9BA8 }, { 0xE9BE, 0x9BB4 }, { 0xE9BF, 0x9BC0 }, { 0xE9C0, 0x9BCA }, { 0xE9C1, 0x9BB9 }, { 0xE9C2, 0x9BC6 }, 
-	{ 0xE9C3, 0x9BCF }, { 0xE9C4, 0x9BD1 }, { 0xE9C5, 0x9BD2 }, { 0xE9C6, 0x9BE3 }, { 0xE9C7, 0x9BE2 }, { 0xE9C8, 0x9BE4 }, { 0xE9C9, 0x9BD4 }, { 0xE9CA, 0x9BE1 }, 
-	{ 0xE9CB, 0x9C3A }, { 0xE9CC, 0x9BF2 }, { 0xE9CD, 0x9BF1 }, { 0xE9CE, 0x9BF0 }, { 0xE9CF, 0x9C15 }, { 0xE9D0, 0x9C14 }, { 0xE9D1, 0x9C09 }, { 0xE9D2, 0x9C13 }, 
-	{ 0xE9D3, 0x9C0C }, { 0xE9D4, 0x9C06 }, { 0xE9D5, 0x9C08 }, { 0xE9D6, 0x9C12 }, { 0xE9D7, 0x9C0A }, { 0xE9D8, 0x9C04 }, { 0xE9D9, 0x9C2E }, { 0xE9DA, 0x9C1B }, 
-	{ 0xE9DB, 0x9C25 }, { 0xE9DC, 0x9C24 }, { 0xE9DD, 0x9C21 }, { 0xE9DE, 0x9C30 }, { 0xE9DF, 0x9C47 }, { 0xE9E0, 0x9C32 }, { 0xE9E1, 0x9C46 }, { 0xE9E2, 0x9C3E }, 
-	{ 0xE9E3, 0x9C5A }, { 0xE9E4, 0x9C60 }, { 0xE9E5, 0x9C67 }, { 0xE9E6, 0x9C76 }, { 0xE9E7, 0x9C78 }, { 0xE9E8, 0x9CE7 }, { 0xE9E9, 0x9CEC }, { 0xE9EA, 0x9CF0 }, 
-	{ 0xE9EB, 0x9D09 }, { 0xE9EC, 0x9D08 }, { 0xE9ED, 0x9CEB }, { 0xE9EE, 0x9D03 }, { 0xE9EF, 0x9D06 }, { 0xE9F0, 0x9D2A }, { 0xE9F1, 0x9D26 }, { 0xE9F2, 0x9DAF }, 
-	{ 0xE9F3, 0x9D23 }, { 0xE9F4, 0x9D1F }, { 0xE9F5, 0x9D44 }, { 0xE9F6, 0x9D15 }, { 0xE9F7, 0x9D12 }, { 0xE9F8, 0x9D41 }, { 0xE9F9, 0x9D3F }, { 0xE9FA, 0x9D3E }, 
-	{ 0xE9FB, 0x9D46 }, { 0xE9FC, 0x9D48 }, { 0xEA40, 0x9D5D }, { 0xEA41, 0x9D5E }, { 0xEA42, 0x9D64 }, { 0xEA43, 0x9D51 }, { 0xEA44, 0x9D50 }, { 0xEA45, 0x9D59 }, 
-	{ 0xEA46, 0x9D72 }, { 0xEA47, 0x9D89 }, { 0xEA48, 0x9D87 }, { 0xEA49, 0x9DAB }, { 0xEA4A, 0x9D6F }, { 0xEA4B, 0x9D7A }, { 0xEA4C, 0x9D9A }, { 0xEA4D, 0x9DA4 }, 
-	{ 0xEA4E, 0x9DA9 }, { 0xEA4F, 0x9DB2 }, { 0xEA50, 0x9DC4 }, { 0xEA51, 0x9DC1 }, { 0xEA52, 0x9DBB }, { 0xEA53, 0x9DB8 }, { 0xEA54, 0x9DBA }, { 0xEA55, 0x9DC6 }, 
-	{ 0xEA56, 0x9DCF }, { 0xEA57, 0x9DC2 }, { 0xEA58, 0x9DD9 }, { 0xEA59, 0x9DD3 }, { 0xEA5A, 0x9DF8 }, { 0xEA5B, 0x9DE6 }, { 0xEA5C, 0x9DED }, { 0xEA5D, 0x9DEF }, 
-	{ 0xEA5E, 0x9DFD }, { 0xEA5F, 0x9E1A }, { 0xEA60, 0x9E1B }, { 0xEA61, 0x9E1E }, { 0xEA62, 0x9E75 }, { 0xEA63, 0x9E79 }, { 0xEA64, 0x9E7D }, { 0xEA65, 0x9E81 }, 
-	{ 0xEA66, 0x9E88 }, { 0xEA67, 0x9E8B }, { 0xEA68, 0x9E8C }, { 0xEA69, 0x9E92 }, { 0xEA6A, 0x9E95 }, { 0xEA6B, 0x9E91 }, { 0xEA6C, 0x9E9D }, { 0xEA6D, 0x9EA5 }, 
-	{ 0xEA6E, 0x9EA9 }, { 0xEA6F, 0x9EB8 }, { 0xEA70, 0x9EAA }, { 0xEA71, 0x9EAD }, { 0xEA72, 0x9761 }, { 0xEA73, 0x9ECC }, { 0xEA74, 0x9ECE }, { 0xEA75, 0x9ECF }, 
-	{ 0xEA76, 0x9ED0 }, { 0xEA77, 0x9ED4 }, { 0xEA78, 0x9EDC }, { 0xEA79, 0x9EDE }, { 0xEA7A, 0x9EDD }, { 0xEA7B, 0x9EE0 }, { 0xEA7C, 0x9EE5 }, { 0xEA7D, 0x9EE8 }, 
-	{ 0xEA7E, 0x9EEF }, { 0xEA80, 0x9EF4 }, { 0xEA81, 0x9EF6 }, { 0xEA82, 0x9EF7 }, { 0xEA83, 0x9EF9 }, { 0xEA84, 0x9EFB }, { 0xEA85, 0x9EFC }, { 0xEA86, 0x9EFD }, 
-	{ 0xEA87, 0x9F07 }, { 0xEA88, 0x9F08 }, { 0xEA89, 0x76B7 }, { 0xEA8A, 0x9F15 }, { 0xEA8B, 0x9F21 }, { 0xEA8C, 0x9F2C }, { 0xEA8D, 0x9F3E }, { 0xEA8E, 0x9F4A }, 
-	{ 0xEA8F, 0x9F52 }, { 0xEA90, 0x9F54 }, { 0xEA91, 0x9F63 }, { 0xEA92, 0x9F5F }, { 0xEA93, 0x9F60 }, { 0xEA94, 0x9F61 }, { 0xEA95, 0x9F66 }, { 0xEA96, 0x9F67 }, 
-	{ 0xEA97, 0x9F6C }, { 0xEA98, 0x9F6A }, { 0xEA99, 0x9F77 }, { 0xEA9A, 0x9F72 }, { 0xEA9B, 0x9F76 }, { 0xEA9C, 0x9F95 }, { 0xEA9D, 0x9F9C }, { 0xEA9E, 0x9FA0 }, 
-	{ 0xEA9F, 0x582F }, { 0xEAA0, 0x69C7 }, { 0xEAA1, 0x9059 }, { 0xEAA2, 0x7464 }, { 0xEAA3, 0x51DC }, { 0xEAA4, 0x7199 }, { 0xEB51, 0xFE33 }, { 0xEB5C, 0xFE31 }, 
-	{ 0xEB64, 0xFE30 }, { 0xEB69, 0xFE35 }, { 0xEB6A, 0xFE36 }, { 0xEB6B, 0xFE39 }, { 0xEB6C, 0xFE3A }, { 0xEB6F, 0xFE37 }, { 0xEB70, 0xFE38 }, { 0xEB71, 0xFE3F }, 
-	{ 0xEB72, 0xFE40 }, { 0xEB73, 0xFE3D }, { 0xEB74, 0xFE3E }, { 0xEB75, 0xFE41 }, { 0xEB76, 0xFE42 }, { 0xEB77, 0xFE43 }, { 0xEB78, 0xFE44 }, { 0xEB79, 0xFE3B }, 
-	{ 0xEB7A, 0xFE3C }, 
+	{ 0x8140, 0x3000 }, { 0x8141, 0x3001 }, { 0x8142, 0x3002 }, { 0x8143, 0xFF0C }, { 0x8144, 0xFF0E }, { 0x8145, 0x30FB }, { 0x8146, 0xFF1A }, { 0x8147, 0xFF1B },
+	{ 0x8148, 0xFF1F }, { 0x8149, 0xFF01 }, { 0x814A, 0x309B }, { 0x814B, 0x309C }, { 0x814C, 0x00B4 }, { 0x814D, 0xFF40 }, { 0x814E, 0x00A8 }, { 0x814F, 0xFF3E },
+	{ 0x8150, 0xFFE3 }, { 0x8151, 0xFF3F }, { 0x8152, 0x30FD }, { 0x8153, 0x30FE }, { 0x8154, 0x309D }, { 0x8155, 0x309E }, { 0x8156, 0x3003 }, { 0x8157, 0x4EDD },
+	{ 0x8158, 0x3005 }, { 0x8159, 0x3006 }, { 0x815A, 0x3007 }, { 0x815B, 0x30FC }, { 0x815C, 0x2014 }, { 0x815D, 0x2010 }, { 0x815E, 0xFF0F }, { 0x815F, 0xFF3C },
+	{ 0x8160, 0x301C }, { 0x8161, 0x2016 }, { 0x8162, 0xFF5C }, { 0x8163, 0x2026 }, { 0x8164, 0x2025 }, { 0x8165, 0x2018 }, { 0x8166, 0x2019 }, { 0x8167, 0x201C },
+	{ 0x8168, 0x201D }, { 0x8169, 0xFF08 }, { 0x816A, 0xFF09 }, { 0x816B, 0x3014 }, { 0x816C, 0x3015 }, { 0x816D, 0xFF3B }, { 0x816E, 0xFF3D }, { 0x816F, 0xFF5B },
+	{ 0x8170, 0xFF5D }, { 0x8171, 0x3008 }, { 0x8172, 0x3009 }, { 0x8173, 0x300A }, { 0x8174, 0x300B }, { 0x8175, 0x300C }, { 0x8176, 0x300D }, { 0x8177, 0x300E },
+	{ 0x8178, 0x300F }, { 0x8179, 0x3010 }, { 0x817A, 0x3011 }, { 0x817B, 0xFF0B }, { 0x817C, 0x2212 }, { 0x817D, 0x00B1 }, { 0x817E, 0x00D7 }, { 0x8180, 0x00F7 },
+	{ 0x8181, 0xFF1D }, { 0x8182, 0x2260 }, { 0x8183, 0xFF1C }, { 0x8184, 0xFF1E }, { 0x8185, 0x2266 }, { 0x8186, 0x2267 }, { 0x8187, 0x221E }, { 0x8188, 0x2234 },
+	{ 0x8189, 0x2642 }, { 0x818A, 0x2640 }, { 0x818B, 0x00B0 }, { 0x818C, 0x2032 }, { 0x818D, 0x2033 }, { 0x818E, 0x2103 }, { 0x818F, 0xFFE5 }, { 0x8190, 0xFF04 },
+	{ 0x8191, 0x00A2 }, { 0x8192, 0x00A3 }, { 0x8193, 0xFF05 }, { 0x8194, 0xFF03 }, { 0x8195, 0xFF06 }, { 0x8196, 0xFF0A }, { 0x8197, 0xFF20 }, { 0x8198, 0x00A7 },
+	{ 0x8199, 0x2606 }, { 0x819A, 0x2605 }, { 0x819B, 0x25CB }, { 0x819C, 0x25CF }, { 0x819D, 0x25CE }, { 0x819E, 0x25C7 }, { 0x819F, 0x25C6 }, { 0x81A0, 0x25A1 },
+	{ 0x81A1, 0x25A0 }, { 0x81A2, 0x25B3 }, { 0x81A3, 0x25B2 }, { 0x81A4, 0x25BD }, { 0x81A5, 0x25BC }, { 0x81A6, 0x203B }, { 0x81A7, 0x3012 }, { 0x81A8, 0x2192 },
+	{ 0x81A9, 0x2190 }, { 0x81AA, 0x2191 }, { 0x81AB, 0x2193 }, { 0x81AC, 0x3013 }, { 0x81B8, 0x2208 }, { 0x81B9, 0x220B }, { 0x81BA, 0x2286 }, { 0x81BB, 0x2287 },
+	{ 0x81BC, 0x2282 }, { 0x81BD, 0x2283 }, { 0x81BE, 0x222A }, { 0x81BF, 0x2229 }, { 0x81C8, 0x2227 }, { 0x81C9, 0x2228 }, { 0x81CA, 0x00AC }, { 0x81CB, 0x21D2 },
+	{ 0x81CC, 0x21D4 }, { 0x81CD, 0x2200 }, { 0x81CE, 0x2203 }, { 0x81DA, 0x2220 }, { 0x81DB, 0x22A5 }, { 0x81DC, 0x2312 }, { 0x81DD, 0x2202 }, { 0x81DE, 0x2207 },
+	{ 0x81DF, 0x2261 }, { 0x81E0, 0x2252 }, { 0x81E1, 0x226A }, { 0x81E2, 0x226B }, { 0x81E3, 0x221A }, { 0x81E4, 0x223D }, { 0x81E5, 0x221D }, { 0x81E6, 0x2235 },
+	{ 0x81E7, 0x222B }, { 0x81E8, 0x222C }, { 0x81F0, 0x212B }, { 0x81F1, 0x2030 }, { 0x81F2, 0x266F }, { 0x81F3, 0x266D }, { 0x81F4, 0x266A }, { 0x81F5, 0x2020 },
+	{ 0x81F6, 0x2021 }, { 0x81F7, 0x00B6 }, { 0x81FC, 0x25EF }, { 0x824F, 0xFF10 }, { 0x8250, 0xFF11 }, { 0x8251, 0xFF12 }, { 0x8252, 0xFF13 }, { 0x8253, 0xFF14 },
+	{ 0x8254, 0xFF15 }, { 0x8255, 0xFF16 }, { 0x8256, 0xFF17 }, { 0x8257, 0xFF18 }, { 0x8258, 0xFF19 }, { 0x8260, 0xFF21 }, { 0x8261, 0xFF22 }, { 0x8262, 0xFF23 },
+	{ 0x8263, 0xFF24 }, { 0x8264, 0xFF25 }, { 0x8265, 0xFF26 }, { 0x8266, 0xFF27 }, { 0x8267, 0xFF28 }, { 0x8268, 0xFF29 }, { 0x8269, 0xFF2A }, { 0x826A, 0xFF2B },
+	{ 0x826B, 0xFF2C }, { 0x826C, 0xFF2D }, { 0x826D, 0xFF2E }, { 0x826E, 0xFF2F }, { 0x826F, 0xFF30 }, { 0x8270, 0xFF31 }, { 0x8271, 0xFF32 }, { 0x8272, 0xFF33 },
+	{ 0x8273, 0xFF34 }, { 0x8274, 0xFF35 }, { 0x8275, 0xFF36 }, { 0x8276, 0xFF37 }, { 0x8277, 0xFF38 }, { 0x8278, 0xFF39 }, { 0x8279, 0xFF3A }, { 0x8281, 0xFF41 },
+	{ 0x8282, 0xFF42 }, { 0x8283, 0xFF43 }, { 0x8284, 0xFF44 }, { 0x8285, 0xFF45 }, { 0x8286, 0xFF46 }, { 0x8287, 0xFF47 }, { 0x8288, 0xFF48 }, { 0x8289, 0xFF49 },
+	{ 0x828A, 0xFF4A }, { 0x828B, 0xFF4B }, { 0x828C, 0xFF4C }, { 0x828D, 0xFF4D }, { 0x828E, 0xFF4E }, { 0x828F, 0xFF4F }, { 0x8290, 0xFF50 }, { 0x8291, 0xFF51 },
+	{ 0x8292, 0xFF52 }, { 0x8293, 0xFF53 }, { 0x8294, 0xFF54 }, { 0x8295, 0xFF55 }, { 0x8296, 0xFF56 }, { 0x8297, 0xFF57 }, { 0x8298, 0xFF58 }, { 0x8299, 0xFF59 },
+	{ 0x829A, 0xFF5A }, { 0x829F, 0x3041 }, { 0x82A0, 0x3042 }, { 0x82A1, 0x3043 }, { 0x82A2, 0x3044 }, { 0x82A3, 0x3045 }, { 0x82A4, 0x3046 }, { 0x82A5, 0x3047 },
+	{ 0x82A6, 0x3048 }, { 0x82A7, 0x3049 }, { 0x82A8, 0x304A }, { 0x82A9, 0x304B }, { 0x82AA, 0x304C }, { 0x82AB, 0x304D }, { 0x82AC, 0x304E }, { 0x82AD, 0x304F },
+	{ 0x82AE, 0x3050 }, { 0x82AF, 0x3051 }, { 0x82B0, 0x3052 }, { 0x82B1, 0x3053 }, { 0x82B2, 0x3054 }, { 0x82B3, 0x3055 }, { 0x82B4, 0x3056 }, { 0x82B5, 0x3057 },
+	{ 0x82B6, 0x3058 }, { 0x82B7, 0x3059 }, { 0x82B8, 0x305A }, { 0x82B9, 0x305B }, { 0x82BA, 0x305C }, { 0x82BB, 0x305D }, { 0x82BC, 0x305E }, { 0x82BD, 0x305F },
+	{ 0x82BE, 0x3060 }, { 0x82BF, 0x3061 }, { 0x82C0, 0x3062 }, { 0x82C1, 0x3063 }, { 0x82C2, 0x3064 }, { 0x82C3, 0x3065 }, { 0x82C4, 0x3066 }, { 0x82C5, 0x3067 },
+	{ 0x82C6, 0x3068 }, { 0x82C7, 0x3069 }, { 0x82C8, 0x306A }, { 0x82C9, 0x306B }, { 0x82CA, 0x306C }, { 0x82CB, 0x306D }, { 0x82CC, 0x306E }, { 0x82CD, 0x306F },
+	{ 0x82CE, 0x3070 }, { 0x82CF, 0x3071 }, { 0x82D0, 0x3072 }, { 0x82D1, 0x3073 }, { 0x82D2, 0x3074 }, { 0x82D3, 0x3075 }, { 0x82D4, 0x3076 }, { 0x82D5, 0x3077 },
+	{ 0x82D6, 0x3078 }, { 0x82D7, 0x3079 }, { 0x82D8, 0x307A }, { 0x82D9, 0x307B }, { 0x82DA, 0x307C }, { 0x82DB, 0x307D }, { 0x82DC, 0x307E }, { 0x82DD, 0x307F },
+	{ 0x82DE, 0x3080 }, { 0x82DF, 0x3081 }, { 0x82E0, 0x3082 }, { 0x82E1, 0x3083 }, { 0x82E2, 0x3084 }, { 0x82E3, 0x3085 }, { 0x82E4, 0x3086 }, { 0x82E5, 0x3087 },
+	{ 0x82E6, 0x3088 }, { 0x82E7, 0x3089 }, { 0x82E8, 0x308A }, { 0x82E9, 0x308B }, { 0x82EA, 0x308C }, { 0x82EB, 0x308D }, { 0x82EC, 0x308E }, { 0x82ED, 0x308F },
+	{ 0x82EE, 0x3090 }, { 0x82EF, 0x3091 }, { 0x82F0, 0x3092 }, { 0x82F1, 0x3093 }, { 0x8340, 0x30A1 }, { 0x8341, 0x30A2 }, { 0x8342, 0x30A3 }, { 0x8343, 0x30A4 },
+	{ 0x8344, 0x30A5 }, { 0x8345, 0x30A6 }, { 0x8346, 0x30A7 }, { 0x8347, 0x30A8 }, { 0x8348, 0x30A9 }, { 0x8349, 0x30AA }, { 0x834A, 0x30AB }, { 0x834B, 0x30AC },
+	{ 0x834C, 0x30AD }, { 0x834D, 0x30AE }, { 0x834E, 0x30AF }, { 0x834F, 0x30B0 }, { 0x8350, 0x30B1 }, { 0x8351, 0x30B2 }, { 0x8352, 0x30B3 }, { 0x8353, 0x30B4 },
+	{ 0x8354, 0x30B5 }, { 0x8355, 0x30B6 }, { 0x8356, 0x30B7 }, { 0x8357, 0x30B8 }, { 0x8358, 0x30B9 }, { 0x8359, 0x30BA }, { 0x835A, 0x30BB }, { 0x835B, 0x30BC },
+	{ 0x835C, 0x30BD }, { 0x835D, 0x30BE }, { 0x835E, 0x30BF }, { 0x835F, 0x30C0 }, { 0x8360, 0x30C1 }, { 0x8361, 0x30C2 }, { 0x8362, 0x30C3 }, { 0x8363, 0x30C4 },
+	{ 0x8364, 0x30C5 }, { 0x8365, 0x30C6 }, { 0x8366, 0x30C7 }, { 0x8367, 0x30C8 }, { 0x8368, 0x30C9 }, { 0x8369, 0x30CA }, { 0x836A, 0x30CB }, { 0x836B, 0x30CC },
+	{ 0x836C, 0x30CD }, { 0x836D, 0x30CE }, { 0x836E, 0x30CF }, { 0x836F, 0x30D0 }, { 0x8370, 0x30D1 }, { 0x8371, 0x30D2 }, { 0x8372, 0x30D3 }, { 0x8373, 0x30D4 },
+	{ 0x8374, 0x30D5 }, { 0x8375, 0x30D6 }, { 0x8376, 0x30D7 }, { 0x8377, 0x30D8 }, { 0x8378, 0x30D9 }, { 0x8379, 0x30DA }, { 0x837A, 0x30DB }, { 0x837B, 0x30DC },
+	{ 0x837C, 0x30DD }, { 0x837D, 0x30DE }, { 0x837E, 0x30DF }, { 0x8380, 0x30E0 }, { 0x8381, 0x30E1 }, { 0x8382, 0x30E2 }, { 0x8383, 0x30E3 }, { 0x8384, 0x30E4 },
+	{ 0x8385, 0x30E5 }, { 0x8386, 0x30E6 }, { 0x8387, 0x30E7 }, { 0x8388, 0x30E8 }, { 0x8389, 0x30E9 }, { 0x838A, 0x30EA }, { 0x838B, 0x30EB }, { 0x838C, 0x30EC },
+	{ 0x838D, 0x30ED }, { 0x838E, 0x30EE }, { 0x838F, 0x30EF }, { 0x8390, 0x30F0 }, { 0x8391, 0x30F1 }, { 0x8392, 0x30F2 }, { 0x8393, 0x30F3 }, { 0x8394, 0x30F4 },
+	{ 0x8395, 0x30F5 }, { 0x8396, 0x30F6 }, { 0x839F, 0x0391 }, { 0x83A0, 0x0392 }, { 0x83A1, 0x0393 }, { 0x83A2, 0x0394 }, { 0x83A3, 0x0395 }, { 0x83A4, 0x0396 },
+	{ 0x83A5, 0x0397 }, { 0x83A6, 0x0398 }, { 0x83A7, 0x0399 }, { 0x83A8, 0x039A }, { 0x83A9, 0x039B }, { 0x83AA, 0x039C }, { 0x83AB, 0x039D }, { 0x83AC, 0x039E },
+	{ 0x83AD, 0x039F }, { 0x83AE, 0x03A0 }, { 0x83AF, 0x03A1 }, { 0x83B0, 0x03A3 }, { 0x83B1, 0x03A4 }, { 0x83B2, 0x03A5 }, { 0x83B3, 0x03A6 }, { 0x83B4, 0x03A7 },
+	{ 0x83B5, 0x03A8 }, { 0x83B6, 0x03A9 }, { 0x83BF, 0x03B1 }, { 0x83C0, 0x03B2 }, { 0x83C1, 0x03B3 }, { 0x83C2, 0x03B4 }, { 0x83C3, 0x03B5 }, { 0x83C4, 0x03B6 },
+	{ 0x83C5, 0x03B7 }, { 0x83C6, 0x03B8 }, { 0x83C7, 0x03B9 }, { 0x83C8, 0x03BA }, { 0x83C9, 0x03BB }, { 0x83CA, 0x03BC }, { 0x83CB, 0x03BD }, { 0x83CC, 0x03BE },
+	{ 0x83CD, 0x03BF }, { 0x83CE, 0x03C0 }, { 0x83CF, 0x03C1 }, { 0x83D0, 0x03C3 }, { 0x83D1, 0x03C4 }, { 0x83D2, 0x03C5 }, { 0x83D3, 0x03C6 }, { 0x83D4, 0x03C7 },
+	{ 0x83D5, 0x03C8 }, { 0x83D6, 0x03C9 }, { 0x8440, 0x0410 }, { 0x8441, 0x0411 }, { 0x8442, 0x0412 }, { 0x8443, 0x0413 }, { 0x8444, 0x0414 }, { 0x8445, 0x0415 },
+	{ 0x8446, 0x0401 }, { 0x8447, 0x0416 }, { 0x8448, 0x0417 }, { 0x8449, 0x0418 }, { 0x844A, 0x0419 }, { 0x844B, 0x041A }, { 0x844C, 0x041B }, { 0x844D, 0x041C },
+	{ 0x844E, 0x041D }, { 0x844F, 0x041E }, { 0x8450, 0x041F }, { 0x8451, 0x0420 }, { 0x8452, 0x0421 }, { 0x8453, 0x0422 }, { 0x8454, 0x0423 }, { 0x8455, 0x0424 },
+	{ 0x8456, 0x0425 }, { 0x8457, 0x0426 }, { 0x8458, 0x0427 }, { 0x8459, 0x0428 }, { 0x845A, 0x0429 }, { 0x845B, 0x042A }, { 0x845C, 0x042B }, { 0x845D, 0x042C },
+	{ 0x845E, 0x042D }, { 0x845F, 0x042E }, { 0x8460, 0x042F }, { 0x8470, 0x0430 }, { 0x8471, 0x0431 }, { 0x8472, 0x0432 }, { 0x8473, 0x0433 }, { 0x8474, 0x0434 },
+	{ 0x8475, 0x0435 }, { 0x8476, 0x0451 }, { 0x8477, 0x0436 }, { 0x8478, 0x0437 }, { 0x8479, 0x0438 }, { 0x847A, 0x0439 }, { 0x847B, 0x043A }, { 0x847C, 0x043B },
+	{ 0x847D, 0x043C }, { 0x847E, 0x043D }, { 0x8480, 0x043E }, { 0x8481, 0x043F }, { 0x8482, 0x0440 }, { 0x8483, 0x0441 }, { 0x8484, 0x0442 }, { 0x8485, 0x0443 },
+	{ 0x8486, 0x0444 }, { 0x8487, 0x0445 }, { 0x8488, 0x0446 }, { 0x8489, 0x0447 }, { 0x848A, 0x0448 }, { 0x848B, 0x0449 }, { 0x848C, 0x044A }, { 0x848D, 0x044B },
+	{ 0x848E, 0x044C }, { 0x848F, 0x044D }, { 0x8490, 0x044E }, { 0x8491, 0x044F }, { 0x849F, 0x2500 }, { 0x84A0, 0x2502 }, { 0x84A1, 0x250C }, { 0x84A2, 0x2510 },
+	{ 0x84A3, 0x2518 }, { 0x84A4, 0x2514 }, { 0x84A5, 0x251C }, { 0x84A6, 0x252C }, { 0x84A7, 0x2524 }, { 0x84A8, 0x2534 }, { 0x84A9, 0x253C }, { 0x84AA, 0x2501 },
+	{ 0x84AB, 0x2503 }, { 0x84AC, 0x250F }, { 0x84AD, 0x2513 }, { 0x84AE, 0x251B }, { 0x84AF, 0x2517 }, { 0x84B0, 0x2523 }, { 0x84B1, 0x2533 }, { 0x84B2, 0x252B },
+	{ 0x84B3, 0x253B }, { 0x84B4, 0x254B }, { 0x84B5, 0x2520 }, { 0x84B6, 0x252F }, { 0x84B7, 0x2528 }, { 0x84B8, 0x2537 }, { 0x84B9, 0x253F }, { 0x84BA, 0x251D },
+	{ 0x84BB, 0x2530 }, { 0x84BC, 0x2525 }, { 0x84BD, 0x2538 }, { 0x84BE, 0x2542 }, { 0x8540, 0x2460 }, { 0x8541, 0x2461 }, { 0x8542, 0x2462 }, { 0x8543, 0x2463 },
+	{ 0x8544, 0x2464 }, { 0x8545, 0x2465 }, { 0x8546, 0x2466 }, { 0x8547, 0x2467 }, { 0x8548, 0x2468 }, { 0x8549, 0x2469 }, { 0x854A, 0x246A }, { 0x854B, 0x246B },
+	{ 0x854C, 0x246C }, { 0x854D, 0x246D }, { 0x854E, 0x246E }, { 0x854F, 0x246F }, { 0x8550, 0x2470 }, { 0x8551, 0x2471 }, { 0x8552, 0x2472 }, { 0x8553, 0x2473 },
+	{ 0x855E, 0x2474 }, { 0x855F, 0x2475 }, { 0x8560, 0x2476 }, { 0x8561, 0x2477 }, { 0x8562, 0x2478 }, { 0x8563, 0x2479 }, { 0x8564, 0x247A }, { 0x8565, 0x247B },
+	{ 0x8566, 0x247C }, { 0x8567, 0x247D }, { 0x8568, 0x247E }, { 0x8569, 0x247F }, { 0x856A, 0x2480 }, { 0x856B, 0x2481 }, { 0x856C, 0x2482 }, { 0x856D, 0x2483 },
+	{ 0x856E, 0x2484 }, { 0x856F, 0x2485 }, { 0x8570, 0x2486 }, { 0x8571, 0x2487 }, { 0x857C, 0x2776 }, { 0x857D, 0x2777 }, { 0x857E, 0x2778 }, { 0x8580, 0x2779 },
+	{ 0x8581, 0x277A }, { 0x8582, 0x277B }, { 0x8583, 0x277C }, { 0x8584, 0x277D }, { 0x8585, 0x277E }, { 0x8592, 0x2488 }, { 0x8593, 0x2489 }, { 0x8594, 0x248A },
+	{ 0x8595, 0x248B }, { 0x8596, 0x248C }, { 0x8597, 0x248D }, { 0x8598, 0x248E }, { 0x8599, 0x248F }, { 0x859A, 0x2490 }, { 0x859F, 0x2160 }, { 0x85A0, 0x2161 },
+	{ 0x85A1, 0x2162 }, { 0x85A2, 0x2163 }, { 0x85A3, 0x2164 }, { 0x85A4, 0x2165 }, { 0x85A5, 0x2166 }, { 0x85A6, 0x2167 }, { 0x85A7, 0x2168 }, { 0x85A8, 0x2169 },
+	{ 0x85A9, 0x216A }, { 0x85AA, 0x216B }, { 0x85B3, 0x2170 }, { 0x85B4, 0x2171 }, { 0x85B5, 0x2172 }, { 0x85B6, 0x2173 }, { 0x85B7, 0x2174 }, { 0x85B8, 0x2175 },
+	{ 0x85B9, 0x2176 }, { 0x85BA, 0x2177 }, { 0x85BB, 0x2178 }, { 0x85BC, 0x2179 }, { 0x85BD, 0x217A }, { 0x85BE, 0x217B }, { 0x85DB, 0x249C }, { 0x85DC, 0x249D },
+	{ 0x85DD, 0x249E }, { 0x85DE, 0x249F }, { 0x85DF, 0x24A0 }, { 0x85E0, 0x24A1 }, { 0x85E1, 0x24A2 }, { 0x85E2, 0x24A3 }, { 0x85E3, 0x24A4 }, { 0x85E4, 0x24A5 },
+	{ 0x85E5, 0x24A6 }, { 0x85E6, 0x24A7 }, { 0x85E7, 0x24A8 }, { 0x85E8, 0x24A9 }, { 0x85E9, 0x24AA }, { 0x85EA, 0x24AB }, { 0x85EB, 0x24AC }, { 0x85EC, 0x24AD },
+	{ 0x85ED, 0x24AE }, { 0x85EE, 0x24AF }, { 0x85EF, 0x24B0 }, { 0x85F0, 0x24B1 }, { 0x85F1, 0x24B2 }, { 0x85F2, 0x24B3 }, { 0x85F3, 0x24B4 }, { 0x85F4, 0x24B5 },
+	{ 0x8640, 0x339C }, { 0x8641, 0x339F }, { 0x8642, 0x339D }, { 0x8643, 0x33A0 }, { 0x8644, 0x33A4 }, { 0x8646, 0x33A1 }, { 0x8647, 0x33A5 }, { 0x8648, 0x339E },
+	{ 0x8649, 0x33A2 }, { 0x864A, 0x338E }, { 0x864C, 0x338F }, { 0x864D, 0x33C4 }, { 0x864E, 0x3396 }, { 0x864F, 0x3397 }, { 0x8650, 0x2113 }, { 0x8651, 0x3398 },
+	{ 0x8652, 0x33B3 }, { 0x8653, 0x33B2 }, { 0x8654, 0x33B1 }, { 0x8655, 0x33B0 }, { 0x8656, 0x2109 }, { 0x8657, 0x33D4 }, { 0x8658, 0x33CB }, { 0x8659, 0x3390 },
+	{ 0x865A, 0x3385 }, { 0x865B, 0x3386 }, { 0x865C, 0x3387 }, { 0x869B, 0x2116 }, { 0x869C, 0x33CD }, { 0x869D, 0x2121 }, { 0x869F, 0x2664 }, { 0x86A0, 0x2667 },
+	{ 0x86A1, 0x2661 }, { 0x86A2, 0x2662 }, { 0x86A3, 0x2660 }, { 0x86A4, 0x2663 }, { 0x86A5, 0x2665 }, { 0x86A6, 0x2666 }, { 0x86B3, 0x3020 }, { 0x86B4, 0x260E },
+	{ 0x86B5, 0x3004 }, { 0x86C7, 0x261E }, { 0x86C8, 0x261C }, { 0x86C9, 0x261D }, { 0x86CA, 0x261F }, { 0x86CB, 0x21C6 }, { 0x86CC, 0x21C4 }, { 0x86CD, 0x21C5 },
+	{ 0x86CF, 0x21E8 }, { 0x86D0, 0x21E6 }, { 0x86D1, 0x21E7 }, { 0x86D2, 0x21E9 }, { 0x8740, 0x3230 }, { 0x8741, 0x322A }, { 0x8742, 0x322B }, { 0x8743, 0x322C },
+	{ 0x8744, 0x322D }, { 0x8745, 0x322E }, { 0x8746, 0x322F }, { 0x8747, 0x3240 }, { 0x8748, 0x3237 }, { 0x8749, 0x3242 }, { 0x874A, 0x3243 }, { 0x874B, 0x3239 },
+	{ 0x874C, 0x323A }, { 0x874D, 0x3231 }, { 0x874E, 0x323E }, { 0x874F, 0x3234 }, { 0x8750, 0x3232 }, { 0x8751, 0x323B }, { 0x8752, 0x3236 }, { 0x8753, 0x3233 },
+	{ 0x8754, 0x3235 }, { 0x8755, 0x323C }, { 0x8756, 0x323D }, { 0x8757, 0x323F }, { 0x8758, 0x3238 }, { 0x8793, 0x32A4 }, { 0x8794, 0x32A5 }, { 0x8795, 0x32A6 },
+	{ 0x8796, 0x32A7 }, { 0x8797, 0x32A8 }, { 0x8798, 0x32A9 }, { 0x8799, 0x3296 }, { 0x879A, 0x329D }, { 0x879B, 0x3298 }, { 0x879C, 0x329E }, { 0x879E, 0x3299 },
+	{ 0x879F, 0x3349 }, { 0x87A0, 0x3322 }, { 0x87A1, 0x334D }, { 0x87A2, 0x3314 }, { 0x87A3, 0x3316 }, { 0x87A4, 0x3305 }, { 0x87A5, 0x3333 }, { 0x87A6, 0x334E },
+	{ 0x87A7, 0x3303 }, { 0x87A8, 0x3336 }, { 0x87A9, 0x3318 }, { 0x87AA, 0x3315 }, { 0x87AB, 0x3327 }, { 0x87AC, 0x3351 }, { 0x87AD, 0x334A }, { 0x87AE, 0x3339 },
+	{ 0x87AF, 0x3357 }, { 0x87B0, 0x330D }, { 0x87B1, 0x3342 }, { 0x87B2, 0x3323 }, { 0x87B3, 0x3326 }, { 0x87B4, 0x333B }, { 0x87B5, 0x332B }, { 0x87BD, 0x3300 },
+	{ 0x87BE, 0x331E }, { 0x87BF, 0x332A }, { 0x87C0, 0x3331 }, { 0x87C1, 0x3347 }, { 0x87E5, 0x337E }, { 0x87E6, 0x337D }, { 0x87E7, 0x337C }, { 0x87E8, 0x337B },
+	{ 0x87FA, 0x337F }, { 0x8840, 0x222E }, { 0x8841, 0x221F }, { 0x8842, 0x22BF }, { 0x8854, 0x301D }, { 0x8855, 0x301F }, { 0x8868, 0x3094 }, { 0x886A, 0x30F7 },
+	{ 0x886B, 0x30F8 }, { 0x886C, 0x30F9 }, { 0x886D, 0x30FA }, { 0x889F, 0x4E9C }, { 0x88A0, 0x5516 }, { 0x88A1, 0x5A03 }, { 0x88A2, 0x963F }, { 0x88A3, 0x54C0 },
+	{ 0x88A4, 0x611B }, { 0x88A5, 0x6328 }, { 0x88A6, 0x59F6 }, { 0x88A7, 0x9022 }, { 0x88A8, 0x8475 }, { 0x88A9, 0x831C }, { 0x88AA, 0x7A50 }, { 0x88AB, 0x60AA },
+	{ 0x88AC, 0x63E1 }, { 0x88AD, 0x6E25 }, { 0x88AE, 0x65ED }, { 0x88AF, 0x8466 }, { 0x88B0, 0x82A6 }, { 0x88B1, 0x9BF5 }, { 0x88B2, 0x6893 }, { 0x88B3, 0x5727 },
+	{ 0x88B4, 0x65A1 }, { 0x88B5, 0x6271 }, { 0x88B6, 0x5B9B }, { 0x88B7, 0x59D0 }, { 0x88B8, 0x867B }, { 0x88B9, 0x98F4 }, { 0x88BA, 0x7D62 }, { 0x88BB, 0x7DBE },
+	{ 0x88BC, 0x9B8E }, { 0x88BD, 0x6216 }, { 0x88BE, 0x7C9F }, { 0x88BF, 0x88B7 }, { 0x88C0, 0x5B89 }, { 0x88C1, 0x5EB5 }, { 0x88C2, 0x6309 }, { 0x88C3, 0x6697 },
+	{ 0x88C4, 0x6848 }, { 0x88C5, 0x95C7 }, { 0x88C6, 0x978D }, { 0x88C7, 0x674F }, { 0x88C8, 0x4EE5 }, { 0x88C9, 0x4F0A }, { 0x88CA, 0x4F4D }, { 0x88CB, 0x4F9D },
+	{ 0x88CC, 0x5049 }, { 0x88CD, 0x56F2 }, { 0x88CE, 0x5937 }, { 0x88CF, 0x59D4 }, { 0x88D0, 0x5A01 }, { 0x88D1, 0x5C09 }, { 0x88D2, 0x60DF }, { 0x88D3, 0x610F },
+	{ 0x88D4, 0x6170 }, { 0x88D5, 0x6613 }, { 0x88D6, 0x6905 }, { 0x88D7, 0x70BA }, { 0x88D8, 0x754F }, { 0x88D9, 0x7570 }, { 0x88DA, 0x79FB }, { 0x88DB, 0x7DAD },
+	{ 0x88DC, 0x7DEF }, { 0x88DD, 0x80C3 }, { 0x88DE, 0x840E }, { 0x88DF, 0x8863 }, { 0x88E0, 0x8B02 }, { 0x88E1, 0x9055 }, { 0x88E2, 0x907A }, { 0x88E3, 0x533B },
+	{ 0x88E4, 0x4E95 }, { 0x88E5, 0x4EA5 }, { 0x88E6, 0x57DF }, { 0x88E7, 0x80B2 }, { 0x88E8, 0x90C1 }, { 0x88E9, 0x78EF }, { 0x88EA, 0x4E00 }, { 0x88EB, 0x58F1 },
+	{ 0x88EC, 0x6EA2 }, { 0x88ED, 0x9038 }, { 0x88EE, 0x7A32 }, { 0x88EF, 0x8328 }, { 0x88F0, 0x828B }, { 0x88F1, 0x9C2F }, { 0x88F2, 0x5141 }, { 0x88F3, 0x5370 },
+	{ 0x88F4, 0x54BD }, { 0x88F5, 0x54E1 }, { 0x88F6, 0x56E0 }, { 0x88F7, 0x59FB }, { 0x88F8, 0x5F15 }, { 0x88F9, 0x98F2 }, { 0x88FA, 0x6DEB }, { 0x88FB, 0x80E4 },
+	{ 0x88FC, 0x852D }, { 0x8940, 0x9662 }, { 0x8941, 0x9670 }, { 0x8942, 0x96A0 }, { 0x8943, 0x97FB }, { 0x8944, 0x540B }, { 0x8945, 0x53F3 }, { 0x8946, 0x5B87 },
+	{ 0x8947, 0x70CF }, { 0x8948, 0x7FBD }, { 0x8949, 0x8FC2 }, { 0x894A, 0x96E8 }, { 0x894B, 0x536F }, { 0x894C, 0x9D5C }, { 0x894D, 0x7ABA }, { 0x894E, 0x4E11 },
+	{ 0x894F, 0x7893 }, { 0x8950, 0x81FC }, { 0x8951, 0x6E26 }, { 0x8952, 0x5618 }, { 0x8953, 0x5504 }, { 0x8954, 0x6B1D }, { 0x8955, 0x851A }, { 0x8956, 0x9C3B },
+	{ 0x8957, 0x59E5 }, { 0x8958, 0x53A9 }, { 0x8959, 0x6D66 }, { 0x895A, 0x74DC }, { 0x895B, 0x958F }, { 0x895C, 0x5642 }, { 0x895D, 0x4E91 }, { 0x895E, 0x904B },
+	{ 0x895F, 0x96F2 }, { 0x8960, 0x834F }, { 0x8961, 0x990C }, { 0x8962, 0x53E1 }, { 0x8963, 0x55B6 }, { 0x8964, 0x5B30 }, { 0x8965, 0x5F71 }, { 0x8966, 0x6620 },
+	{ 0x8967, 0x66F3 }, { 0x8968, 0x6804 }, { 0x8969, 0x6C38 }, { 0x896A, 0x6CF3 }, { 0x896B, 0x6D29 }, { 0x896C, 0x745B }, { 0x896D, 0x76C8 }, { 0x896E, 0x7A4E },
+	{ 0x896F, 0x9834 }, { 0x8970, 0x82F1 }, { 0x8971, 0x885B }, { 0x8972, 0x8A60 }, { 0x8973, 0x92ED }, { 0x8974, 0x6DB2 }, { 0x8975, 0x75AB }, { 0x8976, 0x76CA },
+	{ 0x8977, 0x99C5 }, { 0x8978, 0x60A6 }, { 0x8979, 0x8B01 }, { 0x897A, 0x8D8A }, { 0x897B, 0x95B2 }, { 0x897C, 0x698E }, { 0x897D, 0x53AD }, { 0x897E, 0x5186 },
+	{ 0x8980, 0x5712 }, { 0x8981, 0x5830 }, { 0x8982, 0x5944 }, { 0x8983, 0x5BB4 }, { 0x8984, 0x5EF6 }, { 0x8985, 0x6028 }, { 0x8986, 0x63A9 }, { 0x8987, 0x63F4 },
+	{ 0x8988, 0x6CBF }, { 0x8989, 0x6F14 }, { 0x898A, 0x708E }, { 0x898B, 0x7114 }, { 0x898C, 0x7159 }, { 0x898D, 0x71D5 }, { 0x898E, 0x733F }, { 0x898F, 0x7E01 },
+	{ 0x8990, 0x8276 }, { 0x8991, 0x82D1 }, { 0x8992, 0x8597 }, { 0x8993, 0x9060 }, { 0x8994, 0x925B }, { 0x8995, 0x9D1B }, { 0x8996, 0x5869 }, { 0x8997, 0x65BC },
+	{ 0x8998, 0x6C5A }, { 0x8999, 0x7525 }, { 0x899A, 0x51F9 }, { 0x899B, 0x592E }, { 0x899C, 0x5965 }, { 0x899D, 0x5F80 }, { 0x899E, 0x5FDC }, { 0x899F, 0x62BC },
+	{ 0x89A0, 0x65FA }, { 0x89A1, 0x6A2A }, { 0x89A2, 0x6B27 }, { 0x89A3, 0x6BB4 }, { 0x89A4, 0x738B }, { 0x89A5, 0x7FC1 }, { 0x89A6, 0x8956 }, { 0x89A7, 0x9D2C },
+	{ 0x89A8, 0x9D0E }, { 0x89A9, 0x9EC4 }, { 0x89AA, 0x5CA1 }, { 0x89AB, 0x6C96 }, { 0x89AC, 0x837B }, { 0x89AD, 0x5104 }, { 0x89AE, 0x5C4B }, { 0x89AF, 0x61B6 },
+	{ 0x89B0, 0x81C6 }, { 0x89B1, 0x6876 }, { 0x89B2, 0x7261 }, { 0x89B3, 0x4E59 }, { 0x89B4, 0x4FFA }, { 0x89B5, 0x5378 }, { 0x89B6, 0x6069 }, { 0x89B7, 0x6E29 },
+	{ 0x89B8, 0x7A4F }, { 0x89B9, 0x97F3 }, { 0x89BA, 0x4E0B }, { 0x89BB, 0x5316 }, { 0x89BC, 0x4EEE }, { 0x89BD, 0x4F55 }, { 0x89BE, 0x4F3D }, { 0x89BF, 0x4FA1 },
+	{ 0x89C0, 0x4F73 }, { 0x89C1, 0x52A0 }, { 0x89C2, 0x53EF }, { 0x89C3, 0x5609 }, { 0x89C4, 0x590F }, { 0x89C5, 0x5AC1 }, { 0x89C6, 0x5BB6 }, { 0x89C7, 0x5BE1 },
+	{ 0x89C8, 0x79D1 }, { 0x89C9, 0x6687 }, { 0x89CA, 0x679C }, { 0x89CB, 0x67B6 }, { 0x89CC, 0x6B4C }, { 0x89CD, 0x6CB3 }, { 0x89CE, 0x706B }, { 0x89CF, 0x73C2 },
+	{ 0x89D0, 0x798D }, { 0x89D1, 0x79BE }, { 0x89D2, 0x7A3C }, { 0x89D3, 0x7B87 }, { 0x89D4, 0x82B1 }, { 0x89D5, 0x82DB }, { 0x89D6, 0x8304 }, { 0x89D7, 0x8377 },
+	{ 0x89D8, 0x83EF }, { 0x89D9, 0x83D3 }, { 0x89DA, 0x8766 }, { 0x89DB, 0x8AB2 }, { 0x89DC, 0x5629 }, { 0x89DD, 0x8CA8 }, { 0x89DE, 0x8FE6 }, { 0x89DF, 0x904E },
+	{ 0x89E0, 0x971E }, { 0x89E1, 0x868A }, { 0x89E2, 0x4FC4 }, { 0x89E3, 0x5CE8 }, { 0x89E4, 0x6211 }, { 0x89E5, 0x7259 }, { 0x89E6, 0x753B }, { 0x89E7, 0x81E5 },
+	{ 0x89E8, 0x82BD }, { 0x89E9, 0x86FE }, { 0x89EA, 0x8CC0 }, { 0x89EB, 0x96C5 }, { 0x89EC, 0x9913 }, { 0x89ED, 0x99D5 }, { 0x89EE, 0x4ECB }, { 0x89EF, 0x4F1A },
+	{ 0x89F0, 0x89E3 }, { 0x89F1, 0x56DE }, { 0x89F2, 0x584A }, { 0x89F3, 0x58CA }, { 0x89F4, 0x5EFB }, { 0x89F5, 0x5FEB }, { 0x89F6, 0x602A }, { 0x89F7, 0x6094 },
+	{ 0x89F8, 0x6062 }, { 0x89F9, 0x61D0 }, { 0x89FA, 0x6212 }, { 0x89FB, 0x62D0 }, { 0x89FC, 0x6539 }, { 0x8A40, 0x9B41 }, { 0x8A41, 0x6666 }, { 0x8A42, 0x68B0 },
+	{ 0x8A43, 0x6D77 }, { 0x8A44, 0x7070 }, { 0x8A45, 0x754C }, { 0x8A46, 0x7686 }, { 0x8A47, 0x7D75 }, { 0x8A48, 0x82A5 }, { 0x8A49, 0x87F9 }, { 0x8A4A, 0x958B },
+	{ 0x8A4B, 0x968E }, { 0x8A4C, 0x8C9D }, { 0x8A4D, 0x51F1 }, { 0x8A4E, 0x52BE }, { 0x8A4F, 0x5916 }, { 0x8A50, 0x54B3 }, { 0x8A51, 0x5BB3 }, { 0x8A52, 0x5D16 },
+	{ 0x8A53, 0x6168 }, { 0x8A54, 0x6982 }, { 0x8A55, 0x6DAF }, { 0x8A56, 0x788D }, { 0x8A57, 0x84CB }, { 0x8A58, 0x8857 }, { 0x8A59, 0x8A72 }, { 0x8A5A, 0x93A7 },
+	{ 0x8A5B, 0x9AB8 }, { 0x8A5C, 0x6D6C }, { 0x8A5D, 0x99A8 }, { 0x8A5E, 0x86D9 }, { 0x8A5F, 0x57A3 }, { 0x8A60, 0x67FF }, { 0x8A61, 0x86CE }, { 0x8A62, 0x920E },
+	{ 0x8A63, 0x5283 }, { 0x8A64, 0x5687 }, { 0x8A65, 0x5404 }, { 0x8A66, 0x5ED3 }, { 0x8A67, 0x62E1 }, { 0x8A68, 0x64B9 }, { 0x8A69, 0x683C }, { 0x8A6A, 0x6838 },
+	{ 0x8A6B, 0x6BBB }, { 0x8A6C, 0x7372 }, { 0x8A6D, 0x78BA }, { 0x8A6E, 0x7A6B }, { 0x8A6F, 0x899A }, { 0x8A70, 0x89D2 }, { 0x8A71, 0x8D6B }, { 0x8A72, 0x8F03 },
+	{ 0x8A73, 0x90ED }, { 0x8A74, 0x95A3 }, { 0x8A75, 0x9694 }, { 0x8A76, 0x9769 }, { 0x8A77, 0x5B66 }, { 0x8A78, 0x5CB3 }, { 0x8A79, 0x697D }, { 0x8A7A, 0x984D },
+	{ 0x8A7B, 0x984E }, { 0x8A7C, 0x639B }, { 0x8A7D, 0x7B20 }, { 0x8A7E, 0x6A2B }, { 0x8A80, 0x6A7F }, { 0x8A81, 0x68B6 }, { 0x8A82, 0x9C0D }, { 0x8A83, 0x6F5F },
+	{ 0x8A84, 0x5272 }, { 0x8A85, 0x559D }, { 0x8A86, 0x6070 }, { 0x8A87, 0x62EC }, { 0x8A88, 0x6D3B }, { 0x8A89, 0x6E07 }, { 0x8A8A, 0x6ED1 }, { 0x8A8B, 0x845B },
+	{ 0x8A8C, 0x8910 }, { 0x8A8D, 0x8F44 }, { 0x8A8E, 0x4E14 }, { 0x8A8F, 0x9C39 }, { 0x8A90, 0x53F6 }, { 0x8A91, 0x691B }, { 0x8A92, 0x6A3A }, { 0x8A93, 0x9784 },
+	{ 0x8A94, 0x682A }, { 0x8A95, 0x515C }, { 0x8A96, 0x7AC3 }, { 0x8A97, 0x84B2 }, { 0x8A98, 0x91DC }, { 0x8A99, 0x938C }, { 0x8A9A, 0x565B }, { 0x8A9B, 0x9D28 },
+	{ 0x8A9C, 0x6822 }, { 0x8A9D, 0x8305 }, { 0x8A9E, 0x8431 }, { 0x8A9F, 0x7CA5 }, { 0x8AA0, 0x5208 }, { 0x8AA1, 0x82C5 }, { 0x8AA2, 0x74E6 }, { 0x8AA3, 0x4E7E },
+	{ 0x8AA4, 0x4F83 }, { 0x8AA5, 0x51A0 }, { 0x8AA6, 0x5BD2 }, { 0x8AA7, 0x520A }, { 0x8AA8, 0x52D8 }, { 0x8AA9, 0x52E7 }, { 0x8AAA, 0x5DFB }, { 0x8AAB, 0x559A },
+	{ 0x8AAC, 0x582A }, { 0x8AAD, 0x59E6 }, { 0x8AAE, 0x5B8C }, { 0x8AAF, 0x5B98 }, { 0x8AB0, 0x5BDB }, { 0x8AB1, 0x5E72 }, { 0x8AB2, 0x5E79 }, { 0x8AB3, 0x60A3 },
+	{ 0x8AB4, 0x611F }, { 0x8AB5, 0x6163 }, { 0x8AB6, 0x61BE }, { 0x8AB7, 0x63DB }, { 0x8AB8, 0x6562 }, { 0x8AB9, 0x67D1 }, { 0x8ABA, 0x6853 }, { 0x8ABB, 0x68FA },
+	{ 0x8ABC, 0x6B3E }, { 0x8ABD, 0x6B53 }, { 0x8ABE, 0x6C57 }, { 0x8ABF, 0x6F22 }, { 0x8AC0, 0x6F97 }, { 0x8AC1, 0x6F45 }, { 0x8AC2, 0x74B0 }, { 0x8AC3, 0x7518 },
+	{ 0x8AC4, 0x76E3 }, { 0x8AC5, 0x770B }, { 0x8AC6, 0x7AFF }, { 0x8AC7, 0x7BA1 }, { 0x8AC8, 0x7C21 }, { 0x8AC9, 0x7DE9 }, { 0x8ACA, 0x7F36 }, { 0x8ACB, 0x7FF0 },
+	{ 0x8ACC, 0x809D }, { 0x8ACD, 0x8266 }, { 0x8ACE, 0x839E }, { 0x8ACF, 0x89B3 }, { 0x8AD0, 0x8ACC }, { 0x8AD1, 0x8CAB }, { 0x8AD2, 0x9084 }, { 0x8AD3, 0x9451 },
+	{ 0x8AD4, 0x9593 }, { 0x8AD5, 0x9591 }, { 0x8AD6, 0x95A2 }, { 0x8AD7, 0x9665 }, { 0x8AD8, 0x97D3 }, { 0x8AD9, 0x9928 }, { 0x8ADA, 0x8218 }, { 0x8ADB, 0x4E38 },
+	{ 0x8ADC, 0x542B }, { 0x8ADD, 0x5CB8 }, { 0x8ADE, 0x5DCC }, { 0x8ADF, 0x73A9 }, { 0x8AE0, 0x764C }, { 0x8AE1, 0x773C }, { 0x8AE2, 0x5CA9 }, { 0x8AE3, 0x7FEB },
+	{ 0x8AE4, 0x8D0B }, { 0x8AE5, 0x96C1 }, { 0x8AE6, 0x9811 }, { 0x8AE7, 0x9854 }, { 0x8AE8, 0x9858 }, { 0x8AE9, 0x4F01 }, { 0x8AEA, 0x4F0E }, { 0x8AEB, 0x5371 },
+	{ 0x8AEC, 0x559C }, { 0x8AED, 0x5668 }, { 0x8AEE, 0x57FA }, { 0x8AEF, 0x5947 }, { 0x8AF0, 0x5B09 }, { 0x8AF1, 0x5BC4 }, { 0x8AF2, 0x5C90 }, { 0x8AF3, 0x5E0C },
+	{ 0x8AF4, 0x5E7E }, { 0x8AF5, 0x5FCC }, { 0x8AF6, 0x63EE }, { 0x8AF7, 0x673A }, { 0x8AF8, 0x65D7 }, { 0x8AF9, 0x65E2 }, { 0x8AFA, 0x671F }, { 0x8AFB, 0x68CB },
+	{ 0x8AFC, 0x68C4 }, { 0x8B40, 0x6A5F }, { 0x8B41, 0x5E30 }, { 0x8B42, 0x6BC5 }, { 0x8B43, 0x6C17 }, { 0x8B44, 0x6C7D }, { 0x8B45, 0x757F }, { 0x8B46, 0x7948 },
+	{ 0x8B47, 0x5B63 }, { 0x8B48, 0x7A00 }, { 0x8B49, 0x7D00 }, { 0x8B4A, 0x5FBD }, { 0x8B4B, 0x898F }, { 0x8B4C, 0x8A18 }, { 0x8B4D, 0x8CB4 }, { 0x8B4E, 0x8D77 },
+	{ 0x8B4F, 0x8ECC }, { 0x8B50, 0x8F1D }, { 0x8B51, 0x98E2 }, { 0x8B52, 0x9A0E }, { 0x8B53, 0x9B3C }, { 0x8B54, 0x4E80 }, { 0x8B55, 0x507D }, { 0x8B56, 0x5100 },
+	{ 0x8B57, 0x5993 }, { 0x8B58, 0x5B9C }, { 0x8B59, 0x622F }, { 0x8B5A, 0x6280 }, { 0x8B5B, 0x64EC }, { 0x8B5C, 0x6B3A }, { 0x8B5D, 0x72A0 }, { 0x8B5E, 0x7591 },
+	{ 0x8B5F, 0x7947 }, { 0x8B60, 0x7FA9 }, { 0x8B61, 0x87FB }, { 0x8B62, 0x8ABC }, { 0x8B63, 0x8B70 }, { 0x8B64, 0x63AC }, { 0x8B65, 0x83CA }, { 0x8B66, 0x97A0 },
+	{ 0x8B67, 0x5409 }, { 0x8B68, 0x5403 }, { 0x8B69, 0x55AB }, { 0x8B6A, 0x6854 }, { 0x8B6B, 0x6A58 }, { 0x8B6C, 0x8A70 }, { 0x8B6D, 0x7827 }, { 0x8B6E, 0x6775 },
+	{ 0x8B6F, 0x9ECD }, { 0x8B70, 0x5374 }, { 0x8B71, 0x5BA2 }, { 0x8B72, 0x811A }, { 0x8B73, 0x8650 }, { 0x8B74, 0x9006 }, { 0x8B75, 0x4E18 }, { 0x8B76, 0x4E45 },
+	{ 0x8B77, 0x4EC7 }, { 0x8B78, 0x4F11 }, { 0x8B79, 0x53CA }, { 0x8B7A, 0x5438 }, { 0x8B7B, 0x5BAE }, { 0x8B7C, 0x5F13 }, { 0x8B7D, 0x6025 }, { 0x8B7E, 0x6551 },
+	{ 0x8B80, 0x673D }, { 0x8B81, 0x6C42 }, { 0x8B82, 0x6C72 }, { 0x8B83, 0x6CE3 }, { 0x8B84, 0x7078 }, { 0x8B85, 0x7403 }, { 0x8B86, 0x7A76 }, { 0x8B87, 0x7AAE },
+	{ 0x8B88, 0x7B08 }, { 0x8B89, 0x7D1A }, { 0x8B8A, 0x7CFE }, { 0x8B8B, 0x7D66 }, { 0x8B8C, 0x65E7 }, { 0x8B8D, 0x725B }, { 0x8B8E, 0x53BB }, { 0x8B8F, 0x5C45 },
+	{ 0x8B90, 0x5DE8 }, { 0x8B91, 0x62D2 }, { 0x8B92, 0x62E0 }, { 0x8B93, 0x6319 }, { 0x8B94, 0x6E20 }, { 0x8B95, 0x865A }, { 0x8B96, 0x8A31 }, { 0x8B97, 0x8DDD },
+	{ 0x8B98, 0x92F8 }, { 0x8B99, 0x6F01 }, { 0x8B9A, 0x79A6 }, { 0x8B9B, 0x9B5A }, { 0x8B9C, 0x4EA8 }, { 0x8B9D, 0x4EAB }, { 0x8B9E, 0x4EAC }, { 0x8B9F, 0x4F9B },
+	{ 0x8BA0, 0x4FA0 }, { 0x8BA1, 0x50D1 }, { 0x8BA2, 0x5147 }, { 0x8BA3, 0x7AF6 }, { 0x8BA4, 0x5171 }, { 0x8BA5, 0x51F6 }, { 0x8BA6, 0x5354 }, { 0x8BA7, 0x5321 },
+	{ 0x8BA8, 0x537F }, { 0x8BA9, 0x53EB }, { 0x8BAA, 0x55AC }, { 0x8BAB, 0x5883 }, { 0x8BAC, 0x5CE1 }, { 0x8BAD, 0x5F37 }, { 0x8BAE, 0x5F4A }, { 0x8BAF, 0x602F },
+	{ 0x8BB0, 0x6050 }, { 0x8BB1, 0x606D }, { 0x8BB2, 0x631F }, { 0x8BB3, 0x6559 }, { 0x8BB4, 0x6A4B }, { 0x8BB5, 0x6CC1 }, { 0x8BB6, 0x72C2 }, { 0x8BB7, 0x72ED },
+	{ 0x8BB8, 0x77EF }, { 0x8BB9, 0x80F8 }, { 0x8BBA, 0x8105 }, { 0x8BBB, 0x8208 }, { 0x8BBC, 0x854E }, { 0x8BBD, 0x90F7 }, { 0x8BBE, 0x93E1 }, { 0x8BBF, 0x97FF },
+	{ 0x8BC0, 0x9957 }, { 0x8BC1, 0x9A5A }, { 0x8BC2, 0x4EF0 }, { 0x8BC3, 0x51DD }, { 0x8BC4, 0x5C2D }, { 0x8BC5, 0x6681 }, { 0x8BC6, 0x696D }, { 0x8BC7, 0x5C40 },
+	{ 0x8BC8, 0x66F2 }, { 0x8BC9, 0x6975 }, { 0x8BCA, 0x7389 }, { 0x8BCB, 0x6850 }, { 0x8BCC, 0x7C81 }, { 0x8BCD, 0x50C5 }, { 0x8BCE, 0x52E4 }, { 0x8BCF, 0x5747 },
+	{ 0x8BD0, 0x5DFE }, { 0x8BD1, 0x9326 }, { 0x8BD2, 0x65A4 }, { 0x8BD3, 0x6B23 }, { 0x8BD4, 0x6B3D }, { 0x8BD5, 0x7434 }, { 0x8BD6, 0x7981 }, { 0x8BD7, 0x79BD },
+	{ 0x8BD8, 0x7B4B }, { 0x8BD9, 0x7DCA }, { 0x8BDA, 0x82B9 }, { 0x8BDB, 0x83CC }, { 0x8BDC, 0x887F }, { 0x8BDD, 0x895F }, { 0x8BDE, 0x8B39 }, { 0x8BDF, 0x8FD1 },
+	{ 0x8BE0, 0x91D1 }, { 0x8BE1, 0x541F }, { 0x8BE2, 0x9280 }, { 0x8BE3, 0x4E5D }, { 0x8BE4, 0x5036 }, { 0x8BE5, 0x53E5 }, { 0x8BE6, 0x533A }, { 0x8BE7, 0x72D7 },
+	{ 0x8BE8, 0x7396 }, { 0x8BE9, 0x77E9 }, { 0x8BEA, 0x82E6 }, { 0x8BEB, 0x8EAF }, { 0x8BEC, 0x99C6 }, { 0x8BED, 0x99C8 }, { 0x8BEE, 0x99D2 }, { 0x8BEF, 0x5177 },
+	{ 0x8BF0, 0x611A }, { 0x8BF1, 0x865E }, { 0x8BF2, 0x55B0 }, { 0x8BF3, 0x7A7A }, { 0x8BF4, 0x5076 }, { 0x8BF5, 0x5BD3 }, { 0x8BF6, 0x9047 }, { 0x8BF7, 0x9685 },
+	{ 0x8BF8, 0x4E32 }, { 0x8BF9, 0x6ADB }, { 0x8BFA, 0x91E7 }, { 0x8BFB, 0x5C51 }, { 0x8BFC, 0x5C48 }, { 0x8C40, 0x6398 }, { 0x8C41, 0x7A9F }, { 0x8C42, 0x6C93 },
+	{ 0x8C43, 0x9774 }, { 0x8C44, 0x8F61 }, { 0x8C45, 0x7AAA }, { 0x8C46, 0x718A }, { 0x8C47, 0x9688 }, { 0x8C48, 0x7C82 }, { 0x8C49, 0x6817 }, { 0x8C4A, 0x7E70 },
+	{ 0x8C4B, 0x6851 }, { 0x8C4C, 0x936C }, { 0x8C4D, 0x52F2 }, { 0x8C4E, 0x541B }, { 0x8C4F, 0x85AB }, { 0x8C50, 0x8A13 }, { 0x8C51, 0x7FA4 }, { 0x8C52, 0x8ECD },
+	{ 0x8C53, 0x90E1 }, { 0x8C54, 0x5366 }, { 0x8C55, 0x8888 }, { 0x8C56, 0x7941 }, { 0x8C57, 0x4FC2 }, { 0x8C58, 0x50BE }, { 0x8C59, 0x5211 }, { 0x8C5A, 0x5144 },
+	{ 0x8C5B, 0x5553 }, { 0x8C5C, 0x572D }, { 0x8C5D, 0x73EA }, { 0x8C5E, 0x578B }, { 0x8C5F, 0x5951 }, { 0x8C60, 0x5F62 }, { 0x8C61, 0x5F84 }, { 0x8C62, 0x6075 },
+	{ 0x8C63, 0x6176 }, { 0x8C64, 0x6167 }, { 0x8C65, 0x61A9 }, { 0x8C66, 0x63B2 }, { 0x8C67, 0x643A }, { 0x8C68, 0x656C }, { 0x8C69, 0x666F }, { 0x8C6A, 0x6842 },
+	{ 0x8C6B, 0x6E13 }, { 0x8C6C, 0x7566 }, { 0x8C6D, 0x7A3D }, { 0x8C6E, 0x7CFB }, { 0x8C6F, 0x7D4C }, { 0x8C70, 0x7D99 }, { 0x8C71, 0x7E4B }, { 0x8C72, 0x7F6B },
+	{ 0x8C73, 0x830E }, { 0x8C74, 0x834A }, { 0x8C75, 0x86CD }, { 0x8C76, 0x8A08 }, { 0x8C77, 0x8A63 }, { 0x8C78, 0x8B66 }, { 0x8C79, 0x8EFD }, { 0x8C7A, 0x981A },
+	{ 0x8C7B, 0x9D8F }, { 0x8C7C, 0x82B8 }, { 0x8C7D, 0x8FCE }, { 0x8C7E, 0x9BE8 }, { 0x8C80, 0x5287 }, { 0x8C81, 0x621F }, { 0x8C82, 0x6483 }, { 0x8C83, 0x6FC0 },
+	{ 0x8C84, 0x9699 }, { 0x8C85, 0x6841 }, { 0x8C86, 0x5091 }, { 0x8C87, 0x6B20 }, { 0x8C88, 0x6C7A }, { 0x8C89, 0x6F54 }, { 0x8C8A, 0x7A74 }, { 0x8C8B, 0x7D50 },
+	{ 0x8C8C, 0x8840 }, { 0x8C8D, 0x8A23 }, { 0x8C8E, 0x6708 }, { 0x8C8F, 0x4EF6 }, { 0x8C90, 0x5039 }, { 0x8C91, 0x5026 }, { 0x8C92, 0x5065 }, { 0x8C93, 0x517C },
+	{ 0x8C94, 0x5238 }, { 0x8C95, 0x5263 }, { 0x8C96, 0x55A7 }, { 0x8C97, 0x570F }, { 0x8C98, 0x5805 }, { 0x8C99, 0x5ACC }, { 0x8C9A, 0x5EFA }, { 0x8C9B, 0x61B2 },
+	{ 0x8C9C, 0x61F8 }, { 0x8C9D, 0x62F3 }, { 0x8C9E, 0x6372 }, { 0x8C9F, 0x691C }, { 0x8CA0, 0x6A29 }, { 0x8CA1, 0x727D }, { 0x8CA2, 0x72AC }, { 0x8CA3, 0x732E },
+	{ 0x8CA4, 0x7814 }, { 0x8CA5, 0x786F }, { 0x8CA6, 0x7D79 }, { 0x8CA7, 0x770C }, { 0x8CA8, 0x80A9 }, { 0x8CA9, 0x898B }, { 0x8CAA, 0x8B19 }, { 0x8CAB, 0x8CE2 },
+	{ 0x8CAC, 0x8ED2 }, { 0x8CAD, 0x9063 }, { 0x8CAE, 0x9375 }, { 0x8CAF, 0x967A }, { 0x8CB0, 0x9855 }, { 0x8CB1, 0x9A13 }, { 0x8CB2, 0x9E78 }, { 0x8CB3, 0x5143 },
+	{ 0x8CB4, 0x539F }, { 0x8CB5, 0x53B3 }, { 0x8CB6, 0x5E7B }, { 0x8CB7, 0x5F26 }, { 0x8CB8, 0x6E1B }, { 0x8CB9, 0x6E90 }, { 0x8CBA, 0x7384 }, { 0x8CBB, 0x73FE },
+	{ 0x8CBC, 0x7D43 }, { 0x8CBD, 0x8237 }, { 0x8CBE, 0x8A00 }, { 0x8CBF, 0x8AFA }, { 0x8CC0, 0x9650 }, { 0x8CC1, 0x4E4E }, { 0x8CC2, 0x500B }, { 0x8CC3, 0x53E4 },
+	{ 0x8CC4, 0x547C }, { 0x8CC5, 0x56FA }, { 0x8CC6, 0x59D1 }, { 0x8CC7, 0x5B64 }, { 0x8CC8, 0x5DF1 }, { 0x8CC9, 0x5EAB }, { 0x8CCA, 0x5F27 }, { 0x8CCB, 0x6238 },
+	{ 0x8CCC, 0x6545 }, { 0x8CCD, 0x67AF }, { 0x8CCE, 0x6E56 }, { 0x8CCF, 0x72D0 }, { 0x8CD0, 0x7CCA }, { 0x8CD1, 0x88B4 }, { 0x8CD2, 0x80A1 }, { 0x8CD3, 0x80E1 },
+	{ 0x8CD4, 0x83F0 }, { 0x8CD5, 0x864E }, { 0x8CD6, 0x8A87 }, { 0x8CD7, 0x8DE8 }, { 0x8CD8, 0x9237 }, { 0x8CD9, 0x96C7 }, { 0x8CDA, 0x9867 }, { 0x8CDB, 0x9F13 },
+	{ 0x8CDC, 0x4E94 }, { 0x8CDD, 0x4E92 }, { 0x8CDE, 0x4F0D }, { 0x8CDF, 0x5348 }, { 0x8CE0, 0x5449 }, { 0x8CE1, 0x543E }, { 0x8CE2, 0x5A2F }, { 0x8CE3, 0x5F8C },
+	{ 0x8CE4, 0x5FA1 }, { 0x8CE5, 0x609F }, { 0x8CE6, 0x68A7 }, { 0x8CE7, 0x6A8E }, { 0x8CE8, 0x745A }, { 0x8CE9, 0x7881 }, { 0x8CEA, 0x8A9E }, { 0x8CEB, 0x8AA4 },
+	{ 0x8CEC, 0x8B77 }, { 0x8CED, 0x9190 }, { 0x8CEE, 0x4E5E }, { 0x8CEF, 0x9BC9 }, { 0x8CF0, 0x4EA4 }, { 0x8CF1, 0x4F7C }, { 0x8CF2, 0x4FAF }, { 0x8CF3, 0x5019 },
+	{ 0x8CF4, 0x5016 }, { 0x8CF5, 0x5149 }, { 0x8CF6, 0x516C }, { 0x8CF7, 0x529F }, { 0x8CF8, 0x52B9 }, { 0x8CF9, 0x52FE }, { 0x8CFA, 0x539A }, { 0x8CFB, 0x53E3 },
+	{ 0x8CFC, 0x5411 }, { 0x8D40, 0x540E }, { 0x8D41, 0x5589 }, { 0x8D42, 0x5751 }, { 0x8D43, 0x57A2 }, { 0x8D44, 0x597D }, { 0x8D45, 0x5B54 }, { 0x8D46, 0x5B5D },
+	{ 0x8D47, 0x5B8F }, { 0x8D48, 0x5DE5 }, { 0x8D49, 0x5DE7 }, { 0x8D4A, 0x5DF7 }, { 0x8D4B, 0x5E78 }, { 0x8D4C, 0x5E83 }, { 0x8D4D, 0x5E9A }, { 0x8D4E, 0x5EB7 },
+	{ 0x8D4F, 0x5F18 }, { 0x8D50, 0x6052 }, { 0x8D51, 0x614C }, { 0x8D52, 0x6297 }, { 0x8D53, 0x62D8 }, { 0x8D54, 0x63A7 }, { 0x8D55, 0x653B }, { 0x8D56, 0x6602 },
+	{ 0x8D57, 0x6643 }, { 0x8D58, 0x66F4 }, { 0x8D59, 0x676D }, { 0x8D5A, 0x6821 }, { 0x8D5B, 0x6897 }, { 0x8D5C, 0x69CB }, { 0x8D5D, 0x6C5F }, { 0x8D5E, 0x6D2A },
+	{ 0x8D5F, 0x6D69 }, { 0x8D60, 0x6E2F }, { 0x8D61, 0x6E9D }, { 0x8D62, 0x7532 }, { 0x8D63, 0x7687 }, { 0x8D64, 0x786C }, { 0x8D65, 0x7A3F }, { 0x8D66, 0x7CE0 },
+	{ 0x8D67, 0x7D05 }, { 0x8D68, 0x7D18 }, { 0x8D69, 0x7D5E }, { 0x8D6A, 0x7DB1 }, { 0x8D6B, 0x8015 }, { 0x8D6C, 0x8003 }, { 0x8D6D, 0x80AF }, { 0x8D6E, 0x80B1 },
+	{ 0x8D6F, 0x8154 }, { 0x8D70, 0x818F }, { 0x8D71, 0x822A }, { 0x8D72, 0x8352 }, { 0x8D73, 0x884C }, { 0x8D74, 0x8861 }, { 0x8D75, 0x8B1B }, { 0x8D76, 0x8CA2 },
+	{ 0x8D77, 0x8CFC }, { 0x8D78, 0x90CA }, { 0x8D79, 0x9175 }, { 0x8D7A, 0x9271 }, { 0x8D7B, 0x783F }, { 0x8D7C, 0x92FC }, { 0x8D7D, 0x95A4 }, { 0x8D7E, 0x964D },
+	{ 0x8D80, 0x9805 }, { 0x8D81, 0x9999 }, { 0x8D82, 0x9AD8 }, { 0x8D83, 0x9D3B }, { 0x8D84, 0x525B }, { 0x8D85, 0x52AB }, { 0x8D86, 0x53F7 }, { 0x8D87, 0x5408 },
+	{ 0x8D88, 0x58D5 }, { 0x8D89, 0x62F7 }, { 0x8D8A, 0x6FE0 }, { 0x8D8B, 0x8C6A }, { 0x8D8C, 0x8F5F }, { 0x8D8D, 0x9EB9 }, { 0x8D8E, 0x514B }, { 0x8D8F, 0x523B },
+	{ 0x8D90, 0x544A }, { 0x8D91, 0x56FD }, { 0x8D92, 0x7A40 }, { 0x8D93, 0x9177 }, { 0x8D94, 0x9D60 }, { 0x8D95, 0x9ED2 }, { 0x8D96, 0x7344 }, { 0x8D97, 0x6F09 },
+	{ 0x8D98, 0x8170 }, { 0x8D99, 0x7511 }, { 0x8D9A, 0x5FFD }, { 0x8D9B, 0x60DA }, { 0x8D9C, 0x9AA8 }, { 0x8D9D, 0x72DB }, { 0x8D9E, 0x8FBC }, { 0x8D9F, 0x6B64 },
+	{ 0x8DA0, 0x9803 }, { 0x8DA1, 0x4ECA }, { 0x8DA2, 0x56F0 }, { 0x8DA3, 0x5764 }, { 0x8DA4, 0x58BE }, { 0x8DA5, 0x5A5A }, { 0x8DA6, 0x6068 }, { 0x8DA7, 0x61C7 },
+	{ 0x8DA8, 0x660F }, { 0x8DA9, 0x6606 }, { 0x8DAA, 0x6839 }, { 0x8DAB, 0x68B1 }, { 0x8DAC, 0x6DF7 }, { 0x8DAD, 0x75D5 }, { 0x8DAE, 0x7D3A }, { 0x8DAF, 0x826E },
+	{ 0x8DB0, 0x9B42 }, { 0x8DB1, 0x4E9B }, { 0x8DB2, 0x4F50 }, { 0x8DB3, 0x53C9 }, { 0x8DB4, 0x5506 }, { 0x8DB5, 0x5D6F }, { 0x8DB6, 0x5DE6 }, { 0x8DB7, 0x5DEE },
+	{ 0x8DB8, 0x67FB }, { 0x8DB9, 0x6C99 }, { 0x8DBA, 0x7473 }, { 0x8DBB, 0x7802 }, { 0x8DBC, 0x8A50 }, { 0x8DBD, 0x9396 }, { 0x8DBE, 0x88DF }, { 0x8DBF, 0x5750 },
+	{ 0x8DC0, 0x5EA7 }, { 0x8DC1, 0x632B }, { 0x8DC2, 0x50B5 }, { 0x8DC3, 0x50AC }, { 0x8DC4, 0x518D }, { 0x8DC5, 0x6700 }, { 0x8DC6, 0x54C9 }, { 0x8DC7, 0x585E },
+	{ 0x8DC8, 0x59BB }, { 0x8DC9, 0x5BB0 }, { 0x8DCA, 0x5F69 }, { 0x8DCB, 0x624D }, { 0x8DCC, 0x63A1 }, { 0x8DCD, 0x683D }, { 0x8DCE, 0x6B73 }, { 0x8DCF, 0x6E08 },
+	{ 0x8DD0, 0x707D }, { 0x8DD1, 0x91C7 }, { 0x8DD2, 0x7280 }, { 0x8DD3, 0x7815 }, { 0x8DD4, 0x7826 }, { 0x8DD5, 0x796D }, { 0x8DD6, 0x658E }, { 0x8DD7, 0x7D30 },
+	{ 0x8DD8, 0x83DC }, { 0x8DD9, 0x88C1 }, { 0x8DDA, 0x8F09 }, { 0x8DDB, 0x969B }, { 0x8DDC, 0x5264 }, { 0x8DDD, 0x5728 }, { 0x8DDE, 0x6750 }, { 0x8DDF, 0x7F6A },
+	{ 0x8DE0, 0x8CA1 }, { 0x8DE1, 0x51B4 }, { 0x8DE2, 0x5742 }, { 0x8DE3, 0x962A }, { 0x8DE4, 0x583A }, { 0x8DE5, 0x698A }, { 0x8DE6, 0x80B4 }, { 0x8DE7, 0x54B2 },
+	{ 0x8DE8, 0x5D0E }, { 0x8DE9, 0x57FC }, { 0x8DEA, 0x7895 }, { 0x8DEB, 0x9DFA }, { 0x8DEC, 0x4F5C }, { 0x8DED, 0x524A }, { 0x8DEE, 0x548B }, { 0x8DEF, 0x643E },
+	{ 0x8DF0, 0x6628 }, { 0x8DF1, 0x6714 }, { 0x8DF2, 0x67F5 }, { 0x8DF3, 0x7A84 }, { 0x8DF4, 0x7B56 }, { 0x8DF5, 0x7D22 }, { 0x8DF6, 0x932F }, { 0x8DF7, 0x685C },
+	{ 0x8DF8, 0x9BAD }, { 0x8DF9, 0x7B39 }, { 0x8DFA, 0x5319 }, { 0x8DFB, 0x518A }, { 0x8DFC, 0x5237 }, { 0x8E40, 0x5BDF }, { 0x8E41, 0x62F6 }, { 0x8E42, 0x64AE },
+	{ 0x8E43, 0x64E6 }, { 0x8E44, 0x672D }, { 0x8E45, 0x6BBA }, { 0x8E46, 0x85A9 }, { 0x8E47, 0x96D1 }, { 0x8E48, 0x7690 }, { 0x8E49, 0x9BD6 }, { 0x8E4A, 0x634C },
+	{ 0x8E4B, 0x9306 }, { 0x8E4C, 0x9BAB }, { 0x8E4D, 0x76BF }, { 0x8E4E, 0x6652 }, { 0x8E4F, 0x4E09 }, { 0x8E50, 0x5098 }, { 0x8E51, 0x53C2 }, { 0x8E52, 0x5C71 },
+	{ 0x8E53, 0x60E8 }, { 0x8E54, 0x6492 }, { 0x8E55, 0x6563 }, { 0x8E56, 0x685F }, { 0x8E57, 0x71E6 }, { 0x8E58, 0x73CA }, { 0x8E59, 0x7523 }, { 0x8E5A, 0x7B97 },
+	{ 0x8E5B, 0x7E82 }, { 0x8E5C, 0x8695 }, { 0x8E5D, 0x8B83 }, { 0x8E5E, 0x8CDB }, { 0x8E5F, 0x9178 }, { 0x8E60, 0x9910 }, { 0x8E61, 0x65AC }, { 0x8E62, 0x66AB },
+	{ 0x8E63, 0x6B8B }, { 0x8E64, 0x4ED5 }, { 0x8E65, 0x4ED4 }, { 0x8E66, 0x4F3A }, { 0x8E67, 0x4F7F }, { 0x8E68, 0x523A }, { 0x8E69, 0x53F8 }, { 0x8E6A, 0x53F2 },
+	{ 0x8E6B, 0x55E3 }, { 0x8E6C, 0x56DB }, { 0x8E6D, 0x58EB }, { 0x8E6E, 0x59CB }, { 0x8E6F, 0x59C9 }, { 0x8E70, 0x59FF }, { 0x8E71, 0x5B50 }, { 0x8E72, 0x5C4D },
+	{ 0x8E73, 0x5E02 }, { 0x8E74, 0x5E2B }, { 0x8E75, 0x5FD7 }, { 0x8E76, 0x601D }, { 0x8E77, 0x6307 }, { 0x8E78, 0x652F }, { 0x8E79, 0x5B5C }, { 0x8E7A, 0x65AF },
+	{ 0x8E7B, 0x65BD }, { 0x8E7C, 0x65E8 }, { 0x8E7D, 0x679D }, { 0x8E7E, 0x6B62 }, { 0x8E80, 0x6B7B }, { 0x8E81, 0x6C0F }, { 0x8E82, 0x7345 }, { 0x8E83, 0x7949 },
+	{ 0x8E84, 0x79C1 }, { 0x8E85, 0x7CF8 }, { 0x8E86, 0x7D19 }, { 0x8E87, 0x7D2B }, { 0x8E88, 0x80A2 }, { 0x8E89, 0x8102 }, { 0x8E8A, 0x81F3 }, { 0x8E8B, 0x8996 },
+	{ 0x8E8C, 0x8A5E }, { 0x8E8D, 0x8A69 }, { 0x8E8E, 0x8A66 }, { 0x8E8F, 0x8A8C }, { 0x8E90, 0x8AEE }, { 0x8E91, 0x8CC7 }, { 0x8E92, 0x8CDC }, { 0x8E93, 0x96CC },
+	{ 0x8E94, 0x98FC }, { 0x8E95, 0x6B6F }, { 0x8E96, 0x4E8B }, { 0x8E97, 0x4F3C }, { 0x8E98, 0x4F8D }, { 0x8E99, 0x5150 }, { 0x8E9A, 0x5B57 }, { 0x8E9B, 0x5BFA },
+	{ 0x8E9C, 0x6148 }, { 0x8E9D, 0x6301 }, { 0x8E9E, 0x6642 }, { 0x8E9F, 0x6B21 }, { 0x8EA0, 0x6ECB }, { 0x8EA1, 0x6CBB }, { 0x8EA2, 0x723E }, { 0x8EA3, 0x74BD },
+	{ 0x8EA4, 0x75D4 }, { 0x8EA5, 0x78C1 }, { 0x8EA6, 0x793A }, { 0x8EA7, 0x800C }, { 0x8EA8, 0x8033 }, { 0x8EA9, 0x81EA }, { 0x8EAA, 0x8494 }, { 0x8EAB, 0x8F9E },
+	{ 0x8EAC, 0x6C50 }, { 0x8EAD, 0x9E7F }, { 0x8EAE, 0x5F0F }, { 0x8EAF, 0x8B58 }, { 0x8EB0, 0x9D2B }, { 0x8EB1, 0x7AFA }, { 0x8EB2, 0x8EF8 }, { 0x8EB3, 0x5B8D },
+	{ 0x8EB4, 0x96EB }, { 0x8EB5, 0x4E03 }, { 0x8EB6, 0x53F1 }, { 0x8EB7, 0x57F7 }, { 0x8EB8, 0x5931 }, { 0x8EB9, 0x5AC9 }, { 0x8EBA, 0x5BA4 }, { 0x8EBB, 0x6089 },
+	{ 0x8EBC, 0x6E7F }, { 0x8EBD, 0x6F06 }, { 0x8EBE, 0x75BE }, { 0x8EBF, 0x8CEA }, { 0x8EC0, 0x5B9F }, { 0x8EC1, 0x8500 }, { 0x8EC2, 0x7BE0 }, { 0x8EC3, 0x5072 },
+	{ 0x8EC4, 0x67F4 }, { 0x8EC5, 0x829D }, { 0x8EC6, 0x5C61 }, { 0x8EC7, 0x854A }, { 0x8EC8, 0x7E1E }, { 0x8EC9, 0x820E }, { 0x8ECA, 0x5199 }, { 0x8ECB, 0x5C04 },
+	{ 0x8ECC, 0x6368 }, { 0x8ECD, 0x8D66 }, { 0x8ECE, 0x659C }, { 0x8ECF, 0x716E }, { 0x8ED0, 0x793E }, { 0x8ED1, 0x7D17 }, { 0x8ED2, 0x8005 }, { 0x8ED3, 0x8B1D },
+	{ 0x8ED4, 0x8ECA }, { 0x8ED5, 0x906E }, { 0x8ED6, 0x86C7 }, { 0x8ED7, 0x90AA }, { 0x8ED8, 0x501F }, { 0x8ED9, 0x52FA }, { 0x8EDA, 0x5C3A }, { 0x8EDB, 0x6753 },
+	{ 0x8EDC, 0x707C }, { 0x8EDD, 0x7235 }, { 0x8EDE, 0x914C }, { 0x8EDF, 0x91C8 }, { 0x8EE0, 0x932B }, { 0x8EE1, 0x82E5 }, { 0x8EE2, 0x5BC2 }, { 0x8EE3, 0x5F31 },
+	{ 0x8EE4, 0x60F9 }, { 0x8EE5, 0x4E3B }, { 0x8EE6, 0x53D6 }, { 0x8EE7, 0x5B88 }, { 0x8EE8, 0x624B }, { 0x8EE9, 0x6731 }, { 0x8EEA, 0x6B8A }, { 0x8EEB, 0x72E9 },
+	{ 0x8EEC, 0x73E0 }, { 0x8EED, 0x7A2E }, { 0x8EEE, 0x816B }, { 0x8EEF, 0x8DA3 }, { 0x8EF0, 0x9152 }, { 0x8EF1, 0x9996 }, { 0x8EF2, 0x5112 }, { 0x8EF3, 0x53D7 },
+	{ 0x8EF4, 0x546A }, { 0x8EF5, 0x5BFF }, { 0x8EF6, 0x6388 }, { 0x8EF7, 0x6A39 }, { 0x8EF8, 0x7DAC }, { 0x8EF9, 0x9700 }, { 0x8EFA, 0x56DA }, { 0x8EFB, 0x53CE },
+	{ 0x8EFC, 0x5468 }, { 0x8F40, 0x5B97 }, { 0x8F41, 0x5C31 }, { 0x8F42, 0x5DDE }, { 0x8F43, 0x4FEE }, { 0x8F44, 0x6101 }, { 0x8F45, 0x62FE }, { 0x8F46, 0x6D32 },
+	{ 0x8F47, 0x79C0 }, { 0x8F48, 0x79CB }, { 0x8F49, 0x7D42 }, { 0x8F4A, 0x7E4D }, { 0x8F4B, 0x7FD2 }, { 0x8F4C, 0x81ED }, { 0x8F4D, 0x821F }, { 0x8F4E, 0x8490 },
+	{ 0x8F4F, 0x8846 }, { 0x8F50, 0x8972 }, { 0x8F51, 0x8B90 }, { 0x8F52, 0x8E74 }, { 0x8F53, 0x8F2F }, { 0x8F54, 0x9031 }, { 0x8F55, 0x914B }, { 0x8F56, 0x916C },
+	{ 0x8F57, 0x96C6 }, { 0x8F58, 0x919C }, { 0x8F59, 0x4EC0 }, { 0x8F5A, 0x4F4F }, { 0x8F5B, 0x5145 }, { 0x8F5C, 0x5341 }, { 0x8F5D, 0x5F93 }, { 0x8F5E, 0x620E },
+	{ 0x8F5F, 0x67D4 }, { 0x8F60, 0x6C41 }, { 0x8F61, 0x6E0B }, { 0x8F62, 0x7363 }, { 0x8F63, 0x7E26 }, { 0x8F64, 0x91CD }, { 0x8F65, 0x9283 }, { 0x8F66, 0x53D4 },
+	{ 0x8F67, 0x5919 }, { 0x8F68, 0x5BBF }, { 0x8F69, 0x6DD1 }, { 0x8F6A, 0x795D }, { 0x8F6B, 0x7E2E }, { 0x8F6C, 0x7C9B }, { 0x8F6D, 0x587E }, { 0x8F6E, 0x719F },
+	{ 0x8F6F, 0x51FA }, { 0x8F70, 0x8853 }, { 0x8F71, 0x8FF0 }, { 0x8F72, 0x4FCA }, { 0x8F73, 0x5CFB }, { 0x8F74, 0x6625 }, { 0x8F75, 0x77AC }, { 0x8F76, 0x7AE3 },
+	{ 0x8F77, 0x821C }, { 0x8F78, 0x99FF }, { 0x8F79, 0x51C6 }, { 0x8F7A, 0x5FAA }, { 0x8F7B, 0x65EC }, { 0x8F7C, 0x696F }, { 0x8F7D, 0x6B89 }, { 0x8F7E, 0x6DF3 },
+	{ 0x8F80, 0x6E96 }, { 0x8F81, 0x6F64 }, { 0x8F82, 0x76FE }, { 0x8F83, 0x7D14 }, { 0x8F84, 0x5DE1 }, { 0x8F85, 0x9075 }, { 0x8F86, 0x9187 }, { 0x8F87, 0x9806 },
+	{ 0x8F88, 0x51E6 }, { 0x8F89, 0x521D }, { 0x8F8A, 0x6240 }, { 0x8F8B, 0x6691 }, { 0x8F8C, 0x66D9 }, { 0x8F8D, 0x6E1A }, { 0x8F8E, 0x5EB6 }, { 0x8F8F, 0x7DD2 },
+	{ 0x8F90, 0x7F72 }, { 0x8F91, 0x66F8 }, { 0x8F92, 0x85AF }, { 0x8F93, 0x85F7 }, { 0x8F94, 0x8AF8 }, { 0x8F95, 0x52A9 }, { 0x8F96, 0x53D9 }, { 0x8F97, 0x5973 },
+	{ 0x8F98, 0x5E8F }, { 0x8F99, 0x5F90 }, { 0x8F9A, 0x6055 }, { 0x8F9B, 0x92E4 }, { 0x8F9C, 0x9664 }, { 0x8F9D, 0x50B7 }, { 0x8F9E, 0x511F }, { 0x8F9F, 0x52DD },
+	{ 0x8FA0, 0x5320 }, { 0x8FA1, 0x5347 }, { 0x8FA2, 0x53EC }, { 0x8FA3, 0x54E8 }, { 0x8FA4, 0x5546 }, { 0x8FA5, 0x5531 }, { 0x8FA6, 0x5617 }, { 0x8FA7, 0x5968 },
+	{ 0x8FA8, 0x59BE }, { 0x8FA9, 0x5A3C }, { 0x8FAA, 0x5BB5 }, { 0x8FAB, 0x5C06 }, { 0x8FAC, 0x5C0F }, { 0x8FAD, 0x5C11 }, { 0x8FAE, 0x5C1A }, { 0x8FAF, 0x5E84 },
+	{ 0x8FB0, 0x5E8A }, { 0x8FB1, 0x5EE0 }, { 0x8FB2, 0x5F70 }, { 0x8FB3, 0x627F }, { 0x8FB4, 0x6284 }, { 0x8FB5, 0x62DB }, { 0x8FB6, 0x638C }, { 0x8FB7, 0x6377 },
+	{ 0x8FB8, 0x6607 }, { 0x8FB9, 0x660C }, { 0x8FBA, 0x662D }, { 0x8FBB, 0x6676 }, { 0x8FBC, 0x677E }, { 0x8FBD, 0x68A2 }, { 0x8FBE, 0x6A1F }, { 0x8FBF, 0x6A35 },
+	{ 0x8FC0, 0x6CBC }, { 0x8FC1, 0x6D88 }, { 0x8FC2, 0x6E09 }, { 0x8FC3, 0x6E58 }, { 0x8FC4, 0x713C }, { 0x8FC5, 0x7126 }, { 0x8FC6, 0x7167 }, { 0x8FC7, 0x75C7 },
+	{ 0x8FC8, 0x7701 }, { 0x8FC9, 0x785D }, { 0x8FCA, 0x7901 }, { 0x8FCB, 0x7965 }, { 0x8FCC, 0x79F0 }, { 0x8FCD, 0x7AE0 }, { 0x8FCE, 0x7B11 }, { 0x8FCF, 0x7CA7 },
+	{ 0x8FD0, 0x7D39 }, { 0x8FD1, 0x8096 }, { 0x8FD2, 0x83D6 }, { 0x8FD3, 0x848B }, { 0x8FD4, 0x8549 }, { 0x8FD5, 0x885D }, { 0x8FD6, 0x88F3 }, { 0x8FD7, 0x8A1F },
+	{ 0x8FD8, 0x8A3C }, { 0x8FD9, 0x8A54 }, { 0x8FDA, 0x8A73 }, { 0x8FDB, 0x8C61 }, { 0x8FDC, 0x8CDE }, { 0x8FDD, 0x91A4 }, { 0x8FDE, 0x9266 }, { 0x8FDF, 0x937E },
+	{ 0x8FE0, 0x9418 }, { 0x8FE1, 0x969C }, { 0x8FE2, 0x9798 }, { 0x8FE3, 0x4E0A }, { 0x8FE4, 0x4E08 }, { 0x8FE5, 0x4E1E }, { 0x8FE6, 0x4E57 }, { 0x8FE7, 0x5197 },
+	{ 0x8FE8, 0x5270 }, { 0x8FE9, 0x57CE }, { 0x8FEA, 0x5834 }, { 0x8FEB, 0x58CC }, { 0x8FEC, 0x5B22 }, { 0x8FED, 0x5E38 }, { 0x8FEE, 0x60C5 }, { 0x8FEF, 0x64FE },
+	{ 0x8FF0, 0x6761 }, { 0x8FF1, 0x6756 }, { 0x8FF2, 0x6D44 }, { 0x8FF3, 0x72B6 }, { 0x8FF4, 0x7573 }, { 0x8FF5, 0x7A63 }, { 0x8FF6, 0x84B8 }, { 0x8FF7, 0x8B72 },
+	{ 0x8FF8, 0x91B8 }, { 0x8FF9, 0x9320 }, { 0x8FFA, 0x5631 }, { 0x8FFB, 0x57F4 }, { 0x8FFC, 0x98FE }, { 0x9040, 0x62ED }, { 0x9041, 0x690D }, { 0x9042, 0x6B96 },
+	{ 0x9043, 0x71ED }, { 0x9044, 0x7E54 }, { 0x9045, 0x8077 }, { 0x9046, 0x8272 }, { 0x9047, 0x89E6 }, { 0x9048, 0x98DF }, { 0x9049, 0x8755 }, { 0x904A, 0x8FB1 },
+	{ 0x904B, 0x5C3B }, { 0x904C, 0x4F38 }, { 0x904D, 0x4FE1 }, { 0x904E, 0x4FB5 }, { 0x904F, 0x5507 }, { 0x9050, 0x5A20 }, { 0x9051, 0x5BDD }, { 0x9052, 0x5BE9 },
+	{ 0x9053, 0x5FC3 }, { 0x9054, 0x614E }, { 0x9055, 0x632F }, { 0x9056, 0x65B0 }, { 0x9057, 0x664B }, { 0x9058, 0x68EE }, { 0x9059, 0x699B }, { 0x905A, 0x6D78 },
+	{ 0x905B, 0x6DF1 }, { 0x905C, 0x7533 }, { 0x905D, 0x75B9 }, { 0x905E, 0x771F }, { 0x905F, 0x795E }, { 0x9060, 0x79E6 }, { 0x9061, 0x7D33 }, { 0x9062, 0x81E3 },
+	{ 0x9063, 0x82AF }, { 0x9064, 0x85AA }, { 0x9065, 0x89AA }, { 0x9066, 0x8A3A }, { 0x9067, 0x8EAB }, { 0x9068, 0x8F9B }, { 0x9069, 0x9032 }, { 0x906A, 0x91DD },
+	{ 0x906B, 0x9707 }, { 0x906C, 0x4EBA }, { 0x906D, 0x4EC1 }, { 0x906E, 0x5203 }, { 0x906F, 0x5875 }, { 0x9070, 0x58EC }, { 0x9071, 0x5C0B }, { 0x9072, 0x751A },
+	{ 0x9073, 0x5C3D }, { 0x9074, 0x814E }, { 0x9075, 0x8A0A }, { 0x9076, 0x8FC5 }, { 0x9077, 0x9663 }, { 0x9078, 0x976D }, { 0x9079, 0x7B25 }, { 0x907A, 0x8ACF },
+	{ 0x907B, 0x9808 }, { 0x907C, 0x9162 }, { 0x907D, 0x56F3 }, { 0x907E, 0x53A8 }, { 0x9080, 0x9017 }, { 0x9081, 0x5439 }, { 0x9082, 0x5782 }, { 0x9083, 0x5E25 },
+	{ 0x9084, 0x63A8 }, { 0x9085, 0x6C34 }, { 0x9086, 0x708A }, { 0x9087, 0x7761 }, { 0x9088, 0x7C8B }, { 0x9089, 0x7FE0 }, { 0x908A, 0x8870 }, { 0x908B, 0x9042 },
+	{ 0x908C, 0x9154 }, { 0x908D, 0x9310 }, { 0x908E, 0x9318 }, { 0x908F, 0x968F }, { 0x9090, 0x745E }, { 0x9091, 0x9AC4 }, { 0x9092, 0x5D07 }, { 0x9093, 0x5D69 },
+	{ 0x9094, 0x6570 }, { 0x9095, 0x67A2 }, { 0x9096, 0x8DA8 }, { 0x9097, 0x96DB }, { 0x9098, 0x636E }, { 0x9099, 0x6749 }, { 0x909A, 0x6919 }, { 0x909B, 0x83C5 },
+	{ 0x909C, 0x9817 }, { 0x909D, 0x96C0 }, { 0x909E, 0x88FE }, { 0x909F, 0x6F84 }, { 0x90A0, 0x647A }, { 0x90A1, 0x5BF8 }, { 0x90A2, 0x4E16 }, { 0x90A3, 0x702C },
+	{ 0x90A4, 0x755D }, { 0x90A5, 0x662F }, { 0x90A6, 0x51C4 }, { 0x90A7, 0x5236 }, { 0x90A8, 0x52E2 }, { 0x90A9, 0x59D3 }, { 0x90AA, 0x5F81 }, { 0x90AB, 0x6027 },
+	{ 0x90AC, 0x6210 }, { 0x90AD, 0x653F }, { 0x90AE, 0x6574 }, { 0x90AF, 0x661F }, { 0x90B0, 0x6674 }, { 0x90B1, 0x68F2 }, { 0x90B2, 0x6816 }, { 0x90B3, 0x6B63 },
+	{ 0x90B4, 0x6E05 }, { 0x90B5, 0x7272 }, { 0x90B6, 0x751F }, { 0x90B7, 0x76DB }, { 0x90B8, 0x7CBE }, { 0x90B9, 0x8056 }, { 0x90BA, 0x58F0 }, { 0x90BB, 0x88FD },
+	{ 0x90BC, 0x897F }, { 0x90BD, 0x8AA0 }, { 0x90BE, 0x8A93 }, { 0x90BF, 0x8ACB }, { 0x90C0, 0x901D }, { 0x90C1, 0x9192 }, { 0x90C2, 0x9752 }, { 0x90C3, 0x9759 },
+	{ 0x90C4, 0x6589 }, { 0x90C5, 0x7A0E }, { 0x90C6, 0x8106 }, { 0x90C7, 0x96BB }, { 0x90C8, 0x5E2D }, { 0x90C9, 0x60DC }, { 0x90CA, 0x621A }, { 0x90CB, 0x65A5 },
+	{ 0x90CC, 0x6614 }, { 0x90CD, 0x6790 }, { 0x90CE, 0x77F3 }, { 0x90CF, 0x7A4D }, { 0x90D0, 0x7C4D }, { 0x90D1, 0x7E3E }, { 0x90D2, 0x810A }, { 0x90D3, 0x8CAC },
+	{ 0x90D4, 0x8D64 }, { 0x90D5, 0x8DE1 }, { 0x90D6, 0x8E5F }, { 0x90D7, 0x78A9 }, { 0x90D8, 0x5207 }, { 0x90D9, 0x62D9 }, { 0x90DA, 0x63A5 }, { 0x90DB, 0x6442 },
+	{ 0x90DC, 0x6298 }, { 0x90DD, 0x8A2D }, { 0x90DE, 0x7A83 }, { 0x90DF, 0x7BC0 }, { 0x90E0, 0x8AAC }, { 0x90E1, 0x96EA }, { 0x90E2, 0x7D76 }, { 0x90E3, 0x820C },
+	{ 0x90E4, 0x8749 }, { 0x90E5, 0x4ED9 }, { 0x90E6, 0x5148 }, { 0x90E7, 0x5343 }, { 0x90E8, 0x5360 }, { 0x90E9, 0x5BA3 }, { 0x90EA, 0x5C02 }, { 0x90EB, 0x5C16 },
+	{ 0x90EC, 0x5DDD }, { 0x90ED, 0x6226 }, { 0x90EE, 0x6247 }, { 0x90EF, 0x64B0 }, { 0x90F0, 0x6813 }, { 0x90F1, 0x6834 }, { 0x90F2, 0x6CC9 }, { 0x90F3, 0x6D45 },
+	{ 0x90F4, 0x6D17 }, { 0x90F5, 0x67D3 }, { 0x90F6, 0x6F5C }, { 0x90F7, 0x714E }, { 0x90F8, 0x717D }, { 0x90F9, 0x65CB }, { 0x90FA, 0x7A7F }, { 0x90FB, 0x7BAD },
+	{ 0x90FC, 0x7DDA }, { 0x9140, 0x7E4A }, { 0x9141, 0x7FA8 }, { 0x9142, 0x817A }, { 0x9143, 0x821B }, { 0x9144, 0x8239 }, { 0x9145, 0x85A6 }, { 0x9146, 0x8A6E },
+	{ 0x9147, 0x8CCE }, { 0x9148, 0x8DF5 }, { 0x9149, 0x9078 }, { 0x914A, 0x9077 }, { 0x914B, 0x92AD }, { 0x914C, 0x9291 }, { 0x914D, 0x9583 }, { 0x914E, 0x9BAE },
+	{ 0x914F, 0x524D }, { 0x9150, 0x5584 }, { 0x9151, 0x6F38 }, { 0x9152, 0x7136 }, { 0x9153, 0x5168 }, { 0x9154, 0x7985 }, { 0x9155, 0x7E55 }, { 0x9156, 0x81B3 },
+	{ 0x9157, 0x7CCE }, { 0x9158, 0x564C }, { 0x9159, 0x5851 }, { 0x915A, 0x5CA8 }, { 0x915B, 0x63AA }, { 0x915C, 0x66FE }, { 0x915D, 0x66FD }, { 0x915E, 0x695A },
+	{ 0x915F, 0x72D9 }, { 0x9160, 0x758F }, { 0x9161, 0x758E }, { 0x9162, 0x790E }, { 0x9163, 0x7956 }, { 0x9164, 0x79DF }, { 0x9165, 0x7C97 }, { 0x9166, 0x7D20 },
+	{ 0x9167, 0x7D44 }, { 0x9168, 0x8607 }, { 0x9169, 0x8A34 }, { 0x916A, 0x963B }, { 0x916B, 0x9061 }, { 0x916C, 0x9F20 }, { 0x916D, 0x50E7 }, { 0x916E, 0x5275 },
+	{ 0x916F, 0x53CC }, { 0x9170, 0x53E2 }, { 0x9171, 0x5009 }, { 0x9172, 0x55AA }, { 0x9173, 0x58EE }, { 0x9174, 0x594F }, { 0x9175, 0x723D }, { 0x9176, 0x5B8B },
+	{ 0x9177, 0x5C64 }, { 0x9178, 0x531D }, { 0x9179, 0x60E3 }, { 0x917A, 0x60F3 }, { 0x917B, 0x635C }, { 0x917C, 0x6383 }, { 0x917D, 0x633F }, { 0x917E, 0x63BB },
+	{ 0x9180, 0x64CD }, { 0x9181, 0x65E9 }, { 0x9182, 0x66F9 }, { 0x9183, 0x5DE3 }, { 0x9184, 0x69CD }, { 0x9185, 0x69FD }, { 0x9186, 0x6F15 }, { 0x9187, 0x71E5 },
+	{ 0x9188, 0x4E89 }, { 0x9189, 0x75E9 }, { 0x918A, 0x76F8 }, { 0x918B, 0x7A93 }, { 0x918C, 0x7CDF }, { 0x918D, 0x7DCF }, { 0x918E, 0x7D9C }, { 0x918F, 0x8061 },
+	{ 0x9190, 0x8349 }, { 0x9191, 0x8358 }, { 0x9192, 0x846C }, { 0x9193, 0x84BC }, { 0x9194, 0x85FB }, { 0x9195, 0x88C5 }, { 0x9196, 0x8D70 }, { 0x9197, 0x9001 },
+	{ 0x9198, 0x906D }, { 0x9199, 0x9397 }, { 0x919A, 0x971C }, { 0x919B, 0x9A12 }, { 0x919C, 0x50CF }, { 0x919D, 0x5897 }, { 0x919E, 0x618E }, { 0x919F, 0x81D3 },
+	{ 0x91A0, 0x8535 }, { 0x91A1, 0x8D08 }, { 0x91A2, 0x9020 }, { 0x91A3, 0x4FC3 }, { 0x91A4, 0x5074 }, { 0x91A5, 0x5247 }, { 0x91A6, 0x5373 }, { 0x91A7, 0x606F },
+	{ 0x91A8, 0x6349 }, { 0x91A9, 0x675F }, { 0x91AA, 0x6E2C }, { 0x91AB, 0x8DB3 }, { 0x91AC, 0x901F }, { 0x91AD, 0x4FD7 }, { 0x91AE, 0x5C5E }, { 0x91AF, 0x8CCA },
+	{ 0x91B0, 0x65CF }, { 0x91B1, 0x7D9A }, { 0x91B2, 0x5352 }, { 0x91B3, 0x8896 }, { 0x91B4, 0x5176 }, { 0x91B5, 0x63C3 }, { 0x91B6, 0x5B58 }, { 0x91B7, 0x5B6B },
+	{ 0x91B8, 0x5C0A }, { 0x91B9, 0x640D }, { 0x91BA, 0x6751 }, { 0x91BB, 0x905C }, { 0x91BC, 0x4ED6 }, { 0x91BD, 0x591A }, { 0x91BE, 0x592A }, { 0x91BF, 0x6C70 },
+	{ 0x91C0, 0x8A51 }, { 0x91C1, 0x553E }, { 0x91C2, 0x5815 }, { 0x91C3, 0x59A5 }, { 0x91C4, 0x60F0 }, { 0x91C5, 0x6253 }, { 0x91C6, 0x67C1 }, { 0x91C7, 0x8235 },
+	{ 0x91C8, 0x6955 }, { 0x91C9, 0x9640 }, { 0x91CA, 0x99C4 }, { 0x91CB, 0x9A28 }, { 0x91CC, 0x4F53 }, { 0x91CD, 0x5806 }, { 0x91CE, 0x5BFE }, { 0x91CF, 0x8010 },
+	{ 0x91D0, 0x5CB1 }, { 0x91D1, 0x5E2F }, { 0x91D2, 0x5F85 }, { 0x91D3, 0x6020 }, { 0x91D4, 0x614B }, { 0x91D5, 0x6234 }, { 0x91D6, 0x66FF }, { 0x91D7, 0x6CF0 },
+	{ 0x91D8, 0x6EDE }, { 0x91D9, 0x80CE }, { 0x91DA, 0x817F }, { 0x91DB, 0x82D4 }, { 0x91DC, 0x888B }, { 0x91DD, 0x8CB8 }, { 0x91DE, 0x9000 }, { 0x91DF, 0x902E },
+	{ 0x91E0, 0x968A }, { 0x91E1, 0x9EDB }, { 0x91E2, 0x9BDB }, { 0x91E3, 0x4EE3 }, { 0x91E4, 0x53F0 }, { 0x91E5, 0x5927 }, { 0x91E6, 0x7B2C }, { 0x91E7, 0x918D },
+	{ 0x91E8, 0x984C }, { 0x91E9, 0x9DF9 }, { 0x91EA, 0x6EDD }, { 0x91EB, 0x7027 }, { 0x91EC, 0x5353 }, { 0x91ED, 0x5544 }, { 0x91EE, 0x5B85 }, { 0x91EF, 0x6258 },
+	{ 0x91F0, 0x629E }, { 0x91F1, 0x62D3 }, { 0x91F2, 0x6CA2 }, { 0x91F3, 0x6FEF }, { 0x91F4, 0x7422 }, { 0x91F5, 0x8A17 }, { 0x91F6, 0x9438 }, { 0x91F7, 0x6FC1 },
+	{ 0x91F8, 0x8AFE }, { 0x91F9, 0x8338 }, { 0x91FA, 0x51E7 }, { 0x91FB, 0x86F8 }, { 0x91FC, 0x53EA }, { 0x9240, 0x53E9 }, { 0x9241, 0x4F46 }, { 0x9242, 0x9054 },
+	{ 0x9243, 0x8FB0 }, { 0x9244, 0x596A }, { 0x9245, 0x8131 }, { 0x9246, 0x5DFD }, { 0x9247, 0x7AEA }, { 0x9248, 0x8FBF }, { 0x9249, 0x68DA }, { 0x924A, 0x8C37 },
+	{ 0x924B, 0x72F8 }, { 0x924C, 0x9C48 }, { 0x924D, 0x6A3D }, { 0x924E, 0x8AB0 }, { 0x924F, 0x4E39 }, { 0x9250, 0x5358 }, { 0x9251, 0x5606 }, { 0x9252, 0x5766 },
+	{ 0x9253, 0x62C5 }, { 0x9254, 0x63A2 }, { 0x9255, 0x65E6 }, { 0x9256, 0x6B4E }, { 0x9257, 0x6DE1 }, { 0x9258, 0x6E5B }, { 0x9259, 0x70AD }, { 0x925A, 0x77ED },
+	{ 0x925B, 0x7AEF }, { 0x925C, 0x7BAA }, { 0x925D, 0x7DBB }, { 0x925E, 0x803D }, { 0x925F, 0x80C6 }, { 0x9260, 0x86CB }, { 0x9261, 0x8A95 }, { 0x9262, 0x935B },
+	{ 0x9263, 0x56E3 }, { 0x9264, 0x58C7 }, { 0x9265, 0x5F3E }, { 0x9266, 0x65AD }, { 0x9267, 0x6696 }, { 0x9268, 0x6A80 }, { 0x9269, 0x6BB5 }, { 0x926A, 0x7537 },
+	{ 0x926B, 0x8AC7 }, { 0x926C, 0x5024 }, { 0x926D, 0x77E5 }, { 0x926E, 0x5730 }, { 0x926F, 0x5F1B }, { 0x9270, 0x6065 }, { 0x9271, 0x667A }, { 0x9272, 0x6C60 },
+	{ 0x9273, 0x75F4 }, { 0x9274, 0x7A1A }, { 0x9275, 0x7F6E }, { 0x9276, 0x81F4 }, { 0x9277, 0x8718 }, { 0x9278, 0x9045 }, { 0x9279, 0x99B3 }, { 0x927A, 0x7BC9 },
+	{ 0x927B, 0x755C }, { 0x927C, 0x7AF9 }, { 0x927D, 0x7B51 }, { 0x927E, 0x84C4 }, { 0x9280, 0x9010 }, { 0x9281, 0x79E9 }, { 0x9282, 0x7A92 }, { 0x9283, 0x8336 },
+	{ 0x9284, 0x5AE1 }, { 0x9285, 0x7740 }, { 0x9286, 0x4E2D }, { 0x9287, 0x4EF2 }, { 0x9288, 0x5B99 }, { 0x9289, 0x5FE0 }, { 0x928A, 0x62BD }, { 0x928B, 0x663C },
+	{ 0x928C, 0x67F1 }, { 0x928D, 0x6CE8 }, { 0x928E, 0x866B }, { 0x928F, 0x8877 }, { 0x9290, 0x8A3B }, { 0x9291, 0x914E }, { 0x9292, 0x92F3 }, { 0x9293, 0x99D0 },
+	{ 0x9294, 0x6A17 }, { 0x9295, 0x7026 }, { 0x9296, 0x732A }, { 0x9297, 0x82E7 }, { 0x9298, 0x8457 }, { 0x9299, 0x8CAF }, { 0x929A, 0x4E01 }, { 0x929B, 0x5146 },
+	{ 0x929C, 0x51CB }, { 0x929D, 0x558B }, { 0x929E, 0x5BF5 }, { 0x929F, 0x5E16 }, { 0x92A0, 0x5E33 }, { 0x92A1, 0x5E81 }, { 0x92A2, 0x5F14 }, { 0x92A3, 0x5F35 },
+	{ 0x92A4, 0x5F6B }, { 0x92A5, 0x5FB4 }, { 0x92A6, 0x61F2 }, { 0x92A7, 0x6311 }, { 0x92A8, 0x66A2 }, { 0x92A9, 0x671D }, { 0x92AA, 0x6F6E }, { 0x92AB, 0x7252 },
+	{ 0x92AC, 0x753A }, { 0x92AD, 0x773A }, { 0x92AE, 0x8074 }, { 0x92AF, 0x8139 }, { 0x92B0, 0x8178 }, { 0x92B1, 0x8776 }, { 0x92B2, 0x8ABF }, { 0x92B3, 0x8ADC },
+	{ 0x92B4, 0x8D85 }, { 0x92B5, 0x8DF3 }, { 0x92B6, 0x929A }, { 0x92B7, 0x9577 }, { 0x92B8, 0x9802 }, { 0x92B9, 0x9CE5 }, { 0x92BA, 0x52C5 }, { 0x92BB, 0x6357 },
+	{ 0x92BC, 0x76F4 }, { 0x92BD, 0x6715 }, { 0x92BE, 0x6C88 }, { 0x92BF, 0x73CD }, { 0x92C0, 0x8CC3 }, { 0x92C1, 0x93AE }, { 0x92C2, 0x9673 }, { 0x92C3, 0x6D25 },
+	{ 0x92C4, 0x589C }, { 0x92C5, 0x690E }, { 0x92C6, 0x69CC }, { 0x92C7, 0x8FFD }, { 0x92C8, 0x939A }, { 0x92C9, 0x75DB }, { 0x92CA, 0x901A }, { 0x92CB, 0x585A },
+	{ 0x92CC, 0x6802 }, { 0x92CD, 0x63B4 }, { 0x92CE, 0x69FB }, { 0x92CF, 0x4F43 }, { 0x92D0, 0x6F2C }, { 0x92D1, 0x67D8 }, { 0x92D2, 0x8FBB }, { 0x92D3, 0x8526 },
+	{ 0x92D4, 0x7DB4 }, { 0x92D5, 0x9354 }, { 0x92D6, 0x693F }, { 0x92D7, 0x6F70 }, { 0x92D8, 0x576A }, { 0x92D9, 0x58F7 }, { 0x92DA, 0x5B2C }, { 0x92DB, 0x7D2C },
+	{ 0x92DC, 0x722A }, { 0x92DD, 0x540A }, { 0x92DE, 0x91E3 }, { 0x92DF, 0x9DB4 }, { 0x92E0, 0x4EAD }, { 0x92E1, 0x4F4E }, { 0x92E2, 0x505C }, { 0x92E3, 0x5075 },
+	{ 0x92E4, 0x5243 }, { 0x92E5, 0x8C9E }, { 0x92E6, 0x5448 }, { 0x92E7, 0x5824 }, { 0x92E8, 0x5B9A }, { 0x92E9, 0x5E1D }, { 0x92EA, 0x5E95 }, { 0x92EB, 0x5EAD },
+	{ 0x92EC, 0x5EF7 }, { 0x92ED, 0x5F1F }, { 0x92EE, 0x608C }, { 0x92EF, 0x62B5 }, { 0x92F0, 0x633A }, { 0x92F1, 0x63D0 }, { 0x92F2, 0x68AF }, { 0x92F3, 0x6C40 },
+	{ 0x92F4, 0x7887 }, { 0x92F5, 0x798E }, { 0x92F6, 0x7A0B }, { 0x92F7, 0x7DE0 }, { 0x92F8, 0x8247 }, { 0x92F9, 0x8A02 }, { 0x92FA, 0x8AE6 }, { 0x92FB, 0x8E44 },
+	{ 0x92FC, 0x9013 }, { 0x9340, 0x90B8 }, { 0x9341, 0x912D }, { 0x9342, 0x91D8 }, { 0x9343, 0x9F0E }, { 0x9344, 0x6CE5 }, { 0x9345, 0x6458 }, { 0x9346, 0x64E2 },
+	{ 0x9347, 0x6575 }, { 0x9348, 0x6EF4 }, { 0x9349, 0x7684 }, { 0x934A, 0x7B1B }, { 0x934B, 0x9069 }, { 0x934C, 0x93D1 }, { 0x934D, 0x6EBA }, { 0x934E, 0x54F2 },
+	{ 0x934F, 0x5FB9 }, { 0x9350, 0x64A4 }, { 0x9351, 0x8F4D }, { 0x9352, 0x8FED }, { 0x9353, 0x9244 }, { 0x9354, 0x5178 }, { 0x9355, 0x586B }, { 0x9356, 0x5929 },
+	{ 0x9357, 0x5C55 }, { 0x9358, 0x5E97 }, { 0x9359, 0x6DFB }, { 0x935A, 0x7E8F }, { 0x935B, 0x751C }, { 0x935C, 0x8CBC }, { 0x935D, 0x8EE2 }, { 0x935E, 0x985B },
+	{ 0x935F, 0x70B9 }, { 0x9360, 0x4F1D }, { 0x9361, 0x6BBF }, { 0x9362, 0x6FB1 }, { 0x9363, 0x7530 }, { 0x9364, 0x96FB }, { 0x9365, 0x514E }, { 0x9366, 0x5410 },
+	{ 0x9367, 0x5835 }, { 0x9368, 0x5857 }, { 0x9369, 0x59AC }, { 0x936A, 0x5C60 }, { 0x936B, 0x5F92 }, { 0x936C, 0x6597 }, { 0x936D, 0x675C }, { 0x936E, 0x6E21 },
+	{ 0x936F, 0x767B }, { 0x9370, 0x83DF }, { 0x9371, 0x8CED }, { 0x9372, 0x9014 }, { 0x9373, 0x90FD }, { 0x9374, 0x934D }, { 0x9375, 0x7825 }, { 0x9376, 0x783A },
+	{ 0x9377, 0x52AA }, { 0x9378, 0x5EA6 }, { 0x9379, 0x571F }, { 0x937A, 0x5974 }, { 0x937B, 0x6012 }, { 0x937C, 0x5012 }, { 0x937D, 0x515A }, { 0x937E, 0x51AC },
+	{ 0x9380, 0x51CD }, { 0x9381, 0x5200 }, { 0x9382, 0x5510 }, { 0x9383, 0x5854 }, { 0x9384, 0x5858 }, { 0x9385, 0x5957 }, { 0x9386, 0x5B95 }, { 0x9387, 0x5CF6 },
+	{ 0x9388, 0x5D8B }, { 0x9389, 0x60BC }, { 0x938A, 0x6295 }, { 0x938B, 0x642D }, { 0x938C, 0x6771 }, { 0x938D, 0x6843 }, { 0x938E, 0x68BC }, { 0x938F, 0x68DF },
+	{ 0x9390, 0x76D7 }, { 0x9391, 0x6DD8 }, { 0x9392, 0x6E6F }, { 0x9393, 0x6D9B }, { 0x9394, 0x706F }, { 0x9395, 0x71C8 }, { 0x9396, 0x5F53 }, { 0x9397, 0x75D8 },
+	{ 0x9398, 0x7977 }, { 0x9399, 0x7B49 }, { 0x939A, 0x7B54 }, { 0x939B, 0x7B52 }, { 0x939C, 0x7CD6 }, { 0x939D, 0x7D71 }, { 0x939E, 0x5230 }, { 0x939F, 0x8463 },
+	{ 0x93A0, 0x8569 }, { 0x93A1, 0x85E4 }, { 0x93A2, 0x8A0E }, { 0x93A3, 0x8B04 }, { 0x93A4, 0x8C46 }, { 0x93A5, 0x8E0F }, { 0x93A6, 0x9003 }, { 0x93A7, 0x900F },
+	{ 0x93A8, 0x9419 }, { 0x93A9, 0x9676 }, { 0x93AA, 0x982D }, { 0x93AB, 0x9A30 }, { 0x93AC, 0x95D8 }, { 0x93AD, 0x50CD }, { 0x93AE, 0x52D5 }, { 0x93AF, 0x540C },
+	{ 0x93B0, 0x5802 }, { 0x93B1, 0x5C0E }, { 0x93B2, 0x61A7 }, { 0x93B3, 0x649E }, { 0x93B4, 0x6D1E }, { 0x93B5, 0x77B3 }, { 0x93B6, 0x7AE5 }, { 0x93B7, 0x80F4 },
+	{ 0x93B8, 0x8404 }, { 0x93B9, 0x9053 }, { 0x93BA, 0x9285 }, { 0x93BB, 0x5CE0 }, { 0x93BC, 0x9D07 }, { 0x93BD, 0x533F }, { 0x93BE, 0x5F97 }, { 0x93BF, 0x5FB3 },
+	{ 0x93C0, 0x6D9C }, { 0x93C1, 0x7279 }, { 0x93C2, 0x7763 }, { 0x93C3, 0x79BF }, { 0x93C4, 0x7BE4 }, { 0x93C5, 0x6BD2 }, { 0x93C6, 0x72EC }, { 0x93C7, 0x8AAD },
+	{ 0x93C8, 0x6803 }, { 0x93C9, 0x6A61 }, { 0x93CA, 0x51F8 }, { 0x93CB, 0x7A81 }, { 0x93CC, 0x6934 }, { 0x93CD, 0x5C4A }, { 0x93CE, 0x9CF6 }, { 0x93CF, 0x82EB },
+	{ 0x93D0, 0x5BC5 }, { 0x93D1, 0x9149 }, { 0x93D2, 0x701E }, { 0x93D3, 0x5678 }, { 0x93D4, 0x5C6F }, { 0x93D5, 0x60C7 }, { 0x93D6, 0x6566 }, { 0x93D7, 0x6C8C },
+	{ 0x93D8, 0x8C5A }, { 0x93D9, 0x9041 }, { 0x93DA, 0x9813 }, { 0x93DB, 0x5451 }, { 0x93DC, 0x66C7 }, { 0x93DD, 0x920D }, { 0x93DE, 0x5948 }, { 0x93DF, 0x90A3 },
+	{ 0x93E0, 0x5185 }, { 0x93E1, 0x4E4D }, { 0x93E2, 0x51EA }, { 0x93E3, 0x8599 }, { 0x93E4, 0x8B0E }, { 0x93E5, 0x7058 }, { 0x93E6, 0x637A }, { 0x93E7, 0x934B },
+	{ 0x93E8, 0x6962 }, { 0x93E9, 0x99B4 }, { 0x93EA, 0x7E04 }, { 0x93EB, 0x7577 }, { 0x93EC, 0x5357 }, { 0x93ED, 0x6960 }, { 0x93EE, 0x8EDF }, { 0x93EF, 0x96E3 },
+	{ 0x93F0, 0x6C5D }, { 0x93F1, 0x4E8C }, { 0x93F2, 0x5C3C }, { 0x93F3, 0x5F10 }, { 0x93F4, 0x8FE9 }, { 0x93F5, 0x5302 }, { 0x93F6, 0x8CD1 }, { 0x93F7, 0x8089 },
+	{ 0x93F8, 0x8679 }, { 0x93F9, 0x5EFF }, { 0x93FA, 0x65E5 }, { 0x93FB, 0x4E73 }, { 0x93FC, 0x5165 }, { 0x9440, 0x5982 }, { 0x9441, 0x5C3F }, { 0x9442, 0x97EE },
+	{ 0x9443, 0x4EFB }, { 0x9444, 0x598A }, { 0x9445, 0x5FCD }, { 0x9446, 0x8A8D }, { 0x9447, 0x6FE1 }, { 0x9448, 0x79B0 }, { 0x9449, 0x7962 }, { 0x944A, 0x5BE7 },
+	{ 0x944B, 0x8471 }, { 0x944C, 0x732B }, { 0x944D, 0x71B1 }, { 0x944E, 0x5E74 }, { 0x944F, 0x5FF5 }, { 0x9450, 0x637B }, { 0x9451, 0x649A }, { 0x9452, 0x71C3 },
+	{ 0x9453, 0x7C98 }, { 0x9454, 0x4E43 }, { 0x9455, 0x5EFC }, { 0x9456, 0x4E4B }, { 0x9457, 0x57DC }, { 0x9458, 0x56A2 }, { 0x9459, 0x60A9 }, { 0x945A, 0x6FC3 },
+	{ 0x945B, 0x7D0D }, { 0x945C, 0x80FD }, { 0x945D, 0x8133 }, { 0x945E, 0x81BF }, { 0x945F, 0x8FB2 }, { 0x9460, 0x8997 }, { 0x9461, 0x86A4 }, { 0x9462, 0x5DF4 },
+	{ 0x9463, 0x628A }, { 0x9464, 0x64AD }, { 0x9465, 0x8987 }, { 0x9466, 0x6777 }, { 0x9467, 0x6CE2 }, { 0x9468, 0x6D3E }, { 0x9469, 0x7436 }, { 0x946A, 0x7834 },
+	{ 0x946B, 0x5A46 }, { 0x946C, 0x7F75 }, { 0x946D, 0x82AD }, { 0x946E, 0x99AC }, { 0x946F, 0x4FF3 }, { 0x9470, 0x5EC3 }, { 0x9471, 0x62DD }, { 0x9472, 0x6392 },
+	{ 0x9473, 0x6557 }, { 0x9474, 0x676F }, { 0x9475, 0x76C3 }, { 0x9476, 0x724C }, { 0x9477, 0x80CC }, { 0x9478, 0x80BA }, { 0x9479, 0x8F29 }, { 0x947A, 0x914D },
+	{ 0x947B, 0x500D }, { 0x947C, 0x57F9 }, { 0x947D, 0x5A92 }, { 0x947E, 0x6885 }, { 0x9480, 0x6973 }, { 0x9481, 0x7164 }, { 0x9482, 0x72FD }, { 0x9483, 0x8CB7 },
+	{ 0x9484, 0x58F2 }, { 0x9485, 0x8CE0 }, { 0x9486, 0x966A }, { 0x9487, 0x9019 }, { 0x9488, 0x877F }, { 0x9489, 0x79E4 }, { 0x948A, 0x77E7 }, { 0x948B, 0x8429 },
+	{ 0x948C, 0x4F2F }, { 0x948D, 0x5265 }, { 0x948E, 0x535A }, { 0x948F, 0x62CD }, { 0x9490, 0x67CF }, { 0x9491, 0x6CCA }, { 0x9492, 0x767D }, { 0x9493, 0x7B94 },
+	{ 0x9494, 0x7C95 }, { 0x9495, 0x8236 }, { 0x9496, 0x8584 }, { 0x9497, 0x8FEB }, { 0x9498, 0x66DD }, { 0x9499, 0x6F20 }, { 0x949A, 0x7206 }, { 0x949B, 0x7E1B },
+	{ 0x949C, 0x83AB }, { 0x949D, 0x99C1 }, { 0x949E, 0x9EA6 }, { 0x949F, 0x51FD }, { 0x94A0, 0x7BB1 }, { 0x94A1, 0x7872 }, { 0x94A2, 0x7BB8 }, { 0x94A3, 0x8087 },
+	{ 0x94A4, 0x7B48 }, { 0x94A5, 0x6AE8 }, { 0x94A6, 0x5E61 }, { 0x94A7, 0x808C }, { 0x94A8, 0x7551 }, { 0x94A9, 0x7560 }, { 0x94AA, 0x516B }, { 0x94AB, 0x9262 },
+	{ 0x94AC, 0x6E8C }, { 0x94AD, 0x767A }, { 0x94AE, 0x9197 }, { 0x94AF, 0x9AEA }, { 0x94B0, 0x4F10 }, { 0x94B1, 0x7F70 }, { 0x94B2, 0x629C }, { 0x94B3, 0x7B4F },
+	{ 0x94B4, 0x95A5 }, { 0x94B5, 0x9CE9 }, { 0x94B6, 0x567A }, { 0x94B7, 0x5859 }, { 0x94B8, 0x86E4 }, { 0x94B9, 0x96BC }, { 0x94BA, 0x4F34 }, { 0x94BB, 0x5224 },
+	{ 0x94BC, 0x534A }, { 0x94BD, 0x53CD }, { 0x94BE, 0x53DB }, { 0x94BF, 0x5E06 }, { 0x94C0, 0x642C }, { 0x94C1, 0x6591 }, { 0x94C2, 0x677F }, { 0x94C3, 0x6C3E },
+	{ 0x94C4, 0x6C4E }, { 0x94C5, 0x7248 }, { 0x94C6, 0x72AF }, { 0x94C7, 0x73ED }, { 0x94C8, 0x7554 }, { 0x94C9, 0x7E41 }, { 0x94CA, 0x822C }, { 0x94CB, 0x85E9 },
+	{ 0x94CC, 0x8CA9 }, { 0x94CD, 0x7BC4 }, { 0x94CE, 0x91C6 }, { 0x94CF, 0x7169 }, { 0x94D0, 0x9812 }, { 0x94D1, 0x98EF }, { 0x94D2, 0x633D }, { 0x94D3, 0x6669 },
+	{ 0x94D4, 0x756A }, { 0x94D5, 0x76E4 }, { 0x94D6, 0x78D0 }, { 0x94D7, 0x8543 }, { 0x94D8, 0x86EE }, { 0x94D9, 0x532A }, { 0x94DA, 0x5351 }, { 0x94DB, 0x5426 },
+	{ 0x94DC, 0x5983 }, { 0x94DD, 0x5E87 }, { 0x94DE, 0x5F7C }, { 0x94DF, 0x60B2 }, { 0x94E0, 0x6249 }, { 0x94E1, 0x6279 }, { 0x94E2, 0x62AB }, { 0x94E3, 0x6590 },
+	{ 0x94E4, 0x6BD4 }, { 0x94E5, 0x6CCC }, { 0x94E6, 0x75B2 }, { 0x94E7, 0x76AE }, { 0x94E8, 0x7891 }, { 0x94E9, 0x79D8 }, { 0x94EA, 0x7DCB }, { 0x94EB, 0x7F77 },
+	{ 0x94EC, 0x80A5 }, { 0x94ED, 0x88AB }, { 0x94EE, 0x8AB9 }, { 0x94EF, 0x8CBB }, { 0x94F0, 0x907F }, { 0x94F1, 0x975E }, { 0x94F2, 0x98DB }, { 0x94F3, 0x6A0B },
+	{ 0x94F4, 0x7C38 }, { 0x94F5, 0x5099 }, { 0x94F6, 0x5C3E }, { 0x94F7, 0x5FAE }, { 0x94F8, 0x6787 }, { 0x94F9, 0x6BD8 }, { 0x94FA, 0x7435 }, { 0x94FB, 0x7709 },
+	{ 0x94FC, 0x7F8E }, { 0x9540, 0x9F3B }, { 0x9541, 0x67CA }, { 0x9542, 0x7A17 }, { 0x9543, 0x5339 }, { 0x9544, 0x758B }, { 0x9545, 0x9AED }, { 0x9546, 0x5F66 },
+	{ 0x9547, 0x819D }, { 0x9548, 0x83F1 }, { 0x9549, 0x8098 }, { 0x954A, 0x5F3C }, { 0x954B, 0x5FC5 }, { 0x954C, 0x7562 }, { 0x954D, 0x7B46 }, { 0x954E, 0x903C },
+	{ 0x954F, 0x6867 }, { 0x9550, 0x59EB }, { 0x9551, 0x5A9B }, { 0x9552, 0x7D10 }, { 0x9553, 0x767E }, { 0x9554, 0x8B2C }, { 0x9555, 0x4FF5 }, { 0x9556, 0x5F6A },
+	{ 0x9557, 0x6A19 }, { 0x9558, 0x6C37 }, { 0x9559, 0x6F02 }, { 0x955A, 0x74E2 }, { 0x955B, 0x7968 }, { 0x955C, 0x8868 }, { 0x955D, 0x8A55 }, { 0x955E, 0x8C79 },
+	{ 0x955F, 0x5EDF }, { 0x9560, 0x63CF }, { 0x9561, 0x75C5 }, { 0x9562, 0x79D2 }, { 0x9563, 0x82D7 }, { 0x9564, 0x9328 }, { 0x9565, 0x92F2 }, { 0x9566, 0x849C },
+	{ 0x9567, 0x86ED }, { 0x9568, 0x9C2D }, { 0x9569, 0x54C1 }, { 0x956A, 0x5F6C }, { 0x956B, 0x658C }, { 0x956C, 0x6D5C }, { 0x956D, 0x7015 }, { 0x956E, 0x8CA7 },
+	{ 0x956F, 0x8CD3 }, { 0x9570, 0x983B }, { 0x9571, 0x654F }, { 0x9572, 0x74F6 }, { 0x9573, 0x4E0D }, { 0x9574, 0x4ED8 }, { 0x9575, 0x57E0 }, { 0x9576, 0x592B },
+	{ 0x9577, 0x5A66 }, { 0x9578, 0x5BCC }, { 0x9579, 0x51A8 }, { 0x957A, 0x5E03 }, { 0x957B, 0x5E9C }, { 0x957C, 0x6016 }, { 0x957D, 0x6276 }, { 0x957E, 0x6577 },
+	{ 0x9580, 0x65A7 }, { 0x9581, 0x666E }, { 0x9582, 0x6D6E }, { 0x9583, 0x7236 }, { 0x9584, 0x7B26 }, { 0x9585, 0x8150 }, { 0x9586, 0x819A }, { 0x9587, 0x8299 },
+	{ 0x9588, 0x8B5C }, { 0x9589, 0x8CA0 }, { 0x958A, 0x8CE6 }, { 0x958B, 0x8D74 }, { 0x958C, 0x961C }, { 0x958D, 0x9644 }, { 0x958E, 0x4FAE }, { 0x958F, 0x64AB },
+	{ 0x9590, 0x6B66 }, { 0x9591, 0x821E }, { 0x9592, 0x8461 }, { 0x9593, 0x856A }, { 0x9594, 0x90E8 }, { 0x9595, 0x5C01 }, { 0x9596, 0x6953 }, { 0x9597, 0x98A8 },
+	{ 0x9598, 0x847A }, { 0x9599, 0x8557 }, { 0x959A, 0x4F0F }, { 0x959B, 0x526F }, { 0x959C, 0x5FA9 }, { 0x959D, 0x5E45 }, { 0x959E, 0x670D }, { 0x959F, 0x798F },
+	{ 0x95A0, 0x8179 }, { 0x95A1, 0x8907 }, { 0x95A2, 0x8986 }, { 0x95A3, 0x6DF5 }, { 0x95A4, 0x5F17 }, { 0x95A5, 0x6255 }, { 0x95A6, 0x6CB8 }, { 0x95A7, 0x4ECF },
+	{ 0x95A8, 0x7269 }, { 0x95A9, 0x9B92 }, { 0x95AA, 0x5206 }, { 0x95AB, 0x543B }, { 0x95AC, 0x5674 }, { 0x95AD, 0x58B3 }, { 0x95AE, 0x61A4 }, { 0x95AF, 0x626E },
+	{ 0x95B0, 0x711A }, { 0x95B1, 0x596E }, { 0x95B2, 0x7C89 }, { 0x95B3, 0x7CDE }, { 0x95B4, 0x7D1B }, { 0x95B5, 0x96F0 }, { 0x95B6, 0x6587 }, { 0x95B7, 0x805E },
+	{ 0x95B8, 0x4E19 }, { 0x95B9, 0x4F75 }, { 0x95BA, 0x5175 }, { 0x95BB, 0x5840 }, { 0x95BC, 0x5E63 }, { 0x95BD, 0x5E73 }, { 0x95BE, 0x5F0A }, { 0x95BF, 0x67C4 },
+	{ 0x95C0, 0x4E26 }, { 0x95C1, 0x853D }, { 0x95C2, 0x9589 }, { 0x95C3, 0x965B }, { 0x95C4, 0x7C73 }, { 0x95C5, 0x9801 }, { 0x95C6, 0x50FB }, { 0x95C7, 0x58C1 },
+	{ 0x95C8, 0x7656 }, { 0x95C9, 0x78A7 }, { 0x95CA, 0x5225 }, { 0x95CB, 0x77A5 }, { 0x95CC, 0x8511 }, { 0x95CD, 0x7B86 }, { 0x95CE, 0x504F }, { 0x95CF, 0x5909 },
+	{ 0x95D0, 0x7247 }, { 0x95D1, 0x7BC7 }, { 0x95D2, 0x7DE8 }, { 0x95D3, 0x8FBA }, { 0x95D4, 0x8FD4 }, { 0x95D5, 0x904D }, { 0x95D6, 0x4FBF }, { 0x95D7, 0x52C9 },
+	{ 0x95D8, 0x5A29 }, { 0x95D9, 0x5F01 }, { 0x95DA, 0x97AD }, { 0x95DB, 0x4FDD }, { 0x95DC, 0x8217 }, { 0x95DD, 0x92EA }, { 0x95DE, 0x5703 }, { 0x95DF, 0x6355 },
+	{ 0x95E0, 0x6B69 }, { 0x95E1, 0x752B }, { 0x95E2, 0x88DC }, { 0x95E3, 0x8F14 }, { 0x95E4, 0x7A42 }, { 0x95E5, 0x52DF }, { 0x95E6, 0x5893 }, { 0x95E7, 0x6155 },
+	{ 0x95E8, 0x620A }, { 0x95E9, 0x66AE }, { 0x95EA, 0x6BCD }, { 0x95EB, 0x7C3F }, { 0x95EC, 0x83E9 }, { 0x95ED, 0x5023 }, { 0x95EE, 0x4FF8 }, { 0x95EF, 0x5305 },
+	{ 0x95F0, 0x5446 }, { 0x95F1, 0x5831 }, { 0x95F2, 0x5949 }, { 0x95F3, 0x5B9D }, { 0x95F4, 0x5CF0 }, { 0x95F5, 0x5CEF }, { 0x95F6, 0x5D29 }, { 0x95F7, 0x5E96 },
+	{ 0x95F8, 0x62B1 }, { 0x95F9, 0x6367 }, { 0x95FA, 0x653E }, { 0x95FB, 0x65B9 }, { 0x95FC, 0x670B }, { 0x9640, 0x6CD5 }, { 0x9641, 0x6CE1 }, { 0x9642, 0x70F9 },
+	{ 0x9643, 0x7832 }, { 0x9644, 0x7E2B }, { 0x9645, 0x80DE }, { 0x9646, 0x82B3 }, { 0x9647, 0x840C }, { 0x9648, 0x84EC }, { 0x9649, 0x8702 }, { 0x964A, 0x8912 },
+	{ 0x964B, 0x8A2A }, { 0x964C, 0x8C4A }, { 0x964D, 0x90A6 }, { 0x964E, 0x92D2 }, { 0x964F, 0x98FD }, { 0x9650, 0x9CF3 }, { 0x9651, 0x9D6C }, { 0x9652, 0x4E4F },
+	{ 0x9653, 0x4EA1 }, { 0x9654, 0x508D }, { 0x9655, 0x5256 }, { 0x9656, 0x574A }, { 0x9657, 0x59A8 }, { 0x9658, 0x5E3D }, { 0x9659, 0x5FD8 }, { 0x965A, 0x5FD9 },
+	{ 0x965B, 0x623F }, { 0x965C, 0x66B4 }, { 0x965D, 0x671B }, { 0x965E, 0x67D0 }, { 0x965F, 0x68D2 }, { 0x9660, 0x5192 }, { 0x9661, 0x7D21 }, { 0x9662, 0x80AA },
+	{ 0x9663, 0x81A8 }, { 0x9664, 0x8B00 }, { 0x9665, 0x8C8C }, { 0x9666, 0x8CBF }, { 0x9667, 0x927E }, { 0x9668, 0x9632 }, { 0x9669, 0x5420 }, { 0x966A, 0x982C },
+	{ 0x966B, 0x5317 }, { 0x966C, 0x50D5 }, { 0x966D, 0x535C }, { 0x966E, 0x58A8 }, { 0x966F, 0x64B2 }, { 0x9670, 0x6734 }, { 0x9671, 0x7267 }, { 0x9672, 0x7766 },
+	{ 0x9673, 0x7A46 }, { 0x9674, 0x91E6 }, { 0x9675, 0x52C3 }, { 0x9676, 0x6CA1 }, { 0x9677, 0x6B86 }, { 0x9678, 0x5800 }, { 0x9679, 0x5E4C }, { 0x967A, 0x5954 },
+	{ 0x967B, 0x672C }, { 0x967C, 0x7FFB }, { 0x967D, 0x51E1 }, { 0x967E, 0x76C6 }, { 0x9680, 0x6469 }, { 0x9681, 0x78E8 }, { 0x9682, 0x9B54 }, { 0x9683, 0x9EBB },
+	{ 0x9684, 0x57CB }, { 0x9685, 0x59B9 }, { 0x9686, 0x6627 }, { 0x9687, 0x679A }, { 0x9688, 0x6BCE }, { 0x9689, 0x54E9 }, { 0x968A, 0x69D9 }, { 0x968B, 0x5E55 },
+	{ 0x968C, 0x819C }, { 0x968D, 0x6795 }, { 0x968E, 0x9BAA }, { 0x968F, 0x67FE }, { 0x9690, 0x9C52 }, { 0x9691, 0x685D }, { 0x9692, 0x4EA6 }, { 0x9693, 0x4FE3 },
+	{ 0x9694, 0x53C8 }, { 0x9695, 0x62B9 }, { 0x9696, 0x672B }, { 0x9697, 0x6CAB }, { 0x9698, 0x8FC4 }, { 0x9699, 0x4FAD }, { 0x969A, 0x7E6D }, { 0x969B, 0x9EBF },
+	{ 0x969C, 0x4E07 }, { 0x969D, 0x6162 }, { 0x969E, 0x6E80 }, { 0x969F, 0x6F2B }, { 0x96A0, 0x8513 }, { 0x96A1, 0x5473 }, { 0x96A2, 0x672A }, { 0x96A3, 0x9B45 },
+	{ 0x96A4, 0x5DF3 }, { 0x96A5, 0x7B95 }, { 0x96A6, 0x5CAC }, { 0x96A7, 0x5BC6 }, { 0x96A8, 0x871C }, { 0x96A9, 0x6E4A }, { 0x96AA, 0x84D1 }, { 0x96AB, 0x7A14 },
+	{ 0x96AC, 0x8108 }, { 0x96AD, 0x5999 }, { 0x96AE, 0x7C8D }, { 0x96AF, 0x6C11 }, { 0x96B0, 0x7720 }, { 0x96B1, 0x52D9 }, { 0x96B2, 0x5922 }, { 0x96B3, 0x7121 },
+	{ 0x96B4, 0x725F }, { 0x96B5, 0x77DB }, { 0x96B6, 0x9727 }, { 0x96B7, 0x9D61 }, { 0x96B8, 0x690B }, { 0x96B9, 0x5A7F }, { 0x96BA, 0x5A18 }, { 0x96BB, 0x51A5 },
+	{ 0x96BC, 0x540D }, { 0x96BD, 0x547D }, { 0x96BE, 0x660E }, { 0x96BF, 0x76DF }, { 0x96C0, 0x8FF7 }, { 0x96C1, 0x9298 }, { 0x96C2, 0x9CF4 }, { 0x96C3, 0x59EA },
+	{ 0x96C4, 0x725D }, { 0x96C5, 0x6EC5 }, { 0x96C6, 0x514D }, { 0x96C7, 0x68C9 }, { 0x96C8, 0x7DBF }, { 0x96C9, 0x7DEC }, { 0x96CA, 0x9762 }, { 0x96CB, 0x9EBA },
+	{ 0x96CC, 0x6478 }, { 0x96CD, 0x6A21 }, { 0x96CE, 0x8302 }, { 0x96CF, 0x5984 }, { 0x96D0, 0x5B5F }, { 0x96D1, 0x6BDB }, { 0x96D2, 0x731B }, { 0x96D3, 0x76F2 },
+	{ 0x96D4, 0x7DB2 }, { 0x96D5, 0x8017 }, { 0x96D6, 0x8499 }, { 0x96D7, 0x5132 }, { 0x96D8, 0x6728 }, { 0x96D9, 0x9ED9 }, { 0x96DA, 0x76EE }, { 0x96DB, 0x6762 },
+	{ 0x96DC, 0x52FF }, { 0x96DD, 0x9905 }, { 0x96DE, 0x5C24 }, { 0x96DF, 0x623B }, { 0x96E0, 0x7C7E }, { 0x96E1, 0x8CB0 }, { 0x96E2, 0x554F }, { 0x96E3, 0x60B6 },
+	{ 0x96E4, 0x7D0B }, { 0x96E5, 0x9580 }, { 0x96E6, 0x5301 }, { 0x96E7, 0x4E5F }, { 0x96E8, 0x51B6 }, { 0x96E9, 0x591C }, { 0x96EA, 0x723A }, { 0x96EB, 0x8036 },
+	{ 0x96EC, 0x91CE }, { 0x96ED, 0x5F25 }, { 0x96EE, 0x77E2 }, { 0x96EF, 0x5384 }, { 0x96F0, 0x5F79 }, { 0x96F1, 0x7D04 }, { 0x96F2, 0x85AC }, { 0x96F3, 0x8A33 },
+	{ 0x96F4, 0x8E8D }, { 0x96F5, 0x9756 }, { 0x96F6, 0x67F3 }, { 0x96F7, 0x85AE }, { 0x96F8, 0x9453 }, { 0x96F9, 0x6109 }, { 0x96FA, 0x6108 }, { 0x96FB, 0x6CB9 },
+	{ 0x96FC, 0x7652 }, { 0x9740, 0x8AED }, { 0x9741, 0x8F38 }, { 0x9742, 0x552F }, { 0x9743, 0x4F51 }, { 0x9744, 0x512A }, { 0x9745, 0x52C7 }, { 0x9746, 0x53CB },
+	{ 0x9747, 0x5BA5 }, { 0x9748, 0x5E7D }, { 0x9749, 0x60A0 }, { 0x974A, 0x6182 }, { 0x974B, 0x63D6 }, { 0x974C, 0x6709 }, { 0x974D, 0x67DA }, { 0x974E, 0x6E67 },
+	{ 0x974F, 0x6D8C }, { 0x9750, 0x7336 }, { 0x9751, 0x7337 }, { 0x9752, 0x7531 }, { 0x9753, 0x7950 }, { 0x9754, 0x88D5 }, { 0x9755, 0x8A98 }, { 0x9756, 0x904A },
+	{ 0x9757, 0x9091 }, { 0x9758, 0x90F5 }, { 0x9759, 0x96C4 }, { 0x975A, 0x878D }, { 0x975B, 0x5915 }, { 0x975C, 0x4E88 }, { 0x975D, 0x4F59 }, { 0x975E, 0x4E0E },
+	{ 0x975F, 0x8A89 }, { 0x9760, 0x8F3F }, { 0x9761, 0x9810 }, { 0x9762, 0x50AD }, { 0x9763, 0x5E7C }, { 0x9764, 0x5996 }, { 0x9765, 0x5BB9 }, { 0x9766, 0x5EB8 },
+	{ 0x9767, 0x63DA }, { 0x9768, 0x63FA }, { 0x9769, 0x64C1 }, { 0x976A, 0x66DC }, { 0x976B, 0x694A }, { 0x976C, 0x69D8 }, { 0x976D, 0x6D0B }, { 0x976E, 0x6EB6 },
+	{ 0x976F, 0x7194 }, { 0x9770, 0x7528 }, { 0x9771, 0x7AAF }, { 0x9772, 0x7F8A }, { 0x9773, 0x8000 }, { 0x9774, 0x8449 }, { 0x9775, 0x84C9 }, { 0x9776, 0x8981 },
+	{ 0x9777, 0x8B21 }, { 0x9778, 0x8E0A }, { 0x9779, 0x9065 }, { 0x977A, 0x967D }, { 0x977B, 0x990A }, { 0x977C, 0x617E }, { 0x977D, 0x6291 }, { 0x977E, 0x6B32 },
+	{ 0x9780, 0x6C83 }, { 0x9781, 0x6D74 }, { 0x9782, 0x7FCC }, { 0x9783, 0x7FFC }, { 0x9784, 0x6DC0 }, { 0x9785, 0x7F85 }, { 0x9786, 0x87BA }, { 0x9787, 0x88F8 },
+	{ 0x9788, 0x6765 }, { 0x9789, 0x83B1 }, { 0x978A, 0x983C }, { 0x978B, 0x96F7 }, { 0x978C, 0x6D1B }, { 0x978D, 0x7D61 }, { 0x978E, 0x843D }, { 0x978F, 0x916A },
+	{ 0x9790, 0x4E71 }, { 0x9791, 0x5375 }, { 0x9792, 0x5D50 }, { 0x9793, 0x6B04 }, { 0x9794, 0x6FEB }, { 0x9795, 0x85CD }, { 0x9796, 0x862D }, { 0x9797, 0x89A7 },
+	{ 0x9798, 0x5229 }, { 0x9799, 0x540F }, { 0x979A, 0x5C65 }, { 0x979B, 0x674E }, { 0x979C, 0x68A8 }, { 0x979D, 0x7406 }, { 0x979E, 0x7483 }, { 0x979F, 0x75E2 },
+	{ 0x97A0, 0x88CF }, { 0x97A1, 0x88E1 }, { 0x97A2, 0x91CC }, { 0x97A3, 0x96E2 }, { 0x97A4, 0x9678 }, { 0x97A5, 0x5F8B }, { 0x97A6, 0x7387 }, { 0x97A7, 0x7ACB },
+	{ 0x97A8, 0x844E }, { 0x97A9, 0x63A0 }, { 0x97AA, 0x7565 }, { 0x97AB, 0x5289 }, { 0x97AC, 0x6D41 }, { 0x97AD, 0x6E9C }, { 0x97AE, 0x7409 }, { 0x97AF, 0x7559 },
+	{ 0x97B0, 0x786B }, { 0x97B1, 0x7C92 }, { 0x97B2, 0x9686 }, { 0x97B3, 0x7ADC }, { 0x97B4, 0x9F8D }, { 0x97B5, 0x4FB6 }, { 0x97B6, 0x616E }, { 0x97B7, 0x65C5 },
+	{ 0x97B8, 0x865C }, { 0x97B9, 0x4E86 }, { 0x97BA, 0x4EAE }, { 0x97BB, 0x50DA }, { 0x97BC, 0x4E21 }, { 0x97BD, 0x51CC }, { 0x97BE, 0x5BEE }, { 0x97BF, 0x6599 },
+	{ 0x97C0, 0x6881 }, { 0x97C1, 0x6DBC }, { 0x97C2, 0x731F }, { 0x97C3, 0x7642 }, { 0x97C4, 0x77AD }, { 0x97C5, 0x7A1C }, { 0x97C6, 0x7CE7 }, { 0x97C7, 0x826F },
+	{ 0x97C8, 0x8AD2 }, { 0x97C9, 0x907C }, { 0x97CA, 0x91CF }, { 0x97CB, 0x9675 }, { 0x97CC, 0x9818 }, { 0x97CD, 0x529B }, { 0x97CE, 0x7DD1 }, { 0x97CF, 0x502B },
+	{ 0x97D0, 0x5398 }, { 0x97D1, 0x6797 }, { 0x97D2, 0x6DCB }, { 0x97D3, 0x71D0 }, { 0x97D4, 0x7433 }, { 0x97D5, 0x81E8 }, { 0x97D6, 0x8F2A }, { 0x97D7, 0x96A3 },
+	{ 0x97D8, 0x9C57 }, { 0x97D9, 0x9E9F }, { 0x97DA, 0x7460 }, { 0x97DB, 0x5841 }, { 0x97DC, 0x6D99 }, { 0x97DD, 0x7D2F }, { 0x97DE, 0x985E }, { 0x97DF, 0x4EE4 },
+	{ 0x97E0, 0x4F36 }, { 0x97E1, 0x4F8B }, { 0x97E2, 0x51B7 }, { 0x97E3, 0x52B1 }, { 0x97E4, 0x5DBA }, { 0x97E5, 0x601C }, { 0x97E6, 0x73B2 }, { 0x97E7, 0x793C },
+	{ 0x97E8, 0x82D3 }, { 0x97E9, 0x9234 }, { 0x97EA, 0x96B7 }, { 0x97EB, 0x96F6 }, { 0x97EC, 0x970A }, { 0x97ED, 0x9E97 }, { 0x97EE, 0x9F62 }, { 0x97EF, 0x66A6 },
+	{ 0x97F0, 0x6B74 }, { 0x97F1, 0x5217 }, { 0x97F2, 0x52A3 }, { 0x97F3, 0x70C8 }, { 0x97F4, 0x88C2 }, { 0x97F5, 0x5EC9 }, { 0x97F6, 0x604B }, { 0x97F7, 0x6190 },
+	{ 0x97F8, 0x6F23 }, { 0x97F9, 0x7149 }, { 0x97FA, 0x7C3E }, { 0x97FB, 0x7DF4 }, { 0x97FC, 0x806F }, { 0x9840, 0x84EE }, { 0x9841, 0x9023 }, { 0x9842, 0x932C },
+	{ 0x9843, 0x5442 }, { 0x9844, 0x9B6F }, { 0x9845, 0x6AD3 }, { 0x9846, 0x7089 }, { 0x9847, 0x8CC2 }, { 0x9848, 0x8DEF }, { 0x9849, 0x9732 }, { 0x984A, 0x52B4 },
+	{ 0x984B, 0x5A41 }, { 0x984C, 0x5ECA }, { 0x984D, 0x5F04 }, { 0x984E, 0x6717 }, { 0x984F, 0x697C }, { 0x9850, 0x6994 }, { 0x9851, 0x6D6A }, { 0x9852, 0x6F0F },
+	{ 0x9853, 0x7262 }, { 0x9854, 0x72FC }, { 0x9855, 0x7BED }, { 0x9856, 0x8001 }, { 0x9857, 0x807E }, { 0x9858, 0x874B }, { 0x9859, 0x90CE }, { 0x985A, 0x516D },
+	{ 0x985B, 0x9E93 }, { 0x985C, 0x7984 }, { 0x985D, 0x808B }, { 0x985E, 0x9332 }, { 0x985F, 0x8AD6 }, { 0x9860, 0x502D }, { 0x9861, 0x548C }, { 0x9862, 0x8A71 },
+	{ 0x9863, 0x6B6A }, { 0x9864, 0x8CC4 }, { 0x9865, 0x8107 }, { 0x9866, 0x60D1 }, { 0x9867, 0x67A0 }, { 0x9868, 0x9DF2 }, { 0x9869, 0x4E99 }, { 0x986A, 0x4E98 },
+	{ 0x986B, 0x9C10 }, { 0x986C, 0x8A6B }, { 0x986D, 0x85C1 }, { 0x986E, 0x8568 }, { 0x986F, 0x6900 }, { 0x9870, 0x6E7E }, { 0x9871, 0x7897 }, { 0x9872, 0x8155 },
+	{ 0x989F, 0x5F0C }, { 0x98A0, 0x4E10 }, { 0x98A1, 0x4E15 }, { 0x98A2, 0x4E2A }, { 0x98A3, 0x4E31 }, { 0x98A4, 0x4E36 }, { 0x98A5, 0x4E3C }, { 0x98A6, 0x4E3F },
+	{ 0x98A7, 0x4E42 }, { 0x98A8, 0x4E56 }, { 0x98A9, 0x4E58 }, { 0x98AA, 0x4E82 }, { 0x98AB, 0x4E85 }, { 0x98AC, 0x8C6B }, { 0x98AD, 0x4E8A }, { 0x98AE, 0x8212 },
+	{ 0x98AF, 0x5F0D }, { 0x98B0, 0x4E8E }, { 0x98B1, 0x4E9E }, { 0x98B2, 0x4E9F }, { 0x98B3, 0x4EA0 }, { 0x98B4, 0x4EA2 }, { 0x98B5, 0x4EB0 }, { 0x98B6, 0x4EB3 },
+	{ 0x98B7, 0x4EB6 }, { 0x98B8, 0x4ECE }, { 0x98B9, 0x4ECD }, { 0x98BA, 0x4EC4 }, { 0x98BB, 0x4EC6 }, { 0x98BC, 0x4EC2 }, { 0x98BD, 0x4ED7 }, { 0x98BE, 0x4EDE },
+	{ 0x98BF, 0x4EED }, { 0x98C0, 0x4EDF }, { 0x98C1, 0x4EF7 }, { 0x98C2, 0x4F09 }, { 0x98C3, 0x4F5A }, { 0x98C4, 0x4F30 }, { 0x98C5, 0x4F5B }, { 0x98C6, 0x4F5D },
+	{ 0x98C7, 0x4F57 }, { 0x98C8, 0x4F47 }, { 0x98C9, 0x4F76 }, { 0x98CA, 0x4F88 }, { 0x98CB, 0x4F8F }, { 0x98CC, 0x4F98 }, { 0x98CD, 0x4F7B }, { 0x98CE, 0x4F69 },
+	{ 0x98CF, 0x4F70 }, { 0x98D0, 0x4F91 }, { 0x98D1, 0x4F6F }, { 0x98D2, 0x4F86 }, { 0x98D3, 0x4F96 }, { 0x98D4, 0x5118 }, { 0x98D5, 0x4FD4 }, { 0x98D6, 0x4FDF },
+	{ 0x98D7, 0x4FCE }, { 0x98D8, 0x4FD8 }, { 0x98D9, 0x4FDB }, { 0x98DA, 0x4FD1 }, { 0x98DB, 0x4FDA }, { 0x98DC, 0x4FD0 }, { 0x98DD, 0x4FE4 }, { 0x98DE, 0x4FE5 },
+	{ 0x98DF, 0x501A }, { 0x98E0, 0x5028 }, { 0x98E1, 0x5014 }, { 0x98E2, 0x502A }, { 0x98E3, 0x5025 }, { 0x98E4, 0x5005 }, { 0x98E5, 0x4F1C }, { 0x98E6, 0x4FF6 },
+	{ 0x98E7, 0x5021 }, { 0x98E8, 0x5029 }, { 0x98E9, 0x502C }, { 0x98EA, 0x4FFE }, { 0x98EB, 0x4FEF }, { 0x98EC, 0x5011 }, { 0x98ED, 0x5006 }, { 0x98EE, 0x5043 },
+	{ 0x98EF, 0x5047 }, { 0x98F0, 0x6703 }, { 0x98F1, 0x5055 }, { 0x98F2, 0x5050 }, { 0x98F3, 0x5048 }, { 0x98F4, 0x505A }, { 0x98F5, 0x5056 }, { 0x98F6, 0x506C },
+	{ 0x98F7, 0x5078 }, { 0x98F8, 0x5080 }, { 0x98F9, 0x509A }, { 0x98FA, 0x5085 }, { 0x98FB, 0x50B4 }, { 0x98FC, 0x50B2 }, { 0x9940, 0x50C9 }, { 0x9941, 0x50CA },
+	{ 0x9942, 0x50B3 }, { 0x9943, 0x50C2 }, { 0x9944, 0x50D6 }, { 0x9945, 0x50DE }, { 0x9946, 0x50E5 }, { 0x9947, 0x50ED }, { 0x9948, 0x50E3 }, { 0x9949, 0x50EE },
+	{ 0x994A, 0x50F9 }, { 0x994B, 0x50F5 }, { 0x994C, 0x5109 }, { 0x994D, 0x5101 }, { 0x994E, 0x5102 }, { 0x994F, 0x5116 }, { 0x9950, 0x5115 }, { 0x9951, 0x5114 },
+	{ 0x9952, 0x511A }, { 0x9953, 0x5121 }, { 0x9954, 0x513A }, { 0x9955, 0x5137 }, { 0x9956, 0x513C }, { 0x9957, 0x513B }, { 0x9958, 0x513F }, { 0x9959, 0x5140 },
+	{ 0x995A, 0x5152 }, { 0x995B, 0x514C }, { 0x995C, 0x5154 }, { 0x995D, 0x5162 }, { 0x995E, 0x7AF8 }, { 0x995F, 0x5169 }, { 0x9960, 0x516A }, { 0x9961, 0x516E },
+	{ 0x9962, 0x5180 }, { 0x9963, 0x5182 }, { 0x9964, 0x56D8 }, { 0x9965, 0x518C }, { 0x9966, 0x5189 }, { 0x9967, 0x518F }, { 0x9968, 0x5191 }, { 0x9969, 0x5193 },
+	{ 0x996A, 0x5195 }, { 0x996B, 0x5196 }, { 0x996C, 0x51A4 }, { 0x996D, 0x51A6 }, { 0x996E, 0x51A2 }, { 0x996F, 0x51A9 }, { 0x9970, 0x51AA }, { 0x9971, 0x51AB },
+	{ 0x9972, 0x51B3 }, { 0x9973, 0x51B1 }, { 0x9974, 0x51B2 }, { 0x9975, 0x51B0 }, { 0x9976, 0x51B5 }, { 0x9977, 0x51BD }, { 0x9978, 0x51C5 }, { 0x9979, 0x51C9 },
+	{ 0x997A, 0x51DB }, { 0x997B, 0x51E0 }, { 0x997C, 0x8655 }, { 0x997D, 0x51E9 }, { 0x997E, 0x51ED }, { 0x9980, 0x51F0 }, { 0x9981, 0x51F5 }, { 0x9982, 0x51FE },
+	{ 0x9983, 0x5204 }, { 0x9984, 0x520B }, { 0x9985, 0x5214 }, { 0x9986, 0x520E }, { 0x9987, 0x5227 }, { 0x9988, 0x522A }, { 0x9989, 0x522E }, { 0x998A, 0x5233 },
+	{ 0x998B, 0x5239 }, { 0x998C, 0x524F }, { 0x998D, 0x5244 }, { 0x998E, 0x524B }, { 0x998F, 0x524C }, { 0x9990, 0x525E }, { 0x9991, 0x5254 }, { 0x9992, 0x526A },
+	{ 0x9993, 0x5274 }, { 0x9994, 0x5269 }, { 0x9995, 0x5273 }, { 0x9996, 0x527F }, { 0x9997, 0x527D }, { 0x9998, 0x528D }, { 0x9999, 0x5294 }, { 0x999A, 0x5292 },
+	{ 0x999B, 0x5271 }, { 0x999C, 0x5288 }, { 0x999D, 0x5291 }, { 0x999E, 0x8FA8 }, { 0x999F, 0x8FA7 }, { 0x99A0, 0x52AC }, { 0x99A1, 0x52AD }, { 0x99A2, 0x52BC },
+	{ 0x99A3, 0x52B5 }, { 0x99A4, 0x52C1 }, { 0x99A5, 0x52CD }, { 0x99A6, 0x52D7 }, { 0x99A7, 0x52DE }, { 0x99A8, 0x52E3 }, { 0x99A9, 0x52E6 }, { 0x99AA, 0x98ED },
+	{ 0x99AB, 0x52E0 }, { 0x99AC, 0x52F3 }, { 0x99AD, 0x52F5 }, { 0x99AE, 0x52F8 }, { 0x99AF, 0x52F9 }, { 0x99B0, 0x5306 }, { 0x99B1, 0x5308 }, { 0x99B2, 0x7538 },
+	{ 0x99B3, 0x530D }, { 0x99B4, 0x5310 }, { 0x99B5, 0x530F }, { 0x99B6, 0x5315 }, { 0x99B7, 0x531A }, { 0x99B8, 0x5323 }, { 0x99B9, 0x532F }, { 0x99BA, 0x5331 },
+	{ 0x99BB, 0x5333 }, { 0x99BC, 0x5338 }, { 0x99BD, 0x5340 }, { 0x99BE, 0x5346 }, { 0x99BF, 0x5345 }, { 0x99C0, 0x4E17 }, { 0x99C1, 0x5349 }, { 0x99C2, 0x534D },
+	{ 0x99C3, 0x51D6 }, { 0x99C4, 0x535E }, { 0x99C5, 0x5369 }, { 0x99C6, 0x536E }, { 0x99C7, 0x5918 }, { 0x99C8, 0x537B }, { 0x99C9, 0x5377 }, { 0x99CA, 0x5382 },
+	{ 0x99CB, 0x5396 }, { 0x99CC, 0x53A0 }, { 0x99CD, 0x53A6 }, { 0x99CE, 0x53A5 }, { 0x99CF, 0x53AE }, { 0x99D0, 0x53B0 }, { 0x99D1, 0x53B6 }, { 0x99D2, 0x53C3 },
+	{ 0x99D3, 0x7C12 }, { 0x99D4, 0x96D9 }, { 0x99D5, 0x53DF }, { 0x99D6, 0x66FC }, { 0x99D7, 0x71EE }, { 0x99D8, 0x53EE }, { 0x99D9, 0x53E8 }, { 0x99DA, 0x53ED },
+	{ 0x99DB, 0x53FA }, { 0x99DC, 0x5401 }, { 0x99DD, 0x543D }, { 0x99DE, 0x5440 }, { 0x99DF, 0x542C }, { 0x99E0, 0x542D }, { 0x99E1, 0x543C }, { 0x99E2, 0x542E },
+	{ 0x99E3, 0x5436 }, { 0x99E4, 0x5429 }, { 0x99E5, 0x541D }, { 0x99E6, 0x544E }, { 0x99E7, 0x548F }, { 0x99E8, 0x5475 }, { 0x99E9, 0x548E }, { 0x99EA, 0x545F },
+	{ 0x99EB, 0x5471 }, { 0x99EC, 0x5477 }, { 0x99ED, 0x5470 }, { 0x99EE, 0x5492 }, { 0x99EF, 0x547B }, { 0x99F0, 0x5480 }, { 0x99F1, 0x5476 }, { 0x99F2, 0x5484 },
+	{ 0x99F3, 0x5490 }, { 0x99F4, 0x5486 }, { 0x99F5, 0x54C7 }, { 0x99F6, 0x54A2 }, { 0x99F7, 0x54B8 }, { 0x99F8, 0x54A5 }, { 0x99F9, 0x54AC }, { 0x99FA, 0x54C4 },
+	{ 0x99FB, 0x54C8 }, { 0x99FC, 0x54A8 }, { 0x9A40, 0x54AB }, { 0x9A41, 0x54C2 }, { 0x9A42, 0x54A4 }, { 0x9A43, 0x54BE }, { 0x9A44, 0x54BC }, { 0x9A45, 0x54D8 },
+	{ 0x9A46, 0x54E5 }, { 0x9A47, 0x54E6 }, { 0x9A48, 0x550F }, { 0x9A49, 0x5514 }, { 0x9A4A, 0x54FD }, { 0x9A4B, 0x54EE }, { 0x9A4C, 0x54ED }, { 0x9A4D, 0x54FA },
+	{ 0x9A4E, 0x54E2 }, { 0x9A4F, 0x5539 }, { 0x9A50, 0x5540 }, { 0x9A51, 0x5563 }, { 0x9A52, 0x554C }, { 0x9A53, 0x552E }, { 0x9A54, 0x555C }, { 0x9A55, 0x5545 },
+	{ 0x9A56, 0x5556 }, { 0x9A57, 0x5557 }, { 0x9A58, 0x5538 }, { 0x9A59, 0x5533 }, { 0x9A5A, 0x555D }, { 0x9A5B, 0x5599 }, { 0x9A5C, 0x5580 }, { 0x9A5D, 0x54AF },
+	{ 0x9A5E, 0x558A }, { 0x9A5F, 0x559F }, { 0x9A60, 0x557B }, { 0x9A61, 0x557E }, { 0x9A62, 0x5598 }, { 0x9A63, 0x559E }, { 0x9A64, 0x55AE }, { 0x9A65, 0x557C },
+	{ 0x9A66, 0x5583 }, { 0x9A67, 0x55A9 }, { 0x9A68, 0x5587 }, { 0x9A69, 0x55A8 }, { 0x9A6A, 0x55DA }, { 0x9A6B, 0x55C5 }, { 0x9A6C, 0x55DF }, { 0x9A6D, 0x55C4 },
+	{ 0x9A6E, 0x55DC }, { 0x9A6F, 0x55E4 }, { 0x9A70, 0x55D4 }, { 0x9A71, 0x5614 }, { 0x9A72, 0x55F7 }, { 0x9A73, 0x5616 }, { 0x9A74, 0x55FE }, { 0x9A75, 0x55FD },
+	{ 0x9A76, 0x561B }, { 0x9A77, 0x55F9 }, { 0x9A78, 0x564E }, { 0x9A79, 0x5650 }, { 0x9A7A, 0x71DF }, { 0x9A7B, 0x5634 }, { 0x9A7C, 0x5636 }, { 0x9A7D, 0x5632 },
+	{ 0x9A7E, 0x5638 }, { 0x9A80, 0x566B }, { 0x9A81, 0x5664 }, { 0x9A82, 0x562F }, { 0x9A83, 0x566C }, { 0x9A84, 0x566A }, { 0x9A85, 0x5686 }, { 0x9A86, 0x5680 },
+	{ 0x9A87, 0x568A }, { 0x9A88, 0x56A0 }, { 0x9A89, 0x5694 }, { 0x9A8A, 0x568F }, { 0x9A8B, 0x56A5 }, { 0x9A8C, 0x56AE }, { 0x9A8D, 0x56B6 }, { 0x9A8E, 0x56B4 },
+	{ 0x9A8F, 0x56C2 }, { 0x9A90, 0x56BC }, { 0x9A91, 0x56C1 }, { 0x9A92, 0x56C3 }, { 0x9A93, 0x56C0 }, { 0x9A94, 0x56C8 }, { 0x9A95, 0x56CE }, { 0x9A96, 0x56D1 },
+	{ 0x9A97, 0x56D3 }, { 0x9A98, 0x56D7 }, { 0x9A99, 0x56EE }, { 0x9A9A, 0x56F9 }, { 0x9A9B, 0x5700 }, { 0x9A9C, 0x56FF }, { 0x9A9D, 0x5704 }, { 0x9A9E, 0x5709 },
+	{ 0x9A9F, 0x5708 }, { 0x9AA0, 0x570B }, { 0x9AA1, 0x570D }, { 0x9AA2, 0x5713 }, { 0x9AA3, 0x5718 }, { 0x9AA4, 0x5716 }, { 0x9AA5, 0x55C7 }, { 0x9AA6, 0x571C },
+	{ 0x9AA7, 0x5726 }, { 0x9AA8, 0x5737 }, { 0x9AA9, 0x5738 }, { 0x9AAA, 0x574E }, { 0x9AAB, 0x573B }, { 0x9AAC, 0x5740 }, { 0x9AAD, 0x574F }, { 0x9AAE, 0x5769 },
+	{ 0x9AAF, 0x57C0 }, { 0x9AB0, 0x5788 }, { 0x9AB1, 0x5761 }, { 0x9AB2, 0x577F }, { 0x9AB3, 0x5789 }, { 0x9AB4, 0x5793 }, { 0x9AB5, 0x57A0 }, { 0x9AB6, 0x57B3 },
+	{ 0x9AB7, 0x57A4 }, { 0x9AB8, 0x57AA }, { 0x9AB9, 0x57B0 }, { 0x9ABA, 0x57C3 }, { 0x9ABB, 0x57C6 }, { 0x9ABC, 0x57D4 }, { 0x9ABD, 0x57D2 }, { 0x9ABE, 0x57D3 },
+	{ 0x9ABF, 0x580A }, { 0x9AC0, 0x57D6 }, { 0x9AC1, 0x57E3 }, { 0x9AC2, 0x580B }, { 0x9AC3, 0x5819 }, { 0x9AC4, 0x581D }, { 0x9AC5, 0x5872 }, { 0x9AC6, 0x5821 },
+	{ 0x9AC7, 0x5862 }, { 0x9AC8, 0x584B }, { 0x9AC9, 0x5870 }, { 0x9ACA, 0x6BC0 }, { 0x9ACB, 0x5852 }, { 0x9ACC, 0x583D }, { 0x9ACD, 0x5879 }, { 0x9ACE, 0x5885 },
+	{ 0x9ACF, 0x58B9 }, { 0x9AD0, 0x589F }, { 0x9AD1, 0x58AB }, { 0x9AD2, 0x58BA }, { 0x9AD3, 0x58DE }, { 0x9AD4, 0x58BB }, { 0x9AD5, 0x58B8 }, { 0x9AD6, 0x58AE },
+	{ 0x9AD7, 0x58C5 }, { 0x9AD8, 0x58D3 }, { 0x9AD9, 0x58D1 }, { 0x9ADA, 0x58D7 }, { 0x9ADB, 0x58D9 }, { 0x9ADC, 0x58D8 }, { 0x9ADD, 0x58E5 }, { 0x9ADE, 0x58DC },
+	{ 0x9ADF, 0x58E4 }, { 0x9AE0, 0x58DF }, { 0x9AE1, 0x58EF }, { 0x9AE2, 0x58FA }, { 0x9AE3, 0x58F9 }, { 0x9AE4, 0x58FB }, { 0x9AE5, 0x58FC }, { 0x9AE6, 0x58FD },
+	{ 0x9AE7, 0x5902 }, { 0x9AE8, 0x590A }, { 0x9AE9, 0x5910 }, { 0x9AEA, 0x591B }, { 0x9AEB, 0x68A6 }, { 0x9AEC, 0x5925 }, { 0x9AED, 0x592C }, { 0x9AEE, 0x592D },
+	{ 0x9AEF, 0x5932 }, { 0x9AF0, 0x5938 }, { 0x9AF1, 0x593E }, { 0x9AF2, 0x7AD2 }, { 0x9AF3, 0x5955 }, { 0x9AF4, 0x5950 }, { 0x9AF5, 0x594E }, { 0x9AF6, 0x595A },
+	{ 0x9AF7, 0x5958 }, { 0x9AF8, 0x5962 }, { 0x9AF9, 0x5960 }, { 0x9AFA, 0x5967 }, { 0x9AFB, 0x596C }, { 0x9AFC, 0x5969 }, { 0x9B40, 0x5978 }, { 0x9B41, 0x5981 },
+	{ 0x9B42, 0x599D }, { 0x9B43, 0x4F5E }, { 0x9B44, 0x4FAB }, { 0x9B45, 0x59A3 }, { 0x9B46, 0x59B2 }, { 0x9B47, 0x59C6 }, { 0x9B48, 0x59E8 }, { 0x9B49, 0x59DC },
+	{ 0x9B4A, 0x598D }, { 0x9B4B, 0x59D9 }, { 0x9B4C, 0x59DA }, { 0x9B4D, 0x5A25 }, { 0x9B4E, 0x5A1F }, { 0x9B4F, 0x5A11 }, { 0x9B50, 0x5A1C }, { 0x9B51, 0x5A09 },
+	{ 0x9B52, 0x5A1A }, { 0x9B53, 0x5A40 }, { 0x9B54, 0x5A6C }, { 0x9B55, 0x5A49 }, { 0x9B56, 0x5A35 }, { 0x9B57, 0x5A36 }, { 0x9B58, 0x5A62 }, { 0x9B59, 0x5A6A },
+	{ 0x9B5A, 0x5A9A }, { 0x9B5B, 0x5ABC }, { 0x9B5C, 0x5ABE }, { 0x9B5D, 0x5ACB }, { 0x9B5E, 0x5AC2 }, { 0x9B5F, 0x5ABD }, { 0x9B60, 0x5AE3 }, { 0x9B61, 0x5AD7 },
+	{ 0x9B62, 0x5AE6 }, { 0x9B63, 0x5AE9 }, { 0x9B64, 0x5AD6 }, { 0x9B65, 0x5AFA }, { 0x9B66, 0x5AFB }, { 0x9B67, 0x5B0C }, { 0x9B68, 0x5B0B }, { 0x9B69, 0x5B16 },
+	{ 0x9B6A, 0x5B32 }, { 0x9B6B, 0x5AD0 }, { 0x9B6C, 0x5B2A }, { 0x9B6D, 0x5B36 }, { 0x9B6E, 0x5B3E }, { 0x9B6F, 0x5B43 }, { 0x9B70, 0x5B45 }, { 0x9B71, 0x5B40 },
+	{ 0x9B72, 0x5B51 }, { 0x9B73, 0x5B55 }, { 0x9B74, 0x5B5A }, { 0x9B75, 0x5B5B }, { 0x9B76, 0x5B65 }, { 0x9B77, 0x5B69 }, { 0x9B78, 0x5B70 }, { 0x9B79, 0x5B73 },
+	{ 0x9B7A, 0x5B75 }, { 0x9B7B, 0x5B78 }, { 0x9B7C, 0x6588 }, { 0x9B7D, 0x5B7A }, { 0x9B7E, 0x5B80 }, { 0x9B80, 0x5B83 }, { 0x9B81, 0x5BA6 }, { 0x9B82, 0x5BB8 },
+	{ 0x9B83, 0x5BC3 }, { 0x9B84, 0x5BC7 }, { 0x9B85, 0x5BC9 }, { 0x9B86, 0x5BD4 }, { 0x9B87, 0x5BD0 }, { 0x9B88, 0x5BE4 }, { 0x9B89, 0x5BE6 }, { 0x9B8A, 0x5BE2 },
+	{ 0x9B8B, 0x5BDE }, { 0x9B8C, 0x5BE5 }, { 0x9B8D, 0x5BEB }, { 0x9B8E, 0x5BF0 }, { 0x9B8F, 0x5BF6 }, { 0x9B90, 0x5BF3 }, { 0x9B91, 0x5C05 }, { 0x9B92, 0x5C07 },
+	{ 0x9B93, 0x5C08 }, { 0x9B94, 0x5C0D }, { 0x9B95, 0x5C13 }, { 0x9B96, 0x5C20 }, { 0x9B97, 0x5C22 }, { 0x9B98, 0x5C28 }, { 0x9B99, 0x5C38 }, { 0x9B9A, 0x5C39 },
+	{ 0x9B9B, 0x5C41 }, { 0x9B9C, 0x5C46 }, { 0x9B9D, 0x5C4E }, { 0x9B9E, 0x5C53 }, { 0x9B9F, 0x5C50 }, { 0x9BA0, 0x5C4F }, { 0x9BA1, 0x5B71 }, { 0x9BA2, 0x5C6C },
+	{ 0x9BA3, 0x5C6E }, { 0x9BA4, 0x4E62 }, { 0x9BA5, 0x5C76 }, { 0x9BA6, 0x5C79 }, { 0x9BA7, 0x5C8C }, { 0x9BA8, 0x5C91 }, { 0x9BA9, 0x5C94 }, { 0x9BAA, 0x599B },
+	{ 0x9BAB, 0x5CAB }, { 0x9BAC, 0x5CBB }, { 0x9BAD, 0x5CB6 }, { 0x9BAE, 0x5CBC }, { 0x9BAF, 0x5CB7 }, { 0x9BB0, 0x5CC5 }, { 0x9BB1, 0x5CBE }, { 0x9BB2, 0x5CC7 },
+	{ 0x9BB3, 0x5CD9 }, { 0x9BB4, 0x5CE9 }, { 0x9BB5, 0x5CFD }, { 0x9BB6, 0x5CFA }, { 0x9BB7, 0x5CED }, { 0x9BB8, 0x5D8C }, { 0x9BB9, 0x5CEA }, { 0x9BBA, 0x5D0B },
+	{ 0x9BBB, 0x5D15 }, { 0x9BBC, 0x5D17 }, { 0x9BBD, 0x5D5C }, { 0x9BBE, 0x5D1F }, { 0x9BBF, 0x5D1B }, { 0x9BC0, 0x5D11 }, { 0x9BC1, 0x5D14 }, { 0x9BC2, 0x5D22 },
+	{ 0x9BC3, 0x5D1A }, { 0x9BC4, 0x5D19 }, { 0x9BC5, 0x5D18 }, { 0x9BC6, 0x5D4C }, { 0x9BC7, 0x5D52 }, { 0x9BC8, 0x5D4E }, { 0x9BC9, 0x5D4B }, { 0x9BCA, 0x5D6C },
+	{ 0x9BCB, 0x5D73 }, { 0x9BCC, 0x5D76 }, { 0x9BCD, 0x5D87 }, { 0x9BCE, 0x5D84 }, { 0x9BCF, 0x5D82 }, { 0x9BD0, 0x5DA2 }, { 0x9BD1, 0x5D9D }, { 0x9BD2, 0x5DAC },
+	{ 0x9BD3, 0x5DAE }, { 0x9BD4, 0x5DBD }, { 0x9BD5, 0x5D90 }, { 0x9BD6, 0x5DB7 }, { 0x9BD7, 0x5DBC }, { 0x9BD8, 0x5DC9 }, { 0x9BD9, 0x5DCD }, { 0x9BDA, 0x5DD3 },
+	{ 0x9BDB, 0x5DD2 }, { 0x9BDC, 0x5DD6 }, { 0x9BDD, 0x5DDB }, { 0x9BDE, 0x5DEB }, { 0x9BDF, 0x5DF2 }, { 0x9BE0, 0x5DF5 }, { 0x9BE1, 0x5E0B }, { 0x9BE2, 0x5E1A },
+	{ 0x9BE3, 0x5E19 }, { 0x9BE4, 0x5E11 }, { 0x9BE5, 0x5E1B }, { 0x9BE6, 0x5E36 }, { 0x9BE7, 0x5E37 }, { 0x9BE8, 0x5E44 }, { 0x9BE9, 0x5E43 }, { 0x9BEA, 0x5E40 },
+	{ 0x9BEB, 0x5E4E }, { 0x9BEC, 0x5E57 }, { 0x9BED, 0x5E54 }, { 0x9BEE, 0x5E5F }, { 0x9BEF, 0x5E62 }, { 0x9BF0, 0x5E64 }, { 0x9BF1, 0x5E47 }, { 0x9BF2, 0x5E75 },
+	{ 0x9BF3, 0x5E76 }, { 0x9BF4, 0x5E7A }, { 0x9BF5, 0x9EBC }, { 0x9BF6, 0x5E7F }, { 0x9BF7, 0x5EA0 }, { 0x9BF8, 0x5EC1 }, { 0x9BF9, 0x5EC2 }, { 0x9BFA, 0x5EC8 },
+	{ 0x9BFB, 0x5ED0 }, { 0x9BFC, 0x5ECF }, { 0x9C40, 0x5ED6 }, { 0x9C41, 0x5EE3 }, { 0x9C42, 0x5EDD }, { 0x9C43, 0x5EDA }, { 0x9C44, 0x5EDB }, { 0x9C45, 0x5EE2 },
+	{ 0x9C46, 0x5EE1 }, { 0x9C47, 0x5EE8 }, { 0x9C48, 0x5EE9 }, { 0x9C49, 0x5EEC }, { 0x9C4A, 0x5EF1 }, { 0x9C4B, 0x5EF3 }, { 0x9C4C, 0x5EF0 }, { 0x9C4D, 0x5EF4 },
+	{ 0x9C4E, 0x5EF8 }, { 0x9C4F, 0x5EFE }, { 0x9C50, 0x5F03 }, { 0x9C51, 0x5F09 }, { 0x9C52, 0x5F5D }, { 0x9C53, 0x5F5C }, { 0x9C54, 0x5F0B }, { 0x9C55, 0x5F11 },
+	{ 0x9C56, 0x5F16 }, { 0x9C57, 0x5F29 }, { 0x9C58, 0x5F2D }, { 0x9C59, 0x5F38 }, { 0x9C5A, 0x5F41 }, { 0x9C5B, 0x5F48 }, { 0x9C5C, 0x5F4C }, { 0x9C5D, 0x5F4E },
+	{ 0x9C5E, 0x5F2F }, { 0x9C5F, 0x5F51 }, { 0x9C60, 0x5F56 }, { 0x9C61, 0x5F57 }, { 0x9C62, 0x5F59 }, { 0x9C63, 0x5F61 }, { 0x9C64, 0x5F6D }, { 0x9C65, 0x5F73 },
+	{ 0x9C66, 0x5F77 }, { 0x9C67, 0x5F83 }, { 0x9C68, 0x5F82 }, { 0x9C69, 0x5F7F }, { 0x9C6A, 0x5F8A }, { 0x9C6B, 0x5F88 }, { 0x9C6C, 0x5F91 }, { 0x9C6D, 0x5F87 },
+	{ 0x9C6E, 0x5F9E }, { 0x9C6F, 0x5F99 }, { 0x9C70, 0x5F98 }, { 0x9C71, 0x5FA0 }, { 0x9C72, 0x5FA8 }, { 0x9C73, 0x5FAD }, { 0x9C74, 0x5FBC }, { 0x9C75, 0x5FD6 },
+	{ 0x9C76, 0x5FFB }, { 0x9C77, 0x5FE4 }, { 0x9C78, 0x5FF8 }, { 0x9C79, 0x5FF1 }, { 0x9C7A, 0x5FDD }, { 0x9C7B, 0x60B3 }, { 0x9C7C, 0x5FFF }, { 0x9C7D, 0x6021 },
+	{ 0x9C7E, 0x6060 }, { 0x9C80, 0x6019 }, { 0x9C81, 0x6010 }, { 0x9C82, 0x6029 }, { 0x9C83, 0x600E }, { 0x9C84, 0x6031 }, { 0x9C85, 0x601B }, { 0x9C86, 0x6015 },
+	{ 0x9C87, 0x602B }, { 0x9C88, 0x6026 }, { 0x9C89, 0x600F }, { 0x9C8A, 0x603A }, { 0x9C8B, 0x605A }, { 0x9C8C, 0x6041 }, { 0x9C8D, 0x606A }, { 0x9C8E, 0x6077 },
+	{ 0x9C8F, 0x605F }, { 0x9C90, 0x604A }, { 0x9C91, 0x6046 }, { 0x9C92, 0x604D }, { 0x9C93, 0x6063 }, { 0x9C94, 0x6043 }, { 0x9C95, 0x6064 }, { 0x9C96, 0x6042 },
+	{ 0x9C97, 0x606C }, { 0x9C98, 0x606B }, { 0x9C99, 0x6059 }, { 0x9C9A, 0x6081 }, { 0x9C9B, 0x608D }, { 0x9C9C, 0x60E7 }, { 0x9C9D, 0x6083 }, { 0x9C9E, 0x609A },
+	{ 0x9C9F, 0x6084 }, { 0x9CA0, 0x609B }, { 0x9CA1, 0x6096 }, { 0x9CA2, 0x6097 }, { 0x9CA3, 0x6092 }, { 0x9CA4, 0x60A7 }, { 0x9CA5, 0x608B }, { 0x9CA6, 0x60E1 },
+	{ 0x9CA7, 0x60B8 }, { 0x9CA8, 0x60E0 }, { 0x9CA9, 0x60D3 }, { 0x9CAA, 0x60B4 }, { 0x9CAB, 0x5FF0 }, { 0x9CAC, 0x60BD }, { 0x9CAD, 0x60C6 }, { 0x9CAE, 0x60B5 },
+	{ 0x9CAF, 0x60D8 }, { 0x9CB0, 0x614D }, { 0x9CB1, 0x6115 }, { 0x9CB2, 0x6106 }, { 0x9CB3, 0x60F6 }, { 0x9CB4, 0x60F7 }, { 0x9CB5, 0x6100 }, { 0x9CB6, 0x60F4 },
+	{ 0x9CB7, 0x60FA }, { 0x9CB8, 0x6103 }, { 0x9CB9, 0x6121 }, { 0x9CBA, 0x60FB }, { 0x9CBB, 0x60F1 }, { 0x9CBC, 0x610D }, { 0x9CBD, 0x610E }, { 0x9CBE, 0x6147 },
+	{ 0x9CBF, 0x613E }, { 0x9CC0, 0x6128 }, { 0x9CC1, 0x6127 }, { 0x9CC2, 0x614A }, { 0x9CC3, 0x613F }, { 0x9CC4, 0x613C }, { 0x9CC5, 0x612C }, { 0x9CC6, 0x6134 },
+	{ 0x9CC7, 0x613D }, { 0x9CC8, 0x6142 }, { 0x9CC9, 0x6144 }, { 0x9CCA, 0x6173 }, { 0x9CCB, 0x6177 }, { 0x9CCC, 0x6158 }, { 0x9CCD, 0x6159 }, { 0x9CCE, 0x615A },
+	{ 0x9CCF, 0x616B }, { 0x9CD0, 0x6174 }, { 0x9CD1, 0x616F }, { 0x9CD2, 0x6165 }, { 0x9CD3, 0x6171 }, { 0x9CD4, 0x615F }, { 0x9CD5, 0x615D }, { 0x9CD6, 0x6153 },
+	{ 0x9CD7, 0x6175 }, { 0x9CD8, 0x6199 }, { 0x9CD9, 0x6196 }, { 0x9CDA, 0x6187 }, { 0x9CDB, 0x61AC }, { 0x9CDC, 0x6194 }, { 0x9CDD, 0x619A }, { 0x9CDE, 0x618A },
+	{ 0x9CDF, 0x6191 }, { 0x9CE0, 0x61AB }, { 0x9CE1, 0x61AE }, { 0x9CE2, 0x61CC }, { 0x9CE3, 0x61CA }, { 0x9CE4, 0x61C9 }, { 0x9CE5, 0x61F7 }, { 0x9CE6, 0x61C8 },
+	{ 0x9CE7, 0x61C3 }, { 0x9CE8, 0x61C6 }, { 0x9CE9, 0x61BA }, { 0x9CEA, 0x61CB }, { 0x9CEB, 0x7F79 }, { 0x9CEC, 0x61CD }, { 0x9CED, 0x61E6 }, { 0x9CEE, 0x61E3 },
+	{ 0x9CEF, 0x61F6 }, { 0x9CF0, 0x61FA }, { 0x9CF1, 0x61F4 }, { 0x9CF2, 0x61FF }, { 0x9CF3, 0x61FD }, { 0x9CF4, 0x61FC }, { 0x9CF5, 0x61FE }, { 0x9CF6, 0x6200 },
+	{ 0x9CF7, 0x6208 }, { 0x9CF8, 0x6209 }, { 0x9CF9, 0x620D }, { 0x9CFA, 0x620C }, { 0x9CFB, 0x6214 }, { 0x9CFC, 0x621B }, { 0x9D40, 0x621E }, { 0x9D41, 0x6221 },
+	{ 0x9D42, 0x622A }, { 0x9D43, 0x622E }, { 0x9D44, 0x6230 }, { 0x9D45, 0x6232 }, { 0x9D46, 0x6233 }, { 0x9D47, 0x6241 }, { 0x9D48, 0x624E }, { 0x9D49, 0x625E },
+	{ 0x9D4A, 0x6263 }, { 0x9D4B, 0x625B }, { 0x9D4C, 0x6260 }, { 0x9D4D, 0x6268 }, { 0x9D4E, 0x627C }, { 0x9D4F, 0x6282 }, { 0x9D50, 0x6289 }, { 0x9D51, 0x627E },
+	{ 0x9D52, 0x6292 }, { 0x9D53, 0x6293 }, { 0x9D54, 0x6296 }, { 0x9D55, 0x62D4 }, { 0x9D56, 0x6283 }, { 0x9D57, 0x6294 }, { 0x9D58, 0x62D7 }, { 0x9D59, 0x62D1 },
+	{ 0x9D5A, 0x62BB }, { 0x9D5B, 0x62CF }, { 0x9D5C, 0x62FF }, { 0x9D5D, 0x62C6 }, { 0x9D5E, 0x64D4 }, { 0x9D5F, 0x62C8 }, { 0x9D60, 0x62DC }, { 0x9D61, 0x62CC },
+	{ 0x9D62, 0x62CA }, { 0x9D63, 0x62C2 }, { 0x9D64, 0x62C7 }, { 0x9D65, 0x629B }, { 0x9D66, 0x62C9 }, { 0x9D67, 0x630C }, { 0x9D68, 0x62EE }, { 0x9D69, 0x62F1 },
+	{ 0x9D6A, 0x6327 }, { 0x9D6B, 0x6302 }, { 0x9D6C, 0x6308 }, { 0x9D6D, 0x62EF }, { 0x9D6E, 0x62F5 }, { 0x9D6F, 0x6350 }, { 0x9D70, 0x633E }, { 0x9D71, 0x634D },
+	{ 0x9D72, 0x641C }, { 0x9D73, 0x634F }, { 0x9D74, 0x6396 }, { 0x9D75, 0x638E }, { 0x9D76, 0x6380 }, { 0x9D77, 0x63AB }, { 0x9D78, 0x6376 }, { 0x9D79, 0x63A3 },
+	{ 0x9D7A, 0x638F }, { 0x9D7B, 0x6389 }, { 0x9D7C, 0x639F }, { 0x9D7D, 0x63B5 }, { 0x9D7E, 0x636B }, { 0x9D80, 0x6369 }, { 0x9D81, 0x63BE }, { 0x9D82, 0x63E9 },
+	{ 0x9D83, 0x63C0 }, { 0x9D84, 0x63C6 }, { 0x9D85, 0x63E3 }, { 0x9D86, 0x63C9 }, { 0x9D87, 0x63D2 }, { 0x9D88, 0x63F6 }, { 0x9D89, 0x63C4 }, { 0x9D8A, 0x6416 },
+	{ 0x9D8B, 0x6434 }, { 0x9D8C, 0x6406 }, { 0x9D8D, 0x6413 }, { 0x9D8E, 0x6426 }, { 0x9D8F, 0x6436 }, { 0x9D90, 0x651D }, { 0x9D91, 0x6417 }, { 0x9D92, 0x6428 },
+	{ 0x9D93, 0x640F }, { 0x9D94, 0x6467 }, { 0x9D95, 0x646F }, { 0x9D96, 0x6476 }, { 0x9D97, 0x644E }, { 0x9D98, 0x652A }, { 0x9D99, 0x6495 }, { 0x9D9A, 0x6493 },
+	{ 0x9D9B, 0x64A5 }, { 0x9D9C, 0x64A9 }, { 0x9D9D, 0x6488 }, { 0x9D9E, 0x64BC }, { 0x9D9F, 0x64DA }, { 0x9DA0, 0x64D2 }, { 0x9DA1, 0x64C5 }, { 0x9DA2, 0x64C7 },
+	{ 0x9DA3, 0x64BB }, { 0x9DA4, 0x64D8 }, { 0x9DA5, 0x64C2 }, { 0x9DA6, 0x64F1 }, { 0x9DA7, 0x64E7 }, { 0x9DA8, 0x8209 }, { 0x9DA9, 0x64E0 }, { 0x9DAA, 0x64E1 },
+	{ 0x9DAB, 0x62AC }, { 0x9DAC, 0x64E3 }, { 0x9DAD, 0x64EF }, { 0x9DAE, 0x652C }, { 0x9DAF, 0x64F6 }, { 0x9DB0, 0x64F4 }, { 0x9DB1, 0x64F2 }, { 0x9DB2, 0x64FA },
+	{ 0x9DB3, 0x6500 }, { 0x9DB4, 0x64FD }, { 0x9DB5, 0x6518 }, { 0x9DB6, 0x651C }, { 0x9DB7, 0x6505 }, { 0x9DB8, 0x6524 }, { 0x9DB9, 0x6523 }, { 0x9DBA, 0x652B },
+	{ 0x9DBB, 0x6534 }, { 0x9DBC, 0x6535 }, { 0x9DBD, 0x6537 }, { 0x9DBE, 0x6536 }, { 0x9DBF, 0x6538 }, { 0x9DC0, 0x754B }, { 0x9DC1, 0x6548 }, { 0x9DC2, 0x6556 },
+	{ 0x9DC3, 0x6555 }, { 0x9DC4, 0x654D }, { 0x9DC5, 0x6558 }, { 0x9DC6, 0x655E }, { 0x9DC7, 0x655D }, { 0x9DC8, 0x6572 }, { 0x9DC9, 0x6578 }, { 0x9DCA, 0x6582 },
+	{ 0x9DCB, 0x6583 }, { 0x9DCC, 0x8B8A }, { 0x9DCD, 0x659B }, { 0x9DCE, 0x659F }, { 0x9DCF, 0x65AB }, { 0x9DD0, 0x65B7 }, { 0x9DD1, 0x65C3 }, { 0x9DD2, 0x65C6 },
+	{ 0x9DD3, 0x65C1 }, { 0x9DD4, 0x65C4 }, { 0x9DD5, 0x65CC }, { 0x9DD6, 0x65D2 }, { 0x9DD7, 0x65DB }, { 0x9DD8, 0x65D9 }, { 0x9DD9, 0x65E0 }, { 0x9DDA, 0x65E1 },
+	{ 0x9DDB, 0x65F1 }, { 0x9DDC, 0x6772 }, { 0x9DDD, 0x660A }, { 0x9DDE, 0x6603 }, { 0x9DDF, 0x65FB }, { 0x9DE0, 0x6773 }, { 0x9DE1, 0x6635 }, { 0x9DE2, 0x6636 },
+	{ 0x9DE3, 0x6634 }, { 0x9DE4, 0x661C }, { 0x9DE5, 0x664F }, { 0x9DE6, 0x6644 }, { 0x9DE7, 0x6649 }, { 0x9DE8, 0x6641 }, { 0x9DE9, 0x665E }, { 0x9DEA, 0x665D },
+	{ 0x9DEB, 0x6664 }, { 0x9DEC, 0x6667 }, { 0x9DED, 0x6668 }, { 0x9DEE, 0x665F }, { 0x9DEF, 0x6662 }, { 0x9DF0, 0x6670 }, { 0x9DF1, 0x6683 }, { 0x9DF2, 0x6688 },
+	{ 0x9DF3, 0x668E }, { 0x9DF4, 0x6689 }, { 0x9DF5, 0x6684 }, { 0x9DF6, 0x6698 }, { 0x9DF7, 0x669D }, { 0x9DF8, 0x66C1 }, { 0x9DF9, 0x66B9 }, { 0x9DFA, 0x66C9 },
+	{ 0x9DFB, 0x66BE }, { 0x9DFC, 0x66BC }, { 0x9E40, 0x66C4 }, { 0x9E41, 0x66B8 }, { 0x9E42, 0x66D6 }, { 0x9E43, 0x66DA }, { 0x9E44, 0x66E0 }, { 0x9E45, 0x663F },
+	{ 0x9E46, 0x66E6 }, { 0x9E47, 0x66E9 }, { 0x9E48, 0x66F0 }, { 0x9E49, 0x66F5 }, { 0x9E4A, 0x66F7 }, { 0x9E4B, 0x670F }, { 0x9E4C, 0x6716 }, { 0x9E4D, 0x671E },
+	{ 0x9E4E, 0x6726 }, { 0x9E4F, 0x6727 }, { 0x9E50, 0x9738 }, { 0x9E51, 0x672E }, { 0x9E52, 0x673F }, { 0x9E53, 0x6736 }, { 0x9E54, 0x6741 }, { 0x9E55, 0x6738 },
+	{ 0x9E56, 0x6737 }, { 0x9E57, 0x6746 }, { 0x9E58, 0x675E }, { 0x9E59, 0x6760 }, { 0x9E5A, 0x6759 }, { 0x9E5B, 0x6763 }, { 0x9E5C, 0x6764 }, { 0x9E5D, 0x6789 },
+	{ 0x9E5E, 0x6770 }, { 0x9E5F, 0x67A9 }, { 0x9E60, 0x677C }, { 0x9E61, 0x676A }, { 0x9E62, 0x678C }, { 0x9E63, 0x678B }, { 0x9E64, 0x67A6 }, { 0x9E65, 0x67A1 },
+	{ 0x9E66, 0x6785 }, { 0x9E67, 0x67B7 }, { 0x9E68, 0x67EF }, { 0x9E69, 0x67B4 }, { 0x9E6A, 0x67EC }, { 0x9E6B, 0x67B3 }, { 0x9E6C, 0x67E9 }, { 0x9E6D, 0x67B8 },
+	{ 0x9E6E, 0x67E4 }, { 0x9E6F, 0x67DE }, { 0x9E70, 0x67DD }, { 0x9E71, 0x67E2 }, { 0x9E72, 0x67EE }, { 0x9E73, 0x67B9 }, { 0x9E74, 0x67CE }, { 0x9E75, 0x67C6 },
+	{ 0x9E76, 0x67E7 }, { 0x9E77, 0x6A9C }, { 0x9E78, 0x681E }, { 0x9E79, 0x6846 }, { 0x9E7A, 0x6829 }, { 0x9E7B, 0x6840 }, { 0x9E7C, 0x684D }, { 0x9E7D, 0x6832 },
+	{ 0x9E7E, 0x684E }, { 0x9E80, 0x68B3 }, { 0x9E81, 0x682B }, { 0x9E82, 0x6859 }, { 0x9E83, 0x6863 }, { 0x9E84, 0x6877 }, { 0x9E85, 0x687F }, { 0x9E86, 0x689F },
+	{ 0x9E87, 0x688F }, { 0x9E88, 0x68AD }, { 0x9E89, 0x6894 }, { 0x9E8A, 0x689D }, { 0x9E8B, 0x689B }, { 0x9E8C, 0x6883 }, { 0x9E8D, 0x6AAE }, { 0x9E8E, 0x68B9 },
+	{ 0x9E8F, 0x6874 }, { 0x9E90, 0x68B5 }, { 0x9E91, 0x68A0 }, { 0x9E92, 0x68BA }, { 0x9E93, 0x690F }, { 0x9E94, 0x688D }, { 0x9E95, 0x687E }, { 0x9E96, 0x6901 },
+	{ 0x9E97, 0x68CA }, { 0x9E98, 0x6908 }, { 0x9E99, 0x68D8 }, { 0x9E9A, 0x6922 }, { 0x9E9B, 0x6926 }, { 0x9E9C, 0x68E1 }, { 0x9E9D, 0x690C }, { 0x9E9E, 0x68CD },
+	{ 0x9E9F, 0x68D4 }, { 0x9EA0, 0x68E7 }, { 0x9EA1, 0x68D5 }, { 0x9EA2, 0x6936 }, { 0x9EA3, 0x6912 }, { 0x9EA4, 0x6904 }, { 0x9EA5, 0x68D7 }, { 0x9EA6, 0x68E3 },
+	{ 0x9EA7, 0x6925 }, { 0x9EA8, 0x68F9 }, { 0x9EA9, 0x68E0 }, { 0x9EAA, 0x68EF }, { 0x9EAB, 0x6928 }, { 0x9EAC, 0x692A }, { 0x9EAD, 0x691A }, { 0x9EAE, 0x6923 },
+	{ 0x9EAF, 0x6921 }, { 0x9EB0, 0x68C6 }, { 0x9EB1, 0x6979 }, { 0x9EB2, 0x6977 }, { 0x9EB3, 0x695C }, { 0x9EB4, 0x6978 }, { 0x9EB5, 0x696B }, { 0x9EB6, 0x6954 },
+	{ 0x9EB7, 0x697E }, { 0x9EB8, 0x696E }, { 0x9EB9, 0x6939 }, { 0x9EBA, 0x6974 }, { 0x9EBB, 0x693D }, { 0x9EBC, 0x6959 }, { 0x9EBD, 0x6930 }, { 0x9EBE, 0x6961 },
+	{ 0x9EBF, 0x695E }, { 0x9EC0, 0x695D }, { 0x9EC1, 0x6981 }, { 0x9EC2, 0x696A }, { 0x9EC3, 0x69B2 }, { 0x9EC4, 0x69AE }, { 0x9EC5, 0x69D0 }, { 0x9EC6, 0x69BF },
+	{ 0x9EC7, 0x69C1 }, { 0x9EC8, 0x69D3 }, { 0x9EC9, 0x69BE }, { 0x9ECA, 0x69CE }, { 0x9ECB, 0x5BE8 }, { 0x9ECC, 0x69CA }, { 0x9ECD, 0x69DD }, { 0x9ECE, 0x69BB },
+	{ 0x9ECF, 0x69C3 }, { 0x9ED0, 0x69A7 }, { 0x9ED1, 0x6A2E }, { 0x9ED2, 0x6991 }, { 0x9ED3, 0x69A0 }, { 0x9ED4, 0x699C }, { 0x9ED5, 0x6995 }, { 0x9ED6, 0x69B4 },
+	{ 0x9ED7, 0x69DE }, { 0x9ED8, 0x69E8 }, { 0x9ED9, 0x6A02 }, { 0x9EDA, 0x6A1B }, { 0x9EDB, 0x69FF }, { 0x9EDC, 0x6B0A }, { 0x9EDD, 0x69F9 }, { 0x9EDE, 0x69F2 },
+	{ 0x9EDF, 0x69E7 }, { 0x9EE0, 0x6A05 }, { 0x9EE1, 0x69B1 }, { 0x9EE2, 0x6A1E }, { 0x9EE3, 0x69ED }, { 0x9EE4, 0x6A14 }, { 0x9EE5, 0x69EB }, { 0x9EE6, 0x6A0A },
+	{ 0x9EE7, 0x6A12 }, { 0x9EE8, 0x6AC1 }, { 0x9EE9, 0x6A23 }, { 0x9EEA, 0x6A13 }, { 0x9EEB, 0x6A44 }, { 0x9EEC, 0x6A0C }, { 0x9EED, 0x6A72 }, { 0x9EEE, 0x6A36 },
+	{ 0x9EEF, 0x6A78 }, { 0x9EF0, 0x6A47 }, { 0x9EF1, 0x6A62 }, { 0x9EF2, 0x6A59 }, { 0x9EF3, 0x6A66 }, { 0x9EF4, 0x6A48 }, { 0x9EF5, 0x6A38 }, { 0x9EF6, 0x6A22 },
+	{ 0x9EF7, 0x6A90 }, { 0x9EF8, 0x6A8D }, { 0x9EF9, 0x6AA0 }, { 0x9EFA, 0x6A84 }, { 0x9EFB, 0x6AA2 }, { 0x9EFC, 0x6AA3 }, { 0x9F40, 0x6A97 }, { 0x9F41, 0x8617 },
+	{ 0x9F42, 0x6ABB }, { 0x9F43, 0x6AC3 }, { 0x9F44, 0x6AC2 }, { 0x9F45, 0x6AB8 }, { 0x9F46, 0x6AB3 }, { 0x9F47, 0x6AAC }, { 0x9F48, 0x6ADE }, { 0x9F49, 0x6AD1 },
+	{ 0x9F4A, 0x6ADF }, { 0x9F4B, 0x6AAA }, { 0x9F4C, 0x6ADA }, { 0x9F4D, 0x6AEA }, { 0x9F4E, 0x6AFB }, { 0x9F4F, 0x6B05 }, { 0x9F50, 0x8616 }, { 0x9F51, 0x6AFA },
+	{ 0x9F52, 0x6B12 }, { 0x9F53, 0x6B16 }, { 0x9F54, 0x9B31 }, { 0x9F55, 0x6B1F }, { 0x9F56, 0x6B38 }, { 0x9F57, 0x6B37 }, { 0x9F58, 0x76DC }, { 0x9F59, 0x6B39 },
+	{ 0x9F5A, 0x98EE }, { 0x9F5B, 0x6B47 }, { 0x9F5C, 0x6B43 }, { 0x9F5D, 0x6B49 }, { 0x9F5E, 0x6B50 }, { 0x9F5F, 0x6B59 }, { 0x9F60, 0x6B54 }, { 0x9F61, 0x6B5B },
+	{ 0x9F62, 0x6B5F }, { 0x9F63, 0x6B61 }, { 0x9F64, 0x6B78 }, { 0x9F65, 0x6B79 }, { 0x9F66, 0x6B7F }, { 0x9F67, 0x6B80 }, { 0x9F68, 0x6B84 }, { 0x9F69, 0x6B83 },
+	{ 0x9F6A, 0x6B8D }, { 0x9F6B, 0x6B98 }, { 0x9F6C, 0x6B95 }, { 0x9F6D, 0x6B9E }, { 0x9F6E, 0x6BA4 }, { 0x9F6F, 0x6BAA }, { 0x9F70, 0x6BAB }, { 0x9F71, 0x6BAF },
+	{ 0x9F72, 0x6BB2 }, { 0x9F73, 0x6BB1 }, { 0x9F74, 0x6BB3 }, { 0x9F75, 0x6BB7 }, { 0x9F76, 0x6BBC }, { 0x9F77, 0x6BC6 }, { 0x9F78, 0x6BCB }, { 0x9F79, 0x6BD3 },
+	{ 0x9F7A, 0x6BDF }, { 0x9F7B, 0x6BEC }, { 0x9F7C, 0x6BEB }, { 0x9F7D, 0x6BF3 }, { 0x9F7E, 0x6BEF }, { 0x9F80, 0x9EBE }, { 0x9F81, 0x6C08 }, { 0x9F82, 0x6C13 },
+	{ 0x9F83, 0x6C14 }, { 0x9F84, 0x6C1B }, { 0x9F85, 0x6C24 }, { 0x9F86, 0x6C23 }, { 0x9F87, 0x6C5E }, { 0x9F88, 0x6C55 }, { 0x9F89, 0x6C62 }, { 0x9F8A, 0x6C6A },
+	{ 0x9F8B, 0x6C82 }, { 0x9F8C, 0x6C8D }, { 0x9F8D, 0x6C9A }, { 0x9F8E, 0x6C81 }, { 0x9F8F, 0x6C9B }, { 0x9F90, 0x6C7E }, { 0x9F91, 0x6C68 }, { 0x9F92, 0x6C73 },
+	{ 0x9F93, 0x6C92 }, { 0x9F94, 0x6C90 }, { 0x9F95, 0x6CC4 }, { 0x9F96, 0x6CF1 }, { 0x9F97, 0x6CD3 }, { 0x9F98, 0x6CBD }, { 0x9F99, 0x6CD7 }, { 0x9F9A, 0x6CC5 },
+	{ 0x9F9B, 0x6CDD }, { 0x9F9C, 0x6CAE }, { 0x9F9D, 0x6CB1 }, { 0x9F9E, 0x6CBE }, { 0x9F9F, 0x6CBA }, { 0x9FA0, 0x6CDB }, { 0x9FA1, 0x6CEF }, { 0x9FA2, 0x6CD9 },
+	{ 0x9FA3, 0x6CEA }, { 0x9FA4, 0x6D1F }, { 0x9FA5, 0x884D }, { 0x9FA6, 0x6D36 }, { 0x9FA7, 0x6D2B }, { 0x9FA8, 0x6D3D }, { 0x9FA9, 0x6D38 }, { 0x9FAA, 0x6D19 },
+	{ 0x9FAB, 0x6D35 }, { 0x9FAC, 0x6D33 }, { 0x9FAD, 0x6D12 }, { 0x9FAE, 0x6D0C }, { 0x9FAF, 0x6D63 }, { 0x9FB0, 0x6D93 }, { 0x9FB1, 0x6D64 }, { 0x9FB2, 0x6D5A },
+	{ 0x9FB3, 0x6D79 }, { 0x9FB4, 0x6D59 }, { 0x9FB5, 0x6D8E }, { 0x9FB6, 0x6D95 }, { 0x9FB7, 0x6FE4 }, { 0x9FB8, 0x6D85 }, { 0x9FB9, 0x6DF9 }, { 0x9FBA, 0x6E15 },
+	{ 0x9FBB, 0x6E0A }, { 0x9FBC, 0x6DB5 }, { 0x9FBD, 0x6DC7 }, { 0x9FBE, 0x6DE6 }, { 0x9FBF, 0x6DB8 }, { 0x9FC0, 0x6DC6 }, { 0x9FC1, 0x6DEC }, { 0x9FC2, 0x6DDE },
+	{ 0x9FC3, 0x6DCC }, { 0x9FC4, 0x6DE8 }, { 0x9FC5, 0x6DD2 }, { 0x9FC6, 0x6DC5 }, { 0x9FC7, 0x6DFA }, { 0x9FC8, 0x6DD9 }, { 0x9FC9, 0x6DE4 }, { 0x9FCA, 0x6DD5 },
+	{ 0x9FCB, 0x6DEA }, { 0x9FCC, 0x6DEE }, { 0x9FCD, 0x6E2D }, { 0x9FCE, 0x6E6E }, { 0x9FCF, 0x6E2E }, { 0x9FD0, 0x6E19 }, { 0x9FD1, 0x6E72 }, { 0x9FD2, 0x6E5F },
+	{ 0x9FD3, 0x6E3E }, { 0x9FD4, 0x6E23 }, { 0x9FD5, 0x6E6B }, { 0x9FD6, 0x6E2B }, { 0x9FD7, 0x6E76 }, { 0x9FD8, 0x6E4D }, { 0x9FD9, 0x6E1F }, { 0x9FDA, 0x6E43 },
+	{ 0x9FDB, 0x6E3A }, { 0x9FDC, 0x6E4E }, { 0x9FDD, 0x6E24 }, { 0x9FDE, 0x6EFF }, { 0x9FDF, 0x6E1D }, { 0x9FE0, 0x6E38 }, { 0x9FE1, 0x6E82 }, { 0x9FE2, 0x6EAA },
+	{ 0x9FE3, 0x6E98 }, { 0x9FE4, 0x6EC9 }, { 0x9FE5, 0x6EB7 }, { 0x9FE6, 0x6ED3 }, { 0x9FE7, 0x6EBD }, { 0x9FE8, 0x6EAF }, { 0x9FE9, 0x6EC4 }, { 0x9FEA, 0x6EB2 },
+	{ 0x9FEB, 0x6ED4 }, { 0x9FEC, 0x6ED5 }, { 0x9FED, 0x6E8F }, { 0x9FEE, 0x6EA5 }, { 0x9FEF, 0x6EC2 }, { 0x9FF0, 0x6E9F }, { 0x9FF1, 0x6F41 }, { 0x9FF2, 0x6F11 },
+	{ 0x9FF3, 0x704C }, { 0x9FF4, 0x6EEC }, { 0x9FF5, 0x6EF8 }, { 0x9FF6, 0x6EFE }, { 0x9FF7, 0x6F3F }, { 0x9FF8, 0x6EF2 }, { 0x9FF9, 0x6F31 }, { 0x9FFA, 0x6EEF },
+	{ 0x9FFB, 0x6F32 }, { 0x9FFC, 0x6ECC }, { 0xE040, 0x6F3E }, { 0xE041, 0x6F13 }, { 0xE042, 0x6EF7 }, { 0xE043, 0x6F86 }, { 0xE044, 0x6F7A }, { 0xE045, 0x6F78 },
+	{ 0xE046, 0x6F81 }, { 0xE047, 0x6F80 }, { 0xE048, 0x6F6F }, { 0xE049, 0x6F5B }, { 0xE04A, 0x6FF3 }, { 0xE04B, 0x6F6D }, { 0xE04C, 0x6F82 }, { 0xE04D, 0x6F7C },
+	{ 0xE04E, 0x6F58 }, { 0xE04F, 0x6F8E }, { 0xE050, 0x6F91 }, { 0xE051, 0x6FC2 }, { 0xE052, 0x6F66 }, { 0xE053, 0x6FB3 }, { 0xE054, 0x6FA3 }, { 0xE055, 0x6FA1 },
+	{ 0xE056, 0x6FA4 }, { 0xE057, 0x6FB9 }, { 0xE058, 0x6FC6 }, { 0xE059, 0x6FAA }, { 0xE05A, 0x6FDF }, { 0xE05B, 0x6FD5 }, { 0xE05C, 0x6FEC }, { 0xE05D, 0x6FD4 },
+	{ 0xE05E, 0x6FD8 }, { 0xE05F, 0x6FF1 }, { 0xE060, 0x6FEE }, { 0xE061, 0x6FDB }, { 0xE062, 0x7009 }, { 0xE063, 0x700B }, { 0xE064, 0x6FFA }, { 0xE065, 0x7011 },
+	{ 0xE066, 0x7001 }, { 0xE067, 0x700F }, { 0xE068, 0x6FFE }, { 0xE069, 0x701B }, { 0xE06A, 0x701A }, { 0xE06B, 0x6F74 }, { 0xE06C, 0x701D }, { 0xE06D, 0x7018 },
+	{ 0xE06E, 0x701F }, { 0xE06F, 0x7030 }, { 0xE070, 0x703E }, { 0xE071, 0x7032 }, { 0xE072, 0x7051 }, { 0xE073, 0x7063 }, { 0xE074, 0x7099 }, { 0xE075, 0x7092 },
+	{ 0xE076, 0x70AF }, { 0xE077, 0x70F1 }, { 0xE078, 0x70AC }, { 0xE079, 0x70B8 }, { 0xE07A, 0x70B3 }, { 0xE07B, 0x70AE }, { 0xE07C, 0x70DF }, { 0xE07D, 0x70CB },
+	{ 0xE07E, 0x70DD }, { 0xE080, 0x70D9 }, { 0xE081, 0x7109 }, { 0xE082, 0x70FD }, { 0xE083, 0x711C }, { 0xE084, 0x7119 }, { 0xE085, 0x7165 }, { 0xE086, 0x7155 },
+	{ 0xE087, 0x7188 }, { 0xE088, 0x7166 }, { 0xE089, 0x7162 }, { 0xE08A, 0x714C }, { 0xE08B, 0x7156 }, { 0xE08C, 0x716C }, { 0xE08D, 0x718F }, { 0xE08E, 0x71FB },
+	{ 0xE08F, 0x7184 }, { 0xE090, 0x7195 }, { 0xE091, 0x71A8 }, { 0xE092, 0x71AC }, { 0xE093, 0x71D7 }, { 0xE094, 0x71B9 }, { 0xE095, 0x71BE }, { 0xE096, 0x71D2 },
+	{ 0xE097, 0x71C9 }, { 0xE098, 0x71D4 }, { 0xE099, 0x71CE }, { 0xE09A, 0x71E0 }, { 0xE09B, 0x71EC }, { 0xE09C, 0x71E7 }, { 0xE09D, 0x71F5 }, { 0xE09E, 0x71FC },
+	{ 0xE09F, 0x71F9 }, { 0xE0A0, 0x71FF }, { 0xE0A1, 0x720D }, { 0xE0A2, 0x7210 }, { 0xE0A3, 0x721B }, { 0xE0A4, 0x7228 }, { 0xE0A5, 0x722D }, { 0xE0A6, 0x722C },
+	{ 0xE0A7, 0x7230 }, { 0xE0A8, 0x7232 }, { 0xE0A9, 0x723B }, { 0xE0AA, 0x723C }, { 0xE0AB, 0x723F }, { 0xE0AC, 0x7240 }, { 0xE0AD, 0x7246 }, { 0xE0AE, 0x724B },
+	{ 0xE0AF, 0x7258 }, { 0xE0B0, 0x7274 }, { 0xE0B1, 0x727E }, { 0xE0B2, 0x7282 }, { 0xE0B3, 0x7281 }, { 0xE0B4, 0x7287 }, { 0xE0B5, 0x7292 }, { 0xE0B6, 0x7296 },
+	{ 0xE0B7, 0x72A2 }, { 0xE0B8, 0x72A7 }, { 0xE0B9, 0x72B9 }, { 0xE0BA, 0x72B2 }, { 0xE0BB, 0x72C3 }, { 0xE0BC, 0x72C6 }, { 0xE0BD, 0x72C4 }, { 0xE0BE, 0x72CE },
+	{ 0xE0BF, 0x72D2 }, { 0xE0C0, 0x72E2 }, { 0xE0C1, 0x72E0 }, { 0xE0C2, 0x72E1 }, { 0xE0C3, 0x72F9 }, { 0xE0C4, 0x72F7 }, { 0xE0C5, 0x500F }, { 0xE0C6, 0x7317 },
+	{ 0xE0C7, 0x730A }, { 0xE0C8, 0x731C }, { 0xE0C9, 0x7316 }, { 0xE0CA, 0x731D }, { 0xE0CB, 0x7334 }, { 0xE0CC, 0x732F }, { 0xE0CD, 0x7329 }, { 0xE0CE, 0x7325 },
+	{ 0xE0CF, 0x733E }, { 0xE0D0, 0x734E }, { 0xE0D1, 0x734F }, { 0xE0D2, 0x9ED8 }, { 0xE0D3, 0x7357 }, { 0xE0D4, 0x736A }, { 0xE0D5, 0x7368 }, { 0xE0D6, 0x7370 },
+	{ 0xE0D7, 0x7378 }, { 0xE0D8, 0x7375 }, { 0xE0D9, 0x737B }, { 0xE0DA, 0x737A }, { 0xE0DB, 0x73C8 }, { 0xE0DC, 0x73B3 }, { 0xE0DD, 0x73CE }, { 0xE0DE, 0x73BB },
+	{ 0xE0DF, 0x73C0 }, { 0xE0E0, 0x73E5 }, { 0xE0E1, 0x73EE }, { 0xE0E2, 0x73DE }, { 0xE0E3, 0x74A2 }, { 0xE0E4, 0x7405 }, { 0xE0E5, 0x746F }, { 0xE0E6, 0x7425 },
+	{ 0xE0E7, 0x73F8 }, { 0xE0E8, 0x7432 }, { 0xE0E9, 0x743A }, { 0xE0EA, 0x7455 }, { 0xE0EB, 0x743F }, { 0xE0EC, 0x745F }, { 0xE0ED, 0x7459 }, { 0xE0EE, 0x7441 },
+	{ 0xE0EF, 0x745C }, { 0xE0F0, 0x7469 }, { 0xE0F1, 0x7470 }, { 0xE0F2, 0x7463 }, { 0xE0F3, 0x746A }, { 0xE0F4, 0x7476 }, { 0xE0F5, 0x747E }, { 0xE0F6, 0x748B },
+	{ 0xE0F7, 0x749E }, { 0xE0F8, 0x74A7 }, { 0xE0F9, 0x74CA }, { 0xE0FA, 0x74CF }, { 0xE0FB, 0x74D4 }, { 0xE0FC, 0x73F1 }, { 0xE140, 0x74E0 }, { 0xE141, 0x74E3 },
+	{ 0xE142, 0x74E7 }, { 0xE143, 0x74E9 }, { 0xE144, 0x74EE }, { 0xE145, 0x74F2 }, { 0xE146, 0x74F0 }, { 0xE147, 0x74F1 }, { 0xE148, 0x74F8 }, { 0xE149, 0x74F7 },
+	{ 0xE14A, 0x7504 }, { 0xE14B, 0x7503 }, { 0xE14C, 0x7505 }, { 0xE14D, 0x750C }, { 0xE14E, 0x750E }, { 0xE14F, 0x750D }, { 0xE150, 0x7515 }, { 0xE151, 0x7513 },
+	{ 0xE152, 0x751E }, { 0xE153, 0x7526 }, { 0xE154, 0x752C }, { 0xE155, 0x753C }, { 0xE156, 0x7544 }, { 0xE157, 0x754D }, { 0xE158, 0x754A }, { 0xE159, 0x7549 },
+	{ 0xE15A, 0x755B }, { 0xE15B, 0x7546 }, { 0xE15C, 0x755A }, { 0xE15D, 0x7569 }, { 0xE15E, 0x7564 }, { 0xE15F, 0x7567 }, { 0xE160, 0x756B }, { 0xE161, 0x756D },
+	{ 0xE162, 0x7578 }, { 0xE163, 0x7576 }, { 0xE164, 0x7586 }, { 0xE165, 0x7587 }, { 0xE166, 0x7574 }, { 0xE167, 0x758A }, { 0xE168, 0x7589 }, { 0xE169, 0x7582 },
+	{ 0xE16A, 0x7594 }, { 0xE16B, 0x759A }, { 0xE16C, 0x759D }, { 0xE16D, 0x75A5 }, { 0xE16E, 0x75A3 }, { 0xE16F, 0x75C2 }, { 0xE170, 0x75B3 }, { 0xE171, 0x75C3 },
+	{ 0xE172, 0x75B5 }, { 0xE173, 0x75BD }, { 0xE174, 0x75B8 }, { 0xE175, 0x75BC }, { 0xE176, 0x75B1 }, { 0xE177, 0x75CD }, { 0xE178, 0x75CA }, { 0xE179, 0x75D2 },
+	{ 0xE17A, 0x75D9 }, { 0xE17B, 0x75E3 }, { 0xE17C, 0x75DE }, { 0xE17D, 0x75FE }, { 0xE17E, 0x75FF }, { 0xE180, 0x75FC }, { 0xE181, 0x7601 }, { 0xE182, 0x75F0 },
+	{ 0xE183, 0x75FA }, { 0xE184, 0x75F2 }, { 0xE185, 0x75F3 }, { 0xE186, 0x760B }, { 0xE187, 0x760D }, { 0xE188, 0x7609 }, { 0xE189, 0x761F }, { 0xE18A, 0x7627 },
+	{ 0xE18B, 0x7620 }, { 0xE18C, 0x7621 }, { 0xE18D, 0x7622 }, { 0xE18E, 0x7624 }, { 0xE18F, 0x7634 }, { 0xE190, 0x7630 }, { 0xE191, 0x763B }, { 0xE192, 0x7647 },
+	{ 0xE193, 0x7648 }, { 0xE194, 0x7646 }, { 0xE195, 0x765C }, { 0xE196, 0x7658 }, { 0xE197, 0x7661 }, { 0xE198, 0x7662 }, { 0xE199, 0x7668 }, { 0xE19A, 0x7669 },
+	{ 0xE19B, 0x766A }, { 0xE19C, 0x7667 }, { 0xE19D, 0x766C }, { 0xE19E, 0x7670 }, { 0xE19F, 0x7672 }, { 0xE1A0, 0x7676 }, { 0xE1A1, 0x7678 }, { 0xE1A2, 0x767C },
+	{ 0xE1A3, 0x7680 }, { 0xE1A4, 0x7683 }, { 0xE1A5, 0x7688 }, { 0xE1A6, 0x768B }, { 0xE1A7, 0x768E }, { 0xE1A8, 0x7696 }, { 0xE1A9, 0x7693 }, { 0xE1AA, 0x7699 },
+	{ 0xE1AB, 0x769A }, { 0xE1AC, 0x76B0 }, { 0xE1AD, 0x76B4 }, { 0xE1AE, 0x76B8 }, { 0xE1AF, 0x76B9 }, { 0xE1B0, 0x76BA }, { 0xE1B1, 0x76C2 }, { 0xE1B2, 0x76CD },
+	{ 0xE1B3, 0x76D6 }, { 0xE1B4, 0x76D2 }, { 0xE1B5, 0x76DE }, { 0xE1B6, 0x76E1 }, { 0xE1B7, 0x76E5 }, { 0xE1B8, 0x76E7 }, { 0xE1B9, 0x76EA }, { 0xE1BA, 0x862F },
+	{ 0xE1BB, 0x76FB }, { 0xE1BC, 0x7708 }, { 0xE1BD, 0x7707 }, { 0xE1BE, 0x7704 }, { 0xE1BF, 0x7729 }, { 0xE1C0, 0x7724 }, { 0xE1C1, 0x771E }, { 0xE1C2, 0x7725 },
+	{ 0xE1C3, 0x7726 }, { 0xE1C4, 0x771B }, { 0xE1C5, 0x7737 }, { 0xE1C6, 0x7738 }, { 0xE1C7, 0x7747 }, { 0xE1C8, 0x775A }, { 0xE1C9, 0x7768 }, { 0xE1CA, 0x776B },
+	{ 0xE1CB, 0x775B }, { 0xE1CC, 0x7765 }, { 0xE1CD, 0x777F }, { 0xE1CE, 0x777E }, { 0xE1CF, 0x7779 }, { 0xE1D0, 0x778E }, { 0xE1D1, 0x778B }, { 0xE1D2, 0x7791 },
+	{ 0xE1D3, 0x77A0 }, { 0xE1D4, 0x779E }, { 0xE1D5, 0x77B0 }, { 0xE1D6, 0x77B6 }, { 0xE1D7, 0x77B9 }, { 0xE1D8, 0x77BF }, { 0xE1D9, 0x77BC }, { 0xE1DA, 0x77BD },
+	{ 0xE1DB, 0x77BB }, { 0xE1DC, 0x77C7 }, { 0xE1DD, 0x77CD }, { 0xE1DE, 0x77D7 }, { 0xE1DF, 0x77DA }, { 0xE1E0, 0x77DC }, { 0xE1E1, 0x77E3 }, { 0xE1E2, 0x77EE },
+	{ 0xE1E3, 0x77FC }, { 0xE1E4, 0x780C }, { 0xE1E5, 0x7812 }, { 0xE1E6, 0x7926 }, { 0xE1E7, 0x7820 }, { 0xE1E8, 0x792A }, { 0xE1E9, 0x7845 }, { 0xE1EA, 0x788E },
+	{ 0xE1EB, 0x7874 }, { 0xE1EC, 0x7886 }, { 0xE1ED, 0x787C }, { 0xE1EE, 0x789A }, { 0xE1EF, 0x788C }, { 0xE1F0, 0x78A3 }, { 0xE1F1, 0x78B5 }, { 0xE1F2, 0x78AA },
+	{ 0xE1F3, 0x78AF }, { 0xE1F4, 0x78D1 }, { 0xE1F5, 0x78C6 }, { 0xE1F6, 0x78CB }, { 0xE1F7, 0x78D4 }, { 0xE1F8, 0x78BE }, { 0xE1F9, 0x78BC }, { 0xE1FA, 0x78C5 },
+	{ 0xE1FB, 0x78CA }, { 0xE1FC, 0x78EC }, { 0xE240, 0x78E7 }, { 0xE241, 0x78DA }, { 0xE242, 0x78FD }, { 0xE243, 0x78F4 }, { 0xE244, 0x7907 }, { 0xE245, 0x7912 },
+	{ 0xE246, 0x7911 }, { 0xE247, 0x7919 }, { 0xE248, 0x792C }, { 0xE249, 0x792B }, { 0xE24A, 0x7940 }, { 0xE24B, 0x7960 }, { 0xE24C, 0x7957 }, { 0xE24D, 0x795F },
+	{ 0xE24E, 0x795A }, { 0xE24F, 0x7955 }, { 0xE250, 0x7953 }, { 0xE251, 0x797A }, { 0xE252, 0x797F }, { 0xE253, 0x798A }, { 0xE254, 0x799D }, { 0xE255, 0x79A7 },
+	{ 0xE256, 0x9F4B }, { 0xE257, 0x79AA }, { 0xE258, 0x79AE }, { 0xE259, 0x79B3 }, { 0xE25A, 0x79B9 }, { 0xE25B, 0x79BA }, { 0xE25C, 0x79C9 }, { 0xE25D, 0x79D5 },
+	{ 0xE25E, 0x79E7 }, { 0xE25F, 0x79EC }, { 0xE260, 0x79E1 }, { 0xE261, 0x79E3 }, { 0xE262, 0x7A08 }, { 0xE263, 0x7A0D }, { 0xE264, 0x7A18 }, { 0xE265, 0x7A19 },
+	{ 0xE266, 0x7A20 }, { 0xE267, 0x7A1F }, { 0xE268, 0x7980 }, { 0xE269, 0x7A31 }, { 0xE26A, 0x7A3B }, { 0xE26B, 0x7A3E }, { 0xE26C, 0x7A37 }, { 0xE26D, 0x7A43 },
+	{ 0xE26E, 0x7A57 }, { 0xE26F, 0x7A49 }, { 0xE270, 0x7A61 }, { 0xE271, 0x7A62 }, { 0xE272, 0x7A69 }, { 0xE273, 0x9F9D }, { 0xE274, 0x7A70 }, { 0xE275, 0x7A79 },
+	{ 0xE276, 0x7A7D }, { 0xE277, 0x7A88 }, { 0xE278, 0x7A97 }, { 0xE279, 0x7A95 }, { 0xE27A, 0x7A98 }, { 0xE27B, 0x7A96 }, { 0xE27C, 0x7AA9 }, { 0xE27D, 0x7AC8 },
+	{ 0xE27E, 0x7AB0 }, { 0xE280, 0x7AB6 }, { 0xE281, 0x7AC5 }, { 0xE282, 0x7AC4 }, { 0xE283, 0x7ABF }, { 0xE284, 0x9083 }, { 0xE285, 0x7AC7 }, { 0xE286, 0x7ACA },
+	{ 0xE287, 0x7ACD }, { 0xE288, 0x7ACF }, { 0xE289, 0x7AD5 }, { 0xE28A, 0x7AD3 }, { 0xE28B, 0x7AD9 }, { 0xE28C, 0x7ADA }, { 0xE28D, 0x7ADD }, { 0xE28E, 0x7AE1 },
+	{ 0xE28F, 0x7AE2 }, { 0xE290, 0x7AE6 }, { 0xE291, 0x7AED }, { 0xE292, 0x7AF0 }, { 0xE293, 0x7B02 }, { 0xE294, 0x7B0F }, { 0xE295, 0x7B0A }, { 0xE296, 0x7B06 },
+	{ 0xE297, 0x7B33 }, { 0xE298, 0x7B18 }, { 0xE299, 0x7B19 }, { 0xE29A, 0x7B1E }, { 0xE29B, 0x7B35 }, { 0xE29C, 0x7B28 }, { 0xE29D, 0x7B36 }, { 0xE29E, 0x7B50 },
+	{ 0xE29F, 0x7B7A }, { 0xE2A0, 0x7B04 }, { 0xE2A1, 0x7B4D }, { 0xE2A2, 0x7B0B }, { 0xE2A3, 0x7B4C }, { 0xE2A4, 0x7B45 }, { 0xE2A5, 0x7B75 }, { 0xE2A6, 0x7B65 },
+	{ 0xE2A7, 0x7B74 }, { 0xE2A8, 0x7B67 }, { 0xE2A9, 0x7B70 }, { 0xE2AA, 0x7B71 }, { 0xE2AB, 0x7B6C }, { 0xE2AC, 0x7B6E }, { 0xE2AD, 0x7B9D }, { 0xE2AE, 0x7B98 },
+	{ 0xE2AF, 0x7B9F }, { 0xE2B0, 0x7B8D }, { 0xE2B1, 0x7B9C }, { 0xE2B2, 0x7B9A }, { 0xE2B3, 0x7B8B }, { 0xE2B4, 0x7B92 }, { 0xE2B5, 0x7B8F }, { 0xE2B6, 0x7B5D },
+	{ 0xE2B7, 0x7B99 }, { 0xE2B8, 0x7BCB }, { 0xE2B9, 0x7BC1 }, { 0xE2BA, 0x7BCC }, { 0xE2BB, 0x7BCF }, { 0xE2BC, 0x7BB4 }, { 0xE2BD, 0x7BC6 }, { 0xE2BE, 0x7BDD },
+	{ 0xE2BF, 0x7BE9 }, { 0xE2C0, 0x7C11 }, { 0xE2C1, 0x7C14 }, { 0xE2C2, 0x7BE6 }, { 0xE2C3, 0x7BE5 }, { 0xE2C4, 0x7C60 }, { 0xE2C5, 0x7C00 }, { 0xE2C6, 0x7C07 },
+	{ 0xE2C7, 0x7C13 }, { 0xE2C8, 0x7BF3 }, { 0xE2C9, 0x7BF7 }, { 0xE2CA, 0x7C17 }, { 0xE2CB, 0x7C0D }, { 0xE2CC, 0x7BF6 }, { 0xE2CD, 0x7C23 }, { 0xE2CE, 0x7C27 },
+	{ 0xE2CF, 0x7C2A }, { 0xE2D0, 0x7C1F }, { 0xE2D1, 0x7C37 }, { 0xE2D2, 0x7C2B }, { 0xE2D3, 0x7C3D }, { 0xE2D4, 0x7C4C }, { 0xE2D5, 0x7C43 }, { 0xE2D6, 0x7C54 },
+	{ 0xE2D7, 0x7C4F }, { 0xE2D8, 0x7C40 }, { 0xE2D9, 0x7C50 }, { 0xE2DA, 0x7C58 }, { 0xE2DB, 0x7C5F }, { 0xE2DC, 0x7C64 }, { 0xE2DD, 0x7C56 }, { 0xE2DE, 0x7C65 },
+	{ 0xE2DF, 0x7C6C }, { 0xE2E0, 0x7C75 }, { 0xE2E1, 0x7C83 }, { 0xE2E2, 0x7C90 }, { 0xE2E3, 0x7CA4 }, { 0xE2E4, 0x7CAD }, { 0xE2E5, 0x7CA2 }, { 0xE2E6, 0x7CAB },
+	{ 0xE2E7, 0x7CA1 }, { 0xE2E8, 0x7CA8 }, { 0xE2E9, 0x7CB3 }, { 0xE2EA, 0x7CB2 }, { 0xE2EB, 0x7CB1 }, { 0xE2EC, 0x7CAE }, { 0xE2ED, 0x7CB9 }, { 0xE2EE, 0x7CBD },
+	{ 0xE2EF, 0x7CC0 }, { 0xE2F0, 0x7CC5 }, { 0xE2F1, 0x7CC2 }, { 0xE2F2, 0x7CD8 }, { 0xE2F3, 0x7CD2 }, { 0xE2F4, 0x7CDC }, { 0xE2F5, 0x7CE2 }, { 0xE2F6, 0x9B3B },
+	{ 0xE2F7, 0x7CEF }, { 0xE2F8, 0x7CF2 }, { 0xE2F9, 0x7CF4 }, { 0xE2FA, 0x7CF6 }, { 0xE2FB, 0x7CFA }, { 0xE2FC, 0x7D06 }, { 0xE340, 0x7D02 }, { 0xE341, 0x7D1C },
+	{ 0xE342, 0x7D15 }, { 0xE343, 0x7D0A }, { 0xE344, 0x7D45 }, { 0xE345, 0x7D4B }, { 0xE346, 0x7D2E }, { 0xE347, 0x7D32 }, { 0xE348, 0x7D3F }, { 0xE349, 0x7D35 },
+	{ 0xE34A, 0x7D46 }, { 0xE34B, 0x7D73 }, { 0xE34C, 0x7D56 }, { 0xE34D, 0x7D4E }, { 0xE34E, 0x7D72 }, { 0xE34F, 0x7D68 }, { 0xE350, 0x7D6E }, { 0xE351, 0x7D4F },
+	{ 0xE352, 0x7D63 }, { 0xE353, 0x7D93 }, { 0xE354, 0x7D89 }, { 0xE355, 0x7D5B }, { 0xE356, 0x7D8F }, { 0xE357, 0x7D7D }, { 0xE358, 0x7D9B }, { 0xE359, 0x7DBA },
+	{ 0xE35A, 0x7DAE }, { 0xE35B, 0x7DA3 }, { 0xE35C, 0x7DB5 }, { 0xE35D, 0x7DC7 }, { 0xE35E, 0x7DBD }, { 0xE35F, 0x7DAB }, { 0xE360, 0x7E3D }, { 0xE361, 0x7DA2 },
+	{ 0xE362, 0x7DAF }, { 0xE363, 0x7DDC }, { 0xE364, 0x7DB8 }, { 0xE365, 0x7D9F }, { 0xE366, 0x7DB0 }, { 0xE367, 0x7DD8 }, { 0xE368, 0x7DDD }, { 0xE369, 0x7DE4 },
+	{ 0xE36A, 0x7DDE }, { 0xE36B, 0x7DFB }, { 0xE36C, 0x7DF2 }, { 0xE36D, 0x7DE1 }, { 0xE36E, 0x7E05 }, { 0xE36F, 0x7E0A }, { 0xE370, 0x7E23 }, { 0xE371, 0x7E21 },
+	{ 0xE372, 0x7E12 }, { 0xE373, 0x7E31 }, { 0xE374, 0x7E1F }, { 0xE375, 0x7E09 }, { 0xE376, 0x7E0B }, { 0xE377, 0x7E22 }, { 0xE378, 0x7E46 }, { 0xE379, 0x7E66 },
+	{ 0xE37A, 0x7E3B }, { 0xE37B, 0x7E35 }, { 0xE37C, 0x7E39 }, { 0xE37D, 0x7E43 }, { 0xE37E, 0x7E37 }, { 0xE380, 0x7E32 }, { 0xE381, 0x7E3A }, { 0xE382, 0x7E67 },
+	{ 0xE383, 0x7E5D }, { 0xE384, 0x7E56 }, { 0xE385, 0x7E5E }, { 0xE386, 0x7E59 }, { 0xE387, 0x7E5A }, { 0xE388, 0x7E79 }, { 0xE389, 0x7E6A }, { 0xE38A, 0x7E69 },
+	{ 0xE38B, 0x7E7C }, { 0xE38C, 0x7E7B }, { 0xE38D, 0x7E83 }, { 0xE38E, 0x7DD5 }, { 0xE38F, 0x7E7D }, { 0xE390, 0x8FAE }, { 0xE391, 0x7E7F }, { 0xE392, 0x7E88 },
+	{ 0xE393, 0x7E89 }, { 0xE394, 0x7E8C }, { 0xE395, 0x7E92 }, { 0xE396, 0x7E90 }, { 0xE397, 0x7E93 }, { 0xE398, 0x7E94 }, { 0xE399, 0x7E96 }, { 0xE39A, 0x7E8E },
+	{ 0xE39B, 0x7E9B }, { 0xE39C, 0x7E9C }, { 0xE39D, 0x7F38 }, { 0xE39E, 0x7F3A }, { 0xE39F, 0x7F45 }, { 0xE3A0, 0x7F4C }, { 0xE3A1, 0x7F4D }, { 0xE3A2, 0x7F4E },
+	{ 0xE3A3, 0x7F50 }, { 0xE3A4, 0x7F51 }, { 0xE3A5, 0x7F55 }, { 0xE3A6, 0x7F54 }, { 0xE3A7, 0x7F58 }, { 0xE3A8, 0x7F5F }, { 0xE3A9, 0x7F60 }, { 0xE3AA, 0x7F68 },
+	{ 0xE3AB, 0x7F69 }, { 0xE3AC, 0x7F67 }, { 0xE3AD, 0x7F78 }, { 0xE3AE, 0x7F82 }, { 0xE3AF, 0x7F86 }, { 0xE3B0, 0x7F83 }, { 0xE3B1, 0x7F88 }, { 0xE3B2, 0x7F87 },
+	{ 0xE3B3, 0x7F8C }, { 0xE3B4, 0x7F94 }, { 0xE3B5, 0x7F9E }, { 0xE3B6, 0x7F9D }, { 0xE3B7, 0x7F9A }, { 0xE3B8, 0x7FA3 }, { 0xE3B9, 0x7FAF }, { 0xE3BA, 0x7FB2 },
+	{ 0xE3BB, 0x7FB9 }, { 0xE3BC, 0x7FAE }, { 0xE3BD, 0x7FB6 }, { 0xE3BE, 0x7FB8 }, { 0xE3BF, 0x8B71 }, { 0xE3C0, 0x7FC5 }, { 0xE3C1, 0x7FC6 }, { 0xE3C2, 0x7FCA },
+	{ 0xE3C3, 0x7FD5 }, { 0xE3C4, 0x7FD4 }, { 0xE3C5, 0x7FE1 }, { 0xE3C6, 0x7FE6 }, { 0xE3C7, 0x7FE9 }, { 0xE3C8, 0x7FF3 }, { 0xE3C9, 0x7FF9 }, { 0xE3CA, 0x98DC },
+	{ 0xE3CB, 0x8006 }, { 0xE3CC, 0x8004 }, { 0xE3CD, 0x800B }, { 0xE3CE, 0x8012 }, { 0xE3CF, 0x8018 }, { 0xE3D0, 0x8019 }, { 0xE3D1, 0x801C }, { 0xE3D2, 0x8021 },
+	{ 0xE3D3, 0x8028 }, { 0xE3D4, 0x803F }, { 0xE3D5, 0x803B }, { 0xE3D6, 0x804A }, { 0xE3D7, 0x8046 }, { 0xE3D8, 0x8052 }, { 0xE3D9, 0x8058 }, { 0xE3DA, 0x805A },
+	{ 0xE3DB, 0x805F }, { 0xE3DC, 0x8062 }, { 0xE3DD, 0x8068 }, { 0xE3DE, 0x8073 }, { 0xE3DF, 0x8072 }, { 0xE3E0, 0x8070 }, { 0xE3E1, 0x8076 }, { 0xE3E2, 0x8079 },
+	{ 0xE3E3, 0x807D }, { 0xE3E4, 0x807F }, { 0xE3E5, 0x8084 }, { 0xE3E6, 0x8086 }, { 0xE3E7, 0x8085 }, { 0xE3E8, 0x809B }, { 0xE3E9, 0x8093 }, { 0xE3EA, 0x809A },
+	{ 0xE3EB, 0x80AD }, { 0xE3EC, 0x5190 }, { 0xE3ED, 0x80AC }, { 0xE3EE, 0x80DB }, { 0xE3EF, 0x80E5 }, { 0xE3F0, 0x80D9 }, { 0xE3F1, 0x80DD }, { 0xE3F2, 0x80C4 },
+	{ 0xE3F3, 0x80DA }, { 0xE3F4, 0x80D6 }, { 0xE3F5, 0x8109 }, { 0xE3F6, 0x80EF }, { 0xE3F7, 0x80F1 }, { 0xE3F8, 0x811B }, { 0xE3F9, 0x8129 }, { 0xE3FA, 0x8123 },
+	{ 0xE3FB, 0x812F }, { 0xE3FC, 0x814B }, { 0xE440, 0x968B }, { 0xE441, 0x8146 }, { 0xE442, 0x813E }, { 0xE443, 0x8153 }, { 0xE444, 0x8151 }, { 0xE445, 0x80FC },
+	{ 0xE446, 0x8171 }, { 0xE447, 0x816E }, { 0xE448, 0x8165 }, { 0xE449, 0x8166 }, { 0xE44A, 0x8174 }, { 0xE44B, 0x8183 }, { 0xE44C, 0x8188 }, { 0xE44D, 0x818A },
+	{ 0xE44E, 0x8180 }, { 0xE44F, 0x8182 }, { 0xE450, 0x81A0 }, { 0xE451, 0x8195 }, { 0xE452, 0x81A4 }, { 0xE453, 0x81A3 }, { 0xE454, 0x815F }, { 0xE455, 0x8193 },
+	{ 0xE456, 0x81A9 }, { 0xE457, 0x81B0 }, { 0xE458, 0x81B5 }, { 0xE459, 0x81BE }, { 0xE45A, 0x81B8 }, { 0xE45B, 0x81BD }, { 0xE45C, 0x81C0 }, { 0xE45D, 0x81C2 },
+	{ 0xE45E, 0x81BA }, { 0xE45F, 0x81C9 }, { 0xE460, 0x81CD }, { 0xE461, 0x81D1 }, { 0xE462, 0x81D9 }, { 0xE463, 0x81D8 }, { 0xE464, 0x81C8 }, { 0xE465, 0x81DA },
+	{ 0xE466, 0x81DF }, { 0xE467, 0x81E0 }, { 0xE468, 0x81E7 }, { 0xE469, 0x81FA }, { 0xE46A, 0x81FB }, { 0xE46B, 0x81FE }, { 0xE46C, 0x8201 }, { 0xE46D, 0x8202 },
+	{ 0xE46E, 0x8205 }, { 0xE46F, 0x8207 }, { 0xE470, 0x820A }, { 0xE471, 0x820D }, { 0xE472, 0x8210 }, { 0xE473, 0x8216 }, { 0xE474, 0x8229 }, { 0xE475, 0x822B },
+	{ 0xE476, 0x8238 }, { 0xE477, 0x8233 }, { 0xE478, 0x8240 }, { 0xE479, 0x8259 }, { 0xE47A, 0x8258 }, { 0xE47B, 0x825D }, { 0xE47C, 0x825A }, { 0xE47D, 0x825F },
+	{ 0xE47E, 0x8264 }, { 0xE480, 0x8262 }, { 0xE481, 0x8268 }, { 0xE482, 0x826A }, { 0xE483, 0x826B }, { 0xE484, 0x822E }, { 0xE485, 0x8271 }, { 0xE486, 0x8277 },
+	{ 0xE487, 0x8278 }, { 0xE488, 0x827E }, { 0xE489, 0x828D }, { 0xE48A, 0x8292 }, { 0xE48B, 0x82AB }, { 0xE48C, 0x829F }, { 0xE48D, 0x82BB }, { 0xE48E, 0x82AC },
+	{ 0xE48F, 0x82E1 }, { 0xE490, 0x82E3 }, { 0xE491, 0x82DF }, { 0xE492, 0x82D2 }, { 0xE493, 0x82F4 }, { 0xE494, 0x82F3 }, { 0xE495, 0x82FA }, { 0xE496, 0x8393 },
+	{ 0xE497, 0x8303 }, { 0xE498, 0x82FB }, { 0xE499, 0x82F9 }, { 0xE49A, 0x82DE }, { 0xE49B, 0x8306 }, { 0xE49C, 0x82DC }, { 0xE49D, 0x8309 }, { 0xE49E, 0x82D9 },
+	{ 0xE49F, 0x8335 }, { 0xE4A0, 0x8334 }, { 0xE4A1, 0x8316 }, { 0xE4A2, 0x8332 }, { 0xE4A3, 0x8331 }, { 0xE4A4, 0x8340 }, { 0xE4A5, 0x8339 }, { 0xE4A6, 0x8350 },
+	{ 0xE4A7, 0x8345 }, { 0xE4A8, 0x832F }, { 0xE4A9, 0x832B }, { 0xE4AA, 0x8317 }, { 0xE4AB, 0x8318 }, { 0xE4AC, 0x8385 }, { 0xE4AD, 0x839A }, { 0xE4AE, 0x83AA },
+	{ 0xE4AF, 0x839F }, { 0xE4B0, 0x83A2 }, { 0xE4B1, 0x8396 }, { 0xE4B2, 0x8323 }, { 0xE4B3, 0x838E }, { 0xE4B4, 0x8387 }, { 0xE4B5, 0x838A }, { 0xE4B6, 0x837C },
+	{ 0xE4B7, 0x83B5 }, { 0xE4B8, 0x8373 }, { 0xE4B9, 0x8375 }, { 0xE4BA, 0x83A0 }, { 0xE4BB, 0x8389 }, { 0xE4BC, 0x83A8 }, { 0xE4BD, 0x83F4 }, { 0xE4BE, 0x8413 },
+	{ 0xE4BF, 0x83EB }, { 0xE4C0, 0x83CE }, { 0xE4C1, 0x83FD }, { 0xE4C2, 0x8403 }, { 0xE4C3, 0x83D8 }, { 0xE4C4, 0x840B }, { 0xE4C5, 0x83C1 }, { 0xE4C6, 0x83F7 },
+	{ 0xE4C7, 0x8407 }, { 0xE4C8, 0x83E0 }, { 0xE4C9, 0x83F2 }, { 0xE4CA, 0x840D }, { 0xE4CB, 0x8422 }, { 0xE4CC, 0x8420 }, { 0xE4CD, 0x83BD }, { 0xE4CE, 0x8438 },
+	{ 0xE4CF, 0x8506 }, { 0xE4D0, 0x83FB }, { 0xE4D1, 0x846D }, { 0xE4D2, 0x842A }, { 0xE4D3, 0x843C }, { 0xE4D4, 0x855A }, { 0xE4D5, 0x8484 }, { 0xE4D6, 0x8477 },
+	{ 0xE4D7, 0x846B }, { 0xE4D8, 0x84AD }, { 0xE4D9, 0x846E }, { 0xE4DA, 0x8482 }, { 0xE4DB, 0x8469 }, { 0xE4DC, 0x8446 }, { 0xE4DD, 0x842C }, { 0xE4DE, 0x846F },
+	{ 0xE4DF, 0x8479 }, { 0xE4E0, 0x8435 }, { 0xE4E1, 0x84CA }, { 0xE4E2, 0x8462 }, { 0xE4E3, 0x84B9 }, { 0xE4E4, 0x84BF }, { 0xE4E5, 0x849F }, { 0xE4E6, 0x84D9 },
+	{ 0xE4E7, 0x84CD }, { 0xE4E8, 0x84BB }, { 0xE4E9, 0x84DA }, { 0xE4EA, 0x84D0 }, { 0xE4EB, 0x84C1 }, { 0xE4EC, 0x84C6 }, { 0xE4ED, 0x84D6 }, { 0xE4EE, 0x84A1 },
+	{ 0xE4EF, 0x8521 }, { 0xE4F0, 0x84FF }, { 0xE4F1, 0x84F4 }, { 0xE4F2, 0x8517 }, { 0xE4F3, 0x8518 }, { 0xE4F4, 0x852C }, { 0xE4F5, 0x851F }, { 0xE4F6, 0x8515 },
+	{ 0xE4F7, 0x8514 }, { 0xE4F8, 0x84FC }, { 0xE4F9, 0x8540 }, { 0xE4FA, 0x8563 }, { 0xE4FB, 0x8558 }, { 0xE4FC, 0x8548 }, { 0xE540, 0x8541 }, { 0xE541, 0x8602 },
+	{ 0xE542, 0x854B }, { 0xE543, 0x8555 }, { 0xE544, 0x8580 }, { 0xE545, 0x85A4 }, { 0xE546, 0x8588 }, { 0xE547, 0x8591 }, { 0xE548, 0x858A }, { 0xE549, 0x85A8 },
+	{ 0xE54A, 0x856D }, { 0xE54B, 0x8594 }, { 0xE54C, 0x859B }, { 0xE54D, 0x85EA }, { 0xE54E, 0x8587 }, { 0xE54F, 0x859C }, { 0xE550, 0x8577 }, { 0xE551, 0x857E },
+	{ 0xE552, 0x8590 }, { 0xE553, 0x85C9 }, { 0xE554, 0x85BA }, { 0xE555, 0x85CF }, { 0xE556, 0x85B9 }, { 0xE557, 0x85D0 }, { 0xE558, 0x85D5 }, { 0xE559, 0x85DD },
+	{ 0xE55A, 0x85E5 }, { 0xE55B, 0x85DC }, { 0xE55C, 0x85F9 }, { 0xE55D, 0x860A }, { 0xE55E, 0x8613 }, { 0xE55F, 0x860B }, { 0xE560, 0x85FE }, { 0xE561, 0x85FA },
+	{ 0xE562, 0x8606 }, { 0xE563, 0x8622 }, { 0xE564, 0x861A }, { 0xE565, 0x8630 }, { 0xE566, 0x863F }, { 0xE567, 0x864D }, { 0xE568, 0x4E55 }, { 0xE569, 0x8654 },
+	{ 0xE56A, 0x865F }, { 0xE56B, 0x8667 }, { 0xE56C, 0x8671 }, { 0xE56D, 0x8693 }, { 0xE56E, 0x86A3 }, { 0xE56F, 0x86A9 }, { 0xE570, 0x86AA }, { 0xE571, 0x868B },
+	{ 0xE572, 0x868C }, { 0xE573, 0x86B6 }, { 0xE574, 0x86AF }, { 0xE575, 0x86C4 }, { 0xE576, 0x86C6 }, { 0xE577, 0x86B0 }, { 0xE578, 0x86C9 }, { 0xE579, 0x8823 },
+	{ 0xE57A, 0x86AB }, { 0xE57B, 0x86D4 }, { 0xE57C, 0x86DE }, { 0xE57D, 0x86E9 }, { 0xE57E, 0x86EC }, { 0xE580, 0x86DF }, { 0xE581, 0x86DB }, { 0xE582, 0x86EF },
+	{ 0xE583, 0x8712 }, { 0xE584, 0x8706 }, { 0xE585, 0x8708 }, { 0xE586, 0x8700 }, { 0xE587, 0x8703 }, { 0xE588, 0x86FB }, { 0xE589, 0x8711 }, { 0xE58A, 0x8709 },
+	{ 0xE58B, 0x870D }, { 0xE58C, 0x86F9 }, { 0xE58D, 0x870A }, { 0xE58E, 0x8734 }, { 0xE58F, 0x873F }, { 0xE590, 0x8737 }, { 0xE591, 0x873B }, { 0xE592, 0x8725 },
+	{ 0xE593, 0x8729 }, { 0xE594, 0x871A }, { 0xE595, 0x8760 }, { 0xE596, 0x875F }, { 0xE597, 0x8778 }, { 0xE598, 0x874C }, { 0xE599, 0x874E }, { 0xE59A, 0x8774 },
+	{ 0xE59B, 0x8757 }, { 0xE59C, 0x8768 }, { 0xE59D, 0x876E }, { 0xE59E, 0x8759 }, { 0xE59F, 0x8753 }, { 0xE5A0, 0x8763 }, { 0xE5A1, 0x876A }, { 0xE5A2, 0x8805 },
+	{ 0xE5A3, 0x87A2 }, { 0xE5A4, 0x879F }, { 0xE5A5, 0x8782 }, { 0xE5A6, 0x87AF }, { 0xE5A7, 0x87CB }, { 0xE5A8, 0x87BD }, { 0xE5A9, 0x87C0 }, { 0xE5AA, 0x87D0 },
+	{ 0xE5AB, 0x96D6 }, { 0xE5AC, 0x87AB }, { 0xE5AD, 0x87C4 }, { 0xE5AE, 0x87B3 }, { 0xE5AF, 0x87C7 }, { 0xE5B0, 0x87C6 }, { 0xE5B1, 0x87BB }, { 0xE5B2, 0x87EF },
+	{ 0xE5B3, 0x87F2 }, { 0xE5B4, 0x87E0 }, { 0xE5B5, 0x880F }, { 0xE5B6, 0x880D }, { 0xE5B7, 0x87FE }, { 0xE5B8, 0x87F6 }, { 0xE5B9, 0x87F7 }, { 0xE5BA, 0x880E },
+	{ 0xE5BB, 0x87D2 }, { 0xE5BC, 0x8811 }, { 0xE5BD, 0x8816 }, { 0xE5BE, 0x8815 }, { 0xE5BF, 0x8822 }, { 0xE5C0, 0x8821 }, { 0xE5C1, 0x8831 }, { 0xE5C2, 0x8836 },
+	{ 0xE5C3, 0x8839 }, { 0xE5C4, 0x8827 }, { 0xE5C5, 0x883B }, { 0xE5C6, 0x8844 }, { 0xE5C7, 0x8842 }, { 0xE5C8, 0x8852 }, { 0xE5C9, 0x8859 }, { 0xE5CA, 0x885E },
+	{ 0xE5CB, 0x8862 }, { 0xE5CC, 0x886B }, { 0xE5CD, 0x8881 }, { 0xE5CE, 0x887E }, { 0xE5CF, 0x889E }, { 0xE5D0, 0x8875 }, { 0xE5D1, 0x887D }, { 0xE5D2, 0x88B5 },
+	{ 0xE5D3, 0x8872 }, { 0xE5D4, 0x8882 }, { 0xE5D5, 0x8897 }, { 0xE5D6, 0x8892 }, { 0xE5D7, 0x88AE }, { 0xE5D8, 0x8899 }, { 0xE5D9, 0x88A2 }, { 0xE5DA, 0x888D },
+	{ 0xE5DB, 0x88A4 }, { 0xE5DC, 0x88B0 }, { 0xE5DD, 0x88BF }, { 0xE5DE, 0x88B1 }, { 0xE5DF, 0x88C3 }, { 0xE5E0, 0x88C4 }, { 0xE5E1, 0x88D4 }, { 0xE5E2, 0x88D8 },
+	{ 0xE5E3, 0x88D9 }, { 0xE5E4, 0x88DD }, { 0xE5E5, 0x88F9 }, { 0xE5E6, 0x8902 }, { 0xE5E7, 0x88FC }, { 0xE5E8, 0x88F4 }, { 0xE5E9, 0x88E8 }, { 0xE5EA, 0x88F2 },
+	{ 0xE5EB, 0x8904 }, { 0xE5EC, 0x890C }, { 0xE5ED, 0x890A }, { 0xE5EE, 0x8913 }, { 0xE5EF, 0x8943 }, { 0xE5F0, 0x891E }, { 0xE5F1, 0x8925 }, { 0xE5F2, 0x892A },
+	{ 0xE5F3, 0x892B }, { 0xE5F4, 0x8941 }, { 0xE5F5, 0x8944 }, { 0xE5F6, 0x893B }, { 0xE5F7, 0x8936 }, { 0xE5F8, 0x8938 }, { 0xE5F9, 0x894C }, { 0xE5FA, 0x891D },
+	{ 0xE5FB, 0x8960 }, { 0xE5FC, 0x895E }, { 0xE640, 0x8966 }, { 0xE641, 0x8964 }, { 0xE642, 0x896D }, { 0xE643, 0x896A }, { 0xE644, 0x896F }, { 0xE645, 0x8974 },
+	{ 0xE646, 0x8977 }, { 0xE647, 0x897E }, { 0xE648, 0x8983 }, { 0xE649, 0x8988 }, { 0xE64A, 0x898A }, { 0xE64B, 0x8993 }, { 0xE64C, 0x8998 }, { 0xE64D, 0x89A1 },
+	{ 0xE64E, 0x89A9 }, { 0xE64F, 0x89A6 }, { 0xE650, 0x89AC }, { 0xE651, 0x89AF }, { 0xE652, 0x89B2 }, { 0xE653, 0x89BA }, { 0xE654, 0x89BD }, { 0xE655, 0x89BF },
+	{ 0xE656, 0x89C0 }, { 0xE657, 0x89DA }, { 0xE658, 0x89DC }, { 0xE659, 0x89DD }, { 0xE65A, 0x89E7 }, { 0xE65B, 0x89F4 }, { 0xE65C, 0x89F8 }, { 0xE65D, 0x8A03 },
+	{ 0xE65E, 0x8A16 }, { 0xE65F, 0x8A10 }, { 0xE660, 0x8A0C }, { 0xE661, 0x8A1B }, { 0xE662, 0x8A1D }, { 0xE663, 0x8A25 }, { 0xE664, 0x8A36 }, { 0xE665, 0x8A41 },
+	{ 0xE666, 0x8A5B }, { 0xE667, 0x8A52 }, { 0xE668, 0x8A46 }, { 0xE669, 0x8A48 }, { 0xE66A, 0x8A7C }, { 0xE66B, 0x8A6D }, { 0xE66C, 0x8A6C }, { 0xE66D, 0x8A62 },
+	{ 0xE66E, 0x8A85 }, { 0xE66F, 0x8A82 }, { 0xE670, 0x8A84 }, { 0xE671, 0x8AA8 }, { 0xE672, 0x8AA1 }, { 0xE673, 0x8A91 }, { 0xE674, 0x8AA5 }, { 0xE675, 0x8AA6 },
+	{ 0xE676, 0x8A9A }, { 0xE677, 0x8AA3 }, { 0xE678, 0x8AC4 }, { 0xE679, 0x8ACD }, { 0xE67A, 0x8AC2 }, { 0xE67B, 0x8ADA }, { 0xE67C, 0x8AEB }, { 0xE67D, 0x8AF3 },
+	{ 0xE67E, 0x8AE7 }, { 0xE680, 0x8AE4 }, { 0xE681, 0x8AF1 }, { 0xE682, 0x8B14 }, { 0xE683, 0x8AE0 }, { 0xE684, 0x8AE2 }, { 0xE685, 0x8AF7 }, { 0xE686, 0x8ADE },
+	{ 0xE687, 0x8ADB }, { 0xE688, 0x8B0C }, { 0xE689, 0x8B07 }, { 0xE68A, 0x8B1A }, { 0xE68B, 0x8AE1 }, { 0xE68C, 0x8B16 }, { 0xE68D, 0x8B10 }, { 0xE68E, 0x8B17 },
+	{ 0xE68F, 0x8B20 }, { 0xE690, 0x8B33 }, { 0xE691, 0x97AB }, { 0xE692, 0x8B26 }, { 0xE693, 0x8B2B }, { 0xE694, 0x8B3E }, { 0xE695, 0x8B28 }, { 0xE696, 0x8B41 },
+	{ 0xE697, 0x8B4C }, { 0xE698, 0x8B4F }, { 0xE699, 0x8B4E }, { 0xE69A, 0x8B49 }, { 0xE69B, 0x8B56 }, { 0xE69C, 0x8B5B }, { 0xE69D, 0x8B5A }, { 0xE69E, 0x8B6B },
+	{ 0xE69F, 0x8B5F }, { 0xE6A0, 0x8B6C }, { 0xE6A1, 0x8B6F }, { 0xE6A2, 0x8B74 }, { 0xE6A3, 0x8B7D }, { 0xE6A4, 0x8B80 }, { 0xE6A5, 0x8B8C }, { 0xE6A6, 0x8B8E },
+	{ 0xE6A7, 0x8B92 }, { 0xE6A8, 0x8B93 }, { 0xE6A9, 0x8B96 }, { 0xE6AA, 0x8B99 }, { 0xE6AB, 0x8B9A }, { 0xE6AC, 0x8C3A }, { 0xE6AD, 0x8C41 }, { 0xE6AE, 0x8C3F },
+	{ 0xE6AF, 0x8C48 }, { 0xE6B0, 0x8C4C }, { 0xE6B1, 0x8C4E }, { 0xE6B2, 0x8C50 }, { 0xE6B3, 0x8C55 }, { 0xE6B4, 0x8C62 }, { 0xE6B5, 0x8C6C }, { 0xE6B6, 0x8C78 },
+	{ 0xE6B7, 0x8C7A }, { 0xE6B8, 0x8C82 }, { 0xE6B9, 0x8C89 }, { 0xE6BA, 0x8C85 }, { 0xE6BB, 0x8C8A }, { 0xE6BC, 0x8C8D }, { 0xE6BD, 0x8C8E }, { 0xE6BE, 0x8C94 },
+	{ 0xE6BF, 0x8C7C }, { 0xE6C0, 0x8C98 }, { 0xE6C1, 0x621D }, { 0xE6C2, 0x8CAD }, { 0xE6C3, 0x8CAA }, { 0xE6C4, 0x8CBD }, { 0xE6C5, 0x8CB2 }, { 0xE6C6, 0x8CB3 },
+	{ 0xE6C7, 0x8CAE }, { 0xE6C8, 0x8CB6 }, { 0xE6C9, 0x8CC8 }, { 0xE6CA, 0x8CC1 }, { 0xE6CB, 0x8CE4 }, { 0xE6CC, 0x8CE3 }, { 0xE6CD, 0x8CDA }, { 0xE6CE, 0x8CFD },
+	{ 0xE6CF, 0x8CFA }, { 0xE6D0, 0x8CFB }, { 0xE6D1, 0x8D04 }, { 0xE6D2, 0x8D05 }, { 0xE6D3, 0x8D0A }, { 0xE6D4, 0x8D07 }, { 0xE6D5, 0x8D0F }, { 0xE6D6, 0x8D0D },
+	{ 0xE6D7, 0x8D10 }, { 0xE6D8, 0x9F4E }, { 0xE6D9, 0x8D13 }, { 0xE6DA, 0x8CCD }, { 0xE6DB, 0x8D14 }, { 0xE6DC, 0x8D16 }, { 0xE6DD, 0x8D67 }, { 0xE6DE, 0x8D6D },
+	{ 0xE6DF, 0x8D71 }, { 0xE6E0, 0x8D73 }, { 0xE6E1, 0x8D81 }, { 0xE6E2, 0x8D99 }, { 0xE6E3, 0x8DC2 }, { 0xE6E4, 0x8DBE }, { 0xE6E5, 0x8DBA }, { 0xE6E6, 0x8DCF },
+	{ 0xE6E7, 0x8DDA }, { 0xE6E8, 0x8DD6 }, { 0xE6E9, 0x8DCC }, { 0xE6EA, 0x8DDB }, { 0xE6EB, 0x8DCB }, { 0xE6EC, 0x8DEA }, { 0xE6ED, 0x8DEB }, { 0xE6EE, 0x8DDF },
+	{ 0xE6EF, 0x8DE3 }, { 0xE6F0, 0x8DFC }, { 0xE6F1, 0x8E08 }, { 0xE6F2, 0x8E09 }, { 0xE6F3, 0x8DFF }, { 0xE6F4, 0x8E1D }, { 0xE6F5, 0x8E1E }, { 0xE6F6, 0x8E10 },
+	{ 0xE6F7, 0x8E1F }, { 0xE6F8, 0x8E42 }, { 0xE6F9, 0x8E35 }, { 0xE6FA, 0x8E30 }, { 0xE6FB, 0x8E34 }, { 0xE6FC, 0x8E4A }, { 0xE740, 0x8E47 }, { 0xE741, 0x8E49 },
+	{ 0xE742, 0x8E4C }, { 0xE743, 0x8E50 }, { 0xE744, 0x8E48 }, { 0xE745, 0x8E59 }, { 0xE746, 0x8E64 }, { 0xE747, 0x8E60 }, { 0xE748, 0x8E2A }, { 0xE749, 0x8E63 },
+	{ 0xE74A, 0x8E55 }, { 0xE74B, 0x8E76 }, { 0xE74C, 0x8E72 }, { 0xE74D, 0x8E7C }, { 0xE74E, 0x8E81 }, { 0xE74F, 0x8E87 }, { 0xE750, 0x8E85 }, { 0xE751, 0x8E84 },
+	{ 0xE752, 0x8E8B }, { 0xE753, 0x8E8A }, { 0xE754, 0x8E93 }, { 0xE755, 0x8E91 }, { 0xE756, 0x8E94 }, { 0xE757, 0x8E99 }, { 0xE758, 0x8EAA }, { 0xE759, 0x8EA1 },
+	{ 0xE75A, 0x8EAC }, { 0xE75B, 0x8EB0 }, { 0xE75C, 0x8EC6 }, { 0xE75D, 0x8EB1 }, { 0xE75E, 0x8EBE }, { 0xE75F, 0x8EC5 }, { 0xE760, 0x8EC8 }, { 0xE761, 0x8ECB },
+	{ 0xE762, 0x8EDB }, { 0xE763, 0x8EE3 }, { 0xE764, 0x8EFC }, { 0xE765, 0x8EFB }, { 0xE766, 0x8EEB }, { 0xE767, 0x8EFE }, { 0xE768, 0x8F0A }, { 0xE769, 0x8F05 },
+	{ 0xE76A, 0x8F15 }, { 0xE76B, 0x8F12 }, { 0xE76C, 0x8F19 }, { 0xE76D, 0x8F13 }, { 0xE76E, 0x8F1C }, { 0xE76F, 0x8F1F }, { 0xE770, 0x8F1B }, { 0xE771, 0x8F0C },
+	{ 0xE772, 0x8F26 }, { 0xE773, 0x8F33 }, { 0xE774, 0x8F3B }, { 0xE775, 0x8F39 }, { 0xE776, 0x8F45 }, { 0xE777, 0x8F42 }, { 0xE778, 0x8F3E }, { 0xE779, 0x8F4C },
+	{ 0xE77A, 0x8F49 }, { 0xE77B, 0x8F46 }, { 0xE77C, 0x8F4E }, { 0xE77D, 0x8F57 }, { 0xE77E, 0x8F5C }, { 0xE780, 0x8F62 }, { 0xE781, 0x8F63 }, { 0xE782, 0x8F64 },
+	{ 0xE783, 0x8F9C }, { 0xE784, 0x8F9F }, { 0xE785, 0x8FA3 }, { 0xE786, 0x8FAD }, { 0xE787, 0x8FAF }, { 0xE788, 0x8FB7 }, { 0xE789, 0x8FDA }, { 0xE78A, 0x8FE5 },
+	{ 0xE78B, 0x8FE2 }, { 0xE78C, 0x8FEA }, { 0xE78D, 0x8FEF }, { 0xE78E, 0x9087 }, { 0xE78F, 0x8FF4 }, { 0xE790, 0x9005 }, { 0xE791, 0x8FF9 }, { 0xE792, 0x8FFA },
+	{ 0xE793, 0x9011 }, { 0xE794, 0x9015 }, { 0xE795, 0x9021 }, { 0xE796, 0x900D }, { 0xE797, 0x901E }, { 0xE798, 0x9016 }, { 0xE799, 0x900B }, { 0xE79A, 0x9027 },
+	{ 0xE79B, 0x9036 }, { 0xE79C, 0x9035 }, { 0xE79D, 0x9039 }, { 0xE79E, 0x8FF8 }, { 0xE79F, 0x904F }, { 0xE7A0, 0x9050 }, { 0xE7A1, 0x9051 }, { 0xE7A2, 0x9052 },
+	{ 0xE7A3, 0x900E }, { 0xE7A4, 0x9049 }, { 0xE7A5, 0x903E }, { 0xE7A6, 0x9056 }, { 0xE7A7, 0x9058 }, { 0xE7A8, 0x905E }, { 0xE7A9, 0x9068 }, { 0xE7AA, 0x906F },
+	{ 0xE7AB, 0x9076 }, { 0xE7AC, 0x96A8 }, { 0xE7AD, 0x9072 }, { 0xE7AE, 0x9082 }, { 0xE7AF, 0x907D }, { 0xE7B0, 0x9081 }, { 0xE7B1, 0x9080 }, { 0xE7B2, 0x908A },
+	{ 0xE7B3, 0x9089 }, { 0xE7B4, 0x908F }, { 0xE7B5, 0x90A8 }, { 0xE7B6, 0x90AF }, { 0xE7B7, 0x90B1 }, { 0xE7B8, 0x90B5 }, { 0xE7B9, 0x90E2 }, { 0xE7BA, 0x90E4 },
+	{ 0xE7BB, 0x6248 }, { 0xE7BC, 0x90DB }, { 0xE7BD, 0x9102 }, { 0xE7BE, 0x9112 }, { 0xE7BF, 0x9119 }, { 0xE7C0, 0x9132 }, { 0xE7C1, 0x9130 }, { 0xE7C2, 0x914A },
+	{ 0xE7C3, 0x9156 }, { 0xE7C4, 0x9158 }, { 0xE7C5, 0x9163 }, { 0xE7C6, 0x9165 }, { 0xE7C7, 0x9169 }, { 0xE7C8, 0x9173 }, { 0xE7C9, 0x9172 }, { 0xE7CA, 0x918B },
+	{ 0xE7CB, 0x9189 }, { 0xE7CC, 0x9182 }, { 0xE7CD, 0x91A2 }, { 0xE7CE, 0x91AB }, { 0xE7CF, 0x91AF }, { 0xE7D0, 0x91AA }, { 0xE7D1, 0x91B5 }, { 0xE7D2, 0x91B4 },
+	{ 0xE7D3, 0x91BA }, { 0xE7D4, 0x91C0 }, { 0xE7D5, 0x91C1 }, { 0xE7D6, 0x91C9 }, { 0xE7D7, 0x91CB }, { 0xE7D8, 0x91D0 }, { 0xE7D9, 0x91D6 }, { 0xE7DA, 0x91DF },
+	{ 0xE7DB, 0x91E1 }, { 0xE7DC, 0x91DB }, { 0xE7DD, 0x91FC }, { 0xE7DE, 0x91F5 }, { 0xE7DF, 0x91F6 }, { 0xE7E0, 0x921E }, { 0xE7E1, 0x91FF }, { 0xE7E2, 0x9214 },
+	{ 0xE7E3, 0x922C }, { 0xE7E4, 0x9215 }, { 0xE7E5, 0x9211 }, { 0xE7E6, 0x925E }, { 0xE7E7, 0x9257 }, { 0xE7E8, 0x9245 }, { 0xE7E9, 0x9249 }, { 0xE7EA, 0x9264 },
+	{ 0xE7EB, 0x9248 }, { 0xE7EC, 0x9295 }, { 0xE7ED, 0x923F }, { 0xE7EE, 0x924B }, { 0xE7EF, 0x9250 }, { 0xE7F0, 0x929C }, { 0xE7F1, 0x9296 }, { 0xE7F2, 0x9293 },
+	{ 0xE7F3, 0x929B }, { 0xE7F4, 0x925A }, { 0xE7F5, 0x92CF }, { 0xE7F6, 0x92B9 }, { 0xE7F7, 0x92B7 }, { 0xE7F8, 0x92E9 }, { 0xE7F9, 0x930F }, { 0xE7FA, 0x92FA },
+	{ 0xE7FB, 0x9344 }, { 0xE7FC, 0x932E }, { 0xE840, 0x9319 }, { 0xE841, 0x9322 }, { 0xE842, 0x931A }, { 0xE843, 0x9323 }, { 0xE844, 0x933A }, { 0xE845, 0x9335 },
+	{ 0xE846, 0x933B }, { 0xE847, 0x935C }, { 0xE848, 0x9360 }, { 0xE849, 0x937C }, { 0xE84A, 0x936E }, { 0xE84B, 0x9356 }, { 0xE84C, 0x93B0 }, { 0xE84D, 0x93AC },
+	{ 0xE84E, 0x93AD }, { 0xE84F, 0x9394 }, { 0xE850, 0x93B9 }, { 0xE851, 0x93D6 }, { 0xE852, 0x93D7 }, { 0xE853, 0x93E8 }, { 0xE854, 0x93E5 }, { 0xE855, 0x93D8 },
+	{ 0xE856, 0x93C3 }, { 0xE857, 0x93DD }, { 0xE858, 0x93D0 }, { 0xE859, 0x93C8 }, { 0xE85A, 0x93E4 }, { 0xE85B, 0x941A }, { 0xE85C, 0x9414 }, { 0xE85D, 0x9413 },
+	{ 0xE85E, 0x9403 }, { 0xE85F, 0x9407 }, { 0xE860, 0x9410 }, { 0xE861, 0x9436 }, { 0xE862, 0x942B }, { 0xE863, 0x9435 }, { 0xE864, 0x9421 }, { 0xE865, 0x943A },
+	{ 0xE866, 0x9441 }, { 0xE867, 0x9452 }, { 0xE868, 0x9444 }, { 0xE869, 0x945B }, { 0xE86A, 0x9460 }, { 0xE86B, 0x9462 }, { 0xE86C, 0x945E }, { 0xE86D, 0x946A },
+	{ 0xE86E, 0x9229 }, { 0xE86F, 0x9470 }, { 0xE870, 0x9475 }, { 0xE871, 0x9477 }, { 0xE872, 0x947D }, { 0xE873, 0x945A }, { 0xE874, 0x947C }, { 0xE875, 0x947E },
+	{ 0xE876, 0x9481 }, { 0xE877, 0x947F }, { 0xE878, 0x9582 }, { 0xE879, 0x9587 }, { 0xE87A, 0x958A }, { 0xE87B, 0x9594 }, { 0xE87C, 0x9596 }, { 0xE87D, 0x9598 },
+	{ 0xE87E, 0x9599 }, { 0xE880, 0x95A0 }, { 0xE881, 0x95A8 }, { 0xE882, 0x95A7 }, { 0xE883, 0x95AD }, { 0xE884, 0x95BC }, { 0xE885, 0x95BB }, { 0xE886, 0x95B9 },
+	{ 0xE887, 0x95BE }, { 0xE888, 0x95CA }, { 0xE889, 0x6FF6 }, { 0xE88A, 0x95C3 }, { 0xE88B, 0x95CD }, { 0xE88C, 0x95CC }, { 0xE88D, 0x95D5 }, { 0xE88E, 0x95D4 },
+	{ 0xE88F, 0x95D6 }, { 0xE890, 0x95DC }, { 0xE891, 0x95E1 }, { 0xE892, 0x95E5 }, { 0xE893, 0x95E2 }, { 0xE894, 0x9621 }, { 0xE895, 0x9628 }, { 0xE896, 0x962E },
+	{ 0xE897, 0x962F }, { 0xE898, 0x9642 }, { 0xE899, 0x964C }, { 0xE89A, 0x964F }, { 0xE89B, 0x964B }, { 0xE89C, 0x9677 }, { 0xE89D, 0x965C }, { 0xE89E, 0x965E },
+	{ 0xE89F, 0x965D }, { 0xE8A0, 0x965F }, { 0xE8A1, 0x9666 }, { 0xE8A2, 0x9672 }, { 0xE8A3, 0x966C }, { 0xE8A4, 0x968D }, { 0xE8A5, 0x9698 }, { 0xE8A6, 0x9695 },
+	{ 0xE8A7, 0x9697 }, { 0xE8A8, 0x96AA }, { 0xE8A9, 0x96A7 }, { 0xE8AA, 0x96B1 }, { 0xE8AB, 0x96B2 }, { 0xE8AC, 0x96B0 }, { 0xE8AD, 0x96B4 }, { 0xE8AE, 0x96B6 },
+	{ 0xE8AF, 0x96B8 }, { 0xE8B0, 0x96B9 }, { 0xE8B1, 0x96CE }, { 0xE8B2, 0x96CB }, { 0xE8B3, 0x96C9 }, { 0xE8B4, 0x96CD }, { 0xE8B5, 0x894D }, { 0xE8B6, 0x96DC },
+	{ 0xE8B7, 0x970D }, { 0xE8B8, 0x96D5 }, { 0xE8B9, 0x96F9 }, { 0xE8BA, 0x9704 }, { 0xE8BB, 0x9706 }, { 0xE8BC, 0x9708 }, { 0xE8BD, 0x9713 }, { 0xE8BE, 0x970E },
+	{ 0xE8BF, 0x9711 }, { 0xE8C0, 0x970F }, { 0xE8C1, 0x9716 }, { 0xE8C2, 0x9719 }, { 0xE8C3, 0x9724 }, { 0xE8C4, 0x972A }, { 0xE8C5, 0x9730 }, { 0xE8C6, 0x9739 },
+	{ 0xE8C7, 0x973D }, { 0xE8C8, 0x973E }, { 0xE8C9, 0x9744 }, { 0xE8CA, 0x9746 }, { 0xE8CB, 0x9748 }, { 0xE8CC, 0x9742 }, { 0xE8CD, 0x9749 }, { 0xE8CE, 0x975C },
+	{ 0xE8CF, 0x9760 }, { 0xE8D0, 0x9764 }, { 0xE8D1, 0x9766 }, { 0xE8D2, 0x9768 }, { 0xE8D3, 0x52D2 }, { 0xE8D4, 0x976B }, { 0xE8D5, 0x9771 }, { 0xE8D6, 0x9779 },
+	{ 0xE8D7, 0x9785 }, { 0xE8D8, 0x977C }, { 0xE8D9, 0x9781 }, { 0xE8DA, 0x977A }, { 0xE8DB, 0x9786 }, { 0xE8DC, 0x978B }, { 0xE8DD, 0x978F }, { 0xE8DE, 0x9790 },
+	{ 0xE8DF, 0x979C }, { 0xE8E0, 0x97A8 }, { 0xE8E1, 0x97A6 }, { 0xE8E2, 0x97A3 }, { 0xE8E3, 0x97B3 }, { 0xE8E4, 0x97B4 }, { 0xE8E5, 0x97C3 }, { 0xE8E6, 0x97C6 },
+	{ 0xE8E7, 0x97C8 }, { 0xE8E8, 0x97CB }, { 0xE8E9, 0x97DC }, { 0xE8EA, 0x97ED }, { 0xE8EB, 0x9F4F }, { 0xE8EC, 0x97F2 }, { 0xE8ED, 0x7ADF }, { 0xE8EE, 0x97F6 },
+	{ 0xE8EF, 0x97F5 }, { 0xE8F0, 0x980F }, { 0xE8F1, 0x980C }, { 0xE8F2, 0x9838 }, { 0xE8F3, 0x9824 }, { 0xE8F4, 0x9821 }, { 0xE8F5, 0x9837 }, { 0xE8F6, 0x983D },
+	{ 0xE8F7, 0x9846 }, { 0xE8F8, 0x984F }, { 0xE8F9, 0x984B }, { 0xE8FA, 0x986B }, { 0xE8FB, 0x986F }, { 0xE8FC, 0x9870 }, { 0xE940, 0x9871 }, { 0xE941, 0x9874 },
+	{ 0xE942, 0x9873 }, { 0xE943, 0x98AA }, { 0xE944, 0x98AF }, { 0xE945, 0x98B1 }, { 0xE946, 0x98B6 }, { 0xE947, 0x98C4 }, { 0xE948, 0x98C3 }, { 0xE949, 0x98C6 },
+	{ 0xE94A, 0x98E9 }, { 0xE94B, 0x98EB }, { 0xE94C, 0x9903 }, { 0xE94D, 0x9909 }, { 0xE94E, 0x9912 }, { 0xE94F, 0x9914 }, { 0xE950, 0x9918 }, { 0xE951, 0x9921 },
+	{ 0xE952, 0x991D }, { 0xE953, 0x991E }, { 0xE954, 0x9924 }, { 0xE955, 0x9920 }, { 0xE956, 0x992C }, { 0xE957, 0x992E }, { 0xE958, 0x993D }, { 0xE959, 0x993E },
+	{ 0xE95A, 0x9942 }, { 0xE95B, 0x9949 }, { 0xE95C, 0x9945 }, { 0xE95D, 0x9950 }, { 0xE95E, 0x994B }, { 0xE95F, 0x9951 }, { 0xE960, 0x9952 }, { 0xE961, 0x994C },
+	{ 0xE962, 0x9955 }, { 0xE963, 0x9997 }, { 0xE964, 0x9998 }, { 0xE965, 0x99A5 }, { 0xE966, 0x99AD }, { 0xE967, 0x99AE }, { 0xE968, 0x99BC }, { 0xE969, 0x99DF },
+	{ 0xE96A, 0x99DB }, { 0xE96B, 0x99DD }, { 0xE96C, 0x99D8 }, { 0xE96D, 0x99D1 }, { 0xE96E, 0x99ED }, { 0xE96F, 0x99EE }, { 0xE970, 0x99F1 }, { 0xE971, 0x99F2 },
+	{ 0xE972, 0x99FB }, { 0xE973, 0x99F8 }, { 0xE974, 0x9A01 }, { 0xE975, 0x9A0F }, { 0xE976, 0x9A05 }, { 0xE977, 0x99E2 }, { 0xE978, 0x9A19 }, { 0xE979, 0x9A2B },
+	{ 0xE97A, 0x9A37 }, { 0xE97B, 0x9A45 }, { 0xE97C, 0x9A42 }, { 0xE97D, 0x9A40 }, { 0xE97E, 0x9A43 }, { 0xE980, 0x9A3E }, { 0xE981, 0x9A55 }, { 0xE982, 0x9A4D },
+	{ 0xE983, 0x9A5B }, { 0xE984, 0x9A57 }, { 0xE985, 0x9A5F }, { 0xE986, 0x9A62 }, { 0xE987, 0x9A65 }, { 0xE988, 0x9A64 }, { 0xE989, 0x9A69 }, { 0xE98A, 0x9A6B },
+	{ 0xE98B, 0x9A6A }, { 0xE98C, 0x9AAD }, { 0xE98D, 0x9AB0 }, { 0xE98E, 0x9ABC }, { 0xE98F, 0x9AC0 }, { 0xE990, 0x9ACF }, { 0xE991, 0x9AD1 }, { 0xE992, 0x9AD3 },
+	{ 0xE993, 0x9AD4 }, { 0xE994, 0x9ADE }, { 0xE995, 0x9ADF }, { 0xE996, 0x9AE2 }, { 0xE997, 0x9AE3 }, { 0xE998, 0x9AE6 }, { 0xE999, 0x9AEF }, { 0xE99A, 0x9AEB },
+	{ 0xE99B, 0x9AEE }, { 0xE99C, 0x9AF4 }, { 0xE99D, 0x9AF1 }, { 0xE99E, 0x9AF7 }, { 0xE99F, 0x9AFB }, { 0xE9A0, 0x9B06 }, { 0xE9A1, 0x9B18 }, { 0xE9A2, 0x9B1A },
+	{ 0xE9A3, 0x9B1F }, { 0xE9A4, 0x9B22 }, { 0xE9A5, 0x9B23 }, { 0xE9A6, 0x9B25 }, { 0xE9A7, 0x9B27 }, { 0xE9A8, 0x9B28 }, { 0xE9A9, 0x9B29 }, { 0xE9AA, 0x9B2A },
+	{ 0xE9AB, 0x9B2E }, { 0xE9AC, 0x9B2F }, { 0xE9AD, 0x9B32 }, { 0xE9AE, 0x9B44 }, { 0xE9AF, 0x9B43 }, { 0xE9B0, 0x9B4F }, { 0xE9B1, 0x9B4D }, { 0xE9B2, 0x9B4E },
+	{ 0xE9B3, 0x9B51 }, { 0xE9B4, 0x9B58 }, { 0xE9B5, 0x9B74 }, { 0xE9B6, 0x9B93 }, { 0xE9B7, 0x9B83 }, { 0xE9B8, 0x9B91 }, { 0xE9B9, 0x9B96 }, { 0xE9BA, 0x9B97 },
+	{ 0xE9BB, 0x9B9F }, { 0xE9BC, 0x9BA0 }, { 0xE9BD, 0x9BA8 }, { 0xE9BE, 0x9BB4 }, { 0xE9BF, 0x9BC0 }, { 0xE9C0, 0x9BCA }, { 0xE9C1, 0x9BB9 }, { 0xE9C2, 0x9BC6 },
+	{ 0xE9C3, 0x9BCF }, { 0xE9C4, 0x9BD1 }, { 0xE9C5, 0x9BD2 }, { 0xE9C6, 0x9BE3 }, { 0xE9C7, 0x9BE2 }, { 0xE9C8, 0x9BE4 }, { 0xE9C9, 0x9BD4 }, { 0xE9CA, 0x9BE1 },
+	{ 0xE9CB, 0x9C3A }, { 0xE9CC, 0x9BF2 }, { 0xE9CD, 0x9BF1 }, { 0xE9CE, 0x9BF0 }, { 0xE9CF, 0x9C15 }, { 0xE9D0, 0x9C14 }, { 0xE9D1, 0x9C09 }, { 0xE9D2, 0x9C13 },
+	{ 0xE9D3, 0x9C0C }, { 0xE9D4, 0x9C06 }, { 0xE9D5, 0x9C08 }, { 0xE9D6, 0x9C12 }, { 0xE9D7, 0x9C0A }, { 0xE9D8, 0x9C04 }, { 0xE9D9, 0x9C2E }, { 0xE9DA, 0x9C1B },
+	{ 0xE9DB, 0x9C25 }, { 0xE9DC, 0x9C24 }, { 0xE9DD, 0x9C21 }, { 0xE9DE, 0x9C30 }, { 0xE9DF, 0x9C47 }, { 0xE9E0, 0x9C32 }, { 0xE9E1, 0x9C46 }, { 0xE9E2, 0x9C3E },
+	{ 0xE9E3, 0x9C5A }, { 0xE9E4, 0x9C60 }, { 0xE9E5, 0x9C67 }, { 0xE9E6, 0x9C76 }, { 0xE9E7, 0x9C78 }, { 0xE9E8, 0x9CE7 }, { 0xE9E9, 0x9CEC }, { 0xE9EA, 0x9CF0 },
+	{ 0xE9EB, 0x9D09 }, { 0xE9EC, 0x9D08 }, { 0xE9ED, 0x9CEB }, { 0xE9EE, 0x9D03 }, { 0xE9EF, 0x9D06 }, { 0xE9F0, 0x9D2A }, { 0xE9F1, 0x9D26 }, { 0xE9F2, 0x9DAF },
+	{ 0xE9F3, 0x9D23 }, { 0xE9F4, 0x9D1F }, { 0xE9F5, 0x9D44 }, { 0xE9F6, 0x9D15 }, { 0xE9F7, 0x9D12 }, { 0xE9F8, 0x9D41 }, { 0xE9F9, 0x9D3F }, { 0xE9FA, 0x9D3E },
+	{ 0xE9FB, 0x9D46 }, { 0xE9FC, 0x9D48 }, { 0xEA40, 0x9D5D }, { 0xEA41, 0x9D5E }, { 0xEA42, 0x9D64 }, { 0xEA43, 0x9D51 }, { 0xEA44, 0x9D50 }, { 0xEA45, 0x9D59 },
+	{ 0xEA46, 0x9D72 }, { 0xEA47, 0x9D89 }, { 0xEA48, 0x9D87 }, { 0xEA49, 0x9DAB }, { 0xEA4A, 0x9D6F }, { 0xEA4B, 0x9D7A }, { 0xEA4C, 0x9D9A }, { 0xEA4D, 0x9DA4 },
+	{ 0xEA4E, 0x9DA9 }, { 0xEA4F, 0x9DB2 }, { 0xEA50, 0x9DC4 }, { 0xEA51, 0x9DC1 }, { 0xEA52, 0x9DBB }, { 0xEA53, 0x9DB8 }, { 0xEA54, 0x9DBA }, { 0xEA55, 0x9DC6 },
+	{ 0xEA56, 0x9DCF }, { 0xEA57, 0x9DC2 }, { 0xEA58, 0x9DD9 }, { 0xEA59, 0x9DD3 }, { 0xEA5A, 0x9DF8 }, { 0xEA5B, 0x9DE6 }, { 0xEA5C, 0x9DED }, { 0xEA5D, 0x9DEF },
+	{ 0xEA5E, 0x9DFD }, { 0xEA5F, 0x9E1A }, { 0xEA60, 0x9E1B }, { 0xEA61, 0x9E1E }, { 0xEA62, 0x9E75 }, { 0xEA63, 0x9E79 }, { 0xEA64, 0x9E7D }, { 0xEA65, 0x9E81 },
+	{ 0xEA66, 0x9E88 }, { 0xEA67, 0x9E8B }, { 0xEA68, 0x9E8C }, { 0xEA69, 0x9E92 }, { 0xEA6A, 0x9E95 }, { 0xEA6B, 0x9E91 }, { 0xEA6C, 0x9E9D }, { 0xEA6D, 0x9EA5 },
+	{ 0xEA6E, 0x9EA9 }, { 0xEA6F, 0x9EB8 }, { 0xEA70, 0x9EAA }, { 0xEA71, 0x9EAD }, { 0xEA72, 0x9761 }, { 0xEA73, 0x9ECC }, { 0xEA74, 0x9ECE }, { 0xEA75, 0x9ECF },
+	{ 0xEA76, 0x9ED0 }, { 0xEA77, 0x9ED4 }, { 0xEA78, 0x9EDC }, { 0xEA79, 0x9EDE }, { 0xEA7A, 0x9EDD }, { 0xEA7B, 0x9EE0 }, { 0xEA7C, 0x9EE5 }, { 0xEA7D, 0x9EE8 },
+	{ 0xEA7E, 0x9EEF }, { 0xEA80, 0x9EF4 }, { 0xEA81, 0x9EF6 }, { 0xEA82, 0x9EF7 }, { 0xEA83, 0x9EF9 }, { 0xEA84, 0x9EFB }, { 0xEA85, 0x9EFC }, { 0xEA86, 0x9EFD },
+	{ 0xEA87, 0x9F07 }, { 0xEA88, 0x9F08 }, { 0xEA89, 0x76B7 }, { 0xEA8A, 0x9F15 }, { 0xEA8B, 0x9F21 }, { 0xEA8C, 0x9F2C }, { 0xEA8D, 0x9F3E }, { 0xEA8E, 0x9F4A },
+	{ 0xEA8F, 0x9F52 }, { 0xEA90, 0x9F54 }, { 0xEA91, 0x9F63 }, { 0xEA92, 0x9F5F }, { 0xEA93, 0x9F60 }, { 0xEA94, 0x9F61 }, { 0xEA95, 0x9F66 }, { 0xEA96, 0x9F67 },
+	{ 0xEA97, 0x9F6C }, { 0xEA98, 0x9F6A }, { 0xEA99, 0x9F77 }, { 0xEA9A, 0x9F72 }, { 0xEA9B, 0x9F76 }, { 0xEA9C, 0x9F95 }, { 0xEA9D, 0x9F9C }, { 0xEA9E, 0x9FA0 },
+	{ 0xEA9F, 0x582F }, { 0xEAA0, 0x69C7 }, { 0xEAA1, 0x9059 }, { 0xEAA2, 0x7464 }, { 0xEAA3, 0x51DC }, { 0xEAA4, 0x7199 }, { 0xEB51, 0xFE33 }, { 0xEB5C, 0xFE31 },
+	{ 0xEB64, 0xFE30 }, { 0xEB69, 0xFE35 }, { 0xEB6A, 0xFE36 }, { 0xEB6B, 0xFE39 }, { 0xEB6C, 0xFE3A }, { 0xEB6F, 0xFE37 }, { 0xEB70, 0xFE38 }, { 0xEB71, 0xFE3F },
+	{ 0xEB72, 0xFE40 }, { 0xEB73, 0xFE3D }, { 0xEB74, 0xFE3E }, { 0xEB75, 0xFE41 }, { 0xEB76, 0xFE42 }, { 0xEB77, 0xFE43 }, { 0xEB78, 0xFE44 }, { 0xEB79, 0xFE3B },
+	{ 0xEB7A, 0xFE3C },
 };
 
 
 const DoubleByteEncoding::Mapping MacJapaneseEncoding::_reverseMappingTable[] = {
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x0080 }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00A0 }, 
-	{ 0x00A2, 0x8191 }, { 0x00A3, 0x8192 }, { 0x00A5, 0x005C }, { 0x00A7, 0x8198 }, { 0x00A8, 0x814E }, { 0x00A9, 0x00FD }, { 0x00AC, 0x81CA }, { 0x00B0, 0x818B }, 
-	{ 0x00B1, 0x817D }, { 0x00B4, 0x814C }, { 0x00B6, 0x81F7 }, { 0x00D7, 0x817E }, { 0x00F7, 0x8180 }, { 0x0391, 0x839F }, { 0x0392, 0x83A0 }, { 0x0393, 0x83A1 }, 
-	{ 0x0394, 0x83A2 }, { 0x0395, 0x83A3 }, { 0x0396, 0x83A4 }, { 0x0397, 0x83A5 }, { 0x0398, 0x83A6 }, { 0x0399, 0x83A7 }, { 0x039A, 0x83A8 }, { 0x039B, 0x83A9 }, 
-	{ 0x039C, 0x83AA }, { 0x039D, 0x83AB }, { 0x039E, 0x83AC }, { 0x039F, 0x83AD }, { 0x03A0, 0x83AE }, { 0x03A1, 0x83AF }, { 0x03A3, 0x83B0 }, { 0x03A4, 0x83B1 }, 
-	{ 0x03A5, 0x83B2 }, { 0x03A6, 0x83B3 }, { 0x03A7, 0x83B4 }, { 0x03A8, 0x83B5 }, { 0x03A9, 0x83B6 }, { 0x03B1, 0x83BF }, { 0x03B2, 0x83C0 }, { 0x03B3, 0x83C1 }, 
-	{ 0x03B4, 0x83C2 }, { 0x03B5, 0x83C3 }, { 0x03B6, 0x83C4 }, { 0x03B7, 0x83C5 }, { 0x03B8, 0x83C6 }, { 0x03B9, 0x83C7 }, { 0x03BA, 0x83C8 }, { 0x03BB, 0x83C9 }, 
-	{ 0x03BC, 0x83CA }, { 0x03BD, 0x83CB }, { 0x03BE, 0x83CC }, { 0x03BF, 0x83CD }, { 0x03C0, 0x83CE }, { 0x03C1, 0x83CF }, { 0x03C3, 0x83D0 }, { 0x03C4, 0x83D1 }, 
-	{ 0x03C5, 0x83D2 }, { 0x03C6, 0x83D3 }, { 0x03C7, 0x83D4 }, { 0x03C8, 0x83D5 }, { 0x03C9, 0x83D6 }, { 0x0401, 0x8446 }, { 0x0410, 0x8440 }, { 0x0411, 0x8441 }, 
-	{ 0x0412, 0x8442 }, { 0x0413, 0x8443 }, { 0x0414, 0x8444 }, { 0x0415, 0x8445 }, { 0x0416, 0x8447 }, { 0x0417, 0x8448 }, { 0x0418, 0x8449 }, { 0x0419, 0x844A }, 
-	{ 0x041A, 0x844B }, { 0x041B, 0x844C }, { 0x041C, 0x844D }, { 0x041D, 0x844E }, { 0x041E, 0x844F }, { 0x041F, 0x8450 }, { 0x0420, 0x8451 }, { 0x0421, 0x8452 }, 
-	{ 0x0422, 0x8453 }, { 0x0423, 0x8454 }, { 0x0424, 0x8455 }, { 0x0425, 0x8456 }, { 0x0426, 0x8457 }, { 0x0427, 0x8458 }, { 0x0428, 0x8459 }, { 0x0429, 0x845A }, 
-	{ 0x042A, 0x845B }, { 0x042B, 0x845C }, { 0x042C, 0x845D }, { 0x042D, 0x845E }, { 0x042E, 0x845F }, { 0x042F, 0x8460 }, { 0x0430, 0x8470 }, { 0x0431, 0x8471 }, 
-	{ 0x0432, 0x8472 }, { 0x0433, 0x8473 }, { 0x0434, 0x8474 }, { 0x0435, 0x8475 }, { 0x0436, 0x8477 }, { 0x0437, 0x8478 }, { 0x0438, 0x8479 }, { 0x0439, 0x847A }, 
-	{ 0x043A, 0x847B }, { 0x043B, 0x847C }, { 0x043C, 0x847D }, { 0x043D, 0x847E }, { 0x043E, 0x8480 }, { 0x043F, 0x8481 }, { 0x0440, 0x8482 }, { 0x0441, 0x8483 }, 
-	{ 0x0442, 0x8484 }, { 0x0443, 0x8485 }, { 0x0444, 0x8486 }, { 0x0445, 0x8487 }, { 0x0446, 0x8488 }, { 0x0447, 0x8489 }, { 0x0448, 0x848A }, { 0x0449, 0x848B }, 
-	{ 0x044A, 0x848C }, { 0x044B, 0x848D }, { 0x044C, 0x848E }, { 0x044D, 0x848F }, { 0x044E, 0x8490 }, { 0x044F, 0x8491 }, { 0x0451, 0x8476 }, { 0x2010, 0x815D }, 
-	{ 0x2014, 0x815C }, { 0x2016, 0x8161 }, { 0x2018, 0x8165 }, { 0x2019, 0x8166 }, { 0x201C, 0x8167 }, { 0x201D, 0x8168 }, { 0x2020, 0x81F5 }, { 0x2021, 0x81F6 }, 
-	{ 0x2025, 0x8164 }, { 0x2026, 0x8163 }, { 0x2030, 0x81F1 }, { 0x2032, 0x818C }, { 0x2033, 0x818D }, { 0x203B, 0x81A6 }, { 0x2103, 0x818E }, { 0x2109, 0x8656 }, 
-	{ 0x2113, 0x8650 }, { 0x2116, 0x869B }, { 0x2121, 0x869D }, { 0x2122, 0x00FE }, { 0x212B, 0x81F0 }, { 0x2160, 0x859F }, { 0x2161, 0x85A0 }, { 0x2162, 0x85A1 }, 
-	{ 0x2163, 0x85A2 }, { 0x2164, 0x85A3 }, { 0x2165, 0x85A4 }, { 0x2166, 0x85A5 }, { 0x2167, 0x85A6 }, { 0x2168, 0x85A7 }, { 0x2169, 0x85A8 }, { 0x216A, 0x85A9 }, 
-	{ 0x216B, 0x85AA }, { 0x2170, 0x85B3 }, { 0x2171, 0x85B4 }, { 0x2172, 0x85B5 }, { 0x2173, 0x85B6 }, { 0x2174, 0x85B7 }, { 0x2175, 0x85B8 }, { 0x2176, 0x85B9 }, 
-	{ 0x2177, 0x85BA }, { 0x2178, 0x85BB }, { 0x2179, 0x85BC }, { 0x217A, 0x85BD }, { 0x217B, 0x85BE }, { 0x2190, 0x81A9 }, { 0x2191, 0x81AA }, { 0x2192, 0x81A8 }, 
-	{ 0x2193, 0x81AB }, { 0x21C4, 0x86CC }, { 0x21C5, 0x86CD }, { 0x21C6, 0x86CB }, { 0x21D2, 0x81CB }, { 0x21D4, 0x81CC }, { 0x21E6, 0x86D0 }, { 0x21E7, 0x86D1 }, 
-	{ 0x21E8, 0x86CF }, { 0x21E9, 0x86D2 }, { 0x2200, 0x81CD }, { 0x2202, 0x81DD }, { 0x2203, 0x81CE }, { 0x2207, 0x81DE }, { 0x2208, 0x81B8 }, { 0x220B, 0x81B9 }, 
-	{ 0x2212, 0x817C }, { 0x221A, 0x81E3 }, { 0x221D, 0x81E5 }, { 0x221E, 0x8187 }, { 0x221F, 0x8841 }, { 0x2220, 0x81DA }, { 0x2227, 0x81C8 }, { 0x2228, 0x81C9 }, 
-	{ 0x2229, 0x81BF }, { 0x222A, 0x81BE }, { 0x222B, 0x81E7 }, { 0x222C, 0x81E8 }, { 0x222E, 0x8840 }, { 0x2234, 0x8188 }, { 0x2235, 0x81E6 }, { 0x223D, 0x81E4 }, 
-	{ 0x2252, 0x81E0 }, { 0x2260, 0x8182 }, { 0x2261, 0x81DF }, { 0x2266, 0x8185 }, { 0x2267, 0x8186 }, { 0x226A, 0x81E1 }, { 0x226B, 0x81E2 }, { 0x2282, 0x81BC }, 
-	{ 0x2283, 0x81BD }, { 0x2286, 0x81BA }, { 0x2287, 0x81BB }, { 0x22A5, 0x81DB }, { 0x22BF, 0x8842 }, { 0x2312, 0x81DC }, { 0x2460, 0x8540 }, { 0x2461, 0x8541 }, 
-	{ 0x2462, 0x8542 }, { 0x2463, 0x8543 }, { 0x2464, 0x8544 }, { 0x2465, 0x8545 }, { 0x2466, 0x8546 }, { 0x2467, 0x8547 }, { 0x2468, 0x8548 }, { 0x2469, 0x8549 }, 
-	{ 0x246A, 0x854A }, { 0x246B, 0x854B }, { 0x246C, 0x854C }, { 0x246D, 0x854D }, { 0x246E, 0x854E }, { 0x246F, 0x854F }, { 0x2470, 0x8550 }, { 0x2471, 0x8551 }, 
-	{ 0x2472, 0x8552 }, { 0x2473, 0x8553 }, { 0x2474, 0x855E }, { 0x2475, 0x855F }, { 0x2476, 0x8560 }, { 0x2477, 0x8561 }, { 0x2478, 0x8562 }, { 0x2479, 0x8563 }, 
-	{ 0x247A, 0x8564 }, { 0x247B, 0x8565 }, { 0x247C, 0x8566 }, { 0x247D, 0x8567 }, { 0x247E, 0x8568 }, { 0x247F, 0x8569 }, { 0x2480, 0x856A }, { 0x2481, 0x856B }, 
-	{ 0x2482, 0x856C }, { 0x2483, 0x856D }, { 0x2484, 0x856E }, { 0x2485, 0x856F }, { 0x2486, 0x8570 }, { 0x2487, 0x8571 }, { 0x2488, 0x8592 }, { 0x2489, 0x8593 }, 
-	{ 0x248A, 0x8594 }, { 0x248B, 0x8595 }, { 0x248C, 0x8596 }, { 0x248D, 0x8597 }, { 0x248E, 0x8598 }, { 0x248F, 0x8599 }, { 0x2490, 0x859A }, { 0x249C, 0x85DB }, 
-	{ 0x249D, 0x85DC }, { 0x249E, 0x85DD }, { 0x249F, 0x85DE }, { 0x24A0, 0x85DF }, { 0x24A1, 0x85E0 }, { 0x24A2, 0x85E1 }, { 0x24A3, 0x85E2 }, { 0x24A4, 0x85E3 }, 
-	{ 0x24A5, 0x85E4 }, { 0x24A6, 0x85E5 }, { 0x24A7, 0x85E6 }, { 0x24A8, 0x85E7 }, { 0x24A9, 0x85E8 }, { 0x24AA, 0x85E9 }, { 0x24AB, 0x85EA }, { 0x24AC, 0x85EB }, 
-	{ 0x24AD, 0x85EC }, { 0x24AE, 0x85ED }, { 0x24AF, 0x85EE }, { 0x24B0, 0x85EF }, { 0x24B1, 0x85F0 }, { 0x24B2, 0x85F1 }, { 0x24B3, 0x85F2 }, { 0x24B4, 0x85F3 }, 
-	{ 0x24B5, 0x85F4 }, { 0x2500, 0x849F }, { 0x2501, 0x84AA }, { 0x2502, 0x84A0 }, { 0x2503, 0x84AB }, { 0x250C, 0x84A1 }, { 0x250F, 0x84AC }, { 0x2510, 0x84A2 }, 
-	{ 0x2513, 0x84AD }, { 0x2514, 0x84A4 }, { 0x2517, 0x84AF }, { 0x2518, 0x84A3 }, { 0x251B, 0x84AE }, { 0x251C, 0x84A5 }, { 0x251D, 0x84BA }, { 0x2520, 0x84B5 }, 
-	{ 0x2523, 0x84B0 }, { 0x2524, 0x84A7 }, { 0x2525, 0x84BC }, { 0x2528, 0x84B7 }, { 0x252B, 0x84B2 }, { 0x252C, 0x84A6 }, { 0x252F, 0x84B6 }, { 0x2530, 0x84BB }, 
-	{ 0x2533, 0x84B1 }, { 0x2534, 0x84A8 }, { 0x2537, 0x84B8 }, { 0x2538, 0x84BD }, { 0x253B, 0x84B3 }, { 0x253C, 0x84A9 }, { 0x253F, 0x84B9 }, { 0x2542, 0x84BE }, 
-	{ 0x254B, 0x84B4 }, { 0x25A0, 0x81A1 }, { 0x25A1, 0x81A0 }, { 0x25B2, 0x81A3 }, { 0x25B3, 0x81A2 }, { 0x25BC, 0x81A5 }, { 0x25BD, 0x81A4 }, { 0x25C6, 0x819F }, 
-	{ 0x25C7, 0x819E }, { 0x25CB, 0x819B }, { 0x25CE, 0x819D }, { 0x25CF, 0x819C }, { 0x25EF, 0x81FC }, { 0x2605, 0x819A }, { 0x2606, 0x8199 }, { 0x260E, 0x86B4 }, 
-	{ 0x261C, 0x86C8 }, { 0x261D, 0x86C9 }, { 0x261E, 0x86C7 }, { 0x261F, 0x86CA }, { 0x2640, 0x818A }, { 0x2642, 0x8189 }, { 0x2660, 0x86A3 }, { 0x2661, 0x86A1 }, 
-	{ 0x2662, 0x86A2 }, { 0x2663, 0x86A4 }, { 0x2664, 0x869F }, { 0x2665, 0x86A5 }, { 0x2666, 0x86A6 }, { 0x2667, 0x86A0 }, { 0x266A, 0x81F4 }, { 0x266D, 0x81F3 }, 
-	{ 0x266F, 0x81F2 }, { 0x2776, 0x857C }, { 0x2777, 0x857D }, { 0x2778, 0x857E }, { 0x2779, 0x8580 }, { 0x277A, 0x8581 }, { 0x277B, 0x8582 }, { 0x277C, 0x8583 }, 
-	{ 0x277D, 0x8584 }, { 0x277E, 0x8585 }, { 0x3000, 0x8140 }, { 0x3001, 0x8141 }, { 0x3002, 0x8142 }, { 0x3003, 0x8156 }, { 0x3004, 0x86B5 }, { 0x3005, 0x8158 }, 
-	{ 0x3006, 0x8159 }, { 0x3007, 0x815A }, { 0x3008, 0x8171 }, { 0x3009, 0x8172 }, { 0x300A, 0x8173 }, { 0x300B, 0x8174 }, { 0x300C, 0x8175 }, { 0x300D, 0x8176 }, 
-	{ 0x300E, 0x8177 }, { 0x300F, 0x8178 }, { 0x3010, 0x8179 }, { 0x3011, 0x817A }, { 0x3012, 0x81A7 }, { 0x3013, 0x81AC }, { 0x3014, 0x816B }, { 0x3015, 0x816C }, 
-	{ 0x301C, 0x8160 }, { 0x301D, 0x8854 }, { 0x301F, 0x8855 }, { 0x3020, 0x86B3 }, { 0x3041, 0x829F }, { 0x3042, 0x82A0 }, { 0x3043, 0x82A1 }, { 0x3044, 0x82A2 }, 
-	{ 0x3045, 0x82A3 }, { 0x3046, 0x82A4 }, { 0x3047, 0x82A5 }, { 0x3048, 0x82A6 }, { 0x3049, 0x82A7 }, { 0x304A, 0x82A8 }, { 0x304B, 0x82A9 }, { 0x304C, 0x82AA }, 
-	{ 0x304D, 0x82AB }, { 0x304E, 0x82AC }, { 0x304F, 0x82AD }, { 0x3050, 0x82AE }, { 0x3051, 0x82AF }, { 0x3052, 0x82B0 }, { 0x3053, 0x82B1 }, { 0x3054, 0x82B2 }, 
-	{ 0x3055, 0x82B3 }, { 0x3056, 0x82B4 }, { 0x3057, 0x82B5 }, { 0x3058, 0x82B6 }, { 0x3059, 0x82B7 }, { 0x305A, 0x82B8 }, { 0x305B, 0x82B9 }, { 0x305C, 0x82BA }, 
-	{ 0x305D, 0x82BB }, { 0x305E, 0x82BC }, { 0x305F, 0x82BD }, { 0x3060, 0x82BE }, { 0x3061, 0x82BF }, { 0x3062, 0x82C0 }, { 0x3063, 0x82C1 }, { 0x3064, 0x82C2 }, 
-	{ 0x3065, 0x82C3 }, { 0x3066, 0x82C4 }, { 0x3067, 0x82C5 }, { 0x3068, 0x82C6 }, { 0x3069, 0x82C7 }, { 0x306A, 0x82C8 }, { 0x306B, 0x82C9 }, { 0x306C, 0x82CA }, 
-	{ 0x306D, 0x82CB }, { 0x306E, 0x82CC }, { 0x306F, 0x82CD }, { 0x3070, 0x82CE }, { 0x3071, 0x82CF }, { 0x3072, 0x82D0 }, { 0x3073, 0x82D1 }, { 0x3074, 0x82D2 }, 
-	{ 0x3075, 0x82D3 }, { 0x3076, 0x82D4 }, { 0x3077, 0x82D5 }, { 0x3078, 0x82D6 }, { 0x3079, 0x82D7 }, { 0x307A, 0x82D8 }, { 0x307B, 0x82D9 }, { 0x307C, 0x82DA }, 
-	{ 0x307D, 0x82DB }, { 0x307E, 0x82DC }, { 0x307F, 0x82DD }, { 0x3080, 0x82DE }, { 0x3081, 0x82DF }, { 0x3082, 0x82E0 }, { 0x3083, 0x82E1 }, { 0x3084, 0x82E2 }, 
-	{ 0x3085, 0x82E3 }, { 0x3086, 0x82E4 }, { 0x3087, 0x82E5 }, { 0x3088, 0x82E6 }, { 0x3089, 0x82E7 }, { 0x308A, 0x82E8 }, { 0x308B, 0x82E9 }, { 0x308C, 0x82EA }, 
-	{ 0x308D, 0x82EB }, { 0x308E, 0x82EC }, { 0x308F, 0x82ED }, { 0x3090, 0x82EE }, { 0x3091, 0x82EF }, { 0x3092, 0x82F0 }, { 0x3093, 0x82F1 }, { 0x3094, 0x8868 }, 
-	{ 0x309B, 0x814A }, { 0x309C, 0x814B }, { 0x309D, 0x8154 }, { 0x309E, 0x8155 }, { 0x30A1, 0x8340 }, { 0x30A2, 0x8341 }, { 0x30A3, 0x8342 }, { 0x30A4, 0x8343 }, 
-	{ 0x30A5, 0x8344 }, { 0x30A6, 0x8345 }, { 0x30A7, 0x8346 }, { 0x30A8, 0x8347 }, { 0x30A9, 0x8348 }, { 0x30AA, 0x8349 }, { 0x30AB, 0x834A }, { 0x30AC, 0x834B }, 
-	{ 0x30AD, 0x834C }, { 0x30AE, 0x834D }, { 0x30AF, 0x834E }, { 0x30B0, 0x834F }, { 0x30B1, 0x8350 }, { 0x30B2, 0x8351 }, { 0x30B3, 0x8352 }, { 0x30B4, 0x8353 }, 
-	{ 0x30B5, 0x8354 }, { 0x30B6, 0x8355 }, { 0x30B7, 0x8356 }, { 0x30B8, 0x8357 }, { 0x30B9, 0x8358 }, { 0x30BA, 0x8359 }, { 0x30BB, 0x835A }, { 0x30BC, 0x835B }, 
-	{ 0x30BD, 0x835C }, { 0x30BE, 0x835D }, { 0x30BF, 0x835E }, { 0x30C0, 0x835F }, { 0x30C1, 0x8360 }, { 0x30C2, 0x8361 }, { 0x30C3, 0x8362 }, { 0x30C4, 0x8363 }, 
-	{ 0x30C5, 0x8364 }, { 0x30C6, 0x8365 }, { 0x30C7, 0x8366 }, { 0x30C8, 0x8367 }, { 0x30C9, 0x8368 }, { 0x30CA, 0x8369 }, { 0x30CB, 0x836A }, { 0x30CC, 0x836B }, 
-	{ 0x30CD, 0x836C }, { 0x30CE, 0x836D }, { 0x30CF, 0x836E }, { 0x30D0, 0x836F }, { 0x30D1, 0x8370 }, { 0x30D2, 0x8371 }, { 0x30D3, 0x8372 }, { 0x30D4, 0x8373 }, 
-	{ 0x30D5, 0x8374 }, { 0x30D6, 0x8375 }, { 0x30D7, 0x8376 }, { 0x30D8, 0x8377 }, { 0x30D9, 0x8378 }, { 0x30DA, 0x8379 }, { 0x30DB, 0x837A }, { 0x30DC, 0x837B }, 
-	{ 0x30DD, 0x837C }, { 0x30DE, 0x837D }, { 0x30DF, 0x837E }, { 0x30E0, 0x8380 }, { 0x30E1, 0x8381 }, { 0x30E2, 0x8382 }, { 0x30E3, 0x8383 }, { 0x30E4, 0x8384 }, 
-	{ 0x30E5, 0x8385 }, { 0x30E6, 0x8386 }, { 0x30E7, 0x8387 }, { 0x30E8, 0x8388 }, { 0x30E9, 0x8389 }, { 0x30EA, 0x838A }, { 0x30EB, 0x838B }, { 0x30EC, 0x838C }, 
-	{ 0x30ED, 0x838D }, { 0x30EE, 0x838E }, { 0x30EF, 0x838F }, { 0x30F0, 0x8390 }, { 0x30F1, 0x8391 }, { 0x30F2, 0x8392 }, { 0x30F3, 0x8393 }, { 0x30F4, 0x8394 }, 
-	{ 0x30F5, 0x8395 }, { 0x30F6, 0x8396 }, { 0x30F7, 0x886A }, { 0x30F8, 0x886B }, { 0x30F9, 0x886C }, { 0x30FA, 0x886D }, { 0x30FB, 0x8145 }, { 0x30FC, 0x815B }, 
-	{ 0x30FD, 0x8152 }, { 0x30FE, 0x8153 }, { 0x322A, 0x8741 }, { 0x322B, 0x8742 }, { 0x322C, 0x8743 }, { 0x322D, 0x8744 }, { 0x322E, 0x8745 }, { 0x322F, 0x8746 }, 
-	{ 0x3230, 0x8740 }, { 0x3231, 0x874D }, { 0x3232, 0x8750 }, { 0x3233, 0x8753 }, { 0x3234, 0x874F }, { 0x3235, 0x8754 }, { 0x3236, 0x8752 }, { 0x3237, 0x8748 }, 
-	{ 0x3238, 0x8758 }, { 0x3239, 0x874B }, { 0x323A, 0x874C }, { 0x323B, 0x8751 }, { 0x323C, 0x8755 }, { 0x323D, 0x8756 }, { 0x323E, 0x874E }, { 0x323F, 0x8757 }, 
-	{ 0x3240, 0x8747 }, { 0x3242, 0x8749 }, { 0x3243, 0x874A }, { 0x3296, 0x8799 }, { 0x3298, 0x879B }, { 0x3299, 0x879E }, { 0x329D, 0x879A }, { 0x329E, 0x879C }, 
-	{ 0x32A4, 0x8793 }, { 0x32A5, 0x8794 }, { 0x32A6, 0x8795 }, { 0x32A7, 0x8796 }, { 0x32A8, 0x8797 }, { 0x32A9, 0x8798 }, { 0x3300, 0x87BD }, { 0x3303, 0x87A7 }, 
-	{ 0x3305, 0x87A4 }, { 0x330D, 0x87B0 }, { 0x3314, 0x87A2 }, { 0x3315, 0x87AA }, { 0x3316, 0x87A3 }, { 0x3318, 0x87A9 }, { 0x331E, 0x87BE }, { 0x3322, 0x87A0 }, 
-	{ 0x3323, 0x87B2 }, { 0x3326, 0x87B3 }, { 0x3327, 0x87AB }, { 0x332A, 0x87BF }, { 0x332B, 0x87B5 }, { 0x3331, 0x87C0 }, { 0x3333, 0x87A5 }, { 0x3336, 0x87A8 }, 
-	{ 0x3339, 0x87AE }, { 0x333B, 0x87B4 }, { 0x3342, 0x87B1 }, { 0x3347, 0x87C1 }, { 0x3349, 0x879F }, { 0x334A, 0x87AD }, { 0x334D, 0x87A1 }, { 0x334E, 0x87A6 }, 
-	{ 0x3351, 0x87AC }, { 0x3357, 0x87AF }, { 0x337B, 0x87E8 }, { 0x337C, 0x87E7 }, { 0x337D, 0x87E6 }, { 0x337E, 0x87E5 }, { 0x337F, 0x87FA }, { 0x3385, 0x865A }, 
-	{ 0x3386, 0x865B }, { 0x3387, 0x865C }, { 0x338E, 0x864A }, { 0x338F, 0x864C }, { 0x3390, 0x8659 }, { 0x3396, 0x864E }, { 0x3397, 0x864F }, { 0x3398, 0x8651 }, 
-	{ 0x339C, 0x8640 }, { 0x339D, 0x8642 }, { 0x339E, 0x8648 }, { 0x339F, 0x8641 }, { 0x33A0, 0x8643 }, { 0x33A1, 0x8646 }, { 0x33A2, 0x8649 }, { 0x33A4, 0x8644 }, 
-	{ 0x33A5, 0x8647 }, { 0x33B0, 0x8655 }, { 0x33B1, 0x8654 }, { 0x33B2, 0x8653 }, { 0x33B3, 0x8652 }, { 0x33C4, 0x864D }, { 0x33CB, 0x8658 }, { 0x33CD, 0x869C }, 
-	{ 0x33D4, 0x8657 }, { 0x4E00, 0x88EA }, { 0x4E01, 0x929A }, { 0x4E03, 0x8EB5 }, { 0x4E07, 0x969C }, { 0x4E08, 0x8FE4 }, { 0x4E09, 0x8E4F }, { 0x4E0A, 0x8FE3 }, 
-	{ 0x4E0B, 0x89BA }, { 0x4E0D, 0x9573 }, { 0x4E0E, 0x975E }, { 0x4E10, 0x98A0 }, { 0x4E11, 0x894E }, { 0x4E14, 0x8A8E }, { 0x4E15, 0x98A1 }, { 0x4E16, 0x90A2 }, 
-	{ 0x4E17, 0x99C0 }, { 0x4E18, 0x8B75 }, { 0x4E19, 0x95B8 }, { 0x4E1E, 0x8FE5 }, { 0x4E21, 0x97BC }, { 0x4E26, 0x95C0 }, { 0x4E2A, 0x98A2 }, { 0x4E2D, 0x9286 }, 
-	{ 0x4E31, 0x98A3 }, { 0x4E32, 0x8BF8 }, { 0x4E36, 0x98A4 }, { 0x4E38, 0x8ADB }, { 0x4E39, 0x924F }, { 0x4E3B, 0x8EE5 }, { 0x4E3C, 0x98A5 }, { 0x4E3F, 0x98A6 }, 
-	{ 0x4E42, 0x98A7 }, { 0x4E43, 0x9454 }, { 0x4E45, 0x8B76 }, { 0x4E4B, 0x9456 }, { 0x4E4D, 0x93E1 }, { 0x4E4E, 0x8CC1 }, { 0x4E4F, 0x9652 }, { 0x4E55, 0xE568 }, 
-	{ 0x4E56, 0x98A8 }, { 0x4E57, 0x8FE6 }, { 0x4E58, 0x98A9 }, { 0x4E59, 0x89B3 }, { 0x4E5D, 0x8BE3 }, { 0x4E5E, 0x8CEE }, { 0x4E5F, 0x96E7 }, { 0x4E62, 0x9BA4 }, 
-	{ 0x4E71, 0x9790 }, { 0x4E73, 0x93FB }, { 0x4E7E, 0x8AA3 }, { 0x4E80, 0x8B54 }, { 0x4E82, 0x98AA }, { 0x4E85, 0x98AB }, { 0x4E86, 0x97B9 }, { 0x4E88, 0x975C }, 
-	{ 0x4E89, 0x9188 }, { 0x4E8A, 0x98AD }, { 0x4E8B, 0x8E96 }, { 0x4E8C, 0x93F1 }, { 0x4E8E, 0x98B0 }, { 0x4E91, 0x895D }, { 0x4E92, 0x8CDD }, { 0x4E94, 0x8CDC }, 
-	{ 0x4E95, 0x88E4 }, { 0x4E98, 0x986A }, { 0x4E99, 0x9869 }, { 0x4E9B, 0x8DB1 }, { 0x4E9C, 0x889F }, { 0x4E9E, 0x98B1 }, { 0x4E9F, 0x98B2 }, { 0x4EA0, 0x98B3 }, 
-	{ 0x4EA1, 0x9653 }, { 0x4EA2, 0x98B4 }, { 0x4EA4, 0x8CF0 }, { 0x4EA5, 0x88E5 }, { 0x4EA6, 0x9692 }, { 0x4EA8, 0x8B9C }, { 0x4EAB, 0x8B9D }, { 0x4EAC, 0x8B9E }, 
-	{ 0x4EAD, 0x92E0 }, { 0x4EAE, 0x97BA }, { 0x4EB0, 0x98B5 }, { 0x4EB3, 0x98B6 }, { 0x4EB6, 0x98B7 }, { 0x4EBA, 0x906C }, { 0x4EC0, 0x8F59 }, { 0x4EC1, 0x906D }, 
-	{ 0x4EC2, 0x98BC }, { 0x4EC4, 0x98BA }, { 0x4EC6, 0x98BB }, { 0x4EC7, 0x8B77 }, { 0x4ECA, 0x8DA1 }, { 0x4ECB, 0x89EE }, { 0x4ECD, 0x98B9 }, { 0x4ECE, 0x98B8 }, 
-	{ 0x4ECF, 0x95A7 }, { 0x4ED4, 0x8E65 }, { 0x4ED5, 0x8E64 }, { 0x4ED6, 0x91BC }, { 0x4ED7, 0x98BD }, { 0x4ED8, 0x9574 }, { 0x4ED9, 0x90E5 }, { 0x4EDD, 0x8157 }, 
-	{ 0x4EDE, 0x98BE }, { 0x4EDF, 0x98C0 }, { 0x4EE3, 0x91E3 }, { 0x4EE4, 0x97DF }, { 0x4EE5, 0x88C8 }, { 0x4EED, 0x98BF }, { 0x4EEE, 0x89BC }, { 0x4EF0, 0x8BC2 }, 
-	{ 0x4EF2, 0x9287 }, { 0x4EF6, 0x8C8F }, { 0x4EF7, 0x98C1 }, { 0x4EFB, 0x9443 }, { 0x4F01, 0x8AE9 }, { 0x4F09, 0x98C2 }, { 0x4F0A, 0x88C9 }, { 0x4F0D, 0x8CDE }, 
-	{ 0x4F0E, 0x8AEA }, { 0x4F0F, 0x959A }, { 0x4F10, 0x94B0 }, { 0x4F11, 0x8B78 }, { 0x4F1A, 0x89EF }, { 0x4F1C, 0x98E5 }, { 0x4F1D, 0x9360 }, { 0x4F2F, 0x948C }, 
-	{ 0x4F30, 0x98C4 }, { 0x4F34, 0x94BA }, { 0x4F36, 0x97E0 }, { 0x4F38, 0x904C }, { 0x4F3A, 0x8E66 }, { 0x4F3C, 0x8E97 }, { 0x4F3D, 0x89BE }, { 0x4F43, 0x92CF }, 
-	{ 0x4F46, 0x9241 }, { 0x4F47, 0x98C8 }, { 0x4F4D, 0x88CA }, { 0x4F4E, 0x92E1 }, { 0x4F4F, 0x8F5A }, { 0x4F50, 0x8DB2 }, { 0x4F51, 0x9743 }, { 0x4F53, 0x91CC }, 
-	{ 0x4F55, 0x89BD }, { 0x4F57, 0x98C7 }, { 0x4F59, 0x975D }, { 0x4F5A, 0x98C3 }, { 0x4F5B, 0x98C5 }, { 0x4F5C, 0x8DEC }, { 0x4F5D, 0x98C6 }, { 0x4F5E, 0x9B43 }, 
-	{ 0x4F69, 0x98CE }, { 0x4F6F, 0x98D1 }, { 0x4F70, 0x98CF }, { 0x4F73, 0x89C0 }, { 0x4F75, 0x95B9 }, { 0x4F76, 0x98C9 }, { 0x4F7B, 0x98CD }, { 0x4F7C, 0x8CF1 }, 
-	{ 0x4F7F, 0x8E67 }, { 0x4F83, 0x8AA4 }, { 0x4F86, 0x98D2 }, { 0x4F88, 0x98CA }, { 0x4F8B, 0x97E1 }, { 0x4F8D, 0x8E98 }, { 0x4F8F, 0x98CB }, { 0x4F91, 0x98D0 }, 
-	{ 0x4F96, 0x98D3 }, { 0x4F98, 0x98CC }, { 0x4F9B, 0x8B9F }, { 0x4F9D, 0x88CB }, { 0x4FA0, 0x8BA0 }, { 0x4FA1, 0x89BF }, { 0x4FAB, 0x9B44 }, { 0x4FAD, 0x9699 }, 
-	{ 0x4FAE, 0x958E }, { 0x4FAF, 0x8CF2 }, { 0x4FB5, 0x904E }, { 0x4FB6, 0x97B5 }, { 0x4FBF, 0x95D6 }, { 0x4FC2, 0x8C57 }, { 0x4FC3, 0x91A3 }, { 0x4FC4, 0x89E2 }, 
-	{ 0x4FCA, 0x8F72 }, { 0x4FCE, 0x98D7 }, { 0x4FD0, 0x98DC }, { 0x4FD1, 0x98DA }, { 0x4FD4, 0x98D5 }, { 0x4FD7, 0x91AD }, { 0x4FD8, 0x98D8 }, { 0x4FDA, 0x98DB }, 
-	{ 0x4FDB, 0x98D9 }, { 0x4FDD, 0x95DB }, { 0x4FDF, 0x98D6 }, { 0x4FE1, 0x904D }, { 0x4FE3, 0x9693 }, { 0x4FE4, 0x98DD }, { 0x4FE5, 0x98DE }, { 0x4FEE, 0x8F43 }, 
-	{ 0x4FEF, 0x98EB }, { 0x4FF3, 0x946F }, { 0x4FF5, 0x9555 }, { 0x4FF6, 0x98E6 }, { 0x4FF8, 0x95EE }, { 0x4FFA, 0x89B4 }, { 0x4FFE, 0x98EA }, { 0x5005, 0x98E4 }, 
-	{ 0x5006, 0x98ED }, { 0x5009, 0x9171 }, { 0x500B, 0x8CC2 }, { 0x500D, 0x947B }, { 0x500F, 0xE0C5 }, { 0x5011, 0x98EC }, { 0x5012, 0x937C }, { 0x5014, 0x98E1 }, 
-	{ 0x5016, 0x8CF4 }, { 0x5019, 0x8CF3 }, { 0x501A, 0x98DF }, { 0x501F, 0x8ED8 }, { 0x5021, 0x98E7 }, { 0x5023, 0x95ED }, { 0x5024, 0x926C }, { 0x5025, 0x98E3 }, 
-	{ 0x5026, 0x8C91 }, { 0x5028, 0x98E0 }, { 0x5029, 0x98E8 }, { 0x502A, 0x98E2 }, { 0x502B, 0x97CF }, { 0x502C, 0x98E9 }, { 0x502D, 0x9860 }, { 0x5036, 0x8BE4 }, 
-	{ 0x5039, 0x8C90 }, { 0x5043, 0x98EE }, { 0x5047, 0x98EF }, { 0x5048, 0x98F3 }, { 0x5049, 0x88CC }, { 0x504F, 0x95CE }, { 0x5050, 0x98F2 }, { 0x5055, 0x98F1 }, 
-	{ 0x5056, 0x98F5 }, { 0x505A, 0x98F4 }, { 0x505C, 0x92E2 }, { 0x5065, 0x8C92 }, { 0x506C, 0x98F6 }, { 0x5072, 0x8EC3 }, { 0x5074, 0x91A4 }, { 0x5075, 0x92E3 }, 
-	{ 0x5076, 0x8BF4 }, { 0x5078, 0x98F7 }, { 0x507D, 0x8B55 }, { 0x5080, 0x98F8 }, { 0x5085, 0x98FA }, { 0x508D, 0x9654 }, { 0x5091, 0x8C86 }, { 0x5098, 0x8E50 }, 
-	{ 0x5099, 0x94F5 }, { 0x509A, 0x98F9 }, { 0x50AC, 0x8DC3 }, { 0x50AD, 0x9762 }, { 0x50B2, 0x98FC }, { 0x50B3, 0x9942 }, { 0x50B4, 0x98FB }, { 0x50B5, 0x8DC2 }, 
-	{ 0x50B7, 0x8F9D }, { 0x50BE, 0x8C58 }, { 0x50C2, 0x9943 }, { 0x50C5, 0x8BCD }, { 0x50C9, 0x9940 }, { 0x50CA, 0x9941 }, { 0x50CD, 0x93AD }, { 0x50CF, 0x919C }, 
-	{ 0x50D1, 0x8BA1 }, { 0x50D5, 0x966C }, { 0x50D6, 0x9944 }, { 0x50DA, 0x97BB }, { 0x50DE, 0x9945 }, { 0x50E3, 0x9948 }, { 0x50E5, 0x9946 }, { 0x50E7, 0x916D }, 
-	{ 0x50ED, 0x9947 }, { 0x50EE, 0x9949 }, { 0x50F5, 0x994B }, { 0x50F9, 0x994A }, { 0x50FB, 0x95C6 }, { 0x5100, 0x8B56 }, { 0x5101, 0x994D }, { 0x5102, 0x994E }, 
-	{ 0x5104, 0x89AD }, { 0x5109, 0x994C }, { 0x5112, 0x8EF2 }, { 0x5114, 0x9951 }, { 0x5115, 0x9950 }, { 0x5116, 0x994F }, { 0x5118, 0x98D4 }, { 0x511A, 0x9952 }, 
-	{ 0x511F, 0x8F9E }, { 0x5121, 0x9953 }, { 0x512A, 0x9744 }, { 0x5132, 0x96D7 }, { 0x5137, 0x9955 }, { 0x513A, 0x9954 }, { 0x513B, 0x9957 }, { 0x513C, 0x9956 }, 
-	{ 0x513F, 0x9958 }, { 0x5140, 0x9959 }, { 0x5141, 0x88F2 }, { 0x5143, 0x8CB3 }, { 0x5144, 0x8C5A }, { 0x5145, 0x8F5B }, { 0x5146, 0x929B }, { 0x5147, 0x8BA2 }, 
-	{ 0x5148, 0x90E6 }, { 0x5149, 0x8CF5 }, { 0x514B, 0x8D8E }, { 0x514C, 0x995B }, { 0x514D, 0x96C6 }, { 0x514E, 0x9365 }, { 0x5150, 0x8E99 }, { 0x5152, 0x995A }, 
-	{ 0x5154, 0x995C }, { 0x515A, 0x937D }, { 0x515C, 0x8A95 }, { 0x5162, 0x995D }, { 0x5165, 0x93FC }, { 0x5168, 0x9153 }, { 0x5169, 0x995F }, { 0x516A, 0x9960 }, 
-	{ 0x516B, 0x94AA }, { 0x516C, 0x8CF6 }, { 0x516D, 0x985A }, { 0x516E, 0x9961 }, { 0x5171, 0x8BA4 }, { 0x5175, 0x95BA }, { 0x5176, 0x91B4 }, { 0x5177, 0x8BEF }, 
-	{ 0x5178, 0x9354 }, { 0x517C, 0x8C93 }, { 0x5180, 0x9962 }, { 0x5182, 0x9963 }, { 0x5185, 0x93E0 }, { 0x5186, 0x897E }, { 0x5189, 0x9966 }, { 0x518A, 0x8DFB }, 
-	{ 0x518C, 0x9965 }, { 0x518D, 0x8DC4 }, { 0x518F, 0x9967 }, { 0x5190, 0xE3EC }, { 0x5191, 0x9968 }, { 0x5192, 0x9660 }, { 0x5193, 0x9969 }, { 0x5195, 0x996A }, 
-	{ 0x5196, 0x996B }, { 0x5197, 0x8FE7 }, { 0x5199, 0x8ECA }, { 0x51A0, 0x8AA5 }, { 0x51A2, 0x996E }, { 0x51A4, 0x996C }, { 0x51A5, 0x96BB }, { 0x51A6, 0x996D }, 
-	{ 0x51A8, 0x9579 }, { 0x51A9, 0x996F }, { 0x51AA, 0x9970 }, { 0x51AB, 0x9971 }, { 0x51AC, 0x937E }, { 0x51B0, 0x9975 }, { 0x51B1, 0x9973 }, { 0x51B2, 0x9974 }, 
-	{ 0x51B3, 0x9972 }, { 0x51B4, 0x8DE1 }, { 0x51B5, 0x9976 }, { 0x51B6, 0x96E8 }, { 0x51B7, 0x97E2 }, { 0x51BD, 0x9977 }, { 0x51C4, 0x90A6 }, { 0x51C5, 0x9978 }, 
-	{ 0x51C6, 0x8F79 }, { 0x51C9, 0x9979 }, { 0x51CB, 0x929C }, { 0x51CC, 0x97BD }, { 0x51CD, 0x9380 }, { 0x51D6, 0x99C3 }, { 0x51DB, 0x997A }, { 0x51DC, 0xEAA3 }, 
-	{ 0x51DD, 0x8BC3 }, { 0x51E0, 0x997B }, { 0x51E1, 0x967D }, { 0x51E6, 0x8F88 }, { 0x51E7, 0x91FA }, { 0x51E9, 0x997D }, { 0x51EA, 0x93E2 }, { 0x51ED, 0x997E }, 
-	{ 0x51F0, 0x9980 }, { 0x51F1, 0x8A4D }, { 0x51F5, 0x9981 }, { 0x51F6, 0x8BA5 }, { 0x51F8, 0x93CA }, { 0x51F9, 0x899A }, { 0x51FA, 0x8F6F }, { 0x51FD, 0x949F }, 
-	{ 0x51FE, 0x9982 }, { 0x5200, 0x9381 }, { 0x5203, 0x906E }, { 0x5204, 0x9983 }, { 0x5206, 0x95AA }, { 0x5207, 0x90D8 }, { 0x5208, 0x8AA0 }, { 0x520A, 0x8AA7 }, 
-	{ 0x520B, 0x9984 }, { 0x520E, 0x9986 }, { 0x5211, 0x8C59 }, { 0x5214, 0x9985 }, { 0x5217, 0x97F1 }, { 0x521D, 0x8F89 }, { 0x5224, 0x94BB }, { 0x5225, 0x95CA }, 
-	{ 0x5227, 0x9987 }, { 0x5229, 0x9798 }, { 0x522A, 0x9988 }, { 0x522E, 0x9989 }, { 0x5230, 0x939E }, { 0x5233, 0x998A }, { 0x5236, 0x90A7 }, { 0x5237, 0x8DFC }, 
-	{ 0x5238, 0x8C94 }, { 0x5239, 0x998B }, { 0x523A, 0x8E68 }, { 0x523B, 0x8D8F }, { 0x5243, 0x92E4 }, { 0x5244, 0x998D }, { 0x5247, 0x91A5 }, { 0x524A, 0x8DED }, 
-	{ 0x524B, 0x998E }, { 0x524C, 0x998F }, { 0x524D, 0x914F }, { 0x524F, 0x998C }, { 0x5254, 0x9991 }, { 0x5256, 0x9655 }, { 0x525B, 0x8D84 }, { 0x525E, 0x9990 }, 
-	{ 0x5263, 0x8C95 }, { 0x5264, 0x8DDC }, { 0x5265, 0x948D }, { 0x5269, 0x9994 }, { 0x526A, 0x9992 }, { 0x526F, 0x959B }, { 0x5270, 0x8FE8 }, { 0x5271, 0x999B }, 
-	{ 0x5272, 0x8A84 }, { 0x5273, 0x9995 }, { 0x5274, 0x9993 }, { 0x5275, 0x916E }, { 0x527D, 0x9997 }, { 0x527F, 0x9996 }, { 0x5283, 0x8A63 }, { 0x5287, 0x8C80 }, 
-	{ 0x5288, 0x999C }, { 0x5289, 0x97AB }, { 0x528D, 0x9998 }, { 0x5291, 0x999D }, { 0x5292, 0x999A }, { 0x5294, 0x9999 }, { 0x529B, 0x97CD }, { 0x529F, 0x8CF7 }, 
-	{ 0x52A0, 0x89C1 }, { 0x52A3, 0x97F2 }, { 0x52A9, 0x8F95 }, { 0x52AA, 0x9377 }, { 0x52AB, 0x8D85 }, { 0x52AC, 0x99A0 }, { 0x52AD, 0x99A1 }, { 0x52B1, 0x97E3 }, 
-	{ 0x52B4, 0x984A }, { 0x52B5, 0x99A3 }, { 0x52B9, 0x8CF8 }, { 0x52BC, 0x99A2 }, { 0x52BE, 0x8A4E }, { 0x52C1, 0x99A4 }, { 0x52C3, 0x9675 }, { 0x52C5, 0x92BA }, 
-	{ 0x52C7, 0x9745 }, { 0x52C9, 0x95D7 }, { 0x52CD, 0x99A5 }, { 0x52D2, 0xE8D3 }, { 0x52D5, 0x93AE }, { 0x52D7, 0x99A6 }, { 0x52D8, 0x8AA8 }, { 0x52D9, 0x96B1 }, 
-	{ 0x52DD, 0x8F9F }, { 0x52DE, 0x99A7 }, { 0x52DF, 0x95E5 }, { 0x52E0, 0x99AB }, { 0x52E2, 0x90A8 }, { 0x52E3, 0x99A8 }, { 0x52E4, 0x8BCE }, { 0x52E6, 0x99A9 }, 
-	{ 0x52E7, 0x8AA9 }, { 0x52F2, 0x8C4D }, { 0x52F3, 0x99AC }, { 0x52F5, 0x99AD }, { 0x52F8, 0x99AE }, { 0x52F9, 0x99AF }, { 0x52FA, 0x8ED9 }, { 0x52FE, 0x8CF9 }, 
-	{ 0x52FF, 0x96DC }, { 0x5301, 0x96E6 }, { 0x5302, 0x93F5 }, { 0x5305, 0x95EF }, { 0x5306, 0x99B0 }, { 0x5308, 0x99B1 }, { 0x530D, 0x99B3 }, { 0x530F, 0x99B5 }, 
-	{ 0x5310, 0x99B4 }, { 0x5315, 0x99B6 }, { 0x5316, 0x89BB }, { 0x5317, 0x966B }, { 0x5319, 0x8DFA }, { 0x531A, 0x99B7 }, { 0x531D, 0x9178 }, { 0x5320, 0x8FA0 }, 
-	{ 0x5321, 0x8BA7 }, { 0x5323, 0x99B8 }, { 0x532A, 0x94D9 }, { 0x532F, 0x99B9 }, { 0x5331, 0x99BA }, { 0x5333, 0x99BB }, { 0x5338, 0x99BC }, { 0x5339, 0x9543 }, 
-	{ 0x533A, 0x8BE6 }, { 0x533B, 0x88E3 }, { 0x533F, 0x93BD }, { 0x5340, 0x99BD }, { 0x5341, 0x8F5C }, { 0x5343, 0x90E7 }, { 0x5345, 0x99BF }, { 0x5346, 0x99BE }, 
-	{ 0x5347, 0x8FA1 }, { 0x5348, 0x8CDF }, { 0x5349, 0x99C1 }, { 0x534A, 0x94BC }, { 0x534D, 0x99C2 }, { 0x5351, 0x94DA }, { 0x5352, 0x91B2 }, { 0x5353, 0x91EC }, 
-	{ 0x5354, 0x8BA6 }, { 0x5357, 0x93EC }, { 0x5358, 0x9250 }, { 0x535A, 0x948E }, { 0x535C, 0x966D }, { 0x535E, 0x99C4 }, { 0x5360, 0x90E8 }, { 0x5366, 0x8C54 }, 
-	{ 0x5369, 0x99C5 }, { 0x536E, 0x99C6 }, { 0x536F, 0x894B }, { 0x5370, 0x88F3 }, { 0x5371, 0x8AEB }, { 0x5373, 0x91A6 }, { 0x5374, 0x8B70 }, { 0x5375, 0x9791 }, 
-	{ 0x5377, 0x99C9 }, { 0x5378, 0x89B5 }, { 0x537B, 0x99C8 }, { 0x537F, 0x8BA8 }, { 0x5382, 0x99CA }, { 0x5384, 0x96EF }, { 0x5396, 0x99CB }, { 0x5398, 0x97D0 }, 
-	{ 0x539A, 0x8CFA }, { 0x539F, 0x8CB4 }, { 0x53A0, 0x99CC }, { 0x53A5, 0x99CE }, { 0x53A6, 0x99CD }, { 0x53A8, 0x907E }, { 0x53A9, 0x8958 }, { 0x53AD, 0x897D }, 
-	{ 0x53AE, 0x99CF }, { 0x53B0, 0x99D0 }, { 0x53B3, 0x8CB5 }, { 0x53B6, 0x99D1 }, { 0x53BB, 0x8B8E }, { 0x53C2, 0x8E51 }, { 0x53C3, 0x99D2 }, { 0x53C8, 0x9694 }, 
-	{ 0x53C9, 0x8DB3 }, { 0x53CA, 0x8B79 }, { 0x53CB, 0x9746 }, { 0x53CC, 0x916F }, { 0x53CD, 0x94BD }, { 0x53CE, 0x8EFB }, { 0x53D4, 0x8F66 }, { 0x53D6, 0x8EE6 }, 
-	{ 0x53D7, 0x8EF3 }, { 0x53D9, 0x8F96 }, { 0x53DB, 0x94BE }, { 0x53DF, 0x99D5 }, { 0x53E1, 0x8962 }, { 0x53E2, 0x9170 }, { 0x53E3, 0x8CFB }, { 0x53E4, 0x8CC3 }, 
-	{ 0x53E5, 0x8BE5 }, { 0x53E8, 0x99D9 }, { 0x53E9, 0x9240 }, { 0x53EA, 0x91FC }, { 0x53EB, 0x8BA9 }, { 0x53EC, 0x8FA2 }, { 0x53ED, 0x99DA }, { 0x53EE, 0x99D8 }, 
-	{ 0x53EF, 0x89C2 }, { 0x53F0, 0x91E4 }, { 0x53F1, 0x8EB6 }, { 0x53F2, 0x8E6A }, { 0x53F3, 0x8945 }, { 0x53F6, 0x8A90 }, { 0x53F7, 0x8D86 }, { 0x53F8, 0x8E69 }, 
-	{ 0x53FA, 0x99DB }, { 0x5401, 0x99DC }, { 0x5403, 0x8B68 }, { 0x5404, 0x8A65 }, { 0x5408, 0x8D87 }, { 0x5409, 0x8B67 }, { 0x540A, 0x92DD }, { 0x540B, 0x8944 }, 
-	{ 0x540C, 0x93AF }, { 0x540D, 0x96BC }, { 0x540E, 0x8D40 }, { 0x540F, 0x9799 }, { 0x5410, 0x9366 }, { 0x5411, 0x8CFC }, { 0x541B, 0x8C4E }, { 0x541D, 0x99E5 }, 
-	{ 0x541F, 0x8BE1 }, { 0x5420, 0x9669 }, { 0x5426, 0x94DB }, { 0x5429, 0x99E4 }, { 0x542B, 0x8ADC }, { 0x542C, 0x99DF }, { 0x542D, 0x99E0 }, { 0x542E, 0x99E2 }, 
-	{ 0x5436, 0x99E3 }, { 0x5438, 0x8B7A }, { 0x5439, 0x9081 }, { 0x543B, 0x95AB }, { 0x543C, 0x99E1 }, { 0x543D, 0x99DD }, { 0x543E, 0x8CE1 }, { 0x5440, 0x99DE }, 
-	{ 0x5442, 0x9843 }, { 0x5446, 0x95F0 }, { 0x5448, 0x92E6 }, { 0x5449, 0x8CE0 }, { 0x544A, 0x8D90 }, { 0x544E, 0x99E6 }, { 0x5451, 0x93DB }, { 0x545F, 0x99EA }, 
-	{ 0x5468, 0x8EFC }, { 0x546A, 0x8EF4 }, { 0x5470, 0x99ED }, { 0x5471, 0x99EB }, { 0x5473, 0x96A1 }, { 0x5475, 0x99E8 }, { 0x5476, 0x99F1 }, { 0x5477, 0x99EC }, 
-	{ 0x547B, 0x99EF }, { 0x547C, 0x8CC4 }, { 0x547D, 0x96BD }, { 0x5480, 0x99F0 }, { 0x5484, 0x99F2 }, { 0x5486, 0x99F4 }, { 0x548B, 0x8DEE }, { 0x548C, 0x9861 }, 
-	{ 0x548E, 0x99E9 }, { 0x548F, 0x99E7 }, { 0x5490, 0x99F3 }, { 0x5492, 0x99EE }, { 0x54A2, 0x99F6 }, { 0x54A4, 0x9A42 }, { 0x54A5, 0x99F8 }, { 0x54A8, 0x99FC }, 
-	{ 0x54AB, 0x9A40 }, { 0x54AC, 0x99F9 }, { 0x54AF, 0x9A5D }, { 0x54B2, 0x8DE7 }, { 0x54B3, 0x8A50 }, { 0x54B8, 0x99F7 }, { 0x54BC, 0x9A44 }, { 0x54BD, 0x88F4 }, 
-	{ 0x54BE, 0x9A43 }, { 0x54C0, 0x88A3 }, { 0x54C1, 0x9569 }, { 0x54C2, 0x9A41 }, { 0x54C4, 0x99FA }, { 0x54C7, 0x99F5 }, { 0x54C8, 0x99FB }, { 0x54C9, 0x8DC6 }, 
-	{ 0x54D8, 0x9A45 }, { 0x54E1, 0x88F5 }, { 0x54E2, 0x9A4E }, { 0x54E5, 0x9A46 }, { 0x54E6, 0x9A47 }, { 0x54E8, 0x8FA3 }, { 0x54E9, 0x9689 }, { 0x54ED, 0x9A4C }, 
-	{ 0x54EE, 0x9A4B }, { 0x54F2, 0x934E }, { 0x54FA, 0x9A4D }, { 0x54FD, 0x9A4A }, { 0x5504, 0x8953 }, { 0x5506, 0x8DB4 }, { 0x5507, 0x904F }, { 0x550F, 0x9A48 }, 
-	{ 0x5510, 0x9382 }, { 0x5514, 0x9A49 }, { 0x5516, 0x88A0 }, { 0x552E, 0x9A53 }, { 0x552F, 0x9742 }, { 0x5531, 0x8FA5 }, { 0x5533, 0x9A59 }, { 0x5538, 0x9A58 }, 
-	{ 0x5539, 0x9A4F }, { 0x553E, 0x91C1 }, { 0x5540, 0x9A50 }, { 0x5544, 0x91ED }, { 0x5545, 0x9A55 }, { 0x5546, 0x8FA4 }, { 0x554C, 0x9A52 }, { 0x554F, 0x96E2 }, 
-	{ 0x5553, 0x8C5B }, { 0x5556, 0x9A56 }, { 0x5557, 0x9A57 }, { 0x555C, 0x9A54 }, { 0x555D, 0x9A5A }, { 0x5563, 0x9A51 }, { 0x557B, 0x9A60 }, { 0x557C, 0x9A65 }, 
-	{ 0x557E, 0x9A61 }, { 0x5580, 0x9A5C }, { 0x5583, 0x9A66 }, { 0x5584, 0x9150 }, { 0x5587, 0x9A68 }, { 0x5589, 0x8D41 }, { 0x558A, 0x9A5E }, { 0x558B, 0x929D }, 
-	{ 0x5598, 0x9A62 }, { 0x5599, 0x9A5B }, { 0x559A, 0x8AAB }, { 0x559C, 0x8AEC }, { 0x559D, 0x8A85 }, { 0x559E, 0x9A63 }, { 0x559F, 0x9A5F }, { 0x55A7, 0x8C96 }, 
-	{ 0x55A8, 0x9A69 }, { 0x55A9, 0x9A67 }, { 0x55AA, 0x9172 }, { 0x55AB, 0x8B69 }, { 0x55AC, 0x8BAA }, { 0x55AE, 0x9A64 }, { 0x55B0, 0x8BF2 }, { 0x55B6, 0x8963 }, 
-	{ 0x55C4, 0x9A6D }, { 0x55C5, 0x9A6B }, { 0x55C7, 0x9AA5 }, { 0x55D4, 0x9A70 }, { 0x55DA, 0x9A6A }, { 0x55DC, 0x9A6E }, { 0x55DF, 0x9A6C }, { 0x55E3, 0x8E6B }, 
-	{ 0x55E4, 0x9A6F }, { 0x55F7, 0x9A72 }, { 0x55F9, 0x9A77 }, { 0x55FD, 0x9A75 }, { 0x55FE, 0x9A74 }, { 0x5606, 0x9251 }, { 0x5609, 0x89C3 }, { 0x5614, 0x9A71 }, 
-	{ 0x5616, 0x9A73 }, { 0x5617, 0x8FA6 }, { 0x5618, 0x8952 }, { 0x561B, 0x9A76 }, { 0x5629, 0x89DC }, { 0x562F, 0x9A82 }, { 0x5631, 0x8FFA }, { 0x5632, 0x9A7D }, 
-	{ 0x5634, 0x9A7B }, { 0x5636, 0x9A7C }, { 0x5638, 0x9A7E }, { 0x5642, 0x895C }, { 0x564C, 0x9158 }, { 0x564E, 0x9A78 }, { 0x5650, 0x9A79 }, { 0x565B, 0x8A9A }, 
-	{ 0x5664, 0x9A81 }, { 0x5668, 0x8AED }, { 0x566A, 0x9A84 }, { 0x566B, 0x9A80 }, { 0x566C, 0x9A83 }, { 0x5674, 0x95AC }, { 0x5678, 0x93D3 }, { 0x567A, 0x94B6 }, 
-	{ 0x5680, 0x9A86 }, { 0x5686, 0x9A85 }, { 0x5687, 0x8A64 }, { 0x568A, 0x9A87 }, { 0x568F, 0x9A8A }, { 0x5694, 0x9A89 }, { 0x56A0, 0x9A88 }, { 0x56A2, 0x9458 }, 
-	{ 0x56A5, 0x9A8B }, { 0x56AE, 0x9A8C }, { 0x56B4, 0x9A8E }, { 0x56B6, 0x9A8D }, { 0x56BC, 0x9A90 }, { 0x56C0, 0x9A93 }, { 0x56C1, 0x9A91 }, { 0x56C2, 0x9A8F }, 
-	{ 0x56C3, 0x9A92 }, { 0x56C8, 0x9A94 }, { 0x56CE, 0x9A95 }, { 0x56D1, 0x9A96 }, { 0x56D3, 0x9A97 }, { 0x56D7, 0x9A98 }, { 0x56D8, 0x9964 }, { 0x56DA, 0x8EFA }, 
-	{ 0x56DB, 0x8E6C }, { 0x56DE, 0x89F1 }, { 0x56E0, 0x88F6 }, { 0x56E3, 0x9263 }, { 0x56EE, 0x9A99 }, { 0x56F0, 0x8DA2 }, { 0x56F2, 0x88CD }, { 0x56F3, 0x907D }, 
-	{ 0x56F9, 0x9A9A }, { 0x56FA, 0x8CC5 }, { 0x56FD, 0x8D91 }, { 0x56FF, 0x9A9C }, { 0x5700, 0x9A9B }, { 0x5703, 0x95DE }, { 0x5704, 0x9A9D }, { 0x5708, 0x9A9F }, 
-	{ 0x5709, 0x9A9E }, { 0x570B, 0x9AA0 }, { 0x570D, 0x9AA1 }, { 0x570F, 0x8C97 }, { 0x5712, 0x8980 }, { 0x5713, 0x9AA2 }, { 0x5716, 0x9AA4 }, { 0x5718, 0x9AA3 }, 
-	{ 0x571C, 0x9AA6 }, { 0x571F, 0x9379 }, { 0x5726, 0x9AA7 }, { 0x5727, 0x88B3 }, { 0x5728, 0x8DDD }, { 0x572D, 0x8C5C }, { 0x5730, 0x926E }, { 0x5737, 0x9AA8 }, 
-	{ 0x5738, 0x9AA9 }, { 0x573B, 0x9AAB }, { 0x5740, 0x9AAC }, { 0x5742, 0x8DE2 }, { 0x5747, 0x8BCF }, { 0x574A, 0x9656 }, { 0x574E, 0x9AAA }, { 0x574F, 0x9AAD }, 
-	{ 0x5750, 0x8DBF }, { 0x5751, 0x8D42 }, { 0x5761, 0x9AB1 }, { 0x5764, 0x8DA3 }, { 0x5766, 0x9252 }, { 0x5769, 0x9AAE }, { 0x576A, 0x92D8 }, { 0x577F, 0x9AB2 }, 
-	{ 0x5782, 0x9082 }, { 0x5788, 0x9AB0 }, { 0x5789, 0x9AB3 }, { 0x578B, 0x8C5E }, { 0x5793, 0x9AB4 }, { 0x57A0, 0x9AB5 }, { 0x57A2, 0x8D43 }, { 0x57A3, 0x8A5F }, 
-	{ 0x57A4, 0x9AB7 }, { 0x57AA, 0x9AB8 }, { 0x57B0, 0x9AB9 }, { 0x57B3, 0x9AB6 }, { 0x57C0, 0x9AAF }, { 0x57C3, 0x9ABA }, { 0x57C6, 0x9ABB }, { 0x57CB, 0x9684 }, 
-	{ 0x57CE, 0x8FE9 }, { 0x57D2, 0x9ABD }, { 0x57D3, 0x9ABE }, { 0x57D4, 0x9ABC }, { 0x57D6, 0x9AC0 }, { 0x57DC, 0x9457 }, { 0x57DF, 0x88E6 }, { 0x57E0, 0x9575 }, 
-	{ 0x57E3, 0x9AC1 }, { 0x57F4, 0x8FFB }, { 0x57F7, 0x8EB7 }, { 0x57F9, 0x947C }, { 0x57FA, 0x8AEE }, { 0x57FC, 0x8DE9 }, { 0x5800, 0x9678 }, { 0x5802, 0x93B0 }, 
-	{ 0x5805, 0x8C98 }, { 0x5806, 0x91CD }, { 0x580A, 0x9ABF }, { 0x580B, 0x9AC2 }, { 0x5815, 0x91C2 }, { 0x5819, 0x9AC3 }, { 0x581D, 0x9AC4 }, { 0x5821, 0x9AC6 }, 
-	{ 0x5824, 0x92E7 }, { 0x582A, 0x8AAC }, { 0x582F, 0xEA9F }, { 0x5830, 0x8981 }, { 0x5831, 0x95F1 }, { 0x5834, 0x8FEA }, { 0x5835, 0x9367 }, { 0x583A, 0x8DE4 }, 
-	{ 0x583D, 0x9ACC }, { 0x5840, 0x95BB }, { 0x5841, 0x97DB }, { 0x584A, 0x89F2 }, { 0x584B, 0x9AC8 }, { 0x5851, 0x9159 }, { 0x5852, 0x9ACB }, { 0x5854, 0x9383 }, 
-	{ 0x5857, 0x9368 }, { 0x5858, 0x9384 }, { 0x5859, 0x94B7 }, { 0x585A, 0x92CB }, { 0x585E, 0x8DC7 }, { 0x5862, 0x9AC7 }, { 0x5869, 0x8996 }, { 0x586B, 0x9355 }, 
-	{ 0x5870, 0x9AC9 }, { 0x5872, 0x9AC5 }, { 0x5875, 0x906F }, { 0x5879, 0x9ACD }, { 0x587E, 0x8F6D }, { 0x5883, 0x8BAB }, { 0x5885, 0x9ACE }, { 0x5893, 0x95E6 }, 
-	{ 0x5897, 0x919D }, { 0x589C, 0x92C4 }, { 0x589F, 0x9AD0 }, { 0x58A8, 0x966E }, { 0x58AB, 0x9AD1 }, { 0x58AE, 0x9AD6 }, { 0x58B3, 0x95AD }, { 0x58B8, 0x9AD5 }, 
-	{ 0x58B9, 0x9ACF }, { 0x58BA, 0x9AD2 }, { 0x58BB, 0x9AD4 }, { 0x58BE, 0x8DA4 }, { 0x58C1, 0x95C7 }, { 0x58C5, 0x9AD7 }, { 0x58C7, 0x9264 }, { 0x58CA, 0x89F3 }, 
-	{ 0x58CC, 0x8FEB }, { 0x58D1, 0x9AD9 }, { 0x58D3, 0x9AD8 }, { 0x58D5, 0x8D88 }, { 0x58D7, 0x9ADA }, { 0x58D8, 0x9ADC }, { 0x58D9, 0x9ADB }, { 0x58DC, 0x9ADE }, 
-	{ 0x58DE, 0x9AD3 }, { 0x58DF, 0x9AE0 }, { 0x58E4, 0x9ADF }, { 0x58E5, 0x9ADD }, { 0x58EB, 0x8E6D }, { 0x58EC, 0x9070 }, { 0x58EE, 0x9173 }, { 0x58EF, 0x9AE1 }, 
-	{ 0x58F0, 0x90BA }, { 0x58F1, 0x88EB }, { 0x58F2, 0x9484 }, { 0x58F7, 0x92D9 }, { 0x58F9, 0x9AE3 }, { 0x58FA, 0x9AE2 }, { 0x58FB, 0x9AE4 }, { 0x58FC, 0x9AE5 }, 
-	{ 0x58FD, 0x9AE6 }, { 0x5902, 0x9AE7 }, { 0x5909, 0x95CF }, { 0x590A, 0x9AE8 }, { 0x590F, 0x89C4 }, { 0x5910, 0x9AE9 }, { 0x5915, 0x975B }, { 0x5916, 0x8A4F }, 
-	{ 0x5918, 0x99C7 }, { 0x5919, 0x8F67 }, { 0x591A, 0x91BD }, { 0x591B, 0x9AEA }, { 0x591C, 0x96E9 }, { 0x5922, 0x96B2 }, { 0x5925, 0x9AEC }, { 0x5927, 0x91E5 }, 
-	{ 0x5929, 0x9356 }, { 0x592A, 0x91BE }, { 0x592B, 0x9576 }, { 0x592C, 0x9AED }, { 0x592D, 0x9AEE }, { 0x592E, 0x899B }, { 0x5931, 0x8EB8 }, { 0x5932, 0x9AEF }, 
-	{ 0x5937, 0x88CE }, { 0x5938, 0x9AF0 }, { 0x593E, 0x9AF1 }, { 0x5944, 0x8982 }, { 0x5947, 0x8AEF }, { 0x5948, 0x93DE }, { 0x5949, 0x95F2 }, { 0x594E, 0x9AF5 }, 
-	{ 0x594F, 0x9174 }, { 0x5950, 0x9AF4 }, { 0x5951, 0x8C5F }, { 0x5954, 0x967A }, { 0x5955, 0x9AF3 }, { 0x5957, 0x9385 }, { 0x5958, 0x9AF7 }, { 0x595A, 0x9AF6 }, 
-	{ 0x5960, 0x9AF9 }, { 0x5962, 0x9AF8 }, { 0x5965, 0x899C }, { 0x5967, 0x9AFA }, { 0x5968, 0x8FA7 }, { 0x5969, 0x9AFC }, { 0x596A, 0x9244 }, { 0x596C, 0x9AFB }, 
-	{ 0x596E, 0x95B1 }, { 0x5973, 0x8F97 }, { 0x5974, 0x937A }, { 0x5978, 0x9B40 }, { 0x597D, 0x8D44 }, { 0x5981, 0x9B41 }, { 0x5982, 0x9440 }, { 0x5983, 0x94DC }, 
-	{ 0x5984, 0x96CF }, { 0x598A, 0x9444 }, { 0x598D, 0x9B4A }, { 0x5993, 0x8B57 }, { 0x5996, 0x9764 }, { 0x5999, 0x96AD }, { 0x599B, 0x9BAA }, { 0x599D, 0x9B42 }, 
-	{ 0x59A3, 0x9B45 }, { 0x59A5, 0x91C3 }, { 0x59A8, 0x9657 }, { 0x59AC, 0x9369 }, { 0x59B2, 0x9B46 }, { 0x59B9, 0x9685 }, { 0x59BB, 0x8DC8 }, { 0x59BE, 0x8FA8 }, 
-	{ 0x59C6, 0x9B47 }, { 0x59C9, 0x8E6F }, { 0x59CB, 0x8E6E }, { 0x59D0, 0x88B7 }, { 0x59D1, 0x8CC6 }, { 0x59D3, 0x90A9 }, { 0x59D4, 0x88CF }, { 0x59D9, 0x9B4B }, 
-	{ 0x59DA, 0x9B4C }, { 0x59DC, 0x9B49 }, { 0x59E5, 0x8957 }, { 0x59E6, 0x8AAD }, { 0x59E8, 0x9B48 }, { 0x59EA, 0x96C3 }, { 0x59EB, 0x9550 }, { 0x59F6, 0x88A6 }, 
-	{ 0x59FB, 0x88F7 }, { 0x59FF, 0x8E70 }, { 0x5A01, 0x88D0 }, { 0x5A03, 0x88A1 }, { 0x5A09, 0x9B51 }, { 0x5A11, 0x9B4F }, { 0x5A18, 0x96BA }, { 0x5A1A, 0x9B52 }, 
-	{ 0x5A1C, 0x9B50 }, { 0x5A1F, 0x9B4E }, { 0x5A20, 0x9050 }, { 0x5A25, 0x9B4D }, { 0x5A29, 0x95D8 }, { 0x5A2F, 0x8CE2 }, { 0x5A35, 0x9B56 }, { 0x5A36, 0x9B57 }, 
-	{ 0x5A3C, 0x8FA9 }, { 0x5A40, 0x9B53 }, { 0x5A41, 0x984B }, { 0x5A46, 0x946B }, { 0x5A49, 0x9B55 }, { 0x5A5A, 0x8DA5 }, { 0x5A62, 0x9B58 }, { 0x5A66, 0x9577 }, 
-	{ 0x5A6A, 0x9B59 }, { 0x5A6C, 0x9B54 }, { 0x5A7F, 0x96B9 }, { 0x5A92, 0x947D }, { 0x5A9A, 0x9B5A }, { 0x5A9B, 0x9551 }, { 0x5ABC, 0x9B5B }, { 0x5ABD, 0x9B5F }, 
-	{ 0x5ABE, 0x9B5C }, { 0x5AC1, 0x89C5 }, { 0x5AC2, 0x9B5E }, { 0x5AC9, 0x8EB9 }, { 0x5ACB, 0x9B5D }, { 0x5ACC, 0x8C99 }, { 0x5AD0, 0x9B6B }, { 0x5AD6, 0x9B64 }, 
-	{ 0x5AD7, 0x9B61 }, { 0x5AE1, 0x9284 }, { 0x5AE3, 0x9B60 }, { 0x5AE6, 0x9B62 }, { 0x5AE9, 0x9B63 }, { 0x5AFA, 0x9B65 }, { 0x5AFB, 0x9B66 }, { 0x5B09, 0x8AF0 }, 
-	{ 0x5B0B, 0x9B68 }, { 0x5B0C, 0x9B67 }, { 0x5B16, 0x9B69 }, { 0x5B22, 0x8FEC }, { 0x5B2A, 0x9B6C }, { 0x5B2C, 0x92DA }, { 0x5B30, 0x8964 }, { 0x5B32, 0x9B6A }, 
-	{ 0x5B36, 0x9B6D }, { 0x5B3E, 0x9B6E }, { 0x5B40, 0x9B71 }, { 0x5B43, 0x9B6F }, { 0x5B45, 0x9B70 }, { 0x5B50, 0x8E71 }, { 0x5B51, 0x9B72 }, { 0x5B54, 0x8D45 }, 
-	{ 0x5B55, 0x9B73 }, { 0x5B57, 0x8E9A }, { 0x5B58, 0x91B6 }, { 0x5B5A, 0x9B74 }, { 0x5B5B, 0x9B75 }, { 0x5B5C, 0x8E79 }, { 0x5B5D, 0x8D46 }, { 0x5B5F, 0x96D0 }, 
-	{ 0x5B63, 0x8B47 }, { 0x5B64, 0x8CC7 }, { 0x5B65, 0x9B76 }, { 0x5B66, 0x8A77 }, { 0x5B69, 0x9B77 }, { 0x5B6B, 0x91B7 }, { 0x5B70, 0x9B78 }, { 0x5B71, 0x9BA1 }, 
-	{ 0x5B73, 0x9B79 }, { 0x5B75, 0x9B7A }, { 0x5B78, 0x9B7B }, { 0x5B7A, 0x9B7D }, { 0x5B80, 0x9B7E }, { 0x5B83, 0x9B80 }, { 0x5B85, 0x91EE }, { 0x5B87, 0x8946 }, 
-	{ 0x5B88, 0x8EE7 }, { 0x5B89, 0x88C0 }, { 0x5B8B, 0x9176 }, { 0x5B8C, 0x8AAE }, { 0x5B8D, 0x8EB3 }, { 0x5B8F, 0x8D47 }, { 0x5B95, 0x9386 }, { 0x5B97, 0x8F40 }, 
-	{ 0x5B98, 0x8AAF }, { 0x5B99, 0x9288 }, { 0x5B9A, 0x92E8 }, { 0x5B9B, 0x88B6 }, { 0x5B9C, 0x8B58 }, { 0x5B9D, 0x95F3 }, { 0x5B9F, 0x8EC0 }, { 0x5BA2, 0x8B71 }, 
-	{ 0x5BA3, 0x90E9 }, { 0x5BA4, 0x8EBA }, { 0x5BA5, 0x9747 }, { 0x5BA6, 0x9B81 }, { 0x5BAE, 0x8B7B }, { 0x5BB0, 0x8DC9 }, { 0x5BB3, 0x8A51 }, { 0x5BB4, 0x8983 }, 
-	{ 0x5BB5, 0x8FAA }, { 0x5BB6, 0x89C6 }, { 0x5BB8, 0x9B82 }, { 0x5BB9, 0x9765 }, { 0x5BBF, 0x8F68 }, { 0x5BC2, 0x8EE2 }, { 0x5BC3, 0x9B83 }, { 0x5BC4, 0x8AF1 }, 
-	{ 0x5BC5, 0x93D0 }, { 0x5BC6, 0x96A7 }, { 0x5BC7, 0x9B84 }, { 0x5BC9, 0x9B85 }, { 0x5BCC, 0x9578 }, { 0x5BD0, 0x9B87 }, { 0x5BD2, 0x8AA6 }, { 0x5BD3, 0x8BF5 }, 
-	{ 0x5BD4, 0x9B86 }, { 0x5BDB, 0x8AB0 }, { 0x5BDD, 0x9051 }, { 0x5BDE, 0x9B8B }, { 0x5BDF, 0x8E40 }, { 0x5BE1, 0x89C7 }, { 0x5BE2, 0x9B8A }, { 0x5BE4, 0x9B88 }, 
-	{ 0x5BE5, 0x9B8C }, { 0x5BE6, 0x9B89 }, { 0x5BE7, 0x944A }, { 0x5BE8, 0x9ECB }, { 0x5BE9, 0x9052 }, { 0x5BEB, 0x9B8D }, { 0x5BEE, 0x97BE }, { 0x5BF0, 0x9B8E }, 
-	{ 0x5BF3, 0x9B90 }, { 0x5BF5, 0x929E }, { 0x5BF6, 0x9B8F }, { 0x5BF8, 0x90A1 }, { 0x5BFA, 0x8E9B }, { 0x5BFE, 0x91CE }, { 0x5BFF, 0x8EF5 }, { 0x5C01, 0x9595 }, 
-	{ 0x5C02, 0x90EA }, { 0x5C04, 0x8ECB }, { 0x5C05, 0x9B91 }, { 0x5C06, 0x8FAB }, { 0x5C07, 0x9B92 }, { 0x5C08, 0x9B93 }, { 0x5C09, 0x88D1 }, { 0x5C0A, 0x91B8 }, 
-	{ 0x5C0B, 0x9071 }, { 0x5C0D, 0x9B94 }, { 0x5C0E, 0x93B1 }, { 0x5C0F, 0x8FAC }, { 0x5C11, 0x8FAD }, { 0x5C13, 0x9B95 }, { 0x5C16, 0x90EB }, { 0x5C1A, 0x8FAE }, 
-	{ 0x5C20, 0x9B96 }, { 0x5C22, 0x9B97 }, { 0x5C24, 0x96DE }, { 0x5C28, 0x9B98 }, { 0x5C2D, 0x8BC4 }, { 0x5C31, 0x8F41 }, { 0x5C38, 0x9B99 }, { 0x5C39, 0x9B9A }, 
-	{ 0x5C3A, 0x8EDA }, { 0x5C3B, 0x904B }, { 0x5C3C, 0x93F2 }, { 0x5C3D, 0x9073 }, { 0x5C3E, 0x94F6 }, { 0x5C3F, 0x9441 }, { 0x5C40, 0x8BC7 }, { 0x5C41, 0x9B9B }, 
-	{ 0x5C45, 0x8B8F }, { 0x5C46, 0x9B9C }, { 0x5C48, 0x8BFC }, { 0x5C4A, 0x93CD }, { 0x5C4B, 0x89AE }, { 0x5C4D, 0x8E72 }, { 0x5C4E, 0x9B9D }, { 0x5C4F, 0x9BA0 }, 
-	{ 0x5C50, 0x9B9F }, { 0x5C51, 0x8BFB }, { 0x5C53, 0x9B9E }, { 0x5C55, 0x9357 }, { 0x5C5E, 0x91AE }, { 0x5C60, 0x936A }, { 0x5C61, 0x8EC6 }, { 0x5C64, 0x9177 }, 
-	{ 0x5C65, 0x979A }, { 0x5C6C, 0x9BA2 }, { 0x5C6E, 0x9BA3 }, { 0x5C6F, 0x93D4 }, { 0x5C71, 0x8E52 }, { 0x5C76, 0x9BA5 }, { 0x5C79, 0x9BA6 }, { 0x5C8C, 0x9BA7 }, 
-	{ 0x5C90, 0x8AF2 }, { 0x5C91, 0x9BA8 }, { 0x5C94, 0x9BA9 }, { 0x5CA1, 0x89AA }, { 0x5CA8, 0x915A }, { 0x5CA9, 0x8AE2 }, { 0x5CAB, 0x9BAB }, { 0x5CAC, 0x96A6 }, 
-	{ 0x5CB1, 0x91D0 }, { 0x5CB3, 0x8A78 }, { 0x5CB6, 0x9BAD }, { 0x5CB7, 0x9BAF }, { 0x5CB8, 0x8ADD }, { 0x5CBB, 0x9BAC }, { 0x5CBC, 0x9BAE }, { 0x5CBE, 0x9BB1 }, 
-	{ 0x5CC5, 0x9BB0 }, { 0x5CC7, 0x9BB2 }, { 0x5CD9, 0x9BB3 }, { 0x5CE0, 0x93BB }, { 0x5CE1, 0x8BAC }, { 0x5CE8, 0x89E3 }, { 0x5CE9, 0x9BB4 }, { 0x5CEA, 0x9BB9 }, 
-	{ 0x5CED, 0x9BB7 }, { 0x5CEF, 0x95F5 }, { 0x5CF0, 0x95F4 }, { 0x5CF6, 0x9387 }, { 0x5CFA, 0x9BB6 }, { 0x5CFB, 0x8F73 }, { 0x5CFD, 0x9BB5 }, { 0x5D07, 0x9092 }, 
-	{ 0x5D0B, 0x9BBA }, { 0x5D0E, 0x8DE8 }, { 0x5D11, 0x9BC0 }, { 0x5D14, 0x9BC1 }, { 0x5D15, 0x9BBB }, { 0x5D16, 0x8A52 }, { 0x5D17, 0x9BBC }, { 0x5D18, 0x9BC5 }, 
-	{ 0x5D19, 0x9BC4 }, { 0x5D1A, 0x9BC3 }, { 0x5D1B, 0x9BBF }, { 0x5D1F, 0x9BBE }, { 0x5D22, 0x9BC2 }, { 0x5D29, 0x95F6 }, { 0x5D4B, 0x9BC9 }, { 0x5D4C, 0x9BC6 }, 
-	{ 0x5D4E, 0x9BC8 }, { 0x5D50, 0x9792 }, { 0x5D52, 0x9BC7 }, { 0x5D5C, 0x9BBD }, { 0x5D69, 0x9093 }, { 0x5D6C, 0x9BCA }, { 0x5D6F, 0x8DB5 }, { 0x5D73, 0x9BCB }, 
-	{ 0x5D76, 0x9BCC }, { 0x5D82, 0x9BCF }, { 0x5D84, 0x9BCE }, { 0x5D87, 0x9BCD }, { 0x5D8B, 0x9388 }, { 0x5D8C, 0x9BB8 }, { 0x5D90, 0x9BD5 }, { 0x5D9D, 0x9BD1 }, 
-	{ 0x5DA2, 0x9BD0 }, { 0x5DAC, 0x9BD2 }, { 0x5DAE, 0x9BD3 }, { 0x5DB7, 0x9BD6 }, { 0x5DBA, 0x97E4 }, { 0x5DBC, 0x9BD7 }, { 0x5DBD, 0x9BD4 }, { 0x5DC9, 0x9BD8 }, 
-	{ 0x5DCC, 0x8ADE }, { 0x5DCD, 0x9BD9 }, { 0x5DD2, 0x9BDB }, { 0x5DD3, 0x9BDA }, { 0x5DD6, 0x9BDC }, { 0x5DDB, 0x9BDD }, { 0x5DDD, 0x90EC }, { 0x5DDE, 0x8F42 }, 
-	{ 0x5DE1, 0x8F84 }, { 0x5DE3, 0x9183 }, { 0x5DE5, 0x8D48 }, { 0x5DE6, 0x8DB6 }, { 0x5DE7, 0x8D49 }, { 0x5DE8, 0x8B90 }, { 0x5DEB, 0x9BDE }, { 0x5DEE, 0x8DB7 }, 
-	{ 0x5DF1, 0x8CC8 }, { 0x5DF2, 0x9BDF }, { 0x5DF3, 0x96A4 }, { 0x5DF4, 0x9462 }, { 0x5DF5, 0x9BE0 }, { 0x5DF7, 0x8D4A }, { 0x5DFB, 0x8AAA }, { 0x5DFD, 0x9246 }, 
-	{ 0x5DFE, 0x8BD0 }, { 0x5E02, 0x8E73 }, { 0x5E03, 0x957A }, { 0x5E06, 0x94BF }, { 0x5E0B, 0x9BE1 }, { 0x5E0C, 0x8AF3 }, { 0x5E11, 0x9BE4 }, { 0x5E16, 0x929F }, 
-	{ 0x5E19, 0x9BE3 }, { 0x5E1A, 0x9BE2 }, { 0x5E1B, 0x9BE5 }, { 0x5E1D, 0x92E9 }, { 0x5E25, 0x9083 }, { 0x5E2B, 0x8E74 }, { 0x5E2D, 0x90C8 }, { 0x5E2F, 0x91D1 }, 
-	{ 0x5E30, 0x8B41 }, { 0x5E33, 0x92A0 }, { 0x5E36, 0x9BE6 }, { 0x5E37, 0x9BE7 }, { 0x5E38, 0x8FED }, { 0x5E3D, 0x9658 }, { 0x5E40, 0x9BEA }, { 0x5E43, 0x9BE9 }, 
-	{ 0x5E44, 0x9BE8 }, { 0x5E45, 0x959D }, { 0x5E47, 0x9BF1 }, { 0x5E4C, 0x9679 }, { 0x5E4E, 0x9BEB }, { 0x5E54, 0x9BED }, { 0x5E55, 0x968B }, { 0x5E57, 0x9BEC }, 
-	{ 0x5E5F, 0x9BEE }, { 0x5E61, 0x94A6 }, { 0x5E62, 0x9BEF }, { 0x5E63, 0x95BC }, { 0x5E64, 0x9BF0 }, { 0x5E72, 0x8AB1 }, { 0x5E73, 0x95BD }, { 0x5E74, 0x944E }, 
-	{ 0x5E75, 0x9BF2 }, { 0x5E76, 0x9BF3 }, { 0x5E78, 0x8D4B }, { 0x5E79, 0x8AB2 }, { 0x5E7A, 0x9BF4 }, { 0x5E7B, 0x8CB6 }, { 0x5E7C, 0x9763 }, { 0x5E7D, 0x9748 }, 
-	{ 0x5E7E, 0x8AF4 }, { 0x5E7F, 0x9BF6 }, { 0x5E81, 0x92A1 }, { 0x5E83, 0x8D4C }, { 0x5E84, 0x8FAF }, { 0x5E87, 0x94DD }, { 0x5E8A, 0x8FB0 }, { 0x5E8F, 0x8F98 }, 
-	{ 0x5E95, 0x92EA }, { 0x5E96, 0x95F7 }, { 0x5E97, 0x9358 }, { 0x5E9A, 0x8D4D }, { 0x5E9C, 0x957B }, { 0x5EA0, 0x9BF7 }, { 0x5EA6, 0x9378 }, { 0x5EA7, 0x8DC0 }, 
-	{ 0x5EAB, 0x8CC9 }, { 0x5EAD, 0x92EB }, { 0x5EB5, 0x88C1 }, { 0x5EB6, 0x8F8E }, { 0x5EB7, 0x8D4E }, { 0x5EB8, 0x9766 }, { 0x5EC1, 0x9BF8 }, { 0x5EC2, 0x9BF9 }, 
-	{ 0x5EC3, 0x9470 }, { 0x5EC8, 0x9BFA }, { 0x5EC9, 0x97F5 }, { 0x5ECA, 0x984C }, { 0x5ECF, 0x9BFC }, { 0x5ED0, 0x9BFB }, { 0x5ED3, 0x8A66 }, { 0x5ED6, 0x9C40 }, 
-	{ 0x5EDA, 0x9C43 }, { 0x5EDB, 0x9C44 }, { 0x5EDD, 0x9C42 }, { 0x5EDF, 0x955F }, { 0x5EE0, 0x8FB1 }, { 0x5EE1, 0x9C46 }, { 0x5EE2, 0x9C45 }, { 0x5EE3, 0x9C41 }, 
-	{ 0x5EE8, 0x9C47 }, { 0x5EE9, 0x9C48 }, { 0x5EEC, 0x9C49 }, { 0x5EF0, 0x9C4C }, { 0x5EF1, 0x9C4A }, { 0x5EF3, 0x9C4B }, { 0x5EF4, 0x9C4D }, { 0x5EF6, 0x8984 }, 
-	{ 0x5EF7, 0x92EC }, { 0x5EF8, 0x9C4E }, { 0x5EFA, 0x8C9A }, { 0x5EFB, 0x89F4 }, { 0x5EFC, 0x9455 }, { 0x5EFE, 0x9C4F }, { 0x5EFF, 0x93F9 }, { 0x5F01, 0x95D9 }, 
-	{ 0x5F03, 0x9C50 }, { 0x5F04, 0x984D }, { 0x5F09, 0x9C51 }, { 0x5F0A, 0x95BE }, { 0x5F0B, 0x9C54 }, { 0x5F0C, 0x989F }, { 0x5F0D, 0x98AF }, { 0x5F0F, 0x8EAE }, 
-	{ 0x5F10, 0x93F3 }, { 0x5F11, 0x9C55 }, { 0x5F13, 0x8B7C }, { 0x5F14, 0x92A2 }, { 0x5F15, 0x88F8 }, { 0x5F16, 0x9C56 }, { 0x5F17, 0x95A4 }, { 0x5F18, 0x8D4F }, 
-	{ 0x5F1B, 0x926F }, { 0x5F1F, 0x92ED }, { 0x5F25, 0x96ED }, { 0x5F26, 0x8CB7 }, { 0x5F27, 0x8CCA }, { 0x5F29, 0x9C57 }, { 0x5F2D, 0x9C58 }, { 0x5F2F, 0x9C5E }, 
-	{ 0x5F31, 0x8EE3 }, { 0x5F35, 0x92A3 }, { 0x5F37, 0x8BAD }, { 0x5F38, 0x9C59 }, { 0x5F3C, 0x954A }, { 0x5F3E, 0x9265 }, { 0x5F41, 0x9C5A }, { 0x5F48, 0x9C5B }, 
-	{ 0x5F4A, 0x8BAE }, { 0x5F4C, 0x9C5C }, { 0x5F4E, 0x9C5D }, { 0x5F51, 0x9C5F }, { 0x5F53, 0x9396 }, { 0x5F56, 0x9C60 }, { 0x5F57, 0x9C61 }, { 0x5F59, 0x9C62 }, 
-	{ 0x5F5C, 0x9C53 }, { 0x5F5D, 0x9C52 }, { 0x5F61, 0x9C63 }, { 0x5F62, 0x8C60 }, { 0x5F66, 0x9546 }, { 0x5F69, 0x8DCA }, { 0x5F6A, 0x9556 }, { 0x5F6B, 0x92A4 }, 
-	{ 0x5F6C, 0x956A }, { 0x5F6D, 0x9C64 }, { 0x5F70, 0x8FB2 }, { 0x5F71, 0x8965 }, { 0x5F73, 0x9C65 }, { 0x5F77, 0x9C66 }, { 0x5F79, 0x96F0 }, { 0x5F7C, 0x94DE }, 
-	{ 0x5F7F, 0x9C69 }, { 0x5F80, 0x899D }, { 0x5F81, 0x90AA }, { 0x5F82, 0x9C68 }, { 0x5F83, 0x9C67 }, { 0x5F84, 0x8C61 }, { 0x5F85, 0x91D2 }, { 0x5F87, 0x9C6D }, 
-	{ 0x5F88, 0x9C6B }, { 0x5F8A, 0x9C6A }, { 0x5F8B, 0x97A5 }, { 0x5F8C, 0x8CE3 }, { 0x5F90, 0x8F99 }, { 0x5F91, 0x9C6C }, { 0x5F92, 0x936B }, { 0x5F93, 0x8F5D }, 
-	{ 0x5F97, 0x93BE }, { 0x5F98, 0x9C70 }, { 0x5F99, 0x9C6F }, { 0x5F9E, 0x9C6E }, { 0x5FA0, 0x9C71 }, { 0x5FA1, 0x8CE4 }, { 0x5FA8, 0x9C72 }, { 0x5FA9, 0x959C }, 
-	{ 0x5FAA, 0x8F7A }, { 0x5FAD, 0x9C73 }, { 0x5FAE, 0x94F7 }, { 0x5FB3, 0x93BF }, { 0x5FB4, 0x92A5 }, { 0x5FB9, 0x934F }, { 0x5FBC, 0x9C74 }, { 0x5FBD, 0x8B4A }, 
-	{ 0x5FC3, 0x9053 }, { 0x5FC5, 0x954B }, { 0x5FCC, 0x8AF5 }, { 0x5FCD, 0x9445 }, { 0x5FD6, 0x9C75 }, { 0x5FD7, 0x8E75 }, { 0x5FD8, 0x9659 }, { 0x5FD9, 0x965A }, 
-	{ 0x5FDC, 0x899E }, { 0x5FDD, 0x9C7A }, { 0x5FE0, 0x9289 }, { 0x5FE4, 0x9C77 }, { 0x5FEB, 0x89F5 }, { 0x5FF0, 0x9CAB }, { 0x5FF1, 0x9C79 }, { 0x5FF5, 0x944F }, 
-	{ 0x5FF8, 0x9C78 }, { 0x5FFB, 0x9C76 }, { 0x5FFD, 0x8D9A }, { 0x5FFF, 0x9C7C }, { 0x600E, 0x9C83 }, { 0x600F, 0x9C89 }, { 0x6010, 0x9C81 }, { 0x6012, 0x937B }, 
-	{ 0x6015, 0x9C86 }, { 0x6016, 0x957C }, { 0x6019, 0x9C80 }, { 0x601B, 0x9C85 }, { 0x601C, 0x97E5 }, { 0x601D, 0x8E76 }, { 0x6020, 0x91D3 }, { 0x6021, 0x9C7D }, 
-	{ 0x6025, 0x8B7D }, { 0x6026, 0x9C88 }, { 0x6027, 0x90AB }, { 0x6028, 0x8985 }, { 0x6029, 0x9C82 }, { 0x602A, 0x89F6 }, { 0x602B, 0x9C87 }, { 0x602F, 0x8BAF }, 
-	{ 0x6031, 0x9C84 }, { 0x603A, 0x9C8A }, { 0x6041, 0x9C8C }, { 0x6042, 0x9C96 }, { 0x6043, 0x9C94 }, { 0x6046, 0x9C91 }, { 0x604A, 0x9C90 }, { 0x604B, 0x97F6 }, 
-	{ 0x604D, 0x9C92 }, { 0x6050, 0x8BB0 }, { 0x6052, 0x8D50 }, { 0x6055, 0x8F9A }, { 0x6059, 0x9C99 }, { 0x605A, 0x9C8B }, { 0x605F, 0x9C8F }, { 0x6060, 0x9C7E }, 
-	{ 0x6062, 0x89F8 }, { 0x6063, 0x9C93 }, { 0x6064, 0x9C95 }, { 0x6065, 0x9270 }, { 0x6068, 0x8DA6 }, { 0x6069, 0x89B6 }, { 0x606A, 0x9C8D }, { 0x606B, 0x9C98 }, 
-	{ 0x606C, 0x9C97 }, { 0x606D, 0x8BB1 }, { 0x606F, 0x91A7 }, { 0x6070, 0x8A86 }, { 0x6075, 0x8C62 }, { 0x6077, 0x9C8E }, { 0x6081, 0x9C9A }, { 0x6083, 0x9C9D }, 
-	{ 0x6084, 0x9C9F }, { 0x6089, 0x8EBB }, { 0x608B, 0x9CA5 }, { 0x608C, 0x92EE }, { 0x608D, 0x9C9B }, { 0x6092, 0x9CA3 }, { 0x6094, 0x89F7 }, { 0x6096, 0x9CA1 }, 
-	{ 0x6097, 0x9CA2 }, { 0x609A, 0x9C9E }, { 0x609B, 0x9CA0 }, { 0x609F, 0x8CE5 }, { 0x60A0, 0x9749 }, { 0x60A3, 0x8AB3 }, { 0x60A6, 0x8978 }, { 0x60A7, 0x9CA4 }, 
-	{ 0x60A9, 0x9459 }, { 0x60AA, 0x88AB }, { 0x60B2, 0x94DF }, { 0x60B3, 0x9C7B }, { 0x60B4, 0x9CAA }, { 0x60B5, 0x9CAE }, { 0x60B6, 0x96E3 }, { 0x60B8, 0x9CA7 }, 
-	{ 0x60BC, 0x9389 }, { 0x60BD, 0x9CAC }, { 0x60C5, 0x8FEE }, { 0x60C6, 0x9CAD }, { 0x60C7, 0x93D5 }, { 0x60D1, 0x9866 }, { 0x60D3, 0x9CA9 }, { 0x60D8, 0x9CAF }, 
-	{ 0x60DA, 0x8D9B }, { 0x60DC, 0x90C9 }, { 0x60DF, 0x88D2 }, { 0x60E0, 0x9CA8 }, { 0x60E1, 0x9CA6 }, { 0x60E3, 0x9179 }, { 0x60E7, 0x9C9C }, { 0x60E8, 0x8E53 }, 
-	{ 0x60F0, 0x91C4 }, { 0x60F1, 0x9CBB }, { 0x60F3, 0x917A }, { 0x60F4, 0x9CB6 }, { 0x60F6, 0x9CB3 }, { 0x60F7, 0x9CB4 }, { 0x60F9, 0x8EE4 }, { 0x60FA, 0x9CB7 }, 
-	{ 0x60FB, 0x9CBA }, { 0x6100, 0x9CB5 }, { 0x6101, 0x8F44 }, { 0x6103, 0x9CB8 }, { 0x6106, 0x9CB2 }, { 0x6108, 0x96FA }, { 0x6109, 0x96F9 }, { 0x610D, 0x9CBC }, 
-	{ 0x610E, 0x9CBD }, { 0x610F, 0x88D3 }, { 0x6115, 0x9CB1 }, { 0x611A, 0x8BF0 }, { 0x611B, 0x88A4 }, { 0x611F, 0x8AB4 }, { 0x6121, 0x9CB9 }, { 0x6127, 0x9CC1 }, 
-	{ 0x6128, 0x9CC0 }, { 0x612C, 0x9CC5 }, { 0x6134, 0x9CC6 }, { 0x613C, 0x9CC4 }, { 0x613D, 0x9CC7 }, { 0x613E, 0x9CBF }, { 0x613F, 0x9CC3 }, { 0x6142, 0x9CC8 }, 
-	{ 0x6144, 0x9CC9 }, { 0x6147, 0x9CBE }, { 0x6148, 0x8E9C }, { 0x614A, 0x9CC2 }, { 0x614B, 0x91D4 }, { 0x614C, 0x8D51 }, { 0x614D, 0x9CB0 }, { 0x614E, 0x9054 }, 
-	{ 0x6153, 0x9CD6 }, { 0x6155, 0x95E7 }, { 0x6158, 0x9CCC }, { 0x6159, 0x9CCD }, { 0x615A, 0x9CCE }, { 0x615D, 0x9CD5 }, { 0x615F, 0x9CD4 }, { 0x6162, 0x969D }, 
-	{ 0x6163, 0x8AB5 }, { 0x6165, 0x9CD2 }, { 0x6167, 0x8C64 }, { 0x6168, 0x8A53 }, { 0x616B, 0x9CCF }, { 0x616E, 0x97B6 }, { 0x616F, 0x9CD1 }, { 0x6170, 0x88D4 }, 
-	{ 0x6171, 0x9CD3 }, { 0x6173, 0x9CCA }, { 0x6174, 0x9CD0 }, { 0x6175, 0x9CD7 }, { 0x6176, 0x8C63 }, { 0x6177, 0x9CCB }, { 0x617E, 0x977C }, { 0x6182, 0x974A }, 
-	{ 0x6187, 0x9CDA }, { 0x618A, 0x9CDE }, { 0x618E, 0x919E }, { 0x6190, 0x97F7 }, { 0x6191, 0x9CDF }, { 0x6194, 0x9CDC }, { 0x6196, 0x9CD9 }, { 0x6199, 0x9CD8 }, 
-	{ 0x619A, 0x9CDD }, { 0x61A4, 0x95AE }, { 0x61A7, 0x93B2 }, { 0x61A9, 0x8C65 }, { 0x61AB, 0x9CE0 }, { 0x61AC, 0x9CDB }, { 0x61AE, 0x9CE1 }, { 0x61B2, 0x8C9B }, 
-	{ 0x61B6, 0x89AF }, { 0x61BA, 0x9CE9 }, { 0x61BE, 0x8AB6 }, { 0x61C3, 0x9CE7 }, { 0x61C6, 0x9CE8 }, { 0x61C7, 0x8DA7 }, { 0x61C8, 0x9CE6 }, { 0x61C9, 0x9CE4 }, 
-	{ 0x61CA, 0x9CE3 }, { 0x61CB, 0x9CEA }, { 0x61CC, 0x9CE2 }, { 0x61CD, 0x9CEC }, { 0x61D0, 0x89F9 }, { 0x61E3, 0x9CEE }, { 0x61E6, 0x9CED }, { 0x61F2, 0x92A6 }, 
-	{ 0x61F4, 0x9CF1 }, { 0x61F6, 0x9CEF }, { 0x61F7, 0x9CE5 }, { 0x61F8, 0x8C9C }, { 0x61FA, 0x9CF0 }, { 0x61FC, 0x9CF4 }, { 0x61FD, 0x9CF3 }, { 0x61FE, 0x9CF5 }, 
-	{ 0x61FF, 0x9CF2 }, { 0x6200, 0x9CF6 }, { 0x6208, 0x9CF7 }, { 0x6209, 0x9CF8 }, { 0x620A, 0x95E8 }, { 0x620C, 0x9CFA }, { 0x620D, 0x9CF9 }, { 0x620E, 0x8F5E }, 
-	{ 0x6210, 0x90AC }, { 0x6211, 0x89E4 }, { 0x6212, 0x89FA }, { 0x6214, 0x9CFB }, { 0x6216, 0x88BD }, { 0x621A, 0x90CA }, { 0x621B, 0x9CFC }, { 0x621D, 0xE6C1 }, 
-	{ 0x621E, 0x9D40 }, { 0x621F, 0x8C81 }, { 0x6221, 0x9D41 }, { 0x6226, 0x90ED }, { 0x622A, 0x9D42 }, { 0x622E, 0x9D43 }, { 0x622F, 0x8B59 }, { 0x6230, 0x9D44 }, 
-	{ 0x6232, 0x9D45 }, { 0x6233, 0x9D46 }, { 0x6234, 0x91D5 }, { 0x6238, 0x8CCB }, { 0x623B, 0x96DF }, { 0x623F, 0x965B }, { 0x6240, 0x8F8A }, { 0x6241, 0x9D47 }, 
-	{ 0x6247, 0x90EE }, { 0x6248, 0xE7BB }, { 0x6249, 0x94E0 }, { 0x624B, 0x8EE8 }, { 0x624D, 0x8DCB }, { 0x624E, 0x9D48 }, { 0x6253, 0x91C5 }, { 0x6255, 0x95A5 }, 
-	{ 0x6258, 0x91EF }, { 0x625B, 0x9D4B }, { 0x625E, 0x9D49 }, { 0x6260, 0x9D4C }, { 0x6263, 0x9D4A }, { 0x6268, 0x9D4D }, { 0x626E, 0x95AF }, { 0x6271, 0x88B5 }, 
-	{ 0x6276, 0x957D }, { 0x6279, 0x94E1 }, { 0x627C, 0x9D4E }, { 0x627E, 0x9D51 }, { 0x627F, 0x8FB3 }, { 0x6280, 0x8B5A }, { 0x6282, 0x9D4F }, { 0x6283, 0x9D56 }, 
-	{ 0x6284, 0x8FB4 }, { 0x6289, 0x9D50 }, { 0x628A, 0x9463 }, { 0x6291, 0x977D }, { 0x6292, 0x9D52 }, { 0x6293, 0x9D53 }, { 0x6294, 0x9D57 }, { 0x6295, 0x938A }, 
-	{ 0x6296, 0x9D54 }, { 0x6297, 0x8D52 }, { 0x6298, 0x90DC }, { 0x629B, 0x9D65 }, { 0x629C, 0x94B2 }, { 0x629E, 0x91F0 }, { 0x62AB, 0x94E2 }, { 0x62AC, 0x9DAB }, 
-	{ 0x62B1, 0x95F8 }, { 0x62B5, 0x92EF }, { 0x62B9, 0x9695 }, { 0x62BB, 0x9D5A }, { 0x62BC, 0x899F }, { 0x62BD, 0x928A }, { 0x62C2, 0x9D63 }, { 0x62C5, 0x9253 }, 
-	{ 0x62C6, 0x9D5D }, { 0x62C7, 0x9D64 }, { 0x62C8, 0x9D5F }, { 0x62C9, 0x9D66 }, { 0x62CA, 0x9D62 }, { 0x62CC, 0x9D61 }, { 0x62CD, 0x948F }, { 0x62CF, 0x9D5B }, 
-	{ 0x62D0, 0x89FB }, { 0x62D1, 0x9D59 }, { 0x62D2, 0x8B91 }, { 0x62D3, 0x91F1 }, { 0x62D4, 0x9D55 }, { 0x62D7, 0x9D58 }, { 0x62D8, 0x8D53 }, { 0x62D9, 0x90D9 }, 
-	{ 0x62DB, 0x8FB5 }, { 0x62DC, 0x9D60 }, { 0x62DD, 0x9471 }, { 0x62E0, 0x8B92 }, { 0x62E1, 0x8A67 }, { 0x62EC, 0x8A87 }, { 0x62ED, 0x9040 }, { 0x62EE, 0x9D68 }, 
-	{ 0x62EF, 0x9D6D }, { 0x62F1, 0x9D69 }, { 0x62F3, 0x8C9D }, { 0x62F5, 0x9D6E }, { 0x62F6, 0x8E41 }, { 0x62F7, 0x8D89 }, { 0x62FE, 0x8F45 }, { 0x62FF, 0x9D5C }, 
-	{ 0x6301, 0x8E9D }, { 0x6302, 0x9D6B }, { 0x6307, 0x8E77 }, { 0x6308, 0x9D6C }, { 0x6309, 0x88C2 }, { 0x630C, 0x9D67 }, { 0x6311, 0x92A7 }, { 0x6319, 0x8B93 }, 
-	{ 0x631F, 0x8BB2 }, { 0x6327, 0x9D6A }, { 0x6328, 0x88A5 }, { 0x632B, 0x8DC1 }, { 0x632F, 0x9055 }, { 0x633A, 0x92F0 }, { 0x633D, 0x94D2 }, { 0x633E, 0x9D70 }, 
-	{ 0x633F, 0x917D }, { 0x6349, 0x91A8 }, { 0x634C, 0x8E4A }, { 0x634D, 0x9D71 }, { 0x634F, 0x9D73 }, { 0x6350, 0x9D6F }, { 0x6355, 0x95DF }, { 0x6357, 0x92BB }, 
-	{ 0x635C, 0x917B }, { 0x6367, 0x95F9 }, { 0x6368, 0x8ECC }, { 0x6369, 0x9D80 }, { 0x636B, 0x9D7E }, { 0x636E, 0x9098 }, { 0x6372, 0x8C9E }, { 0x6376, 0x9D78 }, 
-	{ 0x6377, 0x8FB7 }, { 0x637A, 0x93E6 }, { 0x637B, 0x9450 }, { 0x6380, 0x9D76 }, { 0x6383, 0x917C }, { 0x6388, 0x8EF6 }, { 0x6389, 0x9D7B }, { 0x638C, 0x8FB6 }, 
-	{ 0x638E, 0x9D75 }, { 0x638F, 0x9D7A }, { 0x6392, 0x9472 }, { 0x6396, 0x9D74 }, { 0x6398, 0x8C40 }, { 0x639B, 0x8A7C }, { 0x639F, 0x9D7C }, { 0x63A0, 0x97A9 }, 
-	{ 0x63A1, 0x8DCC }, { 0x63A2, 0x9254 }, { 0x63A3, 0x9D79 }, { 0x63A5, 0x90DA }, { 0x63A7, 0x8D54 }, { 0x63A8, 0x9084 }, { 0x63A9, 0x8986 }, { 0x63AA, 0x915B }, 
-	{ 0x63AB, 0x9D77 }, { 0x63AC, 0x8B64 }, { 0x63B2, 0x8C66 }, { 0x63B4, 0x92CD }, { 0x63B5, 0x9D7D }, { 0x63BB, 0x917E }, { 0x63BE, 0x9D81 }, { 0x63C0, 0x9D83 }, 
-	{ 0x63C3, 0x91B5 }, { 0x63C4, 0x9D89 }, { 0x63C6, 0x9D84 }, { 0x63C9, 0x9D86 }, { 0x63CF, 0x9560 }, { 0x63D0, 0x92F1 }, { 0x63D2, 0x9D87 }, { 0x63D6, 0x974B }, 
-	{ 0x63DA, 0x9767 }, { 0x63DB, 0x8AB7 }, { 0x63E1, 0x88AC }, { 0x63E3, 0x9D85 }, { 0x63E9, 0x9D82 }, { 0x63EE, 0x8AF6 }, { 0x63F4, 0x8987 }, { 0x63F6, 0x9D88 }, 
-	{ 0x63FA, 0x9768 }, { 0x6406, 0x9D8C }, { 0x640D, 0x91B9 }, { 0x640F, 0x9D93 }, { 0x6413, 0x9D8D }, { 0x6416, 0x9D8A }, { 0x6417, 0x9D91 }, { 0x641C, 0x9D72 }, 
-	{ 0x6426, 0x9D8E }, { 0x6428, 0x9D92 }, { 0x642C, 0x94C0 }, { 0x642D, 0x938B }, { 0x6434, 0x9D8B }, { 0x6436, 0x9D8F }, { 0x643A, 0x8C67 }, { 0x643E, 0x8DEF }, 
-	{ 0x6442, 0x90DB }, { 0x644E, 0x9D97 }, { 0x6458, 0x9345 }, { 0x6467, 0x9D94 }, { 0x6469, 0x9680 }, { 0x646F, 0x9D95 }, { 0x6476, 0x9D96 }, { 0x6478, 0x96CC }, 
-	{ 0x647A, 0x90A0 }, { 0x6483, 0x8C82 }, { 0x6488, 0x9D9D }, { 0x6492, 0x8E54 }, { 0x6493, 0x9D9A }, { 0x6495, 0x9D99 }, { 0x649A, 0x9451 }, { 0x649E, 0x93B3 }, 
-	{ 0x64A4, 0x9350 }, { 0x64A5, 0x9D9B }, { 0x64A9, 0x9D9C }, { 0x64AB, 0x958F }, { 0x64AD, 0x9464 }, { 0x64AE, 0x8E42 }, { 0x64B0, 0x90EF }, { 0x64B2, 0x966F }, 
-	{ 0x64B9, 0x8A68 }, { 0x64BB, 0x9DA3 }, { 0x64BC, 0x9D9E }, { 0x64C1, 0x9769 }, { 0x64C2, 0x9DA5 }, { 0x64C5, 0x9DA1 }, { 0x64C7, 0x9DA2 }, { 0x64CD, 0x9180 }, 
-	{ 0x64D2, 0x9DA0 }, { 0x64D4, 0x9D5E }, { 0x64D8, 0x9DA4 }, { 0x64DA, 0x9D9F }, { 0x64E0, 0x9DA9 }, { 0x64E1, 0x9DAA }, { 0x64E2, 0x9346 }, { 0x64E3, 0x9DAC }, 
-	{ 0x64E6, 0x8E43 }, { 0x64E7, 0x9DA7 }, { 0x64EC, 0x8B5B }, { 0x64EF, 0x9DAD }, { 0x64F1, 0x9DA6 }, { 0x64F2, 0x9DB1 }, { 0x64F4, 0x9DB0 }, { 0x64F6, 0x9DAF }, 
-	{ 0x64FA, 0x9DB2 }, { 0x64FD, 0x9DB4 }, { 0x64FE, 0x8FEF }, { 0x6500, 0x9DB3 }, { 0x6505, 0x9DB7 }, { 0x6518, 0x9DB5 }, { 0x651C, 0x9DB6 }, { 0x651D, 0x9D90 }, 
-	{ 0x6523, 0x9DB9 }, { 0x6524, 0x9DB8 }, { 0x652A, 0x9D98 }, { 0x652B, 0x9DBA }, { 0x652C, 0x9DAE }, { 0x652F, 0x8E78 }, { 0x6534, 0x9DBB }, { 0x6535, 0x9DBC }, 
-	{ 0x6536, 0x9DBE }, { 0x6537, 0x9DBD }, { 0x6538, 0x9DBF }, { 0x6539, 0x89FC }, { 0x653B, 0x8D55 }, { 0x653E, 0x95FA }, { 0x653F, 0x90AD }, { 0x6545, 0x8CCC }, 
-	{ 0x6548, 0x9DC1 }, { 0x654D, 0x9DC4 }, { 0x654F, 0x9571 }, { 0x6551, 0x8B7E }, { 0x6555, 0x9DC3 }, { 0x6556, 0x9DC2 }, { 0x6557, 0x9473 }, { 0x6558, 0x9DC5 }, 
-	{ 0x6559, 0x8BB3 }, { 0x655D, 0x9DC7 }, { 0x655E, 0x9DC6 }, { 0x6562, 0x8AB8 }, { 0x6563, 0x8E55 }, { 0x6566, 0x93D6 }, { 0x656C, 0x8C68 }, { 0x6570, 0x9094 }, 
-	{ 0x6572, 0x9DC8 }, { 0x6574, 0x90AE }, { 0x6575, 0x9347 }, { 0x6577, 0x957E }, { 0x6578, 0x9DC9 }, { 0x6582, 0x9DCA }, { 0x6583, 0x9DCB }, { 0x6587, 0x95B6 }, 
-	{ 0x6588, 0x9B7C }, { 0x6589, 0x90C4 }, { 0x658C, 0x956B }, { 0x658E, 0x8DD6 }, { 0x6590, 0x94E3 }, { 0x6591, 0x94C1 }, { 0x6597, 0x936C }, { 0x6599, 0x97BF }, 
-	{ 0x659B, 0x9DCD }, { 0x659C, 0x8ECE }, { 0x659F, 0x9DCE }, { 0x65A1, 0x88B4 }, { 0x65A4, 0x8BD2 }, { 0x65A5, 0x90CB }, { 0x65A7, 0x9580 }, { 0x65AB, 0x9DCF }, 
-	{ 0x65AC, 0x8E61 }, { 0x65AD, 0x9266 }, { 0x65AF, 0x8E7A }, { 0x65B0, 0x9056 }, { 0x65B7, 0x9DD0 }, { 0x65B9, 0x95FB }, { 0x65BC, 0x8997 }, { 0x65BD, 0x8E7B }, 
-	{ 0x65C1, 0x9DD3 }, { 0x65C3, 0x9DD1 }, { 0x65C4, 0x9DD4 }, { 0x65C5, 0x97B7 }, { 0x65C6, 0x9DD2 }, { 0x65CB, 0x90F9 }, { 0x65CC, 0x9DD5 }, { 0x65CF, 0x91B0 }, 
-	{ 0x65D2, 0x9DD6 }, { 0x65D7, 0x8AF8 }, { 0x65D9, 0x9DD8 }, { 0x65DB, 0x9DD7 }, { 0x65E0, 0x9DD9 }, { 0x65E1, 0x9DDA }, { 0x65E2, 0x8AF9 }, { 0x65E5, 0x93FA }, 
-	{ 0x65E6, 0x9255 }, { 0x65E7, 0x8B8C }, { 0x65E8, 0x8E7C }, { 0x65E9, 0x9181 }, { 0x65EC, 0x8F7B }, { 0x65ED, 0x88AE }, { 0x65F1, 0x9DDB }, { 0x65FA, 0x89A0 }, 
-	{ 0x65FB, 0x9DDF }, { 0x6602, 0x8D56 }, { 0x6603, 0x9DDE }, { 0x6606, 0x8DA9 }, { 0x6607, 0x8FB8 }, { 0x660A, 0x9DDD }, { 0x660C, 0x8FB9 }, { 0x660E, 0x96BE }, 
-	{ 0x660F, 0x8DA8 }, { 0x6613, 0x88D5 }, { 0x6614, 0x90CC }, { 0x661C, 0x9DE4 }, { 0x661F, 0x90AF }, { 0x6620, 0x8966 }, { 0x6625, 0x8F74 }, { 0x6627, 0x9686 }, 
-	{ 0x6628, 0x8DF0 }, { 0x662D, 0x8FBA }, { 0x662F, 0x90A5 }, { 0x6634, 0x9DE3 }, { 0x6635, 0x9DE1 }, { 0x6636, 0x9DE2 }, { 0x663C, 0x928B }, { 0x663F, 0x9E45 }, 
-	{ 0x6641, 0x9DE8 }, { 0x6642, 0x8E9E }, { 0x6643, 0x8D57 }, { 0x6644, 0x9DE6 }, { 0x6649, 0x9DE7 }, { 0x664B, 0x9057 }, { 0x664F, 0x9DE5 }, { 0x6652, 0x8E4E }, 
-	{ 0x665D, 0x9DEA }, { 0x665E, 0x9DE9 }, { 0x665F, 0x9DEE }, { 0x6662, 0x9DEF }, { 0x6664, 0x9DEB }, { 0x6666, 0x8A41 }, { 0x6667, 0x9DEC }, { 0x6668, 0x9DED }, 
-	{ 0x6669, 0x94D3 }, { 0x666E, 0x9581 }, { 0x666F, 0x8C69 }, { 0x6670, 0x9DF0 }, { 0x6674, 0x90B0 }, { 0x6676, 0x8FBB }, { 0x667A, 0x9271 }, { 0x6681, 0x8BC5 }, 
-	{ 0x6683, 0x9DF1 }, { 0x6684, 0x9DF5 }, { 0x6687, 0x89C9 }, { 0x6688, 0x9DF2 }, { 0x6689, 0x9DF4 }, { 0x668E, 0x9DF3 }, { 0x6691, 0x8F8B }, { 0x6696, 0x9267 }, 
-	{ 0x6697, 0x88C3 }, { 0x6698, 0x9DF6 }, { 0x669D, 0x9DF7 }, { 0x66A2, 0x92A8 }, { 0x66A6, 0x97EF }, { 0x66AB, 0x8E62 }, { 0x66AE, 0x95E9 }, { 0x66B4, 0x965C }, 
-	{ 0x66B8, 0x9E41 }, { 0x66B9, 0x9DF9 }, { 0x66BC, 0x9DFC }, { 0x66BE, 0x9DFB }, { 0x66C1, 0x9DF8 }, { 0x66C4, 0x9E40 }, { 0x66C7, 0x93DC }, { 0x66C9, 0x9DFA }, 
-	{ 0x66D6, 0x9E42 }, { 0x66D9, 0x8F8C }, { 0x66DA, 0x9E43 }, { 0x66DC, 0x976A }, { 0x66DD, 0x9498 }, { 0x66E0, 0x9E44 }, { 0x66E6, 0x9E46 }, { 0x66E9, 0x9E47 }, 
-	{ 0x66F0, 0x9E48 }, { 0x66F2, 0x8BC8 }, { 0x66F3, 0x8967 }, { 0x66F4, 0x8D58 }, { 0x66F5, 0x9E49 }, { 0x66F7, 0x9E4A }, { 0x66F8, 0x8F91 }, { 0x66F9, 0x9182 }, 
-	{ 0x66FC, 0x99D6 }, { 0x66FD, 0x915D }, { 0x66FE, 0x915C }, { 0x66FF, 0x91D6 }, { 0x6700, 0x8DC5 }, { 0x6703, 0x98F0 }, { 0x6708, 0x8C8E }, { 0x6709, 0x974C }, 
-	{ 0x670B, 0x95FC }, { 0x670D, 0x959E }, { 0x670F, 0x9E4B }, { 0x6714, 0x8DF1 }, { 0x6715, 0x92BD }, { 0x6716, 0x9E4C }, { 0x6717, 0x984E }, { 0x671B, 0x965D }, 
-	{ 0x671D, 0x92A9 }, { 0x671E, 0x9E4D }, { 0x671F, 0x8AFA }, { 0x6726, 0x9E4E }, { 0x6727, 0x9E4F }, { 0x6728, 0x96D8 }, { 0x672A, 0x96A2 }, { 0x672B, 0x9696 }, 
-	{ 0x672C, 0x967B }, { 0x672D, 0x8E44 }, { 0x672E, 0x9E51 }, { 0x6731, 0x8EE9 }, { 0x6734, 0x9670 }, { 0x6736, 0x9E53 }, { 0x6737, 0x9E56 }, { 0x6738, 0x9E55 }, 
-	{ 0x673A, 0x8AF7 }, { 0x673D, 0x8B80 }, { 0x673F, 0x9E52 }, { 0x6741, 0x9E54 }, { 0x6746, 0x9E57 }, { 0x6749, 0x9099 }, { 0x674E, 0x979B }, { 0x674F, 0x88C7 }, 
-	{ 0x6750, 0x8DDE }, { 0x6751, 0x91BA }, { 0x6753, 0x8EDB }, { 0x6756, 0x8FF1 }, { 0x6759, 0x9E5A }, { 0x675C, 0x936D }, { 0x675E, 0x9E58 }, { 0x675F, 0x91A9 }, 
-	{ 0x6760, 0x9E59 }, { 0x6761, 0x8FF0 }, { 0x6762, 0x96DB }, { 0x6763, 0x9E5B }, { 0x6764, 0x9E5C }, { 0x6765, 0x9788 }, { 0x676A, 0x9E61 }, { 0x676D, 0x8D59 }, 
-	{ 0x676F, 0x9474 }, { 0x6770, 0x9E5E }, { 0x6771, 0x938C }, { 0x6772, 0x9DDC }, { 0x6773, 0x9DE0 }, { 0x6775, 0x8B6E }, { 0x6777, 0x9466 }, { 0x677C, 0x9E60 }, 
-	{ 0x677E, 0x8FBC }, { 0x677F, 0x94C2 }, { 0x6785, 0x9E66 }, { 0x6787, 0x94F8 }, { 0x6789, 0x9E5D }, { 0x678B, 0x9E63 }, { 0x678C, 0x9E62 }, { 0x6790, 0x90CD }, 
-	{ 0x6795, 0x968D }, { 0x6797, 0x97D1 }, { 0x679A, 0x9687 }, { 0x679C, 0x89CA }, { 0x679D, 0x8E7D }, { 0x67A0, 0x9867 }, { 0x67A1, 0x9E65 }, { 0x67A2, 0x9095 }, 
-	{ 0x67A6, 0x9E64 }, { 0x67A9, 0x9E5F }, { 0x67AF, 0x8CCD }, { 0x67B3, 0x9E6B }, { 0x67B4, 0x9E69 }, { 0x67B6, 0x89CB }, { 0x67B7, 0x9E67 }, { 0x67B8, 0x9E6D }, 
-	{ 0x67B9, 0x9E73 }, { 0x67C1, 0x91C6 }, { 0x67C4, 0x95BF }, { 0x67C6, 0x9E75 }, { 0x67CA, 0x9541 }, { 0x67CE, 0x9E74 }, { 0x67CF, 0x9490 }, { 0x67D0, 0x965E }, 
-	{ 0x67D1, 0x8AB9 }, { 0x67D3, 0x90F5 }, { 0x67D4, 0x8F5F }, { 0x67D8, 0x92D1 }, { 0x67DA, 0x974D }, { 0x67DD, 0x9E70 }, { 0x67DE, 0x9E6F }, { 0x67E2, 0x9E71 }, 
-	{ 0x67E4, 0x9E6E }, { 0x67E7, 0x9E76 }, { 0x67E9, 0x9E6C }, { 0x67EC, 0x9E6A }, { 0x67EE, 0x9E72 }, { 0x67EF, 0x9E68 }, { 0x67F1, 0x928C }, { 0x67F3, 0x96F6 }, 
-	{ 0x67F4, 0x8EC4 }, { 0x67F5, 0x8DF2 }, { 0x67FB, 0x8DB8 }, { 0x67FE, 0x968F }, { 0x67FF, 0x8A60 }, { 0x6802, 0x92CC }, { 0x6803, 0x93C8 }, { 0x6804, 0x8968 }, 
-	{ 0x6813, 0x90F0 }, { 0x6816, 0x90B2 }, { 0x6817, 0x8C49 }, { 0x681E, 0x9E78 }, { 0x6821, 0x8D5A }, { 0x6822, 0x8A9C }, { 0x6829, 0x9E7A }, { 0x682A, 0x8A94 }, 
-	{ 0x682B, 0x9E81 }, { 0x6832, 0x9E7D }, { 0x6834, 0x90F1 }, { 0x6838, 0x8A6A }, { 0x6839, 0x8DAA }, { 0x683C, 0x8A69 }, { 0x683D, 0x8DCD }, { 0x6840, 0x9E7B }, 
-	{ 0x6841, 0x8C85 }, { 0x6842, 0x8C6A }, { 0x6843, 0x938D }, { 0x6846, 0x9E79 }, { 0x6848, 0x88C4 }, { 0x684D, 0x9E7C }, { 0x684E, 0x9E7E }, { 0x6850, 0x8BCB }, 
-	{ 0x6851, 0x8C4B }, { 0x6853, 0x8ABA }, { 0x6854, 0x8B6A }, { 0x6859, 0x9E82 }, { 0x685C, 0x8DF7 }, { 0x685D, 0x9691 }, { 0x685F, 0x8E56 }, { 0x6863, 0x9E83 }, 
-	{ 0x6867, 0x954F }, { 0x6874, 0x9E8F }, { 0x6876, 0x89B1 }, { 0x6877, 0x9E84 }, { 0x687E, 0x9E95 }, { 0x687F, 0x9E85 }, { 0x6881, 0x97C0 }, { 0x6883, 0x9E8C }, 
-	{ 0x6885, 0x947E }, { 0x688D, 0x9E94 }, { 0x688F, 0x9E87 }, { 0x6893, 0x88B2 }, { 0x6894, 0x9E89 }, { 0x6897, 0x8D5B }, { 0x689B, 0x9E8B }, { 0x689D, 0x9E8A }, 
-	{ 0x689F, 0x9E86 }, { 0x68A0, 0x9E91 }, { 0x68A2, 0x8FBD }, { 0x68A6, 0x9AEB }, { 0x68A7, 0x8CE6 }, { 0x68A8, 0x979C }, { 0x68AD, 0x9E88 }, { 0x68AF, 0x92F2 }, 
-	{ 0x68B0, 0x8A42 }, { 0x68B1, 0x8DAB }, { 0x68B3, 0x9E80 }, { 0x68B5, 0x9E90 }, { 0x68B6, 0x8A81 }, { 0x68B9, 0x9E8E }, { 0x68BA, 0x9E92 }, { 0x68BC, 0x938E }, 
-	{ 0x68C4, 0x8AFC }, { 0x68C6, 0x9EB0 }, { 0x68C9, 0x96C7 }, { 0x68CA, 0x9E97 }, { 0x68CB, 0x8AFB }, { 0x68CD, 0x9E9E }, { 0x68D2, 0x965F }, { 0x68D4, 0x9E9F }, 
-	{ 0x68D5, 0x9EA1 }, { 0x68D7, 0x9EA5 }, { 0x68D8, 0x9E99 }, { 0x68DA, 0x9249 }, { 0x68DF, 0x938F }, { 0x68E0, 0x9EA9 }, { 0x68E1, 0x9E9C }, { 0x68E3, 0x9EA6 }, 
-	{ 0x68E7, 0x9EA0 }, { 0x68EE, 0x9058 }, { 0x68EF, 0x9EAA }, { 0x68F2, 0x90B1 }, { 0x68F9, 0x9EA8 }, { 0x68FA, 0x8ABB }, { 0x6900, 0x986F }, { 0x6901, 0x9E96 }, 
-	{ 0x6904, 0x9EA4 }, { 0x6905, 0x88D6 }, { 0x6908, 0x9E98 }, { 0x690B, 0x96B8 }, { 0x690C, 0x9E9D }, { 0x690D, 0x9041 }, { 0x690E, 0x92C5 }, { 0x690F, 0x9E93 }, 
-	{ 0x6912, 0x9EA3 }, { 0x6919, 0x909A }, { 0x691A, 0x9EAD }, { 0x691B, 0x8A91 }, { 0x691C, 0x8C9F }, { 0x6921, 0x9EAF }, { 0x6922, 0x9E9A }, { 0x6923, 0x9EAE }, 
-	{ 0x6925, 0x9EA7 }, { 0x6926, 0x9E9B }, { 0x6928, 0x9EAB }, { 0x692A, 0x9EAC }, { 0x6930, 0x9EBD }, { 0x6934, 0x93CC }, { 0x6936, 0x9EA2 }, { 0x6939, 0x9EB9 }, 
-	{ 0x693D, 0x9EBB }, { 0x693F, 0x92D6 }, { 0x694A, 0x976B }, { 0x6953, 0x9596 }, { 0x6954, 0x9EB6 }, { 0x6955, 0x91C8 }, { 0x6959, 0x9EBC }, { 0x695A, 0x915E }, 
-	{ 0x695C, 0x9EB3 }, { 0x695D, 0x9EC0 }, { 0x695E, 0x9EBF }, { 0x6960, 0x93ED }, { 0x6961, 0x9EBE }, { 0x6962, 0x93E8 }, { 0x696A, 0x9EC2 }, { 0x696B, 0x9EB5 }, 
-	{ 0x696D, 0x8BC6 }, { 0x696E, 0x9EB8 }, { 0x696F, 0x8F7C }, { 0x6973, 0x9480 }, { 0x6974, 0x9EBA }, { 0x6975, 0x8BC9 }, { 0x6977, 0x9EB2 }, { 0x6978, 0x9EB4 }, 
-	{ 0x6979, 0x9EB1 }, { 0x697C, 0x984F }, { 0x697D, 0x8A79 }, { 0x697E, 0x9EB7 }, { 0x6981, 0x9EC1 }, { 0x6982, 0x8A54 }, { 0x698A, 0x8DE5 }, { 0x698E, 0x897C }, 
-	{ 0x6991, 0x9ED2 }, { 0x6994, 0x9850 }, { 0x6995, 0x9ED5 }, { 0x699B, 0x9059 }, { 0x699C, 0x9ED4 }, { 0x69A0, 0x9ED3 }, { 0x69A7, 0x9ED0 }, { 0x69AE, 0x9EC4 }, 
-	{ 0x69B1, 0x9EE1 }, { 0x69B2, 0x9EC3 }, { 0x69B4, 0x9ED6 }, { 0x69BB, 0x9ECE }, { 0x69BE, 0x9EC9 }, { 0x69BF, 0x9EC6 }, { 0x69C1, 0x9EC7 }, { 0x69C3, 0x9ECF }, 
-	{ 0x69C7, 0xEAA0 }, { 0x69CA, 0x9ECC }, { 0x69CB, 0x8D5C }, { 0x69CC, 0x92C6 }, { 0x69CD, 0x9184 }, { 0x69CE, 0x9ECA }, { 0x69D0, 0x9EC5 }, { 0x69D3, 0x9EC8 }, 
-	{ 0x69D8, 0x976C }, { 0x69D9, 0x968A }, { 0x69DD, 0x9ECD }, { 0x69DE, 0x9ED7 }, { 0x69E7, 0x9EDF }, { 0x69E8, 0x9ED8 }, { 0x69EB, 0x9EE5 }, { 0x69ED, 0x9EE3 }, 
-	{ 0x69F2, 0x9EDE }, { 0x69F9, 0x9EDD }, { 0x69FB, 0x92CE }, { 0x69FD, 0x9185 }, { 0x69FF, 0x9EDB }, { 0x6A02, 0x9ED9 }, { 0x6A05, 0x9EE0 }, { 0x6A0A, 0x9EE6 }, 
-	{ 0x6A0B, 0x94F3 }, { 0x6A0C, 0x9EEC }, { 0x6A12, 0x9EE7 }, { 0x6A13, 0x9EEA }, { 0x6A14, 0x9EE4 }, { 0x6A17, 0x9294 }, { 0x6A19, 0x9557 }, { 0x6A1B, 0x9EDA }, 
-	{ 0x6A1E, 0x9EE2 }, { 0x6A1F, 0x8FBE }, { 0x6A21, 0x96CD }, { 0x6A22, 0x9EF6 }, { 0x6A23, 0x9EE9 }, { 0x6A29, 0x8CA0 }, { 0x6A2A, 0x89A1 }, { 0x6A2B, 0x8A7E }, 
-	{ 0x6A2E, 0x9ED1 }, { 0x6A35, 0x8FBF }, { 0x6A36, 0x9EEE }, { 0x6A38, 0x9EF5 }, { 0x6A39, 0x8EF7 }, { 0x6A3A, 0x8A92 }, { 0x6A3D, 0x924D }, { 0x6A44, 0x9EEB }, 
-	{ 0x6A47, 0x9EF0 }, { 0x6A48, 0x9EF4 }, { 0x6A4B, 0x8BB4 }, { 0x6A58, 0x8B6B }, { 0x6A59, 0x9EF2 }, { 0x6A5F, 0x8B40 }, { 0x6A61, 0x93C9 }, { 0x6A62, 0x9EF1 }, 
-	{ 0x6A66, 0x9EF3 }, { 0x6A72, 0x9EED }, { 0x6A78, 0x9EEF }, { 0x6A7F, 0x8A80 }, { 0x6A80, 0x9268 }, { 0x6A84, 0x9EFA }, { 0x6A8D, 0x9EF8 }, { 0x6A8E, 0x8CE7 }, 
-	{ 0x6A90, 0x9EF7 }, { 0x6A97, 0x9F40 }, { 0x6A9C, 0x9E77 }, { 0x6AA0, 0x9EF9 }, { 0x6AA2, 0x9EFB }, { 0x6AA3, 0x9EFC }, { 0x6AAA, 0x9F4B }, { 0x6AAC, 0x9F47 }, 
-	{ 0x6AAE, 0x9E8D }, { 0x6AB3, 0x9F46 }, { 0x6AB8, 0x9F45 }, { 0x6ABB, 0x9F42 }, { 0x6AC1, 0x9EE8 }, { 0x6AC2, 0x9F44 }, { 0x6AC3, 0x9F43 }, { 0x6AD1, 0x9F49 }, 
-	{ 0x6AD3, 0x9845 }, { 0x6ADA, 0x9F4C }, { 0x6ADB, 0x8BF9 }, { 0x6ADE, 0x9F48 }, { 0x6ADF, 0x9F4A }, { 0x6AE8, 0x94A5 }, { 0x6AEA, 0x9F4D }, { 0x6AFA, 0x9F51 }, 
-	{ 0x6AFB, 0x9F4E }, { 0x6B04, 0x9793 }, { 0x6B05, 0x9F4F }, { 0x6B0A, 0x9EDC }, { 0x6B12, 0x9F52 }, { 0x6B16, 0x9F53 }, { 0x6B1D, 0x8954 }, { 0x6B1F, 0x9F55 }, 
-	{ 0x6B20, 0x8C87 }, { 0x6B21, 0x8E9F }, { 0x6B23, 0x8BD3 }, { 0x6B27, 0x89A2 }, { 0x6B32, 0x977E }, { 0x6B37, 0x9F57 }, { 0x6B38, 0x9F56 }, { 0x6B39, 0x9F59 }, 
-	{ 0x6B3A, 0x8B5C }, { 0x6B3D, 0x8BD4 }, { 0x6B3E, 0x8ABC }, { 0x6B43, 0x9F5C }, { 0x6B47, 0x9F5B }, { 0x6B49, 0x9F5D }, { 0x6B4C, 0x89CC }, { 0x6B4E, 0x9256 }, 
-	{ 0x6B50, 0x9F5E }, { 0x6B53, 0x8ABD }, { 0x6B54, 0x9F60 }, { 0x6B59, 0x9F5F }, { 0x6B5B, 0x9F61 }, { 0x6B5F, 0x9F62 }, { 0x6B61, 0x9F63 }, { 0x6B62, 0x8E7E }, 
-	{ 0x6B63, 0x90B3 }, { 0x6B64, 0x8D9F }, { 0x6B66, 0x9590 }, { 0x6B69, 0x95E0 }, { 0x6B6A, 0x9863 }, { 0x6B6F, 0x8E95 }, { 0x6B73, 0x8DCE }, { 0x6B74, 0x97F0 }, 
-	{ 0x6B78, 0x9F64 }, { 0x6B79, 0x9F65 }, { 0x6B7B, 0x8E80 }, { 0x6B7F, 0x9F66 }, { 0x6B80, 0x9F67 }, { 0x6B83, 0x9F69 }, { 0x6B84, 0x9F68 }, { 0x6B86, 0x9677 }, 
-	{ 0x6B89, 0x8F7D }, { 0x6B8A, 0x8EEA }, { 0x6B8B, 0x8E63 }, { 0x6B8D, 0x9F6A }, { 0x6B95, 0x9F6C }, { 0x6B96, 0x9042 }, { 0x6B98, 0x9F6B }, { 0x6B9E, 0x9F6D }, 
-	{ 0x6BA4, 0x9F6E }, { 0x6BAA, 0x9F6F }, { 0x6BAB, 0x9F70 }, { 0x6BAF, 0x9F71 }, { 0x6BB1, 0x9F73 }, { 0x6BB2, 0x9F72 }, { 0x6BB3, 0x9F74 }, { 0x6BB4, 0x89A3 }, 
-	{ 0x6BB5, 0x9269 }, { 0x6BB7, 0x9F75 }, { 0x6BBA, 0x8E45 }, { 0x6BBB, 0x8A6B }, { 0x6BBC, 0x9F76 }, { 0x6BBF, 0x9361 }, { 0x6BC0, 0x9ACA }, { 0x6BC5, 0x8B42 }, 
-	{ 0x6BC6, 0x9F77 }, { 0x6BCB, 0x9F78 }, { 0x6BCD, 0x95EA }, { 0x6BCE, 0x9688 }, { 0x6BD2, 0x93C5 }, { 0x6BD3, 0x9F79 }, { 0x6BD4, 0x94E4 }, { 0x6BD8, 0x94F9 }, 
-	{ 0x6BDB, 0x96D1 }, { 0x6BDF, 0x9F7A }, { 0x6BEB, 0x9F7C }, { 0x6BEC, 0x9F7B }, { 0x6BEF, 0x9F7E }, { 0x6BF3, 0x9F7D }, { 0x6C08, 0x9F81 }, { 0x6C0F, 0x8E81 }, 
-	{ 0x6C11, 0x96AF }, { 0x6C13, 0x9F82 }, { 0x6C14, 0x9F83 }, { 0x6C17, 0x8B43 }, { 0x6C1B, 0x9F84 }, { 0x6C23, 0x9F86 }, { 0x6C24, 0x9F85 }, { 0x6C34, 0x9085 }, 
-	{ 0x6C37, 0x9558 }, { 0x6C38, 0x8969 }, { 0x6C3E, 0x94C3 }, { 0x6C40, 0x92F3 }, { 0x6C41, 0x8F60 }, { 0x6C42, 0x8B81 }, { 0x6C4E, 0x94C4 }, { 0x6C50, 0x8EAC }, 
-	{ 0x6C55, 0x9F88 }, { 0x6C57, 0x8ABE }, { 0x6C5A, 0x8998 }, { 0x6C5D, 0x93F0 }, { 0x6C5E, 0x9F87 }, { 0x6C5F, 0x8D5D }, { 0x6C60, 0x9272 }, { 0x6C62, 0x9F89 }, 
-	{ 0x6C68, 0x9F91 }, { 0x6C6A, 0x9F8A }, { 0x6C70, 0x91BF }, { 0x6C72, 0x8B82 }, { 0x6C73, 0x9F92 }, { 0x6C7A, 0x8C88 }, { 0x6C7D, 0x8B44 }, { 0x6C7E, 0x9F90 }, 
-	{ 0x6C81, 0x9F8E }, { 0x6C82, 0x9F8B }, { 0x6C83, 0x9780 }, { 0x6C88, 0x92BE }, { 0x6C8C, 0x93D7 }, { 0x6C8D, 0x9F8C }, { 0x6C90, 0x9F94 }, { 0x6C92, 0x9F93 }, 
-	{ 0x6C93, 0x8C42 }, { 0x6C96, 0x89AB }, { 0x6C99, 0x8DB9 }, { 0x6C9A, 0x9F8D }, { 0x6C9B, 0x9F8F }, { 0x6CA1, 0x9676 }, { 0x6CA2, 0x91F2 }, { 0x6CAB, 0x9697 }, 
-	{ 0x6CAE, 0x9F9C }, { 0x6CB1, 0x9F9D }, { 0x6CB3, 0x89CD }, { 0x6CB8, 0x95A6 }, { 0x6CB9, 0x96FB }, { 0x6CBA, 0x9F9F }, { 0x6CBB, 0x8EA1 }, { 0x6CBC, 0x8FC0 }, 
-	{ 0x6CBD, 0x9F98 }, { 0x6CBE, 0x9F9E }, { 0x6CBF, 0x8988 }, { 0x6CC1, 0x8BB5 }, { 0x6CC4, 0x9F95 }, { 0x6CC5, 0x9F9A }, { 0x6CC9, 0x90F2 }, { 0x6CCA, 0x9491 }, 
-	{ 0x6CCC, 0x94E5 }, { 0x6CD3, 0x9F97 }, { 0x6CD5, 0x9640 }, { 0x6CD7, 0x9F99 }, { 0x6CD9, 0x9FA2 }, { 0x6CDB, 0x9FA0 }, { 0x6CDD, 0x9F9B }, { 0x6CE1, 0x9641 }, 
-	{ 0x6CE2, 0x9467 }, { 0x6CE3, 0x8B83 }, { 0x6CE5, 0x9344 }, { 0x6CE8, 0x928D }, { 0x6CEA, 0x9FA3 }, { 0x6CEF, 0x9FA1 }, { 0x6CF0, 0x91D7 }, { 0x6CF1, 0x9F96 }, 
-	{ 0x6CF3, 0x896A }, { 0x6D0B, 0x976D }, { 0x6D0C, 0x9FAE }, { 0x6D12, 0x9FAD }, { 0x6D17, 0x90F4 }, { 0x6D19, 0x9FAA }, { 0x6D1B, 0x978C }, { 0x6D1E, 0x93B4 }, 
-	{ 0x6D1F, 0x9FA4 }, { 0x6D25, 0x92C3 }, { 0x6D29, 0x896B }, { 0x6D2A, 0x8D5E }, { 0x6D2B, 0x9FA7 }, { 0x6D32, 0x8F46 }, { 0x6D33, 0x9FAC }, { 0x6D35, 0x9FAB }, 
-	{ 0x6D36, 0x9FA6 }, { 0x6D38, 0x9FA9 }, { 0x6D3B, 0x8A88 }, { 0x6D3D, 0x9FA8 }, { 0x6D3E, 0x9468 }, { 0x6D41, 0x97AC }, { 0x6D44, 0x8FF2 }, { 0x6D45, 0x90F3 }, 
-	{ 0x6D59, 0x9FB4 }, { 0x6D5A, 0x9FB2 }, { 0x6D5C, 0x956C }, { 0x6D63, 0x9FAF }, { 0x6D64, 0x9FB1 }, { 0x6D66, 0x8959 }, { 0x6D69, 0x8D5F }, { 0x6D6A, 0x9851 }, 
-	{ 0x6D6C, 0x8A5C }, { 0x6D6E, 0x9582 }, { 0x6D74, 0x9781 }, { 0x6D77, 0x8A43 }, { 0x6D78, 0x905A }, { 0x6D79, 0x9FB3 }, { 0x6D85, 0x9FB8 }, { 0x6D88, 0x8FC1 }, 
-	{ 0x6D8C, 0x974F }, { 0x6D8E, 0x9FB5 }, { 0x6D93, 0x9FB0 }, { 0x6D95, 0x9FB6 }, { 0x6D99, 0x97DC }, { 0x6D9B, 0x9393 }, { 0x6D9C, 0x93C0 }, { 0x6DAF, 0x8A55 }, 
-	{ 0x6DB2, 0x8974 }, { 0x6DB5, 0x9FBC }, { 0x6DB8, 0x9FBF }, { 0x6DBC, 0x97C1 }, { 0x6DC0, 0x9784 }, { 0x6DC5, 0x9FC6 }, { 0x6DC6, 0x9FC0 }, { 0x6DC7, 0x9FBD }, 
-	{ 0x6DCB, 0x97D2 }, { 0x6DCC, 0x9FC3 }, { 0x6DD1, 0x8F69 }, { 0x6DD2, 0x9FC5 }, { 0x6DD5, 0x9FCA }, { 0x6DD8, 0x9391 }, { 0x6DD9, 0x9FC8 }, { 0x6DDE, 0x9FC2 }, 
-	{ 0x6DE1, 0x9257 }, { 0x6DE4, 0x9FC9 }, { 0x6DE6, 0x9FBE }, { 0x6DE8, 0x9FC4 }, { 0x6DEA, 0x9FCB }, { 0x6DEB, 0x88FA }, { 0x6DEC, 0x9FC1 }, { 0x6DEE, 0x9FCC }, 
-	{ 0x6DF1, 0x905B }, { 0x6DF3, 0x8F7E }, { 0x6DF5, 0x95A3 }, { 0x6DF7, 0x8DAC }, { 0x6DF9, 0x9FB9 }, { 0x6DFA, 0x9FC7 }, { 0x6DFB, 0x9359 }, { 0x6E05, 0x90B4 }, 
-	{ 0x6E07, 0x8A89 }, { 0x6E08, 0x8DCF }, { 0x6E09, 0x8FC2 }, { 0x6E0A, 0x9FBB }, { 0x6E0B, 0x8F61 }, { 0x6E13, 0x8C6B }, { 0x6E15, 0x9FBA }, { 0x6E19, 0x9FD0 }, 
-	{ 0x6E1A, 0x8F8D }, { 0x6E1B, 0x8CB8 }, { 0x6E1D, 0x9FDF }, { 0x6E1F, 0x9FD9 }, { 0x6E20, 0x8B94 }, { 0x6E21, 0x936E }, { 0x6E23, 0x9FD4 }, { 0x6E24, 0x9FDD }, 
-	{ 0x6E25, 0x88AD }, { 0x6E26, 0x8951 }, { 0x6E29, 0x89B7 }, { 0x6E2B, 0x9FD6 }, { 0x6E2C, 0x91AA }, { 0x6E2D, 0x9FCD }, { 0x6E2E, 0x9FCF }, { 0x6E2F, 0x8D60 }, 
-	{ 0x6E38, 0x9FE0 }, { 0x6E3A, 0x9FDB }, { 0x6E3E, 0x9FD3 }, { 0x6E43, 0x9FDA }, { 0x6E4A, 0x96A9 }, { 0x6E4D, 0x9FD8 }, { 0x6E4E, 0x9FDC }, { 0x6E56, 0x8CCE }, 
-	{ 0x6E58, 0x8FC3 }, { 0x6E5B, 0x9258 }, { 0x6E5F, 0x9FD2 }, { 0x6E67, 0x974E }, { 0x6E6B, 0x9FD5 }, { 0x6E6E, 0x9FCE }, { 0x6E6F, 0x9392 }, { 0x6E72, 0x9FD1 }, 
-	{ 0x6E76, 0x9FD7 }, { 0x6E7E, 0x9870 }, { 0x6E7F, 0x8EBC }, { 0x6E80, 0x969E }, { 0x6E82, 0x9FE1 }, { 0x6E8C, 0x94AC }, { 0x6E8F, 0x9FED }, { 0x6E90, 0x8CB9 }, 
-	{ 0x6E96, 0x8F80 }, { 0x6E98, 0x9FE3 }, { 0x6E9C, 0x97AD }, { 0x6E9D, 0x8D61 }, { 0x6E9F, 0x9FF0 }, { 0x6EA2, 0x88EC }, { 0x6EA5, 0x9FEE }, { 0x6EAA, 0x9FE2 }, 
-	{ 0x6EAF, 0x9FE8 }, { 0x6EB2, 0x9FEA }, { 0x6EB6, 0x976E }, { 0x6EB7, 0x9FE5 }, { 0x6EBA, 0x934D }, { 0x6EBD, 0x9FE7 }, { 0x6EC2, 0x9FEF }, { 0x6EC4, 0x9FE9 }, 
-	{ 0x6EC5, 0x96C5 }, { 0x6EC9, 0x9FE4 }, { 0x6ECB, 0x8EA0 }, { 0x6ECC, 0x9FFC }, { 0x6ED1, 0x8A8A }, { 0x6ED3, 0x9FE6 }, { 0x6ED4, 0x9FEB }, { 0x6ED5, 0x9FEC }, 
-	{ 0x6EDD, 0x91EA }, { 0x6EDE, 0x91D8 }, { 0x6EEC, 0x9FF4 }, { 0x6EEF, 0x9FFA }, { 0x6EF2, 0x9FF8 }, { 0x6EF4, 0x9348 }, { 0x6EF7, 0xE042 }, { 0x6EF8, 0x9FF5 }, 
-	{ 0x6EFE, 0x9FF6 }, { 0x6EFF, 0x9FDE }, { 0x6F01, 0x8B99 }, { 0x6F02, 0x9559 }, { 0x6F06, 0x8EBD }, { 0x6F09, 0x8D97 }, { 0x6F0F, 0x9852 }, { 0x6F11, 0x9FF2 }, 
-	{ 0x6F13, 0xE041 }, { 0x6F14, 0x8989 }, { 0x6F15, 0x9186 }, { 0x6F20, 0x9499 }, { 0x6F22, 0x8ABF }, { 0x6F23, 0x97F8 }, { 0x6F2B, 0x969F }, { 0x6F2C, 0x92D0 }, 
-	{ 0x6F31, 0x9FF9 }, { 0x6F32, 0x9FFB }, { 0x6F38, 0x9151 }, { 0x6F3E, 0xE040 }, { 0x6F3F, 0x9FF7 }, { 0x6F41, 0x9FF1 }, { 0x6F45, 0x8AC1 }, { 0x6F54, 0x8C89 }, 
-	{ 0x6F58, 0xE04E }, { 0x6F5B, 0xE049 }, { 0x6F5C, 0x90F6 }, { 0x6F5F, 0x8A83 }, { 0x6F64, 0x8F81 }, { 0x6F66, 0xE052 }, { 0x6F6D, 0xE04B }, { 0x6F6E, 0x92AA }, 
-	{ 0x6F6F, 0xE048 }, { 0x6F70, 0x92D7 }, { 0x6F74, 0xE06B }, { 0x6F78, 0xE045 }, { 0x6F7A, 0xE044 }, { 0x6F7C, 0xE04D }, { 0x6F80, 0xE047 }, { 0x6F81, 0xE046 }, 
-	{ 0x6F82, 0xE04C }, { 0x6F84, 0x909F }, { 0x6F86, 0xE043 }, { 0x6F8E, 0xE04F }, { 0x6F91, 0xE050 }, { 0x6F97, 0x8AC0 }, { 0x6FA1, 0xE055 }, { 0x6FA3, 0xE054 }, 
-	{ 0x6FA4, 0xE056 }, { 0x6FAA, 0xE059 }, { 0x6FB1, 0x9362 }, { 0x6FB3, 0xE053 }, { 0x6FB9, 0xE057 }, { 0x6FC0, 0x8C83 }, { 0x6FC1, 0x91F7 }, { 0x6FC2, 0xE051 }, 
-	{ 0x6FC3, 0x945A }, { 0x6FC6, 0xE058 }, { 0x6FD4, 0xE05D }, { 0x6FD5, 0xE05B }, { 0x6FD8, 0xE05E }, { 0x6FDB, 0xE061 }, { 0x6FDF, 0xE05A }, { 0x6FE0, 0x8D8A }, 
-	{ 0x6FE1, 0x9447 }, { 0x6FE4, 0x9FB7 }, { 0x6FEB, 0x9794 }, { 0x6FEC, 0xE05C }, { 0x6FEE, 0xE060 }, { 0x6FEF, 0x91F3 }, { 0x6FF1, 0xE05F }, { 0x6FF3, 0xE04A }, 
-	{ 0x6FF6, 0xE889 }, { 0x6FFA, 0xE064 }, { 0x6FFE, 0xE068 }, { 0x7001, 0xE066 }, { 0x7009, 0xE062 }, { 0x700B, 0xE063 }, { 0x700F, 0xE067 }, { 0x7011, 0xE065 }, 
-	{ 0x7015, 0x956D }, { 0x7018, 0xE06D }, { 0x701A, 0xE06A }, { 0x701B, 0xE069 }, { 0x701D, 0xE06C }, { 0x701E, 0x93D2 }, { 0x701F, 0xE06E }, { 0x7026, 0x9295 }, 
-	{ 0x7027, 0x91EB }, { 0x702C, 0x90A3 }, { 0x7030, 0xE06F }, { 0x7032, 0xE071 }, { 0x703E, 0xE070 }, { 0x704C, 0x9FF3 }, { 0x7051, 0xE072 }, { 0x7058, 0x93E5 }, 
-	{ 0x7063, 0xE073 }, { 0x706B, 0x89CE }, { 0x706F, 0x9394 }, { 0x7070, 0x8A44 }, { 0x7078, 0x8B84 }, { 0x707C, 0x8EDC }, { 0x707D, 0x8DD0 }, { 0x7089, 0x9846 }, 
-	{ 0x708A, 0x9086 }, { 0x708E, 0x898A }, { 0x7092, 0xE075 }, { 0x7099, 0xE074 }, { 0x70AC, 0xE078 }, { 0x70AD, 0x9259 }, { 0x70AE, 0xE07B }, { 0x70AF, 0xE076 }, 
-	{ 0x70B3, 0xE07A }, { 0x70B8, 0xE079 }, { 0x70B9, 0x935F }, { 0x70BA, 0x88D7 }, { 0x70C8, 0x97F3 }, { 0x70CB, 0xE07D }, { 0x70CF, 0x8947 }, { 0x70D9, 0xE080 }, 
-	{ 0x70DD, 0xE07E }, { 0x70DF, 0xE07C }, { 0x70F1, 0xE077 }, { 0x70F9, 0x9642 }, { 0x70FD, 0xE082 }, { 0x7109, 0xE081 }, { 0x7114, 0x898B }, { 0x7119, 0xE084 }, 
-	{ 0x711A, 0x95B0 }, { 0x711C, 0xE083 }, { 0x7121, 0x96B3 }, { 0x7126, 0x8FC5 }, { 0x7136, 0x9152 }, { 0x713C, 0x8FC4 }, { 0x7149, 0x97F9 }, { 0x714C, 0xE08A }, 
-	{ 0x714E, 0x90F7 }, { 0x7155, 0xE086 }, { 0x7156, 0xE08B }, { 0x7159, 0x898C }, { 0x7162, 0xE089 }, { 0x7164, 0x9481 }, { 0x7165, 0xE085 }, { 0x7166, 0xE088 }, 
-	{ 0x7167, 0x8FC6 }, { 0x7169, 0x94CF }, { 0x716C, 0xE08C }, { 0x716E, 0x8ECF }, { 0x717D, 0x90F8 }, { 0x7184, 0xE08F }, { 0x7188, 0xE087 }, { 0x718A, 0x8C46 }, 
-	{ 0x718F, 0xE08D }, { 0x7194, 0x976F }, { 0x7195, 0xE090 }, { 0x7199, 0xEAA4 }, { 0x719F, 0x8F6E }, { 0x71A8, 0xE091 }, { 0x71AC, 0xE092 }, { 0x71B1, 0x944D }, 
-	{ 0x71B9, 0xE094 }, { 0x71BE, 0xE095 }, { 0x71C3, 0x9452 }, { 0x71C8, 0x9395 }, { 0x71C9, 0xE097 }, { 0x71CE, 0xE099 }, { 0x71D0, 0x97D3 }, { 0x71D2, 0xE096 }, 
-	{ 0x71D4, 0xE098 }, { 0x71D5, 0x898D }, { 0x71D7, 0xE093 }, { 0x71DF, 0x9A7A }, { 0x71E0, 0xE09A }, { 0x71E5, 0x9187 }, { 0x71E6, 0x8E57 }, { 0x71E7, 0xE09C }, 
-	{ 0x71EC, 0xE09B }, { 0x71ED, 0x9043 }, { 0x71EE, 0x99D7 }, { 0x71F5, 0xE09D }, { 0x71F9, 0xE09F }, { 0x71FB, 0xE08E }, { 0x71FC, 0xE09E }, { 0x71FF, 0xE0A0 }, 
-	{ 0x7206, 0x949A }, { 0x720D, 0xE0A1 }, { 0x7210, 0xE0A2 }, { 0x721B, 0xE0A3 }, { 0x7228, 0xE0A4 }, { 0x722A, 0x92DC }, { 0x722C, 0xE0A6 }, { 0x722D, 0xE0A5 }, 
-	{ 0x7230, 0xE0A7 }, { 0x7232, 0xE0A8 }, { 0x7235, 0x8EDD }, { 0x7236, 0x9583 }, { 0x723A, 0x96EA }, { 0x723B, 0xE0A9 }, { 0x723C, 0xE0AA }, { 0x723D, 0x9175 }, 
-	{ 0x723E, 0x8EA2 }, { 0x723F, 0xE0AB }, { 0x7240, 0xE0AC }, { 0x7246, 0xE0AD }, { 0x7247, 0x95D0 }, { 0x7248, 0x94C5 }, { 0x724B, 0xE0AE }, { 0x724C, 0x9476 }, 
-	{ 0x7252, 0x92AB }, { 0x7258, 0xE0AF }, { 0x7259, 0x89E5 }, { 0x725B, 0x8B8D }, { 0x725D, 0x96C4 }, { 0x725F, 0x96B4 }, { 0x7261, 0x89B2 }, { 0x7262, 0x9853 }, 
-	{ 0x7267, 0x9671 }, { 0x7269, 0x95A8 }, { 0x7272, 0x90B5 }, { 0x7274, 0xE0B0 }, { 0x7279, 0x93C1 }, { 0x727D, 0x8CA1 }, { 0x727E, 0xE0B1 }, { 0x7280, 0x8DD2 }, 
-	{ 0x7281, 0xE0B3 }, { 0x7282, 0xE0B2 }, { 0x7287, 0xE0B4 }, { 0x7292, 0xE0B5 }, { 0x7296, 0xE0B6 }, { 0x72A0, 0x8B5D }, { 0x72A2, 0xE0B7 }, { 0x72A7, 0xE0B8 }, 
-	{ 0x72AC, 0x8CA2 }, { 0x72AF, 0x94C6 }, { 0x72B2, 0xE0BA }, { 0x72B6, 0x8FF3 }, { 0x72B9, 0xE0B9 }, { 0x72C2, 0x8BB6 }, { 0x72C3, 0xE0BB }, { 0x72C4, 0xE0BD }, 
-	{ 0x72C6, 0xE0BC }, { 0x72CE, 0xE0BE }, { 0x72D0, 0x8CCF }, { 0x72D2, 0xE0BF }, { 0x72D7, 0x8BE7 }, { 0x72D9, 0x915F }, { 0x72DB, 0x8D9D }, { 0x72E0, 0xE0C1 }, 
-	{ 0x72E1, 0xE0C2 }, { 0x72E2, 0xE0C0 }, { 0x72E9, 0x8EEB }, { 0x72EC, 0x93C6 }, { 0x72ED, 0x8BB7 }, { 0x72F7, 0xE0C4 }, { 0x72F8, 0x924B }, { 0x72F9, 0xE0C3 }, 
-	{ 0x72FC, 0x9854 }, { 0x72FD, 0x9482 }, { 0x730A, 0xE0C7 }, { 0x7316, 0xE0C9 }, { 0x7317, 0xE0C6 }, { 0x731B, 0x96D2 }, { 0x731C, 0xE0C8 }, { 0x731D, 0xE0CA }, 
-	{ 0x731F, 0x97C2 }, { 0x7325, 0xE0CE }, { 0x7329, 0xE0CD }, { 0x732A, 0x9296 }, { 0x732B, 0x944C }, { 0x732E, 0x8CA3 }, { 0x732F, 0xE0CC }, { 0x7334, 0xE0CB }, 
-	{ 0x7336, 0x9750 }, { 0x7337, 0x9751 }, { 0x733E, 0xE0CF }, { 0x733F, 0x898E }, { 0x7344, 0x8D96 }, { 0x7345, 0x8E82 }, { 0x734E, 0xE0D0 }, { 0x734F, 0xE0D1 }, 
-	{ 0x7357, 0xE0D3 }, { 0x7363, 0x8F62 }, { 0x7368, 0xE0D5 }, { 0x736A, 0xE0D4 }, { 0x7370, 0xE0D6 }, { 0x7372, 0x8A6C }, { 0x7375, 0xE0D8 }, { 0x7378, 0xE0D7 }, 
-	{ 0x737A, 0xE0DA }, { 0x737B, 0xE0D9 }, { 0x7384, 0x8CBA }, { 0x7387, 0x97A6 }, { 0x7389, 0x8BCA }, { 0x738B, 0x89A4 }, { 0x7396, 0x8BE8 }, { 0x73A9, 0x8ADF }, 
-	{ 0x73B2, 0x97E6 }, { 0x73B3, 0xE0DC }, { 0x73BB, 0xE0DE }, { 0x73C0, 0xE0DF }, { 0x73C2, 0x89CF }, { 0x73C8, 0xE0DB }, { 0x73CA, 0x8E58 }, { 0x73CD, 0x92BF }, 
-	{ 0x73CE, 0xE0DD }, { 0x73DE, 0xE0E2 }, { 0x73E0, 0x8EEC }, { 0x73E5, 0xE0E0 }, { 0x73EA, 0x8C5D }, { 0x73ED, 0x94C7 }, { 0x73EE, 0xE0E1 }, { 0x73F1, 0xE0FC }, 
-	{ 0x73F8, 0xE0E7 }, { 0x73FE, 0x8CBB }, { 0x7403, 0x8B85 }, { 0x7405, 0xE0E4 }, { 0x7406, 0x979D }, { 0x7409, 0x97AE }, { 0x7422, 0x91F4 }, { 0x7425, 0xE0E6 }, 
-	{ 0x7432, 0xE0E8 }, { 0x7433, 0x97D4 }, { 0x7434, 0x8BD5 }, { 0x7435, 0x94FA }, { 0x7436, 0x9469 }, { 0x743A, 0xE0E9 }, { 0x743F, 0xE0EB }, { 0x7441, 0xE0EE }, 
-	{ 0x7455, 0xE0EA }, { 0x7459, 0xE0ED }, { 0x745A, 0x8CE8 }, { 0x745B, 0x896C }, { 0x745C, 0xE0EF }, { 0x745E, 0x9090 }, { 0x745F, 0xE0EC }, { 0x7460, 0x97DA }, 
-	{ 0x7463, 0xE0F2 }, { 0x7464, 0xEAA2 }, { 0x7469, 0xE0F0 }, { 0x746A, 0xE0F3 }, { 0x746F, 0xE0E5 }, { 0x7470, 0xE0F1 }, { 0x7473, 0x8DBA }, { 0x7476, 0xE0F4 }, 
-	{ 0x747E, 0xE0F5 }, { 0x7483, 0x979E }, { 0x748B, 0xE0F6 }, { 0x749E, 0xE0F7 }, { 0x74A2, 0xE0E3 }, { 0x74A7, 0xE0F8 }, { 0x74B0, 0x8AC2 }, { 0x74BD, 0x8EA3 }, 
-	{ 0x74CA, 0xE0F9 }, { 0x74CF, 0xE0FA }, { 0x74D4, 0xE0FB }, { 0x74DC, 0x895A }, { 0x74E0, 0xE140 }, { 0x74E2, 0x955A }, { 0x74E3, 0xE141 }, { 0x74E6, 0x8AA2 }, 
-	{ 0x74E7, 0xE142 }, { 0x74E9, 0xE143 }, { 0x74EE, 0xE144 }, { 0x74F0, 0xE146 }, { 0x74F1, 0xE147 }, { 0x74F2, 0xE145 }, { 0x74F6, 0x9572 }, { 0x74F7, 0xE149 }, 
-	{ 0x74F8, 0xE148 }, { 0x7503, 0xE14B }, { 0x7504, 0xE14A }, { 0x7505, 0xE14C }, { 0x750C, 0xE14D }, { 0x750D, 0xE14F }, { 0x750E, 0xE14E }, { 0x7511, 0x8D99 }, 
-	{ 0x7513, 0xE151 }, { 0x7515, 0xE150 }, { 0x7518, 0x8AC3 }, { 0x751A, 0x9072 }, { 0x751C, 0x935B }, { 0x751E, 0xE152 }, { 0x751F, 0x90B6 }, { 0x7523, 0x8E59 }, 
-	{ 0x7525, 0x8999 }, { 0x7526, 0xE153 }, { 0x7528, 0x9770 }, { 0x752B, 0x95E1 }, { 0x752C, 0xE154 }, { 0x7530, 0x9363 }, { 0x7531, 0x9752 }, { 0x7532, 0x8D62 }, 
-	{ 0x7533, 0x905C }, { 0x7537, 0x926A }, { 0x7538, 0x99B2 }, { 0x753A, 0x92AC }, { 0x753B, 0x89E6 }, { 0x753C, 0xE155 }, { 0x7544, 0xE156 }, { 0x7546, 0xE15B }, 
-	{ 0x7549, 0xE159 }, { 0x754A, 0xE158 }, { 0x754B, 0x9DC0 }, { 0x754C, 0x8A45 }, { 0x754D, 0xE157 }, { 0x754F, 0x88D8 }, { 0x7551, 0x94A8 }, { 0x7554, 0x94C8 }, 
-	{ 0x7559, 0x97AF }, { 0x755A, 0xE15C }, { 0x755B, 0xE15A }, { 0x755C, 0x927B }, { 0x755D, 0x90A4 }, { 0x7560, 0x94A9 }, { 0x7562, 0x954C }, { 0x7564, 0xE15E }, 
-	{ 0x7565, 0x97AA }, { 0x7566, 0x8C6C }, { 0x7567, 0xE15F }, { 0x7569, 0xE15D }, { 0x756A, 0x94D4 }, { 0x756B, 0xE160 }, { 0x756D, 0xE161 }, { 0x7570, 0x88D9 }, 
-	{ 0x7573, 0x8FF4 }, { 0x7574, 0xE166 }, { 0x7576, 0xE163 }, { 0x7577, 0x93EB }, { 0x7578, 0xE162 }, { 0x757F, 0x8B45 }, { 0x7582, 0xE169 }, { 0x7586, 0xE164 }, 
-	{ 0x7587, 0xE165 }, { 0x7589, 0xE168 }, { 0x758A, 0xE167 }, { 0x758B, 0x9544 }, { 0x758E, 0x9161 }, { 0x758F, 0x9160 }, { 0x7591, 0x8B5E }, { 0x7594, 0xE16A }, 
-	{ 0x759A, 0xE16B }, { 0x759D, 0xE16C }, { 0x75A3, 0xE16E }, { 0x75A5, 0xE16D }, { 0x75AB, 0x8975 }, { 0x75B1, 0xE176 }, { 0x75B2, 0x94E6 }, { 0x75B3, 0xE170 }, 
-	{ 0x75B5, 0xE172 }, { 0x75B8, 0xE174 }, { 0x75B9, 0x905D }, { 0x75BC, 0xE175 }, { 0x75BD, 0xE173 }, { 0x75BE, 0x8EBE }, { 0x75C2, 0xE16F }, { 0x75C3, 0xE171 }, 
-	{ 0x75C5, 0x9561 }, { 0x75C7, 0x8FC7 }, { 0x75CA, 0xE178 }, { 0x75CD, 0xE177 }, { 0x75D2, 0xE179 }, { 0x75D4, 0x8EA4 }, { 0x75D5, 0x8DAD }, { 0x75D8, 0x9397 }, 
-	{ 0x75D9, 0xE17A }, { 0x75DB, 0x92C9 }, { 0x75DE, 0xE17C }, { 0x75E2, 0x979F }, { 0x75E3, 0xE17B }, { 0x75E9, 0x9189 }, { 0x75F0, 0xE182 }, { 0x75F2, 0xE184 }, 
-	{ 0x75F3, 0xE185 }, { 0x75F4, 0x9273 }, { 0x75FA, 0xE183 }, { 0x75FC, 0xE180 }, { 0x75FE, 0xE17D }, { 0x75FF, 0xE17E }, { 0x7601, 0xE181 }, { 0x7609, 0xE188 }, 
-	{ 0x760B, 0xE186 }, { 0x760D, 0xE187 }, { 0x761F, 0xE189 }, { 0x7620, 0xE18B }, { 0x7621, 0xE18C }, { 0x7622, 0xE18D }, { 0x7624, 0xE18E }, { 0x7627, 0xE18A }, 
-	{ 0x7630, 0xE190 }, { 0x7634, 0xE18F }, { 0x763B, 0xE191 }, { 0x7642, 0x97C3 }, { 0x7646, 0xE194 }, { 0x7647, 0xE192 }, { 0x7648, 0xE193 }, { 0x764C, 0x8AE0 }, 
-	{ 0x7652, 0x96FC }, { 0x7656, 0x95C8 }, { 0x7658, 0xE196 }, { 0x765C, 0xE195 }, { 0x7661, 0xE197 }, { 0x7662, 0xE198 }, { 0x7667, 0xE19C }, { 0x7668, 0xE199 }, 
-	{ 0x7669, 0xE19A }, { 0x766A, 0xE19B }, { 0x766C, 0xE19D }, { 0x7670, 0xE19E }, { 0x7672, 0xE19F }, { 0x7676, 0xE1A0 }, { 0x7678, 0xE1A1 }, { 0x767A, 0x94AD }, 
-	{ 0x767B, 0x936F }, { 0x767C, 0xE1A2 }, { 0x767D, 0x9492 }, { 0x767E, 0x9553 }, { 0x7680, 0xE1A3 }, { 0x7683, 0xE1A4 }, { 0x7684, 0x9349 }, { 0x7686, 0x8A46 }, 
-	{ 0x7687, 0x8D63 }, { 0x7688, 0xE1A5 }, { 0x768B, 0xE1A6 }, { 0x768E, 0xE1A7 }, { 0x7690, 0x8E48 }, { 0x7693, 0xE1A9 }, { 0x7696, 0xE1A8 }, { 0x7699, 0xE1AA }, 
-	{ 0x769A, 0xE1AB }, { 0x76AE, 0x94E7 }, { 0x76B0, 0xE1AC }, { 0x76B4, 0xE1AD }, { 0x76B7, 0xEA89 }, { 0x76B8, 0xE1AE }, { 0x76B9, 0xE1AF }, { 0x76BA, 0xE1B0 }, 
-	{ 0x76BF, 0x8E4D }, { 0x76C2, 0xE1B1 }, { 0x76C3, 0x9475 }, { 0x76C6, 0x967E }, { 0x76C8, 0x896D }, { 0x76CA, 0x8976 }, { 0x76CD, 0xE1B2 }, { 0x76D2, 0xE1B4 }, 
-	{ 0x76D6, 0xE1B3 }, { 0x76D7, 0x9390 }, { 0x76DB, 0x90B7 }, { 0x76DC, 0x9F58 }, { 0x76DE, 0xE1B5 }, { 0x76DF, 0x96BF }, { 0x76E1, 0xE1B6 }, { 0x76E3, 0x8AC4 }, 
-	{ 0x76E4, 0x94D5 }, { 0x76E5, 0xE1B7 }, { 0x76E7, 0xE1B8 }, { 0x76EA, 0xE1B9 }, { 0x76EE, 0x96DA }, { 0x76F2, 0x96D3 }, { 0x76F4, 0x92BC }, { 0x76F8, 0x918A }, 
-	{ 0x76FB, 0xE1BB }, { 0x76FE, 0x8F82 }, { 0x7701, 0x8FC8 }, { 0x7704, 0xE1BE }, { 0x7707, 0xE1BD }, { 0x7708, 0xE1BC }, { 0x7709, 0x94FB }, { 0x770B, 0x8AC5 }, 
-	{ 0x770C, 0x8CA7 }, { 0x771B, 0xE1C4 }, { 0x771E, 0xE1C1 }, { 0x771F, 0x905E }, { 0x7720, 0x96B0 }, { 0x7724, 0xE1C0 }, { 0x7725, 0xE1C2 }, { 0x7726, 0xE1C3 }, 
-	{ 0x7729, 0xE1BF }, { 0x7737, 0xE1C5 }, { 0x7738, 0xE1C6 }, { 0x773A, 0x92AD }, { 0x773C, 0x8AE1 }, { 0x7740, 0x9285 }, { 0x7747, 0xE1C7 }, { 0x775A, 0xE1C8 }, 
-	{ 0x775B, 0xE1CB }, { 0x7761, 0x9087 }, { 0x7763, 0x93C2 }, { 0x7765, 0xE1CC }, { 0x7766, 0x9672 }, { 0x7768, 0xE1C9 }, { 0x776B, 0xE1CA }, { 0x7779, 0xE1CF }, 
-	{ 0x777E, 0xE1CE }, { 0x777F, 0xE1CD }, { 0x778B, 0xE1D1 }, { 0x778E, 0xE1D0 }, { 0x7791, 0xE1D2 }, { 0x779E, 0xE1D4 }, { 0x77A0, 0xE1D3 }, { 0x77A5, 0x95CB }, 
-	{ 0x77AC, 0x8F75 }, { 0x77AD, 0x97C4 }, { 0x77B0, 0xE1D5 }, { 0x77B3, 0x93B5 }, { 0x77B6, 0xE1D6 }, { 0x77B9, 0xE1D7 }, { 0x77BB, 0xE1DB }, { 0x77BC, 0xE1D9 }, 
-	{ 0x77BD, 0xE1DA }, { 0x77BF, 0xE1D8 }, { 0x77C7, 0xE1DC }, { 0x77CD, 0xE1DD }, { 0x77D7, 0xE1DE }, { 0x77DA, 0xE1DF }, { 0x77DB, 0x96B5 }, { 0x77DC, 0xE1E0 }, 
-	{ 0x77E2, 0x96EE }, { 0x77E3, 0xE1E1 }, { 0x77E5, 0x926D }, { 0x77E7, 0x948A }, { 0x77E9, 0x8BE9 }, { 0x77ED, 0x925A }, { 0x77EE, 0xE1E2 }, { 0x77EF, 0x8BB8 }, 
-	{ 0x77F3, 0x90CE }, { 0x77FC, 0xE1E3 }, { 0x7802, 0x8DBB }, { 0x780C, 0xE1E4 }, { 0x7812, 0xE1E5 }, { 0x7814, 0x8CA4 }, { 0x7815, 0x8DD3 }, { 0x7820, 0xE1E7 }, 
-	{ 0x7825, 0x9375 }, { 0x7826, 0x8DD4 }, { 0x7827, 0x8B6D }, { 0x7832, 0x9643 }, { 0x7834, 0x946A }, { 0x783A, 0x9376 }, { 0x783F, 0x8D7B }, { 0x7845, 0xE1E9 }, 
-	{ 0x785D, 0x8FC9 }, { 0x786B, 0x97B0 }, { 0x786C, 0x8D64 }, { 0x786F, 0x8CA5 }, { 0x7872, 0x94A1 }, { 0x7874, 0xE1EB }, { 0x787C, 0xE1ED }, { 0x7881, 0x8CE9 }, 
-	{ 0x7886, 0xE1EC }, { 0x7887, 0x92F4 }, { 0x788C, 0xE1EF }, { 0x788D, 0x8A56 }, { 0x788E, 0xE1EA }, { 0x7891, 0x94E8 }, { 0x7893, 0x894F }, { 0x7895, 0x8DEA }, 
-	{ 0x7897, 0x9871 }, { 0x789A, 0xE1EE }, { 0x78A3, 0xE1F0 }, { 0x78A7, 0x95C9 }, { 0x78A9, 0x90D7 }, { 0x78AA, 0xE1F2 }, { 0x78AF, 0xE1F3 }, { 0x78B5, 0xE1F1 }, 
-	{ 0x78BA, 0x8A6D }, { 0x78BC, 0xE1F9 }, { 0x78BE, 0xE1F8 }, { 0x78C1, 0x8EA5 }, { 0x78C5, 0xE1FA }, { 0x78C6, 0xE1F5 }, { 0x78CA, 0xE1FB }, { 0x78CB, 0xE1F6 }, 
-	{ 0x78D0, 0x94D6 }, { 0x78D1, 0xE1F4 }, { 0x78D4, 0xE1F7 }, { 0x78DA, 0xE241 }, { 0x78E7, 0xE240 }, { 0x78E8, 0x9681 }, { 0x78EC, 0xE1FC }, { 0x78EF, 0x88E9 }, 
-	{ 0x78F4, 0xE243 }, { 0x78FD, 0xE242 }, { 0x7901, 0x8FCA }, { 0x7907, 0xE244 }, { 0x790E, 0x9162 }, { 0x7911, 0xE246 }, { 0x7912, 0xE245 }, { 0x7919, 0xE247 }, 
-	{ 0x7926, 0xE1E6 }, { 0x792A, 0xE1E8 }, { 0x792B, 0xE249 }, { 0x792C, 0xE248 }, { 0x793A, 0x8EA6 }, { 0x793C, 0x97E7 }, { 0x793E, 0x8ED0 }, { 0x7940, 0xE24A }, 
-	{ 0x7941, 0x8C56 }, { 0x7947, 0x8B5F }, { 0x7948, 0x8B46 }, { 0x7949, 0x8E83 }, { 0x7950, 0x9753 }, { 0x7953, 0xE250 }, { 0x7955, 0xE24F }, { 0x7956, 0x9163 }, 
-	{ 0x7957, 0xE24C }, { 0x795A, 0xE24E }, { 0x795D, 0x8F6A }, { 0x795E, 0x905F }, { 0x795F, 0xE24D }, { 0x7960, 0xE24B }, { 0x7962, 0x9449 }, { 0x7965, 0x8FCB }, 
-	{ 0x7968, 0x955B }, { 0x796D, 0x8DD5 }, { 0x7977, 0x9398 }, { 0x797A, 0xE251 }, { 0x797F, 0xE252 }, { 0x7980, 0xE268 }, { 0x7981, 0x8BD6 }, { 0x7984, 0x985C }, 
-	{ 0x7985, 0x9154 }, { 0x798A, 0xE253 }, { 0x798D, 0x89D0 }, { 0x798E, 0x92F5 }, { 0x798F, 0x959F }, { 0x799D, 0xE254 }, { 0x79A6, 0x8B9A }, { 0x79A7, 0xE255 }, 
-	{ 0x79AA, 0xE257 }, { 0x79AE, 0xE258 }, { 0x79B0, 0x9448 }, { 0x79B3, 0xE259 }, { 0x79B9, 0xE25A }, { 0x79BA, 0xE25B }, { 0x79BD, 0x8BD7 }, { 0x79BE, 0x89D1 }, 
-	{ 0x79BF, 0x93C3 }, { 0x79C0, 0x8F47 }, { 0x79C1, 0x8E84 }, { 0x79C9, 0xE25C }, { 0x79CB, 0x8F48 }, { 0x79D1, 0x89C8 }, { 0x79D2, 0x9562 }, { 0x79D5, 0xE25D }, 
-	{ 0x79D8, 0x94E9 }, { 0x79DF, 0x9164 }, { 0x79E1, 0xE260 }, { 0x79E3, 0xE261 }, { 0x79E4, 0x9489 }, { 0x79E6, 0x9060 }, { 0x79E7, 0xE25E }, { 0x79E9, 0x9281 }, 
-	{ 0x79EC, 0xE25F }, { 0x79F0, 0x8FCC }, { 0x79FB, 0x88DA }, { 0x7A00, 0x8B48 }, { 0x7A08, 0xE262 }, { 0x7A0B, 0x92F6 }, { 0x7A0D, 0xE263 }, { 0x7A0E, 0x90C5 }, 
-	{ 0x7A14, 0x96AB }, { 0x7A17, 0x9542 }, { 0x7A18, 0xE264 }, { 0x7A19, 0xE265 }, { 0x7A1A, 0x9274 }, { 0x7A1C, 0x97C5 }, { 0x7A1F, 0xE267 }, { 0x7A20, 0xE266 }, 
-	{ 0x7A2E, 0x8EED }, { 0x7A31, 0xE269 }, { 0x7A32, 0x88EE }, { 0x7A37, 0xE26C }, { 0x7A3B, 0xE26A }, { 0x7A3C, 0x89D2 }, { 0x7A3D, 0x8C6D }, { 0x7A3E, 0xE26B }, 
-	{ 0x7A3F, 0x8D65 }, { 0x7A40, 0x8D92 }, { 0x7A42, 0x95E4 }, { 0x7A43, 0xE26D }, { 0x7A46, 0x9673 }, { 0x7A49, 0xE26F }, { 0x7A4D, 0x90CF }, { 0x7A4E, 0x896E }, 
-	{ 0x7A4F, 0x89B8 }, { 0x7A50, 0x88AA }, { 0x7A57, 0xE26E }, { 0x7A61, 0xE270 }, { 0x7A62, 0xE271 }, { 0x7A63, 0x8FF5 }, { 0x7A69, 0xE272 }, { 0x7A6B, 0x8A6E }, 
-	{ 0x7A70, 0xE274 }, { 0x7A74, 0x8C8A }, { 0x7A76, 0x8B86 }, { 0x7A79, 0xE275 }, { 0x7A7A, 0x8BF3 }, { 0x7A7D, 0xE276 }, { 0x7A7F, 0x90FA }, { 0x7A81, 0x93CB }, 
-	{ 0x7A83, 0x90DE }, { 0x7A84, 0x8DF3 }, { 0x7A88, 0xE277 }, { 0x7A92, 0x9282 }, { 0x7A93, 0x918B }, { 0x7A95, 0xE279 }, { 0x7A96, 0xE27B }, { 0x7A97, 0xE278 }, 
-	{ 0x7A98, 0xE27A }, { 0x7A9F, 0x8C41 }, { 0x7AA9, 0xE27C }, { 0x7AAA, 0x8C45 }, { 0x7AAE, 0x8B87 }, { 0x7AAF, 0x9771 }, { 0x7AB0, 0xE27E }, { 0x7AB6, 0xE280 }, 
-	{ 0x7ABA, 0x894D }, { 0x7ABF, 0xE283 }, { 0x7AC3, 0x8A96 }, { 0x7AC4, 0xE282 }, { 0x7AC5, 0xE281 }, { 0x7AC7, 0xE285 }, { 0x7AC8, 0xE27D }, { 0x7ACA, 0xE286 }, 
-	{ 0x7ACB, 0x97A7 }, { 0x7ACD, 0xE287 }, { 0x7ACF, 0xE288 }, { 0x7AD2, 0x9AF2 }, { 0x7AD3, 0xE28A }, { 0x7AD5, 0xE289 }, { 0x7AD9, 0xE28B }, { 0x7ADA, 0xE28C }, 
-	{ 0x7ADC, 0x97B3 }, { 0x7ADD, 0xE28D }, { 0x7ADF, 0xE8ED }, { 0x7AE0, 0x8FCD }, { 0x7AE1, 0xE28E }, { 0x7AE2, 0xE28F }, { 0x7AE3, 0x8F76 }, { 0x7AE5, 0x93B6 }, 
-	{ 0x7AE6, 0xE290 }, { 0x7AEA, 0x9247 }, { 0x7AED, 0xE291 }, { 0x7AEF, 0x925B }, { 0x7AF0, 0xE292 }, { 0x7AF6, 0x8BA3 }, { 0x7AF8, 0x995E }, { 0x7AF9, 0x927C }, 
-	{ 0x7AFA, 0x8EB1 }, { 0x7AFF, 0x8AC6 }, { 0x7B02, 0xE293 }, { 0x7B04, 0xE2A0 }, { 0x7B06, 0xE296 }, { 0x7B08, 0x8B88 }, { 0x7B0A, 0xE295 }, { 0x7B0B, 0xE2A2 }, 
-	{ 0x7B0F, 0xE294 }, { 0x7B11, 0x8FCE }, { 0x7B18, 0xE298 }, { 0x7B19, 0xE299 }, { 0x7B1B, 0x934A }, { 0x7B1E, 0xE29A }, { 0x7B20, 0x8A7D }, { 0x7B25, 0x9079 }, 
-	{ 0x7B26, 0x9584 }, { 0x7B28, 0xE29C }, { 0x7B2C, 0x91E6 }, { 0x7B33, 0xE297 }, { 0x7B35, 0xE29B }, { 0x7B36, 0xE29D }, { 0x7B39, 0x8DF9 }, { 0x7B45, 0xE2A4 }, 
-	{ 0x7B46, 0x954D }, { 0x7B48, 0x94A4 }, { 0x7B49, 0x9399 }, { 0x7B4B, 0x8BD8 }, { 0x7B4C, 0xE2A3 }, { 0x7B4D, 0xE2A1 }, { 0x7B4F, 0x94B3 }, { 0x7B50, 0xE29E }, 
-	{ 0x7B51, 0x927D }, { 0x7B52, 0x939B }, { 0x7B54, 0x939A }, { 0x7B56, 0x8DF4 }, { 0x7B5D, 0xE2B6 }, { 0x7B65, 0xE2A6 }, { 0x7B67, 0xE2A8 }, { 0x7B6C, 0xE2AB }, 
-	{ 0x7B6E, 0xE2AC }, { 0x7B70, 0xE2A9 }, { 0x7B71, 0xE2AA }, { 0x7B74, 0xE2A7 }, { 0x7B75, 0xE2A5 }, { 0x7B7A, 0xE29F }, { 0x7B86, 0x95CD }, { 0x7B87, 0x89D3 }, 
-	{ 0x7B8B, 0xE2B3 }, { 0x7B8D, 0xE2B0 }, { 0x7B8F, 0xE2B5 }, { 0x7B92, 0xE2B4 }, { 0x7B94, 0x9493 }, { 0x7B95, 0x96A5 }, { 0x7B97, 0x8E5A }, { 0x7B98, 0xE2AE }, 
-	{ 0x7B99, 0xE2B7 }, { 0x7B9A, 0xE2B2 }, { 0x7B9C, 0xE2B1 }, { 0x7B9D, 0xE2AD }, { 0x7B9F, 0xE2AF }, { 0x7BA1, 0x8AC7 }, { 0x7BAA, 0x925C }, { 0x7BAD, 0x90FB }, 
-	{ 0x7BB1, 0x94A0 }, { 0x7BB4, 0xE2BC }, { 0x7BB8, 0x94A2 }, { 0x7BC0, 0x90DF }, { 0x7BC1, 0xE2B9 }, { 0x7BC4, 0x94CD }, { 0x7BC6, 0xE2BD }, { 0x7BC7, 0x95D1 }, 
-	{ 0x7BC9, 0x927A }, { 0x7BCB, 0xE2B8 }, { 0x7BCC, 0xE2BA }, { 0x7BCF, 0xE2BB }, { 0x7BDD, 0xE2BE }, { 0x7BE0, 0x8EC2 }, { 0x7BE4, 0x93C4 }, { 0x7BE5, 0xE2C3 }, 
-	{ 0x7BE6, 0xE2C2 }, { 0x7BE9, 0xE2BF }, { 0x7BED, 0x9855 }, { 0x7BF3, 0xE2C8 }, { 0x7BF6, 0xE2CC }, { 0x7BF7, 0xE2C9 }, { 0x7C00, 0xE2C5 }, { 0x7C07, 0xE2C6 }, 
-	{ 0x7C0D, 0xE2CB }, { 0x7C11, 0xE2C0 }, { 0x7C12, 0x99D3 }, { 0x7C13, 0xE2C7 }, { 0x7C14, 0xE2C1 }, { 0x7C17, 0xE2CA }, { 0x7C1F, 0xE2D0 }, { 0x7C21, 0x8AC8 }, 
-	{ 0x7C23, 0xE2CD }, { 0x7C27, 0xE2CE }, { 0x7C2A, 0xE2CF }, { 0x7C2B, 0xE2D2 }, { 0x7C37, 0xE2D1 }, { 0x7C38, 0x94F4 }, { 0x7C3D, 0xE2D3 }, { 0x7C3E, 0x97FA }, 
-	{ 0x7C3F, 0x95EB }, { 0x7C40, 0xE2D8 }, { 0x7C43, 0xE2D5 }, { 0x7C4C, 0xE2D4 }, { 0x7C4D, 0x90D0 }, { 0x7C4F, 0xE2D7 }, { 0x7C50, 0xE2D9 }, { 0x7C54, 0xE2D6 }, 
-	{ 0x7C56, 0xE2DD }, { 0x7C58, 0xE2DA }, { 0x7C5F, 0xE2DB }, { 0x7C60, 0xE2C4 }, { 0x7C64, 0xE2DC }, { 0x7C65, 0xE2DE }, { 0x7C6C, 0xE2DF }, { 0x7C73, 0x95C4 }, 
-	{ 0x7C75, 0xE2E0 }, { 0x7C7E, 0x96E0 }, { 0x7C81, 0x8BCC }, { 0x7C82, 0x8C48 }, { 0x7C83, 0xE2E1 }, { 0x7C89, 0x95B2 }, { 0x7C8B, 0x9088 }, { 0x7C8D, 0x96AE }, 
-	{ 0x7C90, 0xE2E2 }, { 0x7C92, 0x97B1 }, { 0x7C95, 0x9494 }, { 0x7C97, 0x9165 }, { 0x7C98, 0x9453 }, { 0x7C9B, 0x8F6C }, { 0x7C9F, 0x88BE }, { 0x7CA1, 0xE2E7 }, 
-	{ 0x7CA2, 0xE2E5 }, { 0x7CA4, 0xE2E3 }, { 0x7CA5, 0x8A9F }, { 0x7CA7, 0x8FCF }, { 0x7CA8, 0xE2E8 }, { 0x7CAB, 0xE2E6 }, { 0x7CAD, 0xE2E4 }, { 0x7CAE, 0xE2EC }, 
-	{ 0x7CB1, 0xE2EB }, { 0x7CB2, 0xE2EA }, { 0x7CB3, 0xE2E9 }, { 0x7CB9, 0xE2ED }, { 0x7CBD, 0xE2EE }, { 0x7CBE, 0x90B8 }, { 0x7CC0, 0xE2EF }, { 0x7CC2, 0xE2F1 }, 
-	{ 0x7CC5, 0xE2F0 }, { 0x7CCA, 0x8CD0 }, { 0x7CCE, 0x9157 }, { 0x7CD2, 0xE2F3 }, { 0x7CD6, 0x939C }, { 0x7CD8, 0xE2F2 }, { 0x7CDC, 0xE2F4 }, { 0x7CDE, 0x95B3 }, 
-	{ 0x7CDF, 0x918C }, { 0x7CE0, 0x8D66 }, { 0x7CE2, 0xE2F5 }, { 0x7CE7, 0x97C6 }, { 0x7CEF, 0xE2F7 }, { 0x7CF2, 0xE2F8 }, { 0x7CF4, 0xE2F9 }, { 0x7CF6, 0xE2FA }, 
-	{ 0x7CF8, 0x8E85 }, { 0x7CFA, 0xE2FB }, { 0x7CFB, 0x8C6E }, { 0x7CFE, 0x8B8A }, { 0x7D00, 0x8B49 }, { 0x7D02, 0xE340 }, { 0x7D04, 0x96F1 }, { 0x7D05, 0x8D67 }, 
-	{ 0x7D06, 0xE2FC }, { 0x7D0A, 0xE343 }, { 0x7D0B, 0x96E4 }, { 0x7D0D, 0x945B }, { 0x7D10, 0x9552 }, { 0x7D14, 0x8F83 }, { 0x7D15, 0xE342 }, { 0x7D17, 0x8ED1 }, 
-	{ 0x7D18, 0x8D68 }, { 0x7D19, 0x8E86 }, { 0x7D1A, 0x8B89 }, { 0x7D1B, 0x95B4 }, { 0x7D1C, 0xE341 }, { 0x7D20, 0x9166 }, { 0x7D21, 0x9661 }, { 0x7D22, 0x8DF5 }, 
-	{ 0x7D2B, 0x8E87 }, { 0x7D2C, 0x92DB }, { 0x7D2E, 0xE346 }, { 0x7D2F, 0x97DD }, { 0x7D30, 0x8DD7 }, { 0x7D32, 0xE347 }, { 0x7D33, 0x9061 }, { 0x7D35, 0xE349 }, 
-	{ 0x7D39, 0x8FD0 }, { 0x7D3A, 0x8DAE }, { 0x7D3F, 0xE348 }, { 0x7D42, 0x8F49 }, { 0x7D43, 0x8CBC }, { 0x7D44, 0x9167 }, { 0x7D45, 0xE344 }, { 0x7D46, 0xE34A }, 
-	{ 0x7D4B, 0xE345 }, { 0x7D4C, 0x8C6F }, { 0x7D4E, 0xE34D }, { 0x7D4F, 0xE351 }, { 0x7D50, 0x8C8B }, { 0x7D56, 0xE34C }, { 0x7D5B, 0xE355 }, { 0x7D5E, 0x8D69 }, 
-	{ 0x7D61, 0x978D }, { 0x7D62, 0x88BA }, { 0x7D63, 0xE352 }, { 0x7D66, 0x8B8B }, { 0x7D68, 0xE34F }, { 0x7D6E, 0xE350 }, { 0x7D71, 0x939D }, { 0x7D72, 0xE34E }, 
-	{ 0x7D73, 0xE34B }, { 0x7D75, 0x8A47 }, { 0x7D76, 0x90E2 }, { 0x7D79, 0x8CA6 }, { 0x7D7D, 0xE357 }, { 0x7D89, 0xE354 }, { 0x7D8F, 0xE356 }, { 0x7D93, 0xE353 }, 
-	{ 0x7D99, 0x8C70 }, { 0x7D9A, 0x91B1 }, { 0x7D9B, 0xE358 }, { 0x7D9C, 0x918E }, { 0x7D9F, 0xE365 }, { 0x7DA2, 0xE361 }, { 0x7DA3, 0xE35B }, { 0x7DAB, 0xE35F }, 
-	{ 0x7DAC, 0x8EF8 }, { 0x7DAD, 0x88DB }, { 0x7DAE, 0xE35A }, { 0x7DAF, 0xE362 }, { 0x7DB0, 0xE366 }, { 0x7DB1, 0x8D6A }, { 0x7DB2, 0x96D4 }, { 0x7DB4, 0x92D4 }, 
-	{ 0x7DB5, 0xE35C }, { 0x7DB8, 0xE364 }, { 0x7DBA, 0xE359 }, { 0x7DBB, 0x925D }, { 0x7DBD, 0xE35E }, { 0x7DBE, 0x88BB }, { 0x7DBF, 0x96C8 }, { 0x7DC7, 0xE35D }, 
-	{ 0x7DCA, 0x8BD9 }, { 0x7DCB, 0x94EA }, { 0x7DCF, 0x918D }, { 0x7DD1, 0x97CE }, { 0x7DD2, 0x8F8F }, { 0x7DD5, 0xE38E }, { 0x7DD8, 0xE367 }, { 0x7DDA, 0x90FC }, 
-	{ 0x7DDC, 0xE363 }, { 0x7DDD, 0xE368 }, { 0x7DDE, 0xE36A }, { 0x7DE0, 0x92F7 }, { 0x7DE1, 0xE36D }, { 0x7DE4, 0xE369 }, { 0x7DE8, 0x95D2 }, { 0x7DE9, 0x8AC9 }, 
-	{ 0x7DEC, 0x96C9 }, { 0x7DEF, 0x88DC }, { 0x7DF2, 0xE36C }, { 0x7DF4, 0x97FB }, { 0x7DFB, 0xE36B }, { 0x7E01, 0x898F }, { 0x7E04, 0x93EA }, { 0x7E05, 0xE36E }, 
-	{ 0x7E09, 0xE375 }, { 0x7E0A, 0xE36F }, { 0x7E0B, 0xE376 }, { 0x7E12, 0xE372 }, { 0x7E1B, 0x949B }, { 0x7E1E, 0x8EC8 }, { 0x7E1F, 0xE374 }, { 0x7E21, 0xE371 }, 
-	{ 0x7E22, 0xE377 }, { 0x7E23, 0xE370 }, { 0x7E26, 0x8F63 }, { 0x7E2B, 0x9644 }, { 0x7E2E, 0x8F6B }, { 0x7E31, 0xE373 }, { 0x7E32, 0xE380 }, { 0x7E35, 0xE37B }, 
-	{ 0x7E37, 0xE37E }, { 0x7E39, 0xE37C }, { 0x7E3A, 0xE381 }, { 0x7E3B, 0xE37A }, { 0x7E3D, 0xE360 }, { 0x7E3E, 0x90D1 }, { 0x7E41, 0x94C9 }, { 0x7E43, 0xE37D }, 
-	{ 0x7E46, 0xE378 }, { 0x7E4A, 0x9140 }, { 0x7E4B, 0x8C71 }, { 0x7E4D, 0x8F4A }, { 0x7E54, 0x9044 }, { 0x7E55, 0x9155 }, { 0x7E56, 0xE384 }, { 0x7E59, 0xE386 }, 
-	{ 0x7E5A, 0xE387 }, { 0x7E5D, 0xE383 }, { 0x7E5E, 0xE385 }, { 0x7E66, 0xE379 }, { 0x7E67, 0xE382 }, { 0x7E69, 0xE38A }, { 0x7E6A, 0xE389 }, { 0x7E6D, 0x969A }, 
-	{ 0x7E70, 0x8C4A }, { 0x7E79, 0xE388 }, { 0x7E7B, 0xE38C }, { 0x7E7C, 0xE38B }, { 0x7E7D, 0xE38F }, { 0x7E7F, 0xE391 }, { 0x7E82, 0x8E5B }, { 0x7E83, 0xE38D }, 
-	{ 0x7E88, 0xE392 }, { 0x7E89, 0xE393 }, { 0x7E8C, 0xE394 }, { 0x7E8E, 0xE39A }, { 0x7E8F, 0x935A }, { 0x7E90, 0xE396 }, { 0x7E92, 0xE395 }, { 0x7E93, 0xE397 }, 
-	{ 0x7E94, 0xE398 }, { 0x7E96, 0xE399 }, { 0x7E9B, 0xE39B }, { 0x7E9C, 0xE39C }, { 0x7F36, 0x8ACA }, { 0x7F38, 0xE39D }, { 0x7F3A, 0xE39E }, { 0x7F45, 0xE39F }, 
-	{ 0x7F4C, 0xE3A0 }, { 0x7F4D, 0xE3A1 }, { 0x7F4E, 0xE3A2 }, { 0x7F50, 0xE3A3 }, { 0x7F51, 0xE3A4 }, { 0x7F54, 0xE3A6 }, { 0x7F55, 0xE3A5 }, { 0x7F58, 0xE3A7 }, 
-	{ 0x7F5F, 0xE3A8 }, { 0x7F60, 0xE3A9 }, { 0x7F67, 0xE3AC }, { 0x7F68, 0xE3AA }, { 0x7F69, 0xE3AB }, { 0x7F6A, 0x8DDF }, { 0x7F6B, 0x8C72 }, { 0x7F6E, 0x9275 }, 
-	{ 0x7F70, 0x94B1 }, { 0x7F72, 0x8F90 }, { 0x7F75, 0x946C }, { 0x7F77, 0x94EB }, { 0x7F78, 0xE3AD }, { 0x7F79, 0x9CEB }, { 0x7F82, 0xE3AE }, { 0x7F83, 0xE3B0 }, 
-	{ 0x7F85, 0x9785 }, { 0x7F86, 0xE3AF }, { 0x7F87, 0xE3B2 }, { 0x7F88, 0xE3B1 }, { 0x7F8A, 0x9772 }, { 0x7F8C, 0xE3B3 }, { 0x7F8E, 0x94FC }, { 0x7F94, 0xE3B4 }, 
-	{ 0x7F9A, 0xE3B7 }, { 0x7F9D, 0xE3B6 }, { 0x7F9E, 0xE3B5 }, { 0x7FA3, 0xE3B8 }, { 0x7FA4, 0x8C51 }, { 0x7FA8, 0x9141 }, { 0x7FA9, 0x8B60 }, { 0x7FAE, 0xE3BC }, 
-	{ 0x7FAF, 0xE3B9 }, { 0x7FB2, 0xE3BA }, { 0x7FB6, 0xE3BD }, { 0x7FB8, 0xE3BE }, { 0x7FB9, 0xE3BB }, { 0x7FBD, 0x8948 }, { 0x7FC1, 0x89A5 }, { 0x7FC5, 0xE3C0 }, 
-	{ 0x7FC6, 0xE3C1 }, { 0x7FCA, 0xE3C2 }, { 0x7FCC, 0x9782 }, { 0x7FD2, 0x8F4B }, { 0x7FD4, 0xE3C4 }, { 0x7FD5, 0xE3C3 }, { 0x7FE0, 0x9089 }, { 0x7FE1, 0xE3C5 }, 
-	{ 0x7FE6, 0xE3C6 }, { 0x7FE9, 0xE3C7 }, { 0x7FEB, 0x8AE3 }, { 0x7FF0, 0x8ACB }, { 0x7FF3, 0xE3C8 }, { 0x7FF9, 0xE3C9 }, { 0x7FFB, 0x967C }, { 0x7FFC, 0x9783 }, 
-	{ 0x8000, 0x9773 }, { 0x8001, 0x9856 }, { 0x8003, 0x8D6C }, { 0x8004, 0xE3CC }, { 0x8005, 0x8ED2 }, { 0x8006, 0xE3CB }, { 0x800B, 0xE3CD }, { 0x800C, 0x8EA7 }, 
-	{ 0x8010, 0x91CF }, { 0x8012, 0xE3CE }, { 0x8015, 0x8D6B }, { 0x8017, 0x96D5 }, { 0x8018, 0xE3CF }, { 0x8019, 0xE3D0 }, { 0x801C, 0xE3D1 }, { 0x8021, 0xE3D2 }, 
-	{ 0x8028, 0xE3D3 }, { 0x8033, 0x8EA8 }, { 0x8036, 0x96EB }, { 0x803B, 0xE3D5 }, { 0x803D, 0x925E }, { 0x803F, 0xE3D4 }, { 0x8046, 0xE3D7 }, { 0x804A, 0xE3D6 }, 
-	{ 0x8052, 0xE3D8 }, { 0x8056, 0x90B9 }, { 0x8058, 0xE3D9 }, { 0x805A, 0xE3DA }, { 0x805E, 0x95B7 }, { 0x805F, 0xE3DB }, { 0x8061, 0x918F }, { 0x8062, 0xE3DC }, 
-	{ 0x8068, 0xE3DD }, { 0x806F, 0x97FC }, { 0x8070, 0xE3E0 }, { 0x8072, 0xE3DF }, { 0x8073, 0xE3DE }, { 0x8074, 0x92AE }, { 0x8076, 0xE3E1 }, { 0x8077, 0x9045 }, 
-	{ 0x8079, 0xE3E2 }, { 0x807D, 0xE3E3 }, { 0x807E, 0x9857 }, { 0x807F, 0xE3E4 }, { 0x8084, 0xE3E5 }, { 0x8085, 0xE3E7 }, { 0x8086, 0xE3E6 }, { 0x8087, 0x94A3 }, 
-	{ 0x8089, 0x93F7 }, { 0x808B, 0x985D }, { 0x808C, 0x94A7 }, { 0x8093, 0xE3E9 }, { 0x8096, 0x8FD1 }, { 0x8098, 0x9549 }, { 0x809A, 0xE3EA }, { 0x809B, 0xE3E8 }, 
-	{ 0x809D, 0x8ACC }, { 0x80A1, 0x8CD2 }, { 0x80A2, 0x8E88 }, { 0x80A5, 0x94EC }, { 0x80A9, 0x8CA8 }, { 0x80AA, 0x9662 }, { 0x80AC, 0xE3ED }, { 0x80AD, 0xE3EB }, 
-	{ 0x80AF, 0x8D6D }, { 0x80B1, 0x8D6E }, { 0x80B2, 0x88E7 }, { 0x80B4, 0x8DE6 }, { 0x80BA, 0x9478 }, { 0x80C3, 0x88DD }, { 0x80C4, 0xE3F2 }, { 0x80C6, 0x925F }, 
-	{ 0x80CC, 0x9477 }, { 0x80CE, 0x91D9 }, { 0x80D6, 0xE3F4 }, { 0x80D9, 0xE3F0 }, { 0x80DA, 0xE3F3 }, { 0x80DB, 0xE3EE }, { 0x80DD, 0xE3F1 }, { 0x80DE, 0x9645 }, 
-	{ 0x80E1, 0x8CD3 }, { 0x80E4, 0x88FB }, { 0x80E5, 0xE3EF }, { 0x80EF, 0xE3F6 }, { 0x80F1, 0xE3F7 }, { 0x80F4, 0x93B7 }, { 0x80F8, 0x8BB9 }, { 0x80FC, 0xE445 }, 
-	{ 0x80FD, 0x945C }, { 0x8102, 0x8E89 }, { 0x8105, 0x8BBA }, { 0x8106, 0x90C6 }, { 0x8107, 0x9865 }, { 0x8108, 0x96AC }, { 0x8109, 0xE3F5 }, { 0x810A, 0x90D2 }, 
-	{ 0x811A, 0x8B72 }, { 0x811B, 0xE3F8 }, { 0x8123, 0xE3FA }, { 0x8129, 0xE3F9 }, { 0x812F, 0xE3FB }, { 0x8131, 0x9245 }, { 0x8133, 0x945D }, { 0x8139, 0x92AF }, 
-	{ 0x813E, 0xE442 }, { 0x8146, 0xE441 }, { 0x814B, 0xE3FC }, { 0x814E, 0x9074 }, { 0x8150, 0x9585 }, { 0x8151, 0xE444 }, { 0x8153, 0xE443 }, { 0x8154, 0x8D6F }, 
-	{ 0x8155, 0x9872 }, { 0x815F, 0xE454 }, { 0x8165, 0xE448 }, { 0x8166, 0xE449 }, { 0x816B, 0x8EEE }, { 0x816E, 0xE447 }, { 0x8170, 0x8D98 }, { 0x8171, 0xE446 }, 
-	{ 0x8174, 0xE44A }, { 0x8178, 0x92B0 }, { 0x8179, 0x95A0 }, { 0x817A, 0x9142 }, { 0x817F, 0x91DA }, { 0x8180, 0xE44E }, { 0x8182, 0xE44F }, { 0x8183, 0xE44B }, 
-	{ 0x8188, 0xE44C }, { 0x818A, 0xE44D }, { 0x818F, 0x8D70 }, { 0x8193, 0xE455 }, { 0x8195, 0xE451 }, { 0x819A, 0x9586 }, { 0x819C, 0x968C }, { 0x819D, 0x9547 }, 
-	{ 0x81A0, 0xE450 }, { 0x81A3, 0xE453 }, { 0x81A4, 0xE452 }, { 0x81A8, 0x9663 }, { 0x81A9, 0xE456 }, { 0x81B0, 0xE457 }, { 0x81B3, 0x9156 }, { 0x81B5, 0xE458 }, 
-	{ 0x81B8, 0xE45A }, { 0x81BA, 0xE45E }, { 0x81BD, 0xE45B }, { 0x81BE, 0xE459 }, { 0x81BF, 0x945E }, { 0x81C0, 0xE45C }, { 0x81C2, 0xE45D }, { 0x81C6, 0x89B0 }, 
-	{ 0x81C8, 0xE464 }, { 0x81C9, 0xE45F }, { 0x81CD, 0xE460 }, { 0x81D1, 0xE461 }, { 0x81D3, 0x919F }, { 0x81D8, 0xE463 }, { 0x81D9, 0xE462 }, { 0x81DA, 0xE465 }, 
-	{ 0x81DF, 0xE466 }, { 0x81E0, 0xE467 }, { 0x81E3, 0x9062 }, { 0x81E5, 0x89E7 }, { 0x81E7, 0xE468 }, { 0x81E8, 0x97D5 }, { 0x81EA, 0x8EA9 }, { 0x81ED, 0x8F4C }, 
-	{ 0x81F3, 0x8E8A }, { 0x81F4, 0x9276 }, { 0x81FA, 0xE469 }, { 0x81FB, 0xE46A }, { 0x81FC, 0x8950 }, { 0x81FE, 0xE46B }, { 0x8201, 0xE46C }, { 0x8202, 0xE46D }, 
-	{ 0x8205, 0xE46E }, { 0x8207, 0xE46F }, { 0x8208, 0x8BBB }, { 0x8209, 0x9DA8 }, { 0x820A, 0xE470 }, { 0x820C, 0x90E3 }, { 0x820D, 0xE471 }, { 0x820E, 0x8EC9 }, 
-	{ 0x8210, 0xE472 }, { 0x8212, 0x98AE }, { 0x8216, 0xE473 }, { 0x8217, 0x95DC }, { 0x8218, 0x8ADA }, { 0x821B, 0x9143 }, { 0x821C, 0x8F77 }, { 0x821E, 0x9591 }, 
-	{ 0x821F, 0x8F4D }, { 0x8229, 0xE474 }, { 0x822A, 0x8D71 }, { 0x822B, 0xE475 }, { 0x822C, 0x94CA }, { 0x822E, 0xE484 }, { 0x8233, 0xE477 }, { 0x8235, 0x91C7 }, 
-	{ 0x8236, 0x9495 }, { 0x8237, 0x8CBD }, { 0x8238, 0xE476 }, { 0x8239, 0x9144 }, { 0x8240, 0xE478 }, { 0x8247, 0x92F8 }, { 0x8258, 0xE47A }, { 0x8259, 0xE479 }, 
-	{ 0x825A, 0xE47C }, { 0x825D, 0xE47B }, { 0x825F, 0xE47D }, { 0x8262, 0xE480 }, { 0x8264, 0xE47E }, { 0x8266, 0x8ACD }, { 0x8268, 0xE481 }, { 0x826A, 0xE482 }, 
-	{ 0x826B, 0xE483 }, { 0x826E, 0x8DAF }, { 0x826F, 0x97C7 }, { 0x8271, 0xE485 }, { 0x8272, 0x9046 }, { 0x8276, 0x8990 }, { 0x8277, 0xE486 }, { 0x8278, 0xE487 }, 
-	{ 0x827E, 0xE488 }, { 0x828B, 0x88F0 }, { 0x828D, 0xE489 }, { 0x8292, 0xE48A }, { 0x8299, 0x9587 }, { 0x829D, 0x8EC5 }, { 0x829F, 0xE48C }, { 0x82A5, 0x8A48 }, 
-	{ 0x82A6, 0x88B0 }, { 0x82AB, 0xE48B }, { 0x82AC, 0xE48E }, { 0x82AD, 0x946D }, { 0x82AF, 0x9063 }, { 0x82B1, 0x89D4 }, { 0x82B3, 0x9646 }, { 0x82B8, 0x8C7C }, 
-	{ 0x82B9, 0x8BDA }, { 0x82BB, 0xE48D }, { 0x82BD, 0x89E8 }, { 0x82C5, 0x8AA1 }, { 0x82D1, 0x8991 }, { 0x82D2, 0xE492 }, { 0x82D3, 0x97E8 }, { 0x82D4, 0x91DB }, 
-	{ 0x82D7, 0x9563 }, { 0x82D9, 0xE49E }, { 0x82DB, 0x89D5 }, { 0x82DC, 0xE49C }, { 0x82DE, 0xE49A }, { 0x82DF, 0xE491 }, { 0x82E1, 0xE48F }, { 0x82E3, 0xE490 }, 
-	{ 0x82E5, 0x8EE1 }, { 0x82E6, 0x8BEA }, { 0x82E7, 0x9297 }, { 0x82EB, 0x93CF }, { 0x82F1, 0x8970 }, { 0x82F3, 0xE494 }, { 0x82F4, 0xE493 }, { 0x82F9, 0xE499 }, 
-	{ 0x82FA, 0xE495 }, { 0x82FB, 0xE498 }, { 0x8302, 0x96CE }, { 0x8303, 0xE497 }, { 0x8304, 0x89D6 }, { 0x8305, 0x8A9D }, { 0x8306, 0xE49B }, { 0x8309, 0xE49D }, 
-	{ 0x830E, 0x8C73 }, { 0x8316, 0xE4A1 }, { 0x8317, 0xE4AA }, { 0x8318, 0xE4AB }, { 0x831C, 0x88A9 }, { 0x8323, 0xE4B2 }, { 0x8328, 0x88EF }, { 0x832B, 0xE4A9 }, 
-	{ 0x832F, 0xE4A8 }, { 0x8331, 0xE4A3 }, { 0x8332, 0xE4A2 }, { 0x8334, 0xE4A0 }, { 0x8335, 0xE49F }, { 0x8336, 0x9283 }, { 0x8338, 0x91F9 }, { 0x8339, 0xE4A5 }, 
-	{ 0x8340, 0xE4A4 }, { 0x8345, 0xE4A7 }, { 0x8349, 0x9190 }, { 0x834A, 0x8C74 }, { 0x834F, 0x8960 }, { 0x8350, 0xE4A6 }, { 0x8352, 0x8D72 }, { 0x8358, 0x9191 }, 
-	{ 0x8373, 0xE4B8 }, { 0x8375, 0xE4B9 }, { 0x8377, 0x89D7 }, { 0x837B, 0x89AC }, { 0x837C, 0xE4B6 }, { 0x8385, 0xE4AC }, { 0x8387, 0xE4B4 }, { 0x8389, 0xE4BB }, 
-	{ 0x838A, 0xE4B5 }, { 0x838E, 0xE4B3 }, { 0x8393, 0xE496 }, { 0x8396, 0xE4B1 }, { 0x839A, 0xE4AD }, { 0x839E, 0x8ACE }, { 0x839F, 0xE4AF }, { 0x83A0, 0xE4BA }, 
-	{ 0x83A2, 0xE4B0 }, { 0x83A8, 0xE4BC }, { 0x83AA, 0xE4AE }, { 0x83AB, 0x949C }, { 0x83B1, 0x9789 }, { 0x83B5, 0xE4B7 }, { 0x83BD, 0xE4CD }, { 0x83C1, 0xE4C5 }, 
-	{ 0x83C5, 0x909B }, { 0x83CA, 0x8B65 }, { 0x83CC, 0x8BDB }, { 0x83CE, 0xE4C0 }, { 0x83D3, 0x89D9 }, { 0x83D6, 0x8FD2 }, { 0x83D8, 0xE4C3 }, { 0x83DC, 0x8DD8 }, 
-	{ 0x83DF, 0x9370 }, { 0x83E0, 0xE4C8 }, { 0x83E9, 0x95EC }, { 0x83EB, 0xE4BF }, { 0x83EF, 0x89D8 }, { 0x83F0, 0x8CD4 }, { 0x83F1, 0x9548 }, { 0x83F2, 0xE4C9 }, 
-	{ 0x83F4, 0xE4BD }, { 0x83F7, 0xE4C6 }, { 0x83FB, 0xE4D0 }, { 0x83FD, 0xE4C1 }, { 0x8403, 0xE4C2 }, { 0x8404, 0x93B8 }, { 0x8407, 0xE4C7 }, { 0x840B, 0xE4C4 }, 
-	{ 0x840C, 0x9647 }, { 0x840D, 0xE4CA }, { 0x840E, 0x88DE }, { 0x8413, 0xE4BE }, { 0x8420, 0xE4CC }, { 0x8422, 0xE4CB }, { 0x8429, 0x948B }, { 0x842A, 0xE4D2 }, 
-	{ 0x842C, 0xE4DD }, { 0x8431, 0x8A9E }, { 0x8435, 0xE4E0 }, { 0x8438, 0xE4CE }, { 0x843C, 0xE4D3 }, { 0x843D, 0x978E }, { 0x8446, 0xE4DC }, { 0x8449, 0x9774 }, 
-	{ 0x844E, 0x97A8 }, { 0x8457, 0x9298 }, { 0x845B, 0x8A8B }, { 0x8461, 0x9592 }, { 0x8462, 0xE4E2 }, { 0x8463, 0x939F }, { 0x8466, 0x88AF }, { 0x8469, 0xE4DB }, 
-	{ 0x846B, 0xE4D7 }, { 0x846C, 0x9192 }, { 0x846D, 0xE4D1 }, { 0x846E, 0xE4D9 }, { 0x846F, 0xE4DE }, { 0x8471, 0x944B }, { 0x8475, 0x88A8 }, { 0x8477, 0xE4D6 }, 
-	{ 0x8479, 0xE4DF }, { 0x847A, 0x9598 }, { 0x8482, 0xE4DA }, { 0x8484, 0xE4D5 }, { 0x848B, 0x8FD3 }, { 0x8490, 0x8F4E }, { 0x8494, 0x8EAA }, { 0x8499, 0x96D6 }, 
-	{ 0x849C, 0x9566 }, { 0x849F, 0xE4E5 }, { 0x84A1, 0xE4EE }, { 0x84AD, 0xE4D8 }, { 0x84B2, 0x8A97 }, { 0x84B8, 0x8FF6 }, { 0x84B9, 0xE4E3 }, { 0x84BB, 0xE4E8 }, 
-	{ 0x84BC, 0x9193 }, { 0x84BF, 0xE4E4 }, { 0x84C1, 0xE4EB }, { 0x84C4, 0x927E }, { 0x84C6, 0xE4EC }, { 0x84C9, 0x9775 }, { 0x84CA, 0xE4E1 }, { 0x84CB, 0x8A57 }, 
-	{ 0x84CD, 0xE4E7 }, { 0x84D0, 0xE4EA }, { 0x84D1, 0x96AA }, { 0x84D6, 0xE4ED }, { 0x84D9, 0xE4E6 }, { 0x84DA, 0xE4E9 }, { 0x84EC, 0x9648 }, { 0x84EE, 0x9840 }, 
-	{ 0x84F4, 0xE4F1 }, { 0x84FC, 0xE4F8 }, { 0x84FF, 0xE4F0 }, { 0x8500, 0x8EC1 }, { 0x8506, 0xE4CF }, { 0x8511, 0x95CC }, { 0x8513, 0x96A0 }, { 0x8514, 0xE4F7 }, 
-	{ 0x8515, 0xE4F6 }, { 0x8517, 0xE4F2 }, { 0x8518, 0xE4F3 }, { 0x851A, 0x8955 }, { 0x851F, 0xE4F5 }, { 0x8521, 0xE4EF }, { 0x8526, 0x92D3 }, { 0x852C, 0xE4F4 }, 
-	{ 0x852D, 0x88FC }, { 0x8535, 0x91A0 }, { 0x853D, 0x95C1 }, { 0x8540, 0xE4F9 }, { 0x8541, 0xE540 }, { 0x8543, 0x94D7 }, { 0x8548, 0xE4FC }, { 0x8549, 0x8FD4 }, 
-	{ 0x854A, 0x8EC7 }, { 0x854B, 0xE542 }, { 0x854E, 0x8BBC }, { 0x8555, 0xE543 }, { 0x8557, 0x9599 }, { 0x8558, 0xE4FB }, { 0x855A, 0xE4D4 }, { 0x8563, 0xE4FA }, 
-	{ 0x8568, 0x986E }, { 0x8569, 0x93A0 }, { 0x856A, 0x9593 }, { 0x856D, 0xE54A }, { 0x8577, 0xE550 }, { 0x857E, 0xE551 }, { 0x8580, 0xE544 }, { 0x8584, 0x9496 }, 
-	{ 0x8587, 0xE54E }, { 0x8588, 0xE546 }, { 0x858A, 0xE548 }, { 0x8590, 0xE552 }, { 0x8591, 0xE547 }, { 0x8594, 0xE54B }, { 0x8597, 0x8992 }, { 0x8599, 0x93E3 }, 
-	{ 0x859B, 0xE54C }, { 0x859C, 0xE54F }, { 0x85A4, 0xE545 }, { 0x85A6, 0x9145 }, { 0x85A8, 0xE549 }, { 0x85A9, 0x8E46 }, { 0x85AA, 0x9064 }, { 0x85AB, 0x8C4F }, 
-	{ 0x85AC, 0x96F2 }, { 0x85AE, 0x96F7 }, { 0x85AF, 0x8F92 }, { 0x85B9, 0xE556 }, { 0x85BA, 0xE554 }, { 0x85C1, 0x986D }, { 0x85C9, 0xE553 }, { 0x85CD, 0x9795 }, 
-	{ 0x85CF, 0xE555 }, { 0x85D0, 0xE557 }, { 0x85D5, 0xE558 }, { 0x85DC, 0xE55B }, { 0x85DD, 0xE559 }, { 0x85E4, 0x93A1 }, { 0x85E5, 0xE55A }, { 0x85E9, 0x94CB }, 
-	{ 0x85EA, 0xE54D }, { 0x85F7, 0x8F93 }, { 0x85F9, 0xE55C }, { 0x85FA, 0xE561 }, { 0x85FB, 0x9194 }, { 0x85FE, 0xE560 }, { 0x8602, 0xE541 }, { 0x8606, 0xE562 }, 
-	{ 0x8607, 0x9168 }, { 0x860A, 0xE55D }, { 0x860B, 0xE55F }, { 0x8613, 0xE55E }, { 0x8616, 0x9F50 }, { 0x8617, 0x9F41 }, { 0x861A, 0xE564 }, { 0x8622, 0xE563 }, 
-	{ 0x862D, 0x9796 }, { 0x862F, 0xE1BA }, { 0x8630, 0xE565 }, { 0x863F, 0xE566 }, { 0x864D, 0xE567 }, { 0x864E, 0x8CD5 }, { 0x8650, 0x8B73 }, { 0x8654, 0xE569 }, 
-	{ 0x8655, 0x997C }, { 0x865A, 0x8B95 }, { 0x865C, 0x97B8 }, { 0x865E, 0x8BF1 }, { 0x865F, 0xE56A }, { 0x8667, 0xE56B }, { 0x866B, 0x928E }, { 0x8671, 0xE56C }, 
-	{ 0x8679, 0x93F8 }, { 0x867B, 0x88B8 }, { 0x868A, 0x89E1 }, { 0x868B, 0xE571 }, { 0x868C, 0xE572 }, { 0x8693, 0xE56D }, { 0x8695, 0x8E5C }, { 0x86A3, 0xE56E }, 
-	{ 0x86A4, 0x9461 }, { 0x86A9, 0xE56F }, { 0x86AA, 0xE570 }, { 0x86AB, 0xE57A }, { 0x86AF, 0xE574 }, { 0x86B0, 0xE577 }, { 0x86B6, 0xE573 }, { 0x86C4, 0xE575 }, 
-	{ 0x86C6, 0xE576 }, { 0x86C7, 0x8ED6 }, { 0x86C9, 0xE578 }, { 0x86CB, 0x9260 }, { 0x86CD, 0x8C75 }, { 0x86CE, 0x8A61 }, { 0x86D4, 0xE57B }, { 0x86D9, 0x8A5E }, 
-	{ 0x86DB, 0xE581 }, { 0x86DE, 0xE57C }, { 0x86DF, 0xE580 }, { 0x86E4, 0x94B8 }, { 0x86E9, 0xE57D }, { 0x86EC, 0xE57E }, { 0x86ED, 0x9567 }, { 0x86EE, 0x94D8 }, 
-	{ 0x86EF, 0xE582 }, { 0x86F8, 0x91FB }, { 0x86F9, 0xE58C }, { 0x86FB, 0xE588 }, { 0x86FE, 0x89E9 }, { 0x8700, 0xE586 }, { 0x8702, 0x9649 }, { 0x8703, 0xE587 }, 
-	{ 0x8706, 0xE584 }, { 0x8708, 0xE585 }, { 0x8709, 0xE58A }, { 0x870A, 0xE58D }, { 0x870D, 0xE58B }, { 0x8711, 0xE589 }, { 0x8712, 0xE583 }, { 0x8718, 0x9277 }, 
-	{ 0x871A, 0xE594 }, { 0x871C, 0x96A8 }, { 0x8725, 0xE592 }, { 0x8729, 0xE593 }, { 0x8734, 0xE58E }, { 0x8737, 0xE590 }, { 0x873B, 0xE591 }, { 0x873F, 0xE58F }, 
-	{ 0x8749, 0x90E4 }, { 0x874B, 0x9858 }, { 0x874C, 0xE598 }, { 0x874E, 0xE599 }, { 0x8753, 0xE59F }, { 0x8755, 0x9049 }, { 0x8757, 0xE59B }, { 0x8759, 0xE59E }, 
-	{ 0x875F, 0xE596 }, { 0x8760, 0xE595 }, { 0x8763, 0xE5A0 }, { 0x8766, 0x89DA }, { 0x8768, 0xE59C }, { 0x876A, 0xE5A1 }, { 0x876E, 0xE59D }, { 0x8774, 0xE59A }, 
-	{ 0x8776, 0x92B1 }, { 0x8778, 0xE597 }, { 0x877F, 0x9488 }, { 0x8782, 0xE5A5 }, { 0x878D, 0x975A }, { 0x879F, 0xE5A4 }, { 0x87A2, 0xE5A3 }, { 0x87AB, 0xE5AC }, 
-	{ 0x87AF, 0xE5A6 }, { 0x87B3, 0xE5AE }, { 0x87BA, 0x9786 }, { 0x87BB, 0xE5B1 }, { 0x87BD, 0xE5A8 }, { 0x87C0, 0xE5A9 }, { 0x87C4, 0xE5AD }, { 0x87C6, 0xE5B0 }, 
-	{ 0x87C7, 0xE5AF }, { 0x87CB, 0xE5A7 }, { 0x87D0, 0xE5AA }, { 0x87D2, 0xE5BB }, { 0x87E0, 0xE5B4 }, { 0x87EF, 0xE5B2 }, { 0x87F2, 0xE5B3 }, { 0x87F6, 0xE5B8 }, 
-	{ 0x87F7, 0xE5B9 }, { 0x87F9, 0x8A49 }, { 0x87FB, 0x8B61 }, { 0x87FE, 0xE5B7 }, { 0x8805, 0xE5A2 }, { 0x880D, 0xE5B6 }, { 0x880E, 0xE5BA }, { 0x880F, 0xE5B5 }, 
-	{ 0x8811, 0xE5BC }, { 0x8815, 0xE5BE }, { 0x8816, 0xE5BD }, { 0x8821, 0xE5C0 }, { 0x8822, 0xE5BF }, { 0x8823, 0xE579 }, { 0x8827, 0xE5C4 }, { 0x8831, 0xE5C1 }, 
-	{ 0x8836, 0xE5C2 }, { 0x8839, 0xE5C3 }, { 0x883B, 0xE5C5 }, { 0x8840, 0x8C8C }, { 0x8842, 0xE5C7 }, { 0x8844, 0xE5C6 }, { 0x8846, 0x8F4F }, { 0x884C, 0x8D73 }, 
-	{ 0x884D, 0x9FA5 }, { 0x8852, 0xE5C8 }, { 0x8853, 0x8F70 }, { 0x8857, 0x8A58 }, { 0x8859, 0xE5C9 }, { 0x885B, 0x8971 }, { 0x885D, 0x8FD5 }, { 0x885E, 0xE5CA }, 
-	{ 0x8861, 0x8D74 }, { 0x8862, 0xE5CB }, { 0x8863, 0x88DF }, { 0x8868, 0x955C }, { 0x886B, 0xE5CC }, { 0x8870, 0x908A }, { 0x8872, 0xE5D3 }, { 0x8875, 0xE5D0 }, 
-	{ 0x8877, 0x928F }, { 0x887D, 0xE5D1 }, { 0x887E, 0xE5CE }, { 0x887F, 0x8BDC }, { 0x8881, 0xE5CD }, { 0x8882, 0xE5D4 }, { 0x8888, 0x8C55 }, { 0x888B, 0x91DC }, 
-	{ 0x888D, 0xE5DA }, { 0x8892, 0xE5D6 }, { 0x8896, 0x91B3 }, { 0x8897, 0xE5D5 }, { 0x8899, 0xE5D8 }, { 0x889E, 0xE5CF }, { 0x88A2, 0xE5D9 }, { 0x88A4, 0xE5DB }, 
-	{ 0x88AB, 0x94ED }, { 0x88AE, 0xE5D7 }, { 0x88B0, 0xE5DC }, { 0x88B1, 0xE5DE }, { 0x88B4, 0x8CD1 }, { 0x88B5, 0xE5D2 }, { 0x88B7, 0x88BF }, { 0x88BF, 0xE5DD }, 
-	{ 0x88C1, 0x8DD9 }, { 0x88C2, 0x97F4 }, { 0x88C3, 0xE5DF }, { 0x88C4, 0xE5E0 }, { 0x88C5, 0x9195 }, { 0x88CF, 0x97A0 }, { 0x88D4, 0xE5E1 }, { 0x88D5, 0x9754 }, 
-	{ 0x88D8, 0xE5E2 }, { 0x88D9, 0xE5E3 }, { 0x88DC, 0x95E2 }, { 0x88DD, 0xE5E4 }, { 0x88DF, 0x8DBE }, { 0x88E1, 0x97A1 }, { 0x88E8, 0xE5E9 }, { 0x88F2, 0xE5EA }, 
-	{ 0x88F3, 0x8FD6 }, { 0x88F4, 0xE5E8 }, { 0x88F8, 0x9787 }, { 0x88F9, 0xE5E5 }, { 0x88FC, 0xE5E7 }, { 0x88FD, 0x90BB }, { 0x88FE, 0x909E }, { 0x8902, 0xE5E6 }, 
-	{ 0x8904, 0xE5EB }, { 0x8907, 0x95A1 }, { 0x890A, 0xE5ED }, { 0x890C, 0xE5EC }, { 0x8910, 0x8A8C }, { 0x8912, 0x964A }, { 0x8913, 0xE5EE }, { 0x891D, 0xE5FA }, 
-	{ 0x891E, 0xE5F0 }, { 0x8925, 0xE5F1 }, { 0x892A, 0xE5F2 }, { 0x892B, 0xE5F3 }, { 0x8936, 0xE5F7 }, { 0x8938, 0xE5F8 }, { 0x893B, 0xE5F6 }, { 0x8941, 0xE5F4 }, 
-	{ 0x8943, 0xE5EF }, { 0x8944, 0xE5F5 }, { 0x894C, 0xE5F9 }, { 0x894D, 0xE8B5 }, { 0x8956, 0x89A6 }, { 0x895E, 0xE5FC }, { 0x895F, 0x8BDD }, { 0x8960, 0xE5FB }, 
-	{ 0x8964, 0xE641 }, { 0x8966, 0xE640 }, { 0x896A, 0xE643 }, { 0x896D, 0xE642 }, { 0x896F, 0xE644 }, { 0x8972, 0x8F50 }, { 0x8974, 0xE645 }, { 0x8977, 0xE646 }, 
-	{ 0x897E, 0xE647 }, { 0x897F, 0x90BC }, { 0x8981, 0x9776 }, { 0x8983, 0xE648 }, { 0x8986, 0x95A2 }, { 0x8987, 0x9465 }, { 0x8988, 0xE649 }, { 0x898A, 0xE64A }, 
-	{ 0x898B, 0x8CA9 }, { 0x898F, 0x8B4B }, { 0x8993, 0xE64B }, { 0x8996, 0x8E8B }, { 0x8997, 0x9460 }, { 0x8998, 0xE64C }, { 0x899A, 0x8A6F }, { 0x89A1, 0xE64D }, 
-	{ 0x89A6, 0xE64F }, { 0x89A7, 0x9797 }, { 0x89A9, 0xE64E }, { 0x89AA, 0x9065 }, { 0x89AC, 0xE650 }, { 0x89AF, 0xE651 }, { 0x89B2, 0xE652 }, { 0x89B3, 0x8ACF }, 
-	{ 0x89BA, 0xE653 }, { 0x89BD, 0xE654 }, { 0x89BF, 0xE655 }, { 0x89C0, 0xE656 }, { 0x89D2, 0x8A70 }, { 0x89DA, 0xE657 }, { 0x89DC, 0xE658 }, { 0x89DD, 0xE659 }, 
-	{ 0x89E3, 0x89F0 }, { 0x89E6, 0x9047 }, { 0x89E7, 0xE65A }, { 0x89F4, 0xE65B }, { 0x89F8, 0xE65C }, { 0x8A00, 0x8CBE }, { 0x8A02, 0x92F9 }, { 0x8A03, 0xE65D }, 
-	{ 0x8A08, 0x8C76 }, { 0x8A0A, 0x9075 }, { 0x8A0C, 0xE660 }, { 0x8A0E, 0x93A2 }, { 0x8A10, 0xE65F }, { 0x8A13, 0x8C50 }, { 0x8A16, 0xE65E }, { 0x8A17, 0x91F5 }, 
-	{ 0x8A18, 0x8B4C }, { 0x8A1B, 0xE661 }, { 0x8A1D, 0xE662 }, { 0x8A1F, 0x8FD7 }, { 0x8A23, 0x8C8D }, { 0x8A25, 0xE663 }, { 0x8A2A, 0x964B }, { 0x8A2D, 0x90DD }, 
-	{ 0x8A31, 0x8B96 }, { 0x8A33, 0x96F3 }, { 0x8A34, 0x9169 }, { 0x8A36, 0xE664 }, { 0x8A3A, 0x9066 }, { 0x8A3B, 0x9290 }, { 0x8A3C, 0x8FD8 }, { 0x8A41, 0xE665 }, 
-	{ 0x8A46, 0xE668 }, { 0x8A48, 0xE669 }, { 0x8A50, 0x8DBC }, { 0x8A51, 0x91C0 }, { 0x8A52, 0xE667 }, { 0x8A54, 0x8FD9 }, { 0x8A55, 0x955D }, { 0x8A5B, 0xE666 }, 
-	{ 0x8A5E, 0x8E8C }, { 0x8A60, 0x8972 }, { 0x8A62, 0xE66D }, { 0x8A63, 0x8C77 }, { 0x8A66, 0x8E8E }, { 0x8A69, 0x8E8D }, { 0x8A6B, 0x986C }, { 0x8A6C, 0xE66C }, 
-	{ 0x8A6D, 0xE66B }, { 0x8A6E, 0x9146 }, { 0x8A70, 0x8B6C }, { 0x8A71, 0x9862 }, { 0x8A72, 0x8A59 }, { 0x8A73, 0x8FDA }, { 0x8A7C, 0xE66A }, { 0x8A82, 0xE66F }, 
-	{ 0x8A84, 0xE670 }, { 0x8A85, 0xE66E }, { 0x8A87, 0x8CD6 }, { 0x8A89, 0x975F }, { 0x8A8C, 0x8E8F }, { 0x8A8D, 0x9446 }, { 0x8A91, 0xE673 }, { 0x8A93, 0x90BE }, 
-	{ 0x8A95, 0x9261 }, { 0x8A98, 0x9755 }, { 0x8A9A, 0xE676 }, { 0x8A9E, 0x8CEA }, { 0x8AA0, 0x90BD }, { 0x8AA1, 0xE672 }, { 0x8AA3, 0xE677 }, { 0x8AA4, 0x8CEB }, 
-	{ 0x8AA5, 0xE674 }, { 0x8AA6, 0xE675 }, { 0x8AA8, 0xE671 }, { 0x8AAC, 0x90E0 }, { 0x8AAD, 0x93C7 }, { 0x8AB0, 0x924E }, { 0x8AB2, 0x89DB }, { 0x8AB9, 0x94EE }, 
-	{ 0x8ABC, 0x8B62 }, { 0x8ABF, 0x92B2 }, { 0x8AC2, 0xE67A }, { 0x8AC4, 0xE678 }, { 0x8AC7, 0x926B }, { 0x8ACB, 0x90BF }, { 0x8ACC, 0x8AD0 }, { 0x8ACD, 0xE679 }, 
-	{ 0x8ACF, 0x907A }, { 0x8AD2, 0x97C8 }, { 0x8AD6, 0x985F }, { 0x8ADA, 0xE67B }, { 0x8ADB, 0xE687 }, { 0x8ADC, 0x92B3 }, { 0x8ADE, 0xE686 }, { 0x8AE0, 0xE683 }, 
-	{ 0x8AE1, 0xE68B }, { 0x8AE2, 0xE684 }, { 0x8AE4, 0xE680 }, { 0x8AE6, 0x92FA }, { 0x8AE7, 0xE67E }, { 0x8AEB, 0xE67C }, { 0x8AED, 0x9740 }, { 0x8AEE, 0x8E90 }, 
-	{ 0x8AF1, 0xE681 }, { 0x8AF3, 0xE67D }, { 0x8AF7, 0xE685 }, { 0x8AF8, 0x8F94 }, { 0x8AFA, 0x8CBF }, { 0x8AFE, 0x91F8 }, { 0x8B00, 0x9664 }, { 0x8B01, 0x8979 }, 
-	{ 0x8B02, 0x88E0 }, { 0x8B04, 0x93A3 }, { 0x8B07, 0xE689 }, { 0x8B0C, 0xE688 }, { 0x8B0E, 0x93E4 }, { 0x8B10, 0xE68D }, { 0x8B14, 0xE682 }, { 0x8B16, 0xE68C }, 
-	{ 0x8B17, 0xE68E }, { 0x8B19, 0x8CAA }, { 0x8B1A, 0xE68A }, { 0x8B1B, 0x8D75 }, { 0x8B1D, 0x8ED3 }, { 0x8B20, 0xE68F }, { 0x8B21, 0x9777 }, { 0x8B26, 0xE692 }, 
-	{ 0x8B28, 0xE695 }, { 0x8B2B, 0xE693 }, { 0x8B2C, 0x9554 }, { 0x8B33, 0xE690 }, { 0x8B39, 0x8BDE }, { 0x8B3E, 0xE694 }, { 0x8B41, 0xE696 }, { 0x8B49, 0xE69A }, 
-	{ 0x8B4C, 0xE697 }, { 0x8B4E, 0xE699 }, { 0x8B4F, 0xE698 }, { 0x8B56, 0xE69B }, { 0x8B58, 0x8EAF }, { 0x8B5A, 0xE69D }, { 0x8B5B, 0xE69C }, { 0x8B5C, 0x9588 }, 
-	{ 0x8B5F, 0xE69F }, { 0x8B66, 0x8C78 }, { 0x8B6B, 0xE69E }, { 0x8B6C, 0xE6A0 }, { 0x8B6F, 0xE6A1 }, { 0x8B70, 0x8B63 }, { 0x8B71, 0xE3BF }, { 0x8B72, 0x8FF7 }, 
-	{ 0x8B74, 0xE6A2 }, { 0x8B77, 0x8CEC }, { 0x8B7D, 0xE6A3 }, { 0x8B80, 0xE6A4 }, { 0x8B83, 0x8E5D }, { 0x8B8A, 0x9DCC }, { 0x8B8C, 0xE6A5 }, { 0x8B8E, 0xE6A6 }, 
-	{ 0x8B90, 0x8F51 }, { 0x8B92, 0xE6A7 }, { 0x8B93, 0xE6A8 }, { 0x8B96, 0xE6A9 }, { 0x8B99, 0xE6AA }, { 0x8B9A, 0xE6AB }, { 0x8C37, 0x924A }, { 0x8C3A, 0xE6AC }, 
-	{ 0x8C3F, 0xE6AE }, { 0x8C41, 0xE6AD }, { 0x8C46, 0x93A4 }, { 0x8C48, 0xE6AF }, { 0x8C4A, 0x964C }, { 0x8C4C, 0xE6B0 }, { 0x8C4E, 0xE6B1 }, { 0x8C50, 0xE6B2 }, 
-	{ 0x8C55, 0xE6B3 }, { 0x8C5A, 0x93D8 }, { 0x8C61, 0x8FDB }, { 0x8C62, 0xE6B4 }, { 0x8C6A, 0x8D8B }, { 0x8C6B, 0x98AC }, { 0x8C6C, 0xE6B5 }, { 0x8C78, 0xE6B6 }, 
-	{ 0x8C79, 0x955E }, { 0x8C7A, 0xE6B7 }, { 0x8C7C, 0xE6BF }, { 0x8C82, 0xE6B8 }, { 0x8C85, 0xE6BA }, { 0x8C89, 0xE6B9 }, { 0x8C8A, 0xE6BB }, { 0x8C8C, 0x9665 }, 
-	{ 0x8C8D, 0xE6BC }, { 0x8C8E, 0xE6BD }, { 0x8C94, 0xE6BE }, { 0x8C98, 0xE6C0 }, { 0x8C9D, 0x8A4C }, { 0x8C9E, 0x92E5 }, { 0x8CA0, 0x9589 }, { 0x8CA1, 0x8DE0 }, 
-	{ 0x8CA2, 0x8D76 }, { 0x8CA7, 0x956E }, { 0x8CA8, 0x89DD }, { 0x8CA9, 0x94CC }, { 0x8CAA, 0xE6C3 }, { 0x8CAB, 0x8AD1 }, { 0x8CAC, 0x90D3 }, { 0x8CAD, 0xE6C2 }, 
-	{ 0x8CAE, 0xE6C7 }, { 0x8CAF, 0x9299 }, { 0x8CB0, 0x96E1 }, { 0x8CB2, 0xE6C5 }, { 0x8CB3, 0xE6C6 }, { 0x8CB4, 0x8B4D }, { 0x8CB6, 0xE6C8 }, { 0x8CB7, 0x9483 }, 
-	{ 0x8CB8, 0x91DD }, { 0x8CBB, 0x94EF }, { 0x8CBC, 0x935C }, { 0x8CBD, 0xE6C4 }, { 0x8CBF, 0x9666 }, { 0x8CC0, 0x89EA }, { 0x8CC1, 0xE6CA }, { 0x8CC2, 0x9847 }, 
-	{ 0x8CC3, 0x92C0 }, { 0x8CC4, 0x9864 }, { 0x8CC7, 0x8E91 }, { 0x8CC8, 0xE6C9 }, { 0x8CCA, 0x91AF }, { 0x8CCD, 0xE6DA }, { 0x8CCE, 0x9147 }, { 0x8CD1, 0x93F6 }, 
-	{ 0x8CD3, 0x956F }, { 0x8CDA, 0xE6CD }, { 0x8CDB, 0x8E5E }, { 0x8CDC, 0x8E92 }, { 0x8CDE, 0x8FDC }, { 0x8CE0, 0x9485 }, { 0x8CE2, 0x8CAB }, { 0x8CE3, 0xE6CC }, 
-	{ 0x8CE4, 0xE6CB }, { 0x8CE6, 0x958A }, { 0x8CEA, 0x8EBF }, { 0x8CED, 0x9371 }, { 0x8CFA, 0xE6CF }, { 0x8CFB, 0xE6D0 }, { 0x8CFC, 0x8D77 }, { 0x8CFD, 0xE6CE }, 
-	{ 0x8D04, 0xE6D1 }, { 0x8D05, 0xE6D2 }, { 0x8D07, 0xE6D4 }, { 0x8D08, 0x91A1 }, { 0x8D0A, 0xE6D3 }, { 0x8D0B, 0x8AE4 }, { 0x8D0D, 0xE6D6 }, { 0x8D0F, 0xE6D5 }, 
-	{ 0x8D10, 0xE6D7 }, { 0x8D13, 0xE6D9 }, { 0x8D14, 0xE6DB }, { 0x8D16, 0xE6DC }, { 0x8D64, 0x90D4 }, { 0x8D66, 0x8ECD }, { 0x8D67, 0xE6DD }, { 0x8D6B, 0x8A71 }, 
-	{ 0x8D6D, 0xE6DE }, { 0x8D70, 0x9196 }, { 0x8D71, 0xE6DF }, { 0x8D73, 0xE6E0 }, { 0x8D74, 0x958B }, { 0x8D77, 0x8B4E }, { 0x8D81, 0xE6E1 }, { 0x8D85, 0x92B4 }, 
-	{ 0x8D8A, 0x897A }, { 0x8D99, 0xE6E2 }, { 0x8DA3, 0x8EEF }, { 0x8DA8, 0x9096 }, { 0x8DB3, 0x91AB }, { 0x8DBA, 0xE6E5 }, { 0x8DBE, 0xE6E4 }, { 0x8DC2, 0xE6E3 }, 
-	{ 0x8DCB, 0xE6EB }, { 0x8DCC, 0xE6E9 }, { 0x8DCF, 0xE6E6 }, { 0x8DD6, 0xE6E8 }, { 0x8DDA, 0xE6E7 }, { 0x8DDB, 0xE6EA }, { 0x8DDD, 0x8B97 }, { 0x8DDF, 0xE6EE }, 
-	{ 0x8DE1, 0x90D5 }, { 0x8DE3, 0xE6EF }, { 0x8DE8, 0x8CD7 }, { 0x8DEA, 0xE6EC }, { 0x8DEB, 0xE6ED }, { 0x8DEF, 0x9848 }, { 0x8DF3, 0x92B5 }, { 0x8DF5, 0x9148 }, 
-	{ 0x8DFC, 0xE6F0 }, { 0x8DFF, 0xE6F3 }, { 0x8E08, 0xE6F1 }, { 0x8E09, 0xE6F2 }, { 0x8E0A, 0x9778 }, { 0x8E0F, 0x93A5 }, { 0x8E10, 0xE6F6 }, { 0x8E1D, 0xE6F4 }, 
-	{ 0x8E1E, 0xE6F5 }, { 0x8E1F, 0xE6F7 }, { 0x8E2A, 0xE748 }, { 0x8E30, 0xE6FA }, { 0x8E34, 0xE6FB }, { 0x8E35, 0xE6F9 }, { 0x8E42, 0xE6F8 }, { 0x8E44, 0x92FB }, 
-	{ 0x8E47, 0xE740 }, { 0x8E48, 0xE744 }, { 0x8E49, 0xE741 }, { 0x8E4A, 0xE6FC }, { 0x8E4C, 0xE742 }, { 0x8E50, 0xE743 }, { 0x8E55, 0xE74A }, { 0x8E59, 0xE745 }, 
-	{ 0x8E5F, 0x90D6 }, { 0x8E60, 0xE747 }, { 0x8E63, 0xE749 }, { 0x8E64, 0xE746 }, { 0x8E72, 0xE74C }, { 0x8E74, 0x8F52 }, { 0x8E76, 0xE74B }, { 0x8E7C, 0xE74D }, 
-	{ 0x8E81, 0xE74E }, { 0x8E84, 0xE751 }, { 0x8E85, 0xE750 }, { 0x8E87, 0xE74F }, { 0x8E8A, 0xE753 }, { 0x8E8B, 0xE752 }, { 0x8E8D, 0x96F4 }, { 0x8E91, 0xE755 }, 
-	{ 0x8E93, 0xE754 }, { 0x8E94, 0xE756 }, { 0x8E99, 0xE757 }, { 0x8EA1, 0xE759 }, { 0x8EAA, 0xE758 }, { 0x8EAB, 0x9067 }, { 0x8EAC, 0xE75A }, { 0x8EAF, 0x8BEB }, 
-	{ 0x8EB0, 0xE75B }, { 0x8EB1, 0xE75D }, { 0x8EBE, 0xE75E }, { 0x8EC5, 0xE75F }, { 0x8EC6, 0xE75C }, { 0x8EC8, 0xE760 }, { 0x8ECA, 0x8ED4 }, { 0x8ECB, 0xE761 }, 
-	{ 0x8ECC, 0x8B4F }, { 0x8ECD, 0x8C52 }, { 0x8ED2, 0x8CAC }, { 0x8EDB, 0xE762 }, { 0x8EDF, 0x93EE }, { 0x8EE2, 0x935D }, { 0x8EE3, 0xE763 }, { 0x8EEB, 0xE766 }, 
-	{ 0x8EF8, 0x8EB2 }, { 0x8EFB, 0xE765 }, { 0x8EFC, 0xE764 }, { 0x8EFD, 0x8C79 }, { 0x8EFE, 0xE767 }, { 0x8F03, 0x8A72 }, { 0x8F05, 0xE769 }, { 0x8F09, 0x8DDA }, 
-	{ 0x8F0A, 0xE768 }, { 0x8F0C, 0xE771 }, { 0x8F12, 0xE76B }, { 0x8F13, 0xE76D }, { 0x8F14, 0x95E3 }, { 0x8F15, 0xE76A }, { 0x8F19, 0xE76C }, { 0x8F1B, 0xE770 }, 
-	{ 0x8F1C, 0xE76E }, { 0x8F1D, 0x8B50 }, { 0x8F1F, 0xE76F }, { 0x8F26, 0xE772 }, { 0x8F29, 0x9479 }, { 0x8F2A, 0x97D6 }, { 0x8F2F, 0x8F53 }, { 0x8F33, 0xE773 }, 
-	{ 0x8F38, 0x9741 }, { 0x8F39, 0xE775 }, { 0x8F3B, 0xE774 }, { 0x8F3E, 0xE778 }, { 0x8F3F, 0x9760 }, { 0x8F42, 0xE777 }, { 0x8F44, 0x8A8D }, { 0x8F45, 0xE776 }, 
-	{ 0x8F46, 0xE77B }, { 0x8F49, 0xE77A }, { 0x8F4C, 0xE779 }, { 0x8F4D, 0x9351 }, { 0x8F4E, 0xE77C }, { 0x8F57, 0xE77D }, { 0x8F5C, 0xE77E }, { 0x8F5F, 0x8D8C }, 
-	{ 0x8F61, 0x8C44 }, { 0x8F62, 0xE780 }, { 0x8F63, 0xE781 }, { 0x8F64, 0xE782 }, { 0x8F9B, 0x9068 }, { 0x8F9C, 0xE783 }, { 0x8F9E, 0x8EAB }, { 0x8F9F, 0xE784 }, 
-	{ 0x8FA3, 0xE785 }, { 0x8FA7, 0x999F }, { 0x8FA8, 0x999E }, { 0x8FAD, 0xE786 }, { 0x8FAE, 0xE390 }, { 0x8FAF, 0xE787 }, { 0x8FB0, 0x9243 }, { 0x8FB1, 0x904A }, 
-	{ 0x8FB2, 0x945F }, { 0x8FB7, 0xE788 }, { 0x8FBA, 0x95D3 }, { 0x8FBB, 0x92D2 }, { 0x8FBC, 0x8D9E }, { 0x8FBF, 0x9248 }, { 0x8FC2, 0x8949 }, { 0x8FC4, 0x9698 }, 
-	{ 0x8FC5, 0x9076 }, { 0x8FCE, 0x8C7D }, { 0x8FD1, 0x8BDF }, { 0x8FD4, 0x95D4 }, { 0x8FDA, 0xE789 }, { 0x8FE2, 0xE78B }, { 0x8FE5, 0xE78A }, { 0x8FE6, 0x89DE }, 
-	{ 0x8FE9, 0x93F4 }, { 0x8FEA, 0xE78C }, { 0x8FEB, 0x9497 }, { 0x8FED, 0x9352 }, { 0x8FEF, 0xE78D }, { 0x8FF0, 0x8F71 }, { 0x8FF4, 0xE78F }, { 0x8FF7, 0x96C0 }, 
-	{ 0x8FF8, 0xE79E }, { 0x8FF9, 0xE791 }, { 0x8FFA, 0xE792 }, { 0x8FFD, 0x92C7 }, { 0x9000, 0x91DE }, { 0x9001, 0x9197 }, { 0x9003, 0x93A6 }, { 0x9005, 0xE790 }, 
-	{ 0x9006, 0x8B74 }, { 0x900B, 0xE799 }, { 0x900D, 0xE796 }, { 0x900E, 0xE7A3 }, { 0x900F, 0x93A7 }, { 0x9010, 0x9280 }, { 0x9011, 0xE793 }, { 0x9013, 0x92FC }, 
-	{ 0x9014, 0x9372 }, { 0x9015, 0xE794 }, { 0x9016, 0xE798 }, { 0x9017, 0x9080 }, { 0x9019, 0x9487 }, { 0x901A, 0x92CA }, { 0x901D, 0x90C0 }, { 0x901E, 0xE797 }, 
-	{ 0x901F, 0x91AC }, { 0x9020, 0x91A2 }, { 0x9021, 0xE795 }, { 0x9022, 0x88A7 }, { 0x9023, 0x9841 }, { 0x9027, 0xE79A }, { 0x902E, 0x91DF }, { 0x9031, 0x8F54 }, 
-	{ 0x9032, 0x9069 }, { 0x9035, 0xE79C }, { 0x9036, 0xE79B }, { 0x9038, 0x88ED }, { 0x9039, 0xE79D }, { 0x903C, 0x954E }, { 0x903E, 0xE7A5 }, { 0x9041, 0x93D9 }, 
-	{ 0x9042, 0x908B }, { 0x9045, 0x9278 }, { 0x9047, 0x8BF6 }, { 0x9049, 0xE7A4 }, { 0x904A, 0x9756 }, { 0x904B, 0x895E }, { 0x904D, 0x95D5 }, { 0x904E, 0x89DF }, 
-	{ 0x904F, 0xE79F }, { 0x9050, 0xE7A0 }, { 0x9051, 0xE7A1 }, { 0x9052, 0xE7A2 }, { 0x9053, 0x93B9 }, { 0x9054, 0x9242 }, { 0x9055, 0x88E1 }, { 0x9056, 0xE7A6 }, 
-	{ 0x9058, 0xE7A7 }, { 0x9059, 0xEAA1 }, { 0x905C, 0x91BB }, { 0x905E, 0xE7A8 }, { 0x9060, 0x8993 }, { 0x9061, 0x916B }, { 0x9063, 0x8CAD }, { 0x9065, 0x9779 }, 
-	{ 0x9068, 0xE7A9 }, { 0x9069, 0x934B }, { 0x906D, 0x9198 }, { 0x906E, 0x8ED5 }, { 0x906F, 0xE7AA }, { 0x9072, 0xE7AD }, { 0x9075, 0x8F85 }, { 0x9076, 0xE7AB }, 
-	{ 0x9077, 0x914A }, { 0x9078, 0x9149 }, { 0x907A, 0x88E2 }, { 0x907C, 0x97C9 }, { 0x907D, 0xE7AF }, { 0x907F, 0x94F0 }, { 0x9080, 0xE7B1 }, { 0x9081, 0xE7B0 }, 
-	{ 0x9082, 0xE7AE }, { 0x9083, 0xE284 }, { 0x9084, 0x8AD2 }, { 0x9087, 0xE78E }, { 0x9089, 0xE7B3 }, { 0x908A, 0xE7B2 }, { 0x908F, 0xE7B4 }, { 0x9091, 0x9757 }, 
-	{ 0x90A3, 0x93DF }, { 0x90A6, 0x964D }, { 0x90A8, 0xE7B5 }, { 0x90AA, 0x8ED7 }, { 0x90AF, 0xE7B6 }, { 0x90B1, 0xE7B7 }, { 0x90B5, 0xE7B8 }, { 0x90B8, 0x9340 }, 
-	{ 0x90C1, 0x88E8 }, { 0x90CA, 0x8D78 }, { 0x90CE, 0x9859 }, { 0x90DB, 0xE7BC }, { 0x90E1, 0x8C53 }, { 0x90E2, 0xE7B9 }, { 0x90E4, 0xE7BA }, { 0x90E8, 0x9594 }, 
-	{ 0x90ED, 0x8A73 }, { 0x90F5, 0x9758 }, { 0x90F7, 0x8BBD }, { 0x90FD, 0x9373 }, { 0x9102, 0xE7BD }, { 0x9112, 0xE7BE }, { 0x9119, 0xE7BF }, { 0x912D, 0x9341 }, 
-	{ 0x9130, 0xE7C1 }, { 0x9132, 0xE7C0 }, { 0x9149, 0x93D1 }, { 0x914A, 0xE7C2 }, { 0x914B, 0x8F55 }, { 0x914C, 0x8EDE }, { 0x914D, 0x947A }, { 0x914E, 0x9291 }, 
-	{ 0x9152, 0x8EF0 }, { 0x9154, 0x908C }, { 0x9156, 0xE7C3 }, { 0x9158, 0xE7C4 }, { 0x9162, 0x907C }, { 0x9163, 0xE7C5 }, { 0x9165, 0xE7C6 }, { 0x9169, 0xE7C7 }, 
-	{ 0x916A, 0x978F }, { 0x916C, 0x8F56 }, { 0x9172, 0xE7C9 }, { 0x9173, 0xE7C8 }, { 0x9175, 0x8D79 }, { 0x9177, 0x8D93 }, { 0x9178, 0x8E5F }, { 0x9182, 0xE7CC }, 
-	{ 0x9187, 0x8F86 }, { 0x9189, 0xE7CB }, { 0x918B, 0xE7CA }, { 0x918D, 0x91E7 }, { 0x9190, 0x8CED }, { 0x9192, 0x90C1 }, { 0x9197, 0x94AE }, { 0x919C, 0x8F58 }, 
-	{ 0x91A2, 0xE7CD }, { 0x91A4, 0x8FDD }, { 0x91AA, 0xE7D0 }, { 0x91AB, 0xE7CE }, { 0x91AF, 0xE7CF }, { 0x91B4, 0xE7D2 }, { 0x91B5, 0xE7D1 }, { 0x91B8, 0x8FF8 }, 
-	{ 0x91BA, 0xE7D3 }, { 0x91C0, 0xE7D4 }, { 0x91C1, 0xE7D5 }, { 0x91C6, 0x94CE }, { 0x91C7, 0x8DD1 }, { 0x91C8, 0x8EDF }, { 0x91C9, 0xE7D6 }, { 0x91CB, 0xE7D7 }, 
-	{ 0x91CC, 0x97A2 }, { 0x91CD, 0x8F64 }, { 0x91CE, 0x96EC }, { 0x91CF, 0x97CA }, { 0x91D0, 0xE7D8 }, { 0x91D1, 0x8BE0 }, { 0x91D6, 0xE7D9 }, { 0x91D8, 0x9342 }, 
-	{ 0x91DB, 0xE7DC }, { 0x91DC, 0x8A98 }, { 0x91DD, 0x906A }, { 0x91DF, 0xE7DA }, { 0x91E1, 0xE7DB }, { 0x91E3, 0x92DE }, { 0x91E6, 0x9674 }, { 0x91E7, 0x8BFA }, 
-	{ 0x91F5, 0xE7DE }, { 0x91F6, 0xE7DF }, { 0x91FC, 0xE7DD }, { 0x91FF, 0xE7E1 }, { 0x920D, 0x93DD }, { 0x920E, 0x8A62 }, { 0x9211, 0xE7E5 }, { 0x9214, 0xE7E2 }, 
-	{ 0x9215, 0xE7E4 }, { 0x921E, 0xE7E0 }, { 0x9229, 0xE86E }, { 0x922C, 0xE7E3 }, { 0x9234, 0x97E9 }, { 0x9237, 0x8CD8 }, { 0x923F, 0xE7ED }, { 0x9244, 0x9353 }, 
-	{ 0x9245, 0xE7E8 }, { 0x9248, 0xE7EB }, { 0x9249, 0xE7E9 }, { 0x924B, 0xE7EE }, { 0x9250, 0xE7EF }, { 0x9257, 0xE7E7 }, { 0x925A, 0xE7F4 }, { 0x925B, 0x8994 }, 
-	{ 0x925E, 0xE7E6 }, { 0x9262, 0x94AB }, { 0x9264, 0xE7EA }, { 0x9266, 0x8FDE }, { 0x9271, 0x8D7A }, { 0x927E, 0x9667 }, { 0x9280, 0x8BE2 }, { 0x9283, 0x8F65 }, 
-	{ 0x9285, 0x93BA }, { 0x9291, 0x914C }, { 0x9293, 0xE7F2 }, { 0x9295, 0xE7EC }, { 0x9296, 0xE7F1 }, { 0x9298, 0x96C1 }, { 0x929A, 0x92B6 }, { 0x929B, 0xE7F3 }, 
-	{ 0x929C, 0xE7F0 }, { 0x92AD, 0x914B }, { 0x92B7, 0xE7F7 }, { 0x92B9, 0xE7F6 }, { 0x92CF, 0xE7F5 }, { 0x92D2, 0x964E }, { 0x92E4, 0x8F9B }, { 0x92E9, 0xE7F8 }, 
-	{ 0x92EA, 0x95DD }, { 0x92ED, 0x8973 }, { 0x92F2, 0x9565 }, { 0x92F3, 0x9292 }, { 0x92F8, 0x8B98 }, { 0x92FA, 0xE7FA }, { 0x92FC, 0x8D7C }, { 0x9306, 0x8E4B }, 
-	{ 0x930F, 0xE7F9 }, { 0x9310, 0x908D }, { 0x9318, 0x908E }, { 0x9319, 0xE840 }, { 0x931A, 0xE842 }, { 0x9320, 0x8FF9 }, { 0x9322, 0xE841 }, { 0x9323, 0xE843 }, 
-	{ 0x9326, 0x8BD1 }, { 0x9328, 0x9564 }, { 0x932B, 0x8EE0 }, { 0x932C, 0x9842 }, { 0x932E, 0xE7FC }, { 0x932F, 0x8DF6 }, { 0x9332, 0x985E }, { 0x9335, 0xE845 }, 
-	{ 0x933A, 0xE844 }, { 0x933B, 0xE846 }, { 0x9344, 0xE7FB }, { 0x934B, 0x93E7 }, { 0x934D, 0x9374 }, { 0x9354, 0x92D5 }, { 0x9356, 0xE84B }, { 0x935B, 0x9262 }, 
-	{ 0x935C, 0xE847 }, { 0x9360, 0xE848 }, { 0x936C, 0x8C4C }, { 0x936E, 0xE84A }, { 0x9375, 0x8CAE }, { 0x937C, 0xE849 }, { 0x937E, 0x8FDF }, { 0x938C, 0x8A99 }, 
-	{ 0x9394, 0xE84F }, { 0x9396, 0x8DBD }, { 0x9397, 0x9199 }, { 0x939A, 0x92C8 }, { 0x93A7, 0x8A5A }, { 0x93AC, 0xE84D }, { 0x93AD, 0xE84E }, { 0x93AE, 0x92C1 }, 
-	{ 0x93B0, 0xE84C }, { 0x93B9, 0xE850 }, { 0x93C3, 0xE856 }, { 0x93C8, 0xE859 }, { 0x93D0, 0xE858 }, { 0x93D1, 0x934C }, { 0x93D6, 0xE851 }, { 0x93D7, 0xE852 }, 
-	{ 0x93D8, 0xE855 }, { 0x93DD, 0xE857 }, { 0x93E1, 0x8BBE }, { 0x93E4, 0xE85A }, { 0x93E5, 0xE854 }, { 0x93E8, 0xE853 }, { 0x9403, 0xE85E }, { 0x9407, 0xE85F }, 
-	{ 0x9410, 0xE860 }, { 0x9413, 0xE85D }, { 0x9414, 0xE85C }, { 0x9418, 0x8FE0 }, { 0x9419, 0x93A8 }, { 0x941A, 0xE85B }, { 0x9421, 0xE864 }, { 0x942B, 0xE862 }, 
-	{ 0x9435, 0xE863 }, { 0x9436, 0xE861 }, { 0x9438, 0x91F6 }, { 0x943A, 0xE865 }, { 0x9441, 0xE866 }, { 0x9444, 0xE868 }, { 0x9451, 0x8AD3 }, { 0x9452, 0xE867 }, 
-	{ 0x9453, 0x96F8 }, { 0x945A, 0xE873 }, { 0x945B, 0xE869 }, { 0x945E, 0xE86C }, { 0x9460, 0xE86A }, { 0x9462, 0xE86B }, { 0x946A, 0xE86D }, { 0x9470, 0xE86F }, 
-	{ 0x9475, 0xE870 }, { 0x9477, 0xE871 }, { 0x947C, 0xE874 }, { 0x947D, 0xE872 }, { 0x947E, 0xE875 }, { 0x947F, 0xE877 }, { 0x9481, 0xE876 }, { 0x9577, 0x92B7 }, 
-	{ 0x9580, 0x96E5 }, { 0x9582, 0xE878 }, { 0x9583, 0x914D }, { 0x9587, 0xE879 }, { 0x9589, 0x95C2 }, { 0x958A, 0xE87A }, { 0x958B, 0x8A4A }, { 0x958F, 0x895B }, 
-	{ 0x9591, 0x8AD5 }, { 0x9593, 0x8AD4 }, { 0x9594, 0xE87B }, { 0x9596, 0xE87C }, { 0x9598, 0xE87D }, { 0x9599, 0xE87E }, { 0x95A0, 0xE880 }, { 0x95A2, 0x8AD6 }, 
-	{ 0x95A3, 0x8A74 }, { 0x95A4, 0x8D7D }, { 0x95A5, 0x94B4 }, { 0x95A7, 0xE882 }, { 0x95A8, 0xE881 }, { 0x95AD, 0xE883 }, { 0x95B2, 0x897B }, { 0x95B9, 0xE886 }, 
-	{ 0x95BB, 0xE885 }, { 0x95BC, 0xE884 }, { 0x95BE, 0xE887 }, { 0x95C3, 0xE88A }, { 0x95C7, 0x88C5 }, { 0x95CA, 0xE888 }, { 0x95CC, 0xE88C }, { 0x95CD, 0xE88B }, 
-	{ 0x95D4, 0xE88E }, { 0x95D5, 0xE88D }, { 0x95D6, 0xE88F }, { 0x95D8, 0x93AC }, { 0x95DC, 0xE890 }, { 0x95E1, 0xE891 }, { 0x95E2, 0xE893 }, { 0x95E5, 0xE892 }, 
-	{ 0x961C, 0x958C }, { 0x9621, 0xE894 }, { 0x9628, 0xE895 }, { 0x962A, 0x8DE3 }, { 0x962E, 0xE896 }, { 0x962F, 0xE897 }, { 0x9632, 0x9668 }, { 0x963B, 0x916A }, 
-	{ 0x963F, 0x88A2 }, { 0x9640, 0x91C9 }, { 0x9642, 0xE898 }, { 0x9644, 0x958D }, { 0x964B, 0xE89B }, { 0x964C, 0xE899 }, { 0x964D, 0x8D7E }, { 0x964F, 0xE89A }, 
-	{ 0x9650, 0x8CC0 }, { 0x965B, 0x95C3 }, { 0x965C, 0xE89D }, { 0x965D, 0xE89F }, { 0x965E, 0xE89E }, { 0x965F, 0xE8A0 }, { 0x9662, 0x8940 }, { 0x9663, 0x9077 }, 
-	{ 0x9664, 0x8F9C }, { 0x9665, 0x8AD7 }, { 0x9666, 0xE8A1 }, { 0x966A, 0x9486 }, { 0x966C, 0xE8A3 }, { 0x9670, 0x8941 }, { 0x9672, 0xE8A2 }, { 0x9673, 0x92C2 }, 
-	{ 0x9675, 0x97CB }, { 0x9676, 0x93A9 }, { 0x9677, 0xE89C }, { 0x9678, 0x97A4 }, { 0x967A, 0x8CAF }, { 0x967D, 0x977A }, { 0x9685, 0x8BF7 }, { 0x9686, 0x97B2 }, 
-	{ 0x9688, 0x8C47 }, { 0x968A, 0x91E0 }, { 0x968B, 0xE440 }, { 0x968D, 0xE8A4 }, { 0x968E, 0x8A4B }, { 0x968F, 0x908F }, { 0x9694, 0x8A75 }, { 0x9695, 0xE8A6 }, 
-	{ 0x9697, 0xE8A7 }, { 0x9698, 0xE8A5 }, { 0x9699, 0x8C84 }, { 0x969B, 0x8DDB }, { 0x969C, 0x8FE1 }, { 0x96A0, 0x8942 }, { 0x96A3, 0x97D7 }, { 0x96A7, 0xE8A9 }, 
-	{ 0x96A8, 0xE7AC }, { 0x96AA, 0xE8A8 }, { 0x96B0, 0xE8AC }, { 0x96B1, 0xE8AA }, { 0x96B2, 0xE8AB }, { 0x96B4, 0xE8AD }, { 0x96B6, 0xE8AE }, { 0x96B7, 0x97EA }, 
-	{ 0x96B8, 0xE8AF }, { 0x96B9, 0xE8B0 }, { 0x96BB, 0x90C7 }, { 0x96BC, 0x94B9 }, { 0x96C0, 0x909D }, { 0x96C1, 0x8AE5 }, { 0x96C4, 0x9759 }, { 0x96C5, 0x89EB }, 
-	{ 0x96C6, 0x8F57 }, { 0x96C7, 0x8CD9 }, { 0x96C9, 0xE8B3 }, { 0x96CB, 0xE8B2 }, { 0x96CC, 0x8E93 }, { 0x96CD, 0xE8B4 }, { 0x96CE, 0xE8B1 }, { 0x96D1, 0x8E47 }, 
-	{ 0x96D5, 0xE8B8 }, { 0x96D6, 0xE5AB }, { 0x96D9, 0x99D4 }, { 0x96DB, 0x9097 }, { 0x96DC, 0xE8B6 }, { 0x96E2, 0x97A3 }, { 0x96E3, 0x93EF }, { 0x96E8, 0x894A }, 
-	{ 0x96EA, 0x90E1 }, { 0x96EB, 0x8EB4 }, { 0x96F0, 0x95B5 }, { 0x96F2, 0x895F }, { 0x96F6, 0x97EB }, { 0x96F7, 0x978B }, { 0x96F9, 0xE8B9 }, { 0x96FB, 0x9364 }, 
-	{ 0x9700, 0x8EF9 }, { 0x9704, 0xE8BA }, { 0x9706, 0xE8BB }, { 0x9707, 0x906B }, { 0x9708, 0xE8BC }, { 0x970A, 0x97EC }, { 0x970D, 0xE8B7 }, { 0x970E, 0xE8BE }, 
-	{ 0x970F, 0xE8C0 }, { 0x9711, 0xE8BF }, { 0x9713, 0xE8BD }, { 0x9716, 0xE8C1 }, { 0x9719, 0xE8C2 }, { 0x971C, 0x919A }, { 0x971E, 0x89E0 }, { 0x9724, 0xE8C3 }, 
-	{ 0x9727, 0x96B6 }, { 0x972A, 0xE8C4 }, { 0x9730, 0xE8C5 }, { 0x9732, 0x9849 }, { 0x9738, 0x9E50 }, { 0x9739, 0xE8C6 }, { 0x973D, 0xE8C7 }, { 0x973E, 0xE8C8 }, 
-	{ 0x9742, 0xE8CC }, { 0x9744, 0xE8C9 }, { 0x9746, 0xE8CA }, { 0x9748, 0xE8CB }, { 0x9749, 0xE8CD }, { 0x9752, 0x90C2 }, { 0x9756, 0x96F5 }, { 0x9759, 0x90C3 }, 
-	{ 0x975C, 0xE8CE }, { 0x975E, 0x94F1 }, { 0x9760, 0xE8CF }, { 0x9761, 0xEA72 }, { 0x9762, 0x96CA }, { 0x9764, 0xE8D0 }, { 0x9766, 0xE8D1 }, { 0x9768, 0xE8D2 }, 
-	{ 0x9769, 0x8A76 }, { 0x976B, 0xE8D4 }, { 0x976D, 0x9078 }, { 0x9771, 0xE8D5 }, { 0x9774, 0x8C43 }, { 0x9779, 0xE8D6 }, { 0x977A, 0xE8DA }, { 0x977C, 0xE8D8 }, 
-	{ 0x9781, 0xE8D9 }, { 0x9784, 0x8A93 }, { 0x9785, 0xE8D7 }, { 0x9786, 0xE8DB }, { 0x978B, 0xE8DC }, { 0x978D, 0x88C6 }, { 0x978F, 0xE8DD }, { 0x9790, 0xE8DE }, 
-	{ 0x9798, 0x8FE2 }, { 0x979C, 0xE8DF }, { 0x97A0, 0x8B66 }, { 0x97A3, 0xE8E2 }, { 0x97A6, 0xE8E1 }, { 0x97A8, 0xE8E0 }, { 0x97AB, 0xE691 }, { 0x97AD, 0x95DA }, 
-	{ 0x97B3, 0xE8E3 }, { 0x97B4, 0xE8E4 }, { 0x97C3, 0xE8E5 }, { 0x97C6, 0xE8E6 }, { 0x97C8, 0xE8E7 }, { 0x97CB, 0xE8E8 }, { 0x97D3, 0x8AD8 }, { 0x97DC, 0xE8E9 }, 
-	{ 0x97ED, 0xE8EA }, { 0x97EE, 0x9442 }, { 0x97F2, 0xE8EC }, { 0x97F3, 0x89B9 }, { 0x97F5, 0xE8EF }, { 0x97F6, 0xE8EE }, { 0x97FB, 0x8943 }, { 0x97FF, 0x8BBF }, 
-	{ 0x9801, 0x95C5 }, { 0x9802, 0x92B8 }, { 0x9803, 0x8DA0 }, { 0x9805, 0x8D80 }, { 0x9806, 0x8F87 }, { 0x9808, 0x907B }, { 0x980C, 0xE8F1 }, { 0x980F, 0xE8F0 }, 
-	{ 0x9810, 0x9761 }, { 0x9811, 0x8AE6 }, { 0x9812, 0x94D0 }, { 0x9813, 0x93DA }, { 0x9817, 0x909C }, { 0x9818, 0x97CC }, { 0x981A, 0x8C7A }, { 0x9821, 0xE8F4 }, 
-	{ 0x9824, 0xE8F3 }, { 0x982C, 0x966A }, { 0x982D, 0x93AA }, { 0x9834, 0x896F }, { 0x9837, 0xE8F5 }, { 0x9838, 0xE8F2 }, { 0x983B, 0x9570 }, { 0x983C, 0x978A }, 
-	{ 0x983D, 0xE8F6 }, { 0x9846, 0xE8F7 }, { 0x984B, 0xE8F9 }, { 0x984C, 0x91E8 }, { 0x984D, 0x8A7A }, { 0x984E, 0x8A7B }, { 0x984F, 0xE8F8 }, { 0x9854, 0x8AE7 }, 
-	{ 0x9855, 0x8CB0 }, { 0x9858, 0x8AE8 }, { 0x985B, 0x935E }, { 0x985E, 0x97DE }, { 0x9867, 0x8CDA }, { 0x986B, 0xE8FA }, { 0x986F, 0xE8FB }, { 0x9870, 0xE8FC }, 
-	{ 0x9871, 0xE940 }, { 0x9873, 0xE942 }, { 0x9874, 0xE941 }, { 0x98A8, 0x9597 }, { 0x98AA, 0xE943 }, { 0x98AF, 0xE944 }, { 0x98B1, 0xE945 }, { 0x98B6, 0xE946 }, 
-	{ 0x98C3, 0xE948 }, { 0x98C4, 0xE947 }, { 0x98C6, 0xE949 }, { 0x98DB, 0x94F2 }, { 0x98DC, 0xE3CA }, { 0x98DF, 0x9048 }, { 0x98E2, 0x8B51 }, { 0x98E9, 0xE94A }, 
-	{ 0x98EB, 0xE94B }, { 0x98ED, 0x99AA }, { 0x98EE, 0x9F5A }, { 0x98EF, 0x94D1 }, { 0x98F2, 0x88F9 }, { 0x98F4, 0x88B9 }, { 0x98FC, 0x8E94 }, { 0x98FD, 0x964F }, 
-	{ 0x98FE, 0x8FFC }, { 0x9903, 0xE94C }, { 0x9905, 0x96DD }, { 0x9909, 0xE94D }, { 0x990A, 0x977B }, { 0x990C, 0x8961 }, { 0x9910, 0x8E60 }, { 0x9912, 0xE94E }, 
-	{ 0x9913, 0x89EC }, { 0x9914, 0xE94F }, { 0x9918, 0xE950 }, { 0x991D, 0xE952 }, { 0x991E, 0xE953 }, { 0x9920, 0xE955 }, { 0x9921, 0xE951 }, { 0x9924, 0xE954 }, 
-	{ 0x9928, 0x8AD9 }, { 0x992C, 0xE956 }, { 0x992E, 0xE957 }, { 0x993D, 0xE958 }, { 0x993E, 0xE959 }, { 0x9942, 0xE95A }, { 0x9945, 0xE95C }, { 0x9949, 0xE95B }, 
-	{ 0x994B, 0xE95E }, { 0x994C, 0xE961 }, { 0x9950, 0xE95D }, { 0x9951, 0xE95F }, { 0x9952, 0xE960 }, { 0x9955, 0xE962 }, { 0x9957, 0x8BC0 }, { 0x9996, 0x8EF1 }, 
-	{ 0x9997, 0xE963 }, { 0x9998, 0xE964 }, { 0x9999, 0x8D81 }, { 0x99A5, 0xE965 }, { 0x99A8, 0x8A5D }, { 0x99AC, 0x946E }, { 0x99AD, 0xE966 }, { 0x99AE, 0xE967 }, 
-	{ 0x99B3, 0x9279 }, { 0x99B4, 0x93E9 }, { 0x99BC, 0xE968 }, { 0x99C1, 0x949D }, { 0x99C4, 0x91CA }, { 0x99C5, 0x8977 }, { 0x99C6, 0x8BEC }, { 0x99C8, 0x8BED }, 
-	{ 0x99D0, 0x9293 }, { 0x99D1, 0xE96D }, { 0x99D2, 0x8BEE }, { 0x99D5, 0x89ED }, { 0x99D8, 0xE96C }, { 0x99DB, 0xE96A }, { 0x99DD, 0xE96B }, { 0x99DF, 0xE969 }, 
-	{ 0x99E2, 0xE977 }, { 0x99ED, 0xE96E }, { 0x99EE, 0xE96F }, { 0x99F1, 0xE970 }, { 0x99F2, 0xE971 }, { 0x99F8, 0xE973 }, { 0x99FB, 0xE972 }, { 0x99FF, 0x8F78 }, 
-	{ 0x9A01, 0xE974 }, { 0x9A05, 0xE976 }, { 0x9A0E, 0x8B52 }, { 0x9A0F, 0xE975 }, { 0x9A12, 0x919B }, { 0x9A13, 0x8CB1 }, { 0x9A19, 0xE978 }, { 0x9A28, 0x91CB }, 
-	{ 0x9A2B, 0xE979 }, { 0x9A30, 0x93AB }, { 0x9A37, 0xE97A }, { 0x9A3E, 0xE980 }, { 0x9A40, 0xE97D }, { 0x9A42, 0xE97C }, { 0x9A43, 0xE97E }, { 0x9A45, 0xE97B }, 
-	{ 0x9A4D, 0xE982 }, { 0x9A55, 0xE981 }, { 0x9A57, 0xE984 }, { 0x9A5A, 0x8BC1 }, { 0x9A5B, 0xE983 }, { 0x9A5F, 0xE985 }, { 0x9A62, 0xE986 }, { 0x9A64, 0xE988 }, 
-	{ 0x9A65, 0xE987 }, { 0x9A69, 0xE989 }, { 0x9A6A, 0xE98B }, { 0x9A6B, 0xE98A }, { 0x9AA8, 0x8D9C }, { 0x9AAD, 0xE98C }, { 0x9AB0, 0xE98D }, { 0x9AB8, 0x8A5B }, 
-	{ 0x9ABC, 0xE98E }, { 0x9AC0, 0xE98F }, { 0x9AC4, 0x9091 }, { 0x9ACF, 0xE990 }, { 0x9AD1, 0xE991 }, { 0x9AD3, 0xE992 }, { 0x9AD4, 0xE993 }, { 0x9AD8, 0x8D82 }, 
-	{ 0x9ADE, 0xE994 }, { 0x9ADF, 0xE995 }, { 0x9AE2, 0xE996 }, { 0x9AE3, 0xE997 }, { 0x9AE6, 0xE998 }, { 0x9AEA, 0x94AF }, { 0x9AEB, 0xE99A }, { 0x9AED, 0x9545 }, 
-	{ 0x9AEE, 0xE99B }, { 0x9AEF, 0xE999 }, { 0x9AF1, 0xE99D }, { 0x9AF4, 0xE99C }, { 0x9AF7, 0xE99E }, { 0x9AFB, 0xE99F }, { 0x9B06, 0xE9A0 }, { 0x9B18, 0xE9A1 }, 
-	{ 0x9B1A, 0xE9A2 }, { 0x9B1F, 0xE9A3 }, { 0x9B22, 0xE9A4 }, { 0x9B23, 0xE9A5 }, { 0x9B25, 0xE9A6 }, { 0x9B27, 0xE9A7 }, { 0x9B28, 0xE9A8 }, { 0x9B29, 0xE9A9 }, 
-	{ 0x9B2A, 0xE9AA }, { 0x9B2E, 0xE9AB }, { 0x9B2F, 0xE9AC }, { 0x9B31, 0x9F54 }, { 0x9B32, 0xE9AD }, { 0x9B3B, 0xE2F6 }, { 0x9B3C, 0x8B53 }, { 0x9B41, 0x8A40 }, 
-	{ 0x9B42, 0x8DB0 }, { 0x9B43, 0xE9AF }, { 0x9B44, 0xE9AE }, { 0x9B45, 0x96A3 }, { 0x9B4D, 0xE9B1 }, { 0x9B4E, 0xE9B2 }, { 0x9B4F, 0xE9B0 }, { 0x9B51, 0xE9B3 }, 
-	{ 0x9B54, 0x9682 }, { 0x9B58, 0xE9B4 }, { 0x9B5A, 0x8B9B }, { 0x9B6F, 0x9844 }, { 0x9B74, 0xE9B5 }, { 0x9B83, 0xE9B7 }, { 0x9B8E, 0x88BC }, { 0x9B91, 0xE9B8 }, 
-	{ 0x9B92, 0x95A9 }, { 0x9B93, 0xE9B6 }, { 0x9B96, 0xE9B9 }, { 0x9B97, 0xE9BA }, { 0x9B9F, 0xE9BB }, { 0x9BA0, 0xE9BC }, { 0x9BA8, 0xE9BD }, { 0x9BAA, 0x968E }, 
-	{ 0x9BAB, 0x8E4C }, { 0x9BAD, 0x8DF8 }, { 0x9BAE, 0x914E }, { 0x9BB4, 0xE9BE }, { 0x9BB9, 0xE9C1 }, { 0x9BC0, 0xE9BF }, { 0x9BC6, 0xE9C2 }, { 0x9BC9, 0x8CEF }, 
-	{ 0x9BCA, 0xE9C0 }, { 0x9BCF, 0xE9C3 }, { 0x9BD1, 0xE9C4 }, { 0x9BD2, 0xE9C5 }, { 0x9BD4, 0xE9C9 }, { 0x9BD6, 0x8E49 }, { 0x9BDB, 0x91E2 }, { 0x9BE1, 0xE9CA }, 
-	{ 0x9BE2, 0xE9C7 }, { 0x9BE3, 0xE9C6 }, { 0x9BE4, 0xE9C8 }, { 0x9BE8, 0x8C7E }, { 0x9BF0, 0xE9CE }, { 0x9BF1, 0xE9CD }, { 0x9BF2, 0xE9CC }, { 0x9BF5, 0x88B1 }, 
-	{ 0x9C04, 0xE9D8 }, { 0x9C06, 0xE9D4 }, { 0x9C08, 0xE9D5 }, { 0x9C09, 0xE9D1 }, { 0x9C0A, 0xE9D7 }, { 0x9C0C, 0xE9D3 }, { 0x9C0D, 0x8A82 }, { 0x9C10, 0x986B }, 
-	{ 0x9C12, 0xE9D6 }, { 0x9C13, 0xE9D2 }, { 0x9C14, 0xE9D0 }, { 0x9C15, 0xE9CF }, { 0x9C1B, 0xE9DA }, { 0x9C21, 0xE9DD }, { 0x9C24, 0xE9DC }, { 0x9C25, 0xE9DB }, 
-	{ 0x9C2D, 0x9568 }, { 0x9C2E, 0xE9D9 }, { 0x9C2F, 0x88F1 }, { 0x9C30, 0xE9DE }, { 0x9C32, 0xE9E0 }, { 0x9C39, 0x8A8F }, { 0x9C3A, 0xE9CB }, { 0x9C3B, 0x8956 }, 
-	{ 0x9C3E, 0xE9E2 }, { 0x9C46, 0xE9E1 }, { 0x9C47, 0xE9DF }, { 0x9C48, 0x924C }, { 0x9C52, 0x9690 }, { 0x9C57, 0x97D8 }, { 0x9C5A, 0xE9E3 }, { 0x9C60, 0xE9E4 }, 
-	{ 0x9C67, 0xE9E5 }, { 0x9C76, 0xE9E6 }, { 0x9C78, 0xE9E7 }, { 0x9CE5, 0x92B9 }, { 0x9CE7, 0xE9E8 }, { 0x9CE9, 0x94B5 }, { 0x9CEB, 0xE9ED }, { 0x9CEC, 0xE9E9 }, 
-	{ 0x9CF0, 0xE9EA }, { 0x9CF3, 0x9650 }, { 0x9CF4, 0x96C2 }, { 0x9CF6, 0x93CE }, { 0x9D03, 0xE9EE }, { 0x9D06, 0xE9EF }, { 0x9D07, 0x93BC }, { 0x9D08, 0xE9EC }, 
-	{ 0x9D09, 0xE9EB }, { 0x9D0E, 0x89A8 }, { 0x9D12, 0xE9F7 }, { 0x9D15, 0xE9F6 }, { 0x9D1B, 0x8995 }, { 0x9D1F, 0xE9F4 }, { 0x9D23, 0xE9F3 }, { 0x9D26, 0xE9F1 }, 
-	{ 0x9D28, 0x8A9B }, { 0x9D2A, 0xE9F0 }, { 0x9D2B, 0x8EB0 }, { 0x9D2C, 0x89A7 }, { 0x9D3B, 0x8D83 }, { 0x9D3E, 0xE9FA }, { 0x9D3F, 0xE9F9 }, { 0x9D41, 0xE9F8 }, 
-	{ 0x9D44, 0xE9F5 }, { 0x9D46, 0xE9FB }, { 0x9D48, 0xE9FC }, { 0x9D50, 0xEA44 }, { 0x9D51, 0xEA43 }, { 0x9D59, 0xEA45 }, { 0x9D5C, 0x894C }, { 0x9D5D, 0xEA40 }, 
-	{ 0x9D5E, 0xEA41 }, { 0x9D60, 0x8D94 }, { 0x9D61, 0x96B7 }, { 0x9D64, 0xEA42 }, { 0x9D6C, 0x9651 }, { 0x9D6F, 0xEA4A }, { 0x9D72, 0xEA46 }, { 0x9D7A, 0xEA4B }, 
-	{ 0x9D87, 0xEA48 }, { 0x9D89, 0xEA47 }, { 0x9D8F, 0x8C7B }, { 0x9D9A, 0xEA4C }, { 0x9DA4, 0xEA4D }, { 0x9DA9, 0xEA4E }, { 0x9DAB, 0xEA49 }, { 0x9DAF, 0xE9F2 }, 
-	{ 0x9DB2, 0xEA4F }, { 0x9DB4, 0x92DF }, { 0x9DB8, 0xEA53 }, { 0x9DBA, 0xEA54 }, { 0x9DBB, 0xEA52 }, { 0x9DC1, 0xEA51 }, { 0x9DC2, 0xEA57 }, { 0x9DC4, 0xEA50 }, 
-	{ 0x9DC6, 0xEA55 }, { 0x9DCF, 0xEA56 }, { 0x9DD3, 0xEA59 }, { 0x9DD9, 0xEA58 }, { 0x9DE6, 0xEA5B }, { 0x9DED, 0xEA5C }, { 0x9DEF, 0xEA5D }, { 0x9DF2, 0x9868 }, 
-	{ 0x9DF8, 0xEA5A }, { 0x9DF9, 0x91E9 }, { 0x9DFA, 0x8DEB }, { 0x9DFD, 0xEA5E }, { 0x9E1A, 0xEA5F }, { 0x9E1B, 0xEA60 }, { 0x9E1E, 0xEA61 }, { 0x9E75, 0xEA62 }, 
-	{ 0x9E78, 0x8CB2 }, { 0x9E79, 0xEA63 }, { 0x9E7D, 0xEA64 }, { 0x9E7F, 0x8EAD }, { 0x9E81, 0xEA65 }, { 0x9E88, 0xEA66 }, { 0x9E8B, 0xEA67 }, { 0x9E8C, 0xEA68 }, 
-	{ 0x9E91, 0xEA6B }, { 0x9E92, 0xEA69 }, { 0x9E93, 0x985B }, { 0x9E95, 0xEA6A }, { 0x9E97, 0x97ED }, { 0x9E9D, 0xEA6C }, { 0x9E9F, 0x97D9 }, { 0x9EA5, 0xEA6D }, 
-	{ 0x9EA6, 0x949E }, { 0x9EA9, 0xEA6E }, { 0x9EAA, 0xEA70 }, { 0x9EAD, 0xEA71 }, { 0x9EB8, 0xEA6F }, { 0x9EB9, 0x8D8D }, { 0x9EBA, 0x96CB }, { 0x9EBB, 0x9683 }, 
-	{ 0x9EBC, 0x9BF5 }, { 0x9EBE, 0x9F80 }, { 0x9EBF, 0x969B }, { 0x9EC4, 0x89A9 }, { 0x9ECC, 0xEA73 }, { 0x9ECD, 0x8B6F }, { 0x9ECE, 0xEA74 }, { 0x9ECF, 0xEA75 }, 
-	{ 0x9ED0, 0xEA76 }, { 0x9ED2, 0x8D95 }, { 0x9ED4, 0xEA77 }, { 0x9ED8, 0xE0D2 }, { 0x9ED9, 0x96D9 }, { 0x9EDB, 0x91E1 }, { 0x9EDC, 0xEA78 }, { 0x9EDD, 0xEA7A }, 
-	{ 0x9EDE, 0xEA79 }, { 0x9EE0, 0xEA7B }, { 0x9EE5, 0xEA7C }, { 0x9EE8, 0xEA7D }, { 0x9EEF, 0xEA7E }, { 0x9EF4, 0xEA80 }, { 0x9EF6, 0xEA81 }, { 0x9EF7, 0xEA82 }, 
-	{ 0x9EF9, 0xEA83 }, { 0x9EFB, 0xEA84 }, { 0x9EFC, 0xEA85 }, { 0x9EFD, 0xEA86 }, { 0x9F07, 0xEA87 }, { 0x9F08, 0xEA88 }, { 0x9F0E, 0x9343 }, { 0x9F13, 0x8CDB }, 
-	{ 0x9F15, 0xEA8A }, { 0x9F20, 0x916C }, { 0x9F21, 0xEA8B }, { 0x9F2C, 0xEA8C }, { 0x9F3B, 0x9540 }, { 0x9F3E, 0xEA8D }, { 0x9F4A, 0xEA8E }, { 0x9F4B, 0xE256 }, 
-	{ 0x9F4E, 0xE6D8 }, { 0x9F4F, 0xE8EB }, { 0x9F52, 0xEA8F }, { 0x9F54, 0xEA90 }, { 0x9F5F, 0xEA92 }, { 0x9F60, 0xEA93 }, { 0x9F61, 0xEA94 }, { 0x9F62, 0x97EE }, 
-	{ 0x9F63, 0xEA91 }, { 0x9F66, 0xEA95 }, { 0x9F67, 0xEA96 }, { 0x9F6A, 0xEA98 }, { 0x9F6C, 0xEA97 }, { 0x9F72, 0xEA9A }, { 0x9F76, 0xEA9B }, { 0x9F77, 0xEA99 }, 
-	{ 0x9F8D, 0x97B4 }, { 0x9F95, 0xEA9C }, { 0x9F9C, 0xEA9D }, { 0x9F9D, 0xE273 }, { 0x9FA0, 0xEA9E }, { 0xFE30, 0xEB64 }, { 0xFE31, 0xEB5C }, { 0xFE33, 0xEB51 }, 
-	{ 0xFE35, 0xEB69 }, { 0xFE36, 0xEB6A }, { 0xFE37, 0xEB6F }, { 0xFE38, 0xEB70 }, { 0xFE39, 0xEB6B }, { 0xFE3A, 0xEB6C }, { 0xFE3B, 0xEB79 }, { 0xFE3C, 0xEB7A }, 
-	{ 0xFE3D, 0xEB73 }, { 0xFE3E, 0xEB74 }, { 0xFE3F, 0xEB71 }, { 0xFE40, 0xEB72 }, { 0xFE41, 0xEB75 }, { 0xFE42, 0xEB76 }, { 0xFE43, 0xEB77 }, { 0xFE44, 0xEB78 }, 
-	{ 0xFF01, 0x8149 }, { 0xFF03, 0x8194 }, { 0xFF04, 0x8190 }, { 0xFF05, 0x8193 }, { 0xFF06, 0x8195 }, { 0xFF08, 0x8169 }, { 0xFF09, 0x816A }, { 0xFF0A, 0x8196 }, 
-	{ 0xFF0B, 0x817B }, { 0xFF0C, 0x8143 }, { 0xFF0E, 0x8144 }, { 0xFF0F, 0x815E }, { 0xFF10, 0x824F }, { 0xFF11, 0x8250 }, { 0xFF12, 0x8251 }, { 0xFF13, 0x8252 }, 
-	{ 0xFF14, 0x8253 }, { 0xFF15, 0x8254 }, { 0xFF16, 0x8255 }, { 0xFF17, 0x8256 }, { 0xFF18, 0x8257 }, { 0xFF19, 0x8258 }, { 0xFF1A, 0x8146 }, { 0xFF1B, 0x8147 }, 
-	{ 0xFF1C, 0x8183 }, { 0xFF1D, 0x8181 }, { 0xFF1E, 0x8184 }, { 0xFF1F, 0x8148 }, { 0xFF20, 0x8197 }, { 0xFF21, 0x8260 }, { 0xFF22, 0x8261 }, { 0xFF23, 0x8262 }, 
-	{ 0xFF24, 0x8263 }, { 0xFF25, 0x8264 }, { 0xFF26, 0x8265 }, { 0xFF27, 0x8266 }, { 0xFF28, 0x8267 }, { 0xFF29, 0x8268 }, { 0xFF2A, 0x8269 }, { 0xFF2B, 0x826A }, 
-	{ 0xFF2C, 0x826B }, { 0xFF2D, 0x826C }, { 0xFF2E, 0x826D }, { 0xFF2F, 0x826E }, { 0xFF30, 0x826F }, { 0xFF31, 0x8270 }, { 0xFF32, 0x8271 }, { 0xFF33, 0x8272 }, 
-	{ 0xFF34, 0x8273 }, { 0xFF35, 0x8274 }, { 0xFF36, 0x8275 }, { 0xFF37, 0x8276 }, { 0xFF38, 0x8277 }, { 0xFF39, 0x8278 }, { 0xFF3A, 0x8279 }, { 0xFF3B, 0x816D }, 
-	{ 0xFF3C, 0x815F }, { 0xFF3D, 0x816E }, { 0xFF3E, 0x814F }, { 0xFF3F, 0x8151 }, { 0xFF40, 0x814D }, { 0xFF41, 0x8281 }, { 0xFF42, 0x8282 }, { 0xFF43, 0x8283 }, 
-	{ 0xFF44, 0x8284 }, { 0xFF45, 0x8285 }, { 0xFF46, 0x8286 }, { 0xFF47, 0x8287 }, { 0xFF48, 0x8288 }, { 0xFF49, 0x8289 }, { 0xFF4A, 0x828A }, { 0xFF4B, 0x828B }, 
-	{ 0xFF4C, 0x828C }, { 0xFF4D, 0x828D }, { 0xFF4E, 0x828E }, { 0xFF4F, 0x828F }, { 0xFF50, 0x8290 }, { 0xFF51, 0x8291 }, { 0xFF52, 0x8292 }, { 0xFF53, 0x8293 }, 
-	{ 0xFF54, 0x8294 }, { 0xFF55, 0x8295 }, { 0xFF56, 0x8296 }, { 0xFF57, 0x8297 }, { 0xFF58, 0x8298 }, { 0xFF59, 0x8299 }, { 0xFF5A, 0x829A }, { 0xFF5B, 0x816F }, 
-	{ 0xFF5C, 0x8162 }, { 0xFF5D, 0x8170 }, { 0xFF61, 0x00A1 }, { 0xFF62, 0x00A2 }, { 0xFF63, 0x00A3 }, { 0xFF64, 0x00A4 }, { 0xFF65, 0x00A5 }, { 0xFF66, 0x00A6 }, 
-	{ 0xFF67, 0x00A7 }, { 0xFF68, 0x00A8 }, { 0xFF69, 0x00A9 }, { 0xFF6A, 0x00AA }, { 0xFF6B, 0x00AB }, { 0xFF6C, 0x00AC }, { 0xFF6D, 0x00AD }, { 0xFF6E, 0x00AE }, 
-	{ 0xFF6F, 0x00AF }, { 0xFF70, 0x00B0 }, { 0xFF71, 0x00B1 }, { 0xFF72, 0x00B2 }, { 0xFF73, 0x00B3 }, { 0xFF74, 0x00B4 }, { 0xFF75, 0x00B5 }, { 0xFF76, 0x00B6 }, 
-	{ 0xFF77, 0x00B7 }, { 0xFF78, 0x00B8 }, { 0xFF79, 0x00B9 }, { 0xFF7A, 0x00BA }, { 0xFF7B, 0x00BB }, { 0xFF7C, 0x00BC }, { 0xFF7D, 0x00BD }, { 0xFF7E, 0x00BE }, 
-	{ 0xFF7F, 0x00BF }, { 0xFF80, 0x00C0 }, { 0xFF81, 0x00C1 }, { 0xFF82, 0x00C2 }, { 0xFF83, 0x00C3 }, { 0xFF84, 0x00C4 }, { 0xFF85, 0x00C5 }, { 0xFF86, 0x00C6 }, 
-	{ 0xFF87, 0x00C7 }, { 0xFF88, 0x00C8 }, { 0xFF89, 0x00C9 }, { 0xFF8A, 0x00CA }, { 0xFF8B, 0x00CB }, { 0xFF8C, 0x00CC }, { 0xFF8D, 0x00CD }, { 0xFF8E, 0x00CE }, 
-	{ 0xFF8F, 0x00CF }, { 0xFF90, 0x00D0 }, { 0xFF91, 0x00D1 }, { 0xFF92, 0x00D2 }, { 0xFF93, 0x00D3 }, { 0xFF94, 0x00D4 }, { 0xFF95, 0x00D5 }, { 0xFF96, 0x00D6 }, 
-	{ 0xFF97, 0x00D7 }, { 0xFF98, 0x00D8 }, { 0xFF99, 0x00D9 }, { 0xFF9A, 0x00DA }, { 0xFF9B, 0x00DB }, { 0xFF9C, 0x00DC }, { 0xFF9D, 0x00DD }, { 0xFF9E, 0x00DE }, 
-	{ 0xFF9F, 0x00DF }, { 0xFFE3, 0x8150 }, { 0xFFE5, 0x818F }, 
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x0080 }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00A0 },
+	{ 0x00A2, 0x8191 }, { 0x00A3, 0x8192 }, { 0x00A5, 0x005C }, { 0x00A7, 0x8198 }, { 0x00A8, 0x814E }, { 0x00A9, 0x00FD }, { 0x00AC, 0x81CA }, { 0x00B0, 0x818B },
+	{ 0x00B1, 0x817D }, { 0x00B4, 0x814C }, { 0x00B6, 0x81F7 }, { 0x00D7, 0x817E }, { 0x00F7, 0x8180 }, { 0x0391, 0x839F }, { 0x0392, 0x83A0 }, { 0x0393, 0x83A1 },
+	{ 0x0394, 0x83A2 }, { 0x0395, 0x83A3 }, { 0x0396, 0x83A4 }, { 0x0397, 0x83A5 }, { 0x0398, 0x83A6 }, { 0x0399, 0x83A7 }, { 0x039A, 0x83A8 }, { 0x039B, 0x83A9 },
+	{ 0x039C, 0x83AA }, { 0x039D, 0x83AB }, { 0x039E, 0x83AC }, { 0x039F, 0x83AD }, { 0x03A0, 0x83AE }, { 0x03A1, 0x83AF }, { 0x03A3, 0x83B0 }, { 0x03A4, 0x83B1 },
+	{ 0x03A5, 0x83B2 }, { 0x03A6, 0x83B3 }, { 0x03A7, 0x83B4 }, { 0x03A8, 0x83B5 }, { 0x03A9, 0x83B6 }, { 0x03B1, 0x83BF }, { 0x03B2, 0x83C0 }, { 0x03B3, 0x83C1 },
+	{ 0x03B4, 0x83C2 }, { 0x03B5, 0x83C3 }, { 0x03B6, 0x83C4 }, { 0x03B7, 0x83C5 }, { 0x03B8, 0x83C6 }, { 0x03B9, 0x83C7 }, { 0x03BA, 0x83C8 }, { 0x03BB, 0x83C9 },
+	{ 0x03BC, 0x83CA }, { 0x03BD, 0x83CB }, { 0x03BE, 0x83CC }, { 0x03BF, 0x83CD }, { 0x03C0, 0x83CE }, { 0x03C1, 0x83CF }, { 0x03C3, 0x83D0 }, { 0x03C4, 0x83D1 },
+	{ 0x03C5, 0x83D2 }, { 0x03C6, 0x83D3 }, { 0x03C7, 0x83D4 }, { 0x03C8, 0x83D5 }, { 0x03C9, 0x83D6 }, { 0x0401, 0x8446 }, { 0x0410, 0x8440 }, { 0x0411, 0x8441 },
+	{ 0x0412, 0x8442 }, { 0x0413, 0x8443 }, { 0x0414, 0x8444 }, { 0x0415, 0x8445 }, { 0x0416, 0x8447 }, { 0x0417, 0x8448 }, { 0x0418, 0x8449 }, { 0x0419, 0x844A },
+	{ 0x041A, 0x844B }, { 0x041B, 0x844C }, { 0x041C, 0x844D }, { 0x041D, 0x844E }, { 0x041E, 0x844F }, { 0x041F, 0x8450 }, { 0x0420, 0x8451 }, { 0x0421, 0x8452 },
+	{ 0x0422, 0x8453 }, { 0x0423, 0x8454 }, { 0x0424, 0x8455 }, { 0x0425, 0x8456 }, { 0x0426, 0x8457 }, { 0x0427, 0x8458 }, { 0x0428, 0x8459 }, { 0x0429, 0x845A },
+	{ 0x042A, 0x845B }, { 0x042B, 0x845C }, { 0x042C, 0x845D }, { 0x042D, 0x845E }, { 0x042E, 0x845F }, { 0x042F, 0x8460 }, { 0x0430, 0x8470 }, { 0x0431, 0x8471 },
+	{ 0x0432, 0x8472 }, { 0x0433, 0x8473 }, { 0x0434, 0x8474 }, { 0x0435, 0x8475 }, { 0x0436, 0x8477 }, { 0x0437, 0x8478 }, { 0x0438, 0x8479 }, { 0x0439, 0x847A },
+	{ 0x043A, 0x847B }, { 0x043B, 0x847C }, { 0x043C, 0x847D }, { 0x043D, 0x847E }, { 0x043E, 0x8480 }, { 0x043F, 0x8481 }, { 0x0440, 0x8482 }, { 0x0441, 0x8483 },
+	{ 0x0442, 0x8484 }, { 0x0443, 0x8485 }, { 0x0444, 0x8486 }, { 0x0445, 0x8487 }, { 0x0446, 0x8488 }, { 0x0447, 0x8489 }, { 0x0448, 0x848A }, { 0x0449, 0x848B },
+	{ 0x044A, 0x848C }, { 0x044B, 0x848D }, { 0x044C, 0x848E }, { 0x044D, 0x848F }, { 0x044E, 0x8490 }, { 0x044F, 0x8491 }, { 0x0451, 0x8476 }, { 0x2010, 0x815D },
+	{ 0x2014, 0x815C }, { 0x2016, 0x8161 }, { 0x2018, 0x8165 }, { 0x2019, 0x8166 }, { 0x201C, 0x8167 }, { 0x201D, 0x8168 }, { 0x2020, 0x81F5 }, { 0x2021, 0x81F6 },
+	{ 0x2025, 0x8164 }, { 0x2026, 0x8163 }, { 0x2030, 0x81F1 }, { 0x2032, 0x818C }, { 0x2033, 0x818D }, { 0x203B, 0x81A6 }, { 0x2103, 0x818E }, { 0x2109, 0x8656 },
+	{ 0x2113, 0x8650 }, { 0x2116, 0x869B }, { 0x2121, 0x869D }, { 0x2122, 0x00FE }, { 0x212B, 0x81F0 }, { 0x2160, 0x859F }, { 0x2161, 0x85A0 }, { 0x2162, 0x85A1 },
+	{ 0x2163, 0x85A2 }, { 0x2164, 0x85A3 }, { 0x2165, 0x85A4 }, { 0x2166, 0x85A5 }, { 0x2167, 0x85A6 }, { 0x2168, 0x85A7 }, { 0x2169, 0x85A8 }, { 0x216A, 0x85A9 },
+	{ 0x216B, 0x85AA }, { 0x2170, 0x85B3 }, { 0x2171, 0x85B4 }, { 0x2172, 0x85B5 }, { 0x2173, 0x85B6 }, { 0x2174, 0x85B7 }, { 0x2175, 0x85B8 }, { 0x2176, 0x85B9 },
+	{ 0x2177, 0x85BA }, { 0x2178, 0x85BB }, { 0x2179, 0x85BC }, { 0x217A, 0x85BD }, { 0x217B, 0x85BE }, { 0x2190, 0x81A9 }, { 0x2191, 0x81AA }, { 0x2192, 0x81A8 },
+	{ 0x2193, 0x81AB }, { 0x21C4, 0x86CC }, { 0x21C5, 0x86CD }, { 0x21C6, 0x86CB }, { 0x21D2, 0x81CB }, { 0x21D4, 0x81CC }, { 0x21E6, 0x86D0 }, { 0x21E7, 0x86D1 },
+	{ 0x21E8, 0x86CF }, { 0x21E9, 0x86D2 }, { 0x2200, 0x81CD }, { 0x2202, 0x81DD }, { 0x2203, 0x81CE }, { 0x2207, 0x81DE }, { 0x2208, 0x81B8 }, { 0x220B, 0x81B9 },
+	{ 0x2212, 0x817C }, { 0x221A, 0x81E3 }, { 0x221D, 0x81E5 }, { 0x221E, 0x8187 }, { 0x221F, 0x8841 }, { 0x2220, 0x81DA }, { 0x2227, 0x81C8 }, { 0x2228, 0x81C9 },
+	{ 0x2229, 0x81BF }, { 0x222A, 0x81BE }, { 0x222B, 0x81E7 }, { 0x222C, 0x81E8 }, { 0x222E, 0x8840 }, { 0x2234, 0x8188 }, { 0x2235, 0x81E6 }, { 0x223D, 0x81E4 },
+	{ 0x2252, 0x81E0 }, { 0x2260, 0x8182 }, { 0x2261, 0x81DF }, { 0x2266, 0x8185 }, { 0x2267, 0x8186 }, { 0x226A, 0x81E1 }, { 0x226B, 0x81E2 }, { 0x2282, 0x81BC },
+	{ 0x2283, 0x81BD }, { 0x2286, 0x81BA }, { 0x2287, 0x81BB }, { 0x22A5, 0x81DB }, { 0x22BF, 0x8842 }, { 0x2312, 0x81DC }, { 0x2460, 0x8540 }, { 0x2461, 0x8541 },
+	{ 0x2462, 0x8542 }, { 0x2463, 0x8543 }, { 0x2464, 0x8544 }, { 0x2465, 0x8545 }, { 0x2466, 0x8546 }, { 0x2467, 0x8547 }, { 0x2468, 0x8548 }, { 0x2469, 0x8549 },
+	{ 0x246A, 0x854A }, { 0x246B, 0x854B }, { 0x246C, 0x854C }, { 0x246D, 0x854D }, { 0x246E, 0x854E }, { 0x246F, 0x854F }, { 0x2470, 0x8550 }, { 0x2471, 0x8551 },
+	{ 0x2472, 0x8552 }, { 0x2473, 0x8553 }, { 0x2474, 0x855E }, { 0x2475, 0x855F }, { 0x2476, 0x8560 }, { 0x2477, 0x8561 }, { 0x2478, 0x8562 }, { 0x2479, 0x8563 },
+	{ 0x247A, 0x8564 }, { 0x247B, 0x8565 }, { 0x247C, 0x8566 }, { 0x247D, 0x8567 }, { 0x247E, 0x8568 }, { 0x247F, 0x8569 }, { 0x2480, 0x856A }, { 0x2481, 0x856B },
+	{ 0x2482, 0x856C }, { 0x2483, 0x856D }, { 0x2484, 0x856E }, { 0x2485, 0x856F }, { 0x2486, 0x8570 }, { 0x2487, 0x8571 }, { 0x2488, 0x8592 }, { 0x2489, 0x8593 },
+	{ 0x248A, 0x8594 }, { 0x248B, 0x8595 }, { 0x248C, 0x8596 }, { 0x248D, 0x8597 }, { 0x248E, 0x8598 }, { 0x248F, 0x8599 }, { 0x2490, 0x859A }, { 0x249C, 0x85DB },
+	{ 0x249D, 0x85DC }, { 0x249E, 0x85DD }, { 0x249F, 0x85DE }, { 0x24A0, 0x85DF }, { 0x24A1, 0x85E0 }, { 0x24A2, 0x85E1 }, { 0x24A3, 0x85E2 }, { 0x24A4, 0x85E3 },
+	{ 0x24A5, 0x85E4 }, { 0x24A6, 0x85E5 }, { 0x24A7, 0x85E6 }, { 0x24A8, 0x85E7 }, { 0x24A9, 0x85E8 }, { 0x24AA, 0x85E9 }, { 0x24AB, 0x85EA }, { 0x24AC, 0x85EB },
+	{ 0x24AD, 0x85EC }, { 0x24AE, 0x85ED }, { 0x24AF, 0x85EE }, { 0x24B0, 0x85EF }, { 0x24B1, 0x85F0 }, { 0x24B2, 0x85F1 }, { 0x24B3, 0x85F2 }, { 0x24B4, 0x85F3 },
+	{ 0x24B5, 0x85F4 }, { 0x2500, 0x849F }, { 0x2501, 0x84AA }, { 0x2502, 0x84A0 }, { 0x2503, 0x84AB }, { 0x250C, 0x84A1 }, { 0x250F, 0x84AC }, { 0x2510, 0x84A2 },
+	{ 0x2513, 0x84AD }, { 0x2514, 0x84A4 }, { 0x2517, 0x84AF }, { 0x2518, 0x84A3 }, { 0x251B, 0x84AE }, { 0x251C, 0x84A5 }, { 0x251D, 0x84BA }, { 0x2520, 0x84B5 },
+	{ 0x2523, 0x84B0 }, { 0x2524, 0x84A7 }, { 0x2525, 0x84BC }, { 0x2528, 0x84B7 }, { 0x252B, 0x84B2 }, { 0x252C, 0x84A6 }, { 0x252F, 0x84B6 }, { 0x2530, 0x84BB },
+	{ 0x2533, 0x84B1 }, { 0x2534, 0x84A8 }, { 0x2537, 0x84B8 }, { 0x2538, 0x84BD }, { 0x253B, 0x84B3 }, { 0x253C, 0x84A9 }, { 0x253F, 0x84B9 }, { 0x2542, 0x84BE },
+	{ 0x254B, 0x84B4 }, { 0x25A0, 0x81A1 }, { 0x25A1, 0x81A0 }, { 0x25B2, 0x81A3 }, { 0x25B3, 0x81A2 }, { 0x25BC, 0x81A5 }, { 0x25BD, 0x81A4 }, { 0x25C6, 0x819F },
+	{ 0x25C7, 0x819E }, { 0x25CB, 0x819B }, { 0x25CE, 0x819D }, { 0x25CF, 0x819C }, { 0x25EF, 0x81FC }, { 0x2605, 0x819A }, { 0x2606, 0x8199 }, { 0x260E, 0x86B4 },
+	{ 0x261C, 0x86C8 }, { 0x261D, 0x86C9 }, { 0x261E, 0x86C7 }, { 0x261F, 0x86CA }, { 0x2640, 0x818A }, { 0x2642, 0x8189 }, { 0x2660, 0x86A3 }, { 0x2661, 0x86A1 },
+	{ 0x2662, 0x86A2 }, { 0x2663, 0x86A4 }, { 0x2664, 0x869F }, { 0x2665, 0x86A5 }, { 0x2666, 0x86A6 }, { 0x2667, 0x86A0 }, { 0x266A, 0x81F4 }, { 0x266D, 0x81F3 },
+	{ 0x266F, 0x81F2 }, { 0x2776, 0x857C }, { 0x2777, 0x857D }, { 0x2778, 0x857E }, { 0x2779, 0x8580 }, { 0x277A, 0x8581 }, { 0x277B, 0x8582 }, { 0x277C, 0x8583 },
+	{ 0x277D, 0x8584 }, { 0x277E, 0x8585 }, { 0x3000, 0x8140 }, { 0x3001, 0x8141 }, { 0x3002, 0x8142 }, { 0x3003, 0x8156 }, { 0x3004, 0x86B5 }, { 0x3005, 0x8158 },
+	{ 0x3006, 0x8159 }, { 0x3007, 0x815A }, { 0x3008, 0x8171 }, { 0x3009, 0x8172 }, { 0x300A, 0x8173 }, { 0x300B, 0x8174 }, { 0x300C, 0x8175 }, { 0x300D, 0x8176 },
+	{ 0x300E, 0x8177 }, { 0x300F, 0x8178 }, { 0x3010, 0x8179 }, { 0x3011, 0x817A }, { 0x3012, 0x81A7 }, { 0x3013, 0x81AC }, { 0x3014, 0x816B }, { 0x3015, 0x816C },
+	{ 0x301C, 0x8160 }, { 0x301D, 0x8854 }, { 0x301F, 0x8855 }, { 0x3020, 0x86B3 }, { 0x3041, 0x829F }, { 0x3042, 0x82A0 }, { 0x3043, 0x82A1 }, { 0x3044, 0x82A2 },
+	{ 0x3045, 0x82A3 }, { 0x3046, 0x82A4 }, { 0x3047, 0x82A5 }, { 0x3048, 0x82A6 }, { 0x3049, 0x82A7 }, { 0x304A, 0x82A8 }, { 0x304B, 0x82A9 }, { 0x304C, 0x82AA },
+	{ 0x304D, 0x82AB }, { 0x304E, 0x82AC }, { 0x304F, 0x82AD }, { 0x3050, 0x82AE }, { 0x3051, 0x82AF }, { 0x3052, 0x82B0 }, { 0x3053, 0x82B1 }, { 0x3054, 0x82B2 },
+	{ 0x3055, 0x82B3 }, { 0x3056, 0x82B4 }, { 0x3057, 0x82B5 }, { 0x3058, 0x82B6 }, { 0x3059, 0x82B7 }, { 0x305A, 0x82B8 }, { 0x305B, 0x82B9 }, { 0x305C, 0x82BA },
+	{ 0x305D, 0x82BB }, { 0x305E, 0x82BC }, { 0x305F, 0x82BD }, { 0x3060, 0x82BE }, { 0x3061, 0x82BF }, { 0x3062, 0x82C0 }, { 0x3063, 0x82C1 }, { 0x3064, 0x82C2 },
+	{ 0x3065, 0x82C3 }, { 0x3066, 0x82C4 }, { 0x3067, 0x82C5 }, { 0x3068, 0x82C6 }, { 0x3069, 0x82C7 }, { 0x306A, 0x82C8 }, { 0x306B, 0x82C9 }, { 0x306C, 0x82CA },
+	{ 0x306D, 0x82CB }, { 0x306E, 0x82CC }, { 0x306F, 0x82CD }, { 0x3070, 0x82CE }, { 0x3071, 0x82CF }, { 0x3072, 0x82D0 }, { 0x3073, 0x82D1 }, { 0x3074, 0x82D2 },
+	{ 0x3075, 0x82D3 }, { 0x3076, 0x82D4 }, { 0x3077, 0x82D5 }, { 0x3078, 0x82D6 }, { 0x3079, 0x82D7 }, { 0x307A, 0x82D8 }, { 0x307B, 0x82D9 }, { 0x307C, 0x82DA },
+	{ 0x307D, 0x82DB }, { 0x307E, 0x82DC }, { 0x307F, 0x82DD }, { 0x3080, 0x82DE }, { 0x3081, 0x82DF }, { 0x3082, 0x82E0 }, { 0x3083, 0x82E1 }, { 0x3084, 0x82E2 },
+	{ 0x3085, 0x82E3 }, { 0x3086, 0x82E4 }, { 0x3087, 0x82E5 }, { 0x3088, 0x82E6 }, { 0x3089, 0x82E7 }, { 0x308A, 0x82E8 }, { 0x308B, 0x82E9 }, { 0x308C, 0x82EA },
+	{ 0x308D, 0x82EB }, { 0x308E, 0x82EC }, { 0x308F, 0x82ED }, { 0x3090, 0x82EE }, { 0x3091, 0x82EF }, { 0x3092, 0x82F0 }, { 0x3093, 0x82F1 }, { 0x3094, 0x8868 },
+	{ 0x309B, 0x814A }, { 0x309C, 0x814B }, { 0x309D, 0x8154 }, { 0x309E, 0x8155 }, { 0x30A1, 0x8340 }, { 0x30A2, 0x8341 }, { 0x30A3, 0x8342 }, { 0x30A4, 0x8343 },
+	{ 0x30A5, 0x8344 }, { 0x30A6, 0x8345 }, { 0x30A7, 0x8346 }, { 0x30A8, 0x8347 }, { 0x30A9, 0x8348 }, { 0x30AA, 0x8349 }, { 0x30AB, 0x834A }, { 0x30AC, 0x834B },
+	{ 0x30AD, 0x834C }, { 0x30AE, 0x834D }, { 0x30AF, 0x834E }, { 0x30B0, 0x834F }, { 0x30B1, 0x8350 }, { 0x30B2, 0x8351 }, { 0x30B3, 0x8352 }, { 0x30B4, 0x8353 },
+	{ 0x30B5, 0x8354 }, { 0x30B6, 0x8355 }, { 0x30B7, 0x8356 }, { 0x30B8, 0x8357 }, { 0x30B9, 0x8358 }, { 0x30BA, 0x8359 }, { 0x30BB, 0x835A }, { 0x30BC, 0x835B },
+	{ 0x30BD, 0x835C }, { 0x30BE, 0x835D }, { 0x30BF, 0x835E }, { 0x30C0, 0x835F }, { 0x30C1, 0x8360 }, { 0x30C2, 0x8361 }, { 0x30C3, 0x8362 }, { 0x30C4, 0x8363 },
+	{ 0x30C5, 0x8364 }, { 0x30C6, 0x8365 }, { 0x30C7, 0x8366 }, { 0x30C8, 0x8367 }, { 0x30C9, 0x8368 }, { 0x30CA, 0x8369 }, { 0x30CB, 0x836A }, { 0x30CC, 0x836B },
+	{ 0x30CD, 0x836C }, { 0x30CE, 0x836D }, { 0x30CF, 0x836E }, { 0x30D0, 0x836F }, { 0x30D1, 0x8370 }, { 0x30D2, 0x8371 }, { 0x30D3, 0x8372 }, { 0x30D4, 0x8373 },
+	{ 0x30D5, 0x8374 }, { 0x30D6, 0x8375 }, { 0x30D7, 0x8376 }, { 0x30D8, 0x8377 }, { 0x30D9, 0x8378 }, { 0x30DA, 0x8379 }, { 0x30DB, 0x837A }, { 0x30DC, 0x837B },
+	{ 0x30DD, 0x837C }, { 0x30DE, 0x837D }, { 0x30DF, 0x837E }, { 0x30E0, 0x8380 }, { 0x30E1, 0x8381 }, { 0x30E2, 0x8382 }, { 0x30E3, 0x8383 }, { 0x30E4, 0x8384 },
+	{ 0x30E5, 0x8385 }, { 0x30E6, 0x8386 }, { 0x30E7, 0x8387 }, { 0x30E8, 0x8388 }, { 0x30E9, 0x8389 }, { 0x30EA, 0x838A }, { 0x30EB, 0x838B }, { 0x30EC, 0x838C },
+	{ 0x30ED, 0x838D }, { 0x30EE, 0x838E }, { 0x30EF, 0x838F }, { 0x30F0, 0x8390 }, { 0x30F1, 0x8391 }, { 0x30F2, 0x8392 }, { 0x30F3, 0x8393 }, { 0x30F4, 0x8394 },
+	{ 0x30F5, 0x8395 }, { 0x30F6, 0x8396 }, { 0x30F7, 0x886A }, { 0x30F8, 0x886B }, { 0x30F9, 0x886C }, { 0x30FA, 0x886D }, { 0x30FB, 0x8145 }, { 0x30FC, 0x815B },
+	{ 0x30FD, 0x8152 }, { 0x30FE, 0x8153 }, { 0x322A, 0x8741 }, { 0x322B, 0x8742 }, { 0x322C, 0x8743 }, { 0x322D, 0x8744 }, { 0x322E, 0x8745 }, { 0x322F, 0x8746 },
+	{ 0x3230, 0x8740 }, { 0x3231, 0x874D }, { 0x3232, 0x8750 }, { 0x3233, 0x8753 }, { 0x3234, 0x874F }, { 0x3235, 0x8754 }, { 0x3236, 0x8752 }, { 0x3237, 0x8748 },
+	{ 0x3238, 0x8758 }, { 0x3239, 0x874B }, { 0x323A, 0x874C }, { 0x323B, 0x8751 }, { 0x323C, 0x8755 }, { 0x323D, 0x8756 }, { 0x323E, 0x874E }, { 0x323F, 0x8757 },
+	{ 0x3240, 0x8747 }, { 0x3242, 0x8749 }, { 0x3243, 0x874A }, { 0x3296, 0x8799 }, { 0x3298, 0x879B }, { 0x3299, 0x879E }, { 0x329D, 0x879A }, { 0x329E, 0x879C },
+	{ 0x32A4, 0x8793 }, { 0x32A5, 0x8794 }, { 0x32A6, 0x8795 }, { 0x32A7, 0x8796 }, { 0x32A8, 0x8797 }, { 0x32A9, 0x8798 }, { 0x3300, 0x87BD }, { 0x3303, 0x87A7 },
+	{ 0x3305, 0x87A4 }, { 0x330D, 0x87B0 }, { 0x3314, 0x87A2 }, { 0x3315, 0x87AA }, { 0x3316, 0x87A3 }, { 0x3318, 0x87A9 }, { 0x331E, 0x87BE }, { 0x3322, 0x87A0 },
+	{ 0x3323, 0x87B2 }, { 0x3326, 0x87B3 }, { 0x3327, 0x87AB }, { 0x332A, 0x87BF }, { 0x332B, 0x87B5 }, { 0x3331, 0x87C0 }, { 0x3333, 0x87A5 }, { 0x3336, 0x87A8 },
+	{ 0x3339, 0x87AE }, { 0x333B, 0x87B4 }, { 0x3342, 0x87B1 }, { 0x3347, 0x87C1 }, { 0x3349, 0x879F }, { 0x334A, 0x87AD }, { 0x334D, 0x87A1 }, { 0x334E, 0x87A6 },
+	{ 0x3351, 0x87AC }, { 0x3357, 0x87AF }, { 0x337B, 0x87E8 }, { 0x337C, 0x87E7 }, { 0x337D, 0x87E6 }, { 0x337E, 0x87E5 }, { 0x337F, 0x87FA }, { 0x3385, 0x865A },
+	{ 0x3386, 0x865B }, { 0x3387, 0x865C }, { 0x338E, 0x864A }, { 0x338F, 0x864C }, { 0x3390, 0x8659 }, { 0x3396, 0x864E }, { 0x3397, 0x864F }, { 0x3398, 0x8651 },
+	{ 0x339C, 0x8640 }, { 0x339D, 0x8642 }, { 0x339E, 0x8648 }, { 0x339F, 0x8641 }, { 0x33A0, 0x8643 }, { 0x33A1, 0x8646 }, { 0x33A2, 0x8649 }, { 0x33A4, 0x8644 },
+	{ 0x33A5, 0x8647 }, { 0x33B0, 0x8655 }, { 0x33B1, 0x8654 }, { 0x33B2, 0x8653 }, { 0x33B3, 0x8652 }, { 0x33C4, 0x864D }, { 0x33CB, 0x8658 }, { 0x33CD, 0x869C },
+	{ 0x33D4, 0x8657 }, { 0x4E00, 0x88EA }, { 0x4E01, 0x929A }, { 0x4E03, 0x8EB5 }, { 0x4E07, 0x969C }, { 0x4E08, 0x8FE4 }, { 0x4E09, 0x8E4F }, { 0x4E0A, 0x8FE3 },
+	{ 0x4E0B, 0x89BA }, { 0x4E0D, 0x9573 }, { 0x4E0E, 0x975E }, { 0x4E10, 0x98A0 }, { 0x4E11, 0x894E }, { 0x4E14, 0x8A8E }, { 0x4E15, 0x98A1 }, { 0x4E16, 0x90A2 },
+	{ 0x4E17, 0x99C0 }, { 0x4E18, 0x8B75 }, { 0x4E19, 0x95B8 }, { 0x4E1E, 0x8FE5 }, { 0x4E21, 0x97BC }, { 0x4E26, 0x95C0 }, { 0x4E2A, 0x98A2 }, { 0x4E2D, 0x9286 },
+	{ 0x4E31, 0x98A3 }, { 0x4E32, 0x8BF8 }, { 0x4E36, 0x98A4 }, { 0x4E38, 0x8ADB }, { 0x4E39, 0x924F }, { 0x4E3B, 0x8EE5 }, { 0x4E3C, 0x98A5 }, { 0x4E3F, 0x98A6 },
+	{ 0x4E42, 0x98A7 }, { 0x4E43, 0x9454 }, { 0x4E45, 0x8B76 }, { 0x4E4B, 0x9456 }, { 0x4E4D, 0x93E1 }, { 0x4E4E, 0x8CC1 }, { 0x4E4F, 0x9652 }, { 0x4E55, 0xE568 },
+	{ 0x4E56, 0x98A8 }, { 0x4E57, 0x8FE6 }, { 0x4E58, 0x98A9 }, { 0x4E59, 0x89B3 }, { 0x4E5D, 0x8BE3 }, { 0x4E5E, 0x8CEE }, { 0x4E5F, 0x96E7 }, { 0x4E62, 0x9BA4 },
+	{ 0x4E71, 0x9790 }, { 0x4E73, 0x93FB }, { 0x4E7E, 0x8AA3 }, { 0x4E80, 0x8B54 }, { 0x4E82, 0x98AA }, { 0x4E85, 0x98AB }, { 0x4E86, 0x97B9 }, { 0x4E88, 0x975C },
+	{ 0x4E89, 0x9188 }, { 0x4E8A, 0x98AD }, { 0x4E8B, 0x8E96 }, { 0x4E8C, 0x93F1 }, { 0x4E8E, 0x98B0 }, { 0x4E91, 0x895D }, { 0x4E92, 0x8CDD }, { 0x4E94, 0x8CDC },
+	{ 0x4E95, 0x88E4 }, { 0x4E98, 0x986A }, { 0x4E99, 0x9869 }, { 0x4E9B, 0x8DB1 }, { 0x4E9C, 0x889F }, { 0x4E9E, 0x98B1 }, { 0x4E9F, 0x98B2 }, { 0x4EA0, 0x98B3 },
+	{ 0x4EA1, 0x9653 }, { 0x4EA2, 0x98B4 }, { 0x4EA4, 0x8CF0 }, { 0x4EA5, 0x88E5 }, { 0x4EA6, 0x9692 }, { 0x4EA8, 0x8B9C }, { 0x4EAB, 0x8B9D }, { 0x4EAC, 0x8B9E },
+	{ 0x4EAD, 0x92E0 }, { 0x4EAE, 0x97BA }, { 0x4EB0, 0x98B5 }, { 0x4EB3, 0x98B6 }, { 0x4EB6, 0x98B7 }, { 0x4EBA, 0x906C }, { 0x4EC0, 0x8F59 }, { 0x4EC1, 0x906D },
+	{ 0x4EC2, 0x98BC }, { 0x4EC4, 0x98BA }, { 0x4EC6, 0x98BB }, { 0x4EC7, 0x8B77 }, { 0x4ECA, 0x8DA1 }, { 0x4ECB, 0x89EE }, { 0x4ECD, 0x98B9 }, { 0x4ECE, 0x98B8 },
+	{ 0x4ECF, 0x95A7 }, { 0x4ED4, 0x8E65 }, { 0x4ED5, 0x8E64 }, { 0x4ED6, 0x91BC }, { 0x4ED7, 0x98BD }, { 0x4ED8, 0x9574 }, { 0x4ED9, 0x90E5 }, { 0x4EDD, 0x8157 },
+	{ 0x4EDE, 0x98BE }, { 0x4EDF, 0x98C0 }, { 0x4EE3, 0x91E3 }, { 0x4EE4, 0x97DF }, { 0x4EE5, 0x88C8 }, { 0x4EED, 0x98BF }, { 0x4EEE, 0x89BC }, { 0x4EF0, 0x8BC2 },
+	{ 0x4EF2, 0x9287 }, { 0x4EF6, 0x8C8F }, { 0x4EF7, 0x98C1 }, { 0x4EFB, 0x9443 }, { 0x4F01, 0x8AE9 }, { 0x4F09, 0x98C2 }, { 0x4F0A, 0x88C9 }, { 0x4F0D, 0x8CDE },
+	{ 0x4F0E, 0x8AEA }, { 0x4F0F, 0x959A }, { 0x4F10, 0x94B0 }, { 0x4F11, 0x8B78 }, { 0x4F1A, 0x89EF }, { 0x4F1C, 0x98E5 }, { 0x4F1D, 0x9360 }, { 0x4F2F, 0x948C },
+	{ 0x4F30, 0x98C4 }, { 0x4F34, 0x94BA }, { 0x4F36, 0x97E0 }, { 0x4F38, 0x904C }, { 0x4F3A, 0x8E66 }, { 0x4F3C, 0x8E97 }, { 0x4F3D, 0x89BE }, { 0x4F43, 0x92CF },
+	{ 0x4F46, 0x9241 }, { 0x4F47, 0x98C8 }, { 0x4F4D, 0x88CA }, { 0x4F4E, 0x92E1 }, { 0x4F4F, 0x8F5A }, { 0x4F50, 0x8DB2 }, { 0x4F51, 0x9743 }, { 0x4F53, 0x91CC },
+	{ 0x4F55, 0x89BD }, { 0x4F57, 0x98C7 }, { 0x4F59, 0x975D }, { 0x4F5A, 0x98C3 }, { 0x4F5B, 0x98C5 }, { 0x4F5C, 0x8DEC }, { 0x4F5D, 0x98C6 }, { 0x4F5E, 0x9B43 },
+	{ 0x4F69, 0x98CE }, { 0x4F6F, 0x98D1 }, { 0x4F70, 0x98CF }, { 0x4F73, 0x89C0 }, { 0x4F75, 0x95B9 }, { 0x4F76, 0x98C9 }, { 0x4F7B, 0x98CD }, { 0x4F7C, 0x8CF1 },
+	{ 0x4F7F, 0x8E67 }, { 0x4F83, 0x8AA4 }, { 0x4F86, 0x98D2 }, { 0x4F88, 0x98CA }, { 0x4F8B, 0x97E1 }, { 0x4F8D, 0x8E98 }, { 0x4F8F, 0x98CB }, { 0x4F91, 0x98D0 },
+	{ 0x4F96, 0x98D3 }, { 0x4F98, 0x98CC }, { 0x4F9B, 0x8B9F }, { 0x4F9D, 0x88CB }, { 0x4FA0, 0x8BA0 }, { 0x4FA1, 0x89BF }, { 0x4FAB, 0x9B44 }, { 0x4FAD, 0x9699 },
+	{ 0x4FAE, 0x958E }, { 0x4FAF, 0x8CF2 }, { 0x4FB5, 0x904E }, { 0x4FB6, 0x97B5 }, { 0x4FBF, 0x95D6 }, { 0x4FC2, 0x8C57 }, { 0x4FC3, 0x91A3 }, { 0x4FC4, 0x89E2 },
+	{ 0x4FCA, 0x8F72 }, { 0x4FCE, 0x98D7 }, { 0x4FD0, 0x98DC }, { 0x4FD1, 0x98DA }, { 0x4FD4, 0x98D5 }, { 0x4FD7, 0x91AD }, { 0x4FD8, 0x98D8 }, { 0x4FDA, 0x98DB },
+	{ 0x4FDB, 0x98D9 }, { 0x4FDD, 0x95DB }, { 0x4FDF, 0x98D6 }, { 0x4FE1, 0x904D }, { 0x4FE3, 0x9693 }, { 0x4FE4, 0x98DD }, { 0x4FE5, 0x98DE }, { 0x4FEE, 0x8F43 },
+	{ 0x4FEF, 0x98EB }, { 0x4FF3, 0x946F }, { 0x4FF5, 0x9555 }, { 0x4FF6, 0x98E6 }, { 0x4FF8, 0x95EE }, { 0x4FFA, 0x89B4 }, { 0x4FFE, 0x98EA }, { 0x5005, 0x98E4 },
+	{ 0x5006, 0x98ED }, { 0x5009, 0x9171 }, { 0x500B, 0x8CC2 }, { 0x500D, 0x947B }, { 0x500F, 0xE0C5 }, { 0x5011, 0x98EC }, { 0x5012, 0x937C }, { 0x5014, 0x98E1 },
+	{ 0x5016, 0x8CF4 }, { 0x5019, 0x8CF3 }, { 0x501A, 0x98DF }, { 0x501F, 0x8ED8 }, { 0x5021, 0x98E7 }, { 0x5023, 0x95ED }, { 0x5024, 0x926C }, { 0x5025, 0x98E3 },
+	{ 0x5026, 0x8C91 }, { 0x5028, 0x98E0 }, { 0x5029, 0x98E8 }, { 0x502A, 0x98E2 }, { 0x502B, 0x97CF }, { 0x502C, 0x98E9 }, { 0x502D, 0x9860 }, { 0x5036, 0x8BE4 },
+	{ 0x5039, 0x8C90 }, { 0x5043, 0x98EE }, { 0x5047, 0x98EF }, { 0x5048, 0x98F3 }, { 0x5049, 0x88CC }, { 0x504F, 0x95CE }, { 0x5050, 0x98F2 }, { 0x5055, 0x98F1 },
+	{ 0x5056, 0x98F5 }, { 0x505A, 0x98F4 }, { 0x505C, 0x92E2 }, { 0x5065, 0x8C92 }, { 0x506C, 0x98F6 }, { 0x5072, 0x8EC3 }, { 0x5074, 0x91A4 }, { 0x5075, 0x92E3 },
+	{ 0x5076, 0x8BF4 }, { 0x5078, 0x98F7 }, { 0x507D, 0x8B55 }, { 0x5080, 0x98F8 }, { 0x5085, 0x98FA }, { 0x508D, 0x9654 }, { 0x5091, 0x8C86 }, { 0x5098, 0x8E50 },
+	{ 0x5099, 0x94F5 }, { 0x509A, 0x98F9 }, { 0x50AC, 0x8DC3 }, { 0x50AD, 0x9762 }, { 0x50B2, 0x98FC }, { 0x50B3, 0x9942 }, { 0x50B4, 0x98FB }, { 0x50B5, 0x8DC2 },
+	{ 0x50B7, 0x8F9D }, { 0x50BE, 0x8C58 }, { 0x50C2, 0x9943 }, { 0x50C5, 0x8BCD }, { 0x50C9, 0x9940 }, { 0x50CA, 0x9941 }, { 0x50CD, 0x93AD }, { 0x50CF, 0x919C },
+	{ 0x50D1, 0x8BA1 }, { 0x50D5, 0x966C }, { 0x50D6, 0x9944 }, { 0x50DA, 0x97BB }, { 0x50DE, 0x9945 }, { 0x50E3, 0x9948 }, { 0x50E5, 0x9946 }, { 0x50E7, 0x916D },
+	{ 0x50ED, 0x9947 }, { 0x50EE, 0x9949 }, { 0x50F5, 0x994B }, { 0x50F9, 0x994A }, { 0x50FB, 0x95C6 }, { 0x5100, 0x8B56 }, { 0x5101, 0x994D }, { 0x5102, 0x994E },
+	{ 0x5104, 0x89AD }, { 0x5109, 0x994C }, { 0x5112, 0x8EF2 }, { 0x5114, 0x9951 }, { 0x5115, 0x9950 }, { 0x5116, 0x994F }, { 0x5118, 0x98D4 }, { 0x511A, 0x9952 },
+	{ 0x511F, 0x8F9E }, { 0x5121, 0x9953 }, { 0x512A, 0x9744 }, { 0x5132, 0x96D7 }, { 0x5137, 0x9955 }, { 0x513A, 0x9954 }, { 0x513B, 0x9957 }, { 0x513C, 0x9956 },
+	{ 0x513F, 0x9958 }, { 0x5140, 0x9959 }, { 0x5141, 0x88F2 }, { 0x5143, 0x8CB3 }, { 0x5144, 0x8C5A }, { 0x5145, 0x8F5B }, { 0x5146, 0x929B }, { 0x5147, 0x8BA2 },
+	{ 0x5148, 0x90E6 }, { 0x5149, 0x8CF5 }, { 0x514B, 0x8D8E }, { 0x514C, 0x995B }, { 0x514D, 0x96C6 }, { 0x514E, 0x9365 }, { 0x5150, 0x8E99 }, { 0x5152, 0x995A },
+	{ 0x5154, 0x995C }, { 0x515A, 0x937D }, { 0x515C, 0x8A95 }, { 0x5162, 0x995D }, { 0x5165, 0x93FC }, { 0x5168, 0x9153 }, { 0x5169, 0x995F }, { 0x516A, 0x9960 },
+	{ 0x516B, 0x94AA }, { 0x516C, 0x8CF6 }, { 0x516D, 0x985A }, { 0x516E, 0x9961 }, { 0x5171, 0x8BA4 }, { 0x5175, 0x95BA }, { 0x5176, 0x91B4 }, { 0x5177, 0x8BEF },
+	{ 0x5178, 0x9354 }, { 0x517C, 0x8C93 }, { 0x5180, 0x9962 }, { 0x5182, 0x9963 }, { 0x5185, 0x93E0 }, { 0x5186, 0x897E }, { 0x5189, 0x9966 }, { 0x518A, 0x8DFB },
+	{ 0x518C, 0x9965 }, { 0x518D, 0x8DC4 }, { 0x518F, 0x9967 }, { 0x5190, 0xE3EC }, { 0x5191, 0x9968 }, { 0x5192, 0x9660 }, { 0x5193, 0x9969 }, { 0x5195, 0x996A },
+	{ 0x5196, 0x996B }, { 0x5197, 0x8FE7 }, { 0x5199, 0x8ECA }, { 0x51A0, 0x8AA5 }, { 0x51A2, 0x996E }, { 0x51A4, 0x996C }, { 0x51A5, 0x96BB }, { 0x51A6, 0x996D },
+	{ 0x51A8, 0x9579 }, { 0x51A9, 0x996F }, { 0x51AA, 0x9970 }, { 0x51AB, 0x9971 }, { 0x51AC, 0x937E }, { 0x51B0, 0x9975 }, { 0x51B1, 0x9973 }, { 0x51B2, 0x9974 },
+	{ 0x51B3, 0x9972 }, { 0x51B4, 0x8DE1 }, { 0x51B5, 0x9976 }, { 0x51B6, 0x96E8 }, { 0x51B7, 0x97E2 }, { 0x51BD, 0x9977 }, { 0x51C4, 0x90A6 }, { 0x51C5, 0x9978 },
+	{ 0x51C6, 0x8F79 }, { 0x51C9, 0x9979 }, { 0x51CB, 0x929C }, { 0x51CC, 0x97BD }, { 0x51CD, 0x9380 }, { 0x51D6, 0x99C3 }, { 0x51DB, 0x997A }, { 0x51DC, 0xEAA3 },
+	{ 0x51DD, 0x8BC3 }, { 0x51E0, 0x997B }, { 0x51E1, 0x967D }, { 0x51E6, 0x8F88 }, { 0x51E7, 0x91FA }, { 0x51E9, 0x997D }, { 0x51EA, 0x93E2 }, { 0x51ED, 0x997E },
+	{ 0x51F0, 0x9980 }, { 0x51F1, 0x8A4D }, { 0x51F5, 0x9981 }, { 0x51F6, 0x8BA5 }, { 0x51F8, 0x93CA }, { 0x51F9, 0x899A }, { 0x51FA, 0x8F6F }, { 0x51FD, 0x949F },
+	{ 0x51FE, 0x9982 }, { 0x5200, 0x9381 }, { 0x5203, 0x906E }, { 0x5204, 0x9983 }, { 0x5206, 0x95AA }, { 0x5207, 0x90D8 }, { 0x5208, 0x8AA0 }, { 0x520A, 0x8AA7 },
+	{ 0x520B, 0x9984 }, { 0x520E, 0x9986 }, { 0x5211, 0x8C59 }, { 0x5214, 0x9985 }, { 0x5217, 0x97F1 }, { 0x521D, 0x8F89 }, { 0x5224, 0x94BB }, { 0x5225, 0x95CA },
+	{ 0x5227, 0x9987 }, { 0x5229, 0x9798 }, { 0x522A, 0x9988 }, { 0x522E, 0x9989 }, { 0x5230, 0x939E }, { 0x5233, 0x998A }, { 0x5236, 0x90A7 }, { 0x5237, 0x8DFC },
+	{ 0x5238, 0x8C94 }, { 0x5239, 0x998B }, { 0x523A, 0x8E68 }, { 0x523B, 0x8D8F }, { 0x5243, 0x92E4 }, { 0x5244, 0x998D }, { 0x5247, 0x91A5 }, { 0x524A, 0x8DED },
+	{ 0x524B, 0x998E }, { 0x524C, 0x998F }, { 0x524D, 0x914F }, { 0x524F, 0x998C }, { 0x5254, 0x9991 }, { 0x5256, 0x9655 }, { 0x525B, 0x8D84 }, { 0x525E, 0x9990 },
+	{ 0x5263, 0x8C95 }, { 0x5264, 0x8DDC }, { 0x5265, 0x948D }, { 0x5269, 0x9994 }, { 0x526A, 0x9992 }, { 0x526F, 0x959B }, { 0x5270, 0x8FE8 }, { 0x5271, 0x999B },
+	{ 0x5272, 0x8A84 }, { 0x5273, 0x9995 }, { 0x5274, 0x9993 }, { 0x5275, 0x916E }, { 0x527D, 0x9997 }, { 0x527F, 0x9996 }, { 0x5283, 0x8A63 }, { 0x5287, 0x8C80 },
+	{ 0x5288, 0x999C }, { 0x5289, 0x97AB }, { 0x528D, 0x9998 }, { 0x5291, 0x999D }, { 0x5292, 0x999A }, { 0x5294, 0x9999 }, { 0x529B, 0x97CD }, { 0x529F, 0x8CF7 },
+	{ 0x52A0, 0x89C1 }, { 0x52A3, 0x97F2 }, { 0x52A9, 0x8F95 }, { 0x52AA, 0x9377 }, { 0x52AB, 0x8D85 }, { 0x52AC, 0x99A0 }, { 0x52AD, 0x99A1 }, { 0x52B1, 0x97E3 },
+	{ 0x52B4, 0x984A }, { 0x52B5, 0x99A3 }, { 0x52B9, 0x8CF8 }, { 0x52BC, 0x99A2 }, { 0x52BE, 0x8A4E }, { 0x52C1, 0x99A4 }, { 0x52C3, 0x9675 }, { 0x52C5, 0x92BA },
+	{ 0x52C7, 0x9745 }, { 0x52C9, 0x95D7 }, { 0x52CD, 0x99A5 }, { 0x52D2, 0xE8D3 }, { 0x52D5, 0x93AE }, { 0x52D7, 0x99A6 }, { 0x52D8, 0x8AA8 }, { 0x52D9, 0x96B1 },
+	{ 0x52DD, 0x8F9F }, { 0x52DE, 0x99A7 }, { 0x52DF, 0x95E5 }, { 0x52E0, 0x99AB }, { 0x52E2, 0x90A8 }, { 0x52E3, 0x99A8 }, { 0x52E4, 0x8BCE }, { 0x52E6, 0x99A9 },
+	{ 0x52E7, 0x8AA9 }, { 0x52F2, 0x8C4D }, { 0x52F3, 0x99AC }, { 0x52F5, 0x99AD }, { 0x52F8, 0x99AE }, { 0x52F9, 0x99AF }, { 0x52FA, 0x8ED9 }, { 0x52FE, 0x8CF9 },
+	{ 0x52FF, 0x96DC }, { 0x5301, 0x96E6 }, { 0x5302, 0x93F5 }, { 0x5305, 0x95EF }, { 0x5306, 0x99B0 }, { 0x5308, 0x99B1 }, { 0x530D, 0x99B3 }, { 0x530F, 0x99B5 },
+	{ 0x5310, 0x99B4 }, { 0x5315, 0x99B6 }, { 0x5316, 0x89BB }, { 0x5317, 0x966B }, { 0x5319, 0x8DFA }, { 0x531A, 0x99B7 }, { 0x531D, 0x9178 }, { 0x5320, 0x8FA0 },
+	{ 0x5321, 0x8BA7 }, { 0x5323, 0x99B8 }, { 0x532A, 0x94D9 }, { 0x532F, 0x99B9 }, { 0x5331, 0x99BA }, { 0x5333, 0x99BB }, { 0x5338, 0x99BC }, { 0x5339, 0x9543 },
+	{ 0x533A, 0x8BE6 }, { 0x533B, 0x88E3 }, { 0x533F, 0x93BD }, { 0x5340, 0x99BD }, { 0x5341, 0x8F5C }, { 0x5343, 0x90E7 }, { 0x5345, 0x99BF }, { 0x5346, 0x99BE },
+	{ 0x5347, 0x8FA1 }, { 0x5348, 0x8CDF }, { 0x5349, 0x99C1 }, { 0x534A, 0x94BC }, { 0x534D, 0x99C2 }, { 0x5351, 0x94DA }, { 0x5352, 0x91B2 }, { 0x5353, 0x91EC },
+	{ 0x5354, 0x8BA6 }, { 0x5357, 0x93EC }, { 0x5358, 0x9250 }, { 0x535A, 0x948E }, { 0x535C, 0x966D }, { 0x535E, 0x99C4 }, { 0x5360, 0x90E8 }, { 0x5366, 0x8C54 },
+	{ 0x5369, 0x99C5 }, { 0x536E, 0x99C6 }, { 0x536F, 0x894B }, { 0x5370, 0x88F3 }, { 0x5371, 0x8AEB }, { 0x5373, 0x91A6 }, { 0x5374, 0x8B70 }, { 0x5375, 0x9791 },
+	{ 0x5377, 0x99C9 }, { 0x5378, 0x89B5 }, { 0x537B, 0x99C8 }, { 0x537F, 0x8BA8 }, { 0x5382, 0x99CA }, { 0x5384, 0x96EF }, { 0x5396, 0x99CB }, { 0x5398, 0x97D0 },
+	{ 0x539A, 0x8CFA }, { 0x539F, 0x8CB4 }, { 0x53A0, 0x99CC }, { 0x53A5, 0x99CE }, { 0x53A6, 0x99CD }, { 0x53A8, 0x907E }, { 0x53A9, 0x8958 }, { 0x53AD, 0x897D },
+	{ 0x53AE, 0x99CF }, { 0x53B0, 0x99D0 }, { 0x53B3, 0x8CB5 }, { 0x53B6, 0x99D1 }, { 0x53BB, 0x8B8E }, { 0x53C2, 0x8E51 }, { 0x53C3, 0x99D2 }, { 0x53C8, 0x9694 },
+	{ 0x53C9, 0x8DB3 }, { 0x53CA, 0x8B79 }, { 0x53CB, 0x9746 }, { 0x53CC, 0x916F }, { 0x53CD, 0x94BD }, { 0x53CE, 0x8EFB }, { 0x53D4, 0x8F66 }, { 0x53D6, 0x8EE6 },
+	{ 0x53D7, 0x8EF3 }, { 0x53D9, 0x8F96 }, { 0x53DB, 0x94BE }, { 0x53DF, 0x99D5 }, { 0x53E1, 0x8962 }, { 0x53E2, 0x9170 }, { 0x53E3, 0x8CFB }, { 0x53E4, 0x8CC3 },
+	{ 0x53E5, 0x8BE5 }, { 0x53E8, 0x99D9 }, { 0x53E9, 0x9240 }, { 0x53EA, 0x91FC }, { 0x53EB, 0x8BA9 }, { 0x53EC, 0x8FA2 }, { 0x53ED, 0x99DA }, { 0x53EE, 0x99D8 },
+	{ 0x53EF, 0x89C2 }, { 0x53F0, 0x91E4 }, { 0x53F1, 0x8EB6 }, { 0x53F2, 0x8E6A }, { 0x53F3, 0x8945 }, { 0x53F6, 0x8A90 }, { 0x53F7, 0x8D86 }, { 0x53F8, 0x8E69 },
+	{ 0x53FA, 0x99DB }, { 0x5401, 0x99DC }, { 0x5403, 0x8B68 }, { 0x5404, 0x8A65 }, { 0x5408, 0x8D87 }, { 0x5409, 0x8B67 }, { 0x540A, 0x92DD }, { 0x540B, 0x8944 },
+	{ 0x540C, 0x93AF }, { 0x540D, 0x96BC }, { 0x540E, 0x8D40 }, { 0x540F, 0x9799 }, { 0x5410, 0x9366 }, { 0x5411, 0x8CFC }, { 0x541B, 0x8C4E }, { 0x541D, 0x99E5 },
+	{ 0x541F, 0x8BE1 }, { 0x5420, 0x9669 }, { 0x5426, 0x94DB }, { 0x5429, 0x99E4 }, { 0x542B, 0x8ADC }, { 0x542C, 0x99DF }, { 0x542D, 0x99E0 }, { 0x542E, 0x99E2 },
+	{ 0x5436, 0x99E3 }, { 0x5438, 0x8B7A }, { 0x5439, 0x9081 }, { 0x543B, 0x95AB }, { 0x543C, 0x99E1 }, { 0x543D, 0x99DD }, { 0x543E, 0x8CE1 }, { 0x5440, 0x99DE },
+	{ 0x5442, 0x9843 }, { 0x5446, 0x95F0 }, { 0x5448, 0x92E6 }, { 0x5449, 0x8CE0 }, { 0x544A, 0x8D90 }, { 0x544E, 0x99E6 }, { 0x5451, 0x93DB }, { 0x545F, 0x99EA },
+	{ 0x5468, 0x8EFC }, { 0x546A, 0x8EF4 }, { 0x5470, 0x99ED }, { 0x5471, 0x99EB }, { 0x5473, 0x96A1 }, { 0x5475, 0x99E8 }, { 0x5476, 0x99F1 }, { 0x5477, 0x99EC },
+	{ 0x547B, 0x99EF }, { 0x547C, 0x8CC4 }, { 0x547D, 0x96BD }, { 0x5480, 0x99F0 }, { 0x5484, 0x99F2 }, { 0x5486, 0x99F4 }, { 0x548B, 0x8DEE }, { 0x548C, 0x9861 },
+	{ 0x548E, 0x99E9 }, { 0x548F, 0x99E7 }, { 0x5490, 0x99F3 }, { 0x5492, 0x99EE }, { 0x54A2, 0x99F6 }, { 0x54A4, 0x9A42 }, { 0x54A5, 0x99F8 }, { 0x54A8, 0x99FC },
+	{ 0x54AB, 0x9A40 }, { 0x54AC, 0x99F9 }, { 0x54AF, 0x9A5D }, { 0x54B2, 0x8DE7 }, { 0x54B3, 0x8A50 }, { 0x54B8, 0x99F7 }, { 0x54BC, 0x9A44 }, { 0x54BD, 0x88F4 },
+	{ 0x54BE, 0x9A43 }, { 0x54C0, 0x88A3 }, { 0x54C1, 0x9569 }, { 0x54C2, 0x9A41 }, { 0x54C4, 0x99FA }, { 0x54C7, 0x99F5 }, { 0x54C8, 0x99FB }, { 0x54C9, 0x8DC6 },
+	{ 0x54D8, 0x9A45 }, { 0x54E1, 0x88F5 }, { 0x54E2, 0x9A4E }, { 0x54E5, 0x9A46 }, { 0x54E6, 0x9A47 }, { 0x54E8, 0x8FA3 }, { 0x54E9, 0x9689 }, { 0x54ED, 0x9A4C },
+	{ 0x54EE, 0x9A4B }, { 0x54F2, 0x934E }, { 0x54FA, 0x9A4D }, { 0x54FD, 0x9A4A }, { 0x5504, 0x8953 }, { 0x5506, 0x8DB4 }, { 0x5507, 0x904F }, { 0x550F, 0x9A48 },
+	{ 0x5510, 0x9382 }, { 0x5514, 0x9A49 }, { 0x5516, 0x88A0 }, { 0x552E, 0x9A53 }, { 0x552F, 0x9742 }, { 0x5531, 0x8FA5 }, { 0x5533, 0x9A59 }, { 0x5538, 0x9A58 },
+	{ 0x5539, 0x9A4F }, { 0x553E, 0x91C1 }, { 0x5540, 0x9A50 }, { 0x5544, 0x91ED }, { 0x5545, 0x9A55 }, { 0x5546, 0x8FA4 }, { 0x554C, 0x9A52 }, { 0x554F, 0x96E2 },
+	{ 0x5553, 0x8C5B }, { 0x5556, 0x9A56 }, { 0x5557, 0x9A57 }, { 0x555C, 0x9A54 }, { 0x555D, 0x9A5A }, { 0x5563, 0x9A51 }, { 0x557B, 0x9A60 }, { 0x557C, 0x9A65 },
+	{ 0x557E, 0x9A61 }, { 0x5580, 0x9A5C }, { 0x5583, 0x9A66 }, { 0x5584, 0x9150 }, { 0x5587, 0x9A68 }, { 0x5589, 0x8D41 }, { 0x558A, 0x9A5E }, { 0x558B, 0x929D },
+	{ 0x5598, 0x9A62 }, { 0x5599, 0x9A5B }, { 0x559A, 0x8AAB }, { 0x559C, 0x8AEC }, { 0x559D, 0x8A85 }, { 0x559E, 0x9A63 }, { 0x559F, 0x9A5F }, { 0x55A7, 0x8C96 },
+	{ 0x55A8, 0x9A69 }, { 0x55A9, 0x9A67 }, { 0x55AA, 0x9172 }, { 0x55AB, 0x8B69 }, { 0x55AC, 0x8BAA }, { 0x55AE, 0x9A64 }, { 0x55B0, 0x8BF2 }, { 0x55B6, 0x8963 },
+	{ 0x55C4, 0x9A6D }, { 0x55C5, 0x9A6B }, { 0x55C7, 0x9AA5 }, { 0x55D4, 0x9A70 }, { 0x55DA, 0x9A6A }, { 0x55DC, 0x9A6E }, { 0x55DF, 0x9A6C }, { 0x55E3, 0x8E6B },
+	{ 0x55E4, 0x9A6F }, { 0x55F7, 0x9A72 }, { 0x55F9, 0x9A77 }, { 0x55FD, 0x9A75 }, { 0x55FE, 0x9A74 }, { 0x5606, 0x9251 }, { 0x5609, 0x89C3 }, { 0x5614, 0x9A71 },
+	{ 0x5616, 0x9A73 }, { 0x5617, 0x8FA6 }, { 0x5618, 0x8952 }, { 0x561B, 0x9A76 }, { 0x5629, 0x89DC }, { 0x562F, 0x9A82 }, { 0x5631, 0x8FFA }, { 0x5632, 0x9A7D },
+	{ 0x5634, 0x9A7B }, { 0x5636, 0x9A7C }, { 0x5638, 0x9A7E }, { 0x5642, 0x895C }, { 0x564C, 0x9158 }, { 0x564E, 0x9A78 }, { 0x5650, 0x9A79 }, { 0x565B, 0x8A9A },
+	{ 0x5664, 0x9A81 }, { 0x5668, 0x8AED }, { 0x566A, 0x9A84 }, { 0x566B, 0x9A80 }, { 0x566C, 0x9A83 }, { 0x5674, 0x95AC }, { 0x5678, 0x93D3 }, { 0x567A, 0x94B6 },
+	{ 0x5680, 0x9A86 }, { 0x5686, 0x9A85 }, { 0x5687, 0x8A64 }, { 0x568A, 0x9A87 }, { 0x568F, 0x9A8A }, { 0x5694, 0x9A89 }, { 0x56A0, 0x9A88 }, { 0x56A2, 0x9458 },
+	{ 0x56A5, 0x9A8B }, { 0x56AE, 0x9A8C }, { 0x56B4, 0x9A8E }, { 0x56B6, 0x9A8D }, { 0x56BC, 0x9A90 }, { 0x56C0, 0x9A93 }, { 0x56C1, 0x9A91 }, { 0x56C2, 0x9A8F },
+	{ 0x56C3, 0x9A92 }, { 0x56C8, 0x9A94 }, { 0x56CE, 0x9A95 }, { 0x56D1, 0x9A96 }, { 0x56D3, 0x9A97 }, { 0x56D7, 0x9A98 }, { 0x56D8, 0x9964 }, { 0x56DA, 0x8EFA },
+	{ 0x56DB, 0x8E6C }, { 0x56DE, 0x89F1 }, { 0x56E0, 0x88F6 }, { 0x56E3, 0x9263 }, { 0x56EE, 0x9A99 }, { 0x56F0, 0x8DA2 }, { 0x56F2, 0x88CD }, { 0x56F3, 0x907D },
+	{ 0x56F9, 0x9A9A }, { 0x56FA, 0x8CC5 }, { 0x56FD, 0x8D91 }, { 0x56FF, 0x9A9C }, { 0x5700, 0x9A9B }, { 0x5703, 0x95DE }, { 0x5704, 0x9A9D }, { 0x5708, 0x9A9F },
+	{ 0x5709, 0x9A9E }, { 0x570B, 0x9AA0 }, { 0x570D, 0x9AA1 }, { 0x570F, 0x8C97 }, { 0x5712, 0x8980 }, { 0x5713, 0x9AA2 }, { 0x5716, 0x9AA4 }, { 0x5718, 0x9AA3 },
+	{ 0x571C, 0x9AA6 }, { 0x571F, 0x9379 }, { 0x5726, 0x9AA7 }, { 0x5727, 0x88B3 }, { 0x5728, 0x8DDD }, { 0x572D, 0x8C5C }, { 0x5730, 0x926E }, { 0x5737, 0x9AA8 },
+	{ 0x5738, 0x9AA9 }, { 0x573B, 0x9AAB }, { 0x5740, 0x9AAC }, { 0x5742, 0x8DE2 }, { 0x5747, 0x8BCF }, { 0x574A, 0x9656 }, { 0x574E, 0x9AAA }, { 0x574F, 0x9AAD },
+	{ 0x5750, 0x8DBF }, { 0x5751, 0x8D42 }, { 0x5761, 0x9AB1 }, { 0x5764, 0x8DA3 }, { 0x5766, 0x9252 }, { 0x5769, 0x9AAE }, { 0x576A, 0x92D8 }, { 0x577F, 0x9AB2 },
+	{ 0x5782, 0x9082 }, { 0x5788, 0x9AB0 }, { 0x5789, 0x9AB3 }, { 0x578B, 0x8C5E }, { 0x5793, 0x9AB4 }, { 0x57A0, 0x9AB5 }, { 0x57A2, 0x8D43 }, { 0x57A3, 0x8A5F },
+	{ 0x57A4, 0x9AB7 }, { 0x57AA, 0x9AB8 }, { 0x57B0, 0x9AB9 }, { 0x57B3, 0x9AB6 }, { 0x57C0, 0x9AAF }, { 0x57C3, 0x9ABA }, { 0x57C6, 0x9ABB }, { 0x57CB, 0x9684 },
+	{ 0x57CE, 0x8FE9 }, { 0x57D2, 0x9ABD }, { 0x57D3, 0x9ABE }, { 0x57D4, 0x9ABC }, { 0x57D6, 0x9AC0 }, { 0x57DC, 0x9457 }, { 0x57DF, 0x88E6 }, { 0x57E0, 0x9575 },
+	{ 0x57E3, 0x9AC1 }, { 0x57F4, 0x8FFB }, { 0x57F7, 0x8EB7 }, { 0x57F9, 0x947C }, { 0x57FA, 0x8AEE }, { 0x57FC, 0x8DE9 }, { 0x5800, 0x9678 }, { 0x5802, 0x93B0 },
+	{ 0x5805, 0x8C98 }, { 0x5806, 0x91CD }, { 0x580A, 0x9ABF }, { 0x580B, 0x9AC2 }, { 0x5815, 0x91C2 }, { 0x5819, 0x9AC3 }, { 0x581D, 0x9AC4 }, { 0x5821, 0x9AC6 },
+	{ 0x5824, 0x92E7 }, { 0x582A, 0x8AAC }, { 0x582F, 0xEA9F }, { 0x5830, 0x8981 }, { 0x5831, 0x95F1 }, { 0x5834, 0x8FEA }, { 0x5835, 0x9367 }, { 0x583A, 0x8DE4 },
+	{ 0x583D, 0x9ACC }, { 0x5840, 0x95BB }, { 0x5841, 0x97DB }, { 0x584A, 0x89F2 }, { 0x584B, 0x9AC8 }, { 0x5851, 0x9159 }, { 0x5852, 0x9ACB }, { 0x5854, 0x9383 },
+	{ 0x5857, 0x9368 }, { 0x5858, 0x9384 }, { 0x5859, 0x94B7 }, { 0x585A, 0x92CB }, { 0x585E, 0x8DC7 }, { 0x5862, 0x9AC7 }, { 0x5869, 0x8996 }, { 0x586B, 0x9355 },
+	{ 0x5870, 0x9AC9 }, { 0x5872, 0x9AC5 }, { 0x5875, 0x906F }, { 0x5879, 0x9ACD }, { 0x587E, 0x8F6D }, { 0x5883, 0x8BAB }, { 0x5885, 0x9ACE }, { 0x5893, 0x95E6 },
+	{ 0x5897, 0x919D }, { 0x589C, 0x92C4 }, { 0x589F, 0x9AD0 }, { 0x58A8, 0x966E }, { 0x58AB, 0x9AD1 }, { 0x58AE, 0x9AD6 }, { 0x58B3, 0x95AD }, { 0x58B8, 0x9AD5 },
+	{ 0x58B9, 0x9ACF }, { 0x58BA, 0x9AD2 }, { 0x58BB, 0x9AD4 }, { 0x58BE, 0x8DA4 }, { 0x58C1, 0x95C7 }, { 0x58C5, 0x9AD7 }, { 0x58C7, 0x9264 }, { 0x58CA, 0x89F3 },
+	{ 0x58CC, 0x8FEB }, { 0x58D1, 0x9AD9 }, { 0x58D3, 0x9AD8 }, { 0x58D5, 0x8D88 }, { 0x58D7, 0x9ADA }, { 0x58D8, 0x9ADC }, { 0x58D9, 0x9ADB }, { 0x58DC, 0x9ADE },
+	{ 0x58DE, 0x9AD3 }, { 0x58DF, 0x9AE0 }, { 0x58E4, 0x9ADF }, { 0x58E5, 0x9ADD }, { 0x58EB, 0x8E6D }, { 0x58EC, 0x9070 }, { 0x58EE, 0x9173 }, { 0x58EF, 0x9AE1 },
+	{ 0x58F0, 0x90BA }, { 0x58F1, 0x88EB }, { 0x58F2, 0x9484 }, { 0x58F7, 0x92D9 }, { 0x58F9, 0x9AE3 }, { 0x58FA, 0x9AE2 }, { 0x58FB, 0x9AE4 }, { 0x58FC, 0x9AE5 },
+	{ 0x58FD, 0x9AE6 }, { 0x5902, 0x9AE7 }, { 0x5909, 0x95CF }, { 0x590A, 0x9AE8 }, { 0x590F, 0x89C4 }, { 0x5910, 0x9AE9 }, { 0x5915, 0x975B }, { 0x5916, 0x8A4F },
+	{ 0x5918, 0x99C7 }, { 0x5919, 0x8F67 }, { 0x591A, 0x91BD }, { 0x591B, 0x9AEA }, { 0x591C, 0x96E9 }, { 0x5922, 0x96B2 }, { 0x5925, 0x9AEC }, { 0x5927, 0x91E5 },
+	{ 0x5929, 0x9356 }, { 0x592A, 0x91BE }, { 0x592B, 0x9576 }, { 0x592C, 0x9AED }, { 0x592D, 0x9AEE }, { 0x592E, 0x899B }, { 0x5931, 0x8EB8 }, { 0x5932, 0x9AEF },
+	{ 0x5937, 0x88CE }, { 0x5938, 0x9AF0 }, { 0x593E, 0x9AF1 }, { 0x5944, 0x8982 }, { 0x5947, 0x8AEF }, { 0x5948, 0x93DE }, { 0x5949, 0x95F2 }, { 0x594E, 0x9AF5 },
+	{ 0x594F, 0x9174 }, { 0x5950, 0x9AF4 }, { 0x5951, 0x8C5F }, { 0x5954, 0x967A }, { 0x5955, 0x9AF3 }, { 0x5957, 0x9385 }, { 0x5958, 0x9AF7 }, { 0x595A, 0x9AF6 },
+	{ 0x5960, 0x9AF9 }, { 0x5962, 0x9AF8 }, { 0x5965, 0x899C }, { 0x5967, 0x9AFA }, { 0x5968, 0x8FA7 }, { 0x5969, 0x9AFC }, { 0x596A, 0x9244 }, { 0x596C, 0x9AFB },
+	{ 0x596E, 0x95B1 }, { 0x5973, 0x8F97 }, { 0x5974, 0x937A }, { 0x5978, 0x9B40 }, { 0x597D, 0x8D44 }, { 0x5981, 0x9B41 }, { 0x5982, 0x9440 }, { 0x5983, 0x94DC },
+	{ 0x5984, 0x96CF }, { 0x598A, 0x9444 }, { 0x598D, 0x9B4A }, { 0x5993, 0x8B57 }, { 0x5996, 0x9764 }, { 0x5999, 0x96AD }, { 0x599B, 0x9BAA }, { 0x599D, 0x9B42 },
+	{ 0x59A3, 0x9B45 }, { 0x59A5, 0x91C3 }, { 0x59A8, 0x9657 }, { 0x59AC, 0x9369 }, { 0x59B2, 0x9B46 }, { 0x59B9, 0x9685 }, { 0x59BB, 0x8DC8 }, { 0x59BE, 0x8FA8 },
+	{ 0x59C6, 0x9B47 }, { 0x59C9, 0x8E6F }, { 0x59CB, 0x8E6E }, { 0x59D0, 0x88B7 }, { 0x59D1, 0x8CC6 }, { 0x59D3, 0x90A9 }, { 0x59D4, 0x88CF }, { 0x59D9, 0x9B4B },
+	{ 0x59DA, 0x9B4C }, { 0x59DC, 0x9B49 }, { 0x59E5, 0x8957 }, { 0x59E6, 0x8AAD }, { 0x59E8, 0x9B48 }, { 0x59EA, 0x96C3 }, { 0x59EB, 0x9550 }, { 0x59F6, 0x88A6 },
+	{ 0x59FB, 0x88F7 }, { 0x59FF, 0x8E70 }, { 0x5A01, 0x88D0 }, { 0x5A03, 0x88A1 }, { 0x5A09, 0x9B51 }, { 0x5A11, 0x9B4F }, { 0x5A18, 0x96BA }, { 0x5A1A, 0x9B52 },
+	{ 0x5A1C, 0x9B50 }, { 0x5A1F, 0x9B4E }, { 0x5A20, 0x9050 }, { 0x5A25, 0x9B4D }, { 0x5A29, 0x95D8 }, { 0x5A2F, 0x8CE2 }, { 0x5A35, 0x9B56 }, { 0x5A36, 0x9B57 },
+	{ 0x5A3C, 0x8FA9 }, { 0x5A40, 0x9B53 }, { 0x5A41, 0x984B }, { 0x5A46, 0x946B }, { 0x5A49, 0x9B55 }, { 0x5A5A, 0x8DA5 }, { 0x5A62, 0x9B58 }, { 0x5A66, 0x9577 },
+	{ 0x5A6A, 0x9B59 }, { 0x5A6C, 0x9B54 }, { 0x5A7F, 0x96B9 }, { 0x5A92, 0x947D }, { 0x5A9A, 0x9B5A }, { 0x5A9B, 0x9551 }, { 0x5ABC, 0x9B5B }, { 0x5ABD, 0x9B5F },
+	{ 0x5ABE, 0x9B5C }, { 0x5AC1, 0x89C5 }, { 0x5AC2, 0x9B5E }, { 0x5AC9, 0x8EB9 }, { 0x5ACB, 0x9B5D }, { 0x5ACC, 0x8C99 }, { 0x5AD0, 0x9B6B }, { 0x5AD6, 0x9B64 },
+	{ 0x5AD7, 0x9B61 }, { 0x5AE1, 0x9284 }, { 0x5AE3, 0x9B60 }, { 0x5AE6, 0x9B62 }, { 0x5AE9, 0x9B63 }, { 0x5AFA, 0x9B65 }, { 0x5AFB, 0x9B66 }, { 0x5B09, 0x8AF0 },
+	{ 0x5B0B, 0x9B68 }, { 0x5B0C, 0x9B67 }, { 0x5B16, 0x9B69 }, { 0x5B22, 0x8FEC }, { 0x5B2A, 0x9B6C }, { 0x5B2C, 0x92DA }, { 0x5B30, 0x8964 }, { 0x5B32, 0x9B6A },
+	{ 0x5B36, 0x9B6D }, { 0x5B3E, 0x9B6E }, { 0x5B40, 0x9B71 }, { 0x5B43, 0x9B6F }, { 0x5B45, 0x9B70 }, { 0x5B50, 0x8E71 }, { 0x5B51, 0x9B72 }, { 0x5B54, 0x8D45 },
+	{ 0x5B55, 0x9B73 }, { 0x5B57, 0x8E9A }, { 0x5B58, 0x91B6 }, { 0x5B5A, 0x9B74 }, { 0x5B5B, 0x9B75 }, { 0x5B5C, 0x8E79 }, { 0x5B5D, 0x8D46 }, { 0x5B5F, 0x96D0 },
+	{ 0x5B63, 0x8B47 }, { 0x5B64, 0x8CC7 }, { 0x5B65, 0x9B76 }, { 0x5B66, 0x8A77 }, { 0x5B69, 0x9B77 }, { 0x5B6B, 0x91B7 }, { 0x5B70, 0x9B78 }, { 0x5B71, 0x9BA1 },
+	{ 0x5B73, 0x9B79 }, { 0x5B75, 0x9B7A }, { 0x5B78, 0x9B7B }, { 0x5B7A, 0x9B7D }, { 0x5B80, 0x9B7E }, { 0x5B83, 0x9B80 }, { 0x5B85, 0x91EE }, { 0x5B87, 0x8946 },
+	{ 0x5B88, 0x8EE7 }, { 0x5B89, 0x88C0 }, { 0x5B8B, 0x9176 }, { 0x5B8C, 0x8AAE }, { 0x5B8D, 0x8EB3 }, { 0x5B8F, 0x8D47 }, { 0x5B95, 0x9386 }, { 0x5B97, 0x8F40 },
+	{ 0x5B98, 0x8AAF }, { 0x5B99, 0x9288 }, { 0x5B9A, 0x92E8 }, { 0x5B9B, 0x88B6 }, { 0x5B9C, 0x8B58 }, { 0x5B9D, 0x95F3 }, { 0x5B9F, 0x8EC0 }, { 0x5BA2, 0x8B71 },
+	{ 0x5BA3, 0x90E9 }, { 0x5BA4, 0x8EBA }, { 0x5BA5, 0x9747 }, { 0x5BA6, 0x9B81 }, { 0x5BAE, 0x8B7B }, { 0x5BB0, 0x8DC9 }, { 0x5BB3, 0x8A51 }, { 0x5BB4, 0x8983 },
+	{ 0x5BB5, 0x8FAA }, { 0x5BB6, 0x89C6 }, { 0x5BB8, 0x9B82 }, { 0x5BB9, 0x9765 }, { 0x5BBF, 0x8F68 }, { 0x5BC2, 0x8EE2 }, { 0x5BC3, 0x9B83 }, { 0x5BC4, 0x8AF1 },
+	{ 0x5BC5, 0x93D0 }, { 0x5BC6, 0x96A7 }, { 0x5BC7, 0x9B84 }, { 0x5BC9, 0x9B85 }, { 0x5BCC, 0x9578 }, { 0x5BD0, 0x9B87 }, { 0x5BD2, 0x8AA6 }, { 0x5BD3, 0x8BF5 },
+	{ 0x5BD4, 0x9B86 }, { 0x5BDB, 0x8AB0 }, { 0x5BDD, 0x9051 }, { 0x5BDE, 0x9B8B }, { 0x5BDF, 0x8E40 }, { 0x5BE1, 0x89C7 }, { 0x5BE2, 0x9B8A }, { 0x5BE4, 0x9B88 },
+	{ 0x5BE5, 0x9B8C }, { 0x5BE6, 0x9B89 }, { 0x5BE7, 0x944A }, { 0x5BE8, 0x9ECB }, { 0x5BE9, 0x9052 }, { 0x5BEB, 0x9B8D }, { 0x5BEE, 0x97BE }, { 0x5BF0, 0x9B8E },
+	{ 0x5BF3, 0x9B90 }, { 0x5BF5, 0x929E }, { 0x5BF6, 0x9B8F }, { 0x5BF8, 0x90A1 }, { 0x5BFA, 0x8E9B }, { 0x5BFE, 0x91CE }, { 0x5BFF, 0x8EF5 }, { 0x5C01, 0x9595 },
+	{ 0x5C02, 0x90EA }, { 0x5C04, 0x8ECB }, { 0x5C05, 0x9B91 }, { 0x5C06, 0x8FAB }, { 0x5C07, 0x9B92 }, { 0x5C08, 0x9B93 }, { 0x5C09, 0x88D1 }, { 0x5C0A, 0x91B8 },
+	{ 0x5C0B, 0x9071 }, { 0x5C0D, 0x9B94 }, { 0x5C0E, 0x93B1 }, { 0x5C0F, 0x8FAC }, { 0x5C11, 0x8FAD }, { 0x5C13, 0x9B95 }, { 0x5C16, 0x90EB }, { 0x5C1A, 0x8FAE },
+	{ 0x5C20, 0x9B96 }, { 0x5C22, 0x9B97 }, { 0x5C24, 0x96DE }, { 0x5C28, 0x9B98 }, { 0x5C2D, 0x8BC4 }, { 0x5C31, 0x8F41 }, { 0x5C38, 0x9B99 }, { 0x5C39, 0x9B9A },
+	{ 0x5C3A, 0x8EDA }, { 0x5C3B, 0x904B }, { 0x5C3C, 0x93F2 }, { 0x5C3D, 0x9073 }, { 0x5C3E, 0x94F6 }, { 0x5C3F, 0x9441 }, { 0x5C40, 0x8BC7 }, { 0x5C41, 0x9B9B },
+	{ 0x5C45, 0x8B8F }, { 0x5C46, 0x9B9C }, { 0x5C48, 0x8BFC }, { 0x5C4A, 0x93CD }, { 0x5C4B, 0x89AE }, { 0x5C4D, 0x8E72 }, { 0x5C4E, 0x9B9D }, { 0x5C4F, 0x9BA0 },
+	{ 0x5C50, 0x9B9F }, { 0x5C51, 0x8BFB }, { 0x5C53, 0x9B9E }, { 0x5C55, 0x9357 }, { 0x5C5E, 0x91AE }, { 0x5C60, 0x936A }, { 0x5C61, 0x8EC6 }, { 0x5C64, 0x9177 },
+	{ 0x5C65, 0x979A }, { 0x5C6C, 0x9BA2 }, { 0x5C6E, 0x9BA3 }, { 0x5C6F, 0x93D4 }, { 0x5C71, 0x8E52 }, { 0x5C76, 0x9BA5 }, { 0x5C79, 0x9BA6 }, { 0x5C8C, 0x9BA7 },
+	{ 0x5C90, 0x8AF2 }, { 0x5C91, 0x9BA8 }, { 0x5C94, 0x9BA9 }, { 0x5CA1, 0x89AA }, { 0x5CA8, 0x915A }, { 0x5CA9, 0x8AE2 }, { 0x5CAB, 0x9BAB }, { 0x5CAC, 0x96A6 },
+	{ 0x5CB1, 0x91D0 }, { 0x5CB3, 0x8A78 }, { 0x5CB6, 0x9BAD }, { 0x5CB7, 0x9BAF }, { 0x5CB8, 0x8ADD }, { 0x5CBB, 0x9BAC }, { 0x5CBC, 0x9BAE }, { 0x5CBE, 0x9BB1 },
+	{ 0x5CC5, 0x9BB0 }, { 0x5CC7, 0x9BB2 }, { 0x5CD9, 0x9BB3 }, { 0x5CE0, 0x93BB }, { 0x5CE1, 0x8BAC }, { 0x5CE8, 0x89E3 }, { 0x5CE9, 0x9BB4 }, { 0x5CEA, 0x9BB9 },
+	{ 0x5CED, 0x9BB7 }, { 0x5CEF, 0x95F5 }, { 0x5CF0, 0x95F4 }, { 0x5CF6, 0x9387 }, { 0x5CFA, 0x9BB6 }, { 0x5CFB, 0x8F73 }, { 0x5CFD, 0x9BB5 }, { 0x5D07, 0x9092 },
+	{ 0x5D0B, 0x9BBA }, { 0x5D0E, 0x8DE8 }, { 0x5D11, 0x9BC0 }, { 0x5D14, 0x9BC1 }, { 0x5D15, 0x9BBB }, { 0x5D16, 0x8A52 }, { 0x5D17, 0x9BBC }, { 0x5D18, 0x9BC5 },
+	{ 0x5D19, 0x9BC4 }, { 0x5D1A, 0x9BC3 }, { 0x5D1B, 0x9BBF }, { 0x5D1F, 0x9BBE }, { 0x5D22, 0x9BC2 }, { 0x5D29, 0x95F6 }, { 0x5D4B, 0x9BC9 }, { 0x5D4C, 0x9BC6 },
+	{ 0x5D4E, 0x9BC8 }, { 0x5D50, 0x9792 }, { 0x5D52, 0x9BC7 }, { 0x5D5C, 0x9BBD }, { 0x5D69, 0x9093 }, { 0x5D6C, 0x9BCA }, { 0x5D6F, 0x8DB5 }, { 0x5D73, 0x9BCB },
+	{ 0x5D76, 0x9BCC }, { 0x5D82, 0x9BCF }, { 0x5D84, 0x9BCE }, { 0x5D87, 0x9BCD }, { 0x5D8B, 0x9388 }, { 0x5D8C, 0x9BB8 }, { 0x5D90, 0x9BD5 }, { 0x5D9D, 0x9BD1 },
+	{ 0x5DA2, 0x9BD0 }, { 0x5DAC, 0x9BD2 }, { 0x5DAE, 0x9BD3 }, { 0x5DB7, 0x9BD6 }, { 0x5DBA, 0x97E4 }, { 0x5DBC, 0x9BD7 }, { 0x5DBD, 0x9BD4 }, { 0x5DC9, 0x9BD8 },
+	{ 0x5DCC, 0x8ADE }, { 0x5DCD, 0x9BD9 }, { 0x5DD2, 0x9BDB }, { 0x5DD3, 0x9BDA }, { 0x5DD6, 0x9BDC }, { 0x5DDB, 0x9BDD }, { 0x5DDD, 0x90EC }, { 0x5DDE, 0x8F42 },
+	{ 0x5DE1, 0x8F84 }, { 0x5DE3, 0x9183 }, { 0x5DE5, 0x8D48 }, { 0x5DE6, 0x8DB6 }, { 0x5DE7, 0x8D49 }, { 0x5DE8, 0x8B90 }, { 0x5DEB, 0x9BDE }, { 0x5DEE, 0x8DB7 },
+	{ 0x5DF1, 0x8CC8 }, { 0x5DF2, 0x9BDF }, { 0x5DF3, 0x96A4 }, { 0x5DF4, 0x9462 }, { 0x5DF5, 0x9BE0 }, { 0x5DF7, 0x8D4A }, { 0x5DFB, 0x8AAA }, { 0x5DFD, 0x9246 },
+	{ 0x5DFE, 0x8BD0 }, { 0x5E02, 0x8E73 }, { 0x5E03, 0x957A }, { 0x5E06, 0x94BF }, { 0x5E0B, 0x9BE1 }, { 0x5E0C, 0x8AF3 }, { 0x5E11, 0x9BE4 }, { 0x5E16, 0x929F },
+	{ 0x5E19, 0x9BE3 }, { 0x5E1A, 0x9BE2 }, { 0x5E1B, 0x9BE5 }, { 0x5E1D, 0x92E9 }, { 0x5E25, 0x9083 }, { 0x5E2B, 0x8E74 }, { 0x5E2D, 0x90C8 }, { 0x5E2F, 0x91D1 },
+	{ 0x5E30, 0x8B41 }, { 0x5E33, 0x92A0 }, { 0x5E36, 0x9BE6 }, { 0x5E37, 0x9BE7 }, { 0x5E38, 0x8FED }, { 0x5E3D, 0x9658 }, { 0x5E40, 0x9BEA }, { 0x5E43, 0x9BE9 },
+	{ 0x5E44, 0x9BE8 }, { 0x5E45, 0x959D }, { 0x5E47, 0x9BF1 }, { 0x5E4C, 0x9679 }, { 0x5E4E, 0x9BEB }, { 0x5E54, 0x9BED }, { 0x5E55, 0x968B }, { 0x5E57, 0x9BEC },
+	{ 0x5E5F, 0x9BEE }, { 0x5E61, 0x94A6 }, { 0x5E62, 0x9BEF }, { 0x5E63, 0x95BC }, { 0x5E64, 0x9BF0 }, { 0x5E72, 0x8AB1 }, { 0x5E73, 0x95BD }, { 0x5E74, 0x944E },
+	{ 0x5E75, 0x9BF2 }, { 0x5E76, 0x9BF3 }, { 0x5E78, 0x8D4B }, { 0x5E79, 0x8AB2 }, { 0x5E7A, 0x9BF4 }, { 0x5E7B, 0x8CB6 }, { 0x5E7C, 0x9763 }, { 0x5E7D, 0x9748 },
+	{ 0x5E7E, 0x8AF4 }, { 0x5E7F, 0x9BF6 }, { 0x5E81, 0x92A1 }, { 0x5E83, 0x8D4C }, { 0x5E84, 0x8FAF }, { 0x5E87, 0x94DD }, { 0x5E8A, 0x8FB0 }, { 0x5E8F, 0x8F98 },
+	{ 0x5E95, 0x92EA }, { 0x5E96, 0x95F7 }, { 0x5E97, 0x9358 }, { 0x5E9A, 0x8D4D }, { 0x5E9C, 0x957B }, { 0x5EA0, 0x9BF7 }, { 0x5EA6, 0x9378 }, { 0x5EA7, 0x8DC0 },
+	{ 0x5EAB, 0x8CC9 }, { 0x5EAD, 0x92EB }, { 0x5EB5, 0x88C1 }, { 0x5EB6, 0x8F8E }, { 0x5EB7, 0x8D4E }, { 0x5EB8, 0x9766 }, { 0x5EC1, 0x9BF8 }, { 0x5EC2, 0x9BF9 },
+	{ 0x5EC3, 0x9470 }, { 0x5EC8, 0x9BFA }, { 0x5EC9, 0x97F5 }, { 0x5ECA, 0x984C }, { 0x5ECF, 0x9BFC }, { 0x5ED0, 0x9BFB }, { 0x5ED3, 0x8A66 }, { 0x5ED6, 0x9C40 },
+	{ 0x5EDA, 0x9C43 }, { 0x5EDB, 0x9C44 }, { 0x5EDD, 0x9C42 }, { 0x5EDF, 0x955F }, { 0x5EE0, 0x8FB1 }, { 0x5EE1, 0x9C46 }, { 0x5EE2, 0x9C45 }, { 0x5EE3, 0x9C41 },
+	{ 0x5EE8, 0x9C47 }, { 0x5EE9, 0x9C48 }, { 0x5EEC, 0x9C49 }, { 0x5EF0, 0x9C4C }, { 0x5EF1, 0x9C4A }, { 0x5EF3, 0x9C4B }, { 0x5EF4, 0x9C4D }, { 0x5EF6, 0x8984 },
+	{ 0x5EF7, 0x92EC }, { 0x5EF8, 0x9C4E }, { 0x5EFA, 0x8C9A }, { 0x5EFB, 0x89F4 }, { 0x5EFC, 0x9455 }, { 0x5EFE, 0x9C4F }, { 0x5EFF, 0x93F9 }, { 0x5F01, 0x95D9 },
+	{ 0x5F03, 0x9C50 }, { 0x5F04, 0x984D }, { 0x5F09, 0x9C51 }, { 0x5F0A, 0x95BE }, { 0x5F0B, 0x9C54 }, { 0x5F0C, 0x989F }, { 0x5F0D, 0x98AF }, { 0x5F0F, 0x8EAE },
+	{ 0x5F10, 0x93F3 }, { 0x5F11, 0x9C55 }, { 0x5F13, 0x8B7C }, { 0x5F14, 0x92A2 }, { 0x5F15, 0x88F8 }, { 0x5F16, 0x9C56 }, { 0x5F17, 0x95A4 }, { 0x5F18, 0x8D4F },
+	{ 0x5F1B, 0x926F }, { 0x5F1F, 0x92ED }, { 0x5F25, 0x96ED }, { 0x5F26, 0x8CB7 }, { 0x5F27, 0x8CCA }, { 0x5F29, 0x9C57 }, { 0x5F2D, 0x9C58 }, { 0x5F2F, 0x9C5E },
+	{ 0x5F31, 0x8EE3 }, { 0x5F35, 0x92A3 }, { 0x5F37, 0x8BAD }, { 0x5F38, 0x9C59 }, { 0x5F3C, 0x954A }, { 0x5F3E, 0x9265 }, { 0x5F41, 0x9C5A }, { 0x5F48, 0x9C5B },
+	{ 0x5F4A, 0x8BAE }, { 0x5F4C, 0x9C5C }, { 0x5F4E, 0x9C5D }, { 0x5F51, 0x9C5F }, { 0x5F53, 0x9396 }, { 0x5F56, 0x9C60 }, { 0x5F57, 0x9C61 }, { 0x5F59, 0x9C62 },
+	{ 0x5F5C, 0x9C53 }, { 0x5F5D, 0x9C52 }, { 0x5F61, 0x9C63 }, { 0x5F62, 0x8C60 }, { 0x5F66, 0x9546 }, { 0x5F69, 0x8DCA }, { 0x5F6A, 0x9556 }, { 0x5F6B, 0x92A4 },
+	{ 0x5F6C, 0x956A }, { 0x5F6D, 0x9C64 }, { 0x5F70, 0x8FB2 }, { 0x5F71, 0x8965 }, { 0x5F73, 0x9C65 }, { 0x5F77, 0x9C66 }, { 0x5F79, 0x96F0 }, { 0x5F7C, 0x94DE },
+	{ 0x5F7F, 0x9C69 }, { 0x5F80, 0x899D }, { 0x5F81, 0x90AA }, { 0x5F82, 0x9C68 }, { 0x5F83, 0x9C67 }, { 0x5F84, 0x8C61 }, { 0x5F85, 0x91D2 }, { 0x5F87, 0x9C6D },
+	{ 0x5F88, 0x9C6B }, { 0x5F8A, 0x9C6A }, { 0x5F8B, 0x97A5 }, { 0x5F8C, 0x8CE3 }, { 0x5F90, 0x8F99 }, { 0x5F91, 0x9C6C }, { 0x5F92, 0x936B }, { 0x5F93, 0x8F5D },
+	{ 0x5F97, 0x93BE }, { 0x5F98, 0x9C70 }, { 0x5F99, 0x9C6F }, { 0x5F9E, 0x9C6E }, { 0x5FA0, 0x9C71 }, { 0x5FA1, 0x8CE4 }, { 0x5FA8, 0x9C72 }, { 0x5FA9, 0x959C },
+	{ 0x5FAA, 0x8F7A }, { 0x5FAD, 0x9C73 }, { 0x5FAE, 0x94F7 }, { 0x5FB3, 0x93BF }, { 0x5FB4, 0x92A5 }, { 0x5FB9, 0x934F }, { 0x5FBC, 0x9C74 }, { 0x5FBD, 0x8B4A },
+	{ 0x5FC3, 0x9053 }, { 0x5FC5, 0x954B }, { 0x5FCC, 0x8AF5 }, { 0x5FCD, 0x9445 }, { 0x5FD6, 0x9C75 }, { 0x5FD7, 0x8E75 }, { 0x5FD8, 0x9659 }, { 0x5FD9, 0x965A },
+	{ 0x5FDC, 0x899E }, { 0x5FDD, 0x9C7A }, { 0x5FE0, 0x9289 }, { 0x5FE4, 0x9C77 }, { 0x5FEB, 0x89F5 }, { 0x5FF0, 0x9CAB }, { 0x5FF1, 0x9C79 }, { 0x5FF5, 0x944F },
+	{ 0x5FF8, 0x9C78 }, { 0x5FFB, 0x9C76 }, { 0x5FFD, 0x8D9A }, { 0x5FFF, 0x9C7C }, { 0x600E, 0x9C83 }, { 0x600F, 0x9C89 }, { 0x6010, 0x9C81 }, { 0x6012, 0x937B },
+	{ 0x6015, 0x9C86 }, { 0x6016, 0x957C }, { 0x6019, 0x9C80 }, { 0x601B, 0x9C85 }, { 0x601C, 0x97E5 }, { 0x601D, 0x8E76 }, { 0x6020, 0x91D3 }, { 0x6021, 0x9C7D },
+	{ 0x6025, 0x8B7D }, { 0x6026, 0x9C88 }, { 0x6027, 0x90AB }, { 0x6028, 0x8985 }, { 0x6029, 0x9C82 }, { 0x602A, 0x89F6 }, { 0x602B, 0x9C87 }, { 0x602F, 0x8BAF },
+	{ 0x6031, 0x9C84 }, { 0x603A, 0x9C8A }, { 0x6041, 0x9C8C }, { 0x6042, 0x9C96 }, { 0x6043, 0x9C94 }, { 0x6046, 0x9C91 }, { 0x604A, 0x9C90 }, { 0x604B, 0x97F6 },
+	{ 0x604D, 0x9C92 }, { 0x6050, 0x8BB0 }, { 0x6052, 0x8D50 }, { 0x6055, 0x8F9A }, { 0x6059, 0x9C99 }, { 0x605A, 0x9C8B }, { 0x605F, 0x9C8F }, { 0x6060, 0x9C7E },
+	{ 0x6062, 0x89F8 }, { 0x6063, 0x9C93 }, { 0x6064, 0x9C95 }, { 0x6065, 0x9270 }, { 0x6068, 0x8DA6 }, { 0x6069, 0x89B6 }, { 0x606A, 0x9C8D }, { 0x606B, 0x9C98 },
+	{ 0x606C, 0x9C97 }, { 0x606D, 0x8BB1 }, { 0x606F, 0x91A7 }, { 0x6070, 0x8A86 }, { 0x6075, 0x8C62 }, { 0x6077, 0x9C8E }, { 0x6081, 0x9C9A }, { 0x6083, 0x9C9D },
+	{ 0x6084, 0x9C9F }, { 0x6089, 0x8EBB }, { 0x608B, 0x9CA5 }, { 0x608C, 0x92EE }, { 0x608D, 0x9C9B }, { 0x6092, 0x9CA3 }, { 0x6094, 0x89F7 }, { 0x6096, 0x9CA1 },
+	{ 0x6097, 0x9CA2 }, { 0x609A, 0x9C9E }, { 0x609B, 0x9CA0 }, { 0x609F, 0x8CE5 }, { 0x60A0, 0x9749 }, { 0x60A3, 0x8AB3 }, { 0x60A6, 0x8978 }, { 0x60A7, 0x9CA4 },
+	{ 0x60A9, 0x9459 }, { 0x60AA, 0x88AB }, { 0x60B2, 0x94DF }, { 0x60B3, 0x9C7B }, { 0x60B4, 0x9CAA }, { 0x60B5, 0x9CAE }, { 0x60B6, 0x96E3 }, { 0x60B8, 0x9CA7 },
+	{ 0x60BC, 0x9389 }, { 0x60BD, 0x9CAC }, { 0x60C5, 0x8FEE }, { 0x60C6, 0x9CAD }, { 0x60C7, 0x93D5 }, { 0x60D1, 0x9866 }, { 0x60D3, 0x9CA9 }, { 0x60D8, 0x9CAF },
+	{ 0x60DA, 0x8D9B }, { 0x60DC, 0x90C9 }, { 0x60DF, 0x88D2 }, { 0x60E0, 0x9CA8 }, { 0x60E1, 0x9CA6 }, { 0x60E3, 0x9179 }, { 0x60E7, 0x9C9C }, { 0x60E8, 0x8E53 },
+	{ 0x60F0, 0x91C4 }, { 0x60F1, 0x9CBB }, { 0x60F3, 0x917A }, { 0x60F4, 0x9CB6 }, { 0x60F6, 0x9CB3 }, { 0x60F7, 0x9CB4 }, { 0x60F9, 0x8EE4 }, { 0x60FA, 0x9CB7 },
+	{ 0x60FB, 0x9CBA }, { 0x6100, 0x9CB5 }, { 0x6101, 0x8F44 }, { 0x6103, 0x9CB8 }, { 0x6106, 0x9CB2 }, { 0x6108, 0x96FA }, { 0x6109, 0x96F9 }, { 0x610D, 0x9CBC },
+	{ 0x610E, 0x9CBD }, { 0x610F, 0x88D3 }, { 0x6115, 0x9CB1 }, { 0x611A, 0x8BF0 }, { 0x611B, 0x88A4 }, { 0x611F, 0x8AB4 }, { 0x6121, 0x9CB9 }, { 0x6127, 0x9CC1 },
+	{ 0x6128, 0x9CC0 }, { 0x612C, 0x9CC5 }, { 0x6134, 0x9CC6 }, { 0x613C, 0x9CC4 }, { 0x613D, 0x9CC7 }, { 0x613E, 0x9CBF }, { 0x613F, 0x9CC3 }, { 0x6142, 0x9CC8 },
+	{ 0x6144, 0x9CC9 }, { 0x6147, 0x9CBE }, { 0x6148, 0x8E9C }, { 0x614A, 0x9CC2 }, { 0x614B, 0x91D4 }, { 0x614C, 0x8D51 }, { 0x614D, 0x9CB0 }, { 0x614E, 0x9054 },
+	{ 0x6153, 0x9CD6 }, { 0x6155, 0x95E7 }, { 0x6158, 0x9CCC }, { 0x6159, 0x9CCD }, { 0x615A, 0x9CCE }, { 0x615D, 0x9CD5 }, { 0x615F, 0x9CD4 }, { 0x6162, 0x969D },
+	{ 0x6163, 0x8AB5 }, { 0x6165, 0x9CD2 }, { 0x6167, 0x8C64 }, { 0x6168, 0x8A53 }, { 0x616B, 0x9CCF }, { 0x616E, 0x97B6 }, { 0x616F, 0x9CD1 }, { 0x6170, 0x88D4 },
+	{ 0x6171, 0x9CD3 }, { 0x6173, 0x9CCA }, { 0x6174, 0x9CD0 }, { 0x6175, 0x9CD7 }, { 0x6176, 0x8C63 }, { 0x6177, 0x9CCB }, { 0x617E, 0x977C }, { 0x6182, 0x974A },
+	{ 0x6187, 0x9CDA }, { 0x618A, 0x9CDE }, { 0x618E, 0x919E }, { 0x6190, 0x97F7 }, { 0x6191, 0x9CDF }, { 0x6194, 0x9CDC }, { 0x6196, 0x9CD9 }, { 0x6199, 0x9CD8 },
+	{ 0x619A, 0x9CDD }, { 0x61A4, 0x95AE }, { 0x61A7, 0x93B2 }, { 0x61A9, 0x8C65 }, { 0x61AB, 0x9CE0 }, { 0x61AC, 0x9CDB }, { 0x61AE, 0x9CE1 }, { 0x61B2, 0x8C9B },
+	{ 0x61B6, 0x89AF }, { 0x61BA, 0x9CE9 }, { 0x61BE, 0x8AB6 }, { 0x61C3, 0x9CE7 }, { 0x61C6, 0x9CE8 }, { 0x61C7, 0x8DA7 }, { 0x61C8, 0x9CE6 }, { 0x61C9, 0x9CE4 },
+	{ 0x61CA, 0x9CE3 }, { 0x61CB, 0x9CEA }, { 0x61CC, 0x9CE2 }, { 0x61CD, 0x9CEC }, { 0x61D0, 0x89F9 }, { 0x61E3, 0x9CEE }, { 0x61E6, 0x9CED }, { 0x61F2, 0x92A6 },
+	{ 0x61F4, 0x9CF1 }, { 0x61F6, 0x9CEF }, { 0x61F7, 0x9CE5 }, { 0x61F8, 0x8C9C }, { 0x61FA, 0x9CF0 }, { 0x61FC, 0x9CF4 }, { 0x61FD, 0x9CF3 }, { 0x61FE, 0x9CF5 },
+	{ 0x61FF, 0x9CF2 }, { 0x6200, 0x9CF6 }, { 0x6208, 0x9CF7 }, { 0x6209, 0x9CF8 }, { 0x620A, 0x95E8 }, { 0x620C, 0x9CFA }, { 0x620D, 0x9CF9 }, { 0x620E, 0x8F5E },
+	{ 0x6210, 0x90AC }, { 0x6211, 0x89E4 }, { 0x6212, 0x89FA }, { 0x6214, 0x9CFB }, { 0x6216, 0x88BD }, { 0x621A, 0x90CA }, { 0x621B, 0x9CFC }, { 0x621D, 0xE6C1 },
+	{ 0x621E, 0x9D40 }, { 0x621F, 0x8C81 }, { 0x6221, 0x9D41 }, { 0x6226, 0x90ED }, { 0x622A, 0x9D42 }, { 0x622E, 0x9D43 }, { 0x622F, 0x8B59 }, { 0x6230, 0x9D44 },
+	{ 0x6232, 0x9D45 }, { 0x6233, 0x9D46 }, { 0x6234, 0x91D5 }, { 0x6238, 0x8CCB }, { 0x623B, 0x96DF }, { 0x623F, 0x965B }, { 0x6240, 0x8F8A }, { 0x6241, 0x9D47 },
+	{ 0x6247, 0x90EE }, { 0x6248, 0xE7BB }, { 0x6249, 0x94E0 }, { 0x624B, 0x8EE8 }, { 0x624D, 0x8DCB }, { 0x624E, 0x9D48 }, { 0x6253, 0x91C5 }, { 0x6255, 0x95A5 },
+	{ 0x6258, 0x91EF }, { 0x625B, 0x9D4B }, { 0x625E, 0x9D49 }, { 0x6260, 0x9D4C }, { 0x6263, 0x9D4A }, { 0x6268, 0x9D4D }, { 0x626E, 0x95AF }, { 0x6271, 0x88B5 },
+	{ 0x6276, 0x957D }, { 0x6279, 0x94E1 }, { 0x627C, 0x9D4E }, { 0x627E, 0x9D51 }, { 0x627F, 0x8FB3 }, { 0x6280, 0x8B5A }, { 0x6282, 0x9D4F }, { 0x6283, 0x9D56 },
+	{ 0x6284, 0x8FB4 }, { 0x6289, 0x9D50 }, { 0x628A, 0x9463 }, { 0x6291, 0x977D }, { 0x6292, 0x9D52 }, { 0x6293, 0x9D53 }, { 0x6294, 0x9D57 }, { 0x6295, 0x938A },
+	{ 0x6296, 0x9D54 }, { 0x6297, 0x8D52 }, { 0x6298, 0x90DC }, { 0x629B, 0x9D65 }, { 0x629C, 0x94B2 }, { 0x629E, 0x91F0 }, { 0x62AB, 0x94E2 }, { 0x62AC, 0x9DAB },
+	{ 0x62B1, 0x95F8 }, { 0x62B5, 0x92EF }, { 0x62B9, 0x9695 }, { 0x62BB, 0x9D5A }, { 0x62BC, 0x899F }, { 0x62BD, 0x928A }, { 0x62C2, 0x9D63 }, { 0x62C5, 0x9253 },
+	{ 0x62C6, 0x9D5D }, { 0x62C7, 0x9D64 }, { 0x62C8, 0x9D5F }, { 0x62C9, 0x9D66 }, { 0x62CA, 0x9D62 }, { 0x62CC, 0x9D61 }, { 0x62CD, 0x948F }, { 0x62CF, 0x9D5B },
+	{ 0x62D0, 0x89FB }, { 0x62D1, 0x9D59 }, { 0x62D2, 0x8B91 }, { 0x62D3, 0x91F1 }, { 0x62D4, 0x9D55 }, { 0x62D7, 0x9D58 }, { 0x62D8, 0x8D53 }, { 0x62D9, 0x90D9 },
+	{ 0x62DB, 0x8FB5 }, { 0x62DC, 0x9D60 }, { 0x62DD, 0x9471 }, { 0x62E0, 0x8B92 }, { 0x62E1, 0x8A67 }, { 0x62EC, 0x8A87 }, { 0x62ED, 0x9040 }, { 0x62EE, 0x9D68 },
+	{ 0x62EF, 0x9D6D }, { 0x62F1, 0x9D69 }, { 0x62F3, 0x8C9D }, { 0x62F5, 0x9D6E }, { 0x62F6, 0x8E41 }, { 0x62F7, 0x8D89 }, { 0x62FE, 0x8F45 }, { 0x62FF, 0x9D5C },
+	{ 0x6301, 0x8E9D }, { 0x6302, 0x9D6B }, { 0x6307, 0x8E77 }, { 0x6308, 0x9D6C }, { 0x6309, 0x88C2 }, { 0x630C, 0x9D67 }, { 0x6311, 0x92A7 }, { 0x6319, 0x8B93 },
+	{ 0x631F, 0x8BB2 }, { 0x6327, 0x9D6A }, { 0x6328, 0x88A5 }, { 0x632B, 0x8DC1 }, { 0x632F, 0x9055 }, { 0x633A, 0x92F0 }, { 0x633D, 0x94D2 }, { 0x633E, 0x9D70 },
+	{ 0x633F, 0x917D }, { 0x6349, 0x91A8 }, { 0x634C, 0x8E4A }, { 0x634D, 0x9D71 }, { 0x634F, 0x9D73 }, { 0x6350, 0x9D6F }, { 0x6355, 0x95DF }, { 0x6357, 0x92BB },
+	{ 0x635C, 0x917B }, { 0x6367, 0x95F9 }, { 0x6368, 0x8ECC }, { 0x6369, 0x9D80 }, { 0x636B, 0x9D7E }, { 0x636E, 0x9098 }, { 0x6372, 0x8C9E }, { 0x6376, 0x9D78 },
+	{ 0x6377, 0x8FB7 }, { 0x637A, 0x93E6 }, { 0x637B, 0x9450 }, { 0x6380, 0x9D76 }, { 0x6383, 0x917C }, { 0x6388, 0x8EF6 }, { 0x6389, 0x9D7B }, { 0x638C, 0x8FB6 },
+	{ 0x638E, 0x9D75 }, { 0x638F, 0x9D7A }, { 0x6392, 0x9472 }, { 0x6396, 0x9D74 }, { 0x6398, 0x8C40 }, { 0x639B, 0x8A7C }, { 0x639F, 0x9D7C }, { 0x63A0, 0x97A9 },
+	{ 0x63A1, 0x8DCC }, { 0x63A2, 0x9254 }, { 0x63A3, 0x9D79 }, { 0x63A5, 0x90DA }, { 0x63A7, 0x8D54 }, { 0x63A8, 0x9084 }, { 0x63A9, 0x8986 }, { 0x63AA, 0x915B },
+	{ 0x63AB, 0x9D77 }, { 0x63AC, 0x8B64 }, { 0x63B2, 0x8C66 }, { 0x63B4, 0x92CD }, { 0x63B5, 0x9D7D }, { 0x63BB, 0x917E }, { 0x63BE, 0x9D81 }, { 0x63C0, 0x9D83 },
+	{ 0x63C3, 0x91B5 }, { 0x63C4, 0x9D89 }, { 0x63C6, 0x9D84 }, { 0x63C9, 0x9D86 }, { 0x63CF, 0x9560 }, { 0x63D0, 0x92F1 }, { 0x63D2, 0x9D87 }, { 0x63D6, 0x974B },
+	{ 0x63DA, 0x9767 }, { 0x63DB, 0x8AB7 }, { 0x63E1, 0x88AC }, { 0x63E3, 0x9D85 }, { 0x63E9, 0x9D82 }, { 0x63EE, 0x8AF6 }, { 0x63F4, 0x8987 }, { 0x63F6, 0x9D88 },
+	{ 0x63FA, 0x9768 }, { 0x6406, 0x9D8C }, { 0x640D, 0x91B9 }, { 0x640F, 0x9D93 }, { 0x6413, 0x9D8D }, { 0x6416, 0x9D8A }, { 0x6417, 0x9D91 }, { 0x641C, 0x9D72 },
+	{ 0x6426, 0x9D8E }, { 0x6428, 0x9D92 }, { 0x642C, 0x94C0 }, { 0x642D, 0x938B }, { 0x6434, 0x9D8B }, { 0x6436, 0x9D8F }, { 0x643A, 0x8C67 }, { 0x643E, 0x8DEF },
+	{ 0x6442, 0x90DB }, { 0x644E, 0x9D97 }, { 0x6458, 0x9345 }, { 0x6467, 0x9D94 }, { 0x6469, 0x9680 }, { 0x646F, 0x9D95 }, { 0x6476, 0x9D96 }, { 0x6478, 0x96CC },
+	{ 0x647A, 0x90A0 }, { 0x6483, 0x8C82 }, { 0x6488, 0x9D9D }, { 0x6492, 0x8E54 }, { 0x6493, 0x9D9A }, { 0x6495, 0x9D99 }, { 0x649A, 0x9451 }, { 0x649E, 0x93B3 },
+	{ 0x64A4, 0x9350 }, { 0x64A5, 0x9D9B }, { 0x64A9, 0x9D9C }, { 0x64AB, 0x958F }, { 0x64AD, 0x9464 }, { 0x64AE, 0x8E42 }, { 0x64B0, 0x90EF }, { 0x64B2, 0x966F },
+	{ 0x64B9, 0x8A68 }, { 0x64BB, 0x9DA3 }, { 0x64BC, 0x9D9E }, { 0x64C1, 0x9769 }, { 0x64C2, 0x9DA5 }, { 0x64C5, 0x9DA1 }, { 0x64C7, 0x9DA2 }, { 0x64CD, 0x9180 },
+	{ 0x64D2, 0x9DA0 }, { 0x64D4, 0x9D5E }, { 0x64D8, 0x9DA4 }, { 0x64DA, 0x9D9F }, { 0x64E0, 0x9DA9 }, { 0x64E1, 0x9DAA }, { 0x64E2, 0x9346 }, { 0x64E3, 0x9DAC },
+	{ 0x64E6, 0x8E43 }, { 0x64E7, 0x9DA7 }, { 0x64EC, 0x8B5B }, { 0x64EF, 0x9DAD }, { 0x64F1, 0x9DA6 }, { 0x64F2, 0x9DB1 }, { 0x64F4, 0x9DB0 }, { 0x64F6, 0x9DAF },
+	{ 0x64FA, 0x9DB2 }, { 0x64FD, 0x9DB4 }, { 0x64FE, 0x8FEF }, { 0x6500, 0x9DB3 }, { 0x6505, 0x9DB7 }, { 0x6518, 0x9DB5 }, { 0x651C, 0x9DB6 }, { 0x651D, 0x9D90 },
+	{ 0x6523, 0x9DB9 }, { 0x6524, 0x9DB8 }, { 0x652A, 0x9D98 }, { 0x652B, 0x9DBA }, { 0x652C, 0x9DAE }, { 0x652F, 0x8E78 }, { 0x6534, 0x9DBB }, { 0x6535, 0x9DBC },
+	{ 0x6536, 0x9DBE }, { 0x6537, 0x9DBD }, { 0x6538, 0x9DBF }, { 0x6539, 0x89FC }, { 0x653B, 0x8D55 }, { 0x653E, 0x95FA }, { 0x653F, 0x90AD }, { 0x6545, 0x8CCC },
+	{ 0x6548, 0x9DC1 }, { 0x654D, 0x9DC4 }, { 0x654F, 0x9571 }, { 0x6551, 0x8B7E }, { 0x6555, 0x9DC3 }, { 0x6556, 0x9DC2 }, { 0x6557, 0x9473 }, { 0x6558, 0x9DC5 },
+	{ 0x6559, 0x8BB3 }, { 0x655D, 0x9DC7 }, { 0x655E, 0x9DC6 }, { 0x6562, 0x8AB8 }, { 0x6563, 0x8E55 }, { 0x6566, 0x93D6 }, { 0x656C, 0x8C68 }, { 0x6570, 0x9094 },
+	{ 0x6572, 0x9DC8 }, { 0x6574, 0x90AE }, { 0x6575, 0x9347 }, { 0x6577, 0x957E }, { 0x6578, 0x9DC9 }, { 0x6582, 0x9DCA }, { 0x6583, 0x9DCB }, { 0x6587, 0x95B6 },
+	{ 0x6588, 0x9B7C }, { 0x6589, 0x90C4 }, { 0x658C, 0x956B }, { 0x658E, 0x8DD6 }, { 0x6590, 0x94E3 }, { 0x6591, 0x94C1 }, { 0x6597, 0x936C }, { 0x6599, 0x97BF },
+	{ 0x659B, 0x9DCD }, { 0x659C, 0x8ECE }, { 0x659F, 0x9DCE }, { 0x65A1, 0x88B4 }, { 0x65A4, 0x8BD2 }, { 0x65A5, 0x90CB }, { 0x65A7, 0x9580 }, { 0x65AB, 0x9DCF },
+	{ 0x65AC, 0x8E61 }, { 0x65AD, 0x9266 }, { 0x65AF, 0x8E7A }, { 0x65B0, 0x9056 }, { 0x65B7, 0x9DD0 }, { 0x65B9, 0x95FB }, { 0x65BC, 0x8997 }, { 0x65BD, 0x8E7B },
+	{ 0x65C1, 0x9DD3 }, { 0x65C3, 0x9DD1 }, { 0x65C4, 0x9DD4 }, { 0x65C5, 0x97B7 }, { 0x65C6, 0x9DD2 }, { 0x65CB, 0x90F9 }, { 0x65CC, 0x9DD5 }, { 0x65CF, 0x91B0 },
+	{ 0x65D2, 0x9DD6 }, { 0x65D7, 0x8AF8 }, { 0x65D9, 0x9DD8 }, { 0x65DB, 0x9DD7 }, { 0x65E0, 0x9DD9 }, { 0x65E1, 0x9DDA }, { 0x65E2, 0x8AF9 }, { 0x65E5, 0x93FA },
+	{ 0x65E6, 0x9255 }, { 0x65E7, 0x8B8C }, { 0x65E8, 0x8E7C }, { 0x65E9, 0x9181 }, { 0x65EC, 0x8F7B }, { 0x65ED, 0x88AE }, { 0x65F1, 0x9DDB }, { 0x65FA, 0x89A0 },
+	{ 0x65FB, 0x9DDF }, { 0x6602, 0x8D56 }, { 0x6603, 0x9DDE }, { 0x6606, 0x8DA9 }, { 0x6607, 0x8FB8 }, { 0x660A, 0x9DDD }, { 0x660C, 0x8FB9 }, { 0x660E, 0x96BE },
+	{ 0x660F, 0x8DA8 }, { 0x6613, 0x88D5 }, { 0x6614, 0x90CC }, { 0x661C, 0x9DE4 }, { 0x661F, 0x90AF }, { 0x6620, 0x8966 }, { 0x6625, 0x8F74 }, { 0x6627, 0x9686 },
+	{ 0x6628, 0x8DF0 }, { 0x662D, 0x8FBA }, { 0x662F, 0x90A5 }, { 0x6634, 0x9DE3 }, { 0x6635, 0x9DE1 }, { 0x6636, 0x9DE2 }, { 0x663C, 0x928B }, { 0x663F, 0x9E45 },
+	{ 0x6641, 0x9DE8 }, { 0x6642, 0x8E9E }, { 0x6643, 0x8D57 }, { 0x6644, 0x9DE6 }, { 0x6649, 0x9DE7 }, { 0x664B, 0x9057 }, { 0x664F, 0x9DE5 }, { 0x6652, 0x8E4E },
+	{ 0x665D, 0x9DEA }, { 0x665E, 0x9DE9 }, { 0x665F, 0x9DEE }, { 0x6662, 0x9DEF }, { 0x6664, 0x9DEB }, { 0x6666, 0x8A41 }, { 0x6667, 0x9DEC }, { 0x6668, 0x9DED },
+	{ 0x6669, 0x94D3 }, { 0x666E, 0x9581 }, { 0x666F, 0x8C69 }, { 0x6670, 0x9DF0 }, { 0x6674, 0x90B0 }, { 0x6676, 0x8FBB }, { 0x667A, 0x9271 }, { 0x6681, 0x8BC5 },
+	{ 0x6683, 0x9DF1 }, { 0x6684, 0x9DF5 }, { 0x6687, 0x89C9 }, { 0x6688, 0x9DF2 }, { 0x6689, 0x9DF4 }, { 0x668E, 0x9DF3 }, { 0x6691, 0x8F8B }, { 0x6696, 0x9267 },
+	{ 0x6697, 0x88C3 }, { 0x6698, 0x9DF6 }, { 0x669D, 0x9DF7 }, { 0x66A2, 0x92A8 }, { 0x66A6, 0x97EF }, { 0x66AB, 0x8E62 }, { 0x66AE, 0x95E9 }, { 0x66B4, 0x965C },
+	{ 0x66B8, 0x9E41 }, { 0x66B9, 0x9DF9 }, { 0x66BC, 0x9DFC }, { 0x66BE, 0x9DFB }, { 0x66C1, 0x9DF8 }, { 0x66C4, 0x9E40 }, { 0x66C7, 0x93DC }, { 0x66C9, 0x9DFA },
+	{ 0x66D6, 0x9E42 }, { 0x66D9, 0x8F8C }, { 0x66DA, 0x9E43 }, { 0x66DC, 0x976A }, { 0x66DD, 0x9498 }, { 0x66E0, 0x9E44 }, { 0x66E6, 0x9E46 }, { 0x66E9, 0x9E47 },
+	{ 0x66F0, 0x9E48 }, { 0x66F2, 0x8BC8 }, { 0x66F3, 0x8967 }, { 0x66F4, 0x8D58 }, { 0x66F5, 0x9E49 }, { 0x66F7, 0x9E4A }, { 0x66F8, 0x8F91 }, { 0x66F9, 0x9182 },
+	{ 0x66FC, 0x99D6 }, { 0x66FD, 0x915D }, { 0x66FE, 0x915C }, { 0x66FF, 0x91D6 }, { 0x6700, 0x8DC5 }, { 0x6703, 0x98F0 }, { 0x6708, 0x8C8E }, { 0x6709, 0x974C },
+	{ 0x670B, 0x95FC }, { 0x670D, 0x959E }, { 0x670F, 0x9E4B }, { 0x6714, 0x8DF1 }, { 0x6715, 0x92BD }, { 0x6716, 0x9E4C }, { 0x6717, 0x984E }, { 0x671B, 0x965D },
+	{ 0x671D, 0x92A9 }, { 0x671E, 0x9E4D }, { 0x671F, 0x8AFA }, { 0x6726, 0x9E4E }, { 0x6727, 0x9E4F }, { 0x6728, 0x96D8 }, { 0x672A, 0x96A2 }, { 0x672B, 0x9696 },
+	{ 0x672C, 0x967B }, { 0x672D, 0x8E44 }, { 0x672E, 0x9E51 }, { 0x6731, 0x8EE9 }, { 0x6734, 0x9670 }, { 0x6736, 0x9E53 }, { 0x6737, 0x9E56 }, { 0x6738, 0x9E55 },
+	{ 0x673A, 0x8AF7 }, { 0x673D, 0x8B80 }, { 0x673F, 0x9E52 }, { 0x6741, 0x9E54 }, { 0x6746, 0x9E57 }, { 0x6749, 0x9099 }, { 0x674E, 0x979B }, { 0x674F, 0x88C7 },
+	{ 0x6750, 0x8DDE }, { 0x6751, 0x91BA }, { 0x6753, 0x8EDB }, { 0x6756, 0x8FF1 }, { 0x6759, 0x9E5A }, { 0x675C, 0x936D }, { 0x675E, 0x9E58 }, { 0x675F, 0x91A9 },
+	{ 0x6760, 0x9E59 }, { 0x6761, 0x8FF0 }, { 0x6762, 0x96DB }, { 0x6763, 0x9E5B }, { 0x6764, 0x9E5C }, { 0x6765, 0x9788 }, { 0x676A, 0x9E61 }, { 0x676D, 0x8D59 },
+	{ 0x676F, 0x9474 }, { 0x6770, 0x9E5E }, { 0x6771, 0x938C }, { 0x6772, 0x9DDC }, { 0x6773, 0x9DE0 }, { 0x6775, 0x8B6E }, { 0x6777, 0x9466 }, { 0x677C, 0x9E60 },
+	{ 0x677E, 0x8FBC }, { 0x677F, 0x94C2 }, { 0x6785, 0x9E66 }, { 0x6787, 0x94F8 }, { 0x6789, 0x9E5D }, { 0x678B, 0x9E63 }, { 0x678C, 0x9E62 }, { 0x6790, 0x90CD },
+	{ 0x6795, 0x968D }, { 0x6797, 0x97D1 }, { 0x679A, 0x9687 }, { 0x679C, 0x89CA }, { 0x679D, 0x8E7D }, { 0x67A0, 0x9867 }, { 0x67A1, 0x9E65 }, { 0x67A2, 0x9095 },
+	{ 0x67A6, 0x9E64 }, { 0x67A9, 0x9E5F }, { 0x67AF, 0x8CCD }, { 0x67B3, 0x9E6B }, { 0x67B4, 0x9E69 }, { 0x67B6, 0x89CB }, { 0x67B7, 0x9E67 }, { 0x67B8, 0x9E6D },
+	{ 0x67B9, 0x9E73 }, { 0x67C1, 0x91C6 }, { 0x67C4, 0x95BF }, { 0x67C6, 0x9E75 }, { 0x67CA, 0x9541 }, { 0x67CE, 0x9E74 }, { 0x67CF, 0x9490 }, { 0x67D0, 0x965E },
+	{ 0x67D1, 0x8AB9 }, { 0x67D3, 0x90F5 }, { 0x67D4, 0x8F5F }, { 0x67D8, 0x92D1 }, { 0x67DA, 0x974D }, { 0x67DD, 0x9E70 }, { 0x67DE, 0x9E6F }, { 0x67E2, 0x9E71 },
+	{ 0x67E4, 0x9E6E }, { 0x67E7, 0x9E76 }, { 0x67E9, 0x9E6C }, { 0x67EC, 0x9E6A }, { 0x67EE, 0x9E72 }, { 0x67EF, 0x9E68 }, { 0x67F1, 0x928C }, { 0x67F3, 0x96F6 },
+	{ 0x67F4, 0x8EC4 }, { 0x67F5, 0x8DF2 }, { 0x67FB, 0x8DB8 }, { 0x67FE, 0x968F }, { 0x67FF, 0x8A60 }, { 0x6802, 0x92CC }, { 0x6803, 0x93C8 }, { 0x6804, 0x8968 },
+	{ 0x6813, 0x90F0 }, { 0x6816, 0x90B2 }, { 0x6817, 0x8C49 }, { 0x681E, 0x9E78 }, { 0x6821, 0x8D5A }, { 0x6822, 0x8A9C }, { 0x6829, 0x9E7A }, { 0x682A, 0x8A94 },
+	{ 0x682B, 0x9E81 }, { 0x6832, 0x9E7D }, { 0x6834, 0x90F1 }, { 0x6838, 0x8A6A }, { 0x6839, 0x8DAA }, { 0x683C, 0x8A69 }, { 0x683D, 0x8DCD }, { 0x6840, 0x9E7B },
+	{ 0x6841, 0x8C85 }, { 0x6842, 0x8C6A }, { 0x6843, 0x938D }, { 0x6846, 0x9E79 }, { 0x6848, 0x88C4 }, { 0x684D, 0x9E7C }, { 0x684E, 0x9E7E }, { 0x6850, 0x8BCB },
+	{ 0x6851, 0x8C4B }, { 0x6853, 0x8ABA }, { 0x6854, 0x8B6A }, { 0x6859, 0x9E82 }, { 0x685C, 0x8DF7 }, { 0x685D, 0x9691 }, { 0x685F, 0x8E56 }, { 0x6863, 0x9E83 },
+	{ 0x6867, 0x954F }, { 0x6874, 0x9E8F }, { 0x6876, 0x89B1 }, { 0x6877, 0x9E84 }, { 0x687E, 0x9E95 }, { 0x687F, 0x9E85 }, { 0x6881, 0x97C0 }, { 0x6883, 0x9E8C },
+	{ 0x6885, 0x947E }, { 0x688D, 0x9E94 }, { 0x688F, 0x9E87 }, { 0x6893, 0x88B2 }, { 0x6894, 0x9E89 }, { 0x6897, 0x8D5B }, { 0x689B, 0x9E8B }, { 0x689D, 0x9E8A },
+	{ 0x689F, 0x9E86 }, { 0x68A0, 0x9E91 }, { 0x68A2, 0x8FBD }, { 0x68A6, 0x9AEB }, { 0x68A7, 0x8CE6 }, { 0x68A8, 0x979C }, { 0x68AD, 0x9E88 }, { 0x68AF, 0x92F2 },
+	{ 0x68B0, 0x8A42 }, { 0x68B1, 0x8DAB }, { 0x68B3, 0x9E80 }, { 0x68B5, 0x9E90 }, { 0x68B6, 0x8A81 }, { 0x68B9, 0x9E8E }, { 0x68BA, 0x9E92 }, { 0x68BC, 0x938E },
+	{ 0x68C4, 0x8AFC }, { 0x68C6, 0x9EB0 }, { 0x68C9, 0x96C7 }, { 0x68CA, 0x9E97 }, { 0x68CB, 0x8AFB }, { 0x68CD, 0x9E9E }, { 0x68D2, 0x965F }, { 0x68D4, 0x9E9F },
+	{ 0x68D5, 0x9EA1 }, { 0x68D7, 0x9EA5 }, { 0x68D8, 0x9E99 }, { 0x68DA, 0x9249 }, { 0x68DF, 0x938F }, { 0x68E0, 0x9EA9 }, { 0x68E1, 0x9E9C }, { 0x68E3, 0x9EA6 },
+	{ 0x68E7, 0x9EA0 }, { 0x68EE, 0x9058 }, { 0x68EF, 0x9EAA }, { 0x68F2, 0x90B1 }, { 0x68F9, 0x9EA8 }, { 0x68FA, 0x8ABB }, { 0x6900, 0x986F }, { 0x6901, 0x9E96 },
+	{ 0x6904, 0x9EA4 }, { 0x6905, 0x88D6 }, { 0x6908, 0x9E98 }, { 0x690B, 0x96B8 }, { 0x690C, 0x9E9D }, { 0x690D, 0x9041 }, { 0x690E, 0x92C5 }, { 0x690F, 0x9E93 },
+	{ 0x6912, 0x9EA3 }, { 0x6919, 0x909A }, { 0x691A, 0x9EAD }, { 0x691B, 0x8A91 }, { 0x691C, 0x8C9F }, { 0x6921, 0x9EAF }, { 0x6922, 0x9E9A }, { 0x6923, 0x9EAE },
+	{ 0x6925, 0x9EA7 }, { 0x6926, 0x9E9B }, { 0x6928, 0x9EAB }, { 0x692A, 0x9EAC }, { 0x6930, 0x9EBD }, { 0x6934, 0x93CC }, { 0x6936, 0x9EA2 }, { 0x6939, 0x9EB9 },
+	{ 0x693D, 0x9EBB }, { 0x693F, 0x92D6 }, { 0x694A, 0x976B }, { 0x6953, 0x9596 }, { 0x6954, 0x9EB6 }, { 0x6955, 0x91C8 }, { 0x6959, 0x9EBC }, { 0x695A, 0x915E },
+	{ 0x695C, 0x9EB3 }, { 0x695D, 0x9EC0 }, { 0x695E, 0x9EBF }, { 0x6960, 0x93ED }, { 0x6961, 0x9EBE }, { 0x6962, 0x93E8 }, { 0x696A, 0x9EC2 }, { 0x696B, 0x9EB5 },
+	{ 0x696D, 0x8BC6 }, { 0x696E, 0x9EB8 }, { 0x696F, 0x8F7C }, { 0x6973, 0x9480 }, { 0x6974, 0x9EBA }, { 0x6975, 0x8BC9 }, { 0x6977, 0x9EB2 }, { 0x6978, 0x9EB4 },
+	{ 0x6979, 0x9EB1 }, { 0x697C, 0x984F }, { 0x697D, 0x8A79 }, { 0x697E, 0x9EB7 }, { 0x6981, 0x9EC1 }, { 0x6982, 0x8A54 }, { 0x698A, 0x8DE5 }, { 0x698E, 0x897C },
+	{ 0x6991, 0x9ED2 }, { 0x6994, 0x9850 }, { 0x6995, 0x9ED5 }, { 0x699B, 0x9059 }, { 0x699C, 0x9ED4 }, { 0x69A0, 0x9ED3 }, { 0x69A7, 0x9ED0 }, { 0x69AE, 0x9EC4 },
+	{ 0x69B1, 0x9EE1 }, { 0x69B2, 0x9EC3 }, { 0x69B4, 0x9ED6 }, { 0x69BB, 0x9ECE }, { 0x69BE, 0x9EC9 }, { 0x69BF, 0x9EC6 }, { 0x69C1, 0x9EC7 }, { 0x69C3, 0x9ECF },
+	{ 0x69C7, 0xEAA0 }, { 0x69CA, 0x9ECC }, { 0x69CB, 0x8D5C }, { 0x69CC, 0x92C6 }, { 0x69CD, 0x9184 }, { 0x69CE, 0x9ECA }, { 0x69D0, 0x9EC5 }, { 0x69D3, 0x9EC8 },
+	{ 0x69D8, 0x976C }, { 0x69D9, 0x968A }, { 0x69DD, 0x9ECD }, { 0x69DE, 0x9ED7 }, { 0x69E7, 0x9EDF }, { 0x69E8, 0x9ED8 }, { 0x69EB, 0x9EE5 }, { 0x69ED, 0x9EE3 },
+	{ 0x69F2, 0x9EDE }, { 0x69F9, 0x9EDD }, { 0x69FB, 0x92CE }, { 0x69FD, 0x9185 }, { 0x69FF, 0x9EDB }, { 0x6A02, 0x9ED9 }, { 0x6A05, 0x9EE0 }, { 0x6A0A, 0x9EE6 },
+	{ 0x6A0B, 0x94F3 }, { 0x6A0C, 0x9EEC }, { 0x6A12, 0x9EE7 }, { 0x6A13, 0x9EEA }, { 0x6A14, 0x9EE4 }, { 0x6A17, 0x9294 }, { 0x6A19, 0x9557 }, { 0x6A1B, 0x9EDA },
+	{ 0x6A1E, 0x9EE2 }, { 0x6A1F, 0x8FBE }, { 0x6A21, 0x96CD }, { 0x6A22, 0x9EF6 }, { 0x6A23, 0x9EE9 }, { 0x6A29, 0x8CA0 }, { 0x6A2A, 0x89A1 }, { 0x6A2B, 0x8A7E },
+	{ 0x6A2E, 0x9ED1 }, { 0x6A35, 0x8FBF }, { 0x6A36, 0x9EEE }, { 0x6A38, 0x9EF5 }, { 0x6A39, 0x8EF7 }, { 0x6A3A, 0x8A92 }, { 0x6A3D, 0x924D }, { 0x6A44, 0x9EEB },
+	{ 0x6A47, 0x9EF0 }, { 0x6A48, 0x9EF4 }, { 0x6A4B, 0x8BB4 }, { 0x6A58, 0x8B6B }, { 0x6A59, 0x9EF2 }, { 0x6A5F, 0x8B40 }, { 0x6A61, 0x93C9 }, { 0x6A62, 0x9EF1 },
+	{ 0x6A66, 0x9EF3 }, { 0x6A72, 0x9EED }, { 0x6A78, 0x9EEF }, { 0x6A7F, 0x8A80 }, { 0x6A80, 0x9268 }, { 0x6A84, 0x9EFA }, { 0x6A8D, 0x9EF8 }, { 0x6A8E, 0x8CE7 },
+	{ 0x6A90, 0x9EF7 }, { 0x6A97, 0x9F40 }, { 0x6A9C, 0x9E77 }, { 0x6AA0, 0x9EF9 }, { 0x6AA2, 0x9EFB }, { 0x6AA3, 0x9EFC }, { 0x6AAA, 0x9F4B }, { 0x6AAC, 0x9F47 },
+	{ 0x6AAE, 0x9E8D }, { 0x6AB3, 0x9F46 }, { 0x6AB8, 0x9F45 }, { 0x6ABB, 0x9F42 }, { 0x6AC1, 0x9EE8 }, { 0x6AC2, 0x9F44 }, { 0x6AC3, 0x9F43 }, { 0x6AD1, 0x9F49 },
+	{ 0x6AD3, 0x9845 }, { 0x6ADA, 0x9F4C }, { 0x6ADB, 0x8BF9 }, { 0x6ADE, 0x9F48 }, { 0x6ADF, 0x9F4A }, { 0x6AE8, 0x94A5 }, { 0x6AEA, 0x9F4D }, { 0x6AFA, 0x9F51 },
+	{ 0x6AFB, 0x9F4E }, { 0x6B04, 0x9793 }, { 0x6B05, 0x9F4F }, { 0x6B0A, 0x9EDC }, { 0x6B12, 0x9F52 }, { 0x6B16, 0x9F53 }, { 0x6B1D, 0x8954 }, { 0x6B1F, 0x9F55 },
+	{ 0x6B20, 0x8C87 }, { 0x6B21, 0x8E9F }, { 0x6B23, 0x8BD3 }, { 0x6B27, 0x89A2 }, { 0x6B32, 0x977E }, { 0x6B37, 0x9F57 }, { 0x6B38, 0x9F56 }, { 0x6B39, 0x9F59 },
+	{ 0x6B3A, 0x8B5C }, { 0x6B3D, 0x8BD4 }, { 0x6B3E, 0x8ABC }, { 0x6B43, 0x9F5C }, { 0x6B47, 0x9F5B }, { 0x6B49, 0x9F5D }, { 0x6B4C, 0x89CC }, { 0x6B4E, 0x9256 },
+	{ 0x6B50, 0x9F5E }, { 0x6B53, 0x8ABD }, { 0x6B54, 0x9F60 }, { 0x6B59, 0x9F5F }, { 0x6B5B, 0x9F61 }, { 0x6B5F, 0x9F62 }, { 0x6B61, 0x9F63 }, { 0x6B62, 0x8E7E },
+	{ 0x6B63, 0x90B3 }, { 0x6B64, 0x8D9F }, { 0x6B66, 0x9590 }, { 0x6B69, 0x95E0 }, { 0x6B6A, 0x9863 }, { 0x6B6F, 0x8E95 }, { 0x6B73, 0x8DCE }, { 0x6B74, 0x97F0 },
+	{ 0x6B78, 0x9F64 }, { 0x6B79, 0x9F65 }, { 0x6B7B, 0x8E80 }, { 0x6B7F, 0x9F66 }, { 0x6B80, 0x9F67 }, { 0x6B83, 0x9F69 }, { 0x6B84, 0x9F68 }, { 0x6B86, 0x9677 },
+	{ 0x6B89, 0x8F7D }, { 0x6B8A, 0x8EEA }, { 0x6B8B, 0x8E63 }, { 0x6B8D, 0x9F6A }, { 0x6B95, 0x9F6C }, { 0x6B96, 0x9042 }, { 0x6B98, 0x9F6B }, { 0x6B9E, 0x9F6D },
+	{ 0x6BA4, 0x9F6E }, { 0x6BAA, 0x9F6F }, { 0x6BAB, 0x9F70 }, { 0x6BAF, 0x9F71 }, { 0x6BB1, 0x9F73 }, { 0x6BB2, 0x9F72 }, { 0x6BB3, 0x9F74 }, { 0x6BB4, 0x89A3 },
+	{ 0x6BB5, 0x9269 }, { 0x6BB7, 0x9F75 }, { 0x6BBA, 0x8E45 }, { 0x6BBB, 0x8A6B }, { 0x6BBC, 0x9F76 }, { 0x6BBF, 0x9361 }, { 0x6BC0, 0x9ACA }, { 0x6BC5, 0x8B42 },
+	{ 0x6BC6, 0x9F77 }, { 0x6BCB, 0x9F78 }, { 0x6BCD, 0x95EA }, { 0x6BCE, 0x9688 }, { 0x6BD2, 0x93C5 }, { 0x6BD3, 0x9F79 }, { 0x6BD4, 0x94E4 }, { 0x6BD8, 0x94F9 },
+	{ 0x6BDB, 0x96D1 }, { 0x6BDF, 0x9F7A }, { 0x6BEB, 0x9F7C }, { 0x6BEC, 0x9F7B }, { 0x6BEF, 0x9F7E }, { 0x6BF3, 0x9F7D }, { 0x6C08, 0x9F81 }, { 0x6C0F, 0x8E81 },
+	{ 0x6C11, 0x96AF }, { 0x6C13, 0x9F82 }, { 0x6C14, 0x9F83 }, { 0x6C17, 0x8B43 }, { 0x6C1B, 0x9F84 }, { 0x6C23, 0x9F86 }, { 0x6C24, 0x9F85 }, { 0x6C34, 0x9085 },
+	{ 0x6C37, 0x9558 }, { 0x6C38, 0x8969 }, { 0x6C3E, 0x94C3 }, { 0x6C40, 0x92F3 }, { 0x6C41, 0x8F60 }, { 0x6C42, 0x8B81 }, { 0x6C4E, 0x94C4 }, { 0x6C50, 0x8EAC },
+	{ 0x6C55, 0x9F88 }, { 0x6C57, 0x8ABE }, { 0x6C5A, 0x8998 }, { 0x6C5D, 0x93F0 }, { 0x6C5E, 0x9F87 }, { 0x6C5F, 0x8D5D }, { 0x6C60, 0x9272 }, { 0x6C62, 0x9F89 },
+	{ 0x6C68, 0x9F91 }, { 0x6C6A, 0x9F8A }, { 0x6C70, 0x91BF }, { 0x6C72, 0x8B82 }, { 0x6C73, 0x9F92 }, { 0x6C7A, 0x8C88 }, { 0x6C7D, 0x8B44 }, { 0x6C7E, 0x9F90 },
+	{ 0x6C81, 0x9F8E }, { 0x6C82, 0x9F8B }, { 0x6C83, 0x9780 }, { 0x6C88, 0x92BE }, { 0x6C8C, 0x93D7 }, { 0x6C8D, 0x9F8C }, { 0x6C90, 0x9F94 }, { 0x6C92, 0x9F93 },
+	{ 0x6C93, 0x8C42 }, { 0x6C96, 0x89AB }, { 0x6C99, 0x8DB9 }, { 0x6C9A, 0x9F8D }, { 0x6C9B, 0x9F8F }, { 0x6CA1, 0x9676 }, { 0x6CA2, 0x91F2 }, { 0x6CAB, 0x9697 },
+	{ 0x6CAE, 0x9F9C }, { 0x6CB1, 0x9F9D }, { 0x6CB3, 0x89CD }, { 0x6CB8, 0x95A6 }, { 0x6CB9, 0x96FB }, { 0x6CBA, 0x9F9F }, { 0x6CBB, 0x8EA1 }, { 0x6CBC, 0x8FC0 },
+	{ 0x6CBD, 0x9F98 }, { 0x6CBE, 0x9F9E }, { 0x6CBF, 0x8988 }, { 0x6CC1, 0x8BB5 }, { 0x6CC4, 0x9F95 }, { 0x6CC5, 0x9F9A }, { 0x6CC9, 0x90F2 }, { 0x6CCA, 0x9491 },
+	{ 0x6CCC, 0x94E5 }, { 0x6CD3, 0x9F97 }, { 0x6CD5, 0x9640 }, { 0x6CD7, 0x9F99 }, { 0x6CD9, 0x9FA2 }, { 0x6CDB, 0x9FA0 }, { 0x6CDD, 0x9F9B }, { 0x6CE1, 0x9641 },
+	{ 0x6CE2, 0x9467 }, { 0x6CE3, 0x8B83 }, { 0x6CE5, 0x9344 }, { 0x6CE8, 0x928D }, { 0x6CEA, 0x9FA3 }, { 0x6CEF, 0x9FA1 }, { 0x6CF0, 0x91D7 }, { 0x6CF1, 0x9F96 },
+	{ 0x6CF3, 0x896A }, { 0x6D0B, 0x976D }, { 0x6D0C, 0x9FAE }, { 0x6D12, 0x9FAD }, { 0x6D17, 0x90F4 }, { 0x6D19, 0x9FAA }, { 0x6D1B, 0x978C }, { 0x6D1E, 0x93B4 },
+	{ 0x6D1F, 0x9FA4 }, { 0x6D25, 0x92C3 }, { 0x6D29, 0x896B }, { 0x6D2A, 0x8D5E }, { 0x6D2B, 0x9FA7 }, { 0x6D32, 0x8F46 }, { 0x6D33, 0x9FAC }, { 0x6D35, 0x9FAB },
+	{ 0x6D36, 0x9FA6 }, { 0x6D38, 0x9FA9 }, { 0x6D3B, 0x8A88 }, { 0x6D3D, 0x9FA8 }, { 0x6D3E, 0x9468 }, { 0x6D41, 0x97AC }, { 0x6D44, 0x8FF2 }, { 0x6D45, 0x90F3 },
+	{ 0x6D59, 0x9FB4 }, { 0x6D5A, 0x9FB2 }, { 0x6D5C, 0x956C }, { 0x6D63, 0x9FAF }, { 0x6D64, 0x9FB1 }, { 0x6D66, 0x8959 }, { 0x6D69, 0x8D5F }, { 0x6D6A, 0x9851 },
+	{ 0x6D6C, 0x8A5C }, { 0x6D6E, 0x9582 }, { 0x6D74, 0x9781 }, { 0x6D77, 0x8A43 }, { 0x6D78, 0x905A }, { 0x6D79, 0x9FB3 }, { 0x6D85, 0x9FB8 }, { 0x6D88, 0x8FC1 },
+	{ 0x6D8C, 0x974F }, { 0x6D8E, 0x9FB5 }, { 0x6D93, 0x9FB0 }, { 0x6D95, 0x9FB6 }, { 0x6D99, 0x97DC }, { 0x6D9B, 0x9393 }, { 0x6D9C, 0x93C0 }, { 0x6DAF, 0x8A55 },
+	{ 0x6DB2, 0x8974 }, { 0x6DB5, 0x9FBC }, { 0x6DB8, 0x9FBF }, { 0x6DBC, 0x97C1 }, { 0x6DC0, 0x9784 }, { 0x6DC5, 0x9FC6 }, { 0x6DC6, 0x9FC0 }, { 0x6DC7, 0x9FBD },
+	{ 0x6DCB, 0x97D2 }, { 0x6DCC, 0x9FC3 }, { 0x6DD1, 0x8F69 }, { 0x6DD2, 0x9FC5 }, { 0x6DD5, 0x9FCA }, { 0x6DD8, 0x9391 }, { 0x6DD9, 0x9FC8 }, { 0x6DDE, 0x9FC2 },
+	{ 0x6DE1, 0x9257 }, { 0x6DE4, 0x9FC9 }, { 0x6DE6, 0x9FBE }, { 0x6DE8, 0x9FC4 }, { 0x6DEA, 0x9FCB }, { 0x6DEB, 0x88FA }, { 0x6DEC, 0x9FC1 }, { 0x6DEE, 0x9FCC },
+	{ 0x6DF1, 0x905B }, { 0x6DF3, 0x8F7E }, { 0x6DF5, 0x95A3 }, { 0x6DF7, 0x8DAC }, { 0x6DF9, 0x9FB9 }, { 0x6DFA, 0x9FC7 }, { 0x6DFB, 0x9359 }, { 0x6E05, 0x90B4 },
+	{ 0x6E07, 0x8A89 }, { 0x6E08, 0x8DCF }, { 0x6E09, 0x8FC2 }, { 0x6E0A, 0x9FBB }, { 0x6E0B, 0x8F61 }, { 0x6E13, 0x8C6B }, { 0x6E15, 0x9FBA }, { 0x6E19, 0x9FD0 },
+	{ 0x6E1A, 0x8F8D }, { 0x6E1B, 0x8CB8 }, { 0x6E1D, 0x9FDF }, { 0x6E1F, 0x9FD9 }, { 0x6E20, 0x8B94 }, { 0x6E21, 0x936E }, { 0x6E23, 0x9FD4 }, { 0x6E24, 0x9FDD },
+	{ 0x6E25, 0x88AD }, { 0x6E26, 0x8951 }, { 0x6E29, 0x89B7 }, { 0x6E2B, 0x9FD6 }, { 0x6E2C, 0x91AA }, { 0x6E2D, 0x9FCD }, { 0x6E2E, 0x9FCF }, { 0x6E2F, 0x8D60 },
+	{ 0x6E38, 0x9FE0 }, { 0x6E3A, 0x9FDB }, { 0x6E3E, 0x9FD3 }, { 0x6E43, 0x9FDA }, { 0x6E4A, 0x96A9 }, { 0x6E4D, 0x9FD8 }, { 0x6E4E, 0x9FDC }, { 0x6E56, 0x8CCE },
+	{ 0x6E58, 0x8FC3 }, { 0x6E5B, 0x9258 }, { 0x6E5F, 0x9FD2 }, { 0x6E67, 0x974E }, { 0x6E6B, 0x9FD5 }, { 0x6E6E, 0x9FCE }, { 0x6E6F, 0x9392 }, { 0x6E72, 0x9FD1 },
+	{ 0x6E76, 0x9FD7 }, { 0x6E7E, 0x9870 }, { 0x6E7F, 0x8EBC }, { 0x6E80, 0x969E }, { 0x6E82, 0x9FE1 }, { 0x6E8C, 0x94AC }, { 0x6E8F, 0x9FED }, { 0x6E90, 0x8CB9 },
+	{ 0x6E96, 0x8F80 }, { 0x6E98, 0x9FE3 }, { 0x6E9C, 0x97AD }, { 0x6E9D, 0x8D61 }, { 0x6E9F, 0x9FF0 }, { 0x6EA2, 0x88EC }, { 0x6EA5, 0x9FEE }, { 0x6EAA, 0x9FE2 },
+	{ 0x6EAF, 0x9FE8 }, { 0x6EB2, 0x9FEA }, { 0x6EB6, 0x976E }, { 0x6EB7, 0x9FE5 }, { 0x6EBA, 0x934D }, { 0x6EBD, 0x9FE7 }, { 0x6EC2, 0x9FEF }, { 0x6EC4, 0x9FE9 },
+	{ 0x6EC5, 0x96C5 }, { 0x6EC9, 0x9FE4 }, { 0x6ECB, 0x8EA0 }, { 0x6ECC, 0x9FFC }, { 0x6ED1, 0x8A8A }, { 0x6ED3, 0x9FE6 }, { 0x6ED4, 0x9FEB }, { 0x6ED5, 0x9FEC },
+	{ 0x6EDD, 0x91EA }, { 0x6EDE, 0x91D8 }, { 0x6EEC, 0x9FF4 }, { 0x6EEF, 0x9FFA }, { 0x6EF2, 0x9FF8 }, { 0x6EF4, 0x9348 }, { 0x6EF7, 0xE042 }, { 0x6EF8, 0x9FF5 },
+	{ 0x6EFE, 0x9FF6 }, { 0x6EFF, 0x9FDE }, { 0x6F01, 0x8B99 }, { 0x6F02, 0x9559 }, { 0x6F06, 0x8EBD }, { 0x6F09, 0x8D97 }, { 0x6F0F, 0x9852 }, { 0x6F11, 0x9FF2 },
+	{ 0x6F13, 0xE041 }, { 0x6F14, 0x8989 }, { 0x6F15, 0x9186 }, { 0x6F20, 0x9499 }, { 0x6F22, 0x8ABF }, { 0x6F23, 0x97F8 }, { 0x6F2B, 0x969F }, { 0x6F2C, 0x92D0 },
+	{ 0x6F31, 0x9FF9 }, { 0x6F32, 0x9FFB }, { 0x6F38, 0x9151 }, { 0x6F3E, 0xE040 }, { 0x6F3F, 0x9FF7 }, { 0x6F41, 0x9FF1 }, { 0x6F45, 0x8AC1 }, { 0x6F54, 0x8C89 },
+	{ 0x6F58, 0xE04E }, { 0x6F5B, 0xE049 }, { 0x6F5C, 0x90F6 }, { 0x6F5F, 0x8A83 }, { 0x6F64, 0x8F81 }, { 0x6F66, 0xE052 }, { 0x6F6D, 0xE04B }, { 0x6F6E, 0x92AA },
+	{ 0x6F6F, 0xE048 }, { 0x6F70, 0x92D7 }, { 0x6F74, 0xE06B }, { 0x6F78, 0xE045 }, { 0x6F7A, 0xE044 }, { 0x6F7C, 0xE04D }, { 0x6F80, 0xE047 }, { 0x6F81, 0xE046 },
+	{ 0x6F82, 0xE04C }, { 0x6F84, 0x909F }, { 0x6F86, 0xE043 }, { 0x6F8E, 0xE04F }, { 0x6F91, 0xE050 }, { 0x6F97, 0x8AC0 }, { 0x6FA1, 0xE055 }, { 0x6FA3, 0xE054 },
+	{ 0x6FA4, 0xE056 }, { 0x6FAA, 0xE059 }, { 0x6FB1, 0x9362 }, { 0x6FB3, 0xE053 }, { 0x6FB9, 0xE057 }, { 0x6FC0, 0x8C83 }, { 0x6FC1, 0x91F7 }, { 0x6FC2, 0xE051 },
+	{ 0x6FC3, 0x945A }, { 0x6FC6, 0xE058 }, { 0x6FD4, 0xE05D }, { 0x6FD5, 0xE05B }, { 0x6FD8, 0xE05E }, { 0x6FDB, 0xE061 }, { 0x6FDF, 0xE05A }, { 0x6FE0, 0x8D8A },
+	{ 0x6FE1, 0x9447 }, { 0x6FE4, 0x9FB7 }, { 0x6FEB, 0x9794 }, { 0x6FEC, 0xE05C }, { 0x6FEE, 0xE060 }, { 0x6FEF, 0x91F3 }, { 0x6FF1, 0xE05F }, { 0x6FF3, 0xE04A },
+	{ 0x6FF6, 0xE889 }, { 0x6FFA, 0xE064 }, { 0x6FFE, 0xE068 }, { 0x7001, 0xE066 }, { 0x7009, 0xE062 }, { 0x700B, 0xE063 }, { 0x700F, 0xE067 }, { 0x7011, 0xE065 },
+	{ 0x7015, 0x956D }, { 0x7018, 0xE06D }, { 0x701A, 0xE06A }, { 0x701B, 0xE069 }, { 0x701D, 0xE06C }, { 0x701E, 0x93D2 }, { 0x701F, 0xE06E }, { 0x7026, 0x9295 },
+	{ 0x7027, 0x91EB }, { 0x702C, 0x90A3 }, { 0x7030, 0xE06F }, { 0x7032, 0xE071 }, { 0x703E, 0xE070 }, { 0x704C, 0x9FF3 }, { 0x7051, 0xE072 }, { 0x7058, 0x93E5 },
+	{ 0x7063, 0xE073 }, { 0x706B, 0x89CE }, { 0x706F, 0x9394 }, { 0x7070, 0x8A44 }, { 0x7078, 0x8B84 }, { 0x707C, 0x8EDC }, { 0x707D, 0x8DD0 }, { 0x7089, 0x9846 },
+	{ 0x708A, 0x9086 }, { 0x708E, 0x898A }, { 0x7092, 0xE075 }, { 0x7099, 0xE074 }, { 0x70AC, 0xE078 }, { 0x70AD, 0x9259 }, { 0x70AE, 0xE07B }, { 0x70AF, 0xE076 },
+	{ 0x70B3, 0xE07A }, { 0x70B8, 0xE079 }, { 0x70B9, 0x935F }, { 0x70BA, 0x88D7 }, { 0x70C8, 0x97F3 }, { 0x70CB, 0xE07D }, { 0x70CF, 0x8947 }, { 0x70D9, 0xE080 },
+	{ 0x70DD, 0xE07E }, { 0x70DF, 0xE07C }, { 0x70F1, 0xE077 }, { 0x70F9, 0x9642 }, { 0x70FD, 0xE082 }, { 0x7109, 0xE081 }, { 0x7114, 0x898B }, { 0x7119, 0xE084 },
+	{ 0x711A, 0x95B0 }, { 0x711C, 0xE083 }, { 0x7121, 0x96B3 }, { 0x7126, 0x8FC5 }, { 0x7136, 0x9152 }, { 0x713C, 0x8FC4 }, { 0x7149, 0x97F9 }, { 0x714C, 0xE08A },
+	{ 0x714E, 0x90F7 }, { 0x7155, 0xE086 }, { 0x7156, 0xE08B }, { 0x7159, 0x898C }, { 0x7162, 0xE089 }, { 0x7164, 0x9481 }, { 0x7165, 0xE085 }, { 0x7166, 0xE088 },
+	{ 0x7167, 0x8FC6 }, { 0x7169, 0x94CF }, { 0x716C, 0xE08C }, { 0x716E, 0x8ECF }, { 0x717D, 0x90F8 }, { 0x7184, 0xE08F }, { 0x7188, 0xE087 }, { 0x718A, 0x8C46 },
+	{ 0x718F, 0xE08D }, { 0x7194, 0x976F }, { 0x7195, 0xE090 }, { 0x7199, 0xEAA4 }, { 0x719F, 0x8F6E }, { 0x71A8, 0xE091 }, { 0x71AC, 0xE092 }, { 0x71B1, 0x944D },
+	{ 0x71B9, 0xE094 }, { 0x71BE, 0xE095 }, { 0x71C3, 0x9452 }, { 0x71C8, 0x9395 }, { 0x71C9, 0xE097 }, { 0x71CE, 0xE099 }, { 0x71D0, 0x97D3 }, { 0x71D2, 0xE096 },
+	{ 0x71D4, 0xE098 }, { 0x71D5, 0x898D }, { 0x71D7, 0xE093 }, { 0x71DF, 0x9A7A }, { 0x71E0, 0xE09A }, { 0x71E5, 0x9187 }, { 0x71E6, 0x8E57 }, { 0x71E7, 0xE09C },
+	{ 0x71EC, 0xE09B }, { 0x71ED, 0x9043 }, { 0x71EE, 0x99D7 }, { 0x71F5, 0xE09D }, { 0x71F9, 0xE09F }, { 0x71FB, 0xE08E }, { 0x71FC, 0xE09E }, { 0x71FF, 0xE0A0 },
+	{ 0x7206, 0x949A }, { 0x720D, 0xE0A1 }, { 0x7210, 0xE0A2 }, { 0x721B, 0xE0A3 }, { 0x7228, 0xE0A4 }, { 0x722A, 0x92DC }, { 0x722C, 0xE0A6 }, { 0x722D, 0xE0A5 },
+	{ 0x7230, 0xE0A7 }, { 0x7232, 0xE0A8 }, { 0x7235, 0x8EDD }, { 0x7236, 0x9583 }, { 0x723A, 0x96EA }, { 0x723B, 0xE0A9 }, { 0x723C, 0xE0AA }, { 0x723D, 0x9175 },
+	{ 0x723E, 0x8EA2 }, { 0x723F, 0xE0AB }, { 0x7240, 0xE0AC }, { 0x7246, 0xE0AD }, { 0x7247, 0x95D0 }, { 0x7248, 0x94C5 }, { 0x724B, 0xE0AE }, { 0x724C, 0x9476 },
+	{ 0x7252, 0x92AB }, { 0x7258, 0xE0AF }, { 0x7259, 0x89E5 }, { 0x725B, 0x8B8D }, { 0x725D, 0x96C4 }, { 0x725F, 0x96B4 }, { 0x7261, 0x89B2 }, { 0x7262, 0x9853 },
+	{ 0x7267, 0x9671 }, { 0x7269, 0x95A8 }, { 0x7272, 0x90B5 }, { 0x7274, 0xE0B0 }, { 0x7279, 0x93C1 }, { 0x727D, 0x8CA1 }, { 0x727E, 0xE0B1 }, { 0x7280, 0x8DD2 },
+	{ 0x7281, 0xE0B3 }, { 0x7282, 0xE0B2 }, { 0x7287, 0xE0B4 }, { 0x7292, 0xE0B5 }, { 0x7296, 0xE0B6 }, { 0x72A0, 0x8B5D }, { 0x72A2, 0xE0B7 }, { 0x72A7, 0xE0B8 },
+	{ 0x72AC, 0x8CA2 }, { 0x72AF, 0x94C6 }, { 0x72B2, 0xE0BA }, { 0x72B6, 0x8FF3 }, { 0x72B9, 0xE0B9 }, { 0x72C2, 0x8BB6 }, { 0x72C3, 0xE0BB }, { 0x72C4, 0xE0BD },
+	{ 0x72C6, 0xE0BC }, { 0x72CE, 0xE0BE }, { 0x72D0, 0x8CCF }, { 0x72D2, 0xE0BF }, { 0x72D7, 0x8BE7 }, { 0x72D9, 0x915F }, { 0x72DB, 0x8D9D }, { 0x72E0, 0xE0C1 },
+	{ 0x72E1, 0xE0C2 }, { 0x72E2, 0xE0C0 }, { 0x72E9, 0x8EEB }, { 0x72EC, 0x93C6 }, { 0x72ED, 0x8BB7 }, { 0x72F7, 0xE0C4 }, { 0x72F8, 0x924B }, { 0x72F9, 0xE0C3 },
+	{ 0x72FC, 0x9854 }, { 0x72FD, 0x9482 }, { 0x730A, 0xE0C7 }, { 0x7316, 0xE0C9 }, { 0x7317, 0xE0C6 }, { 0x731B, 0x96D2 }, { 0x731C, 0xE0C8 }, { 0x731D, 0xE0CA },
+	{ 0x731F, 0x97C2 }, { 0x7325, 0xE0CE }, { 0x7329, 0xE0CD }, { 0x732A, 0x9296 }, { 0x732B, 0x944C }, { 0x732E, 0x8CA3 }, { 0x732F, 0xE0CC }, { 0x7334, 0xE0CB },
+	{ 0x7336, 0x9750 }, { 0x7337, 0x9751 }, { 0x733E, 0xE0CF }, { 0x733F, 0x898E }, { 0x7344, 0x8D96 }, { 0x7345, 0x8E82 }, { 0x734E, 0xE0D0 }, { 0x734F, 0xE0D1 },
+	{ 0x7357, 0xE0D3 }, { 0x7363, 0x8F62 }, { 0x7368, 0xE0D5 }, { 0x736A, 0xE0D4 }, { 0x7370, 0xE0D6 }, { 0x7372, 0x8A6C }, { 0x7375, 0xE0D8 }, { 0x7378, 0xE0D7 },
+	{ 0x737A, 0xE0DA }, { 0x737B, 0xE0D9 }, { 0x7384, 0x8CBA }, { 0x7387, 0x97A6 }, { 0x7389, 0x8BCA }, { 0x738B, 0x89A4 }, { 0x7396, 0x8BE8 }, { 0x73A9, 0x8ADF },
+	{ 0x73B2, 0x97E6 }, { 0x73B3, 0xE0DC }, { 0x73BB, 0xE0DE }, { 0x73C0, 0xE0DF }, { 0x73C2, 0x89CF }, { 0x73C8, 0xE0DB }, { 0x73CA, 0x8E58 }, { 0x73CD, 0x92BF },
+	{ 0x73CE, 0xE0DD }, { 0x73DE, 0xE0E2 }, { 0x73E0, 0x8EEC }, { 0x73E5, 0xE0E0 }, { 0x73EA, 0x8C5D }, { 0x73ED, 0x94C7 }, { 0x73EE, 0xE0E1 }, { 0x73F1, 0xE0FC },
+	{ 0x73F8, 0xE0E7 }, { 0x73FE, 0x8CBB }, { 0x7403, 0x8B85 }, { 0x7405, 0xE0E4 }, { 0x7406, 0x979D }, { 0x7409, 0x97AE }, { 0x7422, 0x91F4 }, { 0x7425, 0xE0E6 },
+	{ 0x7432, 0xE0E8 }, { 0x7433, 0x97D4 }, { 0x7434, 0x8BD5 }, { 0x7435, 0x94FA }, { 0x7436, 0x9469 }, { 0x743A, 0xE0E9 }, { 0x743F, 0xE0EB }, { 0x7441, 0xE0EE },
+	{ 0x7455, 0xE0EA }, { 0x7459, 0xE0ED }, { 0x745A, 0x8CE8 }, { 0x745B, 0x896C }, { 0x745C, 0xE0EF }, { 0x745E, 0x9090 }, { 0x745F, 0xE0EC }, { 0x7460, 0x97DA },
+	{ 0x7463, 0xE0F2 }, { 0x7464, 0xEAA2 }, { 0x7469, 0xE0F0 }, { 0x746A, 0xE0F3 }, { 0x746F, 0xE0E5 }, { 0x7470, 0xE0F1 }, { 0x7473, 0x8DBA }, { 0x7476, 0xE0F4 },
+	{ 0x747E, 0xE0F5 }, { 0x7483, 0x979E }, { 0x748B, 0xE0F6 }, { 0x749E, 0xE0F7 }, { 0x74A2, 0xE0E3 }, { 0x74A7, 0xE0F8 }, { 0x74B0, 0x8AC2 }, { 0x74BD, 0x8EA3 },
+	{ 0x74CA, 0xE0F9 }, { 0x74CF, 0xE0FA }, { 0x74D4, 0xE0FB }, { 0x74DC, 0x895A }, { 0x74E0, 0xE140 }, { 0x74E2, 0x955A }, { 0x74E3, 0xE141 }, { 0x74E6, 0x8AA2 },
+	{ 0x74E7, 0xE142 }, { 0x74E9, 0xE143 }, { 0x74EE, 0xE144 }, { 0x74F0, 0xE146 }, { 0x74F1, 0xE147 }, { 0x74F2, 0xE145 }, { 0x74F6, 0x9572 }, { 0x74F7, 0xE149 },
+	{ 0x74F8, 0xE148 }, { 0x7503, 0xE14B }, { 0x7504, 0xE14A }, { 0x7505, 0xE14C }, { 0x750C, 0xE14D }, { 0x750D, 0xE14F }, { 0x750E, 0xE14E }, { 0x7511, 0x8D99 },
+	{ 0x7513, 0xE151 }, { 0x7515, 0xE150 }, { 0x7518, 0x8AC3 }, { 0x751A, 0x9072 }, { 0x751C, 0x935B }, { 0x751E, 0xE152 }, { 0x751F, 0x90B6 }, { 0x7523, 0x8E59 },
+	{ 0x7525, 0x8999 }, { 0x7526, 0xE153 }, { 0x7528, 0x9770 }, { 0x752B, 0x95E1 }, { 0x752C, 0xE154 }, { 0x7530, 0x9363 }, { 0x7531, 0x9752 }, { 0x7532, 0x8D62 },
+	{ 0x7533, 0x905C }, { 0x7537, 0x926A }, { 0x7538, 0x99B2 }, { 0x753A, 0x92AC }, { 0x753B, 0x89E6 }, { 0x753C, 0xE155 }, { 0x7544, 0xE156 }, { 0x7546, 0xE15B },
+	{ 0x7549, 0xE159 }, { 0x754A, 0xE158 }, { 0x754B, 0x9DC0 }, { 0x754C, 0x8A45 }, { 0x754D, 0xE157 }, { 0x754F, 0x88D8 }, { 0x7551, 0x94A8 }, { 0x7554, 0x94C8 },
+	{ 0x7559, 0x97AF }, { 0x755A, 0xE15C }, { 0x755B, 0xE15A }, { 0x755C, 0x927B }, { 0x755D, 0x90A4 }, { 0x7560, 0x94A9 }, { 0x7562, 0x954C }, { 0x7564, 0xE15E },
+	{ 0x7565, 0x97AA }, { 0x7566, 0x8C6C }, { 0x7567, 0xE15F }, { 0x7569, 0xE15D }, { 0x756A, 0x94D4 }, { 0x756B, 0xE160 }, { 0x756D, 0xE161 }, { 0x7570, 0x88D9 },
+	{ 0x7573, 0x8FF4 }, { 0x7574, 0xE166 }, { 0x7576, 0xE163 }, { 0x7577, 0x93EB }, { 0x7578, 0xE162 }, { 0x757F, 0x8B45 }, { 0x7582, 0xE169 }, { 0x7586, 0xE164 },
+	{ 0x7587, 0xE165 }, { 0x7589, 0xE168 }, { 0x758A, 0xE167 }, { 0x758B, 0x9544 }, { 0x758E, 0x9161 }, { 0x758F, 0x9160 }, { 0x7591, 0x8B5E }, { 0x7594, 0xE16A },
+	{ 0x759A, 0xE16B }, { 0x759D, 0xE16C }, { 0x75A3, 0xE16E }, { 0x75A5, 0xE16D }, { 0x75AB, 0x8975 }, { 0x75B1, 0xE176 }, { 0x75B2, 0x94E6 }, { 0x75B3, 0xE170 },
+	{ 0x75B5, 0xE172 }, { 0x75B8, 0xE174 }, { 0x75B9, 0x905D }, { 0x75BC, 0xE175 }, { 0x75BD, 0xE173 }, { 0x75BE, 0x8EBE }, { 0x75C2, 0xE16F }, { 0x75C3, 0xE171 },
+	{ 0x75C5, 0x9561 }, { 0x75C7, 0x8FC7 }, { 0x75CA, 0xE178 }, { 0x75CD, 0xE177 }, { 0x75D2, 0xE179 }, { 0x75D4, 0x8EA4 }, { 0x75D5, 0x8DAD }, { 0x75D8, 0x9397 },
+	{ 0x75D9, 0xE17A }, { 0x75DB, 0x92C9 }, { 0x75DE, 0xE17C }, { 0x75E2, 0x979F }, { 0x75E3, 0xE17B }, { 0x75E9, 0x9189 }, { 0x75F0, 0xE182 }, { 0x75F2, 0xE184 },
+	{ 0x75F3, 0xE185 }, { 0x75F4, 0x9273 }, { 0x75FA, 0xE183 }, { 0x75FC, 0xE180 }, { 0x75FE, 0xE17D }, { 0x75FF, 0xE17E }, { 0x7601, 0xE181 }, { 0x7609, 0xE188 },
+	{ 0x760B, 0xE186 }, { 0x760D, 0xE187 }, { 0x761F, 0xE189 }, { 0x7620, 0xE18B }, { 0x7621, 0xE18C }, { 0x7622, 0xE18D }, { 0x7624, 0xE18E }, { 0x7627, 0xE18A },
+	{ 0x7630, 0xE190 }, { 0x7634, 0xE18F }, { 0x763B, 0xE191 }, { 0x7642, 0x97C3 }, { 0x7646, 0xE194 }, { 0x7647, 0xE192 }, { 0x7648, 0xE193 }, { 0x764C, 0x8AE0 },
+	{ 0x7652, 0x96FC }, { 0x7656, 0x95C8 }, { 0x7658, 0xE196 }, { 0x765C, 0xE195 }, { 0x7661, 0xE197 }, { 0x7662, 0xE198 }, { 0x7667, 0xE19C }, { 0x7668, 0xE199 },
+	{ 0x7669, 0xE19A }, { 0x766A, 0xE19B }, { 0x766C, 0xE19D }, { 0x7670, 0xE19E }, { 0x7672, 0xE19F }, { 0x7676, 0xE1A0 }, { 0x7678, 0xE1A1 }, { 0x767A, 0x94AD },
+	{ 0x767B, 0x936F }, { 0x767C, 0xE1A2 }, { 0x767D, 0x9492 }, { 0x767E, 0x9553 }, { 0x7680, 0xE1A3 }, { 0x7683, 0xE1A4 }, { 0x7684, 0x9349 }, { 0x7686, 0x8A46 },
+	{ 0x7687, 0x8D63 }, { 0x7688, 0xE1A5 }, { 0x768B, 0xE1A6 }, { 0x768E, 0xE1A7 }, { 0x7690, 0x8E48 }, { 0x7693, 0xE1A9 }, { 0x7696, 0xE1A8 }, { 0x7699, 0xE1AA },
+	{ 0x769A, 0xE1AB }, { 0x76AE, 0x94E7 }, { 0x76B0, 0xE1AC }, { 0x76B4, 0xE1AD }, { 0x76B7, 0xEA89 }, { 0x76B8, 0xE1AE }, { 0x76B9, 0xE1AF }, { 0x76BA, 0xE1B0 },
+	{ 0x76BF, 0x8E4D }, { 0x76C2, 0xE1B1 }, { 0x76C3, 0x9475 }, { 0x76C6, 0x967E }, { 0x76C8, 0x896D }, { 0x76CA, 0x8976 }, { 0x76CD, 0xE1B2 }, { 0x76D2, 0xE1B4 },
+	{ 0x76D6, 0xE1B3 }, { 0x76D7, 0x9390 }, { 0x76DB, 0x90B7 }, { 0x76DC, 0x9F58 }, { 0x76DE, 0xE1B5 }, { 0x76DF, 0x96BF }, { 0x76E1, 0xE1B6 }, { 0x76E3, 0x8AC4 },
+	{ 0x76E4, 0x94D5 }, { 0x76E5, 0xE1B7 }, { 0x76E7, 0xE1B8 }, { 0x76EA, 0xE1B9 }, { 0x76EE, 0x96DA }, { 0x76F2, 0x96D3 }, { 0x76F4, 0x92BC }, { 0x76F8, 0x918A },
+	{ 0x76FB, 0xE1BB }, { 0x76FE, 0x8F82 }, { 0x7701, 0x8FC8 }, { 0x7704, 0xE1BE }, { 0x7707, 0xE1BD }, { 0x7708, 0xE1BC }, { 0x7709, 0x94FB }, { 0x770B, 0x8AC5 },
+	{ 0x770C, 0x8CA7 }, { 0x771B, 0xE1C4 }, { 0x771E, 0xE1C1 }, { 0x771F, 0x905E }, { 0x7720, 0x96B0 }, { 0x7724, 0xE1C0 }, { 0x7725, 0xE1C2 }, { 0x7726, 0xE1C3 },
+	{ 0x7729, 0xE1BF }, { 0x7737, 0xE1C5 }, { 0x7738, 0xE1C6 }, { 0x773A, 0x92AD }, { 0x773C, 0x8AE1 }, { 0x7740, 0x9285 }, { 0x7747, 0xE1C7 }, { 0x775A, 0xE1C8 },
+	{ 0x775B, 0xE1CB }, { 0x7761, 0x9087 }, { 0x7763, 0x93C2 }, { 0x7765, 0xE1CC }, { 0x7766, 0x9672 }, { 0x7768, 0xE1C9 }, { 0x776B, 0xE1CA }, { 0x7779, 0xE1CF },
+	{ 0x777E, 0xE1CE }, { 0x777F, 0xE1CD }, { 0x778B, 0xE1D1 }, { 0x778E, 0xE1D0 }, { 0x7791, 0xE1D2 }, { 0x779E, 0xE1D4 }, { 0x77A0, 0xE1D3 }, { 0x77A5, 0x95CB },
+	{ 0x77AC, 0x8F75 }, { 0x77AD, 0x97C4 }, { 0x77B0, 0xE1D5 }, { 0x77B3, 0x93B5 }, { 0x77B6, 0xE1D6 }, { 0x77B9, 0xE1D7 }, { 0x77BB, 0xE1DB }, { 0x77BC, 0xE1D9 },
+	{ 0x77BD, 0xE1DA }, { 0x77BF, 0xE1D8 }, { 0x77C7, 0xE1DC }, { 0x77CD, 0xE1DD }, { 0x77D7, 0xE1DE }, { 0x77DA, 0xE1DF }, { 0x77DB, 0x96B5 }, { 0x77DC, 0xE1E0 },
+	{ 0x77E2, 0x96EE }, { 0x77E3, 0xE1E1 }, { 0x77E5, 0x926D }, { 0x77E7, 0x948A }, { 0x77E9, 0x8BE9 }, { 0x77ED, 0x925A }, { 0x77EE, 0xE1E2 }, { 0x77EF, 0x8BB8 },
+	{ 0x77F3, 0x90CE }, { 0x77FC, 0xE1E3 }, { 0x7802, 0x8DBB }, { 0x780C, 0xE1E4 }, { 0x7812, 0xE1E5 }, { 0x7814, 0x8CA4 }, { 0x7815, 0x8DD3 }, { 0x7820, 0xE1E7 },
+	{ 0x7825, 0x9375 }, { 0x7826, 0x8DD4 }, { 0x7827, 0x8B6D }, { 0x7832, 0x9643 }, { 0x7834, 0x946A }, { 0x783A, 0x9376 }, { 0x783F, 0x8D7B }, { 0x7845, 0xE1E9 },
+	{ 0x785D, 0x8FC9 }, { 0x786B, 0x97B0 }, { 0x786C, 0x8D64 }, { 0x786F, 0x8CA5 }, { 0x7872, 0x94A1 }, { 0x7874, 0xE1EB }, { 0x787C, 0xE1ED }, { 0x7881, 0x8CE9 },
+	{ 0x7886, 0xE1EC }, { 0x7887, 0x92F4 }, { 0x788C, 0xE1EF }, { 0x788D, 0x8A56 }, { 0x788E, 0xE1EA }, { 0x7891, 0x94E8 }, { 0x7893, 0x894F }, { 0x7895, 0x8DEA },
+	{ 0x7897, 0x9871 }, { 0x789A, 0xE1EE }, { 0x78A3, 0xE1F0 }, { 0x78A7, 0x95C9 }, { 0x78A9, 0x90D7 }, { 0x78AA, 0xE1F2 }, { 0x78AF, 0xE1F3 }, { 0x78B5, 0xE1F1 },
+	{ 0x78BA, 0x8A6D }, { 0x78BC, 0xE1F9 }, { 0x78BE, 0xE1F8 }, { 0x78C1, 0x8EA5 }, { 0x78C5, 0xE1FA }, { 0x78C6, 0xE1F5 }, { 0x78CA, 0xE1FB }, { 0x78CB, 0xE1F6 },
+	{ 0x78D0, 0x94D6 }, { 0x78D1, 0xE1F4 }, { 0x78D4, 0xE1F7 }, { 0x78DA, 0xE241 }, { 0x78E7, 0xE240 }, { 0x78E8, 0x9681 }, { 0x78EC, 0xE1FC }, { 0x78EF, 0x88E9 },
+	{ 0x78F4, 0xE243 }, { 0x78FD, 0xE242 }, { 0x7901, 0x8FCA }, { 0x7907, 0xE244 }, { 0x790E, 0x9162 }, { 0x7911, 0xE246 }, { 0x7912, 0xE245 }, { 0x7919, 0xE247 },
+	{ 0x7926, 0xE1E6 }, { 0x792A, 0xE1E8 }, { 0x792B, 0xE249 }, { 0x792C, 0xE248 }, { 0x793A, 0x8EA6 }, { 0x793C, 0x97E7 }, { 0x793E, 0x8ED0 }, { 0x7940, 0xE24A },
+	{ 0x7941, 0x8C56 }, { 0x7947, 0x8B5F }, { 0x7948, 0x8B46 }, { 0x7949, 0x8E83 }, { 0x7950, 0x9753 }, { 0x7953, 0xE250 }, { 0x7955, 0xE24F }, { 0x7956, 0x9163 },
+	{ 0x7957, 0xE24C }, { 0x795A, 0xE24E }, { 0x795D, 0x8F6A }, { 0x795E, 0x905F }, { 0x795F, 0xE24D }, { 0x7960, 0xE24B }, { 0x7962, 0x9449 }, { 0x7965, 0x8FCB },
+	{ 0x7968, 0x955B }, { 0x796D, 0x8DD5 }, { 0x7977, 0x9398 }, { 0x797A, 0xE251 }, { 0x797F, 0xE252 }, { 0x7980, 0xE268 }, { 0x7981, 0x8BD6 }, { 0x7984, 0x985C },
+	{ 0x7985, 0x9154 }, { 0x798A, 0xE253 }, { 0x798D, 0x89D0 }, { 0x798E, 0x92F5 }, { 0x798F, 0x959F }, { 0x799D, 0xE254 }, { 0x79A6, 0x8B9A }, { 0x79A7, 0xE255 },
+	{ 0x79AA, 0xE257 }, { 0x79AE, 0xE258 }, { 0x79B0, 0x9448 }, { 0x79B3, 0xE259 }, { 0x79B9, 0xE25A }, { 0x79BA, 0xE25B }, { 0x79BD, 0x8BD7 }, { 0x79BE, 0x89D1 },
+	{ 0x79BF, 0x93C3 }, { 0x79C0, 0x8F47 }, { 0x79C1, 0x8E84 }, { 0x79C9, 0xE25C }, { 0x79CB, 0x8F48 }, { 0x79D1, 0x89C8 }, { 0x79D2, 0x9562 }, { 0x79D5, 0xE25D },
+	{ 0x79D8, 0x94E9 }, { 0x79DF, 0x9164 }, { 0x79E1, 0xE260 }, { 0x79E3, 0xE261 }, { 0x79E4, 0x9489 }, { 0x79E6, 0x9060 }, { 0x79E7, 0xE25E }, { 0x79E9, 0x9281 },
+	{ 0x79EC, 0xE25F }, { 0x79F0, 0x8FCC }, { 0x79FB, 0x88DA }, { 0x7A00, 0x8B48 }, { 0x7A08, 0xE262 }, { 0x7A0B, 0x92F6 }, { 0x7A0D, 0xE263 }, { 0x7A0E, 0x90C5 },
+	{ 0x7A14, 0x96AB }, { 0x7A17, 0x9542 }, { 0x7A18, 0xE264 }, { 0x7A19, 0xE265 }, { 0x7A1A, 0x9274 }, { 0x7A1C, 0x97C5 }, { 0x7A1F, 0xE267 }, { 0x7A20, 0xE266 },
+	{ 0x7A2E, 0x8EED }, { 0x7A31, 0xE269 }, { 0x7A32, 0x88EE }, { 0x7A37, 0xE26C }, { 0x7A3B, 0xE26A }, { 0x7A3C, 0x89D2 }, { 0x7A3D, 0x8C6D }, { 0x7A3E, 0xE26B },
+	{ 0x7A3F, 0x8D65 }, { 0x7A40, 0x8D92 }, { 0x7A42, 0x95E4 }, { 0x7A43, 0xE26D }, { 0x7A46, 0x9673 }, { 0x7A49, 0xE26F }, { 0x7A4D, 0x90CF }, { 0x7A4E, 0x896E },
+	{ 0x7A4F, 0x89B8 }, { 0x7A50, 0x88AA }, { 0x7A57, 0xE26E }, { 0x7A61, 0xE270 }, { 0x7A62, 0xE271 }, { 0x7A63, 0x8FF5 }, { 0x7A69, 0xE272 }, { 0x7A6B, 0x8A6E },
+	{ 0x7A70, 0xE274 }, { 0x7A74, 0x8C8A }, { 0x7A76, 0x8B86 }, { 0x7A79, 0xE275 }, { 0x7A7A, 0x8BF3 }, { 0x7A7D, 0xE276 }, { 0x7A7F, 0x90FA }, { 0x7A81, 0x93CB },
+	{ 0x7A83, 0x90DE }, { 0x7A84, 0x8DF3 }, { 0x7A88, 0xE277 }, { 0x7A92, 0x9282 }, { 0x7A93, 0x918B }, { 0x7A95, 0xE279 }, { 0x7A96, 0xE27B }, { 0x7A97, 0xE278 },
+	{ 0x7A98, 0xE27A }, { 0x7A9F, 0x8C41 }, { 0x7AA9, 0xE27C }, { 0x7AAA, 0x8C45 }, { 0x7AAE, 0x8B87 }, { 0x7AAF, 0x9771 }, { 0x7AB0, 0xE27E }, { 0x7AB6, 0xE280 },
+	{ 0x7ABA, 0x894D }, { 0x7ABF, 0xE283 }, { 0x7AC3, 0x8A96 }, { 0x7AC4, 0xE282 }, { 0x7AC5, 0xE281 }, { 0x7AC7, 0xE285 }, { 0x7AC8, 0xE27D }, { 0x7ACA, 0xE286 },
+	{ 0x7ACB, 0x97A7 }, { 0x7ACD, 0xE287 }, { 0x7ACF, 0xE288 }, { 0x7AD2, 0x9AF2 }, { 0x7AD3, 0xE28A }, { 0x7AD5, 0xE289 }, { 0x7AD9, 0xE28B }, { 0x7ADA, 0xE28C },
+	{ 0x7ADC, 0x97B3 }, { 0x7ADD, 0xE28D }, { 0x7ADF, 0xE8ED }, { 0x7AE0, 0x8FCD }, { 0x7AE1, 0xE28E }, { 0x7AE2, 0xE28F }, { 0x7AE3, 0x8F76 }, { 0x7AE5, 0x93B6 },
+	{ 0x7AE6, 0xE290 }, { 0x7AEA, 0x9247 }, { 0x7AED, 0xE291 }, { 0x7AEF, 0x925B }, { 0x7AF0, 0xE292 }, { 0x7AF6, 0x8BA3 }, { 0x7AF8, 0x995E }, { 0x7AF9, 0x927C },
+	{ 0x7AFA, 0x8EB1 }, { 0x7AFF, 0x8AC6 }, { 0x7B02, 0xE293 }, { 0x7B04, 0xE2A0 }, { 0x7B06, 0xE296 }, { 0x7B08, 0x8B88 }, { 0x7B0A, 0xE295 }, { 0x7B0B, 0xE2A2 },
+	{ 0x7B0F, 0xE294 }, { 0x7B11, 0x8FCE }, { 0x7B18, 0xE298 }, { 0x7B19, 0xE299 }, { 0x7B1B, 0x934A }, { 0x7B1E, 0xE29A }, { 0x7B20, 0x8A7D }, { 0x7B25, 0x9079 },
+	{ 0x7B26, 0x9584 }, { 0x7B28, 0xE29C }, { 0x7B2C, 0x91E6 }, { 0x7B33, 0xE297 }, { 0x7B35, 0xE29B }, { 0x7B36, 0xE29D }, { 0x7B39, 0x8DF9 }, { 0x7B45, 0xE2A4 },
+	{ 0x7B46, 0x954D }, { 0x7B48, 0x94A4 }, { 0x7B49, 0x9399 }, { 0x7B4B, 0x8BD8 }, { 0x7B4C, 0xE2A3 }, { 0x7B4D, 0xE2A1 }, { 0x7B4F, 0x94B3 }, { 0x7B50, 0xE29E },
+	{ 0x7B51, 0x927D }, { 0x7B52, 0x939B }, { 0x7B54, 0x939A }, { 0x7B56, 0x8DF4 }, { 0x7B5D, 0xE2B6 }, { 0x7B65, 0xE2A6 }, { 0x7B67, 0xE2A8 }, { 0x7B6C, 0xE2AB },
+	{ 0x7B6E, 0xE2AC }, { 0x7B70, 0xE2A9 }, { 0x7B71, 0xE2AA }, { 0x7B74, 0xE2A7 }, { 0x7B75, 0xE2A5 }, { 0x7B7A, 0xE29F }, { 0x7B86, 0x95CD }, { 0x7B87, 0x89D3 },
+	{ 0x7B8B, 0xE2B3 }, { 0x7B8D, 0xE2B0 }, { 0x7B8F, 0xE2B5 }, { 0x7B92, 0xE2B4 }, { 0x7B94, 0x9493 }, { 0x7B95, 0x96A5 }, { 0x7B97, 0x8E5A }, { 0x7B98, 0xE2AE },
+	{ 0x7B99, 0xE2B7 }, { 0x7B9A, 0xE2B2 }, { 0x7B9C, 0xE2B1 }, { 0x7B9D, 0xE2AD }, { 0x7B9F, 0xE2AF }, { 0x7BA1, 0x8AC7 }, { 0x7BAA, 0x925C }, { 0x7BAD, 0x90FB },
+	{ 0x7BB1, 0x94A0 }, { 0x7BB4, 0xE2BC }, { 0x7BB8, 0x94A2 }, { 0x7BC0, 0x90DF }, { 0x7BC1, 0xE2B9 }, { 0x7BC4, 0x94CD }, { 0x7BC6, 0xE2BD }, { 0x7BC7, 0x95D1 },
+	{ 0x7BC9, 0x927A }, { 0x7BCB, 0xE2B8 }, { 0x7BCC, 0xE2BA }, { 0x7BCF, 0xE2BB }, { 0x7BDD, 0xE2BE }, { 0x7BE0, 0x8EC2 }, { 0x7BE4, 0x93C4 }, { 0x7BE5, 0xE2C3 },
+	{ 0x7BE6, 0xE2C2 }, { 0x7BE9, 0xE2BF }, { 0x7BED, 0x9855 }, { 0x7BF3, 0xE2C8 }, { 0x7BF6, 0xE2CC }, { 0x7BF7, 0xE2C9 }, { 0x7C00, 0xE2C5 }, { 0x7C07, 0xE2C6 },
+	{ 0x7C0D, 0xE2CB }, { 0x7C11, 0xE2C0 }, { 0x7C12, 0x99D3 }, { 0x7C13, 0xE2C7 }, { 0x7C14, 0xE2C1 }, { 0x7C17, 0xE2CA }, { 0x7C1F, 0xE2D0 }, { 0x7C21, 0x8AC8 },
+	{ 0x7C23, 0xE2CD }, { 0x7C27, 0xE2CE }, { 0x7C2A, 0xE2CF }, { 0x7C2B, 0xE2D2 }, { 0x7C37, 0xE2D1 }, { 0x7C38, 0x94F4 }, { 0x7C3D, 0xE2D3 }, { 0x7C3E, 0x97FA },
+	{ 0x7C3F, 0x95EB }, { 0x7C40, 0xE2D8 }, { 0x7C43, 0xE2D5 }, { 0x7C4C, 0xE2D4 }, { 0x7C4D, 0x90D0 }, { 0x7C4F, 0xE2D7 }, { 0x7C50, 0xE2D9 }, { 0x7C54, 0xE2D6 },
+	{ 0x7C56, 0xE2DD }, { 0x7C58, 0xE2DA }, { 0x7C5F, 0xE2DB }, { 0x7C60, 0xE2C4 }, { 0x7C64, 0xE2DC }, { 0x7C65, 0xE2DE }, { 0x7C6C, 0xE2DF }, { 0x7C73, 0x95C4 },
+	{ 0x7C75, 0xE2E0 }, { 0x7C7E, 0x96E0 }, { 0x7C81, 0x8BCC }, { 0x7C82, 0x8C48 }, { 0x7C83, 0xE2E1 }, { 0x7C89, 0x95B2 }, { 0x7C8B, 0x9088 }, { 0x7C8D, 0x96AE },
+	{ 0x7C90, 0xE2E2 }, { 0x7C92, 0x97B1 }, { 0x7C95, 0x9494 }, { 0x7C97, 0x9165 }, { 0x7C98, 0x9453 }, { 0x7C9B, 0x8F6C }, { 0x7C9F, 0x88BE }, { 0x7CA1, 0xE2E7 },
+	{ 0x7CA2, 0xE2E5 }, { 0x7CA4, 0xE2E3 }, { 0x7CA5, 0x8A9F }, { 0x7CA7, 0x8FCF }, { 0x7CA8, 0xE2E8 }, { 0x7CAB, 0xE2E6 }, { 0x7CAD, 0xE2E4 }, { 0x7CAE, 0xE2EC },
+	{ 0x7CB1, 0xE2EB }, { 0x7CB2, 0xE2EA }, { 0x7CB3, 0xE2E9 }, { 0x7CB9, 0xE2ED }, { 0x7CBD, 0xE2EE }, { 0x7CBE, 0x90B8 }, { 0x7CC0, 0xE2EF }, { 0x7CC2, 0xE2F1 },
+	{ 0x7CC5, 0xE2F0 }, { 0x7CCA, 0x8CD0 }, { 0x7CCE, 0x9157 }, { 0x7CD2, 0xE2F3 }, { 0x7CD6, 0x939C }, { 0x7CD8, 0xE2F2 }, { 0x7CDC, 0xE2F4 }, { 0x7CDE, 0x95B3 },
+	{ 0x7CDF, 0x918C }, { 0x7CE0, 0x8D66 }, { 0x7CE2, 0xE2F5 }, { 0x7CE7, 0x97C6 }, { 0x7CEF, 0xE2F7 }, { 0x7CF2, 0xE2F8 }, { 0x7CF4, 0xE2F9 }, { 0x7CF6, 0xE2FA },
+	{ 0x7CF8, 0x8E85 }, { 0x7CFA, 0xE2FB }, { 0x7CFB, 0x8C6E }, { 0x7CFE, 0x8B8A }, { 0x7D00, 0x8B49 }, { 0x7D02, 0xE340 }, { 0x7D04, 0x96F1 }, { 0x7D05, 0x8D67 },
+	{ 0x7D06, 0xE2FC }, { 0x7D0A, 0xE343 }, { 0x7D0B, 0x96E4 }, { 0x7D0D, 0x945B }, { 0x7D10, 0x9552 }, { 0x7D14, 0x8F83 }, { 0x7D15, 0xE342 }, { 0x7D17, 0x8ED1 },
+	{ 0x7D18, 0x8D68 }, { 0x7D19, 0x8E86 }, { 0x7D1A, 0x8B89 }, { 0x7D1B, 0x95B4 }, { 0x7D1C, 0xE341 }, { 0x7D20, 0x9166 }, { 0x7D21, 0x9661 }, { 0x7D22, 0x8DF5 },
+	{ 0x7D2B, 0x8E87 }, { 0x7D2C, 0x92DB }, { 0x7D2E, 0xE346 }, { 0x7D2F, 0x97DD }, { 0x7D30, 0x8DD7 }, { 0x7D32, 0xE347 }, { 0x7D33, 0x9061 }, { 0x7D35, 0xE349 },
+	{ 0x7D39, 0x8FD0 }, { 0x7D3A, 0x8DAE }, { 0x7D3F, 0xE348 }, { 0x7D42, 0x8F49 }, { 0x7D43, 0x8CBC }, { 0x7D44, 0x9167 }, { 0x7D45, 0xE344 }, { 0x7D46, 0xE34A },
+	{ 0x7D4B, 0xE345 }, { 0x7D4C, 0x8C6F }, { 0x7D4E, 0xE34D }, { 0x7D4F, 0xE351 }, { 0x7D50, 0x8C8B }, { 0x7D56, 0xE34C }, { 0x7D5B, 0xE355 }, { 0x7D5E, 0x8D69 },
+	{ 0x7D61, 0x978D }, { 0x7D62, 0x88BA }, { 0x7D63, 0xE352 }, { 0x7D66, 0x8B8B }, { 0x7D68, 0xE34F }, { 0x7D6E, 0xE350 }, { 0x7D71, 0x939D }, { 0x7D72, 0xE34E },
+	{ 0x7D73, 0xE34B }, { 0x7D75, 0x8A47 }, { 0x7D76, 0x90E2 }, { 0x7D79, 0x8CA6 }, { 0x7D7D, 0xE357 }, { 0x7D89, 0xE354 }, { 0x7D8F, 0xE356 }, { 0x7D93, 0xE353 },
+	{ 0x7D99, 0x8C70 }, { 0x7D9A, 0x91B1 }, { 0x7D9B, 0xE358 }, { 0x7D9C, 0x918E }, { 0x7D9F, 0xE365 }, { 0x7DA2, 0xE361 }, { 0x7DA3, 0xE35B }, { 0x7DAB, 0xE35F },
+	{ 0x7DAC, 0x8EF8 }, { 0x7DAD, 0x88DB }, { 0x7DAE, 0xE35A }, { 0x7DAF, 0xE362 }, { 0x7DB0, 0xE366 }, { 0x7DB1, 0x8D6A }, { 0x7DB2, 0x96D4 }, { 0x7DB4, 0x92D4 },
+	{ 0x7DB5, 0xE35C }, { 0x7DB8, 0xE364 }, { 0x7DBA, 0xE359 }, { 0x7DBB, 0x925D }, { 0x7DBD, 0xE35E }, { 0x7DBE, 0x88BB }, { 0x7DBF, 0x96C8 }, { 0x7DC7, 0xE35D },
+	{ 0x7DCA, 0x8BD9 }, { 0x7DCB, 0x94EA }, { 0x7DCF, 0x918D }, { 0x7DD1, 0x97CE }, { 0x7DD2, 0x8F8F }, { 0x7DD5, 0xE38E }, { 0x7DD8, 0xE367 }, { 0x7DDA, 0x90FC },
+	{ 0x7DDC, 0xE363 }, { 0x7DDD, 0xE368 }, { 0x7DDE, 0xE36A }, { 0x7DE0, 0x92F7 }, { 0x7DE1, 0xE36D }, { 0x7DE4, 0xE369 }, { 0x7DE8, 0x95D2 }, { 0x7DE9, 0x8AC9 },
+	{ 0x7DEC, 0x96C9 }, { 0x7DEF, 0x88DC }, { 0x7DF2, 0xE36C }, { 0x7DF4, 0x97FB }, { 0x7DFB, 0xE36B }, { 0x7E01, 0x898F }, { 0x7E04, 0x93EA }, { 0x7E05, 0xE36E },
+	{ 0x7E09, 0xE375 }, { 0x7E0A, 0xE36F }, { 0x7E0B, 0xE376 }, { 0x7E12, 0xE372 }, { 0x7E1B, 0x949B }, { 0x7E1E, 0x8EC8 }, { 0x7E1F, 0xE374 }, { 0x7E21, 0xE371 },
+	{ 0x7E22, 0xE377 }, { 0x7E23, 0xE370 }, { 0x7E26, 0x8F63 }, { 0x7E2B, 0x9644 }, { 0x7E2E, 0x8F6B }, { 0x7E31, 0xE373 }, { 0x7E32, 0xE380 }, { 0x7E35, 0xE37B },
+	{ 0x7E37, 0xE37E }, { 0x7E39, 0xE37C }, { 0x7E3A, 0xE381 }, { 0x7E3B, 0xE37A }, { 0x7E3D, 0xE360 }, { 0x7E3E, 0x90D1 }, { 0x7E41, 0x94C9 }, { 0x7E43, 0xE37D },
+	{ 0x7E46, 0xE378 }, { 0x7E4A, 0x9140 }, { 0x7E4B, 0x8C71 }, { 0x7E4D, 0x8F4A }, { 0x7E54, 0x9044 }, { 0x7E55, 0x9155 }, { 0x7E56, 0xE384 }, { 0x7E59, 0xE386 },
+	{ 0x7E5A, 0xE387 }, { 0x7E5D, 0xE383 }, { 0x7E5E, 0xE385 }, { 0x7E66, 0xE379 }, { 0x7E67, 0xE382 }, { 0x7E69, 0xE38A }, { 0x7E6A, 0xE389 }, { 0x7E6D, 0x969A },
+	{ 0x7E70, 0x8C4A }, { 0x7E79, 0xE388 }, { 0x7E7B, 0xE38C }, { 0x7E7C, 0xE38B }, { 0x7E7D, 0xE38F }, { 0x7E7F, 0xE391 }, { 0x7E82, 0x8E5B }, { 0x7E83, 0xE38D },
+	{ 0x7E88, 0xE392 }, { 0x7E89, 0xE393 }, { 0x7E8C, 0xE394 }, { 0x7E8E, 0xE39A }, { 0x7E8F, 0x935A }, { 0x7E90, 0xE396 }, { 0x7E92, 0xE395 }, { 0x7E93, 0xE397 },
+	{ 0x7E94, 0xE398 }, { 0x7E96, 0xE399 }, { 0x7E9B, 0xE39B }, { 0x7E9C, 0xE39C }, { 0x7F36, 0x8ACA }, { 0x7F38, 0xE39D }, { 0x7F3A, 0xE39E }, { 0x7F45, 0xE39F },
+	{ 0x7F4C, 0xE3A0 }, { 0x7F4D, 0xE3A1 }, { 0x7F4E, 0xE3A2 }, { 0x7F50, 0xE3A3 }, { 0x7F51, 0xE3A4 }, { 0x7F54, 0xE3A6 }, { 0x7F55, 0xE3A5 }, { 0x7F58, 0xE3A7 },
+	{ 0x7F5F, 0xE3A8 }, { 0x7F60, 0xE3A9 }, { 0x7F67, 0xE3AC }, { 0x7F68, 0xE3AA }, { 0x7F69, 0xE3AB }, { 0x7F6A, 0x8DDF }, { 0x7F6B, 0x8C72 }, { 0x7F6E, 0x9275 },
+	{ 0x7F70, 0x94B1 }, { 0x7F72, 0x8F90 }, { 0x7F75, 0x946C }, { 0x7F77, 0x94EB }, { 0x7F78, 0xE3AD }, { 0x7F79, 0x9CEB }, { 0x7F82, 0xE3AE }, { 0x7F83, 0xE3B0 },
+	{ 0x7F85, 0x9785 }, { 0x7F86, 0xE3AF }, { 0x7F87, 0xE3B2 }, { 0x7F88, 0xE3B1 }, { 0x7F8A, 0x9772 }, { 0x7F8C, 0xE3B3 }, { 0x7F8E, 0x94FC }, { 0x7F94, 0xE3B4 },
+	{ 0x7F9A, 0xE3B7 }, { 0x7F9D, 0xE3B6 }, { 0x7F9E, 0xE3B5 }, { 0x7FA3, 0xE3B8 }, { 0x7FA4, 0x8C51 }, { 0x7FA8, 0x9141 }, { 0x7FA9, 0x8B60 }, { 0x7FAE, 0xE3BC },
+	{ 0x7FAF, 0xE3B9 }, { 0x7FB2, 0xE3BA }, { 0x7FB6, 0xE3BD }, { 0x7FB8, 0xE3BE }, { 0x7FB9, 0xE3BB }, { 0x7FBD, 0x8948 }, { 0x7FC1, 0x89A5 }, { 0x7FC5, 0xE3C0 },
+	{ 0x7FC6, 0xE3C1 }, { 0x7FCA, 0xE3C2 }, { 0x7FCC, 0x9782 }, { 0x7FD2, 0x8F4B }, { 0x7FD4, 0xE3C4 }, { 0x7FD5, 0xE3C3 }, { 0x7FE0, 0x9089 }, { 0x7FE1, 0xE3C5 },
+	{ 0x7FE6, 0xE3C6 }, { 0x7FE9, 0xE3C7 }, { 0x7FEB, 0x8AE3 }, { 0x7FF0, 0x8ACB }, { 0x7FF3, 0xE3C8 }, { 0x7FF9, 0xE3C9 }, { 0x7FFB, 0x967C }, { 0x7FFC, 0x9783 },
+	{ 0x8000, 0x9773 }, { 0x8001, 0x9856 }, { 0x8003, 0x8D6C }, { 0x8004, 0xE3CC }, { 0x8005, 0x8ED2 }, { 0x8006, 0xE3CB }, { 0x800B, 0xE3CD }, { 0x800C, 0x8EA7 },
+	{ 0x8010, 0x91CF }, { 0x8012, 0xE3CE }, { 0x8015, 0x8D6B }, { 0x8017, 0x96D5 }, { 0x8018, 0xE3CF }, { 0x8019, 0xE3D0 }, { 0x801C, 0xE3D1 }, { 0x8021, 0xE3D2 },
+	{ 0x8028, 0xE3D3 }, { 0x8033, 0x8EA8 }, { 0x8036, 0x96EB }, { 0x803B, 0xE3D5 }, { 0x803D, 0x925E }, { 0x803F, 0xE3D4 }, { 0x8046, 0xE3D7 }, { 0x804A, 0xE3D6 },
+	{ 0x8052, 0xE3D8 }, { 0x8056, 0x90B9 }, { 0x8058, 0xE3D9 }, { 0x805A, 0xE3DA }, { 0x805E, 0x95B7 }, { 0x805F, 0xE3DB }, { 0x8061, 0x918F }, { 0x8062, 0xE3DC },
+	{ 0x8068, 0xE3DD }, { 0x806F, 0x97FC }, { 0x8070, 0xE3E0 }, { 0x8072, 0xE3DF }, { 0x8073, 0xE3DE }, { 0x8074, 0x92AE }, { 0x8076, 0xE3E1 }, { 0x8077, 0x9045 },
+	{ 0x8079, 0xE3E2 }, { 0x807D, 0xE3E3 }, { 0x807E, 0x9857 }, { 0x807F, 0xE3E4 }, { 0x8084, 0xE3E5 }, { 0x8085, 0xE3E7 }, { 0x8086, 0xE3E6 }, { 0x8087, 0x94A3 },
+	{ 0x8089, 0x93F7 }, { 0x808B, 0x985D }, { 0x808C, 0x94A7 }, { 0x8093, 0xE3E9 }, { 0x8096, 0x8FD1 }, { 0x8098, 0x9549 }, { 0x809A, 0xE3EA }, { 0x809B, 0xE3E8 },
+	{ 0x809D, 0x8ACC }, { 0x80A1, 0x8CD2 }, { 0x80A2, 0x8E88 }, { 0x80A5, 0x94EC }, { 0x80A9, 0x8CA8 }, { 0x80AA, 0x9662 }, { 0x80AC, 0xE3ED }, { 0x80AD, 0xE3EB },
+	{ 0x80AF, 0x8D6D }, { 0x80B1, 0x8D6E }, { 0x80B2, 0x88E7 }, { 0x80B4, 0x8DE6 }, { 0x80BA, 0x9478 }, { 0x80C3, 0x88DD }, { 0x80C4, 0xE3F2 }, { 0x80C6, 0x925F },
+	{ 0x80CC, 0x9477 }, { 0x80CE, 0x91D9 }, { 0x80D6, 0xE3F4 }, { 0x80D9, 0xE3F0 }, { 0x80DA, 0xE3F3 }, { 0x80DB, 0xE3EE }, { 0x80DD, 0xE3F1 }, { 0x80DE, 0x9645 },
+	{ 0x80E1, 0x8CD3 }, { 0x80E4, 0x88FB }, { 0x80E5, 0xE3EF }, { 0x80EF, 0xE3F6 }, { 0x80F1, 0xE3F7 }, { 0x80F4, 0x93B7 }, { 0x80F8, 0x8BB9 }, { 0x80FC, 0xE445 },
+	{ 0x80FD, 0x945C }, { 0x8102, 0x8E89 }, { 0x8105, 0x8BBA }, { 0x8106, 0x90C6 }, { 0x8107, 0x9865 }, { 0x8108, 0x96AC }, { 0x8109, 0xE3F5 }, { 0x810A, 0x90D2 },
+	{ 0x811A, 0x8B72 }, { 0x811B, 0xE3F8 }, { 0x8123, 0xE3FA }, { 0x8129, 0xE3F9 }, { 0x812F, 0xE3FB }, { 0x8131, 0x9245 }, { 0x8133, 0x945D }, { 0x8139, 0x92AF },
+	{ 0x813E, 0xE442 }, { 0x8146, 0xE441 }, { 0x814B, 0xE3FC }, { 0x814E, 0x9074 }, { 0x8150, 0x9585 }, { 0x8151, 0xE444 }, { 0x8153, 0xE443 }, { 0x8154, 0x8D6F },
+	{ 0x8155, 0x9872 }, { 0x815F, 0xE454 }, { 0x8165, 0xE448 }, { 0x8166, 0xE449 }, { 0x816B, 0x8EEE }, { 0x816E, 0xE447 }, { 0x8170, 0x8D98 }, { 0x8171, 0xE446 },
+	{ 0x8174, 0xE44A }, { 0x8178, 0x92B0 }, { 0x8179, 0x95A0 }, { 0x817A, 0x9142 }, { 0x817F, 0x91DA }, { 0x8180, 0xE44E }, { 0x8182, 0xE44F }, { 0x8183, 0xE44B },
+	{ 0x8188, 0xE44C }, { 0x818A, 0xE44D }, { 0x818F, 0x8D70 }, { 0x8193, 0xE455 }, { 0x8195, 0xE451 }, { 0x819A, 0x9586 }, { 0x819C, 0x968C }, { 0x819D, 0x9547 },
+	{ 0x81A0, 0xE450 }, { 0x81A3, 0xE453 }, { 0x81A4, 0xE452 }, { 0x81A8, 0x9663 }, { 0x81A9, 0xE456 }, { 0x81B0, 0xE457 }, { 0x81B3, 0x9156 }, { 0x81B5, 0xE458 },
+	{ 0x81B8, 0xE45A }, { 0x81BA, 0xE45E }, { 0x81BD, 0xE45B }, { 0x81BE, 0xE459 }, { 0x81BF, 0x945E }, { 0x81C0, 0xE45C }, { 0x81C2, 0xE45D }, { 0x81C6, 0x89B0 },
+	{ 0x81C8, 0xE464 }, { 0x81C9, 0xE45F }, { 0x81CD, 0xE460 }, { 0x81D1, 0xE461 }, { 0x81D3, 0x919F }, { 0x81D8, 0xE463 }, { 0x81D9, 0xE462 }, { 0x81DA, 0xE465 },
+	{ 0x81DF, 0xE466 }, { 0x81E0, 0xE467 }, { 0x81E3, 0x9062 }, { 0x81E5, 0x89E7 }, { 0x81E7, 0xE468 }, { 0x81E8, 0x97D5 }, { 0x81EA, 0x8EA9 }, { 0x81ED, 0x8F4C },
+	{ 0x81F3, 0x8E8A }, { 0x81F4, 0x9276 }, { 0x81FA, 0xE469 }, { 0x81FB, 0xE46A }, { 0x81FC, 0x8950 }, { 0x81FE, 0xE46B }, { 0x8201, 0xE46C }, { 0x8202, 0xE46D },
+	{ 0x8205, 0xE46E }, { 0x8207, 0xE46F }, { 0x8208, 0x8BBB }, { 0x8209, 0x9DA8 }, { 0x820A, 0xE470 }, { 0x820C, 0x90E3 }, { 0x820D, 0xE471 }, { 0x820E, 0x8EC9 },
+	{ 0x8210, 0xE472 }, { 0x8212, 0x98AE }, { 0x8216, 0xE473 }, { 0x8217, 0x95DC }, { 0x8218, 0x8ADA }, { 0x821B, 0x9143 }, { 0x821C, 0x8F77 }, { 0x821E, 0x9591 },
+	{ 0x821F, 0x8F4D }, { 0x8229, 0xE474 }, { 0x822A, 0x8D71 }, { 0x822B, 0xE475 }, { 0x822C, 0x94CA }, { 0x822E, 0xE484 }, { 0x8233, 0xE477 }, { 0x8235, 0x91C7 },
+	{ 0x8236, 0x9495 }, { 0x8237, 0x8CBD }, { 0x8238, 0xE476 }, { 0x8239, 0x9144 }, { 0x8240, 0xE478 }, { 0x8247, 0x92F8 }, { 0x8258, 0xE47A }, { 0x8259, 0xE479 },
+	{ 0x825A, 0xE47C }, { 0x825D, 0xE47B }, { 0x825F, 0xE47D }, { 0x8262, 0xE480 }, { 0x8264, 0xE47E }, { 0x8266, 0x8ACD }, { 0x8268, 0xE481 }, { 0x826A, 0xE482 },
+	{ 0x826B, 0xE483 }, { 0x826E, 0x8DAF }, { 0x826F, 0x97C7 }, { 0x8271, 0xE485 }, { 0x8272, 0x9046 }, { 0x8276, 0x8990 }, { 0x8277, 0xE486 }, { 0x8278, 0xE487 },
+	{ 0x827E, 0xE488 }, { 0x828B, 0x88F0 }, { 0x828D, 0xE489 }, { 0x8292, 0xE48A }, { 0x8299, 0x9587 }, { 0x829D, 0x8EC5 }, { 0x829F, 0xE48C }, { 0x82A5, 0x8A48 },
+	{ 0x82A6, 0x88B0 }, { 0x82AB, 0xE48B }, { 0x82AC, 0xE48E }, { 0x82AD, 0x946D }, { 0x82AF, 0x9063 }, { 0x82B1, 0x89D4 }, { 0x82B3, 0x9646 }, { 0x82B8, 0x8C7C },
+	{ 0x82B9, 0x8BDA }, { 0x82BB, 0xE48D }, { 0x82BD, 0x89E8 }, { 0x82C5, 0x8AA1 }, { 0x82D1, 0x8991 }, { 0x82D2, 0xE492 }, { 0x82D3, 0x97E8 }, { 0x82D4, 0x91DB },
+	{ 0x82D7, 0x9563 }, { 0x82D9, 0xE49E }, { 0x82DB, 0x89D5 }, { 0x82DC, 0xE49C }, { 0x82DE, 0xE49A }, { 0x82DF, 0xE491 }, { 0x82E1, 0xE48F }, { 0x82E3, 0xE490 },
+	{ 0x82E5, 0x8EE1 }, { 0x82E6, 0x8BEA }, { 0x82E7, 0x9297 }, { 0x82EB, 0x93CF }, { 0x82F1, 0x8970 }, { 0x82F3, 0xE494 }, { 0x82F4, 0xE493 }, { 0x82F9, 0xE499 },
+	{ 0x82FA, 0xE495 }, { 0x82FB, 0xE498 }, { 0x8302, 0x96CE }, { 0x8303, 0xE497 }, { 0x8304, 0x89D6 }, { 0x8305, 0x8A9D }, { 0x8306, 0xE49B }, { 0x8309, 0xE49D },
+	{ 0x830E, 0x8C73 }, { 0x8316, 0xE4A1 }, { 0x8317, 0xE4AA }, { 0x8318, 0xE4AB }, { 0x831C, 0x88A9 }, { 0x8323, 0xE4B2 }, { 0x8328, 0x88EF }, { 0x832B, 0xE4A9 },
+	{ 0x832F, 0xE4A8 }, { 0x8331, 0xE4A3 }, { 0x8332, 0xE4A2 }, { 0x8334, 0xE4A0 }, { 0x8335, 0xE49F }, { 0x8336, 0x9283 }, { 0x8338, 0x91F9 }, { 0x8339, 0xE4A5 },
+	{ 0x8340, 0xE4A4 }, { 0x8345, 0xE4A7 }, { 0x8349, 0x9190 }, { 0x834A, 0x8C74 }, { 0x834F, 0x8960 }, { 0x8350, 0xE4A6 }, { 0x8352, 0x8D72 }, { 0x8358, 0x9191 },
+	{ 0x8373, 0xE4B8 }, { 0x8375, 0xE4B9 }, { 0x8377, 0x89D7 }, { 0x837B, 0x89AC }, { 0x837C, 0xE4B6 }, { 0x8385, 0xE4AC }, { 0x8387, 0xE4B4 }, { 0x8389, 0xE4BB },
+	{ 0x838A, 0xE4B5 }, { 0x838E, 0xE4B3 }, { 0x8393, 0xE496 }, { 0x8396, 0xE4B1 }, { 0x839A, 0xE4AD }, { 0x839E, 0x8ACE }, { 0x839F, 0xE4AF }, { 0x83A0, 0xE4BA },
+	{ 0x83A2, 0xE4B0 }, { 0x83A8, 0xE4BC }, { 0x83AA, 0xE4AE }, { 0x83AB, 0x949C }, { 0x83B1, 0x9789 }, { 0x83B5, 0xE4B7 }, { 0x83BD, 0xE4CD }, { 0x83C1, 0xE4C5 },
+	{ 0x83C5, 0x909B }, { 0x83CA, 0x8B65 }, { 0x83CC, 0x8BDB }, { 0x83CE, 0xE4C0 }, { 0x83D3, 0x89D9 }, { 0x83D6, 0x8FD2 }, { 0x83D8, 0xE4C3 }, { 0x83DC, 0x8DD8 },
+	{ 0x83DF, 0x9370 }, { 0x83E0, 0xE4C8 }, { 0x83E9, 0x95EC }, { 0x83EB, 0xE4BF }, { 0x83EF, 0x89D8 }, { 0x83F0, 0x8CD4 }, { 0x83F1, 0x9548 }, { 0x83F2, 0xE4C9 },
+	{ 0x83F4, 0xE4BD }, { 0x83F7, 0xE4C6 }, { 0x83FB, 0xE4D0 }, { 0x83FD, 0xE4C1 }, { 0x8403, 0xE4C2 }, { 0x8404, 0x93B8 }, { 0x8407, 0xE4C7 }, { 0x840B, 0xE4C4 },
+	{ 0x840C, 0x9647 }, { 0x840D, 0xE4CA }, { 0x840E, 0x88DE }, { 0x8413, 0xE4BE }, { 0x8420, 0xE4CC }, { 0x8422, 0xE4CB }, { 0x8429, 0x948B }, { 0x842A, 0xE4D2 },
+	{ 0x842C, 0xE4DD }, { 0x8431, 0x8A9E }, { 0x8435, 0xE4E0 }, { 0x8438, 0xE4CE }, { 0x843C, 0xE4D3 }, { 0x843D, 0x978E }, { 0x8446, 0xE4DC }, { 0x8449, 0x9774 },
+	{ 0x844E, 0x97A8 }, { 0x8457, 0x9298 }, { 0x845B, 0x8A8B }, { 0x8461, 0x9592 }, { 0x8462, 0xE4E2 }, { 0x8463, 0x939F }, { 0x8466, 0x88AF }, { 0x8469, 0xE4DB },
+	{ 0x846B, 0xE4D7 }, { 0x846C, 0x9192 }, { 0x846D, 0xE4D1 }, { 0x846E, 0xE4D9 }, { 0x846F, 0xE4DE }, { 0x8471, 0x944B }, { 0x8475, 0x88A8 }, { 0x8477, 0xE4D6 },
+	{ 0x8479, 0xE4DF }, { 0x847A, 0x9598 }, { 0x8482, 0xE4DA }, { 0x8484, 0xE4D5 }, { 0x848B, 0x8FD3 }, { 0x8490, 0x8F4E }, { 0x8494, 0x8EAA }, { 0x8499, 0x96D6 },
+	{ 0x849C, 0x9566 }, { 0x849F, 0xE4E5 }, { 0x84A1, 0xE4EE }, { 0x84AD, 0xE4D8 }, { 0x84B2, 0x8A97 }, { 0x84B8, 0x8FF6 }, { 0x84B9, 0xE4E3 }, { 0x84BB, 0xE4E8 },
+	{ 0x84BC, 0x9193 }, { 0x84BF, 0xE4E4 }, { 0x84C1, 0xE4EB }, { 0x84C4, 0x927E }, { 0x84C6, 0xE4EC }, { 0x84C9, 0x9775 }, { 0x84CA, 0xE4E1 }, { 0x84CB, 0x8A57 },
+	{ 0x84CD, 0xE4E7 }, { 0x84D0, 0xE4EA }, { 0x84D1, 0x96AA }, { 0x84D6, 0xE4ED }, { 0x84D9, 0xE4E6 }, { 0x84DA, 0xE4E9 }, { 0x84EC, 0x9648 }, { 0x84EE, 0x9840 },
+	{ 0x84F4, 0xE4F1 }, { 0x84FC, 0xE4F8 }, { 0x84FF, 0xE4F0 }, { 0x8500, 0x8EC1 }, { 0x8506, 0xE4CF }, { 0x8511, 0x95CC }, { 0x8513, 0x96A0 }, { 0x8514, 0xE4F7 },
+	{ 0x8515, 0xE4F6 }, { 0x8517, 0xE4F2 }, { 0x8518, 0xE4F3 }, { 0x851A, 0x8955 }, { 0x851F, 0xE4F5 }, { 0x8521, 0xE4EF }, { 0x8526, 0x92D3 }, { 0x852C, 0xE4F4 },
+	{ 0x852D, 0x88FC }, { 0x8535, 0x91A0 }, { 0x853D, 0x95C1 }, { 0x8540, 0xE4F9 }, { 0x8541, 0xE540 }, { 0x8543, 0x94D7 }, { 0x8548, 0xE4FC }, { 0x8549, 0x8FD4 },
+	{ 0x854A, 0x8EC7 }, { 0x854B, 0xE542 }, { 0x854E, 0x8BBC }, { 0x8555, 0xE543 }, { 0x8557, 0x9599 }, { 0x8558, 0xE4FB }, { 0x855A, 0xE4D4 }, { 0x8563, 0xE4FA },
+	{ 0x8568, 0x986E }, { 0x8569, 0x93A0 }, { 0x856A, 0x9593 }, { 0x856D, 0xE54A }, { 0x8577, 0xE550 }, { 0x857E, 0xE551 }, { 0x8580, 0xE544 }, { 0x8584, 0x9496 },
+	{ 0x8587, 0xE54E }, { 0x8588, 0xE546 }, { 0x858A, 0xE548 }, { 0x8590, 0xE552 }, { 0x8591, 0xE547 }, { 0x8594, 0xE54B }, { 0x8597, 0x8992 }, { 0x8599, 0x93E3 },
+	{ 0x859B, 0xE54C }, { 0x859C, 0xE54F }, { 0x85A4, 0xE545 }, { 0x85A6, 0x9145 }, { 0x85A8, 0xE549 }, { 0x85A9, 0x8E46 }, { 0x85AA, 0x9064 }, { 0x85AB, 0x8C4F },
+	{ 0x85AC, 0x96F2 }, { 0x85AE, 0x96F7 }, { 0x85AF, 0x8F92 }, { 0x85B9, 0xE556 }, { 0x85BA, 0xE554 }, { 0x85C1, 0x986D }, { 0x85C9, 0xE553 }, { 0x85CD, 0x9795 },
+	{ 0x85CF, 0xE555 }, { 0x85D0, 0xE557 }, { 0x85D5, 0xE558 }, { 0x85DC, 0xE55B }, { 0x85DD, 0xE559 }, { 0x85E4, 0x93A1 }, { 0x85E5, 0xE55A }, { 0x85E9, 0x94CB },
+	{ 0x85EA, 0xE54D }, { 0x85F7, 0x8F93 }, { 0x85F9, 0xE55C }, { 0x85FA, 0xE561 }, { 0x85FB, 0x9194 }, { 0x85FE, 0xE560 }, { 0x8602, 0xE541 }, { 0x8606, 0xE562 },
+	{ 0x8607, 0x9168 }, { 0x860A, 0xE55D }, { 0x860B, 0xE55F }, { 0x8613, 0xE55E }, { 0x8616, 0x9F50 }, { 0x8617, 0x9F41 }, { 0x861A, 0xE564 }, { 0x8622, 0xE563 },
+	{ 0x862D, 0x9796 }, { 0x862F, 0xE1BA }, { 0x8630, 0xE565 }, { 0x863F, 0xE566 }, { 0x864D, 0xE567 }, { 0x864E, 0x8CD5 }, { 0x8650, 0x8B73 }, { 0x8654, 0xE569 },
+	{ 0x8655, 0x997C }, { 0x865A, 0x8B95 }, { 0x865C, 0x97B8 }, { 0x865E, 0x8BF1 }, { 0x865F, 0xE56A }, { 0x8667, 0xE56B }, { 0x866B, 0x928E }, { 0x8671, 0xE56C },
+	{ 0x8679, 0x93F8 }, { 0x867B, 0x88B8 }, { 0x868A, 0x89E1 }, { 0x868B, 0xE571 }, { 0x868C, 0xE572 }, { 0x8693, 0xE56D }, { 0x8695, 0x8E5C }, { 0x86A3, 0xE56E },
+	{ 0x86A4, 0x9461 }, { 0x86A9, 0xE56F }, { 0x86AA, 0xE570 }, { 0x86AB, 0xE57A }, { 0x86AF, 0xE574 }, { 0x86B0, 0xE577 }, { 0x86B6, 0xE573 }, { 0x86C4, 0xE575 },
+	{ 0x86C6, 0xE576 }, { 0x86C7, 0x8ED6 }, { 0x86C9, 0xE578 }, { 0x86CB, 0x9260 }, { 0x86CD, 0x8C75 }, { 0x86CE, 0x8A61 }, { 0x86D4, 0xE57B }, { 0x86D9, 0x8A5E },
+	{ 0x86DB, 0xE581 }, { 0x86DE, 0xE57C }, { 0x86DF, 0xE580 }, { 0x86E4, 0x94B8 }, { 0x86E9, 0xE57D }, { 0x86EC, 0xE57E }, { 0x86ED, 0x9567 }, { 0x86EE, 0x94D8 },
+	{ 0x86EF, 0xE582 }, { 0x86F8, 0x91FB }, { 0x86F9, 0xE58C }, { 0x86FB, 0xE588 }, { 0x86FE, 0x89E9 }, { 0x8700, 0xE586 }, { 0x8702, 0x9649 }, { 0x8703, 0xE587 },
+	{ 0x8706, 0xE584 }, { 0x8708, 0xE585 }, { 0x8709, 0xE58A }, { 0x870A, 0xE58D }, { 0x870D, 0xE58B }, { 0x8711, 0xE589 }, { 0x8712, 0xE583 }, { 0x8718, 0x9277 },
+	{ 0x871A, 0xE594 }, { 0x871C, 0x96A8 }, { 0x8725, 0xE592 }, { 0x8729, 0xE593 }, { 0x8734, 0xE58E }, { 0x8737, 0xE590 }, { 0x873B, 0xE591 }, { 0x873F, 0xE58F },
+	{ 0x8749, 0x90E4 }, { 0x874B, 0x9858 }, { 0x874C, 0xE598 }, { 0x874E, 0xE599 }, { 0x8753, 0xE59F }, { 0x8755, 0x9049 }, { 0x8757, 0xE59B }, { 0x8759, 0xE59E },
+	{ 0x875F, 0xE596 }, { 0x8760, 0xE595 }, { 0x8763, 0xE5A0 }, { 0x8766, 0x89DA }, { 0x8768, 0xE59C }, { 0x876A, 0xE5A1 }, { 0x876E, 0xE59D }, { 0x8774, 0xE59A },
+	{ 0x8776, 0x92B1 }, { 0x8778, 0xE597 }, { 0x877F, 0x9488 }, { 0x8782, 0xE5A5 }, { 0x878D, 0x975A }, { 0x879F, 0xE5A4 }, { 0x87A2, 0xE5A3 }, { 0x87AB, 0xE5AC },
+	{ 0x87AF, 0xE5A6 }, { 0x87B3, 0xE5AE }, { 0x87BA, 0x9786 }, { 0x87BB, 0xE5B1 }, { 0x87BD, 0xE5A8 }, { 0x87C0, 0xE5A9 }, { 0x87C4, 0xE5AD }, { 0x87C6, 0xE5B0 },
+	{ 0x87C7, 0xE5AF }, { 0x87CB, 0xE5A7 }, { 0x87D0, 0xE5AA }, { 0x87D2, 0xE5BB }, { 0x87E0, 0xE5B4 }, { 0x87EF, 0xE5B2 }, { 0x87F2, 0xE5B3 }, { 0x87F6, 0xE5B8 },
+	{ 0x87F7, 0xE5B9 }, { 0x87F9, 0x8A49 }, { 0x87FB, 0x8B61 }, { 0x87FE, 0xE5B7 }, { 0x8805, 0xE5A2 }, { 0x880D, 0xE5B6 }, { 0x880E, 0xE5BA }, { 0x880F, 0xE5B5 },
+	{ 0x8811, 0xE5BC }, { 0x8815, 0xE5BE }, { 0x8816, 0xE5BD }, { 0x8821, 0xE5C0 }, { 0x8822, 0xE5BF }, { 0x8823, 0xE579 }, { 0x8827, 0xE5C4 }, { 0x8831, 0xE5C1 },
+	{ 0x8836, 0xE5C2 }, { 0x8839, 0xE5C3 }, { 0x883B, 0xE5C5 }, { 0x8840, 0x8C8C }, { 0x8842, 0xE5C7 }, { 0x8844, 0xE5C6 }, { 0x8846, 0x8F4F }, { 0x884C, 0x8D73 },
+	{ 0x884D, 0x9FA5 }, { 0x8852, 0xE5C8 }, { 0x8853, 0x8F70 }, { 0x8857, 0x8A58 }, { 0x8859, 0xE5C9 }, { 0x885B, 0x8971 }, { 0x885D, 0x8FD5 }, { 0x885E, 0xE5CA },
+	{ 0x8861, 0x8D74 }, { 0x8862, 0xE5CB }, { 0x8863, 0x88DF }, { 0x8868, 0x955C }, { 0x886B, 0xE5CC }, { 0x8870, 0x908A }, { 0x8872, 0xE5D3 }, { 0x8875, 0xE5D0 },
+	{ 0x8877, 0x928F }, { 0x887D, 0xE5D1 }, { 0x887E, 0xE5CE }, { 0x887F, 0x8BDC }, { 0x8881, 0xE5CD }, { 0x8882, 0xE5D4 }, { 0x8888, 0x8C55 }, { 0x888B, 0x91DC },
+	{ 0x888D, 0xE5DA }, { 0x8892, 0xE5D6 }, { 0x8896, 0x91B3 }, { 0x8897, 0xE5D5 }, { 0x8899, 0xE5D8 }, { 0x889E, 0xE5CF }, { 0x88A2, 0xE5D9 }, { 0x88A4, 0xE5DB },
+	{ 0x88AB, 0x94ED }, { 0x88AE, 0xE5D7 }, { 0x88B0, 0xE5DC }, { 0x88B1, 0xE5DE }, { 0x88B4, 0x8CD1 }, { 0x88B5, 0xE5D2 }, { 0x88B7, 0x88BF }, { 0x88BF, 0xE5DD },
+	{ 0x88C1, 0x8DD9 }, { 0x88C2, 0x97F4 }, { 0x88C3, 0xE5DF }, { 0x88C4, 0xE5E0 }, { 0x88C5, 0x9195 }, { 0x88CF, 0x97A0 }, { 0x88D4, 0xE5E1 }, { 0x88D5, 0x9754 },
+	{ 0x88D8, 0xE5E2 }, { 0x88D9, 0xE5E3 }, { 0x88DC, 0x95E2 }, { 0x88DD, 0xE5E4 }, { 0x88DF, 0x8DBE }, { 0x88E1, 0x97A1 }, { 0x88E8, 0xE5E9 }, { 0x88F2, 0xE5EA },
+	{ 0x88F3, 0x8FD6 }, { 0x88F4, 0xE5E8 }, { 0x88F8, 0x9787 }, { 0x88F9, 0xE5E5 }, { 0x88FC, 0xE5E7 }, { 0x88FD, 0x90BB }, { 0x88FE, 0x909E }, { 0x8902, 0xE5E6 },
+	{ 0x8904, 0xE5EB }, { 0x8907, 0x95A1 }, { 0x890A, 0xE5ED }, { 0x890C, 0xE5EC }, { 0x8910, 0x8A8C }, { 0x8912, 0x964A }, { 0x8913, 0xE5EE }, { 0x891D, 0xE5FA },
+	{ 0x891E, 0xE5F0 }, { 0x8925, 0xE5F1 }, { 0x892A, 0xE5F2 }, { 0x892B, 0xE5F3 }, { 0x8936, 0xE5F7 }, { 0x8938, 0xE5F8 }, { 0x893B, 0xE5F6 }, { 0x8941, 0xE5F4 },
+	{ 0x8943, 0xE5EF }, { 0x8944, 0xE5F5 }, { 0x894C, 0xE5F9 }, { 0x894D, 0xE8B5 }, { 0x8956, 0x89A6 }, { 0x895E, 0xE5FC }, { 0x895F, 0x8BDD }, { 0x8960, 0xE5FB },
+	{ 0x8964, 0xE641 }, { 0x8966, 0xE640 }, { 0x896A, 0xE643 }, { 0x896D, 0xE642 }, { 0x896F, 0xE644 }, { 0x8972, 0x8F50 }, { 0x8974, 0xE645 }, { 0x8977, 0xE646 },
+	{ 0x897E, 0xE647 }, { 0x897F, 0x90BC }, { 0x8981, 0x9776 }, { 0x8983, 0xE648 }, { 0x8986, 0x95A2 }, { 0x8987, 0x9465 }, { 0x8988, 0xE649 }, { 0x898A, 0xE64A },
+	{ 0x898B, 0x8CA9 }, { 0x898F, 0x8B4B }, { 0x8993, 0xE64B }, { 0x8996, 0x8E8B }, { 0x8997, 0x9460 }, { 0x8998, 0xE64C }, { 0x899A, 0x8A6F }, { 0x89A1, 0xE64D },
+	{ 0x89A6, 0xE64F }, { 0x89A7, 0x9797 }, { 0x89A9, 0xE64E }, { 0x89AA, 0x9065 }, { 0x89AC, 0xE650 }, { 0x89AF, 0xE651 }, { 0x89B2, 0xE652 }, { 0x89B3, 0x8ACF },
+	{ 0x89BA, 0xE653 }, { 0x89BD, 0xE654 }, { 0x89BF, 0xE655 }, { 0x89C0, 0xE656 }, { 0x89D2, 0x8A70 }, { 0x89DA, 0xE657 }, { 0x89DC, 0xE658 }, { 0x89DD, 0xE659 },
+	{ 0x89E3, 0x89F0 }, { 0x89E6, 0x9047 }, { 0x89E7, 0xE65A }, { 0x89F4, 0xE65B }, { 0x89F8, 0xE65C }, { 0x8A00, 0x8CBE }, { 0x8A02, 0x92F9 }, { 0x8A03, 0xE65D },
+	{ 0x8A08, 0x8C76 }, { 0x8A0A, 0x9075 }, { 0x8A0C, 0xE660 }, { 0x8A0E, 0x93A2 }, { 0x8A10, 0xE65F }, { 0x8A13, 0x8C50 }, { 0x8A16, 0xE65E }, { 0x8A17, 0x91F5 },
+	{ 0x8A18, 0x8B4C }, { 0x8A1B, 0xE661 }, { 0x8A1D, 0xE662 }, { 0x8A1F, 0x8FD7 }, { 0x8A23, 0x8C8D }, { 0x8A25, 0xE663 }, { 0x8A2A, 0x964B }, { 0x8A2D, 0x90DD },
+	{ 0x8A31, 0x8B96 }, { 0x8A33, 0x96F3 }, { 0x8A34, 0x9169 }, { 0x8A36, 0xE664 }, { 0x8A3A, 0x9066 }, { 0x8A3B, 0x9290 }, { 0x8A3C, 0x8FD8 }, { 0x8A41, 0xE665 },
+	{ 0x8A46, 0xE668 }, { 0x8A48, 0xE669 }, { 0x8A50, 0x8DBC }, { 0x8A51, 0x91C0 }, { 0x8A52, 0xE667 }, { 0x8A54, 0x8FD9 }, { 0x8A55, 0x955D }, { 0x8A5B, 0xE666 },
+	{ 0x8A5E, 0x8E8C }, { 0x8A60, 0x8972 }, { 0x8A62, 0xE66D }, { 0x8A63, 0x8C77 }, { 0x8A66, 0x8E8E }, { 0x8A69, 0x8E8D }, { 0x8A6B, 0x986C }, { 0x8A6C, 0xE66C },
+	{ 0x8A6D, 0xE66B }, { 0x8A6E, 0x9146 }, { 0x8A70, 0x8B6C }, { 0x8A71, 0x9862 }, { 0x8A72, 0x8A59 }, { 0x8A73, 0x8FDA }, { 0x8A7C, 0xE66A }, { 0x8A82, 0xE66F },
+	{ 0x8A84, 0xE670 }, { 0x8A85, 0xE66E }, { 0x8A87, 0x8CD6 }, { 0x8A89, 0x975F }, { 0x8A8C, 0x8E8F }, { 0x8A8D, 0x9446 }, { 0x8A91, 0xE673 }, { 0x8A93, 0x90BE },
+	{ 0x8A95, 0x9261 }, { 0x8A98, 0x9755 }, { 0x8A9A, 0xE676 }, { 0x8A9E, 0x8CEA }, { 0x8AA0, 0x90BD }, { 0x8AA1, 0xE672 }, { 0x8AA3, 0xE677 }, { 0x8AA4, 0x8CEB },
+	{ 0x8AA5, 0xE674 }, { 0x8AA6, 0xE675 }, { 0x8AA8, 0xE671 }, { 0x8AAC, 0x90E0 }, { 0x8AAD, 0x93C7 }, { 0x8AB0, 0x924E }, { 0x8AB2, 0x89DB }, { 0x8AB9, 0x94EE },
+	{ 0x8ABC, 0x8B62 }, { 0x8ABF, 0x92B2 }, { 0x8AC2, 0xE67A }, { 0x8AC4, 0xE678 }, { 0x8AC7, 0x926B }, { 0x8ACB, 0x90BF }, { 0x8ACC, 0x8AD0 }, { 0x8ACD, 0xE679 },
+	{ 0x8ACF, 0x907A }, { 0x8AD2, 0x97C8 }, { 0x8AD6, 0x985F }, { 0x8ADA, 0xE67B }, { 0x8ADB, 0xE687 }, { 0x8ADC, 0x92B3 }, { 0x8ADE, 0xE686 }, { 0x8AE0, 0xE683 },
+	{ 0x8AE1, 0xE68B }, { 0x8AE2, 0xE684 }, { 0x8AE4, 0xE680 }, { 0x8AE6, 0x92FA }, { 0x8AE7, 0xE67E }, { 0x8AEB, 0xE67C }, { 0x8AED, 0x9740 }, { 0x8AEE, 0x8E90 },
+	{ 0x8AF1, 0xE681 }, { 0x8AF3, 0xE67D }, { 0x8AF7, 0xE685 }, { 0x8AF8, 0x8F94 }, { 0x8AFA, 0x8CBF }, { 0x8AFE, 0x91F8 }, { 0x8B00, 0x9664 }, { 0x8B01, 0x8979 },
+	{ 0x8B02, 0x88E0 }, { 0x8B04, 0x93A3 }, { 0x8B07, 0xE689 }, { 0x8B0C, 0xE688 }, { 0x8B0E, 0x93E4 }, { 0x8B10, 0xE68D }, { 0x8B14, 0xE682 }, { 0x8B16, 0xE68C },
+	{ 0x8B17, 0xE68E }, { 0x8B19, 0x8CAA }, { 0x8B1A, 0xE68A }, { 0x8B1B, 0x8D75 }, { 0x8B1D, 0x8ED3 }, { 0x8B20, 0xE68F }, { 0x8B21, 0x9777 }, { 0x8B26, 0xE692 },
+	{ 0x8B28, 0xE695 }, { 0x8B2B, 0xE693 }, { 0x8B2C, 0x9554 }, { 0x8B33, 0xE690 }, { 0x8B39, 0x8BDE }, { 0x8B3E, 0xE694 }, { 0x8B41, 0xE696 }, { 0x8B49, 0xE69A },
+	{ 0x8B4C, 0xE697 }, { 0x8B4E, 0xE699 }, { 0x8B4F, 0xE698 }, { 0x8B56, 0xE69B }, { 0x8B58, 0x8EAF }, { 0x8B5A, 0xE69D }, { 0x8B5B, 0xE69C }, { 0x8B5C, 0x9588 },
+	{ 0x8B5F, 0xE69F }, { 0x8B66, 0x8C78 }, { 0x8B6B, 0xE69E }, { 0x8B6C, 0xE6A0 }, { 0x8B6F, 0xE6A1 }, { 0x8B70, 0x8B63 }, { 0x8B71, 0xE3BF }, { 0x8B72, 0x8FF7 },
+	{ 0x8B74, 0xE6A2 }, { 0x8B77, 0x8CEC }, { 0x8B7D, 0xE6A3 }, { 0x8B80, 0xE6A4 }, { 0x8B83, 0x8E5D }, { 0x8B8A, 0x9DCC }, { 0x8B8C, 0xE6A5 }, { 0x8B8E, 0xE6A6 },
+	{ 0x8B90, 0x8F51 }, { 0x8B92, 0xE6A7 }, { 0x8B93, 0xE6A8 }, { 0x8B96, 0xE6A9 }, { 0x8B99, 0xE6AA }, { 0x8B9A, 0xE6AB }, { 0x8C37, 0x924A }, { 0x8C3A, 0xE6AC },
+	{ 0x8C3F, 0xE6AE }, { 0x8C41, 0xE6AD }, { 0x8C46, 0x93A4 }, { 0x8C48, 0xE6AF }, { 0x8C4A, 0x964C }, { 0x8C4C, 0xE6B0 }, { 0x8C4E, 0xE6B1 }, { 0x8C50, 0xE6B2 },
+	{ 0x8C55, 0xE6B3 }, { 0x8C5A, 0x93D8 }, { 0x8C61, 0x8FDB }, { 0x8C62, 0xE6B4 }, { 0x8C6A, 0x8D8B }, { 0x8C6B, 0x98AC }, { 0x8C6C, 0xE6B5 }, { 0x8C78, 0xE6B6 },
+	{ 0x8C79, 0x955E }, { 0x8C7A, 0xE6B7 }, { 0x8C7C, 0xE6BF }, { 0x8C82, 0xE6B8 }, { 0x8C85, 0xE6BA }, { 0x8C89, 0xE6B9 }, { 0x8C8A, 0xE6BB }, { 0x8C8C, 0x9665 },
+	{ 0x8C8D, 0xE6BC }, { 0x8C8E, 0xE6BD }, { 0x8C94, 0xE6BE }, { 0x8C98, 0xE6C0 }, { 0x8C9D, 0x8A4C }, { 0x8C9E, 0x92E5 }, { 0x8CA0, 0x9589 }, { 0x8CA1, 0x8DE0 },
+	{ 0x8CA2, 0x8D76 }, { 0x8CA7, 0x956E }, { 0x8CA8, 0x89DD }, { 0x8CA9, 0x94CC }, { 0x8CAA, 0xE6C3 }, { 0x8CAB, 0x8AD1 }, { 0x8CAC, 0x90D3 }, { 0x8CAD, 0xE6C2 },
+	{ 0x8CAE, 0xE6C7 }, { 0x8CAF, 0x9299 }, { 0x8CB0, 0x96E1 }, { 0x8CB2, 0xE6C5 }, { 0x8CB3, 0xE6C6 }, { 0x8CB4, 0x8B4D }, { 0x8CB6, 0xE6C8 }, { 0x8CB7, 0x9483 },
+	{ 0x8CB8, 0x91DD }, { 0x8CBB, 0x94EF }, { 0x8CBC, 0x935C }, { 0x8CBD, 0xE6C4 }, { 0x8CBF, 0x9666 }, { 0x8CC0, 0x89EA }, { 0x8CC1, 0xE6CA }, { 0x8CC2, 0x9847 },
+	{ 0x8CC3, 0x92C0 }, { 0x8CC4, 0x9864 }, { 0x8CC7, 0x8E91 }, { 0x8CC8, 0xE6C9 }, { 0x8CCA, 0x91AF }, { 0x8CCD, 0xE6DA }, { 0x8CCE, 0x9147 }, { 0x8CD1, 0x93F6 },
+	{ 0x8CD3, 0x956F }, { 0x8CDA, 0xE6CD }, { 0x8CDB, 0x8E5E }, { 0x8CDC, 0x8E92 }, { 0x8CDE, 0x8FDC }, { 0x8CE0, 0x9485 }, { 0x8CE2, 0x8CAB }, { 0x8CE3, 0xE6CC },
+	{ 0x8CE4, 0xE6CB }, { 0x8CE6, 0x958A }, { 0x8CEA, 0x8EBF }, { 0x8CED, 0x9371 }, { 0x8CFA, 0xE6CF }, { 0x8CFB, 0xE6D0 }, { 0x8CFC, 0x8D77 }, { 0x8CFD, 0xE6CE },
+	{ 0x8D04, 0xE6D1 }, { 0x8D05, 0xE6D2 }, { 0x8D07, 0xE6D4 }, { 0x8D08, 0x91A1 }, { 0x8D0A, 0xE6D3 }, { 0x8D0B, 0x8AE4 }, { 0x8D0D, 0xE6D6 }, { 0x8D0F, 0xE6D5 },
+	{ 0x8D10, 0xE6D7 }, { 0x8D13, 0xE6D9 }, { 0x8D14, 0xE6DB }, { 0x8D16, 0xE6DC }, { 0x8D64, 0x90D4 }, { 0x8D66, 0x8ECD }, { 0x8D67, 0xE6DD }, { 0x8D6B, 0x8A71 },
+	{ 0x8D6D, 0xE6DE }, { 0x8D70, 0x9196 }, { 0x8D71, 0xE6DF }, { 0x8D73, 0xE6E0 }, { 0x8D74, 0x958B }, { 0x8D77, 0x8B4E }, { 0x8D81, 0xE6E1 }, { 0x8D85, 0x92B4 },
+	{ 0x8D8A, 0x897A }, { 0x8D99, 0xE6E2 }, { 0x8DA3, 0x8EEF }, { 0x8DA8, 0x9096 }, { 0x8DB3, 0x91AB }, { 0x8DBA, 0xE6E5 }, { 0x8DBE, 0xE6E4 }, { 0x8DC2, 0xE6E3 },
+	{ 0x8DCB, 0xE6EB }, { 0x8DCC, 0xE6E9 }, { 0x8DCF, 0xE6E6 }, { 0x8DD6, 0xE6E8 }, { 0x8DDA, 0xE6E7 }, { 0x8DDB, 0xE6EA }, { 0x8DDD, 0x8B97 }, { 0x8DDF, 0xE6EE },
+	{ 0x8DE1, 0x90D5 }, { 0x8DE3, 0xE6EF }, { 0x8DE8, 0x8CD7 }, { 0x8DEA, 0xE6EC }, { 0x8DEB, 0xE6ED }, { 0x8DEF, 0x9848 }, { 0x8DF3, 0x92B5 }, { 0x8DF5, 0x9148 },
+	{ 0x8DFC, 0xE6F0 }, { 0x8DFF, 0xE6F3 }, { 0x8E08, 0xE6F1 }, { 0x8E09, 0xE6F2 }, { 0x8E0A, 0x9778 }, { 0x8E0F, 0x93A5 }, { 0x8E10, 0xE6F6 }, { 0x8E1D, 0xE6F4 },
+	{ 0x8E1E, 0xE6F5 }, { 0x8E1F, 0xE6F7 }, { 0x8E2A, 0xE748 }, { 0x8E30, 0xE6FA }, { 0x8E34, 0xE6FB }, { 0x8E35, 0xE6F9 }, { 0x8E42, 0xE6F8 }, { 0x8E44, 0x92FB },
+	{ 0x8E47, 0xE740 }, { 0x8E48, 0xE744 }, { 0x8E49, 0xE741 }, { 0x8E4A, 0xE6FC }, { 0x8E4C, 0xE742 }, { 0x8E50, 0xE743 }, { 0x8E55, 0xE74A }, { 0x8E59, 0xE745 },
+	{ 0x8E5F, 0x90D6 }, { 0x8E60, 0xE747 }, { 0x8E63, 0xE749 }, { 0x8E64, 0xE746 }, { 0x8E72, 0xE74C }, { 0x8E74, 0x8F52 }, { 0x8E76, 0xE74B }, { 0x8E7C, 0xE74D },
+	{ 0x8E81, 0xE74E }, { 0x8E84, 0xE751 }, { 0x8E85, 0xE750 }, { 0x8E87, 0xE74F }, { 0x8E8A, 0xE753 }, { 0x8E8B, 0xE752 }, { 0x8E8D, 0x96F4 }, { 0x8E91, 0xE755 },
+	{ 0x8E93, 0xE754 }, { 0x8E94, 0xE756 }, { 0x8E99, 0xE757 }, { 0x8EA1, 0xE759 }, { 0x8EAA, 0xE758 }, { 0x8EAB, 0x9067 }, { 0x8EAC, 0xE75A }, { 0x8EAF, 0x8BEB },
+	{ 0x8EB0, 0xE75B }, { 0x8EB1, 0xE75D }, { 0x8EBE, 0xE75E }, { 0x8EC5, 0xE75F }, { 0x8EC6, 0xE75C }, { 0x8EC8, 0xE760 }, { 0x8ECA, 0x8ED4 }, { 0x8ECB, 0xE761 },
+	{ 0x8ECC, 0x8B4F }, { 0x8ECD, 0x8C52 }, { 0x8ED2, 0x8CAC }, { 0x8EDB, 0xE762 }, { 0x8EDF, 0x93EE }, { 0x8EE2, 0x935D }, { 0x8EE3, 0xE763 }, { 0x8EEB, 0xE766 },
+	{ 0x8EF8, 0x8EB2 }, { 0x8EFB, 0xE765 }, { 0x8EFC, 0xE764 }, { 0x8EFD, 0x8C79 }, { 0x8EFE, 0xE767 }, { 0x8F03, 0x8A72 }, { 0x8F05, 0xE769 }, { 0x8F09, 0x8DDA },
+	{ 0x8F0A, 0xE768 }, { 0x8F0C, 0xE771 }, { 0x8F12, 0xE76B }, { 0x8F13, 0xE76D }, { 0x8F14, 0x95E3 }, { 0x8F15, 0xE76A }, { 0x8F19, 0xE76C }, { 0x8F1B, 0xE770 },
+	{ 0x8F1C, 0xE76E }, { 0x8F1D, 0x8B50 }, { 0x8F1F, 0xE76F }, { 0x8F26, 0xE772 }, { 0x8F29, 0x9479 }, { 0x8F2A, 0x97D6 }, { 0x8F2F, 0x8F53 }, { 0x8F33, 0xE773 },
+	{ 0x8F38, 0x9741 }, { 0x8F39, 0xE775 }, { 0x8F3B, 0xE774 }, { 0x8F3E, 0xE778 }, { 0x8F3F, 0x9760 }, { 0x8F42, 0xE777 }, { 0x8F44, 0x8A8D }, { 0x8F45, 0xE776 },
+	{ 0x8F46, 0xE77B }, { 0x8F49, 0xE77A }, { 0x8F4C, 0xE779 }, { 0x8F4D, 0x9351 }, { 0x8F4E, 0xE77C }, { 0x8F57, 0xE77D }, { 0x8F5C, 0xE77E }, { 0x8F5F, 0x8D8C },
+	{ 0x8F61, 0x8C44 }, { 0x8F62, 0xE780 }, { 0x8F63, 0xE781 }, { 0x8F64, 0xE782 }, { 0x8F9B, 0x9068 }, { 0x8F9C, 0xE783 }, { 0x8F9E, 0x8EAB }, { 0x8F9F, 0xE784 },
+	{ 0x8FA3, 0xE785 }, { 0x8FA7, 0x999F }, { 0x8FA8, 0x999E }, { 0x8FAD, 0xE786 }, { 0x8FAE, 0xE390 }, { 0x8FAF, 0xE787 }, { 0x8FB0, 0x9243 }, { 0x8FB1, 0x904A },
+	{ 0x8FB2, 0x945F }, { 0x8FB7, 0xE788 }, { 0x8FBA, 0x95D3 }, { 0x8FBB, 0x92D2 }, { 0x8FBC, 0x8D9E }, { 0x8FBF, 0x9248 }, { 0x8FC2, 0x8949 }, { 0x8FC4, 0x9698 },
+	{ 0x8FC5, 0x9076 }, { 0x8FCE, 0x8C7D }, { 0x8FD1, 0x8BDF }, { 0x8FD4, 0x95D4 }, { 0x8FDA, 0xE789 }, { 0x8FE2, 0xE78B }, { 0x8FE5, 0xE78A }, { 0x8FE6, 0x89DE },
+	{ 0x8FE9, 0x93F4 }, { 0x8FEA, 0xE78C }, { 0x8FEB, 0x9497 }, { 0x8FED, 0x9352 }, { 0x8FEF, 0xE78D }, { 0x8FF0, 0x8F71 }, { 0x8FF4, 0xE78F }, { 0x8FF7, 0x96C0 },
+	{ 0x8FF8, 0xE79E }, { 0x8FF9, 0xE791 }, { 0x8FFA, 0xE792 }, { 0x8FFD, 0x92C7 }, { 0x9000, 0x91DE }, { 0x9001, 0x9197 }, { 0x9003, 0x93A6 }, { 0x9005, 0xE790 },
+	{ 0x9006, 0x8B74 }, { 0x900B, 0xE799 }, { 0x900D, 0xE796 }, { 0x900E, 0xE7A3 }, { 0x900F, 0x93A7 }, { 0x9010, 0x9280 }, { 0x9011, 0xE793 }, { 0x9013, 0x92FC },
+	{ 0x9014, 0x9372 }, { 0x9015, 0xE794 }, { 0x9016, 0xE798 }, { 0x9017, 0x9080 }, { 0x9019, 0x9487 }, { 0x901A, 0x92CA }, { 0x901D, 0x90C0 }, { 0x901E, 0xE797 },
+	{ 0x901F, 0x91AC }, { 0x9020, 0x91A2 }, { 0x9021, 0xE795 }, { 0x9022, 0x88A7 }, { 0x9023, 0x9841 }, { 0x9027, 0xE79A }, { 0x902E, 0x91DF }, { 0x9031, 0x8F54 },
+	{ 0x9032, 0x9069 }, { 0x9035, 0xE79C }, { 0x9036, 0xE79B }, { 0x9038, 0x88ED }, { 0x9039, 0xE79D }, { 0x903C, 0x954E }, { 0x903E, 0xE7A5 }, { 0x9041, 0x93D9 },
+	{ 0x9042, 0x908B }, { 0x9045, 0x9278 }, { 0x9047, 0x8BF6 }, { 0x9049, 0xE7A4 }, { 0x904A, 0x9756 }, { 0x904B, 0x895E }, { 0x904D, 0x95D5 }, { 0x904E, 0x89DF },
+	{ 0x904F, 0xE79F }, { 0x9050, 0xE7A0 }, { 0x9051, 0xE7A1 }, { 0x9052, 0xE7A2 }, { 0x9053, 0x93B9 }, { 0x9054, 0x9242 }, { 0x9055, 0x88E1 }, { 0x9056, 0xE7A6 },
+	{ 0x9058, 0xE7A7 }, { 0x9059, 0xEAA1 }, { 0x905C, 0x91BB }, { 0x905E, 0xE7A8 }, { 0x9060, 0x8993 }, { 0x9061, 0x916B }, { 0x9063, 0x8CAD }, { 0x9065, 0x9779 },
+	{ 0x9068, 0xE7A9 }, { 0x9069, 0x934B }, { 0x906D, 0x9198 }, { 0x906E, 0x8ED5 }, { 0x906F, 0xE7AA }, { 0x9072, 0xE7AD }, { 0x9075, 0x8F85 }, { 0x9076, 0xE7AB },
+	{ 0x9077, 0x914A }, { 0x9078, 0x9149 }, { 0x907A, 0x88E2 }, { 0x907C, 0x97C9 }, { 0x907D, 0xE7AF }, { 0x907F, 0x94F0 }, { 0x9080, 0xE7B1 }, { 0x9081, 0xE7B0 },
+	{ 0x9082, 0xE7AE }, { 0x9083, 0xE284 }, { 0x9084, 0x8AD2 }, { 0x9087, 0xE78E }, { 0x9089, 0xE7B3 }, { 0x908A, 0xE7B2 }, { 0x908F, 0xE7B4 }, { 0x9091, 0x9757 },
+	{ 0x90A3, 0x93DF }, { 0x90A6, 0x964D }, { 0x90A8, 0xE7B5 }, { 0x90AA, 0x8ED7 }, { 0x90AF, 0xE7B6 }, { 0x90B1, 0xE7B7 }, { 0x90B5, 0xE7B8 }, { 0x90B8, 0x9340 },
+	{ 0x90C1, 0x88E8 }, { 0x90CA, 0x8D78 }, { 0x90CE, 0x9859 }, { 0x90DB, 0xE7BC }, { 0x90E1, 0x8C53 }, { 0x90E2, 0xE7B9 }, { 0x90E4, 0xE7BA }, { 0x90E8, 0x9594 },
+	{ 0x90ED, 0x8A73 }, { 0x90F5, 0x9758 }, { 0x90F7, 0x8BBD }, { 0x90FD, 0x9373 }, { 0x9102, 0xE7BD }, { 0x9112, 0xE7BE }, { 0x9119, 0xE7BF }, { 0x912D, 0x9341 },
+	{ 0x9130, 0xE7C1 }, { 0x9132, 0xE7C0 }, { 0x9149, 0x93D1 }, { 0x914A, 0xE7C2 }, { 0x914B, 0x8F55 }, { 0x914C, 0x8EDE }, { 0x914D, 0x947A }, { 0x914E, 0x9291 },
+	{ 0x9152, 0x8EF0 }, { 0x9154, 0x908C }, { 0x9156, 0xE7C3 }, { 0x9158, 0xE7C4 }, { 0x9162, 0x907C }, { 0x9163, 0xE7C5 }, { 0x9165, 0xE7C6 }, { 0x9169, 0xE7C7 },
+	{ 0x916A, 0x978F }, { 0x916C, 0x8F56 }, { 0x9172, 0xE7C9 }, { 0x9173, 0xE7C8 }, { 0x9175, 0x8D79 }, { 0x9177, 0x8D93 }, { 0x9178, 0x8E5F }, { 0x9182, 0xE7CC },
+	{ 0x9187, 0x8F86 }, { 0x9189, 0xE7CB }, { 0x918B, 0xE7CA }, { 0x918D, 0x91E7 }, { 0x9190, 0x8CED }, { 0x9192, 0x90C1 }, { 0x9197, 0x94AE }, { 0x919C, 0x8F58 },
+	{ 0x91A2, 0xE7CD }, { 0x91A4, 0x8FDD }, { 0x91AA, 0xE7D0 }, { 0x91AB, 0xE7CE }, { 0x91AF, 0xE7CF }, { 0x91B4, 0xE7D2 }, { 0x91B5, 0xE7D1 }, { 0x91B8, 0x8FF8 },
+	{ 0x91BA, 0xE7D3 }, { 0x91C0, 0xE7D4 }, { 0x91C1, 0xE7D5 }, { 0x91C6, 0x94CE }, { 0x91C7, 0x8DD1 }, { 0x91C8, 0x8EDF }, { 0x91C9, 0xE7D6 }, { 0x91CB, 0xE7D7 },
+	{ 0x91CC, 0x97A2 }, { 0x91CD, 0x8F64 }, { 0x91CE, 0x96EC }, { 0x91CF, 0x97CA }, { 0x91D0, 0xE7D8 }, { 0x91D1, 0x8BE0 }, { 0x91D6, 0xE7D9 }, { 0x91D8, 0x9342 },
+	{ 0x91DB, 0xE7DC }, { 0x91DC, 0x8A98 }, { 0x91DD, 0x906A }, { 0x91DF, 0xE7DA }, { 0x91E1, 0xE7DB }, { 0x91E3, 0x92DE }, { 0x91E6, 0x9674 }, { 0x91E7, 0x8BFA },
+	{ 0x91F5, 0xE7DE }, { 0x91F6, 0xE7DF }, { 0x91FC, 0xE7DD }, { 0x91FF, 0xE7E1 }, { 0x920D, 0x93DD }, { 0x920E, 0x8A62 }, { 0x9211, 0xE7E5 }, { 0x9214, 0xE7E2 },
+	{ 0x9215, 0xE7E4 }, { 0x921E, 0xE7E0 }, { 0x9229, 0xE86E }, { 0x922C, 0xE7E3 }, { 0x9234, 0x97E9 }, { 0x9237, 0x8CD8 }, { 0x923F, 0xE7ED }, { 0x9244, 0x9353 },
+	{ 0x9245, 0xE7E8 }, { 0x9248, 0xE7EB }, { 0x9249, 0xE7E9 }, { 0x924B, 0xE7EE }, { 0x9250, 0xE7EF }, { 0x9257, 0xE7E7 }, { 0x925A, 0xE7F4 }, { 0x925B, 0x8994 },
+	{ 0x925E, 0xE7E6 }, { 0x9262, 0x94AB }, { 0x9264, 0xE7EA }, { 0x9266, 0x8FDE }, { 0x9271, 0x8D7A }, { 0x927E, 0x9667 }, { 0x9280, 0x8BE2 }, { 0x9283, 0x8F65 },
+	{ 0x9285, 0x93BA }, { 0x9291, 0x914C }, { 0x9293, 0xE7F2 }, { 0x9295, 0xE7EC }, { 0x9296, 0xE7F1 }, { 0x9298, 0x96C1 }, { 0x929A, 0x92B6 }, { 0x929B, 0xE7F3 },
+	{ 0x929C, 0xE7F0 }, { 0x92AD, 0x914B }, { 0x92B7, 0xE7F7 }, { 0x92B9, 0xE7F6 }, { 0x92CF, 0xE7F5 }, { 0x92D2, 0x964E }, { 0x92E4, 0x8F9B }, { 0x92E9, 0xE7F8 },
+	{ 0x92EA, 0x95DD }, { 0x92ED, 0x8973 }, { 0x92F2, 0x9565 }, { 0x92F3, 0x9292 }, { 0x92F8, 0x8B98 }, { 0x92FA, 0xE7FA }, { 0x92FC, 0x8D7C }, { 0x9306, 0x8E4B },
+	{ 0x930F, 0xE7F9 }, { 0x9310, 0x908D }, { 0x9318, 0x908E }, { 0x9319, 0xE840 }, { 0x931A, 0xE842 }, { 0x9320, 0x8FF9 }, { 0x9322, 0xE841 }, { 0x9323, 0xE843 },
+	{ 0x9326, 0x8BD1 }, { 0x9328, 0x9564 }, { 0x932B, 0x8EE0 }, { 0x932C, 0x9842 }, { 0x932E, 0xE7FC }, { 0x932F, 0x8DF6 }, { 0x9332, 0x985E }, { 0x9335, 0xE845 },
+	{ 0x933A, 0xE844 }, { 0x933B, 0xE846 }, { 0x9344, 0xE7FB }, { 0x934B, 0x93E7 }, { 0x934D, 0x9374 }, { 0x9354, 0x92D5 }, { 0x9356, 0xE84B }, { 0x935B, 0x9262 },
+	{ 0x935C, 0xE847 }, { 0x9360, 0xE848 }, { 0x936C, 0x8C4C }, { 0x936E, 0xE84A }, { 0x9375, 0x8CAE }, { 0x937C, 0xE849 }, { 0x937E, 0x8FDF }, { 0x938C, 0x8A99 },
+	{ 0x9394, 0xE84F }, { 0x9396, 0x8DBD }, { 0x9397, 0x9199 }, { 0x939A, 0x92C8 }, { 0x93A7, 0x8A5A }, { 0x93AC, 0xE84D }, { 0x93AD, 0xE84E }, { 0x93AE, 0x92C1 },
+	{ 0x93B0, 0xE84C }, { 0x93B9, 0xE850 }, { 0x93C3, 0xE856 }, { 0x93C8, 0xE859 }, { 0x93D0, 0xE858 }, { 0x93D1, 0x934C }, { 0x93D6, 0xE851 }, { 0x93D7, 0xE852 },
+	{ 0x93D8, 0xE855 }, { 0x93DD, 0xE857 }, { 0x93E1, 0x8BBE }, { 0x93E4, 0xE85A }, { 0x93E5, 0xE854 }, { 0x93E8, 0xE853 }, { 0x9403, 0xE85E }, { 0x9407, 0xE85F },
+	{ 0x9410, 0xE860 }, { 0x9413, 0xE85D }, { 0x9414, 0xE85C }, { 0x9418, 0x8FE0 }, { 0x9419, 0x93A8 }, { 0x941A, 0xE85B }, { 0x9421, 0xE864 }, { 0x942B, 0xE862 },
+	{ 0x9435, 0xE863 }, { 0x9436, 0xE861 }, { 0x9438, 0x91F6 }, { 0x943A, 0xE865 }, { 0x9441, 0xE866 }, { 0x9444, 0xE868 }, { 0x9451, 0x8AD3 }, { 0x9452, 0xE867 },
+	{ 0x9453, 0x96F8 }, { 0x945A, 0xE873 }, { 0x945B, 0xE869 }, { 0x945E, 0xE86C }, { 0x9460, 0xE86A }, { 0x9462, 0xE86B }, { 0x946A, 0xE86D }, { 0x9470, 0xE86F },
+	{ 0x9475, 0xE870 }, { 0x9477, 0xE871 }, { 0x947C, 0xE874 }, { 0x947D, 0xE872 }, { 0x947E, 0xE875 }, { 0x947F, 0xE877 }, { 0x9481, 0xE876 }, { 0x9577, 0x92B7 },
+	{ 0x9580, 0x96E5 }, { 0x9582, 0xE878 }, { 0x9583, 0x914D }, { 0x9587, 0xE879 }, { 0x9589, 0x95C2 }, { 0x958A, 0xE87A }, { 0x958B, 0x8A4A }, { 0x958F, 0x895B },
+	{ 0x9591, 0x8AD5 }, { 0x9593, 0x8AD4 }, { 0x9594, 0xE87B }, { 0x9596, 0xE87C }, { 0x9598, 0xE87D }, { 0x9599, 0xE87E }, { 0x95A0, 0xE880 }, { 0x95A2, 0x8AD6 },
+	{ 0x95A3, 0x8A74 }, { 0x95A4, 0x8D7D }, { 0x95A5, 0x94B4 }, { 0x95A7, 0xE882 }, { 0x95A8, 0xE881 }, { 0x95AD, 0xE883 }, { 0x95B2, 0x897B }, { 0x95B9, 0xE886 },
+	{ 0x95BB, 0xE885 }, { 0x95BC, 0xE884 }, { 0x95BE, 0xE887 }, { 0x95C3, 0xE88A }, { 0x95C7, 0x88C5 }, { 0x95CA, 0xE888 }, { 0x95CC, 0xE88C }, { 0x95CD, 0xE88B },
+	{ 0x95D4, 0xE88E }, { 0x95D5, 0xE88D }, { 0x95D6, 0xE88F }, { 0x95D8, 0x93AC }, { 0x95DC, 0xE890 }, { 0x95E1, 0xE891 }, { 0x95E2, 0xE893 }, { 0x95E5, 0xE892 },
+	{ 0x961C, 0x958C }, { 0x9621, 0xE894 }, { 0x9628, 0xE895 }, { 0x962A, 0x8DE3 }, { 0x962E, 0xE896 }, { 0x962F, 0xE897 }, { 0x9632, 0x9668 }, { 0x963B, 0x916A },
+	{ 0x963F, 0x88A2 }, { 0x9640, 0x91C9 }, { 0x9642, 0xE898 }, { 0x9644, 0x958D }, { 0x964B, 0xE89B }, { 0x964C, 0xE899 }, { 0x964D, 0x8D7E }, { 0x964F, 0xE89A },
+	{ 0x9650, 0x8CC0 }, { 0x965B, 0x95C3 }, { 0x965C, 0xE89D }, { 0x965D, 0xE89F }, { 0x965E, 0xE89E }, { 0x965F, 0xE8A0 }, { 0x9662, 0x8940 }, { 0x9663, 0x9077 },
+	{ 0x9664, 0x8F9C }, { 0x9665, 0x8AD7 }, { 0x9666, 0xE8A1 }, { 0x966A, 0x9486 }, { 0x966C, 0xE8A3 }, { 0x9670, 0x8941 }, { 0x9672, 0xE8A2 }, { 0x9673, 0x92C2 },
+	{ 0x9675, 0x97CB }, { 0x9676, 0x93A9 }, { 0x9677, 0xE89C }, { 0x9678, 0x97A4 }, { 0x967A, 0x8CAF }, { 0x967D, 0x977A }, { 0x9685, 0x8BF7 }, { 0x9686, 0x97B2 },
+	{ 0x9688, 0x8C47 }, { 0x968A, 0x91E0 }, { 0x968B, 0xE440 }, { 0x968D, 0xE8A4 }, { 0x968E, 0x8A4B }, { 0x968F, 0x908F }, { 0x9694, 0x8A75 }, { 0x9695, 0xE8A6 },
+	{ 0x9697, 0xE8A7 }, { 0x9698, 0xE8A5 }, { 0x9699, 0x8C84 }, { 0x969B, 0x8DDB }, { 0x969C, 0x8FE1 }, { 0x96A0, 0x8942 }, { 0x96A3, 0x97D7 }, { 0x96A7, 0xE8A9 },
+	{ 0x96A8, 0xE7AC }, { 0x96AA, 0xE8A8 }, { 0x96B0, 0xE8AC }, { 0x96B1, 0xE8AA }, { 0x96B2, 0xE8AB }, { 0x96B4, 0xE8AD }, { 0x96B6, 0xE8AE }, { 0x96B7, 0x97EA },
+	{ 0x96B8, 0xE8AF }, { 0x96B9, 0xE8B0 }, { 0x96BB, 0x90C7 }, { 0x96BC, 0x94B9 }, { 0x96C0, 0x909D }, { 0x96C1, 0x8AE5 }, { 0x96C4, 0x9759 }, { 0x96C5, 0x89EB },
+	{ 0x96C6, 0x8F57 }, { 0x96C7, 0x8CD9 }, { 0x96C9, 0xE8B3 }, { 0x96CB, 0xE8B2 }, { 0x96CC, 0x8E93 }, { 0x96CD, 0xE8B4 }, { 0x96CE, 0xE8B1 }, { 0x96D1, 0x8E47 },
+	{ 0x96D5, 0xE8B8 }, { 0x96D6, 0xE5AB }, { 0x96D9, 0x99D4 }, { 0x96DB, 0x9097 }, { 0x96DC, 0xE8B6 }, { 0x96E2, 0x97A3 }, { 0x96E3, 0x93EF }, { 0x96E8, 0x894A },
+	{ 0x96EA, 0x90E1 }, { 0x96EB, 0x8EB4 }, { 0x96F0, 0x95B5 }, { 0x96F2, 0x895F }, { 0x96F6, 0x97EB }, { 0x96F7, 0x978B }, { 0x96F9, 0xE8B9 }, { 0x96FB, 0x9364 },
+	{ 0x9700, 0x8EF9 }, { 0x9704, 0xE8BA }, { 0x9706, 0xE8BB }, { 0x9707, 0x906B }, { 0x9708, 0xE8BC }, { 0x970A, 0x97EC }, { 0x970D, 0xE8B7 }, { 0x970E, 0xE8BE },
+	{ 0x970F, 0xE8C0 }, { 0x9711, 0xE8BF }, { 0x9713, 0xE8BD }, { 0x9716, 0xE8C1 }, { 0x9719, 0xE8C2 }, { 0x971C, 0x919A }, { 0x971E, 0x89E0 }, { 0x9724, 0xE8C3 },
+	{ 0x9727, 0x96B6 }, { 0x972A, 0xE8C4 }, { 0x9730, 0xE8C5 }, { 0x9732, 0x9849 }, { 0x9738, 0x9E50 }, { 0x9739, 0xE8C6 }, { 0x973D, 0xE8C7 }, { 0x973E, 0xE8C8 },
+	{ 0x9742, 0xE8CC }, { 0x9744, 0xE8C9 }, { 0x9746, 0xE8CA }, { 0x9748, 0xE8CB }, { 0x9749, 0xE8CD }, { 0x9752, 0x90C2 }, { 0x9756, 0x96F5 }, { 0x9759, 0x90C3 },
+	{ 0x975C, 0xE8CE }, { 0x975E, 0x94F1 }, { 0x9760, 0xE8CF }, { 0x9761, 0xEA72 }, { 0x9762, 0x96CA }, { 0x9764, 0xE8D0 }, { 0x9766, 0xE8D1 }, { 0x9768, 0xE8D2 },
+	{ 0x9769, 0x8A76 }, { 0x976B, 0xE8D4 }, { 0x976D, 0x9078 }, { 0x9771, 0xE8D5 }, { 0x9774, 0x8C43 }, { 0x9779, 0xE8D6 }, { 0x977A, 0xE8DA }, { 0x977C, 0xE8D8 },
+	{ 0x9781, 0xE8D9 }, { 0x9784, 0x8A93 }, { 0x9785, 0xE8D7 }, { 0x9786, 0xE8DB }, { 0x978B, 0xE8DC }, { 0x978D, 0x88C6 }, { 0x978F, 0xE8DD }, { 0x9790, 0xE8DE },
+	{ 0x9798, 0x8FE2 }, { 0x979C, 0xE8DF }, { 0x97A0, 0x8B66 }, { 0x97A3, 0xE8E2 }, { 0x97A6, 0xE8E1 }, { 0x97A8, 0xE8E0 }, { 0x97AB, 0xE691 }, { 0x97AD, 0x95DA },
+	{ 0x97B3, 0xE8E3 }, { 0x97B4, 0xE8E4 }, { 0x97C3, 0xE8E5 }, { 0x97C6, 0xE8E6 }, { 0x97C8, 0xE8E7 }, { 0x97CB, 0xE8E8 }, { 0x97D3, 0x8AD8 }, { 0x97DC, 0xE8E9 },
+	{ 0x97ED, 0xE8EA }, { 0x97EE, 0x9442 }, { 0x97F2, 0xE8EC }, { 0x97F3, 0x89B9 }, { 0x97F5, 0xE8EF }, { 0x97F6, 0xE8EE }, { 0x97FB, 0x8943 }, { 0x97FF, 0x8BBF },
+	{ 0x9801, 0x95C5 }, { 0x9802, 0x92B8 }, { 0x9803, 0x8DA0 }, { 0x9805, 0x8D80 }, { 0x9806, 0x8F87 }, { 0x9808, 0x907B }, { 0x980C, 0xE8F1 }, { 0x980F, 0xE8F0 },
+	{ 0x9810, 0x9761 }, { 0x9811, 0x8AE6 }, { 0x9812, 0x94D0 }, { 0x9813, 0x93DA }, { 0x9817, 0x909C }, { 0x9818, 0x97CC }, { 0x981A, 0x8C7A }, { 0x9821, 0xE8F4 },
+	{ 0x9824, 0xE8F3 }, { 0x982C, 0x966A }, { 0x982D, 0x93AA }, { 0x9834, 0x896F }, { 0x9837, 0xE8F5 }, { 0x9838, 0xE8F2 }, { 0x983B, 0x9570 }, { 0x983C, 0x978A },
+	{ 0x983D, 0xE8F6 }, { 0x9846, 0xE8F7 }, { 0x984B, 0xE8F9 }, { 0x984C, 0x91E8 }, { 0x984D, 0x8A7A }, { 0x984E, 0x8A7B }, { 0x984F, 0xE8F8 }, { 0x9854, 0x8AE7 },
+	{ 0x9855, 0x8CB0 }, { 0x9858, 0x8AE8 }, { 0x985B, 0x935E }, { 0x985E, 0x97DE }, { 0x9867, 0x8CDA }, { 0x986B, 0xE8FA }, { 0x986F, 0xE8FB }, { 0x9870, 0xE8FC },
+	{ 0x9871, 0xE940 }, { 0x9873, 0xE942 }, { 0x9874, 0xE941 }, { 0x98A8, 0x9597 }, { 0x98AA, 0xE943 }, { 0x98AF, 0xE944 }, { 0x98B1, 0xE945 }, { 0x98B6, 0xE946 },
+	{ 0x98C3, 0xE948 }, { 0x98C4, 0xE947 }, { 0x98C6, 0xE949 }, { 0x98DB, 0x94F2 }, { 0x98DC, 0xE3CA }, { 0x98DF, 0x9048 }, { 0x98E2, 0x8B51 }, { 0x98E9, 0xE94A },
+	{ 0x98EB, 0xE94B }, { 0x98ED, 0x99AA }, { 0x98EE, 0x9F5A }, { 0x98EF, 0x94D1 }, { 0x98F2, 0x88F9 }, { 0x98F4, 0x88B9 }, { 0x98FC, 0x8E94 }, { 0x98FD, 0x964F },
+	{ 0x98FE, 0x8FFC }, { 0x9903, 0xE94C }, { 0x9905, 0x96DD }, { 0x9909, 0xE94D }, { 0x990A, 0x977B }, { 0x990C, 0x8961 }, { 0x9910, 0x8E60 }, { 0x9912, 0xE94E },
+	{ 0x9913, 0x89EC }, { 0x9914, 0xE94F }, { 0x9918, 0xE950 }, { 0x991D, 0xE952 }, { 0x991E, 0xE953 }, { 0x9920, 0xE955 }, { 0x9921, 0xE951 }, { 0x9924, 0xE954 },
+	{ 0x9928, 0x8AD9 }, { 0x992C, 0xE956 }, { 0x992E, 0xE957 }, { 0x993D, 0xE958 }, { 0x993E, 0xE959 }, { 0x9942, 0xE95A }, { 0x9945, 0xE95C }, { 0x9949, 0xE95B },
+	{ 0x994B, 0xE95E }, { 0x994C, 0xE961 }, { 0x9950, 0xE95D }, { 0x9951, 0xE95F }, { 0x9952, 0xE960 }, { 0x9955, 0xE962 }, { 0x9957, 0x8BC0 }, { 0x9996, 0x8EF1 },
+	{ 0x9997, 0xE963 }, { 0x9998, 0xE964 }, { 0x9999, 0x8D81 }, { 0x99A5, 0xE965 }, { 0x99A8, 0x8A5D }, { 0x99AC, 0x946E }, { 0x99AD, 0xE966 }, { 0x99AE, 0xE967 },
+	{ 0x99B3, 0x9279 }, { 0x99B4, 0x93E9 }, { 0x99BC, 0xE968 }, { 0x99C1, 0x949D }, { 0x99C4, 0x91CA }, { 0x99C5, 0x8977 }, { 0x99C6, 0x8BEC }, { 0x99C8, 0x8BED },
+	{ 0x99D0, 0x9293 }, { 0x99D1, 0xE96D }, { 0x99D2, 0x8BEE }, { 0x99D5, 0x89ED }, { 0x99D8, 0xE96C }, { 0x99DB, 0xE96A }, { 0x99DD, 0xE96B }, { 0x99DF, 0xE969 },
+	{ 0x99E2, 0xE977 }, { 0x99ED, 0xE96E }, { 0x99EE, 0xE96F }, { 0x99F1, 0xE970 }, { 0x99F2, 0xE971 }, { 0x99F8, 0xE973 }, { 0x99FB, 0xE972 }, { 0x99FF, 0x8F78 },
+	{ 0x9A01, 0xE974 }, { 0x9A05, 0xE976 }, { 0x9A0E, 0x8B52 }, { 0x9A0F, 0xE975 }, { 0x9A12, 0x919B }, { 0x9A13, 0x8CB1 }, { 0x9A19, 0xE978 }, { 0x9A28, 0x91CB },
+	{ 0x9A2B, 0xE979 }, { 0x9A30, 0x93AB }, { 0x9A37, 0xE97A }, { 0x9A3E, 0xE980 }, { 0x9A40, 0xE97D }, { 0x9A42, 0xE97C }, { 0x9A43, 0xE97E }, { 0x9A45, 0xE97B },
+	{ 0x9A4D, 0xE982 }, { 0x9A55, 0xE981 }, { 0x9A57, 0xE984 }, { 0x9A5A, 0x8BC1 }, { 0x9A5B, 0xE983 }, { 0x9A5F, 0xE985 }, { 0x9A62, 0xE986 }, { 0x9A64, 0xE988 },
+	{ 0x9A65, 0xE987 }, { 0x9A69, 0xE989 }, { 0x9A6A, 0xE98B }, { 0x9A6B, 0xE98A }, { 0x9AA8, 0x8D9C }, { 0x9AAD, 0xE98C }, { 0x9AB0, 0xE98D }, { 0x9AB8, 0x8A5B },
+	{ 0x9ABC, 0xE98E }, { 0x9AC0, 0xE98F }, { 0x9AC4, 0x9091 }, { 0x9ACF, 0xE990 }, { 0x9AD1, 0xE991 }, { 0x9AD3, 0xE992 }, { 0x9AD4, 0xE993 }, { 0x9AD8, 0x8D82 },
+	{ 0x9ADE, 0xE994 }, { 0x9ADF, 0xE995 }, { 0x9AE2, 0xE996 }, { 0x9AE3, 0xE997 }, { 0x9AE6, 0xE998 }, { 0x9AEA, 0x94AF }, { 0x9AEB, 0xE99A }, { 0x9AED, 0x9545 },
+	{ 0x9AEE, 0xE99B }, { 0x9AEF, 0xE999 }, { 0x9AF1, 0xE99D }, { 0x9AF4, 0xE99C }, { 0x9AF7, 0xE99E }, { 0x9AFB, 0xE99F }, { 0x9B06, 0xE9A0 }, { 0x9B18, 0xE9A1 },
+	{ 0x9B1A, 0xE9A2 }, { 0x9B1F, 0xE9A3 }, { 0x9B22, 0xE9A4 }, { 0x9B23, 0xE9A5 }, { 0x9B25, 0xE9A6 }, { 0x9B27, 0xE9A7 }, { 0x9B28, 0xE9A8 }, { 0x9B29, 0xE9A9 },
+	{ 0x9B2A, 0xE9AA }, { 0x9B2E, 0xE9AB }, { 0x9B2F, 0xE9AC }, { 0x9B31, 0x9F54 }, { 0x9B32, 0xE9AD }, { 0x9B3B, 0xE2F6 }, { 0x9B3C, 0x8B53 }, { 0x9B41, 0x8A40 },
+	{ 0x9B42, 0x8DB0 }, { 0x9B43, 0xE9AF }, { 0x9B44, 0xE9AE }, { 0x9B45, 0x96A3 }, { 0x9B4D, 0xE9B1 }, { 0x9B4E, 0xE9B2 }, { 0x9B4F, 0xE9B0 }, { 0x9B51, 0xE9B3 },
+	{ 0x9B54, 0x9682 }, { 0x9B58, 0xE9B4 }, { 0x9B5A, 0x8B9B }, { 0x9B6F, 0x9844 }, { 0x9B74, 0xE9B5 }, { 0x9B83, 0xE9B7 }, { 0x9B8E, 0x88BC }, { 0x9B91, 0xE9B8 },
+	{ 0x9B92, 0x95A9 }, { 0x9B93, 0xE9B6 }, { 0x9B96, 0xE9B9 }, { 0x9B97, 0xE9BA }, { 0x9B9F, 0xE9BB }, { 0x9BA0, 0xE9BC }, { 0x9BA8, 0xE9BD }, { 0x9BAA, 0x968E },
+	{ 0x9BAB, 0x8E4C }, { 0x9BAD, 0x8DF8 }, { 0x9BAE, 0x914E }, { 0x9BB4, 0xE9BE }, { 0x9BB9, 0xE9C1 }, { 0x9BC0, 0xE9BF }, { 0x9BC6, 0xE9C2 }, { 0x9BC9, 0x8CEF },
+	{ 0x9BCA, 0xE9C0 }, { 0x9BCF, 0xE9C3 }, { 0x9BD1, 0xE9C4 }, { 0x9BD2, 0xE9C5 }, { 0x9BD4, 0xE9C9 }, { 0x9BD6, 0x8E49 }, { 0x9BDB, 0x91E2 }, { 0x9BE1, 0xE9CA },
+	{ 0x9BE2, 0xE9C7 }, { 0x9BE3, 0xE9C6 }, { 0x9BE4, 0xE9C8 }, { 0x9BE8, 0x8C7E }, { 0x9BF0, 0xE9CE }, { 0x9BF1, 0xE9CD }, { 0x9BF2, 0xE9CC }, { 0x9BF5, 0x88B1 },
+	{ 0x9C04, 0xE9D8 }, { 0x9C06, 0xE9D4 }, { 0x9C08, 0xE9D5 }, { 0x9C09, 0xE9D1 }, { 0x9C0A, 0xE9D7 }, { 0x9C0C, 0xE9D3 }, { 0x9C0D, 0x8A82 }, { 0x9C10, 0x986B },
+	{ 0x9C12, 0xE9D6 }, { 0x9C13, 0xE9D2 }, { 0x9C14, 0xE9D0 }, { 0x9C15, 0xE9CF }, { 0x9C1B, 0xE9DA }, { 0x9C21, 0xE9DD }, { 0x9C24, 0xE9DC }, { 0x9C25, 0xE9DB },
+	{ 0x9C2D, 0x9568 }, { 0x9C2E, 0xE9D9 }, { 0x9C2F, 0x88F1 }, { 0x9C30, 0xE9DE }, { 0x9C32, 0xE9E0 }, { 0x9C39, 0x8A8F }, { 0x9C3A, 0xE9CB }, { 0x9C3B, 0x8956 },
+	{ 0x9C3E, 0xE9E2 }, { 0x9C46, 0xE9E1 }, { 0x9C47, 0xE9DF }, { 0x9C48, 0x924C }, { 0x9C52, 0x9690 }, { 0x9C57, 0x97D8 }, { 0x9C5A, 0xE9E3 }, { 0x9C60, 0xE9E4 },
+	{ 0x9C67, 0xE9E5 }, { 0x9C76, 0xE9E6 }, { 0x9C78, 0xE9E7 }, { 0x9CE5, 0x92B9 }, { 0x9CE7, 0xE9E8 }, { 0x9CE9, 0x94B5 }, { 0x9CEB, 0xE9ED }, { 0x9CEC, 0xE9E9 },
+	{ 0x9CF0, 0xE9EA }, { 0x9CF3, 0x9650 }, { 0x9CF4, 0x96C2 }, { 0x9CF6, 0x93CE }, { 0x9D03, 0xE9EE }, { 0x9D06, 0xE9EF }, { 0x9D07, 0x93BC }, { 0x9D08, 0xE9EC },
+	{ 0x9D09, 0xE9EB }, { 0x9D0E, 0x89A8 }, { 0x9D12, 0xE9F7 }, { 0x9D15, 0xE9F6 }, { 0x9D1B, 0x8995 }, { 0x9D1F, 0xE9F4 }, { 0x9D23, 0xE9F3 }, { 0x9D26, 0xE9F1 },
+	{ 0x9D28, 0x8A9B }, { 0x9D2A, 0xE9F0 }, { 0x9D2B, 0x8EB0 }, { 0x9D2C, 0x89A7 }, { 0x9D3B, 0x8D83 }, { 0x9D3E, 0xE9FA }, { 0x9D3F, 0xE9F9 }, { 0x9D41, 0xE9F8 },
+	{ 0x9D44, 0xE9F5 }, { 0x9D46, 0xE9FB }, { 0x9D48, 0xE9FC }, { 0x9D50, 0xEA44 }, { 0x9D51, 0xEA43 }, { 0x9D59, 0xEA45 }, { 0x9D5C, 0x894C }, { 0x9D5D, 0xEA40 },
+	{ 0x9D5E, 0xEA41 }, { 0x9D60, 0x8D94 }, { 0x9D61, 0x96B7 }, { 0x9D64, 0xEA42 }, { 0x9D6C, 0x9651 }, { 0x9D6F, 0xEA4A }, { 0x9D72, 0xEA46 }, { 0x9D7A, 0xEA4B },
+	{ 0x9D87, 0xEA48 }, { 0x9D89, 0xEA47 }, { 0x9D8F, 0x8C7B }, { 0x9D9A, 0xEA4C }, { 0x9DA4, 0xEA4D }, { 0x9DA9, 0xEA4E }, { 0x9DAB, 0xEA49 }, { 0x9DAF, 0xE9F2 },
+	{ 0x9DB2, 0xEA4F }, { 0x9DB4, 0x92DF }, { 0x9DB8, 0xEA53 }, { 0x9DBA, 0xEA54 }, { 0x9DBB, 0xEA52 }, { 0x9DC1, 0xEA51 }, { 0x9DC2, 0xEA57 }, { 0x9DC4, 0xEA50 },
+	{ 0x9DC6, 0xEA55 }, { 0x9DCF, 0xEA56 }, { 0x9DD3, 0xEA59 }, { 0x9DD9, 0xEA58 }, { 0x9DE6, 0xEA5B }, { 0x9DED, 0xEA5C }, { 0x9DEF, 0xEA5D }, { 0x9DF2, 0x9868 },
+	{ 0x9DF8, 0xEA5A }, { 0x9DF9, 0x91E9 }, { 0x9DFA, 0x8DEB }, { 0x9DFD, 0xEA5E }, { 0x9E1A, 0xEA5F }, { 0x9E1B, 0xEA60 }, { 0x9E1E, 0xEA61 }, { 0x9E75, 0xEA62 },
+	{ 0x9E78, 0x8CB2 }, { 0x9E79, 0xEA63 }, { 0x9E7D, 0xEA64 }, { 0x9E7F, 0x8EAD }, { 0x9E81, 0xEA65 }, { 0x9E88, 0xEA66 }, { 0x9E8B, 0xEA67 }, { 0x9E8C, 0xEA68 },
+	{ 0x9E91, 0xEA6B }, { 0x9E92, 0xEA69 }, { 0x9E93, 0x985B }, { 0x9E95, 0xEA6A }, { 0x9E97, 0x97ED }, { 0x9E9D, 0xEA6C }, { 0x9E9F, 0x97D9 }, { 0x9EA5, 0xEA6D },
+	{ 0x9EA6, 0x949E }, { 0x9EA9, 0xEA6E }, { 0x9EAA, 0xEA70 }, { 0x9EAD, 0xEA71 }, { 0x9EB8, 0xEA6F }, { 0x9EB9, 0x8D8D }, { 0x9EBA, 0x96CB }, { 0x9EBB, 0x9683 },
+	{ 0x9EBC, 0x9BF5 }, { 0x9EBE, 0x9F80 }, { 0x9EBF, 0x969B }, { 0x9EC4, 0x89A9 }, { 0x9ECC, 0xEA73 }, { 0x9ECD, 0x8B6F }, { 0x9ECE, 0xEA74 }, { 0x9ECF, 0xEA75 },
+	{ 0x9ED0, 0xEA76 }, { 0x9ED2, 0x8D95 }, { 0x9ED4, 0xEA77 }, { 0x9ED8, 0xE0D2 }, { 0x9ED9, 0x96D9 }, { 0x9EDB, 0x91E1 }, { 0x9EDC, 0xEA78 }, { 0x9EDD, 0xEA7A },
+	{ 0x9EDE, 0xEA79 }, { 0x9EE0, 0xEA7B }, { 0x9EE5, 0xEA7C }, { 0x9EE8, 0xEA7D }, { 0x9EEF, 0xEA7E }, { 0x9EF4, 0xEA80 }, { 0x9EF6, 0xEA81 }, { 0x9EF7, 0xEA82 },
+	{ 0x9EF9, 0xEA83 }, { 0x9EFB, 0xEA84 }, { 0x9EFC, 0xEA85 }, { 0x9EFD, 0xEA86 }, { 0x9F07, 0xEA87 }, { 0x9F08, 0xEA88 }, { 0x9F0E, 0x9343 }, { 0x9F13, 0x8CDB },
+	{ 0x9F15, 0xEA8A }, { 0x9F20, 0x916C }, { 0x9F21, 0xEA8B }, { 0x9F2C, 0xEA8C }, { 0x9F3B, 0x9540 }, { 0x9F3E, 0xEA8D }, { 0x9F4A, 0xEA8E }, { 0x9F4B, 0xE256 },
+	{ 0x9F4E, 0xE6D8 }, { 0x9F4F, 0xE8EB }, { 0x9F52, 0xEA8F }, { 0x9F54, 0xEA90 }, { 0x9F5F, 0xEA92 }, { 0x9F60, 0xEA93 }, { 0x9F61, 0xEA94 }, { 0x9F62, 0x97EE },
+	{ 0x9F63, 0xEA91 }, { 0x9F66, 0xEA95 }, { 0x9F67, 0xEA96 }, { 0x9F6A, 0xEA98 }, { 0x9F6C, 0xEA97 }, { 0x9F72, 0xEA9A }, { 0x9F76, 0xEA9B }, { 0x9F77, 0xEA99 },
+	{ 0x9F8D, 0x97B4 }, { 0x9F95, 0xEA9C }, { 0x9F9C, 0xEA9D }, { 0x9F9D, 0xE273 }, { 0x9FA0, 0xEA9E }, { 0xFE30, 0xEB64 }, { 0xFE31, 0xEB5C }, { 0xFE33, 0xEB51 },
+	{ 0xFE35, 0xEB69 }, { 0xFE36, 0xEB6A }, { 0xFE37, 0xEB6F }, { 0xFE38, 0xEB70 }, { 0xFE39, 0xEB6B }, { 0xFE3A, 0xEB6C }, { 0xFE3B, 0xEB79 }, { 0xFE3C, 0xEB7A },
+	{ 0xFE3D, 0xEB73 }, { 0xFE3E, 0xEB74 }, { 0xFE3F, 0xEB71 }, { 0xFE40, 0xEB72 }, { 0xFE41, 0xEB75 }, { 0xFE42, 0xEB76 }, { 0xFE43, 0xEB77 }, { 0xFE44, 0xEB78 },
+	{ 0xFF01, 0x8149 }, { 0xFF03, 0x8194 }, { 0xFF04, 0x8190 }, { 0xFF05, 0x8193 }, { 0xFF06, 0x8195 }, { 0xFF08, 0x8169 }, { 0xFF09, 0x816A }, { 0xFF0A, 0x8196 },
+	{ 0xFF0B, 0x817B }, { 0xFF0C, 0x8143 }, { 0xFF0E, 0x8144 }, { 0xFF0F, 0x815E }, { 0xFF10, 0x824F }, { 0xFF11, 0x8250 }, { 0xFF12, 0x8251 }, { 0xFF13, 0x8252 },
+	{ 0xFF14, 0x8253 }, { 0xFF15, 0x8254 }, { 0xFF16, 0x8255 }, { 0xFF17, 0x8256 }, { 0xFF18, 0x8257 }, { 0xFF19, 0x8258 }, { 0xFF1A, 0x8146 }, { 0xFF1B, 0x8147 },
+	{ 0xFF1C, 0x8183 }, { 0xFF1D, 0x8181 }, { 0xFF1E, 0x8184 }, { 0xFF1F, 0x8148 }, { 0xFF20, 0x8197 }, { 0xFF21, 0x8260 }, { 0xFF22, 0x8261 }, { 0xFF23, 0x8262 },
+	{ 0xFF24, 0x8263 }, { 0xFF25, 0x8264 }, { 0xFF26, 0x8265 }, { 0xFF27, 0x8266 }, { 0xFF28, 0x8267 }, { 0xFF29, 0x8268 }, { 0xFF2A, 0x8269 }, { 0xFF2B, 0x826A },
+	{ 0xFF2C, 0x826B }, { 0xFF2D, 0x826C }, { 0xFF2E, 0x826D }, { 0xFF2F, 0x826E }, { 0xFF30, 0x826F }, { 0xFF31, 0x8270 }, { 0xFF32, 0x8271 }, { 0xFF33, 0x8272 },
+	{ 0xFF34, 0x8273 }, { 0xFF35, 0x8274 }, { 0xFF36, 0x8275 }, { 0xFF37, 0x8276 }, { 0xFF38, 0x8277 }, { 0xFF39, 0x8278 }, { 0xFF3A, 0x8279 }, { 0xFF3B, 0x816D },
+	{ 0xFF3C, 0x815F }, { 0xFF3D, 0x816E }, { 0xFF3E, 0x814F }, { 0xFF3F, 0x8151 }, { 0xFF40, 0x814D }, { 0xFF41, 0x8281 }, { 0xFF42, 0x8282 }, { 0xFF43, 0x8283 },
+	{ 0xFF44, 0x8284 }, { 0xFF45, 0x8285 }, { 0xFF46, 0x8286 }, { 0xFF47, 0x8287 }, { 0xFF48, 0x8288 }, { 0xFF49, 0x8289 }, { 0xFF4A, 0x828A }, { 0xFF4B, 0x828B },
+	{ 0xFF4C, 0x828C }, { 0xFF4D, 0x828D }, { 0xFF4E, 0x828E }, { 0xFF4F, 0x828F }, { 0xFF50, 0x8290 }, { 0xFF51, 0x8291 }, { 0xFF52, 0x8292 }, { 0xFF53, 0x8293 },
+	{ 0xFF54, 0x8294 }, { 0xFF55, 0x8295 }, { 0xFF56, 0x8296 }, { 0xFF57, 0x8297 }, { 0xFF58, 0x8298 }, { 0xFF59, 0x8299 }, { 0xFF5A, 0x829A }, { 0xFF5B, 0x816F },
+	{ 0xFF5C, 0x8162 }, { 0xFF5D, 0x8170 }, { 0xFF61, 0x00A1 }, { 0xFF62, 0x00A2 }, { 0xFF63, 0x00A3 }, { 0xFF64, 0x00A4 }, { 0xFF65, 0x00A5 }, { 0xFF66, 0x00A6 },
+	{ 0xFF67, 0x00A7 }, { 0xFF68, 0x00A8 }, { 0xFF69, 0x00A9 }, { 0xFF6A, 0x00AA }, { 0xFF6B, 0x00AB }, { 0xFF6C, 0x00AC }, { 0xFF6D, 0x00AD }, { 0xFF6E, 0x00AE },
+	{ 0xFF6F, 0x00AF }, { 0xFF70, 0x00B0 }, { 0xFF71, 0x00B1 }, { 0xFF72, 0x00B2 }, { 0xFF73, 0x00B3 }, { 0xFF74, 0x00B4 }, { 0xFF75, 0x00B5 }, { 0xFF76, 0x00B6 },
+	{ 0xFF77, 0x00B7 }, { 0xFF78, 0x00B8 }, { 0xFF79, 0x00B9 }, { 0xFF7A, 0x00BA }, { 0xFF7B, 0x00BB }, { 0xFF7C, 0x00BC }, { 0xFF7D, 0x00BD }, { 0xFF7E, 0x00BE },
+	{ 0xFF7F, 0x00BF }, { 0xFF80, 0x00C0 }, { 0xFF81, 0x00C1 }, { 0xFF82, 0x00C2 }, { 0xFF83, 0x00C3 }, { 0xFF84, 0x00C4 }, { 0xFF85, 0x00C5 }, { 0xFF86, 0x00C6 },
+	{ 0xFF87, 0x00C7 }, { 0xFF88, 0x00C8 }, { 0xFF89, 0x00C9 }, { 0xFF8A, 0x00CA }, { 0xFF8B, 0x00CB }, { 0xFF8C, 0x00CC }, { 0xFF8D, 0x00CD }, { 0xFF8E, 0x00CE },
+	{ 0xFF8F, 0x00CF }, { 0xFF90, 0x00D0 }, { 0xFF91, 0x00D1 }, { 0xFF92, 0x00D2 }, { 0xFF93, 0x00D3 }, { 0xFF94, 0x00D4 }, { 0xFF95, 0x00D5 }, { 0xFF96, 0x00D6 },
+	{ 0xFF97, 0x00D7 }, { 0xFF98, 0x00D8 }, { 0xFF99, 0x00D9 }, { 0xFF9A, 0x00DA }, { 0xFF9B, 0x00DB }, { 0xFF9C, 0x00DC }, { 0xFF9D, 0x00DD }, { 0xFF9E, 0x00DE },
+	{ 0xFF9F, 0x00DF }, { 0xFFE3, 0x8150 }, { 0xFFE5, 0x818F },
 };
 
 
diff --git a/Encodings/src/MacKoreanEncoding.cpp b/Encodings/src/MacKoreanEncoding.cpp
index 3ce539765..dee366d39 100644
--- a/Encodings/src/MacKoreanEncoding.cpp
+++ b/Encodings/src/MacKoreanEncoding.cpp
@@ -25,2178 +25,2178 @@ const char* MacKoreanEncoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap MacKoreanEncoding::_charMap = 
+const TextEncoding::CharacterMap MacKoreanEncoding::_charMap =
 {
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
-	0x00A0, 0x20A9,     -1, 0x00A9,     -1, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 
-	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 
-	    -1,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2, 
-	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1,
+	0x00A0, 0x20A9,     -1, 0x00A9,     -1, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+	    -1,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,
+	    -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -2,     -1,     -1,
 };
 
 
 const DoubleByteEncoding::Mapping MacKoreanEncoding::_mappingTable[] = {
-	{ 0xA14D, 0xFE59 }, { 0xA14E, 0xFE5A }, { 0xA159, 0x2985 }, { 0xA15A, 0x2986 }, { 0xA15D, 0x3016 }, { 0xA15E, 0x3017 }, { 0xA15F, 0x3018 }, { 0xA160, 0x3019 }, 
-	{ 0xA16D, 0x2051 }, { 0xA16E, 0xF840 }, { 0xA16F, 0x201F }, { 0xA170, 0x201B }, { 0xA171, 0x207A }, { 0xA172, 0x207B }, { 0xA17A, 0x207C }, { 0xA17C, 0x207D }, 
-	{ 0xA17D, 0x207E }, { 0xA196, 0x204C }, { 0xA197, 0x204D }, { 0xA198, 0x02BC }, { 0xA199, 0x2997 }, { 0xA19A, 0x2998 }, { 0xA1A1, 0x3000 }, { 0xA1A2, 0x3001 }, 
-	{ 0xA1A3, 0x3002 }, { 0xA1A4, 0x00B7 }, { 0xA1A5, 0x2025 }, { 0xA1A6, 0x2026 }, { 0xA1A7, 0x00A8 }, { 0xA1A8, 0x3003 }, { 0xA1A9, 0x2013 }, { 0xA1AA, 0x2014 }, 
-	{ 0xA1AB, 0x2016 }, { 0xA1AC, 0xFF3C }, { 0xA1AD, 0x301C }, { 0xA1AE, 0x2018 }, { 0xA1AF, 0x2019 }, { 0xA1B0, 0x201C }, { 0xA1B1, 0x201D }, { 0xA1B2, 0x3014 }, 
-	{ 0xA1B3, 0x3015 }, { 0xA1B4, 0x3008 }, { 0xA1B5, 0x3009 }, { 0xA1B6, 0x300A }, { 0xA1B7, 0x300B }, { 0xA1B8, 0x300C }, { 0xA1B9, 0x300D }, { 0xA1BA, 0x300E }, 
-	{ 0xA1BB, 0x300F }, { 0xA1BC, 0x3010 }, { 0xA1BD, 0x3011 }, { 0xA1BE, 0x00B1 }, { 0xA1BF, 0x00D7 }, { 0xA1C0, 0x00F7 }, { 0xA1C1, 0x2260 }, { 0xA1C2, 0x2264 }, 
-	{ 0xA1C3, 0x2265 }, { 0xA1C4, 0x221E }, { 0xA1C5, 0x2234 }, { 0xA1C6, 0x00B0 }, { 0xA1C7, 0x2032 }, { 0xA1C8, 0x2033 }, { 0xA1C9, 0x2103 }, { 0xA1CA, 0x212B }, 
-	{ 0xA1CB, 0x00A2 }, { 0xA1CC, 0x00A3 }, { 0xA1CD, 0x00A5 }, { 0xA1CE, 0x2642 }, { 0xA1CF, 0x2640 }, { 0xA1D0, 0x2220 }, { 0xA1D1, 0x22A5 }, { 0xA1D2, 0x2312 }, 
-	{ 0xA1D3, 0x2202 }, { 0xA1D4, 0x2207 }, { 0xA1D5, 0x2261 }, { 0xA1D6, 0x2252 }, { 0xA1D7, 0x00A7 }, { 0xA1D8, 0x203B }, { 0xA1D9, 0x2606 }, { 0xA1DA, 0x2605 }, 
-	{ 0xA1DB, 0x25CB }, { 0xA1DC, 0x25CF }, { 0xA1DD, 0x25CE }, { 0xA1DE, 0x25C7 }, { 0xA1DF, 0x25C6 }, { 0xA1E0, 0x25A1 }, { 0xA1E1, 0x25A0 }, { 0xA1E2, 0x25B3 }, 
-	{ 0xA1E3, 0x25B2 }, { 0xA1E4, 0x25BD }, { 0xA1E5, 0x25BC }, { 0xA1E6, 0x2192 }, { 0xA1E7, 0x2190 }, { 0xA1E8, 0x2191 }, { 0xA1E9, 0x2193 }, { 0xA1EA, 0x2194 }, 
-	{ 0xA1EB, 0x3013 }, { 0xA1EC, 0x226A }, { 0xA1ED, 0x226B }, { 0xA1EE, 0x221A }, { 0xA1EF, 0x223D }, { 0xA1F0, 0x221D }, { 0xA1F1, 0x2235 }, { 0xA1F2, 0x222B }, 
-	{ 0xA1F3, 0x222C }, { 0xA1F4, 0x2208 }, { 0xA1F5, 0x220B }, { 0xA1F6, 0x2286 }, { 0xA1F7, 0x2287 }, { 0xA1F8, 0x2282 }, { 0xA1F9, 0x2283 }, { 0xA1FA, 0x222A }, 
-	{ 0xA1FB, 0x2229 }, { 0xA1FC, 0x2227 }, { 0xA1FD, 0x2228 }, { 0xA1FE, 0x00AC }, { 0xA2A1, 0x21D2 }, { 0xA2A2, 0x21D4 }, { 0xA2A3, 0x2200 }, { 0xA2A4, 0x2203 }, 
-	{ 0xA2A5, 0x00B4 }, { 0xA2A6, 0x02DC }, { 0xA2A7, 0x02C7 }, { 0xA2A8, 0x02D8 }, { 0xA2A9, 0x02DD }, { 0xA2AA, 0x02DA }, { 0xA2AB, 0x02D9 }, { 0xA2AC, 0x00B8 }, 
-	{ 0xA2AD, 0x02DB }, { 0xA2AE, 0x00A1 }, { 0xA2AF, 0x00BF }, { 0xA2B0, 0x02D0 }, { 0xA2B1, 0x222E }, { 0xA2B2, 0x2211 }, { 0xA2B3, 0x220F }, { 0xA2B4, 0x00A4 }, 
-	{ 0xA2B5, 0x2109 }, { 0xA2B6, 0x2030 }, { 0xA2B7, 0x25C1 }, { 0xA2B8, 0x25C0 }, { 0xA2B9, 0x25B7 }, { 0xA2BA, 0x25B6 }, { 0xA2BB, 0x2664 }, { 0xA2BC, 0x2660 }, 
-	{ 0xA2BD, 0x2661 }, { 0xA2BE, 0x2665 }, { 0xA2BF, 0x2667 }, { 0xA2C0, 0x2663 }, { 0xA2C1, 0x25C9 }, { 0xA2C2, 0x25C8 }, { 0xA2C3, 0x25A3 }, { 0xA2C4, 0x25D0 }, 
-	{ 0xA2C5, 0x25D1 }, { 0xA2C6, 0x2592 }, { 0xA2C7, 0x25A4 }, { 0xA2C8, 0x25A5 }, { 0xA2C9, 0x25A8 }, { 0xA2CA, 0x25A7 }, { 0xA2CB, 0x25A6 }, { 0xA2CC, 0x25A9 }, 
-	{ 0xA2CD, 0x2668 }, { 0xA2CE, 0x260F }, { 0xA2CF, 0x260E }, { 0xA2D0, 0x261C }, { 0xA2D1, 0x261E }, { 0xA2D2, 0x00B6 }, { 0xA2D3, 0x2020 }, { 0xA2D4, 0x2021 }, 
-	{ 0xA2D5, 0x2195 }, { 0xA2D6, 0x2197 }, { 0xA2D7, 0x2199 }, { 0xA2D8, 0x2196 }, { 0xA2D9, 0x2198 }, { 0xA2DA, 0x266D }, { 0xA2DB, 0x2669 }, { 0xA2DC, 0x266A }, 
-	{ 0xA2DD, 0x266C }, { 0xA2DE, 0x327F }, { 0xA2DF, 0x321C }, { 0xA2E0, 0x2116 }, { 0xA2E1, 0x33C7 }, { 0xA2E2, 0x2122 }, { 0xA2E3, 0x33C2 }, { 0xA2E4, 0x33D8 }, 
-	{ 0xA2E5, 0x2121 }, { 0xA2FD, 0x22EE }, { 0xA2FE, 0x2237 }, { 0xA355, 0x278A }, { 0xA356, 0x278B }, { 0xA357, 0x278C }, { 0xA358, 0x278D }, { 0xA359, 0x278E }, 
-	{ 0xA35A, 0x278F }, { 0xA35B, 0x2790 }, { 0xA35C, 0x2791 }, { 0xA35D, 0x2792 }, { 0xA35E, 0x2793 }, { 0xA386, 0x24B6 }, { 0xA387, 0x24B7 }, { 0xA388, 0x24B8 }, 
-	{ 0xA389, 0x24B9 }, { 0xA38A, 0x24BA }, { 0xA38B, 0x24BB }, { 0xA38C, 0x24BC }, { 0xA38D, 0x24BD }, { 0xA38E, 0x24BE }, { 0xA38F, 0x24BF }, { 0xA390, 0x24C0 }, 
-	{ 0xA391, 0x24C1 }, { 0xA392, 0x24C2 }, { 0xA393, 0x24C3 }, { 0xA394, 0x24C4 }, { 0xA395, 0x24C5 }, { 0xA396, 0x24C6 }, { 0xA397, 0x24C7 }, { 0xA398, 0x24C8 }, 
-	{ 0xA399, 0x24C9 }, { 0xA39A, 0x24CA }, { 0xA39B, 0x24CB }, { 0xA39C, 0x24CC }, { 0xA39D, 0x24CD }, { 0xA39E, 0x24CE }, { 0xA39F, 0x24CF }, { 0xA3A1, 0xFF01 }, 
-	{ 0xA3A2, 0xFF02 }, { 0xA3A3, 0xFF03 }, { 0xA3A4, 0xFF04 }, { 0xA3A5, 0xFF05 }, { 0xA3A6, 0xFF06 }, { 0xA3A7, 0xFF07 }, { 0xA3A8, 0xFF08 }, { 0xA3A9, 0xFF09 }, 
-	{ 0xA3AA, 0xFF0A }, { 0xA3AB, 0xFF0B }, { 0xA3AC, 0xFF0C }, { 0xA3AD, 0xFF0D }, { 0xA3AE, 0xFF0E }, { 0xA3AF, 0xFF0F }, { 0xA3B0, 0xFF10 }, { 0xA3B1, 0xFF11 }, 
-	{ 0xA3B2, 0xFF12 }, { 0xA3B3, 0xFF13 }, { 0xA3B4, 0xFF14 }, { 0xA3B5, 0xFF15 }, { 0xA3B6, 0xFF16 }, { 0xA3B7, 0xFF17 }, { 0xA3B8, 0xFF18 }, { 0xA3B9, 0xFF19 }, 
-	{ 0xA3BA, 0xFF1A }, { 0xA3BB, 0xFF1B }, { 0xA3BC, 0xFF1C }, { 0xA3BD, 0xFF1D }, { 0xA3BE, 0xFF1E }, { 0xA3BF, 0xFF1F }, { 0xA3C0, 0xFF20 }, { 0xA3C1, 0xFF21 }, 
-	{ 0xA3C2, 0xFF22 }, { 0xA3C3, 0xFF23 }, { 0xA3C4, 0xFF24 }, { 0xA3C5, 0xFF25 }, { 0xA3C6, 0xFF26 }, { 0xA3C7, 0xFF27 }, { 0xA3C8, 0xFF28 }, { 0xA3C9, 0xFF29 }, 
-	{ 0xA3CA, 0xFF2A }, { 0xA3CB, 0xFF2B }, { 0xA3CC, 0xFF2C }, { 0xA3CD, 0xFF2D }, { 0xA3CE, 0xFF2E }, { 0xA3CF, 0xFF2F }, { 0xA3D0, 0xFF30 }, { 0xA3D1, 0xFF31 }, 
-	{ 0xA3D2, 0xFF32 }, { 0xA3D3, 0xFF33 }, { 0xA3D4, 0xFF34 }, { 0xA3D5, 0xFF35 }, { 0xA3D6, 0xFF36 }, { 0xA3D7, 0xFF37 }, { 0xA3D8, 0xFF38 }, { 0xA3D9, 0xFF39 }, 
-	{ 0xA3DA, 0xFF3A }, { 0xA3DB, 0xFF3B }, { 0xA3DC, 0xFFE6 }, { 0xA3DD, 0xFF3D }, { 0xA3DE, 0xFF3E }, { 0xA3DF, 0xFF3F }, { 0xA3E0, 0xFF40 }, { 0xA3E1, 0xFF41 }, 
-	{ 0xA3E2, 0xFF42 }, { 0xA3E3, 0xFF43 }, { 0xA3E4, 0xFF44 }, { 0xA3E5, 0xFF45 }, { 0xA3E6, 0xFF46 }, { 0xA3E7, 0xFF47 }, { 0xA3E8, 0xFF48 }, { 0xA3E9, 0xFF49 }, 
-	{ 0xA3EA, 0xFF4A }, { 0xA3EB, 0xFF4B }, { 0xA3EC, 0xFF4C }, { 0xA3ED, 0xFF4D }, { 0xA3EE, 0xFF4E }, { 0xA3EF, 0xFF4F }, { 0xA3F0, 0xFF50 }, { 0xA3F1, 0xFF51 }, 
-	{ 0xA3F2, 0xFF52 }, { 0xA3F3, 0xFF53 }, { 0xA3F4, 0xFF54 }, { 0xA3F5, 0xFF55 }, { 0xA3F6, 0xFF56 }, { 0xA3F7, 0xFF57 }, { 0xA3F8, 0xFF58 }, { 0xA3F9, 0xFF59 }, 
-	{ 0xA3FA, 0xFF5A }, { 0xA3FB, 0xFF5B }, { 0xA3FC, 0xFF5C }, { 0xA3FD, 0xFF5D }, { 0xA3FE, 0x203E }, { 0xA47D, 0x2A26 }, { 0xA481, 0x227A }, { 0xA482, 0x227B }, 
-	{ 0xA483, 0x22CE }, { 0xA484, 0x22CF }, { 0xA485, 0x2280 }, { 0xA486, 0x2281 }, { 0xA487, 0x2270 }, { 0xA488, 0x2271 }, { 0xA489, 0x2272 }, { 0xA48A, 0x2273 }, 
-	{ 0xA48B, 0x2AC5 }, { 0xA48C, 0x2ACB }, { 0xA48D, 0x2AC6 }, { 0xA48E, 0x2ACC }, { 0xA48F, 0x2276 }, { 0xA490, 0x2277 }, { 0xA491, 0x2279 }, { 0xA492, 0x22DA }, 
-	{ 0xA493, 0x22DB }, { 0xA494, 0x2A8B }, { 0xA495, 0x2A8C }, { 0xA496, 0x2A91 }, { 0xA497, 0x2A92 }, { 0xA499, 0x2245 }, { 0xA49A, 0x2243 }, { 0xA49B, 0x2248 }, 
-	{ 0xA49C, 0x29A3 }, { 0xA49D, 0x22A4 }, { 0xA4A1, 0x3131 }, { 0xA4A2, 0x3132 }, { 0xA4A3, 0x3133 }, { 0xA4A4, 0x3134 }, { 0xA4A5, 0x3135 }, { 0xA4A6, 0x3136 }, 
-	{ 0xA4A7, 0x3137 }, { 0xA4A8, 0x3138 }, { 0xA4A9, 0x3139 }, { 0xA4AA, 0x313A }, { 0xA4AB, 0x313B }, { 0xA4AC, 0x313C }, { 0xA4AD, 0x313D }, { 0xA4AE, 0x313E }, 
-	{ 0xA4AF, 0x313F }, { 0xA4B0, 0x3140 }, { 0xA4B1, 0x3141 }, { 0xA4B2, 0x3142 }, { 0xA4B3, 0x3143 }, { 0xA4B4, 0x3144 }, { 0xA4B5, 0x3145 }, { 0xA4B6, 0x3146 }, 
-	{ 0xA4B7, 0x3147 }, { 0xA4B8, 0x3148 }, { 0xA4B9, 0x3149 }, { 0xA4BA, 0x314A }, { 0xA4BB, 0x314B }, { 0xA4BC, 0x314C }, { 0xA4BD, 0x314D }, { 0xA4BE, 0x314E }, 
-	{ 0xA4BF, 0x314F }, { 0xA4C0, 0x3150 }, { 0xA4C1, 0x3151 }, { 0xA4C2, 0x3152 }, { 0xA4C3, 0x3153 }, { 0xA4C4, 0x3154 }, { 0xA4C5, 0x3155 }, { 0xA4C6, 0x3156 }, 
-	{ 0xA4C7, 0x3157 }, { 0xA4C8, 0x3158 }, { 0xA4C9, 0x3159 }, { 0xA4CA, 0x315A }, { 0xA4CB, 0x315B }, { 0xA4CC, 0x315C }, { 0xA4CD, 0x315D }, { 0xA4CE, 0x315E }, 
-	{ 0xA4CF, 0x315F }, { 0xA4D0, 0x3160 }, { 0xA4D1, 0x3161 }, { 0xA4D2, 0x3162 }, { 0xA4D3, 0x3163 }, { 0xA4D4, 0x3164 }, { 0xA4D5, 0x3165 }, { 0xA4D6, 0x3166 }, 
-	{ 0xA4D7, 0x3167 }, { 0xA4D8, 0x3168 }, { 0xA4D9, 0x3169 }, { 0xA4DA, 0x316A }, { 0xA4DB, 0x316B }, { 0xA4DC, 0x316C }, { 0xA4DD, 0x316D }, { 0xA4DE, 0x316E }, 
-	{ 0xA4DF, 0x316F }, { 0xA4E0, 0x3170 }, { 0xA4E1, 0x3171 }, { 0xA4E2, 0x3172 }, { 0xA4E3, 0x3173 }, { 0xA4E4, 0x3174 }, { 0xA4E5, 0x3175 }, { 0xA4E6, 0x3176 }, 
-	{ 0xA4E7, 0x3177 }, { 0xA4E8, 0x3178 }, { 0xA4E9, 0x3179 }, { 0xA4EA, 0x317A }, { 0xA4EB, 0x317B }, { 0xA4EC, 0x317C }, { 0xA4ED, 0x317D }, { 0xA4EE, 0x317E }, 
-	{ 0xA4EF, 0x317F }, { 0xA4F0, 0x3180 }, { 0xA4F1, 0x3181 }, { 0xA4F2, 0x3182 }, { 0xA4F3, 0x3183 }, { 0xA4F4, 0x3184 }, { 0xA4F5, 0x3185 }, { 0xA4F6, 0x3186 }, 
-	{ 0xA4F7, 0x3187 }, { 0xA4F8, 0x3188 }, { 0xA4F9, 0x3189 }, { 0xA4FA, 0x318A }, { 0xA4FB, 0x318B }, { 0xA4FC, 0x318C }, { 0xA4FD, 0x318D }, { 0xA4FE, 0x318E }, 
-	{ 0xA5A1, 0x2170 }, { 0xA5A2, 0x2171 }, { 0xA5A3, 0x2172 }, { 0xA5A4, 0x2173 }, { 0xA5A5, 0x2174 }, { 0xA5A6, 0x2175 }, { 0xA5A7, 0x2176 }, { 0xA5A8, 0x2177 }, 
-	{ 0xA5A9, 0x2178 }, { 0xA5AA, 0x2179 }, { 0xA5B0, 0x2160 }, { 0xA5B1, 0x2161 }, { 0xA5B2, 0x2162 }, { 0xA5B3, 0x2163 }, { 0xA5B4, 0x2164 }, { 0xA5B5, 0x2165 }, 
-	{ 0xA5B6, 0x2166 }, { 0xA5B7, 0x2167 }, { 0xA5B8, 0x2168 }, { 0xA5B9, 0x2169 }, { 0xA5C1, 0x0391 }, { 0xA5C2, 0x0392 }, { 0xA5C3, 0x0393 }, { 0xA5C4, 0x0394 }, 
-	{ 0xA5C5, 0x0395 }, { 0xA5C6, 0x0396 }, { 0xA5C7, 0x0397 }, { 0xA5C8, 0x0398 }, { 0xA5C9, 0x0399 }, { 0xA5CA, 0x039A }, { 0xA5CB, 0x039B }, { 0xA5CC, 0x039C }, 
-	{ 0xA5CD, 0x039D }, { 0xA5CE, 0x039E }, { 0xA5CF, 0x039F }, { 0xA5D0, 0x03A0 }, { 0xA5D1, 0x03A1 }, { 0xA5D2, 0x03A3 }, { 0xA5D3, 0x03A4 }, { 0xA5D4, 0x03A5 }, 
-	{ 0xA5D5, 0x03A6 }, { 0xA5D6, 0x03A7 }, { 0xA5D7, 0x03A8 }, { 0xA5D8, 0x03A9 }, { 0xA5DE, 0x2034 }, { 0xA5E1, 0x03B1 }, { 0xA5E2, 0x03B2 }, { 0xA5E3, 0x03B3 }, 
-	{ 0xA5E4, 0x03B4 }, { 0xA5E5, 0x03B5 }, { 0xA5E6, 0x03B6 }, { 0xA5E7, 0x03B7 }, { 0xA5E8, 0x03B8 }, { 0xA5E9, 0x03B9 }, { 0xA5EA, 0x03BA }, { 0xA5EB, 0x03BB }, 
-	{ 0xA5EC, 0x03BC }, { 0xA5ED, 0x03BD }, { 0xA5EE, 0x03BE }, { 0xA5EF, 0x03BF }, { 0xA5F0, 0x03C0 }, { 0xA5F1, 0x03C1 }, { 0xA5F2, 0x03C3 }, { 0xA5F3, 0x03C4 }, 
-	{ 0xA5F4, 0x03C5 }, { 0xA5F5, 0x03C6 }, { 0xA5F6, 0x03C7 }, { 0xA5F7, 0x03C8 }, { 0xA5F8, 0x03C9 }, { 0xA642, 0xF83D }, { 0xA648, 0x266F }, { 0xA64D, 0x2042 }, 
-	{ 0xA64E, 0x204E }, { 0xA652, 0x273D }, { 0xA653, 0x2731 }, { 0xA654, 0x2747 }, { 0xA655, 0x2022 }, { 0xA658, 0xF805 }, { 0xA65A, 0x2039 }, { 0xA65B, 0x203A }, 
-	{ 0xA65C, 0x00AB }, { 0xA65D, 0x00BB }, { 0xA663, 0xF806 }, { 0xA664, 0x29C8 }, { 0xA668, 0x29BE }, { 0xA66C, 0x271A }, { 0xA66D, 0x2716 }, { 0xA66E, 0x29BF }, 
-	{ 0xA66F, 0x25EF }, { 0xA672, 0x2723 }, { 0xA673, 0x2756 }, { 0xA674, 0xF80A }, { 0xA675, 0x25CC }, { 0xA677, 0x2610 }, { 0xA678, 0x25A2 }, { 0xA67C, 0x273F }, 
-	{ 0xA681, 0xF809 }, { 0xA683, 0x274D }, { 0xA684, 0x25CD }, { 0xA688, 0x2720 }, { 0xA68D, 0x2741 }, { 0xA68F, 0xF808 }, { 0xA693, 0x262F }, { 0xA696, 0xF80B }, 
-	{ 0xA699, 0x2740 }, { 0xA69A, 0xF80C }, { 0xA69E, 0x3020 }, { 0xA69F, 0xF807 }, { 0xA6A1, 0x2500 }, { 0xA6A2, 0x2502 }, { 0xA6A3, 0x250C }, { 0xA6A4, 0x2510 }, 
-	{ 0xA6A5, 0x2518 }, { 0xA6A6, 0x2514 }, { 0xA6A7, 0x251C }, { 0xA6A8, 0x252C }, { 0xA6A9, 0x2524 }, { 0xA6AA, 0x2534 }, { 0xA6AB, 0x253C }, { 0xA6AC, 0x2501 }, 
-	{ 0xA6AD, 0x2503 }, { 0xA6AE, 0x250F }, { 0xA6AF, 0x2513 }, { 0xA6B0, 0x251B }, { 0xA6B1, 0x2517 }, { 0xA6B2, 0x2523 }, { 0xA6B3, 0x2533 }, { 0xA6B4, 0x252B }, 
-	{ 0xA6B5, 0x253B }, { 0xA6B6, 0x254B }, { 0xA6B7, 0x2520 }, { 0xA6B8, 0x252F }, { 0xA6B9, 0x2528 }, { 0xA6BA, 0x2537 }, { 0xA6BB, 0x253F }, { 0xA6BC, 0x251D }, 
-	{ 0xA6BD, 0x2530 }, { 0xA6BE, 0x2525 }, { 0xA6BF, 0x2538 }, { 0xA6C0, 0x2542 }, { 0xA6C1, 0x2512 }, { 0xA6C2, 0x2511 }, { 0xA6C3, 0x251A }, { 0xA6C4, 0x2519 }, 
-	{ 0xA6C5, 0x2516 }, { 0xA6C6, 0x2515 }, { 0xA6C7, 0x250E }, { 0xA6C8, 0x250D }, { 0xA6C9, 0x251E }, { 0xA6CA, 0x251F }, { 0xA6CB, 0x2521 }, { 0xA6CC, 0x2522 }, 
-	{ 0xA6CD, 0x2526 }, { 0xA6CE, 0x2527 }, { 0xA6CF, 0x2529 }, { 0xA6D0, 0x252A }, { 0xA6D1, 0x252D }, { 0xA6D2, 0x252E }, { 0xA6D3, 0x2531 }, { 0xA6D4, 0x2532 }, 
-	{ 0xA6D5, 0x2535 }, { 0xA6D6, 0x2536 }, { 0xA6D7, 0x2539 }, { 0xA6D8, 0x253A }, { 0xA6D9, 0x253D }, { 0xA6DA, 0x253E }, { 0xA6DB, 0x2540 }, { 0xA6DC, 0x2541 }, 
-	{ 0xA6DD, 0x2543 }, { 0xA6DE, 0x2544 }, { 0xA6DF, 0x2545 }, { 0xA6E0, 0x2546 }, { 0xA6E1, 0x2547 }, { 0xA6E2, 0x2548 }, { 0xA6E3, 0x2549 }, { 0xA6E4, 0x254A }, 
-	{ 0xA6E5, 0x2776 }, { 0xA6E6, 0x2777 }, { 0xA6E7, 0x2778 }, { 0xA6E8, 0x2779 }, { 0xA6E9, 0x277A }, { 0xA6EA, 0x277B }, { 0xA6EB, 0x277C }, { 0xA6EC, 0x277D }, 
-	{ 0xA6ED, 0x277E }, { 0xA6EE, 0x277F }, { 0xA6EF, 0x24EB }, { 0xA6F0, 0x24EC }, { 0xA6F1, 0x24ED }, { 0xA6F2, 0x24EE }, { 0xA6F3, 0x24EF }, { 0xA6F4, 0x24F0 }, 
-	{ 0xA6F5, 0x24F1 }, { 0xA6F6, 0x24F2 }, { 0xA6F7, 0x24F3 }, { 0xA6F8, 0x24F4 }, { 0xA742, 0x3012 }, { 0xA743, 0x3036 }, { 0xA746, 0x25FB }, { 0xA747, 0xF84C }, 
-	{ 0xA74A, 0x25AD }, { 0xA74B, 0xF84D }, { 0xA74C, 0xF84E }, { 0xA74D, 0xF84F }, { 0xA751, 0x2206 }, { 0xA753, 0x221F }, { 0xA755, 0x2225 }, { 0xA756, 0x2226 }, 
-	{ 0xA758, 0x2253 }, { 0xA759, 0x2251 }, { 0xA75A, 0x2266 }, { 0xA75B, 0x2267 }, { 0xA75C, 0x2213 }, { 0xA75D, 0x2295 }, { 0xA75E, 0x2296 }, { 0xA75F, 0x2297 }, 
-	{ 0xA760, 0x2A38 }, { 0xA761, 0x2314 }, { 0xA764, 0x2262 }, { 0xA766, 0x25B1 }, { 0xA768, 0x2222 }, { 0xA769, 0x2250 }, { 0xA76A, 0x03D5 }, { 0xA76B, 0x2AE8 }, 
-	{ 0xA76C, 0x22A3 }, { 0xA76F, 0x226E }, { 0xA770, 0x226F }, { 0xA771, 0x2285 }, { 0xA772, 0x2284 }, { 0xA773, 0x2209 }, { 0xA774, 0x220C }, { 0xA775, 0x22BB }, 
-	{ 0xA776, 0x22BC }, { 0xA777, 0x225A }, { 0xA778, 0x2306 }, { 0xA77B, 0x2A72 }, { 0xA782, 0x329E }, { 0xA784, 0x203C }, { 0xA785, 0x2049 }, { 0xA787, 0x2047 }, 
-	{ 0xA78F, 0x2588 }, { 0xA790, 0x25E6 }, { 0xA794, 0x25BF }, { 0xA795, 0x25B5 }, { 0xA796, 0x25B9 }, { 0xA797, 0x25C3 }, { 0xA798, 0x2666 }, { 0xA799, 0x2981 }, 
-	{ 0xA79A, 0x25FC }, { 0xA79C, 0x25CA }, { 0xA79D, 0x3231 }, { 0xA79E, 0x3239 }, { 0xA79F, 0x33CB }, { 0xA7A1, 0x3395 }, { 0xA7A2, 0x3396 }, { 0xA7A3, 0x3397 }, 
-	{ 0xA7A4, 0x2113 }, { 0xA7A5, 0x3398 }, { 0xA7A6, 0x33C4 }, { 0xA7A7, 0x33A3 }, { 0xA7A8, 0x33A4 }, { 0xA7A9, 0x33A5 }, { 0xA7AA, 0x33A6 }, { 0xA7AB, 0x3399 }, 
-	{ 0xA7AC, 0x339A }, { 0xA7AD, 0x339B }, { 0xA7AE, 0x339C }, { 0xA7AF, 0x339D }, { 0xA7B0, 0x339E }, { 0xA7B1, 0x339F }, { 0xA7B2, 0x33A0 }, { 0xA7B3, 0x33A1 }, 
-	{ 0xA7B4, 0x33A2 }, { 0xA7B5, 0x33CA }, { 0xA7B6, 0x338D }, { 0xA7B7, 0x338E }, { 0xA7B8, 0x338F }, { 0xA7B9, 0x33CF }, { 0xA7BA, 0x3388 }, { 0xA7BB, 0x3389 }, 
-	{ 0xA7BC, 0x33C8 }, { 0xA7BD, 0x33A7 }, { 0xA7BE, 0x33A8 }, { 0xA7BF, 0x33B0 }, { 0xA7C0, 0x33B1 }, { 0xA7C1, 0x33B2 }, { 0xA7C2, 0x33B3 }, { 0xA7C3, 0x33B4 }, 
-	{ 0xA7C4, 0x33B5 }, { 0xA7C5, 0x33B6 }, { 0xA7C6, 0x33B7 }, { 0xA7C7, 0x33B8 }, { 0xA7C8, 0x33B9 }, { 0xA7C9, 0x3380 }, { 0xA7CA, 0x3381 }, { 0xA7CB, 0x3382 }, 
-	{ 0xA7CC, 0x3383 }, { 0xA7CD, 0x3384 }, { 0xA7CE, 0x33BA }, { 0xA7CF, 0x33BB }, { 0xA7D0, 0x33BC }, { 0xA7D1, 0x33BD }, { 0xA7D2, 0x33BE }, { 0xA7D3, 0x33BF }, 
-	{ 0xA7D4, 0x3390 }, { 0xA7D5, 0x3391 }, { 0xA7D6, 0x3392 }, { 0xA7D7, 0x3393 }, { 0xA7D8, 0x3394 }, { 0xA7D9, 0x2126 }, { 0xA7DA, 0x33C0 }, { 0xA7DB, 0x33C1 }, 
-	{ 0xA7DC, 0x338A }, { 0xA7DD, 0x338B }, { 0xA7DE, 0x338C }, { 0xA7DF, 0x33D6 }, { 0xA7E0, 0x33C5 }, { 0xA7E1, 0x33AD }, { 0xA7E2, 0x33AE }, { 0xA7E3, 0x33AF }, 
-	{ 0xA7E4, 0x33DB }, { 0xA7E5, 0x33A9 }, { 0xA7E6, 0x33AA }, { 0xA7E7, 0x33AB }, { 0xA7E8, 0x33AC }, { 0xA7E9, 0x33DD }, { 0xA7EA, 0x33D0 }, { 0xA7EB, 0x33D3 }, 
-	{ 0xA7EC, 0x33C3 }, { 0xA7ED, 0x33C9 }, { 0xA7EE, 0x33DC }, { 0xA7EF, 0x33C6 }, { 0xA7F0, 0x246F }, { 0xA7F1, 0x2470 }, { 0xA7F2, 0x2471 }, { 0xA7F3, 0x2472 }, 
-	{ 0xA7F4, 0x2473 }, { 0xA7F5, 0x3251 }, { 0xA7F6, 0x3252 }, { 0xA7F7, 0x3253 }, { 0xA7F8, 0x3254 }, { 0xA7F9, 0x3255 }, { 0xA7FA, 0x3256 }, { 0xA7FB, 0x3257 }, 
-	{ 0xA7FC, 0x3258 }, { 0xA7FD, 0x3259 }, { 0xA7FE, 0x325A }, { 0xA849, 0x21D0 }, { 0xA84A, 0x21CF }, { 0xA84B, 0x21CD }, { 0xA85C, 0x27B2 }, { 0xA860, 0x279C }, 
-	{ 0xA867, 0xF846 }, { 0xA868, 0xF847 }, { 0xA86A, 0x279B }, { 0xA86F, 0x2962 }, { 0xA870, 0x2964 }, { 0xA871, 0x2963 }, { 0xA872, 0x2965 }, { 0xA874, 0x27A1 }, 
-	{ 0xA878, 0x279E }, { 0xA87B, 0x21B2 }, { 0xA87C, 0x21B1 }, { 0xA881, 0x21B4 }, { 0xA882, 0x21B0 }, { 0xA883, 0x21B3 }, { 0xA886, 0x2936 }, { 0xA889, 0x2935 }, 
-	{ 0xA88B, 0x2937 }, { 0xA88C, 0x2939 }, { 0xA88D, 0x2934 }, { 0xA892, 0x21BC }, { 0xA893, 0x21C0 }, { 0xA894, 0xF841 }, { 0xA89C, 0xF849 }, { 0xA89D, 0xF848 }, 
-	{ 0xA89E, 0x21C4 }, { 0xA89F, 0x21C5 }, { 0xA8A1, 0x00C6 }, { 0xA8A2, 0x00D0 }, { 0xA8A3, 0x00AA }, { 0xA8A4, 0x0126 }, { 0xA8A6, 0x0132 }, { 0xA8A8, 0x013F }, 
-	{ 0xA8A9, 0x0141 }, { 0xA8AA, 0x00D8 }, { 0xA8AB, 0x0152 }, { 0xA8AC, 0x00BA }, { 0xA8AD, 0x00DE }, { 0xA8AE, 0x0166 }, { 0xA8AF, 0x014A }, { 0xA8B1, 0x3260 }, 
-	{ 0xA8B2, 0x3261 }, { 0xA8B3, 0x3262 }, { 0xA8B4, 0x3263 }, { 0xA8B5, 0x3264 }, { 0xA8B6, 0x3265 }, { 0xA8B7, 0x3266 }, { 0xA8B8, 0x3267 }, { 0xA8B9, 0x3268 }, 
-	{ 0xA8BA, 0x3269 }, { 0xA8BB, 0x326A }, { 0xA8BC, 0x326B }, { 0xA8BD, 0x326C }, { 0xA8BE, 0x326D }, { 0xA8BF, 0x326E }, { 0xA8C0, 0x326F }, { 0xA8C1, 0x3270 }, 
-	{ 0xA8C2, 0x3271 }, { 0xA8C3, 0x3272 }, { 0xA8C4, 0x3273 }, { 0xA8C5, 0x3274 }, { 0xA8C6, 0x3275 }, { 0xA8C7, 0x3276 }, { 0xA8C8, 0x3277 }, { 0xA8C9, 0x3278 }, 
-	{ 0xA8CA, 0x3279 }, { 0xA8CB, 0x327A }, { 0xA8CC, 0x327B }, { 0xA8CD, 0x24D0 }, { 0xA8CE, 0x24D1 }, { 0xA8CF, 0x24D2 }, { 0xA8D0, 0x24D3 }, { 0xA8D1, 0x24D4 }, 
-	{ 0xA8D2, 0x24D5 }, { 0xA8D3, 0x24D6 }, { 0xA8D4, 0x24D7 }, { 0xA8D5, 0x24D8 }, { 0xA8D6, 0x24D9 }, { 0xA8D7, 0x24DA }, { 0xA8D8, 0x24DB }, { 0xA8D9, 0x24DC }, 
-	{ 0xA8DA, 0x24DD }, { 0xA8DB, 0x24DE }, { 0xA8DC, 0x24DF }, { 0xA8DD, 0x24E0 }, { 0xA8DE, 0x24E1 }, { 0xA8DF, 0x24E2 }, { 0xA8E0, 0x24E3 }, { 0xA8E1, 0x24E4 }, 
-	{ 0xA8E2, 0x24E5 }, { 0xA8E3, 0x24E6 }, { 0xA8E4, 0x24E7 }, { 0xA8E5, 0x24E8 }, { 0xA8E6, 0x24E9 }, { 0xA8E7, 0x2460 }, { 0xA8E8, 0x2461 }, { 0xA8E9, 0x2462 }, 
-	{ 0xA8EA, 0x2463 }, { 0xA8EB, 0x2464 }, { 0xA8EC, 0x2465 }, { 0xA8ED, 0x2466 }, { 0xA8EE, 0x2467 }, { 0xA8EF, 0x2468 }, { 0xA8F0, 0x2469 }, { 0xA8F1, 0x246A }, 
-	{ 0xA8F2, 0x246B }, { 0xA8F3, 0x246C }, { 0xA8F4, 0x246D }, { 0xA8F5, 0x246E }, { 0xA8F6, 0x00BD }, { 0xA8F7, 0x2153 }, { 0xA8F8, 0x2154 }, { 0xA8F9, 0x00BC }, 
-	{ 0xA8FA, 0x00BE }, { 0xA8FB, 0x215B }, { 0xA8FC, 0x215C }, { 0xA8FD, 0x215D }, { 0xA8FE, 0x215E }, { 0xA9A1, 0x00E6 }, { 0xA9A2, 0x0111 }, { 0xA9A3, 0x00F0 }, 
-	{ 0xA9A4, 0x0127 }, { 0xA9A5, 0x0131 }, { 0xA9A6, 0x0133 }, { 0xA9A7, 0x0138 }, { 0xA9A8, 0x0140 }, { 0xA9A9, 0x0142 }, { 0xA9AA, 0x00F8 }, { 0xA9AB, 0x0153 }, 
-	{ 0xA9AC, 0x00DF }, { 0xA9AD, 0x00FE }, { 0xA9AE, 0x0167 }, { 0xA9AF, 0x014B }, { 0xA9B0, 0x0149 }, { 0xA9B1, 0x3200 }, { 0xA9B2, 0x3201 }, { 0xA9B3, 0x3202 }, 
-	{ 0xA9B4, 0x3203 }, { 0xA9B5, 0x3204 }, { 0xA9B6, 0x3205 }, { 0xA9B7, 0x3206 }, { 0xA9B8, 0x3207 }, { 0xA9B9, 0x3208 }, { 0xA9BA, 0x3209 }, { 0xA9BB, 0x320A }, 
-	{ 0xA9BC, 0x320B }, { 0xA9BD, 0x320C }, { 0xA9BE, 0x320D }, { 0xA9BF, 0x320E }, { 0xA9C0, 0x320F }, { 0xA9C1, 0x3210 }, { 0xA9C2, 0x3211 }, { 0xA9C3, 0x3212 }, 
-	{ 0xA9C4, 0x3213 }, { 0xA9C5, 0x3214 }, { 0xA9C6, 0x3215 }, { 0xA9C7, 0x3216 }, { 0xA9C8, 0x3217 }, { 0xA9C9, 0x3218 }, { 0xA9CA, 0x3219 }, { 0xA9CB, 0x321A }, 
-	{ 0xA9CC, 0x321B }, { 0xA9CD, 0x249C }, { 0xA9CE, 0x249D }, { 0xA9CF, 0x249E }, { 0xA9D0, 0x249F }, { 0xA9D1, 0x24A0 }, { 0xA9D2, 0x24A1 }, { 0xA9D3, 0x24A2 }, 
-	{ 0xA9D4, 0x24A3 }, { 0xA9D5, 0x24A4 }, { 0xA9D6, 0x24A5 }, { 0xA9D7, 0x24A6 }, { 0xA9D8, 0x24A7 }, { 0xA9D9, 0x24A8 }, { 0xA9DA, 0x24A9 }, { 0xA9DB, 0x24AA }, 
-	{ 0xA9DC, 0x24AB }, { 0xA9DD, 0x24AC }, { 0xA9DE, 0x24AD }, { 0xA9DF, 0x24AE }, { 0xA9E0, 0x24AF }, { 0xA9E1, 0x24B0 }, { 0xA9E2, 0x24B1 }, { 0xA9E3, 0x24B2 }, 
-	{ 0xA9E4, 0x24B3 }, { 0xA9E5, 0x24B4 }, { 0xA9E6, 0x24B5 }, { 0xA9E7, 0x2474 }, { 0xA9E8, 0x2475 }, { 0xA9E9, 0x2476 }, { 0xA9EA, 0x2477 }, { 0xA9EB, 0x2478 }, 
-	{ 0xA9EC, 0x2479 }, { 0xA9ED, 0x247A }, { 0xA9EE, 0x247B }, { 0xA9EF, 0x247C }, { 0xA9F0, 0x247D }, { 0xA9F1, 0x247E }, { 0xA9F2, 0x247F }, { 0xA9F3, 0x2480 }, 
-	{ 0xA9F4, 0x2481 }, { 0xA9F5, 0x2482 }, { 0xA9F6, 0x00B9 }, { 0xA9F7, 0x00B2 }, { 0xA9F8, 0x00B3 }, { 0xA9F9, 0x2074 }, { 0xA9FA, 0x207F }, { 0xA9FB, 0x2081 }, 
-	{ 0xA9FC, 0x2082 }, { 0xA9FD, 0x2083 }, { 0xA9FE, 0x2084 }, { 0xAAA1, 0x3041 }, { 0xAAA2, 0x3042 }, { 0xAAA3, 0x3043 }, { 0xAAA4, 0x3044 }, { 0xAAA5, 0x3045 }, 
-	{ 0xAAA6, 0x3046 }, { 0xAAA7, 0x3047 }, { 0xAAA8, 0x3048 }, { 0xAAA9, 0x3049 }, { 0xAAAA, 0x304A }, { 0xAAAB, 0x304B }, { 0xAAAC, 0x304C }, { 0xAAAD, 0x304D }, 
-	{ 0xAAAE, 0x304E }, { 0xAAAF, 0x304F }, { 0xAAB0, 0x3050 }, { 0xAAB1, 0x3051 }, { 0xAAB2, 0x3052 }, { 0xAAB3, 0x3053 }, { 0xAAB4, 0x3054 }, { 0xAAB5, 0x3055 }, 
-	{ 0xAAB6, 0x3056 }, { 0xAAB7, 0x3057 }, { 0xAAB8, 0x3058 }, { 0xAAB9, 0x3059 }, { 0xAABA, 0x305A }, { 0xAABB, 0x305B }, { 0xAABC, 0x305C }, { 0xAABD, 0x305D }, 
-	{ 0xAABE, 0x305E }, { 0xAABF, 0x305F }, { 0xAAC0, 0x3060 }, { 0xAAC1, 0x3061 }, { 0xAAC2, 0x3062 }, { 0xAAC3, 0x3063 }, { 0xAAC4, 0x3064 }, { 0xAAC5, 0x3065 }, 
-	{ 0xAAC6, 0x3066 }, { 0xAAC7, 0x3067 }, { 0xAAC8, 0x3068 }, { 0xAAC9, 0x3069 }, { 0xAACA, 0x306A }, { 0xAACB, 0x306B }, { 0xAACC, 0x306C }, { 0xAACD, 0x306D }, 
-	{ 0xAACE, 0x306E }, { 0xAACF, 0x306F }, { 0xAAD0, 0x3070 }, { 0xAAD1, 0x3071 }, { 0xAAD2, 0x3072 }, { 0xAAD3, 0x3073 }, { 0xAAD4, 0x3074 }, { 0xAAD5, 0x3075 }, 
-	{ 0xAAD6, 0x3076 }, { 0xAAD7, 0x3077 }, { 0xAAD8, 0x3078 }, { 0xAAD9, 0x3079 }, { 0xAADA, 0x307A }, { 0xAADB, 0x307B }, { 0xAADC, 0x307C }, { 0xAADD, 0x307D }, 
-	{ 0xAADE, 0x307E }, { 0xAADF, 0x307F }, { 0xAAE0, 0x3080 }, { 0xAAE1, 0x3081 }, { 0xAAE2, 0x3082 }, { 0xAAE3, 0x3083 }, { 0xAAE4, 0x3084 }, { 0xAAE5, 0x3085 }, 
-	{ 0xAAE6, 0x3086 }, { 0xAAE7, 0x3087 }, { 0xAAE8, 0x3088 }, { 0xAAE9, 0x3089 }, { 0xAAEA, 0x308A }, { 0xAAEB, 0x308B }, { 0xAAEC, 0x308C }, { 0xAAED, 0x308D }, 
-	{ 0xAAEE, 0x308E }, { 0xAAEF, 0x308F }, { 0xAAF0, 0x3090 }, { 0xAAF1, 0x3091 }, { 0xAAF2, 0x3092 }, { 0xAAF3, 0x3093 }, { 0xAAF4, 0x2483 }, { 0xAAF5, 0x2484 }, 
-	{ 0xAAF6, 0x2485 }, { 0xAAF7, 0x2486 }, { 0xAAF8, 0x2487 }, { 0xAB5C, 0x3294 }, { 0xAB6C, 0x32A5 }, { 0xABA1, 0x30A1 }, { 0xABA2, 0x30A2 }, { 0xABA3, 0x30A3 }, 
-	{ 0xABA4, 0x30A4 }, { 0xABA5, 0x30A5 }, { 0xABA6, 0x30A6 }, { 0xABA7, 0x30A7 }, { 0xABA8, 0x30A8 }, { 0xABA9, 0x30A9 }, { 0xABAA, 0x30AA }, { 0xABAB, 0x30AB }, 
-	{ 0xABAC, 0x30AC }, { 0xABAD, 0x30AD }, { 0xABAE, 0x30AE }, { 0xABAF, 0x30AF }, { 0xABB0, 0x30B0 }, { 0xABB1, 0x30B1 }, { 0xABB2, 0x30B2 }, { 0xABB3, 0x30B3 }, 
-	{ 0xABB4, 0x30B4 }, { 0xABB5, 0x30B5 }, { 0xABB6, 0x30B6 }, { 0xABB7, 0x30B7 }, { 0xABB8, 0x30B8 }, { 0xABB9, 0x30B9 }, { 0xABBA, 0x30BA }, { 0xABBB, 0x30BB }, 
-	{ 0xABBC, 0x30BC }, { 0xABBD, 0x30BD }, { 0xABBE, 0x30BE }, { 0xABBF, 0x30BF }, { 0xABC0, 0x30C0 }, { 0xABC1, 0x30C1 }, { 0xABC2, 0x30C2 }, { 0xABC3, 0x30C3 }, 
-	{ 0xABC4, 0x30C4 }, { 0xABC5, 0x30C5 }, { 0xABC6, 0x30C6 }, { 0xABC7, 0x30C7 }, { 0xABC8, 0x30C8 }, { 0xABC9, 0x30C9 }, { 0xABCA, 0x30CA }, { 0xABCB, 0x30CB }, 
-	{ 0xABCC, 0x30CC }, { 0xABCD, 0x30CD }, { 0xABCE, 0x30CE }, { 0xABCF, 0x30CF }, { 0xABD0, 0x30D0 }, { 0xABD1, 0x30D1 }, { 0xABD2, 0x30D2 }, { 0xABD3, 0x30D3 }, 
-	{ 0xABD4, 0x30D4 }, { 0xABD5, 0x30D5 }, { 0xABD6, 0x30D6 }, { 0xABD7, 0x30D7 }, { 0xABD8, 0x30D8 }, { 0xABD9, 0x30D9 }, { 0xABDA, 0x30DA }, { 0xABDB, 0x30DB }, 
-	{ 0xABDC, 0x30DC }, { 0xABDD, 0x30DD }, { 0xABDE, 0x30DE }, { 0xABDF, 0x30DF }, { 0xABE0, 0x30E0 }, { 0xABE1, 0x30E1 }, { 0xABE2, 0x30E2 }, { 0xABE3, 0x30E3 }, 
-	{ 0xABE4, 0x30E4 }, { 0xABE5, 0x30E5 }, { 0xABE6, 0x30E6 }, { 0xABE7, 0x30E7 }, { 0xABE8, 0x30E8 }, { 0xABE9, 0x30E9 }, { 0xABEA, 0x30EA }, { 0xABEB, 0x30EB }, 
-	{ 0xABEC, 0x30EC }, { 0xABED, 0x30ED }, { 0xABEE, 0x30EE }, { 0xABEF, 0x30EF }, { 0xABF0, 0x30F0 }, { 0xABF1, 0x30F1 }, { 0xABF2, 0x30F2 }, { 0xABF3, 0x30F3 }, 
-	{ 0xABF4, 0x30F4 }, { 0xABF5, 0x30F5 }, { 0xABF6, 0x30F6 }, { 0xAC41, 0x21F0 }, { 0xAC42, 0xF843 }, { 0xAC43, 0x27B5 }, { 0xAC48, 0x27A4 }, { 0xAC49, 0xF844 }, 
-	{ 0xAC4A, 0xF84B }, { 0xAC4B, 0xF84A }, { 0xAC50, 0x21B6 }, { 0xAC51, 0x21B7 }, { 0xAC52, 0x219D }, { 0xAC53, 0x219C }, { 0xAC54, 0xF842 }, { 0xAC5E, 0x2794 }, 
-	{ 0xAC5F, 0xF845 }, { 0xAC6A, 0x21E0 }, { 0xAC6B, 0x21E2 }, { 0xAC6C, 0x21E1 }, { 0xAC6D, 0x21E3 }, { 0xAC72, 0x21E6 }, { 0xAC73, 0x21E8 }, { 0xAC74, 0x21E7 }, 
-	{ 0xAC75, 0x21E9 }, { 0xAC8D, 0x261D }, { 0xAC8E, 0x261F }, { 0xACA1, 0x0410 }, { 0xACA2, 0x0411 }, { 0xACA3, 0x0412 }, { 0xACA4, 0x0413 }, { 0xACA5, 0x0414 }, 
-	{ 0xACA6, 0x0415 }, { 0xACA7, 0x0401 }, { 0xACA8, 0x0416 }, { 0xACA9, 0x0417 }, { 0xACAA, 0x0418 }, { 0xACAB, 0x0419 }, { 0xACAC, 0x041A }, { 0xACAD, 0x041B }, 
-	{ 0xACAE, 0x041C }, { 0xACAF, 0x041D }, { 0xACB0, 0x041E }, { 0xACB1, 0x041F }, { 0xACB2, 0x0420 }, { 0xACB3, 0x0421 }, { 0xACB4, 0x0422 }, { 0xACB5, 0x0423 }, 
-	{ 0xACB6, 0x0424 }, { 0xACB7, 0x0425 }, { 0xACB8, 0x0426 }, { 0xACB9, 0x0427 }, { 0xACBA, 0x0428 }, { 0xACBB, 0x0429 }, { 0xACBC, 0x042A }, { 0xACBD, 0x042B }, 
-	{ 0xACBE, 0x042C }, { 0xACBF, 0x042D }, { 0xACC0, 0x042E }, { 0xACC1, 0x042F }, { 0xACD1, 0x0430 }, { 0xACD2, 0x0431 }, { 0xACD3, 0x0432 }, { 0xACD4, 0x0433 }, 
-	{ 0xACD5, 0x0434 }, { 0xACD6, 0x0435 }, { 0xACD7, 0x0451 }, { 0xACD8, 0x0436 }, { 0xACD9, 0x0437 }, { 0xACDA, 0x0438 }, { 0xACDB, 0x0439 }, { 0xACDC, 0x043A }, 
-	{ 0xACDD, 0x043B }, { 0xACDE, 0x043C }, { 0xACDF, 0x043D }, { 0xACE0, 0x043E }, { 0xACE1, 0x043F }, { 0xACE2, 0x0440 }, { 0xACE3, 0x0441 }, { 0xACE4, 0x0442 }, 
-	{ 0xACE5, 0x0443 }, { 0xACE6, 0x0444 }, { 0xACE7, 0x0445 }, { 0xACE8, 0x0446 }, { 0xACE9, 0x0447 }, { 0xACEA, 0x0448 }, { 0xACEB, 0x0449 }, { 0xACEC, 0x044A }, 
-	{ 0xACED, 0x044B }, { 0xACEE, 0x044C }, { 0xACEF, 0x044D }, { 0xACF0, 0x044E }, { 0xACF1, 0x044F }, { 0xAD70, 0x3290 }, { 0xAD71, 0x328A }, { 0xAD72, 0x328B }, 
-	{ 0xAD73, 0x328C }, { 0xAD74, 0x328D }, { 0xAD75, 0x328E }, { 0xAD76, 0x328F }, { 0xADA9, 0x301E }, { 0xADAA, 0x301F }, { 0xADAB, 0x2036 }, { 0xADAD, 0x2035 }, 
-	{ 0xB0A1, 0xAC00 }, { 0xB0A2, 0xAC01 }, { 0xB0A3, 0xAC04 }, { 0xB0A4, 0xAC07 }, { 0xB0A5, 0xAC08 }, { 0xB0A6, 0xAC09 }, { 0xB0A7, 0xAC0A }, { 0xB0A8, 0xAC10 }, 
-	{ 0xB0A9, 0xAC11 }, { 0xB0AA, 0xAC12 }, { 0xB0AB, 0xAC13 }, { 0xB0AC, 0xAC14 }, { 0xB0AD, 0xAC15 }, { 0xB0AE, 0xAC16 }, { 0xB0AF, 0xAC17 }, { 0xB0B0, 0xAC19 }, 
-	{ 0xB0B1, 0xAC1A }, { 0xB0B2, 0xAC1B }, { 0xB0B3, 0xAC1C }, { 0xB0B4, 0xAC1D }, { 0xB0B5, 0xAC20 }, { 0xB0B6, 0xAC24 }, { 0xB0B7, 0xAC2C }, { 0xB0B8, 0xAC2D }, 
-	{ 0xB0B9, 0xAC2F }, { 0xB0BA, 0xAC30 }, { 0xB0BB, 0xAC31 }, { 0xB0BC, 0xAC38 }, { 0xB0BD, 0xAC39 }, { 0xB0BE, 0xAC3C }, { 0xB0BF, 0xAC40 }, { 0xB0C0, 0xAC4B }, 
-	{ 0xB0C1, 0xAC4D }, { 0xB0C2, 0xAC54 }, { 0xB0C3, 0xAC58 }, { 0xB0C4, 0xAC5C }, { 0xB0C5, 0xAC70 }, { 0xB0C6, 0xAC71 }, { 0xB0C7, 0xAC74 }, { 0xB0C8, 0xAC77 }, 
-	{ 0xB0C9, 0xAC78 }, { 0xB0CA, 0xAC7A }, { 0xB0CB, 0xAC80 }, { 0xB0CC, 0xAC81 }, { 0xB0CD, 0xAC83 }, { 0xB0CE, 0xAC84 }, { 0xB0CF, 0xAC85 }, { 0xB0D0, 0xAC86 }, 
-	{ 0xB0D1, 0xAC89 }, { 0xB0D2, 0xAC8A }, { 0xB0D3, 0xAC8B }, { 0xB0D4, 0xAC8C }, { 0xB0D5, 0xAC90 }, { 0xB0D6, 0xAC94 }, { 0xB0D7, 0xAC9C }, { 0xB0D8, 0xAC9D }, 
-	{ 0xB0D9, 0xAC9F }, { 0xB0DA, 0xACA0 }, { 0xB0DB, 0xACA1 }, { 0xB0DC, 0xACA8 }, { 0xB0DD, 0xACA9 }, { 0xB0DE, 0xACAA }, { 0xB0DF, 0xACAC }, { 0xB0E0, 0xACAF }, 
-	{ 0xB0E1, 0xACB0 }, { 0xB0E2, 0xACB8 }, { 0xB0E3, 0xACB9 }, { 0xB0E4, 0xACBB }, { 0xB0E5, 0xACBC }, { 0xB0E6, 0xACBD }, { 0xB0E7, 0xACC1 }, { 0xB0E8, 0xACC4 }, 
-	{ 0xB0E9, 0xACC8 }, { 0xB0EA, 0xACCC }, { 0xB0EB, 0xACD5 }, { 0xB0EC, 0xACD7 }, { 0xB0ED, 0xACE0 }, { 0xB0EE, 0xACE1 }, { 0xB0EF, 0xACE4 }, { 0xB0F0, 0xACE7 }, 
-	{ 0xB0F1, 0xACE8 }, { 0xB0F2, 0xACEA }, { 0xB0F3, 0xACEC }, { 0xB0F4, 0xACEF }, { 0xB0F5, 0xACF0 }, { 0xB0F6, 0xACF1 }, { 0xB0F7, 0xACF3 }, { 0xB0F8, 0xACF5 }, 
-	{ 0xB0F9, 0xACF6 }, { 0xB0FA, 0xACFC }, { 0xB0FB, 0xACFD }, { 0xB0FC, 0xAD00 }, { 0xB0FD, 0xAD04 }, { 0xB0FE, 0xAD06 }, { 0xB1A1, 0xAD0C }, { 0xB1A2, 0xAD0D }, 
-	{ 0xB1A3, 0xAD0F }, { 0xB1A4, 0xAD11 }, { 0xB1A5, 0xAD18 }, { 0xB1A6, 0xAD1C }, { 0xB1A7, 0xAD20 }, { 0xB1A8, 0xAD29 }, { 0xB1A9, 0xAD2C }, { 0xB1AA, 0xAD2D }, 
-	{ 0xB1AB, 0xAD34 }, { 0xB1AC, 0xAD35 }, { 0xB1AD, 0xAD38 }, { 0xB1AE, 0xAD3C }, { 0xB1AF, 0xAD44 }, { 0xB1B0, 0xAD45 }, { 0xB1B1, 0xAD47 }, { 0xB1B2, 0xAD49 }, 
-	{ 0xB1B3, 0xAD50 }, { 0xB1B4, 0xAD54 }, { 0xB1B5, 0xAD58 }, { 0xB1B6, 0xAD61 }, { 0xB1B7, 0xAD63 }, { 0xB1B8, 0xAD6C }, { 0xB1B9, 0xAD6D }, { 0xB1BA, 0xAD70 }, 
-	{ 0xB1BB, 0xAD73 }, { 0xB1BC, 0xAD74 }, { 0xB1BD, 0xAD75 }, { 0xB1BE, 0xAD76 }, { 0xB1BF, 0xAD7B }, { 0xB1C0, 0xAD7C }, { 0xB1C1, 0xAD7D }, { 0xB1C2, 0xAD7F }, 
-	{ 0xB1C3, 0xAD81 }, { 0xB1C4, 0xAD82 }, { 0xB1C5, 0xAD88 }, { 0xB1C6, 0xAD89 }, { 0xB1C7, 0xAD8C }, { 0xB1C8, 0xAD90 }, { 0xB1C9, 0xAD9C }, { 0xB1CA, 0xAD9D }, 
-	{ 0xB1CB, 0xADA4 }, { 0xB1CC, 0xADB7 }, { 0xB1CD, 0xADC0 }, { 0xB1CE, 0xADC1 }, { 0xB1CF, 0xADC4 }, { 0xB1D0, 0xADC8 }, { 0xB1D1, 0xADD0 }, { 0xB1D2, 0xADD1 }, 
-	{ 0xB1D3, 0xADD3 }, { 0xB1D4, 0xADDC }, { 0xB1D5, 0xADE0 }, { 0xB1D6, 0xADE4 }, { 0xB1D7, 0xADF8 }, { 0xB1D8, 0xADF9 }, { 0xB1D9, 0xADFC }, { 0xB1DA, 0xADFF }, 
-	{ 0xB1DB, 0xAE00 }, { 0xB1DC, 0xAE01 }, { 0xB1DD, 0xAE08 }, { 0xB1DE, 0xAE09 }, { 0xB1DF, 0xAE0B }, { 0xB1E0, 0xAE0D }, { 0xB1E1, 0xAE14 }, { 0xB1E2, 0xAE30 }, 
-	{ 0xB1E3, 0xAE31 }, { 0xB1E4, 0xAE34 }, { 0xB1E5, 0xAE37 }, { 0xB1E6, 0xAE38 }, { 0xB1E7, 0xAE3A }, { 0xB1E8, 0xAE40 }, { 0xB1E9, 0xAE41 }, { 0xB1EA, 0xAE43 }, 
-	{ 0xB1EB, 0xAE45 }, { 0xB1EC, 0xAE46 }, { 0xB1ED, 0xAE4A }, { 0xB1EE, 0xAE4C }, { 0xB1EF, 0xAE4D }, { 0xB1F0, 0xAE4E }, { 0xB1F1, 0xAE50 }, { 0xB1F2, 0xAE54 }, 
-	{ 0xB1F3, 0xAE56 }, { 0xB1F4, 0xAE5C }, { 0xB1F5, 0xAE5D }, { 0xB1F6, 0xAE5F }, { 0xB1F7, 0xAE60 }, { 0xB1F8, 0xAE61 }, { 0xB1F9, 0xAE65 }, { 0xB1FA, 0xAE68 }, 
-	{ 0xB1FB, 0xAE69 }, { 0xB1FC, 0xAE6C }, { 0xB1FD, 0xAE70 }, { 0xB1FE, 0xAE78 }, { 0xB2A1, 0xAE79 }, { 0xB2A2, 0xAE7B }, { 0xB2A3, 0xAE7C }, { 0xB2A4, 0xAE7D }, 
-	{ 0xB2A5, 0xAE84 }, { 0xB2A6, 0xAE85 }, { 0xB2A7, 0xAE8C }, { 0xB2A8, 0xAEBC }, { 0xB2A9, 0xAEBD }, { 0xB2AA, 0xAEBE }, { 0xB2AB, 0xAEC0 }, { 0xB2AC, 0xAEC4 }, 
-	{ 0xB2AD, 0xAECC }, { 0xB2AE, 0xAECD }, { 0xB2AF, 0xAECF }, { 0xB2B0, 0xAED0 }, { 0xB2B1, 0xAED1 }, { 0xB2B2, 0xAED8 }, { 0xB2B3, 0xAED9 }, { 0xB2B4, 0xAEDC }, 
-	{ 0xB2B5, 0xAEE8 }, { 0xB2B6, 0xAEEB }, { 0xB2B7, 0xAEED }, { 0xB2B8, 0xAEF4 }, { 0xB2B9, 0xAEF8 }, { 0xB2BA, 0xAEFC }, { 0xB2BB, 0xAF07 }, { 0xB2BC, 0xAF08 }, 
-	{ 0xB2BD, 0xAF0D }, { 0xB2BE, 0xAF10 }, { 0xB2BF, 0xAF2C }, { 0xB2C0, 0xAF2D }, { 0xB2C1, 0xAF30 }, { 0xB2C2, 0xAF32 }, { 0xB2C3, 0xAF34 }, { 0xB2C4, 0xAF3C }, 
-	{ 0xB2C5, 0xAF3D }, { 0xB2C6, 0xAF3F }, { 0xB2C7, 0xAF41 }, { 0xB2C8, 0xAF42 }, { 0xB2C9, 0xAF43 }, { 0xB2CA, 0xAF48 }, { 0xB2CB, 0xAF49 }, { 0xB2CC, 0xAF50 }, 
-	{ 0xB2CD, 0xAF5C }, { 0xB2CE, 0xAF5D }, { 0xB2CF, 0xAF64 }, { 0xB2D0, 0xAF65 }, { 0xB2D1, 0xAF79 }, { 0xB2D2, 0xAF80 }, { 0xB2D3, 0xAF84 }, { 0xB2D4, 0xAF88 }, 
-	{ 0xB2D5, 0xAF90 }, { 0xB2D6, 0xAF91 }, { 0xB2D7, 0xAF95 }, { 0xB2D8, 0xAF9C }, { 0xB2D9, 0xAFB8 }, { 0xB2DA, 0xAFB9 }, { 0xB2DB, 0xAFBC }, { 0xB2DC, 0xAFC0 }, 
-	{ 0xB2DD, 0xAFC7 }, { 0xB2DE, 0xAFC8 }, { 0xB2DF, 0xAFC9 }, { 0xB2E0, 0xAFCB }, { 0xB2E1, 0xAFCD }, { 0xB2E2, 0xAFCE }, { 0xB2E3, 0xAFD4 }, { 0xB2E4, 0xAFDC }, 
-	{ 0xB2E5, 0xAFE8 }, { 0xB2E6, 0xAFE9 }, { 0xB2E7, 0xAFF0 }, { 0xB2E8, 0xAFF1 }, { 0xB2E9, 0xAFF4 }, { 0xB2EA, 0xAFF8 }, { 0xB2EB, 0xB000 }, { 0xB2EC, 0xB001 }, 
-	{ 0xB2ED, 0xB004 }, { 0xB2EE, 0xB00C }, { 0xB2EF, 0xB010 }, { 0xB2F0, 0xB014 }, { 0xB2F1, 0xB01C }, { 0xB2F2, 0xB01D }, { 0xB2F3, 0xB028 }, { 0xB2F4, 0xB044 }, 
-	{ 0xB2F5, 0xB045 }, { 0xB2F6, 0xB048 }, { 0xB2F7, 0xB04A }, { 0xB2F8, 0xB04C }, { 0xB2F9, 0xB04E }, { 0xB2FA, 0xB053 }, { 0xB2FB, 0xB054 }, { 0xB2FC, 0xB055 }, 
-	{ 0xB2FD, 0xB057 }, { 0xB2FE, 0xB059 }, { 0xB3A1, 0xB05D }, { 0xB3A2, 0xB07C }, { 0xB3A3, 0xB07D }, { 0xB3A4, 0xB080 }, { 0xB3A5, 0xB084 }, { 0xB3A6, 0xB08C }, 
-	{ 0xB3A7, 0xB08D }, { 0xB3A8, 0xB08F }, { 0xB3A9, 0xB091 }, { 0xB3AA, 0xB098 }, { 0xB3AB, 0xB099 }, { 0xB3AC, 0xB09A }, { 0xB3AD, 0xB09C }, { 0xB3AE, 0xB09F }, 
-	{ 0xB3AF, 0xB0A0 }, { 0xB3B0, 0xB0A1 }, { 0xB3B1, 0xB0A2 }, { 0xB3B2, 0xB0A8 }, { 0xB3B3, 0xB0A9 }, { 0xB3B4, 0xB0AB }, { 0xB3B5, 0xB0AC }, { 0xB3B6, 0xB0AD }, 
-	{ 0xB3B7, 0xB0AE }, { 0xB3B8, 0xB0AF }, { 0xB3B9, 0xB0B1 }, { 0xB3BA, 0xB0B3 }, { 0xB3BB, 0xB0B4 }, { 0xB3BC, 0xB0B5 }, { 0xB3BD, 0xB0B8 }, { 0xB3BE, 0xB0BC }, 
-	{ 0xB3BF, 0xB0C4 }, { 0xB3C0, 0xB0C5 }, { 0xB3C1, 0xB0C7 }, { 0xB3C2, 0xB0C8 }, { 0xB3C3, 0xB0C9 }, { 0xB3C4, 0xB0D0 }, { 0xB3C5, 0xB0D1 }, { 0xB3C6, 0xB0D4 }, 
-	{ 0xB3C7, 0xB0D8 }, { 0xB3C8, 0xB0E0 }, { 0xB3C9, 0xB0E5 }, { 0xB3CA, 0xB108 }, { 0xB3CB, 0xB109 }, { 0xB3CC, 0xB10B }, { 0xB3CD, 0xB10C }, { 0xB3CE, 0xB110 }, 
-	{ 0xB3CF, 0xB112 }, { 0xB3D0, 0xB113 }, { 0xB3D1, 0xB118 }, { 0xB3D2, 0xB119 }, { 0xB3D3, 0xB11B }, { 0xB3D4, 0xB11C }, { 0xB3D5, 0xB11D }, { 0xB3D6, 0xB123 }, 
-	{ 0xB3D7, 0xB124 }, { 0xB3D8, 0xB125 }, { 0xB3D9, 0xB128 }, { 0xB3DA, 0xB12C }, { 0xB3DB, 0xB134 }, { 0xB3DC, 0xB135 }, { 0xB3DD, 0xB137 }, { 0xB3DE, 0xB138 }, 
-	{ 0xB3DF, 0xB139 }, { 0xB3E0, 0xB140 }, { 0xB3E1, 0xB141 }, { 0xB3E2, 0xB144 }, { 0xB3E3, 0xB148 }, { 0xB3E4, 0xB150 }, { 0xB3E5, 0xB151 }, { 0xB3E6, 0xB154 }, 
-	{ 0xB3E7, 0xB155 }, { 0xB3E8, 0xB158 }, { 0xB3E9, 0xB15C }, { 0xB3EA, 0xB160 }, { 0xB3EB, 0xB178 }, { 0xB3EC, 0xB179 }, { 0xB3ED, 0xB17C }, { 0xB3EE, 0xB180 }, 
-	{ 0xB3EF, 0xB182 }, { 0xB3F0, 0xB188 }, { 0xB3F1, 0xB189 }, { 0xB3F2, 0xB18B }, { 0xB3F3, 0xB18D }, { 0xB3F4, 0xB192 }, { 0xB3F5, 0xB193 }, { 0xB3F6, 0xB194 }, 
-	{ 0xB3F7, 0xB198 }, { 0xB3F8, 0xB19C }, { 0xB3F9, 0xB1A8 }, { 0xB3FA, 0xB1CC }, { 0xB3FB, 0xB1D0 }, { 0xB3FC, 0xB1D4 }, { 0xB3FD, 0xB1DC }, { 0xB3FE, 0xB1DD }, 
-	{ 0xB4A1, 0xB1DF }, { 0xB4A2, 0xB1E8 }, { 0xB4A3, 0xB1E9 }, { 0xB4A4, 0xB1EC }, { 0xB4A5, 0xB1F0 }, { 0xB4A6, 0xB1F9 }, { 0xB4A7, 0xB1FB }, { 0xB4A8, 0xB1FD }, 
-	{ 0xB4A9, 0xB204 }, { 0xB4AA, 0xB205 }, { 0xB4AB, 0xB208 }, { 0xB4AC, 0xB20B }, { 0xB4AD, 0xB20C }, { 0xB4AE, 0xB214 }, { 0xB4AF, 0xB215 }, { 0xB4B0, 0xB217 }, 
-	{ 0xB4B1, 0xB219 }, { 0xB4B2, 0xB220 }, { 0xB4B3, 0xB234 }, { 0xB4B4, 0xB23C }, { 0xB4B5, 0xB258 }, { 0xB4B6, 0xB25C }, { 0xB4B7, 0xB260 }, { 0xB4B8, 0xB268 }, 
-	{ 0xB4B9, 0xB269 }, { 0xB4BA, 0xB274 }, { 0xB4BB, 0xB275 }, { 0xB4BC, 0xB27C }, { 0xB4BD, 0xB284 }, { 0xB4BE, 0xB285 }, { 0xB4BF, 0xB289 }, { 0xB4C0, 0xB290 }, 
-	{ 0xB4C1, 0xB291 }, { 0xB4C2, 0xB294 }, { 0xB4C3, 0xB298 }, { 0xB4C4, 0xB299 }, { 0xB4C5, 0xB29A }, { 0xB4C6, 0xB2A0 }, { 0xB4C7, 0xB2A1 }, { 0xB4C8, 0xB2A3 }, 
-	{ 0xB4C9, 0xB2A5 }, { 0xB4CA, 0xB2A6 }, { 0xB4CB, 0xB2AA }, { 0xB4CC, 0xB2AC }, { 0xB4CD, 0xB2B0 }, { 0xB4CE, 0xB2B4 }, { 0xB4CF, 0xB2C8 }, { 0xB4D0, 0xB2C9 }, 
-	{ 0xB4D1, 0xB2CC }, { 0xB4D2, 0xB2D0 }, { 0xB4D3, 0xB2D2 }, { 0xB4D4, 0xB2D8 }, { 0xB4D5, 0xB2D9 }, { 0xB4D6, 0xB2DB }, { 0xB4D7, 0xB2DD }, { 0xB4D8, 0xB2E2 }, 
-	{ 0xB4D9, 0xB2E4 }, { 0xB4DA, 0xB2E5 }, { 0xB4DB, 0xB2E6 }, { 0xB4DC, 0xB2E8 }, { 0xB4DD, 0xB2EB }, { 0xB4DE, 0xB2EC }, { 0xB4DF, 0xB2ED }, { 0xB4E0, 0xB2EE }, 
-	{ 0xB4E1, 0xB2EF }, { 0xB4E2, 0xB2F3 }, { 0xB4E3, 0xB2F4 }, { 0xB4E4, 0xB2F5 }, { 0xB4E5, 0xB2F7 }, { 0xB4E6, 0xB2F8 }, { 0xB4E7, 0xB2F9 }, { 0xB4E8, 0xB2FA }, 
-	{ 0xB4E9, 0xB2FB }, { 0xB4EA, 0xB2FF }, { 0xB4EB, 0xB300 }, { 0xB4EC, 0xB301 }, { 0xB4ED, 0xB304 }, { 0xB4EE, 0xB308 }, { 0xB4EF, 0xB310 }, { 0xB4F0, 0xB311 }, 
-	{ 0xB4F1, 0xB313 }, { 0xB4F2, 0xB314 }, { 0xB4F3, 0xB315 }, { 0xB4F4, 0xB31C }, { 0xB4F5, 0xB354 }, { 0xB4F6, 0xB355 }, { 0xB4F7, 0xB356 }, { 0xB4F8, 0xB358 }, 
-	{ 0xB4F9, 0xB35B }, { 0xB4FA, 0xB35C }, { 0xB4FB, 0xB35E }, { 0xB4FC, 0xB35F }, { 0xB4FD, 0xB364 }, { 0xB4FE, 0xB365 }, { 0xB5A1, 0xB367 }, { 0xB5A2, 0xB369 }, 
-	{ 0xB5A3, 0xB36B }, { 0xB5A4, 0xB36E }, { 0xB5A5, 0xB370 }, { 0xB5A6, 0xB371 }, { 0xB5A7, 0xB374 }, { 0xB5A8, 0xB378 }, { 0xB5A9, 0xB380 }, { 0xB5AA, 0xB381 }, 
-	{ 0xB5AB, 0xB383 }, { 0xB5AC, 0xB384 }, { 0xB5AD, 0xB385 }, { 0xB5AE, 0xB38C }, { 0xB5AF, 0xB390 }, { 0xB5B0, 0xB394 }, { 0xB5B1, 0xB3A0 }, { 0xB5B2, 0xB3A1 }, 
-	{ 0xB5B3, 0xB3A8 }, { 0xB5B4, 0xB3AC }, { 0xB5B5, 0xB3C4 }, { 0xB5B6, 0xB3C5 }, { 0xB5B7, 0xB3C8 }, { 0xB5B8, 0xB3CB }, { 0xB5B9, 0xB3CC }, { 0xB5BA, 0xB3CE }, 
-	{ 0xB5BB, 0xB3D0 }, { 0xB5BC, 0xB3D4 }, { 0xB5BD, 0xB3D5 }, { 0xB5BE, 0xB3D7 }, { 0xB5BF, 0xB3D9 }, { 0xB5C0, 0xB3DB }, { 0xB5C1, 0xB3DD }, { 0xB5C2, 0xB3E0 }, 
-	{ 0xB5C3, 0xB3E4 }, { 0xB5C4, 0xB3E8 }, { 0xB5C5, 0xB3FC }, { 0xB5C6, 0xB410 }, { 0xB5C7, 0xB418 }, { 0xB5C8, 0xB41C }, { 0xB5C9, 0xB420 }, { 0xB5CA, 0xB428 }, 
-	{ 0xB5CB, 0xB429 }, { 0xB5CC, 0xB42B }, { 0xB5CD, 0xB434 }, { 0xB5CE, 0xB450 }, { 0xB5CF, 0xB451 }, { 0xB5D0, 0xB454 }, { 0xB5D1, 0xB458 }, { 0xB5D2, 0xB460 }, 
-	{ 0xB5D3, 0xB461 }, { 0xB5D4, 0xB463 }, { 0xB5D5, 0xB465 }, { 0xB5D6, 0xB46C }, { 0xB5D7, 0xB480 }, { 0xB5D8, 0xB488 }, { 0xB5D9, 0xB49D }, { 0xB5DA, 0xB4A4 }, 
-	{ 0xB5DB, 0xB4A8 }, { 0xB5DC, 0xB4AC }, { 0xB5DD, 0xB4B5 }, { 0xB5DE, 0xB4B7 }, { 0xB5DF, 0xB4B9 }, { 0xB5E0, 0xB4C0 }, { 0xB5E1, 0xB4C4 }, { 0xB5E2, 0xB4C8 }, 
-	{ 0xB5E3, 0xB4D0 }, { 0xB5E4, 0xB4D5 }, { 0xB5E5, 0xB4DC }, { 0xB5E6, 0xB4DD }, { 0xB5E7, 0xB4E0 }, { 0xB5E8, 0xB4E3 }, { 0xB5E9, 0xB4E4 }, { 0xB5EA, 0xB4E6 }, 
-	{ 0xB5EB, 0xB4EC }, { 0xB5EC, 0xB4ED }, { 0xB5ED, 0xB4EF }, { 0xB5EE, 0xB4F1 }, { 0xB5EF, 0xB4F8 }, { 0xB5F0, 0xB514 }, { 0xB5F1, 0xB515 }, { 0xB5F2, 0xB518 }, 
-	{ 0xB5F3, 0xB51B }, { 0xB5F4, 0xB51C }, { 0xB5F5, 0xB524 }, { 0xB5F6, 0xB525 }, { 0xB5F7, 0xB527 }, { 0xB5F8, 0xB528 }, { 0xB5F9, 0xB529 }, { 0xB5FA, 0xB52A }, 
-	{ 0xB5FB, 0xB530 }, { 0xB5FC, 0xB531 }, { 0xB5FD, 0xB534 }, { 0xB5FE, 0xB538 }, { 0xB6A1, 0xB540 }, { 0xB6A2, 0xB541 }, { 0xB6A3, 0xB543 }, { 0xB6A4, 0xB544 }, 
-	{ 0xB6A5, 0xB545 }, { 0xB6A6, 0xB54B }, { 0xB6A7, 0xB54C }, { 0xB6A8, 0xB54D }, { 0xB6A9, 0xB550 }, { 0xB6AA, 0xB554 }, { 0xB6AB, 0xB55C }, { 0xB6AC, 0xB55D }, 
-	{ 0xB6AD, 0xB55F }, { 0xB6AE, 0xB560 }, { 0xB6AF, 0xB561 }, { 0xB6B0, 0xB5A0 }, { 0xB6B1, 0xB5A1 }, { 0xB6B2, 0xB5A4 }, { 0xB6B3, 0xB5A8 }, { 0xB6B4, 0xB5AA }, 
-	{ 0xB6B5, 0xB5AB }, { 0xB6B6, 0xB5B0 }, { 0xB6B7, 0xB5B1 }, { 0xB6B8, 0xB5B3 }, { 0xB6B9, 0xB5B4 }, { 0xB6BA, 0xB5B5 }, { 0xB6BB, 0xB5BB }, { 0xB6BC, 0xB5BC }, 
-	{ 0xB6BD, 0xB5BD }, { 0xB6BE, 0xB5C0 }, { 0xB6BF, 0xB5C4 }, { 0xB6C0, 0xB5CC }, { 0xB6C1, 0xB5CD }, { 0xB6C2, 0xB5CF }, { 0xB6C3, 0xB5D0 }, { 0xB6C4, 0xB5D1 }, 
-	{ 0xB6C5, 0xB5D8 }, { 0xB6C6, 0xB5EC }, { 0xB6C7, 0xB610 }, { 0xB6C8, 0xB611 }, { 0xB6C9, 0xB614 }, { 0xB6CA, 0xB618 }, { 0xB6CB, 0xB625 }, { 0xB6CC, 0xB62C }, 
-	{ 0xB6CD, 0xB634 }, { 0xB6CE, 0xB648 }, { 0xB6CF, 0xB664 }, { 0xB6D0, 0xB668 }, { 0xB6D1, 0xB69C }, { 0xB6D2, 0xB69D }, { 0xB6D3, 0xB6A0 }, { 0xB6D4, 0xB6A4 }, 
-	{ 0xB6D5, 0xB6AB }, { 0xB6D6, 0xB6AC }, { 0xB6D7, 0xB6B1 }, { 0xB6D8, 0xB6D4 }, { 0xB6D9, 0xB6F0 }, { 0xB6DA, 0xB6F4 }, { 0xB6DB, 0xB6F8 }, { 0xB6DC, 0xB700 }, 
-	{ 0xB6DD, 0xB701 }, { 0xB6DE, 0xB705 }, { 0xB6DF, 0xB728 }, { 0xB6E0, 0xB729 }, { 0xB6E1, 0xB72C }, { 0xB6E2, 0xB72F }, { 0xB6E3, 0xB730 }, { 0xB6E4, 0xB738 }, 
-	{ 0xB6E5, 0xB739 }, { 0xB6E6, 0xB73B }, { 0xB6E7, 0xB744 }, { 0xB6E8, 0xB748 }, { 0xB6E9, 0xB74C }, { 0xB6EA, 0xB754 }, { 0xB6EB, 0xB755 }, { 0xB6EC, 0xB760 }, 
-	{ 0xB6ED, 0xB764 }, { 0xB6EE, 0xB768 }, { 0xB6EF, 0xB770 }, { 0xB6F0, 0xB771 }, { 0xB6F1, 0xB773 }, { 0xB6F2, 0xB775 }, { 0xB6F3, 0xB77C }, { 0xB6F4, 0xB77D }, 
-	{ 0xB6F5, 0xB780 }, { 0xB6F6, 0xB784 }, { 0xB6F7, 0xB78C }, { 0xB6F8, 0xB78D }, { 0xB6F9, 0xB78F }, { 0xB6FA, 0xB790 }, { 0xB6FB, 0xB791 }, { 0xB6FC, 0xB792 }, 
-	{ 0xB6FD, 0xB796 }, { 0xB6FE, 0xB797 }, { 0xB7A1, 0xB798 }, { 0xB7A2, 0xB799 }, { 0xB7A3, 0xB79C }, { 0xB7A4, 0xB7A0 }, { 0xB7A5, 0xB7A8 }, { 0xB7A6, 0xB7A9 }, 
-	{ 0xB7A7, 0xB7AB }, { 0xB7A8, 0xB7AC }, { 0xB7A9, 0xB7AD }, { 0xB7AA, 0xB7B4 }, { 0xB7AB, 0xB7B5 }, { 0xB7AC, 0xB7B8 }, { 0xB7AD, 0xB7C7 }, { 0xB7AE, 0xB7C9 }, 
-	{ 0xB7AF, 0xB7EC }, { 0xB7B0, 0xB7ED }, { 0xB7B1, 0xB7F0 }, { 0xB7B2, 0xB7F4 }, { 0xB7B3, 0xB7FC }, { 0xB7B4, 0xB7FD }, { 0xB7B5, 0xB7FF }, { 0xB7B6, 0xB800 }, 
-	{ 0xB7B7, 0xB801 }, { 0xB7B8, 0xB807 }, { 0xB7B9, 0xB808 }, { 0xB7BA, 0xB809 }, { 0xB7BB, 0xB80C }, { 0xB7BC, 0xB810 }, { 0xB7BD, 0xB818 }, { 0xB7BE, 0xB819 }, 
-	{ 0xB7BF, 0xB81B }, { 0xB7C0, 0xB81D }, { 0xB7C1, 0xB824 }, { 0xB7C2, 0xB825 }, { 0xB7C3, 0xB828 }, { 0xB7C4, 0xB82C }, { 0xB7C5, 0xB834 }, { 0xB7C6, 0xB835 }, 
-	{ 0xB7C7, 0xB837 }, { 0xB7C8, 0xB838 }, { 0xB7C9, 0xB839 }, { 0xB7CA, 0xB840 }, { 0xB7CB, 0xB844 }, { 0xB7CC, 0xB851 }, { 0xB7CD, 0xB853 }, { 0xB7CE, 0xB85C }, 
-	{ 0xB7CF, 0xB85D }, { 0xB7D0, 0xB860 }, { 0xB7D1, 0xB864 }, { 0xB7D2, 0xB86C }, { 0xB7D3, 0xB86D }, { 0xB7D4, 0xB86F }, { 0xB7D5, 0xB871 }, { 0xB7D6, 0xB878 }, 
-	{ 0xB7D7, 0xB87C }, { 0xB7D8, 0xB88D }, { 0xB7D9, 0xB8A8 }, { 0xB7DA, 0xB8B0 }, { 0xB7DB, 0xB8B4 }, { 0xB7DC, 0xB8B8 }, { 0xB7DD, 0xB8C0 }, { 0xB7DE, 0xB8C1 }, 
-	{ 0xB7DF, 0xB8C3 }, { 0xB7E0, 0xB8C5 }, { 0xB7E1, 0xB8CC }, { 0xB7E2, 0xB8D0 }, { 0xB7E3, 0xB8D4 }, { 0xB7E4, 0xB8DD }, { 0xB7E5, 0xB8DF }, { 0xB7E6, 0xB8E1 }, 
-	{ 0xB7E7, 0xB8E8 }, { 0xB7E8, 0xB8E9 }, { 0xB7E9, 0xB8EC }, { 0xB7EA, 0xB8F0 }, { 0xB7EB, 0xB8F8 }, { 0xB7EC, 0xB8F9 }, { 0xB7ED, 0xB8FB }, { 0xB7EE, 0xB8FD }, 
-	{ 0xB7EF, 0xB904 }, { 0xB7F0, 0xB918 }, { 0xB7F1, 0xB920 }, { 0xB7F2, 0xB93C }, { 0xB7F3, 0xB93D }, { 0xB7F4, 0xB940 }, { 0xB7F5, 0xB944 }, { 0xB7F6, 0xB94C }, 
-	{ 0xB7F7, 0xB94F }, { 0xB7F8, 0xB951 }, { 0xB7F9, 0xB958 }, { 0xB7FA, 0xB959 }, { 0xB7FB, 0xB95C }, { 0xB7FC, 0xB960 }, { 0xB7FD, 0xB968 }, { 0xB7FE, 0xB969 }, 
-	{ 0xB8A1, 0xB96B }, { 0xB8A2, 0xB96D }, { 0xB8A3, 0xB974 }, { 0xB8A4, 0xB975 }, { 0xB8A5, 0xB978 }, { 0xB8A6, 0xB97C }, { 0xB8A7, 0xB984 }, { 0xB8A8, 0xB985 }, 
-	{ 0xB8A9, 0xB987 }, { 0xB8AA, 0xB989 }, { 0xB8AB, 0xB98A }, { 0xB8AC, 0xB98D }, { 0xB8AD, 0xB98E }, { 0xB8AE, 0xB9AC }, { 0xB8AF, 0xB9AD }, { 0xB8B0, 0xB9B0 }, 
-	{ 0xB8B1, 0xB9B4 }, { 0xB8B2, 0xB9BC }, { 0xB8B3, 0xB9BD }, { 0xB8B4, 0xB9BF }, { 0xB8B5, 0xB9C1 }, { 0xB8B6, 0xB9C8 }, { 0xB8B7, 0xB9C9 }, { 0xB8B8, 0xB9CC }, 
-	{ 0xB8B9, 0xB9CE }, { 0xB8BA, 0xB9CF }, { 0xB8BB, 0xB9D0 }, { 0xB8BC, 0xB9D1 }, { 0xB8BD, 0xB9D2 }, { 0xB8BE, 0xB9D8 }, { 0xB8BF, 0xB9D9 }, { 0xB8C0, 0xB9DB }, 
-	{ 0xB8C1, 0xB9DD }, { 0xB8C2, 0xB9DE }, { 0xB8C3, 0xB9E1 }, { 0xB8C4, 0xB9E3 }, { 0xB8C5, 0xB9E4 }, { 0xB8C6, 0xB9E5 }, { 0xB8C7, 0xB9E8 }, { 0xB8C8, 0xB9EC }, 
-	{ 0xB8C9, 0xB9F4 }, { 0xB8CA, 0xB9F5 }, { 0xB8CB, 0xB9F7 }, { 0xB8CC, 0xB9F8 }, { 0xB8CD, 0xB9F9 }, { 0xB8CE, 0xB9FA }, { 0xB8CF, 0xBA00 }, { 0xB8D0, 0xBA01 }, 
-	{ 0xB8D1, 0xBA08 }, { 0xB8D2, 0xBA15 }, { 0xB8D3, 0xBA38 }, { 0xB8D4, 0xBA39 }, { 0xB8D5, 0xBA3C }, { 0xB8D6, 0xBA40 }, { 0xB8D7, 0xBA42 }, { 0xB8D8, 0xBA48 }, 
-	{ 0xB8D9, 0xBA49 }, { 0xB8DA, 0xBA4B }, { 0xB8DB, 0xBA4D }, { 0xB8DC, 0xBA4E }, { 0xB8DD, 0xBA53 }, { 0xB8DE, 0xBA54 }, { 0xB8DF, 0xBA55 }, { 0xB8E0, 0xBA58 }, 
-	{ 0xB8E1, 0xBA5C }, { 0xB8E2, 0xBA64 }, { 0xB8E3, 0xBA65 }, { 0xB8E4, 0xBA67 }, { 0xB8E5, 0xBA68 }, { 0xB8E6, 0xBA69 }, { 0xB8E7, 0xBA70 }, { 0xB8E8, 0xBA71 }, 
-	{ 0xB8E9, 0xBA74 }, { 0xB8EA, 0xBA78 }, { 0xB8EB, 0xBA83 }, { 0xB8EC, 0xBA84 }, { 0xB8ED, 0xBA85 }, { 0xB8EE, 0xBA87 }, { 0xB8EF, 0xBA8C }, { 0xB8F0, 0xBAA8 }, 
-	{ 0xB8F1, 0xBAA9 }, { 0xB8F2, 0xBAAB }, { 0xB8F3, 0xBAAC }, { 0xB8F4, 0xBAB0 }, { 0xB8F5, 0xBAB2 }, { 0xB8F6, 0xBAB8 }, { 0xB8F7, 0xBAB9 }, { 0xB8F8, 0xBABB }, 
-	{ 0xB8F9, 0xBABD }, { 0xB8FA, 0xBAC4 }, { 0xB8FB, 0xBAC8 }, { 0xB8FC, 0xBAD8 }, { 0xB8FD, 0xBAD9 }, { 0xB8FE, 0xBAFC }, { 0xB9A1, 0xBB00 }, { 0xB9A2, 0xBB04 }, 
-	{ 0xB9A3, 0xBB0D }, { 0xB9A4, 0xBB0F }, { 0xB9A5, 0xBB11 }, { 0xB9A6, 0xBB18 }, { 0xB9A7, 0xBB1C }, { 0xB9A8, 0xBB20 }, { 0xB9A9, 0xBB29 }, { 0xB9AA, 0xBB2B }, 
-	{ 0xB9AB, 0xBB34 }, { 0xB9AC, 0xBB35 }, { 0xB9AD, 0xBB36 }, { 0xB9AE, 0xBB38 }, { 0xB9AF, 0xBB3B }, { 0xB9B0, 0xBB3C }, { 0xB9B1, 0xBB3D }, { 0xB9B2, 0xBB3E }, 
-	{ 0xB9B3, 0xBB44 }, { 0xB9B4, 0xBB45 }, { 0xB9B5, 0xBB47 }, { 0xB9B6, 0xBB49 }, { 0xB9B7, 0xBB4D }, { 0xB9B8, 0xBB4F }, { 0xB9B9, 0xBB50 }, { 0xB9BA, 0xBB54 }, 
-	{ 0xB9BB, 0xBB58 }, { 0xB9BC, 0xBB61 }, { 0xB9BD, 0xBB63 }, { 0xB9BE, 0xBB6C }, { 0xB9BF, 0xBB88 }, { 0xB9C0, 0xBB8C }, { 0xB9C1, 0xBB90 }, { 0xB9C2, 0xBBA4 }, 
-	{ 0xB9C3, 0xBBA8 }, { 0xB9C4, 0xBBAC }, { 0xB9C5, 0xBBB4 }, { 0xB9C6, 0xBBB7 }, { 0xB9C7, 0xBBC0 }, { 0xB9C8, 0xBBC4 }, { 0xB9C9, 0xBBC8 }, { 0xB9CA, 0xBBD0 }, 
-	{ 0xB9CB, 0xBBD3 }, { 0xB9CC, 0xBBF8 }, { 0xB9CD, 0xBBF9 }, { 0xB9CE, 0xBBFC }, { 0xB9CF, 0xBBFF }, { 0xB9D0, 0xBC00 }, { 0xB9D1, 0xBC02 }, { 0xB9D2, 0xBC08 }, 
-	{ 0xB9D3, 0xBC09 }, { 0xB9D4, 0xBC0B }, { 0xB9D5, 0xBC0C }, { 0xB9D6, 0xBC0D }, { 0xB9D7, 0xBC0F }, { 0xB9D8, 0xBC11 }, { 0xB9D9, 0xBC14 }, { 0xB9DA, 0xBC15 }, 
-	{ 0xB9DB, 0xBC16 }, { 0xB9DC, 0xBC17 }, { 0xB9DD, 0xBC18 }, { 0xB9DE, 0xBC1B }, { 0xB9DF, 0xBC1C }, { 0xB9E0, 0xBC1D }, { 0xB9E1, 0xBC1E }, { 0xB9E2, 0xBC1F }, 
-	{ 0xB9E3, 0xBC24 }, { 0xB9E4, 0xBC25 }, { 0xB9E5, 0xBC27 }, { 0xB9E6, 0xBC29 }, { 0xB9E7, 0xBC2D }, { 0xB9E8, 0xBC30 }, { 0xB9E9, 0xBC31 }, { 0xB9EA, 0xBC34 }, 
-	{ 0xB9EB, 0xBC38 }, { 0xB9EC, 0xBC40 }, { 0xB9ED, 0xBC41 }, { 0xB9EE, 0xBC43 }, { 0xB9EF, 0xBC44 }, { 0xB9F0, 0xBC45 }, { 0xB9F1, 0xBC49 }, { 0xB9F2, 0xBC4C }, 
-	{ 0xB9F3, 0xBC4D }, { 0xB9F4, 0xBC50 }, { 0xB9F5, 0xBC5D }, { 0xB9F6, 0xBC84 }, { 0xB9F7, 0xBC85 }, { 0xB9F8, 0xBC88 }, { 0xB9F9, 0xBC8B }, { 0xB9FA, 0xBC8C }, 
-	{ 0xB9FB, 0xBC8E }, { 0xB9FC, 0xBC94 }, { 0xB9FD, 0xBC95 }, { 0xB9FE, 0xBC97 }, { 0xBAA1, 0xBC99 }, { 0xBAA2, 0xBC9A }, { 0xBAA3, 0xBCA0 }, { 0xBAA4, 0xBCA1 }, 
-	{ 0xBAA5, 0xBCA4 }, { 0xBAA6, 0xBCA7 }, { 0xBAA7, 0xBCA8 }, { 0xBAA8, 0xBCB0 }, { 0xBAA9, 0xBCB1 }, { 0xBAAA, 0xBCB3 }, { 0xBAAB, 0xBCB4 }, { 0xBAAC, 0xBCB5 }, 
-	{ 0xBAAD, 0xBCBC }, { 0xBAAE, 0xBCBD }, { 0xBAAF, 0xBCC0 }, { 0xBAB0, 0xBCC4 }, { 0xBAB1, 0xBCCD }, { 0xBAB2, 0xBCCF }, { 0xBAB3, 0xBCD0 }, { 0xBAB4, 0xBCD1 }, 
-	{ 0xBAB5, 0xBCD5 }, { 0xBAB6, 0xBCD8 }, { 0xBAB7, 0xBCDC }, { 0xBAB8, 0xBCF4 }, { 0xBAB9, 0xBCF5 }, { 0xBABA, 0xBCF6 }, { 0xBABB, 0xBCF8 }, { 0xBABC, 0xBCFC }, 
-	{ 0xBABD, 0xBD04 }, { 0xBABE, 0xBD05 }, { 0xBABF, 0xBD07 }, { 0xBAC0, 0xBD09 }, { 0xBAC1, 0xBD10 }, { 0xBAC2, 0xBD14 }, { 0xBAC3, 0xBD24 }, { 0xBAC4, 0xBD2C }, 
-	{ 0xBAC5, 0xBD40 }, { 0xBAC6, 0xBD48 }, { 0xBAC7, 0xBD49 }, { 0xBAC8, 0xBD4C }, { 0xBAC9, 0xBD50 }, { 0xBACA, 0xBD58 }, { 0xBACB, 0xBD59 }, { 0xBACC, 0xBD64 }, 
-	{ 0xBACD, 0xBD68 }, { 0xBACE, 0xBD80 }, { 0xBACF, 0xBD81 }, { 0xBAD0, 0xBD84 }, { 0xBAD1, 0xBD87 }, { 0xBAD2, 0xBD88 }, { 0xBAD3, 0xBD89 }, { 0xBAD4, 0xBD8A }, 
-	{ 0xBAD5, 0xBD90 }, { 0xBAD6, 0xBD91 }, { 0xBAD7, 0xBD93 }, { 0xBAD8, 0xBD95 }, { 0xBAD9, 0xBD99 }, { 0xBADA, 0xBD9A }, { 0xBADB, 0xBD9C }, { 0xBADC, 0xBDA4 }, 
-	{ 0xBADD, 0xBDB0 }, { 0xBADE, 0xBDB8 }, { 0xBADF, 0xBDD4 }, { 0xBAE0, 0xBDD5 }, { 0xBAE1, 0xBDD8 }, { 0xBAE2, 0xBDDC }, { 0xBAE3, 0xBDE9 }, { 0xBAE4, 0xBDF0 }, 
-	{ 0xBAE5, 0xBDF4 }, { 0xBAE6, 0xBDF8 }, { 0xBAE7, 0xBE00 }, { 0xBAE8, 0xBE03 }, { 0xBAE9, 0xBE05 }, { 0xBAEA, 0xBE0C }, { 0xBAEB, 0xBE0D }, { 0xBAEC, 0xBE10 }, 
-	{ 0xBAED, 0xBE14 }, { 0xBAEE, 0xBE1C }, { 0xBAEF, 0xBE1D }, { 0xBAF0, 0xBE1F }, { 0xBAF1, 0xBE44 }, { 0xBAF2, 0xBE45 }, { 0xBAF3, 0xBE48 }, { 0xBAF4, 0xBE4C }, 
-	{ 0xBAF5, 0xBE4E }, { 0xBAF6, 0xBE54 }, { 0xBAF7, 0xBE55 }, { 0xBAF8, 0xBE57 }, { 0xBAF9, 0xBE59 }, { 0xBAFA, 0xBE5A }, { 0xBAFB, 0xBE5B }, { 0xBAFC, 0xBE60 }, 
-	{ 0xBAFD, 0xBE61 }, { 0xBAFE, 0xBE64 }, { 0xBBA1, 0xBE68 }, { 0xBBA2, 0xBE6A }, { 0xBBA3, 0xBE70 }, { 0xBBA4, 0xBE71 }, { 0xBBA5, 0xBE73 }, { 0xBBA6, 0xBE74 }, 
-	{ 0xBBA7, 0xBE75 }, { 0xBBA8, 0xBE7B }, { 0xBBA9, 0xBE7C }, { 0xBBAA, 0xBE7D }, { 0xBBAB, 0xBE80 }, { 0xBBAC, 0xBE84 }, { 0xBBAD, 0xBE8C }, { 0xBBAE, 0xBE8D }, 
-	{ 0xBBAF, 0xBE8F }, { 0xBBB0, 0xBE90 }, { 0xBBB1, 0xBE91 }, { 0xBBB2, 0xBE98 }, { 0xBBB3, 0xBE99 }, { 0xBBB4, 0xBEA8 }, { 0xBBB5, 0xBED0 }, { 0xBBB6, 0xBED1 }, 
-	{ 0xBBB7, 0xBED4 }, { 0xBBB8, 0xBED7 }, { 0xBBB9, 0xBED8 }, { 0xBBBA, 0xBEE0 }, { 0xBBBB, 0xBEE3 }, { 0xBBBC, 0xBEE4 }, { 0xBBBD, 0xBEE5 }, { 0xBBBE, 0xBEEC }, 
-	{ 0xBBBF, 0xBF01 }, { 0xBBC0, 0xBF08 }, { 0xBBC1, 0xBF09 }, { 0xBBC2, 0xBF18 }, { 0xBBC3, 0xBF19 }, { 0xBBC4, 0xBF1B }, { 0xBBC5, 0xBF1C }, { 0xBBC6, 0xBF1D }, 
-	{ 0xBBC7, 0xBF40 }, { 0xBBC8, 0xBF41 }, { 0xBBC9, 0xBF44 }, { 0xBBCA, 0xBF48 }, { 0xBBCB, 0xBF50 }, { 0xBBCC, 0xBF51 }, { 0xBBCD, 0xBF55 }, { 0xBBCE, 0xBF94 }, 
-	{ 0xBBCF, 0xBFB0 }, { 0xBBD0, 0xBFC5 }, { 0xBBD1, 0xBFCC }, { 0xBBD2, 0xBFCD }, { 0xBBD3, 0xBFD0 }, { 0xBBD4, 0xBFD4 }, { 0xBBD5, 0xBFDC }, { 0xBBD6, 0xBFDF }, 
-	{ 0xBBD7, 0xBFE1 }, { 0xBBD8, 0xC03C }, { 0xBBD9, 0xC051 }, { 0xBBDA, 0xC058 }, { 0xBBDB, 0xC05C }, { 0xBBDC, 0xC060 }, { 0xBBDD, 0xC068 }, { 0xBBDE, 0xC069 }, 
-	{ 0xBBDF, 0xC090 }, { 0xBBE0, 0xC091 }, { 0xBBE1, 0xC094 }, { 0xBBE2, 0xC098 }, { 0xBBE3, 0xC0A0 }, { 0xBBE4, 0xC0A1 }, { 0xBBE5, 0xC0A3 }, { 0xBBE6, 0xC0A5 }, 
-	{ 0xBBE7, 0xC0AC }, { 0xBBE8, 0xC0AD }, { 0xBBE9, 0xC0AF }, { 0xBBEA, 0xC0B0 }, { 0xBBEB, 0xC0B3 }, { 0xBBEC, 0xC0B4 }, { 0xBBED, 0xC0B5 }, { 0xBBEE, 0xC0B6 }, 
-	{ 0xBBEF, 0xC0BC }, { 0xBBF0, 0xC0BD }, { 0xBBF1, 0xC0BF }, { 0xBBF2, 0xC0C0 }, { 0xBBF3, 0xC0C1 }, { 0xBBF4, 0xC0C5 }, { 0xBBF5, 0xC0C8 }, { 0xBBF6, 0xC0C9 }, 
-	{ 0xBBF7, 0xC0CC }, { 0xBBF8, 0xC0D0 }, { 0xBBF9, 0xC0D8 }, { 0xBBFA, 0xC0D9 }, { 0xBBFB, 0xC0DB }, { 0xBBFC, 0xC0DC }, { 0xBBFD, 0xC0DD }, { 0xBBFE, 0xC0E4 }, 
-	{ 0xBCA1, 0xC0E5 }, { 0xBCA2, 0xC0E8 }, { 0xBCA3, 0xC0EC }, { 0xBCA4, 0xC0F4 }, { 0xBCA5, 0xC0F5 }, { 0xBCA6, 0xC0F7 }, { 0xBCA7, 0xC0F9 }, { 0xBCA8, 0xC100 }, 
-	{ 0xBCA9, 0xC104 }, { 0xBCAA, 0xC108 }, { 0xBCAB, 0xC110 }, { 0xBCAC, 0xC115 }, { 0xBCAD, 0xC11C }, { 0xBCAE, 0xC11D }, { 0xBCAF, 0xC11E }, { 0xBCB0, 0xC11F }, 
-	{ 0xBCB1, 0xC120 }, { 0xBCB2, 0xC123 }, { 0xBCB3, 0xC124 }, { 0xBCB4, 0xC126 }, { 0xBCB5, 0xC127 }, { 0xBCB6, 0xC12C }, { 0xBCB7, 0xC12D }, { 0xBCB8, 0xC12F }, 
-	{ 0xBCB9, 0xC130 }, { 0xBCBA, 0xC131 }, { 0xBCBB, 0xC136 }, { 0xBCBC, 0xC138 }, { 0xBCBD, 0xC139 }, { 0xBCBE, 0xC13C }, { 0xBCBF, 0xC140 }, { 0xBCC0, 0xC148 }, 
-	{ 0xBCC1, 0xC149 }, { 0xBCC2, 0xC14B }, { 0xBCC3, 0xC14C }, { 0xBCC4, 0xC14D }, { 0xBCC5, 0xC154 }, { 0xBCC6, 0xC155 }, { 0xBCC7, 0xC158 }, { 0xBCC8, 0xC15C }, 
-	{ 0xBCC9, 0xC164 }, { 0xBCCA, 0xC165 }, { 0xBCCB, 0xC167 }, { 0xBCCC, 0xC168 }, { 0xBCCD, 0xC169 }, { 0xBCCE, 0xC170 }, { 0xBCCF, 0xC174 }, { 0xBCD0, 0xC178 }, 
-	{ 0xBCD1, 0xC185 }, { 0xBCD2, 0xC18C }, { 0xBCD3, 0xC18D }, { 0xBCD4, 0xC18E }, { 0xBCD5, 0xC190 }, { 0xBCD6, 0xC194 }, { 0xBCD7, 0xC196 }, { 0xBCD8, 0xC19C }, 
-	{ 0xBCD9, 0xC19D }, { 0xBCDA, 0xC19F }, { 0xBCDB, 0xC1A1 }, { 0xBCDC, 0xC1A5 }, { 0xBCDD, 0xC1A8 }, { 0xBCDE, 0xC1A9 }, { 0xBCDF, 0xC1AC }, { 0xBCE0, 0xC1B0 }, 
-	{ 0xBCE1, 0xC1BD }, { 0xBCE2, 0xC1C4 }, { 0xBCE3, 0xC1C8 }, { 0xBCE4, 0xC1CC }, { 0xBCE5, 0xC1D4 }, { 0xBCE6, 0xC1D7 }, { 0xBCE7, 0xC1D8 }, { 0xBCE8, 0xC1E0 }, 
-	{ 0xBCE9, 0xC1E4 }, { 0xBCEA, 0xC1E8 }, { 0xBCEB, 0xC1F0 }, { 0xBCEC, 0xC1F1 }, { 0xBCED, 0xC1F3 }, { 0xBCEE, 0xC1FC }, { 0xBCEF, 0xC1FD }, { 0xBCF0, 0xC200 }, 
-	{ 0xBCF1, 0xC204 }, { 0xBCF2, 0xC20C }, { 0xBCF3, 0xC20D }, { 0xBCF4, 0xC20F }, { 0xBCF5, 0xC211 }, { 0xBCF6, 0xC218 }, { 0xBCF7, 0xC219 }, { 0xBCF8, 0xC21C }, 
-	{ 0xBCF9, 0xC21F }, { 0xBCFA, 0xC220 }, { 0xBCFB, 0xC228 }, { 0xBCFC, 0xC229 }, { 0xBCFD, 0xC22B }, { 0xBCFE, 0xC22D }, { 0xBDA1, 0xC22F }, { 0xBDA2, 0xC231 }, 
-	{ 0xBDA3, 0xC232 }, { 0xBDA4, 0xC234 }, { 0xBDA5, 0xC248 }, { 0xBDA6, 0xC250 }, { 0xBDA7, 0xC251 }, { 0xBDA8, 0xC254 }, { 0xBDA9, 0xC258 }, { 0xBDAA, 0xC260 }, 
-	{ 0xBDAB, 0xC265 }, { 0xBDAC, 0xC26C }, { 0xBDAD, 0xC26D }, { 0xBDAE, 0xC270 }, { 0xBDAF, 0xC274 }, { 0xBDB0, 0xC27C }, { 0xBDB1, 0xC27D }, { 0xBDB2, 0xC27F }, 
-	{ 0xBDB3, 0xC281 }, { 0xBDB4, 0xC288 }, { 0xBDB5, 0xC289 }, { 0xBDB6, 0xC290 }, { 0xBDB7, 0xC298 }, { 0xBDB8, 0xC29B }, { 0xBDB9, 0xC29D }, { 0xBDBA, 0xC2A4 }, 
-	{ 0xBDBB, 0xC2A5 }, { 0xBDBC, 0xC2A8 }, { 0xBDBD, 0xC2AC }, { 0xBDBE, 0xC2AD }, { 0xBDBF, 0xC2B4 }, { 0xBDC0, 0xC2B5 }, { 0xBDC1, 0xC2B7 }, { 0xBDC2, 0xC2B9 }, 
-	{ 0xBDC3, 0xC2DC }, { 0xBDC4, 0xC2DD }, { 0xBDC5, 0xC2E0 }, { 0xBDC6, 0xC2E3 }, { 0xBDC7, 0xC2E4 }, { 0xBDC8, 0xC2EB }, { 0xBDC9, 0xC2EC }, { 0xBDCA, 0xC2ED }, 
-	{ 0xBDCB, 0xC2EF }, { 0xBDCC, 0xC2F1 }, { 0xBDCD, 0xC2F6 }, { 0xBDCE, 0xC2F8 }, { 0xBDCF, 0xC2F9 }, { 0xBDD0, 0xC2FB }, { 0xBDD1, 0xC2FC }, { 0xBDD2, 0xC300 }, 
-	{ 0xBDD3, 0xC308 }, { 0xBDD4, 0xC309 }, { 0xBDD5, 0xC30C }, { 0xBDD6, 0xC30D }, { 0xBDD7, 0xC313 }, { 0xBDD8, 0xC314 }, { 0xBDD9, 0xC315 }, { 0xBDDA, 0xC318 }, 
-	{ 0xBDDB, 0xC31C }, { 0xBDDC, 0xC324 }, { 0xBDDD, 0xC325 }, { 0xBDDE, 0xC328 }, { 0xBDDF, 0xC329 }, { 0xBDE0, 0xC345 }, { 0xBDE1, 0xC368 }, { 0xBDE2, 0xC369 }, 
-	{ 0xBDE3, 0xC36C }, { 0xBDE4, 0xC370 }, { 0xBDE5, 0xC372 }, { 0xBDE6, 0xC378 }, { 0xBDE7, 0xC379 }, { 0xBDE8, 0xC37C }, { 0xBDE9, 0xC37D }, { 0xBDEA, 0xC384 }, 
-	{ 0xBDEB, 0xC388 }, { 0xBDEC, 0xC38C }, { 0xBDED, 0xC3C0 }, { 0xBDEE, 0xC3D8 }, { 0xBDEF, 0xC3D9 }, { 0xBDF0, 0xC3DC }, { 0xBDF1, 0xC3DF }, { 0xBDF2, 0xC3E0 }, 
-	{ 0xBDF3, 0xC3E2 }, { 0xBDF4, 0xC3E8 }, { 0xBDF5, 0xC3E9 }, { 0xBDF6, 0xC3ED }, { 0xBDF7, 0xC3F4 }, { 0xBDF8, 0xC3F5 }, { 0xBDF9, 0xC3F8 }, { 0xBDFA, 0xC408 }, 
-	{ 0xBDFB, 0xC410 }, { 0xBDFC, 0xC424 }, { 0xBDFD, 0xC42C }, { 0xBDFE, 0xC430 }, { 0xBEA1, 0xC434 }, { 0xBEA2, 0xC43C }, { 0xBEA3, 0xC43D }, { 0xBEA4, 0xC448 }, 
-	{ 0xBEA5, 0xC464 }, { 0xBEA6, 0xC465 }, { 0xBEA7, 0xC468 }, { 0xBEA8, 0xC46C }, { 0xBEA9, 0xC474 }, { 0xBEAA, 0xC475 }, { 0xBEAB, 0xC479 }, { 0xBEAC, 0xC480 }, 
-	{ 0xBEAD, 0xC494 }, { 0xBEAE, 0xC49C }, { 0xBEAF, 0xC4B8 }, { 0xBEB0, 0xC4BC }, { 0xBEB1, 0xC4E9 }, { 0xBEB2, 0xC4F0 }, { 0xBEB3, 0xC4F1 }, { 0xBEB4, 0xC4F4 }, 
-	{ 0xBEB5, 0xC4F8 }, { 0xBEB6, 0xC4FA }, { 0xBEB7, 0xC4FF }, { 0xBEB8, 0xC500 }, { 0xBEB9, 0xC501 }, { 0xBEBA, 0xC50C }, { 0xBEBB, 0xC510 }, { 0xBEBC, 0xC514 }, 
-	{ 0xBEBD, 0xC51C }, { 0xBEBE, 0xC528 }, { 0xBEBF, 0xC529 }, { 0xBEC0, 0xC52C }, { 0xBEC1, 0xC530 }, { 0xBEC2, 0xC538 }, { 0xBEC3, 0xC539 }, { 0xBEC4, 0xC53B }, 
-	{ 0xBEC5, 0xC53D }, { 0xBEC6, 0xC544 }, { 0xBEC7, 0xC545 }, { 0xBEC8, 0xC548 }, { 0xBEC9, 0xC549 }, { 0xBECA, 0xC54A }, { 0xBECB, 0xC54C }, { 0xBECC, 0xC54D }, 
-	{ 0xBECD, 0xC54E }, { 0xBECE, 0xC553 }, { 0xBECF, 0xC554 }, { 0xBED0, 0xC555 }, { 0xBED1, 0xC557 }, { 0xBED2, 0xC558 }, { 0xBED3, 0xC559 }, { 0xBED4, 0xC55D }, 
-	{ 0xBED5, 0xC55E }, { 0xBED6, 0xC560 }, { 0xBED7, 0xC561 }, { 0xBED8, 0xC564 }, { 0xBED9, 0xC568 }, { 0xBEDA, 0xC570 }, { 0xBEDB, 0xC571 }, { 0xBEDC, 0xC573 }, 
-	{ 0xBEDD, 0xC574 }, { 0xBEDE, 0xC575 }, { 0xBEDF, 0xC57C }, { 0xBEE0, 0xC57D }, { 0xBEE1, 0xC580 }, { 0xBEE2, 0xC584 }, { 0xBEE3, 0xC587 }, { 0xBEE4, 0xC58C }, 
-	{ 0xBEE5, 0xC58D }, { 0xBEE6, 0xC58F }, { 0xBEE7, 0xC591 }, { 0xBEE8, 0xC595 }, { 0xBEE9, 0xC597 }, { 0xBEEA, 0xC598 }, { 0xBEEB, 0xC59C }, { 0xBEEC, 0xC5A0 }, 
-	{ 0xBEED, 0xC5A9 }, { 0xBEEE, 0xC5B4 }, { 0xBEEF, 0xC5B5 }, { 0xBEF0, 0xC5B8 }, { 0xBEF1, 0xC5B9 }, { 0xBEF2, 0xC5BB }, { 0xBEF3, 0xC5BC }, { 0xBEF4, 0xC5BD }, 
-	{ 0xBEF5, 0xC5BE }, { 0xBEF6, 0xC5C4 }, { 0xBEF7, 0xC5C5 }, { 0xBEF8, 0xC5C6 }, { 0xBEF9, 0xC5C7 }, { 0xBEFA, 0xC5C8 }, { 0xBEFB, 0xC5C9 }, { 0xBEFC, 0xC5CA }, 
-	{ 0xBEFD, 0xC5CC }, { 0xBEFE, 0xC5CE }, { 0xBFA1, 0xC5D0 }, { 0xBFA2, 0xC5D1 }, { 0xBFA3, 0xC5D4 }, { 0xBFA4, 0xC5D8 }, { 0xBFA5, 0xC5E0 }, { 0xBFA6, 0xC5E1 }, 
-	{ 0xBFA7, 0xC5E3 }, { 0xBFA8, 0xC5E5 }, { 0xBFA9, 0xC5EC }, { 0xBFAA, 0xC5ED }, { 0xBFAB, 0xC5EE }, { 0xBFAC, 0xC5F0 }, { 0xBFAD, 0xC5F4 }, { 0xBFAE, 0xC5F6 }, 
-	{ 0xBFAF, 0xC5F7 }, { 0xBFB0, 0xC5FC }, { 0xBFB1, 0xC5FD }, { 0xBFB2, 0xC5FE }, { 0xBFB3, 0xC5FF }, { 0xBFB4, 0xC600 }, { 0xBFB5, 0xC601 }, { 0xBFB6, 0xC605 }, 
-	{ 0xBFB7, 0xC606 }, { 0xBFB8, 0xC607 }, { 0xBFB9, 0xC608 }, { 0xBFBA, 0xC60C }, { 0xBFBB, 0xC610 }, { 0xBFBC, 0xC618 }, { 0xBFBD, 0xC619 }, { 0xBFBE, 0xC61B }, 
-	{ 0xBFBF, 0xC61C }, { 0xBFC0, 0xC624 }, { 0xBFC1, 0xC625 }, { 0xBFC2, 0xC628 }, { 0xBFC3, 0xC62C }, { 0xBFC4, 0xC62D }, { 0xBFC5, 0xC62E }, { 0xBFC6, 0xC630 }, 
-	{ 0xBFC7, 0xC633 }, { 0xBFC8, 0xC634 }, { 0xBFC9, 0xC635 }, { 0xBFCA, 0xC637 }, { 0xBFCB, 0xC639 }, { 0xBFCC, 0xC63B }, { 0xBFCD, 0xC640 }, { 0xBFCE, 0xC641 }, 
-	{ 0xBFCF, 0xC644 }, { 0xBFD0, 0xC648 }, { 0xBFD1, 0xC650 }, { 0xBFD2, 0xC651 }, { 0xBFD3, 0xC653 }, { 0xBFD4, 0xC654 }, { 0xBFD5, 0xC655 }, { 0xBFD6, 0xC65C }, 
-	{ 0xBFD7, 0xC65D }, { 0xBFD8, 0xC660 }, { 0xBFD9, 0xC66C }, { 0xBFDA, 0xC66F }, { 0xBFDB, 0xC671 }, { 0xBFDC, 0xC678 }, { 0xBFDD, 0xC679 }, { 0xBFDE, 0xC67C }, 
-	{ 0xBFDF, 0xC680 }, { 0xBFE0, 0xC688 }, { 0xBFE1, 0xC689 }, { 0xBFE2, 0xC68B }, { 0xBFE3, 0xC68D }, { 0xBFE4, 0xC694 }, { 0xBFE5, 0xC695 }, { 0xBFE6, 0xC698 }, 
-	{ 0xBFE7, 0xC69C }, { 0xBFE8, 0xC6A4 }, { 0xBFE9, 0xC6A5 }, { 0xBFEA, 0xC6A7 }, { 0xBFEB, 0xC6A9 }, { 0xBFEC, 0xC6B0 }, { 0xBFED, 0xC6B1 }, { 0xBFEE, 0xC6B4 }, 
-	{ 0xBFEF, 0xC6B8 }, { 0xBFF0, 0xC6B9 }, { 0xBFF1, 0xC6BA }, { 0xBFF2, 0xC6C0 }, { 0xBFF3, 0xC6C1 }, { 0xBFF4, 0xC6C3 }, { 0xBFF5, 0xC6C5 }, { 0xBFF6, 0xC6CC }, 
-	{ 0xBFF7, 0xC6CD }, { 0xBFF8, 0xC6D0 }, { 0xBFF9, 0xC6D4 }, { 0xBFFA, 0xC6DC }, { 0xBFFB, 0xC6DD }, { 0xBFFC, 0xC6E0 }, { 0xBFFD, 0xC6E1 }, { 0xBFFE, 0xC6E8 }, 
-	{ 0xC0A1, 0xC6E9 }, { 0xC0A2, 0xC6EC }, { 0xC0A3, 0xC6F0 }, { 0xC0A4, 0xC6F8 }, { 0xC0A5, 0xC6F9 }, { 0xC0A6, 0xC6FD }, { 0xC0A7, 0xC704 }, { 0xC0A8, 0xC705 }, 
-	{ 0xC0A9, 0xC708 }, { 0xC0AA, 0xC70C }, { 0xC0AB, 0xC714 }, { 0xC0AC, 0xC715 }, { 0xC0AD, 0xC717 }, { 0xC0AE, 0xC719 }, { 0xC0AF, 0xC720 }, { 0xC0B0, 0xC721 }, 
-	{ 0xC0B1, 0xC724 }, { 0xC0B2, 0xC728 }, { 0xC0B3, 0xC730 }, { 0xC0B4, 0xC731 }, { 0xC0B5, 0xC733 }, { 0xC0B6, 0xC735 }, { 0xC0B7, 0xC737 }, { 0xC0B8, 0xC73C }, 
-	{ 0xC0B9, 0xC73D }, { 0xC0BA, 0xC740 }, { 0xC0BB, 0xC744 }, { 0xC0BC, 0xC74A }, { 0xC0BD, 0xC74C }, { 0xC0BE, 0xC74D }, { 0xC0BF, 0xC74F }, { 0xC0C0, 0xC751 }, 
-	{ 0xC0C1, 0xC752 }, { 0xC0C2, 0xC753 }, { 0xC0C3, 0xC754 }, { 0xC0C4, 0xC755 }, { 0xC0C5, 0xC756 }, { 0xC0C6, 0xC757 }, { 0xC0C7, 0xC758 }, { 0xC0C8, 0xC75C }, 
-	{ 0xC0C9, 0xC760 }, { 0xC0CA, 0xC768 }, { 0xC0CB, 0xC76B }, { 0xC0CC, 0xC774 }, { 0xC0CD, 0xC775 }, { 0xC0CE, 0xC778 }, { 0xC0CF, 0xC77C }, { 0xC0D0, 0xC77D }, 
-	{ 0xC0D1, 0xC77E }, { 0xC0D2, 0xC783 }, { 0xC0D3, 0xC784 }, { 0xC0D4, 0xC785 }, { 0xC0D5, 0xC787 }, { 0xC0D6, 0xC788 }, { 0xC0D7, 0xC789 }, { 0xC0D8, 0xC78A }, 
-	{ 0xC0D9, 0xC78E }, { 0xC0DA, 0xC790 }, { 0xC0DB, 0xC791 }, { 0xC0DC, 0xC794 }, { 0xC0DD, 0xC796 }, { 0xC0DE, 0xC797 }, { 0xC0DF, 0xC798 }, { 0xC0E0, 0xC79A }, 
-	{ 0xC0E1, 0xC7A0 }, { 0xC0E2, 0xC7A1 }, { 0xC0E3, 0xC7A3 }, { 0xC0E4, 0xC7A4 }, { 0xC0E5, 0xC7A5 }, { 0xC0E6, 0xC7A6 }, { 0xC0E7, 0xC7AC }, { 0xC0E8, 0xC7AD }, 
-	{ 0xC0E9, 0xC7B0 }, { 0xC0EA, 0xC7B4 }, { 0xC0EB, 0xC7BC }, { 0xC0EC, 0xC7BD }, { 0xC0ED, 0xC7BF }, { 0xC0EE, 0xC7C0 }, { 0xC0EF, 0xC7C1 }, { 0xC0F0, 0xC7C8 }, 
-	{ 0xC0F1, 0xC7C9 }, { 0xC0F2, 0xC7CC }, { 0xC0F3, 0xC7CE }, { 0xC0F4, 0xC7D0 }, { 0xC0F5, 0xC7D8 }, { 0xC0F6, 0xC7DD }, { 0xC0F7, 0xC7E4 }, { 0xC0F8, 0xC7E8 }, 
-	{ 0xC0F9, 0xC7EC }, { 0xC0FA, 0xC800 }, { 0xC0FB, 0xC801 }, { 0xC0FC, 0xC804 }, { 0xC0FD, 0xC808 }, { 0xC0FE, 0xC80A }, { 0xC1A1, 0xC810 }, { 0xC1A2, 0xC811 }, 
-	{ 0xC1A3, 0xC813 }, { 0xC1A4, 0xC815 }, { 0xC1A5, 0xC816 }, { 0xC1A6, 0xC81C }, { 0xC1A7, 0xC81D }, { 0xC1A8, 0xC820 }, { 0xC1A9, 0xC824 }, { 0xC1AA, 0xC82C }, 
-	{ 0xC1AB, 0xC82D }, { 0xC1AC, 0xC82F }, { 0xC1AD, 0xC831 }, { 0xC1AE, 0xC838 }, { 0xC1AF, 0xC83C }, { 0xC1B0, 0xC840 }, { 0xC1B1, 0xC848 }, { 0xC1B2, 0xC849 }, 
-	{ 0xC1B3, 0xC84C }, { 0xC1B4, 0xC84D }, { 0xC1B5, 0xC854 }, { 0xC1B6, 0xC870 }, { 0xC1B7, 0xC871 }, { 0xC1B8, 0xC874 }, { 0xC1B9, 0xC878 }, { 0xC1BA, 0xC87A }, 
-	{ 0xC1BB, 0xC880 }, { 0xC1BC, 0xC881 }, { 0xC1BD, 0xC883 }, { 0xC1BE, 0xC885 }, { 0xC1BF, 0xC886 }, { 0xC1C0, 0xC887 }, { 0xC1C1, 0xC88B }, { 0xC1C2, 0xC88C }, 
-	{ 0xC1C3, 0xC88D }, { 0xC1C4, 0xC894 }, { 0xC1C5, 0xC89D }, { 0xC1C6, 0xC89F }, { 0xC1C7, 0xC8A1 }, { 0xC1C8, 0xC8A8 }, { 0xC1C9, 0xC8BC }, { 0xC1CA, 0xC8BD }, 
-	{ 0xC1CB, 0xC8C4 }, { 0xC1CC, 0xC8C8 }, { 0xC1CD, 0xC8CC }, { 0xC1CE, 0xC8D4 }, { 0xC1CF, 0xC8D5 }, { 0xC1D0, 0xC8D7 }, { 0xC1D1, 0xC8D9 }, { 0xC1D2, 0xC8E0 }, 
-	{ 0xC1D3, 0xC8E1 }, { 0xC1D4, 0xC8E4 }, { 0xC1D5, 0xC8F5 }, { 0xC1D6, 0xC8FC }, { 0xC1D7, 0xC8FD }, { 0xC1D8, 0xC900 }, { 0xC1D9, 0xC904 }, { 0xC1DA, 0xC905 }, 
-	{ 0xC1DB, 0xC906 }, { 0xC1DC, 0xC90C }, { 0xC1DD, 0xC90D }, { 0xC1DE, 0xC90F }, { 0xC1DF, 0xC911 }, { 0xC1E0, 0xC918 }, { 0xC1E1, 0xC92C }, { 0xC1E2, 0xC934 }, 
-	{ 0xC1E3, 0xC950 }, { 0xC1E4, 0xC951 }, { 0xC1E5, 0xC954 }, { 0xC1E6, 0xC958 }, { 0xC1E7, 0xC960 }, { 0xC1E8, 0xC961 }, { 0xC1E9, 0xC963 }, { 0xC1EA, 0xC96C }, 
-	{ 0xC1EB, 0xC970 }, { 0xC1EC, 0xC974 }, { 0xC1ED, 0xC97C }, { 0xC1EE, 0xC988 }, { 0xC1EF, 0xC989 }, { 0xC1F0, 0xC98C }, { 0xC1F1, 0xC990 }, { 0xC1F2, 0xC998 }, 
-	{ 0xC1F3, 0xC999 }, { 0xC1F4, 0xC99B }, { 0xC1F5, 0xC99D }, { 0xC1F6, 0xC9C0 }, { 0xC1F7, 0xC9C1 }, { 0xC1F8, 0xC9C4 }, { 0xC1F9, 0xC9C7 }, { 0xC1FA, 0xC9C8 }, 
-	{ 0xC1FB, 0xC9CA }, { 0xC1FC, 0xC9D0 }, { 0xC1FD, 0xC9D1 }, { 0xC1FE, 0xC9D3 }, { 0xC2A1, 0xC9D5 }, { 0xC2A2, 0xC9D6 }, { 0xC2A3, 0xC9D9 }, { 0xC2A4, 0xC9DA }, 
-	{ 0xC2A5, 0xC9DC }, { 0xC2A6, 0xC9DD }, { 0xC2A7, 0xC9E0 }, { 0xC2A8, 0xC9E2 }, { 0xC2A9, 0xC9E4 }, { 0xC2AA, 0xC9E7 }, { 0xC2AB, 0xC9EC }, { 0xC2AC, 0xC9ED }, 
-	{ 0xC2AD, 0xC9EF }, { 0xC2AE, 0xC9F0 }, { 0xC2AF, 0xC9F1 }, { 0xC2B0, 0xC9F8 }, { 0xC2B1, 0xC9F9 }, { 0xC2B2, 0xC9FC }, { 0xC2B3, 0xCA00 }, { 0xC2B4, 0xCA08 }, 
-	{ 0xC2B5, 0xCA09 }, { 0xC2B6, 0xCA0B }, { 0xC2B7, 0xCA0C }, { 0xC2B8, 0xCA0D }, { 0xC2B9, 0xCA14 }, { 0xC2BA, 0xCA18 }, { 0xC2BB, 0xCA29 }, { 0xC2BC, 0xCA4C }, 
-	{ 0xC2BD, 0xCA4D }, { 0xC2BE, 0xCA50 }, { 0xC2BF, 0xCA54 }, { 0xC2C0, 0xCA5C }, { 0xC2C1, 0xCA5D }, { 0xC2C2, 0xCA5F }, { 0xC2C3, 0xCA60 }, { 0xC2C4, 0xCA61 }, 
-	{ 0xC2C5, 0xCA68 }, { 0xC2C6, 0xCA7D }, { 0xC2C7, 0xCA84 }, { 0xC2C8, 0xCA98 }, { 0xC2C9, 0xCABC }, { 0xC2CA, 0xCABD }, { 0xC2CB, 0xCAC0 }, { 0xC2CC, 0xCAC4 }, 
-	{ 0xC2CD, 0xCACC }, { 0xC2CE, 0xCACD }, { 0xC2CF, 0xCACF }, { 0xC2D0, 0xCAD1 }, { 0xC2D1, 0xCAD3 }, { 0xC2D2, 0xCAD8 }, { 0xC2D3, 0xCAD9 }, { 0xC2D4, 0xCAE0 }, 
-	{ 0xC2D5, 0xCAEC }, { 0xC2D6, 0xCAF4 }, { 0xC2D7, 0xCB08 }, { 0xC2D8, 0xCB10 }, { 0xC2D9, 0xCB14 }, { 0xC2DA, 0xCB18 }, { 0xC2DB, 0xCB20 }, { 0xC2DC, 0xCB21 }, 
-	{ 0xC2DD, 0xCB41 }, { 0xC2DE, 0xCB48 }, { 0xC2DF, 0xCB49 }, { 0xC2E0, 0xCB4C }, { 0xC2E1, 0xCB50 }, { 0xC2E2, 0xCB58 }, { 0xC2E3, 0xCB59 }, { 0xC2E4, 0xCB5D }, 
-	{ 0xC2E5, 0xCB64 }, { 0xC2E6, 0xCB78 }, { 0xC2E7, 0xCB79 }, { 0xC2E8, 0xCB9C }, { 0xC2E9, 0xCBB8 }, { 0xC2EA, 0xCBD4 }, { 0xC2EB, 0xCBE4 }, { 0xC2EC, 0xCBE7 }, 
-	{ 0xC2ED, 0xCBE9 }, { 0xC2EE, 0xCC0C }, { 0xC2EF, 0xCC0D }, { 0xC2F0, 0xCC10 }, { 0xC2F1, 0xCC14 }, { 0xC2F2, 0xCC1C }, { 0xC2F3, 0xCC1D }, { 0xC2F4, 0xCC21 }, 
-	{ 0xC2F5, 0xCC22 }, { 0xC2F6, 0xCC27 }, { 0xC2F7, 0xCC28 }, { 0xC2F8, 0xCC29 }, { 0xC2F9, 0xCC2C }, { 0xC2FA, 0xCC2E }, { 0xC2FB, 0xCC30 }, { 0xC2FC, 0xCC38 }, 
-	{ 0xC2FD, 0xCC39 }, { 0xC2FE, 0xCC3B }, { 0xC3A1, 0xCC3C }, { 0xC3A2, 0xCC3D }, { 0xC3A3, 0xCC3E }, { 0xC3A4, 0xCC44 }, { 0xC3A5, 0xCC45 }, { 0xC3A6, 0xCC48 }, 
-	{ 0xC3A7, 0xCC4C }, { 0xC3A8, 0xCC54 }, { 0xC3A9, 0xCC55 }, { 0xC3AA, 0xCC57 }, { 0xC3AB, 0xCC58 }, { 0xC3AC, 0xCC59 }, { 0xC3AD, 0xCC60 }, { 0xC3AE, 0xCC64 }, 
-	{ 0xC3AF, 0xCC66 }, { 0xC3B0, 0xCC68 }, { 0xC3B1, 0xCC70 }, { 0xC3B2, 0xCC75 }, { 0xC3B3, 0xCC98 }, { 0xC3B4, 0xCC99 }, { 0xC3B5, 0xCC9C }, { 0xC3B6, 0xCCA0 }, 
-	{ 0xC3B7, 0xCCA8 }, { 0xC3B8, 0xCCA9 }, { 0xC3B9, 0xCCAB }, { 0xC3BA, 0xCCAC }, { 0xC3BB, 0xCCAD }, { 0xC3BC, 0xCCB4 }, { 0xC3BD, 0xCCB5 }, { 0xC3BE, 0xCCB8 }, 
-	{ 0xC3BF, 0xCCBC }, { 0xC3C0, 0xCCC4 }, { 0xC3C1, 0xCCC5 }, { 0xC3C2, 0xCCC7 }, { 0xC3C3, 0xCCC9 }, { 0xC3C4, 0xCCD0 }, { 0xC3C5, 0xCCD4 }, { 0xC3C6, 0xCCE4 }, 
-	{ 0xC3C7, 0xCCEC }, { 0xC3C8, 0xCCF0 }, { 0xC3C9, 0xCD01 }, { 0xC3CA, 0xCD08 }, { 0xC3CB, 0xCD09 }, { 0xC3CC, 0xCD0C }, { 0xC3CD, 0xCD10 }, { 0xC3CE, 0xCD18 }, 
-	{ 0xC3CF, 0xCD19 }, { 0xC3D0, 0xCD1B }, { 0xC3D1, 0xCD1D }, { 0xC3D2, 0xCD24 }, { 0xC3D3, 0xCD28 }, { 0xC3D4, 0xCD2C }, { 0xC3D5, 0xCD39 }, { 0xC3D6, 0xCD5C }, 
-	{ 0xC3D7, 0xCD60 }, { 0xC3D8, 0xCD64 }, { 0xC3D9, 0xCD6C }, { 0xC3DA, 0xCD6D }, { 0xC3DB, 0xCD6F }, { 0xC3DC, 0xCD71 }, { 0xC3DD, 0xCD78 }, { 0xC3DE, 0xCD88 }, 
-	{ 0xC3DF, 0xCD94 }, { 0xC3E0, 0xCD95 }, { 0xC3E1, 0xCD98 }, { 0xC3E2, 0xCD9C }, { 0xC3E3, 0xCDA4 }, { 0xC3E4, 0xCDA5 }, { 0xC3E5, 0xCDA7 }, { 0xC3E6, 0xCDA9 }, 
-	{ 0xC3E7, 0xCDB0 }, { 0xC3E8, 0xCDC4 }, { 0xC3E9, 0xCDCC }, { 0xC3EA, 0xCDD0 }, { 0xC3EB, 0xCDE8 }, { 0xC3EC, 0xCDEC }, { 0xC3ED, 0xCDF0 }, { 0xC3EE, 0xCDF8 }, 
-	{ 0xC3EF, 0xCDF9 }, { 0xC3F0, 0xCDFB }, { 0xC3F1, 0xCDFD }, { 0xC3F2, 0xCE04 }, { 0xC3F3, 0xCE08 }, { 0xC3F4, 0xCE0C }, { 0xC3F5, 0xCE14 }, { 0xC3F6, 0xCE19 }, 
-	{ 0xC3F7, 0xCE20 }, { 0xC3F8, 0xCE21 }, { 0xC3F9, 0xCE24 }, { 0xC3FA, 0xCE28 }, { 0xC3FB, 0xCE30 }, { 0xC3FC, 0xCE31 }, { 0xC3FD, 0xCE33 }, { 0xC3FE, 0xCE35 }, 
-	{ 0xC4A1, 0xCE58 }, { 0xC4A2, 0xCE59 }, { 0xC4A3, 0xCE5C }, { 0xC4A4, 0xCE5F }, { 0xC4A5, 0xCE60 }, { 0xC4A6, 0xCE61 }, { 0xC4A7, 0xCE68 }, { 0xC4A8, 0xCE69 }, 
-	{ 0xC4A9, 0xCE6B }, { 0xC4AA, 0xCE6D }, { 0xC4AB, 0xCE74 }, { 0xC4AC, 0xCE75 }, { 0xC4AD, 0xCE78 }, { 0xC4AE, 0xCE7C }, { 0xC4AF, 0xCE84 }, { 0xC4B0, 0xCE85 }, 
-	{ 0xC4B1, 0xCE87 }, { 0xC4B2, 0xCE89 }, { 0xC4B3, 0xCE90 }, { 0xC4B4, 0xCE91 }, { 0xC4B5, 0xCE94 }, { 0xC4B6, 0xCE98 }, { 0xC4B7, 0xCEA0 }, { 0xC4B8, 0xCEA1 }, 
-	{ 0xC4B9, 0xCEA3 }, { 0xC4BA, 0xCEA4 }, { 0xC4BB, 0xCEA5 }, { 0xC4BC, 0xCEAC }, { 0xC4BD, 0xCEAD }, { 0xC4BE, 0xCEC1 }, { 0xC4BF, 0xCEE4 }, { 0xC4C0, 0xCEE5 }, 
-	{ 0xC4C1, 0xCEE8 }, { 0xC4C2, 0xCEEB }, { 0xC4C3, 0xCEEC }, { 0xC4C4, 0xCEF4 }, { 0xC4C5, 0xCEF5 }, { 0xC4C6, 0xCEF7 }, { 0xC4C7, 0xCEF8 }, { 0xC4C8, 0xCEF9 }, 
-	{ 0xC4C9, 0xCF00 }, { 0xC4CA, 0xCF01 }, { 0xC4CB, 0xCF04 }, { 0xC4CC, 0xCF08 }, { 0xC4CD, 0xCF10 }, { 0xC4CE, 0xCF11 }, { 0xC4CF, 0xCF13 }, { 0xC4D0, 0xCF15 }, 
-	{ 0xC4D1, 0xCF1C }, { 0xC4D2, 0xCF20 }, { 0xC4D3, 0xCF24 }, { 0xC4D4, 0xCF2C }, { 0xC4D5, 0xCF2D }, { 0xC4D6, 0xCF2F }, { 0xC4D7, 0xCF30 }, { 0xC4D8, 0xCF31 }, 
-	{ 0xC4D9, 0xCF38 }, { 0xC4DA, 0xCF54 }, { 0xC4DB, 0xCF55 }, { 0xC4DC, 0xCF58 }, { 0xC4DD, 0xCF5C }, { 0xC4DE, 0xCF64 }, { 0xC4DF, 0xCF65 }, { 0xC4E0, 0xCF67 }, 
-	{ 0xC4E1, 0xCF69 }, { 0xC4E2, 0xCF70 }, { 0xC4E3, 0xCF71 }, { 0xC4E4, 0xCF74 }, { 0xC4E5, 0xCF78 }, { 0xC4E6, 0xCF80 }, { 0xC4E7, 0xCF85 }, { 0xC4E8, 0xCF8C }, 
-	{ 0xC4E9, 0xCFA1 }, { 0xC4EA, 0xCFA8 }, { 0xC4EB, 0xCFB0 }, { 0xC4EC, 0xCFC4 }, { 0xC4ED, 0xCFE0 }, { 0xC4EE, 0xCFE1 }, { 0xC4EF, 0xCFE4 }, { 0xC4F0, 0xCFE8 }, 
-	{ 0xC4F1, 0xCFF0 }, { 0xC4F2, 0xCFF1 }, { 0xC4F3, 0xCFF3 }, { 0xC4F4, 0xCFF5 }, { 0xC4F5, 0xCFFC }, { 0xC4F6, 0xD000 }, { 0xC4F7, 0xD004 }, { 0xC4F8, 0xD011 }, 
-	{ 0xC4F9, 0xD018 }, { 0xC4FA, 0xD02D }, { 0xC4FB, 0xD034 }, { 0xC4FC, 0xD035 }, { 0xC4FD, 0xD038 }, { 0xC4FE, 0xD03C }, { 0xC5A1, 0xD044 }, { 0xC5A2, 0xD045 }, 
-	{ 0xC5A3, 0xD047 }, { 0xC5A4, 0xD049 }, { 0xC5A5, 0xD050 }, { 0xC5A6, 0xD054 }, { 0xC5A7, 0xD058 }, { 0xC5A8, 0xD060 }, { 0xC5A9, 0xD06C }, { 0xC5AA, 0xD06D }, 
-	{ 0xC5AB, 0xD070 }, { 0xC5AC, 0xD074 }, { 0xC5AD, 0xD07C }, { 0xC5AE, 0xD07D }, { 0xC5AF, 0xD081 }, { 0xC5B0, 0xD0A4 }, { 0xC5B1, 0xD0A5 }, { 0xC5B2, 0xD0A8 }, 
-	{ 0xC5B3, 0xD0AC }, { 0xC5B4, 0xD0B4 }, { 0xC5B5, 0xD0B5 }, { 0xC5B6, 0xD0B7 }, { 0xC5B7, 0xD0B9 }, { 0xC5B8, 0xD0C0 }, { 0xC5B9, 0xD0C1 }, { 0xC5BA, 0xD0C4 }, 
-	{ 0xC5BB, 0xD0C8 }, { 0xC5BC, 0xD0C9 }, { 0xC5BD, 0xD0D0 }, { 0xC5BE, 0xD0D1 }, { 0xC5BF, 0xD0D3 }, { 0xC5C0, 0xD0D4 }, { 0xC5C1, 0xD0D5 }, { 0xC5C2, 0xD0DC }, 
-	{ 0xC5C3, 0xD0DD }, { 0xC5C4, 0xD0E0 }, { 0xC5C5, 0xD0E4 }, { 0xC5C6, 0xD0EC }, { 0xC5C7, 0xD0ED }, { 0xC5C8, 0xD0EF }, { 0xC5C9, 0xD0F0 }, { 0xC5CA, 0xD0F1 }, 
-	{ 0xC5CB, 0xD0F8 }, { 0xC5CC, 0xD10D }, { 0xC5CD, 0xD130 }, { 0xC5CE, 0xD131 }, { 0xC5CF, 0xD134 }, { 0xC5D0, 0xD138 }, { 0xC5D1, 0xD13A }, { 0xC5D2, 0xD140 }, 
-	{ 0xC5D3, 0xD141 }, { 0xC5D4, 0xD143 }, { 0xC5D5, 0xD144 }, { 0xC5D6, 0xD145 }, { 0xC5D7, 0xD14C }, { 0xC5D8, 0xD14D }, { 0xC5D9, 0xD150 }, { 0xC5DA, 0xD154 }, 
-	{ 0xC5DB, 0xD15C }, { 0xC5DC, 0xD15D }, { 0xC5DD, 0xD15F }, { 0xC5DE, 0xD161 }, { 0xC5DF, 0xD168 }, { 0xC5E0, 0xD16C }, { 0xC5E1, 0xD17C }, { 0xC5E2, 0xD184 }, 
-	{ 0xC5E3, 0xD188 }, { 0xC5E4, 0xD1A0 }, { 0xC5E5, 0xD1A1 }, { 0xC5E6, 0xD1A4 }, { 0xC5E7, 0xD1A8 }, { 0xC5E8, 0xD1B0 }, { 0xC5E9, 0xD1B1 }, { 0xC5EA, 0xD1B3 }, 
-	{ 0xC5EB, 0xD1B5 }, { 0xC5EC, 0xD1BA }, { 0xC5ED, 0xD1BC }, { 0xC5EE, 0xD1C0 }, { 0xC5EF, 0xD1D8 }, { 0xC5F0, 0xD1F4 }, { 0xC5F1, 0xD1F8 }, { 0xC5F2, 0xD207 }, 
-	{ 0xC5F3, 0xD209 }, { 0xC5F4, 0xD210 }, { 0xC5F5, 0xD22C }, { 0xC5F6, 0xD22D }, { 0xC5F7, 0xD230 }, { 0xC5F8, 0xD234 }, { 0xC5F9, 0xD23C }, { 0xC5FA, 0xD23D }, 
-	{ 0xC5FB, 0xD23F }, { 0xC5FC, 0xD241 }, { 0xC5FD, 0xD248 }, { 0xC5FE, 0xD25C }, { 0xC6A1, 0xD264 }, { 0xC6A2, 0xD280 }, { 0xC6A3, 0xD281 }, { 0xC6A4, 0xD284 }, 
-	{ 0xC6A5, 0xD288 }, { 0xC6A6, 0xD290 }, { 0xC6A7, 0xD291 }, { 0xC6A8, 0xD295 }, { 0xC6A9, 0xD29C }, { 0xC6AA, 0xD2A0 }, { 0xC6AB, 0xD2A4 }, { 0xC6AC, 0xD2AC }, 
-	{ 0xC6AD, 0xD2B1 }, { 0xC6AE, 0xD2B8 }, { 0xC6AF, 0xD2B9 }, { 0xC6B0, 0xD2BC }, { 0xC6B1, 0xD2BF }, { 0xC6B2, 0xD2C0 }, { 0xC6B3, 0xD2C2 }, { 0xC6B4, 0xD2C8 }, 
-	{ 0xC6B5, 0xD2C9 }, { 0xC6B6, 0xD2CB }, { 0xC6B7, 0xD2D4 }, { 0xC6B8, 0xD2D8 }, { 0xC6B9, 0xD2DC }, { 0xC6BA, 0xD2E4 }, { 0xC6BB, 0xD2E5 }, { 0xC6BC, 0xD2F0 }, 
-	{ 0xC6BD, 0xD2F1 }, { 0xC6BE, 0xD2F4 }, { 0xC6BF, 0xD2F8 }, { 0xC6C0, 0xD300 }, { 0xC6C1, 0xD301 }, { 0xC6C2, 0xD303 }, { 0xC6C3, 0xD305 }, { 0xC6C4, 0xD30C }, 
-	{ 0xC6C5, 0xD30D }, { 0xC6C6, 0xD30E }, { 0xC6C7, 0xD310 }, { 0xC6C8, 0xD314 }, { 0xC6C9, 0xD316 }, { 0xC6CA, 0xD31C }, { 0xC6CB, 0xD31D }, { 0xC6CC, 0xD31F }, 
-	{ 0xC6CD, 0xD320 }, { 0xC6CE, 0xD321 }, { 0xC6CF, 0xD325 }, { 0xC6D0, 0xD328 }, { 0xC6D1, 0xD329 }, { 0xC6D2, 0xD32C }, { 0xC6D3, 0xD330 }, { 0xC6D4, 0xD338 }, 
-	{ 0xC6D5, 0xD339 }, { 0xC6D6, 0xD33B }, { 0xC6D7, 0xD33C }, { 0xC6D8, 0xD33D }, { 0xC6D9, 0xD344 }, { 0xC6DA, 0xD345 }, { 0xC6DB, 0xD37C }, { 0xC6DC, 0xD37D }, 
-	{ 0xC6DD, 0xD380 }, { 0xC6DE, 0xD384 }, { 0xC6DF, 0xD38C }, { 0xC6E0, 0xD38D }, { 0xC6E1, 0xD38F }, { 0xC6E2, 0xD390 }, { 0xC6E3, 0xD391 }, { 0xC6E4, 0xD398 }, 
-	{ 0xC6E5, 0xD399 }, { 0xC6E6, 0xD39C }, { 0xC6E7, 0xD3A0 }, { 0xC6E8, 0xD3A8 }, { 0xC6E9, 0xD3A9 }, { 0xC6EA, 0xD3AB }, { 0xC6EB, 0xD3AD }, { 0xC6EC, 0xD3B4 }, 
-	{ 0xC6ED, 0xD3B8 }, { 0xC6EE, 0xD3BC }, { 0xC6EF, 0xD3C4 }, { 0xC6F0, 0xD3C5 }, { 0xC6F1, 0xD3C8 }, { 0xC6F2, 0xD3C9 }, { 0xC6F3, 0xD3D0 }, { 0xC6F4, 0xD3D8 }, 
-	{ 0xC6F5, 0xD3E1 }, { 0xC6F6, 0xD3E3 }, { 0xC6F7, 0xD3EC }, { 0xC6F8, 0xD3ED }, { 0xC6F9, 0xD3F0 }, { 0xC6FA, 0xD3F4 }, { 0xC6FB, 0xD3FC }, { 0xC6FC, 0xD3FD }, 
-	{ 0xC6FD, 0xD3FF }, { 0xC6FE, 0xD401 }, { 0xC7A1, 0xD408 }, { 0xC7A2, 0xD41D }, { 0xC7A3, 0xD440 }, { 0xC7A4, 0xD444 }, { 0xC7A5, 0xD45C }, { 0xC7A6, 0xD460 }, 
-	{ 0xC7A7, 0xD464 }, { 0xC7A8, 0xD46D }, { 0xC7A9, 0xD46F }, { 0xC7AA, 0xD478 }, { 0xC7AB, 0xD479 }, { 0xC7AC, 0xD47C }, { 0xC7AD, 0xD47F }, { 0xC7AE, 0xD480 }, 
-	{ 0xC7AF, 0xD482 }, { 0xC7B0, 0xD488 }, { 0xC7B1, 0xD489 }, { 0xC7B2, 0xD48B }, { 0xC7B3, 0xD48D }, { 0xC7B4, 0xD494 }, { 0xC7B5, 0xD4A9 }, { 0xC7B6, 0xD4CC }, 
-	{ 0xC7B7, 0xD4D0 }, { 0xC7B8, 0xD4D4 }, { 0xC7B9, 0xD4DC }, { 0xC7BA, 0xD4DF }, { 0xC7BB, 0xD4E8 }, { 0xC7BC, 0xD4EC }, { 0xC7BD, 0xD4F0 }, { 0xC7BE, 0xD4F8 }, 
-	{ 0xC7BF, 0xD4FB }, { 0xC7C0, 0xD4FD }, { 0xC7C1, 0xD504 }, { 0xC7C2, 0xD508 }, { 0xC7C3, 0xD50C }, { 0xC7C4, 0xD514 }, { 0xC7C5, 0xD515 }, { 0xC7C6, 0xD517 }, 
-	{ 0xC7C7, 0xD53C }, { 0xC7C8, 0xD53D }, { 0xC7C9, 0xD540 }, { 0xC7CA, 0xD544 }, { 0xC7CB, 0xD54C }, { 0xC7CC, 0xD54D }, { 0xC7CD, 0xD54F }, { 0xC7CE, 0xD551 }, 
-	{ 0xC7CF, 0xD558 }, { 0xC7D0, 0xD559 }, { 0xC7D1, 0xD55C }, { 0xC7D2, 0xD560 }, { 0xC7D3, 0xD565 }, { 0xC7D4, 0xD568 }, { 0xC7D5, 0xD569 }, { 0xC7D6, 0xD56B }, 
-	{ 0xC7D7, 0xD56D }, { 0xC7D8, 0xD574 }, { 0xC7D9, 0xD575 }, { 0xC7DA, 0xD578 }, { 0xC7DB, 0xD57C }, { 0xC7DC, 0xD584 }, { 0xC7DD, 0xD585 }, { 0xC7DE, 0xD587 }, 
-	{ 0xC7DF, 0xD588 }, { 0xC7E0, 0xD589 }, { 0xC7E1, 0xD590 }, { 0xC7E2, 0xD5A5 }, { 0xC7E3, 0xD5C8 }, { 0xC7E4, 0xD5C9 }, { 0xC7E5, 0xD5CC }, { 0xC7E6, 0xD5D0 }, 
-	{ 0xC7E7, 0xD5D2 }, { 0xC7E8, 0xD5D8 }, { 0xC7E9, 0xD5D9 }, { 0xC7EA, 0xD5DB }, { 0xC7EB, 0xD5DD }, { 0xC7EC, 0xD5E4 }, { 0xC7ED, 0xD5E5 }, { 0xC7EE, 0xD5E8 }, 
-	{ 0xC7EF, 0xD5EC }, { 0xC7F0, 0xD5F4 }, { 0xC7F1, 0xD5F5 }, { 0xC7F2, 0xD5F7 }, { 0xC7F3, 0xD5F9 }, { 0xC7F4, 0xD600 }, { 0xC7F5, 0xD601 }, { 0xC7F6, 0xD604 }, 
-	{ 0xC7F7, 0xD608 }, { 0xC7F8, 0xD610 }, { 0xC7F9, 0xD611 }, { 0xC7FA, 0xD613 }, { 0xC7FB, 0xD614 }, { 0xC7FC, 0xD615 }, { 0xC7FD, 0xD61C }, { 0xC7FE, 0xD620 }, 
-	{ 0xC8A1, 0xD624 }, { 0xC8A2, 0xD62D }, { 0xC8A3, 0xD638 }, { 0xC8A4, 0xD639 }, { 0xC8A5, 0xD63C }, { 0xC8A6, 0xD640 }, { 0xC8A7, 0xD645 }, { 0xC8A8, 0xD648 }, 
-	{ 0xC8A9, 0xD649 }, { 0xC8AA, 0xD64B }, { 0xC8AB, 0xD64D }, { 0xC8AC, 0xD651 }, { 0xC8AD, 0xD654 }, { 0xC8AE, 0xD655 }, { 0xC8AF, 0xD658 }, { 0xC8B0, 0xD65C }, 
-	{ 0xC8B1, 0xD667 }, { 0xC8B2, 0xD669 }, { 0xC8B3, 0xD670 }, { 0xC8B4, 0xD671 }, { 0xC8B5, 0xD674 }, { 0xC8B6, 0xD683 }, { 0xC8B7, 0xD685 }, { 0xC8B8, 0xD68C }, 
-	{ 0xC8B9, 0xD68D }, { 0xC8BA, 0xD690 }, { 0xC8BB, 0xD694 }, { 0xC8BC, 0xD69D }, { 0xC8BD, 0xD69F }, { 0xC8BE, 0xD6A1 }, { 0xC8BF, 0xD6A8 }, { 0xC8C0, 0xD6AC }, 
-	{ 0xC8C1, 0xD6B0 }, { 0xC8C2, 0xD6B9 }, { 0xC8C3, 0xD6BB }, { 0xC8C4, 0xD6C4 }, { 0xC8C5, 0xD6C5 }, { 0xC8C6, 0xD6C8 }, { 0xC8C7, 0xD6CC }, { 0xC8C8, 0xD6D1 }, 
-	{ 0xC8C9, 0xD6D4 }, { 0xC8CA, 0xD6D7 }, { 0xC8CB, 0xD6D9 }, { 0xC8CC, 0xD6E0 }, { 0xC8CD, 0xD6E4 }, { 0xC8CE, 0xD6E8 }, { 0xC8CF, 0xD6F0 }, { 0xC8D0, 0xD6F5 }, 
-	{ 0xC8D1, 0xD6FC }, { 0xC8D2, 0xD6FD }, { 0xC8D3, 0xD700 }, { 0xC8D4, 0xD704 }, { 0xC8D5, 0xD711 }, { 0xC8D6, 0xD718 }, { 0xC8D7, 0xD719 }, { 0xC8D8, 0xD71C }, 
-	{ 0xC8D9, 0xD720 }, { 0xC8DA, 0xD728 }, { 0xC8DB, 0xD729 }, { 0xC8DC, 0xD72B }, { 0xC8DD, 0xD72D }, { 0xC8DE, 0xD734 }, { 0xC8DF, 0xD735 }, { 0xC8E0, 0xD738 }, 
-	{ 0xC8E1, 0xD73C }, { 0xC8E2, 0xD744 }, { 0xC8E3, 0xD747 }, { 0xC8E4, 0xD749 }, { 0xC8E5, 0xD750 }, { 0xC8E6, 0xD751 }, { 0xC8E7, 0xD754 }, { 0xC8E8, 0xD756 }, 
-	{ 0xC8E9, 0xD757 }, { 0xC8EA, 0xD758 }, { 0xC8EB, 0xD759 }, { 0xC8EC, 0xD760 }, { 0xC8ED, 0xD761 }, { 0xC8EE, 0xD763 }, { 0xC8EF, 0xD765 }, { 0xC8F0, 0xD769 }, 
-	{ 0xC8F1, 0xD76C }, { 0xC8F2, 0xD770 }, { 0xC8F3, 0xD774 }, { 0xC8F4, 0xD77C }, { 0xC8F5, 0xD77D }, { 0xC8F6, 0xD781 }, { 0xC8F7, 0xD788 }, { 0xC8F8, 0xD789 }, 
-	{ 0xC8F9, 0xD78C }, { 0xC8FA, 0xD790 }, { 0xC8FB, 0xD798 }, { 0xC8FC, 0xD799 }, { 0xC8FD, 0xD79B }, { 0xC8FE, 0xD79D }, { 0xCAA1, 0x4F3D }, { 0xCAA2, 0x4F73 }, 
-	{ 0xCAA3, 0x5047 }, { 0xCAA4, 0x50F9 }, { 0xCAA5, 0x52A0 }, { 0xCAA6, 0x53EF }, { 0xCAA7, 0x5475 }, { 0xCAA8, 0x54E5 }, { 0xCAA9, 0x5609 }, { 0xCAAA, 0x5AC1 }, 
-	{ 0xCAAB, 0x5BB6 }, { 0xCAAC, 0x6687 }, { 0xCAAD, 0x67B6 }, { 0xCAAE, 0x67B7 }, { 0xCAAF, 0x67EF }, { 0xCAB0, 0x6B4C }, { 0xCAB1, 0x73C2 }, { 0xCAB2, 0x75C2 }, 
-	{ 0xCAB3, 0x7A3C }, { 0xCAB4, 0x82DB }, { 0xCAB5, 0x8304 }, { 0xCAB6, 0x8857 }, { 0xCAB7, 0x8888 }, { 0xCAB8, 0x8A36 }, { 0xCAB9, 0x8CC8 }, { 0xCABA, 0x8DCF }, 
-	{ 0xCABB, 0x8EFB }, { 0xCABC, 0x8FE6 }, { 0xCABD, 0x99D5 }, { 0xCABE, 0x523B }, { 0xCABF, 0x5374 }, { 0xCAC0, 0x5404 }, { 0xCAC1, 0x606A }, { 0xCAC2, 0x6164 }, 
-	{ 0xCAC3, 0x6BBC }, { 0xCAC4, 0x73CF }, { 0xCAC5, 0x811A }, { 0xCAC6, 0x89BA }, { 0xCAC7, 0x89D2 }, { 0xCAC8, 0x95A3 }, { 0xCAC9, 0x4F83 }, { 0xCACA, 0x520A }, 
-	{ 0xCACB, 0x58BE }, { 0xCACC, 0x5978 }, { 0xCACD, 0x59E6 }, { 0xCACE, 0x5E72 }, { 0xCACF, 0x5E79 }, { 0xCAD0, 0x61C7 }, { 0xCAD1, 0x63C0 }, { 0xCAD2, 0x6746 }, 
-	{ 0xCAD3, 0x67EC }, { 0xCAD4, 0x687F }, { 0xCAD5, 0x6F97 }, { 0xCAD6, 0x764E }, { 0xCAD7, 0x770B }, { 0xCAD8, 0x78F5 }, { 0xCAD9, 0x7A08 }, { 0xCADA, 0x7AFF }, 
-	{ 0xCADB, 0x7C21 }, { 0xCADC, 0x809D }, { 0xCADD, 0x826E }, { 0xCADE, 0x8271 }, { 0xCADF, 0x8AEB }, { 0xCAE0, 0x9593 }, { 0xCAE1, 0x4E6B }, { 0xCAE2, 0x559D }, 
-	{ 0xCAE3, 0x66F7 }, { 0xCAE4, 0x6E34 }, { 0xCAE5, 0x78A3 }, { 0xCAE6, 0x7AED }, { 0xCAE7, 0x845B }, { 0xCAE8, 0x8910 }, { 0xCAE9, 0x874E }, { 0xCAEA, 0x97A8 }, 
-	{ 0xCAEB, 0x52D8 }, { 0xCAEC, 0x574E }, { 0xCAED, 0x582A }, { 0xCAEE, 0x5D4C }, { 0xCAEF, 0x611F }, { 0xCAF0, 0x61BE }, { 0xCAF1, 0x6221 }, { 0xCAF2, 0x6562 }, 
-	{ 0xCAF3, 0x67D1 }, { 0xCAF4, 0x6A44 }, { 0xCAF5, 0x6E1B }, { 0xCAF6, 0x7518 }, { 0xCAF7, 0x75B3 }, { 0xCAF8, 0x76E3 }, { 0xCAF9, 0x77B0 }, { 0xCAFA, 0x7D3A }, 
-	{ 0xCAFB, 0x90AF }, { 0xCAFC, 0x9451 }, { 0xCAFD, 0x9452 }, { 0xCAFE, 0x9F95 }, { 0xCBA1, 0x5323 }, { 0xCBA2, 0x5CAC }, { 0xCBA3, 0x7532 }, { 0xCBA4, 0x80DB }, 
-	{ 0xCBA5, 0x9240 }, { 0xCBA6, 0x9598 }, { 0xCBA7, 0x525B }, { 0xCBA8, 0x5808 }, { 0xCBA9, 0x59DC }, { 0xCBAA, 0x5CA1 }, { 0xCBAB, 0x5D17 }, { 0xCBAC, 0x5EB7 }, 
-	{ 0xCBAD, 0x5F3A }, { 0xCBAE, 0x5F4A }, { 0xCBAF, 0x6177 }, { 0xCBB0, 0x6C5F }, { 0xCBB1, 0x757A }, { 0xCBB2, 0x7586 }, { 0xCBB3, 0x7CE0 }, { 0xCBB4, 0x7D73 }, 
-	{ 0xCBB5, 0x7DB1 }, { 0xCBB6, 0x7F8C }, { 0xCBB7, 0x8154 }, { 0xCBB8, 0x8221 }, { 0xCBB9, 0x8591 }, { 0xCBBA, 0x8941 }, { 0xCBBB, 0x8B1B }, { 0xCBBC, 0x92FC }, 
-	{ 0xCBBD, 0x964D }, { 0xCBBE, 0x9C47 }, { 0xCBBF, 0x4ECB }, { 0xCBC0, 0x4EF7 }, { 0xCBC1, 0x500B }, { 0xCBC2, 0x51F1 }, { 0xCBC3, 0x584F }, { 0xCBC4, 0x6137 }, 
-	{ 0xCBC5, 0x613E }, { 0xCBC6, 0x6168 }, { 0xCBC7, 0x6539 }, { 0xCBC8, 0x69EA }, { 0xCBC9, 0x6F11 }, { 0xCBCA, 0x75A5 }, { 0xCBCB, 0x7686 }, { 0xCBCC, 0x76D6 }, 
-	{ 0xCBCD, 0x7B87 }, { 0xCBCE, 0x82A5 }, { 0xCBCF, 0x84CB }, { 0xCBD0, 0xF900 }, { 0xCBD1, 0x93A7 }, { 0xCBD2, 0x958B }, { 0xCBD3, 0x5580 }, { 0xCBD4, 0x5BA2 }, 
-	{ 0xCBD5, 0x5751 }, { 0xCBD6, 0xF901 }, { 0xCBD7, 0x7CB3 }, { 0xCBD8, 0x7FB9 }, { 0xCBD9, 0x91B5 }, { 0xCBDA, 0x5028 }, { 0xCBDB, 0x53BB }, { 0xCBDC, 0x5C45 }, 
-	{ 0xCBDD, 0x5DE8 }, { 0xCBDE, 0x62D2 }, { 0xCBDF, 0x636E }, { 0xCBE0, 0x64DA }, { 0xCBE1, 0x64E7 }, { 0xCBE2, 0x6E20 }, { 0xCBE3, 0x70AC }, { 0xCBE4, 0x795B }, 
-	{ 0xCBE5, 0x8DDD }, { 0xCBE6, 0x8E1E }, { 0xCBE7, 0xF902 }, { 0xCBE8, 0x907D }, { 0xCBE9, 0x9245 }, { 0xCBEA, 0x92F8 }, { 0xCBEB, 0x4E7E }, { 0xCBEC, 0x4EF6 }, 
-	{ 0xCBED, 0x5065 }, { 0xCBEE, 0x5DFE }, { 0xCBEF, 0x5EFA }, { 0xCBF0, 0x6106 }, { 0xCBF1, 0x6957 }, { 0xCBF2, 0x8171 }, { 0xCBF3, 0x8654 }, { 0xCBF4, 0x8E47 }, 
-	{ 0xCBF5, 0x9375 }, { 0xCBF6, 0x9A2B }, { 0xCBF7, 0x4E5E }, { 0xCBF8, 0x5091 }, { 0xCBF9, 0x6770 }, { 0xCBFA, 0x6840 }, { 0xCBFB, 0x5109 }, { 0xCBFC, 0x528D }, 
-	{ 0xCBFD, 0x5292 }, { 0xCBFE, 0x6AA2 }, { 0xCCA1, 0x77BC }, { 0xCCA2, 0x9210 }, { 0xCCA3, 0x9ED4 }, { 0xCCA4, 0x52AB }, { 0xCCA5, 0x602F }, { 0xCCA6, 0x8FF2 }, 
-	{ 0xCCA7, 0x5048 }, { 0xCCA8, 0x61A9 }, { 0xCCA9, 0x63ED }, { 0xCCAA, 0x64CA }, { 0xCCAB, 0x683C }, { 0xCCAC, 0x6A84 }, { 0xCCAD, 0x6FC0 }, { 0xCCAE, 0x8188 }, 
-	{ 0xCCAF, 0x89A1 }, { 0xCCB0, 0x9694 }, { 0xCCB1, 0x5805 }, { 0xCCB2, 0x727D }, { 0xCCB3, 0x72AC }, { 0xCCB4, 0x7504 }, { 0xCCB5, 0x7D79 }, { 0xCCB6, 0x7E6D }, 
-	{ 0xCCB7, 0x80A9 }, { 0xCCB8, 0x898B }, { 0xCCB9, 0x8B74 }, { 0xCCBA, 0x9063 }, { 0xCCBB, 0x9D51 }, { 0xCCBC, 0x6289 }, { 0xCCBD, 0x6C7A }, { 0xCCBE, 0x6F54 }, 
-	{ 0xCCBF, 0x7D50 }, { 0xCCC0, 0x7F3A }, { 0xCCC1, 0x8A23 }, { 0xCCC2, 0x517C }, { 0xCCC3, 0x614A }, { 0xCCC4, 0x7B9D }, { 0xCCC5, 0x8B19 }, { 0xCCC6, 0x9257 }, 
-	{ 0xCCC7, 0x938C }, { 0xCCC8, 0x4EAC }, { 0xCCC9, 0x4FD3 }, { 0xCCCA, 0x501E }, { 0xCCCB, 0x50BE }, { 0xCCCC, 0x5106 }, { 0xCCCD, 0x52C1 }, { 0xCCCE, 0x52CD }, 
-	{ 0xCCCF, 0x537F }, { 0xCCD0, 0x5770 }, { 0xCCD1, 0x5883 }, { 0xCCD2, 0x5E9A }, { 0xCCD3, 0x5F91 }, { 0xCCD4, 0x6176 }, { 0xCCD5, 0x61AC }, { 0xCCD6, 0x64CE }, 
-	{ 0xCCD7, 0x656C }, { 0xCCD8, 0x666F }, { 0xCCD9, 0x66BB }, { 0xCCDA, 0x66F4 }, { 0xCCDB, 0x6897 }, { 0xCCDC, 0x6D87 }, { 0xCCDD, 0x7085 }, { 0xCCDE, 0x70F1 }, 
-	{ 0xCCDF, 0x749F }, { 0xCCE0, 0x74A5 }, { 0xCCE1, 0x74CA }, { 0xCCE2, 0x75D9 }, { 0xCCE3, 0x786C }, { 0xCCE4, 0x78EC }, { 0xCCE5, 0x7ADF }, { 0xCCE6, 0x7AF6 }, 
-	{ 0xCCE7, 0x7D45 }, { 0xCCE8, 0x7D93 }, { 0xCCE9, 0x8015 }, { 0xCCEA, 0x803F }, { 0xCCEB, 0x811B }, { 0xCCEC, 0x8396 }, { 0xCCED, 0x8B66 }, { 0xCCEE, 0x8F15 }, 
-	{ 0xCCEF, 0x9015 }, { 0xCCF0, 0x93E1 }, { 0xCCF1, 0x9803 }, { 0xCCF2, 0x9838 }, { 0xCCF3, 0x9A5A }, { 0xCCF4, 0x9BE8 }, { 0xCCF5, 0x4FC2 }, { 0xCCF6, 0x5553 }, 
-	{ 0xCCF7, 0x583A }, { 0xCCF8, 0x5951 }, { 0xCCF9, 0x5B63 }, { 0xCCFA, 0x5C46 }, { 0xCCFB, 0x60B8 }, { 0xCCFC, 0x6212 }, { 0xCCFD, 0x6842 }, { 0xCCFE, 0x68B0 }, 
-	{ 0xCDA1, 0x68E8 }, { 0xCDA2, 0x6EAA }, { 0xCDA3, 0x754C }, { 0xCDA4, 0x7678 }, { 0xCDA5, 0x78CE }, { 0xCDA6, 0x7A3D }, { 0xCDA7, 0x7CFB }, { 0xCDA8, 0x7E6B }, 
-	{ 0xCDA9, 0x7E7C }, { 0xCDAA, 0x8A08 }, { 0xCDAB, 0x8AA1 }, { 0xCDAC, 0x8C3F }, { 0xCDAD, 0x968E }, { 0xCDAE, 0x9DC4 }, { 0xCDAF, 0x53E4 }, { 0xCDB0, 0x53E9 }, 
-	{ 0xCDB1, 0x544A }, { 0xCDB2, 0x5471 }, { 0xCDB3, 0x56FA }, { 0xCDB4, 0x59D1 }, { 0xCDB5, 0x5B64 }, { 0xCDB6, 0x5C3B }, { 0xCDB7, 0x5EAB }, { 0xCDB8, 0x62F7 }, 
-	{ 0xCDB9, 0x6537 }, { 0xCDBA, 0x6545 }, { 0xCDBB, 0x6572 }, { 0xCDBC, 0x66A0 }, { 0xCDBD, 0x67AF }, { 0xCDBE, 0x69C1 }, { 0xCDBF, 0x6CBD }, { 0xCDC0, 0x75FC }, 
-	{ 0xCDC1, 0x7690 }, { 0xCDC2, 0x777E }, { 0xCDC3, 0x7A3F }, { 0xCDC4, 0x7F94 }, { 0xCDC5, 0x8003 }, { 0xCDC6, 0x80A1 }, { 0xCDC7, 0x818F }, { 0xCDC8, 0x82E6 }, 
-	{ 0xCDC9, 0x82FD }, { 0xCDCA, 0x83F0 }, { 0xCDCB, 0x85C1 }, { 0xCDCC, 0x8831 }, { 0xCDCD, 0x88B4 }, { 0xCDCE, 0x8AA5 }, { 0xCDCF, 0xF903 }, { 0xCDD0, 0x8F9C }, 
-	{ 0xCDD1, 0x932E }, { 0xCDD2, 0x96C7 }, { 0xCDD3, 0x9867 }, { 0xCDD4, 0x9AD8 }, { 0xCDD5, 0x9F13 }, { 0xCDD6, 0x54ED }, { 0xCDD7, 0x659B }, { 0xCDD8, 0x66F2 }, 
-	{ 0xCDD9, 0x688F }, { 0xCDDA, 0x7A40 }, { 0xCDDB, 0x8C37 }, { 0xCDDC, 0x9D60 }, { 0xCDDD, 0x56F0 }, { 0xCDDE, 0x5764 }, { 0xCDDF, 0x5D11 }, { 0xCDE0, 0x6606 }, 
-	{ 0xCDE1, 0x68B1 }, { 0xCDE2, 0x68CD }, { 0xCDE3, 0x6EFE }, { 0xCDE4, 0x7428 }, { 0xCDE5, 0x889E }, { 0xCDE6, 0x9BE4 }, { 0xCDE7, 0x6C68 }, { 0xCDE8, 0xF904 }, 
-	{ 0xCDE9, 0x9AA8 }, { 0xCDEA, 0x4F9B }, { 0xCDEB, 0x516C }, { 0xCDEC, 0x5171 }, { 0xCDED, 0x529F }, { 0xCDEE, 0x5B54 }, { 0xCDEF, 0x5DE5 }, { 0xCDF0, 0x6050 }, 
-	{ 0xCDF1, 0x606D }, { 0xCDF2, 0x62F1 }, { 0xCDF3, 0x63A7 }, { 0xCDF4, 0x653B }, { 0xCDF5, 0x73D9 }, { 0xCDF6, 0x7A7A }, { 0xCDF7, 0x86A3 }, { 0xCDF8, 0x8CA2 }, 
-	{ 0xCDF9, 0x978F }, { 0xCDFA, 0x4E32 }, { 0xCDFB, 0x5BE1 }, { 0xCDFC, 0x6208 }, { 0xCDFD, 0x679C }, { 0xCDFE, 0x74DC }, { 0xCEA1, 0x79D1 }, { 0xCEA2, 0x83D3 }, 
-	{ 0xCEA3, 0x8A87 }, { 0xCEA4, 0x8AB2 }, { 0xCEA5, 0x8DE8 }, { 0xCEA6, 0x904E }, { 0xCEA7, 0x934B }, { 0xCEA8, 0x9846 }, { 0xCEA9, 0x5ED3 }, { 0xCEAA, 0x69E8 }, 
-	{ 0xCEAB, 0x85FF }, { 0xCEAC, 0x90ED }, { 0xCEAD, 0xF905 }, { 0xCEAE, 0x51A0 }, { 0xCEAF, 0x5B98 }, { 0xCEB0, 0x5BEC }, { 0xCEB1, 0x6163 }, { 0xCEB2, 0x68FA }, 
-	{ 0xCEB3, 0x6B3E }, { 0xCEB4, 0x704C }, { 0xCEB5, 0x742F }, { 0xCEB6, 0x74D8 }, { 0xCEB7, 0x7BA1 }, { 0xCEB8, 0x7F50 }, { 0xCEB9, 0x83C5 }, { 0xCEBA, 0x89C0 }, 
-	{ 0xCEBB, 0x8CAB }, { 0xCEBC, 0x95DC }, { 0xCEBD, 0x9928 }, { 0xCEBE, 0x522E }, { 0xCEBF, 0x605D }, { 0xCEC0, 0x62EC }, { 0xCEC1, 0x9002 }, { 0xCEC2, 0x4F8A }, 
-	{ 0xCEC3, 0x5149 }, { 0xCEC4, 0x5321 }, { 0xCEC5, 0x58D9 }, { 0xCEC6, 0x5EE3 }, { 0xCEC7, 0x66E0 }, { 0xCEC8, 0x6D38 }, { 0xCEC9, 0x709A }, { 0xCECA, 0x72C2 }, 
-	{ 0xCECB, 0x73D6 }, { 0xCECC, 0x7B50 }, { 0xCECD, 0x80F1 }, { 0xCECE, 0x945B }, { 0xCECF, 0x5366 }, { 0xCED0, 0x639B }, { 0xCED1, 0x7F6B }, { 0xCED2, 0x4E56 }, 
-	{ 0xCED3, 0x5080 }, { 0xCED4, 0x584A }, { 0xCED5, 0x58DE }, { 0xCED6, 0x602A }, { 0xCED7, 0x6127 }, { 0xCED8, 0x62D0 }, { 0xCED9, 0x69D0 }, { 0xCEDA, 0x9B41 }, 
-	{ 0xCEDB, 0x5B8F }, { 0xCEDC, 0x7D18 }, { 0xCEDD, 0x80B1 }, { 0xCEDE, 0x8F5F }, { 0xCEDF, 0x4EA4 }, { 0xCEE0, 0x50D1 }, { 0xCEE1, 0x54AC }, { 0xCEE2, 0x55AC }, 
-	{ 0xCEE3, 0x5B0C }, { 0xCEE4, 0x5DA0 }, { 0xCEE5, 0x5DE7 }, { 0xCEE6, 0x652A }, { 0xCEE7, 0x654E }, { 0xCEE8, 0x6821 }, { 0xCEE9, 0x6A4B }, { 0xCEEA, 0x72E1 }, 
-	{ 0xCEEB, 0x768E }, { 0xCEEC, 0x77EF }, { 0xCEED, 0x7D5E }, { 0xCEEE, 0x7FF9 }, { 0xCEEF, 0x81A0 }, { 0xCEF0, 0x854E }, { 0xCEF1, 0x86DF }, { 0xCEF2, 0x8F03 }, 
-	{ 0xCEF3, 0x8F4E }, { 0xCEF4, 0x90CA }, { 0xCEF5, 0x9903 }, { 0xCEF6, 0x9A55 }, { 0xCEF7, 0x9BAB }, { 0xCEF8, 0x4E18 }, { 0xCEF9, 0x4E45 }, { 0xCEFA, 0x4E5D }, 
-	{ 0xCEFB, 0x4EC7 }, { 0xCEFC, 0x4FF1 }, { 0xCEFD, 0x5177 }, { 0xCEFE, 0x52FE }, { 0xCFA1, 0x5340 }, { 0xCFA2, 0x53E3 }, { 0xCFA3, 0x53E5 }, { 0xCFA4, 0x548E }, 
-	{ 0xCFA5, 0x5614 }, { 0xCFA6, 0x5775 }, { 0xCFA7, 0x57A2 }, { 0xCFA8, 0x5BC7 }, { 0xCFA9, 0x5D87 }, { 0xCFAA, 0x5ED0 }, { 0xCFAB, 0x61FC }, { 0xCFAC, 0x62D8 }, 
-	{ 0xCFAD, 0x6551 }, { 0xCFAE, 0x67B8 }, { 0xCFAF, 0x67E9 }, { 0xCFB0, 0x69CB }, { 0xCFB1, 0x6B50 }, { 0xCFB2, 0x6BC6 }, { 0xCFB3, 0x6BEC }, { 0xCFB4, 0x6C42 }, 
-	{ 0xCFB5, 0x6E9D }, { 0xCFB6, 0x7078 }, { 0xCFB7, 0x72D7 }, { 0xCFB8, 0x7396 }, { 0xCFB9, 0x7403 }, { 0xCFBA, 0x77BF }, { 0xCFBB, 0x77E9 }, { 0xCFBC, 0x7A76 }, 
-	{ 0xCFBD, 0x7D7F }, { 0xCFBE, 0x8009 }, { 0xCFBF, 0x81FC }, { 0xCFC0, 0x8205 }, { 0xCFC1, 0x820A }, { 0xCFC2, 0x82DF }, { 0xCFC3, 0x8862 }, { 0xCFC4, 0x8B33 }, 
-	{ 0xCFC5, 0x8CFC }, { 0xCFC6, 0x8EC0 }, { 0xCFC7, 0x9011 }, { 0xCFC8, 0x90B1 }, { 0xCFC9, 0x9264 }, { 0xCFCA, 0x92B6 }, { 0xCFCB, 0x99D2 }, { 0xCFCC, 0x9A45 }, 
-	{ 0xCFCD, 0x9CE9 }, { 0xCFCE, 0x9DD7 }, { 0xCFCF, 0x9F9C }, { 0xCFD0, 0x570B }, { 0xCFD1, 0x5C40 }, { 0xCFD2, 0x83CA }, { 0xCFD3, 0x97A0 }, { 0xCFD4, 0x97AB }, 
-	{ 0xCFD5, 0x9EB4 }, { 0xCFD6, 0x541B }, { 0xCFD7, 0x7A98 }, { 0xCFD8, 0x7FA4 }, { 0xCFD9, 0x88D9 }, { 0xCFDA, 0x8ECD }, { 0xCFDB, 0x90E1 }, { 0xCFDC, 0x5800 }, 
-	{ 0xCFDD, 0x5C48 }, { 0xCFDE, 0x6398 }, { 0xCFDF, 0x7A9F }, { 0xCFE0, 0x5BAE }, { 0xCFE1, 0x5F13 }, { 0xCFE2, 0x7A79 }, { 0xCFE3, 0x7AAE }, { 0xCFE4, 0x828E }, 
-	{ 0xCFE5, 0x8EAC }, { 0xCFE6, 0x5026 }, { 0xCFE7, 0x5238 }, { 0xCFE8, 0x52F8 }, { 0xCFE9, 0x5377 }, { 0xCFEA, 0x5708 }, { 0xCFEB, 0x62F3 }, { 0xCFEC, 0x6372 }, 
-	{ 0xCFED, 0x6B0A }, { 0xCFEE, 0x6DC3 }, { 0xCFEF, 0x7737 }, { 0xCFF0, 0x53A5 }, { 0xCFF1, 0x7357 }, { 0xCFF2, 0x8568 }, { 0xCFF3, 0x8E76 }, { 0xCFF4, 0x95D5 }, 
-	{ 0xCFF5, 0x673A }, { 0xCFF6, 0x6AC3 }, { 0xCFF7, 0x6F70 }, { 0xCFF8, 0x8A6D }, { 0xCFF9, 0x8ECC }, { 0xCFFA, 0x994B }, { 0xCFFB, 0xF906 }, { 0xCFFC, 0x6677 }, 
-	{ 0xCFFD, 0x6B78 }, { 0xCFFE, 0x8CB4 }, { 0xD0A1, 0x9B3C }, { 0xD0A2, 0xF907 }, { 0xD0A3, 0x53EB }, { 0xD0A4, 0x572D }, { 0xD0A5, 0x594E }, { 0xD0A6, 0x63C6 }, 
-	{ 0xD0A7, 0x69FB }, { 0xD0A8, 0x73EA }, { 0xD0A9, 0x7845 }, { 0xD0AA, 0x7ABA }, { 0xD0AB, 0x7AC5 }, { 0xD0AC, 0x7CFE }, { 0xD0AD, 0x8475 }, { 0xD0AE, 0x898F }, 
-	{ 0xD0AF, 0x8D73 }, { 0xD0B0, 0x9035 }, { 0xD0B1, 0x95A8 }, { 0xD0B2, 0x52FB }, { 0xD0B3, 0x5747 }, { 0xD0B4, 0x7547 }, { 0xD0B5, 0x7B60 }, { 0xD0B6, 0x83CC }, 
-	{ 0xD0B7, 0x921E }, { 0xD0B8, 0xF908 }, { 0xD0B9, 0x6A58 }, { 0xD0BA, 0x514B }, { 0xD0BB, 0x524B }, { 0xD0BC, 0x5287 }, { 0xD0BD, 0x621F }, { 0xD0BE, 0x68D8 }, 
-	{ 0xD0BF, 0x6975 }, { 0xD0C0, 0x9699 }, { 0xD0C1, 0x50C5 }, { 0xD0C2, 0x52A4 }, { 0xD0C3, 0x52E4 }, { 0xD0C4, 0x61C3 }, { 0xD0C5, 0x65A4 }, { 0xD0C6, 0x6839 }, 
-	{ 0xD0C7, 0x69FF }, { 0xD0C8, 0x747E }, { 0xD0C9, 0x7B4B }, { 0xD0CA, 0x82B9 }, { 0xD0CB, 0x83EB }, { 0xD0CC, 0x89B2 }, { 0xD0CD, 0x8B39 }, { 0xD0CE, 0x8FD1 }, 
-	{ 0xD0CF, 0x9949 }, { 0xD0D0, 0xF909 }, { 0xD0D1, 0x4ECA }, { 0xD0D2, 0x5997 }, { 0xD0D3, 0x64D2 }, { 0xD0D4, 0x6611 }, { 0xD0D5, 0x6A8E }, { 0xD0D6, 0x7434 }, 
-	{ 0xD0D7, 0x7981 }, { 0xD0D8, 0x79BD }, { 0xD0D9, 0x82A9 }, { 0xD0DA, 0x887E }, { 0xD0DB, 0x887F }, { 0xD0DC, 0x895F }, { 0xD0DD, 0xF90A }, { 0xD0DE, 0x9326 }, 
-	{ 0xD0DF, 0x4F0B }, { 0xD0E0, 0x53CA }, { 0xD0E1, 0x6025 }, { 0xD0E2, 0x6271 }, { 0xD0E3, 0x6C72 }, { 0xD0E4, 0x7D1A }, { 0xD0E5, 0x7D66 }, { 0xD0E6, 0x4E98 }, 
-	{ 0xD0E7, 0x5162 }, { 0xD0E8, 0x77DC }, { 0xD0E9, 0x80AF }, { 0xD0EA, 0x4F01 }, { 0xD0EB, 0x4F0E }, { 0xD0EC, 0x5176 }, { 0xD0ED, 0x5180 }, { 0xD0EE, 0x55DC }, 
-	{ 0xD0EF, 0x5668 }, { 0xD0F0, 0x573B }, { 0xD0F1, 0x57FA }, { 0xD0F2, 0x57FC }, { 0xD0F3, 0x5914 }, { 0xD0F4, 0x5947 }, { 0xD0F5, 0x5993 }, { 0xD0F6, 0x5BC4 }, 
-	{ 0xD0F7, 0x5C90 }, { 0xD0F8, 0x5D0E }, { 0xD0F9, 0x5DF1 }, { 0xD0FA, 0x5E7E }, { 0xD0FB, 0x5FCC }, { 0xD0FC, 0x6280 }, { 0xD0FD, 0x65D7 }, { 0xD0FE, 0x65E3 }, 
-	{ 0xD1A1, 0x671E }, { 0xD1A2, 0x671F }, { 0xD1A3, 0x675E }, { 0xD1A4, 0x68CB }, { 0xD1A5, 0x68C4 }, { 0xD1A6, 0x6A5F }, { 0xD1A7, 0x6B3A }, { 0xD1A8, 0x6C23 }, 
-	{ 0xD1A9, 0x6C7D }, { 0xD1AA, 0x6C82 }, { 0xD1AB, 0x6DC7 }, { 0xD1AC, 0x7398 }, { 0xD1AD, 0x7426 }, { 0xD1AE, 0x742A }, { 0xD1AF, 0x7482 }, { 0xD1B0, 0x74A3 }, 
-	{ 0xD1B1, 0x7578 }, { 0xD1B2, 0x757F }, { 0xD1B3, 0x7881 }, { 0xD1B4, 0x78EF }, { 0xD1B5, 0x7941 }, { 0xD1B6, 0x7947 }, { 0xD1B7, 0x7948 }, { 0xD1B8, 0x797A }, 
-	{ 0xD1B9, 0x7B95 }, { 0xD1BA, 0x7D00 }, { 0xD1BB, 0x7DBA }, { 0xD1BC, 0x7F88 }, { 0xD1BD, 0x8006 }, { 0xD1BE, 0x802D }, { 0xD1BF, 0x808C }, { 0xD1C0, 0x8A18 }, 
-	{ 0xD1C1, 0x8B4F }, { 0xD1C2, 0x8C48 }, { 0xD1C3, 0x8D77 }, { 0xD1C4, 0x9321 }, { 0xD1C5, 0x9324 }, { 0xD1C6, 0x98E2 }, { 0xD1C7, 0x9951 }, { 0xD1C8, 0x9A0E }, 
-	{ 0xD1C9, 0x9A0F }, { 0xD1CA, 0x9A65 }, { 0xD1CB, 0x9E92 }, { 0xD1CC, 0x7DCA }, { 0xD1CD, 0x4F76 }, { 0xD1CE, 0x5409 }, { 0xD1CF, 0x62EE }, { 0xD1D0, 0x6854 }, 
-	{ 0xD1D1, 0x91D1 }, { 0xD1D2, 0x55AB }, { 0xD1D3, 0x513A }, { 0xD1D4, 0xF90B }, { 0xD1D5, 0xF90C }, { 0xD1D6, 0x5A1C }, { 0xD1D7, 0x61E6 }, { 0xD1D8, 0xF90D }, 
-	{ 0xD1D9, 0x62CF }, { 0xD1DA, 0x62FF }, { 0xD1DB, 0xF90E }, { 0xD1DC, 0xF90F }, { 0xD1DD, 0xF910 }, { 0xD1DE, 0xF911 }, { 0xD1DF, 0xF912 }, { 0xD1E0, 0xF913 }, 
-	{ 0xD1E1, 0x90A3 }, { 0xD1E2, 0xF914 }, { 0xD1E3, 0xF915 }, { 0xD1E4, 0xF916 }, { 0xD1E5, 0xF917 }, { 0xD1E6, 0xF918 }, { 0xD1E7, 0x8AFE }, { 0xD1E8, 0xF919 }, 
-	{ 0xD1E9, 0xF91A }, { 0xD1EA, 0xF91B }, { 0xD1EB, 0xF91C }, { 0xD1EC, 0x6696 }, { 0xD1ED, 0xF91D }, { 0xD1EE, 0x7156 }, { 0xD1EF, 0xF91E }, { 0xD1F0, 0xF91F }, 
-	{ 0xD1F1, 0x96E3 }, { 0xD1F2, 0xF920 }, { 0xD1F3, 0x634F }, { 0xD1F4, 0x637A }, { 0xD1F5, 0x5357 }, { 0xD1F6, 0xF921 }, { 0xD1F7, 0x678F }, { 0xD1F8, 0x6960 }, 
-	{ 0xD1F9, 0x6E73 }, { 0xD1FA, 0xF922 }, { 0xD1FB, 0x7537 }, { 0xD1FC, 0xF923 }, { 0xD1FD, 0xF924 }, { 0xD1FE, 0xF925 }, { 0xD2A1, 0x7D0D }, { 0xD2A2, 0xF926 }, 
-	{ 0xD2A3, 0xF927 }, { 0xD2A4, 0x8872 }, { 0xD2A5, 0x56CA }, { 0xD2A6, 0x5A18 }, { 0xD2A7, 0xF928 }, { 0xD2A8, 0xF929 }, { 0xD2A9, 0xF92A }, { 0xD2AA, 0xF92B }, 
-	{ 0xD2AB, 0xF92C }, { 0xD2AC, 0x4E43 }, { 0xD2AD, 0xF92D }, { 0xD2AE, 0x5167 }, { 0xD2AF, 0x5948 }, { 0xD2B0, 0x67F0 }, { 0xD2B1, 0x8010 }, { 0xD2B2, 0xF92E }, 
-	{ 0xD2B3, 0x5973 }, { 0xD2B4, 0x5E74 }, { 0xD2B5, 0x649A }, { 0xD2B6, 0x79CA }, { 0xD2B7, 0x5FF5 }, { 0xD2B8, 0x606C }, { 0xD2B9, 0x62C8 }, { 0xD2BA, 0x637B }, 
-	{ 0xD2BB, 0x5BE7 }, { 0xD2BC, 0x5BD7 }, { 0xD2BD, 0x52AA }, { 0xD2BE, 0xF92F }, { 0xD2BF, 0x5974 }, { 0xD2C0, 0x5F29 }, { 0xD2C1, 0x6012 }, { 0xD2C2, 0xF930 }, 
-	{ 0xD2C3, 0xF931 }, { 0xD2C4, 0xF932 }, { 0xD2C5, 0x7459 }, { 0xD2C6, 0xF933 }, { 0xD2C7, 0xF934 }, { 0xD2C8, 0xF935 }, { 0xD2C9, 0xF936 }, { 0xD2CA, 0xF937 }, 
-	{ 0xD2CB, 0xF938 }, { 0xD2CC, 0x99D1 }, { 0xD2CD, 0xF939 }, { 0xD2CE, 0xF93A }, { 0xD2CF, 0xF93B }, { 0xD2D0, 0xF93C }, { 0xD2D1, 0xF93D }, { 0xD2D2, 0xF93E }, 
-	{ 0xD2D3, 0xF93F }, { 0xD2D4, 0xF940 }, { 0xD2D5, 0xF941 }, { 0xD2D6, 0xF942 }, { 0xD2D7, 0xF943 }, { 0xD2D8, 0x6FC3 }, { 0xD2D9, 0xF944 }, { 0xD2DA, 0xF945 }, 
-	{ 0xD2DB, 0x81BF }, { 0xD2DC, 0x8FB2 }, { 0xD2DD, 0x60F1 }, { 0xD2DE, 0xF946 }, { 0xD2DF, 0xF947 }, { 0xD2E0, 0x8166 }, { 0xD2E1, 0xF948 }, { 0xD2E2, 0xF949 }, 
-	{ 0xD2E3, 0x5C3F }, { 0xD2E4, 0xF94A }, { 0xD2E5, 0xF94B }, { 0xD2E6, 0xF94C }, { 0xD2E7, 0xF94D }, { 0xD2E8, 0xF94E }, { 0xD2E9, 0xF94F }, { 0xD2EA, 0xF950 }, 
-	{ 0xD2EB, 0xF951 }, { 0xD2EC, 0x5AE9 }, { 0xD2ED, 0x8A25 }, { 0xD2EE, 0x677B }, { 0xD2EF, 0x7D10 }, { 0xD2F0, 0xF952 }, { 0xD2F1, 0xF953 }, { 0xD2F2, 0xF954 }, 
-	{ 0xD2F3, 0xF955 }, { 0xD2F4, 0xF956 }, { 0xD2F5, 0xF957 }, { 0xD2F6, 0x80FD }, { 0xD2F7, 0xF958 }, { 0xD2F8, 0xF959 }, { 0xD2F9, 0x5C3C }, { 0xD2FA, 0x6CE5 }, 
-	{ 0xD2FB, 0x533F }, { 0xD2FC, 0x6EBA }, { 0xD2FD, 0x591A }, { 0xD2FE, 0x8336 }, { 0xD3A1, 0x4E39 }, { 0xD3A2, 0x4EB6 }, { 0xD3A3, 0x4F46 }, { 0xD3A4, 0x55AE }, 
-	{ 0xD3A5, 0x5718 }, { 0xD3A6, 0x58C7 }, { 0xD3A7, 0x5F56 }, { 0xD3A8, 0x65B7 }, { 0xD3A9, 0x65E6 }, { 0xD3AA, 0x6A80 }, { 0xD3AB, 0x6BB5 }, { 0xD3AC, 0x6E4D }, 
-	{ 0xD3AD, 0x77ED }, { 0xD3AE, 0x7AEF }, { 0xD3AF, 0x7C1E }, { 0xD3B0, 0x7DDE }, { 0xD3B1, 0x86CB }, { 0xD3B2, 0x8892 }, { 0xD3B3, 0x9132 }, { 0xD3B4, 0x935B }, 
-	{ 0xD3B5, 0x64BB }, { 0xD3B6, 0x6FBE }, { 0xD3B7, 0x737A }, { 0xD3B8, 0x75B8 }, { 0xD3B9, 0x9054 }, { 0xD3BA, 0x5556 }, { 0xD3BB, 0x574D }, { 0xD3BC, 0x61BA }, 
-	{ 0xD3BD, 0x64D4 }, { 0xD3BE, 0x66C7 }, { 0xD3BF, 0x6DE1 }, { 0xD3C0, 0x6E5B }, { 0xD3C1, 0x6F6D }, { 0xD3C2, 0x6FB9 }, { 0xD3C3, 0x75F0 }, { 0xD3C4, 0x8043 }, 
-	{ 0xD3C5, 0x81BD }, { 0xD3C6, 0x8541 }, { 0xD3C7, 0x8983 }, { 0xD3C8, 0x8AC7 }, { 0xD3C9, 0x8B5A }, { 0xD3CA, 0x931F }, { 0xD3CB, 0x6C93 }, { 0xD3CC, 0x7553 }, 
-	{ 0xD3CD, 0x7B54 }, { 0xD3CE, 0x8E0F }, { 0xD3CF, 0x905D }, { 0xD3D0, 0x5510 }, { 0xD3D1, 0x5802 }, { 0xD3D2, 0x5858 }, { 0xD3D3, 0x5E62 }, { 0xD3D4, 0x6207 }, 
-	{ 0xD3D5, 0x649E }, { 0xD3D6, 0x68E0 }, { 0xD3D7, 0x7576 }, { 0xD3D8, 0x7CD6 }, { 0xD3D9, 0x87B3 }, { 0xD3DA, 0x9EE8 }, { 0xD3DB, 0x4EE3 }, { 0xD3DC, 0x5788 }, 
-	{ 0xD3DD, 0x576E }, { 0xD3DE, 0x5927 }, { 0xD3DF, 0x5C0D }, { 0xD3E0, 0x5CB1 }, { 0xD3E1, 0x5E36 }, { 0xD3E2, 0x5F85 }, { 0xD3E3, 0x6234 }, { 0xD3E4, 0x64E1 }, 
-	{ 0xD3E5, 0x73B3 }, { 0xD3E6, 0x81FA }, { 0xD3E7, 0x888B }, { 0xD3E8, 0x8CB8 }, { 0xD3E9, 0x968A }, { 0xD3EA, 0x9EDB }, { 0xD3EB, 0x5B85 }, { 0xD3EC, 0x5FB7 }, 
-	{ 0xD3ED, 0x60B3 }, { 0xD3EE, 0x5012 }, { 0xD3EF, 0x5200 }, { 0xD3F0, 0x5230 }, { 0xD3F1, 0x5716 }, { 0xD3F2, 0x5835 }, { 0xD3F3, 0x5857 }, { 0xD3F4, 0x5C0E }, 
-	{ 0xD3F5, 0x5C60 }, { 0xD3F6, 0x5CF6 }, { 0xD3F7, 0x5D8B }, { 0xD3F8, 0x5EA6 }, { 0xD3F9, 0x5F92 }, { 0xD3FA, 0x60BC }, { 0xD3FB, 0x6311 }, { 0xD3FC, 0x6389 }, 
-	{ 0xD3FD, 0x6417 }, { 0xD3FE, 0x6843 }, { 0xD4A1, 0x68F9 }, { 0xD4A2, 0x6AC2 }, { 0xD4A3, 0x6DD8 }, { 0xD4A4, 0x6E21 }, { 0xD4A5, 0x6ED4 }, { 0xD4A6, 0x6FE4 }, 
-	{ 0xD4A7, 0x71FE }, { 0xD4A8, 0x76DC }, { 0xD4A9, 0x7779 }, { 0xD4AA, 0x79B1 }, { 0xD4AB, 0x7A3B }, { 0xD4AC, 0x8404 }, { 0xD4AD, 0x89A9 }, { 0xD4AE, 0x8CED }, 
-	{ 0xD4AF, 0x8DF3 }, { 0xD4B0, 0x8E48 }, { 0xD4B1, 0x9003 }, { 0xD4B2, 0x9014 }, { 0xD4B3, 0x9053 }, { 0xD4B4, 0x90FD }, { 0xD4B5, 0x934D }, { 0xD4B6, 0x9676 }, 
-	{ 0xD4B7, 0x97DC }, { 0xD4B8, 0x6BD2 }, { 0xD4B9, 0x7006 }, { 0xD4BA, 0x7258 }, { 0xD4BB, 0x72A2 }, { 0xD4BC, 0x7368 }, { 0xD4BD, 0x7763 }, { 0xD4BE, 0x79BF }, 
-	{ 0xD4BF, 0x7BE4 }, { 0xD4C0, 0x7E9B }, { 0xD4C1, 0x8B80 }, { 0xD4C2, 0x58A9 }, { 0xD4C3, 0x60C7 }, { 0xD4C4, 0x6566 }, { 0xD4C5, 0x65FD }, { 0xD4C6, 0x66BE }, 
-	{ 0xD4C7, 0x6C8C }, { 0xD4C8, 0x711E }, { 0xD4C9, 0x71C9 }, { 0xD4CA, 0x8C5A }, { 0xD4CB, 0x9813 }, { 0xD4CC, 0x4E6D }, { 0xD4CD, 0x7A81 }, { 0xD4CE, 0x4EDD }, 
-	{ 0xD4CF, 0x51AC }, { 0xD4D0, 0x51CD }, { 0xD4D1, 0x52D5 }, { 0xD4D2, 0x540C }, { 0xD4D3, 0x61A7 }, { 0xD4D4, 0x6771 }, { 0xD4D5, 0x6850 }, { 0xD4D6, 0x68DF }, 
-	{ 0xD4D7, 0x6D1E }, { 0xD4D8, 0x6F7C }, { 0xD4D9, 0x75BC }, { 0xD4DA, 0x77B3 }, { 0xD4DB, 0x7AE5 }, { 0xD4DC, 0x80F4 }, { 0xD4DD, 0x8463 }, { 0xD4DE, 0x9285 }, 
-	{ 0xD4DF, 0x515C }, { 0xD4E0, 0x6597 }, { 0xD4E1, 0x675C }, { 0xD4E2, 0x6793 }, { 0xD4E3, 0x75D8 }, { 0xD4E4, 0x7AC7 }, { 0xD4E5, 0x8373 }, { 0xD4E6, 0xF95A }, 
-	{ 0xD4E7, 0x8C46 }, { 0xD4E8, 0x9017 }, { 0xD4E9, 0x982D }, { 0xD4EA, 0x5C6F }, { 0xD4EB, 0x81C0 }, { 0xD4EC, 0x829A }, { 0xD4ED, 0x9041 }, { 0xD4EE, 0x906F }, 
-	{ 0xD4EF, 0x920D }, { 0xD4F0, 0x5F97 }, { 0xD4F1, 0x5D9D }, { 0xD4F2, 0x6A59 }, { 0xD4F3, 0x71C8 }, { 0xD4F4, 0x767B }, { 0xD4F5, 0x7B49 }, { 0xD4F6, 0x85E4 }, 
-	{ 0xD4F7, 0x8B04 }, { 0xD4F8, 0x9127 }, { 0xD4F9, 0x9A30 }, { 0xD4FA, 0x5587 }, { 0xD4FB, 0x61F6 }, { 0xD4FC, 0xF95B }, { 0xD4FD, 0x7669 }, { 0xD4FE, 0x7F85 }, 
-	{ 0xD5A1, 0x863F }, { 0xD5A2, 0x87BA }, { 0xD5A3, 0x88F8 }, { 0xD5A4, 0x908F }, { 0xD5A5, 0xF95C }, { 0xD5A6, 0x6D1B }, { 0xD5A7, 0x70D9 }, { 0xD5A8, 0x73DE }, 
-	{ 0xD5A9, 0x7D61 }, { 0xD5AA, 0x843D }, { 0xD5AB, 0xF95D }, { 0xD5AC, 0x916A }, { 0xD5AD, 0x99F1 }, { 0xD5AE, 0xF95E }, { 0xD5AF, 0x4E82 }, { 0xD5B0, 0x5375 }, 
-	{ 0xD5B1, 0x6B04 }, { 0xD5B2, 0x6B12 }, { 0xD5B3, 0x703E }, { 0xD5B4, 0x721B }, { 0xD5B5, 0x862D }, { 0xD5B6, 0x9E1E }, { 0xD5B7, 0x524C }, { 0xD5B8, 0x8FA3 }, 
-	{ 0xD5B9, 0x5D50 }, { 0xD5BA, 0x64E5 }, { 0xD5BB, 0x652C }, { 0xD5BC, 0x6B16 }, { 0xD5BD, 0x6FEB }, { 0xD5BE, 0x7C43 }, { 0xD5BF, 0x7E9C }, { 0xD5C0, 0x85CD }, 
-	{ 0xD5C1, 0x8964 }, { 0xD5C2, 0x89BD }, { 0xD5C3, 0x62C9 }, { 0xD5C4, 0x81D8 }, { 0xD5C5, 0x881F }, { 0xD5C6, 0x5ECA }, { 0xD5C7, 0x6717 }, { 0xD5C8, 0x6D6A }, 
-	{ 0xD5C9, 0x72FC }, { 0xD5CA, 0x7405 }, { 0xD5CB, 0x746F }, { 0xD5CC, 0x8782 }, { 0xD5CD, 0x90DE }, { 0xD5CE, 0x4F86 }, { 0xD5CF, 0x5D0D }, { 0xD5D0, 0x5FA0 }, 
-	{ 0xD5D1, 0x840A }, { 0xD5D2, 0x51B7 }, { 0xD5D3, 0x63A0 }, { 0xD5D4, 0x7565 }, { 0xD5D5, 0x4EAE }, { 0xD5D6, 0x5006 }, { 0xD5D7, 0x5169 }, { 0xD5D8, 0x51C9 }, 
-	{ 0xD5D9, 0x6881 }, { 0xD5DA, 0x6A11 }, { 0xD5DB, 0x7CAE }, { 0xD5DC, 0x7CB1 }, { 0xD5DD, 0x7CE7 }, { 0xD5DE, 0x826F }, { 0xD5DF, 0x8AD2 }, { 0xD5E0, 0x8F1B }, 
-	{ 0xD5E1, 0x91CF }, { 0xD5E2, 0x4FB6 }, { 0xD5E3, 0x5137 }, { 0xD5E4, 0x52F5 }, { 0xD5E5, 0x5442 }, { 0xD5E6, 0x5EEC }, { 0xD5E7, 0x616E }, { 0xD5E8, 0x623E }, 
-	{ 0xD5E9, 0x65C5 }, { 0xD5EA, 0x6ADA }, { 0xD5EB, 0x6FFE }, { 0xD5EC, 0x792A }, { 0xD5ED, 0x85DC }, { 0xD5EE, 0x8823 }, { 0xD5EF, 0x95AD }, { 0xD5F0, 0x9A62 }, 
-	{ 0xD5F1, 0x9A6A }, { 0xD5F2, 0x9E97 }, { 0xD5F3, 0x9ECE }, { 0xD5F4, 0x529B }, { 0xD5F5, 0x66C6 }, { 0xD5F6, 0x6B77 }, { 0xD5F7, 0x701D }, { 0xD5F8, 0x792B }, 
-	{ 0xD5F9, 0x8F62 }, { 0xD5FA, 0x9742 }, { 0xD5FB, 0x6190 }, { 0xD5FC, 0x6200 }, { 0xD5FD, 0x6523 }, { 0xD5FE, 0x6F23 }, { 0xD6A1, 0x7149 }, { 0xD6A2, 0x7489 }, 
-	{ 0xD6A3, 0x7DF4 }, { 0xD6A4, 0x806F }, { 0xD6A5, 0x84EE }, { 0xD6A6, 0x8F26 }, { 0xD6A7, 0x9023 }, { 0xD6A8, 0x934A }, { 0xD6A9, 0x51BD }, { 0xD6AA, 0x5217 }, 
-	{ 0xD6AB, 0x52A3 }, { 0xD6AC, 0x6D0C }, { 0xD6AD, 0x70C8 }, { 0xD6AE, 0x88C2 }, { 0xD6AF, 0x5EC9 }, { 0xD6B0, 0x6582 }, { 0xD6B1, 0x6BAE }, { 0xD6B2, 0x6FC2 }, 
-	{ 0xD6B3, 0x7C3E }, { 0xD6B4, 0x7375 }, { 0xD6B5, 0x4EE4 }, { 0xD6B6, 0x4F36 }, { 0xD6B7, 0x56F9 }, { 0xD6B8, 0xF95F }, { 0xD6B9, 0x5CBA }, { 0xD6BA, 0x5DBA }, 
-	{ 0xD6BB, 0x601C }, { 0xD6BC, 0x73B2 }, { 0xD6BD, 0x7B2D }, { 0xD6BE, 0x7F9A }, { 0xD6BF, 0x7FCE }, { 0xD6C0, 0x8046 }, { 0xD6C1, 0x901E }, { 0xD6C2, 0x9234 }, 
-	{ 0xD6C3, 0x96F6 }, { 0xD6C4, 0x9748 }, { 0xD6C5, 0x9818 }, { 0xD6C6, 0x9F61 }, { 0xD6C7, 0x4F8B }, { 0xD6C8, 0x6FA7 }, { 0xD6C9, 0x79AE }, { 0xD6CA, 0x91B4 }, 
-	{ 0xD6CB, 0x96B7 }, { 0xD6CC, 0x52DE }, { 0xD6CD, 0xF960 }, { 0xD6CE, 0x6488 }, { 0xD6CF, 0x64C4 }, { 0xD6D0, 0x6AD3 }, { 0xD6D1, 0x6F5E }, { 0xD6D2, 0x7018 }, 
-	{ 0xD6D3, 0x7210 }, { 0xD6D4, 0x76E7 }, { 0xD6D5, 0x8001 }, { 0xD6D6, 0x8606 }, { 0xD6D7, 0x865C }, { 0xD6D8, 0x8DEF }, { 0xD6D9, 0x8F05 }, { 0xD6DA, 0x9732 }, 
-	{ 0xD6DB, 0x9B6F }, { 0xD6DC, 0x9DFA }, { 0xD6DD, 0x9E75 }, { 0xD6DE, 0x788C }, { 0xD6DF, 0x797F }, { 0xD6E0, 0x7DA0 }, { 0xD6E1, 0x83C9 }, { 0xD6E2, 0x9304 }, 
-	{ 0xD6E3, 0x9E7F }, { 0xD6E4, 0x9E93 }, { 0xD6E5, 0x8AD6 }, { 0xD6E6, 0x58DF }, { 0xD6E7, 0x5F04 }, { 0xD6E8, 0x6727 }, { 0xD6E9, 0x7027 }, { 0xD6EA, 0x74CF }, 
-	{ 0xD6EB, 0x7C60 }, { 0xD6EC, 0x807E }, { 0xD6ED, 0x5121 }, { 0xD6EE, 0x7028 }, { 0xD6EF, 0x7262 }, { 0xD6F0, 0x78CA }, { 0xD6F1, 0x8CC2 }, { 0xD6F2, 0x8CDA }, 
-	{ 0xD6F3, 0x8CF4 }, { 0xD6F4, 0x96F7 }, { 0xD6F5, 0x4E86 }, { 0xD6F6, 0x50DA }, { 0xD6F7, 0x5BEE }, { 0xD6F8, 0x5ED6 }, { 0xD6F9, 0x6599 }, { 0xD6FA, 0x71CE }, 
-	{ 0xD6FB, 0x7642 }, { 0xD6FC, 0x77AD }, { 0xD6FD, 0x804A }, { 0xD6FE, 0x84FC }, { 0xD7A1, 0x907C }, { 0xD7A2, 0x9B27 }, { 0xD7A3, 0x9F8D }, { 0xD7A4, 0x58D8 }, 
-	{ 0xD7A5, 0x5A41 }, { 0xD7A6, 0x5C62 }, { 0xD7A7, 0x6A13 }, { 0xD7A8, 0x6DDA }, { 0xD7A9, 0x6F0F }, { 0xD7AA, 0x763B }, { 0xD7AB, 0x7D2F }, { 0xD7AC, 0x7E37 }, 
-	{ 0xD7AD, 0x851E }, { 0xD7AE, 0x8938 }, { 0xD7AF, 0x93E4 }, { 0xD7B0, 0x964B }, { 0xD7B1, 0x5289 }, { 0xD7B2, 0x65D2 }, { 0xD7B3, 0x67F3 }, { 0xD7B4, 0x69B4 }, 
-	{ 0xD7B5, 0x6D41 }, { 0xD7B6, 0x6E9C }, { 0xD7B7, 0x700F }, { 0xD7B8, 0x7409 }, { 0xD7B9, 0x7460 }, { 0xD7BA, 0x7559 }, { 0xD7BB, 0x7624 }, { 0xD7BC, 0x786B }, 
-	{ 0xD7BD, 0x8B2C }, { 0xD7BE, 0x985E }, { 0xD7BF, 0x516D }, { 0xD7C0, 0x622E }, { 0xD7C1, 0x9678 }, { 0xD7C2, 0x4F96 }, { 0xD7C3, 0x502B }, { 0xD7C4, 0x5D19 }, 
-	{ 0xD7C5, 0x6DEA }, { 0xD7C6, 0x7DB8 }, { 0xD7C7, 0x8F2A }, { 0xD7C8, 0x5F8B }, { 0xD7C9, 0x6144 }, { 0xD7CA, 0x6817 }, { 0xD7CB, 0xF961 }, { 0xD7CC, 0x9686 }, 
-	{ 0xD7CD, 0x52D2 }, { 0xD7CE, 0x808B }, { 0xD7CF, 0x51DC }, { 0xD7D0, 0x51CC }, { 0xD7D1, 0x695E }, { 0xD7D2, 0x7A1C }, { 0xD7D3, 0x7DBE }, { 0xD7D4, 0x83F1 }, 
-	{ 0xD7D5, 0x9675 }, { 0xD7D6, 0x4FDA }, { 0xD7D7, 0x5229 }, { 0xD7D8, 0x5398 }, { 0xD7D9, 0x540F }, { 0xD7DA, 0x550E }, { 0xD7DB, 0x5C65 }, { 0xD7DC, 0x60A7 }, 
-	{ 0xD7DD, 0x674E }, { 0xD7DE, 0x68A8 }, { 0xD7DF, 0x6D6C }, { 0xD7E0, 0x7281 }, { 0xD7E1, 0x72F8 }, { 0xD7E2, 0x7406 }, { 0xD7E3, 0x7483 }, { 0xD7E4, 0xF962 }, 
-	{ 0xD7E5, 0x75E2 }, { 0xD7E6, 0x7C6C }, { 0xD7E7, 0x7F79 }, { 0xD7E8, 0x7FB8 }, { 0xD7E9, 0x8389 }, { 0xD7EA, 0x88CF }, { 0xD7EB, 0x88E1 }, { 0xD7EC, 0x91CC }, 
-	{ 0xD7ED, 0x91D0 }, { 0xD7EE, 0x96E2 }, { 0xD7EF, 0x9BC9 }, { 0xD7F0, 0x541D }, { 0xD7F1, 0x6F7E }, { 0xD7F2, 0x71D0 }, { 0xD7F3, 0x7498 }, { 0xD7F4, 0x85FA }, 
-	{ 0xD7F5, 0x8EAA }, { 0xD7F6, 0x96A3 }, { 0xD7F7, 0x9C57 }, { 0xD7F8, 0x9E9F }, { 0xD7F9, 0x6797 }, { 0xD7FA, 0x6DCB }, { 0xD7FB, 0x7433 }, { 0xD7FC, 0x81E8 }, 
-	{ 0xD7FD, 0x9716 }, { 0xD7FE, 0x782C }, { 0xD8A1, 0x7ACB }, { 0xD8A2, 0x7B20 }, { 0xD8A3, 0x7C92 }, { 0xD8A4, 0x6469 }, { 0xD8A5, 0x746A }, { 0xD8A6, 0x75F2 }, 
-	{ 0xD8A7, 0x78BC }, { 0xD8A8, 0x78E8 }, { 0xD8A9, 0x99AC }, { 0xD8AA, 0x9B54 }, { 0xD8AB, 0x9EBB }, { 0xD8AC, 0x5BDE }, { 0xD8AD, 0x5E55 }, { 0xD8AE, 0x6F20 }, 
-	{ 0xD8AF, 0x819C }, { 0xD8B0, 0x83AB }, { 0xD8B1, 0x9088 }, { 0xD8B2, 0x4E07 }, { 0xD8B3, 0x534D }, { 0xD8B4, 0x5A29 }, { 0xD8B5, 0x5DD2 }, { 0xD8B6, 0x5F4E }, 
-	{ 0xD8B7, 0x6162 }, { 0xD8B8, 0x633D }, { 0xD8B9, 0x6669 }, { 0xD8BA, 0x66FC }, { 0xD8BB, 0x6EFF }, { 0xD8BC, 0x6F2B }, { 0xD8BD, 0x7063 }, { 0xD8BE, 0x779E }, 
-	{ 0xD8BF, 0x842C }, { 0xD8C0, 0x8513 }, { 0xD8C1, 0x883B }, { 0xD8C2, 0x8F13 }, { 0xD8C3, 0x9945 }, { 0xD8C4, 0x9C3B }, { 0xD8C5, 0x551C }, { 0xD8C6, 0x62B9 }, 
-	{ 0xD8C7, 0x672B }, { 0xD8C8, 0x6CAB }, { 0xD8C9, 0x8309 }, { 0xD8CA, 0x896A }, { 0xD8CB, 0x977A }, { 0xD8CC, 0x4EA1 }, { 0xD8CD, 0x5984 }, { 0xD8CE, 0x5FD8 }, 
-	{ 0xD8CF, 0x5FD9 }, { 0xD8D0, 0x671B }, { 0xD8D1, 0x7DB2 }, { 0xD8D2, 0x7F54 }, { 0xD8D3, 0x8292 }, { 0xD8D4, 0x832B }, { 0xD8D5, 0x83BD }, { 0xD8D6, 0x8F1E }, 
-	{ 0xD8D7, 0x9099 }, { 0xD8D8, 0x57CB }, { 0xD8D9, 0x59B9 }, { 0xD8DA, 0x5A92 }, { 0xD8DB, 0x5BD0 }, { 0xD8DC, 0x6627 }, { 0xD8DD, 0x679A }, { 0xD8DE, 0x6885 }, 
-	{ 0xD8DF, 0x6BCF }, { 0xD8E0, 0x7164 }, { 0xD8E1, 0x7F75 }, { 0xD8E2, 0x8CB7 }, { 0xD8E3, 0x8CE3 }, { 0xD8E4, 0x9081 }, { 0xD8E5, 0x9B45 }, { 0xD8E6, 0x8108 }, 
-	{ 0xD8E7, 0x8C8A }, { 0xD8E8, 0x964C }, { 0xD8E9, 0x9A40 }, { 0xD8EA, 0x9EA5 }, { 0xD8EB, 0x5B5F }, { 0xD8EC, 0x6C13 }, { 0xD8ED, 0x731B }, { 0xD8EE, 0x76F2 }, 
-	{ 0xD8EF, 0x76DF }, { 0xD8F0, 0x840C }, { 0xD8F1, 0x51AA }, { 0xD8F2, 0x8993 }, { 0xD8F3, 0x514D }, { 0xD8F4, 0x5195 }, { 0xD8F5, 0x52C9 }, { 0xD8F6, 0x68C9 }, 
-	{ 0xD8F7, 0x6C94 }, { 0xD8F8, 0x7704 }, { 0xD8F9, 0x7720 }, { 0xD8FA, 0x7DBF }, { 0xD8FB, 0x7DEC }, { 0xD8FC, 0x9762 }, { 0xD8FD, 0x9EB5 }, { 0xD8FE, 0x6EC5 }, 
-	{ 0xD9A1, 0x8511 }, { 0xD9A2, 0x51A5 }, { 0xD9A3, 0x540D }, { 0xD9A4, 0x547D }, { 0xD9A5, 0x660E }, { 0xD9A6, 0x669D }, { 0xD9A7, 0x6927 }, { 0xD9A8, 0x6E9F }, 
-	{ 0xD9A9, 0x76BF }, { 0xD9AA, 0x7791 }, { 0xD9AB, 0x8317 }, { 0xD9AC, 0x84C2 }, { 0xD9AD, 0x879F }, { 0xD9AE, 0x9169 }, { 0xD9AF, 0x9298 }, { 0xD9B0, 0x9CF4 }, 
-	{ 0xD9B1, 0x8882 }, { 0xD9B2, 0x4FAE }, { 0xD9B3, 0x5192 }, { 0xD9B4, 0x52DF }, { 0xD9B5, 0x59C6 }, { 0xD9B6, 0x5E3D }, { 0xD9B7, 0x6155 }, { 0xD9B8, 0x6478 }, 
-	{ 0xD9B9, 0x6479 }, { 0xD9BA, 0x66AE }, { 0xD9BB, 0x67D0 }, { 0xD9BC, 0x6A21 }, { 0xD9BD, 0x6BCD }, { 0xD9BE, 0x6BDB }, { 0xD9BF, 0x725F }, { 0xD9C0, 0x7261 }, 
-	{ 0xD9C1, 0x7441 }, { 0xD9C2, 0x7738 }, { 0xD9C3, 0x77DB }, { 0xD9C4, 0x8017 }, { 0xD9C5, 0x82BC }, { 0xD9C6, 0x8305 }, { 0xD9C7, 0x8B00 }, { 0xD9C8, 0x8B28 }, 
-	{ 0xD9C9, 0x8C8C }, { 0xD9CA, 0x6728 }, { 0xD9CB, 0x6C90 }, { 0xD9CC, 0x7267 }, { 0xD9CD, 0x76EE }, { 0xD9CE, 0x7766 }, { 0xD9CF, 0x7A46 }, { 0xD9D0, 0x9DA9 }, 
-	{ 0xD9D1, 0x6B7F }, { 0xD9D2, 0x6C92 }, { 0xD9D3, 0x5922 }, { 0xD9D4, 0x6726 }, { 0xD9D5, 0x8499 }, { 0xD9D6, 0x536F }, { 0xD9D7, 0x5893 }, { 0xD9D8, 0x5999 }, 
-	{ 0xD9D9, 0x5EDF }, { 0xD9DA, 0x63CF }, { 0xD9DB, 0x6634 }, { 0xD9DC, 0x6773 }, { 0xD9DD, 0x6E3A }, { 0xD9DE, 0x732B }, { 0xD9DF, 0x7AD7 }, { 0xD9E0, 0x82D7 }, 
-	{ 0xD9E1, 0x9328 }, { 0xD9E2, 0x52D9 }, { 0xD9E3, 0x5DEB }, { 0xD9E4, 0x61AE }, { 0xD9E5, 0x61CB }, { 0xD9E6, 0x620A }, { 0xD9E7, 0x62C7 }, { 0xD9E8, 0x64AB }, 
-	{ 0xD9E9, 0x65E0 }, { 0xD9EA, 0x6959 }, { 0xD9EB, 0x6B66 }, { 0xD9EC, 0x6BCB }, { 0xD9ED, 0x7121 }, { 0xD9EE, 0x73F7 }, { 0xD9EF, 0x755D }, { 0xD9F0, 0x7E46 }, 
-	{ 0xD9F1, 0x821E }, { 0xD9F2, 0x8302 }, { 0xD9F3, 0x856A }, { 0xD9F4, 0x8AA3 }, { 0xD9F5, 0x8CBF }, { 0xD9F6, 0x9727 }, { 0xD9F7, 0x9D61 }, { 0xD9F8, 0x58A8 }, 
-	{ 0xD9F9, 0x9ED8 }, { 0xD9FA, 0x5011 }, { 0xD9FB, 0x520E }, { 0xD9FC, 0x543B }, { 0xD9FD, 0x554F }, { 0xD9FE, 0x6587 }, { 0xDAA1, 0x6C76 }, { 0xDAA2, 0x7D0A }, 
-	{ 0xDAA3, 0x7D0B }, { 0xDAA4, 0x805E }, { 0xDAA5, 0x868A }, { 0xDAA6, 0x9580 }, { 0xDAA7, 0x96EF }, { 0xDAA8, 0x52FF }, { 0xDAA9, 0x6C95 }, { 0xDAAA, 0x7269 }, 
-	{ 0xDAAB, 0x5473 }, { 0xDAAC, 0x5A9A }, { 0xDAAD, 0x5C3E }, { 0xDAAE, 0x5D4B }, { 0xDAAF, 0x5F4C }, { 0xDAB0, 0x5FAE }, { 0xDAB1, 0x672A }, { 0xDAB2, 0x68B6 }, 
-	{ 0xDAB3, 0x6963 }, { 0xDAB4, 0x6E3C }, { 0xDAB5, 0x6E44 }, { 0xDAB6, 0x7709 }, { 0xDAB7, 0x7C73 }, { 0xDAB8, 0x7F8E }, { 0xDAB9, 0x8587 }, { 0xDABA, 0x8B0E }, 
-	{ 0xDABB, 0x8FF7 }, { 0xDABC, 0x9761 }, { 0xDABD, 0x9EF4 }, { 0xDABE, 0x5CB7 }, { 0xDABF, 0x60B6 }, { 0xDAC0, 0x610D }, { 0xDAC1, 0x61AB }, { 0xDAC2, 0x654F }, 
-	{ 0xDAC3, 0x65FB }, { 0xDAC4, 0x65FC }, { 0xDAC5, 0x6C11 }, { 0xDAC6, 0x6CEF }, { 0xDAC7, 0x739F }, { 0xDAC8, 0x73C9 }, { 0xDAC9, 0x7DE1 }, { 0xDACA, 0x9594 }, 
-	{ 0xDACB, 0x5BC6 }, { 0xDACC, 0x871C }, { 0xDACD, 0x8B10 }, { 0xDACE, 0x525D }, { 0xDACF, 0x535A }, { 0xDAD0, 0x62CD }, { 0xDAD1, 0x640F }, { 0xDAD2, 0x64B2 }, 
-	{ 0xDAD3, 0x6734 }, { 0xDAD4, 0x6A38 }, { 0xDAD5, 0x6CCA }, { 0xDAD6, 0x73C0 }, { 0xDAD7, 0x749E }, { 0xDAD8, 0x7B94 }, { 0xDAD9, 0x7C95 }, { 0xDADA, 0x7E1B }, 
-	{ 0xDADB, 0x818A }, { 0xDADC, 0x8236 }, { 0xDADD, 0x8584 }, { 0xDADE, 0x8FEB }, { 0xDADF, 0x96F9 }, { 0xDAE0, 0x99C1 }, { 0xDAE1, 0x4F34 }, { 0xDAE2, 0x534A }, 
-	{ 0xDAE3, 0x53CD }, { 0xDAE4, 0x53DB }, { 0xDAE5, 0x62CC }, { 0xDAE6, 0x642C }, { 0xDAE7, 0x6500 }, { 0xDAE8, 0x6591 }, { 0xDAE9, 0x69C3 }, { 0xDAEA, 0x6CEE }, 
-	{ 0xDAEB, 0x6F58 }, { 0xDAEC, 0x73ED }, { 0xDAED, 0x7554 }, { 0xDAEE, 0x7622 }, { 0xDAEF, 0x76E4 }, { 0xDAF0, 0x76FC }, { 0xDAF1, 0x78D0 }, { 0xDAF2, 0x78FB }, 
-	{ 0xDAF3, 0x792C }, { 0xDAF4, 0x7D46 }, { 0xDAF5, 0x822C }, { 0xDAF6, 0x87E0 }, { 0xDAF7, 0x8FD4 }, { 0xDAF8, 0x9812 }, { 0xDAF9, 0x98EF }, { 0xDAFA, 0x52C3 }, 
-	{ 0xDAFB, 0x62D4 }, { 0xDAFC, 0x64A5 }, { 0xDAFD, 0x6E24 }, { 0xDAFE, 0x6F51 }, { 0xDBA1, 0x767C }, { 0xDBA2, 0x8DCB }, { 0xDBA3, 0x91B1 }, { 0xDBA4, 0x9262 }, 
-	{ 0xDBA5, 0x9AEE }, { 0xDBA6, 0x9B43 }, { 0xDBA7, 0x5023 }, { 0xDBA8, 0x508D }, { 0xDBA9, 0x574A }, { 0xDBAA, 0x59A8 }, { 0xDBAB, 0x5C28 }, { 0xDBAC, 0x5E47 }, 
-	{ 0xDBAD, 0x5F77 }, { 0xDBAE, 0x623F }, { 0xDBAF, 0x653E }, { 0xDBB0, 0x65B9 }, { 0xDBB1, 0x65C1 }, { 0xDBB2, 0x6609 }, { 0xDBB3, 0x678B }, { 0xDBB4, 0x699C }, 
-	{ 0xDBB5, 0x6EC2 }, { 0xDBB6, 0x78C5 }, { 0xDBB7, 0x7D21 }, { 0xDBB8, 0x80AA }, { 0xDBB9, 0x8180 }, { 0xDBBA, 0x822B }, { 0xDBBB, 0x82B3 }, { 0xDBBC, 0x84A1 }, 
-	{ 0xDBBD, 0x868C }, { 0xDBBE, 0x8A2A }, { 0xDBBF, 0x8B17 }, { 0xDBC0, 0x90A6 }, { 0xDBC1, 0x9632 }, { 0xDBC2, 0x9F90 }, { 0xDBC3, 0x500D }, { 0xDBC4, 0x4FF3 }, 
-	{ 0xDBC5, 0xF963 }, { 0xDBC6, 0x57F9 }, { 0xDBC7, 0x5F98 }, { 0xDBC8, 0x62DC }, { 0xDBC9, 0x6392 }, { 0xDBCA, 0x676F }, { 0xDBCB, 0x6E43 }, { 0xDBCC, 0x7119 }, 
-	{ 0xDBCD, 0x76C3 }, { 0xDBCE, 0x80CC }, { 0xDBCF, 0x80DA }, { 0xDBD0, 0x88F4 }, { 0xDBD1, 0x88F5 }, { 0xDBD2, 0x8919 }, { 0xDBD3, 0x8CE0 }, { 0xDBD4, 0x8F29 }, 
-	{ 0xDBD5, 0x914D }, { 0xDBD6, 0x966A }, { 0xDBD7, 0x4F2F }, { 0xDBD8, 0x4F70 }, { 0xDBD9, 0x5E1B }, { 0xDBDA, 0x67CF }, { 0xDBDB, 0x6822 }, { 0xDBDC, 0x767D }, 
-	{ 0xDBDD, 0x767E }, { 0xDBDE, 0x9B44 }, { 0xDBDF, 0x5E61 }, { 0xDBE0, 0x6A0A }, { 0xDBE1, 0x7169 }, { 0xDBE2, 0x71D4 }, { 0xDBE3, 0x756A }, { 0xDBE4, 0xF964 }, 
-	{ 0xDBE5, 0x7E41 }, { 0xDBE6, 0x8543 }, { 0xDBE7, 0x85E9 }, { 0xDBE8, 0x98DC }, { 0xDBE9, 0x4F10 }, { 0xDBEA, 0x7B4F }, { 0xDBEB, 0x7F70 }, { 0xDBEC, 0x95A5 }, 
-	{ 0xDBED, 0x51E1 }, { 0xDBEE, 0x5E06 }, { 0xDBEF, 0x68B5 }, { 0xDBF0, 0x6C3E }, { 0xDBF1, 0x6C4E }, { 0xDBF2, 0x6CDB }, { 0xDBF3, 0x72AF }, { 0xDBF4, 0x7BC4 }, 
-	{ 0xDBF5, 0x8303 }, { 0xDBF6, 0x6CD5 }, { 0xDBF7, 0x743A }, { 0xDBF8, 0x50FB }, { 0xDBF9, 0x5288 }, { 0xDBFA, 0x58C1 }, { 0xDBFB, 0x64D8 }, { 0xDBFC, 0x6A97 }, 
-	{ 0xDBFD, 0x74A7 }, { 0xDBFE, 0x7656 }, { 0xDCA1, 0x78A7 }, { 0xDCA2, 0x8617 }, { 0xDCA3, 0x95E2 }, { 0xDCA4, 0x9739 }, { 0xDCA5, 0xF965 }, { 0xDCA6, 0x535E }, 
-	{ 0xDCA7, 0x5F01 }, { 0xDCA8, 0x8B8A }, { 0xDCA9, 0x8FA8 }, { 0xDCAA, 0x8FAF }, { 0xDCAB, 0x908A }, { 0xDCAC, 0x5225 }, { 0xDCAD, 0x77A5 }, { 0xDCAE, 0x9C49 }, 
-	{ 0xDCAF, 0x9F08 }, { 0xDCB0, 0x4E19 }, { 0xDCB1, 0x5002 }, { 0xDCB2, 0x5175 }, { 0xDCB3, 0x5C5B }, { 0xDCB4, 0x5E77 }, { 0xDCB5, 0x661E }, { 0xDCB6, 0x663A }, 
-	{ 0xDCB7, 0x67C4 }, { 0xDCB8, 0x68C5 }, { 0xDCB9, 0x70B3 }, { 0xDCBA, 0x7501 }, { 0xDCBB, 0x75C5 }, { 0xDCBC, 0x79C9 }, { 0xDCBD, 0x7ADD }, { 0xDCBE, 0x8F27 }, 
-	{ 0xDCBF, 0x9920 }, { 0xDCC0, 0x9A08 }, { 0xDCC1, 0x4FDD }, { 0xDCC2, 0x5821 }, { 0xDCC3, 0x5831 }, { 0xDCC4, 0x5BF6 }, { 0xDCC5, 0x666E }, { 0xDCC6, 0x6B65 }, 
-	{ 0xDCC7, 0x6D11 }, { 0xDCC8, 0x6E7A }, { 0xDCC9, 0x6F7D }, { 0xDCCA, 0x73E4 }, { 0xDCCB, 0x752B }, { 0xDCCC, 0x83E9 }, { 0xDCCD, 0x88DC }, { 0xDCCE, 0x8913 }, 
-	{ 0xDCCF, 0x8B5C }, { 0xDCD0, 0x8F14 }, { 0xDCD1, 0x4F0F }, { 0xDCD2, 0x50D5 }, { 0xDCD3, 0x5310 }, { 0xDCD4, 0x535C }, { 0xDCD5, 0x5B93 }, { 0xDCD6, 0x5FA9 }, 
-	{ 0xDCD7, 0x670D }, { 0xDCD8, 0x798F }, { 0xDCD9, 0x8179 }, { 0xDCDA, 0x832F }, { 0xDCDB, 0x8514 }, { 0xDCDC, 0x8907 }, { 0xDCDD, 0x8986 }, { 0xDCDE, 0x8F39 }, 
-	{ 0xDCDF, 0x8F3B }, { 0xDCE0, 0x99A5 }, { 0xDCE1, 0x9C12 }, { 0xDCE2, 0x672C }, { 0xDCE3, 0x4E76 }, { 0xDCE4, 0x4FF8 }, { 0xDCE5, 0x5949 }, { 0xDCE6, 0x5C01 }, 
-	{ 0xDCE7, 0x5CEF }, { 0xDCE8, 0x5CF0 }, { 0xDCE9, 0x6367 }, { 0xDCEA, 0x68D2 }, { 0xDCEB, 0x70FD }, { 0xDCEC, 0x71A2 }, { 0xDCED, 0x742B }, { 0xDCEE, 0x7E2B }, 
-	{ 0xDCEF, 0x84EC }, { 0xDCF0, 0x8702 }, { 0xDCF1, 0x9022 }, { 0xDCF2, 0x92D2 }, { 0xDCF3, 0x9CF3 }, { 0xDCF4, 0x4E0D }, { 0xDCF5, 0x4ED8 }, { 0xDCF6, 0x4FEF }, 
-	{ 0xDCF7, 0x5085 }, { 0xDCF8, 0x5256 }, { 0xDCF9, 0x526F }, { 0xDCFA, 0x5426 }, { 0xDCFB, 0x5490 }, { 0xDCFC, 0x57E0 }, { 0xDCFD, 0x592B }, { 0xDCFE, 0x5A66 }, 
-	{ 0xDDA1, 0x5B5A }, { 0xDDA2, 0x5B75 }, { 0xDDA3, 0x5BCC }, { 0xDDA4, 0x5E9C }, { 0xDDA5, 0xF966 }, { 0xDDA6, 0x6276 }, { 0xDDA7, 0x6577 }, { 0xDDA8, 0x65A7 }, 
-	{ 0xDDA9, 0x6D6E }, { 0xDDAA, 0x6EA5 }, { 0xDDAB, 0x7236 }, { 0xDDAC, 0x7B26 }, { 0xDDAD, 0x7C3F }, { 0xDDAE, 0x7F36 }, { 0xDDAF, 0x8150 }, { 0xDDB0, 0x8151 }, 
-	{ 0xDDB1, 0x819A }, { 0xDDB2, 0x8240 }, { 0xDDB3, 0x8299 }, { 0xDDB4, 0x83A9 }, { 0xDDB5, 0x8A03 }, { 0xDDB6, 0x8CA0 }, { 0xDDB7, 0x8CE6 }, { 0xDDB8, 0x8CFB }, 
-	{ 0xDDB9, 0x8D74 }, { 0xDDBA, 0x8DBA }, { 0xDDBB, 0x90E8 }, { 0xDDBC, 0x91DC }, { 0xDDBD, 0x961C }, { 0xDDBE, 0x9644 }, { 0xDDBF, 0x99D9 }, { 0xDDC0, 0x9CE7 }, 
-	{ 0xDDC1, 0x5317 }, { 0xDDC2, 0x5206 }, { 0xDDC3, 0x5429 }, { 0xDDC4, 0x5674 }, { 0xDDC5, 0x58B3 }, { 0xDDC6, 0x5954 }, { 0xDDC7, 0x596E }, { 0xDDC8, 0x5FFF }, 
-	{ 0xDDC9, 0x61A4 }, { 0xDDCA, 0x626E }, { 0xDDCB, 0x6610 }, { 0xDDCC, 0x6C7E }, { 0xDDCD, 0x711A }, { 0xDDCE, 0x76C6 }, { 0xDDCF, 0x7C89 }, { 0xDDD0, 0x7CDE }, 
-	{ 0xDDD1, 0x7D1B }, { 0xDDD2, 0x82AC }, { 0xDDD3, 0x8CC1 }, { 0xDDD4, 0x96F0 }, { 0xDDD5, 0xF967 }, { 0xDDD6, 0x4F5B }, { 0xDDD7, 0x5F17 }, { 0xDDD8, 0x5F7F }, 
-	{ 0xDDD9, 0x62C2 }, { 0xDDDA, 0x5D29 }, { 0xDDDB, 0x670B }, { 0xDDDC, 0x68DA }, { 0xDDDD, 0x787C }, { 0xDDDE, 0x7E43 }, { 0xDDDF, 0x9D6C }, { 0xDDE0, 0x4E15 }, 
-	{ 0xDDE1, 0x5099 }, { 0xDDE2, 0x5315 }, { 0xDDE3, 0x532A }, { 0xDDE4, 0x5351 }, { 0xDDE5, 0x5983 }, { 0xDDE6, 0x5A62 }, { 0xDDE7, 0x5E87 }, { 0xDDE8, 0x60B2 }, 
-	{ 0xDDE9, 0x618A }, { 0xDDEA, 0x6249 }, { 0xDDEB, 0x6279 }, { 0xDDEC, 0x6590 }, { 0xDDED, 0x6787 }, { 0xDDEE, 0x69A7 }, { 0xDDEF, 0x6BD4 }, { 0xDDF0, 0x6BD6 }, 
-	{ 0xDDF1, 0x6BD7 }, { 0xDDF2, 0x6BD8 }, { 0xDDF3, 0x6CB8 }, { 0xDDF4, 0xF968 }, { 0xDDF5, 0x7435 }, { 0xDDF6, 0x75FA }, { 0xDDF7, 0x7812 }, { 0xDDF8, 0x7891 }, 
-	{ 0xDDF9, 0x79D5 }, { 0xDDFA, 0x79D8 }, { 0xDDFB, 0x7C83 }, { 0xDDFC, 0x7DCB }, { 0xDDFD, 0x7FE1 }, { 0xDDFE, 0x80A5 }, { 0xDEA1, 0x813E }, { 0xDEA2, 0x81C2 }, 
-	{ 0xDEA3, 0x83F2 }, { 0xDEA4, 0x871A }, { 0xDEA5, 0x88E8 }, { 0xDEA6, 0x8AB9 }, { 0xDEA7, 0x8B6C }, { 0xDEA8, 0x8CBB }, { 0xDEA9, 0x9119 }, { 0xDEAA, 0x975E }, 
-	{ 0xDEAB, 0x98DB }, { 0xDEAC, 0x9F3B }, { 0xDEAD, 0x56AC }, { 0xDEAE, 0x5B2A }, { 0xDEAF, 0x5F6C }, { 0xDEB0, 0x658C }, { 0xDEB1, 0x6AB3 }, { 0xDEB2, 0x6BAF }, 
-	{ 0xDEB3, 0x6D5C }, { 0xDEB4, 0x6FF1 }, { 0xDEB5, 0x7015 }, { 0xDEB6, 0x725D }, { 0xDEB7, 0x73AD }, { 0xDEB8, 0x8CA7 }, { 0xDEB9, 0x8CD3 }, { 0xDEBA, 0x983B }, 
-	{ 0xDEBB, 0x6191 }, { 0xDEBC, 0x6C37 }, { 0xDEBD, 0x8058 }, { 0xDEBE, 0x9A01 }, { 0xDEBF, 0x4E4D }, { 0xDEC0, 0x4E8B }, { 0xDEC1, 0x4E9B }, { 0xDEC2, 0x4ED5 }, 
-	{ 0xDEC3, 0x4F3A }, { 0xDEC4, 0x4F3C }, { 0xDEC5, 0x4F7F }, { 0xDEC6, 0x4FDF }, { 0xDEC7, 0x50FF }, { 0xDEC8, 0x53F2 }, { 0xDEC9, 0x53F8 }, { 0xDECA, 0x5506 }, 
-	{ 0xDECB, 0x55E3 }, { 0xDECC, 0x56DB }, { 0xDECD, 0x58EB }, { 0xDECE, 0x5962 }, { 0xDECF, 0x5A11 }, { 0xDED0, 0x5BEB }, { 0xDED1, 0x5BFA }, { 0xDED2, 0x5C04 }, 
-	{ 0xDED3, 0x5DF3 }, { 0xDED4, 0x5E2B }, { 0xDED5, 0x5F99 }, { 0xDED6, 0x601D }, { 0xDED7, 0x6368 }, { 0xDED8, 0x659C }, { 0xDED9, 0x65AF }, { 0xDEDA, 0x67F6 }, 
-	{ 0xDEDB, 0x67FB }, { 0xDEDC, 0x68AD }, { 0xDEDD, 0x6B7B }, { 0xDEDE, 0x6C99 }, { 0xDEDF, 0x6CD7 }, { 0xDEE0, 0x6E23 }, { 0xDEE1, 0x7009 }, { 0xDEE2, 0x7345 }, 
-	{ 0xDEE3, 0x7802 }, { 0xDEE4, 0x793E }, { 0xDEE5, 0x7940 }, { 0xDEE6, 0x7960 }, { 0xDEE7, 0x79C1 }, { 0xDEE8, 0x7BE9 }, { 0xDEE9, 0x7D17 }, { 0xDEEA, 0x7D72 }, 
-	{ 0xDEEB, 0x8086 }, { 0xDEEC, 0x820D }, { 0xDEED, 0x838E }, { 0xDEEE, 0x84D1 }, { 0xDEEF, 0x86C7 }, { 0xDEF0, 0x88DF }, { 0xDEF1, 0x8A50 }, { 0xDEF2, 0x8A5E }, 
-	{ 0xDEF3, 0x8B1D }, { 0xDEF4, 0x8CDC }, { 0xDEF5, 0x8D66 }, { 0xDEF6, 0x8FAD }, { 0xDEF7, 0x90AA }, { 0xDEF8, 0x98FC }, { 0xDEF9, 0x99DF }, { 0xDEFA, 0x9E9D }, 
-	{ 0xDEFB, 0x524A }, { 0xDEFC, 0xF969 }, { 0xDEFD, 0x6714 }, { 0xDEFE, 0xF96A }, { 0xDFA1, 0x5098 }, { 0xDFA2, 0x522A }, { 0xDFA3, 0x5C71 }, { 0xDFA4, 0x6563 }, 
-	{ 0xDFA5, 0x6C55 }, { 0xDFA6, 0x73CA }, { 0xDFA7, 0x7523 }, { 0xDFA8, 0x759D }, { 0xDFA9, 0x7B97 }, { 0xDFAA, 0x849C }, { 0xDFAB, 0x9178 }, { 0xDFAC, 0x9730 }, 
-	{ 0xDFAD, 0x4E77 }, { 0xDFAE, 0x6492 }, { 0xDFAF, 0x6BBA }, { 0xDFB0, 0x715E }, { 0xDFB1, 0x85A9 }, { 0xDFB2, 0x4E09 }, { 0xDFB3, 0xF96B }, { 0xDFB4, 0x6749 }, 
-	{ 0xDFB5, 0x68EE }, { 0xDFB6, 0x6E17 }, { 0xDFB7, 0x829F }, { 0xDFB8, 0x8518 }, { 0xDFB9, 0x886B }, { 0xDFBA, 0x63F7 }, { 0xDFBB, 0x6F81 }, { 0xDFBC, 0x9212 }, 
-	{ 0xDFBD, 0x98AF }, { 0xDFBE, 0x4E0A }, { 0xDFBF, 0x50B7 }, { 0xDFC0, 0x50CF }, { 0xDFC1, 0x511F }, { 0xDFC2, 0x5546 }, { 0xDFC3, 0x55AA }, { 0xDFC4, 0x5617 }, 
-	{ 0xDFC5, 0x5B40 }, { 0xDFC6, 0x5C19 }, { 0xDFC7, 0x5CE0 }, { 0xDFC8, 0x5E38 }, { 0xDFC9, 0x5E8A }, { 0xDFCA, 0x5EA0 }, { 0xDFCB, 0x5EC2 }, { 0xDFCC, 0x60F3 }, 
-	{ 0xDFCD, 0x6851 }, { 0xDFCE, 0x6A61 }, { 0xDFCF, 0x6E58 }, { 0xDFD0, 0x723D }, { 0xDFD1, 0x7240 }, { 0xDFD2, 0x72C0 }, { 0xDFD3, 0x76F8 }, { 0xDFD4, 0x7965 }, 
-	{ 0xDFD5, 0x7BB1 }, { 0xDFD6, 0x7FD4 }, { 0xDFD7, 0x88F3 }, { 0xDFD8, 0x89F4 }, { 0xDFD9, 0x8A73 }, { 0xDFDA, 0x8C61 }, { 0xDFDB, 0x8CDE }, { 0xDFDC, 0x971C }, 
-	{ 0xDFDD, 0x585E }, { 0xDFDE, 0x74BD }, { 0xDFDF, 0x8CFD }, { 0xDFE0, 0x55C7 }, { 0xDFE1, 0xF96C }, { 0xDFE2, 0x7A61 }, { 0xDFE3, 0x7D22 }, { 0xDFE4, 0x8272 }, 
-	{ 0xDFE5, 0x7272 }, { 0xDFE6, 0x751F }, { 0xDFE7, 0x7525 }, { 0xDFE8, 0xF96D }, { 0xDFE9, 0x7B19 }, { 0xDFEA, 0x5885 }, { 0xDFEB, 0x58FB }, { 0xDFEC, 0x5DBC }, 
-	{ 0xDFED, 0x5E8F }, { 0xDFEE, 0x5EB6 }, { 0xDFEF, 0x5F90 }, { 0xDFF0, 0x6055 }, { 0xDFF1, 0x6292 }, { 0xDFF2, 0x637F }, { 0xDFF3, 0x654D }, { 0xDFF4, 0x6691 }, 
-	{ 0xDFF5, 0x66D9 }, { 0xDFF6, 0x66F8 }, { 0xDFF7, 0x6816 }, { 0xDFF8, 0x68F2 }, { 0xDFF9, 0x7280 }, { 0xDFFA, 0x745E }, { 0xDFFB, 0x7B6E }, { 0xDFFC, 0x7D6E }, 
-	{ 0xDFFD, 0x7DD6 }, { 0xDFFE, 0x7F72 }, { 0xE0A1, 0x80E5 }, { 0xE0A2, 0x8212 }, { 0xE0A3, 0x85AF }, { 0xE0A4, 0x897F }, { 0xE0A5, 0x8A93 }, { 0xE0A6, 0x901D }, 
-	{ 0xE0A7, 0x92E4 }, { 0xE0A8, 0x9ECD }, { 0xE0A9, 0x9F20 }, { 0xE0AA, 0x5915 }, { 0xE0AB, 0x596D }, { 0xE0AC, 0x5E2D }, { 0xE0AD, 0x60DC }, { 0xE0AE, 0x6614 }, 
-	{ 0xE0AF, 0x6673 }, { 0xE0B0, 0x6790 }, { 0xE0B1, 0x6C50 }, { 0xE0B2, 0x6DC5 }, { 0xE0B3, 0x6F5F }, { 0xE0B4, 0x77F3 }, { 0xE0B5, 0x78A9 }, { 0xE0B6, 0x84C6 }, 
-	{ 0xE0B7, 0x91CB }, { 0xE0B8, 0x932B }, { 0xE0B9, 0x4ED9 }, { 0xE0BA, 0x50CA }, { 0xE0BB, 0x5148 }, { 0xE0BC, 0x5584 }, { 0xE0BD, 0x5B0B }, { 0xE0BE, 0x5BA3 }, 
-	{ 0xE0BF, 0x6247 }, { 0xE0C0, 0x657E }, { 0xE0C1, 0x65CB }, { 0xE0C2, 0x6E32 }, { 0xE0C3, 0x717D }, { 0xE0C4, 0x7401 }, { 0xE0C5, 0x7444 }, { 0xE0C6, 0x7487 }, 
-	{ 0xE0C7, 0x74BF }, { 0xE0C8, 0x766C }, { 0xE0C9, 0x79AA }, { 0xE0CA, 0x7DDA }, { 0xE0CB, 0x7E55 }, { 0xE0CC, 0x7FA8 }, { 0xE0CD, 0x817A }, { 0xE0CE, 0x81B3 }, 
-	{ 0xE0CF, 0x8239 }, { 0xE0D0, 0x861A }, { 0xE0D1, 0x87EC }, { 0xE0D2, 0x8A75 }, { 0xE0D3, 0x8DE3 }, { 0xE0D4, 0x9078 }, { 0xE0D5, 0x9291 }, { 0xE0D6, 0x9425 }, 
-	{ 0xE0D7, 0x994D }, { 0xE0D8, 0x9BAE }, { 0xE0D9, 0x5368 }, { 0xE0DA, 0x5C51 }, { 0xE0DB, 0x6954 }, { 0xE0DC, 0x6CC4 }, { 0xE0DD, 0x6D29 }, { 0xE0DE, 0x6E2B }, 
-	{ 0xE0DF, 0x820C }, { 0xE0E0, 0x859B }, { 0xE0E1, 0x893B }, { 0xE0E2, 0x8A2D }, { 0xE0E3, 0x8AAA }, { 0xE0E4, 0x96EA }, { 0xE0E5, 0x9F67 }, { 0xE0E6, 0x5261 }, 
-	{ 0xE0E7, 0x66B9 }, { 0xE0E8, 0x6BB2 }, { 0xE0E9, 0x7E96 }, { 0xE0EA, 0x87FE }, { 0xE0EB, 0x8D0D }, { 0xE0EC, 0x9583 }, { 0xE0ED, 0x965D }, { 0xE0EE, 0x651D }, 
-	{ 0xE0EF, 0x6D89 }, { 0xE0F0, 0x71EE }, { 0xE0F1, 0xF96E }, { 0xE0F2, 0x57CE }, { 0xE0F3, 0x59D3 }, { 0xE0F4, 0x5BAC }, { 0xE0F5, 0x6027 }, { 0xE0F6, 0x60FA }, 
-	{ 0xE0F7, 0x6210 }, { 0xE0F8, 0x661F }, { 0xE0F9, 0x665F }, { 0xE0FA, 0x7329 }, { 0xE0FB, 0x73F9 }, { 0xE0FC, 0x76DB }, { 0xE0FD, 0x7701 }, { 0xE0FE, 0x7B6C }, 
-	{ 0xE1A1, 0x8056 }, { 0xE1A2, 0x8072 }, { 0xE1A3, 0x8165 }, { 0xE1A4, 0x8AA0 }, { 0xE1A5, 0x9192 }, { 0xE1A6, 0x4E16 }, { 0xE1A7, 0x52E2 }, { 0xE1A8, 0x6B72 }, 
-	{ 0xE1A9, 0x6D17 }, { 0xE1AA, 0x7A05 }, { 0xE1AB, 0x7B39 }, { 0xE1AC, 0x7D30 }, { 0xE1AD, 0xF96F }, { 0xE1AE, 0x8CB0 }, { 0xE1AF, 0x53EC }, { 0xE1B0, 0x562F }, 
-	{ 0xE1B1, 0x5851 }, { 0xE1B2, 0x5BB5 }, { 0xE1B3, 0x5C0F }, { 0xE1B4, 0x5C11 }, { 0xE1B5, 0x5DE2 }, { 0xE1B6, 0x6240 }, { 0xE1B7, 0x6383 }, { 0xE1B8, 0x6414 }, 
-	{ 0xE1B9, 0x662D }, { 0xE1BA, 0x68B3 }, { 0xE1BB, 0x6CBC }, { 0xE1BC, 0x6D88 }, { 0xE1BD, 0x6EAF }, { 0xE1BE, 0x701F }, { 0xE1BF, 0x70A4 }, { 0xE1C0, 0x71D2 }, 
-	{ 0xE1C1, 0x7526 }, { 0xE1C2, 0x758F }, { 0xE1C3, 0x758E }, { 0xE1C4, 0x7619 }, { 0xE1C5, 0x7B11 }, { 0xE1C6, 0x7BE0 }, { 0xE1C7, 0x7C2B }, { 0xE1C8, 0x7D20 }, 
-	{ 0xE1C9, 0x7D39 }, { 0xE1CA, 0x852C }, { 0xE1CB, 0x856D }, { 0xE1CC, 0x8607 }, { 0xE1CD, 0x8A34 }, { 0xE1CE, 0x900D }, { 0xE1CF, 0x9061 }, { 0xE1D0, 0x90B5 }, 
-	{ 0xE1D1, 0x92B7 }, { 0xE1D2, 0x97F6 }, { 0xE1D3, 0x9A37 }, { 0xE1D4, 0x4FD7 }, { 0xE1D5, 0x5C6C }, { 0xE1D6, 0x675F }, { 0xE1D7, 0x6D91 }, { 0xE1D8, 0x7C9F }, 
-	{ 0xE1D9, 0x7E8C }, { 0xE1DA, 0x8B16 }, { 0xE1DB, 0x8D16 }, { 0xE1DC, 0x901F }, { 0xE1DD, 0x5B6B }, { 0xE1DE, 0x5DFD }, { 0xE1DF, 0x640D }, { 0xE1E0, 0x84C0 }, 
-	{ 0xE1E1, 0x905C }, { 0xE1E2, 0x98E1 }, { 0xE1E3, 0x7387 }, { 0xE1E4, 0x5B8B }, { 0xE1E5, 0x609A }, { 0xE1E6, 0x677E }, { 0xE1E7, 0x6DDE }, { 0xE1E8, 0x8A1F }, 
-	{ 0xE1E9, 0x8AA6 }, { 0xE1EA, 0x9001 }, { 0xE1EB, 0x980C }, { 0xE1EC, 0x5237 }, { 0xE1ED, 0xF970 }, { 0xE1EE, 0x7051 }, { 0xE1EF, 0x788E }, { 0xE1F0, 0x9396 }, 
-	{ 0xE1F1, 0x8870 }, { 0xE1F2, 0x91D7 }, { 0xE1F3, 0x4FEE }, { 0xE1F4, 0x53D7 }, { 0xE1F5, 0x55FD }, { 0xE1F6, 0x56DA }, { 0xE1F7, 0x5782 }, { 0xE1F8, 0x58FD }, 
-	{ 0xE1F9, 0x5AC2 }, { 0xE1FA, 0x5B88 }, { 0xE1FB, 0x5CAB }, { 0xE1FC, 0x5CC0 }, { 0xE1FD, 0x5E25 }, { 0xE1FE, 0x6101 }, { 0xE2A1, 0x620D }, { 0xE2A2, 0x624B }, 
-	{ 0xE2A3, 0x6388 }, { 0xE2A4, 0x641C }, { 0xE2A5, 0x6536 }, { 0xE2A6, 0x6578 }, { 0xE2A7, 0x6A39 }, { 0xE2A8, 0x6B8A }, { 0xE2A9, 0x6C34 }, { 0xE2AA, 0x6D19 }, 
-	{ 0xE2AB, 0x6F31 }, { 0xE2AC, 0x71E7 }, { 0xE2AD, 0x72E9 }, { 0xE2AE, 0x7378 }, { 0xE2AF, 0x7407 }, { 0xE2B0, 0x74B2 }, { 0xE2B1, 0x7626 }, { 0xE2B2, 0x7761 }, 
-	{ 0xE2B3, 0x79C0 }, { 0xE2B4, 0x7A57 }, { 0xE2B5, 0x7AEA }, { 0xE2B6, 0x7CB9 }, { 0xE2B7, 0x7D8F }, { 0xE2B8, 0x7DAC }, { 0xE2B9, 0x7E61 }, { 0xE2BA, 0x7F9E }, 
-	{ 0xE2BB, 0x8129 }, { 0xE2BC, 0x8331 }, { 0xE2BD, 0x8490 }, { 0xE2BE, 0x84DA }, { 0xE2BF, 0x85EA }, { 0xE2C0, 0x8896 }, { 0xE2C1, 0x8AB0 }, { 0xE2C2, 0x8B90 }, 
-	{ 0xE2C3, 0x8F38 }, { 0xE2C4, 0x9042 }, { 0xE2C5, 0x9083 }, { 0xE2C6, 0x916C }, { 0xE2C7, 0x9296 }, { 0xE2C8, 0x92B9 }, { 0xE2C9, 0x968B }, { 0xE2CA, 0x96A7 }, 
-	{ 0xE2CB, 0x96A8 }, { 0xE2CC, 0x96D6 }, { 0xE2CD, 0x9700 }, { 0xE2CE, 0x9808 }, { 0xE2CF, 0x9996 }, { 0xE2D0, 0x9AD3 }, { 0xE2D1, 0x9B1A }, { 0xE2D2, 0x53D4 }, 
-	{ 0xE2D3, 0x587E }, { 0xE2D4, 0x5919 }, { 0xE2D5, 0x5B70 }, { 0xE2D6, 0x5BBF }, { 0xE2D7, 0x6DD1 }, { 0xE2D8, 0x6F5A }, { 0xE2D9, 0x719F }, { 0xE2DA, 0x7421 }, 
-	{ 0xE2DB, 0x74B9 }, { 0xE2DC, 0x8085 }, { 0xE2DD, 0x83FD }, { 0xE2DE, 0x5DE1 }, { 0xE2DF, 0x5F87 }, { 0xE2E0, 0x5FAA }, { 0xE2E1, 0x6042 }, { 0xE2E2, 0x65EC }, 
-	{ 0xE2E3, 0x6812 }, { 0xE2E4, 0x696F }, { 0xE2E5, 0x6A53 }, { 0xE2E6, 0x6B89 }, { 0xE2E7, 0x6D35 }, { 0xE2E8, 0x6DF3 }, { 0xE2E9, 0x73E3 }, { 0xE2EA, 0x76FE }, 
-	{ 0xE2EB, 0x77AC }, { 0xE2EC, 0x7B4D }, { 0xE2ED, 0x7D14 }, { 0xE2EE, 0x8123 }, { 0xE2EF, 0x821C }, { 0xE2F0, 0x8340 }, { 0xE2F1, 0x84F4 }, { 0xE2F2, 0x8563 }, 
-	{ 0xE2F3, 0x8A62 }, { 0xE2F4, 0x8AC4 }, { 0xE2F5, 0x9187 }, { 0xE2F6, 0x931E }, { 0xE2F7, 0x9806 }, { 0xE2F8, 0x99B4 }, { 0xE2F9, 0x620C }, { 0xE2FA, 0x8853 }, 
-	{ 0xE2FB, 0x8FF0 }, { 0xE2FC, 0x9265 }, { 0xE2FD, 0x5D07 }, { 0xE2FE, 0x5D27 }, { 0xE3A1, 0x5D69 }, { 0xE3A2, 0x745F }, { 0xE3A3, 0x819D }, { 0xE3A4, 0x8768 }, 
-	{ 0xE3A5, 0x6FD5 }, { 0xE3A6, 0x62FE }, { 0xE3A7, 0x7FD2 }, { 0xE3A8, 0x8936 }, { 0xE3A9, 0x8972 }, { 0xE3AA, 0x4E1E }, { 0xE3AB, 0x4E58 }, { 0xE3AC, 0x50E7 }, 
-	{ 0xE3AD, 0x52DD }, { 0xE3AE, 0x5347 }, { 0xE3AF, 0x627F }, { 0xE3B0, 0x6607 }, { 0xE3B1, 0x7E69 }, { 0xE3B2, 0x8805 }, { 0xE3B3, 0x965E }, { 0xE3B4, 0x4F8D }, 
-	{ 0xE3B5, 0x5319 }, { 0xE3B6, 0x5636 }, { 0xE3B7, 0x59CB }, { 0xE3B8, 0x5AA4 }, { 0xE3B9, 0x5C38 }, { 0xE3BA, 0x5C4E }, { 0xE3BB, 0x5C4D }, { 0xE3BC, 0x5E02 }, 
-	{ 0xE3BD, 0x5F11 }, { 0xE3BE, 0x6043 }, { 0xE3BF, 0x65BD }, { 0xE3C0, 0x662F }, { 0xE3C1, 0x6642 }, { 0xE3C2, 0x67BE }, { 0xE3C3, 0x67F4 }, { 0xE3C4, 0x731C }, 
-	{ 0xE3C5, 0x77E2 }, { 0xE3C6, 0x793A }, { 0xE3C7, 0x7FC5 }, { 0xE3C8, 0x8494 }, { 0xE3C9, 0x84CD }, { 0xE3CA, 0x8996 }, { 0xE3CB, 0x8A66 }, { 0xE3CC, 0x8A69 }, 
-	{ 0xE3CD, 0x8AE1 }, { 0xE3CE, 0x8C55 }, { 0xE3CF, 0x8C7A }, { 0xE3D0, 0x57F4 }, { 0xE3D1, 0x5BD4 }, { 0xE3D2, 0x5F0F }, { 0xE3D3, 0x606F }, { 0xE3D4, 0x62ED }, 
-	{ 0xE3D5, 0x690D }, { 0xE3D6, 0x6B96 }, { 0xE3D7, 0x6E5C }, { 0xE3D8, 0x7184 }, { 0xE3D9, 0x7BD2 }, { 0xE3DA, 0x8755 }, { 0xE3DB, 0x8B58 }, { 0xE3DC, 0x8EFE }, 
-	{ 0xE3DD, 0x98DF }, { 0xE3DE, 0x98FE }, { 0xE3DF, 0x4F38 }, { 0xE3E0, 0x4F81 }, { 0xE3E1, 0x4FE1 }, { 0xE3E2, 0x547B }, { 0xE3E3, 0x5A20 }, { 0xE3E4, 0x5BB8 }, 
-	{ 0xE3E5, 0x613C }, { 0xE3E6, 0x65B0 }, { 0xE3E7, 0x6668 }, { 0xE3E8, 0x71FC }, { 0xE3E9, 0x7533 }, { 0xE3EA, 0x795E }, { 0xE3EB, 0x7D33 }, { 0xE3EC, 0x814E }, 
-	{ 0xE3ED, 0x81E3 }, { 0xE3EE, 0x8398 }, { 0xE3EF, 0x85AA }, { 0xE3F0, 0x85CE }, { 0xE3F1, 0x8703 }, { 0xE3F2, 0x8A0A }, { 0xE3F3, 0x8EAB }, { 0xE3F4, 0x8F9B }, 
-	{ 0xE3F5, 0xF971 }, { 0xE3F6, 0x8FC5 }, { 0xE3F7, 0x5931 }, { 0xE3F8, 0x5BA4 }, { 0xE3F9, 0x5BE6 }, { 0xE3FA, 0x6089 }, { 0xE3FB, 0x5BE9 }, { 0xE3FC, 0x5C0B }, 
-	{ 0xE3FD, 0x5FC3 }, { 0xE3FE, 0x6C81 }, { 0xE4A1, 0xF972 }, { 0xE4A2, 0x6DF1 }, { 0xE4A3, 0x700B }, { 0xE4A4, 0x751A }, { 0xE4A5, 0x82AF }, { 0xE4A6, 0x8AF6 }, 
-	{ 0xE4A7, 0x4EC0 }, { 0xE4A8, 0x5341 }, { 0xE4A9, 0xF973 }, { 0xE4AA, 0x96D9 }, { 0xE4AB, 0x6C0F }, { 0xE4AC, 0x4E9E }, { 0xE4AD, 0x4FC4 }, { 0xE4AE, 0x5152 }, 
-	{ 0xE4AF, 0x555E }, { 0xE4B0, 0x5A25 }, { 0xE4B1, 0x5CE8 }, { 0xE4B2, 0x6211 }, { 0xE4B3, 0x7259 }, { 0xE4B4, 0x82BD }, { 0xE4B5, 0x83AA }, { 0xE4B6, 0x86FE }, 
-	{ 0xE4B7, 0x8859 }, { 0xE4B8, 0x8A1D }, { 0xE4B9, 0x963F }, { 0xE4BA, 0x96C5 }, { 0xE4BB, 0x9913 }, { 0xE4BC, 0x9D09 }, { 0xE4BD, 0x9D5D }, { 0xE4BE, 0x580A }, 
-	{ 0xE4BF, 0x5CB3 }, { 0xE4C0, 0x5DBD }, { 0xE4C1, 0x5E44 }, { 0xE4C2, 0x60E1 }, { 0xE4C3, 0x6115 }, { 0xE4C4, 0x63E1 }, { 0xE4C5, 0x6A02 }, { 0xE4C6, 0x6E25 }, 
-	{ 0xE4C7, 0x9102 }, { 0xE4C8, 0x9354 }, { 0xE4C9, 0x984E }, { 0xE4CA, 0x9C10 }, { 0xE4CB, 0x9F77 }, { 0xE4CC, 0x5B89 }, { 0xE4CD, 0x5CB8 }, { 0xE4CE, 0x6309 }, 
-	{ 0xE4CF, 0x664F }, { 0xE4D0, 0x6848 }, { 0xE4D1, 0x773C }, { 0xE4D2, 0x96C1 }, { 0xE4D3, 0x978D }, { 0xE4D4, 0x9854 }, { 0xE4D5, 0x9B9F }, { 0xE4D6, 0x65A1 }, 
-	{ 0xE4D7, 0x8B01 }, { 0xE4D8, 0x8ECB }, { 0xE4D9, 0x95BC }, { 0xE4DA, 0x5535 }, { 0xE4DB, 0x5CA9 }, { 0xE4DC, 0x5DD6 }, { 0xE4DD, 0x5EB5 }, { 0xE4DE, 0x6697 }, 
-	{ 0xE4DF, 0x764C }, { 0xE4E0, 0x83F4 }, { 0xE4E1, 0x95C7 }, { 0xE4E2, 0x58D3 }, { 0xE4E3, 0x62BC }, { 0xE4E4, 0x72CE }, { 0xE4E5, 0x9D28 }, { 0xE4E6, 0x4EF0 }, 
-	{ 0xE4E7, 0x592E }, { 0xE4E8, 0x600F }, { 0xE4E9, 0x663B }, { 0xE4EA, 0x6B83 }, { 0xE4EB, 0x79E7 }, { 0xE4EC, 0x9D26 }, { 0xE4ED, 0x5393 }, { 0xE4EE, 0x54C0 }, 
-	{ 0xE4EF, 0x57C3 }, { 0xE4F0, 0x5D16 }, { 0xE4F1, 0x611B }, { 0xE4F2, 0x66D6 }, { 0xE4F3, 0x6DAF }, { 0xE4F4, 0x788D }, { 0xE4F5, 0x827E }, { 0xE4F6, 0x9698 }, 
-	{ 0xE4F7, 0x9744 }, { 0xE4F8, 0x5384 }, { 0xE4F9, 0x627C }, { 0xE4FA, 0x6396 }, { 0xE4FB, 0x6DB2 }, { 0xE4FC, 0x7E0A }, { 0xE4FD, 0x814B }, { 0xE4FE, 0x984D }, 
-	{ 0xE5A1, 0x6AFB }, { 0xE5A2, 0x7F4C }, { 0xE5A3, 0x9DAF }, { 0xE5A4, 0x9E1A }, { 0xE5A5, 0x4E5F }, { 0xE5A6, 0x503B }, { 0xE5A7, 0x51B6 }, { 0xE5A8, 0x591C }, 
-	{ 0xE5A9, 0x60F9 }, { 0xE5AA, 0x63F6 }, { 0xE5AB, 0x6930 }, { 0xE5AC, 0x723A }, { 0xE5AD, 0x8036 }, { 0xE5AE, 0xF974 }, { 0xE5AF, 0x91CE }, { 0xE5B0, 0x5F31 }, 
-	{ 0xE5B1, 0xF975 }, { 0xE5B2, 0xF976 }, { 0xE5B3, 0x7D04 }, { 0xE5B4, 0x82E5 }, { 0xE5B5, 0x846F }, { 0xE5B6, 0x84BB }, { 0xE5B7, 0x85E5 }, { 0xE5B8, 0x8E8D }, 
-	{ 0xE5B9, 0xF977 }, { 0xE5BA, 0x4F6F }, { 0xE5BB, 0xF978 }, { 0xE5BC, 0xF979 }, { 0xE5BD, 0x58E4 }, { 0xE5BE, 0x5B43 }, { 0xE5BF, 0x6059 }, { 0xE5C0, 0x63DA }, 
-	{ 0xE5C1, 0x6518 }, { 0xE5C2, 0x656D }, { 0xE5C3, 0x6698 }, { 0xE5C4, 0xF97A }, { 0xE5C5, 0x694A }, { 0xE5C6, 0x6A23 }, { 0xE5C7, 0x6D0B }, { 0xE5C8, 0x7001 }, 
-	{ 0xE5C9, 0x716C }, { 0xE5CA, 0x75D2 }, { 0xE5CB, 0x760D }, { 0xE5CC, 0x79B3 }, { 0xE5CD, 0x7A70 }, { 0xE5CE, 0xF97B }, { 0xE5CF, 0x7F8A }, { 0xE5D0, 0xF97C }, 
-	{ 0xE5D1, 0x8944 }, { 0xE5D2, 0xF97D }, { 0xE5D3, 0x8B93 }, { 0xE5D4, 0x91C0 }, { 0xE5D5, 0x967D }, { 0xE5D6, 0xF97E }, { 0xE5D7, 0x990A }, { 0xE5D8, 0x5704 }, 
-	{ 0xE5D9, 0x5FA1 }, { 0xE5DA, 0x65BC }, { 0xE5DB, 0x6F01 }, { 0xE5DC, 0x7600 }, { 0xE5DD, 0x79A6 }, { 0xE5DE, 0x8A9E }, { 0xE5DF, 0x99AD }, { 0xE5E0, 0x9B5A }, 
-	{ 0xE5E1, 0x9F6C }, { 0xE5E2, 0x5104 }, { 0xE5E3, 0x61B6 }, { 0xE5E4, 0x6291 }, { 0xE5E5, 0x6A8D }, { 0xE5E6, 0x81C6 }, { 0xE5E7, 0x5043 }, { 0xE5E8, 0x5830 }, 
-	{ 0xE5E9, 0x5F66 }, { 0xE5EA, 0x7109 }, { 0xE5EB, 0x8A00 }, { 0xE5EC, 0x8AFA }, { 0xE5ED, 0x5B7C }, { 0xE5EE, 0x8616 }, { 0xE5EF, 0x4FFA }, { 0xE5F0, 0x513C }, 
-	{ 0xE5F1, 0x56B4 }, { 0xE5F2, 0x5944 }, { 0xE5F3, 0x63A9 }, { 0xE5F4, 0x6DF9 }, { 0xE5F5, 0x5DAA }, { 0xE5F6, 0x696D }, { 0xE5F7, 0x5186 }, { 0xE5F8, 0x4E88 }, 
-	{ 0xE5F9, 0x4F59 }, { 0xE5FA, 0xF97F }, { 0xE5FB, 0xF980 }, { 0xE5FC, 0xF981 }, { 0xE5FD, 0x5982 }, { 0xE5FE, 0xF982 }, { 0xE6A1, 0xF983 }, { 0xE6A2, 0x6B5F }, 
-	{ 0xE6A3, 0x6C5D }, { 0xE6A4, 0xF984 }, { 0xE6A5, 0x74B5 }, { 0xE6A6, 0x7916 }, { 0xE6A7, 0xF985 }, { 0xE6A8, 0x8207 }, { 0xE6A9, 0x8245 }, { 0xE6AA, 0x8339 }, 
-	{ 0xE6AB, 0x8F3F }, { 0xE6AC, 0x8F5D }, { 0xE6AD, 0xF986 }, { 0xE6AE, 0x9918 }, { 0xE6AF, 0xF987 }, { 0xE6B0, 0xF988 }, { 0xE6B1, 0xF989 }, { 0xE6B2, 0x4EA6 }, 
-	{ 0xE6B3, 0xF98A }, { 0xE6B4, 0x57DF }, { 0xE6B5, 0x5F79 }, { 0xE6B6, 0x6613 }, { 0xE6B7, 0xF98B }, { 0xE6B8, 0xF98C }, { 0xE6B9, 0x75AB }, { 0xE6BA, 0x7E79 }, 
-	{ 0xE6BB, 0x8B6F }, { 0xE6BC, 0xF98D }, { 0xE6BD, 0x9006 }, { 0xE6BE, 0x9A5B }, { 0xE6BF, 0x56A5 }, { 0xE6C0, 0x5827 }, { 0xE6C1, 0x59F8 }, { 0xE6C2, 0x5A1F }, 
-	{ 0xE6C3, 0x5BB4 }, { 0xE6C4, 0xF98E }, { 0xE6C5, 0x5EF6 }, { 0xE6C6, 0xF98F }, { 0xE6C7, 0xF990 }, { 0xE6C8, 0x6350 }, { 0xE6C9, 0x633B }, { 0xE6CA, 0xF991 }, 
-	{ 0xE6CB, 0x693D }, { 0xE6CC, 0x6C87 }, { 0xE6CD, 0x6CBF }, { 0xE6CE, 0x6D8E }, { 0xE6CF, 0x6D93 }, { 0xE6D0, 0x6DF5 }, { 0xE6D1, 0x6F14 }, { 0xE6D2, 0xF992 }, 
-	{ 0xE6D3, 0x70DF }, { 0xE6D4, 0x7136 }, { 0xE6D5, 0x7159 }, { 0xE6D6, 0xF993 }, { 0xE6D7, 0x71C3 }, { 0xE6D8, 0x71D5 }, { 0xE6D9, 0xF994 }, { 0xE6DA, 0x784F }, 
-	{ 0xE6DB, 0x786F }, { 0xE6DC, 0xF995 }, { 0xE6DD, 0x7B75 }, { 0xE6DE, 0x7DE3 }, { 0xE6DF, 0xF996 }, { 0xE6E0, 0x7E2F }, { 0xE6E1, 0xF997 }, { 0xE6E2, 0x884D }, 
-	{ 0xE6E3, 0x8EDF }, { 0xE6E4, 0xF998 }, { 0xE6E5, 0xF999 }, { 0xE6E6, 0xF99A }, { 0xE6E7, 0x925B }, { 0xE6E8, 0xF99B }, { 0xE6E9, 0x9CF6 }, { 0xE6EA, 0xF99C }, 
-	{ 0xE6EB, 0xF99D }, { 0xE6EC, 0xF99E }, { 0xE6ED, 0x6085 }, { 0xE6EE, 0x6D85 }, { 0xE6EF, 0xF99F }, { 0xE6F0, 0x71B1 }, { 0xE6F1, 0xF9A0 }, { 0xE6F2, 0xF9A1 }, 
-	{ 0xE6F3, 0x95B1 }, { 0xE6F4, 0x53AD }, { 0xE6F5, 0xF9A2 }, { 0xE6F6, 0xF9A3 }, { 0xE6F7, 0xF9A4 }, { 0xE6F8, 0x67D3 }, { 0xE6F9, 0xF9A5 }, { 0xE6FA, 0x708E }, 
-	{ 0xE6FB, 0x7130 }, { 0xE6FC, 0x7430 }, { 0xE6FD, 0x8276 }, { 0xE6FE, 0x82D2 }, { 0xE7A1, 0xF9A6 }, { 0xE7A2, 0x95BB }, { 0xE7A3, 0x9AE5 }, { 0xE7A4, 0x9E7D }, 
-	{ 0xE7A5, 0x66C4 }, { 0xE7A6, 0xF9A7 }, { 0xE7A7, 0x71C1 }, { 0xE7A8, 0x8449 }, { 0xE7A9, 0xF9A8 }, { 0xE7AA, 0xF9A9 }, { 0xE7AB, 0x584B }, { 0xE7AC, 0xF9AA }, 
-	{ 0xE7AD, 0xF9AB }, { 0xE7AE, 0x5DB8 }, { 0xE7AF, 0x5F71 }, { 0xE7B0, 0xF9AC }, { 0xE7B1, 0x6620 }, { 0xE7B2, 0x668E }, { 0xE7B3, 0x6979 }, { 0xE7B4, 0x69AE }, 
-	{ 0xE7B5, 0x6C38 }, { 0xE7B6, 0x6CF3 }, { 0xE7B7, 0x6E36 }, { 0xE7B8, 0x6F41 }, { 0xE7B9, 0x6FDA }, { 0xE7BA, 0x701B }, { 0xE7BB, 0x702F }, { 0xE7BC, 0x7150 }, 
-	{ 0xE7BD, 0x71DF }, { 0xE7BE, 0x7370 }, { 0xE7BF, 0xF9AD }, { 0xE7C0, 0x745B }, { 0xE7C1, 0xF9AE }, { 0xE7C2, 0x74D4 }, { 0xE7C3, 0x76C8 }, { 0xE7C4, 0x7A4E }, 
-	{ 0xE7C5, 0x7E93 }, { 0xE7C6, 0xF9AF }, { 0xE7C7, 0xF9B0 }, { 0xE7C8, 0x82F1 }, { 0xE7C9, 0x8A60 }, { 0xE7CA, 0x8FCE }, { 0xE7CB, 0xF9B1 }, { 0xE7CC, 0x9348 }, 
-	{ 0xE7CD, 0xF9B2 }, { 0xE7CE, 0x9719 }, { 0xE7CF, 0xF9B3 }, { 0xE7D0, 0xF9B4 }, { 0xE7D1, 0x4E42 }, { 0xE7D2, 0x502A }, { 0xE7D3, 0xF9B5 }, { 0xE7D4, 0x5208 }, 
-	{ 0xE7D5, 0x53E1 }, { 0xE7D6, 0x66F3 }, { 0xE7D7, 0x6C6D }, { 0xE7D8, 0x6FCA }, { 0xE7D9, 0x730A }, { 0xE7DA, 0x777F }, { 0xE7DB, 0x7A62 }, { 0xE7DC, 0x82AE }, 
-	{ 0xE7DD, 0x85DD }, { 0xE7DE, 0x8602 }, { 0xE7DF, 0xF9B6 }, { 0xE7E0, 0x88D4 }, { 0xE7E1, 0x8A63 }, { 0xE7E2, 0x8B7D }, { 0xE7E3, 0x8C6B }, { 0xE7E4, 0xF9B7 }, 
-	{ 0xE7E5, 0x92B3 }, { 0xE7E6, 0xF9B8 }, { 0xE7E7, 0x9713 }, { 0xE7E8, 0x9810 }, { 0xE7E9, 0x4E94 }, { 0xE7EA, 0x4F0D }, { 0xE7EB, 0x4FC9 }, { 0xE7EC, 0x50B2 }, 
-	{ 0xE7ED, 0x5348 }, { 0xE7EE, 0x543E }, { 0xE7EF, 0x5433 }, { 0xE7F0, 0x55DA }, { 0xE7F1, 0x5862 }, { 0xE7F2, 0x58BA }, { 0xE7F3, 0x5967 }, { 0xE7F4, 0x5A1B }, 
-	{ 0xE7F5, 0x5BE4 }, { 0xE7F6, 0x609F }, { 0xE7F7, 0xF9B9 }, { 0xE7F8, 0x61CA }, { 0xE7F9, 0x6556 }, { 0xE7FA, 0x65FF }, { 0xE7FB, 0x6664 }, { 0xE7FC, 0x68A7 }, 
-	{ 0xE7FD, 0x6C5A }, { 0xE7FE, 0x6FB3 }, { 0xE8A1, 0x70CF }, { 0xE8A2, 0x71AC }, { 0xE8A3, 0x7352 }, { 0xE8A4, 0x7B7D }, { 0xE8A5, 0x8708 }, { 0xE8A6, 0x8AA4 }, 
-	{ 0xE8A7, 0x9C32 }, { 0xE8A8, 0x9F07 }, { 0xE8A9, 0x5C4B }, { 0xE8AA, 0x6C83 }, { 0xE8AB, 0x7344 }, { 0xE8AC, 0x7389 }, { 0xE8AD, 0x923A }, { 0xE8AE, 0x6EAB }, 
-	{ 0xE8AF, 0x7465 }, { 0xE8B0, 0x761F }, { 0xE8B1, 0x7A69 }, { 0xE8B2, 0x7E15 }, { 0xE8B3, 0x860A }, { 0xE8B4, 0x5140 }, { 0xE8B5, 0x58C5 }, { 0xE8B6, 0x64C1 }, 
-	{ 0xE8B7, 0x74EE }, { 0xE8B8, 0x7515 }, { 0xE8B9, 0x7670 }, { 0xE8BA, 0x7FC1 }, { 0xE8BB, 0x9095 }, { 0xE8BC, 0x96CD }, { 0xE8BD, 0x9954 }, { 0xE8BE, 0x6E26 }, 
-	{ 0xE8BF, 0x74E6 }, { 0xE8C0, 0x7AA9 }, { 0xE8C1, 0x7AAA }, { 0xE8C2, 0x81E5 }, { 0xE8C3, 0x86D9 }, { 0xE8C4, 0x8778 }, { 0xE8C5, 0x8A1B }, { 0xE8C6, 0x5A49 }, 
-	{ 0xE8C7, 0x5B8C }, { 0xE8C8, 0x5B9B }, { 0xE8C9, 0x68A1 }, { 0xE8CA, 0x6900 }, { 0xE8CB, 0x6D63 }, { 0xE8CC, 0x73A9 }, { 0xE8CD, 0x7413 }, { 0xE8CE, 0x742C }, 
-	{ 0xE8CF, 0x7897 }, { 0xE8D0, 0x7DE9 }, { 0xE8D1, 0x7FEB }, { 0xE8D2, 0x8118 }, { 0xE8D3, 0x8155 }, { 0xE8D4, 0x839E }, { 0xE8D5, 0x8C4C }, { 0xE8D6, 0x962E }, 
-	{ 0xE8D7, 0x9811 }, { 0xE8D8, 0x66F0 }, { 0xE8D9, 0x5F80 }, { 0xE8DA, 0x65FA }, { 0xE8DB, 0x6789 }, { 0xE8DC, 0x6C6A }, { 0xE8DD, 0x738B }, { 0xE8DE, 0x502D }, 
-	{ 0xE8DF, 0x5A03 }, { 0xE8E0, 0x6B6A }, { 0xE8E1, 0x77EE }, { 0xE8E2, 0x5916 }, { 0xE8E3, 0x5D6C }, { 0xE8E4, 0x5DCD }, { 0xE8E5, 0x7325 }, { 0xE8E6, 0x754F }, 
-	{ 0xE8E7, 0xF9BA }, { 0xE8E8, 0xF9BB }, { 0xE8E9, 0x50E5 }, { 0xE8EA, 0x51F9 }, { 0xE8EB, 0x582F }, { 0xE8EC, 0x592D }, { 0xE8ED, 0x5996 }, { 0xE8EE, 0x59DA }, 
-	{ 0xE8EF, 0x5BE5 }, { 0xE8F0, 0xF9BC }, { 0xE8F1, 0xF9BD }, { 0xE8F2, 0x5DA2 }, { 0xE8F3, 0x62D7 }, { 0xE8F4, 0x6416 }, { 0xE8F5, 0x6493 }, { 0xE8F6, 0x64FE }, 
-	{ 0xE8F7, 0xF9BE }, { 0xE8F8, 0x66DC }, { 0xE8F9, 0xF9BF }, { 0xE8FA, 0x6A48 }, { 0xE8FB, 0xF9C0 }, { 0xE8FC, 0x71FF }, { 0xE8FD, 0x7464 }, { 0xE8FE, 0xF9C1 }, 
-	{ 0xE9A1, 0x7A88 }, { 0xE9A2, 0x7AAF }, { 0xE9A3, 0x7E47 }, { 0xE9A4, 0x7E5E }, { 0xE9A5, 0x8000 }, { 0xE9A6, 0x8170 }, { 0xE9A7, 0xF9C2 }, { 0xE9A8, 0x87EF }, 
-	{ 0xE9A9, 0x8981 }, { 0xE9AA, 0x8B20 }, { 0xE9AB, 0x9059 }, { 0xE9AC, 0xF9C3 }, { 0xE9AD, 0x9080 }, { 0xE9AE, 0x9952 }, { 0xE9AF, 0x617E }, { 0xE9B0, 0x6B32 }, 
-	{ 0xE9B1, 0x6D74 }, { 0xE9B2, 0x7E1F }, { 0xE9B3, 0x8925 }, { 0xE9B4, 0x8FB1 }, { 0xE9B5, 0x4FD1 }, { 0xE9B6, 0x50AD }, { 0xE9B7, 0x5197 }, { 0xE9B8, 0x52C7 }, 
-	{ 0xE9B9, 0x57C7 }, { 0xE9BA, 0x5889 }, { 0xE9BB, 0x5BB9 }, { 0xE9BC, 0x5EB8 }, { 0xE9BD, 0x6142 }, { 0xE9BE, 0x6995 }, { 0xE9BF, 0x6D8C }, { 0xE9C0, 0x6E67 }, 
-	{ 0xE9C1, 0x6EB6 }, { 0xE9C2, 0x7194 }, { 0xE9C3, 0x7462 }, { 0xE9C4, 0x7528 }, { 0xE9C5, 0x752C }, { 0xE9C6, 0x8073 }, { 0xE9C7, 0x8338 }, { 0xE9C8, 0x84C9 }, 
-	{ 0xE9C9, 0x8E0A }, { 0xE9CA, 0x9394 }, { 0xE9CB, 0x93DE }, { 0xE9CC, 0xF9C4 }, { 0xE9CD, 0x4E8E }, { 0xE9CE, 0x4F51 }, { 0xE9CF, 0x5076 }, { 0xE9D0, 0x512A }, 
-	{ 0xE9D1, 0x53C8 }, { 0xE9D2, 0x53CB }, { 0xE9D3, 0x53F3 }, { 0xE9D4, 0x5B87 }, { 0xE9D5, 0x5BD3 }, { 0xE9D6, 0x5C24 }, { 0xE9D7, 0x611A }, { 0xE9D8, 0x6182 }, 
-	{ 0xE9D9, 0x65F4 }, { 0xE9DA, 0x725B }, { 0xE9DB, 0x7397 }, { 0xE9DC, 0x7440 }, { 0xE9DD, 0x76C2 }, { 0xE9DE, 0x7950 }, { 0xE9DF, 0x7991 }, { 0xE9E0, 0x79B9 }, 
-	{ 0xE9E1, 0x7D06 }, { 0xE9E2, 0x7FBD }, { 0xE9E3, 0x828B }, { 0xE9E4, 0x85D5 }, { 0xE9E5, 0x865E }, { 0xE9E6, 0x8FC2 }, { 0xE9E7, 0x9047 }, { 0xE9E8, 0x90F5 }, 
-	{ 0xE9E9, 0x91EA }, { 0xE9EA, 0x9685 }, { 0xE9EB, 0x96E8 }, { 0xE9EC, 0x96E9 }, { 0xE9ED, 0x52D6 }, { 0xE9EE, 0x5F67 }, { 0xE9EF, 0x65ED }, { 0xE9F0, 0x6631 }, 
-	{ 0xE9F1, 0x682F }, { 0xE9F2, 0x715C }, { 0xE9F3, 0x7A36 }, { 0xE9F4, 0x90C1 }, { 0xE9F5, 0x980A }, { 0xE9F6, 0x4E91 }, { 0xE9F7, 0xF9C5 }, { 0xE9F8, 0x6A52 }, 
-	{ 0xE9F9, 0x6B9E }, { 0xE9FA, 0x6F90 }, { 0xE9FB, 0x7189 }, { 0xE9FC, 0x8018 }, { 0xE9FD, 0x82B8 }, { 0xE9FE, 0x8553 }, { 0xEAA1, 0x904B }, { 0xEAA2, 0x9695 }, 
-	{ 0xEAA3, 0x96F2 }, { 0xEAA4, 0x97FB }, { 0xEAA5, 0x851A }, { 0xEAA6, 0x9B31 }, { 0xEAA7, 0x4E90 }, { 0xEAA8, 0x718A }, { 0xEAA9, 0x96C4 }, { 0xEAAA, 0x5143 }, 
-	{ 0xEAAB, 0x539F }, { 0xEAAC, 0x54E1 }, { 0xEAAD, 0x5713 }, { 0xEAAE, 0x5712 }, { 0xEAAF, 0x57A3 }, { 0xEAB0, 0x5A9B }, { 0xEAB1, 0x5AC4 }, { 0xEAB2, 0x5BC3 }, 
-	{ 0xEAB3, 0x6028 }, { 0xEAB4, 0x613F }, { 0xEAB5, 0x63F4 }, { 0xEAB6, 0x6C85 }, { 0xEAB7, 0x6D39 }, { 0xEAB8, 0x6E72 }, { 0xEAB9, 0x6E90 }, { 0xEABA, 0x7230 }, 
-	{ 0xEABB, 0x733F }, { 0xEABC, 0x7457 }, { 0xEABD, 0x82D1 }, { 0xEABE, 0x8881 }, { 0xEABF, 0x8F45 }, { 0xEAC0, 0x9060 }, { 0xEAC1, 0xF9C6 }, { 0xEAC2, 0x9662 }, 
-	{ 0xEAC3, 0x9858 }, { 0xEAC4, 0x9D1B }, { 0xEAC5, 0x6708 }, { 0xEAC6, 0x8D8A }, { 0xEAC7, 0x925E }, { 0xEAC8, 0x4F4D }, { 0xEAC9, 0x5049 }, { 0xEACA, 0x50DE }, 
-	{ 0xEACB, 0x5371 }, { 0xEACC, 0x570D }, { 0xEACD, 0x59D4 }, { 0xEACE, 0x5A01 }, { 0xEACF, 0x5C09 }, { 0xEAD0, 0x6170 }, { 0xEAD1, 0x6690 }, { 0xEAD2, 0x6E2D }, 
-	{ 0xEAD3, 0x7232 }, { 0xEAD4, 0x744B }, { 0xEAD5, 0x7DEF }, { 0xEAD6, 0x80C3 }, { 0xEAD7, 0x840E }, { 0xEAD8, 0x8466 }, { 0xEAD9, 0x853F }, { 0xEADA, 0x875F }, 
-	{ 0xEADB, 0x885B }, { 0xEADC, 0x8918 }, { 0xEADD, 0x8B02 }, { 0xEADE, 0x9055 }, { 0xEADF, 0x97CB }, { 0xEAE0, 0x9B4F }, { 0xEAE1, 0x4E73 }, { 0xEAE2, 0x4F91 }, 
-	{ 0xEAE3, 0x5112 }, { 0xEAE4, 0x516A }, { 0xEAE5, 0xF9C7 }, { 0xEAE6, 0x552F }, { 0xEAE7, 0x55A9 }, { 0xEAE8, 0x5B7A }, { 0xEAE9, 0x5BA5 }, { 0xEAEA, 0x5E7C }, 
-	{ 0xEAEB, 0x5E7D }, { 0xEAEC, 0x5EBE }, { 0xEAED, 0x60A0 }, { 0xEAEE, 0x60DF }, { 0xEAEF, 0x6108 }, { 0xEAF0, 0x6109 }, { 0xEAF1, 0x63C4 }, { 0xEAF2, 0x6538 }, 
-	{ 0xEAF3, 0x6709 }, { 0xEAF4, 0xF9C8 }, { 0xEAF5, 0x67D4 }, { 0xEAF6, 0x67DA }, { 0xEAF7, 0xF9C9 }, { 0xEAF8, 0x6961 }, { 0xEAF9, 0x6962 }, { 0xEAFA, 0x6CB9 }, 
-	{ 0xEAFB, 0x6D27 }, { 0xEAFC, 0xF9CA }, { 0xEAFD, 0x6E38 }, { 0xEAFE, 0xF9CB }, { 0xEBA1, 0x6FE1 }, { 0xEBA2, 0x7336 }, { 0xEBA3, 0x7337 }, { 0xEBA4, 0xF9CC }, 
-	{ 0xEBA5, 0x745C }, { 0xEBA6, 0x7531 }, { 0xEBA7, 0xF9CD }, { 0xEBA8, 0x7652 }, { 0xEBA9, 0xF9CE }, { 0xEBAA, 0xF9CF }, { 0xEBAB, 0x7DAD }, { 0xEBAC, 0x81FE }, 
-	{ 0xEBAD, 0x8438 }, { 0xEBAE, 0x88D5 }, { 0xEBAF, 0x8A98 }, { 0xEBB0, 0x8ADB }, { 0xEBB1, 0x8AED }, { 0xEBB2, 0x8E30 }, { 0xEBB3, 0x8E42 }, { 0xEBB4, 0x904A }, 
-	{ 0xEBB5, 0x903E }, { 0xEBB6, 0x907A }, { 0xEBB7, 0x9149 }, { 0xEBB8, 0x91C9 }, { 0xEBB9, 0x936E }, { 0xEBBA, 0xF9D0 }, { 0xEBBB, 0xF9D1 }, { 0xEBBC, 0x5809 }, 
-	{ 0xEBBD, 0xF9D2 }, { 0xEBBE, 0x6BD3 }, { 0xEBBF, 0x8089 }, { 0xEBC0, 0x80B2 }, { 0xEBC1, 0xF9D3 }, { 0xEBC2, 0xF9D4 }, { 0xEBC3, 0x5141 }, { 0xEBC4, 0x596B }, 
-	{ 0xEBC5, 0x5C39 }, { 0xEBC6, 0xF9D5 }, { 0xEBC7, 0xF9D6 }, { 0xEBC8, 0x6F64 }, { 0xEBC9, 0x73A7 }, { 0xEBCA, 0x80E4 }, { 0xEBCB, 0x8D07 }, { 0xEBCC, 0xF9D7 }, 
-	{ 0xEBCD, 0x9217 }, { 0xEBCE, 0x958F }, { 0xEBCF, 0xF9D8 }, { 0xEBD0, 0xF9D9 }, { 0xEBD1, 0xF9DA }, { 0xEBD2, 0xF9DB }, { 0xEBD3, 0x807F }, { 0xEBD4, 0x620E }, 
-	{ 0xEBD5, 0x701C }, { 0xEBD6, 0x7D68 }, { 0xEBD7, 0x878D }, { 0xEBD8, 0xF9DC }, { 0xEBD9, 0x57A0 }, { 0xEBDA, 0x6069 }, { 0xEBDB, 0x6147 }, { 0xEBDC, 0x6BB7 }, 
-	{ 0xEBDD, 0x8ABE }, { 0xEBDE, 0x9280 }, { 0xEBDF, 0x96B1 }, { 0xEBE0, 0x4E59 }, { 0xEBE1, 0x541F }, { 0xEBE2, 0x6DEB }, { 0xEBE3, 0x852D }, { 0xEBE4, 0x9670 }, 
-	{ 0xEBE5, 0x97F3 }, { 0xEBE6, 0x98EE }, { 0xEBE7, 0x63D6 }, { 0xEBE8, 0x6CE3 }, { 0xEBE9, 0x9091 }, { 0xEBEA, 0x51DD }, { 0xEBEB, 0x61C9 }, { 0xEBEC, 0x81BA }, 
-	{ 0xEBED, 0x9DF9 }, { 0xEBEE, 0x4F9D }, { 0xEBEF, 0x501A }, { 0xEBF0, 0x5100 }, { 0xEBF1, 0x5B9C }, { 0xEBF2, 0x610F }, { 0xEBF3, 0x61FF }, { 0xEBF4, 0x64EC }, 
-	{ 0xEBF5, 0x6905 }, { 0xEBF6, 0x6BC5 }, { 0xEBF7, 0x7591 }, { 0xEBF8, 0x77E3 }, { 0xEBF9, 0x7FA9 }, { 0xEBFA, 0x8264 }, { 0xEBFB, 0x858F }, { 0xEBFC, 0x87FB }, 
-	{ 0xEBFD, 0x8863 }, { 0xEBFE, 0x8ABC }, { 0xECA1, 0x8B70 }, { 0xECA2, 0x91AB }, { 0xECA3, 0x4E8C }, { 0xECA4, 0x4EE5 }, { 0xECA5, 0x4F0A }, { 0xECA6, 0xF9DD }, 
-	{ 0xECA7, 0xF9DE }, { 0xECA8, 0x5937 }, { 0xECA9, 0x59E8 }, { 0xECAA, 0xF9DF }, { 0xECAB, 0x5DF2 }, { 0xECAC, 0x5F1B }, { 0xECAD, 0x5F5B }, { 0xECAE, 0x6021 }, 
-	{ 0xECAF, 0xF9E0 }, { 0xECB0, 0xF9E1 }, { 0xECB1, 0xF9E2 }, { 0xECB2, 0xF9E3 }, { 0xECB3, 0x723E }, { 0xECB4, 0x73E5 }, { 0xECB5, 0xF9E4 }, { 0xECB6, 0x7570 }, 
-	{ 0xECB7, 0x75CD }, { 0xECB8, 0xF9E5 }, { 0xECB9, 0x79FB }, { 0xECBA, 0xF9E6 }, { 0xECBB, 0x800C }, { 0xECBC, 0x8033 }, { 0xECBD, 0x8084 }, { 0xECBE, 0x82E1 }, 
-	{ 0xECBF, 0x8351 }, { 0xECC0, 0xF9E7 }, { 0xECC1, 0xF9E8 }, { 0xECC2, 0x8CBD }, { 0xECC3, 0x8CB3 }, { 0xECC4, 0x9087 }, { 0xECC5, 0xF9E9 }, { 0xECC6, 0xF9EA }, 
-	{ 0xECC7, 0x98F4 }, { 0xECC8, 0x990C }, { 0xECC9, 0xF9EB }, { 0xECCA, 0xF9EC }, { 0xECCB, 0x7037 }, { 0xECCC, 0x76CA }, { 0xECCD, 0x7FCA }, { 0xECCE, 0x7FCC }, 
-	{ 0xECCF, 0x7FFC }, { 0xECD0, 0x8B1A }, { 0xECD1, 0x4EBA }, { 0xECD2, 0x4EC1 }, { 0xECD3, 0x5203 }, { 0xECD4, 0x5370 }, { 0xECD5, 0xF9ED }, { 0xECD6, 0x54BD }, 
-	{ 0xECD7, 0x56E0 }, { 0xECD8, 0x59FB }, { 0xECD9, 0x5BC5 }, { 0xECDA, 0x5F15 }, { 0xECDB, 0x5FCD }, { 0xECDC, 0x6E6E }, { 0xECDD, 0xF9EE }, { 0xECDE, 0xF9EF }, 
-	{ 0xECDF, 0x7D6A }, { 0xECE0, 0x8335 }, { 0xECE1, 0xF9F0 }, { 0xECE2, 0x8693 }, { 0xECE3, 0x8A8D }, { 0xECE4, 0xF9F1 }, { 0xECE5, 0x976D }, { 0xECE6, 0x9777 }, 
-	{ 0xECE7, 0xF9F2 }, { 0xECE8, 0xF9F3 }, { 0xECE9, 0x4E00 }, { 0xECEA, 0x4F5A }, { 0xECEB, 0x4F7E }, { 0xECEC, 0x58F9 }, { 0xECED, 0x65E5 }, { 0xECEE, 0x6EA2 }, 
-	{ 0xECEF, 0x9038 }, { 0xECF0, 0x93B0 }, { 0xECF1, 0x99B9 }, { 0xECF2, 0x4EFB }, { 0xECF3, 0x58EC }, { 0xECF4, 0x598A }, { 0xECF5, 0x59D9 }, { 0xECF6, 0x6041 }, 
-	{ 0xECF7, 0xF9F4 }, { 0xECF8, 0xF9F5 }, { 0xECF9, 0x7A14 }, { 0xECFA, 0xF9F6 }, { 0xECFB, 0x834F }, { 0xECFC, 0x8CC3 }, { 0xECFD, 0x5165 }, { 0xECFE, 0x5344 }, 
-	{ 0xEDA1, 0xF9F7 }, { 0xEDA2, 0xF9F8 }, { 0xEDA3, 0xF9F9 }, { 0xEDA4, 0x4ECD }, { 0xEDA5, 0x5269 }, { 0xEDA6, 0x5B55 }, { 0xEDA7, 0x82BF }, { 0xEDA8, 0x4ED4 }, 
-	{ 0xEDA9, 0x523A }, { 0xEDAA, 0x54A8 }, { 0xEDAB, 0x59C9 }, { 0xEDAC, 0x59FF }, { 0xEDAD, 0x5B50 }, { 0xEDAE, 0x5B57 }, { 0xEDAF, 0x5B5C }, { 0xEDB0, 0x6063 }, 
-	{ 0xEDB1, 0x6148 }, { 0xEDB2, 0x6ECB }, { 0xEDB3, 0x7099 }, { 0xEDB4, 0x716E }, { 0xEDB5, 0x7386 }, { 0xEDB6, 0x74F7 }, { 0xEDB7, 0x75B5 }, { 0xEDB8, 0x78C1 }, 
-	{ 0xEDB9, 0x7D2B }, { 0xEDBA, 0x8005 }, { 0xEDBB, 0x81EA }, { 0xEDBC, 0x8328 }, { 0xEDBD, 0x8517 }, { 0xEDBE, 0x85C9 }, { 0xEDBF, 0x8AEE }, { 0xEDC0, 0x8CC7 }, 
-	{ 0xEDC1, 0x96CC }, { 0xEDC2, 0x4F5C }, { 0xEDC3, 0x52FA }, { 0xEDC4, 0x56BC }, { 0xEDC5, 0x65AB }, { 0xEDC6, 0x6628 }, { 0xEDC7, 0x707C }, { 0xEDC8, 0x70B8 }, 
-	{ 0xEDC9, 0x7235 }, { 0xEDCA, 0x7DBD }, { 0xEDCB, 0x828D }, { 0xEDCC, 0x914C }, { 0xEDCD, 0x96C0 }, { 0xEDCE, 0x9D72 }, { 0xEDCF, 0x5B71 }, { 0xEDD0, 0x68E7 }, 
-	{ 0xEDD1, 0x6B98 }, { 0xEDD2, 0x6F7A }, { 0xEDD3, 0x76DE }, { 0xEDD4, 0x5C91 }, { 0xEDD5, 0x66AB }, { 0xEDD6, 0x6F5B }, { 0xEDD7, 0x7BB4 }, { 0xEDD8, 0x7C2A }, 
-	{ 0xEDD9, 0x8836 }, { 0xEDDA, 0x96DC }, { 0xEDDB, 0x4E08 }, { 0xEDDC, 0x4ED7 }, { 0xEDDD, 0x5320 }, { 0xEDDE, 0x5834 }, { 0xEDDF, 0x58BB }, { 0xEDE0, 0x58EF }, 
-	{ 0xEDE1, 0x596C }, { 0xEDE2, 0x5C07 }, { 0xEDE3, 0x5E33 }, { 0xEDE4, 0x5E84 }, { 0xEDE5, 0x5F35 }, { 0xEDE6, 0x638C }, { 0xEDE7, 0x66B2 }, { 0xEDE8, 0x6756 }, 
-	{ 0xEDE9, 0x6A1F }, { 0xEDEA, 0x6AA3 }, { 0xEDEB, 0x6B0C }, { 0xEDEC, 0x6F3F }, { 0xEDED, 0x7246 }, { 0xEDEE, 0xF9FA }, { 0xEDEF, 0x7350 }, { 0xEDF0, 0x748B }, 
-	{ 0xEDF1, 0x7AE0 }, { 0xEDF2, 0x7CA7 }, { 0xEDF3, 0x8178 }, { 0xEDF4, 0x81DF }, { 0xEDF5, 0x81E7 }, { 0xEDF6, 0x838A }, { 0xEDF7, 0x846C }, { 0xEDF8, 0x8523 }, 
-	{ 0xEDF9, 0x8594 }, { 0xEDFA, 0x85CF }, { 0xEDFB, 0x88DD }, { 0xEDFC, 0x8D13 }, { 0xEDFD, 0x91AC }, { 0xEDFE, 0x9577 }, { 0xEEA1, 0x969C }, { 0xEEA2, 0x518D }, 
-	{ 0xEEA3, 0x54C9 }, { 0xEEA4, 0x5728 }, { 0xEEA5, 0x5BB0 }, { 0xEEA6, 0x624D }, { 0xEEA7, 0x6750 }, { 0xEEA8, 0x683D }, { 0xEEA9, 0x6893 }, { 0xEEAA, 0x6E3D }, 
-	{ 0xEEAB, 0x6ED3 }, { 0xEEAC, 0x707D }, { 0xEEAD, 0x7E21 }, { 0xEEAE, 0x88C1 }, { 0xEEAF, 0x8CA1 }, { 0xEEB0, 0x8F09 }, { 0xEEB1, 0x9F4B }, { 0xEEB2, 0x9F4E }, 
-	{ 0xEEB3, 0x722D }, { 0xEEB4, 0x7B8F }, { 0xEEB5, 0x8ACD }, { 0xEEB6, 0x931A }, { 0xEEB7, 0x4F47 }, { 0xEEB8, 0x4F4E }, { 0xEEB9, 0x5132 }, { 0xEEBA, 0x5480 }, 
-	{ 0xEEBB, 0x59D0 }, { 0xEEBC, 0x5E95 }, { 0xEEBD, 0x62B5 }, { 0xEEBE, 0x6775 }, { 0xEEBF, 0x696E }, { 0xEEC0, 0x6A17 }, { 0xEEC1, 0x6CAE }, { 0xEEC2, 0x6E1A }, 
-	{ 0xEEC3, 0x72D9 }, { 0xEEC4, 0x732A }, { 0xEEC5, 0x75BD }, { 0xEEC6, 0x7BB8 }, { 0xEEC7, 0x7D35 }, { 0xEEC8, 0x82E7 }, { 0xEEC9, 0x83F9 }, { 0xEECA, 0x8457 }, 
-	{ 0xEECB, 0x85F7 }, { 0xEECC, 0x8A5B }, { 0xEECD, 0x8CAF }, { 0xEECE, 0x8E87 }, { 0xEECF, 0x9019 }, { 0xEED0, 0x90B8 }, { 0xEED1, 0x96CE }, { 0xEED2, 0x9F5F }, 
-	{ 0xEED3, 0x52E3 }, { 0xEED4, 0x540A }, { 0xEED5, 0x5AE1 }, { 0xEED6, 0x5BC2 }, { 0xEED7, 0x6458 }, { 0xEED8, 0x6575 }, { 0xEED9, 0x6EF4 }, { 0xEEDA, 0x72C4 }, 
-	{ 0xEEDB, 0xF9FB }, { 0xEEDC, 0x7684 }, { 0xEEDD, 0x7A4D }, { 0xEEDE, 0x7B1B }, { 0xEEDF, 0x7C4D }, { 0xEEE0, 0x7E3E }, { 0xEEE1, 0x7FDF }, { 0xEEE2, 0x837B }, 
-	{ 0xEEE3, 0x8B2B }, { 0xEEE4, 0x8CCA }, { 0xEEE5, 0x8D64 }, { 0xEEE6, 0x8DE1 }, { 0xEEE7, 0x8E5F }, { 0xEEE8, 0x8FEA }, { 0xEEE9, 0x8FF9 }, { 0xEEEA, 0x9069 }, 
-	{ 0xEEEB, 0x93D1 }, { 0xEEEC, 0x4F43 }, { 0xEEED, 0x4F7A }, { 0xEEEE, 0x50B3 }, { 0xEEEF, 0x5168 }, { 0xEEF0, 0x5178 }, { 0xEEF1, 0x524D }, { 0xEEF2, 0x526A }, 
-	{ 0xEEF3, 0x5861 }, { 0xEEF4, 0x587C }, { 0xEEF5, 0x5960 }, { 0xEEF6, 0x5C08 }, { 0xEEF7, 0x5C55 }, { 0xEEF8, 0x5EDB }, { 0xEEF9, 0x609B }, { 0xEEFA, 0x6230 }, 
-	{ 0xEEFB, 0x6813 }, { 0xEEFC, 0x6BBF }, { 0xEEFD, 0x6C08 }, { 0xEEFE, 0x6FB1 }, { 0xEFA1, 0x714E }, { 0xEFA2, 0x7420 }, { 0xEFA3, 0x7530 }, { 0xEFA4, 0x7538 }, 
-	{ 0xEFA5, 0x7551 }, { 0xEFA6, 0x7672 }, { 0xEFA7, 0x7B4C }, { 0xEFA8, 0x7B8B }, { 0xEFA9, 0x7BAD }, { 0xEFAA, 0x7BC6 }, { 0xEFAB, 0x7E8F }, { 0xEFAC, 0x8A6E }, 
-	{ 0xEFAD, 0x8F3E }, { 0xEFAE, 0x8F49 }, { 0xEFAF, 0x923F }, { 0xEFB0, 0x9293 }, { 0xEFB1, 0x9322 }, { 0xEFB2, 0x942B }, { 0xEFB3, 0x96FB }, { 0xEFB4, 0x985A }, 
-	{ 0xEFB5, 0x986B }, { 0xEFB6, 0x991E }, { 0xEFB7, 0x5207 }, { 0xEFB8, 0x622A }, { 0xEFB9, 0x6298 }, { 0xEFBA, 0x6D59 }, { 0xEFBB, 0x7664 }, { 0xEFBC, 0x7ACA }, 
-	{ 0xEFBD, 0x7BC0 }, { 0xEFBE, 0x7D76 }, { 0xEFBF, 0x5360 }, { 0xEFC0, 0x5CBE }, { 0xEFC1, 0x5E97 }, { 0xEFC2, 0x6F38 }, { 0xEFC3, 0x70B9 }, { 0xEFC4, 0x7C98 }, 
-	{ 0xEFC5, 0x9711 }, { 0xEFC6, 0x9B8E }, { 0xEFC7, 0x9EDE }, { 0xEFC8, 0x63A5 }, { 0xEFC9, 0x647A }, { 0xEFCA, 0x8776 }, { 0xEFCB, 0x4E01 }, { 0xEFCC, 0x4E95 }, 
-	{ 0xEFCD, 0x4EAD }, { 0xEFCE, 0x505C }, { 0xEFCF, 0x5075 }, { 0xEFD0, 0x5448 }, { 0xEFD1, 0x59C3 }, { 0xEFD2, 0x5B9A }, { 0xEFD3, 0x5E40 }, { 0xEFD4, 0x5EAD }, 
-	{ 0xEFD5, 0x5EF7 }, { 0xEFD6, 0x5F81 }, { 0xEFD7, 0x60C5 }, { 0xEFD8, 0x633A }, { 0xEFD9, 0x653F }, { 0xEFDA, 0x6574 }, { 0xEFDB, 0x65CC }, { 0xEFDC, 0x6676 }, 
-	{ 0xEFDD, 0x6678 }, { 0xEFDE, 0x67FE }, { 0xEFDF, 0x6968 }, { 0xEFE0, 0x6A89 }, { 0xEFE1, 0x6B63 }, { 0xEFE2, 0x6C40 }, { 0xEFE3, 0x6DC0 }, { 0xEFE4, 0x6DE8 }, 
-	{ 0xEFE5, 0x6E1F }, { 0xEFE6, 0x6E5E }, { 0xEFE7, 0x701E }, { 0xEFE8, 0x70A1 }, { 0xEFE9, 0x738E }, { 0xEFEA, 0x73FD }, { 0xEFEB, 0x753A }, { 0xEFEC, 0x775B }, 
-	{ 0xEFED, 0x7887 }, { 0xEFEE, 0x798E }, { 0xEFEF, 0x7A0B }, { 0xEFF0, 0x7A7D }, { 0xEFF1, 0x7CBE }, { 0xEFF2, 0x7D8E }, { 0xEFF3, 0x8247 }, { 0xEFF4, 0x8A02 }, 
-	{ 0xEFF5, 0x8AEA }, { 0xEFF6, 0x8C9E }, { 0xEFF7, 0x912D }, { 0xEFF8, 0x914A }, { 0xEFF9, 0x91D8 }, { 0xEFFA, 0x9266 }, { 0xEFFB, 0x92CC }, { 0xEFFC, 0x9320 }, 
-	{ 0xEFFD, 0x9706 }, { 0xEFFE, 0x9756 }, { 0xF0A1, 0x975C }, { 0xF0A2, 0x9802 }, { 0xF0A3, 0x9F0E }, { 0xF0A4, 0x5236 }, { 0xF0A5, 0x5291 }, { 0xF0A6, 0x557C }, 
-	{ 0xF0A7, 0x5824 }, { 0xF0A8, 0x5E1D }, { 0xF0A9, 0x5F1F }, { 0xF0AA, 0x608C }, { 0xF0AB, 0x63D0 }, { 0xF0AC, 0x68AF }, { 0xF0AD, 0x6FDF }, { 0xF0AE, 0x796D }, 
-	{ 0xF0AF, 0x7B2C }, { 0xF0B0, 0x81CD }, { 0xF0B1, 0x85BA }, { 0xF0B2, 0x88FD }, { 0xF0B3, 0x8AF8 }, { 0xF0B4, 0x8E44 }, { 0xF0B5, 0x918D }, { 0xF0B6, 0x9664 }, 
-	{ 0xF0B7, 0x969B }, { 0xF0B8, 0x973D }, { 0xF0B9, 0x984C }, { 0xF0BA, 0x9F4A }, { 0xF0BB, 0x4FCE }, { 0xF0BC, 0x5146 }, { 0xF0BD, 0x51CB }, { 0xF0BE, 0x52A9 }, 
-	{ 0xF0BF, 0x5632 }, { 0xF0C0, 0x5F14 }, { 0xF0C1, 0x5F6B }, { 0xF0C2, 0x63AA }, { 0xF0C3, 0x64CD }, { 0xF0C4, 0x65E9 }, { 0xF0C5, 0x6641 }, { 0xF0C6, 0x66FA }, 
-	{ 0xF0C7, 0x66F9 }, { 0xF0C8, 0x671D }, { 0xF0C9, 0x689D }, { 0xF0CA, 0x68D7 }, { 0xF0CB, 0x69FD }, { 0xF0CC, 0x6F15 }, { 0xF0CD, 0x6F6E }, { 0xF0CE, 0x7167 }, 
-	{ 0xF0CF, 0x71E5 }, { 0xF0D0, 0x722A }, { 0xF0D1, 0x74AA }, { 0xF0D2, 0x773A }, { 0xF0D3, 0x7956 }, { 0xF0D4, 0x795A }, { 0xF0D5, 0x79DF }, { 0xF0D6, 0x7A20 }, 
-	{ 0xF0D7, 0x7A95 }, { 0xF0D8, 0x7C97 }, { 0xF0D9, 0x7CDF }, { 0xF0DA, 0x7D44 }, { 0xF0DB, 0x7E70 }, { 0xF0DC, 0x8087 }, { 0xF0DD, 0x85FB }, { 0xF0DE, 0x86A4 }, 
-	{ 0xF0DF, 0x8A54 }, { 0xF0E0, 0x8ABF }, { 0xF0E1, 0x8D99 }, { 0xF0E2, 0x8E81 }, { 0xF0E3, 0x9020 }, { 0xF0E4, 0x906D }, { 0xF0E5, 0x91E3 }, { 0xF0E6, 0x963B }, 
-	{ 0xF0E7, 0x96D5 }, { 0xF0E8, 0x9CE5 }, { 0xF0E9, 0x65CF }, { 0xF0EA, 0x7C07 }, { 0xF0EB, 0x8DB3 }, { 0xF0EC, 0x93C3 }, { 0xF0ED, 0x5B58 }, { 0xF0EE, 0x5C0A }, 
-	{ 0xF0EF, 0x5352 }, { 0xF0F0, 0x62D9 }, { 0xF0F1, 0x731D }, { 0xF0F2, 0x5027 }, { 0xF0F3, 0x5B97 }, { 0xF0F4, 0x5F9E }, { 0xF0F5, 0x60B0 }, { 0xF0F6, 0x616B }, 
-	{ 0xF0F7, 0x68D5 }, { 0xF0F8, 0x6DD9 }, { 0xF0F9, 0x742E }, { 0xF0FA, 0x7A2E }, { 0xF0FB, 0x7D42 }, { 0xF0FC, 0x7D9C }, { 0xF0FD, 0x7E31 }, { 0xF0FE, 0x816B }, 
-	{ 0xF1A1, 0x8E2A }, { 0xF1A2, 0x8E35 }, { 0xF1A3, 0x937E }, { 0xF1A4, 0x9418 }, { 0xF1A5, 0x4F50 }, { 0xF1A6, 0x5750 }, { 0xF1A7, 0x5DE6 }, { 0xF1A8, 0x5EA7 }, 
-	{ 0xF1A9, 0x632B }, { 0xF1AA, 0x7F6A }, { 0xF1AB, 0x4E3B }, { 0xF1AC, 0x4F4F }, { 0xF1AD, 0x4F8F }, { 0xF1AE, 0x505A }, { 0xF1AF, 0x59DD }, { 0xF1B0, 0x80C4 }, 
-	{ 0xF1B1, 0x546A }, { 0xF1B2, 0x5468 }, { 0xF1B3, 0x55FE }, { 0xF1B4, 0x594F }, { 0xF1B5, 0x5B99 }, { 0xF1B6, 0x5DDE }, { 0xF1B7, 0x5EDA }, { 0xF1B8, 0x665D }, 
-	{ 0xF1B9, 0x6731 }, { 0xF1BA, 0x67F1 }, { 0xF1BB, 0x682A }, { 0xF1BC, 0x6CE8 }, { 0xF1BD, 0x6D32 }, { 0xF1BE, 0x6E4A }, { 0xF1BF, 0x6F8D }, { 0xF1C0, 0x70B7 }, 
-	{ 0xF1C1, 0x73E0 }, { 0xF1C2, 0x7587 }, { 0xF1C3, 0x7C4C }, { 0xF1C4, 0x7D02 }, { 0xF1C5, 0x7D2C }, { 0xF1C6, 0x7DA2 }, { 0xF1C7, 0x821F }, { 0xF1C8, 0x86DB }, 
-	{ 0xF1C9, 0x8A3B }, { 0xF1CA, 0x8A85 }, { 0xF1CB, 0x8D70 }, { 0xF1CC, 0x8E8A }, { 0xF1CD, 0x8F33 }, { 0xF1CE, 0x9031 }, { 0xF1CF, 0x914E }, { 0xF1D0, 0x9152 }, 
-	{ 0xF1D1, 0x9444 }, { 0xF1D2, 0x99D0 }, { 0xF1D3, 0x7AF9 }, { 0xF1D4, 0x7CA5 }, { 0xF1D5, 0x4FCA }, { 0xF1D6, 0x5101 }, { 0xF1D7, 0x51C6 }, { 0xF1D8, 0x57C8 }, 
-	{ 0xF1D9, 0x5BEF }, { 0xF1DA, 0x5CFB }, { 0xF1DB, 0x6659 }, { 0xF1DC, 0x6A3D }, { 0xF1DD, 0x6D5A }, { 0xF1DE, 0x6E96 }, { 0xF1DF, 0x6FEC }, { 0xF1E0, 0x710C }, 
-	{ 0xF1E1, 0x756F }, { 0xF1E2, 0x7AE3 }, { 0xF1E3, 0x8822 }, { 0xF1E4, 0x9021 }, { 0xF1E5, 0x9075 }, { 0xF1E6, 0x96CB }, { 0xF1E7, 0x99FF }, { 0xF1E8, 0x8301 }, 
-	{ 0xF1E9, 0x4E2D }, { 0xF1EA, 0x4EF2 }, { 0xF1EB, 0x8846 }, { 0xF1EC, 0x91CD }, { 0xF1ED, 0x537D }, { 0xF1EE, 0x6ADB }, { 0xF1EF, 0x696B }, { 0xF1F0, 0x6C41 }, 
-	{ 0xF1F1, 0x847A }, { 0xF1F2, 0x589E }, { 0xF1F3, 0x618E }, { 0xF1F4, 0x66FE }, { 0xF1F5, 0x62EF }, { 0xF1F6, 0x70DD }, { 0xF1F7, 0x7511 }, { 0xF1F8, 0x75C7 }, 
-	{ 0xF1F9, 0x7E52 }, { 0xF1FA, 0x84B8 }, { 0xF1FB, 0x8B49 }, { 0xF1FC, 0x8D08 }, { 0xF1FD, 0x4E4B }, { 0xF1FE, 0x53EA }, { 0xF2A1, 0x54AB }, { 0xF2A2, 0x5730 }, 
-	{ 0xF2A3, 0x5740 }, { 0xF2A4, 0x5FD7 }, { 0xF2A5, 0x6301 }, { 0xF2A6, 0x6307 }, { 0xF2A7, 0x646F }, { 0xF2A8, 0x652F }, { 0xF2A9, 0x65E8 }, { 0xF2AA, 0x667A }, 
-	{ 0xF2AB, 0x679D }, { 0xF2AC, 0x67B3 }, { 0xF2AD, 0x6B62 }, { 0xF2AE, 0x6C60 }, { 0xF2AF, 0x6C9A }, { 0xF2B0, 0x6F2C }, { 0xF2B1, 0x77E5 }, { 0xF2B2, 0x7825 }, 
-	{ 0xF2B3, 0x7949 }, { 0xF2B4, 0x7957 }, { 0xF2B5, 0x7D19 }, { 0xF2B6, 0x80A2 }, { 0xF2B7, 0x8102 }, { 0xF2B8, 0x81F3 }, { 0xF2B9, 0x829D }, { 0xF2BA, 0x82B7 }, 
-	{ 0xF2BB, 0x8718 }, { 0xF2BC, 0x8A8C }, { 0xF2BD, 0xF9FC }, { 0xF2BE, 0x8D04 }, { 0xF2BF, 0x8DBE }, { 0xF2C0, 0x9072 }, { 0xF2C1, 0x76F4 }, { 0xF2C2, 0x7A19 }, 
-	{ 0xF2C3, 0x7A37 }, { 0xF2C4, 0x7E54 }, { 0xF2C5, 0x8077 }, { 0xF2C6, 0x5507 }, { 0xF2C7, 0x55D4 }, { 0xF2C8, 0x5875 }, { 0xF2C9, 0x632F }, { 0xF2CA, 0x6422 }, 
-	{ 0xF2CB, 0x6649 }, { 0xF2CC, 0x664B }, { 0xF2CD, 0x686D }, { 0xF2CE, 0x699B }, { 0xF2CF, 0x6B84 }, { 0xF2D0, 0x6D25 }, { 0xF2D1, 0x6EB1 }, { 0xF2D2, 0x73CD }, 
-	{ 0xF2D3, 0x7468 }, { 0xF2D4, 0x74A1 }, { 0xF2D5, 0x755B }, { 0xF2D6, 0x75B9 }, { 0xF2D7, 0x76E1 }, { 0xF2D8, 0x771E }, { 0xF2D9, 0x778B }, { 0xF2DA, 0x79E6 }, 
-	{ 0xF2DB, 0x7E09 }, { 0xF2DC, 0x7E1D }, { 0xF2DD, 0x81FB }, { 0xF2DE, 0x852F }, { 0xF2DF, 0x8897 }, { 0xF2E0, 0x8A3A }, { 0xF2E1, 0x8CD1 }, { 0xF2E2, 0x8EEB }, 
-	{ 0xF2E3, 0x8FB0 }, { 0xF2E4, 0x9032 }, { 0xF2E5, 0x93AD }, { 0xF2E6, 0x9663 }, { 0xF2E7, 0x9673 }, { 0xF2E8, 0x9707 }, { 0xF2E9, 0x4F84 }, { 0xF2EA, 0x53F1 }, 
-	{ 0xF2EB, 0x59EA }, { 0xF2EC, 0x5AC9 }, { 0xF2ED, 0x5E19 }, { 0xF2EE, 0x684E }, { 0xF2EF, 0x74C6 }, { 0xF2F0, 0x75BE }, { 0xF2F1, 0x79E9 }, { 0xF2F2, 0x7A92 }, 
-	{ 0xF2F3, 0x81A3 }, { 0xF2F4, 0x86ED }, { 0xF2F5, 0x8CEA }, { 0xF2F6, 0x8DCC }, { 0xF2F7, 0x8FED }, { 0xF2F8, 0x659F }, { 0xF2F9, 0x6715 }, { 0xF2FA, 0xF9FD }, 
-	{ 0xF2FB, 0x57F7 }, { 0xF2FC, 0x6F57 }, { 0xF2FD, 0x7DDD }, { 0xF2FE, 0x8F2F }, { 0xF3A1, 0x93F6 }, { 0xF3A2, 0x96C6 }, { 0xF3A3, 0x5FB5 }, { 0xF3A4, 0x61F2 }, 
-	{ 0xF3A5, 0x6F84 }, { 0xF3A6, 0x4E14 }, { 0xF3A7, 0x4F98 }, { 0xF3A8, 0x501F }, { 0xF3A9, 0x53C9 }, { 0xF3AA, 0x55DF }, { 0xF3AB, 0x5D6F }, { 0xF3AC, 0x5DEE }, 
-	{ 0xF3AD, 0x6B21 }, { 0xF3AE, 0x6B64 }, { 0xF3AF, 0x78CB }, { 0xF3B0, 0x7B9A }, { 0xF3B1, 0xF9FE }, { 0xF3B2, 0x8E49 }, { 0xF3B3, 0x8ECA }, { 0xF3B4, 0x906E }, 
-	{ 0xF3B5, 0x6349 }, { 0xF3B6, 0x643E }, { 0xF3B7, 0x7740 }, { 0xF3B8, 0x7A84 }, { 0xF3B9, 0x932F }, { 0xF3BA, 0x947F }, { 0xF3BB, 0x9F6A }, { 0xF3BC, 0x64B0 }, 
-	{ 0xF3BD, 0x6FAF }, { 0xF3BE, 0x71E6 }, { 0xF3BF, 0x74A8 }, { 0xF3C0, 0x74DA }, { 0xF3C1, 0x7AC4 }, { 0xF3C2, 0x7C12 }, { 0xF3C3, 0x7E82 }, { 0xF3C4, 0x7CB2 }, 
-	{ 0xF3C5, 0x7E98 }, { 0xF3C6, 0x8B9A }, { 0xF3C7, 0x8D0A }, { 0xF3C8, 0x947D }, { 0xF3C9, 0x9910 }, { 0xF3CA, 0x994C }, { 0xF3CB, 0x5239 }, { 0xF3CC, 0x5BDF }, 
-	{ 0xF3CD, 0x64E6 }, { 0xF3CE, 0x672D }, { 0xF3CF, 0x7D2E }, { 0xF3D0, 0x50ED }, { 0xF3D1, 0x53C3 }, { 0xF3D2, 0x5879 }, { 0xF3D3, 0x6158 }, { 0xF3D4, 0x6159 }, 
-	{ 0xF3D5, 0x61FA }, { 0xF3D6, 0x65AC }, { 0xF3D7, 0x7AD9 }, { 0xF3D8, 0x8B92 }, { 0xF3D9, 0x8B96 }, { 0xF3DA, 0x5009 }, { 0xF3DB, 0x5021 }, { 0xF3DC, 0x5275 }, 
-	{ 0xF3DD, 0x5531 }, { 0xF3DE, 0x5A3C }, { 0xF3DF, 0x5EE0 }, { 0xF3E0, 0x5F70 }, { 0xF3E1, 0x6134 }, { 0xF3E2, 0x655E }, { 0xF3E3, 0x660C }, { 0xF3E4, 0x6636 }, 
-	{ 0xF3E5, 0x66A2 }, { 0xF3E6, 0x69CD }, { 0xF3E7, 0x6EC4 }, { 0xF3E8, 0x6F32 }, { 0xF3E9, 0x7316 }, { 0xF3EA, 0x7621 }, { 0xF3EB, 0x7A93 }, { 0xF3EC, 0x8139 }, 
-	{ 0xF3ED, 0x8259 }, { 0xF3EE, 0x83D6 }, { 0xF3EF, 0x84BC }, { 0xF3F0, 0x50B5 }, { 0xF3F1, 0x57F0 }, { 0xF3F2, 0x5BC0 }, { 0xF3F3, 0x5BE8 }, { 0xF3F4, 0x5F69 }, 
-	{ 0xF3F5, 0x63A1 }, { 0xF3F6, 0x7826 }, { 0xF3F7, 0x7DB5 }, { 0xF3F8, 0x83DC }, { 0xF3F9, 0x8521 }, { 0xF3FA, 0x91C7 }, { 0xF3FB, 0x91F5 }, { 0xF3FC, 0x518A }, 
-	{ 0xF3FD, 0x67F5 }, { 0xF3FE, 0x7B56 }, { 0xF4A1, 0x8CAC }, { 0xF4A2, 0x51C4 }, { 0xF4A3, 0x59BB }, { 0xF4A4, 0x60BD }, { 0xF4A5, 0x8655 }, { 0xF4A6, 0x501C }, 
-	{ 0xF4A7, 0xF9FF }, { 0xF4A8, 0x5254 }, { 0xF4A9, 0x5C3A }, { 0xF4AA, 0x617D }, { 0xF4AB, 0x621A }, { 0xF4AC, 0x62D3 }, { 0xF4AD, 0x64F2 }, { 0xF4AE, 0x65A5 }, 
-	{ 0xF4AF, 0x6ECC }, { 0xF4B0, 0x7620 }, { 0xF4B1, 0x810A }, { 0xF4B2, 0x8E60 }, { 0xF4B3, 0x965F }, { 0xF4B4, 0x96BB }, { 0xF4B5, 0x4EDF }, { 0xF4B6, 0x5343 }, 
-	{ 0xF4B7, 0x5598 }, { 0xF4B8, 0x5929 }, { 0xF4B9, 0x5DDD }, { 0xF4BA, 0x64C5 }, { 0xF4BB, 0x6CC9 }, { 0xF4BC, 0x6DFA }, { 0xF4BD, 0x7394 }, { 0xF4BE, 0x7A7F }, 
-	{ 0xF4BF, 0x821B }, { 0xF4C0, 0x85A6 }, { 0xF4C1, 0x8CE4 }, { 0xF4C2, 0x8E10 }, { 0xF4C3, 0x9077 }, { 0xF4C4, 0x91E7 }, { 0xF4C5, 0x95E1 }, { 0xF4C6, 0x9621 }, 
-	{ 0xF4C7, 0x97C6 }, { 0xF4C8, 0x51F8 }, { 0xF4C9, 0x54F2 }, { 0xF4CA, 0x5586 }, { 0xF4CB, 0x5FB9 }, { 0xF4CC, 0x64A4 }, { 0xF4CD, 0x6F88 }, { 0xF4CE, 0x7DB4 }, 
-	{ 0xF4CF, 0x8F1F }, { 0xF4D0, 0x8F4D }, { 0xF4D1, 0x9435 }, { 0xF4D2, 0x50C9 }, { 0xF4D3, 0x5C16 }, { 0xF4D4, 0x6CBE }, { 0xF4D5, 0x6DFB }, { 0xF4D6, 0x751B }, 
-	{ 0xF4D7, 0x77BB }, { 0xF4D8, 0x7C3D }, { 0xF4D9, 0x7C64 }, { 0xF4DA, 0x8A79 }, { 0xF4DB, 0x8AC2 }, { 0xF4DC, 0x581E }, { 0xF4DD, 0x59BE }, { 0xF4DE, 0x5E16 }, 
-	{ 0xF4DF, 0x6377 }, { 0xF4E0, 0x7252 }, { 0xF4E1, 0x758A }, { 0xF4E2, 0x776B }, { 0xF4E3, 0x8ADC }, { 0xF4E4, 0x8CBC }, { 0xF4E5, 0x8F12 }, { 0xF4E6, 0x5EF3 }, 
-	{ 0xF4E7, 0x6674 }, { 0xF4E8, 0x6DF8 }, { 0xF4E9, 0x807D }, { 0xF4EA, 0x83C1 }, { 0xF4EB, 0x8ACB }, { 0xF4EC, 0x9751 }, { 0xF4ED, 0x9BD6 }, { 0xF4EE, 0xFA00 }, 
-	{ 0xF4EF, 0x5243 }, { 0xF4F0, 0x66FF }, { 0xF4F1, 0x6D95 }, { 0xF4F2, 0x6EEF }, { 0xF4F3, 0x7DE0 }, { 0xF4F4, 0x8AE6 }, { 0xF4F5, 0x902E }, { 0xF4F6, 0x905E }, 
-	{ 0xF4F7, 0x9AD4 }, { 0xF4F8, 0x521D }, { 0xF4F9, 0x527F }, { 0xF4FA, 0x54E8 }, { 0xF4FB, 0x6194 }, { 0xF4FC, 0x6284 }, { 0xF4FD, 0x62DB }, { 0xF4FE, 0x68A2 }, 
-	{ 0xF5A1, 0x6912 }, { 0xF5A2, 0x695A }, { 0xF5A3, 0x6A35 }, { 0xF5A4, 0x7092 }, { 0xF5A5, 0x7126 }, { 0xF5A6, 0x785D }, { 0xF5A7, 0x7901 }, { 0xF5A8, 0x790E }, 
-	{ 0xF5A9, 0x79D2 }, { 0xF5AA, 0x7A0D }, { 0xF5AB, 0x8096 }, { 0xF5AC, 0x8278 }, { 0xF5AD, 0x82D5 }, { 0xF5AE, 0x8349 }, { 0xF5AF, 0x8549 }, { 0xF5B0, 0x8C82 }, 
-	{ 0xF5B1, 0x8D85 }, { 0xF5B2, 0x9162 }, { 0xF5B3, 0x918B }, { 0xF5B4, 0x91AE }, { 0xF5B5, 0x4FC3 }, { 0xF5B6, 0x56D1 }, { 0xF5B7, 0x71ED }, { 0xF5B8, 0x77D7 }, 
-	{ 0xF5B9, 0x8700 }, { 0xF5BA, 0x89F8 }, { 0xF5BB, 0x5BF8 }, { 0xF5BC, 0x5FD6 }, { 0xF5BD, 0x6751 }, { 0xF5BE, 0x90A8 }, { 0xF5BF, 0x53E2 }, { 0xF5C0, 0x585A }, 
-	{ 0xF5C1, 0x5BF5 }, { 0xF5C2, 0x60A4 }, { 0xF5C3, 0x6181 }, { 0xF5C4, 0x6460 }, { 0xF5C5, 0x7E3D }, { 0xF5C6, 0x8070 }, { 0xF5C7, 0x8525 }, { 0xF5C8, 0x9283 }, 
-	{ 0xF5C9, 0x64AE }, { 0xF5CA, 0x50AC }, { 0xF5CB, 0x5D14 }, { 0xF5CC, 0x6700 }, { 0xF5CD, 0x589C }, { 0xF5CE, 0x62BD }, { 0xF5CF, 0x63A8 }, { 0xF5D0, 0x690E }, 
-	{ 0xF5D1, 0x6978 }, { 0xF5D2, 0x6A1E }, { 0xF5D3, 0x6E6B }, { 0xF5D4, 0x76BA }, { 0xF5D5, 0x79CB }, { 0xF5D6, 0x82BB }, { 0xF5D7, 0x8429 }, { 0xF5D8, 0x8ACF }, 
-	{ 0xF5D9, 0x8DA8 }, { 0xF5DA, 0x8FFD }, { 0xF5DB, 0x9112 }, { 0xF5DC, 0x914B }, { 0xF5DD, 0x919C }, { 0xF5DE, 0x9310 }, { 0xF5DF, 0x9318 }, { 0xF5E0, 0x939A }, 
-	{ 0xF5E1, 0x96DB }, { 0xF5E2, 0x9A36 }, { 0xF5E3, 0x9C0D }, { 0xF5E4, 0x4E11 }, { 0xF5E5, 0x755C }, { 0xF5E6, 0x795D }, { 0xF5E7, 0x7AFA }, { 0xF5E8, 0x7B51 }, 
-	{ 0xF5E9, 0x7BC9 }, { 0xF5EA, 0x7E2E }, { 0xF5EB, 0x84C4 }, { 0xF5EC, 0x8E59 }, { 0xF5ED, 0x8E74 }, { 0xF5EE, 0x8EF8 }, { 0xF5EF, 0x9010 }, { 0xF5F0, 0x6625 }, 
-	{ 0xF5F1, 0x693F }, { 0xF5F2, 0x7443 }, { 0xF5F3, 0x51FA }, { 0xF5F4, 0x672E }, { 0xF5F5, 0x9EDC }, { 0xF5F6, 0x5145 }, { 0xF5F7, 0x5FE0 }, { 0xF5F8, 0x6C96 }, 
-	{ 0xF5F9, 0x87F2 }, { 0xF5FA, 0x885D }, { 0xF5FB, 0x8877 }, { 0xF5FC, 0x60B4 }, { 0xF5FD, 0x81B5 }, { 0xF5FE, 0x8403 }, { 0xF6A1, 0x8D05 }, { 0xF6A2, 0x53D6 }, 
-	{ 0xF6A3, 0x5439 }, { 0xF6A4, 0x5634 }, { 0xF6A5, 0x5A36 }, { 0xF6A6, 0x5C31 }, { 0xF6A7, 0x708A }, { 0xF6A8, 0x7FE0 }, { 0xF6A9, 0x805A }, { 0xF6AA, 0x8106 }, 
-	{ 0xF6AB, 0x81ED }, { 0xF6AC, 0x8DA3 }, { 0xF6AD, 0x9189 }, { 0xF6AE, 0x9A5F }, { 0xF6AF, 0x9DF2 }, { 0xF6B0, 0x5074 }, { 0xF6B1, 0x4EC4 }, { 0xF6B2, 0x53A0 }, 
-	{ 0xF6B3, 0x60FB }, { 0xF6B4, 0x6E2C }, { 0xF6B5, 0x5C64 }, { 0xF6B6, 0x4F88 }, { 0xF6B7, 0x5024 }, { 0xF6B8, 0x55E4 }, { 0xF6B9, 0x5CD9 }, { 0xF6BA, 0x5E5F }, 
-	{ 0xF6BB, 0x6065 }, { 0xF6BC, 0x6894 }, { 0xF6BD, 0x6CBB }, { 0xF6BE, 0x6DC4 }, { 0xF6BF, 0x71BE }, { 0xF6C0, 0x75D4 }, { 0xF6C1, 0x75F4 }, { 0xF6C2, 0x7661 }, 
-	{ 0xF6C3, 0x7A1A }, { 0xF6C4, 0x7A49 }, { 0xF6C5, 0x7DC7 }, { 0xF6C6, 0x7DFB }, { 0xF6C7, 0x7F6E }, { 0xF6C8, 0x81F4 }, { 0xF6C9, 0x86A9 }, { 0xF6CA, 0x8F1C }, 
-	{ 0xF6CB, 0x96C9 }, { 0xF6CC, 0x99B3 }, { 0xF6CD, 0x9F52 }, { 0xF6CE, 0x5247 }, { 0xF6CF, 0x52C5 }, { 0xF6D0, 0x98ED }, { 0xF6D1, 0x89AA }, { 0xF6D2, 0x4E03 }, 
-	{ 0xF6D3, 0x67D2 }, { 0xF6D4, 0x6F06 }, { 0xF6D5, 0x4FB5 }, { 0xF6D6, 0x5BE2 }, { 0xF6D7, 0x6795 }, { 0xF6D8, 0x6C88 }, { 0xF6D9, 0x6D78 }, { 0xF6DA, 0x741B }, 
-	{ 0xF6DB, 0x7827 }, { 0xF6DC, 0x91DD }, { 0xF6DD, 0x937C }, { 0xF6DE, 0x87C4 }, { 0xF6DF, 0x79E4 }, { 0xF6E0, 0x7A31 }, { 0xF6E1, 0x5FEB }, { 0xF6E2, 0x4ED6 }, 
-	{ 0xF6E3, 0x54A4 }, { 0xF6E4, 0x553E }, { 0xF6E5, 0x58AE }, { 0xF6E6, 0x59A5 }, { 0xF6E7, 0x60F0 }, { 0xF6E8, 0x6253 }, { 0xF6E9, 0x62D6 }, { 0xF6EA, 0x6736 }, 
-	{ 0xF6EB, 0x6955 }, { 0xF6EC, 0x8235 }, { 0xF6ED, 0x9640 }, { 0xF6EE, 0x99B1 }, { 0xF6EF, 0x99DD }, { 0xF6F0, 0x502C }, { 0xF6F1, 0x5353 }, { 0xF6F2, 0x5544 }, 
-	{ 0xF6F3, 0x577C }, { 0xF6F4, 0xFA01 }, { 0xF6F5, 0x6258 }, { 0xF6F6, 0xFA02 }, { 0xF6F7, 0x64E2 }, { 0xF6F8, 0x666B }, { 0xF6F9, 0x67DD }, { 0xF6FA, 0x6FC1 }, 
-	{ 0xF6FB, 0x6FEF }, { 0xF6FC, 0x7422 }, { 0xF6FD, 0x7438 }, { 0xF6FE, 0x8A17 }, { 0xF7A1, 0x9438 }, { 0xF7A2, 0x5451 }, { 0xF7A3, 0x5606 }, { 0xF7A4, 0x5766 }, 
-	{ 0xF7A5, 0x5F48 }, { 0xF7A6, 0x619A }, { 0xF7A7, 0x6B4E }, { 0xF7A8, 0x7058 }, { 0xF7A9, 0x70AD }, { 0xF7AA, 0x7DBB }, { 0xF7AB, 0x8A95 }, { 0xF7AC, 0x596A }, 
-	{ 0xF7AD, 0x812B }, { 0xF7AE, 0x63A2 }, { 0xF7AF, 0x7708 }, { 0xF7B0, 0x803D }, { 0xF7B1, 0x8CAA }, { 0xF7B2, 0x5854 }, { 0xF7B3, 0x642D }, { 0xF7B4, 0x69BB }, 
-	{ 0xF7B5, 0x5B95 }, { 0xF7B6, 0x5E11 }, { 0xF7B7, 0x6E6F }, { 0xF7B8, 0xFA03 }, { 0xF7B9, 0x8569 }, { 0xF7BA, 0x514C }, { 0xF7BB, 0x53F0 }, { 0xF7BC, 0x592A }, 
-	{ 0xF7BD, 0x6020 }, { 0xF7BE, 0x614B }, { 0xF7BF, 0x6B86 }, { 0xF7C0, 0x6C70 }, { 0xF7C1, 0x6CF0 }, { 0xF7C2, 0x7B1E }, { 0xF7C3, 0x80CE }, { 0xF7C4, 0x82D4 }, 
-	{ 0xF7C5, 0x8DC6 }, { 0xF7C6, 0x90B0 }, { 0xF7C7, 0x98B1 }, { 0xF7C8, 0xFA04 }, { 0xF7C9, 0x64C7 }, { 0xF7CA, 0x6FA4 }, { 0xF7CB, 0x6491 }, { 0xF7CC, 0x6504 }, 
-	{ 0xF7CD, 0x514E }, { 0xF7CE, 0x5410 }, { 0xF7CF, 0x571F }, { 0xF7D0, 0x8A0E }, { 0xF7D1, 0x615F }, { 0xF7D2, 0x6876 }, { 0xF7D3, 0xFA05 }, { 0xF7D4, 0x75DB }, 
-	{ 0xF7D5, 0x7B52 }, { 0xF7D6, 0x7D71 }, { 0xF7D7, 0x901A }, { 0xF7D8, 0x5806 }, { 0xF7D9, 0x69CC }, { 0xF7DA, 0x817F }, { 0xF7DB, 0x892A }, { 0xF7DC, 0x9000 }, 
-	{ 0xF7DD, 0x9839 }, { 0xF7DE, 0x5078 }, { 0xF7DF, 0x5957 }, { 0xF7E0, 0x59AC }, { 0xF7E1, 0x6295 }, { 0xF7E2, 0x900F }, { 0xF7E3, 0x9B2A }, { 0xF7E4, 0x615D }, 
-	{ 0xF7E5, 0x7279 }, { 0xF7E6, 0x95D6 }, { 0xF7E7, 0x5761 }, { 0xF7E8, 0x5A46 }, { 0xF7E9, 0x5DF4 }, { 0xF7EA, 0x628A }, { 0xF7EB, 0x64AD }, { 0xF7EC, 0x64FA }, 
-	{ 0xF7ED, 0x6777 }, { 0xF7EE, 0x6CE2 }, { 0xF7EF, 0x6D3E }, { 0xF7F0, 0x722C }, { 0xF7F1, 0x7436 }, { 0xF7F2, 0x7834 }, { 0xF7F3, 0x7F77 }, { 0xF7F4, 0x82AD }, 
-	{ 0xF7F5, 0x8DDB }, { 0xF7F6, 0x9817 }, { 0xF7F7, 0x5224 }, { 0xF7F8, 0x5742 }, { 0xF7F9, 0x677F }, { 0xF7FA, 0x7248 }, { 0xF7FB, 0x74E3 }, { 0xF7FC, 0x8CA9 }, 
-	{ 0xF7FD, 0x8FA6 }, { 0xF7FE, 0x9211 }, { 0xF8A1, 0x962A }, { 0xF8A2, 0x516B }, { 0xF8A3, 0x53ED }, { 0xF8A4, 0x634C }, { 0xF8A5, 0x4F69 }, { 0xF8A6, 0x5504 }, 
-	{ 0xF8A7, 0x6096 }, { 0xF8A8, 0x6557 }, { 0xF8A9, 0x6C9B }, { 0xF8AA, 0x6D7F }, { 0xF8AB, 0x724C }, { 0xF8AC, 0x72FD }, { 0xF8AD, 0x7A17 }, { 0xF8AE, 0x8987 }, 
-	{ 0xF8AF, 0x8C9D }, { 0xF8B0, 0x5F6D }, { 0xF8B1, 0x6F8E }, { 0xF8B2, 0x70F9 }, { 0xF8B3, 0x81A8 }, { 0xF8B4, 0x610E }, { 0xF8B5, 0x4FBF }, { 0xF8B6, 0x504F }, 
-	{ 0xF8B7, 0x6241 }, { 0xF8B8, 0x7247 }, { 0xF8B9, 0x7BC7 }, { 0xF8BA, 0x7DE8 }, { 0xF8BB, 0x7FE9 }, { 0xF8BC, 0x904D }, { 0xF8BD, 0x97AD }, { 0xF8BE, 0x9A19 }, 
-	{ 0xF8BF, 0x8CB6 }, { 0xF8C0, 0x576A }, { 0xF8C1, 0x5E73 }, { 0xF8C2, 0x67B0 }, { 0xF8C3, 0x840D }, { 0xF8C4, 0x8A55 }, { 0xF8C5, 0x5420 }, { 0xF8C6, 0x5B16 }, 
-	{ 0xF8C7, 0x5E63 }, { 0xF8C8, 0x5EE2 }, { 0xF8C9, 0x5F0A }, { 0xF8CA, 0x6583 }, { 0xF8CB, 0x80BA }, { 0xF8CC, 0x853D }, { 0xF8CD, 0x9589 }, { 0xF8CE, 0x965B }, 
-	{ 0xF8CF, 0x4F48 }, { 0xF8D0, 0x5305 }, { 0xF8D1, 0x530D }, { 0xF8D2, 0x530F }, { 0xF8D3, 0x5486 }, { 0xF8D4, 0x54FA }, { 0xF8D5, 0x5703 }, { 0xF8D6, 0x5E03 }, 
-	{ 0xF8D7, 0x6016 }, { 0xF8D8, 0x629B }, { 0xF8D9, 0x62B1 }, { 0xF8DA, 0x6355 }, { 0xF8DB, 0xFA06 }, { 0xF8DC, 0x6CE1 }, { 0xF8DD, 0x6D66 }, { 0xF8DE, 0x75B1 }, 
-	{ 0xF8DF, 0x7832 }, { 0xF8E0, 0x80DE }, { 0xF8E1, 0x812F }, { 0xF8E2, 0x82DE }, { 0xF8E3, 0x8461 }, { 0xF8E4, 0x84B2 }, { 0xF8E5, 0x888D }, { 0xF8E6, 0x8912 }, 
-	{ 0xF8E7, 0x900B }, { 0xF8E8, 0x92EA }, { 0xF8E9, 0x98FD }, { 0xF8EA, 0x9B91 }, { 0xF8EB, 0x5E45 }, { 0xF8EC, 0x66B4 }, { 0xF8ED, 0x66DD }, { 0xF8EE, 0x7011 }, 
-	{ 0xF8EF, 0x7206 }, { 0xF8F0, 0xFA07 }, { 0xF8F1, 0x4FF5 }, { 0xF8F2, 0x527D }, { 0xF8F3, 0x5F6A }, { 0xF8F4, 0x6153 }, { 0xF8F5, 0x6753 }, { 0xF8F6, 0x6A19 }, 
-	{ 0xF8F7, 0x6F02 }, { 0xF8F8, 0x74E2 }, { 0xF8F9, 0x7968 }, { 0xF8FA, 0x8868 }, { 0xF8FB, 0x8C79 }, { 0xF8FC, 0x98C7 }, { 0xF8FD, 0x98C4 }, { 0xF8FE, 0x9A43 }, 
-	{ 0xF9A1, 0x54C1 }, { 0xF9A2, 0x7A1F }, { 0xF9A3, 0x6953 }, { 0xF9A4, 0x8AF7 }, { 0xF9A5, 0x8C4A }, { 0xF9A6, 0x98A8 }, { 0xF9A7, 0x99AE }, { 0xF9A8, 0x5F7C }, 
-	{ 0xF9A9, 0x62AB }, { 0xF9AA, 0x75B2 }, { 0xF9AB, 0x76AE }, { 0xF9AC, 0x88AB }, { 0xF9AD, 0x907F }, { 0xF9AE, 0x9642 }, { 0xF9AF, 0x5339 }, { 0xF9B0, 0x5F3C }, 
-	{ 0xF9B1, 0x5FC5 }, { 0xF9B2, 0x6CCC }, { 0xF9B3, 0x73CC }, { 0xF9B4, 0x7562 }, { 0xF9B5, 0x758B }, { 0xF9B6, 0x7B46 }, { 0xF9B7, 0x82FE }, { 0xF9B8, 0x999D }, 
-	{ 0xF9B9, 0x4E4F }, { 0xF9BA, 0x903C }, { 0xF9BB, 0x4E0B }, { 0xF9BC, 0x4F55 }, { 0xF9BD, 0x53A6 }, { 0xF9BE, 0x590F }, { 0xF9BF, 0x5EC8 }, { 0xF9C0, 0x6630 }, 
-	{ 0xF9C1, 0x6CB3 }, { 0xF9C2, 0x7455 }, { 0xF9C3, 0x8377 }, { 0xF9C4, 0x8766 }, { 0xF9C5, 0x8CC0 }, { 0xF9C6, 0x9050 }, { 0xF9C7, 0x971E }, { 0xF9C8, 0x9C15 }, 
-	{ 0xF9C9, 0x58D1 }, { 0xF9CA, 0x5B78 }, { 0xF9CB, 0x8650 }, { 0xF9CC, 0x8B14 }, { 0xF9CD, 0x9DB4 }, { 0xF9CE, 0x5BD2 }, { 0xF9CF, 0x6068 }, { 0xF9D0, 0x608D }, 
-	{ 0xF9D1, 0x65F1 }, { 0xF9D2, 0x6C57 }, { 0xF9D3, 0x6F22 }, { 0xF9D4, 0x6FA3 }, { 0xF9D5, 0x701A }, { 0xF9D6, 0x7F55 }, { 0xF9D7, 0x7FF0 }, { 0xF9D8, 0x9591 }, 
-	{ 0xF9D9, 0x9592 }, { 0xF9DA, 0x9650 }, { 0xF9DB, 0x97D3 }, { 0xF9DC, 0x5272 }, { 0xF9DD, 0x8F44 }, { 0xF9DE, 0x51FD }, { 0xF9DF, 0x542B }, { 0xF9E0, 0x54B8 }, 
-	{ 0xF9E1, 0x5563 }, { 0xF9E2, 0x558A }, { 0xF9E3, 0x6ABB }, { 0xF9E4, 0x6DB5 }, { 0xF9E5, 0x7DD8 }, { 0xF9E6, 0x8266 }, { 0xF9E7, 0x929C }, { 0xF9E8, 0x9677 }, 
-	{ 0xF9E9, 0x9E79 }, { 0xF9EA, 0x5408 }, { 0xF9EB, 0x54C8 }, { 0xF9EC, 0x76D2 }, { 0xF9ED, 0x86E4 }, { 0xF9EE, 0x95A4 }, { 0xF9EF, 0x95D4 }, { 0xF9F0, 0x965C }, 
-	{ 0xF9F1, 0x4EA2 }, { 0xF9F2, 0x4F09 }, { 0xF9F3, 0x59EE }, { 0xF9F4, 0x5AE6 }, { 0xF9F5, 0x5DF7 }, { 0xF9F6, 0x6052 }, { 0xF9F7, 0x6297 }, { 0xF9F8, 0x676D }, 
-	{ 0xF9F9, 0x6841 }, { 0xF9FA, 0x6C86 }, { 0xF9FB, 0x6E2F }, { 0xF9FC, 0x7F38 }, { 0xF9FD, 0x809B }, { 0xF9FE, 0x822A }, { 0xFAA1, 0xFA08 }, { 0xFAA2, 0xFA09 }, 
-	{ 0xFAA3, 0x9805 }, { 0xFAA4, 0x4EA5 }, { 0xFAA5, 0x5055 }, { 0xFAA6, 0x54B3 }, { 0xFAA7, 0x5793 }, { 0xFAA8, 0x595A }, { 0xFAA9, 0x5B69 }, { 0xFAAA, 0x5BB3 }, 
-	{ 0xFAAB, 0x61C8 }, { 0xFAAC, 0x6977 }, { 0xFAAD, 0x6D77 }, { 0xFAAE, 0x7023 }, { 0xFAAF, 0x87F9 }, { 0xFAB0, 0x89E3 }, { 0xFAB1, 0x8A72 }, { 0xFAB2, 0x8AE7 }, 
-	{ 0xFAB3, 0x9082 }, { 0xFAB4, 0x99ED }, { 0xFAB5, 0x9AB8 }, { 0xFAB6, 0x52BE }, { 0xFAB7, 0x6838 }, { 0xFAB8, 0x5016 }, { 0xFAB9, 0x5E78 }, { 0xFABA, 0x674F }, 
-	{ 0xFABB, 0x8347 }, { 0xFABC, 0x884C }, { 0xFABD, 0x4EAB }, { 0xFABE, 0x5411 }, { 0xFABF, 0x56AE }, { 0xFAC0, 0x73E6 }, { 0xFAC1, 0x9115 }, { 0xFAC2, 0x97FF }, 
-	{ 0xFAC3, 0x9909 }, { 0xFAC4, 0x9957 }, { 0xFAC5, 0x9999 }, { 0xFAC6, 0x5653 }, { 0xFAC7, 0x589F }, { 0xFAC8, 0x865B }, { 0xFAC9, 0x8A31 }, { 0xFACA, 0x61B2 }, 
-	{ 0xFACB, 0x6AF6 }, { 0xFACC, 0x737B }, { 0xFACD, 0x8ED2 }, { 0xFACE, 0x6B47 }, { 0xFACF, 0x96AA }, { 0xFAD0, 0x9A57 }, { 0xFAD1, 0x5955 }, { 0xFAD2, 0x7200 }, 
-	{ 0xFAD3, 0x8D6B }, { 0xFAD4, 0x9769 }, { 0xFAD5, 0x4FD4 }, { 0xFAD6, 0x5CF4 }, { 0xFAD7, 0x5F26 }, { 0xFAD8, 0x61F8 }, { 0xFAD9, 0x665B }, { 0xFADA, 0x6CEB }, 
-	{ 0xFADB, 0x70AB }, { 0xFADC, 0x7384 }, { 0xFADD, 0x73B9 }, { 0xFADE, 0x73FE }, { 0xFADF, 0x7729 }, { 0xFAE0, 0x774D }, { 0xFAE1, 0x7D43 }, { 0xFAE2, 0x7D62 }, 
-	{ 0xFAE3, 0x7E23 }, { 0xFAE4, 0x8237 }, { 0xFAE5, 0x8852 }, { 0xFAE6, 0xFA0A }, { 0xFAE7, 0x8CE2 }, { 0xFAE8, 0x9249 }, { 0xFAE9, 0x986F }, { 0xFAEA, 0x5B51 }, 
-	{ 0xFAEB, 0x7A74 }, { 0xFAEC, 0x8840 }, { 0xFAED, 0x9801 }, { 0xFAEE, 0x5ACC }, { 0xFAEF, 0x4FE0 }, { 0xFAF0, 0x5354 }, { 0xFAF1, 0x593E }, { 0xFAF2, 0x5CFD }, 
-	{ 0xFAF3, 0x633E }, { 0xFAF4, 0x6D79 }, { 0xFAF5, 0x72F9 }, { 0xFAF6, 0x8105 }, { 0xFAF7, 0x8107 }, { 0xFAF8, 0x83A2 }, { 0xFAF9, 0x92CF }, { 0xFAFA, 0x9830 }, 
-	{ 0xFAFB, 0x4EA8 }, { 0xFAFC, 0x5144 }, { 0xFAFD, 0x5211 }, { 0xFAFE, 0x578B }, { 0xFBA1, 0x5F62 }, { 0xFBA2, 0x6CC2 }, { 0xFBA3, 0x6ECE }, { 0xFBA4, 0x7005 }, 
-	{ 0xFBA5, 0x7050 }, { 0xFBA6, 0x70AF }, { 0xFBA7, 0x7192 }, { 0xFBA8, 0x73E9 }, { 0xFBA9, 0x7469 }, { 0xFBAA, 0x834A }, { 0xFBAB, 0x87A2 }, { 0xFBAC, 0x8861 }, 
-	{ 0xFBAD, 0x9008 }, { 0xFBAE, 0x90A2 }, { 0xFBAF, 0x93A3 }, { 0xFBB0, 0x99A8 }, { 0xFBB1, 0x516E }, { 0xFBB2, 0x5F57 }, { 0xFBB3, 0x60E0 }, { 0xFBB4, 0x6167 }, 
-	{ 0xFBB5, 0x66B3 }, { 0xFBB6, 0x8559 }, { 0xFBB7, 0x8E4A }, { 0xFBB8, 0x91AF }, { 0xFBB9, 0x978B }, { 0xFBBA, 0x4E4E }, { 0xFBBB, 0x4E92 }, { 0xFBBC, 0x547C }, 
-	{ 0xFBBD, 0x58D5 }, { 0xFBBE, 0x58FA }, { 0xFBBF, 0x597D }, { 0xFBC0, 0x5CB5 }, { 0xFBC1, 0x5F27 }, { 0xFBC2, 0x6236 }, { 0xFBC3, 0x6248 }, { 0xFBC4, 0x660A }, 
-	{ 0xFBC5, 0x6667 }, { 0xFBC6, 0x6BEB }, { 0xFBC7, 0x6D69 }, { 0xFBC8, 0x6DCF }, { 0xFBC9, 0x6E56 }, { 0xFBCA, 0x6EF8 }, { 0xFBCB, 0x6F94 }, { 0xFBCC, 0x6FE0 }, 
-	{ 0xFBCD, 0x6FE9 }, { 0xFBCE, 0x705D }, { 0xFBCF, 0x72D0 }, { 0xFBD0, 0x7425 }, { 0xFBD1, 0x745A }, { 0xFBD2, 0x74E0 }, { 0xFBD3, 0x7693 }, { 0xFBD4, 0x795C }, 
-	{ 0xFBD5, 0x7CCA }, { 0xFBD6, 0x7E1E }, { 0xFBD7, 0x80E1 }, { 0xFBD8, 0x82A6 }, { 0xFBD9, 0x846B }, { 0xFBDA, 0x84BF }, { 0xFBDB, 0x864E }, { 0xFBDC, 0x865F }, 
-	{ 0xFBDD, 0x8774 }, { 0xFBDE, 0x8B77 }, { 0xFBDF, 0x8C6A }, { 0xFBE0, 0x93AC }, { 0xFBE1, 0x9800 }, { 0xFBE2, 0x9865 }, { 0xFBE3, 0x60D1 }, { 0xFBE4, 0x6216 }, 
-	{ 0xFBE5, 0x9177 }, { 0xFBE6, 0x5A5A }, { 0xFBE7, 0x660F }, { 0xFBE8, 0x6DF7 }, { 0xFBE9, 0x6E3E }, { 0xFBEA, 0x743F }, { 0xFBEB, 0x9B42 }, { 0xFBEC, 0x5FFD }, 
-	{ 0xFBED, 0x60DA }, { 0xFBEE, 0x7B0F }, { 0xFBEF, 0x54C4 }, { 0xFBF0, 0x5F18 }, { 0xFBF1, 0x6C5E }, { 0xFBF2, 0x6CD3 }, { 0xFBF3, 0x6D2A }, { 0xFBF4, 0x70D8 }, 
-	{ 0xFBF5, 0x7D05 }, { 0xFBF6, 0x8679 }, { 0xFBF7, 0x8A0C }, { 0xFBF8, 0x9D3B }, { 0xFBF9, 0x5316 }, { 0xFBFA, 0x548C }, { 0xFBFB, 0x5B05 }, { 0xFBFC, 0x6A3A }, 
-	{ 0xFBFD, 0x706B }, { 0xFBFE, 0x7575 }, { 0xFCA1, 0x798D }, { 0xFCA2, 0x79BE }, { 0xFCA3, 0x82B1 }, { 0xFCA4, 0x83EF }, { 0xFCA5, 0x8A71 }, { 0xFCA6, 0x8B41 }, 
-	{ 0xFCA7, 0x8CA8 }, { 0xFCA8, 0x9774 }, { 0xFCA9, 0xFA0B }, { 0xFCAA, 0x64F4 }, { 0xFCAB, 0x652B }, { 0xFCAC, 0x78BA }, { 0xFCAD, 0x78BB }, { 0xFCAE, 0x7A6B }, 
-	{ 0xFCAF, 0x4E38 }, { 0xFCB0, 0x559A }, { 0xFCB1, 0x5950 }, { 0xFCB2, 0x5BA6 }, { 0xFCB3, 0x5E7B }, { 0xFCB4, 0x60A3 }, { 0xFCB5, 0x63DB }, { 0xFCB6, 0x6B61 }, 
-	{ 0xFCB7, 0x6665 }, { 0xFCB8, 0x6853 }, { 0xFCB9, 0x6E19 }, { 0xFCBA, 0x7165 }, { 0xFCBB, 0x74B0 }, { 0xFCBC, 0x7D08 }, { 0xFCBD, 0x9084 }, { 0xFCBE, 0x9A69 }, 
-	{ 0xFCBF, 0x9C25 }, { 0xFCC0, 0x6D3B }, { 0xFCC1, 0x6ED1 }, { 0xFCC2, 0x733E }, { 0xFCC3, 0x8C41 }, { 0xFCC4, 0x95CA }, { 0xFCC5, 0x51F0 }, { 0xFCC6, 0x5E4C }, 
-	{ 0xFCC7, 0x5FA8 }, { 0xFCC8, 0x604D }, { 0xFCC9, 0x60F6 }, { 0xFCCA, 0x6130 }, { 0xFCCB, 0x614C }, { 0xFCCC, 0x6643 }, { 0xFCCD, 0x6644 }, { 0xFCCE, 0x69A5 }, 
-	{ 0xFCCF, 0x6CC1 }, { 0xFCD0, 0x6E5F }, { 0xFCD1, 0x6EC9 }, { 0xFCD2, 0x6F62 }, { 0xFCD3, 0x714C }, { 0xFCD4, 0x749C }, { 0xFCD5, 0x7687 }, { 0xFCD6, 0x7BC1 }, 
-	{ 0xFCD7, 0x7C27 }, { 0xFCD8, 0x8352 }, { 0xFCD9, 0x8757 }, { 0xFCDA, 0x9051 }, { 0xFCDB, 0x968D }, { 0xFCDC, 0x9EC3 }, { 0xFCDD, 0x532F }, { 0xFCDE, 0x56DE }, 
-	{ 0xFCDF, 0x5EFB }, { 0xFCE0, 0x5F8A }, { 0xFCE1, 0x6062 }, { 0xFCE2, 0x6094 }, { 0xFCE3, 0x61F7 }, { 0xFCE4, 0x6666 }, { 0xFCE5, 0x6703 }, { 0xFCE6, 0x6A9C }, 
-	{ 0xFCE7, 0x6DEE }, { 0xFCE8, 0x6FAE }, { 0xFCE9, 0x7070 }, { 0xFCEA, 0x736A }, { 0xFCEB, 0x7E6A }, { 0xFCEC, 0x81BE }, { 0xFCED, 0x8334 }, { 0xFCEE, 0x86D4 }, 
-	{ 0xFCEF, 0x8AA8 }, { 0xFCF0, 0x8CC4 }, { 0xFCF1, 0x5283 }, { 0xFCF2, 0x7372 }, { 0xFCF3, 0x5B96 }, { 0xFCF4, 0x6A6B }, { 0xFCF5, 0x9404 }, { 0xFCF6, 0x54EE }, 
-	{ 0xFCF7, 0x5686 }, { 0xFCF8, 0x5B5D }, { 0xFCF9, 0x6548 }, { 0xFCFA, 0x6585 }, { 0xFCFB, 0x66C9 }, { 0xFCFC, 0x689F }, { 0xFCFD, 0x6D8D }, { 0xFCFE, 0x6DC6 }, 
-	{ 0xFDA1, 0x723B }, { 0xFDA2, 0x80B4 }, { 0xFDA3, 0x9175 }, { 0xFDA4, 0x9A4D }, { 0xFDA5, 0x4FAF }, { 0xFDA6, 0x5019 }, { 0xFDA7, 0x539A }, { 0xFDA8, 0x540E }, 
-	{ 0xFDA9, 0x543C }, { 0xFDAA, 0x5589 }, { 0xFDAB, 0x55C5 }, { 0xFDAC, 0x5E3F }, { 0xFDAD, 0x5F8C }, { 0xFDAE, 0x673D }, { 0xFDAF, 0x7166 }, { 0xFDB0, 0x73DD }, 
-	{ 0xFDB1, 0x9005 }, { 0xFDB2, 0x52DB }, { 0xFDB3, 0x52F3 }, { 0xFDB4, 0x5864 }, { 0xFDB5, 0x58CE }, { 0xFDB6, 0x7104 }, { 0xFDB7, 0x718F }, { 0xFDB8, 0x71FB }, 
-	{ 0xFDB9, 0x85B0 }, { 0xFDBA, 0x8A13 }, { 0xFDBB, 0x6688 }, { 0xFDBC, 0x85A8 }, { 0xFDBD, 0x55A7 }, { 0xFDBE, 0x6684 }, { 0xFDBF, 0x714A }, { 0xFDC0, 0x8431 }, 
-	{ 0xFDC1, 0x5349 }, { 0xFDC2, 0x5599 }, { 0xFDC3, 0x6BC1 }, { 0xFDC4, 0x5F59 }, { 0xFDC5, 0x5FBD }, { 0xFDC6, 0x63EE }, { 0xFDC7, 0x6689 }, { 0xFDC8, 0x7147 }, 
-	{ 0xFDC9, 0x8AF1 }, { 0xFDCA, 0x8F1D }, { 0xFDCB, 0x9EBE }, { 0xFDCC, 0x4F11 }, { 0xFDCD, 0x643A }, { 0xFDCE, 0x70CB }, { 0xFDCF, 0x7566 }, { 0xFDD0, 0x8667 }, 
-	{ 0xFDD1, 0x6064 }, { 0xFDD2, 0x8B4E }, { 0xFDD3, 0x9DF8 }, { 0xFDD4, 0x5147 }, { 0xFDD5, 0x51F6 }, { 0xFDD6, 0x5308 }, { 0xFDD7, 0x6D36 }, { 0xFDD8, 0x80F8 }, 
-	{ 0xFDD9, 0x9ED1 }, { 0xFDDA, 0x6615 }, { 0xFDDB, 0x6B23 }, { 0xFDDC, 0x7098 }, { 0xFDDD, 0x75D5 }, { 0xFDDE, 0x5403 }, { 0xFDDF, 0x5C79 }, { 0xFDE0, 0x7D07 }, 
-	{ 0xFDE1, 0x8A16 }, { 0xFDE2, 0x6B20 }, { 0xFDE3, 0x6B3D }, { 0xFDE4, 0x6B46 }, { 0xFDE5, 0x5438 }, { 0xFDE6, 0x6070 }, { 0xFDE7, 0x6D3D }, { 0xFDE8, 0x7FD5 }, 
-	{ 0xFDE9, 0x8208 }, { 0xFDEA, 0x50D6 }, { 0xFDEB, 0x51DE }, { 0xFDEC, 0x559C }, { 0xFDED, 0x566B }, { 0xFDEE, 0x56CD }, { 0xFDEF, 0x59EC }, { 0xFDF0, 0x5B09 }, 
-	{ 0xFDF1, 0x5E0C }, { 0xFDF2, 0x6199 }, { 0xFDF3, 0x6198 }, { 0xFDF4, 0x6231 }, { 0xFDF5, 0x665E }, { 0xFDF6, 0x66E6 }, { 0xFDF7, 0x7199 }, { 0xFDF8, 0x71B9 }, 
-	{ 0xFDF9, 0x71BA }, { 0xFDFA, 0x72A7 }, { 0xFDFB, 0x79A7 }, { 0xFDFC, 0x7A00 }, { 0xFDFD, 0x7FB2 }, { 0xFDFE, 0x8A70 }, 
+	{ 0xA14D, 0xFE59 }, { 0xA14E, 0xFE5A }, { 0xA159, 0x2985 }, { 0xA15A, 0x2986 }, { 0xA15D, 0x3016 }, { 0xA15E, 0x3017 }, { 0xA15F, 0x3018 }, { 0xA160, 0x3019 },
+	{ 0xA16D, 0x2051 }, { 0xA16E, 0xF840 }, { 0xA16F, 0x201F }, { 0xA170, 0x201B }, { 0xA171, 0x207A }, { 0xA172, 0x207B }, { 0xA17A, 0x207C }, { 0xA17C, 0x207D },
+	{ 0xA17D, 0x207E }, { 0xA196, 0x204C }, { 0xA197, 0x204D }, { 0xA198, 0x02BC }, { 0xA199, 0x2997 }, { 0xA19A, 0x2998 }, { 0xA1A1, 0x3000 }, { 0xA1A2, 0x3001 },
+	{ 0xA1A3, 0x3002 }, { 0xA1A4, 0x00B7 }, { 0xA1A5, 0x2025 }, { 0xA1A6, 0x2026 }, { 0xA1A7, 0x00A8 }, { 0xA1A8, 0x3003 }, { 0xA1A9, 0x2013 }, { 0xA1AA, 0x2014 },
+	{ 0xA1AB, 0x2016 }, { 0xA1AC, 0xFF3C }, { 0xA1AD, 0x301C }, { 0xA1AE, 0x2018 }, { 0xA1AF, 0x2019 }, { 0xA1B0, 0x201C }, { 0xA1B1, 0x201D }, { 0xA1B2, 0x3014 },
+	{ 0xA1B3, 0x3015 }, { 0xA1B4, 0x3008 }, { 0xA1B5, 0x3009 }, { 0xA1B6, 0x300A }, { 0xA1B7, 0x300B }, { 0xA1B8, 0x300C }, { 0xA1B9, 0x300D }, { 0xA1BA, 0x300E },
+	{ 0xA1BB, 0x300F }, { 0xA1BC, 0x3010 }, { 0xA1BD, 0x3011 }, { 0xA1BE, 0x00B1 }, { 0xA1BF, 0x00D7 }, { 0xA1C0, 0x00F7 }, { 0xA1C1, 0x2260 }, { 0xA1C2, 0x2264 },
+	{ 0xA1C3, 0x2265 }, { 0xA1C4, 0x221E }, { 0xA1C5, 0x2234 }, { 0xA1C6, 0x00B0 }, { 0xA1C7, 0x2032 }, { 0xA1C8, 0x2033 }, { 0xA1C9, 0x2103 }, { 0xA1CA, 0x212B },
+	{ 0xA1CB, 0x00A2 }, { 0xA1CC, 0x00A3 }, { 0xA1CD, 0x00A5 }, { 0xA1CE, 0x2642 }, { 0xA1CF, 0x2640 }, { 0xA1D0, 0x2220 }, { 0xA1D1, 0x22A5 }, { 0xA1D2, 0x2312 },
+	{ 0xA1D3, 0x2202 }, { 0xA1D4, 0x2207 }, { 0xA1D5, 0x2261 }, { 0xA1D6, 0x2252 }, { 0xA1D7, 0x00A7 }, { 0xA1D8, 0x203B }, { 0xA1D9, 0x2606 }, { 0xA1DA, 0x2605 },
+	{ 0xA1DB, 0x25CB }, { 0xA1DC, 0x25CF }, { 0xA1DD, 0x25CE }, { 0xA1DE, 0x25C7 }, { 0xA1DF, 0x25C6 }, { 0xA1E0, 0x25A1 }, { 0xA1E1, 0x25A0 }, { 0xA1E2, 0x25B3 },
+	{ 0xA1E3, 0x25B2 }, { 0xA1E4, 0x25BD }, { 0xA1E5, 0x25BC }, { 0xA1E6, 0x2192 }, { 0xA1E7, 0x2190 }, { 0xA1E8, 0x2191 }, { 0xA1E9, 0x2193 }, { 0xA1EA, 0x2194 },
+	{ 0xA1EB, 0x3013 }, { 0xA1EC, 0x226A }, { 0xA1ED, 0x226B }, { 0xA1EE, 0x221A }, { 0xA1EF, 0x223D }, { 0xA1F0, 0x221D }, { 0xA1F1, 0x2235 }, { 0xA1F2, 0x222B },
+	{ 0xA1F3, 0x222C }, { 0xA1F4, 0x2208 }, { 0xA1F5, 0x220B }, { 0xA1F6, 0x2286 }, { 0xA1F7, 0x2287 }, { 0xA1F8, 0x2282 }, { 0xA1F9, 0x2283 }, { 0xA1FA, 0x222A },
+	{ 0xA1FB, 0x2229 }, { 0xA1FC, 0x2227 }, { 0xA1FD, 0x2228 }, { 0xA1FE, 0x00AC }, { 0xA2A1, 0x21D2 }, { 0xA2A2, 0x21D4 }, { 0xA2A3, 0x2200 }, { 0xA2A4, 0x2203 },
+	{ 0xA2A5, 0x00B4 }, { 0xA2A6, 0x02DC }, { 0xA2A7, 0x02C7 }, { 0xA2A8, 0x02D8 }, { 0xA2A9, 0x02DD }, { 0xA2AA, 0x02DA }, { 0xA2AB, 0x02D9 }, { 0xA2AC, 0x00B8 },
+	{ 0xA2AD, 0x02DB }, { 0xA2AE, 0x00A1 }, { 0xA2AF, 0x00BF }, { 0xA2B0, 0x02D0 }, { 0xA2B1, 0x222E }, { 0xA2B2, 0x2211 }, { 0xA2B3, 0x220F }, { 0xA2B4, 0x00A4 },
+	{ 0xA2B5, 0x2109 }, { 0xA2B6, 0x2030 }, { 0xA2B7, 0x25C1 }, { 0xA2B8, 0x25C0 }, { 0xA2B9, 0x25B7 }, { 0xA2BA, 0x25B6 }, { 0xA2BB, 0x2664 }, { 0xA2BC, 0x2660 },
+	{ 0xA2BD, 0x2661 }, { 0xA2BE, 0x2665 }, { 0xA2BF, 0x2667 }, { 0xA2C0, 0x2663 }, { 0xA2C1, 0x25C9 }, { 0xA2C2, 0x25C8 }, { 0xA2C3, 0x25A3 }, { 0xA2C4, 0x25D0 },
+	{ 0xA2C5, 0x25D1 }, { 0xA2C6, 0x2592 }, { 0xA2C7, 0x25A4 }, { 0xA2C8, 0x25A5 }, { 0xA2C9, 0x25A8 }, { 0xA2CA, 0x25A7 }, { 0xA2CB, 0x25A6 }, { 0xA2CC, 0x25A9 },
+	{ 0xA2CD, 0x2668 }, { 0xA2CE, 0x260F }, { 0xA2CF, 0x260E }, { 0xA2D0, 0x261C }, { 0xA2D1, 0x261E }, { 0xA2D2, 0x00B6 }, { 0xA2D3, 0x2020 }, { 0xA2D4, 0x2021 },
+	{ 0xA2D5, 0x2195 }, { 0xA2D6, 0x2197 }, { 0xA2D7, 0x2199 }, { 0xA2D8, 0x2196 }, { 0xA2D9, 0x2198 }, { 0xA2DA, 0x266D }, { 0xA2DB, 0x2669 }, { 0xA2DC, 0x266A },
+	{ 0xA2DD, 0x266C }, { 0xA2DE, 0x327F }, { 0xA2DF, 0x321C }, { 0xA2E0, 0x2116 }, { 0xA2E1, 0x33C7 }, { 0xA2E2, 0x2122 }, { 0xA2E3, 0x33C2 }, { 0xA2E4, 0x33D8 },
+	{ 0xA2E5, 0x2121 }, { 0xA2FD, 0x22EE }, { 0xA2FE, 0x2237 }, { 0xA355, 0x278A }, { 0xA356, 0x278B }, { 0xA357, 0x278C }, { 0xA358, 0x278D }, { 0xA359, 0x278E },
+	{ 0xA35A, 0x278F }, { 0xA35B, 0x2790 }, { 0xA35C, 0x2791 }, { 0xA35D, 0x2792 }, { 0xA35E, 0x2793 }, { 0xA386, 0x24B6 }, { 0xA387, 0x24B7 }, { 0xA388, 0x24B8 },
+	{ 0xA389, 0x24B9 }, { 0xA38A, 0x24BA }, { 0xA38B, 0x24BB }, { 0xA38C, 0x24BC }, { 0xA38D, 0x24BD }, { 0xA38E, 0x24BE }, { 0xA38F, 0x24BF }, { 0xA390, 0x24C0 },
+	{ 0xA391, 0x24C1 }, { 0xA392, 0x24C2 }, { 0xA393, 0x24C3 }, { 0xA394, 0x24C4 }, { 0xA395, 0x24C5 }, { 0xA396, 0x24C6 }, { 0xA397, 0x24C7 }, { 0xA398, 0x24C8 },
+	{ 0xA399, 0x24C9 }, { 0xA39A, 0x24CA }, { 0xA39B, 0x24CB }, { 0xA39C, 0x24CC }, { 0xA39D, 0x24CD }, { 0xA39E, 0x24CE }, { 0xA39F, 0x24CF }, { 0xA3A1, 0xFF01 },
+	{ 0xA3A2, 0xFF02 }, { 0xA3A3, 0xFF03 }, { 0xA3A4, 0xFF04 }, { 0xA3A5, 0xFF05 }, { 0xA3A6, 0xFF06 }, { 0xA3A7, 0xFF07 }, { 0xA3A8, 0xFF08 }, { 0xA3A9, 0xFF09 },
+	{ 0xA3AA, 0xFF0A }, { 0xA3AB, 0xFF0B }, { 0xA3AC, 0xFF0C }, { 0xA3AD, 0xFF0D }, { 0xA3AE, 0xFF0E }, { 0xA3AF, 0xFF0F }, { 0xA3B0, 0xFF10 }, { 0xA3B1, 0xFF11 },
+	{ 0xA3B2, 0xFF12 }, { 0xA3B3, 0xFF13 }, { 0xA3B4, 0xFF14 }, { 0xA3B5, 0xFF15 }, { 0xA3B6, 0xFF16 }, { 0xA3B7, 0xFF17 }, { 0xA3B8, 0xFF18 }, { 0xA3B9, 0xFF19 },
+	{ 0xA3BA, 0xFF1A }, { 0xA3BB, 0xFF1B }, { 0xA3BC, 0xFF1C }, { 0xA3BD, 0xFF1D }, { 0xA3BE, 0xFF1E }, { 0xA3BF, 0xFF1F }, { 0xA3C0, 0xFF20 }, { 0xA3C1, 0xFF21 },
+	{ 0xA3C2, 0xFF22 }, { 0xA3C3, 0xFF23 }, { 0xA3C4, 0xFF24 }, { 0xA3C5, 0xFF25 }, { 0xA3C6, 0xFF26 }, { 0xA3C7, 0xFF27 }, { 0xA3C8, 0xFF28 }, { 0xA3C9, 0xFF29 },
+	{ 0xA3CA, 0xFF2A }, { 0xA3CB, 0xFF2B }, { 0xA3CC, 0xFF2C }, { 0xA3CD, 0xFF2D }, { 0xA3CE, 0xFF2E }, { 0xA3CF, 0xFF2F }, { 0xA3D0, 0xFF30 }, { 0xA3D1, 0xFF31 },
+	{ 0xA3D2, 0xFF32 }, { 0xA3D3, 0xFF33 }, { 0xA3D4, 0xFF34 }, { 0xA3D5, 0xFF35 }, { 0xA3D6, 0xFF36 }, { 0xA3D7, 0xFF37 }, { 0xA3D8, 0xFF38 }, { 0xA3D9, 0xFF39 },
+	{ 0xA3DA, 0xFF3A }, { 0xA3DB, 0xFF3B }, { 0xA3DC, 0xFFE6 }, { 0xA3DD, 0xFF3D }, { 0xA3DE, 0xFF3E }, { 0xA3DF, 0xFF3F }, { 0xA3E0, 0xFF40 }, { 0xA3E1, 0xFF41 },
+	{ 0xA3E2, 0xFF42 }, { 0xA3E3, 0xFF43 }, { 0xA3E4, 0xFF44 }, { 0xA3E5, 0xFF45 }, { 0xA3E6, 0xFF46 }, { 0xA3E7, 0xFF47 }, { 0xA3E8, 0xFF48 }, { 0xA3E9, 0xFF49 },
+	{ 0xA3EA, 0xFF4A }, { 0xA3EB, 0xFF4B }, { 0xA3EC, 0xFF4C }, { 0xA3ED, 0xFF4D }, { 0xA3EE, 0xFF4E }, { 0xA3EF, 0xFF4F }, { 0xA3F0, 0xFF50 }, { 0xA3F1, 0xFF51 },
+	{ 0xA3F2, 0xFF52 }, { 0xA3F3, 0xFF53 }, { 0xA3F4, 0xFF54 }, { 0xA3F5, 0xFF55 }, { 0xA3F6, 0xFF56 }, { 0xA3F7, 0xFF57 }, { 0xA3F8, 0xFF58 }, { 0xA3F9, 0xFF59 },
+	{ 0xA3FA, 0xFF5A }, { 0xA3FB, 0xFF5B }, { 0xA3FC, 0xFF5C }, { 0xA3FD, 0xFF5D }, { 0xA3FE, 0x203E }, { 0xA47D, 0x2A26 }, { 0xA481, 0x227A }, { 0xA482, 0x227B },
+	{ 0xA483, 0x22CE }, { 0xA484, 0x22CF }, { 0xA485, 0x2280 }, { 0xA486, 0x2281 }, { 0xA487, 0x2270 }, { 0xA488, 0x2271 }, { 0xA489, 0x2272 }, { 0xA48A, 0x2273 },
+	{ 0xA48B, 0x2AC5 }, { 0xA48C, 0x2ACB }, { 0xA48D, 0x2AC6 }, { 0xA48E, 0x2ACC }, { 0xA48F, 0x2276 }, { 0xA490, 0x2277 }, { 0xA491, 0x2279 }, { 0xA492, 0x22DA },
+	{ 0xA493, 0x22DB }, { 0xA494, 0x2A8B }, { 0xA495, 0x2A8C }, { 0xA496, 0x2A91 }, { 0xA497, 0x2A92 }, { 0xA499, 0x2245 }, { 0xA49A, 0x2243 }, { 0xA49B, 0x2248 },
+	{ 0xA49C, 0x29A3 }, { 0xA49D, 0x22A4 }, { 0xA4A1, 0x3131 }, { 0xA4A2, 0x3132 }, { 0xA4A3, 0x3133 }, { 0xA4A4, 0x3134 }, { 0xA4A5, 0x3135 }, { 0xA4A6, 0x3136 },
+	{ 0xA4A7, 0x3137 }, { 0xA4A8, 0x3138 }, { 0xA4A9, 0x3139 }, { 0xA4AA, 0x313A }, { 0xA4AB, 0x313B }, { 0xA4AC, 0x313C }, { 0xA4AD, 0x313D }, { 0xA4AE, 0x313E },
+	{ 0xA4AF, 0x313F }, { 0xA4B0, 0x3140 }, { 0xA4B1, 0x3141 }, { 0xA4B2, 0x3142 }, { 0xA4B3, 0x3143 }, { 0xA4B4, 0x3144 }, { 0xA4B5, 0x3145 }, { 0xA4B6, 0x3146 },
+	{ 0xA4B7, 0x3147 }, { 0xA4B8, 0x3148 }, { 0xA4B9, 0x3149 }, { 0xA4BA, 0x314A }, { 0xA4BB, 0x314B }, { 0xA4BC, 0x314C }, { 0xA4BD, 0x314D }, { 0xA4BE, 0x314E },
+	{ 0xA4BF, 0x314F }, { 0xA4C0, 0x3150 }, { 0xA4C1, 0x3151 }, { 0xA4C2, 0x3152 }, { 0xA4C3, 0x3153 }, { 0xA4C4, 0x3154 }, { 0xA4C5, 0x3155 }, { 0xA4C6, 0x3156 },
+	{ 0xA4C7, 0x3157 }, { 0xA4C8, 0x3158 }, { 0xA4C9, 0x3159 }, { 0xA4CA, 0x315A }, { 0xA4CB, 0x315B }, { 0xA4CC, 0x315C }, { 0xA4CD, 0x315D }, { 0xA4CE, 0x315E },
+	{ 0xA4CF, 0x315F }, { 0xA4D0, 0x3160 }, { 0xA4D1, 0x3161 }, { 0xA4D2, 0x3162 }, { 0xA4D3, 0x3163 }, { 0xA4D4, 0x3164 }, { 0xA4D5, 0x3165 }, { 0xA4D6, 0x3166 },
+	{ 0xA4D7, 0x3167 }, { 0xA4D8, 0x3168 }, { 0xA4D9, 0x3169 }, { 0xA4DA, 0x316A }, { 0xA4DB, 0x316B }, { 0xA4DC, 0x316C }, { 0xA4DD, 0x316D }, { 0xA4DE, 0x316E },
+	{ 0xA4DF, 0x316F }, { 0xA4E0, 0x3170 }, { 0xA4E1, 0x3171 }, { 0xA4E2, 0x3172 }, { 0xA4E3, 0x3173 }, { 0xA4E4, 0x3174 }, { 0xA4E5, 0x3175 }, { 0xA4E6, 0x3176 },
+	{ 0xA4E7, 0x3177 }, { 0xA4E8, 0x3178 }, { 0xA4E9, 0x3179 }, { 0xA4EA, 0x317A }, { 0xA4EB, 0x317B }, { 0xA4EC, 0x317C }, { 0xA4ED, 0x317D }, { 0xA4EE, 0x317E },
+	{ 0xA4EF, 0x317F }, { 0xA4F0, 0x3180 }, { 0xA4F1, 0x3181 }, { 0xA4F2, 0x3182 }, { 0xA4F3, 0x3183 }, { 0xA4F4, 0x3184 }, { 0xA4F5, 0x3185 }, { 0xA4F6, 0x3186 },
+	{ 0xA4F7, 0x3187 }, { 0xA4F8, 0x3188 }, { 0xA4F9, 0x3189 }, { 0xA4FA, 0x318A }, { 0xA4FB, 0x318B }, { 0xA4FC, 0x318C }, { 0xA4FD, 0x318D }, { 0xA4FE, 0x318E },
+	{ 0xA5A1, 0x2170 }, { 0xA5A2, 0x2171 }, { 0xA5A3, 0x2172 }, { 0xA5A4, 0x2173 }, { 0xA5A5, 0x2174 }, { 0xA5A6, 0x2175 }, { 0xA5A7, 0x2176 }, { 0xA5A8, 0x2177 },
+	{ 0xA5A9, 0x2178 }, { 0xA5AA, 0x2179 }, { 0xA5B0, 0x2160 }, { 0xA5B1, 0x2161 }, { 0xA5B2, 0x2162 }, { 0xA5B3, 0x2163 }, { 0xA5B4, 0x2164 }, { 0xA5B5, 0x2165 },
+	{ 0xA5B6, 0x2166 }, { 0xA5B7, 0x2167 }, { 0xA5B8, 0x2168 }, { 0xA5B9, 0x2169 }, { 0xA5C1, 0x0391 }, { 0xA5C2, 0x0392 }, { 0xA5C3, 0x0393 }, { 0xA5C4, 0x0394 },
+	{ 0xA5C5, 0x0395 }, { 0xA5C6, 0x0396 }, { 0xA5C7, 0x0397 }, { 0xA5C8, 0x0398 }, { 0xA5C9, 0x0399 }, { 0xA5CA, 0x039A }, { 0xA5CB, 0x039B }, { 0xA5CC, 0x039C },
+	{ 0xA5CD, 0x039D }, { 0xA5CE, 0x039E }, { 0xA5CF, 0x039F }, { 0xA5D0, 0x03A0 }, { 0xA5D1, 0x03A1 }, { 0xA5D2, 0x03A3 }, { 0xA5D3, 0x03A4 }, { 0xA5D4, 0x03A5 },
+	{ 0xA5D5, 0x03A6 }, { 0xA5D6, 0x03A7 }, { 0xA5D7, 0x03A8 }, { 0xA5D8, 0x03A9 }, { 0xA5DE, 0x2034 }, { 0xA5E1, 0x03B1 }, { 0xA5E2, 0x03B2 }, { 0xA5E3, 0x03B3 },
+	{ 0xA5E4, 0x03B4 }, { 0xA5E5, 0x03B5 }, { 0xA5E6, 0x03B6 }, { 0xA5E7, 0x03B7 }, { 0xA5E8, 0x03B8 }, { 0xA5E9, 0x03B9 }, { 0xA5EA, 0x03BA }, { 0xA5EB, 0x03BB },
+	{ 0xA5EC, 0x03BC }, { 0xA5ED, 0x03BD }, { 0xA5EE, 0x03BE }, { 0xA5EF, 0x03BF }, { 0xA5F0, 0x03C0 }, { 0xA5F1, 0x03C1 }, { 0xA5F2, 0x03C3 }, { 0xA5F3, 0x03C4 },
+	{ 0xA5F4, 0x03C5 }, { 0xA5F5, 0x03C6 }, { 0xA5F6, 0x03C7 }, { 0xA5F7, 0x03C8 }, { 0xA5F8, 0x03C9 }, { 0xA642, 0xF83D }, { 0xA648, 0x266F }, { 0xA64D, 0x2042 },
+	{ 0xA64E, 0x204E }, { 0xA652, 0x273D }, { 0xA653, 0x2731 }, { 0xA654, 0x2747 }, { 0xA655, 0x2022 }, { 0xA658, 0xF805 }, { 0xA65A, 0x2039 }, { 0xA65B, 0x203A },
+	{ 0xA65C, 0x00AB }, { 0xA65D, 0x00BB }, { 0xA663, 0xF806 }, { 0xA664, 0x29C8 }, { 0xA668, 0x29BE }, { 0xA66C, 0x271A }, { 0xA66D, 0x2716 }, { 0xA66E, 0x29BF },
+	{ 0xA66F, 0x25EF }, { 0xA672, 0x2723 }, { 0xA673, 0x2756 }, { 0xA674, 0xF80A }, { 0xA675, 0x25CC }, { 0xA677, 0x2610 }, { 0xA678, 0x25A2 }, { 0xA67C, 0x273F },
+	{ 0xA681, 0xF809 }, { 0xA683, 0x274D }, { 0xA684, 0x25CD }, { 0xA688, 0x2720 }, { 0xA68D, 0x2741 }, { 0xA68F, 0xF808 }, { 0xA693, 0x262F }, { 0xA696, 0xF80B },
+	{ 0xA699, 0x2740 }, { 0xA69A, 0xF80C }, { 0xA69E, 0x3020 }, { 0xA69F, 0xF807 }, { 0xA6A1, 0x2500 }, { 0xA6A2, 0x2502 }, { 0xA6A3, 0x250C }, { 0xA6A4, 0x2510 },
+	{ 0xA6A5, 0x2518 }, { 0xA6A6, 0x2514 }, { 0xA6A7, 0x251C }, { 0xA6A8, 0x252C }, { 0xA6A9, 0x2524 }, { 0xA6AA, 0x2534 }, { 0xA6AB, 0x253C }, { 0xA6AC, 0x2501 },
+	{ 0xA6AD, 0x2503 }, { 0xA6AE, 0x250F }, { 0xA6AF, 0x2513 }, { 0xA6B0, 0x251B }, { 0xA6B1, 0x2517 }, { 0xA6B2, 0x2523 }, { 0xA6B3, 0x2533 }, { 0xA6B4, 0x252B },
+	{ 0xA6B5, 0x253B }, { 0xA6B6, 0x254B }, { 0xA6B7, 0x2520 }, { 0xA6B8, 0x252F }, { 0xA6B9, 0x2528 }, { 0xA6BA, 0x2537 }, { 0xA6BB, 0x253F }, { 0xA6BC, 0x251D },
+	{ 0xA6BD, 0x2530 }, { 0xA6BE, 0x2525 }, { 0xA6BF, 0x2538 }, { 0xA6C0, 0x2542 }, { 0xA6C1, 0x2512 }, { 0xA6C2, 0x2511 }, { 0xA6C3, 0x251A }, { 0xA6C4, 0x2519 },
+	{ 0xA6C5, 0x2516 }, { 0xA6C6, 0x2515 }, { 0xA6C7, 0x250E }, { 0xA6C8, 0x250D }, { 0xA6C9, 0x251E }, { 0xA6CA, 0x251F }, { 0xA6CB, 0x2521 }, { 0xA6CC, 0x2522 },
+	{ 0xA6CD, 0x2526 }, { 0xA6CE, 0x2527 }, { 0xA6CF, 0x2529 }, { 0xA6D0, 0x252A }, { 0xA6D1, 0x252D }, { 0xA6D2, 0x252E }, { 0xA6D3, 0x2531 }, { 0xA6D4, 0x2532 },
+	{ 0xA6D5, 0x2535 }, { 0xA6D6, 0x2536 }, { 0xA6D7, 0x2539 }, { 0xA6D8, 0x253A }, { 0xA6D9, 0x253D }, { 0xA6DA, 0x253E }, { 0xA6DB, 0x2540 }, { 0xA6DC, 0x2541 },
+	{ 0xA6DD, 0x2543 }, { 0xA6DE, 0x2544 }, { 0xA6DF, 0x2545 }, { 0xA6E0, 0x2546 }, { 0xA6E1, 0x2547 }, { 0xA6E2, 0x2548 }, { 0xA6E3, 0x2549 }, { 0xA6E4, 0x254A },
+	{ 0xA6E5, 0x2776 }, { 0xA6E6, 0x2777 }, { 0xA6E7, 0x2778 }, { 0xA6E8, 0x2779 }, { 0xA6E9, 0x277A }, { 0xA6EA, 0x277B }, { 0xA6EB, 0x277C }, { 0xA6EC, 0x277D },
+	{ 0xA6ED, 0x277E }, { 0xA6EE, 0x277F }, { 0xA6EF, 0x24EB }, { 0xA6F0, 0x24EC }, { 0xA6F1, 0x24ED }, { 0xA6F2, 0x24EE }, { 0xA6F3, 0x24EF }, { 0xA6F4, 0x24F0 },
+	{ 0xA6F5, 0x24F1 }, { 0xA6F6, 0x24F2 }, { 0xA6F7, 0x24F3 }, { 0xA6F8, 0x24F4 }, { 0xA742, 0x3012 }, { 0xA743, 0x3036 }, { 0xA746, 0x25FB }, { 0xA747, 0xF84C },
+	{ 0xA74A, 0x25AD }, { 0xA74B, 0xF84D }, { 0xA74C, 0xF84E }, { 0xA74D, 0xF84F }, { 0xA751, 0x2206 }, { 0xA753, 0x221F }, { 0xA755, 0x2225 }, { 0xA756, 0x2226 },
+	{ 0xA758, 0x2253 }, { 0xA759, 0x2251 }, { 0xA75A, 0x2266 }, { 0xA75B, 0x2267 }, { 0xA75C, 0x2213 }, { 0xA75D, 0x2295 }, { 0xA75E, 0x2296 }, { 0xA75F, 0x2297 },
+	{ 0xA760, 0x2A38 }, { 0xA761, 0x2314 }, { 0xA764, 0x2262 }, { 0xA766, 0x25B1 }, { 0xA768, 0x2222 }, { 0xA769, 0x2250 }, { 0xA76A, 0x03D5 }, { 0xA76B, 0x2AE8 },
+	{ 0xA76C, 0x22A3 }, { 0xA76F, 0x226E }, { 0xA770, 0x226F }, { 0xA771, 0x2285 }, { 0xA772, 0x2284 }, { 0xA773, 0x2209 }, { 0xA774, 0x220C }, { 0xA775, 0x22BB },
+	{ 0xA776, 0x22BC }, { 0xA777, 0x225A }, { 0xA778, 0x2306 }, { 0xA77B, 0x2A72 }, { 0xA782, 0x329E }, { 0xA784, 0x203C }, { 0xA785, 0x2049 }, { 0xA787, 0x2047 },
+	{ 0xA78F, 0x2588 }, { 0xA790, 0x25E6 }, { 0xA794, 0x25BF }, { 0xA795, 0x25B5 }, { 0xA796, 0x25B9 }, { 0xA797, 0x25C3 }, { 0xA798, 0x2666 }, { 0xA799, 0x2981 },
+	{ 0xA79A, 0x25FC }, { 0xA79C, 0x25CA }, { 0xA79D, 0x3231 }, { 0xA79E, 0x3239 }, { 0xA79F, 0x33CB }, { 0xA7A1, 0x3395 }, { 0xA7A2, 0x3396 }, { 0xA7A3, 0x3397 },
+	{ 0xA7A4, 0x2113 }, { 0xA7A5, 0x3398 }, { 0xA7A6, 0x33C4 }, { 0xA7A7, 0x33A3 }, { 0xA7A8, 0x33A4 }, { 0xA7A9, 0x33A5 }, { 0xA7AA, 0x33A6 }, { 0xA7AB, 0x3399 },
+	{ 0xA7AC, 0x339A }, { 0xA7AD, 0x339B }, { 0xA7AE, 0x339C }, { 0xA7AF, 0x339D }, { 0xA7B0, 0x339E }, { 0xA7B1, 0x339F }, { 0xA7B2, 0x33A0 }, { 0xA7B3, 0x33A1 },
+	{ 0xA7B4, 0x33A2 }, { 0xA7B5, 0x33CA }, { 0xA7B6, 0x338D }, { 0xA7B7, 0x338E }, { 0xA7B8, 0x338F }, { 0xA7B9, 0x33CF }, { 0xA7BA, 0x3388 }, { 0xA7BB, 0x3389 },
+	{ 0xA7BC, 0x33C8 }, { 0xA7BD, 0x33A7 }, { 0xA7BE, 0x33A8 }, { 0xA7BF, 0x33B0 }, { 0xA7C0, 0x33B1 }, { 0xA7C1, 0x33B2 }, { 0xA7C2, 0x33B3 }, { 0xA7C3, 0x33B4 },
+	{ 0xA7C4, 0x33B5 }, { 0xA7C5, 0x33B6 }, { 0xA7C6, 0x33B7 }, { 0xA7C7, 0x33B8 }, { 0xA7C8, 0x33B9 }, { 0xA7C9, 0x3380 }, { 0xA7CA, 0x3381 }, { 0xA7CB, 0x3382 },
+	{ 0xA7CC, 0x3383 }, { 0xA7CD, 0x3384 }, { 0xA7CE, 0x33BA }, { 0xA7CF, 0x33BB }, { 0xA7D0, 0x33BC }, { 0xA7D1, 0x33BD }, { 0xA7D2, 0x33BE }, { 0xA7D3, 0x33BF },
+	{ 0xA7D4, 0x3390 }, { 0xA7D5, 0x3391 }, { 0xA7D6, 0x3392 }, { 0xA7D7, 0x3393 }, { 0xA7D8, 0x3394 }, { 0xA7D9, 0x2126 }, { 0xA7DA, 0x33C0 }, { 0xA7DB, 0x33C1 },
+	{ 0xA7DC, 0x338A }, { 0xA7DD, 0x338B }, { 0xA7DE, 0x338C }, { 0xA7DF, 0x33D6 }, { 0xA7E0, 0x33C5 }, { 0xA7E1, 0x33AD }, { 0xA7E2, 0x33AE }, { 0xA7E3, 0x33AF },
+	{ 0xA7E4, 0x33DB }, { 0xA7E5, 0x33A9 }, { 0xA7E6, 0x33AA }, { 0xA7E7, 0x33AB }, { 0xA7E8, 0x33AC }, { 0xA7E9, 0x33DD }, { 0xA7EA, 0x33D0 }, { 0xA7EB, 0x33D3 },
+	{ 0xA7EC, 0x33C3 }, { 0xA7ED, 0x33C9 }, { 0xA7EE, 0x33DC }, { 0xA7EF, 0x33C6 }, { 0xA7F0, 0x246F }, { 0xA7F1, 0x2470 }, { 0xA7F2, 0x2471 }, { 0xA7F3, 0x2472 },
+	{ 0xA7F4, 0x2473 }, { 0xA7F5, 0x3251 }, { 0xA7F6, 0x3252 }, { 0xA7F7, 0x3253 }, { 0xA7F8, 0x3254 }, { 0xA7F9, 0x3255 }, { 0xA7FA, 0x3256 }, { 0xA7FB, 0x3257 },
+	{ 0xA7FC, 0x3258 }, { 0xA7FD, 0x3259 }, { 0xA7FE, 0x325A }, { 0xA849, 0x21D0 }, { 0xA84A, 0x21CF }, { 0xA84B, 0x21CD }, { 0xA85C, 0x27B2 }, { 0xA860, 0x279C },
+	{ 0xA867, 0xF846 }, { 0xA868, 0xF847 }, { 0xA86A, 0x279B }, { 0xA86F, 0x2962 }, { 0xA870, 0x2964 }, { 0xA871, 0x2963 }, { 0xA872, 0x2965 }, { 0xA874, 0x27A1 },
+	{ 0xA878, 0x279E }, { 0xA87B, 0x21B2 }, { 0xA87C, 0x21B1 }, { 0xA881, 0x21B4 }, { 0xA882, 0x21B0 }, { 0xA883, 0x21B3 }, { 0xA886, 0x2936 }, { 0xA889, 0x2935 },
+	{ 0xA88B, 0x2937 }, { 0xA88C, 0x2939 }, { 0xA88D, 0x2934 }, { 0xA892, 0x21BC }, { 0xA893, 0x21C0 }, { 0xA894, 0xF841 }, { 0xA89C, 0xF849 }, { 0xA89D, 0xF848 },
+	{ 0xA89E, 0x21C4 }, { 0xA89F, 0x21C5 }, { 0xA8A1, 0x00C6 }, { 0xA8A2, 0x00D0 }, { 0xA8A3, 0x00AA }, { 0xA8A4, 0x0126 }, { 0xA8A6, 0x0132 }, { 0xA8A8, 0x013F },
+	{ 0xA8A9, 0x0141 }, { 0xA8AA, 0x00D8 }, { 0xA8AB, 0x0152 }, { 0xA8AC, 0x00BA }, { 0xA8AD, 0x00DE }, { 0xA8AE, 0x0166 }, { 0xA8AF, 0x014A }, { 0xA8B1, 0x3260 },
+	{ 0xA8B2, 0x3261 }, { 0xA8B3, 0x3262 }, { 0xA8B4, 0x3263 }, { 0xA8B5, 0x3264 }, { 0xA8B6, 0x3265 }, { 0xA8B7, 0x3266 }, { 0xA8B8, 0x3267 }, { 0xA8B9, 0x3268 },
+	{ 0xA8BA, 0x3269 }, { 0xA8BB, 0x326A }, { 0xA8BC, 0x326B }, { 0xA8BD, 0x326C }, { 0xA8BE, 0x326D }, { 0xA8BF, 0x326E }, { 0xA8C0, 0x326F }, { 0xA8C1, 0x3270 },
+	{ 0xA8C2, 0x3271 }, { 0xA8C3, 0x3272 }, { 0xA8C4, 0x3273 }, { 0xA8C5, 0x3274 }, { 0xA8C6, 0x3275 }, { 0xA8C7, 0x3276 }, { 0xA8C8, 0x3277 }, { 0xA8C9, 0x3278 },
+	{ 0xA8CA, 0x3279 }, { 0xA8CB, 0x327A }, { 0xA8CC, 0x327B }, { 0xA8CD, 0x24D0 }, { 0xA8CE, 0x24D1 }, { 0xA8CF, 0x24D2 }, { 0xA8D0, 0x24D3 }, { 0xA8D1, 0x24D4 },
+	{ 0xA8D2, 0x24D5 }, { 0xA8D3, 0x24D6 }, { 0xA8D4, 0x24D7 }, { 0xA8D5, 0x24D8 }, { 0xA8D6, 0x24D9 }, { 0xA8D7, 0x24DA }, { 0xA8D8, 0x24DB }, { 0xA8D9, 0x24DC },
+	{ 0xA8DA, 0x24DD }, { 0xA8DB, 0x24DE }, { 0xA8DC, 0x24DF }, { 0xA8DD, 0x24E0 }, { 0xA8DE, 0x24E1 }, { 0xA8DF, 0x24E2 }, { 0xA8E0, 0x24E3 }, { 0xA8E1, 0x24E4 },
+	{ 0xA8E2, 0x24E5 }, { 0xA8E3, 0x24E6 }, { 0xA8E4, 0x24E7 }, { 0xA8E5, 0x24E8 }, { 0xA8E6, 0x24E9 }, { 0xA8E7, 0x2460 }, { 0xA8E8, 0x2461 }, { 0xA8E9, 0x2462 },
+	{ 0xA8EA, 0x2463 }, { 0xA8EB, 0x2464 }, { 0xA8EC, 0x2465 }, { 0xA8ED, 0x2466 }, { 0xA8EE, 0x2467 }, { 0xA8EF, 0x2468 }, { 0xA8F0, 0x2469 }, { 0xA8F1, 0x246A },
+	{ 0xA8F2, 0x246B }, { 0xA8F3, 0x246C }, { 0xA8F4, 0x246D }, { 0xA8F5, 0x246E }, { 0xA8F6, 0x00BD }, { 0xA8F7, 0x2153 }, { 0xA8F8, 0x2154 }, { 0xA8F9, 0x00BC },
+	{ 0xA8FA, 0x00BE }, { 0xA8FB, 0x215B }, { 0xA8FC, 0x215C }, { 0xA8FD, 0x215D }, { 0xA8FE, 0x215E }, { 0xA9A1, 0x00E6 }, { 0xA9A2, 0x0111 }, { 0xA9A3, 0x00F0 },
+	{ 0xA9A4, 0x0127 }, { 0xA9A5, 0x0131 }, { 0xA9A6, 0x0133 }, { 0xA9A7, 0x0138 }, { 0xA9A8, 0x0140 }, { 0xA9A9, 0x0142 }, { 0xA9AA, 0x00F8 }, { 0xA9AB, 0x0153 },
+	{ 0xA9AC, 0x00DF }, { 0xA9AD, 0x00FE }, { 0xA9AE, 0x0167 }, { 0xA9AF, 0x014B }, { 0xA9B0, 0x0149 }, { 0xA9B1, 0x3200 }, { 0xA9B2, 0x3201 }, { 0xA9B3, 0x3202 },
+	{ 0xA9B4, 0x3203 }, { 0xA9B5, 0x3204 }, { 0xA9B6, 0x3205 }, { 0xA9B7, 0x3206 }, { 0xA9B8, 0x3207 }, { 0xA9B9, 0x3208 }, { 0xA9BA, 0x3209 }, { 0xA9BB, 0x320A },
+	{ 0xA9BC, 0x320B }, { 0xA9BD, 0x320C }, { 0xA9BE, 0x320D }, { 0xA9BF, 0x320E }, { 0xA9C0, 0x320F }, { 0xA9C1, 0x3210 }, { 0xA9C2, 0x3211 }, { 0xA9C3, 0x3212 },
+	{ 0xA9C4, 0x3213 }, { 0xA9C5, 0x3214 }, { 0xA9C6, 0x3215 }, { 0xA9C7, 0x3216 }, { 0xA9C8, 0x3217 }, { 0xA9C9, 0x3218 }, { 0xA9CA, 0x3219 }, { 0xA9CB, 0x321A },
+	{ 0xA9CC, 0x321B }, { 0xA9CD, 0x249C }, { 0xA9CE, 0x249D }, { 0xA9CF, 0x249E }, { 0xA9D0, 0x249F }, { 0xA9D1, 0x24A0 }, { 0xA9D2, 0x24A1 }, { 0xA9D3, 0x24A2 },
+	{ 0xA9D4, 0x24A3 }, { 0xA9D5, 0x24A4 }, { 0xA9D6, 0x24A5 }, { 0xA9D7, 0x24A6 }, { 0xA9D8, 0x24A7 }, { 0xA9D9, 0x24A8 }, { 0xA9DA, 0x24A9 }, { 0xA9DB, 0x24AA },
+	{ 0xA9DC, 0x24AB }, { 0xA9DD, 0x24AC }, { 0xA9DE, 0x24AD }, { 0xA9DF, 0x24AE }, { 0xA9E0, 0x24AF }, { 0xA9E1, 0x24B0 }, { 0xA9E2, 0x24B1 }, { 0xA9E3, 0x24B2 },
+	{ 0xA9E4, 0x24B3 }, { 0xA9E5, 0x24B4 }, { 0xA9E6, 0x24B5 }, { 0xA9E7, 0x2474 }, { 0xA9E8, 0x2475 }, { 0xA9E9, 0x2476 }, { 0xA9EA, 0x2477 }, { 0xA9EB, 0x2478 },
+	{ 0xA9EC, 0x2479 }, { 0xA9ED, 0x247A }, { 0xA9EE, 0x247B }, { 0xA9EF, 0x247C }, { 0xA9F0, 0x247D }, { 0xA9F1, 0x247E }, { 0xA9F2, 0x247F }, { 0xA9F3, 0x2480 },
+	{ 0xA9F4, 0x2481 }, { 0xA9F5, 0x2482 }, { 0xA9F6, 0x00B9 }, { 0xA9F7, 0x00B2 }, { 0xA9F8, 0x00B3 }, { 0xA9F9, 0x2074 }, { 0xA9FA, 0x207F }, { 0xA9FB, 0x2081 },
+	{ 0xA9FC, 0x2082 }, { 0xA9FD, 0x2083 }, { 0xA9FE, 0x2084 }, { 0xAAA1, 0x3041 }, { 0xAAA2, 0x3042 }, { 0xAAA3, 0x3043 }, { 0xAAA4, 0x3044 }, { 0xAAA5, 0x3045 },
+	{ 0xAAA6, 0x3046 }, { 0xAAA7, 0x3047 }, { 0xAAA8, 0x3048 }, { 0xAAA9, 0x3049 }, { 0xAAAA, 0x304A }, { 0xAAAB, 0x304B }, { 0xAAAC, 0x304C }, { 0xAAAD, 0x304D },
+	{ 0xAAAE, 0x304E }, { 0xAAAF, 0x304F }, { 0xAAB0, 0x3050 }, { 0xAAB1, 0x3051 }, { 0xAAB2, 0x3052 }, { 0xAAB3, 0x3053 }, { 0xAAB4, 0x3054 }, { 0xAAB5, 0x3055 },
+	{ 0xAAB6, 0x3056 }, { 0xAAB7, 0x3057 }, { 0xAAB8, 0x3058 }, { 0xAAB9, 0x3059 }, { 0xAABA, 0x305A }, { 0xAABB, 0x305B }, { 0xAABC, 0x305C }, { 0xAABD, 0x305D },
+	{ 0xAABE, 0x305E }, { 0xAABF, 0x305F }, { 0xAAC0, 0x3060 }, { 0xAAC1, 0x3061 }, { 0xAAC2, 0x3062 }, { 0xAAC3, 0x3063 }, { 0xAAC4, 0x3064 }, { 0xAAC5, 0x3065 },
+	{ 0xAAC6, 0x3066 }, { 0xAAC7, 0x3067 }, { 0xAAC8, 0x3068 }, { 0xAAC9, 0x3069 }, { 0xAACA, 0x306A }, { 0xAACB, 0x306B }, { 0xAACC, 0x306C }, { 0xAACD, 0x306D },
+	{ 0xAACE, 0x306E }, { 0xAACF, 0x306F }, { 0xAAD0, 0x3070 }, { 0xAAD1, 0x3071 }, { 0xAAD2, 0x3072 }, { 0xAAD3, 0x3073 }, { 0xAAD4, 0x3074 }, { 0xAAD5, 0x3075 },
+	{ 0xAAD6, 0x3076 }, { 0xAAD7, 0x3077 }, { 0xAAD8, 0x3078 }, { 0xAAD9, 0x3079 }, { 0xAADA, 0x307A }, { 0xAADB, 0x307B }, { 0xAADC, 0x307C }, { 0xAADD, 0x307D },
+	{ 0xAADE, 0x307E }, { 0xAADF, 0x307F }, { 0xAAE0, 0x3080 }, { 0xAAE1, 0x3081 }, { 0xAAE2, 0x3082 }, { 0xAAE3, 0x3083 }, { 0xAAE4, 0x3084 }, { 0xAAE5, 0x3085 },
+	{ 0xAAE6, 0x3086 }, { 0xAAE7, 0x3087 }, { 0xAAE8, 0x3088 }, { 0xAAE9, 0x3089 }, { 0xAAEA, 0x308A }, { 0xAAEB, 0x308B }, { 0xAAEC, 0x308C }, { 0xAAED, 0x308D },
+	{ 0xAAEE, 0x308E }, { 0xAAEF, 0x308F }, { 0xAAF0, 0x3090 }, { 0xAAF1, 0x3091 }, { 0xAAF2, 0x3092 }, { 0xAAF3, 0x3093 }, { 0xAAF4, 0x2483 }, { 0xAAF5, 0x2484 },
+	{ 0xAAF6, 0x2485 }, { 0xAAF7, 0x2486 }, { 0xAAF8, 0x2487 }, { 0xAB5C, 0x3294 }, { 0xAB6C, 0x32A5 }, { 0xABA1, 0x30A1 }, { 0xABA2, 0x30A2 }, { 0xABA3, 0x30A3 },
+	{ 0xABA4, 0x30A4 }, { 0xABA5, 0x30A5 }, { 0xABA6, 0x30A6 }, { 0xABA7, 0x30A7 }, { 0xABA8, 0x30A8 }, { 0xABA9, 0x30A9 }, { 0xABAA, 0x30AA }, { 0xABAB, 0x30AB },
+	{ 0xABAC, 0x30AC }, { 0xABAD, 0x30AD }, { 0xABAE, 0x30AE }, { 0xABAF, 0x30AF }, { 0xABB0, 0x30B0 }, { 0xABB1, 0x30B1 }, { 0xABB2, 0x30B2 }, { 0xABB3, 0x30B3 },
+	{ 0xABB4, 0x30B4 }, { 0xABB5, 0x30B5 }, { 0xABB6, 0x30B6 }, { 0xABB7, 0x30B7 }, { 0xABB8, 0x30B8 }, { 0xABB9, 0x30B9 }, { 0xABBA, 0x30BA }, { 0xABBB, 0x30BB },
+	{ 0xABBC, 0x30BC }, { 0xABBD, 0x30BD }, { 0xABBE, 0x30BE }, { 0xABBF, 0x30BF }, { 0xABC0, 0x30C0 }, { 0xABC1, 0x30C1 }, { 0xABC2, 0x30C2 }, { 0xABC3, 0x30C3 },
+	{ 0xABC4, 0x30C4 }, { 0xABC5, 0x30C5 }, { 0xABC6, 0x30C6 }, { 0xABC7, 0x30C7 }, { 0xABC8, 0x30C8 }, { 0xABC9, 0x30C9 }, { 0xABCA, 0x30CA }, { 0xABCB, 0x30CB },
+	{ 0xABCC, 0x30CC }, { 0xABCD, 0x30CD }, { 0xABCE, 0x30CE }, { 0xABCF, 0x30CF }, { 0xABD0, 0x30D0 }, { 0xABD1, 0x30D1 }, { 0xABD2, 0x30D2 }, { 0xABD3, 0x30D3 },
+	{ 0xABD4, 0x30D4 }, { 0xABD5, 0x30D5 }, { 0xABD6, 0x30D6 }, { 0xABD7, 0x30D7 }, { 0xABD8, 0x30D8 }, { 0xABD9, 0x30D9 }, { 0xABDA, 0x30DA }, { 0xABDB, 0x30DB },
+	{ 0xABDC, 0x30DC }, { 0xABDD, 0x30DD }, { 0xABDE, 0x30DE }, { 0xABDF, 0x30DF }, { 0xABE0, 0x30E0 }, { 0xABE1, 0x30E1 }, { 0xABE2, 0x30E2 }, { 0xABE3, 0x30E3 },
+	{ 0xABE4, 0x30E4 }, { 0xABE5, 0x30E5 }, { 0xABE6, 0x30E6 }, { 0xABE7, 0x30E7 }, { 0xABE8, 0x30E8 }, { 0xABE9, 0x30E9 }, { 0xABEA, 0x30EA }, { 0xABEB, 0x30EB },
+	{ 0xABEC, 0x30EC }, { 0xABED, 0x30ED }, { 0xABEE, 0x30EE }, { 0xABEF, 0x30EF }, { 0xABF0, 0x30F0 }, { 0xABF1, 0x30F1 }, { 0xABF2, 0x30F2 }, { 0xABF3, 0x30F3 },
+	{ 0xABF4, 0x30F4 }, { 0xABF5, 0x30F5 }, { 0xABF6, 0x30F6 }, { 0xAC41, 0x21F0 }, { 0xAC42, 0xF843 }, { 0xAC43, 0x27B5 }, { 0xAC48, 0x27A4 }, { 0xAC49, 0xF844 },
+	{ 0xAC4A, 0xF84B }, { 0xAC4B, 0xF84A }, { 0xAC50, 0x21B6 }, { 0xAC51, 0x21B7 }, { 0xAC52, 0x219D }, { 0xAC53, 0x219C }, { 0xAC54, 0xF842 }, { 0xAC5E, 0x2794 },
+	{ 0xAC5F, 0xF845 }, { 0xAC6A, 0x21E0 }, { 0xAC6B, 0x21E2 }, { 0xAC6C, 0x21E1 }, { 0xAC6D, 0x21E3 }, { 0xAC72, 0x21E6 }, { 0xAC73, 0x21E8 }, { 0xAC74, 0x21E7 },
+	{ 0xAC75, 0x21E9 }, { 0xAC8D, 0x261D }, { 0xAC8E, 0x261F }, { 0xACA1, 0x0410 }, { 0xACA2, 0x0411 }, { 0xACA3, 0x0412 }, { 0xACA4, 0x0413 }, { 0xACA5, 0x0414 },
+	{ 0xACA6, 0x0415 }, { 0xACA7, 0x0401 }, { 0xACA8, 0x0416 }, { 0xACA9, 0x0417 }, { 0xACAA, 0x0418 }, { 0xACAB, 0x0419 }, { 0xACAC, 0x041A }, { 0xACAD, 0x041B },
+	{ 0xACAE, 0x041C }, { 0xACAF, 0x041D }, { 0xACB0, 0x041E }, { 0xACB1, 0x041F }, { 0xACB2, 0x0420 }, { 0xACB3, 0x0421 }, { 0xACB4, 0x0422 }, { 0xACB5, 0x0423 },
+	{ 0xACB6, 0x0424 }, { 0xACB7, 0x0425 }, { 0xACB8, 0x0426 }, { 0xACB9, 0x0427 }, { 0xACBA, 0x0428 }, { 0xACBB, 0x0429 }, { 0xACBC, 0x042A }, { 0xACBD, 0x042B },
+	{ 0xACBE, 0x042C }, { 0xACBF, 0x042D }, { 0xACC0, 0x042E }, { 0xACC1, 0x042F }, { 0xACD1, 0x0430 }, { 0xACD2, 0x0431 }, { 0xACD3, 0x0432 }, { 0xACD4, 0x0433 },
+	{ 0xACD5, 0x0434 }, { 0xACD6, 0x0435 }, { 0xACD7, 0x0451 }, { 0xACD8, 0x0436 }, { 0xACD9, 0x0437 }, { 0xACDA, 0x0438 }, { 0xACDB, 0x0439 }, { 0xACDC, 0x043A },
+	{ 0xACDD, 0x043B }, { 0xACDE, 0x043C }, { 0xACDF, 0x043D }, { 0xACE0, 0x043E }, { 0xACE1, 0x043F }, { 0xACE2, 0x0440 }, { 0xACE3, 0x0441 }, { 0xACE4, 0x0442 },
+	{ 0xACE5, 0x0443 }, { 0xACE6, 0x0444 }, { 0xACE7, 0x0445 }, { 0xACE8, 0x0446 }, { 0xACE9, 0x0447 }, { 0xACEA, 0x0448 }, { 0xACEB, 0x0449 }, { 0xACEC, 0x044A },
+	{ 0xACED, 0x044B }, { 0xACEE, 0x044C }, { 0xACEF, 0x044D }, { 0xACF0, 0x044E }, { 0xACF1, 0x044F }, { 0xAD70, 0x3290 }, { 0xAD71, 0x328A }, { 0xAD72, 0x328B },
+	{ 0xAD73, 0x328C }, { 0xAD74, 0x328D }, { 0xAD75, 0x328E }, { 0xAD76, 0x328F }, { 0xADA9, 0x301E }, { 0xADAA, 0x301F }, { 0xADAB, 0x2036 }, { 0xADAD, 0x2035 },
+	{ 0xB0A1, 0xAC00 }, { 0xB0A2, 0xAC01 }, { 0xB0A3, 0xAC04 }, { 0xB0A4, 0xAC07 }, { 0xB0A5, 0xAC08 }, { 0xB0A6, 0xAC09 }, { 0xB0A7, 0xAC0A }, { 0xB0A8, 0xAC10 },
+	{ 0xB0A9, 0xAC11 }, { 0xB0AA, 0xAC12 }, { 0xB0AB, 0xAC13 }, { 0xB0AC, 0xAC14 }, { 0xB0AD, 0xAC15 }, { 0xB0AE, 0xAC16 }, { 0xB0AF, 0xAC17 }, { 0xB0B0, 0xAC19 },
+	{ 0xB0B1, 0xAC1A }, { 0xB0B2, 0xAC1B }, { 0xB0B3, 0xAC1C }, { 0xB0B4, 0xAC1D }, { 0xB0B5, 0xAC20 }, { 0xB0B6, 0xAC24 }, { 0xB0B7, 0xAC2C }, { 0xB0B8, 0xAC2D },
+	{ 0xB0B9, 0xAC2F }, { 0xB0BA, 0xAC30 }, { 0xB0BB, 0xAC31 }, { 0xB0BC, 0xAC38 }, { 0xB0BD, 0xAC39 }, { 0xB0BE, 0xAC3C }, { 0xB0BF, 0xAC40 }, { 0xB0C0, 0xAC4B },
+	{ 0xB0C1, 0xAC4D }, { 0xB0C2, 0xAC54 }, { 0xB0C3, 0xAC58 }, { 0xB0C4, 0xAC5C }, { 0xB0C5, 0xAC70 }, { 0xB0C6, 0xAC71 }, { 0xB0C7, 0xAC74 }, { 0xB0C8, 0xAC77 },
+	{ 0xB0C9, 0xAC78 }, { 0xB0CA, 0xAC7A }, { 0xB0CB, 0xAC80 }, { 0xB0CC, 0xAC81 }, { 0xB0CD, 0xAC83 }, { 0xB0CE, 0xAC84 }, { 0xB0CF, 0xAC85 }, { 0xB0D0, 0xAC86 },
+	{ 0xB0D1, 0xAC89 }, { 0xB0D2, 0xAC8A }, { 0xB0D3, 0xAC8B }, { 0xB0D4, 0xAC8C }, { 0xB0D5, 0xAC90 }, { 0xB0D6, 0xAC94 }, { 0xB0D7, 0xAC9C }, { 0xB0D8, 0xAC9D },
+	{ 0xB0D9, 0xAC9F }, { 0xB0DA, 0xACA0 }, { 0xB0DB, 0xACA1 }, { 0xB0DC, 0xACA8 }, { 0xB0DD, 0xACA9 }, { 0xB0DE, 0xACAA }, { 0xB0DF, 0xACAC }, { 0xB0E0, 0xACAF },
+	{ 0xB0E1, 0xACB0 }, { 0xB0E2, 0xACB8 }, { 0xB0E3, 0xACB9 }, { 0xB0E4, 0xACBB }, { 0xB0E5, 0xACBC }, { 0xB0E6, 0xACBD }, { 0xB0E7, 0xACC1 }, { 0xB0E8, 0xACC4 },
+	{ 0xB0E9, 0xACC8 }, { 0xB0EA, 0xACCC }, { 0xB0EB, 0xACD5 }, { 0xB0EC, 0xACD7 }, { 0xB0ED, 0xACE0 }, { 0xB0EE, 0xACE1 }, { 0xB0EF, 0xACE4 }, { 0xB0F0, 0xACE7 },
+	{ 0xB0F1, 0xACE8 }, { 0xB0F2, 0xACEA }, { 0xB0F3, 0xACEC }, { 0xB0F4, 0xACEF }, { 0xB0F5, 0xACF0 }, { 0xB0F6, 0xACF1 }, { 0xB0F7, 0xACF3 }, { 0xB0F8, 0xACF5 },
+	{ 0xB0F9, 0xACF6 }, { 0xB0FA, 0xACFC }, { 0xB0FB, 0xACFD }, { 0xB0FC, 0xAD00 }, { 0xB0FD, 0xAD04 }, { 0xB0FE, 0xAD06 }, { 0xB1A1, 0xAD0C }, { 0xB1A2, 0xAD0D },
+	{ 0xB1A3, 0xAD0F }, { 0xB1A4, 0xAD11 }, { 0xB1A5, 0xAD18 }, { 0xB1A6, 0xAD1C }, { 0xB1A7, 0xAD20 }, { 0xB1A8, 0xAD29 }, { 0xB1A9, 0xAD2C }, { 0xB1AA, 0xAD2D },
+	{ 0xB1AB, 0xAD34 }, { 0xB1AC, 0xAD35 }, { 0xB1AD, 0xAD38 }, { 0xB1AE, 0xAD3C }, { 0xB1AF, 0xAD44 }, { 0xB1B0, 0xAD45 }, { 0xB1B1, 0xAD47 }, { 0xB1B2, 0xAD49 },
+	{ 0xB1B3, 0xAD50 }, { 0xB1B4, 0xAD54 }, { 0xB1B5, 0xAD58 }, { 0xB1B6, 0xAD61 }, { 0xB1B7, 0xAD63 }, { 0xB1B8, 0xAD6C }, { 0xB1B9, 0xAD6D }, { 0xB1BA, 0xAD70 },
+	{ 0xB1BB, 0xAD73 }, { 0xB1BC, 0xAD74 }, { 0xB1BD, 0xAD75 }, { 0xB1BE, 0xAD76 }, { 0xB1BF, 0xAD7B }, { 0xB1C0, 0xAD7C }, { 0xB1C1, 0xAD7D }, { 0xB1C2, 0xAD7F },
+	{ 0xB1C3, 0xAD81 }, { 0xB1C4, 0xAD82 }, { 0xB1C5, 0xAD88 }, { 0xB1C6, 0xAD89 }, { 0xB1C7, 0xAD8C }, { 0xB1C8, 0xAD90 }, { 0xB1C9, 0xAD9C }, { 0xB1CA, 0xAD9D },
+	{ 0xB1CB, 0xADA4 }, { 0xB1CC, 0xADB7 }, { 0xB1CD, 0xADC0 }, { 0xB1CE, 0xADC1 }, { 0xB1CF, 0xADC4 }, { 0xB1D0, 0xADC8 }, { 0xB1D1, 0xADD0 }, { 0xB1D2, 0xADD1 },
+	{ 0xB1D3, 0xADD3 }, { 0xB1D4, 0xADDC }, { 0xB1D5, 0xADE0 }, { 0xB1D6, 0xADE4 }, { 0xB1D7, 0xADF8 }, { 0xB1D8, 0xADF9 }, { 0xB1D9, 0xADFC }, { 0xB1DA, 0xADFF },
+	{ 0xB1DB, 0xAE00 }, { 0xB1DC, 0xAE01 }, { 0xB1DD, 0xAE08 }, { 0xB1DE, 0xAE09 }, { 0xB1DF, 0xAE0B }, { 0xB1E0, 0xAE0D }, { 0xB1E1, 0xAE14 }, { 0xB1E2, 0xAE30 },
+	{ 0xB1E3, 0xAE31 }, { 0xB1E4, 0xAE34 }, { 0xB1E5, 0xAE37 }, { 0xB1E6, 0xAE38 }, { 0xB1E7, 0xAE3A }, { 0xB1E8, 0xAE40 }, { 0xB1E9, 0xAE41 }, { 0xB1EA, 0xAE43 },
+	{ 0xB1EB, 0xAE45 }, { 0xB1EC, 0xAE46 }, { 0xB1ED, 0xAE4A }, { 0xB1EE, 0xAE4C }, { 0xB1EF, 0xAE4D }, { 0xB1F0, 0xAE4E }, { 0xB1F1, 0xAE50 }, { 0xB1F2, 0xAE54 },
+	{ 0xB1F3, 0xAE56 }, { 0xB1F4, 0xAE5C }, { 0xB1F5, 0xAE5D }, { 0xB1F6, 0xAE5F }, { 0xB1F7, 0xAE60 }, { 0xB1F8, 0xAE61 }, { 0xB1F9, 0xAE65 }, { 0xB1FA, 0xAE68 },
+	{ 0xB1FB, 0xAE69 }, { 0xB1FC, 0xAE6C }, { 0xB1FD, 0xAE70 }, { 0xB1FE, 0xAE78 }, { 0xB2A1, 0xAE79 }, { 0xB2A2, 0xAE7B }, { 0xB2A3, 0xAE7C }, { 0xB2A4, 0xAE7D },
+	{ 0xB2A5, 0xAE84 }, { 0xB2A6, 0xAE85 }, { 0xB2A7, 0xAE8C }, { 0xB2A8, 0xAEBC }, { 0xB2A9, 0xAEBD }, { 0xB2AA, 0xAEBE }, { 0xB2AB, 0xAEC0 }, { 0xB2AC, 0xAEC4 },
+	{ 0xB2AD, 0xAECC }, { 0xB2AE, 0xAECD }, { 0xB2AF, 0xAECF }, { 0xB2B0, 0xAED0 }, { 0xB2B1, 0xAED1 }, { 0xB2B2, 0xAED8 }, { 0xB2B3, 0xAED9 }, { 0xB2B4, 0xAEDC },
+	{ 0xB2B5, 0xAEE8 }, { 0xB2B6, 0xAEEB }, { 0xB2B7, 0xAEED }, { 0xB2B8, 0xAEF4 }, { 0xB2B9, 0xAEF8 }, { 0xB2BA, 0xAEFC }, { 0xB2BB, 0xAF07 }, { 0xB2BC, 0xAF08 },
+	{ 0xB2BD, 0xAF0D }, { 0xB2BE, 0xAF10 }, { 0xB2BF, 0xAF2C }, { 0xB2C0, 0xAF2D }, { 0xB2C1, 0xAF30 }, { 0xB2C2, 0xAF32 }, { 0xB2C3, 0xAF34 }, { 0xB2C4, 0xAF3C },
+	{ 0xB2C5, 0xAF3D }, { 0xB2C6, 0xAF3F }, { 0xB2C7, 0xAF41 }, { 0xB2C8, 0xAF42 }, { 0xB2C9, 0xAF43 }, { 0xB2CA, 0xAF48 }, { 0xB2CB, 0xAF49 }, { 0xB2CC, 0xAF50 },
+	{ 0xB2CD, 0xAF5C }, { 0xB2CE, 0xAF5D }, { 0xB2CF, 0xAF64 }, { 0xB2D0, 0xAF65 }, { 0xB2D1, 0xAF79 }, { 0xB2D2, 0xAF80 }, { 0xB2D3, 0xAF84 }, { 0xB2D4, 0xAF88 },
+	{ 0xB2D5, 0xAF90 }, { 0xB2D6, 0xAF91 }, { 0xB2D7, 0xAF95 }, { 0xB2D8, 0xAF9C }, { 0xB2D9, 0xAFB8 }, { 0xB2DA, 0xAFB9 }, { 0xB2DB, 0xAFBC }, { 0xB2DC, 0xAFC0 },
+	{ 0xB2DD, 0xAFC7 }, { 0xB2DE, 0xAFC8 }, { 0xB2DF, 0xAFC9 }, { 0xB2E0, 0xAFCB }, { 0xB2E1, 0xAFCD }, { 0xB2E2, 0xAFCE }, { 0xB2E3, 0xAFD4 }, { 0xB2E4, 0xAFDC },
+	{ 0xB2E5, 0xAFE8 }, { 0xB2E6, 0xAFE9 }, { 0xB2E7, 0xAFF0 }, { 0xB2E8, 0xAFF1 }, { 0xB2E9, 0xAFF4 }, { 0xB2EA, 0xAFF8 }, { 0xB2EB, 0xB000 }, { 0xB2EC, 0xB001 },
+	{ 0xB2ED, 0xB004 }, { 0xB2EE, 0xB00C }, { 0xB2EF, 0xB010 }, { 0xB2F0, 0xB014 }, { 0xB2F1, 0xB01C }, { 0xB2F2, 0xB01D }, { 0xB2F3, 0xB028 }, { 0xB2F4, 0xB044 },
+	{ 0xB2F5, 0xB045 }, { 0xB2F6, 0xB048 }, { 0xB2F7, 0xB04A }, { 0xB2F8, 0xB04C }, { 0xB2F9, 0xB04E }, { 0xB2FA, 0xB053 }, { 0xB2FB, 0xB054 }, { 0xB2FC, 0xB055 },
+	{ 0xB2FD, 0xB057 }, { 0xB2FE, 0xB059 }, { 0xB3A1, 0xB05D }, { 0xB3A2, 0xB07C }, { 0xB3A3, 0xB07D }, { 0xB3A4, 0xB080 }, { 0xB3A5, 0xB084 }, { 0xB3A6, 0xB08C },
+	{ 0xB3A7, 0xB08D }, { 0xB3A8, 0xB08F }, { 0xB3A9, 0xB091 }, { 0xB3AA, 0xB098 }, { 0xB3AB, 0xB099 }, { 0xB3AC, 0xB09A }, { 0xB3AD, 0xB09C }, { 0xB3AE, 0xB09F },
+	{ 0xB3AF, 0xB0A0 }, { 0xB3B0, 0xB0A1 }, { 0xB3B1, 0xB0A2 }, { 0xB3B2, 0xB0A8 }, { 0xB3B3, 0xB0A9 }, { 0xB3B4, 0xB0AB }, { 0xB3B5, 0xB0AC }, { 0xB3B6, 0xB0AD },
+	{ 0xB3B7, 0xB0AE }, { 0xB3B8, 0xB0AF }, { 0xB3B9, 0xB0B1 }, { 0xB3BA, 0xB0B3 }, { 0xB3BB, 0xB0B4 }, { 0xB3BC, 0xB0B5 }, { 0xB3BD, 0xB0B8 }, { 0xB3BE, 0xB0BC },
+	{ 0xB3BF, 0xB0C4 }, { 0xB3C0, 0xB0C5 }, { 0xB3C1, 0xB0C7 }, { 0xB3C2, 0xB0C8 }, { 0xB3C3, 0xB0C9 }, { 0xB3C4, 0xB0D0 }, { 0xB3C5, 0xB0D1 }, { 0xB3C6, 0xB0D4 },
+	{ 0xB3C7, 0xB0D8 }, { 0xB3C8, 0xB0E0 }, { 0xB3C9, 0xB0E5 }, { 0xB3CA, 0xB108 }, { 0xB3CB, 0xB109 }, { 0xB3CC, 0xB10B }, { 0xB3CD, 0xB10C }, { 0xB3CE, 0xB110 },
+	{ 0xB3CF, 0xB112 }, { 0xB3D0, 0xB113 }, { 0xB3D1, 0xB118 }, { 0xB3D2, 0xB119 }, { 0xB3D3, 0xB11B }, { 0xB3D4, 0xB11C }, { 0xB3D5, 0xB11D }, { 0xB3D6, 0xB123 },
+	{ 0xB3D7, 0xB124 }, { 0xB3D8, 0xB125 }, { 0xB3D9, 0xB128 }, { 0xB3DA, 0xB12C }, { 0xB3DB, 0xB134 }, { 0xB3DC, 0xB135 }, { 0xB3DD, 0xB137 }, { 0xB3DE, 0xB138 },
+	{ 0xB3DF, 0xB139 }, { 0xB3E0, 0xB140 }, { 0xB3E1, 0xB141 }, { 0xB3E2, 0xB144 }, { 0xB3E3, 0xB148 }, { 0xB3E4, 0xB150 }, { 0xB3E5, 0xB151 }, { 0xB3E6, 0xB154 },
+	{ 0xB3E7, 0xB155 }, { 0xB3E8, 0xB158 }, { 0xB3E9, 0xB15C }, { 0xB3EA, 0xB160 }, { 0xB3EB, 0xB178 }, { 0xB3EC, 0xB179 }, { 0xB3ED, 0xB17C }, { 0xB3EE, 0xB180 },
+	{ 0xB3EF, 0xB182 }, { 0xB3F0, 0xB188 }, { 0xB3F1, 0xB189 }, { 0xB3F2, 0xB18B }, { 0xB3F3, 0xB18D }, { 0xB3F4, 0xB192 }, { 0xB3F5, 0xB193 }, { 0xB3F6, 0xB194 },
+	{ 0xB3F7, 0xB198 }, { 0xB3F8, 0xB19C }, { 0xB3F9, 0xB1A8 }, { 0xB3FA, 0xB1CC }, { 0xB3FB, 0xB1D0 }, { 0xB3FC, 0xB1D4 }, { 0xB3FD, 0xB1DC }, { 0xB3FE, 0xB1DD },
+	{ 0xB4A1, 0xB1DF }, { 0xB4A2, 0xB1E8 }, { 0xB4A3, 0xB1E9 }, { 0xB4A4, 0xB1EC }, { 0xB4A5, 0xB1F0 }, { 0xB4A6, 0xB1F9 }, { 0xB4A7, 0xB1FB }, { 0xB4A8, 0xB1FD },
+	{ 0xB4A9, 0xB204 }, { 0xB4AA, 0xB205 }, { 0xB4AB, 0xB208 }, { 0xB4AC, 0xB20B }, { 0xB4AD, 0xB20C }, { 0xB4AE, 0xB214 }, { 0xB4AF, 0xB215 }, { 0xB4B0, 0xB217 },
+	{ 0xB4B1, 0xB219 }, { 0xB4B2, 0xB220 }, { 0xB4B3, 0xB234 }, { 0xB4B4, 0xB23C }, { 0xB4B5, 0xB258 }, { 0xB4B6, 0xB25C }, { 0xB4B7, 0xB260 }, { 0xB4B8, 0xB268 },
+	{ 0xB4B9, 0xB269 }, { 0xB4BA, 0xB274 }, { 0xB4BB, 0xB275 }, { 0xB4BC, 0xB27C }, { 0xB4BD, 0xB284 }, { 0xB4BE, 0xB285 }, { 0xB4BF, 0xB289 }, { 0xB4C0, 0xB290 },
+	{ 0xB4C1, 0xB291 }, { 0xB4C2, 0xB294 }, { 0xB4C3, 0xB298 }, { 0xB4C4, 0xB299 }, { 0xB4C5, 0xB29A }, { 0xB4C6, 0xB2A0 }, { 0xB4C7, 0xB2A1 }, { 0xB4C8, 0xB2A3 },
+	{ 0xB4C9, 0xB2A5 }, { 0xB4CA, 0xB2A6 }, { 0xB4CB, 0xB2AA }, { 0xB4CC, 0xB2AC }, { 0xB4CD, 0xB2B0 }, { 0xB4CE, 0xB2B4 }, { 0xB4CF, 0xB2C8 }, { 0xB4D0, 0xB2C9 },
+	{ 0xB4D1, 0xB2CC }, { 0xB4D2, 0xB2D0 }, { 0xB4D3, 0xB2D2 }, { 0xB4D4, 0xB2D8 }, { 0xB4D5, 0xB2D9 }, { 0xB4D6, 0xB2DB }, { 0xB4D7, 0xB2DD }, { 0xB4D8, 0xB2E2 },
+	{ 0xB4D9, 0xB2E4 }, { 0xB4DA, 0xB2E5 }, { 0xB4DB, 0xB2E6 }, { 0xB4DC, 0xB2E8 }, { 0xB4DD, 0xB2EB }, { 0xB4DE, 0xB2EC }, { 0xB4DF, 0xB2ED }, { 0xB4E0, 0xB2EE },
+	{ 0xB4E1, 0xB2EF }, { 0xB4E2, 0xB2F3 }, { 0xB4E3, 0xB2F4 }, { 0xB4E4, 0xB2F5 }, { 0xB4E5, 0xB2F7 }, { 0xB4E6, 0xB2F8 }, { 0xB4E7, 0xB2F9 }, { 0xB4E8, 0xB2FA },
+	{ 0xB4E9, 0xB2FB }, { 0xB4EA, 0xB2FF }, { 0xB4EB, 0xB300 }, { 0xB4EC, 0xB301 }, { 0xB4ED, 0xB304 }, { 0xB4EE, 0xB308 }, { 0xB4EF, 0xB310 }, { 0xB4F0, 0xB311 },
+	{ 0xB4F1, 0xB313 }, { 0xB4F2, 0xB314 }, { 0xB4F3, 0xB315 }, { 0xB4F4, 0xB31C }, { 0xB4F5, 0xB354 }, { 0xB4F6, 0xB355 }, { 0xB4F7, 0xB356 }, { 0xB4F8, 0xB358 },
+	{ 0xB4F9, 0xB35B }, { 0xB4FA, 0xB35C }, { 0xB4FB, 0xB35E }, { 0xB4FC, 0xB35F }, { 0xB4FD, 0xB364 }, { 0xB4FE, 0xB365 }, { 0xB5A1, 0xB367 }, { 0xB5A2, 0xB369 },
+	{ 0xB5A3, 0xB36B }, { 0xB5A4, 0xB36E }, { 0xB5A5, 0xB370 }, { 0xB5A6, 0xB371 }, { 0xB5A7, 0xB374 }, { 0xB5A8, 0xB378 }, { 0xB5A9, 0xB380 }, { 0xB5AA, 0xB381 },
+	{ 0xB5AB, 0xB383 }, { 0xB5AC, 0xB384 }, { 0xB5AD, 0xB385 }, { 0xB5AE, 0xB38C }, { 0xB5AF, 0xB390 }, { 0xB5B0, 0xB394 }, { 0xB5B1, 0xB3A0 }, { 0xB5B2, 0xB3A1 },
+	{ 0xB5B3, 0xB3A8 }, { 0xB5B4, 0xB3AC }, { 0xB5B5, 0xB3C4 }, { 0xB5B6, 0xB3C5 }, { 0xB5B7, 0xB3C8 }, { 0xB5B8, 0xB3CB }, { 0xB5B9, 0xB3CC }, { 0xB5BA, 0xB3CE },
+	{ 0xB5BB, 0xB3D0 }, { 0xB5BC, 0xB3D4 }, { 0xB5BD, 0xB3D5 }, { 0xB5BE, 0xB3D7 }, { 0xB5BF, 0xB3D9 }, { 0xB5C0, 0xB3DB }, { 0xB5C1, 0xB3DD }, { 0xB5C2, 0xB3E0 },
+	{ 0xB5C3, 0xB3E4 }, { 0xB5C4, 0xB3E8 }, { 0xB5C5, 0xB3FC }, { 0xB5C6, 0xB410 }, { 0xB5C7, 0xB418 }, { 0xB5C8, 0xB41C }, { 0xB5C9, 0xB420 }, { 0xB5CA, 0xB428 },
+	{ 0xB5CB, 0xB429 }, { 0xB5CC, 0xB42B }, { 0xB5CD, 0xB434 }, { 0xB5CE, 0xB450 }, { 0xB5CF, 0xB451 }, { 0xB5D0, 0xB454 }, { 0xB5D1, 0xB458 }, { 0xB5D2, 0xB460 },
+	{ 0xB5D3, 0xB461 }, { 0xB5D4, 0xB463 }, { 0xB5D5, 0xB465 }, { 0xB5D6, 0xB46C }, { 0xB5D7, 0xB480 }, { 0xB5D8, 0xB488 }, { 0xB5D9, 0xB49D }, { 0xB5DA, 0xB4A4 },
+	{ 0xB5DB, 0xB4A8 }, { 0xB5DC, 0xB4AC }, { 0xB5DD, 0xB4B5 }, { 0xB5DE, 0xB4B7 }, { 0xB5DF, 0xB4B9 }, { 0xB5E0, 0xB4C0 }, { 0xB5E1, 0xB4C4 }, { 0xB5E2, 0xB4C8 },
+	{ 0xB5E3, 0xB4D0 }, { 0xB5E4, 0xB4D5 }, { 0xB5E5, 0xB4DC }, { 0xB5E6, 0xB4DD }, { 0xB5E7, 0xB4E0 }, { 0xB5E8, 0xB4E3 }, { 0xB5E9, 0xB4E4 }, { 0xB5EA, 0xB4E6 },
+	{ 0xB5EB, 0xB4EC }, { 0xB5EC, 0xB4ED }, { 0xB5ED, 0xB4EF }, { 0xB5EE, 0xB4F1 }, { 0xB5EF, 0xB4F8 }, { 0xB5F0, 0xB514 }, { 0xB5F1, 0xB515 }, { 0xB5F2, 0xB518 },
+	{ 0xB5F3, 0xB51B }, { 0xB5F4, 0xB51C }, { 0xB5F5, 0xB524 }, { 0xB5F6, 0xB525 }, { 0xB5F7, 0xB527 }, { 0xB5F8, 0xB528 }, { 0xB5F9, 0xB529 }, { 0xB5FA, 0xB52A },
+	{ 0xB5FB, 0xB530 }, { 0xB5FC, 0xB531 }, { 0xB5FD, 0xB534 }, { 0xB5FE, 0xB538 }, { 0xB6A1, 0xB540 }, { 0xB6A2, 0xB541 }, { 0xB6A3, 0xB543 }, { 0xB6A4, 0xB544 },
+	{ 0xB6A5, 0xB545 }, { 0xB6A6, 0xB54B }, { 0xB6A7, 0xB54C }, { 0xB6A8, 0xB54D }, { 0xB6A9, 0xB550 }, { 0xB6AA, 0xB554 }, { 0xB6AB, 0xB55C }, { 0xB6AC, 0xB55D },
+	{ 0xB6AD, 0xB55F }, { 0xB6AE, 0xB560 }, { 0xB6AF, 0xB561 }, { 0xB6B0, 0xB5A0 }, { 0xB6B1, 0xB5A1 }, { 0xB6B2, 0xB5A4 }, { 0xB6B3, 0xB5A8 }, { 0xB6B4, 0xB5AA },
+	{ 0xB6B5, 0xB5AB }, { 0xB6B6, 0xB5B0 }, { 0xB6B7, 0xB5B1 }, { 0xB6B8, 0xB5B3 }, { 0xB6B9, 0xB5B4 }, { 0xB6BA, 0xB5B5 }, { 0xB6BB, 0xB5BB }, { 0xB6BC, 0xB5BC },
+	{ 0xB6BD, 0xB5BD }, { 0xB6BE, 0xB5C0 }, { 0xB6BF, 0xB5C4 }, { 0xB6C0, 0xB5CC }, { 0xB6C1, 0xB5CD }, { 0xB6C2, 0xB5CF }, { 0xB6C3, 0xB5D0 }, { 0xB6C4, 0xB5D1 },
+	{ 0xB6C5, 0xB5D8 }, { 0xB6C6, 0xB5EC }, { 0xB6C7, 0xB610 }, { 0xB6C8, 0xB611 }, { 0xB6C9, 0xB614 }, { 0xB6CA, 0xB618 }, { 0xB6CB, 0xB625 }, { 0xB6CC, 0xB62C },
+	{ 0xB6CD, 0xB634 }, { 0xB6CE, 0xB648 }, { 0xB6CF, 0xB664 }, { 0xB6D0, 0xB668 }, { 0xB6D1, 0xB69C }, { 0xB6D2, 0xB69D }, { 0xB6D3, 0xB6A0 }, { 0xB6D4, 0xB6A4 },
+	{ 0xB6D5, 0xB6AB }, { 0xB6D6, 0xB6AC }, { 0xB6D7, 0xB6B1 }, { 0xB6D8, 0xB6D4 }, { 0xB6D9, 0xB6F0 }, { 0xB6DA, 0xB6F4 }, { 0xB6DB, 0xB6F8 }, { 0xB6DC, 0xB700 },
+	{ 0xB6DD, 0xB701 }, { 0xB6DE, 0xB705 }, { 0xB6DF, 0xB728 }, { 0xB6E0, 0xB729 }, { 0xB6E1, 0xB72C }, { 0xB6E2, 0xB72F }, { 0xB6E3, 0xB730 }, { 0xB6E4, 0xB738 },
+	{ 0xB6E5, 0xB739 }, { 0xB6E6, 0xB73B }, { 0xB6E7, 0xB744 }, { 0xB6E8, 0xB748 }, { 0xB6E9, 0xB74C }, { 0xB6EA, 0xB754 }, { 0xB6EB, 0xB755 }, { 0xB6EC, 0xB760 },
+	{ 0xB6ED, 0xB764 }, { 0xB6EE, 0xB768 }, { 0xB6EF, 0xB770 }, { 0xB6F0, 0xB771 }, { 0xB6F1, 0xB773 }, { 0xB6F2, 0xB775 }, { 0xB6F3, 0xB77C }, { 0xB6F4, 0xB77D },
+	{ 0xB6F5, 0xB780 }, { 0xB6F6, 0xB784 }, { 0xB6F7, 0xB78C }, { 0xB6F8, 0xB78D }, { 0xB6F9, 0xB78F }, { 0xB6FA, 0xB790 }, { 0xB6FB, 0xB791 }, { 0xB6FC, 0xB792 },
+	{ 0xB6FD, 0xB796 }, { 0xB6FE, 0xB797 }, { 0xB7A1, 0xB798 }, { 0xB7A2, 0xB799 }, { 0xB7A3, 0xB79C }, { 0xB7A4, 0xB7A0 }, { 0xB7A5, 0xB7A8 }, { 0xB7A6, 0xB7A9 },
+	{ 0xB7A7, 0xB7AB }, { 0xB7A8, 0xB7AC }, { 0xB7A9, 0xB7AD }, { 0xB7AA, 0xB7B4 }, { 0xB7AB, 0xB7B5 }, { 0xB7AC, 0xB7B8 }, { 0xB7AD, 0xB7C7 }, { 0xB7AE, 0xB7C9 },
+	{ 0xB7AF, 0xB7EC }, { 0xB7B0, 0xB7ED }, { 0xB7B1, 0xB7F0 }, { 0xB7B2, 0xB7F4 }, { 0xB7B3, 0xB7FC }, { 0xB7B4, 0xB7FD }, { 0xB7B5, 0xB7FF }, { 0xB7B6, 0xB800 },
+	{ 0xB7B7, 0xB801 }, { 0xB7B8, 0xB807 }, { 0xB7B9, 0xB808 }, { 0xB7BA, 0xB809 }, { 0xB7BB, 0xB80C }, { 0xB7BC, 0xB810 }, { 0xB7BD, 0xB818 }, { 0xB7BE, 0xB819 },
+	{ 0xB7BF, 0xB81B }, { 0xB7C0, 0xB81D }, { 0xB7C1, 0xB824 }, { 0xB7C2, 0xB825 }, { 0xB7C3, 0xB828 }, { 0xB7C4, 0xB82C }, { 0xB7C5, 0xB834 }, { 0xB7C6, 0xB835 },
+	{ 0xB7C7, 0xB837 }, { 0xB7C8, 0xB838 }, { 0xB7C9, 0xB839 }, { 0xB7CA, 0xB840 }, { 0xB7CB, 0xB844 }, { 0xB7CC, 0xB851 }, { 0xB7CD, 0xB853 }, { 0xB7CE, 0xB85C },
+	{ 0xB7CF, 0xB85D }, { 0xB7D0, 0xB860 }, { 0xB7D1, 0xB864 }, { 0xB7D2, 0xB86C }, { 0xB7D3, 0xB86D }, { 0xB7D4, 0xB86F }, { 0xB7D5, 0xB871 }, { 0xB7D6, 0xB878 },
+	{ 0xB7D7, 0xB87C }, { 0xB7D8, 0xB88D }, { 0xB7D9, 0xB8A8 }, { 0xB7DA, 0xB8B0 }, { 0xB7DB, 0xB8B4 }, { 0xB7DC, 0xB8B8 }, { 0xB7DD, 0xB8C0 }, { 0xB7DE, 0xB8C1 },
+	{ 0xB7DF, 0xB8C3 }, { 0xB7E0, 0xB8C5 }, { 0xB7E1, 0xB8CC }, { 0xB7E2, 0xB8D0 }, { 0xB7E3, 0xB8D4 }, { 0xB7E4, 0xB8DD }, { 0xB7E5, 0xB8DF }, { 0xB7E6, 0xB8E1 },
+	{ 0xB7E7, 0xB8E8 }, { 0xB7E8, 0xB8E9 }, { 0xB7E9, 0xB8EC }, { 0xB7EA, 0xB8F0 }, { 0xB7EB, 0xB8F8 }, { 0xB7EC, 0xB8F9 }, { 0xB7ED, 0xB8FB }, { 0xB7EE, 0xB8FD },
+	{ 0xB7EF, 0xB904 }, { 0xB7F0, 0xB918 }, { 0xB7F1, 0xB920 }, { 0xB7F2, 0xB93C }, { 0xB7F3, 0xB93D }, { 0xB7F4, 0xB940 }, { 0xB7F5, 0xB944 }, { 0xB7F6, 0xB94C },
+	{ 0xB7F7, 0xB94F }, { 0xB7F8, 0xB951 }, { 0xB7F9, 0xB958 }, { 0xB7FA, 0xB959 }, { 0xB7FB, 0xB95C }, { 0xB7FC, 0xB960 }, { 0xB7FD, 0xB968 }, { 0xB7FE, 0xB969 },
+	{ 0xB8A1, 0xB96B }, { 0xB8A2, 0xB96D }, { 0xB8A3, 0xB974 }, { 0xB8A4, 0xB975 }, { 0xB8A5, 0xB978 }, { 0xB8A6, 0xB97C }, { 0xB8A7, 0xB984 }, { 0xB8A8, 0xB985 },
+	{ 0xB8A9, 0xB987 }, { 0xB8AA, 0xB989 }, { 0xB8AB, 0xB98A }, { 0xB8AC, 0xB98D }, { 0xB8AD, 0xB98E }, { 0xB8AE, 0xB9AC }, { 0xB8AF, 0xB9AD }, { 0xB8B0, 0xB9B0 },
+	{ 0xB8B1, 0xB9B4 }, { 0xB8B2, 0xB9BC }, { 0xB8B3, 0xB9BD }, { 0xB8B4, 0xB9BF }, { 0xB8B5, 0xB9C1 }, { 0xB8B6, 0xB9C8 }, { 0xB8B7, 0xB9C9 }, { 0xB8B8, 0xB9CC },
+	{ 0xB8B9, 0xB9CE }, { 0xB8BA, 0xB9CF }, { 0xB8BB, 0xB9D0 }, { 0xB8BC, 0xB9D1 }, { 0xB8BD, 0xB9D2 }, { 0xB8BE, 0xB9D8 }, { 0xB8BF, 0xB9D9 }, { 0xB8C0, 0xB9DB },
+	{ 0xB8C1, 0xB9DD }, { 0xB8C2, 0xB9DE }, { 0xB8C3, 0xB9E1 }, { 0xB8C4, 0xB9E3 }, { 0xB8C5, 0xB9E4 }, { 0xB8C6, 0xB9E5 }, { 0xB8C7, 0xB9E8 }, { 0xB8C8, 0xB9EC },
+	{ 0xB8C9, 0xB9F4 }, { 0xB8CA, 0xB9F5 }, { 0xB8CB, 0xB9F7 }, { 0xB8CC, 0xB9F8 }, { 0xB8CD, 0xB9F9 }, { 0xB8CE, 0xB9FA }, { 0xB8CF, 0xBA00 }, { 0xB8D0, 0xBA01 },
+	{ 0xB8D1, 0xBA08 }, { 0xB8D2, 0xBA15 }, { 0xB8D3, 0xBA38 }, { 0xB8D4, 0xBA39 }, { 0xB8D5, 0xBA3C }, { 0xB8D6, 0xBA40 }, { 0xB8D7, 0xBA42 }, { 0xB8D8, 0xBA48 },
+	{ 0xB8D9, 0xBA49 }, { 0xB8DA, 0xBA4B }, { 0xB8DB, 0xBA4D }, { 0xB8DC, 0xBA4E }, { 0xB8DD, 0xBA53 }, { 0xB8DE, 0xBA54 }, { 0xB8DF, 0xBA55 }, { 0xB8E0, 0xBA58 },
+	{ 0xB8E1, 0xBA5C }, { 0xB8E2, 0xBA64 }, { 0xB8E3, 0xBA65 }, { 0xB8E4, 0xBA67 }, { 0xB8E5, 0xBA68 }, { 0xB8E6, 0xBA69 }, { 0xB8E7, 0xBA70 }, { 0xB8E8, 0xBA71 },
+	{ 0xB8E9, 0xBA74 }, { 0xB8EA, 0xBA78 }, { 0xB8EB, 0xBA83 }, { 0xB8EC, 0xBA84 }, { 0xB8ED, 0xBA85 }, { 0xB8EE, 0xBA87 }, { 0xB8EF, 0xBA8C }, { 0xB8F0, 0xBAA8 },
+	{ 0xB8F1, 0xBAA9 }, { 0xB8F2, 0xBAAB }, { 0xB8F3, 0xBAAC }, { 0xB8F4, 0xBAB0 }, { 0xB8F5, 0xBAB2 }, { 0xB8F6, 0xBAB8 }, { 0xB8F7, 0xBAB9 }, { 0xB8F8, 0xBABB },
+	{ 0xB8F9, 0xBABD }, { 0xB8FA, 0xBAC4 }, { 0xB8FB, 0xBAC8 }, { 0xB8FC, 0xBAD8 }, { 0xB8FD, 0xBAD9 }, { 0xB8FE, 0xBAFC }, { 0xB9A1, 0xBB00 }, { 0xB9A2, 0xBB04 },
+	{ 0xB9A3, 0xBB0D }, { 0xB9A4, 0xBB0F }, { 0xB9A5, 0xBB11 }, { 0xB9A6, 0xBB18 }, { 0xB9A7, 0xBB1C }, { 0xB9A8, 0xBB20 }, { 0xB9A9, 0xBB29 }, { 0xB9AA, 0xBB2B },
+	{ 0xB9AB, 0xBB34 }, { 0xB9AC, 0xBB35 }, { 0xB9AD, 0xBB36 }, { 0xB9AE, 0xBB38 }, { 0xB9AF, 0xBB3B }, { 0xB9B0, 0xBB3C }, { 0xB9B1, 0xBB3D }, { 0xB9B2, 0xBB3E },
+	{ 0xB9B3, 0xBB44 }, { 0xB9B4, 0xBB45 }, { 0xB9B5, 0xBB47 }, { 0xB9B6, 0xBB49 }, { 0xB9B7, 0xBB4D }, { 0xB9B8, 0xBB4F }, { 0xB9B9, 0xBB50 }, { 0xB9BA, 0xBB54 },
+	{ 0xB9BB, 0xBB58 }, { 0xB9BC, 0xBB61 }, { 0xB9BD, 0xBB63 }, { 0xB9BE, 0xBB6C }, { 0xB9BF, 0xBB88 }, { 0xB9C0, 0xBB8C }, { 0xB9C1, 0xBB90 }, { 0xB9C2, 0xBBA4 },
+	{ 0xB9C3, 0xBBA8 }, { 0xB9C4, 0xBBAC }, { 0xB9C5, 0xBBB4 }, { 0xB9C6, 0xBBB7 }, { 0xB9C7, 0xBBC0 }, { 0xB9C8, 0xBBC4 }, { 0xB9C9, 0xBBC8 }, { 0xB9CA, 0xBBD0 },
+	{ 0xB9CB, 0xBBD3 }, { 0xB9CC, 0xBBF8 }, { 0xB9CD, 0xBBF9 }, { 0xB9CE, 0xBBFC }, { 0xB9CF, 0xBBFF }, { 0xB9D0, 0xBC00 }, { 0xB9D1, 0xBC02 }, { 0xB9D2, 0xBC08 },
+	{ 0xB9D3, 0xBC09 }, { 0xB9D4, 0xBC0B }, { 0xB9D5, 0xBC0C }, { 0xB9D6, 0xBC0D }, { 0xB9D7, 0xBC0F }, { 0xB9D8, 0xBC11 }, { 0xB9D9, 0xBC14 }, { 0xB9DA, 0xBC15 },
+	{ 0xB9DB, 0xBC16 }, { 0xB9DC, 0xBC17 }, { 0xB9DD, 0xBC18 }, { 0xB9DE, 0xBC1B }, { 0xB9DF, 0xBC1C }, { 0xB9E0, 0xBC1D }, { 0xB9E1, 0xBC1E }, { 0xB9E2, 0xBC1F },
+	{ 0xB9E3, 0xBC24 }, { 0xB9E4, 0xBC25 }, { 0xB9E5, 0xBC27 }, { 0xB9E6, 0xBC29 }, { 0xB9E7, 0xBC2D }, { 0xB9E8, 0xBC30 }, { 0xB9E9, 0xBC31 }, { 0xB9EA, 0xBC34 },
+	{ 0xB9EB, 0xBC38 }, { 0xB9EC, 0xBC40 }, { 0xB9ED, 0xBC41 }, { 0xB9EE, 0xBC43 }, { 0xB9EF, 0xBC44 }, { 0xB9F0, 0xBC45 }, { 0xB9F1, 0xBC49 }, { 0xB9F2, 0xBC4C },
+	{ 0xB9F3, 0xBC4D }, { 0xB9F4, 0xBC50 }, { 0xB9F5, 0xBC5D }, { 0xB9F6, 0xBC84 }, { 0xB9F7, 0xBC85 }, { 0xB9F8, 0xBC88 }, { 0xB9F9, 0xBC8B }, { 0xB9FA, 0xBC8C },
+	{ 0xB9FB, 0xBC8E }, { 0xB9FC, 0xBC94 }, { 0xB9FD, 0xBC95 }, { 0xB9FE, 0xBC97 }, { 0xBAA1, 0xBC99 }, { 0xBAA2, 0xBC9A }, { 0xBAA3, 0xBCA0 }, { 0xBAA4, 0xBCA1 },
+	{ 0xBAA5, 0xBCA4 }, { 0xBAA6, 0xBCA7 }, { 0xBAA7, 0xBCA8 }, { 0xBAA8, 0xBCB0 }, { 0xBAA9, 0xBCB1 }, { 0xBAAA, 0xBCB3 }, { 0xBAAB, 0xBCB4 }, { 0xBAAC, 0xBCB5 },
+	{ 0xBAAD, 0xBCBC }, { 0xBAAE, 0xBCBD }, { 0xBAAF, 0xBCC0 }, { 0xBAB0, 0xBCC4 }, { 0xBAB1, 0xBCCD }, { 0xBAB2, 0xBCCF }, { 0xBAB3, 0xBCD0 }, { 0xBAB4, 0xBCD1 },
+	{ 0xBAB5, 0xBCD5 }, { 0xBAB6, 0xBCD8 }, { 0xBAB7, 0xBCDC }, { 0xBAB8, 0xBCF4 }, { 0xBAB9, 0xBCF5 }, { 0xBABA, 0xBCF6 }, { 0xBABB, 0xBCF8 }, { 0xBABC, 0xBCFC },
+	{ 0xBABD, 0xBD04 }, { 0xBABE, 0xBD05 }, { 0xBABF, 0xBD07 }, { 0xBAC0, 0xBD09 }, { 0xBAC1, 0xBD10 }, { 0xBAC2, 0xBD14 }, { 0xBAC3, 0xBD24 }, { 0xBAC4, 0xBD2C },
+	{ 0xBAC5, 0xBD40 }, { 0xBAC6, 0xBD48 }, { 0xBAC7, 0xBD49 }, { 0xBAC8, 0xBD4C }, { 0xBAC9, 0xBD50 }, { 0xBACA, 0xBD58 }, { 0xBACB, 0xBD59 }, { 0xBACC, 0xBD64 },
+	{ 0xBACD, 0xBD68 }, { 0xBACE, 0xBD80 }, { 0xBACF, 0xBD81 }, { 0xBAD0, 0xBD84 }, { 0xBAD1, 0xBD87 }, { 0xBAD2, 0xBD88 }, { 0xBAD3, 0xBD89 }, { 0xBAD4, 0xBD8A },
+	{ 0xBAD5, 0xBD90 }, { 0xBAD6, 0xBD91 }, { 0xBAD7, 0xBD93 }, { 0xBAD8, 0xBD95 }, { 0xBAD9, 0xBD99 }, { 0xBADA, 0xBD9A }, { 0xBADB, 0xBD9C }, { 0xBADC, 0xBDA4 },
+	{ 0xBADD, 0xBDB0 }, { 0xBADE, 0xBDB8 }, { 0xBADF, 0xBDD4 }, { 0xBAE0, 0xBDD5 }, { 0xBAE1, 0xBDD8 }, { 0xBAE2, 0xBDDC }, { 0xBAE3, 0xBDE9 }, { 0xBAE4, 0xBDF0 },
+	{ 0xBAE5, 0xBDF4 }, { 0xBAE6, 0xBDF8 }, { 0xBAE7, 0xBE00 }, { 0xBAE8, 0xBE03 }, { 0xBAE9, 0xBE05 }, { 0xBAEA, 0xBE0C }, { 0xBAEB, 0xBE0D }, { 0xBAEC, 0xBE10 },
+	{ 0xBAED, 0xBE14 }, { 0xBAEE, 0xBE1C }, { 0xBAEF, 0xBE1D }, { 0xBAF0, 0xBE1F }, { 0xBAF1, 0xBE44 }, { 0xBAF2, 0xBE45 }, { 0xBAF3, 0xBE48 }, { 0xBAF4, 0xBE4C },
+	{ 0xBAF5, 0xBE4E }, { 0xBAF6, 0xBE54 }, { 0xBAF7, 0xBE55 }, { 0xBAF8, 0xBE57 }, { 0xBAF9, 0xBE59 }, { 0xBAFA, 0xBE5A }, { 0xBAFB, 0xBE5B }, { 0xBAFC, 0xBE60 },
+	{ 0xBAFD, 0xBE61 }, { 0xBAFE, 0xBE64 }, { 0xBBA1, 0xBE68 }, { 0xBBA2, 0xBE6A }, { 0xBBA3, 0xBE70 }, { 0xBBA4, 0xBE71 }, { 0xBBA5, 0xBE73 }, { 0xBBA6, 0xBE74 },
+	{ 0xBBA7, 0xBE75 }, { 0xBBA8, 0xBE7B }, { 0xBBA9, 0xBE7C }, { 0xBBAA, 0xBE7D }, { 0xBBAB, 0xBE80 }, { 0xBBAC, 0xBE84 }, { 0xBBAD, 0xBE8C }, { 0xBBAE, 0xBE8D },
+	{ 0xBBAF, 0xBE8F }, { 0xBBB0, 0xBE90 }, { 0xBBB1, 0xBE91 }, { 0xBBB2, 0xBE98 }, { 0xBBB3, 0xBE99 }, { 0xBBB4, 0xBEA8 }, { 0xBBB5, 0xBED0 }, { 0xBBB6, 0xBED1 },
+	{ 0xBBB7, 0xBED4 }, { 0xBBB8, 0xBED7 }, { 0xBBB9, 0xBED8 }, { 0xBBBA, 0xBEE0 }, { 0xBBBB, 0xBEE3 }, { 0xBBBC, 0xBEE4 }, { 0xBBBD, 0xBEE5 }, { 0xBBBE, 0xBEEC },
+	{ 0xBBBF, 0xBF01 }, { 0xBBC0, 0xBF08 }, { 0xBBC1, 0xBF09 }, { 0xBBC2, 0xBF18 }, { 0xBBC3, 0xBF19 }, { 0xBBC4, 0xBF1B }, { 0xBBC5, 0xBF1C }, { 0xBBC6, 0xBF1D },
+	{ 0xBBC7, 0xBF40 }, { 0xBBC8, 0xBF41 }, { 0xBBC9, 0xBF44 }, { 0xBBCA, 0xBF48 }, { 0xBBCB, 0xBF50 }, { 0xBBCC, 0xBF51 }, { 0xBBCD, 0xBF55 }, { 0xBBCE, 0xBF94 },
+	{ 0xBBCF, 0xBFB0 }, { 0xBBD0, 0xBFC5 }, { 0xBBD1, 0xBFCC }, { 0xBBD2, 0xBFCD }, { 0xBBD3, 0xBFD0 }, { 0xBBD4, 0xBFD4 }, { 0xBBD5, 0xBFDC }, { 0xBBD6, 0xBFDF },
+	{ 0xBBD7, 0xBFE1 }, { 0xBBD8, 0xC03C }, { 0xBBD9, 0xC051 }, { 0xBBDA, 0xC058 }, { 0xBBDB, 0xC05C }, { 0xBBDC, 0xC060 }, { 0xBBDD, 0xC068 }, { 0xBBDE, 0xC069 },
+	{ 0xBBDF, 0xC090 }, { 0xBBE0, 0xC091 }, { 0xBBE1, 0xC094 }, { 0xBBE2, 0xC098 }, { 0xBBE3, 0xC0A0 }, { 0xBBE4, 0xC0A1 }, { 0xBBE5, 0xC0A3 }, { 0xBBE6, 0xC0A5 },
+	{ 0xBBE7, 0xC0AC }, { 0xBBE8, 0xC0AD }, { 0xBBE9, 0xC0AF }, { 0xBBEA, 0xC0B0 }, { 0xBBEB, 0xC0B3 }, { 0xBBEC, 0xC0B4 }, { 0xBBED, 0xC0B5 }, { 0xBBEE, 0xC0B6 },
+	{ 0xBBEF, 0xC0BC }, { 0xBBF0, 0xC0BD }, { 0xBBF1, 0xC0BF }, { 0xBBF2, 0xC0C0 }, { 0xBBF3, 0xC0C1 }, { 0xBBF4, 0xC0C5 }, { 0xBBF5, 0xC0C8 }, { 0xBBF6, 0xC0C9 },
+	{ 0xBBF7, 0xC0CC }, { 0xBBF8, 0xC0D0 }, { 0xBBF9, 0xC0D8 }, { 0xBBFA, 0xC0D9 }, { 0xBBFB, 0xC0DB }, { 0xBBFC, 0xC0DC }, { 0xBBFD, 0xC0DD }, { 0xBBFE, 0xC0E4 },
+	{ 0xBCA1, 0xC0E5 }, { 0xBCA2, 0xC0E8 }, { 0xBCA3, 0xC0EC }, { 0xBCA4, 0xC0F4 }, { 0xBCA5, 0xC0F5 }, { 0xBCA6, 0xC0F7 }, { 0xBCA7, 0xC0F9 }, { 0xBCA8, 0xC100 },
+	{ 0xBCA9, 0xC104 }, { 0xBCAA, 0xC108 }, { 0xBCAB, 0xC110 }, { 0xBCAC, 0xC115 }, { 0xBCAD, 0xC11C }, { 0xBCAE, 0xC11D }, { 0xBCAF, 0xC11E }, { 0xBCB0, 0xC11F },
+	{ 0xBCB1, 0xC120 }, { 0xBCB2, 0xC123 }, { 0xBCB3, 0xC124 }, { 0xBCB4, 0xC126 }, { 0xBCB5, 0xC127 }, { 0xBCB6, 0xC12C }, { 0xBCB7, 0xC12D }, { 0xBCB8, 0xC12F },
+	{ 0xBCB9, 0xC130 }, { 0xBCBA, 0xC131 }, { 0xBCBB, 0xC136 }, { 0xBCBC, 0xC138 }, { 0xBCBD, 0xC139 }, { 0xBCBE, 0xC13C }, { 0xBCBF, 0xC140 }, { 0xBCC0, 0xC148 },
+	{ 0xBCC1, 0xC149 }, { 0xBCC2, 0xC14B }, { 0xBCC3, 0xC14C }, { 0xBCC4, 0xC14D }, { 0xBCC5, 0xC154 }, { 0xBCC6, 0xC155 }, { 0xBCC7, 0xC158 }, { 0xBCC8, 0xC15C },
+	{ 0xBCC9, 0xC164 }, { 0xBCCA, 0xC165 }, { 0xBCCB, 0xC167 }, { 0xBCCC, 0xC168 }, { 0xBCCD, 0xC169 }, { 0xBCCE, 0xC170 }, { 0xBCCF, 0xC174 }, { 0xBCD0, 0xC178 },
+	{ 0xBCD1, 0xC185 }, { 0xBCD2, 0xC18C }, { 0xBCD3, 0xC18D }, { 0xBCD4, 0xC18E }, { 0xBCD5, 0xC190 }, { 0xBCD6, 0xC194 }, { 0xBCD7, 0xC196 }, { 0xBCD8, 0xC19C },
+	{ 0xBCD9, 0xC19D }, { 0xBCDA, 0xC19F }, { 0xBCDB, 0xC1A1 }, { 0xBCDC, 0xC1A5 }, { 0xBCDD, 0xC1A8 }, { 0xBCDE, 0xC1A9 }, { 0xBCDF, 0xC1AC }, { 0xBCE0, 0xC1B0 },
+	{ 0xBCE1, 0xC1BD }, { 0xBCE2, 0xC1C4 }, { 0xBCE3, 0xC1C8 }, { 0xBCE4, 0xC1CC }, { 0xBCE5, 0xC1D4 }, { 0xBCE6, 0xC1D7 }, { 0xBCE7, 0xC1D8 }, { 0xBCE8, 0xC1E0 },
+	{ 0xBCE9, 0xC1E4 }, { 0xBCEA, 0xC1E8 }, { 0xBCEB, 0xC1F0 }, { 0xBCEC, 0xC1F1 }, { 0xBCED, 0xC1F3 }, { 0xBCEE, 0xC1FC }, { 0xBCEF, 0xC1FD }, { 0xBCF0, 0xC200 },
+	{ 0xBCF1, 0xC204 }, { 0xBCF2, 0xC20C }, { 0xBCF3, 0xC20D }, { 0xBCF4, 0xC20F }, { 0xBCF5, 0xC211 }, { 0xBCF6, 0xC218 }, { 0xBCF7, 0xC219 }, { 0xBCF8, 0xC21C },
+	{ 0xBCF9, 0xC21F }, { 0xBCFA, 0xC220 }, { 0xBCFB, 0xC228 }, { 0xBCFC, 0xC229 }, { 0xBCFD, 0xC22B }, { 0xBCFE, 0xC22D }, { 0xBDA1, 0xC22F }, { 0xBDA2, 0xC231 },
+	{ 0xBDA3, 0xC232 }, { 0xBDA4, 0xC234 }, { 0xBDA5, 0xC248 }, { 0xBDA6, 0xC250 }, { 0xBDA7, 0xC251 }, { 0xBDA8, 0xC254 }, { 0xBDA9, 0xC258 }, { 0xBDAA, 0xC260 },
+	{ 0xBDAB, 0xC265 }, { 0xBDAC, 0xC26C }, { 0xBDAD, 0xC26D }, { 0xBDAE, 0xC270 }, { 0xBDAF, 0xC274 }, { 0xBDB0, 0xC27C }, { 0xBDB1, 0xC27D }, { 0xBDB2, 0xC27F },
+	{ 0xBDB3, 0xC281 }, { 0xBDB4, 0xC288 }, { 0xBDB5, 0xC289 }, { 0xBDB6, 0xC290 }, { 0xBDB7, 0xC298 }, { 0xBDB8, 0xC29B }, { 0xBDB9, 0xC29D }, { 0xBDBA, 0xC2A4 },
+	{ 0xBDBB, 0xC2A5 }, { 0xBDBC, 0xC2A8 }, { 0xBDBD, 0xC2AC }, { 0xBDBE, 0xC2AD }, { 0xBDBF, 0xC2B4 }, { 0xBDC0, 0xC2B5 }, { 0xBDC1, 0xC2B7 }, { 0xBDC2, 0xC2B9 },
+	{ 0xBDC3, 0xC2DC }, { 0xBDC4, 0xC2DD }, { 0xBDC5, 0xC2E0 }, { 0xBDC6, 0xC2E3 }, { 0xBDC7, 0xC2E4 }, { 0xBDC8, 0xC2EB }, { 0xBDC9, 0xC2EC }, { 0xBDCA, 0xC2ED },
+	{ 0xBDCB, 0xC2EF }, { 0xBDCC, 0xC2F1 }, { 0xBDCD, 0xC2F6 }, { 0xBDCE, 0xC2F8 }, { 0xBDCF, 0xC2F9 }, { 0xBDD0, 0xC2FB }, { 0xBDD1, 0xC2FC }, { 0xBDD2, 0xC300 },
+	{ 0xBDD3, 0xC308 }, { 0xBDD4, 0xC309 }, { 0xBDD5, 0xC30C }, { 0xBDD6, 0xC30D }, { 0xBDD7, 0xC313 }, { 0xBDD8, 0xC314 }, { 0xBDD9, 0xC315 }, { 0xBDDA, 0xC318 },
+	{ 0xBDDB, 0xC31C }, { 0xBDDC, 0xC324 }, { 0xBDDD, 0xC325 }, { 0xBDDE, 0xC328 }, { 0xBDDF, 0xC329 }, { 0xBDE0, 0xC345 }, { 0xBDE1, 0xC368 }, { 0xBDE2, 0xC369 },
+	{ 0xBDE3, 0xC36C }, { 0xBDE4, 0xC370 }, { 0xBDE5, 0xC372 }, { 0xBDE6, 0xC378 }, { 0xBDE7, 0xC379 }, { 0xBDE8, 0xC37C }, { 0xBDE9, 0xC37D }, { 0xBDEA, 0xC384 },
+	{ 0xBDEB, 0xC388 }, { 0xBDEC, 0xC38C }, { 0xBDED, 0xC3C0 }, { 0xBDEE, 0xC3D8 }, { 0xBDEF, 0xC3D9 }, { 0xBDF0, 0xC3DC }, { 0xBDF1, 0xC3DF }, { 0xBDF2, 0xC3E0 },
+	{ 0xBDF3, 0xC3E2 }, { 0xBDF4, 0xC3E8 }, { 0xBDF5, 0xC3E9 }, { 0xBDF6, 0xC3ED }, { 0xBDF7, 0xC3F4 }, { 0xBDF8, 0xC3F5 }, { 0xBDF9, 0xC3F8 }, { 0xBDFA, 0xC408 },
+	{ 0xBDFB, 0xC410 }, { 0xBDFC, 0xC424 }, { 0xBDFD, 0xC42C }, { 0xBDFE, 0xC430 }, { 0xBEA1, 0xC434 }, { 0xBEA2, 0xC43C }, { 0xBEA3, 0xC43D }, { 0xBEA4, 0xC448 },
+	{ 0xBEA5, 0xC464 }, { 0xBEA6, 0xC465 }, { 0xBEA7, 0xC468 }, { 0xBEA8, 0xC46C }, { 0xBEA9, 0xC474 }, { 0xBEAA, 0xC475 }, { 0xBEAB, 0xC479 }, { 0xBEAC, 0xC480 },
+	{ 0xBEAD, 0xC494 }, { 0xBEAE, 0xC49C }, { 0xBEAF, 0xC4B8 }, { 0xBEB0, 0xC4BC }, { 0xBEB1, 0xC4E9 }, { 0xBEB2, 0xC4F0 }, { 0xBEB3, 0xC4F1 }, { 0xBEB4, 0xC4F4 },
+	{ 0xBEB5, 0xC4F8 }, { 0xBEB6, 0xC4FA }, { 0xBEB7, 0xC4FF }, { 0xBEB8, 0xC500 }, { 0xBEB9, 0xC501 }, { 0xBEBA, 0xC50C }, { 0xBEBB, 0xC510 }, { 0xBEBC, 0xC514 },
+	{ 0xBEBD, 0xC51C }, { 0xBEBE, 0xC528 }, { 0xBEBF, 0xC529 }, { 0xBEC0, 0xC52C }, { 0xBEC1, 0xC530 }, { 0xBEC2, 0xC538 }, { 0xBEC3, 0xC539 }, { 0xBEC4, 0xC53B },
+	{ 0xBEC5, 0xC53D }, { 0xBEC6, 0xC544 }, { 0xBEC7, 0xC545 }, { 0xBEC8, 0xC548 }, { 0xBEC9, 0xC549 }, { 0xBECA, 0xC54A }, { 0xBECB, 0xC54C }, { 0xBECC, 0xC54D },
+	{ 0xBECD, 0xC54E }, { 0xBECE, 0xC553 }, { 0xBECF, 0xC554 }, { 0xBED0, 0xC555 }, { 0xBED1, 0xC557 }, { 0xBED2, 0xC558 }, { 0xBED3, 0xC559 }, { 0xBED4, 0xC55D },
+	{ 0xBED5, 0xC55E }, { 0xBED6, 0xC560 }, { 0xBED7, 0xC561 }, { 0xBED8, 0xC564 }, { 0xBED9, 0xC568 }, { 0xBEDA, 0xC570 }, { 0xBEDB, 0xC571 }, { 0xBEDC, 0xC573 },
+	{ 0xBEDD, 0xC574 }, { 0xBEDE, 0xC575 }, { 0xBEDF, 0xC57C }, { 0xBEE0, 0xC57D }, { 0xBEE1, 0xC580 }, { 0xBEE2, 0xC584 }, { 0xBEE3, 0xC587 }, { 0xBEE4, 0xC58C },
+	{ 0xBEE5, 0xC58D }, { 0xBEE6, 0xC58F }, { 0xBEE7, 0xC591 }, { 0xBEE8, 0xC595 }, { 0xBEE9, 0xC597 }, { 0xBEEA, 0xC598 }, { 0xBEEB, 0xC59C }, { 0xBEEC, 0xC5A0 },
+	{ 0xBEED, 0xC5A9 }, { 0xBEEE, 0xC5B4 }, { 0xBEEF, 0xC5B5 }, { 0xBEF0, 0xC5B8 }, { 0xBEF1, 0xC5B9 }, { 0xBEF2, 0xC5BB }, { 0xBEF3, 0xC5BC }, { 0xBEF4, 0xC5BD },
+	{ 0xBEF5, 0xC5BE }, { 0xBEF6, 0xC5C4 }, { 0xBEF7, 0xC5C5 }, { 0xBEF8, 0xC5C6 }, { 0xBEF9, 0xC5C7 }, { 0xBEFA, 0xC5C8 }, { 0xBEFB, 0xC5C9 }, { 0xBEFC, 0xC5CA },
+	{ 0xBEFD, 0xC5CC }, { 0xBEFE, 0xC5CE }, { 0xBFA1, 0xC5D0 }, { 0xBFA2, 0xC5D1 }, { 0xBFA3, 0xC5D4 }, { 0xBFA4, 0xC5D8 }, { 0xBFA5, 0xC5E0 }, { 0xBFA6, 0xC5E1 },
+	{ 0xBFA7, 0xC5E3 }, { 0xBFA8, 0xC5E5 }, { 0xBFA9, 0xC5EC }, { 0xBFAA, 0xC5ED }, { 0xBFAB, 0xC5EE }, { 0xBFAC, 0xC5F0 }, { 0xBFAD, 0xC5F4 }, { 0xBFAE, 0xC5F6 },
+	{ 0xBFAF, 0xC5F7 }, { 0xBFB0, 0xC5FC }, { 0xBFB1, 0xC5FD }, { 0xBFB2, 0xC5FE }, { 0xBFB3, 0xC5FF }, { 0xBFB4, 0xC600 }, { 0xBFB5, 0xC601 }, { 0xBFB6, 0xC605 },
+	{ 0xBFB7, 0xC606 }, { 0xBFB8, 0xC607 }, { 0xBFB9, 0xC608 }, { 0xBFBA, 0xC60C }, { 0xBFBB, 0xC610 }, { 0xBFBC, 0xC618 }, { 0xBFBD, 0xC619 }, { 0xBFBE, 0xC61B },
+	{ 0xBFBF, 0xC61C }, { 0xBFC0, 0xC624 }, { 0xBFC1, 0xC625 }, { 0xBFC2, 0xC628 }, { 0xBFC3, 0xC62C }, { 0xBFC4, 0xC62D }, { 0xBFC5, 0xC62E }, { 0xBFC6, 0xC630 },
+	{ 0xBFC7, 0xC633 }, { 0xBFC8, 0xC634 }, { 0xBFC9, 0xC635 }, { 0xBFCA, 0xC637 }, { 0xBFCB, 0xC639 }, { 0xBFCC, 0xC63B }, { 0xBFCD, 0xC640 }, { 0xBFCE, 0xC641 },
+	{ 0xBFCF, 0xC644 }, { 0xBFD0, 0xC648 }, { 0xBFD1, 0xC650 }, { 0xBFD2, 0xC651 }, { 0xBFD3, 0xC653 }, { 0xBFD4, 0xC654 }, { 0xBFD5, 0xC655 }, { 0xBFD6, 0xC65C },
+	{ 0xBFD7, 0xC65D }, { 0xBFD8, 0xC660 }, { 0xBFD9, 0xC66C }, { 0xBFDA, 0xC66F }, { 0xBFDB, 0xC671 }, { 0xBFDC, 0xC678 }, { 0xBFDD, 0xC679 }, { 0xBFDE, 0xC67C },
+	{ 0xBFDF, 0xC680 }, { 0xBFE0, 0xC688 }, { 0xBFE1, 0xC689 }, { 0xBFE2, 0xC68B }, { 0xBFE3, 0xC68D }, { 0xBFE4, 0xC694 }, { 0xBFE5, 0xC695 }, { 0xBFE6, 0xC698 },
+	{ 0xBFE7, 0xC69C }, { 0xBFE8, 0xC6A4 }, { 0xBFE9, 0xC6A5 }, { 0xBFEA, 0xC6A7 }, { 0xBFEB, 0xC6A9 }, { 0xBFEC, 0xC6B0 }, { 0xBFED, 0xC6B1 }, { 0xBFEE, 0xC6B4 },
+	{ 0xBFEF, 0xC6B8 }, { 0xBFF0, 0xC6B9 }, { 0xBFF1, 0xC6BA }, { 0xBFF2, 0xC6C0 }, { 0xBFF3, 0xC6C1 }, { 0xBFF4, 0xC6C3 }, { 0xBFF5, 0xC6C5 }, { 0xBFF6, 0xC6CC },
+	{ 0xBFF7, 0xC6CD }, { 0xBFF8, 0xC6D0 }, { 0xBFF9, 0xC6D4 }, { 0xBFFA, 0xC6DC }, { 0xBFFB, 0xC6DD }, { 0xBFFC, 0xC6E0 }, { 0xBFFD, 0xC6E1 }, { 0xBFFE, 0xC6E8 },
+	{ 0xC0A1, 0xC6E9 }, { 0xC0A2, 0xC6EC }, { 0xC0A3, 0xC6F0 }, { 0xC0A4, 0xC6F8 }, { 0xC0A5, 0xC6F9 }, { 0xC0A6, 0xC6FD }, { 0xC0A7, 0xC704 }, { 0xC0A8, 0xC705 },
+	{ 0xC0A9, 0xC708 }, { 0xC0AA, 0xC70C }, { 0xC0AB, 0xC714 }, { 0xC0AC, 0xC715 }, { 0xC0AD, 0xC717 }, { 0xC0AE, 0xC719 }, { 0xC0AF, 0xC720 }, { 0xC0B0, 0xC721 },
+	{ 0xC0B1, 0xC724 }, { 0xC0B2, 0xC728 }, { 0xC0B3, 0xC730 }, { 0xC0B4, 0xC731 }, { 0xC0B5, 0xC733 }, { 0xC0B6, 0xC735 }, { 0xC0B7, 0xC737 }, { 0xC0B8, 0xC73C },
+	{ 0xC0B9, 0xC73D }, { 0xC0BA, 0xC740 }, { 0xC0BB, 0xC744 }, { 0xC0BC, 0xC74A }, { 0xC0BD, 0xC74C }, { 0xC0BE, 0xC74D }, { 0xC0BF, 0xC74F }, { 0xC0C0, 0xC751 },
+	{ 0xC0C1, 0xC752 }, { 0xC0C2, 0xC753 }, { 0xC0C3, 0xC754 }, { 0xC0C4, 0xC755 }, { 0xC0C5, 0xC756 }, { 0xC0C6, 0xC757 }, { 0xC0C7, 0xC758 }, { 0xC0C8, 0xC75C },
+	{ 0xC0C9, 0xC760 }, { 0xC0CA, 0xC768 }, { 0xC0CB, 0xC76B }, { 0xC0CC, 0xC774 }, { 0xC0CD, 0xC775 }, { 0xC0CE, 0xC778 }, { 0xC0CF, 0xC77C }, { 0xC0D0, 0xC77D },
+	{ 0xC0D1, 0xC77E }, { 0xC0D2, 0xC783 }, { 0xC0D3, 0xC784 }, { 0xC0D4, 0xC785 }, { 0xC0D5, 0xC787 }, { 0xC0D6, 0xC788 }, { 0xC0D7, 0xC789 }, { 0xC0D8, 0xC78A },
+	{ 0xC0D9, 0xC78E }, { 0xC0DA, 0xC790 }, { 0xC0DB, 0xC791 }, { 0xC0DC, 0xC794 }, { 0xC0DD, 0xC796 }, { 0xC0DE, 0xC797 }, { 0xC0DF, 0xC798 }, { 0xC0E0, 0xC79A },
+	{ 0xC0E1, 0xC7A0 }, { 0xC0E2, 0xC7A1 }, { 0xC0E3, 0xC7A3 }, { 0xC0E4, 0xC7A4 }, { 0xC0E5, 0xC7A5 }, { 0xC0E6, 0xC7A6 }, { 0xC0E7, 0xC7AC }, { 0xC0E8, 0xC7AD },
+	{ 0xC0E9, 0xC7B0 }, { 0xC0EA, 0xC7B4 }, { 0xC0EB, 0xC7BC }, { 0xC0EC, 0xC7BD }, { 0xC0ED, 0xC7BF }, { 0xC0EE, 0xC7C0 }, { 0xC0EF, 0xC7C1 }, { 0xC0F0, 0xC7C8 },
+	{ 0xC0F1, 0xC7C9 }, { 0xC0F2, 0xC7CC }, { 0xC0F3, 0xC7CE }, { 0xC0F4, 0xC7D0 }, { 0xC0F5, 0xC7D8 }, { 0xC0F6, 0xC7DD }, { 0xC0F7, 0xC7E4 }, { 0xC0F8, 0xC7E8 },
+	{ 0xC0F9, 0xC7EC }, { 0xC0FA, 0xC800 }, { 0xC0FB, 0xC801 }, { 0xC0FC, 0xC804 }, { 0xC0FD, 0xC808 }, { 0xC0FE, 0xC80A }, { 0xC1A1, 0xC810 }, { 0xC1A2, 0xC811 },
+	{ 0xC1A3, 0xC813 }, { 0xC1A4, 0xC815 }, { 0xC1A5, 0xC816 }, { 0xC1A6, 0xC81C }, { 0xC1A7, 0xC81D }, { 0xC1A8, 0xC820 }, { 0xC1A9, 0xC824 }, { 0xC1AA, 0xC82C },
+	{ 0xC1AB, 0xC82D }, { 0xC1AC, 0xC82F }, { 0xC1AD, 0xC831 }, { 0xC1AE, 0xC838 }, { 0xC1AF, 0xC83C }, { 0xC1B0, 0xC840 }, { 0xC1B1, 0xC848 }, { 0xC1B2, 0xC849 },
+	{ 0xC1B3, 0xC84C }, { 0xC1B4, 0xC84D }, { 0xC1B5, 0xC854 }, { 0xC1B6, 0xC870 }, { 0xC1B7, 0xC871 }, { 0xC1B8, 0xC874 }, { 0xC1B9, 0xC878 }, { 0xC1BA, 0xC87A },
+	{ 0xC1BB, 0xC880 }, { 0xC1BC, 0xC881 }, { 0xC1BD, 0xC883 }, { 0xC1BE, 0xC885 }, { 0xC1BF, 0xC886 }, { 0xC1C0, 0xC887 }, { 0xC1C1, 0xC88B }, { 0xC1C2, 0xC88C },
+	{ 0xC1C3, 0xC88D }, { 0xC1C4, 0xC894 }, { 0xC1C5, 0xC89D }, { 0xC1C6, 0xC89F }, { 0xC1C7, 0xC8A1 }, { 0xC1C8, 0xC8A8 }, { 0xC1C9, 0xC8BC }, { 0xC1CA, 0xC8BD },
+	{ 0xC1CB, 0xC8C4 }, { 0xC1CC, 0xC8C8 }, { 0xC1CD, 0xC8CC }, { 0xC1CE, 0xC8D4 }, { 0xC1CF, 0xC8D5 }, { 0xC1D0, 0xC8D7 }, { 0xC1D1, 0xC8D9 }, { 0xC1D2, 0xC8E0 },
+	{ 0xC1D3, 0xC8E1 }, { 0xC1D4, 0xC8E4 }, { 0xC1D5, 0xC8F5 }, { 0xC1D6, 0xC8FC }, { 0xC1D7, 0xC8FD }, { 0xC1D8, 0xC900 }, { 0xC1D9, 0xC904 }, { 0xC1DA, 0xC905 },
+	{ 0xC1DB, 0xC906 }, { 0xC1DC, 0xC90C }, { 0xC1DD, 0xC90D }, { 0xC1DE, 0xC90F }, { 0xC1DF, 0xC911 }, { 0xC1E0, 0xC918 }, { 0xC1E1, 0xC92C }, { 0xC1E2, 0xC934 },
+	{ 0xC1E3, 0xC950 }, { 0xC1E4, 0xC951 }, { 0xC1E5, 0xC954 }, { 0xC1E6, 0xC958 }, { 0xC1E7, 0xC960 }, { 0xC1E8, 0xC961 }, { 0xC1E9, 0xC963 }, { 0xC1EA, 0xC96C },
+	{ 0xC1EB, 0xC970 }, { 0xC1EC, 0xC974 }, { 0xC1ED, 0xC97C }, { 0xC1EE, 0xC988 }, { 0xC1EF, 0xC989 }, { 0xC1F0, 0xC98C }, { 0xC1F1, 0xC990 }, { 0xC1F2, 0xC998 },
+	{ 0xC1F3, 0xC999 }, { 0xC1F4, 0xC99B }, { 0xC1F5, 0xC99D }, { 0xC1F6, 0xC9C0 }, { 0xC1F7, 0xC9C1 }, { 0xC1F8, 0xC9C4 }, { 0xC1F9, 0xC9C7 }, { 0xC1FA, 0xC9C8 },
+	{ 0xC1FB, 0xC9CA }, { 0xC1FC, 0xC9D0 }, { 0xC1FD, 0xC9D1 }, { 0xC1FE, 0xC9D3 }, { 0xC2A1, 0xC9D5 }, { 0xC2A2, 0xC9D6 }, { 0xC2A3, 0xC9D9 }, { 0xC2A4, 0xC9DA },
+	{ 0xC2A5, 0xC9DC }, { 0xC2A6, 0xC9DD }, { 0xC2A7, 0xC9E0 }, { 0xC2A8, 0xC9E2 }, { 0xC2A9, 0xC9E4 }, { 0xC2AA, 0xC9E7 }, { 0xC2AB, 0xC9EC }, { 0xC2AC, 0xC9ED },
+	{ 0xC2AD, 0xC9EF }, { 0xC2AE, 0xC9F0 }, { 0xC2AF, 0xC9F1 }, { 0xC2B0, 0xC9F8 }, { 0xC2B1, 0xC9F9 }, { 0xC2B2, 0xC9FC }, { 0xC2B3, 0xCA00 }, { 0xC2B4, 0xCA08 },
+	{ 0xC2B5, 0xCA09 }, { 0xC2B6, 0xCA0B }, { 0xC2B7, 0xCA0C }, { 0xC2B8, 0xCA0D }, { 0xC2B9, 0xCA14 }, { 0xC2BA, 0xCA18 }, { 0xC2BB, 0xCA29 }, { 0xC2BC, 0xCA4C },
+	{ 0xC2BD, 0xCA4D }, { 0xC2BE, 0xCA50 }, { 0xC2BF, 0xCA54 }, { 0xC2C0, 0xCA5C }, { 0xC2C1, 0xCA5D }, { 0xC2C2, 0xCA5F }, { 0xC2C3, 0xCA60 }, { 0xC2C4, 0xCA61 },
+	{ 0xC2C5, 0xCA68 }, { 0xC2C6, 0xCA7D }, { 0xC2C7, 0xCA84 }, { 0xC2C8, 0xCA98 }, { 0xC2C9, 0xCABC }, { 0xC2CA, 0xCABD }, { 0xC2CB, 0xCAC0 }, { 0xC2CC, 0xCAC4 },
+	{ 0xC2CD, 0xCACC }, { 0xC2CE, 0xCACD }, { 0xC2CF, 0xCACF }, { 0xC2D0, 0xCAD1 }, { 0xC2D1, 0xCAD3 }, { 0xC2D2, 0xCAD8 }, { 0xC2D3, 0xCAD9 }, { 0xC2D4, 0xCAE0 },
+	{ 0xC2D5, 0xCAEC }, { 0xC2D6, 0xCAF4 }, { 0xC2D7, 0xCB08 }, { 0xC2D8, 0xCB10 }, { 0xC2D9, 0xCB14 }, { 0xC2DA, 0xCB18 }, { 0xC2DB, 0xCB20 }, { 0xC2DC, 0xCB21 },
+	{ 0xC2DD, 0xCB41 }, { 0xC2DE, 0xCB48 }, { 0xC2DF, 0xCB49 }, { 0xC2E0, 0xCB4C }, { 0xC2E1, 0xCB50 }, { 0xC2E2, 0xCB58 }, { 0xC2E3, 0xCB59 }, { 0xC2E4, 0xCB5D },
+	{ 0xC2E5, 0xCB64 }, { 0xC2E6, 0xCB78 }, { 0xC2E7, 0xCB79 }, { 0xC2E8, 0xCB9C }, { 0xC2E9, 0xCBB8 }, { 0xC2EA, 0xCBD4 }, { 0xC2EB, 0xCBE4 }, { 0xC2EC, 0xCBE7 },
+	{ 0xC2ED, 0xCBE9 }, { 0xC2EE, 0xCC0C }, { 0xC2EF, 0xCC0D }, { 0xC2F0, 0xCC10 }, { 0xC2F1, 0xCC14 }, { 0xC2F2, 0xCC1C }, { 0xC2F3, 0xCC1D }, { 0xC2F4, 0xCC21 },
+	{ 0xC2F5, 0xCC22 }, { 0xC2F6, 0xCC27 }, { 0xC2F7, 0xCC28 }, { 0xC2F8, 0xCC29 }, { 0xC2F9, 0xCC2C }, { 0xC2FA, 0xCC2E }, { 0xC2FB, 0xCC30 }, { 0xC2FC, 0xCC38 },
+	{ 0xC2FD, 0xCC39 }, { 0xC2FE, 0xCC3B }, { 0xC3A1, 0xCC3C }, { 0xC3A2, 0xCC3D }, { 0xC3A3, 0xCC3E }, { 0xC3A4, 0xCC44 }, { 0xC3A5, 0xCC45 }, { 0xC3A6, 0xCC48 },
+	{ 0xC3A7, 0xCC4C }, { 0xC3A8, 0xCC54 }, { 0xC3A9, 0xCC55 }, { 0xC3AA, 0xCC57 }, { 0xC3AB, 0xCC58 }, { 0xC3AC, 0xCC59 }, { 0xC3AD, 0xCC60 }, { 0xC3AE, 0xCC64 },
+	{ 0xC3AF, 0xCC66 }, { 0xC3B0, 0xCC68 }, { 0xC3B1, 0xCC70 }, { 0xC3B2, 0xCC75 }, { 0xC3B3, 0xCC98 }, { 0xC3B4, 0xCC99 }, { 0xC3B5, 0xCC9C }, { 0xC3B6, 0xCCA0 },
+	{ 0xC3B7, 0xCCA8 }, { 0xC3B8, 0xCCA9 }, { 0xC3B9, 0xCCAB }, { 0xC3BA, 0xCCAC }, { 0xC3BB, 0xCCAD }, { 0xC3BC, 0xCCB4 }, { 0xC3BD, 0xCCB5 }, { 0xC3BE, 0xCCB8 },
+	{ 0xC3BF, 0xCCBC }, { 0xC3C0, 0xCCC4 }, { 0xC3C1, 0xCCC5 }, { 0xC3C2, 0xCCC7 }, { 0xC3C3, 0xCCC9 }, { 0xC3C4, 0xCCD0 }, { 0xC3C5, 0xCCD4 }, { 0xC3C6, 0xCCE4 },
+	{ 0xC3C7, 0xCCEC }, { 0xC3C8, 0xCCF0 }, { 0xC3C9, 0xCD01 }, { 0xC3CA, 0xCD08 }, { 0xC3CB, 0xCD09 }, { 0xC3CC, 0xCD0C }, { 0xC3CD, 0xCD10 }, { 0xC3CE, 0xCD18 },
+	{ 0xC3CF, 0xCD19 }, { 0xC3D0, 0xCD1B }, { 0xC3D1, 0xCD1D }, { 0xC3D2, 0xCD24 }, { 0xC3D3, 0xCD28 }, { 0xC3D4, 0xCD2C }, { 0xC3D5, 0xCD39 }, { 0xC3D6, 0xCD5C },
+	{ 0xC3D7, 0xCD60 }, { 0xC3D8, 0xCD64 }, { 0xC3D9, 0xCD6C }, { 0xC3DA, 0xCD6D }, { 0xC3DB, 0xCD6F }, { 0xC3DC, 0xCD71 }, { 0xC3DD, 0xCD78 }, { 0xC3DE, 0xCD88 },
+	{ 0xC3DF, 0xCD94 }, { 0xC3E0, 0xCD95 }, { 0xC3E1, 0xCD98 }, { 0xC3E2, 0xCD9C }, { 0xC3E3, 0xCDA4 }, { 0xC3E4, 0xCDA5 }, { 0xC3E5, 0xCDA7 }, { 0xC3E6, 0xCDA9 },
+	{ 0xC3E7, 0xCDB0 }, { 0xC3E8, 0xCDC4 }, { 0xC3E9, 0xCDCC }, { 0xC3EA, 0xCDD0 }, { 0xC3EB, 0xCDE8 }, { 0xC3EC, 0xCDEC }, { 0xC3ED, 0xCDF0 }, { 0xC3EE, 0xCDF8 },
+	{ 0xC3EF, 0xCDF9 }, { 0xC3F0, 0xCDFB }, { 0xC3F1, 0xCDFD }, { 0xC3F2, 0xCE04 }, { 0xC3F3, 0xCE08 }, { 0xC3F4, 0xCE0C }, { 0xC3F5, 0xCE14 }, { 0xC3F6, 0xCE19 },
+	{ 0xC3F7, 0xCE20 }, { 0xC3F8, 0xCE21 }, { 0xC3F9, 0xCE24 }, { 0xC3FA, 0xCE28 }, { 0xC3FB, 0xCE30 }, { 0xC3FC, 0xCE31 }, { 0xC3FD, 0xCE33 }, { 0xC3FE, 0xCE35 },
+	{ 0xC4A1, 0xCE58 }, { 0xC4A2, 0xCE59 }, { 0xC4A3, 0xCE5C }, { 0xC4A4, 0xCE5F }, { 0xC4A5, 0xCE60 }, { 0xC4A6, 0xCE61 }, { 0xC4A7, 0xCE68 }, { 0xC4A8, 0xCE69 },
+	{ 0xC4A9, 0xCE6B }, { 0xC4AA, 0xCE6D }, { 0xC4AB, 0xCE74 }, { 0xC4AC, 0xCE75 }, { 0xC4AD, 0xCE78 }, { 0xC4AE, 0xCE7C }, { 0xC4AF, 0xCE84 }, { 0xC4B0, 0xCE85 },
+	{ 0xC4B1, 0xCE87 }, { 0xC4B2, 0xCE89 }, { 0xC4B3, 0xCE90 }, { 0xC4B4, 0xCE91 }, { 0xC4B5, 0xCE94 }, { 0xC4B6, 0xCE98 }, { 0xC4B7, 0xCEA0 }, { 0xC4B8, 0xCEA1 },
+	{ 0xC4B9, 0xCEA3 }, { 0xC4BA, 0xCEA4 }, { 0xC4BB, 0xCEA5 }, { 0xC4BC, 0xCEAC }, { 0xC4BD, 0xCEAD }, { 0xC4BE, 0xCEC1 }, { 0xC4BF, 0xCEE4 }, { 0xC4C0, 0xCEE5 },
+	{ 0xC4C1, 0xCEE8 }, { 0xC4C2, 0xCEEB }, { 0xC4C3, 0xCEEC }, { 0xC4C4, 0xCEF4 }, { 0xC4C5, 0xCEF5 }, { 0xC4C6, 0xCEF7 }, { 0xC4C7, 0xCEF8 }, { 0xC4C8, 0xCEF9 },
+	{ 0xC4C9, 0xCF00 }, { 0xC4CA, 0xCF01 }, { 0xC4CB, 0xCF04 }, { 0xC4CC, 0xCF08 }, { 0xC4CD, 0xCF10 }, { 0xC4CE, 0xCF11 }, { 0xC4CF, 0xCF13 }, { 0xC4D0, 0xCF15 },
+	{ 0xC4D1, 0xCF1C }, { 0xC4D2, 0xCF20 }, { 0xC4D3, 0xCF24 }, { 0xC4D4, 0xCF2C }, { 0xC4D5, 0xCF2D }, { 0xC4D6, 0xCF2F }, { 0xC4D7, 0xCF30 }, { 0xC4D8, 0xCF31 },
+	{ 0xC4D9, 0xCF38 }, { 0xC4DA, 0xCF54 }, { 0xC4DB, 0xCF55 }, { 0xC4DC, 0xCF58 }, { 0xC4DD, 0xCF5C }, { 0xC4DE, 0xCF64 }, { 0xC4DF, 0xCF65 }, { 0xC4E0, 0xCF67 },
+	{ 0xC4E1, 0xCF69 }, { 0xC4E2, 0xCF70 }, { 0xC4E3, 0xCF71 }, { 0xC4E4, 0xCF74 }, { 0xC4E5, 0xCF78 }, { 0xC4E6, 0xCF80 }, { 0xC4E7, 0xCF85 }, { 0xC4E8, 0xCF8C },
+	{ 0xC4E9, 0xCFA1 }, { 0xC4EA, 0xCFA8 }, { 0xC4EB, 0xCFB0 }, { 0xC4EC, 0xCFC4 }, { 0xC4ED, 0xCFE0 }, { 0xC4EE, 0xCFE1 }, { 0xC4EF, 0xCFE4 }, { 0xC4F0, 0xCFE8 },
+	{ 0xC4F1, 0xCFF0 }, { 0xC4F2, 0xCFF1 }, { 0xC4F3, 0xCFF3 }, { 0xC4F4, 0xCFF5 }, { 0xC4F5, 0xCFFC }, { 0xC4F6, 0xD000 }, { 0xC4F7, 0xD004 }, { 0xC4F8, 0xD011 },
+	{ 0xC4F9, 0xD018 }, { 0xC4FA, 0xD02D }, { 0xC4FB, 0xD034 }, { 0xC4FC, 0xD035 }, { 0xC4FD, 0xD038 }, { 0xC4FE, 0xD03C }, { 0xC5A1, 0xD044 }, { 0xC5A2, 0xD045 },
+	{ 0xC5A3, 0xD047 }, { 0xC5A4, 0xD049 }, { 0xC5A5, 0xD050 }, { 0xC5A6, 0xD054 }, { 0xC5A7, 0xD058 }, { 0xC5A8, 0xD060 }, { 0xC5A9, 0xD06C }, { 0xC5AA, 0xD06D },
+	{ 0xC5AB, 0xD070 }, { 0xC5AC, 0xD074 }, { 0xC5AD, 0xD07C }, { 0xC5AE, 0xD07D }, { 0xC5AF, 0xD081 }, { 0xC5B0, 0xD0A4 }, { 0xC5B1, 0xD0A5 }, { 0xC5B2, 0xD0A8 },
+	{ 0xC5B3, 0xD0AC }, { 0xC5B4, 0xD0B4 }, { 0xC5B5, 0xD0B5 }, { 0xC5B6, 0xD0B7 }, { 0xC5B7, 0xD0B9 }, { 0xC5B8, 0xD0C0 }, { 0xC5B9, 0xD0C1 }, { 0xC5BA, 0xD0C4 },
+	{ 0xC5BB, 0xD0C8 }, { 0xC5BC, 0xD0C9 }, { 0xC5BD, 0xD0D0 }, { 0xC5BE, 0xD0D1 }, { 0xC5BF, 0xD0D3 }, { 0xC5C0, 0xD0D4 }, { 0xC5C1, 0xD0D5 }, { 0xC5C2, 0xD0DC },
+	{ 0xC5C3, 0xD0DD }, { 0xC5C4, 0xD0E0 }, { 0xC5C5, 0xD0E4 }, { 0xC5C6, 0xD0EC }, { 0xC5C7, 0xD0ED }, { 0xC5C8, 0xD0EF }, { 0xC5C9, 0xD0F0 }, { 0xC5CA, 0xD0F1 },
+	{ 0xC5CB, 0xD0F8 }, { 0xC5CC, 0xD10D }, { 0xC5CD, 0xD130 }, { 0xC5CE, 0xD131 }, { 0xC5CF, 0xD134 }, { 0xC5D0, 0xD138 }, { 0xC5D1, 0xD13A }, { 0xC5D2, 0xD140 },
+	{ 0xC5D3, 0xD141 }, { 0xC5D4, 0xD143 }, { 0xC5D5, 0xD144 }, { 0xC5D6, 0xD145 }, { 0xC5D7, 0xD14C }, { 0xC5D8, 0xD14D }, { 0xC5D9, 0xD150 }, { 0xC5DA, 0xD154 },
+	{ 0xC5DB, 0xD15C }, { 0xC5DC, 0xD15D }, { 0xC5DD, 0xD15F }, { 0xC5DE, 0xD161 }, { 0xC5DF, 0xD168 }, { 0xC5E0, 0xD16C }, { 0xC5E1, 0xD17C }, { 0xC5E2, 0xD184 },
+	{ 0xC5E3, 0xD188 }, { 0xC5E4, 0xD1A0 }, { 0xC5E5, 0xD1A1 }, { 0xC5E6, 0xD1A4 }, { 0xC5E7, 0xD1A8 }, { 0xC5E8, 0xD1B0 }, { 0xC5E9, 0xD1B1 }, { 0xC5EA, 0xD1B3 },
+	{ 0xC5EB, 0xD1B5 }, { 0xC5EC, 0xD1BA }, { 0xC5ED, 0xD1BC }, { 0xC5EE, 0xD1C0 }, { 0xC5EF, 0xD1D8 }, { 0xC5F0, 0xD1F4 }, { 0xC5F1, 0xD1F8 }, { 0xC5F2, 0xD207 },
+	{ 0xC5F3, 0xD209 }, { 0xC5F4, 0xD210 }, { 0xC5F5, 0xD22C }, { 0xC5F6, 0xD22D }, { 0xC5F7, 0xD230 }, { 0xC5F8, 0xD234 }, { 0xC5F9, 0xD23C }, { 0xC5FA, 0xD23D },
+	{ 0xC5FB, 0xD23F }, { 0xC5FC, 0xD241 }, { 0xC5FD, 0xD248 }, { 0xC5FE, 0xD25C }, { 0xC6A1, 0xD264 }, { 0xC6A2, 0xD280 }, { 0xC6A3, 0xD281 }, { 0xC6A4, 0xD284 },
+	{ 0xC6A5, 0xD288 }, { 0xC6A6, 0xD290 }, { 0xC6A7, 0xD291 }, { 0xC6A8, 0xD295 }, { 0xC6A9, 0xD29C }, { 0xC6AA, 0xD2A0 }, { 0xC6AB, 0xD2A4 }, { 0xC6AC, 0xD2AC },
+	{ 0xC6AD, 0xD2B1 }, { 0xC6AE, 0xD2B8 }, { 0xC6AF, 0xD2B9 }, { 0xC6B0, 0xD2BC }, { 0xC6B1, 0xD2BF }, { 0xC6B2, 0xD2C0 }, { 0xC6B3, 0xD2C2 }, { 0xC6B4, 0xD2C8 },
+	{ 0xC6B5, 0xD2C9 }, { 0xC6B6, 0xD2CB }, { 0xC6B7, 0xD2D4 }, { 0xC6B8, 0xD2D8 }, { 0xC6B9, 0xD2DC }, { 0xC6BA, 0xD2E4 }, { 0xC6BB, 0xD2E5 }, { 0xC6BC, 0xD2F0 },
+	{ 0xC6BD, 0xD2F1 }, { 0xC6BE, 0xD2F4 }, { 0xC6BF, 0xD2F8 }, { 0xC6C0, 0xD300 }, { 0xC6C1, 0xD301 }, { 0xC6C2, 0xD303 }, { 0xC6C3, 0xD305 }, { 0xC6C4, 0xD30C },
+	{ 0xC6C5, 0xD30D }, { 0xC6C6, 0xD30E }, { 0xC6C7, 0xD310 }, { 0xC6C8, 0xD314 }, { 0xC6C9, 0xD316 }, { 0xC6CA, 0xD31C }, { 0xC6CB, 0xD31D }, { 0xC6CC, 0xD31F },
+	{ 0xC6CD, 0xD320 }, { 0xC6CE, 0xD321 }, { 0xC6CF, 0xD325 }, { 0xC6D0, 0xD328 }, { 0xC6D1, 0xD329 }, { 0xC6D2, 0xD32C }, { 0xC6D3, 0xD330 }, { 0xC6D4, 0xD338 },
+	{ 0xC6D5, 0xD339 }, { 0xC6D6, 0xD33B }, { 0xC6D7, 0xD33C }, { 0xC6D8, 0xD33D }, { 0xC6D9, 0xD344 }, { 0xC6DA, 0xD345 }, { 0xC6DB, 0xD37C }, { 0xC6DC, 0xD37D },
+	{ 0xC6DD, 0xD380 }, { 0xC6DE, 0xD384 }, { 0xC6DF, 0xD38C }, { 0xC6E0, 0xD38D }, { 0xC6E1, 0xD38F }, { 0xC6E2, 0xD390 }, { 0xC6E3, 0xD391 }, { 0xC6E4, 0xD398 },
+	{ 0xC6E5, 0xD399 }, { 0xC6E6, 0xD39C }, { 0xC6E7, 0xD3A0 }, { 0xC6E8, 0xD3A8 }, { 0xC6E9, 0xD3A9 }, { 0xC6EA, 0xD3AB }, { 0xC6EB, 0xD3AD }, { 0xC6EC, 0xD3B4 },
+	{ 0xC6ED, 0xD3B8 }, { 0xC6EE, 0xD3BC }, { 0xC6EF, 0xD3C4 }, { 0xC6F0, 0xD3C5 }, { 0xC6F1, 0xD3C8 }, { 0xC6F2, 0xD3C9 }, { 0xC6F3, 0xD3D0 }, { 0xC6F4, 0xD3D8 },
+	{ 0xC6F5, 0xD3E1 }, { 0xC6F6, 0xD3E3 }, { 0xC6F7, 0xD3EC }, { 0xC6F8, 0xD3ED }, { 0xC6F9, 0xD3F0 }, { 0xC6FA, 0xD3F4 }, { 0xC6FB, 0xD3FC }, { 0xC6FC, 0xD3FD },
+	{ 0xC6FD, 0xD3FF }, { 0xC6FE, 0xD401 }, { 0xC7A1, 0xD408 }, { 0xC7A2, 0xD41D }, { 0xC7A3, 0xD440 }, { 0xC7A4, 0xD444 }, { 0xC7A5, 0xD45C }, { 0xC7A6, 0xD460 },
+	{ 0xC7A7, 0xD464 }, { 0xC7A8, 0xD46D }, { 0xC7A9, 0xD46F }, { 0xC7AA, 0xD478 }, { 0xC7AB, 0xD479 }, { 0xC7AC, 0xD47C }, { 0xC7AD, 0xD47F }, { 0xC7AE, 0xD480 },
+	{ 0xC7AF, 0xD482 }, { 0xC7B0, 0xD488 }, { 0xC7B1, 0xD489 }, { 0xC7B2, 0xD48B }, { 0xC7B3, 0xD48D }, { 0xC7B4, 0xD494 }, { 0xC7B5, 0xD4A9 }, { 0xC7B6, 0xD4CC },
+	{ 0xC7B7, 0xD4D0 }, { 0xC7B8, 0xD4D4 }, { 0xC7B9, 0xD4DC }, { 0xC7BA, 0xD4DF }, { 0xC7BB, 0xD4E8 }, { 0xC7BC, 0xD4EC }, { 0xC7BD, 0xD4F0 }, { 0xC7BE, 0xD4F8 },
+	{ 0xC7BF, 0xD4FB }, { 0xC7C0, 0xD4FD }, { 0xC7C1, 0xD504 }, { 0xC7C2, 0xD508 }, { 0xC7C3, 0xD50C }, { 0xC7C4, 0xD514 }, { 0xC7C5, 0xD515 }, { 0xC7C6, 0xD517 },
+	{ 0xC7C7, 0xD53C }, { 0xC7C8, 0xD53D }, { 0xC7C9, 0xD540 }, { 0xC7CA, 0xD544 }, { 0xC7CB, 0xD54C }, { 0xC7CC, 0xD54D }, { 0xC7CD, 0xD54F }, { 0xC7CE, 0xD551 },
+	{ 0xC7CF, 0xD558 }, { 0xC7D0, 0xD559 }, { 0xC7D1, 0xD55C }, { 0xC7D2, 0xD560 }, { 0xC7D3, 0xD565 }, { 0xC7D4, 0xD568 }, { 0xC7D5, 0xD569 }, { 0xC7D6, 0xD56B },
+	{ 0xC7D7, 0xD56D }, { 0xC7D8, 0xD574 }, { 0xC7D9, 0xD575 }, { 0xC7DA, 0xD578 }, { 0xC7DB, 0xD57C }, { 0xC7DC, 0xD584 }, { 0xC7DD, 0xD585 }, { 0xC7DE, 0xD587 },
+	{ 0xC7DF, 0xD588 }, { 0xC7E0, 0xD589 }, { 0xC7E1, 0xD590 }, { 0xC7E2, 0xD5A5 }, { 0xC7E3, 0xD5C8 }, { 0xC7E4, 0xD5C9 }, { 0xC7E5, 0xD5CC }, { 0xC7E6, 0xD5D0 },
+	{ 0xC7E7, 0xD5D2 }, { 0xC7E8, 0xD5D8 }, { 0xC7E9, 0xD5D9 }, { 0xC7EA, 0xD5DB }, { 0xC7EB, 0xD5DD }, { 0xC7EC, 0xD5E4 }, { 0xC7ED, 0xD5E5 }, { 0xC7EE, 0xD5E8 },
+	{ 0xC7EF, 0xD5EC }, { 0xC7F0, 0xD5F4 }, { 0xC7F1, 0xD5F5 }, { 0xC7F2, 0xD5F7 }, { 0xC7F3, 0xD5F9 }, { 0xC7F4, 0xD600 }, { 0xC7F5, 0xD601 }, { 0xC7F6, 0xD604 },
+	{ 0xC7F7, 0xD608 }, { 0xC7F8, 0xD610 }, { 0xC7F9, 0xD611 }, { 0xC7FA, 0xD613 }, { 0xC7FB, 0xD614 }, { 0xC7FC, 0xD615 }, { 0xC7FD, 0xD61C }, { 0xC7FE, 0xD620 },
+	{ 0xC8A1, 0xD624 }, { 0xC8A2, 0xD62D }, { 0xC8A3, 0xD638 }, { 0xC8A4, 0xD639 }, { 0xC8A5, 0xD63C }, { 0xC8A6, 0xD640 }, { 0xC8A7, 0xD645 }, { 0xC8A8, 0xD648 },
+	{ 0xC8A9, 0xD649 }, { 0xC8AA, 0xD64B }, { 0xC8AB, 0xD64D }, { 0xC8AC, 0xD651 }, { 0xC8AD, 0xD654 }, { 0xC8AE, 0xD655 }, { 0xC8AF, 0xD658 }, { 0xC8B0, 0xD65C },
+	{ 0xC8B1, 0xD667 }, { 0xC8B2, 0xD669 }, { 0xC8B3, 0xD670 }, { 0xC8B4, 0xD671 }, { 0xC8B5, 0xD674 }, { 0xC8B6, 0xD683 }, { 0xC8B7, 0xD685 }, { 0xC8B8, 0xD68C },
+	{ 0xC8B9, 0xD68D }, { 0xC8BA, 0xD690 }, { 0xC8BB, 0xD694 }, { 0xC8BC, 0xD69D }, { 0xC8BD, 0xD69F }, { 0xC8BE, 0xD6A1 }, { 0xC8BF, 0xD6A8 }, { 0xC8C0, 0xD6AC },
+	{ 0xC8C1, 0xD6B0 }, { 0xC8C2, 0xD6B9 }, { 0xC8C3, 0xD6BB }, { 0xC8C4, 0xD6C4 }, { 0xC8C5, 0xD6C5 }, { 0xC8C6, 0xD6C8 }, { 0xC8C7, 0xD6CC }, { 0xC8C8, 0xD6D1 },
+	{ 0xC8C9, 0xD6D4 }, { 0xC8CA, 0xD6D7 }, { 0xC8CB, 0xD6D9 }, { 0xC8CC, 0xD6E0 }, { 0xC8CD, 0xD6E4 }, { 0xC8CE, 0xD6E8 }, { 0xC8CF, 0xD6F0 }, { 0xC8D0, 0xD6F5 },
+	{ 0xC8D1, 0xD6FC }, { 0xC8D2, 0xD6FD }, { 0xC8D3, 0xD700 }, { 0xC8D4, 0xD704 }, { 0xC8D5, 0xD711 }, { 0xC8D6, 0xD718 }, { 0xC8D7, 0xD719 }, { 0xC8D8, 0xD71C },
+	{ 0xC8D9, 0xD720 }, { 0xC8DA, 0xD728 }, { 0xC8DB, 0xD729 }, { 0xC8DC, 0xD72B }, { 0xC8DD, 0xD72D }, { 0xC8DE, 0xD734 }, { 0xC8DF, 0xD735 }, { 0xC8E0, 0xD738 },
+	{ 0xC8E1, 0xD73C }, { 0xC8E2, 0xD744 }, { 0xC8E3, 0xD747 }, { 0xC8E4, 0xD749 }, { 0xC8E5, 0xD750 }, { 0xC8E6, 0xD751 }, { 0xC8E7, 0xD754 }, { 0xC8E8, 0xD756 },
+	{ 0xC8E9, 0xD757 }, { 0xC8EA, 0xD758 }, { 0xC8EB, 0xD759 }, { 0xC8EC, 0xD760 }, { 0xC8ED, 0xD761 }, { 0xC8EE, 0xD763 }, { 0xC8EF, 0xD765 }, { 0xC8F0, 0xD769 },
+	{ 0xC8F1, 0xD76C }, { 0xC8F2, 0xD770 }, { 0xC8F3, 0xD774 }, { 0xC8F4, 0xD77C }, { 0xC8F5, 0xD77D }, { 0xC8F6, 0xD781 }, { 0xC8F7, 0xD788 }, { 0xC8F8, 0xD789 },
+	{ 0xC8F9, 0xD78C }, { 0xC8FA, 0xD790 }, { 0xC8FB, 0xD798 }, { 0xC8FC, 0xD799 }, { 0xC8FD, 0xD79B }, { 0xC8FE, 0xD79D }, { 0xCAA1, 0x4F3D }, { 0xCAA2, 0x4F73 },
+	{ 0xCAA3, 0x5047 }, { 0xCAA4, 0x50F9 }, { 0xCAA5, 0x52A0 }, { 0xCAA6, 0x53EF }, { 0xCAA7, 0x5475 }, { 0xCAA8, 0x54E5 }, { 0xCAA9, 0x5609 }, { 0xCAAA, 0x5AC1 },
+	{ 0xCAAB, 0x5BB6 }, { 0xCAAC, 0x6687 }, { 0xCAAD, 0x67B6 }, { 0xCAAE, 0x67B7 }, { 0xCAAF, 0x67EF }, { 0xCAB0, 0x6B4C }, { 0xCAB1, 0x73C2 }, { 0xCAB2, 0x75C2 },
+	{ 0xCAB3, 0x7A3C }, { 0xCAB4, 0x82DB }, { 0xCAB5, 0x8304 }, { 0xCAB6, 0x8857 }, { 0xCAB7, 0x8888 }, { 0xCAB8, 0x8A36 }, { 0xCAB9, 0x8CC8 }, { 0xCABA, 0x8DCF },
+	{ 0xCABB, 0x8EFB }, { 0xCABC, 0x8FE6 }, { 0xCABD, 0x99D5 }, { 0xCABE, 0x523B }, { 0xCABF, 0x5374 }, { 0xCAC0, 0x5404 }, { 0xCAC1, 0x606A }, { 0xCAC2, 0x6164 },
+	{ 0xCAC3, 0x6BBC }, { 0xCAC4, 0x73CF }, { 0xCAC5, 0x811A }, { 0xCAC6, 0x89BA }, { 0xCAC7, 0x89D2 }, { 0xCAC8, 0x95A3 }, { 0xCAC9, 0x4F83 }, { 0xCACA, 0x520A },
+	{ 0xCACB, 0x58BE }, { 0xCACC, 0x5978 }, { 0xCACD, 0x59E6 }, { 0xCACE, 0x5E72 }, { 0xCACF, 0x5E79 }, { 0xCAD0, 0x61C7 }, { 0xCAD1, 0x63C0 }, { 0xCAD2, 0x6746 },
+	{ 0xCAD3, 0x67EC }, { 0xCAD4, 0x687F }, { 0xCAD5, 0x6F97 }, { 0xCAD6, 0x764E }, { 0xCAD7, 0x770B }, { 0xCAD8, 0x78F5 }, { 0xCAD9, 0x7A08 }, { 0xCADA, 0x7AFF },
+	{ 0xCADB, 0x7C21 }, { 0xCADC, 0x809D }, { 0xCADD, 0x826E }, { 0xCADE, 0x8271 }, { 0xCADF, 0x8AEB }, { 0xCAE0, 0x9593 }, { 0xCAE1, 0x4E6B }, { 0xCAE2, 0x559D },
+	{ 0xCAE3, 0x66F7 }, { 0xCAE4, 0x6E34 }, { 0xCAE5, 0x78A3 }, { 0xCAE6, 0x7AED }, { 0xCAE7, 0x845B }, { 0xCAE8, 0x8910 }, { 0xCAE9, 0x874E }, { 0xCAEA, 0x97A8 },
+	{ 0xCAEB, 0x52D8 }, { 0xCAEC, 0x574E }, { 0xCAED, 0x582A }, { 0xCAEE, 0x5D4C }, { 0xCAEF, 0x611F }, { 0xCAF0, 0x61BE }, { 0xCAF1, 0x6221 }, { 0xCAF2, 0x6562 },
+	{ 0xCAF3, 0x67D1 }, { 0xCAF4, 0x6A44 }, { 0xCAF5, 0x6E1B }, { 0xCAF6, 0x7518 }, { 0xCAF7, 0x75B3 }, { 0xCAF8, 0x76E3 }, { 0xCAF9, 0x77B0 }, { 0xCAFA, 0x7D3A },
+	{ 0xCAFB, 0x90AF }, { 0xCAFC, 0x9451 }, { 0xCAFD, 0x9452 }, { 0xCAFE, 0x9F95 }, { 0xCBA1, 0x5323 }, { 0xCBA2, 0x5CAC }, { 0xCBA3, 0x7532 }, { 0xCBA4, 0x80DB },
+	{ 0xCBA5, 0x9240 }, { 0xCBA6, 0x9598 }, { 0xCBA7, 0x525B }, { 0xCBA8, 0x5808 }, { 0xCBA9, 0x59DC }, { 0xCBAA, 0x5CA1 }, { 0xCBAB, 0x5D17 }, { 0xCBAC, 0x5EB7 },
+	{ 0xCBAD, 0x5F3A }, { 0xCBAE, 0x5F4A }, { 0xCBAF, 0x6177 }, { 0xCBB0, 0x6C5F }, { 0xCBB1, 0x757A }, { 0xCBB2, 0x7586 }, { 0xCBB3, 0x7CE0 }, { 0xCBB4, 0x7D73 },
+	{ 0xCBB5, 0x7DB1 }, { 0xCBB6, 0x7F8C }, { 0xCBB7, 0x8154 }, { 0xCBB8, 0x8221 }, { 0xCBB9, 0x8591 }, { 0xCBBA, 0x8941 }, { 0xCBBB, 0x8B1B }, { 0xCBBC, 0x92FC },
+	{ 0xCBBD, 0x964D }, { 0xCBBE, 0x9C47 }, { 0xCBBF, 0x4ECB }, { 0xCBC0, 0x4EF7 }, { 0xCBC1, 0x500B }, { 0xCBC2, 0x51F1 }, { 0xCBC3, 0x584F }, { 0xCBC4, 0x6137 },
+	{ 0xCBC5, 0x613E }, { 0xCBC6, 0x6168 }, { 0xCBC7, 0x6539 }, { 0xCBC8, 0x69EA }, { 0xCBC9, 0x6F11 }, { 0xCBCA, 0x75A5 }, { 0xCBCB, 0x7686 }, { 0xCBCC, 0x76D6 },
+	{ 0xCBCD, 0x7B87 }, { 0xCBCE, 0x82A5 }, { 0xCBCF, 0x84CB }, { 0xCBD0, 0xF900 }, { 0xCBD1, 0x93A7 }, { 0xCBD2, 0x958B }, { 0xCBD3, 0x5580 }, { 0xCBD4, 0x5BA2 },
+	{ 0xCBD5, 0x5751 }, { 0xCBD6, 0xF901 }, { 0xCBD7, 0x7CB3 }, { 0xCBD8, 0x7FB9 }, { 0xCBD9, 0x91B5 }, { 0xCBDA, 0x5028 }, { 0xCBDB, 0x53BB }, { 0xCBDC, 0x5C45 },
+	{ 0xCBDD, 0x5DE8 }, { 0xCBDE, 0x62D2 }, { 0xCBDF, 0x636E }, { 0xCBE0, 0x64DA }, { 0xCBE1, 0x64E7 }, { 0xCBE2, 0x6E20 }, { 0xCBE3, 0x70AC }, { 0xCBE4, 0x795B },
+	{ 0xCBE5, 0x8DDD }, { 0xCBE6, 0x8E1E }, { 0xCBE7, 0xF902 }, { 0xCBE8, 0x907D }, { 0xCBE9, 0x9245 }, { 0xCBEA, 0x92F8 }, { 0xCBEB, 0x4E7E }, { 0xCBEC, 0x4EF6 },
+	{ 0xCBED, 0x5065 }, { 0xCBEE, 0x5DFE }, { 0xCBEF, 0x5EFA }, { 0xCBF0, 0x6106 }, { 0xCBF1, 0x6957 }, { 0xCBF2, 0x8171 }, { 0xCBF3, 0x8654 }, { 0xCBF4, 0x8E47 },
+	{ 0xCBF5, 0x9375 }, { 0xCBF6, 0x9A2B }, { 0xCBF7, 0x4E5E }, { 0xCBF8, 0x5091 }, { 0xCBF9, 0x6770 }, { 0xCBFA, 0x6840 }, { 0xCBFB, 0x5109 }, { 0xCBFC, 0x528D },
+	{ 0xCBFD, 0x5292 }, { 0xCBFE, 0x6AA2 }, { 0xCCA1, 0x77BC }, { 0xCCA2, 0x9210 }, { 0xCCA3, 0x9ED4 }, { 0xCCA4, 0x52AB }, { 0xCCA5, 0x602F }, { 0xCCA6, 0x8FF2 },
+	{ 0xCCA7, 0x5048 }, { 0xCCA8, 0x61A9 }, { 0xCCA9, 0x63ED }, { 0xCCAA, 0x64CA }, { 0xCCAB, 0x683C }, { 0xCCAC, 0x6A84 }, { 0xCCAD, 0x6FC0 }, { 0xCCAE, 0x8188 },
+	{ 0xCCAF, 0x89A1 }, { 0xCCB0, 0x9694 }, { 0xCCB1, 0x5805 }, { 0xCCB2, 0x727D }, { 0xCCB3, 0x72AC }, { 0xCCB4, 0x7504 }, { 0xCCB5, 0x7D79 }, { 0xCCB6, 0x7E6D },
+	{ 0xCCB7, 0x80A9 }, { 0xCCB8, 0x898B }, { 0xCCB9, 0x8B74 }, { 0xCCBA, 0x9063 }, { 0xCCBB, 0x9D51 }, { 0xCCBC, 0x6289 }, { 0xCCBD, 0x6C7A }, { 0xCCBE, 0x6F54 },
+	{ 0xCCBF, 0x7D50 }, { 0xCCC0, 0x7F3A }, { 0xCCC1, 0x8A23 }, { 0xCCC2, 0x517C }, { 0xCCC3, 0x614A }, { 0xCCC4, 0x7B9D }, { 0xCCC5, 0x8B19 }, { 0xCCC6, 0x9257 },
+	{ 0xCCC7, 0x938C }, { 0xCCC8, 0x4EAC }, { 0xCCC9, 0x4FD3 }, { 0xCCCA, 0x501E }, { 0xCCCB, 0x50BE }, { 0xCCCC, 0x5106 }, { 0xCCCD, 0x52C1 }, { 0xCCCE, 0x52CD },
+	{ 0xCCCF, 0x537F }, { 0xCCD0, 0x5770 }, { 0xCCD1, 0x5883 }, { 0xCCD2, 0x5E9A }, { 0xCCD3, 0x5F91 }, { 0xCCD4, 0x6176 }, { 0xCCD5, 0x61AC }, { 0xCCD6, 0x64CE },
+	{ 0xCCD7, 0x656C }, { 0xCCD8, 0x666F }, { 0xCCD9, 0x66BB }, { 0xCCDA, 0x66F4 }, { 0xCCDB, 0x6897 }, { 0xCCDC, 0x6D87 }, { 0xCCDD, 0x7085 }, { 0xCCDE, 0x70F1 },
+	{ 0xCCDF, 0x749F }, { 0xCCE0, 0x74A5 }, { 0xCCE1, 0x74CA }, { 0xCCE2, 0x75D9 }, { 0xCCE3, 0x786C }, { 0xCCE4, 0x78EC }, { 0xCCE5, 0x7ADF }, { 0xCCE6, 0x7AF6 },
+	{ 0xCCE7, 0x7D45 }, { 0xCCE8, 0x7D93 }, { 0xCCE9, 0x8015 }, { 0xCCEA, 0x803F }, { 0xCCEB, 0x811B }, { 0xCCEC, 0x8396 }, { 0xCCED, 0x8B66 }, { 0xCCEE, 0x8F15 },
+	{ 0xCCEF, 0x9015 }, { 0xCCF0, 0x93E1 }, { 0xCCF1, 0x9803 }, { 0xCCF2, 0x9838 }, { 0xCCF3, 0x9A5A }, { 0xCCF4, 0x9BE8 }, { 0xCCF5, 0x4FC2 }, { 0xCCF6, 0x5553 },
+	{ 0xCCF7, 0x583A }, { 0xCCF8, 0x5951 }, { 0xCCF9, 0x5B63 }, { 0xCCFA, 0x5C46 }, { 0xCCFB, 0x60B8 }, { 0xCCFC, 0x6212 }, { 0xCCFD, 0x6842 }, { 0xCCFE, 0x68B0 },
+	{ 0xCDA1, 0x68E8 }, { 0xCDA2, 0x6EAA }, { 0xCDA3, 0x754C }, { 0xCDA4, 0x7678 }, { 0xCDA5, 0x78CE }, { 0xCDA6, 0x7A3D }, { 0xCDA7, 0x7CFB }, { 0xCDA8, 0x7E6B },
+	{ 0xCDA9, 0x7E7C }, { 0xCDAA, 0x8A08 }, { 0xCDAB, 0x8AA1 }, { 0xCDAC, 0x8C3F }, { 0xCDAD, 0x968E }, { 0xCDAE, 0x9DC4 }, { 0xCDAF, 0x53E4 }, { 0xCDB0, 0x53E9 },
+	{ 0xCDB1, 0x544A }, { 0xCDB2, 0x5471 }, { 0xCDB3, 0x56FA }, { 0xCDB4, 0x59D1 }, { 0xCDB5, 0x5B64 }, { 0xCDB6, 0x5C3B }, { 0xCDB7, 0x5EAB }, { 0xCDB8, 0x62F7 },
+	{ 0xCDB9, 0x6537 }, { 0xCDBA, 0x6545 }, { 0xCDBB, 0x6572 }, { 0xCDBC, 0x66A0 }, { 0xCDBD, 0x67AF }, { 0xCDBE, 0x69C1 }, { 0xCDBF, 0x6CBD }, { 0xCDC0, 0x75FC },
+	{ 0xCDC1, 0x7690 }, { 0xCDC2, 0x777E }, { 0xCDC3, 0x7A3F }, { 0xCDC4, 0x7F94 }, { 0xCDC5, 0x8003 }, { 0xCDC6, 0x80A1 }, { 0xCDC7, 0x818F }, { 0xCDC8, 0x82E6 },
+	{ 0xCDC9, 0x82FD }, { 0xCDCA, 0x83F0 }, { 0xCDCB, 0x85C1 }, { 0xCDCC, 0x8831 }, { 0xCDCD, 0x88B4 }, { 0xCDCE, 0x8AA5 }, { 0xCDCF, 0xF903 }, { 0xCDD0, 0x8F9C },
+	{ 0xCDD1, 0x932E }, { 0xCDD2, 0x96C7 }, { 0xCDD3, 0x9867 }, { 0xCDD4, 0x9AD8 }, { 0xCDD5, 0x9F13 }, { 0xCDD6, 0x54ED }, { 0xCDD7, 0x659B }, { 0xCDD8, 0x66F2 },
+	{ 0xCDD9, 0x688F }, { 0xCDDA, 0x7A40 }, { 0xCDDB, 0x8C37 }, { 0xCDDC, 0x9D60 }, { 0xCDDD, 0x56F0 }, { 0xCDDE, 0x5764 }, { 0xCDDF, 0x5D11 }, { 0xCDE0, 0x6606 },
+	{ 0xCDE1, 0x68B1 }, { 0xCDE2, 0x68CD }, { 0xCDE3, 0x6EFE }, { 0xCDE4, 0x7428 }, { 0xCDE5, 0x889E }, { 0xCDE6, 0x9BE4 }, { 0xCDE7, 0x6C68 }, { 0xCDE8, 0xF904 },
+	{ 0xCDE9, 0x9AA8 }, { 0xCDEA, 0x4F9B }, { 0xCDEB, 0x516C }, { 0xCDEC, 0x5171 }, { 0xCDED, 0x529F }, { 0xCDEE, 0x5B54 }, { 0xCDEF, 0x5DE5 }, { 0xCDF0, 0x6050 },
+	{ 0xCDF1, 0x606D }, { 0xCDF2, 0x62F1 }, { 0xCDF3, 0x63A7 }, { 0xCDF4, 0x653B }, { 0xCDF5, 0x73D9 }, { 0xCDF6, 0x7A7A }, { 0xCDF7, 0x86A3 }, { 0xCDF8, 0x8CA2 },
+	{ 0xCDF9, 0x978F }, { 0xCDFA, 0x4E32 }, { 0xCDFB, 0x5BE1 }, { 0xCDFC, 0x6208 }, { 0xCDFD, 0x679C }, { 0xCDFE, 0x74DC }, { 0xCEA1, 0x79D1 }, { 0xCEA2, 0x83D3 },
+	{ 0xCEA3, 0x8A87 }, { 0xCEA4, 0x8AB2 }, { 0xCEA5, 0x8DE8 }, { 0xCEA6, 0x904E }, { 0xCEA7, 0x934B }, { 0xCEA8, 0x9846 }, { 0xCEA9, 0x5ED3 }, { 0xCEAA, 0x69E8 },
+	{ 0xCEAB, 0x85FF }, { 0xCEAC, 0x90ED }, { 0xCEAD, 0xF905 }, { 0xCEAE, 0x51A0 }, { 0xCEAF, 0x5B98 }, { 0xCEB0, 0x5BEC }, { 0xCEB1, 0x6163 }, { 0xCEB2, 0x68FA },
+	{ 0xCEB3, 0x6B3E }, { 0xCEB4, 0x704C }, { 0xCEB5, 0x742F }, { 0xCEB6, 0x74D8 }, { 0xCEB7, 0x7BA1 }, { 0xCEB8, 0x7F50 }, { 0xCEB9, 0x83C5 }, { 0xCEBA, 0x89C0 },
+	{ 0xCEBB, 0x8CAB }, { 0xCEBC, 0x95DC }, { 0xCEBD, 0x9928 }, { 0xCEBE, 0x522E }, { 0xCEBF, 0x605D }, { 0xCEC0, 0x62EC }, { 0xCEC1, 0x9002 }, { 0xCEC2, 0x4F8A },
+	{ 0xCEC3, 0x5149 }, { 0xCEC4, 0x5321 }, { 0xCEC5, 0x58D9 }, { 0xCEC6, 0x5EE3 }, { 0xCEC7, 0x66E0 }, { 0xCEC8, 0x6D38 }, { 0xCEC9, 0x709A }, { 0xCECA, 0x72C2 },
+	{ 0xCECB, 0x73D6 }, { 0xCECC, 0x7B50 }, { 0xCECD, 0x80F1 }, { 0xCECE, 0x945B }, { 0xCECF, 0x5366 }, { 0xCED0, 0x639B }, { 0xCED1, 0x7F6B }, { 0xCED2, 0x4E56 },
+	{ 0xCED3, 0x5080 }, { 0xCED4, 0x584A }, { 0xCED5, 0x58DE }, { 0xCED6, 0x602A }, { 0xCED7, 0x6127 }, { 0xCED8, 0x62D0 }, { 0xCED9, 0x69D0 }, { 0xCEDA, 0x9B41 },
+	{ 0xCEDB, 0x5B8F }, { 0xCEDC, 0x7D18 }, { 0xCEDD, 0x80B1 }, { 0xCEDE, 0x8F5F }, { 0xCEDF, 0x4EA4 }, { 0xCEE0, 0x50D1 }, { 0xCEE1, 0x54AC }, { 0xCEE2, 0x55AC },
+	{ 0xCEE3, 0x5B0C }, { 0xCEE4, 0x5DA0 }, { 0xCEE5, 0x5DE7 }, { 0xCEE6, 0x652A }, { 0xCEE7, 0x654E }, { 0xCEE8, 0x6821 }, { 0xCEE9, 0x6A4B }, { 0xCEEA, 0x72E1 },
+	{ 0xCEEB, 0x768E }, { 0xCEEC, 0x77EF }, { 0xCEED, 0x7D5E }, { 0xCEEE, 0x7FF9 }, { 0xCEEF, 0x81A0 }, { 0xCEF0, 0x854E }, { 0xCEF1, 0x86DF }, { 0xCEF2, 0x8F03 },
+	{ 0xCEF3, 0x8F4E }, { 0xCEF4, 0x90CA }, { 0xCEF5, 0x9903 }, { 0xCEF6, 0x9A55 }, { 0xCEF7, 0x9BAB }, { 0xCEF8, 0x4E18 }, { 0xCEF9, 0x4E45 }, { 0xCEFA, 0x4E5D },
+	{ 0xCEFB, 0x4EC7 }, { 0xCEFC, 0x4FF1 }, { 0xCEFD, 0x5177 }, { 0xCEFE, 0x52FE }, { 0xCFA1, 0x5340 }, { 0xCFA2, 0x53E3 }, { 0xCFA3, 0x53E5 }, { 0xCFA4, 0x548E },
+	{ 0xCFA5, 0x5614 }, { 0xCFA6, 0x5775 }, { 0xCFA7, 0x57A2 }, { 0xCFA8, 0x5BC7 }, { 0xCFA9, 0x5D87 }, { 0xCFAA, 0x5ED0 }, { 0xCFAB, 0x61FC }, { 0xCFAC, 0x62D8 },
+	{ 0xCFAD, 0x6551 }, { 0xCFAE, 0x67B8 }, { 0xCFAF, 0x67E9 }, { 0xCFB0, 0x69CB }, { 0xCFB1, 0x6B50 }, { 0xCFB2, 0x6BC6 }, { 0xCFB3, 0x6BEC }, { 0xCFB4, 0x6C42 },
+	{ 0xCFB5, 0x6E9D }, { 0xCFB6, 0x7078 }, { 0xCFB7, 0x72D7 }, { 0xCFB8, 0x7396 }, { 0xCFB9, 0x7403 }, { 0xCFBA, 0x77BF }, { 0xCFBB, 0x77E9 }, { 0xCFBC, 0x7A76 },
+	{ 0xCFBD, 0x7D7F }, { 0xCFBE, 0x8009 }, { 0xCFBF, 0x81FC }, { 0xCFC0, 0x8205 }, { 0xCFC1, 0x820A }, { 0xCFC2, 0x82DF }, { 0xCFC3, 0x8862 }, { 0xCFC4, 0x8B33 },
+	{ 0xCFC5, 0x8CFC }, { 0xCFC6, 0x8EC0 }, { 0xCFC7, 0x9011 }, { 0xCFC8, 0x90B1 }, { 0xCFC9, 0x9264 }, { 0xCFCA, 0x92B6 }, { 0xCFCB, 0x99D2 }, { 0xCFCC, 0x9A45 },
+	{ 0xCFCD, 0x9CE9 }, { 0xCFCE, 0x9DD7 }, { 0xCFCF, 0x9F9C }, { 0xCFD0, 0x570B }, { 0xCFD1, 0x5C40 }, { 0xCFD2, 0x83CA }, { 0xCFD3, 0x97A0 }, { 0xCFD4, 0x97AB },
+	{ 0xCFD5, 0x9EB4 }, { 0xCFD6, 0x541B }, { 0xCFD7, 0x7A98 }, { 0xCFD8, 0x7FA4 }, { 0xCFD9, 0x88D9 }, { 0xCFDA, 0x8ECD }, { 0xCFDB, 0x90E1 }, { 0xCFDC, 0x5800 },
+	{ 0xCFDD, 0x5C48 }, { 0xCFDE, 0x6398 }, { 0xCFDF, 0x7A9F }, { 0xCFE0, 0x5BAE }, { 0xCFE1, 0x5F13 }, { 0xCFE2, 0x7A79 }, { 0xCFE3, 0x7AAE }, { 0xCFE4, 0x828E },
+	{ 0xCFE5, 0x8EAC }, { 0xCFE6, 0x5026 }, { 0xCFE7, 0x5238 }, { 0xCFE8, 0x52F8 }, { 0xCFE9, 0x5377 }, { 0xCFEA, 0x5708 }, { 0xCFEB, 0x62F3 }, { 0xCFEC, 0x6372 },
+	{ 0xCFED, 0x6B0A }, { 0xCFEE, 0x6DC3 }, { 0xCFEF, 0x7737 }, { 0xCFF0, 0x53A5 }, { 0xCFF1, 0x7357 }, { 0xCFF2, 0x8568 }, { 0xCFF3, 0x8E76 }, { 0xCFF4, 0x95D5 },
+	{ 0xCFF5, 0x673A }, { 0xCFF6, 0x6AC3 }, { 0xCFF7, 0x6F70 }, { 0xCFF8, 0x8A6D }, { 0xCFF9, 0x8ECC }, { 0xCFFA, 0x994B }, { 0xCFFB, 0xF906 }, { 0xCFFC, 0x6677 },
+	{ 0xCFFD, 0x6B78 }, { 0xCFFE, 0x8CB4 }, { 0xD0A1, 0x9B3C }, { 0xD0A2, 0xF907 }, { 0xD0A3, 0x53EB }, { 0xD0A4, 0x572D }, { 0xD0A5, 0x594E }, { 0xD0A6, 0x63C6 },
+	{ 0xD0A7, 0x69FB }, { 0xD0A8, 0x73EA }, { 0xD0A9, 0x7845 }, { 0xD0AA, 0x7ABA }, { 0xD0AB, 0x7AC5 }, { 0xD0AC, 0x7CFE }, { 0xD0AD, 0x8475 }, { 0xD0AE, 0x898F },
+	{ 0xD0AF, 0x8D73 }, { 0xD0B0, 0x9035 }, { 0xD0B1, 0x95A8 }, { 0xD0B2, 0x52FB }, { 0xD0B3, 0x5747 }, { 0xD0B4, 0x7547 }, { 0xD0B5, 0x7B60 }, { 0xD0B6, 0x83CC },
+	{ 0xD0B7, 0x921E }, { 0xD0B8, 0xF908 }, { 0xD0B9, 0x6A58 }, { 0xD0BA, 0x514B }, { 0xD0BB, 0x524B }, { 0xD0BC, 0x5287 }, { 0xD0BD, 0x621F }, { 0xD0BE, 0x68D8 },
+	{ 0xD0BF, 0x6975 }, { 0xD0C0, 0x9699 }, { 0xD0C1, 0x50C5 }, { 0xD0C2, 0x52A4 }, { 0xD0C3, 0x52E4 }, { 0xD0C4, 0x61C3 }, { 0xD0C5, 0x65A4 }, { 0xD0C6, 0x6839 },
+	{ 0xD0C7, 0x69FF }, { 0xD0C8, 0x747E }, { 0xD0C9, 0x7B4B }, { 0xD0CA, 0x82B9 }, { 0xD0CB, 0x83EB }, { 0xD0CC, 0x89B2 }, { 0xD0CD, 0x8B39 }, { 0xD0CE, 0x8FD1 },
+	{ 0xD0CF, 0x9949 }, { 0xD0D0, 0xF909 }, { 0xD0D1, 0x4ECA }, { 0xD0D2, 0x5997 }, { 0xD0D3, 0x64D2 }, { 0xD0D4, 0x6611 }, { 0xD0D5, 0x6A8E }, { 0xD0D6, 0x7434 },
+	{ 0xD0D7, 0x7981 }, { 0xD0D8, 0x79BD }, { 0xD0D9, 0x82A9 }, { 0xD0DA, 0x887E }, { 0xD0DB, 0x887F }, { 0xD0DC, 0x895F }, { 0xD0DD, 0xF90A }, { 0xD0DE, 0x9326 },
+	{ 0xD0DF, 0x4F0B }, { 0xD0E0, 0x53CA }, { 0xD0E1, 0x6025 }, { 0xD0E2, 0x6271 }, { 0xD0E3, 0x6C72 }, { 0xD0E4, 0x7D1A }, { 0xD0E5, 0x7D66 }, { 0xD0E6, 0x4E98 },
+	{ 0xD0E7, 0x5162 }, { 0xD0E8, 0x77DC }, { 0xD0E9, 0x80AF }, { 0xD0EA, 0x4F01 }, { 0xD0EB, 0x4F0E }, { 0xD0EC, 0x5176 }, { 0xD0ED, 0x5180 }, { 0xD0EE, 0x55DC },
+	{ 0xD0EF, 0x5668 }, { 0xD0F0, 0x573B }, { 0xD0F1, 0x57FA }, { 0xD0F2, 0x57FC }, { 0xD0F3, 0x5914 }, { 0xD0F4, 0x5947 }, { 0xD0F5, 0x5993 }, { 0xD0F6, 0x5BC4 },
+	{ 0xD0F7, 0x5C90 }, { 0xD0F8, 0x5D0E }, { 0xD0F9, 0x5DF1 }, { 0xD0FA, 0x5E7E }, { 0xD0FB, 0x5FCC }, { 0xD0FC, 0x6280 }, { 0xD0FD, 0x65D7 }, { 0xD0FE, 0x65E3 },
+	{ 0xD1A1, 0x671E }, { 0xD1A2, 0x671F }, { 0xD1A3, 0x675E }, { 0xD1A4, 0x68CB }, { 0xD1A5, 0x68C4 }, { 0xD1A6, 0x6A5F }, { 0xD1A7, 0x6B3A }, { 0xD1A8, 0x6C23 },
+	{ 0xD1A9, 0x6C7D }, { 0xD1AA, 0x6C82 }, { 0xD1AB, 0x6DC7 }, { 0xD1AC, 0x7398 }, { 0xD1AD, 0x7426 }, { 0xD1AE, 0x742A }, { 0xD1AF, 0x7482 }, { 0xD1B0, 0x74A3 },
+	{ 0xD1B1, 0x7578 }, { 0xD1B2, 0x757F }, { 0xD1B3, 0x7881 }, { 0xD1B4, 0x78EF }, { 0xD1B5, 0x7941 }, { 0xD1B6, 0x7947 }, { 0xD1B7, 0x7948 }, { 0xD1B8, 0x797A },
+	{ 0xD1B9, 0x7B95 }, { 0xD1BA, 0x7D00 }, { 0xD1BB, 0x7DBA }, { 0xD1BC, 0x7F88 }, { 0xD1BD, 0x8006 }, { 0xD1BE, 0x802D }, { 0xD1BF, 0x808C }, { 0xD1C0, 0x8A18 },
+	{ 0xD1C1, 0x8B4F }, { 0xD1C2, 0x8C48 }, { 0xD1C3, 0x8D77 }, { 0xD1C4, 0x9321 }, { 0xD1C5, 0x9324 }, { 0xD1C6, 0x98E2 }, { 0xD1C7, 0x9951 }, { 0xD1C8, 0x9A0E },
+	{ 0xD1C9, 0x9A0F }, { 0xD1CA, 0x9A65 }, { 0xD1CB, 0x9E92 }, { 0xD1CC, 0x7DCA }, { 0xD1CD, 0x4F76 }, { 0xD1CE, 0x5409 }, { 0xD1CF, 0x62EE }, { 0xD1D0, 0x6854 },
+	{ 0xD1D1, 0x91D1 }, { 0xD1D2, 0x55AB }, { 0xD1D3, 0x513A }, { 0xD1D4, 0xF90B }, { 0xD1D5, 0xF90C }, { 0xD1D6, 0x5A1C }, { 0xD1D7, 0x61E6 }, { 0xD1D8, 0xF90D },
+	{ 0xD1D9, 0x62CF }, { 0xD1DA, 0x62FF }, { 0xD1DB, 0xF90E }, { 0xD1DC, 0xF90F }, { 0xD1DD, 0xF910 }, { 0xD1DE, 0xF911 }, { 0xD1DF, 0xF912 }, { 0xD1E0, 0xF913 },
+	{ 0xD1E1, 0x90A3 }, { 0xD1E2, 0xF914 }, { 0xD1E3, 0xF915 }, { 0xD1E4, 0xF916 }, { 0xD1E5, 0xF917 }, { 0xD1E6, 0xF918 }, { 0xD1E7, 0x8AFE }, { 0xD1E8, 0xF919 },
+	{ 0xD1E9, 0xF91A }, { 0xD1EA, 0xF91B }, { 0xD1EB, 0xF91C }, { 0xD1EC, 0x6696 }, { 0xD1ED, 0xF91D }, { 0xD1EE, 0x7156 }, { 0xD1EF, 0xF91E }, { 0xD1F0, 0xF91F },
+	{ 0xD1F1, 0x96E3 }, { 0xD1F2, 0xF920 }, { 0xD1F3, 0x634F }, { 0xD1F4, 0x637A }, { 0xD1F5, 0x5357 }, { 0xD1F6, 0xF921 }, { 0xD1F7, 0x678F }, { 0xD1F8, 0x6960 },
+	{ 0xD1F9, 0x6E73 }, { 0xD1FA, 0xF922 }, { 0xD1FB, 0x7537 }, { 0xD1FC, 0xF923 }, { 0xD1FD, 0xF924 }, { 0xD1FE, 0xF925 }, { 0xD2A1, 0x7D0D }, { 0xD2A2, 0xF926 },
+	{ 0xD2A3, 0xF927 }, { 0xD2A4, 0x8872 }, { 0xD2A5, 0x56CA }, { 0xD2A6, 0x5A18 }, { 0xD2A7, 0xF928 }, { 0xD2A8, 0xF929 }, { 0xD2A9, 0xF92A }, { 0xD2AA, 0xF92B },
+	{ 0xD2AB, 0xF92C }, { 0xD2AC, 0x4E43 }, { 0xD2AD, 0xF92D }, { 0xD2AE, 0x5167 }, { 0xD2AF, 0x5948 }, { 0xD2B0, 0x67F0 }, { 0xD2B1, 0x8010 }, { 0xD2B2, 0xF92E },
+	{ 0xD2B3, 0x5973 }, { 0xD2B4, 0x5E74 }, { 0xD2B5, 0x649A }, { 0xD2B6, 0x79CA }, { 0xD2B7, 0x5FF5 }, { 0xD2B8, 0x606C }, { 0xD2B9, 0x62C8 }, { 0xD2BA, 0x637B },
+	{ 0xD2BB, 0x5BE7 }, { 0xD2BC, 0x5BD7 }, { 0xD2BD, 0x52AA }, { 0xD2BE, 0xF92F }, { 0xD2BF, 0x5974 }, { 0xD2C0, 0x5F29 }, { 0xD2C1, 0x6012 }, { 0xD2C2, 0xF930 },
+	{ 0xD2C3, 0xF931 }, { 0xD2C4, 0xF932 }, { 0xD2C5, 0x7459 }, { 0xD2C6, 0xF933 }, { 0xD2C7, 0xF934 }, { 0xD2C8, 0xF935 }, { 0xD2C9, 0xF936 }, { 0xD2CA, 0xF937 },
+	{ 0xD2CB, 0xF938 }, { 0xD2CC, 0x99D1 }, { 0xD2CD, 0xF939 }, { 0xD2CE, 0xF93A }, { 0xD2CF, 0xF93B }, { 0xD2D0, 0xF93C }, { 0xD2D1, 0xF93D }, { 0xD2D2, 0xF93E },
+	{ 0xD2D3, 0xF93F }, { 0xD2D4, 0xF940 }, { 0xD2D5, 0xF941 }, { 0xD2D6, 0xF942 }, { 0xD2D7, 0xF943 }, { 0xD2D8, 0x6FC3 }, { 0xD2D9, 0xF944 }, { 0xD2DA, 0xF945 },
+	{ 0xD2DB, 0x81BF }, { 0xD2DC, 0x8FB2 }, { 0xD2DD, 0x60F1 }, { 0xD2DE, 0xF946 }, { 0xD2DF, 0xF947 }, { 0xD2E0, 0x8166 }, { 0xD2E1, 0xF948 }, { 0xD2E2, 0xF949 },
+	{ 0xD2E3, 0x5C3F }, { 0xD2E4, 0xF94A }, { 0xD2E5, 0xF94B }, { 0xD2E6, 0xF94C }, { 0xD2E7, 0xF94D }, { 0xD2E8, 0xF94E }, { 0xD2E9, 0xF94F }, { 0xD2EA, 0xF950 },
+	{ 0xD2EB, 0xF951 }, { 0xD2EC, 0x5AE9 }, { 0xD2ED, 0x8A25 }, { 0xD2EE, 0x677B }, { 0xD2EF, 0x7D10 }, { 0xD2F0, 0xF952 }, { 0xD2F1, 0xF953 }, { 0xD2F2, 0xF954 },
+	{ 0xD2F3, 0xF955 }, { 0xD2F4, 0xF956 }, { 0xD2F5, 0xF957 }, { 0xD2F6, 0x80FD }, { 0xD2F7, 0xF958 }, { 0xD2F8, 0xF959 }, { 0xD2F9, 0x5C3C }, { 0xD2FA, 0x6CE5 },
+	{ 0xD2FB, 0x533F }, { 0xD2FC, 0x6EBA }, { 0xD2FD, 0x591A }, { 0xD2FE, 0x8336 }, { 0xD3A1, 0x4E39 }, { 0xD3A2, 0x4EB6 }, { 0xD3A3, 0x4F46 }, { 0xD3A4, 0x55AE },
+	{ 0xD3A5, 0x5718 }, { 0xD3A6, 0x58C7 }, { 0xD3A7, 0x5F56 }, { 0xD3A8, 0x65B7 }, { 0xD3A9, 0x65E6 }, { 0xD3AA, 0x6A80 }, { 0xD3AB, 0x6BB5 }, { 0xD3AC, 0x6E4D },
+	{ 0xD3AD, 0x77ED }, { 0xD3AE, 0x7AEF }, { 0xD3AF, 0x7C1E }, { 0xD3B0, 0x7DDE }, { 0xD3B1, 0x86CB }, { 0xD3B2, 0x8892 }, { 0xD3B3, 0x9132 }, { 0xD3B4, 0x935B },
+	{ 0xD3B5, 0x64BB }, { 0xD3B6, 0x6FBE }, { 0xD3B7, 0x737A }, { 0xD3B8, 0x75B8 }, { 0xD3B9, 0x9054 }, { 0xD3BA, 0x5556 }, { 0xD3BB, 0x574D }, { 0xD3BC, 0x61BA },
+	{ 0xD3BD, 0x64D4 }, { 0xD3BE, 0x66C7 }, { 0xD3BF, 0x6DE1 }, { 0xD3C0, 0x6E5B }, { 0xD3C1, 0x6F6D }, { 0xD3C2, 0x6FB9 }, { 0xD3C3, 0x75F0 }, { 0xD3C4, 0x8043 },
+	{ 0xD3C5, 0x81BD }, { 0xD3C6, 0x8541 }, { 0xD3C7, 0x8983 }, { 0xD3C8, 0x8AC7 }, { 0xD3C9, 0x8B5A }, { 0xD3CA, 0x931F }, { 0xD3CB, 0x6C93 }, { 0xD3CC, 0x7553 },
+	{ 0xD3CD, 0x7B54 }, { 0xD3CE, 0x8E0F }, { 0xD3CF, 0x905D }, { 0xD3D0, 0x5510 }, { 0xD3D1, 0x5802 }, { 0xD3D2, 0x5858 }, { 0xD3D3, 0x5E62 }, { 0xD3D4, 0x6207 },
+	{ 0xD3D5, 0x649E }, { 0xD3D6, 0x68E0 }, { 0xD3D7, 0x7576 }, { 0xD3D8, 0x7CD6 }, { 0xD3D9, 0x87B3 }, { 0xD3DA, 0x9EE8 }, { 0xD3DB, 0x4EE3 }, { 0xD3DC, 0x5788 },
+	{ 0xD3DD, 0x576E }, { 0xD3DE, 0x5927 }, { 0xD3DF, 0x5C0D }, { 0xD3E0, 0x5CB1 }, { 0xD3E1, 0x5E36 }, { 0xD3E2, 0x5F85 }, { 0xD3E3, 0x6234 }, { 0xD3E4, 0x64E1 },
+	{ 0xD3E5, 0x73B3 }, { 0xD3E6, 0x81FA }, { 0xD3E7, 0x888B }, { 0xD3E8, 0x8CB8 }, { 0xD3E9, 0x968A }, { 0xD3EA, 0x9EDB }, { 0xD3EB, 0x5B85 }, { 0xD3EC, 0x5FB7 },
+	{ 0xD3ED, 0x60B3 }, { 0xD3EE, 0x5012 }, { 0xD3EF, 0x5200 }, { 0xD3F0, 0x5230 }, { 0xD3F1, 0x5716 }, { 0xD3F2, 0x5835 }, { 0xD3F3, 0x5857 }, { 0xD3F4, 0x5C0E },
+	{ 0xD3F5, 0x5C60 }, { 0xD3F6, 0x5CF6 }, { 0xD3F7, 0x5D8B }, { 0xD3F8, 0x5EA6 }, { 0xD3F9, 0x5F92 }, { 0xD3FA, 0x60BC }, { 0xD3FB, 0x6311 }, { 0xD3FC, 0x6389 },
+	{ 0xD3FD, 0x6417 }, { 0xD3FE, 0x6843 }, { 0xD4A1, 0x68F9 }, { 0xD4A2, 0x6AC2 }, { 0xD4A3, 0x6DD8 }, { 0xD4A4, 0x6E21 }, { 0xD4A5, 0x6ED4 }, { 0xD4A6, 0x6FE4 },
+	{ 0xD4A7, 0x71FE }, { 0xD4A8, 0x76DC }, { 0xD4A9, 0x7779 }, { 0xD4AA, 0x79B1 }, { 0xD4AB, 0x7A3B }, { 0xD4AC, 0x8404 }, { 0xD4AD, 0x89A9 }, { 0xD4AE, 0x8CED },
+	{ 0xD4AF, 0x8DF3 }, { 0xD4B0, 0x8E48 }, { 0xD4B1, 0x9003 }, { 0xD4B2, 0x9014 }, { 0xD4B3, 0x9053 }, { 0xD4B4, 0x90FD }, { 0xD4B5, 0x934D }, { 0xD4B6, 0x9676 },
+	{ 0xD4B7, 0x97DC }, { 0xD4B8, 0x6BD2 }, { 0xD4B9, 0x7006 }, { 0xD4BA, 0x7258 }, { 0xD4BB, 0x72A2 }, { 0xD4BC, 0x7368 }, { 0xD4BD, 0x7763 }, { 0xD4BE, 0x79BF },
+	{ 0xD4BF, 0x7BE4 }, { 0xD4C0, 0x7E9B }, { 0xD4C1, 0x8B80 }, { 0xD4C2, 0x58A9 }, { 0xD4C3, 0x60C7 }, { 0xD4C4, 0x6566 }, { 0xD4C5, 0x65FD }, { 0xD4C6, 0x66BE },
+	{ 0xD4C7, 0x6C8C }, { 0xD4C8, 0x711E }, { 0xD4C9, 0x71C9 }, { 0xD4CA, 0x8C5A }, { 0xD4CB, 0x9813 }, { 0xD4CC, 0x4E6D }, { 0xD4CD, 0x7A81 }, { 0xD4CE, 0x4EDD },
+	{ 0xD4CF, 0x51AC }, { 0xD4D0, 0x51CD }, { 0xD4D1, 0x52D5 }, { 0xD4D2, 0x540C }, { 0xD4D3, 0x61A7 }, { 0xD4D4, 0x6771 }, { 0xD4D5, 0x6850 }, { 0xD4D6, 0x68DF },
+	{ 0xD4D7, 0x6D1E }, { 0xD4D8, 0x6F7C }, { 0xD4D9, 0x75BC }, { 0xD4DA, 0x77B3 }, { 0xD4DB, 0x7AE5 }, { 0xD4DC, 0x80F4 }, { 0xD4DD, 0x8463 }, { 0xD4DE, 0x9285 },
+	{ 0xD4DF, 0x515C }, { 0xD4E0, 0x6597 }, { 0xD4E1, 0x675C }, { 0xD4E2, 0x6793 }, { 0xD4E3, 0x75D8 }, { 0xD4E4, 0x7AC7 }, { 0xD4E5, 0x8373 }, { 0xD4E6, 0xF95A },
+	{ 0xD4E7, 0x8C46 }, { 0xD4E8, 0x9017 }, { 0xD4E9, 0x982D }, { 0xD4EA, 0x5C6F }, { 0xD4EB, 0x81C0 }, { 0xD4EC, 0x829A }, { 0xD4ED, 0x9041 }, { 0xD4EE, 0x906F },
+	{ 0xD4EF, 0x920D }, { 0xD4F0, 0x5F97 }, { 0xD4F1, 0x5D9D }, { 0xD4F2, 0x6A59 }, { 0xD4F3, 0x71C8 }, { 0xD4F4, 0x767B }, { 0xD4F5, 0x7B49 }, { 0xD4F6, 0x85E4 },
+	{ 0xD4F7, 0x8B04 }, { 0xD4F8, 0x9127 }, { 0xD4F9, 0x9A30 }, { 0xD4FA, 0x5587 }, { 0xD4FB, 0x61F6 }, { 0xD4FC, 0xF95B }, { 0xD4FD, 0x7669 }, { 0xD4FE, 0x7F85 },
+	{ 0xD5A1, 0x863F }, { 0xD5A2, 0x87BA }, { 0xD5A3, 0x88F8 }, { 0xD5A4, 0x908F }, { 0xD5A5, 0xF95C }, { 0xD5A6, 0x6D1B }, { 0xD5A7, 0x70D9 }, { 0xD5A8, 0x73DE },
+	{ 0xD5A9, 0x7D61 }, { 0xD5AA, 0x843D }, { 0xD5AB, 0xF95D }, { 0xD5AC, 0x916A }, { 0xD5AD, 0x99F1 }, { 0xD5AE, 0xF95E }, { 0xD5AF, 0x4E82 }, { 0xD5B0, 0x5375 },
+	{ 0xD5B1, 0x6B04 }, { 0xD5B2, 0x6B12 }, { 0xD5B3, 0x703E }, { 0xD5B4, 0x721B }, { 0xD5B5, 0x862D }, { 0xD5B6, 0x9E1E }, { 0xD5B7, 0x524C }, { 0xD5B8, 0x8FA3 },
+	{ 0xD5B9, 0x5D50 }, { 0xD5BA, 0x64E5 }, { 0xD5BB, 0x652C }, { 0xD5BC, 0x6B16 }, { 0xD5BD, 0x6FEB }, { 0xD5BE, 0x7C43 }, { 0xD5BF, 0x7E9C }, { 0xD5C0, 0x85CD },
+	{ 0xD5C1, 0x8964 }, { 0xD5C2, 0x89BD }, { 0xD5C3, 0x62C9 }, { 0xD5C4, 0x81D8 }, { 0xD5C5, 0x881F }, { 0xD5C6, 0x5ECA }, { 0xD5C7, 0x6717 }, { 0xD5C8, 0x6D6A },
+	{ 0xD5C9, 0x72FC }, { 0xD5CA, 0x7405 }, { 0xD5CB, 0x746F }, { 0xD5CC, 0x8782 }, { 0xD5CD, 0x90DE }, { 0xD5CE, 0x4F86 }, { 0xD5CF, 0x5D0D }, { 0xD5D0, 0x5FA0 },
+	{ 0xD5D1, 0x840A }, { 0xD5D2, 0x51B7 }, { 0xD5D3, 0x63A0 }, { 0xD5D4, 0x7565 }, { 0xD5D5, 0x4EAE }, { 0xD5D6, 0x5006 }, { 0xD5D7, 0x5169 }, { 0xD5D8, 0x51C9 },
+	{ 0xD5D9, 0x6881 }, { 0xD5DA, 0x6A11 }, { 0xD5DB, 0x7CAE }, { 0xD5DC, 0x7CB1 }, { 0xD5DD, 0x7CE7 }, { 0xD5DE, 0x826F }, { 0xD5DF, 0x8AD2 }, { 0xD5E0, 0x8F1B },
+	{ 0xD5E1, 0x91CF }, { 0xD5E2, 0x4FB6 }, { 0xD5E3, 0x5137 }, { 0xD5E4, 0x52F5 }, { 0xD5E5, 0x5442 }, { 0xD5E6, 0x5EEC }, { 0xD5E7, 0x616E }, { 0xD5E8, 0x623E },
+	{ 0xD5E9, 0x65C5 }, { 0xD5EA, 0x6ADA }, { 0xD5EB, 0x6FFE }, { 0xD5EC, 0x792A }, { 0xD5ED, 0x85DC }, { 0xD5EE, 0x8823 }, { 0xD5EF, 0x95AD }, { 0xD5F0, 0x9A62 },
+	{ 0xD5F1, 0x9A6A }, { 0xD5F2, 0x9E97 }, { 0xD5F3, 0x9ECE }, { 0xD5F4, 0x529B }, { 0xD5F5, 0x66C6 }, { 0xD5F6, 0x6B77 }, { 0xD5F7, 0x701D }, { 0xD5F8, 0x792B },
+	{ 0xD5F9, 0x8F62 }, { 0xD5FA, 0x9742 }, { 0xD5FB, 0x6190 }, { 0xD5FC, 0x6200 }, { 0xD5FD, 0x6523 }, { 0xD5FE, 0x6F23 }, { 0xD6A1, 0x7149 }, { 0xD6A2, 0x7489 },
+	{ 0xD6A3, 0x7DF4 }, { 0xD6A4, 0x806F }, { 0xD6A5, 0x84EE }, { 0xD6A6, 0x8F26 }, { 0xD6A7, 0x9023 }, { 0xD6A8, 0x934A }, { 0xD6A9, 0x51BD }, { 0xD6AA, 0x5217 },
+	{ 0xD6AB, 0x52A3 }, { 0xD6AC, 0x6D0C }, { 0xD6AD, 0x70C8 }, { 0xD6AE, 0x88C2 }, { 0xD6AF, 0x5EC9 }, { 0xD6B0, 0x6582 }, { 0xD6B1, 0x6BAE }, { 0xD6B2, 0x6FC2 },
+	{ 0xD6B3, 0x7C3E }, { 0xD6B4, 0x7375 }, { 0xD6B5, 0x4EE4 }, { 0xD6B6, 0x4F36 }, { 0xD6B7, 0x56F9 }, { 0xD6B8, 0xF95F }, { 0xD6B9, 0x5CBA }, { 0xD6BA, 0x5DBA },
+	{ 0xD6BB, 0x601C }, { 0xD6BC, 0x73B2 }, { 0xD6BD, 0x7B2D }, { 0xD6BE, 0x7F9A }, { 0xD6BF, 0x7FCE }, { 0xD6C0, 0x8046 }, { 0xD6C1, 0x901E }, { 0xD6C2, 0x9234 },
+	{ 0xD6C3, 0x96F6 }, { 0xD6C4, 0x9748 }, { 0xD6C5, 0x9818 }, { 0xD6C6, 0x9F61 }, { 0xD6C7, 0x4F8B }, { 0xD6C8, 0x6FA7 }, { 0xD6C9, 0x79AE }, { 0xD6CA, 0x91B4 },
+	{ 0xD6CB, 0x96B7 }, { 0xD6CC, 0x52DE }, { 0xD6CD, 0xF960 }, { 0xD6CE, 0x6488 }, { 0xD6CF, 0x64C4 }, { 0xD6D0, 0x6AD3 }, { 0xD6D1, 0x6F5E }, { 0xD6D2, 0x7018 },
+	{ 0xD6D3, 0x7210 }, { 0xD6D4, 0x76E7 }, { 0xD6D5, 0x8001 }, { 0xD6D6, 0x8606 }, { 0xD6D7, 0x865C }, { 0xD6D8, 0x8DEF }, { 0xD6D9, 0x8F05 }, { 0xD6DA, 0x9732 },
+	{ 0xD6DB, 0x9B6F }, { 0xD6DC, 0x9DFA }, { 0xD6DD, 0x9E75 }, { 0xD6DE, 0x788C }, { 0xD6DF, 0x797F }, { 0xD6E0, 0x7DA0 }, { 0xD6E1, 0x83C9 }, { 0xD6E2, 0x9304 },
+	{ 0xD6E3, 0x9E7F }, { 0xD6E4, 0x9E93 }, { 0xD6E5, 0x8AD6 }, { 0xD6E6, 0x58DF }, { 0xD6E7, 0x5F04 }, { 0xD6E8, 0x6727 }, { 0xD6E9, 0x7027 }, { 0xD6EA, 0x74CF },
+	{ 0xD6EB, 0x7C60 }, { 0xD6EC, 0x807E }, { 0xD6ED, 0x5121 }, { 0xD6EE, 0x7028 }, { 0xD6EF, 0x7262 }, { 0xD6F0, 0x78CA }, { 0xD6F1, 0x8CC2 }, { 0xD6F2, 0x8CDA },
+	{ 0xD6F3, 0x8CF4 }, { 0xD6F4, 0x96F7 }, { 0xD6F5, 0x4E86 }, { 0xD6F6, 0x50DA }, { 0xD6F7, 0x5BEE }, { 0xD6F8, 0x5ED6 }, { 0xD6F9, 0x6599 }, { 0xD6FA, 0x71CE },
+	{ 0xD6FB, 0x7642 }, { 0xD6FC, 0x77AD }, { 0xD6FD, 0x804A }, { 0xD6FE, 0x84FC }, { 0xD7A1, 0x907C }, { 0xD7A2, 0x9B27 }, { 0xD7A3, 0x9F8D }, { 0xD7A4, 0x58D8 },
+	{ 0xD7A5, 0x5A41 }, { 0xD7A6, 0x5C62 }, { 0xD7A7, 0x6A13 }, { 0xD7A8, 0x6DDA }, { 0xD7A9, 0x6F0F }, { 0xD7AA, 0x763B }, { 0xD7AB, 0x7D2F }, { 0xD7AC, 0x7E37 },
+	{ 0xD7AD, 0x851E }, { 0xD7AE, 0x8938 }, { 0xD7AF, 0x93E4 }, { 0xD7B0, 0x964B }, { 0xD7B1, 0x5289 }, { 0xD7B2, 0x65D2 }, { 0xD7B3, 0x67F3 }, { 0xD7B4, 0x69B4 },
+	{ 0xD7B5, 0x6D41 }, { 0xD7B6, 0x6E9C }, { 0xD7B7, 0x700F }, { 0xD7B8, 0x7409 }, { 0xD7B9, 0x7460 }, { 0xD7BA, 0x7559 }, { 0xD7BB, 0x7624 }, { 0xD7BC, 0x786B },
+	{ 0xD7BD, 0x8B2C }, { 0xD7BE, 0x985E }, { 0xD7BF, 0x516D }, { 0xD7C0, 0x622E }, { 0xD7C1, 0x9678 }, { 0xD7C2, 0x4F96 }, { 0xD7C3, 0x502B }, { 0xD7C4, 0x5D19 },
+	{ 0xD7C5, 0x6DEA }, { 0xD7C6, 0x7DB8 }, { 0xD7C7, 0x8F2A }, { 0xD7C8, 0x5F8B }, { 0xD7C9, 0x6144 }, { 0xD7CA, 0x6817 }, { 0xD7CB, 0xF961 }, { 0xD7CC, 0x9686 },
+	{ 0xD7CD, 0x52D2 }, { 0xD7CE, 0x808B }, { 0xD7CF, 0x51DC }, { 0xD7D0, 0x51CC }, { 0xD7D1, 0x695E }, { 0xD7D2, 0x7A1C }, { 0xD7D3, 0x7DBE }, { 0xD7D4, 0x83F1 },
+	{ 0xD7D5, 0x9675 }, { 0xD7D6, 0x4FDA }, { 0xD7D7, 0x5229 }, { 0xD7D8, 0x5398 }, { 0xD7D9, 0x540F }, { 0xD7DA, 0x550E }, { 0xD7DB, 0x5C65 }, { 0xD7DC, 0x60A7 },
+	{ 0xD7DD, 0x674E }, { 0xD7DE, 0x68A8 }, { 0xD7DF, 0x6D6C }, { 0xD7E0, 0x7281 }, { 0xD7E1, 0x72F8 }, { 0xD7E2, 0x7406 }, { 0xD7E3, 0x7483 }, { 0xD7E4, 0xF962 },
+	{ 0xD7E5, 0x75E2 }, { 0xD7E6, 0x7C6C }, { 0xD7E7, 0x7F79 }, { 0xD7E8, 0x7FB8 }, { 0xD7E9, 0x8389 }, { 0xD7EA, 0x88CF }, { 0xD7EB, 0x88E1 }, { 0xD7EC, 0x91CC },
+	{ 0xD7ED, 0x91D0 }, { 0xD7EE, 0x96E2 }, { 0xD7EF, 0x9BC9 }, { 0xD7F0, 0x541D }, { 0xD7F1, 0x6F7E }, { 0xD7F2, 0x71D0 }, { 0xD7F3, 0x7498 }, { 0xD7F4, 0x85FA },
+	{ 0xD7F5, 0x8EAA }, { 0xD7F6, 0x96A3 }, { 0xD7F7, 0x9C57 }, { 0xD7F8, 0x9E9F }, { 0xD7F9, 0x6797 }, { 0xD7FA, 0x6DCB }, { 0xD7FB, 0x7433 }, { 0xD7FC, 0x81E8 },
+	{ 0xD7FD, 0x9716 }, { 0xD7FE, 0x782C }, { 0xD8A1, 0x7ACB }, { 0xD8A2, 0x7B20 }, { 0xD8A3, 0x7C92 }, { 0xD8A4, 0x6469 }, { 0xD8A5, 0x746A }, { 0xD8A6, 0x75F2 },
+	{ 0xD8A7, 0x78BC }, { 0xD8A8, 0x78E8 }, { 0xD8A9, 0x99AC }, { 0xD8AA, 0x9B54 }, { 0xD8AB, 0x9EBB }, { 0xD8AC, 0x5BDE }, { 0xD8AD, 0x5E55 }, { 0xD8AE, 0x6F20 },
+	{ 0xD8AF, 0x819C }, { 0xD8B0, 0x83AB }, { 0xD8B1, 0x9088 }, { 0xD8B2, 0x4E07 }, { 0xD8B3, 0x534D }, { 0xD8B4, 0x5A29 }, { 0xD8B5, 0x5DD2 }, { 0xD8B6, 0x5F4E },
+	{ 0xD8B7, 0x6162 }, { 0xD8B8, 0x633D }, { 0xD8B9, 0x6669 }, { 0xD8BA, 0x66FC }, { 0xD8BB, 0x6EFF }, { 0xD8BC, 0x6F2B }, { 0xD8BD, 0x7063 }, { 0xD8BE, 0x779E },
+	{ 0xD8BF, 0x842C }, { 0xD8C0, 0x8513 }, { 0xD8C1, 0x883B }, { 0xD8C2, 0x8F13 }, { 0xD8C3, 0x9945 }, { 0xD8C4, 0x9C3B }, { 0xD8C5, 0x551C }, { 0xD8C6, 0x62B9 },
+	{ 0xD8C7, 0x672B }, { 0xD8C8, 0x6CAB }, { 0xD8C9, 0x8309 }, { 0xD8CA, 0x896A }, { 0xD8CB, 0x977A }, { 0xD8CC, 0x4EA1 }, { 0xD8CD, 0x5984 }, { 0xD8CE, 0x5FD8 },
+	{ 0xD8CF, 0x5FD9 }, { 0xD8D0, 0x671B }, { 0xD8D1, 0x7DB2 }, { 0xD8D2, 0x7F54 }, { 0xD8D3, 0x8292 }, { 0xD8D4, 0x832B }, { 0xD8D5, 0x83BD }, { 0xD8D6, 0x8F1E },
+	{ 0xD8D7, 0x9099 }, { 0xD8D8, 0x57CB }, { 0xD8D9, 0x59B9 }, { 0xD8DA, 0x5A92 }, { 0xD8DB, 0x5BD0 }, { 0xD8DC, 0x6627 }, { 0xD8DD, 0x679A }, { 0xD8DE, 0x6885 },
+	{ 0xD8DF, 0x6BCF }, { 0xD8E0, 0x7164 }, { 0xD8E1, 0x7F75 }, { 0xD8E2, 0x8CB7 }, { 0xD8E3, 0x8CE3 }, { 0xD8E4, 0x9081 }, { 0xD8E5, 0x9B45 }, { 0xD8E6, 0x8108 },
+	{ 0xD8E7, 0x8C8A }, { 0xD8E8, 0x964C }, { 0xD8E9, 0x9A40 }, { 0xD8EA, 0x9EA5 }, { 0xD8EB, 0x5B5F }, { 0xD8EC, 0x6C13 }, { 0xD8ED, 0x731B }, { 0xD8EE, 0x76F2 },
+	{ 0xD8EF, 0x76DF }, { 0xD8F0, 0x840C }, { 0xD8F1, 0x51AA }, { 0xD8F2, 0x8993 }, { 0xD8F3, 0x514D }, { 0xD8F4, 0x5195 }, { 0xD8F5, 0x52C9 }, { 0xD8F6, 0x68C9 },
+	{ 0xD8F7, 0x6C94 }, { 0xD8F8, 0x7704 }, { 0xD8F9, 0x7720 }, { 0xD8FA, 0x7DBF }, { 0xD8FB, 0x7DEC }, { 0xD8FC, 0x9762 }, { 0xD8FD, 0x9EB5 }, { 0xD8FE, 0x6EC5 },
+	{ 0xD9A1, 0x8511 }, { 0xD9A2, 0x51A5 }, { 0xD9A3, 0x540D }, { 0xD9A4, 0x547D }, { 0xD9A5, 0x660E }, { 0xD9A6, 0x669D }, { 0xD9A7, 0x6927 }, { 0xD9A8, 0x6E9F },
+	{ 0xD9A9, 0x76BF }, { 0xD9AA, 0x7791 }, { 0xD9AB, 0x8317 }, { 0xD9AC, 0x84C2 }, { 0xD9AD, 0x879F }, { 0xD9AE, 0x9169 }, { 0xD9AF, 0x9298 }, { 0xD9B0, 0x9CF4 },
+	{ 0xD9B1, 0x8882 }, { 0xD9B2, 0x4FAE }, { 0xD9B3, 0x5192 }, { 0xD9B4, 0x52DF }, { 0xD9B5, 0x59C6 }, { 0xD9B6, 0x5E3D }, { 0xD9B7, 0x6155 }, { 0xD9B8, 0x6478 },
+	{ 0xD9B9, 0x6479 }, { 0xD9BA, 0x66AE }, { 0xD9BB, 0x67D0 }, { 0xD9BC, 0x6A21 }, { 0xD9BD, 0x6BCD }, { 0xD9BE, 0x6BDB }, { 0xD9BF, 0x725F }, { 0xD9C0, 0x7261 },
+	{ 0xD9C1, 0x7441 }, { 0xD9C2, 0x7738 }, { 0xD9C3, 0x77DB }, { 0xD9C4, 0x8017 }, { 0xD9C5, 0x82BC }, { 0xD9C6, 0x8305 }, { 0xD9C7, 0x8B00 }, { 0xD9C8, 0x8B28 },
+	{ 0xD9C9, 0x8C8C }, { 0xD9CA, 0x6728 }, { 0xD9CB, 0x6C90 }, { 0xD9CC, 0x7267 }, { 0xD9CD, 0x76EE }, { 0xD9CE, 0x7766 }, { 0xD9CF, 0x7A46 }, { 0xD9D0, 0x9DA9 },
+	{ 0xD9D1, 0x6B7F }, { 0xD9D2, 0x6C92 }, { 0xD9D3, 0x5922 }, { 0xD9D4, 0x6726 }, { 0xD9D5, 0x8499 }, { 0xD9D6, 0x536F }, { 0xD9D7, 0x5893 }, { 0xD9D8, 0x5999 },
+	{ 0xD9D9, 0x5EDF }, { 0xD9DA, 0x63CF }, { 0xD9DB, 0x6634 }, { 0xD9DC, 0x6773 }, { 0xD9DD, 0x6E3A }, { 0xD9DE, 0x732B }, { 0xD9DF, 0x7AD7 }, { 0xD9E0, 0x82D7 },
+	{ 0xD9E1, 0x9328 }, { 0xD9E2, 0x52D9 }, { 0xD9E3, 0x5DEB }, { 0xD9E4, 0x61AE }, { 0xD9E5, 0x61CB }, { 0xD9E6, 0x620A }, { 0xD9E7, 0x62C7 }, { 0xD9E8, 0x64AB },
+	{ 0xD9E9, 0x65E0 }, { 0xD9EA, 0x6959 }, { 0xD9EB, 0x6B66 }, { 0xD9EC, 0x6BCB }, { 0xD9ED, 0x7121 }, { 0xD9EE, 0x73F7 }, { 0xD9EF, 0x755D }, { 0xD9F0, 0x7E46 },
+	{ 0xD9F1, 0x821E }, { 0xD9F2, 0x8302 }, { 0xD9F3, 0x856A }, { 0xD9F4, 0x8AA3 }, { 0xD9F5, 0x8CBF }, { 0xD9F6, 0x9727 }, { 0xD9F7, 0x9D61 }, { 0xD9F8, 0x58A8 },
+	{ 0xD9F9, 0x9ED8 }, { 0xD9FA, 0x5011 }, { 0xD9FB, 0x520E }, { 0xD9FC, 0x543B }, { 0xD9FD, 0x554F }, { 0xD9FE, 0x6587 }, { 0xDAA1, 0x6C76 }, { 0xDAA2, 0x7D0A },
+	{ 0xDAA3, 0x7D0B }, { 0xDAA4, 0x805E }, { 0xDAA5, 0x868A }, { 0xDAA6, 0x9580 }, { 0xDAA7, 0x96EF }, { 0xDAA8, 0x52FF }, { 0xDAA9, 0x6C95 }, { 0xDAAA, 0x7269 },
+	{ 0xDAAB, 0x5473 }, { 0xDAAC, 0x5A9A }, { 0xDAAD, 0x5C3E }, { 0xDAAE, 0x5D4B }, { 0xDAAF, 0x5F4C }, { 0xDAB0, 0x5FAE }, { 0xDAB1, 0x672A }, { 0xDAB2, 0x68B6 },
+	{ 0xDAB3, 0x6963 }, { 0xDAB4, 0x6E3C }, { 0xDAB5, 0x6E44 }, { 0xDAB6, 0x7709 }, { 0xDAB7, 0x7C73 }, { 0xDAB8, 0x7F8E }, { 0xDAB9, 0x8587 }, { 0xDABA, 0x8B0E },
+	{ 0xDABB, 0x8FF7 }, { 0xDABC, 0x9761 }, { 0xDABD, 0x9EF4 }, { 0xDABE, 0x5CB7 }, { 0xDABF, 0x60B6 }, { 0xDAC0, 0x610D }, { 0xDAC1, 0x61AB }, { 0xDAC2, 0x654F },
+	{ 0xDAC3, 0x65FB }, { 0xDAC4, 0x65FC }, { 0xDAC5, 0x6C11 }, { 0xDAC6, 0x6CEF }, { 0xDAC7, 0x739F }, { 0xDAC8, 0x73C9 }, { 0xDAC9, 0x7DE1 }, { 0xDACA, 0x9594 },
+	{ 0xDACB, 0x5BC6 }, { 0xDACC, 0x871C }, { 0xDACD, 0x8B10 }, { 0xDACE, 0x525D }, { 0xDACF, 0x535A }, { 0xDAD0, 0x62CD }, { 0xDAD1, 0x640F }, { 0xDAD2, 0x64B2 },
+	{ 0xDAD3, 0x6734 }, { 0xDAD4, 0x6A38 }, { 0xDAD5, 0x6CCA }, { 0xDAD6, 0x73C0 }, { 0xDAD7, 0x749E }, { 0xDAD8, 0x7B94 }, { 0xDAD9, 0x7C95 }, { 0xDADA, 0x7E1B },
+	{ 0xDADB, 0x818A }, { 0xDADC, 0x8236 }, { 0xDADD, 0x8584 }, { 0xDADE, 0x8FEB }, { 0xDADF, 0x96F9 }, { 0xDAE0, 0x99C1 }, { 0xDAE1, 0x4F34 }, { 0xDAE2, 0x534A },
+	{ 0xDAE3, 0x53CD }, { 0xDAE4, 0x53DB }, { 0xDAE5, 0x62CC }, { 0xDAE6, 0x642C }, { 0xDAE7, 0x6500 }, { 0xDAE8, 0x6591 }, { 0xDAE9, 0x69C3 }, { 0xDAEA, 0x6CEE },
+	{ 0xDAEB, 0x6F58 }, { 0xDAEC, 0x73ED }, { 0xDAED, 0x7554 }, { 0xDAEE, 0x7622 }, { 0xDAEF, 0x76E4 }, { 0xDAF0, 0x76FC }, { 0xDAF1, 0x78D0 }, { 0xDAF2, 0x78FB },
+	{ 0xDAF3, 0x792C }, { 0xDAF4, 0x7D46 }, { 0xDAF5, 0x822C }, { 0xDAF6, 0x87E0 }, { 0xDAF7, 0x8FD4 }, { 0xDAF8, 0x9812 }, { 0xDAF9, 0x98EF }, { 0xDAFA, 0x52C3 },
+	{ 0xDAFB, 0x62D4 }, { 0xDAFC, 0x64A5 }, { 0xDAFD, 0x6E24 }, { 0xDAFE, 0x6F51 }, { 0xDBA1, 0x767C }, { 0xDBA2, 0x8DCB }, { 0xDBA3, 0x91B1 }, { 0xDBA4, 0x9262 },
+	{ 0xDBA5, 0x9AEE }, { 0xDBA6, 0x9B43 }, { 0xDBA7, 0x5023 }, { 0xDBA8, 0x508D }, { 0xDBA9, 0x574A }, { 0xDBAA, 0x59A8 }, { 0xDBAB, 0x5C28 }, { 0xDBAC, 0x5E47 },
+	{ 0xDBAD, 0x5F77 }, { 0xDBAE, 0x623F }, { 0xDBAF, 0x653E }, { 0xDBB0, 0x65B9 }, { 0xDBB1, 0x65C1 }, { 0xDBB2, 0x6609 }, { 0xDBB3, 0x678B }, { 0xDBB4, 0x699C },
+	{ 0xDBB5, 0x6EC2 }, { 0xDBB6, 0x78C5 }, { 0xDBB7, 0x7D21 }, { 0xDBB8, 0x80AA }, { 0xDBB9, 0x8180 }, { 0xDBBA, 0x822B }, { 0xDBBB, 0x82B3 }, { 0xDBBC, 0x84A1 },
+	{ 0xDBBD, 0x868C }, { 0xDBBE, 0x8A2A }, { 0xDBBF, 0x8B17 }, { 0xDBC0, 0x90A6 }, { 0xDBC1, 0x9632 }, { 0xDBC2, 0x9F90 }, { 0xDBC3, 0x500D }, { 0xDBC4, 0x4FF3 },
+	{ 0xDBC5, 0xF963 }, { 0xDBC6, 0x57F9 }, { 0xDBC7, 0x5F98 }, { 0xDBC8, 0x62DC }, { 0xDBC9, 0x6392 }, { 0xDBCA, 0x676F }, { 0xDBCB, 0x6E43 }, { 0xDBCC, 0x7119 },
+	{ 0xDBCD, 0x76C3 }, { 0xDBCE, 0x80CC }, { 0xDBCF, 0x80DA }, { 0xDBD0, 0x88F4 }, { 0xDBD1, 0x88F5 }, { 0xDBD2, 0x8919 }, { 0xDBD3, 0x8CE0 }, { 0xDBD4, 0x8F29 },
+	{ 0xDBD5, 0x914D }, { 0xDBD6, 0x966A }, { 0xDBD7, 0x4F2F }, { 0xDBD8, 0x4F70 }, { 0xDBD9, 0x5E1B }, { 0xDBDA, 0x67CF }, { 0xDBDB, 0x6822 }, { 0xDBDC, 0x767D },
+	{ 0xDBDD, 0x767E }, { 0xDBDE, 0x9B44 }, { 0xDBDF, 0x5E61 }, { 0xDBE0, 0x6A0A }, { 0xDBE1, 0x7169 }, { 0xDBE2, 0x71D4 }, { 0xDBE3, 0x756A }, { 0xDBE4, 0xF964 },
+	{ 0xDBE5, 0x7E41 }, { 0xDBE6, 0x8543 }, { 0xDBE7, 0x85E9 }, { 0xDBE8, 0x98DC }, { 0xDBE9, 0x4F10 }, { 0xDBEA, 0x7B4F }, { 0xDBEB, 0x7F70 }, { 0xDBEC, 0x95A5 },
+	{ 0xDBED, 0x51E1 }, { 0xDBEE, 0x5E06 }, { 0xDBEF, 0x68B5 }, { 0xDBF0, 0x6C3E }, { 0xDBF1, 0x6C4E }, { 0xDBF2, 0x6CDB }, { 0xDBF3, 0x72AF }, { 0xDBF4, 0x7BC4 },
+	{ 0xDBF5, 0x8303 }, { 0xDBF6, 0x6CD5 }, { 0xDBF7, 0x743A }, { 0xDBF8, 0x50FB }, { 0xDBF9, 0x5288 }, { 0xDBFA, 0x58C1 }, { 0xDBFB, 0x64D8 }, { 0xDBFC, 0x6A97 },
+	{ 0xDBFD, 0x74A7 }, { 0xDBFE, 0x7656 }, { 0xDCA1, 0x78A7 }, { 0xDCA2, 0x8617 }, { 0xDCA3, 0x95E2 }, { 0xDCA4, 0x9739 }, { 0xDCA5, 0xF965 }, { 0xDCA6, 0x535E },
+	{ 0xDCA7, 0x5F01 }, { 0xDCA8, 0x8B8A }, { 0xDCA9, 0x8FA8 }, { 0xDCAA, 0x8FAF }, { 0xDCAB, 0x908A }, { 0xDCAC, 0x5225 }, { 0xDCAD, 0x77A5 }, { 0xDCAE, 0x9C49 },
+	{ 0xDCAF, 0x9F08 }, { 0xDCB0, 0x4E19 }, { 0xDCB1, 0x5002 }, { 0xDCB2, 0x5175 }, { 0xDCB3, 0x5C5B }, { 0xDCB4, 0x5E77 }, { 0xDCB5, 0x661E }, { 0xDCB6, 0x663A },
+	{ 0xDCB7, 0x67C4 }, { 0xDCB8, 0x68C5 }, { 0xDCB9, 0x70B3 }, { 0xDCBA, 0x7501 }, { 0xDCBB, 0x75C5 }, { 0xDCBC, 0x79C9 }, { 0xDCBD, 0x7ADD }, { 0xDCBE, 0x8F27 },
+	{ 0xDCBF, 0x9920 }, { 0xDCC0, 0x9A08 }, { 0xDCC1, 0x4FDD }, { 0xDCC2, 0x5821 }, { 0xDCC3, 0x5831 }, { 0xDCC4, 0x5BF6 }, { 0xDCC5, 0x666E }, { 0xDCC6, 0x6B65 },
+	{ 0xDCC7, 0x6D11 }, { 0xDCC8, 0x6E7A }, { 0xDCC9, 0x6F7D }, { 0xDCCA, 0x73E4 }, { 0xDCCB, 0x752B }, { 0xDCCC, 0x83E9 }, { 0xDCCD, 0x88DC }, { 0xDCCE, 0x8913 },
+	{ 0xDCCF, 0x8B5C }, { 0xDCD0, 0x8F14 }, { 0xDCD1, 0x4F0F }, { 0xDCD2, 0x50D5 }, { 0xDCD3, 0x5310 }, { 0xDCD4, 0x535C }, { 0xDCD5, 0x5B93 }, { 0xDCD6, 0x5FA9 },
+	{ 0xDCD7, 0x670D }, { 0xDCD8, 0x798F }, { 0xDCD9, 0x8179 }, { 0xDCDA, 0x832F }, { 0xDCDB, 0x8514 }, { 0xDCDC, 0x8907 }, { 0xDCDD, 0x8986 }, { 0xDCDE, 0x8F39 },
+	{ 0xDCDF, 0x8F3B }, { 0xDCE0, 0x99A5 }, { 0xDCE1, 0x9C12 }, { 0xDCE2, 0x672C }, { 0xDCE3, 0x4E76 }, { 0xDCE4, 0x4FF8 }, { 0xDCE5, 0x5949 }, { 0xDCE6, 0x5C01 },
+	{ 0xDCE7, 0x5CEF }, { 0xDCE8, 0x5CF0 }, { 0xDCE9, 0x6367 }, { 0xDCEA, 0x68D2 }, { 0xDCEB, 0x70FD }, { 0xDCEC, 0x71A2 }, { 0xDCED, 0x742B }, { 0xDCEE, 0x7E2B },
+	{ 0xDCEF, 0x84EC }, { 0xDCF0, 0x8702 }, { 0xDCF1, 0x9022 }, { 0xDCF2, 0x92D2 }, { 0xDCF3, 0x9CF3 }, { 0xDCF4, 0x4E0D }, { 0xDCF5, 0x4ED8 }, { 0xDCF6, 0x4FEF },
+	{ 0xDCF7, 0x5085 }, { 0xDCF8, 0x5256 }, { 0xDCF9, 0x526F }, { 0xDCFA, 0x5426 }, { 0xDCFB, 0x5490 }, { 0xDCFC, 0x57E0 }, { 0xDCFD, 0x592B }, { 0xDCFE, 0x5A66 },
+	{ 0xDDA1, 0x5B5A }, { 0xDDA2, 0x5B75 }, { 0xDDA3, 0x5BCC }, { 0xDDA4, 0x5E9C }, { 0xDDA5, 0xF966 }, { 0xDDA6, 0x6276 }, { 0xDDA7, 0x6577 }, { 0xDDA8, 0x65A7 },
+	{ 0xDDA9, 0x6D6E }, { 0xDDAA, 0x6EA5 }, { 0xDDAB, 0x7236 }, { 0xDDAC, 0x7B26 }, { 0xDDAD, 0x7C3F }, { 0xDDAE, 0x7F36 }, { 0xDDAF, 0x8150 }, { 0xDDB0, 0x8151 },
+	{ 0xDDB1, 0x819A }, { 0xDDB2, 0x8240 }, { 0xDDB3, 0x8299 }, { 0xDDB4, 0x83A9 }, { 0xDDB5, 0x8A03 }, { 0xDDB6, 0x8CA0 }, { 0xDDB7, 0x8CE6 }, { 0xDDB8, 0x8CFB },
+	{ 0xDDB9, 0x8D74 }, { 0xDDBA, 0x8DBA }, { 0xDDBB, 0x90E8 }, { 0xDDBC, 0x91DC }, { 0xDDBD, 0x961C }, { 0xDDBE, 0x9644 }, { 0xDDBF, 0x99D9 }, { 0xDDC0, 0x9CE7 },
+	{ 0xDDC1, 0x5317 }, { 0xDDC2, 0x5206 }, { 0xDDC3, 0x5429 }, { 0xDDC4, 0x5674 }, { 0xDDC5, 0x58B3 }, { 0xDDC6, 0x5954 }, { 0xDDC7, 0x596E }, { 0xDDC8, 0x5FFF },
+	{ 0xDDC9, 0x61A4 }, { 0xDDCA, 0x626E }, { 0xDDCB, 0x6610 }, { 0xDDCC, 0x6C7E }, { 0xDDCD, 0x711A }, { 0xDDCE, 0x76C6 }, { 0xDDCF, 0x7C89 }, { 0xDDD0, 0x7CDE },
+	{ 0xDDD1, 0x7D1B }, { 0xDDD2, 0x82AC }, { 0xDDD3, 0x8CC1 }, { 0xDDD4, 0x96F0 }, { 0xDDD5, 0xF967 }, { 0xDDD6, 0x4F5B }, { 0xDDD7, 0x5F17 }, { 0xDDD8, 0x5F7F },
+	{ 0xDDD9, 0x62C2 }, { 0xDDDA, 0x5D29 }, { 0xDDDB, 0x670B }, { 0xDDDC, 0x68DA }, { 0xDDDD, 0x787C }, { 0xDDDE, 0x7E43 }, { 0xDDDF, 0x9D6C }, { 0xDDE0, 0x4E15 },
+	{ 0xDDE1, 0x5099 }, { 0xDDE2, 0x5315 }, { 0xDDE3, 0x532A }, { 0xDDE4, 0x5351 }, { 0xDDE5, 0x5983 }, { 0xDDE6, 0x5A62 }, { 0xDDE7, 0x5E87 }, { 0xDDE8, 0x60B2 },
+	{ 0xDDE9, 0x618A }, { 0xDDEA, 0x6249 }, { 0xDDEB, 0x6279 }, { 0xDDEC, 0x6590 }, { 0xDDED, 0x6787 }, { 0xDDEE, 0x69A7 }, { 0xDDEF, 0x6BD4 }, { 0xDDF0, 0x6BD6 },
+	{ 0xDDF1, 0x6BD7 }, { 0xDDF2, 0x6BD8 }, { 0xDDF3, 0x6CB8 }, { 0xDDF4, 0xF968 }, { 0xDDF5, 0x7435 }, { 0xDDF6, 0x75FA }, { 0xDDF7, 0x7812 }, { 0xDDF8, 0x7891 },
+	{ 0xDDF9, 0x79D5 }, { 0xDDFA, 0x79D8 }, { 0xDDFB, 0x7C83 }, { 0xDDFC, 0x7DCB }, { 0xDDFD, 0x7FE1 }, { 0xDDFE, 0x80A5 }, { 0xDEA1, 0x813E }, { 0xDEA2, 0x81C2 },
+	{ 0xDEA3, 0x83F2 }, { 0xDEA4, 0x871A }, { 0xDEA5, 0x88E8 }, { 0xDEA6, 0x8AB9 }, { 0xDEA7, 0x8B6C }, { 0xDEA8, 0x8CBB }, { 0xDEA9, 0x9119 }, { 0xDEAA, 0x975E },
+	{ 0xDEAB, 0x98DB }, { 0xDEAC, 0x9F3B }, { 0xDEAD, 0x56AC }, { 0xDEAE, 0x5B2A }, { 0xDEAF, 0x5F6C }, { 0xDEB0, 0x658C }, { 0xDEB1, 0x6AB3 }, { 0xDEB2, 0x6BAF },
+	{ 0xDEB3, 0x6D5C }, { 0xDEB4, 0x6FF1 }, { 0xDEB5, 0x7015 }, { 0xDEB6, 0x725D }, { 0xDEB7, 0x73AD }, { 0xDEB8, 0x8CA7 }, { 0xDEB9, 0x8CD3 }, { 0xDEBA, 0x983B },
+	{ 0xDEBB, 0x6191 }, { 0xDEBC, 0x6C37 }, { 0xDEBD, 0x8058 }, { 0xDEBE, 0x9A01 }, { 0xDEBF, 0x4E4D }, { 0xDEC0, 0x4E8B }, { 0xDEC1, 0x4E9B }, { 0xDEC2, 0x4ED5 },
+	{ 0xDEC3, 0x4F3A }, { 0xDEC4, 0x4F3C }, { 0xDEC5, 0x4F7F }, { 0xDEC6, 0x4FDF }, { 0xDEC7, 0x50FF }, { 0xDEC8, 0x53F2 }, { 0xDEC9, 0x53F8 }, { 0xDECA, 0x5506 },
+	{ 0xDECB, 0x55E3 }, { 0xDECC, 0x56DB }, { 0xDECD, 0x58EB }, { 0xDECE, 0x5962 }, { 0xDECF, 0x5A11 }, { 0xDED0, 0x5BEB }, { 0xDED1, 0x5BFA }, { 0xDED2, 0x5C04 },
+	{ 0xDED3, 0x5DF3 }, { 0xDED4, 0x5E2B }, { 0xDED5, 0x5F99 }, { 0xDED6, 0x601D }, { 0xDED7, 0x6368 }, { 0xDED8, 0x659C }, { 0xDED9, 0x65AF }, { 0xDEDA, 0x67F6 },
+	{ 0xDEDB, 0x67FB }, { 0xDEDC, 0x68AD }, { 0xDEDD, 0x6B7B }, { 0xDEDE, 0x6C99 }, { 0xDEDF, 0x6CD7 }, { 0xDEE0, 0x6E23 }, { 0xDEE1, 0x7009 }, { 0xDEE2, 0x7345 },
+	{ 0xDEE3, 0x7802 }, { 0xDEE4, 0x793E }, { 0xDEE5, 0x7940 }, { 0xDEE6, 0x7960 }, { 0xDEE7, 0x79C1 }, { 0xDEE8, 0x7BE9 }, { 0xDEE9, 0x7D17 }, { 0xDEEA, 0x7D72 },
+	{ 0xDEEB, 0x8086 }, { 0xDEEC, 0x820D }, { 0xDEED, 0x838E }, { 0xDEEE, 0x84D1 }, { 0xDEEF, 0x86C7 }, { 0xDEF0, 0x88DF }, { 0xDEF1, 0x8A50 }, { 0xDEF2, 0x8A5E },
+	{ 0xDEF3, 0x8B1D }, { 0xDEF4, 0x8CDC }, { 0xDEF5, 0x8D66 }, { 0xDEF6, 0x8FAD }, { 0xDEF7, 0x90AA }, { 0xDEF8, 0x98FC }, { 0xDEF9, 0x99DF }, { 0xDEFA, 0x9E9D },
+	{ 0xDEFB, 0x524A }, { 0xDEFC, 0xF969 }, { 0xDEFD, 0x6714 }, { 0xDEFE, 0xF96A }, { 0xDFA1, 0x5098 }, { 0xDFA2, 0x522A }, { 0xDFA3, 0x5C71 }, { 0xDFA4, 0x6563 },
+	{ 0xDFA5, 0x6C55 }, { 0xDFA6, 0x73CA }, { 0xDFA7, 0x7523 }, { 0xDFA8, 0x759D }, { 0xDFA9, 0x7B97 }, { 0xDFAA, 0x849C }, { 0xDFAB, 0x9178 }, { 0xDFAC, 0x9730 },
+	{ 0xDFAD, 0x4E77 }, { 0xDFAE, 0x6492 }, { 0xDFAF, 0x6BBA }, { 0xDFB0, 0x715E }, { 0xDFB1, 0x85A9 }, { 0xDFB2, 0x4E09 }, { 0xDFB3, 0xF96B }, { 0xDFB4, 0x6749 },
+	{ 0xDFB5, 0x68EE }, { 0xDFB6, 0x6E17 }, { 0xDFB7, 0x829F }, { 0xDFB8, 0x8518 }, { 0xDFB9, 0x886B }, { 0xDFBA, 0x63F7 }, { 0xDFBB, 0x6F81 }, { 0xDFBC, 0x9212 },
+	{ 0xDFBD, 0x98AF }, { 0xDFBE, 0x4E0A }, { 0xDFBF, 0x50B7 }, { 0xDFC0, 0x50CF }, { 0xDFC1, 0x511F }, { 0xDFC2, 0x5546 }, { 0xDFC3, 0x55AA }, { 0xDFC4, 0x5617 },
+	{ 0xDFC5, 0x5B40 }, { 0xDFC6, 0x5C19 }, { 0xDFC7, 0x5CE0 }, { 0xDFC8, 0x5E38 }, { 0xDFC9, 0x5E8A }, { 0xDFCA, 0x5EA0 }, { 0xDFCB, 0x5EC2 }, { 0xDFCC, 0x60F3 },
+	{ 0xDFCD, 0x6851 }, { 0xDFCE, 0x6A61 }, { 0xDFCF, 0x6E58 }, { 0xDFD0, 0x723D }, { 0xDFD1, 0x7240 }, { 0xDFD2, 0x72C0 }, { 0xDFD3, 0x76F8 }, { 0xDFD4, 0x7965 },
+	{ 0xDFD5, 0x7BB1 }, { 0xDFD6, 0x7FD4 }, { 0xDFD7, 0x88F3 }, { 0xDFD8, 0x89F4 }, { 0xDFD9, 0x8A73 }, { 0xDFDA, 0x8C61 }, { 0xDFDB, 0x8CDE }, { 0xDFDC, 0x971C },
+	{ 0xDFDD, 0x585E }, { 0xDFDE, 0x74BD }, { 0xDFDF, 0x8CFD }, { 0xDFE0, 0x55C7 }, { 0xDFE1, 0xF96C }, { 0xDFE2, 0x7A61 }, { 0xDFE3, 0x7D22 }, { 0xDFE4, 0x8272 },
+	{ 0xDFE5, 0x7272 }, { 0xDFE6, 0x751F }, { 0xDFE7, 0x7525 }, { 0xDFE8, 0xF96D }, { 0xDFE9, 0x7B19 }, { 0xDFEA, 0x5885 }, { 0xDFEB, 0x58FB }, { 0xDFEC, 0x5DBC },
+	{ 0xDFED, 0x5E8F }, { 0xDFEE, 0x5EB6 }, { 0xDFEF, 0x5F90 }, { 0xDFF0, 0x6055 }, { 0xDFF1, 0x6292 }, { 0xDFF2, 0x637F }, { 0xDFF3, 0x654D }, { 0xDFF4, 0x6691 },
+	{ 0xDFF5, 0x66D9 }, { 0xDFF6, 0x66F8 }, { 0xDFF7, 0x6816 }, { 0xDFF8, 0x68F2 }, { 0xDFF9, 0x7280 }, { 0xDFFA, 0x745E }, { 0xDFFB, 0x7B6E }, { 0xDFFC, 0x7D6E },
+	{ 0xDFFD, 0x7DD6 }, { 0xDFFE, 0x7F72 }, { 0xE0A1, 0x80E5 }, { 0xE0A2, 0x8212 }, { 0xE0A3, 0x85AF }, { 0xE0A4, 0x897F }, { 0xE0A5, 0x8A93 }, { 0xE0A6, 0x901D },
+	{ 0xE0A7, 0x92E4 }, { 0xE0A8, 0x9ECD }, { 0xE0A9, 0x9F20 }, { 0xE0AA, 0x5915 }, { 0xE0AB, 0x596D }, { 0xE0AC, 0x5E2D }, { 0xE0AD, 0x60DC }, { 0xE0AE, 0x6614 },
+	{ 0xE0AF, 0x6673 }, { 0xE0B0, 0x6790 }, { 0xE0B1, 0x6C50 }, { 0xE0B2, 0x6DC5 }, { 0xE0B3, 0x6F5F }, { 0xE0B4, 0x77F3 }, { 0xE0B5, 0x78A9 }, { 0xE0B6, 0x84C6 },
+	{ 0xE0B7, 0x91CB }, { 0xE0B8, 0x932B }, { 0xE0B9, 0x4ED9 }, { 0xE0BA, 0x50CA }, { 0xE0BB, 0x5148 }, { 0xE0BC, 0x5584 }, { 0xE0BD, 0x5B0B }, { 0xE0BE, 0x5BA3 },
+	{ 0xE0BF, 0x6247 }, { 0xE0C0, 0x657E }, { 0xE0C1, 0x65CB }, { 0xE0C2, 0x6E32 }, { 0xE0C3, 0x717D }, { 0xE0C4, 0x7401 }, { 0xE0C5, 0x7444 }, { 0xE0C6, 0x7487 },
+	{ 0xE0C7, 0x74BF }, { 0xE0C8, 0x766C }, { 0xE0C9, 0x79AA }, { 0xE0CA, 0x7DDA }, { 0xE0CB, 0x7E55 }, { 0xE0CC, 0x7FA8 }, { 0xE0CD, 0x817A }, { 0xE0CE, 0x81B3 },
+	{ 0xE0CF, 0x8239 }, { 0xE0D0, 0x861A }, { 0xE0D1, 0x87EC }, { 0xE0D2, 0x8A75 }, { 0xE0D3, 0x8DE3 }, { 0xE0D4, 0x9078 }, { 0xE0D5, 0x9291 }, { 0xE0D6, 0x9425 },
+	{ 0xE0D7, 0x994D }, { 0xE0D8, 0x9BAE }, { 0xE0D9, 0x5368 }, { 0xE0DA, 0x5C51 }, { 0xE0DB, 0x6954 }, { 0xE0DC, 0x6CC4 }, { 0xE0DD, 0x6D29 }, { 0xE0DE, 0x6E2B },
+	{ 0xE0DF, 0x820C }, { 0xE0E0, 0x859B }, { 0xE0E1, 0x893B }, { 0xE0E2, 0x8A2D }, { 0xE0E3, 0x8AAA }, { 0xE0E4, 0x96EA }, { 0xE0E5, 0x9F67 }, { 0xE0E6, 0x5261 },
+	{ 0xE0E7, 0x66B9 }, { 0xE0E8, 0x6BB2 }, { 0xE0E9, 0x7E96 }, { 0xE0EA, 0x87FE }, { 0xE0EB, 0x8D0D }, { 0xE0EC, 0x9583 }, { 0xE0ED, 0x965D }, { 0xE0EE, 0x651D },
+	{ 0xE0EF, 0x6D89 }, { 0xE0F0, 0x71EE }, { 0xE0F1, 0xF96E }, { 0xE0F2, 0x57CE }, { 0xE0F3, 0x59D3 }, { 0xE0F4, 0x5BAC }, { 0xE0F5, 0x6027 }, { 0xE0F6, 0x60FA },
+	{ 0xE0F7, 0x6210 }, { 0xE0F8, 0x661F }, { 0xE0F9, 0x665F }, { 0xE0FA, 0x7329 }, { 0xE0FB, 0x73F9 }, { 0xE0FC, 0x76DB }, { 0xE0FD, 0x7701 }, { 0xE0FE, 0x7B6C },
+	{ 0xE1A1, 0x8056 }, { 0xE1A2, 0x8072 }, { 0xE1A3, 0x8165 }, { 0xE1A4, 0x8AA0 }, { 0xE1A5, 0x9192 }, { 0xE1A6, 0x4E16 }, { 0xE1A7, 0x52E2 }, { 0xE1A8, 0x6B72 },
+	{ 0xE1A9, 0x6D17 }, { 0xE1AA, 0x7A05 }, { 0xE1AB, 0x7B39 }, { 0xE1AC, 0x7D30 }, { 0xE1AD, 0xF96F }, { 0xE1AE, 0x8CB0 }, { 0xE1AF, 0x53EC }, { 0xE1B0, 0x562F },
+	{ 0xE1B1, 0x5851 }, { 0xE1B2, 0x5BB5 }, { 0xE1B3, 0x5C0F }, { 0xE1B4, 0x5C11 }, { 0xE1B5, 0x5DE2 }, { 0xE1B6, 0x6240 }, { 0xE1B7, 0x6383 }, { 0xE1B8, 0x6414 },
+	{ 0xE1B9, 0x662D }, { 0xE1BA, 0x68B3 }, { 0xE1BB, 0x6CBC }, { 0xE1BC, 0x6D88 }, { 0xE1BD, 0x6EAF }, { 0xE1BE, 0x701F }, { 0xE1BF, 0x70A4 }, { 0xE1C0, 0x71D2 },
+	{ 0xE1C1, 0x7526 }, { 0xE1C2, 0x758F }, { 0xE1C3, 0x758E }, { 0xE1C4, 0x7619 }, { 0xE1C5, 0x7B11 }, { 0xE1C6, 0x7BE0 }, { 0xE1C7, 0x7C2B }, { 0xE1C8, 0x7D20 },
+	{ 0xE1C9, 0x7D39 }, { 0xE1CA, 0x852C }, { 0xE1CB, 0x856D }, { 0xE1CC, 0x8607 }, { 0xE1CD, 0x8A34 }, { 0xE1CE, 0x900D }, { 0xE1CF, 0x9061 }, { 0xE1D0, 0x90B5 },
+	{ 0xE1D1, 0x92B7 }, { 0xE1D2, 0x97F6 }, { 0xE1D3, 0x9A37 }, { 0xE1D4, 0x4FD7 }, { 0xE1D5, 0x5C6C }, { 0xE1D6, 0x675F }, { 0xE1D7, 0x6D91 }, { 0xE1D8, 0x7C9F },
+	{ 0xE1D9, 0x7E8C }, { 0xE1DA, 0x8B16 }, { 0xE1DB, 0x8D16 }, { 0xE1DC, 0x901F }, { 0xE1DD, 0x5B6B }, { 0xE1DE, 0x5DFD }, { 0xE1DF, 0x640D }, { 0xE1E0, 0x84C0 },
+	{ 0xE1E1, 0x905C }, { 0xE1E2, 0x98E1 }, { 0xE1E3, 0x7387 }, { 0xE1E4, 0x5B8B }, { 0xE1E5, 0x609A }, { 0xE1E6, 0x677E }, { 0xE1E7, 0x6DDE }, { 0xE1E8, 0x8A1F },
+	{ 0xE1E9, 0x8AA6 }, { 0xE1EA, 0x9001 }, { 0xE1EB, 0x980C }, { 0xE1EC, 0x5237 }, { 0xE1ED, 0xF970 }, { 0xE1EE, 0x7051 }, { 0xE1EF, 0x788E }, { 0xE1F0, 0x9396 },
+	{ 0xE1F1, 0x8870 }, { 0xE1F2, 0x91D7 }, { 0xE1F3, 0x4FEE }, { 0xE1F4, 0x53D7 }, { 0xE1F5, 0x55FD }, { 0xE1F6, 0x56DA }, { 0xE1F7, 0x5782 }, { 0xE1F8, 0x58FD },
+	{ 0xE1F9, 0x5AC2 }, { 0xE1FA, 0x5B88 }, { 0xE1FB, 0x5CAB }, { 0xE1FC, 0x5CC0 }, { 0xE1FD, 0x5E25 }, { 0xE1FE, 0x6101 }, { 0xE2A1, 0x620D }, { 0xE2A2, 0x624B },
+	{ 0xE2A3, 0x6388 }, { 0xE2A4, 0x641C }, { 0xE2A5, 0x6536 }, { 0xE2A6, 0x6578 }, { 0xE2A7, 0x6A39 }, { 0xE2A8, 0x6B8A }, { 0xE2A9, 0x6C34 }, { 0xE2AA, 0x6D19 },
+	{ 0xE2AB, 0x6F31 }, { 0xE2AC, 0x71E7 }, { 0xE2AD, 0x72E9 }, { 0xE2AE, 0x7378 }, { 0xE2AF, 0x7407 }, { 0xE2B0, 0x74B2 }, { 0xE2B1, 0x7626 }, { 0xE2B2, 0x7761 },
+	{ 0xE2B3, 0x79C0 }, { 0xE2B4, 0x7A57 }, { 0xE2B5, 0x7AEA }, { 0xE2B6, 0x7CB9 }, { 0xE2B7, 0x7D8F }, { 0xE2B8, 0x7DAC }, { 0xE2B9, 0x7E61 }, { 0xE2BA, 0x7F9E },
+	{ 0xE2BB, 0x8129 }, { 0xE2BC, 0x8331 }, { 0xE2BD, 0x8490 }, { 0xE2BE, 0x84DA }, { 0xE2BF, 0x85EA }, { 0xE2C0, 0x8896 }, { 0xE2C1, 0x8AB0 }, { 0xE2C2, 0x8B90 },
+	{ 0xE2C3, 0x8F38 }, { 0xE2C4, 0x9042 }, { 0xE2C5, 0x9083 }, { 0xE2C6, 0x916C }, { 0xE2C7, 0x9296 }, { 0xE2C8, 0x92B9 }, { 0xE2C9, 0x968B }, { 0xE2CA, 0x96A7 },
+	{ 0xE2CB, 0x96A8 }, { 0xE2CC, 0x96D6 }, { 0xE2CD, 0x9700 }, { 0xE2CE, 0x9808 }, { 0xE2CF, 0x9996 }, { 0xE2D0, 0x9AD3 }, { 0xE2D1, 0x9B1A }, { 0xE2D2, 0x53D4 },
+	{ 0xE2D3, 0x587E }, { 0xE2D4, 0x5919 }, { 0xE2D5, 0x5B70 }, { 0xE2D6, 0x5BBF }, { 0xE2D7, 0x6DD1 }, { 0xE2D8, 0x6F5A }, { 0xE2D9, 0x719F }, { 0xE2DA, 0x7421 },
+	{ 0xE2DB, 0x74B9 }, { 0xE2DC, 0x8085 }, { 0xE2DD, 0x83FD }, { 0xE2DE, 0x5DE1 }, { 0xE2DF, 0x5F87 }, { 0xE2E0, 0x5FAA }, { 0xE2E1, 0x6042 }, { 0xE2E2, 0x65EC },
+	{ 0xE2E3, 0x6812 }, { 0xE2E4, 0x696F }, { 0xE2E5, 0x6A53 }, { 0xE2E6, 0x6B89 }, { 0xE2E7, 0x6D35 }, { 0xE2E8, 0x6DF3 }, { 0xE2E9, 0x73E3 }, { 0xE2EA, 0x76FE },
+	{ 0xE2EB, 0x77AC }, { 0xE2EC, 0x7B4D }, { 0xE2ED, 0x7D14 }, { 0xE2EE, 0x8123 }, { 0xE2EF, 0x821C }, { 0xE2F0, 0x8340 }, { 0xE2F1, 0x84F4 }, { 0xE2F2, 0x8563 },
+	{ 0xE2F3, 0x8A62 }, { 0xE2F4, 0x8AC4 }, { 0xE2F5, 0x9187 }, { 0xE2F6, 0x931E }, { 0xE2F7, 0x9806 }, { 0xE2F8, 0x99B4 }, { 0xE2F9, 0x620C }, { 0xE2FA, 0x8853 },
+	{ 0xE2FB, 0x8FF0 }, { 0xE2FC, 0x9265 }, { 0xE2FD, 0x5D07 }, { 0xE2FE, 0x5D27 }, { 0xE3A1, 0x5D69 }, { 0xE3A2, 0x745F }, { 0xE3A3, 0x819D }, { 0xE3A4, 0x8768 },
+	{ 0xE3A5, 0x6FD5 }, { 0xE3A6, 0x62FE }, { 0xE3A7, 0x7FD2 }, { 0xE3A8, 0x8936 }, { 0xE3A9, 0x8972 }, { 0xE3AA, 0x4E1E }, { 0xE3AB, 0x4E58 }, { 0xE3AC, 0x50E7 },
+	{ 0xE3AD, 0x52DD }, { 0xE3AE, 0x5347 }, { 0xE3AF, 0x627F }, { 0xE3B0, 0x6607 }, { 0xE3B1, 0x7E69 }, { 0xE3B2, 0x8805 }, { 0xE3B3, 0x965E }, { 0xE3B4, 0x4F8D },
+	{ 0xE3B5, 0x5319 }, { 0xE3B6, 0x5636 }, { 0xE3B7, 0x59CB }, { 0xE3B8, 0x5AA4 }, { 0xE3B9, 0x5C38 }, { 0xE3BA, 0x5C4E }, { 0xE3BB, 0x5C4D }, { 0xE3BC, 0x5E02 },
+	{ 0xE3BD, 0x5F11 }, { 0xE3BE, 0x6043 }, { 0xE3BF, 0x65BD }, { 0xE3C0, 0x662F }, { 0xE3C1, 0x6642 }, { 0xE3C2, 0x67BE }, { 0xE3C3, 0x67F4 }, { 0xE3C4, 0x731C },
+	{ 0xE3C5, 0x77E2 }, { 0xE3C6, 0x793A }, { 0xE3C7, 0x7FC5 }, { 0xE3C8, 0x8494 }, { 0xE3C9, 0x84CD }, { 0xE3CA, 0x8996 }, { 0xE3CB, 0x8A66 }, { 0xE3CC, 0x8A69 },
+	{ 0xE3CD, 0x8AE1 }, { 0xE3CE, 0x8C55 }, { 0xE3CF, 0x8C7A }, { 0xE3D0, 0x57F4 }, { 0xE3D1, 0x5BD4 }, { 0xE3D2, 0x5F0F }, { 0xE3D3, 0x606F }, { 0xE3D4, 0x62ED },
+	{ 0xE3D5, 0x690D }, { 0xE3D6, 0x6B96 }, { 0xE3D7, 0x6E5C }, { 0xE3D8, 0x7184 }, { 0xE3D9, 0x7BD2 }, { 0xE3DA, 0x8755 }, { 0xE3DB, 0x8B58 }, { 0xE3DC, 0x8EFE },
+	{ 0xE3DD, 0x98DF }, { 0xE3DE, 0x98FE }, { 0xE3DF, 0x4F38 }, { 0xE3E0, 0x4F81 }, { 0xE3E1, 0x4FE1 }, { 0xE3E2, 0x547B }, { 0xE3E3, 0x5A20 }, { 0xE3E4, 0x5BB8 },
+	{ 0xE3E5, 0x613C }, { 0xE3E6, 0x65B0 }, { 0xE3E7, 0x6668 }, { 0xE3E8, 0x71FC }, { 0xE3E9, 0x7533 }, { 0xE3EA, 0x795E }, { 0xE3EB, 0x7D33 }, { 0xE3EC, 0x814E },
+	{ 0xE3ED, 0x81E3 }, { 0xE3EE, 0x8398 }, { 0xE3EF, 0x85AA }, { 0xE3F0, 0x85CE }, { 0xE3F1, 0x8703 }, { 0xE3F2, 0x8A0A }, { 0xE3F3, 0x8EAB }, { 0xE3F4, 0x8F9B },
+	{ 0xE3F5, 0xF971 }, { 0xE3F6, 0x8FC5 }, { 0xE3F7, 0x5931 }, { 0xE3F8, 0x5BA4 }, { 0xE3F9, 0x5BE6 }, { 0xE3FA, 0x6089 }, { 0xE3FB, 0x5BE9 }, { 0xE3FC, 0x5C0B },
+	{ 0xE3FD, 0x5FC3 }, { 0xE3FE, 0x6C81 }, { 0xE4A1, 0xF972 }, { 0xE4A2, 0x6DF1 }, { 0xE4A3, 0x700B }, { 0xE4A4, 0x751A }, { 0xE4A5, 0x82AF }, { 0xE4A6, 0x8AF6 },
+	{ 0xE4A7, 0x4EC0 }, { 0xE4A8, 0x5341 }, { 0xE4A9, 0xF973 }, { 0xE4AA, 0x96D9 }, { 0xE4AB, 0x6C0F }, { 0xE4AC, 0x4E9E }, { 0xE4AD, 0x4FC4 }, { 0xE4AE, 0x5152 },
+	{ 0xE4AF, 0x555E }, { 0xE4B0, 0x5A25 }, { 0xE4B1, 0x5CE8 }, { 0xE4B2, 0x6211 }, { 0xE4B3, 0x7259 }, { 0xE4B4, 0x82BD }, { 0xE4B5, 0x83AA }, { 0xE4B6, 0x86FE },
+	{ 0xE4B7, 0x8859 }, { 0xE4B8, 0x8A1D }, { 0xE4B9, 0x963F }, { 0xE4BA, 0x96C5 }, { 0xE4BB, 0x9913 }, { 0xE4BC, 0x9D09 }, { 0xE4BD, 0x9D5D }, { 0xE4BE, 0x580A },
+	{ 0xE4BF, 0x5CB3 }, { 0xE4C0, 0x5DBD }, { 0xE4C1, 0x5E44 }, { 0xE4C2, 0x60E1 }, { 0xE4C3, 0x6115 }, { 0xE4C4, 0x63E1 }, { 0xE4C5, 0x6A02 }, { 0xE4C6, 0x6E25 },
+	{ 0xE4C7, 0x9102 }, { 0xE4C8, 0x9354 }, { 0xE4C9, 0x984E }, { 0xE4CA, 0x9C10 }, { 0xE4CB, 0x9F77 }, { 0xE4CC, 0x5B89 }, { 0xE4CD, 0x5CB8 }, { 0xE4CE, 0x6309 },
+	{ 0xE4CF, 0x664F }, { 0xE4D0, 0x6848 }, { 0xE4D1, 0x773C }, { 0xE4D2, 0x96C1 }, { 0xE4D3, 0x978D }, { 0xE4D4, 0x9854 }, { 0xE4D5, 0x9B9F }, { 0xE4D6, 0x65A1 },
+	{ 0xE4D7, 0x8B01 }, { 0xE4D8, 0x8ECB }, { 0xE4D9, 0x95BC }, { 0xE4DA, 0x5535 }, { 0xE4DB, 0x5CA9 }, { 0xE4DC, 0x5DD6 }, { 0xE4DD, 0x5EB5 }, { 0xE4DE, 0x6697 },
+	{ 0xE4DF, 0x764C }, { 0xE4E0, 0x83F4 }, { 0xE4E1, 0x95C7 }, { 0xE4E2, 0x58D3 }, { 0xE4E3, 0x62BC }, { 0xE4E4, 0x72CE }, { 0xE4E5, 0x9D28 }, { 0xE4E6, 0x4EF0 },
+	{ 0xE4E7, 0x592E }, { 0xE4E8, 0x600F }, { 0xE4E9, 0x663B }, { 0xE4EA, 0x6B83 }, { 0xE4EB, 0x79E7 }, { 0xE4EC, 0x9D26 }, { 0xE4ED, 0x5393 }, { 0xE4EE, 0x54C0 },
+	{ 0xE4EF, 0x57C3 }, { 0xE4F0, 0x5D16 }, { 0xE4F1, 0x611B }, { 0xE4F2, 0x66D6 }, { 0xE4F3, 0x6DAF }, { 0xE4F4, 0x788D }, { 0xE4F5, 0x827E }, { 0xE4F6, 0x9698 },
+	{ 0xE4F7, 0x9744 }, { 0xE4F8, 0x5384 }, { 0xE4F9, 0x627C }, { 0xE4FA, 0x6396 }, { 0xE4FB, 0x6DB2 }, { 0xE4FC, 0x7E0A }, { 0xE4FD, 0x814B }, { 0xE4FE, 0x984D },
+	{ 0xE5A1, 0x6AFB }, { 0xE5A2, 0x7F4C }, { 0xE5A3, 0x9DAF }, { 0xE5A4, 0x9E1A }, { 0xE5A5, 0x4E5F }, { 0xE5A6, 0x503B }, { 0xE5A7, 0x51B6 }, { 0xE5A8, 0x591C },
+	{ 0xE5A9, 0x60F9 }, { 0xE5AA, 0x63F6 }, { 0xE5AB, 0x6930 }, { 0xE5AC, 0x723A }, { 0xE5AD, 0x8036 }, { 0xE5AE, 0xF974 }, { 0xE5AF, 0x91CE }, { 0xE5B0, 0x5F31 },
+	{ 0xE5B1, 0xF975 }, { 0xE5B2, 0xF976 }, { 0xE5B3, 0x7D04 }, { 0xE5B4, 0x82E5 }, { 0xE5B5, 0x846F }, { 0xE5B6, 0x84BB }, { 0xE5B7, 0x85E5 }, { 0xE5B8, 0x8E8D },
+	{ 0xE5B9, 0xF977 }, { 0xE5BA, 0x4F6F }, { 0xE5BB, 0xF978 }, { 0xE5BC, 0xF979 }, { 0xE5BD, 0x58E4 }, { 0xE5BE, 0x5B43 }, { 0xE5BF, 0x6059 }, { 0xE5C0, 0x63DA },
+	{ 0xE5C1, 0x6518 }, { 0xE5C2, 0x656D }, { 0xE5C3, 0x6698 }, { 0xE5C4, 0xF97A }, { 0xE5C5, 0x694A }, { 0xE5C6, 0x6A23 }, { 0xE5C7, 0x6D0B }, { 0xE5C8, 0x7001 },
+	{ 0xE5C9, 0x716C }, { 0xE5CA, 0x75D2 }, { 0xE5CB, 0x760D }, { 0xE5CC, 0x79B3 }, { 0xE5CD, 0x7A70 }, { 0xE5CE, 0xF97B }, { 0xE5CF, 0x7F8A }, { 0xE5D0, 0xF97C },
+	{ 0xE5D1, 0x8944 }, { 0xE5D2, 0xF97D }, { 0xE5D3, 0x8B93 }, { 0xE5D4, 0x91C0 }, { 0xE5D5, 0x967D }, { 0xE5D6, 0xF97E }, { 0xE5D7, 0x990A }, { 0xE5D8, 0x5704 },
+	{ 0xE5D9, 0x5FA1 }, { 0xE5DA, 0x65BC }, { 0xE5DB, 0x6F01 }, { 0xE5DC, 0x7600 }, { 0xE5DD, 0x79A6 }, { 0xE5DE, 0x8A9E }, { 0xE5DF, 0x99AD }, { 0xE5E0, 0x9B5A },
+	{ 0xE5E1, 0x9F6C }, { 0xE5E2, 0x5104 }, { 0xE5E3, 0x61B6 }, { 0xE5E4, 0x6291 }, { 0xE5E5, 0x6A8D }, { 0xE5E6, 0x81C6 }, { 0xE5E7, 0x5043 }, { 0xE5E8, 0x5830 },
+	{ 0xE5E9, 0x5F66 }, { 0xE5EA, 0x7109 }, { 0xE5EB, 0x8A00 }, { 0xE5EC, 0x8AFA }, { 0xE5ED, 0x5B7C }, { 0xE5EE, 0x8616 }, { 0xE5EF, 0x4FFA }, { 0xE5F0, 0x513C },
+	{ 0xE5F1, 0x56B4 }, { 0xE5F2, 0x5944 }, { 0xE5F3, 0x63A9 }, { 0xE5F4, 0x6DF9 }, { 0xE5F5, 0x5DAA }, { 0xE5F6, 0x696D }, { 0xE5F7, 0x5186 }, { 0xE5F8, 0x4E88 },
+	{ 0xE5F9, 0x4F59 }, { 0xE5FA, 0xF97F }, { 0xE5FB, 0xF980 }, { 0xE5FC, 0xF981 }, { 0xE5FD, 0x5982 }, { 0xE5FE, 0xF982 }, { 0xE6A1, 0xF983 }, { 0xE6A2, 0x6B5F },
+	{ 0xE6A3, 0x6C5D }, { 0xE6A4, 0xF984 }, { 0xE6A5, 0x74B5 }, { 0xE6A6, 0x7916 }, { 0xE6A7, 0xF985 }, { 0xE6A8, 0x8207 }, { 0xE6A9, 0x8245 }, { 0xE6AA, 0x8339 },
+	{ 0xE6AB, 0x8F3F }, { 0xE6AC, 0x8F5D }, { 0xE6AD, 0xF986 }, { 0xE6AE, 0x9918 }, { 0xE6AF, 0xF987 }, { 0xE6B0, 0xF988 }, { 0xE6B1, 0xF989 }, { 0xE6B2, 0x4EA6 },
+	{ 0xE6B3, 0xF98A }, { 0xE6B4, 0x57DF }, { 0xE6B5, 0x5F79 }, { 0xE6B6, 0x6613 }, { 0xE6B7, 0xF98B }, { 0xE6B8, 0xF98C }, { 0xE6B9, 0x75AB }, { 0xE6BA, 0x7E79 },
+	{ 0xE6BB, 0x8B6F }, { 0xE6BC, 0xF98D }, { 0xE6BD, 0x9006 }, { 0xE6BE, 0x9A5B }, { 0xE6BF, 0x56A5 }, { 0xE6C0, 0x5827 }, { 0xE6C1, 0x59F8 }, { 0xE6C2, 0x5A1F },
+	{ 0xE6C3, 0x5BB4 }, { 0xE6C4, 0xF98E }, { 0xE6C5, 0x5EF6 }, { 0xE6C6, 0xF98F }, { 0xE6C7, 0xF990 }, { 0xE6C8, 0x6350 }, { 0xE6C9, 0x633B }, { 0xE6CA, 0xF991 },
+	{ 0xE6CB, 0x693D }, { 0xE6CC, 0x6C87 }, { 0xE6CD, 0x6CBF }, { 0xE6CE, 0x6D8E }, { 0xE6CF, 0x6D93 }, { 0xE6D0, 0x6DF5 }, { 0xE6D1, 0x6F14 }, { 0xE6D2, 0xF992 },
+	{ 0xE6D3, 0x70DF }, { 0xE6D4, 0x7136 }, { 0xE6D5, 0x7159 }, { 0xE6D6, 0xF993 }, { 0xE6D7, 0x71C3 }, { 0xE6D8, 0x71D5 }, { 0xE6D9, 0xF994 }, { 0xE6DA, 0x784F },
+	{ 0xE6DB, 0x786F }, { 0xE6DC, 0xF995 }, { 0xE6DD, 0x7B75 }, { 0xE6DE, 0x7DE3 }, { 0xE6DF, 0xF996 }, { 0xE6E0, 0x7E2F }, { 0xE6E1, 0xF997 }, { 0xE6E2, 0x884D },
+	{ 0xE6E3, 0x8EDF }, { 0xE6E4, 0xF998 }, { 0xE6E5, 0xF999 }, { 0xE6E6, 0xF99A }, { 0xE6E7, 0x925B }, { 0xE6E8, 0xF99B }, { 0xE6E9, 0x9CF6 }, { 0xE6EA, 0xF99C },
+	{ 0xE6EB, 0xF99D }, { 0xE6EC, 0xF99E }, { 0xE6ED, 0x6085 }, { 0xE6EE, 0x6D85 }, { 0xE6EF, 0xF99F }, { 0xE6F0, 0x71B1 }, { 0xE6F1, 0xF9A0 }, { 0xE6F2, 0xF9A1 },
+	{ 0xE6F3, 0x95B1 }, { 0xE6F4, 0x53AD }, { 0xE6F5, 0xF9A2 }, { 0xE6F6, 0xF9A3 }, { 0xE6F7, 0xF9A4 }, { 0xE6F8, 0x67D3 }, { 0xE6F9, 0xF9A5 }, { 0xE6FA, 0x708E },
+	{ 0xE6FB, 0x7130 }, { 0xE6FC, 0x7430 }, { 0xE6FD, 0x8276 }, { 0xE6FE, 0x82D2 }, { 0xE7A1, 0xF9A6 }, { 0xE7A2, 0x95BB }, { 0xE7A3, 0x9AE5 }, { 0xE7A4, 0x9E7D },
+	{ 0xE7A5, 0x66C4 }, { 0xE7A6, 0xF9A7 }, { 0xE7A7, 0x71C1 }, { 0xE7A8, 0x8449 }, { 0xE7A9, 0xF9A8 }, { 0xE7AA, 0xF9A9 }, { 0xE7AB, 0x584B }, { 0xE7AC, 0xF9AA },
+	{ 0xE7AD, 0xF9AB }, { 0xE7AE, 0x5DB8 }, { 0xE7AF, 0x5F71 }, { 0xE7B0, 0xF9AC }, { 0xE7B1, 0x6620 }, { 0xE7B2, 0x668E }, { 0xE7B3, 0x6979 }, { 0xE7B4, 0x69AE },
+	{ 0xE7B5, 0x6C38 }, { 0xE7B6, 0x6CF3 }, { 0xE7B7, 0x6E36 }, { 0xE7B8, 0x6F41 }, { 0xE7B9, 0x6FDA }, { 0xE7BA, 0x701B }, { 0xE7BB, 0x702F }, { 0xE7BC, 0x7150 },
+	{ 0xE7BD, 0x71DF }, { 0xE7BE, 0x7370 }, { 0xE7BF, 0xF9AD }, { 0xE7C0, 0x745B }, { 0xE7C1, 0xF9AE }, { 0xE7C2, 0x74D4 }, { 0xE7C3, 0x76C8 }, { 0xE7C4, 0x7A4E },
+	{ 0xE7C5, 0x7E93 }, { 0xE7C6, 0xF9AF }, { 0xE7C7, 0xF9B0 }, { 0xE7C8, 0x82F1 }, { 0xE7C9, 0x8A60 }, { 0xE7CA, 0x8FCE }, { 0xE7CB, 0xF9B1 }, { 0xE7CC, 0x9348 },
+	{ 0xE7CD, 0xF9B2 }, { 0xE7CE, 0x9719 }, { 0xE7CF, 0xF9B3 }, { 0xE7D0, 0xF9B4 }, { 0xE7D1, 0x4E42 }, { 0xE7D2, 0x502A }, { 0xE7D3, 0xF9B5 }, { 0xE7D4, 0x5208 },
+	{ 0xE7D5, 0x53E1 }, { 0xE7D6, 0x66F3 }, { 0xE7D7, 0x6C6D }, { 0xE7D8, 0x6FCA }, { 0xE7D9, 0x730A }, { 0xE7DA, 0x777F }, { 0xE7DB, 0x7A62 }, { 0xE7DC, 0x82AE },
+	{ 0xE7DD, 0x85DD }, { 0xE7DE, 0x8602 }, { 0xE7DF, 0xF9B6 }, { 0xE7E0, 0x88D4 }, { 0xE7E1, 0x8A63 }, { 0xE7E2, 0x8B7D }, { 0xE7E3, 0x8C6B }, { 0xE7E4, 0xF9B7 },
+	{ 0xE7E5, 0x92B3 }, { 0xE7E6, 0xF9B8 }, { 0xE7E7, 0x9713 }, { 0xE7E8, 0x9810 }, { 0xE7E9, 0x4E94 }, { 0xE7EA, 0x4F0D }, { 0xE7EB, 0x4FC9 }, { 0xE7EC, 0x50B2 },
+	{ 0xE7ED, 0x5348 }, { 0xE7EE, 0x543E }, { 0xE7EF, 0x5433 }, { 0xE7F0, 0x55DA }, { 0xE7F1, 0x5862 }, { 0xE7F2, 0x58BA }, { 0xE7F3, 0x5967 }, { 0xE7F4, 0x5A1B },
+	{ 0xE7F5, 0x5BE4 }, { 0xE7F6, 0x609F }, { 0xE7F7, 0xF9B9 }, { 0xE7F8, 0x61CA }, { 0xE7F9, 0x6556 }, { 0xE7FA, 0x65FF }, { 0xE7FB, 0x6664 }, { 0xE7FC, 0x68A7 },
+	{ 0xE7FD, 0x6C5A }, { 0xE7FE, 0x6FB3 }, { 0xE8A1, 0x70CF }, { 0xE8A2, 0x71AC }, { 0xE8A3, 0x7352 }, { 0xE8A4, 0x7B7D }, { 0xE8A5, 0x8708 }, { 0xE8A6, 0x8AA4 },
+	{ 0xE8A7, 0x9C32 }, { 0xE8A8, 0x9F07 }, { 0xE8A9, 0x5C4B }, { 0xE8AA, 0x6C83 }, { 0xE8AB, 0x7344 }, { 0xE8AC, 0x7389 }, { 0xE8AD, 0x923A }, { 0xE8AE, 0x6EAB },
+	{ 0xE8AF, 0x7465 }, { 0xE8B0, 0x761F }, { 0xE8B1, 0x7A69 }, { 0xE8B2, 0x7E15 }, { 0xE8B3, 0x860A }, { 0xE8B4, 0x5140 }, { 0xE8B5, 0x58C5 }, { 0xE8B6, 0x64C1 },
+	{ 0xE8B7, 0x74EE }, { 0xE8B8, 0x7515 }, { 0xE8B9, 0x7670 }, { 0xE8BA, 0x7FC1 }, { 0xE8BB, 0x9095 }, { 0xE8BC, 0x96CD }, { 0xE8BD, 0x9954 }, { 0xE8BE, 0x6E26 },
+	{ 0xE8BF, 0x74E6 }, { 0xE8C0, 0x7AA9 }, { 0xE8C1, 0x7AAA }, { 0xE8C2, 0x81E5 }, { 0xE8C3, 0x86D9 }, { 0xE8C4, 0x8778 }, { 0xE8C5, 0x8A1B }, { 0xE8C6, 0x5A49 },
+	{ 0xE8C7, 0x5B8C }, { 0xE8C8, 0x5B9B }, { 0xE8C9, 0x68A1 }, { 0xE8CA, 0x6900 }, { 0xE8CB, 0x6D63 }, { 0xE8CC, 0x73A9 }, { 0xE8CD, 0x7413 }, { 0xE8CE, 0x742C },
+	{ 0xE8CF, 0x7897 }, { 0xE8D0, 0x7DE9 }, { 0xE8D1, 0x7FEB }, { 0xE8D2, 0x8118 }, { 0xE8D3, 0x8155 }, { 0xE8D4, 0x839E }, { 0xE8D5, 0x8C4C }, { 0xE8D6, 0x962E },
+	{ 0xE8D7, 0x9811 }, { 0xE8D8, 0x66F0 }, { 0xE8D9, 0x5F80 }, { 0xE8DA, 0x65FA }, { 0xE8DB, 0x6789 }, { 0xE8DC, 0x6C6A }, { 0xE8DD, 0x738B }, { 0xE8DE, 0x502D },
+	{ 0xE8DF, 0x5A03 }, { 0xE8E0, 0x6B6A }, { 0xE8E1, 0x77EE }, { 0xE8E2, 0x5916 }, { 0xE8E3, 0x5D6C }, { 0xE8E4, 0x5DCD }, { 0xE8E5, 0x7325 }, { 0xE8E6, 0x754F },
+	{ 0xE8E7, 0xF9BA }, { 0xE8E8, 0xF9BB }, { 0xE8E9, 0x50E5 }, { 0xE8EA, 0x51F9 }, { 0xE8EB, 0x582F }, { 0xE8EC, 0x592D }, { 0xE8ED, 0x5996 }, { 0xE8EE, 0x59DA },
+	{ 0xE8EF, 0x5BE5 }, { 0xE8F0, 0xF9BC }, { 0xE8F1, 0xF9BD }, { 0xE8F2, 0x5DA2 }, { 0xE8F3, 0x62D7 }, { 0xE8F4, 0x6416 }, { 0xE8F5, 0x6493 }, { 0xE8F6, 0x64FE },
+	{ 0xE8F7, 0xF9BE }, { 0xE8F8, 0x66DC }, { 0xE8F9, 0xF9BF }, { 0xE8FA, 0x6A48 }, { 0xE8FB, 0xF9C0 }, { 0xE8FC, 0x71FF }, { 0xE8FD, 0x7464 }, { 0xE8FE, 0xF9C1 },
+	{ 0xE9A1, 0x7A88 }, { 0xE9A2, 0x7AAF }, { 0xE9A3, 0x7E47 }, { 0xE9A4, 0x7E5E }, { 0xE9A5, 0x8000 }, { 0xE9A6, 0x8170 }, { 0xE9A7, 0xF9C2 }, { 0xE9A8, 0x87EF },
+	{ 0xE9A9, 0x8981 }, { 0xE9AA, 0x8B20 }, { 0xE9AB, 0x9059 }, { 0xE9AC, 0xF9C3 }, { 0xE9AD, 0x9080 }, { 0xE9AE, 0x9952 }, { 0xE9AF, 0x617E }, { 0xE9B0, 0x6B32 },
+	{ 0xE9B1, 0x6D74 }, { 0xE9B2, 0x7E1F }, { 0xE9B3, 0x8925 }, { 0xE9B4, 0x8FB1 }, { 0xE9B5, 0x4FD1 }, { 0xE9B6, 0x50AD }, { 0xE9B7, 0x5197 }, { 0xE9B8, 0x52C7 },
+	{ 0xE9B9, 0x57C7 }, { 0xE9BA, 0x5889 }, { 0xE9BB, 0x5BB9 }, { 0xE9BC, 0x5EB8 }, { 0xE9BD, 0x6142 }, { 0xE9BE, 0x6995 }, { 0xE9BF, 0x6D8C }, { 0xE9C0, 0x6E67 },
+	{ 0xE9C1, 0x6EB6 }, { 0xE9C2, 0x7194 }, { 0xE9C3, 0x7462 }, { 0xE9C4, 0x7528 }, { 0xE9C5, 0x752C }, { 0xE9C6, 0x8073 }, { 0xE9C7, 0x8338 }, { 0xE9C8, 0x84C9 },
+	{ 0xE9C9, 0x8E0A }, { 0xE9CA, 0x9394 }, { 0xE9CB, 0x93DE }, { 0xE9CC, 0xF9C4 }, { 0xE9CD, 0x4E8E }, { 0xE9CE, 0x4F51 }, { 0xE9CF, 0x5076 }, { 0xE9D0, 0x512A },
+	{ 0xE9D1, 0x53C8 }, { 0xE9D2, 0x53CB }, { 0xE9D3, 0x53F3 }, { 0xE9D4, 0x5B87 }, { 0xE9D5, 0x5BD3 }, { 0xE9D6, 0x5C24 }, { 0xE9D7, 0x611A }, { 0xE9D8, 0x6182 },
+	{ 0xE9D9, 0x65F4 }, { 0xE9DA, 0x725B }, { 0xE9DB, 0x7397 }, { 0xE9DC, 0x7440 }, { 0xE9DD, 0x76C2 }, { 0xE9DE, 0x7950 }, { 0xE9DF, 0x7991 }, { 0xE9E0, 0x79B9 },
+	{ 0xE9E1, 0x7D06 }, { 0xE9E2, 0x7FBD }, { 0xE9E3, 0x828B }, { 0xE9E4, 0x85D5 }, { 0xE9E5, 0x865E }, { 0xE9E6, 0x8FC2 }, { 0xE9E7, 0x9047 }, { 0xE9E8, 0x90F5 },
+	{ 0xE9E9, 0x91EA }, { 0xE9EA, 0x9685 }, { 0xE9EB, 0x96E8 }, { 0xE9EC, 0x96E9 }, { 0xE9ED, 0x52D6 }, { 0xE9EE, 0x5F67 }, { 0xE9EF, 0x65ED }, { 0xE9F0, 0x6631 },
+	{ 0xE9F1, 0x682F }, { 0xE9F2, 0x715C }, { 0xE9F3, 0x7A36 }, { 0xE9F4, 0x90C1 }, { 0xE9F5, 0x980A }, { 0xE9F6, 0x4E91 }, { 0xE9F7, 0xF9C5 }, { 0xE9F8, 0x6A52 },
+	{ 0xE9F9, 0x6B9E }, { 0xE9FA, 0x6F90 }, { 0xE9FB, 0x7189 }, { 0xE9FC, 0x8018 }, { 0xE9FD, 0x82B8 }, { 0xE9FE, 0x8553 }, { 0xEAA1, 0x904B }, { 0xEAA2, 0x9695 },
+	{ 0xEAA3, 0x96F2 }, { 0xEAA4, 0x97FB }, { 0xEAA5, 0x851A }, { 0xEAA6, 0x9B31 }, { 0xEAA7, 0x4E90 }, { 0xEAA8, 0x718A }, { 0xEAA9, 0x96C4 }, { 0xEAAA, 0x5143 },
+	{ 0xEAAB, 0x539F }, { 0xEAAC, 0x54E1 }, { 0xEAAD, 0x5713 }, { 0xEAAE, 0x5712 }, { 0xEAAF, 0x57A3 }, { 0xEAB0, 0x5A9B }, { 0xEAB1, 0x5AC4 }, { 0xEAB2, 0x5BC3 },
+	{ 0xEAB3, 0x6028 }, { 0xEAB4, 0x613F }, { 0xEAB5, 0x63F4 }, { 0xEAB6, 0x6C85 }, { 0xEAB7, 0x6D39 }, { 0xEAB8, 0x6E72 }, { 0xEAB9, 0x6E90 }, { 0xEABA, 0x7230 },
+	{ 0xEABB, 0x733F }, { 0xEABC, 0x7457 }, { 0xEABD, 0x82D1 }, { 0xEABE, 0x8881 }, { 0xEABF, 0x8F45 }, { 0xEAC0, 0x9060 }, { 0xEAC1, 0xF9C6 }, { 0xEAC2, 0x9662 },
+	{ 0xEAC3, 0x9858 }, { 0xEAC4, 0x9D1B }, { 0xEAC5, 0x6708 }, { 0xEAC6, 0x8D8A }, { 0xEAC7, 0x925E }, { 0xEAC8, 0x4F4D }, { 0xEAC9, 0x5049 }, { 0xEACA, 0x50DE },
+	{ 0xEACB, 0x5371 }, { 0xEACC, 0x570D }, { 0xEACD, 0x59D4 }, { 0xEACE, 0x5A01 }, { 0xEACF, 0x5C09 }, { 0xEAD0, 0x6170 }, { 0xEAD1, 0x6690 }, { 0xEAD2, 0x6E2D },
+	{ 0xEAD3, 0x7232 }, { 0xEAD4, 0x744B }, { 0xEAD5, 0x7DEF }, { 0xEAD6, 0x80C3 }, { 0xEAD7, 0x840E }, { 0xEAD8, 0x8466 }, { 0xEAD9, 0x853F }, { 0xEADA, 0x875F },
+	{ 0xEADB, 0x885B }, { 0xEADC, 0x8918 }, { 0xEADD, 0x8B02 }, { 0xEADE, 0x9055 }, { 0xEADF, 0x97CB }, { 0xEAE0, 0x9B4F }, { 0xEAE1, 0x4E73 }, { 0xEAE2, 0x4F91 },
+	{ 0xEAE3, 0x5112 }, { 0xEAE4, 0x516A }, { 0xEAE5, 0xF9C7 }, { 0xEAE6, 0x552F }, { 0xEAE7, 0x55A9 }, { 0xEAE8, 0x5B7A }, { 0xEAE9, 0x5BA5 }, { 0xEAEA, 0x5E7C },
+	{ 0xEAEB, 0x5E7D }, { 0xEAEC, 0x5EBE }, { 0xEAED, 0x60A0 }, { 0xEAEE, 0x60DF }, { 0xEAEF, 0x6108 }, { 0xEAF0, 0x6109 }, { 0xEAF1, 0x63C4 }, { 0xEAF2, 0x6538 },
+	{ 0xEAF3, 0x6709 }, { 0xEAF4, 0xF9C8 }, { 0xEAF5, 0x67D4 }, { 0xEAF6, 0x67DA }, { 0xEAF7, 0xF9C9 }, { 0xEAF8, 0x6961 }, { 0xEAF9, 0x6962 }, { 0xEAFA, 0x6CB9 },
+	{ 0xEAFB, 0x6D27 }, { 0xEAFC, 0xF9CA }, { 0xEAFD, 0x6E38 }, { 0xEAFE, 0xF9CB }, { 0xEBA1, 0x6FE1 }, { 0xEBA2, 0x7336 }, { 0xEBA3, 0x7337 }, { 0xEBA4, 0xF9CC },
+	{ 0xEBA5, 0x745C }, { 0xEBA6, 0x7531 }, { 0xEBA7, 0xF9CD }, { 0xEBA8, 0x7652 }, { 0xEBA9, 0xF9CE }, { 0xEBAA, 0xF9CF }, { 0xEBAB, 0x7DAD }, { 0xEBAC, 0x81FE },
+	{ 0xEBAD, 0x8438 }, { 0xEBAE, 0x88D5 }, { 0xEBAF, 0x8A98 }, { 0xEBB0, 0x8ADB }, { 0xEBB1, 0x8AED }, { 0xEBB2, 0x8E30 }, { 0xEBB3, 0x8E42 }, { 0xEBB4, 0x904A },
+	{ 0xEBB5, 0x903E }, { 0xEBB6, 0x907A }, { 0xEBB7, 0x9149 }, { 0xEBB8, 0x91C9 }, { 0xEBB9, 0x936E }, { 0xEBBA, 0xF9D0 }, { 0xEBBB, 0xF9D1 }, { 0xEBBC, 0x5809 },
+	{ 0xEBBD, 0xF9D2 }, { 0xEBBE, 0x6BD3 }, { 0xEBBF, 0x8089 }, { 0xEBC0, 0x80B2 }, { 0xEBC1, 0xF9D3 }, { 0xEBC2, 0xF9D4 }, { 0xEBC3, 0x5141 }, { 0xEBC4, 0x596B },
+	{ 0xEBC5, 0x5C39 }, { 0xEBC6, 0xF9D5 }, { 0xEBC7, 0xF9D6 }, { 0xEBC8, 0x6F64 }, { 0xEBC9, 0x73A7 }, { 0xEBCA, 0x80E4 }, { 0xEBCB, 0x8D07 }, { 0xEBCC, 0xF9D7 },
+	{ 0xEBCD, 0x9217 }, { 0xEBCE, 0x958F }, { 0xEBCF, 0xF9D8 }, { 0xEBD0, 0xF9D9 }, { 0xEBD1, 0xF9DA }, { 0xEBD2, 0xF9DB }, { 0xEBD3, 0x807F }, { 0xEBD4, 0x620E },
+	{ 0xEBD5, 0x701C }, { 0xEBD6, 0x7D68 }, { 0xEBD7, 0x878D }, { 0xEBD8, 0xF9DC }, { 0xEBD9, 0x57A0 }, { 0xEBDA, 0x6069 }, { 0xEBDB, 0x6147 }, { 0xEBDC, 0x6BB7 },
+	{ 0xEBDD, 0x8ABE }, { 0xEBDE, 0x9280 }, { 0xEBDF, 0x96B1 }, { 0xEBE0, 0x4E59 }, { 0xEBE1, 0x541F }, { 0xEBE2, 0x6DEB }, { 0xEBE3, 0x852D }, { 0xEBE4, 0x9670 },
+	{ 0xEBE5, 0x97F3 }, { 0xEBE6, 0x98EE }, { 0xEBE7, 0x63D6 }, { 0xEBE8, 0x6CE3 }, { 0xEBE9, 0x9091 }, { 0xEBEA, 0x51DD }, { 0xEBEB, 0x61C9 }, { 0xEBEC, 0x81BA },
+	{ 0xEBED, 0x9DF9 }, { 0xEBEE, 0x4F9D }, { 0xEBEF, 0x501A }, { 0xEBF0, 0x5100 }, { 0xEBF1, 0x5B9C }, { 0xEBF2, 0x610F }, { 0xEBF3, 0x61FF }, { 0xEBF4, 0x64EC },
+	{ 0xEBF5, 0x6905 }, { 0xEBF6, 0x6BC5 }, { 0xEBF7, 0x7591 }, { 0xEBF8, 0x77E3 }, { 0xEBF9, 0x7FA9 }, { 0xEBFA, 0x8264 }, { 0xEBFB, 0x858F }, { 0xEBFC, 0x87FB },
+	{ 0xEBFD, 0x8863 }, { 0xEBFE, 0x8ABC }, { 0xECA1, 0x8B70 }, { 0xECA2, 0x91AB }, { 0xECA3, 0x4E8C }, { 0xECA4, 0x4EE5 }, { 0xECA5, 0x4F0A }, { 0xECA6, 0xF9DD },
+	{ 0xECA7, 0xF9DE }, { 0xECA8, 0x5937 }, { 0xECA9, 0x59E8 }, { 0xECAA, 0xF9DF }, { 0xECAB, 0x5DF2 }, { 0xECAC, 0x5F1B }, { 0xECAD, 0x5F5B }, { 0xECAE, 0x6021 },
+	{ 0xECAF, 0xF9E0 }, { 0xECB0, 0xF9E1 }, { 0xECB1, 0xF9E2 }, { 0xECB2, 0xF9E3 }, { 0xECB3, 0x723E }, { 0xECB4, 0x73E5 }, { 0xECB5, 0xF9E4 }, { 0xECB6, 0x7570 },
+	{ 0xECB7, 0x75CD }, { 0xECB8, 0xF9E5 }, { 0xECB9, 0x79FB }, { 0xECBA, 0xF9E6 }, { 0xECBB, 0x800C }, { 0xECBC, 0x8033 }, { 0xECBD, 0x8084 }, { 0xECBE, 0x82E1 },
+	{ 0xECBF, 0x8351 }, { 0xECC0, 0xF9E7 }, { 0xECC1, 0xF9E8 }, { 0xECC2, 0x8CBD }, { 0xECC3, 0x8CB3 }, { 0xECC4, 0x9087 }, { 0xECC5, 0xF9E9 }, { 0xECC6, 0xF9EA },
+	{ 0xECC7, 0x98F4 }, { 0xECC8, 0x990C }, { 0xECC9, 0xF9EB }, { 0xECCA, 0xF9EC }, { 0xECCB, 0x7037 }, { 0xECCC, 0x76CA }, { 0xECCD, 0x7FCA }, { 0xECCE, 0x7FCC },
+	{ 0xECCF, 0x7FFC }, { 0xECD0, 0x8B1A }, { 0xECD1, 0x4EBA }, { 0xECD2, 0x4EC1 }, { 0xECD3, 0x5203 }, { 0xECD4, 0x5370 }, { 0xECD5, 0xF9ED }, { 0xECD6, 0x54BD },
+	{ 0xECD7, 0x56E0 }, { 0xECD8, 0x59FB }, { 0xECD9, 0x5BC5 }, { 0xECDA, 0x5F15 }, { 0xECDB, 0x5FCD }, { 0xECDC, 0x6E6E }, { 0xECDD, 0xF9EE }, { 0xECDE, 0xF9EF },
+	{ 0xECDF, 0x7D6A }, { 0xECE0, 0x8335 }, { 0xECE1, 0xF9F0 }, { 0xECE2, 0x8693 }, { 0xECE3, 0x8A8D }, { 0xECE4, 0xF9F1 }, { 0xECE5, 0x976D }, { 0xECE6, 0x9777 },
+	{ 0xECE7, 0xF9F2 }, { 0xECE8, 0xF9F3 }, { 0xECE9, 0x4E00 }, { 0xECEA, 0x4F5A }, { 0xECEB, 0x4F7E }, { 0xECEC, 0x58F9 }, { 0xECED, 0x65E5 }, { 0xECEE, 0x6EA2 },
+	{ 0xECEF, 0x9038 }, { 0xECF0, 0x93B0 }, { 0xECF1, 0x99B9 }, { 0xECF2, 0x4EFB }, { 0xECF3, 0x58EC }, { 0xECF4, 0x598A }, { 0xECF5, 0x59D9 }, { 0xECF6, 0x6041 },
+	{ 0xECF7, 0xF9F4 }, { 0xECF8, 0xF9F5 }, { 0xECF9, 0x7A14 }, { 0xECFA, 0xF9F6 }, { 0xECFB, 0x834F }, { 0xECFC, 0x8CC3 }, { 0xECFD, 0x5165 }, { 0xECFE, 0x5344 },
+	{ 0xEDA1, 0xF9F7 }, { 0xEDA2, 0xF9F8 }, { 0xEDA3, 0xF9F9 }, { 0xEDA4, 0x4ECD }, { 0xEDA5, 0x5269 }, { 0xEDA6, 0x5B55 }, { 0xEDA7, 0x82BF }, { 0xEDA8, 0x4ED4 },
+	{ 0xEDA9, 0x523A }, { 0xEDAA, 0x54A8 }, { 0xEDAB, 0x59C9 }, { 0xEDAC, 0x59FF }, { 0xEDAD, 0x5B50 }, { 0xEDAE, 0x5B57 }, { 0xEDAF, 0x5B5C }, { 0xEDB0, 0x6063 },
+	{ 0xEDB1, 0x6148 }, { 0xEDB2, 0x6ECB }, { 0xEDB3, 0x7099 }, { 0xEDB4, 0x716E }, { 0xEDB5, 0x7386 }, { 0xEDB6, 0x74F7 }, { 0xEDB7, 0x75B5 }, { 0xEDB8, 0x78C1 },
+	{ 0xEDB9, 0x7D2B }, { 0xEDBA, 0x8005 }, { 0xEDBB, 0x81EA }, { 0xEDBC, 0x8328 }, { 0xEDBD, 0x8517 }, { 0xEDBE, 0x85C9 }, { 0xEDBF, 0x8AEE }, { 0xEDC0, 0x8CC7 },
+	{ 0xEDC1, 0x96CC }, { 0xEDC2, 0x4F5C }, { 0xEDC3, 0x52FA }, { 0xEDC4, 0x56BC }, { 0xEDC5, 0x65AB }, { 0xEDC6, 0x6628 }, { 0xEDC7, 0x707C }, { 0xEDC8, 0x70B8 },
+	{ 0xEDC9, 0x7235 }, { 0xEDCA, 0x7DBD }, { 0xEDCB, 0x828D }, { 0xEDCC, 0x914C }, { 0xEDCD, 0x96C0 }, { 0xEDCE, 0x9D72 }, { 0xEDCF, 0x5B71 }, { 0xEDD0, 0x68E7 },
+	{ 0xEDD1, 0x6B98 }, { 0xEDD2, 0x6F7A }, { 0xEDD3, 0x76DE }, { 0xEDD4, 0x5C91 }, { 0xEDD5, 0x66AB }, { 0xEDD6, 0x6F5B }, { 0xEDD7, 0x7BB4 }, { 0xEDD8, 0x7C2A },
+	{ 0xEDD9, 0x8836 }, { 0xEDDA, 0x96DC }, { 0xEDDB, 0x4E08 }, { 0xEDDC, 0x4ED7 }, { 0xEDDD, 0x5320 }, { 0xEDDE, 0x5834 }, { 0xEDDF, 0x58BB }, { 0xEDE0, 0x58EF },
+	{ 0xEDE1, 0x596C }, { 0xEDE2, 0x5C07 }, { 0xEDE3, 0x5E33 }, { 0xEDE4, 0x5E84 }, { 0xEDE5, 0x5F35 }, { 0xEDE6, 0x638C }, { 0xEDE7, 0x66B2 }, { 0xEDE8, 0x6756 },
+	{ 0xEDE9, 0x6A1F }, { 0xEDEA, 0x6AA3 }, { 0xEDEB, 0x6B0C }, { 0xEDEC, 0x6F3F }, { 0xEDED, 0x7246 }, { 0xEDEE, 0xF9FA }, { 0xEDEF, 0x7350 }, { 0xEDF0, 0x748B },
+	{ 0xEDF1, 0x7AE0 }, { 0xEDF2, 0x7CA7 }, { 0xEDF3, 0x8178 }, { 0xEDF4, 0x81DF }, { 0xEDF5, 0x81E7 }, { 0xEDF6, 0x838A }, { 0xEDF7, 0x846C }, { 0xEDF8, 0x8523 },
+	{ 0xEDF9, 0x8594 }, { 0xEDFA, 0x85CF }, { 0xEDFB, 0x88DD }, { 0xEDFC, 0x8D13 }, { 0xEDFD, 0x91AC }, { 0xEDFE, 0x9577 }, { 0xEEA1, 0x969C }, { 0xEEA2, 0x518D },
+	{ 0xEEA3, 0x54C9 }, { 0xEEA4, 0x5728 }, { 0xEEA5, 0x5BB0 }, { 0xEEA6, 0x624D }, { 0xEEA7, 0x6750 }, { 0xEEA8, 0x683D }, { 0xEEA9, 0x6893 }, { 0xEEAA, 0x6E3D },
+	{ 0xEEAB, 0x6ED3 }, { 0xEEAC, 0x707D }, { 0xEEAD, 0x7E21 }, { 0xEEAE, 0x88C1 }, { 0xEEAF, 0x8CA1 }, { 0xEEB0, 0x8F09 }, { 0xEEB1, 0x9F4B }, { 0xEEB2, 0x9F4E },
+	{ 0xEEB3, 0x722D }, { 0xEEB4, 0x7B8F }, { 0xEEB5, 0x8ACD }, { 0xEEB6, 0x931A }, { 0xEEB7, 0x4F47 }, { 0xEEB8, 0x4F4E }, { 0xEEB9, 0x5132 }, { 0xEEBA, 0x5480 },
+	{ 0xEEBB, 0x59D0 }, { 0xEEBC, 0x5E95 }, { 0xEEBD, 0x62B5 }, { 0xEEBE, 0x6775 }, { 0xEEBF, 0x696E }, { 0xEEC0, 0x6A17 }, { 0xEEC1, 0x6CAE }, { 0xEEC2, 0x6E1A },
+	{ 0xEEC3, 0x72D9 }, { 0xEEC4, 0x732A }, { 0xEEC5, 0x75BD }, { 0xEEC6, 0x7BB8 }, { 0xEEC7, 0x7D35 }, { 0xEEC8, 0x82E7 }, { 0xEEC9, 0x83F9 }, { 0xEECA, 0x8457 },
+	{ 0xEECB, 0x85F7 }, { 0xEECC, 0x8A5B }, { 0xEECD, 0x8CAF }, { 0xEECE, 0x8E87 }, { 0xEECF, 0x9019 }, { 0xEED0, 0x90B8 }, { 0xEED1, 0x96CE }, { 0xEED2, 0x9F5F },
+	{ 0xEED3, 0x52E3 }, { 0xEED4, 0x540A }, { 0xEED5, 0x5AE1 }, { 0xEED6, 0x5BC2 }, { 0xEED7, 0x6458 }, { 0xEED8, 0x6575 }, { 0xEED9, 0x6EF4 }, { 0xEEDA, 0x72C4 },
+	{ 0xEEDB, 0xF9FB }, { 0xEEDC, 0x7684 }, { 0xEEDD, 0x7A4D }, { 0xEEDE, 0x7B1B }, { 0xEEDF, 0x7C4D }, { 0xEEE0, 0x7E3E }, { 0xEEE1, 0x7FDF }, { 0xEEE2, 0x837B },
+	{ 0xEEE3, 0x8B2B }, { 0xEEE4, 0x8CCA }, { 0xEEE5, 0x8D64 }, { 0xEEE6, 0x8DE1 }, { 0xEEE7, 0x8E5F }, { 0xEEE8, 0x8FEA }, { 0xEEE9, 0x8FF9 }, { 0xEEEA, 0x9069 },
+	{ 0xEEEB, 0x93D1 }, { 0xEEEC, 0x4F43 }, { 0xEEED, 0x4F7A }, { 0xEEEE, 0x50B3 }, { 0xEEEF, 0x5168 }, { 0xEEF0, 0x5178 }, { 0xEEF1, 0x524D }, { 0xEEF2, 0x526A },
+	{ 0xEEF3, 0x5861 }, { 0xEEF4, 0x587C }, { 0xEEF5, 0x5960 }, { 0xEEF6, 0x5C08 }, { 0xEEF7, 0x5C55 }, { 0xEEF8, 0x5EDB }, { 0xEEF9, 0x609B }, { 0xEEFA, 0x6230 },
+	{ 0xEEFB, 0x6813 }, { 0xEEFC, 0x6BBF }, { 0xEEFD, 0x6C08 }, { 0xEEFE, 0x6FB1 }, { 0xEFA1, 0x714E }, { 0xEFA2, 0x7420 }, { 0xEFA3, 0x7530 }, { 0xEFA4, 0x7538 },
+	{ 0xEFA5, 0x7551 }, { 0xEFA6, 0x7672 }, { 0xEFA7, 0x7B4C }, { 0xEFA8, 0x7B8B }, { 0xEFA9, 0x7BAD }, { 0xEFAA, 0x7BC6 }, { 0xEFAB, 0x7E8F }, { 0xEFAC, 0x8A6E },
+	{ 0xEFAD, 0x8F3E }, { 0xEFAE, 0x8F49 }, { 0xEFAF, 0x923F }, { 0xEFB0, 0x9293 }, { 0xEFB1, 0x9322 }, { 0xEFB2, 0x942B }, { 0xEFB3, 0x96FB }, { 0xEFB4, 0x985A },
+	{ 0xEFB5, 0x986B }, { 0xEFB6, 0x991E }, { 0xEFB7, 0x5207 }, { 0xEFB8, 0x622A }, { 0xEFB9, 0x6298 }, { 0xEFBA, 0x6D59 }, { 0xEFBB, 0x7664 }, { 0xEFBC, 0x7ACA },
+	{ 0xEFBD, 0x7BC0 }, { 0xEFBE, 0x7D76 }, { 0xEFBF, 0x5360 }, { 0xEFC0, 0x5CBE }, { 0xEFC1, 0x5E97 }, { 0xEFC2, 0x6F38 }, { 0xEFC3, 0x70B9 }, { 0xEFC4, 0x7C98 },
+	{ 0xEFC5, 0x9711 }, { 0xEFC6, 0x9B8E }, { 0xEFC7, 0x9EDE }, { 0xEFC8, 0x63A5 }, { 0xEFC9, 0x647A }, { 0xEFCA, 0x8776 }, { 0xEFCB, 0x4E01 }, { 0xEFCC, 0x4E95 },
+	{ 0xEFCD, 0x4EAD }, { 0xEFCE, 0x505C }, { 0xEFCF, 0x5075 }, { 0xEFD0, 0x5448 }, { 0xEFD1, 0x59C3 }, { 0xEFD2, 0x5B9A }, { 0xEFD3, 0x5E40 }, { 0xEFD4, 0x5EAD },
+	{ 0xEFD5, 0x5EF7 }, { 0xEFD6, 0x5F81 }, { 0xEFD7, 0x60C5 }, { 0xEFD8, 0x633A }, { 0xEFD9, 0x653F }, { 0xEFDA, 0x6574 }, { 0xEFDB, 0x65CC }, { 0xEFDC, 0x6676 },
+	{ 0xEFDD, 0x6678 }, { 0xEFDE, 0x67FE }, { 0xEFDF, 0x6968 }, { 0xEFE0, 0x6A89 }, { 0xEFE1, 0x6B63 }, { 0xEFE2, 0x6C40 }, { 0xEFE3, 0x6DC0 }, { 0xEFE4, 0x6DE8 },
+	{ 0xEFE5, 0x6E1F }, { 0xEFE6, 0x6E5E }, { 0xEFE7, 0x701E }, { 0xEFE8, 0x70A1 }, { 0xEFE9, 0x738E }, { 0xEFEA, 0x73FD }, { 0xEFEB, 0x753A }, { 0xEFEC, 0x775B },
+	{ 0xEFED, 0x7887 }, { 0xEFEE, 0x798E }, { 0xEFEF, 0x7A0B }, { 0xEFF0, 0x7A7D }, { 0xEFF1, 0x7CBE }, { 0xEFF2, 0x7D8E }, { 0xEFF3, 0x8247 }, { 0xEFF4, 0x8A02 },
+	{ 0xEFF5, 0x8AEA }, { 0xEFF6, 0x8C9E }, { 0xEFF7, 0x912D }, { 0xEFF8, 0x914A }, { 0xEFF9, 0x91D8 }, { 0xEFFA, 0x9266 }, { 0xEFFB, 0x92CC }, { 0xEFFC, 0x9320 },
+	{ 0xEFFD, 0x9706 }, { 0xEFFE, 0x9756 }, { 0xF0A1, 0x975C }, { 0xF0A2, 0x9802 }, { 0xF0A3, 0x9F0E }, { 0xF0A4, 0x5236 }, { 0xF0A5, 0x5291 }, { 0xF0A6, 0x557C },
+	{ 0xF0A7, 0x5824 }, { 0xF0A8, 0x5E1D }, { 0xF0A9, 0x5F1F }, { 0xF0AA, 0x608C }, { 0xF0AB, 0x63D0 }, { 0xF0AC, 0x68AF }, { 0xF0AD, 0x6FDF }, { 0xF0AE, 0x796D },
+	{ 0xF0AF, 0x7B2C }, { 0xF0B0, 0x81CD }, { 0xF0B1, 0x85BA }, { 0xF0B2, 0x88FD }, { 0xF0B3, 0x8AF8 }, { 0xF0B4, 0x8E44 }, { 0xF0B5, 0x918D }, { 0xF0B6, 0x9664 },
+	{ 0xF0B7, 0x969B }, { 0xF0B8, 0x973D }, { 0xF0B9, 0x984C }, { 0xF0BA, 0x9F4A }, { 0xF0BB, 0x4FCE }, { 0xF0BC, 0x5146 }, { 0xF0BD, 0x51CB }, { 0xF0BE, 0x52A9 },
+	{ 0xF0BF, 0x5632 }, { 0xF0C0, 0x5F14 }, { 0xF0C1, 0x5F6B }, { 0xF0C2, 0x63AA }, { 0xF0C3, 0x64CD }, { 0xF0C4, 0x65E9 }, { 0xF0C5, 0x6641 }, { 0xF0C6, 0x66FA },
+	{ 0xF0C7, 0x66F9 }, { 0xF0C8, 0x671D }, { 0xF0C9, 0x689D }, { 0xF0CA, 0x68D7 }, { 0xF0CB, 0x69FD }, { 0xF0CC, 0x6F15 }, { 0xF0CD, 0x6F6E }, { 0xF0CE, 0x7167 },
+	{ 0xF0CF, 0x71E5 }, { 0xF0D0, 0x722A }, { 0xF0D1, 0x74AA }, { 0xF0D2, 0x773A }, { 0xF0D3, 0x7956 }, { 0xF0D4, 0x795A }, { 0xF0D5, 0x79DF }, { 0xF0D6, 0x7A20 },
+	{ 0xF0D7, 0x7A95 }, { 0xF0D8, 0x7C97 }, { 0xF0D9, 0x7CDF }, { 0xF0DA, 0x7D44 }, { 0xF0DB, 0x7E70 }, { 0xF0DC, 0x8087 }, { 0xF0DD, 0x85FB }, { 0xF0DE, 0x86A4 },
+	{ 0xF0DF, 0x8A54 }, { 0xF0E0, 0x8ABF }, { 0xF0E1, 0x8D99 }, { 0xF0E2, 0x8E81 }, { 0xF0E3, 0x9020 }, { 0xF0E4, 0x906D }, { 0xF0E5, 0x91E3 }, { 0xF0E6, 0x963B },
+	{ 0xF0E7, 0x96D5 }, { 0xF0E8, 0x9CE5 }, { 0xF0E9, 0x65CF }, { 0xF0EA, 0x7C07 }, { 0xF0EB, 0x8DB3 }, { 0xF0EC, 0x93C3 }, { 0xF0ED, 0x5B58 }, { 0xF0EE, 0x5C0A },
+	{ 0xF0EF, 0x5352 }, { 0xF0F0, 0x62D9 }, { 0xF0F1, 0x731D }, { 0xF0F2, 0x5027 }, { 0xF0F3, 0x5B97 }, { 0xF0F4, 0x5F9E }, { 0xF0F5, 0x60B0 }, { 0xF0F6, 0x616B },
+	{ 0xF0F7, 0x68D5 }, { 0xF0F8, 0x6DD9 }, { 0xF0F9, 0x742E }, { 0xF0FA, 0x7A2E }, { 0xF0FB, 0x7D42 }, { 0xF0FC, 0x7D9C }, { 0xF0FD, 0x7E31 }, { 0xF0FE, 0x816B },
+	{ 0xF1A1, 0x8E2A }, { 0xF1A2, 0x8E35 }, { 0xF1A3, 0x937E }, { 0xF1A4, 0x9418 }, { 0xF1A5, 0x4F50 }, { 0xF1A6, 0x5750 }, { 0xF1A7, 0x5DE6 }, { 0xF1A8, 0x5EA7 },
+	{ 0xF1A9, 0x632B }, { 0xF1AA, 0x7F6A }, { 0xF1AB, 0x4E3B }, { 0xF1AC, 0x4F4F }, { 0xF1AD, 0x4F8F }, { 0xF1AE, 0x505A }, { 0xF1AF, 0x59DD }, { 0xF1B0, 0x80C4 },
+	{ 0xF1B1, 0x546A }, { 0xF1B2, 0x5468 }, { 0xF1B3, 0x55FE }, { 0xF1B4, 0x594F }, { 0xF1B5, 0x5B99 }, { 0xF1B6, 0x5DDE }, { 0xF1B7, 0x5EDA }, { 0xF1B8, 0x665D },
+	{ 0xF1B9, 0x6731 }, { 0xF1BA, 0x67F1 }, { 0xF1BB, 0x682A }, { 0xF1BC, 0x6CE8 }, { 0xF1BD, 0x6D32 }, { 0xF1BE, 0x6E4A }, { 0xF1BF, 0x6F8D }, { 0xF1C0, 0x70B7 },
+	{ 0xF1C1, 0x73E0 }, { 0xF1C2, 0x7587 }, { 0xF1C3, 0x7C4C }, { 0xF1C4, 0x7D02 }, { 0xF1C5, 0x7D2C }, { 0xF1C6, 0x7DA2 }, { 0xF1C7, 0x821F }, { 0xF1C8, 0x86DB },
+	{ 0xF1C9, 0x8A3B }, { 0xF1CA, 0x8A85 }, { 0xF1CB, 0x8D70 }, { 0xF1CC, 0x8E8A }, { 0xF1CD, 0x8F33 }, { 0xF1CE, 0x9031 }, { 0xF1CF, 0x914E }, { 0xF1D0, 0x9152 },
+	{ 0xF1D1, 0x9444 }, { 0xF1D2, 0x99D0 }, { 0xF1D3, 0x7AF9 }, { 0xF1D4, 0x7CA5 }, { 0xF1D5, 0x4FCA }, { 0xF1D6, 0x5101 }, { 0xF1D7, 0x51C6 }, { 0xF1D8, 0x57C8 },
+	{ 0xF1D9, 0x5BEF }, { 0xF1DA, 0x5CFB }, { 0xF1DB, 0x6659 }, { 0xF1DC, 0x6A3D }, { 0xF1DD, 0x6D5A }, { 0xF1DE, 0x6E96 }, { 0xF1DF, 0x6FEC }, { 0xF1E0, 0x710C },
+	{ 0xF1E1, 0x756F }, { 0xF1E2, 0x7AE3 }, { 0xF1E3, 0x8822 }, { 0xF1E4, 0x9021 }, { 0xF1E5, 0x9075 }, { 0xF1E6, 0x96CB }, { 0xF1E7, 0x99FF }, { 0xF1E8, 0x8301 },
+	{ 0xF1E9, 0x4E2D }, { 0xF1EA, 0x4EF2 }, { 0xF1EB, 0x8846 }, { 0xF1EC, 0x91CD }, { 0xF1ED, 0x537D }, { 0xF1EE, 0x6ADB }, { 0xF1EF, 0x696B }, { 0xF1F0, 0x6C41 },
+	{ 0xF1F1, 0x847A }, { 0xF1F2, 0x589E }, { 0xF1F3, 0x618E }, { 0xF1F4, 0x66FE }, { 0xF1F5, 0x62EF }, { 0xF1F6, 0x70DD }, { 0xF1F7, 0x7511 }, { 0xF1F8, 0x75C7 },
+	{ 0xF1F9, 0x7E52 }, { 0xF1FA, 0x84B8 }, { 0xF1FB, 0x8B49 }, { 0xF1FC, 0x8D08 }, { 0xF1FD, 0x4E4B }, { 0xF1FE, 0x53EA }, { 0xF2A1, 0x54AB }, { 0xF2A2, 0x5730 },
+	{ 0xF2A3, 0x5740 }, { 0xF2A4, 0x5FD7 }, { 0xF2A5, 0x6301 }, { 0xF2A6, 0x6307 }, { 0xF2A7, 0x646F }, { 0xF2A8, 0x652F }, { 0xF2A9, 0x65E8 }, { 0xF2AA, 0x667A },
+	{ 0xF2AB, 0x679D }, { 0xF2AC, 0x67B3 }, { 0xF2AD, 0x6B62 }, { 0xF2AE, 0x6C60 }, { 0xF2AF, 0x6C9A }, { 0xF2B0, 0x6F2C }, { 0xF2B1, 0x77E5 }, { 0xF2B2, 0x7825 },
+	{ 0xF2B3, 0x7949 }, { 0xF2B4, 0x7957 }, { 0xF2B5, 0x7D19 }, { 0xF2B6, 0x80A2 }, { 0xF2B7, 0x8102 }, { 0xF2B8, 0x81F3 }, { 0xF2B9, 0x829D }, { 0xF2BA, 0x82B7 },
+	{ 0xF2BB, 0x8718 }, { 0xF2BC, 0x8A8C }, { 0xF2BD, 0xF9FC }, { 0xF2BE, 0x8D04 }, { 0xF2BF, 0x8DBE }, { 0xF2C0, 0x9072 }, { 0xF2C1, 0x76F4 }, { 0xF2C2, 0x7A19 },
+	{ 0xF2C3, 0x7A37 }, { 0xF2C4, 0x7E54 }, { 0xF2C5, 0x8077 }, { 0xF2C6, 0x5507 }, { 0xF2C7, 0x55D4 }, { 0xF2C8, 0x5875 }, { 0xF2C9, 0x632F }, { 0xF2CA, 0x6422 },
+	{ 0xF2CB, 0x6649 }, { 0xF2CC, 0x664B }, { 0xF2CD, 0x686D }, { 0xF2CE, 0x699B }, { 0xF2CF, 0x6B84 }, { 0xF2D0, 0x6D25 }, { 0xF2D1, 0x6EB1 }, { 0xF2D2, 0x73CD },
+	{ 0xF2D3, 0x7468 }, { 0xF2D4, 0x74A1 }, { 0xF2D5, 0x755B }, { 0xF2D6, 0x75B9 }, { 0xF2D7, 0x76E1 }, { 0xF2D8, 0x771E }, { 0xF2D9, 0x778B }, { 0xF2DA, 0x79E6 },
+	{ 0xF2DB, 0x7E09 }, { 0xF2DC, 0x7E1D }, { 0xF2DD, 0x81FB }, { 0xF2DE, 0x852F }, { 0xF2DF, 0x8897 }, { 0xF2E0, 0x8A3A }, { 0xF2E1, 0x8CD1 }, { 0xF2E2, 0x8EEB },
+	{ 0xF2E3, 0x8FB0 }, { 0xF2E4, 0x9032 }, { 0xF2E5, 0x93AD }, { 0xF2E6, 0x9663 }, { 0xF2E7, 0x9673 }, { 0xF2E8, 0x9707 }, { 0xF2E9, 0x4F84 }, { 0xF2EA, 0x53F1 },
+	{ 0xF2EB, 0x59EA }, { 0xF2EC, 0x5AC9 }, { 0xF2ED, 0x5E19 }, { 0xF2EE, 0x684E }, { 0xF2EF, 0x74C6 }, { 0xF2F0, 0x75BE }, { 0xF2F1, 0x79E9 }, { 0xF2F2, 0x7A92 },
+	{ 0xF2F3, 0x81A3 }, { 0xF2F4, 0x86ED }, { 0xF2F5, 0x8CEA }, { 0xF2F6, 0x8DCC }, { 0xF2F7, 0x8FED }, { 0xF2F8, 0x659F }, { 0xF2F9, 0x6715 }, { 0xF2FA, 0xF9FD },
+	{ 0xF2FB, 0x57F7 }, { 0xF2FC, 0x6F57 }, { 0xF2FD, 0x7DDD }, { 0xF2FE, 0x8F2F }, { 0xF3A1, 0x93F6 }, { 0xF3A2, 0x96C6 }, { 0xF3A3, 0x5FB5 }, { 0xF3A4, 0x61F2 },
+	{ 0xF3A5, 0x6F84 }, { 0xF3A6, 0x4E14 }, { 0xF3A7, 0x4F98 }, { 0xF3A8, 0x501F }, { 0xF3A9, 0x53C9 }, { 0xF3AA, 0x55DF }, { 0xF3AB, 0x5D6F }, { 0xF3AC, 0x5DEE },
+	{ 0xF3AD, 0x6B21 }, { 0xF3AE, 0x6B64 }, { 0xF3AF, 0x78CB }, { 0xF3B0, 0x7B9A }, { 0xF3B1, 0xF9FE }, { 0xF3B2, 0x8E49 }, { 0xF3B3, 0x8ECA }, { 0xF3B4, 0x906E },
+	{ 0xF3B5, 0x6349 }, { 0xF3B6, 0x643E }, { 0xF3B7, 0x7740 }, { 0xF3B8, 0x7A84 }, { 0xF3B9, 0x932F }, { 0xF3BA, 0x947F }, { 0xF3BB, 0x9F6A }, { 0xF3BC, 0x64B0 },
+	{ 0xF3BD, 0x6FAF }, { 0xF3BE, 0x71E6 }, { 0xF3BF, 0x74A8 }, { 0xF3C0, 0x74DA }, { 0xF3C1, 0x7AC4 }, { 0xF3C2, 0x7C12 }, { 0xF3C3, 0x7E82 }, { 0xF3C4, 0x7CB2 },
+	{ 0xF3C5, 0x7E98 }, { 0xF3C6, 0x8B9A }, { 0xF3C7, 0x8D0A }, { 0xF3C8, 0x947D }, { 0xF3C9, 0x9910 }, { 0xF3CA, 0x994C }, { 0xF3CB, 0x5239 }, { 0xF3CC, 0x5BDF },
+	{ 0xF3CD, 0x64E6 }, { 0xF3CE, 0x672D }, { 0xF3CF, 0x7D2E }, { 0xF3D0, 0x50ED }, { 0xF3D1, 0x53C3 }, { 0xF3D2, 0x5879 }, { 0xF3D3, 0x6158 }, { 0xF3D4, 0x6159 },
+	{ 0xF3D5, 0x61FA }, { 0xF3D6, 0x65AC }, { 0xF3D7, 0x7AD9 }, { 0xF3D8, 0x8B92 }, { 0xF3D9, 0x8B96 }, { 0xF3DA, 0x5009 }, { 0xF3DB, 0x5021 }, { 0xF3DC, 0x5275 },
+	{ 0xF3DD, 0x5531 }, { 0xF3DE, 0x5A3C }, { 0xF3DF, 0x5EE0 }, { 0xF3E0, 0x5F70 }, { 0xF3E1, 0x6134 }, { 0xF3E2, 0x655E }, { 0xF3E3, 0x660C }, { 0xF3E4, 0x6636 },
+	{ 0xF3E5, 0x66A2 }, { 0xF3E6, 0x69CD }, { 0xF3E7, 0x6EC4 }, { 0xF3E8, 0x6F32 }, { 0xF3E9, 0x7316 }, { 0xF3EA, 0x7621 }, { 0xF3EB, 0x7A93 }, { 0xF3EC, 0x8139 },
+	{ 0xF3ED, 0x8259 }, { 0xF3EE, 0x83D6 }, { 0xF3EF, 0x84BC }, { 0xF3F0, 0x50B5 }, { 0xF3F1, 0x57F0 }, { 0xF3F2, 0x5BC0 }, { 0xF3F3, 0x5BE8 }, { 0xF3F4, 0x5F69 },
+	{ 0xF3F5, 0x63A1 }, { 0xF3F6, 0x7826 }, { 0xF3F7, 0x7DB5 }, { 0xF3F8, 0x83DC }, { 0xF3F9, 0x8521 }, { 0xF3FA, 0x91C7 }, { 0xF3FB, 0x91F5 }, { 0xF3FC, 0x518A },
+	{ 0xF3FD, 0x67F5 }, { 0xF3FE, 0x7B56 }, { 0xF4A1, 0x8CAC }, { 0xF4A2, 0x51C4 }, { 0xF4A3, 0x59BB }, { 0xF4A4, 0x60BD }, { 0xF4A5, 0x8655 }, { 0xF4A6, 0x501C },
+	{ 0xF4A7, 0xF9FF }, { 0xF4A8, 0x5254 }, { 0xF4A9, 0x5C3A }, { 0xF4AA, 0x617D }, { 0xF4AB, 0x621A }, { 0xF4AC, 0x62D3 }, { 0xF4AD, 0x64F2 }, { 0xF4AE, 0x65A5 },
+	{ 0xF4AF, 0x6ECC }, { 0xF4B0, 0x7620 }, { 0xF4B1, 0x810A }, { 0xF4B2, 0x8E60 }, { 0xF4B3, 0x965F }, { 0xF4B4, 0x96BB }, { 0xF4B5, 0x4EDF }, { 0xF4B6, 0x5343 },
+	{ 0xF4B7, 0x5598 }, { 0xF4B8, 0x5929 }, { 0xF4B9, 0x5DDD }, { 0xF4BA, 0x64C5 }, { 0xF4BB, 0x6CC9 }, { 0xF4BC, 0x6DFA }, { 0xF4BD, 0x7394 }, { 0xF4BE, 0x7A7F },
+	{ 0xF4BF, 0x821B }, { 0xF4C0, 0x85A6 }, { 0xF4C1, 0x8CE4 }, { 0xF4C2, 0x8E10 }, { 0xF4C3, 0x9077 }, { 0xF4C4, 0x91E7 }, { 0xF4C5, 0x95E1 }, { 0xF4C6, 0x9621 },
+	{ 0xF4C7, 0x97C6 }, { 0xF4C8, 0x51F8 }, { 0xF4C9, 0x54F2 }, { 0xF4CA, 0x5586 }, { 0xF4CB, 0x5FB9 }, { 0xF4CC, 0x64A4 }, { 0xF4CD, 0x6F88 }, { 0xF4CE, 0x7DB4 },
+	{ 0xF4CF, 0x8F1F }, { 0xF4D0, 0x8F4D }, { 0xF4D1, 0x9435 }, { 0xF4D2, 0x50C9 }, { 0xF4D3, 0x5C16 }, { 0xF4D4, 0x6CBE }, { 0xF4D5, 0x6DFB }, { 0xF4D6, 0x751B },
+	{ 0xF4D7, 0x77BB }, { 0xF4D8, 0x7C3D }, { 0xF4D9, 0x7C64 }, { 0xF4DA, 0x8A79 }, { 0xF4DB, 0x8AC2 }, { 0xF4DC, 0x581E }, { 0xF4DD, 0x59BE }, { 0xF4DE, 0x5E16 },
+	{ 0xF4DF, 0x6377 }, { 0xF4E0, 0x7252 }, { 0xF4E1, 0x758A }, { 0xF4E2, 0x776B }, { 0xF4E3, 0x8ADC }, { 0xF4E4, 0x8CBC }, { 0xF4E5, 0x8F12 }, { 0xF4E6, 0x5EF3 },
+	{ 0xF4E7, 0x6674 }, { 0xF4E8, 0x6DF8 }, { 0xF4E9, 0x807D }, { 0xF4EA, 0x83C1 }, { 0xF4EB, 0x8ACB }, { 0xF4EC, 0x9751 }, { 0xF4ED, 0x9BD6 }, { 0xF4EE, 0xFA00 },
+	{ 0xF4EF, 0x5243 }, { 0xF4F0, 0x66FF }, { 0xF4F1, 0x6D95 }, { 0xF4F2, 0x6EEF }, { 0xF4F3, 0x7DE0 }, { 0xF4F4, 0x8AE6 }, { 0xF4F5, 0x902E }, { 0xF4F6, 0x905E },
+	{ 0xF4F7, 0x9AD4 }, { 0xF4F8, 0x521D }, { 0xF4F9, 0x527F }, { 0xF4FA, 0x54E8 }, { 0xF4FB, 0x6194 }, { 0xF4FC, 0x6284 }, { 0xF4FD, 0x62DB }, { 0xF4FE, 0x68A2 },
+	{ 0xF5A1, 0x6912 }, { 0xF5A2, 0x695A }, { 0xF5A3, 0x6A35 }, { 0xF5A4, 0x7092 }, { 0xF5A5, 0x7126 }, { 0xF5A6, 0x785D }, { 0xF5A7, 0x7901 }, { 0xF5A8, 0x790E },
+	{ 0xF5A9, 0x79D2 }, { 0xF5AA, 0x7A0D }, { 0xF5AB, 0x8096 }, { 0xF5AC, 0x8278 }, { 0xF5AD, 0x82D5 }, { 0xF5AE, 0x8349 }, { 0xF5AF, 0x8549 }, { 0xF5B0, 0x8C82 },
+	{ 0xF5B1, 0x8D85 }, { 0xF5B2, 0x9162 }, { 0xF5B3, 0x918B }, { 0xF5B4, 0x91AE }, { 0xF5B5, 0x4FC3 }, { 0xF5B6, 0x56D1 }, { 0xF5B7, 0x71ED }, { 0xF5B8, 0x77D7 },
+	{ 0xF5B9, 0x8700 }, { 0xF5BA, 0x89F8 }, { 0xF5BB, 0x5BF8 }, { 0xF5BC, 0x5FD6 }, { 0xF5BD, 0x6751 }, { 0xF5BE, 0x90A8 }, { 0xF5BF, 0x53E2 }, { 0xF5C0, 0x585A },
+	{ 0xF5C1, 0x5BF5 }, { 0xF5C2, 0x60A4 }, { 0xF5C3, 0x6181 }, { 0xF5C4, 0x6460 }, { 0xF5C5, 0x7E3D }, { 0xF5C6, 0x8070 }, { 0xF5C7, 0x8525 }, { 0xF5C8, 0x9283 },
+	{ 0xF5C9, 0x64AE }, { 0xF5CA, 0x50AC }, { 0xF5CB, 0x5D14 }, { 0xF5CC, 0x6700 }, { 0xF5CD, 0x589C }, { 0xF5CE, 0x62BD }, { 0xF5CF, 0x63A8 }, { 0xF5D0, 0x690E },
+	{ 0xF5D1, 0x6978 }, { 0xF5D2, 0x6A1E }, { 0xF5D3, 0x6E6B }, { 0xF5D4, 0x76BA }, { 0xF5D5, 0x79CB }, { 0xF5D6, 0x82BB }, { 0xF5D7, 0x8429 }, { 0xF5D8, 0x8ACF },
+	{ 0xF5D9, 0x8DA8 }, { 0xF5DA, 0x8FFD }, { 0xF5DB, 0x9112 }, { 0xF5DC, 0x914B }, { 0xF5DD, 0x919C }, { 0xF5DE, 0x9310 }, { 0xF5DF, 0x9318 }, { 0xF5E0, 0x939A },
+	{ 0xF5E1, 0x96DB }, { 0xF5E2, 0x9A36 }, { 0xF5E3, 0x9C0D }, { 0xF5E4, 0x4E11 }, { 0xF5E5, 0x755C }, { 0xF5E6, 0x795D }, { 0xF5E7, 0x7AFA }, { 0xF5E8, 0x7B51 },
+	{ 0xF5E9, 0x7BC9 }, { 0xF5EA, 0x7E2E }, { 0xF5EB, 0x84C4 }, { 0xF5EC, 0x8E59 }, { 0xF5ED, 0x8E74 }, { 0xF5EE, 0x8EF8 }, { 0xF5EF, 0x9010 }, { 0xF5F0, 0x6625 },
+	{ 0xF5F1, 0x693F }, { 0xF5F2, 0x7443 }, { 0xF5F3, 0x51FA }, { 0xF5F4, 0x672E }, { 0xF5F5, 0x9EDC }, { 0xF5F6, 0x5145 }, { 0xF5F7, 0x5FE0 }, { 0xF5F8, 0x6C96 },
+	{ 0xF5F9, 0x87F2 }, { 0xF5FA, 0x885D }, { 0xF5FB, 0x8877 }, { 0xF5FC, 0x60B4 }, { 0xF5FD, 0x81B5 }, { 0xF5FE, 0x8403 }, { 0xF6A1, 0x8D05 }, { 0xF6A2, 0x53D6 },
+	{ 0xF6A3, 0x5439 }, { 0xF6A4, 0x5634 }, { 0xF6A5, 0x5A36 }, { 0xF6A6, 0x5C31 }, { 0xF6A7, 0x708A }, { 0xF6A8, 0x7FE0 }, { 0xF6A9, 0x805A }, { 0xF6AA, 0x8106 },
+	{ 0xF6AB, 0x81ED }, { 0xF6AC, 0x8DA3 }, { 0xF6AD, 0x9189 }, { 0xF6AE, 0x9A5F }, { 0xF6AF, 0x9DF2 }, { 0xF6B0, 0x5074 }, { 0xF6B1, 0x4EC4 }, { 0xF6B2, 0x53A0 },
+	{ 0xF6B3, 0x60FB }, { 0xF6B4, 0x6E2C }, { 0xF6B5, 0x5C64 }, { 0xF6B6, 0x4F88 }, { 0xF6B7, 0x5024 }, { 0xF6B8, 0x55E4 }, { 0xF6B9, 0x5CD9 }, { 0xF6BA, 0x5E5F },
+	{ 0xF6BB, 0x6065 }, { 0xF6BC, 0x6894 }, { 0xF6BD, 0x6CBB }, { 0xF6BE, 0x6DC4 }, { 0xF6BF, 0x71BE }, { 0xF6C0, 0x75D4 }, { 0xF6C1, 0x75F4 }, { 0xF6C2, 0x7661 },
+	{ 0xF6C3, 0x7A1A }, { 0xF6C4, 0x7A49 }, { 0xF6C5, 0x7DC7 }, { 0xF6C6, 0x7DFB }, { 0xF6C7, 0x7F6E }, { 0xF6C8, 0x81F4 }, { 0xF6C9, 0x86A9 }, { 0xF6CA, 0x8F1C },
+	{ 0xF6CB, 0x96C9 }, { 0xF6CC, 0x99B3 }, { 0xF6CD, 0x9F52 }, { 0xF6CE, 0x5247 }, { 0xF6CF, 0x52C5 }, { 0xF6D0, 0x98ED }, { 0xF6D1, 0x89AA }, { 0xF6D2, 0x4E03 },
+	{ 0xF6D3, 0x67D2 }, { 0xF6D4, 0x6F06 }, { 0xF6D5, 0x4FB5 }, { 0xF6D6, 0x5BE2 }, { 0xF6D7, 0x6795 }, { 0xF6D8, 0x6C88 }, { 0xF6D9, 0x6D78 }, { 0xF6DA, 0x741B },
+	{ 0xF6DB, 0x7827 }, { 0xF6DC, 0x91DD }, { 0xF6DD, 0x937C }, { 0xF6DE, 0x87C4 }, { 0xF6DF, 0x79E4 }, { 0xF6E0, 0x7A31 }, { 0xF6E1, 0x5FEB }, { 0xF6E2, 0x4ED6 },
+	{ 0xF6E3, 0x54A4 }, { 0xF6E4, 0x553E }, { 0xF6E5, 0x58AE }, { 0xF6E6, 0x59A5 }, { 0xF6E7, 0x60F0 }, { 0xF6E8, 0x6253 }, { 0xF6E9, 0x62D6 }, { 0xF6EA, 0x6736 },
+	{ 0xF6EB, 0x6955 }, { 0xF6EC, 0x8235 }, { 0xF6ED, 0x9640 }, { 0xF6EE, 0x99B1 }, { 0xF6EF, 0x99DD }, { 0xF6F0, 0x502C }, { 0xF6F1, 0x5353 }, { 0xF6F2, 0x5544 },
+	{ 0xF6F3, 0x577C }, { 0xF6F4, 0xFA01 }, { 0xF6F5, 0x6258 }, { 0xF6F6, 0xFA02 }, { 0xF6F7, 0x64E2 }, { 0xF6F8, 0x666B }, { 0xF6F9, 0x67DD }, { 0xF6FA, 0x6FC1 },
+	{ 0xF6FB, 0x6FEF }, { 0xF6FC, 0x7422 }, { 0xF6FD, 0x7438 }, { 0xF6FE, 0x8A17 }, { 0xF7A1, 0x9438 }, { 0xF7A2, 0x5451 }, { 0xF7A3, 0x5606 }, { 0xF7A4, 0x5766 },
+	{ 0xF7A5, 0x5F48 }, { 0xF7A6, 0x619A }, { 0xF7A7, 0x6B4E }, { 0xF7A8, 0x7058 }, { 0xF7A9, 0x70AD }, { 0xF7AA, 0x7DBB }, { 0xF7AB, 0x8A95 }, { 0xF7AC, 0x596A },
+	{ 0xF7AD, 0x812B }, { 0xF7AE, 0x63A2 }, { 0xF7AF, 0x7708 }, { 0xF7B0, 0x803D }, { 0xF7B1, 0x8CAA }, { 0xF7B2, 0x5854 }, { 0xF7B3, 0x642D }, { 0xF7B4, 0x69BB },
+	{ 0xF7B5, 0x5B95 }, { 0xF7B6, 0x5E11 }, { 0xF7B7, 0x6E6F }, { 0xF7B8, 0xFA03 }, { 0xF7B9, 0x8569 }, { 0xF7BA, 0x514C }, { 0xF7BB, 0x53F0 }, { 0xF7BC, 0x592A },
+	{ 0xF7BD, 0x6020 }, { 0xF7BE, 0x614B }, { 0xF7BF, 0x6B86 }, { 0xF7C0, 0x6C70 }, { 0xF7C1, 0x6CF0 }, { 0xF7C2, 0x7B1E }, { 0xF7C3, 0x80CE }, { 0xF7C4, 0x82D4 },
+	{ 0xF7C5, 0x8DC6 }, { 0xF7C6, 0x90B0 }, { 0xF7C7, 0x98B1 }, { 0xF7C8, 0xFA04 }, { 0xF7C9, 0x64C7 }, { 0xF7CA, 0x6FA4 }, { 0xF7CB, 0x6491 }, { 0xF7CC, 0x6504 },
+	{ 0xF7CD, 0x514E }, { 0xF7CE, 0x5410 }, { 0xF7CF, 0x571F }, { 0xF7D0, 0x8A0E }, { 0xF7D1, 0x615F }, { 0xF7D2, 0x6876 }, { 0xF7D3, 0xFA05 }, { 0xF7D4, 0x75DB },
+	{ 0xF7D5, 0x7B52 }, { 0xF7D6, 0x7D71 }, { 0xF7D7, 0x901A }, { 0xF7D8, 0x5806 }, { 0xF7D9, 0x69CC }, { 0xF7DA, 0x817F }, { 0xF7DB, 0x892A }, { 0xF7DC, 0x9000 },
+	{ 0xF7DD, 0x9839 }, { 0xF7DE, 0x5078 }, { 0xF7DF, 0x5957 }, { 0xF7E0, 0x59AC }, { 0xF7E1, 0x6295 }, { 0xF7E2, 0x900F }, { 0xF7E3, 0x9B2A }, { 0xF7E4, 0x615D },
+	{ 0xF7E5, 0x7279 }, { 0xF7E6, 0x95D6 }, { 0xF7E7, 0x5761 }, { 0xF7E8, 0x5A46 }, { 0xF7E9, 0x5DF4 }, { 0xF7EA, 0x628A }, { 0xF7EB, 0x64AD }, { 0xF7EC, 0x64FA },
+	{ 0xF7ED, 0x6777 }, { 0xF7EE, 0x6CE2 }, { 0xF7EF, 0x6D3E }, { 0xF7F0, 0x722C }, { 0xF7F1, 0x7436 }, { 0xF7F2, 0x7834 }, { 0xF7F3, 0x7F77 }, { 0xF7F4, 0x82AD },
+	{ 0xF7F5, 0x8DDB }, { 0xF7F6, 0x9817 }, { 0xF7F7, 0x5224 }, { 0xF7F8, 0x5742 }, { 0xF7F9, 0x677F }, { 0xF7FA, 0x7248 }, { 0xF7FB, 0x74E3 }, { 0xF7FC, 0x8CA9 },
+	{ 0xF7FD, 0x8FA6 }, { 0xF7FE, 0x9211 }, { 0xF8A1, 0x962A }, { 0xF8A2, 0x516B }, { 0xF8A3, 0x53ED }, { 0xF8A4, 0x634C }, { 0xF8A5, 0x4F69 }, { 0xF8A6, 0x5504 },
+	{ 0xF8A7, 0x6096 }, { 0xF8A8, 0x6557 }, { 0xF8A9, 0x6C9B }, { 0xF8AA, 0x6D7F }, { 0xF8AB, 0x724C }, { 0xF8AC, 0x72FD }, { 0xF8AD, 0x7A17 }, { 0xF8AE, 0x8987 },
+	{ 0xF8AF, 0x8C9D }, { 0xF8B0, 0x5F6D }, { 0xF8B1, 0x6F8E }, { 0xF8B2, 0x70F9 }, { 0xF8B3, 0x81A8 }, { 0xF8B4, 0x610E }, { 0xF8B5, 0x4FBF }, { 0xF8B6, 0x504F },
+	{ 0xF8B7, 0x6241 }, { 0xF8B8, 0x7247 }, { 0xF8B9, 0x7BC7 }, { 0xF8BA, 0x7DE8 }, { 0xF8BB, 0x7FE9 }, { 0xF8BC, 0x904D }, { 0xF8BD, 0x97AD }, { 0xF8BE, 0x9A19 },
+	{ 0xF8BF, 0x8CB6 }, { 0xF8C0, 0x576A }, { 0xF8C1, 0x5E73 }, { 0xF8C2, 0x67B0 }, { 0xF8C3, 0x840D }, { 0xF8C4, 0x8A55 }, { 0xF8C5, 0x5420 }, { 0xF8C6, 0x5B16 },
+	{ 0xF8C7, 0x5E63 }, { 0xF8C8, 0x5EE2 }, { 0xF8C9, 0x5F0A }, { 0xF8CA, 0x6583 }, { 0xF8CB, 0x80BA }, { 0xF8CC, 0x853D }, { 0xF8CD, 0x9589 }, { 0xF8CE, 0x965B },
+	{ 0xF8CF, 0x4F48 }, { 0xF8D0, 0x5305 }, { 0xF8D1, 0x530D }, { 0xF8D2, 0x530F }, { 0xF8D3, 0x5486 }, { 0xF8D4, 0x54FA }, { 0xF8D5, 0x5703 }, { 0xF8D6, 0x5E03 },
+	{ 0xF8D7, 0x6016 }, { 0xF8D8, 0x629B }, { 0xF8D9, 0x62B1 }, { 0xF8DA, 0x6355 }, { 0xF8DB, 0xFA06 }, { 0xF8DC, 0x6CE1 }, { 0xF8DD, 0x6D66 }, { 0xF8DE, 0x75B1 },
+	{ 0xF8DF, 0x7832 }, { 0xF8E0, 0x80DE }, { 0xF8E1, 0x812F }, { 0xF8E2, 0x82DE }, { 0xF8E3, 0x8461 }, { 0xF8E4, 0x84B2 }, { 0xF8E5, 0x888D }, { 0xF8E6, 0x8912 },
+	{ 0xF8E7, 0x900B }, { 0xF8E8, 0x92EA }, { 0xF8E9, 0x98FD }, { 0xF8EA, 0x9B91 }, { 0xF8EB, 0x5E45 }, { 0xF8EC, 0x66B4 }, { 0xF8ED, 0x66DD }, { 0xF8EE, 0x7011 },
+	{ 0xF8EF, 0x7206 }, { 0xF8F0, 0xFA07 }, { 0xF8F1, 0x4FF5 }, { 0xF8F2, 0x527D }, { 0xF8F3, 0x5F6A }, { 0xF8F4, 0x6153 }, { 0xF8F5, 0x6753 }, { 0xF8F6, 0x6A19 },
+	{ 0xF8F7, 0x6F02 }, { 0xF8F8, 0x74E2 }, { 0xF8F9, 0x7968 }, { 0xF8FA, 0x8868 }, { 0xF8FB, 0x8C79 }, { 0xF8FC, 0x98C7 }, { 0xF8FD, 0x98C4 }, { 0xF8FE, 0x9A43 },
+	{ 0xF9A1, 0x54C1 }, { 0xF9A2, 0x7A1F }, { 0xF9A3, 0x6953 }, { 0xF9A4, 0x8AF7 }, { 0xF9A5, 0x8C4A }, { 0xF9A6, 0x98A8 }, { 0xF9A7, 0x99AE }, { 0xF9A8, 0x5F7C },
+	{ 0xF9A9, 0x62AB }, { 0xF9AA, 0x75B2 }, { 0xF9AB, 0x76AE }, { 0xF9AC, 0x88AB }, { 0xF9AD, 0x907F }, { 0xF9AE, 0x9642 }, { 0xF9AF, 0x5339 }, { 0xF9B0, 0x5F3C },
+	{ 0xF9B1, 0x5FC5 }, { 0xF9B2, 0x6CCC }, { 0xF9B3, 0x73CC }, { 0xF9B4, 0x7562 }, { 0xF9B5, 0x758B }, { 0xF9B6, 0x7B46 }, { 0xF9B7, 0x82FE }, { 0xF9B8, 0x999D },
+	{ 0xF9B9, 0x4E4F }, { 0xF9BA, 0x903C }, { 0xF9BB, 0x4E0B }, { 0xF9BC, 0x4F55 }, { 0xF9BD, 0x53A6 }, { 0xF9BE, 0x590F }, { 0xF9BF, 0x5EC8 }, { 0xF9C0, 0x6630 },
+	{ 0xF9C1, 0x6CB3 }, { 0xF9C2, 0x7455 }, { 0xF9C3, 0x8377 }, { 0xF9C4, 0x8766 }, { 0xF9C5, 0x8CC0 }, { 0xF9C6, 0x9050 }, { 0xF9C7, 0x971E }, { 0xF9C8, 0x9C15 },
+	{ 0xF9C9, 0x58D1 }, { 0xF9CA, 0x5B78 }, { 0xF9CB, 0x8650 }, { 0xF9CC, 0x8B14 }, { 0xF9CD, 0x9DB4 }, { 0xF9CE, 0x5BD2 }, { 0xF9CF, 0x6068 }, { 0xF9D0, 0x608D },
+	{ 0xF9D1, 0x65F1 }, { 0xF9D2, 0x6C57 }, { 0xF9D3, 0x6F22 }, { 0xF9D4, 0x6FA3 }, { 0xF9D5, 0x701A }, { 0xF9D6, 0x7F55 }, { 0xF9D7, 0x7FF0 }, { 0xF9D8, 0x9591 },
+	{ 0xF9D9, 0x9592 }, { 0xF9DA, 0x9650 }, { 0xF9DB, 0x97D3 }, { 0xF9DC, 0x5272 }, { 0xF9DD, 0x8F44 }, { 0xF9DE, 0x51FD }, { 0xF9DF, 0x542B }, { 0xF9E0, 0x54B8 },
+	{ 0xF9E1, 0x5563 }, { 0xF9E2, 0x558A }, { 0xF9E3, 0x6ABB }, { 0xF9E4, 0x6DB5 }, { 0xF9E5, 0x7DD8 }, { 0xF9E6, 0x8266 }, { 0xF9E7, 0x929C }, { 0xF9E8, 0x9677 },
+	{ 0xF9E9, 0x9E79 }, { 0xF9EA, 0x5408 }, { 0xF9EB, 0x54C8 }, { 0xF9EC, 0x76D2 }, { 0xF9ED, 0x86E4 }, { 0xF9EE, 0x95A4 }, { 0xF9EF, 0x95D4 }, { 0xF9F0, 0x965C },
+	{ 0xF9F1, 0x4EA2 }, { 0xF9F2, 0x4F09 }, { 0xF9F3, 0x59EE }, { 0xF9F4, 0x5AE6 }, { 0xF9F5, 0x5DF7 }, { 0xF9F6, 0x6052 }, { 0xF9F7, 0x6297 }, { 0xF9F8, 0x676D },
+	{ 0xF9F9, 0x6841 }, { 0xF9FA, 0x6C86 }, { 0xF9FB, 0x6E2F }, { 0xF9FC, 0x7F38 }, { 0xF9FD, 0x809B }, { 0xF9FE, 0x822A }, { 0xFAA1, 0xFA08 }, { 0xFAA2, 0xFA09 },
+	{ 0xFAA3, 0x9805 }, { 0xFAA4, 0x4EA5 }, { 0xFAA5, 0x5055 }, { 0xFAA6, 0x54B3 }, { 0xFAA7, 0x5793 }, { 0xFAA8, 0x595A }, { 0xFAA9, 0x5B69 }, { 0xFAAA, 0x5BB3 },
+	{ 0xFAAB, 0x61C8 }, { 0xFAAC, 0x6977 }, { 0xFAAD, 0x6D77 }, { 0xFAAE, 0x7023 }, { 0xFAAF, 0x87F9 }, { 0xFAB0, 0x89E3 }, { 0xFAB1, 0x8A72 }, { 0xFAB2, 0x8AE7 },
+	{ 0xFAB3, 0x9082 }, { 0xFAB4, 0x99ED }, { 0xFAB5, 0x9AB8 }, { 0xFAB6, 0x52BE }, { 0xFAB7, 0x6838 }, { 0xFAB8, 0x5016 }, { 0xFAB9, 0x5E78 }, { 0xFABA, 0x674F },
+	{ 0xFABB, 0x8347 }, { 0xFABC, 0x884C }, { 0xFABD, 0x4EAB }, { 0xFABE, 0x5411 }, { 0xFABF, 0x56AE }, { 0xFAC0, 0x73E6 }, { 0xFAC1, 0x9115 }, { 0xFAC2, 0x97FF },
+	{ 0xFAC3, 0x9909 }, { 0xFAC4, 0x9957 }, { 0xFAC5, 0x9999 }, { 0xFAC6, 0x5653 }, { 0xFAC7, 0x589F }, { 0xFAC8, 0x865B }, { 0xFAC9, 0x8A31 }, { 0xFACA, 0x61B2 },
+	{ 0xFACB, 0x6AF6 }, { 0xFACC, 0x737B }, { 0xFACD, 0x8ED2 }, { 0xFACE, 0x6B47 }, { 0xFACF, 0x96AA }, { 0xFAD0, 0x9A57 }, { 0xFAD1, 0x5955 }, { 0xFAD2, 0x7200 },
+	{ 0xFAD3, 0x8D6B }, { 0xFAD4, 0x9769 }, { 0xFAD5, 0x4FD4 }, { 0xFAD6, 0x5CF4 }, { 0xFAD7, 0x5F26 }, { 0xFAD8, 0x61F8 }, { 0xFAD9, 0x665B }, { 0xFADA, 0x6CEB },
+	{ 0xFADB, 0x70AB }, { 0xFADC, 0x7384 }, { 0xFADD, 0x73B9 }, { 0xFADE, 0x73FE }, { 0xFADF, 0x7729 }, { 0xFAE0, 0x774D }, { 0xFAE1, 0x7D43 }, { 0xFAE2, 0x7D62 },
+	{ 0xFAE3, 0x7E23 }, { 0xFAE4, 0x8237 }, { 0xFAE5, 0x8852 }, { 0xFAE6, 0xFA0A }, { 0xFAE7, 0x8CE2 }, { 0xFAE8, 0x9249 }, { 0xFAE9, 0x986F }, { 0xFAEA, 0x5B51 },
+	{ 0xFAEB, 0x7A74 }, { 0xFAEC, 0x8840 }, { 0xFAED, 0x9801 }, { 0xFAEE, 0x5ACC }, { 0xFAEF, 0x4FE0 }, { 0xFAF0, 0x5354 }, { 0xFAF1, 0x593E }, { 0xFAF2, 0x5CFD },
+	{ 0xFAF3, 0x633E }, { 0xFAF4, 0x6D79 }, { 0xFAF5, 0x72F9 }, { 0xFAF6, 0x8105 }, { 0xFAF7, 0x8107 }, { 0xFAF8, 0x83A2 }, { 0xFAF9, 0x92CF }, { 0xFAFA, 0x9830 },
+	{ 0xFAFB, 0x4EA8 }, { 0xFAFC, 0x5144 }, { 0xFAFD, 0x5211 }, { 0xFAFE, 0x578B }, { 0xFBA1, 0x5F62 }, { 0xFBA2, 0x6CC2 }, { 0xFBA3, 0x6ECE }, { 0xFBA4, 0x7005 },
+	{ 0xFBA5, 0x7050 }, { 0xFBA6, 0x70AF }, { 0xFBA7, 0x7192 }, { 0xFBA8, 0x73E9 }, { 0xFBA9, 0x7469 }, { 0xFBAA, 0x834A }, { 0xFBAB, 0x87A2 }, { 0xFBAC, 0x8861 },
+	{ 0xFBAD, 0x9008 }, { 0xFBAE, 0x90A2 }, { 0xFBAF, 0x93A3 }, { 0xFBB0, 0x99A8 }, { 0xFBB1, 0x516E }, { 0xFBB2, 0x5F57 }, { 0xFBB3, 0x60E0 }, { 0xFBB4, 0x6167 },
+	{ 0xFBB5, 0x66B3 }, { 0xFBB6, 0x8559 }, { 0xFBB7, 0x8E4A }, { 0xFBB8, 0x91AF }, { 0xFBB9, 0x978B }, { 0xFBBA, 0x4E4E }, { 0xFBBB, 0x4E92 }, { 0xFBBC, 0x547C },
+	{ 0xFBBD, 0x58D5 }, { 0xFBBE, 0x58FA }, { 0xFBBF, 0x597D }, { 0xFBC0, 0x5CB5 }, { 0xFBC1, 0x5F27 }, { 0xFBC2, 0x6236 }, { 0xFBC3, 0x6248 }, { 0xFBC4, 0x660A },
+	{ 0xFBC5, 0x6667 }, { 0xFBC6, 0x6BEB }, { 0xFBC7, 0x6D69 }, { 0xFBC8, 0x6DCF }, { 0xFBC9, 0x6E56 }, { 0xFBCA, 0x6EF8 }, { 0xFBCB, 0x6F94 }, { 0xFBCC, 0x6FE0 },
+	{ 0xFBCD, 0x6FE9 }, { 0xFBCE, 0x705D }, { 0xFBCF, 0x72D0 }, { 0xFBD0, 0x7425 }, { 0xFBD1, 0x745A }, { 0xFBD2, 0x74E0 }, { 0xFBD3, 0x7693 }, { 0xFBD4, 0x795C },
+	{ 0xFBD5, 0x7CCA }, { 0xFBD6, 0x7E1E }, { 0xFBD7, 0x80E1 }, { 0xFBD8, 0x82A6 }, { 0xFBD9, 0x846B }, { 0xFBDA, 0x84BF }, { 0xFBDB, 0x864E }, { 0xFBDC, 0x865F },
+	{ 0xFBDD, 0x8774 }, { 0xFBDE, 0x8B77 }, { 0xFBDF, 0x8C6A }, { 0xFBE0, 0x93AC }, { 0xFBE1, 0x9800 }, { 0xFBE2, 0x9865 }, { 0xFBE3, 0x60D1 }, { 0xFBE4, 0x6216 },
+	{ 0xFBE5, 0x9177 }, { 0xFBE6, 0x5A5A }, { 0xFBE7, 0x660F }, { 0xFBE8, 0x6DF7 }, { 0xFBE9, 0x6E3E }, { 0xFBEA, 0x743F }, { 0xFBEB, 0x9B42 }, { 0xFBEC, 0x5FFD },
+	{ 0xFBED, 0x60DA }, { 0xFBEE, 0x7B0F }, { 0xFBEF, 0x54C4 }, { 0xFBF0, 0x5F18 }, { 0xFBF1, 0x6C5E }, { 0xFBF2, 0x6CD3 }, { 0xFBF3, 0x6D2A }, { 0xFBF4, 0x70D8 },
+	{ 0xFBF5, 0x7D05 }, { 0xFBF6, 0x8679 }, { 0xFBF7, 0x8A0C }, { 0xFBF8, 0x9D3B }, { 0xFBF9, 0x5316 }, { 0xFBFA, 0x548C }, { 0xFBFB, 0x5B05 }, { 0xFBFC, 0x6A3A },
+	{ 0xFBFD, 0x706B }, { 0xFBFE, 0x7575 }, { 0xFCA1, 0x798D }, { 0xFCA2, 0x79BE }, { 0xFCA3, 0x82B1 }, { 0xFCA4, 0x83EF }, { 0xFCA5, 0x8A71 }, { 0xFCA6, 0x8B41 },
+	{ 0xFCA7, 0x8CA8 }, { 0xFCA8, 0x9774 }, { 0xFCA9, 0xFA0B }, { 0xFCAA, 0x64F4 }, { 0xFCAB, 0x652B }, { 0xFCAC, 0x78BA }, { 0xFCAD, 0x78BB }, { 0xFCAE, 0x7A6B },
+	{ 0xFCAF, 0x4E38 }, { 0xFCB0, 0x559A }, { 0xFCB1, 0x5950 }, { 0xFCB2, 0x5BA6 }, { 0xFCB3, 0x5E7B }, { 0xFCB4, 0x60A3 }, { 0xFCB5, 0x63DB }, { 0xFCB6, 0x6B61 },
+	{ 0xFCB7, 0x6665 }, { 0xFCB8, 0x6853 }, { 0xFCB9, 0x6E19 }, { 0xFCBA, 0x7165 }, { 0xFCBB, 0x74B0 }, { 0xFCBC, 0x7D08 }, { 0xFCBD, 0x9084 }, { 0xFCBE, 0x9A69 },
+	{ 0xFCBF, 0x9C25 }, { 0xFCC0, 0x6D3B }, { 0xFCC1, 0x6ED1 }, { 0xFCC2, 0x733E }, { 0xFCC3, 0x8C41 }, { 0xFCC4, 0x95CA }, { 0xFCC5, 0x51F0 }, { 0xFCC6, 0x5E4C },
+	{ 0xFCC7, 0x5FA8 }, { 0xFCC8, 0x604D }, { 0xFCC9, 0x60F6 }, { 0xFCCA, 0x6130 }, { 0xFCCB, 0x614C }, { 0xFCCC, 0x6643 }, { 0xFCCD, 0x6644 }, { 0xFCCE, 0x69A5 },
+	{ 0xFCCF, 0x6CC1 }, { 0xFCD0, 0x6E5F }, { 0xFCD1, 0x6EC9 }, { 0xFCD2, 0x6F62 }, { 0xFCD3, 0x714C }, { 0xFCD4, 0x749C }, { 0xFCD5, 0x7687 }, { 0xFCD6, 0x7BC1 },
+	{ 0xFCD7, 0x7C27 }, { 0xFCD8, 0x8352 }, { 0xFCD9, 0x8757 }, { 0xFCDA, 0x9051 }, { 0xFCDB, 0x968D }, { 0xFCDC, 0x9EC3 }, { 0xFCDD, 0x532F }, { 0xFCDE, 0x56DE },
+	{ 0xFCDF, 0x5EFB }, { 0xFCE0, 0x5F8A }, { 0xFCE1, 0x6062 }, { 0xFCE2, 0x6094 }, { 0xFCE3, 0x61F7 }, { 0xFCE4, 0x6666 }, { 0xFCE5, 0x6703 }, { 0xFCE6, 0x6A9C },
+	{ 0xFCE7, 0x6DEE }, { 0xFCE8, 0x6FAE }, { 0xFCE9, 0x7070 }, { 0xFCEA, 0x736A }, { 0xFCEB, 0x7E6A }, { 0xFCEC, 0x81BE }, { 0xFCED, 0x8334 }, { 0xFCEE, 0x86D4 },
+	{ 0xFCEF, 0x8AA8 }, { 0xFCF0, 0x8CC4 }, { 0xFCF1, 0x5283 }, { 0xFCF2, 0x7372 }, { 0xFCF3, 0x5B96 }, { 0xFCF4, 0x6A6B }, { 0xFCF5, 0x9404 }, { 0xFCF6, 0x54EE },
+	{ 0xFCF7, 0x5686 }, { 0xFCF8, 0x5B5D }, { 0xFCF9, 0x6548 }, { 0xFCFA, 0x6585 }, { 0xFCFB, 0x66C9 }, { 0xFCFC, 0x689F }, { 0xFCFD, 0x6D8D }, { 0xFCFE, 0x6DC6 },
+	{ 0xFDA1, 0x723B }, { 0xFDA2, 0x80B4 }, { 0xFDA3, 0x9175 }, { 0xFDA4, 0x9A4D }, { 0xFDA5, 0x4FAF }, { 0xFDA6, 0x5019 }, { 0xFDA7, 0x539A }, { 0xFDA8, 0x540E },
+	{ 0xFDA9, 0x543C }, { 0xFDAA, 0x5589 }, { 0xFDAB, 0x55C5 }, { 0xFDAC, 0x5E3F }, { 0xFDAD, 0x5F8C }, { 0xFDAE, 0x673D }, { 0xFDAF, 0x7166 }, { 0xFDB0, 0x73DD },
+	{ 0xFDB1, 0x9005 }, { 0xFDB2, 0x52DB }, { 0xFDB3, 0x52F3 }, { 0xFDB4, 0x5864 }, { 0xFDB5, 0x58CE }, { 0xFDB6, 0x7104 }, { 0xFDB7, 0x718F }, { 0xFDB8, 0x71FB },
+	{ 0xFDB9, 0x85B0 }, { 0xFDBA, 0x8A13 }, { 0xFDBB, 0x6688 }, { 0xFDBC, 0x85A8 }, { 0xFDBD, 0x55A7 }, { 0xFDBE, 0x6684 }, { 0xFDBF, 0x714A }, { 0xFDC0, 0x8431 },
+	{ 0xFDC1, 0x5349 }, { 0xFDC2, 0x5599 }, { 0xFDC3, 0x6BC1 }, { 0xFDC4, 0x5F59 }, { 0xFDC5, 0x5FBD }, { 0xFDC6, 0x63EE }, { 0xFDC7, 0x6689 }, { 0xFDC8, 0x7147 },
+	{ 0xFDC9, 0x8AF1 }, { 0xFDCA, 0x8F1D }, { 0xFDCB, 0x9EBE }, { 0xFDCC, 0x4F11 }, { 0xFDCD, 0x643A }, { 0xFDCE, 0x70CB }, { 0xFDCF, 0x7566 }, { 0xFDD0, 0x8667 },
+	{ 0xFDD1, 0x6064 }, { 0xFDD2, 0x8B4E }, { 0xFDD3, 0x9DF8 }, { 0xFDD4, 0x5147 }, { 0xFDD5, 0x51F6 }, { 0xFDD6, 0x5308 }, { 0xFDD7, 0x6D36 }, { 0xFDD8, 0x80F8 },
+	{ 0xFDD9, 0x9ED1 }, { 0xFDDA, 0x6615 }, { 0xFDDB, 0x6B23 }, { 0xFDDC, 0x7098 }, { 0xFDDD, 0x75D5 }, { 0xFDDE, 0x5403 }, { 0xFDDF, 0x5C79 }, { 0xFDE0, 0x7D07 },
+	{ 0xFDE1, 0x8A16 }, { 0xFDE2, 0x6B20 }, { 0xFDE3, 0x6B3D }, { 0xFDE4, 0x6B46 }, { 0xFDE5, 0x5438 }, { 0xFDE6, 0x6070 }, { 0xFDE7, 0x6D3D }, { 0xFDE8, 0x7FD5 },
+	{ 0xFDE9, 0x8208 }, { 0xFDEA, 0x50D6 }, { 0xFDEB, 0x51DE }, { 0xFDEC, 0x559C }, { 0xFDED, 0x566B }, { 0xFDEE, 0x56CD }, { 0xFDEF, 0x59EC }, { 0xFDF0, 0x5B09 },
+	{ 0xFDF1, 0x5E0C }, { 0xFDF2, 0x6199 }, { 0xFDF3, 0x6198 }, { 0xFDF4, 0x6231 }, { 0xFDF5, 0x665E }, { 0xFDF6, 0x66E6 }, { 0xFDF7, 0x7199 }, { 0xFDF8, 0x71B9 },
+	{ 0xFDF9, 0x71BA }, { 0xFDFA, 0x72A7 }, { 0xFDFB, 0x79A7 }, { 0xFDFC, 0x7A00 }, { 0xFDFD, 0x7FB2 }, { 0xFDFE, 0x8A70 },
 };
 
 
 const DoubleByteEncoding::Mapping MacKoreanEncoding::_reverseMappingTable[] = {
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x0085, 0x0085 }, 
-	{ 0x0086, 0x0086 }, { 0x0087, 0x0087 }, { 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D }, 
-	{ 0x008E, 0x008E }, { 0x008F, 0x008F }, { 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 }, 
-	{ 0x0096, 0x0096 }, { 0x0097, 0x0097 }, { 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D }, 
-	{ 0x009E, 0x009E }, { 0x009F, 0x009F }, { 0x00A0, 0x0080 }, { 0x00A1, 0xA2AE }, { 0x00A2, 0xA1CB }, { 0x00A3, 0xA1CC }, { 0x00A4, 0xA2B4 }, { 0x00A5, 0xA1CD }, 
-	{ 0x00A7, 0xA1D7 }, { 0x00A8, 0xA1A7 }, { 0x00A9, 0x0083 }, { 0x00AA, 0xA8A3 }, { 0x00AB, 0xA65C }, { 0x00AC, 0xA1FE }, { 0x00B0, 0xA1C6 }, { 0x00B1, 0xA1BE }, 
-	{ 0x00B2, 0xA9F7 }, { 0x00B3, 0xA9F8 }, { 0x00B4, 0xA2A5 }, { 0x00B6, 0xA2D2 }, { 0x00B7, 0xA1A4 }, { 0x00B8, 0xA2AC }, { 0x00B9, 0xA9F6 }, { 0x00BA, 0xA8AC }, 
-	{ 0x00BB, 0xA65D }, { 0x00BC, 0xA8F9 }, { 0x00BD, 0xA8F6 }, { 0x00BE, 0xA8FA }, { 0x00BF, 0xA2AF }, { 0x00C6, 0xA8A1 }, { 0x00D0, 0xA8A2 }, { 0x00D7, 0xA1BF }, 
-	{ 0x00D8, 0xA8AA }, { 0x00DE, 0xA8AD }, { 0x00DF, 0xA9AC }, { 0x00E6, 0xA9A1 }, { 0x00F0, 0xA9A3 }, { 0x00F7, 0xA1C0 }, { 0x00F8, 0xA9AA }, { 0x00FE, 0xA9AD }, 
-	{ 0x0111, 0xA9A2 }, { 0x0126, 0xA8A4 }, { 0x0127, 0xA9A4 }, { 0x0131, 0xA9A5 }, { 0x0132, 0xA8A6 }, { 0x0133, 0xA9A6 }, { 0x0138, 0xA9A7 }, { 0x013F, 0xA8A8 }, 
-	{ 0x0140, 0xA9A8 }, { 0x0141, 0xA8A9 }, { 0x0142, 0xA9A9 }, { 0x0149, 0xA9B0 }, { 0x014A, 0xA8AF }, { 0x014B, 0xA9AF }, { 0x0152, 0xA8AB }, { 0x0153, 0xA9AB }, 
-	{ 0x0166, 0xA8AE }, { 0x0167, 0xA9AE }, { 0x02BC, 0xA198 }, { 0x02C7, 0xA2A7 }, { 0x02D0, 0xA2B0 }, { 0x02D8, 0xA2A8 }, { 0x02D9, 0xA2AB }, { 0x02DA, 0xA2AA }, 
-	{ 0x02DB, 0xA2AD }, { 0x02DC, 0xA2A6 }, { 0x02DD, 0xA2A9 }, { 0x0391, 0xA5C1 }, { 0x0392, 0xA5C2 }, { 0x0393, 0xA5C3 }, { 0x0394, 0xA5C4 }, { 0x0395, 0xA5C5 }, 
-	{ 0x0396, 0xA5C6 }, { 0x0397, 0xA5C7 }, { 0x0398, 0xA5C8 }, { 0x0399, 0xA5C9 }, { 0x039A, 0xA5CA }, { 0x039B, 0xA5CB }, { 0x039C, 0xA5CC }, { 0x039D, 0xA5CD }, 
-	{ 0x039E, 0xA5CE }, { 0x039F, 0xA5CF }, { 0x03A0, 0xA5D0 }, { 0x03A1, 0xA5D1 }, { 0x03A3, 0xA5D2 }, { 0x03A4, 0xA5D3 }, { 0x03A5, 0xA5D4 }, { 0x03A6, 0xA5D5 }, 
-	{ 0x03A7, 0xA5D6 }, { 0x03A8, 0xA5D7 }, { 0x03A9, 0xA5D8 }, { 0x03B1, 0xA5E1 }, { 0x03B2, 0xA5E2 }, { 0x03B3, 0xA5E3 }, { 0x03B4, 0xA5E4 }, { 0x03B5, 0xA5E5 }, 
-	{ 0x03B6, 0xA5E6 }, { 0x03B7, 0xA5E7 }, { 0x03B8, 0xA5E8 }, { 0x03B9, 0xA5E9 }, { 0x03BA, 0xA5EA }, { 0x03BB, 0xA5EB }, { 0x03BC, 0xA5EC }, { 0x03BD, 0xA5ED }, 
-	{ 0x03BE, 0xA5EE }, { 0x03BF, 0xA5EF }, { 0x03C0, 0xA5F0 }, { 0x03C1, 0xA5F1 }, { 0x03C3, 0xA5F2 }, { 0x03C4, 0xA5F3 }, { 0x03C5, 0xA5F4 }, { 0x03C6, 0xA5F5 }, 
-	{ 0x03C7, 0xA5F6 }, { 0x03C8, 0xA5F7 }, { 0x03C9, 0xA5F8 }, { 0x03D5, 0xA76A }, { 0x0401, 0xACA7 }, { 0x0410, 0xACA1 }, { 0x0411, 0xACA2 }, { 0x0412, 0xACA3 }, 
-	{ 0x0413, 0xACA4 }, { 0x0414, 0xACA5 }, { 0x0415, 0xACA6 }, { 0x0416, 0xACA8 }, { 0x0417, 0xACA9 }, { 0x0418, 0xACAA }, { 0x0419, 0xACAB }, { 0x041A, 0xACAC }, 
-	{ 0x041B, 0xACAD }, { 0x041C, 0xACAE }, { 0x041D, 0xACAF }, { 0x041E, 0xACB0 }, { 0x041F, 0xACB1 }, { 0x0420, 0xACB2 }, { 0x0421, 0xACB3 }, { 0x0422, 0xACB4 }, 
-	{ 0x0423, 0xACB5 }, { 0x0424, 0xACB6 }, { 0x0425, 0xACB7 }, { 0x0426, 0xACB8 }, { 0x0427, 0xACB9 }, { 0x0428, 0xACBA }, { 0x0429, 0xACBB }, { 0x042A, 0xACBC }, 
-	{ 0x042B, 0xACBD }, { 0x042C, 0xACBE }, { 0x042D, 0xACBF }, { 0x042E, 0xACC0 }, { 0x042F, 0xACC1 }, { 0x0430, 0xACD1 }, { 0x0431, 0xACD2 }, { 0x0432, 0xACD3 }, 
-	{ 0x0433, 0xACD4 }, { 0x0434, 0xACD5 }, { 0x0435, 0xACD6 }, { 0x0436, 0xACD8 }, { 0x0437, 0xACD9 }, { 0x0438, 0xACDA }, { 0x0439, 0xACDB }, { 0x043A, 0xACDC }, 
-	{ 0x043B, 0xACDD }, { 0x043C, 0xACDE }, { 0x043D, 0xACDF }, { 0x043E, 0xACE0 }, { 0x043F, 0xACE1 }, { 0x0440, 0xACE2 }, { 0x0441, 0xACE3 }, { 0x0442, 0xACE4 }, 
-	{ 0x0443, 0xACE5 }, { 0x0444, 0xACE6 }, { 0x0445, 0xACE7 }, { 0x0446, 0xACE8 }, { 0x0447, 0xACE9 }, { 0x0448, 0xACEA }, { 0x0449, 0xACEB }, { 0x044A, 0xACEC }, 
-	{ 0x044B, 0xACED }, { 0x044C, 0xACEE }, { 0x044D, 0xACEF }, { 0x044E, 0xACF0 }, { 0x044F, 0xACF1 }, { 0x0451, 0xACD7 }, { 0x2013, 0xA1A9 }, { 0x2014, 0xA1AA }, 
-	{ 0x2016, 0xA1AB }, { 0x2018, 0xA1AE }, { 0x2019, 0xA1AF }, { 0x201B, 0xA170 }, { 0x201C, 0xA1B0 }, { 0x201D, 0xA1B1 }, { 0x201F, 0xA16F }, { 0x2020, 0xA2D3 }, 
-	{ 0x2021, 0xA2D4 }, { 0x2022, 0xA655 }, { 0x2025, 0xA1A5 }, { 0x2026, 0xA1A6 }, { 0x2030, 0xA2B6 }, { 0x2032, 0xA1C7 }, { 0x2033, 0xA1C8 }, { 0x2034, 0xA5DE }, 
-	{ 0x2035, 0xADAD }, { 0x2036, 0xADAB }, { 0x2039, 0xA65A }, { 0x203A, 0xA65B }, { 0x203B, 0xA1D8 }, { 0x203C, 0xA784 }, { 0x203E, 0xA3FE }, { 0x2042, 0xA64D }, 
-	{ 0x2047, 0xA787 }, { 0x2049, 0xA785 }, { 0x204C, 0xA196 }, { 0x204D, 0xA197 }, { 0x204E, 0xA64E }, { 0x2051, 0xA16D }, { 0x2074, 0xA9F9 }, { 0x207A, 0xA171 }, 
-	{ 0x207B, 0xA172 }, { 0x207C, 0xA17A }, { 0x207D, 0xA17C }, { 0x207E, 0xA17D }, { 0x207F, 0xA9FA }, { 0x2081, 0xA9FB }, { 0x2082, 0xA9FC }, { 0x2083, 0xA9FD }, 
-	{ 0x2084, 0xA9FE }, { 0x20A9, 0x0081 }, { 0x2103, 0xA1C9 }, { 0x2109, 0xA2B5 }, { 0x2113, 0xA7A4 }, { 0x2116, 0xA2E0 }, { 0x2121, 0xA2E5 }, { 0x2122, 0xA2E2 }, 
-	{ 0x2126, 0xA7D9 }, { 0x212B, 0xA1CA }, { 0x2153, 0xA8F7 }, { 0x2154, 0xA8F8 }, { 0x215B, 0xA8FB }, { 0x215C, 0xA8FC }, { 0x215D, 0xA8FD }, { 0x215E, 0xA8FE }, 
-	{ 0x2160, 0xA5B0 }, { 0x2161, 0xA5B1 }, { 0x2162, 0xA5B2 }, { 0x2163, 0xA5B3 }, { 0x2164, 0xA5B4 }, { 0x2165, 0xA5B5 }, { 0x2166, 0xA5B6 }, { 0x2167, 0xA5B7 }, 
-	{ 0x2168, 0xA5B8 }, { 0x2169, 0xA5B9 }, { 0x2170, 0xA5A1 }, { 0x2171, 0xA5A2 }, { 0x2172, 0xA5A3 }, { 0x2173, 0xA5A4 }, { 0x2174, 0xA5A5 }, { 0x2175, 0xA5A6 }, 
-	{ 0x2176, 0xA5A7 }, { 0x2177, 0xA5A8 }, { 0x2178, 0xA5A9 }, { 0x2179, 0xA5AA }, { 0x2190, 0xA1E7 }, { 0x2191, 0xA1E8 }, { 0x2192, 0xA1E6 }, { 0x2193, 0xA1E9 }, 
-	{ 0x2194, 0xA1EA }, { 0x2195, 0xA2D5 }, { 0x2196, 0xA2D8 }, { 0x2197, 0xA2D6 }, { 0x2198, 0xA2D9 }, { 0x2199, 0xA2D7 }, { 0x219C, 0xAC53 }, { 0x219D, 0xAC52 }, 
-	{ 0x21B0, 0xA882 }, { 0x21B1, 0xA87C }, { 0x21B2, 0xA87B }, { 0x21B3, 0xA883 }, { 0x21B4, 0xA881 }, { 0x21B6, 0xAC50 }, { 0x21B7, 0xAC51 }, { 0x21BC, 0xA892 }, 
-	{ 0x21C0, 0xA893 }, { 0x21C4, 0xA89E }, { 0x21C5, 0xA89F }, { 0x21CD, 0xA84B }, { 0x21CF, 0xA84A }, { 0x21D0, 0xA849 }, { 0x21D2, 0xA2A1 }, { 0x21D4, 0xA2A2 }, 
-	{ 0x21E0, 0xAC6A }, { 0x21E1, 0xAC6C }, { 0x21E2, 0xAC6B }, { 0x21E3, 0xAC6D }, { 0x21E6, 0xAC72 }, { 0x21E7, 0xAC74 }, { 0x21E8, 0xAC73 }, { 0x21E9, 0xAC75 }, 
-	{ 0x21F0, 0xAC41 }, { 0x2200, 0xA2A3 }, { 0x2202, 0xA1D3 }, { 0x2203, 0xA2A4 }, { 0x2206, 0xA751 }, { 0x2207, 0xA1D4 }, { 0x2208, 0xA1F4 }, { 0x2209, 0xA773 }, 
-	{ 0x220B, 0xA1F5 }, { 0x220C, 0xA774 }, { 0x220F, 0xA2B3 }, { 0x2211, 0xA2B2 }, { 0x2213, 0xA75C }, { 0x221A, 0xA1EE }, { 0x221D, 0xA1F0 }, { 0x221E, 0xA1C4 }, 
-	{ 0x221F, 0xA753 }, { 0x2220, 0xA1D0 }, { 0x2222, 0xA768 }, { 0x2225, 0xA755 }, { 0x2226, 0xA756 }, { 0x2227, 0xA1FC }, { 0x2228, 0xA1FD }, { 0x2229, 0xA1FB }, 
-	{ 0x222A, 0xA1FA }, { 0x222B, 0xA1F2 }, { 0x222C, 0xA1F3 }, { 0x222E, 0xA2B1 }, { 0x2234, 0xA1C5 }, { 0x2235, 0xA1F1 }, { 0x2237, 0xA2FE }, { 0x223D, 0xA1EF }, 
-	{ 0x2243, 0xA49A }, { 0x2245, 0xA499 }, { 0x2248, 0xA49B }, { 0x2250, 0xA769 }, { 0x2251, 0xA759 }, { 0x2252, 0xA1D6 }, { 0x2253, 0xA758 }, { 0x225A, 0xA777 }, 
-	{ 0x2260, 0xA1C1 }, { 0x2261, 0xA1D5 }, { 0x2262, 0xA764 }, { 0x2264, 0xA1C2 }, { 0x2265, 0xA1C3 }, { 0x2266, 0xA75A }, { 0x2267, 0xA75B }, { 0x226A, 0xA1EC }, 
-	{ 0x226B, 0xA1ED }, { 0x226E, 0xA76F }, { 0x226F, 0xA770 }, { 0x2270, 0xA487 }, { 0x2271, 0xA488 }, { 0x2272, 0xA489 }, { 0x2273, 0xA48A }, { 0x2276, 0xA48F }, 
-	{ 0x2277, 0xA490 }, { 0x2279, 0xA491 }, { 0x227A, 0xA481 }, { 0x227B, 0xA482 }, { 0x2280, 0xA485 }, { 0x2281, 0xA486 }, { 0x2282, 0xA1F8 }, { 0x2283, 0xA1F9 }, 
-	{ 0x2284, 0xA772 }, { 0x2285, 0xA771 }, { 0x2286, 0xA1F6 }, { 0x2287, 0xA1F7 }, { 0x2295, 0xA75D }, { 0x2296, 0xA75E }, { 0x2297, 0xA75F }, { 0x22A3, 0xA76C }, 
-	{ 0x22A4, 0xA49D }, { 0x22A5, 0xA1D1 }, { 0x22BB, 0xA775 }, { 0x22BC, 0xA776 }, { 0x22CE, 0xA483 }, { 0x22CF, 0xA484 }, { 0x22DA, 0xA492 }, { 0x22DB, 0xA493 }, 
-	{ 0x22EE, 0xA2FD }, { 0x2306, 0xA778 }, { 0x2312, 0xA1D2 }, { 0x2314, 0xA761 }, { 0x2460, 0xA8E7 }, { 0x2461, 0xA8E8 }, { 0x2462, 0xA8E9 }, { 0x2463, 0xA8EA }, 
-	{ 0x2464, 0xA8EB }, { 0x2465, 0xA8EC }, { 0x2466, 0xA8ED }, { 0x2467, 0xA8EE }, { 0x2468, 0xA8EF }, { 0x2469, 0xA8F0 }, { 0x246A, 0xA8F1 }, { 0x246B, 0xA8F2 }, 
-	{ 0x246C, 0xA8F3 }, { 0x246D, 0xA8F4 }, { 0x246E, 0xA8F5 }, { 0x246F, 0xA7F0 }, { 0x2470, 0xA7F1 }, { 0x2471, 0xA7F2 }, { 0x2472, 0xA7F3 }, { 0x2473, 0xA7F4 }, 
-	{ 0x2474, 0xA9E7 }, { 0x2475, 0xA9E8 }, { 0x2476, 0xA9E9 }, { 0x2477, 0xA9EA }, { 0x2478, 0xA9EB }, { 0x2479, 0xA9EC }, { 0x247A, 0xA9ED }, { 0x247B, 0xA9EE }, 
-	{ 0x247C, 0xA9EF }, { 0x247D, 0xA9F0 }, { 0x247E, 0xA9F1 }, { 0x247F, 0xA9F2 }, { 0x2480, 0xA9F3 }, { 0x2481, 0xA9F4 }, { 0x2482, 0xA9F5 }, { 0x2483, 0xAAF4 }, 
-	{ 0x2484, 0xAAF5 }, { 0x2485, 0xAAF6 }, { 0x2486, 0xAAF7 }, { 0x2487, 0xAAF8 }, { 0x249C, 0xA9CD }, { 0x249D, 0xA9CE }, { 0x249E, 0xA9CF }, { 0x249F, 0xA9D0 }, 
-	{ 0x24A0, 0xA9D1 }, { 0x24A1, 0xA9D2 }, { 0x24A2, 0xA9D3 }, { 0x24A3, 0xA9D4 }, { 0x24A4, 0xA9D5 }, { 0x24A5, 0xA9D6 }, { 0x24A6, 0xA9D7 }, { 0x24A7, 0xA9D8 }, 
-	{ 0x24A8, 0xA9D9 }, { 0x24A9, 0xA9DA }, { 0x24AA, 0xA9DB }, { 0x24AB, 0xA9DC }, { 0x24AC, 0xA9DD }, { 0x24AD, 0xA9DE }, { 0x24AE, 0xA9DF }, { 0x24AF, 0xA9E0 }, 
-	{ 0x24B0, 0xA9E1 }, { 0x24B1, 0xA9E2 }, { 0x24B2, 0xA9E3 }, { 0x24B3, 0xA9E4 }, { 0x24B4, 0xA9E5 }, { 0x24B5, 0xA9E6 }, { 0x24B6, 0xA386 }, { 0x24B7, 0xA387 }, 
-	{ 0x24B8, 0xA388 }, { 0x24B9, 0xA389 }, { 0x24BA, 0xA38A }, { 0x24BB, 0xA38B }, { 0x24BC, 0xA38C }, { 0x24BD, 0xA38D }, { 0x24BE, 0xA38E }, { 0x24BF, 0xA38F }, 
-	{ 0x24C0, 0xA390 }, { 0x24C1, 0xA391 }, { 0x24C2, 0xA392 }, { 0x24C3, 0xA393 }, { 0x24C4, 0xA394 }, { 0x24C5, 0xA395 }, { 0x24C6, 0xA396 }, { 0x24C7, 0xA397 }, 
-	{ 0x24C8, 0xA398 }, { 0x24C9, 0xA399 }, { 0x24CA, 0xA39A }, { 0x24CB, 0xA39B }, { 0x24CC, 0xA39C }, { 0x24CD, 0xA39D }, { 0x24CE, 0xA39E }, { 0x24CF, 0xA39F }, 
-	{ 0x24D0, 0xA8CD }, { 0x24D1, 0xA8CE }, { 0x24D2, 0xA8CF }, { 0x24D3, 0xA8D0 }, { 0x24D4, 0xA8D1 }, { 0x24D5, 0xA8D2 }, { 0x24D6, 0xA8D3 }, { 0x24D7, 0xA8D4 }, 
-	{ 0x24D8, 0xA8D5 }, { 0x24D9, 0xA8D6 }, { 0x24DA, 0xA8D7 }, { 0x24DB, 0xA8D8 }, { 0x24DC, 0xA8D9 }, { 0x24DD, 0xA8DA }, { 0x24DE, 0xA8DB }, { 0x24DF, 0xA8DC }, 
-	{ 0x24E0, 0xA8DD }, { 0x24E1, 0xA8DE }, { 0x24E2, 0xA8DF }, { 0x24E3, 0xA8E0 }, { 0x24E4, 0xA8E1 }, { 0x24E5, 0xA8E2 }, { 0x24E6, 0xA8E3 }, { 0x24E7, 0xA8E4 }, 
-	{ 0x24E8, 0xA8E5 }, { 0x24E9, 0xA8E6 }, { 0x24EB, 0xA6EF }, { 0x24EC, 0xA6F0 }, { 0x24ED, 0xA6F1 }, { 0x24EE, 0xA6F2 }, { 0x24EF, 0xA6F3 }, { 0x24F0, 0xA6F4 }, 
-	{ 0x24F1, 0xA6F5 }, { 0x24F2, 0xA6F6 }, { 0x24F3, 0xA6F7 }, { 0x24F4, 0xA6F8 }, { 0x2500, 0xA6A1 }, { 0x2501, 0xA6AC }, { 0x2502, 0xA6A2 }, { 0x2503, 0xA6AD }, 
-	{ 0x250C, 0xA6A3 }, { 0x250D, 0xA6C8 }, { 0x250E, 0xA6C7 }, { 0x250F, 0xA6AE }, { 0x2510, 0xA6A4 }, { 0x2511, 0xA6C2 }, { 0x2512, 0xA6C1 }, { 0x2513, 0xA6AF }, 
-	{ 0x2514, 0xA6A6 }, { 0x2515, 0xA6C6 }, { 0x2516, 0xA6C5 }, { 0x2517, 0xA6B1 }, { 0x2518, 0xA6A5 }, { 0x2519, 0xA6C4 }, { 0x251A, 0xA6C3 }, { 0x251B, 0xA6B0 }, 
-	{ 0x251C, 0xA6A7 }, { 0x251D, 0xA6BC }, { 0x251E, 0xA6C9 }, { 0x251F, 0xA6CA }, { 0x2520, 0xA6B7 }, { 0x2521, 0xA6CB }, { 0x2522, 0xA6CC }, { 0x2523, 0xA6B2 }, 
-	{ 0x2524, 0xA6A9 }, { 0x2525, 0xA6BE }, { 0x2526, 0xA6CD }, { 0x2527, 0xA6CE }, { 0x2528, 0xA6B9 }, { 0x2529, 0xA6CF }, { 0x252A, 0xA6D0 }, { 0x252B, 0xA6B4 }, 
-	{ 0x252C, 0xA6A8 }, { 0x252D, 0xA6D1 }, { 0x252E, 0xA6D2 }, { 0x252F, 0xA6B8 }, { 0x2530, 0xA6BD }, { 0x2531, 0xA6D3 }, { 0x2532, 0xA6D4 }, { 0x2533, 0xA6B3 }, 
-	{ 0x2534, 0xA6AA }, { 0x2535, 0xA6D5 }, { 0x2536, 0xA6D6 }, { 0x2537, 0xA6BA }, { 0x2538, 0xA6BF }, { 0x2539, 0xA6D7 }, { 0x253A, 0xA6D8 }, { 0x253B, 0xA6B5 }, 
-	{ 0x253C, 0xA6AB }, { 0x253D, 0xA6D9 }, { 0x253E, 0xA6DA }, { 0x253F, 0xA6BB }, { 0x2540, 0xA6DB }, { 0x2541, 0xA6DC }, { 0x2542, 0xA6C0 }, { 0x2543, 0xA6DD }, 
-	{ 0x2544, 0xA6DE }, { 0x2545, 0xA6DF }, { 0x2546, 0xA6E0 }, { 0x2547, 0xA6E1 }, { 0x2548, 0xA6E2 }, { 0x2549, 0xA6E3 }, { 0x254A, 0xA6E4 }, { 0x254B, 0xA6B6 }, 
-	{ 0x2588, 0xA78F }, { 0x2592, 0xA2C6 }, { 0x25A0, 0xA1E1 }, { 0x25A1, 0xA1E0 }, { 0x25A2, 0xA678 }, { 0x25A3, 0xA2C3 }, { 0x25A4, 0xA2C7 }, { 0x25A5, 0xA2C8 }, 
-	{ 0x25A6, 0xA2CB }, { 0x25A7, 0xA2CA }, { 0x25A8, 0xA2C9 }, { 0x25A9, 0xA2CC }, { 0x25AD, 0xA74A }, { 0x25B1, 0xA766 }, { 0x25B2, 0xA1E3 }, { 0x25B3, 0xA1E2 }, 
-	{ 0x25B5, 0xA795 }, { 0x25B6, 0xA2BA }, { 0x25B7, 0xA2B9 }, { 0x25B9, 0xA796 }, { 0x25BC, 0xA1E5 }, { 0x25BD, 0xA1E4 }, { 0x25BF, 0xA794 }, { 0x25C0, 0xA2B8 }, 
-	{ 0x25C1, 0xA2B7 }, { 0x25C3, 0xA797 }, { 0x25C6, 0xA1DF }, { 0x25C7, 0xA1DE }, { 0x25C8, 0xA2C2 }, { 0x25C9, 0xA2C1 }, { 0x25CA, 0xA79C }, { 0x25CB, 0xA1DB }, 
-	{ 0x25CC, 0xA675 }, { 0x25CD, 0xA684 }, { 0x25CE, 0xA1DD }, { 0x25CF, 0xA1DC }, { 0x25D0, 0xA2C4 }, { 0x25D1, 0xA2C5 }, { 0x25E6, 0xA790 }, { 0x25EF, 0xA66F }, 
-	{ 0x25FB, 0xA746 }, { 0x25FC, 0xA79A }, { 0x2605, 0xA1DA }, { 0x2606, 0xA1D9 }, { 0x260E, 0xA2CF }, { 0x260F, 0xA2CE }, { 0x2610, 0xA677 }, { 0x261C, 0xA2D0 }, 
-	{ 0x261D, 0xAC8D }, { 0x261E, 0xA2D1 }, { 0x261F, 0xAC8E }, { 0x262F, 0xA693 }, { 0x2640, 0xA1CF }, { 0x2642, 0xA1CE }, { 0x2660, 0xA2BC }, { 0x2661, 0xA2BD }, 
-	{ 0x2663, 0xA2C0 }, { 0x2664, 0xA2BB }, { 0x2665, 0xA2BE }, { 0x2666, 0xA798 }, { 0x2667, 0xA2BF }, { 0x2668, 0xA2CD }, { 0x2669, 0xA2DB }, { 0x266A, 0xA2DC }, 
-	{ 0x266C, 0xA2DD }, { 0x266D, 0xA2DA }, { 0x266F, 0xA648 }, { 0x2716, 0xA66D }, { 0x271A, 0xA66C }, { 0x2720, 0xA688 }, { 0x2723, 0xA672 }, { 0x2731, 0xA653 }, 
-	{ 0x273D, 0xA652 }, { 0x273F, 0xA67C }, { 0x2740, 0xA699 }, { 0x2741, 0xA68D }, { 0x2747, 0xA654 }, { 0x274D, 0xA683 }, { 0x2756, 0xA673 }, { 0x2776, 0xA6E5 }, 
-	{ 0x2777, 0xA6E6 }, { 0x2778, 0xA6E7 }, { 0x2779, 0xA6E8 }, { 0x277A, 0xA6E9 }, { 0x277B, 0xA6EA }, { 0x277C, 0xA6EB }, { 0x277D, 0xA6EC }, { 0x277E, 0xA6ED }, 
-	{ 0x277F, 0xA6EE }, { 0x278A, 0xA355 }, { 0x278B, 0xA356 }, { 0x278C, 0xA357 }, { 0x278D, 0xA358 }, { 0x278E, 0xA359 }, { 0x278F, 0xA35A }, { 0x2790, 0xA35B }, 
-	{ 0x2791, 0xA35C }, { 0x2792, 0xA35D }, { 0x2793, 0xA35E }, { 0x2794, 0xAC5E }, { 0x279B, 0xA86A }, { 0x279C, 0xA860 }, { 0x279E, 0xA878 }, { 0x27A1, 0xA874 }, 
-	{ 0x27A4, 0xAC48 }, { 0x27B2, 0xA85C }, { 0x27B5, 0xAC43 }, { 0x2934, 0xA88D }, { 0x2935, 0xA889 }, { 0x2936, 0xA886 }, { 0x2937, 0xA88B }, { 0x2939, 0xA88C }, 
-	{ 0x2962, 0xA86F }, { 0x2963, 0xA871 }, { 0x2964, 0xA870 }, { 0x2965, 0xA872 }, { 0x2981, 0xA799 }, { 0x2985, 0xA159 }, { 0x2986, 0xA15A }, { 0x2997, 0xA199 }, 
-	{ 0x2998, 0xA19A }, { 0x29A3, 0xA49C }, { 0x29BE, 0xA668 }, { 0x29BF, 0xA66E }, { 0x29C8, 0xA664 }, { 0x2A26, 0xA47D }, { 0x2A38, 0xA760 }, { 0x2A72, 0xA77B }, 
-	{ 0x2A8B, 0xA494 }, { 0x2A8C, 0xA495 }, { 0x2A91, 0xA496 }, { 0x2A92, 0xA497 }, { 0x2AC5, 0xA48B }, { 0x2AC6, 0xA48D }, { 0x2ACB, 0xA48C }, { 0x2ACC, 0xA48E }, 
-	{ 0x2AE8, 0xA76B }, { 0x3000, 0xA1A1 }, { 0x3001, 0xA1A2 }, { 0x3002, 0xA1A3 }, { 0x3003, 0xA1A8 }, { 0x3008, 0xA1B4 }, { 0x3009, 0xA1B5 }, { 0x300A, 0xA1B6 }, 
-	{ 0x300B, 0xA1B7 }, { 0x300C, 0xA1B8 }, { 0x300D, 0xA1B9 }, { 0x300E, 0xA1BA }, { 0x300F, 0xA1BB }, { 0x3010, 0xA1BC }, { 0x3011, 0xA1BD }, { 0x3012, 0xA742 }, 
-	{ 0x3013, 0xA1EB }, { 0x3014, 0xA1B2 }, { 0x3015, 0xA1B3 }, { 0x3016, 0xA15D }, { 0x3017, 0xA15E }, { 0x3018, 0xA15F }, { 0x3019, 0xA160 }, { 0x301C, 0xA1AD }, 
-	{ 0x301E, 0xADA9 }, { 0x301F, 0xADAA }, { 0x3020, 0xA69E }, { 0x3036, 0xA743 }, { 0x3041, 0xAAA1 }, { 0x3042, 0xAAA2 }, { 0x3043, 0xAAA3 }, { 0x3044, 0xAAA4 }, 
-	{ 0x3045, 0xAAA5 }, { 0x3046, 0xAAA6 }, { 0x3047, 0xAAA7 }, { 0x3048, 0xAAA8 }, { 0x3049, 0xAAA9 }, { 0x304A, 0xAAAA }, { 0x304B, 0xAAAB }, { 0x304C, 0xAAAC }, 
-	{ 0x304D, 0xAAAD }, { 0x304E, 0xAAAE }, { 0x304F, 0xAAAF }, { 0x3050, 0xAAB0 }, { 0x3051, 0xAAB1 }, { 0x3052, 0xAAB2 }, { 0x3053, 0xAAB3 }, { 0x3054, 0xAAB4 }, 
-	{ 0x3055, 0xAAB5 }, { 0x3056, 0xAAB6 }, { 0x3057, 0xAAB7 }, { 0x3058, 0xAAB8 }, { 0x3059, 0xAAB9 }, { 0x305A, 0xAABA }, { 0x305B, 0xAABB }, { 0x305C, 0xAABC }, 
-	{ 0x305D, 0xAABD }, { 0x305E, 0xAABE }, { 0x305F, 0xAABF }, { 0x3060, 0xAAC0 }, { 0x3061, 0xAAC1 }, { 0x3062, 0xAAC2 }, { 0x3063, 0xAAC3 }, { 0x3064, 0xAAC4 }, 
-	{ 0x3065, 0xAAC5 }, { 0x3066, 0xAAC6 }, { 0x3067, 0xAAC7 }, { 0x3068, 0xAAC8 }, { 0x3069, 0xAAC9 }, { 0x306A, 0xAACA }, { 0x306B, 0xAACB }, { 0x306C, 0xAACC }, 
-	{ 0x306D, 0xAACD }, { 0x306E, 0xAACE }, { 0x306F, 0xAACF }, { 0x3070, 0xAAD0 }, { 0x3071, 0xAAD1 }, { 0x3072, 0xAAD2 }, { 0x3073, 0xAAD3 }, { 0x3074, 0xAAD4 }, 
-	{ 0x3075, 0xAAD5 }, { 0x3076, 0xAAD6 }, { 0x3077, 0xAAD7 }, { 0x3078, 0xAAD8 }, { 0x3079, 0xAAD9 }, { 0x307A, 0xAADA }, { 0x307B, 0xAADB }, { 0x307C, 0xAADC }, 
-	{ 0x307D, 0xAADD }, { 0x307E, 0xAADE }, { 0x307F, 0xAADF }, { 0x3080, 0xAAE0 }, { 0x3081, 0xAAE1 }, { 0x3082, 0xAAE2 }, { 0x3083, 0xAAE3 }, { 0x3084, 0xAAE4 }, 
-	{ 0x3085, 0xAAE5 }, { 0x3086, 0xAAE6 }, { 0x3087, 0xAAE7 }, { 0x3088, 0xAAE8 }, { 0x3089, 0xAAE9 }, { 0x308A, 0xAAEA }, { 0x308B, 0xAAEB }, { 0x308C, 0xAAEC }, 
-	{ 0x308D, 0xAAED }, { 0x308E, 0xAAEE }, { 0x308F, 0xAAEF }, { 0x3090, 0xAAF0 }, { 0x3091, 0xAAF1 }, { 0x3092, 0xAAF2 }, { 0x3093, 0xAAF3 }, { 0x30A1, 0xABA1 }, 
-	{ 0x30A2, 0xABA2 }, { 0x30A3, 0xABA3 }, { 0x30A4, 0xABA4 }, { 0x30A5, 0xABA5 }, { 0x30A6, 0xABA6 }, { 0x30A7, 0xABA7 }, { 0x30A8, 0xABA8 }, { 0x30A9, 0xABA9 }, 
-	{ 0x30AA, 0xABAA }, { 0x30AB, 0xABAB }, { 0x30AC, 0xABAC }, { 0x30AD, 0xABAD }, { 0x30AE, 0xABAE }, { 0x30AF, 0xABAF }, { 0x30B0, 0xABB0 }, { 0x30B1, 0xABB1 }, 
-	{ 0x30B2, 0xABB2 }, { 0x30B3, 0xABB3 }, { 0x30B4, 0xABB4 }, { 0x30B5, 0xABB5 }, { 0x30B6, 0xABB6 }, { 0x30B7, 0xABB7 }, { 0x30B8, 0xABB8 }, { 0x30B9, 0xABB9 }, 
-	{ 0x30BA, 0xABBA }, { 0x30BB, 0xABBB }, { 0x30BC, 0xABBC }, { 0x30BD, 0xABBD }, { 0x30BE, 0xABBE }, { 0x30BF, 0xABBF }, { 0x30C0, 0xABC0 }, { 0x30C1, 0xABC1 }, 
-	{ 0x30C2, 0xABC2 }, { 0x30C3, 0xABC3 }, { 0x30C4, 0xABC4 }, { 0x30C5, 0xABC5 }, { 0x30C6, 0xABC6 }, { 0x30C7, 0xABC7 }, { 0x30C8, 0xABC8 }, { 0x30C9, 0xABC9 }, 
-	{ 0x30CA, 0xABCA }, { 0x30CB, 0xABCB }, { 0x30CC, 0xABCC }, { 0x30CD, 0xABCD }, { 0x30CE, 0xABCE }, { 0x30CF, 0xABCF }, { 0x30D0, 0xABD0 }, { 0x30D1, 0xABD1 }, 
-	{ 0x30D2, 0xABD2 }, { 0x30D3, 0xABD3 }, { 0x30D4, 0xABD4 }, { 0x30D5, 0xABD5 }, { 0x30D6, 0xABD6 }, { 0x30D7, 0xABD7 }, { 0x30D8, 0xABD8 }, { 0x30D9, 0xABD9 }, 
-	{ 0x30DA, 0xABDA }, { 0x30DB, 0xABDB }, { 0x30DC, 0xABDC }, { 0x30DD, 0xABDD }, { 0x30DE, 0xABDE }, { 0x30DF, 0xABDF }, { 0x30E0, 0xABE0 }, { 0x30E1, 0xABE1 }, 
-	{ 0x30E2, 0xABE2 }, { 0x30E3, 0xABE3 }, { 0x30E4, 0xABE4 }, { 0x30E5, 0xABE5 }, { 0x30E6, 0xABE6 }, { 0x30E7, 0xABE7 }, { 0x30E8, 0xABE8 }, { 0x30E9, 0xABE9 }, 
-	{ 0x30EA, 0xABEA }, { 0x30EB, 0xABEB }, { 0x30EC, 0xABEC }, { 0x30ED, 0xABED }, { 0x30EE, 0xABEE }, { 0x30EF, 0xABEF }, { 0x30F0, 0xABF0 }, { 0x30F1, 0xABF1 }, 
-	{ 0x30F2, 0xABF2 }, { 0x30F3, 0xABF3 }, { 0x30F4, 0xABF4 }, { 0x30F5, 0xABF5 }, { 0x30F6, 0xABF6 }, { 0x3131, 0xA4A1 }, { 0x3132, 0xA4A2 }, { 0x3133, 0xA4A3 }, 
-	{ 0x3134, 0xA4A4 }, { 0x3135, 0xA4A5 }, { 0x3136, 0xA4A6 }, { 0x3137, 0xA4A7 }, { 0x3138, 0xA4A8 }, { 0x3139, 0xA4A9 }, { 0x313A, 0xA4AA }, { 0x313B, 0xA4AB }, 
-	{ 0x313C, 0xA4AC }, { 0x313D, 0xA4AD }, { 0x313E, 0xA4AE }, { 0x313F, 0xA4AF }, { 0x3140, 0xA4B0 }, { 0x3141, 0xA4B1 }, { 0x3142, 0xA4B2 }, { 0x3143, 0xA4B3 }, 
-	{ 0x3144, 0xA4B4 }, { 0x3145, 0xA4B5 }, { 0x3146, 0xA4B6 }, { 0x3147, 0xA4B7 }, { 0x3148, 0xA4B8 }, { 0x3149, 0xA4B9 }, { 0x314A, 0xA4BA }, { 0x314B, 0xA4BB }, 
-	{ 0x314C, 0xA4BC }, { 0x314D, 0xA4BD }, { 0x314E, 0xA4BE }, { 0x314F, 0xA4BF }, { 0x3150, 0xA4C0 }, { 0x3151, 0xA4C1 }, { 0x3152, 0xA4C2 }, { 0x3153, 0xA4C3 }, 
-	{ 0x3154, 0xA4C4 }, { 0x3155, 0xA4C5 }, { 0x3156, 0xA4C6 }, { 0x3157, 0xA4C7 }, { 0x3158, 0xA4C8 }, { 0x3159, 0xA4C9 }, { 0x315A, 0xA4CA }, { 0x315B, 0xA4CB }, 
-	{ 0x315C, 0xA4CC }, { 0x315D, 0xA4CD }, { 0x315E, 0xA4CE }, { 0x315F, 0xA4CF }, { 0x3160, 0xA4D0 }, { 0x3161, 0xA4D1 }, { 0x3162, 0xA4D2 }, { 0x3163, 0xA4D3 }, 
-	{ 0x3164, 0xA4D4 }, { 0x3165, 0xA4D5 }, { 0x3166, 0xA4D6 }, { 0x3167, 0xA4D7 }, { 0x3168, 0xA4D8 }, { 0x3169, 0xA4D9 }, { 0x316A, 0xA4DA }, { 0x316B, 0xA4DB }, 
-	{ 0x316C, 0xA4DC }, { 0x316D, 0xA4DD }, { 0x316E, 0xA4DE }, { 0x316F, 0xA4DF }, { 0x3170, 0xA4E0 }, { 0x3171, 0xA4E1 }, { 0x3172, 0xA4E2 }, { 0x3173, 0xA4E3 }, 
-	{ 0x3174, 0xA4E4 }, { 0x3175, 0xA4E5 }, { 0x3176, 0xA4E6 }, { 0x3177, 0xA4E7 }, { 0x3178, 0xA4E8 }, { 0x3179, 0xA4E9 }, { 0x317A, 0xA4EA }, { 0x317B, 0xA4EB }, 
-	{ 0x317C, 0xA4EC }, { 0x317D, 0xA4ED }, { 0x317E, 0xA4EE }, { 0x317F, 0xA4EF }, { 0x3180, 0xA4F0 }, { 0x3181, 0xA4F1 }, { 0x3182, 0xA4F2 }, { 0x3183, 0xA4F3 }, 
-	{ 0x3184, 0xA4F4 }, { 0x3185, 0xA4F5 }, { 0x3186, 0xA4F6 }, { 0x3187, 0xA4F7 }, { 0x3188, 0xA4F8 }, { 0x3189, 0xA4F9 }, { 0x318A, 0xA4FA }, { 0x318B, 0xA4FB }, 
-	{ 0x318C, 0xA4FC }, { 0x318D, 0xA4FD }, { 0x318E, 0xA4FE }, { 0x3200, 0xA9B1 }, { 0x3201, 0xA9B2 }, { 0x3202, 0xA9B3 }, { 0x3203, 0xA9B4 }, { 0x3204, 0xA9B5 }, 
-	{ 0x3205, 0xA9B6 }, { 0x3206, 0xA9B7 }, { 0x3207, 0xA9B8 }, { 0x3208, 0xA9B9 }, { 0x3209, 0xA9BA }, { 0x320A, 0xA9BB }, { 0x320B, 0xA9BC }, { 0x320C, 0xA9BD }, 
-	{ 0x320D, 0xA9BE }, { 0x320E, 0xA9BF }, { 0x320F, 0xA9C0 }, { 0x3210, 0xA9C1 }, { 0x3211, 0xA9C2 }, { 0x3212, 0xA9C3 }, { 0x3213, 0xA9C4 }, { 0x3214, 0xA9C5 }, 
-	{ 0x3215, 0xA9C6 }, { 0x3216, 0xA9C7 }, { 0x3217, 0xA9C8 }, { 0x3218, 0xA9C9 }, { 0x3219, 0xA9CA }, { 0x321A, 0xA9CB }, { 0x321B, 0xA9CC }, { 0x321C, 0xA2DF }, 
-	{ 0x3231, 0xA79D }, { 0x3239, 0xA79E }, { 0x3251, 0xA7F5 }, { 0x3252, 0xA7F6 }, { 0x3253, 0xA7F7 }, { 0x3254, 0xA7F8 }, { 0x3255, 0xA7F9 }, { 0x3256, 0xA7FA }, 
-	{ 0x3257, 0xA7FB }, { 0x3258, 0xA7FC }, { 0x3259, 0xA7FD }, { 0x325A, 0xA7FE }, { 0x3260, 0xA8B1 }, { 0x3261, 0xA8B2 }, { 0x3262, 0xA8B3 }, { 0x3263, 0xA8B4 }, 
-	{ 0x3264, 0xA8B5 }, { 0x3265, 0xA8B6 }, { 0x3266, 0xA8B7 }, { 0x3267, 0xA8B8 }, { 0x3268, 0xA8B9 }, { 0x3269, 0xA8BA }, { 0x326A, 0xA8BB }, { 0x326B, 0xA8BC }, 
-	{ 0x326C, 0xA8BD }, { 0x326D, 0xA8BE }, { 0x326E, 0xA8BF }, { 0x326F, 0xA8C0 }, { 0x3270, 0xA8C1 }, { 0x3271, 0xA8C2 }, { 0x3272, 0xA8C3 }, { 0x3273, 0xA8C4 }, 
-	{ 0x3274, 0xA8C5 }, { 0x3275, 0xA8C6 }, { 0x3276, 0xA8C7 }, { 0x3277, 0xA8C8 }, { 0x3278, 0xA8C9 }, { 0x3279, 0xA8CA }, { 0x327A, 0xA8CB }, { 0x327B, 0xA8CC }, 
-	{ 0x327F, 0xA2DE }, { 0x328A, 0xAD71 }, { 0x328B, 0xAD72 }, { 0x328C, 0xAD73 }, { 0x328D, 0xAD74 }, { 0x328E, 0xAD75 }, { 0x328F, 0xAD76 }, { 0x3290, 0xAD70 }, 
-	{ 0x3294, 0xAB5C }, { 0x329E, 0xA782 }, { 0x32A5, 0xAB6C }, { 0x3380, 0xA7C9 }, { 0x3381, 0xA7CA }, { 0x3382, 0xA7CB }, { 0x3383, 0xA7CC }, { 0x3384, 0xA7CD }, 
-	{ 0x3388, 0xA7BA }, { 0x3389, 0xA7BB }, { 0x338A, 0xA7DC }, { 0x338B, 0xA7DD }, { 0x338C, 0xA7DE }, { 0x338D, 0xA7B6 }, { 0x338E, 0xA7B7 }, { 0x338F, 0xA7B8 }, 
-	{ 0x3390, 0xA7D4 }, { 0x3391, 0xA7D5 }, { 0x3392, 0xA7D6 }, { 0x3393, 0xA7D7 }, { 0x3394, 0xA7D8 }, { 0x3395, 0xA7A1 }, { 0x3396, 0xA7A2 }, { 0x3397, 0xA7A3 }, 
-	{ 0x3398, 0xA7A5 }, { 0x3399, 0xA7AB }, { 0x339A, 0xA7AC }, { 0x339B, 0xA7AD }, { 0x339C, 0xA7AE }, { 0x339D, 0xA7AF }, { 0x339E, 0xA7B0 }, { 0x339F, 0xA7B1 }, 
-	{ 0x33A0, 0xA7B2 }, { 0x33A1, 0xA7B3 }, { 0x33A2, 0xA7B4 }, { 0x33A3, 0xA7A7 }, { 0x33A4, 0xA7A8 }, { 0x33A5, 0xA7A9 }, { 0x33A6, 0xA7AA }, { 0x33A7, 0xA7BD }, 
-	{ 0x33A8, 0xA7BE }, { 0x33A9, 0xA7E5 }, { 0x33AA, 0xA7E6 }, { 0x33AB, 0xA7E7 }, { 0x33AC, 0xA7E8 }, { 0x33AD, 0xA7E1 }, { 0x33AE, 0xA7E2 }, { 0x33AF, 0xA7E3 }, 
-	{ 0x33B0, 0xA7BF }, { 0x33B1, 0xA7C0 }, { 0x33B2, 0xA7C1 }, { 0x33B3, 0xA7C2 }, { 0x33B4, 0xA7C3 }, { 0x33B5, 0xA7C4 }, { 0x33B6, 0xA7C5 }, { 0x33B7, 0xA7C6 }, 
-	{ 0x33B8, 0xA7C7 }, { 0x33B9, 0xA7C8 }, { 0x33BA, 0xA7CE }, { 0x33BB, 0xA7CF }, { 0x33BC, 0xA7D0 }, { 0x33BD, 0xA7D1 }, { 0x33BE, 0xA7D2 }, { 0x33BF, 0xA7D3 }, 
-	{ 0x33C0, 0xA7DA }, { 0x33C1, 0xA7DB }, { 0x33C2, 0xA2E3 }, { 0x33C3, 0xA7EC }, { 0x33C4, 0xA7A6 }, { 0x33C5, 0xA7E0 }, { 0x33C6, 0xA7EF }, { 0x33C7, 0xA2E1 }, 
-	{ 0x33C8, 0xA7BC }, { 0x33C9, 0xA7ED }, { 0x33CA, 0xA7B5 }, { 0x33CB, 0xA79F }, { 0x33CF, 0xA7B9 }, { 0x33D0, 0xA7EA }, { 0x33D3, 0xA7EB }, { 0x33D6, 0xA7DF }, 
-	{ 0x33D8, 0xA2E4 }, { 0x33DB, 0xA7E4 }, { 0x33DC, 0xA7EE }, { 0x33DD, 0xA7E9 }, { 0x4E00, 0xECE9 }, { 0x4E01, 0xEFCB }, { 0x4E03, 0xF6D2 }, { 0x4E07, 0xD8B2 }, 
-	{ 0x4E08, 0xEDDB }, { 0x4E09, 0xDFB2 }, { 0x4E0A, 0xDFBE }, { 0x4E0B, 0xF9BB }, { 0x4E0D, 0xDCF4 }, { 0x4E11, 0xF5E4 }, { 0x4E14, 0xF3A6 }, { 0x4E15, 0xDDE0 }, 
-	{ 0x4E16, 0xE1A6 }, { 0x4E18, 0xCEF8 }, { 0x4E19, 0xDCB0 }, { 0x4E1E, 0xE3AA }, { 0x4E2D, 0xF1E9 }, { 0x4E32, 0xCDFA }, { 0x4E38, 0xFCAF }, { 0x4E39, 0xD3A1 }, 
-	{ 0x4E3B, 0xF1AB }, { 0x4E42, 0xE7D1 }, { 0x4E43, 0xD2AC }, { 0x4E45, 0xCEF9 }, { 0x4E4B, 0xF1FD }, { 0x4E4D, 0xDEBF }, { 0x4E4E, 0xFBBA }, { 0x4E4F, 0xF9B9 }, 
-	{ 0x4E56, 0xCED2 }, { 0x4E58, 0xE3AB }, { 0x4E59, 0xEBE0 }, { 0x4E5D, 0xCEFA }, { 0x4E5E, 0xCBF7 }, { 0x4E5F, 0xE5A5 }, { 0x4E6B, 0xCAE1 }, { 0x4E6D, 0xD4CC }, 
-	{ 0x4E73, 0xEAE1 }, { 0x4E76, 0xDCE3 }, { 0x4E77, 0xDFAD }, { 0x4E7E, 0xCBEB }, { 0x4E82, 0xD5AF }, { 0x4E86, 0xD6F5 }, { 0x4E88, 0xE5F8 }, { 0x4E8B, 0xDEC0 }, 
-	{ 0x4E8C, 0xECA3 }, { 0x4E8E, 0xE9CD }, { 0x4E90, 0xEAA7 }, { 0x4E91, 0xE9F6 }, { 0x4E92, 0xFBBB }, { 0x4E94, 0xE7E9 }, { 0x4E95, 0xEFCC }, { 0x4E98, 0xD0E6 }, 
-	{ 0x4E9B, 0xDEC1 }, { 0x4E9E, 0xE4AC }, { 0x4EA1, 0xD8CC }, { 0x4EA2, 0xF9F1 }, { 0x4EA4, 0xCEDF }, { 0x4EA5, 0xFAA4 }, { 0x4EA6, 0xE6B2 }, { 0x4EA8, 0xFAFB }, 
-	{ 0x4EAB, 0xFABD }, { 0x4EAC, 0xCCC8 }, { 0x4EAD, 0xEFCD }, { 0x4EAE, 0xD5D5 }, { 0x4EB6, 0xD3A2 }, { 0x4EBA, 0xECD1 }, { 0x4EC0, 0xE4A7 }, { 0x4EC1, 0xECD2 }, 
-	{ 0x4EC4, 0xF6B1 }, { 0x4EC7, 0xCEFB }, { 0x4ECA, 0xD0D1 }, { 0x4ECB, 0xCBBF }, { 0x4ECD, 0xEDA4 }, { 0x4ED4, 0xEDA8 }, { 0x4ED5, 0xDEC2 }, { 0x4ED6, 0xF6E2 }, 
-	{ 0x4ED7, 0xEDDC }, { 0x4ED8, 0xDCF5 }, { 0x4ED9, 0xE0B9 }, { 0x4EDD, 0xD4CE }, { 0x4EDF, 0xF4B5 }, { 0x4EE3, 0xD3DB }, { 0x4EE4, 0xD6B5 }, { 0x4EE5, 0xECA4 }, 
-	{ 0x4EF0, 0xE4E6 }, { 0x4EF2, 0xF1EA }, { 0x4EF6, 0xCBEC }, { 0x4EF7, 0xCBC0 }, { 0x4EFB, 0xECF2 }, { 0x4F01, 0xD0EA }, { 0x4F09, 0xF9F2 }, { 0x4F0A, 0xECA5 }, 
-	{ 0x4F0B, 0xD0DF }, { 0x4F0D, 0xE7EA }, { 0x4F0E, 0xD0EB }, { 0x4F0F, 0xDCD1 }, { 0x4F10, 0xDBE9 }, { 0x4F11, 0xFDCC }, { 0x4F2F, 0xDBD7 }, { 0x4F34, 0xDAE1 }, 
-	{ 0x4F36, 0xD6B6 }, { 0x4F38, 0xE3DF }, { 0x4F3A, 0xDEC3 }, { 0x4F3C, 0xDEC4 }, { 0x4F3D, 0xCAA1 }, { 0x4F43, 0xEEEC }, { 0x4F46, 0xD3A3 }, { 0x4F47, 0xEEB7 }, 
-	{ 0x4F48, 0xF8CF }, { 0x4F4D, 0xEAC8 }, { 0x4F4E, 0xEEB8 }, { 0x4F4F, 0xF1AC }, { 0x4F50, 0xF1A5 }, { 0x4F51, 0xE9CE }, { 0x4F55, 0xF9BC }, { 0x4F59, 0xE5F9 }, 
-	{ 0x4F5A, 0xECEA }, { 0x4F5B, 0xDDD6 }, { 0x4F5C, 0xEDC2 }, { 0x4F69, 0xF8A5 }, { 0x4F6F, 0xE5BA }, { 0x4F70, 0xDBD8 }, { 0x4F73, 0xCAA2 }, { 0x4F76, 0xD1CD }, 
-	{ 0x4F7A, 0xEEED }, { 0x4F7E, 0xECEB }, { 0x4F7F, 0xDEC5 }, { 0x4F81, 0xE3E0 }, { 0x4F83, 0xCAC9 }, { 0x4F84, 0xF2E9 }, { 0x4F86, 0xD5CE }, { 0x4F88, 0xF6B6 }, 
-	{ 0x4F8A, 0xCEC2 }, { 0x4F8B, 0xD6C7 }, { 0x4F8D, 0xE3B4 }, { 0x4F8F, 0xF1AD }, { 0x4F91, 0xEAE2 }, { 0x4F96, 0xD7C2 }, { 0x4F98, 0xF3A7 }, { 0x4F9B, 0xCDEA }, 
-	{ 0x4F9D, 0xEBEE }, { 0x4FAE, 0xD9B2 }, { 0x4FAF, 0xFDA5 }, { 0x4FB5, 0xF6D5 }, { 0x4FB6, 0xD5E2 }, { 0x4FBF, 0xF8B5 }, { 0x4FC2, 0xCCF5 }, { 0x4FC3, 0xF5B5 }, 
-	{ 0x4FC4, 0xE4AD }, { 0x4FC9, 0xE7EB }, { 0x4FCA, 0xF1D5 }, { 0x4FCE, 0xF0BB }, { 0x4FD1, 0xE9B5 }, { 0x4FD3, 0xCCC9 }, { 0x4FD4, 0xFAD5 }, { 0x4FD7, 0xE1D4 }, 
-	{ 0x4FDA, 0xD7D6 }, { 0x4FDD, 0xDCC1 }, { 0x4FDF, 0xDEC6 }, { 0x4FE0, 0xFAEF }, { 0x4FE1, 0xE3E1 }, { 0x4FEE, 0xE1F3 }, { 0x4FEF, 0xDCF6 }, { 0x4FF1, 0xCEFC }, 
-	{ 0x4FF3, 0xDBC4 }, { 0x4FF5, 0xF8F1 }, { 0x4FF8, 0xDCE4 }, { 0x4FFA, 0xE5EF }, { 0x5002, 0xDCB1 }, { 0x5006, 0xD5D6 }, { 0x5009, 0xF3DA }, { 0x500B, 0xCBC1 }, 
-	{ 0x500D, 0xDBC3 }, { 0x5011, 0xD9FA }, { 0x5012, 0xD3EE }, { 0x5016, 0xFAB8 }, { 0x5019, 0xFDA6 }, { 0x501A, 0xEBEF }, { 0x501C, 0xF4A6 }, { 0x501E, 0xCCCA }, 
-	{ 0x501F, 0xF3A8 }, { 0x5021, 0xF3DB }, { 0x5023, 0xDBA7 }, { 0x5024, 0xF6B7 }, { 0x5026, 0xCFE6 }, { 0x5027, 0xF0F2 }, { 0x5028, 0xCBDA }, { 0x502A, 0xE7D2 }, 
-	{ 0x502B, 0xD7C3 }, { 0x502C, 0xF6F0 }, { 0x502D, 0xE8DE }, { 0x503B, 0xE5A6 }, { 0x5043, 0xE5E7 }, { 0x5047, 0xCAA3 }, { 0x5048, 0xCCA7 }, { 0x5049, 0xEAC9 }, 
-	{ 0x504F, 0xF8B6 }, { 0x5055, 0xFAA5 }, { 0x505A, 0xF1AE }, { 0x505C, 0xEFCE }, { 0x5065, 0xCBED }, { 0x5074, 0xF6B0 }, { 0x5075, 0xEFCF }, { 0x5076, 0xE9CF }, 
-	{ 0x5078, 0xF7DE }, { 0x5080, 0xCED3 }, { 0x5085, 0xDCF7 }, { 0x508D, 0xDBA8 }, { 0x5091, 0xCBF8 }, { 0x5098, 0xDFA1 }, { 0x5099, 0xDDE1 }, { 0x50AC, 0xF5CA }, 
-	{ 0x50AD, 0xE9B6 }, { 0x50B2, 0xE7EC }, { 0x50B3, 0xEEEE }, { 0x50B5, 0xF3F0 }, { 0x50B7, 0xDFBF }, { 0x50BE, 0xCCCB }, { 0x50C5, 0xD0C1 }, { 0x50C9, 0xF4D2 }, 
-	{ 0x50CA, 0xE0BA }, { 0x50CF, 0xDFC0 }, { 0x50D1, 0xCEE0 }, { 0x50D5, 0xDCD2 }, { 0x50D6, 0xFDEA }, { 0x50DA, 0xD6F6 }, { 0x50DE, 0xEACA }, { 0x50E5, 0xE8E9 }, 
-	{ 0x50E7, 0xE3AC }, { 0x50ED, 0xF3D0 }, { 0x50F9, 0xCAA4 }, { 0x50FB, 0xDBF8 }, { 0x50FF, 0xDEC7 }, { 0x5100, 0xEBF0 }, { 0x5101, 0xF1D6 }, { 0x5104, 0xE5E2 }, 
-	{ 0x5106, 0xCCCC }, { 0x5109, 0xCBFB }, { 0x5112, 0xEAE3 }, { 0x511F, 0xDFC1 }, { 0x5121, 0xD6ED }, { 0x512A, 0xE9D0 }, { 0x5132, 0xEEB9 }, { 0x5137, 0xD5E3 }, 
-	{ 0x513A, 0xD1D3 }, { 0x513C, 0xE5F0 }, { 0x5140, 0xE8B4 }, { 0x5141, 0xEBC3 }, { 0x5143, 0xEAAA }, { 0x5144, 0xFAFC }, { 0x5145, 0xF5F6 }, { 0x5146, 0xF0BC }, 
-	{ 0x5147, 0xFDD4 }, { 0x5148, 0xE0BB }, { 0x5149, 0xCEC3 }, { 0x514B, 0xD0BA }, { 0x514C, 0xF7BA }, { 0x514D, 0xD8F3 }, { 0x514E, 0xF7CD }, { 0x5152, 0xE4AE }, 
-	{ 0x515C, 0xD4DF }, { 0x5162, 0xD0E7 }, { 0x5165, 0xECFD }, { 0x5167, 0xD2AE }, { 0x5168, 0xEEEF }, { 0x5169, 0xD5D7 }, { 0x516A, 0xEAE4 }, { 0x516B, 0xF8A2 }, 
-	{ 0x516C, 0xCDEB }, { 0x516D, 0xD7BF }, { 0x516E, 0xFBB1 }, { 0x5171, 0xCDEC }, { 0x5175, 0xDCB2 }, { 0x5176, 0xD0EC }, { 0x5177, 0xCEFD }, { 0x5178, 0xEEF0 }, 
-	{ 0x517C, 0xCCC2 }, { 0x5180, 0xD0ED }, { 0x5186, 0xE5F7 }, { 0x518A, 0xF3FC }, { 0x518D, 0xEEA2 }, { 0x5192, 0xD9B3 }, { 0x5195, 0xD8F4 }, { 0x5197, 0xE9B7 }, 
-	{ 0x51A0, 0xCEAE }, { 0x51A5, 0xD9A2 }, { 0x51AA, 0xD8F1 }, { 0x51AC, 0xD4CF }, { 0x51B6, 0xE5A7 }, { 0x51B7, 0xD5D2 }, { 0x51BD, 0xD6A9 }, { 0x51C4, 0xF4A2 }, 
-	{ 0x51C6, 0xF1D7 }, { 0x51C9, 0xD5D8 }, { 0x51CB, 0xF0BD }, { 0x51CC, 0xD7D0 }, { 0x51CD, 0xD4D0 }, { 0x51DC, 0xD7CF }, { 0x51DD, 0xEBEA }, { 0x51DE, 0xFDEB }, 
-	{ 0x51E1, 0xDBED }, { 0x51F0, 0xFCC5 }, { 0x51F1, 0xCBC2 }, { 0x51F6, 0xFDD5 }, { 0x51F8, 0xF4C8 }, { 0x51F9, 0xE8EA }, { 0x51FA, 0xF5F3 }, { 0x51FD, 0xF9DE }, 
-	{ 0x5200, 0xD3EF }, { 0x5203, 0xECD3 }, { 0x5206, 0xDDC2 }, { 0x5207, 0xEFB7 }, { 0x5208, 0xE7D4 }, { 0x520A, 0xCACA }, { 0x520E, 0xD9FB }, { 0x5211, 0xFAFD }, 
-	{ 0x5217, 0xD6AA }, { 0x521D, 0xF4F8 }, { 0x5224, 0xF7F7 }, { 0x5225, 0xDCAC }, { 0x5229, 0xD7D7 }, { 0x522A, 0xDFA2 }, { 0x522E, 0xCEBE }, { 0x5230, 0xD3F0 }, 
-	{ 0x5236, 0xF0A4 }, { 0x5237, 0xE1EC }, { 0x5238, 0xCFE7 }, { 0x5239, 0xF3CB }, { 0x523A, 0xEDA9 }, { 0x523B, 0xCABE }, { 0x5243, 0xF4EF }, { 0x5247, 0xF6CE }, 
-	{ 0x524A, 0xDEFB }, { 0x524B, 0xD0BB }, { 0x524C, 0xD5B7 }, { 0x524D, 0xEEF1 }, { 0x5254, 0xF4A8 }, { 0x5256, 0xDCF8 }, { 0x525B, 0xCBA7 }, { 0x525D, 0xDACE }, 
-	{ 0x5261, 0xE0E6 }, { 0x5269, 0xEDA5 }, { 0x526A, 0xEEF2 }, { 0x526F, 0xDCF9 }, { 0x5272, 0xF9DC }, { 0x5275, 0xF3DC }, { 0x527D, 0xF8F2 }, { 0x527F, 0xF4F9 }, 
-	{ 0x5283, 0xFCF1 }, { 0x5287, 0xD0BC }, { 0x5288, 0xDBF9 }, { 0x5289, 0xD7B1 }, { 0x528D, 0xCBFC }, { 0x5291, 0xF0A5 }, { 0x5292, 0xCBFD }, { 0x529B, 0xD5F4 }, 
-	{ 0x529F, 0xCDED }, { 0x52A0, 0xCAA5 }, { 0x52A3, 0xD6AB }, { 0x52A4, 0xD0C2 }, { 0x52A9, 0xF0BE }, { 0x52AA, 0xD2BD }, { 0x52AB, 0xCCA4 }, { 0x52BE, 0xFAB6 }, 
-	{ 0x52C1, 0xCCCD }, { 0x52C3, 0xDAFA }, { 0x52C5, 0xF6CF }, { 0x52C7, 0xE9B8 }, { 0x52C9, 0xD8F5 }, { 0x52CD, 0xCCCE }, { 0x52D2, 0xD7CD }, { 0x52D5, 0xD4D1 }, 
-	{ 0x52D6, 0xE9ED }, { 0x52D8, 0xCAEB }, { 0x52D9, 0xD9E2 }, { 0x52DB, 0xFDB2 }, { 0x52DD, 0xE3AD }, { 0x52DE, 0xD6CC }, { 0x52DF, 0xD9B4 }, { 0x52E2, 0xE1A7 }, 
-	{ 0x52E3, 0xEED3 }, { 0x52E4, 0xD0C3 }, { 0x52F3, 0xFDB3 }, { 0x52F5, 0xD5E4 }, { 0x52F8, 0xCFE8 }, { 0x52FA, 0xEDC3 }, { 0x52FB, 0xD0B2 }, { 0x52FE, 0xCEFE }, 
-	{ 0x52FF, 0xDAA8 }, { 0x5305, 0xF8D0 }, { 0x5308, 0xFDD6 }, { 0x530D, 0xF8D1 }, { 0x530F, 0xF8D2 }, { 0x5310, 0xDCD3 }, { 0x5315, 0xDDE2 }, { 0x5316, 0xFBF9 }, 
-	{ 0x5317, 0xDDC1 }, { 0x5319, 0xE3B5 }, { 0x5320, 0xEDDD }, { 0x5321, 0xCEC4 }, { 0x5323, 0xCBA1 }, { 0x532A, 0xDDE3 }, { 0x532F, 0xFCDD }, { 0x5339, 0xF9AF }, 
-	{ 0x533F, 0xD2FB }, { 0x5340, 0xCFA1 }, { 0x5341, 0xE4A8 }, { 0x5343, 0xF4B6 }, { 0x5344, 0xECFE }, { 0x5347, 0xE3AE }, { 0x5348, 0xE7ED }, { 0x5349, 0xFDC1 }, 
-	{ 0x534A, 0xDAE2 }, { 0x534D, 0xD8B3 }, { 0x5351, 0xDDE4 }, { 0x5352, 0xF0EF }, { 0x5353, 0xF6F1 }, { 0x5354, 0xFAF0 }, { 0x5357, 0xD1F5 }, { 0x535A, 0xDACF }, 
-	{ 0x535C, 0xDCD4 }, { 0x535E, 0xDCA6 }, { 0x5360, 0xEFBF }, { 0x5366, 0xCECF }, { 0x5368, 0xE0D9 }, { 0x536F, 0xD9D6 }, { 0x5370, 0xECD4 }, { 0x5371, 0xEACB }, 
-	{ 0x5374, 0xCABF }, { 0x5375, 0xD5B0 }, { 0x5377, 0xCFE9 }, { 0x537D, 0xF1ED }, { 0x537F, 0xCCCF }, { 0x5384, 0xE4F8 }, { 0x5393, 0xE4ED }, { 0x5398, 0xD7D8 }, 
-	{ 0x539A, 0xFDA7 }, { 0x539F, 0xEAAB }, { 0x53A0, 0xF6B2 }, { 0x53A5, 0xCFF0 }, { 0x53A6, 0xF9BD }, { 0x53AD, 0xE6F4 }, { 0x53BB, 0xCBDB }, { 0x53C3, 0xF3D1 }, 
-	{ 0x53C8, 0xE9D1 }, { 0x53C9, 0xF3A9 }, { 0x53CA, 0xD0E0 }, { 0x53CB, 0xE9D2 }, { 0x53CD, 0xDAE3 }, { 0x53D4, 0xE2D2 }, { 0x53D6, 0xF6A2 }, { 0x53D7, 0xE1F4 }, 
-	{ 0x53DB, 0xDAE4 }, { 0x53E1, 0xE7D5 }, { 0x53E2, 0xF5BF }, { 0x53E3, 0xCFA2 }, { 0x53E4, 0xCDAF }, { 0x53E5, 0xCFA3 }, { 0x53E9, 0xCDB0 }, { 0x53EA, 0xF1FE }, 
-	{ 0x53EB, 0xD0A3 }, { 0x53EC, 0xE1AF }, { 0x53ED, 0xF8A3 }, { 0x53EF, 0xCAA6 }, { 0x53F0, 0xF7BB }, { 0x53F1, 0xF2EA }, { 0x53F2, 0xDEC8 }, { 0x53F3, 0xE9D3 }, 
-	{ 0x53F8, 0xDEC9 }, { 0x5403, 0xFDDE }, { 0x5404, 0xCAC0 }, { 0x5408, 0xF9EA }, { 0x5409, 0xD1CE }, { 0x540A, 0xEED4 }, { 0x540C, 0xD4D2 }, { 0x540D, 0xD9A3 }, 
-	{ 0x540E, 0xFDA8 }, { 0x540F, 0xD7D9 }, { 0x5410, 0xF7CE }, { 0x5411, 0xFABE }, { 0x541B, 0xCFD6 }, { 0x541D, 0xD7F0 }, { 0x541F, 0xEBE1 }, { 0x5420, 0xF8C5 }, 
-	{ 0x5426, 0xDCFA }, { 0x5429, 0xDDC3 }, { 0x542B, 0xF9DF }, { 0x5433, 0xE7EF }, { 0x5438, 0xFDE5 }, { 0x5439, 0xF6A3 }, { 0x543B, 0xD9FC }, { 0x543C, 0xFDA9 }, 
-	{ 0x543E, 0xE7EE }, { 0x5442, 0xD5E5 }, { 0x5448, 0xEFD0 }, { 0x544A, 0xCDB1 }, { 0x5451, 0xF7A2 }, { 0x5468, 0xF1B2 }, { 0x546A, 0xF1B1 }, { 0x5471, 0xCDB2 }, 
-	{ 0x5473, 0xDAAB }, { 0x5475, 0xCAA7 }, { 0x547B, 0xE3E2 }, { 0x547C, 0xFBBC }, { 0x547D, 0xD9A4 }, { 0x5480, 0xEEBA }, { 0x5486, 0xF8D3 }, { 0x548C, 0xFBFA }, 
-	{ 0x548E, 0xCFA4 }, { 0x5490, 0xDCFB }, { 0x54A4, 0xF6E3 }, { 0x54A8, 0xEDAA }, { 0x54AB, 0xF2A1 }, { 0x54AC, 0xCEE1 }, { 0x54B3, 0xFAA6 }, { 0x54B8, 0xF9E0 }, 
-	{ 0x54BD, 0xECD6 }, { 0x54C0, 0xE4EE }, { 0x54C1, 0xF9A1 }, { 0x54C4, 0xFBEF }, { 0x54C8, 0xF9EB }, { 0x54C9, 0xEEA3 }, { 0x54E1, 0xEAAC }, { 0x54E5, 0xCAA8 }, 
-	{ 0x54E8, 0xF4FA }, { 0x54ED, 0xCDD6 }, { 0x54EE, 0xFCF6 }, { 0x54F2, 0xF4C9 }, { 0x54FA, 0xF8D4 }, { 0x5504, 0xF8A6 }, { 0x5506, 0xDECA }, { 0x5507, 0xF2C6 }, 
-	{ 0x550E, 0xD7DA }, { 0x5510, 0xD3D0 }, { 0x551C, 0xD8C5 }, { 0x552F, 0xEAE6 }, { 0x5531, 0xF3DD }, { 0x5535, 0xE4DA }, { 0x553E, 0xF6E4 }, { 0x5544, 0xF6F2 }, 
-	{ 0x5546, 0xDFC2 }, { 0x554F, 0xD9FD }, { 0x5553, 0xCCF6 }, { 0x5556, 0xD3BA }, { 0x555E, 0xE4AF }, { 0x5563, 0xF9E1 }, { 0x557C, 0xF0A6 }, { 0x5580, 0xCBD3 }, 
-	{ 0x5584, 0xE0BC }, { 0x5586, 0xF4CA }, { 0x5587, 0xD4FA }, { 0x5589, 0xFDAA }, { 0x558A, 0xF9E2 }, { 0x5598, 0xF4B7 }, { 0x5599, 0xFDC2 }, { 0x559A, 0xFCB0 }, 
-	{ 0x559C, 0xFDEC }, { 0x559D, 0xCAE2 }, { 0x55A7, 0xFDBD }, { 0x55A9, 0xEAE7 }, { 0x55AA, 0xDFC3 }, { 0x55AB, 0xD1D2 }, { 0x55AC, 0xCEE2 }, { 0x55AE, 0xD3A4 }, 
-	{ 0x55C5, 0xFDAB }, { 0x55C7, 0xDFE0 }, { 0x55D4, 0xF2C7 }, { 0x55DA, 0xE7F0 }, { 0x55DC, 0xD0EE }, { 0x55DF, 0xF3AA }, { 0x55E3, 0xDECB }, { 0x55E4, 0xF6B8 }, 
-	{ 0x55FD, 0xE1F5 }, { 0x55FE, 0xF1B3 }, { 0x5606, 0xF7A3 }, { 0x5609, 0xCAA9 }, { 0x5614, 0xCFA5 }, { 0x5617, 0xDFC4 }, { 0x562F, 0xE1B0 }, { 0x5632, 0xF0BF }, 
-	{ 0x5634, 0xF6A4 }, { 0x5636, 0xE3B6 }, { 0x5653, 0xFAC6 }, { 0x5668, 0xD0EF }, { 0x566B, 0xFDED }, { 0x5674, 0xDDC4 }, { 0x5686, 0xFCF7 }, { 0x56A5, 0xE6BF }, 
-	{ 0x56AC, 0xDEAD }, { 0x56AE, 0xFABF }, { 0x56B4, 0xE5F1 }, { 0x56BC, 0xEDC4 }, { 0x56CA, 0xD2A5 }, { 0x56CD, 0xFDEE }, { 0x56D1, 0xF5B6 }, { 0x56DA, 0xE1F6 }, 
-	{ 0x56DB, 0xDECC }, { 0x56DE, 0xFCDE }, { 0x56E0, 0xECD7 }, { 0x56F0, 0xCDDD }, { 0x56F9, 0xD6B7 }, { 0x56FA, 0xCDB3 }, { 0x5703, 0xF8D5 }, { 0x5704, 0xE5D8 }, 
-	{ 0x5708, 0xCFEA }, { 0x570B, 0xCFD0 }, { 0x570D, 0xEACC }, { 0x5712, 0xEAAE }, { 0x5713, 0xEAAD }, { 0x5716, 0xD3F1 }, { 0x5718, 0xD3A5 }, { 0x571F, 0xF7CF }, 
-	{ 0x5728, 0xEEA4 }, { 0x572D, 0xD0A4 }, { 0x5730, 0xF2A2 }, { 0x573B, 0xD0F0 }, { 0x5740, 0xF2A3 }, { 0x5742, 0xF7F8 }, { 0x5747, 0xD0B3 }, { 0x574A, 0xDBA9 }, 
-	{ 0x574D, 0xD3BB }, { 0x574E, 0xCAEC }, { 0x5750, 0xF1A6 }, { 0x5751, 0xCBD5 }, { 0x5761, 0xF7E7 }, { 0x5764, 0xCDDE }, { 0x5766, 0xF7A4 }, { 0x576A, 0xF8C0 }, 
-	{ 0x576E, 0xD3DD }, { 0x5770, 0xCCD0 }, { 0x5775, 0xCFA6 }, { 0x577C, 0xF6F3 }, { 0x5782, 0xE1F7 }, { 0x5788, 0xD3DC }, { 0x578B, 0xFAFE }, { 0x5793, 0xFAA7 }, 
-	{ 0x57A0, 0xEBD9 }, { 0x57A2, 0xCFA7 }, { 0x57A3, 0xEAAF }, { 0x57C3, 0xE4EF }, { 0x57C7, 0xE9B9 }, { 0x57C8, 0xF1D8 }, { 0x57CB, 0xD8D8 }, { 0x57CE, 0xE0F2 }, 
-	{ 0x57DF, 0xE6B4 }, { 0x57E0, 0xDCFC }, { 0x57F0, 0xF3F1 }, { 0x57F4, 0xE3D0 }, { 0x57F7, 0xF2FB }, { 0x57F9, 0xDBC6 }, { 0x57FA, 0xD0F1 }, { 0x57FC, 0xD0F2 }, 
-	{ 0x5800, 0xCFDC }, { 0x5802, 0xD3D1 }, { 0x5805, 0xCCB1 }, { 0x5806, 0xF7D8 }, { 0x5808, 0xCBA8 }, { 0x5809, 0xEBBC }, { 0x580A, 0xE4BE }, { 0x581E, 0xF4DC }, 
-	{ 0x5821, 0xDCC2 }, { 0x5824, 0xF0A7 }, { 0x5827, 0xE6C0 }, { 0x582A, 0xCAED }, { 0x582F, 0xE8EB }, { 0x5830, 0xE5E8 }, { 0x5831, 0xDCC3 }, { 0x5834, 0xEDDE }, 
-	{ 0x5835, 0xD3F2 }, { 0x583A, 0xCCF7 }, { 0x584A, 0xCED4 }, { 0x584B, 0xE7AB }, { 0x584F, 0xCBC3 }, { 0x5851, 0xE1B1 }, { 0x5854, 0xF7B2 }, { 0x5857, 0xD3F3 }, 
-	{ 0x5858, 0xD3D2 }, { 0x585A, 0xF5C0 }, { 0x585E, 0xDFDD }, { 0x5861, 0xEEF3 }, { 0x5862, 0xE7F1 }, { 0x5864, 0xFDB4 }, { 0x5875, 0xF2C8 }, { 0x5879, 0xF3D2 }, 
-	{ 0x587C, 0xEEF4 }, { 0x587E, 0xE2D3 }, { 0x5883, 0xCCD1 }, { 0x5885, 0xDFEA }, { 0x5889, 0xE9BA }, { 0x5893, 0xD9D7 }, { 0x589C, 0xF5CD }, { 0x589E, 0xF1F2 }, 
-	{ 0x589F, 0xFAC7 }, { 0x58A8, 0xD9F8 }, { 0x58A9, 0xD4C2 }, { 0x58AE, 0xF6E5 }, { 0x58B3, 0xDDC5 }, { 0x58BA, 0xE7F2 }, { 0x58BB, 0xEDDF }, { 0x58BE, 0xCACB }, 
-	{ 0x58C1, 0xDBFA }, { 0x58C5, 0xE8B5 }, { 0x58C7, 0xD3A6 }, { 0x58CE, 0xFDB5 }, { 0x58D1, 0xF9C9 }, { 0x58D3, 0xE4E2 }, { 0x58D5, 0xFBBD }, { 0x58D8, 0xD7A4 }, 
-	{ 0x58D9, 0xCEC5 }, { 0x58DE, 0xCED5 }, { 0x58DF, 0xD6E6 }, { 0x58E4, 0xE5BD }, { 0x58EB, 0xDECD }, { 0x58EC, 0xECF3 }, { 0x58EF, 0xEDE0 }, { 0x58F9, 0xECEC }, 
-	{ 0x58FA, 0xFBBE }, { 0x58FB, 0xDFEB }, { 0x58FD, 0xE1F8 }, { 0x590F, 0xF9BE }, { 0x5914, 0xD0F3 }, { 0x5915, 0xE0AA }, { 0x5916, 0xE8E2 }, { 0x5919, 0xE2D4 }, 
-	{ 0x591A, 0xD2FD }, { 0x591C, 0xE5A8 }, { 0x5922, 0xD9D3 }, { 0x5927, 0xD3DE }, { 0x5929, 0xF4B8 }, { 0x592A, 0xF7BC }, { 0x592B, 0xDCFD }, { 0x592D, 0xE8EC }, 
-	{ 0x592E, 0xE4E7 }, { 0x5931, 0xE3F7 }, { 0x5937, 0xECA8 }, { 0x593E, 0xFAF1 }, { 0x5944, 0xE5F2 }, { 0x5947, 0xD0F4 }, { 0x5948, 0xD2AF }, { 0x5949, 0xDCE5 }, 
-	{ 0x594E, 0xD0A5 }, { 0x594F, 0xF1B4 }, { 0x5950, 0xFCB1 }, { 0x5951, 0xCCF8 }, { 0x5954, 0xDDC6 }, { 0x5955, 0xFAD1 }, { 0x5957, 0xF7DF }, { 0x595A, 0xFAA8 }, 
-	{ 0x5960, 0xEEF5 }, { 0x5962, 0xDECE }, { 0x5967, 0xE7F3 }, { 0x596A, 0xF7AC }, { 0x596B, 0xEBC4 }, { 0x596C, 0xEDE1 }, { 0x596D, 0xE0AB }, { 0x596E, 0xDDC7 }, 
-	{ 0x5973, 0xD2B3 }, { 0x5974, 0xD2BF }, { 0x5978, 0xCACC }, { 0x597D, 0xFBBF }, { 0x5982, 0xE5FD }, { 0x5983, 0xDDE5 }, { 0x5984, 0xD8CD }, { 0x598A, 0xECF4 }, 
-	{ 0x5993, 0xD0F5 }, { 0x5996, 0xE8ED }, { 0x5997, 0xD0D2 }, { 0x5999, 0xD9D8 }, { 0x59A5, 0xF6E6 }, { 0x59A8, 0xDBAA }, { 0x59AC, 0xF7E0 }, { 0x59B9, 0xD8D9 }, 
-	{ 0x59BB, 0xF4A3 }, { 0x59BE, 0xF4DD }, { 0x59C3, 0xEFD1 }, { 0x59C6, 0xD9B5 }, { 0x59C9, 0xEDAB }, { 0x59CB, 0xE3B7 }, { 0x59D0, 0xEEBB }, { 0x59D1, 0xCDB4 }, 
-	{ 0x59D3, 0xE0F3 }, { 0x59D4, 0xEACD }, { 0x59D9, 0xECF5 }, { 0x59DA, 0xE8EE }, { 0x59DC, 0xCBA9 }, { 0x59DD, 0xF1AF }, { 0x59E6, 0xCACD }, { 0x59E8, 0xECA9 }, 
-	{ 0x59EA, 0xF2EB }, { 0x59EC, 0xFDEF }, { 0x59EE, 0xF9F3 }, { 0x59F8, 0xE6C1 }, { 0x59FB, 0xECD8 }, { 0x59FF, 0xEDAC }, { 0x5A01, 0xEACE }, { 0x5A03, 0xE8DF }, 
-	{ 0x5A11, 0xDECF }, { 0x5A18, 0xD2A6 }, { 0x5A1B, 0xE7F4 }, { 0x5A1C, 0xD1D6 }, { 0x5A1F, 0xE6C2 }, { 0x5A20, 0xE3E3 }, { 0x5A25, 0xE4B0 }, { 0x5A29, 0xD8B4 }, 
-	{ 0x5A36, 0xF6A5 }, { 0x5A3C, 0xF3DE }, { 0x5A41, 0xD7A5 }, { 0x5A46, 0xF7E8 }, { 0x5A49, 0xE8C6 }, { 0x5A5A, 0xFBE6 }, { 0x5A62, 0xDDE6 }, { 0x5A66, 0xDCFE }, 
-	{ 0x5A92, 0xD8DA }, { 0x5A9A, 0xDAAC }, { 0x5A9B, 0xEAB0 }, { 0x5AA4, 0xE3B8 }, { 0x5AC1, 0xCAAA }, { 0x5AC2, 0xE1F9 }, { 0x5AC4, 0xEAB1 }, { 0x5AC9, 0xF2EC }, 
-	{ 0x5ACC, 0xFAEE }, { 0x5AE1, 0xEED5 }, { 0x5AE6, 0xF9F4 }, { 0x5AE9, 0xD2EC }, { 0x5B05, 0xFBFB }, { 0x5B09, 0xFDF0 }, { 0x5B0B, 0xE0BD }, { 0x5B0C, 0xCEE3 }, 
-	{ 0x5B16, 0xF8C6 }, { 0x5B2A, 0xDEAE }, { 0x5B40, 0xDFC5 }, { 0x5B43, 0xE5BE }, { 0x5B50, 0xEDAD }, { 0x5B51, 0xFAEA }, { 0x5B54, 0xCDEE }, { 0x5B55, 0xEDA6 }, 
-	{ 0x5B57, 0xEDAE }, { 0x5B58, 0xF0ED }, { 0x5B5A, 0xDDA1 }, { 0x5B5C, 0xEDAF }, { 0x5B5D, 0xFCF8 }, { 0x5B5F, 0xD8EB }, { 0x5B63, 0xCCF9 }, { 0x5B64, 0xCDB5 }, 
-	{ 0x5B69, 0xFAA9 }, { 0x5B6B, 0xE1DD }, { 0x5B70, 0xE2D5 }, { 0x5B71, 0xEDCF }, { 0x5B75, 0xDDA2 }, { 0x5B78, 0xF9CA }, { 0x5B7A, 0xEAE8 }, { 0x5B7C, 0xE5ED }, 
-	{ 0x5B85, 0xD3EB }, { 0x5B87, 0xE9D4 }, { 0x5B88, 0xE1FA }, { 0x5B89, 0xE4CC }, { 0x5B8B, 0xE1E4 }, { 0x5B8C, 0xE8C7 }, { 0x5B8F, 0xCEDB }, { 0x5B93, 0xDCD5 }, 
-	{ 0x5B95, 0xF7B5 }, { 0x5B96, 0xFCF3 }, { 0x5B97, 0xF0F3 }, { 0x5B98, 0xCEAF }, { 0x5B99, 0xF1B5 }, { 0x5B9A, 0xEFD2 }, { 0x5B9B, 0xE8C8 }, { 0x5B9C, 0xEBF1 }, 
-	{ 0x5BA2, 0xCBD4 }, { 0x5BA3, 0xE0BE }, { 0x5BA4, 0xE3F8 }, { 0x5BA5, 0xEAE9 }, { 0x5BA6, 0xFCB2 }, { 0x5BAC, 0xE0F4 }, { 0x5BAE, 0xCFE0 }, { 0x5BB0, 0xEEA5 }, 
-	{ 0x5BB3, 0xFAAA }, { 0x5BB4, 0xE6C3 }, { 0x5BB5, 0xE1B2 }, { 0x5BB6, 0xCAAB }, { 0x5BB8, 0xE3E4 }, { 0x5BB9, 0xE9BB }, { 0x5BBF, 0xE2D6 }, { 0x5BC0, 0xF3F2 }, 
-	{ 0x5BC2, 0xEED6 }, { 0x5BC3, 0xEAB2 }, { 0x5BC4, 0xD0F6 }, { 0x5BC5, 0xECD9 }, { 0x5BC6, 0xDACB }, { 0x5BC7, 0xCFA8 }, { 0x5BCC, 0xDDA3 }, { 0x5BD0, 0xD8DB }, 
-	{ 0x5BD2, 0xF9CE }, { 0x5BD3, 0xE9D5 }, { 0x5BD4, 0xE3D1 }, { 0x5BD7, 0xD2BC }, { 0x5BDE, 0xD8AC }, { 0x5BDF, 0xF3CC }, { 0x5BE1, 0xCDFB }, { 0x5BE2, 0xF6D6 }, 
-	{ 0x5BE4, 0xE7F5 }, { 0x5BE5, 0xE8EF }, { 0x5BE6, 0xE3F9 }, { 0x5BE7, 0xD2BB }, { 0x5BE8, 0xF3F3 }, { 0x5BE9, 0xE3FB }, { 0x5BEB, 0xDED0 }, { 0x5BEC, 0xCEB0 }, 
-	{ 0x5BEE, 0xD6F7 }, { 0x5BEF, 0xF1D9 }, { 0x5BF5, 0xF5C1 }, { 0x5BF6, 0xDCC4 }, { 0x5BF8, 0xF5BB }, { 0x5BFA, 0xDED1 }, { 0x5C01, 0xDCE6 }, { 0x5C04, 0xDED2 }, 
-	{ 0x5C07, 0xEDE2 }, { 0x5C08, 0xEEF6 }, { 0x5C09, 0xEACF }, { 0x5C0A, 0xF0EE }, { 0x5C0B, 0xE3FC }, { 0x5C0D, 0xD3DF }, { 0x5C0E, 0xD3F4 }, { 0x5C0F, 0xE1B3 }, 
-	{ 0x5C11, 0xE1B4 }, { 0x5C16, 0xF4D3 }, { 0x5C19, 0xDFC6 }, { 0x5C24, 0xE9D6 }, { 0x5C28, 0xDBAB }, { 0x5C31, 0xF6A6 }, { 0x5C38, 0xE3B9 }, { 0x5C39, 0xEBC5 }, 
-	{ 0x5C3A, 0xF4A9 }, { 0x5C3B, 0xCDB6 }, { 0x5C3C, 0xD2F9 }, { 0x5C3E, 0xDAAD }, { 0x5C3F, 0xD2E3 }, { 0x5C40, 0xCFD1 }, { 0x5C45, 0xCBDC }, { 0x5C46, 0xCCFA }, 
-	{ 0x5C48, 0xCFDD }, { 0x5C4B, 0xE8A9 }, { 0x5C4D, 0xE3BB }, { 0x5C4E, 0xE3BA }, { 0x5C51, 0xE0DA }, { 0x5C55, 0xEEF7 }, { 0x5C5B, 0xDCB3 }, { 0x5C60, 0xD3F5 }, 
-	{ 0x5C62, 0xD7A6 }, { 0x5C64, 0xF6B5 }, { 0x5C65, 0xD7DB }, { 0x5C6C, 0xE1D5 }, { 0x5C6F, 0xD4EA }, { 0x5C71, 0xDFA3 }, { 0x5C79, 0xFDDF }, { 0x5C90, 0xD0F7 }, 
-	{ 0x5C91, 0xEDD4 }, { 0x5CA1, 0xCBAA }, { 0x5CA9, 0xE4DB }, { 0x5CAB, 0xE1FB }, { 0x5CAC, 0xCBA2 }, { 0x5CB1, 0xD3E0 }, { 0x5CB3, 0xE4BF }, { 0x5CB5, 0xFBC0 }, 
-	{ 0x5CB7, 0xDABE }, { 0x5CB8, 0xE4CD }, { 0x5CBA, 0xD6B9 }, { 0x5CBE, 0xEFC0 }, { 0x5CC0, 0xE1FC }, { 0x5CD9, 0xF6B9 }, { 0x5CE0, 0xDFC7 }, { 0x5CE8, 0xE4B1 }, 
-	{ 0x5CEF, 0xDCE7 }, { 0x5CF0, 0xDCE8 }, { 0x5CF4, 0xFAD6 }, { 0x5CF6, 0xD3F6 }, { 0x5CFB, 0xF1DA }, { 0x5CFD, 0xFAF2 }, { 0x5D07, 0xE2FD }, { 0x5D0D, 0xD5CF }, 
-	{ 0x5D0E, 0xD0F8 }, { 0x5D11, 0xCDDF }, { 0x5D14, 0xF5CB }, { 0x5D16, 0xE4F0 }, { 0x5D17, 0xCBAB }, { 0x5D19, 0xD7C4 }, { 0x5D27, 0xE2FE }, { 0x5D29, 0xDDDA }, 
-	{ 0x5D4B, 0xDAAE }, { 0x5D4C, 0xCAEE }, { 0x5D50, 0xD5B9 }, { 0x5D69, 0xE3A1 }, { 0x5D6C, 0xE8E3 }, { 0x5D6F, 0xF3AB }, { 0x5D87, 0xCFA9 }, { 0x5D8B, 0xD3F7 }, 
-	{ 0x5D9D, 0xD4F1 }, { 0x5DA0, 0xCEE4 }, { 0x5DA2, 0xE8F2 }, { 0x5DAA, 0xE5F5 }, { 0x5DB8, 0xE7AE }, { 0x5DBA, 0xD6BA }, { 0x5DBC, 0xDFEC }, { 0x5DBD, 0xE4C0 }, 
-	{ 0x5DCD, 0xE8E4 }, { 0x5DD2, 0xD8B5 }, { 0x5DD6, 0xE4DC }, { 0x5DDD, 0xF4B9 }, { 0x5DDE, 0xF1B6 }, { 0x5DE1, 0xE2DE }, { 0x5DE2, 0xE1B5 }, { 0x5DE5, 0xCDEF }, 
-	{ 0x5DE6, 0xF1A7 }, { 0x5DE7, 0xCEE5 }, { 0x5DE8, 0xCBDD }, { 0x5DEB, 0xD9E3 }, { 0x5DEE, 0xF3AC }, { 0x5DF1, 0xD0F9 }, { 0x5DF2, 0xECAB }, { 0x5DF3, 0xDED3 }, 
-	{ 0x5DF4, 0xF7E9 }, { 0x5DF7, 0xF9F5 }, { 0x5DFD, 0xE1DE }, { 0x5DFE, 0xCBEE }, { 0x5E02, 0xE3BC }, { 0x5E03, 0xF8D6 }, { 0x5E06, 0xDBEE }, { 0x5E0C, 0xFDF1 }, 
-	{ 0x5E11, 0xF7B6 }, { 0x5E16, 0xF4DE }, { 0x5E19, 0xF2ED }, { 0x5E1B, 0xDBD9 }, { 0x5E1D, 0xF0A8 }, { 0x5E25, 0xE1FD }, { 0x5E2B, 0xDED4 }, { 0x5E2D, 0xE0AC }, 
-	{ 0x5E33, 0xEDE3 }, { 0x5E36, 0xD3E1 }, { 0x5E38, 0xDFC8 }, { 0x5E3D, 0xD9B6 }, { 0x5E3F, 0xFDAC }, { 0x5E40, 0xEFD3 }, { 0x5E44, 0xE4C1 }, { 0x5E45, 0xF8EB }, 
-	{ 0x5E47, 0xDBAC }, { 0x5E4C, 0xFCC6 }, { 0x5E55, 0xD8AD }, { 0x5E5F, 0xF6BA }, { 0x5E61, 0xDBDF }, { 0x5E62, 0xD3D3 }, { 0x5E63, 0xF8C7 }, { 0x5E72, 0xCACE }, 
-	{ 0x5E73, 0xF8C1 }, { 0x5E74, 0xD2B4 }, { 0x5E77, 0xDCB4 }, { 0x5E78, 0xFAB9 }, { 0x5E79, 0xCACF }, { 0x5E7B, 0xFCB3 }, { 0x5E7C, 0xEAEA }, { 0x5E7D, 0xEAEB }, 
-	{ 0x5E7E, 0xD0FA }, { 0x5E84, 0xEDE4 }, { 0x5E87, 0xDDE7 }, { 0x5E8A, 0xDFC9 }, { 0x5E8F, 0xDFED }, { 0x5E95, 0xEEBC }, { 0x5E97, 0xEFC1 }, { 0x5E9A, 0xCCD2 }, 
-	{ 0x5E9C, 0xDDA4 }, { 0x5EA0, 0xDFCA }, { 0x5EA6, 0xD3F8 }, { 0x5EA7, 0xF1A8 }, { 0x5EAB, 0xCDB7 }, { 0x5EAD, 0xEFD4 }, { 0x5EB5, 0xE4DD }, { 0x5EB6, 0xDFEE }, 
-	{ 0x5EB7, 0xCBAC }, { 0x5EB8, 0xE9BC }, { 0x5EBE, 0xEAEC }, { 0x5EC2, 0xDFCB }, { 0x5EC8, 0xF9BF }, { 0x5EC9, 0xD6AF }, { 0x5ECA, 0xD5C6 }, { 0x5ED0, 0xCFAA }, 
-	{ 0x5ED3, 0xCEA9 }, { 0x5ED6, 0xD6F8 }, { 0x5EDA, 0xF1B7 }, { 0x5EDB, 0xEEF8 }, { 0x5EDF, 0xD9D9 }, { 0x5EE0, 0xF3DF }, { 0x5EE2, 0xF8C8 }, { 0x5EE3, 0xCEC6 }, 
-	{ 0x5EEC, 0xD5E6 }, { 0x5EF3, 0xF4E6 }, { 0x5EF6, 0xE6C5 }, { 0x5EF7, 0xEFD5 }, { 0x5EFA, 0xCBEF }, { 0x5EFB, 0xFCDF }, { 0x5F01, 0xDCA7 }, { 0x5F04, 0xD6E7 }, 
-	{ 0x5F0A, 0xF8C9 }, { 0x5F0F, 0xE3D2 }, { 0x5F11, 0xE3BD }, { 0x5F13, 0xCFE1 }, { 0x5F14, 0xF0C0 }, { 0x5F15, 0xECDA }, { 0x5F17, 0xDDD7 }, { 0x5F18, 0xFBF0 }, 
-	{ 0x5F1B, 0xECAC }, { 0x5F1F, 0xF0A9 }, { 0x5F26, 0xFAD7 }, { 0x5F27, 0xFBC1 }, { 0x5F29, 0xD2C0 }, { 0x5F31, 0xE5B0 }, { 0x5F35, 0xEDE5 }, { 0x5F3A, 0xCBAD }, 
-	{ 0x5F3C, 0xF9B0 }, { 0x5F48, 0xF7A5 }, { 0x5F4A, 0xCBAE }, { 0x5F4C, 0xDAAF }, { 0x5F4E, 0xD8B6 }, { 0x5F56, 0xD3A7 }, { 0x5F57, 0xFBB2 }, { 0x5F59, 0xFDC4 }, 
-	{ 0x5F5B, 0xECAD }, { 0x5F62, 0xFBA1 }, { 0x5F66, 0xE5E9 }, { 0x5F67, 0xE9EE }, { 0x5F69, 0xF3F4 }, { 0x5F6A, 0xF8F3 }, { 0x5F6B, 0xF0C1 }, { 0x5F6C, 0xDEAF }, 
-	{ 0x5F6D, 0xF8B0 }, { 0x5F70, 0xF3E0 }, { 0x5F71, 0xE7AF }, { 0x5F77, 0xDBAD }, { 0x5F79, 0xE6B5 }, { 0x5F7C, 0xF9A8 }, { 0x5F7F, 0xDDD8 }, { 0x5F80, 0xE8D9 }, 
-	{ 0x5F81, 0xEFD6 }, { 0x5F85, 0xD3E2 }, { 0x5F87, 0xE2DF }, { 0x5F8A, 0xFCE0 }, { 0x5F8B, 0xD7C8 }, { 0x5F8C, 0xFDAD }, { 0x5F90, 0xDFEF }, { 0x5F91, 0xCCD3 }, 
-	{ 0x5F92, 0xD3F9 }, { 0x5F97, 0xD4F0 }, { 0x5F98, 0xDBC7 }, { 0x5F99, 0xDED5 }, { 0x5F9E, 0xF0F4 }, { 0x5FA0, 0xD5D0 }, { 0x5FA1, 0xE5D9 }, { 0x5FA8, 0xFCC7 }, 
-	{ 0x5FA9, 0xDCD6 }, { 0x5FAA, 0xE2E0 }, { 0x5FAE, 0xDAB0 }, { 0x5FB5, 0xF3A3 }, { 0x5FB7, 0xD3EC }, { 0x5FB9, 0xF4CB }, { 0x5FBD, 0xFDC5 }, { 0x5FC3, 0xE3FD }, 
-	{ 0x5FC5, 0xF9B1 }, { 0x5FCC, 0xD0FB }, { 0x5FCD, 0xECDB }, { 0x5FD6, 0xF5BC }, { 0x5FD7, 0xF2A4 }, { 0x5FD8, 0xD8CE }, { 0x5FD9, 0xD8CF }, { 0x5FE0, 0xF5F7 }, 
-	{ 0x5FEB, 0xF6E1 }, { 0x5FF5, 0xD2B7 }, { 0x5FFD, 0xFBEC }, { 0x5FFF, 0xDDC8 }, { 0x600F, 0xE4E8 }, { 0x6012, 0xD2C1 }, { 0x6016, 0xF8D7 }, { 0x601C, 0xD6BB }, 
-	{ 0x601D, 0xDED6 }, { 0x6020, 0xF7BD }, { 0x6021, 0xECAE }, { 0x6025, 0xD0E1 }, { 0x6027, 0xE0F5 }, { 0x6028, 0xEAB3 }, { 0x602A, 0xCED6 }, { 0x602F, 0xCCA5 }, 
-	{ 0x6041, 0xECF6 }, { 0x6042, 0xE2E1 }, { 0x6043, 0xE3BE }, { 0x604D, 0xFCC8 }, { 0x6050, 0xCDF0 }, { 0x6052, 0xF9F6 }, { 0x6055, 0xDFF0 }, { 0x6059, 0xE5BF }, 
-	{ 0x605D, 0xCEBF }, { 0x6062, 0xFCE1 }, { 0x6063, 0xEDB0 }, { 0x6064, 0xFDD1 }, { 0x6065, 0xF6BB }, { 0x6068, 0xF9CF }, { 0x6069, 0xEBDA }, { 0x606A, 0xCAC1 }, 
-	{ 0x606C, 0xD2B8 }, { 0x606D, 0xCDF1 }, { 0x606F, 0xE3D3 }, { 0x6070, 0xFDE6 }, { 0x6085, 0xE6ED }, { 0x6089, 0xE3FA }, { 0x608C, 0xF0AA }, { 0x608D, 0xF9D0 }, 
-	{ 0x6094, 0xFCE2 }, { 0x6096, 0xF8A7 }, { 0x609A, 0xE1E5 }, { 0x609B, 0xEEF9 }, { 0x609F, 0xE7F6 }, { 0x60A0, 0xEAED }, { 0x60A3, 0xFCB4 }, { 0x60A4, 0xF5C2 }, 
-	{ 0x60A7, 0xD7DC }, { 0x60B0, 0xF0F5 }, { 0x60B2, 0xDDE8 }, { 0x60B3, 0xD3ED }, { 0x60B4, 0xF5FC }, { 0x60B6, 0xDABF }, { 0x60B8, 0xCCFB }, { 0x60BC, 0xD3FA }, 
-	{ 0x60BD, 0xF4A4 }, { 0x60C5, 0xEFD7 }, { 0x60C7, 0xD4C3 }, { 0x60D1, 0xFBE3 }, { 0x60DA, 0xFBED }, { 0x60DC, 0xE0AD }, { 0x60DF, 0xEAEE }, { 0x60E0, 0xFBB3 }, 
-	{ 0x60E1, 0xE4C2 }, { 0x60F0, 0xF6E7 }, { 0x60F1, 0xD2DD }, { 0x60F3, 0xDFCC }, { 0x60F6, 0xFCC9 }, { 0x60F9, 0xE5A9 }, { 0x60FA, 0xE0F6 }, { 0x60FB, 0xF6B3 }, 
-	{ 0x6101, 0xE1FE }, { 0x6106, 0xCBF0 }, { 0x6108, 0xEAEF }, { 0x6109, 0xEAF0 }, { 0x610D, 0xDAC0 }, { 0x610E, 0xF8B4 }, { 0x610F, 0xEBF2 }, { 0x6115, 0xE4C3 }, 
-	{ 0x611A, 0xE9D7 }, { 0x611B, 0xE4F1 }, { 0x611F, 0xCAEF }, { 0x6127, 0xCED7 }, { 0x6130, 0xFCCA }, { 0x6134, 0xF3E1 }, { 0x6137, 0xCBC4 }, { 0x613C, 0xE3E5 }, 
-	{ 0x613E, 0xCBC5 }, { 0x613F, 0xEAB4 }, { 0x6142, 0xE9BD }, { 0x6144, 0xD7C9 }, { 0x6147, 0xEBDB }, { 0x6148, 0xEDB1 }, { 0x614A, 0xCCC3 }, { 0x614B, 0xF7BE }, 
-	{ 0x614C, 0xFCCB }, { 0x6153, 0xF8F4 }, { 0x6155, 0xD9B7 }, { 0x6158, 0xF3D3 }, { 0x6159, 0xF3D4 }, { 0x615D, 0xF7E4 }, { 0x615F, 0xF7D1 }, { 0x6162, 0xD8B7 }, 
-	{ 0x6163, 0xCEB1 }, { 0x6164, 0xCAC2 }, { 0x6167, 0xFBB4 }, { 0x6168, 0xCBC6 }, { 0x616B, 0xF0F6 }, { 0x616E, 0xD5E7 }, { 0x6170, 0xEAD0 }, { 0x6176, 0xCCD4 }, 
-	{ 0x6177, 0xCBAF }, { 0x617D, 0xF4AA }, { 0x617E, 0xE9AF }, { 0x6181, 0xF5C3 }, { 0x6182, 0xE9D8 }, { 0x618A, 0xDDE9 }, { 0x618E, 0xF1F3 }, { 0x6190, 0xD5FB }, 
-	{ 0x6191, 0xDEBB }, { 0x6194, 0xF4FB }, { 0x6198, 0xFDF3 }, { 0x6199, 0xFDF2 }, { 0x619A, 0xF7A6 }, { 0x61A4, 0xDDC9 }, { 0x61A7, 0xD4D3 }, { 0x61A9, 0xCCA8 }, 
-	{ 0x61AB, 0xDAC1 }, { 0x61AC, 0xCCD5 }, { 0x61AE, 0xD9E4 }, { 0x61B2, 0xFACA }, { 0x61B6, 0xE5E3 }, { 0x61BA, 0xD3BC }, { 0x61BE, 0xCAF0 }, { 0x61C3, 0xD0C4 }, 
-	{ 0x61C7, 0xCAD0 }, { 0x61C8, 0xFAAB }, { 0x61C9, 0xEBEB }, { 0x61CA, 0xE7F8 }, { 0x61CB, 0xD9E5 }, { 0x61E6, 0xD1D7 }, { 0x61F2, 0xF3A4 }, { 0x61F6, 0xD4FB }, 
-	{ 0x61F7, 0xFCE3 }, { 0x61F8, 0xFAD8 }, { 0x61FA, 0xF3D5 }, { 0x61FC, 0xCFAB }, { 0x61FF, 0xEBF3 }, { 0x6200, 0xD5FC }, { 0x6207, 0xD3D4 }, { 0x6208, 0xCDFC }, 
-	{ 0x620A, 0xD9E6 }, { 0x620C, 0xE2F9 }, { 0x620D, 0xE2A1 }, { 0x620E, 0xEBD4 }, { 0x6210, 0xE0F7 }, { 0x6211, 0xE4B2 }, { 0x6212, 0xCCFC }, { 0x6216, 0xFBE4 }, 
-	{ 0x621A, 0xF4AB }, { 0x621F, 0xD0BD }, { 0x6221, 0xCAF1 }, { 0x622A, 0xEFB8 }, { 0x622E, 0xD7C0 }, { 0x6230, 0xEEFA }, { 0x6231, 0xFDF4 }, { 0x6234, 0xD3E3 }, 
-	{ 0x6236, 0xFBC2 }, { 0x623E, 0xD5E8 }, { 0x623F, 0xDBAE }, { 0x6240, 0xE1B6 }, { 0x6241, 0xF8B7 }, { 0x6247, 0xE0BF }, { 0x6248, 0xFBC3 }, { 0x6249, 0xDDEA }, 
-	{ 0x624B, 0xE2A2 }, { 0x624D, 0xEEA6 }, { 0x6253, 0xF6E8 }, { 0x6258, 0xF6F5 }, { 0x626E, 0xDDCA }, { 0x6271, 0xD0E2 }, { 0x6276, 0xDDA6 }, { 0x6279, 0xDDEB }, 
-	{ 0x627C, 0xE4F9 }, { 0x627F, 0xE3AF }, { 0x6280, 0xD0FC }, { 0x6284, 0xF4FC }, { 0x6289, 0xCCBC }, { 0x628A, 0xF7EA }, { 0x6291, 0xE5E4 }, { 0x6292, 0xDFF1 }, 
-	{ 0x6295, 0xF7E1 }, { 0x6297, 0xF9F7 }, { 0x6298, 0xEFB9 }, { 0x629B, 0xF8D8 }, { 0x62AB, 0xF9A9 }, { 0x62B1, 0xF8D9 }, { 0x62B5, 0xEEBD }, { 0x62B9, 0xD8C6 }, 
-	{ 0x62BC, 0xE4E3 }, { 0x62BD, 0xF5CE }, { 0x62C2, 0xDDD9 }, { 0x62C7, 0xD9E7 }, { 0x62C8, 0xD2B9 }, { 0x62C9, 0xD5C3 }, { 0x62CC, 0xDAE5 }, { 0x62CD, 0xDAD0 }, 
-	{ 0x62CF, 0xD1D9 }, { 0x62D0, 0xCED8 }, { 0x62D2, 0xCBDE }, { 0x62D3, 0xF4AC }, { 0x62D4, 0xDAFB }, { 0x62D6, 0xF6E9 }, { 0x62D7, 0xE8F3 }, { 0x62D8, 0xCFAC }, 
-	{ 0x62D9, 0xF0F0 }, { 0x62DB, 0xF4FD }, { 0x62DC, 0xDBC8 }, { 0x62EC, 0xCEC0 }, { 0x62ED, 0xE3D4 }, { 0x62EE, 0xD1CF }, { 0x62EF, 0xF1F5 }, { 0x62F1, 0xCDF2 }, 
-	{ 0x62F3, 0xCFEB }, { 0x62F7, 0xCDB8 }, { 0x62FE, 0xE3A6 }, { 0x62FF, 0xD1DA }, { 0x6301, 0xF2A5 }, { 0x6307, 0xF2A6 }, { 0x6309, 0xE4CE }, { 0x6311, 0xD3FB }, 
-	{ 0x632B, 0xF1A9 }, { 0x632F, 0xF2C9 }, { 0x633A, 0xEFD8 }, { 0x633B, 0xE6C9 }, { 0x633D, 0xD8B8 }, { 0x633E, 0xFAF3 }, { 0x6349, 0xF3B5 }, { 0x634C, 0xF8A4 }, 
-	{ 0x634F, 0xD1F3 }, { 0x6350, 0xE6C8 }, { 0x6355, 0xF8DA }, { 0x6367, 0xDCE9 }, { 0x6368, 0xDED7 }, { 0x636E, 0xCBDF }, { 0x6372, 0xCFEC }, { 0x6377, 0xF4DF }, 
-	{ 0x637A, 0xD1F4 }, { 0x637B, 0xD2BA }, { 0x637F, 0xDFF2 }, { 0x6383, 0xE1B7 }, { 0x6388, 0xE2A3 }, { 0x6389, 0xD3FC }, { 0x638C, 0xEDE6 }, { 0x6392, 0xDBC9 }, 
-	{ 0x6396, 0xE4FA }, { 0x6398, 0xCFDE }, { 0x639B, 0xCED0 }, { 0x63A0, 0xD5D3 }, { 0x63A1, 0xF3F5 }, { 0x63A2, 0xF7AE }, { 0x63A5, 0xEFC8 }, { 0x63A7, 0xCDF3 }, 
-	{ 0x63A8, 0xF5CF }, { 0x63A9, 0xE5F3 }, { 0x63AA, 0xF0C2 }, { 0x63C0, 0xCAD1 }, { 0x63C4, 0xEAF1 }, { 0x63C6, 0xD0A6 }, { 0x63CF, 0xD9DA }, { 0x63D0, 0xF0AB }, 
-	{ 0x63D6, 0xEBE7 }, { 0x63DA, 0xE5C0 }, { 0x63DB, 0xFCB5 }, { 0x63E1, 0xE4C4 }, { 0x63ED, 0xCCA9 }, { 0x63EE, 0xFDC6 }, { 0x63F4, 0xEAB5 }, { 0x63F6, 0xE5AA }, 
-	{ 0x63F7, 0xDFBA }, { 0x640D, 0xE1DF }, { 0x640F, 0xDAD1 }, { 0x6414, 0xE1B8 }, { 0x6416, 0xE8F4 }, { 0x6417, 0xD3FD }, { 0x641C, 0xE2A4 }, { 0x6422, 0xF2CA }, 
-	{ 0x642C, 0xDAE6 }, { 0x642D, 0xF7B3 }, { 0x643A, 0xFDCD }, { 0x643E, 0xF3B6 }, { 0x6458, 0xEED7 }, { 0x6460, 0xF5C4 }, { 0x6469, 0xD8A4 }, { 0x646F, 0xF2A7 }, 
-	{ 0x6478, 0xD9B8 }, { 0x6479, 0xD9B9 }, { 0x647A, 0xEFC9 }, { 0x6488, 0xD6CE }, { 0x6491, 0xF7CB }, { 0x6492, 0xDFAE }, { 0x6493, 0xE8F5 }, { 0x649A, 0xD2B5 }, 
-	{ 0x649E, 0xD3D5 }, { 0x64A4, 0xF4CC }, { 0x64A5, 0xDAFC }, { 0x64AB, 0xD9E8 }, { 0x64AD, 0xF7EB }, { 0x64AE, 0xF5C9 }, { 0x64B0, 0xF3BC }, { 0x64B2, 0xDAD2 }, 
-	{ 0x64BB, 0xD3B5 }, { 0x64C1, 0xE8B6 }, { 0x64C4, 0xD6CF }, { 0x64C5, 0xF4BA }, { 0x64C7, 0xF7C9 }, { 0x64CA, 0xCCAA }, { 0x64CD, 0xF0C3 }, { 0x64CE, 0xCCD6 }, 
-	{ 0x64D2, 0xD0D3 }, { 0x64D4, 0xD3BD }, { 0x64D8, 0xDBFB }, { 0x64DA, 0xCBE0 }, { 0x64E1, 0xD3E4 }, { 0x64E2, 0xF6F7 }, { 0x64E5, 0xD5BA }, { 0x64E6, 0xF3CD }, 
-	{ 0x64E7, 0xCBE1 }, { 0x64EC, 0xEBF4 }, { 0x64F2, 0xF4AD }, { 0x64F4, 0xFCAA }, { 0x64FA, 0xF7EC }, { 0x64FE, 0xE8F6 }, { 0x6500, 0xDAE7 }, { 0x6504, 0xF7CC }, 
-	{ 0x6518, 0xE5C1 }, { 0x651D, 0xE0EE }, { 0x6523, 0xD5FD }, { 0x652A, 0xCEE6 }, { 0x652B, 0xFCAB }, { 0x652C, 0xD5BB }, { 0x652F, 0xF2A8 }, { 0x6536, 0xE2A5 }, 
-	{ 0x6537, 0xCDB9 }, { 0x6538, 0xEAF2 }, { 0x6539, 0xCBC7 }, { 0x653B, 0xCDF4 }, { 0x653E, 0xDBAF }, { 0x653F, 0xEFD9 }, { 0x6545, 0xCDBA }, { 0x6548, 0xFCF9 }, 
-	{ 0x654D, 0xDFF3 }, { 0x654E, 0xCEE7 }, { 0x654F, 0xDAC2 }, { 0x6551, 0xCFAD }, { 0x6556, 0xE7F9 }, { 0x6557, 0xF8A8 }, { 0x655E, 0xF3E2 }, { 0x6562, 0xCAF2 }, 
-	{ 0x6563, 0xDFA4 }, { 0x6566, 0xD4C4 }, { 0x656C, 0xCCD7 }, { 0x656D, 0xE5C2 }, { 0x6572, 0xCDBB }, { 0x6574, 0xEFDA }, { 0x6575, 0xEED8 }, { 0x6577, 0xDDA7 }, 
-	{ 0x6578, 0xE2A6 }, { 0x657E, 0xE0C0 }, { 0x6582, 0xD6B0 }, { 0x6583, 0xF8CA }, { 0x6585, 0xFCFA }, { 0x6587, 0xD9FE }, { 0x658C, 0xDEB0 }, { 0x6590, 0xDDEC }, 
-	{ 0x6591, 0xDAE8 }, { 0x6597, 0xD4E0 }, { 0x6599, 0xD6F9 }, { 0x659B, 0xCDD7 }, { 0x659C, 0xDED8 }, { 0x659F, 0xF2F8 }, { 0x65A1, 0xE4D6 }, { 0x65A4, 0xD0C5 }, 
-	{ 0x65A5, 0xF4AE }, { 0x65A7, 0xDDA8 }, { 0x65AB, 0xEDC5 }, { 0x65AC, 0xF3D6 }, { 0x65AF, 0xDED9 }, { 0x65B0, 0xE3E6 }, { 0x65B7, 0xD3A8 }, { 0x65B9, 0xDBB0 }, 
-	{ 0x65BC, 0xE5DA }, { 0x65BD, 0xE3BF }, { 0x65C1, 0xDBB1 }, { 0x65C5, 0xD5E9 }, { 0x65CB, 0xE0C1 }, { 0x65CC, 0xEFDB }, { 0x65CF, 0xF0E9 }, { 0x65D2, 0xD7B2 }, 
-	{ 0x65D7, 0xD0FD }, { 0x65E0, 0xD9E9 }, { 0x65E3, 0xD0FE }, { 0x65E5, 0xECED }, { 0x65E6, 0xD3A9 }, { 0x65E8, 0xF2A9 }, { 0x65E9, 0xF0C4 }, { 0x65EC, 0xE2E2 }, 
-	{ 0x65ED, 0xE9EF }, { 0x65F1, 0xF9D1 }, { 0x65F4, 0xE9D9 }, { 0x65FA, 0xE8DA }, { 0x65FB, 0xDAC3 }, { 0x65FC, 0xDAC4 }, { 0x65FD, 0xD4C5 }, { 0x65FF, 0xE7FA }, 
-	{ 0x6606, 0xCDE0 }, { 0x6607, 0xE3B0 }, { 0x6609, 0xDBB2 }, { 0x660A, 0xFBC4 }, { 0x660C, 0xF3E3 }, { 0x660E, 0xD9A5 }, { 0x660F, 0xFBE7 }, { 0x6610, 0xDDCB }, 
-	{ 0x6611, 0xD0D4 }, { 0x6613, 0xE6B6 }, { 0x6614, 0xE0AE }, { 0x6615, 0xFDDA }, { 0x661E, 0xDCB5 }, { 0x661F, 0xE0F8 }, { 0x6620, 0xE7B1 }, { 0x6625, 0xF5F0 }, 
-	{ 0x6627, 0xD8DC }, { 0x6628, 0xEDC6 }, { 0x662D, 0xE1B9 }, { 0x662F, 0xE3C0 }, { 0x6630, 0xF9C0 }, { 0x6631, 0xE9F0 }, { 0x6634, 0xD9DB }, { 0x6636, 0xF3E4 }, 
-	{ 0x663A, 0xDCB6 }, { 0x663B, 0xE4E9 }, { 0x6641, 0xF0C5 }, { 0x6642, 0xE3C1 }, { 0x6643, 0xFCCC }, { 0x6644, 0xFCCD }, { 0x6649, 0xF2CB }, { 0x664B, 0xF2CC }, 
-	{ 0x664F, 0xE4CF }, { 0x6659, 0xF1DB }, { 0x665B, 0xFAD9 }, { 0x665D, 0xF1B8 }, { 0x665E, 0xFDF5 }, { 0x665F, 0xE0F9 }, { 0x6664, 0xE7FB }, { 0x6665, 0xFCB7 }, 
-	{ 0x6666, 0xFCE4 }, { 0x6667, 0xFBC5 }, { 0x6668, 0xE3E7 }, { 0x6669, 0xD8B9 }, { 0x666B, 0xF6F8 }, { 0x666E, 0xDCC5 }, { 0x666F, 0xCCD8 }, { 0x6673, 0xE0AF }, 
-	{ 0x6674, 0xF4E7 }, { 0x6676, 0xEFDC }, { 0x6677, 0xCFFC }, { 0x6678, 0xEFDD }, { 0x667A, 0xF2AA }, { 0x6684, 0xFDBE }, { 0x6687, 0xCAAC }, { 0x6688, 0xFDBB }, 
-	{ 0x6689, 0xFDC7 }, { 0x668E, 0xE7B2 }, { 0x6690, 0xEAD1 }, { 0x6691, 0xDFF4 }, { 0x6696, 0xD1EC }, { 0x6697, 0xE4DE }, { 0x6698, 0xE5C3 }, { 0x669D, 0xD9A6 }, 
-	{ 0x66A0, 0xCDBC }, { 0x66A2, 0xF3E5 }, { 0x66AB, 0xEDD5 }, { 0x66AE, 0xD9BA }, { 0x66B2, 0xEDE7 }, { 0x66B3, 0xFBB5 }, { 0x66B4, 0xF8EC }, { 0x66B9, 0xE0E7 }, 
-	{ 0x66BB, 0xCCD9 }, { 0x66BE, 0xD4C6 }, { 0x66C4, 0xE7A5 }, { 0x66C6, 0xD5F5 }, { 0x66C7, 0xD3BE }, { 0x66C9, 0xFCFB }, { 0x66D6, 0xE4F2 }, { 0x66D9, 0xDFF5 }, 
-	{ 0x66DC, 0xE8F8 }, { 0x66DD, 0xF8ED }, { 0x66E0, 0xCEC7 }, { 0x66E6, 0xFDF6 }, { 0x66F0, 0xE8D8 }, { 0x66F2, 0xCDD8 }, { 0x66F3, 0xE7D6 }, { 0x66F4, 0xCCDA }, 
-	{ 0x66F7, 0xCAE3 }, { 0x66F8, 0xDFF6 }, { 0x66F9, 0xF0C7 }, { 0x66FA, 0xF0C6 }, { 0x66FC, 0xD8BA }, { 0x66FE, 0xF1F4 }, { 0x66FF, 0xF4F0 }, { 0x6700, 0xF5CC }, 
-	{ 0x6703, 0xFCE5 }, { 0x6708, 0xEAC5 }, { 0x6709, 0xEAF3 }, { 0x670B, 0xDDDB }, { 0x670D, 0xDCD7 }, { 0x6714, 0xDEFD }, { 0x6715, 0xF2F9 }, { 0x6717, 0xD5C7 }, 
-	{ 0x671B, 0xD8D0 }, { 0x671D, 0xF0C8 }, { 0x671E, 0xD1A1 }, { 0x671F, 0xD1A2 }, { 0x6726, 0xD9D4 }, { 0x6727, 0xD6E8 }, { 0x6728, 0xD9CA }, { 0x672A, 0xDAB1 }, 
-	{ 0x672B, 0xD8C7 }, { 0x672C, 0xDCE2 }, { 0x672D, 0xF3CE }, { 0x672E, 0xF5F4 }, { 0x6731, 0xF1B9 }, { 0x6734, 0xDAD3 }, { 0x6736, 0xF6EA }, { 0x673A, 0xCFF5 }, 
-	{ 0x673D, 0xFDAE }, { 0x6746, 0xCAD2 }, { 0x6749, 0xDFB4 }, { 0x674E, 0xD7DD }, { 0x674F, 0xFABA }, { 0x6750, 0xEEA7 }, { 0x6751, 0xF5BD }, { 0x6753, 0xF8F5 }, 
-	{ 0x6756, 0xEDE8 }, { 0x675C, 0xD4E1 }, { 0x675E, 0xD1A3 }, { 0x675F, 0xE1D6 }, { 0x676D, 0xF9F8 }, { 0x676F, 0xDBCA }, { 0x6770, 0xCBF9 }, { 0x6771, 0xD4D4 }, 
-	{ 0x6773, 0xD9DC }, { 0x6775, 0xEEBE }, { 0x6777, 0xF7ED }, { 0x677B, 0xD2EE }, { 0x677E, 0xE1E6 }, { 0x677F, 0xF7F9 }, { 0x6787, 0xDDED }, { 0x6789, 0xE8DB }, 
-	{ 0x678B, 0xDBB3 }, { 0x678F, 0xD1F7 }, { 0x6790, 0xE0B0 }, { 0x6793, 0xD4E2 }, { 0x6795, 0xF6D7 }, { 0x6797, 0xD7F9 }, { 0x679A, 0xD8DD }, { 0x679C, 0xCDFD }, 
-	{ 0x679D, 0xF2AB }, { 0x67AF, 0xCDBD }, { 0x67B0, 0xF8C2 }, { 0x67B3, 0xF2AC }, { 0x67B6, 0xCAAD }, { 0x67B7, 0xCAAE }, { 0x67B8, 0xCFAE }, { 0x67BE, 0xE3C2 }, 
-	{ 0x67C4, 0xDCB7 }, { 0x67CF, 0xDBDA }, { 0x67D0, 0xD9BB }, { 0x67D1, 0xCAF3 }, { 0x67D2, 0xF6D3 }, { 0x67D3, 0xE6F8 }, { 0x67D4, 0xEAF5 }, { 0x67DA, 0xEAF6 }, 
-	{ 0x67DD, 0xF6F9 }, { 0x67E9, 0xCFAF }, { 0x67EC, 0xCAD3 }, { 0x67EF, 0xCAAF }, { 0x67F0, 0xD2B0 }, { 0x67F1, 0xF1BA }, { 0x67F3, 0xD7B3 }, { 0x67F4, 0xE3C3 }, 
-	{ 0x67F5, 0xF3FD }, { 0x67F6, 0xDEDA }, { 0x67FB, 0xDEDB }, { 0x67FE, 0xEFDE }, { 0x6812, 0xE2E3 }, { 0x6813, 0xEEFB }, { 0x6816, 0xDFF7 }, { 0x6817, 0xD7CA }, 
-	{ 0x6821, 0xCEE8 }, { 0x6822, 0xDBDB }, { 0x682A, 0xF1BB }, { 0x682F, 0xE9F1 }, { 0x6838, 0xFAB7 }, { 0x6839, 0xD0C6 }, { 0x683C, 0xCCAB }, { 0x683D, 0xEEA8 }, 
-	{ 0x6840, 0xCBFA }, { 0x6841, 0xF9F9 }, { 0x6842, 0xCCFD }, { 0x6843, 0xD3FE }, { 0x6848, 0xE4D0 }, { 0x684E, 0xF2EE }, { 0x6850, 0xD4D5 }, { 0x6851, 0xDFCD }, 
-	{ 0x6853, 0xFCB8 }, { 0x6854, 0xD1D0 }, { 0x686D, 0xF2CD }, { 0x6876, 0xF7D2 }, { 0x687F, 0xCAD4 }, { 0x6881, 0xD5D9 }, { 0x6885, 0xD8DE }, { 0x688F, 0xCDD9 }, 
-	{ 0x6893, 0xEEA9 }, { 0x6894, 0xF6BC }, { 0x6897, 0xCCDB }, { 0x689D, 0xF0C9 }, { 0x689F, 0xFCFC }, { 0x68A1, 0xE8C9 }, { 0x68A2, 0xF4FE }, { 0x68A7, 0xE7FC }, 
-	{ 0x68A8, 0xD7DE }, { 0x68AD, 0xDEDC }, { 0x68AF, 0xF0AC }, { 0x68B0, 0xCCFE }, { 0x68B1, 0xCDE1 }, { 0x68B3, 0xE1BA }, { 0x68B5, 0xDBEF }, { 0x68B6, 0xDAB2 }, 
-	{ 0x68C4, 0xD1A5 }, { 0x68C5, 0xDCB8 }, { 0x68C9, 0xD8F6 }, { 0x68CB, 0xD1A4 }, { 0x68CD, 0xCDE2 }, { 0x68D2, 0xDCEA }, { 0x68D5, 0xF0F7 }, { 0x68D7, 0xF0CA }, 
-	{ 0x68D8, 0xD0BE }, { 0x68DA, 0xDDDC }, { 0x68DF, 0xD4D6 }, { 0x68E0, 0xD3D6 }, { 0x68E7, 0xEDD0 }, { 0x68E8, 0xCDA1 }, { 0x68EE, 0xDFB5 }, { 0x68F2, 0xDFF8 }, 
-	{ 0x68F9, 0xD4A1 }, { 0x68FA, 0xCEB2 }, { 0x6900, 0xE8CA }, { 0x6905, 0xEBF5 }, { 0x690D, 0xE3D5 }, { 0x690E, 0xF5D0 }, { 0x6912, 0xF5A1 }, { 0x6927, 0xD9A7 }, 
-	{ 0x6930, 0xE5AB }, { 0x693D, 0xE6CB }, { 0x693F, 0xF5F1 }, { 0x694A, 0xE5C5 }, { 0x6953, 0xF9A3 }, { 0x6954, 0xE0DB }, { 0x6955, 0xF6EB }, { 0x6957, 0xCBF1 }, 
-	{ 0x6959, 0xD9EA }, { 0x695A, 0xF5A2 }, { 0x695E, 0xD7D1 }, { 0x6960, 0xD1F8 }, { 0x6961, 0xEAF8 }, { 0x6962, 0xEAF9 }, { 0x6963, 0xDAB3 }, { 0x6968, 0xEFDF }, 
-	{ 0x696B, 0xF1EF }, { 0x696D, 0xE5F6 }, { 0x696E, 0xEEBF }, { 0x696F, 0xE2E4 }, { 0x6975, 0xD0BF }, { 0x6977, 0xFAAC }, { 0x6978, 0xF5D1 }, { 0x6979, 0xE7B3 }, 
-	{ 0x6995, 0xE9BE }, { 0x699B, 0xF2CE }, { 0x699C, 0xDBB4 }, { 0x69A5, 0xFCCE }, { 0x69A7, 0xDDEE }, { 0x69AE, 0xE7B4 }, { 0x69B4, 0xD7B4 }, { 0x69BB, 0xF7B4 }, 
-	{ 0x69C1, 0xCDBE }, { 0x69C3, 0xDAE9 }, { 0x69CB, 0xCFB0 }, { 0x69CC, 0xF7D9 }, { 0x69CD, 0xF3E6 }, { 0x69D0, 0xCED9 }, { 0x69E8, 0xCEAA }, { 0x69EA, 0xCBC8 }, 
-	{ 0x69FB, 0xD0A7 }, { 0x69FD, 0xF0CB }, { 0x69FF, 0xD0C7 }, { 0x6A02, 0xE4C5 }, { 0x6A0A, 0xDBE0 }, { 0x6A11, 0xD5DA }, { 0x6A13, 0xD7A7 }, { 0x6A17, 0xEEC0 }, 
-	{ 0x6A19, 0xF8F6 }, { 0x6A1E, 0xF5D2 }, { 0x6A1F, 0xEDE9 }, { 0x6A21, 0xD9BC }, { 0x6A23, 0xE5C6 }, { 0x6A35, 0xF5A3 }, { 0x6A38, 0xDAD4 }, { 0x6A39, 0xE2A7 }, 
-	{ 0x6A3A, 0xFBFC }, { 0x6A3D, 0xF1DC }, { 0x6A44, 0xCAF4 }, { 0x6A48, 0xE8FA }, { 0x6A4B, 0xCEE9 }, { 0x6A52, 0xE9F8 }, { 0x6A53, 0xE2E5 }, { 0x6A58, 0xD0B9 }, 
-	{ 0x6A59, 0xD4F2 }, { 0x6A5F, 0xD1A6 }, { 0x6A61, 0xDFCE }, { 0x6A6B, 0xFCF4 }, { 0x6A80, 0xD3AA }, { 0x6A84, 0xCCAC }, { 0x6A89, 0xEFE0 }, { 0x6A8D, 0xE5E5 }, 
-	{ 0x6A8E, 0xD0D5 }, { 0x6A97, 0xDBFC }, { 0x6A9C, 0xFCE6 }, { 0x6AA2, 0xCBFE }, { 0x6AA3, 0xEDEA }, { 0x6AB3, 0xDEB1 }, { 0x6ABB, 0xF9E3 }, { 0x6AC2, 0xD4A2 }, 
-	{ 0x6AC3, 0xCFF6 }, { 0x6AD3, 0xD6D0 }, { 0x6ADA, 0xD5EA }, { 0x6ADB, 0xF1EE }, { 0x6AF6, 0xFACB }, { 0x6AFB, 0xE5A1 }, { 0x6B04, 0xD5B1 }, { 0x6B0A, 0xCFED }, 
-	{ 0x6B0C, 0xEDEB }, { 0x6B12, 0xD5B2 }, { 0x6B16, 0xD5BC }, { 0x6B20, 0xFDE2 }, { 0x6B21, 0xF3AD }, { 0x6B23, 0xFDDB }, { 0x6B32, 0xE9B0 }, { 0x6B3A, 0xD1A7 }, 
-	{ 0x6B3D, 0xFDE3 }, { 0x6B3E, 0xCEB3 }, { 0x6B46, 0xFDE4 }, { 0x6B47, 0xFACE }, { 0x6B4C, 0xCAB0 }, { 0x6B4E, 0xF7A7 }, { 0x6B50, 0xCFB1 }, { 0x6B5F, 0xE6A2 }, 
-	{ 0x6B61, 0xFCB6 }, { 0x6B62, 0xF2AD }, { 0x6B63, 0xEFE1 }, { 0x6B64, 0xF3AE }, { 0x6B65, 0xDCC6 }, { 0x6B66, 0xD9EB }, { 0x6B6A, 0xE8E0 }, { 0x6B72, 0xE1A8 }, 
-	{ 0x6B77, 0xD5F6 }, { 0x6B78, 0xCFFD }, { 0x6B7B, 0xDEDD }, { 0x6B7F, 0xD9D1 }, { 0x6B83, 0xE4EA }, { 0x6B84, 0xF2CF }, { 0x6B86, 0xF7BF }, { 0x6B89, 0xE2E6 }, 
-	{ 0x6B8A, 0xE2A8 }, { 0x6B96, 0xE3D6 }, { 0x6B98, 0xEDD1 }, { 0x6B9E, 0xE9F9 }, { 0x6BAE, 0xD6B1 }, { 0x6BAF, 0xDEB2 }, { 0x6BB2, 0xE0E8 }, { 0x6BB5, 0xD3AB }, 
-	{ 0x6BB7, 0xEBDC }, { 0x6BBA, 0xDFAF }, { 0x6BBC, 0xCAC3 }, { 0x6BBF, 0xEEFC }, { 0x6BC1, 0xFDC3 }, { 0x6BC5, 0xEBF6 }, { 0x6BC6, 0xCFB2 }, { 0x6BCB, 0xD9EC }, 
-	{ 0x6BCD, 0xD9BD }, { 0x6BCF, 0xD8DF }, { 0x6BD2, 0xD4B8 }, { 0x6BD3, 0xEBBE }, { 0x6BD4, 0xDDEF }, { 0x6BD6, 0xDDF0 }, { 0x6BD7, 0xDDF1 }, { 0x6BD8, 0xDDF2 }, 
-	{ 0x6BDB, 0xD9BE }, { 0x6BEB, 0xFBC6 }, { 0x6BEC, 0xCFB3 }, { 0x6C08, 0xEEFD }, { 0x6C0F, 0xE4AB }, { 0x6C11, 0xDAC5 }, { 0x6C13, 0xD8EC }, { 0x6C23, 0xD1A8 }, 
-	{ 0x6C34, 0xE2A9 }, { 0x6C37, 0xDEBC }, { 0x6C38, 0xE7B5 }, { 0x6C3E, 0xDBF0 }, { 0x6C40, 0xEFE2 }, { 0x6C41, 0xF1F0 }, { 0x6C42, 0xCFB4 }, { 0x6C4E, 0xDBF1 }, 
-	{ 0x6C50, 0xE0B1 }, { 0x6C55, 0xDFA5 }, { 0x6C57, 0xF9D2 }, { 0x6C5A, 0xE7FD }, { 0x6C5D, 0xE6A3 }, { 0x6C5E, 0xFBF1 }, { 0x6C5F, 0xCBB0 }, { 0x6C60, 0xF2AE }, 
-	{ 0x6C68, 0xCDE7 }, { 0x6C6A, 0xE8DC }, { 0x6C6D, 0xE7D7 }, { 0x6C70, 0xF7C0 }, { 0x6C72, 0xD0E3 }, { 0x6C76, 0xDAA1 }, { 0x6C7A, 0xCCBD }, { 0x6C7D, 0xD1A9 }, 
-	{ 0x6C7E, 0xDDCC }, { 0x6C81, 0xE3FE }, { 0x6C82, 0xD1AA }, { 0x6C83, 0xE8AA }, { 0x6C85, 0xEAB6 }, { 0x6C86, 0xF9FA }, { 0x6C87, 0xE6CC }, { 0x6C88, 0xF6D8 }, 
-	{ 0x6C8C, 0xD4C7 }, { 0x6C90, 0xD9CB }, { 0x6C92, 0xD9D2 }, { 0x6C93, 0xD3CB }, { 0x6C94, 0xD8F7 }, { 0x6C95, 0xDAA9 }, { 0x6C96, 0xF5F8 }, { 0x6C99, 0xDEDE }, 
-	{ 0x6C9A, 0xF2AF }, { 0x6C9B, 0xF8A9 }, { 0x6CAB, 0xD8C8 }, { 0x6CAE, 0xEEC1 }, { 0x6CB3, 0xF9C1 }, { 0x6CB8, 0xDDF3 }, { 0x6CB9, 0xEAFA }, { 0x6CBB, 0xF6BD }, 
-	{ 0x6CBC, 0xE1BB }, { 0x6CBD, 0xCDBF }, { 0x6CBE, 0xF4D4 }, { 0x6CBF, 0xE6CD }, { 0x6CC1, 0xFCCF }, { 0x6CC2, 0xFBA2 }, { 0x6CC4, 0xE0DC }, { 0x6CC9, 0xF4BB }, 
-	{ 0x6CCA, 0xDAD5 }, { 0x6CCC, 0xF9B2 }, { 0x6CD3, 0xFBF2 }, { 0x6CD5, 0xDBF6 }, { 0x6CD7, 0xDEDF }, { 0x6CDB, 0xDBF2 }, { 0x6CE1, 0xF8DC }, { 0x6CE2, 0xF7EE }, 
-	{ 0x6CE3, 0xEBE8 }, { 0x6CE5, 0xD2FA }, { 0x6CE8, 0xF1BC }, { 0x6CEB, 0xFADA }, { 0x6CEE, 0xDAEA }, { 0x6CEF, 0xDAC6 }, { 0x6CF0, 0xF7C1 }, { 0x6CF3, 0xE7B6 }, 
-	{ 0x6D0B, 0xE5C7 }, { 0x6D0C, 0xD6AC }, { 0x6D11, 0xDCC7 }, { 0x6D17, 0xE1A9 }, { 0x6D19, 0xE2AA }, { 0x6D1B, 0xD5A6 }, { 0x6D1E, 0xD4D7 }, { 0x6D25, 0xF2D0 }, 
-	{ 0x6D27, 0xEAFB }, { 0x6D29, 0xE0DD }, { 0x6D2A, 0xFBF3 }, { 0x6D32, 0xF1BD }, { 0x6D35, 0xE2E7 }, { 0x6D36, 0xFDD7 }, { 0x6D38, 0xCEC8 }, { 0x6D39, 0xEAB7 }, 
-	{ 0x6D3B, 0xFCC0 }, { 0x6D3D, 0xFDE7 }, { 0x6D3E, 0xF7EF }, { 0x6D41, 0xD7B5 }, { 0x6D59, 0xEFBA }, { 0x6D5A, 0xF1DD }, { 0x6D5C, 0xDEB3 }, { 0x6D63, 0xE8CB }, 
-	{ 0x6D66, 0xF8DD }, { 0x6D69, 0xFBC7 }, { 0x6D6A, 0xD5C8 }, { 0x6D6C, 0xD7DF }, { 0x6D6E, 0xDDA9 }, { 0x6D74, 0xE9B1 }, { 0x6D77, 0xFAAD }, { 0x6D78, 0xF6D9 }, 
-	{ 0x6D79, 0xFAF4 }, { 0x6D7F, 0xF8AA }, { 0x6D85, 0xE6EE }, { 0x6D87, 0xCCDC }, { 0x6D88, 0xE1BC }, { 0x6D89, 0xE0EF }, { 0x6D8C, 0xE9BF }, { 0x6D8D, 0xFCFD }, 
-	{ 0x6D8E, 0xE6CE }, { 0x6D91, 0xE1D7 }, { 0x6D93, 0xE6CF }, { 0x6D95, 0xF4F1 }, { 0x6DAF, 0xE4F3 }, { 0x6DB2, 0xE4FB }, { 0x6DB5, 0xF9E4 }, { 0x6DC0, 0xEFE3 }, 
-	{ 0x6DC3, 0xCFEE }, { 0x6DC4, 0xF6BE }, { 0x6DC5, 0xE0B2 }, { 0x6DC6, 0xFCFE }, { 0x6DC7, 0xD1AB }, { 0x6DCB, 0xD7FA }, { 0x6DCF, 0xFBC8 }, { 0x6DD1, 0xE2D7 }, 
-	{ 0x6DD8, 0xD4A3 }, { 0x6DD9, 0xF0F8 }, { 0x6DDA, 0xD7A8 }, { 0x6DDE, 0xE1E7 }, { 0x6DE1, 0xD3BF }, { 0x6DE8, 0xEFE4 }, { 0x6DEA, 0xD7C5 }, { 0x6DEB, 0xEBE2 }, 
-	{ 0x6DEE, 0xFCE7 }, { 0x6DF1, 0xE4A2 }, { 0x6DF3, 0xE2E8 }, { 0x6DF5, 0xE6D0 }, { 0x6DF7, 0xFBE8 }, { 0x6DF8, 0xF4E8 }, { 0x6DF9, 0xE5F4 }, { 0x6DFA, 0xF4BC }, 
-	{ 0x6DFB, 0xF4D5 }, { 0x6E17, 0xDFB6 }, { 0x6E19, 0xFCB9 }, { 0x6E1A, 0xEEC2 }, { 0x6E1B, 0xCAF5 }, { 0x6E1F, 0xEFE5 }, { 0x6E20, 0xCBE2 }, { 0x6E21, 0xD4A4 }, 
-	{ 0x6E23, 0xDEE0 }, { 0x6E24, 0xDAFD }, { 0x6E25, 0xE4C6 }, { 0x6E26, 0xE8BE }, { 0x6E2B, 0xE0DE }, { 0x6E2C, 0xF6B4 }, { 0x6E2D, 0xEAD2 }, { 0x6E2F, 0xF9FB }, 
-	{ 0x6E32, 0xE0C2 }, { 0x6E34, 0xCAE4 }, { 0x6E36, 0xE7B7 }, { 0x6E38, 0xEAFD }, { 0x6E3A, 0xD9DD }, { 0x6E3C, 0xDAB4 }, { 0x6E3D, 0xEEAA }, { 0x6E3E, 0xFBE9 }, 
-	{ 0x6E43, 0xDBCB }, { 0x6E44, 0xDAB5 }, { 0x6E4A, 0xF1BE }, { 0x6E4D, 0xD3AC }, { 0x6E56, 0xFBC9 }, { 0x6E58, 0xDFCF }, { 0x6E5B, 0xD3C0 }, { 0x6E5C, 0xE3D7 }, 
-	{ 0x6E5E, 0xEFE6 }, { 0x6E5F, 0xFCD0 }, { 0x6E67, 0xE9C0 }, { 0x6E6B, 0xF5D3 }, { 0x6E6E, 0xECDC }, { 0x6E6F, 0xF7B7 }, { 0x6E72, 0xEAB8 }, { 0x6E73, 0xD1F9 }, 
-	{ 0x6E7A, 0xDCC8 }, { 0x6E90, 0xEAB9 }, { 0x6E96, 0xF1DE }, { 0x6E9C, 0xD7B6 }, { 0x6E9D, 0xCFB5 }, { 0x6E9F, 0xD9A8 }, { 0x6EA2, 0xECEE }, { 0x6EA5, 0xDDAA }, 
-	{ 0x6EAA, 0xCDA2 }, { 0x6EAB, 0xE8AE }, { 0x6EAF, 0xE1BD }, { 0x6EB1, 0xF2D1 }, { 0x6EB6, 0xE9C1 }, { 0x6EBA, 0xD2FC }, { 0x6EC2, 0xDBB5 }, { 0x6EC4, 0xF3E7 }, 
-	{ 0x6EC5, 0xD8FE }, { 0x6EC9, 0xFCD1 }, { 0x6ECB, 0xEDB2 }, { 0x6ECC, 0xF4AF }, { 0x6ECE, 0xFBA3 }, { 0x6ED1, 0xFCC1 }, { 0x6ED3, 0xEEAB }, { 0x6ED4, 0xD4A5 }, 
-	{ 0x6EEF, 0xF4F2 }, { 0x6EF4, 0xEED9 }, { 0x6EF8, 0xFBCA }, { 0x6EFE, 0xCDE3 }, { 0x6EFF, 0xD8BB }, { 0x6F01, 0xE5DB }, { 0x6F02, 0xF8F7 }, { 0x6F06, 0xF6D4 }, 
-	{ 0x6F0F, 0xD7A9 }, { 0x6F11, 0xCBC9 }, { 0x6F14, 0xE6D1 }, { 0x6F15, 0xF0CC }, { 0x6F20, 0xD8AE }, { 0x6F22, 0xF9D3 }, { 0x6F23, 0xD5FE }, { 0x6F2B, 0xD8BC }, 
-	{ 0x6F2C, 0xF2B0 }, { 0x6F31, 0xE2AB }, { 0x6F32, 0xF3E8 }, { 0x6F38, 0xEFC2 }, { 0x6F3F, 0xEDEC }, { 0x6F41, 0xE7B8 }, { 0x6F51, 0xDAFE }, { 0x6F54, 0xCCBE }, 
-	{ 0x6F57, 0xF2FC }, { 0x6F58, 0xDAEB }, { 0x6F5A, 0xE2D8 }, { 0x6F5B, 0xEDD6 }, { 0x6F5E, 0xD6D1 }, { 0x6F5F, 0xE0B3 }, { 0x6F62, 0xFCD2 }, { 0x6F64, 0xEBC8 }, 
-	{ 0x6F6D, 0xD3C1 }, { 0x6F6E, 0xF0CD }, { 0x6F70, 0xCFF7 }, { 0x6F7A, 0xEDD2 }, { 0x6F7C, 0xD4D8 }, { 0x6F7D, 0xDCC9 }, { 0x6F7E, 0xD7F1 }, { 0x6F81, 0xDFBB }, 
-	{ 0x6F84, 0xF3A5 }, { 0x6F88, 0xF4CD }, { 0x6F8D, 0xF1BF }, { 0x6F8E, 0xF8B1 }, { 0x6F90, 0xE9FA }, { 0x6F94, 0xFBCB }, { 0x6F97, 0xCAD5 }, { 0x6FA3, 0xF9D4 }, 
-	{ 0x6FA4, 0xF7CA }, { 0x6FA7, 0xD6C8 }, { 0x6FAE, 0xFCE8 }, { 0x6FAF, 0xF3BD }, { 0x6FB1, 0xEEFE }, { 0x6FB3, 0xE7FE }, { 0x6FB9, 0xD3C2 }, { 0x6FBE, 0xD3B6 }, 
-	{ 0x6FC0, 0xCCAD }, { 0x6FC1, 0xF6FA }, { 0x6FC2, 0xD6B2 }, { 0x6FC3, 0xD2D8 }, { 0x6FCA, 0xE7D8 }, { 0x6FD5, 0xE3A5 }, { 0x6FDA, 0xE7B9 }, { 0x6FDF, 0xF0AD }, 
-	{ 0x6FE0, 0xFBCC }, { 0x6FE1, 0xEBA1 }, { 0x6FE4, 0xD4A6 }, { 0x6FE9, 0xFBCD }, { 0x6FEB, 0xD5BD }, { 0x6FEC, 0xF1DF }, { 0x6FEF, 0xF6FB }, { 0x6FF1, 0xDEB4 }, 
-	{ 0x6FFE, 0xD5EB }, { 0x7001, 0xE5C8 }, { 0x7005, 0xFBA4 }, { 0x7006, 0xD4B9 }, { 0x7009, 0xDEE1 }, { 0x700B, 0xE4A3 }, { 0x700F, 0xD7B7 }, { 0x7011, 0xF8EE }, 
-	{ 0x7015, 0xDEB5 }, { 0x7018, 0xD6D2 }, { 0x701A, 0xF9D5 }, { 0x701B, 0xE7BA }, { 0x701C, 0xEBD5 }, { 0x701D, 0xD5F7 }, { 0x701E, 0xEFE7 }, { 0x701F, 0xE1BE }, 
-	{ 0x7023, 0xFAAE }, { 0x7027, 0xD6E9 }, { 0x7028, 0xD6EE }, { 0x702F, 0xE7BB }, { 0x7037, 0xECCB }, { 0x703E, 0xD5B3 }, { 0x704C, 0xCEB4 }, { 0x7050, 0xFBA5 }, 
-	{ 0x7051, 0xE1EE }, { 0x7058, 0xF7A8 }, { 0x705D, 0xFBCE }, { 0x7063, 0xD8BD }, { 0x706B, 0xFBFD }, { 0x7070, 0xFCE9 }, { 0x7078, 0xCFB6 }, { 0x707C, 0xEDC7 }, 
-	{ 0x707D, 0xEEAC }, { 0x7085, 0xCCDD }, { 0x708A, 0xF6A7 }, { 0x708E, 0xE6FA }, { 0x7092, 0xF5A4 }, { 0x7098, 0xFDDC }, { 0x7099, 0xEDB3 }, { 0x709A, 0xCEC9 }, 
-	{ 0x70A1, 0xEFE8 }, { 0x70A4, 0xE1BF }, { 0x70AB, 0xFADB }, { 0x70AC, 0xCBE3 }, { 0x70AD, 0xF7A9 }, { 0x70AF, 0xFBA6 }, { 0x70B3, 0xDCB9 }, { 0x70B7, 0xF1C0 }, 
-	{ 0x70B8, 0xEDC8 }, { 0x70B9, 0xEFC3 }, { 0x70C8, 0xD6AD }, { 0x70CB, 0xFDCE }, { 0x70CF, 0xE8A1 }, { 0x70D8, 0xFBF4 }, { 0x70D9, 0xD5A7 }, { 0x70DD, 0xF1F6 }, 
-	{ 0x70DF, 0xE6D3 }, { 0x70F1, 0xCCDE }, { 0x70F9, 0xF8B2 }, { 0x70FD, 0xDCEB }, { 0x7104, 0xFDB6 }, { 0x7109, 0xE5EA }, { 0x710C, 0xF1E0 }, { 0x7119, 0xDBCC }, 
-	{ 0x711A, 0xDDCD }, { 0x711E, 0xD4C8 }, { 0x7121, 0xD9ED }, { 0x7126, 0xF5A5 }, { 0x7130, 0xE6FB }, { 0x7136, 0xE6D4 }, { 0x7147, 0xFDC8 }, { 0x7149, 0xD6A1 }, 
-	{ 0x714A, 0xFDBF }, { 0x714C, 0xFCD3 }, { 0x714E, 0xEFA1 }, { 0x7150, 0xE7BC }, { 0x7156, 0xD1EE }, { 0x7159, 0xE6D5 }, { 0x715C, 0xE9F2 }, { 0x715E, 0xDFB0 }, 
-	{ 0x7164, 0xD8E0 }, { 0x7165, 0xFCBA }, { 0x7166, 0xFDAF }, { 0x7167, 0xF0CE }, { 0x7169, 0xDBE1 }, { 0x716C, 0xE5C9 }, { 0x716E, 0xEDB4 }, { 0x717D, 0xE0C3 }, 
-	{ 0x7184, 0xE3D8 }, { 0x7189, 0xE9FB }, { 0x718A, 0xEAA8 }, { 0x718F, 0xFDB7 }, { 0x7192, 0xFBA7 }, { 0x7194, 0xE9C2 }, { 0x7199, 0xFDF7 }, { 0x719F, 0xE2D9 }, 
-	{ 0x71A2, 0xDCEC }, { 0x71AC, 0xE8A2 }, { 0x71B1, 0xE6F0 }, { 0x71B9, 0xFDF8 }, { 0x71BA, 0xFDF9 }, { 0x71BE, 0xF6BF }, { 0x71C1, 0xE7A7 }, { 0x71C3, 0xE6D7 }, 
-	{ 0x71C8, 0xD4F3 }, { 0x71C9, 0xD4C9 }, { 0x71CE, 0xD6FA }, { 0x71D0, 0xD7F2 }, { 0x71D2, 0xE1C0 }, { 0x71D4, 0xDBE2 }, { 0x71D5, 0xE6D8 }, { 0x71DF, 0xE7BD }, 
-	{ 0x71E5, 0xF0CF }, { 0x71E6, 0xF3BE }, { 0x71E7, 0xE2AC }, { 0x71ED, 0xF5B7 }, { 0x71EE, 0xE0F0 }, { 0x71FB, 0xFDB8 }, { 0x71FC, 0xE3E8 }, { 0x71FE, 0xD4A7 }, 
-	{ 0x71FF, 0xE8FC }, { 0x7200, 0xFAD2 }, { 0x7206, 0xF8EF }, { 0x7210, 0xD6D3 }, { 0x721B, 0xD5B4 }, { 0x722A, 0xF0D0 }, { 0x722C, 0xF7F0 }, { 0x722D, 0xEEB3 }, 
-	{ 0x7230, 0xEABA }, { 0x7232, 0xEAD3 }, { 0x7235, 0xEDC9 }, { 0x7236, 0xDDAB }, { 0x723A, 0xE5AC }, { 0x723B, 0xFDA1 }, { 0x723D, 0xDFD0 }, { 0x723E, 0xECB3 }, 
-	{ 0x7240, 0xDFD1 }, { 0x7246, 0xEDED }, { 0x7247, 0xF8B8 }, { 0x7248, 0xF7FA }, { 0x724C, 0xF8AB }, { 0x7252, 0xF4E0 }, { 0x7258, 0xD4BA }, { 0x7259, 0xE4B3 }, 
-	{ 0x725B, 0xE9DA }, { 0x725D, 0xDEB6 }, { 0x725F, 0xD9BF }, { 0x7261, 0xD9C0 }, { 0x7262, 0xD6EF }, { 0x7267, 0xD9CC }, { 0x7269, 0xDAAA }, { 0x7272, 0xDFE5 }, 
-	{ 0x7279, 0xF7E5 }, { 0x727D, 0xCCB2 }, { 0x7280, 0xDFF9 }, { 0x7281, 0xD7E0 }, { 0x72A2, 0xD4BB }, { 0x72A7, 0xFDFA }, { 0x72AC, 0xCCB3 }, { 0x72AF, 0xDBF3 }, 
-	{ 0x72C0, 0xDFD2 }, { 0x72C2, 0xCECA }, { 0x72C4, 0xEEDA }, { 0x72CE, 0xE4E4 }, { 0x72D0, 0xFBCF }, { 0x72D7, 0xCFB7 }, { 0x72D9, 0xEEC3 }, { 0x72E1, 0xCEEA }, 
-	{ 0x72E9, 0xE2AD }, { 0x72F8, 0xD7E1 }, { 0x72F9, 0xFAF5 }, { 0x72FC, 0xD5C9 }, { 0x72FD, 0xF8AC }, { 0x730A, 0xE7D9 }, { 0x7316, 0xF3E9 }, { 0x731B, 0xD8ED }, 
-	{ 0x731C, 0xE3C4 }, { 0x731D, 0xF0F1 }, { 0x7325, 0xE8E5 }, { 0x7329, 0xE0FA }, { 0x732A, 0xEEC4 }, { 0x732B, 0xD9DE }, { 0x7336, 0xEBA2 }, { 0x7337, 0xEBA3 }, 
-	{ 0x733E, 0xFCC2 }, { 0x733F, 0xEABB }, { 0x7344, 0xE8AB }, { 0x7345, 0xDEE2 }, { 0x7350, 0xEDEF }, { 0x7352, 0xE8A3 }, { 0x7357, 0xCFF1 }, { 0x7368, 0xD4BC }, 
-	{ 0x736A, 0xFCEA }, { 0x7370, 0xE7BE }, { 0x7372, 0xFCF2 }, { 0x7375, 0xD6B4 }, { 0x7378, 0xE2AE }, { 0x737A, 0xD3B7 }, { 0x737B, 0xFACC }, { 0x7384, 0xFADC }, 
-	{ 0x7386, 0xEDB5 }, { 0x7387, 0xE1E3 }, { 0x7389, 0xE8AC }, { 0x738B, 0xE8DD }, { 0x738E, 0xEFE9 }, { 0x7394, 0xF4BD }, { 0x7396, 0xCFB8 }, { 0x7397, 0xE9DB }, 
-	{ 0x7398, 0xD1AC }, { 0x739F, 0xDAC7 }, { 0x73A7, 0xEBC9 }, { 0x73A9, 0xE8CC }, { 0x73AD, 0xDEB7 }, { 0x73B2, 0xD6BC }, { 0x73B3, 0xD3E5 }, { 0x73B9, 0xFADD }, 
-	{ 0x73C0, 0xDAD6 }, { 0x73C2, 0xCAB1 }, { 0x73C9, 0xDAC8 }, { 0x73CA, 0xDFA6 }, { 0x73CC, 0xF9B3 }, { 0x73CD, 0xF2D2 }, { 0x73CF, 0xCAC4 }, { 0x73D6, 0xCECB }, 
-	{ 0x73D9, 0xCDF5 }, { 0x73DD, 0xFDB0 }, { 0x73DE, 0xD5A8 }, { 0x73E0, 0xF1C1 }, { 0x73E3, 0xE2E9 }, { 0x73E4, 0xDCCA }, { 0x73E5, 0xECB4 }, { 0x73E6, 0xFAC0 }, 
-	{ 0x73E9, 0xFBA8 }, { 0x73EA, 0xD0A8 }, { 0x73ED, 0xDAEC }, { 0x73F7, 0xD9EE }, { 0x73F9, 0xE0FB }, { 0x73FD, 0xEFEA }, { 0x73FE, 0xFADE }, { 0x7401, 0xE0C4 }, 
-	{ 0x7403, 0xCFB9 }, { 0x7405, 0xD5CA }, { 0x7406, 0xD7E2 }, { 0x7407, 0xE2AF }, { 0x7409, 0xD7B8 }, { 0x7413, 0xE8CD }, { 0x741B, 0xF6DA }, { 0x7420, 0xEFA2 }, 
-	{ 0x7421, 0xE2DA }, { 0x7422, 0xF6FC }, { 0x7425, 0xFBD0 }, { 0x7426, 0xD1AD }, { 0x7428, 0xCDE4 }, { 0x742A, 0xD1AE }, { 0x742B, 0xDCED }, { 0x742C, 0xE8CE }, 
-	{ 0x742E, 0xF0F9 }, { 0x742F, 0xCEB5 }, { 0x7430, 0xE6FC }, { 0x7433, 0xD7FB }, { 0x7434, 0xD0D6 }, { 0x7435, 0xDDF5 }, { 0x7436, 0xF7F1 }, { 0x7438, 0xF6FD }, 
-	{ 0x743A, 0xDBF7 }, { 0x743F, 0xFBEA }, { 0x7440, 0xE9DC }, { 0x7441, 0xD9C1 }, { 0x7443, 0xF5F2 }, { 0x7444, 0xE0C5 }, { 0x744B, 0xEAD4 }, { 0x7455, 0xF9C2 }, 
-	{ 0x7457, 0xEABC }, { 0x7459, 0xD2C5 }, { 0x745A, 0xFBD1 }, { 0x745B, 0xE7C0 }, { 0x745C, 0xEBA5 }, { 0x745E, 0xDFFA }, { 0x745F, 0xE3A2 }, { 0x7460, 0xD7B9 }, 
-	{ 0x7462, 0xE9C3 }, { 0x7464, 0xE8FD }, { 0x7465, 0xE8AF }, { 0x7468, 0xF2D3 }, { 0x7469, 0xFBA9 }, { 0x746A, 0xD8A5 }, { 0x746F, 0xD5CB }, { 0x747E, 0xD0C8 }, 
-	{ 0x7482, 0xD1AF }, { 0x7483, 0xD7E3 }, { 0x7487, 0xE0C6 }, { 0x7489, 0xD6A2 }, { 0x748B, 0xEDF0 }, { 0x7498, 0xD7F3 }, { 0x749C, 0xFCD4 }, { 0x749E, 0xDAD7 }, 
-	{ 0x749F, 0xCCDF }, { 0x74A1, 0xF2D4 }, { 0x74A3, 0xD1B0 }, { 0x74A5, 0xCCE0 }, { 0x74A7, 0xDBFD }, { 0x74A8, 0xF3BF }, { 0x74AA, 0xF0D1 }, { 0x74B0, 0xFCBB }, 
-	{ 0x74B2, 0xE2B0 }, { 0x74B5, 0xE6A5 }, { 0x74B9, 0xE2DB }, { 0x74BD, 0xDFDE }, { 0x74BF, 0xE0C7 }, { 0x74C6, 0xF2EF }, { 0x74CA, 0xCCE1 }, { 0x74CF, 0xD6EA }, 
-	{ 0x74D4, 0xE7C2 }, { 0x74D8, 0xCEB6 }, { 0x74DA, 0xF3C0 }, { 0x74DC, 0xCDFE }, { 0x74E0, 0xFBD2 }, { 0x74E2, 0xF8F8 }, { 0x74E3, 0xF7FB }, { 0x74E6, 0xE8BF }, 
-	{ 0x74EE, 0xE8B7 }, { 0x74F7, 0xEDB6 }, { 0x7501, 0xDCBA }, { 0x7504, 0xCCB4 }, { 0x7511, 0xF1F7 }, { 0x7515, 0xE8B8 }, { 0x7518, 0xCAF6 }, { 0x751A, 0xE4A4 }, 
-	{ 0x751B, 0xF4D6 }, { 0x751F, 0xDFE6 }, { 0x7523, 0xDFA7 }, { 0x7525, 0xDFE7 }, { 0x7526, 0xE1C1 }, { 0x7528, 0xE9C4 }, { 0x752B, 0xDCCB }, { 0x752C, 0xE9C5 }, 
-	{ 0x7530, 0xEFA3 }, { 0x7531, 0xEBA6 }, { 0x7532, 0xCBA3 }, { 0x7533, 0xE3E9 }, { 0x7537, 0xD1FB }, { 0x7538, 0xEFA4 }, { 0x753A, 0xEFEB }, { 0x7547, 0xD0B4 }, 
-	{ 0x754C, 0xCDA3 }, { 0x754F, 0xE8E6 }, { 0x7551, 0xEFA5 }, { 0x7553, 0xD3CC }, { 0x7554, 0xDAED }, { 0x7559, 0xD7BA }, { 0x755B, 0xF2D5 }, { 0x755C, 0xF5E5 }, 
-	{ 0x755D, 0xD9EF }, { 0x7562, 0xF9B4 }, { 0x7565, 0xD5D4 }, { 0x7566, 0xFDCF }, { 0x756A, 0xDBE3 }, { 0x756F, 0xF1E1 }, { 0x7570, 0xECB6 }, { 0x7575, 0xFBFE }, 
-	{ 0x7576, 0xD3D7 }, { 0x7578, 0xD1B1 }, { 0x757A, 0xCBB1 }, { 0x757F, 0xD1B2 }, { 0x7586, 0xCBB2 }, { 0x7587, 0xF1C2 }, { 0x758A, 0xF4E1 }, { 0x758B, 0xF9B5 }, 
-	{ 0x758E, 0xE1C3 }, { 0x758F, 0xE1C2 }, { 0x7591, 0xEBF7 }, { 0x759D, 0xDFA8 }, { 0x75A5, 0xCBCA }, { 0x75AB, 0xE6B9 }, { 0x75B1, 0xF8DE }, { 0x75B2, 0xF9AA }, 
-	{ 0x75B3, 0xCAF7 }, { 0x75B5, 0xEDB7 }, { 0x75B8, 0xD3B8 }, { 0x75B9, 0xF2D6 }, { 0x75BC, 0xD4D9 }, { 0x75BD, 0xEEC5 }, { 0x75BE, 0xF2F0 }, { 0x75C2, 0xCAB2 }, 
-	{ 0x75C5, 0xDCBB }, { 0x75C7, 0xF1F8 }, { 0x75CD, 0xECB7 }, { 0x75D2, 0xE5CA }, { 0x75D4, 0xF6C0 }, { 0x75D5, 0xFDDD }, { 0x75D8, 0xD4E3 }, { 0x75D9, 0xCCE2 }, 
-	{ 0x75DB, 0xF7D4 }, { 0x75E2, 0xD7E5 }, { 0x75F0, 0xD3C3 }, { 0x75F2, 0xD8A6 }, { 0x75F4, 0xF6C1 }, { 0x75FA, 0xDDF6 }, { 0x75FC, 0xCDC0 }, { 0x7600, 0xE5DC }, 
-	{ 0x760D, 0xE5CB }, { 0x7619, 0xE1C4 }, { 0x761F, 0xE8B0 }, { 0x7620, 0xF4B0 }, { 0x7621, 0xF3EA }, { 0x7622, 0xDAEE }, { 0x7624, 0xD7BB }, { 0x7626, 0xE2B1 }, 
-	{ 0x763B, 0xD7AA }, { 0x7642, 0xD6FB }, { 0x764C, 0xE4DF }, { 0x764E, 0xCAD6 }, { 0x7652, 0xEBA8 }, { 0x7656, 0xDBFE }, { 0x7661, 0xF6C2 }, { 0x7664, 0xEFBB }, 
-	{ 0x7669, 0xD4FD }, { 0x766C, 0xE0C8 }, { 0x7670, 0xE8B9 }, { 0x7672, 0xEFA6 }, { 0x7678, 0xCDA4 }, { 0x767B, 0xD4F4 }, { 0x767C, 0xDBA1 }, { 0x767D, 0xDBDC }, 
-	{ 0x767E, 0xDBDD }, { 0x7684, 0xEEDC }, { 0x7686, 0xCBCB }, { 0x7687, 0xFCD5 }, { 0x768E, 0xCEEB }, { 0x7690, 0xCDC1 }, { 0x7693, 0xFBD3 }, { 0x76AE, 0xF9AB }, 
-	{ 0x76BA, 0xF5D4 }, { 0x76BF, 0xD9A9 }, { 0x76C2, 0xE9DD }, { 0x76C3, 0xDBCD }, { 0x76C6, 0xDDCE }, { 0x76C8, 0xE7C3 }, { 0x76CA, 0xECCC }, { 0x76D2, 0xF9EC }, 
-	{ 0x76D6, 0xCBCC }, { 0x76DB, 0xE0FC }, { 0x76DC, 0xD4A8 }, { 0x76DE, 0xEDD3 }, { 0x76DF, 0xD8EF }, { 0x76E1, 0xF2D7 }, { 0x76E3, 0xCAF8 }, { 0x76E4, 0xDAEF }, 
-	{ 0x76E7, 0xD6D4 }, { 0x76EE, 0xD9CD }, { 0x76F2, 0xD8EE }, { 0x76F4, 0xF2C1 }, { 0x76F8, 0xDFD3 }, { 0x76FC, 0xDAF0 }, { 0x76FE, 0xE2EA }, { 0x7701, 0xE0FD }, 
-	{ 0x7704, 0xD8F8 }, { 0x7708, 0xF7AF }, { 0x7709, 0xDAB6 }, { 0x770B, 0xCAD7 }, { 0x771E, 0xF2D8 }, { 0x7720, 0xD8F9 }, { 0x7729, 0xFADF }, { 0x7737, 0xCFEF }, 
-	{ 0x7738, 0xD9C2 }, { 0x773A, 0xF0D2 }, { 0x773C, 0xE4D1 }, { 0x7740, 0xF3B7 }, { 0x774D, 0xFAE0 }, { 0x775B, 0xEFEC }, { 0x7761, 0xE2B2 }, { 0x7763, 0xD4BD }, 
-	{ 0x7766, 0xD9CE }, { 0x776B, 0xF4E2 }, { 0x7779, 0xD4A9 }, { 0x777E, 0xCDC2 }, { 0x777F, 0xE7DA }, { 0x778B, 0xF2D9 }, { 0x7791, 0xD9AA }, { 0x779E, 0xD8BE }, 
-	{ 0x77A5, 0xDCAD }, { 0x77AC, 0xE2EB }, { 0x77AD, 0xD6FC }, { 0x77B0, 0xCAF9 }, { 0x77B3, 0xD4DA }, { 0x77BB, 0xF4D7 }, { 0x77BC, 0xCCA1 }, { 0x77BF, 0xCFBA }, 
-	{ 0x77D7, 0xF5B8 }, { 0x77DB, 0xD9C3 }, { 0x77DC, 0xD0E8 }, { 0x77E2, 0xE3C5 }, { 0x77E3, 0xEBF8 }, { 0x77E5, 0xF2B1 }, { 0x77E9, 0xCFBB }, { 0x77ED, 0xD3AD }, 
-	{ 0x77EE, 0xE8E1 }, { 0x77EF, 0xCEEC }, { 0x77F3, 0xE0B4 }, { 0x7802, 0xDEE3 }, { 0x7812, 0xDDF7 }, { 0x7825, 0xF2B2 }, { 0x7826, 0xF3F6 }, { 0x7827, 0xF6DB }, 
-	{ 0x782C, 0xD7FE }, { 0x7832, 0xF8DF }, { 0x7834, 0xF7F2 }, { 0x7845, 0xD0A9 }, { 0x784F, 0xE6DA }, { 0x785D, 0xF5A6 }, { 0x786B, 0xD7BC }, { 0x786C, 0xCCE3 }, 
-	{ 0x786F, 0xE6DB }, { 0x787C, 0xDDDD }, { 0x7881, 0xD1B3 }, { 0x7887, 0xEFED }, { 0x788C, 0xD6DE }, { 0x788D, 0xE4F4 }, { 0x788E, 0xE1EF }, { 0x7891, 0xDDF8 }, 
-	{ 0x7897, 0xE8CF }, { 0x78A3, 0xCAE5 }, { 0x78A7, 0xDCA1 }, { 0x78A9, 0xE0B5 }, { 0x78BA, 0xFCAC }, { 0x78BB, 0xFCAD }, { 0x78BC, 0xD8A7 }, { 0x78C1, 0xEDB8 }, 
-	{ 0x78C5, 0xDBB6 }, { 0x78CA, 0xD6F0 }, { 0x78CB, 0xF3AF }, { 0x78CE, 0xCDA5 }, { 0x78D0, 0xDAF1 }, { 0x78E8, 0xD8A8 }, { 0x78EC, 0xCCE4 }, { 0x78EF, 0xD1B4 }, 
-	{ 0x78F5, 0xCAD8 }, { 0x78FB, 0xDAF2 }, { 0x7901, 0xF5A7 }, { 0x790E, 0xF5A8 }, { 0x7916, 0xE6A6 }, { 0x792A, 0xD5EC }, { 0x792B, 0xD5F8 }, { 0x792C, 0xDAF3 }, 
-	{ 0x793A, 0xE3C6 }, { 0x793E, 0xDEE4 }, { 0x7940, 0xDEE5 }, { 0x7941, 0xD1B5 }, { 0x7947, 0xD1B6 }, { 0x7948, 0xD1B7 }, { 0x7949, 0xF2B3 }, { 0x7950, 0xE9DE }, 
-	{ 0x7956, 0xF0D3 }, { 0x7957, 0xF2B4 }, { 0x795A, 0xF0D4 }, { 0x795B, 0xCBE4 }, { 0x795C, 0xFBD4 }, { 0x795D, 0xF5E6 }, { 0x795E, 0xE3EA }, { 0x7960, 0xDEE6 }, 
-	{ 0x7965, 0xDFD4 }, { 0x7968, 0xF8F9 }, { 0x796D, 0xF0AE }, { 0x797A, 0xD1B8 }, { 0x797F, 0xD6DF }, { 0x7981, 0xD0D7 }, { 0x798D, 0xFCA1 }, { 0x798E, 0xEFEE }, 
-	{ 0x798F, 0xDCD8 }, { 0x7991, 0xE9DF }, { 0x79A6, 0xE5DD }, { 0x79A7, 0xFDFB }, { 0x79AA, 0xE0C9 }, { 0x79AE, 0xD6C9 }, { 0x79B1, 0xD4AA }, { 0x79B3, 0xE5CC }, 
-	{ 0x79B9, 0xE9E0 }, { 0x79BD, 0xD0D8 }, { 0x79BE, 0xFCA2 }, { 0x79BF, 0xD4BE }, { 0x79C0, 0xE2B3 }, { 0x79C1, 0xDEE7 }, { 0x79C9, 0xDCBC }, { 0x79CA, 0xD2B6 }, 
-	{ 0x79CB, 0xF5D5 }, { 0x79D1, 0xCEA1 }, { 0x79D2, 0xF5A9 }, { 0x79D5, 0xDDF9 }, { 0x79D8, 0xDDFA }, { 0x79DF, 0xF0D5 }, { 0x79E4, 0xF6DF }, { 0x79E6, 0xF2DA }, 
-	{ 0x79E7, 0xE4EB }, { 0x79E9, 0xF2F1 }, { 0x79FB, 0xECB9 }, { 0x7A00, 0xFDFC }, { 0x7A05, 0xE1AA }, { 0x7A08, 0xCAD9 }, { 0x7A0B, 0xEFEF }, { 0x7A0D, 0xF5AA }, 
-	{ 0x7A14, 0xECF9 }, { 0x7A17, 0xF8AD }, { 0x7A19, 0xF2C2 }, { 0x7A1A, 0xF6C3 }, { 0x7A1C, 0xD7D2 }, { 0x7A1F, 0xF9A2 }, { 0x7A20, 0xF0D6 }, { 0x7A2E, 0xF0FA }, 
-	{ 0x7A31, 0xF6E0 }, { 0x7A36, 0xE9F3 }, { 0x7A37, 0xF2C3 }, { 0x7A3B, 0xD4AB }, { 0x7A3C, 0xCAB3 }, { 0x7A3D, 0xCDA6 }, { 0x7A3F, 0xCDC3 }, { 0x7A40, 0xCDDA }, 
-	{ 0x7A46, 0xD9CF }, { 0x7A49, 0xF6C4 }, { 0x7A4D, 0xEEDD }, { 0x7A4E, 0xE7C4 }, { 0x7A57, 0xE2B4 }, { 0x7A61, 0xDFE2 }, { 0x7A62, 0xE7DB }, { 0x7A69, 0xE8B1 }, 
-	{ 0x7A6B, 0xFCAE }, { 0x7A70, 0xE5CD }, { 0x7A74, 0xFAEB }, { 0x7A76, 0xCFBC }, { 0x7A79, 0xCFE2 }, { 0x7A7A, 0xCDF6 }, { 0x7A7D, 0xEFF0 }, { 0x7A7F, 0xF4BE }, 
-	{ 0x7A81, 0xD4CD }, { 0x7A84, 0xF3B8 }, { 0x7A88, 0xE9A1 }, { 0x7A92, 0xF2F2 }, { 0x7A93, 0xF3EB }, { 0x7A95, 0xF0D7 }, { 0x7A98, 0xCFD7 }, { 0x7A9F, 0xCFDF }, 
-	{ 0x7AA9, 0xE8C0 }, { 0x7AAA, 0xE8C1 }, { 0x7AAE, 0xCFE3 }, { 0x7AAF, 0xE9A2 }, { 0x7ABA, 0xD0AA }, { 0x7AC4, 0xF3C1 }, { 0x7AC5, 0xD0AB }, { 0x7AC7, 0xD4E4 }, 
-	{ 0x7ACA, 0xEFBC }, { 0x7ACB, 0xD8A1 }, { 0x7AD7, 0xD9DF }, { 0x7AD9, 0xF3D7 }, { 0x7ADD, 0xDCBD }, { 0x7ADF, 0xCCE5 }, { 0x7AE0, 0xEDF1 }, { 0x7AE3, 0xF1E2 }, 
-	{ 0x7AE5, 0xD4DB }, { 0x7AEA, 0xE2B5 }, { 0x7AED, 0xCAE6 }, { 0x7AEF, 0xD3AE }, { 0x7AF6, 0xCCE6 }, { 0x7AF9, 0xF1D3 }, { 0x7AFA, 0xF5E7 }, { 0x7AFF, 0xCADA }, 
-	{ 0x7B0F, 0xFBEE }, { 0x7B11, 0xE1C5 }, { 0x7B19, 0xDFE9 }, { 0x7B1B, 0xEEDE }, { 0x7B1E, 0xF7C2 }, { 0x7B20, 0xD8A2 }, { 0x7B26, 0xDDAC }, { 0x7B2C, 0xF0AF }, 
-	{ 0x7B2D, 0xD6BD }, { 0x7B39, 0xE1AB }, { 0x7B46, 0xF9B6 }, { 0x7B49, 0xD4F5 }, { 0x7B4B, 0xD0C9 }, { 0x7B4C, 0xEFA7 }, { 0x7B4D, 0xE2EC }, { 0x7B4F, 0xDBEA }, 
-	{ 0x7B50, 0xCECC }, { 0x7B51, 0xF5E8 }, { 0x7B52, 0xF7D5 }, { 0x7B54, 0xD3CD }, { 0x7B56, 0xF3FE }, { 0x7B60, 0xD0B5 }, { 0x7B6C, 0xE0FE }, { 0x7B6E, 0xDFFB }, 
-	{ 0x7B75, 0xE6DD }, { 0x7B7D, 0xE8A4 }, { 0x7B87, 0xCBCD }, { 0x7B8B, 0xEFA8 }, { 0x7B8F, 0xEEB4 }, { 0x7B94, 0xDAD8 }, { 0x7B95, 0xD1B9 }, { 0x7B97, 0xDFA9 }, 
-	{ 0x7B9A, 0xF3B0 }, { 0x7B9D, 0xCCC4 }, { 0x7BA1, 0xCEB7 }, { 0x7BAD, 0xEFA9 }, { 0x7BB1, 0xDFD5 }, { 0x7BB4, 0xEDD7 }, { 0x7BB8, 0xEEC6 }, { 0x7BC0, 0xEFBD }, 
-	{ 0x7BC1, 0xFCD6 }, { 0x7BC4, 0xDBF4 }, { 0x7BC6, 0xEFAA }, { 0x7BC7, 0xF8B9 }, { 0x7BC9, 0xF5E9 }, { 0x7BD2, 0xE3D9 }, { 0x7BE0, 0xE1C6 }, { 0x7BE4, 0xD4BF }, 
-	{ 0x7BE9, 0xDEE8 }, { 0x7C07, 0xF0EA }, { 0x7C12, 0xF3C2 }, { 0x7C1E, 0xD3AF }, { 0x7C21, 0xCADB }, { 0x7C27, 0xFCD7 }, { 0x7C2A, 0xEDD8 }, { 0x7C2B, 0xE1C7 }, 
-	{ 0x7C3D, 0xF4D8 }, { 0x7C3E, 0xD6B3 }, { 0x7C3F, 0xDDAD }, { 0x7C43, 0xD5BE }, { 0x7C4C, 0xF1C3 }, { 0x7C4D, 0xEEDF }, { 0x7C60, 0xD6EB }, { 0x7C64, 0xF4D9 }, 
-	{ 0x7C6C, 0xD7E6 }, { 0x7C73, 0xDAB7 }, { 0x7C83, 0xDDFB }, { 0x7C89, 0xDDCF }, { 0x7C92, 0xD8A3 }, { 0x7C95, 0xDAD9 }, { 0x7C97, 0xF0D8 }, { 0x7C98, 0xEFC4 }, 
-	{ 0x7C9F, 0xE1D8 }, { 0x7CA5, 0xF1D4 }, { 0x7CA7, 0xEDF2 }, { 0x7CAE, 0xD5DB }, { 0x7CB1, 0xD5DC }, { 0x7CB2, 0xF3C4 }, { 0x7CB3, 0xCBD7 }, { 0x7CB9, 0xE2B6 }, 
-	{ 0x7CBE, 0xEFF1 }, { 0x7CCA, 0xFBD5 }, { 0x7CD6, 0xD3D8 }, { 0x7CDE, 0xDDD0 }, { 0x7CDF, 0xF0D9 }, { 0x7CE0, 0xCBB3 }, { 0x7CE7, 0xD5DD }, { 0x7CFB, 0xCDA7 }, 
-	{ 0x7CFE, 0xD0AC }, { 0x7D00, 0xD1BA }, { 0x7D02, 0xF1C4 }, { 0x7D04, 0xE5B3 }, { 0x7D05, 0xFBF5 }, { 0x7D06, 0xE9E1 }, { 0x7D07, 0xFDE0 }, { 0x7D08, 0xFCBC }, 
-	{ 0x7D0A, 0xDAA2 }, { 0x7D0B, 0xDAA3 }, { 0x7D0D, 0xD2A1 }, { 0x7D10, 0xD2EF }, { 0x7D14, 0xE2ED }, { 0x7D17, 0xDEE9 }, { 0x7D18, 0xCEDC }, { 0x7D19, 0xF2B5 }, 
-	{ 0x7D1A, 0xD0E4 }, { 0x7D1B, 0xDDD1 }, { 0x7D20, 0xE1C8 }, { 0x7D21, 0xDBB7 }, { 0x7D22, 0xDFE3 }, { 0x7D2B, 0xEDB9 }, { 0x7D2C, 0xF1C5 }, { 0x7D2E, 0xF3CF }, 
-	{ 0x7D2F, 0xD7AB }, { 0x7D30, 0xE1AC }, { 0x7D33, 0xE3EB }, { 0x7D35, 0xEEC7 }, { 0x7D39, 0xE1C9 }, { 0x7D3A, 0xCAFA }, { 0x7D42, 0xF0FB }, { 0x7D43, 0xFAE1 }, 
-	{ 0x7D44, 0xF0DA }, { 0x7D45, 0xCCE7 }, { 0x7D46, 0xDAF4 }, { 0x7D50, 0xCCBF }, { 0x7D5E, 0xCEED }, { 0x7D61, 0xD5A9 }, { 0x7D62, 0xFAE2 }, { 0x7D66, 0xD0E5 }, 
-	{ 0x7D68, 0xEBD6 }, { 0x7D6A, 0xECDF }, { 0x7D6E, 0xDFFC }, { 0x7D71, 0xF7D6 }, { 0x7D72, 0xDEEA }, { 0x7D73, 0xCBB4 }, { 0x7D76, 0xEFBE }, { 0x7D79, 0xCCB5 }, 
-	{ 0x7D7F, 0xCFBD }, { 0x7D8E, 0xEFF2 }, { 0x7D8F, 0xE2B7 }, { 0x7D93, 0xCCE8 }, { 0x7D9C, 0xF0FC }, { 0x7DA0, 0xD6E0 }, { 0x7DA2, 0xF1C6 }, { 0x7DAC, 0xE2B8 }, 
-	{ 0x7DAD, 0xEBAB }, { 0x7DB1, 0xCBB5 }, { 0x7DB2, 0xD8D1 }, { 0x7DB4, 0xF4CE }, { 0x7DB5, 0xF3F7 }, { 0x7DB8, 0xD7C6 }, { 0x7DBA, 0xD1BB }, { 0x7DBB, 0xF7AA }, 
-	{ 0x7DBD, 0xEDCA }, { 0x7DBE, 0xD7D3 }, { 0x7DBF, 0xD8FA }, { 0x7DC7, 0xF6C5 }, { 0x7DCA, 0xD1CC }, { 0x7DCB, 0xDDFC }, { 0x7DD6, 0xDFFD }, { 0x7DD8, 0xF9E5 }, 
-	{ 0x7DDA, 0xE0CA }, { 0x7DDD, 0xF2FD }, { 0x7DDE, 0xD3B0 }, { 0x7DE0, 0xF4F3 }, { 0x7DE1, 0xDAC9 }, { 0x7DE3, 0xE6DE }, { 0x7DE8, 0xF8BA }, { 0x7DE9, 0xE8D0 }, 
-	{ 0x7DEC, 0xD8FB }, { 0x7DEF, 0xEAD5 }, { 0x7DF4, 0xD6A3 }, { 0x7DFB, 0xF6C6 }, { 0x7E09, 0xF2DB }, { 0x7E0A, 0xE4FC }, { 0x7E15, 0xE8B2 }, { 0x7E1B, 0xDADA }, 
-	{ 0x7E1D, 0xF2DC }, { 0x7E1E, 0xFBD6 }, { 0x7E1F, 0xE9B2 }, { 0x7E21, 0xEEAD }, { 0x7E23, 0xFAE3 }, { 0x7E2B, 0xDCEE }, { 0x7E2E, 0xF5EA }, { 0x7E2F, 0xE6E0 }, 
-	{ 0x7E31, 0xF0FD }, { 0x7E37, 0xD7AC }, { 0x7E3D, 0xF5C5 }, { 0x7E3E, 0xEEE0 }, { 0x7E41, 0xDBE5 }, { 0x7E43, 0xDDDE }, { 0x7E46, 0xD9F0 }, { 0x7E47, 0xE9A3 }, 
-	{ 0x7E52, 0xF1F9 }, { 0x7E54, 0xF2C4 }, { 0x7E55, 0xE0CB }, { 0x7E5E, 0xE9A4 }, { 0x7E61, 0xE2B9 }, { 0x7E69, 0xE3B1 }, { 0x7E6A, 0xFCEB }, { 0x7E6B, 0xCDA8 }, 
-	{ 0x7E6D, 0xCCB6 }, { 0x7E70, 0xF0DB }, { 0x7E79, 0xE6BA }, { 0x7E7C, 0xCDA9 }, { 0x7E82, 0xF3C3 }, { 0x7E8C, 0xE1D9 }, { 0x7E8F, 0xEFAB }, { 0x7E93, 0xE7C5 }, 
-	{ 0x7E96, 0xE0E9 }, { 0x7E98, 0xF3C5 }, { 0x7E9B, 0xD4C0 }, { 0x7E9C, 0xD5BF }, { 0x7F36, 0xDDAE }, { 0x7F38, 0xF9FC }, { 0x7F3A, 0xCCC0 }, { 0x7F4C, 0xE5A2 }, 
-	{ 0x7F50, 0xCEB8 }, { 0x7F54, 0xD8D2 }, { 0x7F55, 0xF9D6 }, { 0x7F6A, 0xF1AA }, { 0x7F6B, 0xCED1 }, { 0x7F6E, 0xF6C7 }, { 0x7F70, 0xDBEB }, { 0x7F72, 0xDFFE }, 
-	{ 0x7F75, 0xD8E1 }, { 0x7F77, 0xF7F3 }, { 0x7F79, 0xD7E7 }, { 0x7F85, 0xD4FE }, { 0x7F88, 0xD1BC }, { 0x7F8A, 0xE5CF }, { 0x7F8C, 0xCBB6 }, { 0x7F8E, 0xDAB8 }, 
-	{ 0x7F94, 0xCDC4 }, { 0x7F9A, 0xD6BE }, { 0x7F9E, 0xE2BA }, { 0x7FA4, 0xCFD8 }, { 0x7FA8, 0xE0CC }, { 0x7FA9, 0xEBF9 }, { 0x7FB2, 0xFDFD }, { 0x7FB8, 0xD7E8 }, 
-	{ 0x7FB9, 0xCBD8 }, { 0x7FBD, 0xE9E2 }, { 0x7FC1, 0xE8BA }, { 0x7FC5, 0xE3C7 }, { 0x7FCA, 0xECCD }, { 0x7FCC, 0xECCE }, { 0x7FCE, 0xD6BF }, { 0x7FD2, 0xE3A7 }, 
-	{ 0x7FD4, 0xDFD6 }, { 0x7FD5, 0xFDE8 }, { 0x7FDF, 0xEEE1 }, { 0x7FE0, 0xF6A8 }, { 0x7FE1, 0xDDFD }, { 0x7FE9, 0xF8BB }, { 0x7FEB, 0xE8D1 }, { 0x7FF0, 0xF9D7 }, 
-	{ 0x7FF9, 0xCEEE }, { 0x7FFC, 0xECCF }, { 0x8000, 0xE9A5 }, { 0x8001, 0xD6D5 }, { 0x8003, 0xCDC5 }, { 0x8005, 0xEDBA }, { 0x8006, 0xD1BD }, { 0x8009, 0xCFBE }, 
-	{ 0x800C, 0xECBB }, { 0x8010, 0xD2B1 }, { 0x8015, 0xCCE9 }, { 0x8017, 0xD9C4 }, { 0x8018, 0xE9FC }, { 0x802D, 0xD1BE }, { 0x8033, 0xECBC }, { 0x8036, 0xE5AD }, 
-	{ 0x803D, 0xF7B0 }, { 0x803F, 0xCCEA }, { 0x8043, 0xD3C4 }, { 0x8046, 0xD6C0 }, { 0x804A, 0xD6FD }, { 0x8056, 0xE1A1 }, { 0x8058, 0xDEBD }, { 0x805A, 0xF6A9 }, 
-	{ 0x805E, 0xDAA4 }, { 0x806F, 0xD6A4 }, { 0x8070, 0xF5C6 }, { 0x8072, 0xE1A2 }, { 0x8073, 0xE9C6 }, { 0x8077, 0xF2C5 }, { 0x807D, 0xF4E9 }, { 0x807E, 0xD6EC }, 
-	{ 0x807F, 0xEBD3 }, { 0x8084, 0xECBD }, { 0x8085, 0xE2DC }, { 0x8086, 0xDEEB }, { 0x8087, 0xF0DC }, { 0x8089, 0xEBBF }, { 0x808B, 0xD7CE }, { 0x808C, 0xD1BF }, 
-	{ 0x8096, 0xF5AB }, { 0x809B, 0xF9FD }, { 0x809D, 0xCADC }, { 0x80A1, 0xCDC6 }, { 0x80A2, 0xF2B6 }, { 0x80A5, 0xDDFE }, { 0x80A9, 0xCCB7 }, { 0x80AA, 0xDBB8 }, 
-	{ 0x80AF, 0xD0E9 }, { 0x80B1, 0xCEDD }, { 0x80B2, 0xEBC0 }, { 0x80B4, 0xFDA2 }, { 0x80BA, 0xF8CB }, { 0x80C3, 0xEAD6 }, { 0x80C4, 0xF1B0 }, { 0x80CC, 0xDBCE }, 
-	{ 0x80CE, 0xF7C3 }, { 0x80DA, 0xDBCF }, { 0x80DB, 0xCBA4 }, { 0x80DE, 0xF8E0 }, { 0x80E1, 0xFBD7 }, { 0x80E4, 0xEBCA }, { 0x80E5, 0xE0A1 }, { 0x80F1, 0xCECD }, 
-	{ 0x80F4, 0xD4DC }, { 0x80F8, 0xFDD8 }, { 0x80FD, 0xD2F6 }, { 0x8102, 0xF2B7 }, { 0x8105, 0xFAF6 }, { 0x8106, 0xF6AA }, { 0x8107, 0xFAF7 }, { 0x8108, 0xD8E6 }, 
-	{ 0x810A, 0xF4B1 }, { 0x8118, 0xE8D2 }, { 0x811A, 0xCAC5 }, { 0x811B, 0xCCEB }, { 0x8123, 0xE2EE }, { 0x8129, 0xE2BB }, { 0x812B, 0xF7AD }, { 0x812F, 0xF8E1 }, 
-	{ 0x8139, 0xF3EC }, { 0x813E, 0xDEA1 }, { 0x814B, 0xE4FD }, { 0x814E, 0xE3EC }, { 0x8150, 0xDDAF }, { 0x8151, 0xDDB0 }, { 0x8154, 0xCBB7 }, { 0x8155, 0xE8D3 }, 
-	{ 0x8165, 0xE1A3 }, { 0x8166, 0xD2E0 }, { 0x816B, 0xF0FE }, { 0x8170, 0xE9A6 }, { 0x8171, 0xCBF2 }, { 0x8178, 0xEDF3 }, { 0x8179, 0xDCD9 }, { 0x817A, 0xE0CD }, 
-	{ 0x817F, 0xF7DA }, { 0x8180, 0xDBB9 }, { 0x8188, 0xCCAE }, { 0x818A, 0xDADB }, { 0x818F, 0xCDC7 }, { 0x819A, 0xDDB1 }, { 0x819C, 0xD8AF }, { 0x819D, 0xE3A3 }, 
-	{ 0x81A0, 0xCEEF }, { 0x81A3, 0xF2F3 }, { 0x81A8, 0xF8B3 }, { 0x81B3, 0xE0CE }, { 0x81B5, 0xF5FD }, { 0x81BA, 0xEBEC }, { 0x81BD, 0xD3C5 }, { 0x81BE, 0xFCEC }, 
-	{ 0x81BF, 0xD2DB }, { 0x81C0, 0xD4EB }, { 0x81C2, 0xDEA2 }, { 0x81C6, 0xE5E6 }, { 0x81CD, 0xF0B0 }, { 0x81D8, 0xD5C4 }, { 0x81DF, 0xEDF4 }, { 0x81E3, 0xE3ED }, 
-	{ 0x81E5, 0xE8C2 }, { 0x81E7, 0xEDF5 }, { 0x81E8, 0xD7FC }, { 0x81EA, 0xEDBB }, { 0x81ED, 0xF6AB }, { 0x81F3, 0xF2B8 }, { 0x81F4, 0xF6C8 }, { 0x81FA, 0xD3E6 }, 
-	{ 0x81FB, 0xF2DD }, { 0x81FC, 0xCFBF }, { 0x81FE, 0xEBAC }, { 0x8205, 0xCFC0 }, { 0x8207, 0xE6A8 }, { 0x8208, 0xFDE9 }, { 0x820A, 0xCFC1 }, { 0x820C, 0xE0DF }, 
-	{ 0x820D, 0xDEEC }, { 0x8212, 0xE0A2 }, { 0x821B, 0xF4BF }, { 0x821C, 0xE2EF }, { 0x821E, 0xD9F1 }, { 0x821F, 0xF1C7 }, { 0x8221, 0xCBB8 }, { 0x822A, 0xF9FE }, 
-	{ 0x822B, 0xDBBA }, { 0x822C, 0xDAF5 }, { 0x8235, 0xF6EC }, { 0x8236, 0xDADC }, { 0x8237, 0xFAE4 }, { 0x8239, 0xE0CF }, { 0x8240, 0xDDB2 }, { 0x8245, 0xE6A9 }, 
-	{ 0x8247, 0xEFF3 }, { 0x8259, 0xF3ED }, { 0x8264, 0xEBFA }, { 0x8266, 0xF9E6 }, { 0x826E, 0xCADD }, { 0x826F, 0xD5DE }, { 0x8271, 0xCADE }, { 0x8272, 0xDFE4 }, 
-	{ 0x8276, 0xE6FD }, { 0x8278, 0xF5AC }, { 0x827E, 0xE4F5 }, { 0x828B, 0xE9E3 }, { 0x828D, 0xEDCB }, { 0x828E, 0xCFE4 }, { 0x8292, 0xD8D3 }, { 0x8299, 0xDDB3 }, 
-	{ 0x829A, 0xD4EC }, { 0x829D, 0xF2B9 }, { 0x829F, 0xDFB7 }, { 0x82A5, 0xCBCE }, { 0x82A6, 0xFBD8 }, { 0x82A9, 0xD0D9 }, { 0x82AC, 0xDDD2 }, { 0x82AD, 0xF7F4 }, 
-	{ 0x82AE, 0xE7DC }, { 0x82AF, 0xE4A5 }, { 0x82B1, 0xFCA3 }, { 0x82B3, 0xDBBB }, { 0x82B7, 0xF2BA }, { 0x82B8, 0xE9FD }, { 0x82B9, 0xD0CA }, { 0x82BB, 0xF5D6 }, 
-	{ 0x82BC, 0xD9C5 }, { 0x82BD, 0xE4B4 }, { 0x82BF, 0xEDA7 }, { 0x82D1, 0xEABD }, { 0x82D2, 0xE6FE }, { 0x82D4, 0xF7C4 }, { 0x82D5, 0xF5AD }, { 0x82D7, 0xD9E0 }, 
-	{ 0x82DB, 0xCAB4 }, { 0x82DE, 0xF8E2 }, { 0x82DF, 0xCFC2 }, { 0x82E1, 0xECBE }, { 0x82E5, 0xE5B4 }, { 0x82E6, 0xCDC8 }, { 0x82E7, 0xEEC8 }, { 0x82F1, 0xE7C8 }, 
-	{ 0x82FD, 0xCDC9 }, { 0x82FE, 0xF9B7 }, { 0x8301, 0xF1E8 }, { 0x8302, 0xD9F2 }, { 0x8303, 0xDBF5 }, { 0x8304, 0xCAB5 }, { 0x8305, 0xD9C6 }, { 0x8309, 0xD8C9 }, 
-	{ 0x8317, 0xD9AB }, { 0x8328, 0xEDBC }, { 0x832B, 0xD8D4 }, { 0x832F, 0xDCDA }, { 0x8331, 0xE2BC }, { 0x8334, 0xFCED }, { 0x8335, 0xECE0 }, { 0x8336, 0xD2FE }, 
-	{ 0x8338, 0xE9C7 }, { 0x8339, 0xE6AA }, { 0x8340, 0xE2F0 }, { 0x8347, 0xFABB }, { 0x8349, 0xF5AE }, { 0x834A, 0xFBAA }, { 0x834F, 0xECFB }, { 0x8351, 0xECBF }, 
-	{ 0x8352, 0xFCD8 }, { 0x8373, 0xD4E5 }, { 0x8377, 0xF9C3 }, { 0x837B, 0xEEE2 }, { 0x8389, 0xD7E9 }, { 0x838A, 0xEDF6 }, { 0x838E, 0xDEED }, { 0x8396, 0xCCEC }, 
-	{ 0x8398, 0xE3EE }, { 0x839E, 0xE8D4 }, { 0x83A2, 0xFAF8 }, { 0x83A9, 0xDDB4 }, { 0x83AA, 0xE4B5 }, { 0x83AB, 0xD8B0 }, { 0x83BD, 0xD8D5 }, { 0x83C1, 0xF4EA }, 
-	{ 0x83C5, 0xCEB9 }, { 0x83C9, 0xD6E1 }, { 0x83CA, 0xCFD2 }, { 0x83CC, 0xD0B6 }, { 0x83D3, 0xCEA2 }, { 0x83D6, 0xF3EE }, { 0x83DC, 0xF3F8 }, { 0x83E9, 0xDCCC }, 
-	{ 0x83EB, 0xD0CB }, { 0x83EF, 0xFCA4 }, { 0x83F0, 0xCDCA }, { 0x83F1, 0xD7D4 }, { 0x83F2, 0xDEA3 }, { 0x83F4, 0xE4E0 }, { 0x83F9, 0xEEC9 }, { 0x83FD, 0xE2DD }, 
-	{ 0x8403, 0xF5FE }, { 0x8404, 0xD4AC }, { 0x840A, 0xD5D1 }, { 0x840C, 0xD8F0 }, { 0x840D, 0xF8C3 }, { 0x840E, 0xEAD7 }, { 0x8429, 0xF5D7 }, { 0x842C, 0xD8BF }, 
-	{ 0x8431, 0xFDC0 }, { 0x8438, 0xEBAD }, { 0x843D, 0xD5AA }, { 0x8449, 0xE7A8 }, { 0x8457, 0xEECA }, { 0x845B, 0xCAE7 }, { 0x8461, 0xF8E3 }, { 0x8463, 0xD4DD }, 
-	{ 0x8466, 0xEAD8 }, { 0x846B, 0xFBD9 }, { 0x846C, 0xEDF7 }, { 0x846F, 0xE5B5 }, { 0x8475, 0xD0AD }, { 0x847A, 0xF1F1 }, { 0x8490, 0xE2BD }, { 0x8494, 0xE3C8 }, 
-	{ 0x8499, 0xD9D5 }, { 0x849C, 0xDFAA }, { 0x84A1, 0xDBBC }, { 0x84B2, 0xF8E4 }, { 0x84B8, 0xF1FA }, { 0x84BB, 0xE5B6 }, { 0x84BC, 0xF3EF }, { 0x84BF, 0xFBDA }, 
-	{ 0x84C0, 0xE1E0 }, { 0x84C2, 0xD9AC }, { 0x84C4, 0xF5EB }, { 0x84C6, 0xE0B6 }, { 0x84C9, 0xE9C8 }, { 0x84CB, 0xCBCF }, { 0x84CD, 0xE3C9 }, { 0x84D1, 0xDEEE }, 
-	{ 0x84DA, 0xE2BE }, { 0x84EC, 0xDCEF }, { 0x84EE, 0xD6A5 }, { 0x84F4, 0xE2F1 }, { 0x84FC, 0xD6FE }, { 0x8511, 0xD9A1 }, { 0x8513, 0xD8C0 }, { 0x8514, 0xDCDB }, 
-	{ 0x8517, 0xEDBD }, { 0x8518, 0xDFB8 }, { 0x851A, 0xEAA5 }, { 0x851E, 0xD7AD }, { 0x8521, 0xF3F9 }, { 0x8523, 0xEDF8 }, { 0x8525, 0xF5C7 }, { 0x852C, 0xE1CA }, 
-	{ 0x852D, 0xEBE3 }, { 0x852F, 0xF2DE }, { 0x853D, 0xF8CC }, { 0x853F, 0xEAD9 }, { 0x8541, 0xD3C6 }, { 0x8543, 0xDBE6 }, { 0x8549, 0xF5AF }, { 0x854E, 0xCEF0 }, 
-	{ 0x8553, 0xE9FE }, { 0x8559, 0xFBB6 }, { 0x8563, 0xE2F2 }, { 0x8568, 0xCFF2 }, { 0x8569, 0xF7B9 }, { 0x856A, 0xD9F3 }, { 0x856D, 0xE1CB }, { 0x8584, 0xDADD }, 
-	{ 0x8587, 0xDAB9 }, { 0x858F, 0xEBFB }, { 0x8591, 0xCBB9 }, { 0x8594, 0xEDF9 }, { 0x859B, 0xE0E0 }, { 0x85A6, 0xF4C0 }, { 0x85A8, 0xFDBC }, { 0x85A9, 0xDFB1 }, 
-	{ 0x85AA, 0xE3EF }, { 0x85AF, 0xE0A3 }, { 0x85B0, 0xFDB9 }, { 0x85BA, 0xF0B1 }, { 0x85C1, 0xCDCB }, { 0x85C9, 0xEDBE }, { 0x85CD, 0xD5C0 }, { 0x85CE, 0xE3F0 }, 
-	{ 0x85CF, 0xEDFA }, { 0x85D5, 0xE9E4 }, { 0x85DC, 0xD5ED }, { 0x85DD, 0xE7DD }, { 0x85E4, 0xD4F6 }, { 0x85E5, 0xE5B7 }, { 0x85E9, 0xDBE7 }, { 0x85EA, 0xE2BF }, 
-	{ 0x85F7, 0xEECB }, { 0x85FA, 0xD7F4 }, { 0x85FB, 0xF0DD }, { 0x85FF, 0xCEAB }, { 0x8602, 0xE7DE }, { 0x8606, 0xD6D6 }, { 0x8607, 0xE1CC }, { 0x860A, 0xE8B3 }, 
-	{ 0x8616, 0xE5EE }, { 0x8617, 0xDCA2 }, { 0x861A, 0xE0D0 }, { 0x862D, 0xD5B5 }, { 0x863F, 0xD5A1 }, { 0x864E, 0xFBDB }, { 0x8650, 0xF9CB }, { 0x8654, 0xCBF3 }, 
-	{ 0x8655, 0xF4A5 }, { 0x865B, 0xFAC8 }, { 0x865C, 0xD6D7 }, { 0x865E, 0xE9E5 }, { 0x865F, 0xFBDC }, { 0x8667, 0xFDD0 }, { 0x8679, 0xFBF6 }, { 0x868A, 0xDAA5 }, 
-	{ 0x868C, 0xDBBD }, { 0x8693, 0xECE2 }, { 0x86A3, 0xCDF7 }, { 0x86A4, 0xF0DE }, { 0x86A9, 0xF6C9 }, { 0x86C7, 0xDEEF }, { 0x86CB, 0xD3B1 }, { 0x86D4, 0xFCEE }, 
-	{ 0x86D9, 0xE8C3 }, { 0x86DB, 0xF1C8 }, { 0x86DF, 0xCEF1 }, { 0x86E4, 0xF9ED }, { 0x86ED, 0xF2F4 }, { 0x86FE, 0xE4B6 }, { 0x8700, 0xF5B9 }, { 0x8702, 0xDCF0 }, 
-	{ 0x8703, 0xE3F1 }, { 0x8708, 0xE8A5 }, { 0x8718, 0xF2BB }, { 0x871A, 0xDEA4 }, { 0x871C, 0xDACC }, { 0x874E, 0xCAE9 }, { 0x8755, 0xE3DA }, { 0x8757, 0xFCD9 }, 
-	{ 0x875F, 0xEADA }, { 0x8766, 0xF9C4 }, { 0x8768, 0xE3A4 }, { 0x8774, 0xFBDD }, { 0x8776, 0xEFCA }, { 0x8778, 0xE8C4 }, { 0x8782, 0xD5CC }, { 0x878D, 0xEBD7 }, 
-	{ 0x879F, 0xD9AD }, { 0x87A2, 0xFBAB }, { 0x87B3, 0xD3D9 }, { 0x87BA, 0xD5A2 }, { 0x87C4, 0xF6DE }, { 0x87E0, 0xDAF6 }, { 0x87EC, 0xE0D1 }, { 0x87EF, 0xE9A8 }, 
-	{ 0x87F2, 0xF5F9 }, { 0x87F9, 0xFAAF }, { 0x87FB, 0xEBFC }, { 0x87FE, 0xE0EA }, { 0x8805, 0xE3B2 }, { 0x881F, 0xD5C5 }, { 0x8822, 0xF1E3 }, { 0x8823, 0xD5EE }, 
-	{ 0x8831, 0xCDCC }, { 0x8836, 0xEDD9 }, { 0x883B, 0xD8C1 }, { 0x8840, 0xFAEC }, { 0x8846, 0xF1EB }, { 0x884C, 0xFABC }, { 0x884D, 0xE6E2 }, { 0x8852, 0xFAE5 }, 
-	{ 0x8853, 0xE2FA }, { 0x8857, 0xCAB6 }, { 0x8859, 0xE4B7 }, { 0x885B, 0xEADB }, { 0x885D, 0xF5FA }, { 0x8861, 0xFBAC }, { 0x8862, 0xCFC3 }, { 0x8863, 0xEBFD }, 
-	{ 0x8868, 0xF8FA }, { 0x886B, 0xDFB9 }, { 0x8870, 0xE1F1 }, { 0x8872, 0xD2A4 }, { 0x8877, 0xF5FB }, { 0x887E, 0xD0DA }, { 0x887F, 0xD0DB }, { 0x8881, 0xEABE }, 
-	{ 0x8882, 0xD9B1 }, { 0x8888, 0xCAB7 }, { 0x888B, 0xD3E7 }, { 0x888D, 0xF8E5 }, { 0x8892, 0xD3B2 }, { 0x8896, 0xE2C0 }, { 0x8897, 0xF2DF }, { 0x889E, 0xCDE5 }, 
-	{ 0x88AB, 0xF9AC }, { 0x88B4, 0xCDCD }, { 0x88C1, 0xEEAE }, { 0x88C2, 0xD6AE }, { 0x88CF, 0xD7EA }, { 0x88D4, 0xE7E0 }, { 0x88D5, 0xEBAE }, { 0x88D9, 0xCFD9 }, 
-	{ 0x88DC, 0xDCCD }, { 0x88DD, 0xEDFB }, { 0x88DF, 0xDEF0 }, { 0x88E1, 0xD7EB }, { 0x88E8, 0xDEA5 }, { 0x88F3, 0xDFD7 }, { 0x88F4, 0xDBD0 }, { 0x88F5, 0xDBD1 }, 
-	{ 0x88F8, 0xD5A3 }, { 0x88FD, 0xF0B2 }, { 0x8907, 0xDCDC }, { 0x8910, 0xCAE8 }, { 0x8912, 0xF8E6 }, { 0x8913, 0xDCCE }, { 0x8918, 0xEADC }, { 0x8919, 0xDBD2 }, 
-	{ 0x8925, 0xE9B3 }, { 0x892A, 0xF7DB }, { 0x8936, 0xE3A8 }, { 0x8938, 0xD7AE }, { 0x893B, 0xE0E1 }, { 0x8941, 0xCBBA }, { 0x8944, 0xE5D1 }, { 0x895F, 0xD0DC }, 
-	{ 0x8964, 0xD5C1 }, { 0x896A, 0xD8CA }, { 0x8972, 0xE3A9 }, { 0x897F, 0xE0A4 }, { 0x8981, 0xE9A9 }, { 0x8983, 0xD3C7 }, { 0x8986, 0xDCDD }, { 0x8987, 0xF8AE }, 
-	{ 0x898B, 0xCCB8 }, { 0x898F, 0xD0AE }, { 0x8993, 0xD8F2 }, { 0x8996, 0xE3CA }, { 0x89A1, 0xCCAF }, { 0x89A9, 0xD4AD }, { 0x89AA, 0xF6D1 }, { 0x89B2, 0xD0CC }, 
-	{ 0x89BA, 0xCAC6 }, { 0x89BD, 0xD5C2 }, { 0x89C0, 0xCEBA }, { 0x89D2, 0xCAC7 }, { 0x89E3, 0xFAB0 }, { 0x89F4, 0xDFD8 }, { 0x89F8, 0xF5BA }, { 0x8A00, 0xE5EB }, 
-	{ 0x8A02, 0xEFF4 }, { 0x8A03, 0xDDB5 }, { 0x8A08, 0xCDAA }, { 0x8A0A, 0xE3F2 }, { 0x8A0C, 0xFBF7 }, { 0x8A0E, 0xF7D0 }, { 0x8A13, 0xFDBA }, { 0x8A16, 0xFDE1 }, 
-	{ 0x8A17, 0xF6FE }, { 0x8A18, 0xD1C0 }, { 0x8A1B, 0xE8C5 }, { 0x8A1D, 0xE4B8 }, { 0x8A1F, 0xE1E8 }, { 0x8A23, 0xCCC1 }, { 0x8A25, 0xD2ED }, { 0x8A2A, 0xDBBE }, 
-	{ 0x8A2D, 0xE0E2 }, { 0x8A31, 0xFAC9 }, { 0x8A34, 0xE1CD }, { 0x8A36, 0xCAB8 }, { 0x8A3A, 0xF2E0 }, { 0x8A3B, 0xF1C9 }, { 0x8A50, 0xDEF1 }, { 0x8A54, 0xF0DF }, 
-	{ 0x8A55, 0xF8C4 }, { 0x8A5B, 0xEECC }, { 0x8A5E, 0xDEF2 }, { 0x8A60, 0xE7C9 }, { 0x8A62, 0xE2F3 }, { 0x8A63, 0xE7E1 }, { 0x8A66, 0xE3CB }, { 0x8A69, 0xE3CC }, 
-	{ 0x8A6D, 0xCFF8 }, { 0x8A6E, 0xEFAC }, { 0x8A70, 0xFDFE }, { 0x8A71, 0xFCA5 }, { 0x8A72, 0xFAB1 }, { 0x8A73, 0xDFD9 }, { 0x8A75, 0xE0D2 }, { 0x8A79, 0xF4DA }, 
-	{ 0x8A85, 0xF1CA }, { 0x8A87, 0xCEA3 }, { 0x8A8C, 0xF2BC }, { 0x8A8D, 0xECE3 }, { 0x8A93, 0xE0A5 }, { 0x8A95, 0xF7AB }, { 0x8A98, 0xEBAF }, { 0x8A9E, 0xE5DE }, 
-	{ 0x8AA0, 0xE1A4 }, { 0x8AA1, 0xCDAB }, { 0x8AA3, 0xD9F4 }, { 0x8AA4, 0xE8A6 }, { 0x8AA5, 0xCDCE }, { 0x8AA6, 0xE1E9 }, { 0x8AA8, 0xFCEF }, { 0x8AAA, 0xE0E3 }, 
-	{ 0x8AB0, 0xE2C1 }, { 0x8AB2, 0xCEA4 }, { 0x8AB9, 0xDEA6 }, { 0x8ABC, 0xEBFE }, { 0x8ABE, 0xEBDD }, { 0x8ABF, 0xF0E0 }, { 0x8AC2, 0xF4DB }, { 0x8AC4, 0xE2F4 }, 
-	{ 0x8AC7, 0xD3C8 }, { 0x8ACB, 0xF4EB }, { 0x8ACD, 0xEEB5 }, { 0x8ACF, 0xF5D8 }, { 0x8AD2, 0xD5DF }, { 0x8AD6, 0xD6E5 }, { 0x8ADB, 0xEBB0 }, { 0x8ADC, 0xF4E3 }, 
-	{ 0x8AE1, 0xE3CD }, { 0x8AE6, 0xF4F4 }, { 0x8AE7, 0xFAB2 }, { 0x8AEA, 0xEFF5 }, { 0x8AEB, 0xCADF }, { 0x8AED, 0xEBB1 }, { 0x8AEE, 0xEDBF }, { 0x8AF1, 0xFDC9 }, 
-	{ 0x8AF6, 0xE4A6 }, { 0x8AF7, 0xF9A4 }, { 0x8AF8, 0xF0B3 }, { 0x8AFA, 0xE5EC }, { 0x8AFE, 0xD1E7 }, { 0x8B00, 0xD9C7 }, { 0x8B01, 0xE4D7 }, { 0x8B02, 0xEADD }, 
-	{ 0x8B04, 0xD4F7 }, { 0x8B0E, 0xDABA }, { 0x8B10, 0xDACD }, { 0x8B14, 0xF9CC }, { 0x8B16, 0xE1DA }, { 0x8B17, 0xDBBF }, { 0x8B19, 0xCCC5 }, { 0x8B1A, 0xECD0 }, 
-	{ 0x8B1B, 0xCBBB }, { 0x8B1D, 0xDEF3 }, { 0x8B20, 0xE9AA }, { 0x8B28, 0xD9C8 }, { 0x8B2B, 0xEEE3 }, { 0x8B2C, 0xD7BD }, { 0x8B33, 0xCFC4 }, { 0x8B39, 0xD0CD }, 
-	{ 0x8B41, 0xFCA6 }, { 0x8B49, 0xF1FB }, { 0x8B4E, 0xFDD2 }, { 0x8B4F, 0xD1C1 }, { 0x8B58, 0xE3DB }, { 0x8B5A, 0xD3C9 }, { 0x8B5C, 0xDCCF }, { 0x8B66, 0xCCED }, 
-	{ 0x8B6C, 0xDEA7 }, { 0x8B6F, 0xE6BB }, { 0x8B70, 0xECA1 }, { 0x8B74, 0xCCB9 }, { 0x8B77, 0xFBDE }, { 0x8B7D, 0xE7E2 }, { 0x8B80, 0xD4C1 }, { 0x8B8A, 0xDCA8 }, 
-	{ 0x8B90, 0xE2C2 }, { 0x8B92, 0xF3D8 }, { 0x8B93, 0xE5D3 }, { 0x8B96, 0xF3D9 }, { 0x8B9A, 0xF3C6 }, { 0x8C37, 0xCDDB }, { 0x8C3F, 0xCDAC }, { 0x8C41, 0xFCC3 }, 
-	{ 0x8C46, 0xD4E7 }, { 0x8C48, 0xD1C2 }, { 0x8C4A, 0xF9A5 }, { 0x8C4C, 0xE8D5 }, { 0x8C55, 0xE3CE }, { 0x8C5A, 0xD4CA }, { 0x8C61, 0xDFDA }, { 0x8C6A, 0xFBDF }, 
-	{ 0x8C6B, 0xE7E3 }, { 0x8C79, 0xF8FB }, { 0x8C7A, 0xE3CF }, { 0x8C82, 0xF5B0 }, { 0x8C8A, 0xD8E7 }, { 0x8C8C, 0xD9C9 }, { 0x8C9D, 0xF8AF }, { 0x8C9E, 0xEFF6 }, 
-	{ 0x8CA0, 0xDDB6 }, { 0x8CA1, 0xEEAF }, { 0x8CA2, 0xCDF8 }, { 0x8CA7, 0xDEB8 }, { 0x8CA8, 0xFCA7 }, { 0x8CA9, 0xF7FC }, { 0x8CAA, 0xF7B1 }, { 0x8CAB, 0xCEBB }, 
-	{ 0x8CAC, 0xF4A1 }, { 0x8CAF, 0xEECD }, { 0x8CB0, 0xE1AE }, { 0x8CB3, 0xECC3 }, { 0x8CB4, 0xCFFE }, { 0x8CB6, 0xF8BF }, { 0x8CB7, 0xD8E2 }, { 0x8CB8, 0xD3E8 }, 
-	{ 0x8CBB, 0xDEA8 }, { 0x8CBC, 0xF4E4 }, { 0x8CBD, 0xECC2 }, { 0x8CBF, 0xD9F5 }, { 0x8CC0, 0xF9C5 }, { 0x8CC1, 0xDDD3 }, { 0x8CC2, 0xD6F1 }, { 0x8CC3, 0xECFC }, 
-	{ 0x8CC4, 0xFCF0 }, { 0x8CC7, 0xEDC0 }, { 0x8CC8, 0xCAB9 }, { 0x8CCA, 0xEEE4 }, { 0x8CD1, 0xF2E1 }, { 0x8CD3, 0xDEB9 }, { 0x8CDA, 0xD6F2 }, { 0x8CDC, 0xDEF4 }, 
-	{ 0x8CDE, 0xDFDB }, { 0x8CE0, 0xDBD3 }, { 0x8CE2, 0xFAE7 }, { 0x8CE3, 0xD8E3 }, { 0x8CE4, 0xF4C1 }, { 0x8CE6, 0xDDB7 }, { 0x8CEA, 0xF2F5 }, { 0x8CED, 0xD4AE }, 
-	{ 0x8CF4, 0xD6F3 }, { 0x8CFB, 0xDDB8 }, { 0x8CFC, 0xCFC5 }, { 0x8CFD, 0xDFDF }, { 0x8D04, 0xF2BE }, { 0x8D05, 0xF6A1 }, { 0x8D07, 0xEBCB }, { 0x8D08, 0xF1FC }, 
-	{ 0x8D0A, 0xF3C7 }, { 0x8D0D, 0xE0EB }, { 0x8D13, 0xEDFC }, { 0x8D16, 0xE1DB }, { 0x8D64, 0xEEE5 }, { 0x8D66, 0xDEF5 }, { 0x8D6B, 0xFAD3 }, { 0x8D70, 0xF1CB }, 
-	{ 0x8D73, 0xD0AF }, { 0x8D74, 0xDDB9 }, { 0x8D77, 0xD1C3 }, { 0x8D85, 0xF5B1 }, { 0x8D8A, 0xEAC6 }, { 0x8D99, 0xF0E1 }, { 0x8DA3, 0xF6AC }, { 0x8DA8, 0xF5D9 }, 
-	{ 0x8DB3, 0xF0EB }, { 0x8DBA, 0xDDBA }, { 0x8DBE, 0xF2BF }, { 0x8DC6, 0xF7C5 }, { 0x8DCB, 0xDBA2 }, { 0x8DCC, 0xF2F6 }, { 0x8DCF, 0xCABA }, { 0x8DDB, 0xF7F5 }, 
-	{ 0x8DDD, 0xCBE5 }, { 0x8DE1, 0xEEE6 }, { 0x8DE3, 0xE0D3 }, { 0x8DE8, 0xCEA5 }, { 0x8DEF, 0xD6D8 }, { 0x8DF3, 0xD4AF }, { 0x8E0A, 0xE9C9 }, { 0x8E0F, 0xD3CE }, 
-	{ 0x8E10, 0xF4C2 }, { 0x8E1E, 0xCBE6 }, { 0x8E2A, 0xF1A1 }, { 0x8E30, 0xEBB2 }, { 0x8E35, 0xF1A2 }, { 0x8E42, 0xEBB3 }, { 0x8E44, 0xF0B4 }, { 0x8E47, 0xCBF4 }, 
-	{ 0x8E48, 0xD4B0 }, { 0x8E49, 0xF3B2 }, { 0x8E4A, 0xFBB7 }, { 0x8E59, 0xF5EC }, { 0x8E5F, 0xEEE7 }, { 0x8E60, 0xF4B2 }, { 0x8E74, 0xF5ED }, { 0x8E76, 0xCFF3 }, 
-	{ 0x8E81, 0xF0E2 }, { 0x8E87, 0xEECE }, { 0x8E8A, 0xF1CC }, { 0x8E8D, 0xE5B8 }, { 0x8EAA, 0xD7F5 }, { 0x8EAB, 0xE3F3 }, { 0x8EAC, 0xCFE5 }, { 0x8EC0, 0xCFC6 }, 
-	{ 0x8ECA, 0xF3B3 }, { 0x8ECB, 0xE4D8 }, { 0x8ECC, 0xCFF9 }, { 0x8ECD, 0xCFDA }, { 0x8ED2, 0xFACD }, { 0x8EDF, 0xE6E3 }, { 0x8EEB, 0xF2E2 }, { 0x8EF8, 0xF5EE }, 
-	{ 0x8EFB, 0xCABB }, { 0x8EFE, 0xE3DC }, { 0x8F03, 0xCEF2 }, { 0x8F05, 0xD6D9 }, { 0x8F09, 0xEEB0 }, { 0x8F12, 0xF4E5 }, { 0x8F13, 0xD8C2 }, { 0x8F14, 0xDCD0 }, 
-	{ 0x8F15, 0xCCEE }, { 0x8F1B, 0xD5E0 }, { 0x8F1C, 0xF6CA }, { 0x8F1D, 0xFDCA }, { 0x8F1E, 0xD8D6 }, { 0x8F1F, 0xF4CF }, { 0x8F26, 0xD6A6 }, { 0x8F27, 0xDCBE }, 
-	{ 0x8F29, 0xDBD4 }, { 0x8F2A, 0xD7C7 }, { 0x8F2F, 0xF2FE }, { 0x8F33, 0xF1CD }, { 0x8F38, 0xE2C3 }, { 0x8F39, 0xDCDE }, { 0x8F3B, 0xDCDF }, { 0x8F3E, 0xEFAD }, 
-	{ 0x8F3F, 0xE6AB }, { 0x8F44, 0xF9DD }, { 0x8F45, 0xEABF }, { 0x8F49, 0xEFAE }, { 0x8F4D, 0xF4D0 }, { 0x8F4E, 0xCEF3 }, { 0x8F5D, 0xE6AC }, { 0x8F5F, 0xCEDE }, 
-	{ 0x8F62, 0xD5F9 }, { 0x8F9B, 0xE3F4 }, { 0x8F9C, 0xCDD0 }, { 0x8FA3, 0xD5B8 }, { 0x8FA6, 0xF7FD }, { 0x8FA8, 0xDCA9 }, { 0x8FAD, 0xDEF6 }, { 0x8FAF, 0xDCAA }, 
-	{ 0x8FB0, 0xF2E3 }, { 0x8FB1, 0xE9B4 }, { 0x8FB2, 0xD2DC }, { 0x8FC2, 0xE9E6 }, { 0x8FC5, 0xE3F6 }, { 0x8FCE, 0xE7CA }, { 0x8FD1, 0xD0CE }, { 0x8FD4, 0xDAF7 }, 
-	{ 0x8FE6, 0xCABC }, { 0x8FEA, 0xEEE8 }, { 0x8FEB, 0xDADE }, { 0x8FED, 0xF2F7 }, { 0x8FF0, 0xE2FB }, { 0x8FF2, 0xCCA6 }, { 0x8FF7, 0xDABB }, { 0x8FF9, 0xEEE9 }, 
-	{ 0x8FFD, 0xF5DA }, { 0x9000, 0xF7DC }, { 0x9001, 0xE1EA }, { 0x9002, 0xCEC1 }, { 0x9003, 0xD4B1 }, { 0x9005, 0xFDB1 }, { 0x9006, 0xE6BD }, { 0x9008, 0xFBAD }, 
-	{ 0x900B, 0xF8E7 }, { 0x900D, 0xE1CE }, { 0x900F, 0xF7E2 }, { 0x9010, 0xF5EF }, { 0x9011, 0xCFC7 }, { 0x9014, 0xD4B2 }, { 0x9015, 0xCCEF }, { 0x9017, 0xD4E8 }, 
-	{ 0x9019, 0xEECF }, { 0x901A, 0xF7D7 }, { 0x901D, 0xE0A6 }, { 0x901E, 0xD6C1 }, { 0x901F, 0xE1DC }, { 0x9020, 0xF0E3 }, { 0x9021, 0xF1E4 }, { 0x9022, 0xDCF1 }, 
-	{ 0x9023, 0xD6A7 }, { 0x902E, 0xF4F5 }, { 0x9031, 0xF1CE }, { 0x9032, 0xF2E4 }, { 0x9035, 0xD0B0 }, { 0x9038, 0xECEF }, { 0x903C, 0xF9BA }, { 0x903E, 0xEBB5 }, 
-	{ 0x9041, 0xD4ED }, { 0x9042, 0xE2C4 }, { 0x9047, 0xE9E7 }, { 0x904A, 0xEBB4 }, { 0x904B, 0xEAA1 }, { 0x904D, 0xF8BC }, { 0x904E, 0xCEA6 }, { 0x9050, 0xF9C6 }, 
-	{ 0x9051, 0xFCDA }, { 0x9053, 0xD4B3 }, { 0x9054, 0xD3B9 }, { 0x9055, 0xEADE }, { 0x9059, 0xE9AB }, { 0x905C, 0xE1E1 }, { 0x905D, 0xD3CF }, { 0x905E, 0xF4F6 }, 
-	{ 0x9060, 0xEAC0 }, { 0x9061, 0xE1CF }, { 0x9063, 0xCCBA }, { 0x9069, 0xEEEA }, { 0x906D, 0xF0E4 }, { 0x906E, 0xF3B4 }, { 0x906F, 0xD4EE }, { 0x9072, 0xF2C0 }, 
-	{ 0x9075, 0xF1E5 }, { 0x9077, 0xF4C3 }, { 0x9078, 0xE0D4 }, { 0x907A, 0xEBB6 }, { 0x907C, 0xD7A1 }, { 0x907D, 0xCBE8 }, { 0x907F, 0xF9AD }, { 0x9080, 0xE9AD }, 
-	{ 0x9081, 0xD8E4 }, { 0x9082, 0xFAB3 }, { 0x9083, 0xE2C5 }, { 0x9084, 0xFCBD }, { 0x9087, 0xECC4 }, { 0x9088, 0xD8B1 }, { 0x908A, 0xDCAB }, { 0x908F, 0xD5A4 }, 
-	{ 0x9091, 0xEBE9 }, { 0x9095, 0xE8BB }, { 0x9099, 0xD8D7 }, { 0x90A2, 0xFBAE }, { 0x90A3, 0xD1E1 }, { 0x90A6, 0xDBC0 }, { 0x90A8, 0xF5BE }, { 0x90AA, 0xDEF7 }, 
-	{ 0x90AF, 0xCAFB }, { 0x90B0, 0xF7C6 }, { 0x90B1, 0xCFC8 }, { 0x90B5, 0xE1D0 }, { 0x90B8, 0xEED0 }, { 0x90C1, 0xE9F4 }, { 0x90CA, 0xCEF4 }, { 0x90DE, 0xD5CD }, 
-	{ 0x90E1, 0xCFDB }, { 0x90E8, 0xDDBB }, { 0x90ED, 0xCEAC }, { 0x90F5, 0xE9E8 }, { 0x90FD, 0xD4B4 }, { 0x9102, 0xE4C7 }, { 0x9112, 0xF5DB }, { 0x9115, 0xFAC1 }, 
-	{ 0x9119, 0xDEA9 }, { 0x9127, 0xD4F8 }, { 0x912D, 0xEFF7 }, { 0x9132, 0xD3B3 }, { 0x9149, 0xEBB7 }, { 0x914A, 0xEFF8 }, { 0x914B, 0xF5DC }, { 0x914C, 0xEDCC }, 
-	{ 0x914D, 0xDBD5 }, { 0x914E, 0xF1CF }, { 0x9152, 0xF1D0 }, { 0x9162, 0xF5B2 }, { 0x9169, 0xD9AE }, { 0x916A, 0xD5AC }, { 0x916C, 0xE2C6 }, { 0x9175, 0xFDA3 }, 
-	{ 0x9177, 0xFBE5 }, { 0x9178, 0xDFAB }, { 0x9187, 0xE2F5 }, { 0x9189, 0xF6AD }, { 0x918B, 0xF5B3 }, { 0x918D, 0xF0B5 }, { 0x9192, 0xE1A5 }, { 0x919C, 0xF5DD }, 
-	{ 0x91AB, 0xECA2 }, { 0x91AC, 0xEDFD }, { 0x91AE, 0xF5B4 }, { 0x91AF, 0xFBB8 }, { 0x91B1, 0xDBA3 }, { 0x91B4, 0xD6CA }, { 0x91B5, 0xCBD9 }, { 0x91C0, 0xE5D4 }, 
-	{ 0x91C7, 0xF3FA }, { 0x91C9, 0xEBB8 }, { 0x91CB, 0xE0B7 }, { 0x91CC, 0xD7EC }, { 0x91CD, 0xF1EC }, { 0x91CE, 0xE5AF }, { 0x91CF, 0xD5E1 }, { 0x91D0, 0xD7ED }, 
-	{ 0x91D1, 0xD1D1 }, { 0x91D7, 0xE1F2 }, { 0x91D8, 0xEFF9 }, { 0x91DC, 0xDDBC }, { 0x91DD, 0xF6DC }, { 0x91E3, 0xF0E5 }, { 0x91E7, 0xF4C4 }, { 0x91EA, 0xE9E9 }, 
-	{ 0x91F5, 0xF3FB }, { 0x920D, 0xD4EF }, { 0x9210, 0xCCA2 }, { 0x9211, 0xF7FE }, { 0x9212, 0xDFBC }, { 0x9217, 0xEBCD }, { 0x921E, 0xD0B7 }, { 0x9234, 0xD6C2 }, 
-	{ 0x923A, 0xE8AD }, { 0x923F, 0xEFAF }, { 0x9240, 0xCBA5 }, { 0x9245, 0xCBE9 }, { 0x9249, 0xFAE8 }, { 0x9257, 0xCCC6 }, { 0x925B, 0xE6E7 }, { 0x925E, 0xEAC7 }, 
-	{ 0x9262, 0xDBA4 }, { 0x9264, 0xCFC9 }, { 0x9265, 0xE2FC }, { 0x9266, 0xEFFA }, { 0x9280, 0xEBDE }, { 0x9283, 0xF5C8 }, { 0x9285, 0xD4DE }, { 0x9291, 0xE0D5 }, 
-	{ 0x9293, 0xEFB0 }, { 0x9296, 0xE2C7 }, { 0x9298, 0xD9AF }, { 0x929C, 0xF9E7 }, { 0x92B3, 0xE7E5 }, { 0x92B6, 0xCFCA }, { 0x92B7, 0xE1D1 }, { 0x92B9, 0xE2C8 }, 
-	{ 0x92CC, 0xEFFB }, { 0x92CF, 0xFAF9 }, { 0x92D2, 0xDCF2 }, { 0x92E4, 0xE0A7 }, { 0x92EA, 0xF8E8 }, { 0x92F8, 0xCBEA }, { 0x92FC, 0xCBBC }, { 0x9304, 0xD6E2 }, 
-	{ 0x9310, 0xF5DE }, { 0x9318, 0xF5DF }, { 0x931A, 0xEEB6 }, { 0x931E, 0xE2F6 }, { 0x931F, 0xD3CA }, { 0x9320, 0xEFFC }, { 0x9321, 0xD1C4 }, { 0x9322, 0xEFB1 }, 
-	{ 0x9324, 0xD1C5 }, { 0x9326, 0xD0DE }, { 0x9328, 0xD9E1 }, { 0x932B, 0xE0B8 }, { 0x932E, 0xCDD1 }, { 0x932F, 0xF3B9 }, { 0x9348, 0xE7CC }, { 0x934A, 0xD6A8 }, 
-	{ 0x934B, 0xCEA7 }, { 0x934D, 0xD4B5 }, { 0x9354, 0xE4C8 }, { 0x935B, 0xD3B4 }, { 0x936E, 0xEBB9 }, { 0x9375, 0xCBF5 }, { 0x937C, 0xF6DD }, { 0x937E, 0xF1A3 }, 
-	{ 0x938C, 0xCCC7 }, { 0x9394, 0xE9CA }, { 0x9396, 0xE1F0 }, { 0x939A, 0xF5E0 }, { 0x93A3, 0xFBAF }, { 0x93A7, 0xCBD1 }, { 0x93AC, 0xFBE0 }, { 0x93AD, 0xF2E5 }, 
-	{ 0x93B0, 0xECF0 }, { 0x93C3, 0xF0EC }, { 0x93D1, 0xEEEB }, { 0x93DE, 0xE9CB }, { 0x93E1, 0xCCF0 }, { 0x93E4, 0xD7AF }, { 0x93F6, 0xF3A1 }, { 0x9404, 0xFCF5 }, 
-	{ 0x9418, 0xF1A4 }, { 0x9425, 0xE0D6 }, { 0x942B, 0xEFB2 }, { 0x9435, 0xF4D1 }, { 0x9438, 0xF7A1 }, { 0x9444, 0xF1D1 }, { 0x9451, 0xCAFC }, { 0x9452, 0xCAFD }, 
-	{ 0x945B, 0xCECE }, { 0x947D, 0xF3C8 }, { 0x947F, 0xF3BA }, { 0x9577, 0xEDFE }, { 0x9580, 0xDAA6 }, { 0x9583, 0xE0EC }, { 0x9589, 0xF8CD }, { 0x958B, 0xCBD2 }, 
-	{ 0x958F, 0xEBCE }, { 0x9591, 0xF9D8 }, { 0x9592, 0xF9D9 }, { 0x9593, 0xCAE0 }, { 0x9594, 0xDACA }, { 0x9598, 0xCBA6 }, { 0x95A3, 0xCAC8 }, { 0x95A4, 0xF9EE }, 
-	{ 0x95A5, 0xDBEC }, { 0x95A8, 0xD0B1 }, { 0x95AD, 0xD5EF }, { 0x95B1, 0xE6F3 }, { 0x95BB, 0xE7A2 }, { 0x95BC, 0xE4D9 }, { 0x95C7, 0xE4E1 }, { 0x95CA, 0xFCC4 }, 
-	{ 0x95D4, 0xF9EF }, { 0x95D5, 0xCFF4 }, { 0x95D6, 0xF7E6 }, { 0x95DC, 0xCEBC }, { 0x95E1, 0xF4C5 }, { 0x95E2, 0xDCA3 }, { 0x961C, 0xDDBD }, { 0x9621, 0xF4C6 }, 
-	{ 0x962A, 0xF8A1 }, { 0x962E, 0xE8D6 }, { 0x9632, 0xDBC1 }, { 0x963B, 0xF0E6 }, { 0x963F, 0xE4B9 }, { 0x9640, 0xF6ED }, { 0x9642, 0xF9AE }, { 0x9644, 0xDDBE }, 
-	{ 0x964B, 0xD7B0 }, { 0x964C, 0xD8E8 }, { 0x964D, 0xCBBD }, { 0x9650, 0xF9DA }, { 0x965B, 0xF8CE }, { 0x965C, 0xF9F0 }, { 0x965D, 0xE0ED }, { 0x965E, 0xE3B3 }, 
-	{ 0x965F, 0xF4B3 }, { 0x9662, 0xEAC2 }, { 0x9663, 0xF2E6 }, { 0x9664, 0xF0B6 }, { 0x966A, 0xDBD6 }, { 0x9670, 0xEBE4 }, { 0x9673, 0xF2E7 }, { 0x9675, 0xD7D5 }, 
-	{ 0x9676, 0xD4B6 }, { 0x9677, 0xF9E8 }, { 0x9678, 0xD7C1 }, { 0x967D, 0xE5D5 }, { 0x9685, 0xE9EA }, { 0x9686, 0xD7CC }, { 0x968A, 0xD3E9 }, { 0x968B, 0xE2C9 }, 
-	{ 0x968D, 0xFCDB }, { 0x968E, 0xCDAD }, { 0x9694, 0xCCB0 }, { 0x9695, 0xEAA2 }, { 0x9698, 0xE4F6 }, { 0x9699, 0xD0C0 }, { 0x969B, 0xF0B7 }, { 0x969C, 0xEEA1 }, 
-	{ 0x96A3, 0xD7F6 }, { 0x96A7, 0xE2CA }, { 0x96A8, 0xE2CB }, { 0x96AA, 0xFACF }, { 0x96B1, 0xEBDF }, { 0x96B7, 0xD6CB }, { 0x96BB, 0xF4B4 }, { 0x96C0, 0xEDCD }, 
-	{ 0x96C1, 0xE4D2 }, { 0x96C4, 0xEAA9 }, { 0x96C5, 0xE4BA }, { 0x96C6, 0xF3A2 }, { 0x96C7, 0xCDD2 }, { 0x96C9, 0xF6CB }, { 0x96CB, 0xF1E6 }, { 0x96CC, 0xEDC1 }, 
-	{ 0x96CD, 0xE8BC }, { 0x96CE, 0xEED1 }, { 0x96D5, 0xF0E7 }, { 0x96D6, 0xE2CC }, { 0x96D9, 0xE4AA }, { 0x96DB, 0xF5E1 }, { 0x96DC, 0xEDDA }, { 0x96E2, 0xD7EE }, 
-	{ 0x96E3, 0xD1F1 }, { 0x96E8, 0xE9EB }, { 0x96E9, 0xE9EC }, { 0x96EA, 0xE0E4 }, { 0x96EF, 0xDAA7 }, { 0x96F0, 0xDDD4 }, { 0x96F2, 0xEAA3 }, { 0x96F6, 0xD6C3 }, 
-	{ 0x96F7, 0xD6F4 }, { 0x96F9, 0xDADF }, { 0x96FB, 0xEFB3 }, { 0x9700, 0xE2CD }, { 0x9706, 0xEFFD }, { 0x9707, 0xF2E8 }, { 0x9711, 0xEFC5 }, { 0x9713, 0xE7E7 }, 
-	{ 0x9716, 0xD7FD }, { 0x9719, 0xE7CE }, { 0x971C, 0xDFDC }, { 0x971E, 0xF9C7 }, { 0x9727, 0xD9F6 }, { 0x9730, 0xDFAC }, { 0x9732, 0xD6DA }, { 0x9739, 0xDCA4 }, 
-	{ 0x973D, 0xF0B8 }, { 0x9742, 0xD5FA }, { 0x9744, 0xE4F7 }, { 0x9748, 0xD6C4 }, { 0x9751, 0xF4EC }, { 0x9756, 0xEFFE }, { 0x975C, 0xF0A1 }, { 0x975E, 0xDEAA }, 
-	{ 0x9761, 0xDABC }, { 0x9762, 0xD8FC }, { 0x9769, 0xFAD4 }, { 0x976D, 0xECE5 }, { 0x9774, 0xFCA8 }, { 0x9777, 0xECE6 }, { 0x977A, 0xD8CB }, { 0x978B, 0xFBB9 }, 
-	{ 0x978D, 0xE4D3 }, { 0x978F, 0xCDF9 }, { 0x97A0, 0xCFD3 }, { 0x97A8, 0xCAEA }, { 0x97AB, 0xCFD4 }, { 0x97AD, 0xF8BD }, { 0x97C6, 0xF4C7 }, { 0x97CB, 0xEADF }, 
-	{ 0x97D3, 0xF9DB }, { 0x97DC, 0xD4B7 }, { 0x97F3, 0xEBE5 }, { 0x97F6, 0xE1D2 }, { 0x97FB, 0xEAA4 }, { 0x97FF, 0xFAC2 }, { 0x9800, 0xFBE1 }, { 0x9801, 0xFAED }, 
-	{ 0x9802, 0xF0A2 }, { 0x9803, 0xCCF1 }, { 0x9805, 0xFAA3 }, { 0x9806, 0xE2F7 }, { 0x9808, 0xE2CE }, { 0x980A, 0xE9F5 }, { 0x980C, 0xE1EB }, { 0x9810, 0xE7E8 }, 
-	{ 0x9811, 0xE8D7 }, { 0x9812, 0xDAF8 }, { 0x9813, 0xD4CB }, { 0x9817, 0xF7F6 }, { 0x9818, 0xD6C5 }, { 0x982D, 0xD4E9 }, { 0x9830, 0xFAFA }, { 0x9838, 0xCCF2 }, 
-	{ 0x9839, 0xF7DD }, { 0x983B, 0xDEBA }, { 0x9846, 0xCEA8 }, { 0x984C, 0xF0B9 }, { 0x984D, 0xE4FE }, { 0x984E, 0xE4C9 }, { 0x9854, 0xE4D4 }, { 0x9858, 0xEAC3 }, 
-	{ 0x985A, 0xEFB4 }, { 0x985E, 0xD7BE }, { 0x9865, 0xFBE2 }, { 0x9867, 0xCDD3 }, { 0x986B, 0xEFB5 }, { 0x986F, 0xFAE9 }, { 0x98A8, 0xF9A6 }, { 0x98AF, 0xDFBD }, 
-	{ 0x98B1, 0xF7C7 }, { 0x98C4, 0xF8FD }, { 0x98C7, 0xF8FC }, { 0x98DB, 0xDEAB }, { 0x98DC, 0xDBE8 }, { 0x98DF, 0xE3DD }, { 0x98E1, 0xE1E2 }, { 0x98E2, 0xD1C6 }, 
-	{ 0x98ED, 0xF6D0 }, { 0x98EE, 0xEBE6 }, { 0x98EF, 0xDAF9 }, { 0x98F4, 0xECC7 }, { 0x98FC, 0xDEF8 }, { 0x98FD, 0xF8E9 }, { 0x98FE, 0xE3DE }, { 0x9903, 0xCEF5 }, 
-	{ 0x9909, 0xFAC3 }, { 0x990A, 0xE5D7 }, { 0x990C, 0xECC8 }, { 0x9910, 0xF3C9 }, { 0x9913, 0xE4BB }, { 0x9918, 0xE6AE }, { 0x991E, 0xEFB6 }, { 0x9920, 0xDCBF }, 
-	{ 0x9928, 0xCEBD }, { 0x9945, 0xD8C3 }, { 0x9949, 0xD0CF }, { 0x994B, 0xCFFA }, { 0x994C, 0xF3CA }, { 0x994D, 0xE0D7 }, { 0x9951, 0xD1C7 }, { 0x9952, 0xE9AE }, 
-	{ 0x9954, 0xE8BD }, { 0x9957, 0xFAC4 }, { 0x9996, 0xE2CF }, { 0x9999, 0xFAC5 }, { 0x999D, 0xF9B8 }, { 0x99A5, 0xDCE0 }, { 0x99A8, 0xFBB0 }, { 0x99AC, 0xD8A9 }, 
-	{ 0x99AD, 0xE5DF }, { 0x99AE, 0xF9A7 }, { 0x99B1, 0xF6EE }, { 0x99B3, 0xF6CC }, { 0x99B4, 0xE2F8 }, { 0x99B9, 0xECF1 }, { 0x99C1, 0xDAE0 }, { 0x99D0, 0xF1D2 }, 
-	{ 0x99D1, 0xD2CC }, { 0x99D2, 0xCFCB }, { 0x99D5, 0xCABD }, { 0x99D9, 0xDDBF }, { 0x99DD, 0xF6EF }, { 0x99DF, 0xDEF9 }, { 0x99ED, 0xFAB4 }, { 0x99F1, 0xD5AD }, 
-	{ 0x99FF, 0xF1E7 }, { 0x9A01, 0xDEBE }, { 0x9A08, 0xDCC0 }, { 0x9A0E, 0xD1C8 }, { 0x9A0F, 0xD1C9 }, { 0x9A19, 0xF8BE }, { 0x9A2B, 0xCBF6 }, { 0x9A30, 0xD4F9 }, 
-	{ 0x9A36, 0xF5E2 }, { 0x9A37, 0xE1D3 }, { 0x9A40, 0xD8E9 }, { 0x9A43, 0xF8FE }, { 0x9A45, 0xCFCC }, { 0x9A4D, 0xFDA4 }, { 0x9A55, 0xCEF6 }, { 0x9A57, 0xFAD0 }, 
-	{ 0x9A5A, 0xCCF3 }, { 0x9A5B, 0xE6BE }, { 0x9A5F, 0xF6AE }, { 0x9A62, 0xD5F0 }, { 0x9A65, 0xD1CA }, { 0x9A69, 0xFCBE }, { 0x9A6A, 0xD5F1 }, { 0x9AA8, 0xCDE9 }, 
-	{ 0x9AB8, 0xFAB5 }, { 0x9AD3, 0xE2D0 }, { 0x9AD4, 0xF4F7 }, { 0x9AD8, 0xCDD4 }, { 0x9AE5, 0xE7A3 }, { 0x9AEE, 0xDBA5 }, { 0x9B1A, 0xE2D1 }, { 0x9B27, 0xD7A2 }, 
-	{ 0x9B2A, 0xF7E3 }, { 0x9B31, 0xEAA6 }, { 0x9B3C, 0xD0A1 }, { 0x9B41, 0xCEDA }, { 0x9B42, 0xFBEB }, { 0x9B43, 0xDBA6 }, { 0x9B44, 0xDBDE }, { 0x9B45, 0xD8E5 }, 
-	{ 0x9B4F, 0xEAE0 }, { 0x9B54, 0xD8AA }, { 0x9B5A, 0xE5E0 }, { 0x9B6F, 0xD6DB }, { 0x9B8E, 0xEFC6 }, { 0x9B91, 0xF8EA }, { 0x9B9F, 0xE4D5 }, { 0x9BAB, 0xCEF7 }, 
-	{ 0x9BAE, 0xE0D8 }, { 0x9BC9, 0xD7EF }, { 0x9BD6, 0xF4ED }, { 0x9BE4, 0xCDE6 }, { 0x9BE8, 0xCCF4 }, { 0x9C0D, 0xF5E3 }, { 0x9C10, 0xE4CA }, { 0x9C12, 0xDCE1 }, 
-	{ 0x9C15, 0xF9C8 }, { 0x9C25, 0xFCBF }, { 0x9C32, 0xE8A7 }, { 0x9C3B, 0xD8C4 }, { 0x9C47, 0xCBBE }, { 0x9C49, 0xDCAE }, { 0x9C57, 0xD7F7 }, { 0x9CE5, 0xF0E8 }, 
-	{ 0x9CE7, 0xDDC0 }, { 0x9CE9, 0xCFCD }, { 0x9CF3, 0xDCF3 }, { 0x9CF4, 0xD9B0 }, { 0x9CF6, 0xE6E9 }, { 0x9D09, 0xE4BC }, { 0x9D1B, 0xEAC4 }, { 0x9D26, 0xE4EC }, 
-	{ 0x9D28, 0xE4E5 }, { 0x9D3B, 0xFBF8 }, { 0x9D51, 0xCCBB }, { 0x9D5D, 0xE4BD }, { 0x9D60, 0xCDDC }, { 0x9D61, 0xD9F7 }, { 0x9D6C, 0xDDDF }, { 0x9D72, 0xEDCE }, 
-	{ 0x9DA9, 0xD9D0 }, { 0x9DAF, 0xE5A3 }, { 0x9DB4, 0xF9CD }, { 0x9DC4, 0xCDAE }, { 0x9DD7, 0xCFCE }, { 0x9DF2, 0xF6AF }, { 0x9DF8, 0xFDD3 }, { 0x9DF9, 0xEBED }, 
-	{ 0x9DFA, 0xD6DC }, { 0x9E1A, 0xE5A4 }, { 0x9E1E, 0xD5B6 }, { 0x9E75, 0xD6DD }, { 0x9E79, 0xF9E9 }, { 0x9E7D, 0xE7A4 }, { 0x9E7F, 0xD6E3 }, { 0x9E92, 0xD1CB }, 
-	{ 0x9E93, 0xD6E4 }, { 0x9E97, 0xD5F2 }, { 0x9E9D, 0xDEFA }, { 0x9E9F, 0xD7F8 }, { 0x9EA5, 0xD8EA }, { 0x9EB4, 0xCFD5 }, { 0x9EB5, 0xD8FD }, { 0x9EBB, 0xD8AB }, 
-	{ 0x9EBE, 0xFDCB }, { 0x9EC3, 0xFCDC }, { 0x9ECD, 0xE0A8 }, { 0x9ECE, 0xD5F3 }, { 0x9ED1, 0xFDD9 }, { 0x9ED4, 0xCCA3 }, { 0x9ED8, 0xD9F9 }, { 0x9EDB, 0xD3EA }, 
-	{ 0x9EDC, 0xF5F5 }, { 0x9EDE, 0xEFC7 }, { 0x9EE8, 0xD3DA }, { 0x9EF4, 0xDABD }, { 0x9F07, 0xE8A8 }, { 0x9F08, 0xDCAF }, { 0x9F0E, 0xF0A3 }, { 0x9F13, 0xCDD5 }, 
-	{ 0x9F20, 0xE0A9 }, { 0x9F3B, 0xDEAC }, { 0x9F4A, 0xF0BA }, { 0x9F4B, 0xEEB1 }, { 0x9F4E, 0xEEB2 }, { 0x9F52, 0xF6CD }, { 0x9F5F, 0xEED2 }, { 0x9F61, 0xD6C6 }, 
-	{ 0x9F67, 0xE0E5 }, { 0x9F6A, 0xF3BB }, { 0x9F6C, 0xE5E1 }, { 0x9F77, 0xE4CB }, { 0x9F8D, 0xD7A3 }, { 0x9F90, 0xDBC2 }, { 0x9F95, 0xCAFE }, { 0x9F9C, 0xCFCF }, 
-	{ 0xAC00, 0xB0A1 }, { 0xAC01, 0xB0A2 }, { 0xAC04, 0xB0A3 }, { 0xAC07, 0xB0A4 }, { 0xAC08, 0xB0A5 }, { 0xAC09, 0xB0A6 }, { 0xAC0A, 0xB0A7 }, { 0xAC10, 0xB0A8 }, 
-	{ 0xAC11, 0xB0A9 }, { 0xAC12, 0xB0AA }, { 0xAC13, 0xB0AB }, { 0xAC14, 0xB0AC }, { 0xAC15, 0xB0AD }, { 0xAC16, 0xB0AE }, { 0xAC17, 0xB0AF }, { 0xAC19, 0xB0B0 }, 
-	{ 0xAC1A, 0xB0B1 }, { 0xAC1B, 0xB0B2 }, { 0xAC1C, 0xB0B3 }, { 0xAC1D, 0xB0B4 }, { 0xAC20, 0xB0B5 }, { 0xAC24, 0xB0B6 }, { 0xAC2C, 0xB0B7 }, { 0xAC2D, 0xB0B8 }, 
-	{ 0xAC2F, 0xB0B9 }, { 0xAC30, 0xB0BA }, { 0xAC31, 0xB0BB }, { 0xAC38, 0xB0BC }, { 0xAC39, 0xB0BD }, { 0xAC3C, 0xB0BE }, { 0xAC40, 0xB0BF }, { 0xAC4B, 0xB0C0 }, 
-	{ 0xAC4D, 0xB0C1 }, { 0xAC54, 0xB0C2 }, { 0xAC58, 0xB0C3 }, { 0xAC5C, 0xB0C4 }, { 0xAC70, 0xB0C5 }, { 0xAC71, 0xB0C6 }, { 0xAC74, 0xB0C7 }, { 0xAC77, 0xB0C8 }, 
-	{ 0xAC78, 0xB0C9 }, { 0xAC7A, 0xB0CA }, { 0xAC80, 0xB0CB }, { 0xAC81, 0xB0CC }, { 0xAC83, 0xB0CD }, { 0xAC84, 0xB0CE }, { 0xAC85, 0xB0CF }, { 0xAC86, 0xB0D0 }, 
-	{ 0xAC89, 0xB0D1 }, { 0xAC8A, 0xB0D2 }, { 0xAC8B, 0xB0D3 }, { 0xAC8C, 0xB0D4 }, { 0xAC90, 0xB0D5 }, { 0xAC94, 0xB0D6 }, { 0xAC9C, 0xB0D7 }, { 0xAC9D, 0xB0D8 }, 
-	{ 0xAC9F, 0xB0D9 }, { 0xACA0, 0xB0DA }, { 0xACA1, 0xB0DB }, { 0xACA8, 0xB0DC }, { 0xACA9, 0xB0DD }, { 0xACAA, 0xB0DE }, { 0xACAC, 0xB0DF }, { 0xACAF, 0xB0E0 }, 
-	{ 0xACB0, 0xB0E1 }, { 0xACB8, 0xB0E2 }, { 0xACB9, 0xB0E3 }, { 0xACBB, 0xB0E4 }, { 0xACBC, 0xB0E5 }, { 0xACBD, 0xB0E6 }, { 0xACC1, 0xB0E7 }, { 0xACC4, 0xB0E8 }, 
-	{ 0xACC8, 0xB0E9 }, { 0xACCC, 0xB0EA }, { 0xACD5, 0xB0EB }, { 0xACD7, 0xB0EC }, { 0xACE0, 0xB0ED }, { 0xACE1, 0xB0EE }, { 0xACE4, 0xB0EF }, { 0xACE7, 0xB0F0 }, 
-	{ 0xACE8, 0xB0F1 }, { 0xACEA, 0xB0F2 }, { 0xACEC, 0xB0F3 }, { 0xACEF, 0xB0F4 }, { 0xACF0, 0xB0F5 }, { 0xACF1, 0xB0F6 }, { 0xACF3, 0xB0F7 }, { 0xACF5, 0xB0F8 }, 
-	{ 0xACF6, 0xB0F9 }, { 0xACFC, 0xB0FA }, { 0xACFD, 0xB0FB }, { 0xAD00, 0xB0FC }, { 0xAD04, 0xB0FD }, { 0xAD06, 0xB0FE }, { 0xAD0C, 0xB1A1 }, { 0xAD0D, 0xB1A2 }, 
-	{ 0xAD0F, 0xB1A3 }, { 0xAD11, 0xB1A4 }, { 0xAD18, 0xB1A5 }, { 0xAD1C, 0xB1A6 }, { 0xAD20, 0xB1A7 }, { 0xAD29, 0xB1A8 }, { 0xAD2C, 0xB1A9 }, { 0xAD2D, 0xB1AA }, 
-	{ 0xAD34, 0xB1AB }, { 0xAD35, 0xB1AC }, { 0xAD38, 0xB1AD }, { 0xAD3C, 0xB1AE }, { 0xAD44, 0xB1AF }, { 0xAD45, 0xB1B0 }, { 0xAD47, 0xB1B1 }, { 0xAD49, 0xB1B2 }, 
-	{ 0xAD50, 0xB1B3 }, { 0xAD54, 0xB1B4 }, { 0xAD58, 0xB1B5 }, { 0xAD61, 0xB1B6 }, { 0xAD63, 0xB1B7 }, { 0xAD6C, 0xB1B8 }, { 0xAD6D, 0xB1B9 }, { 0xAD70, 0xB1BA }, 
-	{ 0xAD73, 0xB1BB }, { 0xAD74, 0xB1BC }, { 0xAD75, 0xB1BD }, { 0xAD76, 0xB1BE }, { 0xAD7B, 0xB1BF }, { 0xAD7C, 0xB1C0 }, { 0xAD7D, 0xB1C1 }, { 0xAD7F, 0xB1C2 }, 
-	{ 0xAD81, 0xB1C3 }, { 0xAD82, 0xB1C4 }, { 0xAD88, 0xB1C5 }, { 0xAD89, 0xB1C6 }, { 0xAD8C, 0xB1C7 }, { 0xAD90, 0xB1C8 }, { 0xAD9C, 0xB1C9 }, { 0xAD9D, 0xB1CA }, 
-	{ 0xADA4, 0xB1CB }, { 0xADB7, 0xB1CC }, { 0xADC0, 0xB1CD }, { 0xADC1, 0xB1CE }, { 0xADC4, 0xB1CF }, { 0xADC8, 0xB1D0 }, { 0xADD0, 0xB1D1 }, { 0xADD1, 0xB1D2 }, 
-	{ 0xADD3, 0xB1D3 }, { 0xADDC, 0xB1D4 }, { 0xADE0, 0xB1D5 }, { 0xADE4, 0xB1D6 }, { 0xADF8, 0xB1D7 }, { 0xADF9, 0xB1D8 }, { 0xADFC, 0xB1D9 }, { 0xADFF, 0xB1DA }, 
-	{ 0xAE00, 0xB1DB }, { 0xAE01, 0xB1DC }, { 0xAE08, 0xB1DD }, { 0xAE09, 0xB1DE }, { 0xAE0B, 0xB1DF }, { 0xAE0D, 0xB1E0 }, { 0xAE14, 0xB1E1 }, { 0xAE30, 0xB1E2 }, 
-	{ 0xAE31, 0xB1E3 }, { 0xAE34, 0xB1E4 }, { 0xAE37, 0xB1E5 }, { 0xAE38, 0xB1E6 }, { 0xAE3A, 0xB1E7 }, { 0xAE40, 0xB1E8 }, { 0xAE41, 0xB1E9 }, { 0xAE43, 0xB1EA }, 
-	{ 0xAE45, 0xB1EB }, { 0xAE46, 0xB1EC }, { 0xAE4A, 0xB1ED }, { 0xAE4C, 0xB1EE }, { 0xAE4D, 0xB1EF }, { 0xAE4E, 0xB1F0 }, { 0xAE50, 0xB1F1 }, { 0xAE54, 0xB1F2 }, 
-	{ 0xAE56, 0xB1F3 }, { 0xAE5C, 0xB1F4 }, { 0xAE5D, 0xB1F5 }, { 0xAE5F, 0xB1F6 }, { 0xAE60, 0xB1F7 }, { 0xAE61, 0xB1F8 }, { 0xAE65, 0xB1F9 }, { 0xAE68, 0xB1FA }, 
-	{ 0xAE69, 0xB1FB }, { 0xAE6C, 0xB1FC }, { 0xAE70, 0xB1FD }, { 0xAE78, 0xB1FE }, { 0xAE79, 0xB2A1 }, { 0xAE7B, 0xB2A2 }, { 0xAE7C, 0xB2A3 }, { 0xAE7D, 0xB2A4 }, 
-	{ 0xAE84, 0xB2A5 }, { 0xAE85, 0xB2A6 }, { 0xAE8C, 0xB2A7 }, { 0xAEBC, 0xB2A8 }, { 0xAEBD, 0xB2A9 }, { 0xAEBE, 0xB2AA }, { 0xAEC0, 0xB2AB }, { 0xAEC4, 0xB2AC }, 
-	{ 0xAECC, 0xB2AD }, { 0xAECD, 0xB2AE }, { 0xAECF, 0xB2AF }, { 0xAED0, 0xB2B0 }, { 0xAED1, 0xB2B1 }, { 0xAED8, 0xB2B2 }, { 0xAED9, 0xB2B3 }, { 0xAEDC, 0xB2B4 }, 
-	{ 0xAEE8, 0xB2B5 }, { 0xAEEB, 0xB2B6 }, { 0xAEED, 0xB2B7 }, { 0xAEF4, 0xB2B8 }, { 0xAEF8, 0xB2B9 }, { 0xAEFC, 0xB2BA }, { 0xAF07, 0xB2BB }, { 0xAF08, 0xB2BC }, 
-	{ 0xAF0D, 0xB2BD }, { 0xAF10, 0xB2BE }, { 0xAF2C, 0xB2BF }, { 0xAF2D, 0xB2C0 }, { 0xAF30, 0xB2C1 }, { 0xAF32, 0xB2C2 }, { 0xAF34, 0xB2C3 }, { 0xAF3C, 0xB2C4 }, 
-	{ 0xAF3D, 0xB2C5 }, { 0xAF3F, 0xB2C6 }, { 0xAF41, 0xB2C7 }, { 0xAF42, 0xB2C8 }, { 0xAF43, 0xB2C9 }, { 0xAF48, 0xB2CA }, { 0xAF49, 0xB2CB }, { 0xAF50, 0xB2CC }, 
-	{ 0xAF5C, 0xB2CD }, { 0xAF5D, 0xB2CE }, { 0xAF64, 0xB2CF }, { 0xAF65, 0xB2D0 }, { 0xAF79, 0xB2D1 }, { 0xAF80, 0xB2D2 }, { 0xAF84, 0xB2D3 }, { 0xAF88, 0xB2D4 }, 
-	{ 0xAF90, 0xB2D5 }, { 0xAF91, 0xB2D6 }, { 0xAF95, 0xB2D7 }, { 0xAF9C, 0xB2D8 }, { 0xAFB8, 0xB2D9 }, { 0xAFB9, 0xB2DA }, { 0xAFBC, 0xB2DB }, { 0xAFC0, 0xB2DC }, 
-	{ 0xAFC7, 0xB2DD }, { 0xAFC8, 0xB2DE }, { 0xAFC9, 0xB2DF }, { 0xAFCB, 0xB2E0 }, { 0xAFCD, 0xB2E1 }, { 0xAFCE, 0xB2E2 }, { 0xAFD4, 0xB2E3 }, { 0xAFDC, 0xB2E4 }, 
-	{ 0xAFE8, 0xB2E5 }, { 0xAFE9, 0xB2E6 }, { 0xAFF0, 0xB2E7 }, { 0xAFF1, 0xB2E8 }, { 0xAFF4, 0xB2E9 }, { 0xAFF8, 0xB2EA }, { 0xB000, 0xB2EB }, { 0xB001, 0xB2EC }, 
-	{ 0xB004, 0xB2ED }, { 0xB00C, 0xB2EE }, { 0xB010, 0xB2EF }, { 0xB014, 0xB2F0 }, { 0xB01C, 0xB2F1 }, { 0xB01D, 0xB2F2 }, { 0xB028, 0xB2F3 }, { 0xB044, 0xB2F4 }, 
-	{ 0xB045, 0xB2F5 }, { 0xB048, 0xB2F6 }, { 0xB04A, 0xB2F7 }, { 0xB04C, 0xB2F8 }, { 0xB04E, 0xB2F9 }, { 0xB053, 0xB2FA }, { 0xB054, 0xB2FB }, { 0xB055, 0xB2FC }, 
-	{ 0xB057, 0xB2FD }, { 0xB059, 0xB2FE }, { 0xB05D, 0xB3A1 }, { 0xB07C, 0xB3A2 }, { 0xB07D, 0xB3A3 }, { 0xB080, 0xB3A4 }, { 0xB084, 0xB3A5 }, { 0xB08C, 0xB3A6 }, 
-	{ 0xB08D, 0xB3A7 }, { 0xB08F, 0xB3A8 }, { 0xB091, 0xB3A9 }, { 0xB098, 0xB3AA }, { 0xB099, 0xB3AB }, { 0xB09A, 0xB3AC }, { 0xB09C, 0xB3AD }, { 0xB09F, 0xB3AE }, 
-	{ 0xB0A0, 0xB3AF }, { 0xB0A1, 0xB3B0 }, { 0xB0A2, 0xB3B1 }, { 0xB0A8, 0xB3B2 }, { 0xB0A9, 0xB3B3 }, { 0xB0AB, 0xB3B4 }, { 0xB0AC, 0xB3B5 }, { 0xB0AD, 0xB3B6 }, 
-	{ 0xB0AE, 0xB3B7 }, { 0xB0AF, 0xB3B8 }, { 0xB0B1, 0xB3B9 }, { 0xB0B3, 0xB3BA }, { 0xB0B4, 0xB3BB }, { 0xB0B5, 0xB3BC }, { 0xB0B8, 0xB3BD }, { 0xB0BC, 0xB3BE }, 
-	{ 0xB0C4, 0xB3BF }, { 0xB0C5, 0xB3C0 }, { 0xB0C7, 0xB3C1 }, { 0xB0C8, 0xB3C2 }, { 0xB0C9, 0xB3C3 }, { 0xB0D0, 0xB3C4 }, { 0xB0D1, 0xB3C5 }, { 0xB0D4, 0xB3C6 }, 
-	{ 0xB0D8, 0xB3C7 }, { 0xB0E0, 0xB3C8 }, { 0xB0E5, 0xB3C9 }, { 0xB108, 0xB3CA }, { 0xB109, 0xB3CB }, { 0xB10B, 0xB3CC }, { 0xB10C, 0xB3CD }, { 0xB110, 0xB3CE }, 
-	{ 0xB112, 0xB3CF }, { 0xB113, 0xB3D0 }, { 0xB118, 0xB3D1 }, { 0xB119, 0xB3D2 }, { 0xB11B, 0xB3D3 }, { 0xB11C, 0xB3D4 }, { 0xB11D, 0xB3D5 }, { 0xB123, 0xB3D6 }, 
-	{ 0xB124, 0xB3D7 }, { 0xB125, 0xB3D8 }, { 0xB128, 0xB3D9 }, { 0xB12C, 0xB3DA }, { 0xB134, 0xB3DB }, { 0xB135, 0xB3DC }, { 0xB137, 0xB3DD }, { 0xB138, 0xB3DE }, 
-	{ 0xB139, 0xB3DF }, { 0xB140, 0xB3E0 }, { 0xB141, 0xB3E1 }, { 0xB144, 0xB3E2 }, { 0xB148, 0xB3E3 }, { 0xB150, 0xB3E4 }, { 0xB151, 0xB3E5 }, { 0xB154, 0xB3E6 }, 
-	{ 0xB155, 0xB3E7 }, { 0xB158, 0xB3E8 }, { 0xB15C, 0xB3E9 }, { 0xB160, 0xB3EA }, { 0xB178, 0xB3EB }, { 0xB179, 0xB3EC }, { 0xB17C, 0xB3ED }, { 0xB180, 0xB3EE }, 
-	{ 0xB182, 0xB3EF }, { 0xB188, 0xB3F0 }, { 0xB189, 0xB3F1 }, { 0xB18B, 0xB3F2 }, { 0xB18D, 0xB3F3 }, { 0xB192, 0xB3F4 }, { 0xB193, 0xB3F5 }, { 0xB194, 0xB3F6 }, 
-	{ 0xB198, 0xB3F7 }, { 0xB19C, 0xB3F8 }, { 0xB1A8, 0xB3F9 }, { 0xB1CC, 0xB3FA }, { 0xB1D0, 0xB3FB }, { 0xB1D4, 0xB3FC }, { 0xB1DC, 0xB3FD }, { 0xB1DD, 0xB3FE }, 
-	{ 0xB1DF, 0xB4A1 }, { 0xB1E8, 0xB4A2 }, { 0xB1E9, 0xB4A3 }, { 0xB1EC, 0xB4A4 }, { 0xB1F0, 0xB4A5 }, { 0xB1F9, 0xB4A6 }, { 0xB1FB, 0xB4A7 }, { 0xB1FD, 0xB4A8 }, 
-	{ 0xB204, 0xB4A9 }, { 0xB205, 0xB4AA }, { 0xB208, 0xB4AB }, { 0xB20B, 0xB4AC }, { 0xB20C, 0xB4AD }, { 0xB214, 0xB4AE }, { 0xB215, 0xB4AF }, { 0xB217, 0xB4B0 }, 
-	{ 0xB219, 0xB4B1 }, { 0xB220, 0xB4B2 }, { 0xB234, 0xB4B3 }, { 0xB23C, 0xB4B4 }, { 0xB258, 0xB4B5 }, { 0xB25C, 0xB4B6 }, { 0xB260, 0xB4B7 }, { 0xB268, 0xB4B8 }, 
-	{ 0xB269, 0xB4B9 }, { 0xB274, 0xB4BA }, { 0xB275, 0xB4BB }, { 0xB27C, 0xB4BC }, { 0xB284, 0xB4BD }, { 0xB285, 0xB4BE }, { 0xB289, 0xB4BF }, { 0xB290, 0xB4C0 }, 
-	{ 0xB291, 0xB4C1 }, { 0xB294, 0xB4C2 }, { 0xB298, 0xB4C3 }, { 0xB299, 0xB4C4 }, { 0xB29A, 0xB4C5 }, { 0xB2A0, 0xB4C6 }, { 0xB2A1, 0xB4C7 }, { 0xB2A3, 0xB4C8 }, 
-	{ 0xB2A5, 0xB4C9 }, { 0xB2A6, 0xB4CA }, { 0xB2AA, 0xB4CB }, { 0xB2AC, 0xB4CC }, { 0xB2B0, 0xB4CD }, { 0xB2B4, 0xB4CE }, { 0xB2C8, 0xB4CF }, { 0xB2C9, 0xB4D0 }, 
-	{ 0xB2CC, 0xB4D1 }, { 0xB2D0, 0xB4D2 }, { 0xB2D2, 0xB4D3 }, { 0xB2D8, 0xB4D4 }, { 0xB2D9, 0xB4D5 }, { 0xB2DB, 0xB4D6 }, { 0xB2DD, 0xB4D7 }, { 0xB2E2, 0xB4D8 }, 
-	{ 0xB2E4, 0xB4D9 }, { 0xB2E5, 0xB4DA }, { 0xB2E6, 0xB4DB }, { 0xB2E8, 0xB4DC }, { 0xB2EB, 0xB4DD }, { 0xB2EC, 0xB4DE }, { 0xB2ED, 0xB4DF }, { 0xB2EE, 0xB4E0 }, 
-	{ 0xB2EF, 0xB4E1 }, { 0xB2F3, 0xB4E2 }, { 0xB2F4, 0xB4E3 }, { 0xB2F5, 0xB4E4 }, { 0xB2F7, 0xB4E5 }, { 0xB2F8, 0xB4E6 }, { 0xB2F9, 0xB4E7 }, { 0xB2FA, 0xB4E8 }, 
-	{ 0xB2FB, 0xB4E9 }, { 0xB2FF, 0xB4EA }, { 0xB300, 0xB4EB }, { 0xB301, 0xB4EC }, { 0xB304, 0xB4ED }, { 0xB308, 0xB4EE }, { 0xB310, 0xB4EF }, { 0xB311, 0xB4F0 }, 
-	{ 0xB313, 0xB4F1 }, { 0xB314, 0xB4F2 }, { 0xB315, 0xB4F3 }, { 0xB31C, 0xB4F4 }, { 0xB354, 0xB4F5 }, { 0xB355, 0xB4F6 }, { 0xB356, 0xB4F7 }, { 0xB358, 0xB4F8 }, 
-	{ 0xB35B, 0xB4F9 }, { 0xB35C, 0xB4FA }, { 0xB35E, 0xB4FB }, { 0xB35F, 0xB4FC }, { 0xB364, 0xB4FD }, { 0xB365, 0xB4FE }, { 0xB367, 0xB5A1 }, { 0xB369, 0xB5A2 }, 
-	{ 0xB36B, 0xB5A3 }, { 0xB36E, 0xB5A4 }, { 0xB370, 0xB5A5 }, { 0xB371, 0xB5A6 }, { 0xB374, 0xB5A7 }, { 0xB378, 0xB5A8 }, { 0xB380, 0xB5A9 }, { 0xB381, 0xB5AA }, 
-	{ 0xB383, 0xB5AB }, { 0xB384, 0xB5AC }, { 0xB385, 0xB5AD }, { 0xB38C, 0xB5AE }, { 0xB390, 0xB5AF }, { 0xB394, 0xB5B0 }, { 0xB3A0, 0xB5B1 }, { 0xB3A1, 0xB5B2 }, 
-	{ 0xB3A8, 0xB5B3 }, { 0xB3AC, 0xB5B4 }, { 0xB3C4, 0xB5B5 }, { 0xB3C5, 0xB5B6 }, { 0xB3C8, 0xB5B7 }, { 0xB3CB, 0xB5B8 }, { 0xB3CC, 0xB5B9 }, { 0xB3CE, 0xB5BA }, 
-	{ 0xB3D0, 0xB5BB }, { 0xB3D4, 0xB5BC }, { 0xB3D5, 0xB5BD }, { 0xB3D7, 0xB5BE }, { 0xB3D9, 0xB5BF }, { 0xB3DB, 0xB5C0 }, { 0xB3DD, 0xB5C1 }, { 0xB3E0, 0xB5C2 }, 
-	{ 0xB3E4, 0xB5C3 }, { 0xB3E8, 0xB5C4 }, { 0xB3FC, 0xB5C5 }, { 0xB410, 0xB5C6 }, { 0xB418, 0xB5C7 }, { 0xB41C, 0xB5C8 }, { 0xB420, 0xB5C9 }, { 0xB428, 0xB5CA }, 
-	{ 0xB429, 0xB5CB }, { 0xB42B, 0xB5CC }, { 0xB434, 0xB5CD }, { 0xB450, 0xB5CE }, { 0xB451, 0xB5CF }, { 0xB454, 0xB5D0 }, { 0xB458, 0xB5D1 }, { 0xB460, 0xB5D2 }, 
-	{ 0xB461, 0xB5D3 }, { 0xB463, 0xB5D4 }, { 0xB465, 0xB5D5 }, { 0xB46C, 0xB5D6 }, { 0xB480, 0xB5D7 }, { 0xB488, 0xB5D8 }, { 0xB49D, 0xB5D9 }, { 0xB4A4, 0xB5DA }, 
-	{ 0xB4A8, 0xB5DB }, { 0xB4AC, 0xB5DC }, { 0xB4B5, 0xB5DD }, { 0xB4B7, 0xB5DE }, { 0xB4B9, 0xB5DF }, { 0xB4C0, 0xB5E0 }, { 0xB4C4, 0xB5E1 }, { 0xB4C8, 0xB5E2 }, 
-	{ 0xB4D0, 0xB5E3 }, { 0xB4D5, 0xB5E4 }, { 0xB4DC, 0xB5E5 }, { 0xB4DD, 0xB5E6 }, { 0xB4E0, 0xB5E7 }, { 0xB4E3, 0xB5E8 }, { 0xB4E4, 0xB5E9 }, { 0xB4E6, 0xB5EA }, 
-	{ 0xB4EC, 0xB5EB }, { 0xB4ED, 0xB5EC }, { 0xB4EF, 0xB5ED }, { 0xB4F1, 0xB5EE }, { 0xB4F8, 0xB5EF }, { 0xB514, 0xB5F0 }, { 0xB515, 0xB5F1 }, { 0xB518, 0xB5F2 }, 
-	{ 0xB51B, 0xB5F3 }, { 0xB51C, 0xB5F4 }, { 0xB524, 0xB5F5 }, { 0xB525, 0xB5F6 }, { 0xB527, 0xB5F7 }, { 0xB528, 0xB5F8 }, { 0xB529, 0xB5F9 }, { 0xB52A, 0xB5FA }, 
-	{ 0xB530, 0xB5FB }, { 0xB531, 0xB5FC }, { 0xB534, 0xB5FD }, { 0xB538, 0xB5FE }, { 0xB540, 0xB6A1 }, { 0xB541, 0xB6A2 }, { 0xB543, 0xB6A3 }, { 0xB544, 0xB6A4 }, 
-	{ 0xB545, 0xB6A5 }, { 0xB54B, 0xB6A6 }, { 0xB54C, 0xB6A7 }, { 0xB54D, 0xB6A8 }, { 0xB550, 0xB6A9 }, { 0xB554, 0xB6AA }, { 0xB55C, 0xB6AB }, { 0xB55D, 0xB6AC }, 
-	{ 0xB55F, 0xB6AD }, { 0xB560, 0xB6AE }, { 0xB561, 0xB6AF }, { 0xB5A0, 0xB6B0 }, { 0xB5A1, 0xB6B1 }, { 0xB5A4, 0xB6B2 }, { 0xB5A8, 0xB6B3 }, { 0xB5AA, 0xB6B4 }, 
-	{ 0xB5AB, 0xB6B5 }, { 0xB5B0, 0xB6B6 }, { 0xB5B1, 0xB6B7 }, { 0xB5B3, 0xB6B8 }, { 0xB5B4, 0xB6B9 }, { 0xB5B5, 0xB6BA }, { 0xB5BB, 0xB6BB }, { 0xB5BC, 0xB6BC }, 
-	{ 0xB5BD, 0xB6BD }, { 0xB5C0, 0xB6BE }, { 0xB5C4, 0xB6BF }, { 0xB5CC, 0xB6C0 }, { 0xB5CD, 0xB6C1 }, { 0xB5CF, 0xB6C2 }, { 0xB5D0, 0xB6C3 }, { 0xB5D1, 0xB6C4 }, 
-	{ 0xB5D8, 0xB6C5 }, { 0xB5EC, 0xB6C6 }, { 0xB610, 0xB6C7 }, { 0xB611, 0xB6C8 }, { 0xB614, 0xB6C9 }, { 0xB618, 0xB6CA }, { 0xB625, 0xB6CB }, { 0xB62C, 0xB6CC }, 
-	{ 0xB634, 0xB6CD }, { 0xB648, 0xB6CE }, { 0xB664, 0xB6CF }, { 0xB668, 0xB6D0 }, { 0xB69C, 0xB6D1 }, { 0xB69D, 0xB6D2 }, { 0xB6A0, 0xB6D3 }, { 0xB6A4, 0xB6D4 }, 
-	{ 0xB6AB, 0xB6D5 }, { 0xB6AC, 0xB6D6 }, { 0xB6B1, 0xB6D7 }, { 0xB6D4, 0xB6D8 }, { 0xB6F0, 0xB6D9 }, { 0xB6F4, 0xB6DA }, { 0xB6F8, 0xB6DB }, { 0xB700, 0xB6DC }, 
-	{ 0xB701, 0xB6DD }, { 0xB705, 0xB6DE }, { 0xB728, 0xB6DF }, { 0xB729, 0xB6E0 }, { 0xB72C, 0xB6E1 }, { 0xB72F, 0xB6E2 }, { 0xB730, 0xB6E3 }, { 0xB738, 0xB6E4 }, 
-	{ 0xB739, 0xB6E5 }, { 0xB73B, 0xB6E6 }, { 0xB744, 0xB6E7 }, { 0xB748, 0xB6E8 }, { 0xB74C, 0xB6E9 }, { 0xB754, 0xB6EA }, { 0xB755, 0xB6EB }, { 0xB760, 0xB6EC }, 
-	{ 0xB764, 0xB6ED }, { 0xB768, 0xB6EE }, { 0xB770, 0xB6EF }, { 0xB771, 0xB6F0 }, { 0xB773, 0xB6F1 }, { 0xB775, 0xB6F2 }, { 0xB77C, 0xB6F3 }, { 0xB77D, 0xB6F4 }, 
-	{ 0xB780, 0xB6F5 }, { 0xB784, 0xB6F6 }, { 0xB78C, 0xB6F7 }, { 0xB78D, 0xB6F8 }, { 0xB78F, 0xB6F9 }, { 0xB790, 0xB6FA }, { 0xB791, 0xB6FB }, { 0xB792, 0xB6FC }, 
-	{ 0xB796, 0xB6FD }, { 0xB797, 0xB6FE }, { 0xB798, 0xB7A1 }, { 0xB799, 0xB7A2 }, { 0xB79C, 0xB7A3 }, { 0xB7A0, 0xB7A4 }, { 0xB7A8, 0xB7A5 }, { 0xB7A9, 0xB7A6 }, 
-	{ 0xB7AB, 0xB7A7 }, { 0xB7AC, 0xB7A8 }, { 0xB7AD, 0xB7A9 }, { 0xB7B4, 0xB7AA }, { 0xB7B5, 0xB7AB }, { 0xB7B8, 0xB7AC }, { 0xB7C7, 0xB7AD }, { 0xB7C9, 0xB7AE }, 
-	{ 0xB7EC, 0xB7AF }, { 0xB7ED, 0xB7B0 }, { 0xB7F0, 0xB7B1 }, { 0xB7F4, 0xB7B2 }, { 0xB7FC, 0xB7B3 }, { 0xB7FD, 0xB7B4 }, { 0xB7FF, 0xB7B5 }, { 0xB800, 0xB7B6 }, 
-	{ 0xB801, 0xB7B7 }, { 0xB807, 0xB7B8 }, { 0xB808, 0xB7B9 }, { 0xB809, 0xB7BA }, { 0xB80C, 0xB7BB }, { 0xB810, 0xB7BC }, { 0xB818, 0xB7BD }, { 0xB819, 0xB7BE }, 
-	{ 0xB81B, 0xB7BF }, { 0xB81D, 0xB7C0 }, { 0xB824, 0xB7C1 }, { 0xB825, 0xB7C2 }, { 0xB828, 0xB7C3 }, { 0xB82C, 0xB7C4 }, { 0xB834, 0xB7C5 }, { 0xB835, 0xB7C6 }, 
-	{ 0xB837, 0xB7C7 }, { 0xB838, 0xB7C8 }, { 0xB839, 0xB7C9 }, { 0xB840, 0xB7CA }, { 0xB844, 0xB7CB }, { 0xB851, 0xB7CC }, { 0xB853, 0xB7CD }, { 0xB85C, 0xB7CE }, 
-	{ 0xB85D, 0xB7CF }, { 0xB860, 0xB7D0 }, { 0xB864, 0xB7D1 }, { 0xB86C, 0xB7D2 }, { 0xB86D, 0xB7D3 }, { 0xB86F, 0xB7D4 }, { 0xB871, 0xB7D5 }, { 0xB878, 0xB7D6 }, 
-	{ 0xB87C, 0xB7D7 }, { 0xB88D, 0xB7D8 }, { 0xB8A8, 0xB7D9 }, { 0xB8B0, 0xB7DA }, { 0xB8B4, 0xB7DB }, { 0xB8B8, 0xB7DC }, { 0xB8C0, 0xB7DD }, { 0xB8C1, 0xB7DE }, 
-	{ 0xB8C3, 0xB7DF }, { 0xB8C5, 0xB7E0 }, { 0xB8CC, 0xB7E1 }, { 0xB8D0, 0xB7E2 }, { 0xB8D4, 0xB7E3 }, { 0xB8DD, 0xB7E4 }, { 0xB8DF, 0xB7E5 }, { 0xB8E1, 0xB7E6 }, 
-	{ 0xB8E8, 0xB7E7 }, { 0xB8E9, 0xB7E8 }, { 0xB8EC, 0xB7E9 }, { 0xB8F0, 0xB7EA }, { 0xB8F8, 0xB7EB }, { 0xB8F9, 0xB7EC }, { 0xB8FB, 0xB7ED }, { 0xB8FD, 0xB7EE }, 
-	{ 0xB904, 0xB7EF }, { 0xB918, 0xB7F0 }, { 0xB920, 0xB7F1 }, { 0xB93C, 0xB7F2 }, { 0xB93D, 0xB7F3 }, { 0xB940, 0xB7F4 }, { 0xB944, 0xB7F5 }, { 0xB94C, 0xB7F6 }, 
-	{ 0xB94F, 0xB7F7 }, { 0xB951, 0xB7F8 }, { 0xB958, 0xB7F9 }, { 0xB959, 0xB7FA }, { 0xB95C, 0xB7FB }, { 0xB960, 0xB7FC }, { 0xB968, 0xB7FD }, { 0xB969, 0xB7FE }, 
-	{ 0xB96B, 0xB8A1 }, { 0xB96D, 0xB8A2 }, { 0xB974, 0xB8A3 }, { 0xB975, 0xB8A4 }, { 0xB978, 0xB8A5 }, { 0xB97C, 0xB8A6 }, { 0xB984, 0xB8A7 }, { 0xB985, 0xB8A8 }, 
-	{ 0xB987, 0xB8A9 }, { 0xB989, 0xB8AA }, { 0xB98A, 0xB8AB }, { 0xB98D, 0xB8AC }, { 0xB98E, 0xB8AD }, { 0xB9AC, 0xB8AE }, { 0xB9AD, 0xB8AF }, { 0xB9B0, 0xB8B0 }, 
-	{ 0xB9B4, 0xB8B1 }, { 0xB9BC, 0xB8B2 }, { 0xB9BD, 0xB8B3 }, { 0xB9BF, 0xB8B4 }, { 0xB9C1, 0xB8B5 }, { 0xB9C8, 0xB8B6 }, { 0xB9C9, 0xB8B7 }, { 0xB9CC, 0xB8B8 }, 
-	{ 0xB9CE, 0xB8B9 }, { 0xB9CF, 0xB8BA }, { 0xB9D0, 0xB8BB }, { 0xB9D1, 0xB8BC }, { 0xB9D2, 0xB8BD }, { 0xB9D8, 0xB8BE }, { 0xB9D9, 0xB8BF }, { 0xB9DB, 0xB8C0 }, 
-	{ 0xB9DD, 0xB8C1 }, { 0xB9DE, 0xB8C2 }, { 0xB9E1, 0xB8C3 }, { 0xB9E3, 0xB8C4 }, { 0xB9E4, 0xB8C5 }, { 0xB9E5, 0xB8C6 }, { 0xB9E8, 0xB8C7 }, { 0xB9EC, 0xB8C8 }, 
-	{ 0xB9F4, 0xB8C9 }, { 0xB9F5, 0xB8CA }, { 0xB9F7, 0xB8CB }, { 0xB9F8, 0xB8CC }, { 0xB9F9, 0xB8CD }, { 0xB9FA, 0xB8CE }, { 0xBA00, 0xB8CF }, { 0xBA01, 0xB8D0 }, 
-	{ 0xBA08, 0xB8D1 }, { 0xBA15, 0xB8D2 }, { 0xBA38, 0xB8D3 }, { 0xBA39, 0xB8D4 }, { 0xBA3C, 0xB8D5 }, { 0xBA40, 0xB8D6 }, { 0xBA42, 0xB8D7 }, { 0xBA48, 0xB8D8 }, 
-	{ 0xBA49, 0xB8D9 }, { 0xBA4B, 0xB8DA }, { 0xBA4D, 0xB8DB }, { 0xBA4E, 0xB8DC }, { 0xBA53, 0xB8DD }, { 0xBA54, 0xB8DE }, { 0xBA55, 0xB8DF }, { 0xBA58, 0xB8E0 }, 
-	{ 0xBA5C, 0xB8E1 }, { 0xBA64, 0xB8E2 }, { 0xBA65, 0xB8E3 }, { 0xBA67, 0xB8E4 }, { 0xBA68, 0xB8E5 }, { 0xBA69, 0xB8E6 }, { 0xBA70, 0xB8E7 }, { 0xBA71, 0xB8E8 }, 
-	{ 0xBA74, 0xB8E9 }, { 0xBA78, 0xB8EA }, { 0xBA83, 0xB8EB }, { 0xBA84, 0xB8EC }, { 0xBA85, 0xB8ED }, { 0xBA87, 0xB8EE }, { 0xBA8C, 0xB8EF }, { 0xBAA8, 0xB8F0 }, 
-	{ 0xBAA9, 0xB8F1 }, { 0xBAAB, 0xB8F2 }, { 0xBAAC, 0xB8F3 }, { 0xBAB0, 0xB8F4 }, { 0xBAB2, 0xB8F5 }, { 0xBAB8, 0xB8F6 }, { 0xBAB9, 0xB8F7 }, { 0xBABB, 0xB8F8 }, 
-	{ 0xBABD, 0xB8F9 }, { 0xBAC4, 0xB8FA }, { 0xBAC8, 0xB8FB }, { 0xBAD8, 0xB8FC }, { 0xBAD9, 0xB8FD }, { 0xBAFC, 0xB8FE }, { 0xBB00, 0xB9A1 }, { 0xBB04, 0xB9A2 }, 
-	{ 0xBB0D, 0xB9A3 }, { 0xBB0F, 0xB9A4 }, { 0xBB11, 0xB9A5 }, { 0xBB18, 0xB9A6 }, { 0xBB1C, 0xB9A7 }, { 0xBB20, 0xB9A8 }, { 0xBB29, 0xB9A9 }, { 0xBB2B, 0xB9AA }, 
-	{ 0xBB34, 0xB9AB }, { 0xBB35, 0xB9AC }, { 0xBB36, 0xB9AD }, { 0xBB38, 0xB9AE }, { 0xBB3B, 0xB9AF }, { 0xBB3C, 0xB9B0 }, { 0xBB3D, 0xB9B1 }, { 0xBB3E, 0xB9B2 }, 
-	{ 0xBB44, 0xB9B3 }, { 0xBB45, 0xB9B4 }, { 0xBB47, 0xB9B5 }, { 0xBB49, 0xB9B6 }, { 0xBB4D, 0xB9B7 }, { 0xBB4F, 0xB9B8 }, { 0xBB50, 0xB9B9 }, { 0xBB54, 0xB9BA }, 
-	{ 0xBB58, 0xB9BB }, { 0xBB61, 0xB9BC }, { 0xBB63, 0xB9BD }, { 0xBB6C, 0xB9BE }, { 0xBB88, 0xB9BF }, { 0xBB8C, 0xB9C0 }, { 0xBB90, 0xB9C1 }, { 0xBBA4, 0xB9C2 }, 
-	{ 0xBBA8, 0xB9C3 }, { 0xBBAC, 0xB9C4 }, { 0xBBB4, 0xB9C5 }, { 0xBBB7, 0xB9C6 }, { 0xBBC0, 0xB9C7 }, { 0xBBC4, 0xB9C8 }, { 0xBBC8, 0xB9C9 }, { 0xBBD0, 0xB9CA }, 
-	{ 0xBBD3, 0xB9CB }, { 0xBBF8, 0xB9CC }, { 0xBBF9, 0xB9CD }, { 0xBBFC, 0xB9CE }, { 0xBBFF, 0xB9CF }, { 0xBC00, 0xB9D0 }, { 0xBC02, 0xB9D1 }, { 0xBC08, 0xB9D2 }, 
-	{ 0xBC09, 0xB9D3 }, { 0xBC0B, 0xB9D4 }, { 0xBC0C, 0xB9D5 }, { 0xBC0D, 0xB9D6 }, { 0xBC0F, 0xB9D7 }, { 0xBC11, 0xB9D8 }, { 0xBC14, 0xB9D9 }, { 0xBC15, 0xB9DA }, 
-	{ 0xBC16, 0xB9DB }, { 0xBC17, 0xB9DC }, { 0xBC18, 0xB9DD }, { 0xBC1B, 0xB9DE }, { 0xBC1C, 0xB9DF }, { 0xBC1D, 0xB9E0 }, { 0xBC1E, 0xB9E1 }, { 0xBC1F, 0xB9E2 }, 
-	{ 0xBC24, 0xB9E3 }, { 0xBC25, 0xB9E4 }, { 0xBC27, 0xB9E5 }, { 0xBC29, 0xB9E6 }, { 0xBC2D, 0xB9E7 }, { 0xBC30, 0xB9E8 }, { 0xBC31, 0xB9E9 }, { 0xBC34, 0xB9EA }, 
-	{ 0xBC38, 0xB9EB }, { 0xBC40, 0xB9EC }, { 0xBC41, 0xB9ED }, { 0xBC43, 0xB9EE }, { 0xBC44, 0xB9EF }, { 0xBC45, 0xB9F0 }, { 0xBC49, 0xB9F1 }, { 0xBC4C, 0xB9F2 }, 
-	{ 0xBC4D, 0xB9F3 }, { 0xBC50, 0xB9F4 }, { 0xBC5D, 0xB9F5 }, { 0xBC84, 0xB9F6 }, { 0xBC85, 0xB9F7 }, { 0xBC88, 0xB9F8 }, { 0xBC8B, 0xB9F9 }, { 0xBC8C, 0xB9FA }, 
-	{ 0xBC8E, 0xB9FB }, { 0xBC94, 0xB9FC }, { 0xBC95, 0xB9FD }, { 0xBC97, 0xB9FE }, { 0xBC99, 0xBAA1 }, { 0xBC9A, 0xBAA2 }, { 0xBCA0, 0xBAA3 }, { 0xBCA1, 0xBAA4 }, 
-	{ 0xBCA4, 0xBAA5 }, { 0xBCA7, 0xBAA6 }, { 0xBCA8, 0xBAA7 }, { 0xBCB0, 0xBAA8 }, { 0xBCB1, 0xBAA9 }, { 0xBCB3, 0xBAAA }, { 0xBCB4, 0xBAAB }, { 0xBCB5, 0xBAAC }, 
-	{ 0xBCBC, 0xBAAD }, { 0xBCBD, 0xBAAE }, { 0xBCC0, 0xBAAF }, { 0xBCC4, 0xBAB0 }, { 0xBCCD, 0xBAB1 }, { 0xBCCF, 0xBAB2 }, { 0xBCD0, 0xBAB3 }, { 0xBCD1, 0xBAB4 }, 
-	{ 0xBCD5, 0xBAB5 }, { 0xBCD8, 0xBAB6 }, { 0xBCDC, 0xBAB7 }, { 0xBCF4, 0xBAB8 }, { 0xBCF5, 0xBAB9 }, { 0xBCF6, 0xBABA }, { 0xBCF8, 0xBABB }, { 0xBCFC, 0xBABC }, 
-	{ 0xBD04, 0xBABD }, { 0xBD05, 0xBABE }, { 0xBD07, 0xBABF }, { 0xBD09, 0xBAC0 }, { 0xBD10, 0xBAC1 }, { 0xBD14, 0xBAC2 }, { 0xBD24, 0xBAC3 }, { 0xBD2C, 0xBAC4 }, 
-	{ 0xBD40, 0xBAC5 }, { 0xBD48, 0xBAC6 }, { 0xBD49, 0xBAC7 }, { 0xBD4C, 0xBAC8 }, { 0xBD50, 0xBAC9 }, { 0xBD58, 0xBACA }, { 0xBD59, 0xBACB }, { 0xBD64, 0xBACC }, 
-	{ 0xBD68, 0xBACD }, { 0xBD80, 0xBACE }, { 0xBD81, 0xBACF }, { 0xBD84, 0xBAD0 }, { 0xBD87, 0xBAD1 }, { 0xBD88, 0xBAD2 }, { 0xBD89, 0xBAD3 }, { 0xBD8A, 0xBAD4 }, 
-	{ 0xBD90, 0xBAD5 }, { 0xBD91, 0xBAD6 }, { 0xBD93, 0xBAD7 }, { 0xBD95, 0xBAD8 }, { 0xBD99, 0xBAD9 }, { 0xBD9A, 0xBADA }, { 0xBD9C, 0xBADB }, { 0xBDA4, 0xBADC }, 
-	{ 0xBDB0, 0xBADD }, { 0xBDB8, 0xBADE }, { 0xBDD4, 0xBADF }, { 0xBDD5, 0xBAE0 }, { 0xBDD8, 0xBAE1 }, { 0xBDDC, 0xBAE2 }, { 0xBDE9, 0xBAE3 }, { 0xBDF0, 0xBAE4 }, 
-	{ 0xBDF4, 0xBAE5 }, { 0xBDF8, 0xBAE6 }, { 0xBE00, 0xBAE7 }, { 0xBE03, 0xBAE8 }, { 0xBE05, 0xBAE9 }, { 0xBE0C, 0xBAEA }, { 0xBE0D, 0xBAEB }, { 0xBE10, 0xBAEC }, 
-	{ 0xBE14, 0xBAED }, { 0xBE1C, 0xBAEE }, { 0xBE1D, 0xBAEF }, { 0xBE1F, 0xBAF0 }, { 0xBE44, 0xBAF1 }, { 0xBE45, 0xBAF2 }, { 0xBE48, 0xBAF3 }, { 0xBE4C, 0xBAF4 }, 
-	{ 0xBE4E, 0xBAF5 }, { 0xBE54, 0xBAF6 }, { 0xBE55, 0xBAF7 }, { 0xBE57, 0xBAF8 }, { 0xBE59, 0xBAF9 }, { 0xBE5A, 0xBAFA }, { 0xBE5B, 0xBAFB }, { 0xBE60, 0xBAFC }, 
-	{ 0xBE61, 0xBAFD }, { 0xBE64, 0xBAFE }, { 0xBE68, 0xBBA1 }, { 0xBE6A, 0xBBA2 }, { 0xBE70, 0xBBA3 }, { 0xBE71, 0xBBA4 }, { 0xBE73, 0xBBA5 }, { 0xBE74, 0xBBA6 }, 
-	{ 0xBE75, 0xBBA7 }, { 0xBE7B, 0xBBA8 }, { 0xBE7C, 0xBBA9 }, { 0xBE7D, 0xBBAA }, { 0xBE80, 0xBBAB }, { 0xBE84, 0xBBAC }, { 0xBE8C, 0xBBAD }, { 0xBE8D, 0xBBAE }, 
-	{ 0xBE8F, 0xBBAF }, { 0xBE90, 0xBBB0 }, { 0xBE91, 0xBBB1 }, { 0xBE98, 0xBBB2 }, { 0xBE99, 0xBBB3 }, { 0xBEA8, 0xBBB4 }, { 0xBED0, 0xBBB5 }, { 0xBED1, 0xBBB6 }, 
-	{ 0xBED4, 0xBBB7 }, { 0xBED7, 0xBBB8 }, { 0xBED8, 0xBBB9 }, { 0xBEE0, 0xBBBA }, { 0xBEE3, 0xBBBB }, { 0xBEE4, 0xBBBC }, { 0xBEE5, 0xBBBD }, { 0xBEEC, 0xBBBE }, 
-	{ 0xBF01, 0xBBBF }, { 0xBF08, 0xBBC0 }, { 0xBF09, 0xBBC1 }, { 0xBF18, 0xBBC2 }, { 0xBF19, 0xBBC3 }, { 0xBF1B, 0xBBC4 }, { 0xBF1C, 0xBBC5 }, { 0xBF1D, 0xBBC6 }, 
-	{ 0xBF40, 0xBBC7 }, { 0xBF41, 0xBBC8 }, { 0xBF44, 0xBBC9 }, { 0xBF48, 0xBBCA }, { 0xBF50, 0xBBCB }, { 0xBF51, 0xBBCC }, { 0xBF55, 0xBBCD }, { 0xBF94, 0xBBCE }, 
-	{ 0xBFB0, 0xBBCF }, { 0xBFC5, 0xBBD0 }, { 0xBFCC, 0xBBD1 }, { 0xBFCD, 0xBBD2 }, { 0xBFD0, 0xBBD3 }, { 0xBFD4, 0xBBD4 }, { 0xBFDC, 0xBBD5 }, { 0xBFDF, 0xBBD6 }, 
-	{ 0xBFE1, 0xBBD7 }, { 0xC03C, 0xBBD8 }, { 0xC051, 0xBBD9 }, { 0xC058, 0xBBDA }, { 0xC05C, 0xBBDB }, { 0xC060, 0xBBDC }, { 0xC068, 0xBBDD }, { 0xC069, 0xBBDE }, 
-	{ 0xC090, 0xBBDF }, { 0xC091, 0xBBE0 }, { 0xC094, 0xBBE1 }, { 0xC098, 0xBBE2 }, { 0xC0A0, 0xBBE3 }, { 0xC0A1, 0xBBE4 }, { 0xC0A3, 0xBBE5 }, { 0xC0A5, 0xBBE6 }, 
-	{ 0xC0AC, 0xBBE7 }, { 0xC0AD, 0xBBE8 }, { 0xC0AF, 0xBBE9 }, { 0xC0B0, 0xBBEA }, { 0xC0B3, 0xBBEB }, { 0xC0B4, 0xBBEC }, { 0xC0B5, 0xBBED }, { 0xC0B6, 0xBBEE }, 
-	{ 0xC0BC, 0xBBEF }, { 0xC0BD, 0xBBF0 }, { 0xC0BF, 0xBBF1 }, { 0xC0C0, 0xBBF2 }, { 0xC0C1, 0xBBF3 }, { 0xC0C5, 0xBBF4 }, { 0xC0C8, 0xBBF5 }, { 0xC0C9, 0xBBF6 }, 
-	{ 0xC0CC, 0xBBF7 }, { 0xC0D0, 0xBBF8 }, { 0xC0D8, 0xBBF9 }, { 0xC0D9, 0xBBFA }, { 0xC0DB, 0xBBFB }, { 0xC0DC, 0xBBFC }, { 0xC0DD, 0xBBFD }, { 0xC0E4, 0xBBFE }, 
-	{ 0xC0E5, 0xBCA1 }, { 0xC0E8, 0xBCA2 }, { 0xC0EC, 0xBCA3 }, { 0xC0F4, 0xBCA4 }, { 0xC0F5, 0xBCA5 }, { 0xC0F7, 0xBCA6 }, { 0xC0F9, 0xBCA7 }, { 0xC100, 0xBCA8 }, 
-	{ 0xC104, 0xBCA9 }, { 0xC108, 0xBCAA }, { 0xC110, 0xBCAB }, { 0xC115, 0xBCAC }, { 0xC11C, 0xBCAD }, { 0xC11D, 0xBCAE }, { 0xC11E, 0xBCAF }, { 0xC11F, 0xBCB0 }, 
-	{ 0xC120, 0xBCB1 }, { 0xC123, 0xBCB2 }, { 0xC124, 0xBCB3 }, { 0xC126, 0xBCB4 }, { 0xC127, 0xBCB5 }, { 0xC12C, 0xBCB6 }, { 0xC12D, 0xBCB7 }, { 0xC12F, 0xBCB8 }, 
-	{ 0xC130, 0xBCB9 }, { 0xC131, 0xBCBA }, { 0xC136, 0xBCBB }, { 0xC138, 0xBCBC }, { 0xC139, 0xBCBD }, { 0xC13C, 0xBCBE }, { 0xC140, 0xBCBF }, { 0xC148, 0xBCC0 }, 
-	{ 0xC149, 0xBCC1 }, { 0xC14B, 0xBCC2 }, { 0xC14C, 0xBCC3 }, { 0xC14D, 0xBCC4 }, { 0xC154, 0xBCC5 }, { 0xC155, 0xBCC6 }, { 0xC158, 0xBCC7 }, { 0xC15C, 0xBCC8 }, 
-	{ 0xC164, 0xBCC9 }, { 0xC165, 0xBCCA }, { 0xC167, 0xBCCB }, { 0xC168, 0xBCCC }, { 0xC169, 0xBCCD }, { 0xC170, 0xBCCE }, { 0xC174, 0xBCCF }, { 0xC178, 0xBCD0 }, 
-	{ 0xC185, 0xBCD1 }, { 0xC18C, 0xBCD2 }, { 0xC18D, 0xBCD3 }, { 0xC18E, 0xBCD4 }, { 0xC190, 0xBCD5 }, { 0xC194, 0xBCD6 }, { 0xC196, 0xBCD7 }, { 0xC19C, 0xBCD8 }, 
-	{ 0xC19D, 0xBCD9 }, { 0xC19F, 0xBCDA }, { 0xC1A1, 0xBCDB }, { 0xC1A5, 0xBCDC }, { 0xC1A8, 0xBCDD }, { 0xC1A9, 0xBCDE }, { 0xC1AC, 0xBCDF }, { 0xC1B0, 0xBCE0 }, 
-	{ 0xC1BD, 0xBCE1 }, { 0xC1C4, 0xBCE2 }, { 0xC1C8, 0xBCE3 }, { 0xC1CC, 0xBCE4 }, { 0xC1D4, 0xBCE5 }, { 0xC1D7, 0xBCE6 }, { 0xC1D8, 0xBCE7 }, { 0xC1E0, 0xBCE8 }, 
-	{ 0xC1E4, 0xBCE9 }, { 0xC1E8, 0xBCEA }, { 0xC1F0, 0xBCEB }, { 0xC1F1, 0xBCEC }, { 0xC1F3, 0xBCED }, { 0xC1FC, 0xBCEE }, { 0xC1FD, 0xBCEF }, { 0xC200, 0xBCF0 }, 
-	{ 0xC204, 0xBCF1 }, { 0xC20C, 0xBCF2 }, { 0xC20D, 0xBCF3 }, { 0xC20F, 0xBCF4 }, { 0xC211, 0xBCF5 }, { 0xC218, 0xBCF6 }, { 0xC219, 0xBCF7 }, { 0xC21C, 0xBCF8 }, 
-	{ 0xC21F, 0xBCF9 }, { 0xC220, 0xBCFA }, { 0xC228, 0xBCFB }, { 0xC229, 0xBCFC }, { 0xC22B, 0xBCFD }, { 0xC22D, 0xBCFE }, { 0xC22F, 0xBDA1 }, { 0xC231, 0xBDA2 }, 
-	{ 0xC232, 0xBDA3 }, { 0xC234, 0xBDA4 }, { 0xC248, 0xBDA5 }, { 0xC250, 0xBDA6 }, { 0xC251, 0xBDA7 }, { 0xC254, 0xBDA8 }, { 0xC258, 0xBDA9 }, { 0xC260, 0xBDAA }, 
-	{ 0xC265, 0xBDAB }, { 0xC26C, 0xBDAC }, { 0xC26D, 0xBDAD }, { 0xC270, 0xBDAE }, { 0xC274, 0xBDAF }, { 0xC27C, 0xBDB0 }, { 0xC27D, 0xBDB1 }, { 0xC27F, 0xBDB2 }, 
-	{ 0xC281, 0xBDB3 }, { 0xC288, 0xBDB4 }, { 0xC289, 0xBDB5 }, { 0xC290, 0xBDB6 }, { 0xC298, 0xBDB7 }, { 0xC29B, 0xBDB8 }, { 0xC29D, 0xBDB9 }, { 0xC2A4, 0xBDBA }, 
-	{ 0xC2A5, 0xBDBB }, { 0xC2A8, 0xBDBC }, { 0xC2AC, 0xBDBD }, { 0xC2AD, 0xBDBE }, { 0xC2B4, 0xBDBF }, { 0xC2B5, 0xBDC0 }, { 0xC2B7, 0xBDC1 }, { 0xC2B9, 0xBDC2 }, 
-	{ 0xC2DC, 0xBDC3 }, { 0xC2DD, 0xBDC4 }, { 0xC2E0, 0xBDC5 }, { 0xC2E3, 0xBDC6 }, { 0xC2E4, 0xBDC7 }, { 0xC2EB, 0xBDC8 }, { 0xC2EC, 0xBDC9 }, { 0xC2ED, 0xBDCA }, 
-	{ 0xC2EF, 0xBDCB }, { 0xC2F1, 0xBDCC }, { 0xC2F6, 0xBDCD }, { 0xC2F8, 0xBDCE }, { 0xC2F9, 0xBDCF }, { 0xC2FB, 0xBDD0 }, { 0xC2FC, 0xBDD1 }, { 0xC300, 0xBDD2 }, 
-	{ 0xC308, 0xBDD3 }, { 0xC309, 0xBDD4 }, { 0xC30C, 0xBDD5 }, { 0xC30D, 0xBDD6 }, { 0xC313, 0xBDD7 }, { 0xC314, 0xBDD8 }, { 0xC315, 0xBDD9 }, { 0xC318, 0xBDDA }, 
-	{ 0xC31C, 0xBDDB }, { 0xC324, 0xBDDC }, { 0xC325, 0xBDDD }, { 0xC328, 0xBDDE }, { 0xC329, 0xBDDF }, { 0xC345, 0xBDE0 }, { 0xC368, 0xBDE1 }, { 0xC369, 0xBDE2 }, 
-	{ 0xC36C, 0xBDE3 }, { 0xC370, 0xBDE4 }, { 0xC372, 0xBDE5 }, { 0xC378, 0xBDE6 }, { 0xC379, 0xBDE7 }, { 0xC37C, 0xBDE8 }, { 0xC37D, 0xBDE9 }, { 0xC384, 0xBDEA }, 
-	{ 0xC388, 0xBDEB }, { 0xC38C, 0xBDEC }, { 0xC3C0, 0xBDED }, { 0xC3D8, 0xBDEE }, { 0xC3D9, 0xBDEF }, { 0xC3DC, 0xBDF0 }, { 0xC3DF, 0xBDF1 }, { 0xC3E0, 0xBDF2 }, 
-	{ 0xC3E2, 0xBDF3 }, { 0xC3E8, 0xBDF4 }, { 0xC3E9, 0xBDF5 }, { 0xC3ED, 0xBDF6 }, { 0xC3F4, 0xBDF7 }, { 0xC3F5, 0xBDF8 }, { 0xC3F8, 0xBDF9 }, { 0xC408, 0xBDFA }, 
-	{ 0xC410, 0xBDFB }, { 0xC424, 0xBDFC }, { 0xC42C, 0xBDFD }, { 0xC430, 0xBDFE }, { 0xC434, 0xBEA1 }, { 0xC43C, 0xBEA2 }, { 0xC43D, 0xBEA3 }, { 0xC448, 0xBEA4 }, 
-	{ 0xC464, 0xBEA5 }, { 0xC465, 0xBEA6 }, { 0xC468, 0xBEA7 }, { 0xC46C, 0xBEA8 }, { 0xC474, 0xBEA9 }, { 0xC475, 0xBEAA }, { 0xC479, 0xBEAB }, { 0xC480, 0xBEAC }, 
-	{ 0xC494, 0xBEAD }, { 0xC49C, 0xBEAE }, { 0xC4B8, 0xBEAF }, { 0xC4BC, 0xBEB0 }, { 0xC4E9, 0xBEB1 }, { 0xC4F0, 0xBEB2 }, { 0xC4F1, 0xBEB3 }, { 0xC4F4, 0xBEB4 }, 
-	{ 0xC4F8, 0xBEB5 }, { 0xC4FA, 0xBEB6 }, { 0xC4FF, 0xBEB7 }, { 0xC500, 0xBEB8 }, { 0xC501, 0xBEB9 }, { 0xC50C, 0xBEBA }, { 0xC510, 0xBEBB }, { 0xC514, 0xBEBC }, 
-	{ 0xC51C, 0xBEBD }, { 0xC528, 0xBEBE }, { 0xC529, 0xBEBF }, { 0xC52C, 0xBEC0 }, { 0xC530, 0xBEC1 }, { 0xC538, 0xBEC2 }, { 0xC539, 0xBEC3 }, { 0xC53B, 0xBEC4 }, 
-	{ 0xC53D, 0xBEC5 }, { 0xC544, 0xBEC6 }, { 0xC545, 0xBEC7 }, { 0xC548, 0xBEC8 }, { 0xC549, 0xBEC9 }, { 0xC54A, 0xBECA }, { 0xC54C, 0xBECB }, { 0xC54D, 0xBECC }, 
-	{ 0xC54E, 0xBECD }, { 0xC553, 0xBECE }, { 0xC554, 0xBECF }, { 0xC555, 0xBED0 }, { 0xC557, 0xBED1 }, { 0xC558, 0xBED2 }, { 0xC559, 0xBED3 }, { 0xC55D, 0xBED4 }, 
-	{ 0xC55E, 0xBED5 }, { 0xC560, 0xBED6 }, { 0xC561, 0xBED7 }, { 0xC564, 0xBED8 }, { 0xC568, 0xBED9 }, { 0xC570, 0xBEDA }, { 0xC571, 0xBEDB }, { 0xC573, 0xBEDC }, 
-	{ 0xC574, 0xBEDD }, { 0xC575, 0xBEDE }, { 0xC57C, 0xBEDF }, { 0xC57D, 0xBEE0 }, { 0xC580, 0xBEE1 }, { 0xC584, 0xBEE2 }, { 0xC587, 0xBEE3 }, { 0xC58C, 0xBEE4 }, 
-	{ 0xC58D, 0xBEE5 }, { 0xC58F, 0xBEE6 }, { 0xC591, 0xBEE7 }, { 0xC595, 0xBEE8 }, { 0xC597, 0xBEE9 }, { 0xC598, 0xBEEA }, { 0xC59C, 0xBEEB }, { 0xC5A0, 0xBEEC }, 
-	{ 0xC5A9, 0xBEED }, { 0xC5B4, 0xBEEE }, { 0xC5B5, 0xBEEF }, { 0xC5B8, 0xBEF0 }, { 0xC5B9, 0xBEF1 }, { 0xC5BB, 0xBEF2 }, { 0xC5BC, 0xBEF3 }, { 0xC5BD, 0xBEF4 }, 
-	{ 0xC5BE, 0xBEF5 }, { 0xC5C4, 0xBEF6 }, { 0xC5C5, 0xBEF7 }, { 0xC5C6, 0xBEF8 }, { 0xC5C7, 0xBEF9 }, { 0xC5C8, 0xBEFA }, { 0xC5C9, 0xBEFB }, { 0xC5CA, 0xBEFC }, 
-	{ 0xC5CC, 0xBEFD }, { 0xC5CE, 0xBEFE }, { 0xC5D0, 0xBFA1 }, { 0xC5D1, 0xBFA2 }, { 0xC5D4, 0xBFA3 }, { 0xC5D8, 0xBFA4 }, { 0xC5E0, 0xBFA5 }, { 0xC5E1, 0xBFA6 }, 
-	{ 0xC5E3, 0xBFA7 }, { 0xC5E5, 0xBFA8 }, { 0xC5EC, 0xBFA9 }, { 0xC5ED, 0xBFAA }, { 0xC5EE, 0xBFAB }, { 0xC5F0, 0xBFAC }, { 0xC5F4, 0xBFAD }, { 0xC5F6, 0xBFAE }, 
-	{ 0xC5F7, 0xBFAF }, { 0xC5FC, 0xBFB0 }, { 0xC5FD, 0xBFB1 }, { 0xC5FE, 0xBFB2 }, { 0xC5FF, 0xBFB3 }, { 0xC600, 0xBFB4 }, { 0xC601, 0xBFB5 }, { 0xC605, 0xBFB6 }, 
-	{ 0xC606, 0xBFB7 }, { 0xC607, 0xBFB8 }, { 0xC608, 0xBFB9 }, { 0xC60C, 0xBFBA }, { 0xC610, 0xBFBB }, { 0xC618, 0xBFBC }, { 0xC619, 0xBFBD }, { 0xC61B, 0xBFBE }, 
-	{ 0xC61C, 0xBFBF }, { 0xC624, 0xBFC0 }, { 0xC625, 0xBFC1 }, { 0xC628, 0xBFC2 }, { 0xC62C, 0xBFC3 }, { 0xC62D, 0xBFC4 }, { 0xC62E, 0xBFC5 }, { 0xC630, 0xBFC6 }, 
-	{ 0xC633, 0xBFC7 }, { 0xC634, 0xBFC8 }, { 0xC635, 0xBFC9 }, { 0xC637, 0xBFCA }, { 0xC639, 0xBFCB }, { 0xC63B, 0xBFCC }, { 0xC640, 0xBFCD }, { 0xC641, 0xBFCE }, 
-	{ 0xC644, 0xBFCF }, { 0xC648, 0xBFD0 }, { 0xC650, 0xBFD1 }, { 0xC651, 0xBFD2 }, { 0xC653, 0xBFD3 }, { 0xC654, 0xBFD4 }, { 0xC655, 0xBFD5 }, { 0xC65C, 0xBFD6 }, 
-	{ 0xC65D, 0xBFD7 }, { 0xC660, 0xBFD8 }, { 0xC66C, 0xBFD9 }, { 0xC66F, 0xBFDA }, { 0xC671, 0xBFDB }, { 0xC678, 0xBFDC }, { 0xC679, 0xBFDD }, { 0xC67C, 0xBFDE }, 
-	{ 0xC680, 0xBFDF }, { 0xC688, 0xBFE0 }, { 0xC689, 0xBFE1 }, { 0xC68B, 0xBFE2 }, { 0xC68D, 0xBFE3 }, { 0xC694, 0xBFE4 }, { 0xC695, 0xBFE5 }, { 0xC698, 0xBFE6 }, 
-	{ 0xC69C, 0xBFE7 }, { 0xC6A4, 0xBFE8 }, { 0xC6A5, 0xBFE9 }, { 0xC6A7, 0xBFEA }, { 0xC6A9, 0xBFEB }, { 0xC6B0, 0xBFEC }, { 0xC6B1, 0xBFED }, { 0xC6B4, 0xBFEE }, 
-	{ 0xC6B8, 0xBFEF }, { 0xC6B9, 0xBFF0 }, { 0xC6BA, 0xBFF1 }, { 0xC6C0, 0xBFF2 }, { 0xC6C1, 0xBFF3 }, { 0xC6C3, 0xBFF4 }, { 0xC6C5, 0xBFF5 }, { 0xC6CC, 0xBFF6 }, 
-	{ 0xC6CD, 0xBFF7 }, { 0xC6D0, 0xBFF8 }, { 0xC6D4, 0xBFF9 }, { 0xC6DC, 0xBFFA }, { 0xC6DD, 0xBFFB }, { 0xC6E0, 0xBFFC }, { 0xC6E1, 0xBFFD }, { 0xC6E8, 0xBFFE }, 
-	{ 0xC6E9, 0xC0A1 }, { 0xC6EC, 0xC0A2 }, { 0xC6F0, 0xC0A3 }, { 0xC6F8, 0xC0A4 }, { 0xC6F9, 0xC0A5 }, { 0xC6FD, 0xC0A6 }, { 0xC704, 0xC0A7 }, { 0xC705, 0xC0A8 }, 
-	{ 0xC708, 0xC0A9 }, { 0xC70C, 0xC0AA }, { 0xC714, 0xC0AB }, { 0xC715, 0xC0AC }, { 0xC717, 0xC0AD }, { 0xC719, 0xC0AE }, { 0xC720, 0xC0AF }, { 0xC721, 0xC0B0 }, 
-	{ 0xC724, 0xC0B1 }, { 0xC728, 0xC0B2 }, { 0xC730, 0xC0B3 }, { 0xC731, 0xC0B4 }, { 0xC733, 0xC0B5 }, { 0xC735, 0xC0B6 }, { 0xC737, 0xC0B7 }, { 0xC73C, 0xC0B8 }, 
-	{ 0xC73D, 0xC0B9 }, { 0xC740, 0xC0BA }, { 0xC744, 0xC0BB }, { 0xC74A, 0xC0BC }, { 0xC74C, 0xC0BD }, { 0xC74D, 0xC0BE }, { 0xC74F, 0xC0BF }, { 0xC751, 0xC0C0 }, 
-	{ 0xC752, 0xC0C1 }, { 0xC753, 0xC0C2 }, { 0xC754, 0xC0C3 }, { 0xC755, 0xC0C4 }, { 0xC756, 0xC0C5 }, { 0xC757, 0xC0C6 }, { 0xC758, 0xC0C7 }, { 0xC75C, 0xC0C8 }, 
-	{ 0xC760, 0xC0C9 }, { 0xC768, 0xC0CA }, { 0xC76B, 0xC0CB }, { 0xC774, 0xC0CC }, { 0xC775, 0xC0CD }, { 0xC778, 0xC0CE }, { 0xC77C, 0xC0CF }, { 0xC77D, 0xC0D0 }, 
-	{ 0xC77E, 0xC0D1 }, { 0xC783, 0xC0D2 }, { 0xC784, 0xC0D3 }, { 0xC785, 0xC0D4 }, { 0xC787, 0xC0D5 }, { 0xC788, 0xC0D6 }, { 0xC789, 0xC0D7 }, { 0xC78A, 0xC0D8 }, 
-	{ 0xC78E, 0xC0D9 }, { 0xC790, 0xC0DA }, { 0xC791, 0xC0DB }, { 0xC794, 0xC0DC }, { 0xC796, 0xC0DD }, { 0xC797, 0xC0DE }, { 0xC798, 0xC0DF }, { 0xC79A, 0xC0E0 }, 
-	{ 0xC7A0, 0xC0E1 }, { 0xC7A1, 0xC0E2 }, { 0xC7A3, 0xC0E3 }, { 0xC7A4, 0xC0E4 }, { 0xC7A5, 0xC0E5 }, { 0xC7A6, 0xC0E6 }, { 0xC7AC, 0xC0E7 }, { 0xC7AD, 0xC0E8 }, 
-	{ 0xC7B0, 0xC0E9 }, { 0xC7B4, 0xC0EA }, { 0xC7BC, 0xC0EB }, { 0xC7BD, 0xC0EC }, { 0xC7BF, 0xC0ED }, { 0xC7C0, 0xC0EE }, { 0xC7C1, 0xC0EF }, { 0xC7C8, 0xC0F0 }, 
-	{ 0xC7C9, 0xC0F1 }, { 0xC7CC, 0xC0F2 }, { 0xC7CE, 0xC0F3 }, { 0xC7D0, 0xC0F4 }, { 0xC7D8, 0xC0F5 }, { 0xC7DD, 0xC0F6 }, { 0xC7E4, 0xC0F7 }, { 0xC7E8, 0xC0F8 }, 
-	{ 0xC7EC, 0xC0F9 }, { 0xC800, 0xC0FA }, { 0xC801, 0xC0FB }, { 0xC804, 0xC0FC }, { 0xC808, 0xC0FD }, { 0xC80A, 0xC0FE }, { 0xC810, 0xC1A1 }, { 0xC811, 0xC1A2 }, 
-	{ 0xC813, 0xC1A3 }, { 0xC815, 0xC1A4 }, { 0xC816, 0xC1A5 }, { 0xC81C, 0xC1A6 }, { 0xC81D, 0xC1A7 }, { 0xC820, 0xC1A8 }, { 0xC824, 0xC1A9 }, { 0xC82C, 0xC1AA }, 
-	{ 0xC82D, 0xC1AB }, { 0xC82F, 0xC1AC }, { 0xC831, 0xC1AD }, { 0xC838, 0xC1AE }, { 0xC83C, 0xC1AF }, { 0xC840, 0xC1B0 }, { 0xC848, 0xC1B1 }, { 0xC849, 0xC1B2 }, 
-	{ 0xC84C, 0xC1B3 }, { 0xC84D, 0xC1B4 }, { 0xC854, 0xC1B5 }, { 0xC870, 0xC1B6 }, { 0xC871, 0xC1B7 }, { 0xC874, 0xC1B8 }, { 0xC878, 0xC1B9 }, { 0xC87A, 0xC1BA }, 
-	{ 0xC880, 0xC1BB }, { 0xC881, 0xC1BC }, { 0xC883, 0xC1BD }, { 0xC885, 0xC1BE }, { 0xC886, 0xC1BF }, { 0xC887, 0xC1C0 }, { 0xC88B, 0xC1C1 }, { 0xC88C, 0xC1C2 }, 
-	{ 0xC88D, 0xC1C3 }, { 0xC894, 0xC1C4 }, { 0xC89D, 0xC1C5 }, { 0xC89F, 0xC1C6 }, { 0xC8A1, 0xC1C7 }, { 0xC8A8, 0xC1C8 }, { 0xC8BC, 0xC1C9 }, { 0xC8BD, 0xC1CA }, 
-	{ 0xC8C4, 0xC1CB }, { 0xC8C8, 0xC1CC }, { 0xC8CC, 0xC1CD }, { 0xC8D4, 0xC1CE }, { 0xC8D5, 0xC1CF }, { 0xC8D7, 0xC1D0 }, { 0xC8D9, 0xC1D1 }, { 0xC8E0, 0xC1D2 }, 
-	{ 0xC8E1, 0xC1D3 }, { 0xC8E4, 0xC1D4 }, { 0xC8F5, 0xC1D5 }, { 0xC8FC, 0xC1D6 }, { 0xC8FD, 0xC1D7 }, { 0xC900, 0xC1D8 }, { 0xC904, 0xC1D9 }, { 0xC905, 0xC1DA }, 
-	{ 0xC906, 0xC1DB }, { 0xC90C, 0xC1DC }, { 0xC90D, 0xC1DD }, { 0xC90F, 0xC1DE }, { 0xC911, 0xC1DF }, { 0xC918, 0xC1E0 }, { 0xC92C, 0xC1E1 }, { 0xC934, 0xC1E2 }, 
-	{ 0xC950, 0xC1E3 }, { 0xC951, 0xC1E4 }, { 0xC954, 0xC1E5 }, { 0xC958, 0xC1E6 }, { 0xC960, 0xC1E7 }, { 0xC961, 0xC1E8 }, { 0xC963, 0xC1E9 }, { 0xC96C, 0xC1EA }, 
-	{ 0xC970, 0xC1EB }, { 0xC974, 0xC1EC }, { 0xC97C, 0xC1ED }, { 0xC988, 0xC1EE }, { 0xC989, 0xC1EF }, { 0xC98C, 0xC1F0 }, { 0xC990, 0xC1F1 }, { 0xC998, 0xC1F2 }, 
-	{ 0xC999, 0xC1F3 }, { 0xC99B, 0xC1F4 }, { 0xC99D, 0xC1F5 }, { 0xC9C0, 0xC1F6 }, { 0xC9C1, 0xC1F7 }, { 0xC9C4, 0xC1F8 }, { 0xC9C7, 0xC1F9 }, { 0xC9C8, 0xC1FA }, 
-	{ 0xC9CA, 0xC1FB }, { 0xC9D0, 0xC1FC }, { 0xC9D1, 0xC1FD }, { 0xC9D3, 0xC1FE }, { 0xC9D5, 0xC2A1 }, { 0xC9D6, 0xC2A2 }, { 0xC9D9, 0xC2A3 }, { 0xC9DA, 0xC2A4 }, 
-	{ 0xC9DC, 0xC2A5 }, { 0xC9DD, 0xC2A6 }, { 0xC9E0, 0xC2A7 }, { 0xC9E2, 0xC2A8 }, { 0xC9E4, 0xC2A9 }, { 0xC9E7, 0xC2AA }, { 0xC9EC, 0xC2AB }, { 0xC9ED, 0xC2AC }, 
-	{ 0xC9EF, 0xC2AD }, { 0xC9F0, 0xC2AE }, { 0xC9F1, 0xC2AF }, { 0xC9F8, 0xC2B0 }, { 0xC9F9, 0xC2B1 }, { 0xC9FC, 0xC2B2 }, { 0xCA00, 0xC2B3 }, { 0xCA08, 0xC2B4 }, 
-	{ 0xCA09, 0xC2B5 }, { 0xCA0B, 0xC2B6 }, { 0xCA0C, 0xC2B7 }, { 0xCA0D, 0xC2B8 }, { 0xCA14, 0xC2B9 }, { 0xCA18, 0xC2BA }, { 0xCA29, 0xC2BB }, { 0xCA4C, 0xC2BC }, 
-	{ 0xCA4D, 0xC2BD }, { 0xCA50, 0xC2BE }, { 0xCA54, 0xC2BF }, { 0xCA5C, 0xC2C0 }, { 0xCA5D, 0xC2C1 }, { 0xCA5F, 0xC2C2 }, { 0xCA60, 0xC2C3 }, { 0xCA61, 0xC2C4 }, 
-	{ 0xCA68, 0xC2C5 }, { 0xCA7D, 0xC2C6 }, { 0xCA84, 0xC2C7 }, { 0xCA98, 0xC2C8 }, { 0xCABC, 0xC2C9 }, { 0xCABD, 0xC2CA }, { 0xCAC0, 0xC2CB }, { 0xCAC4, 0xC2CC }, 
-	{ 0xCACC, 0xC2CD }, { 0xCACD, 0xC2CE }, { 0xCACF, 0xC2CF }, { 0xCAD1, 0xC2D0 }, { 0xCAD3, 0xC2D1 }, { 0xCAD8, 0xC2D2 }, { 0xCAD9, 0xC2D3 }, { 0xCAE0, 0xC2D4 }, 
-	{ 0xCAEC, 0xC2D5 }, { 0xCAF4, 0xC2D6 }, { 0xCB08, 0xC2D7 }, { 0xCB10, 0xC2D8 }, { 0xCB14, 0xC2D9 }, { 0xCB18, 0xC2DA }, { 0xCB20, 0xC2DB }, { 0xCB21, 0xC2DC }, 
-	{ 0xCB41, 0xC2DD }, { 0xCB48, 0xC2DE }, { 0xCB49, 0xC2DF }, { 0xCB4C, 0xC2E0 }, { 0xCB50, 0xC2E1 }, { 0xCB58, 0xC2E2 }, { 0xCB59, 0xC2E3 }, { 0xCB5D, 0xC2E4 }, 
-	{ 0xCB64, 0xC2E5 }, { 0xCB78, 0xC2E6 }, { 0xCB79, 0xC2E7 }, { 0xCB9C, 0xC2E8 }, { 0xCBB8, 0xC2E9 }, { 0xCBD4, 0xC2EA }, { 0xCBE4, 0xC2EB }, { 0xCBE7, 0xC2EC }, 
-	{ 0xCBE9, 0xC2ED }, { 0xCC0C, 0xC2EE }, { 0xCC0D, 0xC2EF }, { 0xCC10, 0xC2F0 }, { 0xCC14, 0xC2F1 }, { 0xCC1C, 0xC2F2 }, { 0xCC1D, 0xC2F3 }, { 0xCC21, 0xC2F4 }, 
-	{ 0xCC22, 0xC2F5 }, { 0xCC27, 0xC2F6 }, { 0xCC28, 0xC2F7 }, { 0xCC29, 0xC2F8 }, { 0xCC2C, 0xC2F9 }, { 0xCC2E, 0xC2FA }, { 0xCC30, 0xC2FB }, { 0xCC38, 0xC2FC }, 
-	{ 0xCC39, 0xC2FD }, { 0xCC3B, 0xC2FE }, { 0xCC3C, 0xC3A1 }, { 0xCC3D, 0xC3A2 }, { 0xCC3E, 0xC3A3 }, { 0xCC44, 0xC3A4 }, { 0xCC45, 0xC3A5 }, { 0xCC48, 0xC3A6 }, 
-	{ 0xCC4C, 0xC3A7 }, { 0xCC54, 0xC3A8 }, { 0xCC55, 0xC3A9 }, { 0xCC57, 0xC3AA }, { 0xCC58, 0xC3AB }, { 0xCC59, 0xC3AC }, { 0xCC60, 0xC3AD }, { 0xCC64, 0xC3AE }, 
-	{ 0xCC66, 0xC3AF }, { 0xCC68, 0xC3B0 }, { 0xCC70, 0xC3B1 }, { 0xCC75, 0xC3B2 }, { 0xCC98, 0xC3B3 }, { 0xCC99, 0xC3B4 }, { 0xCC9C, 0xC3B5 }, { 0xCCA0, 0xC3B6 }, 
-	{ 0xCCA8, 0xC3B7 }, { 0xCCA9, 0xC3B8 }, { 0xCCAB, 0xC3B9 }, { 0xCCAC, 0xC3BA }, { 0xCCAD, 0xC3BB }, { 0xCCB4, 0xC3BC }, { 0xCCB5, 0xC3BD }, { 0xCCB8, 0xC3BE }, 
-	{ 0xCCBC, 0xC3BF }, { 0xCCC4, 0xC3C0 }, { 0xCCC5, 0xC3C1 }, { 0xCCC7, 0xC3C2 }, { 0xCCC9, 0xC3C3 }, { 0xCCD0, 0xC3C4 }, { 0xCCD4, 0xC3C5 }, { 0xCCE4, 0xC3C6 }, 
-	{ 0xCCEC, 0xC3C7 }, { 0xCCF0, 0xC3C8 }, { 0xCD01, 0xC3C9 }, { 0xCD08, 0xC3CA }, { 0xCD09, 0xC3CB }, { 0xCD0C, 0xC3CC }, { 0xCD10, 0xC3CD }, { 0xCD18, 0xC3CE }, 
-	{ 0xCD19, 0xC3CF }, { 0xCD1B, 0xC3D0 }, { 0xCD1D, 0xC3D1 }, { 0xCD24, 0xC3D2 }, { 0xCD28, 0xC3D3 }, { 0xCD2C, 0xC3D4 }, { 0xCD39, 0xC3D5 }, { 0xCD5C, 0xC3D6 }, 
-	{ 0xCD60, 0xC3D7 }, { 0xCD64, 0xC3D8 }, { 0xCD6C, 0xC3D9 }, { 0xCD6D, 0xC3DA }, { 0xCD6F, 0xC3DB }, { 0xCD71, 0xC3DC }, { 0xCD78, 0xC3DD }, { 0xCD88, 0xC3DE }, 
-	{ 0xCD94, 0xC3DF }, { 0xCD95, 0xC3E0 }, { 0xCD98, 0xC3E1 }, { 0xCD9C, 0xC3E2 }, { 0xCDA4, 0xC3E3 }, { 0xCDA5, 0xC3E4 }, { 0xCDA7, 0xC3E5 }, { 0xCDA9, 0xC3E6 }, 
-	{ 0xCDB0, 0xC3E7 }, { 0xCDC4, 0xC3E8 }, { 0xCDCC, 0xC3E9 }, { 0xCDD0, 0xC3EA }, { 0xCDE8, 0xC3EB }, { 0xCDEC, 0xC3EC }, { 0xCDF0, 0xC3ED }, { 0xCDF8, 0xC3EE }, 
-	{ 0xCDF9, 0xC3EF }, { 0xCDFB, 0xC3F0 }, { 0xCDFD, 0xC3F1 }, { 0xCE04, 0xC3F2 }, { 0xCE08, 0xC3F3 }, { 0xCE0C, 0xC3F4 }, { 0xCE14, 0xC3F5 }, { 0xCE19, 0xC3F6 }, 
-	{ 0xCE20, 0xC3F7 }, { 0xCE21, 0xC3F8 }, { 0xCE24, 0xC3F9 }, { 0xCE28, 0xC3FA }, { 0xCE30, 0xC3FB }, { 0xCE31, 0xC3FC }, { 0xCE33, 0xC3FD }, { 0xCE35, 0xC3FE }, 
-	{ 0xCE58, 0xC4A1 }, { 0xCE59, 0xC4A2 }, { 0xCE5C, 0xC4A3 }, { 0xCE5F, 0xC4A4 }, { 0xCE60, 0xC4A5 }, { 0xCE61, 0xC4A6 }, { 0xCE68, 0xC4A7 }, { 0xCE69, 0xC4A8 }, 
-	{ 0xCE6B, 0xC4A9 }, { 0xCE6D, 0xC4AA }, { 0xCE74, 0xC4AB }, { 0xCE75, 0xC4AC }, { 0xCE78, 0xC4AD }, { 0xCE7C, 0xC4AE }, { 0xCE84, 0xC4AF }, { 0xCE85, 0xC4B0 }, 
-	{ 0xCE87, 0xC4B1 }, { 0xCE89, 0xC4B2 }, { 0xCE90, 0xC4B3 }, { 0xCE91, 0xC4B4 }, { 0xCE94, 0xC4B5 }, { 0xCE98, 0xC4B6 }, { 0xCEA0, 0xC4B7 }, { 0xCEA1, 0xC4B8 }, 
-	{ 0xCEA3, 0xC4B9 }, { 0xCEA4, 0xC4BA }, { 0xCEA5, 0xC4BB }, { 0xCEAC, 0xC4BC }, { 0xCEAD, 0xC4BD }, { 0xCEC1, 0xC4BE }, { 0xCEE4, 0xC4BF }, { 0xCEE5, 0xC4C0 }, 
-	{ 0xCEE8, 0xC4C1 }, { 0xCEEB, 0xC4C2 }, { 0xCEEC, 0xC4C3 }, { 0xCEF4, 0xC4C4 }, { 0xCEF5, 0xC4C5 }, { 0xCEF7, 0xC4C6 }, { 0xCEF8, 0xC4C7 }, { 0xCEF9, 0xC4C8 }, 
-	{ 0xCF00, 0xC4C9 }, { 0xCF01, 0xC4CA }, { 0xCF04, 0xC4CB }, { 0xCF08, 0xC4CC }, { 0xCF10, 0xC4CD }, { 0xCF11, 0xC4CE }, { 0xCF13, 0xC4CF }, { 0xCF15, 0xC4D0 }, 
-	{ 0xCF1C, 0xC4D1 }, { 0xCF20, 0xC4D2 }, { 0xCF24, 0xC4D3 }, { 0xCF2C, 0xC4D4 }, { 0xCF2D, 0xC4D5 }, { 0xCF2F, 0xC4D6 }, { 0xCF30, 0xC4D7 }, { 0xCF31, 0xC4D8 }, 
-	{ 0xCF38, 0xC4D9 }, { 0xCF54, 0xC4DA }, { 0xCF55, 0xC4DB }, { 0xCF58, 0xC4DC }, { 0xCF5C, 0xC4DD }, { 0xCF64, 0xC4DE }, { 0xCF65, 0xC4DF }, { 0xCF67, 0xC4E0 }, 
-	{ 0xCF69, 0xC4E1 }, { 0xCF70, 0xC4E2 }, { 0xCF71, 0xC4E3 }, { 0xCF74, 0xC4E4 }, { 0xCF78, 0xC4E5 }, { 0xCF80, 0xC4E6 }, { 0xCF85, 0xC4E7 }, { 0xCF8C, 0xC4E8 }, 
-	{ 0xCFA1, 0xC4E9 }, { 0xCFA8, 0xC4EA }, { 0xCFB0, 0xC4EB }, { 0xCFC4, 0xC4EC }, { 0xCFE0, 0xC4ED }, { 0xCFE1, 0xC4EE }, { 0xCFE4, 0xC4EF }, { 0xCFE8, 0xC4F0 }, 
-	{ 0xCFF0, 0xC4F1 }, { 0xCFF1, 0xC4F2 }, { 0xCFF3, 0xC4F3 }, { 0xCFF5, 0xC4F4 }, { 0xCFFC, 0xC4F5 }, { 0xD000, 0xC4F6 }, { 0xD004, 0xC4F7 }, { 0xD011, 0xC4F8 }, 
-	{ 0xD018, 0xC4F9 }, { 0xD02D, 0xC4FA }, { 0xD034, 0xC4FB }, { 0xD035, 0xC4FC }, { 0xD038, 0xC4FD }, { 0xD03C, 0xC4FE }, { 0xD044, 0xC5A1 }, { 0xD045, 0xC5A2 }, 
-	{ 0xD047, 0xC5A3 }, { 0xD049, 0xC5A4 }, { 0xD050, 0xC5A5 }, { 0xD054, 0xC5A6 }, { 0xD058, 0xC5A7 }, { 0xD060, 0xC5A8 }, { 0xD06C, 0xC5A9 }, { 0xD06D, 0xC5AA }, 
-	{ 0xD070, 0xC5AB }, { 0xD074, 0xC5AC }, { 0xD07C, 0xC5AD }, { 0xD07D, 0xC5AE }, { 0xD081, 0xC5AF }, { 0xD0A4, 0xC5B0 }, { 0xD0A5, 0xC5B1 }, { 0xD0A8, 0xC5B2 }, 
-	{ 0xD0AC, 0xC5B3 }, { 0xD0B4, 0xC5B4 }, { 0xD0B5, 0xC5B5 }, { 0xD0B7, 0xC5B6 }, { 0xD0B9, 0xC5B7 }, { 0xD0C0, 0xC5B8 }, { 0xD0C1, 0xC5B9 }, { 0xD0C4, 0xC5BA }, 
-	{ 0xD0C8, 0xC5BB }, { 0xD0C9, 0xC5BC }, { 0xD0D0, 0xC5BD }, { 0xD0D1, 0xC5BE }, { 0xD0D3, 0xC5BF }, { 0xD0D4, 0xC5C0 }, { 0xD0D5, 0xC5C1 }, { 0xD0DC, 0xC5C2 }, 
-	{ 0xD0DD, 0xC5C3 }, { 0xD0E0, 0xC5C4 }, { 0xD0E4, 0xC5C5 }, { 0xD0EC, 0xC5C6 }, { 0xD0ED, 0xC5C7 }, { 0xD0EF, 0xC5C8 }, { 0xD0F0, 0xC5C9 }, { 0xD0F1, 0xC5CA }, 
-	{ 0xD0F8, 0xC5CB }, { 0xD10D, 0xC5CC }, { 0xD130, 0xC5CD }, { 0xD131, 0xC5CE }, { 0xD134, 0xC5CF }, { 0xD138, 0xC5D0 }, { 0xD13A, 0xC5D1 }, { 0xD140, 0xC5D2 }, 
-	{ 0xD141, 0xC5D3 }, { 0xD143, 0xC5D4 }, { 0xD144, 0xC5D5 }, { 0xD145, 0xC5D6 }, { 0xD14C, 0xC5D7 }, { 0xD14D, 0xC5D8 }, { 0xD150, 0xC5D9 }, { 0xD154, 0xC5DA }, 
-	{ 0xD15C, 0xC5DB }, { 0xD15D, 0xC5DC }, { 0xD15F, 0xC5DD }, { 0xD161, 0xC5DE }, { 0xD168, 0xC5DF }, { 0xD16C, 0xC5E0 }, { 0xD17C, 0xC5E1 }, { 0xD184, 0xC5E2 }, 
-	{ 0xD188, 0xC5E3 }, { 0xD1A0, 0xC5E4 }, { 0xD1A1, 0xC5E5 }, { 0xD1A4, 0xC5E6 }, { 0xD1A8, 0xC5E7 }, { 0xD1B0, 0xC5E8 }, { 0xD1B1, 0xC5E9 }, { 0xD1B3, 0xC5EA }, 
-	{ 0xD1B5, 0xC5EB }, { 0xD1BA, 0xC5EC }, { 0xD1BC, 0xC5ED }, { 0xD1C0, 0xC5EE }, { 0xD1D8, 0xC5EF }, { 0xD1F4, 0xC5F0 }, { 0xD1F8, 0xC5F1 }, { 0xD207, 0xC5F2 }, 
-	{ 0xD209, 0xC5F3 }, { 0xD210, 0xC5F4 }, { 0xD22C, 0xC5F5 }, { 0xD22D, 0xC5F6 }, { 0xD230, 0xC5F7 }, { 0xD234, 0xC5F8 }, { 0xD23C, 0xC5F9 }, { 0xD23D, 0xC5FA }, 
-	{ 0xD23F, 0xC5FB }, { 0xD241, 0xC5FC }, { 0xD248, 0xC5FD }, { 0xD25C, 0xC5FE }, { 0xD264, 0xC6A1 }, { 0xD280, 0xC6A2 }, { 0xD281, 0xC6A3 }, { 0xD284, 0xC6A4 }, 
-	{ 0xD288, 0xC6A5 }, { 0xD290, 0xC6A6 }, { 0xD291, 0xC6A7 }, { 0xD295, 0xC6A8 }, { 0xD29C, 0xC6A9 }, { 0xD2A0, 0xC6AA }, { 0xD2A4, 0xC6AB }, { 0xD2AC, 0xC6AC }, 
-	{ 0xD2B1, 0xC6AD }, { 0xD2B8, 0xC6AE }, { 0xD2B9, 0xC6AF }, { 0xD2BC, 0xC6B0 }, { 0xD2BF, 0xC6B1 }, { 0xD2C0, 0xC6B2 }, { 0xD2C2, 0xC6B3 }, { 0xD2C8, 0xC6B4 }, 
-	{ 0xD2C9, 0xC6B5 }, { 0xD2CB, 0xC6B6 }, { 0xD2D4, 0xC6B7 }, { 0xD2D8, 0xC6B8 }, { 0xD2DC, 0xC6B9 }, { 0xD2E4, 0xC6BA }, { 0xD2E5, 0xC6BB }, { 0xD2F0, 0xC6BC }, 
-	{ 0xD2F1, 0xC6BD }, { 0xD2F4, 0xC6BE }, { 0xD2F8, 0xC6BF }, { 0xD300, 0xC6C0 }, { 0xD301, 0xC6C1 }, { 0xD303, 0xC6C2 }, { 0xD305, 0xC6C3 }, { 0xD30C, 0xC6C4 }, 
-	{ 0xD30D, 0xC6C5 }, { 0xD30E, 0xC6C6 }, { 0xD310, 0xC6C7 }, { 0xD314, 0xC6C8 }, { 0xD316, 0xC6C9 }, { 0xD31C, 0xC6CA }, { 0xD31D, 0xC6CB }, { 0xD31F, 0xC6CC }, 
-	{ 0xD320, 0xC6CD }, { 0xD321, 0xC6CE }, { 0xD325, 0xC6CF }, { 0xD328, 0xC6D0 }, { 0xD329, 0xC6D1 }, { 0xD32C, 0xC6D2 }, { 0xD330, 0xC6D3 }, { 0xD338, 0xC6D4 }, 
-	{ 0xD339, 0xC6D5 }, { 0xD33B, 0xC6D6 }, { 0xD33C, 0xC6D7 }, { 0xD33D, 0xC6D8 }, { 0xD344, 0xC6D9 }, { 0xD345, 0xC6DA }, { 0xD37C, 0xC6DB }, { 0xD37D, 0xC6DC }, 
-	{ 0xD380, 0xC6DD }, { 0xD384, 0xC6DE }, { 0xD38C, 0xC6DF }, { 0xD38D, 0xC6E0 }, { 0xD38F, 0xC6E1 }, { 0xD390, 0xC6E2 }, { 0xD391, 0xC6E3 }, { 0xD398, 0xC6E4 }, 
-	{ 0xD399, 0xC6E5 }, { 0xD39C, 0xC6E6 }, { 0xD3A0, 0xC6E7 }, { 0xD3A8, 0xC6E8 }, { 0xD3A9, 0xC6E9 }, { 0xD3AB, 0xC6EA }, { 0xD3AD, 0xC6EB }, { 0xD3B4, 0xC6EC }, 
-	{ 0xD3B8, 0xC6ED }, { 0xD3BC, 0xC6EE }, { 0xD3C4, 0xC6EF }, { 0xD3C5, 0xC6F0 }, { 0xD3C8, 0xC6F1 }, { 0xD3C9, 0xC6F2 }, { 0xD3D0, 0xC6F3 }, { 0xD3D8, 0xC6F4 }, 
-	{ 0xD3E1, 0xC6F5 }, { 0xD3E3, 0xC6F6 }, { 0xD3EC, 0xC6F7 }, { 0xD3ED, 0xC6F8 }, { 0xD3F0, 0xC6F9 }, { 0xD3F4, 0xC6FA }, { 0xD3FC, 0xC6FB }, { 0xD3FD, 0xC6FC }, 
-	{ 0xD3FF, 0xC6FD }, { 0xD401, 0xC6FE }, { 0xD408, 0xC7A1 }, { 0xD41D, 0xC7A2 }, { 0xD440, 0xC7A3 }, { 0xD444, 0xC7A4 }, { 0xD45C, 0xC7A5 }, { 0xD460, 0xC7A6 }, 
-	{ 0xD464, 0xC7A7 }, { 0xD46D, 0xC7A8 }, { 0xD46F, 0xC7A9 }, { 0xD478, 0xC7AA }, { 0xD479, 0xC7AB }, { 0xD47C, 0xC7AC }, { 0xD47F, 0xC7AD }, { 0xD480, 0xC7AE }, 
-	{ 0xD482, 0xC7AF }, { 0xD488, 0xC7B0 }, { 0xD489, 0xC7B1 }, { 0xD48B, 0xC7B2 }, { 0xD48D, 0xC7B3 }, { 0xD494, 0xC7B4 }, { 0xD4A9, 0xC7B5 }, { 0xD4CC, 0xC7B6 }, 
-	{ 0xD4D0, 0xC7B7 }, { 0xD4D4, 0xC7B8 }, { 0xD4DC, 0xC7B9 }, { 0xD4DF, 0xC7BA }, { 0xD4E8, 0xC7BB }, { 0xD4EC, 0xC7BC }, { 0xD4F0, 0xC7BD }, { 0xD4F8, 0xC7BE }, 
-	{ 0xD4FB, 0xC7BF }, { 0xD4FD, 0xC7C0 }, { 0xD504, 0xC7C1 }, { 0xD508, 0xC7C2 }, { 0xD50C, 0xC7C3 }, { 0xD514, 0xC7C4 }, { 0xD515, 0xC7C5 }, { 0xD517, 0xC7C6 }, 
-	{ 0xD53C, 0xC7C7 }, { 0xD53D, 0xC7C8 }, { 0xD540, 0xC7C9 }, { 0xD544, 0xC7CA }, { 0xD54C, 0xC7CB }, { 0xD54D, 0xC7CC }, { 0xD54F, 0xC7CD }, { 0xD551, 0xC7CE }, 
-	{ 0xD558, 0xC7CF }, { 0xD559, 0xC7D0 }, { 0xD55C, 0xC7D1 }, { 0xD560, 0xC7D2 }, { 0xD565, 0xC7D3 }, { 0xD568, 0xC7D4 }, { 0xD569, 0xC7D5 }, { 0xD56B, 0xC7D6 }, 
-	{ 0xD56D, 0xC7D7 }, { 0xD574, 0xC7D8 }, { 0xD575, 0xC7D9 }, { 0xD578, 0xC7DA }, { 0xD57C, 0xC7DB }, { 0xD584, 0xC7DC }, { 0xD585, 0xC7DD }, { 0xD587, 0xC7DE }, 
-	{ 0xD588, 0xC7DF }, { 0xD589, 0xC7E0 }, { 0xD590, 0xC7E1 }, { 0xD5A5, 0xC7E2 }, { 0xD5C8, 0xC7E3 }, { 0xD5C9, 0xC7E4 }, { 0xD5CC, 0xC7E5 }, { 0xD5D0, 0xC7E6 }, 
-	{ 0xD5D2, 0xC7E7 }, { 0xD5D8, 0xC7E8 }, { 0xD5D9, 0xC7E9 }, { 0xD5DB, 0xC7EA }, { 0xD5DD, 0xC7EB }, { 0xD5E4, 0xC7EC }, { 0xD5E5, 0xC7ED }, { 0xD5E8, 0xC7EE }, 
-	{ 0xD5EC, 0xC7EF }, { 0xD5F4, 0xC7F0 }, { 0xD5F5, 0xC7F1 }, { 0xD5F7, 0xC7F2 }, { 0xD5F9, 0xC7F3 }, { 0xD600, 0xC7F4 }, { 0xD601, 0xC7F5 }, { 0xD604, 0xC7F6 }, 
-	{ 0xD608, 0xC7F7 }, { 0xD610, 0xC7F8 }, { 0xD611, 0xC7F9 }, { 0xD613, 0xC7FA }, { 0xD614, 0xC7FB }, { 0xD615, 0xC7FC }, { 0xD61C, 0xC7FD }, { 0xD620, 0xC7FE }, 
-	{ 0xD624, 0xC8A1 }, { 0xD62D, 0xC8A2 }, { 0xD638, 0xC8A3 }, { 0xD639, 0xC8A4 }, { 0xD63C, 0xC8A5 }, { 0xD640, 0xC8A6 }, { 0xD645, 0xC8A7 }, { 0xD648, 0xC8A8 }, 
-	{ 0xD649, 0xC8A9 }, { 0xD64B, 0xC8AA }, { 0xD64D, 0xC8AB }, { 0xD651, 0xC8AC }, { 0xD654, 0xC8AD }, { 0xD655, 0xC8AE }, { 0xD658, 0xC8AF }, { 0xD65C, 0xC8B0 }, 
-	{ 0xD667, 0xC8B1 }, { 0xD669, 0xC8B2 }, { 0xD670, 0xC8B3 }, { 0xD671, 0xC8B4 }, { 0xD674, 0xC8B5 }, { 0xD683, 0xC8B6 }, { 0xD685, 0xC8B7 }, { 0xD68C, 0xC8B8 }, 
-	{ 0xD68D, 0xC8B9 }, { 0xD690, 0xC8BA }, { 0xD694, 0xC8BB }, { 0xD69D, 0xC8BC }, { 0xD69F, 0xC8BD }, { 0xD6A1, 0xC8BE }, { 0xD6A8, 0xC8BF }, { 0xD6AC, 0xC8C0 }, 
-	{ 0xD6B0, 0xC8C1 }, { 0xD6B9, 0xC8C2 }, { 0xD6BB, 0xC8C3 }, { 0xD6C4, 0xC8C4 }, { 0xD6C5, 0xC8C5 }, { 0xD6C8, 0xC8C6 }, { 0xD6CC, 0xC8C7 }, { 0xD6D1, 0xC8C8 }, 
-	{ 0xD6D4, 0xC8C9 }, { 0xD6D7, 0xC8CA }, { 0xD6D9, 0xC8CB }, { 0xD6E0, 0xC8CC }, { 0xD6E4, 0xC8CD }, { 0xD6E8, 0xC8CE }, { 0xD6F0, 0xC8CF }, { 0xD6F5, 0xC8D0 }, 
-	{ 0xD6FC, 0xC8D1 }, { 0xD6FD, 0xC8D2 }, { 0xD700, 0xC8D3 }, { 0xD704, 0xC8D4 }, { 0xD711, 0xC8D5 }, { 0xD718, 0xC8D6 }, { 0xD719, 0xC8D7 }, { 0xD71C, 0xC8D8 }, 
-	{ 0xD720, 0xC8D9 }, { 0xD728, 0xC8DA }, { 0xD729, 0xC8DB }, { 0xD72B, 0xC8DC }, { 0xD72D, 0xC8DD }, { 0xD734, 0xC8DE }, { 0xD735, 0xC8DF }, { 0xD738, 0xC8E0 }, 
-	{ 0xD73C, 0xC8E1 }, { 0xD744, 0xC8E2 }, { 0xD747, 0xC8E3 }, { 0xD749, 0xC8E4 }, { 0xD750, 0xC8E5 }, { 0xD751, 0xC8E6 }, { 0xD754, 0xC8E7 }, { 0xD756, 0xC8E8 }, 
-	{ 0xD757, 0xC8E9 }, { 0xD758, 0xC8EA }, { 0xD759, 0xC8EB }, { 0xD760, 0xC8EC }, { 0xD761, 0xC8ED }, { 0xD763, 0xC8EE }, { 0xD765, 0xC8EF }, { 0xD769, 0xC8F0 }, 
-	{ 0xD76C, 0xC8F1 }, { 0xD770, 0xC8F2 }, { 0xD774, 0xC8F3 }, { 0xD77C, 0xC8F4 }, { 0xD77D, 0xC8F5 }, { 0xD781, 0xC8F6 }, { 0xD788, 0xC8F7 }, { 0xD789, 0xC8F8 }, 
-	{ 0xD78C, 0xC8F9 }, { 0xD790, 0xC8FA }, { 0xD798, 0xC8FB }, { 0xD799, 0xC8FC }, { 0xD79B, 0xC8FD }, { 0xD79D, 0xC8FE }, { 0xF805, 0xA658 }, { 0xF806, 0xA663 }, 
-	{ 0xF807, 0xA69F }, { 0xF808, 0xA68F }, { 0xF809, 0xA681 }, { 0xF80A, 0xA674 }, { 0xF80B, 0xA696 }, { 0xF80C, 0xA69A }, { 0xF83D, 0xA642 }, { 0xF840, 0xA16E }, 
-	{ 0xF841, 0xA894 }, { 0xF842, 0xAC54 }, { 0xF843, 0xAC42 }, { 0xF844, 0xAC49 }, { 0xF845, 0xAC5F }, { 0xF846, 0xA867 }, { 0xF847, 0xA868 }, { 0xF848, 0xA89D }, 
-	{ 0xF849, 0xA89C }, { 0xF84A, 0xAC4B }, { 0xF84B, 0xAC4A }, { 0xF84C, 0xA747 }, { 0xF84D, 0xA74B }, { 0xF84E, 0xA74C }, { 0xF84F, 0xA74D }, { 0xF900, 0xCBD0 }, 
-	{ 0xF901, 0xCBD6 }, { 0xF902, 0xCBE7 }, { 0xF903, 0xCDCF }, { 0xF904, 0xCDE8 }, { 0xF905, 0xCEAD }, { 0xF906, 0xCFFB }, { 0xF907, 0xD0A2 }, { 0xF908, 0xD0B8 }, 
-	{ 0xF909, 0xD0D0 }, { 0xF90A, 0xD0DD }, { 0xF90B, 0xD1D4 }, { 0xF90C, 0xD1D5 }, { 0xF90D, 0xD1D8 }, { 0xF90E, 0xD1DB }, { 0xF90F, 0xD1DC }, { 0xF910, 0xD1DD }, 
-	{ 0xF911, 0xD1DE }, { 0xF912, 0xD1DF }, { 0xF913, 0xD1E0 }, { 0xF914, 0xD1E2 }, { 0xF915, 0xD1E3 }, { 0xF916, 0xD1E4 }, { 0xF917, 0xD1E5 }, { 0xF918, 0xD1E6 }, 
-	{ 0xF919, 0xD1E8 }, { 0xF91A, 0xD1E9 }, { 0xF91B, 0xD1EA }, { 0xF91C, 0xD1EB }, { 0xF91D, 0xD1ED }, { 0xF91E, 0xD1EF }, { 0xF91F, 0xD1F0 }, { 0xF920, 0xD1F2 }, 
-	{ 0xF921, 0xD1F6 }, { 0xF922, 0xD1FA }, { 0xF923, 0xD1FC }, { 0xF924, 0xD1FD }, { 0xF925, 0xD1FE }, { 0xF926, 0xD2A2 }, { 0xF927, 0xD2A3 }, { 0xF928, 0xD2A7 }, 
-	{ 0xF929, 0xD2A8 }, { 0xF92A, 0xD2A9 }, { 0xF92B, 0xD2AA }, { 0xF92C, 0xD2AB }, { 0xF92D, 0xD2AD }, { 0xF92E, 0xD2B2 }, { 0xF92F, 0xD2BE }, { 0xF930, 0xD2C2 }, 
-	{ 0xF931, 0xD2C3 }, { 0xF932, 0xD2C4 }, { 0xF933, 0xD2C6 }, { 0xF934, 0xD2C7 }, { 0xF935, 0xD2C8 }, { 0xF936, 0xD2C9 }, { 0xF937, 0xD2CA }, { 0xF938, 0xD2CB }, 
-	{ 0xF939, 0xD2CD }, { 0xF93A, 0xD2CE }, { 0xF93B, 0xD2CF }, { 0xF93C, 0xD2D0 }, { 0xF93D, 0xD2D1 }, { 0xF93E, 0xD2D2 }, { 0xF93F, 0xD2D3 }, { 0xF940, 0xD2D4 }, 
-	{ 0xF941, 0xD2D5 }, { 0xF942, 0xD2D6 }, { 0xF943, 0xD2D7 }, { 0xF944, 0xD2D9 }, { 0xF945, 0xD2DA }, { 0xF946, 0xD2DE }, { 0xF947, 0xD2DF }, { 0xF948, 0xD2E1 }, 
-	{ 0xF949, 0xD2E2 }, { 0xF94A, 0xD2E4 }, { 0xF94B, 0xD2E5 }, { 0xF94C, 0xD2E6 }, { 0xF94D, 0xD2E7 }, { 0xF94E, 0xD2E8 }, { 0xF94F, 0xD2E9 }, { 0xF950, 0xD2EA }, 
-	{ 0xF951, 0xD2EB }, { 0xF952, 0xD2F0 }, { 0xF953, 0xD2F1 }, { 0xF954, 0xD2F2 }, { 0xF955, 0xD2F3 }, { 0xF956, 0xD2F4 }, { 0xF957, 0xD2F5 }, { 0xF958, 0xD2F7 }, 
-	{ 0xF959, 0xD2F8 }, { 0xF95A, 0xD4E6 }, { 0xF95B, 0xD4FC }, { 0xF95C, 0xD5A5 }, { 0xF95D, 0xD5AB }, { 0xF95E, 0xD5AE }, { 0xF95F, 0xD6B8 }, { 0xF960, 0xD6CD }, 
-	{ 0xF961, 0xD7CB }, { 0xF962, 0xD7E4 }, { 0xF963, 0xDBC5 }, { 0xF964, 0xDBE4 }, { 0xF965, 0xDCA5 }, { 0xF966, 0xDDA5 }, { 0xF967, 0xDDD5 }, { 0xF968, 0xDDF4 }, 
-	{ 0xF969, 0xDEFC }, { 0xF96A, 0xDEFE }, { 0xF96B, 0xDFB3 }, { 0xF96C, 0xDFE1 }, { 0xF96D, 0xDFE8 }, { 0xF96E, 0xE0F1 }, { 0xF96F, 0xE1AD }, { 0xF970, 0xE1ED }, 
-	{ 0xF971, 0xE3F5 }, { 0xF972, 0xE4A1 }, { 0xF973, 0xE4A9 }, { 0xF974, 0xE5AE }, { 0xF975, 0xE5B1 }, { 0xF976, 0xE5B2 }, { 0xF977, 0xE5B9 }, { 0xF978, 0xE5BB }, 
-	{ 0xF979, 0xE5BC }, { 0xF97A, 0xE5C4 }, { 0xF97B, 0xE5CE }, { 0xF97C, 0xE5D0 }, { 0xF97D, 0xE5D2 }, { 0xF97E, 0xE5D6 }, { 0xF97F, 0xE5FA }, { 0xF980, 0xE5FB }, 
-	{ 0xF981, 0xE5FC }, { 0xF982, 0xE5FE }, { 0xF983, 0xE6A1 }, { 0xF984, 0xE6A4 }, { 0xF985, 0xE6A7 }, { 0xF986, 0xE6AD }, { 0xF987, 0xE6AF }, { 0xF988, 0xE6B0 }, 
-	{ 0xF989, 0xE6B1 }, { 0xF98A, 0xE6B3 }, { 0xF98B, 0xE6B7 }, { 0xF98C, 0xE6B8 }, { 0xF98D, 0xE6BC }, { 0xF98E, 0xE6C4 }, { 0xF98F, 0xE6C6 }, { 0xF990, 0xE6C7 }, 
-	{ 0xF991, 0xE6CA }, { 0xF992, 0xE6D2 }, { 0xF993, 0xE6D6 }, { 0xF994, 0xE6D9 }, { 0xF995, 0xE6DC }, { 0xF996, 0xE6DF }, { 0xF997, 0xE6E1 }, { 0xF998, 0xE6E4 }, 
-	{ 0xF999, 0xE6E5 }, { 0xF99A, 0xE6E6 }, { 0xF99B, 0xE6E8 }, { 0xF99C, 0xE6EA }, { 0xF99D, 0xE6EB }, { 0xF99E, 0xE6EC }, { 0xF99F, 0xE6EF }, { 0xF9A0, 0xE6F1 }, 
-	{ 0xF9A1, 0xE6F2 }, { 0xF9A2, 0xE6F5 }, { 0xF9A3, 0xE6F6 }, { 0xF9A4, 0xE6F7 }, { 0xF9A5, 0xE6F9 }, { 0xF9A6, 0xE7A1 }, { 0xF9A7, 0xE7A6 }, { 0xF9A8, 0xE7A9 }, 
-	{ 0xF9A9, 0xE7AA }, { 0xF9AA, 0xE7AC }, { 0xF9AB, 0xE7AD }, { 0xF9AC, 0xE7B0 }, { 0xF9AD, 0xE7BF }, { 0xF9AE, 0xE7C1 }, { 0xF9AF, 0xE7C6 }, { 0xF9B0, 0xE7C7 }, 
-	{ 0xF9B1, 0xE7CB }, { 0xF9B2, 0xE7CD }, { 0xF9B3, 0xE7CF }, { 0xF9B4, 0xE7D0 }, { 0xF9B5, 0xE7D3 }, { 0xF9B6, 0xE7DF }, { 0xF9B7, 0xE7E4 }, { 0xF9B8, 0xE7E6 }, 
-	{ 0xF9B9, 0xE7F7 }, { 0xF9BA, 0xE8E7 }, { 0xF9BB, 0xE8E8 }, { 0xF9BC, 0xE8F0 }, { 0xF9BD, 0xE8F1 }, { 0xF9BE, 0xE8F7 }, { 0xF9BF, 0xE8F9 }, { 0xF9C0, 0xE8FB }, 
-	{ 0xF9C1, 0xE8FE }, { 0xF9C2, 0xE9A7 }, { 0xF9C3, 0xE9AC }, { 0xF9C4, 0xE9CC }, { 0xF9C5, 0xE9F7 }, { 0xF9C6, 0xEAC1 }, { 0xF9C7, 0xEAE5 }, { 0xF9C8, 0xEAF4 }, 
-	{ 0xF9C9, 0xEAF7 }, { 0xF9CA, 0xEAFC }, { 0xF9CB, 0xEAFE }, { 0xF9CC, 0xEBA4 }, { 0xF9CD, 0xEBA7 }, { 0xF9CE, 0xEBA9 }, { 0xF9CF, 0xEBAA }, { 0xF9D0, 0xEBBA }, 
-	{ 0xF9D1, 0xEBBB }, { 0xF9D2, 0xEBBD }, { 0xF9D3, 0xEBC1 }, { 0xF9D4, 0xEBC2 }, { 0xF9D5, 0xEBC6 }, { 0xF9D6, 0xEBC7 }, { 0xF9D7, 0xEBCC }, { 0xF9D8, 0xEBCF }, 
-	{ 0xF9D9, 0xEBD0 }, { 0xF9DA, 0xEBD1 }, { 0xF9DB, 0xEBD2 }, { 0xF9DC, 0xEBD8 }, { 0xF9DD, 0xECA6 }, { 0xF9DE, 0xECA7 }, { 0xF9DF, 0xECAA }, { 0xF9E0, 0xECAF }, 
-	{ 0xF9E1, 0xECB0 }, { 0xF9E2, 0xECB1 }, { 0xF9E3, 0xECB2 }, { 0xF9E4, 0xECB5 }, { 0xF9E5, 0xECB8 }, { 0xF9E6, 0xECBA }, { 0xF9E7, 0xECC0 }, { 0xF9E8, 0xECC1 }, 
-	{ 0xF9E9, 0xECC5 }, { 0xF9EA, 0xECC6 }, { 0xF9EB, 0xECC9 }, { 0xF9EC, 0xECCA }, { 0xF9ED, 0xECD5 }, { 0xF9EE, 0xECDD }, { 0xF9EF, 0xECDE }, { 0xF9F0, 0xECE1 }, 
-	{ 0xF9F1, 0xECE4 }, { 0xF9F2, 0xECE7 }, { 0xF9F3, 0xECE8 }, { 0xF9F4, 0xECF7 }, { 0xF9F5, 0xECF8 }, { 0xF9F6, 0xECFA }, { 0xF9F7, 0xEDA1 }, { 0xF9F8, 0xEDA2 }, 
-	{ 0xF9F9, 0xEDA3 }, { 0xF9FA, 0xEDEE }, { 0xF9FB, 0xEEDB }, { 0xF9FC, 0xF2BD }, { 0xF9FD, 0xF2FA }, { 0xF9FE, 0xF3B1 }, { 0xF9FF, 0xF4A7 }, { 0xFA00, 0xF4EE }, 
-	{ 0xFA01, 0xF6F4 }, { 0xFA02, 0xF6F6 }, { 0xFA03, 0xF7B8 }, { 0xFA04, 0xF7C8 }, { 0xFA05, 0xF7D3 }, { 0xFA06, 0xF8DB }, { 0xFA07, 0xF8F0 }, { 0xFA08, 0xFAA1 }, 
-	{ 0xFA09, 0xFAA2 }, { 0xFA0A, 0xFAE6 }, { 0xFA0B, 0xFCA9 }, { 0xFE59, 0xA14D }, { 0xFE5A, 0xA14E }, { 0xFF01, 0xA3A1 }, { 0xFF02, 0xA3A2 }, { 0xFF03, 0xA3A3 }, 
-	{ 0xFF04, 0xA3A4 }, { 0xFF05, 0xA3A5 }, { 0xFF06, 0xA3A6 }, { 0xFF07, 0xA3A7 }, { 0xFF08, 0xA3A8 }, { 0xFF09, 0xA3A9 }, { 0xFF0A, 0xA3AA }, { 0xFF0B, 0xA3AB }, 
-	{ 0xFF0C, 0xA3AC }, { 0xFF0D, 0xA3AD }, { 0xFF0E, 0xA3AE }, { 0xFF0F, 0xA3AF }, { 0xFF10, 0xA3B0 }, { 0xFF11, 0xA3B1 }, { 0xFF12, 0xA3B2 }, { 0xFF13, 0xA3B3 }, 
-	{ 0xFF14, 0xA3B4 }, { 0xFF15, 0xA3B5 }, { 0xFF16, 0xA3B6 }, { 0xFF17, 0xA3B7 }, { 0xFF18, 0xA3B8 }, { 0xFF19, 0xA3B9 }, { 0xFF1A, 0xA3BA }, { 0xFF1B, 0xA3BB }, 
-	{ 0xFF1C, 0xA3BC }, { 0xFF1D, 0xA3BD }, { 0xFF1E, 0xA3BE }, { 0xFF1F, 0xA3BF }, { 0xFF20, 0xA3C0 }, { 0xFF21, 0xA3C1 }, { 0xFF22, 0xA3C2 }, { 0xFF23, 0xA3C3 }, 
-	{ 0xFF24, 0xA3C4 }, { 0xFF25, 0xA3C5 }, { 0xFF26, 0xA3C6 }, { 0xFF27, 0xA3C7 }, { 0xFF28, 0xA3C8 }, { 0xFF29, 0xA3C9 }, { 0xFF2A, 0xA3CA }, { 0xFF2B, 0xA3CB }, 
-	{ 0xFF2C, 0xA3CC }, { 0xFF2D, 0xA3CD }, { 0xFF2E, 0xA3CE }, { 0xFF2F, 0xA3CF }, { 0xFF30, 0xA3D0 }, { 0xFF31, 0xA3D1 }, { 0xFF32, 0xA3D2 }, { 0xFF33, 0xA3D3 }, 
-	{ 0xFF34, 0xA3D4 }, { 0xFF35, 0xA3D5 }, { 0xFF36, 0xA3D6 }, { 0xFF37, 0xA3D7 }, { 0xFF38, 0xA3D8 }, { 0xFF39, 0xA3D9 }, { 0xFF3A, 0xA3DA }, { 0xFF3B, 0xA3DB }, 
-	{ 0xFF3C, 0xA1AC }, { 0xFF3D, 0xA3DD }, { 0xFF3E, 0xA3DE }, { 0xFF3F, 0xA3DF }, { 0xFF40, 0xA3E0 }, { 0xFF41, 0xA3E1 }, { 0xFF42, 0xA3E2 }, { 0xFF43, 0xA3E3 }, 
-	{ 0xFF44, 0xA3E4 }, { 0xFF45, 0xA3E5 }, { 0xFF46, 0xA3E6 }, { 0xFF47, 0xA3E7 }, { 0xFF48, 0xA3E8 }, { 0xFF49, 0xA3E9 }, { 0xFF4A, 0xA3EA }, { 0xFF4B, 0xA3EB }, 
-	{ 0xFF4C, 0xA3EC }, { 0xFF4D, 0xA3ED }, { 0xFF4E, 0xA3EE }, { 0xFF4F, 0xA3EF }, { 0xFF50, 0xA3F0 }, { 0xFF51, 0xA3F1 }, { 0xFF52, 0xA3F2 }, { 0xFF53, 0xA3F3 }, 
-	{ 0xFF54, 0xA3F4 }, { 0xFF55, 0xA3F5 }, { 0xFF56, 0xA3F6 }, { 0xFF57, 0xA3F7 }, { 0xFF58, 0xA3F8 }, { 0xFF59, 0xA3F9 }, { 0xFF5A, 0xA3FA }, { 0xFF5B, 0xA3FB }, 
-	{ 0xFF5C, 0xA3FC }, { 0xFF5D, 0xA3FD }, { 0xFFE6, 0xA3DC }, 
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x0085, 0x0085 },
+	{ 0x0086, 0x0086 }, { 0x0087, 0x0087 }, { 0x0088, 0x0088 }, { 0x0089, 0x0089 }, { 0x008A, 0x008A }, { 0x008B, 0x008B }, { 0x008C, 0x008C }, { 0x008D, 0x008D },
+	{ 0x008E, 0x008E }, { 0x008F, 0x008F }, { 0x0090, 0x0090 }, { 0x0091, 0x0091 }, { 0x0092, 0x0092 }, { 0x0093, 0x0093 }, { 0x0094, 0x0094 }, { 0x0095, 0x0095 },
+	{ 0x0096, 0x0096 }, { 0x0097, 0x0097 }, { 0x0098, 0x0098 }, { 0x0099, 0x0099 }, { 0x009A, 0x009A }, { 0x009B, 0x009B }, { 0x009C, 0x009C }, { 0x009D, 0x009D },
+	{ 0x009E, 0x009E }, { 0x009F, 0x009F }, { 0x00A0, 0x0080 }, { 0x00A1, 0xA2AE }, { 0x00A2, 0xA1CB }, { 0x00A3, 0xA1CC }, { 0x00A4, 0xA2B4 }, { 0x00A5, 0xA1CD },
+	{ 0x00A7, 0xA1D7 }, { 0x00A8, 0xA1A7 }, { 0x00A9, 0x0083 }, { 0x00AA, 0xA8A3 }, { 0x00AB, 0xA65C }, { 0x00AC, 0xA1FE }, { 0x00B0, 0xA1C6 }, { 0x00B1, 0xA1BE },
+	{ 0x00B2, 0xA9F7 }, { 0x00B3, 0xA9F8 }, { 0x00B4, 0xA2A5 }, { 0x00B6, 0xA2D2 }, { 0x00B7, 0xA1A4 }, { 0x00B8, 0xA2AC }, { 0x00B9, 0xA9F6 }, { 0x00BA, 0xA8AC },
+	{ 0x00BB, 0xA65D }, { 0x00BC, 0xA8F9 }, { 0x00BD, 0xA8F6 }, { 0x00BE, 0xA8FA }, { 0x00BF, 0xA2AF }, { 0x00C6, 0xA8A1 }, { 0x00D0, 0xA8A2 }, { 0x00D7, 0xA1BF },
+	{ 0x00D8, 0xA8AA }, { 0x00DE, 0xA8AD }, { 0x00DF, 0xA9AC }, { 0x00E6, 0xA9A1 }, { 0x00F0, 0xA9A3 }, { 0x00F7, 0xA1C0 }, { 0x00F8, 0xA9AA }, { 0x00FE, 0xA9AD },
+	{ 0x0111, 0xA9A2 }, { 0x0126, 0xA8A4 }, { 0x0127, 0xA9A4 }, { 0x0131, 0xA9A5 }, { 0x0132, 0xA8A6 }, { 0x0133, 0xA9A6 }, { 0x0138, 0xA9A7 }, { 0x013F, 0xA8A8 },
+	{ 0x0140, 0xA9A8 }, { 0x0141, 0xA8A9 }, { 0x0142, 0xA9A9 }, { 0x0149, 0xA9B0 }, { 0x014A, 0xA8AF }, { 0x014B, 0xA9AF }, { 0x0152, 0xA8AB }, { 0x0153, 0xA9AB },
+	{ 0x0166, 0xA8AE }, { 0x0167, 0xA9AE }, { 0x02BC, 0xA198 }, { 0x02C7, 0xA2A7 }, { 0x02D0, 0xA2B0 }, { 0x02D8, 0xA2A8 }, { 0x02D9, 0xA2AB }, { 0x02DA, 0xA2AA },
+	{ 0x02DB, 0xA2AD }, { 0x02DC, 0xA2A6 }, { 0x02DD, 0xA2A9 }, { 0x0391, 0xA5C1 }, { 0x0392, 0xA5C2 }, { 0x0393, 0xA5C3 }, { 0x0394, 0xA5C4 }, { 0x0395, 0xA5C5 },
+	{ 0x0396, 0xA5C6 }, { 0x0397, 0xA5C7 }, { 0x0398, 0xA5C8 }, { 0x0399, 0xA5C9 }, { 0x039A, 0xA5CA }, { 0x039B, 0xA5CB }, { 0x039C, 0xA5CC }, { 0x039D, 0xA5CD },
+	{ 0x039E, 0xA5CE }, { 0x039F, 0xA5CF }, { 0x03A0, 0xA5D0 }, { 0x03A1, 0xA5D1 }, { 0x03A3, 0xA5D2 }, { 0x03A4, 0xA5D3 }, { 0x03A5, 0xA5D4 }, { 0x03A6, 0xA5D5 },
+	{ 0x03A7, 0xA5D6 }, { 0x03A8, 0xA5D7 }, { 0x03A9, 0xA5D8 }, { 0x03B1, 0xA5E1 }, { 0x03B2, 0xA5E2 }, { 0x03B3, 0xA5E3 }, { 0x03B4, 0xA5E4 }, { 0x03B5, 0xA5E5 },
+	{ 0x03B6, 0xA5E6 }, { 0x03B7, 0xA5E7 }, { 0x03B8, 0xA5E8 }, { 0x03B9, 0xA5E9 }, { 0x03BA, 0xA5EA }, { 0x03BB, 0xA5EB }, { 0x03BC, 0xA5EC }, { 0x03BD, 0xA5ED },
+	{ 0x03BE, 0xA5EE }, { 0x03BF, 0xA5EF }, { 0x03C0, 0xA5F0 }, { 0x03C1, 0xA5F1 }, { 0x03C3, 0xA5F2 }, { 0x03C4, 0xA5F3 }, { 0x03C5, 0xA5F4 }, { 0x03C6, 0xA5F5 },
+	{ 0x03C7, 0xA5F6 }, { 0x03C8, 0xA5F7 }, { 0x03C9, 0xA5F8 }, { 0x03D5, 0xA76A }, { 0x0401, 0xACA7 }, { 0x0410, 0xACA1 }, { 0x0411, 0xACA2 }, { 0x0412, 0xACA3 },
+	{ 0x0413, 0xACA4 }, { 0x0414, 0xACA5 }, { 0x0415, 0xACA6 }, { 0x0416, 0xACA8 }, { 0x0417, 0xACA9 }, { 0x0418, 0xACAA }, { 0x0419, 0xACAB }, { 0x041A, 0xACAC },
+	{ 0x041B, 0xACAD }, { 0x041C, 0xACAE }, { 0x041D, 0xACAF }, { 0x041E, 0xACB0 }, { 0x041F, 0xACB1 }, { 0x0420, 0xACB2 }, { 0x0421, 0xACB3 }, { 0x0422, 0xACB4 },
+	{ 0x0423, 0xACB5 }, { 0x0424, 0xACB6 }, { 0x0425, 0xACB7 }, { 0x0426, 0xACB8 }, { 0x0427, 0xACB9 }, { 0x0428, 0xACBA }, { 0x0429, 0xACBB }, { 0x042A, 0xACBC },
+	{ 0x042B, 0xACBD }, { 0x042C, 0xACBE }, { 0x042D, 0xACBF }, { 0x042E, 0xACC0 }, { 0x042F, 0xACC1 }, { 0x0430, 0xACD1 }, { 0x0431, 0xACD2 }, { 0x0432, 0xACD3 },
+	{ 0x0433, 0xACD4 }, { 0x0434, 0xACD5 }, { 0x0435, 0xACD6 }, { 0x0436, 0xACD8 }, { 0x0437, 0xACD9 }, { 0x0438, 0xACDA }, { 0x0439, 0xACDB }, { 0x043A, 0xACDC },
+	{ 0x043B, 0xACDD }, { 0x043C, 0xACDE }, { 0x043D, 0xACDF }, { 0x043E, 0xACE0 }, { 0x043F, 0xACE1 }, { 0x0440, 0xACE2 }, { 0x0441, 0xACE3 }, { 0x0442, 0xACE4 },
+	{ 0x0443, 0xACE5 }, { 0x0444, 0xACE6 }, { 0x0445, 0xACE7 }, { 0x0446, 0xACE8 }, { 0x0447, 0xACE9 }, { 0x0448, 0xACEA }, { 0x0449, 0xACEB }, { 0x044A, 0xACEC },
+	{ 0x044B, 0xACED }, { 0x044C, 0xACEE }, { 0x044D, 0xACEF }, { 0x044E, 0xACF0 }, { 0x044F, 0xACF1 }, { 0x0451, 0xACD7 }, { 0x2013, 0xA1A9 }, { 0x2014, 0xA1AA },
+	{ 0x2016, 0xA1AB }, { 0x2018, 0xA1AE }, { 0x2019, 0xA1AF }, { 0x201B, 0xA170 }, { 0x201C, 0xA1B0 }, { 0x201D, 0xA1B1 }, { 0x201F, 0xA16F }, { 0x2020, 0xA2D3 },
+	{ 0x2021, 0xA2D4 }, { 0x2022, 0xA655 }, { 0x2025, 0xA1A5 }, { 0x2026, 0xA1A6 }, { 0x2030, 0xA2B6 }, { 0x2032, 0xA1C7 }, { 0x2033, 0xA1C8 }, { 0x2034, 0xA5DE },
+	{ 0x2035, 0xADAD }, { 0x2036, 0xADAB }, { 0x2039, 0xA65A }, { 0x203A, 0xA65B }, { 0x203B, 0xA1D8 }, { 0x203C, 0xA784 }, { 0x203E, 0xA3FE }, { 0x2042, 0xA64D },
+	{ 0x2047, 0xA787 }, { 0x2049, 0xA785 }, { 0x204C, 0xA196 }, { 0x204D, 0xA197 }, { 0x204E, 0xA64E }, { 0x2051, 0xA16D }, { 0x2074, 0xA9F9 }, { 0x207A, 0xA171 },
+	{ 0x207B, 0xA172 }, { 0x207C, 0xA17A }, { 0x207D, 0xA17C }, { 0x207E, 0xA17D }, { 0x207F, 0xA9FA }, { 0x2081, 0xA9FB }, { 0x2082, 0xA9FC }, { 0x2083, 0xA9FD },
+	{ 0x2084, 0xA9FE }, { 0x20A9, 0x0081 }, { 0x2103, 0xA1C9 }, { 0x2109, 0xA2B5 }, { 0x2113, 0xA7A4 }, { 0x2116, 0xA2E0 }, { 0x2121, 0xA2E5 }, { 0x2122, 0xA2E2 },
+	{ 0x2126, 0xA7D9 }, { 0x212B, 0xA1CA }, { 0x2153, 0xA8F7 }, { 0x2154, 0xA8F8 }, { 0x215B, 0xA8FB }, { 0x215C, 0xA8FC }, { 0x215D, 0xA8FD }, { 0x215E, 0xA8FE },
+	{ 0x2160, 0xA5B0 }, { 0x2161, 0xA5B1 }, { 0x2162, 0xA5B2 }, { 0x2163, 0xA5B3 }, { 0x2164, 0xA5B4 }, { 0x2165, 0xA5B5 }, { 0x2166, 0xA5B6 }, { 0x2167, 0xA5B7 },
+	{ 0x2168, 0xA5B8 }, { 0x2169, 0xA5B9 }, { 0x2170, 0xA5A1 }, { 0x2171, 0xA5A2 }, { 0x2172, 0xA5A3 }, { 0x2173, 0xA5A4 }, { 0x2174, 0xA5A5 }, { 0x2175, 0xA5A6 },
+	{ 0x2176, 0xA5A7 }, { 0x2177, 0xA5A8 }, { 0x2178, 0xA5A9 }, { 0x2179, 0xA5AA }, { 0x2190, 0xA1E7 }, { 0x2191, 0xA1E8 }, { 0x2192, 0xA1E6 }, { 0x2193, 0xA1E9 },
+	{ 0x2194, 0xA1EA }, { 0x2195, 0xA2D5 }, { 0x2196, 0xA2D8 }, { 0x2197, 0xA2D6 }, { 0x2198, 0xA2D9 }, { 0x2199, 0xA2D7 }, { 0x219C, 0xAC53 }, { 0x219D, 0xAC52 },
+	{ 0x21B0, 0xA882 }, { 0x21B1, 0xA87C }, { 0x21B2, 0xA87B }, { 0x21B3, 0xA883 }, { 0x21B4, 0xA881 }, { 0x21B6, 0xAC50 }, { 0x21B7, 0xAC51 }, { 0x21BC, 0xA892 },
+	{ 0x21C0, 0xA893 }, { 0x21C4, 0xA89E }, { 0x21C5, 0xA89F }, { 0x21CD, 0xA84B }, { 0x21CF, 0xA84A }, { 0x21D0, 0xA849 }, { 0x21D2, 0xA2A1 }, { 0x21D4, 0xA2A2 },
+	{ 0x21E0, 0xAC6A }, { 0x21E1, 0xAC6C }, { 0x21E2, 0xAC6B }, { 0x21E3, 0xAC6D }, { 0x21E6, 0xAC72 }, { 0x21E7, 0xAC74 }, { 0x21E8, 0xAC73 }, { 0x21E9, 0xAC75 },
+	{ 0x21F0, 0xAC41 }, { 0x2200, 0xA2A3 }, { 0x2202, 0xA1D3 }, { 0x2203, 0xA2A4 }, { 0x2206, 0xA751 }, { 0x2207, 0xA1D4 }, { 0x2208, 0xA1F4 }, { 0x2209, 0xA773 },
+	{ 0x220B, 0xA1F5 }, { 0x220C, 0xA774 }, { 0x220F, 0xA2B3 }, { 0x2211, 0xA2B2 }, { 0x2213, 0xA75C }, { 0x221A, 0xA1EE }, { 0x221D, 0xA1F0 }, { 0x221E, 0xA1C4 },
+	{ 0x221F, 0xA753 }, { 0x2220, 0xA1D0 }, { 0x2222, 0xA768 }, { 0x2225, 0xA755 }, { 0x2226, 0xA756 }, { 0x2227, 0xA1FC }, { 0x2228, 0xA1FD }, { 0x2229, 0xA1FB },
+	{ 0x222A, 0xA1FA }, { 0x222B, 0xA1F2 }, { 0x222C, 0xA1F3 }, { 0x222E, 0xA2B1 }, { 0x2234, 0xA1C5 }, { 0x2235, 0xA1F1 }, { 0x2237, 0xA2FE }, { 0x223D, 0xA1EF },
+	{ 0x2243, 0xA49A }, { 0x2245, 0xA499 }, { 0x2248, 0xA49B }, { 0x2250, 0xA769 }, { 0x2251, 0xA759 }, { 0x2252, 0xA1D6 }, { 0x2253, 0xA758 }, { 0x225A, 0xA777 },
+	{ 0x2260, 0xA1C1 }, { 0x2261, 0xA1D5 }, { 0x2262, 0xA764 }, { 0x2264, 0xA1C2 }, { 0x2265, 0xA1C3 }, { 0x2266, 0xA75A }, { 0x2267, 0xA75B }, { 0x226A, 0xA1EC },
+	{ 0x226B, 0xA1ED }, { 0x226E, 0xA76F }, { 0x226F, 0xA770 }, { 0x2270, 0xA487 }, { 0x2271, 0xA488 }, { 0x2272, 0xA489 }, { 0x2273, 0xA48A }, { 0x2276, 0xA48F },
+	{ 0x2277, 0xA490 }, { 0x2279, 0xA491 }, { 0x227A, 0xA481 }, { 0x227B, 0xA482 }, { 0x2280, 0xA485 }, { 0x2281, 0xA486 }, { 0x2282, 0xA1F8 }, { 0x2283, 0xA1F9 },
+	{ 0x2284, 0xA772 }, { 0x2285, 0xA771 }, { 0x2286, 0xA1F6 }, { 0x2287, 0xA1F7 }, { 0x2295, 0xA75D }, { 0x2296, 0xA75E }, { 0x2297, 0xA75F }, { 0x22A3, 0xA76C },
+	{ 0x22A4, 0xA49D }, { 0x22A5, 0xA1D1 }, { 0x22BB, 0xA775 }, { 0x22BC, 0xA776 }, { 0x22CE, 0xA483 }, { 0x22CF, 0xA484 }, { 0x22DA, 0xA492 }, { 0x22DB, 0xA493 },
+	{ 0x22EE, 0xA2FD }, { 0x2306, 0xA778 }, { 0x2312, 0xA1D2 }, { 0x2314, 0xA761 }, { 0x2460, 0xA8E7 }, { 0x2461, 0xA8E8 }, { 0x2462, 0xA8E9 }, { 0x2463, 0xA8EA },
+	{ 0x2464, 0xA8EB }, { 0x2465, 0xA8EC }, { 0x2466, 0xA8ED }, { 0x2467, 0xA8EE }, { 0x2468, 0xA8EF }, { 0x2469, 0xA8F0 }, { 0x246A, 0xA8F1 }, { 0x246B, 0xA8F2 },
+	{ 0x246C, 0xA8F3 }, { 0x246D, 0xA8F4 }, { 0x246E, 0xA8F5 }, { 0x246F, 0xA7F0 }, { 0x2470, 0xA7F1 }, { 0x2471, 0xA7F2 }, { 0x2472, 0xA7F3 }, { 0x2473, 0xA7F4 },
+	{ 0x2474, 0xA9E7 }, { 0x2475, 0xA9E8 }, { 0x2476, 0xA9E9 }, { 0x2477, 0xA9EA }, { 0x2478, 0xA9EB }, { 0x2479, 0xA9EC }, { 0x247A, 0xA9ED }, { 0x247B, 0xA9EE },
+	{ 0x247C, 0xA9EF }, { 0x247D, 0xA9F0 }, { 0x247E, 0xA9F1 }, { 0x247F, 0xA9F2 }, { 0x2480, 0xA9F3 }, { 0x2481, 0xA9F4 }, { 0x2482, 0xA9F5 }, { 0x2483, 0xAAF4 },
+	{ 0x2484, 0xAAF5 }, { 0x2485, 0xAAF6 }, { 0x2486, 0xAAF7 }, { 0x2487, 0xAAF8 }, { 0x249C, 0xA9CD }, { 0x249D, 0xA9CE }, { 0x249E, 0xA9CF }, { 0x249F, 0xA9D0 },
+	{ 0x24A0, 0xA9D1 }, { 0x24A1, 0xA9D2 }, { 0x24A2, 0xA9D3 }, { 0x24A3, 0xA9D4 }, { 0x24A4, 0xA9D5 }, { 0x24A5, 0xA9D6 }, { 0x24A6, 0xA9D7 }, { 0x24A7, 0xA9D8 },
+	{ 0x24A8, 0xA9D9 }, { 0x24A9, 0xA9DA }, { 0x24AA, 0xA9DB }, { 0x24AB, 0xA9DC }, { 0x24AC, 0xA9DD }, { 0x24AD, 0xA9DE }, { 0x24AE, 0xA9DF }, { 0x24AF, 0xA9E0 },
+	{ 0x24B0, 0xA9E1 }, { 0x24B1, 0xA9E2 }, { 0x24B2, 0xA9E3 }, { 0x24B3, 0xA9E4 }, { 0x24B4, 0xA9E5 }, { 0x24B5, 0xA9E6 }, { 0x24B6, 0xA386 }, { 0x24B7, 0xA387 },
+	{ 0x24B8, 0xA388 }, { 0x24B9, 0xA389 }, { 0x24BA, 0xA38A }, { 0x24BB, 0xA38B }, { 0x24BC, 0xA38C }, { 0x24BD, 0xA38D }, { 0x24BE, 0xA38E }, { 0x24BF, 0xA38F },
+	{ 0x24C0, 0xA390 }, { 0x24C1, 0xA391 }, { 0x24C2, 0xA392 }, { 0x24C3, 0xA393 }, { 0x24C4, 0xA394 }, { 0x24C5, 0xA395 }, { 0x24C6, 0xA396 }, { 0x24C7, 0xA397 },
+	{ 0x24C8, 0xA398 }, { 0x24C9, 0xA399 }, { 0x24CA, 0xA39A }, { 0x24CB, 0xA39B }, { 0x24CC, 0xA39C }, { 0x24CD, 0xA39D }, { 0x24CE, 0xA39E }, { 0x24CF, 0xA39F },
+	{ 0x24D0, 0xA8CD }, { 0x24D1, 0xA8CE }, { 0x24D2, 0xA8CF }, { 0x24D3, 0xA8D0 }, { 0x24D4, 0xA8D1 }, { 0x24D5, 0xA8D2 }, { 0x24D6, 0xA8D3 }, { 0x24D7, 0xA8D4 },
+	{ 0x24D8, 0xA8D5 }, { 0x24D9, 0xA8D6 }, { 0x24DA, 0xA8D7 }, { 0x24DB, 0xA8D8 }, { 0x24DC, 0xA8D9 }, { 0x24DD, 0xA8DA }, { 0x24DE, 0xA8DB }, { 0x24DF, 0xA8DC },
+	{ 0x24E0, 0xA8DD }, { 0x24E1, 0xA8DE }, { 0x24E2, 0xA8DF }, { 0x24E3, 0xA8E0 }, { 0x24E4, 0xA8E1 }, { 0x24E5, 0xA8E2 }, { 0x24E6, 0xA8E3 }, { 0x24E7, 0xA8E4 },
+	{ 0x24E8, 0xA8E5 }, { 0x24E9, 0xA8E6 }, { 0x24EB, 0xA6EF }, { 0x24EC, 0xA6F0 }, { 0x24ED, 0xA6F1 }, { 0x24EE, 0xA6F2 }, { 0x24EF, 0xA6F3 }, { 0x24F0, 0xA6F4 },
+	{ 0x24F1, 0xA6F5 }, { 0x24F2, 0xA6F6 }, { 0x24F3, 0xA6F7 }, { 0x24F4, 0xA6F8 }, { 0x2500, 0xA6A1 }, { 0x2501, 0xA6AC }, { 0x2502, 0xA6A2 }, { 0x2503, 0xA6AD },
+	{ 0x250C, 0xA6A3 }, { 0x250D, 0xA6C8 }, { 0x250E, 0xA6C7 }, { 0x250F, 0xA6AE }, { 0x2510, 0xA6A4 }, { 0x2511, 0xA6C2 }, { 0x2512, 0xA6C1 }, { 0x2513, 0xA6AF },
+	{ 0x2514, 0xA6A6 }, { 0x2515, 0xA6C6 }, { 0x2516, 0xA6C5 }, { 0x2517, 0xA6B1 }, { 0x2518, 0xA6A5 }, { 0x2519, 0xA6C4 }, { 0x251A, 0xA6C3 }, { 0x251B, 0xA6B0 },
+	{ 0x251C, 0xA6A7 }, { 0x251D, 0xA6BC }, { 0x251E, 0xA6C9 }, { 0x251F, 0xA6CA }, { 0x2520, 0xA6B7 }, { 0x2521, 0xA6CB }, { 0x2522, 0xA6CC }, { 0x2523, 0xA6B2 },
+	{ 0x2524, 0xA6A9 }, { 0x2525, 0xA6BE }, { 0x2526, 0xA6CD }, { 0x2527, 0xA6CE }, { 0x2528, 0xA6B9 }, { 0x2529, 0xA6CF }, { 0x252A, 0xA6D0 }, { 0x252B, 0xA6B4 },
+	{ 0x252C, 0xA6A8 }, { 0x252D, 0xA6D1 }, { 0x252E, 0xA6D2 }, { 0x252F, 0xA6B8 }, { 0x2530, 0xA6BD }, { 0x2531, 0xA6D3 }, { 0x2532, 0xA6D4 }, { 0x2533, 0xA6B3 },
+	{ 0x2534, 0xA6AA }, { 0x2535, 0xA6D5 }, { 0x2536, 0xA6D6 }, { 0x2537, 0xA6BA }, { 0x2538, 0xA6BF }, { 0x2539, 0xA6D7 }, { 0x253A, 0xA6D8 }, { 0x253B, 0xA6B5 },
+	{ 0x253C, 0xA6AB }, { 0x253D, 0xA6D9 }, { 0x253E, 0xA6DA }, { 0x253F, 0xA6BB }, { 0x2540, 0xA6DB }, { 0x2541, 0xA6DC }, { 0x2542, 0xA6C0 }, { 0x2543, 0xA6DD },
+	{ 0x2544, 0xA6DE }, { 0x2545, 0xA6DF }, { 0x2546, 0xA6E0 }, { 0x2547, 0xA6E1 }, { 0x2548, 0xA6E2 }, { 0x2549, 0xA6E3 }, { 0x254A, 0xA6E4 }, { 0x254B, 0xA6B6 },
+	{ 0x2588, 0xA78F }, { 0x2592, 0xA2C6 }, { 0x25A0, 0xA1E1 }, { 0x25A1, 0xA1E0 }, { 0x25A2, 0xA678 }, { 0x25A3, 0xA2C3 }, { 0x25A4, 0xA2C7 }, { 0x25A5, 0xA2C8 },
+	{ 0x25A6, 0xA2CB }, { 0x25A7, 0xA2CA }, { 0x25A8, 0xA2C9 }, { 0x25A9, 0xA2CC }, { 0x25AD, 0xA74A }, { 0x25B1, 0xA766 }, { 0x25B2, 0xA1E3 }, { 0x25B3, 0xA1E2 },
+	{ 0x25B5, 0xA795 }, { 0x25B6, 0xA2BA }, { 0x25B7, 0xA2B9 }, { 0x25B9, 0xA796 }, { 0x25BC, 0xA1E5 }, { 0x25BD, 0xA1E4 }, { 0x25BF, 0xA794 }, { 0x25C0, 0xA2B8 },
+	{ 0x25C1, 0xA2B7 }, { 0x25C3, 0xA797 }, { 0x25C6, 0xA1DF }, { 0x25C7, 0xA1DE }, { 0x25C8, 0xA2C2 }, { 0x25C9, 0xA2C1 }, { 0x25CA, 0xA79C }, { 0x25CB, 0xA1DB },
+	{ 0x25CC, 0xA675 }, { 0x25CD, 0xA684 }, { 0x25CE, 0xA1DD }, { 0x25CF, 0xA1DC }, { 0x25D0, 0xA2C4 }, { 0x25D1, 0xA2C5 }, { 0x25E6, 0xA790 }, { 0x25EF, 0xA66F },
+	{ 0x25FB, 0xA746 }, { 0x25FC, 0xA79A }, { 0x2605, 0xA1DA }, { 0x2606, 0xA1D9 }, { 0x260E, 0xA2CF }, { 0x260F, 0xA2CE }, { 0x2610, 0xA677 }, { 0x261C, 0xA2D0 },
+	{ 0x261D, 0xAC8D }, { 0x261E, 0xA2D1 }, { 0x261F, 0xAC8E }, { 0x262F, 0xA693 }, { 0x2640, 0xA1CF }, { 0x2642, 0xA1CE }, { 0x2660, 0xA2BC }, { 0x2661, 0xA2BD },
+	{ 0x2663, 0xA2C0 }, { 0x2664, 0xA2BB }, { 0x2665, 0xA2BE }, { 0x2666, 0xA798 }, { 0x2667, 0xA2BF }, { 0x2668, 0xA2CD }, { 0x2669, 0xA2DB }, { 0x266A, 0xA2DC },
+	{ 0x266C, 0xA2DD }, { 0x266D, 0xA2DA }, { 0x266F, 0xA648 }, { 0x2716, 0xA66D }, { 0x271A, 0xA66C }, { 0x2720, 0xA688 }, { 0x2723, 0xA672 }, { 0x2731, 0xA653 },
+	{ 0x273D, 0xA652 }, { 0x273F, 0xA67C }, { 0x2740, 0xA699 }, { 0x2741, 0xA68D }, { 0x2747, 0xA654 }, { 0x274D, 0xA683 }, { 0x2756, 0xA673 }, { 0x2776, 0xA6E5 },
+	{ 0x2777, 0xA6E6 }, { 0x2778, 0xA6E7 }, { 0x2779, 0xA6E8 }, { 0x277A, 0xA6E9 }, { 0x277B, 0xA6EA }, { 0x277C, 0xA6EB }, { 0x277D, 0xA6EC }, { 0x277E, 0xA6ED },
+	{ 0x277F, 0xA6EE }, { 0x278A, 0xA355 }, { 0x278B, 0xA356 }, { 0x278C, 0xA357 }, { 0x278D, 0xA358 }, { 0x278E, 0xA359 }, { 0x278F, 0xA35A }, { 0x2790, 0xA35B },
+	{ 0x2791, 0xA35C }, { 0x2792, 0xA35D }, { 0x2793, 0xA35E }, { 0x2794, 0xAC5E }, { 0x279B, 0xA86A }, { 0x279C, 0xA860 }, { 0x279E, 0xA878 }, { 0x27A1, 0xA874 },
+	{ 0x27A4, 0xAC48 }, { 0x27B2, 0xA85C }, { 0x27B5, 0xAC43 }, { 0x2934, 0xA88D }, { 0x2935, 0xA889 }, { 0x2936, 0xA886 }, { 0x2937, 0xA88B }, { 0x2939, 0xA88C },
+	{ 0x2962, 0xA86F }, { 0x2963, 0xA871 }, { 0x2964, 0xA870 }, { 0x2965, 0xA872 }, { 0x2981, 0xA799 }, { 0x2985, 0xA159 }, { 0x2986, 0xA15A }, { 0x2997, 0xA199 },
+	{ 0x2998, 0xA19A }, { 0x29A3, 0xA49C }, { 0x29BE, 0xA668 }, { 0x29BF, 0xA66E }, { 0x29C8, 0xA664 }, { 0x2A26, 0xA47D }, { 0x2A38, 0xA760 }, { 0x2A72, 0xA77B },
+	{ 0x2A8B, 0xA494 }, { 0x2A8C, 0xA495 }, { 0x2A91, 0xA496 }, { 0x2A92, 0xA497 }, { 0x2AC5, 0xA48B }, { 0x2AC6, 0xA48D }, { 0x2ACB, 0xA48C }, { 0x2ACC, 0xA48E },
+	{ 0x2AE8, 0xA76B }, { 0x3000, 0xA1A1 }, { 0x3001, 0xA1A2 }, { 0x3002, 0xA1A3 }, { 0x3003, 0xA1A8 }, { 0x3008, 0xA1B4 }, { 0x3009, 0xA1B5 }, { 0x300A, 0xA1B6 },
+	{ 0x300B, 0xA1B7 }, { 0x300C, 0xA1B8 }, { 0x300D, 0xA1B9 }, { 0x300E, 0xA1BA }, { 0x300F, 0xA1BB }, { 0x3010, 0xA1BC }, { 0x3011, 0xA1BD }, { 0x3012, 0xA742 },
+	{ 0x3013, 0xA1EB }, { 0x3014, 0xA1B2 }, { 0x3015, 0xA1B3 }, { 0x3016, 0xA15D }, { 0x3017, 0xA15E }, { 0x3018, 0xA15F }, { 0x3019, 0xA160 }, { 0x301C, 0xA1AD },
+	{ 0x301E, 0xADA9 }, { 0x301F, 0xADAA }, { 0x3020, 0xA69E }, { 0x3036, 0xA743 }, { 0x3041, 0xAAA1 }, { 0x3042, 0xAAA2 }, { 0x3043, 0xAAA3 }, { 0x3044, 0xAAA4 },
+	{ 0x3045, 0xAAA5 }, { 0x3046, 0xAAA6 }, { 0x3047, 0xAAA7 }, { 0x3048, 0xAAA8 }, { 0x3049, 0xAAA9 }, { 0x304A, 0xAAAA }, { 0x304B, 0xAAAB }, { 0x304C, 0xAAAC },
+	{ 0x304D, 0xAAAD }, { 0x304E, 0xAAAE }, { 0x304F, 0xAAAF }, { 0x3050, 0xAAB0 }, { 0x3051, 0xAAB1 }, { 0x3052, 0xAAB2 }, { 0x3053, 0xAAB3 }, { 0x3054, 0xAAB4 },
+	{ 0x3055, 0xAAB5 }, { 0x3056, 0xAAB6 }, { 0x3057, 0xAAB7 }, { 0x3058, 0xAAB8 }, { 0x3059, 0xAAB9 }, { 0x305A, 0xAABA }, { 0x305B, 0xAABB }, { 0x305C, 0xAABC },
+	{ 0x305D, 0xAABD }, { 0x305E, 0xAABE }, { 0x305F, 0xAABF }, { 0x3060, 0xAAC0 }, { 0x3061, 0xAAC1 }, { 0x3062, 0xAAC2 }, { 0x3063, 0xAAC3 }, { 0x3064, 0xAAC4 },
+	{ 0x3065, 0xAAC5 }, { 0x3066, 0xAAC6 }, { 0x3067, 0xAAC7 }, { 0x3068, 0xAAC8 }, { 0x3069, 0xAAC9 }, { 0x306A, 0xAACA }, { 0x306B, 0xAACB }, { 0x306C, 0xAACC },
+	{ 0x306D, 0xAACD }, { 0x306E, 0xAACE }, { 0x306F, 0xAACF }, { 0x3070, 0xAAD0 }, { 0x3071, 0xAAD1 }, { 0x3072, 0xAAD2 }, { 0x3073, 0xAAD3 }, { 0x3074, 0xAAD4 },
+	{ 0x3075, 0xAAD5 }, { 0x3076, 0xAAD6 }, { 0x3077, 0xAAD7 }, { 0x3078, 0xAAD8 }, { 0x3079, 0xAAD9 }, { 0x307A, 0xAADA }, { 0x307B, 0xAADB }, { 0x307C, 0xAADC },
+	{ 0x307D, 0xAADD }, { 0x307E, 0xAADE }, { 0x307F, 0xAADF }, { 0x3080, 0xAAE0 }, { 0x3081, 0xAAE1 }, { 0x3082, 0xAAE2 }, { 0x3083, 0xAAE3 }, { 0x3084, 0xAAE4 },
+	{ 0x3085, 0xAAE5 }, { 0x3086, 0xAAE6 }, { 0x3087, 0xAAE7 }, { 0x3088, 0xAAE8 }, { 0x3089, 0xAAE9 }, { 0x308A, 0xAAEA }, { 0x308B, 0xAAEB }, { 0x308C, 0xAAEC },
+	{ 0x308D, 0xAAED }, { 0x308E, 0xAAEE }, { 0x308F, 0xAAEF }, { 0x3090, 0xAAF0 }, { 0x3091, 0xAAF1 }, { 0x3092, 0xAAF2 }, { 0x3093, 0xAAF3 }, { 0x30A1, 0xABA1 },
+	{ 0x30A2, 0xABA2 }, { 0x30A3, 0xABA3 }, { 0x30A4, 0xABA4 }, { 0x30A5, 0xABA5 }, { 0x30A6, 0xABA6 }, { 0x30A7, 0xABA7 }, { 0x30A8, 0xABA8 }, { 0x30A9, 0xABA9 },
+	{ 0x30AA, 0xABAA }, { 0x30AB, 0xABAB }, { 0x30AC, 0xABAC }, { 0x30AD, 0xABAD }, { 0x30AE, 0xABAE }, { 0x30AF, 0xABAF }, { 0x30B0, 0xABB0 }, { 0x30B1, 0xABB1 },
+	{ 0x30B2, 0xABB2 }, { 0x30B3, 0xABB3 }, { 0x30B4, 0xABB4 }, { 0x30B5, 0xABB5 }, { 0x30B6, 0xABB6 }, { 0x30B7, 0xABB7 }, { 0x30B8, 0xABB8 }, { 0x30B9, 0xABB9 },
+	{ 0x30BA, 0xABBA }, { 0x30BB, 0xABBB }, { 0x30BC, 0xABBC }, { 0x30BD, 0xABBD }, { 0x30BE, 0xABBE }, { 0x30BF, 0xABBF }, { 0x30C0, 0xABC0 }, { 0x30C1, 0xABC1 },
+	{ 0x30C2, 0xABC2 }, { 0x30C3, 0xABC3 }, { 0x30C4, 0xABC4 }, { 0x30C5, 0xABC5 }, { 0x30C6, 0xABC6 }, { 0x30C7, 0xABC7 }, { 0x30C8, 0xABC8 }, { 0x30C9, 0xABC9 },
+	{ 0x30CA, 0xABCA }, { 0x30CB, 0xABCB }, { 0x30CC, 0xABCC }, { 0x30CD, 0xABCD }, { 0x30CE, 0xABCE }, { 0x30CF, 0xABCF }, { 0x30D0, 0xABD0 }, { 0x30D1, 0xABD1 },
+	{ 0x30D2, 0xABD2 }, { 0x30D3, 0xABD3 }, { 0x30D4, 0xABD4 }, { 0x30D5, 0xABD5 }, { 0x30D6, 0xABD6 }, { 0x30D7, 0xABD7 }, { 0x30D8, 0xABD8 }, { 0x30D9, 0xABD9 },
+	{ 0x30DA, 0xABDA }, { 0x30DB, 0xABDB }, { 0x30DC, 0xABDC }, { 0x30DD, 0xABDD }, { 0x30DE, 0xABDE }, { 0x30DF, 0xABDF }, { 0x30E0, 0xABE0 }, { 0x30E1, 0xABE1 },
+	{ 0x30E2, 0xABE2 }, { 0x30E3, 0xABE3 }, { 0x30E4, 0xABE4 }, { 0x30E5, 0xABE5 }, { 0x30E6, 0xABE6 }, { 0x30E7, 0xABE7 }, { 0x30E8, 0xABE8 }, { 0x30E9, 0xABE9 },
+	{ 0x30EA, 0xABEA }, { 0x30EB, 0xABEB }, { 0x30EC, 0xABEC }, { 0x30ED, 0xABED }, { 0x30EE, 0xABEE }, { 0x30EF, 0xABEF }, { 0x30F0, 0xABF0 }, { 0x30F1, 0xABF1 },
+	{ 0x30F2, 0xABF2 }, { 0x30F3, 0xABF3 }, { 0x30F4, 0xABF4 }, { 0x30F5, 0xABF5 }, { 0x30F6, 0xABF6 }, { 0x3131, 0xA4A1 }, { 0x3132, 0xA4A2 }, { 0x3133, 0xA4A3 },
+	{ 0x3134, 0xA4A4 }, { 0x3135, 0xA4A5 }, { 0x3136, 0xA4A6 }, { 0x3137, 0xA4A7 }, { 0x3138, 0xA4A8 }, { 0x3139, 0xA4A9 }, { 0x313A, 0xA4AA }, { 0x313B, 0xA4AB },
+	{ 0x313C, 0xA4AC }, { 0x313D, 0xA4AD }, { 0x313E, 0xA4AE }, { 0x313F, 0xA4AF }, { 0x3140, 0xA4B0 }, { 0x3141, 0xA4B1 }, { 0x3142, 0xA4B2 }, { 0x3143, 0xA4B3 },
+	{ 0x3144, 0xA4B4 }, { 0x3145, 0xA4B5 }, { 0x3146, 0xA4B6 }, { 0x3147, 0xA4B7 }, { 0x3148, 0xA4B8 }, { 0x3149, 0xA4B9 }, { 0x314A, 0xA4BA }, { 0x314B, 0xA4BB },
+	{ 0x314C, 0xA4BC }, { 0x314D, 0xA4BD }, { 0x314E, 0xA4BE }, { 0x314F, 0xA4BF }, { 0x3150, 0xA4C0 }, { 0x3151, 0xA4C1 }, { 0x3152, 0xA4C2 }, { 0x3153, 0xA4C3 },
+	{ 0x3154, 0xA4C4 }, { 0x3155, 0xA4C5 }, { 0x3156, 0xA4C6 }, { 0x3157, 0xA4C7 }, { 0x3158, 0xA4C8 }, { 0x3159, 0xA4C9 }, { 0x315A, 0xA4CA }, { 0x315B, 0xA4CB },
+	{ 0x315C, 0xA4CC }, { 0x315D, 0xA4CD }, { 0x315E, 0xA4CE }, { 0x315F, 0xA4CF }, { 0x3160, 0xA4D0 }, { 0x3161, 0xA4D1 }, { 0x3162, 0xA4D2 }, { 0x3163, 0xA4D3 },
+	{ 0x3164, 0xA4D4 }, { 0x3165, 0xA4D5 }, { 0x3166, 0xA4D6 }, { 0x3167, 0xA4D7 }, { 0x3168, 0xA4D8 }, { 0x3169, 0xA4D9 }, { 0x316A, 0xA4DA }, { 0x316B, 0xA4DB },
+	{ 0x316C, 0xA4DC }, { 0x316D, 0xA4DD }, { 0x316E, 0xA4DE }, { 0x316F, 0xA4DF }, { 0x3170, 0xA4E0 }, { 0x3171, 0xA4E1 }, { 0x3172, 0xA4E2 }, { 0x3173, 0xA4E3 },
+	{ 0x3174, 0xA4E4 }, { 0x3175, 0xA4E5 }, { 0x3176, 0xA4E6 }, { 0x3177, 0xA4E7 }, { 0x3178, 0xA4E8 }, { 0x3179, 0xA4E9 }, { 0x317A, 0xA4EA }, { 0x317B, 0xA4EB },
+	{ 0x317C, 0xA4EC }, { 0x317D, 0xA4ED }, { 0x317E, 0xA4EE }, { 0x317F, 0xA4EF }, { 0x3180, 0xA4F0 }, { 0x3181, 0xA4F1 }, { 0x3182, 0xA4F2 }, { 0x3183, 0xA4F3 },
+	{ 0x3184, 0xA4F4 }, { 0x3185, 0xA4F5 }, { 0x3186, 0xA4F6 }, { 0x3187, 0xA4F7 }, { 0x3188, 0xA4F8 }, { 0x3189, 0xA4F9 }, { 0x318A, 0xA4FA }, { 0x318B, 0xA4FB },
+	{ 0x318C, 0xA4FC }, { 0x318D, 0xA4FD }, { 0x318E, 0xA4FE }, { 0x3200, 0xA9B1 }, { 0x3201, 0xA9B2 }, { 0x3202, 0xA9B3 }, { 0x3203, 0xA9B4 }, { 0x3204, 0xA9B5 },
+	{ 0x3205, 0xA9B6 }, { 0x3206, 0xA9B7 }, { 0x3207, 0xA9B8 }, { 0x3208, 0xA9B9 }, { 0x3209, 0xA9BA }, { 0x320A, 0xA9BB }, { 0x320B, 0xA9BC }, { 0x320C, 0xA9BD },
+	{ 0x320D, 0xA9BE }, { 0x320E, 0xA9BF }, { 0x320F, 0xA9C0 }, { 0x3210, 0xA9C1 }, { 0x3211, 0xA9C2 }, { 0x3212, 0xA9C3 }, { 0x3213, 0xA9C4 }, { 0x3214, 0xA9C5 },
+	{ 0x3215, 0xA9C6 }, { 0x3216, 0xA9C7 }, { 0x3217, 0xA9C8 }, { 0x3218, 0xA9C9 }, { 0x3219, 0xA9CA }, { 0x321A, 0xA9CB }, { 0x321B, 0xA9CC }, { 0x321C, 0xA2DF },
+	{ 0x3231, 0xA79D }, { 0x3239, 0xA79E }, { 0x3251, 0xA7F5 }, { 0x3252, 0xA7F6 }, { 0x3253, 0xA7F7 }, { 0x3254, 0xA7F8 }, { 0x3255, 0xA7F9 }, { 0x3256, 0xA7FA },
+	{ 0x3257, 0xA7FB }, { 0x3258, 0xA7FC }, { 0x3259, 0xA7FD }, { 0x325A, 0xA7FE }, { 0x3260, 0xA8B1 }, { 0x3261, 0xA8B2 }, { 0x3262, 0xA8B3 }, { 0x3263, 0xA8B4 },
+	{ 0x3264, 0xA8B5 }, { 0x3265, 0xA8B6 }, { 0x3266, 0xA8B7 }, { 0x3267, 0xA8B8 }, { 0x3268, 0xA8B9 }, { 0x3269, 0xA8BA }, { 0x326A, 0xA8BB }, { 0x326B, 0xA8BC },
+	{ 0x326C, 0xA8BD }, { 0x326D, 0xA8BE }, { 0x326E, 0xA8BF }, { 0x326F, 0xA8C0 }, { 0x3270, 0xA8C1 }, { 0x3271, 0xA8C2 }, { 0x3272, 0xA8C3 }, { 0x3273, 0xA8C4 },
+	{ 0x3274, 0xA8C5 }, { 0x3275, 0xA8C6 }, { 0x3276, 0xA8C7 }, { 0x3277, 0xA8C8 }, { 0x3278, 0xA8C9 }, { 0x3279, 0xA8CA }, { 0x327A, 0xA8CB }, { 0x327B, 0xA8CC },
+	{ 0x327F, 0xA2DE }, { 0x328A, 0xAD71 }, { 0x328B, 0xAD72 }, { 0x328C, 0xAD73 }, { 0x328D, 0xAD74 }, { 0x328E, 0xAD75 }, { 0x328F, 0xAD76 }, { 0x3290, 0xAD70 },
+	{ 0x3294, 0xAB5C }, { 0x329E, 0xA782 }, { 0x32A5, 0xAB6C }, { 0x3380, 0xA7C9 }, { 0x3381, 0xA7CA }, { 0x3382, 0xA7CB }, { 0x3383, 0xA7CC }, { 0x3384, 0xA7CD },
+	{ 0x3388, 0xA7BA }, { 0x3389, 0xA7BB }, { 0x338A, 0xA7DC }, { 0x338B, 0xA7DD }, { 0x338C, 0xA7DE }, { 0x338D, 0xA7B6 }, { 0x338E, 0xA7B7 }, { 0x338F, 0xA7B8 },
+	{ 0x3390, 0xA7D4 }, { 0x3391, 0xA7D5 }, { 0x3392, 0xA7D6 }, { 0x3393, 0xA7D7 }, { 0x3394, 0xA7D8 }, { 0x3395, 0xA7A1 }, { 0x3396, 0xA7A2 }, { 0x3397, 0xA7A3 },
+	{ 0x3398, 0xA7A5 }, { 0x3399, 0xA7AB }, { 0x339A, 0xA7AC }, { 0x339B, 0xA7AD }, { 0x339C, 0xA7AE }, { 0x339D, 0xA7AF }, { 0x339E, 0xA7B0 }, { 0x339F, 0xA7B1 },
+	{ 0x33A0, 0xA7B2 }, { 0x33A1, 0xA7B3 }, { 0x33A2, 0xA7B4 }, { 0x33A3, 0xA7A7 }, { 0x33A4, 0xA7A8 }, { 0x33A5, 0xA7A9 }, { 0x33A6, 0xA7AA }, { 0x33A7, 0xA7BD },
+	{ 0x33A8, 0xA7BE }, { 0x33A9, 0xA7E5 }, { 0x33AA, 0xA7E6 }, { 0x33AB, 0xA7E7 }, { 0x33AC, 0xA7E8 }, { 0x33AD, 0xA7E1 }, { 0x33AE, 0xA7E2 }, { 0x33AF, 0xA7E3 },
+	{ 0x33B0, 0xA7BF }, { 0x33B1, 0xA7C0 }, { 0x33B2, 0xA7C1 }, { 0x33B3, 0xA7C2 }, { 0x33B4, 0xA7C3 }, { 0x33B5, 0xA7C4 }, { 0x33B6, 0xA7C5 }, { 0x33B7, 0xA7C6 },
+	{ 0x33B8, 0xA7C7 }, { 0x33B9, 0xA7C8 }, { 0x33BA, 0xA7CE }, { 0x33BB, 0xA7CF }, { 0x33BC, 0xA7D0 }, { 0x33BD, 0xA7D1 }, { 0x33BE, 0xA7D2 }, { 0x33BF, 0xA7D3 },
+	{ 0x33C0, 0xA7DA }, { 0x33C1, 0xA7DB }, { 0x33C2, 0xA2E3 }, { 0x33C3, 0xA7EC }, { 0x33C4, 0xA7A6 }, { 0x33C5, 0xA7E0 }, { 0x33C6, 0xA7EF }, { 0x33C7, 0xA2E1 },
+	{ 0x33C8, 0xA7BC }, { 0x33C9, 0xA7ED }, { 0x33CA, 0xA7B5 }, { 0x33CB, 0xA79F }, { 0x33CF, 0xA7B9 }, { 0x33D0, 0xA7EA }, { 0x33D3, 0xA7EB }, { 0x33D6, 0xA7DF },
+	{ 0x33D8, 0xA2E4 }, { 0x33DB, 0xA7E4 }, { 0x33DC, 0xA7EE }, { 0x33DD, 0xA7E9 }, { 0x4E00, 0xECE9 }, { 0x4E01, 0xEFCB }, { 0x4E03, 0xF6D2 }, { 0x4E07, 0xD8B2 },
+	{ 0x4E08, 0xEDDB }, { 0x4E09, 0xDFB2 }, { 0x4E0A, 0xDFBE }, { 0x4E0B, 0xF9BB }, { 0x4E0D, 0xDCF4 }, { 0x4E11, 0xF5E4 }, { 0x4E14, 0xF3A6 }, { 0x4E15, 0xDDE0 },
+	{ 0x4E16, 0xE1A6 }, { 0x4E18, 0xCEF8 }, { 0x4E19, 0xDCB0 }, { 0x4E1E, 0xE3AA }, { 0x4E2D, 0xF1E9 }, { 0x4E32, 0xCDFA }, { 0x4E38, 0xFCAF }, { 0x4E39, 0xD3A1 },
+	{ 0x4E3B, 0xF1AB }, { 0x4E42, 0xE7D1 }, { 0x4E43, 0xD2AC }, { 0x4E45, 0xCEF9 }, { 0x4E4B, 0xF1FD }, { 0x4E4D, 0xDEBF }, { 0x4E4E, 0xFBBA }, { 0x4E4F, 0xF9B9 },
+	{ 0x4E56, 0xCED2 }, { 0x4E58, 0xE3AB }, { 0x4E59, 0xEBE0 }, { 0x4E5D, 0xCEFA }, { 0x4E5E, 0xCBF7 }, { 0x4E5F, 0xE5A5 }, { 0x4E6B, 0xCAE1 }, { 0x4E6D, 0xD4CC },
+	{ 0x4E73, 0xEAE1 }, { 0x4E76, 0xDCE3 }, { 0x4E77, 0xDFAD }, { 0x4E7E, 0xCBEB }, { 0x4E82, 0xD5AF }, { 0x4E86, 0xD6F5 }, { 0x4E88, 0xE5F8 }, { 0x4E8B, 0xDEC0 },
+	{ 0x4E8C, 0xECA3 }, { 0x4E8E, 0xE9CD }, { 0x4E90, 0xEAA7 }, { 0x4E91, 0xE9F6 }, { 0x4E92, 0xFBBB }, { 0x4E94, 0xE7E9 }, { 0x4E95, 0xEFCC }, { 0x4E98, 0xD0E6 },
+	{ 0x4E9B, 0xDEC1 }, { 0x4E9E, 0xE4AC }, { 0x4EA1, 0xD8CC }, { 0x4EA2, 0xF9F1 }, { 0x4EA4, 0xCEDF }, { 0x4EA5, 0xFAA4 }, { 0x4EA6, 0xE6B2 }, { 0x4EA8, 0xFAFB },
+	{ 0x4EAB, 0xFABD }, { 0x4EAC, 0xCCC8 }, { 0x4EAD, 0xEFCD }, { 0x4EAE, 0xD5D5 }, { 0x4EB6, 0xD3A2 }, { 0x4EBA, 0xECD1 }, { 0x4EC0, 0xE4A7 }, { 0x4EC1, 0xECD2 },
+	{ 0x4EC4, 0xF6B1 }, { 0x4EC7, 0xCEFB }, { 0x4ECA, 0xD0D1 }, { 0x4ECB, 0xCBBF }, { 0x4ECD, 0xEDA4 }, { 0x4ED4, 0xEDA8 }, { 0x4ED5, 0xDEC2 }, { 0x4ED6, 0xF6E2 },
+	{ 0x4ED7, 0xEDDC }, { 0x4ED8, 0xDCF5 }, { 0x4ED9, 0xE0B9 }, { 0x4EDD, 0xD4CE }, { 0x4EDF, 0xF4B5 }, { 0x4EE3, 0xD3DB }, { 0x4EE4, 0xD6B5 }, { 0x4EE5, 0xECA4 },
+	{ 0x4EF0, 0xE4E6 }, { 0x4EF2, 0xF1EA }, { 0x4EF6, 0xCBEC }, { 0x4EF7, 0xCBC0 }, { 0x4EFB, 0xECF2 }, { 0x4F01, 0xD0EA }, { 0x4F09, 0xF9F2 }, { 0x4F0A, 0xECA5 },
+	{ 0x4F0B, 0xD0DF }, { 0x4F0D, 0xE7EA }, { 0x4F0E, 0xD0EB }, { 0x4F0F, 0xDCD1 }, { 0x4F10, 0xDBE9 }, { 0x4F11, 0xFDCC }, { 0x4F2F, 0xDBD7 }, { 0x4F34, 0xDAE1 },
+	{ 0x4F36, 0xD6B6 }, { 0x4F38, 0xE3DF }, { 0x4F3A, 0xDEC3 }, { 0x4F3C, 0xDEC4 }, { 0x4F3D, 0xCAA1 }, { 0x4F43, 0xEEEC }, { 0x4F46, 0xD3A3 }, { 0x4F47, 0xEEB7 },
+	{ 0x4F48, 0xF8CF }, { 0x4F4D, 0xEAC8 }, { 0x4F4E, 0xEEB8 }, { 0x4F4F, 0xF1AC }, { 0x4F50, 0xF1A5 }, { 0x4F51, 0xE9CE }, { 0x4F55, 0xF9BC }, { 0x4F59, 0xE5F9 },
+	{ 0x4F5A, 0xECEA }, { 0x4F5B, 0xDDD6 }, { 0x4F5C, 0xEDC2 }, { 0x4F69, 0xF8A5 }, { 0x4F6F, 0xE5BA }, { 0x4F70, 0xDBD8 }, { 0x4F73, 0xCAA2 }, { 0x4F76, 0xD1CD },
+	{ 0x4F7A, 0xEEED }, { 0x4F7E, 0xECEB }, { 0x4F7F, 0xDEC5 }, { 0x4F81, 0xE3E0 }, { 0x4F83, 0xCAC9 }, { 0x4F84, 0xF2E9 }, { 0x4F86, 0xD5CE }, { 0x4F88, 0xF6B6 },
+	{ 0x4F8A, 0xCEC2 }, { 0x4F8B, 0xD6C7 }, { 0x4F8D, 0xE3B4 }, { 0x4F8F, 0xF1AD }, { 0x4F91, 0xEAE2 }, { 0x4F96, 0xD7C2 }, { 0x4F98, 0xF3A7 }, { 0x4F9B, 0xCDEA },
+	{ 0x4F9D, 0xEBEE }, { 0x4FAE, 0xD9B2 }, { 0x4FAF, 0xFDA5 }, { 0x4FB5, 0xF6D5 }, { 0x4FB6, 0xD5E2 }, { 0x4FBF, 0xF8B5 }, { 0x4FC2, 0xCCF5 }, { 0x4FC3, 0xF5B5 },
+	{ 0x4FC4, 0xE4AD }, { 0x4FC9, 0xE7EB }, { 0x4FCA, 0xF1D5 }, { 0x4FCE, 0xF0BB }, { 0x4FD1, 0xE9B5 }, { 0x4FD3, 0xCCC9 }, { 0x4FD4, 0xFAD5 }, { 0x4FD7, 0xE1D4 },
+	{ 0x4FDA, 0xD7D6 }, { 0x4FDD, 0xDCC1 }, { 0x4FDF, 0xDEC6 }, { 0x4FE0, 0xFAEF }, { 0x4FE1, 0xE3E1 }, { 0x4FEE, 0xE1F3 }, { 0x4FEF, 0xDCF6 }, { 0x4FF1, 0xCEFC },
+	{ 0x4FF3, 0xDBC4 }, { 0x4FF5, 0xF8F1 }, { 0x4FF8, 0xDCE4 }, { 0x4FFA, 0xE5EF }, { 0x5002, 0xDCB1 }, { 0x5006, 0xD5D6 }, { 0x5009, 0xF3DA }, { 0x500B, 0xCBC1 },
+	{ 0x500D, 0xDBC3 }, { 0x5011, 0xD9FA }, { 0x5012, 0xD3EE }, { 0x5016, 0xFAB8 }, { 0x5019, 0xFDA6 }, { 0x501A, 0xEBEF }, { 0x501C, 0xF4A6 }, { 0x501E, 0xCCCA },
+	{ 0x501F, 0xF3A8 }, { 0x5021, 0xF3DB }, { 0x5023, 0xDBA7 }, { 0x5024, 0xF6B7 }, { 0x5026, 0xCFE6 }, { 0x5027, 0xF0F2 }, { 0x5028, 0xCBDA }, { 0x502A, 0xE7D2 },
+	{ 0x502B, 0xD7C3 }, { 0x502C, 0xF6F0 }, { 0x502D, 0xE8DE }, { 0x503B, 0xE5A6 }, { 0x5043, 0xE5E7 }, { 0x5047, 0xCAA3 }, { 0x5048, 0xCCA7 }, { 0x5049, 0xEAC9 },
+	{ 0x504F, 0xF8B6 }, { 0x5055, 0xFAA5 }, { 0x505A, 0xF1AE }, { 0x505C, 0xEFCE }, { 0x5065, 0xCBED }, { 0x5074, 0xF6B0 }, { 0x5075, 0xEFCF }, { 0x5076, 0xE9CF },
+	{ 0x5078, 0xF7DE }, { 0x5080, 0xCED3 }, { 0x5085, 0xDCF7 }, { 0x508D, 0xDBA8 }, { 0x5091, 0xCBF8 }, { 0x5098, 0xDFA1 }, { 0x5099, 0xDDE1 }, { 0x50AC, 0xF5CA },
+	{ 0x50AD, 0xE9B6 }, { 0x50B2, 0xE7EC }, { 0x50B3, 0xEEEE }, { 0x50B5, 0xF3F0 }, { 0x50B7, 0xDFBF }, { 0x50BE, 0xCCCB }, { 0x50C5, 0xD0C1 }, { 0x50C9, 0xF4D2 },
+	{ 0x50CA, 0xE0BA }, { 0x50CF, 0xDFC0 }, { 0x50D1, 0xCEE0 }, { 0x50D5, 0xDCD2 }, { 0x50D6, 0xFDEA }, { 0x50DA, 0xD6F6 }, { 0x50DE, 0xEACA }, { 0x50E5, 0xE8E9 },
+	{ 0x50E7, 0xE3AC }, { 0x50ED, 0xF3D0 }, { 0x50F9, 0xCAA4 }, { 0x50FB, 0xDBF8 }, { 0x50FF, 0xDEC7 }, { 0x5100, 0xEBF0 }, { 0x5101, 0xF1D6 }, { 0x5104, 0xE5E2 },
+	{ 0x5106, 0xCCCC }, { 0x5109, 0xCBFB }, { 0x5112, 0xEAE3 }, { 0x511F, 0xDFC1 }, { 0x5121, 0xD6ED }, { 0x512A, 0xE9D0 }, { 0x5132, 0xEEB9 }, { 0x5137, 0xD5E3 },
+	{ 0x513A, 0xD1D3 }, { 0x513C, 0xE5F0 }, { 0x5140, 0xE8B4 }, { 0x5141, 0xEBC3 }, { 0x5143, 0xEAAA }, { 0x5144, 0xFAFC }, { 0x5145, 0xF5F6 }, { 0x5146, 0xF0BC },
+	{ 0x5147, 0xFDD4 }, { 0x5148, 0xE0BB }, { 0x5149, 0xCEC3 }, { 0x514B, 0xD0BA }, { 0x514C, 0xF7BA }, { 0x514D, 0xD8F3 }, { 0x514E, 0xF7CD }, { 0x5152, 0xE4AE },
+	{ 0x515C, 0xD4DF }, { 0x5162, 0xD0E7 }, { 0x5165, 0xECFD }, { 0x5167, 0xD2AE }, { 0x5168, 0xEEEF }, { 0x5169, 0xD5D7 }, { 0x516A, 0xEAE4 }, { 0x516B, 0xF8A2 },
+	{ 0x516C, 0xCDEB }, { 0x516D, 0xD7BF }, { 0x516E, 0xFBB1 }, { 0x5171, 0xCDEC }, { 0x5175, 0xDCB2 }, { 0x5176, 0xD0EC }, { 0x5177, 0xCEFD }, { 0x5178, 0xEEF0 },
+	{ 0x517C, 0xCCC2 }, { 0x5180, 0xD0ED }, { 0x5186, 0xE5F7 }, { 0x518A, 0xF3FC }, { 0x518D, 0xEEA2 }, { 0x5192, 0xD9B3 }, { 0x5195, 0xD8F4 }, { 0x5197, 0xE9B7 },
+	{ 0x51A0, 0xCEAE }, { 0x51A5, 0xD9A2 }, { 0x51AA, 0xD8F1 }, { 0x51AC, 0xD4CF }, { 0x51B6, 0xE5A7 }, { 0x51B7, 0xD5D2 }, { 0x51BD, 0xD6A9 }, { 0x51C4, 0xF4A2 },
+	{ 0x51C6, 0xF1D7 }, { 0x51C9, 0xD5D8 }, { 0x51CB, 0xF0BD }, { 0x51CC, 0xD7D0 }, { 0x51CD, 0xD4D0 }, { 0x51DC, 0xD7CF }, { 0x51DD, 0xEBEA }, { 0x51DE, 0xFDEB },
+	{ 0x51E1, 0xDBED }, { 0x51F0, 0xFCC5 }, { 0x51F1, 0xCBC2 }, { 0x51F6, 0xFDD5 }, { 0x51F8, 0xF4C8 }, { 0x51F9, 0xE8EA }, { 0x51FA, 0xF5F3 }, { 0x51FD, 0xF9DE },
+	{ 0x5200, 0xD3EF }, { 0x5203, 0xECD3 }, { 0x5206, 0xDDC2 }, { 0x5207, 0xEFB7 }, { 0x5208, 0xE7D4 }, { 0x520A, 0xCACA }, { 0x520E, 0xD9FB }, { 0x5211, 0xFAFD },
+	{ 0x5217, 0xD6AA }, { 0x521D, 0xF4F8 }, { 0x5224, 0xF7F7 }, { 0x5225, 0xDCAC }, { 0x5229, 0xD7D7 }, { 0x522A, 0xDFA2 }, { 0x522E, 0xCEBE }, { 0x5230, 0xD3F0 },
+	{ 0x5236, 0xF0A4 }, { 0x5237, 0xE1EC }, { 0x5238, 0xCFE7 }, { 0x5239, 0xF3CB }, { 0x523A, 0xEDA9 }, { 0x523B, 0xCABE }, { 0x5243, 0xF4EF }, { 0x5247, 0xF6CE },
+	{ 0x524A, 0xDEFB }, { 0x524B, 0xD0BB }, { 0x524C, 0xD5B7 }, { 0x524D, 0xEEF1 }, { 0x5254, 0xF4A8 }, { 0x5256, 0xDCF8 }, { 0x525B, 0xCBA7 }, { 0x525D, 0xDACE },
+	{ 0x5261, 0xE0E6 }, { 0x5269, 0xEDA5 }, { 0x526A, 0xEEF2 }, { 0x526F, 0xDCF9 }, { 0x5272, 0xF9DC }, { 0x5275, 0xF3DC }, { 0x527D, 0xF8F2 }, { 0x527F, 0xF4F9 },
+	{ 0x5283, 0xFCF1 }, { 0x5287, 0xD0BC }, { 0x5288, 0xDBF9 }, { 0x5289, 0xD7B1 }, { 0x528D, 0xCBFC }, { 0x5291, 0xF0A5 }, { 0x5292, 0xCBFD }, { 0x529B, 0xD5F4 },
+	{ 0x529F, 0xCDED }, { 0x52A0, 0xCAA5 }, { 0x52A3, 0xD6AB }, { 0x52A4, 0xD0C2 }, { 0x52A9, 0xF0BE }, { 0x52AA, 0xD2BD }, { 0x52AB, 0xCCA4 }, { 0x52BE, 0xFAB6 },
+	{ 0x52C1, 0xCCCD }, { 0x52C3, 0xDAFA }, { 0x52C5, 0xF6CF }, { 0x52C7, 0xE9B8 }, { 0x52C9, 0xD8F5 }, { 0x52CD, 0xCCCE }, { 0x52D2, 0xD7CD }, { 0x52D5, 0xD4D1 },
+	{ 0x52D6, 0xE9ED }, { 0x52D8, 0xCAEB }, { 0x52D9, 0xD9E2 }, { 0x52DB, 0xFDB2 }, { 0x52DD, 0xE3AD }, { 0x52DE, 0xD6CC }, { 0x52DF, 0xD9B4 }, { 0x52E2, 0xE1A7 },
+	{ 0x52E3, 0xEED3 }, { 0x52E4, 0xD0C3 }, { 0x52F3, 0xFDB3 }, { 0x52F5, 0xD5E4 }, { 0x52F8, 0xCFE8 }, { 0x52FA, 0xEDC3 }, { 0x52FB, 0xD0B2 }, { 0x52FE, 0xCEFE },
+	{ 0x52FF, 0xDAA8 }, { 0x5305, 0xF8D0 }, { 0x5308, 0xFDD6 }, { 0x530D, 0xF8D1 }, { 0x530F, 0xF8D2 }, { 0x5310, 0xDCD3 }, { 0x5315, 0xDDE2 }, { 0x5316, 0xFBF9 },
+	{ 0x5317, 0xDDC1 }, { 0x5319, 0xE3B5 }, { 0x5320, 0xEDDD }, { 0x5321, 0xCEC4 }, { 0x5323, 0xCBA1 }, { 0x532A, 0xDDE3 }, { 0x532F, 0xFCDD }, { 0x5339, 0xF9AF },
+	{ 0x533F, 0xD2FB }, { 0x5340, 0xCFA1 }, { 0x5341, 0xE4A8 }, { 0x5343, 0xF4B6 }, { 0x5344, 0xECFE }, { 0x5347, 0xE3AE }, { 0x5348, 0xE7ED }, { 0x5349, 0xFDC1 },
+	{ 0x534A, 0xDAE2 }, { 0x534D, 0xD8B3 }, { 0x5351, 0xDDE4 }, { 0x5352, 0xF0EF }, { 0x5353, 0xF6F1 }, { 0x5354, 0xFAF0 }, { 0x5357, 0xD1F5 }, { 0x535A, 0xDACF },
+	{ 0x535C, 0xDCD4 }, { 0x535E, 0xDCA6 }, { 0x5360, 0xEFBF }, { 0x5366, 0xCECF }, { 0x5368, 0xE0D9 }, { 0x536F, 0xD9D6 }, { 0x5370, 0xECD4 }, { 0x5371, 0xEACB },
+	{ 0x5374, 0xCABF }, { 0x5375, 0xD5B0 }, { 0x5377, 0xCFE9 }, { 0x537D, 0xF1ED }, { 0x537F, 0xCCCF }, { 0x5384, 0xE4F8 }, { 0x5393, 0xE4ED }, { 0x5398, 0xD7D8 },
+	{ 0x539A, 0xFDA7 }, { 0x539F, 0xEAAB }, { 0x53A0, 0xF6B2 }, { 0x53A5, 0xCFF0 }, { 0x53A6, 0xF9BD }, { 0x53AD, 0xE6F4 }, { 0x53BB, 0xCBDB }, { 0x53C3, 0xF3D1 },
+	{ 0x53C8, 0xE9D1 }, { 0x53C9, 0xF3A9 }, { 0x53CA, 0xD0E0 }, { 0x53CB, 0xE9D2 }, { 0x53CD, 0xDAE3 }, { 0x53D4, 0xE2D2 }, { 0x53D6, 0xF6A2 }, { 0x53D7, 0xE1F4 },
+	{ 0x53DB, 0xDAE4 }, { 0x53E1, 0xE7D5 }, { 0x53E2, 0xF5BF }, { 0x53E3, 0xCFA2 }, { 0x53E4, 0xCDAF }, { 0x53E5, 0xCFA3 }, { 0x53E9, 0xCDB0 }, { 0x53EA, 0xF1FE },
+	{ 0x53EB, 0xD0A3 }, { 0x53EC, 0xE1AF }, { 0x53ED, 0xF8A3 }, { 0x53EF, 0xCAA6 }, { 0x53F0, 0xF7BB }, { 0x53F1, 0xF2EA }, { 0x53F2, 0xDEC8 }, { 0x53F3, 0xE9D3 },
+	{ 0x53F8, 0xDEC9 }, { 0x5403, 0xFDDE }, { 0x5404, 0xCAC0 }, { 0x5408, 0xF9EA }, { 0x5409, 0xD1CE }, { 0x540A, 0xEED4 }, { 0x540C, 0xD4D2 }, { 0x540D, 0xD9A3 },
+	{ 0x540E, 0xFDA8 }, { 0x540F, 0xD7D9 }, { 0x5410, 0xF7CE }, { 0x5411, 0xFABE }, { 0x541B, 0xCFD6 }, { 0x541D, 0xD7F0 }, { 0x541F, 0xEBE1 }, { 0x5420, 0xF8C5 },
+	{ 0x5426, 0xDCFA }, { 0x5429, 0xDDC3 }, { 0x542B, 0xF9DF }, { 0x5433, 0xE7EF }, { 0x5438, 0xFDE5 }, { 0x5439, 0xF6A3 }, { 0x543B, 0xD9FC }, { 0x543C, 0xFDA9 },
+	{ 0x543E, 0xE7EE }, { 0x5442, 0xD5E5 }, { 0x5448, 0xEFD0 }, { 0x544A, 0xCDB1 }, { 0x5451, 0xF7A2 }, { 0x5468, 0xF1B2 }, { 0x546A, 0xF1B1 }, { 0x5471, 0xCDB2 },
+	{ 0x5473, 0xDAAB }, { 0x5475, 0xCAA7 }, { 0x547B, 0xE3E2 }, { 0x547C, 0xFBBC }, { 0x547D, 0xD9A4 }, { 0x5480, 0xEEBA }, { 0x5486, 0xF8D3 }, { 0x548C, 0xFBFA },
+	{ 0x548E, 0xCFA4 }, { 0x5490, 0xDCFB }, { 0x54A4, 0xF6E3 }, { 0x54A8, 0xEDAA }, { 0x54AB, 0xF2A1 }, { 0x54AC, 0xCEE1 }, { 0x54B3, 0xFAA6 }, { 0x54B8, 0xF9E0 },
+	{ 0x54BD, 0xECD6 }, { 0x54C0, 0xE4EE }, { 0x54C1, 0xF9A1 }, { 0x54C4, 0xFBEF }, { 0x54C8, 0xF9EB }, { 0x54C9, 0xEEA3 }, { 0x54E1, 0xEAAC }, { 0x54E5, 0xCAA8 },
+	{ 0x54E8, 0xF4FA }, { 0x54ED, 0xCDD6 }, { 0x54EE, 0xFCF6 }, { 0x54F2, 0xF4C9 }, { 0x54FA, 0xF8D4 }, { 0x5504, 0xF8A6 }, { 0x5506, 0xDECA }, { 0x5507, 0xF2C6 },
+	{ 0x550E, 0xD7DA }, { 0x5510, 0xD3D0 }, { 0x551C, 0xD8C5 }, { 0x552F, 0xEAE6 }, { 0x5531, 0xF3DD }, { 0x5535, 0xE4DA }, { 0x553E, 0xF6E4 }, { 0x5544, 0xF6F2 },
+	{ 0x5546, 0xDFC2 }, { 0x554F, 0xD9FD }, { 0x5553, 0xCCF6 }, { 0x5556, 0xD3BA }, { 0x555E, 0xE4AF }, { 0x5563, 0xF9E1 }, { 0x557C, 0xF0A6 }, { 0x5580, 0xCBD3 },
+	{ 0x5584, 0xE0BC }, { 0x5586, 0xF4CA }, { 0x5587, 0xD4FA }, { 0x5589, 0xFDAA }, { 0x558A, 0xF9E2 }, { 0x5598, 0xF4B7 }, { 0x5599, 0xFDC2 }, { 0x559A, 0xFCB0 },
+	{ 0x559C, 0xFDEC }, { 0x559D, 0xCAE2 }, { 0x55A7, 0xFDBD }, { 0x55A9, 0xEAE7 }, { 0x55AA, 0xDFC3 }, { 0x55AB, 0xD1D2 }, { 0x55AC, 0xCEE2 }, { 0x55AE, 0xD3A4 },
+	{ 0x55C5, 0xFDAB }, { 0x55C7, 0xDFE0 }, { 0x55D4, 0xF2C7 }, { 0x55DA, 0xE7F0 }, { 0x55DC, 0xD0EE }, { 0x55DF, 0xF3AA }, { 0x55E3, 0xDECB }, { 0x55E4, 0xF6B8 },
+	{ 0x55FD, 0xE1F5 }, { 0x55FE, 0xF1B3 }, { 0x5606, 0xF7A3 }, { 0x5609, 0xCAA9 }, { 0x5614, 0xCFA5 }, { 0x5617, 0xDFC4 }, { 0x562F, 0xE1B0 }, { 0x5632, 0xF0BF },
+	{ 0x5634, 0xF6A4 }, { 0x5636, 0xE3B6 }, { 0x5653, 0xFAC6 }, { 0x5668, 0xD0EF }, { 0x566B, 0xFDED }, { 0x5674, 0xDDC4 }, { 0x5686, 0xFCF7 }, { 0x56A5, 0xE6BF },
+	{ 0x56AC, 0xDEAD }, { 0x56AE, 0xFABF }, { 0x56B4, 0xE5F1 }, { 0x56BC, 0xEDC4 }, { 0x56CA, 0xD2A5 }, { 0x56CD, 0xFDEE }, { 0x56D1, 0xF5B6 }, { 0x56DA, 0xE1F6 },
+	{ 0x56DB, 0xDECC }, { 0x56DE, 0xFCDE }, { 0x56E0, 0xECD7 }, { 0x56F0, 0xCDDD }, { 0x56F9, 0xD6B7 }, { 0x56FA, 0xCDB3 }, { 0x5703, 0xF8D5 }, { 0x5704, 0xE5D8 },
+	{ 0x5708, 0xCFEA }, { 0x570B, 0xCFD0 }, { 0x570D, 0xEACC }, { 0x5712, 0xEAAE }, { 0x5713, 0xEAAD }, { 0x5716, 0xD3F1 }, { 0x5718, 0xD3A5 }, { 0x571F, 0xF7CF },
+	{ 0x5728, 0xEEA4 }, { 0x572D, 0xD0A4 }, { 0x5730, 0xF2A2 }, { 0x573B, 0xD0F0 }, { 0x5740, 0xF2A3 }, { 0x5742, 0xF7F8 }, { 0x5747, 0xD0B3 }, { 0x574A, 0xDBA9 },
+	{ 0x574D, 0xD3BB }, { 0x574E, 0xCAEC }, { 0x5750, 0xF1A6 }, { 0x5751, 0xCBD5 }, { 0x5761, 0xF7E7 }, { 0x5764, 0xCDDE }, { 0x5766, 0xF7A4 }, { 0x576A, 0xF8C0 },
+	{ 0x576E, 0xD3DD }, { 0x5770, 0xCCD0 }, { 0x5775, 0xCFA6 }, { 0x577C, 0xF6F3 }, { 0x5782, 0xE1F7 }, { 0x5788, 0xD3DC }, { 0x578B, 0xFAFE }, { 0x5793, 0xFAA7 },
+	{ 0x57A0, 0xEBD9 }, { 0x57A2, 0xCFA7 }, { 0x57A3, 0xEAAF }, { 0x57C3, 0xE4EF }, { 0x57C7, 0xE9B9 }, { 0x57C8, 0xF1D8 }, { 0x57CB, 0xD8D8 }, { 0x57CE, 0xE0F2 },
+	{ 0x57DF, 0xE6B4 }, { 0x57E0, 0xDCFC }, { 0x57F0, 0xF3F1 }, { 0x57F4, 0xE3D0 }, { 0x57F7, 0xF2FB }, { 0x57F9, 0xDBC6 }, { 0x57FA, 0xD0F1 }, { 0x57FC, 0xD0F2 },
+	{ 0x5800, 0xCFDC }, { 0x5802, 0xD3D1 }, { 0x5805, 0xCCB1 }, { 0x5806, 0xF7D8 }, { 0x5808, 0xCBA8 }, { 0x5809, 0xEBBC }, { 0x580A, 0xE4BE }, { 0x581E, 0xF4DC },
+	{ 0x5821, 0xDCC2 }, { 0x5824, 0xF0A7 }, { 0x5827, 0xE6C0 }, { 0x582A, 0xCAED }, { 0x582F, 0xE8EB }, { 0x5830, 0xE5E8 }, { 0x5831, 0xDCC3 }, { 0x5834, 0xEDDE },
+	{ 0x5835, 0xD3F2 }, { 0x583A, 0xCCF7 }, { 0x584A, 0xCED4 }, { 0x584B, 0xE7AB }, { 0x584F, 0xCBC3 }, { 0x5851, 0xE1B1 }, { 0x5854, 0xF7B2 }, { 0x5857, 0xD3F3 },
+	{ 0x5858, 0xD3D2 }, { 0x585A, 0xF5C0 }, { 0x585E, 0xDFDD }, { 0x5861, 0xEEF3 }, { 0x5862, 0xE7F1 }, { 0x5864, 0xFDB4 }, { 0x5875, 0xF2C8 }, { 0x5879, 0xF3D2 },
+	{ 0x587C, 0xEEF4 }, { 0x587E, 0xE2D3 }, { 0x5883, 0xCCD1 }, { 0x5885, 0xDFEA }, { 0x5889, 0xE9BA }, { 0x5893, 0xD9D7 }, { 0x589C, 0xF5CD }, { 0x589E, 0xF1F2 },
+	{ 0x589F, 0xFAC7 }, { 0x58A8, 0xD9F8 }, { 0x58A9, 0xD4C2 }, { 0x58AE, 0xF6E5 }, { 0x58B3, 0xDDC5 }, { 0x58BA, 0xE7F2 }, { 0x58BB, 0xEDDF }, { 0x58BE, 0xCACB },
+	{ 0x58C1, 0xDBFA }, { 0x58C5, 0xE8B5 }, { 0x58C7, 0xD3A6 }, { 0x58CE, 0xFDB5 }, { 0x58D1, 0xF9C9 }, { 0x58D3, 0xE4E2 }, { 0x58D5, 0xFBBD }, { 0x58D8, 0xD7A4 },
+	{ 0x58D9, 0xCEC5 }, { 0x58DE, 0xCED5 }, { 0x58DF, 0xD6E6 }, { 0x58E4, 0xE5BD }, { 0x58EB, 0xDECD }, { 0x58EC, 0xECF3 }, { 0x58EF, 0xEDE0 }, { 0x58F9, 0xECEC },
+	{ 0x58FA, 0xFBBE }, { 0x58FB, 0xDFEB }, { 0x58FD, 0xE1F8 }, { 0x590F, 0xF9BE }, { 0x5914, 0xD0F3 }, { 0x5915, 0xE0AA }, { 0x5916, 0xE8E2 }, { 0x5919, 0xE2D4 },
+	{ 0x591A, 0xD2FD }, { 0x591C, 0xE5A8 }, { 0x5922, 0xD9D3 }, { 0x5927, 0xD3DE }, { 0x5929, 0xF4B8 }, { 0x592A, 0xF7BC }, { 0x592B, 0xDCFD }, { 0x592D, 0xE8EC },
+	{ 0x592E, 0xE4E7 }, { 0x5931, 0xE3F7 }, { 0x5937, 0xECA8 }, { 0x593E, 0xFAF1 }, { 0x5944, 0xE5F2 }, { 0x5947, 0xD0F4 }, { 0x5948, 0xD2AF }, { 0x5949, 0xDCE5 },
+	{ 0x594E, 0xD0A5 }, { 0x594F, 0xF1B4 }, { 0x5950, 0xFCB1 }, { 0x5951, 0xCCF8 }, { 0x5954, 0xDDC6 }, { 0x5955, 0xFAD1 }, { 0x5957, 0xF7DF }, { 0x595A, 0xFAA8 },
+	{ 0x5960, 0xEEF5 }, { 0x5962, 0xDECE }, { 0x5967, 0xE7F3 }, { 0x596A, 0xF7AC }, { 0x596B, 0xEBC4 }, { 0x596C, 0xEDE1 }, { 0x596D, 0xE0AB }, { 0x596E, 0xDDC7 },
+	{ 0x5973, 0xD2B3 }, { 0x5974, 0xD2BF }, { 0x5978, 0xCACC }, { 0x597D, 0xFBBF }, { 0x5982, 0xE5FD }, { 0x5983, 0xDDE5 }, { 0x5984, 0xD8CD }, { 0x598A, 0xECF4 },
+	{ 0x5993, 0xD0F5 }, { 0x5996, 0xE8ED }, { 0x5997, 0xD0D2 }, { 0x5999, 0xD9D8 }, { 0x59A5, 0xF6E6 }, { 0x59A8, 0xDBAA }, { 0x59AC, 0xF7E0 }, { 0x59B9, 0xD8D9 },
+	{ 0x59BB, 0xF4A3 }, { 0x59BE, 0xF4DD }, { 0x59C3, 0xEFD1 }, { 0x59C6, 0xD9B5 }, { 0x59C9, 0xEDAB }, { 0x59CB, 0xE3B7 }, { 0x59D0, 0xEEBB }, { 0x59D1, 0xCDB4 },
+	{ 0x59D3, 0xE0F3 }, { 0x59D4, 0xEACD }, { 0x59D9, 0xECF5 }, { 0x59DA, 0xE8EE }, { 0x59DC, 0xCBA9 }, { 0x59DD, 0xF1AF }, { 0x59E6, 0xCACD }, { 0x59E8, 0xECA9 },
+	{ 0x59EA, 0xF2EB }, { 0x59EC, 0xFDEF }, { 0x59EE, 0xF9F3 }, { 0x59F8, 0xE6C1 }, { 0x59FB, 0xECD8 }, { 0x59FF, 0xEDAC }, { 0x5A01, 0xEACE }, { 0x5A03, 0xE8DF },
+	{ 0x5A11, 0xDECF }, { 0x5A18, 0xD2A6 }, { 0x5A1B, 0xE7F4 }, { 0x5A1C, 0xD1D6 }, { 0x5A1F, 0xE6C2 }, { 0x5A20, 0xE3E3 }, { 0x5A25, 0xE4B0 }, { 0x5A29, 0xD8B4 },
+	{ 0x5A36, 0xF6A5 }, { 0x5A3C, 0xF3DE }, { 0x5A41, 0xD7A5 }, { 0x5A46, 0xF7E8 }, { 0x5A49, 0xE8C6 }, { 0x5A5A, 0xFBE6 }, { 0x5A62, 0xDDE6 }, { 0x5A66, 0xDCFE },
+	{ 0x5A92, 0xD8DA }, { 0x5A9A, 0xDAAC }, { 0x5A9B, 0xEAB0 }, { 0x5AA4, 0xE3B8 }, { 0x5AC1, 0xCAAA }, { 0x5AC2, 0xE1F9 }, { 0x5AC4, 0xEAB1 }, { 0x5AC9, 0xF2EC },
+	{ 0x5ACC, 0xFAEE }, { 0x5AE1, 0xEED5 }, { 0x5AE6, 0xF9F4 }, { 0x5AE9, 0xD2EC }, { 0x5B05, 0xFBFB }, { 0x5B09, 0xFDF0 }, { 0x5B0B, 0xE0BD }, { 0x5B0C, 0xCEE3 },
+	{ 0x5B16, 0xF8C6 }, { 0x5B2A, 0xDEAE }, { 0x5B40, 0xDFC5 }, { 0x5B43, 0xE5BE }, { 0x5B50, 0xEDAD }, { 0x5B51, 0xFAEA }, { 0x5B54, 0xCDEE }, { 0x5B55, 0xEDA6 },
+	{ 0x5B57, 0xEDAE }, { 0x5B58, 0xF0ED }, { 0x5B5A, 0xDDA1 }, { 0x5B5C, 0xEDAF }, { 0x5B5D, 0xFCF8 }, { 0x5B5F, 0xD8EB }, { 0x5B63, 0xCCF9 }, { 0x5B64, 0xCDB5 },
+	{ 0x5B69, 0xFAA9 }, { 0x5B6B, 0xE1DD }, { 0x5B70, 0xE2D5 }, { 0x5B71, 0xEDCF }, { 0x5B75, 0xDDA2 }, { 0x5B78, 0xF9CA }, { 0x5B7A, 0xEAE8 }, { 0x5B7C, 0xE5ED },
+	{ 0x5B85, 0xD3EB }, { 0x5B87, 0xE9D4 }, { 0x5B88, 0xE1FA }, { 0x5B89, 0xE4CC }, { 0x5B8B, 0xE1E4 }, { 0x5B8C, 0xE8C7 }, { 0x5B8F, 0xCEDB }, { 0x5B93, 0xDCD5 },
+	{ 0x5B95, 0xF7B5 }, { 0x5B96, 0xFCF3 }, { 0x5B97, 0xF0F3 }, { 0x5B98, 0xCEAF }, { 0x5B99, 0xF1B5 }, { 0x5B9A, 0xEFD2 }, { 0x5B9B, 0xE8C8 }, { 0x5B9C, 0xEBF1 },
+	{ 0x5BA2, 0xCBD4 }, { 0x5BA3, 0xE0BE }, { 0x5BA4, 0xE3F8 }, { 0x5BA5, 0xEAE9 }, { 0x5BA6, 0xFCB2 }, { 0x5BAC, 0xE0F4 }, { 0x5BAE, 0xCFE0 }, { 0x5BB0, 0xEEA5 },
+	{ 0x5BB3, 0xFAAA }, { 0x5BB4, 0xE6C3 }, { 0x5BB5, 0xE1B2 }, { 0x5BB6, 0xCAAB }, { 0x5BB8, 0xE3E4 }, { 0x5BB9, 0xE9BB }, { 0x5BBF, 0xE2D6 }, { 0x5BC0, 0xF3F2 },
+	{ 0x5BC2, 0xEED6 }, { 0x5BC3, 0xEAB2 }, { 0x5BC4, 0xD0F6 }, { 0x5BC5, 0xECD9 }, { 0x5BC6, 0xDACB }, { 0x5BC7, 0xCFA8 }, { 0x5BCC, 0xDDA3 }, { 0x5BD0, 0xD8DB },
+	{ 0x5BD2, 0xF9CE }, { 0x5BD3, 0xE9D5 }, { 0x5BD4, 0xE3D1 }, { 0x5BD7, 0xD2BC }, { 0x5BDE, 0xD8AC }, { 0x5BDF, 0xF3CC }, { 0x5BE1, 0xCDFB }, { 0x5BE2, 0xF6D6 },
+	{ 0x5BE4, 0xE7F5 }, { 0x5BE5, 0xE8EF }, { 0x5BE6, 0xE3F9 }, { 0x5BE7, 0xD2BB }, { 0x5BE8, 0xF3F3 }, { 0x5BE9, 0xE3FB }, { 0x5BEB, 0xDED0 }, { 0x5BEC, 0xCEB0 },
+	{ 0x5BEE, 0xD6F7 }, { 0x5BEF, 0xF1D9 }, { 0x5BF5, 0xF5C1 }, { 0x5BF6, 0xDCC4 }, { 0x5BF8, 0xF5BB }, { 0x5BFA, 0xDED1 }, { 0x5C01, 0xDCE6 }, { 0x5C04, 0xDED2 },
+	{ 0x5C07, 0xEDE2 }, { 0x5C08, 0xEEF6 }, { 0x5C09, 0xEACF }, { 0x5C0A, 0xF0EE }, { 0x5C0B, 0xE3FC }, { 0x5C0D, 0xD3DF }, { 0x5C0E, 0xD3F4 }, { 0x5C0F, 0xE1B3 },
+	{ 0x5C11, 0xE1B4 }, { 0x5C16, 0xF4D3 }, { 0x5C19, 0xDFC6 }, { 0x5C24, 0xE9D6 }, { 0x5C28, 0xDBAB }, { 0x5C31, 0xF6A6 }, { 0x5C38, 0xE3B9 }, { 0x5C39, 0xEBC5 },
+	{ 0x5C3A, 0xF4A9 }, { 0x5C3B, 0xCDB6 }, { 0x5C3C, 0xD2F9 }, { 0x5C3E, 0xDAAD }, { 0x5C3F, 0xD2E3 }, { 0x5C40, 0xCFD1 }, { 0x5C45, 0xCBDC }, { 0x5C46, 0xCCFA },
+	{ 0x5C48, 0xCFDD }, { 0x5C4B, 0xE8A9 }, { 0x5C4D, 0xE3BB }, { 0x5C4E, 0xE3BA }, { 0x5C51, 0xE0DA }, { 0x5C55, 0xEEF7 }, { 0x5C5B, 0xDCB3 }, { 0x5C60, 0xD3F5 },
+	{ 0x5C62, 0xD7A6 }, { 0x5C64, 0xF6B5 }, { 0x5C65, 0xD7DB }, { 0x5C6C, 0xE1D5 }, { 0x5C6F, 0xD4EA }, { 0x5C71, 0xDFA3 }, { 0x5C79, 0xFDDF }, { 0x5C90, 0xD0F7 },
+	{ 0x5C91, 0xEDD4 }, { 0x5CA1, 0xCBAA }, { 0x5CA9, 0xE4DB }, { 0x5CAB, 0xE1FB }, { 0x5CAC, 0xCBA2 }, { 0x5CB1, 0xD3E0 }, { 0x5CB3, 0xE4BF }, { 0x5CB5, 0xFBC0 },
+	{ 0x5CB7, 0xDABE }, { 0x5CB8, 0xE4CD }, { 0x5CBA, 0xD6B9 }, { 0x5CBE, 0xEFC0 }, { 0x5CC0, 0xE1FC }, { 0x5CD9, 0xF6B9 }, { 0x5CE0, 0xDFC7 }, { 0x5CE8, 0xE4B1 },
+	{ 0x5CEF, 0xDCE7 }, { 0x5CF0, 0xDCE8 }, { 0x5CF4, 0xFAD6 }, { 0x5CF6, 0xD3F6 }, { 0x5CFB, 0xF1DA }, { 0x5CFD, 0xFAF2 }, { 0x5D07, 0xE2FD }, { 0x5D0D, 0xD5CF },
+	{ 0x5D0E, 0xD0F8 }, { 0x5D11, 0xCDDF }, { 0x5D14, 0xF5CB }, { 0x5D16, 0xE4F0 }, { 0x5D17, 0xCBAB }, { 0x5D19, 0xD7C4 }, { 0x5D27, 0xE2FE }, { 0x5D29, 0xDDDA },
+	{ 0x5D4B, 0xDAAE }, { 0x5D4C, 0xCAEE }, { 0x5D50, 0xD5B9 }, { 0x5D69, 0xE3A1 }, { 0x5D6C, 0xE8E3 }, { 0x5D6F, 0xF3AB }, { 0x5D87, 0xCFA9 }, { 0x5D8B, 0xD3F7 },
+	{ 0x5D9D, 0xD4F1 }, { 0x5DA0, 0xCEE4 }, { 0x5DA2, 0xE8F2 }, { 0x5DAA, 0xE5F5 }, { 0x5DB8, 0xE7AE }, { 0x5DBA, 0xD6BA }, { 0x5DBC, 0xDFEC }, { 0x5DBD, 0xE4C0 },
+	{ 0x5DCD, 0xE8E4 }, { 0x5DD2, 0xD8B5 }, { 0x5DD6, 0xE4DC }, { 0x5DDD, 0xF4B9 }, { 0x5DDE, 0xF1B6 }, { 0x5DE1, 0xE2DE }, { 0x5DE2, 0xE1B5 }, { 0x5DE5, 0xCDEF },
+	{ 0x5DE6, 0xF1A7 }, { 0x5DE7, 0xCEE5 }, { 0x5DE8, 0xCBDD }, { 0x5DEB, 0xD9E3 }, { 0x5DEE, 0xF3AC }, { 0x5DF1, 0xD0F9 }, { 0x5DF2, 0xECAB }, { 0x5DF3, 0xDED3 },
+	{ 0x5DF4, 0xF7E9 }, { 0x5DF7, 0xF9F5 }, { 0x5DFD, 0xE1DE }, { 0x5DFE, 0xCBEE }, { 0x5E02, 0xE3BC }, { 0x5E03, 0xF8D6 }, { 0x5E06, 0xDBEE }, { 0x5E0C, 0xFDF1 },
+	{ 0x5E11, 0xF7B6 }, { 0x5E16, 0xF4DE }, { 0x5E19, 0xF2ED }, { 0x5E1B, 0xDBD9 }, { 0x5E1D, 0xF0A8 }, { 0x5E25, 0xE1FD }, { 0x5E2B, 0xDED4 }, { 0x5E2D, 0xE0AC },
+	{ 0x5E33, 0xEDE3 }, { 0x5E36, 0xD3E1 }, { 0x5E38, 0xDFC8 }, { 0x5E3D, 0xD9B6 }, { 0x5E3F, 0xFDAC }, { 0x5E40, 0xEFD3 }, { 0x5E44, 0xE4C1 }, { 0x5E45, 0xF8EB },
+	{ 0x5E47, 0xDBAC }, { 0x5E4C, 0xFCC6 }, { 0x5E55, 0xD8AD }, { 0x5E5F, 0xF6BA }, { 0x5E61, 0xDBDF }, { 0x5E62, 0xD3D3 }, { 0x5E63, 0xF8C7 }, { 0x5E72, 0xCACE },
+	{ 0x5E73, 0xF8C1 }, { 0x5E74, 0xD2B4 }, { 0x5E77, 0xDCB4 }, { 0x5E78, 0xFAB9 }, { 0x5E79, 0xCACF }, { 0x5E7B, 0xFCB3 }, { 0x5E7C, 0xEAEA }, { 0x5E7D, 0xEAEB },
+	{ 0x5E7E, 0xD0FA }, { 0x5E84, 0xEDE4 }, { 0x5E87, 0xDDE7 }, { 0x5E8A, 0xDFC9 }, { 0x5E8F, 0xDFED }, { 0x5E95, 0xEEBC }, { 0x5E97, 0xEFC1 }, { 0x5E9A, 0xCCD2 },
+	{ 0x5E9C, 0xDDA4 }, { 0x5EA0, 0xDFCA }, { 0x5EA6, 0xD3F8 }, { 0x5EA7, 0xF1A8 }, { 0x5EAB, 0xCDB7 }, { 0x5EAD, 0xEFD4 }, { 0x5EB5, 0xE4DD }, { 0x5EB6, 0xDFEE },
+	{ 0x5EB7, 0xCBAC }, { 0x5EB8, 0xE9BC }, { 0x5EBE, 0xEAEC }, { 0x5EC2, 0xDFCB }, { 0x5EC8, 0xF9BF }, { 0x5EC9, 0xD6AF }, { 0x5ECA, 0xD5C6 }, { 0x5ED0, 0xCFAA },
+	{ 0x5ED3, 0xCEA9 }, { 0x5ED6, 0xD6F8 }, { 0x5EDA, 0xF1B7 }, { 0x5EDB, 0xEEF8 }, { 0x5EDF, 0xD9D9 }, { 0x5EE0, 0xF3DF }, { 0x5EE2, 0xF8C8 }, { 0x5EE3, 0xCEC6 },
+	{ 0x5EEC, 0xD5E6 }, { 0x5EF3, 0xF4E6 }, { 0x5EF6, 0xE6C5 }, { 0x5EF7, 0xEFD5 }, { 0x5EFA, 0xCBEF }, { 0x5EFB, 0xFCDF }, { 0x5F01, 0xDCA7 }, { 0x5F04, 0xD6E7 },
+	{ 0x5F0A, 0xF8C9 }, { 0x5F0F, 0xE3D2 }, { 0x5F11, 0xE3BD }, { 0x5F13, 0xCFE1 }, { 0x5F14, 0xF0C0 }, { 0x5F15, 0xECDA }, { 0x5F17, 0xDDD7 }, { 0x5F18, 0xFBF0 },
+	{ 0x5F1B, 0xECAC }, { 0x5F1F, 0xF0A9 }, { 0x5F26, 0xFAD7 }, { 0x5F27, 0xFBC1 }, { 0x5F29, 0xD2C0 }, { 0x5F31, 0xE5B0 }, { 0x5F35, 0xEDE5 }, { 0x5F3A, 0xCBAD },
+	{ 0x5F3C, 0xF9B0 }, { 0x5F48, 0xF7A5 }, { 0x5F4A, 0xCBAE }, { 0x5F4C, 0xDAAF }, { 0x5F4E, 0xD8B6 }, { 0x5F56, 0xD3A7 }, { 0x5F57, 0xFBB2 }, { 0x5F59, 0xFDC4 },
+	{ 0x5F5B, 0xECAD }, { 0x5F62, 0xFBA1 }, { 0x5F66, 0xE5E9 }, { 0x5F67, 0xE9EE }, { 0x5F69, 0xF3F4 }, { 0x5F6A, 0xF8F3 }, { 0x5F6B, 0xF0C1 }, { 0x5F6C, 0xDEAF },
+	{ 0x5F6D, 0xF8B0 }, { 0x5F70, 0xF3E0 }, { 0x5F71, 0xE7AF }, { 0x5F77, 0xDBAD }, { 0x5F79, 0xE6B5 }, { 0x5F7C, 0xF9A8 }, { 0x5F7F, 0xDDD8 }, { 0x5F80, 0xE8D9 },
+	{ 0x5F81, 0xEFD6 }, { 0x5F85, 0xD3E2 }, { 0x5F87, 0xE2DF }, { 0x5F8A, 0xFCE0 }, { 0x5F8B, 0xD7C8 }, { 0x5F8C, 0xFDAD }, { 0x5F90, 0xDFEF }, { 0x5F91, 0xCCD3 },
+	{ 0x5F92, 0xD3F9 }, { 0x5F97, 0xD4F0 }, { 0x5F98, 0xDBC7 }, { 0x5F99, 0xDED5 }, { 0x5F9E, 0xF0F4 }, { 0x5FA0, 0xD5D0 }, { 0x5FA1, 0xE5D9 }, { 0x5FA8, 0xFCC7 },
+	{ 0x5FA9, 0xDCD6 }, { 0x5FAA, 0xE2E0 }, { 0x5FAE, 0xDAB0 }, { 0x5FB5, 0xF3A3 }, { 0x5FB7, 0xD3EC }, { 0x5FB9, 0xF4CB }, { 0x5FBD, 0xFDC5 }, { 0x5FC3, 0xE3FD },
+	{ 0x5FC5, 0xF9B1 }, { 0x5FCC, 0xD0FB }, { 0x5FCD, 0xECDB }, { 0x5FD6, 0xF5BC }, { 0x5FD7, 0xF2A4 }, { 0x5FD8, 0xD8CE }, { 0x5FD9, 0xD8CF }, { 0x5FE0, 0xF5F7 },
+	{ 0x5FEB, 0xF6E1 }, { 0x5FF5, 0xD2B7 }, { 0x5FFD, 0xFBEC }, { 0x5FFF, 0xDDC8 }, { 0x600F, 0xE4E8 }, { 0x6012, 0xD2C1 }, { 0x6016, 0xF8D7 }, { 0x601C, 0xD6BB },
+	{ 0x601D, 0xDED6 }, { 0x6020, 0xF7BD }, { 0x6021, 0xECAE }, { 0x6025, 0xD0E1 }, { 0x6027, 0xE0F5 }, { 0x6028, 0xEAB3 }, { 0x602A, 0xCED6 }, { 0x602F, 0xCCA5 },
+	{ 0x6041, 0xECF6 }, { 0x6042, 0xE2E1 }, { 0x6043, 0xE3BE }, { 0x604D, 0xFCC8 }, { 0x6050, 0xCDF0 }, { 0x6052, 0xF9F6 }, { 0x6055, 0xDFF0 }, { 0x6059, 0xE5BF },
+	{ 0x605D, 0xCEBF }, { 0x6062, 0xFCE1 }, { 0x6063, 0xEDB0 }, { 0x6064, 0xFDD1 }, { 0x6065, 0xF6BB }, { 0x6068, 0xF9CF }, { 0x6069, 0xEBDA }, { 0x606A, 0xCAC1 },
+	{ 0x606C, 0xD2B8 }, { 0x606D, 0xCDF1 }, { 0x606F, 0xE3D3 }, { 0x6070, 0xFDE6 }, { 0x6085, 0xE6ED }, { 0x6089, 0xE3FA }, { 0x608C, 0xF0AA }, { 0x608D, 0xF9D0 },
+	{ 0x6094, 0xFCE2 }, { 0x6096, 0xF8A7 }, { 0x609A, 0xE1E5 }, { 0x609B, 0xEEF9 }, { 0x609F, 0xE7F6 }, { 0x60A0, 0xEAED }, { 0x60A3, 0xFCB4 }, { 0x60A4, 0xF5C2 },
+	{ 0x60A7, 0xD7DC }, { 0x60B0, 0xF0F5 }, { 0x60B2, 0xDDE8 }, { 0x60B3, 0xD3ED }, { 0x60B4, 0xF5FC }, { 0x60B6, 0xDABF }, { 0x60B8, 0xCCFB }, { 0x60BC, 0xD3FA },
+	{ 0x60BD, 0xF4A4 }, { 0x60C5, 0xEFD7 }, { 0x60C7, 0xD4C3 }, { 0x60D1, 0xFBE3 }, { 0x60DA, 0xFBED }, { 0x60DC, 0xE0AD }, { 0x60DF, 0xEAEE }, { 0x60E0, 0xFBB3 },
+	{ 0x60E1, 0xE4C2 }, { 0x60F0, 0xF6E7 }, { 0x60F1, 0xD2DD }, { 0x60F3, 0xDFCC }, { 0x60F6, 0xFCC9 }, { 0x60F9, 0xE5A9 }, { 0x60FA, 0xE0F6 }, { 0x60FB, 0xF6B3 },
+	{ 0x6101, 0xE1FE }, { 0x6106, 0xCBF0 }, { 0x6108, 0xEAEF }, { 0x6109, 0xEAF0 }, { 0x610D, 0xDAC0 }, { 0x610E, 0xF8B4 }, { 0x610F, 0xEBF2 }, { 0x6115, 0xE4C3 },
+	{ 0x611A, 0xE9D7 }, { 0x611B, 0xE4F1 }, { 0x611F, 0xCAEF }, { 0x6127, 0xCED7 }, { 0x6130, 0xFCCA }, { 0x6134, 0xF3E1 }, { 0x6137, 0xCBC4 }, { 0x613C, 0xE3E5 },
+	{ 0x613E, 0xCBC5 }, { 0x613F, 0xEAB4 }, { 0x6142, 0xE9BD }, { 0x6144, 0xD7C9 }, { 0x6147, 0xEBDB }, { 0x6148, 0xEDB1 }, { 0x614A, 0xCCC3 }, { 0x614B, 0xF7BE },
+	{ 0x614C, 0xFCCB }, { 0x6153, 0xF8F4 }, { 0x6155, 0xD9B7 }, { 0x6158, 0xF3D3 }, { 0x6159, 0xF3D4 }, { 0x615D, 0xF7E4 }, { 0x615F, 0xF7D1 }, { 0x6162, 0xD8B7 },
+	{ 0x6163, 0xCEB1 }, { 0x6164, 0xCAC2 }, { 0x6167, 0xFBB4 }, { 0x6168, 0xCBC6 }, { 0x616B, 0xF0F6 }, { 0x616E, 0xD5E7 }, { 0x6170, 0xEAD0 }, { 0x6176, 0xCCD4 },
+	{ 0x6177, 0xCBAF }, { 0x617D, 0xF4AA }, { 0x617E, 0xE9AF }, { 0x6181, 0xF5C3 }, { 0x6182, 0xE9D8 }, { 0x618A, 0xDDE9 }, { 0x618E, 0xF1F3 }, { 0x6190, 0xD5FB },
+	{ 0x6191, 0xDEBB }, { 0x6194, 0xF4FB }, { 0x6198, 0xFDF3 }, { 0x6199, 0xFDF2 }, { 0x619A, 0xF7A6 }, { 0x61A4, 0xDDC9 }, { 0x61A7, 0xD4D3 }, { 0x61A9, 0xCCA8 },
+	{ 0x61AB, 0xDAC1 }, { 0x61AC, 0xCCD5 }, { 0x61AE, 0xD9E4 }, { 0x61B2, 0xFACA }, { 0x61B6, 0xE5E3 }, { 0x61BA, 0xD3BC }, { 0x61BE, 0xCAF0 }, { 0x61C3, 0xD0C4 },
+	{ 0x61C7, 0xCAD0 }, { 0x61C8, 0xFAAB }, { 0x61C9, 0xEBEB }, { 0x61CA, 0xE7F8 }, { 0x61CB, 0xD9E5 }, { 0x61E6, 0xD1D7 }, { 0x61F2, 0xF3A4 }, { 0x61F6, 0xD4FB },
+	{ 0x61F7, 0xFCE3 }, { 0x61F8, 0xFAD8 }, { 0x61FA, 0xF3D5 }, { 0x61FC, 0xCFAB }, { 0x61FF, 0xEBF3 }, { 0x6200, 0xD5FC }, { 0x6207, 0xD3D4 }, { 0x6208, 0xCDFC },
+	{ 0x620A, 0xD9E6 }, { 0x620C, 0xE2F9 }, { 0x620D, 0xE2A1 }, { 0x620E, 0xEBD4 }, { 0x6210, 0xE0F7 }, { 0x6211, 0xE4B2 }, { 0x6212, 0xCCFC }, { 0x6216, 0xFBE4 },
+	{ 0x621A, 0xF4AB }, { 0x621F, 0xD0BD }, { 0x6221, 0xCAF1 }, { 0x622A, 0xEFB8 }, { 0x622E, 0xD7C0 }, { 0x6230, 0xEEFA }, { 0x6231, 0xFDF4 }, { 0x6234, 0xD3E3 },
+	{ 0x6236, 0xFBC2 }, { 0x623E, 0xD5E8 }, { 0x623F, 0xDBAE }, { 0x6240, 0xE1B6 }, { 0x6241, 0xF8B7 }, { 0x6247, 0xE0BF }, { 0x6248, 0xFBC3 }, { 0x6249, 0xDDEA },
+	{ 0x624B, 0xE2A2 }, { 0x624D, 0xEEA6 }, { 0x6253, 0xF6E8 }, { 0x6258, 0xF6F5 }, { 0x626E, 0xDDCA }, { 0x6271, 0xD0E2 }, { 0x6276, 0xDDA6 }, { 0x6279, 0xDDEB },
+	{ 0x627C, 0xE4F9 }, { 0x627F, 0xE3AF }, { 0x6280, 0xD0FC }, { 0x6284, 0xF4FC }, { 0x6289, 0xCCBC }, { 0x628A, 0xF7EA }, { 0x6291, 0xE5E4 }, { 0x6292, 0xDFF1 },
+	{ 0x6295, 0xF7E1 }, { 0x6297, 0xF9F7 }, { 0x6298, 0xEFB9 }, { 0x629B, 0xF8D8 }, { 0x62AB, 0xF9A9 }, { 0x62B1, 0xF8D9 }, { 0x62B5, 0xEEBD }, { 0x62B9, 0xD8C6 },
+	{ 0x62BC, 0xE4E3 }, { 0x62BD, 0xF5CE }, { 0x62C2, 0xDDD9 }, { 0x62C7, 0xD9E7 }, { 0x62C8, 0xD2B9 }, { 0x62C9, 0xD5C3 }, { 0x62CC, 0xDAE5 }, { 0x62CD, 0xDAD0 },
+	{ 0x62CF, 0xD1D9 }, { 0x62D0, 0xCED8 }, { 0x62D2, 0xCBDE }, { 0x62D3, 0xF4AC }, { 0x62D4, 0xDAFB }, { 0x62D6, 0xF6E9 }, { 0x62D7, 0xE8F3 }, { 0x62D8, 0xCFAC },
+	{ 0x62D9, 0xF0F0 }, { 0x62DB, 0xF4FD }, { 0x62DC, 0xDBC8 }, { 0x62EC, 0xCEC0 }, { 0x62ED, 0xE3D4 }, { 0x62EE, 0xD1CF }, { 0x62EF, 0xF1F5 }, { 0x62F1, 0xCDF2 },
+	{ 0x62F3, 0xCFEB }, { 0x62F7, 0xCDB8 }, { 0x62FE, 0xE3A6 }, { 0x62FF, 0xD1DA }, { 0x6301, 0xF2A5 }, { 0x6307, 0xF2A6 }, { 0x6309, 0xE4CE }, { 0x6311, 0xD3FB },
+	{ 0x632B, 0xF1A9 }, { 0x632F, 0xF2C9 }, { 0x633A, 0xEFD8 }, { 0x633B, 0xE6C9 }, { 0x633D, 0xD8B8 }, { 0x633E, 0xFAF3 }, { 0x6349, 0xF3B5 }, { 0x634C, 0xF8A4 },
+	{ 0x634F, 0xD1F3 }, { 0x6350, 0xE6C8 }, { 0x6355, 0xF8DA }, { 0x6367, 0xDCE9 }, { 0x6368, 0xDED7 }, { 0x636E, 0xCBDF }, { 0x6372, 0xCFEC }, { 0x6377, 0xF4DF },
+	{ 0x637A, 0xD1F4 }, { 0x637B, 0xD2BA }, { 0x637F, 0xDFF2 }, { 0x6383, 0xE1B7 }, { 0x6388, 0xE2A3 }, { 0x6389, 0xD3FC }, { 0x638C, 0xEDE6 }, { 0x6392, 0xDBC9 },
+	{ 0x6396, 0xE4FA }, { 0x6398, 0xCFDE }, { 0x639B, 0xCED0 }, { 0x63A0, 0xD5D3 }, { 0x63A1, 0xF3F5 }, { 0x63A2, 0xF7AE }, { 0x63A5, 0xEFC8 }, { 0x63A7, 0xCDF3 },
+	{ 0x63A8, 0xF5CF }, { 0x63A9, 0xE5F3 }, { 0x63AA, 0xF0C2 }, { 0x63C0, 0xCAD1 }, { 0x63C4, 0xEAF1 }, { 0x63C6, 0xD0A6 }, { 0x63CF, 0xD9DA }, { 0x63D0, 0xF0AB },
+	{ 0x63D6, 0xEBE7 }, { 0x63DA, 0xE5C0 }, { 0x63DB, 0xFCB5 }, { 0x63E1, 0xE4C4 }, { 0x63ED, 0xCCA9 }, { 0x63EE, 0xFDC6 }, { 0x63F4, 0xEAB5 }, { 0x63F6, 0xE5AA },
+	{ 0x63F7, 0xDFBA }, { 0x640D, 0xE1DF }, { 0x640F, 0xDAD1 }, { 0x6414, 0xE1B8 }, { 0x6416, 0xE8F4 }, { 0x6417, 0xD3FD }, { 0x641C, 0xE2A4 }, { 0x6422, 0xF2CA },
+	{ 0x642C, 0xDAE6 }, { 0x642D, 0xF7B3 }, { 0x643A, 0xFDCD }, { 0x643E, 0xF3B6 }, { 0x6458, 0xEED7 }, { 0x6460, 0xF5C4 }, { 0x6469, 0xD8A4 }, { 0x646F, 0xF2A7 },
+	{ 0x6478, 0xD9B8 }, { 0x6479, 0xD9B9 }, { 0x647A, 0xEFC9 }, { 0x6488, 0xD6CE }, { 0x6491, 0xF7CB }, { 0x6492, 0xDFAE }, { 0x6493, 0xE8F5 }, { 0x649A, 0xD2B5 },
+	{ 0x649E, 0xD3D5 }, { 0x64A4, 0xF4CC }, { 0x64A5, 0xDAFC }, { 0x64AB, 0xD9E8 }, { 0x64AD, 0xF7EB }, { 0x64AE, 0xF5C9 }, { 0x64B0, 0xF3BC }, { 0x64B2, 0xDAD2 },
+	{ 0x64BB, 0xD3B5 }, { 0x64C1, 0xE8B6 }, { 0x64C4, 0xD6CF }, { 0x64C5, 0xF4BA }, { 0x64C7, 0xF7C9 }, { 0x64CA, 0xCCAA }, { 0x64CD, 0xF0C3 }, { 0x64CE, 0xCCD6 },
+	{ 0x64D2, 0xD0D3 }, { 0x64D4, 0xD3BD }, { 0x64D8, 0xDBFB }, { 0x64DA, 0xCBE0 }, { 0x64E1, 0xD3E4 }, { 0x64E2, 0xF6F7 }, { 0x64E5, 0xD5BA }, { 0x64E6, 0xF3CD },
+	{ 0x64E7, 0xCBE1 }, { 0x64EC, 0xEBF4 }, { 0x64F2, 0xF4AD }, { 0x64F4, 0xFCAA }, { 0x64FA, 0xF7EC }, { 0x64FE, 0xE8F6 }, { 0x6500, 0xDAE7 }, { 0x6504, 0xF7CC },
+	{ 0x6518, 0xE5C1 }, { 0x651D, 0xE0EE }, { 0x6523, 0xD5FD }, { 0x652A, 0xCEE6 }, { 0x652B, 0xFCAB }, { 0x652C, 0xD5BB }, { 0x652F, 0xF2A8 }, { 0x6536, 0xE2A5 },
+	{ 0x6537, 0xCDB9 }, { 0x6538, 0xEAF2 }, { 0x6539, 0xCBC7 }, { 0x653B, 0xCDF4 }, { 0x653E, 0xDBAF }, { 0x653F, 0xEFD9 }, { 0x6545, 0xCDBA }, { 0x6548, 0xFCF9 },
+	{ 0x654D, 0xDFF3 }, { 0x654E, 0xCEE7 }, { 0x654F, 0xDAC2 }, { 0x6551, 0xCFAD }, { 0x6556, 0xE7F9 }, { 0x6557, 0xF8A8 }, { 0x655E, 0xF3E2 }, { 0x6562, 0xCAF2 },
+	{ 0x6563, 0xDFA4 }, { 0x6566, 0xD4C4 }, { 0x656C, 0xCCD7 }, { 0x656D, 0xE5C2 }, { 0x6572, 0xCDBB }, { 0x6574, 0xEFDA }, { 0x6575, 0xEED8 }, { 0x6577, 0xDDA7 },
+	{ 0x6578, 0xE2A6 }, { 0x657E, 0xE0C0 }, { 0x6582, 0xD6B0 }, { 0x6583, 0xF8CA }, { 0x6585, 0xFCFA }, { 0x6587, 0xD9FE }, { 0x658C, 0xDEB0 }, { 0x6590, 0xDDEC },
+	{ 0x6591, 0xDAE8 }, { 0x6597, 0xD4E0 }, { 0x6599, 0xD6F9 }, { 0x659B, 0xCDD7 }, { 0x659C, 0xDED8 }, { 0x659F, 0xF2F8 }, { 0x65A1, 0xE4D6 }, { 0x65A4, 0xD0C5 },
+	{ 0x65A5, 0xF4AE }, { 0x65A7, 0xDDA8 }, { 0x65AB, 0xEDC5 }, { 0x65AC, 0xF3D6 }, { 0x65AF, 0xDED9 }, { 0x65B0, 0xE3E6 }, { 0x65B7, 0xD3A8 }, { 0x65B9, 0xDBB0 },
+	{ 0x65BC, 0xE5DA }, { 0x65BD, 0xE3BF }, { 0x65C1, 0xDBB1 }, { 0x65C5, 0xD5E9 }, { 0x65CB, 0xE0C1 }, { 0x65CC, 0xEFDB }, { 0x65CF, 0xF0E9 }, { 0x65D2, 0xD7B2 },
+	{ 0x65D7, 0xD0FD }, { 0x65E0, 0xD9E9 }, { 0x65E3, 0xD0FE }, { 0x65E5, 0xECED }, { 0x65E6, 0xD3A9 }, { 0x65E8, 0xF2A9 }, { 0x65E9, 0xF0C4 }, { 0x65EC, 0xE2E2 },
+	{ 0x65ED, 0xE9EF }, { 0x65F1, 0xF9D1 }, { 0x65F4, 0xE9D9 }, { 0x65FA, 0xE8DA }, { 0x65FB, 0xDAC3 }, { 0x65FC, 0xDAC4 }, { 0x65FD, 0xD4C5 }, { 0x65FF, 0xE7FA },
+	{ 0x6606, 0xCDE0 }, { 0x6607, 0xE3B0 }, { 0x6609, 0xDBB2 }, { 0x660A, 0xFBC4 }, { 0x660C, 0xF3E3 }, { 0x660E, 0xD9A5 }, { 0x660F, 0xFBE7 }, { 0x6610, 0xDDCB },
+	{ 0x6611, 0xD0D4 }, { 0x6613, 0xE6B6 }, { 0x6614, 0xE0AE }, { 0x6615, 0xFDDA }, { 0x661E, 0xDCB5 }, { 0x661F, 0xE0F8 }, { 0x6620, 0xE7B1 }, { 0x6625, 0xF5F0 },
+	{ 0x6627, 0xD8DC }, { 0x6628, 0xEDC6 }, { 0x662D, 0xE1B9 }, { 0x662F, 0xE3C0 }, { 0x6630, 0xF9C0 }, { 0x6631, 0xE9F0 }, { 0x6634, 0xD9DB }, { 0x6636, 0xF3E4 },
+	{ 0x663A, 0xDCB6 }, { 0x663B, 0xE4E9 }, { 0x6641, 0xF0C5 }, { 0x6642, 0xE3C1 }, { 0x6643, 0xFCCC }, { 0x6644, 0xFCCD }, { 0x6649, 0xF2CB }, { 0x664B, 0xF2CC },
+	{ 0x664F, 0xE4CF }, { 0x6659, 0xF1DB }, { 0x665B, 0xFAD9 }, { 0x665D, 0xF1B8 }, { 0x665E, 0xFDF5 }, { 0x665F, 0xE0F9 }, { 0x6664, 0xE7FB }, { 0x6665, 0xFCB7 },
+	{ 0x6666, 0xFCE4 }, { 0x6667, 0xFBC5 }, { 0x6668, 0xE3E7 }, { 0x6669, 0xD8B9 }, { 0x666B, 0xF6F8 }, { 0x666E, 0xDCC5 }, { 0x666F, 0xCCD8 }, { 0x6673, 0xE0AF },
+	{ 0x6674, 0xF4E7 }, { 0x6676, 0xEFDC }, { 0x6677, 0xCFFC }, { 0x6678, 0xEFDD }, { 0x667A, 0xF2AA }, { 0x6684, 0xFDBE }, { 0x6687, 0xCAAC }, { 0x6688, 0xFDBB },
+	{ 0x6689, 0xFDC7 }, { 0x668E, 0xE7B2 }, { 0x6690, 0xEAD1 }, { 0x6691, 0xDFF4 }, { 0x6696, 0xD1EC }, { 0x6697, 0xE4DE }, { 0x6698, 0xE5C3 }, { 0x669D, 0xD9A6 },
+	{ 0x66A0, 0xCDBC }, { 0x66A2, 0xF3E5 }, { 0x66AB, 0xEDD5 }, { 0x66AE, 0xD9BA }, { 0x66B2, 0xEDE7 }, { 0x66B3, 0xFBB5 }, { 0x66B4, 0xF8EC }, { 0x66B9, 0xE0E7 },
+	{ 0x66BB, 0xCCD9 }, { 0x66BE, 0xD4C6 }, { 0x66C4, 0xE7A5 }, { 0x66C6, 0xD5F5 }, { 0x66C7, 0xD3BE }, { 0x66C9, 0xFCFB }, { 0x66D6, 0xE4F2 }, { 0x66D9, 0xDFF5 },
+	{ 0x66DC, 0xE8F8 }, { 0x66DD, 0xF8ED }, { 0x66E0, 0xCEC7 }, { 0x66E6, 0xFDF6 }, { 0x66F0, 0xE8D8 }, { 0x66F2, 0xCDD8 }, { 0x66F3, 0xE7D6 }, { 0x66F4, 0xCCDA },
+	{ 0x66F7, 0xCAE3 }, { 0x66F8, 0xDFF6 }, { 0x66F9, 0xF0C7 }, { 0x66FA, 0xF0C6 }, { 0x66FC, 0xD8BA }, { 0x66FE, 0xF1F4 }, { 0x66FF, 0xF4F0 }, { 0x6700, 0xF5CC },
+	{ 0x6703, 0xFCE5 }, { 0x6708, 0xEAC5 }, { 0x6709, 0xEAF3 }, { 0x670B, 0xDDDB }, { 0x670D, 0xDCD7 }, { 0x6714, 0xDEFD }, { 0x6715, 0xF2F9 }, { 0x6717, 0xD5C7 },
+	{ 0x671B, 0xD8D0 }, { 0x671D, 0xF0C8 }, { 0x671E, 0xD1A1 }, { 0x671F, 0xD1A2 }, { 0x6726, 0xD9D4 }, { 0x6727, 0xD6E8 }, { 0x6728, 0xD9CA }, { 0x672A, 0xDAB1 },
+	{ 0x672B, 0xD8C7 }, { 0x672C, 0xDCE2 }, { 0x672D, 0xF3CE }, { 0x672E, 0xF5F4 }, { 0x6731, 0xF1B9 }, { 0x6734, 0xDAD3 }, { 0x6736, 0xF6EA }, { 0x673A, 0xCFF5 },
+	{ 0x673D, 0xFDAE }, { 0x6746, 0xCAD2 }, { 0x6749, 0xDFB4 }, { 0x674E, 0xD7DD }, { 0x674F, 0xFABA }, { 0x6750, 0xEEA7 }, { 0x6751, 0xF5BD }, { 0x6753, 0xF8F5 },
+	{ 0x6756, 0xEDE8 }, { 0x675C, 0xD4E1 }, { 0x675E, 0xD1A3 }, { 0x675F, 0xE1D6 }, { 0x676D, 0xF9F8 }, { 0x676F, 0xDBCA }, { 0x6770, 0xCBF9 }, { 0x6771, 0xD4D4 },
+	{ 0x6773, 0xD9DC }, { 0x6775, 0xEEBE }, { 0x6777, 0xF7ED }, { 0x677B, 0xD2EE }, { 0x677E, 0xE1E6 }, { 0x677F, 0xF7F9 }, { 0x6787, 0xDDED }, { 0x6789, 0xE8DB },
+	{ 0x678B, 0xDBB3 }, { 0x678F, 0xD1F7 }, { 0x6790, 0xE0B0 }, { 0x6793, 0xD4E2 }, { 0x6795, 0xF6D7 }, { 0x6797, 0xD7F9 }, { 0x679A, 0xD8DD }, { 0x679C, 0xCDFD },
+	{ 0x679D, 0xF2AB }, { 0x67AF, 0xCDBD }, { 0x67B0, 0xF8C2 }, { 0x67B3, 0xF2AC }, { 0x67B6, 0xCAAD }, { 0x67B7, 0xCAAE }, { 0x67B8, 0xCFAE }, { 0x67BE, 0xE3C2 },
+	{ 0x67C4, 0xDCB7 }, { 0x67CF, 0xDBDA }, { 0x67D0, 0xD9BB }, { 0x67D1, 0xCAF3 }, { 0x67D2, 0xF6D3 }, { 0x67D3, 0xE6F8 }, { 0x67D4, 0xEAF5 }, { 0x67DA, 0xEAF6 },
+	{ 0x67DD, 0xF6F9 }, { 0x67E9, 0xCFAF }, { 0x67EC, 0xCAD3 }, { 0x67EF, 0xCAAF }, { 0x67F0, 0xD2B0 }, { 0x67F1, 0xF1BA }, { 0x67F3, 0xD7B3 }, { 0x67F4, 0xE3C3 },
+	{ 0x67F5, 0xF3FD }, { 0x67F6, 0xDEDA }, { 0x67FB, 0xDEDB }, { 0x67FE, 0xEFDE }, { 0x6812, 0xE2E3 }, { 0x6813, 0xEEFB }, { 0x6816, 0xDFF7 }, { 0x6817, 0xD7CA },
+	{ 0x6821, 0xCEE8 }, { 0x6822, 0xDBDB }, { 0x682A, 0xF1BB }, { 0x682F, 0xE9F1 }, { 0x6838, 0xFAB7 }, { 0x6839, 0xD0C6 }, { 0x683C, 0xCCAB }, { 0x683D, 0xEEA8 },
+	{ 0x6840, 0xCBFA }, { 0x6841, 0xF9F9 }, { 0x6842, 0xCCFD }, { 0x6843, 0xD3FE }, { 0x6848, 0xE4D0 }, { 0x684E, 0xF2EE }, { 0x6850, 0xD4D5 }, { 0x6851, 0xDFCD },
+	{ 0x6853, 0xFCB8 }, { 0x6854, 0xD1D0 }, { 0x686D, 0xF2CD }, { 0x6876, 0xF7D2 }, { 0x687F, 0xCAD4 }, { 0x6881, 0xD5D9 }, { 0x6885, 0xD8DE }, { 0x688F, 0xCDD9 },
+	{ 0x6893, 0xEEA9 }, { 0x6894, 0xF6BC }, { 0x6897, 0xCCDB }, { 0x689D, 0xF0C9 }, { 0x689F, 0xFCFC }, { 0x68A1, 0xE8C9 }, { 0x68A2, 0xF4FE }, { 0x68A7, 0xE7FC },
+	{ 0x68A8, 0xD7DE }, { 0x68AD, 0xDEDC }, { 0x68AF, 0xF0AC }, { 0x68B0, 0xCCFE }, { 0x68B1, 0xCDE1 }, { 0x68B3, 0xE1BA }, { 0x68B5, 0xDBEF }, { 0x68B6, 0xDAB2 },
+	{ 0x68C4, 0xD1A5 }, { 0x68C5, 0xDCB8 }, { 0x68C9, 0xD8F6 }, { 0x68CB, 0xD1A4 }, { 0x68CD, 0xCDE2 }, { 0x68D2, 0xDCEA }, { 0x68D5, 0xF0F7 }, { 0x68D7, 0xF0CA },
+	{ 0x68D8, 0xD0BE }, { 0x68DA, 0xDDDC }, { 0x68DF, 0xD4D6 }, { 0x68E0, 0xD3D6 }, { 0x68E7, 0xEDD0 }, { 0x68E8, 0xCDA1 }, { 0x68EE, 0xDFB5 }, { 0x68F2, 0xDFF8 },
+	{ 0x68F9, 0xD4A1 }, { 0x68FA, 0xCEB2 }, { 0x6900, 0xE8CA }, { 0x6905, 0xEBF5 }, { 0x690D, 0xE3D5 }, { 0x690E, 0xF5D0 }, { 0x6912, 0xF5A1 }, { 0x6927, 0xD9A7 },
+	{ 0x6930, 0xE5AB }, { 0x693D, 0xE6CB }, { 0x693F, 0xF5F1 }, { 0x694A, 0xE5C5 }, { 0x6953, 0xF9A3 }, { 0x6954, 0xE0DB }, { 0x6955, 0xF6EB }, { 0x6957, 0xCBF1 },
+	{ 0x6959, 0xD9EA }, { 0x695A, 0xF5A2 }, { 0x695E, 0xD7D1 }, { 0x6960, 0xD1F8 }, { 0x6961, 0xEAF8 }, { 0x6962, 0xEAF9 }, { 0x6963, 0xDAB3 }, { 0x6968, 0xEFDF },
+	{ 0x696B, 0xF1EF }, { 0x696D, 0xE5F6 }, { 0x696E, 0xEEBF }, { 0x696F, 0xE2E4 }, { 0x6975, 0xD0BF }, { 0x6977, 0xFAAC }, { 0x6978, 0xF5D1 }, { 0x6979, 0xE7B3 },
+	{ 0x6995, 0xE9BE }, { 0x699B, 0xF2CE }, { 0x699C, 0xDBB4 }, { 0x69A5, 0xFCCE }, { 0x69A7, 0xDDEE }, { 0x69AE, 0xE7B4 }, { 0x69B4, 0xD7B4 }, { 0x69BB, 0xF7B4 },
+	{ 0x69C1, 0xCDBE }, { 0x69C3, 0xDAE9 }, { 0x69CB, 0xCFB0 }, { 0x69CC, 0xF7D9 }, { 0x69CD, 0xF3E6 }, { 0x69D0, 0xCED9 }, { 0x69E8, 0xCEAA }, { 0x69EA, 0xCBC8 },
+	{ 0x69FB, 0xD0A7 }, { 0x69FD, 0xF0CB }, { 0x69FF, 0xD0C7 }, { 0x6A02, 0xE4C5 }, { 0x6A0A, 0xDBE0 }, { 0x6A11, 0xD5DA }, { 0x6A13, 0xD7A7 }, { 0x6A17, 0xEEC0 },
+	{ 0x6A19, 0xF8F6 }, { 0x6A1E, 0xF5D2 }, { 0x6A1F, 0xEDE9 }, { 0x6A21, 0xD9BC }, { 0x6A23, 0xE5C6 }, { 0x6A35, 0xF5A3 }, { 0x6A38, 0xDAD4 }, { 0x6A39, 0xE2A7 },
+	{ 0x6A3A, 0xFBFC }, { 0x6A3D, 0xF1DC }, { 0x6A44, 0xCAF4 }, { 0x6A48, 0xE8FA }, { 0x6A4B, 0xCEE9 }, { 0x6A52, 0xE9F8 }, { 0x6A53, 0xE2E5 }, { 0x6A58, 0xD0B9 },
+	{ 0x6A59, 0xD4F2 }, { 0x6A5F, 0xD1A6 }, { 0x6A61, 0xDFCE }, { 0x6A6B, 0xFCF4 }, { 0x6A80, 0xD3AA }, { 0x6A84, 0xCCAC }, { 0x6A89, 0xEFE0 }, { 0x6A8D, 0xE5E5 },
+	{ 0x6A8E, 0xD0D5 }, { 0x6A97, 0xDBFC }, { 0x6A9C, 0xFCE6 }, { 0x6AA2, 0xCBFE }, { 0x6AA3, 0xEDEA }, { 0x6AB3, 0xDEB1 }, { 0x6ABB, 0xF9E3 }, { 0x6AC2, 0xD4A2 },
+	{ 0x6AC3, 0xCFF6 }, { 0x6AD3, 0xD6D0 }, { 0x6ADA, 0xD5EA }, { 0x6ADB, 0xF1EE }, { 0x6AF6, 0xFACB }, { 0x6AFB, 0xE5A1 }, { 0x6B04, 0xD5B1 }, { 0x6B0A, 0xCFED },
+	{ 0x6B0C, 0xEDEB }, { 0x6B12, 0xD5B2 }, { 0x6B16, 0xD5BC }, { 0x6B20, 0xFDE2 }, { 0x6B21, 0xF3AD }, { 0x6B23, 0xFDDB }, { 0x6B32, 0xE9B0 }, { 0x6B3A, 0xD1A7 },
+	{ 0x6B3D, 0xFDE3 }, { 0x6B3E, 0xCEB3 }, { 0x6B46, 0xFDE4 }, { 0x6B47, 0xFACE }, { 0x6B4C, 0xCAB0 }, { 0x6B4E, 0xF7A7 }, { 0x6B50, 0xCFB1 }, { 0x6B5F, 0xE6A2 },
+	{ 0x6B61, 0xFCB6 }, { 0x6B62, 0xF2AD }, { 0x6B63, 0xEFE1 }, { 0x6B64, 0xF3AE }, { 0x6B65, 0xDCC6 }, { 0x6B66, 0xD9EB }, { 0x6B6A, 0xE8E0 }, { 0x6B72, 0xE1A8 },
+	{ 0x6B77, 0xD5F6 }, { 0x6B78, 0xCFFD }, { 0x6B7B, 0xDEDD }, { 0x6B7F, 0xD9D1 }, { 0x6B83, 0xE4EA }, { 0x6B84, 0xF2CF }, { 0x6B86, 0xF7BF }, { 0x6B89, 0xE2E6 },
+	{ 0x6B8A, 0xE2A8 }, { 0x6B96, 0xE3D6 }, { 0x6B98, 0xEDD1 }, { 0x6B9E, 0xE9F9 }, { 0x6BAE, 0xD6B1 }, { 0x6BAF, 0xDEB2 }, { 0x6BB2, 0xE0E8 }, { 0x6BB5, 0xD3AB },
+	{ 0x6BB7, 0xEBDC }, { 0x6BBA, 0xDFAF }, { 0x6BBC, 0xCAC3 }, { 0x6BBF, 0xEEFC }, { 0x6BC1, 0xFDC3 }, { 0x6BC5, 0xEBF6 }, { 0x6BC6, 0xCFB2 }, { 0x6BCB, 0xD9EC },
+	{ 0x6BCD, 0xD9BD }, { 0x6BCF, 0xD8DF }, { 0x6BD2, 0xD4B8 }, { 0x6BD3, 0xEBBE }, { 0x6BD4, 0xDDEF }, { 0x6BD6, 0xDDF0 }, { 0x6BD7, 0xDDF1 }, { 0x6BD8, 0xDDF2 },
+	{ 0x6BDB, 0xD9BE }, { 0x6BEB, 0xFBC6 }, { 0x6BEC, 0xCFB3 }, { 0x6C08, 0xEEFD }, { 0x6C0F, 0xE4AB }, { 0x6C11, 0xDAC5 }, { 0x6C13, 0xD8EC }, { 0x6C23, 0xD1A8 },
+	{ 0x6C34, 0xE2A9 }, { 0x6C37, 0xDEBC }, { 0x6C38, 0xE7B5 }, { 0x6C3E, 0xDBF0 }, { 0x6C40, 0xEFE2 }, { 0x6C41, 0xF1F0 }, { 0x6C42, 0xCFB4 }, { 0x6C4E, 0xDBF1 },
+	{ 0x6C50, 0xE0B1 }, { 0x6C55, 0xDFA5 }, { 0x6C57, 0xF9D2 }, { 0x6C5A, 0xE7FD }, { 0x6C5D, 0xE6A3 }, { 0x6C5E, 0xFBF1 }, { 0x6C5F, 0xCBB0 }, { 0x6C60, 0xF2AE },
+	{ 0x6C68, 0xCDE7 }, { 0x6C6A, 0xE8DC }, { 0x6C6D, 0xE7D7 }, { 0x6C70, 0xF7C0 }, { 0x6C72, 0xD0E3 }, { 0x6C76, 0xDAA1 }, { 0x6C7A, 0xCCBD }, { 0x6C7D, 0xD1A9 },
+	{ 0x6C7E, 0xDDCC }, { 0x6C81, 0xE3FE }, { 0x6C82, 0xD1AA }, { 0x6C83, 0xE8AA }, { 0x6C85, 0xEAB6 }, { 0x6C86, 0xF9FA }, { 0x6C87, 0xE6CC }, { 0x6C88, 0xF6D8 },
+	{ 0x6C8C, 0xD4C7 }, { 0x6C90, 0xD9CB }, { 0x6C92, 0xD9D2 }, { 0x6C93, 0xD3CB }, { 0x6C94, 0xD8F7 }, { 0x6C95, 0xDAA9 }, { 0x6C96, 0xF5F8 }, { 0x6C99, 0xDEDE },
+	{ 0x6C9A, 0xF2AF }, { 0x6C9B, 0xF8A9 }, { 0x6CAB, 0xD8C8 }, { 0x6CAE, 0xEEC1 }, { 0x6CB3, 0xF9C1 }, { 0x6CB8, 0xDDF3 }, { 0x6CB9, 0xEAFA }, { 0x6CBB, 0xF6BD },
+	{ 0x6CBC, 0xE1BB }, { 0x6CBD, 0xCDBF }, { 0x6CBE, 0xF4D4 }, { 0x6CBF, 0xE6CD }, { 0x6CC1, 0xFCCF }, { 0x6CC2, 0xFBA2 }, { 0x6CC4, 0xE0DC }, { 0x6CC9, 0xF4BB },
+	{ 0x6CCA, 0xDAD5 }, { 0x6CCC, 0xF9B2 }, { 0x6CD3, 0xFBF2 }, { 0x6CD5, 0xDBF6 }, { 0x6CD7, 0xDEDF }, { 0x6CDB, 0xDBF2 }, { 0x6CE1, 0xF8DC }, { 0x6CE2, 0xF7EE },
+	{ 0x6CE3, 0xEBE8 }, { 0x6CE5, 0xD2FA }, { 0x6CE8, 0xF1BC }, { 0x6CEB, 0xFADA }, { 0x6CEE, 0xDAEA }, { 0x6CEF, 0xDAC6 }, { 0x6CF0, 0xF7C1 }, { 0x6CF3, 0xE7B6 },
+	{ 0x6D0B, 0xE5C7 }, { 0x6D0C, 0xD6AC }, { 0x6D11, 0xDCC7 }, { 0x6D17, 0xE1A9 }, { 0x6D19, 0xE2AA }, { 0x6D1B, 0xD5A6 }, { 0x6D1E, 0xD4D7 }, { 0x6D25, 0xF2D0 },
+	{ 0x6D27, 0xEAFB }, { 0x6D29, 0xE0DD }, { 0x6D2A, 0xFBF3 }, { 0x6D32, 0xF1BD }, { 0x6D35, 0xE2E7 }, { 0x6D36, 0xFDD7 }, { 0x6D38, 0xCEC8 }, { 0x6D39, 0xEAB7 },
+	{ 0x6D3B, 0xFCC0 }, { 0x6D3D, 0xFDE7 }, { 0x6D3E, 0xF7EF }, { 0x6D41, 0xD7B5 }, { 0x6D59, 0xEFBA }, { 0x6D5A, 0xF1DD }, { 0x6D5C, 0xDEB3 }, { 0x6D63, 0xE8CB },
+	{ 0x6D66, 0xF8DD }, { 0x6D69, 0xFBC7 }, { 0x6D6A, 0xD5C8 }, { 0x6D6C, 0xD7DF }, { 0x6D6E, 0xDDA9 }, { 0x6D74, 0xE9B1 }, { 0x6D77, 0xFAAD }, { 0x6D78, 0xF6D9 },
+	{ 0x6D79, 0xFAF4 }, { 0x6D7F, 0xF8AA }, { 0x6D85, 0xE6EE }, { 0x6D87, 0xCCDC }, { 0x6D88, 0xE1BC }, { 0x6D89, 0xE0EF }, { 0x6D8C, 0xE9BF }, { 0x6D8D, 0xFCFD },
+	{ 0x6D8E, 0xE6CE }, { 0x6D91, 0xE1D7 }, { 0x6D93, 0xE6CF }, { 0x6D95, 0xF4F1 }, { 0x6DAF, 0xE4F3 }, { 0x6DB2, 0xE4FB }, { 0x6DB5, 0xF9E4 }, { 0x6DC0, 0xEFE3 },
+	{ 0x6DC3, 0xCFEE }, { 0x6DC4, 0xF6BE }, { 0x6DC5, 0xE0B2 }, { 0x6DC6, 0xFCFE }, { 0x6DC7, 0xD1AB }, { 0x6DCB, 0xD7FA }, { 0x6DCF, 0xFBC8 }, { 0x6DD1, 0xE2D7 },
+	{ 0x6DD8, 0xD4A3 }, { 0x6DD9, 0xF0F8 }, { 0x6DDA, 0xD7A8 }, { 0x6DDE, 0xE1E7 }, { 0x6DE1, 0xD3BF }, { 0x6DE8, 0xEFE4 }, { 0x6DEA, 0xD7C5 }, { 0x6DEB, 0xEBE2 },
+	{ 0x6DEE, 0xFCE7 }, { 0x6DF1, 0xE4A2 }, { 0x6DF3, 0xE2E8 }, { 0x6DF5, 0xE6D0 }, { 0x6DF7, 0xFBE8 }, { 0x6DF8, 0xF4E8 }, { 0x6DF9, 0xE5F4 }, { 0x6DFA, 0xF4BC },
+	{ 0x6DFB, 0xF4D5 }, { 0x6E17, 0xDFB6 }, { 0x6E19, 0xFCB9 }, { 0x6E1A, 0xEEC2 }, { 0x6E1B, 0xCAF5 }, { 0x6E1F, 0xEFE5 }, { 0x6E20, 0xCBE2 }, { 0x6E21, 0xD4A4 },
+	{ 0x6E23, 0xDEE0 }, { 0x6E24, 0xDAFD }, { 0x6E25, 0xE4C6 }, { 0x6E26, 0xE8BE }, { 0x6E2B, 0xE0DE }, { 0x6E2C, 0xF6B4 }, { 0x6E2D, 0xEAD2 }, { 0x6E2F, 0xF9FB },
+	{ 0x6E32, 0xE0C2 }, { 0x6E34, 0xCAE4 }, { 0x6E36, 0xE7B7 }, { 0x6E38, 0xEAFD }, { 0x6E3A, 0xD9DD }, { 0x6E3C, 0xDAB4 }, { 0x6E3D, 0xEEAA }, { 0x6E3E, 0xFBE9 },
+	{ 0x6E43, 0xDBCB }, { 0x6E44, 0xDAB5 }, { 0x6E4A, 0xF1BE }, { 0x6E4D, 0xD3AC }, { 0x6E56, 0xFBC9 }, { 0x6E58, 0xDFCF }, { 0x6E5B, 0xD3C0 }, { 0x6E5C, 0xE3D7 },
+	{ 0x6E5E, 0xEFE6 }, { 0x6E5F, 0xFCD0 }, { 0x6E67, 0xE9C0 }, { 0x6E6B, 0xF5D3 }, { 0x6E6E, 0xECDC }, { 0x6E6F, 0xF7B7 }, { 0x6E72, 0xEAB8 }, { 0x6E73, 0xD1F9 },
+	{ 0x6E7A, 0xDCC8 }, { 0x6E90, 0xEAB9 }, { 0x6E96, 0xF1DE }, { 0x6E9C, 0xD7B6 }, { 0x6E9D, 0xCFB5 }, { 0x6E9F, 0xD9A8 }, { 0x6EA2, 0xECEE }, { 0x6EA5, 0xDDAA },
+	{ 0x6EAA, 0xCDA2 }, { 0x6EAB, 0xE8AE }, { 0x6EAF, 0xE1BD }, { 0x6EB1, 0xF2D1 }, { 0x6EB6, 0xE9C1 }, { 0x6EBA, 0xD2FC }, { 0x6EC2, 0xDBB5 }, { 0x6EC4, 0xF3E7 },
+	{ 0x6EC5, 0xD8FE }, { 0x6EC9, 0xFCD1 }, { 0x6ECB, 0xEDB2 }, { 0x6ECC, 0xF4AF }, { 0x6ECE, 0xFBA3 }, { 0x6ED1, 0xFCC1 }, { 0x6ED3, 0xEEAB }, { 0x6ED4, 0xD4A5 },
+	{ 0x6EEF, 0xF4F2 }, { 0x6EF4, 0xEED9 }, { 0x6EF8, 0xFBCA }, { 0x6EFE, 0xCDE3 }, { 0x6EFF, 0xD8BB }, { 0x6F01, 0xE5DB }, { 0x6F02, 0xF8F7 }, { 0x6F06, 0xF6D4 },
+	{ 0x6F0F, 0xD7A9 }, { 0x6F11, 0xCBC9 }, { 0x6F14, 0xE6D1 }, { 0x6F15, 0xF0CC }, { 0x6F20, 0xD8AE }, { 0x6F22, 0xF9D3 }, { 0x6F23, 0xD5FE }, { 0x6F2B, 0xD8BC },
+	{ 0x6F2C, 0xF2B0 }, { 0x6F31, 0xE2AB }, { 0x6F32, 0xF3E8 }, { 0x6F38, 0xEFC2 }, { 0x6F3F, 0xEDEC }, { 0x6F41, 0xE7B8 }, { 0x6F51, 0xDAFE }, { 0x6F54, 0xCCBE },
+	{ 0x6F57, 0xF2FC }, { 0x6F58, 0xDAEB }, { 0x6F5A, 0xE2D8 }, { 0x6F5B, 0xEDD6 }, { 0x6F5E, 0xD6D1 }, { 0x6F5F, 0xE0B3 }, { 0x6F62, 0xFCD2 }, { 0x6F64, 0xEBC8 },
+	{ 0x6F6D, 0xD3C1 }, { 0x6F6E, 0xF0CD }, { 0x6F70, 0xCFF7 }, { 0x6F7A, 0xEDD2 }, { 0x6F7C, 0xD4D8 }, { 0x6F7D, 0xDCC9 }, { 0x6F7E, 0xD7F1 }, { 0x6F81, 0xDFBB },
+	{ 0x6F84, 0xF3A5 }, { 0x6F88, 0xF4CD }, { 0x6F8D, 0xF1BF }, { 0x6F8E, 0xF8B1 }, { 0x6F90, 0xE9FA }, { 0x6F94, 0xFBCB }, { 0x6F97, 0xCAD5 }, { 0x6FA3, 0xF9D4 },
+	{ 0x6FA4, 0xF7CA }, { 0x6FA7, 0xD6C8 }, { 0x6FAE, 0xFCE8 }, { 0x6FAF, 0xF3BD }, { 0x6FB1, 0xEEFE }, { 0x6FB3, 0xE7FE }, { 0x6FB9, 0xD3C2 }, { 0x6FBE, 0xD3B6 },
+	{ 0x6FC0, 0xCCAD }, { 0x6FC1, 0xF6FA }, { 0x6FC2, 0xD6B2 }, { 0x6FC3, 0xD2D8 }, { 0x6FCA, 0xE7D8 }, { 0x6FD5, 0xE3A5 }, { 0x6FDA, 0xE7B9 }, { 0x6FDF, 0xF0AD },
+	{ 0x6FE0, 0xFBCC }, { 0x6FE1, 0xEBA1 }, { 0x6FE4, 0xD4A6 }, { 0x6FE9, 0xFBCD }, { 0x6FEB, 0xD5BD }, { 0x6FEC, 0xF1DF }, { 0x6FEF, 0xF6FB }, { 0x6FF1, 0xDEB4 },
+	{ 0x6FFE, 0xD5EB }, { 0x7001, 0xE5C8 }, { 0x7005, 0xFBA4 }, { 0x7006, 0xD4B9 }, { 0x7009, 0xDEE1 }, { 0x700B, 0xE4A3 }, { 0x700F, 0xD7B7 }, { 0x7011, 0xF8EE },
+	{ 0x7015, 0xDEB5 }, { 0x7018, 0xD6D2 }, { 0x701A, 0xF9D5 }, { 0x701B, 0xE7BA }, { 0x701C, 0xEBD5 }, { 0x701D, 0xD5F7 }, { 0x701E, 0xEFE7 }, { 0x701F, 0xE1BE },
+	{ 0x7023, 0xFAAE }, { 0x7027, 0xD6E9 }, { 0x7028, 0xD6EE }, { 0x702F, 0xE7BB }, { 0x7037, 0xECCB }, { 0x703E, 0xD5B3 }, { 0x704C, 0xCEB4 }, { 0x7050, 0xFBA5 },
+	{ 0x7051, 0xE1EE }, { 0x7058, 0xF7A8 }, { 0x705D, 0xFBCE }, { 0x7063, 0xD8BD }, { 0x706B, 0xFBFD }, { 0x7070, 0xFCE9 }, { 0x7078, 0xCFB6 }, { 0x707C, 0xEDC7 },
+	{ 0x707D, 0xEEAC }, { 0x7085, 0xCCDD }, { 0x708A, 0xF6A7 }, { 0x708E, 0xE6FA }, { 0x7092, 0xF5A4 }, { 0x7098, 0xFDDC }, { 0x7099, 0xEDB3 }, { 0x709A, 0xCEC9 },
+	{ 0x70A1, 0xEFE8 }, { 0x70A4, 0xE1BF }, { 0x70AB, 0xFADB }, { 0x70AC, 0xCBE3 }, { 0x70AD, 0xF7A9 }, { 0x70AF, 0xFBA6 }, { 0x70B3, 0xDCB9 }, { 0x70B7, 0xF1C0 },
+	{ 0x70B8, 0xEDC8 }, { 0x70B9, 0xEFC3 }, { 0x70C8, 0xD6AD }, { 0x70CB, 0xFDCE }, { 0x70CF, 0xE8A1 }, { 0x70D8, 0xFBF4 }, { 0x70D9, 0xD5A7 }, { 0x70DD, 0xF1F6 },
+	{ 0x70DF, 0xE6D3 }, { 0x70F1, 0xCCDE }, { 0x70F9, 0xF8B2 }, { 0x70FD, 0xDCEB }, { 0x7104, 0xFDB6 }, { 0x7109, 0xE5EA }, { 0x710C, 0xF1E0 }, { 0x7119, 0xDBCC },
+	{ 0x711A, 0xDDCD }, { 0x711E, 0xD4C8 }, { 0x7121, 0xD9ED }, { 0x7126, 0xF5A5 }, { 0x7130, 0xE6FB }, { 0x7136, 0xE6D4 }, { 0x7147, 0xFDC8 }, { 0x7149, 0xD6A1 },
+	{ 0x714A, 0xFDBF }, { 0x714C, 0xFCD3 }, { 0x714E, 0xEFA1 }, { 0x7150, 0xE7BC }, { 0x7156, 0xD1EE }, { 0x7159, 0xE6D5 }, { 0x715C, 0xE9F2 }, { 0x715E, 0xDFB0 },
+	{ 0x7164, 0xD8E0 }, { 0x7165, 0xFCBA }, { 0x7166, 0xFDAF }, { 0x7167, 0xF0CE }, { 0x7169, 0xDBE1 }, { 0x716C, 0xE5C9 }, { 0x716E, 0xEDB4 }, { 0x717D, 0xE0C3 },
+	{ 0x7184, 0xE3D8 }, { 0x7189, 0xE9FB }, { 0x718A, 0xEAA8 }, { 0x718F, 0xFDB7 }, { 0x7192, 0xFBA7 }, { 0x7194, 0xE9C2 }, { 0x7199, 0xFDF7 }, { 0x719F, 0xE2D9 },
+	{ 0x71A2, 0xDCEC }, { 0x71AC, 0xE8A2 }, { 0x71B1, 0xE6F0 }, { 0x71B9, 0xFDF8 }, { 0x71BA, 0xFDF9 }, { 0x71BE, 0xF6BF }, { 0x71C1, 0xE7A7 }, { 0x71C3, 0xE6D7 },
+	{ 0x71C8, 0xD4F3 }, { 0x71C9, 0xD4C9 }, { 0x71CE, 0xD6FA }, { 0x71D0, 0xD7F2 }, { 0x71D2, 0xE1C0 }, { 0x71D4, 0xDBE2 }, { 0x71D5, 0xE6D8 }, { 0x71DF, 0xE7BD },
+	{ 0x71E5, 0xF0CF }, { 0x71E6, 0xF3BE }, { 0x71E7, 0xE2AC }, { 0x71ED, 0xF5B7 }, { 0x71EE, 0xE0F0 }, { 0x71FB, 0xFDB8 }, { 0x71FC, 0xE3E8 }, { 0x71FE, 0xD4A7 },
+	{ 0x71FF, 0xE8FC }, { 0x7200, 0xFAD2 }, { 0x7206, 0xF8EF }, { 0x7210, 0xD6D3 }, { 0x721B, 0xD5B4 }, { 0x722A, 0xF0D0 }, { 0x722C, 0xF7F0 }, { 0x722D, 0xEEB3 },
+	{ 0x7230, 0xEABA }, { 0x7232, 0xEAD3 }, { 0x7235, 0xEDC9 }, { 0x7236, 0xDDAB }, { 0x723A, 0xE5AC }, { 0x723B, 0xFDA1 }, { 0x723D, 0xDFD0 }, { 0x723E, 0xECB3 },
+	{ 0x7240, 0xDFD1 }, { 0x7246, 0xEDED }, { 0x7247, 0xF8B8 }, { 0x7248, 0xF7FA }, { 0x724C, 0xF8AB }, { 0x7252, 0xF4E0 }, { 0x7258, 0xD4BA }, { 0x7259, 0xE4B3 },
+	{ 0x725B, 0xE9DA }, { 0x725D, 0xDEB6 }, { 0x725F, 0xD9BF }, { 0x7261, 0xD9C0 }, { 0x7262, 0xD6EF }, { 0x7267, 0xD9CC }, { 0x7269, 0xDAAA }, { 0x7272, 0xDFE5 },
+	{ 0x7279, 0xF7E5 }, { 0x727D, 0xCCB2 }, { 0x7280, 0xDFF9 }, { 0x7281, 0xD7E0 }, { 0x72A2, 0xD4BB }, { 0x72A7, 0xFDFA }, { 0x72AC, 0xCCB3 }, { 0x72AF, 0xDBF3 },
+	{ 0x72C0, 0xDFD2 }, { 0x72C2, 0xCECA }, { 0x72C4, 0xEEDA }, { 0x72CE, 0xE4E4 }, { 0x72D0, 0xFBCF }, { 0x72D7, 0xCFB7 }, { 0x72D9, 0xEEC3 }, { 0x72E1, 0xCEEA },
+	{ 0x72E9, 0xE2AD }, { 0x72F8, 0xD7E1 }, { 0x72F9, 0xFAF5 }, { 0x72FC, 0xD5C9 }, { 0x72FD, 0xF8AC }, { 0x730A, 0xE7D9 }, { 0x7316, 0xF3E9 }, { 0x731B, 0xD8ED },
+	{ 0x731C, 0xE3C4 }, { 0x731D, 0xF0F1 }, { 0x7325, 0xE8E5 }, { 0x7329, 0xE0FA }, { 0x732A, 0xEEC4 }, { 0x732B, 0xD9DE }, { 0x7336, 0xEBA2 }, { 0x7337, 0xEBA3 },
+	{ 0x733E, 0xFCC2 }, { 0x733F, 0xEABB }, { 0x7344, 0xE8AB }, { 0x7345, 0xDEE2 }, { 0x7350, 0xEDEF }, { 0x7352, 0xE8A3 }, { 0x7357, 0xCFF1 }, { 0x7368, 0xD4BC },
+	{ 0x736A, 0xFCEA }, { 0x7370, 0xE7BE }, { 0x7372, 0xFCF2 }, { 0x7375, 0xD6B4 }, { 0x7378, 0xE2AE }, { 0x737A, 0xD3B7 }, { 0x737B, 0xFACC }, { 0x7384, 0xFADC },
+	{ 0x7386, 0xEDB5 }, { 0x7387, 0xE1E3 }, { 0x7389, 0xE8AC }, { 0x738B, 0xE8DD }, { 0x738E, 0xEFE9 }, { 0x7394, 0xF4BD }, { 0x7396, 0xCFB8 }, { 0x7397, 0xE9DB },
+	{ 0x7398, 0xD1AC }, { 0x739F, 0xDAC7 }, { 0x73A7, 0xEBC9 }, { 0x73A9, 0xE8CC }, { 0x73AD, 0xDEB7 }, { 0x73B2, 0xD6BC }, { 0x73B3, 0xD3E5 }, { 0x73B9, 0xFADD },
+	{ 0x73C0, 0xDAD6 }, { 0x73C2, 0xCAB1 }, { 0x73C9, 0xDAC8 }, { 0x73CA, 0xDFA6 }, { 0x73CC, 0xF9B3 }, { 0x73CD, 0xF2D2 }, { 0x73CF, 0xCAC4 }, { 0x73D6, 0xCECB },
+	{ 0x73D9, 0xCDF5 }, { 0x73DD, 0xFDB0 }, { 0x73DE, 0xD5A8 }, { 0x73E0, 0xF1C1 }, { 0x73E3, 0xE2E9 }, { 0x73E4, 0xDCCA }, { 0x73E5, 0xECB4 }, { 0x73E6, 0xFAC0 },
+	{ 0x73E9, 0xFBA8 }, { 0x73EA, 0xD0A8 }, { 0x73ED, 0xDAEC }, { 0x73F7, 0xD9EE }, { 0x73F9, 0xE0FB }, { 0x73FD, 0xEFEA }, { 0x73FE, 0xFADE }, { 0x7401, 0xE0C4 },
+	{ 0x7403, 0xCFB9 }, { 0x7405, 0xD5CA }, { 0x7406, 0xD7E2 }, { 0x7407, 0xE2AF }, { 0x7409, 0xD7B8 }, { 0x7413, 0xE8CD }, { 0x741B, 0xF6DA }, { 0x7420, 0xEFA2 },
+	{ 0x7421, 0xE2DA }, { 0x7422, 0xF6FC }, { 0x7425, 0xFBD0 }, { 0x7426, 0xD1AD }, { 0x7428, 0xCDE4 }, { 0x742A, 0xD1AE }, { 0x742B, 0xDCED }, { 0x742C, 0xE8CE },
+	{ 0x742E, 0xF0F9 }, { 0x742F, 0xCEB5 }, { 0x7430, 0xE6FC }, { 0x7433, 0xD7FB }, { 0x7434, 0xD0D6 }, { 0x7435, 0xDDF5 }, { 0x7436, 0xF7F1 }, { 0x7438, 0xF6FD },
+	{ 0x743A, 0xDBF7 }, { 0x743F, 0xFBEA }, { 0x7440, 0xE9DC }, { 0x7441, 0xD9C1 }, { 0x7443, 0xF5F2 }, { 0x7444, 0xE0C5 }, { 0x744B, 0xEAD4 }, { 0x7455, 0xF9C2 },
+	{ 0x7457, 0xEABC }, { 0x7459, 0xD2C5 }, { 0x745A, 0xFBD1 }, { 0x745B, 0xE7C0 }, { 0x745C, 0xEBA5 }, { 0x745E, 0xDFFA }, { 0x745F, 0xE3A2 }, { 0x7460, 0xD7B9 },
+	{ 0x7462, 0xE9C3 }, { 0x7464, 0xE8FD }, { 0x7465, 0xE8AF }, { 0x7468, 0xF2D3 }, { 0x7469, 0xFBA9 }, { 0x746A, 0xD8A5 }, { 0x746F, 0xD5CB }, { 0x747E, 0xD0C8 },
+	{ 0x7482, 0xD1AF }, { 0x7483, 0xD7E3 }, { 0x7487, 0xE0C6 }, { 0x7489, 0xD6A2 }, { 0x748B, 0xEDF0 }, { 0x7498, 0xD7F3 }, { 0x749C, 0xFCD4 }, { 0x749E, 0xDAD7 },
+	{ 0x749F, 0xCCDF }, { 0x74A1, 0xF2D4 }, { 0x74A3, 0xD1B0 }, { 0x74A5, 0xCCE0 }, { 0x74A7, 0xDBFD }, { 0x74A8, 0xF3BF }, { 0x74AA, 0xF0D1 }, { 0x74B0, 0xFCBB },
+	{ 0x74B2, 0xE2B0 }, { 0x74B5, 0xE6A5 }, { 0x74B9, 0xE2DB }, { 0x74BD, 0xDFDE }, { 0x74BF, 0xE0C7 }, { 0x74C6, 0xF2EF }, { 0x74CA, 0xCCE1 }, { 0x74CF, 0xD6EA },
+	{ 0x74D4, 0xE7C2 }, { 0x74D8, 0xCEB6 }, { 0x74DA, 0xF3C0 }, { 0x74DC, 0xCDFE }, { 0x74E0, 0xFBD2 }, { 0x74E2, 0xF8F8 }, { 0x74E3, 0xF7FB }, { 0x74E6, 0xE8BF },
+	{ 0x74EE, 0xE8B7 }, { 0x74F7, 0xEDB6 }, { 0x7501, 0xDCBA }, { 0x7504, 0xCCB4 }, { 0x7511, 0xF1F7 }, { 0x7515, 0xE8B8 }, { 0x7518, 0xCAF6 }, { 0x751A, 0xE4A4 },
+	{ 0x751B, 0xF4D6 }, { 0x751F, 0xDFE6 }, { 0x7523, 0xDFA7 }, { 0x7525, 0xDFE7 }, { 0x7526, 0xE1C1 }, { 0x7528, 0xE9C4 }, { 0x752B, 0xDCCB }, { 0x752C, 0xE9C5 },
+	{ 0x7530, 0xEFA3 }, { 0x7531, 0xEBA6 }, { 0x7532, 0xCBA3 }, { 0x7533, 0xE3E9 }, { 0x7537, 0xD1FB }, { 0x7538, 0xEFA4 }, { 0x753A, 0xEFEB }, { 0x7547, 0xD0B4 },
+	{ 0x754C, 0xCDA3 }, { 0x754F, 0xE8E6 }, { 0x7551, 0xEFA5 }, { 0x7553, 0xD3CC }, { 0x7554, 0xDAED }, { 0x7559, 0xD7BA }, { 0x755B, 0xF2D5 }, { 0x755C, 0xF5E5 },
+	{ 0x755D, 0xD9EF }, { 0x7562, 0xF9B4 }, { 0x7565, 0xD5D4 }, { 0x7566, 0xFDCF }, { 0x756A, 0xDBE3 }, { 0x756F, 0xF1E1 }, { 0x7570, 0xECB6 }, { 0x7575, 0xFBFE },
+	{ 0x7576, 0xD3D7 }, { 0x7578, 0xD1B1 }, { 0x757A, 0xCBB1 }, { 0x757F, 0xD1B2 }, { 0x7586, 0xCBB2 }, { 0x7587, 0xF1C2 }, { 0x758A, 0xF4E1 }, { 0x758B, 0xF9B5 },
+	{ 0x758E, 0xE1C3 }, { 0x758F, 0xE1C2 }, { 0x7591, 0xEBF7 }, { 0x759D, 0xDFA8 }, { 0x75A5, 0xCBCA }, { 0x75AB, 0xE6B9 }, { 0x75B1, 0xF8DE }, { 0x75B2, 0xF9AA },
+	{ 0x75B3, 0xCAF7 }, { 0x75B5, 0xEDB7 }, { 0x75B8, 0xD3B8 }, { 0x75B9, 0xF2D6 }, { 0x75BC, 0xD4D9 }, { 0x75BD, 0xEEC5 }, { 0x75BE, 0xF2F0 }, { 0x75C2, 0xCAB2 },
+	{ 0x75C5, 0xDCBB }, { 0x75C7, 0xF1F8 }, { 0x75CD, 0xECB7 }, { 0x75D2, 0xE5CA }, { 0x75D4, 0xF6C0 }, { 0x75D5, 0xFDDD }, { 0x75D8, 0xD4E3 }, { 0x75D9, 0xCCE2 },
+	{ 0x75DB, 0xF7D4 }, { 0x75E2, 0xD7E5 }, { 0x75F0, 0xD3C3 }, { 0x75F2, 0xD8A6 }, { 0x75F4, 0xF6C1 }, { 0x75FA, 0xDDF6 }, { 0x75FC, 0xCDC0 }, { 0x7600, 0xE5DC },
+	{ 0x760D, 0xE5CB }, { 0x7619, 0xE1C4 }, { 0x761F, 0xE8B0 }, { 0x7620, 0xF4B0 }, { 0x7621, 0xF3EA }, { 0x7622, 0xDAEE }, { 0x7624, 0xD7BB }, { 0x7626, 0xE2B1 },
+	{ 0x763B, 0xD7AA }, { 0x7642, 0xD6FB }, { 0x764C, 0xE4DF }, { 0x764E, 0xCAD6 }, { 0x7652, 0xEBA8 }, { 0x7656, 0xDBFE }, { 0x7661, 0xF6C2 }, { 0x7664, 0xEFBB },
+	{ 0x7669, 0xD4FD }, { 0x766C, 0xE0C8 }, { 0x7670, 0xE8B9 }, { 0x7672, 0xEFA6 }, { 0x7678, 0xCDA4 }, { 0x767B, 0xD4F4 }, { 0x767C, 0xDBA1 }, { 0x767D, 0xDBDC },
+	{ 0x767E, 0xDBDD }, { 0x7684, 0xEEDC }, { 0x7686, 0xCBCB }, { 0x7687, 0xFCD5 }, { 0x768E, 0xCEEB }, { 0x7690, 0xCDC1 }, { 0x7693, 0xFBD3 }, { 0x76AE, 0xF9AB },
+	{ 0x76BA, 0xF5D4 }, { 0x76BF, 0xD9A9 }, { 0x76C2, 0xE9DD }, { 0x76C3, 0xDBCD }, { 0x76C6, 0xDDCE }, { 0x76C8, 0xE7C3 }, { 0x76CA, 0xECCC }, { 0x76D2, 0xF9EC },
+	{ 0x76D6, 0xCBCC }, { 0x76DB, 0xE0FC }, { 0x76DC, 0xD4A8 }, { 0x76DE, 0xEDD3 }, { 0x76DF, 0xD8EF }, { 0x76E1, 0xF2D7 }, { 0x76E3, 0xCAF8 }, { 0x76E4, 0xDAEF },
+	{ 0x76E7, 0xD6D4 }, { 0x76EE, 0xD9CD }, { 0x76F2, 0xD8EE }, { 0x76F4, 0xF2C1 }, { 0x76F8, 0xDFD3 }, { 0x76FC, 0xDAF0 }, { 0x76FE, 0xE2EA }, { 0x7701, 0xE0FD },
+	{ 0x7704, 0xD8F8 }, { 0x7708, 0xF7AF }, { 0x7709, 0xDAB6 }, { 0x770B, 0xCAD7 }, { 0x771E, 0xF2D8 }, { 0x7720, 0xD8F9 }, { 0x7729, 0xFADF }, { 0x7737, 0xCFEF },
+	{ 0x7738, 0xD9C2 }, { 0x773A, 0xF0D2 }, { 0x773C, 0xE4D1 }, { 0x7740, 0xF3B7 }, { 0x774D, 0xFAE0 }, { 0x775B, 0xEFEC }, { 0x7761, 0xE2B2 }, { 0x7763, 0xD4BD },
+	{ 0x7766, 0xD9CE }, { 0x776B, 0xF4E2 }, { 0x7779, 0xD4A9 }, { 0x777E, 0xCDC2 }, { 0x777F, 0xE7DA }, { 0x778B, 0xF2D9 }, { 0x7791, 0xD9AA }, { 0x779E, 0xD8BE },
+	{ 0x77A5, 0xDCAD }, { 0x77AC, 0xE2EB }, { 0x77AD, 0xD6FC }, { 0x77B0, 0xCAF9 }, { 0x77B3, 0xD4DA }, { 0x77BB, 0xF4D7 }, { 0x77BC, 0xCCA1 }, { 0x77BF, 0xCFBA },
+	{ 0x77D7, 0xF5B8 }, { 0x77DB, 0xD9C3 }, { 0x77DC, 0xD0E8 }, { 0x77E2, 0xE3C5 }, { 0x77E3, 0xEBF8 }, { 0x77E5, 0xF2B1 }, { 0x77E9, 0xCFBB }, { 0x77ED, 0xD3AD },
+	{ 0x77EE, 0xE8E1 }, { 0x77EF, 0xCEEC }, { 0x77F3, 0xE0B4 }, { 0x7802, 0xDEE3 }, { 0x7812, 0xDDF7 }, { 0x7825, 0xF2B2 }, { 0x7826, 0xF3F6 }, { 0x7827, 0xF6DB },
+	{ 0x782C, 0xD7FE }, { 0x7832, 0xF8DF }, { 0x7834, 0xF7F2 }, { 0x7845, 0xD0A9 }, { 0x784F, 0xE6DA }, { 0x785D, 0xF5A6 }, { 0x786B, 0xD7BC }, { 0x786C, 0xCCE3 },
+	{ 0x786F, 0xE6DB }, { 0x787C, 0xDDDD }, { 0x7881, 0xD1B3 }, { 0x7887, 0xEFED }, { 0x788C, 0xD6DE }, { 0x788D, 0xE4F4 }, { 0x788E, 0xE1EF }, { 0x7891, 0xDDF8 },
+	{ 0x7897, 0xE8CF }, { 0x78A3, 0xCAE5 }, { 0x78A7, 0xDCA1 }, { 0x78A9, 0xE0B5 }, { 0x78BA, 0xFCAC }, { 0x78BB, 0xFCAD }, { 0x78BC, 0xD8A7 }, { 0x78C1, 0xEDB8 },
+	{ 0x78C5, 0xDBB6 }, { 0x78CA, 0xD6F0 }, { 0x78CB, 0xF3AF }, { 0x78CE, 0xCDA5 }, { 0x78D0, 0xDAF1 }, { 0x78E8, 0xD8A8 }, { 0x78EC, 0xCCE4 }, { 0x78EF, 0xD1B4 },
+	{ 0x78F5, 0xCAD8 }, { 0x78FB, 0xDAF2 }, { 0x7901, 0xF5A7 }, { 0x790E, 0xF5A8 }, { 0x7916, 0xE6A6 }, { 0x792A, 0xD5EC }, { 0x792B, 0xD5F8 }, { 0x792C, 0xDAF3 },
+	{ 0x793A, 0xE3C6 }, { 0x793E, 0xDEE4 }, { 0x7940, 0xDEE5 }, { 0x7941, 0xD1B5 }, { 0x7947, 0xD1B6 }, { 0x7948, 0xD1B7 }, { 0x7949, 0xF2B3 }, { 0x7950, 0xE9DE },
+	{ 0x7956, 0xF0D3 }, { 0x7957, 0xF2B4 }, { 0x795A, 0xF0D4 }, { 0x795B, 0xCBE4 }, { 0x795C, 0xFBD4 }, { 0x795D, 0xF5E6 }, { 0x795E, 0xE3EA }, { 0x7960, 0xDEE6 },
+	{ 0x7965, 0xDFD4 }, { 0x7968, 0xF8F9 }, { 0x796D, 0xF0AE }, { 0x797A, 0xD1B8 }, { 0x797F, 0xD6DF }, { 0x7981, 0xD0D7 }, { 0x798D, 0xFCA1 }, { 0x798E, 0xEFEE },
+	{ 0x798F, 0xDCD8 }, { 0x7991, 0xE9DF }, { 0x79A6, 0xE5DD }, { 0x79A7, 0xFDFB }, { 0x79AA, 0xE0C9 }, { 0x79AE, 0xD6C9 }, { 0x79B1, 0xD4AA }, { 0x79B3, 0xE5CC },
+	{ 0x79B9, 0xE9E0 }, { 0x79BD, 0xD0D8 }, { 0x79BE, 0xFCA2 }, { 0x79BF, 0xD4BE }, { 0x79C0, 0xE2B3 }, { 0x79C1, 0xDEE7 }, { 0x79C9, 0xDCBC }, { 0x79CA, 0xD2B6 },
+	{ 0x79CB, 0xF5D5 }, { 0x79D1, 0xCEA1 }, { 0x79D2, 0xF5A9 }, { 0x79D5, 0xDDF9 }, { 0x79D8, 0xDDFA }, { 0x79DF, 0xF0D5 }, { 0x79E4, 0xF6DF }, { 0x79E6, 0xF2DA },
+	{ 0x79E7, 0xE4EB }, { 0x79E9, 0xF2F1 }, { 0x79FB, 0xECB9 }, { 0x7A00, 0xFDFC }, { 0x7A05, 0xE1AA }, { 0x7A08, 0xCAD9 }, { 0x7A0B, 0xEFEF }, { 0x7A0D, 0xF5AA },
+	{ 0x7A14, 0xECF9 }, { 0x7A17, 0xF8AD }, { 0x7A19, 0xF2C2 }, { 0x7A1A, 0xF6C3 }, { 0x7A1C, 0xD7D2 }, { 0x7A1F, 0xF9A2 }, { 0x7A20, 0xF0D6 }, { 0x7A2E, 0xF0FA },
+	{ 0x7A31, 0xF6E0 }, { 0x7A36, 0xE9F3 }, { 0x7A37, 0xF2C3 }, { 0x7A3B, 0xD4AB }, { 0x7A3C, 0xCAB3 }, { 0x7A3D, 0xCDA6 }, { 0x7A3F, 0xCDC3 }, { 0x7A40, 0xCDDA },
+	{ 0x7A46, 0xD9CF }, { 0x7A49, 0xF6C4 }, { 0x7A4D, 0xEEDD }, { 0x7A4E, 0xE7C4 }, { 0x7A57, 0xE2B4 }, { 0x7A61, 0xDFE2 }, { 0x7A62, 0xE7DB }, { 0x7A69, 0xE8B1 },
+	{ 0x7A6B, 0xFCAE }, { 0x7A70, 0xE5CD }, { 0x7A74, 0xFAEB }, { 0x7A76, 0xCFBC }, { 0x7A79, 0xCFE2 }, { 0x7A7A, 0xCDF6 }, { 0x7A7D, 0xEFF0 }, { 0x7A7F, 0xF4BE },
+	{ 0x7A81, 0xD4CD }, { 0x7A84, 0xF3B8 }, { 0x7A88, 0xE9A1 }, { 0x7A92, 0xF2F2 }, { 0x7A93, 0xF3EB }, { 0x7A95, 0xF0D7 }, { 0x7A98, 0xCFD7 }, { 0x7A9F, 0xCFDF },
+	{ 0x7AA9, 0xE8C0 }, { 0x7AAA, 0xE8C1 }, { 0x7AAE, 0xCFE3 }, { 0x7AAF, 0xE9A2 }, { 0x7ABA, 0xD0AA }, { 0x7AC4, 0xF3C1 }, { 0x7AC5, 0xD0AB }, { 0x7AC7, 0xD4E4 },
+	{ 0x7ACA, 0xEFBC }, { 0x7ACB, 0xD8A1 }, { 0x7AD7, 0xD9DF }, { 0x7AD9, 0xF3D7 }, { 0x7ADD, 0xDCBD }, { 0x7ADF, 0xCCE5 }, { 0x7AE0, 0xEDF1 }, { 0x7AE3, 0xF1E2 },
+	{ 0x7AE5, 0xD4DB }, { 0x7AEA, 0xE2B5 }, { 0x7AED, 0xCAE6 }, { 0x7AEF, 0xD3AE }, { 0x7AF6, 0xCCE6 }, { 0x7AF9, 0xF1D3 }, { 0x7AFA, 0xF5E7 }, { 0x7AFF, 0xCADA },
+	{ 0x7B0F, 0xFBEE }, { 0x7B11, 0xE1C5 }, { 0x7B19, 0xDFE9 }, { 0x7B1B, 0xEEDE }, { 0x7B1E, 0xF7C2 }, { 0x7B20, 0xD8A2 }, { 0x7B26, 0xDDAC }, { 0x7B2C, 0xF0AF },
+	{ 0x7B2D, 0xD6BD }, { 0x7B39, 0xE1AB }, { 0x7B46, 0xF9B6 }, { 0x7B49, 0xD4F5 }, { 0x7B4B, 0xD0C9 }, { 0x7B4C, 0xEFA7 }, { 0x7B4D, 0xE2EC }, { 0x7B4F, 0xDBEA },
+	{ 0x7B50, 0xCECC }, { 0x7B51, 0xF5E8 }, { 0x7B52, 0xF7D5 }, { 0x7B54, 0xD3CD }, { 0x7B56, 0xF3FE }, { 0x7B60, 0xD0B5 }, { 0x7B6C, 0xE0FE }, { 0x7B6E, 0xDFFB },
+	{ 0x7B75, 0xE6DD }, { 0x7B7D, 0xE8A4 }, { 0x7B87, 0xCBCD }, { 0x7B8B, 0xEFA8 }, { 0x7B8F, 0xEEB4 }, { 0x7B94, 0xDAD8 }, { 0x7B95, 0xD1B9 }, { 0x7B97, 0xDFA9 },
+	{ 0x7B9A, 0xF3B0 }, { 0x7B9D, 0xCCC4 }, { 0x7BA1, 0xCEB7 }, { 0x7BAD, 0xEFA9 }, { 0x7BB1, 0xDFD5 }, { 0x7BB4, 0xEDD7 }, { 0x7BB8, 0xEEC6 }, { 0x7BC0, 0xEFBD },
+	{ 0x7BC1, 0xFCD6 }, { 0x7BC4, 0xDBF4 }, { 0x7BC6, 0xEFAA }, { 0x7BC7, 0xF8B9 }, { 0x7BC9, 0xF5E9 }, { 0x7BD2, 0xE3D9 }, { 0x7BE0, 0xE1C6 }, { 0x7BE4, 0xD4BF },
+	{ 0x7BE9, 0xDEE8 }, { 0x7C07, 0xF0EA }, { 0x7C12, 0xF3C2 }, { 0x7C1E, 0xD3AF }, { 0x7C21, 0xCADB }, { 0x7C27, 0xFCD7 }, { 0x7C2A, 0xEDD8 }, { 0x7C2B, 0xE1C7 },
+	{ 0x7C3D, 0xF4D8 }, { 0x7C3E, 0xD6B3 }, { 0x7C3F, 0xDDAD }, { 0x7C43, 0xD5BE }, { 0x7C4C, 0xF1C3 }, { 0x7C4D, 0xEEDF }, { 0x7C60, 0xD6EB }, { 0x7C64, 0xF4D9 },
+	{ 0x7C6C, 0xD7E6 }, { 0x7C73, 0xDAB7 }, { 0x7C83, 0xDDFB }, { 0x7C89, 0xDDCF }, { 0x7C92, 0xD8A3 }, { 0x7C95, 0xDAD9 }, { 0x7C97, 0xF0D8 }, { 0x7C98, 0xEFC4 },
+	{ 0x7C9F, 0xE1D8 }, { 0x7CA5, 0xF1D4 }, { 0x7CA7, 0xEDF2 }, { 0x7CAE, 0xD5DB }, { 0x7CB1, 0xD5DC }, { 0x7CB2, 0xF3C4 }, { 0x7CB3, 0xCBD7 }, { 0x7CB9, 0xE2B6 },
+	{ 0x7CBE, 0xEFF1 }, { 0x7CCA, 0xFBD5 }, { 0x7CD6, 0xD3D8 }, { 0x7CDE, 0xDDD0 }, { 0x7CDF, 0xF0D9 }, { 0x7CE0, 0xCBB3 }, { 0x7CE7, 0xD5DD }, { 0x7CFB, 0xCDA7 },
+	{ 0x7CFE, 0xD0AC }, { 0x7D00, 0xD1BA }, { 0x7D02, 0xF1C4 }, { 0x7D04, 0xE5B3 }, { 0x7D05, 0xFBF5 }, { 0x7D06, 0xE9E1 }, { 0x7D07, 0xFDE0 }, { 0x7D08, 0xFCBC },
+	{ 0x7D0A, 0xDAA2 }, { 0x7D0B, 0xDAA3 }, { 0x7D0D, 0xD2A1 }, { 0x7D10, 0xD2EF }, { 0x7D14, 0xE2ED }, { 0x7D17, 0xDEE9 }, { 0x7D18, 0xCEDC }, { 0x7D19, 0xF2B5 },
+	{ 0x7D1A, 0xD0E4 }, { 0x7D1B, 0xDDD1 }, { 0x7D20, 0xE1C8 }, { 0x7D21, 0xDBB7 }, { 0x7D22, 0xDFE3 }, { 0x7D2B, 0xEDB9 }, { 0x7D2C, 0xF1C5 }, { 0x7D2E, 0xF3CF },
+	{ 0x7D2F, 0xD7AB }, { 0x7D30, 0xE1AC }, { 0x7D33, 0xE3EB }, { 0x7D35, 0xEEC7 }, { 0x7D39, 0xE1C9 }, { 0x7D3A, 0xCAFA }, { 0x7D42, 0xF0FB }, { 0x7D43, 0xFAE1 },
+	{ 0x7D44, 0xF0DA }, { 0x7D45, 0xCCE7 }, { 0x7D46, 0xDAF4 }, { 0x7D50, 0xCCBF }, { 0x7D5E, 0xCEED }, { 0x7D61, 0xD5A9 }, { 0x7D62, 0xFAE2 }, { 0x7D66, 0xD0E5 },
+	{ 0x7D68, 0xEBD6 }, { 0x7D6A, 0xECDF }, { 0x7D6E, 0xDFFC }, { 0x7D71, 0xF7D6 }, { 0x7D72, 0xDEEA }, { 0x7D73, 0xCBB4 }, { 0x7D76, 0xEFBE }, { 0x7D79, 0xCCB5 },
+	{ 0x7D7F, 0xCFBD }, { 0x7D8E, 0xEFF2 }, { 0x7D8F, 0xE2B7 }, { 0x7D93, 0xCCE8 }, { 0x7D9C, 0xF0FC }, { 0x7DA0, 0xD6E0 }, { 0x7DA2, 0xF1C6 }, { 0x7DAC, 0xE2B8 },
+	{ 0x7DAD, 0xEBAB }, { 0x7DB1, 0xCBB5 }, { 0x7DB2, 0xD8D1 }, { 0x7DB4, 0xF4CE }, { 0x7DB5, 0xF3F7 }, { 0x7DB8, 0xD7C6 }, { 0x7DBA, 0xD1BB }, { 0x7DBB, 0xF7AA },
+	{ 0x7DBD, 0xEDCA }, { 0x7DBE, 0xD7D3 }, { 0x7DBF, 0xD8FA }, { 0x7DC7, 0xF6C5 }, { 0x7DCA, 0xD1CC }, { 0x7DCB, 0xDDFC }, { 0x7DD6, 0xDFFD }, { 0x7DD8, 0xF9E5 },
+	{ 0x7DDA, 0xE0CA }, { 0x7DDD, 0xF2FD }, { 0x7DDE, 0xD3B0 }, { 0x7DE0, 0xF4F3 }, { 0x7DE1, 0xDAC9 }, { 0x7DE3, 0xE6DE }, { 0x7DE8, 0xF8BA }, { 0x7DE9, 0xE8D0 },
+	{ 0x7DEC, 0xD8FB }, { 0x7DEF, 0xEAD5 }, { 0x7DF4, 0xD6A3 }, { 0x7DFB, 0xF6C6 }, { 0x7E09, 0xF2DB }, { 0x7E0A, 0xE4FC }, { 0x7E15, 0xE8B2 }, { 0x7E1B, 0xDADA },
+	{ 0x7E1D, 0xF2DC }, { 0x7E1E, 0xFBD6 }, { 0x7E1F, 0xE9B2 }, { 0x7E21, 0xEEAD }, { 0x7E23, 0xFAE3 }, { 0x7E2B, 0xDCEE }, { 0x7E2E, 0xF5EA }, { 0x7E2F, 0xE6E0 },
+	{ 0x7E31, 0xF0FD }, { 0x7E37, 0xD7AC }, { 0x7E3D, 0xF5C5 }, { 0x7E3E, 0xEEE0 }, { 0x7E41, 0xDBE5 }, { 0x7E43, 0xDDDE }, { 0x7E46, 0xD9F0 }, { 0x7E47, 0xE9A3 },
+	{ 0x7E52, 0xF1F9 }, { 0x7E54, 0xF2C4 }, { 0x7E55, 0xE0CB }, { 0x7E5E, 0xE9A4 }, { 0x7E61, 0xE2B9 }, { 0x7E69, 0xE3B1 }, { 0x7E6A, 0xFCEB }, { 0x7E6B, 0xCDA8 },
+	{ 0x7E6D, 0xCCB6 }, { 0x7E70, 0xF0DB }, { 0x7E79, 0xE6BA }, { 0x7E7C, 0xCDA9 }, { 0x7E82, 0xF3C3 }, { 0x7E8C, 0xE1D9 }, { 0x7E8F, 0xEFAB }, { 0x7E93, 0xE7C5 },
+	{ 0x7E96, 0xE0E9 }, { 0x7E98, 0xF3C5 }, { 0x7E9B, 0xD4C0 }, { 0x7E9C, 0xD5BF }, { 0x7F36, 0xDDAE }, { 0x7F38, 0xF9FC }, { 0x7F3A, 0xCCC0 }, { 0x7F4C, 0xE5A2 },
+	{ 0x7F50, 0xCEB8 }, { 0x7F54, 0xD8D2 }, { 0x7F55, 0xF9D6 }, { 0x7F6A, 0xF1AA }, { 0x7F6B, 0xCED1 }, { 0x7F6E, 0xF6C7 }, { 0x7F70, 0xDBEB }, { 0x7F72, 0xDFFE },
+	{ 0x7F75, 0xD8E1 }, { 0x7F77, 0xF7F3 }, { 0x7F79, 0xD7E7 }, { 0x7F85, 0xD4FE }, { 0x7F88, 0xD1BC }, { 0x7F8A, 0xE5CF }, { 0x7F8C, 0xCBB6 }, { 0x7F8E, 0xDAB8 },
+	{ 0x7F94, 0xCDC4 }, { 0x7F9A, 0xD6BE }, { 0x7F9E, 0xE2BA }, { 0x7FA4, 0xCFD8 }, { 0x7FA8, 0xE0CC }, { 0x7FA9, 0xEBF9 }, { 0x7FB2, 0xFDFD }, { 0x7FB8, 0xD7E8 },
+	{ 0x7FB9, 0xCBD8 }, { 0x7FBD, 0xE9E2 }, { 0x7FC1, 0xE8BA }, { 0x7FC5, 0xE3C7 }, { 0x7FCA, 0xECCD }, { 0x7FCC, 0xECCE }, { 0x7FCE, 0xD6BF }, { 0x7FD2, 0xE3A7 },
+	{ 0x7FD4, 0xDFD6 }, { 0x7FD5, 0xFDE8 }, { 0x7FDF, 0xEEE1 }, { 0x7FE0, 0xF6A8 }, { 0x7FE1, 0xDDFD }, { 0x7FE9, 0xF8BB }, { 0x7FEB, 0xE8D1 }, { 0x7FF0, 0xF9D7 },
+	{ 0x7FF9, 0xCEEE }, { 0x7FFC, 0xECCF }, { 0x8000, 0xE9A5 }, { 0x8001, 0xD6D5 }, { 0x8003, 0xCDC5 }, { 0x8005, 0xEDBA }, { 0x8006, 0xD1BD }, { 0x8009, 0xCFBE },
+	{ 0x800C, 0xECBB }, { 0x8010, 0xD2B1 }, { 0x8015, 0xCCE9 }, { 0x8017, 0xD9C4 }, { 0x8018, 0xE9FC }, { 0x802D, 0xD1BE }, { 0x8033, 0xECBC }, { 0x8036, 0xE5AD },
+	{ 0x803D, 0xF7B0 }, { 0x803F, 0xCCEA }, { 0x8043, 0xD3C4 }, { 0x8046, 0xD6C0 }, { 0x804A, 0xD6FD }, { 0x8056, 0xE1A1 }, { 0x8058, 0xDEBD }, { 0x805A, 0xF6A9 },
+	{ 0x805E, 0xDAA4 }, { 0x806F, 0xD6A4 }, { 0x8070, 0xF5C6 }, { 0x8072, 0xE1A2 }, { 0x8073, 0xE9C6 }, { 0x8077, 0xF2C5 }, { 0x807D, 0xF4E9 }, { 0x807E, 0xD6EC },
+	{ 0x807F, 0xEBD3 }, { 0x8084, 0xECBD }, { 0x8085, 0xE2DC }, { 0x8086, 0xDEEB }, { 0x8087, 0xF0DC }, { 0x8089, 0xEBBF }, { 0x808B, 0xD7CE }, { 0x808C, 0xD1BF },
+	{ 0x8096, 0xF5AB }, { 0x809B, 0xF9FD }, { 0x809D, 0xCADC }, { 0x80A1, 0xCDC6 }, { 0x80A2, 0xF2B6 }, { 0x80A5, 0xDDFE }, { 0x80A9, 0xCCB7 }, { 0x80AA, 0xDBB8 },
+	{ 0x80AF, 0xD0E9 }, { 0x80B1, 0xCEDD }, { 0x80B2, 0xEBC0 }, { 0x80B4, 0xFDA2 }, { 0x80BA, 0xF8CB }, { 0x80C3, 0xEAD6 }, { 0x80C4, 0xF1B0 }, { 0x80CC, 0xDBCE },
+	{ 0x80CE, 0xF7C3 }, { 0x80DA, 0xDBCF }, { 0x80DB, 0xCBA4 }, { 0x80DE, 0xF8E0 }, { 0x80E1, 0xFBD7 }, { 0x80E4, 0xEBCA }, { 0x80E5, 0xE0A1 }, { 0x80F1, 0xCECD },
+	{ 0x80F4, 0xD4DC }, { 0x80F8, 0xFDD8 }, { 0x80FD, 0xD2F6 }, { 0x8102, 0xF2B7 }, { 0x8105, 0xFAF6 }, { 0x8106, 0xF6AA }, { 0x8107, 0xFAF7 }, { 0x8108, 0xD8E6 },
+	{ 0x810A, 0xF4B1 }, { 0x8118, 0xE8D2 }, { 0x811A, 0xCAC5 }, { 0x811B, 0xCCEB }, { 0x8123, 0xE2EE }, { 0x8129, 0xE2BB }, { 0x812B, 0xF7AD }, { 0x812F, 0xF8E1 },
+	{ 0x8139, 0xF3EC }, { 0x813E, 0xDEA1 }, { 0x814B, 0xE4FD }, { 0x814E, 0xE3EC }, { 0x8150, 0xDDAF }, { 0x8151, 0xDDB0 }, { 0x8154, 0xCBB7 }, { 0x8155, 0xE8D3 },
+	{ 0x8165, 0xE1A3 }, { 0x8166, 0xD2E0 }, { 0x816B, 0xF0FE }, { 0x8170, 0xE9A6 }, { 0x8171, 0xCBF2 }, { 0x8178, 0xEDF3 }, { 0x8179, 0xDCD9 }, { 0x817A, 0xE0CD },
+	{ 0x817F, 0xF7DA }, { 0x8180, 0xDBB9 }, { 0x8188, 0xCCAE }, { 0x818A, 0xDADB }, { 0x818F, 0xCDC7 }, { 0x819A, 0xDDB1 }, { 0x819C, 0xD8AF }, { 0x819D, 0xE3A3 },
+	{ 0x81A0, 0xCEEF }, { 0x81A3, 0xF2F3 }, { 0x81A8, 0xF8B3 }, { 0x81B3, 0xE0CE }, { 0x81B5, 0xF5FD }, { 0x81BA, 0xEBEC }, { 0x81BD, 0xD3C5 }, { 0x81BE, 0xFCEC },
+	{ 0x81BF, 0xD2DB }, { 0x81C0, 0xD4EB }, { 0x81C2, 0xDEA2 }, { 0x81C6, 0xE5E6 }, { 0x81CD, 0xF0B0 }, { 0x81D8, 0xD5C4 }, { 0x81DF, 0xEDF4 }, { 0x81E3, 0xE3ED },
+	{ 0x81E5, 0xE8C2 }, { 0x81E7, 0xEDF5 }, { 0x81E8, 0xD7FC }, { 0x81EA, 0xEDBB }, { 0x81ED, 0xF6AB }, { 0x81F3, 0xF2B8 }, { 0x81F4, 0xF6C8 }, { 0x81FA, 0xD3E6 },
+	{ 0x81FB, 0xF2DD }, { 0x81FC, 0xCFBF }, { 0x81FE, 0xEBAC }, { 0x8205, 0xCFC0 }, { 0x8207, 0xE6A8 }, { 0x8208, 0xFDE9 }, { 0x820A, 0xCFC1 }, { 0x820C, 0xE0DF },
+	{ 0x820D, 0xDEEC }, { 0x8212, 0xE0A2 }, { 0x821B, 0xF4BF }, { 0x821C, 0xE2EF }, { 0x821E, 0xD9F1 }, { 0x821F, 0xF1C7 }, { 0x8221, 0xCBB8 }, { 0x822A, 0xF9FE },
+	{ 0x822B, 0xDBBA }, { 0x822C, 0xDAF5 }, { 0x8235, 0xF6EC }, { 0x8236, 0xDADC }, { 0x8237, 0xFAE4 }, { 0x8239, 0xE0CF }, { 0x8240, 0xDDB2 }, { 0x8245, 0xE6A9 },
+	{ 0x8247, 0xEFF3 }, { 0x8259, 0xF3ED }, { 0x8264, 0xEBFA }, { 0x8266, 0xF9E6 }, { 0x826E, 0xCADD }, { 0x826F, 0xD5DE }, { 0x8271, 0xCADE }, { 0x8272, 0xDFE4 },
+	{ 0x8276, 0xE6FD }, { 0x8278, 0xF5AC }, { 0x827E, 0xE4F5 }, { 0x828B, 0xE9E3 }, { 0x828D, 0xEDCB }, { 0x828E, 0xCFE4 }, { 0x8292, 0xD8D3 }, { 0x8299, 0xDDB3 },
+	{ 0x829A, 0xD4EC }, { 0x829D, 0xF2B9 }, { 0x829F, 0xDFB7 }, { 0x82A5, 0xCBCE }, { 0x82A6, 0xFBD8 }, { 0x82A9, 0xD0D9 }, { 0x82AC, 0xDDD2 }, { 0x82AD, 0xF7F4 },
+	{ 0x82AE, 0xE7DC }, { 0x82AF, 0xE4A5 }, { 0x82B1, 0xFCA3 }, { 0x82B3, 0xDBBB }, { 0x82B7, 0xF2BA }, { 0x82B8, 0xE9FD }, { 0x82B9, 0xD0CA }, { 0x82BB, 0xF5D6 },
+	{ 0x82BC, 0xD9C5 }, { 0x82BD, 0xE4B4 }, { 0x82BF, 0xEDA7 }, { 0x82D1, 0xEABD }, { 0x82D2, 0xE6FE }, { 0x82D4, 0xF7C4 }, { 0x82D5, 0xF5AD }, { 0x82D7, 0xD9E0 },
+	{ 0x82DB, 0xCAB4 }, { 0x82DE, 0xF8E2 }, { 0x82DF, 0xCFC2 }, { 0x82E1, 0xECBE }, { 0x82E5, 0xE5B4 }, { 0x82E6, 0xCDC8 }, { 0x82E7, 0xEEC8 }, { 0x82F1, 0xE7C8 },
+	{ 0x82FD, 0xCDC9 }, { 0x82FE, 0xF9B7 }, { 0x8301, 0xF1E8 }, { 0x8302, 0xD9F2 }, { 0x8303, 0xDBF5 }, { 0x8304, 0xCAB5 }, { 0x8305, 0xD9C6 }, { 0x8309, 0xD8C9 },
+	{ 0x8317, 0xD9AB }, { 0x8328, 0xEDBC }, { 0x832B, 0xD8D4 }, { 0x832F, 0xDCDA }, { 0x8331, 0xE2BC }, { 0x8334, 0xFCED }, { 0x8335, 0xECE0 }, { 0x8336, 0xD2FE },
+	{ 0x8338, 0xE9C7 }, { 0x8339, 0xE6AA }, { 0x8340, 0xE2F0 }, { 0x8347, 0xFABB }, { 0x8349, 0xF5AE }, { 0x834A, 0xFBAA }, { 0x834F, 0xECFB }, { 0x8351, 0xECBF },
+	{ 0x8352, 0xFCD8 }, { 0x8373, 0xD4E5 }, { 0x8377, 0xF9C3 }, { 0x837B, 0xEEE2 }, { 0x8389, 0xD7E9 }, { 0x838A, 0xEDF6 }, { 0x838E, 0xDEED }, { 0x8396, 0xCCEC },
+	{ 0x8398, 0xE3EE }, { 0x839E, 0xE8D4 }, { 0x83A2, 0xFAF8 }, { 0x83A9, 0xDDB4 }, { 0x83AA, 0xE4B5 }, { 0x83AB, 0xD8B0 }, { 0x83BD, 0xD8D5 }, { 0x83C1, 0xF4EA },
+	{ 0x83C5, 0xCEB9 }, { 0x83C9, 0xD6E1 }, { 0x83CA, 0xCFD2 }, { 0x83CC, 0xD0B6 }, { 0x83D3, 0xCEA2 }, { 0x83D6, 0xF3EE }, { 0x83DC, 0xF3F8 }, { 0x83E9, 0xDCCC },
+	{ 0x83EB, 0xD0CB }, { 0x83EF, 0xFCA4 }, { 0x83F0, 0xCDCA }, { 0x83F1, 0xD7D4 }, { 0x83F2, 0xDEA3 }, { 0x83F4, 0xE4E0 }, { 0x83F9, 0xEEC9 }, { 0x83FD, 0xE2DD },
+	{ 0x8403, 0xF5FE }, { 0x8404, 0xD4AC }, { 0x840A, 0xD5D1 }, { 0x840C, 0xD8F0 }, { 0x840D, 0xF8C3 }, { 0x840E, 0xEAD7 }, { 0x8429, 0xF5D7 }, { 0x842C, 0xD8BF },
+	{ 0x8431, 0xFDC0 }, { 0x8438, 0xEBAD }, { 0x843D, 0xD5AA }, { 0x8449, 0xE7A8 }, { 0x8457, 0xEECA }, { 0x845B, 0xCAE7 }, { 0x8461, 0xF8E3 }, { 0x8463, 0xD4DD },
+	{ 0x8466, 0xEAD8 }, { 0x846B, 0xFBD9 }, { 0x846C, 0xEDF7 }, { 0x846F, 0xE5B5 }, { 0x8475, 0xD0AD }, { 0x847A, 0xF1F1 }, { 0x8490, 0xE2BD }, { 0x8494, 0xE3C8 },
+	{ 0x8499, 0xD9D5 }, { 0x849C, 0xDFAA }, { 0x84A1, 0xDBBC }, { 0x84B2, 0xF8E4 }, { 0x84B8, 0xF1FA }, { 0x84BB, 0xE5B6 }, { 0x84BC, 0xF3EF }, { 0x84BF, 0xFBDA },
+	{ 0x84C0, 0xE1E0 }, { 0x84C2, 0xD9AC }, { 0x84C4, 0xF5EB }, { 0x84C6, 0xE0B6 }, { 0x84C9, 0xE9C8 }, { 0x84CB, 0xCBCF }, { 0x84CD, 0xE3C9 }, { 0x84D1, 0xDEEE },
+	{ 0x84DA, 0xE2BE }, { 0x84EC, 0xDCEF }, { 0x84EE, 0xD6A5 }, { 0x84F4, 0xE2F1 }, { 0x84FC, 0xD6FE }, { 0x8511, 0xD9A1 }, { 0x8513, 0xD8C0 }, { 0x8514, 0xDCDB },
+	{ 0x8517, 0xEDBD }, { 0x8518, 0xDFB8 }, { 0x851A, 0xEAA5 }, { 0x851E, 0xD7AD }, { 0x8521, 0xF3F9 }, { 0x8523, 0xEDF8 }, { 0x8525, 0xF5C7 }, { 0x852C, 0xE1CA },
+	{ 0x852D, 0xEBE3 }, { 0x852F, 0xF2DE }, { 0x853D, 0xF8CC }, { 0x853F, 0xEAD9 }, { 0x8541, 0xD3C6 }, { 0x8543, 0xDBE6 }, { 0x8549, 0xF5AF }, { 0x854E, 0xCEF0 },
+	{ 0x8553, 0xE9FE }, { 0x8559, 0xFBB6 }, { 0x8563, 0xE2F2 }, { 0x8568, 0xCFF2 }, { 0x8569, 0xF7B9 }, { 0x856A, 0xD9F3 }, { 0x856D, 0xE1CB }, { 0x8584, 0xDADD },
+	{ 0x8587, 0xDAB9 }, { 0x858F, 0xEBFB }, { 0x8591, 0xCBB9 }, { 0x8594, 0xEDF9 }, { 0x859B, 0xE0E0 }, { 0x85A6, 0xF4C0 }, { 0x85A8, 0xFDBC }, { 0x85A9, 0xDFB1 },
+	{ 0x85AA, 0xE3EF }, { 0x85AF, 0xE0A3 }, { 0x85B0, 0xFDB9 }, { 0x85BA, 0xF0B1 }, { 0x85C1, 0xCDCB }, { 0x85C9, 0xEDBE }, { 0x85CD, 0xD5C0 }, { 0x85CE, 0xE3F0 },
+	{ 0x85CF, 0xEDFA }, { 0x85D5, 0xE9E4 }, { 0x85DC, 0xD5ED }, { 0x85DD, 0xE7DD }, { 0x85E4, 0xD4F6 }, { 0x85E5, 0xE5B7 }, { 0x85E9, 0xDBE7 }, { 0x85EA, 0xE2BF },
+	{ 0x85F7, 0xEECB }, { 0x85FA, 0xD7F4 }, { 0x85FB, 0xF0DD }, { 0x85FF, 0xCEAB }, { 0x8602, 0xE7DE }, { 0x8606, 0xD6D6 }, { 0x8607, 0xE1CC }, { 0x860A, 0xE8B3 },
+	{ 0x8616, 0xE5EE }, { 0x8617, 0xDCA2 }, { 0x861A, 0xE0D0 }, { 0x862D, 0xD5B5 }, { 0x863F, 0xD5A1 }, { 0x864E, 0xFBDB }, { 0x8650, 0xF9CB }, { 0x8654, 0xCBF3 },
+	{ 0x8655, 0xF4A5 }, { 0x865B, 0xFAC8 }, { 0x865C, 0xD6D7 }, { 0x865E, 0xE9E5 }, { 0x865F, 0xFBDC }, { 0x8667, 0xFDD0 }, { 0x8679, 0xFBF6 }, { 0x868A, 0xDAA5 },
+	{ 0x868C, 0xDBBD }, { 0x8693, 0xECE2 }, { 0x86A3, 0xCDF7 }, { 0x86A4, 0xF0DE }, { 0x86A9, 0xF6C9 }, { 0x86C7, 0xDEEF }, { 0x86CB, 0xD3B1 }, { 0x86D4, 0xFCEE },
+	{ 0x86D9, 0xE8C3 }, { 0x86DB, 0xF1C8 }, { 0x86DF, 0xCEF1 }, { 0x86E4, 0xF9ED }, { 0x86ED, 0xF2F4 }, { 0x86FE, 0xE4B6 }, { 0x8700, 0xF5B9 }, { 0x8702, 0xDCF0 },
+	{ 0x8703, 0xE3F1 }, { 0x8708, 0xE8A5 }, { 0x8718, 0xF2BB }, { 0x871A, 0xDEA4 }, { 0x871C, 0xDACC }, { 0x874E, 0xCAE9 }, { 0x8755, 0xE3DA }, { 0x8757, 0xFCD9 },
+	{ 0x875F, 0xEADA }, { 0x8766, 0xF9C4 }, { 0x8768, 0xE3A4 }, { 0x8774, 0xFBDD }, { 0x8776, 0xEFCA }, { 0x8778, 0xE8C4 }, { 0x8782, 0xD5CC }, { 0x878D, 0xEBD7 },
+	{ 0x879F, 0xD9AD }, { 0x87A2, 0xFBAB }, { 0x87B3, 0xD3D9 }, { 0x87BA, 0xD5A2 }, { 0x87C4, 0xF6DE }, { 0x87E0, 0xDAF6 }, { 0x87EC, 0xE0D1 }, { 0x87EF, 0xE9A8 },
+	{ 0x87F2, 0xF5F9 }, { 0x87F9, 0xFAAF }, { 0x87FB, 0xEBFC }, { 0x87FE, 0xE0EA }, { 0x8805, 0xE3B2 }, { 0x881F, 0xD5C5 }, { 0x8822, 0xF1E3 }, { 0x8823, 0xD5EE },
+	{ 0x8831, 0xCDCC }, { 0x8836, 0xEDD9 }, { 0x883B, 0xD8C1 }, { 0x8840, 0xFAEC }, { 0x8846, 0xF1EB }, { 0x884C, 0xFABC }, { 0x884D, 0xE6E2 }, { 0x8852, 0xFAE5 },
+	{ 0x8853, 0xE2FA }, { 0x8857, 0xCAB6 }, { 0x8859, 0xE4B7 }, { 0x885B, 0xEADB }, { 0x885D, 0xF5FA }, { 0x8861, 0xFBAC }, { 0x8862, 0xCFC3 }, { 0x8863, 0xEBFD },
+	{ 0x8868, 0xF8FA }, { 0x886B, 0xDFB9 }, { 0x8870, 0xE1F1 }, { 0x8872, 0xD2A4 }, { 0x8877, 0xF5FB }, { 0x887E, 0xD0DA }, { 0x887F, 0xD0DB }, { 0x8881, 0xEABE },
+	{ 0x8882, 0xD9B1 }, { 0x8888, 0xCAB7 }, { 0x888B, 0xD3E7 }, { 0x888D, 0xF8E5 }, { 0x8892, 0xD3B2 }, { 0x8896, 0xE2C0 }, { 0x8897, 0xF2DF }, { 0x889E, 0xCDE5 },
+	{ 0x88AB, 0xF9AC }, { 0x88B4, 0xCDCD }, { 0x88C1, 0xEEAE }, { 0x88C2, 0xD6AE }, { 0x88CF, 0xD7EA }, { 0x88D4, 0xE7E0 }, { 0x88D5, 0xEBAE }, { 0x88D9, 0xCFD9 },
+	{ 0x88DC, 0xDCCD }, { 0x88DD, 0xEDFB }, { 0x88DF, 0xDEF0 }, { 0x88E1, 0xD7EB }, { 0x88E8, 0xDEA5 }, { 0x88F3, 0xDFD7 }, { 0x88F4, 0xDBD0 }, { 0x88F5, 0xDBD1 },
+	{ 0x88F8, 0xD5A3 }, { 0x88FD, 0xF0B2 }, { 0x8907, 0xDCDC }, { 0x8910, 0xCAE8 }, { 0x8912, 0xF8E6 }, { 0x8913, 0xDCCE }, { 0x8918, 0xEADC }, { 0x8919, 0xDBD2 },
+	{ 0x8925, 0xE9B3 }, { 0x892A, 0xF7DB }, { 0x8936, 0xE3A8 }, { 0x8938, 0xD7AE }, { 0x893B, 0xE0E1 }, { 0x8941, 0xCBBA }, { 0x8944, 0xE5D1 }, { 0x895F, 0xD0DC },
+	{ 0x8964, 0xD5C1 }, { 0x896A, 0xD8CA }, { 0x8972, 0xE3A9 }, { 0x897F, 0xE0A4 }, { 0x8981, 0xE9A9 }, { 0x8983, 0xD3C7 }, { 0x8986, 0xDCDD }, { 0x8987, 0xF8AE },
+	{ 0x898B, 0xCCB8 }, { 0x898F, 0xD0AE }, { 0x8993, 0xD8F2 }, { 0x8996, 0xE3CA }, { 0x89A1, 0xCCAF }, { 0x89A9, 0xD4AD }, { 0x89AA, 0xF6D1 }, { 0x89B2, 0xD0CC },
+	{ 0x89BA, 0xCAC6 }, { 0x89BD, 0xD5C2 }, { 0x89C0, 0xCEBA }, { 0x89D2, 0xCAC7 }, { 0x89E3, 0xFAB0 }, { 0x89F4, 0xDFD8 }, { 0x89F8, 0xF5BA }, { 0x8A00, 0xE5EB },
+	{ 0x8A02, 0xEFF4 }, { 0x8A03, 0xDDB5 }, { 0x8A08, 0xCDAA }, { 0x8A0A, 0xE3F2 }, { 0x8A0C, 0xFBF7 }, { 0x8A0E, 0xF7D0 }, { 0x8A13, 0xFDBA }, { 0x8A16, 0xFDE1 },
+	{ 0x8A17, 0xF6FE }, { 0x8A18, 0xD1C0 }, { 0x8A1B, 0xE8C5 }, { 0x8A1D, 0xE4B8 }, { 0x8A1F, 0xE1E8 }, { 0x8A23, 0xCCC1 }, { 0x8A25, 0xD2ED }, { 0x8A2A, 0xDBBE },
+	{ 0x8A2D, 0xE0E2 }, { 0x8A31, 0xFAC9 }, { 0x8A34, 0xE1CD }, { 0x8A36, 0xCAB8 }, { 0x8A3A, 0xF2E0 }, { 0x8A3B, 0xF1C9 }, { 0x8A50, 0xDEF1 }, { 0x8A54, 0xF0DF },
+	{ 0x8A55, 0xF8C4 }, { 0x8A5B, 0xEECC }, { 0x8A5E, 0xDEF2 }, { 0x8A60, 0xE7C9 }, { 0x8A62, 0xE2F3 }, { 0x8A63, 0xE7E1 }, { 0x8A66, 0xE3CB }, { 0x8A69, 0xE3CC },
+	{ 0x8A6D, 0xCFF8 }, { 0x8A6E, 0xEFAC }, { 0x8A70, 0xFDFE }, { 0x8A71, 0xFCA5 }, { 0x8A72, 0xFAB1 }, { 0x8A73, 0xDFD9 }, { 0x8A75, 0xE0D2 }, { 0x8A79, 0xF4DA },
+	{ 0x8A85, 0xF1CA }, { 0x8A87, 0xCEA3 }, { 0x8A8C, 0xF2BC }, { 0x8A8D, 0xECE3 }, { 0x8A93, 0xE0A5 }, { 0x8A95, 0xF7AB }, { 0x8A98, 0xEBAF }, { 0x8A9E, 0xE5DE },
+	{ 0x8AA0, 0xE1A4 }, { 0x8AA1, 0xCDAB }, { 0x8AA3, 0xD9F4 }, { 0x8AA4, 0xE8A6 }, { 0x8AA5, 0xCDCE }, { 0x8AA6, 0xE1E9 }, { 0x8AA8, 0xFCEF }, { 0x8AAA, 0xE0E3 },
+	{ 0x8AB0, 0xE2C1 }, { 0x8AB2, 0xCEA4 }, { 0x8AB9, 0xDEA6 }, { 0x8ABC, 0xEBFE }, { 0x8ABE, 0xEBDD }, { 0x8ABF, 0xF0E0 }, { 0x8AC2, 0xF4DB }, { 0x8AC4, 0xE2F4 },
+	{ 0x8AC7, 0xD3C8 }, { 0x8ACB, 0xF4EB }, { 0x8ACD, 0xEEB5 }, { 0x8ACF, 0xF5D8 }, { 0x8AD2, 0xD5DF }, { 0x8AD6, 0xD6E5 }, { 0x8ADB, 0xEBB0 }, { 0x8ADC, 0xF4E3 },
+	{ 0x8AE1, 0xE3CD }, { 0x8AE6, 0xF4F4 }, { 0x8AE7, 0xFAB2 }, { 0x8AEA, 0xEFF5 }, { 0x8AEB, 0xCADF }, { 0x8AED, 0xEBB1 }, { 0x8AEE, 0xEDBF }, { 0x8AF1, 0xFDC9 },
+	{ 0x8AF6, 0xE4A6 }, { 0x8AF7, 0xF9A4 }, { 0x8AF8, 0xF0B3 }, { 0x8AFA, 0xE5EC }, { 0x8AFE, 0xD1E7 }, { 0x8B00, 0xD9C7 }, { 0x8B01, 0xE4D7 }, { 0x8B02, 0xEADD },
+	{ 0x8B04, 0xD4F7 }, { 0x8B0E, 0xDABA }, { 0x8B10, 0xDACD }, { 0x8B14, 0xF9CC }, { 0x8B16, 0xE1DA }, { 0x8B17, 0xDBBF }, { 0x8B19, 0xCCC5 }, { 0x8B1A, 0xECD0 },
+	{ 0x8B1B, 0xCBBB }, { 0x8B1D, 0xDEF3 }, { 0x8B20, 0xE9AA }, { 0x8B28, 0xD9C8 }, { 0x8B2B, 0xEEE3 }, { 0x8B2C, 0xD7BD }, { 0x8B33, 0xCFC4 }, { 0x8B39, 0xD0CD },
+	{ 0x8B41, 0xFCA6 }, { 0x8B49, 0xF1FB }, { 0x8B4E, 0xFDD2 }, { 0x8B4F, 0xD1C1 }, { 0x8B58, 0xE3DB }, { 0x8B5A, 0xD3C9 }, { 0x8B5C, 0xDCCF }, { 0x8B66, 0xCCED },
+	{ 0x8B6C, 0xDEA7 }, { 0x8B6F, 0xE6BB }, { 0x8B70, 0xECA1 }, { 0x8B74, 0xCCB9 }, { 0x8B77, 0xFBDE }, { 0x8B7D, 0xE7E2 }, { 0x8B80, 0xD4C1 }, { 0x8B8A, 0xDCA8 },
+	{ 0x8B90, 0xE2C2 }, { 0x8B92, 0xF3D8 }, { 0x8B93, 0xE5D3 }, { 0x8B96, 0xF3D9 }, { 0x8B9A, 0xF3C6 }, { 0x8C37, 0xCDDB }, { 0x8C3F, 0xCDAC }, { 0x8C41, 0xFCC3 },
+	{ 0x8C46, 0xD4E7 }, { 0x8C48, 0xD1C2 }, { 0x8C4A, 0xF9A5 }, { 0x8C4C, 0xE8D5 }, { 0x8C55, 0xE3CE }, { 0x8C5A, 0xD4CA }, { 0x8C61, 0xDFDA }, { 0x8C6A, 0xFBDF },
+	{ 0x8C6B, 0xE7E3 }, { 0x8C79, 0xF8FB }, { 0x8C7A, 0xE3CF }, { 0x8C82, 0xF5B0 }, { 0x8C8A, 0xD8E7 }, { 0x8C8C, 0xD9C9 }, { 0x8C9D, 0xF8AF }, { 0x8C9E, 0xEFF6 },
+	{ 0x8CA0, 0xDDB6 }, { 0x8CA1, 0xEEAF }, { 0x8CA2, 0xCDF8 }, { 0x8CA7, 0xDEB8 }, { 0x8CA8, 0xFCA7 }, { 0x8CA9, 0xF7FC }, { 0x8CAA, 0xF7B1 }, { 0x8CAB, 0xCEBB },
+	{ 0x8CAC, 0xF4A1 }, { 0x8CAF, 0xEECD }, { 0x8CB0, 0xE1AE }, { 0x8CB3, 0xECC3 }, { 0x8CB4, 0xCFFE }, { 0x8CB6, 0xF8BF }, { 0x8CB7, 0xD8E2 }, { 0x8CB8, 0xD3E8 },
+	{ 0x8CBB, 0xDEA8 }, { 0x8CBC, 0xF4E4 }, { 0x8CBD, 0xECC2 }, { 0x8CBF, 0xD9F5 }, { 0x8CC0, 0xF9C5 }, { 0x8CC1, 0xDDD3 }, { 0x8CC2, 0xD6F1 }, { 0x8CC3, 0xECFC },
+	{ 0x8CC4, 0xFCF0 }, { 0x8CC7, 0xEDC0 }, { 0x8CC8, 0xCAB9 }, { 0x8CCA, 0xEEE4 }, { 0x8CD1, 0xF2E1 }, { 0x8CD3, 0xDEB9 }, { 0x8CDA, 0xD6F2 }, { 0x8CDC, 0xDEF4 },
+	{ 0x8CDE, 0xDFDB }, { 0x8CE0, 0xDBD3 }, { 0x8CE2, 0xFAE7 }, { 0x8CE3, 0xD8E3 }, { 0x8CE4, 0xF4C1 }, { 0x8CE6, 0xDDB7 }, { 0x8CEA, 0xF2F5 }, { 0x8CED, 0xD4AE },
+	{ 0x8CF4, 0xD6F3 }, { 0x8CFB, 0xDDB8 }, { 0x8CFC, 0xCFC5 }, { 0x8CFD, 0xDFDF }, { 0x8D04, 0xF2BE }, { 0x8D05, 0xF6A1 }, { 0x8D07, 0xEBCB }, { 0x8D08, 0xF1FC },
+	{ 0x8D0A, 0xF3C7 }, { 0x8D0D, 0xE0EB }, { 0x8D13, 0xEDFC }, { 0x8D16, 0xE1DB }, { 0x8D64, 0xEEE5 }, { 0x8D66, 0xDEF5 }, { 0x8D6B, 0xFAD3 }, { 0x8D70, 0xF1CB },
+	{ 0x8D73, 0xD0AF }, { 0x8D74, 0xDDB9 }, { 0x8D77, 0xD1C3 }, { 0x8D85, 0xF5B1 }, { 0x8D8A, 0xEAC6 }, { 0x8D99, 0xF0E1 }, { 0x8DA3, 0xF6AC }, { 0x8DA8, 0xF5D9 },
+	{ 0x8DB3, 0xF0EB }, { 0x8DBA, 0xDDBA }, { 0x8DBE, 0xF2BF }, { 0x8DC6, 0xF7C5 }, { 0x8DCB, 0xDBA2 }, { 0x8DCC, 0xF2F6 }, { 0x8DCF, 0xCABA }, { 0x8DDB, 0xF7F5 },
+	{ 0x8DDD, 0xCBE5 }, { 0x8DE1, 0xEEE6 }, { 0x8DE3, 0xE0D3 }, { 0x8DE8, 0xCEA5 }, { 0x8DEF, 0xD6D8 }, { 0x8DF3, 0xD4AF }, { 0x8E0A, 0xE9C9 }, { 0x8E0F, 0xD3CE },
+	{ 0x8E10, 0xF4C2 }, { 0x8E1E, 0xCBE6 }, { 0x8E2A, 0xF1A1 }, { 0x8E30, 0xEBB2 }, { 0x8E35, 0xF1A2 }, { 0x8E42, 0xEBB3 }, { 0x8E44, 0xF0B4 }, { 0x8E47, 0xCBF4 },
+	{ 0x8E48, 0xD4B0 }, { 0x8E49, 0xF3B2 }, { 0x8E4A, 0xFBB7 }, { 0x8E59, 0xF5EC }, { 0x8E5F, 0xEEE7 }, { 0x8E60, 0xF4B2 }, { 0x8E74, 0xF5ED }, { 0x8E76, 0xCFF3 },
+	{ 0x8E81, 0xF0E2 }, { 0x8E87, 0xEECE }, { 0x8E8A, 0xF1CC }, { 0x8E8D, 0xE5B8 }, { 0x8EAA, 0xD7F5 }, { 0x8EAB, 0xE3F3 }, { 0x8EAC, 0xCFE5 }, { 0x8EC0, 0xCFC6 },
+	{ 0x8ECA, 0xF3B3 }, { 0x8ECB, 0xE4D8 }, { 0x8ECC, 0xCFF9 }, { 0x8ECD, 0xCFDA }, { 0x8ED2, 0xFACD }, { 0x8EDF, 0xE6E3 }, { 0x8EEB, 0xF2E2 }, { 0x8EF8, 0xF5EE },
+	{ 0x8EFB, 0xCABB }, { 0x8EFE, 0xE3DC }, { 0x8F03, 0xCEF2 }, { 0x8F05, 0xD6D9 }, { 0x8F09, 0xEEB0 }, { 0x8F12, 0xF4E5 }, { 0x8F13, 0xD8C2 }, { 0x8F14, 0xDCD0 },
+	{ 0x8F15, 0xCCEE }, { 0x8F1B, 0xD5E0 }, { 0x8F1C, 0xF6CA }, { 0x8F1D, 0xFDCA }, { 0x8F1E, 0xD8D6 }, { 0x8F1F, 0xF4CF }, { 0x8F26, 0xD6A6 }, { 0x8F27, 0xDCBE },
+	{ 0x8F29, 0xDBD4 }, { 0x8F2A, 0xD7C7 }, { 0x8F2F, 0xF2FE }, { 0x8F33, 0xF1CD }, { 0x8F38, 0xE2C3 }, { 0x8F39, 0xDCDE }, { 0x8F3B, 0xDCDF }, { 0x8F3E, 0xEFAD },
+	{ 0x8F3F, 0xE6AB }, { 0x8F44, 0xF9DD }, { 0x8F45, 0xEABF }, { 0x8F49, 0xEFAE }, { 0x8F4D, 0xF4D0 }, { 0x8F4E, 0xCEF3 }, { 0x8F5D, 0xE6AC }, { 0x8F5F, 0xCEDE },
+	{ 0x8F62, 0xD5F9 }, { 0x8F9B, 0xE3F4 }, { 0x8F9C, 0xCDD0 }, { 0x8FA3, 0xD5B8 }, { 0x8FA6, 0xF7FD }, { 0x8FA8, 0xDCA9 }, { 0x8FAD, 0xDEF6 }, { 0x8FAF, 0xDCAA },
+	{ 0x8FB0, 0xF2E3 }, { 0x8FB1, 0xE9B4 }, { 0x8FB2, 0xD2DC }, { 0x8FC2, 0xE9E6 }, { 0x8FC5, 0xE3F6 }, { 0x8FCE, 0xE7CA }, { 0x8FD1, 0xD0CE }, { 0x8FD4, 0xDAF7 },
+	{ 0x8FE6, 0xCABC }, { 0x8FEA, 0xEEE8 }, { 0x8FEB, 0xDADE }, { 0x8FED, 0xF2F7 }, { 0x8FF0, 0xE2FB }, { 0x8FF2, 0xCCA6 }, { 0x8FF7, 0xDABB }, { 0x8FF9, 0xEEE9 },
+	{ 0x8FFD, 0xF5DA }, { 0x9000, 0xF7DC }, { 0x9001, 0xE1EA }, { 0x9002, 0xCEC1 }, { 0x9003, 0xD4B1 }, { 0x9005, 0xFDB1 }, { 0x9006, 0xE6BD }, { 0x9008, 0xFBAD },
+	{ 0x900B, 0xF8E7 }, { 0x900D, 0xE1CE }, { 0x900F, 0xF7E2 }, { 0x9010, 0xF5EF }, { 0x9011, 0xCFC7 }, { 0x9014, 0xD4B2 }, { 0x9015, 0xCCEF }, { 0x9017, 0xD4E8 },
+	{ 0x9019, 0xEECF }, { 0x901A, 0xF7D7 }, { 0x901D, 0xE0A6 }, { 0x901E, 0xD6C1 }, { 0x901F, 0xE1DC }, { 0x9020, 0xF0E3 }, { 0x9021, 0xF1E4 }, { 0x9022, 0xDCF1 },
+	{ 0x9023, 0xD6A7 }, { 0x902E, 0xF4F5 }, { 0x9031, 0xF1CE }, { 0x9032, 0xF2E4 }, { 0x9035, 0xD0B0 }, { 0x9038, 0xECEF }, { 0x903C, 0xF9BA }, { 0x903E, 0xEBB5 },
+	{ 0x9041, 0xD4ED }, { 0x9042, 0xE2C4 }, { 0x9047, 0xE9E7 }, { 0x904A, 0xEBB4 }, { 0x904B, 0xEAA1 }, { 0x904D, 0xF8BC }, { 0x904E, 0xCEA6 }, { 0x9050, 0xF9C6 },
+	{ 0x9051, 0xFCDA }, { 0x9053, 0xD4B3 }, { 0x9054, 0xD3B9 }, { 0x9055, 0xEADE }, { 0x9059, 0xE9AB }, { 0x905C, 0xE1E1 }, { 0x905D, 0xD3CF }, { 0x905E, 0xF4F6 },
+	{ 0x9060, 0xEAC0 }, { 0x9061, 0xE1CF }, { 0x9063, 0xCCBA }, { 0x9069, 0xEEEA }, { 0x906D, 0xF0E4 }, { 0x906E, 0xF3B4 }, { 0x906F, 0xD4EE }, { 0x9072, 0xF2C0 },
+	{ 0x9075, 0xF1E5 }, { 0x9077, 0xF4C3 }, { 0x9078, 0xE0D4 }, { 0x907A, 0xEBB6 }, { 0x907C, 0xD7A1 }, { 0x907D, 0xCBE8 }, { 0x907F, 0xF9AD }, { 0x9080, 0xE9AD },
+	{ 0x9081, 0xD8E4 }, { 0x9082, 0xFAB3 }, { 0x9083, 0xE2C5 }, { 0x9084, 0xFCBD }, { 0x9087, 0xECC4 }, { 0x9088, 0xD8B1 }, { 0x908A, 0xDCAB }, { 0x908F, 0xD5A4 },
+	{ 0x9091, 0xEBE9 }, { 0x9095, 0xE8BB }, { 0x9099, 0xD8D7 }, { 0x90A2, 0xFBAE }, { 0x90A3, 0xD1E1 }, { 0x90A6, 0xDBC0 }, { 0x90A8, 0xF5BE }, { 0x90AA, 0xDEF7 },
+	{ 0x90AF, 0xCAFB }, { 0x90B0, 0xF7C6 }, { 0x90B1, 0xCFC8 }, { 0x90B5, 0xE1D0 }, { 0x90B8, 0xEED0 }, { 0x90C1, 0xE9F4 }, { 0x90CA, 0xCEF4 }, { 0x90DE, 0xD5CD },
+	{ 0x90E1, 0xCFDB }, { 0x90E8, 0xDDBB }, { 0x90ED, 0xCEAC }, { 0x90F5, 0xE9E8 }, { 0x90FD, 0xD4B4 }, { 0x9102, 0xE4C7 }, { 0x9112, 0xF5DB }, { 0x9115, 0xFAC1 },
+	{ 0x9119, 0xDEA9 }, { 0x9127, 0xD4F8 }, { 0x912D, 0xEFF7 }, { 0x9132, 0xD3B3 }, { 0x9149, 0xEBB7 }, { 0x914A, 0xEFF8 }, { 0x914B, 0xF5DC }, { 0x914C, 0xEDCC },
+	{ 0x914D, 0xDBD5 }, { 0x914E, 0xF1CF }, { 0x9152, 0xF1D0 }, { 0x9162, 0xF5B2 }, { 0x9169, 0xD9AE }, { 0x916A, 0xD5AC }, { 0x916C, 0xE2C6 }, { 0x9175, 0xFDA3 },
+	{ 0x9177, 0xFBE5 }, { 0x9178, 0xDFAB }, { 0x9187, 0xE2F5 }, { 0x9189, 0xF6AD }, { 0x918B, 0xF5B3 }, { 0x918D, 0xF0B5 }, { 0x9192, 0xE1A5 }, { 0x919C, 0xF5DD },
+	{ 0x91AB, 0xECA2 }, { 0x91AC, 0xEDFD }, { 0x91AE, 0xF5B4 }, { 0x91AF, 0xFBB8 }, { 0x91B1, 0xDBA3 }, { 0x91B4, 0xD6CA }, { 0x91B5, 0xCBD9 }, { 0x91C0, 0xE5D4 },
+	{ 0x91C7, 0xF3FA }, { 0x91C9, 0xEBB8 }, { 0x91CB, 0xE0B7 }, { 0x91CC, 0xD7EC }, { 0x91CD, 0xF1EC }, { 0x91CE, 0xE5AF }, { 0x91CF, 0xD5E1 }, { 0x91D0, 0xD7ED },
+	{ 0x91D1, 0xD1D1 }, { 0x91D7, 0xE1F2 }, { 0x91D8, 0xEFF9 }, { 0x91DC, 0xDDBC }, { 0x91DD, 0xF6DC }, { 0x91E3, 0xF0E5 }, { 0x91E7, 0xF4C4 }, { 0x91EA, 0xE9E9 },
+	{ 0x91F5, 0xF3FB }, { 0x920D, 0xD4EF }, { 0x9210, 0xCCA2 }, { 0x9211, 0xF7FE }, { 0x9212, 0xDFBC }, { 0x9217, 0xEBCD }, { 0x921E, 0xD0B7 }, { 0x9234, 0xD6C2 },
+	{ 0x923A, 0xE8AD }, { 0x923F, 0xEFAF }, { 0x9240, 0xCBA5 }, { 0x9245, 0xCBE9 }, { 0x9249, 0xFAE8 }, { 0x9257, 0xCCC6 }, { 0x925B, 0xE6E7 }, { 0x925E, 0xEAC7 },
+	{ 0x9262, 0xDBA4 }, { 0x9264, 0xCFC9 }, { 0x9265, 0xE2FC }, { 0x9266, 0xEFFA }, { 0x9280, 0xEBDE }, { 0x9283, 0xF5C8 }, { 0x9285, 0xD4DE }, { 0x9291, 0xE0D5 },
+	{ 0x9293, 0xEFB0 }, { 0x9296, 0xE2C7 }, { 0x9298, 0xD9AF }, { 0x929C, 0xF9E7 }, { 0x92B3, 0xE7E5 }, { 0x92B6, 0xCFCA }, { 0x92B7, 0xE1D1 }, { 0x92B9, 0xE2C8 },
+	{ 0x92CC, 0xEFFB }, { 0x92CF, 0xFAF9 }, { 0x92D2, 0xDCF2 }, { 0x92E4, 0xE0A7 }, { 0x92EA, 0xF8E8 }, { 0x92F8, 0xCBEA }, { 0x92FC, 0xCBBC }, { 0x9304, 0xD6E2 },
+	{ 0x9310, 0xF5DE }, { 0x9318, 0xF5DF }, { 0x931A, 0xEEB6 }, { 0x931E, 0xE2F6 }, { 0x931F, 0xD3CA }, { 0x9320, 0xEFFC }, { 0x9321, 0xD1C4 }, { 0x9322, 0xEFB1 },
+	{ 0x9324, 0xD1C5 }, { 0x9326, 0xD0DE }, { 0x9328, 0xD9E1 }, { 0x932B, 0xE0B8 }, { 0x932E, 0xCDD1 }, { 0x932F, 0xF3B9 }, { 0x9348, 0xE7CC }, { 0x934A, 0xD6A8 },
+	{ 0x934B, 0xCEA7 }, { 0x934D, 0xD4B5 }, { 0x9354, 0xE4C8 }, { 0x935B, 0xD3B4 }, { 0x936E, 0xEBB9 }, { 0x9375, 0xCBF5 }, { 0x937C, 0xF6DD }, { 0x937E, 0xF1A3 },
+	{ 0x938C, 0xCCC7 }, { 0x9394, 0xE9CA }, { 0x9396, 0xE1F0 }, { 0x939A, 0xF5E0 }, { 0x93A3, 0xFBAF }, { 0x93A7, 0xCBD1 }, { 0x93AC, 0xFBE0 }, { 0x93AD, 0xF2E5 },
+	{ 0x93B0, 0xECF0 }, { 0x93C3, 0xF0EC }, { 0x93D1, 0xEEEB }, { 0x93DE, 0xE9CB }, { 0x93E1, 0xCCF0 }, { 0x93E4, 0xD7AF }, { 0x93F6, 0xF3A1 }, { 0x9404, 0xFCF5 },
+	{ 0x9418, 0xF1A4 }, { 0x9425, 0xE0D6 }, { 0x942B, 0xEFB2 }, { 0x9435, 0xF4D1 }, { 0x9438, 0xF7A1 }, { 0x9444, 0xF1D1 }, { 0x9451, 0xCAFC }, { 0x9452, 0xCAFD },
+	{ 0x945B, 0xCECE }, { 0x947D, 0xF3C8 }, { 0x947F, 0xF3BA }, { 0x9577, 0xEDFE }, { 0x9580, 0xDAA6 }, { 0x9583, 0xE0EC }, { 0x9589, 0xF8CD }, { 0x958B, 0xCBD2 },
+	{ 0x958F, 0xEBCE }, { 0x9591, 0xF9D8 }, { 0x9592, 0xF9D9 }, { 0x9593, 0xCAE0 }, { 0x9594, 0xDACA }, { 0x9598, 0xCBA6 }, { 0x95A3, 0xCAC8 }, { 0x95A4, 0xF9EE },
+	{ 0x95A5, 0xDBEC }, { 0x95A8, 0xD0B1 }, { 0x95AD, 0xD5EF }, { 0x95B1, 0xE6F3 }, { 0x95BB, 0xE7A2 }, { 0x95BC, 0xE4D9 }, { 0x95C7, 0xE4E1 }, { 0x95CA, 0xFCC4 },
+	{ 0x95D4, 0xF9EF }, { 0x95D5, 0xCFF4 }, { 0x95D6, 0xF7E6 }, { 0x95DC, 0xCEBC }, { 0x95E1, 0xF4C5 }, { 0x95E2, 0xDCA3 }, { 0x961C, 0xDDBD }, { 0x9621, 0xF4C6 },
+	{ 0x962A, 0xF8A1 }, { 0x962E, 0xE8D6 }, { 0x9632, 0xDBC1 }, { 0x963B, 0xF0E6 }, { 0x963F, 0xE4B9 }, { 0x9640, 0xF6ED }, { 0x9642, 0xF9AE }, { 0x9644, 0xDDBE },
+	{ 0x964B, 0xD7B0 }, { 0x964C, 0xD8E8 }, { 0x964D, 0xCBBD }, { 0x9650, 0xF9DA }, { 0x965B, 0xF8CE }, { 0x965C, 0xF9F0 }, { 0x965D, 0xE0ED }, { 0x965E, 0xE3B3 },
+	{ 0x965F, 0xF4B3 }, { 0x9662, 0xEAC2 }, { 0x9663, 0xF2E6 }, { 0x9664, 0xF0B6 }, { 0x966A, 0xDBD6 }, { 0x9670, 0xEBE4 }, { 0x9673, 0xF2E7 }, { 0x9675, 0xD7D5 },
+	{ 0x9676, 0xD4B6 }, { 0x9677, 0xF9E8 }, { 0x9678, 0xD7C1 }, { 0x967D, 0xE5D5 }, { 0x9685, 0xE9EA }, { 0x9686, 0xD7CC }, { 0x968A, 0xD3E9 }, { 0x968B, 0xE2C9 },
+	{ 0x968D, 0xFCDB }, { 0x968E, 0xCDAD }, { 0x9694, 0xCCB0 }, { 0x9695, 0xEAA2 }, { 0x9698, 0xE4F6 }, { 0x9699, 0xD0C0 }, { 0x969B, 0xF0B7 }, { 0x969C, 0xEEA1 },
+	{ 0x96A3, 0xD7F6 }, { 0x96A7, 0xE2CA }, { 0x96A8, 0xE2CB }, { 0x96AA, 0xFACF }, { 0x96B1, 0xEBDF }, { 0x96B7, 0xD6CB }, { 0x96BB, 0xF4B4 }, { 0x96C0, 0xEDCD },
+	{ 0x96C1, 0xE4D2 }, { 0x96C4, 0xEAA9 }, { 0x96C5, 0xE4BA }, { 0x96C6, 0xF3A2 }, { 0x96C7, 0xCDD2 }, { 0x96C9, 0xF6CB }, { 0x96CB, 0xF1E6 }, { 0x96CC, 0xEDC1 },
+	{ 0x96CD, 0xE8BC }, { 0x96CE, 0xEED1 }, { 0x96D5, 0xF0E7 }, { 0x96D6, 0xE2CC }, { 0x96D9, 0xE4AA }, { 0x96DB, 0xF5E1 }, { 0x96DC, 0xEDDA }, { 0x96E2, 0xD7EE },
+	{ 0x96E3, 0xD1F1 }, { 0x96E8, 0xE9EB }, { 0x96E9, 0xE9EC }, { 0x96EA, 0xE0E4 }, { 0x96EF, 0xDAA7 }, { 0x96F0, 0xDDD4 }, { 0x96F2, 0xEAA3 }, { 0x96F6, 0xD6C3 },
+	{ 0x96F7, 0xD6F4 }, { 0x96F9, 0xDADF }, { 0x96FB, 0xEFB3 }, { 0x9700, 0xE2CD }, { 0x9706, 0xEFFD }, { 0x9707, 0xF2E8 }, { 0x9711, 0xEFC5 }, { 0x9713, 0xE7E7 },
+	{ 0x9716, 0xD7FD }, { 0x9719, 0xE7CE }, { 0x971C, 0xDFDC }, { 0x971E, 0xF9C7 }, { 0x9727, 0xD9F6 }, { 0x9730, 0xDFAC }, { 0x9732, 0xD6DA }, { 0x9739, 0xDCA4 },
+	{ 0x973D, 0xF0B8 }, { 0x9742, 0xD5FA }, { 0x9744, 0xE4F7 }, { 0x9748, 0xD6C4 }, { 0x9751, 0xF4EC }, { 0x9756, 0xEFFE }, { 0x975C, 0xF0A1 }, { 0x975E, 0xDEAA },
+	{ 0x9761, 0xDABC }, { 0x9762, 0xD8FC }, { 0x9769, 0xFAD4 }, { 0x976D, 0xECE5 }, { 0x9774, 0xFCA8 }, { 0x9777, 0xECE6 }, { 0x977A, 0xD8CB }, { 0x978B, 0xFBB9 },
+	{ 0x978D, 0xE4D3 }, { 0x978F, 0xCDF9 }, { 0x97A0, 0xCFD3 }, { 0x97A8, 0xCAEA }, { 0x97AB, 0xCFD4 }, { 0x97AD, 0xF8BD }, { 0x97C6, 0xF4C7 }, { 0x97CB, 0xEADF },
+	{ 0x97D3, 0xF9DB }, { 0x97DC, 0xD4B7 }, { 0x97F3, 0xEBE5 }, { 0x97F6, 0xE1D2 }, { 0x97FB, 0xEAA4 }, { 0x97FF, 0xFAC2 }, { 0x9800, 0xFBE1 }, { 0x9801, 0xFAED },
+	{ 0x9802, 0xF0A2 }, { 0x9803, 0xCCF1 }, { 0x9805, 0xFAA3 }, { 0x9806, 0xE2F7 }, { 0x9808, 0xE2CE }, { 0x980A, 0xE9F5 }, { 0x980C, 0xE1EB }, { 0x9810, 0xE7E8 },
+	{ 0x9811, 0xE8D7 }, { 0x9812, 0xDAF8 }, { 0x9813, 0xD4CB }, { 0x9817, 0xF7F6 }, { 0x9818, 0xD6C5 }, { 0x982D, 0xD4E9 }, { 0x9830, 0xFAFA }, { 0x9838, 0xCCF2 },
+	{ 0x9839, 0xF7DD }, { 0x983B, 0xDEBA }, { 0x9846, 0xCEA8 }, { 0x984C, 0xF0B9 }, { 0x984D, 0xE4FE }, { 0x984E, 0xE4C9 }, { 0x9854, 0xE4D4 }, { 0x9858, 0xEAC3 },
+	{ 0x985A, 0xEFB4 }, { 0x985E, 0xD7BE }, { 0x9865, 0xFBE2 }, { 0x9867, 0xCDD3 }, { 0x986B, 0xEFB5 }, { 0x986F, 0xFAE9 }, { 0x98A8, 0xF9A6 }, { 0x98AF, 0xDFBD },
+	{ 0x98B1, 0xF7C7 }, { 0x98C4, 0xF8FD }, { 0x98C7, 0xF8FC }, { 0x98DB, 0xDEAB }, { 0x98DC, 0xDBE8 }, { 0x98DF, 0xE3DD }, { 0x98E1, 0xE1E2 }, { 0x98E2, 0xD1C6 },
+	{ 0x98ED, 0xF6D0 }, { 0x98EE, 0xEBE6 }, { 0x98EF, 0xDAF9 }, { 0x98F4, 0xECC7 }, { 0x98FC, 0xDEF8 }, { 0x98FD, 0xF8E9 }, { 0x98FE, 0xE3DE }, { 0x9903, 0xCEF5 },
+	{ 0x9909, 0xFAC3 }, { 0x990A, 0xE5D7 }, { 0x990C, 0xECC8 }, { 0x9910, 0xF3C9 }, { 0x9913, 0xE4BB }, { 0x9918, 0xE6AE }, { 0x991E, 0xEFB6 }, { 0x9920, 0xDCBF },
+	{ 0x9928, 0xCEBD }, { 0x9945, 0xD8C3 }, { 0x9949, 0xD0CF }, { 0x994B, 0xCFFA }, { 0x994C, 0xF3CA }, { 0x994D, 0xE0D7 }, { 0x9951, 0xD1C7 }, { 0x9952, 0xE9AE },
+	{ 0x9954, 0xE8BD }, { 0x9957, 0xFAC4 }, { 0x9996, 0xE2CF }, { 0x9999, 0xFAC5 }, { 0x999D, 0xF9B8 }, { 0x99A5, 0xDCE0 }, { 0x99A8, 0xFBB0 }, { 0x99AC, 0xD8A9 },
+	{ 0x99AD, 0xE5DF }, { 0x99AE, 0xF9A7 }, { 0x99B1, 0xF6EE }, { 0x99B3, 0xF6CC }, { 0x99B4, 0xE2F8 }, { 0x99B9, 0xECF1 }, { 0x99C1, 0xDAE0 }, { 0x99D0, 0xF1D2 },
+	{ 0x99D1, 0xD2CC }, { 0x99D2, 0xCFCB }, { 0x99D5, 0xCABD }, { 0x99D9, 0xDDBF }, { 0x99DD, 0xF6EF }, { 0x99DF, 0xDEF9 }, { 0x99ED, 0xFAB4 }, { 0x99F1, 0xD5AD },
+	{ 0x99FF, 0xF1E7 }, { 0x9A01, 0xDEBE }, { 0x9A08, 0xDCC0 }, { 0x9A0E, 0xD1C8 }, { 0x9A0F, 0xD1C9 }, { 0x9A19, 0xF8BE }, { 0x9A2B, 0xCBF6 }, { 0x9A30, 0xD4F9 },
+	{ 0x9A36, 0xF5E2 }, { 0x9A37, 0xE1D3 }, { 0x9A40, 0xD8E9 }, { 0x9A43, 0xF8FE }, { 0x9A45, 0xCFCC }, { 0x9A4D, 0xFDA4 }, { 0x9A55, 0xCEF6 }, { 0x9A57, 0xFAD0 },
+	{ 0x9A5A, 0xCCF3 }, { 0x9A5B, 0xE6BE }, { 0x9A5F, 0xF6AE }, { 0x9A62, 0xD5F0 }, { 0x9A65, 0xD1CA }, { 0x9A69, 0xFCBE }, { 0x9A6A, 0xD5F1 }, { 0x9AA8, 0xCDE9 },
+	{ 0x9AB8, 0xFAB5 }, { 0x9AD3, 0xE2D0 }, { 0x9AD4, 0xF4F7 }, { 0x9AD8, 0xCDD4 }, { 0x9AE5, 0xE7A3 }, { 0x9AEE, 0xDBA5 }, { 0x9B1A, 0xE2D1 }, { 0x9B27, 0xD7A2 },
+	{ 0x9B2A, 0xF7E3 }, { 0x9B31, 0xEAA6 }, { 0x9B3C, 0xD0A1 }, { 0x9B41, 0xCEDA }, { 0x9B42, 0xFBEB }, { 0x9B43, 0xDBA6 }, { 0x9B44, 0xDBDE }, { 0x9B45, 0xD8E5 },
+	{ 0x9B4F, 0xEAE0 }, { 0x9B54, 0xD8AA }, { 0x9B5A, 0xE5E0 }, { 0x9B6F, 0xD6DB }, { 0x9B8E, 0xEFC6 }, { 0x9B91, 0xF8EA }, { 0x9B9F, 0xE4D5 }, { 0x9BAB, 0xCEF7 },
+	{ 0x9BAE, 0xE0D8 }, { 0x9BC9, 0xD7EF }, { 0x9BD6, 0xF4ED }, { 0x9BE4, 0xCDE6 }, { 0x9BE8, 0xCCF4 }, { 0x9C0D, 0xF5E3 }, { 0x9C10, 0xE4CA }, { 0x9C12, 0xDCE1 },
+	{ 0x9C15, 0xF9C8 }, { 0x9C25, 0xFCBF }, { 0x9C32, 0xE8A7 }, { 0x9C3B, 0xD8C4 }, { 0x9C47, 0xCBBE }, { 0x9C49, 0xDCAE }, { 0x9C57, 0xD7F7 }, { 0x9CE5, 0xF0E8 },
+	{ 0x9CE7, 0xDDC0 }, { 0x9CE9, 0xCFCD }, { 0x9CF3, 0xDCF3 }, { 0x9CF4, 0xD9B0 }, { 0x9CF6, 0xE6E9 }, { 0x9D09, 0xE4BC }, { 0x9D1B, 0xEAC4 }, { 0x9D26, 0xE4EC },
+	{ 0x9D28, 0xE4E5 }, { 0x9D3B, 0xFBF8 }, { 0x9D51, 0xCCBB }, { 0x9D5D, 0xE4BD }, { 0x9D60, 0xCDDC }, { 0x9D61, 0xD9F7 }, { 0x9D6C, 0xDDDF }, { 0x9D72, 0xEDCE },
+	{ 0x9DA9, 0xD9D0 }, { 0x9DAF, 0xE5A3 }, { 0x9DB4, 0xF9CD }, { 0x9DC4, 0xCDAE }, { 0x9DD7, 0xCFCE }, { 0x9DF2, 0xF6AF }, { 0x9DF8, 0xFDD3 }, { 0x9DF9, 0xEBED },
+	{ 0x9DFA, 0xD6DC }, { 0x9E1A, 0xE5A4 }, { 0x9E1E, 0xD5B6 }, { 0x9E75, 0xD6DD }, { 0x9E79, 0xF9E9 }, { 0x9E7D, 0xE7A4 }, { 0x9E7F, 0xD6E3 }, { 0x9E92, 0xD1CB },
+	{ 0x9E93, 0xD6E4 }, { 0x9E97, 0xD5F2 }, { 0x9E9D, 0xDEFA }, { 0x9E9F, 0xD7F8 }, { 0x9EA5, 0xD8EA }, { 0x9EB4, 0xCFD5 }, { 0x9EB5, 0xD8FD }, { 0x9EBB, 0xD8AB },
+	{ 0x9EBE, 0xFDCB }, { 0x9EC3, 0xFCDC }, { 0x9ECD, 0xE0A8 }, { 0x9ECE, 0xD5F3 }, { 0x9ED1, 0xFDD9 }, { 0x9ED4, 0xCCA3 }, { 0x9ED8, 0xD9F9 }, { 0x9EDB, 0xD3EA },
+	{ 0x9EDC, 0xF5F5 }, { 0x9EDE, 0xEFC7 }, { 0x9EE8, 0xD3DA }, { 0x9EF4, 0xDABD }, { 0x9F07, 0xE8A8 }, { 0x9F08, 0xDCAF }, { 0x9F0E, 0xF0A3 }, { 0x9F13, 0xCDD5 },
+	{ 0x9F20, 0xE0A9 }, { 0x9F3B, 0xDEAC }, { 0x9F4A, 0xF0BA }, { 0x9F4B, 0xEEB1 }, { 0x9F4E, 0xEEB2 }, { 0x9F52, 0xF6CD }, { 0x9F5F, 0xEED2 }, { 0x9F61, 0xD6C6 },
+	{ 0x9F67, 0xE0E5 }, { 0x9F6A, 0xF3BB }, { 0x9F6C, 0xE5E1 }, { 0x9F77, 0xE4CB }, { 0x9F8D, 0xD7A3 }, { 0x9F90, 0xDBC2 }, { 0x9F95, 0xCAFE }, { 0x9F9C, 0xCFCF },
+	{ 0xAC00, 0xB0A1 }, { 0xAC01, 0xB0A2 }, { 0xAC04, 0xB0A3 }, { 0xAC07, 0xB0A4 }, { 0xAC08, 0xB0A5 }, { 0xAC09, 0xB0A6 }, { 0xAC0A, 0xB0A7 }, { 0xAC10, 0xB0A8 },
+	{ 0xAC11, 0xB0A9 }, { 0xAC12, 0xB0AA }, { 0xAC13, 0xB0AB }, { 0xAC14, 0xB0AC }, { 0xAC15, 0xB0AD }, { 0xAC16, 0xB0AE }, { 0xAC17, 0xB0AF }, { 0xAC19, 0xB0B0 },
+	{ 0xAC1A, 0xB0B1 }, { 0xAC1B, 0xB0B2 }, { 0xAC1C, 0xB0B3 }, { 0xAC1D, 0xB0B4 }, { 0xAC20, 0xB0B5 }, { 0xAC24, 0xB0B6 }, { 0xAC2C, 0xB0B7 }, { 0xAC2D, 0xB0B8 },
+	{ 0xAC2F, 0xB0B9 }, { 0xAC30, 0xB0BA }, { 0xAC31, 0xB0BB }, { 0xAC38, 0xB0BC }, { 0xAC39, 0xB0BD }, { 0xAC3C, 0xB0BE }, { 0xAC40, 0xB0BF }, { 0xAC4B, 0xB0C0 },
+	{ 0xAC4D, 0xB0C1 }, { 0xAC54, 0xB0C2 }, { 0xAC58, 0xB0C3 }, { 0xAC5C, 0xB0C4 }, { 0xAC70, 0xB0C5 }, { 0xAC71, 0xB0C6 }, { 0xAC74, 0xB0C7 }, { 0xAC77, 0xB0C8 },
+	{ 0xAC78, 0xB0C9 }, { 0xAC7A, 0xB0CA }, { 0xAC80, 0xB0CB }, { 0xAC81, 0xB0CC }, { 0xAC83, 0xB0CD }, { 0xAC84, 0xB0CE }, { 0xAC85, 0xB0CF }, { 0xAC86, 0xB0D0 },
+	{ 0xAC89, 0xB0D1 }, { 0xAC8A, 0xB0D2 }, { 0xAC8B, 0xB0D3 }, { 0xAC8C, 0xB0D4 }, { 0xAC90, 0xB0D5 }, { 0xAC94, 0xB0D6 }, { 0xAC9C, 0xB0D7 }, { 0xAC9D, 0xB0D8 },
+	{ 0xAC9F, 0xB0D9 }, { 0xACA0, 0xB0DA }, { 0xACA1, 0xB0DB }, { 0xACA8, 0xB0DC }, { 0xACA9, 0xB0DD }, { 0xACAA, 0xB0DE }, { 0xACAC, 0xB0DF }, { 0xACAF, 0xB0E0 },
+	{ 0xACB0, 0xB0E1 }, { 0xACB8, 0xB0E2 }, { 0xACB9, 0xB0E3 }, { 0xACBB, 0xB0E4 }, { 0xACBC, 0xB0E5 }, { 0xACBD, 0xB0E6 }, { 0xACC1, 0xB0E7 }, { 0xACC4, 0xB0E8 },
+	{ 0xACC8, 0xB0E9 }, { 0xACCC, 0xB0EA }, { 0xACD5, 0xB0EB }, { 0xACD7, 0xB0EC }, { 0xACE0, 0xB0ED }, { 0xACE1, 0xB0EE }, { 0xACE4, 0xB0EF }, { 0xACE7, 0xB0F0 },
+	{ 0xACE8, 0xB0F1 }, { 0xACEA, 0xB0F2 }, { 0xACEC, 0xB0F3 }, { 0xACEF, 0xB0F4 }, { 0xACF0, 0xB0F5 }, { 0xACF1, 0xB0F6 }, { 0xACF3, 0xB0F7 }, { 0xACF5, 0xB0F8 },
+	{ 0xACF6, 0xB0F9 }, { 0xACFC, 0xB0FA }, { 0xACFD, 0xB0FB }, { 0xAD00, 0xB0FC }, { 0xAD04, 0xB0FD }, { 0xAD06, 0xB0FE }, { 0xAD0C, 0xB1A1 }, { 0xAD0D, 0xB1A2 },
+	{ 0xAD0F, 0xB1A3 }, { 0xAD11, 0xB1A4 }, { 0xAD18, 0xB1A5 }, { 0xAD1C, 0xB1A6 }, { 0xAD20, 0xB1A7 }, { 0xAD29, 0xB1A8 }, { 0xAD2C, 0xB1A9 }, { 0xAD2D, 0xB1AA },
+	{ 0xAD34, 0xB1AB }, { 0xAD35, 0xB1AC }, { 0xAD38, 0xB1AD }, { 0xAD3C, 0xB1AE }, { 0xAD44, 0xB1AF }, { 0xAD45, 0xB1B0 }, { 0xAD47, 0xB1B1 }, { 0xAD49, 0xB1B2 },
+	{ 0xAD50, 0xB1B3 }, { 0xAD54, 0xB1B4 }, { 0xAD58, 0xB1B5 }, { 0xAD61, 0xB1B6 }, { 0xAD63, 0xB1B7 }, { 0xAD6C, 0xB1B8 }, { 0xAD6D, 0xB1B9 }, { 0xAD70, 0xB1BA },
+	{ 0xAD73, 0xB1BB }, { 0xAD74, 0xB1BC }, { 0xAD75, 0xB1BD }, { 0xAD76, 0xB1BE }, { 0xAD7B, 0xB1BF }, { 0xAD7C, 0xB1C0 }, { 0xAD7D, 0xB1C1 }, { 0xAD7F, 0xB1C2 },
+	{ 0xAD81, 0xB1C3 }, { 0xAD82, 0xB1C4 }, { 0xAD88, 0xB1C5 }, { 0xAD89, 0xB1C6 }, { 0xAD8C, 0xB1C7 }, { 0xAD90, 0xB1C8 }, { 0xAD9C, 0xB1C9 }, { 0xAD9D, 0xB1CA },
+	{ 0xADA4, 0xB1CB }, { 0xADB7, 0xB1CC }, { 0xADC0, 0xB1CD }, { 0xADC1, 0xB1CE }, { 0xADC4, 0xB1CF }, { 0xADC8, 0xB1D0 }, { 0xADD0, 0xB1D1 }, { 0xADD1, 0xB1D2 },
+	{ 0xADD3, 0xB1D3 }, { 0xADDC, 0xB1D4 }, { 0xADE0, 0xB1D5 }, { 0xADE4, 0xB1D6 }, { 0xADF8, 0xB1D7 }, { 0xADF9, 0xB1D8 }, { 0xADFC, 0xB1D9 }, { 0xADFF, 0xB1DA },
+	{ 0xAE00, 0xB1DB }, { 0xAE01, 0xB1DC }, { 0xAE08, 0xB1DD }, { 0xAE09, 0xB1DE }, { 0xAE0B, 0xB1DF }, { 0xAE0D, 0xB1E0 }, { 0xAE14, 0xB1E1 }, { 0xAE30, 0xB1E2 },
+	{ 0xAE31, 0xB1E3 }, { 0xAE34, 0xB1E4 }, { 0xAE37, 0xB1E5 }, { 0xAE38, 0xB1E6 }, { 0xAE3A, 0xB1E7 }, { 0xAE40, 0xB1E8 }, { 0xAE41, 0xB1E9 }, { 0xAE43, 0xB1EA },
+	{ 0xAE45, 0xB1EB }, { 0xAE46, 0xB1EC }, { 0xAE4A, 0xB1ED }, { 0xAE4C, 0xB1EE }, { 0xAE4D, 0xB1EF }, { 0xAE4E, 0xB1F0 }, { 0xAE50, 0xB1F1 }, { 0xAE54, 0xB1F2 },
+	{ 0xAE56, 0xB1F3 }, { 0xAE5C, 0xB1F4 }, { 0xAE5D, 0xB1F5 }, { 0xAE5F, 0xB1F6 }, { 0xAE60, 0xB1F7 }, { 0xAE61, 0xB1F8 }, { 0xAE65, 0xB1F9 }, { 0xAE68, 0xB1FA },
+	{ 0xAE69, 0xB1FB }, { 0xAE6C, 0xB1FC }, { 0xAE70, 0xB1FD }, { 0xAE78, 0xB1FE }, { 0xAE79, 0xB2A1 }, { 0xAE7B, 0xB2A2 }, { 0xAE7C, 0xB2A3 }, { 0xAE7D, 0xB2A4 },
+	{ 0xAE84, 0xB2A5 }, { 0xAE85, 0xB2A6 }, { 0xAE8C, 0xB2A7 }, { 0xAEBC, 0xB2A8 }, { 0xAEBD, 0xB2A9 }, { 0xAEBE, 0xB2AA }, { 0xAEC0, 0xB2AB }, { 0xAEC4, 0xB2AC },
+	{ 0xAECC, 0xB2AD }, { 0xAECD, 0xB2AE }, { 0xAECF, 0xB2AF }, { 0xAED0, 0xB2B0 }, { 0xAED1, 0xB2B1 }, { 0xAED8, 0xB2B2 }, { 0xAED9, 0xB2B3 }, { 0xAEDC, 0xB2B4 },
+	{ 0xAEE8, 0xB2B5 }, { 0xAEEB, 0xB2B6 }, { 0xAEED, 0xB2B7 }, { 0xAEF4, 0xB2B8 }, { 0xAEF8, 0xB2B9 }, { 0xAEFC, 0xB2BA }, { 0xAF07, 0xB2BB }, { 0xAF08, 0xB2BC },
+	{ 0xAF0D, 0xB2BD }, { 0xAF10, 0xB2BE }, { 0xAF2C, 0xB2BF }, { 0xAF2D, 0xB2C0 }, { 0xAF30, 0xB2C1 }, { 0xAF32, 0xB2C2 }, { 0xAF34, 0xB2C3 }, { 0xAF3C, 0xB2C4 },
+	{ 0xAF3D, 0xB2C5 }, { 0xAF3F, 0xB2C6 }, { 0xAF41, 0xB2C7 }, { 0xAF42, 0xB2C8 }, { 0xAF43, 0xB2C9 }, { 0xAF48, 0xB2CA }, { 0xAF49, 0xB2CB }, { 0xAF50, 0xB2CC },
+	{ 0xAF5C, 0xB2CD }, { 0xAF5D, 0xB2CE }, { 0xAF64, 0xB2CF }, { 0xAF65, 0xB2D0 }, { 0xAF79, 0xB2D1 }, { 0xAF80, 0xB2D2 }, { 0xAF84, 0xB2D3 }, { 0xAF88, 0xB2D4 },
+	{ 0xAF90, 0xB2D5 }, { 0xAF91, 0xB2D6 }, { 0xAF95, 0xB2D7 }, { 0xAF9C, 0xB2D8 }, { 0xAFB8, 0xB2D9 }, { 0xAFB9, 0xB2DA }, { 0xAFBC, 0xB2DB }, { 0xAFC0, 0xB2DC },
+	{ 0xAFC7, 0xB2DD }, { 0xAFC8, 0xB2DE }, { 0xAFC9, 0xB2DF }, { 0xAFCB, 0xB2E0 }, { 0xAFCD, 0xB2E1 }, { 0xAFCE, 0xB2E2 }, { 0xAFD4, 0xB2E3 }, { 0xAFDC, 0xB2E4 },
+	{ 0xAFE8, 0xB2E5 }, { 0xAFE9, 0xB2E6 }, { 0xAFF0, 0xB2E7 }, { 0xAFF1, 0xB2E8 }, { 0xAFF4, 0xB2E9 }, { 0xAFF8, 0xB2EA }, { 0xB000, 0xB2EB }, { 0xB001, 0xB2EC },
+	{ 0xB004, 0xB2ED }, { 0xB00C, 0xB2EE }, { 0xB010, 0xB2EF }, { 0xB014, 0xB2F0 }, { 0xB01C, 0xB2F1 }, { 0xB01D, 0xB2F2 }, { 0xB028, 0xB2F3 }, { 0xB044, 0xB2F4 },
+	{ 0xB045, 0xB2F5 }, { 0xB048, 0xB2F6 }, { 0xB04A, 0xB2F7 }, { 0xB04C, 0xB2F8 }, { 0xB04E, 0xB2F9 }, { 0xB053, 0xB2FA }, { 0xB054, 0xB2FB }, { 0xB055, 0xB2FC },
+	{ 0xB057, 0xB2FD }, { 0xB059, 0xB2FE }, { 0xB05D, 0xB3A1 }, { 0xB07C, 0xB3A2 }, { 0xB07D, 0xB3A3 }, { 0xB080, 0xB3A4 }, { 0xB084, 0xB3A5 }, { 0xB08C, 0xB3A6 },
+	{ 0xB08D, 0xB3A7 }, { 0xB08F, 0xB3A8 }, { 0xB091, 0xB3A9 }, { 0xB098, 0xB3AA }, { 0xB099, 0xB3AB }, { 0xB09A, 0xB3AC }, { 0xB09C, 0xB3AD }, { 0xB09F, 0xB3AE },
+	{ 0xB0A0, 0xB3AF }, { 0xB0A1, 0xB3B0 }, { 0xB0A2, 0xB3B1 }, { 0xB0A8, 0xB3B2 }, { 0xB0A9, 0xB3B3 }, { 0xB0AB, 0xB3B4 }, { 0xB0AC, 0xB3B5 }, { 0xB0AD, 0xB3B6 },
+	{ 0xB0AE, 0xB3B7 }, { 0xB0AF, 0xB3B8 }, { 0xB0B1, 0xB3B9 }, { 0xB0B3, 0xB3BA }, { 0xB0B4, 0xB3BB }, { 0xB0B5, 0xB3BC }, { 0xB0B8, 0xB3BD }, { 0xB0BC, 0xB3BE },
+	{ 0xB0C4, 0xB3BF }, { 0xB0C5, 0xB3C0 }, { 0xB0C7, 0xB3C1 }, { 0xB0C8, 0xB3C2 }, { 0xB0C9, 0xB3C3 }, { 0xB0D0, 0xB3C4 }, { 0xB0D1, 0xB3C5 }, { 0xB0D4, 0xB3C6 },
+	{ 0xB0D8, 0xB3C7 }, { 0xB0E0, 0xB3C8 }, { 0xB0E5, 0xB3C9 }, { 0xB108, 0xB3CA }, { 0xB109, 0xB3CB }, { 0xB10B, 0xB3CC }, { 0xB10C, 0xB3CD }, { 0xB110, 0xB3CE },
+	{ 0xB112, 0xB3CF }, { 0xB113, 0xB3D0 }, { 0xB118, 0xB3D1 }, { 0xB119, 0xB3D2 }, { 0xB11B, 0xB3D3 }, { 0xB11C, 0xB3D4 }, { 0xB11D, 0xB3D5 }, { 0xB123, 0xB3D6 },
+	{ 0xB124, 0xB3D7 }, { 0xB125, 0xB3D8 }, { 0xB128, 0xB3D9 }, { 0xB12C, 0xB3DA }, { 0xB134, 0xB3DB }, { 0xB135, 0xB3DC }, { 0xB137, 0xB3DD }, { 0xB138, 0xB3DE },
+	{ 0xB139, 0xB3DF }, { 0xB140, 0xB3E0 }, { 0xB141, 0xB3E1 }, { 0xB144, 0xB3E2 }, { 0xB148, 0xB3E3 }, { 0xB150, 0xB3E4 }, { 0xB151, 0xB3E5 }, { 0xB154, 0xB3E6 },
+	{ 0xB155, 0xB3E7 }, { 0xB158, 0xB3E8 }, { 0xB15C, 0xB3E9 }, { 0xB160, 0xB3EA }, { 0xB178, 0xB3EB }, { 0xB179, 0xB3EC }, { 0xB17C, 0xB3ED }, { 0xB180, 0xB3EE },
+	{ 0xB182, 0xB3EF }, { 0xB188, 0xB3F0 }, { 0xB189, 0xB3F1 }, { 0xB18B, 0xB3F2 }, { 0xB18D, 0xB3F3 }, { 0xB192, 0xB3F4 }, { 0xB193, 0xB3F5 }, { 0xB194, 0xB3F6 },
+	{ 0xB198, 0xB3F7 }, { 0xB19C, 0xB3F8 }, { 0xB1A8, 0xB3F9 }, { 0xB1CC, 0xB3FA }, { 0xB1D0, 0xB3FB }, { 0xB1D4, 0xB3FC }, { 0xB1DC, 0xB3FD }, { 0xB1DD, 0xB3FE },
+	{ 0xB1DF, 0xB4A1 }, { 0xB1E8, 0xB4A2 }, { 0xB1E9, 0xB4A3 }, { 0xB1EC, 0xB4A4 }, { 0xB1F0, 0xB4A5 }, { 0xB1F9, 0xB4A6 }, { 0xB1FB, 0xB4A7 }, { 0xB1FD, 0xB4A8 },
+	{ 0xB204, 0xB4A9 }, { 0xB205, 0xB4AA }, { 0xB208, 0xB4AB }, { 0xB20B, 0xB4AC }, { 0xB20C, 0xB4AD }, { 0xB214, 0xB4AE }, { 0xB215, 0xB4AF }, { 0xB217, 0xB4B0 },
+	{ 0xB219, 0xB4B1 }, { 0xB220, 0xB4B2 }, { 0xB234, 0xB4B3 }, { 0xB23C, 0xB4B4 }, { 0xB258, 0xB4B5 }, { 0xB25C, 0xB4B6 }, { 0xB260, 0xB4B7 }, { 0xB268, 0xB4B8 },
+	{ 0xB269, 0xB4B9 }, { 0xB274, 0xB4BA }, { 0xB275, 0xB4BB }, { 0xB27C, 0xB4BC }, { 0xB284, 0xB4BD }, { 0xB285, 0xB4BE }, { 0xB289, 0xB4BF }, { 0xB290, 0xB4C0 },
+	{ 0xB291, 0xB4C1 }, { 0xB294, 0xB4C2 }, { 0xB298, 0xB4C3 }, { 0xB299, 0xB4C4 }, { 0xB29A, 0xB4C5 }, { 0xB2A0, 0xB4C6 }, { 0xB2A1, 0xB4C7 }, { 0xB2A3, 0xB4C8 },
+	{ 0xB2A5, 0xB4C9 }, { 0xB2A6, 0xB4CA }, { 0xB2AA, 0xB4CB }, { 0xB2AC, 0xB4CC }, { 0xB2B0, 0xB4CD }, { 0xB2B4, 0xB4CE }, { 0xB2C8, 0xB4CF }, { 0xB2C9, 0xB4D0 },
+	{ 0xB2CC, 0xB4D1 }, { 0xB2D0, 0xB4D2 }, { 0xB2D2, 0xB4D3 }, { 0xB2D8, 0xB4D4 }, { 0xB2D9, 0xB4D5 }, { 0xB2DB, 0xB4D6 }, { 0xB2DD, 0xB4D7 }, { 0xB2E2, 0xB4D8 },
+	{ 0xB2E4, 0xB4D9 }, { 0xB2E5, 0xB4DA }, { 0xB2E6, 0xB4DB }, { 0xB2E8, 0xB4DC }, { 0xB2EB, 0xB4DD }, { 0xB2EC, 0xB4DE }, { 0xB2ED, 0xB4DF }, { 0xB2EE, 0xB4E0 },
+	{ 0xB2EF, 0xB4E1 }, { 0xB2F3, 0xB4E2 }, { 0xB2F4, 0xB4E3 }, { 0xB2F5, 0xB4E4 }, { 0xB2F7, 0xB4E5 }, { 0xB2F8, 0xB4E6 }, { 0xB2F9, 0xB4E7 }, { 0xB2FA, 0xB4E8 },
+	{ 0xB2FB, 0xB4E9 }, { 0xB2FF, 0xB4EA }, { 0xB300, 0xB4EB }, { 0xB301, 0xB4EC }, { 0xB304, 0xB4ED }, { 0xB308, 0xB4EE }, { 0xB310, 0xB4EF }, { 0xB311, 0xB4F0 },
+	{ 0xB313, 0xB4F1 }, { 0xB314, 0xB4F2 }, { 0xB315, 0xB4F3 }, { 0xB31C, 0xB4F4 }, { 0xB354, 0xB4F5 }, { 0xB355, 0xB4F6 }, { 0xB356, 0xB4F7 }, { 0xB358, 0xB4F8 },
+	{ 0xB35B, 0xB4F9 }, { 0xB35C, 0xB4FA }, { 0xB35E, 0xB4FB }, { 0xB35F, 0xB4FC }, { 0xB364, 0xB4FD }, { 0xB365, 0xB4FE }, { 0xB367, 0xB5A1 }, { 0xB369, 0xB5A2 },
+	{ 0xB36B, 0xB5A3 }, { 0xB36E, 0xB5A4 }, { 0xB370, 0xB5A5 }, { 0xB371, 0xB5A6 }, { 0xB374, 0xB5A7 }, { 0xB378, 0xB5A8 }, { 0xB380, 0xB5A9 }, { 0xB381, 0xB5AA },
+	{ 0xB383, 0xB5AB }, { 0xB384, 0xB5AC }, { 0xB385, 0xB5AD }, { 0xB38C, 0xB5AE }, { 0xB390, 0xB5AF }, { 0xB394, 0xB5B0 }, { 0xB3A0, 0xB5B1 }, { 0xB3A1, 0xB5B2 },
+	{ 0xB3A8, 0xB5B3 }, { 0xB3AC, 0xB5B4 }, { 0xB3C4, 0xB5B5 }, { 0xB3C5, 0xB5B6 }, { 0xB3C8, 0xB5B7 }, { 0xB3CB, 0xB5B8 }, { 0xB3CC, 0xB5B9 }, { 0xB3CE, 0xB5BA },
+	{ 0xB3D0, 0xB5BB }, { 0xB3D4, 0xB5BC }, { 0xB3D5, 0xB5BD }, { 0xB3D7, 0xB5BE }, { 0xB3D9, 0xB5BF }, { 0xB3DB, 0xB5C0 }, { 0xB3DD, 0xB5C1 }, { 0xB3E0, 0xB5C2 },
+	{ 0xB3E4, 0xB5C3 }, { 0xB3E8, 0xB5C4 }, { 0xB3FC, 0xB5C5 }, { 0xB410, 0xB5C6 }, { 0xB418, 0xB5C7 }, { 0xB41C, 0xB5C8 }, { 0xB420, 0xB5C9 }, { 0xB428, 0xB5CA },
+	{ 0xB429, 0xB5CB }, { 0xB42B, 0xB5CC }, { 0xB434, 0xB5CD }, { 0xB450, 0xB5CE }, { 0xB451, 0xB5CF }, { 0xB454, 0xB5D0 }, { 0xB458, 0xB5D1 }, { 0xB460, 0xB5D2 },
+	{ 0xB461, 0xB5D3 }, { 0xB463, 0xB5D4 }, { 0xB465, 0xB5D5 }, { 0xB46C, 0xB5D6 }, { 0xB480, 0xB5D7 }, { 0xB488, 0xB5D8 }, { 0xB49D, 0xB5D9 }, { 0xB4A4, 0xB5DA },
+	{ 0xB4A8, 0xB5DB }, { 0xB4AC, 0xB5DC }, { 0xB4B5, 0xB5DD }, { 0xB4B7, 0xB5DE }, { 0xB4B9, 0xB5DF }, { 0xB4C0, 0xB5E0 }, { 0xB4C4, 0xB5E1 }, { 0xB4C8, 0xB5E2 },
+	{ 0xB4D0, 0xB5E3 }, { 0xB4D5, 0xB5E4 }, { 0xB4DC, 0xB5E5 }, { 0xB4DD, 0xB5E6 }, { 0xB4E0, 0xB5E7 }, { 0xB4E3, 0xB5E8 }, { 0xB4E4, 0xB5E9 }, { 0xB4E6, 0xB5EA },
+	{ 0xB4EC, 0xB5EB }, { 0xB4ED, 0xB5EC }, { 0xB4EF, 0xB5ED }, { 0xB4F1, 0xB5EE }, { 0xB4F8, 0xB5EF }, { 0xB514, 0xB5F0 }, { 0xB515, 0xB5F1 }, { 0xB518, 0xB5F2 },
+	{ 0xB51B, 0xB5F3 }, { 0xB51C, 0xB5F4 }, { 0xB524, 0xB5F5 }, { 0xB525, 0xB5F6 }, { 0xB527, 0xB5F7 }, { 0xB528, 0xB5F8 }, { 0xB529, 0xB5F9 }, { 0xB52A, 0xB5FA },
+	{ 0xB530, 0xB5FB }, { 0xB531, 0xB5FC }, { 0xB534, 0xB5FD }, { 0xB538, 0xB5FE }, { 0xB540, 0xB6A1 }, { 0xB541, 0xB6A2 }, { 0xB543, 0xB6A3 }, { 0xB544, 0xB6A4 },
+	{ 0xB545, 0xB6A5 }, { 0xB54B, 0xB6A6 }, { 0xB54C, 0xB6A7 }, { 0xB54D, 0xB6A8 }, { 0xB550, 0xB6A9 }, { 0xB554, 0xB6AA }, { 0xB55C, 0xB6AB }, { 0xB55D, 0xB6AC },
+	{ 0xB55F, 0xB6AD }, { 0xB560, 0xB6AE }, { 0xB561, 0xB6AF }, { 0xB5A0, 0xB6B0 }, { 0xB5A1, 0xB6B1 }, { 0xB5A4, 0xB6B2 }, { 0xB5A8, 0xB6B3 }, { 0xB5AA, 0xB6B4 },
+	{ 0xB5AB, 0xB6B5 }, { 0xB5B0, 0xB6B6 }, { 0xB5B1, 0xB6B7 }, { 0xB5B3, 0xB6B8 }, { 0xB5B4, 0xB6B9 }, { 0xB5B5, 0xB6BA }, { 0xB5BB, 0xB6BB }, { 0xB5BC, 0xB6BC },
+	{ 0xB5BD, 0xB6BD }, { 0xB5C0, 0xB6BE }, { 0xB5C4, 0xB6BF }, { 0xB5CC, 0xB6C0 }, { 0xB5CD, 0xB6C1 }, { 0xB5CF, 0xB6C2 }, { 0xB5D0, 0xB6C3 }, { 0xB5D1, 0xB6C4 },
+	{ 0xB5D8, 0xB6C5 }, { 0xB5EC, 0xB6C6 }, { 0xB610, 0xB6C7 }, { 0xB611, 0xB6C8 }, { 0xB614, 0xB6C9 }, { 0xB618, 0xB6CA }, { 0xB625, 0xB6CB }, { 0xB62C, 0xB6CC },
+	{ 0xB634, 0xB6CD }, { 0xB648, 0xB6CE }, { 0xB664, 0xB6CF }, { 0xB668, 0xB6D0 }, { 0xB69C, 0xB6D1 }, { 0xB69D, 0xB6D2 }, { 0xB6A0, 0xB6D3 }, { 0xB6A4, 0xB6D4 },
+	{ 0xB6AB, 0xB6D5 }, { 0xB6AC, 0xB6D6 }, { 0xB6B1, 0xB6D7 }, { 0xB6D4, 0xB6D8 }, { 0xB6F0, 0xB6D9 }, { 0xB6F4, 0xB6DA }, { 0xB6F8, 0xB6DB }, { 0xB700, 0xB6DC },
+	{ 0xB701, 0xB6DD }, { 0xB705, 0xB6DE }, { 0xB728, 0xB6DF }, { 0xB729, 0xB6E0 }, { 0xB72C, 0xB6E1 }, { 0xB72F, 0xB6E2 }, { 0xB730, 0xB6E3 }, { 0xB738, 0xB6E4 },
+	{ 0xB739, 0xB6E5 }, { 0xB73B, 0xB6E6 }, { 0xB744, 0xB6E7 }, { 0xB748, 0xB6E8 }, { 0xB74C, 0xB6E9 }, { 0xB754, 0xB6EA }, { 0xB755, 0xB6EB }, { 0xB760, 0xB6EC },
+	{ 0xB764, 0xB6ED }, { 0xB768, 0xB6EE }, { 0xB770, 0xB6EF }, { 0xB771, 0xB6F0 }, { 0xB773, 0xB6F1 }, { 0xB775, 0xB6F2 }, { 0xB77C, 0xB6F3 }, { 0xB77D, 0xB6F4 },
+	{ 0xB780, 0xB6F5 }, { 0xB784, 0xB6F6 }, { 0xB78C, 0xB6F7 }, { 0xB78D, 0xB6F8 }, { 0xB78F, 0xB6F9 }, { 0xB790, 0xB6FA }, { 0xB791, 0xB6FB }, { 0xB792, 0xB6FC },
+	{ 0xB796, 0xB6FD }, { 0xB797, 0xB6FE }, { 0xB798, 0xB7A1 }, { 0xB799, 0xB7A2 }, { 0xB79C, 0xB7A3 }, { 0xB7A0, 0xB7A4 }, { 0xB7A8, 0xB7A5 }, { 0xB7A9, 0xB7A6 },
+	{ 0xB7AB, 0xB7A7 }, { 0xB7AC, 0xB7A8 }, { 0xB7AD, 0xB7A9 }, { 0xB7B4, 0xB7AA }, { 0xB7B5, 0xB7AB }, { 0xB7B8, 0xB7AC }, { 0xB7C7, 0xB7AD }, { 0xB7C9, 0xB7AE },
+	{ 0xB7EC, 0xB7AF }, { 0xB7ED, 0xB7B0 }, { 0xB7F0, 0xB7B1 }, { 0xB7F4, 0xB7B2 }, { 0xB7FC, 0xB7B3 }, { 0xB7FD, 0xB7B4 }, { 0xB7FF, 0xB7B5 }, { 0xB800, 0xB7B6 },
+	{ 0xB801, 0xB7B7 }, { 0xB807, 0xB7B8 }, { 0xB808, 0xB7B9 }, { 0xB809, 0xB7BA }, { 0xB80C, 0xB7BB }, { 0xB810, 0xB7BC }, { 0xB818, 0xB7BD }, { 0xB819, 0xB7BE },
+	{ 0xB81B, 0xB7BF }, { 0xB81D, 0xB7C0 }, { 0xB824, 0xB7C1 }, { 0xB825, 0xB7C2 }, { 0xB828, 0xB7C3 }, { 0xB82C, 0xB7C4 }, { 0xB834, 0xB7C5 }, { 0xB835, 0xB7C6 },
+	{ 0xB837, 0xB7C7 }, { 0xB838, 0xB7C8 }, { 0xB839, 0xB7C9 }, { 0xB840, 0xB7CA }, { 0xB844, 0xB7CB }, { 0xB851, 0xB7CC }, { 0xB853, 0xB7CD }, { 0xB85C, 0xB7CE },
+	{ 0xB85D, 0xB7CF }, { 0xB860, 0xB7D0 }, { 0xB864, 0xB7D1 }, { 0xB86C, 0xB7D2 }, { 0xB86D, 0xB7D3 }, { 0xB86F, 0xB7D4 }, { 0xB871, 0xB7D5 }, { 0xB878, 0xB7D6 },
+	{ 0xB87C, 0xB7D7 }, { 0xB88D, 0xB7D8 }, { 0xB8A8, 0xB7D9 }, { 0xB8B0, 0xB7DA }, { 0xB8B4, 0xB7DB }, { 0xB8B8, 0xB7DC }, { 0xB8C0, 0xB7DD }, { 0xB8C1, 0xB7DE },
+	{ 0xB8C3, 0xB7DF }, { 0xB8C5, 0xB7E0 }, { 0xB8CC, 0xB7E1 }, { 0xB8D0, 0xB7E2 }, { 0xB8D4, 0xB7E3 }, { 0xB8DD, 0xB7E4 }, { 0xB8DF, 0xB7E5 }, { 0xB8E1, 0xB7E6 },
+	{ 0xB8E8, 0xB7E7 }, { 0xB8E9, 0xB7E8 }, { 0xB8EC, 0xB7E9 }, { 0xB8F0, 0xB7EA }, { 0xB8F8, 0xB7EB }, { 0xB8F9, 0xB7EC }, { 0xB8FB, 0xB7ED }, { 0xB8FD, 0xB7EE },
+	{ 0xB904, 0xB7EF }, { 0xB918, 0xB7F0 }, { 0xB920, 0xB7F1 }, { 0xB93C, 0xB7F2 }, { 0xB93D, 0xB7F3 }, { 0xB940, 0xB7F4 }, { 0xB944, 0xB7F5 }, { 0xB94C, 0xB7F6 },
+	{ 0xB94F, 0xB7F7 }, { 0xB951, 0xB7F8 }, { 0xB958, 0xB7F9 }, { 0xB959, 0xB7FA }, { 0xB95C, 0xB7FB }, { 0xB960, 0xB7FC }, { 0xB968, 0xB7FD }, { 0xB969, 0xB7FE },
+	{ 0xB96B, 0xB8A1 }, { 0xB96D, 0xB8A2 }, { 0xB974, 0xB8A3 }, { 0xB975, 0xB8A4 }, { 0xB978, 0xB8A5 }, { 0xB97C, 0xB8A6 }, { 0xB984, 0xB8A7 }, { 0xB985, 0xB8A8 },
+	{ 0xB987, 0xB8A9 }, { 0xB989, 0xB8AA }, { 0xB98A, 0xB8AB }, { 0xB98D, 0xB8AC }, { 0xB98E, 0xB8AD }, { 0xB9AC, 0xB8AE }, { 0xB9AD, 0xB8AF }, { 0xB9B0, 0xB8B0 },
+	{ 0xB9B4, 0xB8B1 }, { 0xB9BC, 0xB8B2 }, { 0xB9BD, 0xB8B3 }, { 0xB9BF, 0xB8B4 }, { 0xB9C1, 0xB8B5 }, { 0xB9C8, 0xB8B6 }, { 0xB9C9, 0xB8B7 }, { 0xB9CC, 0xB8B8 },
+	{ 0xB9CE, 0xB8B9 }, { 0xB9CF, 0xB8BA }, { 0xB9D0, 0xB8BB }, { 0xB9D1, 0xB8BC }, { 0xB9D2, 0xB8BD }, { 0xB9D8, 0xB8BE }, { 0xB9D9, 0xB8BF }, { 0xB9DB, 0xB8C0 },
+	{ 0xB9DD, 0xB8C1 }, { 0xB9DE, 0xB8C2 }, { 0xB9E1, 0xB8C3 }, { 0xB9E3, 0xB8C4 }, { 0xB9E4, 0xB8C5 }, { 0xB9E5, 0xB8C6 }, { 0xB9E8, 0xB8C7 }, { 0xB9EC, 0xB8C8 },
+	{ 0xB9F4, 0xB8C9 }, { 0xB9F5, 0xB8CA }, { 0xB9F7, 0xB8CB }, { 0xB9F8, 0xB8CC }, { 0xB9F9, 0xB8CD }, { 0xB9FA, 0xB8CE }, { 0xBA00, 0xB8CF }, { 0xBA01, 0xB8D0 },
+	{ 0xBA08, 0xB8D1 }, { 0xBA15, 0xB8D2 }, { 0xBA38, 0xB8D3 }, { 0xBA39, 0xB8D4 }, { 0xBA3C, 0xB8D5 }, { 0xBA40, 0xB8D6 }, { 0xBA42, 0xB8D7 }, { 0xBA48, 0xB8D8 },
+	{ 0xBA49, 0xB8D9 }, { 0xBA4B, 0xB8DA }, { 0xBA4D, 0xB8DB }, { 0xBA4E, 0xB8DC }, { 0xBA53, 0xB8DD }, { 0xBA54, 0xB8DE }, { 0xBA55, 0xB8DF }, { 0xBA58, 0xB8E0 },
+	{ 0xBA5C, 0xB8E1 }, { 0xBA64, 0xB8E2 }, { 0xBA65, 0xB8E3 }, { 0xBA67, 0xB8E4 }, { 0xBA68, 0xB8E5 }, { 0xBA69, 0xB8E6 }, { 0xBA70, 0xB8E7 }, { 0xBA71, 0xB8E8 },
+	{ 0xBA74, 0xB8E9 }, { 0xBA78, 0xB8EA }, { 0xBA83, 0xB8EB }, { 0xBA84, 0xB8EC }, { 0xBA85, 0xB8ED }, { 0xBA87, 0xB8EE }, { 0xBA8C, 0xB8EF }, { 0xBAA8, 0xB8F0 },
+	{ 0xBAA9, 0xB8F1 }, { 0xBAAB, 0xB8F2 }, { 0xBAAC, 0xB8F3 }, { 0xBAB0, 0xB8F4 }, { 0xBAB2, 0xB8F5 }, { 0xBAB8, 0xB8F6 }, { 0xBAB9, 0xB8F7 }, { 0xBABB, 0xB8F8 },
+	{ 0xBABD, 0xB8F9 }, { 0xBAC4, 0xB8FA }, { 0xBAC8, 0xB8FB }, { 0xBAD8, 0xB8FC }, { 0xBAD9, 0xB8FD }, { 0xBAFC, 0xB8FE }, { 0xBB00, 0xB9A1 }, { 0xBB04, 0xB9A2 },
+	{ 0xBB0D, 0xB9A3 }, { 0xBB0F, 0xB9A4 }, { 0xBB11, 0xB9A5 }, { 0xBB18, 0xB9A6 }, { 0xBB1C, 0xB9A7 }, { 0xBB20, 0xB9A8 }, { 0xBB29, 0xB9A9 }, { 0xBB2B, 0xB9AA },
+	{ 0xBB34, 0xB9AB }, { 0xBB35, 0xB9AC }, { 0xBB36, 0xB9AD }, { 0xBB38, 0xB9AE }, { 0xBB3B, 0xB9AF }, { 0xBB3C, 0xB9B0 }, { 0xBB3D, 0xB9B1 }, { 0xBB3E, 0xB9B2 },
+	{ 0xBB44, 0xB9B3 }, { 0xBB45, 0xB9B4 }, { 0xBB47, 0xB9B5 }, { 0xBB49, 0xB9B6 }, { 0xBB4D, 0xB9B7 }, { 0xBB4F, 0xB9B8 }, { 0xBB50, 0xB9B9 }, { 0xBB54, 0xB9BA },
+	{ 0xBB58, 0xB9BB }, { 0xBB61, 0xB9BC }, { 0xBB63, 0xB9BD }, { 0xBB6C, 0xB9BE }, { 0xBB88, 0xB9BF }, { 0xBB8C, 0xB9C0 }, { 0xBB90, 0xB9C1 }, { 0xBBA4, 0xB9C2 },
+	{ 0xBBA8, 0xB9C3 }, { 0xBBAC, 0xB9C4 }, { 0xBBB4, 0xB9C5 }, { 0xBBB7, 0xB9C6 }, { 0xBBC0, 0xB9C7 }, { 0xBBC4, 0xB9C8 }, { 0xBBC8, 0xB9C9 }, { 0xBBD0, 0xB9CA },
+	{ 0xBBD3, 0xB9CB }, { 0xBBF8, 0xB9CC }, { 0xBBF9, 0xB9CD }, { 0xBBFC, 0xB9CE }, { 0xBBFF, 0xB9CF }, { 0xBC00, 0xB9D0 }, { 0xBC02, 0xB9D1 }, { 0xBC08, 0xB9D2 },
+	{ 0xBC09, 0xB9D3 }, { 0xBC0B, 0xB9D4 }, { 0xBC0C, 0xB9D5 }, { 0xBC0D, 0xB9D6 }, { 0xBC0F, 0xB9D7 }, { 0xBC11, 0xB9D8 }, { 0xBC14, 0xB9D9 }, { 0xBC15, 0xB9DA },
+	{ 0xBC16, 0xB9DB }, { 0xBC17, 0xB9DC }, { 0xBC18, 0xB9DD }, { 0xBC1B, 0xB9DE }, { 0xBC1C, 0xB9DF }, { 0xBC1D, 0xB9E0 }, { 0xBC1E, 0xB9E1 }, { 0xBC1F, 0xB9E2 },
+	{ 0xBC24, 0xB9E3 }, { 0xBC25, 0xB9E4 }, { 0xBC27, 0xB9E5 }, { 0xBC29, 0xB9E6 }, { 0xBC2D, 0xB9E7 }, { 0xBC30, 0xB9E8 }, { 0xBC31, 0xB9E9 }, { 0xBC34, 0xB9EA },
+	{ 0xBC38, 0xB9EB }, { 0xBC40, 0xB9EC }, { 0xBC41, 0xB9ED }, { 0xBC43, 0xB9EE }, { 0xBC44, 0xB9EF }, { 0xBC45, 0xB9F0 }, { 0xBC49, 0xB9F1 }, { 0xBC4C, 0xB9F2 },
+	{ 0xBC4D, 0xB9F3 }, { 0xBC50, 0xB9F4 }, { 0xBC5D, 0xB9F5 }, { 0xBC84, 0xB9F6 }, { 0xBC85, 0xB9F7 }, { 0xBC88, 0xB9F8 }, { 0xBC8B, 0xB9F9 }, { 0xBC8C, 0xB9FA },
+	{ 0xBC8E, 0xB9FB }, { 0xBC94, 0xB9FC }, { 0xBC95, 0xB9FD }, { 0xBC97, 0xB9FE }, { 0xBC99, 0xBAA1 }, { 0xBC9A, 0xBAA2 }, { 0xBCA0, 0xBAA3 }, { 0xBCA1, 0xBAA4 },
+	{ 0xBCA4, 0xBAA5 }, { 0xBCA7, 0xBAA6 }, { 0xBCA8, 0xBAA7 }, { 0xBCB0, 0xBAA8 }, { 0xBCB1, 0xBAA9 }, { 0xBCB3, 0xBAAA }, { 0xBCB4, 0xBAAB }, { 0xBCB5, 0xBAAC },
+	{ 0xBCBC, 0xBAAD }, { 0xBCBD, 0xBAAE }, { 0xBCC0, 0xBAAF }, { 0xBCC4, 0xBAB0 }, { 0xBCCD, 0xBAB1 }, { 0xBCCF, 0xBAB2 }, { 0xBCD0, 0xBAB3 }, { 0xBCD1, 0xBAB4 },
+	{ 0xBCD5, 0xBAB5 }, { 0xBCD8, 0xBAB6 }, { 0xBCDC, 0xBAB7 }, { 0xBCF4, 0xBAB8 }, { 0xBCF5, 0xBAB9 }, { 0xBCF6, 0xBABA }, { 0xBCF8, 0xBABB }, { 0xBCFC, 0xBABC },
+	{ 0xBD04, 0xBABD }, { 0xBD05, 0xBABE }, { 0xBD07, 0xBABF }, { 0xBD09, 0xBAC0 }, { 0xBD10, 0xBAC1 }, { 0xBD14, 0xBAC2 }, { 0xBD24, 0xBAC3 }, { 0xBD2C, 0xBAC4 },
+	{ 0xBD40, 0xBAC5 }, { 0xBD48, 0xBAC6 }, { 0xBD49, 0xBAC7 }, { 0xBD4C, 0xBAC8 }, { 0xBD50, 0xBAC9 }, { 0xBD58, 0xBACA }, { 0xBD59, 0xBACB }, { 0xBD64, 0xBACC },
+	{ 0xBD68, 0xBACD }, { 0xBD80, 0xBACE }, { 0xBD81, 0xBACF }, { 0xBD84, 0xBAD0 }, { 0xBD87, 0xBAD1 }, { 0xBD88, 0xBAD2 }, { 0xBD89, 0xBAD3 }, { 0xBD8A, 0xBAD4 },
+	{ 0xBD90, 0xBAD5 }, { 0xBD91, 0xBAD6 }, { 0xBD93, 0xBAD7 }, { 0xBD95, 0xBAD8 }, { 0xBD99, 0xBAD9 }, { 0xBD9A, 0xBADA }, { 0xBD9C, 0xBADB }, { 0xBDA4, 0xBADC },
+	{ 0xBDB0, 0xBADD }, { 0xBDB8, 0xBADE }, { 0xBDD4, 0xBADF }, { 0xBDD5, 0xBAE0 }, { 0xBDD8, 0xBAE1 }, { 0xBDDC, 0xBAE2 }, { 0xBDE9, 0xBAE3 }, { 0xBDF0, 0xBAE4 },
+	{ 0xBDF4, 0xBAE5 }, { 0xBDF8, 0xBAE6 }, { 0xBE00, 0xBAE7 }, { 0xBE03, 0xBAE8 }, { 0xBE05, 0xBAE9 }, { 0xBE0C, 0xBAEA }, { 0xBE0D, 0xBAEB }, { 0xBE10, 0xBAEC },
+	{ 0xBE14, 0xBAED }, { 0xBE1C, 0xBAEE }, { 0xBE1D, 0xBAEF }, { 0xBE1F, 0xBAF0 }, { 0xBE44, 0xBAF1 }, { 0xBE45, 0xBAF2 }, { 0xBE48, 0xBAF3 }, { 0xBE4C, 0xBAF4 },
+	{ 0xBE4E, 0xBAF5 }, { 0xBE54, 0xBAF6 }, { 0xBE55, 0xBAF7 }, { 0xBE57, 0xBAF8 }, { 0xBE59, 0xBAF9 }, { 0xBE5A, 0xBAFA }, { 0xBE5B, 0xBAFB }, { 0xBE60, 0xBAFC },
+	{ 0xBE61, 0xBAFD }, { 0xBE64, 0xBAFE }, { 0xBE68, 0xBBA1 }, { 0xBE6A, 0xBBA2 }, { 0xBE70, 0xBBA3 }, { 0xBE71, 0xBBA4 }, { 0xBE73, 0xBBA5 }, { 0xBE74, 0xBBA6 },
+	{ 0xBE75, 0xBBA7 }, { 0xBE7B, 0xBBA8 }, { 0xBE7C, 0xBBA9 }, { 0xBE7D, 0xBBAA }, { 0xBE80, 0xBBAB }, { 0xBE84, 0xBBAC }, { 0xBE8C, 0xBBAD }, { 0xBE8D, 0xBBAE },
+	{ 0xBE8F, 0xBBAF }, { 0xBE90, 0xBBB0 }, { 0xBE91, 0xBBB1 }, { 0xBE98, 0xBBB2 }, { 0xBE99, 0xBBB3 }, { 0xBEA8, 0xBBB4 }, { 0xBED0, 0xBBB5 }, { 0xBED1, 0xBBB6 },
+	{ 0xBED4, 0xBBB7 }, { 0xBED7, 0xBBB8 }, { 0xBED8, 0xBBB9 }, { 0xBEE0, 0xBBBA }, { 0xBEE3, 0xBBBB }, { 0xBEE4, 0xBBBC }, { 0xBEE5, 0xBBBD }, { 0xBEEC, 0xBBBE },
+	{ 0xBF01, 0xBBBF }, { 0xBF08, 0xBBC0 }, { 0xBF09, 0xBBC1 }, { 0xBF18, 0xBBC2 }, { 0xBF19, 0xBBC3 }, { 0xBF1B, 0xBBC4 }, { 0xBF1C, 0xBBC5 }, { 0xBF1D, 0xBBC6 },
+	{ 0xBF40, 0xBBC7 }, { 0xBF41, 0xBBC8 }, { 0xBF44, 0xBBC9 }, { 0xBF48, 0xBBCA }, { 0xBF50, 0xBBCB }, { 0xBF51, 0xBBCC }, { 0xBF55, 0xBBCD }, { 0xBF94, 0xBBCE },
+	{ 0xBFB0, 0xBBCF }, { 0xBFC5, 0xBBD0 }, { 0xBFCC, 0xBBD1 }, { 0xBFCD, 0xBBD2 }, { 0xBFD0, 0xBBD3 }, { 0xBFD4, 0xBBD4 }, { 0xBFDC, 0xBBD5 }, { 0xBFDF, 0xBBD6 },
+	{ 0xBFE1, 0xBBD7 }, { 0xC03C, 0xBBD8 }, { 0xC051, 0xBBD9 }, { 0xC058, 0xBBDA }, { 0xC05C, 0xBBDB }, { 0xC060, 0xBBDC }, { 0xC068, 0xBBDD }, { 0xC069, 0xBBDE },
+	{ 0xC090, 0xBBDF }, { 0xC091, 0xBBE0 }, { 0xC094, 0xBBE1 }, { 0xC098, 0xBBE2 }, { 0xC0A0, 0xBBE3 }, { 0xC0A1, 0xBBE4 }, { 0xC0A3, 0xBBE5 }, { 0xC0A5, 0xBBE6 },
+	{ 0xC0AC, 0xBBE7 }, { 0xC0AD, 0xBBE8 }, { 0xC0AF, 0xBBE9 }, { 0xC0B0, 0xBBEA }, { 0xC0B3, 0xBBEB }, { 0xC0B4, 0xBBEC }, { 0xC0B5, 0xBBED }, { 0xC0B6, 0xBBEE },
+	{ 0xC0BC, 0xBBEF }, { 0xC0BD, 0xBBF0 }, { 0xC0BF, 0xBBF1 }, { 0xC0C0, 0xBBF2 }, { 0xC0C1, 0xBBF3 }, { 0xC0C5, 0xBBF4 }, { 0xC0C8, 0xBBF5 }, { 0xC0C9, 0xBBF6 },
+	{ 0xC0CC, 0xBBF7 }, { 0xC0D0, 0xBBF8 }, { 0xC0D8, 0xBBF9 }, { 0xC0D9, 0xBBFA }, { 0xC0DB, 0xBBFB }, { 0xC0DC, 0xBBFC }, { 0xC0DD, 0xBBFD }, { 0xC0E4, 0xBBFE },
+	{ 0xC0E5, 0xBCA1 }, { 0xC0E8, 0xBCA2 }, { 0xC0EC, 0xBCA3 }, { 0xC0F4, 0xBCA4 }, { 0xC0F5, 0xBCA5 }, { 0xC0F7, 0xBCA6 }, { 0xC0F9, 0xBCA7 }, { 0xC100, 0xBCA8 },
+	{ 0xC104, 0xBCA9 }, { 0xC108, 0xBCAA }, { 0xC110, 0xBCAB }, { 0xC115, 0xBCAC }, { 0xC11C, 0xBCAD }, { 0xC11D, 0xBCAE }, { 0xC11E, 0xBCAF }, { 0xC11F, 0xBCB0 },
+	{ 0xC120, 0xBCB1 }, { 0xC123, 0xBCB2 }, { 0xC124, 0xBCB3 }, { 0xC126, 0xBCB4 }, { 0xC127, 0xBCB5 }, { 0xC12C, 0xBCB6 }, { 0xC12D, 0xBCB7 }, { 0xC12F, 0xBCB8 },
+	{ 0xC130, 0xBCB9 }, { 0xC131, 0xBCBA }, { 0xC136, 0xBCBB }, { 0xC138, 0xBCBC }, { 0xC139, 0xBCBD }, { 0xC13C, 0xBCBE }, { 0xC140, 0xBCBF }, { 0xC148, 0xBCC0 },
+	{ 0xC149, 0xBCC1 }, { 0xC14B, 0xBCC2 }, { 0xC14C, 0xBCC3 }, { 0xC14D, 0xBCC4 }, { 0xC154, 0xBCC5 }, { 0xC155, 0xBCC6 }, { 0xC158, 0xBCC7 }, { 0xC15C, 0xBCC8 },
+	{ 0xC164, 0xBCC9 }, { 0xC165, 0xBCCA }, { 0xC167, 0xBCCB }, { 0xC168, 0xBCCC }, { 0xC169, 0xBCCD }, { 0xC170, 0xBCCE }, { 0xC174, 0xBCCF }, { 0xC178, 0xBCD0 },
+	{ 0xC185, 0xBCD1 }, { 0xC18C, 0xBCD2 }, { 0xC18D, 0xBCD3 }, { 0xC18E, 0xBCD4 }, { 0xC190, 0xBCD5 }, { 0xC194, 0xBCD6 }, { 0xC196, 0xBCD7 }, { 0xC19C, 0xBCD8 },
+	{ 0xC19D, 0xBCD9 }, { 0xC19F, 0xBCDA }, { 0xC1A1, 0xBCDB }, { 0xC1A5, 0xBCDC }, { 0xC1A8, 0xBCDD }, { 0xC1A9, 0xBCDE }, { 0xC1AC, 0xBCDF }, { 0xC1B0, 0xBCE0 },
+	{ 0xC1BD, 0xBCE1 }, { 0xC1C4, 0xBCE2 }, { 0xC1C8, 0xBCE3 }, { 0xC1CC, 0xBCE4 }, { 0xC1D4, 0xBCE5 }, { 0xC1D7, 0xBCE6 }, { 0xC1D8, 0xBCE7 }, { 0xC1E0, 0xBCE8 },
+	{ 0xC1E4, 0xBCE9 }, { 0xC1E8, 0xBCEA }, { 0xC1F0, 0xBCEB }, { 0xC1F1, 0xBCEC }, { 0xC1F3, 0xBCED }, { 0xC1FC, 0xBCEE }, { 0xC1FD, 0xBCEF }, { 0xC200, 0xBCF0 },
+	{ 0xC204, 0xBCF1 }, { 0xC20C, 0xBCF2 }, { 0xC20D, 0xBCF3 }, { 0xC20F, 0xBCF4 }, { 0xC211, 0xBCF5 }, { 0xC218, 0xBCF6 }, { 0xC219, 0xBCF7 }, { 0xC21C, 0xBCF8 },
+	{ 0xC21F, 0xBCF9 }, { 0xC220, 0xBCFA }, { 0xC228, 0xBCFB }, { 0xC229, 0xBCFC }, { 0xC22B, 0xBCFD }, { 0xC22D, 0xBCFE }, { 0xC22F, 0xBDA1 }, { 0xC231, 0xBDA2 },
+	{ 0xC232, 0xBDA3 }, { 0xC234, 0xBDA4 }, { 0xC248, 0xBDA5 }, { 0xC250, 0xBDA6 }, { 0xC251, 0xBDA7 }, { 0xC254, 0xBDA8 }, { 0xC258, 0xBDA9 }, { 0xC260, 0xBDAA },
+	{ 0xC265, 0xBDAB }, { 0xC26C, 0xBDAC }, { 0xC26D, 0xBDAD }, { 0xC270, 0xBDAE }, { 0xC274, 0xBDAF }, { 0xC27C, 0xBDB0 }, { 0xC27D, 0xBDB1 }, { 0xC27F, 0xBDB2 },
+	{ 0xC281, 0xBDB3 }, { 0xC288, 0xBDB4 }, { 0xC289, 0xBDB5 }, { 0xC290, 0xBDB6 }, { 0xC298, 0xBDB7 }, { 0xC29B, 0xBDB8 }, { 0xC29D, 0xBDB9 }, { 0xC2A4, 0xBDBA },
+	{ 0xC2A5, 0xBDBB }, { 0xC2A8, 0xBDBC }, { 0xC2AC, 0xBDBD }, { 0xC2AD, 0xBDBE }, { 0xC2B4, 0xBDBF }, { 0xC2B5, 0xBDC0 }, { 0xC2B7, 0xBDC1 }, { 0xC2B9, 0xBDC2 },
+	{ 0xC2DC, 0xBDC3 }, { 0xC2DD, 0xBDC4 }, { 0xC2E0, 0xBDC5 }, { 0xC2E3, 0xBDC6 }, { 0xC2E4, 0xBDC7 }, { 0xC2EB, 0xBDC8 }, { 0xC2EC, 0xBDC9 }, { 0xC2ED, 0xBDCA },
+	{ 0xC2EF, 0xBDCB }, { 0xC2F1, 0xBDCC }, { 0xC2F6, 0xBDCD }, { 0xC2F8, 0xBDCE }, { 0xC2F9, 0xBDCF }, { 0xC2FB, 0xBDD0 }, { 0xC2FC, 0xBDD1 }, { 0xC300, 0xBDD2 },
+	{ 0xC308, 0xBDD3 }, { 0xC309, 0xBDD4 }, { 0xC30C, 0xBDD5 }, { 0xC30D, 0xBDD6 }, { 0xC313, 0xBDD7 }, { 0xC314, 0xBDD8 }, { 0xC315, 0xBDD9 }, { 0xC318, 0xBDDA },
+	{ 0xC31C, 0xBDDB }, { 0xC324, 0xBDDC }, { 0xC325, 0xBDDD }, { 0xC328, 0xBDDE }, { 0xC329, 0xBDDF }, { 0xC345, 0xBDE0 }, { 0xC368, 0xBDE1 }, { 0xC369, 0xBDE2 },
+	{ 0xC36C, 0xBDE3 }, { 0xC370, 0xBDE4 }, { 0xC372, 0xBDE5 }, { 0xC378, 0xBDE6 }, { 0xC379, 0xBDE7 }, { 0xC37C, 0xBDE8 }, { 0xC37D, 0xBDE9 }, { 0xC384, 0xBDEA },
+	{ 0xC388, 0xBDEB }, { 0xC38C, 0xBDEC }, { 0xC3C0, 0xBDED }, { 0xC3D8, 0xBDEE }, { 0xC3D9, 0xBDEF }, { 0xC3DC, 0xBDF0 }, { 0xC3DF, 0xBDF1 }, { 0xC3E0, 0xBDF2 },
+	{ 0xC3E2, 0xBDF3 }, { 0xC3E8, 0xBDF4 }, { 0xC3E9, 0xBDF5 }, { 0xC3ED, 0xBDF6 }, { 0xC3F4, 0xBDF7 }, { 0xC3F5, 0xBDF8 }, { 0xC3F8, 0xBDF9 }, { 0xC408, 0xBDFA },
+	{ 0xC410, 0xBDFB }, { 0xC424, 0xBDFC }, { 0xC42C, 0xBDFD }, { 0xC430, 0xBDFE }, { 0xC434, 0xBEA1 }, { 0xC43C, 0xBEA2 }, { 0xC43D, 0xBEA3 }, { 0xC448, 0xBEA4 },
+	{ 0xC464, 0xBEA5 }, { 0xC465, 0xBEA6 }, { 0xC468, 0xBEA7 }, { 0xC46C, 0xBEA8 }, { 0xC474, 0xBEA9 }, { 0xC475, 0xBEAA }, { 0xC479, 0xBEAB }, { 0xC480, 0xBEAC },
+	{ 0xC494, 0xBEAD }, { 0xC49C, 0xBEAE }, { 0xC4B8, 0xBEAF }, { 0xC4BC, 0xBEB0 }, { 0xC4E9, 0xBEB1 }, { 0xC4F0, 0xBEB2 }, { 0xC4F1, 0xBEB3 }, { 0xC4F4, 0xBEB4 },
+	{ 0xC4F8, 0xBEB5 }, { 0xC4FA, 0xBEB6 }, { 0xC4FF, 0xBEB7 }, { 0xC500, 0xBEB8 }, { 0xC501, 0xBEB9 }, { 0xC50C, 0xBEBA }, { 0xC510, 0xBEBB }, { 0xC514, 0xBEBC },
+	{ 0xC51C, 0xBEBD }, { 0xC528, 0xBEBE }, { 0xC529, 0xBEBF }, { 0xC52C, 0xBEC0 }, { 0xC530, 0xBEC1 }, { 0xC538, 0xBEC2 }, { 0xC539, 0xBEC3 }, { 0xC53B, 0xBEC4 },
+	{ 0xC53D, 0xBEC5 }, { 0xC544, 0xBEC6 }, { 0xC545, 0xBEC7 }, { 0xC548, 0xBEC8 }, { 0xC549, 0xBEC9 }, { 0xC54A, 0xBECA }, { 0xC54C, 0xBECB }, { 0xC54D, 0xBECC },
+	{ 0xC54E, 0xBECD }, { 0xC553, 0xBECE }, { 0xC554, 0xBECF }, { 0xC555, 0xBED0 }, { 0xC557, 0xBED1 }, { 0xC558, 0xBED2 }, { 0xC559, 0xBED3 }, { 0xC55D, 0xBED4 },
+	{ 0xC55E, 0xBED5 }, { 0xC560, 0xBED6 }, { 0xC561, 0xBED7 }, { 0xC564, 0xBED8 }, { 0xC568, 0xBED9 }, { 0xC570, 0xBEDA }, { 0xC571, 0xBEDB }, { 0xC573, 0xBEDC },
+	{ 0xC574, 0xBEDD }, { 0xC575, 0xBEDE }, { 0xC57C, 0xBEDF }, { 0xC57D, 0xBEE0 }, { 0xC580, 0xBEE1 }, { 0xC584, 0xBEE2 }, { 0xC587, 0xBEE3 }, { 0xC58C, 0xBEE4 },
+	{ 0xC58D, 0xBEE5 }, { 0xC58F, 0xBEE6 }, { 0xC591, 0xBEE7 }, { 0xC595, 0xBEE8 }, { 0xC597, 0xBEE9 }, { 0xC598, 0xBEEA }, { 0xC59C, 0xBEEB }, { 0xC5A0, 0xBEEC },
+	{ 0xC5A9, 0xBEED }, { 0xC5B4, 0xBEEE }, { 0xC5B5, 0xBEEF }, { 0xC5B8, 0xBEF0 }, { 0xC5B9, 0xBEF1 }, { 0xC5BB, 0xBEF2 }, { 0xC5BC, 0xBEF3 }, { 0xC5BD, 0xBEF4 },
+	{ 0xC5BE, 0xBEF5 }, { 0xC5C4, 0xBEF6 }, { 0xC5C5, 0xBEF7 }, { 0xC5C6, 0xBEF8 }, { 0xC5C7, 0xBEF9 }, { 0xC5C8, 0xBEFA }, { 0xC5C9, 0xBEFB }, { 0xC5CA, 0xBEFC },
+	{ 0xC5CC, 0xBEFD }, { 0xC5CE, 0xBEFE }, { 0xC5D0, 0xBFA1 }, { 0xC5D1, 0xBFA2 }, { 0xC5D4, 0xBFA3 }, { 0xC5D8, 0xBFA4 }, { 0xC5E0, 0xBFA5 }, { 0xC5E1, 0xBFA6 },
+	{ 0xC5E3, 0xBFA7 }, { 0xC5E5, 0xBFA8 }, { 0xC5EC, 0xBFA9 }, { 0xC5ED, 0xBFAA }, { 0xC5EE, 0xBFAB }, { 0xC5F0, 0xBFAC }, { 0xC5F4, 0xBFAD }, { 0xC5F6, 0xBFAE },
+	{ 0xC5F7, 0xBFAF }, { 0xC5FC, 0xBFB0 }, { 0xC5FD, 0xBFB1 }, { 0xC5FE, 0xBFB2 }, { 0xC5FF, 0xBFB3 }, { 0xC600, 0xBFB4 }, { 0xC601, 0xBFB5 }, { 0xC605, 0xBFB6 },
+	{ 0xC606, 0xBFB7 }, { 0xC607, 0xBFB8 }, { 0xC608, 0xBFB9 }, { 0xC60C, 0xBFBA }, { 0xC610, 0xBFBB }, { 0xC618, 0xBFBC }, { 0xC619, 0xBFBD }, { 0xC61B, 0xBFBE },
+	{ 0xC61C, 0xBFBF }, { 0xC624, 0xBFC0 }, { 0xC625, 0xBFC1 }, { 0xC628, 0xBFC2 }, { 0xC62C, 0xBFC3 }, { 0xC62D, 0xBFC4 }, { 0xC62E, 0xBFC5 }, { 0xC630, 0xBFC6 },
+	{ 0xC633, 0xBFC7 }, { 0xC634, 0xBFC8 }, { 0xC635, 0xBFC9 }, { 0xC637, 0xBFCA }, { 0xC639, 0xBFCB }, { 0xC63B, 0xBFCC }, { 0xC640, 0xBFCD }, { 0xC641, 0xBFCE },
+	{ 0xC644, 0xBFCF }, { 0xC648, 0xBFD0 }, { 0xC650, 0xBFD1 }, { 0xC651, 0xBFD2 }, { 0xC653, 0xBFD3 }, { 0xC654, 0xBFD4 }, { 0xC655, 0xBFD5 }, { 0xC65C, 0xBFD6 },
+	{ 0xC65D, 0xBFD7 }, { 0xC660, 0xBFD8 }, { 0xC66C, 0xBFD9 }, { 0xC66F, 0xBFDA }, { 0xC671, 0xBFDB }, { 0xC678, 0xBFDC }, { 0xC679, 0xBFDD }, { 0xC67C, 0xBFDE },
+	{ 0xC680, 0xBFDF }, { 0xC688, 0xBFE0 }, { 0xC689, 0xBFE1 }, { 0xC68B, 0xBFE2 }, { 0xC68D, 0xBFE3 }, { 0xC694, 0xBFE4 }, { 0xC695, 0xBFE5 }, { 0xC698, 0xBFE6 },
+	{ 0xC69C, 0xBFE7 }, { 0xC6A4, 0xBFE8 }, { 0xC6A5, 0xBFE9 }, { 0xC6A7, 0xBFEA }, { 0xC6A9, 0xBFEB }, { 0xC6B0, 0xBFEC }, { 0xC6B1, 0xBFED }, { 0xC6B4, 0xBFEE },
+	{ 0xC6B8, 0xBFEF }, { 0xC6B9, 0xBFF0 }, { 0xC6BA, 0xBFF1 }, { 0xC6C0, 0xBFF2 }, { 0xC6C1, 0xBFF3 }, { 0xC6C3, 0xBFF4 }, { 0xC6C5, 0xBFF5 }, { 0xC6CC, 0xBFF6 },
+	{ 0xC6CD, 0xBFF7 }, { 0xC6D0, 0xBFF8 }, { 0xC6D4, 0xBFF9 }, { 0xC6DC, 0xBFFA }, { 0xC6DD, 0xBFFB }, { 0xC6E0, 0xBFFC }, { 0xC6E1, 0xBFFD }, { 0xC6E8, 0xBFFE },
+	{ 0xC6E9, 0xC0A1 }, { 0xC6EC, 0xC0A2 }, { 0xC6F0, 0xC0A3 }, { 0xC6F8, 0xC0A4 }, { 0xC6F9, 0xC0A5 }, { 0xC6FD, 0xC0A6 }, { 0xC704, 0xC0A7 }, { 0xC705, 0xC0A8 },
+	{ 0xC708, 0xC0A9 }, { 0xC70C, 0xC0AA }, { 0xC714, 0xC0AB }, { 0xC715, 0xC0AC }, { 0xC717, 0xC0AD }, { 0xC719, 0xC0AE }, { 0xC720, 0xC0AF }, { 0xC721, 0xC0B0 },
+	{ 0xC724, 0xC0B1 }, { 0xC728, 0xC0B2 }, { 0xC730, 0xC0B3 }, { 0xC731, 0xC0B4 }, { 0xC733, 0xC0B5 }, { 0xC735, 0xC0B6 }, { 0xC737, 0xC0B7 }, { 0xC73C, 0xC0B8 },
+	{ 0xC73D, 0xC0B9 }, { 0xC740, 0xC0BA }, { 0xC744, 0xC0BB }, { 0xC74A, 0xC0BC }, { 0xC74C, 0xC0BD }, { 0xC74D, 0xC0BE }, { 0xC74F, 0xC0BF }, { 0xC751, 0xC0C0 },
+	{ 0xC752, 0xC0C1 }, { 0xC753, 0xC0C2 }, { 0xC754, 0xC0C3 }, { 0xC755, 0xC0C4 }, { 0xC756, 0xC0C5 }, { 0xC757, 0xC0C6 }, { 0xC758, 0xC0C7 }, { 0xC75C, 0xC0C8 },
+	{ 0xC760, 0xC0C9 }, { 0xC768, 0xC0CA }, { 0xC76B, 0xC0CB }, { 0xC774, 0xC0CC }, { 0xC775, 0xC0CD }, { 0xC778, 0xC0CE }, { 0xC77C, 0xC0CF }, { 0xC77D, 0xC0D0 },
+	{ 0xC77E, 0xC0D1 }, { 0xC783, 0xC0D2 }, { 0xC784, 0xC0D3 }, { 0xC785, 0xC0D4 }, { 0xC787, 0xC0D5 }, { 0xC788, 0xC0D6 }, { 0xC789, 0xC0D7 }, { 0xC78A, 0xC0D8 },
+	{ 0xC78E, 0xC0D9 }, { 0xC790, 0xC0DA }, { 0xC791, 0xC0DB }, { 0xC794, 0xC0DC }, { 0xC796, 0xC0DD }, { 0xC797, 0xC0DE }, { 0xC798, 0xC0DF }, { 0xC79A, 0xC0E0 },
+	{ 0xC7A0, 0xC0E1 }, { 0xC7A1, 0xC0E2 }, { 0xC7A3, 0xC0E3 }, { 0xC7A4, 0xC0E4 }, { 0xC7A5, 0xC0E5 }, { 0xC7A6, 0xC0E6 }, { 0xC7AC, 0xC0E7 }, { 0xC7AD, 0xC0E8 },
+	{ 0xC7B0, 0xC0E9 }, { 0xC7B4, 0xC0EA }, { 0xC7BC, 0xC0EB }, { 0xC7BD, 0xC0EC }, { 0xC7BF, 0xC0ED }, { 0xC7C0, 0xC0EE }, { 0xC7C1, 0xC0EF }, { 0xC7C8, 0xC0F0 },
+	{ 0xC7C9, 0xC0F1 }, { 0xC7CC, 0xC0F2 }, { 0xC7CE, 0xC0F3 }, { 0xC7D0, 0xC0F4 }, { 0xC7D8, 0xC0F5 }, { 0xC7DD, 0xC0F6 }, { 0xC7E4, 0xC0F7 }, { 0xC7E8, 0xC0F8 },
+	{ 0xC7EC, 0xC0F9 }, { 0xC800, 0xC0FA }, { 0xC801, 0xC0FB }, { 0xC804, 0xC0FC }, { 0xC808, 0xC0FD }, { 0xC80A, 0xC0FE }, { 0xC810, 0xC1A1 }, { 0xC811, 0xC1A2 },
+	{ 0xC813, 0xC1A3 }, { 0xC815, 0xC1A4 }, { 0xC816, 0xC1A5 }, { 0xC81C, 0xC1A6 }, { 0xC81D, 0xC1A7 }, { 0xC820, 0xC1A8 }, { 0xC824, 0xC1A9 }, { 0xC82C, 0xC1AA },
+	{ 0xC82D, 0xC1AB }, { 0xC82F, 0xC1AC }, { 0xC831, 0xC1AD }, { 0xC838, 0xC1AE }, { 0xC83C, 0xC1AF }, { 0xC840, 0xC1B0 }, { 0xC848, 0xC1B1 }, { 0xC849, 0xC1B2 },
+	{ 0xC84C, 0xC1B3 }, { 0xC84D, 0xC1B4 }, { 0xC854, 0xC1B5 }, { 0xC870, 0xC1B6 }, { 0xC871, 0xC1B7 }, { 0xC874, 0xC1B8 }, { 0xC878, 0xC1B9 }, { 0xC87A, 0xC1BA },
+	{ 0xC880, 0xC1BB }, { 0xC881, 0xC1BC }, { 0xC883, 0xC1BD }, { 0xC885, 0xC1BE }, { 0xC886, 0xC1BF }, { 0xC887, 0xC1C0 }, { 0xC88B, 0xC1C1 }, { 0xC88C, 0xC1C2 },
+	{ 0xC88D, 0xC1C3 }, { 0xC894, 0xC1C4 }, { 0xC89D, 0xC1C5 }, { 0xC89F, 0xC1C6 }, { 0xC8A1, 0xC1C7 }, { 0xC8A8, 0xC1C8 }, { 0xC8BC, 0xC1C9 }, { 0xC8BD, 0xC1CA },
+	{ 0xC8C4, 0xC1CB }, { 0xC8C8, 0xC1CC }, { 0xC8CC, 0xC1CD }, { 0xC8D4, 0xC1CE }, { 0xC8D5, 0xC1CF }, { 0xC8D7, 0xC1D0 }, { 0xC8D9, 0xC1D1 }, { 0xC8E0, 0xC1D2 },
+	{ 0xC8E1, 0xC1D3 }, { 0xC8E4, 0xC1D4 }, { 0xC8F5, 0xC1D5 }, { 0xC8FC, 0xC1D6 }, { 0xC8FD, 0xC1D7 }, { 0xC900, 0xC1D8 }, { 0xC904, 0xC1D9 }, { 0xC905, 0xC1DA },
+	{ 0xC906, 0xC1DB }, { 0xC90C, 0xC1DC }, { 0xC90D, 0xC1DD }, { 0xC90F, 0xC1DE }, { 0xC911, 0xC1DF }, { 0xC918, 0xC1E0 }, { 0xC92C, 0xC1E1 }, { 0xC934, 0xC1E2 },
+	{ 0xC950, 0xC1E3 }, { 0xC951, 0xC1E4 }, { 0xC954, 0xC1E5 }, { 0xC958, 0xC1E6 }, { 0xC960, 0xC1E7 }, { 0xC961, 0xC1E8 }, { 0xC963, 0xC1E9 }, { 0xC96C, 0xC1EA },
+	{ 0xC970, 0xC1EB }, { 0xC974, 0xC1EC }, { 0xC97C, 0xC1ED }, { 0xC988, 0xC1EE }, { 0xC989, 0xC1EF }, { 0xC98C, 0xC1F0 }, { 0xC990, 0xC1F1 }, { 0xC998, 0xC1F2 },
+	{ 0xC999, 0xC1F3 }, { 0xC99B, 0xC1F4 }, { 0xC99D, 0xC1F5 }, { 0xC9C0, 0xC1F6 }, { 0xC9C1, 0xC1F7 }, { 0xC9C4, 0xC1F8 }, { 0xC9C7, 0xC1F9 }, { 0xC9C8, 0xC1FA },
+	{ 0xC9CA, 0xC1FB }, { 0xC9D0, 0xC1FC }, { 0xC9D1, 0xC1FD }, { 0xC9D3, 0xC1FE }, { 0xC9D5, 0xC2A1 }, { 0xC9D6, 0xC2A2 }, { 0xC9D9, 0xC2A3 }, { 0xC9DA, 0xC2A4 },
+	{ 0xC9DC, 0xC2A5 }, { 0xC9DD, 0xC2A6 }, { 0xC9E0, 0xC2A7 }, { 0xC9E2, 0xC2A8 }, { 0xC9E4, 0xC2A9 }, { 0xC9E7, 0xC2AA }, { 0xC9EC, 0xC2AB }, { 0xC9ED, 0xC2AC },
+	{ 0xC9EF, 0xC2AD }, { 0xC9F0, 0xC2AE }, { 0xC9F1, 0xC2AF }, { 0xC9F8, 0xC2B0 }, { 0xC9F9, 0xC2B1 }, { 0xC9FC, 0xC2B2 }, { 0xCA00, 0xC2B3 }, { 0xCA08, 0xC2B4 },
+	{ 0xCA09, 0xC2B5 }, { 0xCA0B, 0xC2B6 }, { 0xCA0C, 0xC2B7 }, { 0xCA0D, 0xC2B8 }, { 0xCA14, 0xC2B9 }, { 0xCA18, 0xC2BA }, { 0xCA29, 0xC2BB }, { 0xCA4C, 0xC2BC },
+	{ 0xCA4D, 0xC2BD }, { 0xCA50, 0xC2BE }, { 0xCA54, 0xC2BF }, { 0xCA5C, 0xC2C0 }, { 0xCA5D, 0xC2C1 }, { 0xCA5F, 0xC2C2 }, { 0xCA60, 0xC2C3 }, { 0xCA61, 0xC2C4 },
+	{ 0xCA68, 0xC2C5 }, { 0xCA7D, 0xC2C6 }, { 0xCA84, 0xC2C7 }, { 0xCA98, 0xC2C8 }, { 0xCABC, 0xC2C9 }, { 0xCABD, 0xC2CA }, { 0xCAC0, 0xC2CB }, { 0xCAC4, 0xC2CC },
+	{ 0xCACC, 0xC2CD }, { 0xCACD, 0xC2CE }, { 0xCACF, 0xC2CF }, { 0xCAD1, 0xC2D0 }, { 0xCAD3, 0xC2D1 }, { 0xCAD8, 0xC2D2 }, { 0xCAD9, 0xC2D3 }, { 0xCAE0, 0xC2D4 },
+	{ 0xCAEC, 0xC2D5 }, { 0xCAF4, 0xC2D6 }, { 0xCB08, 0xC2D7 }, { 0xCB10, 0xC2D8 }, { 0xCB14, 0xC2D9 }, { 0xCB18, 0xC2DA }, { 0xCB20, 0xC2DB }, { 0xCB21, 0xC2DC },
+	{ 0xCB41, 0xC2DD }, { 0xCB48, 0xC2DE }, { 0xCB49, 0xC2DF }, { 0xCB4C, 0xC2E0 }, { 0xCB50, 0xC2E1 }, { 0xCB58, 0xC2E2 }, { 0xCB59, 0xC2E3 }, { 0xCB5D, 0xC2E4 },
+	{ 0xCB64, 0xC2E5 }, { 0xCB78, 0xC2E6 }, { 0xCB79, 0xC2E7 }, { 0xCB9C, 0xC2E8 }, { 0xCBB8, 0xC2E9 }, { 0xCBD4, 0xC2EA }, { 0xCBE4, 0xC2EB }, { 0xCBE7, 0xC2EC },
+	{ 0xCBE9, 0xC2ED }, { 0xCC0C, 0xC2EE }, { 0xCC0D, 0xC2EF }, { 0xCC10, 0xC2F0 }, { 0xCC14, 0xC2F1 }, { 0xCC1C, 0xC2F2 }, { 0xCC1D, 0xC2F3 }, { 0xCC21, 0xC2F4 },
+	{ 0xCC22, 0xC2F5 }, { 0xCC27, 0xC2F6 }, { 0xCC28, 0xC2F7 }, { 0xCC29, 0xC2F8 }, { 0xCC2C, 0xC2F9 }, { 0xCC2E, 0xC2FA }, { 0xCC30, 0xC2FB }, { 0xCC38, 0xC2FC },
+	{ 0xCC39, 0xC2FD }, { 0xCC3B, 0xC2FE }, { 0xCC3C, 0xC3A1 }, { 0xCC3D, 0xC3A2 }, { 0xCC3E, 0xC3A3 }, { 0xCC44, 0xC3A4 }, { 0xCC45, 0xC3A5 }, { 0xCC48, 0xC3A6 },
+	{ 0xCC4C, 0xC3A7 }, { 0xCC54, 0xC3A8 }, { 0xCC55, 0xC3A9 }, { 0xCC57, 0xC3AA }, { 0xCC58, 0xC3AB }, { 0xCC59, 0xC3AC }, { 0xCC60, 0xC3AD }, { 0xCC64, 0xC3AE },
+	{ 0xCC66, 0xC3AF }, { 0xCC68, 0xC3B0 }, { 0xCC70, 0xC3B1 }, { 0xCC75, 0xC3B2 }, { 0xCC98, 0xC3B3 }, { 0xCC99, 0xC3B4 }, { 0xCC9C, 0xC3B5 }, { 0xCCA0, 0xC3B6 },
+	{ 0xCCA8, 0xC3B7 }, { 0xCCA9, 0xC3B8 }, { 0xCCAB, 0xC3B9 }, { 0xCCAC, 0xC3BA }, { 0xCCAD, 0xC3BB }, { 0xCCB4, 0xC3BC }, { 0xCCB5, 0xC3BD }, { 0xCCB8, 0xC3BE },
+	{ 0xCCBC, 0xC3BF }, { 0xCCC4, 0xC3C0 }, { 0xCCC5, 0xC3C1 }, { 0xCCC7, 0xC3C2 }, { 0xCCC9, 0xC3C3 }, { 0xCCD0, 0xC3C4 }, { 0xCCD4, 0xC3C5 }, { 0xCCE4, 0xC3C6 },
+	{ 0xCCEC, 0xC3C7 }, { 0xCCF0, 0xC3C8 }, { 0xCD01, 0xC3C9 }, { 0xCD08, 0xC3CA }, { 0xCD09, 0xC3CB }, { 0xCD0C, 0xC3CC }, { 0xCD10, 0xC3CD }, { 0xCD18, 0xC3CE },
+	{ 0xCD19, 0xC3CF }, { 0xCD1B, 0xC3D0 }, { 0xCD1D, 0xC3D1 }, { 0xCD24, 0xC3D2 }, { 0xCD28, 0xC3D3 }, { 0xCD2C, 0xC3D4 }, { 0xCD39, 0xC3D5 }, { 0xCD5C, 0xC3D6 },
+	{ 0xCD60, 0xC3D7 }, { 0xCD64, 0xC3D8 }, { 0xCD6C, 0xC3D9 }, { 0xCD6D, 0xC3DA }, { 0xCD6F, 0xC3DB }, { 0xCD71, 0xC3DC }, { 0xCD78, 0xC3DD }, { 0xCD88, 0xC3DE },
+	{ 0xCD94, 0xC3DF }, { 0xCD95, 0xC3E0 }, { 0xCD98, 0xC3E1 }, { 0xCD9C, 0xC3E2 }, { 0xCDA4, 0xC3E3 }, { 0xCDA5, 0xC3E4 }, { 0xCDA7, 0xC3E5 }, { 0xCDA9, 0xC3E6 },
+	{ 0xCDB0, 0xC3E7 }, { 0xCDC4, 0xC3E8 }, { 0xCDCC, 0xC3E9 }, { 0xCDD0, 0xC3EA }, { 0xCDE8, 0xC3EB }, { 0xCDEC, 0xC3EC }, { 0xCDF0, 0xC3ED }, { 0xCDF8, 0xC3EE },
+	{ 0xCDF9, 0xC3EF }, { 0xCDFB, 0xC3F0 }, { 0xCDFD, 0xC3F1 }, { 0xCE04, 0xC3F2 }, { 0xCE08, 0xC3F3 }, { 0xCE0C, 0xC3F4 }, { 0xCE14, 0xC3F5 }, { 0xCE19, 0xC3F6 },
+	{ 0xCE20, 0xC3F7 }, { 0xCE21, 0xC3F8 }, { 0xCE24, 0xC3F9 }, { 0xCE28, 0xC3FA }, { 0xCE30, 0xC3FB }, { 0xCE31, 0xC3FC }, { 0xCE33, 0xC3FD }, { 0xCE35, 0xC3FE },
+	{ 0xCE58, 0xC4A1 }, { 0xCE59, 0xC4A2 }, { 0xCE5C, 0xC4A3 }, { 0xCE5F, 0xC4A4 }, { 0xCE60, 0xC4A5 }, { 0xCE61, 0xC4A6 }, { 0xCE68, 0xC4A7 }, { 0xCE69, 0xC4A8 },
+	{ 0xCE6B, 0xC4A9 }, { 0xCE6D, 0xC4AA }, { 0xCE74, 0xC4AB }, { 0xCE75, 0xC4AC }, { 0xCE78, 0xC4AD }, { 0xCE7C, 0xC4AE }, { 0xCE84, 0xC4AF }, { 0xCE85, 0xC4B0 },
+	{ 0xCE87, 0xC4B1 }, { 0xCE89, 0xC4B2 }, { 0xCE90, 0xC4B3 }, { 0xCE91, 0xC4B4 }, { 0xCE94, 0xC4B5 }, { 0xCE98, 0xC4B6 }, { 0xCEA0, 0xC4B7 }, { 0xCEA1, 0xC4B8 },
+	{ 0xCEA3, 0xC4B9 }, { 0xCEA4, 0xC4BA }, { 0xCEA5, 0xC4BB }, { 0xCEAC, 0xC4BC }, { 0xCEAD, 0xC4BD }, { 0xCEC1, 0xC4BE }, { 0xCEE4, 0xC4BF }, { 0xCEE5, 0xC4C0 },
+	{ 0xCEE8, 0xC4C1 }, { 0xCEEB, 0xC4C2 }, { 0xCEEC, 0xC4C3 }, { 0xCEF4, 0xC4C4 }, { 0xCEF5, 0xC4C5 }, { 0xCEF7, 0xC4C6 }, { 0xCEF8, 0xC4C7 }, { 0xCEF9, 0xC4C8 },
+	{ 0xCF00, 0xC4C9 }, { 0xCF01, 0xC4CA }, { 0xCF04, 0xC4CB }, { 0xCF08, 0xC4CC }, { 0xCF10, 0xC4CD }, { 0xCF11, 0xC4CE }, { 0xCF13, 0xC4CF }, { 0xCF15, 0xC4D0 },
+	{ 0xCF1C, 0xC4D1 }, { 0xCF20, 0xC4D2 }, { 0xCF24, 0xC4D3 }, { 0xCF2C, 0xC4D4 }, { 0xCF2D, 0xC4D5 }, { 0xCF2F, 0xC4D6 }, { 0xCF30, 0xC4D7 }, { 0xCF31, 0xC4D8 },
+	{ 0xCF38, 0xC4D9 }, { 0xCF54, 0xC4DA }, { 0xCF55, 0xC4DB }, { 0xCF58, 0xC4DC }, { 0xCF5C, 0xC4DD }, { 0xCF64, 0xC4DE }, { 0xCF65, 0xC4DF }, { 0xCF67, 0xC4E0 },
+	{ 0xCF69, 0xC4E1 }, { 0xCF70, 0xC4E2 }, { 0xCF71, 0xC4E3 }, { 0xCF74, 0xC4E4 }, { 0xCF78, 0xC4E5 }, { 0xCF80, 0xC4E6 }, { 0xCF85, 0xC4E7 }, { 0xCF8C, 0xC4E8 },
+	{ 0xCFA1, 0xC4E9 }, { 0xCFA8, 0xC4EA }, { 0xCFB0, 0xC4EB }, { 0xCFC4, 0xC4EC }, { 0xCFE0, 0xC4ED }, { 0xCFE1, 0xC4EE }, { 0xCFE4, 0xC4EF }, { 0xCFE8, 0xC4F0 },
+	{ 0xCFF0, 0xC4F1 }, { 0xCFF1, 0xC4F2 }, { 0xCFF3, 0xC4F3 }, { 0xCFF5, 0xC4F4 }, { 0xCFFC, 0xC4F5 }, { 0xD000, 0xC4F6 }, { 0xD004, 0xC4F7 }, { 0xD011, 0xC4F8 },
+	{ 0xD018, 0xC4F9 }, { 0xD02D, 0xC4FA }, { 0xD034, 0xC4FB }, { 0xD035, 0xC4FC }, { 0xD038, 0xC4FD }, { 0xD03C, 0xC4FE }, { 0xD044, 0xC5A1 }, { 0xD045, 0xC5A2 },
+	{ 0xD047, 0xC5A3 }, { 0xD049, 0xC5A4 }, { 0xD050, 0xC5A5 }, { 0xD054, 0xC5A6 }, { 0xD058, 0xC5A7 }, { 0xD060, 0xC5A8 }, { 0xD06C, 0xC5A9 }, { 0xD06D, 0xC5AA },
+	{ 0xD070, 0xC5AB }, { 0xD074, 0xC5AC }, { 0xD07C, 0xC5AD }, { 0xD07D, 0xC5AE }, { 0xD081, 0xC5AF }, { 0xD0A4, 0xC5B0 }, { 0xD0A5, 0xC5B1 }, { 0xD0A8, 0xC5B2 },
+	{ 0xD0AC, 0xC5B3 }, { 0xD0B4, 0xC5B4 }, { 0xD0B5, 0xC5B5 }, { 0xD0B7, 0xC5B6 }, { 0xD0B9, 0xC5B7 }, { 0xD0C0, 0xC5B8 }, { 0xD0C1, 0xC5B9 }, { 0xD0C4, 0xC5BA },
+	{ 0xD0C8, 0xC5BB }, { 0xD0C9, 0xC5BC }, { 0xD0D0, 0xC5BD }, { 0xD0D1, 0xC5BE }, { 0xD0D3, 0xC5BF }, { 0xD0D4, 0xC5C0 }, { 0xD0D5, 0xC5C1 }, { 0xD0DC, 0xC5C2 },
+	{ 0xD0DD, 0xC5C3 }, { 0xD0E0, 0xC5C4 }, { 0xD0E4, 0xC5C5 }, { 0xD0EC, 0xC5C6 }, { 0xD0ED, 0xC5C7 }, { 0xD0EF, 0xC5C8 }, { 0xD0F0, 0xC5C9 }, { 0xD0F1, 0xC5CA },
+	{ 0xD0F8, 0xC5CB }, { 0xD10D, 0xC5CC }, { 0xD130, 0xC5CD }, { 0xD131, 0xC5CE }, { 0xD134, 0xC5CF }, { 0xD138, 0xC5D0 }, { 0xD13A, 0xC5D1 }, { 0xD140, 0xC5D2 },
+	{ 0xD141, 0xC5D3 }, { 0xD143, 0xC5D4 }, { 0xD144, 0xC5D5 }, { 0xD145, 0xC5D6 }, { 0xD14C, 0xC5D7 }, { 0xD14D, 0xC5D8 }, { 0xD150, 0xC5D9 }, { 0xD154, 0xC5DA },
+	{ 0xD15C, 0xC5DB }, { 0xD15D, 0xC5DC }, { 0xD15F, 0xC5DD }, { 0xD161, 0xC5DE }, { 0xD168, 0xC5DF }, { 0xD16C, 0xC5E0 }, { 0xD17C, 0xC5E1 }, { 0xD184, 0xC5E2 },
+	{ 0xD188, 0xC5E3 }, { 0xD1A0, 0xC5E4 }, { 0xD1A1, 0xC5E5 }, { 0xD1A4, 0xC5E6 }, { 0xD1A8, 0xC5E7 }, { 0xD1B0, 0xC5E8 }, { 0xD1B1, 0xC5E9 }, { 0xD1B3, 0xC5EA },
+	{ 0xD1B5, 0xC5EB }, { 0xD1BA, 0xC5EC }, { 0xD1BC, 0xC5ED }, { 0xD1C0, 0xC5EE }, { 0xD1D8, 0xC5EF }, { 0xD1F4, 0xC5F0 }, { 0xD1F8, 0xC5F1 }, { 0xD207, 0xC5F2 },
+	{ 0xD209, 0xC5F3 }, { 0xD210, 0xC5F4 }, { 0xD22C, 0xC5F5 }, { 0xD22D, 0xC5F6 }, { 0xD230, 0xC5F7 }, { 0xD234, 0xC5F8 }, { 0xD23C, 0xC5F9 }, { 0xD23D, 0xC5FA },
+	{ 0xD23F, 0xC5FB }, { 0xD241, 0xC5FC }, { 0xD248, 0xC5FD }, { 0xD25C, 0xC5FE }, { 0xD264, 0xC6A1 }, { 0xD280, 0xC6A2 }, { 0xD281, 0xC6A3 }, { 0xD284, 0xC6A4 },
+	{ 0xD288, 0xC6A5 }, { 0xD290, 0xC6A6 }, { 0xD291, 0xC6A7 }, { 0xD295, 0xC6A8 }, { 0xD29C, 0xC6A9 }, { 0xD2A0, 0xC6AA }, { 0xD2A4, 0xC6AB }, { 0xD2AC, 0xC6AC },
+	{ 0xD2B1, 0xC6AD }, { 0xD2B8, 0xC6AE }, { 0xD2B9, 0xC6AF }, { 0xD2BC, 0xC6B0 }, { 0xD2BF, 0xC6B1 }, { 0xD2C0, 0xC6B2 }, { 0xD2C2, 0xC6B3 }, { 0xD2C8, 0xC6B4 },
+	{ 0xD2C9, 0xC6B5 }, { 0xD2CB, 0xC6B6 }, { 0xD2D4, 0xC6B7 }, { 0xD2D8, 0xC6B8 }, { 0xD2DC, 0xC6B9 }, { 0xD2E4, 0xC6BA }, { 0xD2E5, 0xC6BB }, { 0xD2F0, 0xC6BC },
+	{ 0xD2F1, 0xC6BD }, { 0xD2F4, 0xC6BE }, { 0xD2F8, 0xC6BF }, { 0xD300, 0xC6C0 }, { 0xD301, 0xC6C1 }, { 0xD303, 0xC6C2 }, { 0xD305, 0xC6C3 }, { 0xD30C, 0xC6C4 },
+	{ 0xD30D, 0xC6C5 }, { 0xD30E, 0xC6C6 }, { 0xD310, 0xC6C7 }, { 0xD314, 0xC6C8 }, { 0xD316, 0xC6C9 }, { 0xD31C, 0xC6CA }, { 0xD31D, 0xC6CB }, { 0xD31F, 0xC6CC },
+	{ 0xD320, 0xC6CD }, { 0xD321, 0xC6CE }, { 0xD325, 0xC6CF }, { 0xD328, 0xC6D0 }, { 0xD329, 0xC6D1 }, { 0xD32C, 0xC6D2 }, { 0xD330, 0xC6D3 }, { 0xD338, 0xC6D4 },
+	{ 0xD339, 0xC6D5 }, { 0xD33B, 0xC6D6 }, { 0xD33C, 0xC6D7 }, { 0xD33D, 0xC6D8 }, { 0xD344, 0xC6D9 }, { 0xD345, 0xC6DA }, { 0xD37C, 0xC6DB }, { 0xD37D, 0xC6DC },
+	{ 0xD380, 0xC6DD }, { 0xD384, 0xC6DE }, { 0xD38C, 0xC6DF }, { 0xD38D, 0xC6E0 }, { 0xD38F, 0xC6E1 }, { 0xD390, 0xC6E2 }, { 0xD391, 0xC6E3 }, { 0xD398, 0xC6E4 },
+	{ 0xD399, 0xC6E5 }, { 0xD39C, 0xC6E6 }, { 0xD3A0, 0xC6E7 }, { 0xD3A8, 0xC6E8 }, { 0xD3A9, 0xC6E9 }, { 0xD3AB, 0xC6EA }, { 0xD3AD, 0xC6EB }, { 0xD3B4, 0xC6EC },
+	{ 0xD3B8, 0xC6ED }, { 0xD3BC, 0xC6EE }, { 0xD3C4, 0xC6EF }, { 0xD3C5, 0xC6F0 }, { 0xD3C8, 0xC6F1 }, { 0xD3C9, 0xC6F2 }, { 0xD3D0, 0xC6F3 }, { 0xD3D8, 0xC6F4 },
+	{ 0xD3E1, 0xC6F5 }, { 0xD3E3, 0xC6F6 }, { 0xD3EC, 0xC6F7 }, { 0xD3ED, 0xC6F8 }, { 0xD3F0, 0xC6F9 }, { 0xD3F4, 0xC6FA }, { 0xD3FC, 0xC6FB }, { 0xD3FD, 0xC6FC },
+	{ 0xD3FF, 0xC6FD }, { 0xD401, 0xC6FE }, { 0xD408, 0xC7A1 }, { 0xD41D, 0xC7A2 }, { 0xD440, 0xC7A3 }, { 0xD444, 0xC7A4 }, { 0xD45C, 0xC7A5 }, { 0xD460, 0xC7A6 },
+	{ 0xD464, 0xC7A7 }, { 0xD46D, 0xC7A8 }, { 0xD46F, 0xC7A9 }, { 0xD478, 0xC7AA }, { 0xD479, 0xC7AB }, { 0xD47C, 0xC7AC }, { 0xD47F, 0xC7AD }, { 0xD480, 0xC7AE },
+	{ 0xD482, 0xC7AF }, { 0xD488, 0xC7B0 }, { 0xD489, 0xC7B1 }, { 0xD48B, 0xC7B2 }, { 0xD48D, 0xC7B3 }, { 0xD494, 0xC7B4 }, { 0xD4A9, 0xC7B5 }, { 0xD4CC, 0xC7B6 },
+	{ 0xD4D0, 0xC7B7 }, { 0xD4D4, 0xC7B8 }, { 0xD4DC, 0xC7B9 }, { 0xD4DF, 0xC7BA }, { 0xD4E8, 0xC7BB }, { 0xD4EC, 0xC7BC }, { 0xD4F0, 0xC7BD }, { 0xD4F8, 0xC7BE },
+	{ 0xD4FB, 0xC7BF }, { 0xD4FD, 0xC7C0 }, { 0xD504, 0xC7C1 }, { 0xD508, 0xC7C2 }, { 0xD50C, 0xC7C3 }, { 0xD514, 0xC7C4 }, { 0xD515, 0xC7C5 }, { 0xD517, 0xC7C6 },
+	{ 0xD53C, 0xC7C7 }, { 0xD53D, 0xC7C8 }, { 0xD540, 0xC7C9 }, { 0xD544, 0xC7CA }, { 0xD54C, 0xC7CB }, { 0xD54D, 0xC7CC }, { 0xD54F, 0xC7CD }, { 0xD551, 0xC7CE },
+	{ 0xD558, 0xC7CF }, { 0xD559, 0xC7D0 }, { 0xD55C, 0xC7D1 }, { 0xD560, 0xC7D2 }, { 0xD565, 0xC7D3 }, { 0xD568, 0xC7D4 }, { 0xD569, 0xC7D5 }, { 0xD56B, 0xC7D6 },
+	{ 0xD56D, 0xC7D7 }, { 0xD574, 0xC7D8 }, { 0xD575, 0xC7D9 }, { 0xD578, 0xC7DA }, { 0xD57C, 0xC7DB }, { 0xD584, 0xC7DC }, { 0xD585, 0xC7DD }, { 0xD587, 0xC7DE },
+	{ 0xD588, 0xC7DF }, { 0xD589, 0xC7E0 }, { 0xD590, 0xC7E1 }, { 0xD5A5, 0xC7E2 }, { 0xD5C8, 0xC7E3 }, { 0xD5C9, 0xC7E4 }, { 0xD5CC, 0xC7E5 }, { 0xD5D0, 0xC7E6 },
+	{ 0xD5D2, 0xC7E7 }, { 0xD5D8, 0xC7E8 }, { 0xD5D9, 0xC7E9 }, { 0xD5DB, 0xC7EA }, { 0xD5DD, 0xC7EB }, { 0xD5E4, 0xC7EC }, { 0xD5E5, 0xC7ED }, { 0xD5E8, 0xC7EE },
+	{ 0xD5EC, 0xC7EF }, { 0xD5F4, 0xC7F0 }, { 0xD5F5, 0xC7F1 }, { 0xD5F7, 0xC7F2 }, { 0xD5F9, 0xC7F3 }, { 0xD600, 0xC7F4 }, { 0xD601, 0xC7F5 }, { 0xD604, 0xC7F6 },
+	{ 0xD608, 0xC7F7 }, { 0xD610, 0xC7F8 }, { 0xD611, 0xC7F9 }, { 0xD613, 0xC7FA }, { 0xD614, 0xC7FB }, { 0xD615, 0xC7FC }, { 0xD61C, 0xC7FD }, { 0xD620, 0xC7FE },
+	{ 0xD624, 0xC8A1 }, { 0xD62D, 0xC8A2 }, { 0xD638, 0xC8A3 }, { 0xD639, 0xC8A4 }, { 0xD63C, 0xC8A5 }, { 0xD640, 0xC8A6 }, { 0xD645, 0xC8A7 }, { 0xD648, 0xC8A8 },
+	{ 0xD649, 0xC8A9 }, { 0xD64B, 0xC8AA }, { 0xD64D, 0xC8AB }, { 0xD651, 0xC8AC }, { 0xD654, 0xC8AD }, { 0xD655, 0xC8AE }, { 0xD658, 0xC8AF }, { 0xD65C, 0xC8B0 },
+	{ 0xD667, 0xC8B1 }, { 0xD669, 0xC8B2 }, { 0xD670, 0xC8B3 }, { 0xD671, 0xC8B4 }, { 0xD674, 0xC8B5 }, { 0xD683, 0xC8B6 }, { 0xD685, 0xC8B7 }, { 0xD68C, 0xC8B8 },
+	{ 0xD68D, 0xC8B9 }, { 0xD690, 0xC8BA }, { 0xD694, 0xC8BB }, { 0xD69D, 0xC8BC }, { 0xD69F, 0xC8BD }, { 0xD6A1, 0xC8BE }, { 0xD6A8, 0xC8BF }, { 0xD6AC, 0xC8C0 },
+	{ 0xD6B0, 0xC8C1 }, { 0xD6B9, 0xC8C2 }, { 0xD6BB, 0xC8C3 }, { 0xD6C4, 0xC8C4 }, { 0xD6C5, 0xC8C5 }, { 0xD6C8, 0xC8C6 }, { 0xD6CC, 0xC8C7 }, { 0xD6D1, 0xC8C8 },
+	{ 0xD6D4, 0xC8C9 }, { 0xD6D7, 0xC8CA }, { 0xD6D9, 0xC8CB }, { 0xD6E0, 0xC8CC }, { 0xD6E4, 0xC8CD }, { 0xD6E8, 0xC8CE }, { 0xD6F0, 0xC8CF }, { 0xD6F5, 0xC8D0 },
+	{ 0xD6FC, 0xC8D1 }, { 0xD6FD, 0xC8D2 }, { 0xD700, 0xC8D3 }, { 0xD704, 0xC8D4 }, { 0xD711, 0xC8D5 }, { 0xD718, 0xC8D6 }, { 0xD719, 0xC8D7 }, { 0xD71C, 0xC8D8 },
+	{ 0xD720, 0xC8D9 }, { 0xD728, 0xC8DA }, { 0xD729, 0xC8DB }, { 0xD72B, 0xC8DC }, { 0xD72D, 0xC8DD }, { 0xD734, 0xC8DE }, { 0xD735, 0xC8DF }, { 0xD738, 0xC8E0 },
+	{ 0xD73C, 0xC8E1 }, { 0xD744, 0xC8E2 }, { 0xD747, 0xC8E3 }, { 0xD749, 0xC8E4 }, { 0xD750, 0xC8E5 }, { 0xD751, 0xC8E6 }, { 0xD754, 0xC8E7 }, { 0xD756, 0xC8E8 },
+	{ 0xD757, 0xC8E9 }, { 0xD758, 0xC8EA }, { 0xD759, 0xC8EB }, { 0xD760, 0xC8EC }, { 0xD761, 0xC8ED }, { 0xD763, 0xC8EE }, { 0xD765, 0xC8EF }, { 0xD769, 0xC8F0 },
+	{ 0xD76C, 0xC8F1 }, { 0xD770, 0xC8F2 }, { 0xD774, 0xC8F3 }, { 0xD77C, 0xC8F4 }, { 0xD77D, 0xC8F5 }, { 0xD781, 0xC8F6 }, { 0xD788, 0xC8F7 }, { 0xD789, 0xC8F8 },
+	{ 0xD78C, 0xC8F9 }, { 0xD790, 0xC8FA }, { 0xD798, 0xC8FB }, { 0xD799, 0xC8FC }, { 0xD79B, 0xC8FD }, { 0xD79D, 0xC8FE }, { 0xF805, 0xA658 }, { 0xF806, 0xA663 },
+	{ 0xF807, 0xA69F }, { 0xF808, 0xA68F }, { 0xF809, 0xA681 }, { 0xF80A, 0xA674 }, { 0xF80B, 0xA696 }, { 0xF80C, 0xA69A }, { 0xF83D, 0xA642 }, { 0xF840, 0xA16E },
+	{ 0xF841, 0xA894 }, { 0xF842, 0xAC54 }, { 0xF843, 0xAC42 }, { 0xF844, 0xAC49 }, { 0xF845, 0xAC5F }, { 0xF846, 0xA867 }, { 0xF847, 0xA868 }, { 0xF848, 0xA89D },
+	{ 0xF849, 0xA89C }, { 0xF84A, 0xAC4B }, { 0xF84B, 0xAC4A }, { 0xF84C, 0xA747 }, { 0xF84D, 0xA74B }, { 0xF84E, 0xA74C }, { 0xF84F, 0xA74D }, { 0xF900, 0xCBD0 },
+	{ 0xF901, 0xCBD6 }, { 0xF902, 0xCBE7 }, { 0xF903, 0xCDCF }, { 0xF904, 0xCDE8 }, { 0xF905, 0xCEAD }, { 0xF906, 0xCFFB }, { 0xF907, 0xD0A2 }, { 0xF908, 0xD0B8 },
+	{ 0xF909, 0xD0D0 }, { 0xF90A, 0xD0DD }, { 0xF90B, 0xD1D4 }, { 0xF90C, 0xD1D5 }, { 0xF90D, 0xD1D8 }, { 0xF90E, 0xD1DB }, { 0xF90F, 0xD1DC }, { 0xF910, 0xD1DD },
+	{ 0xF911, 0xD1DE }, { 0xF912, 0xD1DF }, { 0xF913, 0xD1E0 }, { 0xF914, 0xD1E2 }, { 0xF915, 0xD1E3 }, { 0xF916, 0xD1E4 }, { 0xF917, 0xD1E5 }, { 0xF918, 0xD1E6 },
+	{ 0xF919, 0xD1E8 }, { 0xF91A, 0xD1E9 }, { 0xF91B, 0xD1EA }, { 0xF91C, 0xD1EB }, { 0xF91D, 0xD1ED }, { 0xF91E, 0xD1EF }, { 0xF91F, 0xD1F0 }, { 0xF920, 0xD1F2 },
+	{ 0xF921, 0xD1F6 }, { 0xF922, 0xD1FA }, { 0xF923, 0xD1FC }, { 0xF924, 0xD1FD }, { 0xF925, 0xD1FE }, { 0xF926, 0xD2A2 }, { 0xF927, 0xD2A3 }, { 0xF928, 0xD2A7 },
+	{ 0xF929, 0xD2A8 }, { 0xF92A, 0xD2A9 }, { 0xF92B, 0xD2AA }, { 0xF92C, 0xD2AB }, { 0xF92D, 0xD2AD }, { 0xF92E, 0xD2B2 }, { 0xF92F, 0xD2BE }, { 0xF930, 0xD2C2 },
+	{ 0xF931, 0xD2C3 }, { 0xF932, 0xD2C4 }, { 0xF933, 0xD2C6 }, { 0xF934, 0xD2C7 }, { 0xF935, 0xD2C8 }, { 0xF936, 0xD2C9 }, { 0xF937, 0xD2CA }, { 0xF938, 0xD2CB },
+	{ 0xF939, 0xD2CD }, { 0xF93A, 0xD2CE }, { 0xF93B, 0xD2CF }, { 0xF93C, 0xD2D0 }, { 0xF93D, 0xD2D1 }, { 0xF93E, 0xD2D2 }, { 0xF93F, 0xD2D3 }, { 0xF940, 0xD2D4 },
+	{ 0xF941, 0xD2D5 }, { 0xF942, 0xD2D6 }, { 0xF943, 0xD2D7 }, { 0xF944, 0xD2D9 }, { 0xF945, 0xD2DA }, { 0xF946, 0xD2DE }, { 0xF947, 0xD2DF }, { 0xF948, 0xD2E1 },
+	{ 0xF949, 0xD2E2 }, { 0xF94A, 0xD2E4 }, { 0xF94B, 0xD2E5 }, { 0xF94C, 0xD2E6 }, { 0xF94D, 0xD2E7 }, { 0xF94E, 0xD2E8 }, { 0xF94F, 0xD2E9 }, { 0xF950, 0xD2EA },
+	{ 0xF951, 0xD2EB }, { 0xF952, 0xD2F0 }, { 0xF953, 0xD2F1 }, { 0xF954, 0xD2F2 }, { 0xF955, 0xD2F3 }, { 0xF956, 0xD2F4 }, { 0xF957, 0xD2F5 }, { 0xF958, 0xD2F7 },
+	{ 0xF959, 0xD2F8 }, { 0xF95A, 0xD4E6 }, { 0xF95B, 0xD4FC }, { 0xF95C, 0xD5A5 }, { 0xF95D, 0xD5AB }, { 0xF95E, 0xD5AE }, { 0xF95F, 0xD6B8 }, { 0xF960, 0xD6CD },
+	{ 0xF961, 0xD7CB }, { 0xF962, 0xD7E4 }, { 0xF963, 0xDBC5 }, { 0xF964, 0xDBE4 }, { 0xF965, 0xDCA5 }, { 0xF966, 0xDDA5 }, { 0xF967, 0xDDD5 }, { 0xF968, 0xDDF4 },
+	{ 0xF969, 0xDEFC }, { 0xF96A, 0xDEFE }, { 0xF96B, 0xDFB3 }, { 0xF96C, 0xDFE1 }, { 0xF96D, 0xDFE8 }, { 0xF96E, 0xE0F1 }, { 0xF96F, 0xE1AD }, { 0xF970, 0xE1ED },
+	{ 0xF971, 0xE3F5 }, { 0xF972, 0xE4A1 }, { 0xF973, 0xE4A9 }, { 0xF974, 0xE5AE }, { 0xF975, 0xE5B1 }, { 0xF976, 0xE5B2 }, { 0xF977, 0xE5B9 }, { 0xF978, 0xE5BB },
+	{ 0xF979, 0xE5BC }, { 0xF97A, 0xE5C4 }, { 0xF97B, 0xE5CE }, { 0xF97C, 0xE5D0 }, { 0xF97D, 0xE5D2 }, { 0xF97E, 0xE5D6 }, { 0xF97F, 0xE5FA }, { 0xF980, 0xE5FB },
+	{ 0xF981, 0xE5FC }, { 0xF982, 0xE5FE }, { 0xF983, 0xE6A1 }, { 0xF984, 0xE6A4 }, { 0xF985, 0xE6A7 }, { 0xF986, 0xE6AD }, { 0xF987, 0xE6AF }, { 0xF988, 0xE6B0 },
+	{ 0xF989, 0xE6B1 }, { 0xF98A, 0xE6B3 }, { 0xF98B, 0xE6B7 }, { 0xF98C, 0xE6B8 }, { 0xF98D, 0xE6BC }, { 0xF98E, 0xE6C4 }, { 0xF98F, 0xE6C6 }, { 0xF990, 0xE6C7 },
+	{ 0xF991, 0xE6CA }, { 0xF992, 0xE6D2 }, { 0xF993, 0xE6D6 }, { 0xF994, 0xE6D9 }, { 0xF995, 0xE6DC }, { 0xF996, 0xE6DF }, { 0xF997, 0xE6E1 }, { 0xF998, 0xE6E4 },
+	{ 0xF999, 0xE6E5 }, { 0xF99A, 0xE6E6 }, { 0xF99B, 0xE6E8 }, { 0xF99C, 0xE6EA }, { 0xF99D, 0xE6EB }, { 0xF99E, 0xE6EC }, { 0xF99F, 0xE6EF }, { 0xF9A0, 0xE6F1 },
+	{ 0xF9A1, 0xE6F2 }, { 0xF9A2, 0xE6F5 }, { 0xF9A3, 0xE6F6 }, { 0xF9A4, 0xE6F7 }, { 0xF9A5, 0xE6F9 }, { 0xF9A6, 0xE7A1 }, { 0xF9A7, 0xE7A6 }, { 0xF9A8, 0xE7A9 },
+	{ 0xF9A9, 0xE7AA }, { 0xF9AA, 0xE7AC }, { 0xF9AB, 0xE7AD }, { 0xF9AC, 0xE7B0 }, { 0xF9AD, 0xE7BF }, { 0xF9AE, 0xE7C1 }, { 0xF9AF, 0xE7C6 }, { 0xF9B0, 0xE7C7 },
+	{ 0xF9B1, 0xE7CB }, { 0xF9B2, 0xE7CD }, { 0xF9B3, 0xE7CF }, { 0xF9B4, 0xE7D0 }, { 0xF9B5, 0xE7D3 }, { 0xF9B6, 0xE7DF }, { 0xF9B7, 0xE7E4 }, { 0xF9B8, 0xE7E6 },
+	{ 0xF9B9, 0xE7F7 }, { 0xF9BA, 0xE8E7 }, { 0xF9BB, 0xE8E8 }, { 0xF9BC, 0xE8F0 }, { 0xF9BD, 0xE8F1 }, { 0xF9BE, 0xE8F7 }, { 0xF9BF, 0xE8F9 }, { 0xF9C0, 0xE8FB },
+	{ 0xF9C1, 0xE8FE }, { 0xF9C2, 0xE9A7 }, { 0xF9C3, 0xE9AC }, { 0xF9C4, 0xE9CC }, { 0xF9C5, 0xE9F7 }, { 0xF9C6, 0xEAC1 }, { 0xF9C7, 0xEAE5 }, { 0xF9C8, 0xEAF4 },
+	{ 0xF9C9, 0xEAF7 }, { 0xF9CA, 0xEAFC }, { 0xF9CB, 0xEAFE }, { 0xF9CC, 0xEBA4 }, { 0xF9CD, 0xEBA7 }, { 0xF9CE, 0xEBA9 }, { 0xF9CF, 0xEBAA }, { 0xF9D0, 0xEBBA },
+	{ 0xF9D1, 0xEBBB }, { 0xF9D2, 0xEBBD }, { 0xF9D3, 0xEBC1 }, { 0xF9D4, 0xEBC2 }, { 0xF9D5, 0xEBC6 }, { 0xF9D6, 0xEBC7 }, { 0xF9D7, 0xEBCC }, { 0xF9D8, 0xEBCF },
+	{ 0xF9D9, 0xEBD0 }, { 0xF9DA, 0xEBD1 }, { 0xF9DB, 0xEBD2 }, { 0xF9DC, 0xEBD8 }, { 0xF9DD, 0xECA6 }, { 0xF9DE, 0xECA7 }, { 0xF9DF, 0xECAA }, { 0xF9E0, 0xECAF },
+	{ 0xF9E1, 0xECB0 }, { 0xF9E2, 0xECB1 }, { 0xF9E3, 0xECB2 }, { 0xF9E4, 0xECB5 }, { 0xF9E5, 0xECB8 }, { 0xF9E6, 0xECBA }, { 0xF9E7, 0xECC0 }, { 0xF9E8, 0xECC1 },
+	{ 0xF9E9, 0xECC5 }, { 0xF9EA, 0xECC6 }, { 0xF9EB, 0xECC9 }, { 0xF9EC, 0xECCA }, { 0xF9ED, 0xECD5 }, { 0xF9EE, 0xECDD }, { 0xF9EF, 0xECDE }, { 0xF9F0, 0xECE1 },
+	{ 0xF9F1, 0xECE4 }, { 0xF9F2, 0xECE7 }, { 0xF9F3, 0xECE8 }, { 0xF9F4, 0xECF7 }, { 0xF9F5, 0xECF8 }, { 0xF9F6, 0xECFA }, { 0xF9F7, 0xEDA1 }, { 0xF9F8, 0xEDA2 },
+	{ 0xF9F9, 0xEDA3 }, { 0xF9FA, 0xEDEE }, { 0xF9FB, 0xEEDB }, { 0xF9FC, 0xF2BD }, { 0xF9FD, 0xF2FA }, { 0xF9FE, 0xF3B1 }, { 0xF9FF, 0xF4A7 }, { 0xFA00, 0xF4EE },
+	{ 0xFA01, 0xF6F4 }, { 0xFA02, 0xF6F6 }, { 0xFA03, 0xF7B8 }, { 0xFA04, 0xF7C8 }, { 0xFA05, 0xF7D3 }, { 0xFA06, 0xF8DB }, { 0xFA07, 0xF8F0 }, { 0xFA08, 0xFAA1 },
+	{ 0xFA09, 0xFAA2 }, { 0xFA0A, 0xFAE6 }, { 0xFA0B, 0xFCA9 }, { 0xFE59, 0xA14D }, { 0xFE5A, 0xA14E }, { 0xFF01, 0xA3A1 }, { 0xFF02, 0xA3A2 }, { 0xFF03, 0xA3A3 },
+	{ 0xFF04, 0xA3A4 }, { 0xFF05, 0xA3A5 }, { 0xFF06, 0xA3A6 }, { 0xFF07, 0xA3A7 }, { 0xFF08, 0xA3A8 }, { 0xFF09, 0xA3A9 }, { 0xFF0A, 0xA3AA }, { 0xFF0B, 0xA3AB },
+	{ 0xFF0C, 0xA3AC }, { 0xFF0D, 0xA3AD }, { 0xFF0E, 0xA3AE }, { 0xFF0F, 0xA3AF }, { 0xFF10, 0xA3B0 }, { 0xFF11, 0xA3B1 }, { 0xFF12, 0xA3B2 }, { 0xFF13, 0xA3B3 },
+	{ 0xFF14, 0xA3B4 }, { 0xFF15, 0xA3B5 }, { 0xFF16, 0xA3B6 }, { 0xFF17, 0xA3B7 }, { 0xFF18, 0xA3B8 }, { 0xFF19, 0xA3B9 }, { 0xFF1A, 0xA3BA }, { 0xFF1B, 0xA3BB },
+	{ 0xFF1C, 0xA3BC }, { 0xFF1D, 0xA3BD }, { 0xFF1E, 0xA3BE }, { 0xFF1F, 0xA3BF }, { 0xFF20, 0xA3C0 }, { 0xFF21, 0xA3C1 }, { 0xFF22, 0xA3C2 }, { 0xFF23, 0xA3C3 },
+	{ 0xFF24, 0xA3C4 }, { 0xFF25, 0xA3C5 }, { 0xFF26, 0xA3C6 }, { 0xFF27, 0xA3C7 }, { 0xFF28, 0xA3C8 }, { 0xFF29, 0xA3C9 }, { 0xFF2A, 0xA3CA }, { 0xFF2B, 0xA3CB },
+	{ 0xFF2C, 0xA3CC }, { 0xFF2D, 0xA3CD }, { 0xFF2E, 0xA3CE }, { 0xFF2F, 0xA3CF }, { 0xFF30, 0xA3D0 }, { 0xFF31, 0xA3D1 }, { 0xFF32, 0xA3D2 }, { 0xFF33, 0xA3D3 },
+	{ 0xFF34, 0xA3D4 }, { 0xFF35, 0xA3D5 }, { 0xFF36, 0xA3D6 }, { 0xFF37, 0xA3D7 }, { 0xFF38, 0xA3D8 }, { 0xFF39, 0xA3D9 }, { 0xFF3A, 0xA3DA }, { 0xFF3B, 0xA3DB },
+	{ 0xFF3C, 0xA1AC }, { 0xFF3D, 0xA3DD }, { 0xFF3E, 0xA3DE }, { 0xFF3F, 0xA3DF }, { 0xFF40, 0xA3E0 }, { 0xFF41, 0xA3E1 }, { 0xFF42, 0xA3E2 }, { 0xFF43, 0xA3E3 },
+	{ 0xFF44, 0xA3E4 }, { 0xFF45, 0xA3E5 }, { 0xFF46, 0xA3E6 }, { 0xFF47, 0xA3E7 }, { 0xFF48, 0xA3E8 }, { 0xFF49, 0xA3E9 }, { 0xFF4A, 0xA3EA }, { 0xFF4B, 0xA3EB },
+	{ 0xFF4C, 0xA3EC }, { 0xFF4D, 0xA3ED }, { 0xFF4E, 0xA3EE }, { 0xFF4F, 0xA3EF }, { 0xFF50, 0xA3F0 }, { 0xFF51, 0xA3F1 }, { 0xFF52, 0xA3F2 }, { 0xFF53, 0xA3F3 },
+	{ 0xFF54, 0xA3F4 }, { 0xFF55, 0xA3F5 }, { 0xFF56, 0xA3F6 }, { 0xFF57, 0xA3F7 }, { 0xFF58, 0xA3F8 }, { 0xFF59, 0xA3F9 }, { 0xFF5A, 0xA3FA }, { 0xFF5B, 0xA3FB },
+	{ 0xFF5C, 0xA3FC }, { 0xFF5D, 0xA3FD }, { 0xFFE6, 0xA3DC },
 };
 
 
diff --git a/Encodings/src/MacRomanEncoding.cpp b/Encodings/src/MacRomanEncoding.cpp
index d5799c62e..5484833a1 100644
--- a/Encodings/src/MacRomanEncoding.cpp
+++ b/Encodings/src/MacRomanEncoding.cpp
@@ -25,24 +25,24 @@ const char* MacRomanEncoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap MacRomanEncoding::_charMap = 
+const TextEncoding::CharacterMap MacRomanEncoding::_charMap =
 {
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
-	0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, 
-	0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, 
-	0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8, 
-	0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8, 
-	0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, 
-	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, 0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0xFB01, 0xFB02, 
-	0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, 
-	0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1,
+	0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8,
+	0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC,
+	0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8,
+	0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8,
+	0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153,
+	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, 0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0xFB01, 0xFB02,
+	0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4,
+	0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7,
 };
 
 
@@ -52,34 +52,34 @@ const DoubleByteEncoding::Mapping MacRomanEncoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping MacRomanEncoding::_reverseMappingTable[] = {
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00CA }, 
-	{ 0x00A1, 0x00C1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A5, 0x00B4 }, { 0x00A7, 0x00A4 }, { 0x00A8, 0x00AC }, { 0x00A9, 0x00A9 }, { 0x00AA, 0x00BB }, 
-	{ 0x00AB, 0x00C7 }, { 0x00AC, 0x00C2 }, { 0x00AE, 0x00A8 }, { 0x00AF, 0x00F8 }, { 0x00B0, 0x00A1 }, { 0x00B1, 0x00B1 }, { 0x00B4, 0x00AB }, { 0x00B5, 0x00B5 }, 
-	{ 0x00B6, 0x00A6 }, { 0x00B7, 0x00E1 }, { 0x00B8, 0x00FC }, { 0x00BA, 0x00BC }, { 0x00BB, 0x00C8 }, { 0x00BF, 0x00C0 }, { 0x00C0, 0x00CB }, { 0x00C1, 0x00E7 }, 
-	{ 0x00C2, 0x00E5 }, { 0x00C3, 0x00CC }, { 0x00C4, 0x0080 }, { 0x00C5, 0x0081 }, { 0x00C6, 0x00AE }, { 0x00C7, 0x0082 }, { 0x00C8, 0x00E9 }, { 0x00C9, 0x0083 }, 
-	{ 0x00CA, 0x00E6 }, { 0x00CB, 0x00E8 }, { 0x00CC, 0x00ED }, { 0x00CD, 0x00EA }, { 0x00CE, 0x00EB }, { 0x00CF, 0x00EC }, { 0x00D1, 0x0084 }, { 0x00D2, 0x00F1 }, 
-	{ 0x00D3, 0x00EE }, { 0x00D4, 0x00EF }, { 0x00D5, 0x00CD }, { 0x00D6, 0x0085 }, { 0x00D8, 0x00AF }, { 0x00D9, 0x00F4 }, { 0x00DA, 0x00F2 }, { 0x00DB, 0x00F3 }, 
-	{ 0x00DC, 0x0086 }, { 0x00DF, 0x00A7 }, { 0x00E0, 0x0088 }, { 0x00E1, 0x0087 }, { 0x00E2, 0x0089 }, { 0x00E3, 0x008B }, { 0x00E4, 0x008A }, { 0x00E5, 0x008C }, 
-	{ 0x00E6, 0x00BE }, { 0x00E7, 0x008D }, { 0x00E8, 0x008F }, { 0x00E9, 0x008E }, { 0x00EA, 0x0090 }, { 0x00EB, 0x0091 }, { 0x00EC, 0x0093 }, { 0x00ED, 0x0092 }, 
-	{ 0x00EE, 0x0094 }, { 0x00EF, 0x0095 }, { 0x00F1, 0x0096 }, { 0x00F2, 0x0098 }, { 0x00F3, 0x0097 }, { 0x00F4, 0x0099 }, { 0x00F5, 0x009B }, { 0x00F6, 0x009A }, 
-	{ 0x00F7, 0x00D6 }, { 0x00F8, 0x00BF }, { 0x00F9, 0x009D }, { 0x00FA, 0x009C }, { 0x00FB, 0x009E }, { 0x00FC, 0x009F }, { 0x00FF, 0x00D8 }, { 0x0131, 0x00F5 }, 
-	{ 0x0152, 0x00CE }, { 0x0153, 0x00CF }, { 0x0178, 0x00D9 }, { 0x0192, 0x00C4 }, { 0x02C6, 0x00F6 }, { 0x02C7, 0x00FF }, { 0x02D8, 0x00F9 }, { 0x02D9, 0x00FA }, 
-	{ 0x02DA, 0x00FB }, { 0x02DB, 0x00FE }, { 0x02DC, 0x00F7 }, { 0x02DD, 0x00FD }, { 0x03A9, 0x00BD }, { 0x03C0, 0x00B9 }, { 0x2013, 0x00D0 }, { 0x2014, 0x00D1 }, 
-	{ 0x2018, 0x00D4 }, { 0x2019, 0x00D5 }, { 0x201A, 0x00E2 }, { 0x201C, 0x00D2 }, { 0x201D, 0x00D3 }, { 0x201E, 0x00E3 }, { 0x2020, 0x00A0 }, { 0x2021, 0x00E0 }, 
-	{ 0x2022, 0x00A5 }, { 0x2026, 0x00C9 }, { 0x2030, 0x00E4 }, { 0x2039, 0x00DC }, { 0x203A, 0x00DD }, { 0x2044, 0x00DA }, { 0x20AC, 0x00DB }, { 0x2122, 0x00AA }, 
-	{ 0x2202, 0x00B6 }, { 0x2206, 0x00C6 }, { 0x220F, 0x00B8 }, { 0x2211, 0x00B7 }, { 0x221A, 0x00C3 }, { 0x221E, 0x00B0 }, { 0x222B, 0x00BA }, { 0x2248, 0x00C5 }, 
-	{ 0x2260, 0x00AD }, { 0x2264, 0x00B2 }, { 0x2265, 0x00B3 }, { 0x25CA, 0x00D7 }, { 0xF8FF, 0x00F0 }, { 0xFB01, 0x00DE }, { 0xFB02, 0x00DF }, 
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00CA },
+	{ 0x00A1, 0x00C1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A5, 0x00B4 }, { 0x00A7, 0x00A4 }, { 0x00A8, 0x00AC }, { 0x00A9, 0x00A9 }, { 0x00AA, 0x00BB },
+	{ 0x00AB, 0x00C7 }, { 0x00AC, 0x00C2 }, { 0x00AE, 0x00A8 }, { 0x00AF, 0x00F8 }, { 0x00B0, 0x00A1 }, { 0x00B1, 0x00B1 }, { 0x00B4, 0x00AB }, { 0x00B5, 0x00B5 },
+	{ 0x00B6, 0x00A6 }, { 0x00B7, 0x00E1 }, { 0x00B8, 0x00FC }, { 0x00BA, 0x00BC }, { 0x00BB, 0x00C8 }, { 0x00BF, 0x00C0 }, { 0x00C0, 0x00CB }, { 0x00C1, 0x00E7 },
+	{ 0x00C2, 0x00E5 }, { 0x00C3, 0x00CC }, { 0x00C4, 0x0080 }, { 0x00C5, 0x0081 }, { 0x00C6, 0x00AE }, { 0x00C7, 0x0082 }, { 0x00C8, 0x00E9 }, { 0x00C9, 0x0083 },
+	{ 0x00CA, 0x00E6 }, { 0x00CB, 0x00E8 }, { 0x00CC, 0x00ED }, { 0x00CD, 0x00EA }, { 0x00CE, 0x00EB }, { 0x00CF, 0x00EC }, { 0x00D1, 0x0084 }, { 0x00D2, 0x00F1 },
+	{ 0x00D3, 0x00EE }, { 0x00D4, 0x00EF }, { 0x00D5, 0x00CD }, { 0x00D6, 0x0085 }, { 0x00D8, 0x00AF }, { 0x00D9, 0x00F4 }, { 0x00DA, 0x00F2 }, { 0x00DB, 0x00F3 },
+	{ 0x00DC, 0x0086 }, { 0x00DF, 0x00A7 }, { 0x00E0, 0x0088 }, { 0x00E1, 0x0087 }, { 0x00E2, 0x0089 }, { 0x00E3, 0x008B }, { 0x00E4, 0x008A }, { 0x00E5, 0x008C },
+	{ 0x00E6, 0x00BE }, { 0x00E7, 0x008D }, { 0x00E8, 0x008F }, { 0x00E9, 0x008E }, { 0x00EA, 0x0090 }, { 0x00EB, 0x0091 }, { 0x00EC, 0x0093 }, { 0x00ED, 0x0092 },
+	{ 0x00EE, 0x0094 }, { 0x00EF, 0x0095 }, { 0x00F1, 0x0096 }, { 0x00F2, 0x0098 }, { 0x00F3, 0x0097 }, { 0x00F4, 0x0099 }, { 0x00F5, 0x009B }, { 0x00F6, 0x009A },
+	{ 0x00F7, 0x00D6 }, { 0x00F8, 0x00BF }, { 0x00F9, 0x009D }, { 0x00FA, 0x009C }, { 0x00FB, 0x009E }, { 0x00FC, 0x009F }, { 0x00FF, 0x00D8 }, { 0x0131, 0x00F5 },
+	{ 0x0152, 0x00CE }, { 0x0153, 0x00CF }, { 0x0178, 0x00D9 }, { 0x0192, 0x00C4 }, { 0x02C6, 0x00F6 }, { 0x02C7, 0x00FF }, { 0x02D8, 0x00F9 }, { 0x02D9, 0x00FA },
+	{ 0x02DA, 0x00FB }, { 0x02DB, 0x00FE }, { 0x02DC, 0x00F7 }, { 0x02DD, 0x00FD }, { 0x03A9, 0x00BD }, { 0x03C0, 0x00B9 }, { 0x2013, 0x00D0 }, { 0x2014, 0x00D1 },
+	{ 0x2018, 0x00D4 }, { 0x2019, 0x00D5 }, { 0x201A, 0x00E2 }, { 0x201C, 0x00D2 }, { 0x201D, 0x00D3 }, { 0x201E, 0x00E3 }, { 0x2020, 0x00A0 }, { 0x2021, 0x00E0 },
+	{ 0x2022, 0x00A5 }, { 0x2026, 0x00C9 }, { 0x2030, 0x00E4 }, { 0x2039, 0x00DC }, { 0x203A, 0x00DD }, { 0x2044, 0x00DA }, { 0x20AC, 0x00DB }, { 0x2122, 0x00AA },
+	{ 0x2202, 0x00B6 }, { 0x2206, 0x00C6 }, { 0x220F, 0x00B8 }, { 0x2211, 0x00B7 }, { 0x221A, 0x00C3 }, { 0x221E, 0x00B0 }, { 0x222B, 0x00BA }, { 0x2248, 0x00C5 },
+	{ 0x2260, 0x00AD }, { 0x2264, 0x00B2 }, { 0x2265, 0x00B3 }, { 0x25CA, 0x00D7 }, { 0xF8FF, 0x00F0 }, { 0xFB01, 0x00DE }, { 0xFB02, 0x00DF },
 };
 
 
diff --git a/Encodings/src/Windows1253Encoding.cpp b/Encodings/src/Windows1253Encoding.cpp
index a1ac63db2..faef3459b 100644
--- a/Encodings/src/Windows1253Encoding.cpp
+++ b/Encodings/src/Windows1253Encoding.cpp
@@ -28,24 +28,24 @@ const char* Windows1253Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Windows1253Encoding::_charMap = 
+const TextEncoding::CharacterMap Windows1253Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x20AC,     -1, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,     -1, 0x2030,     -1, 0x2039,     -1,     -1,     -1,     -1, 
-	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,     -1, 0x2122,     -1, 0x203A,     -1,     -1,     -1,     -1, 
-	0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9,     -1, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, 
-	0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 
-	0x03A0, 0x03A1,     -1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 
-	0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 
-	0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE,     -1, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x20AC,     -1, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,     -1, 0x2030,     -1, 0x2039,     -1,     -1,     -1,     -1,
+	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,     -1, 0x2122,     -1, 0x203A,     -1,     -1,     -1,     -1,
+	0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9,     -1, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+	0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+	0x03A0, 0x03A1,     -1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+	0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+	0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE,     -1,
 };
 
 
@@ -55,36 +55,36 @@ const DoubleByteEncoding::Mapping Windows1253Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping Windows1253Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 }, 
-	{ 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, 
-	{ 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00BB, 0x00BB }, { 0x00BD, 0x00BD }, { 0x0192, 0x0083 }, { 0x0384, 0x00B4 }, { 0x0385, 0x00A1 }, 
-	{ 0x0386, 0x00A2 }, { 0x0388, 0x00B8 }, { 0x0389, 0x00B9 }, { 0x038A, 0x00BA }, { 0x038C, 0x00BC }, { 0x038E, 0x00BE }, { 0x038F, 0x00BF }, { 0x0390, 0x00C0 }, 
-	{ 0x0391, 0x00C1 }, { 0x0392, 0x00C2 }, { 0x0393, 0x00C3 }, { 0x0394, 0x00C4 }, { 0x0395, 0x00C5 }, { 0x0396, 0x00C6 }, { 0x0397, 0x00C7 }, { 0x0398, 0x00C8 }, 
-	{ 0x0399, 0x00C9 }, { 0x039A, 0x00CA }, { 0x039B, 0x00CB }, { 0x039C, 0x00CC }, { 0x039D, 0x00CD }, { 0x039E, 0x00CE }, { 0x039F, 0x00CF }, { 0x03A0, 0x00D0 }, 
-	{ 0x03A1, 0x00D1 }, { 0x03A3, 0x00D3 }, { 0x03A4, 0x00D4 }, { 0x03A5, 0x00D5 }, { 0x03A6, 0x00D6 }, { 0x03A7, 0x00D7 }, { 0x03A8, 0x00D8 }, { 0x03A9, 0x00D9 }, 
-	{ 0x03AA, 0x00DA }, { 0x03AB, 0x00DB }, { 0x03AC, 0x00DC }, { 0x03AD, 0x00DD }, { 0x03AE, 0x00DE }, { 0x03AF, 0x00DF }, { 0x03B0, 0x00E0 }, { 0x03B1, 0x00E1 }, 
-	{ 0x03B2, 0x00E2 }, { 0x03B3, 0x00E3 }, { 0x03B4, 0x00E4 }, { 0x03B5, 0x00E5 }, { 0x03B6, 0x00E6 }, { 0x03B7, 0x00E7 }, { 0x03B8, 0x00E8 }, { 0x03B9, 0x00E9 }, 
-	{ 0x03BA, 0x00EA }, { 0x03BB, 0x00EB }, { 0x03BC, 0x00EC }, { 0x03BD, 0x00ED }, { 0x03BE, 0x00EE }, { 0x03BF, 0x00EF }, { 0x03C0, 0x00F0 }, { 0x03C1, 0x00F1 }, 
-	{ 0x03C2, 0x00F2 }, { 0x03C3, 0x00F3 }, { 0x03C4, 0x00F4 }, { 0x03C5, 0x00F5 }, { 0x03C6, 0x00F6 }, { 0x03C7, 0x00F7 }, { 0x03C8, 0x00F8 }, { 0x03C9, 0x00F9 }, 
-	{ 0x03CA, 0x00FA }, { 0x03CB, 0x00FB }, { 0x03CC, 0x00FC }, { 0x03CD, 0x00FD }, { 0x03CE, 0x00FE }, { 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2015, 0x00AF }, 
-	{ 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 }, { 0x2021, 0x0087 }, 
-	{ 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AC, 0x0080 }, { 0x2122, 0x0099 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x00A0, 0x00A0 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 },
+	{ 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 },
+	{ 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00BB, 0x00BB }, { 0x00BD, 0x00BD }, { 0x0192, 0x0083 }, { 0x0384, 0x00B4 }, { 0x0385, 0x00A1 },
+	{ 0x0386, 0x00A2 }, { 0x0388, 0x00B8 }, { 0x0389, 0x00B9 }, { 0x038A, 0x00BA }, { 0x038C, 0x00BC }, { 0x038E, 0x00BE }, { 0x038F, 0x00BF }, { 0x0390, 0x00C0 },
+	{ 0x0391, 0x00C1 }, { 0x0392, 0x00C2 }, { 0x0393, 0x00C3 }, { 0x0394, 0x00C4 }, { 0x0395, 0x00C5 }, { 0x0396, 0x00C6 }, { 0x0397, 0x00C7 }, { 0x0398, 0x00C8 },
+	{ 0x0399, 0x00C9 }, { 0x039A, 0x00CA }, { 0x039B, 0x00CB }, { 0x039C, 0x00CC }, { 0x039D, 0x00CD }, { 0x039E, 0x00CE }, { 0x039F, 0x00CF }, { 0x03A0, 0x00D0 },
+	{ 0x03A1, 0x00D1 }, { 0x03A3, 0x00D3 }, { 0x03A4, 0x00D4 }, { 0x03A5, 0x00D5 }, { 0x03A6, 0x00D6 }, { 0x03A7, 0x00D7 }, { 0x03A8, 0x00D8 }, { 0x03A9, 0x00D9 },
+	{ 0x03AA, 0x00DA }, { 0x03AB, 0x00DB }, { 0x03AC, 0x00DC }, { 0x03AD, 0x00DD }, { 0x03AE, 0x00DE }, { 0x03AF, 0x00DF }, { 0x03B0, 0x00E0 }, { 0x03B1, 0x00E1 },
+	{ 0x03B2, 0x00E2 }, { 0x03B3, 0x00E3 }, { 0x03B4, 0x00E4 }, { 0x03B5, 0x00E5 }, { 0x03B6, 0x00E6 }, { 0x03B7, 0x00E7 }, { 0x03B8, 0x00E8 }, { 0x03B9, 0x00E9 },
+	{ 0x03BA, 0x00EA }, { 0x03BB, 0x00EB }, { 0x03BC, 0x00EC }, { 0x03BD, 0x00ED }, { 0x03BE, 0x00EE }, { 0x03BF, 0x00EF }, { 0x03C0, 0x00F0 }, { 0x03C1, 0x00F1 },
+	{ 0x03C2, 0x00F2 }, { 0x03C3, 0x00F3 }, { 0x03C4, 0x00F4 }, { 0x03C5, 0x00F5 }, { 0x03C6, 0x00F6 }, { 0x03C7, 0x00F7 }, { 0x03C8, 0x00F8 }, { 0x03C9, 0x00F9 },
+	{ 0x03CA, 0x00FA }, { 0x03CB, 0x00FB }, { 0x03CC, 0x00FC }, { 0x03CD, 0x00FD }, { 0x03CE, 0x00FE }, { 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2015, 0x00AF },
+	{ 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 }, { 0x2021, 0x0087 },
+	{ 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AC, 0x0080 }, { 0x2122, 0x0099 },
 };
 
 
diff --git a/Encodings/src/Windows1254Encoding.cpp b/Encodings/src/Windows1254Encoding.cpp
index f09ca34e5..dd03c11ff 100644
--- a/Encodings/src/Windows1254Encoding.cpp
+++ b/Encodings/src/Windows1254Encoding.cpp
@@ -28,24 +28,24 @@ const char* Windows1254Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Windows1254Encoding::_charMap = 
+const TextEncoding::CharacterMap Windows1254Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x20AC,     -1, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152,     -1,     -1,     -1, 
-	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153,     -1,     -1, 0x0178, 
-	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 
-	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 
-	0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, 
-	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 
-	0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x20AC,     -1, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152,     -1,     -1,     -1,
+	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153,     -1,     -1, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF,
 };
 
 
@@ -55,38 +55,38 @@ const DoubleByteEncoding::Mapping Windows1254Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping Windows1254Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A1, 0x00A1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, 
-	{ 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 }, { 0x00AA, 0x00AA }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF }, 
-	{ 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, 
-	{ 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 }, { 0x00BA, 0x00BA }, { 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00BF, 0x00BF }, 
-	{ 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 }, 
-	{ 0x00C8, 0x00C8 }, { 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, 
-	{ 0x00D1, 0x00D1 }, { 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00D8 }, 
-	{ 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, 
-	{ 0x00E3, 0x00E3 }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, 
-	{ 0x00EB, 0x00EB }, { 0x00EC, 0x00EC }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 }, { 0x00F2, 0x00F2 }, { 0x00F3, 0x00F3 }, 
-	{ 0x00F4, 0x00F4 }, { 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00F8 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, 
-	{ 0x00FC, 0x00FC }, { 0x00FF, 0x00FF }, { 0x011E, 0x00D0 }, { 0x011F, 0x00F0 }, { 0x0130, 0x00DD }, { 0x0131, 0x00FD }, { 0x0152, 0x008C }, { 0x0153, 0x009C }, 
-	{ 0x015E, 0x00DE }, { 0x015F, 0x00FE }, { 0x0160, 0x008A }, { 0x0161, 0x009A }, { 0x0178, 0x009F }, { 0x0192, 0x0083 }, { 0x02C6, 0x0088 }, { 0x02DC, 0x0098 }, 
-	{ 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, 
-	{ 0x2020, 0x0086 }, { 0x2021, 0x0087 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AC, 0x0080 }, 
-	{ 0x2122, 0x0099 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x00A0, 0x00A0 }, { 0x00A1, 0x00A1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 },
+	{ 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 }, { 0x00AA, 0x00AA }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF },
+	{ 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 },
+	{ 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 }, { 0x00BA, 0x00BA }, { 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00BF, 0x00BF },
+	{ 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C3, 0x00C3 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 },
+	{ 0x00C8, 0x00C8 }, { 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CC, 0x00CC }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF },
+	{ 0x00D1, 0x00D1 }, { 0x00D2, 0x00D2 }, { 0x00D3, 0x00D3 }, { 0x00D4, 0x00D4 }, { 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00D8 },
+	{ 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 },
+	{ 0x00E3, 0x00E3 }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 }, { 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA },
+	{ 0x00EB, 0x00EB }, { 0x00EC, 0x00EC }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 }, { 0x00F2, 0x00F2 }, { 0x00F3, 0x00F3 },
+	{ 0x00F4, 0x00F4 }, { 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00F8 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB },
+	{ 0x00FC, 0x00FC }, { 0x00FF, 0x00FF }, { 0x011E, 0x00D0 }, { 0x011F, 0x00F0 }, { 0x0130, 0x00DD }, { 0x0131, 0x00FD }, { 0x0152, 0x008C }, { 0x0153, 0x009C },
+	{ 0x015E, 0x00DE }, { 0x015F, 0x00FE }, { 0x0160, 0x008A }, { 0x0161, 0x009A }, { 0x0178, 0x009F }, { 0x0192, 0x0083 }, { 0x02C6, 0x0088 }, { 0x02DC, 0x0098 },
+	{ 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 },
+	{ 0x2020, 0x0086 }, { 0x2021, 0x0087 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AC, 0x0080 },
+	{ 0x2122, 0x0099 },
 };
 
 
diff --git a/Encodings/src/Windows1255Encoding.cpp b/Encodings/src/Windows1255Encoding.cpp
index 2166639b8..b2ec9f85f 100644
--- a/Encodings/src/Windows1255Encoding.cpp
+++ b/Encodings/src/Windows1255Encoding.cpp
@@ -28,24 +28,24 @@ const char* Windows1255Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Windows1255Encoding::_charMap = 
+const TextEncoding::CharacterMap Windows1255Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x20AC,     -1, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030,     -1, 0x2039,     -1,     -1,     -1,     -1, 
-	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122,     -1, 0x203A,     -1,     -1,     -1,     -1, 
-	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AA, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 
-	0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7, 0x05B8, 0x05B9,     -1, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF, 
-	0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, 
-	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA,     -1,     -1, 0x200E, 0x200F,     -1, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x20AC,     -1, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030,     -1, 0x2039,     -1,     -1,     -1,     -1,
+	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122,     -1, 0x203A,     -1,     -1,     -1,     -1,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AA, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7, 0x05B8, 0x05B9,     -1, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
+	0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA,     -1,     -1, 0x200E, 0x200F,     -1,
 };
 
 
@@ -55,36 +55,36 @@ const DoubleByteEncoding::Mapping Windows1255Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping Windows1255Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A1, 0x00A1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, 
-	{ 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, 
-	{ 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 }, 
-	{ 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00BF, 0x00BF }, { 0x00D7, 0x00AA }, { 0x00F7, 0x00BA }, { 0x0192, 0x0083 }, 
-	{ 0x02C6, 0x0088 }, { 0x02DC, 0x0098 }, { 0x05B0, 0x00C0 }, { 0x05B1, 0x00C1 }, { 0x05B2, 0x00C2 }, { 0x05B3, 0x00C3 }, { 0x05B4, 0x00C4 }, { 0x05B5, 0x00C5 }, 
-	{ 0x05B6, 0x00C6 }, { 0x05B7, 0x00C7 }, { 0x05B8, 0x00C8 }, { 0x05B9, 0x00C9 }, { 0x05BB, 0x00CB }, { 0x05BC, 0x00CC }, { 0x05BD, 0x00CD }, { 0x05BE, 0x00CE }, 
-	{ 0x05BF, 0x00CF }, { 0x05C0, 0x00D0 }, { 0x05C1, 0x00D1 }, { 0x05C2, 0x00D2 }, { 0x05C3, 0x00D3 }, { 0x05D0, 0x00E0 }, { 0x05D1, 0x00E1 }, { 0x05D2, 0x00E2 }, 
-	{ 0x05D3, 0x00E3 }, { 0x05D4, 0x00E4 }, { 0x05D5, 0x00E5 }, { 0x05D6, 0x00E6 }, { 0x05D7, 0x00E7 }, { 0x05D8, 0x00E8 }, { 0x05D9, 0x00E9 }, { 0x05DA, 0x00EA }, 
-	{ 0x05DB, 0x00EB }, { 0x05DC, 0x00EC }, { 0x05DD, 0x00ED }, { 0x05DE, 0x00EE }, { 0x05DF, 0x00EF }, { 0x05E0, 0x00F0 }, { 0x05E1, 0x00F1 }, { 0x05E2, 0x00F2 }, 
-	{ 0x05E3, 0x00F3 }, { 0x05E4, 0x00F4 }, { 0x05E5, 0x00F5 }, { 0x05E6, 0x00F6 }, { 0x05E7, 0x00F7 }, { 0x05E8, 0x00F8 }, { 0x05E9, 0x00F9 }, { 0x05EA, 0x00FA }, 
-	{ 0x05F0, 0x00D4 }, { 0x05F1, 0x00D5 }, { 0x05F2, 0x00D6 }, { 0x05F3, 0x00D7 }, { 0x05F4, 0x00D8 }, { 0x200E, 0x00FD }, { 0x200F, 0x00FE }, { 0x2013, 0x0096 }, 
-	{ 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 }, 
-	{ 0x2021, 0x0087 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AA, 0x00A4 }, { 0x20AC, 0x0080 }, 
-	{ 0x2122, 0x0099 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x00A0, 0x00A0 }, { 0x00A1, 0x00A1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 },
+	{ 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 },
+	{ 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 },
+	{ 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00BF, 0x00BF }, { 0x00D7, 0x00AA }, { 0x00F7, 0x00BA }, { 0x0192, 0x0083 },
+	{ 0x02C6, 0x0088 }, { 0x02DC, 0x0098 }, { 0x05B0, 0x00C0 }, { 0x05B1, 0x00C1 }, { 0x05B2, 0x00C2 }, { 0x05B3, 0x00C3 }, { 0x05B4, 0x00C4 }, { 0x05B5, 0x00C5 },
+	{ 0x05B6, 0x00C6 }, { 0x05B7, 0x00C7 }, { 0x05B8, 0x00C8 }, { 0x05B9, 0x00C9 }, { 0x05BB, 0x00CB }, { 0x05BC, 0x00CC }, { 0x05BD, 0x00CD }, { 0x05BE, 0x00CE },
+	{ 0x05BF, 0x00CF }, { 0x05C0, 0x00D0 }, { 0x05C1, 0x00D1 }, { 0x05C2, 0x00D2 }, { 0x05C3, 0x00D3 }, { 0x05D0, 0x00E0 }, { 0x05D1, 0x00E1 }, { 0x05D2, 0x00E2 },
+	{ 0x05D3, 0x00E3 }, { 0x05D4, 0x00E4 }, { 0x05D5, 0x00E5 }, { 0x05D6, 0x00E6 }, { 0x05D7, 0x00E7 }, { 0x05D8, 0x00E8 }, { 0x05D9, 0x00E9 }, { 0x05DA, 0x00EA },
+	{ 0x05DB, 0x00EB }, { 0x05DC, 0x00EC }, { 0x05DD, 0x00ED }, { 0x05DE, 0x00EE }, { 0x05DF, 0x00EF }, { 0x05E0, 0x00F0 }, { 0x05E1, 0x00F1 }, { 0x05E2, 0x00F2 },
+	{ 0x05E3, 0x00F3 }, { 0x05E4, 0x00F4 }, { 0x05E5, 0x00F5 }, { 0x05E6, 0x00F6 }, { 0x05E7, 0x00F7 }, { 0x05E8, 0x00F8 }, { 0x05E9, 0x00F9 }, { 0x05EA, 0x00FA },
+	{ 0x05F0, 0x00D4 }, { 0x05F1, 0x00D5 }, { 0x05F2, 0x00D6 }, { 0x05F3, 0x00D7 }, { 0x05F4, 0x00D8 }, { 0x200E, 0x00FD }, { 0x200F, 0x00FE }, { 0x2013, 0x0096 },
+	{ 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 },
+	{ 0x2021, 0x0087 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AA, 0x00A4 }, { 0x20AC, 0x0080 },
+	{ 0x2122, 0x0099 },
 };
 
 
diff --git a/Encodings/src/Windows1256Encoding.cpp b/Encodings/src/Windows1256Encoding.cpp
index 49107526c..29b6e9064 100644
--- a/Encodings/src/Windows1256Encoding.cpp
+++ b/Encodings/src/Windows1256Encoding.cpp
@@ -28,24 +28,24 @@ const char* Windows1256Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Windows1256Encoding::_charMap = 
+const TextEncoding::CharacterMap Windows1256Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688, 
-	0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA, 
-	0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F, 
-	0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, 
-	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7, 0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643, 
-	0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF, 
-	0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7, 0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
+	0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
+	0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
+	0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7, 0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643,
+	0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
+	0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7, 0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2,
 };
 
 
@@ -55,38 +55,38 @@ const DoubleByteEncoding::Mapping Windows1256Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping Windows1256Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 }, 
-	{ 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, 
-	{ 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 }, 
-	{ 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00D7, 0x00D7 }, { 0x00E0, 0x00E0 }, { 0x00E2, 0x00E2 }, { 0x00E7, 0x00E7 }, 
-	{ 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F4, 0x00F4 }, { 0x00F7, 0x00F7 }, 
-	{ 0x00F9, 0x00F9 }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x0152, 0x008C }, { 0x0153, 0x009C }, { 0x0192, 0x0083 }, { 0x02C6, 0x0088 }, { 0x060C, 0x00A1 }, 
-	{ 0x061B, 0x00BA }, { 0x061F, 0x00BF }, { 0x0621, 0x00C1 }, { 0x0622, 0x00C2 }, { 0x0623, 0x00C3 }, { 0x0624, 0x00C4 }, { 0x0625, 0x00C5 }, { 0x0626, 0x00C6 }, 
-	{ 0x0627, 0x00C7 }, { 0x0628, 0x00C8 }, { 0x0629, 0x00C9 }, { 0x062A, 0x00CA }, { 0x062B, 0x00CB }, { 0x062C, 0x00CC }, { 0x062D, 0x00CD }, { 0x062E, 0x00CE }, 
-	{ 0x062F, 0x00CF }, { 0x0630, 0x00D0 }, { 0x0631, 0x00D1 }, { 0x0632, 0x00D2 }, { 0x0633, 0x00D3 }, { 0x0634, 0x00D4 }, { 0x0635, 0x00D5 }, { 0x0636, 0x00D6 }, 
-	{ 0x0637, 0x00D8 }, { 0x0638, 0x00D9 }, { 0x0639, 0x00DA }, { 0x063A, 0x00DB }, { 0x0640, 0x00DC }, { 0x0641, 0x00DD }, { 0x0642, 0x00DE }, { 0x0643, 0x00DF }, 
-	{ 0x0644, 0x00E1 }, { 0x0645, 0x00E3 }, { 0x0646, 0x00E4 }, { 0x0647, 0x00E5 }, { 0x0648, 0x00E6 }, { 0x0649, 0x00EC }, { 0x064A, 0x00ED }, { 0x064B, 0x00F0 }, 
-	{ 0x064C, 0x00F1 }, { 0x064D, 0x00F2 }, { 0x064E, 0x00F3 }, { 0x064F, 0x00F5 }, { 0x0650, 0x00F6 }, { 0x0651, 0x00F8 }, { 0x0652, 0x00FA }, { 0x0679, 0x008A }, 
-	{ 0x067E, 0x0081 }, { 0x0686, 0x008D }, { 0x0688, 0x008F }, { 0x0691, 0x009A }, { 0x0698, 0x008E }, { 0x06A9, 0x0098 }, { 0x06AF, 0x0090 }, { 0x06BA, 0x009F }, 
-	{ 0x06BE, 0x00AA }, { 0x06C1, 0x00C0 }, { 0x06D2, 0x00FF }, { 0x200C, 0x009D }, { 0x200D, 0x009E }, { 0x200E, 0x00FD }, { 0x200F, 0x00FE }, { 0x2013, 0x0096 }, 
-	{ 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 }, 
-	{ 0x2021, 0x0087 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AC, 0x0080 }, { 0x2122, 0x0099 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x00A0, 0x00A0 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x00A8 },
+	{ 0x00A9, 0x00A9 }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 },
+	{ 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 },
+	{ 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00D7, 0x00D7 }, { 0x00E0, 0x00E0 }, { 0x00E2, 0x00E2 }, { 0x00E7, 0x00E7 },
+	{ 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F4, 0x00F4 }, { 0x00F7, 0x00F7 },
+	{ 0x00F9, 0x00F9 }, { 0x00FB, 0x00FB }, { 0x00FC, 0x00FC }, { 0x0152, 0x008C }, { 0x0153, 0x009C }, { 0x0192, 0x0083 }, { 0x02C6, 0x0088 }, { 0x060C, 0x00A1 },
+	{ 0x061B, 0x00BA }, { 0x061F, 0x00BF }, { 0x0621, 0x00C1 }, { 0x0622, 0x00C2 }, { 0x0623, 0x00C3 }, { 0x0624, 0x00C4 }, { 0x0625, 0x00C5 }, { 0x0626, 0x00C6 },
+	{ 0x0627, 0x00C7 }, { 0x0628, 0x00C8 }, { 0x0629, 0x00C9 }, { 0x062A, 0x00CA }, { 0x062B, 0x00CB }, { 0x062C, 0x00CC }, { 0x062D, 0x00CD }, { 0x062E, 0x00CE },
+	{ 0x062F, 0x00CF }, { 0x0630, 0x00D0 }, { 0x0631, 0x00D1 }, { 0x0632, 0x00D2 }, { 0x0633, 0x00D3 }, { 0x0634, 0x00D4 }, { 0x0635, 0x00D5 }, { 0x0636, 0x00D6 },
+	{ 0x0637, 0x00D8 }, { 0x0638, 0x00D9 }, { 0x0639, 0x00DA }, { 0x063A, 0x00DB }, { 0x0640, 0x00DC }, { 0x0641, 0x00DD }, { 0x0642, 0x00DE }, { 0x0643, 0x00DF },
+	{ 0x0644, 0x00E1 }, { 0x0645, 0x00E3 }, { 0x0646, 0x00E4 }, { 0x0647, 0x00E5 }, { 0x0648, 0x00E6 }, { 0x0649, 0x00EC }, { 0x064A, 0x00ED }, { 0x064B, 0x00F0 },
+	{ 0x064C, 0x00F1 }, { 0x064D, 0x00F2 }, { 0x064E, 0x00F3 }, { 0x064F, 0x00F5 }, { 0x0650, 0x00F6 }, { 0x0651, 0x00F8 }, { 0x0652, 0x00FA }, { 0x0679, 0x008A },
+	{ 0x067E, 0x0081 }, { 0x0686, 0x008D }, { 0x0688, 0x008F }, { 0x0691, 0x009A }, { 0x0698, 0x008E }, { 0x06A9, 0x0098 }, { 0x06AF, 0x0090 }, { 0x06BA, 0x009F },
+	{ 0x06BE, 0x00AA }, { 0x06C1, 0x00C0 }, { 0x06D2, 0x00FF }, { 0x200C, 0x009D }, { 0x200D, 0x009E }, { 0x200E, 0x00FD }, { 0x200F, 0x00FE }, { 0x2013, 0x0096 },
+	{ 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 },
+	{ 0x2021, 0x0087 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AC, 0x0080 }, { 0x2122, 0x0099 },
 };
 
 
diff --git a/Encodings/src/Windows1257Encoding.cpp b/Encodings/src/Windows1257Encoding.cpp
index 662d14576..ab2650bc9 100644
--- a/Encodings/src/Windows1257Encoding.cpp
+++ b/Encodings/src/Windows1257Encoding.cpp
@@ -28,24 +28,24 @@ const char* Windows1257Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Windows1257Encoding::_charMap = 
+const TextEncoding::CharacterMap Windows1257Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x20AC,     -1, 0x201A,     -1, 0x201E, 0x2026, 0x2020, 0x2021,     -1, 0x2030,     -1, 0x2039,     -1, 0x00A8, 0x02C7, 0x00B8, 
-	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,     -1, 0x2122,     -1, 0x203A,     -1, 0x00AF, 0x02DB,     -1, 
-	0x00A0,     -1, 0x00A2, 0x00A3, 0x00A4,     -1, 0x00A6, 0x00A7, 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6, 
-	0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, 
-	0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, 
-	0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, 
-	0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x20AC,     -1, 0x201A,     -1, 0x201E, 0x2026, 0x2020, 0x2021,     -1, 0x2030,     -1, 0x2039,     -1, 0x00A8, 0x02C7, 0x00B8,
+	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,     -1, 0x2122,     -1, 0x203A,     -1, 0x00AF, 0x02DB,     -1,
+	0x00A0,     -1, 0x00A2, 0x00A3, 0x00A4,     -1, 0x00A6, 0x00A7, 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+	0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+	0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+	0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+	0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9,
 };
 
 
@@ -55,37 +55,37 @@ const DoubleByteEncoding::Mapping Windows1257Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping Windows1257Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x008D }, { 0x00A9, 0x00A9 }, 
-	{ 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x009D }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, 
-	{ 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x008F }, { 0x00B9, 0x00B9 }, { 0x00BB, 0x00BB }, 
-	{ 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00AF }, { 0x00C9, 0x00C9 }, { 0x00D3, 0x00D3 }, 
-	{ 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00A8 }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, 
-	{ 0x00E6, 0x00BF }, { 0x00E9, 0x00E9 }, { 0x00F3, 0x00F3 }, { 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00B8 }, { 0x00FC, 0x00FC }, 
-	{ 0x0100, 0x00C2 }, { 0x0101, 0x00E2 }, { 0x0104, 0x00C0 }, { 0x0105, 0x00E0 }, { 0x0106, 0x00C3 }, { 0x0107, 0x00E3 }, { 0x010C, 0x00C8 }, { 0x010D, 0x00E8 }, 
-	{ 0x0112, 0x00C7 }, { 0x0113, 0x00E7 }, { 0x0116, 0x00CB }, { 0x0117, 0x00EB }, { 0x0118, 0x00C6 }, { 0x0119, 0x00E6 }, { 0x0122, 0x00CC }, { 0x0123, 0x00EC }, 
-	{ 0x012A, 0x00CE }, { 0x012B, 0x00EE }, { 0x012E, 0x00C1 }, { 0x012F, 0x00E1 }, { 0x0136, 0x00CD }, { 0x0137, 0x00ED }, { 0x013B, 0x00CF }, { 0x013C, 0x00EF }, 
-	{ 0x0141, 0x00D9 }, { 0x0142, 0x00F9 }, { 0x0143, 0x00D1 }, { 0x0144, 0x00F1 }, { 0x0145, 0x00D2 }, { 0x0146, 0x00F2 }, { 0x014C, 0x00D4 }, { 0x014D, 0x00F4 }, 
-	{ 0x0156, 0x00AA }, { 0x0157, 0x00BA }, { 0x015A, 0x00DA }, { 0x015B, 0x00FA }, { 0x0160, 0x00D0 }, { 0x0161, 0x00F0 }, { 0x016A, 0x00DB }, { 0x016B, 0x00FB }, 
-	{ 0x0172, 0x00D8 }, { 0x0173, 0x00F8 }, { 0x0179, 0x00CA }, { 0x017A, 0x00EA }, { 0x017B, 0x00DD }, { 0x017C, 0x00FD }, { 0x017D, 0x00DE }, { 0x017E, 0x00FE }, 
-	{ 0x02C7, 0x008E }, { 0x02D9, 0x00FF }, { 0x02DB, 0x009E }, { 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 }, 
-	{ 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 }, { 0x2021, 0x0087 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 }, 
-	{ 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AC, 0x0080 }, { 0x2122, 0x0099 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x00A0, 0x00A0 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, { 0x00A8, 0x008D }, { 0x00A9, 0x00A9 },
+	{ 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x009D }, { 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 },
+	{ 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, { 0x00B8, 0x008F }, { 0x00B9, 0x00B9 }, { 0x00BB, 0x00BB },
+	{ 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00AF }, { 0x00C9, 0x00C9 }, { 0x00D3, 0x00D3 },
+	{ 0x00D5, 0x00D5 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00A8 }, { 0x00DC, 0x00DC }, { 0x00DF, 0x00DF }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 },
+	{ 0x00E6, 0x00BF }, { 0x00E9, 0x00E9 }, { 0x00F3, 0x00F3 }, { 0x00F5, 0x00F5 }, { 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00B8 }, { 0x00FC, 0x00FC },
+	{ 0x0100, 0x00C2 }, { 0x0101, 0x00E2 }, { 0x0104, 0x00C0 }, { 0x0105, 0x00E0 }, { 0x0106, 0x00C3 }, { 0x0107, 0x00E3 }, { 0x010C, 0x00C8 }, { 0x010D, 0x00E8 },
+	{ 0x0112, 0x00C7 }, { 0x0113, 0x00E7 }, { 0x0116, 0x00CB }, { 0x0117, 0x00EB }, { 0x0118, 0x00C6 }, { 0x0119, 0x00E6 }, { 0x0122, 0x00CC }, { 0x0123, 0x00EC },
+	{ 0x012A, 0x00CE }, { 0x012B, 0x00EE }, { 0x012E, 0x00C1 }, { 0x012F, 0x00E1 }, { 0x0136, 0x00CD }, { 0x0137, 0x00ED }, { 0x013B, 0x00CF }, { 0x013C, 0x00EF },
+	{ 0x0141, 0x00D9 }, { 0x0142, 0x00F9 }, { 0x0143, 0x00D1 }, { 0x0144, 0x00F1 }, { 0x0145, 0x00D2 }, { 0x0146, 0x00F2 }, { 0x014C, 0x00D4 }, { 0x014D, 0x00F4 },
+	{ 0x0156, 0x00AA }, { 0x0157, 0x00BA }, { 0x015A, 0x00DA }, { 0x015B, 0x00FA }, { 0x0160, 0x00D0 }, { 0x0161, 0x00F0 }, { 0x016A, 0x00DB }, { 0x016B, 0x00FB },
+	{ 0x0172, 0x00D8 }, { 0x0173, 0x00F8 }, { 0x0179, 0x00CA }, { 0x017A, 0x00EA }, { 0x017B, 0x00DD }, { 0x017C, 0x00FD }, { 0x017D, 0x00DE }, { 0x017E, 0x00FE },
+	{ 0x02C7, 0x008E }, { 0x02D9, 0x00FF }, { 0x02DB, 0x009E }, { 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201A, 0x0082 },
+	{ 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 }, { 0x2021, 0x0087 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 }, { 0x2030, 0x0089 },
+	{ 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AC, 0x0080 }, { 0x2122, 0x0099 },
 };
 
 
diff --git a/Encodings/src/Windows1258Encoding.cpp b/Encodings/src/Windows1258Encoding.cpp
index 3270a72c5..765351f9f 100644
--- a/Encodings/src/Windows1258Encoding.cpp
+++ b/Encodings/src/Windows1258Encoding.cpp
@@ -28,24 +28,24 @@ const char* Windows1258Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Windows1258Encoding::_charMap = 
+const TextEncoding::CharacterMap Windows1258Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x20AC,     -1, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030,     -1, 0x2039, 0x0152,     -1,     -1,     -1, 
-	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122,     -1, 0x203A, 0x0153,     -1,     -1, 0x0178, 
-	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 
-	0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF, 
-	0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF, 
-	0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF, 
-	0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x20AC,     -1, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030,     -1, 0x2039, 0x0152,     -1,     -1,     -1,
+	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122,     -1, 0x203A, 0x0153,     -1,     -1, 0x0178,
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF,
+	0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF,
+	0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF,
 };
 
 
@@ -55,37 +55,37 @@ const DoubleByteEncoding::Mapping Windows1258Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping Windows1258Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x00A0, 0x00A0 }, { 0x00A1, 0x00A1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 }, 
-	{ 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 }, { 0x00AA, 0x00AA }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF }, 
-	{ 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 }, 
-	{ 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 }, { 0x00BA, 0x00BA }, { 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00BF, 0x00BF }, 
-	{ 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 }, { 0x00C8, 0x00C8 }, 
-	{ 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, { 0x00D1, 0x00D1 }, { 0x00D3, 0x00D3 }, 
-	{ 0x00D4, 0x00D4 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00D8 }, { 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC }, 
-	{ 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 }, 
-	{ 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 }, 
-	{ 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 }, { 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00F8 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB }, 
-	{ 0x00FC, 0x00FC }, { 0x00FF, 0x00FF }, { 0x0102, 0x00C3 }, { 0x0103, 0x00E3 }, { 0x0110, 0x00D0 }, { 0x0111, 0x00F0 }, { 0x0152, 0x008C }, { 0x0153, 0x009C }, 
-	{ 0x0178, 0x009F }, { 0x0192, 0x0083 }, { 0x01A0, 0x00D5 }, { 0x01A1, 0x00F5 }, { 0x01AF, 0x00DD }, { 0x01B0, 0x00FD }, { 0x02C6, 0x0088 }, { 0x02DC, 0x0098 }, 
-	{ 0x0300, 0x00CC }, { 0x0301, 0x00EC }, { 0x0303, 0x00DE }, { 0x0309, 0x00D2 }, { 0x0323, 0x00F2 }, { 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2018, 0x0091 }, 
-	{ 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 }, { 0x2021, 0x0087 }, { 0x2022, 0x0095 }, 
-	{ 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AB, 0x00FE }, { 0x20AC, 0x0080 }, { 0x2122, 0x0099 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x00A0, 0x00A0 }, { 0x00A1, 0x00A1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A4, 0x00A4 }, { 0x00A5, 0x00A5 }, { 0x00A6, 0x00A6 }, { 0x00A7, 0x00A7 },
+	{ 0x00A8, 0x00A8 }, { 0x00A9, 0x00A9 }, { 0x00AA, 0x00AA }, { 0x00AB, 0x00AB }, { 0x00AC, 0x00AC }, { 0x00AD, 0x00AD }, { 0x00AE, 0x00AE }, { 0x00AF, 0x00AF },
+	{ 0x00B0, 0x00B0 }, { 0x00B1, 0x00B1 }, { 0x00B2, 0x00B2 }, { 0x00B3, 0x00B3 }, { 0x00B4, 0x00B4 }, { 0x00B5, 0x00B5 }, { 0x00B6, 0x00B6 }, { 0x00B7, 0x00B7 },
+	{ 0x00B8, 0x00B8 }, { 0x00B9, 0x00B9 }, { 0x00BA, 0x00BA }, { 0x00BB, 0x00BB }, { 0x00BC, 0x00BC }, { 0x00BD, 0x00BD }, { 0x00BE, 0x00BE }, { 0x00BF, 0x00BF },
+	{ 0x00C0, 0x00C0 }, { 0x00C1, 0x00C1 }, { 0x00C2, 0x00C2 }, { 0x00C4, 0x00C4 }, { 0x00C5, 0x00C5 }, { 0x00C6, 0x00C6 }, { 0x00C7, 0x00C7 }, { 0x00C8, 0x00C8 },
+	{ 0x00C9, 0x00C9 }, { 0x00CA, 0x00CA }, { 0x00CB, 0x00CB }, { 0x00CD, 0x00CD }, { 0x00CE, 0x00CE }, { 0x00CF, 0x00CF }, { 0x00D1, 0x00D1 }, { 0x00D3, 0x00D3 },
+	{ 0x00D4, 0x00D4 }, { 0x00D6, 0x00D6 }, { 0x00D7, 0x00D7 }, { 0x00D8, 0x00D8 }, { 0x00D9, 0x00D9 }, { 0x00DA, 0x00DA }, { 0x00DB, 0x00DB }, { 0x00DC, 0x00DC },
+	{ 0x00DF, 0x00DF }, { 0x00E0, 0x00E0 }, { 0x00E1, 0x00E1 }, { 0x00E2, 0x00E2 }, { 0x00E4, 0x00E4 }, { 0x00E5, 0x00E5 }, { 0x00E6, 0x00E6 }, { 0x00E7, 0x00E7 },
+	{ 0x00E8, 0x00E8 }, { 0x00E9, 0x00E9 }, { 0x00EA, 0x00EA }, { 0x00EB, 0x00EB }, { 0x00ED, 0x00ED }, { 0x00EE, 0x00EE }, { 0x00EF, 0x00EF }, { 0x00F1, 0x00F1 },
+	{ 0x00F3, 0x00F3 }, { 0x00F4, 0x00F4 }, { 0x00F6, 0x00F6 }, { 0x00F7, 0x00F7 }, { 0x00F8, 0x00F8 }, { 0x00F9, 0x00F9 }, { 0x00FA, 0x00FA }, { 0x00FB, 0x00FB },
+	{ 0x00FC, 0x00FC }, { 0x00FF, 0x00FF }, { 0x0102, 0x00C3 }, { 0x0103, 0x00E3 }, { 0x0110, 0x00D0 }, { 0x0111, 0x00F0 }, { 0x0152, 0x008C }, { 0x0153, 0x009C },
+	{ 0x0178, 0x009F }, { 0x0192, 0x0083 }, { 0x01A0, 0x00D5 }, { 0x01A1, 0x00F5 }, { 0x01AF, 0x00DD }, { 0x01B0, 0x00FD }, { 0x02C6, 0x0088 }, { 0x02DC, 0x0098 },
+	{ 0x0300, 0x00CC }, { 0x0301, 0x00EC }, { 0x0303, 0x00DE }, { 0x0309, 0x00D2 }, { 0x0323, 0x00F2 }, { 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2018, 0x0091 },
+	{ 0x2019, 0x0092 }, { 0x201A, 0x0082 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x201E, 0x0084 }, { 0x2020, 0x0086 }, { 0x2021, 0x0087 }, { 0x2022, 0x0095 },
+	{ 0x2026, 0x0085 }, { 0x2030, 0x0089 }, { 0x2039, 0x008B }, { 0x203A, 0x009B }, { 0x20AB, 0x00FE }, { 0x20AC, 0x0080 }, { 0x2122, 0x0099 },
 };
 
 
diff --git a/Encodings/src/Windows874Encoding.cpp b/Encodings/src/Windows874Encoding.cpp
index 75d7ce7e6..6dcd27c26 100644
--- a/Encodings/src/Windows874Encoding.cpp
+++ b/Encodings/src/Windows874Encoding.cpp
@@ -28,24 +28,24 @@ const char* Windows874Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Windows874Encoding::_charMap = 
+const TextEncoding::CharacterMap Windows874Encoding::_charMap =
 {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 
-	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 
-	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
-	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
-	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
-	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
-	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
-	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 
-	0x20AC,     -1,     -1,     -1,     -1, 0x2026,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
-	0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, 
-	0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, 
-	0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, 
-	0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, 0x0E38, 0x0E39, 0x0E3A,     -1,     -1,     -1,     -1, 0x0E3F, 
-	0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, 
-	0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59, 0x0E5A, 0x0E5B,     -1,     -1,     -1,     -1, 
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+	0x20AC,     -1,     -1,     -1,     -1, 0x2026,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	    -1, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
+	0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
+	0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
+	0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
+	0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, 0x0E38, 0x0E39, 0x0E3A,     -1,     -1,     -1,     -1, 0x0E3F,
+	0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
+	0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59, 0x0E5A, 0x0E5B,     -1,     -1,     -1,     -1,
 };
 
 
@@ -55,35 +55,35 @@ const DoubleByteEncoding::Mapping Windows874Encoding::_mappingTable[] = {
 
 
 const DoubleByteEncoding::Mapping Windows874Encoding::_reverseMappingTable[] = {
-	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 }, 
-	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F }, 
-	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 }, 
-	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F }, 
-	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
-	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
-	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
-	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
-	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
-	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
-	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
-	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
-	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
-	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
-	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
-	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F }, 
-	{ 0x00A0, 0x00A0 }, { 0x0E01, 0x00A1 }, { 0x0E02, 0x00A2 }, { 0x0E03, 0x00A3 }, { 0x0E04, 0x00A4 }, { 0x0E05, 0x00A5 }, { 0x0E06, 0x00A6 }, { 0x0E07, 0x00A7 }, 
-	{ 0x0E08, 0x00A8 }, { 0x0E09, 0x00A9 }, { 0x0E0A, 0x00AA }, { 0x0E0B, 0x00AB }, { 0x0E0C, 0x00AC }, { 0x0E0D, 0x00AD }, { 0x0E0E, 0x00AE }, { 0x0E0F, 0x00AF }, 
-	{ 0x0E10, 0x00B0 }, { 0x0E11, 0x00B1 }, { 0x0E12, 0x00B2 }, { 0x0E13, 0x00B3 }, { 0x0E14, 0x00B4 }, { 0x0E15, 0x00B5 }, { 0x0E16, 0x00B6 }, { 0x0E17, 0x00B7 }, 
-	{ 0x0E18, 0x00B8 }, { 0x0E19, 0x00B9 }, { 0x0E1A, 0x00BA }, { 0x0E1B, 0x00BB }, { 0x0E1C, 0x00BC }, { 0x0E1D, 0x00BD }, { 0x0E1E, 0x00BE }, { 0x0E1F, 0x00BF }, 
-	{ 0x0E20, 0x00C0 }, { 0x0E21, 0x00C1 }, { 0x0E22, 0x00C2 }, { 0x0E23, 0x00C3 }, { 0x0E24, 0x00C4 }, { 0x0E25, 0x00C5 }, { 0x0E26, 0x00C6 }, { 0x0E27, 0x00C7 }, 
-	{ 0x0E28, 0x00C8 }, { 0x0E29, 0x00C9 }, { 0x0E2A, 0x00CA }, { 0x0E2B, 0x00CB }, { 0x0E2C, 0x00CC }, { 0x0E2D, 0x00CD }, { 0x0E2E, 0x00CE }, { 0x0E2F, 0x00CF }, 
-	{ 0x0E30, 0x00D0 }, { 0x0E31, 0x00D1 }, { 0x0E32, 0x00D2 }, { 0x0E33, 0x00D3 }, { 0x0E34, 0x00D4 }, { 0x0E35, 0x00D5 }, { 0x0E36, 0x00D6 }, { 0x0E37, 0x00D7 }, 
-	{ 0x0E38, 0x00D8 }, { 0x0E39, 0x00D9 }, { 0x0E3A, 0x00DA }, { 0x0E3F, 0x00DF }, { 0x0E40, 0x00E0 }, { 0x0E41, 0x00E1 }, { 0x0E42, 0x00E2 }, { 0x0E43, 0x00E3 }, 
-	{ 0x0E44, 0x00E4 }, { 0x0E45, 0x00E5 }, { 0x0E46, 0x00E6 }, { 0x0E47, 0x00E7 }, { 0x0E48, 0x00E8 }, { 0x0E49, 0x00E9 }, { 0x0E4A, 0x00EA }, { 0x0E4B, 0x00EB }, 
-	{ 0x0E4C, 0x00EC }, { 0x0E4D, 0x00ED }, { 0x0E4E, 0x00EE }, { 0x0E4F, 0x00EF }, { 0x0E50, 0x00F0 }, { 0x0E51, 0x00F1 }, { 0x0E52, 0x00F2 }, { 0x0E53, 0x00F3 }, 
-	{ 0x0E54, 0x00F4 }, { 0x0E55, 0x00F5 }, { 0x0E56, 0x00F6 }, { 0x0E57, 0x00F7 }, { 0x0E58, 0x00F8 }, { 0x0E59, 0x00F9 }, { 0x0E5A, 0x00FA }, { 0x0E5B, 0x00FB }, 
-	{ 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 }, 
-	{ 0x20AC, 0x0080 }, 
+	{ 0x0000, 0x0000 }, { 0x0001, 0x0001 }, { 0x0002, 0x0002 }, { 0x0003, 0x0003 }, { 0x0004, 0x0004 }, { 0x0005, 0x0005 }, { 0x0006, 0x0006 }, { 0x0007, 0x0007 },
+	{ 0x0008, 0x0008 }, { 0x0009, 0x0009 }, { 0x000A, 0x000A }, { 0x000B, 0x000B }, { 0x000C, 0x000C }, { 0x000D, 0x000D }, { 0x000E, 0x000E }, { 0x000F, 0x000F },
+	{ 0x0010, 0x0010 }, { 0x0011, 0x0011 }, { 0x0012, 0x0012 }, { 0x0013, 0x0013 }, { 0x0014, 0x0014 }, { 0x0015, 0x0015 }, { 0x0016, 0x0016 }, { 0x0017, 0x0017 },
+	{ 0x0018, 0x0018 }, { 0x0019, 0x0019 }, { 0x001A, 0x001A }, { 0x001B, 0x001B }, { 0x001C, 0x001C }, { 0x001D, 0x001D }, { 0x001E, 0x001E }, { 0x001F, 0x001F },
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 },
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F },
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 },
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F },
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 },
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F },
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 },
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F },
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 },
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F },
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 },
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x007F, 0x007F },
+	{ 0x00A0, 0x00A0 }, { 0x0E01, 0x00A1 }, { 0x0E02, 0x00A2 }, { 0x0E03, 0x00A3 }, { 0x0E04, 0x00A4 }, { 0x0E05, 0x00A5 }, { 0x0E06, 0x00A6 }, { 0x0E07, 0x00A7 },
+	{ 0x0E08, 0x00A8 }, { 0x0E09, 0x00A9 }, { 0x0E0A, 0x00AA }, { 0x0E0B, 0x00AB }, { 0x0E0C, 0x00AC }, { 0x0E0D, 0x00AD }, { 0x0E0E, 0x00AE }, { 0x0E0F, 0x00AF },
+	{ 0x0E10, 0x00B0 }, { 0x0E11, 0x00B1 }, { 0x0E12, 0x00B2 }, { 0x0E13, 0x00B3 }, { 0x0E14, 0x00B4 }, { 0x0E15, 0x00B5 }, { 0x0E16, 0x00B6 }, { 0x0E17, 0x00B7 },
+	{ 0x0E18, 0x00B8 }, { 0x0E19, 0x00B9 }, { 0x0E1A, 0x00BA }, { 0x0E1B, 0x00BB }, { 0x0E1C, 0x00BC }, { 0x0E1D, 0x00BD }, { 0x0E1E, 0x00BE }, { 0x0E1F, 0x00BF },
+	{ 0x0E20, 0x00C0 }, { 0x0E21, 0x00C1 }, { 0x0E22, 0x00C2 }, { 0x0E23, 0x00C3 }, { 0x0E24, 0x00C4 }, { 0x0E25, 0x00C5 }, { 0x0E26, 0x00C6 }, { 0x0E27, 0x00C7 },
+	{ 0x0E28, 0x00C8 }, { 0x0E29, 0x00C9 }, { 0x0E2A, 0x00CA }, { 0x0E2B, 0x00CB }, { 0x0E2C, 0x00CC }, { 0x0E2D, 0x00CD }, { 0x0E2E, 0x00CE }, { 0x0E2F, 0x00CF },
+	{ 0x0E30, 0x00D0 }, { 0x0E31, 0x00D1 }, { 0x0E32, 0x00D2 }, { 0x0E33, 0x00D3 }, { 0x0E34, 0x00D4 }, { 0x0E35, 0x00D5 }, { 0x0E36, 0x00D6 }, { 0x0E37, 0x00D7 },
+	{ 0x0E38, 0x00D8 }, { 0x0E39, 0x00D9 }, { 0x0E3A, 0x00DA }, { 0x0E3F, 0x00DF }, { 0x0E40, 0x00E0 }, { 0x0E41, 0x00E1 }, { 0x0E42, 0x00E2 }, { 0x0E43, 0x00E3 },
+	{ 0x0E44, 0x00E4 }, { 0x0E45, 0x00E5 }, { 0x0E46, 0x00E6 }, { 0x0E47, 0x00E7 }, { 0x0E48, 0x00E8 }, { 0x0E49, 0x00E9 }, { 0x0E4A, 0x00EA }, { 0x0E4B, 0x00EB },
+	{ 0x0E4C, 0x00EC }, { 0x0E4D, 0x00ED }, { 0x0E4E, 0x00EE }, { 0x0E4F, 0x00EF }, { 0x0E50, 0x00F0 }, { 0x0E51, 0x00F1 }, { 0x0E52, 0x00F2 }, { 0x0E53, 0x00F3 },
+	{ 0x0E54, 0x00F4 }, { 0x0E55, 0x00F5 }, { 0x0E56, 0x00F6 }, { 0x0E57, 0x00F7 }, { 0x0E58, 0x00F8 }, { 0x0E59, 0x00F9 }, { 0x0E5A, 0x00FA }, { 0x0E5B, 0x00FB },
+	{ 0x2013, 0x0096 }, { 0x2014, 0x0097 }, { 0x2018, 0x0091 }, { 0x2019, 0x0092 }, { 0x201C, 0x0093 }, { 0x201D, 0x0094 }, { 0x2022, 0x0095 }, { 0x2026, 0x0085 },
+	{ 0x20AC, 0x0080 },
 };
 
 
diff --git a/Encodings/testsuite/TestSuite_vs170.vcxproj b/Encodings/testsuite/TestSuite_vs170.vcxproj
index e59f997dd..bca98e1d3 100644
--- a/Encodings/testsuite/TestSuite_vs170.vcxproj
+++ b/Encodings/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{7784E068-96B2-4DDC-BA8B-780206E06B30}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
index 80deebe3e..f504bc1a3 100644
--- a/Foundation/CMakeLists.txt
+++ b/Foundation/CMakeLists.txt
@@ -35,39 +35,45 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc)
 # If POCO_UNBUNDLED is enabled we try to find the required packages
 # The configuration will fail if the packages are not found
 if(POCO_UNBUNDLED)
-	find_package(PCRE REQUIRED)
+	find_package(PCRE2 REQUIRED)
 	find_package(ZLIB REQUIRED)
 
 	#HACK: Unicode.cpp requires functions from these files. The can't be taken from the library
 	POCO_SOURCES(SRCS RegExp
-		src/pcre_ucd.c
-		src/pcre_tables.c
+		src/pcre2_ucd.c
+		src/pcre2_tables.c
 	)
 
 else()
-	# pcre
-	POCO_SOURCES(SRCS pcre
-		src/pcre_config.c
-		src/pcre_byte_order.c
-		src/pcre_chartables.c
-		src/pcre_compile.c
-		src/pcre_exec.c
-		src/pcre_fullinfo.c
-		src/pcre_globals.c
-		src/pcre_maketables.c
-		src/pcre_newline.c
-		src/pcre_ord2utf8.c
-		src/pcre_study.c
-		src/pcre_tables.c
-		src/pcre_dfa_exec.c
-		src/pcre_get.c
-		src/pcre_jit_compile.c
-		src/pcre_refcount.c
-		src/pcre_string_utils.c
-		src/pcre_version.c
-		src/pcre_ucd.c
-		src/pcre_valid_utf8.c
-		src/pcre_xclass.c
+	# pcre2
+	POCO_SOURCES(SRCS pcre2
+		src/pcre2_auto_possess.c
+		src/pcre2_chartables.c
+		src/pcre2_compile.c
+		src/pcre2_config.c
+		src/pcre2_context.c
+		src/pcre2_convert.c
+		src/pcre2_dfa_match.c
+		src/pcre2_error.c
+		src/pcre2_extuni.c
+		src/pcre2_find_bracket.c
+		src/pcre2_jit_compile.c
+		src/pcre2_maketables.c
+		src/pcre2_match.c
+		src/pcre2_match_data.c
+		src/pcre2_newline.c
+		src/pcre2_ord2utf.c
+		src/pcre2_pattern_info.c
+		src/pcre2_script_run.c
+		src/pcre2_serialize.c
+		src/pcre2_string_utils.c
+		src/pcre2_study.c
+		src/pcre2_substitute.c
+		src/pcre2_substring.c
+		src/pcre2_tables.c
+		src/pcre2_ucd.c
+		src/pcre2_valid_utf.c
+		src/pcre2_xclass.c
 	)
 
 	# zlib
@@ -101,7 +107,7 @@ set_target_properties(Foundation
 )
 
 if(POCO_UNBUNDLED)
-	target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB)
+	target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB)
 	target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED)
 endif(POCO_UNBUNDLED)
 
@@ -222,7 +228,7 @@ if(ANDROID)
 			POCO_NO_WSTRING
 			POCO_NO_SHAREDMEMORY
 	)
-	target_link_libraries(Foundation PUBLIC log)
+	target_link_libraries(Foundation PUBLIC -llog)
 endif()
 
 POCO_INSTALL(Foundation)
diff --git a/Foundation/Foundation_vs140.vcxproj b/Foundation/Foundation_vs140.vcxproj
index 384462d1a..1dc961f2e 100644
--- a/Foundation/Foundation_vs140.vcxproj
+++ b/Foundation/Foundation_vs140.vcxproj
@@ -1024,27 +1024,75 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
+    <ClCompile Include="src\pcre2_auto_possess.c" />
+    <ClCompile Include="src\pcre2_chartables.c" />
+    <ClCompile Include="src\pcre2_compile.c" />
+    <ClCompile Include="src\pcre2_config.c" />
+    <ClCompile Include="src\pcre2_context.c" />
+    <ClCompile Include="src\pcre2_convert.c" />
+    <ClCompile Include="src\pcre2_dfa_match.c" />
+    <ClCompile Include="src\pcre2_error.c" />
+    <ClCompile Include="src\pcre2_extuni.c" />
+    <ClCompile Include="src\pcre2_find_bracket.c" />
+    <ClCompile Include="src\pcre2_jit_compile.c" />
+    <ClCompile Include="src\pcre2_jit_match.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_misc.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_maketables.c" />
+    <ClCompile Include="src\pcre2_match.c" />
+    <ClCompile Include="src\pcre2_match_data.c" />
+    <ClCompile Include="src\pcre2_newline.c" />
+    <ClCompile Include="src\pcre2_ord2utf.c" />
+    <ClCompile Include="src\pcre2_pattern_info.c" />
+    <ClCompile Include="src\pcre2_script_run.c" />
+    <ClCompile Include="src\pcre2_serialize.c" />
+    <ClCompile Include="src\pcre2_string_utils.c" />
+    <ClCompile Include="src\pcre2_study.c" />
+    <ClCompile Include="src\pcre2_substitute.c" />
+    <ClCompile Include="src\pcre2_substring.c" />
+    <ClCompile Include="src\pcre2_tables.c" />
+    <ClCompile Include="src\pcre2_ucd.c" />
+    <ClCompile Include="src\pcre2_ucptables.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_valid_utf.c" />
+    <ClCompile Include="src\pcre2_xclass.c" />
     <ClCompile Include="src\Pipe.cpp" />
     <ClCompile Include="src\PipeImpl.cpp" />
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
@@ -1725,12 +1773,13 @@
     <ClInclude Include="src\inffixed.h" />
     <ClInclude Include="src\inflate.h" />
     <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
+    <ClInclude Include="src\pcre2.h" />
+    <ClInclude Include="src\pcre2_config.h" />
+    <ClInclude Include="src\pcre2_internal.h" />
+    <ClInclude Include="src\pcre2_intmodedep.h" />
+    <ClInclude Include="src\pcre2_ucp.h" />
     <ClInclude Include="src\pocomsg.h" />
     <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\ucp.h" />
     <ClInclude Include="src\zconf.h" />
     <ClInclude Include="src\zlib.h" />
     <ClInclude Include="src\zutil.h" />
diff --git a/Foundation/Foundation_vs140.vcxproj.filters b/Foundation/Foundation_vs140.vcxproj.filters
index c13fe7482..319858164 100644
--- a/Foundation/Foundation_vs140.vcxproj.filters
+++ b/Foundation/Foundation_vs140.vcxproj.filters
@@ -52,18 +52,12 @@
     <Filter Include="RegularExpression">
       <UniqueIdentifier>{8d90af25-6c9f-45fb-8af0-7463fab03c44}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{8bd7fdba-6cdf-4cc7-8ffd-e0eef416d7b5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="RegularExpression\Source Files">
       <UniqueIdentifier>{3b04a0e6-f311-428b-af8f-c1a7a3d9fd10}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
       <UniqueIdentifier>{5f191b86-441f-4da7-8b2f-02513d443466}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{f19826b3-7a4b-4d64-aaa3-eb1e084a71b2}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Logging">
       <UniqueIdentifier>{f98d18b5-dfbc-4c35-8654-bf0c3fc815e9}</UniqueIdentifier>
     </Filter>
@@ -187,6 +181,12 @@
     <Filter Include="Dynamic\Source Files">
       <UniqueIdentifier>{7df1fa35-122a-4152-b81f-35be1aabd290}</UniqueIdentifier>
     </Filter>
+    <Filter Include="RegularExpression\PCRE2 Header Files">
+      <UniqueIdentifier>{8bd7fdba-6cdf-4cc7-8ffd-e0eef416d7b5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="RegularExpression\PCRE2 Source Files">
+      <UniqueIdentifier>{f19826b3-7a4b-4d64-aaa3-eb1e084a71b2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Ascii.cpp">
@@ -489,69 +489,6 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_chartables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_compile.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_config.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_dfa_exec.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_exec.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_fullinfo.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_refcount.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_string_utils.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_ucd.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_valid_utf8.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_xclass.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\ArchiveStrategy.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
@@ -888,6 +825,96 @@
     <ClCompile Include="src\DataURIStreamFactory.cpp">
       <Filter>URI\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre2_auto_possess.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_chartables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_compile.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_config.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_compile.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_misc.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_maketables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_match_data.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_newline.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ord2utf.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_pattern_info.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_script_run.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_serialize.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_string_utils.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_study.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_substitute.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_substring.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_tables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ucd.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_context.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_convert.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_dfa_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_error.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_extuni.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_find_bracket.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ucptables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_valid_utf.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_xclass.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1322,18 +1349,6 @@
     <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\pcre.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pcre_config.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pcre_internal.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ucp.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\RegularExpression.h">
       <Filter>RegularExpression\Header Files</Filter>
     </ClInclude>
@@ -1823,6 +1838,21 @@
     <ClInclude Include="include\Poco\DataURIStreamFactory.h">
       <Filter>URI\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\pcre2.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_config.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_internal.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_intmodedep.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_ucp.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_vs150.vcxproj b/Foundation/Foundation_vs150.vcxproj
index 708a99c21..e54736830 100644
--- a/Foundation/Foundation_vs150.vcxproj
+++ b/Foundation/Foundation_vs150.vcxproj
@@ -1024,27 +1024,75 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
+    <ClCompile Include="src\pcre2_auto_possess.c" />
+    <ClCompile Include="src\pcre2_chartables.c" />
+    <ClCompile Include="src\pcre2_compile.c" />
+    <ClCompile Include="src\pcre2_config.c" />
+    <ClCompile Include="src\pcre2_context.c" />
+    <ClCompile Include="src\pcre2_convert.c" />
+    <ClCompile Include="src\pcre2_dfa_match.c" />
+    <ClCompile Include="src\pcre2_error.c" />
+    <ClCompile Include="src\pcre2_extuni.c" />
+    <ClCompile Include="src\pcre2_find_bracket.c" />
+    <ClCompile Include="src\pcre2_jit_compile.c" />
+    <ClCompile Include="src\pcre2_jit_match.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_misc.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_maketables.c" />
+    <ClCompile Include="src\pcre2_match.c" />
+    <ClCompile Include="src\pcre2_match_data.c" />
+    <ClCompile Include="src\pcre2_newline.c" />
+    <ClCompile Include="src\pcre2_ord2utf.c" />
+    <ClCompile Include="src\pcre2_pattern_info.c" />
+    <ClCompile Include="src\pcre2_script_run.c" />
+    <ClCompile Include="src\pcre2_serialize.c" />
+    <ClCompile Include="src\pcre2_string_utils.c" />
+    <ClCompile Include="src\pcre2_study.c" />
+    <ClCompile Include="src\pcre2_substitute.c" />
+    <ClCompile Include="src\pcre2_substring.c" />
+    <ClCompile Include="src\pcre2_tables.c" />
+    <ClCompile Include="src\pcre2_ucd.c" />
+    <ClCompile Include="src\pcre2_ucptables.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_valid_utf.c" />
+    <ClCompile Include="src\pcre2_xclass.c" />
     <ClCompile Include="src\Pipe.cpp" />
     <ClCompile Include="src\PipeImpl.cpp" />
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
@@ -1725,12 +1773,13 @@
     <ClInclude Include="src\inffixed.h" />
     <ClInclude Include="src\inflate.h" />
     <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
+    <ClInclude Include="src\pcre2.h" />
+    <ClInclude Include="src\pcre2_config.h" />
+    <ClInclude Include="src\pcre2_internal.h" />
+    <ClInclude Include="src\pcre2_intmodedep.h" />
+    <ClInclude Include="src\pcre2_ucp.h" />
     <ClInclude Include="src\pocomsg.h" />
     <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\ucp.h" />
     <ClInclude Include="src\zconf.h" />
     <ClInclude Include="src\zlib.h" />
     <ClInclude Include="src\zutil.h" />
diff --git a/Foundation/Foundation_vs150.vcxproj.filters b/Foundation/Foundation_vs150.vcxproj.filters
index c13fe7482..e97e0132c 100644
--- a/Foundation/Foundation_vs150.vcxproj.filters
+++ b/Foundation/Foundation_vs150.vcxproj.filters
@@ -52,18 +52,12 @@
     <Filter Include="RegularExpression">
       <UniqueIdentifier>{8d90af25-6c9f-45fb-8af0-7463fab03c44}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{8bd7fdba-6cdf-4cc7-8ffd-e0eef416d7b5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="RegularExpression\Source Files">
       <UniqueIdentifier>{3b04a0e6-f311-428b-af8f-c1a7a3d9fd10}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
       <UniqueIdentifier>{5f191b86-441f-4da7-8b2f-02513d443466}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{f19826b3-7a4b-4d64-aaa3-eb1e084a71b2}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Logging">
       <UniqueIdentifier>{f98d18b5-dfbc-4c35-8654-bf0c3fc815e9}</UniqueIdentifier>
     </Filter>
@@ -187,6 +181,12 @@
     <Filter Include="Dynamic\Source Files">
       <UniqueIdentifier>{7df1fa35-122a-4152-b81f-35be1aabd290}</UniqueIdentifier>
     </Filter>
+    <Filter Include="RegularExpression\PCRE2 Header Files">
+      <UniqueIdentifier>{8bd7fdba-6cdf-4cc7-8ffd-e0eef416d7b5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="RegularExpression\PCRE2 Source Files">
+      <UniqueIdentifier>{f19826b3-7a4b-4d64-aaa3-eb1e084a71b2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Ascii.cpp">
@@ -489,69 +489,6 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_chartables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_compile.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_config.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_dfa_exec.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_exec.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_fullinfo.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_refcount.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_string_utils.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_ucd.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_valid_utf8.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_xclass.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\ArchiveStrategy.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
@@ -888,6 +825,96 @@
     <ClCompile Include="src\DataURIStreamFactory.cpp">
       <Filter>URI\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre2_auto_possess.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_chartables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_compile.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_config.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_context.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_convert.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_dfa_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_error.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_extuni.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_find_bracket.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_compile.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_misc.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_maketables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_match_data.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_newline.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ord2utf.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_pattern_info.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_script_run.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_serialize.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_string_utils.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_study.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_substitute.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_substring.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_tables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ucd.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ucptables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_valid_utf.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_xclass.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1322,18 +1349,6 @@
     <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\pcre.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pcre_config.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pcre_internal.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ucp.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\RegularExpression.h">
       <Filter>RegularExpression\Header Files</Filter>
     </ClInclude>
@@ -1823,6 +1838,21 @@
     <ClInclude Include="include\Poco\DataURIStreamFactory.h">
       <Filter>URI\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\pcre2.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_config.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_internal.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_intmodedep.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_ucp.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_vs160.vcxproj b/Foundation/Foundation_vs160.vcxproj
index 3d6d4bff5..9a9d92ce2 100644
--- a/Foundation/Foundation_vs160.vcxproj
+++ b/Foundation/Foundation_vs160.vcxproj
@@ -272,6 +272,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -340,6 +341,7 @@
       </DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -397,6 +399,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
@@ -450,6 +453,7 @@
       </DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
@@ -499,6 +503,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
@@ -556,6 +561,7 @@
       </DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>
@@ -1024,27 +1030,75 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
+    <ClCompile Include="src\pcre2_auto_possess.c" />
+    <ClCompile Include="src\pcre2_chartables.c" />
+    <ClCompile Include="src\pcre2_compile.c" />
+    <ClCompile Include="src\pcre2_config.c" />
+    <ClCompile Include="src\pcre2_context.c" />
+    <ClCompile Include="src\pcre2_convert.c" />
+    <ClCompile Include="src\pcre2_dfa_match.c" />
+    <ClCompile Include="src\pcre2_error.c" />
+    <ClCompile Include="src\pcre2_extuni.c" />
+    <ClCompile Include="src\pcre2_find_bracket.c" />
+    <ClCompile Include="src\pcre2_jit_compile.c" />
+    <ClCompile Include="src\pcre2_jit_match.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_misc.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_maketables.c" />
+    <ClCompile Include="src\pcre2_match.c" />
+    <ClCompile Include="src\pcre2_match_data.c" />
+    <ClCompile Include="src\pcre2_newline.c" />
+    <ClCompile Include="src\pcre2_ord2utf.c" />
+    <ClCompile Include="src\pcre2_pattern_info.c" />
+    <ClCompile Include="src\pcre2_script_run.c" />
+    <ClCompile Include="src\pcre2_serialize.c" />
+    <ClCompile Include="src\pcre2_string_utils.c" />
+    <ClCompile Include="src\pcre2_study.c" />
+    <ClCompile Include="src\pcre2_substitute.c" />
+    <ClCompile Include="src\pcre2_substring.c" />
+    <ClCompile Include="src\pcre2_tables.c" />
+    <ClCompile Include="src\pcre2_ucd.c" />
+    <ClCompile Include="src\pcre2_ucptables.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_valid_utf.c" />
+    <ClCompile Include="src\pcre2_xclass.c" />
     <ClCompile Include="src\Pipe.cpp" />
     <ClCompile Include="src\PipeImpl.cpp" />
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
@@ -1725,12 +1779,13 @@
     <ClInclude Include="src\inffixed.h" />
     <ClInclude Include="src\inflate.h" />
     <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
+    <ClInclude Include="src\pcre2.h" />
+    <ClInclude Include="src\pcre2_config.h" />
+    <ClInclude Include="src\pcre2_internal.h" />
+    <ClInclude Include="src\pcre2_intmodedep.h" />
+    <ClInclude Include="src\pcre2_ucp.h" />
     <ClInclude Include="src\pocomsg.h" />
     <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\ucp.h" />
     <ClInclude Include="src\zconf.h" />
     <ClInclude Include="src\zlib.h" />
     <ClInclude Include="src\zutil.h" />
diff --git a/Foundation/Foundation_vs160.vcxproj.filters b/Foundation/Foundation_vs160.vcxproj.filters
index c13fe7482..07fcc124b 100644
--- a/Foundation/Foundation_vs160.vcxproj.filters
+++ b/Foundation/Foundation_vs160.vcxproj.filters
@@ -52,18 +52,12 @@
     <Filter Include="RegularExpression">
       <UniqueIdentifier>{8d90af25-6c9f-45fb-8af0-7463fab03c44}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{8bd7fdba-6cdf-4cc7-8ffd-e0eef416d7b5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="RegularExpression\Source Files">
       <UniqueIdentifier>{3b04a0e6-f311-428b-af8f-c1a7a3d9fd10}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
       <UniqueIdentifier>{5f191b86-441f-4da7-8b2f-02513d443466}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{f19826b3-7a4b-4d64-aaa3-eb1e084a71b2}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Logging">
       <UniqueIdentifier>{f98d18b5-dfbc-4c35-8654-bf0c3fc815e9}</UniqueIdentifier>
     </Filter>
@@ -187,6 +181,12 @@
     <Filter Include="Dynamic\Source Files">
       <UniqueIdentifier>{7df1fa35-122a-4152-b81f-35be1aabd290}</UniqueIdentifier>
     </Filter>
+    <Filter Include="RegularExpression\PCRE2 Header Files">
+      <UniqueIdentifier>{8bd7fdba-6cdf-4cc7-8ffd-e0eef416d7b5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="RegularExpression\PCRE2 Source Files">
+      <UniqueIdentifier>{f19826b3-7a4b-4d64-aaa3-eb1e084a71b2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Ascii.cpp">
@@ -489,69 +489,6 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_chartables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_compile.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_config.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_dfa_exec.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_exec.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_fullinfo.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_refcount.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_string_utils.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_ucd.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_valid_utf8.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_xclass.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\ArchiveStrategy.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
@@ -888,6 +825,96 @@
     <ClCompile Include="src\DataURIStreamFactory.cpp">
       <Filter>URI\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre2_auto_possess.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_chartables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_compile.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_config.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_context.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_convert.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_dfa_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_error.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_extuni.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_find_bracket.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_compile.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_misc.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_maketables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_match_data.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_newline.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ord2utf.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_pattern_info.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_script_run.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_serialize.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_string_utils.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_study.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_substitute.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_substring.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_tables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ucd.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ucptables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_valid_utf.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_xclass.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1322,18 +1349,6 @@
     <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\pcre.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pcre_config.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pcre_internal.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ucp.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\RegularExpression.h">
       <Filter>RegularExpression\Header Files</Filter>
     </ClInclude>
@@ -1823,6 +1838,21 @@
     <ClInclude Include="include\Poco\DataURIStreamFactory.h">
       <Filter>URI\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\pcre2.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_config.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_intmodedep.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_internal.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_ucp.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_vs170.sln b/Foundation/Foundation_vs170.sln
index c17d01b3b..3371a9d6b 100644
--- a/Foundation/Foundation_vs170.sln
+++ b/Foundation/Foundation_vs170.sln
@@ -21,124 +21,178 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\Te
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		debug_shared|x64 = debug_shared|x64
+		debug_static_md|ARM64 = debug_static_md|ARM64
 		debug_static_md|Win32 = debug_static_md|Win32
 		debug_static_md|x64 = debug_static_md|x64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
 		debug_static_mt|Win32 = debug_static_mt|Win32
 		debug_static_mt|x64 = debug_static_mt|x64
+		release_shared|ARM64 = release_shared|ARM64
 		release_shared|Win32 = release_shared|Win32
 		release_shared|x64 = release_shared|x64
+		release_static_md|ARM64 = release_static_md|ARM64
 		release_static_md|Win32 = release_static_md|Win32
 		release_static_md|x64 = release_static_md|x64
+		release_static_mt|ARM64 = release_static_mt|ARM64
 		release_static_mt|Win32 = release_static_mt|Win32
 		release_static_mt|x64 = release_static_mt|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.ActiveCfg = debug_shared|x64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Build.0 = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|ARM64.Build.0 = release_shared|ARM64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Build.0 = release_shared|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Deploy.0 = release_shared|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.ActiveCfg = release_shared|x64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Build.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Build.0 = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
 		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.ActiveCfg = debug_shared|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Build.0 = debug_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|ARM64.Build.0 = release_shared|ARM64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Deploy.0 = release_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.ActiveCfg = release_shared|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Build.0 = release_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Build.0 = release_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.ActiveCfg = debug_shared|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.Build.0 = debug_shared|x64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|ARM64.Build.0 = release_shared|ARM64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|x64.ActiveCfg = release_shared|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|x64.Build.0 = release_shared|x64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.Build.0 = release_static_md|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|x64.Build.0 = release_static_md|x64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.ActiveCfg = debug_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.Build.0 = debug_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|ARM64.ActiveCfg = debug_shared|ARM64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|ARM64.Build.0 = debug_shared|ARM64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.ActiveCfg = debug_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.Build.0 = debug_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|ARM64.ActiveCfg = debug_shared|ARM64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|ARM64.Build.0 = debug_shared|ARM64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.ActiveCfg = debug_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.Build.0 = debug_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|ARM64.Build.0 = release_shared|ARM64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.ActiveCfg = release_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.Build.0 = release_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|ARM64.ActiveCfg = release_shared|ARM64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|ARM64.Build.0 = release_shared|ARM64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.ActiveCfg = release_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.Build.0 = release_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|ARM64.ActiveCfg = release_shared|ARM64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|ARM64.Build.0 = release_shared|ARM64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.ActiveCfg = release_shared|x64
diff --git a/Foundation/Foundation_vs170.vcxproj b/Foundation/Foundation_vs170.vcxproj
index 809095467..0223e151f 100644
--- a/Foundation/Foundation_vs170.vcxproj
+++ b/Foundation/Foundation_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -67,6 +91,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -77,6 +106,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -87,6 +121,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -97,6 +136,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -107,6 +151,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -117,6 +166,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
@@ -125,51 +179,75 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoFoundationd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoFoundation64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoFoundationA64d</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoFoundationmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoFoundationmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoFoundationmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoFoundationmtd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoFoundationmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoFoundationmtd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoFoundation</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoFoundation64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoFoundationA64</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoFoundationmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoFoundationmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoFoundationmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoFoundationmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoFoundationmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoFoundationmt</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -181,6 +259,9 @@
     <OutDir>..\bin64\</OutDir>
     <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\Foundation\$(Configuration)\</IntDir>
@@ -191,6 +272,9 @@
     <OutDir>..\bin64\</OutDir>
     <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <OutDir>..\lib\</OutDir>
     <IntDir>obj\Foundation\$(Configuration)\</IntDir>
@@ -284,6 +368,36 @@
       <ImportLibrary>..\lib64\PocoFoundationd.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoFoundation64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoFoundation64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoFoundationd.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -353,6 +467,41 @@
       <ImportLibrary>..\lib64\PocoFoundation.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoFoundation64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoFoundation.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -402,6 +551,30 @@
       <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ProgramDataBaseFileName>..\libA64\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoFoundationmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -455,6 +628,33 @@
       <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoFoundationmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -504,6 +704,30 @@
       <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ProgramDataBaseFileName>..\libA64\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoFoundationmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -563,6 +787,36 @@
       <OutputFile>..\lib64\PocoFoundationmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+      <OutputFile>..\libA64\PocoFoundationmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\AbstractObserver.cpp" />
     <ClCompile Include="src\ActiveDispatcher.cpp" />
@@ -582,16 +836,22 @@
     <ClCompile Include="src\ByteOrder.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Channel.cpp" />
     <ClCompile Include="src\Checksum.cpp" />
@@ -618,60 +878,84 @@
     <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\DirectoryWatcher.cpp" />
     <ClCompile Include="src\Environment.cpp" />
     <ClCompile Include="src\Environment_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Environment_WIN32U.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Error.cpp" />
     <ClCompile Include="src\ErrorHandler.cpp" />
@@ -682,30 +966,42 @@
     <ClCompile Include="src\Event_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Event_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Exception.cpp" />
     <ClCompile Include="src\FIFOBufferStream.cpp" />
@@ -716,58 +1012,82 @@
     <ClCompile Include="src\FileStream_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\FileStream_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\File_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\File_WIN32U.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Format.cpp" />
     <ClCompile Include="src\Formatter.cpp" />
@@ -776,72 +1096,102 @@
     <ClCompile Include="src\FPEnvironment_C99.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\FPEnvironment_DEC.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\FPEnvironment_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\FPEnvironment_SUN.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\FPEnvironment_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Glob.cpp" />
     <ClCompile Include="src\Hash.cpp" />
@@ -863,30 +1213,42 @@
     <ClCompile Include="src\LogFile_STD.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\LogFile_WIN32U.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Logger.cpp" />
     <ClCompile Include="src\LoggingFactory.cpp" />
@@ -902,88 +1264,124 @@
     <ClCompile Include="src\Mutex_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Mutex_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\NamedEvent.cpp" />
     <ClCompile Include="src\NamedEvent_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\NamedEvent_WIN32U.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\NamedMutex.cpp" />
     <ClCompile Include="src\NamedMutex_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\NamedMutex_WIN32U.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\NestedDiagnosticContext.cpp" />
     <ClCompile Include="src\Notification.cpp" />
@@ -998,96 +1396,192 @@
     <ClCompile Include="src\Path_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Path_WIN32U.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
+    <ClCompile Include="src\pcre2_auto_possess.c" />
+    <ClCompile Include="src\pcre2_chartables.c" />
+    <ClCompile Include="src\pcre2_compile.c" />
+    <ClCompile Include="src\pcre2_config.c" />
+    <ClCompile Include="src\pcre2_context.c" />
+    <ClCompile Include="src\pcre2_convert.c" />
+    <ClCompile Include="src\pcre2_dfa_match.c" />
+    <ClCompile Include="src\pcre2_error.c" />
+    <ClCompile Include="src\pcre2_extuni.c" />
+    <ClCompile Include="src\pcre2_find_bracket.c" />
+    <ClCompile Include="src\pcre2_jit_compile.c" />
+    <ClCompile Include="src\pcre2_jit_match.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_misc.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_maketables.c" />
+    <ClCompile Include="src\pcre2_match.c" />
+    <ClCompile Include="src\pcre2_match_data.c" />
+    <ClCompile Include="src\pcre2_newline.c" />
+    <ClCompile Include="src\pcre2_ord2utf.c" />
+    <ClCompile Include="src\pcre2_pattern_info.c" />
+    <ClCompile Include="src\pcre2_script_run.c" />
+    <ClCompile Include="src\pcre2_serialize.c" />
+    <ClCompile Include="src\pcre2_string_utils.c" />
+    <ClCompile Include="src\pcre2_study.c" />
+    <ClCompile Include="src\pcre2_substitute.c" />
+    <ClCompile Include="src\pcre2_substring.c" />
+    <ClCompile Include="src\pcre2_tables.c" />
+    <ClCompile Include="src\pcre2_ucd.c" />
+    <ClCompile Include="src\pcre2_ucptables.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_valid_utf.c" />
+    <ClCompile Include="src\pcre2_xclass.c" />
     <ClCompile Include="src\Pipe.cpp" />
     <ClCompile Include="src\PipeImpl.cpp" />
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\PipeImpl_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\PipeImpl_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\PipeStream.cpp" />
     <ClCompile Include="src\PriorityNotificationQueue.cpp" />
@@ -1095,30 +1589,42 @@
     <ClCompile Include="src\Process_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Process_WIN32U.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\PurgeStrategy.cpp" />
     <ClCompile Include="src\Random.cpp" />
@@ -1131,59 +1637,83 @@
     <ClCompile Include="src\RWLock_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\RWLock_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Semaphore.cpp" />
     <ClCompile Include="src\Semaphore_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Semaphore_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SHA1Engine.cpp" />
     <ClCompile Include="src\SHA2Engine.cpp" />
@@ -1191,101 +1721,143 @@
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SharedLibrary_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SharedLibrary_WIN32U.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SharedMemory.cpp" />
     <ClCompile Include="src\SharedMemory_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SharedMemory_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SharedMemory_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SignalHandler.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SimpleFileChannel.cpp" />
     <ClCompile Include="src\SortedDirectoryIterator.cpp" />
@@ -1298,32 +1870,44 @@
     <ClCompile Include="src\String.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\StringTokenizer.cpp" />
     <ClCompile Include="src\SynchronizedObject.cpp" />
     <ClCompile Include="src\SyslogChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Task.cpp" />
     <ClCompile Include="src\TaskManager.cpp" />
@@ -1341,30 +1925,42 @@
     <ClCompile Include="src\Thread_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Thread_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\TimedNotificationQueue.cpp" />
     <ClCompile Include="src\Timer.cpp" />
@@ -1374,30 +1970,42 @@
     <ClCompile Include="src\Timezone_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Timezone_WIN32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\Token.cpp" />
     <ClCompile Include="src\trees.c" />
@@ -1725,12 +2333,13 @@
     <ClInclude Include="src\inffixed.h" />
     <ClInclude Include="src\inflate.h" />
     <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
+    <ClInclude Include="src\pcre2.h" />
+    <ClInclude Include="src\pcre2_config.h" />
+    <ClInclude Include="src\pcre2_internal.h" />
+    <ClInclude Include="src\pcre2_intmodedep.h" />
+    <ClInclude Include="src\pcre2_ucp.h" />
     <ClInclude Include="src\pocomsg.h" />
     <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\ucp.h" />
     <ClInclude Include="src\zconf.h" />
     <ClInclude Include="src\zlib.h" />
     <ClInclude Include="src\zutil.h" />
@@ -1740,55 +2349,79 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
     </ResourceCompile>
     <ResourceCompile Include="src\pocomsg.rc" />
   </ItemGroup>
diff --git a/Foundation/Foundation_vs170.vcxproj.filters b/Foundation/Foundation_vs170.vcxproj.filters
index c13fe7482..fc8cd62ce 100644
--- a/Foundation/Foundation_vs170.vcxproj.filters
+++ b/Foundation/Foundation_vs170.vcxproj.filters
@@ -52,18 +52,12 @@
     <Filter Include="RegularExpression">
       <UniqueIdentifier>{8d90af25-6c9f-45fb-8af0-7463fab03c44}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{8bd7fdba-6cdf-4cc7-8ffd-e0eef416d7b5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="RegularExpression\Source Files">
       <UniqueIdentifier>{3b04a0e6-f311-428b-af8f-c1a7a3d9fd10}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
       <UniqueIdentifier>{5f191b86-441f-4da7-8b2f-02513d443466}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{f19826b3-7a4b-4d64-aaa3-eb1e084a71b2}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Logging">
       <UniqueIdentifier>{f98d18b5-dfbc-4c35-8654-bf0c3fc815e9}</UniqueIdentifier>
     </Filter>
@@ -187,6 +181,12 @@
     <Filter Include="Dynamic\Source Files">
       <UniqueIdentifier>{7df1fa35-122a-4152-b81f-35be1aabd290}</UniqueIdentifier>
     </Filter>
+    <Filter Include="RegularExpression\PCRE2 Header Files">
+      <UniqueIdentifier>{8bd7fdba-6cdf-4cc7-8ffd-e0eef416d7b5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="RegularExpression\PCRE2 Source Files">
+      <UniqueIdentifier>{f19826b3-7a4b-4d64-aaa3-eb1e084a71b2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Ascii.cpp">
@@ -489,69 +489,6 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_chartables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_compile.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_config.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_dfa_exec.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_exec.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_fullinfo.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_refcount.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_string_utils.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_ucd.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_valid_utf8.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_xclass.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\ArchiveStrategy.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
@@ -888,6 +825,96 @@
     <ClCompile Include="src\DataURIStreamFactory.cpp">
       <Filter>URI\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre2_auto_possess.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_chartables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_compile.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_config.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_context.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_convert.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_dfa_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_error.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_extuni.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_find_bracket.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_compile.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_jit_misc.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_maketables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_match.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_match_data.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_newline.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ord2utf.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_pattern_info.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_script_run.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_serialize.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_string_utils.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_study.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_substitute.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_substring.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_tables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ucd.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_ucptables.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_valid_utf.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre2_xclass.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1322,18 +1349,6 @@
     <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h">
       <Filter>SharedLibrary\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\pcre.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pcre_config.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pcre_internal.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ucp.h">
-      <Filter>RegularExpression\PCRE Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\RegularExpression.h">
       <Filter>RegularExpression\Header Files</Filter>
     </ClInclude>
@@ -1823,6 +1838,21 @@
     <ClInclude Include="include\Poco\DataURIStreamFactory.h">
       <Filter>URI\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\pcre2.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_config.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_internal.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_ucp.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pcre2_intmodedep.h">
+      <Filter>RegularExpression\PCRE2 Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Makefile b/Foundation/Makefile
index 23d1243a0..c1949c051 100644
--- a/Foundation/Makefile
+++ b/Foundation/Makefile
@@ -35,15 +35,17 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel \
 zlib_objects = adler32 compress crc32 deflate \
 	infback inffast inflate inftrees trees zutil
 
-pcre_objects = pcre_config pcre_chartables pcre_compile pcre_globals pcre_maketables \
-	pcre_study pcre_byte_order pcre_valid_utf8 pcre_dfa_exec pcre_get pcre_jit_compile\
-	pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass pcre_refcount pcre_string_utils \
-	pcre_version
+pcre_objects = pcre2_auto_possess pcre2_chartables pcre2_compile pcre2_config \
+	pcre2_context pcre2_convert pcre2_dfa_match pcre2_error pcre2_extuni \
+	pcre2_find_bracket pcre2_jit_compile pcre2_maketables pcre2_match \
+	pcre2_match_data pcre2_newline pcre2_ord2utf pcre2_pattern_info \
+	pcre2_script_run pcre2_serialize pcre2_string_utils pcre2_study pcre2_substitute \
+	pcre2_substring pcre2_tables pcre2_ucd pcre2_valid_utf pcre2_xclass
 
-pcre_utf8_objects = pcre_ucd pcre_tables
+pcre_utf8_objects = pcre2_ucd pcre2_tables
 
 ifdef POCO_UNBUNDLED
-	SYSLIBS += -lpcre -lz
+	SYSLIBS += -lpcre2-8 -lz
 	objects += $(pcre_utf8_objects)
 else
 	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
diff --git a/Foundation/include/Poco/ASCIIEncoding.h b/Foundation/include/Poco/ASCIIEncoding.h
index e47f61538..d839508db 100644
--- a/Foundation/include/Poco/ASCIIEncoding.h
+++ b/Foundation/include/Poco/ASCIIEncoding.h
@@ -38,7 +38,7 @@ public:
 	int convert(int ch, unsigned char* bytes, int length) const;
 	int queryConvert(const unsigned char* bytes, int length) const;
 	int sequenceLength(const unsigned char* bytes, int length) const;
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Foundation/include/Poco/AbstractDelegate.h b/Foundation/include/Poco/AbstractDelegate.h
index 9dea69a36..0a2b830f0 100644
--- a/Foundation/include/Poco/AbstractDelegate.h
+++ b/Foundation/include/Poco/AbstractDelegate.h
@@ -24,7 +24,7 @@
 namespace Poco {
 
 
-template <class TArgs> 
+template <class TArgs>
 class AbstractDelegate
 	/// Base class for Delegate and Expire.
 {
@@ -37,7 +37,7 @@ public:
 	{
 	}
 
-	virtual ~AbstractDelegate() 
+	virtual ~AbstractDelegate()
 	{
 	}
 
@@ -54,7 +54,7 @@ public:
 
 	virtual void disable() = 0;
 		/// Disables the delegate, which is done prior to removal.
-		
+
 	virtual const AbstractDelegate* unwrap() const
 		/// Returns the unwrapped delegate. Must be overridden by decorators
 		/// like Expire.
@@ -64,7 +64,7 @@ public:
 };
 
 
-template <> 
+template <>
 class AbstractDelegate<void>
 	/// Base class for Delegate and Expire.
 {
@@ -77,7 +77,7 @@ public:
 	{
 	}
 
-	virtual ~AbstractDelegate() 
+	virtual ~AbstractDelegate()
 	{
 	}
 
@@ -94,7 +94,7 @@ public:
 
 	virtual void disable() = 0;
 		/// Disables the delegate, which is done prior to removal.
-		
+
 	virtual const AbstractDelegate* unwrap() const
 		/// Returns the unwrapped delegate. Must be overridden by decorators
 		/// like Expire.
diff --git a/Foundation/include/Poco/AbstractObserver.h b/Foundation/include/Poco/AbstractObserver.h
index 6528660dd..7606878be 100755
--- a/Foundation/include/Poco/AbstractObserver.h
+++ b/Foundation/include/Poco/AbstractObserver.h
@@ -33,7 +33,7 @@ public:
 	AbstractObserver();
 	AbstractObserver(const AbstractObserver& observer);
 	virtual ~AbstractObserver();
-	
+
 	AbstractObserver& operator = (const AbstractObserver& observer);
 
 	virtual void notify(Notification* pNf) const = 0;
diff --git a/Foundation/include/Poco/AbstractPriorityDelegate.h b/Foundation/include/Poco/AbstractPriorityDelegate.h
index c27bc0c3f..dbe367a4e 100644
--- a/Foundation/include/Poco/AbstractPriorityDelegate.h
+++ b/Foundation/include/Poco/AbstractPriorityDelegate.h
@@ -25,7 +25,7 @@
 namespace Poco {
 
 
-template <class TArgs> 
+template <class TArgs>
 class AbstractPriorityDelegate: public AbstractDelegate<TArgs>
 	/// Base class for PriorityDelegate and PriorityExpire.
 	///
@@ -43,7 +43,7 @@ public:
 	{
 	}
 
-	virtual ~AbstractPriorityDelegate() 
+	virtual ~AbstractPriorityDelegate()
 	{
 	}
 
diff --git a/Foundation/include/Poco/AbstractStrategy.h b/Foundation/include/Poco/AbstractStrategy.h
index 0bd8b548f..265804ac4 100644
--- a/Foundation/include/Poco/AbstractStrategy.h
+++ b/Foundation/include/Poco/AbstractStrategy.h
@@ -27,9 +27,9 @@
 namespace Poco {
 
 
-template <class TKey, class TValue> 
+template <class TKey, class TValue>
 class AbstractStrategy
-	/// An AbstractStrategy is the interface for all strategies. 
+	/// An AbstractStrategy is the interface for all strategies.
 {
 public:
 	AbstractStrategy()
@@ -46,7 +46,7 @@ public:
 		onRemove(pSender,args.key());
 		onAdd(pSender, args);
 	}
-	
+
 	virtual void onAdd(const void* pSender, const KeyValueArgs <TKey, TValue>& key) = 0;
 		/// Adds the key to the strategy.
 		/// If for the key already an entry exists, an exception will be thrown.
diff --git a/Foundation/include/Poco/AccessExpirationDecorator.h b/Foundation/include/Poco/AccessExpirationDecorator.h
index 9978185ff..ea0210675 100644
--- a/Foundation/include/Poco/AccessExpirationDecorator.h
+++ b/Foundation/include/Poco/AccessExpirationDecorator.h
@@ -55,7 +55,7 @@ public:
 	~AccessExpirationDecorator()
 	{
 	}
-	
+
 	const Poco::Timespan& getTimeout() const
 	{
 		return _span;
diff --git a/Foundation/include/Poco/AccessExpireCache.h b/Foundation/include/Poco/AccessExpireCache.h
index bb5c57152..f67d57bf9 100644
--- a/Foundation/include/Poco/AccessExpireCache.h
+++ b/Foundation/include/Poco/AccessExpireCache.h
@@ -26,11 +26,11 @@ namespace Poco {
 
 
 template <
-	class TKey, 
-	class TValue, 
-	class TMutex = FastMutex, 
+	class TKey,
+	class TValue,
+	class TMutex = FastMutex,
 	class TEventMutex = FastMutex
-> 
+>
 class AccessExpireCache: public AbstractCache<TKey, TValue, AccessExpireStrategy<TKey, TValue>, TMutex, TEventMutex>
 	/// An AccessExpireCache caches entries for a fixed time period (per default 10 minutes).
 	/// Entries expire when they are not accessed with get() during this time period. Each access resets
@@ -38,11 +38,11 @@ class AccessExpireCache: public AbstractCache<TKey, TValue, AccessExpireStrategy
 	/// Be careful when using an AccessExpireCache. A cache is often used
 	/// like cache.has(x) followed by cache.get x). Note that it could happen
 	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
-	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
+	/// the entry gets invalid, thus leading to an empty SharedPtr being returned
 	/// when "get" is invoked.
 {
 public:
-	AccessExpireCache(Timestamp::TimeDiff expire = 600000): 
+	AccessExpireCache(Timestamp::TimeDiff expire = 600000):
 		AbstractCache<TKey, TValue, AccessExpireStrategy<TKey, TValue>, TMutex, TEventMutex>(AccessExpireStrategy<TKey, TValue>(expire))
 	{
 	}
diff --git a/Foundation/include/Poco/AccessExpireLRUCache.h b/Foundation/include/Poco/AccessExpireLRUCache.h
index 2833894b6..4618a353f 100644
--- a/Foundation/include/Poco/AccessExpireLRUCache.h
+++ b/Foundation/include/Poco/AccessExpireLRUCache.h
@@ -27,10 +27,10 @@
 namespace Poco {
 
 
-template < 
+template <
 	class TKey,
 	class TValue,
-	class TMutex = FastMutex, 
+	class TMutex = FastMutex,
 	class TEventMutex = FastMutex
 >
 class AccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue>, TMutex, TEventMutex>
diff --git a/Foundation/include/Poco/ActiveDispatcher.h b/Foundation/include/Poco/ActiveDispatcher.h
index 578a42087..81c5fbef1 100644
--- a/Foundation/include/Poco/ActiveDispatcher.h
+++ b/Foundation/include/Poco/ActiveDispatcher.h
@@ -21,6 +21,7 @@
 #include "Poco/Foundation.h"
 #include "Poco/Runnable.h"
 #include "Poco/Thread.h"
+#include "Poco/Event.h"
 #include "Poco/ActiveStarter.h"
 #include "Poco/ActiveRunnable.h"
 #include "Poco/NotificationQueue.h"
@@ -35,7 +36,7 @@ class Foundation_API ActiveDispatcher: protected Runnable
 	///
 	/// An active object, which is an ordinary object
 	/// containing ActiveMethod members, executes all
-	/// active methods in their own thread. 
+	/// active methods in their own thread.
 	/// This behavior does not fit the "classic"
 	/// definition of an active object, which serializes
 	/// the execution of active methods (in other words,
@@ -44,7 +45,7 @@ class Foundation_API ActiveDispatcher: protected Runnable
 	///
 	/// Using this class as a base class, the serializing
 	/// behavior for active objects can be implemented.
-	/// 
+	///
 	/// The following example shows how this is done:
 	///
 	///     class ActiveObject: public ActiveDispatcher
@@ -86,7 +87,7 @@ public:
 
 	void cancel();
 		/// Cancels all queued methods.
-		
+
 protected:
 	void run();
 	void stop();
diff --git a/Foundation/include/Poco/ActiveMethod.h b/Foundation/include/Poco/ActiveMethod.h
index 8ab483572..fba154938 100644
--- a/Foundation/include/Poco/ActiveMethod.h
+++ b/Foundation/include/Poco/ActiveMethod.h
@@ -83,7 +83,7 @@ public:
 	{
 		poco_check_ptr (pOwner);
 	}
-	
+
 	ActiveResultType operator () (const ArgType& arg)
 		/// Invokes the ActiveMethod.
 	{
@@ -92,7 +92,7 @@ public:
 		StarterType::start(_pOwner, pRunnable);
 		return result;
 	}
-		
+
 	ActiveMethod(const ActiveMethod& other):
 		_pOwner(other._pOwner),
 		_method(other._method)
@@ -106,7 +106,7 @@ public:
 		return *this;
 	}
 
-	void swap(ActiveMethod& other)
+	void swap(ActiveMethod& other) noexcept
 	{
 		std::swap(_pOwner, other._pOwner);
 		std::swap(_method, other._method);
@@ -175,7 +175,7 @@ public:
 	{
 		poco_check_ptr (pOwner);
 	}
-	
+
 	ActiveResultType operator () (void)
 		/// Invokes the ActiveMethod.
 	{
@@ -184,7 +184,7 @@ public:
 		StarterType::start(_pOwner, pRunnable);
 		return result;
 	}
-		
+
 	ActiveMethod(const ActiveMethod& other):
 		_pOwner(other._pOwner),
 		_method(other._method)
@@ -198,7 +198,7 @@ public:
 		return *this;
 	}
 
-	void swap(ActiveMethod& other)
+	void swap(ActiveMethod& other) noexcept
 	{
 		std::swap(_pOwner, other._pOwner);
 		std::swap(_method, other._method);
diff --git a/Foundation/include/Poco/ActiveResult.h b/Foundation/include/Poco/ActiveResult.h
index 04bd15304..640c55b96 100644
--- a/Foundation/include/Poco/ActiveResult.h
+++ b/Foundation/include/Poco/ActiveResult.h
@@ -33,7 +33,7 @@ template <class ResultType>
 class ActiveResultHolder: public RefCountedObject
 	/// This class holds the result of an asynchronous method
 	/// invocation. It is used to pass the result from the
-	/// execution thread back to the invocation thread. 
+	/// execution thread back to the invocation thread.
 	/// The class uses reference counting for memory management.
 	/// Do not use this class directly, use ActiveResult instead.
 {
@@ -45,26 +45,26 @@ public:
 		/// Creates an ActiveResultHolder.
 	{
 	}
-		
+
 	ResultType& data()
 		/// Returns a reference to the actual result.
 	{
 		poco_check_ptr(_pData);
 		return *_pData;
 	}
-	
+
 	void data(ResultType* pData)
 	{
 		delete _pData;
 		_pData = pData;
 	}
-	
+
 	void wait()
 		/// Pauses the caller until the result becomes available.
 	{
 		_event.wait();
 	}
-	
+
 	bool tryWait(long milliseconds)
 		/// Waits up to the specified interval for the result to
 		/// become available. Returns true if the result became
@@ -72,7 +72,7 @@ public:
 	{
 		return _event.tryWait(milliseconds);
 	}
-	
+
 	void wait(long milliseconds)
 		/// Waits up to the specified interval for the result to
 		/// become available. Throws a TimeoutException if the
@@ -80,20 +80,20 @@ public:
 	{
 		_event.wait(milliseconds);
 	}
-	
+
 	void notify()
 		/// Notifies the invoking thread that the result became available.
 	{
 		_event.set();
 	}
-	
+
 	bool failed() const
 		/// Returns true if the active method failed (and threw an exception).
 		/// Information about the exception can be obtained by calling error().
 	{
 		return _pExc != 0;
 	}
-	
+
 	std::string error() const
 		/// If the active method threw an exception, a textual representation
 		/// of the exception is returned. An empty string is returned if the
@@ -104,21 +104,21 @@ public:
 		else
 			return std::string();
 	}
-	
+
 	Exception* exception() const
 		/// If the active method threw an exception, a clone of the exception
 		/// object is returned, otherwise null.
 	{
 		return _pExc;
 	}
-	
+
 	void error(const Exception& exc)
 		/// Sets the exception.
 	{
 		delete _pExc;
 		_pExc = exc.clone();
 	}
-	
+
 	void error(const std::string& msg)
 		/// Sets the exception.
 	{
@@ -151,13 +151,13 @@ public:
 		/// Creates an ActiveResultHolder.
 	{
 	}
-	
+
 	void wait()
 		/// Pauses the caller until the result becomes available.
 	{
 		_event.wait();
 	}
-	
+
 	bool tryWait(long milliseconds)
 		/// Waits up to the specified interval for the result to
 		/// become available. Returns true if the result became
@@ -165,7 +165,7 @@ public:
 	{
 		return _event.tryWait(milliseconds);
 	}
-	
+
 	void wait(long milliseconds)
 		/// Waits up to the specified interval for the result to
 		/// become available. Throws a TimeoutException if the
@@ -173,20 +173,20 @@ public:
 	{
 		_event.wait(milliseconds);
 	}
-	
+
 	void notify()
 		/// Notifies the invoking thread that the result became available.
 	{
 		_event.set();
 	}
-	
+
 	bool failed() const
 		/// Returns true if the active method failed (and threw an exception).
 		/// Information about the exception can be obtained by calling error().
 	{
 		return _pExc != 0;
 	}
-	
+
 	std::string error() const
 		/// If the active method threw an exception, a textual representation
 		/// of the exception is returned. An empty string is returned if the
@@ -197,21 +197,21 @@ public:
 		else
 			return std::string();
 	}
-	
+
 	Exception* exception() const
 		/// If the active method threw an exception, a clone of the exception
 		/// object is returned, otherwise null.
 	{
 		return _pExc;
 	}
-	
+
 	void error(const Exception& exc)
 		/// Sets the exception.
 	{
 		delete _pExc;
 		_pExc = exc.clone();
 	}
-	
+
 	void error(const std::string& msg)
 		/// Sets the exception.
 	{
@@ -234,8 +234,8 @@ private:
 template <class RT>
 class ActiveResult
 	/// This class holds the result of an asynchronous method
-	/// invocation (see class ActiveMethod). It is used to pass the 
-	/// result from the execution thread back to the invocation thread. 
+	/// invocation (see class ActiveMethod). It is used to pass the
+	/// result from the execution thread back to the invocation thread.
 {
 public:
 	typedef RT ResultType;
@@ -247,20 +247,20 @@ public:
 	{
 		poco_check_ptr (pHolder);
 	}
-	
+
 	ActiveResult(const ActiveResult& result)
 		/// Copy constructor.
 	{
 		_pHolder = result._pHolder;
 		_pHolder->duplicate();
 	}
-	
+
 	~ActiveResult()
 		/// Destroys the result.
 	{
 		_pHolder->release();
 	}
-	
+
 	ActiveResult& operator = (const ActiveResult& result)
 		/// Assignment operator.
 	{
@@ -268,30 +268,30 @@ public:
 		swap(tmp);
 		return *this;
 	}
-	
-	void swap(ActiveResult& result)
+
+	void swap(ActiveResult& result) noexcept
 	{
 		using std::swap;
 		swap(_pHolder, result._pHolder);
 	}
-	
+
 	ResultType& data() const
 		/// Returns a reference to the result data.
 	{
 		return _pHolder->data();
 	}
-	
+
 	void data(ResultType* pValue)
 	{
 		_pHolder->data(pValue);
 	}
-	
+
 	void wait()
 		/// Pauses the caller until the result becomes available.
 	{
 		_pHolder->wait();
 	}
-	
+
 	bool tryWait(long milliseconds)
 		/// Waits up to the specified interval for the result to
 		/// become available. Returns true if the result became
@@ -299,7 +299,7 @@ public:
 	{
 		return _pHolder->tryWait(milliseconds);
 	}
-	
+
 	void wait(long milliseconds)
 		/// Waits up to the specified interval for the result to
 		/// become available. Throws a TimeoutException if the
@@ -307,20 +307,20 @@ public:
 	{
 		_pHolder->wait(milliseconds);
 	}
-	
+
 	bool available() const
 		/// Returns true if a result is available.
 	{
 		return _pHolder->tryWait(0);
 	}
-	
+
 	bool failed() const
 		/// Returns true if the active method failed (and threw an exception).
 		/// Information about the exception can be obtained by calling error().
 	{
 		return _pHolder->failed();
 	}
-	
+
 	std::string error() const
 		/// If the active method threw an exception, a textual representation
 		/// of the exception is returned. An empty string is returned if the
@@ -342,14 +342,14 @@ public:
 	{
 		_pHolder->notify();
 	}
-	
+
 	ResultType& data()
 		/// Returns a non-const reference to the result data. For internal
 		/// use only.
 	{
 		return _pHolder->data();
 	}
-	
+
 	void error(const std::string& msg)
 		/// Sets the failed flag and the exception message.
 	{
@@ -361,7 +361,7 @@ public:
 	{
 		_pHolder->error(exc);
 	}
-	
+
 private:
 	ActiveResult();
 
@@ -373,8 +373,8 @@ private:
 template <>
 class ActiveResult<void>
 	/// This class holds the result of an asynchronous method
-	/// invocation (see class ActiveMethod). It is used to pass the 
-	/// result from the execution thread back to the invocation thread. 
+	/// invocation (see class ActiveMethod). It is used to pass the
+	/// result from the execution thread back to the invocation thread.
 {
 public:
 	typedef ActiveResultHolder<void> ActiveResultHolderType;
@@ -385,20 +385,20 @@ public:
 	{
 		poco_check_ptr (pHolder);
 	}
-	
+
 	ActiveResult(const ActiveResult& result)
 		/// Copy constructor.
 	{
 		_pHolder = result._pHolder;
 		_pHolder->duplicate();
 	}
-	
+
 	~ActiveResult()
 		/// Destroys the result.
 	{
 		_pHolder->release();
 	}
-	
+
 	ActiveResult& operator = (const ActiveResult& result)
 		/// Assignment operator.
 	{
@@ -406,19 +406,19 @@ public:
 		swap(tmp);
 		return *this;
 	}
-	
-	void swap(ActiveResult& result)
+
+	void swap(ActiveResult& result) noexcept
 	{
 		using std::swap;
 		swap(_pHolder, result._pHolder);
 	}
-	
+
 	void wait()
 		/// Pauses the caller until the result becomes available.
 	{
 		_pHolder->wait();
 	}
-	
+
 	bool tryWait(long milliseconds)
 		/// Waits up to the specified interval for the result to
 		/// become available. Returns true if the result became
@@ -426,7 +426,7 @@ public:
 	{
 		return _pHolder->tryWait(milliseconds);
 	}
-	
+
 	void wait(long milliseconds)
 		/// Waits up to the specified interval for the result to
 		/// become available. Throws a TimeoutException if the
@@ -434,20 +434,20 @@ public:
 	{
 		_pHolder->wait(milliseconds);
 	}
-	
+
 	bool available() const
 		/// Returns true if a result is available.
 	{
 		return _pHolder->tryWait(0);
 	}
-	
+
 	bool failed() const
 		/// Returns true if the active method failed (and threw an exception).
 		/// Information about the exception can be obtained by calling error().
 	{
 		return _pHolder->failed();
 	}
-	
+
 	std::string error() const
 		/// If the active method threw an exception, a textual representation
 		/// of the exception is returned. An empty string is returned if the
@@ -469,7 +469,7 @@ public:
 	{
 		_pHolder->notify();
 	}
-	
+
 	void error(const std::string& msg)
 		/// Sets the failed flag and the exception message.
 	{
@@ -481,7 +481,7 @@ public:
 	{
 		_pHolder->error(exc);
 	}
-	
+
 private:
 	ActiveResult();
 
diff --git a/Foundation/include/Poco/ActiveStarter.h b/Foundation/include/Poco/ActiveStarter.h
index b79a31e8f..c1e211738 100644
--- a/Foundation/include/Poco/ActiveStarter.h
+++ b/Foundation/include/Poco/ActiveStarter.h
@@ -28,7 +28,7 @@ namespace Poco {
 
 template <class OwnerType>
 class ActiveStarter
-	/// The default implementation of the StarterType 
+	/// The default implementation of the StarterType
 	/// policy for ActiveMethod. It starts the method
 	/// in its own thread, obtained from the default
 	/// thread pool.
diff --git a/Foundation/include/Poco/Activity.h b/Foundation/include/Poco/Activity.h
index 8329e6d5c..9f5081625 100644
--- a/Foundation/include/Poco/Activity.h
+++ b/Foundation/include/Poco/Activity.h
@@ -42,24 +42,24 @@ class Activity: public Runnable
 	/// be stopped at any time. However, to make stopping
 	/// an activity work, the method implementing the
 	/// activity has to check periodically whether it
-	/// has been requested to stop, and if so, return. 
+	/// has been requested to stop, and if so, return.
 	/// Activities are stopped before the object they belong to is
 	/// destroyed. Methods implementing activities cannot have arguments
-	/// or return values. 
+	/// or return values.
 	///
 	/// Activity objects are used as follows:
 	///
 	///     class ActiveObject
 	///     {
 	///     public:
-	///         ActiveObject(): 
+	///         ActiveObject():
 	///             _activity(this, &ActiveObject::runActivity)
 	///         {
 	///             ...
 	///         }
-	///   
+	///
 	///         ...
-	///  
+	///
 	///     protected:
 	///         void runActivity()
 	///         {
@@ -88,7 +88,7 @@ public:
 	{
 		poco_check_ptr (pOwner);
 	}
-	
+
 	~Activity()
 		/// Stops and destroys the activity.
 	{
@@ -102,7 +102,7 @@ public:
 			poco_unexpected();
 		}
 	}
-	
+
 	void start()
 		/// Starts the activity by acquiring a
 		/// thread for it from the default thread pool.
@@ -113,7 +113,7 @@ public:
 	void start(ThreadPool& pool)
 	{
 		FastMutex::ScopedLock lock(_mutex);
-		
+
 		if (!_running)
 		{
 			_done.reset();
@@ -130,19 +130,20 @@ public:
 			}
 		}
 	}
-	
+
 	void stop()
 		/// Requests to stop the activity.
 	{
 		_stopped = true;
 	}
-	
+
 	void wait()
 		/// Waits for the activity to complete.
 	{
 		if (_running)
 		{
 			_done.wait();
+			_running = false;
 		}
 	}
 
@@ -154,15 +155,16 @@ public:
 		if (_running)
 		{
 			_done.wait(milliseconds);
+			_running = false;
 		}
 	}
-	
+
 	bool isStopped() const
 		/// Returns true if the activity has been requested to stop.
 	{
 		return _stopped;
 	}
-	
+
 	bool isRunning() const
 		/// Returns true if the activity is running.
 	{
@@ -178,14 +180,12 @@ protected:
 		}
 		catch (...)
 		{
-			_running = false;
 			_done.set();
 			throw;
 		}
-		_running = false;
 		_done.set();
 	}
-	
+
 private:
 	Activity();
 	Activity(const Activity&);
diff --git a/Foundation/include/Poco/Any.h b/Foundation/include/Poco/Any.h
index 0480ca258..2321937ee 100644
--- a/Foundation/include/Poco/Any.h
+++ b/Foundation/include/Poco/Any.h
@@ -23,6 +23,9 @@
 #include <cstring>
 
 
+#define poco_any_assert(cond) do { if (!(cond)) std::abort(); } while (0)
+
+
 namespace Poco {
 
 class Any;
@@ -56,6 +59,9 @@ union Placeholder
 	/// (i.e. there will be no heap-allocation). The local buffer size is one byte
 	/// larger - [POCO_SMALL_OBJECT_SIZE + 1], additional byte value indicating
 	/// where the object was allocated (0 => heap, 1 => local).
+	///
+	/// Important: for SOO builds, only same-type (or trivial both-empty no-op)
+	/// swap operation is allowed.
 {
 public:
 	struct Size
@@ -80,12 +86,10 @@ public:
 		destruct(false);
 	}
 
-	void swap(Placeholder& other)
+	void swap(Placeholder& other) noexcept
 	{
-		if (!isLocal() && !other.isLocal())
-			std::swap(pHolder, other.pHolder);
-		else
-			throw Poco::InvalidAccessException("Placeholder::swap()");
+		if (!isEmpty() || !other.isEmpty())
+			std::swap(holder, other.holder);
 	}
 
 	void erase()
@@ -167,7 +171,7 @@ private:
 		delete pHolder;
 	}
 
-	void swap(Placeholder& other)
+	void swap(Placeholder& other) noexcept
 	{
 		std::swap(pHolder, other.pHolder);
 	}
@@ -207,7 +211,7 @@ private:
 
 
 class Any
-	/// An Any class represents a general type and is capable of storing any type, supporting type-safe extraction
+	/// Any class represents a general type and is capable of storing any type, supporting type-safe extraction
 	/// of the internally stored data.
 	///
 	/// Code taken from the Boost 1.33.1 library. Original copyright by Kevlin Henney. Modified for Poco
@@ -247,12 +251,11 @@ public:
 	{
 	}
 
-	Any& swap(Any& other)
+	Any& swap(Any& other) noexcept
 		/// Swaps the content of the two Anys.
 		///
-		/// When small object optimization is enabled, swap only
-		/// has no-throw guarantee when both (*this and other)
-		/// objects are allocated on the heap.
+		/// If an exception occurs during swapping, the program
+		/// execution is aborted.
 	{
 		if (this == &other) return *this;
 
@@ -262,16 +265,15 @@ public:
 		}
 		else
 		{
-			Any tmp(*this);
 			try
 			{
+				Any tmp(*this);
 				construct(other);
 				other = tmp;
 			}
 			catch (...)
 			{
-				construct(tmp);
-				throw;
+				std::abort();
 			}
 		}
 
@@ -307,7 +309,7 @@ public:
 		return _valueHolder.isEmpty();
 	}
 
-	const std::type_info & type() const
+	const std::type_info& type() const
 		/// Returns the type information of the stored content.
 		/// If the Any is empty typeid(void) is returned.
 		/// It is recommended to always query an Any for its type info before
@@ -316,6 +318,14 @@ public:
 		return empty() ? typeid(void) : content()->type();
 	}
 
+	bool local() const
+		/// Returns true if data is held locally (ie. not allocated on the heap).
+		/// If POCO_NO_SOO is defined, it always return false.
+		/// The main purpose of this function is use for testing.
+	{
+		return _valueHolder.isLocal();
+	}
+
 private:
 	class ValueHolder
 	{
@@ -334,7 +344,7 @@ private:
 		{
 		}
 
-		virtual const std::type_info & type() const
+		virtual const std::type_info& type() const
 		{
 			return typeid(ValueType);
 		}
diff --git a/Foundation/include/Poco/ArchiveStrategy.h b/Foundation/include/Poco/ArchiveStrategy.h
index e04605f38..f3344573f 100644
--- a/Foundation/include/Poco/ArchiveStrategy.h
+++ b/Foundation/include/Poco/ArchiveStrategy.h
@@ -32,7 +32,7 @@ class ArchiveCompressor;
 
 
 class Foundation_API ArchiveStrategy
-	/// The ArchiveStrategy is used by FileChannel 
+	/// The ArchiveStrategy is used by FileChannel
 	/// to rename a rotated log file for archiving.
 	///
 	/// Archived files can be automatically compressed,
@@ -48,16 +48,16 @@ public:
 		/// The given LogFile object is deleted.
 
 	void compress(bool flag = true);
-		/// Enables or disables compression of archived files.	
+		/// Enables or disables compression of archived files.
 
 protected:
 	void moveFile(const std::string& oldName, const std::string& newName);
 	bool exists(const std::string& name);
-	
+
 private:
 	ArchiveStrategy(const ArchiveStrategy&);
 	ArchiveStrategy& operator = (const ArchiveStrategy&);
-	
+
 	bool _compress;
 	ArchiveCompressor* _pCompressor;
 };
@@ -84,11 +84,11 @@ public:
 	ArchiveByTimestampStrategy()
 	{
 	}
-	
+
 	~ArchiveByTimestampStrategy()
 	{
 	}
-	
+
 	LogFile* archive(LogFile* pFile)
 		/// Archives the file by appending the current timestamp to the
 		/// file name. If the new file name exists, additionally a monotonic
@@ -99,7 +99,7 @@ public:
 		std::string archPath = path;
 		archPath.append(".");
 		DateTimeFormatter::append(archPath, DT().timestamp(), "%Y%m%d%H%M%S%i");
-		
+
 		if (exists(archPath)) archiveByNumber(archPath);
 		else moveFile(path, archPath);
 
@@ -121,7 +121,7 @@ private:
 			NumberFormatter::append(path, ++n);
 		}
 		while (exists(path));
-		
+
 		while (n >= 0)
 		{
 			std::string oldPath = basePath;
diff --git a/Foundation/include/Poco/Array.h b/Foundation/include/Poco/Array.h
index eaae733c9..ff598b85f 100644
--- a/Foundation/include/Poco/Array.h
+++ b/Foundation/include/Poco/Array.h
@@ -159,7 +159,7 @@ public:
 
 	enum { static_size = N };
 
-	void swap (Array<T,N>& y)
+	void swap (Array<T,N>& y) noexcept
 	{
 		std::swap_ranges(begin(),end(),y.begin());
 	}
@@ -246,7 +246,7 @@ bool operator>= (const Array<T,N>& x, const Array<T,N>& y)
 
 
 template<class T, std::size_t N>
-inline void swap (Array<T,N>& x, Array<T,N>& y)
+inline void swap (Array<T,N>& x, Array<T,N>& y) noexcept
 	/// global swap()
 {
 	x.swap(y);
diff --git a/Foundation/include/Poco/Ascii.h b/Foundation/include/Poco/Ascii.h
index e7a8b855d..3556a322f 100644
--- a/Foundation/include/Poco/Ascii.h
+++ b/Foundation/include/Poco/Ascii.h
@@ -55,7 +55,7 @@ public:
 		ACP_GRAPH    = 0x0100,
 		ACP_PRINT    = 0x0200
 	};
-	
+
 	static int properties(int ch);
 		/// Return the ASCII character properties for the
 		/// character with the given ASCII value.
@@ -65,44 +65,44 @@ public:
 
 	static bool hasSomeProperties(int ch, int properties);
 		/// Returns true if the given character is
-		/// within the ASCII range and has at least one of 
+		/// within the ASCII range and has at least one of
 		/// the given properties.
 
 	static bool hasProperties(int ch, int properties);
 		/// Returns true if the given character is
-		/// within the ASCII range and has all of 
+		/// within the ASCII range and has all of
 		/// the given properties.
 
 	static bool isAscii(int ch);
 		/// Returns true iff the given character code is within
 		/// the ASCII range (0 .. 127).
-		
+
 	static bool isSpace(int ch);
 		/// Returns true iff the given character is a whitespace.
-		
+
 	static bool isDigit(int ch);
 		/// Returns true iff the given character is a digit.
 
 	static bool isHexDigit(int ch);
 		/// Returns true iff the given character is a hexadecimal digit.
-		
+
 	static bool isPunct(int ch);
 		/// Returns true iff the given character is a punctuation character.
-		
+
 	static bool isAlpha(int ch);
-		/// Returns true iff the given character is an alphabetic character.	
+		/// Returns true iff the given character is an alphabetic character.
 
 	static bool isAlphaNumeric(int ch);
-		/// Returns true iff the given character is an alphabetic character.	
-		
+		/// Returns true iff the given character is an alphabetic character.
+
 	static bool isLower(int ch);
 		/// Returns true iff the given character is a lowercase alphabetic
 		/// character.
-		
+
 	static bool isUpper(int ch);
 		/// Returns true iff the given character is an uppercase alphabetic
 		/// character.
-		
+
 	static bool isPrintable(int ch);
 		/// Returns true iff the given character is printable.
 
@@ -115,7 +115,7 @@ public:
 		/// If the given character is a lowercase character,
 		/// return its uppercase counterpart, otherwise return
 		/// the character.
-		
+
 private:
 	static const int CHARACTER_PROPERTIES[128];
 };
@@ -126,7 +126,7 @@ private:
 //
 inline int Ascii::properties(int ch)
 {
-	if (isAscii(ch)) 
+	if (isAscii(ch))
 		return CHARACTER_PROPERTIES[ch];
 	else
 		return 0;
diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h
index 700b7f3db..190bae7dd 100644
--- a/Foundation/include/Poco/AsyncChannel.h
+++ b/Foundation/include/Poco/AsyncChannel.h
@@ -25,6 +25,7 @@
 #include "Poco/Runnable.h"
 #include "Poco/AutoPtr.h"
 #include "Poco/NotificationQueue.h"
+#include <atomic>
 
 
 namespace Poco {
@@ -110,6 +111,7 @@ private:
 	NotificationQueue _queue;
 	std::size_t _queueSize = 0;
 	std::size_t _dropCount = 0;
+	std::atomic<bool> _closed;
 };
 
 
diff --git a/Foundation/include/Poco/AutoPtr.h b/Foundation/include/Poco/AutoPtr.h
index 8d6bbacd1..8251f4669 100644
--- a/Foundation/include/Poco/AutoPtr.h
+++ b/Foundation/include/Poco/AutoPtr.h
@@ -194,7 +194,7 @@ public:
 		return assign<Other>(ptr);
 	}
 
-	void swap(AutoPtr& ptr)
+	void swap(AutoPtr& ptr) noexcept
 	{
 		std::swap(_ptr, ptr._ptr);
 	}
@@ -398,7 +398,7 @@ private:
 
 
 template <class C>
-inline void swap(AutoPtr<C>& p1, AutoPtr<C>& p2)
+inline void swap(AutoPtr<C>& p1, AutoPtr<C>& p2) noexcept
 {
 	p1.swap(p2);
 }
diff --git a/Foundation/include/Poco/AutoReleasePool.h b/Foundation/include/Poco/AutoReleasePool.h
index 42c8de7c4..80e11e558 100644
--- a/Foundation/include/Poco/AutoReleasePool.h
+++ b/Foundation/include/Poco/AutoReleasePool.h
@@ -27,10 +27,10 @@ namespace Poco {
 
 template <class C>
 class AutoReleasePool
-	/// An AutoReleasePool implements simple garbage collection for 
+	/// An AutoReleasePool implements simple garbage collection for
 	/// reference-counted objects.
 	/// It temporarily takes ownership of reference-counted objects that
-	/// nobody else wants to take ownership of and releases them 
+	/// nobody else wants to take ownership of and releases them
 	/// at a later, appropriate point in time.
 	///
 	/// Note: The correct way to add an object hold by an AutoPtr<> to
@@ -46,14 +46,14 @@ public:
 		/// Creates the AutoReleasePool.
 	{
 	}
-	
+
 	~AutoReleasePool()
 		/// Destroys the AutoReleasePool and releases
 		/// all objects it currently holds.
 	{
 		release();
 	}
-	
+
 	void add(C* pObject)
 		/// Adds the given object to the AutoReleasePool.
 		/// The object's reference count is not modified
@@ -61,7 +61,7 @@ public:
 		if (pObject)
 			_list.push_back(pObject);
 	}
-	
+
 	void release()
 		/// Releases all objects the AutoReleasePool currently holds
 		/// by calling each object's release() method.
@@ -72,10 +72,10 @@ public:
 			_list.pop_front();
 		}
 	}
-	
+
 private:
 	typedef std::list<C*> ObjectList;
-	
+
 	ObjectList _list;
 };
 
diff --git a/Foundation/include/Poco/Base32Decoder.h b/Foundation/include/Poco/Base32Decoder.h
index c592e552c..bc87205d3 100644
--- a/Foundation/include/Poco/Base32Decoder.h
+++ b/Foundation/include/Poco/Base32Decoder.h
@@ -30,8 +30,8 @@ class Foundation_API Base32DecoderBuf: public UnbufferedStreamBuf
 	/// This streambuf base32-decodes all data read
 	/// from the istream connected to it.
 	///
-	/// Note: For performance reasons, the characters 
-	/// are read directly from the given istream's 
+	/// Note: For performance reasons, the characters
+	/// are read directly from the given istream's
 	/// underlying streambuf, so the state
 	/// of the istream will not reflect that of
 	/// its streambuf.
@@ -39,7 +39,7 @@ class Foundation_API Base32DecoderBuf: public UnbufferedStreamBuf
 public:
 	Base32DecoderBuf(std::istream& istr);
 	~Base32DecoderBuf();
-	
+
 private:
 	int readFromDevice();
 	int readOne();
@@ -48,10 +48,10 @@ private:
 	int             _groupLength;
 	int             _groupIndex;
 	std::streambuf& _buf;
-	
+
 	static unsigned char IN_ENCODING[256];
 	static bool          IN_ENCODING_INIT;
-	
+
 private:
 	Base32DecoderBuf(const Base32DecoderBuf&);
 	Base32DecoderBuf& operator = (const Base32DecoderBuf&);
@@ -71,7 +71,7 @@ public:
 
 protected:
 	Base32DecoderBuf _buf;
-	
+
 private:
 	Base32DecoderIOS(const Base32DecoderIOS&);
 	Base32DecoderIOS& operator = (const Base32DecoderIOS&);
@@ -84,8 +84,8 @@ class Foundation_API Base32Decoder: public Base32DecoderIOS, public std::istream
 	///
 	/// The class implements RFC 4648 - https://tools.ietf.org/html/rfc4648
 	///
-	/// Note: For performance reasons, the characters 
-	/// are read directly from the given istream's 
+	/// Note: For performance reasons, the characters
+	/// are read directly from the given istream's
 	/// underlying streambuf, so the state
 	/// of the istream will not reflect that of
 	/// its streambuf.
diff --git a/Foundation/include/Poco/Base32Encoder.h b/Foundation/include/Poco/Base32Encoder.h
index 47d2e1a11..f36eac89d 100644
--- a/Foundation/include/Poco/Base32Encoder.h
+++ b/Foundation/include/Poco/Base32Encoder.h
@@ -39,7 +39,7 @@ class Foundation_API Base32EncoderBuf: public UnbufferedStreamBuf
 public:
 	Base32EncoderBuf(std::ostream& ostr, bool padding = true);
 	~Base32EncoderBuf();
-	
+
 	int close();
 		/// Closes the stream buffer.
 
@@ -50,9 +50,9 @@ private:
 	int             _groupLength;
 	std::streambuf& _buf;
 	bool		_doPadding;
-	
+
 	static const unsigned char OUT_ENCODING[32];
-	
+
 	friend class Base32DecoderBuf;
 
 	Base32EncoderBuf(const Base32EncoderBuf&);
diff --git a/Foundation/include/Poco/Base64Decoder.h b/Foundation/include/Poco/Base64Decoder.h
index dbccc6f6c..678da50ec 100644
--- a/Foundation/include/Poco/Base64Decoder.h
+++ b/Foundation/include/Poco/Base64Decoder.h
@@ -30,8 +30,8 @@ class Foundation_API Base64DecoderBuf: public UnbufferedStreamBuf
 	/// This streambuf base64-decodes all data read
 	/// from the istream connected to it.
 	///
-	/// Note: For performance reasons, the characters 
-	/// are read directly from the given istream's 
+	/// Note: For performance reasons, the characters
+	/// are read directly from the given istream's
 	/// underlying streambuf, so the state
 	/// of the istream will not reflect that of
 	/// its streambuf.
@@ -88,8 +88,8 @@ class Foundation_API Base64Decoder: public Base64DecoderIOS, public std::istream
 	///
 	/// The class implements RFC 4648 - https://tools.ietf.org/html/rfc4648
 	///
-	/// Note: For performance reasons, the characters 
-	/// are read directly from the given istream's 
+	/// Note: For performance reasons, the characters
+	/// are read directly from the given istream's
 	/// underlying streambuf, so the state
 	/// of the istream will not reflect that of
 	/// its streambuf.
diff --git a/Foundation/include/Poco/Base64Encoder.h b/Foundation/include/Poco/Base64Encoder.h
index 071b9018d..bc39d826b 100644
--- a/Foundation/include/Poco/Base64Encoder.h
+++ b/Foundation/include/Poco/Base64Encoder.h
@@ -59,7 +59,7 @@ public:
 	void setLineLength(int lineLength);
 		/// Specify the line length.
 		///
-		/// After the given number of characters have been written, 
+		/// After the given number of characters have been written,
 		/// a newline character will be written.
 		///
 		/// Specify 0 for an unlimited line length.
diff --git a/Foundation/include/Poco/BasicEvent.h b/Foundation/include/Poco/BasicEvent.h
index 47e37dbde..a4b53101e 100644
--- a/Foundation/include/Poco/BasicEvent.h
+++ b/Foundation/include/Poco/BasicEvent.h
@@ -27,13 +27,13 @@
 namespace Poco {
 
 
-template <class TArgs, class TMutex = FastMutex> 
-class BasicEvent: public AbstractEvent < 
+template <class TArgs, class TMutex = FastMutex>
+class BasicEvent: public AbstractEvent <
 	TArgs, DefaultStrategy<TArgs, AbstractDelegate<TArgs>>,
 	AbstractDelegate<TArgs>,
 	TMutex
 >
-	/// A BasicEvent uses the DefaultStrategy which 
+	/// A BasicEvent uses the DefaultStrategy which
 	/// invokes delegates in the order they have been registered.
 	///
 	/// Please see the AbstractEvent class template documentation
diff --git a/Foundation/include/Poco/Buffer.h b/Foundation/include/Poco/Buffer.h
index 87c59f166..34981e556 100644
--- a/Foundation/include/Poco/Buffer.h
+++ b/Foundation/include/Poco/Buffer.h
@@ -34,6 +34,21 @@ class Buffer
 	///
 	/// This class is useful everywhere where a temporary buffer
 	/// is needed.
+	///
+	/// Note: A Buffer has both a size and a capacity, similar to
+	/// std::vector and std::string. However, upon creation of the
+	/// Buffer, the size always equals the capacity (provided via the
+	/// length argument of the constructor), as the Buffer is meant
+	/// to be filled by directly writing to its contents,
+	/// i.e., by passing the pointer to the first element
+	/// of the buffer obtained via begin() to a function expecting
+	/// a pointer to a buffer.
+	///
+	/// Therefore, calling append() on a newly created Buffer will
+	/// always expand the buffer size and capacity.
+	/// If you need to create a Buffer and want to write data to it
+	/// by calling append(), the correct steps are to first create
+	/// the Buffer, then call resize(0), and then call append().
 {
 public:
 	Buffer(std::size_t length):
@@ -248,7 +263,7 @@ public:
 		return _capacity * sizeof(T);
 	}
 
-	void swap(Buffer& other)
+	void swap(Buffer& other) noexcept
 	/// Swaps the buffer with another one.
 	{
 		using std::swap;
diff --git a/Foundation/include/Poco/BufferAllocator.h b/Foundation/include/Poco/BufferAllocator.h
index c767fe4ad..9a3083eee 100644
--- a/Foundation/include/Poco/BufferAllocator.h
+++ b/Foundation/include/Poco/BufferAllocator.h
@@ -38,7 +38,7 @@ public:
 	{
 		return new char_type[static_cast<std::size_t>(size)];
 	}
-	
+
 	static void deallocate(char_type* ptr, std::streamsize /*size*/) noexcept
 	{
 		delete [] ptr;
diff --git a/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h b/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h
index 5872c1289..bcb839fe8 100644
--- a/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h
+++ b/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h
@@ -29,9 +29,9 @@
 namespace Poco {
 
 
-template <typename ch, typename tr, typename ba = BufferAllocator<ch>> 
+template <typename ch, typename tr, typename ba = BufferAllocator<ch>>
 class BasicBufferedBidirectionalStreamBuf: public std::basic_streambuf<ch, tr>
-	/// This is an implementation of a buffered bidirectional 
+	/// This is an implementation of a buffered bidirectional
 	/// streambuf that greatly simplifies the implementation of
 	/// custom streambufs of various kinds.
 	/// Derived classes only have to override the methods
@@ -68,13 +68,13 @@ public:
 		Allocator::deallocate(_pReadBuffer, _bufsize);
 		Allocator::deallocate(_pWriteBuffer, _bufsize);
 	}
-	
+
 	virtual int_type overflow(int_type c)
 	{
 		if (!(_mode & IOS::out)) return char_traits::eof();
 
 		if (flushBuffer() == std::streamsize(-1)) return char_traits::eof();
-		if (c != char_traits::eof()) 
+		if (c != char_traits::eof())
 		{
 			*this->pptr() = char_traits::to_char_type(c);
 			this->pbump(1);
@@ -101,12 +101,12 @@ public:
 		this->setg(_pReadBuffer + (4 - putback), _pReadBuffer + 4, _pReadBuffer + 4 + n);
 
 		// return next character
-		return char_traits::to_int_type(*this->gptr());    
+		return char_traits::to_int_type(*this->gptr());
 	}
 
 	virtual int sync()
 	{
-		if (this->pptr() && this->pptr() > this->pbase()) 
+		if (this->pptr() && this->pptr() > this->pbase())
 		{
 			if (flushBuffer() == -1) return -1;
 		}
@@ -123,7 +123,7 @@ protected:
 	{
 		return _mode;
 	}
-	
+
 	void resetBuffers()
 	{
 		this->setg(_pReadBuffer + 4, _pReadBuffer + 4, _pReadBuffer + 4);
@@ -144,7 +144,7 @@ private:
 	int flushBuffer()
 	{
 		int n = int(this->pptr() - this->pbase());
-		if (writeToDevice(this->pbase(), n) == n) 
+		if (writeToDevice(this->pbase(), n) == n)
 		{
 			this->pbump(-n);
 			return n;
@@ -169,7 +169,7 @@ private:
 // instantiation - to avoid duplicate symbols due to multiple
 // instantiations in different libraries.
 //
-#if defined(_MSC_VER) && defined(POCO_DLL) && !defined(Foundation_EXPORTS) 
+#if defined(_MSC_VER) && defined(POCO_DLL) && !defined(Foundation_EXPORTS)
 template class Foundation_API BasicBufferedBidirectionalStreamBuf<char, std::char_traits<char>>;
 #endif
 typedef BasicBufferedBidirectionalStreamBuf<char, std::char_traits<char>> BufferedBidirectionalStreamBuf;
diff --git a/Foundation/include/Poco/BufferedStreamBuf.h b/Foundation/include/Poco/BufferedStreamBuf.h
index 80de74071..2c64a9f99 100644
--- a/Foundation/include/Poco/BufferedStreamBuf.h
+++ b/Foundation/include/Poco/BufferedStreamBuf.h
@@ -29,7 +29,7 @@
 namespace Poco {
 
 
-template <typename ch, typename tr, typename ba = BufferAllocator<ch>> 
+template <typename ch, typename tr, typename ba = BufferAllocator<ch>>
 class BasicBufferedStreamBuf: public std::basic_streambuf<ch, tr>
 	/// This is an implementation of a buffered streambuf
 	/// that greatly simplifies the implementation of
@@ -59,7 +59,7 @@ public:
 		_pBuffer(Allocator::allocate(_bufsize)),
 		_mode(mode)
 	{
-		this->setg(_pBuffer + 4, _pBuffer + 4, _pBuffer + 4);	
+		this->setg(_pBuffer + 4, _pBuffer + 4, _pBuffer + 4);
 		this->setp(_pBuffer, _pBuffer + _bufsize);
 	}
 
@@ -68,7 +68,7 @@ public:
 		try
 		{
 			Allocator::deallocate(_pBuffer, _bufsize);
-		} 
+		}
 		catch (...)
 		{
 			poco_unexpected();
@@ -80,7 +80,7 @@ public:
 		if (!(_mode & IOS::out)) return char_traits::eof();
 
 		if (flushBuffer() == std::streamsize(-1)) return char_traits::eof();
-		if (c != char_traits::eof()) 
+		if (c != char_traits::eof())
 		{
 			*this->pptr() = char_traits::to_char_type(c);
 			this->pbump(1);
@@ -107,12 +107,12 @@ public:
 		this->setg(_pBuffer + (4 - putback), _pBuffer + 4, _pBuffer + 4 + n);
 
 		// return next character
-		return char_traits::to_int_type(*this->gptr());    
+		return char_traits::to_int_type(*this->gptr());
 	}
 
 	virtual int sync()
 	{
-		if (this->pptr() && this->pptr() > this->pbase()) 
+		if (this->pptr() && this->pptr() > this->pbase())
 		{
 			if (flushBuffer() == -1) return -1;
 		}
@@ -124,7 +124,7 @@ protected:
 	{
 		_mode = mode;
 	}
-	
+
 	openmode getMode() const
 	{
 		return _mode;
@@ -144,7 +144,7 @@ private:
 	int flushBuffer()
 	{
 		int n = int(this->pptr() - this->pbase());
-		if (writeToDevice(this->pbase(), n) == n) 
+		if (writeToDevice(this->pbase(), n) == n)
 		{
 			this->pbump(-n);
 			return n;
diff --git a/Foundation/include/Poco/Bugcheck.h b/Foundation/include/Poco/Bugcheck.h
index ca475b887..6e1e4aae7 100644
--- a/Foundation/include/Poco/Bugcheck.h
+++ b/Foundation/include/Poco/Bugcheck.h
@@ -32,26 +32,26 @@ namespace Poco {
 class Foundation_API Bugcheck
 	/// This class provides some static methods that are
 	/// used by the
-	/// poco_assert_dbg(), poco_assert(), poco_check_ptr(), 
-	/// poco_bugcheck() and poco_unexpected() macros. 
+	/// poco_assert_dbg(), poco_assert(), poco_check_ptr(),
+	/// poco_bugcheck() and poco_unexpected() macros.
 	/// You should not invoke these methods
 	/// directly. Use the macros instead, as they
 	/// automatically provide useful context information.
 {
 public:
-	static void assertion(const char* cond, const char* file, int line, const char* text = 0);
+	[[noreturn]] static void assertion(const char* cond, const char* file, int line, const char* text = 0);
 		/// An assertion failed. Break into the debugger, if
 		/// possible, then throw an AssertionViolationException.
 
-	static void nullPointer(const char* ptr, const char* file, int line);
+	[[noreturn]] static void nullPointer(const char* ptr, const char* file, int line);
 		/// An null pointer was encountered. Break into the debugger, if
 		/// possible, then throw an NullPointerException.
 
-	static void bugcheck(const char* file, int line);
+	[[noreturn]] static void bugcheck(const char* file, int line);
 		/// An internal error was encountered. Break into the debugger, if
 		/// possible, then throw an BugcheckException.
 
-	static void bugcheck(const char* msg, const char* file, int line);
+	[[noreturn]] static void bugcheck(const char* msg, const char* file, int line);
 		/// An internal error was encountered. Break into the debugger, if
 		/// possible, then throw an BugcheckException.
 
@@ -186,7 +186,7 @@ struct POCO_STATIC_ASSERTION_FAILURE<true>
 };
 
 
-template <int x> 
+template <int x>
 struct poco_static_assert_test
 {
 };
diff --git a/Foundation/include/Poco/ByteOrder.h b/Foundation/include/Poco/ByteOrder.h
index a2f8735d1..04159cfbd 100644
--- a/Foundation/include/Poco/ByteOrder.h
+++ b/Foundation/include/Poco/ByteOrder.h
@@ -119,7 +119,7 @@ private:
 		#if (POCO_MSVC_VERSION > 71)
 			#define POCO_HAVE_MSC_BYTESWAP 1
 		#endif
-	#elif defined(__clang__) 
+	#elif defined(__clang__)
 		#if __has_builtin(__builtin_bswap32)
 			#define POCO_HAVE_GCC_BYTESWAP 1
 		#endif
diff --git a/Foundation/include/Poco/Channel.h b/Foundation/include/Poco/Channel.h
index 94caf144d..8b97fc616 100644
--- a/Foundation/include/Poco/Channel.h
+++ b/Foundation/include/Poco/Channel.h
@@ -46,29 +46,29 @@ public:
 		/// the reference count to one.
 
 	virtual void open();
-		/// Does whatever is necessary to open the channel. 
+		/// Does whatever is necessary to open the channel.
 		/// The default implementation does nothing.
-		
+
 	virtual void close();
 		/// Does whatever is necessary to close the channel.
 		/// The default implementation does nothing.
-		
+
 	virtual void log(const Message& msg) = 0;
 		/// Logs the given message to the channel. Must be
 		/// overridden by subclasses.
 		///
 		/// If the channel has not been opened yet, the log()
 		/// method will open it.
-		
+
 	void setProperty(const std::string& name, const std::string& value);
 		/// Throws a PropertyNotSupportedException.
 
 	std::string getProperty(const std::string& name) const;
 		/// Throws a PropertyNotSupportedException.
-		
+
 protected:
 	virtual ~Channel();
-	
+
 private:
 	Channel(const Channel&);
 	Channel& operator = (const Channel&);
diff --git a/Foundation/include/Poco/Checksum.h b/Foundation/include/Poco/Checksum.h
index 3961bb762..9a020f3cc 100644
--- a/Foundation/include/Poco/Checksum.h
+++ b/Foundation/include/Poco/Checksum.h
@@ -28,15 +28,15 @@ class Foundation_API Checksum
 	/// This class calculates CRC-32 or Adler-32 checksums
 	/// for arbitrary data.
 	///
-	/// A cyclic redundancy check (CRC) is a type of hash function, which is used to produce a 
-	/// small, fixed-size checksum of a larger block of data, such as a packet of network 
+	/// A cyclic redundancy check (CRC) is a type of hash function, which is used to produce a
+	/// small, fixed-size checksum of a larger block of data, such as a packet of network
 	/// traffic or a computer file. CRC-32 is one of the most commonly used CRC algorithms.
 	///
-	/// Adler-32 is a checksum algorithm which was invented by Mark Adler. 
-	/// It is almost as reliable as a 32-bit cyclic redundancy check for protecting against 
-	/// accidental modification of data, such as distortions occurring during a transmission, 
+	/// Adler-32 is a checksum algorithm which was invented by Mark Adler.
+	/// It is almost as reliable as a 32-bit cyclic redundancy check for protecting against
+	/// accidental modification of data, such as distortions occurring during a transmission,
 	/// but is significantly faster to calculate in software.
-	
+
 {
 public:
 	enum Type
diff --git a/Foundation/include/Poco/ClassLibrary.h b/Foundation/include/Poco/ClassLibrary.h
index d2a54bdee..e10dbcbfb 100644
--- a/Foundation/include/Poco/ClassLibrary.h
+++ b/Foundation/include/Poco/ClassLibrary.h
@@ -40,7 +40,7 @@ extern "C"
 	bool POCO_LIBRARY_API pocoBuildManifest(Poco::ManifestBase* pManifest);
 	void POCO_LIBRARY_API pocoInitializeLibrary();
 	void POCO_LIBRARY_API pocoUninitializeLibrary();
-} 
+}
 
 
 //
diff --git a/Foundation/include/Poco/ClassLoader.h b/Foundation/include/Poco/ClassLoader.h
index 09f20bb6e..a55c63fdc 100644
--- a/Foundation/include/Poco/ClassLoader.h
+++ b/Foundation/include/Poco/ClassLoader.h
@@ -140,7 +140,7 @@ public:
 	}
 
 	void loadLibrary(const std::string& path, const std::string& manifest)
-		/// Loads a library from the given path, using the given manifest. 
+		/// Loads a library from the given path, using the given manifest.
 		/// Does nothing if the library is already loaded.
 		/// Throws a LibraryLoadException if the library
 		/// cannot be loaded or does not have a Manifest.
@@ -208,9 +208,9 @@ public:
 	{
 		loadLibrary(path, "");
 	}
-		
+
 	void unloadLibrary(const std::string& path)
-		/// Unloads the given library. 
+		/// Unloads the given library.
 		/// Be extremely cautious when unloading shared libraries.
 		/// If objects from the library are still referenced somewhere,
 		/// a total crash is very likely.
@@ -256,7 +256,7 @@ public:
 		}
 		return 0;
 	}
-	
+
 	const Meta& classFor(const std::string& className) const
 		/// Returns a reference to the MetaObject for the given
 		/// class. Throws a NotFoundException if the class
@@ -268,7 +268,7 @@ public:
 		else
 			throw NotFoundException(className);
 	}
-	
+
 	Base* create(const std::string& className) const
 		/// Creates an instance of the given class.
 		/// Throws a NotFoundException if the class
@@ -276,7 +276,7 @@ public:
 	{
 		return classFor(className).create();
 	}
-	
+
 	Base& instance(const std::string& className) const
 		/// Returns a reference to the sole instance of
 		/// the given class. The class must be a singleton,
@@ -286,7 +286,7 @@ public:
 	{
 		return classFor(className).instance();
 	}
-	
+
 	bool canCreate(const std::string& className) const
 		/// Returns true if create() can create new instances
 		/// of the class.
@@ -307,7 +307,7 @@ public:
 	{
 		return classFor(className).isAutoDelete(pObject);
 	}
-	
+
 	const Manif* findManifest(const std::string& path) const
 		/// Returns a pointer to the Manifest for the given
 		/// library, or a null pointer if the library has not been loaded.
@@ -320,7 +320,7 @@ public:
 		else
 			return 0;
 	}
-	
+
 	const Manif& manifestFor(const std::string& path) const
 		/// Returns a reference to the Manifest for the given library
 		/// Throws a NotFoundException if the library has not been loaded.
diff --git a/Foundation/include/Poco/Clock.h b/Foundation/include/Poco/Clock.h
index 1a97851ce..570866c45 100644
--- a/Foundation/include/Poco/Clock.h
+++ b/Foundation/include/Poco/Clock.h
@@ -35,8 +35,8 @@ class Foundation_API Clock
 	/// The monotonic() function can be used to check whether
 	/// the system's clock is monotonic.
 	///
-	/// Monotonic Clock is available on Windows, Linux, OS X 
-	/// and on POSIX platforms supporting clock_gettime() with CLOCK_MONOTONIC.	  
+	/// Monotonic Clock is available on Windows, Linux, OS X
+	/// and on POSIX platforms supporting clock_gettime() with CLOCK_MONOTONIC.
 	///
 	/// Clock values are relative to a system-dependent epoch time
 	/// (usually the system's startup time) and have no relation
@@ -54,22 +54,22 @@ public:
 
 	Clock();
 		/// Creates a Clock with the current system clock value.
-		
+
 	Clock(ClockVal tv);
 		/// Creates a Clock from the given clock value.
-		
+
 	Clock(const Clock& other);
 		/// Copy constructor.
-		
+
 	~Clock();
 		/// Destroys the Clock.
-		
+
 	Clock& operator = (const Clock& other);
 	Clock& operator = (ClockVal tv);
-	
-	void swap(Clock& clock);
+
+	void swap(Clock& clock) noexcept;
 		/// Swaps the Clock with another one.
-	
+
 	void update();
 		/// Updates the Clock with the current system clock.
 
@@ -79,13 +79,13 @@ public:
 	bool operator >= (const Clock& ts) const;
 	bool operator <  (const Clock& ts) const;
 	bool operator <= (const Clock& ts) const;
-	
+
 	Clock  operator +  (ClockDiff d) const;
 	Clock  operator -  (ClockDiff d) const;
 	ClockDiff operator - (const Clock& ts) const;
 	Clock& operator += (ClockDiff d);
 	Clock& operator -= (ClockDiff d);
-	
+
 	ClockVal microseconds() const;
 		/// Returns the clock value expressed in microseconds
 		/// since the system-specific epoch time (usually system
@@ -97,23 +97,23 @@ public:
 		/// startup).
 		///
 		/// Same as microseconds().
-	
+
 	ClockDiff elapsed() const;
 		/// Returns the time elapsed since the time denoted by
 		/// the Clock instance. Equivalent to Clock() - *this.
-	
+
 	bool isElapsed(ClockDiff interval) const;
 		/// Returns true iff the given interval has passed
 		/// since the time denoted by the Clock instance.
-	
+
 	static ClockDiff resolution();
 		/// Returns the resolution in units per second.
 		/// Since the Clock class has microsecond resolution,
 		/// the returned value is always 1000000.
-		
+
 	static ClockDiff accuracy();
 		/// Returns the system's clock accuracy in microseconds.
-		
+
 	static bool monotonic();
 		/// Returns true iff the system's clock is monotonic.
 
@@ -220,7 +220,7 @@ inline Clock::ClockDiff Clock::resolution()
 }
 
 
-inline void swap(Clock& s1, Clock& s2)
+inline void swap(Clock& s1, Clock& s2) noexcept
 {
 	s1.swap(s2);
 }
diff --git a/Foundation/include/Poco/Condition.h b/Foundation/include/Poco/Condition.h
index 3340533df..35e73d779 100644
--- a/Foundation/include/Poco/Condition.h
+++ b/Foundation/include/Poco/Condition.h
@@ -30,8 +30,8 @@ namespace Poco {
 
 
 class Foundation_API Condition
-	/// A Condition is a synchronization object used to block a thread 
-	/// until a particular condition is met. 
+	/// A Condition is a synchronization object used to block a thread
+	/// until a particular condition is met.
 	/// A Condition object is always used in conjunction with
 	/// a Mutex (or FastMutex) object.
 	///
@@ -43,16 +43,16 @@ class Foundation_API Condition
 public:
 	Condition();
 		/// Creates the Condition.
-	
+
 	~Condition();
 		/// Destroys the Condition.
-	
+
 	template <class Mtx>
 	void wait(Mtx& mutex)
 		/// Unlocks the mutex (which must be locked upon calling
 		/// wait()) and waits until the Condition is signalled.
 		///
-		/// The given mutex will be locked again upon 
+		/// The given mutex will be locked again upon
 		/// leaving the function, even in case of an exception.
 	{
 		ScopedUnlock<Mtx> unlock(mutex, false);
@@ -64,13 +64,13 @@ public:
 		}
 		event.wait();
 	}
-	
+
 	template <class Mtx>
 	void wait(Mtx& mutex, long milliseconds)
 		/// Unlocks the mutex (which must be locked upon calling
 		/// wait()) and waits for the given time until the Condition is signalled.
 		///
-		/// The given mutex will be locked again upon successfully leaving the 
+		/// The given mutex will be locked again upon successfully leaving the
 		/// function, even in case of an exception.
 		///
 		/// Throws a TimeoutException if the Condition is not signalled
@@ -79,13 +79,13 @@ public:
 		if (!tryWait(mutex, milliseconds))
 			throw TimeoutException();
 	}
-	
+
 	template <class Mtx>
 	bool tryWait(Mtx& mutex, long milliseconds)
 		/// Unlocks the mutex (which must be locked upon calling
 		/// tryWait()) and waits for the given time until the Condition is signalled.
 		///
-		/// The given mutex will be locked again upon leaving the 
+		/// The given mutex will be locked again upon leaving the
 		/// function, even in case of an exception.
 		///
 		/// Returns true if the Condition has been signalled
@@ -106,7 +106,7 @@ public:
 		}
 		return true;
 	}
-	
+
 	void signal();
 		/// Signals the Condition and allows one waiting thread
 		/// to continue execution.
@@ -119,13 +119,13 @@ protected:
 	void enqueue(Event& event);
 	void dequeue();
 	void dequeue(Event& event);
-	
+
 private:
 	Condition(const Condition&);
 	Condition& operator = (const Condition&);
-	
+
 	typedef std::deque<Event*> WaitQueue;
-	
+
 	FastMutex _mutex;
 	WaitQueue _waitQueue;
 };
diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h
index 5be362978..8de4e610b 100644
--- a/Foundation/include/Poco/Config.h
+++ b/Foundation/include/Poco/Config.h
@@ -79,7 +79,7 @@
 // while those smaller will be placement new-ed into an
 // internal stack-auto-allocated buffer.
 #if !defined(POCO_SMALL_OBJECT_SIZE)
-	#define POCO_SMALL_OBJECT_SIZE 32
+	#define POCO_SMALL_OBJECT_SIZE 64
 #endif
 
 
@@ -87,7 +87,7 @@
 // on platforms with no inotify.
 // #define POCO_NO_INOTIFY
 
-// Define to force the use of PollingDirectoryWatcher 
+// Define to force the use of PollingDirectoryWatcher
 // #define POCO_DW_FORCE_POLLING
 
 
@@ -147,13 +147,12 @@
 // #define POCO_NET_NO_UNIX_SOCKET
 
 
-// Define to nonzero to enable move
-// semantics on classes where it
-// introduces a new state.
-// For explanation, see
+// Define to nonzero to enable move semantics
+// on classes where it introduces a new state.
+// For explanation, see:
 // https://github.com/pocoproject/poco/wiki/Move-Semantics-in-POCO
 #ifndef POCO_NEW_STATE_ON_MOVE
-#define POCO_NEW_STATE_ON_MOVE 1
+// #define POCO_NEW_STATE_ON_MOVE 1
 #endif
 
 
@@ -191,7 +190,7 @@
 //   empty or other value:
 //     Do not link any OpenSSL libraries automatically. You will have to edit the
 //     Visual C++ project files for Crypto and NetSSL_OpenSSL.
-#ifndef POCO_EXTERNAL_OPENSSL
+#if !defined(POCO_EXTERNAL_OPENSSL) && defined(POCO_EXTERNAL_OPENSSL_SLPRO)
 	#define POCO_EXTERNAL_OPENSSL POCO_EXTERNAL_OPENSSL_SLPRO
 #endif
 
diff --git a/Foundation/include/Poco/Configurable.h b/Foundation/include/Poco/Configurable.h
index cb260d382..6a5dd8fd5 100644
--- a/Foundation/include/Poco/Configurable.h
+++ b/Foundation/include/Poco/Configurable.h
@@ -48,15 +48,15 @@ class Foundation_API Configurable
 public:
 	Configurable();
 		/// Creates the Configurable.
-		
+
 	virtual ~Configurable();
 		/// Destroys the Configurable.
-		
+
 	virtual void setProperty(const std::string& name, const std::string& value) = 0;
 		/// Sets the property with the given name to the given value.
 		/// If a property with the given name is not supported, a
 		/// PropertyNotSupportedException is thrown.
-		
+
 	virtual std::string getProperty(const std::string& name) const = 0;
 		/// Returns the value of the property with the given name.
 		/// If a property with the given name is not supported, a
diff --git a/Foundation/include/Poco/ConsoleChannel.h b/Foundation/include/Poco/ConsoleChannel.h
index 0c133abe7..d02eb78a9 100644
--- a/Foundation/include/Poco/ConsoleChannel.h
+++ b/Foundation/include/Poco/ConsoleChannel.h
@@ -34,7 +34,7 @@ class Foundation_API ConsoleChannel: public Channel
 	/// by a newline.
 	///
 	/// Chain this channel to a FormattingChannel with an
-	/// appropriate Formatter to control what is contained 
+	/// appropriate Formatter to control what is contained
 	/// in the text.
 	///
 	/// Similar to StreamChannel, except that a static
@@ -47,13 +47,13 @@ public:
 
 	ConsoleChannel();
 		/// Creates the channel and attaches std::clog.
-		
+
 	ConsoleChannel(std::ostream& str);
 		/// Creates the channel using the given stream.
 
 	void log(const Message& msg);
 		/// Logs the given message to the channel's stream.
-		
+
 protected:
 	~ConsoleChannel();
 
@@ -77,7 +77,7 @@ class Foundation_API ColorConsoleChannel: public Channel
 	/// property to true (default). Furthermore, colors can be
 	/// configured by setting the following properties
 	/// (default values are given in parenthesis):
-	/// 
+	///
 	///   * traceColor (gray)
 	///   * debugColor (gray)
 	///   * informationColor (default)
@@ -88,7 +88,7 @@ class Foundation_API ColorConsoleChannel: public Channel
 	///   * fatalColor (lightRed)
 	///
 	/// The following color values are supported:
-	/// 
+	///
 	///   * default
 	///   * black
 	///   * red
@@ -108,7 +108,7 @@ class Foundation_API ColorConsoleChannel: public Channel
 	///   * white
 	///
 	/// Chain this channel to a FormattingChannel with an
-	/// appropriate Formatter to control what is contained 
+	/// appropriate Formatter to control what is contained
 	/// in the text.
 	///
 	/// Similar to StreamChannel, except that a static
@@ -116,19 +116,19 @@ class Foundation_API ColorConsoleChannel: public Channel
 	/// console channels concurrently writing to the
 	/// same stream.
 {
-public:	
+public:
 	ColorConsoleChannel();
 		/// Creates the channel and attaches std::clog.
-		
+
 	ColorConsoleChannel(std::ostream& str);
 		/// Creates the channel using the given stream.
 
 	void log(const Message& msg);
 		/// Logs the given message to the channel's stream.
-	
+
 	void setProperty(const std::string& name, const std::string& value);
-		/// Sets the property with the given name. 
-		/// 
+		/// Sets the property with the given name.
+		///
 		/// The following properties are supported:
 		///   * enableColors:      Enable or disable colors.
 		///   * traceColor:        Specify color for trace messages.
@@ -147,7 +147,7 @@ public:
 		/// See setProperty() for a description of the supported
 		/// properties.
 
-protected:	
+protected:
 	enum Color
 	{
 		CC_DEFAULT      = 0x0027,
diff --git a/Foundation/include/Poco/CountingStream.h b/Foundation/include/Poco/CountingStream.h
index 730205dee..459d4f338 100644
--- a/Foundation/include/Poco/CountingStream.h
+++ b/Foundation/include/Poco/CountingStream.h
@@ -34,7 +34,7 @@ class Foundation_API CountingStreamBuf: public UnbufferedStreamBuf
 public:
 	CountingStreamBuf();
 		/// Creates an unconnected CountingStreamBuf.
-	
+
 	CountingStreamBuf(std::istream& istr);
 		/// Creates the CountingStreamBuf and connects it
 		/// to the given input stream.
@@ -45,34 +45,34 @@ public:
 
 	~CountingStreamBuf();
 		/// Destroys the CountingStream.
-		
+
 	std::streamsize chars() const;
 		/// Returns the total number of characters.
-		
+
 	std::streamsize lines() const;
 		/// Returns the total number of lines.
-		
+
 	std::streamsize pos() const;
 		/// Returns the number of characters on the current line.
-		
+
 	void reset();
 		/// Resets all counters.
-		
+
 	void setCurrentLineNumber(std::streamsize line);
 		/// Sets the current line number.
 		///
 		/// This is mainly useful when parsing C/C++
 		/// preprocessed source code containing #line directives.
-		
+
 	std::streamsize getCurrentLineNumber() const;
 		/// Returns the current line number (same as lines()).
 
 	void addChars(std::streamsize chars);
 		/// Add to the total number of characters.
-		
+
 	void addLines(std::streamsize lines);
 		/// Add to the total number of lines.
-		
+
 	void addPos(std::streamsize pos);
 		/// Add to the number of characters on the current line.
 
@@ -127,16 +127,16 @@ public:
 		///
 		/// This is mainly useful when parsing C/C++
 		/// preprocessed source code containing #line directives.
-		
+
 	std::streamsize getCurrentLineNumber() const;
 		/// Returns the current line number (same as lines()).
 
 	void addChars(std::streamsize chars);
 		/// Add to the total number of characters.
-		
+
 	void addLines(std::streamsize lines);
 		/// Add to the total number of lines.
-		
+
 	void addPos(std::streamsize pos);
 		/// Add to the number of characters on the current line.
 
@@ -170,7 +170,7 @@ class Foundation_API CountingOutputStream: public CountingIOS, public std::ostre
 public:
 	CountingOutputStream();
 		/// Creates an unconnected CountingOutputStream.
-	
+
 	CountingOutputStream(std::ostream& ostr);
 		/// Creates the CountingOutputStream and connects it
 		/// to the given output stream.
diff --git a/Foundation/include/Poco/DataURIStreamFactory.h b/Foundation/include/Poco/DataURIStreamFactory.h
index 4c0a83b45..6297c59a0 100644
--- a/Foundation/include/Poco/DataURIStreamFactory.h
+++ b/Foundation/include/Poco/DataURIStreamFactory.h
@@ -36,7 +36,7 @@ public:
 
 	~DataURIStreamFactory();
 		/// Destroys the DataURIStreamFactory.
-		
+
 	std::istream* open(const URI& uri);
 		/// Creates an input stream returning decoded data from the given data URI.
 		///
diff --git a/Foundation/include/Poco/DateTime.h b/Foundation/include/Poco/DateTime.h
index f0ee41b99..b95af9039 100644
--- a/Foundation/include/Poco/DateTime.h
+++ b/Foundation/include/Poco/DateTime.h
@@ -37,7 +37,7 @@ class Foundation_API DateTime
 	/// UTC, Julian day and Gregorian calendar dates.
 	///
 	/// The date and time stored in a DateTime is always in UTC
-	/// (Coordinated Universal Time) and thus independent of the 
+	/// (Coordinated Universal Time) and thus independent of the
 	/// timezone in effect on the system.
 	///
 	/// Conversion calculations are based on algorithms
@@ -45,7 +45,7 @@ class Foundation_API DateTime
 	/// http://vsg.cape.com/~pbaum/date/date0.htm
 	///
 	/// Internally, this class stores a date/time in two
-	/// forms (UTC and broken down) for performance reasons. Only use 
+	/// forms (UTC and broken down) for performance reasons. Only use
 	/// this class for conversions between date/time representations.
 	/// Use the Timestamp class for everything else.
 	///
@@ -77,7 +77,7 @@ public:
 		NOVEMBER,
 		DECEMBER
 	};
-	
+
 	enum DaysOfWeek
 		/// Symbolic names for week day numbers (0 to 6).
 	{
@@ -99,7 +99,7 @@ public:
 	DateTime(const Timestamp& timestamp);
 		/// Creates a DateTime for the date and time given in
 		/// a Timestamp.
-		
+
 	DateTime(int year, int month, int day, int hour = 0, int minute = 0, int second = 0, int millisecond = 0, int microsecond = 0);
 		/// Creates a DateTime for the given Gregorian date and time.
 		///   * year is from 0 to 9999.
@@ -129,7 +129,7 @@ public:
 
 	DateTime& operator = (const DateTime& dateTime);
 		/// Assigns another DateTime.
-		
+
 	DateTime& operator = (const Timestamp& timestamp);
 		/// Assigns a Timestamp.
 
@@ -149,66 +149,66 @@ public:
 		///
 		/// Throws an InvalidArgumentException if an argument date is out of range.
 
-	void swap(DateTime& dateTime);
+	void swap(DateTime& dateTime) noexcept;
 		/// Swaps the DateTime with another one.
 
 	int year() const;
 		/// Returns the year.
-		
+
 	int month() const;
 		/// Returns the month (1 to 12).
-	
+
 	int week(int firstDayOfWeek = MONDAY) const;
 		/// Returns the week number within the year.
 		/// FirstDayOfWeek should be either SUNDAY (0) or MONDAY (1).
-		/// The returned week number will be from 0 to 53. Week number 1 is the week 
+		/// The returned week number will be from 0 to 53. Week number 1 is the week
 		/// containing January 4. This is in accordance to ISO 8601.
-		/// 
+		///
 		/// The following example assumes that firstDayOfWeek is MONDAY. For 2005, which started
 		/// on a Saturday, week 1 will be the week starting on Monday, January 3.
 		/// January 1 and 2 will fall within week 0 (or the last week of the previous year).
 		///
 		/// For 2007, which starts on a Monday, week 1 will be the week starting on Monday, January 1.
 		/// There will be no week 0 in 2007.
-	
+
 	int day() const;
 		/// Returns the day within the month (1 to 31).
-		
+
 	int dayOfWeek() const;
 		/// Returns the weekday (0 to 6, where
 		/// 0 = Sunday, 1 = Monday, ..., 6 = Saturday).
-	
+
 	int dayOfYear() const;
 		/// Returns the number of the day in the year.
 		/// January 1 is 1, February 1 is 32, etc.
-	
+
 	int hour() const;
 		/// Returns the hour (0 to 23).
-		
+
 	int hourAMPM() const;
 		/// Returns the hour (0 to 12).
-	
+
 	bool isAM() const;
 		/// Returns true if hour < 12;
 
 	bool isPM() const;
 		/// Returns true if hour >= 12.
-		
+
 	int minute() const;
 		/// Returns the minute (0 to 59).
-		
+
 	int second() const;
 		/// Returns the second (0 to 59).
-		
+
 	int millisecond() const;
 		/// Returns the millisecond (0 to 999)
-	
+
 	int microsecond() const;
 		/// Returns the microsecond (0 to 999)
-	
+
 	double julianDay() const;
 		/// Returns the julian day for the date and time.
-		
+
 	Timestamp timestamp() const;
 		/// Returns the date and time expressed as a Timestamp.
 
@@ -217,12 +217,12 @@ public:
 		/// time. UTC base time is midnight, October 15, 1582.
 		/// Resolution is 100 nanoseconds.
 
-	bool operator == (const DateTime& dateTime) const;	
-	bool operator != (const DateTime& dateTime) const;	
-	bool operator <  (const DateTime& dateTime) const;	
-	bool operator <= (const DateTime& dateTime) const;	
-	bool operator >  (const DateTime& dateTime) const;	
-	bool operator >= (const DateTime& dateTime) const;	
+	bool operator == (const DateTime& dateTime) const;
+	bool operator != (const DateTime& dateTime) const;
+	bool operator <  (const DateTime& dateTime) const;
+	bool operator <= (const DateTime& dateTime) const;
+	bool operator >  (const DateTime& dateTime) const;
+	bool operator >= (const DateTime& dateTime) const;
 
 	DateTime  operator +  (const Timespan& span) const;
 	DateTime  operator -  (const Timespan& span) const;
@@ -256,14 +256,14 @@ public:
 protected:
 	static double toJulianDay(Timestamp::UtcTimeVal utcTime);
 		/// Computes the Julian day for an UTC time.
-	
+
 	static double toJulianDay(int year, int month, int day, int hour = 0, int minute = 0, int second = 0, int millisecond = 0, int microsecond = 0);
 		/// Computes the Julian day for a Gregorian calendar date and time.
 		/// See <http://vsg.cape.com/~pbaum/date/jdimp.htm>, section 2.3.1 for the algorithm.
-	
+
 	static Timestamp::UtcTimeVal toUtcTime(double julianDay);
 		/// Computes the UTC time for a Julian day.
-		
+
 	void computeGregorian(double julianDay);
 		/// Computes the Gregorian date for the given Julian day.
 		/// See <http://vsg.cape.com/~pbaum/date/injdimp.htm>, section 3.3.1 for the algorithm.
@@ -323,19 +323,19 @@ inline int DateTime::year() const
 	return _year;
 }
 
-	
+
 inline int DateTime::month() const
 {
 	return _month;
 }
 
-	
+
 inline int DateTime::day() const
 {
 	return _day;
 }
 
-	
+
 inline int DateTime::hour() const
 {
 	return _hour;
@@ -364,19 +364,19 @@ inline bool DateTime::isPM() const
 	return _hour >= 12;
 }
 
-	
+
 inline int DateTime::minute() const
 {
 	return _minute;
 }
 
-	
+
 inline int DateTime::second() const
 {
 	return _second;
 }
 
-	
+
 inline int DateTime::millisecond() const
 {
 	return _millisecond;
@@ -395,13 +395,13 @@ inline bool DateTime::operator == (const DateTime& dateTime) const
 }
 
 
-inline bool DateTime::operator != (const DateTime& dateTime) const	
+inline bool DateTime::operator != (const DateTime& dateTime) const
 {
 	return _utcTime != dateTime._utcTime;
 }
 
 
-inline bool DateTime::operator <  (const DateTime& dateTime) const	
+inline bool DateTime::operator <  (const DateTime& dateTime) const
 {
 	return _utcTime < dateTime._utcTime;
 }
@@ -419,7 +419,7 @@ inline bool DateTime::operator >  (const DateTime& dateTime) const
 }
 
 
-inline bool DateTime::operator >= (const DateTime& dateTime) const	
+inline bool DateTime::operator >= (const DateTime& dateTime) const
 {
 	return _utcTime >= dateTime._utcTime;
 }
@@ -431,7 +431,7 @@ inline bool DateTime::isLeapYear(int year)
 }
 
 
-inline void swap(DateTime& d1, DateTime& d2)
+inline void swap(DateTime& d1, DateTime& d2) noexcept
 {
 	d1.swap(d2);
 }
diff --git a/Foundation/include/Poco/DateTimeFormat.h b/Foundation/include/Poco/DateTimeFormat.h
index 8f222d091..d550b492f 100644
--- a/Foundation/include/Poco/DateTimeFormat.h
+++ b/Foundation/include/Poco/DateTimeFormat.h
@@ -33,7 +33,7 @@ public:
 	static const std::string ISO8601_FORMAT;
 		/// The date/time format defined in the ISO 8601 standard.
 		///
-		/// Examples: 
+		/// Examples:
 		///   2005-01-01T12:00:00+01:00
 		///   2005-01-01T11:00:00Z
 
@@ -41,21 +41,21 @@ public:
 		/// The date/time format defined in the ISO 8601 standard,
 		/// with fractional seconds.
 		///
-		/// Examples: 
+		/// Examples:
 		///   2005-01-01T12:00:00.000000+01:00
 		///   2005-01-01T11:00:00.000000Z
-	
+
 	static const std::string RFC822_FORMAT;
 		/// The date/time format defined in RFC 822 (obsoleted by RFC 1123).
 		///
-		/// Examples: 
+		/// Examples:
 		///   Sat, 1 Jan 05 12:00:00 +0100
 		///   Sat, 1 Jan 05 11:00:00 GMT
 
 	static const std::string RFC1123_FORMAT;
 		/// The date/time format defined in RFC 1123 (obsoletes RFC 822).
 		///
-		/// Examples: 
+		/// Examples:
 		///   Sat, 1 Jan 2005 12:00:00 +0100
 		///   Sat, 1 Jan 2005 11:00:00 GMT
 
@@ -63,28 +63,28 @@ public:
 		/// The date/time format defined in the HTTP specification (RFC 2616),
 		/// which is basically a variant of RFC 1036 with a zero-padded day field.
 		///
-		/// Examples: 
+		/// Examples:
 		///   Sat, 01 Jan 2005 12:00:00 +0100
 		///   Sat, 01 Jan 2005 11:00:00 GMT
 
 	static const std::string RFC850_FORMAT;
 		/// The date/time format defined in RFC 850 (obsoleted by RFC 1036).
 		///
-		/// Examples: 
+		/// Examples:
 		///   Saturday, 1-Jan-05 12:00:00 +0100
 		///   Saturday, 1-Jan-05 11:00:00 GMT
 
 	static const std::string RFC1036_FORMAT;
 		/// The date/time format defined in RFC 1036 (obsoletes RFC 850).
 		///
-		/// Examples: 
+		/// Examples:
 		///   Saturday, 1 Jan 05 12:00:00 +0100
 		///   Saturday, 1 Jan 05 11:00:00 GMT
 
 	static const std::string ASCTIME_FORMAT;
 		/// The date/time format produced by the ANSI C asctime() function.
 		///
-		/// Example: 
+		/// Example:
 		///   Sat Jan  1 12:00:00 2005
 
 	static const std::string SORTABLE_FORMAT;
@@ -97,9 +97,9 @@ public:
 	// names used by formatter and parser
 	static const std::string WEEKDAY_NAMES[7];
 		/// English names of week days (Sunday, Monday, Tuesday, ...).
-		
+
 	static const std::string MONTH_NAMES[12];
-		/// English names of months (January, February, ...).	
+		/// English names of months (January, February, ...).
 };
 
 
diff --git a/Foundation/include/Poco/DateTimeFormatter.h b/Foundation/include/Poco/DateTimeFormatter.h
index 3d6e5ed80..0a6267d12 100644
--- a/Foundation/include/Poco/DateTimeFormatter.h
+++ b/Foundation/include/Poco/DateTimeFormatter.h
@@ -31,7 +31,7 @@ class Timespan;
 
 
 class Foundation_API DateTimeFormatter
-	/// This class converts dates and times into strings, supporting a  
+	/// This class converts dates and times into strings, supporting a
 	/// variety of standard and custom formats.
 	///
 	/// There are two kind of static member functions:
@@ -43,7 +43,7 @@ class Foundation_API DateTimeFormatter
 public:
 	enum
 	{
-		UTC = 0xFFFF /// Special value for timeZoneDifferential denoting UTC. 
+		UTC = 0xFFFF /// Special value for timeZoneDifferential denoting UTC.
 	};
 
 	static std::string format(const Timestamp& timestamp, const std::string& fmt, int timeZoneDifferential = UTC);
@@ -130,7 +130,7 @@ public:
 		/// Formats the given timezone differential in ISO format.
 		/// If timeZoneDifferential is UTC, "Z" is returned,
 		/// otherwise, +HH.MM (or -HH.MM) is returned.
-		
+
 	static std::string tzdRFC(int timeZoneDifferential);
 		/// Formats the given timezone differential in RFC format.
 		/// If timeZoneDifferential is UTC, "GMT" is returned,
@@ -141,7 +141,7 @@ public:
 		/// and appends it to the given string.
 		/// If timeZoneDifferential is UTC, "Z" is returned,
 		/// otherwise, +HH.MM (or -HH.MM) is returned.
-		
+
 	static void tzdRFC(std::string& str, int timeZoneDifferential);
 		/// Formats the given timezone differential in RFC format
 		/// and appends it to the given string.
diff --git a/Foundation/include/Poco/DateTimeParser.h b/Foundation/include/Poco/DateTimeParser.h
index bd8daf383..0459babe3 100644
--- a/Foundation/include/Poco/DateTimeParser.h
+++ b/Foundation/include/Poco/DateTimeParser.h
@@ -46,7 +46,7 @@ class Foundation_API DateTimeParser
 	/// two or four digits. Years 69-00 are interpreted in the 20th century
 	/// (1969-2000), years 01-68 in the 21th century (2001-2068).
 	///
-	/// Note that in the current implementation all characters other than format specifiers in 
+	/// Note that in the current implementation all characters other than format specifiers in
 	/// the format string are ignored/not matched against the date/time string. This may
 	/// lead to non-error results even with nonsense input strings.
 	/// This may change in a future version to a more strict behavior.
@@ -66,13 +66,13 @@ public:
 		/// Throws a SyntaxException if the string cannot be successfully parsed.
 		/// Please see DateTimeFormatter::format() for a description of the format string.
 		/// Class DateTimeFormat defines format strings for various standard date/time formats.
-		
+
 	static bool tryParse(const std::string& fmt, const std::string& str, DateTime& dateTime, int& timeZoneDifferential);
 		/// Parses a date and time in the given format from the given string.
 		/// Returns true if the string has been successfully parsed, false otherwise.
 		/// Please see DateTimeFormatter::format() for a description of the format string.
 		/// Class DateTimeFormat defines format strings for various standard date/time formats.
-		
+
 	static void parse(const std::string& str, DateTime& dateTime, int& timeZoneDifferential);
 		/// Parses a date and time from the given dateTime string. Before parsing, the method
 		/// examines the dateTime string for a known date/time format.
@@ -85,7 +85,7 @@ public:
 		/// examines the dateTime string for a known date/time format.
 		/// Please see DateTimeFormatter::format() for a description of the format string.
 		/// Class DateTimeFormat defines format strings for various standard date/time formats.
-		
+
 	static bool tryParse(const std::string& str, DateTime& dateTime, int& timeZoneDifferential);
 		/// Parses a date and time from the given dateTime string. Before parsing, the method
 		/// examines the dateTime string for a known date/time format.
@@ -94,16 +94,16 @@ public:
 
 	static int parseMonth(std::string::const_iterator& it, const std::string::const_iterator& end);
 		/// Tries to interpret the given range as a month name. The range must be at least
-		/// three characters long. 
+		/// three characters long.
 		/// Returns the month number (1 .. 12) if the month name is valid. Otherwise throws
 		/// a SyntaxException.
 
 	static int parseDayOfWeek(std::string::const_iterator& it, const std::string::const_iterator& end);
 		/// Tries to interpret the given range as a weekday name. The range must be at least
-		/// three characters long. 
+		/// three characters long.
 		/// Returns the weekday number (0 .. 6, where 0 = Sunday, 1 = Monday, etc.) if the
 		/// weekday name is valid. Otherwise throws a SyntaxException.
-		
+
 protected:
 	static int parseTZD(std::string::const_iterator& it, const std::string::const_iterator& end);
 	static int parseAMPM(std::string::const_iterator& it, const std::string::const_iterator& end, int hour);
diff --git a/Foundation/include/Poco/DefaultStrategy.h b/Foundation/include/Poco/DefaultStrategy.h
index 0291f3553..905acacc4 100644
--- a/Foundation/include/Poco/DefaultStrategy.h
+++ b/Foundation/include/Poco/DefaultStrategy.h
@@ -26,7 +26,7 @@
 namespace Poco {
 
 
-template <class TArgs, class TDelegate> 
+template <class TArgs, class TDelegate>
 class DefaultStrategy: public NotificationStrategy<TArgs, TDelegate>
 	/// Default notification strategy.
 	///
@@ -81,7 +81,7 @@ public:
 			}
 		}
 	}
-	
+
 	void remove(DelegateHandle delegateHandle)
 	{
 		for (Iterator it = _delegates.begin(); it != _delegates.end(); ++it)
diff --git a/Foundation/include/Poco/DeflatingStream.h b/Foundation/include/Poco/DeflatingStream.h
index 8af593e02..d75570714 100644
--- a/Foundation/include/Poco/DeflatingStream.h
+++ b/Foundation/include/Poco/DeflatingStream.h
@@ -57,7 +57,7 @@ public:
 		///
 		/// Please refer to the zlib documentation of deflateInit2() for a description
 		/// of the windowBits parameter.
-		
+
 	DeflatingStreamBuf(std::ostream& ostr, StreamType type, int level);
 		/// Creates a DeflatingStreamBuf for compressing data passed
 		/// through and forwarding it to the given output stream.
@@ -68,12 +68,12 @@ public:
 		///
 		/// Please refer to the zlib documentation of deflateInit2() for a description
 		/// of the windowBits parameter.
-		
+
 	~DeflatingStreamBuf();
 		/// Destroys the DeflatingStreamBuf.
-		
+
 	int close();
-		/// Finishes up the stream. 
+		/// Finishes up the stream.
 		///
 		/// Must be called when deflating to an output stream.
 
@@ -83,7 +83,7 @@ protected:
 	virtual int sync();
 
 private:
-	enum 
+	enum
 	{
 		STREAM_BUFFER_SIZE  = 1024,
 		DEFLATE_BUFFER_SIZE = 32768
@@ -128,10 +128,10 @@ public:
 
 	~DeflatingIOS();
 		/// Destroys the DeflatingIOS.
-		
+
 	DeflatingStreamBuf* rdbuf();
 		/// Returns a pointer to the underlying stream buffer.
-		
+
 protected:
 	DeflatingStreamBuf _buf;
 };
@@ -163,9 +163,9 @@ public:
 
 	~DeflatingOutputStream();
 		/// Destroys the DeflatingOutputStream.
-		
+
 	int close();
-		/// Finishes up the stream. 
+		/// Finishes up the stream.
 		///
 		/// Must be called when deflating to an output stream.
 
diff --git a/Foundation/include/Poco/DigestStream.h b/Foundation/include/Poco/DigestStream.h
index 6976e01aa..5d1de54c3 100644
--- a/Foundation/include/Poco/DigestStream.h
+++ b/Foundation/include/Poco/DigestStream.h
@@ -36,7 +36,7 @@ public:
 	DigestBuf(DigestEngine& eng);
 	DigestBuf(DigestEngine& eng, std::istream& istr);
 	DigestBuf(DigestEngine& eng, std::ostream& ostr);
-	~DigestBuf();	
+	~DigestBuf();
 	int readFromDevice(char* buffer, std::streamsize length);
 	int writeToDevice(const char* buffer, std::streamsize length);
 	void close();
@@ -83,7 +83,7 @@ class Foundation_API DigestOutputStream: public DigestIOS, public std::ostream
 	/// all the data passing through it,
 	/// using a DigestEngine.
 	/// To ensure that all data has been incorporated
-	/// into the digest, call close() or flush() before 
+	/// into the digest, call close() or flush() before
 	/// you obtain the digest from the digest engine.
 {
 public:
diff --git a/Foundation/include/Poco/DirectoryIterator.h b/Foundation/include/Poco/DirectoryIterator.h
index c3cedf3f4..fd8e89db1 100644
--- a/Foundation/include/Poco/DirectoryIterator.h
+++ b/Foundation/include/Poco/DirectoryIterator.h
@@ -40,19 +40,19 @@ class Foundation_API DirectoryIterator
 	///     even is the original iterator has been advanced
 	///     (all copies of an iterator share their state with
 	///     the original iterator)
-	///   * because of this you should only use the prefix 
+	///   * because of this you should only use the prefix
 	///     increment operator
 {
 public:
 	DirectoryIterator();
 		/// Creates the end iterator.
-		
+
 	DirectoryIterator(const std::string& path);
 		/// Creates a directory iterator for the given path.
 
 	DirectoryIterator(const DirectoryIterator& iterator);
 		/// Creates a directory iterator for the given path.
-		
+
 	DirectoryIterator(const File& file);
 		/// Creates a directory iterator for the given file.
 
@@ -64,7 +64,7 @@ public:
 
 	const std::string& name() const;
 		/// Returns the current filename.
-		
+
 	const Path& path() const;
 		/// Returns the current path.
 
@@ -72,18 +72,18 @@ public:
 	DirectoryIterator& operator = (const File& file);
 	DirectoryIterator& operator = (const Path& path);
 	DirectoryIterator& operator = (const std::string& path);
-	
+
 	virtual DirectoryIterator& operator ++ ();   // prefix
-	
+
 	//@ deprecated
 	DirectoryIterator operator ++ (int); // postfix
 		/// Please use the prefix increment operator instead.
-	
+
 	const File& operator * () const;
 	File& operator * ();
 	const File* operator -> () const;
 	File* operator -> ();
-	
+
 	bool operator == (const DirectoryIterator& iterator) const;
 	bool operator != (const DirectoryIterator& iterator) const;
 
@@ -104,7 +104,7 @@ inline const std::string& DirectoryIterator::name() const
 	return _path.getFileName();
 }
 
-	
+
 inline const Path& DirectoryIterator::path() const
 {
 	return _path;
diff --git a/Foundation/include/Poco/DirectoryIterator_UNIX.h b/Foundation/include/Poco/DirectoryIterator_UNIX.h
index d21f71192..c91c970c2 100644
--- a/Foundation/include/Poco/DirectoryIterator_UNIX.h
+++ b/Foundation/include/Poco/DirectoryIterator_UNIX.h
@@ -30,13 +30,13 @@ class Foundation_API DirectoryIteratorImpl
 public:
 	DirectoryIteratorImpl(const std::string& path);
 	~DirectoryIteratorImpl();
-	
+
 	void duplicate();
 	void release();
-	
+
 	const std::string& get() const;
 	const std::string& next();
-	
+
 private:
 	DIR*        _pDir;
 	std::string _current;
diff --git a/Foundation/include/Poco/DirectoryIterator_WIN32U.h b/Foundation/include/Poco/DirectoryIterator_WIN32U.h
index 496842c7f..8035e0adf 100644
--- a/Foundation/include/Poco/DirectoryIterator_WIN32U.h
+++ b/Foundation/include/Poco/DirectoryIterator_WIN32U.h
@@ -30,13 +30,13 @@ class Foundation_API DirectoryIteratorImpl
 public:
 	DirectoryIteratorImpl(const std::string& path);
 	~DirectoryIteratorImpl();
-	
+
 	void duplicate();
 	void release();
-	
+
 	const std::string& get() const;
 	const std::string& next();
-	
+
 private:
 	HANDLE           _fh;
 	WIN32_FIND_DATAW _fd;
diff --git a/Foundation/include/Poco/DirectoryWatcher.h b/Foundation/include/Poco/DirectoryWatcher.h
index 6e3a492fd..2de0c9f2a 100644
--- a/Foundation/include/Poco/DirectoryWatcher.h
+++ b/Foundation/include/Poco/DirectoryWatcher.h
@@ -45,7 +45,7 @@ class Foundation_API DirectoryWatcher: protected Runnable
 	///
 	/// A thread will be created that watches the specified
 	/// directory for changes. Events are reported in the context
-	/// of this thread. 
+	/// of this thread.
 	///
 	/// Note that changes to files in subdirectories of the watched
 	/// directory are not reported. Separate DirectoryWatcher objects
@@ -74,7 +74,7 @@ public:
 	{
 		DW_ITEM_ADDED = 1,
 			/// A new item has been created and added to the directory.
-			
+
 		DW_ITEM_REMOVED = 2,
 			/// An item has been removed from the directory.
 
@@ -96,12 +96,12 @@ public:
 		DW_FILTER_DISABLE_ALL = 0
 			/// Disables all event types.
 	};
-	
+
 	enum
 	{
 		DW_DEFAULT_SCAN_INTERVAL = 5 /// Default scan interval for platforms that don't provide a native notification mechanism.
 	};
-	
+
 	struct DirectoryEvent
 	{
 		DirectoryEvent(const File& f, DirectoryEventType ev):
@@ -113,13 +113,13 @@ public:
 		const File& item;          /// The directory or file that has been changed.
 		DirectoryEventType event;  /// The kind of event.
 	};
-	
+
 	BasicEvent<const DirectoryEvent> itemAdded;
 		/// Fired when a file or directory has been created or added to the directory.
-		
+
 	BasicEvent<const DirectoryEvent> itemRemoved;
 		/// Fired when a file or directory has been removed from the directory.
-		
+
 	BasicEvent<const DirectoryEvent> itemModified;
 		/// Fired when a file or directory has been modified.
 
@@ -128,10 +128,10 @@ public:
 
 	BasicEvent<const DirectoryEvent> itemMovedTo;
 		/// Fired when a file or directory has been moved. This event delivers the new name.
-		
+
 	BasicEvent<const Exception> scanError;
 		/// Fired when an error occurs while scanning for changes.
-	
+
 	DirectoryWatcher(const std::string& path, int eventMask = DW_FILTER_ENABLE_ALL, int scanInterval = DW_DEFAULT_SCAN_INTERVAL);
 		/// Creates a DirectoryWatcher for the directory given in path.
 		/// To enable only specific events, an eventMask can be specified by
@@ -139,7 +139,7 @@ public:
 		/// On platforms where no native filesystem notifications are available,
 		/// scanInterval specifies the interval in seconds between scans
 		/// of the directory.
-		
+
 	DirectoryWatcher(const File& directory, int eventMask = DW_FILTER_ENABLE_ALL, int scanInterval = DW_DEFAULT_SCAN_INTERVAL);
 		/// Creates a DirectoryWatcher for the specified directory
 		/// To enable only specific events, an eventMask can be specified by
@@ -150,30 +150,30 @@ public:
 
 	~DirectoryWatcher();
 		/// Destroys the DirectoryWatcher.
-		
+
 	void suspendEvents();
 		/// Suspends sending of events. Can be called multiple times, but every
 		/// call to suspendEvent() must be matched by a call to resumeEvents().
-		
+
 	void resumeEvents();
 		/// Resumes events, after they have been suspended with a call to suspendEvents().
-		
+
 	bool eventsSuspended() const;
 		/// Returns true iff events are suspended.
-		
+
 	int eventMask() const;
 		/// Returns the value of the eventMask passed to the constructor.
-		
+
 	int scanInterval() const;
 		/// Returns the scan interval in seconds.
-		
+
 	const File& directory() const;
 		/// Returns the directory being watched.
-		
+
 	bool supportsMoveEvents() const;
 		/// Returns true iff the platform supports DW_ITEM_MOVED_FROM/itemMovedFrom and
 		/// DW_ITEM_MOVED_TO/itemMovedTo events.
-	
+
 protected:
 	void init();
 	void stop();
diff --git a/Foundation/include/Poco/Dynamic/Pair.h b/Foundation/include/Poco/Dynamic/Pair.h
index 580427533..166dc28a9 100644
--- a/Foundation/include/Poco/Dynamic/Pair.h
+++ b/Foundation/include/Poco/Dynamic/Pair.h
@@ -67,7 +67,7 @@ public:
 	{
 	}
 
-	Pair& swap(Pair& other)
+	Pair& swap(Pair& other) noexcept
 		/// Swaps the content of the two Pairs.
 	{
 		std::swap(_data, other._data);
diff --git a/Foundation/include/Poco/Dynamic/Struct.h b/Foundation/include/Poco/Dynamic/Struct.h
index 60166cf03..317493f6e 100644
--- a/Foundation/include/Poco/Dynamic/Struct.h
+++ b/Foundation/include/Poco/Dynamic/Struct.h
@@ -173,7 +173,7 @@ public:
 		_data.clear();
 	}
 
-	inline void swap(Struct& other)
+	inline void swap(Struct& other) noexcept
 		/// Swap content of Struct with another Struct
 	{
 		_data.swap(other._data);
diff --git a/Foundation/include/Poco/Dynamic/VarHolder.h b/Foundation/include/Poco/Dynamic/VarHolder.h
index 05138430d..16b99d0a1 100644
--- a/Foundation/include/Poco/Dynamic/VarHolder.h
+++ b/Foundation/include/Poco/Dynamic/VarHolder.h
@@ -409,39 +409,49 @@ private:
 
 	template <typename F, typename T>
 	void checkUpperLimit(const F& from) const
-	{
-		if ((sizeof(T) < sizeof(F)) &&
-			(from > static_cast<F>(std::numeric_limits<T>::max())))
-		{
-			throw RangeException("Value too large.");
-		}
-		else
-		if (from > std::numeric_limits<T>::max())
-		{
-			throw RangeException("Value too large.");
-		}
-	}
-
-	template <typename F, typename T>
-	void checkUpperLimitFloat(const F& from) const
 	{
 		if (from > std::numeric_limits<T>::max())
 			throw RangeException("Value too large.");
 	}
 
-	template <typename F, typename T>
-	void checkLowerLimitFloat(const F& from) const
-	{
-		if (from < -std::numeric_limits<T>::max())
-			throw RangeException("Value too small.");
-	}
-
 	template <typename F, typename T>
 	void checkLowerLimit(const F& from) const
 	{
 		if (from < std::numeric_limits<T>::min())
 			throw RangeException("Value too small.");
 	}
+
+	template <typename F, typename T>
+	void checkUpperLimitFloat(const F& from) const
+	{
+		if (std::is_floating_point<T>::value)
+		{
+			if (from > std::numeric_limits<T>::max())
+				throw RangeException("Value too large.");
+		}
+		else
+		{
+			// Avoid clang -Wimplicit-int-float-conversion warning with an explicit cast.
+			if (from > static_cast<F>(std::numeric_limits<T>::max()))
+				throw RangeException("Value too large.");
+		}
+	}
+
+	template <typename F, typename T>
+	void checkLowerLimitFloat(const F& from) const
+	{
+		if (std::is_floating_point<T>::value)
+		{
+			if (from < -std::numeric_limits<T>::max())
+				throw RangeException("Value too small.");
+		}
+		else
+		{
+			// Avoid clang -Wimplicit-int-float-conversion warning with an explicit cast.
+			if (from < static_cast<F>(std::numeric_limits<T>::min()))
+				throw RangeException("Value too small.");
+		}
+	}
 };
 
 
diff --git a/Foundation/include/Poco/Dynamic/VarIterator.h b/Foundation/include/Poco/Dynamic/VarIterator.h
index 038dfdb5c..eb9129fbc 100644
--- a/Foundation/include/Poco/Dynamic/VarIterator.h
+++ b/Foundation/include/Poco/Dynamic/VarIterator.h
@@ -79,11 +79,11 @@ public:
 		/// Advances by one position and returns current position.
 
 	VarIterator operator ++ (int) const;
-		/// Advances by one position and returns copy of the iterator with 
+		/// Advances by one position and returns copy of the iterator with
 		/// previous current position.
 
 	const VarIterator& operator -- () const;
-		/// Goes back by one position and returns copy of the iterator with 
+		/// Goes back by one position and returns copy of the iterator with
 		/// previous current position.
 
 	VarIterator operator -- (int) const;
@@ -103,15 +103,15 @@ private:
 	VarIterator();
 
 	void increment() const;
-		/// Increments the iterator position by one. 
+		/// Increments the iterator position by one.
 		/// Throws RangeException if position is out of range.
 
 	void decrement() const;
-		/// Decrements the iterator position by one. 
+		/// Decrements the iterator position by one.
 		/// Throws RangeException if position is out of range.
 
 	void setPosition(std::size_t pos) const;
-		/// Sets the iterator position. 
+		/// Sets the iterator position.
 		/// Throws RangeException if position is out of range.
 
 	Var*                _pVar;
diff --git a/Foundation/include/Poco/Environment_UNIX.h b/Foundation/include/Poco/Environment_UNIX.h
index d6ae543ff..1efb4ea15 100644
--- a/Foundation/include/Poco/Environment_UNIX.h
+++ b/Foundation/include/Poco/Environment_UNIX.h
@@ -31,8 +31,8 @@ class Foundation_API EnvironmentImpl
 public:
 	typedef UInt8 NodeId[6]; /// Ethernet address.
 
-	static std::string getImpl(const std::string& name);	
-	static bool hasImpl(const std::string& name);	
+	static std::string getImpl(const std::string& name);
+	static bool hasImpl(const std::string& name);
 	static void setImpl(const std::string& name, const std::string& value);
 	static std::string osNameImpl();
 	static std::string osDisplayNameImpl();
@@ -44,7 +44,7 @@ public:
 
 private:
 	typedef std::map<std::string, std::string> StringMap;
-	
+
 	static StringMap _map;
 	static FastMutex _mutex;
 };
diff --git a/Foundation/include/Poco/Environment_VX.h b/Foundation/include/Poco/Environment_VX.h
index 8eb178d03..8feb6b9f0 100644
--- a/Foundation/include/Poco/Environment_VX.h
+++ b/Foundation/include/Poco/Environment_VX.h
@@ -31,8 +31,8 @@ class Foundation_API EnvironmentImpl
 public:
 	typedef UInt8 NodeId[6]; /// Ethernet address.
 
-	static std::string getImpl(const std::string& name);	
-	static bool hasImpl(const std::string& name);	
+	static std::string getImpl(const std::string& name);
+	static bool hasImpl(const std::string& name);
 	static void setImpl(const std::string& name, const std::string& value);
 	static std::string osNameImpl();
 	static std::string osDisplayNameImpl();
@@ -44,7 +44,7 @@ public:
 
 private:
 	typedef std::map<std::string, std::string> StringMap;
-	
+
 	static StringMap _map;
 	static FastMutex _mutex;
 };
diff --git a/Foundation/include/Poco/Environment_WIN32U.h b/Foundation/include/Poco/Environment_WIN32U.h
index b54afb2e8..f7f5e793b 100644
--- a/Foundation/include/Poco/Environment_WIN32U.h
+++ b/Foundation/include/Poco/Environment_WIN32U.h
@@ -29,10 +29,10 @@ class Foundation_API EnvironmentImpl
 public:
 	typedef UInt8 NodeId[6]; /// Ethernet address.
 
-	static std::string getImpl(const std::string& name);	
-	static bool hasImpl(const std::string& name);	
+	static std::string getImpl(const std::string& name);
+	static bool hasImpl(const std::string& name);
 	static void setImpl(const std::string& name, const std::string& value);
-	static std::string osNameImpl();	
+	static std::string osNameImpl();
 	static std::string osDisplayNameImpl();
 	static std::string osVersionImpl();
 	static std::string osArchitectureImpl();
diff --git a/Foundation/include/Poco/Environment_WINCE.h b/Foundation/include/Poco/Environment_WINCE.h
index 0c92bc540..b513682f6 100644
--- a/Foundation/include/Poco/Environment_WINCE.h
+++ b/Foundation/include/Poco/Environment_WINCE.h
@@ -29,27 +29,27 @@ class Foundation_API EnvironmentImpl
 public:
 	typedef UInt8 NodeId[6]; /// Ethernet address.
 
-	static std::string getImpl(const std::string& name);	
-	static bool hasImpl(const std::string& name);	
+	static std::string getImpl(const std::string& name);
+	static bool hasImpl(const std::string& name);
 	static void setImpl(const std::string& name, const std::string& value);
-	static std::string osNameImpl();	
+	static std::string osNameImpl();
 	static std::string osDisplayNameImpl();
 	static std::string osVersionImpl();
 	static std::string osArchitectureImpl();
 	static std::string nodeNameImpl();
 	static void nodeIdImpl(NodeId& id);
 	static unsigned processorCountImpl();
-	
+
 private:
 	static bool envVar(const std::string& name, std::string* value);
-	
+
 	static const std::string TEMP;
 	static const std::string TMP;
 	static const std::string HOMEPATH;
 	static const std::string COMPUTERNAME;
 	static const std::string OS;
 	static const std::string NUMBER_OF_PROCESSORS;
-	static const std::string PROCESSOR_ARCHITECTURE;	
+	static const std::string PROCESSOR_ARCHITECTURE;
 };
 
 
diff --git a/Foundation/include/Poco/ErrorHandler.h b/Foundation/include/Poco/ErrorHandler.h
index a3eea3b14..bc5a6ae04 100644
--- a/Foundation/include/Poco/ErrorHandler.h
+++ b/Foundation/include/Poco/ErrorHandler.h
@@ -32,7 +32,7 @@ class Foundation_API ErrorHandler
 	/// An unhandled exception that causes a thread to terminate is usually
 	/// silently ignored, since the class library cannot do anything meaningful
 	/// about it.
-	/// 
+	///
 	/// The Thread class provides the possibility to register a
 	/// global ErrorHandler that is invoked whenever a thread has
 	/// been terminated by an unhandled exception.
@@ -57,10 +57,10 @@ public:
 		/// be silently ignored.
 		///
 		/// The default implementation just breaks into the debugger.
-		
+
 	virtual void exception(const std::exception& exc);
 		/// Called when a std::exception (or a subclass)
-		/// caused the thread to terminate.		
+		/// caused the thread to terminate.
 		///
 		/// This method should not throw any exception - it would
 		/// be silently ignored.
@@ -76,16 +76,16 @@ public:
 		/// be silently ignored.
 		///
 		/// The default implementation just breaks into the debugger.
-		
+
 	static void handle(const Exception& exc);
 		/// Invokes the currently registered ErrorHandler.
-		
+
 	static void handle(const std::exception& exc);
 		/// Invokes the currently registered ErrorHandler.
-	
+
 	static void handle();
 		/// Invokes the currently registered ErrorHandler.
-	
+
 	static ErrorHandler* set(ErrorHandler* pHandler);
 		/// Registers the given handler as the current error handler.
 		///
@@ -95,10 +95,10 @@ public:
 		/// Returns a pointer to the currently registered
 		/// ErrorHandler.
 
-protected:	
+protected:
 	static ErrorHandler* defaultHandler();
-		/// Returns the default ErrorHandler.	
-		
+		/// Returns the default ErrorHandler.
+
 private:
 	static ErrorHandler* _pHandler;
 	static FastMutex     _mutex;
diff --git a/Foundation/include/Poco/Event.h b/Foundation/include/Poco/Event.h
index 924961780..c59f29acd 100644
--- a/Foundation/include/Poco/Event.h
+++ b/Foundation/include/Poco/Event.h
@@ -54,7 +54,7 @@ public:
 		/// Creates the event. If type is EVENT_AUTORESET,
 		/// the event is automatically reset after
 		/// a wait() successfully returns.
-		
+
 	//@ deprecated
 	explicit Event(bool autoReset);
 		/// Please use Event::Event(EventType) instead.
@@ -64,7 +64,7 @@ public:
 
 	void set();
 		/// Signals the event. If autoReset is true,
-		/// only one thread waiting for the event 
+		/// only one thread waiting for the event
 		/// can resume execution.
 		/// If autoReset is false, all waiting threads
 		/// can resume execution.
@@ -86,7 +86,7 @@ public:
 
 	void reset();
 		/// Resets the event to unsignalled state.
-	
+
 private:
 	Event(const Event&);
 	Event& operator = (const Event&);
diff --git a/Foundation/include/Poco/EventArgs.h b/Foundation/include/Poco/EventArgs.h
index 006679070..a611995c8 100644
--- a/Foundation/include/Poco/EventArgs.h
+++ b/Foundation/include/Poco/EventArgs.h
@@ -34,7 +34,7 @@ class Foundation_API EventArgs
 {
 public:
 	EventArgs();
-	
+
 	virtual ~EventArgs();
 };
 
diff --git a/Foundation/include/Poco/EventChannel.h b/Foundation/include/Poco/EventChannel.h
index 47761ab3e..94a94cfb0 100644
--- a/Foundation/include/Poco/EventChannel.h
+++ b/Foundation/include/Poco/EventChannel.h
@@ -30,7 +30,7 @@ namespace Poco {
 class Foundation_API EventChannel: public Channel
 	/// The EventChannel fires the messageLogged event for every log message
 	/// received. This can be used to hook custom log message processing into
-	/// the logging framework. 
+	/// the logging framework.
 {
 public:
 	using Ptr = AutoPtr<EventChannel>;
diff --git a/Foundation/include/Poco/EventLogChannel.h b/Foundation/include/Poco/EventLogChannel.h
index fcd18d363..c6f96932f 100644
--- a/Foundation/include/Poco/EventLogChannel.h
+++ b/Foundation/include/Poco/EventLogChannel.h
@@ -41,30 +41,30 @@ public:
 		/// Creates the EventLogChannel.
 		/// The name of the current application (or more correctly,
 		/// the name of its executable) is taken as event source name.
-		
+
 	EventLogChannel(const std::string& name);
 		/// Creates the EventLogChannel with the given event source name.
-		
+
 	EventLogChannel(const std::string& name, const std::string& host);
 		/// Creates an EventLogChannel with the given event source
 		/// name that routes messages to the given host.
-		
+
 	void open();
 		/// Opens the EventLogChannel. If necessary, the
 		/// required registry entries to register a
 		/// message resource DLL are made.
-		
+
 	void close();
 		/// Closes the EventLogChannel.
-	
+
 	void log(const Message& msg);
 		/// Logs the given message to the Windows Event Log.
 		///
 		/// The message type and priority are mapped to
 		/// appropriate values for Event Log type and category.
-		
+
 	void setProperty(const std::string& name, const std::string& value);
-		/// Sets or changes a configuration property. 
+		/// Sets or changes a configuration property.
 		///
 		/// The following properties are supported:
 		///
@@ -73,7 +73,7 @@ public:
 		///              The default is "localhost".
 		///   * host:    same as host.
 		///   * logfile: The name of the log file. The default is "Application".
-		
+
 	std::string getProperty(const std::string& name) const;
 		/// Returns the value of the given property.
 
diff --git a/Foundation/include/Poco/Event_POSIX.h b/Foundation/include/Poco/Event_POSIX.h
index b7eb83aa6..93b64e67c 100644
--- a/Foundation/include/Poco/Event_POSIX.h
+++ b/Foundation/include/Poco/Event_POSIX.h
@@ -22,6 +22,7 @@
 #include "Poco/Exception.h"
 #include <pthread.h>
 #include <errno.h>
+#include <atomic>
 
 
 namespace Poco {
@@ -30,18 +31,18 @@ namespace Poco {
 class Foundation_API EventImpl
 {
 protected:
-	EventImpl(bool autoReset);		
+	EventImpl(bool autoReset);
 	~EventImpl();
 	void setImpl();
 	void waitImpl();
 	bool waitImpl(long milliseconds);
 	void resetImpl();
-	
+
 private:
-	bool            _auto;
-	volatile bool   _state;
-	pthread_mutex_t _mutex;
-	pthread_cond_t  _cond;
+	bool              _auto;
+	std::atomic<bool> _state;
+	pthread_mutex_t   _mutex;
+	pthread_cond_t    _cond;
 };
 
 
@@ -50,7 +51,7 @@ private:
 //
 inline void EventImpl::setImpl()
 {
-	if (pthread_mutex_lock(&_mutex))	
+	if (pthread_mutex_lock(&_mutex))
 		throw SystemException("cannot signal event (lock)");
 	_state = true;
 	if (pthread_cond_broadcast(&_cond))
@@ -64,7 +65,7 @@ inline void EventImpl::setImpl()
 
 inline void EventImpl::resetImpl()
 {
-	if (pthread_mutex_lock(&_mutex))	
+	if (pthread_mutex_lock(&_mutex))
 		throw SystemException("cannot reset event");
 	_state = false;
 	pthread_mutex_unlock(&_mutex);
diff --git a/Foundation/include/Poco/Event_VX.h b/Foundation/include/Poco/Event_VX.h
index 9dd23c75e..81cc1be63 100644
--- a/Foundation/include/Poco/Event_VX.h
+++ b/Foundation/include/Poco/Event_VX.h
@@ -29,13 +29,13 @@ namespace Poco {
 class Foundation_API EventImpl
 {
 protected:
-	EventImpl(bool autoReset);		
+	EventImpl(bool autoReset);
 	~EventImpl();
 	void setImpl();
 	void waitImpl();
 	bool waitImpl(long milliseconds);
 	void resetImpl();
-	
+
 private:
 	bool          _auto;
 	volatile bool _state;
diff --git a/Foundation/include/Poco/Event_WIN32.h b/Foundation/include/Poco/Event_WIN32.h
index 07fdb0984..2862887e6 100644
--- a/Foundation/include/Poco/Event_WIN32.h
+++ b/Foundation/include/Poco/Event_WIN32.h
@@ -21,7 +21,7 @@
 #include "Poco/Foundation.h"
 #include "Poco/Exception.h"
 #include "Poco/UnWindows.h"
-
+#include <atomic>
 
 namespace Poco {
 
@@ -29,15 +29,15 @@ namespace Poco {
 class Foundation_API EventImpl
 {
 protected:
-	EventImpl(bool autoReset);		
+	EventImpl(bool autoReset);
 	~EventImpl();
 	void setImpl();
 	void waitImpl();
 	bool waitImpl(long milliseconds);
 	void resetImpl();
-	
+
 private:
-	HANDLE _event;
+	std::atomic<HANDLE> _event;
 };
 
 
diff --git a/Foundation/include/Poco/Exception.h b/Foundation/include/Poco/Exception.h
index c2d9c8db8..ce6d4d035 100644
--- a/Foundation/include/Poco/Exception.h
+++ b/Foundation/include/Poco/Exception.h
@@ -42,7 +42,7 @@ public:
 
 	Exception(const Exception& exc);
 		/// Copy constructor.
-		
+
 	~Exception() noexcept;
 		/// Destroys the exception and deletes the nested exception.
 
@@ -51,25 +51,25 @@ public:
 
 	virtual const char* name() const noexcept;
 		/// Returns a static string describing the exception.
-		
+
 	virtual const char* className() const noexcept;
 		/// Returns the name of the exception class.
-		
+
 	virtual const char* what() const noexcept;
 		/// Returns a static string describing the exception.
 		///
 		/// Same as name(), but for compatibility with std::exception.
-		
+
 	const Exception* nested() const;
 		/// Returns a pointer to the nested exception, or
 		/// null if no nested exception exists.
-			
+
 	const std::string& message() const;
 		/// Returns the message text.
-			
+
 	int code() const;
 		/// Returns the exception code if defined.
-		
+
 	std::string displayText() const;
 		/// Returns a string consisting of the
 		/// message name and the message text.
@@ -79,7 +79,7 @@ public:
 		///
 		/// The copy can later be thrown again by
 		/// invoking rethrow() on it.
-		
+
 	virtual void rethrow() const;
 		/// (Re)Throws the exception.
 		///
@@ -96,7 +96,7 @@ protected:
 
 	void extendedMessage(const std::string& arg);
 		/// Sets the extended message for the exception.
-		
+
 private:
 	std::string _msg;
 	Exception*  _pNested;
diff --git a/Foundation/include/Poco/ExpirationDecorator.h b/Foundation/include/Poco/ExpirationDecorator.h
index 2e9d40a63..15c8e6a8f 100644
--- a/Foundation/include/Poco/ExpirationDecorator.h
+++ b/Foundation/include/Poco/ExpirationDecorator.h
@@ -64,7 +64,7 @@ public:
 	~ExpirationDecorator()
 	{
 	}
-	
+
 	const Poco::Timestamp& getExpiration() const
 	{
 		return _expiresAt;
diff --git a/Foundation/include/Poco/Expire.h b/Foundation/include/Poco/Expire.h
index 73f82b4b0..672ddfc02 100644
--- a/Foundation/include/Poco/Expire.h
+++ b/Foundation/include/Poco/Expire.h
@@ -28,12 +28,12 @@ namespace Poco {
 
 template <class TArgs>
 class Expire: public AbstractDelegate<TArgs>
-	/// Decorator for AbstractDelegate adding automatic 
+	/// Decorator for AbstractDelegate adding automatic
 	/// expiration of registrations to AbstractDelegate's.
 {
 public:
 	Expire(const AbstractDelegate<TArgs>& p, Timestamp::TimeDiff expireMillisecs):
-		_pDelegate(p.clone()), 
+		_pDelegate(p.clone()),
 		_expire(expireMillisecs*1000)
 	{
 	}
@@ -50,7 +50,7 @@ public:
 	{
 		delete _pDelegate;
 	}
-	
+
 	Expire& operator = (const Expire& expire)
 	{
 		if (&expire != this)
@@ -81,7 +81,7 @@ public:
 	{
 		return new Expire(*this);
 	}
-	
+
 	void disable()
 	{
 		_pDelegate->disable();
@@ -109,12 +109,12 @@ private:
 
 template <>
 class Expire<void>: public AbstractDelegate<void>
-	/// Decorator for AbstractDelegate adding automatic 
+	/// Decorator for AbstractDelegate adding automatic
 	/// expiration of registrations to AbstractDelegate's.
 {
 public:
 	Expire(const AbstractDelegate<void>& p, Timestamp::TimeDiff expireMillisecs):
-		_pDelegate(p.clone()), 
+		_pDelegate(p.clone()),
 		_expire(expireMillisecs*1000)
 	{
 	}
@@ -131,7 +131,7 @@ public:
 	{
 		delete _pDelegate;
 	}
-	
+
 	Expire& operator = (const Expire& expire)
 	{
 		if (&expire != this)
@@ -162,7 +162,7 @@ public:
 	{
 		return new Expire(*this);
 	}
-	
+
 	void disable()
 	{
 		_pDelegate->disable();
diff --git a/Foundation/include/Poco/ExpireCache.h b/Foundation/include/Poco/ExpireCache.h
index 41f0482b3..5dd8ff720 100644
--- a/Foundation/include/Poco/ExpireCache.h
+++ b/Foundation/include/Poco/ExpireCache.h
@@ -26,11 +26,11 @@ namespace Poco {
 
 
 template <
-	class TKey, 
-	class TValue, 
-	class TMutex = FastMutex, 
+	class TKey,
+	class TValue,
+	class TMutex = FastMutex,
 	class TEventMutex = FastMutex
-> 
+>
 class ExpireCache: public AbstractCache<TKey, TValue, ExpireStrategy<TKey, TValue>, TMutex, TEventMutex>
 	/// An ExpireCache caches entries for a fixed time period (per default 10 minutes).
 	/// Entries expire independently of the access pattern, i.e. after a constant time.
@@ -40,11 +40,11 @@ class ExpireCache: public AbstractCache<TKey, TValue, ExpireStrategy<TKey, TValu
 	/// Be careful when using an ExpireCache. A cache is often used
 	/// like cache.has(x) followed by cache.get x). Note that it could happen
 	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
-	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
+	/// the entry gets invalid, thus leading to an empty SharedPtr being returned
 	/// when "get" is invoked.
 {
 public:
-	ExpireCache(Timestamp::TimeDiff expire = 600000): 
+	ExpireCache(Timestamp::TimeDiff expire = 600000):
 		AbstractCache<TKey, TValue, ExpireStrategy<TKey, TValue>, TMutex, TEventMutex>(ExpireStrategy<TKey, TValue>(expire))
 	{
 	}
diff --git a/Foundation/include/Poco/ExpireLRUCache.h b/Foundation/include/Poco/ExpireLRUCache.h
index b58badcc5..492121262 100644
--- a/Foundation/include/Poco/ExpireLRUCache.h
+++ b/Foundation/include/Poco/ExpireLRUCache.h
@@ -27,10 +27,10 @@
 namespace Poco {
 
 
-template < 
+template <
 	class TKey,
 	class TValue,
-	class TMutex = FastMutex, 
+	class TMutex = FastMutex,
 	class TEventMutex = FastMutex
 >
 class ExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue>, TMutex, TEventMutex>
diff --git a/Foundation/include/Poco/ExpireStrategy.h b/Foundation/include/Poco/ExpireStrategy.h
index 27e471fd0..157286ada 100644
--- a/Foundation/include/Poco/ExpireStrategy.h
+++ b/Foundation/include/Poco/ExpireStrategy.h
@@ -31,7 +31,7 @@
 namespace Poco {
 
 
-template < 
+template <
 	class TKey,
 	class TValue
 >
@@ -50,7 +50,7 @@ public:
 		/// Create an expire strategy. Note that the smallest allowed caching time is 25ms.
 		/// Anything lower than that is not useful with current operating systems.
 	{
-		if (_expireTime < 25000) throw InvalidArgumentException("expireTime must be at least 25 ms");  
+		if (_expireTime < 25000) throw InvalidArgumentException("expireTime must be at least 25 ms");
 	}
 
 	~ExpireStrategy()
diff --git a/Foundation/include/Poco/FIFOBuffer.h b/Foundation/include/Poco/FIFOBuffer.h
index 7fc85ca7e..c1a6d9966 100644
--- a/Foundation/include/Poco/FIFOBuffer.h
+++ b/Foundation/include/Poco/FIFOBuffer.h
@@ -41,7 +41,7 @@ class BasicFIFOBuffer
 	/// However, to achieve thread-safety in cases where multiple
 	/// member function calls are involved and have to be atomic,
 	/// the mutex must be locked externally.
-	/// 
+	///
 	/// Buffer size, as well as amount of unread data and
 	/// available space introspections are supported as well.
 	///
@@ -55,12 +55,12 @@ public:
 		/// Event indicating "writability" of the buffer,
 		/// triggered as follows:
 		///
-		///	* when buffer transitions from non-full to full, 
-		///	  Writable event observers are notified, with 
+		///	* when buffer transitions from non-full to full,
+		///	  Writable event observers are notified, with
 		///	  false value as the argument
 		///
 		///	* when buffer transitions from full to non-full,
-		///	  Writable event observers are notified, with 
+		///	  Writable event observers are notified, with
 		///	  true value as the argument
 
 	mutable Poco::BasicEvent<bool> readable;
@@ -68,7 +68,7 @@ public:
 		/// triggered as follows:
 		///
 		///	* when buffer transitions from non-empty to empty,
-		///	  Readable event observers are notified, with false  
+		///	  Readable event observers are notified, with false
 		///	  value as the argument
 		///
 		///	* when FIFOBuffer transitions from empty to non-empty,
@@ -112,7 +112,7 @@ public:
 		/// Destroys the FIFOBuffer.
 	{
 	}
-	
+
 	void resize(std::size_t newSize, bool preserveContent = true)
 		/// Resizes the buffer. If preserveContent is true,
 		/// the content of the old buffer is preserved.
@@ -126,22 +126,22 @@ public:
 
 		if (preserveContent && (newSize < _used))
 			throw InvalidAccessException("Can not resize FIFO without data loss.");
-		
+
 		std::size_t usedBefore = _used;
 		_buffer.resize(newSize, preserveContent);
 		if (!preserveContent) _used = 0;
 		if (_notify) notify(usedBefore);
 	}
-	
+
 	std::size_t peek(T* pBuffer, std::size_t length) const
 		/// Peeks into the data currently in the FIFO
 		/// without actually extracting it.
 		/// If length is zero, the return is immediate.
 		/// If length is greater than used length,
-		/// it is substituted with the the current FIFO 
+		/// it is substituted with the the current FIFO
 		/// used length.
-		/// 
-		/// Returns the number of elements copied in the 
+		///
+		/// Returns the number of elements copied in the
 		/// supplied buffer.
 	{
 		if (0 == length) return 0;
@@ -151,17 +151,17 @@ public:
 		std::memcpy(pBuffer, _buffer.begin() + _begin, length * sizeof(T));
 		return length;
 	}
-	
+
 	std::size_t peek(Poco::Buffer<T>& buffer, std::size_t length = 0) const
 		/// Peeks into the data currently in the FIFO
 		/// without actually extracting it.
 		/// Resizes the supplied buffer to the size of
 		/// data written to it. If length is not
-		/// supplied by the caller or is greater than length 
-		/// of currently used data, the current FIFO used 
+		/// supplied by the caller or is greater than length
+		/// of currently used data, the current FIFO used
 		/// data length is substituted for it.
-		/// 
-		/// Returns the number of elements copied in the 
+		///
+		/// Returns the number of elements copied in the
 		/// supplied buffer.
 	{
 		Mutex::ScopedLock lock(_mutex);
@@ -170,13 +170,13 @@ public:
 		buffer.resize(length);
 		return peek(buffer.begin(), length);
 	}
-	
+
 	std::size_t read(T* pBuffer, std::size_t length)
 		/// Copies the data currently in the FIFO
 		/// into the supplied buffer, which must be
 		/// preallocated to at least the length size
 		/// before calling this function.
-		/// 
+		///
 		/// Returns the size of the copied data.
 	{
 		if (0 == length) return 0;
@@ -193,13 +193,13 @@ public:
 
 		return readLen;
 	}
-	
+
 	std::size_t read(Poco::Buffer<T>& buffer, std::size_t length = 0)
 		/// Copies the data currently in the FIFO
 		/// into the supplied buffer.
 		/// Resizes the supplied buffer to the size of
 		/// data written to it.
-		/// 
+		///
 		/// Returns the size of the copied data.
 	{
 		Mutex::ScopedLock lock(_mutex);
@@ -219,20 +219,20 @@ public:
 	std::size_t write(const T* pBuffer, std::size_t length)
 		/// Writes data from supplied buffer to the FIFO buffer.
 		/// If there is no sufficient space for the whole
-		/// buffer to be written, data up to available 
+		/// buffer to be written, data up to available
 		/// length is written.
 		/// The length of data to be written is determined from the
 		/// length argument. Function does nothing and returns zero
 		/// if length argument is equal to zero.
-		/// 
+		///
 		/// Returns the length of data written.
 	{
 		if (0 == length) return 0;
 
 		Mutex::ScopedLock lock(_mutex);
-		
+
 		if (!isWritable()) return 0;
-		
+
 		if (_buffer.size() - (_begin + _used) < length)
 		{
 			std::memmove(_buffer.begin(), begin(), _used * sizeof(T));
@@ -253,12 +253,12 @@ public:
 	std::size_t write(const Buffer<T>& buffer, std::size_t length = 0)
 		/// Writes data from supplied buffer to the FIFO buffer.
 		/// If there is no sufficient space for the whole
-		/// buffer to be written, data up to available 
+		/// buffer to be written, data up to available
 		/// length is written.
 		/// The length of data to be written is determined from the
 		/// length argument or buffer size (when length argument is
 		/// default zero or greater than buffer size).
-		/// 
+		///
 		/// Returns the length of data written.
 	{
 		if (length == 0 || length > buffer.size())
@@ -272,13 +272,13 @@ public:
 	{
 		return _buffer.size();
 	}
-	
+
 	std::size_t used() const
 		/// Returns the size of the used portion of the buffer.
 	{
 		return _used;
 	}
-	
+
 	std::size_t available() const
 		/// Returns the size of the available portion of the buffer.
 	{
@@ -316,10 +316,10 @@ public:
 		if (0 == length) return;
 
 		Mutex::ScopedLock lock(_mutex);
-		
+
 		if (length > available())
 			throw Poco::InvalidAccessException("Cannot extend buffer.");
-		
+
 		if (!isWritable())
 			throw Poco::InvalidAccessException("Buffer not writable.");
 
@@ -331,14 +331,15 @@ public:
 
 	void advance(std::size_t length)
 		/// Advances buffer by length elements.
-		/// Should be called AFTER the data 
+		/// Should be called AFTER the data
 		/// was copied into the buffer.
 	{
+		if (0 == length) return;
 		Mutex::ScopedLock lock(_mutex);
 
 		if (length > available())
 			throw Poco::InvalidAccessException("Cannot extend buffer.");
-		
+
 		if (!isWritable())
 			throw Poco::InvalidAccessException("Buffer not writable.");
 
@@ -377,7 +378,7 @@ public:
 
 	T& operator [] (std::size_t index)
 		/// Returns value at index position.
-		/// Throws InvalidAccessException if index is larger than 
+		/// Throws InvalidAccessException if index is larger than
 		/// the last valid (used) buffer position.
 	{
 		Mutex::ScopedLock lock(_mutex);
@@ -389,7 +390,7 @@ public:
 
 	const T& operator [] (std::size_t index) const
 		/// Returns value at index position.
-		/// Throws InvalidAccessException if index is larger than 
+		/// Throws InvalidAccessException if index is larger than
 		/// the last valid (used) buffer position.
 	{
 		Mutex::ScopedLock lock(_mutex);
@@ -404,12 +405,12 @@ public:
 	{
 		return _buffer;
 	}
-	
+
 	void setError(bool error = true)
 		/// Sets the error flag on the buffer and empties it.
-		/// If notifications are enabled, they will be triggered 
+		/// If notifications are enabled, they will be triggered
 		/// if appropriate.
-		/// 
+		///
 		/// Setting error flag to true prevents reading and writing
 		/// to the buffer; to re-enable FIFOBuffer for reading/writing,
 		/// the error flag must be set to false.
@@ -418,8 +419,8 @@ public:
 		{
 			bool f = false;
 			Mutex::ScopedLock lock(_mutex);
-			if (error && isReadable() && _notify) readable.notify(this, f);
-			if (error && isWritable() && _notify) writable.notify(this, f);
+			if (isReadable() && _notify) readable.notify(this, f);
+			if (isWritable() && _notify) writable.notify(this, f);
 			_error = error;
 			_used = 0;
 		}
@@ -441,14 +442,14 @@ public:
 
 	void setEOF(bool eof = true)
 		/// Sets end-of-file flag on the buffer.
-		/// 
+		///
 		/// Setting EOF flag to true prevents writing to the
 		/// buffer; reading from the buffer will still be
-		/// allowed until all data present in the buffer at the 
-		/// EOF set time is drained. After that, to re-enable 
+		/// allowed until all data present in the buffer at the
+		/// EOF set time is drained. After that, to re-enable
 		/// FIFOBuffer for reading/writing, EOF must be
 		/// set to false.
-		/// 
+		///
 		/// Setting EOF flag to false clears EOF state if it
 		/// was previously set. If EOF was not set, it has no
 		/// effect.
@@ -523,7 +524,7 @@ private:
 			readable.notify(this, t);
 		else if (usedBefore > 0 && 0 == _used)
 			readable.notify(this, f);
-		
+
 		if (usedBefore == _buffer.size() && _used < _buffer.size())
 			writable.notify(this, t);
 		else if (usedBefore < _buffer.size() && _used == _buffer.size())
diff --git a/Foundation/include/Poco/FIFOBufferStream.h b/Foundation/include/Poco/FIFOBufferStream.h
index 6c1e1eb78..08673a7ad 100644
--- a/Foundation/include/Poco/FIFOBufferStream.h
+++ b/Foundation/include/Poco/FIFOBufferStream.h
@@ -33,7 +33,7 @@ class Foundation_API FIFOBufferStreamBuf: public BufferedBidirectionalStreamBuf
 	/// FIFOBuffer is enabled for emtpy/non-empty/full state transitions notifications.
 {
 public:
-	
+
 	FIFOBufferStreamBuf();
 		/// Creates a FIFOBufferStreamBuf.
 
@@ -60,7 +60,7 @@ protected:
 	int writeToDevice(const char* buffer, std::streamsize length);
 
 private:
-	enum 
+	enum
 	{
 		STREAM_BUFFER_SIZE = 1024
 	};
@@ -89,15 +89,15 @@ public:
 
 	explicit FIFOIOS(std::size_t length);
 		/// Creates a FIFOIOS of the given length.
-		
+
 	~FIFOIOS();
 		/// Destroys the FIFOIOS.
 		///
 		/// Flushes the buffer.
-		
+
 	FIFOBufferStreamBuf* rdbuf();
 		/// Returns a pointer to the internal FIFOBufferStreamBuf.
-		
+
 	void close();
 		/// Flushes the stream.
 
diff --git a/Foundation/include/Poco/FIFOEvent.h b/Foundation/include/Poco/FIFOEvent.h
index b461d9631..f4c5007e7 100644
--- a/Foundation/include/Poco/FIFOEvent.h
+++ b/Foundation/include/Poco/FIFOEvent.h
@@ -27,9 +27,9 @@ namespace Poco {
 
 
 //@ deprecated
-template <class TArgs, class TMutex = FastMutex> 
-class FIFOEvent: public AbstractEvent < 
-	TArgs, 
+template <class TArgs, class TMutex = FastMutex>
+class FIFOEvent: public AbstractEvent <
+	TArgs,
 	FIFOStrategy<TArgs, AbstractDelegate<TArgs>>,
 	AbstractDelegate<TArgs>,
 	TMutex
diff --git a/Foundation/include/Poco/FIFOStrategy.h b/Foundation/include/Poco/FIFOStrategy.h
index 79c227604..b69ca6c9d 100644
--- a/Foundation/include/Poco/FIFOStrategy.h
+++ b/Foundation/include/Poco/FIFOStrategy.h
@@ -25,9 +25,9 @@ namespace Poco {
 
 
 //@ deprecated
-template <class TArgs, class TDelegate> 
+template <class TArgs, class TDelegate>
 class FIFOStrategy: public DefaultStrategy<TArgs, TDelegate>
-	/// Note: As of release 1.4.2, DefaultStrategy already 
+	/// Note: As of release 1.4.2, DefaultStrategy already
 	/// implements FIFO behavior, so this class is provided
 	/// for backwards compatibility only.
 {
diff --git a/Foundation/include/Poco/FPEnvironment_DEC.h b/Foundation/include/Poco/FPEnvironment_DEC.h
index b55794a51..932556e2c 100644
--- a/Foundation/include/Poco/FPEnvironment_DEC.h
+++ b/Foundation/include/Poco/FPEnvironment_DEC.h
@@ -59,18 +59,18 @@ protected:
 	FPEnvironmentImpl(const FPEnvironmentImpl& env);
 	~FPEnvironmentImpl();
 	FPEnvironmentImpl& operator = (const FPEnvironmentImpl& env);
-	void keepCurrentImpl();		
+	void keepCurrentImpl();
 	static void clearFlagsImpl();
-	static bool isFlagImpl(FlagImpl flag);	
+	static bool isFlagImpl(FlagImpl flag);
 	static void setRoundingModeImpl(RoundingModeImpl mode);
 	static RoundingModeImpl getRoundingModeImpl();
-	static bool isInfiniteImpl(float value);		
+	static bool isInfiniteImpl(float value);
 	static bool isInfiniteImpl(double value);
 	static bool isInfiniteImpl(long double value);
-	static bool isNaNImpl(float value);		
+	static bool isNaNImpl(float value);
 	static bool isNaNImpl(double value);
 	static bool isNaNImpl(long double value);
-	static float copySignImpl(float target, float source);		
+	static float copySignImpl(float target, float source);
 	static double copySignImpl(double target, double source);
 	static long double copySignImpl(long double target, long double source);
 
diff --git a/Foundation/include/Poco/FPEnvironment_QNX.h b/Foundation/include/Poco/FPEnvironment_QNX.h
index 1eef8259d..ca16bd25e 100644
--- a/Foundation/include/Poco/FPEnvironment_QNX.h
+++ b/Foundation/include/Poco/FPEnvironment_QNX.h
@@ -48,18 +48,18 @@ protected:
 	FPEnvironmentImpl(const FPEnvironmentImpl& env);
 	~FPEnvironmentImpl();
 	FPEnvironmentImpl& operator = (const FPEnvironmentImpl& env);
-	void keepCurrentImpl();		
+	void keepCurrentImpl();
 	static void clearFlagsImpl();
-	static bool isFlagImpl(FlagImpl flag);	
+	static bool isFlagImpl(FlagImpl flag);
 	static void setRoundingModeImpl(RoundingModeImpl mode);
 	static RoundingModeImpl getRoundingModeImpl();
-	static bool isInfiniteImpl(float value);		
+	static bool isInfiniteImpl(float value);
 	static bool isInfiniteImpl(double value);
 	static bool isInfiniteImpl(long double value);
-	static bool isNaNImpl(float value);		
+	static bool isNaNImpl(float value);
 	static bool isNaNImpl(double value);
 	static bool isNaNImpl(long double value);
-	static float copySignImpl(float target, float source);		
+	static float copySignImpl(float target, float source);
 	static double copySignImpl(double target, double source);
 	static long double copySignImpl(long double target, long double source);
 
diff --git a/Foundation/include/Poco/FPEnvironment_SUN.h b/Foundation/include/Poco/FPEnvironment_SUN.h
index d9755006d..b60c0bfa1 100644
--- a/Foundation/include/Poco/FPEnvironment_SUN.h
+++ b/Foundation/include/Poco/FPEnvironment_SUN.h
@@ -47,18 +47,18 @@ protected:
 	FPEnvironmentImpl(const FPEnvironmentImpl& env);
 	~FPEnvironmentImpl();
 	FPEnvironmentImpl& operator = (const FPEnvironmentImpl& env);
-	void keepCurrentImpl();		
+	void keepCurrentImpl();
 	static void clearFlagsImpl();
-	static bool isFlagImpl(FlagImpl flag);	
+	static bool isFlagImpl(FlagImpl flag);
 	static void setRoundingModeImpl(RoundingModeImpl mode);
 	static RoundingModeImpl getRoundingModeImpl();
-	static bool isInfiniteImpl(float value);		
+	static bool isInfiniteImpl(float value);
 	static bool isInfiniteImpl(double value);
 	static bool isInfiniteImpl(long double value);
-	static bool isNaNImpl(float value);		
+	static bool isNaNImpl(float value);
 	static bool isNaNImpl(double value);
 	static bool isNaNImpl(long double value);
-	static float copySignImpl(float target, float source);		
+	static float copySignImpl(float target, float source);
 	static double copySignImpl(double target, double source);
 	static long double copySignImpl(long double target, long double source);
 
diff --git a/Foundation/include/Poco/File.h b/Foundation/include/Poco/File.h
index 26ee82ff6..2ba1e964c 100644
--- a/Foundation/include/Poco/File.h
+++ b/Foundation/include/Poco/File.h
@@ -23,7 +23,7 @@
 #include <vector>
 
 
-#if defined(POCO_OS_FAMILY_WINDOWS) 
+#if defined(POCO_OS_FAMILY_WINDOWS)
 #if defined(_WIN32_WCE)
 #include "File_WINCE.h"
 #else
@@ -103,7 +103,7 @@ public:
 	File& operator = (const Path& path);
 		/// Assignment operator.
 
-	void swap(File& file);
+	void swap(File& file) noexcept;
 		/// Swaps the file with another one.
 
 	const std::string& path() const;
@@ -312,7 +312,7 @@ inline bool File::operator >= (const File& file) const
 }
 
 
-inline void swap(File& f1, File& f2)
+inline void swap(File& f1, File& f2) noexcept
 {
 	f1.swap(f2);
 }
diff --git a/Foundation/include/Poco/FileChannel.h b/Foundation/include/Poco/FileChannel.h
index 84348bca6..f3c8e1955 100644
--- a/Foundation/include/Poco/FileChannel.h
+++ b/Foundation/include/Poco/FileChannel.h
@@ -43,7 +43,7 @@ class Foundation_API FileChannel: public Channel
 	/// by a newline.
 	///
 	/// Chain this channel to a FormattingChannel with an
-	/// appropriate Formatter to control what is in the text. 
+	/// appropriate Formatter to control what is in the text.
 	///
 	/// The FileChannel support log file rotation based
 	/// on log file size or time intervals.
@@ -66,7 +66,7 @@ class Foundation_API FileChannel: public Channel
 	///   * daily:         the file is rotated daily
 	///   * weekly:        the file is rotated every seven days
 	///   * monthly:       the file is rotated every 30 days
-	///   * <n> minutes:   the file is rotated every <n> minutes, 
+	///   * <n> minutes:   the file is rotated every <n> minutes,
 	///                    where <n> is an integer greater than zero.
 	///   * <n> hours:     the file is rotated every <n> hours, where
 	///                    <n> is an integer greater than zero.
@@ -128,7 +128,7 @@ class Foundation_API FileChannel: public Channel
 	///
 	/// Archived log files can be automatically purged, either if
 	/// they reach a certain age, or if the number of archived
-	/// log files reaches a given maximum number. This is 
+	/// log files reaches a given maximum number. This is
 	/// controlled by the purgeAge and purgeCount properties.
 	///
 	/// The purgeAge property can have the following values:
@@ -148,18 +148,18 @@ class Foundation_API FileChannel: public Channel
 	/// The flush property specifies whether each log message is flushed
 	/// immediately to the log file (which may hurt application performance,
 	/// but ensures that everything is in the log in case of a system crash),
-	//  or whether it's allowed to stay in the system's file buffer for some time. 
+	//  or whether it's allowed to stay in the system's file buffer for some time.
 	/// Valid values are:
 	///
 	///   * true:  Every essages is immediately flushed to the log file (default).
 	///   * false: Messages are not immediately flushed to the log file.
 	///
-	/// The rotateOnOpen property specifies whether an existing log file should be 
+	/// The rotateOnOpen property specifies whether an existing log file should be
 	/// rotated (and archived) when the channel is opened. Valid values are:
 	///
 	///   * true:  The log file is rotated (and archived) when the channel is opened.
 	///   * false: Log messages will be appended to an existing log file,
-	///            if it exists (unless other conditions for a rotation are met). 
+	///            if it exists (unless other conditions for a rotation are met).
 	///            This is the default.
 	///
 	/// For a more lightweight file channel class, see SimpleFileChannel.
@@ -173,19 +173,19 @@ public:
 
 	void open();
 		/// Opens the FileChannel and creates the log file if necessary.
-		
+
 	void close();
 		/// Closes the FileChannel.
 
 	void log(const Message& msg);
 		/// Logs the given message to the file.
-		
+
 	void setProperty(const std::string& name, const std::string& value);
-		/// Sets the property with the given name. 
-		/// 
+		/// Sets the property with the given name.
+		///
 		/// The following properties are supported:
 		///   * path:         The log file's path.
-		///   * rotation:     The log file's rotation mode. See the 
+		///   * rotation:     The log file's rotation mode. See the
 		///                   FileChannel class for details.
 		///   * archive:      The log file's archive mode. See the
 		///                   FileChannel class for details.
@@ -203,7 +203,7 @@ public:
 		///   * flush:        Specifies whether messages are immediately
 		///                   flushed to the log file. See the FileChannel class
 		///                   for details.
-		///   * rotateOnOpen: Specifies whether an existing log file should be 
+		///   * rotateOnOpen: Specifies whether an existing log file should be
 		///                   rotated and archived when the channel is opened.
 
 	std::string getProperty(const std::string& name) const;
@@ -213,7 +213,7 @@ public:
 
 	Timestamp creationDate() const;
 		/// Returns the log file's creation date.
-		
+
 	UInt64 size() const;
 		/// Returns the log file's current size in bytes.
 
diff --git a/Foundation/include/Poco/FileStream.h b/Foundation/include/Poco/FileStream.h
index ba1aa0a4f..7c76ad018 100644
--- a/Foundation/include/Poco/FileStream.h
+++ b/Foundation/include/Poco/FileStream.h
@@ -49,14 +49,14 @@ class Foundation_API FileIOS: public virtual std::ios
 public:
 	FileIOS(std::ios::openmode defaultMode);
 		/// Creates the basic stream.
-		
+
 	~FileIOS();
 		/// Destroys the stream.
 
 	void open(const std::string& path, std::ios::openmode mode);
 		/// Opens the file specified by path, using the given mode.
 		///
-		/// Throws a FileException (or a similar exception) if the file 
+		/// Throws a FileException (or a similar exception) if the file
 		/// does not exist or is not accessible for other reasons and
 		/// a new file cannot be created.
 
@@ -90,7 +90,7 @@ class Foundation_API FileInputStream: public FileIOS, public std::istream
 public:
 	FileInputStream();
 		/// Creates an unopened FileInputStream.
-	
+
 	FileInputStream(const std::string& path, std::ios::openmode mode = std::ios::in);
 		/// Creates the FileInputStream for the file given by path, using
 		/// the given mode.
@@ -98,7 +98,7 @@ public:
 		/// The std::ios::in flag is always set, regardless of the actual
 		/// value specified for mode.
 		///
-		/// Throws a FileNotFoundException (or a similar exception) if the file 
+		/// Throws a FileNotFoundException (or a similar exception) if the file
 		/// does not exist or is not accessible for other reasons.
 
 	~FileInputStream();
@@ -120,15 +120,15 @@ class Foundation_API FileOutputStream: public FileIOS, public std::ostream
 public:
 	FileOutputStream();
 		/// Creats an unopened FileOutputStream.
-		
+
 	FileOutputStream(const std::string& path, std::ios::openmode mode = std::ios::out | std::ios::trunc);
 		/// Creates the FileOutputStream for the file given by path, using
 		/// the given mode.
 		///
-		/// The std::ios::out is always set, regardless of the actual 
+		/// The std::ios::out is always set, regardless of the actual
 		/// value specified for mode.
 		///
-		/// Throws a FileException (or a similar exception) if the file 
+		/// Throws a FileException (or a similar exception) if the file
 		/// does not exist or is not accessible for other reasons and
 		/// a new file cannot be created.
 
@@ -147,7 +147,7 @@ class Foundation_API FileStream: public FileIOS, public std::iostream
 	/// Use an InputLineEndingConverter or OutputLineEndingConverter
 	/// if you require CR-LF translation.
 	///
-	/// A seek (seekg() or seekp()) operation will always set the 
+	/// A seek (seekg() or seekp()) operation will always set the
 	/// read position and the write position simultaneously to the
 	/// same value.
 	///
@@ -156,7 +156,7 @@ class Foundation_API FileStream: public FileIOS, public std::iostream
 public:
 	FileStream();
 		/// Creats an unopened FileStream.
-	
+
 	FileStream(const std::string& path, std::ios::openmode mode = std::ios::out | std::ios::in);
 		/// Creates the FileStream for the file given by path, using
 		/// the given mode.
diff --git a/Foundation/include/Poco/FileStreamFactory.h b/Foundation/include/Poco/FileStreamFactory.h
index 01364cf1d..e82d2f3ac 100644
--- a/Foundation/include/Poco/FileStreamFactory.h
+++ b/Foundation/include/Poco/FileStreamFactory.h
@@ -38,7 +38,7 @@ public:
 
 	~FileStreamFactory();
 		/// Destroys the FileStreamFactory.
-		
+
 	std::istream* open(const URI& uri);
 		/// Creates and opens a file stream in binary mode for the given URI.
 		/// The URI must be either a file URI or a relative URI reference
@@ -46,7 +46,7 @@ public:
 		///
 		/// Throws an FileNotFound exception if the file cannot
 		/// be opened.
-		
+
 	std::istream* open(const Path& path);
 		/// Creates and opens a file stream in binary mode for the given path.
 		///
diff --git a/Foundation/include/Poco/FileStream_POSIX.h b/Foundation/include/Poco/FileStream_POSIX.h
index f5fa25cb8..3d19bdec2 100644
--- a/Foundation/include/Poco/FileStream_POSIX.h
+++ b/Foundation/include/Poco/FileStream_POSIX.h
@@ -33,7 +33,7 @@ class Foundation_API FileStreamBuf: public BufferedBidirectionalStreamBuf
 public:
 	FileStreamBuf();
 		/// Creates a FileStreamBuf.
-		
+
 	~FileStreamBuf();
 		/// Destroys the FileStream.
 
diff --git a/Foundation/include/Poco/File_WIN32U.h b/Foundation/include/Poco/File_WIN32U.h
index 7c2e0a935..c97cb2efa 100644
--- a/Foundation/include/Poco/File_WIN32U.h
+++ b/Foundation/include/Poco/File_WIN32U.h
@@ -28,7 +28,7 @@ namespace Poco {
 class Foundation_API FileImpl
 {
 protected:
-	enum Options 
+	enum Options
 	{
 		OPT_FAIL_ON_OVERWRITE_IMPL = 0x01
 	};
diff --git a/Foundation/include/Poco/Format.h b/Foundation/include/Poco/Format.h
index 780f4e4c5..515df47e9 100644
--- a/Foundation/include/Poco/Format.h
+++ b/Foundation/include/Poco/Format.h
@@ -116,6 +116,9 @@ void Foundation_API format(std::string& result, const std::string& fmt, const st
 
 template <
 	typename T,
+#ifdef __cpp_lib_remove_cvref
+	typename std::enable_if_t<!std::is_same_v<std::remove_cvref_t<T>, std::vector<Any>>>,
+#endif
 	typename... Args>
 void format(std::string& result, const std::string& fmt, T arg1, Args... args)
 	/// Appends the formatted string to result.
@@ -130,6 +133,9 @@ void format(std::string& result, const std::string& fmt, T arg1, Args... args)
 
 template <
 	typename T,
+#ifdef __cpp_lib_remove_cvref
+	typename std::enable_if_t<!std::is_same_v<std::remove_cvref_t<T>, std::vector<Any>>>,
+#endif
 	typename... Args>
 void format(std::string& result, const char* fmt, T arg1, Args... args)
 	/// Appends the formatted string to result.
@@ -144,6 +150,9 @@ void format(std::string& result, const char* fmt, T arg1, Args... args)
 
 template <
 	typename T,
+#ifdef __cpp_lib_remove_cvref
+	typename std::enable_if_t<!std::is_same_v<std::remove_cvref_t<T>, std::vector<Any>>>,
+#endif
 	typename... Args>
 std::string format(const std::string& fmt, T arg1, Args... args)
 	/// Returns the formatted string.
@@ -160,6 +169,9 @@ std::string format(const std::string& fmt, T arg1, Args... args)
 
 template <
 	typename T,
+#ifdef __cpp_lib_remove_cvref
+	typename std::enable_if_t<!std::is_same_v<std::remove_cvref_t<T>, std::vector<Any>>>,
+#endif
 	typename... Args>
 std::string format(const char* fmt, T arg1, Args... args)
 	/// Returns the formatted string.
diff --git a/Foundation/include/Poco/Formatter.h b/Foundation/include/Poco/Formatter.h
index f638a5135..e05199289 100644
--- a/Foundation/include/Poco/Formatter.h
+++ b/Foundation/include/Poco/Formatter.h
@@ -44,8 +44,8 @@ class Foundation_API Formatter: public Configurable, public RefCountedObject
 	/// The Formatter class supports the Configurable interface,
 	/// so the behaviour of certain formatters is configurable.
 	/// It also supports reference counting based garbage collection.
-	/// 
-	/// Trivial implementations of of getProperty() and 
+	///
+	/// Trivial implementations of of getProperty() and
 	/// setProperty() are provided.
 	///
 	/// Subclasses must at least provide a format() method.
@@ -55,14 +55,14 @@ public:
 
 	Formatter();
 		/// Creates the formatter.
-		
+
 	virtual ~Formatter();
 		/// Destroys the formatter.
 
 	virtual void format(const Message& msg, std::string& text) = 0;
-		/// Formats the message and places the result in text. 
+		/// Formats the message and places the result in text.
 		/// Subclasses must override this method.
-		
+
 	void setProperty(const std::string& name, const std::string& value);
 		/// Throws a PropertyNotSupportedException.
 
diff --git a/Foundation/include/Poco/FormattingChannel.h b/Foundation/include/Poco/FormattingChannel.h
index 493e52b87..af9d0d6c2 100644
--- a/Foundation/include/Poco/FormattingChannel.h
+++ b/Foundation/include/Poco/FormattingChannel.h
@@ -40,31 +40,31 @@ public:
 
 	FormattingChannel();
 		/// Creates a FormattingChannel.
-		
+
 	FormattingChannel(Formatter::Ptr pFormatter);
 		/// Creates a FormattingChannel and attaches a Formatter.
-		
+
 	FormattingChannel(Formatter::Ptr pFormatter, Channel::Ptr pChannel);
 		/// Creates a FormattingChannel and attaches a Formatter
 		/// and a Channel.
-		
+
 	void setFormatter(Formatter::Ptr pFormatter);
 		/// Sets the Formatter used to format the messages
 		/// before they are passed on. If null, the message
 		/// is passed on unmodified.
-		
+
 	Formatter::Ptr getFormatter() const;
 		/// Returns the Formatter used to format messages,
 		/// which may be null.
 
 	void setChannel(Channel::Ptr pChannel);
-		/// Sets the destination channel to which the formatted 
+		/// Sets the destination channel to which the formatted
 		/// messages are passed on.
-		
+
 	Channel::Ptr getChannel() const;
 		/// Returns the channel to which the formatted
 		/// messages are passed on.
-		
+
 	void log(const Message& msg);
 		/// Formats the given Message using the Formatter and
 		/// passes the formatted message on to the destination
@@ -81,7 +81,7 @@ public:
 
 	void open();
 		/// Opens the attached channel.
-		
+
 	void close();
 		/// Closes the attached channel.
 
diff --git a/Foundation/include/Poco/FunctionDelegate.h b/Foundation/include/Poco/FunctionDelegate.h
index 9aec96d95..b5676a3b5 100644
--- a/Foundation/include/Poco/FunctionDelegate.h
+++ b/Foundation/include/Poco/FunctionDelegate.h
@@ -26,9 +26,9 @@
 namespace Poco {
 
 
-template <class TArgs, bool hasSender = true, bool senderIsConst = true> 
+template <class TArgs, bool hasSender = true, bool senderIsConst = true>
 class FunctionDelegate: public AbstractDelegate<TArgs>
-	/// Wraps a freestanding function or static member function 
+	/// Wraps a freestanding function or static member function
 	/// for use as a Delegate.
 {
 public:
@@ -48,7 +48,7 @@ public:
 	~FunctionDelegate()
 	{
 	}
-	
+
 	FunctionDelegate& operator = (const FunctionDelegate& delegate)
 	{
 		if (&delegate != this)
@@ -79,7 +79,7 @@ public:
 	{
 		return new FunctionDelegate(*this);
 	}
-	
+
 	void disable()
 	{
 		Mutex::ScopedLock lock(_mutex);
@@ -95,7 +95,7 @@ private:
 };
 
 
-template <class TArgs> 
+template <class TArgs>
 class FunctionDelegate<TArgs, true, false>: public AbstractDelegate<TArgs>
 {
 public:
@@ -115,7 +115,7 @@ public:
 	~FunctionDelegate()
 	{
 	}
-	
+
 	FunctionDelegate& operator = (const FunctionDelegate& delegate)
 	{
 		if (&delegate != this)
@@ -162,7 +162,7 @@ private:
 };
 
 
-template <class TArgs, bool senderIsConst> 
+template <class TArgs, bool senderIsConst>
 class FunctionDelegate<TArgs, false, senderIsConst>: public AbstractDelegate<TArgs>
 {
 public:
@@ -182,7 +182,7 @@ public:
 	~FunctionDelegate()
 	{
 	}
-	
+
 	FunctionDelegate& operator = (const FunctionDelegate& delegate)
 	{
 		if (&delegate != this)
@@ -198,7 +198,7 @@ public:
 		if (_function)
 		{
 			(*_function)(arguments);
-			return true; 
+			return true;
 		}
 		else return false;
 	}
@@ -229,9 +229,9 @@ private:
 };
 
 
-template <> 
+template <>
 class FunctionDelegate<void, true, true>: public AbstractDelegate<void>
-	/// Wraps a freestanding function or static member function 
+	/// Wraps a freestanding function or static member function
 	/// for use as a Delegate.
 {
 public:
@@ -251,7 +251,7 @@ public:
 	~FunctionDelegate()
 	{
 	}
-	
+
 	FunctionDelegate& operator = (const FunctionDelegate& delegate)
 	{
 		if (&delegate != this)
@@ -282,7 +282,7 @@ public:
 	{
 		return new FunctionDelegate(*this);
 	}
-	
+
 	void disable()
 	{
 		Mutex::ScopedLock lock(_mutex);
@@ -298,7 +298,7 @@ private:
 };
 
 
-template <> 
+template <>
 class FunctionDelegate<void, true, false>: public AbstractDelegate<void>
 {
 public:
@@ -318,7 +318,7 @@ public:
 	~FunctionDelegate()
 	{
 	}
-	
+
 	FunctionDelegate& operator = (const FunctionDelegate& delegate)
 	{
 		if (&delegate != this)
@@ -365,7 +365,7 @@ private:
 };
 
 
-template <bool senderIsConst> 
+template <bool senderIsConst>
 class FunctionDelegate<void, false, senderIsConst>: public AbstractDelegate<void>
 {
 public:
@@ -385,7 +385,7 @@ public:
 	~FunctionDelegate()
 	{
 	}
-	
+
 	FunctionDelegate& operator = (const FunctionDelegate& delegate)
 	{
 		if (&delegate != this)
@@ -401,7 +401,7 @@ public:
 		if (_function)
 		{
 			(*_function)();
-			return true; 
+			return true;
 		}
 		else return false;
 	}
diff --git a/Foundation/include/Poco/FunctionPriorityDelegate.h b/Foundation/include/Poco/FunctionPriorityDelegate.h
index 60e659204..a1b94b6b2 100644
--- a/Foundation/include/Poco/FunctionPriorityDelegate.h
+++ b/Foundation/include/Poco/FunctionPriorityDelegate.h
@@ -26,9 +26,9 @@
 namespace Poco {
 
 
-template <class TArgs, bool useSender = true, bool senderIsConst = true> 
+template <class TArgs, bool useSender = true, bool senderIsConst = true>
 class FunctionPriorityDelegate: public AbstractPriorityDelegate<TArgs>
-	/// Wraps a freestanding function or static member function 
+	/// Wraps a freestanding function or static member function
 	/// for use as a PriorityDelegate.
 {
 public:
@@ -39,13 +39,13 @@ public:
 		_function(function)
 	{
 	}
-	
+
 	FunctionPriorityDelegate(const FunctionPriorityDelegate& delegate):
 		AbstractPriorityDelegate<TArgs>(delegate),
 		_function(delegate._function)
 	{
 	}
-	
+
 	FunctionPriorityDelegate& operator = (const FunctionPriorityDelegate& delegate)
 	{
 		if (&delegate != this)
@@ -97,7 +97,7 @@ private:
 };
 
 
-template <class TArgs> 
+template <class TArgs>
 class FunctionPriorityDelegate<TArgs, true, false>: public AbstractPriorityDelegate<TArgs>
 {
 public:
@@ -108,13 +108,13 @@ public:
 		_function(function)
 	{
 	}
-	
+
 	FunctionPriorityDelegate(const FunctionPriorityDelegate& delegate):
 		AbstractPriorityDelegate<TArgs>(delegate),
 		_function(delegate._function)
 	{
 	}
-	
+
 	FunctionPriorityDelegate& operator = (const FunctionPriorityDelegate& delegate)
 	{
 		if (&delegate != this)
@@ -166,7 +166,7 @@ private:
 };
 
 
-template <class TArgs> 
+template <class TArgs>
 class FunctionPriorityDelegate<TArgs, false>: public AbstractPriorityDelegate<TArgs>
 {
 public:
@@ -177,13 +177,13 @@ public:
 		_function(function)
 	{
 	}
-	
+
 	FunctionPriorityDelegate(const FunctionPriorityDelegate& delegate):
 		AbstractPriorityDelegate<TArgs>(delegate),
 		_function(delegate._function)
 	{
 	}
-	
+
 	FunctionPriorityDelegate& operator = (const FunctionPriorityDelegate& delegate)
 	{
 		if (&delegate != this)
diff --git a/Foundation/include/Poco/Glob.h b/Foundation/include/Poco/Glob.h
index 0de6eaebe..e23e9b214 100644
--- a/Foundation/include/Poco/Glob.h
+++ b/Foundation/include/Poco/Glob.h
@@ -34,8 +34,8 @@ class Foundation_API Glob
 	/// as known from Unix shells.
 	///
 	/// In the pattern string, '*' matches any sequence of characters,
-	/// '?' matches any single character, [SET] matches any single character 
-	/// in the specified set, [!SET] matches any character not in the  
+	/// '?' matches any single character, [SET] matches any single character
+	/// in the specified set, [!SET] matches any character not in the
 	/// specified set.
 	///
 	/// A set is composed of characters or ranges; a range looks like
@@ -58,23 +58,23 @@ public:
 		GLOB_CASELESS        = 0x04, /// ignore case when comparing characters
 		GLOB_DIRS_ONLY       = 0x80  /// only glob for directories (for internal use only)
 	};
-	
+
 	Glob(const std::string& pattern, int options = 0);
 		/// Creates the Glob, using the given pattern. The pattern
 		/// must not be an empty string.
 		///
-		/// If the GLOB_DOT_SPECIAL option is specified, '*' and '?' do 
+		/// If the GLOB_DOT_SPECIAL option is specified, '*' and '?' do
 		/// not match '.' at the beginning of a matched subject. This is useful for
 		/// making dot-files invisible in good old Unix-style.
 
 	~Glob();
 		/// Destroys the Glob.
-		
+
 	bool match(const std::string& subject);
 		/// Matches the given subject against the glob pattern.
 		/// Returns true if the subject matches the pattern, false
 		/// otherwise.
-		
+
 	static void glob(const std::string& pathPattern, std::set<std::string>& files, int options = 0);
 		/// Creates a set of files that match the given pathPattern.
 		///
@@ -135,7 +135,7 @@ protected:
 	bool matchSet(TextIterator& itp, const TextIterator& endp, int c);
 	static void collect(const Path& pathPattern, const Path& base, const Path& current, const std::string& pattern, std::set<std::string>& files, int options);
 	static bool isDirectory(const Path& path, bool followSymlink);
-	
+
 private:
 	std::string _pattern;
 	int         _options;
diff --git a/Foundation/include/Poco/HMACEngine.h b/Foundation/include/Poco/HMACEngine.h
index e71f700c6..f37a11725 100644
--- a/Foundation/include/Poco/HMACEngine.h
+++ b/Foundation/include/Poco/HMACEngine.h
@@ -31,7 +31,7 @@ class HMACEngine: public DigestEngine
 	/// This class implements the HMAC message
 	/// authentication code algorithm, as specified
 	/// in RFC 2104. The underlying DigestEngine
-	/// (MD5Engine, SHA1Engine, etc.) must be given as 
+	/// (MD5Engine, SHA1Engine, etc.) must be given as
 	/// template argument.
 	/// Since the HMACEngine is a DigestEngine, it can
 	/// be used with the DigestStream class to create
@@ -43,19 +43,19 @@ public:
 		BLOCK_SIZE  = Engine::BLOCK_SIZE,
 		DIGEST_SIZE = Engine::DIGEST_SIZE
 	};
-	
+
 	HMACEngine(const std::string& passphrase)
 	{
 		init(passphrase.data(), passphrase.length());
 	}
-	
+
 	HMACEngine(const char* passphrase, std::size_t length)
 	{
 		poco_check_ptr (passphrase);
 
 		init(passphrase, length);
 	}
-	
+
 	~HMACEngine()
 	{
 		std::memset(_ipad, 0, BLOCK_SIZE);
@@ -63,18 +63,18 @@ public:
 		delete [] _ipad;
 		delete [] _opad;
 	}
-		
+
 	std::size_t digestLength() const
 	{
 		return DIGEST_SIZE;
 	}
-	
+
 	void reset()
 	{
 		_engine.reset();
 		_engine.update(_ipad, BLOCK_SIZE);
 	}
-	
+
 	const DigestEngine::Digest& digest()
 	{
 		const DigestEngine::Digest& d = _engine.digest();
@@ -123,7 +123,7 @@ protected:
 		}
 		reset();
 	}
-	
+
 	void updateImpl(const void* data, std::size_t length)
 	{
 		_engine.update(data, length);
diff --git a/Foundation/include/Poco/Hash.h b/Foundation/include/Poco/Hash.h
index 03ce66b39..99a9352dc 100644
--- a/Foundation/include/Poco/Hash.h
+++ b/Foundation/include/Poco/Hash.h
@@ -64,49 +64,49 @@ struct Hash
 //
 inline std::size_t hash(Int8 n)
 {
-	return static_cast<std::size_t>(n)*2654435761U; 
+	return static_cast<std::size_t>(n)*2654435761U;
 }
 
 
 inline std::size_t hash(UInt8 n)
 {
-	return static_cast<std::size_t>(n)*2654435761U; 
+	return static_cast<std::size_t>(n)*2654435761U;
 }
 
 
 inline std::size_t hash(Int16 n)
 {
-	return static_cast<std::size_t>(n)*2654435761U; 
+	return static_cast<std::size_t>(n)*2654435761U;
 }
 
 
 inline std::size_t hash(UInt16 n)
 {
-	return static_cast<std::size_t>(n)*2654435761U; 
+	return static_cast<std::size_t>(n)*2654435761U;
 }
 
 
 inline std::size_t hash(Int32 n)
 {
-	return static_cast<std::size_t>(n)*2654435761U; 
+	return static_cast<std::size_t>(n)*2654435761U;
 }
 
 
 inline std::size_t hash(UInt32 n)
 {
-	return static_cast<std::size_t>(n)*2654435761U; 
+	return static_cast<std::size_t>(n)*2654435761U;
 }
 
 
 inline std::size_t hash(Int64 n)
 {
-	return static_cast<std::size_t>(n)*2654435761U; 
+	return static_cast<std::size_t>(n)*2654435761U;
 }
 
 
 inline std::size_t hash(UInt64 n)
 {
-	return static_cast<std::size_t>(n)*2654435761U; 
+	return static_cast<std::size_t>(n)*2654435761U;
 }
 
 
diff --git a/Foundation/include/Poco/HashMap.h b/Foundation/include/Poco/HashMap.h
index 70845b707..63def8bf9 100644
--- a/Foundation/include/Poco/HashMap.h
+++ b/Foundation/include/Poco/HashMap.h
@@ -33,13 +33,13 @@ struct HashMapEntry
 {
 	Key   first;
 	Value second;
-	
+
 	HashMapEntry():
 		first(),
 		second()
 	{
 	}
-	
+
 	HashMapEntry(const Key& key):
 		first(key),
 		second()
@@ -51,7 +51,7 @@ struct HashMapEntry
 		second(value)
 	{
 	}
-	
+
 	bool operator == (const HashMapEntry& entry) const
 	{
 		return first == entry.first;
@@ -91,27 +91,27 @@ public:
 	typedef const Mapped&       ConstReference;
 	typedef Mapped*             Pointer;
 	typedef const Mapped*       ConstPointer;
-	
+
 	typedef HashMapEntry<Key, Mapped>      ValueType;
 	typedef std::pair<KeyType, MappedType> PairType;
-	
+
 	typedef HashMapEntryHash<ValueType, HashFunc> HashType;
 	typedef LinearHashTable<ValueType, HashType>  HashTable;
-	
+
 	typedef typename HashTable::Iterator      Iterator;
 	typedef typename HashTable::ConstIterator ConstIterator;
-	
+
 	HashMap()
 		/// Creates an empty HashMap.
 	{
 	}
-	
+
 	HashMap(std::size_t initialReserve):
 		_table(initialReserve)
 		/// Creates the HashMap with room for initialReserve entries.
 	{
 	}
-	
+
 	HashMap& operator = (const HashMap& map)
 		/// Assigns another HashMap.
 	{
@@ -119,33 +119,33 @@ public:
 		swap(tmp);
 		return *this;
 	}
-	
-	void swap(HashMap& map)
+
+	void swap(HashMap& map) noexcept
 		/// Swaps the HashMap with another one.
 	{
 		_table.swap(map._table);
 	}
-	
+
 	ConstIterator begin() const
 	{
 		return _table.begin();
 	}
-	
+
 	ConstIterator end() const
 	{
 		return _table.end();
 	}
-	
+
 	Iterator begin()
 	{
 		return _table.begin();
 	}
-	
+
 	Iterator end()
 	{
 		return _table.end();
 	}
-	
+
 	ConstIterator find(const KeyType& key) const
 	{
 		ValueType value(key);
@@ -174,18 +174,18 @@ public:
 	{
 		return _table.insert(value);
 	}
-	
+
 	void erase(Iterator it)
 	{
 		_table.erase(it);
 	}
-	
+
 	void erase(const KeyType& key)
 	{
 		Iterator it = find(key);
 		_table.erase(it);
 	}
-	
+
 	void clear()
 	{
 		_table.clear();
diff --git a/Foundation/include/Poco/HashSet.h b/Foundation/include/Poco/HashSet.h
index a0c080699..ee0dcb7ce 100644
--- a/Foundation/include/Poco/HashSet.h
+++ b/Foundation/include/Poco/HashSet.h
@@ -38,9 +38,9 @@ public:
 	typedef Value*       Pointer;
 	typedef const Value* ConstPointer;
 	typedef HashFunc     Hash;
-	
+
 	typedef LinearHashTable<ValueType, Hash> HashTable;
-	
+
 	typedef typename HashTable::Iterator      Iterator;
 	typedef typename HashTable::ConstIterator ConstIterator;
 
@@ -49,23 +49,23 @@ public:
 	{
 	}
 
-	HashSet(std::size_t initialReserve): 
+	HashSet(std::size_t initialReserve):
 		_table(initialReserve)
 		/// Creates the HashSet, using the given initialReserve.
 	{
 	}
-	
+
 	HashSet(const HashSet& set):
 		_table(set._table)
 		/// Creates the HashSet by copying another one.
 	{
 	}
-	
+
 	~HashSet()
 		/// Destroys the HashSet.
 	{
 	}
-	
+
 	HashSet& operator = (const HashSet& table)
 		/// Assigns another HashSet.
 	{
@@ -73,37 +73,37 @@ public:
 		swap(tmp);
 		return *this;
 	}
-	
-	void swap(HashSet& set)
+
+	void swap(HashSet& set) noexcept
 		/// Swaps the HashSet with another one.
 	{
 		_table.swap(set._table);
 	}
-	
+
 	ConstIterator begin() const
 		/// Returns an iterator pointing to the first entry, if one exists.
 	{
 		return _table.begin();
 	}
-	
+
 	ConstIterator end() const
 		/// Returns an iterator pointing to the end of the table.
 	{
 		return _table.end();
 	}
-	
+
 	Iterator begin()
 		/// Returns an iterator pointing to the first entry, if one exists.
 	{
 		return _table.begin();
 	}
-	
+
 	Iterator end()
 		/// Returns an iterator pointing to the end of the table.
 	{
 		return _table.end();
 	}
-		
+
 	ConstIterator find(const ValueType& value) const
 		/// Finds an entry in the table.
 	{
@@ -115,51 +115,51 @@ public:
 	{
 		return _table.find(value);
 	}
-	
+
 	std::size_t count(const ValueType& value) const
 		/// Returns the number of elements with the given
 		/// value, with is either 1 or 0.
 	{
 		return _table.count(value);
 	}
-	
+
 	std::pair<Iterator, bool> insert(const ValueType& value)
 		/// Inserts an element into the set.
 		///
 		/// If the element already exists in the set,
-		/// a pair(iterator, false) with iterator pointing to the 
+		/// a pair(iterator, false) with iterator pointing to the
 		/// existing element is returned.
-		/// Otherwise, the element is inserted an a 
+		/// Otherwise, the element is inserted an a
 		/// pair(iterator, true) with iterator
 		/// pointing to the new element is returned.
 	{
 		return _table.insert(value);
 	}
-	
+
 	void erase(Iterator it)
 		/// Erases the element pointed to by it.
 	{
 		_table.erase(it);
 	}
-	
+
 	void erase(const ValueType& value)
 		/// Erases the element with the given value, if it exists.
 	{
 		_table.erase(value);
 	}
-	
+
 	void clear()
 		/// Erases all elements.
 	{
 		_table.clear();
 	}
-	
+
 	std::size_t size() const
 		/// Returns the number of elements in the table.
 	{
 		return _table.size();
 	}
-	
+
 	bool empty() const
 		/// Returns true iff the table is empty.
 	{
diff --git a/Foundation/include/Poco/HashStatistic.h b/Foundation/include/Poco/HashStatistic.h
index ac413fb09..b2541ee23 100644
--- a/Foundation/include/Poco/HashStatistic.h
+++ b/Foundation/include/Poco/HashStatistic.h
@@ -31,10 +31,10 @@ class Foundation_API HashStatistic
 {
 public:
 	HashStatistic(
-		UInt32 tableSize, 
-		UInt32 numEntries, 
-		UInt32 numZeroEntries, 
-		UInt32 maxEntry, 
+		UInt32 tableSize,
+		UInt32 numEntries,
+		UInt32 numZeroEntries,
+		UInt32 maxEntry,
 		std::vector<UInt32> details = std::vector<UInt32>());
 		/// Creates the HashStatistic.
 
diff --git a/Foundation/include/Poco/HashTable.h b/Foundation/include/Poco/HashTable.h
index f2d8eb680..259ce8da3 100644
--- a/Foundation/include/Poco/HashTable.h
+++ b/Foundation/include/Poco/HashTable.h
@@ -51,9 +51,9 @@ public:
 	typedef typename HashEntryMap::const_iterator ConstIterator;
 	typedef typename HashEntryMap::iterator Iterator;
 
-	HashTable(UInt32 initialSize = 251): 
-		_entries(0), 
-		_size(0), 
+	HashTable(UInt32 initialSize = 251):
+		_entries(0),
+		_size(0),
 		_maxCapacity(initialSize)
 		/// Creates the HashTable.
 	{
@@ -211,21 +211,21 @@ public:
 	{
 		return get(key);
 	}
-	
+
 	Value& operator [] (const Key& key)
 	{
 		UInt32 hsh = hash(key);
 
 		if (!_entries[hsh])
 			return insertRaw(key, hsh, Value());
-			
+
 		ConstIterator it = _entries[hsh]->find(key);
 		if (it == _entries[hsh]->end())
 			return insertRaw(key, hsh, Value());
 
 		return it->second;
 	}
-	
+
 	const Key& getKeyRaw(const Key& key, UInt32 hsh)
 		/// Throws an exception if the key does not exist. returns a reference to the internally
 		/// stored key. Useful when someone does an insert and wants for performance reason only to store
@@ -276,7 +276,7 @@ public:
 	{
 		return _size;
 	}
-	
+
 	UInt32 maxCapacity() const
 	{
 		return _maxCapacity;
diff --git a/Foundation/include/Poco/HexBinaryDecoder.h b/Foundation/include/Poco/HexBinaryDecoder.h
index 7aab0f6cd..408e38d42 100644
--- a/Foundation/include/Poco/HexBinaryDecoder.h
+++ b/Foundation/include/Poco/HexBinaryDecoder.h
@@ -29,13 +29,13 @@ namespace Poco {
 class Foundation_API HexBinaryDecoderBuf: public UnbufferedStreamBuf
 	/// This streambuf decodes all hexBinary-encoded data read
 	/// from the istream connected to it.
-	/// In hexBinary encoding, each binary octet is encoded as a character tuple,  
+	/// In hexBinary encoding, each binary octet is encoded as a character tuple,
 	/// consisting of two hexadecimal digits ([0-9a-fA-F]) representing the octet code.
 	/// See also: XML Schema Part 2: Datatypes (http://www.w3.org/TR/xmlschema-2/),
 	/// section 3.2.15.
 	///
-	/// Note: For performance reasons, the characters 
-	/// are read directly from the given istream's 
+	/// Note: For performance reasons, the characters
+	/// are read directly from the given istream's
 	/// underlying streambuf, so the state
 	/// of the istream will not reflect that of
 	/// its streambuf.
@@ -43,7 +43,7 @@ class Foundation_API HexBinaryDecoderBuf: public UnbufferedStreamBuf
 public:
 	HexBinaryDecoderBuf(std::istream& istr);
 	~HexBinaryDecoderBuf();
-	
+
 private:
 	int readFromDevice();
 	int readOne();
@@ -71,13 +71,13 @@ protected:
 class Foundation_API HexBinaryDecoder: public HexBinaryDecoderIOS, public std::istream
 	/// This istream decodes all hexBinary-encoded data read
 	/// from the istream connected to it.
-	/// In hexBinary encoding, each binary octet is encoded as a character tuple,  
+	/// In hexBinary encoding, each binary octet is encoded as a character tuple,
 	/// consisting of two hexadecimal digits ([0-9a-fA-F]) representing the octet code.
 	/// See also: XML Schema Part 2: Datatypes (http://www.w3.org/TR/xmlschema-2/),
 	/// section 3.2.15.
 	///
-	/// Note: For performance reasons, the characters 
-	/// are read directly from the given istream's 
+	/// Note: For performance reasons, the characters
+	/// are read directly from the given istream's
 	/// underlying streambuf, so the state
 	/// of the istream will not reflect that of
 	/// its streambuf.
diff --git a/Foundation/include/Poco/HexBinaryEncoder.h b/Foundation/include/Poco/HexBinaryEncoder.h
index 453c3cd82..bd7653982 100644
--- a/Foundation/include/Poco/HexBinaryEncoder.h
+++ b/Foundation/include/Poco/HexBinaryEncoder.h
@@ -29,8 +29,8 @@ namespace Poco {
 class Foundation_API HexBinaryEncoderBuf: public UnbufferedStreamBuf
 	/// This streambuf encodes all data written
 	/// to it in hexBinary encoding and forwards it to a connected
-	/// ostream. 
-	/// In hexBinary encoding, each binary octet is encoded as a character tuple,  
+	/// ostream.
+	/// In hexBinary encoding, each binary octet is encoded as a character tuple,
 	/// consisting of two hexadecimal digits ([0-9a-fA-F]) representing the octet code.
 	/// See also: XML Schema Part 2: Datatypes (http://www.w3.org/TR/xmlschema-2/),
 	/// section 3.2.15.
@@ -43,24 +43,24 @@ class Foundation_API HexBinaryEncoderBuf: public UnbufferedStreamBuf
 public:
 	HexBinaryEncoderBuf(std::ostream& ostr);
 	~HexBinaryEncoderBuf();
-	
+
 	int close();
 		/// Closes the stream buffer.
-	
+
 	void setLineLength(int lineLength);
 		/// Specify the line length.
 		///
-		/// After the given number of characters have been written, 
+		/// After the given number of characters have been written,
 		/// a newline character will be written.
 		///
 		/// Specify 0 for an unlimited line length.
-		
+
 	int getLineLength() const;
 		/// Returns the currently set line length.
-		
+
 	void setUppercase(bool flag = true);
 		/// Specify whether hex digits a-f are written in upper or lower case.
-	
+
 private:
 	int writeToDevice(char c);
 
@@ -95,7 +95,7 @@ class Foundation_API HexBinaryEncoder: public HexBinaryEncoderIOS, public std::o
 	/// Always call close() when done
 	/// writing data, to ensure proper
 	/// completion of the encoding operation.
-	/// In hexBinary encoding, each binary octet is encoded as a character tuple,  
+	/// In hexBinary encoding, each binary octet is encoded as a character tuple,
 	/// consisting of two hexadecimal digits ([0-9a-fA-F]) representing the octet code.
 	/// See also: XML Schema Part 2: Datatypes (http://www.w3.org/TR/xmlschema-2/),
 	/// section 3.2.15.
diff --git a/Foundation/include/Poco/InflatingStream.h b/Foundation/include/Poco/InflatingStream.h
index 6e66faf6b..61064dc87 100644
--- a/Foundation/include/Poco/InflatingStream.h
+++ b/Foundation/include/Poco/InflatingStream.h
@@ -71,27 +71,27 @@ public:
 
 	~InflatingStreamBuf();
 		/// Destroys the InflatingStreamBuf.
-		
+
 	int close();
-		/// Finishes up the stream. 
+		/// Finishes up the stream.
 		///
 		/// Must be called when inflating to an output stream.
-		
+
 	void reset();
 		/// Resets the stream buffer.
-		
+
 protected:
 	int readFromDevice(char* buffer, std::streamsize length);
 	int writeToDevice(const char* buffer, std::streamsize length);
 	int sync();
 
 private:
-	enum 
+	enum
 	{
 		STREAM_BUFFER_SIZE  = 1024,
 		INFLATE_BUFFER_SIZE = 32768
 	};
-	
+
 	std::istream*  _pIstr;
 	std::ostream*  _pOstr;
 	char*    _buffer;
@@ -111,7 +111,7 @@ public:
 	InflatingIOS(std::ostream& ostr, InflatingStreamBuf::StreamType type = InflatingStreamBuf::STREAM_ZLIB);
 		/// Creates an InflatingIOS for expanding the compressed data passed through
 		/// and forwarding it to the given output stream.
-		
+
 	InflatingIOS(std::ostream& ostr, int windowBits);
 		/// Creates an InflatingIOS for expanding the compressed data passed through
 		/// and forwarding it to the given output stream.
@@ -120,11 +120,11 @@ public:
 		/// of the windowBits parameter.
 
 	InflatingIOS(std::istream& istr, InflatingStreamBuf::StreamType type = InflatingStreamBuf::STREAM_ZLIB);
-		/// Creates an InflatingIOS for expanding the compressed data read from 
+		/// Creates an InflatingIOS for expanding the compressed data read from
 		/// the given input stream.
 
 	InflatingIOS(std::istream& istr, int windowBits);
-		/// Creates an InflatingIOS for expanding the compressed data read from 
+		/// Creates an InflatingIOS for expanding the compressed data read from
 		/// the given input stream.
 		///
 		/// Please refer to the zlib documentation of inflateInit2() for a description
@@ -132,10 +132,10 @@ public:
 
 	~InflatingIOS();
 		/// Destroys the InflatingIOS.
-		
+
 	InflatingStreamBuf* rdbuf();
 		/// Returns a pointer to the underlying stream buffer.
-		
+
 protected:
 	InflatingStreamBuf _buf;
 };
@@ -152,7 +152,7 @@ public:
 	InflatingOutputStream(std::ostream& ostr, InflatingStreamBuf::StreamType type = InflatingStreamBuf::STREAM_ZLIB);
 		/// Creates an InflatingOutputStream for expanding the compressed data passed through
 		/// and forwarding it to the given output stream.
-		
+
 	InflatingOutputStream(std::ostream& ostr, int windowBits);
 		/// Creates an InflatingOutputStream for expanding the compressed data passed through
 		/// and forwarding it to the given output stream.
@@ -162,9 +162,9 @@ public:
 
 	~InflatingOutputStream();
 		/// Destroys the InflatingOutputStream.
-		
+
 	int close();
-		/// Finishes up the stream. 
+		/// Finishes up the stream.
 		///
 		/// Must be called to ensure all data is properly written to
 		/// the target output stream.
@@ -186,11 +186,11 @@ class Foundation_API InflatingInputStream: public std::istream, public Inflating
 {
 public:
 	InflatingInputStream(std::istream& istr, InflatingStreamBuf::StreamType type = InflatingStreamBuf::STREAM_ZLIB);
-		/// Creates an InflatingInputStream for expanding the compressed data read from 
+		/// Creates an InflatingInputStream for expanding the compressed data read from
 		/// the given input stream.
 
 	InflatingInputStream(std::istream& istr, int windowBits);
-		/// Creates an InflatingInputStream for expanding the compressed data read from 
+		/// Creates an InflatingInputStream for expanding the compressed data read from
 		/// the given input stream.
 		///
 		/// Please refer to the zlib documentation of inflateInit2() for a description
@@ -198,7 +198,7 @@ public:
 
 	~InflatingInputStream();
 		/// Destroys the InflatingInputStream.
-		
+
 	void reset();
 		/// Resets the zlib machinery so that another zlib stream can be read from
 		/// the same underlying input stream.
diff --git a/Foundation/include/Poco/Instantiator.h b/Foundation/include/Poco/Instantiator.h
index ce21ebc12..323a523e0 100644
--- a/Foundation/include/Poco/Instantiator.h
+++ b/Foundation/include/Poco/Instantiator.h
@@ -34,14 +34,14 @@ public:
 		/// Creates the AbstractInstantiator.
 	{
 	}
-	
+
 	virtual ~AbstractInstantiator()
 		/// Destroys the AbstractInstantiator.
 	{
 	}
-	
+
 	virtual Base* createInstance() const = 0;
-		/// Creates an instance of a concrete subclass of Base.	
+		/// Creates an instance of a concrete subclass of Base.
 
 private:
 	AbstractInstantiator(const AbstractInstantiator&);
@@ -51,8 +51,8 @@ private:
 
 template <class C, class Base>
 class Instantiator: public AbstractInstantiator<Base>
-	/// A template class for the easy instantiation of 
-	/// instantiators. 
+	/// A template class for the easy instantiation of
+	/// instantiators.
 	///
 	/// For the Instantiator to work, the class of which
 	/// instances are to be instantiated must have a no-argument
@@ -63,7 +63,7 @@ public:
 		/// Creates the Instantiator.
 	{
 	}
-	
+
 	virtual ~Instantiator()
 		/// Destroys the Instantiator.
 	{
diff --git a/Foundation/include/Poco/KeyValueArgs.h b/Foundation/include/Poco/KeyValueArgs.h
index cdcc4e1ce..6c3009da1 100644
--- a/Foundation/include/Poco/KeyValueArgs.h
+++ b/Foundation/include/Poco/KeyValueArgs.h
@@ -24,20 +24,20 @@
 namespace Poco {
 
 
-template <class TKey, class TValue> 
+template <class TKey, class TValue>
 class KeyValueArgs
 	/// Simply event arguments class to transfer a key and a value via an event call.
 	/// Note that key and value are *NOT* copied, only references to them are stored.
 {
 public:
-	KeyValueArgs(const TKey& aKey, const TValue& aVal): 
-		_key(aKey), 
+	KeyValueArgs(const TKey& aKey, const TValue& aVal):
+		_key(aKey),
 		_value(aVal)
 	{
 	}
 
 	KeyValueArgs(const KeyValueArgs& args):
-		_key(args._key), 
+		_key(args._key),
 		_value(args._value)
 	{
 	}
diff --git a/Foundation/include/Poco/LRUCache.h b/Foundation/include/Poco/LRUCache.h
index 9c7bfcad7..d73bbf046 100644
--- a/Foundation/include/Poco/LRUCache.h
+++ b/Foundation/include/Poco/LRUCache.h
@@ -26,11 +26,11 @@ namespace Poco {
 
 
 template <
-	class TKey, 
+	class TKey,
 	class TValue,
-	class TMutex = FastMutex, 
+	class TMutex = FastMutex,
 	class TEventMutex = FastMutex
-> 
+>
 class LRUCache: public AbstractCache<TKey, TValue, LRUStrategy<TKey, TValue>, TMutex, TEventMutex>
 	/// An LRUCache implements Least Recently Used caching. The default size for a cache is 1024 entries.
 {
diff --git a/Foundation/include/Poco/LRUStrategy.h b/Foundation/include/Poco/LRUStrategy.h
index c7180bd88..6bb274443 100644
--- a/Foundation/include/Poco/LRUStrategy.h
+++ b/Foundation/include/Poco/LRUStrategy.h
@@ -44,7 +44,7 @@ public:
 	typedef typename KeyIndex::const_iterator ConstIndexIterator;
 
 public:
-	LRUStrategy(std::size_t size): 
+	LRUStrategy(std::size_t size):
 		_size(size)
 	{
 		if (_size < 1) throw InvalidArgumentException("size must be > 0");
@@ -117,7 +117,7 @@ public:
 		Iterator it = --_keys.end(); //--keys can never be invoked on an empty list due to the minSize==1 requirement of LRU
 		std::size_t i = 0;
 
-		while (i++ < diff) 
+		while (i++ < diff)
 		{
 			elemsToRemove.insert(*it);
 			if (it != _keys.begin())
diff --git a/Foundation/include/Poco/Latin1Encoding.h b/Foundation/include/Poco/Latin1Encoding.h
index b1b987e0a..532da2b9d 100644
--- a/Foundation/include/Poco/Latin1Encoding.h
+++ b/Foundation/include/Poco/Latin1Encoding.h
@@ -38,7 +38,7 @@ public:
 	int convert(int ch, unsigned char* bytes, int length) const;
 	int queryConvert(const unsigned char* bytes, int length) const;
 	int sequenceLength(const unsigned char* bytes, int length) const;
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Foundation/include/Poco/Latin2Encoding.h b/Foundation/include/Poco/Latin2Encoding.h
index ac1cfecde..b82475596 100644
--- a/Foundation/include/Poco/Latin2Encoding.h
+++ b/Foundation/include/Poco/Latin2Encoding.h
@@ -41,7 +41,7 @@ public:
 	int convert(int ch, unsigned char* bytes, int length) const;
 	int queryConvert(const unsigned char* bytes, int length) const;
 	int sequenceLength(const unsigned char* bytes, int length) const;
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Foundation/include/Poco/Latin9Encoding.h b/Foundation/include/Poco/Latin9Encoding.h
index d2b7a1ca7..0eac73349 100644
--- a/Foundation/include/Poco/Latin9Encoding.h
+++ b/Foundation/include/Poco/Latin9Encoding.h
@@ -41,7 +41,7 @@ public:
 	int convert(int ch, unsigned char* bytes, int length) const;
 	int queryConvert(const unsigned char* bytes, int length) const;
 	int sequenceLength(const unsigned char* bytes, int length) const;
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Foundation/include/Poco/LineEndingConverter.h b/Foundation/include/Poco/LineEndingConverter.h
index d23414c35..b519b51ec 100644
--- a/Foundation/include/Poco/LineEndingConverter.h
+++ b/Foundation/include/Poco/LineEndingConverter.h
@@ -41,7 +41,7 @@ public:
 
 class Foundation_API LineEndingConverterStreamBuf: public UnbufferedStreamBuf
 	/// This stream buffer performs line ending conversion
-	/// on text streams. The converter can convert from and to 
+	/// on text streams. The converter can convert from and to
 	/// the Unix (LF), Mac (CR) and DOS/Windows/Network (CF-LF) endings.
 	///
 	/// Any newline sequence in the source will be replaced by the
@@ -58,7 +58,7 @@ public:
 
 	~LineEndingConverterStreamBuf();
 		/// Destroys the LineEndingConverterStream.
-		
+
 	void setNewLine(const std::string& newLineCharacters);
 		/// Sets the target line ending for the converter.
 		///
@@ -90,7 +90,7 @@ private:
 class Foundation_API LineEndingConverterIOS: public virtual std::ios
 	/// The base class for InputLineEndingConverter and OutputLineEndingConverter.
 	///
-	/// This class provides common methods and is also needed to ensure 
+	/// This class provides common methods and is also needed to ensure
 	/// the correct initialization order of the stream buffer and base classes.
 {
 public:
@@ -133,7 +133,7 @@ protected:
 
 class Foundation_API InputLineEndingConverter: public LineEndingConverterIOS, public std::istream
 	/// InputLineEndingConverter performs line ending conversion
-	/// on text input streams. The converter can convert from and to 
+	/// on text input streams. The converter can convert from and to
 	/// the Unix (LF), Mac (CR) and DOS/Windows/Network (CF-LF) endings.
 	///
 	/// Any newline sequence in the source will be replaced by the
@@ -155,7 +155,7 @@ public:
 
 class Foundation_API OutputLineEndingConverter: public LineEndingConverterIOS, public std::ostream
 	/// OutputLineEndingConverter performs line ending conversion
-	/// on text output streams. The converter can convert from and to 
+	/// on text output streams. The converter can convert from and to
 	/// the Unix (LF), Mac (CR) and DOS/Windows/Network (CF-LF) endings.
 	///
 	/// Any newline sequence in the source will be replaced by the
diff --git a/Foundation/include/Poco/LinearHashTable.h b/Foundation/include/Poco/LinearHashTable.h
index 1db5b0088..7883387ad 100644
--- a/Foundation/include/Poco/LinearHashTable.h
+++ b/Foundation/include/Poco/LinearHashTable.h
@@ -73,7 +73,7 @@ public:
 		ConstIterator(): _initialized(false)
 		{
 		}
-		
+
 		ConstIterator(const BucketVecIterator& vecIt, const BucketVecIterator& endIt, const BucketIterator& buckIt):
 			_vecIt(vecIt),
 			_endIt(endIt),
@@ -90,15 +90,15 @@ public:
 
 		{
 		}
-		
+
 		ConstIterator& operator = (const ConstIterator& it)
 		{
 			ConstIterator tmp(it);
 			swap(tmp);
 			return *this;
 		}
-		
-		void swap(ConstIterator& it)
+
+		void swap(ConstIterator& it) noexcept
 		{
 			using std::swap;
 			// uninitialized iterators crash when swapped
@@ -109,7 +109,7 @@ public:
 				swap(_buckIt, it._buckIt);
 				swap(_initialized, it._initialized);
 			}
-			else 
+			else
 			{
 				_vecIt = it._vecIt;
 				_endIt = it._endIt;
@@ -117,7 +117,7 @@ public:
 				_initialized = it._initialized;
 			}
 		}
-		
+
 		bool operator == (const ConstIterator& it) const
 		{
 			return _vecIt == it._vecIt && (_vecIt == _endIt || _buckIt == it._buckIt);
@@ -127,7 +127,7 @@ public:
 		{
 			return _vecIt != it._vecIt || (_vecIt != _endIt && _buckIt != it._buckIt);
 		}
-		
+
 		const typename Bucket::value_type& operator * () const
 		{
 			return *_buckIt;
@@ -137,7 +137,7 @@ public:
 		{
 			return &*_buckIt;
 		}
-		
+
 		ConstIterator& operator ++ () // prefix
 		{
 			if (_vecIt != _endIt)
@@ -151,30 +151,30 @@ public:
 			}
 			return *this;
 		}
-		
+
 		ConstIterator operator ++ (int) // postfix
 		{
 			ConstIterator tmp(*this);
 			++*this;
 			return tmp;
 		}
-		
+
 	protected:
 		BucketVecIterator _vecIt;
 		BucketVecIterator _endIt;
 		BucketIterator    _buckIt;
 		bool              _initialized;
-		
+
 		friend class LinearHashTable;
 	};
-	
+
 	class Iterator: public ConstIterator
 	{
 	public:
 		Iterator()
 		{
 		}
-		
+
 		Iterator(const BucketVecIterator& vecIt, const BucketVecIterator& endIt, const BucketIterator& buckIt):
 			ConstIterator(vecIt, endIt, buckIt)
 		{
@@ -184,19 +184,19 @@ public:
 			ConstIterator(it)
 		{
 		}
-		
+
 		Iterator& operator = (const Iterator& it)
 		{
 			Iterator tmp(it);
 			ConstIterator::swap(tmp);
 			return *this;
 		}
-		
-		void swap(Iterator& it)
+
+		void swap(Iterator& it) noexcept
 		{
 			ConstIterator::swap(it);
 		}
-				
+
 		typename Bucket::value_type& operator * ()
 		{
 			return *this->_buckIt;
@@ -216,13 +216,13 @@ public:
 		{
 			return &*this->_buckIt;
 		}
-		
+
 		Iterator& operator ++ () // prefix
 		{
 			ConstIterator::operator ++ ();
 			return *this;
 		}
-		
+
 		Iterator operator ++ (int) // postfix
 		{
 			Iterator tmp(*this);
@@ -232,8 +232,8 @@ public:
 
 		friend class LinearHashTable;
 	};
-	
-	LinearHashTable(std::size_t initialReserve = 64): 
+
+	LinearHashTable(std::size_t initialReserve = 64):
 		_split(0),
 		_front(1),
 		_size(0)
@@ -242,7 +242,7 @@ public:
 		_buckets.reserve(calcSize(initialReserve));
 		_buckets.push_back(Bucket());
 	}
-	
+
 	LinearHashTable(const LinearHashTable& table):
 		_buckets(table._buckets),
 		_split(table._split),
@@ -251,12 +251,12 @@ public:
 		/// Creates the LinearHashTable by copying another one.
 	{
 	}
-	
+
 	~LinearHashTable()
 		/// Destroys the LinearHashTable.
 	{
 	}
-	
+
 	LinearHashTable& operator = (const LinearHashTable& table)
 		/// Assigns another LinearHashTable.
 	{
@@ -264,8 +264,8 @@ public:
 		swap(tmp);
 		return *this;
 	}
-	
-	void swap(LinearHashTable& table)
+
+	void swap(LinearHashTable& table) noexcept
 		/// Swaps the LinearHashTable with another one.
 	{
 		using std::swap;
@@ -274,7 +274,7 @@ public:
 		swap(_front, table._front);
 		swap(_size, table._size);
 	}
-	
+
 	ConstIterator begin() const
 		/// Returns an iterator pointing to the first entry, if one exists.
 	{
@@ -289,13 +289,13 @@ public:
 		else
 			return ConstIterator(it, itEnd, it->begin());
 	}
-	
+
 	ConstIterator end() const
 		/// Returns an iterator pointing to the end of the table.
 	{
 		return ConstIterator(_buckets.end(), _buckets.end(), _buckets.front().end());
 	}
-	
+
 	Iterator begin()
 		/// Returns an iterator pointing to the first entry, if one exists.
 	{
@@ -310,13 +310,13 @@ public:
 		else
 			return Iterator(it, itEnd, it->begin());
 	}
-	
+
 	Iterator end()
 		/// Returns an iterator pointing to the end of the table.
 	{
 		return Iterator(_buckets.end(), _buckets.end(), _buckets.front().end());
 	}
-		
+
 	ConstIterator find(const Value& value) const
 		/// Finds an entry in the table.
 	{
@@ -340,21 +340,21 @@ public:
 		else
 			return end();
 	}
-	
+
 	std::size_t count(const Value& value) const
 		/// Returns the number of elements with the given
 		/// value, with is either 1 or 0.
 	{
 		return find(value) != end() ? 1 : 0;
 	}
-	
+
 	std::pair<Iterator, bool> insert(const Value& value)
 		/// Inserts an element into the table.
 		///
 		/// If the element already exists in the table,
-		/// a pair(iterator, false) with iterator pointing to the 
+		/// a pair(iterator, false) with iterator pointing to the
 		/// existing element is returned.
-		/// Otherwise, the element is inserted an a 
+		/// Otherwise, the element is inserted an a
 		/// pair(iterator, true) with iterator
 		/// pointing to the new element is returned.
 	{
@@ -376,7 +376,7 @@ public:
 			return std::make_pair(Iterator(it, _buckets.end(), buckIt), false);
 		}
 	}
-	
+
 	void erase(Iterator it)
 		/// Erases the element pointed to by it.
 	{
@@ -387,39 +387,39 @@ public:
 			merge();
 		}
 	}
-	
+
 	void erase(const Value& value)
 		/// Erases the element with the given value, if it exists.
 	{
 		Iterator it = find(value);
 		erase(it);
 	}
-	
+
 	void clear()
 		/// Erases all elements.
 	{
 		LinearHashTable emptyTable;
 		swap(emptyTable);
 	}
-	
+
 	std::size_t size() const
 		/// Returns the number of elements in the table.
 	{
 		return _size;
 	}
-	
+
 	bool empty() const
 		/// Returns true iff the table is empty.
 	{
 		return _size == 0;
 	}
-	
+
 	std::size_t buckets() const
 		/// Returns the number of allocated buckets.
 	{
 		return _buckets.size();
 	}
-	
+
 protected:
 	std::size_t bucketAddress(const Value& value) const
 	{
@@ -429,7 +429,7 @@ protected:
 		else
 			return n % (2*_front);
 	}
-	
+
 	std::size_t bucketAddressForHash(std::size_t hash)
 	{
 		if (hash % _front >= _split)
@@ -437,7 +437,7 @@ protected:
 		else
 			return hash % (2*_front);
 	}
-	
+
 	void split()
 	{
 		if (_split == _front)
@@ -458,7 +458,7 @@ protected:
 			swap(*it, _buckets[addr].back());
 		}
 	}
-	
+
 	void merge()
 	{
 		if (_split == 0)
@@ -478,16 +478,16 @@ protected:
 			swap(*it, _buckets[addr].back());
 		}
 	}
-	
+
 	static std::size_t calcSize(std::size_t initialSize)
 	{
 		std::size_t size = 32;
 		while (size < initialSize) size *= 2;
 		return size;
 	}
-	
+
 private:
-	// Evil hack: _buckets must be mutable because both ConstIterator and Iterator hold 
+	// Evil hack: _buckets must be mutable because both ConstIterator and Iterator hold
 	// ordinary iterator's (not const_iterator's).
 	mutable BucketVec _buckets;
 	std::size_t _split;
diff --git a/Foundation/include/Poco/ListMap.h b/Foundation/include/Poco/ListMap.h
index 51844d7f1..2e41af0a3 100644
--- a/Foundation/include/Poco/ListMap.h
+++ b/Foundation/include/Poco/ListMap.h
@@ -35,7 +35,7 @@ class ListMap
 	/// ordering of elements is not desirable. Naturally, this container will
 	/// have inferior data retrieval performance and it is not recommended for
 	/// use with large datasets. The main purpose within POCO is for Internet
-	/// messages (email message, http headers etc), to prevent automatic 
+	/// messages (email message, http headers etc), to prevent automatic
 	/// header entry reordering.
 {
 public:
@@ -45,17 +45,17 @@ public:
 	using ConstReference = const Mapped&;
 	using Pointer = Mapped*;
 	using ConstPointer = const Mapped*;
-	
+
 	using ValueType = typename Container::value_type;
 	using SizeType = typename Container::size_type;
 	using Iterator = typename Container::iterator;
 	using ConstIterator = typename Container::const_iterator;
-	
+
 	ListMap()
 		/// Creates an empty ListMap.
 	{
 	}
-	
+
 	explicit ListMap(std::size_t initialReserve):
 		_container(initialReserve)
 		/// Creates the ListMap with room for initialReserve entries.
@@ -71,7 +71,7 @@ public:
 		_container(std::move(other._container))
 	{
 	}
-	
+
 	ListMap& operator = (const ListMap& map)
 		/// Assigns another ListMap.
 	{
@@ -79,44 +79,44 @@ public:
 		swap(tmp);
 		return *this;
 	}
-	
+
 	ListMap& operator = (ListMap&& map) noexcept
 		/// Assigns another ListMap.
 	{
 		_container = std::move(map._container);
 		return *this;
 	}
-	
-	void swap(ListMap& map)
+
+	void swap(ListMap& map) noexcept
 		/// Swaps the ListMap with another one.
 	{
 		_container.swap(map._container);
 	}
-	
+
 	ConstIterator begin() const
 		/// Returns the beginning of the map.
 	{
 		return _container.begin();
 	}
-	
+
 	ConstIterator end() const
 		/// Returns the end of the map.
 	{
 		return _container.end();
 	}
-	
+
 	Iterator begin()
 		/// Returns the beginning of the map.
 	{
 		return _container.begin();
 	}
-	
+
 	Iterator end()
 		/// Returns the end of the map.
 	{
 		return _container.end();
 	}
-	
+
 	ConstIterator find(const KeyType& key) const
 		/// Finds the first occurrence of the key and
 		/// returns iterator pointing to the found entry
@@ -148,22 +148,22 @@ public:
 	}
 
 	Iterator insert(const ValueType& val)
-		/// Inserts the value into the map. If one or more values 
-		/// already exist, new value is inserted at the end of the 
+		/// Inserts the value into the map. If one or more values
+		/// already exist, new value is inserted at the end of the
 		/// block. Thus, all the equal value entries are located
 		/// sequentially at all times.
-		/// Returns iterator pointing to the newly inserted value 
+		/// Returns iterator pointing to the newly inserted value
 	{
 		Iterator it = find(val.first);
 		while (it != _container.end() && isEqual(it->first, val.first)) ++it;
 		return _container.insert(it, val);
 	}
-	
+
 	void erase(Iterator it)
 	{
 		_container.erase(it);
 	}
-	
+
 	SizeType erase(const KeyType& key)
 	{
 		SizeType count = 0;
@@ -185,7 +185,7 @@ public:
 		}
 		return count;
 	}
-	
+
 	void clear()
 	{
 		_container.clear();
diff --git a/Foundation/include/Poco/LocalDateTime.h b/Foundation/include/Poco/LocalDateTime.h
index 47206671a..5562309fe 100644
--- a/Foundation/include/Poco/LocalDateTime.h
+++ b/Foundation/include/Poco/LocalDateTime.h
@@ -27,11 +27,11 @@ namespace Poco {
 
 class Foundation_API LocalDateTime
 	/// This class represents an instant in local time
-	/// (as opposed to UTC), expressed in years, months, days, 
-	/// hours, minutes, seconds and milliseconds based on the 
+	/// (as opposed to UTC), expressed in years, months, days,
+	/// hours, minutes, seconds and milliseconds based on the
 	/// Gregorian calendar.
 	///
-	/// In addition to the date and time, the class also 
+	/// In addition to the date and time, the class also
 	/// maintains a time zone differential, which denotes
 	/// the difference in seconds from UTC to local time,
 	/// i.e. UTC = local time - time zone differential.
@@ -53,7 +53,7 @@ class Foundation_API LocalDateTime
 {
 public:
 	LocalDateTime();
-		/// Creates a LocalDateTime with the current date/time 
+		/// Creates a LocalDateTime with the current date/time
 		/// for the current time zone.
 
 	LocalDateTime(int year, int month, int day, int hour = 0, int minute = 0, int second = 0, int millisecond = 0, int microsecond = 0);
@@ -94,7 +94,7 @@ public:
 	//@ deprecated
 	LocalDateTime(int tzd, const DateTime& dateTime, bool adjust);
 		/// Creates a LocalDateTime from the UTC time given in dateTime,
-		/// using the given time zone differential. If adjust is true, 
+		/// using the given time zone differential. If adjust is true,
 		/// adjusts dateTime for the given time zone differential.
 
 	LocalDateTime(double julianDay);
@@ -107,19 +107,19 @@ public:
 
 	LocalDateTime(const LocalDateTime& dateTime);
 		/// Copy constructor. Creates the LocalDateTime from another one.
-		
+
 	~LocalDateTime();
 		/// Destroys the LocalDateTime.
-		
+
 	LocalDateTime& operator = (const LocalDateTime& dateTime);
 		/// Assigns another LocalDateTime.
-	
+
 	LocalDateTime& operator = (const Timestamp& timestamp);
 		/// Assigns a timestamp
 
 	LocalDateTime& operator = (double julianDay);
 		/// Assigns a Julian day in the local time zone.
-	
+
 	LocalDateTime& assign(int year, int month, int day, int hour = 0, int minute = 0, int second = 0, int millisecond = 0, int microseconds = 0);
 		/// Assigns a Gregorian local date and time.
 		///   * year is from 0 to 9999.
@@ -155,64 +155,64 @@ public:
 
 	int year() const;
 		/// Returns the year.
-		
+
 	int month() const;
 		/// Returns the month (1 to 12).
-	
+
 	int week(int firstDayOfWeek = DateTime::MONDAY) const;
 		/// Returns the week number within the year.
 		/// FirstDayOfWeek should be either SUNDAY (0) or MONDAY (1).
-		/// The returned week number will be from 0 to 53. Week number 1 is the week 
+		/// The returned week number will be from 0 to 53. Week number 1 is the week
 		/// containing January 4. This is in accordance to ISO 8601.
-		/// 
+		///
 		/// The following example assumes that firstDayOfWeek is MONDAY. For 2005, which started
 		/// on a Saturday, week 1 will be the week starting on Monday, January 3.
 		/// January 1 and 2 will fall within week 0 (or the last week of the previous year).
 		///
 		/// For 2007, which starts on a Monday, week 1 will be the week starting on Monday, January 1.
 		/// There will be no week 0 in 2007.
-	
+
 	int day() const;
 		/// Returns the day within the month (1 to 31).
-		
+
 	int dayOfWeek() const;
 		/// Returns the weekday (0 to 6, where
 		/// 0 = Sunday, 1 = Monday, ..., 6 = Saturday).
-	
+
 	int dayOfYear() const;
 		/// Returns the number of the day in the year.
 		/// January 1 is 1, February 1 is 32, etc.
-	
+
 	int hour() const;
 		/// Returns the hour (0 to 23).
-		
+
 	int hourAMPM() const;
 		/// Returns the hour (0 to 12).
-	
+
 	bool isAM() const;
 		/// Returns true if hour < 12;
 
 	bool isPM() const;
 		/// Returns true if hour >= 12.
-		
+
 	int minute() const;
 		/// Returns the minute (0 to 59).
-		
+
 	int second() const;
 		/// Returns the second (0 to 59).
-		
+
 	int millisecond() const;
 		/// Returns the millisecond (0 to 999)
-	
+
 	int microsecond() const;
 		/// Returns the microsecond (0 to 999)
-	
+
 	double julianDay() const;
 		/// Returns the Julian day for the date.
 
 	int tzd() const;
 		/// Returns the time zone differential.
-		
+
 	DateTime utc() const;
 		/// Returns the UTC equivalent for the local date and time.
 
@@ -222,12 +222,12 @@ public:
 	Timestamp::UtcTimeVal utcTime() const;
 		/// Returns the UTC equivalent for the local date and time.
 
-	bool operator == (const LocalDateTime& dateTime) const;	
-	bool operator != (const LocalDateTime& dateTime) const;	
-	bool operator <  (const LocalDateTime& dateTime) const;	
-	bool operator <= (const LocalDateTime& dateTime) const;	
-	bool operator >  (const LocalDateTime& dateTime) const;	
-	bool operator >= (const LocalDateTime& dateTime) const;	
+	bool operator == (const LocalDateTime& dateTime) const;
+	bool operator != (const LocalDateTime& dateTime) const;
+	bool operator <  (const LocalDateTime& dateTime) const;
+	bool operator <= (const LocalDateTime& dateTime) const;
+	bool operator >  (const LocalDateTime& dateTime) const;
+	bool operator >= (const LocalDateTime& dateTime) const;
 
 	LocalDateTime  operator +  (const Timespan& span) const;
 	LocalDateTime  operator -  (const Timespan& span) const;
@@ -237,23 +237,23 @@ public:
 
 protected:
 	LocalDateTime(Timestamp::UtcTimeVal utcTime, Timestamp::TimeDiff diff, int tzd);
-		
+
 	void determineTzd(bool adjust = false);
 		/// Recalculate the tzd based on the _dateTime member based
 		/// on the current timezone using the Standard C runtime functions.
 		/// If adjust is true, then adjustForTzd() is called after the
 		/// differential is calculated.
-		
+
 	void adjustForTzd();
 		/// Adjust the _dateTime member based on the _tzd member.
-		
+
 	std::time_t dstOffset(int& dstOffset) const;
 		/// Determine the DST offset for the current date/time.
-	
+
 private:
 	DateTime _dateTime;
 	int      _tzd;
-	
+
 	friend class DateTimeFormatter;
 	friend class DateTimeParser;
 };
@@ -285,7 +285,7 @@ inline int LocalDateTime::day() const
 	return _dateTime.day();
 }
 
-	
+
 inline int LocalDateTime::dayOfWeek() const
 {
 	return _dateTime.dayOfWeek();
@@ -303,7 +303,7 @@ inline int LocalDateTime::hour() const
 	return _dateTime.hour();
 }
 
-	
+
 inline int LocalDateTime::hourAMPM() const
 {
 	return _dateTime.hourAMPM();
@@ -321,19 +321,19 @@ inline bool LocalDateTime::isPM() const
 	return _dateTime.isPM();
 }
 
-	
+
 inline int LocalDateTime::minute() const
 {
 	return _dateTime.minute();
 }
 
-	
+
 inline int LocalDateTime::second() const
 {
 	return _dateTime.second();
 }
 
-	
+
 inline int LocalDateTime::millisecond() const
 {
 	return _dateTime.millisecond();
@@ -376,7 +376,7 @@ inline void LocalDateTime::adjustForTzd()
 }
 
 
-inline void swap(LocalDateTime& d1, LocalDateTime& d2)
+inline void swap(LocalDateTime& d1, LocalDateTime& d2) noexcept
 {
 	d1.swap(d2);
 }
diff --git a/Foundation/include/Poco/LogFile_STD.h b/Foundation/include/Poco/LogFile_STD.h
index 0e8feda2b..a178cb0ba 100644
--- a/Foundation/include/Poco/LogFile_STD.h
+++ b/Foundation/include/Poco/LogFile_STD.h
@@ -43,6 +43,7 @@ private:
 	std::string _path;
 	mutable Poco::FileOutputStream _str;
 	Timestamp _creationDate;
+	UInt64 _size;
 };
 
 
diff --git a/Foundation/include/Poco/LoggingRegistry.h b/Foundation/include/Poco/LoggingRegistry.h
index 2d4ca3647..397b81993 100644
--- a/Foundation/include/Poco/LoggingRegistry.h
+++ b/Foundation/include/Poco/LoggingRegistry.h
@@ -58,7 +58,7 @@ public:
 		/// Registers a channel under a given name.
 		/// It is okay to re-register a different channel under an
 		/// already existing name.
-		
+
 	void registerFormatter(const std::string& name, Formatter::Ptr pFormatter);
 		/// Registers a formatter under a given name.
 		/// It is okay to re-register a different formatter under an
@@ -86,7 +86,7 @@ private:
 	typedef AutoPtr<Formatter> FormatterPtr;
 	typedef std::map<std::string, ChannelPtr> ChannelMap;
 	typedef std::map<std::string, FormatterPtr> FormatterMap;
-	
+
 	ChannelMap   _channelMap;
 	FormatterMap _formatterMap;
 	mutable FastMutex _mutex;
diff --git a/Foundation/include/Poco/MD4Engine.h b/Foundation/include/Poco/MD4Engine.h
index c243e7851..291c561f6 100644
--- a/Foundation/include/Poco/MD4Engine.h
+++ b/Foundation/include/Poco/MD4Engine.h
@@ -61,7 +61,7 @@ public:
 
 	MD4Engine();
 	~MD4Engine();
-		
+
 	std::size_t digestLength() const;
 	void reset();
 	const DigestEngine::Digest& digest();
diff --git a/Foundation/include/Poco/MD5Engine.h b/Foundation/include/Poco/MD5Engine.h
index ec3e80df7..e67b10a99 100644
--- a/Foundation/include/Poco/MD5Engine.h
+++ b/Foundation/include/Poco/MD5Engine.h
@@ -16,7 +16,7 @@
 // MD5 (RFC 1321) algorithm:
 // Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 // rights reserved.
-// 
+//
 // License to copy and use this software is granted provided that it
 // is identified as the "RSA Data Security, Inc. MD5 Message-Digest
 // Algorithm" in all material mentioning or referencing this software
@@ -61,7 +61,7 @@ public:
 
 	MD5Engine();
 	~MD5Engine();
-		
+
 	std::size_t digestLength() const;
 	void reset();
 	const DigestEngine::Digest& digest();
diff --git a/Foundation/include/Poco/Manifest.h b/Foundation/include/Poco/Manifest.h
index b3db242c6..11e3470ea 100644
--- a/Foundation/include/Poco/Manifest.h
+++ b/Foundation/include/Poco/Manifest.h
@@ -100,7 +100,7 @@ public:
 		{
 			return _it->second;
 		}
-		
+
 	private:
 		typename MetaMap::const_iterator _it;
 	};
diff --git a/Foundation/include/Poco/MemoryStream.h b/Foundation/include/Poco/MemoryStream.h
index e168c8a03..1db3a2c23 100644
--- a/Foundation/include/Poco/MemoryStream.h
+++ b/Foundation/include/Poco/MemoryStream.h
@@ -31,9 +31,9 @@
 namespace Poco {
 
 
-template <typename ch, typename tr> 
+template <typename ch, typename tr>
 class BasicMemoryStreamBuf: public std::basic_streambuf<ch, tr>
-	/// BasicMemoryStreamBuf is a simple implementation of a 
+	/// BasicMemoryStreamBuf is a simple implementation of a
 	/// stream buffer for reading and writing from a memory area.
 	///
 	/// This streambuf only supports unidirectional streams.
@@ -145,7 +145,7 @@ public:
 	{
 		return 0;
 	}
-	
+
 	std::streamsize charsWritten() const
 	{
 		return static_cast<std::streamsize>(this->pptr() - this->pbase());
@@ -158,7 +158,7 @@ public:
 		this->setg(_pBuffer, _pBuffer, _pBuffer + _bufferSize);
 		this->setp(_pBuffer, _pBuffer + _bufferSize);
 	}
-		
+
 private:
 	char_type*      _pBuffer;
 	std::streamsize _bufferSize;
@@ -184,13 +184,13 @@ class Foundation_API MemoryIOS: public virtual std::ios
 public:
 	MemoryIOS(char* pBuffer, std::streamsize bufferSize);
 		/// Creates the basic stream.
-		
+
 	~MemoryIOS();
 		/// Destroys the stream.
 
 	MemoryStreamBuf* rdbuf();
 		/// Returns a pointer to the underlying streambuf.
-		
+
 protected:
 	MemoryStreamBuf _buf;
 };
@@ -203,7 +203,7 @@ public:
 	MemoryInputStream(const char* pBuffer, std::streamsize bufferSize);
 		/// Creates a MemoryInputStream for the given memory area,
 		/// ready for reading.
-	
+
 	~MemoryInputStream();
 		/// Destroys the MemoryInputStream.
 };
@@ -216,7 +216,7 @@ public:
 	MemoryOutputStream(char* pBuffer, std::streamsize bufferSize);
 		/// Creates a MemoryOutputStream for the given memory area,
 		/// ready for writing.
-	
+
 	~MemoryOutputStream();
 		/// Destroys the MemoryInputStream.
 
diff --git a/Foundation/include/Poco/Message.h b/Foundation/include/Poco/Message.h
index c3a5be65c..fd3262caf 100644
--- a/Foundation/include/Poco/Message.h
+++ b/Foundation/include/Poco/Message.h
@@ -43,6 +43,8 @@ class Foundation_API Message
 	/// caused the message.
 {
 public:
+	typedef std::map<std::string, std::string> StringMap;
+
 	enum Priority
 	{
 		PRIO_FATAL = 1,   /// A fatal error. The application will most likely terminate. This is the highest priority.
@@ -178,6 +180,9 @@ public:
 		/// with the given name. If the parameter with the given name
 		/// does not exist, then defaultValue is returned.
 
+	const StringMap& getAll() const;
+		/// Returns a const reference to all the values
+
 	void set(const std::string& param, const std::string& value);
 		/// Sets the value for a parameter. If the parameter does
 		/// not exist, then it is created.
@@ -195,7 +200,6 @@ public:
 
 protected:
 	void init();
-	typedef std::map<std::string, std::string> StringMap;
 
 private:
 	std::string _source;
@@ -273,7 +277,7 @@ inline int Message::getSourceLine() const
 }
 
 
-inline void swap(Message& m1, Message& m2)
+inline void swap(Message& m1, Message& m2) noexcept
 {
 	m1.swap(m2);
 }
diff --git a/Foundation/include/Poco/MetaObject.h b/Foundation/include/Poco/MetaObject.h
index a3e574da9..907c9d73d 100644
--- a/Foundation/include/Poco/MetaObject.h
+++ b/Foundation/include/Poco/MetaObject.h
@@ -58,7 +58,7 @@ public:
 	virtual B* create() const = 0;
 		/// Create a new instance of a class.
 		/// Cannot be used for singletons.
-		
+
 	virtual B& instance() const = 0;
 		/// Returns a reference to the only instance
 		/// of the class. Used for singletons only.
@@ -74,7 +74,7 @@ public:
 		/// and the object is deleted.
 	{
 		typename ObjectSet::iterator it = _deleteSet.find(pObject);
-		
+
 		if (it != _deleteSet.end())
 		{
 			_deleteSet.erase(pObject);
@@ -115,7 +115,7 @@ private:
 	AbstractMetaObject& operator = (const AbstractMetaObject&);
 
 	typedef std::set<B*> ObjectSet;
-	
+
 	const char* _name;
 	mutable ObjectSet _deleteSet;
 };
@@ -142,12 +142,12 @@ public:
 	{
 		return new C;
 	}
-	
+
 	B& instance() const
 	{
 		throw InvalidAccessException("Not a singleton. Use create() to create instances of", this->name());
 	}
-	
+
 	bool canCreate() const
 	{
 		return true;
@@ -155,26 +155,26 @@ public:
 };
 
 
-template <class C, class B> 
-class MetaSingleton: public AbstractMetaObject<B> 
+template <class C, class B>
+class MetaSingleton: public AbstractMetaObject<B>
 	/// A SingletonMetaObject disables the create() method
 	/// and instead offers an instance() method to access
-	/// the single instance of its class. 
-{ 
-public: 
-	MetaSingleton(const char* name): AbstractMetaObject<B>(name) 
+	/// the single instance of its class.
+{
+public:
+	MetaSingleton(const char* name): AbstractMetaObject<B>(name)
 	{
 	}
-	
-	~MetaSingleton() 
+
+	~MetaSingleton()
 	{
 	}
-	
+
 	B* create() const
 	{
 		throw InvalidAccessException("Cannot create instances of a singleton class. Use instance() to obtain a", this->name());
 	}
-	
+
 	bool canCreate() const
 	{
 		return false;
@@ -190,9 +190,9 @@ public:
 		return true;
 	}
 
-private: 
-	mutable SingletonHolder<C> _object; 
-}; 
+private:
+	mutable SingletonHolder<C> _object;
+};
 
 
 } // namespace Poco
diff --git a/Foundation/include/Poco/MetaProgramming.h b/Foundation/include/Poco/MetaProgramming.h
index ba68fe054..620d77dea 100644
--- a/Foundation/include/Poco/MetaProgramming.h
+++ b/Foundation/include/Poco/MetaProgramming.h
@@ -38,7 +38,7 @@ struct IsReference
 template <typename T>
 struct IsReference<T&>
 {
-	enum 
+	enum
 	{
 		VALUE = 1
 	};
@@ -48,7 +48,7 @@ struct IsReference<T&>
 template <typename T>
 struct IsReference<const T&>
 {
-	enum 
+	enum
 	{
 		VALUE = 1
 	};
@@ -69,7 +69,7 @@ struct IsConst
 template <typename T>
 struct IsConst<const T&>
 {
-	enum 
+	enum
 	{
 		VALUE = 1
 	};
@@ -79,7 +79,7 @@ struct IsConst<const T&>
 template <typename T>
 struct IsConst<const T>
 {
-	enum 
+	enum
 	{
 		VALUE = 1
 	};
diff --git a/Foundation/include/Poco/Mutex.h b/Foundation/include/Poco/Mutex.h
index c10946846..5070ab37a 100644
--- a/Foundation/include/Poco/Mutex.h
+++ b/Foundation/include/Poco/Mutex.h
@@ -51,10 +51,10 @@ namespace Poco {
 
 
 class Foundation_API Mutex: private MutexImpl
-	/// A Mutex (mutual exclusion) is a synchronization 
+	/// A Mutex (mutual exclusion) is a synchronization
 	/// mechanism used to control access to a shared resource
 	/// in a concurrent (multithreaded) scenario.
-	/// Mutexes are recursive, that is, the same mutex can be 
+	/// Mutexes are recursive, that is, the same mutex can be
 	/// locked multiple times by the same thread (but, of course,
 	/// not by other threads).
 	/// Using the ScopedLock class is the preferred way to automatically
@@ -62,23 +62,23 @@ class Foundation_API Mutex: private MutexImpl
 {
 public:
 	using ScopedLock = Poco::ScopedLock<Mutex>;
-	
+
 	Mutex();
 		/// creates the Mutex.
-		
+
 	~Mutex();
 		/// destroys the Mutex.
 
 	void lock();
 		/// Locks the mutex. Blocks if the mutex
 		/// is held by another thread.
-		
+
 	void lock(long milliseconds);
 		/// Locks the mutex. Blocks up to the given number of milliseconds
 		/// if the mutex is held by another thread. Throws a TimeoutException
 		/// if the mutex can not be locked within the given timeout.
 		///
-		/// Performance Note: On most platforms (including Windows), this member function is 
+		/// Performance Note: On most platforms (including Windows), this member function is
 		/// implemented using a loop calling (the equivalent of) tryLock() and Thread::sleep().
 		/// On POSIX platforms that support pthread_mutex_timedlock(), this is used.
 
@@ -92,14 +92,14 @@ public:
 		/// if the mutex is held by another thread.
 		/// Returns true if the mutex was successfully locked.
 		///
-		/// Performance Note: On most platforms (including Windows), this member function is 
+		/// Performance Note: On most platforms (including Windows), this member function is
 		/// implemented using a loop calling (the equivalent of) tryLock() and Thread::sleep().
 		/// On POSIX platforms that support pthread_mutex_timedlock(), this is used.
 
 	void unlock();
 		/// Unlocks the mutex so that it can be acquired by
 		/// other threads.
-	
+
 private:
 	Mutex(const Mutex&);
 	Mutex& operator = (const Mutex&);
@@ -120,7 +120,7 @@ public:
 
 	FastMutex();
 		/// creates the Mutex.
-		
+
 	~FastMutex();
 		/// destroys the Mutex.
 
@@ -133,7 +133,7 @@ public:
 		/// if the mutex is held by another thread. Throws a TimeoutException
 		/// if the mutex can not be locked within the given timeout.
 		///
-		/// Performance Note: On most platforms (including Windows), this member function is 
+		/// Performance Note: On most platforms (including Windows), this member function is
 		/// implemented using a loop calling (the equivalent of) tryLock() and Thread::sleep().
 		/// On POSIX platforms that support pthread_mutex_timedlock(), this is used.
 
@@ -147,14 +147,14 @@ public:
 		/// if the mutex is held by another thread.
 		/// Returns true if the mutex was successfully locked.
 		///
-		/// Performance Note: On most platforms (including Windows), this member function is 
+		/// Performance Note: On most platforms (including Windows), this member function is
 		/// implemented using a loop calling (the equivalent of) tryLock() and Thread::sleep().
 		/// On POSIX platforms that support pthread_mutex_timedlock(), this is used.
 
 	void unlock();
 		/// Unlocks the mutex so that it can be acquired by
 		/// other threads.
-	
+
 private:
 	FastMutex(const FastMutex&);
 	FastMutex& operator = (const FastMutex&);
@@ -222,12 +222,12 @@ class Foundation_API NullMutex
 {
 public:
 	using ScopedLock = Poco::ScopedLock<NullMutex>;
-	
+
 	NullMutex()
 		/// Creates the NullMutex.
 	{
 	}
-		
+
 	~NullMutex()
 		/// Destroys the NullMutex.
 	{
@@ -237,7 +237,7 @@ public:
 		/// Does nothing.
 	{
 	}
-		
+
 	void lock(long)
 		/// Does nothing.
 	{
diff --git a/Foundation/include/Poco/Mutex_POSIX.h b/Foundation/include/Poco/Mutex_POSIX.h
index 12f61dd68..6e6c42a52 100644
--- a/Foundation/include/Poco/Mutex_POSIX.h
+++ b/Foundation/include/Poco/Mutex_POSIX.h
@@ -37,7 +37,7 @@ protected:
 	bool tryLockImpl();
 	bool tryLockImpl(long milliseconds);
 	void unlockImpl();
-	
+
 private:
 	pthread_mutex_t _mutex;
 };
@@ -56,7 +56,7 @@ protected:
 //
 inline void MutexImpl::lockImpl()
 {
-	if (pthread_mutex_lock(&_mutex)) 
+	if (pthread_mutex_lock(&_mutex))
 		throw SystemException("cannot lock mutex");
 }
 
diff --git a/Foundation/include/Poco/Mutex_VX.h b/Foundation/include/Poco/Mutex_VX.h
index f0f43eac3..7d9f24df2 100644
--- a/Foundation/include/Poco/Mutex_VX.h
+++ b/Foundation/include/Poco/Mutex_VX.h
@@ -37,7 +37,7 @@ protected:
 	bool tryLockImpl();
 	bool tryLockImpl(long milliseconds);
 	void unlockImpl();
-	
+
 private:
 	SEM_ID _sem;
 };
diff --git a/Foundation/include/Poco/Mutex_WIN32.h b/Foundation/include/Poco/Mutex_WIN32.h
index 8e18c527e..b99981b20 100644
--- a/Foundation/include/Poco/Mutex_WIN32.h
+++ b/Foundation/include/Poco/Mutex_WIN32.h
@@ -35,7 +35,7 @@ protected:
 	bool tryLockImpl();
 	bool tryLockImpl(long milliseconds);
 	void unlockImpl();
-	
+
 private:
 	CRITICAL_SECTION _cs;
 };
diff --git a/Foundation/include/Poco/Mutex_WINCE.h b/Foundation/include/Poco/Mutex_WINCE.h
index 27200680f..27f93a72a 100644
--- a/Foundation/include/Poco/Mutex_WINCE.h
+++ b/Foundation/include/Poco/Mutex_WINCE.h
@@ -35,7 +35,7 @@ protected:
 	bool tryLockImpl();
 	bool tryLockImpl(long milliseconds);
 	void unlockImpl();
-	
+
 private:
 	HANDLE _mutex;
 };
diff --git a/Foundation/include/Poco/NObserver.h b/Foundation/include/Poco/NObserver.h
index 4231dc183..95b61fabd 100755
--- a/Foundation/include/Poco/NObserver.h
+++ b/Foundation/include/Poco/NObserver.h
@@ -30,7 +30,7 @@ template <class C, class N>
 class NObserver: public AbstractObserver
 	/// This template class implements an adapter that sits between
 	/// a NotificationCenter and an object receiving notifications
-	/// from it. It is quite similar in concept to the 
+	/// from it. It is quite similar in concept to the
 	/// RunnableAdapter, but provides some NotificationCenter
 	/// specific additional methods.
 	/// See the NotificationCenter class for information on how
@@ -38,7 +38,7 @@ class NObserver: public AbstractObserver
 	///
 	/// This class template is quite similar to the Observer class
 	/// template. The only difference is that the NObserver
-	/// expects the callback function to accept a const AutoPtr& 
+	/// expects the callback function to accept a const AutoPtr&
 	/// instead of a plain pointer as argument, thus simplifying memory
 	/// management.
 {
@@ -46,23 +46,23 @@ public:
 	typedef AutoPtr<N> NotificationPtr;
 	typedef void (C::*Callback)(const NotificationPtr&);
 
-	NObserver(C& object, Callback method): 
-		_pObject(&object), 
+	NObserver(C& object, Callback method):
+		_pObject(&object),
 		_method(method)
 	{
 	}
-	
+
 	NObserver(const NObserver& observer):
 		AbstractObserver(observer),
-		_pObject(observer._pObject), 
+		_pObject(observer._pObject),
 		_method(observer._method)
 	{
 	}
-	
+
 	~NObserver()
 	{
 	}
-	
+
 	NObserver& operator = (const NObserver& observer)
 	{
 		if (&observer != this)
@@ -72,7 +72,7 @@ public:
 		}
 		return *this;
 	}
-	
+
 	void notify(Notification* pNf) const
 	{
 		Poco::Mutex::ScopedLock lock(_mutex);
@@ -87,7 +87,7 @@ public:
 			}
 		}
 	}
-	
+
 	bool equals(const AbstractObserver& abstractObserver) const
 	{
 		const NObserver* pObs = dynamic_cast<const NObserver*>(&abstractObserver);
@@ -98,16 +98,16 @@ public:
 	{
 		return dynamic_cast<N*>(pNf) && (!pName || pNf->name() == pName);
 	}
-	
+
 	AbstractObserver* clone() const
 	{
 		return new NObserver(*this);
 	}
-	
+
 	void disable()
 	{
 		Poco::Mutex::ScopedLock lock(_mutex);
-		
+
 		_pObject = 0;
 	}
 
diff --git a/Foundation/include/Poco/NamedEvent.h b/Foundation/include/Poco/NamedEvent.h
index 5ef42bb1e..93c4b27f7 100644
--- a/Foundation/include/Poco/NamedEvent.h
+++ b/Foundation/include/Poco/NamedEvent.h
@@ -21,7 +21,7 @@
 #include "Poco/Foundation.h"
 
 
-#if defined(POCO_OS_FAMILY_WINDOWS) 
+#if defined(POCO_OS_FAMILY_WINDOWS)
 #include "Poco/NamedEvent_WIN32U.h"
 #elif POCO_OS == POCO_OS_ANDROID
 #include "Poco/NamedEvent_Android.h"
diff --git a/Foundation/include/Poco/NamedEvent_Android.h b/Foundation/include/Poco/NamedEvent_Android.h
index 910c8a46e..27c9bca82 100644
--- a/Foundation/include/Poco/NamedEvent_Android.h
+++ b/Foundation/include/Poco/NamedEvent_Android.h
@@ -27,7 +27,7 @@ namespace Poco {
 class Foundation_API NamedEventImpl
 {
 protected:
-	NamedEventImpl(const std::string& name);	
+	NamedEventImpl(const std::string& name);
 	~NamedEventImpl();
 	void setImpl();
 	void waitImpl();
diff --git a/Foundation/include/Poco/NamedEvent_UNIX.h b/Foundation/include/Poco/NamedEvent_UNIX.h
index e593790d6..22cb31dc9 100644
--- a/Foundation/include/Poco/NamedEvent_UNIX.h
+++ b/Foundation/include/Poco/NamedEvent_UNIX.h
@@ -30,11 +30,11 @@ namespace Poco {
 class Foundation_API NamedEventImpl
 {
 protected:
-	NamedEventImpl(const std::string& name);	
+	NamedEventImpl(const std::string& name);
 	~NamedEventImpl();
 	void setImpl();
 	void waitImpl();
-	
+
 private:
 	std::string getFileName();
 
diff --git a/Foundation/include/Poco/NamedEvent_WIN32U.h b/Foundation/include/Poco/NamedEvent_WIN32U.h
index b2936c416..35f5d45fe 100644
--- a/Foundation/include/Poco/NamedEvent_WIN32U.h
+++ b/Foundation/include/Poco/NamedEvent_WIN32U.h
@@ -28,15 +28,15 @@ namespace Poco {
 class Foundation_API NamedEventImpl
 {
 protected:
-	NamedEventImpl(const std::string& name);	
+	NamedEventImpl(const std::string& name);
 	~NamedEventImpl();
 	void setImpl();
 	void waitImpl();
-	
+
 private:
 	std::string  _name;
 	std::wstring _uname;
-	HANDLE      _event;	
+	HANDLE      _event;
 };
 
 
diff --git a/Foundation/include/Poco/NamedMutex.h b/Foundation/include/Poco/NamedMutex.h
index 686ff5f06..197fe38fb 100644
--- a/Foundation/include/Poco/NamedMutex.h
+++ b/Foundation/include/Poco/NamedMutex.h
@@ -22,7 +22,7 @@
 #include "Poco/ScopedLock.h"
 
 
-#if defined(POCO_OS_FAMILY_WINDOWS) 
+#if defined(POCO_OS_FAMILY_WINDOWS)
 #include "Poco/NamedMutex_WIN32U.h"
 #elif POCO_OS == POCO_OS_ANDROID
 #include "Poco/NamedMutex_Android.h"
diff --git a/Foundation/include/Poco/NamedMutex_UNIX.h b/Foundation/include/Poco/NamedMutex_UNIX.h
index da77a32ee..151aa1ead 100644
--- a/Foundation/include/Poco/NamedMutex_UNIX.h
+++ b/Foundation/include/Poco/NamedMutex_UNIX.h
@@ -37,7 +37,7 @@ protected:
 	void lockImpl();
 	bool tryLockImpl();
 	void unlockImpl();
-	
+
 private:
 	std::string getFileName();
 
diff --git a/Foundation/include/Poco/NamedMutex_WIN32U.h b/Foundation/include/Poco/NamedMutex_WIN32U.h
index 8ee315865..04305436f 100644
--- a/Foundation/include/Poco/NamedMutex_WIN32U.h
+++ b/Foundation/include/Poco/NamedMutex_WIN32U.h
@@ -33,7 +33,7 @@ protected:
 	void lockImpl();
 	bool tryLockImpl();
 	void unlockImpl();
-	
+
 private:
 	std::string  _name;
 	std::wstring _uname;
diff --git a/Foundation/include/Poco/NamedTuple.h b/Foundation/include/Poco/NamedTuple.h
index 6b0262b00..fa0b41efa 100644
--- a/Foundation/include/Poco/NamedTuple.h
+++ b/Foundation/include/Poco/NamedTuple.h
@@ -36,7 +36,7 @@ template<class T0,
 	class T4 = NullTypeList,
 	class T5 = NullTypeList,
 	class T6 = NullTypeList,
-	class T7 = NullTypeList, 
+	class T7 = NullTypeList,
 	class T8 = NullTypeList,
 	class T9 = NullTypeList,
 	class T10 = NullTypeList,
@@ -49,14 +49,14 @@ template<class T0,
 	class T17 = NullTypeList,
 	class T18 = NullTypeList,
 	class T19 = NullTypeList,
-	class T20 = NullTypeList, 
+	class T20 = NullTypeList,
 	class T21 = NullTypeList,
 	class T22 = NullTypeList,
 	class T23 = NullTypeList,
 	class T24 = NullTypeList,
 	class T25 = NullTypeList,
 	class T26 = NullTypeList,
-	class T27 = NullTypeList, 
+	class T27 = NullTypeList,
 	class T28 = NullTypeList,
 	class T29 = NullTypeList,
 	class T30 = NullTypeList,
@@ -73,8 +73,8 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38,T39> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38,T39>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -84,124 +84,124 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35), 
-		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36), 
-		typename TypeWrapper<T37>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37), 
-		typename TypeWrapper<T38>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38), 
-		typename TypeWrapper<T39>::CONSTTYPE& t39 = POCO_TYPEWRAPPER_DEFAULTVALUE(T39)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38,t39), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35),
+		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36),
+		typename TypeWrapper<T37>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37),
+		typename TypeWrapper<T38>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38),
+		typename TypeWrapper<T39>::CONSTTYPE& t39 = POCO_TYPEWRAPPER_DEFAULTVALUE(T39)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38,t39),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35), 
-		typename TypeWrapper<T16>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36), 
-		typename TypeWrapper<T17>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37), 
-		typename TypeWrapper<T18>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38), 
-		typename TypeWrapper<T19>::CONSTTYPE& t39 = POCO_TYPEWRAPPER_DEFAULTVALUE(T39)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35),
+		typename TypeWrapper<T16>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36),
+		typename TypeWrapper<T17>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37),
+		typename TypeWrapper<T18>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38),
+		typename TypeWrapper<T19>::CONSTTYPE& t39 = POCO_TYPEWRAPPER_DEFAULTVALUE(T39)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38,t39)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -225,23 +225,23 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
@@ -263,16 +263,16 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 		const std::string& n38 = "M1",
 		typename TypeWrapper<T38>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38),
 		const std::string& n39 = "N1",
-		typename TypeWrapper<T39>::CONSTTYPE& t39 = POCO_TYPEWRAPPER_DEFAULTVALUE(T39)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38,t39), 
-		_pNames(0) 
+		typename TypeWrapper<T39>::CONSTTYPE& t39 = POCO_TYPEWRAPPER_DEFAULTVALUE(T39)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38,t39),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n33,n34,n35,n36,n37,n38,n39);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -284,11 +284,11 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -304,11 +304,11 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
@@ -324,7 +324,7 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -335,7 +335,7 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -354,7 +354,7 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -378,7 +378,7 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -386,9 +386,9 @@ struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T1
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -399,7 +399,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -419,7 +419,7 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
@@ -434,7 +434,7 @@ private:
 		const std::string& n37 = "L1",
 		const std::string& n38 = "M1",
 		const std::string& n39 = "N1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -492,7 +492,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -505,14 +505,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29,
 	class T30,
@@ -529,8 +529,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37,T38>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -540,122 +540,122 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35), 
-		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36), 
-		typename TypeWrapper<T37>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37), 
-		typename TypeWrapper<T38>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35),
+		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36),
+		typename TypeWrapper<T37>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37),
+		typename TypeWrapper<T38>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35), 
-		typename TypeWrapper<T16>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36), 
-		typename TypeWrapper<T17>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37), 
-		typename TypeWrapper<T18>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35),
+		typename TypeWrapper<T16>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36),
+		typename TypeWrapper<T17>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37),
+		typename TypeWrapper<T18>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -679,23 +679,23 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
@@ -715,16 +715,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n37 = "L1",
 		typename TypeWrapper<T37>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37),
 		const std::string& n38 = "M1",
-		typename TypeWrapper<T38>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38), 
-		_pNames(0) 
+		typename TypeWrapper<T38>::CONSTTYPE& t38 = POCO_TYPEWRAPPER_DEFAULTVALUE(T38)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n33,n34,n35,n36,n37,n38);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -736,11 +736,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -756,11 +756,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
@@ -775,7 +775,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -786,7 +786,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -805,7 +805,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -829,7 +829,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -837,9 +837,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -850,7 +850,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -870,7 +870,7 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
@@ -884,7 +884,7 @@ private:
 		const std::string& n36 = "K1",
 		const std::string& n37 = "L1",
 		const std::string& n38 = "M1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -941,7 +941,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -954,14 +954,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29,
 	class T30,
@@ -977,8 +977,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36,T37>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -988,120 +988,120 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35), 
-		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36), 
-		typename TypeWrapper<T37>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35),
+		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36),
+		typename TypeWrapper<T37>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35), 
-		typename TypeWrapper<T16>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36), 
-		typename TypeWrapper<T17>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35),
+		typename TypeWrapper<T16>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36),
+		typename TypeWrapper<T17>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -1125,23 +1125,23 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
@@ -1159,16 +1159,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n36 = "K1",
 		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36),
 		const std::string& n37 = "L1",
-		typename TypeWrapper<T37>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37), 
-		_pNames(0) 
+		typename TypeWrapper<T37>::CONSTTYPE& t37 = POCO_TYPEWRAPPER_DEFAULTVALUE(T37)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n33,n34,n35,n36,n37);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -1180,11 +1180,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -1200,11 +1200,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
@@ -1218,7 +1218,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -1229,7 +1229,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -1248,7 +1248,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -1272,7 +1272,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -1280,9 +1280,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -1293,7 +1293,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -1313,7 +1313,7 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
@@ -1326,7 +1326,7 @@ private:
 		const std::string& n35 = "J1",
 		const std::string& n36 = "K1",
 		const std::string& n37 = "L1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -1382,7 +1382,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -1395,14 +1395,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29,
 	class T30,
@@ -1417,8 +1417,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35,T36>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -1428,118 +1428,118 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35), 
-		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35),
+		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35), 
-		typename TypeWrapper<T16>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35),
+		typename TypeWrapper<T16>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -1563,23 +1563,23 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
@@ -1595,16 +1595,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n35 = "J1",
 		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35),
 		const std::string& n36 = "K1",
-		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36), 
-		_pNames(0) 
+		typename TypeWrapper<T36>::CONSTTYPE& t36 = POCO_TYPEWRAPPER_DEFAULTVALUE(T36)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n33,n34,n35,n36);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -1616,11 +1616,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -1636,11 +1636,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
@@ -1653,7 +1653,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -1664,7 +1664,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -1683,7 +1683,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -1707,7 +1707,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -1715,9 +1715,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -1728,7 +1728,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -1748,7 +1748,7 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
@@ -1760,7 +1760,7 @@ private:
 		const std::string& n34 = "I1",
 		const std::string& n35 = "J1",
 		const std::string& n36 = "K1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -1815,7 +1815,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -1828,14 +1828,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29,
 	class T30,
@@ -1849,8 +1849,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34,T35>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -1860,116 +1860,116 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34), 
-		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
+		typename TypeWrapper<T15>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -1993,23 +1993,23 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
@@ -2023,16 +2023,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n34 = "I1",
 		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34),
 		const std::string& n35 = "J1",
-		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35), 
-		_pNames(0) 
+		typename TypeWrapper<T35>::CONSTTYPE& t35 = POCO_TYPEWRAPPER_DEFAULTVALUE(T35)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n33,n34,n35);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -2044,11 +2044,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -2064,11 +2064,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
@@ -2080,7 +2080,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -2091,7 +2091,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -2110,7 +2110,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -2134,7 +2134,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -2142,9 +2142,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -2155,7 +2155,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -2175,7 +2175,7 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
@@ -2186,7 +2186,7 @@ private:
 		const std::string& n33 = "H1",
 		const std::string& n34 = "I1",
 		const std::string& n35 = "J1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -2240,7 +2240,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -2253,14 +2253,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29,
 	class T30,
@@ -2273,8 +2273,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33,T34>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -2284,114 +2284,114 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33), 
-		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
+		typename TypeWrapper<T14>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -2415,23 +2415,23 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
@@ -2443,16 +2443,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n33 = "H1",
 		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33),
 		const std::string& n34 = "I1",
-		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34), 
-		_pNames(0) 
+		typename TypeWrapper<T34>::CONSTTYPE& t34 = POCO_TYPEWRAPPER_DEFAULTVALUE(T34)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n33,n34);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -2464,11 +2464,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -2484,11 +2484,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
@@ -2499,7 +2499,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -2510,7 +2510,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -2529,7 +2529,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -2553,7 +2553,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -2561,9 +2561,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -2574,7 +2574,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -2594,7 +2594,7 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
@@ -2604,7 +2604,7 @@ private:
 		const std::string& n32 = "G1",
 		const std::string& n33 = "H1",
 		const std::string& n34 = "I1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -2657,7 +2657,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -2670,14 +2670,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29,
 	class T30,
@@ -2689,8 +2689,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32,T33>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -2700,112 +2700,112 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32), 
-		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
+		typename TypeWrapper<T13>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -2829,23 +2829,23 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
@@ -2855,16 +2855,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n32 = "G1",
 		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32),
 		const std::string& n33 = "H1",
-		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33), 
-		_pNames(0) 
+		typename TypeWrapper<T33>::CONSTTYPE& t33 = POCO_TYPEWRAPPER_DEFAULTVALUE(T33)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n33);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -2876,11 +2876,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -2896,11 +2896,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
@@ -2910,7 +2910,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -2921,7 +2921,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -2940,7 +2940,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -2964,7 +2964,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -2972,9 +2972,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -2985,7 +2985,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -3005,7 +3005,7 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
@@ -3014,7 +3014,7 @@ private:
 		const std::string& n31 = "F1",
 		const std::string& n32 = "G1",
 		const std::string& n33 = "H1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -3066,7 +3066,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -3079,14 +3079,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29,
 	class T30,
@@ -3097,8 +3097,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31,T32>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -3108,110 +3108,110 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31), 
-		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
+		typename TypeWrapper<T12>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -3235,23 +3235,23 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
@@ -3259,16 +3259,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n31 = "F1",
 		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31),
 		const std::string& n32 = "G1",
-		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32), 
-		_pNames(0) 
+		typename TypeWrapper<T32>::CONSTTYPE& t32 = POCO_TYPEWRAPPER_DEFAULTVALUE(T32)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -3280,11 +3280,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -3300,11 +3300,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
@@ -3313,7 +3313,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -3324,7 +3324,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -3343,7 +3343,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -3367,7 +3367,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -3375,9 +3375,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -3388,7 +3388,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -3408,7 +3408,7 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
@@ -3416,7 +3416,7 @@ private:
 		const std::string& n30 = "E1",
 		const std::string& n31 = "F1",
 		const std::string& n32 = "G1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -3467,7 +3467,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -3480,14 +3480,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29,
 	class T30,
@@ -3497,8 +3497,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30,T31>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -3508,108 +3508,108 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30), 
-		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
+		typename TypeWrapper<T11>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -3633,38 +3633,38 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
 		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30),
 		const std::string& n31 = "F1",
-		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31), 
-		_pNames(0) 
+		typename TypeWrapper<T31>::CONSTTYPE& t31 = POCO_TYPEWRAPPER_DEFAULTVALUE(T31)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -3676,11 +3676,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -3696,11 +3696,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
@@ -3708,7 +3708,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -3719,7 +3719,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -3738,7 +3738,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -3762,7 +3762,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -3770,9 +3770,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -3783,7 +3783,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -3803,14 +3803,14 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
 		const std::string& n29 = "D1",
 		const std::string& n30 = "E1",
 		const std::string& n31 = "F1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -3860,7 +3860,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -3873,14 +3873,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29,
 	class T30>
@@ -3889,8 +3889,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,T30>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -3900,106 +3900,106 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29), 
-		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
+		typename TypeWrapper<T10>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -4023,36 +4023,36 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
 		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29),
 		const std::string& n30 = "E1",
-		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30), 
-		_pNames(0) 
+		typename TypeWrapper<T30>::CONSTTYPE& t30 = POCO_TYPEWRAPPER_DEFAULTVALUE(T30)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -4064,11 +4064,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -4084,18 +4084,18 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					case 30: return TupleType::template get<30>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -4106,7 +4106,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -4125,7 +4125,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -4149,7 +4149,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -4157,9 +4157,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -4170,7 +4170,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -4190,13 +4190,13 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
 		const std::string& n29 = "D1",
 		const std::string& n30 = "E1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -4245,7 +4245,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -4258,14 +4258,14 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28,
 	class T29>
 struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29,NullTypeList>:
@@ -4273,8 +4273,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,T29>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -4284,104 +4284,104 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
-		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
+		typename TypeWrapper<T9>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -4405,34 +4405,34 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28),
 		const std::string& n29 = "D1",
-		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29), 
-		_pNames(0) 
+		typename TypeWrapper<T29>::CONSTTYPE& t29 = POCO_TYPEWRAPPER_DEFAULTVALUE(T29)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -4444,11 +4444,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -4464,17 +4464,17 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					case 29: return TupleType::template get<29>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -4485,7 +4485,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -4504,7 +4504,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -4528,7 +4528,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -4536,9 +4536,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -4549,7 +4549,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -4569,12 +4569,12 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1",
 		const std::string& n29 = "D1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -4622,7 +4622,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -4635,22 +4635,22 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
 	class T24,
 	class T25,
 	class T26,
-	class T27, 
+	class T27,
 	class T28>
 struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28,NullTypeList>:
 	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28>
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27,T28>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -4660,102 +4660,102 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28), 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
-		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -4779,32 +4779,32 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
 		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27),
 		const std::string& n28 = "C1",
-		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28), 
-		_pNames(0) 
+		typename TypeWrapper<T28>::CONSTTYPE& t28 = POCO_TYPEWRAPPER_DEFAULTVALUE(T28)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -4816,11 +4816,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -4836,16 +4836,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					case 28: return TupleType::template get<28>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -4856,7 +4856,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -4875,7 +4875,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -4899,7 +4899,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -4907,9 +4907,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -4920,7 +4920,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -4940,11 +4940,11 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1",
 		const std::string& n28 = "C1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -4991,7 +4991,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -5004,7 +5004,7 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
@@ -5017,8 +5017,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26,T27>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -5028,100 +5028,100 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
-		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27), 
+		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
-		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27)): 
+		typename TypeWrapper<T7>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -5145,30 +5145,30 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26), 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26),
 		const std::string& n27 = "B1",
-		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27), 
-		_pNames(0) 
+		typename TypeWrapper<T27>::CONSTTYPE& t27 = POCO_TYPEWRAPPER_DEFAULTVALUE(T27)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26,n27);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -5180,11 +5180,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -5200,15 +5200,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
-					case 27: return TupleType::template get<27>(); 
+					case 27: return TupleType::template get<27>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -5219,7 +5219,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -5238,7 +5238,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -5262,7 +5262,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -5270,9 +5270,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -5283,7 +5283,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -5303,10 +5303,10 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1",
 		const std::string& n27 = "B1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -5352,7 +5352,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -5365,7 +5365,7 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
@@ -5377,8 +5377,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25,T26>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -5388,98 +5388,98 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25), 
-		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26)): 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
+		typename TypeWrapper<T6>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -5503,28 +5503,28 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
 		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25),
 		const std::string& n26 = "A1",
-		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26), 
-		_pNames(0) 
+		typename TypeWrapper<T26>::CONSTTYPE& t26 = POCO_TYPEWRAPPER_DEFAULTVALUE(T26)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25,n26);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -5536,11 +5536,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -5556,14 +5556,14 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					case 26: return TupleType::template get<26>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -5574,7 +5574,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -5593,7 +5593,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -5617,7 +5617,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -5625,9 +5625,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -5638,7 +5638,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -5658,9 +5658,9 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
-		const std::string& n25 = "Z", 
+		const std::string& n25 = "Z",
 		const std::string& n26 = "A1")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -5705,7 +5705,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -5718,7 +5718,7 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
@@ -5729,8 +5729,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -5740,96 +5740,96 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25), 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
-		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25)): 
+		typename TypeWrapper<T5>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -5853,26 +5853,26 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24),
 		const std::string& n25 = "Z",
-		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25), 
-		_pNames(0) 
+		typename TypeWrapper<T25>::CONSTTYPE& t25 = POCO_TYPEWRAPPER_DEFAULTVALUE(T25)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24,n25);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -5884,11 +5884,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -5904,13 +5904,13 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					case 25: return TupleType::template get<25>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -5921,7 +5921,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -5940,7 +5940,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -5964,7 +5964,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -5972,9 +5972,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -5985,7 +5985,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -6006,7 +6006,7 @@ private:
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y",
 		const std::string& n25 = "Z")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -6050,7 +6050,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -6063,7 +6063,7 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23,
@@ -6073,8 +6073,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -6084,94 +6084,94 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24), 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
-		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24)): 
+		typename TypeWrapper<T4>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -6195,24 +6195,24 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
 		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23),
 		const std::string& n24 = "Y",
-		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24), 
-		_pNames(0) 
+		typename TypeWrapper<T24>::CONSTTYPE& t24 = POCO_TYPEWRAPPER_DEFAULTVALUE(T24)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23,n24);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -6224,11 +6224,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -6244,12 +6244,12 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					case 24: return TupleType::template get<24>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -6260,7 +6260,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -6279,7 +6279,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -6303,7 +6303,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -6311,9 +6311,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -6324,7 +6324,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -6344,7 +6344,7 @@ private:
 		const std::string& n22 = "W",
 		const std::string& n23 = "X",
 		const std::string& n24 = "Y")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -6387,7 +6387,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -6400,7 +6400,7 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22,
 	class T23>
@@ -6409,8 +6409,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -6420,92 +6420,92 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
-		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23)): 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
+		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
-		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23)): 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
+		typename TypeWrapper<T3>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -6529,22 +6529,22 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22), 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22),
 		const std::string& n23 = "X",
-		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23), 
-		_pNames(0) 
+		typename TypeWrapper<T23>::CONSTTYPE& t23 = POCO_TYPEWRAPPER_DEFAULTVALUE(T23)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22,n23);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -6556,11 +6556,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -6576,11 +6576,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 20: return TupleType::template get<20>();
 					case 21: return TupleType::template get<21>();
 					case 22: return TupleType::template get<22>();
-					case 23: return TupleType::template get<23>(); 
+					case 23: return TupleType::template get<23>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -6591,7 +6591,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -6610,7 +6610,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -6634,7 +6634,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -6642,9 +6642,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -6655,7 +6655,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -6674,7 +6674,7 @@ private:
 		const std::string& n21 = "V",
 		const std::string& n22 = "W",
 		const std::string& n23 = "X")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -6716,7 +6716,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -6729,7 +6729,7 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21,
 	class T22>
 struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,NullTypeList>:
@@ -6737,8 +6737,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -6748,90 +6748,90 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21), 
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
-		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22)): 
+		typename TypeWrapper<T2>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -6855,20 +6855,20 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
 		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21),
 		const std::string& n22 = "W",
-		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22), 
-		_pNames(0) 
+		typename TypeWrapper<T22>::CONSTTYPE& t22 = POCO_TYPEWRAPPER_DEFAULTVALUE(T22)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21,n22);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -6880,11 +6880,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -6903,7 +6903,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -6914,7 +6914,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -6933,7 +6933,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -6957,7 +6957,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -6965,9 +6965,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -6978,7 +6978,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -6996,7 +6996,7 @@ private:
 		const std::string& n20 = "U",
 		const std::string& n21 = "V",
 		const std::string& n22 = "W")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -7037,7 +7037,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -7050,15 +7050,15 @@ template<class T0,
 	class T17,
 	class T18,
 	class T19,
-	class T20, 
+	class T20,
 	class T21>
 struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,NullTypeList>:
 	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21>
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -7068,88 +7068,88 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21), 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
-		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21)): 
+		typename TypeWrapper<T1>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -7173,18 +7173,18 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20),
 		const std::string& n21 = "V",
-		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21), 
-		_pNames(0) 
+		typename TypeWrapper<T21>::CONSTTYPE& t21 = POCO_TYPEWRAPPER_DEFAULTVALUE(T21)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20,n21);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -7196,11 +7196,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -7218,7 +7218,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -7229,7 +7229,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -7248,7 +7248,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -7272,7 +7272,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -7280,9 +7280,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -7293,7 +7293,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -7310,7 +7310,7 @@ private:
 		const std::string& n19 = "T",
 		const std::string& n20 = "U",
 		const std::string& n21 = "V")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -7350,7 +7350,7 @@ template<class T0,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -7369,8 +7369,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -7380,86 +7380,86 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20), 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19), 
-		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
+		typename TypeWrapper<T0>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -7483,16 +7483,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n19 = "T",
 		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19),
 		const std::string& n20 = "U",
-		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20), 
-		_pNames(0) 
+		typename TypeWrapper<T20>::CONSTTYPE& t20 = POCO_TYPEWRAPPER_DEFAULTVALUE(T20)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19,n20);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -7504,11 +7504,11 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -7525,7 +7525,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -7536,7 +7536,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -7555,7 +7555,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -7579,7 +7579,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -7587,9 +7587,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -7600,7 +7600,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -7616,7 +7616,7 @@ private:
 		const std::string& n18 = "S",
 		const std::string& n19 = "T",
 		const std::string& n20 = "U")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -7648,14 +7648,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -7673,8 +7673,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -7684,84 +7684,84 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -7783,16 +7783,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n18 = "S",
 		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
 		const std::string& n19 = "T",
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19), 
-		_pNames(0) 
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -7800,15 +7800,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -7824,7 +7824,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -7835,7 +7835,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -7854,7 +7854,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -7878,7 +7878,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -7886,9 +7886,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -7899,7 +7899,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -7914,30 +7914,30 @@ private:
 		const std::string& n17 = "R",
 		const std::string& n18 = "S",
 		const std::string& n19 = "T")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
-			_pNames->push_back(n16); 
-			_pNames->push_back(n17); 
-			_pNames->push_back(n18); 
-			_pNames->push_back(n19); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
+			_pNames->push_back(n11);
+			_pNames->push_back(n12);
+			_pNames->push_back(n13);
+			_pNames->push_back(n14);
+			_pNames->push_back(n15);
+			_pNames->push_back(n16);
+			_pNames->push_back(n17);
+			_pNames->push_back(n18);
+			_pNames->push_back(n19);
 		}
 	}
 
@@ -7945,14 +7945,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -7969,93 +7969,93 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -8075,16 +8075,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n17 = "R",
 		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
 		const std::string& n18 = "S",
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18), 
-		_pNames(0) 
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -8092,15 +8092,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -8115,7 +8115,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -8126,7 +8126,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -8145,7 +8145,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -8169,7 +8169,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -8177,9 +8177,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -8190,7 +8190,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -8204,29 +8204,29 @@ private:
 		const std::string& n16 = "Q",
 		const std::string& n17 = "R",
 		const std::string& n18 = "S")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
-			_pNames->push_back(n16); 
-			_pNames->push_back(n17); 
-			_pNames->push_back(n18); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
+			_pNames->push_back(n11);
+			_pNames->push_back(n12);
+			_pNames->push_back(n13);
+			_pNames->push_back(n14);
+			_pNames->push_back(n15);
+			_pNames->push_back(n16);
+			_pNames->push_back(n17);
+			_pNames->push_back(n18);
 		}
 	}
 
@@ -8234,14 +8234,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -8257,8 +8257,8 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
@@ -8268,80 +8268,80 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -8359,16 +8359,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		const std::string& n16 = "Q",
 		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
 		const std::string& n17 = "R",
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17), 
-		_pNames(0) 
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -8376,15 +8376,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -8398,7 +8398,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -8409,7 +8409,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -8428,7 +8428,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -8452,7 +8452,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -8460,9 +8460,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -8473,7 +8473,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -8486,28 +8486,28 @@ private:
 		const std::string& n15 = "P",
 		const std::string& n16 = "Q",
 		const std::string& n17 = "R")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
-			_pNames->push_back(n16); 
-			_pNames->push_back(n17); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
+			_pNames->push_back(n11);
+			_pNames->push_back(n12);
+			_pNames->push_back(n13);
+			_pNames->push_back(n14);
+			_pNames->push_back(n15);
+			_pNames->push_back(n16);
+			_pNames->push_back(n17);
 		}
 	}
 
@@ -8515,14 +8515,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -8537,89 +8537,89 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Null
 {
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::Type Type;
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -8635,16 +8635,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Null
 		const std::string& n15 = "P",
 		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
 		const std::string& n16 = "Q",
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16), 
-		_pNames(0) 
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -8652,15 +8652,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Null
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -8673,7 +8673,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Null
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -8684,7 +8684,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Null
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -8703,7 +8703,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Null
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -8727,7 +8727,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Null
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -8735,9 +8735,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Null
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -8748,7 +8748,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -8760,27 +8760,27 @@ private:
 		const std::string& n14 = "O",
 		const std::string& n15 = "P",
 		const std::string& n16 = "Q")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
-			_pNames->push_back(n16); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
+			_pNames->push_back(n11);
+			_pNames->push_back(n12);
+			_pNames->push_back(n13);
+			_pNames->push_back(n14);
+			_pNames->push_back(n15);
+			_pNames->push_back(n16);
 		}
 	}
 
@@ -8788,14 +8788,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -8810,87 +8810,87 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullType
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -8904,16 +8904,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullType
 		const std::string& n14 = "O",
 		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
 		const std::string& n15 = "P",
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15), 
-		_pNames(0) 
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -8921,15 +8921,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullType
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -8941,7 +8941,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullType
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -8952,7 +8952,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullType
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -8971,7 +8971,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullType
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -8995,7 +8995,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullType
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -9003,9 +9003,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullType
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -9016,7 +9016,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -9027,26 +9027,26 @@ private:
 		const std::string& n13 = "N",
 		const std::string& n14 = "O",
 		const std::string& n15 = "P")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
+			_pNames->push_back(n11);
+			_pNames->push_back(n12);
+			_pNames->push_back(n13);
+			_pNames->push_back(n14);
+			_pNames->push_back(n15);
 		}
 	}
 
@@ -9054,14 +9054,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -9075,85 +9075,85 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -9165,16 +9165,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList
 		const std::string& n13 = "N",
 		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
 		const std::string& n14 = "O",
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14), 
-		_pNames(0) 
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -9182,15 +9182,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -9201,7 +9201,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -9212,7 +9212,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -9231,7 +9231,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -9255,7 +9255,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -9263,9 +9263,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -9276,7 +9276,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -9286,25 +9286,25 @@ private:
 		const std::string& n12 = "M",
 		const std::string& n13 = "N",
 		const std::string& n14 = "O")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
+			_pNames->push_back(n11);
+			_pNames->push_back(n12);
+			_pNames->push_back(n13);
+			_pNames->push_back(n14);
 		}
 	}
 
@@ -9312,14 +9312,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -9332,83 +9332,83 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -9418,16 +9418,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
 		const std::string& n12 = "M",
 		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
 		const std::string& n13 = "N",
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13), 
-		_pNames(0) 
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -9435,15 +9435,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -9453,7 +9453,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -9464,7 +9464,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -9483,7 +9483,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -9507,7 +9507,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -9515,9 +9515,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -9528,7 +9528,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -9537,24 +9537,24 @@ private:
 		const std::string& n11 = "L",
 		const std::string& n12 = "M",
 		const std::string& n13 = "N")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
+			_pNames->push_back(n11);
+			_pNames->push_back(n12);
+			_pNames->push_back(n13);
 		}
 	}
 
@@ -9562,14 +9562,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -9581,81 +9581,81 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
@@ -9663,15 +9663,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
 		const std::string& n11 = "L",
 		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
 		const std::string& n12 = "M",
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): 
-	TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), _pNames(0) 
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)):
+	TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), _pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -9679,15 +9679,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -9696,7 +9696,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -9707,7 +9707,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -9726,7 +9726,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -9750,7 +9750,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -9758,9 +9758,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -9771,7 +9771,7 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
@@ -9779,23 +9779,23 @@ private:
 		const std::string& n10 = "K",
 		const std::string& n11 = "L",
 		const std::string& n12 = "M")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
+			_pNames->push_back(n11);
+			_pNames->push_back(n12);
 		}
 	}
 
@@ -9803,14 +9803,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10,
@@ -9821,94 +9821,94 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
 		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
 		const std::string& n11 = "L",
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11), 
-		_pNames(0) 
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -9916,15 +9916,15 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
@@ -9932,7 +9932,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>:
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -9943,7 +9943,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -9962,7 +9962,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -9986,7 +9986,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -9994,9 +9994,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -10007,29 +10007,29 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
 		const std::string& n9 = "J",
 		const std::string& n10 = "K",
 		const std::string& n11 = "L")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
+			_pNames->push_back(n11);
 		}
 	}
 
@@ -10037,14 +10037,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9,
 	class T10>
@@ -10054,89 +10054,89 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
 		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
 		const std::string& n10 = "K",
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): 
-	TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), _pNames(0) 
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)):
+	TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), _pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -10144,22 +10144,22 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					case 10: return TupleType::template get<10>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -10170,7 +10170,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -10189,7 +10189,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -10213,7 +10213,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -10221,9 +10221,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -10234,27 +10234,27 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
 		const std::string& n9 = "J",
 		const std::string& n10 = "K")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
-			_pNames->push_back(n10); 
+			_pNames->push_back(n9);
+			_pNames->push_back(n10);
 		}
 	}
 
@@ -10262,14 +10262,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8,
 	class T9>
 struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,NullTypeList>:
@@ -10278,86 +10278,86 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
 		const std::string& n9 = "J",
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9), 
-		_pNames(0) 
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -10365,21 +10365,21 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					case 9: return TupleType::template get<9>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -10390,7 +10390,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -10409,7 +10409,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -10433,7 +10433,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -10441,9 +10441,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -10454,25 +10454,25 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I",
 		const std::string& n9 = "J")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
 			_pNames->push_back(n7);
 			_pNames->push_back(n8);
-			_pNames->push_back(n9); 
+			_pNames->push_back(n9);
 		}
 	}
 
@@ -10480,14 +10480,14 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
 	class T4,
 	class T5,
 	class T6,
-	class T7, 
+	class T7,
 	class T8>
 struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,NullTypeList>:
 	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8>
@@ -10495,82 +10495,82 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8), 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
 		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
 		const std::string& n8 = "I",
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8), 
-		_pNames(0) 
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7,n8);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -10578,20 +10578,20 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					case 8: return TupleType::template get<8>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -10602,7 +10602,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -10621,7 +10621,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -10645,7 +10645,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -10653,9 +10653,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -10666,18 +10666,18 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H",
 		const std::string& n8 = "I")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
@@ -10690,7 +10690,7 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
@@ -10704,78 +10704,78 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7), 
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): 
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)):
 		TupleType(t0,t1,t2,t3,t4,t5,t6,t7)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
 		const std::string& n7 = "H",
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7), 
-		_pNames(0) 
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)):
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6,n7);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -10783,19 +10783,19 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
-					case 7: return TupleType::template get<7>(); 
+					case 7: return TupleType::template get<7>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -10806,7 +10806,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -10825,7 +10825,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -10849,7 +10849,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -10857,9 +10857,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -10870,17 +10870,17 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G",
 		const std::string& n7 = "H")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
@@ -10892,7 +10892,7 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
@@ -10905,72 +10905,72 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4,T5,T6> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)):
 	TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)):
 	TupleType(t0,t1,t2,t3,t4,t5,t6)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
 		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
 		const std::string& n6 = "G",
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): 
-	TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0) 
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)):
+	TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5,n6);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -10978,18 +10978,18 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					case 6: return TupleType::template get<6>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -11000,7 +11000,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -11019,7 +11019,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -11043,7 +11043,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -11051,9 +11051,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -11064,16 +11064,16 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
-		const std::string& n5 = "F", 
+		const std::string& n5 = "F",
 		const std::string& n6 = "G")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 			_pNames->push_back(n6);
@@ -11084,7 +11084,7 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
@@ -11096,68 +11096,68 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4,T5> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4,T5>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)):
 	TupleType(t0,t1,t2,t3,t4,t5), _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)):
 	TupleType(t0,t1,t2,t3,t4,t5)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
 		const std::string& n5 = "F",
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): 
-	TupleType(t0,t1,t2,t3,t4,t5), _pNames(0) 
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)):
+	TupleType(t0,t1,t2,t3,t4,t5), _pNames(0)
 	{
 		init(n0,n1,n2,n3,n4,n5);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -11165,17 +11165,17 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					case 5: return TupleType::template get<5>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -11186,7 +11186,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -11205,7 +11205,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -11229,7 +11229,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -11237,9 +11237,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,T5,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -11251,14 +11251,14 @@ private:
 		const std::string& n3 = "D",
 		const std::string& n4 = "E",
 		const std::string& n5 = "F")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 			_pNames->push_back(n5);
 		}
@@ -11268,7 +11268,7 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3,
@@ -11279,66 +11279,66 @@ struct NamedTuple<T0,T1,T2,T3,T4,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3,T4> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3,T4>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): 
-		TupleType(t0,t1,t2,t3,t4), 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)):
+		TupleType(t0,t1,t2,t3,t4),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)):
 		TupleType(t0,t1,t2,t3,t4)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
 		const std::string& n4 = "E",
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): 
-		TupleType(t0,t1,t2,t3,t4), 
-		_pNames(0) 
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)):
+		TupleType(t0,t1,t2,t3,t4),
+		_pNames(0)
 	{
 		init(n0,n1,n2,n3,n4);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -11346,16 +11346,16 @@ struct NamedTuple<T0,T1,T2,T3,T4,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					case 4: return TupleType::template get<4>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -11366,7 +11366,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -11385,7 +11385,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -11409,7 +11409,7 @@ struct NamedTuple<T0,T1,T2,T3,T4,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -11417,9 +11417,9 @@ struct NamedTuple<T0,T1,T2,T3,T4,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -11430,14 +11430,14 @@ private:
 		const std::string& n2 = "C",
 		const std::string& n3 = "D",
 		const std::string& n4 = "E")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 			_pNames->push_back(n4);
 		}
 	}
@@ -11446,7 +11446,7 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2,
 	class T3>
@@ -11456,61 +11456,61 @@ struct NamedTuple<T0,T1,T2,T3,NullTypeList>:
 	typedef Tuple<T0,T1,T2,T3> TupleType;
 	typedef typename Tuple<T0,T1,T2,T3>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): 
-		TupleType(t0,t1,t2,t3), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)):
+		TupleType(t0,t1,t2,t3),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)):
 		TupleType(t0,t1,t2,t3)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		const std::string& n3 = "D",
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): 
-	TupleType(t0,t1,t2,t3), _pNames(0) 
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)):
+	TupleType(t0,t1,t2,t3), _pNames(0)
 	{
 		init(n0,n1,n2,n3);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -11518,15 +11518,15 @@ struct NamedTuple<T0,T1,T2,T3,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
-					case 3: return TupleType::template get<3>(); 
+					case 3: return TupleType::template get<3>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -11537,7 +11537,7 @@ struct NamedTuple<T0,T1,T2,T3,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -11556,7 +11556,7 @@ struct NamedTuple<T0,T1,T2,T3,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -11580,7 +11580,7 @@ struct NamedTuple<T0,T1,T2,T3,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -11588,9 +11588,9 @@ struct NamedTuple<T0,T1,T2,T3,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -11600,14 +11600,14 @@ private:
 		const std::string& n1 = "B",
 		const std::string& n2 = "C",
 		const std::string& n3 = "D")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
 			_pNames->push_back(n0);
 			_pNames->push_back(n1);
 			_pNames->push_back(n2);
-			_pNames->push_back(n3); 
+			_pNames->push_back(n3);
 		}
 	}
 
@@ -11615,7 +11615,7 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1,
 	class T2>
 struct NamedTuple<T0,T1,T2,NullTypeList>:
@@ -11624,58 +11624,58 @@ struct NamedTuple<T0,T1,T2,NullTypeList>:
 	typedef Tuple<T0,T1,T2> TupleType;
 	typedef typename Tuple<T0,T1,T2>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): 
-		TupleType(t0,t1,t2), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)):
+		TupleType(t0,t1,t2),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)):
 		TupleType(t0,t1,t2)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		const std::string& n2 = "C",
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): 
-		TupleType(t0,t1,t2), 
-		_pNames(0) 
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)):
+		TupleType(t0,t1,t2),
+		_pNames(0)
 	{
 		init(n0,n1,n2);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -11683,14 +11683,14 @@ struct NamedTuple<T0,T1,T2,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					case 2: return TupleType::template get<2>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -11701,7 +11701,7 @@ struct NamedTuple<T0,T1,T2,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -11720,7 +11720,7 @@ struct NamedTuple<T0,T1,T2,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -11744,7 +11744,7 @@ struct NamedTuple<T0,T1,T2,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -11752,9 +11752,9 @@ struct NamedTuple<T0,T1,T2,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -11763,7 +11763,7 @@ private:
 	void init(const std::string& n0 = "A",
 		const std::string& n1 = "B",
 		const std::string& n2 = "C")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -11777,7 +11777,7 @@ private:
 };
 
 
-template<class T0, 
+template<class T0,
 	class T1>
 struct NamedTuple<T0,T1,NullTypeList>:
 	public Tuple<T0,T1>
@@ -11785,54 +11785,54 @@ struct NamedTuple<T0,T1,NullTypeList>:
 	typedef Tuple<T0,T1> TupleType;
 	typedef typename Tuple<T0,T1>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): 
-		TupleType(t0,t1), 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)):
+		TupleType(t0,t1),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
+	NamedTuple(const NameVecPtr& rNames,
 		typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)):
 		TupleType(t0,t1)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
 	NamedTuple(const std::string& n0,
-		typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T0>::CONSTTYPE& t0,
 		const std::string& n1 = "B",
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): 
-		TupleType(t0,t1), 
-		_pNames(0) 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)):
+		TupleType(t0,t1),
+		_pNames(0)
 	{
 		init(n0,n1);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -11840,13 +11840,13 @@ struct NamedTuple<T0,T1,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					case 1: return TupleType::template get<1>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -11857,7 +11857,7 @@ struct NamedTuple<T0,T1,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -11876,7 +11876,7 @@ struct NamedTuple<T0,T1,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -11900,7 +11900,7 @@ struct NamedTuple<T0,T1,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -11908,9 +11908,9 @@ struct NamedTuple<T0,T1,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
@@ -11918,7 +11918,7 @@ struct NamedTuple<T0,T1,NullTypeList>:
 private:
 	void init(const std::string& n0 = "A",
 		const std::string& n1 = "B")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
@@ -11938,49 +11938,49 @@ struct NamedTuple<T0,NullTypeList>:
 	typedef Tuple<T0> TupleType;
 	typedef typename Tuple<T0>::Type Type;
 
-	typedef std::vector<std::string> NameVec; 
-	typedef SharedPtr<NameVec> NameVecPtr; 
+	typedef std::vector<std::string> NameVec;
+	typedef SharedPtr<NameVec> NameVecPtr;
 
 	NamedTuple(): _pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames) 
+	NamedTuple(const NameVecPtr& rNames)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
-	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0): 
-		TupleType(t0), 
+	NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0):
+		TupleType(t0),
 		_pNames(0)
 	{
 		init();
 	}
 
-	NamedTuple(const NameVecPtr& rNames, 
-		typename TypeWrapper<T0>::CONSTTYPE& t0): 
+	NamedTuple(const NameVecPtr& rNames,
+		typename TypeWrapper<T0>::CONSTTYPE& t0):
 		TupleType(t0)
 	{
 		if (rNames->size() != TupleType::length)
-			throw InvalidArgumentException("Wrong names vector length."); 
+			throw InvalidArgumentException("Wrong names vector length.");
 
 		_pNames = rNames;
 	}
 
-	NamedTuple(const std::string& n0, typename TypeWrapper<T0>::CONSTTYPE& t0): 
-		TupleType(t0), 
-		_pNames(0) 
+	NamedTuple(const std::string& n0, typename TypeWrapper<T0>::CONSTTYPE& t0):
+		TupleType(t0),
+		_pNames(0)
 	{
 		init(n0);
 	}
 
 	const DynamicAny get(const std::string& name) const
 	{
-		NameVec::const_iterator it = _pNames->begin(); 
+		NameVec::const_iterator it = _pNames->begin();
 		NameVec::const_iterator itEnd = _pNames->end();
 
 		for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
@@ -11988,12 +11988,12 @@ struct NamedTuple<T0,NullTypeList>:
 			if (name == *it)
 			{
 				switch (counter)
-				{ 
+				{
 					case 0: return TupleType::template get<0>();
 					default: throw RangeException();
 				}
 			}
-		} 
+		}
 
 		throw NotFoundException("Name not found: " + name);
 	}
@@ -12004,7 +12004,7 @@ struct NamedTuple<T0,NullTypeList>:
 	}
 
 	template<int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const 
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
 	{
 		return TupleType::template get<N>();
 	}
@@ -12023,7 +12023,7 @@ struct NamedTuple<T0,NullTypeList>:
 
 	const NameVecPtr& names()
 	{
-		return _pNames; 
+		return _pNames;
 	}
 
 	void setName(std::size_t index, const std::string& name)
@@ -12047,7 +12047,7 @@ struct NamedTuple<T0,NullTypeList>:
 		return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
 	}
 
-	bool operator != (const NamedTuple& other) const 
+	bool operator != (const NamedTuple& other) const
 	{
 		return !(*this == other);
 	}
@@ -12055,16 +12055,16 @@ struct NamedTuple<T0,NullTypeList>:
 	bool operator < (const NamedTuple& other) const
 	{
 		TupleType th(*this);
-		TupleType oth(other); 
+		TupleType oth(other);
 
-		return (th < oth && _pNames == other._pNames) || 
+		return (th < oth && _pNames == other._pNames) ||
 			(th == oth && _pNames < other._pNames) ||
 			(th < oth && _pNames < other._pNames);
 	}
 
 private:
 	void init(const std::string& n0 = "A")
-	{ 
+	{
 		if (!_pNames)
 		{
 			_pNames = new NameVec;
diff --git a/Foundation/include/Poco/NestedDiagnosticContext.h b/Foundation/include/Poco/NestedDiagnosticContext.h
index ccb29a56a..80b0c223e 100644
--- a/Foundation/include/Poco/NestedDiagnosticContext.h
+++ b/Foundation/include/Poco/NestedDiagnosticContext.h
@@ -31,7 +31,7 @@ class NDCScope;
 
 class Foundation_API NestedDiagnosticContext
 	/// This class implements a Nested Diagnostic Context (NDC),
-	/// as described in Neil Harrison's article "Patterns for Logging 
+	/// as described in Neil Harrison's article "Patterns for Logging
 	/// Diagnostic Messages" in "Pattern Languages of Program Design 3"
 	/// (Addison-Wesley).
 	///
@@ -61,29 +61,29 @@ public:
 
 	~NestedDiagnosticContext();
 		/// Destroys the NestedDiagnosticContext.
-		
+
 	NestedDiagnosticContext& operator = (const NestedDiagnosticContext& ctx);
 		/// Assignment operator.
-		
+
 	void push(const std::string& info);
 		/// Pushes a context (without line number and filename) onto the stack.
-		
+
 	void push(const std::string& info, int line, const char* filename);
-		/// Pushes a context (including line number and filename) 
+		/// Pushes a context (including line number and filename)
 		/// onto the stack. Filename must be a static string, such as the
 		/// one produced by the __FILE__ preprocessor macro.
 
 	void pop();
 		/// Pops the top-most context off the stack.
-		
+
 	int depth() const;
 		/// Returns the depth (number of contexts) of the stack.
-	
+
 	std::string toString() const;
 		/// Returns the stack as a string with entries
 		/// delimited by colons. The string does not contain
 		/// line numbers and filenames.
-		
+
 	void dump(std::ostream& ostr) const;
 		/// Dumps the stack (including line number and filenames)
 		/// to the given stream. The entries are delimited by
@@ -92,10 +92,10 @@ public:
 	void dump(std::ostream& ostr, const std::string& delimiter) const;
 		/// Dumps the stack (including line number and filenames)
 		/// to the given stream.
-		
+
 	void clear();
 		/// Clears the NDC stack.
-	
+
 	static NestedDiagnosticContext& current();
 		/// Returns the current thread's NDC.
 
@@ -107,7 +107,7 @@ private:
 		int         line;
 	};
 	typedef std::vector<Context> Stack;
-	
+
 	Stack _stack;
 };
 
@@ -123,7 +123,7 @@ class Foundation_API NDCScope
 public:
 	NDCScope(const std::string& info);
 		/// Pushes a context on the stack.
-		
+
 	NDCScope(const std::string& info, int line, const char* filename);
 		/// Pushes a context on the stack.
 
@@ -140,7 +140,7 @@ inline NDCScope::NDCScope(const std::string& info)
 	NestedDiagnosticContext::current().push(info);
 }
 
-	
+
 inline NDCScope::NDCScope(const std::string& info, int line, const char* filename)
 {
 	NestedDiagnosticContext::current().push(info, line, filename);
diff --git a/Foundation/include/Poco/Notification.h b/Foundation/include/Poco/Notification.h
index 2246c6b12..4226ebf7d 100644
--- a/Foundation/include/Poco/Notification.h
+++ b/Foundation/include/Poco/Notification.h
@@ -36,7 +36,7 @@ class Foundation_API Notification: public RefCountedObject
 {
 public:
 	using Ptr = AutoPtr<Notification>;
-	
+
 	Notification();
 		/// Creates the notification.
 
diff --git a/Foundation/include/Poco/NotificationCenter.h b/Foundation/include/Poco/NotificationCenter.h
index 411bba894..dd77972b2 100644
--- a/Foundation/include/Poco/NotificationCenter.h
+++ b/Foundation/include/Poco/NotificationCenter.h
@@ -33,24 +33,24 @@ class AbstractObserver;
 
 
 class Foundation_API NotificationCenter
-	/// A NotificationCenter is essentially a notification dispatcher. 
+	/// A NotificationCenter is essentially a notification dispatcher.
 	/// It notifies all observers of notifications meeting specific criteria.
 	/// This information is encapsulated in Notification objects.
-	/// Client objects register themselves with the notification center as observers of 
-	/// specific notifications posted by other objects. When an event occurs, an object 
-	/// posts an appropriate notification to the notification center. The notification  
-	/// center invokes the registered method on each matching observer, passing the notification 
+	/// Client objects register themselves with the notification center as observers of
+	/// specific notifications posted by other objects. When an event occurs, an object
+	/// posts an appropriate notification to the notification center. The notification
+	/// center invokes the registered method on each matching observer, passing the notification
 	/// as argument.
 	///
-	/// The order in which observers receive notifications is undefined. 
+	/// The order in which observers receive notifications is undefined.
 	/// It is possible for the posting object and the observing object to be the same.
-	/// The NotificationCenter delivers notifications to observers synchronously. 
-	/// In other words the postNotification() method does not return until all observers have 
-	/// received and processed the notification. 
+	/// The NotificationCenter delivers notifications to observers synchronously.
+	/// In other words the postNotification() method does not return until all observers have
+	/// received and processed the notification.
 	/// If an observer throws an exception while handling a notification, the NotificationCenter
 	/// stops dispatching the notification and postNotification() rethrows the exception.
 	///
-	/// In a multithreaded scenario, notifications are always delivered in the thread in which the 
+	/// In a multithreaded scenario, notifications are always delivered in the thread in which the
 	/// notification was posted, which may not be the same thread in which an observer registered itself.
 	///
 	/// The NotificationCenter class is basically a C++ implementation of the NSNotificationCenter class
@@ -116,10 +116,10 @@ public:
 		///
 		/// Can be used to improve performance if an expensive notification
 		/// shall only be created and posted if there are any observers.
-		
+
 	std::size_t countObservers() const;
 		/// Returns the number of registered observers.
-		
+
 	static NotificationCenter& defaultCenter();
 		/// Returns a reference to the default
 		/// NotificationCenter.
diff --git a/Foundation/include/Poco/NotificationQueue.h b/Foundation/include/Poco/NotificationQueue.h
index 7db23a343..e34219c72 100644
--- a/Foundation/include/Poco/NotificationQueue.h
+++ b/Foundation/include/Poco/NotificationQueue.h
@@ -34,9 +34,9 @@ class NotificationCenter;
 class Foundation_API NotificationQueue
 	/// A NotificationQueue object provides a way to implement asynchronous
 	/// notifications. This is especially useful for sending notifications
-	/// from one thread to another, for example from a background thread to 
-	/// the main (user interface) thread. 
-	/// 
+	/// from one thread to another, for example from a background thread to
+	/// the main (user interface) thread.
+	///
 	/// The NotificationQueue can also be used to distribute work from
 	/// a controlling thread to one or more worker threads. Each worker thread
 	/// repeatedly calls waitDequeueNotification() and processes the
@@ -62,7 +62,7 @@ public:
 		/// a call like
 		///     notificationQueue.enqueueNotification(new MyNotification);
 		/// does not result in a memory leak.
-		
+
 	void enqueueUrgentNotification(Notification::Ptr pNotification);
 		/// Enqueues the given notification by adding it to
 		/// the front of the queue (LIFO). The event therefore gets processed
@@ -85,7 +85,7 @@ public:
 	Notification* waitDequeueNotification();
 		/// Dequeues the next pending notification.
 		/// If no notification is available, waits for a notification
-		/// to be enqueued. 
+		/// to be enqueued.
 		/// The caller gains ownership of the notification and
 		/// is expected to release it when done with it.
 		/// This method returns 0 (null) if wakeUpWaitingThreads()
@@ -122,13 +122,13 @@ public:
 
 	void clear();
 		/// Removes all notifications from the queue.
-		
+
 	bool remove(Notification::Ptr pNotification);
 		/// Removes a notification from the queue.
 		/// Returns true if remove succeeded, false otherwise
 
 	bool hasIdleThreads() const;
-		/// Returns true if the queue has at least one thread waiting 
+		/// Returns true if the queue has at least one thread waiting
 		/// for a notification.
 
 	static NotificationQueue& defaultQueue();
diff --git a/Foundation/include/Poco/NotificationStrategy.h b/Foundation/include/Poco/NotificationStrategy.h
index 856507678..63e820916 100644
--- a/Foundation/include/Poco/NotificationStrategy.h
+++ b/Foundation/include/Poco/NotificationStrategy.h
@@ -24,10 +24,10 @@
 namespace Poco {
 
 
-template <class TArgs, class TDelegate> 
+template <class TArgs, class TDelegate>
 class NotificationStrategy
 	/// The interface that all notification strategies must implement.
-	/// 
+	///
 	/// Note: Event is based on policy-driven design, so every strategy implementation
 	/// must provide all the methods from this interface (otherwise: compile errors)
 	/// but does not need to inherit from NotificationStrategy.
@@ -65,10 +65,10 @@ public:
 };
 
 
-template <class TDelegate> 
+template <class TDelegate>
 class NotificationStrategy<void, TDelegate>
 	/// The interface that all notification strategies must implement.
-	/// 
+	///
 	/// Note: Event is based on policy-driven design, so every strategy implementation
 	/// must provide all the methods from this interface (otherwise: compile errors)
 	/// but does not need to inherit from NotificationStrategy.
diff --git a/Foundation/include/Poco/NullChannel.h b/Foundation/include/Poco/NullChannel.h
index 426107e71..bd3ab3f57 100644
--- a/Foundation/include/Poco/NullChannel.h
+++ b/Foundation/include/Poco/NullChannel.h
@@ -29,7 +29,7 @@ class Foundation_API NullChannel: public Channel
 	/// The NullChannel is the /dev/null of Channels.
 	///
 	/// A NullChannel discards all information sent to it.
-	/// Furthermore, its setProperty() method ignores 
+	/// Furthermore, its setProperty() method ignores
 	/// all properties, so it the NullChannel has the
 	/// nice feature that it can stand in for any
 	/// other channel class in a logging configuration.
diff --git a/Foundation/include/Poco/NullStream.h b/Foundation/include/Poco/NullStream.h
index 52c292dff..07c689590 100644
--- a/Foundation/include/Poco/NullStream.h
+++ b/Foundation/include/Poco/NullStream.h
@@ -34,10 +34,10 @@ class Foundation_API NullStreamBuf: public UnbufferedStreamBuf
 public:
 	NullStreamBuf();
 		/// Creates a NullStreamBuf.
-	
+
 	~NullStreamBuf();
 		/// Destroys the NullStreamBuf.
-		
+
 protected:
 	int readFromDevice();
 	int writeToDevice(char c);
@@ -78,7 +78,7 @@ class Foundation_API NullOutputStream: public NullIOS, public std::ostream
 public:
 	NullOutputStream();
 		/// Creates the NullOutputStream.
-	
+
 	~NullOutputStream();
 		/// Destroys the NullOutputStream.
 };
diff --git a/Foundation/include/Poco/Nullable.h b/Foundation/include/Poco/Nullable.h
index f6cc5e2f8..5a22cc94d 100644
--- a/Foundation/include/Poco/Nullable.h
+++ b/Foundation/include/Poco/Nullable.h
@@ -177,7 +177,7 @@ public:
 		return *this;
 	}
 
-	void swap(Nullable& other)
+	void swap(Nullable& other) noexcept
 		/// Swaps this Nullable with other.
 	{
 		std::swap(_value, other._value);
@@ -310,7 +310,7 @@ private:
 
 
 template <typename C>
-inline void swap(Nullable<C>& n1, Nullable<C>& n2)
+inline void swap(Nullable<C>& n1, Nullable<C>& n2) noexcept
 {
 	n1.swap(n2);
 }
diff --git a/Foundation/include/Poco/NumberFormatter.h b/Foundation/include/Poco/NumberFormatter.h
index 6207f13d3..a197712f1 100644
--- a/Foundation/include/Poco/NumberFormatter.h
+++ b/Foundation/include/Poco/NumberFormatter.h
@@ -192,7 +192,7 @@ public:
 
 	static std::string formatHex(unsigned long long value, bool prefix = false);
 		/// Formats a 64-bit integer value in hexadecimal notation.
-		/// If prefix is true, "0x" prefix is prepended to the 
+		/// If prefix is true, "0x" prefix is prepended to the
 		/// resulting string.
 
 	static std::string formatHex(unsigned long long value, int width, bool prefix = false);
@@ -217,7 +217,7 @@ public:
 
 	static std::string formatHex(Int64 value, bool prefix = false);
 		/// Formats a 64-bit integer value in hexadecimal notation.
-		/// If prefix is true, "0x" prefix is prepended to the 
+		/// If prefix is true, "0x" prefix is prepended to the
 		/// resulting string.
 		/// The value is treated as unsigned.
 
@@ -849,6 +849,8 @@ inline std::string NumberFormatter::format(float value)
 
 inline std::string NumberFormatter::format(float value, int precision)
 {
+	if (precision < 0)
+		throw InvalidArgumentException("NumberFormatter::format() requires non-negative precision.");
 	char buffer[POCO_MAX_FLT_STRING_LEN];
 	floatToFixedStr(buffer, POCO_MAX_FLT_STRING_LEN, value, precision);
 	return std::string(buffer);
@@ -857,6 +859,8 @@ inline std::string NumberFormatter::format(float value, int precision)
 
 inline std::string NumberFormatter::format(float value, int width, int precision)
 {
+	if (precision < 0)
+		throw InvalidArgumentException("NumberFormatter::format() requires non-negative precision.");
 	std::string result;
 	floatToFixedStr(result, value, precision, width);
 	return result;
@@ -873,6 +877,8 @@ inline std::string NumberFormatter::format(double value)
 
 inline std::string NumberFormatter::format(double value, int precision)
 {
+	if (precision < 0)
+		throw InvalidArgumentException("NumberFormatter::format() requires non-negative precision.");
 	char buffer[POCO_MAX_FLT_STRING_LEN];
 	doubleToFixedStr(buffer, POCO_MAX_FLT_STRING_LEN, value, precision);
 	return std::string(buffer);
@@ -881,6 +887,8 @@ inline std::string NumberFormatter::format(double value, int precision)
 
 inline std::string NumberFormatter::format(double value, int width, int precision)
 {
+	if (precision < 0)
+		throw InvalidArgumentException("NumberFormatter::format() requires non-negative precision.");
 	std::string result;
 	doubleToFixedStr(result, value, precision, width);
 	return result;
diff --git a/Foundation/include/Poco/NumberParser.h b/Foundation/include/Poco/NumberParser.h
index c58ed4f35..2383a02e5 100644
--- a/Foundation/include/Poco/NumberParser.h
+++ b/Foundation/include/Poco/NumberParser.h
@@ -44,19 +44,19 @@ public:
 	static int parse(const std::string& s, char thousandSeparator = ',');
 		/// Parses an integer value in decimal notation from the given string.
 		/// Throws a SyntaxException if the string does not hold a number in decimal notation.
-	
+
 	static bool tryParse(const std::string& s, int& value, char thousandSeparator = ',');
 		/// Parses an integer value in decimal notation from the given string.
-		/// Returns true if a valid integer has been found, false otherwise. 
+		/// Returns true if a valid integer has been found, false otherwise.
 		/// If parsing was not successful, value is undefined.
-	
+
 	static unsigned parseUnsigned(const std::string& s, char thousandSeparator = ',');
 		/// Parses an unsigned integer value in decimal notation from the given string.
 		/// Throws a SyntaxException if the string does not hold a number in decimal notation.
 
 	static bool tryParseUnsigned(const std::string& s, unsigned& value, char thousandSeparator = ',');
 		/// Parses an unsigned integer value in decimal notation from the given string.
-		/// Returns true if a valid integer has been found, false otherwise. 
+		/// Returns true if a valid integer has been found, false otherwise.
 		/// If parsing was not successful, value is undefined.
 
 	static unsigned parseHex(const std::string& s);
@@ -66,7 +66,7 @@ public:
 
 	static bool tryParseHex(const std::string& s, unsigned& value);
 		/// Parses an unsigned integer value in hexadecimal notation from the given string.
-		/// Returns true if a valid integer has been found, false otherwise. 
+		/// Returns true if a valid integer has been found, false otherwise.
 		/// If parsing was not successful, value is undefined.
 
 	static unsigned parseOct(const std::string& s);
@@ -76,7 +76,7 @@ public:
 
 	static bool tryParseOct(const std::string& s, unsigned& value);
 		/// Parses an unsigned integer value in octal notation from the given string.
-		/// Returns true if a valid integer has been found, false otherwise. 
+		/// Returns true if a valid integer has been found, false otherwise.
 		/// If parsing was not successful, value is undefined.
 
 #if defined(POCO_HAVE_INT64)
@@ -87,7 +87,7 @@ public:
 
 	static bool tryParse64(const std::string& s, Int64& value, char thousandSeparator = ',');
 		/// Parses a 64-bit integer value in decimal notation from the given string.
-		/// Returns true if a valid integer has been found, false otherwise. 
+		/// Returns true if a valid integer has been found, false otherwise.
 		/// If parsing was not successful, value is undefined.
 
 	static UInt64 parseUnsigned64(const std::string& s, char thousandSeparator = ',');
@@ -96,7 +96,7 @@ public:
 
 	static bool tryParseUnsigned64(const std::string& s, UInt64& value, char thousandSeparator = ',');
 		/// Parses an unsigned 64-bit integer value in decimal notation from the given string.
-		/// Returns true if a valid integer has been found, false otherwise. 
+		/// Returns true if a valid integer has been found, false otherwise.
 		/// If parsing was not successful, value is undefined.
 
 	static UInt64 parseHex64(const std::string& s);
@@ -105,7 +105,7 @@ public:
 
 	static bool tryParseHex64(const std::string& s, UInt64& value);
 		/// Parses an unsigned 64-bit integer value in hexadecimal notation from the given string.
-		/// Returns true if a valid integer has been found, false otherwise. 
+		/// Returns true if a valid integer has been found, false otherwise.
 		/// If parsing was not successful, value is undefined.
 
 	static UInt64 parseOct64(const std::string& s);
@@ -114,7 +114,7 @@ public:
 
 	static bool tryParseOct64(const std::string& s, UInt64& value);
 		/// Parses an unsigned 64-bit integer value in octal notation from the given string.
-		/// Returns true if a valid integer has been found, false otherwise. 
+		/// Returns true if a valid integer has been found, false otherwise.
 		/// If parsing was not successful, value is undefined.
 
 #endif // defined(POCO_HAVE_INT64)
@@ -122,9 +122,9 @@ public:
 	static double parseFloat(const std::string& s, char decimalSeparator = '.', char thousandSeparator = ',');
 		/// Parses a double value in decimal floating point notation
 		/// from the given string.
-		/// Throws a SyntaxException if the string does not hold a floating-point 
+		/// Throws a SyntaxException if the string does not hold a floating-point
 		/// number in decimal notation.
-		
+
 	static bool tryParseFloat(const std::string& s, double& value, char decimalSeparator = '.', char thousandSeparator = ',');
 		/// Parses a double value in decimal floating point notation
 		/// from the given string.
diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h
index 3890d0f9f..7fbb5b3f4 100644
--- a/Foundation/include/Poco/NumericString.h
+++ b/Foundation/include/Poco/NumericString.h
@@ -33,7 +33,6 @@
 #if !defined(POCO_NO_LOCALE)
 	#include <locale>
 #endif
-
 #if defined(POCO_NOINTMAX)
 typedef Poco::UInt64 uintmax_t;
 typedef Poco::Int64 intmax_t;
@@ -46,7 +45,6 @@ typedef Poco::Int64 intmax_t;
 #pragma warning(disable : 4146)
 #endif // POCO_COMPILER_MSVC
 
-
 // binary numbers are supported, thus 64 (bits) + 1 (string terminating zero)
 #define POCO_MAX_INT_STRING_LEN 65
 // value from strtod.cc (double_conversion::kMaxSignificantDecimalDigits)
@@ -112,6 +110,46 @@ inline bool isIntOverflow(From val)
 }
 
 
+template<typename R, typename F, typename S>
+bool safeMultiply(R& result, F f, S s)
+{
+	if ((f == 0) || (s==0))
+	{
+		result = 0;
+		return true;
+	}
+
+	if (f > 0)
+	{
+		if (s > 0)
+		{
+			if (f > (std::numeric_limits<R>::max() / s))
+				return false;
+		}
+		else
+		{
+			if (s < (std::numeric_limits<R>::min() / f))
+				return false;
+		}
+	}
+	else
+	{
+		if (s > 0)
+		{
+			if (f < (std::numeric_limits<R>::min() / s))
+				return false;
+		}
+		else
+		{
+			if (s < (std::numeric_limits<R>::max() / f))
+				return false;
+		}
+	}
+	result = f * s;
+	return true;
+}
+
+
 template <typename F, typename T>
 inline T& isSafeIntCast(F from)
 	/// Returns true if it is safe to cast
@@ -124,7 +162,7 @@ inline T& isSafeIntCast(F from)
 
 template <typename F, typename T>
 inline T& safeIntCast(F from, T& to)
-	/// Returns csted value if it is safe
+	/// Returns cast value if it is safe
 	/// to cast integer from F to T,
 	/// otherwise throws BadCastException.
 {
@@ -188,101 +226,54 @@ bool strToInt(const char* pStr, I& outResult, short base, char thSep = ',')
 	}
 	else if (*pStr == '+') ++pStr;
 
-	// all numbers are parsed as positive; the sign
-	// for negative numbers is adjusted after parsing
+	// numbers are parsed as unsigned, for negative numbers the sign is applied after parsing
+	// overflow is checked in every parse step
 	uintmax_t limitCheck = std::numeric_limits<I>::max();
-	if (negative)
-	{
-		poco_assert_dbg(std::numeric_limits<I>::is_signed);
-		// to cover the entire range, (-min > max) has to be
-		// taken into account;
-		// to avoid overflow for the largest int size,
-		// we resort to FPEnvironment::copySign() (ie. floating-point)
-		if (sizeof(I) == sizeof(intmax_t))
-			limitCheck = static_cast<uintmax_t>(FPEnvironment::copySign(static_cast<double>(std::numeric_limits<I>::min()), 1));
-		else
-		{
-			intmax_t i = std::numeric_limits<I>::min();
-			limitCheck = -i;
-		}
-	}
-
+	if (negative) ++limitCheck;
 	uintmax_t result = 0;
+	unsigned char add = 0;
 	for (; *pStr != '\0'; ++pStr)
 	{
-		if  (result > (limitCheck / base)) return false;
+		if (*pStr == thSep)
+		{
+			if (base == 10) continue;
+			throw Poco::SyntaxException("strToInt: thousand separators only allowed for base 10");
+		}
+		if (result > (limitCheck / base)) return false;
+		if (!safeMultiply(result, result, base)) return false;
 		switch (*pStr)
 		{
 		case '0': case '1': case '2': case '3':
 		case '4': case '5': case '6': case '7':
-			{
-				char add = (*pStr - '0');
-				if ((limitCheck - result) < add) return false;
-				result = result * base + add;
-			}
+			add = (*pStr - '0');
 			break;
 
 		case '8': case '9':
-			if ((base == 10) || (base == 0x10))
-			{
-				char  add = (*pStr - '0');
-				if ((limitCheck - result) < add) return false;
-				result = result * base + add;
-			}
+			if ((base == 10) || (base == 0x10)) add = (*pStr - '0');
 			else return false;
-
 			break;
 
 		case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-			{
-				if (base != 0x10) return false;
-				char  add = (*pStr - 'a');
-				if ((limitCheck - result) < add) return false;
-				result = result * base + (10 + add);
-			}
+			if (base != 0x10) return false;
+			add = (*pStr - 'a') + 10;
 			break;
 
 		case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-			{
-				if (base != 0x10) return false;
-				char add = (*pStr - 'A');
-				if ((limitCheck - result) < add) return false;
-				result = result * base + (10 + add);
-			}
+			if (base != 0x10) return false;
+			add = (*pStr - 'A') + 10;
 			break;
 
-		case '.':
-			if ((base == 10) && (thSep == '.')) break;
-			else return false;
-
-		case ',':
-			if ((base == 10) && (thSep == ',')) break;
-			else return false;
-
-		case ' ':
-			if ((base == 10) && (thSep == ' ')) break;
-
 		default:
 			return false;
 		}
+		if ((limitCheck - static_cast<uintmax_t>(result)) < add) return false;
+		result += add;
 	}
 
 	if (negative && (base == 10))
-	{
-		poco_assert_dbg(std::numeric_limits<I>::is_signed);
-		intmax_t i;
-		if (sizeof(I) == sizeof(intmax_t))
-			i = static_cast<intmax_t>(FPEnvironment::copySign(static_cast<double>(result), -1));
-		else
-			i = static_cast<intmax_t>(-result);
-		if (isIntOverflow<I>(i)) return false;
-		outResult = static_cast<I>(i);
-	}
+		outResult = static_cast<I>(-result);
 	else
-	{
-		if (isIntOverflow<I>(result)) return false;
 		outResult = static_cast<I>(result);
-	}
 
 	return true;
 }
diff --git a/Foundation/include/Poco/Observer.h b/Foundation/include/Poco/Observer.h
index 9be67b2ee..e7bc67413 100755
--- a/Foundation/include/Poco/Observer.h
+++ b/Foundation/include/Poco/Observer.h
@@ -30,7 +30,7 @@ template <class C, class N>
 class Observer: public AbstractObserver
 	/// This template class implements an adapter that sits between
 	/// a NotificationCenter and an object receiving notifications
-	/// from it. It is quite similar in concept to the 
+	/// from it. It is quite similar in concept to the
 	/// RunnableAdapter, but provides some NotificationCenter
 	/// specific additional methods.
 	/// See the NotificationCenter class for information on how
@@ -44,23 +44,23 @@ class Observer: public AbstractObserver
 public:
 	typedef void (C::*Callback)(N*);
 
-	Observer(C& object, Callback method): 
-		_pObject(&object), 
+	Observer(C& object, Callback method):
+		_pObject(&object),
 		_method(method)
 	{
 	}
-	
+
 	Observer(const Observer& observer):
 		AbstractObserver(observer),
-		_pObject(observer._pObject), 
+		_pObject(observer._pObject),
 		_method(observer._method)
 	{
 	}
-	
+
 	~Observer()
 	{
 	}
-	
+
 	Observer& operator = (const Observer& observer)
 	{
 		if (&observer != this)
@@ -85,7 +85,7 @@ public:
 			}
 		}
 	}
-	
+
 	bool equals(const AbstractObserver& abstractObserver) const
 	{
 		const Observer* pObs = dynamic_cast<const Observer*>(&abstractObserver);
@@ -96,19 +96,19 @@ public:
 	{
 		return dynamic_cast<N*>(pNf) && (!pName || pNf->name() == pName);
 	}
-	
+
 	AbstractObserver* clone() const
 	{
 		return new Observer(*this);
 	}
-	
+
 	void disable()
 	{
 		Poco::Mutex::ScopedLock lock(_mutex);
-		
+
 		_pObject = 0;
 	}
-	
+
 private:
 	Observer();
 
diff --git a/Foundation/include/Poco/Optional.h b/Foundation/include/Poco/Optional.h
index 15415a796..31c38fd5a 100644
--- a/Foundation/include/Poco/Optional.h
+++ b/Foundation/include/Poco/Optional.h
@@ -141,7 +141,7 @@ public:
 		return *this;
 	}
 
-	void swap(Optional& other)
+	void swap(Optional& other) noexcept
 	{
 		std::swap(_value, other._value);
 		std::swap(_isSpecified, other._isSpecified);
@@ -185,7 +185,7 @@ private:
 
 
 template <typename C>
-inline void swap(Optional<C>& n1, Optional<C>& n2)
+inline void swap(Optional<C>& n1, Optional<C>& n2) noexcept
 {
 	n1.swap(n2);
 }
diff --git a/Foundation/include/Poco/PBKDF2Engine.h b/Foundation/include/Poco/PBKDF2Engine.h
index ca660e5b0..4c6a34eb2 100644
--- a/Foundation/include/Poco/PBKDF2Engine.h
+++ b/Foundation/include/Poco/PBKDF2Engine.h
@@ -31,25 +31,25 @@ template <class PRF>
 class PBKDF2Engine: public DigestEngine
 	/// This class implements the Password-Based Key Derivation Function 2,
 	/// as specified in RFC 2898. The underlying DigestEngine (HMACEngine, etc.),
-	/// which must accept the passphrase as constructor argument (std::string), 
-	/// must be given as template argument. 
+	/// which must accept the passphrase as constructor argument (std::string),
+	/// must be given as template argument.
 	///
-	/// PBKDF2 (Password-Based Key Derivation Function 2) is a key derivation function 
-	/// that is part of RSA Laboratories' Public-Key Cryptography Standards (PKCS) series, 
-	/// specifically PKCS #5 v2.0, also published as Internet Engineering Task Force's 
-	/// RFC 2898. It replaces an earlier standard, PBKDF1, which could only produce 
+	/// PBKDF2 (Password-Based Key Derivation Function 2) is a key derivation function
+	/// that is part of RSA Laboratories' Public-Key Cryptography Standards (PKCS) series,
+	/// specifically PKCS #5 v2.0, also published as Internet Engineering Task Force's
+	/// RFC 2898. It replaces an earlier standard, PBKDF1, which could only produce
 	/// derived keys up to 160 bits long.
 	///
-	/// PBKDF2 applies a pseudorandom function, such as a cryptographic hash, cipher, or 
-	/// HMAC to the input password or passphrase along with a salt value and repeats the 
-	/// process many times to produce a derived key, which can then be used as a 
-	/// cryptographic key in subsequent operations. The added computational work makes 
-	/// password cracking much more difficult, and is known as key stretching. 
-	/// When the standard was written in 2000, the recommended minimum number of 
-	/// iterations was 1000, but the parameter is intended to be increased over time as 
-	/// CPU speeds increase. Having a salt added to the password reduces the ability to 
-	/// use precomputed hashes (rainbow tables) for attacks, and means that multiple 
-	/// passwords have to be tested individually, not all at once. The standard 
+	/// PBKDF2 applies a pseudorandom function, such as a cryptographic hash, cipher, or
+	/// HMAC to the input password or passphrase along with a salt value and repeats the
+	/// process many times to produce a derived key, which can then be used as a
+	/// cryptographic key in subsequent operations. The added computational work makes
+	/// password cracking much more difficult, and is known as key stretching.
+	/// When the standard was written in 2000, the recommended minimum number of
+	/// iterations was 1000, but the parameter is intended to be increased over time as
+	/// CPU speeds increase. Having a salt added to the password reduces the ability to
+	/// use precomputed hashes (rainbow tables) for attacks, and means that multiple
+	/// passwords have to be tested individually, not all at once. The standard
 	/// recommends a salt length of at least 64 bits. [Wikipedia]
 	///
 	/// The PBKDF2 algorithm is implemented as a DigestEngine. The passphrase is specified
@@ -65,30 +65,30 @@ public:
 	{
 		PRF_DIGEST_SIZE = PRF::DIGEST_SIZE
 	};
-	
+
 	PBKDF2Engine(const std::string& salt, unsigned c = 4096, Poco::UInt32 dkLen = PRF_DIGEST_SIZE):
 		_s(salt),
 		_c(c),
 		_dkLen(dkLen)
-	{		
+	{
 		_result.reserve(_dkLen + PRF_DIGEST_SIZE);
 	}
-	
+
 	~PBKDF2Engine()
 	{
 	}
-		
+
 	std::size_t digestLength() const
 	{
 		return _dkLen;
 	}
-	
+
 	void reset()
 	{
 		_p.clear();
 		_result.clear();
 	}
-	
+
 	const DigestEngine::Digest& digest()
 	{
 		Poco::UInt32 i = 1;
@@ -105,7 +105,7 @@ protected:
 	{
 		_p.append(reinterpret_cast<const char*>(data), length);
 	}
-	
+
 	void f(Poco::UInt32 i)
 	{
 		PRF prf(_p);
diff --git a/Foundation/include/Poco/Path.h b/Foundation/include/Poco/Path.h
index 033e2d31d..0f0a889d0 100644
--- a/Foundation/include/Poco/Path.h
+++ b/Foundation/include/Poco/Path.h
@@ -102,7 +102,7 @@ public:
 	Path& operator = (const char* path);
 		/// Assigns a string containing a path in native format.
 
-	void swap(Path& path);
+	void swap(Path& path) noexcept;
 		/// Swaps the path with another one.
 
 	Path& assign(const std::string& path);
@@ -495,7 +495,7 @@ inline char Path::pathSeparator()
 }
 
 
-inline void swap(Path& p1, Path& p2)
+inline void swap(Path& p1, Path& p2) noexcept
 {
 	p1.swap(p2);
 }
diff --git a/Foundation/include/Poco/Path_WIN32U.h b/Foundation/include/Poco/Path_WIN32U.h
index 94fca2b0a..fb9d451cc 100644
--- a/Foundation/include/Poco/Path_WIN32U.h
+++ b/Foundation/include/Poco/Path_WIN32U.h
@@ -40,7 +40,7 @@ public:
 	static std::string systemImpl();
 	static std::string expandImpl(const std::string& path);
 	static void listRootsImpl(std::vector<std::string>& roots);
-	
+
 	enum
 	{
 		MAX_PATH_LEN = 32767
diff --git a/Foundation/include/Poco/Path_WINCE.h b/Foundation/include/Poco/Path_WINCE.h
index a32e3316a..37e3fff58 100644
--- a/Foundation/include/Poco/Path_WINCE.h
+++ b/Foundation/include/Poco/Path_WINCE.h
@@ -40,7 +40,7 @@ public:
 	static std::string systemImpl();
 	static std::string expandImpl(const std::string& path);
 	static void listRootsImpl(std::vector<std::string>& roots);
-	
+
 	enum
 	{
 		MAX_PATH_LEN = 32767
diff --git a/Foundation/include/Poco/PatternFormatter.h b/Foundation/include/Poco/PatternFormatter.h
index 37d2ebd69..9f259bd61 100644
--- a/Foundation/include/Poco/PatternFormatter.h
+++ b/Foundation/include/Poco/PatternFormatter.h
@@ -95,13 +95,13 @@ public:
 
 	void format(const Message& msg, std::string& text);
 		/// Formats the message according to the specified
-		/// format pattern and places the result in text. 
-		
+		/// format pattern and places the result in text.
+
 	void setProperty(const std::string& name, const std::string& value);
 		/// Sets the property with the given name to the given value.
 		///
 		/// The following properties are supported:
-		/// 
+		///
 		///     * pattern: The format pattern. See the PatternFormatter class
 		///       for details.
 		///     * times: Specifies whether times are adjusted for local time
@@ -124,11 +124,11 @@ public:
 protected:
 	const std::string& getPriorityName(int);
 		/// Returns a string for the given priority value.
-	
+
 private:
 	struct PatternAction
 	{
-		PatternAction(): key(0), length(0) 
+		PatternAction(): key(0), length(0)
 		{
 		}
 
diff --git a/Foundation/include/Poco/Pipe.h b/Foundation/include/Poco/Pipe.h
index 89704b12b..e27a0d25d 100644
--- a/Foundation/include/Poco/Pipe.h
+++ b/Foundation/include/Poco/Pipe.h
@@ -35,7 +35,7 @@ class Foundation_API Pipe
 	/// that data only flows in one direction.
 	/// Pipes have a read-end and a write-end. One process writes to
 	/// the pipe and another process reads the data written by
-	/// its peer. 
+	/// its peer.
 	/// Read and write operations are always synchronous. A read will
 	/// block until data is available and a write will block until
 	/// the reader reads the data.
@@ -49,20 +49,20 @@ class Foundation_API Pipe
 {
 public:
 	typedef PipeImpl::Handle Handle; /// The read/write handle or file descriptor.
-	
+
 	enum CloseMode /// used by close()
 	{
 		CLOSE_READ  = 0x01, /// Close reading end of pipe.
 		CLOSE_WRITE = 0x02, /// Close writing end of pipe.
 		CLOSE_BOTH  = 0x03  /// Close both ends of pipe.
 	};
-	
+
 	Pipe();
 		/// Creates the Pipe.
 		///
 		/// Throws a CreateFileException if the pipe cannot be
 		/// created.
-		
+
 	Pipe(const Pipe& pipe);
 		/// Creates the Pipe using the PipeImpl from another one.
 
@@ -94,7 +94,7 @@ public:
 	Handle readHandle() const;
 		/// Returns the read handle or file descriptor
 		/// for the Pipe. For internal use only.
-		
+
 	Handle writeHandle() const;
 		/// Returns the write handle or file descriptor
 		/// for the Pipe. For internal use only.
@@ -103,7 +103,7 @@ public:
 		/// Depending on the argument, closes either the
 		/// reading end, the writing end, or both ends
 		/// of the Pipe.
-		
+
 private:
 	PipeImpl* _pImpl;
 };
diff --git a/Foundation/include/Poco/PipeImpl_POSIX.h b/Foundation/include/Poco/PipeImpl_POSIX.h
index 448e616ef..5b62fefc6 100644
--- a/Foundation/include/Poco/PipeImpl_POSIX.h
+++ b/Foundation/include/Poco/PipeImpl_POSIX.h
@@ -40,7 +40,7 @@ public:
 	Handle writeHandle() const;
 	void closeRead();
 	void closeWrite();
-	
+
 private:
 	int _readfd;
 	int _writefd;
diff --git a/Foundation/include/Poco/PipeImpl_WIN32.h b/Foundation/include/Poco/PipeImpl_WIN32.h
index 936817987..3e5bcd8e4 100644
--- a/Foundation/include/Poco/PipeImpl_WIN32.h
+++ b/Foundation/include/Poco/PipeImpl_WIN32.h
@@ -41,7 +41,7 @@ public:
 	Handle writeHandle() const;
 	void closeRead();
 	void closeWrite();
-	
+
 private:
 	HANDLE _readHandle;
 	HANDLE _writeHandle;
diff --git a/Foundation/include/Poco/PipeStream.h b/Foundation/include/Poco/PipeStream.h
index 96b602aea..5f107986c 100644
--- a/Foundation/include/Poco/PipeStream.h
+++ b/Foundation/include/Poco/PipeStream.h
@@ -33,22 +33,22 @@ class Foundation_API PipeStreamBuf: public BufferedStreamBuf
 {
 public:
 	typedef BufferedStreamBuf::openmode openmode;
-	
+
 	PipeStreamBuf(const Pipe& pipe, openmode mode);
 		/// Creates a PipeStreamBuf with the given Pipe.
 
 	~PipeStreamBuf();
 		/// Destroys the PipeStreamBuf.
-		
+
 	void close();
 		/// Closes the pipe.
-		
+
 protected:
 	int readFromDevice(char* buffer, std::streamsize length);
 	int writeToDevice(const char* buffer, std::streamsize length);
 
 private:
-	enum 
+	enum
 	{
 		STREAM_BUFFER_SIZE = 1024
 	};
@@ -67,15 +67,15 @@ class Foundation_API PipeIOS: public virtual std::ios
 public:
 	PipeIOS(const Pipe& pipe, openmode mode);
 		/// Creates the PipeIOS with the given Pipe.
-		
+
 	~PipeIOS();
 		/// Destroys the PipeIOS.
 		///
 		/// Flushes the buffer, but does not close the pipe.
-		
+
 	PipeStreamBuf* rdbuf();
 		/// Returns a pointer to the internal PipeStreamBuf.
-		
+
 	void close();
 		/// Flushes the stream and closes the pipe.
 
diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
index f5a9a7fe9..f5cc457a7 100644
--- a/Foundation/include/Poco/Platform.h
+++ b/Foundation/include/Poco/Platform.h
@@ -234,6 +234,9 @@
 		#define POCO_ARCH POCO_ARCH_RISCV32
 		#define POCO_ARCH_LITTLE_ENDIAN 1
 	#endif
+#elif defined(__loongarch64)
+	#define POCO_ARCH POCO_ARCH_LOONGARCH64
+	#define POCO_ARCH_LITTLE_ENDIAN 1
 #endif
 
 
@@ -243,6 +246,9 @@
 	#define POCO_COMPILER_MSVC
 #elif defined (__GNUC__)
 	#define POCO_COMPILER_GCC
+	#if defined (__MINGW32__) || defined (__MINGW64__)
+		#define POCO_COMPILER_MINGW
+	#endif
 #elif defined (__MINGW32__) || defined (__MINGW64__)
 	#define POCO_COMPILER_MINGW
 #elif defined (__INTEL_COMPILER) || defined(__ICC) || defined(__ECC) || defined(__ICL)
diff --git a/Foundation/include/Poco/Platform_VX.h b/Foundation/include/Poco/Platform_VX.h
index f21e822fd..fbe566f7d 100644
--- a/Foundation/include/Poco/Platform_VX.h
+++ b/Foundation/include/Poco/Platform_VX.h
@@ -19,9 +19,9 @@
 #define Foundation_Platform_VX_INCLUDED
 
 
-#define POCO_NO_SYS_SELECT_H 
+#define POCO_NO_SYS_SELECT_H
 #define POCO_NO_FPENVIRONMENT
-#define POCO_NO_WSTRING 
+#define POCO_NO_WSTRING
 #define POCO_NO_SHAREDMEMORY
 #define POCO_NO_SYSLOGCHANNEL
 
diff --git a/Foundation/include/Poco/Platform_WIN32.h b/Foundation/include/Poco/Platform_WIN32.h
index a24f723aa..9e88b8678 100644
--- a/Foundation/include/Poco/Platform_WIN32.h
+++ b/Foundation/include/Poco/Platform_WIN32.h
@@ -23,7 +23,7 @@
 
 
 
-// Verify that we're built with the multithreaded 
+// Verify that we're built with the multithreaded
 // versions of the runtime libraries
 #if defined(_MSC_VER) && !defined(_MT)
 	#error Must compile with /MD, /MDd, /MT or /MTd
diff --git a/Foundation/include/Poco/PriorityDelegate.h b/Foundation/include/Poco/PriorityDelegate.h
index 7c776b940..4cd664aab 100644
--- a/Foundation/include/Poco/PriorityDelegate.h
+++ b/Foundation/include/Poco/PriorityDelegate.h
@@ -28,7 +28,7 @@
 namespace Poco {
 
 
-template <class TObj, class TArgs, bool useSender = true> 
+template <class TObj, class TArgs, bool useSender = true>
 class PriorityDelegate: public AbstractPriorityDelegate<TArgs>
 {
 public:
@@ -40,14 +40,14 @@ public:
 		_receiverMethod(method)
 	{
 	}
-	
+
 	PriorityDelegate(const PriorityDelegate& delegate):
 		AbstractPriorityDelegate<TArgs>(delegate),
 		_receiverObject(delegate._receiverObject),
 		_receiverMethod(delegate._receiverMethod)
 	{
 	}
-	
+
 	PriorityDelegate& operator = (const PriorityDelegate& delegate)
 	{
 		if (&delegate != this)
@@ -70,7 +70,7 @@ public:
 		if (_receiverObject)
 		{
 			(_receiverObject->*_receiverMethod)(sender, arguments);
-			return true; 
+			return true;
 		}
 		else return false;
 	}
@@ -91,7 +91,7 @@ public:
 		Mutex::ScopedLock lock(_mutex);
 		_receiverObject = 0;
 	}
-	
+
 protected:
 	TObj*        _receiverObject;
 	NotifyMethod _receiverMethod;
@@ -102,7 +102,7 @@ private:
 };
 
 
-template <class TObj, class TArgs> 
+template <class TObj, class TArgs>
 class PriorityDelegate<TObj, TArgs, false>: public AbstractPriorityDelegate<TArgs>
 {
 public:
@@ -114,14 +114,14 @@ public:
 		_receiverMethod(method)
 	{
 	}
-	
+
 	PriorityDelegate(const PriorityDelegate& delegate):
 		AbstractPriorityDelegate<TArgs>(delegate),
 		_receiverObject(delegate._receiverObject),
 		_receiverMethod(delegate._receiverMethod)
 	{
 	}
-	
+
 	PriorityDelegate& operator = (const PriorityDelegate& delegate)
 	{
 		if (&delegate != this)
diff --git a/Foundation/include/Poco/PriorityEvent.h b/Foundation/include/Poco/PriorityEvent.h
index 48b9f604f..1ccfb89c5 100644
--- a/Foundation/include/Poco/PriorityEvent.h
+++ b/Foundation/include/Poco/PriorityEvent.h
@@ -26,14 +26,14 @@
 namespace Poco {
 
 
-template <class TArgs, class TMutex = FastMutex> 
-class PriorityEvent: public AbstractEvent < 
+template <class TArgs, class TMutex = FastMutex>
+class PriorityEvent: public AbstractEvent <
 	TArgs,
 	PriorityStrategy<TArgs, AbstractPriorityDelegate<TArgs> >,
 	AbstractPriorityDelegate<TArgs>,
 	TMutex
 >
-	/// A PriorityEvent uses internally a PriorityStrategy which 
+	/// A PriorityEvent uses internally a PriorityStrategy which
 	/// invokes delegates in order of priority (lower priorities first).
 	/// PriorityEvent's can only be used together with PriorityDelegate's.
 	/// PriorityDelegate's are sorted according to the priority value, when
diff --git a/Foundation/include/Poco/PriorityExpire.h b/Foundation/include/Poco/PriorityExpire.h
index 9491445f0..d9fc5a4fa 100644
--- a/Foundation/include/Poco/PriorityExpire.h
+++ b/Foundation/include/Poco/PriorityExpire.h
@@ -28,17 +28,17 @@ namespace Poco {
 
 template <class TArgs>
 class PriorityExpire: public AbstractPriorityDelegate<TArgs>
-	/// Decorator for AbstractPriorityDelegate adding automatic 
+	/// Decorator for AbstractPriorityDelegate adding automatic
 	/// expiring of registrations to AbstractPriorityDelegate.
 {
 public:
 	PriorityExpire(const AbstractPriorityDelegate<TArgs>& p, Timestamp::TimeDiff expireMilliSec):
 		AbstractPriorityDelegate<TArgs>(p),
-		_pDelegate(static_cast<AbstractPriorityDelegate<TArgs>*>(p.clone())), 
+		_pDelegate(static_cast<AbstractPriorityDelegate<TArgs>*>(p.clone())),
 		_expire(expireMilliSec*1000)
 	{
 	}
-	
+
 	PriorityExpire(const PriorityExpire& expire):
 		AbstractPriorityDelegate<TArgs>(expire),
 		_pDelegate(static_cast<AbstractPriorityDelegate<TArgs>*>(expire._pDelegate->clone())),
@@ -51,7 +51,7 @@ public:
 	{
 		delete _pDelegate;
 	}
-	
+
 	PriorityExpire& operator = (const PriorityExpire& expire)
 	{
 		if (&expire != this)
@@ -62,7 +62,7 @@ public:
 			this->_expire       = expire._expire;
 			this->_creationTime = expire._creationTime;
 		}
-		return *this; 
+		return *this;
 	}
 
 	bool notify(const void* sender, TArgs& arguments)
diff --git a/Foundation/include/Poco/PriorityNotificationQueue.h b/Foundation/include/Poco/PriorityNotificationQueue.h
index e5269ab85..d11317465 100644
--- a/Foundation/include/Poco/PriorityNotificationQueue.h
+++ b/Foundation/include/Poco/PriorityNotificationQueue.h
@@ -35,19 +35,19 @@ class NotificationCenter;
 class Foundation_API PriorityNotificationQueue
 	/// A PriorityNotificationQueue object provides a way to implement asynchronous
 	/// notifications. This is especially useful for sending notifications
-	/// from one thread to another, for example from a background thread to 
-	/// the main (user interface) thread. 
+	/// from one thread to another, for example from a background thread to
+	/// the main (user interface) thread.
 	///
 	/// The PriorityNotificationQueue is quite similar to the NotificationQueue class.
 	/// The only difference to NotificationQueue is that each Notification is tagged
 	/// with a priority value. When inserting a Notification into the queue, the
-	/// Notification is inserted according to the given priority value, with 
+	/// Notification is inserted according to the given priority value, with
 	/// lower priority values being inserted before higher priority
 	/// values. Therefore, the lower the numerical priority value, the higher
-	/// the actual notification priority. 
+	/// the actual notification priority.
 	///
 	/// Notifications are dequeued in order of their priority.
-	/// 
+	///
 	/// The PriorityNotificationQueue can also be used to distribute work from
 	/// a controlling thread to one or more worker threads. Each worker thread
 	/// repeatedly calls waitDequeueNotification() and processes the
@@ -74,7 +74,7 @@ public:
 		/// a call like
 		///     notificationQueue.enqueueNotification(new MyNotification, 1);
 		/// does not result in a memory leak.
-		
+
 	Notification* dequeueNotification();
 		/// Dequeues the next pending notification.
 		/// Returns 0 (null) if no notification is available.
@@ -88,7 +88,7 @@ public:
 	Notification* waitDequeueNotification();
 		/// Dequeues the next pending notification.
 		/// If no notification is available, waits for a notification
-		/// to be enqueued. 
+		/// to be enqueued.
 		/// The caller gains ownership of the notification and
 		/// is expected to release it when done with it.
 		/// This method returns 0 (null) if wakeUpAll()
@@ -116,27 +116,27 @@ public:
 
 	void wakeUpAll();
 		/// Wakes up all threads that wait for a notification.
-	
+
 	bool empty() const;
 		/// Returns true iff the queue is empty.
-		
+
 	int size() const;
 		/// Returns the number of notifications in the queue.
 
 	void clear();
 		/// Removes all notifications from the queue.
-		
-	bool hasIdleThreads() const;	
-		/// Returns true if the queue has at least one thread waiting 
+
+	bool hasIdleThreads() const;
+		/// Returns true if the queue has at least one thread waiting
 		/// for a notification.
-		
+
 	static PriorityNotificationQueue& defaultQueue();
 		/// Returns a reference to the default
 		/// PriorityNotificationQueue.
 
 protected:
 	Notification::Ptr dequeueOne();
-	
+
 private:
 	typedef std::multimap<int, Notification::Ptr> NfQueue;
 	struct WaitInfo
diff --git a/Foundation/include/Poco/PriorityStrategy.h b/Foundation/include/Poco/PriorityStrategy.h
index 418e5c04d..db031e4e3 100644
--- a/Foundation/include/Poco/PriorityStrategy.h
+++ b/Foundation/include/Poco/PriorityStrategy.h
@@ -26,7 +26,7 @@
 namespace Poco {
 
 
-template <class TArgs, class TDelegate> 
+template <class TArgs, class TDelegate>
 class PriorityStrategy: public NotificationStrategy<TArgs, TDelegate>
 	/// NotificationStrategy for PriorityEvent.
 	///
diff --git a/Foundation/include/Poco/PurgeStrategy.h b/Foundation/include/Poco/PurgeStrategy.h
index c7ef96b48..216f47b0b 100644
--- a/Foundation/include/Poco/PurgeStrategy.h
+++ b/Foundation/include/Poco/PurgeStrategy.h
@@ -39,7 +39,7 @@ public:
 		/// Purges archived log files. The path to the
 		/// current "hot" log file is given.
 		/// To find archived log files, look for files
-		/// with a name consisting of the given path 
+		/// with a name consisting of the given path
 		/// plus any suffix (e.g., .1, .20050929081500, .1.gz).
 		/// A list of archived files can be obtained by calling
 		/// the list() method.
@@ -67,9 +67,9 @@ class Foundation_API PurgeByAgeStrategy: public PurgeStrategy
 public:
 	PurgeByAgeStrategy(const Timespan& age);
 	~PurgeByAgeStrategy();
-	
+
 	void purge(const std::string& path);
-	
+
 private:
 	Timespan _age;
 };
@@ -83,9 +83,9 @@ class Foundation_API PurgeByCountStrategy: public PurgeStrategy
 public:
 	PurgeByCountStrategy(int count);
 	~PurgeByCountStrategy();
-	
+
 	void purge(const std::string& path);
-	
+
 private:
 	int _count;
 };
diff --git a/Foundation/include/Poco/RWLock.h b/Foundation/include/Poco/RWLock.h
index b8cbe9937..60ce8bf9c 100644
--- a/Foundation/include/Poco/RWLock.h
+++ b/Foundation/include/Poco/RWLock.h
@@ -56,10 +56,10 @@ public:
 
 	RWLock();
 		/// Creates the Reader/Writer lock.
-		
+
 	~RWLock();
 		/// Destroys the Reader/Writer lock.
-	
+
 	void readLock();
 		/// Acquires a read lock. If another thread currently holds a write lock,
 		/// waits until the write lock is released.
@@ -69,13 +69,13 @@ public:
 		/// false if another thread currently holds a write lock.
 
 	void writeLock();
-		/// Acquires a write lock. If one or more other threads currently hold 
+		/// Acquires a write lock. If one or more other threads currently hold
 		/// locks, waits until all locks are released. The results are undefined
 		/// if the same thread already holds a read or write lock
 
 	bool tryWriteLock();
 		/// Tries to acquire a write lock. Immediately returns true if successful,
-		/// or false if one or more other threads currently hold 
+		/// or false if one or more other threads currently hold
 		/// locks. The result is undefined if the same thread already
 		/// holds a read or write lock.
 
diff --git a/Foundation/include/Poco/RWLock_Android.h b/Foundation/include/Poco/RWLock_Android.h
index c6dfc4e5b..b95aa8422 100644
--- a/Foundation/include/Poco/RWLock_Android.h
+++ b/Foundation/include/Poco/RWLock_Android.h
@@ -37,7 +37,7 @@ protected:
 	void writeLockImpl();
 	bool tryWriteLockImpl();
 	void unlockImpl();
-	
+
 private:
 	pthread_mutex_t _mutex;
 };
@@ -48,7 +48,7 @@ private:
 //
 inline void RWLockImpl::readLockImpl()
 {
-	if (pthread_mutex_lock(&_mutex)) 
+	if (pthread_mutex_lock(&_mutex))
 		throw SystemException("cannot lock reader/writer lock");
 }
 
@@ -67,7 +67,7 @@ inline bool RWLockImpl::tryReadLockImpl()
 
 inline void RWLockImpl::writeLockImpl()
 {
-	if (pthread_mutex_lock(&_mutex)) 
+	if (pthread_mutex_lock(&_mutex))
 		throw SystemException("cannot lock reader/writer lock");
 }
 
diff --git a/Foundation/include/Poco/RWLock_POSIX.h b/Foundation/include/Poco/RWLock_POSIX.h
index be4d11beb..0b50fd30f 100644
--- a/Foundation/include/Poco/RWLock_POSIX.h
+++ b/Foundation/include/Poco/RWLock_POSIX.h
@@ -37,7 +37,7 @@ protected:
 	void writeLockImpl();
 	bool tryWriteLockImpl();
 	void unlockImpl();
-	
+
 private:
 	pthread_rwlock_t _rwl;
 };
@@ -48,7 +48,7 @@ private:
 //
 inline void RWLockImpl::readLockImpl()
 {
-	if (pthread_rwlock_rdlock(&_rwl)) 
+	if (pthread_rwlock_rdlock(&_rwl))
 		throw SystemException("cannot lock reader/writer lock");
 }
 
@@ -68,7 +68,7 @@ inline bool RWLockImpl::tryReadLockImpl()
 
 inline void RWLockImpl::writeLockImpl()
 {
-	if (pthread_rwlock_wrlock(&_rwl)) 
+	if (pthread_rwlock_wrlock(&_rwl))
 		throw SystemException("cannot lock reader/writer lock");
 }
 
diff --git a/Foundation/include/Poco/RWLock_VX.h b/Foundation/include/Poco/RWLock_VX.h
index bdc4af2fe..e5a18e052 100644
--- a/Foundation/include/Poco/RWLock_VX.h
+++ b/Foundation/include/Poco/RWLock_VX.h
@@ -37,7 +37,7 @@ protected:
 	void writeLockImpl();
 	bool tryWriteLockImpl();
 	void unlockImpl();
-	
+
 private:
 	pthread_mutex_t _mutex;
 };
@@ -48,7 +48,7 @@ private:
 //
 inline void RWLockImpl::readLockImpl()
 {
-	if (pthread_mutex_lock(&_mutex)) 
+	if (pthread_mutex_lock(&_mutex))
 		throw SystemException("cannot lock mutex");
 }
 
diff --git a/Foundation/include/Poco/RWLock_WIN32.h b/Foundation/include/Poco/RWLock_WIN32.h
index e50856e1b..0b7cb2b95 100644
--- a/Foundation/include/Poco/RWLock_WIN32.h
+++ b/Foundation/include/Poco/RWLock_WIN32.h
@@ -36,7 +36,7 @@ protected:
 	void writeLockImpl();
 	bool tryWriteLockImpl();
 	void unlockImpl();
-	
+
 private:
 	void addWriter();
 	void removeWriter();
diff --git a/Foundation/include/Poco/RWLock_WINCE.h b/Foundation/include/Poco/RWLock_WINCE.h
index d6c8314b2..13d080654 100644
--- a/Foundation/include/Poco/RWLock_WINCE.h
+++ b/Foundation/include/Poco/RWLock_WINCE.h
@@ -42,7 +42,7 @@ protected:
 	void writeLockImpl();
 	bool tryWriteLockImpl(DWORD timeout = 1);
 	void unlockImpl();
-	
+
 private:
 	DWORD _readerCount;
 	DWORD _readerWaiting;
diff --git a/Foundation/include/Poco/RefCountedObject.h b/Foundation/include/Poco/RefCountedObject.h
index 55ea76a16..66d4ac6f2 100644
--- a/Foundation/include/Poco/RefCountedObject.h
+++ b/Foundation/include/Poco/RefCountedObject.h
@@ -39,12 +39,12 @@ public:
 
 	void duplicate() const;
 		/// Increments the object's reference count.
-		
+
 	void release() const noexcept;
 		/// Decrements the object's reference count
 		/// and deletes the object if the count
 		/// reaches zero.
-		
+
 	int referenceCount() const;
 		/// Returns the reference count.
 
diff --git a/Foundation/include/Poco/RegularExpression.h b/Foundation/include/Poco/RegularExpression.h
index edc9731e3..6597a249f 100644
--- a/Foundation/include/Poco/RegularExpression.h
+++ b/Foundation/include/Poco/RegularExpression.h
@@ -31,12 +31,12 @@ namespace Poco {
 
 class Foundation_API RegularExpression
 	/// A class for working with regular expressions.
-	/// Implemented using PCRE, the Perl Compatible
+	/// Implemented using PCRE2, the Perl Compatible
 	/// Regular Expressions library by Philip Hazel
 	/// (see http://www.pcre.org).
 {
 public:
-	enum Options // These must match the corresponding options in pcre.h!
+	enum Options
 		/// Some of the following options can only be passed to the constructor;
 		/// some can be passed only to matching functions, and some can be used
 		/// everywhere.
@@ -64,7 +64,7 @@ public:
 		RE_FIRSTLINE       = 0x00040000, /// an  unanchored  pattern  is  required  to  match
 		                                 /// before  or  at  the  first  newline  in  the subject string,
 		                                 /// though the matched text may continue over the newline [ctor]
-		RE_DUPNAMES        = 0x00080000, /// names used to identify capturing  subpatterns  need not be unique [ctor]
+		RE_DUPNAMES        = 0x00080000, /// names used to identify capturing  subpatterns need not be unique [ctor]
 		RE_NEWLINE_CR      = 0x00100000, /// assume newline is CR ('\r'), the default [ctor]
 		RE_NEWLINE_LF      = 0x00200000, /// assume newline is LF ('\n') [ctor]
 		RE_NEWLINE_CRLF    = 0x00300000, /// assume newline is CRLF ("\r\n") [ctor]
@@ -85,8 +85,8 @@ public:
 
 	RegularExpression(const std::string& pattern, int options = 0, bool study = true);
 		/// Creates a regular expression and parses the given pattern.
-		/// If study is true, the pattern is analyzed and optimized. This
-		/// is mainly useful if the pattern is used more than once.
+		/// Note: the study argument is only provided for backwards compatibility
+		/// and is ignored since POCO release 1.12, which uses PCRE2.
 		/// For a description of the options, please see the PCRE documentation.
 		/// Throws a RegularExpressionException if the patter cannot be compiled.
 
@@ -196,17 +196,16 @@ public:
 
 protected:
 	std::string::size_type substOne(std::string& subject, std::string::size_type offset, const std::string& replacement, int options) const;
+	static int compileOptions(int options);
+	static int matchOptions(int options);
 
 private:
-	// Note: to avoid a dependency on the pcre.h header the following are
+	// Note: to avoid a dependency on the pcre2.h header the following are
 	// declared as void* and casted to the correct type in the implementation file.
-	void* _pcre;  // Actual type is pcre*
-	void* _extra; // Actual type is struct pcre_extra*
+	void* _pcre;  // Actual type is pcre2_code_8*
 
 	GroupMap _groups;
 
-	static const int OVEC_SIZE;
-
 	RegularExpression();
 	RegularExpression(const RegularExpression&);
 	RegularExpression& operator = (const RegularExpression&);
diff --git a/Foundation/include/Poco/RotateStrategy.h b/Foundation/include/Poco/RotateStrategy.h
index 82c331f1f..1776fd0ee 100644
--- a/Foundation/include/Poco/RotateStrategy.h
+++ b/Foundation/include/Poco/RotateStrategy.h
@@ -42,7 +42,7 @@ public:
 	virtual bool mustRotate(LogFile* pFile) = 0;
 		/// Returns true if the given log file must
 		/// be rotated, false otherwise.
-		
+
 private:
 	RotateStrategy(const RotateStrategy&);
 	RotateStrategy& operator = (const RotateStrategy&);
@@ -55,14 +55,14 @@ class RotateAtTimeStrategy: public RotateStrategy
 {
 public:
 	RotateAtTimeStrategy(const std::string& rtime):
-		_day(-1), 
-		_hour(-1), 
+		_day(-1),
+		_hour(-1),
 		_minute(0)
 	{
-		if (rtime.empty()) 
+		if (rtime.empty())
 			throw InvalidArgumentException("Rotation time must be specified.");
 
-		if ((rtime.find(',') != rtime.npos) && (rtime.find(':') == rtime.npos)) 
+		if ((rtime.find(',') != rtime.npos) && (rtime.find(':') == rtime.npos))
 			throw InvalidArgumentException("Invalid rotation time specified.");
 
 		StringTokenizer timestr(rtime, ",:", StringTokenizer::TOK_TRIM | StringTokenizer::TOK_IGNORE_EMPTY);
@@ -87,11 +87,11 @@ public:
 		}
 		getNextRollover();
 	}
-	
+
 	~RotateAtTimeStrategy()
 	{
 	}
-	
+
 	bool mustRotate(LogFile* /*pFile*/)
 	{
 		if (DT() >= _threshold)
@@ -111,7 +111,7 @@ private:
 			_threshold += tsp;
 		}
 		while (!(_threshold.minute() == _minute &&
-		        (-1 == _hour || _threshold.hour() == _hour) && 
+		        (-1 == _hour || _threshold.hour() == _hour) &&
 		        (-1 == _day  || _threshold.dayOfWeek() == _day)));
 		// round to :00.0 seconds
 		_threshold.assign(_threshold.year(), _threshold.month(), _threshold.day(), _threshold.hour(), _threshold.minute());
@@ -125,7 +125,7 @@ private:
 
 
 class Foundation_API RotateByIntervalStrategy: public RotateStrategy
-	/// The file is rotated when the log file 
+	/// The file is rotated when the log file
 	/// exceeds a given age.
 	///
 	/// For this to work reliably across all platforms and file systems
diff --git a/Foundation/include/Poco/Runnable.h b/Foundation/include/Poco/Runnable.h
index c87a62817..8a08012f2 100644
--- a/Foundation/include/Poco/Runnable.h
+++ b/Foundation/include/Poco/Runnable.h
@@ -29,10 +29,10 @@ class Foundation_API Runnable
 	/// must be implemented by classes that provide
 	/// an entry point for a thread.
 {
-public:	
+public:
 	Runnable();
 	virtual ~Runnable();
-	
+
 	virtual void run() = 0;
 		/// Do whatever the thread needs to do. Must
 		/// be overridden by subclasses.
diff --git a/Foundation/include/Poco/RunnableAdapter.h b/Foundation/include/Poco/RunnableAdapter.h
index 571871be9..0fa16ef8b 100644
--- a/Foundation/include/Poco/RunnableAdapter.h
+++ b/Foundation/include/Poco/RunnableAdapter.h
@@ -39,11 +39,11 @@ class RunnableAdapter: public Runnable
 {
 public:
 	typedef void (C::*Callback)();
-	
+
 	RunnableAdapter(C& object, Callback method): _pObject(&object), _method(method)
 	{
 	}
-	
+
 	RunnableAdapter(const RunnableAdapter& ra): _pObject(ra._pObject), _method(ra._method)
 	{
 	}
@@ -63,7 +63,7 @@ public:
 	{
 		(_pObject->*_method)();
 	}
-	
+
 private:
 	RunnableAdapter();
 
diff --git a/Foundation/include/Poco/SHA1Engine.h b/Foundation/include/Poco/SHA1Engine.h
index 9aa2b45e3..6d9c07644 100644
--- a/Foundation/include/Poco/SHA1Engine.h
+++ b/Foundation/include/Poco/SHA1Engine.h
@@ -44,7 +44,7 @@ public:
 
 	SHA1Engine();
 	~SHA1Engine();
-		
+
 	std::size_t digestLength() const;
 	void reset();
 	const DigestEngine::Digest& digest();
diff --git a/Foundation/include/Poco/SHA2Engine.h b/Foundation/include/Poco/SHA2Engine.h
index 67417100c..c1de5cd50 100644
--- a/Foundation/include/Poco/SHA2Engine.h
+++ b/Foundation/include/Poco/SHA2Engine.h
@@ -38,10 +38,12 @@ class Foundation_API SHA2Engine: public DigestEngine
 public:
 	enum ALGORITHM
 	{
-		SHA_224 = 224,
-		SHA_256 = 256,
-		SHA_384 = 384,
-		SHA_512 = 512
+		SHA_224 = 1,
+		SHA_256,
+		SHA_384,
+		SHA_512,
+		SHA_512_224,
+		SHA_512_256
 	};
 
 	SHA2Engine(ALGORITHM algorithm = SHA_256);
diff --git a/Foundation/include/Poco/ScopedLock.h b/Foundation/include/Poco/ScopedLock.h
index 8415c3808..4b1f5ce71 100644
--- a/Foundation/include/Poco/ScopedLock.h
+++ b/Foundation/include/Poco/ScopedLock.h
@@ -37,12 +37,12 @@ public:
 	{
 		_mutex.lock();
 	}
-	
+
 	ScopedLock(M& mutex, long milliseconds): _mutex(mutex)
 	{
 		_mutex.lock(milliseconds);
 	}
-	
+
 	~ScopedLock()
 	{
 		try
@@ -79,12 +79,12 @@ public:
 	{
 		_pMutex->lock();
 	}
-	
+
 	ScopedLockWithUnlock(M& mutex, long milliseconds): _pMutex(&mutex)
 	{
 		_pMutex->lock(milliseconds);
 	}
-	
+
 	~ScopedLockWithUnlock()
 	{
 		try
@@ -96,7 +96,7 @@ public:
 			poco_unexpected();
 		}
 	}
-	
+
 	void unlock()
 	{
 		if (_pMutex)
diff --git a/Foundation/include/Poco/Semaphore.h b/Foundation/include/Poco/Semaphore.h
index 7c10c4afe..67b7dddc0 100644
--- a/Foundation/include/Poco/Semaphore.h
+++ b/Foundation/include/Poco/Semaphore.h
@@ -35,16 +35,16 @@ namespace Poco {
 
 
 class Foundation_API Semaphore: private SemaphoreImpl
-	/// A Semaphore is a synchronization object with the following 
+	/// A Semaphore is a synchronization object with the following
 	/// characteristics:
 	/// A semaphore has a value that is constrained to be a non-negative
-	/// integer and two atomic operations. The allowable operations are V 
-	/// (here called set()) and P (here called wait()). A V (set()) operation 
-	/// increases the value of the semaphore by one. 
-	/// A P (wait()) operation decreases the value of the semaphore by one, 
-	/// provided that can be done without violating the constraint that the 
-	/// value be non-negative. A P (wait()) operation that is initiated when 
-	/// the value of the semaphore is 0 suspends the calling thread. 
+	/// integer and two atomic operations. The allowable operations are V
+	/// (here called set()) and P (here called wait()). A V (set()) operation
+	/// increases the value of the semaphore by one.
+	/// A P (wait()) operation decreases the value of the semaphore by one,
+	/// provided that can be done without violating the constraint that the
+	/// value be non-negative. A P (wait()) operation that is initiated when
+	/// the value of the semaphore is 0 suspends the calling thread.
 	/// The calling thread may continue when the value becomes positive again.
 {
 public:
@@ -60,7 +60,7 @@ public:
 		/// greater than zero, n must be greater than
 		/// or equal to zero and less than or equal
 		/// to max.
-		
+
 	~Semaphore();
 		/// Destroys the semaphore.
 
@@ -73,7 +73,7 @@ public:
 	void wait();
 		/// Waits for the semaphore to become signalled.
 		/// To become signalled, a semaphore's value must
-		/// be greater than zero. 
+		/// be greater than zero.
 		/// Decrements the semaphore's value by one.
 
 	void wait(long milliseconds);
@@ -95,7 +95,7 @@ public:
 		/// time interval, false otherwise.
 		/// Decrements the semaphore's value by one
 		/// if successful.
-	
+
 private:
 	Semaphore();
 	Semaphore(const Semaphore&);
diff --git a/Foundation/include/Poco/Semaphore_POSIX.h b/Foundation/include/Poco/Semaphore_POSIX.h
index 3fc0897fa..841f0a702 100644
--- a/Foundation/include/Poco/Semaphore_POSIX.h
+++ b/Foundation/include/Poco/Semaphore_POSIX.h
@@ -30,12 +30,12 @@ namespace Poco {
 class Foundation_API SemaphoreImpl
 {
 protected:
-	SemaphoreImpl(int n, int max);		
+	SemaphoreImpl(int n, int max);
 	~SemaphoreImpl();
 	void setImpl();
 	void waitImpl();
 	bool waitImpl(long milliseconds);
-	
+
 private:
 	volatile int    _n;
 	int             _max;
@@ -49,7 +49,7 @@ private:
 //
 inline void SemaphoreImpl::setImpl()
 {
-	if (pthread_mutex_lock(&_mutex))	
+	if (pthread_mutex_lock(&_mutex))
 		throw SystemException("cannot signal semaphore (lock)");
 	if (_n < _max)
 	{
@@ -59,7 +59,7 @@ inline void SemaphoreImpl::setImpl()
 	{
 		pthread_mutex_unlock(&_mutex);
 		throw SystemException("cannot signal semaphore: count would exceed maximum");
-	}	
+	}
 	if (pthread_cond_signal(&_cond))
 	{
 		pthread_mutex_unlock(&_mutex);
diff --git a/Foundation/include/Poco/Semaphore_VX.h b/Foundation/include/Poco/Semaphore_VX.h
index 181afe2f5..2ec1dda65 100644
--- a/Foundation/include/Poco/Semaphore_VX.h
+++ b/Foundation/include/Poco/Semaphore_VX.h
@@ -29,12 +29,12 @@ namespace Poco {
 class Foundation_API SemaphoreImpl
 {
 protected:
-	SemaphoreImpl(int n, int max);		
+	SemaphoreImpl(int n, int max);
 	~SemaphoreImpl();
 	void setImpl();
 	void waitImpl();
 	bool waitImpl(long milliseconds);
-	
+
 private:
 	SEM_ID _sem;
 };
diff --git a/Foundation/include/Poco/Semaphore_WIN32.h b/Foundation/include/Poco/Semaphore_WIN32.h
index ac9c31356..97515c5b8 100644
--- a/Foundation/include/Poco/Semaphore_WIN32.h
+++ b/Foundation/include/Poco/Semaphore_WIN32.h
@@ -29,12 +29,12 @@ namespace Poco {
 class Foundation_API SemaphoreImpl
 {
 protected:
-	SemaphoreImpl(int n, int max);		
+	SemaphoreImpl(int n, int max);
 	~SemaphoreImpl();
 	void setImpl();
 	void waitImpl();
 	bool waitImpl(long milliseconds);
-	
+
 private:
 	HANDLE _sema;
 };
diff --git a/Foundation/include/Poco/SharedLibrary.h b/Foundation/include/Poco/SharedLibrary.h
index b7e6acc7c..008da32fd 100644
--- a/Foundation/include/Poco/SharedLibrary.h
+++ b/Foundation/include/Poco/SharedLibrary.h
@@ -27,7 +27,7 @@
 #include "Poco/SharedLibrary_VX.h"
 #elif defined(POCO_OS_FAMILY_UNIX)
 #include "Poco/SharedLibrary_UNIX.h"
-#elif defined(POCO_OS_FAMILY_WINDOWS) 
+#elif defined(POCO_OS_FAMILY_WINDOWS)
 #include "Poco/SharedLibrary_WIN32U.h"
 #endif
 
diff --git a/Foundation/include/Poco/SharedMemory.h b/Foundation/include/Poco/SharedMemory.h
index 233856787..e0bc1614b 100644
--- a/Foundation/include/Poco/SharedMemory.h
+++ b/Foundation/include/Poco/SharedMemory.h
@@ -46,7 +46,7 @@ public:
 	};
 
 	SharedMemory();
-		/// Default constructor creates an unmapped SharedMemory object. 
+		/// Default constructor creates an unmapped SharedMemory object.
 		/// No clients can connect to an unmapped SharedMemory object.
 
 	SharedMemory(const std::string& name, std::size_t size, AccessMode mode, const void* addrHint = 0, bool server = true);
@@ -81,7 +81,7 @@ public:
 	SharedMemory& operator = (const SharedMemory& other);
 		/// Assigns another SharedMemory object.
 
-	void swap(SharedMemory& other);
+	void swap(SharedMemory& other) noexcept;
 		/// Swaps the SharedMemory object with another one.
 
 	char* begin() const;
@@ -89,7 +89,7 @@ public:
 		/// Will be NULL for illegal segments.
 
 	char* end() const;
-		/// Returns the one-past-end end address of the shared memory segment. 
+		/// Returns the one-past-end end address of the shared memory segment.
 		/// Will be NULL for illegal segments.
 
 private:
@@ -100,7 +100,7 @@ private:
 //
 // inlines
 //
-inline void SharedMemory::swap(SharedMemory& other)
+inline void SharedMemory::swap(SharedMemory& other) noexcept
 {
 	using std::swap;
 	swap(_pImpl, other._pImpl);
diff --git a/Foundation/include/Poco/SharedMemory_DUMMY.h b/Foundation/include/Poco/SharedMemory_DUMMY.h
index 5a487a0f7..6b740f709 100644
--- a/Foundation/include/Poco/SharedMemory_DUMMY.h
+++ b/Foundation/include/Poco/SharedMemory_DUMMY.h
@@ -54,7 +54,7 @@ public:
 		/// Returns the start address of the shared memory segment.
 
 	char* end() const;
-		/// Returns the one-past-end end address of the shared memory segment. 
+		/// Returns the one-past-end end address of the shared memory segment.
 
 protected:
 	~SharedMemoryImpl();
diff --git a/Foundation/include/Poco/SharedMemory_POSIX.h b/Foundation/include/Poco/SharedMemory_POSIX.h
index 4ba6ab5e8..8b7f34e65 100644
--- a/Foundation/include/Poco/SharedMemory_POSIX.h
+++ b/Foundation/include/Poco/SharedMemory_POSIX.h
@@ -56,7 +56,7 @@ public:
 		/// Returns the start address of the shared memory segment.
 
 	char* end() const;
-		/// Returns the one-past-end end address of the shared memory segment. 
+		/// Returns the one-past-end end address of the shared memory segment.
 
 protected:
 	void map(const void* addrHint);
diff --git a/Foundation/include/Poco/SharedPtr.h b/Foundation/include/Poco/SharedPtr.h
index 30553f7b6..9a4fd69e6 100644
--- a/Foundation/include/Poco/SharedPtr.h
+++ b/Foundation/include/Poco/SharedPtr.h
@@ -239,7 +239,7 @@ public:
 		return assign<Other>(ptr);
 	}
 
-	void swap(SharedPtr& ptr)
+	void swap(SharedPtr& ptr) noexcept
 	{
 		std::swap(_ptr, ptr._ptr);
 		std::swap(_pCounter, ptr._pCounter);
diff --git a/Foundation/include/Poco/SignalHandler.h b/Foundation/include/Poco/SignalHandler.h
index 22b5f1673..471d7a7f0 100644
--- a/Foundation/include/Poco/SignalHandler.h
+++ b/Foundation/include/Poco/SignalHandler.h
@@ -36,7 +36,7 @@ class Foundation_API SignalHandler
 	///
 	/// The class provides a signal handler (installed with
 	/// installHandlers()) that translates certain POSIX
-	/// signals (SIGILL, SIGBUS, SIGSEGV, SIGSYS) into 
+	/// signals (SIGILL, SIGBUS, SIGSEGV, SIGSYS) into
 	/// C++ exceptions.
 	///
 	/// Internally, a stack of sigjmp_buf structs is maintained for
@@ -81,9 +81,9 @@ public:
 		/// Returns the top-most sigjmp_buf for the current thread.
 
 	static void throwSignalException(int sig);
-		/// Throws a SignalException with a textual description  
-		/// of the given signal as argument. 
-	
+		/// Throws a SignalException with a textual description
+		/// of the given signal as argument.
+
 	static void install();
 		/// Installs signal handlers for SIGILL, SIGBUS, SIGSEGV
 		/// and SIGSYS.
@@ -105,7 +105,7 @@ protected:
 
 private:
 	static JumpBufferVec _jumpBufferVec;
-	
+
 	friend class ThreadImpl;
 };
 
diff --git a/Foundation/include/Poco/SimpleFileChannel.h b/Foundation/include/Poco/SimpleFileChannel.h
index 844cacc51..0e03178d8 100644
--- a/Foundation/include/Poco/SimpleFileChannel.h
+++ b/Foundation/include/Poco/SimpleFileChannel.h
@@ -40,15 +40,15 @@ class Foundation_API SimpleFileChannel: public Channel
 	/// by a newline.
 	///
 	/// Chain this channel to a FormattingChannel with an
-	/// appropriate Formatter to control what is in the text. 
+	/// appropriate Formatter to control what is in the text.
 	///
 	/// Log file rotation based on log file size is supported.
 	///
-	/// If rotation is enabled, the SimpleFileChannel will 
+	/// If rotation is enabled, the SimpleFileChannel will
 	/// alternate between two log files. If the size of
 	/// the primary log file exceeds a specified limit,
 	/// the secondary log file will be used, and vice
-	/// versa. 
+	/// versa.
 	///
 	/// Log rotation is configured with the "rotation"
 	/// property, which supports the following values:
@@ -88,20 +88,20 @@ public:
 
 	void open();
 		/// Opens the FileChannel and creates the log file if necessary.
-		
+
 	void close();
 		/// Closes the FileChannel.
 
 	void log(const Message& msg);
 		/// Logs the given message to the file.
-		
+
 	void setProperty(const std::string& name, const std::string& value);
-		/// Sets the property with the given name. 
-		/// 
+		/// Sets the property with the given name.
+		///
 		/// The following properties are supported:
 		///   * path:          The primary log file's path.
 		///   * secondaryPath: The secondary log file's path.
-		///   * rotation:      The log file's rotation mode. See the 
+		///   * rotation:      The log file's rotation mode. See the
 		///                    SimpleFileChannel class for details.
 		///   * flush:         Specifies whether messages are immediately
 		///                    flushed to the log file. See the SimpleFileChannel
@@ -114,7 +114,7 @@ public:
 
 	Timestamp creationDate() const;
 		/// Returns the log file's creation date.
-		
+
 	UInt64 size() const;
 		/// Returns the log file's current size in bytes.
 
diff --git a/Foundation/include/Poco/SimpleHashTable.h b/Foundation/include/Poco/SimpleHashTable.h
index cc2e92fb3..ef8b7d634 100644
--- a/Foundation/include/Poco/SimpleHashTable.h
+++ b/Foundation/include/Poco/SimpleHashTable.h
@@ -68,7 +68,7 @@ public:
 		_entries.reserve(ht._capacity);
 		for (auto p: ht._entries.end())
 		{
-			if (p) 
+			if (p)
 				_entries.push_back(new HashEntry(p));
 			else
 				_entries.push_back(0);
@@ -90,8 +90,8 @@ public:
 		}
 		return *this;
 	}
-	
-	void swap(SimpleHashTable& ht)
+
+	void swap(SimpleHashTable& ht) noexcept
 	{
 		using std::swap;
 		swap(_entries, ht._entries);
@@ -216,12 +216,12 @@ public:
 		UInt32 hsh = hash(key);
 		return const_cast<Value&>(getRaw(key, hsh));
 	}
-	
+
 	const Value& operator [] (const Key& key) const
 	{
 		return get(key);
 	}
-	
+
 	Value& operator [] (const Key& key)
 	{
 		UInt32 hsh = hash(key);
@@ -326,7 +326,7 @@ public:
 	{
 		return _size;
 	}
-	
+
 	UInt32 capacity() const
 	{
 		return _capacity;
diff --git a/Foundation/include/Poco/SingletonHolder.h b/Foundation/include/Poco/SingletonHolder.h
index 8735f114b..3f0b997b5 100644
--- a/Foundation/include/Poco/SingletonHolder.h
+++ b/Foundation/include/Poco/SingletonHolder.h
@@ -39,14 +39,14 @@ public:
 		/// Creates the SingletonHolder.
 	{
 	}
-	
+
 	~SingletonHolder()
 		/// Destroys the SingletonHolder and the singleton
 		/// object that it holds.
 	{
 		delete _pS;
 	}
-	
+
 	S* get()
 		/// Returns a pointer to the singleton object
 		/// hold by the SingletonHolder. The first call
@@ -56,7 +56,7 @@ public:
 		if (!_pS) _pS = new S;
 		return _pS;
 	}
-	
+
 	void reset()
 		/// Deletes the singleton object.
 	{
@@ -64,7 +64,7 @@ public:
 		delete _pS;
 		_pS = 0;
 	}
-	
+
 private:
 	S* _pS;
 	FastMutex _m;
diff --git a/Foundation/include/Poco/SplitterChannel.h b/Foundation/include/Poco/SplitterChannel.h
index 6f48eab3e..cdac8f578 100644
--- a/Foundation/include/Poco/SplitterChannel.h
+++ b/Foundation/include/Poco/SplitterChannel.h
@@ -40,13 +40,13 @@ public:
 
 	void addChannel(Channel::Ptr pChannel);
 		/// Attaches a channel, which may not be null.
-		
+
 	void removeChannel(Channel::Ptr pChannel);
 		/// Removes a channel.
 
 	void log(const Message& msg);
 		/// Sends the given Message to all
-		/// attaches channels. 
+		/// attaches channels.
 
 	void setProperty(const std::string& name, const std::string& value);
 		/// Sets or changes a configuration property.
@@ -59,7 +59,7 @@ public:
 
 	void close();
 		/// Removes all channels.
-		
+
 	int count() const;
 		/// Returns the number of channels in the SplitterChannel.
 
@@ -68,7 +68,7 @@ protected:
 
 private:
 	typedef std::vector<Channel::Ptr> ChannelVec;
-	
+
 	ChannelVec        _channels;
 	mutable FastMutex _mutex;
 };
diff --git a/Foundation/include/Poco/Stopwatch.h b/Foundation/include/Poco/Stopwatch.h
index 6bc27fc92..add8e4c8b 100644
--- a/Foundation/include/Poco/Stopwatch.h
+++ b/Foundation/include/Poco/Stopwatch.h
@@ -35,20 +35,20 @@ public:
 
 	void start();
 		/// Starts (or restarts) the stopwatch.
-		
+
 	void stop();
 		/// Stops or pauses the stopwatch.
-	
+
 	void reset();
 		/// Resets the stopwatch.
-		
+
 	void restart();
 		/// Resets and starts the stopwatch.
-		
+
 	Clock::ClockDiff elapsed() const;
 		/// Returns the elapsed time in microseconds
 		/// since the stopwatch started.
-		
+
 	int elapsedSeconds() const;
 		/// Returns the number of seconds elapsed
 		/// since the stopwatch started.
diff --git a/Foundation/include/Poco/StrategyCollection.h b/Foundation/include/Poco/StrategyCollection.h
index 7994f5417..b67370ddc 100644
--- a/Foundation/include/Poco/StrategyCollection.h
+++ b/Foundation/include/Poco/StrategyCollection.h
@@ -28,7 +28,7 @@
 namespace Poco {
 
 
-template <class TKey, class TValue> 
+template <class TKey, class TValue>
 class StrategyCollection: public AbstractStrategy<TKey, TValue>
 	/// An StrategyCollection is a decorator masking n collections as a single one.
 {
diff --git a/Foundation/include/Poco/StreamChannel.h b/Foundation/include/Poco/StreamChannel.h
index 27ed0c7db..ab8ae57f0 100644
--- a/Foundation/include/Poco/StreamChannel.h
+++ b/Foundation/include/Poco/StreamChannel.h
@@ -34,7 +34,7 @@ class Foundation_API StreamChannel: public Channel
 	/// by a newline.
 	///
 	/// Chain this channel to a FormattingChannel with an
-	/// appropriate Formatter to control what is contained 
+	/// appropriate Formatter to control what is contained
 	/// in the text.
 {
 public:
@@ -45,7 +45,7 @@ public:
 
 	void log(const Message& msg);
 		/// Logs the given message to the channel's stream.
-		
+
 protected:
 	virtual ~StreamChannel();
 
diff --git a/Foundation/include/Poco/StreamConverter.h b/Foundation/include/Poco/StreamConverter.h
index c880e2632..99701aadb 100644
--- a/Foundation/include/Poco/StreamConverter.h
+++ b/Foundation/include/Poco/StreamConverter.h
@@ -91,7 +91,7 @@ class Foundation_API InputStreamConverter: public StreamConverterIOS, public std
 	/// underlying istream from one character encoding into another.
 	/// If a character cannot be represented in outEncoding, defaultChar
 	/// is used instead.
-	/// If a byte sequence read from the underlying stream is not valid in inEncoding, 
+	/// If a byte sequence read from the underlying stream is not valid in inEncoding,
 	/// defaultChar is used instead and the encoding error count is incremented.
 {
 public:
@@ -109,7 +109,7 @@ class Foundation_API OutputStreamConverter: public StreamConverterIOS, public st
 	/// underlying ostream from one character encoding into another.
 	/// If a character cannot be represented in outEncoding, defaultChar
 	/// is used instead.
-	/// If a byte sequence written to the stream is not valid in inEncoding, 
+	/// If a byte sequence written to the stream is not valid in inEncoding,
 	/// defaultChar is used instead and the encoding error count is incremented.
 {
 public:
diff --git a/Foundation/include/Poco/StreamTokenizer.h b/Foundation/include/Poco/StreamTokenizer.h
index 3c5b69641..2b5ad5c13 100644
--- a/Foundation/include/Poco/StreamTokenizer.h
+++ b/Foundation/include/Poco/StreamTokenizer.h
@@ -54,7 +54,7 @@ public:
 		/// and whitespace tokens will be marked as
 		/// ignorable, which means that next() will not
 		/// return them.
-	
+
 	void addToken(Token* pToken, bool ignore);
 		/// Adds a token class to the tokenizer. The
 		/// tokenizer takes ownership of the token and
@@ -62,11 +62,11 @@ public:
 		/// If ignore is true, the token will be marked
 		/// as ignorable, which means that next() will
 		/// not return it.
-		
+
 	const Token* next();
 		/// Extracts the next token from the input stream.
 		/// Returns a pointer to an EOFToken if there are
-		/// no more characters to read. 
+		/// no more characters to read.
 		/// Returns a pointer to an InvalidToken if an
 		/// invalid character is encountered.
 		/// If a token is marked as ignorable, it will not
@@ -81,9 +81,9 @@ private:
 		Token* pToken;
 		bool   ignore;
 	};
-	
+
 	typedef std::vector<TokenInfo> TokenVec;
-	
+
 	TokenVec      _tokens;
 	std::istream* _pIstr;
 	InvalidToken  _invalidToken;
diff --git a/Foundation/include/Poco/StringTokenizer.h b/Foundation/include/Poco/StringTokenizer.h
index 0690fb720..a3c625889 100644
--- a/Foundation/include/Poco/StringTokenizer.h
+++ b/Foundation/include/Poco/StringTokenizer.h
@@ -38,10 +38,10 @@ public:
 		TOK_IGNORE_EMPTY = 1, /// ignore empty tokens
 		TOK_TRIM         = 2  /// remove leading and trailing whitespace from tokens
 	};
-	
+
 	typedef std::vector<std::string> TokenVec;
 	typedef TokenVec::const_iterator Iterator;
-	
+
 	StringTokenizer(const std::string& str, const std::string& separators, int options = 0);
 		/// Splits the given string into tokens. The tokens are expected to be
 		/// separated by one of the separator characters given in separators.
@@ -51,10 +51,10 @@ public:
 
 	~StringTokenizer();
 		/// Destroys the tokenizer.
-	
+
 	Iterator begin() const;
 	Iterator end() const;
-	
+
 	const std::string& operator [] (std::size_t index) const;
 		/// Returns const reference the index'th token.
 		/// Throws a RangeException if the index is out of range.
@@ -72,10 +72,10 @@ public:
 		/// Throws a NotFoundException if the token is not found.
 
 	std::size_t replace(const std::string& oldToken, const std::string& newToken, std::string::size_type pos = 0);
-		/// Starting at position pos, replaces all subsequent tokens having value 
+		/// Starting at position pos, replaces all subsequent tokens having value
 		/// equal to oldToken with newToken.
 		/// Returns the number of modified tokens.
-		
+
 	std::size_t count() const;
 		/// Returns the total number of tokens.
 
diff --git a/Foundation/include/Poco/SynchronizedObject.h b/Foundation/include/Poco/SynchronizedObject.h
index a2cfd96fb..a201f7c86 100644
--- a/Foundation/include/Poco/SynchronizedObject.h
+++ b/Foundation/include/Poco/SynchronizedObject.h
@@ -34,10 +34,10 @@ class Foundation_API SynchronizedObject
 {
 public:
 	using ScopedLock = Poco::ScopedLock<SynchronizedObject>;
-	
+
 	SynchronizedObject();
 		/// Creates the object.
-		
+
 	virtual ~SynchronizedObject();
 		/// Destroys the object.
 
@@ -49,14 +49,14 @@ public:
 		/// Tries to lock the object. Returns false immediately
 		/// if the object is already locked by another thread
 		/// Returns true if the object was successfully locked.
-	
+
 	void unlock() const;
 		/// Unlocks the object so that it can be locked by
 		/// other threads.
-		
+
 	void notify() const;
-		/// Signals the object. 
-		/// Exactly only one thread waiting for the object 
+		/// Signals the object.
+		/// Exactly only one thread waiting for the object
 		/// can resume execution.
 
 	void wait() const;
diff --git a/Foundation/include/Poco/SyslogChannel.h b/Foundation/include/Poco/SyslogChannel.h
index 843d4ce98..2b3e398b7 100644
--- a/Foundation/include/Poco/SyslogChannel.h
+++ b/Foundation/include/Poco/SyslogChannel.h
@@ -38,7 +38,7 @@ public:
 		SYSLOG_NDELAY = 0x08, /// don't delay open
 		SYSLOG_PERROR = 0x20  /// log to stderr as well (not supported on all platforms)
 	};
-	
+
 	enum Facility
 	{
 		SYSLOG_KERN     = ( 0<<3), /// kernel messages
@@ -62,22 +62,22 @@ public:
 		SYSLOG_LOCAL6   = (22<<3), /// reserved for local use
 		SYSLOG_LOCAL7   = (23<<3)  /// reserved for local use
 	};
-	
+
 	SyslogChannel();
 		/// Creates a SyslogChannel.
-		
+
 	SyslogChannel(const std::string& name, int options = SYSLOG_CONS, int facility = SYSLOG_USER);
 		/// Creates a SyslogChannel with the given name, options and facility.
-	
+
 	void open();
 		/// Opens the SyslogChannel.
-		
+
 	void close();
 		/// Closes the SyslogChannel.
-		
+
 	void log(const Message& msg);
 		/// Sens the message's text to the syslog service.
-		
+
 	void setProperty(const std::string& name, const std::string& value);
 		/// Sets the property with the given value.
 		///
@@ -85,7 +85,7 @@ public:
 		///     * name:     The name used to identify the source of log messages.
 		///     * facility: The facility added to each log message. See the Facility enumeration for a list of supported values.
 		///     * options:  The logging options. See the Option enumeration for a list of supported values.
-		
+
 	std::string getProperty(const std::string& name) const;
 		/// Returns the value of the property with the given name.
 
diff --git a/Foundation/include/Poco/Task.h b/Foundation/include/Poco/Task.h
index 6ae11d283..123c74ab3 100644
--- a/Foundation/include/Poco/Task.h
+++ b/Foundation/include/Poco/Task.h
@@ -34,7 +34,7 @@ class NotificationCenter;
 
 
 class Foundation_API Task: public Runnable, public RefCountedObject
-	/// A Task is a subclass of Runnable that has a name 
+	/// A Task is a subclass of Runnable that has a name
 	/// and supports progress reporting and cancellation.
 	///
 	/// A TaskManager object can be used to take care of the
@@ -49,13 +49,13 @@ public:
 		TASK_CANCELLING,
 		TASK_FINISHED
 	};
-	
+
 	Task(const std::string& name);
 		/// Creates the Task.
 
 	const std::string& name() const;
-		/// Returns the task's name.	
-		
+		/// Returns the task's name.
+
 	float progress() const;
 		/// Returns the task's progress.
 		/// The value will be between 0.0 (just started)
@@ -72,7 +72,7 @@ public:
 
 	bool isCancelled() const;
 		/// Returns true if cancellation of the task has been
-		/// requested. 
+		/// requested.
 		///
 		/// A Task's runTask() method should periodically
 		/// call this method and stop whatever it is doing in an
@@ -84,11 +84,11 @@ public:
 	void reset();
 		/// Sets the task's progress to zero and clears the
 		/// cancel flag.
-		
+
 	virtual void runTask() = 0;
 		/// Do whatever the task needs to do. Must
 		/// be overridden by subclasses.
-		
+
 	void run();
 		/// Calls the task's runTask() method and notifies the owner
 		/// of the task's start and completion.
@@ -130,7 +130,7 @@ protected:
 
 	void setOwner(TaskManager* pOwner);
 		/// Sets the (optional) owner of the task.
-		
+
 	TaskManager* getOwner() const;
 		/// Returns the owner of the task, which may be NULL.
 
@@ -139,19 +139,19 @@ protected:
 
 	virtual ~Task();
 		/// Destroys the Task.
-		
+
 private:
 	Task();
 	Task(const Task&);
 	Task& operator = (const Task&);
-	
+
 	std::string       _name;
 	TaskManager*      _pOwner;
 	float             _progress;
-	TaskState         _state;
+	std::atomic<TaskState> _state;
 	Event             _cancelEvent;
 	mutable FastMutex _mutex;
-	
+
 	friend class TaskManager;
 };
 
diff --git a/Foundation/include/Poco/TaskManager.h b/Foundation/include/Poco/TaskManager.h
index 0a4ff86f2..6b7cd2090 100644
--- a/Foundation/include/Poco/TaskManager.h
+++ b/Foundation/include/Poco/TaskManager.h
@@ -70,7 +70,7 @@ public:
 
 	void cancelAll();
 		/// Requests cancellation of all tasks.
-		
+
 	void joinAll();
 		/// Waits for the completion of all the threads
 		/// in the TaskManager's thread pool.
@@ -100,7 +100,7 @@ public:
 
 protected:
 	void postNotification(const Notification::Ptr& pNf);
-		/// Posts a notification to the task manager's 
+		/// Posts a notification to the task manager's
 		/// notification center.
 
 	void taskStarted(Task* pTask);
diff --git a/Foundation/include/Poco/TaskNotification.h b/Foundation/include/Poco/TaskNotification.h
index 88dab508d..120643fff 100644
--- a/Foundation/include/Poco/TaskNotification.h
+++ b/Foundation/include/Poco/TaskNotification.h
@@ -51,7 +51,7 @@ class Foundation_API TaskStartedNotification: public TaskNotification
 {
 public:
 	TaskStartedNotification(Task* pTask);
-	
+
 protected:
 	~TaskStartedNotification();
 };
@@ -92,7 +92,7 @@ public:
 
 protected:
 	~TaskFailedNotification();
-	
+
 private:
 	Exception* _pException;
 };
@@ -109,7 +109,7 @@ public:
 
 protected:
 	~TaskProgressNotification();
-	
+
 private:
 	float _progress;
 };
@@ -137,7 +137,7 @@ public:
 
 protected:
 	~TaskCustomNotification(){};
-	
+
 private:
 	C _custom;
 };
diff --git a/Foundation/include/Poco/TeeStream.h b/Foundation/include/Poco/TeeStream.h
index 07744d834..ad6f2940c 100644
--- a/Foundation/include/Poco/TeeStream.h
+++ b/Foundation/include/Poco/TeeStream.h
@@ -36,7 +36,7 @@ public:
 	TeeStreamBuf();
 		/// Creates an unconnected CountingStreamBuf.
 		/// Use addStream() to attach output streams.
-	
+
 	TeeStreamBuf(std::istream& istr);
 		/// Creates the CountingStreamBuf and connects it
 		/// to the given input stream.
@@ -57,7 +57,7 @@ protected:
 
 private:
 	typedef std::vector<std::ostream*> StreamVec;
-	
+
 	std::istream* _pIstr;
 	StreamVec     _streams;
 };
@@ -116,7 +116,7 @@ class Foundation_API TeeOutputStream: public TeeIOS, public std::ostream
 public:
 	TeeOutputStream();
 		/// Creates an unconnected TeeOutputStream.
-	
+
 	TeeOutputStream(std::ostream& ostr);
 		/// Creates the TeeOutputStream and connects it
 		/// to the given input stream.
diff --git a/Foundation/include/Poco/TextBufferIterator.h b/Foundation/include/Poco/TextBufferIterator.h
index d8eda8417..1d3956283 100644
--- a/Foundation/include/Poco/TextBufferIterator.h
+++ b/Foundation/include/Poco/TextBufferIterator.h
@@ -53,7 +53,7 @@ class Foundation_API TextBufferIterator
 public:
 	TextBufferIterator();
 		/// Creates an uninitialized TextBufferIterator.
-		
+
 	TextBufferIterator(const char* begin, const TextEncoding& encoding);
 		/// Creates a TextBufferIterator for the given buffer, which must be 0-terminated.
 		/// The encoding object must not be deleted as long as the iterator
@@ -74,37 +74,37 @@ public:
 
 	~TextBufferIterator();
 		/// Destroys the TextBufferIterator.
-	
+
 	TextBufferIterator(const TextBufferIterator& it);
 		/// Copy constructor.
-	
+
 	TextBufferIterator& operator = (const TextBufferIterator& it);
 		/// Assignment operator.
-		
-	void swap(TextBufferIterator& it);
+
+	void swap(TextBufferIterator& it) noexcept;
 		/// Swaps the iterator with another one.
-	
+
 	int operator * () const;
 		/// Returns the Unicode value of the current character.
 		/// If there is no valid character at the current position,
 		/// -1 is returned.
-		
-	TextBufferIterator& operator ++ (); 
+
+	TextBufferIterator& operator ++ ();
 		/// Prefix increment operator.
 
-	TextBufferIterator operator ++ (int);		
+	TextBufferIterator operator ++ (int);
 		/// Postfix increment operator.
 
 	bool operator == (const TextBufferIterator& it) const;
 		/// Compares two iterators for equality.
-		
+
 	bool operator != (const TextBufferIterator& it) const;
 		/// Compares two iterators for inequality.
 
 	TextBufferIterator end() const;
 		/// Returns the end iterator for the range handled
 		/// by the iterator.
-		
+
 private:
 	const TextEncoding* _pEncoding;
 	const char* _it;
@@ -127,7 +127,7 @@ inline bool TextBufferIterator::operator != (const TextBufferIterator& it) const
 }
 
 
-inline void swap(TextBufferIterator& it1, TextBufferIterator& it2)
+inline void swap(TextBufferIterator& it1, TextBufferIterator& it2) noexcept
 {
 	it1.swap(it2);
 }
diff --git a/Foundation/include/Poco/TextConverter.h b/Foundation/include/Poco/TextConverter.h
index ebf978fa6..88e2d3191 100644
--- a/Foundation/include/Poco/TextConverter.h
+++ b/Foundation/include/Poco/TextConverter.h
@@ -34,14 +34,14 @@ class Foundation_API TextConverter
 public:
 	typedef int (*Transform)(int);
 		/// Transform function for convert.
-		
+
 	TextConverter(const TextEncoding& inEncoding, const TextEncoding& outEncoding, int defaultChar = '?');
 		/// Creates the TextConverter. The encoding objects must not be deleted while the
 		/// TextConverter is in use.
 
 	~TextConverter();
 		/// Destroys the TextConverter.
-		
+
 	int convert(const std::string& source, std::string& destination, Transform trans);
 		/// Converts the source string from inEncoding to outEncoding
 		/// and appends the result to destination. Every character is
diff --git a/Foundation/include/Poco/TextIterator.h b/Foundation/include/Poco/TextIterator.h
index 17f48a4ab..f78fb868b 100644
--- a/Foundation/include/Poco/TextIterator.h
+++ b/Foundation/include/Poco/TextIterator.h
@@ -51,7 +51,7 @@ class Foundation_API TextIterator
 public:
 	TextIterator();
 		/// Creates an uninitialized TextIterator.
-		
+
 	TextIterator(const std::string& str, const TextEncoding& encoding);
 		/// Creates a TextIterator for the given string.
 		/// The encoding object must not be deleted as long as the iterator
@@ -70,37 +70,37 @@ public:
 
 	~TextIterator();
 		/// Destroys the TextIterator.
-	
+
 	TextIterator(const TextIterator& it);
 		/// Copy constructor.
-	
+
 	TextIterator& operator = (const TextIterator& it);
 		/// Assignment operator.
-		
-	void swap(TextIterator& it);
+
+	void swap(TextIterator& it) noexcept;
 		/// Swaps the iterator with another one.
-	
+
 	int operator * () const;
 		/// Returns the Unicode value of the current character.
 		/// If there is no valid character at the current position,
 		/// -1 is returned.
-		
-	TextIterator& operator ++ (); 
+
+	TextIterator& operator ++ ();
 		/// Prefix increment operator.
 
-	TextIterator operator ++ (int);		
+	TextIterator operator ++ (int);
 		/// Postfix increment operator.
 
 	bool operator == (const TextIterator& it) const;
 		/// Compares two iterators for equality.
-		
+
 	bool operator != (const TextIterator& it) const;
 		/// Compares two iterators for inequality.
-		
+
 	TextIterator end() const;
 		/// Returns the end iterator for the range handled
 		/// by the iterator.
-		
+
 private:
 	const TextEncoding*         _pEncoding;
 	std::string::const_iterator _it;
@@ -123,7 +123,7 @@ inline bool TextIterator::operator != (const TextIterator& it) const
 }
 
 
-inline void swap(TextIterator& it1, TextIterator& it2)
+inline void swap(TextIterator& it1, TextIterator& it2) noexcept
 {
 	it1.swap(it2);
 }
diff --git a/Foundation/include/Poco/ThreadLocal.h b/Foundation/include/Poco/ThreadLocal.h
index cea17d5c1..9cdd01521 100644
--- a/Foundation/include/Poco/ThreadLocal.h
+++ b/Foundation/include/Poco/ThreadLocal.h
@@ -47,16 +47,16 @@ public:
 		_value()
 	{
 	}
-	
+
 	~TLSSlot()
 	{
 	}
-	
+
 	C& value()
 	{
 		return _value;
 	}
-	
+
 private:
 	TLSSlot(const TLSSlot&);
 	TLSSlot& operator = (const TLSSlot&);
@@ -73,24 +73,24 @@ class Foundation_API ThreadLocalStorage
 public:
 	ThreadLocalStorage();
 		/// Creates the TLS.
-		
+
 	~ThreadLocalStorage();
 		/// Deletes the TLS.
 
 	TLSAbstractSlot*& get(const void* key);
 		/// Returns the slot for the given key.
-		
+
 	static ThreadLocalStorage& current();
 		/// Returns the TLS object for the current thread
 		/// (which may also be the main thread).
-		
+
 	static void clear();
 		/// Clears the current thread's TLS object.
 		/// Does nothing in the main thread.
-	
+
 private:
 	typedef std::map<const void*, TLSAbstractSlot*> TLSMap;
-	
+
 	TLSMap _map;
 
 	friend class Thread;
@@ -118,16 +118,16 @@ public:
 	ThreadLocal()
 	{
 	}
-	
+
 	~ThreadLocal()
 	{
 	}
-	
+
 	C* operator -> ()
 	{
 		return &get();
 	}
-	
+
 	C& operator * ()
 		/// "Dereferences" the smart pointer and returns a reference
 		/// to the underlying data object. The reference can be used
@@ -144,7 +144,7 @@ public:
 		if (!p) p = new Slot;
 		return static_cast<Slot*>(p)->value();
 	}
-	
+
 private:
 	ThreadLocal(const ThreadLocal&);
 	ThreadLocal& operator = (const ThreadLocal&);
diff --git a/Foundation/include/Poco/ThreadTarget.h b/Foundation/include/Poco/ThreadTarget.h
index 88452694c..5cf9c4e60 100644
--- a/Foundation/include/Poco/ThreadTarget.h
+++ b/Foundation/include/Poco/ThreadTarget.h
@@ -26,7 +26,7 @@ namespace Poco {
 
 
 class Foundation_API ThreadTarget: public Runnable
-	/// This adapter simplifies using static member functions as well as 
+	/// This adapter simplifies using static member functions as well as
 	/// standalone functions as targets for threads.
 	/// Note that it is possible to pass those entities directly to Thread::start().
 	/// This adapter is provided as a convenience for higher abstraction level
@@ -34,7 +34,7 @@ class Foundation_API ThreadTarget: public Runnable
 	///
 	/// For using a non-static member function as a thread target, please
 	/// see the RunnableAdapter class.
-	/// 
+	///
 	/// Usage:
 	///    class MyObject
 	///    {
@@ -45,18 +45,18 @@ class Foundation_API ThreadTarget: public Runnable
 	///    thr.start(ra);
 	///
 	/// or:
-	/// 
+	///
 	///    void doSomething() {}
-	/// 
+	///
 	///    ThreadTarget ra(doSomething);
 	///    Thread thr;
 	///    thr.start(ra);
 {
 public:
 	typedef void (*Callback)();
-	
+
 	ThreadTarget(Callback method);
-	
+
 	ThreadTarget(const ThreadTarget& te);
 
 	~ThreadTarget();
@@ -64,7 +64,7 @@ public:
 	ThreadTarget& operator = (const ThreadTarget& te);
 
 	void run();
-	
+
 private:
 	ThreadTarget();
 
diff --git a/Foundation/include/Poco/Thread_POSIX.h b/Foundation/include/Poco/Thread_POSIX.h
index f82753366..b46351009 100644
--- a/Foundation/include/Poco/Thread_POSIX.h
+++ b/Foundation/include/Poco/Thread_POSIX.h
@@ -59,7 +59,7 @@ public:
 	{
 		POLICY_DEFAULT_IMPL = SCHED_OTHER
 	};
-	
+
 	ThreadImpl();
 	~ThreadImpl();
 
@@ -141,12 +141,12 @@ private:
 		std::size_t   stackSize;
 		bool          started;
 		bool          joined;
+		mutable FastMutex mutex;
 	};
 
 	AutoPtr<ThreadData> _pData;
-
 	static CurrentThreadHolder _currentThreadHolder;
-	
+
 #if defined(POCO_OS_FAMILY_UNIX) && !defined(POCO_VXWORKS)
 	SignalHandler::JumpBufferVec _jumpBufferVec;
 	friend class SignalHandler;
@@ -171,6 +171,7 @@ inline int ThreadImpl::getOSPriorityImpl() const
 
 inline bool ThreadImpl::isRunningImpl() const
 {
+	FastMutex::ScopedLock l(_pData->mutex);
 	return !_pData->pRunnableTarget.isNull();
 }
 
diff --git a/Foundation/include/Poco/Thread_VX.h b/Foundation/include/Poco/Thread_VX.h
index 33110cc95..506c5ab67 100644
--- a/Foundation/include/Poco/Thread_VX.h
+++ b/Foundation/include/Poco/Thread_VX.h
@@ -33,7 +33,7 @@ namespace Poco {
 
 class Foundation_API ThreadImpl
 {
-public:	
+public:
 	typedef int TIDImpl;
 	typedef void (*Callable)(void*);
 
@@ -63,7 +63,7 @@ public:
 		}
 
 		Callable  callback;
-		void*     pData; 
+		void*     pData;
 	};
 
 	ThreadImpl();
diff --git a/Foundation/include/Poco/Thread_WIN32.h b/Foundation/include/Poco/Thread_WIN32.h
index 80b121024..2d44a20bc 100644
--- a/Foundation/include/Poco/Thread_WIN32.h
+++ b/Foundation/include/Poco/Thread_WIN32.h
@@ -29,7 +29,7 @@ namespace Poco {
 
 class Foundation_API ThreadImpl
 {
-public:	
+public:
 	typedef DWORD TIDImpl;
 	typedef void (*Callable)(void*);
 
@@ -53,7 +53,7 @@ public:
 		POLICY_DEFAULT_IMPL = 0
 	};
 
-	ThreadImpl();				
+	ThreadImpl();
 	~ThreadImpl();
 
 	TIDImpl tidImpl() const;
@@ -106,7 +106,7 @@ private:
 		{
 			TlsSetValue(_slot, pThread);
 		}
-	
+
 	private:
 		DWORD _slot;
 	};
diff --git a/Foundation/include/Poco/Thread_WINCE.h b/Foundation/include/Poco/Thread_WINCE.h
index 49aee701e..47e9f18e8 100644
--- a/Foundation/include/Poco/Thread_WINCE.h
+++ b/Foundation/include/Poco/Thread_WINCE.h
@@ -34,7 +34,7 @@ namespace Poco {
 
 class Foundation_API ThreadImpl
 {
-public:	
+public:
     typedef DWORD TIDImpl;
 	typedef void (*Callable)(void*);
 	typedef DWORD (WINAPI *Entry)(LPVOID);
@@ -53,7 +53,7 @@ public:
 		POLICY_DEFAULT_IMPL = 0
 	};
 
-	ThreadImpl();				
+	ThreadImpl();
 	~ThreadImpl();
 
 	TIDImpl tidImpl() const;
@@ -102,7 +102,7 @@ private:
 		{
 			TlsSetValue(_slot, pThread);
 		}
-	
+
 	private:
 		DWORD _slot;
 	};
diff --git a/Foundation/include/Poco/TimedNotificationQueue.h b/Foundation/include/Poco/TimedNotificationQueue.h
index 841ace6b0..d08e54bcf 100644
--- a/Foundation/include/Poco/TimedNotificationQueue.h
+++ b/Foundation/include/Poco/TimedNotificationQueue.h
@@ -33,13 +33,13 @@ namespace Poco {
 class Foundation_API TimedNotificationQueue
 	/// A TimedNotificationQueue object provides a way to implement timed, asynchronous
 	/// notifications. This is especially useful for sending notifications
-	/// from one thread to another, for example from a background thread to 
-	/// the main (user interface) thread. 
+	/// from one thread to another, for example from a background thread to
+	/// the main (user interface) thread.
 	///
 	/// The TimedNotificationQueue is quite similar to the NotificationQueue class.
 	/// The only difference to NotificationQueue is that each Notification is tagged
 	/// with a Timestamp. When inserting a Notification into the queue, the
-	/// Notification is inserted according to the given Timestamp, with 
+	/// Notification is inserted according to the given Timestamp, with
 	/// lower Timestamp values being inserted before higher ones.
 	///
 	/// Notifications are dequeued in order of their timestamps.
@@ -88,11 +88,11 @@ public:
 		/// It is highly recommended that the result is immediately
 		/// assigned to a Notification::Ptr, to avoid potential
 		/// memory management issues.
-		
+
 	Notification* waitDequeueNotification();
 		/// Dequeues the next pending notification.
 		/// If no notification is available, waits for a notification
-		/// to be enqueued. 
+		/// to be enqueued.
 		/// The caller gains ownership of the notification and
 		/// is expected to release it when done with it.
 		///
@@ -114,7 +114,7 @@ public:
 
 	bool empty() const;
 		/// Returns true iff the queue is empty.
-		
+
 	int size() const;
 		/// Returns the number of notifications in the queue.
 
@@ -129,7 +129,7 @@ protected:
 	typedef std::multimap<Clock, Notification::Ptr> NfQueue;
 	Notification::Ptr dequeueOne(NfQueue::iterator& it);
 	bool wait(Clock::ClockDiff interval);
-	
+
 private:
 	NfQueue _nfQueue;
 	Event   _nfAvailable;
diff --git a/Foundation/include/Poco/Timer.h b/Foundation/include/Poco/Timer.h
index 56dbd2b5b..ce77ae2d1 100644
--- a/Foundation/include/Poco/Timer.h
+++ b/Foundation/include/Poco/Timer.h
@@ -39,14 +39,14 @@ class Foundation_API Timer: protected Runnable
 	/// Once that interval expires, the timer callback is called repeatedly
 	/// in the given periodic interval. If the interval is 0, the timer is only
 	/// called once.
-	/// The timer callback method can stop the timer by setting the 
+	/// The timer callback method can stop the timer by setting the
 	/// timer's periodic interval to 0.
 	///
 	/// The timer callback runs in its own thread, so multithreading
-	/// issues (proper synchronization) have to be considered when writing 
+	/// issues (proper synchronization) have to be considered when writing
 	/// the callback method.
 	///
-	/// The exact interval at which the callback is called depends on many 
+	/// The exact interval at which the callback is called depends on many
 	/// factors like operating system, CPU performance and system load and
 	/// may differ from the specified interval.
 	///
@@ -66,7 +66,7 @@ class Foundation_API Timer: protected Runnable
 public:
 	Timer(long startInterval = 0, long periodicInterval = 0);
 		/// Creates a new timer object. StartInterval and periodicInterval
-		/// are given in milliseconds. If a periodicInterval of zero is 
+		/// are given in milliseconds. If a periodicInterval of zero is
 		/// specified, the callback will only be called once, after the
 		/// startInterval expires.
 		/// To start the timer, call the Start() method.
@@ -101,7 +101,7 @@ public:
 		/// Create the TimerCallback as follows:
 		///     TimerCallback<MyClass> callback(*this, &MyClass::onTimer);
 		///     timer.start(callback);
-		
+
 	void stop();
 		/// Stops the timer. If the callback method is currently running
 		/// it will be allowed to finish first.
@@ -121,7 +121,7 @@ public:
 		/// Returns the start interval.
 
 	void setStartInterval(long milliseconds);
-		/// Sets the start interval. Will only be 
+		/// Sets the start interval. Will only be
 		/// effective before start() is called.
 
 	long getPeriodicInterval() const;
@@ -131,7 +131,7 @@ public:
 		/// Sets the periodic interval. If the timer is already running
 		/// the new interval will be effective when the current interval
 		/// expires.
-		
+
 	long skipped() const;
 		/// Returns the number of skipped invocations since the last invocation.
 		/// Skipped invocations happen if the timer callback function takes
@@ -149,7 +149,7 @@ private:
 	AbstractTimerCallback* _pCallback;
 	Clock                  _nextInvocation;
 	mutable FastMutex      _mutex;
-	
+
 	Timer(const Timer&);
 	Timer& operator = (const Timer&);
 };
@@ -163,7 +163,7 @@ public:
 	AbstractTimerCallback();
 	AbstractTimerCallback(const AbstractTimerCallback& callback);
 	virtual ~AbstractTimerCallback();
-	
+
 	AbstractTimerCallback& operator = (const AbstractTimerCallback& callback);
 
 	virtual void invoke(Timer& timer) const = 0;
@@ -171,11 +171,11 @@ public:
 };
 
 
-template <class C> 
+template <class C>
 class TimerCallback: public AbstractTimerCallback
 	/// This template class implements an adapter that sits between
 	/// a Timer and an object's method invoked by the timer.
-	/// It is quite similar in concept to the RunnableAdapter, but provides 
+	/// It is quite similar in concept to the RunnableAdapter, but provides
 	/// some Timer specific additional methods.
 	/// See the Timer class for information on how
 	/// to use this template class.
diff --git a/Foundation/include/Poco/Timespan.h b/Foundation/include/Poco/Timespan.h
index 09f17428e..d00f9c23f 100644
--- a/Foundation/include/Poco/Timespan.h
+++ b/Foundation/include/Poco/Timespan.h
@@ -20,6 +20,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/Timestamp.h"
+#include <chrono>
 
 
 namespace Poco {
@@ -33,20 +34,25 @@ public:
 
 	Timespan();
 		/// Creates a zero Timespan.
-		
+
 	Timespan(TimeDiff microseconds);
 		/// Creates a Timespan.
-	
+
 	Timespan(long seconds, long microseconds);
 		/// Creates a Timespan. Useful for creating
 		/// a Timespan from a struct timeval.
-	
+
 	Timespan(int days, int hours, int minutes, int seconds, int microSeconds);
 		/// Creates a Timespan.
 
 	Timespan(const Timespan& timespan);
 		/// Creates a Timespan from another one.
 
+	template <class T, class Period>
+	Timespan(const std::chrono::duration<T, Period>& dtime) :
+		_span(std::chrono::duration_cast<std::chrono::microseconds>(dtime).count()) {}
+		/// Creates a Timespan from std::chrono::duration
+
 	~Timespan();
 		/// Destroys the Timespan.
 
@@ -55,15 +61,23 @@ public:
 
 	Timespan& operator = (TimeDiff microseconds);
 		/// Assignment operator.
-		
+
 	Timespan& assign(int days, int hours, int minutes, int seconds, int microSeconds);
 		/// Assigns a new span.
-		
+
 	Timespan& assign(long seconds, long microseconds);
 		/// Assigns a new span. Useful for assigning
 		/// from a struct timeval.
 
-	void swap(Timespan& timespan);
+	template <class T, class Period>
+	Timespan& assign(const std::chrono::duration<T, Period>& dtime)
+		/// Assigns a new span from std::chrono::duration.
+	{
+		_span = std::chrono::duration_cast<std::chrono::microseconds>(dtime).count();
+		return *this;
+	}
+
+	void swap(Timespan& timespan) noexcept;
 		/// Swaps the Timespan with another one.
 
 	bool operator == (const Timespan& ts) const;
@@ -79,7 +93,7 @@ public:
 	bool operator >= (TimeDiff microSeconds) const;
 	bool operator <  (TimeDiff microSeconds) const;
 	bool operator <= (TimeDiff microSeconds) const;
-	
+
 	Timespan operator + (const Timespan& d) const;
 	Timespan operator - (const Timespan& d) const;
 	Timespan& operator += (const Timespan& d);
@@ -92,39 +106,39 @@ public:
 
 	int days() const;
 		/// Returns the number of days.
-		
+
 	int hours() const;
 		/// Returns the number of hours (0 to 23).
-		
+
 	int totalHours() const;
 		/// Returns the total number of hours.
-		
+
 	int minutes() const;
 		/// Returns the number of minutes (0 to 59).
-		
+
 	int totalMinutes() const;
 		/// Returns the total number of minutes.
-		
+
 	int seconds() const;
 		/// Returns the number of seconds (0 to 59).
-		
+
 	int totalSeconds() const;
 		/// Returns the total number of seconds.
-		
+
 	int milliseconds() const;
 		/// Returns the number of milliseconds (0 to 999).
-		
+
 	TimeDiff totalMilliseconds() const;
 		/// Returns the total number of milliseconds.
-		
+
 	int microseconds() const;
 		/// Returns the fractions of a millisecond
 		/// in microseconds (0 to 999).
-		
+
 	int useconds() const;
 		/// Returns the fractions of a second
 		/// in microseconds (0 to 999999).
-		
+
 	TimeDiff totalMicroseconds() const;
 		/// Returns the total number of microseconds.
 
@@ -153,49 +167,49 @@ inline int Timespan::hours() const
 	return int((_span/HOURS) % 24);
 }
 
-	
+
 inline int Timespan::totalHours() const
 {
 	return int(_span/HOURS);
 }
 
-	
+
 inline int Timespan::minutes() const
 {
 	return int((_span/MINUTES) % 60);
 }
 
-	
+
 inline int Timespan::totalMinutes() const
 {
 	return int(_span/MINUTES);
 }
 
-	
+
 inline int Timespan::seconds() const
 {
 	return int((_span/SECONDS) % 60);
 }
 
-	
+
 inline int Timespan::totalSeconds() const
 {
 	return int(_span/SECONDS);
 }
 
-	
+
 inline int Timespan::milliseconds() const
 {
 	return int((_span/MILLISECONDS) % 1000);
 }
 
-	
+
 inline Timespan::TimeDiff Timespan::totalMilliseconds() const
 {
 	return _span/MILLISECONDS;
 }
 
-	
+
 inline int Timespan::microseconds() const
 {
 	return int(_span % 1000);
@@ -207,7 +221,7 @@ inline int Timespan::useconds() const
 	return int(_span % 1000000);
 }
 
-	
+
 inline Timespan::TimeDiff Timespan::totalMicroseconds() const
 {
 	return _span;
@@ -286,7 +300,7 @@ inline bool Timespan::operator <= (TimeDiff microSeconds) const
 }
 
 
-inline void swap(Timespan& s1, Timespan& s2)
+inline void swap(Timespan& s1, Timespan& s2) noexcept
 {
 	s1.swap(s2);
 }
diff --git a/Foundation/include/Poco/Timestamp.h b/Foundation/include/Poco/Timestamp.h
index 0f869e1bd..089ae05b4 100644
--- a/Foundation/include/Poco/Timestamp.h
+++ b/Foundation/include/Poco/Timestamp.h
@@ -43,18 +43,18 @@ class Foundation_API Timestamp
 	/// based and thus independent of the timezone
 	/// in effect on the system.
 	///
-	/// The internal reference time is the Unix epoch, 
+	/// The internal reference time is the Unix epoch,
 	/// midnight, January 1, 1970.
 {
 public:
-	using TimeVal = Int64; 
+	using TimeVal = Int64;
 		/// Monotonic UTC time value in microsecond resolution,
 		/// with base time midnight, January 1, 1970.
-		
-	using UtcTimeVal = Int64; 
+
+	using UtcTimeVal = Int64;
 		/// Monotonic UTC time value in 100 nanosecond resolution,
 		/// with base time midnight, October 15, 1582.
-		
+
 	using TimeDiff = Int64;
 		/// Difference between two TimeVal values in microseconds.
 
@@ -63,23 +63,23 @@ public:
 
 	Timestamp();
 		/// Creates a timestamp with the current time.
-		
+
 	Timestamp(TimeVal tv);
 		/// Creates a timestamp from the given time value
 		/// (microseconds since midnight, January 1, 1970).
-		
+
 	Timestamp(const Timestamp& other);
 		/// Copy constructor.
-		
+
 	~Timestamp();
 		/// Destroys the timestamp
-		
+
 	Timestamp& operator = (const Timestamp& other);
 	Timestamp& operator = (TimeVal tv);
-	
-	void swap(Timestamp& timestamp);
+
+	void swap(Timestamp& timestamp) noexcept;
 		/// Swaps the Timestamp with another one.
-	
+
 	void update();
 		/// Updates the Timestamp with the current time.
 
@@ -89,7 +89,7 @@ public:
 	bool operator >= (const Timestamp& ts) const;
 	bool operator <  (const Timestamp& ts) const;
 	bool operator <= (const Timestamp& ts) const;
-	
+
 	Timestamp  operator +  (TimeDiff d) const;
 	Timestamp  operator +  (const Timespan& span) const;
 	Timestamp  operator -  (TimeDiff d) const;
@@ -99,25 +99,25 @@ public:
 	Timestamp& operator += (const Timespan& span);
 	Timestamp& operator -= (TimeDiff d);
 	Timestamp& operator -= (const Timespan& span);
-	
+
 	std::time_t epochTime() const;
 		/// Returns the timestamp expressed in time_t.
 		/// time_t base time is midnight, January 1, 1970.
 		/// Resolution is one second.
-		
+
 	UtcTimeVal utcTime() const;
 		/// Returns the timestamp expressed in UTC-based
 		/// time. UTC base time is midnight, October 15, 1582.
 		/// Resolution is 100 nanoseconds.
-	
+
 	TimeVal epochMicroseconds() const;
 		/// Returns the timestamp expressed in microseconds
 		/// since the Unix epoch, midnight, January 1, 1970.
-	
+
 	TimeDiff elapsed() const;
 		/// Returns the time elapsed since the time denoted by
 		/// the timestamp. Equivalent to Timestamp() - *this.
-	
+
 	bool isElapsed(TimeDiff interval) const;
 		/// Returns true iff the given interval has passed
 		/// since the time denoted by the timestamp.
@@ -126,15 +126,15 @@ public:
 		/// Returns the raw time value.
 		///
 		/// Same as epochMicroseconds().
-	
+
 	static Timestamp fromEpochTime(std::time_t t);
 		/// Creates a timestamp from a std::time_t.
-		
+
 	static Timestamp fromUtcTime(UtcTimeVal val);
 		/// Creates a timestamp from a UTC time value
 		/// (100 nanosecond intervals since midnight,
 		/// October 15, 1582).
-		
+
 	static TimeDiff resolution();
 		/// Returns the resolution in units per second.
 		/// Since the timestamp has microsecond resolution,
@@ -260,7 +260,7 @@ inline Timestamp::TimeDiff Timestamp::resolution()
 }
 
 
-inline void swap(Timestamp& s1, Timestamp& s2)
+inline void swap(Timestamp& s1, Timestamp& s2) noexcept
 {
 	s1.swap(s2);
 }
diff --git a/Foundation/include/Poco/Token.h b/Foundation/include/Poco/Token.h
index 13540af91..be1eea239 100644
--- a/Foundation/include/Poco/Token.h
+++ b/Foundation/include/Poco/Token.h
@@ -50,13 +50,13 @@ public:
 		INVALID_TOKEN,
 		USER_TOKEN
 	};
-	
+
 	Token();
 		/// Creates the Token.
 
 	virtual ~Token();
 		/// Destroys the Token.
-		
+
 	virtual bool start(char c, std::istream& istr);
 		/// Checks if the given character (and, optionally,
 		/// the next character in the input stream) start
@@ -71,18 +71,18 @@ public:
 		/// be set as the token's value.
 
 	virtual void finish(std::istream& istr);
-		/// Builds the token by reading and appending 
+		/// Builds the token by reading and appending
 		/// the remaining characters from istr.
-		
+
 	virtual Class tokenClass() const;
 		/// Returns the kind of the token.
-	
+
 	const std::string& tokenString() const;
 		/// Returns the token's raw string.
-	
+
 	virtual std::string asString() const;
 		/// Returns a string representation of the token.
-	
+
 #if defined(POCO_HAVE_INT64)
 	virtual Int64 asInteger64() const;
         /// Returns a 64-bit integer representation of the token.
@@ -108,7 +108,7 @@ public:
 
 protected:
 	std::string _value;
-	
+
 private:
 	Token(const Token&);
 	Token& operator = (const Token&);
diff --git a/Foundation/include/Poco/Tuple.h b/Foundation/include/Poco/Tuple.h
index 000749695..ee1e7aee7 100644
--- a/Foundation/include/Poco/Tuple.h
+++ b/Foundation/include/Poco/Tuple.h
@@ -3088,7 +3088,7 @@ struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,N
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -3198,7 +3198,7 @@ struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,NullT
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -3305,7 +3305,7 @@ struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,NullTypeL
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -3409,7 +3409,7 @@ struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -3510,7 +3510,7 @@ struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -3608,7 +3608,7 @@ struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -3703,7 +3703,7 @@ struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -3795,7 +3795,7 @@ struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -3884,7 +3884,7 @@ struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7,T8,T9,T10, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -3970,7 +3970,7 @@ struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7,T8,T9, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -4053,7 +4053,7 @@ struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7,T8, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -4133,7 +4133,7 @@ struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -4210,7 +4210,7 @@ struct Tuple<T0, T1,T2,T3,T4,T5,T6, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -4284,7 +4284,7 @@ struct Tuple<T0, T1,T2,T3,T4,T5, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -4355,7 +4355,7 @@ struct Tuple<T0, T1,T2,T3,T4, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
@@ -4423,7 +4423,7 @@ struct Tuple<T0, T1,T2,T3, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
 		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)):
@@ -4488,7 +4488,7 @@ struct Tuple<T0, T1,T2, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
 		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)):
 		_data(t0, typename TypeListType<T1,T2>::HeadType
@@ -4550,7 +4550,7 @@ struct Tuple<T0, T1, NullTypeList>
 	{
 	}
 
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
 		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)):
 		_data(t0, typename TypeListType<T1>::HeadType(t1, NullTypeList()))
 	{
@@ -4598,7 +4598,7 @@ template <class T0>
 struct Tuple<T0, NullTypeList>
 {
 	typedef TypeList<T0, NullTypeList> Type;
-	
+
 	enum TupleLengthType
 	{
 		length = Type::length
diff --git a/Foundation/include/Poco/TypeList.h b/Foundation/include/Poco/TypeList.h
index 4a53737af..a4022c5a7 100644
--- a/Foundation/include/Poco/TypeList.h
+++ b/Foundation/include/Poco/TypeList.h
@@ -29,7 +29,7 @@
 namespace Poco {
 
 
-template <class Head, class Tail> 
+template <class Head, class Tail>
 struct TypeList;
 
 
@@ -57,7 +57,7 @@ struct NullTypeList
 };
 
 
-template <class Head, class Tail> 
+template <class Head, class Tail>
 struct TypeList
 	/// Compile Time List of Types
 {
@@ -110,7 +110,7 @@ struct TypeList
 			return tail < tl.tail;
 		return false;
 	}
-	
+
 	HeadType head;
 	TailType tail;
 };
@@ -183,7 +183,7 @@ struct TypeListType<>
 };
 
 
-template <int n> 
+template <int n>
 struct Getter
 {
 	template <class Ret, class Head, class Tail>
@@ -200,7 +200,7 @@ struct Getter
 };
 
 
-template <> 
+template <>
 struct Getter<0>
 {
 	template <class Ret, class Head, class Tail>
@@ -217,11 +217,11 @@ struct Getter<0>
 };
 
 
-template <int N, class Head> 
+template <int N, class Head>
 struct TypeGetter;
 
 
-template <int N, class Head, class Tail> 
+template <int N, class Head, class Tail>
 struct TypeGetter<N, TypeList<Head, Tail>>
 {
 	typedef typename TypeGetter<N-1, Tail>::HeadType HeadType;
@@ -229,7 +229,7 @@ struct TypeGetter<N, TypeList<Head, Tail>>
 };
 
 
-template <class Head, class Tail> 
+template <class Head, class Tail>
 struct TypeGetter<0, TypeList<Head, Tail>>
 {
 	typedef typename TypeList<Head, Tail>::HeadType HeadType;
@@ -248,7 +248,7 @@ struct TypeLocator;
 	///
 	/// if (2 == TypeLoc.value) ...
 	///
-	
+
 
 template <class T>
 struct TypeLocator<NullTypeList, T>
@@ -274,7 +274,7 @@ public:
 };
 
 
-template <class Head, class T> 
+template <class Head, class T>
 struct TypeAppender;
 	/// TypeAppender appends T (type or a TypeList) to Head.
 	///
@@ -318,7 +318,7 @@ struct TypeAppender<TypeList<Head, Tail>, T>
 };
 
 
-template <class Head, class T> 
+template <class Head, class T>
 struct TypeOneEraser;
 	/// TypeOneEraser erases the first occurrence of the type T in Head.
 	/// Usage:
@@ -350,7 +350,7 @@ struct TypeOneEraser<TypeList<Head, Tail>, T>
 };
 
 
-template <class Head, class T> 
+template <class Head, class T>
 struct TypeAllEraser;
 	/// TypeAllEraser erases all the occurrences of the type T in Head.
 	/// Usage:
@@ -382,7 +382,7 @@ struct TypeAllEraser<TypeList<Head, Tail>, T>
 };
 
 
-template <class Head> 
+template <class Head>
 struct TypeDuplicateEraser;
 	/// TypeDuplicateEraser erases all but the first occurrence of the type T in Head.
 	/// Usage:
@@ -393,7 +393,7 @@ struct TypeDuplicateEraser;
 	///
 
 
-template <> 
+template <>
 struct TypeDuplicateEraser<NullTypeList>
 {
 	typedef NullTypeList HeadType;
diff --git a/Foundation/include/Poco/URI.h b/Foundation/include/Poco/URI.h
index 258b0af9f..b36b935b4 100644
--- a/Foundation/include/Poco/URI.h
+++ b/Foundation/include/Poco/URI.h
@@ -40,15 +40,18 @@ class Foundation_API URI
 	/// The class automatically performs a few normalizations on
 	/// all URIs and URI parts passed to it:
 	///   * scheme identifiers are converted to lower case
-	///   * percent-encoded characters are decoded (except for the query string)
+	///   * percent-encoded characters are decoded (except for the query string and fragment string)
 	///   * optionally, dot segments are removed from paths (see normalize())
 	///
-	/// Note that dealing with query strings requires some precautions, as, internally,
-	/// query strings are stored in percent-encoded form, while all other parts of the URI
-	/// are stored in decoded form. While parsing query strings from properly encoded URLs
-	/// generally works, explicitly setting query strings with setQuery() or extracting
-	/// query strings with getQuery() may lead to ambiguities. See the descriptions of
-	/// setQuery(), setRawQuery(), getQuery() and getRawQuery() for more information.
+	/// Note that dealing with query strings and fragment strings requires some precautions,
+	/// as, internally, query strings and fragment strings are stored in percent-encoded
+	/// form, while all other parts of the URI are stored in decoded form. While parsing
+	/// query strings and fragment strings from properly encoded URLs generally works,
+	/// explicitly setting query strings (fragment strings) with setQuery() (setFragment())
+	/// or extracting query strings (fragment strings) with getQuery() (getFragment()) may
+	/// lead to ambiguities. See the descriptions of setQuery(), setRawQuery(), getQuery(),
+	/// getRawQuery(), setFragment(), setRawFragment(), getFragment() and getRawFragment()
+	/// for more information.
 {
 public:
 	using QueryParameters = std::vector<std::pair<std::string, std::string>>;
@@ -109,7 +112,7 @@ public:
 		/// Parses and assigns an URI from the given string. Throws a
 		/// SyntaxException if the uri is not valid.
 
-	void swap(URI& uri);
+	void swap(URI& uri) noexcept;
 		/// Swaps the URI with another one.
 
 	void clear();
@@ -220,7 +223,7 @@ public:
 		///
 		/// The given query string must be properly percent-encoded.
 
-	QueryParameters getQueryParameters() const;
+	QueryParameters getQueryParameters(bool plusIsSpace = true) const;
 		/// Returns the decoded query string parameters as a vector
 		/// of name-value pairs.
 
@@ -230,12 +233,20 @@ public:
 		///
 		/// Calls addQueryParameter() for each parameter name and value.
 
-	const std::string& getFragment() const;
+	std::string getFragment() const;
 		/// Returns the fragment part of the URI.
 
 	void setFragment(const std::string& fragment);
 		/// Sets the fragment part of the URI.
 
+	std::string getRawFragment() const;
+		/// Returns the fragment part of the URI in raw form.
+
+	void setRawFragment(const std::string& fragment);
+		/// Sets the fragment part of the URI.
+		///
+		/// The given fragment string must be properly percent-encoded
+
 	void setPathEtc(const std::string& pathEtc);
 		/// Sets the path, query and fragment parts of the URI.
 
@@ -400,7 +411,7 @@ inline const std::string& URI::getRawQuery() const
 }
 
 
-inline const std::string& URI::getFragment() const
+inline std::string URI::getRawFragment() const
 {
 	return _fragment;
 }
@@ -412,7 +423,7 @@ inline unsigned short URI::getSpecifiedPort() const
 }
 
 
-inline void swap(URI& u1, URI& u2)
+inline void swap(URI& u1, URI& u2) noexcept
 {
 	u1.swap(u2);
 }
diff --git a/Foundation/include/Poco/URIStreamFactory.h b/Foundation/include/Poco/URIStreamFactory.h
index c5efa22bd..207bc3a93 100644
--- a/Foundation/include/Poco/URIStreamFactory.h
+++ b/Foundation/include/Poco/URIStreamFactory.h
@@ -55,7 +55,7 @@ protected:
 private:
 	URIStreamFactory(const URIStreamFactory&);
 	URIStreamFactory& operator = (const URIStreamFactory&);
-	
+
 	friend class URIStreamOpener;
 };
 
@@ -68,16 +68,16 @@ class Foundation_API URIRedirection
 public:
 	URIRedirection(const std::string& uri);
 	URIRedirection(const URIRedirection& redir);
-	
+
 	URIRedirection& operator = (const URIRedirection& redir);
-	void swap(URIRedirection& redir);
-	
+	void swap(URIRedirection& redir) noexcept;
+
 	const std::string& uri() const;
 		/// Returns the new URI.
-	
+
 private:
 	URIRedirection();
-	
+
 	std::string _uri;
 };
 
diff --git a/Foundation/include/Poco/URIStreamOpener.h b/Foundation/include/Poco/URIStreamOpener.h
index 85de22b1a..009923882 100644
--- a/Foundation/include/Poco/URIStreamOpener.h
+++ b/Foundation/include/Poco/URIStreamOpener.h
@@ -44,7 +44,7 @@ public:
 	{
 		MAX_REDIRECTS = 10
 	};
-	
+
 	URIStreamOpener();
 		/// Creates the URIStreamOpener and registers a FileStreamFactory
 		/// for file URIs.
@@ -93,7 +93,7 @@ public:
 		///
 		/// Whoever calls the method is responsible for deleting
 		/// the returned stream.
-		
+
 	void registerStreamFactory(const std::string& scheme, URIStreamFactory* pFactory);
 		/// Registers a URIStreamFactory for the given scheme. If another factory
 		/// has already been registered for the scheme, an ExistsException is thrown.
@@ -106,7 +106,7 @@ public:
 		///
 		/// Throws a NotFoundException if no URIStreamFactory has been registered
 		/// for the given scheme.
-		
+
 	bool supportsScheme(const std::string& scheme);
 		/// Returns true iff a URIStreamFactory for the given scheme
 		/// has been registered.
@@ -123,7 +123,7 @@ private:
 	URIStreamOpener& operator = (const URIStreamOpener&);
 
 	typedef std::map<std::string, URIStreamFactory*> FactoryMap;
-	
+
 	FactoryMap        _map;
 	mutable FastMutex _mutex;
 };
diff --git a/Foundation/include/Poco/UTF16Encoding.h b/Foundation/include/Poco/UTF16Encoding.h
index 0d38a71dd..5e95d0aa2 100644
--- a/Foundation/include/Poco/UTF16Encoding.h
+++ b/Foundation/include/Poco/UTF16Encoding.h
@@ -30,7 +30,7 @@ class Foundation_API UTF16Encoding: public TextEncoding
 	///
 	/// When converting from UTF-16 to Unicode, surrogates are
 	/// reported as they are - in other words, surrogate pairs
-	/// are not combined into one Unicode character. 
+	/// are not combined into one Unicode character.
 	/// When converting from Unicode to UTF-16, however, characters
 	/// outside the 16-bit range are converted into a low and
 	/// high surrogate.
@@ -42,28 +42,28 @@ public:
 		LITTLE_ENDIAN_BYTE_ORDER,
 		NATIVE_BYTE_ORDER
 	};
-	
+
 	UTF16Encoding(ByteOrderType byteOrder = NATIVE_BYTE_ORDER);
 		/// Creates and initializes the encoding for the given byte order.
-		
+
 	UTF16Encoding(int byteOrderMark);
 		/// Creates and initializes the encoding for the byte-order
 		/// indicated by the given byte-order mark, which is the Unicode
 		/// character 0xFEFF.
-		
+
 	~UTF16Encoding();
-	
+
 	ByteOrderType getByteOrder() const;
 		/// Returns the byte-order currently in use.
-		
+
 	void setByteOrder(ByteOrderType byteOrder);
 		/// Sets the byte order.
-		
+
 	void setByteOrder(int byteOrderMark);
 		/// Sets the byte order according to the given
 		/// byte order mark, which is the Unicode
 		/// character 0xFEFF.
-	
+
 	const char* canonicalName() const;
 	bool isA(const std::string& encodingName) const;
 	const CharacterMap& characterMap() const;
@@ -71,7 +71,7 @@ public:
 	int convert(int ch, unsigned char* bytes, int length) const;
 	int queryConvert(const unsigned char* bytes, int length) const;
 	int sequenceLength(const unsigned char* bytes, int length) const;
-	
+
 private:
 	bool _flipBytes;
 	static const char* _names[];
diff --git a/Foundation/include/Poco/UTF32Encoding.h b/Foundation/include/Poco/UTF32Encoding.h
index 6f8af525a..fc466b0d2 100644
--- a/Foundation/include/Poco/UTF32Encoding.h
+++ b/Foundation/include/Poco/UTF32Encoding.h
@@ -30,7 +30,7 @@ class Foundation_API UTF32Encoding: public TextEncoding
 	///
 	/// When converting from UTF-32 to Unicode, surrogates are
 	/// reported as they are - in other words, surrogate pairs
-	/// are not combined into one Unicode character. 
+	/// are not combined into one Unicode character.
 {
 public:
 	enum ByteOrderType
@@ -39,28 +39,28 @@ public:
 		LITTLE_ENDIAN_BYTE_ORDER,
 		NATIVE_BYTE_ORDER
 	};
-	
+
 	UTF32Encoding(ByteOrderType byteOrder = NATIVE_BYTE_ORDER);
 		/// Creates and initializes the encoding for the given byte order.
-		
+
 	UTF32Encoding(int byteOrderMark);
 		/// Creates and initializes the encoding for the byte-order
 		/// indicated by the given byte-order mark, which is the Unicode
 		/// character 0xFEFF.
-		
+
 	~UTF32Encoding();
-	
+
 	ByteOrderType getByteOrder() const;
 		/// Returns the byte-order currently in use.
-		
+
 	void setByteOrder(ByteOrderType byteOrder);
 		/// Sets the byte order.
-		
+
 	void setByteOrder(int byteOrderMark);
 		/// Sets the byte order according to the given
 		/// byte order mark, which is the Unicode
 		/// character 0xFEFF.
-	
+
 	const char* canonicalName() const;
 	bool isA(const std::string& encodingName) const;
 	const CharacterMap& characterMap() const;
@@ -68,7 +68,7 @@ public:
 	int convert(int ch, unsigned char* bytes, int length) const;
 	int queryConvert(const unsigned char* bytes, int length) const;
 	int sequenceLength(const unsigned char* bytes, int length) const;
-	
+
 private:
 	bool _flipBytes;
 	static const char* _names[];
diff --git a/Foundation/include/Poco/UTF8Encoding.h b/Foundation/include/Poco/UTF8Encoding.h
index 66e29d2d0..984c163f4 100644
--- a/Foundation/include/Poco/UTF8Encoding.h
+++ b/Foundation/include/Poco/UTF8Encoding.h
@@ -42,10 +42,10 @@ public:
 	static bool isLegal(const unsigned char *bytes, int length);
 		/// Utility routine to tell whether a sequence of bytes is legal UTF-8.
 		/// This must be called with the length pre-determined by the first byte.
-		/// The sequence is illegal right away if there aren't enough bytes 
+		/// The sequence is illegal right away if there aren't enough bytes
 		/// available. If presented with a length > 4, this function returns false.
 		/// The Unicode definition of UTF-8 goes up to 4-byte sequences.
-		/// 
+		///
 		/// Adapted from ftp://ftp.unicode.org/Public/PROGRAMS/CVTUTF/ConvertUTF.c
 		/// Copyright 2001-2004 Unicode, Inc.
 
diff --git a/Foundation/include/Poco/UTF8String.h b/Foundation/include/Poco/UTF8String.h
index 73898c65c..9b0ddb911 100644
--- a/Foundation/include/Poco/UTF8String.h
+++ b/Foundation/include/Poco/UTF8String.h
@@ -52,7 +52,7 @@ struct Foundation_API UTF8
 	static std::string& toUpperInPlace(std::string& str);
 	static std::string toLower(const std::string& str);
 	static std::string& toLowerInPlace(std::string& str);
-	
+
 	static void removeBOM(std::string& str);
 		/// Remove the UTF-8 Byte Order Mark sequence (0xEF, 0xBB, 0xBF)
 		/// from the beginning of the string, if it's there.
diff --git a/Foundation/include/Poco/UTFString.h b/Foundation/include/Poco/UTFString.h
index 7364583e7..09bc7d83c 100644
--- a/Foundation/include/Poco/UTFString.h
+++ b/Foundation/include/Poco/UTFString.h
@@ -39,12 +39,12 @@ struct UTF16CharTraits
 	{
 		c1 = c2;
 	}
-	
+
 	static bool eq(char_type c1, char_type c2)
 	{
 		return c1 == c2;
 	}
-	
+
 	static bool lt(char_type c1, char_type c2)
 	{
 		return c1 < c2;
@@ -120,22 +120,22 @@ struct UTF16CharTraits
 	{
 		return eq_int_type(c, eof()) ? ~eof() : c;
 	}
-	
+
 	static char_type to_char_type(int_type c)
 	{
 		return char_type(c);
 	}
-	
+
 	static int_type to_int_type(char_type c)
 	{
 		return int_type(c);
 	}
-	
+
 	static bool eq_int_type(int_type c1, int_type c2)
 	{
 		return c1 == c2;
 	}
-	
+
 	static int_type eof()
 	{
 		return int_type(0xDFFF);
@@ -156,12 +156,12 @@ struct UTF32CharTraits
 	{
 		c1 = c2;
 	}
-	
+
 	static bool eq(char_type c1, char_type c2)
 	{
 		return c1 == c2;
 	}
-	
+
 	static bool lt(char_type c1, char_type c2)
 	{
 		return c1 < c2;
@@ -237,22 +237,22 @@ struct UTF32CharTraits
 	{
 		return eq_int_type(c, eof()) ? ~eof() : c;
 	}
-	
+
 	static char_type to_char_type(int_type c)
 	{
 		return char_type(c);
 	}
-	
+
 	static int_type to_int_type(char_type c)
 	{
 		return int_type(c);
 	}
-	
+
 	static bool eq_int_type(int_type c1, int_type c2)
 	{
 		return c1 == c2;
 	}
-	
+
 	static int_type eof()
 	{
 		return int_type(0xDFFF);
diff --git a/Foundation/include/Poco/UUID.h b/Foundation/include/Poco/UUID.h
index 2708a0003..0e72f31c2 100644
--- a/Foundation/include/Poco/UUID.h
+++ b/Foundation/include/Poco/UUID.h
@@ -37,7 +37,7 @@ class Foundation_API UUID
 	/// as specified in Appendix A of the DCE 1.1 Remote Procedure
 	/// Call Specification (http://www.opengroup.org/onlinepubs/9629399/),
 	/// RFC 2518 (WebDAV), section 6.4.1 and the UUIDs and GUIDs internet
-	/// draft by Leach/Salz from February, 1998 
+	/// draft by Leach/Salz from February, 1998
 	/// (http://www.ics.uci.edu/~ejw/authoring/uuid-guid/draft-leach-uuids-guids-01.txt)
 	/// and also http://tools.ietf.org/html/draft-mealling-uuid-urn-05
 {
@@ -49,18 +49,18 @@ public:
 		UUID_NAME_BASED      = 0x03,
 		UUID_RANDOM          = 0x04,
 		UUID_NAME_BASED_SHA1 = 0x05
-		
+
 	};
 
 	UUID();
 		/// Creates a nil (all zero) UUID.
-		
+
 	UUID(const UUID& uuid);
 		/// Copy constructor.
 
 	explicit UUID(const std::string& uuid);
 		/// Parses the UUID from a string.
-		
+
 	explicit UUID(const char* uuid);
 		/// Parses the UUID from a string.
 
@@ -69,17 +69,17 @@ public:
 
 	UUID& operator = (const UUID& uuid);
 		/// Assignment operator.
-		
-	void swap(UUID& uuid);
-		/// Swaps the UUID with another one.	
-		
+
+	void swap(UUID& uuid) noexcept;
+		/// Swaps the UUID with another one.
+
 	void parse(const std::string& uuid);
 		/// Parses the UUID from its string representation.
 
 	bool tryParse(const std::string& uuid);
 		/// Tries to interpret the given string as an UUID.
 		/// If the UUID is syntactically valid, assigns the
-		/// members and returns true. Otherwise leaves the 
+		/// members and returns true. Otherwise leaves the
 		/// object unchanged and returns false.
 
 	std::string toString() const;
@@ -100,7 +100,7 @@ public:
 
 	Version version() const;
 		/// Returns the version of the UUID.
-		
+
 	int variant() const;
 		/// Returns the variant number of the UUID:
 		///   - 0 reserved for NCS backward compatibility
@@ -114,7 +114,7 @@ public:
 	bool operator <= (const UUID& uuid) const;
 	bool operator >  (const UUID& uuid) const;
 	bool operator >= (const UUID& uuid) const;
-	
+
 	bool isNull() const;
 		/// Returns true iff the UUID is nil (in other words,
 		/// consists of all zeros).
@@ -124,7 +124,7 @@ public:
 
 	static const UUID& dns();
 		/// Returns the namespace identifier for the DNS namespace.
-		
+
 	static const UUID& uri();
 		/// Returns the namespace identifier for the URI (former URL) namespace.
 
@@ -151,7 +151,7 @@ private:
 	UInt16 _timeHiAndVersion;
 	UInt16 _clockSeq;
 	UInt8  _node[6];
-	
+
 	friend class UUIDGenerator;
 };
 
@@ -207,7 +207,7 @@ inline bool UUID::isNull() const
 }
 
 
-inline void swap(UUID& u1, UUID& u2)
+inline void swap(UUID& u1, UUID& u2) noexcept
 {
 	u1.swap(u2);
 }
diff --git a/Foundation/include/Poco/UnbufferedStreamBuf.h b/Foundation/include/Poco/UnbufferedStreamBuf.h
index 32bb38ab4..314a138f5 100644
--- a/Foundation/include/Poco/UnbufferedStreamBuf.h
+++ b/Foundation/include/Poco/UnbufferedStreamBuf.h
@@ -28,7 +28,7 @@
 namespace Poco {
 
 
-template <typename ch, typename tr> 
+template <typename ch, typename tr>
 class BasicUnbufferedStreamBuf: public std::basic_streambuf<ch, tr>
 	/// This is an implementation of an unbuffered streambuf
 	/// that greatly simplifies the implementation of
@@ -61,7 +61,7 @@ public:
 
 	virtual int_type overflow(int_type c)
 	{
-		if (c != char_traits::eof()) 
+		if (c != char_traits::eof())
 			return writeToDevice(char_traits::to_char_type(c));
 		else
 			return c;
@@ -116,9 +116,9 @@ public:
 			return c;
 		}
 	}
-	
+
 	virtual std::streamsize xsgetn(char_type* p, std::streamsize count)
-		/// Some platforms (for example, Compaq C++) have buggy implementations of 
+		/// Some platforms (for example, Compaq C++) have buggy implementations of
 		/// xsgetn that handle null buffers incorrectly.
 		/// Anyway, it does not hurt to provide an optimized implementation
 		/// of xsgetn for this streambuf implementation.
@@ -146,7 +146,7 @@ private:
 	{
 		return char_traits::eof();
 	}
-	
+
 	virtual int_type writeToDevice(char_type)
 	{
 		return char_traits::eof();
@@ -154,7 +154,7 @@ private:
 
 	int_type _pb;
 	bool     _ispb;
-	
+
 	BasicUnbufferedStreamBuf(const BasicUnbufferedStreamBuf&);
 	BasicUnbufferedStreamBuf& operator = (const BasicUnbufferedStreamBuf&);
 };
diff --git a/Foundation/include/Poco/Unicode.h b/Foundation/include/Poco/Unicode.h
index b6d027685..c6a534592 100644
--- a/Foundation/include/Poco/Unicode.h
+++ b/Foundation/include/Poco/Unicode.h
@@ -36,7 +36,7 @@ class Foundation_API Unicode
 {
 public:
 	// Implementation note: the following definitions must be kept
-	// in sync with those from ucp.h (PCRE).
+	// in sync with those from pcre2_ucp.h (PCRE).
 	enum CharacterCategory
 		/// Unicode character categories.
 	{
@@ -83,7 +83,7 @@ public:
 		UCP_PARAGRAPH_SEPARATOR,
 		UCP_SPACE_SEPARATOR
 	};
-	
+
 	enum Script
 		/// Unicode 7.0 script identifiers.
 	{
@@ -219,12 +219,12 @@ public:
 		UCP_TIRHUTA,
 		UCP_WARANG_CITI
 	};
-	
+
 	enum
 	{
 		UCP_MAX_CODEPOINT = 0x10FFFF
 	};
-	
+
 	struct CharacterProperties
 		/// This structure holds the character properties
 		/// of an Unicode character.
@@ -237,27 +237,27 @@ public:
 	static void properties(int ch, CharacterProperties& props);
 		/// Return the Unicode character properties for the
 		/// character with the given Unicode value.
-		
+
 	static bool isSpace(int ch);
 		/// Returns true iff the given character is a separator.
-		
+
 	static bool isDigit(int ch);
 		/// Returns true iff the given character is a numeric character.
-		
+
 	static bool isPunct(int ch);
 		/// Returns true iff the given character is a punctuation character.
-		
+
 	static bool isAlpha(int ch);
-		/// Returns true iff the given character is a letter.	
-		
+		/// Returns true iff the given character is a letter.
+
 	static bool isLower(int ch);
 		/// Returns true iff the given character is a lowercase
 		/// character.
-		
+
 	static bool isUpper(int ch);
 		/// Returns true iff the given character is an uppercase
 		/// character.
-		
+
 	static int toLower(int ch);
 		/// If the given character is an uppercase character,
 		/// return its lowercase counterpart, otherwise return
@@ -312,7 +312,7 @@ inline bool Unicode::isLower(int ch)
 	return props.category == UCP_LETTER && props.type == UCP_LOWER_CASE_LETTER;
 }
 
-	
+
 inline bool Unicode::isUpper(int ch)
 {
 	CharacterProperties props;
diff --git a/Foundation/include/Poco/UnicodeConverter.h b/Foundation/include/Poco/UnicodeConverter.h
index 0733b67b7..54cda407d 100644
--- a/Foundation/include/Poco/UnicodeConverter.h
+++ b/Foundation/include/Poco/UnicodeConverter.h
@@ -46,10 +46,10 @@ public:
 	static void convert(const std::string& utf8String, UTF16String& utf16String);
 		/// Converts the given UTF-8 encoded string into an UTF-16 encoded wide string.
 
-	static void convert(const char* utf8String,  std::size_t length, UTF16String& utf16String);	
+	static void convert(const char* utf8String,  std::size_t length, UTF16String& utf16String);
 		/// Converts the given UTF-8 encoded character sequence into an UTF-16 encoded wide string.
 
-	static void convert(const char* utf8String, UTF16String& utf16String);	
+	static void convert(const char* utf8String, UTF16String& utf16String);
 		/// Converts the given zero-terminated UTF-8 encoded character sequence into an UTF-16 encoded wide string.
 
 	static void convert(const UTF16String& utf16String, std::string& utf8String);
diff --git a/Foundation/include/Poco/UniqueAccessExpireCache.h b/Foundation/include/Poco/UniqueAccessExpireCache.h
index a2d58f643..17db35072 100644
--- a/Foundation/include/Poco/UniqueAccessExpireCache.h
+++ b/Foundation/include/Poco/UniqueAccessExpireCache.h
@@ -26,19 +26,19 @@ namespace Poco {
 
 
 template <
-	class TKey, 
+	class TKey,
 	class TValue,
-	class TMutex = FastMutex, 
+	class TMutex = FastMutex,
 	class TEventMutex = FastMutex
-> 
+>
 class UniqueAccessExpireCache: public AbstractCache<TKey, TValue, UniqueAccessExpireStrategy<TKey, TValue>, TMutex, TEventMutex>
 	/// An UniqueAccessExpireCache caches entries for a given time span. In contrast
-	/// to ExpireCache which only allows to set a per cache expiration value, it allows to define 
+	/// to ExpireCache which only allows to set a per cache expiration value, it allows to define
 	/// expiration per CacheEntry.
 	/// Each TValue object must thus offer the following method:
-	///    
+	///
 	///    const Poco::Timespan& getTimeout() const;
-	///    
+	///
 	/// which returns the relative timespan for how long the entry should be valid without being accessed!
 	/// The absolute expire timepoint is calculated as now() + getTimeout().
 	/// Accessing an object will update this absolute expire timepoint.
@@ -48,7 +48,7 @@ class UniqueAccessExpireCache: public AbstractCache<TKey, TValue, UniqueAccessEx
 	/// Be careful when using an UniqueAccessExpireCache. A cache is often used
 	/// like cache.has(x) followed by cache.get x). Note that it could happen
 	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
-	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
+	/// the entry gets invalid, thus leading to an empty SharedPtr being returned
 	/// when "get" is invoked.
 {
 public:
diff --git a/Foundation/include/Poco/UniqueAccessExpireLRUCache.h b/Foundation/include/Poco/UniqueAccessExpireLRUCache.h
index ce54a9905..c8bbddde8 100644
--- a/Foundation/include/Poco/UniqueAccessExpireLRUCache.h
+++ b/Foundation/include/Poco/UniqueAccessExpireLRUCache.h
@@ -27,10 +27,10 @@
 namespace Poco {
 
 
-template < 
+template <
 	class TKey,
 	class TValue,
-	class TMutex = FastMutex, 
+	class TMutex = FastMutex,
 	class TEventMutex = FastMutex
 >
 class UniqueAccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue>, TMutex, TEventMutex>
@@ -38,9 +38,9 @@ class UniqueAccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCol
 	/// One can define for each cache entry a separate timepoint
 	/// but also limit the size of the cache (per default: 1024).
 	/// Each TValue object must thus offer the following method:
-	///    
+	///
 	///    const Poco::Timespan& getTimeout() const;
-	///    
+	///
 	/// which returns the relative timespan for how long the entry should be valid without being accessed!
 	/// The absolute expire timepoint is calculated as now() + getTimeout().
 	/// Accessing an object will update this absolute expire timepoint.
@@ -48,7 +48,7 @@ class UniqueAccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCol
 	/// method to values that do not have a getExpiration function.
 {
 public:
-	UniqueAccessExpireLRUCache(std::size_t cacheSize = 1024): 
+	UniqueAccessExpireLRUCache(std::size_t cacheSize = 1024):
 		AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue>, TMutex, TEventMutex>(StrategyCollection<TKey, TValue>())
 	{
 		this->_strategy.pushBack(new LRUStrategy<TKey, TValue>(cacheSize));
diff --git a/Foundation/include/Poco/UniqueAccessExpireStrategy.h b/Foundation/include/Poco/UniqueAccessExpireStrategy.h
index d20f2185e..811a350e5 100644
--- a/Foundation/include/Poco/UniqueAccessExpireStrategy.h
+++ b/Foundation/include/Poco/UniqueAccessExpireStrategy.h
@@ -33,18 +33,18 @@
 namespace Poco {
 
 
-template < 
+template <
 	class TKey,
 	class TValue
 >
 class UniqueAccessExpireStrategy: public AbstractStrategy<TKey, TValue>
 	/// An UniqueExpireStrategy implements time based expiration of cache entries. In contrast
-	/// to ExpireStrategy which only allows to set a per cache expiration value, it allows to define 
+	/// to ExpireStrategy which only allows to set a per cache expiration value, it allows to define
 	/// expiration per CacheEntry.
 	/// Each TValue object must thus offer the following method:
-	///    
+	///
 	///    const Poco::Timestamp& getTimeout() const;
-	///    
+	///
 	/// which returns the timespan for how long an object will be valid without being accessed.
 {
 public:
@@ -71,7 +71,7 @@ public:
 		// value will expire, even insert negative values!
 		Timestamp expire;
 		expire += args.value().getTimeout().totalMicroseconds();
-		
+
 		IndexIterator it = _keyIndex.insert(std::make_pair(expire, std::make_pair(args.key(), args.value().getTimeout())));
 		std::pair<Iterator, bool> stat = _keys.insert(std::make_pair(args.key(), it));
 		if (!stat.second)
diff --git a/Foundation/include/Poco/UniqueExpireCache.h b/Foundation/include/Poco/UniqueExpireCache.h
index 613f9e215..9c1b67fb9 100644
--- a/Foundation/include/Poco/UniqueExpireCache.h
+++ b/Foundation/include/Poco/UniqueExpireCache.h
@@ -26,19 +26,19 @@ namespace Poco {
 
 
 template <
-	class TKey, 
+	class TKey,
 	class TValue,
-	class TMutex = FastMutex, 
+	class TMutex = FastMutex,
 	class TEventMutex = FastMutex
-> 
+>
 class UniqueExpireCache: public AbstractCache<TKey, TValue, UniqueExpireStrategy<TKey, TValue>, TMutex, TEventMutex>
 	/// An UniqueExpireCache caches entries for a given time amount. In contrast
-	/// to ExpireCache which only allows to set a per cache expiration value, it allows to define 
+	/// to ExpireCache which only allows to set a per cache expiration value, it allows to define
 	/// expiration per CacheEntry.
 	/// Each TValue object must thus offer the following method:
-	///    
+	///
 	///    const Poco::Timestamp& getExpiration() const;
-	///    
+	///
 	/// which returns the absolute timepoint when the entry will be invalidated.
 	/// Accessing an object will NOT update this absolute expire timepoint.
 	/// You can use the Poco::ExpirationDecorator to add the getExpiration
@@ -47,7 +47,7 @@ class UniqueExpireCache: public AbstractCache<TKey, TValue, UniqueExpireStrategy
 	/// Be careful when using an UniqueExpireCache. A cache is often used
 	/// like cache.has(x) followed by cache.get x). Note that it could happen
 	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
-	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
+	/// the entry gets invalid, thus leading to an empty SharedPtr being returned
 	/// when "get" is invoked.
 {
 public:
diff --git a/Foundation/include/Poco/UniqueExpireLRUCache.h b/Foundation/include/Poco/UniqueExpireLRUCache.h
index e11935cf9..1c25a0eff 100644
--- a/Foundation/include/Poco/UniqueExpireLRUCache.h
+++ b/Foundation/include/Poco/UniqueExpireLRUCache.h
@@ -27,10 +27,10 @@
 namespace Poco {
 
 
-template < 
+template <
 	class TKey,
 	class TValue,
-	class TMutex = FastMutex, 
+	class TMutex = FastMutex,
 	class TEventMutex = FastMutex
 >
 class UniqueExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue>, TMutex, TEventMutex>
@@ -38,9 +38,9 @@ class UniqueExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollectio
 	/// One can define for each cache entry a separate timepoint
 	/// but also limit the size of the cache (per default: 1024).
 	/// Each TValue object must thus offer the following method:
-	///    
+	///
 	///    const Poco::Timestamp& getExpiration() const;
-	///    
+	///
 	/// which returns the absolute timepoint when the entry will be invalidated.
 	/// Accessing an object will NOT update this absolute expire timepoint.
 	/// You can use the Poco::ExpirationDecorator to add the getExpiration
diff --git a/Foundation/include/Poco/UniqueExpireStrategy.h b/Foundation/include/Poco/UniqueExpireStrategy.h
index 6ae79945b..12858af9c 100644
--- a/Foundation/include/Poco/UniqueExpireStrategy.h
+++ b/Foundation/include/Poco/UniqueExpireStrategy.h
@@ -31,18 +31,18 @@
 namespace Poco {
 
 
-template < 
+template <
 	class TKey,
 	class TValue
 >
 class UniqueExpireStrategy: public AbstractStrategy<TKey, TValue>
 	/// An UniqueExpireStrategy implements time based expiration of cache entries. In contrast
-	/// to ExpireStrategy which only allows to set a per cache expiration value, it allows to define 
+	/// to ExpireStrategy which only allows to set a per cache expiration value, it allows to define
 	/// expiration per CacheEntry.
 	/// Each TValue object must thus offer the following method:
-	///    
+	///
 	///    const Poco::Timestamp& getExpiration() const;
-	///    
+	///
 	/// which returns the absolute timepoint when the entry will be invalidated.
 {
 public:
diff --git a/Foundation/include/Poco/ValidArgs.h b/Foundation/include/Poco/ValidArgs.h
index 7928a0fe8..04afd775a 100644
--- a/Foundation/include/Poco/ValidArgs.h
+++ b/Foundation/include/Poco/ValidArgs.h
@@ -29,13 +29,13 @@ class ValidArgs
 {
 public:
 	ValidArgs(const TKey& key):
-		_key(key), 
+		_key(key),
 		_isValid(true)
 	{
 	}
 
-	ValidArgs(const ValidArgs& args): 
-		_key(args._key), 
+	ValidArgs(const ValidArgs& args):
+		_key(args._key),
 		_isValid(args._isValid)
 	{
 	}
@@ -43,7 +43,7 @@ public:
 	~ValidArgs()
 	{
 	}
-	
+
 	const TKey&	key() const
 	{
 		return _key;
diff --git a/Foundation/include/Poco/Void.h b/Foundation/include/Poco/Void.h
index fa0cd31af..fa3911a71 100644
--- a/Foundation/include/Poco/Void.h
+++ b/Foundation/include/Poco/Void.h
@@ -25,7 +25,7 @@ namespace Poco {
 
 
 class Foundation_API Void
-	/// A dummy class with value-type semantics, 
+	/// A dummy class with value-type semantics,
 	/// mostly useful as a template argument.
 	///
 	/// This class is typically used together with ActiveMethod,
@@ -38,9 +38,9 @@ public:
 	Void(const Void& v);
 		/// Creates the Void from another Void.
 		///
-		/// The philosophical aspects of this operation 
+		/// The philosophical aspects of this operation
 		/// remain undiscussed for now.
-		
+
 	~Void();
 		/// Destroys the Void.
 
diff --git a/Foundation/include/Poco/Windows1250Encoding.h b/Foundation/include/Poco/Windows1250Encoding.h
index c40a42884..35a470740 100644
--- a/Foundation/include/Poco/Windows1250Encoding.h
+++ b/Foundation/include/Poco/Windows1250Encoding.h
@@ -39,7 +39,7 @@ public:
 	int convert(int ch, unsigned char* bytes, int length) const;
 	int queryConvert(const unsigned char* bytes, int length) const;
 	int sequenceLength(const unsigned char* bytes, int length) const;
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Foundation/include/Poco/Windows1251Encoding.h b/Foundation/include/Poco/Windows1251Encoding.h
index 87510a9d9..d44ba8d2b 100644
--- a/Foundation/include/Poco/Windows1251Encoding.h
+++ b/Foundation/include/Poco/Windows1251Encoding.h
@@ -39,7 +39,7 @@ public:
 	int convert(int ch, unsigned char* bytes, int length) const;
 	int queryConvert(const unsigned char* bytes, int length) const;
 	int sequenceLength(const unsigned char* bytes, int length) const;
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Foundation/include/Poco/Windows1252Encoding.h b/Foundation/include/Poco/Windows1252Encoding.h
index a5e290141..cd35a29d7 100644
--- a/Foundation/include/Poco/Windows1252Encoding.h
+++ b/Foundation/include/Poco/Windows1252Encoding.h
@@ -38,7 +38,7 @@ public:
 	int convert(int ch, unsigned char* bytes, int length) const;
 	int queryConvert(const unsigned char* bytes, int length) const;
 	int sequenceLength(const unsigned char* bytes, int length) const;
-	
+
 private:
 	static const char* _names[];
 	static const CharacterMap _charMap;
diff --git a/Foundation/include/Poco/WindowsConsoleChannel.h b/Foundation/include/Poco/WindowsConsoleChannel.h
index 4c7aef662..41c2f88fe 100644
--- a/Foundation/include/Poco/WindowsConsoleChannel.h
+++ b/Foundation/include/Poco/WindowsConsoleChannel.h
@@ -39,7 +39,7 @@ class Foundation_API WindowsConsoleChannel: public Channel
 	/// class, which cannot handle UTF-8 encoded messages on Windows.
 	///
 	/// Chain this channel to a FormattingChannel with an
-	/// appropriate Formatter to control what is contained 
+	/// appropriate Formatter to control what is contained
 	/// in the text.
 	///
 	/// Only available on Windows platforms.
@@ -52,7 +52,7 @@ public:
 
 	void log(const Message& msg);
 		/// Logs the given message to the channel's stream.
-		
+
 protected:
 	~WindowsConsoleChannel();
 
@@ -79,7 +79,7 @@ class Foundation_API WindowsColorConsoleChannel: public Channel
 	/// property to true (default). Furthermore, colors can be
 	/// configured by setting the following properties
 	/// (default values are given in parenthesis):
-	/// 
+	///
 	///   * traceColor (gray)
 	///   * debugColor (gray)
 	///   * informationColor (default)
@@ -90,7 +90,7 @@ class Foundation_API WindowsColorConsoleChannel: public Channel
 	///   * fatalColor (lightRed)
 	///
 	/// The following color values are supported:
-	/// 
+	///
 	///   * default
 	///   * black
 	///   * red
@@ -110,7 +110,7 @@ class Foundation_API WindowsColorConsoleChannel: public Channel
 	///   * white
 	///
 	/// Chain this channel to a FormattingChannel with an
-	/// appropriate Formatter to control what is contained 
+	/// appropriate Formatter to control what is contained
 	/// in the text.
 	///
 	/// Only available on Windows platforms.
@@ -125,8 +125,8 @@ public:
 		/// Logs the given message to the channel's stream.
 
 	void setProperty(const std::string& name, const std::string& value);
-		/// Sets the property with the given name. 
-		/// 
+		/// Sets the property with the given name.
+		///
 		/// The following properties are supported:
 		///   * enableColors:      Enable or disable colors.
 		///   * traceColor:        Specify color for trace messages.
@@ -144,7 +144,7 @@ public:
 		/// Returns the value of the property with the given name.
 		/// See setProperty() for a description of the supported
 		/// properties.
-		
+
 protected:
 	enum Color
 	{
diff --git a/Foundation/include/Poco/ordered_hash.h b/Foundation/include/Poco/ordered_hash.h
index e728c6156..560de7991 100644
--- a/Foundation/include/Poco/ordered_hash.h
+++ b/Foundation/include/Poco/ordered_hash.h
@@ -1,18 +1,18 @@
 /**
  * MIT License
- * 
+ *
  * Copyright (c) 2017 Tessil
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -59,7 +59,7 @@
 
 
 /*
- * Only activate tsl_assert if TSL_DEBUG is defined. 
+ * Only activate tsl_assert if TSL_DEBUG is defined.
  * This way we avoid the performance hit when NDEBUG is not defined with assert as tsl_assert is used a lot
  * (people usually compile with "-O3" and not "-O3 -DNDEBUG").
  */
@@ -75,7 +75,7 @@
 namespace tsl {
 
 namespace detail_ordered_hash {
-    
+
 template<typename T>
 struct make_void {
     using type = void;
@@ -102,9 +102,9 @@ struct is_vector<T, typename std::enable_if<
 
 
 /**
- * Each bucket entry stores a 32-bits index which is the index in m_values corresponding to the bucket's value 
+ * Each bucket entry stores a 32-bits index which is the index in m_values corresponding to the bucket's value
  * and a 32 bits hash (truncated if the original was 64-bits) corresponding to the hash of the value.
- * 
+ *
  * The 32-bit index limits the size of the map to 2^32 - 1 elements (-1 due to a reserved value used to mark a
  * bucket as empty).
  */
@@ -112,63 +112,63 @@ class bucket_entry {
 public:
     using index_type = std::uint_least32_t;
     using truncated_hash_type = std::uint_least32_t;
-    
-    
+
+
     bucket_entry() noexcept: m_index(EMPTY_MARKER_INDEX), m_hash(0) {
     }
-    
+
     bool empty() const noexcept {
         return m_index == EMPTY_MARKER_INDEX;
     }
-    
+
     void clear() noexcept {
         m_index = EMPTY_MARKER_INDEX;
     }
-    
+
     index_type index() const noexcept {
         tsl_assert(!empty());
         return m_index;
     }
-    
+
     index_type& index_ref() noexcept {
         tsl_assert(!empty());
         return m_index;
     }
-    
+
     void set_index(index_type index) noexcept {
         tsl_assert(index <= max_size());
-        
+
         m_index = index;
     }
-    
+
     truncated_hash_type truncated_hash() const noexcept {
         tsl_assert(!empty());
         return m_hash;
     }
-    
+
     truncated_hash_type& truncated_hash_ref() noexcept {
         tsl_assert(!empty());
         return m_hash;
     }
-    
+
     void set_hash(std::size_t hash) noexcept {
         m_hash = truncate_hash(hash);
     }
-    
-    
-    
+
+
+
     static truncated_hash_type truncate_hash(std::size_t hash) noexcept {
         return truncated_hash_type(hash);
     }
-    
+
     static std::size_t max_size() noexcept {
         return std::numeric_limits<index_type>::max() - NB_RESERVED_INDEXES;
     }
-    
+
 private:
     static const index_type EMPTY_MARKER_INDEX = std::numeric_limits<index_type>::max();
     static const std::size_t NB_RESERVED_INDEXES = 1;
-    
+
     index_type m_index;
     truncated_hash_type m_hash;
 };
@@ -177,27 +177,27 @@ private:
 
 /**
  * Internal common class used by ordered_map and ordered_set.
- * 
+ *
  * ValueType is what will be stored by ordered_hash (usually std::pair<Key, T> for map and Key for set).
- * 
+ *
  * KeySelect should be a FunctionObject which takes a ValueType in parameter and return a reference to the key.
- * 
- * ValueSelect should be a FunctionObject which takes a ValueType in parameter and return a reference to the value. 
+ *
+ * ValueSelect should be a FunctionObject which takes a ValueType in parameter and return a reference to the value.
  * ValueSelect should be void if there is no value (in set for example).
- * 
- * ValueTypeContainer is the container which will be used to store ValueType values. 
+ *
+ * ValueTypeContainer is the container which will be used to store ValueType values.
  * Usually a std::deque<ValueType, Allocator> or std::vector<ValueType, Allocator>.
- * 
- * 
- * 
+ *
+ *
+ *
  * The orderd_hash structure is a hash table which preserves the order of insertion of the elements.
  * To do so, it stores the values in the ValueTypeContainer (m_values) using emplace_back at each
- * insertion of a new element. Another structure (m_buckets of type std::vector<bucket_entry>) will 
- * serve as buckets array for the hash table part. Each bucket stores an index which corresponds to 
+ * insertion of a new element. Another structure (m_buckets of type std::vector<bucket_entry>) will
+ * serve as buckets array for the hash table part. Each bucket stores an index which corresponds to
  * the index in m_values where the bucket's value is and the (truncated) hash of this value. An index
  * is used instead of a pointer to the value to reduce the size of each bucket entry.
- * 
- * To resolve collisions in the buckets array, the structures use robin hood linear probing with 
+ *
+ * To resolve collisions in the buckets array, the structures use robin hood linear probing with
  * backward shift deletion.
  */
 template<class ValueType,
@@ -211,17 +211,17 @@ class ordered_hash: private Hash, private KeyEqual {
 private:
     template<typename U>
     using has_mapped_type = typename std::integral_constant<bool, !std::is_same<U, void>::value>;
-    
-    static_assert(std::is_same<typename ValueTypeContainer::value_type, ValueType>::value, 
+
+    static_assert(std::is_same<typename ValueTypeContainer::value_type, ValueType>::value,
                   "ValueTypeContainer::value_type != ValueType.");
-    static_assert(std::is_same<typename ValueTypeContainer::allocator_type, Allocator>::value, 
+    static_assert(std::is_same<typename ValueTypeContainer::allocator_type, Allocator>::value,
                   "ValueTypeContainer::allocator_type != Allocator.");
-    
-    
+
+
 public:
     template<bool IsConst>
     class ordered_iterator;
-    
+
     using key_type = typename KeySelect::key_type;
     using value_type = ValueType;
     using size_type = std::size_t;
@@ -237,34 +237,34 @@ public:
     using const_iterator = ordered_iterator<true>;
     using reverse_iterator = std::reverse_iterator<iterator>;
     using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-    
+
     using values_container_type = ValueTypeContainer;
-    
+
 public:
     template<bool IsConst>
     class ordered_iterator {
         friend class ordered_hash;
-        
+
     private:
-        using iterator = typename std::conditional<IsConst, 
-                                                    typename values_container_type::const_iterator, 
+        using iterator = typename std::conditional<IsConst,
+                                                    typename values_container_type::const_iterator,
                                                     typename values_container_type::iterator>::type;
-    
-        
+
+
         ordered_iterator(iterator it) noexcept: m_iterator(it) {
         }
-        
+
     public:
         using iterator_category = std::random_access_iterator_tag;
         using value_type = const typename ordered_hash::value_type;
         using difference_type = typename iterator::difference_type;
         using reference = value_type&;
         using pointer = value_type*;
-        
-        
+
+
         ordered_iterator() noexcept {
         }
-        
+
         ordered_iterator(const ordered_iterator<false>& other) noexcept: m_iterator(other.m_iterator) {
         }
 
@@ -281,77 +281,77 @@ public:
         typename U::value_type& value() {
             return U()(*m_iterator);
         }
-        
+
         reference operator*() const { return *m_iterator; }
         pointer operator->() const { return m_iterator.operator->(); }
-        
+
         ordered_iterator& operator++() { ++m_iterator; return *this; }
         ordered_iterator& operator--() { --m_iterator; return *this; }
-        
+
         ordered_iterator operator++(int) { ordered_iterator tmp(*this); ++(*this); return tmp; }
         ordered_iterator operator--(int) { ordered_iterator tmp(*this); --(*this); return tmp; }
-        
+
         reference operator[](difference_type n) const { return m_iterator[n]; }
-        
+
         ordered_iterator& operator+=(difference_type n) { m_iterator += n; return *this; }
         ordered_iterator& operator-=(difference_type n) { m_iterator -= n; return *this; }
-        
+
         ordered_iterator operator+(difference_type n) { ordered_iterator tmp(*this); tmp += n; return tmp; }
         ordered_iterator operator-(difference_type n) { ordered_iterator tmp(*this); tmp -= n; return tmp; }
-        
-        friend bool operator==(const ordered_iterator& lhs, const ordered_iterator& rhs) { 
-            return lhs.m_iterator == rhs.m_iterator; 
-        }
-        
-        friend bool operator!=(const ordered_iterator& lhs, const ordered_iterator& rhs) { 
-            return lhs.m_iterator != rhs.m_iterator; 
-        }
-        
-        friend bool operator<(const ordered_iterator& lhs, const ordered_iterator& rhs) { 
-            return lhs.m_iterator < rhs.m_iterator; 
-        }
-        
-        friend bool operator>(const ordered_iterator& lhs, const ordered_iterator& rhs) { 
-            return lhs.m_iterator > rhs.m_iterator; 
-        }
-        
-        friend bool operator<=(const ordered_iterator& lhs, const ordered_iterator& rhs) { 
-            return lhs.m_iterator <= rhs.m_iterator; 
-        }
-        
-        friend bool operator>=(const ordered_iterator& lhs, const ordered_iterator& rhs) { 
-            return lhs.m_iterator >= rhs.m_iterator; 
+
+        friend bool operator==(const ordered_iterator& lhs, const ordered_iterator& rhs) {
+            return lhs.m_iterator == rhs.m_iterator;
         }
 
-        friend ordered_iterator operator+(difference_type n, const ordered_iterator& it) { 
+        friend bool operator!=(const ordered_iterator& lhs, const ordered_iterator& rhs) {
+            return lhs.m_iterator != rhs.m_iterator;
+        }
+
+        friend bool operator<(const ordered_iterator& lhs, const ordered_iterator& rhs) {
+            return lhs.m_iterator < rhs.m_iterator;
+        }
+
+        friend bool operator>(const ordered_iterator& lhs, const ordered_iterator& rhs) {
+            return lhs.m_iterator > rhs.m_iterator;
+        }
+
+        friend bool operator<=(const ordered_iterator& lhs, const ordered_iterator& rhs) {
+            return lhs.m_iterator <= rhs.m_iterator;
+        }
+
+        friend bool operator>=(const ordered_iterator& lhs, const ordered_iterator& rhs) {
+            return lhs.m_iterator >= rhs.m_iterator;
+        }
+
+        friend ordered_iterator operator+(difference_type n, const ordered_iterator& it) {
             return n + it.m_iterator;
         }
 
-        friend difference_type operator-(const ordered_iterator& lhs, const ordered_iterator& rhs) { 
-            return lhs.m_iterator - rhs.m_iterator; 
+        friend difference_type operator-(const ordered_iterator& lhs, const ordered_iterator& rhs) {
+            return lhs.m_iterator - rhs.m_iterator;
         }
 
     private:
         iterator m_iterator;
     };
-    
-    
+
+
 private:
-    using buckets_container_allocator = typename 
-                            std::allocator_traits<allocator_type>::template rebind_alloc<bucket_entry>; 
-                            
+    using buckets_container_allocator = typename
+                            std::allocator_traits<allocator_type>::template rebind_alloc<bucket_entry>;
+
     using buckets_container_type = std::vector<bucket_entry, buckets_container_allocator>;
-    
-    
+
+
     using truncated_hash_type = typename bucket_entry::truncated_hash_type;
     using index_type = typename bucket_entry::index_type;
-    
+
 public:
-    ordered_hash(size_type bucket_count, 
+    ordered_hash(size_type bucket_count,
                  const Hash& hash,
                  const KeyEqual& equal,
                  const Allocator& alloc,
-                 float max_load_factor): Hash(hash), KeyEqual(equal), m_buckets(alloc), 
+                 float max_load_factor): Hash(hash), KeyEqual(equal), m_buckets(alloc),
                                          m_values(alloc), m_grow_on_next_insert(false)
     {
         bucket_count = round_up_to_power_of_two(bucket_count);
@@ -359,86 +359,86 @@ public:
             throw std::length_error("The map exceeds its maxmimum size.");
         }
         tsl_assert(bucket_count > 0);
-        
+
         m_buckets.resize(bucket_count);
-        m_mask = bucket_count - 1; 
-        
+        m_mask = bucket_count - 1;
+
         this->max_load_factor(max_load_factor);
     }
-    
+
     allocator_type get_allocator() const {
         return m_values.get_allocator();
     }
-    
-    
+
+
     /*
      * Iterators
      */
     iterator begin() noexcept {
         return iterator(m_values.begin());
     }
-    
+
     const_iterator begin() const noexcept {
         return cbegin();
     }
-    
+
     const_iterator cbegin() const noexcept {
         return const_iterator(m_values.cbegin());
     }
-    
+
     iterator end() noexcept {
         return iterator(m_values.end());
     }
-    
+
     const_iterator end() const noexcept {
         return cend();
     }
-    
+
     const_iterator cend() const noexcept {
         return const_iterator(m_values.cend());
-    }  
-    
-    
+    }
+
+
     reverse_iterator rbegin() noexcept {
         return reverse_iterator(m_values.end());
     }
-    
+
     const_reverse_iterator rbegin() const noexcept {
         return rcbegin();
     }
-    
+
     const_reverse_iterator rcbegin() const noexcept {
         return const_reverse_iterator(m_values.cend());
     }
-    
+
     reverse_iterator rend() noexcept {
         return reverse_iterator(m_values.begin());
     }
-    
+
     const_reverse_iterator rend() const noexcept {
         return rcend();
     }
-    
+
     const_reverse_iterator rcend() const noexcept {
         return const_reverse_iterator(m_values.cbegin());
-    }  
-    
-    
+    }
+
+
     /*
      * Capacity
      */
     bool empty() const noexcept {
         return m_values.empty();
     }
-    
+
     size_type size() const noexcept {
         return m_values.size();
     }
-    
+
     size_type max_size() const noexcept {
         return std::min(bucket_entry::max_size(), m_values.max_size());
     }
-    
+
 
     /*
      * Modifiers
@@ -447,100 +447,100 @@ public:
         for(auto& bucket: m_buckets) {
             bucket.clear();
         }
-        
+
         m_values.clear();
         m_grow_on_next_insert = false;
     }
-    
+
     template<typename P>
     std::pair<iterator, bool> insert(P&& value) {
         return insert_impl(KeySelect()(value), std::forward<P>(value));
     }
-    
+
     template<typename P>
-    iterator insert(const_iterator hint, P&& value) { 
-        if(hint != cend() && compare_keys(KeySelect()(*hint), KeySelect()(value))) { 
-            return mutable_iterator(hint); 
+    iterator insert(const_iterator hint, P&& value) {
+        if(hint != cend() && compare_keys(KeySelect()(*hint), KeySelect()(value))) {
+            return mutable_iterator(hint);
         }
-        
-        return insert(std::forward<P>(value)).first; 
+
+        return insert(std::forward<P>(value)).first;
     }
-    
+
     template<class InputIt>
     void insert(InputIt first, InputIt last) {
-        if(std::is_base_of<std::forward_iterator_tag, 
-                           typename std::iterator_traits<InputIt>::iterator_category>::value) 
+        if(std::is_base_of<std::forward_iterator_tag,
+                           typename std::iterator_traits<InputIt>::iterator_category>::value)
         {
             const auto nb_elements_insert = std::distance(first, last);
             const size_type nb_free_buckets = m_load_threshold - size();
             tsl_assert(m_load_threshold >= size());
-            
+
             if(nb_elements_insert > 0 && nb_free_buckets < size_type(nb_elements_insert)) {
                 reserve(size() + size_type(nb_elements_insert));
             }
         }
-        
+
         for(; first != last; ++first) {
             insert(*first);
         }
     }
-    
-    
-    
+
+
+
     template<class K, class M>
     std::pair<iterator, bool> insert_or_assign(K&& key, M&& value) {
         auto it = try_emplace(std::forward<K>(key), std::forward<M>(value));
         if(!it.second) {
             it.first.value() = std::forward<M>(value);
         }
-        
+
         return it;
     }
-    
+
     template<class K, class M>
     iterator insert_or_assign(const_iterator hint, K&& key, M&& obj) {
-        if(hint != cend() && compare_keys(KeySelect()(*hint), key)) { 
-            auto it = mutable_iterator(hint); 
+        if(hint != cend() && compare_keys(KeySelect()(*hint), key)) {
+            auto it = mutable_iterator(hint);
             it.value() = std::forward<M>(obj);
-            
+
             return it;
         }
-        
+
         return insert_or_assign(std::forward<K>(key), std::forward<M>(obj)).first;
     }
-    
-    
-    
+
+
+
     template<class... Args>
     std::pair<iterator, bool> emplace(Args&&... args) {
         return insert(value_type(std::forward<Args>(args)...));
     }
-    
+
     template<class... Args>
-    iterator emplace_hint(const_iterator hint, Args&&... args) { 
+    iterator emplace_hint(const_iterator hint, Args&&... args) {
         return insert(hint, value_type(std::forward<Args>(args)...));
     }
-    
-    
-    
+
+
+
     template<class K, class... Args>
     std::pair<iterator, bool> try_emplace(K&& key, Args&&... value_args) {
-        return insert_impl(key, std::piecewise_construct, 
-                                std::forward_as_tuple(std::forward<K>(key)), 
-                                std::forward_as_tuple(std::forward<Args>(value_args)...));     
+        return insert_impl(key, std::piecewise_construct,
+                                std::forward_as_tuple(std::forward<K>(key)),
+                                std::forward_as_tuple(std::forward<Args>(value_args)...));
     }
-    
+
     template<class K, class... Args>
     iterator try_emplace(const_iterator hint, K&& key, Args&&... args) {
-        if(hint != cend() && compare_keys(KeySelect()(*hint), key)) { 
-            return mutable_iterator(hint); 
+        if(hint != cend() && compare_keys(KeySelect()(*hint), key)) {
+            return mutable_iterator(hint);
         }
-        
+
         return try_emplace(std::forward<K>(key), std::forward<Args>(args)...).first;
     }
-    
-    
-    
+
+
+
     /**
      * Here to avoid `template<class K> size_type erase(const K& key)` being used when
      * we use a iterator instead of a const_iterator.
@@ -548,19 +548,19 @@ public:
     iterator erase(iterator pos) {
         return erase(const_iterator(pos));
     }
-    
+
     iterator erase(const_iterator pos) {
         tsl_assert(pos != cend());
-        
+
         const std::size_t index_erase = iterator_to_index(pos);
-        
+
         auto it_bucket = find_key(pos.key(), hash_key(pos.key()));
         tsl_assert(it_bucket != m_buckets.end());
-        
+
         erase_value_from_bucket(it_bucket);
-        
+
         /*
-         * One element was removed from m_values, due to the left shift the next element 
+         * One element was removed from m_values, due to the left shift the next element
          * is now at the position of the previous element (or end if none).
          */
         return begin() + index_erase;
@@ -570,22 +570,22 @@ public:
         if(first == last) {
             return mutable_iterator(first);
         }
-        
+
         tsl_assert(std::distance(first, last) > 0);
         const std::size_t start_index = iterator_to_index(first);
         const std::size_t nb_values = std::size_t(std::distance(first, last));
         const std::size_t end_index = start_index + nb_values;
-        
+
         // Delete all values
-#ifdef TSL_NO_CONTAINER_ERASE_CONST_ITERATOR     
-        auto next_it = m_values.erase(mutable_iterator(first).m_iterator, mutable_iterator(last).m_iterator);   
+#ifdef TSL_NO_CONTAINER_ERASE_CONST_ITERATOR
+        auto next_it = m_values.erase(mutable_iterator(first).m_iterator, mutable_iterator(last).m_iterator);
 #else
         auto next_it = m_values.erase(first.m_iterator, last.m_iterator);
 #endif
-        
+
         /*
          * Mark the buckets corresponding to the values as empty and do a backward shift.
-         * 
+         *
          * Also, the erase operation on m_values has shifted all the values on the right of last.m_iterator.
          * Adapt the indexes for these values.
          */
@@ -607,24 +607,24 @@ public:
                 ibucket++;
             }
         }
-        
+
         return iterator(next_it);
     }
-    
+
 
     template<class K>
     size_type erase(const K& key) {
         return erase(key, hash_key(key));
     }
-    
+
     template<class K>
     size_type erase(const K& key, std::size_t hash) {
         return erase_impl(key, hash);
     }
-    
-    void swap(ordered_hash& other) {
+
+    void swap(ordered_hash& other) noexcept {
         using std::swap;
-        
+
         swap(static_cast<Hash&>(*this), static_cast<Hash&>(other));
         swap(static_cast<KeyEqual&>(*this), static_cast<KeyEqual&>(other));
         swap(m_buckets, other.m_buckets);
@@ -634,28 +634,28 @@ public:
         swap(m_max_load_factor, other.m_max_load_factor);
         swap(m_load_threshold, other.m_load_threshold);
     }
-    
-        
-    
+
+
+
 
     /*
      * Lookup
-     */    
+     */
     template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     typename U::value_type& at(const K& key) {
         return at(key, hash_key(key));
     }
-    
+
     template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     typename U::value_type& at(const K& key, std::size_t hash) {
         return const_cast<typename U::value_type&>(static_cast<const ordered_hash*>(this)->at(key, hash));
     }
-    
+
     template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     const typename U::value_type& at(const K& key) const {
         return at(key, hash_key(key));
     }
-    
+
     template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     const typename U::value_type& at(const K& key, std::size_t hash) const {
         auto it = find(key, hash);
@@ -666,19 +666,19 @@ public:
             throw std::out_of_range("Couldn't find the key.");
         }
     }
-    
-    
+
+
     template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     typename U::value_type& operator[](K&& key) {
         return try_emplace(std::forward<K>(key)).first.value();
     }
-    
-    
+
+
     template<class K>
     size_type count(const K& key) const {
         return count(key, hash_key(key));
     }
-    
+
     template<class K>
     size_type count(const K& key, std::size_t hash) const {
         if(find(key, hash) == cend()) {
@@ -688,282 +688,282 @@ public:
             return 1;
         }
     }
-    
+
     template<class K>
     iterator find(const K& key) {
         return find(key, hash_key(key));
     }
-    
+
     template<class K>
     iterator find(const K& key, std::size_t hash) {
         auto it_bucket = find_key(key, hash);
         return (it_bucket != m_buckets.end())?iterator(m_values.begin() + it_bucket->index()):end();
     }
-    
+
     template<class K>
     const_iterator find(const K& key) const {
         return find(key, hash_key(key));
     }
-    
+
     template<class K>
     const_iterator find(const K& key, std::size_t hash) const {
         auto it_bucket = find_key(key, hash);
         return (it_bucket != m_buckets.cend())?const_iterator(m_values.begin() + it_bucket->index()):end();
     }
-    
-    
+
+
     template<class K>
     std::pair<iterator, iterator> equal_range(const K& key) {
         return equal_range(key, hash_key(key));
     }
-    
+
     template<class K>
     std::pair<iterator, iterator> equal_range(const K& key, std::size_t hash) {
         iterator it = find(key, hash);
         return std::make_pair(it, (it == end())?it:std::next(it));
     }
-    
+
     template<class K>
     std::pair<const_iterator, const_iterator> equal_range(const K& key) const {
         return equal_range(key, hash_key(key));
     }
-    
+
     template<class K>
     std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t hash) const {
         const_iterator it = find(key, hash);
         return std::make_pair(it, (it == cend())?it:std::next(it));
-    }    
-    
-    
+    }
+
+
     /*
-     * Bucket interface 
+     * Bucket interface
      */
     size_type bucket_count() const {
-        return m_buckets.size(); 
+        return m_buckets.size();
     }
-    
+
     size_type max_bucket_count() const {
         return m_buckets.max_size();
-    }    
-    
+    }
+
     /*
-     *  Hash policy 
+     *  Hash policy
      */
     float load_factor() const {
         return float(size())/float(bucket_count());
     }
-    
+
     float max_load_factor() const {
         return m_max_load_factor;
     }
-    
+
     void max_load_factor(float ml) {
         m_max_load_factor = std::max(0.1f, std::min(ml, 0.95f));
         m_load_threshold = size_type(float(bucket_count())*m_max_load_factor);
     }
-    
+
     void rehash(size_type count) {
         count = std::max(count, size_type(std::ceil(float(size())/max_load_factor())));
         rehash_impl(count);
     }
-    
+
     void reserve(size_type count) {
         reserve_space_for_values(count);
-        
+
         count = size_type(std::ceil(float(count)/max_load_factor()));
         rehash(count);
     }
-    
-    
+
+
     /*
      * Observers
      */
     hasher hash_function() const {
         return static_cast<const Hash&>(*this);
     }
-    
+
     key_equal key_eq() const {
         return static_cast<const KeyEqual&>(*this);
     }
 
-    
+
     /*
      * Other
      */
     iterator mutable_iterator(const_iterator pos) {
         return iterator(m_values.begin() + iterator_to_index(pos));
     }
-    
+
     iterator nth(size_type index) {
         return iterator(m_values.begin() + index);
     }
-    
+
     const_iterator nth(size_type index) const {
         return const_iterator(m_values.cbegin() + index);
     }
-    
+
     const_reference front() const {
         return m_values.front();
     }
-    
+
     const_reference back() const {
         return m_values.back();
     }
-    
+
     const values_container_type& values_container() const noexcept {
         return m_values;
     }
-    
-    template<class U = values_container_type, typename std::enable_if<is_vector<U>::value>::type* = nullptr>    
+
+    template<class U = values_container_type, typename std::enable_if<is_vector<U>::value>::type* = nullptr>
     const typename values_container_type::value_type* data() const noexcept {
         return m_values.data();
     }
-    
-    template<class U = values_container_type, typename std::enable_if<is_vector<U>::value>::type* = nullptr>    
+
+    template<class U = values_container_type, typename std::enable_if<is_vector<U>::value>::type* = nullptr>
     size_type capacity() const noexcept {
         return m_values.capacity();
     }
-    
+
     void shrink_to_fit() {
         m_values.shrink_to_fit();
     }
-    
-    
+
+
     template<typename P>
     std::pair<iterator, bool> insert_at_position(const_iterator pos, P&& value) {
         return insert_at_position_impl(pos.m_iterator, KeySelect()(value), std::forward<P>(value));
     }
-    
+
     template<class... Args>
     std::pair<iterator, bool> emplace_at_position(const_iterator pos, Args&&... args) {
         return insert_at_position(pos, value_type(std::forward<Args>(args)...));
     }
-    
+
     template<class K, class... Args>
     std::pair<iterator, bool> try_emplace_at_position(const_iterator pos, K&& key, Args&&... value_args) {
-        return insert_at_position_impl(pos.m_iterator, key, 
-                                       std::piecewise_construct, 
-                                       std::forward_as_tuple(std::forward<K>(key)), 
+        return insert_at_position_impl(pos.m_iterator, key,
+                                       std::piecewise_construct,
+                                       std::forward_as_tuple(std::forward<K>(key)),
                                        std::forward_as_tuple(std::forward<Args>(value_args)...));
     }
-    
+
 
     void pop_back() {
         tsl_assert(!empty());
         erase(std::prev(end()));
     }
-    
-    
+
+
     /**
      * Here to avoid `template<class K> size_type unordered_erase(const K& key)` being used when
      * we use a iterator instead of a const_iterator.
-     */    
+     */
     iterator unordered_erase(iterator pos) {
         return unordered_erase(const_iterator(pos));
     }
-    
+
     iterator unordered_erase(const_iterator pos) {
         const std::size_t index_erase = iterator_to_index(pos);
         unordered_erase(pos.key());
-        
+
         /*
          * One element was deleted, index_erase now points to the next element as the elements after
          * the deleted value were shifted to the left in m_values (will be end() if we deleted the last element).
          */
         return begin() + index_erase;
     }
-    
+
     template<class K>
     size_type unordered_erase(const K& key) {
         return unordered_erase(key, hash_key(key));
     }
-    
+
     template<class K>
     size_type unordered_erase(const K& key, std::size_t hash) {
         auto it_bucket_key = find_key(key, hash);
         if(it_bucket_key == m_buckets.end()) {
             return 0;
         }
-        
+
         /**
-         * If we are not erasing the last element in m_values, we swap 
-         * the element we are erasing with the last element. We then would 
+         * If we are not erasing the last element in m_values, we swap
+         * the element we are erasing with the last element. We then would
          * just have to do a pop_back() in m_values.
          */
         if(!compare_keys(key, KeySelect()(back()))) {
             auto it_bucket_last_elem = find_key(KeySelect()(back()), hash_key(KeySelect()(back())));
             tsl_assert(it_bucket_last_elem != m_buckets.end());
             tsl_assert(it_bucket_last_elem->index() == m_values.size() - 1);
-            
+
             using std::swap;
             swap(m_values[it_bucket_key->index()], m_values[it_bucket_last_elem->index()]);
             swap(it_bucket_key->index_ref(), it_bucket_last_elem->index_ref());
         }
-        
+
         erase_value_from_bucket(it_bucket_key);
-        
+
         return 1;
     }
-    
+
     friend bool operator==(const ordered_hash& lhs, const ordered_hash& rhs) {
         return lhs.m_values == rhs.m_values;
     }
-    
+
     friend bool operator!=(const ordered_hash& lhs, const ordered_hash& rhs) {
         return lhs.m_values != rhs.m_values;
     }
-    
+
     friend bool operator<(const ordered_hash& lhs, const ordered_hash& rhs) {
         return lhs.m_values < rhs.m_values;
     }
-    
+
     friend bool operator<=(const ordered_hash& lhs, const ordered_hash& rhs) {
         return lhs.m_values <= rhs.m_values;
     }
-    
+
     friend bool operator>(const ordered_hash& lhs, const ordered_hash& rhs) {
         return lhs.m_values > rhs.m_values;
     }
-    
+
     friend bool operator>=(const ordered_hash& lhs, const ordered_hash& rhs) {
         return lhs.m_values >= rhs.m_values;
     }
-    
-    
+
+
 private:
     template<class K>
     std::size_t hash_key(const K& key) const {
         return Hash::operator()(key);
     }
-    
+
     template<class K1, class K2>
     bool compare_keys(const K1& key1, const K2& key2) const {
         return KeyEqual::operator()(key1, key2);
     }
-    
+
     template<class K>
     typename buckets_container_type::iterator find_key(const K& key, std::size_t hash) {
         auto it = static_cast<const ordered_hash*>(this)->find_key(key, hash);
         return m_buckets.begin() + std::distance(m_buckets.cbegin(), it);
     }
-    
+
     /**
      * Return bucket which has the key 'key' or m_buckets.end() if none.
-     * 
+     *
      * From the bucket_for_hash, search for the value until we either find an empty bucket
      * or a bucket which has a value with a distance from its ideal bucket longer
      * than the probe length for the value we are looking for.
      */
     template<class K>
     typename buckets_container_type::const_iterator find_key(const K& key, std::size_t hash) const {
-        for(std::size_t ibucket = bucket_for_hash(hash), dist_from_ideal_bucket = 0; ; 
-            ibucket = next_bucket(ibucket), dist_from_ideal_bucket++) 
+        for(std::size_t ibucket = bucket_for_hash(hash), dist_from_ideal_bucket = 0; ;
+            ibucket = next_bucket(ibucket), dist_from_ideal_bucket++)
         {
             if(m_buckets[ibucket].empty()) {
                 return m_buckets.end();
             }
-            else if(m_buckets[ibucket].truncated_hash() == bucket_entry::truncate_hash(hash) && 
-                    compare_keys(key, KeySelect()(m_values[m_buckets[ibucket].index()]))) 
+            else if(m_buckets[ibucket].truncated_hash() == bucket_entry::truncate_hash(hash) &&
+                    compare_keys(key, KeySelect()(m_values[m_buckets[ibucket].index()])))
             {
                 return m_buckets.begin() + ibucket;
             }
@@ -972,47 +972,47 @@ private:
             }
         }
     }
-    
+
     void rehash_impl(size_type bucket_count) {
         bucket_count = round_up_to_power_of_two(bucket_count);
         tsl_assert(bucket_count > 0);
-        
+
         if(bucket_count == this->bucket_count()) {
             return;
         }
-        
+
         if(bucket_count > max_bucket_count()) {
             throw std::length_error("The map exceeds its maxmimum size.");
         }
-        
-        
+
+
         buckets_container_type old_buckets(bucket_count);
         m_buckets.swap(old_buckets);
         // Everything should be noexcept from here.
-        
+
         m_mask = bucket_count - 1;
         this->max_load_factor(m_max_load_factor);
         m_grow_on_next_insert = false;
-        
-        
-        
+
+
+
         for(const bucket_entry& old_bucket: old_buckets) {
             if(old_bucket.empty()) {
                 continue;
             }
-            
+
             truncated_hash_type insert_hash = old_bucket.truncated_hash();
             index_type insert_index = old_bucket.index();
-            
-            for(std::size_t ibucket = bucket_for_hash(insert_hash), dist_from_ideal_bucket = 0; ; 
-                ibucket = next_bucket(ibucket), dist_from_ideal_bucket++) 
+
+            for(std::size_t ibucket = bucket_for_hash(insert_hash), dist_from_ideal_bucket = 0; ;
+                ibucket = next_bucket(ibucket), dist_from_ideal_bucket++)
             {
                 if(m_buckets[ibucket].empty()) {
                     m_buckets[ibucket].set_index(insert_index);
                     m_buckets[ibucket].set_hash(insert_hash);
                     break;
                 }
-                
+
                 const std::size_t distance = distance_from_ideal_bucket(ibucket);
                 if(dist_from_ideal_bucket > distance) {
                     std::swap(insert_index, m_buckets[ibucket].index_ref());
@@ -1022,145 +1022,145 @@ private:
             }
         }
     }
-    
+
     template<class T = values_container_type, typename std::enable_if<is_vector<T>::value>::type* = nullptr>
     void reserve_space_for_values(size_type count) {
         m_values.reserve(count);
     }
-    
+
     template<class T = values_container_type, typename std::enable_if<!is_vector<T>::value>::type* = nullptr>
     void reserve_space_for_values(size_type /*count*/) {
     }
-    
+
     /**
      * Swap the empty bucket with the values on its right until we cross another empty bucket
      * or if the other bucket has a distance_from_ideal_bucket == 0.
      */
     void backward_shift(std::size_t empty_ibucket) noexcept {
         tsl_assert(m_buckets[empty_ibucket].empty());
-        
+
         std::size_t previous_ibucket = empty_ibucket;
-        for(std::size_t current_ibucket = next_bucket(previous_ibucket); 
+        for(std::size_t current_ibucket = next_bucket(previous_ibucket);
             !m_buckets[current_ibucket].empty() && distance_from_ideal_bucket(current_ibucket) > 0;
-            previous_ibucket = current_ibucket, current_ibucket = next_bucket(current_ibucket)) 
+            previous_ibucket = current_ibucket, current_ibucket = next_bucket(current_ibucket))
         {
             std::swap(m_buckets[current_ibucket], m_buckets[previous_ibucket]);
         }
     }
-    
+
     void erase_value_from_bucket(typename buckets_container_type::iterator it_bucket) {
         tsl_assert(it_bucket != m_buckets.end() && !it_bucket->empty());
-        
+
         m_values.erase(m_values.begin() + it_bucket->index());
-        
+
         /*
-         * m_values.erase shifted all the values on the right of the erased value, 
+         * m_values.erase shifted all the values on the right of the erased value,
          * shift the indexes by 1 in the buckets array for these values.
          */
         if(it_bucket->index() != m_values.size()) {
             shift_indexes_in_buckets(it_bucket->index(), short(1));
-        }        
-        
+        }
+
         // Mark the bucket as empty and do a backward shift of the values on the right
         it_bucket->clear();
         backward_shift(std::size_t(std::distance(m_buckets.begin(), it_bucket)));
     }
-    
+
     /**
      * Go through each value from [from_ivalue, m_values.size()) in m_values and for each
      * bucket corresponding to the value, shift the indexes to the left by delta.
      */
     void shift_indexes_in_buckets(index_type from_ivalue, short delta) noexcept  {
-        static_assert(std::is_unsigned<index_type>::value && sizeof(index_type) >= sizeof(short), 
+        static_assert(std::is_unsigned<index_type>::value && sizeof(index_type) >= sizeof(short),
                       "index_type should be unsigned and sizeof(index_type) >= sizeof(short)");
-        
+
         for(std::size_t ivalue = from_ivalue; ivalue < m_values.size(); ivalue++) {
             std::size_t ibucket = bucket_for_hash(hash_key(KeySelect()(m_values[ivalue])));
-            
+
             // Modulo arithmetic, we should be alright for index_type(ivalue + delta). TODO further checks
             while(m_buckets[ibucket].index() != index_type(ivalue + delta)) {
                 ibucket = next_bucket(ibucket);
             }
-            
+
             m_buckets[ibucket].set_index(index_type(m_buckets[ibucket].index() - delta));
         }
     }
-    
+
     template<class K>
     size_type erase_impl(const K& key, std::size_t hash) {
         auto it_bucket = find_key(key, hash);
         if(it_bucket != m_buckets.end()) {
             erase_value_from_bucket(it_bucket);
-            
+
             return 1;
         }
         else {
             return 0;
         }
     }
-    
+
     template<class K, class... Args>
     std::pair<iterator, bool> insert_impl(const K& key, Args&&... value_type_args) {
         return insert_at_position_impl(m_values.cend(), key, std::forward<Args>(value_type_args)...);
     }
-    
+
     /**
      * Insert the element before insert_position.
      */
     template<class K, class... Args>
     std::pair<iterator, bool> insert_at_position_impl(typename values_container_type::const_iterator insert_position,
-                                                      const K& key, Args&&... value_type_args) 
+                                                      const K& key, Args&&... value_type_args)
     {
         const std::size_t hash = hash_key(key);
-        
-        std::size_t ibucket = bucket_for_hash(hash); 
+
+        std::size_t ibucket = bucket_for_hash(hash);
         std::size_t dist_from_ideal_bucket = 0;
-        
+
         while(!m_buckets[ibucket].empty() && dist_from_ideal_bucket <= distance_from_ideal_bucket(ibucket)) {
-            if(m_buckets[ibucket].truncated_hash() == bucket_entry::truncate_hash(hash) && 
-               compare_keys(key, KeySelect()(m_values[m_buckets[ibucket].index()]))) 
+            if(m_buckets[ibucket].truncated_hash() == bucket_entry::truncate_hash(hash) &&
+               compare_keys(key, KeySelect()(m_values[m_buckets[ibucket].index()])))
             {
                 return std::make_pair(begin() + m_buckets[ibucket].index(), false);
             }
-            
+
             ibucket = next_bucket(ibucket);
             dist_from_ideal_bucket++;
         }
-        
+
         if(size() >= max_size()) {
             throw std::length_error("We reached the maximum size for the hash table.");
         }
-        
-        
+
+
         if(grow_on_high_load()) {
             ibucket = bucket_for_hash(hash);
             dist_from_ideal_bucket = 0;
         }
-        
-        
+
+
         const index_type index_insert_position = index_type(std::distance(m_values.cbegin(), insert_position));
-        
+
 #ifdef TSL_NO_CONTAINER_EMPLACE_CONST_ITERATOR
         m_values.emplace(m_values.begin() + std::distance(m_values.cbegin(), insert_position), std::forward<Args>(value_type_args)...);
-#else        
+#else
         m_values.emplace(insert_position, std::forward<Args>(value_type_args)...);
-#endif        
+#endif
 
-        insert_index(ibucket, dist_from_ideal_bucket, 
+        insert_index(ibucket, dist_from_ideal_bucket,
                      index_insert_position, bucket_entry::truncate_hash(hash));
-        
+
         /*
-         * The insertion didn't happend at the end of the m_values container, 
+         * The insertion didn't happend at the end of the m_values container,
          * we need to shift the indexes in m_buckets.
          */
         if(index_insert_position != m_values.size() - 1) {
             shift_indexes_in_buckets(index_insert_position + 1, short(-1));
         }
-        
+
         return std::make_pair(iterator(m_values.begin() + index_insert_position), true);
     }
-    
-    void insert_index(std::size_t ibucket, std::size_t dist_from_ideal_bucket, 
+
+    void insert_index(std::size_t ibucket, std::size_t dist_from_ideal_bucket,
                       index_type index_insert, truncated_hash_type hash_insert) noexcept
     {
         while(!m_buckets[ibucket].empty()) {
@@ -1168,15 +1168,15 @@ private:
             if(dist_from_ideal_bucket > distance) {
                 std::swap(index_insert, m_buckets[ibucket].index_ref());
                 std::swap(hash_insert, m_buckets[ibucket].truncated_hash_ref());
-                
+
                 dist_from_ideal_bucket = distance;
             }
 
-            
+
             ibucket = next_bucket(ibucket);
             dist_from_ideal_bucket++;
-            
-            
+
+
             if(dist_from_ideal_bucket > REHASH_ON_HIGH_NB_PROBES__NPROBES && !m_grow_on_next_insert &&
                load_factor() >= REHASH_ON_HIGH_NB_PROBES__MIN_LOAD_FACTOR)
             {
@@ -1185,43 +1185,43 @@ private:
                 m_grow_on_next_insert = true;
             }
         }
-        
-        
+
+
         m_buckets[ibucket].set_index(index_insert);
-        m_buckets[ibucket].set_hash(hash_insert); 
+        m_buckets[ibucket].set_hash(hash_insert);
     }
-    
+
     std::size_t distance_from_ideal_bucket(std::size_t ibucket) const noexcept {
         const std::size_t ideal_bucket = bucket_for_hash(m_buckets[ibucket].truncated_hash());
-        
+
         if(ibucket >= ideal_bucket) {
             return ibucket - ideal_bucket;
         }
-        // If the bucket is smaller than the ideal bucket for the value, there was a wrapping at the end of the 
+        // If the bucket is smaller than the ideal bucket for the value, there was a wrapping at the end of the
         // bucket array due to the modulo.
         else {
             return (bucket_count() + ibucket) - ideal_bucket;
         }
     }
-    
+
     std::size_t next_bucket(std::size_t index) const noexcept {
         tsl_assert(index < m_buckets.size());
-        
+
         index++;
         return (index < m_buckets.size())?index:0;
     }
-    
+
     std::size_t bucket_for_hash(std::size_t hash) const noexcept {
         return hash & m_mask;
-    }    
-    
+    }
+
     std::size_t iterator_to_index(const_iterator it) const noexcept {
         const auto dist = std::distance(cbegin(), it);
         tsl_assert(dist >= 0);
-        
+
         return std::size_t(dist);
     }
-    
+
     /**
      * Return true if the map has been rehashed.
      */
@@ -1229,50 +1229,50 @@ private:
         if(m_grow_on_next_insert || size() >= m_load_threshold) {
             rehash_impl(bucket_count() * 2);
             m_grow_on_next_insert = false;
-            
+
             return true;
         }
         else {
             return false;
         }
     }
-    
+
     static std::size_t round_up_to_power_of_two(std::size_t value) {
         if(is_power_of_two(value)) {
             return value;
         }
-        
+
         if(value == 0) {
             return 1;
         }
-        
+
         --value;
         for(std::size_t i = 1; i < sizeof(std::size_t) * CHAR_BIT; i *= 2) {
             value |= value >> i;
         }
-        
+
         return value + 1;
     }
-    
+
     static constexpr bool is_power_of_two(std::size_t value) {
         return value != 0 && (value & (value - 1)) == 0;
     }
 
-    
+
 public:
     static const size_type DEFAULT_INIT_BUCKETS_SIZE = 16;
     static constexpr float DEFAULT_MAX_LOAD_FACTOR = 0.75f;
 
-private:    
+private:
     static const size_type REHASH_ON_HIGH_NB_PROBES__NPROBES = 128;
     static constexpr float REHASH_ON_HIGH_NB_PROBES__MIN_LOAD_FACTOR = 0.15f;
-    
+
 private:
     buckets_container_type m_buckets;
     size_type m_mask;
-    
+
     values_container_type m_values;
-    
+
     bool m_grow_on_next_insert;
     float m_max_load_factor;
     size_type m_load_threshold;
diff --git a/Foundation/include/Poco/ordered_map.h b/Foundation/include/Poco/ordered_map.h
index 0b0c28e8a..870a13975 100644
--- a/Foundation/include/Poco/ordered_map.h
+++ b/Foundation/include/Poco/ordered_map.h
@@ -1,18 +1,18 @@
 /**
  * MIT License
- * 
+ *
  * Copyright (c) 2017 Tessil
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -41,29 +41,29 @@ namespace tsl {
 
 /**
  * Implementation of an hash map using open adressing with robin hood with backshift delete to resolve collisions.
- * 
+ *
  * The particularity of this hash map is that it remembers the order in which the elements were added and
- * provide a way to access the structure which stores these values through the 'values_container()' method. 
+ * provide a way to access the structure which stores these values through the 'values_container()' method.
  * The used container is defined by ValueTypeContainer, by default a std::deque is used (grows faster) but
- * a std::vector may be used. In this case the map provides a 'data()' method which give a direct access 
+ * a std::vector may be used. In this case the map provides a 'data()' method which give a direct access
  * to the memory used to store the values (which can be usefull to communicate with C API's).
- * 
+ *
  * The Key and T must be copy constructible and/or move constructible. To use `unordered_erase` they both
  * must be swappable.
- * 
+ *
  * The behaviour of the hash map is undefinded if the destructor of Key or T throws an exception.
- * 
+ *
  * Iterators invalidation:
  *  - clear, operator=, reserve, rehash: always invalidate the iterators (also invalidate end()).
- *  - insert, emplace, emplace_hint, operator[]: when a std::vector is used as ValueTypeContainer 
- *                                               and if size() < capacity(), only end(). 
+ *  - insert, emplace, emplace_hint, operator[]: when a std::vector is used as ValueTypeContainer
+ *                                               and if size() < capacity(), only end().
  *                                               Otherwise all the iterators are invalidated if an insert occurs.
- *  - erase, unordered_erase: when a std::vector is used as ValueTypeContainer invalidate the iterator of 
- *                            the erased element and all the ones after the erased element (including end()). 
+ *  - erase, unordered_erase: when a std::vector is used as ValueTypeContainer invalidate the iterator of
+ *                            the erased element and all the ones after the erased element (including end()).
  *                            Otherwise all the iterators are invalidated if an erase occurs.
  */
-template<class Key, 
-         class T, 
+template<class Key,
+         class T,
          class Hash = std::hash<Key>,
          class KeyEqual = std::equal_to<Key>,
          class Allocator = std::allocator<std::pair<Key, T>>,
@@ -72,36 +72,36 @@ class ordered_map {
 private:
     template<typename U>
     using has_is_transparent = tsl::detail_ordered_hash::has_is_transparent<U>;
-    
+
     class KeySelect {
     public:
         using key_type = Key;
-        
+
         const key_type& operator()(const std::pair<Key, T>& key_value) const noexcept {
             return key_value.first;
         }
-        
+
         key_type& operator()(std::pair<Key, T>& key_value) noexcept {
             return key_value.first;
         }
-    };  
-    
+    };
+
     class ValueSelect {
     public:
         using value_type = T;
-        
+
         const value_type& operator()(const std::pair<Key, T>& key_value) const noexcept {
             return key_value.second;
         }
-        
+
         value_type& operator()(std::pair<Key, T>& key_value) noexcept {
             return key_value.second;
         }
     };
-    
+
     using ht = detail_ordered_hash::ordered_hash<std::pair<Key, T>, KeySelect, ValueSelect,
                                                  Hash, KeyEqual, Allocator, ValueTypeContainer>;
-    
+
 public:
     using key_type = typename ht::key_type;
     using mapped_type = T;
@@ -119,38 +119,38 @@ public:
     using const_iterator = typename ht::const_iterator;
     using reverse_iterator = typename ht::reverse_iterator;
     using const_reverse_iterator = typename ht::const_reverse_iterator;
-    
+
     using values_container_type = typename ht::values_container_type;
-    
-    
+
+
     /*
      * Constructors
      */
     ordered_map(): ordered_map(ht::DEFAULT_INIT_BUCKETS_SIZE) {
     }
-    
-    explicit ordered_map(size_type bucket_count, 
+
+    explicit ordered_map(size_type bucket_count,
                          const Hash& hash = Hash(),
                          const KeyEqual& equal = KeyEqual(),
-                         const Allocator& alloc = Allocator()): 
+                         const Allocator& alloc = Allocator()):
                      m_ht(bucket_count, hash, equal, alloc, ht::DEFAULT_MAX_LOAD_FACTOR)
     {
     }
-    
+
     ordered_map(size_type bucket_count,
                 const Allocator& alloc): ordered_map(bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
-    
+
     ordered_map(size_type bucket_count,
                 const Hash& hash,
                 const Allocator& alloc): ordered_map(bucket_count, hash, KeyEqual(), alloc)
     {
     }
-    
+
     explicit ordered_map(const Allocator& alloc): ordered_map(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {
     }
-    
+
     template<class InputIt>
     ordered_map(InputIt first, InputIt last,
                 size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
@@ -160,14 +160,14 @@ public:
     {
         insert(first, last);
     }
-    
+
     template<class InputIt>
     ordered_map(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Allocator& alloc): ordered_map(first, last, bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
-    
+
     template<class InputIt>
     ordered_map(InputIt first, InputIt last,
                 size_type bucket_count,
@@ -180,14 +180,14 @@ public:
                 size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
                 const Hash& hash = Hash(),
                 const KeyEqual& equal = KeyEqual(),
-                const Allocator& alloc = Allocator()): 
+                const Allocator& alloc = Allocator()):
             ordered_map(init.begin(), init.end(), bucket_count, hash, equal, alloc)
     {
     }
 
     ordered_map(std::initializer_list<value_type> init,
                 size_type bucket_count,
-                const Allocator& alloc): 
+                const Allocator& alloc):
             ordered_map(init.begin(), init.end(), bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
@@ -195,587 +195,586 @@ public:
     ordered_map(std::initializer_list<value_type> init,
                 size_type bucket_count,
                 const Hash& hash,
-                const Allocator& alloc): 
+                const Allocator& alloc):
             ordered_map(init.begin(), init.end(), bucket_count, hash, KeyEqual(), alloc)
     {
     }
 
-    
+
     ordered_map& operator=(std::initializer_list<value_type> ilist) {
         m_ht.clear();
-        
+
         m_ht.reserve(ilist.size());
         m_ht.insert(ilist.begin(), ilist.end());
-        
+
         return *this;
     }
-    
-    allocator_type get_allocator() const { return m_ht.get_allocator(); }
-    
 
-    
+    allocator_type get_allocator() const { return m_ht.get_allocator(); }
+
+
+
     /*
      * Iterators
      */
     iterator begin() noexcept { return m_ht.begin(); }
     const_iterator begin() const noexcept { return m_ht.begin(); }
     const_iterator cbegin() const noexcept { return m_ht.cbegin(); }
-    
+
     iterator end() noexcept { return m_ht.end(); }
     const_iterator end() const noexcept { return m_ht.end(); }
     const_iterator cend() const noexcept { return m_ht.cend(); }
-    
+
     reverse_iterator rbegin() noexcept { return m_ht.rbegin(); }
     const_reverse_iterator rbegin() const noexcept { return m_ht.rbegin(); }
     const_reverse_iterator rcbegin() const noexcept { return m_ht.rcbegin(); }
-    
+
     reverse_iterator rend() noexcept { return m_ht.rend(); }
     const_reverse_iterator rend() const noexcept { return m_ht.rend(); }
     const_reverse_iterator rcend() const noexcept { return m_ht.rcend(); }
-    
-    
+
+
     /*
      * Capacity
      */
     bool empty() const noexcept { return m_ht.empty(); }
     size_type size() const noexcept { return m_ht.size(); }
     size_type max_size() const noexcept { return m_ht.max_size(); }
-    
+
     /*
      * Modifiers
      */
     void clear() noexcept { m_ht.clear(); }
-    
-    
-    
+
+
+
     std::pair<iterator, bool> insert(const value_type& value) { return m_ht.insert(value); }
-        
+
     template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
     std::pair<iterator, bool> insert(P&& value) { return m_ht.emplace(std::forward<P>(value)); }
-    
+
     std::pair<iterator, bool> insert(value_type&& value) { return m_ht.insert(std::move(value)); }
-    
-    
+
+
     iterator insert(const_iterator hint, const value_type& value) {
         return m_ht.insert(hint, value);
     }
-        
+
     template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
     iterator insert(const_iterator hint, P&& value) {
         return m_ht.emplace_hint(hint, std::forward<P>(value));
     }
-    
-    iterator insert(const_iterator hint, value_type&& value) { 
+
+    iterator insert(const_iterator hint, value_type&& value) {
         return m_ht.insert(hint, std::move(value));
     }
-    
-    
+
+
     template<class InputIt>
     void insert(InputIt first, InputIt last) { m_ht.insert(first, last); }
     void insert(std::initializer_list<value_type> ilist) { m_ht.insert(ilist.begin(), ilist.end()); }
 
-    
-    
-    
+
+
+
     template<class M>
-    std::pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj) { 
-        return m_ht.insert_or_assign(k, std::forward<M>(obj)); 
+    std::pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj) {
+        return m_ht.insert_or_assign(k, std::forward<M>(obj));
     }
 
     template<class M>
-    std::pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj) { 
-        return m_ht.insert_or_assign(std::move(k), std::forward<M>(obj)); 
+    std::pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj) {
+        return m_ht.insert_or_assign(std::move(k), std::forward<M>(obj));
     }
-    
-    
+
+
     template<class M>
     iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj) {
         return m_ht.insert_or_assign(hint, k, std::forward<M>(obj));
     }
-    
+
     template<class M>
     iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj) {
         return m_ht.insert_or_assign(hint, std::move(k), std::forward<M>(obj));
     }
-    
+
     /**
      * Due to the way elements are stored, emplace will need to move or copy the key-value once.
      * The method is equivalent to insert(value_type(std::forward<Args>(args)...));
-     * 
+     *
      * Mainly here for compatibility with the std::unordered_map interface.
      */
     template<class... Args>
     std::pair<iterator, bool> emplace(Args&&... args) { return m_ht.emplace(std::forward<Args>(args)...); }
-    
+
     /**
      * Due to the way elements are stored, emplace_hint will need to move or copy the key-value once.
      * The method is equivalent to insert(hint, value_type(std::forward<Args>(args)...));
-     * 
+     *
      * Mainly here for compatibility with the std::unordered_map interface.
      */
     template <class... Args>
     iterator emplace_hint(const_iterator hint, Args&&... args) {
         return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
     }
-    
-    
-    
-    
+
+
+
+
     template<class... Args>
-    std::pair<iterator, bool> try_emplace(const key_type& k, Args&&... args) { 
+    std::pair<iterator, bool> try_emplace(const key_type& k, Args&&... args) {
         return m_ht.try_emplace(k, std::forward<Args>(args)...);
     }
-    
+
     template<class... Args>
     std::pair<iterator, bool> try_emplace(key_type&& k, Args&&... args) {
         return m_ht.try_emplace(std::move(k), std::forward<Args>(args)...);
     }
-    
+
     template<class... Args>
     iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args) {
         return m_ht.try_emplace(hint, k, std::forward<Args>(args)...);
     }
-    
+
     template<class... Args>
     iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args) {
         return m_ht.try_emplace(hint, std::move(k), std::forward<Args>(args)...);
     }
-    
-    
-    
+
+
+
 
     /**
      * When erasing an element, the insert order will be preserved and no holes will be present in the container
-     * returned by 'values_container()'. 
-     * 
+     * returned by 'values_container()'.
+     *
      * The method is in O(n), if the order is not important 'unordered_erase(...)' method is faster with an O(1)
      * average complexity.
      */
     iterator erase(iterator pos) { return m_ht.erase(pos); }
-    
+
     /**
      * @copydoc erase(iterator pos)
      */
     iterator erase(const_iterator pos) { return m_ht.erase(pos); }
-    
+
     /**
      * @copydoc erase(iterator pos)
-     */    
+     */
     iterator erase(const_iterator first, const_iterator last) { return m_ht.erase(first, last); }
-    
+
     /**
      * @copydoc erase(iterator pos)
-     */    
+     */
     size_type erase(const key_type& key) { return m_ht.erase(key); }
-    
+
     /**
      * @copydoc erase(iterator pos)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup to the value if you already have the hash.
-     */    
-    size_type erase(const key_type& key, std::size_t precalculated_hash) { 
-        return m_ht.erase(key, precalculated_hash); 
+     */
+    size_type erase(const key_type& key, std::size_t precalculated_hash) {
+        return m_ht.erase(key, precalculated_hash);
     }
-    
+
     /**
      * @copydoc erase(iterator pos)
-     * 
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     *
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     size_type erase(const K& key) { return m_ht.erase(key); }
-    
+
     /**
      * @copydoc erase(const key_type& key, std::size_t precalculated_hash)
-     * 
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     *
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    size_type erase(const K& key, std::size_t precalculated_hash) { 
-        return m_ht.erase(key, precalculated_hash); 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    size_type erase(const K& key, std::size_t precalculated_hash) {
+        return m_ht.erase(key, precalculated_hash);
     }
-    
-    
-    
-    void swap(ordered_map& other) { other.m_ht.swap(m_ht); }
-    
+
+
+    void swap(ordered_map& other) noexcept { other.m_ht.swap(m_ht); }
+
     /*
      * Lookup
      */
     T& at(const Key& key) { return m_ht.at(key); }
-    
+
     /**
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
     T& at(const Key& key, std::size_t precalculated_hash) { return m_ht.at(key, precalculated_hash); }
-    
-    
+
+
     const T& at(const Key& key) const { return m_ht.at(key); }
-    
+
     /**
      * @copydoc at(const Key& key, std::size_t precalculated_hash)
      */
     const T& at(const Key& key, std::size_t precalculated_hash) const { return m_ht.at(key, precalculated_hash); }
-    
-    
+
+
     /**
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     T& at(const K& key) { return m_ht.at(key); }
-    
+
     /**
      * @copydoc at(const K& key)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
-     */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     T& at(const K& key, std::size_t precalculated_hash) { return m_ht.at(key, precalculated_hash); }
-    
+
     /**
      * @copydoc at(const K& key)
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>     
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     const T& at(const K& key) const { return m_ht.at(key); }
-    
+
     /**
      * @copydoc at(const K& key, std::size_t precalculated_hash)
-     */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     const T& at(const K& key, std::size_t precalculated_hash) const { return m_ht.at(key, precalculated_hash); }
-    
-    
-    
-    T& operator[](const Key& key) { return m_ht[key]; }    
+
+
+
+    T& operator[](const Key& key) { return m_ht[key]; }
     T& operator[](Key&& key) { return m_ht[std::move(key)]; }
-    
-    
-    
+
+
+
     size_type count(const Key& key) const { return m_ht.count(key); }
-    
+
     /**
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    size_type count(const Key& key, std::size_t precalculated_hash) const { 
-        return m_ht.count(key, precalculated_hash); 
-    }
-    
-    /**
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
-     * If so, K must be hashable and comparable to Key.
-     */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>     
-    size_type count(const K& key) const { return m_ht.count(key); }
-    
-    /**
-     * @copydoc count(const K& key) const
-     * 
-     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
-     * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
-     */     
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    size_type count(const K& key, std::size_t precalculated_hash) const { 
+    size_type count(const Key& key, std::size_t precalculated_hash) const {
         return m_ht.count(key, precalculated_hash);
     }
-    
-    
-    
+
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    size_type count(const K& key) const { return m_ht.count(key); }
+
+    /**
+     * @copydoc count(const K& key) const
+     *
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    size_type count(const K& key, std::size_t precalculated_hash) const {
+        return m_ht.count(key, precalculated_hash);
+    }
+
+
+
     iterator find(const Key& key) { return m_ht.find(key); }
-    
+
     /**
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
     iterator find(const Key& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
-    
+
     const_iterator find(const Key& key) const { return m_ht.find(key); }
-    
+
     /**
      * @copydoc find(const Key& key, std::size_t precalculated_hash)
      */
-    const_iterator find(const Key& key, std::size_t precalculated_hash) const { 
+    const_iterator find(const Key& key, std::size_t precalculated_hash) const {
         return m_ht.find(key, precalculated_hash);
     }
-    
-    /**
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
-     * If so, K must be hashable and comparable to Key.
-     */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    iterator find(const K& key) { return m_ht.find(key); }
-    
-    /**
-     * @copydoc find(const K& key)
-     * 
-     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
-     * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
-     */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    iterator find(const K& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
-    
-    /**
-     * @copydoc find(const K& key)
-     */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    const_iterator find(const K& key) const { return m_ht.find(key); }
-    
-    /**
-     * @copydoc find(const K& key)
-     * 
-     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
-     * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
-     */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    const_iterator find(const K& key, std::size_t precalculated_hash) const { 
-        return m_ht.find(key, precalculated_hash); 
-    }
-    
-    
-    
-    std::pair<iterator, iterator> equal_range(const Key& key) { return m_ht.equal_range(key); }
-    
-    /**
-     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
-     * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
-     */
-    std::pair<iterator, iterator> equal_range(const Key& key, std::size_t precalculated_hash) { 
-        return m_ht.equal_range(key, precalculated_hash); 
-    }
-    
-    std::pair<const_iterator, const_iterator> equal_range(const Key& key) const { return m_ht.equal_range(key); }
-    
-    /**
-     * @copydoc equal_range(const Key& key, std::size_t precalculated_hash)
-     */
-    std::pair<const_iterator, const_iterator> equal_range(const Key& key, std::size_t precalculated_hash) const { 
-        return m_ht.equal_range(key, precalculated_hash); 
-    }
 
     /**
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>     
-    std::pair<iterator, iterator> equal_range(const K& key) { return m_ht.equal_range(key); }
-    
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    iterator find(const K& key) { return m_ht.find(key); }
+
     /**
-     * @copydoc equal_range(const K& key)
-     * 
+     * @copydoc find(const K& key)
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) { 
-        return m_ht.equal_range(key, precalculated_hash); 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    iterator find(const K& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
+
+    /**
+     * @copydoc find(const K& key)
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    const_iterator find(const K& key) const { return m_ht.find(key); }
+
+    /**
+     * @copydoc find(const K& key)
+     *
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    const_iterator find(const K& key, std::size_t precalculated_hash) const {
+        return m_ht.find(key, precalculated_hash);
     }
-    
+
+
+
+    std::pair<iterator, iterator> equal_range(const Key& key) { return m_ht.equal_range(key); }
+
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
+     */
+    std::pair<iterator, iterator> equal_range(const Key& key, std::size_t precalculated_hash) {
+        return m_ht.equal_range(key, precalculated_hash);
+    }
+
+    std::pair<const_iterator, const_iterator> equal_range(const Key& key) const { return m_ht.equal_range(key); }
+
+    /**
+     * @copydoc equal_range(const Key& key, std::size_t precalculated_hash)
+     */
+    std::pair<const_iterator, const_iterator> equal_range(const Key& key, std::size_t precalculated_hash) const {
+        return m_ht.equal_range(key, precalculated_hash);
+    }
+
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    std::pair<iterator, iterator> equal_range(const K& key) { return m_ht.equal_range(key); }
+
+    /**
+     * @copydoc equal_range(const K& key)
+     *
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) {
+        return m_ht.equal_range(key, precalculated_hash);
+    }
+
     /**
      * @copydoc equal_range(const K& key)
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>     
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     std::pair<const_iterator, const_iterator> equal_range(const K& key) const { return m_ht.equal_range(key); }
-    
+
     /**
      * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
-     */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const { 
-        return m_ht.equal_range(key, precalculated_hash); 
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const {
+        return m_ht.equal_range(key, precalculated_hash);
     }
-    
-    
-    
+
+
+
     /*
-     * Bucket interface 
+     * Bucket interface
      */
     size_type bucket_count() const { return m_ht.bucket_count(); }
     size_type max_bucket_count() const { return m_ht.max_bucket_count(); }
-    
-    
+
+
     /*
-     * Hash policy 
+     * Hash policy
      */
     float load_factor() const { return m_ht.load_factor(); }
     float max_load_factor() const { return m_ht.max_load_factor(); }
     void max_load_factor(float ml) { m_ht.max_load_factor(ml); }
-    
+
     void rehash(size_type count) { m_ht.rehash(count); }
     void reserve(size_type count) { m_ht.reserve(count); }
-    
-    
+
+
     /*
      * Observers
      */
     hasher hash_function() const { return m_ht.hash_function(); }
     key_equal key_eq() const { return m_ht.key_eq(); }
-    
-    
-    
+
+
+
     /*
      * Other
      */
-    
+
     /**
      * Convert a const_iterator to an iterator.
      */
     iterator mutable_iterator(const_iterator pos) {
         return m_ht.mutable_iterator(pos);
     }
-    
+
     /**
      * Requires index <= size().
-     * 
+     *
      * Return an iterator to the element at index. Return end() if index == size().
      */
     iterator nth(size_type index) { return m_ht.nth(index); }
-    
+
     /**
      * @copydoc nth(size_type index)
      */
     const_iterator nth(size_type index) const { return m_ht.nth(index); }
-    
-    
+
+
     /**
      * Return const_reference to the first element. Requires the container to not be empty.
      */
     const_reference front() const { return m_ht.front(); }
-    
+
     /**
      * Return const_reference to the last element. Requires the container to not be empty.
      */
     const_reference back() const { return m_ht.back(); }
-    
-    
+
+
     /**
      * Only available if ValueTypeContainer is a std::vector. Same as calling 'values_container().data()'.
      */
-    template<class U = values_container_type, typename std::enable_if<tsl::detail_ordered_hash::is_vector<U>::value>::type* = nullptr>    
+    template<class U = values_container_type, typename std::enable_if<tsl::detail_ordered_hash::is_vector<U>::value>::type* = nullptr>
     const typename values_container_type::value_type* data() const noexcept { return m_ht.data(); }
-        
+
     /**
      * Return the container in which the values are stored. The values are in the same order as the insertion order
      * and are contiguous in the structure, no holes (size() == values_container().size()).
      */
     const values_container_type& values_container() const noexcept { return m_ht.values_container(); }
 
-    template<class U = values_container_type, typename std::enable_if<tsl::detail_ordered_hash::is_vector<U>::value>::type* = nullptr>    
+    template<class U = values_container_type, typename std::enable_if<tsl::detail_ordered_hash::is_vector<U>::value>::type* = nullptr>
     size_type capacity() const noexcept { return m_ht.capacity(); }
-    
+
     void shrink_to_fit() { m_ht.shrink_to_fit(); }
-    
-    
-    
+
+
+
     /**
-     * Insert the value before pos shifting all the elements on the right of pos (including pos) one position 
+     * Insert the value before pos shifting all the elements on the right of pos (including pos) one position
      * to the right.
-     * 
+     *
      * Amortized linear time-complexity in the distance between pos and end().
      */
-    std::pair<iterator, bool> insert_at_position(const_iterator pos, const value_type& value) { 
-        return m_ht.insert_at_position(pos, value); 
+    std::pair<iterator, bool> insert_at_position(const_iterator pos, const value_type& value) {
+        return m_ht.insert_at_position(pos, value);
     }
-    
+
     /**
      * @copydoc insert_at_position(const_iterator pos, const value_type& value)
      */
-    std::pair<iterator, bool> insert_at_position(const_iterator pos, value_type&& value) { 
-        return m_ht.insert_at_position(pos, std::move(value)); 
+    std::pair<iterator, bool> insert_at_position(const_iterator pos, value_type&& value) {
+        return m_ht.insert_at_position(pos, std::move(value));
     }
-    
+
     /**
      * @copydoc insert_at_position(const_iterator pos, const value_type& value)
-     * 
+     *
      * Same as insert_at_position(pos, value_type(std::forward<Args>(args)...), mainly
      * here for coherence.
      */
     template<class... Args>
     std::pair<iterator, bool> emplace_at_position(const_iterator pos, Args&&... args) {
-        return m_ht.emplace_at_position(pos, std::forward<Args>(args)...); 
+        return m_ht.emplace_at_position(pos, std::forward<Args>(args)...);
     }
-       
+
     /**
      * @copydoc insert_at_position(const_iterator pos, const value_type& value)
-     */       
+     */
     template<class... Args>
-    std::pair<iterator, bool> try_emplace_at_position(const_iterator pos, const key_type& k, Args&&... args) { 
+    std::pair<iterator, bool> try_emplace_at_position(const_iterator pos, const key_type& k, Args&&... args) {
         return m_ht.try_emplace_at_position(pos, k, std::forward<Args>(args)...);
     }
-    
+
     /**
      * @copydoc insert_at_position(const_iterator pos, const value_type& value)
-     */    
+     */
     template<class... Args>
     std::pair<iterator, bool> try_emplace_at_position(const_iterator pos, key_type&& k, Args&&... args) {
         return m_ht.try_emplace_at_position(pos, std::move(k), std::forward<Args>(args)...);
     }
-    
-    
-    
+
+
+
     void pop_back() { m_ht.pop_back(); }
-    
+
     /**
      * Faster erase operation with an O(1) average complexity but it doesn't preserve the insertion order.
-     * 
+     *
      * If an erasure occurs, the last element of the map will take the place of the erased element.
      */
     iterator unordered_erase(iterator pos) { return m_ht.unordered_erase(pos); }
-    
+
     /**
      * @copydoc unordered_erase(iterator pos)
      */
     iterator unordered_erase(const_iterator pos) { return m_ht.unordered_erase(pos); }
-    
+
     /**
      * @copydoc unordered_erase(iterator pos)
-     */    
+     */
     size_type unordered_erase(const key_type& key) { return m_ht.unordered_erase(key); }
-    
+
     /**
      * @copydoc unordered_erase(iterator pos)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
-     */    
-    size_type unordered_erase(const key_type& key, std::size_t precalculated_hash) { 
-        return m_ht.unordered_erase(key, precalculated_hash); 
+     */
+    size_type unordered_erase(const key_type& key, std::size_t precalculated_hash) {
+        return m_ht.unordered_erase(key, precalculated_hash);
     }
-    
+
     /**
      * @copydoc unordered_erase(iterator pos)
-     * 
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     *
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     size_type unordered_erase(const K& key) { return m_ht.unordered_erase(key); }
-    
+
     /**
      * @copydoc unordered_erase(const K& key)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    size_type unordered_erase(const K& key, std::size_t precalculated_hash) { 
-        return m_ht.unordered_erase(key, precalculated_hash); 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    size_type unordered_erase(const K& key, std::size_t precalculated_hash) {
+        return m_ht.unordered_erase(key, precalculated_hash);
     }
-    
-    
-    
+
+
+
     friend bool operator==(const ordered_map& lhs, const ordered_map& rhs) { return lhs.m_ht == rhs.m_ht; }
     friend bool operator!=(const ordered_map& lhs, const ordered_map& rhs) { return lhs.m_ht != rhs.m_ht; }
     friend bool operator<(const ordered_map& lhs, const ordered_map& rhs) { return lhs.m_ht < rhs.m_ht; }
     friend bool operator<=(const ordered_map& lhs, const ordered_map& rhs) { return lhs.m_ht <= rhs.m_ht; }
     friend bool operator>(const ordered_map& lhs, const ordered_map& rhs) { return lhs.m_ht > rhs.m_ht; }
     friend bool operator>=(const ordered_map& lhs, const ordered_map& rhs) { return lhs.m_ht >= rhs.m_ht; }
-    
+
     friend void swap(ordered_map& lhs, ordered_map& rhs) { lhs.swap(rhs); }
 
 private:
diff --git a/Foundation/include/Poco/ordered_set.h b/Foundation/include/Poco/ordered_set.h
index eeebbaf0e..db7075299 100644
--- a/Foundation/include/Poco/ordered_set.h
+++ b/Foundation/include/Poco/ordered_set.h
@@ -1,18 +1,18 @@
 /**
  * MIT License
- * 
+ *
  * Copyright (c) 2017 Tessil
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -41,27 +41,27 @@ namespace tsl {
 
 /**
  * Implementation of an hash set using open adressing with robin hood with backshift delete to resolve collisions.
- * 
+ *
  * The particularity of this hash set is that it remembers the order in which the elements were added and
- * provide a way to access the structure which stores these values through the 'values_container()' method. 
+ * provide a way to access the structure which stores these values through the 'values_container()' method.
  * The used container is defined by ValueTypeContainer, by default a std::deque is used (grows faster) but
- * a std::vector may be used. In this case the set provides a 'data()' method which give a direct access 
+ * a std::vector may be used. In this case the set provides a 'data()' method which give a direct access
  * to the memory used to store the values (which can be usefull to communicate with C API's).
- * 
+ *
  * The Key must be copy constructible and/or move constructible. To use `unordered_erase` it also must be swappable.
- * 
+ *
  * The behaviour of the hash set is undefinded if the destructor of Key throws an exception.
- * 
+ *
  * Iterators invalidation:
  *  - clear, operator=, reserve, rehash: always invalidate the iterators (also invalidate end()).
- *  - insert, emplace, emplace_hint, operator[]: when a std::vector is used as ValueTypeContainer 
- *                                               and if size() < capacity(), only end(). 
+ *  - insert, emplace, emplace_hint, operator[]: when a std::vector is used as ValueTypeContainer
+ *                                               and if size() < capacity(), only end().
  *                                               Otherwise all the iterators are invalidated if an insert occurs.
- *  - erase, unordered_erase: when a std::vector is used as ValueTypeContainer invalidate the iterator of 
- *                            the erased element and all the ones after the erased element (including end()). 
+ *  - erase, unordered_erase: when a std::vector is used as ValueTypeContainer invalidate the iterator of
+ *                            the erased element and all the ones after the erased element (including end()).
  *                            Otherwise all the iterators are invalidated if an erase occurs.
  */
-template<class Key, 
+template<class Key,
          class Hash = std::hash<Key>,
          class KeyEqual = std::equal_to<Key>,
          class Allocator = std::allocator<Key>,
@@ -70,23 +70,23 @@ class ordered_set {
 private:
     template<typename U>
     using has_is_transparent = tsl::detail_ordered_hash::has_is_transparent<U>;
-    
+
     class KeySelect {
     public:
         using key_type = Key;
-        
+
         const key_type& operator()(const Key& key) const noexcept {
             return key;
         }
-        
+
         key_type& operator()(Key& key) noexcept {
             return key;
         }
     };
-    
+
     using ht = detail_ordered_hash::ordered_hash<Key, KeySelect, void,
                                                  Hash, KeyEqual, Allocator, ValueTypeContainer>;
-            
+
 public:
     using key_type = typename ht::key_type;
     using value_type = typename ht::value_type;
@@ -103,38 +103,38 @@ public:
     using const_iterator = typename ht::const_iterator;
     using reverse_iterator = typename ht::reverse_iterator;
     using const_reverse_iterator = typename ht::const_reverse_iterator;
-    
+
     using values_container_type = typename ht::values_container_type;
 
-    
+
     /*
      * Constructors
      */
     ordered_set(): ordered_set(ht::DEFAULT_INIT_BUCKETS_SIZE) {
     }
-    
-    explicit ordered_set(size_type bucket_count, 
+
+    explicit ordered_set(size_type bucket_count,
                          const Hash& hash = Hash(),
                          const KeyEqual& equal = KeyEqual(),
-                         const Allocator& alloc = Allocator()): 
+                         const Allocator& alloc = Allocator()):
                         m_ht(bucket_count, hash, equal, alloc, ht::DEFAULT_MAX_LOAD_FACTOR)
     {
     }
-    
+
     ordered_set(size_type bucket_count,
                 const Allocator& alloc): ordered_set(bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
-    
+
     ordered_set(size_type bucket_count,
                 const Hash& hash,
                 const Allocator& alloc): ordered_set(bucket_count, hash, KeyEqual(), alloc)
     {
     }
-    
+
     explicit ordered_set(const Allocator& alloc): ordered_set(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {
     }
-    
+
     template<class InputIt>
     ordered_set(InputIt first, InputIt last,
                 size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
@@ -144,14 +144,14 @@ public:
     {
         insert(first, last);
     }
-    
+
     template<class InputIt>
     ordered_set(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Allocator& alloc): ordered_set(first, last, bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
-    
+
     template<class InputIt>
     ordered_set(InputIt first, InputIt last,
                 size_type bucket_count,
@@ -164,14 +164,14 @@ public:
                 size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
                 const Hash& hash = Hash(),
                 const KeyEqual& equal = KeyEqual(),
-                const Allocator& alloc = Allocator()): 
+                const Allocator& alloc = Allocator()):
             ordered_set(init.begin(), init.end(), bucket_count, hash, equal, alloc)
     {
     }
 
     ordered_set(std::initializer_list<value_type> init,
                 size_type bucket_count,
-                const Allocator& alloc): 
+                const Allocator& alloc):
             ordered_set(init.begin(), init.end(), bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
@@ -179,462 +179,462 @@ public:
     ordered_set(std::initializer_list<value_type> init,
                 size_type bucket_count,
                 const Hash& hash,
-                const Allocator& alloc): 
+                const Allocator& alloc):
             ordered_set(init.begin(), init.end(), bucket_count, hash, KeyEqual(), alloc)
     {
     }
 
-    
+
     ordered_set& operator=(std::initializer_list<value_type> ilist) {
         m_ht.clear();
-        
+
         m_ht.reserve(ilist.size());
         m_ht.insert(ilist.begin(), ilist.end());
-        
+
         return *this;
     }
-    
+
     allocator_type get_allocator() const { return m_ht.get_allocator(); }
-    
-    
+
+
     /*
      * Iterators
      */
     iterator begin() noexcept { return m_ht.begin(); }
     const_iterator begin() const noexcept { return m_ht.begin(); }
     const_iterator cbegin() const noexcept { return m_ht.cbegin(); }
-    
+
     iterator end() noexcept { return m_ht.end(); }
     const_iterator end() const noexcept { return m_ht.end(); }
     const_iterator cend() const noexcept { return m_ht.cend(); }
-    
+
     reverse_iterator rbegin() noexcept { return m_ht.rbegin(); }
     const_reverse_iterator rbegin() const noexcept { return m_ht.rbegin(); }
     const_reverse_iterator rcbegin() const noexcept { return m_ht.rcbegin(); }
-    
+
     reverse_iterator rend() noexcept { return m_ht.rend(); }
     const_reverse_iterator rend() const noexcept { return m_ht.rend(); }
     const_reverse_iterator rcend() const noexcept { return m_ht.rcend(); }
-    
-    
+
+
     /*
      * Capacity
      */
     bool empty() const noexcept { return m_ht.empty(); }
     size_type size() const noexcept { return m_ht.size(); }
     size_type max_size() const noexcept { return m_ht.max_size(); }
-    
+
     /*
      * Modifiers
      */
     void clear() noexcept { m_ht.clear(); }
-    
-    
-    
+
+
+
     std::pair<iterator, bool> insert(const value_type& value) { return m_ht.insert(value); }
     std::pair<iterator, bool> insert(value_type&& value) { return m_ht.insert(std::move(value)); }
-    
+
     iterator insert(const_iterator hint, const value_type& value) {
-        return m_ht.insert(hint, value); 
+        return m_ht.insert(hint, value);
     }
-    
-    iterator insert(const_iterator hint, value_type&& value) { 
-        return m_ht.insert(hint, std::move(value)); 
+
+    iterator insert(const_iterator hint, value_type&& value) {
+        return m_ht.insert(hint, std::move(value));
     }
-    
+
     template<class InputIt>
     void insert(InputIt first, InputIt last) { m_ht.insert(first, last); }
     void insert(std::initializer_list<value_type> ilist) { m_ht.insert(ilist.begin(), ilist.end()); }
 
-    
-    
+
+
     /**
      * Due to the way elements are stored, emplace will need to move or copy the key-value once.
      * The method is equivalent to insert(value_type(std::forward<Args>(args)...));
-     * 
+     *
      * Mainly here for compatibility with the std::unordered_map interface.
      */
     template<class... Args>
     std::pair<iterator, bool> emplace(Args&&... args) { return m_ht.emplace(std::forward<Args>(args)...); }
-    
+
     /**
      * Due to the way elements are stored, emplace_hint will need to move or copy the key-value once.
      * The method is equivalent to insert(hint, value_type(std::forward<Args>(args)...));
-     * 
+     *
      * Mainly here for compatibility with the std::unordered_map interface.
      */
     template<class... Args>
     iterator emplace_hint(const_iterator hint, Args&&... args) {
-        return m_ht.emplace_hint(hint, std::forward<Args>(args)...); 
+        return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
     }
 
     /**
      * When erasing an element, the insert order will be preserved and no holes will be present in the container
-     * returned by 'values_container()'. 
-     * 
+     * returned by 'values_container()'.
+     *
      * The method is in O(n), if the order is not important 'unordered_erase(...)' method is faster with an O(1)
      * average complexity.
-     */    
+     */
     iterator erase(iterator pos) { return m_ht.erase(pos); }
-    
+
     /**
      * @copydoc erase(iterator pos)
-     */    
+     */
     iterator erase(const_iterator pos) { return m_ht.erase(pos); }
-    
+
     /**
      * @copydoc erase(iterator pos)
-     */    
+     */
     iterator erase(const_iterator first, const_iterator last) { return m_ht.erase(first, last); }
-    
+
     /**
      * @copydoc erase(iterator pos)
-     */    
+     */
     size_type erase(const key_type& key) { return m_ht.erase(key); }
-    
+
     /**
      * @copydoc erase(iterator pos)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup to the value if you already have the hash.
-     */    
-    size_type erase(const key_type& key, std::size_t precalculated_hash) { 
-        return m_ht.erase(key, precalculated_hash); 
+     */
+    size_type erase(const key_type& key, std::size_t precalculated_hash) {
+        return m_ht.erase(key, precalculated_hash);
     }
-    
+
     /**
      * @copydoc erase(iterator pos)
-     * 
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     *
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     size_type erase(const K& key) { return m_ht.erase(key); }
-    
+
     /**
      * @copydoc erase(const key_type& key, std::size_t precalculated_hash)
-     * 
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     *
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    size_type erase(const K& key, std::size_t precalculated_hash) { 
-        return m_ht.erase(key, precalculated_hash); 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    size_type erase(const K& key, std::size_t precalculated_hash) {
+        return m_ht.erase(key, precalculated_hash);
     }
-    
-    
-    
-    void swap(ordered_set& other) { other.m_ht.swap(m_ht); }
-    
+
+
+
+    void swap(ordered_set& other) noexcept { other.m_ht.swap(m_ht); }
+
     /*
      * Lookup
      */
     size_type count(const Key& key) const { return m_ht.count(key); }
-    
+
     /**
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    size_type count(const Key& key, std::size_t precalculated_hash) const { 
-        return m_ht.count(key, precalculated_hash); 
+    size_type count(const Key& key, std::size_t precalculated_hash) const {
+        return m_ht.count(key, precalculated_hash);
     }
-    
+
     /**
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
     template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     size_type count(const K& key) const { return m_ht.count(key); }
-    
+
     /**
      * @copydoc count(const K& key) const
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
-     */     
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    size_type count(const K& key, std::size_t precalculated_hash) const { 
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    size_type count(const K& key, std::size_t precalculated_hash) const {
         return m_ht.count(key, precalculated_hash);
     }
-    
-    
-    
-    
+
+
+
+
     iterator find(const Key& key) { return m_ht.find(key); }
-    
+
     /**
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
     iterator find(const Key& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
-    
+
     const_iterator find(const Key& key) const { return m_ht.find(key); }
-    
+
     /**
      * @copydoc find(const Key& key, std::size_t precalculated_hash)
      */
-    const_iterator find(const Key& key, std::size_t precalculated_hash) const { 
+    const_iterator find(const Key& key, std::size_t precalculated_hash) const {
         return m_ht.find(key, precalculated_hash);
     }
-    
+
     /**
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
     template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     iterator find(const K& key) { return m_ht.find(key); }
-    
+
     /**
      * @copydoc find(const K& key)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     iterator find(const K& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
-    
+
     /**
      * @copydoc find(const K& key)
      */
     template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     const_iterator find(const K& key) const { return m_ht.find(key); }
-    
+
     /**
      * @copydoc find(const K& key)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    const_iterator find(const K& key, std::size_t precalculated_hash) const { 
-        return m_ht.find(key, precalculated_hash); 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    const_iterator find(const K& key, std::size_t precalculated_hash) const {
+        return m_ht.find(key, precalculated_hash);
     }
-    
-    
-    
+
+
+
     std::pair<iterator, iterator> equal_range(const Key& key) { return m_ht.equal_range(key); }
-    
+
     /**
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    std::pair<iterator, iterator> equal_range(const Key& key, std::size_t precalculated_hash) { 
-        return m_ht.equal_range(key, precalculated_hash); 
+    std::pair<iterator, iterator> equal_range(const Key& key, std::size_t precalculated_hash) {
+        return m_ht.equal_range(key, precalculated_hash);
     }
-    
+
     std::pair<const_iterator, const_iterator> equal_range(const Key& key) const { return m_ht.equal_range(key); }
-    
+
     /**
      * @copydoc equal_range(const Key& key, std::size_t precalculated_hash)
      */
-    std::pair<const_iterator, const_iterator> equal_range(const Key& key, std::size_t precalculated_hash) const { 
-        return m_ht.equal_range(key, precalculated_hash); 
+    std::pair<const_iterator, const_iterator> equal_range(const Key& key, std::size_t precalculated_hash) const {
+        return m_ht.equal_range(key, precalculated_hash);
     }
-    
+
     /**
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>     
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     std::pair<iterator, iterator> equal_range(const K& key) { return m_ht.equal_range(key); }
-    
+
     /**
      * @copydoc equal_range(const K& key)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) { 
-        return m_ht.equal_range(key, precalculated_hash); 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) {
+        return m_ht.equal_range(key, precalculated_hash);
     }
-    
+
     /**
      * @copydoc equal_range(const K& key)
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>     
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     std::pair<const_iterator, const_iterator> equal_range(const K& key) const { return m_ht.equal_range(key); }
-    
+
     /**
      * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
-     */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const { 
-        return m_ht.equal_range(key, precalculated_hash); 
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const {
+        return m_ht.equal_range(key, precalculated_hash);
     }
-    
+
 
     /*
-     * Bucket interface 
+     * Bucket interface
      */
     size_type bucket_count() const { return m_ht.bucket_count(); }
     size_type max_bucket_count() const { return m_ht.max_bucket_count(); }
-    
-    
+
+
     /*
-     *  Hash policy 
+     *  Hash policy
      */
     float load_factor() const { return m_ht.load_factor(); }
     float max_load_factor() const { return m_ht.max_load_factor(); }
     void max_load_factor(float ml) { m_ht.max_load_factor(ml); }
-    
+
     void rehash(size_type count) { m_ht.rehash(count); }
     void reserve(size_type count) { m_ht.reserve(count); }
-    
-    
+
+
     /*
      * Observers
      */
     hasher hash_function() const { return m_ht.hash_function(); }
     key_equal key_eq() const { return m_ht.key_eq(); }
-    
-    
+
+
     /*
      * Other
      */
-    
+
     /**
      * Convert a const_iterator to an iterator.
      */
     iterator mutable_iterator(const_iterator pos) {
         return m_ht.mutable_iterator(pos);
     }
-    
+
     /**
      * Requires index <= size().
-     * 
+     *
      * Return an iterator to the element at index. Return end() if index == size().
      */
     iterator nth(size_type index) { return m_ht.nth(index); }
-    
+
     /**
      * @copydoc nth(size_type index)
      */
     const_iterator nth(size_type index) const { return m_ht.nth(index); }
-    
-    
+
+
     /**
      * Return const_reference to the first element. Requires the container to not be empty.
      */
     const_reference front() const { return m_ht.front(); }
-    
+
     /**
      * Return const_reference to the last element. Requires the container to not be empty.
      */
     const_reference back() const { return m_ht.back(); }
-    
-    
+
+
     /**
      * Only available if ValueTypeContainer is a std::vector. Same as calling 'values_container().data()'.
-     */ 
-    template<class U = values_container_type, typename std::enable_if<tsl::detail_ordered_hash::is_vector<U>::value>::type* = nullptr>    
+     */
+    template<class U = values_container_type, typename std::enable_if<tsl::detail_ordered_hash::is_vector<U>::value>::type* = nullptr>
     const typename values_container_type::value_type* data() const noexcept { return m_ht.data(); }
-    
+
     /**
      * Return the container in which the values are stored. The values are in the same order as the insertion order
      * and are contiguous in the structure, no holes (size() == values_container().size()).
-     */        
+     */
     const values_container_type& values_container() const noexcept { return m_ht.values_container(); }
 
-    template<class U = values_container_type, typename std::enable_if<tsl::detail_ordered_hash::is_vector<U>::value>::type* = nullptr>    
+    template<class U = values_container_type, typename std::enable_if<tsl::detail_ordered_hash::is_vector<U>::value>::type* = nullptr>
     size_type capacity() const noexcept { return m_ht.capacity(); }
-    
+
     void shrink_to_fit() { m_ht.shrink_to_fit(); }
-    
-    
-    
+
+
+
     /**
-     * Insert the value before pos shifting all the elements on the right of pos (including pos) one position 
+     * Insert the value before pos shifting all the elements on the right of pos (including pos) one position
      * to the right.
-     * 
+     *
      * Amortized linear time-complexity in the distance between pos and end().
      */
-    std::pair<iterator, bool> insert_at_position(const_iterator pos, const value_type& value) { 
-        return m_ht.insert_at_position(pos, value); 
+    std::pair<iterator, bool> insert_at_position(const_iterator pos, const value_type& value) {
+        return m_ht.insert_at_position(pos, value);
     }
-    
+
     /**
      * @copydoc insert_at_position(const_iterator pos, const value_type& value)
      */
-    std::pair<iterator, bool> insert_at_position(const_iterator pos, value_type&& value) { 
-        return m_ht.insert_at_position(pos, std::move(value)); 
+    std::pair<iterator, bool> insert_at_position(const_iterator pos, value_type&& value) {
+        return m_ht.insert_at_position(pos, std::move(value));
     }
-    
+
     /**
      * @copydoc insert_at_position(const_iterator pos, const value_type& value)
-     * 
+     *
      * Same as insert_at_position(pos, value_type(std::forward<Args>(args)...), mainly
      * here for coherence.
      */
     template<class... Args>
     std::pair<iterator, bool> emplace_at_position(const_iterator pos, Args&&... args) {
-        return m_ht.emplace_at_position(pos, std::forward<Args>(args)...); 
+        return m_ht.emplace_at_position(pos, std::forward<Args>(args)...);
     }
-    
-    
-    
+
+
+
     void pop_back() { m_ht.pop_back(); }
-    
+
     /**
      * Faster erase operation with an O(1) average complexity but it doesn't preserve the insertion order.
-     * 
+     *
      * If an erasure occurs, the last element of the map will take the place of the erased element.
-     */    
+     */
     iterator unordered_erase(iterator pos) { return m_ht.unordered_erase(pos); }
-    
+
     /**
      * @copydoc unordered_erase(iterator pos)
-     */    
+     */
     iterator unordered_erase(const_iterator pos) { return m_ht.unordered_erase(pos); }
-    
+
     /**
      * @copydoc unordered_erase(iterator pos)
-     */    
+     */
     size_type unordered_erase(const key_type& key) { return m_ht.unordered_erase(key); }
-    
+
     /**
      * @copydoc unordered_erase(iterator pos)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
-     */    
-    size_type unordered_erase(const key_type& key, std::size_t precalculated_hash) { 
-        return m_ht.unordered_erase(key, precalculated_hash); 
+     */
+    size_type unordered_erase(const key_type& key, std::size_t precalculated_hash) {
+        return m_ht.unordered_erase(key, precalculated_hash);
     }
-    
+
     /**
      * @copydoc unordered_erase(iterator pos)
-     * 
-     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     *
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists.
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
     size_type unordered_erase(const K& key) { return m_ht.unordered_erase(key); }
-    
+
     /**
      * @copydoc unordered_erase(const K& key)
-     * 
+     *
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
-    size_type unordered_erase(const K& key, std::size_t precalculated_hash) { 
-        return m_ht.unordered_erase(key, precalculated_hash); 
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+    size_type unordered_erase(const K& key, std::size_t precalculated_hash) {
+        return m_ht.unordered_erase(key, precalculated_hash);
     }
-    
-    
-    
+
+
+
     friend bool operator==(const ordered_set& lhs, const ordered_set& rhs) { return lhs.m_ht == rhs.m_ht; }
     friend bool operator!=(const ordered_set& lhs, const ordered_set& rhs) { return lhs.m_ht != rhs.m_ht; }
     friend bool operator<(const ordered_set& lhs, const ordered_set& rhs) { return lhs.m_ht < rhs.m_ht; }
     friend bool operator<=(const ordered_set& lhs, const ordered_set& rhs) { return lhs.m_ht <= rhs.m_ht; }
     friend bool operator>(const ordered_set& lhs, const ordered_set& rhs) { return lhs.m_ht > rhs.m_ht; }
     friend bool operator>=(const ordered_set& lhs, const ordered_set& rhs) { return lhs.m_ht >= rhs.m_ht; }
-    
+
     friend void swap(ordered_set& lhs, ordered_set& rhs) { lhs.swap(rhs); }
-    
+
 private:
-    ht m_ht;    
+    ht m_ht;
 };
 
 } // end namespace tsl
diff --git a/Foundation/samples/ActiveMethod/src/ActiveMethod.cpp b/Foundation/samples/ActiveMethod/src/ActiveMethod.cpp
index 1d2be4d42..d47f9940f 100644
--- a/Foundation/samples/ActiveMethod/src/ActiveMethod.cpp
+++ b/Foundation/samples/ActiveMethod/src/ActiveMethod.cpp
@@ -27,14 +27,14 @@ public:
 		int a;
 		int b;
 	};
-	
+
 	ActiveMethodExample():
 		activeAdd(this, &ActiveMethodExample::activeAddImp)
 	{
 	}
-	
+
 	ActiveMethod<int, AddArgs, ActiveMethodExample> activeAdd;
-	
+
 private:
 	int activeAddImp(const AddArgs& args)
 	{
@@ -46,11 +46,11 @@ private:
 int main(int argc, char** argv)
 {
 	ActiveMethodExample example;
-	
+
 	ActiveMethodExample::AddArgs args = {1, 2};
 	ActiveResult<int> result = example.activeAdd(args);
 	result.wait();
 	std::cout << result.data() << std::endl;
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/Activity/src/Activity.cpp b/Foundation/samples/Activity/src/Activity.cpp
index 7d13bc39d..0dac9e849 100644
--- a/Foundation/samples/Activity/src/Activity.cpp
+++ b/Foundation/samples/Activity/src/Activity.cpp
@@ -26,12 +26,12 @@ public:
 		_activity(this, &ActivityExample::runActivity)
 	{
 	}
-	
+
 	void start()
 	{
 		_activity.start();
 	}
-	
+
 	void stop()
 	{
 		_activity.stop();
@@ -48,7 +48,7 @@ protected:
 		}
 		std::cout << "Activity stopped." << std::endl;
 	}
-	
+
 private:
 	Activity<ActivityExample> _activity;
 };
diff --git a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.progen b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.progen
+++ b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/BinaryReaderWriter/src/BinaryReaderWriter.cpp b/Foundation/samples/BinaryReaderWriter/src/BinaryReaderWriter.cpp
index d7205e7b6..c32dc507a 100644
--- a/Foundation/samples/BinaryReaderWriter/src/BinaryReaderWriter.cpp
+++ b/Foundation/samples/BinaryReaderWriter/src/BinaryReaderWriter.cpp
@@ -23,32 +23,32 @@ using Poco::BinaryReader;
 int main(int argc, char** argv)
 {
 	std::stringstream str;
-	
+
 	BinaryWriter writer(str);
 	writer << true
 	       << 'x'
 	       << 42
 	       << 3.14159265
 	       << "foo bar";
-	       
+
 	bool   b;
 	char   c;
 	int    i;
 	double d;
 	std::string s;
-	
+
 	BinaryReader reader(str);
 	reader >> b
 	       >> c
 	       >> i
 	       >> d
 	       >> s;
-	       
+
 	std::cout << b << std::endl
 	          << c << std::endl
 	          << i << std::endl
 	          << d << std::endl
 	          << s << std::endl;
-	          	
+
 	return 0;
 }
diff --git a/Foundation/samples/DateTime/DateTime.progen b/Foundation/samples/DateTime/DateTime.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/DateTime/DateTime.progen
+++ b/Foundation/samples/DateTime/DateTime.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/DateTime/src/DateTime.cpp b/Foundation/samples/DateTime/src/DateTime.cpp
index 9cf571890..ac55721b8 100644
--- a/Foundation/samples/DateTime/src/DateTime.cpp
+++ b/Foundation/samples/DateTime/src/DateTime.cpp
@@ -28,7 +28,7 @@ using Poco::DateTimeParser;
 int main(int argc, char** argv)
 {
 	LocalDateTime now;
-	
+
 	std::string str = DateTimeFormatter::format(now, DateTimeFormat::ISO8601_FORMAT);
 	DateTime dt;
 	int tzd;
diff --git a/Foundation/samples/LineEndingConverter/LineEndingConverter.progen b/Foundation/samples/LineEndingConverter/LineEndingConverter.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/LineEndingConverter/LineEndingConverter.progen
+++ b/Foundation/samples/LineEndingConverter/LineEndingConverter.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/LogRotation/LogRotation.progen b/Foundation/samples/LogRotation/LogRotation.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/LogRotation/LogRotation.progen
+++ b/Foundation/samples/LogRotation/LogRotation.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/Logger/Logger.progen b/Foundation/samples/Logger/Logger.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/Logger/Logger.progen
+++ b/Foundation/samples/Logger/Logger.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/Logger/src/Logger.cpp b/Foundation/samples/Logger/src/Logger.cpp
index acee81189..5ed2d9126 100644
--- a/Foundation/samples/Logger/src/Logger.cpp
+++ b/Foundation/samples/Logger/src/Logger.cpp
@@ -34,7 +34,7 @@ int main(int argc, char** argv)
 	FormattingChannel* pFCConsole = new FormattingChannel(new PatternFormatter("[%O] %s: %p: %t"));
 	pFCConsole->setChannel(new ConsoleChannel);
 	pFCConsole->open();
-	
+
 	FormattingChannel* pFCFile = new FormattingChannel(new PatternFormatter("%Y-%m-%d %H:%M:%S.%c %N[%P]:%s:%q:%t"));
 	pFCFile->setChannel(new FileChannel("sample.log"));
 	pFCFile->open();
@@ -43,21 +43,21 @@ int main(int argc, char** argv)
 	// each channel chain.
 	Logger& consoleLogger = Logger::create("ConsoleLogger", pFCConsole, Message::PRIO_INFORMATION);
 	Logger& fileLogger    = Logger::create("FileLogger", pFCFile, Message::PRIO_WARNING);
-	
+
 	// log some messages
 	consoleLogger.error("An error message");
 	fileLogger.error("An error message");
-	
+
 	consoleLogger.warning("A warning message");
 	fileLogger.error("A warning message");
-	
+
 	consoleLogger.information("An information message");
 	fileLogger.information("An information message");
-	
+
 	poco_information(consoleLogger, "Another informational message");
 	poco_warning_f2(consoleLogger, "A warning message with arguments: %d, %d", 1, 2);
-	
+
 	Logger::get("ConsoleLogger").error("Another error message");
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/NotificationQueue/NotificationQueue.progen b/Foundation/samples/NotificationQueue/NotificationQueue.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/NotificationQueue/NotificationQueue.progen
+++ b/Foundation/samples/NotificationQueue/NotificationQueue.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/NotificationQueue/src/NotificationQueue.cpp b/Foundation/samples/NotificationQueue/src/NotificationQueue.cpp
index 2885d8423..c14a1bd07 100644
--- a/Foundation/samples/NotificationQueue/src/NotificationQueue.cpp
+++ b/Foundation/samples/NotificationQueue/src/NotificationQueue.cpp
@@ -36,12 +36,12 @@ class WorkNotification: public Notification
 {
 public:
 	typedef AutoPtr<WorkNotification> Ptr;
-	
+
 	WorkNotification(int data):
 		_data(data)
 	{
 	}
-	
+
 	int data() const
 	{
 		return _data;
@@ -62,7 +62,7 @@ public:
 		_queue(queue)
 	{
 	}
-	
+
 	void run()
 	{
 		Poco::Random rnd;
@@ -84,7 +84,7 @@ public:
 			else break;
 		}
 	}
-	
+
 private:
 	std::string        _name;
 	NotificationQueue& _queue;
@@ -98,7 +98,7 @@ FastMutex Worker::_mutex;
 int main(int argc, char** argv)
 {
 	NotificationQueue queue;
-	
+
 	// create some worker threads
 	Worker worker1("Worker 1", queue);
 	Worker worker2("Worker 2", queue);
@@ -114,15 +114,15 @@ int main(int argc, char** argv)
 	{
 		queue.enqueueNotification(new WorkNotification(i));
 	}
-	
-	// wait until queue is empty and all threads are 
+
+	// wait until queue is empty and all threads are
 	// waiting for new work.
 	while (!queue.empty()) Thread::sleep(200);
 	Thread::sleep(500);
-	
+
 	// stop all worker threads
 	queue.wakeUpAll();
 	ThreadPool::defaultPool().joinAll();
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/StringTokenizer/StringTokenizer.progen b/Foundation/samples/StringTokenizer/StringTokenizer.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/StringTokenizer/StringTokenizer.progen
+++ b/Foundation/samples/StringTokenizer/StringTokenizer.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/Timer/Timer.progen b/Foundation/samples/Timer/Timer.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/Timer/Timer.progen
+++ b/Foundation/samples/Timer/Timer.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/Timer/src/Timer.cpp b/Foundation/samples/Timer/src/Timer.cpp
index 72193a092..5685f20bf 100644
--- a/Foundation/samples/Timer/src/Timer.cpp
+++ b/Foundation/samples/Timer/src/Timer.cpp
@@ -29,27 +29,27 @@ public:
 	{
 		_sw.start();
 	}
-	
+
 	void onTimer(Timer& timer)
 	{
 		std::cout << "Callback called after " << _sw.elapsed()/1000 << " milliseconds." << std::endl;
 	}
-	
+
 private:
 	Stopwatch _sw;
 };
 
 
 int main(int argc, char** argv)
-{	
+{
 	TimerExample example;
 
 	Timer timer(250, 500);
 	timer.start(TimerCallback<TimerExample>(example, &TimerExample::onTimer));
-	
+
 	Thread::sleep(5000);
-	
+
 	timer.stop();
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/URI/URI.progen b/Foundation/samples/URI/URI.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/URI/URI.progen
+++ b/Foundation/samples/URI/URI.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/URI/src/URI.cpp b/Foundation/samples/URI/src/URI.cpp
index c386843c3..8fecd047a 100644
--- a/Foundation/samples/URI/src/URI.cpp
+++ b/Foundation/samples/URI/src/URI.cpp
@@ -20,19 +20,19 @@ using Poco::URI;
 int main(int argc, char** argv)
 {
 	URI uri1("http://www.appinf.com:81/sample?example-query#somewhere");
-	
+
 	std::cout << "Scheme:    " << uri1.getScheme() << std::endl
 	          << "Authority: " << uri1.getAuthority() << std::endl
 	          << "Path:      " << uri1.getPath() << std::endl
 	          << "Query:     " << uri1.getQuery() << std::endl
 	          << "Fragment:  " << uri1.getFragment() << std::endl;
-	          
+
 	URI uri2;
 	uri2.setScheme("https");
 	uri2.setAuthority("www.appinf.com");
 	uri2.setPath("/another sample");
-	
+
 	std::cout << uri2.toString() << std::endl;
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/base64decode/base64decode.progen b/Foundation/samples/base64decode/base64decode.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/base64decode/base64decode.progen
+++ b/Foundation/samples/base64decode/base64decode.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/base64decode/src/base64decode.cpp b/Foundation/samples/base64decode/src/base64decode.cpp
index adda31ac5..1cc15bf4e 100644
--- a/Foundation/samples/base64decode/src/base64decode.cpp
+++ b/Foundation/samples/base64decode/src/base64decode.cpp
@@ -28,29 +28,29 @@ int main(int argc, char** argv)
 		          << "       read base64-encoded <input_file>, decode it and write the result to <output_file>" << std::endl;
 		return 1;
 	}
-	
+
 	std::ifstream istr(argv[1]);
 	if (!istr)
 	{
 		std::cerr << "cannot open input file: " << argv[1] << std::endl;
 		return 2;
 	}
-	
+
 	std::ofstream ostr(argv[2], std::ios::binary);
 	if (!ostr)
 	{
 		std::cerr << "cannot open output file: " << argv[2] << std::endl;
 		return 3;
 	}
-	
+
 	Base64Decoder decoder(istr);
 	StreamCopier::copyStream(decoder, ostr);
-	
+
 	if (!ostr)
 	{
 		std::cerr << "error writing output file: " << argv[2] << std::endl;
 		return 4;
 	}
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/base64encode/base64encode.progen b/Foundation/samples/base64encode/base64encode.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/base64encode/base64encode.progen
+++ b/Foundation/samples/base64encode/base64encode.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/base64encode/src/base64encode.cpp b/Foundation/samples/base64encode/src/base64encode.cpp
index c525330af..d20c9601e 100644
--- a/Foundation/samples/base64encode/src/base64encode.cpp
+++ b/Foundation/samples/base64encode/src/base64encode.cpp
@@ -28,29 +28,29 @@ int main(int argc, char** argv)
 		          << "       read <input_file>, base64-encode it and write the result to <output_file>" << std::endl;
 		return 1;
 	}
-	
+
 	std::ifstream istr(argv[1], std::ios::binary);
 	if (!istr)
 	{
 		std::cerr << "cannot open input file: " << argv[1] << std::endl;
 		return 2;
 	}
-	
+
 	std::ofstream ostr(argv[2]);
 	if (!ostr)
 	{
 		std::cerr << "cannot open output file: " << argv[2] << std::endl;
 		return 3;
 	}
-	
+
 	Base64Encoder encoder(ostr);
 	StreamCopier::copyStream(istr, encoder);
-	
+
 	if (!ostr)
 	{
 		std::cerr << "error writing output file: " << argv[2] << std::endl;
 		return 4;
 	}
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/deflate/deflate.progen b/Foundation/samples/deflate/deflate.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/deflate/deflate.progen
+++ b/Foundation/samples/deflate/deflate.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/deflate/src/deflate.cpp b/Foundation/samples/deflate/src/deflate.cpp
index f13c4863b..46b28b4e5 100644
--- a/Foundation/samples/deflate/src/deflate.cpp
+++ b/Foundation/samples/deflate/src/deflate.cpp
@@ -28,29 +28,29 @@ int main(int argc, char** argv)
 		          << "       read <input_file>, deflate (compress) it and write the result to <output_file>" << std::endl;
 		return 1;
 	}
-	
+
 	std::ifstream istr(argv[1], std::ios::binary);
 	if (!istr)
 	{
 		std::cerr << "cannot open input file: " << argv[1] << std::endl;
 		return 2;
 	}
-	
+
 	std::ofstream ostr(argv[2], std::ios::binary);
 	if (!ostr)
 	{
 		std::cerr << "cannot open output file: " << argv[2] << std::endl;
 		return 3;
 	}
-	
+
 	DeflatingOutputStream deflater(ostr);
 	StreamCopier::copyStream(istr, deflater);
-	
+
 	if (!ostr)
 	{
 		std::cerr << "error writing output file: " << argv[2] << std::endl;
 		return 4;
 	}
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/dir/dir.progen b/Foundation/samples/dir/dir.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/dir/dir.progen
+++ b/Foundation/samples/dir/dir.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/dir/src/dir.cpp b/Foundation/samples/dir/src/dir.cpp
index fe771fb65..923219a80 100644
--- a/Foundation/samples/dir/src/dir.cpp
+++ b/Foundation/samples/dir/src/dir.cpp
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 		dir = argv[1];
 	else
 		dir = Path::current();
-		
+
 	try
 	{
 		DirectoryIterator it(dir);
@@ -57,6 +57,6 @@ int main(int argc, char** argv)
 		std::cerr << exc.displayText() << std::endl;
 		return 1;
 	}
-		
+
 	return 0;
 }
diff --git a/Foundation/samples/grep/grep.progen b/Foundation/samples/grep/grep.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/grep/grep.progen
+++ b/Foundation/samples/grep/grep.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/grep/src/grep.cpp b/Foundation/samples/grep/src/grep.cpp
index 5be5c1693..c0e34bb94 100644
--- a/Foundation/samples/grep/src/grep.cpp
+++ b/Foundation/samples/grep/src/grep.cpp
@@ -24,7 +24,7 @@ int main(int argc, char** argv)
 		std::cout << "usage: " << argv[0] << ": [-i] [-x] pattern" << std::endl;
 		return 1;
 	}
-	
+
 	std::string pattern;
 	int options = 0;
 	for (int i = 1; i < argc; ++i)
@@ -37,9 +37,9 @@ int main(int argc, char** argv)
 		else
 			pattern = arg;
 	}
-	
+
 	RegularExpression re(pattern, options);
-	
+
 	int c = std::cin.get();
 	while (c != -1)
 	{
@@ -56,6 +56,6 @@ int main(int argc, char** argv)
 
 		if (c != -1) c = std::cin.get();
 	}
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/hmacmd5/hmacmd5.progen b/Foundation/samples/hmacmd5/hmacmd5.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/hmacmd5/hmacmd5.progen
+++ b/Foundation/samples/hmacmd5/hmacmd5.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/hmacmd5/src/hmacmd5.cpp b/Foundation/samples/hmacmd5/src/hmacmd5.cpp
index 785c7df2a..4606a9ce4 100644
--- a/Foundation/samples/hmacmd5/src/hmacmd5.cpp
+++ b/Foundation/samples/hmacmd5/src/hmacmd5.cpp
@@ -33,23 +33,23 @@ int main(int argc, char** argv)
 		          << "       create the HMAC-MD5 for <input_file>, using <passphrase>" << std::endl;
 		return 1;
 	}
-	
+
 	std::string passphrase(argv[1]);
-	
+
 	std::ifstream istr(argv[2], std::ios::binary);
 	if (!istr)
 	{
 		std::cerr << "cannot open input file: " << argv[2] << std::endl;
 		return 2;
 	}
-	
+
 	HMACEngine<MD5Engine> hmac(passphrase);
 	DigestOutputStream dos(hmac);
-	
+
 	StreamCopier::copyStream(istr, dos);
 	dos.close();
-	
+
 	std::cout << DigestEngine::digestToHex(hmac.digest()) << std::endl;
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/inflate/inflate.progen b/Foundation/samples/inflate/inflate.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/inflate/inflate.progen
+++ b/Foundation/samples/inflate/inflate.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/inflate/src/inflate.cpp b/Foundation/samples/inflate/src/inflate.cpp
index 0762ab9a0..fbd48ec17 100644
--- a/Foundation/samples/inflate/src/inflate.cpp
+++ b/Foundation/samples/inflate/src/inflate.cpp
@@ -28,29 +28,29 @@ int main(int argc, char** argv)
 		          << "       read deflated (compressed) <input_file>, inflate it and write the result to <output_file>" << std::endl;
 		return 1;
 	}
-	
+
 	std::ifstream istr(argv[1], std::ios::binary);
 	if (!istr)
 	{
 		std::cerr << "cannot open input file: " << argv[1] << std::endl;
 		return 2;
 	}
-	
+
 	std::ofstream ostr(argv[2], std::ios::binary);
 	if (!ostr)
 	{
 		std::cerr << "cannot open output file: " << argv[2] << std::endl;
 		return 3;
 	}
-	
+
 	InflatingInputStream inflater(istr);
 	StreamCopier::copyStream(inflater, ostr);
-	
+
 	if (!ostr)
 	{
 		std::cerr << "error writing output file: " << argv[2] << std::endl;
 		return 4;
 	}
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/md5/md5.progen b/Foundation/samples/md5/md5.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/md5/md5.progen
+++ b/Foundation/samples/md5/md5.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/samples/md5/src/md5.cpp b/Foundation/samples/md5/src/md5.cpp
index 0e3a24dfb..84a50cf13 100644
--- a/Foundation/samples/md5/src/md5.cpp
+++ b/Foundation/samples/md5/src/md5.cpp
@@ -32,21 +32,21 @@ int main(int argc, char** argv)
 		          << "       create the MD5 digest for <input_file>" << std::endl;
 		return 1;
 	}
-	
+
 	std::ifstream istr(argv[1], std::ios::binary);
 	if (!istr)
 	{
 		std::cerr << "cannot open input file: " << argv[1] << std::endl;
 		return 2;
 	}
-	
+
 	MD5Engine md5;
 	DigestOutputStream dos(md5);
-	
+
 	StreamCopier::copyStream(istr, dos);
 	dos.close();
 
 	std::cout << DigestEngine::digestToHex(md5.digest()) << std::endl;
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/uuidgen/src/uuidgen.cpp b/Foundation/samples/uuidgen/src/uuidgen.cpp
index e8df47344..33554b0d0 100644
--- a/Foundation/samples/uuidgen/src/uuidgen.cpp
+++ b/Foundation/samples/uuidgen/src/uuidgen.cpp
@@ -24,11 +24,11 @@ using Poco::Exception;
 int main(int argc, char** argv)
 {
 	UUID uuid;
-	
+
 	std::string arg;
 	if (argc > 1)
 		arg = argv[1];
-	
+
 	try
 	{
 		if (arg == "-random")
@@ -37,7 +37,7 @@ int main(int argc, char** argv)
 			uuid = UUIDGenerator::defaultGenerator().create();
 		else
 			uuid = UUIDGenerator::defaultGenerator().createFromName(UUID::uri(), arg);
-		
+
 		std::cout << uuid.toString() << std::endl;
 	}
 	catch (Exception& exc)
@@ -45,6 +45,6 @@ int main(int argc, char** argv)
 		std::cerr << exc.displayText() << std::endl;
 		return 1;
 	}
-	
+
 	return 0;
 }
diff --git a/Foundation/samples/uuidgen/uuidgen.progen b/Foundation/samples/uuidgen/uuidgen.progen
index 7c2c98bb5..518a9d34a 100644
--- a/Foundation/samples/uuidgen/uuidgen.progen
+++ b/Foundation/samples/uuidgen/uuidgen.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Foundation/src/ASCIIEncoding.cpp b/Foundation/src/ASCIIEncoding.cpp
index 66a1b3da9..862a0f5e7 100644
--- a/Foundation/src/ASCIIEncoding.cpp
+++ b/Foundation/src/ASCIIEncoding.cpp
@@ -27,24 +27,24 @@ const char* ASCIIEncoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap ASCIIEncoding::_charMap = 
+const TextEncoding::CharacterMap ASCIIEncoding::_charMap =
 {
-	/* 00 */	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 
-	/* 10 */	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 
-	/* 20 */	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 
-	/* 30 */	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 
-	/* 40 */	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 
-	/* 50 */	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
-	/* 60 */	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 
-	/* 70 */	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 
-	/* 80 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-	/* 90 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-	/* a0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-	/* b0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-	/* c0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-	/* d0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-	/* e0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-	/* f0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+	/* 00 */	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+	/* 10 */	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+	/* 20 */	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+	/* 30 */	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+	/* 40 */	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+	/* 50 */	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+	/* 60 */	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+	/* 70 */	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+	/* 80 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+	/* 90 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+	/* a0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+	/* b0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+	/* c0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+	/* d0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+	/* e0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+	/* f0 */	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
 };
 
 
diff --git a/Foundation/src/AbstractObserver.cpp b/Foundation/src/AbstractObserver.cpp
index a0fd89657..715048981 100644
--- a/Foundation/src/AbstractObserver.cpp
+++ b/Foundation/src/AbstractObserver.cpp
@@ -32,7 +32,7 @@ AbstractObserver::~AbstractObserver()
 {
 }
 
-	
+
 AbstractObserver& AbstractObserver::operator = (const AbstractObserver& /*observer*/)
 {
 	return *this;
diff --git a/Foundation/src/ActiveDispatcher.cpp b/Foundation/src/ActiveDispatcher.cpp
index dbb031ee2..a39e5f7cf 100644
--- a/Foundation/src/ActiveDispatcher.cpp
+++ b/Foundation/src/ActiveDispatcher.cpp
@@ -29,16 +29,16 @@ namespace
 			_pRunnable(pRunnable)
 		{
 		}
-		
+
 		ActiveRunnableBase::Ptr runnable() const
 		{
 			return _pRunnable;
 		}
-		
+
 	private:
 		ActiveRunnableBase::Ptr _pRunnable;
 	};
-	
+
 	class StopNotification: public Notification
 	{
 	};
diff --git a/Foundation/src/ArchiveStrategy.cpp b/Foundation/src/ArchiveStrategy.cpp
index 08cacacbb..e45cddea8 100644
--- a/Foundation/src/ArchiveStrategy.cpp
+++ b/Foundation/src/ArchiveStrategy.cpp
@@ -40,11 +40,11 @@ public:
 		compress(this, &ArchiveCompressor::compressImpl)
 	{
 	}
-	
+
 	~ArchiveCompressor()
 	{
 	}
-	
+
 	ActiveMethod<void, std::string, ArchiveCompressor, ActiveStarter<ActiveDispatcher>> compress;
 
 protected:
@@ -83,7 +83,7 @@ protected:
 //
 
 
-ArchiveStrategy::ArchiveStrategy(): 
+ArchiveStrategy::ArchiveStrategy():
 	_compress(false),
 	_pCompressor(0)
 {
@@ -174,7 +174,7 @@ LogFile* ArchiveByNumberStrategy::archive(LogFile* pFile)
 		NumberFormatter::append(path, ++n);
 	}
 	while (exists(path));
-	
+
 	while (n >= 0)
 	{
 		std::string oldPath = basePath;
diff --git a/Foundation/src/Ascii.cpp b/Foundation/src/Ascii.cpp
index 676b2db8e..5d5fab792 100644
--- a/Foundation/src/Ascii.cpp
+++ b/Foundation/src/Ascii.cpp
@@ -18,7 +18,7 @@
 namespace Poco {
 
 
-const int Ascii::CHARACTER_PROPERTIES[128] = 
+const int Ascii::CHARACTER_PROPERTIES[128] =
 {
 	/* 00 . */ ACP_CONTROL,
 	/* 01 . */ ACP_CONTROL,
diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp
index 317eea6e4..37cdec477 100644
--- a/Foundation/src/AsyncChannel.cpp
+++ b/Foundation/src/AsyncChannel.cpp
@@ -51,7 +51,8 @@ private:
 
 AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio):
 	_pChannel(pChannel),
-	_thread("AsyncChannel")
+	_thread("AsyncChannel"),
+	_closed(false)
 {
 	_thread.setPriority(prio);
 }
@@ -94,21 +95,25 @@ void AsyncChannel::open()
 
 void AsyncChannel::close()
 {
-	if (_thread.isRunning())
+	if (!_closed.exchange(true))
 	{
-		while (!_queue.empty()) Thread::sleep(100);
-
-		do
+		if (_thread.isRunning())
 		{
-			_queue.wakeUpAll();
+			while (!_queue.empty()) Thread::sleep(100);
+
+			do
+			{
+				_queue.wakeUpAll();
+			}
+			while (!_thread.tryJoin(100));
 		}
-		while (!_thread.tryJoin(100));
 	}
 }
 
 
 void AsyncChannel::log(const Message& msg)
 {
+	if (_closed) return;
 	if (_queueSize != 0 && _queue.size() >= _queueSize)
 	{
 		++_dropCount;
diff --git a/Foundation/src/AtomicCounter.cpp b/Foundation/src/AtomicCounter.cpp
index b1172976a..32a4ef6a0 100644
--- a/Foundation/src/AtomicCounter.cpp
+++ b/Foundation/src/AtomicCounter.cpp
@@ -23,7 +23,7 @@ AtomicCounter::AtomicCounter():
 {
 }
 
-	
+
 AtomicCounter::AtomicCounter(AtomicCounter::ValueType initialValue):
 	_counter(initialValue)
 {
@@ -47,7 +47,7 @@ AtomicCounter& AtomicCounter::operator = (const AtomicCounter& counter)
 	return *this;
 }
 
-	
+
 AtomicCounter& AtomicCounter::operator = (AtomicCounter::ValueType value)
 {
 	_counter.store(value);
diff --git a/Foundation/src/Base32Decoder.cpp b/Foundation/src/Base32Decoder.cpp
index 8e5cf0e04..0e04871c9 100644
--- a/Foundation/src/Base32Decoder.cpp
+++ b/Foundation/src/Base32Decoder.cpp
@@ -32,7 +32,7 @@ namespace
 }
 
 
-Base32DecoderBuf::Base32DecoderBuf(std::istream& istr): 
+Base32DecoderBuf::Base32DecoderBuf(std::istream& istr):
 	_groupLength(0),
 	_groupIndex(0),
 	_buf(*istr.rdbuf())
@@ -61,7 +61,7 @@ Base32DecoderBuf::~Base32DecoderBuf()
 
 int Base32DecoderBuf::readFromDevice()
 {
-	if (_groupIndex < _groupLength) 
+	if (_groupIndex < _groupLength)
 	{
 		return _group[_groupIndex++];
 	}
@@ -109,11 +109,11 @@ int Base32DecoderBuf::readFromDevice()
 
 		if (buffer[2] == '=')
 			_groupLength = 1;
-		else if (buffer[4] == '=') 
+		else if (buffer[4] == '=')
 			_groupLength = 2;
-		else if (buffer[5] == '=') 
+		else if (buffer[5] == '=')
 			_groupLength = 3;
-		else if (buffer[7] == '=') 
+		else if (buffer[7] == '=')
 			_groupLength = 4;
 		else
 			_groupLength = 5;
diff --git a/Foundation/src/Base32Encoder.cpp b/Foundation/src/Base32Encoder.cpp
index dbac2c977..881d44299 100644
--- a/Foundation/src/Base32Encoder.cpp
+++ b/Foundation/src/Base32Encoder.cpp
@@ -27,7 +27,7 @@ const unsigned char Base32EncoderBuf::OUT_ENCODING[32] =
 };
 
 
-Base32EncoderBuf::Base32EncoderBuf(std::ostream& ostr, bool padding): 
+Base32EncoderBuf::Base32EncoderBuf(std::ostream& ostr, bool padding):
 	_groupLength(0),
 	_buf(*ostr.rdbuf()),
 	_doPadding(padding)
diff --git a/Foundation/src/Bugcheck.cpp b/Foundation/src/Bugcheck.cpp
index 14f5170c8..36a250dc5 100644
--- a/Foundation/src/Bugcheck.cpp
+++ b/Foundation/src/Bugcheck.cpp
@@ -90,7 +90,7 @@ void Bugcheck::unexpected(const char* file, int line)
 	catch (...)
 	{
 	}
-#endif	
+#endif
 }
 
 
diff --git a/Foundation/src/Clock.cpp b/Foundation/src/Clock.cpp
index e52cd5db4..87336d1c9 100644
--- a/Foundation/src/Clock.cpp
+++ b/Foundation/src/Clock.cpp
@@ -85,7 +85,7 @@ Clock& Clock::operator = (ClockVal tv)
 }
 
 
-void Clock::swap(Clock& timestamp)
+void Clock::swap(Clock& timestamp) noexcept
 {
 	std::swap(_clock, timestamp._clock);
 }
@@ -112,7 +112,7 @@ void Clock::update()
 	host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cs);
 	clock_get_time(cs, &ts);
 	mach_port_deallocate(mach_task_self(), cs);
-	
+
 	_clock = ClockVal(ts.tv_sec)*resolution() + ts.tv_nsec/1000;
 
 #elif defined(POCO_VXWORKS)
@@ -138,7 +138,7 @@ void Clock::update()
 
 	Poco::Timestamp now;
 	_clock = now.epochMicroseconds();
-	
+
 #endif
 }
 
@@ -164,7 +164,7 @@ Clock::ClockDiff Clock::accuracy()
 	host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cs);
 	clock_get_attributes(cs, CLOCK_GET_TIME_RES, (clock_attr_t)&nanosecs, &n);
 	mach_port_deallocate(mach_task_self(), cs);
-	
+
 	ClockVal acc = nanosecs/1000;
 	return acc > 0 ? acc : 1;
 
@@ -186,18 +186,18 @@ Clock::ClockDiff Clock::accuracy()
 	struct timespec ts;
 	if (clock_getres(CLOCK_MONOTONIC, &ts))
 		throw SystemException("cannot get system clock");
-	
+
 	ClockVal acc = ClockVal(ts.tv_sec)*resolution() + ts.tv_nsec/1000;
 	return acc > 0 ? acc : 1;
 
 #else
 
 	return 1000;
-	
+
 #endif
 }
 
-	
+
 bool Clock::monotonic()
 {
 #if defined(POCO_OS_FAMILY_WINDOWS)
@@ -223,7 +223,7 @@ bool Clock::monotonic()
 #else
 
 	return false;
-	
+
 #endif
 }
 
diff --git a/Foundation/src/Condition.cpp b/Foundation/src/Condition.cpp
index 0d237d69b..64bd88f24 100644
--- a/Foundation/src/Condition.cpp
+++ b/Foundation/src/Condition.cpp
@@ -30,7 +30,7 @@ Condition::~Condition()
 void Condition::signal()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	if (!_waitQueue.empty())
 	{
 		_waitQueue.front()->set();
@@ -42,7 +42,7 @@ void Condition::signal()
 void Condition::broadcast()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	for (auto p: _waitQueue)
 	{
 		p->set();
diff --git a/Foundation/src/ConsoleChannel.cpp b/Foundation/src/ConsoleChannel.cpp
index 9eafc3c43..9fecaa6c0 100644
--- a/Foundation/src/ConsoleChannel.cpp
+++ b/Foundation/src/ConsoleChannel.cpp
@@ -43,7 +43,7 @@ ConsoleChannel::~ConsoleChannel()
 void ConsoleChannel::log(const Message& msg)
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	_str << msg.getText() << std::endl;
 }
 
@@ -52,7 +52,7 @@ FastMutex ColorConsoleChannel::_mutex;
 const std::string ColorConsoleChannel::CSI("\033[");
 
 
-ColorConsoleChannel::ColorConsoleChannel(): 
+ColorConsoleChannel::ColorConsoleChannel():
 	_str(std::clog),
 	_enableColors(true)
 {
@@ -60,7 +60,7 @@ ColorConsoleChannel::ColorConsoleChannel():
 }
 
 
-ColorConsoleChannel::ColorConsoleChannel(std::ostream& str): 
+ColorConsoleChannel::ColorConsoleChannel(std::ostream& str):
 	_str(str),
 	_enableColors(true)
 {
@@ -76,7 +76,7 @@ ColorConsoleChannel::~ColorConsoleChannel()
 void ColorConsoleChannel::log(const Message& msg)
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	if (_enableColors)
 	{
 		int color = _colors[msg.getPriority()];
@@ -87,14 +87,14 @@ void ColorConsoleChannel::log(const Message& msg)
 		color &= 0xff;
 		_str << CSI << color << "m";
 	}
-	
+
 	_str << msg.getText();
-	
+
 	if (_enableColors)
 	{
 		_str << CSI << "0m";
 	}
-	
+
 	_str << std::endl;
 }
 
diff --git a/Foundation/src/CountingStream.cpp b/Foundation/src/CountingStream.cpp
index a2ecf907d..7b4b7ccf5 100644
--- a/Foundation/src/CountingStream.cpp
+++ b/Foundation/src/CountingStream.cpp
@@ -18,31 +18,31 @@
 namespace Poco {
 
 
-CountingStreamBuf::CountingStreamBuf(): 
-	_pIstr(0), 
-	_pOstr(0), 
-	_chars(0), 
-	_lines(0), 
+CountingStreamBuf::CountingStreamBuf():
+	_pIstr(0),
+	_pOstr(0),
+	_chars(0),
+	_lines(0),
 	_pos(0)
 {
 }
 
 
-CountingStreamBuf::CountingStreamBuf(std::istream& istr): 
-	_pIstr(&istr), 
-	_pOstr(0), 
-	_chars(0), 
-	_lines(0), 
+CountingStreamBuf::CountingStreamBuf(std::istream& istr):
+	_pIstr(&istr),
+	_pOstr(0),
+	_chars(0),
+	_lines(0),
 	_pos(0)
 {
 }
 
 
-CountingStreamBuf::CountingStreamBuf(std::ostream& ostr): 
-	_pIstr(0), 
-	_pOstr(&ostr), 
-	_chars(0), 
-	_lines(0), 
+CountingStreamBuf::CountingStreamBuf(std::ostream& ostr):
+	_pIstr(0),
+	_pOstr(&ostr),
+	_chars(0),
+	_lines(0),
 	_pos(0)
 {
 }
@@ -99,13 +99,13 @@ void CountingStreamBuf::addChars(std::streamsize charsToAdd)
 	_chars += charsToAdd;
 }
 
-		
+
 void CountingStreamBuf::addLines(std::streamsize linesToAdd)
 {
 	_lines += linesToAdd;
 }
 
-		
+
 void CountingStreamBuf::addPos(std::streamsize posToAdd)
 {
 	_pos += posToAdd;
@@ -152,13 +152,13 @@ void CountingIOS::addChars(std::streamsize charsToAdd)
 	_buf.addChars(charsToAdd);
 }
 
-		
+
 void CountingIOS::addLines(std::streamsize linesToAdd)
 {
 	_buf.addLines(linesToAdd);
 }
 
-		
+
 void CountingIOS::addPos(std::streamsize posToAdd)
 {
 	_buf.addPos(posToAdd);
diff --git a/Foundation/src/DateTime.cpp b/Foundation/src/DateTime.cpp
index 185aa0844..512a3df87 100644
--- a/Foundation/src/DateTime.cpp
+++ b/Foundation/src/DateTime.cpp
@@ -78,7 +78,7 @@ DateTime::DateTime(int year, int month, int day, int hour, int minute, int secon
 	poco_assert (second >= 0 && second <= 60); // allow leap seconds
 	poco_assert (millisecond >= 0 && millisecond <= 999);
 	poco_assert (microsecond >= 0 && microsecond <= 999);
-	
+
 	_utcTime = toUtcTime(toJulianDay(year, month, day)) + 10*(hour*Timespan::HOURS + minute*Timespan::MINUTES + second*Timespan::SECONDS + millisecond*Timespan::MILLISECONDS + microsecond);
 }
 
@@ -134,7 +134,7 @@ DateTime& DateTime::operator = (const DateTime& dateTime)
 	return *this;
 }
 
-	
+
 DateTime& DateTime::operator = (const Timestamp& timestamp)
 {
 	_utcTime = timestamp.utcTime();
@@ -172,12 +172,12 @@ DateTime& DateTime::assign(int year, int month, int day, int hour, int minute, i
 	_second      = second;
 	_millisecond = millisecond;
 	_microsecond = microsecond;
-	
+
 	return *this;
 }
 
 
-void DateTime::swap(DateTime& dateTime)
+void DateTime::swap(DateTime& dateTime) noexcept
 {
 	std::swap(_utcTime, dateTime._utcTime);
 	std::swap(_year, dateTime._year);
@@ -212,7 +212,7 @@ int DateTime::daysOfMonth(int year, int month)
 	poco_assert (month >= 1 && month <= 12);
 
 	static int daysOfMonthTable[] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-	
+
 	if (month == 2 && isLeapYear(year))
 		return 29;
 	else
@@ -243,7 +243,7 @@ int DateTime::week(int firstDayOfWeek) const
 	while (DateTime(_year, 1, baseDay).dayOfWeek() != firstDayOfWeek) ++baseDay;
 
 	int doy  = dayOfYear();
-	int offs = baseDay <= 4 ? 0 : 1; 
+	int offs = baseDay <= 4 ? 0 : 1;
 	if (doy < baseDay)
 		return offs;
 	else
@@ -320,7 +320,7 @@ void DateTime::makeUTC(int tzd)
 	operator -= (Timespan(((Timestamp::TimeDiff) tzd)*Timespan::SECONDS));
 }
 
-	
+
 void DateTime::makeLocal(int tzd)
 {
 	operator += (Timespan(((Timestamp::TimeDiff) tzd)*Timespan::SECONDS));
@@ -331,7 +331,7 @@ double DateTime::toJulianDay(int year, int month, int day, int hour, int minute,
 {
 	// lookup table for (153*month - 457)/5 - note that 3 <= month <= 14.
 	static int lookup[] = {-91, -60, -30, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275, 306, 337};
- 
+
 	// day to double
 	double dday = double(day) + ((double((hour*60 + minute)*60 + second)*1000 + millisecond)*1000 + microsecond)/86400000000.0;
 	if (month < 3)
diff --git a/Foundation/src/DateTimeFormatter.cpp b/Foundation/src/DateTimeFormatter.cpp
index 25ce6b01f..7eb2969a6 100644
--- a/Foundation/src/DateTimeFormatter.cpp
+++ b/Foundation/src/DateTimeFormatter.cpp
@@ -57,9 +57,9 @@ void DateTimeFormatter::append(std::string& str, const DateTime& dateTime, const
 				case 'A': str.append(dateTime.isAM() ? "AM" : "PM"); break;
 				case 'M': NumberFormatter::append0(str, dateTime.minute(), 2); break;
 				case 'S': NumberFormatter::append0(str, dateTime.second(), 2); break;
-				case 's': NumberFormatter::append0(str, dateTime.second(), 2); 
-				          str += '.'; 
-				          NumberFormatter::append0(str, dateTime.millisecond()*1000 + dateTime.microsecond(), 6); 
+				case 's': NumberFormatter::append0(str, dateTime.second(), 2);
+				          str += '.';
+				          NumberFormatter::append0(str, dateTime.millisecond()*1000 + dateTime.microsecond(), 6);
 				          break;
 				case 'i': NumberFormatter::append0(str, dateTime.millisecond(), 3); break;
 				case 'c': NumberFormatter::append(str, dateTime.millisecond()/100); break;
@@ -146,7 +146,7 @@ void DateTimeFormatter::tzdRFC(std::string& str, int timeZoneDifferential)
 			str += '-';
 			NumberFormatter::append0(str, -timeZoneDifferential/3600, 2);
 			NumberFormatter::append0(str, (-timeZoneDifferential%3600)/60, 2);
-		}		
+		}
 	}
 	else str += "GMT";
 }
diff --git a/Foundation/src/DateTimeParser.cpp b/Foundation/src/DateTimeParser.cpp
index b58482c7b..c9eba1e7e 100644
--- a/Foundation/src/DateTimeParser.cpp
+++ b/Foundation/src/DateTimeParser.cpp
@@ -90,11 +90,11 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& str, DateT
 				case 'o':
 					SKIP_JUNK();
 					PARSE_NUMBER_N(month, 2);
-					break;					 
+					break;
 				case 'y':
 					SKIP_JUNK();
 					PARSE_NUMBER_N(year, 2);
-					if (year >= 69) 
+					if (year >= 69)
 						year += 1900;
 					else
 						year += 2000;
@@ -108,7 +108,7 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& str, DateT
 					PARSE_NUMBER(year);
 					if (year < 1000)
 					{
-						if (year >= 69) 
+						if (year >= 69)
 							year += 1900;
 						else
 							year += 2000;
@@ -171,7 +171,7 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& str, DateT
 	if (day == 0) day = 1;
 	if (DateTime::isValid(year, month, day, hour, minute, second, millis, micros))
 		dateTime.assign(year, month, day, hour, minute, second, millis, micros);
-	else 
+	else
 		throw SyntaxException("date/time component out of range");
 	timeZoneDifferential = tzd;
 }
@@ -184,7 +184,7 @@ DateTime DateTimeParser::parse(const std::string& fmt, const std::string& str, i
 	return result;
 }
 
-	
+
 bool DateTimeParser::tryParse(const std::string& fmt, const std::string& str, DateTime& dateTime, int& timeZoneDifferential)
 {
 	try
@@ -205,7 +205,7 @@ void DateTimeParser::parse(const std::string& str, DateTime& dateTime, int& time
 		throw SyntaxException("Unsupported or invalid date/time format");
 }
 
-	
+
 DateTime DateTimeParser::parse(const std::string& str, int& timeZoneDifferential)
 {
 	DateTime result;
@@ -215,11 +215,11 @@ DateTime DateTimeParser::parse(const std::string& str, int& timeZoneDifferential
 		throw SyntaxException("Unsupported or invalid date/time format");
 }
 
-	
+
 bool DateTimeParser::tryParse(const std::string& str, DateTime& dateTime, int& timeZoneDifferential)
 {
 	if (str.length() < 4) return false;
-	
+
 	if (str[3] == ',')
 		return tryParse("%w, %e %b %r %H:%M:%S %Z", str, dateTime, timeZoneDifferential);
 	else if (str[3] == ' ')
@@ -326,14 +326,14 @@ int DateTimeParser::parseMonth(std::string::const_iterator& it, const std::strin
 	std::string month;
 	while (it != end && (Ascii::isSpace(*it) || Ascii::isPunct(*it))) ++it;
 	bool isFirst = true;
-	while (it != end && Ascii::isAlpha(*it)) 
+	while (it != end && Ascii::isAlpha(*it))
 	{
 		char ch = (*it++);
 		if (isFirst) { month += Ascii::toUpper(ch); isFirst = false; }
 		else month += Ascii::toLower(ch);
 	}
 	if (month.length() < 3) throw SyntaxException("Month name must be at least three characters long", month);
-	for (int i = 0; i < 12; ++i) 
+	for (int i = 0; i < 12; ++i)
 	{
 		if (DateTimeFormat::MONTH_NAMES[i].find(month) == 0)
 			return i + 1;
@@ -347,14 +347,14 @@ int DateTimeParser::parseDayOfWeek(std::string::const_iterator& it, const std::s
 	std::string dow;
 	while (it != end && (Ascii::isSpace(*it) || Ascii::isPunct(*it))) ++it;
 	bool isFirst = true;
-	while (it != end && Ascii::isAlpha(*it)) 
+	while (it != end && Ascii::isAlpha(*it))
 	{
 		char ch = (*it++);
 		if (isFirst) { dow += Ascii::toUpper(ch); isFirst = false; }
 		else dow += Ascii::toLower(ch);
 	}
 	if (dow.length() < 3) throw SyntaxException("Weekday name must be at least three characters long", dow);
-	for (int i = 0; i < 7; ++i) 
+	for (int i = 0; i < 7; ++i)
 	{
 		if (DateTimeFormat::WEEKDAY_NAMES[i].find(dow) == 0)
 			return i;
@@ -367,7 +367,7 @@ int DateTimeParser::parseAMPM(std::string::const_iterator& it, const std::string
 {
 	std::string ampm;
 	while (it != end && (Ascii::isSpace(*it) || Ascii::isPunct(*it))) ++it;
-	while (it != end && Ascii::isAlpha(*it)) 
+	while (it != end && Ascii::isAlpha(*it))
 	{
 		char ch = (*it++);
 		ampm += Ascii::toUpper(ch);
diff --git a/Foundation/src/DigestStream.cpp b/Foundation/src/DigestStream.cpp
index c5ec7b23b..27394d1cc 100644
--- a/Foundation/src/DigestStream.cpp
+++ b/Foundation/src/DigestStream.cpp
@@ -21,28 +21,28 @@ namespace Poco {
 const int DigestBuf::BUFFER_SIZE = 256;
 
 
-DigestBuf::DigestBuf(DigestEngine& eng): 
-	BufferedStreamBuf(BUFFER_SIZE, std::ios::out), 
-	_eng(eng), 
+DigestBuf::DigestBuf(DigestEngine& eng):
+	BufferedStreamBuf(BUFFER_SIZE, std::ios::out),
+	_eng(eng),
 	_pIstr(0),
-	_pOstr(0) 
-{
-}
-
-
-DigestBuf::DigestBuf(DigestEngine& eng, std::istream& istr): 
-	BufferedStreamBuf(BUFFER_SIZE, std::ios::in), 
-	_eng(eng), 
-	_pIstr(&istr), 
 	_pOstr(0)
 {
 }
 
 
-DigestBuf::DigestBuf(DigestEngine& eng, std::ostream& ostr): 
-	BufferedStreamBuf(BUFFER_SIZE, std::ios::out), 
-	_eng(eng), 
-	_pIstr(0), 
+DigestBuf::DigestBuf(DigestEngine& eng, std::istream& istr):
+	BufferedStreamBuf(BUFFER_SIZE, std::ios::in),
+	_eng(eng),
+	_pIstr(&istr),
+	_pOstr(0)
+{
+}
+
+
+DigestBuf::DigestBuf(DigestEngine& eng, std::ostream& ostr):
+	BufferedStreamBuf(BUFFER_SIZE, std::ios::out),
+	_eng(eng),
+	_pIstr(0),
 	_pOstr(&ostr)
 {
 }
@@ -110,8 +110,8 @@ DigestBuf* DigestIOS::rdbuf()
 }
 
 
-DigestInputStream::DigestInputStream(DigestEngine& eng, std::istream& istr): 
-	DigestIOS(eng, istr), 
+DigestInputStream::DigestInputStream(DigestEngine& eng, std::istream& istr):
+	DigestIOS(eng, istr),
 	std::istream(&_buf)
 {
 }
@@ -122,15 +122,15 @@ DigestInputStream::~DigestInputStream()
 }
 
 
-DigestOutputStream::DigestOutputStream(DigestEngine& eng): 
-	DigestIOS(eng), 
+DigestOutputStream::DigestOutputStream(DigestEngine& eng):
+	DigestIOS(eng),
 	std::ostream(&_buf)
 {
 }
 
 
-DigestOutputStream::DigestOutputStream(DigestEngine& eng, std::ostream& ostr): 
-	DigestIOS(eng, ostr), 
+DigestOutputStream::DigestOutputStream(DigestEngine& eng, std::ostream& ostr):
+	DigestIOS(eng, ostr),
 	std::ostream(&_buf)
 {
 }
diff --git a/Foundation/src/DirectoryIterator_WIN32U.cpp b/Foundation/src/DirectoryIterator_WIN32U.cpp
index 8f17bc314..7289016ee 100644
--- a/Foundation/src/DirectoryIterator_WIN32U.cpp
+++ b/Foundation/src/DirectoryIterator_WIN32U.cpp
@@ -44,7 +44,7 @@ DirectoryIteratorImpl::DirectoryIteratorImpl(const std::string& path): _fh(INVAL
 	else
 	{
 		UnicodeConverter::toUTF8(_fd.cFileName, _current);
-		if (_current == "." || _current == "..")	
+		if (_current == "." || _current == "..")
 			next();
 	}
 }
diff --git a/Foundation/src/DirectoryWatcher.cpp b/Foundation/src/DirectoryWatcher.cpp
index 2f05977fb..6e72d2f4d 100644
--- a/Foundation/src/DirectoryWatcher.cpp
+++ b/Foundation/src/DirectoryWatcher.cpp
@@ -371,8 +371,8 @@ public:
 	}
 
 private:
-	int _fd;
-	bool _stopped;
+	std::atomic<int> _fd;
+	std::atomic<bool> _stopped;
 };
 
 
diff --git a/Foundation/src/Environment_WINCE.cpp b/Foundation/src/Environment_WINCE.cpp
index afa59b68d..62f19bce3 100644
--- a/Foundation/src/Environment_WINCE.cpp
+++ b/Foundation/src/Environment_WINCE.cpp
@@ -121,7 +121,7 @@ std::string EnvironmentImpl::nodeNameImpl()
 {
     HKEY hKey;
 	DWORD dwDisposition;
-    if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"\\Ident", 0, 0, 0, 0, 0, &hKey, &dwDisposition) != ERROR_SUCCESS) 
+    if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"\\Ident", 0, 0, 0, 0, 0, &hKey, &dwDisposition) != ERROR_SUCCESS)
 		throw SystemException("Cannot get node name", "registry key not found");
 
 	std::string value;
@@ -130,7 +130,7 @@ std::string EnvironmentImpl::nodeNameImpl()
     DWORD dwData = sizeof(bData);
 	if (RegQueryValueExW(hKey, L"Name", 0, &dwType, bData, &dwData) == ERROR_SUCCESS)
 	{
-		switch (dwType) 
+		switch (dwType)
 		{
 		case REG_SZ:
 			UnicodeConverter::toUTF8(reinterpret_cast<wchar_t*>(bData), value);
@@ -160,7 +160,7 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)
 	// Make an initial call to GetAdaptersInfo to get
 	// the necessary size into len
 	DWORD rc = GetAdaptersInfo(pAdapterInfo, &len);
-	if (rc == ERROR_BUFFER_OVERFLOW) 
+	if (rc == ERROR_BUFFER_OVERFLOW)
 	{
 		delete [] reinterpret_cast<char*>(pAdapterInfo);
 		pAdapterInfo = reinterpret_cast<IP_ADAPTER_INFO*>(new char[len]);
@@ -172,10 +172,10 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)
 	try
 	{
 		bool found = false;
-		if (GetAdaptersInfo(pAdapterInfo, &len) == NO_ERROR) 
+		if (GetAdaptersInfo(pAdapterInfo, &len) == NO_ERROR)
 		{
 			pAdapter = pAdapterInfo;
-			while (pAdapter && !found) 
+			while (pAdapter && !found)
 			{
 				if (pAdapter->Type == MIB_IF_TYPE_ETHERNET && pAdapter->AddressLength == sizeof(id))
 				{
diff --git a/Foundation/src/Error.cpp b/Foundation/src/Error.cpp
index 721b96ff3..f7aaae6c6 100644
--- a/Foundation/src/Error.cpp
+++ b/Foundation/src/Error.cpp
@@ -68,31 +68,31 @@ namespace Poco {
 			setMessage(strerror_r(err, _buffer, sizeof(_buffer)));
 #else
 			setMessage(strerror(err));
-#endif		
+#endif
 		}
-		
+
 		~StrErrorHelper()
 		{
 		}
-		
+
 		const std::string& message() const
 		{
 			return _message;
 		}
-		
+
 	protected:
 		void setMessage(int rc)
 			/// Handles POSIX variant
 		{
 			_message = _buffer;
 		}
-		
+
 		void setMessage(const char* msg)
 			/// Handles GLIBC variant
 		{
 			_message = msg;
 		}
-		
+
 	private:
 		char _buffer[256];
 		std::string _message;
diff --git a/Foundation/src/ErrorHandler.cpp b/Foundation/src/ErrorHandler.cpp
index d0af8ea8a..6e60161f3 100644
--- a/Foundation/src/ErrorHandler.cpp
+++ b/Foundation/src/ErrorHandler.cpp
@@ -38,7 +38,7 @@ void ErrorHandler::exception(const Exception& exc)
 	poco_debugger_msg(exc.what());
 }
 
-	
+
 void ErrorHandler::exception(const std::exception& exc)
 {
 	poco_debugger_msg(exc.what());
@@ -63,7 +63,7 @@ void ErrorHandler::handle(const Exception& exc)
 	}
 }
 
-	
+
 void ErrorHandler::handle(const std::exception& exc)
 {
 	FastMutex::ScopedLock lock(_mutex);
diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp
index 1f51296bb..f9a9fb150 100644
--- a/Foundation/src/EventLogChannel.cpp
+++ b/Foundation/src/EventLogChannel.cpp
@@ -28,7 +28,7 @@ const std::string EventLogChannel::PROP_LOGHOST = "loghost";
 const std::string EventLogChannel::PROP_LOGFILE = "logfile";
 
 
-EventLogChannel::EventLogChannel(): 
+EventLogChannel::EventLogChannel():
 	_logFile("Application"),
 	_h(0)
 {
@@ -46,16 +46,16 @@ EventLogChannel::EventLogChannel():
 }
 
 
-EventLogChannel::EventLogChannel(const std::string& name): 
-	_name(name), 
+EventLogChannel::EventLogChannel(const std::string& name):
+	_name(name),
 	_logFile("Application"),
 	_h(0)
 {
 }
 
 
-EventLogChannel::EventLogChannel(const std::string& name, const std::string& host): 
-	_name(name), 
+EventLogChannel::EventLogChannel(const std::string& name, const std::string& host):
+	_name(name),
 	_host(host),
 	_logFile("Application"),
 	_h(0)
@@ -101,7 +101,7 @@ void EventLogChannel::log(const Message& msg)
 	std::wstring utext;
 	UnicodeConverter::toUTF16(msg.getText(), utext);
 	const wchar_t* pMsg = utext.c_str();
-	ReportEventW(_h, getType(msg), getCategory(msg), POCO_MSG_LOG, NULL, 1, 0, &pMsg, NULL); 
+	ReportEventW(_h, getType(msg), getCategory(msg), POCO_MSG_LOG, NULL, 1, 0, &pMsg, NULL);
 }
 
 
@@ -190,7 +190,7 @@ void EventLogChannel::setUpRegistry() const
 	UnicodeConverter::toUTF16(key, ukey);
 	DWORD rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ukey.c_str(), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &disp);
 	if (rc != ERROR_SUCCESS) return;
-	
+
 	if (disp == REG_CREATED_NEW_KEY)
 	{
 		std::wstring path;
@@ -209,10 +209,10 @@ void EventLogChannel::setUpRegistry() const
 				#endif
 			#endif
 		#endif
-		
+
 		if (path.empty())
 			path = findLibrary(L"PocoMsg.dll");
-		
+
 		if (!path.empty())
 		{
 			DWORD count = 8;
diff --git a/Foundation/src/Event_POSIX.cpp b/Foundation/src/Event_POSIX.cpp
index 50fb6f78a..833dddff5 100644
--- a/Foundation/src/Event_POSIX.cpp
+++ b/Foundation/src/Event_POSIX.cpp
@@ -92,7 +92,10 @@ EventImpl::EventImpl(bool autoReset): _auto(autoReset), _state(false)
 
 EventImpl::~EventImpl()
 {
-	pthread_cond_destroy(&_cond);
+	if (0 == pthread_mutex_lock(&_mutex))
+		pthread_cond_destroy(&_cond);
+	else poco_unexpected();
+	pthread_mutex_unlock(&_mutex);
 	pthread_mutex_destroy(&_mutex);
 }
 
diff --git a/Foundation/src/Event_WIN32.cpp b/Foundation/src/Event_WIN32.cpp
index 256951870..e2ff1efb3 100644
--- a/Foundation/src/Event_WIN32.cpp
+++ b/Foundation/src/Event_WIN32.cpp
@@ -53,7 +53,7 @@ bool EventImpl::waitImpl(long milliseconds)
 	case WAIT_OBJECT_0:
 		return true;
 	default:
-		throw SystemException("wait for event failed");		
+		throw SystemException("wait for event failed");
 	}
 }
 
diff --git a/Foundation/src/Exception.cpp b/Foundation/src/Exception.cpp
index b8e5bacde..a0bfd5849 100644
--- a/Foundation/src/Exception.cpp
+++ b/Foundation/src/Exception.cpp
@@ -52,7 +52,7 @@ Exception::Exception(const Exception& exc):
 	_pNested = exc._pNested ? exc._pNested->clone() : 0;
 }
 
-	
+
 Exception::~Exception() noexcept
 {
 	delete _pNested;
@@ -84,13 +84,13 @@ const char* Exception::className() const noexcept
 	return typeid(*this).name();
 }
 
-	
+
 const char* Exception::what() const noexcept
 {
 	return name();
 }
 
-	
+
 std::string Exception::displayText() const
 {
 	std::string txt = name();
diff --git a/Foundation/src/File.cpp b/Foundation/src/File.cpp
index 0765fd489..7f96d5df7 100644
--- a/Foundation/src/File.cpp
+++ b/Foundation/src/File.cpp
@@ -93,7 +93,7 @@ File& File::operator = (const Path& path)
 }
 
 
-void File::swap(File& file)
+void File::swap(File& file) noexcept
 {
 	swapImpl(file);
 }
diff --git a/Foundation/src/FileChannel.cpp b/Foundation/src/FileChannel.cpp
index 6ec311a18..ceb53a38b 100644
--- a/Foundation/src/FileChannel.cpp
+++ b/Foundation/src/FileChannel.cpp
@@ -39,7 +39,7 @@ const std::string FileChannel::PROP_PURGECOUNT   = "purgeCount";
 const std::string FileChannel::PROP_FLUSH        = "flush";
 const std::string FileChannel::PROP_ROTATEONOPEN = "rotateOnOpen";
 
-FileChannel::FileChannel(): 
+FileChannel::FileChannel():
 	_times("utc"),
 	_compress(false),
 	_flush(true),
@@ -85,7 +85,7 @@ FileChannel::~FileChannel()
 void FileChannel::open()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	if (!_pFile)
 	{
 		_pFile = new LogFile(_path);
@@ -139,7 +139,7 @@ void FileChannel::log(const Message& msg)
 	_pFile->write(msg.getText(), _flush);
 }
 
-	
+
 void FileChannel::setProperty(const std::string& name, const std::string& value)
 {
 	FastMutex::ScopedLock lock(_mutex);
@@ -208,7 +208,7 @@ Timestamp FileChannel::creationDate() const
 		return 0;
 }
 
-	
+
 UInt64 FileChannel::size() const
 {
 	if (_pFile)
@@ -234,7 +234,7 @@ void FileChannel::setRotation(const std::string& rotation)
 	while (it != end && Ascii::isSpace(*it)) ++it;
 	std::string unit;
 	while (it != end && Ascii::isAlpha(*it)) unit += *it++;
-	
+
 	RotateStrategy* pStrategy = 0;
 	if ((rotation.find(',') != std::string::npos) || (rotation.find(':') != std::string::npos))
 	{
@@ -379,13 +379,13 @@ int FileChannel::extractDigit(const std::string& value, std::string::const_itera
 
 	while (it != end && Ascii::isSpace(*it)) ++it;
 	while (it != end && Ascii::isDigit(*it))
-	{ 
+	{
 		digit *= 10;
 		digit += *it++ - '0';
 	}
 
 	if (digit == 0)
-		throw InvalidArgumentException("Zero is not valid purge age.");	
+		throw InvalidArgumentException("Zero is not valid purge age.");
 
 	if (nextToDigit) *nextToDigit = it;
 	return digit;
@@ -405,7 +405,7 @@ Timespan::TimeDiff FileChannel::extractFactor(const std::string& value, std::str
 
 	std::string unit;
 	while (start != value.end() && Ascii::isAlpha(*start)) unit += *start++;
- 
+
 	if (unit == "seconds")
 		return Timespan::SECONDS;
 	if (unit == "minutes")
diff --git a/Foundation/src/FileStreamFactory.cpp b/Foundation/src/FileStreamFactory.cpp
index 472559c95..ba22dafff 100644
--- a/Foundation/src/FileStreamFactory.cpp
+++ b/Foundation/src/FileStreamFactory.cpp
@@ -50,13 +50,13 @@ std::istream* FileStreamFactory::open(const Path& path)
 {
 	File file(path);
 	if (!file.exists()) throw FileNotFoundException(path.toString());
-	
+
 	FileInputStream* istr = new FileInputStream(path.toString(), std::ios::binary);
 	if (!istr->good())
 	{
 		delete istr;
 		throw OpenFileException(path.toString());
-	}	
+	}
 	return istr;
 }
 
diff --git a/Foundation/src/FileStream_POSIX.cpp b/Foundation/src/FileStream_POSIX.cpp
index 848d7c367..faf0109c7 100644
--- a/Foundation/src/FileStream_POSIX.cpp
+++ b/Foundation/src/FileStream_POSIX.cpp
@@ -60,11 +60,11 @@ void FileStreamBuf::open(const std::string& path, std::ios::openmode mode)
 		flags |= O_RDONLY;
 	else
 		flags |= O_WRONLY;
-			
+
 	_fd = ::open(path.c_str(), flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 	if (_fd == -1)
 		File::handleLastError(_path);
-		
+
 	if ((mode & std::ios::app) || (mode & std::ios::ate))
 		seekoff(0, std::ios::end, mode);
 }
@@ -73,10 +73,10 @@ void FileStreamBuf::open(const std::string& path, std::ios::openmode mode)
 int FileStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 {
 	if (_fd == -1) return -1;
-	
+
 	if (getMode() & std::ios::out)
 		sync();
-	
+
 	int n = read(_fd, buffer, length);
 	if (n == -1)
 		File::handleLastError(_path);
@@ -123,7 +123,7 @@ bool FileStreamBuf::close()
 
 std::streampos FileStreamBuf::seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode)
 {
-	if (_fd == -1 || !(getMode() & mode)) 
+	if (_fd == -1 || !(getMode() & mode))
 		return -1;
 
 	if (getMode() & std::ios::out)
@@ -154,7 +154,7 @@ std::streampos FileStreamBuf::seekoff(std::streamoff off, std::ios::seekdir dir,
 
 std::streampos FileStreamBuf::seekpos(std::streampos pos, std::ios::openmode mode)
 {
-	if (_fd == -1 || !(getMode() & mode)) 
+	if (_fd == -1 || !(getMode() & mode))
 		return -1;
 
 	if (getMode() & std::ios::out)
diff --git a/Foundation/src/FileStream_WIN32.cpp b/Foundation/src/FileStream_WIN32.cpp
index fb934e2a4..7e9ca7e4f 100644
--- a/Foundation/src/FileStream_WIN32.cpp
+++ b/Foundation/src/FileStream_WIN32.cpp
@@ -53,7 +53,7 @@ void FileStreamBuf::open(const std::string& path, std::ios::openmode mode)
 	DWORD shareMode = FILE_SHARE_READ;
 	if (!(mode & std::ios::out))
 		shareMode |= FILE_SHARE_WRITE;
-		
+
 	DWORD creationDisp = OPEN_EXISTING;
 	if (mode & std::ios::trunc)
 		creationDisp = CREATE_ALWAYS;
@@ -61,14 +61,14 @@ void FileStreamBuf::open(const std::string& path, std::ios::openmode mode)
 		creationDisp = OPEN_ALWAYS;
 
 	DWORD flags = FILE_ATTRIBUTE_NORMAL;
-	
+
 	std::wstring utf16Path;
 	FileImpl::convertPath(path, utf16Path);
 	_handle = CreateFileW(utf16Path.c_str(), access, shareMode, NULL, creationDisp, flags, NULL);
 
 	if (_handle == INVALID_HANDLE_VALUE)
 		File::handleLastError(_path);
-		
+
 	if ((mode & std::ios::ate) || (mode & std::ios::app))
 		seekoff(0, std::ios::end, mode);
 }
@@ -81,7 +81,7 @@ int FileStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 
 	if (getMode() & std::ios::out)
 		sync();
-	
+
 	DWORD bytesRead(0);
 	BOOL rc = ReadFile(_handle, buffer, static_cast<DWORD>(length), &bytesRead, NULL);
 	if (rc == 0)
@@ -112,7 +112,7 @@ int FileStreamBuf::writeToDevice(const char* buffer, std::streamsize length)
 	BOOL rc = WriteFile(_handle, buffer, static_cast<DWORD>(length), &bytesWritten, NULL);
 	if (rc == 0)
 		File::handleLastError(_path);
-		
+
 	_pos += bytesWritten;
 
 	return static_cast<int>(bytesWritten);
@@ -144,7 +144,7 @@ std::streampos FileStreamBuf::seekoff(std::streamoff off, std::ios::seekdir dir,
 {
 	if (INVALID_HANDLE_VALUE == _handle || !(getMode() & mode))
 		return -1;
-	
+
 	if (getMode() & std::ios::out)
 		sync();
 
@@ -166,7 +166,7 @@ std::streampos FileStreamBuf::seekoff(std::streamoff off, std::ios::seekdir dir,
 	{
 		offset = FILE_END;
 	}
-	
+
 	LARGE_INTEGER li;
 	li.QuadPart = off;
 	li.LowPart  = SetFilePointer(_handle, li.LowPart, &li.HighPart, offset);
diff --git a/Foundation/src/File_VX.cpp b/Foundation/src/File_VX.cpp
index 97f2461e6..ad6b2e63b 100644
--- a/Foundation/src/File_VX.cpp
+++ b/Foundation/src/File_VX.cpp
@@ -289,7 +289,7 @@ void FileImpl::renameToImpl(const std::string& path, int options)
 	struct stat st;
 
 	if (stat(path.c_str(), &st) == 0 && (options &OPT_FAIL_ON_OVERWRITE_IMPL))
-		throw FileExistsException(path, EEXIST);		
+		throw FileExistsException(path, EEXIST);
 
 	if (rename(_path.c_str(), path.c_str()) != 0)
 		handleLastErrorImpl(_path);
diff --git a/Foundation/src/File_WINCE.cpp b/Foundation/src/File_WINCE.cpp
index 9ce78a41f..c894d3196 100644
--- a/Foundation/src/File_WINCE.cpp
+++ b/Foundation/src/File_WINCE.cpp
@@ -301,7 +301,7 @@ void FileImpl::renameToImpl(const std::string& path, int options)
 		if (MoveFileW(_upath.c_str(), upath.c_str(), MOVEFILE_REPLACE_EXISTING) == 0)
 			handleLastErrorImpl(_path);
 	}
-	
+
 }
 
 
diff --git a/Foundation/src/Format.cpp b/Foundation/src/Format.cpp
index 46d20f0b4..df1f37bfe 100644
--- a/Foundation/src/Format.cpp
+++ b/Foundation/src/Format.cpp
@@ -62,8 +62,8 @@ namespace
 		}
 		if (width > 0) str.width(width);
 	}
-	
-	
+
+
 	void parsePrec(std::ostream& str, std::string::const_iterator& itFmt, const std::string::const_iterator& endFmt, std::vector<Any>::const_iterator& itVal)
 	{
 		if (itFmt != endFmt && *itFmt == '.')
@@ -86,7 +86,7 @@ namespace
 			if (prec >= 0) str.precision(prec);
 		}
 	}
-	
+
 	char parseMod(std::string::const_iterator& itFmt, const std::string::const_iterator& endFmt)
 	{
 		char mod = 0;
@@ -96,13 +96,13 @@ namespace
 			{
 			case 'l':
 			case 'h':
-			case 'L': 
+			case 'L':
 			case '?': mod = *itFmt++; break;
 			}
 		}
 		return mod;
 	}
-	
+
 	std::size_t parseIndex(std::string::const_iterator& itFmt, const std::string::const_iterator& endFmt)
 	{
 		int index = 0;
@@ -129,8 +129,8 @@ namespace
 		case 'f': str << std::fixed; break;
 		}
 	}
-	
-	
+
+
 	void writeAnyInt(std::ostream& str, const Any& any)
 	{
 		if (any.type() == typeid(char))
@@ -223,7 +223,7 @@ namespace
 					str << RefAnyCast<std::string>(*itVal++);
 					break;
 				case 'z':
-					str << AnyCast<std::size_t>(*itVal++); 
+					str << AnyCast<std::size_t>(*itVal++);
 					break;
 				case 'I':
 				case 'D':
@@ -241,7 +241,7 @@ namespace
 }
 
 
-std::string format(const std::string& fmt, const Any& value) 
+std::string format(const std::string& fmt, const Any& value)
 {
 	std::string result;
 	format(result, fmt, value);
@@ -260,7 +260,7 @@ void format(std::string& result, const std::string& fmt, const std::vector<Any>&
 	std::string::const_iterator itFmt  = fmt.begin();
 	std::string::const_iterator endFmt = fmt.end();
 	std::vector<Any>::const_iterator itVal  = values.begin();
-	std::vector<Any>::const_iterator endVal = values.end(); 
+	std::vector<Any>::const_iterator endVal = values.end();
 	while (itFmt != endFmt)
 	{
 		switch (*itFmt)
diff --git a/Foundation/src/FormattingChannel.cpp b/Foundation/src/FormattingChannel.cpp
index bdaef07b9..a884fd936 100644
--- a/Foundation/src/FormattingChannel.cpp
+++ b/Foundation/src/FormattingChannel.cpp
@@ -20,22 +20,22 @@
 namespace Poco {
 
 
-FormattingChannel::FormattingChannel(): 
-	_pFormatter(0), 
+FormattingChannel::FormattingChannel():
+	_pFormatter(0),
 	_pChannel(0)
 {
 }
 
 
 FormattingChannel::FormattingChannel(Formatter::Ptr pFormatter):
-	_pFormatter(pFormatter), 
+	_pFormatter(pFormatter),
 	_pChannel(0)
 {
 }
 
 
-FormattingChannel::FormattingChannel(Formatter::Ptr pFormatter, Channel::Ptr pChannel): 
-	_pFormatter(pFormatter), 
+FormattingChannel::FormattingChannel(Formatter::Ptr pFormatter, Channel::Ptr pChannel):
+	_pFormatter(pFormatter),
 	_pChannel(pChannel)
 {
 }
@@ -105,7 +105,7 @@ void FormattingChannel::open()
 		_pChannel->open();
 }
 
-	
+
 void FormattingChannel::close()
 {
 	if (_pChannel)
diff --git a/Foundation/src/Glob.cpp b/Foundation/src/Glob.cpp
index 4ca64debc..0f9fb4fc2 100644
--- a/Foundation/src/Glob.cpp
+++ b/Foundation/src/Glob.cpp
@@ -42,7 +42,7 @@ bool Glob::match(const std::string& subject)
 	TextIterator endp(_pattern);
 	TextIterator its(subject, utf8);
 	TextIterator ends(subject);
-	
+
 	if ((_options & GLOB_DOT_SPECIAL) && its != ends && *its == '.' && (*itp == '?' || *itp == '*'))
 		return false;
 	else
@@ -118,7 +118,7 @@ bool Glob::match(TextIterator& itp, const TextIterator& endp, TextIterator& its,
 			}
 			return true;
 		case '[':
-			if (++itp != endp) 
+			if (++itp != endp)
 			{
 				bool invert = *itp == '!';
 				if (invert) ++itp;
@@ -165,7 +165,7 @@ bool Glob::matchSet(TextIterator& itp, const TextIterator& endp, int c)
 		switch (*itp)
 		{
 		case ']':
-			++itp; 
+			++itp;
 			return false;
 		case '\\':
 			if (++itp == endp) throw SyntaxException("backslash must be followed by character in glob pattern");
diff --git a/Foundation/src/HashStatistic.cpp b/Foundation/src/HashStatistic.cpp
index 52f618d7a..0203636c7 100644
--- a/Foundation/src/HashStatistic.cpp
+++ b/Foundation/src/HashStatistic.cpp
@@ -19,10 +19,10 @@ namespace Poco {
 
 
 HashStatistic::HashStatistic(
-	UInt32 tableSize, 
-	UInt32 numEntries, 
-	UInt32 numZeroEntries, 
-	UInt32 maxEntry, 
+	UInt32 tableSize,
+	UInt32 numEntries,
+	UInt32 numZeroEntries,
+	UInt32 maxEntry,
 	std::vector<UInt32> details):
 	_sizeOfTable(tableSize),
 	_numberOfEntries(numEntries),
diff --git a/Foundation/src/HexBinaryDecoder.cpp b/Foundation/src/HexBinaryDecoder.cpp
index 7c80ac833..dc14ad5dc 100644
--- a/Foundation/src/HexBinaryDecoder.cpp
+++ b/Foundation/src/HexBinaryDecoder.cpp
@@ -19,7 +19,7 @@
 namespace Poco {
 
 
-HexBinaryDecoderBuf::HexBinaryDecoderBuf(std::istream& istr): 
+HexBinaryDecoderBuf::HexBinaryDecoderBuf(std::istream& istr):
 	_buf(*istr.rdbuf())
 {
 }
diff --git a/Foundation/src/HexBinaryEncoder.cpp b/Foundation/src/HexBinaryEncoder.cpp
index 728a2bfdf..5e1b2f274 100644
--- a/Foundation/src/HexBinaryEncoder.cpp
+++ b/Foundation/src/HexBinaryEncoder.cpp
@@ -18,7 +18,7 @@
 namespace Poco {
 
 
-HexBinaryEncoderBuf::HexBinaryEncoderBuf(std::ostream& ostr): 
+HexBinaryEncoderBuf::HexBinaryEncoderBuf(std::ostream& ostr):
 	_pos(0),
 	_lineLength(72),
 	_uppercase(0),
@@ -61,11 +61,11 @@ int HexBinaryEncoderBuf::writeToDevice(char c)
 {
 	static const int eof = std::char_traits<char>::eof();
 	static const char digits[] = "0123456789abcdef0123456789ABCDEF";
-	
+
 	if (_buf.sputc(digits[_uppercase + ((c >> 4) & 0xF)]) == eof) return eof;
 	++_pos;
 	if (_buf.sputc(digits[_uppercase + (c & 0xF)]) == eof) return eof;
-	if (++_pos >= _lineLength && _lineLength > 0) 
+	if (++_pos >= _lineLength && _lineLength > 0)
 	{
 		if (_buf.sputc('\n') == eof) return eof;
 		_pos = 0;
diff --git a/Foundation/src/JSONString.cpp b/Foundation/src/JSONString.cpp
index 2e901a1e3..e843867ff 100644
--- a/Foundation/src/JSONString.cpp
+++ b/Foundation/src/JSONString.cpp
@@ -49,11 +49,12 @@ void writeString(const std::string &value, T& obj, typename WriteFunc<T, S>::Typ
 	{
 		for(std::string::const_iterator it = value.begin(), end = value.end(); it != end; ++it)
 		{
-			if((*it >= 0 && *it <= 31) || (*it == '"') || (*it == '\\'))
+			if ((*it >= 0 && *it <= 31) || (*it == '"') || (*it == '\\'))
 			{
 				std::string str = Poco::UTF8::escape(it, it + 1, true);
 				(obj.*write)(str.c_str(), str.size());
-			}else (obj.*write)(&(*it), 1);
+			}
+			else (obj.*write)(&(*it), 1);
 		}
 	}
 	if(wrap) (obj.*write)("\"", 1);
diff --git a/Foundation/src/Latin1Encoding.cpp b/Foundation/src/Latin1Encoding.cpp
index c5aa00d74..abab7a536 100644
--- a/Foundation/src/Latin1Encoding.cpp
+++ b/Foundation/src/Latin1Encoding.cpp
@@ -28,25 +28,25 @@ const char* Latin1Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Latin1Encoding::_charMap = 
+const TextEncoding::CharacterMap Latin1Encoding::_charMap =
 {
 	/*          00    01    02    03    04    05    06    07    08    09    0a    0b    0c    0d    0e    0f   */
-	/* 00 */	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 
-	/* 10 */	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 
-	/* 20 */	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 
-	/* 30 */	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 
-	/* 40 */	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 
-	/* 50 */	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
-	/* 60 */	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 
-	/* 70 */	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 
-	/* 80 */	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 
-	/* 90 */	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 
-	/* a0 */	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 
-	/* b0 */	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 
-	/* c0 */	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 
-	/* d0 */	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 
-	/* e0 */	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 
-	/* f0 */	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 
+	/* 00 */	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+	/* 10 */	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+	/* 20 */	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+	/* 30 */	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+	/* 40 */	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+	/* 50 */	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+	/* 60 */	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+	/* 70 */	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+	/* 80 */	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+	/* 90 */	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+	/* a0 */	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+	/* b0 */	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+	/* c0 */	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+	/* d0 */	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+	/* e0 */	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+	/* f0 */	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 };
 
 
diff --git a/Foundation/src/Latin2Encoding.cpp b/Foundation/src/Latin2Encoding.cpp
index a0c771500..2d8e8ba01 100644
--- a/Foundation/src/Latin2Encoding.cpp
+++ b/Foundation/src/Latin2Encoding.cpp
@@ -28,19 +28,19 @@ const char* Latin2Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Latin2Encoding::_charMap = 
+const TextEncoding::CharacterMap Latin2Encoding::_charMap =
 {
 	/*          00      01      02      03      04      05      06      07      08      09      0a      0b      0c      0d      0e      0f   */
-	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
-	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
-	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
-	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
-	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
-	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
-	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
-	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
-	/* 80 */	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 
-	/* 90 */	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 
+	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
+	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
+	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
+	/* 80 */	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
+	/* 90 */	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
 	/* a0 */	0x00a0, 0x0104, 0x02d8, 0x0141, 0x00a4, 0x013d, 0x015a, 0x00a7, 0x00a8, 0x0160, 0x015e, 0x0164, 0x0179, 0x00ad, 0x017d, 0x017b,
 	/* b0 */	0x00b0, 0x0105, 0x02db, 0x0142, 0x00b4, 0x013e, 0x015b, 0x02c7, 0x00b8, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c,
 	/* c0 */	0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7, 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e,
diff --git a/Foundation/src/Latin9Encoding.cpp b/Foundation/src/Latin9Encoding.cpp
index eadc71f30..3f403540a 100644
--- a/Foundation/src/Latin9Encoding.cpp
+++ b/Foundation/src/Latin9Encoding.cpp
@@ -28,25 +28,25 @@ const char* Latin9Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Latin9Encoding::_charMap = 
+const TextEncoding::CharacterMap Latin9Encoding::_charMap =
 {
 	/*          00      01      02      03      04      05      06      07      08      09      0a      0b      0c      0d      0e      0f   */
-	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
-	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
-	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
-	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
-	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
-	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
-	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
-	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
-	/* 80 */	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 
-	/* 90 */	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 
-	/* a0 */	0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20ac, 0x00a5, 0x0160, 0x00a7, 0x0161, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
-	/* b0 */	0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x017d, 0x00b5, 0x00b6, 0x00b7, 0x017e, 0x00b9, 0x00ba, 0x00bb, 0x0152, 0x0153, 0x0178, 0x00bf, 
-	/* c0 */	0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, 
-	/* d0 */	0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, 
-	/* e0 */	0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 
-	/* f0 */	0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff, 
+	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
+	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
+	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
+	/* 80 */	0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
+	/* 90 */	0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
+	/* a0 */	0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20ac, 0x00a5, 0x0160, 0x00a7, 0x0161, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
+	/* b0 */	0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x017d, 0x00b5, 0x00b6, 0x00b7, 0x017e, 0x00b9, 0x00ba, 0x00bb, 0x0152, 0x0153, 0x0178, 0x00bf,
+	/* c0 */	0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
+	/* d0 */	0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
+	/* e0 */	0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
+	/* f0 */	0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff,
 };
 
 
diff --git a/Foundation/src/LineEndingConverter.cpp b/Foundation/src/LineEndingConverter.cpp
index 49b4b7122..2f802fab9 100644
--- a/Foundation/src/LineEndingConverter.cpp
+++ b/Foundation/src/LineEndingConverter.cpp
@@ -24,9 +24,9 @@ const std::string LineEnding::NEWLINE_CRLF("\r\n");
 const std::string LineEnding::NEWLINE_LF("\n");
 
 
-LineEndingConverterStreamBuf::LineEndingConverterStreamBuf(std::istream& istr): 
-	_pIstr(&istr), 
-	_pOstr(0), 
+LineEndingConverterStreamBuf::LineEndingConverterStreamBuf(std::istream& istr):
+	_pIstr(&istr),
+	_pOstr(0),
 	_newLine(LineEnding::NEWLINE_DEFAULT),
 	_lastChar(0)
 {
@@ -34,9 +34,9 @@ LineEndingConverterStreamBuf::LineEndingConverterStreamBuf(std::istream& istr):
 }
 
 
-LineEndingConverterStreamBuf::LineEndingConverterStreamBuf(std::ostream& ostr): 
-	_pIstr(0), 
-	_pOstr(&ostr), 
+LineEndingConverterStreamBuf::LineEndingConverterStreamBuf(std::ostream& ostr):
+	_pIstr(0),
+	_pOstr(&ostr),
 	_newLine(LineEnding::NEWLINE_DEFAULT),
 	_lastChar(0)
 {
@@ -132,15 +132,15 @@ LineEndingConverterStreamBuf* LineEndingConverterIOS::rdbuf()
 }
 
 
-InputLineEndingConverter::InputLineEndingConverter(std::istream& istr): 
-	LineEndingConverterIOS(istr), 
+InputLineEndingConverter::InputLineEndingConverter(std::istream& istr):
+	LineEndingConverterIOS(istr),
 	std::istream(&_buf)
 {
 }
 
 
-InputLineEndingConverter::InputLineEndingConverter(std::istream& istr, const std::string& newLineCharacters): 
-	LineEndingConverterIOS(istr), 
+InputLineEndingConverter::InputLineEndingConverter(std::istream& istr, const std::string& newLineCharacters):
+	LineEndingConverterIOS(istr),
 	std::istream(&_buf)
 {
 	setNewLine(newLineCharacters);
@@ -152,15 +152,15 @@ InputLineEndingConverter::~InputLineEndingConverter()
 }
 
 
-OutputLineEndingConverter::OutputLineEndingConverter(std::ostream& ostr): 
-	LineEndingConverterIOS(ostr), 
+OutputLineEndingConverter::OutputLineEndingConverter(std::ostream& ostr):
+	LineEndingConverterIOS(ostr),
 	std::ostream(&_buf)
 {
 }
 
 
-OutputLineEndingConverter::OutputLineEndingConverter(std::ostream& ostr, const std::string& newLineCharacters): 
-	LineEndingConverterIOS(ostr), 
+OutputLineEndingConverter::OutputLineEndingConverter(std::ostream& ostr, const std::string& newLineCharacters):
+	LineEndingConverterIOS(ostr),
 	std::ostream(&_buf)
 {
 	setNewLine(newLineCharacters);
diff --git a/Foundation/src/LogFile_STD.cpp b/Foundation/src/LogFile_STD.cpp
index 66dc45bf2..bfe1c292a 100644
--- a/Foundation/src/LogFile_STD.cpp
+++ b/Foundation/src/LogFile_STD.cpp
@@ -20,11 +20,12 @@
 namespace Poco {
 
 
-LogFileImpl::LogFileImpl(const std::string& path): 
+LogFileImpl::LogFileImpl(const std::string& path):
 	_path(path),
-	_str(_path, std::ios::app)
+	_str(_path, std::ios::app),
+	_size(static_cast<UInt64>(_str.tellp()))
 {
-	if (sizeImpl() == 0)
+	if (_size == 0)
 		_creationDate = File(path).getLastModified();
 	else
 		_creationDate = File(path).created();
@@ -38,18 +39,25 @@ LogFileImpl::~LogFileImpl()
 
 void LogFileImpl::writeImpl(const std::string& text, bool flush)
 {
+	std::streampos pos = _str.tellp();
 	_str << text;
 	if (flush)
 		_str << std::endl;
 	else
 		_str << "\n";
-	if (!_str.good()) throw WriteFileException(_path);
+	if (!_str.good())
+	{
+		_str.clear();
+		_str.seekp(pos);
+		throw WriteFileException(_path);
+	}
+	_size = static_cast<UInt64>(_str.tellp());
 }
 
 
 UInt64 LogFileImpl::sizeImpl() const
 {
-	return (UInt64) _str.tellp();
+	return _size;
 }
 
 
diff --git a/Foundation/src/LogFile_WIN32U.cpp b/Foundation/src/LogFile_WIN32U.cpp
index f42b98a7c..055e9c585 100644
--- a/Foundation/src/LogFile_WIN32U.cpp
+++ b/Foundation/src/LogFile_WIN32U.cpp
@@ -98,7 +98,7 @@ void LogFileImpl::createFile()
 {
 	std::wstring upath;
 	FileImpl::convertPath(_path, upath);
-	
+
 	_hFile = CreateFileW(upath.c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 	if (_hFile == INVALID_HANDLE_VALUE) throw OpenFileException(_path);
 	SetFilePointer(_hFile, 0, 0, FILE_END);
diff --git a/Foundation/src/Logger.cpp b/Foundation/src/Logger.cpp
index 1b3446444..e8005a69c 100644
--- a/Foundation/src/Logger.cpp
+++ b/Foundation/src/Logger.cpp
@@ -69,7 +69,7 @@ void Logger::setProperty(const std::string& name, const std::string& value)
 		setChannel(LoggingRegistry::defaultRegistry().channelForName(value));
 	else if (name == "level")
 		setLevel(value);
-	else 
+	else
 		Channel::setProperty(name, value);
 }
 
diff --git a/Foundation/src/LoggingRegistry.cpp b/Foundation/src/LoggingRegistry.cpp
index da8feda24..7bf6e53d0 100644
--- a/Foundation/src/LoggingRegistry.cpp
+++ b/Foundation/src/LoggingRegistry.cpp
@@ -32,7 +32,7 @@ LoggingRegistry::~LoggingRegistry()
 Channel::Ptr LoggingRegistry::channelForName(const std::string& name) const
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	ChannelMap::const_iterator it = _channelMap.find(name);
 	if (it != _channelMap.end())
 		return it->second;
@@ -60,7 +60,7 @@ void LoggingRegistry::registerChannel(const std::string& name, Channel::Ptr pCha
 	_channelMap[name] = ChannelPtr(pChannel, true);
 }
 
-	
+
 void LoggingRegistry::registerFormatter(const std::string& name, Formatter::Ptr pFormatter)
 {
 	FastMutex::ScopedLock lock(_mutex);
diff --git a/Foundation/src/MD4Engine.cpp b/Foundation/src/MD4Engine.cpp
index cab906231..02d37a03c 100644
--- a/Foundation/src/MD4Engine.cpp
+++ b/Foundation/src/MD4Engine.cpp
@@ -54,7 +54,7 @@ MD4Engine::~MD4Engine()
 	reset();
 }
 
-	
+
 void MD4Engine::updateImpl(const void* input_, std::size_t inputLen)
 {
 	const unsigned char* input = (const unsigned char*) input_;
@@ -71,7 +71,7 @@ void MD4Engine::updateImpl(const void* input_, std::size_t inputLen)
 	partLen = 64 - index;
 
 	/* Transform as many times as possible. */
-	if (inputLen >= partLen) 
+	if (inputLen >= partLen)
 	{
 		std::memcpy(&_context.buffer[index], input, partLen);
 		transform(_context.state, _context.buffer);
@@ -107,7 +107,7 @@ void MD4Engine::reset()
 
 const DigestEngine::Digest& MD4Engine::digest()
 {
-	static const unsigned char PADDING[64] = 
+	static const unsigned char PADDING[64] =
 	{
 		0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/Foundation/src/MD5Engine.cpp b/Foundation/src/MD5Engine.cpp
index 7ac89f0bd..8ba995842 100644
--- a/Foundation/src/MD5Engine.cpp
+++ b/Foundation/src/MD5Engine.cpp
@@ -14,7 +14,7 @@
 // MD5 (RFC 1321) algorithm:
 // Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 // rights reserved.
-// 
+//
 // License to copy and use this software is granted provided that it
 // is identified as the "RSA Data Security, Inc. MD5 Message-Digest
 // Algorithm" in all material mentioning or referencing this software
@@ -54,7 +54,7 @@ MD5Engine::~MD5Engine()
 	reset();
 }
 
-	
+
 void MD5Engine::updateImpl(const void* input_, std::size_t inputLen)
 {
 	const unsigned char* input = (const unsigned char*) input_;
@@ -71,7 +71,7 @@ void MD5Engine::updateImpl(const void* input_, std::size_t inputLen)
 	partLen = 64 - index;
 
 	/* Transform as many times as possible. */
-	if (inputLen >= partLen) 
+	if (inputLen >= partLen)
 	{
 		std::memcpy(&_context.buffer[index], input, partLen);
 		transform(_context.state, _context.buffer);
@@ -107,7 +107,7 @@ void MD5Engine::reset()
 
 const DigestEngine::Digest& MD5Engine::digest()
 {
-	static const unsigned char PADDING[64] = 
+	static const unsigned char PADDING[64] =
 	{
 		0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -286,7 +286,7 @@ void MD5Engine::encode(unsigned char* output, const UInt32* input, std::size_t l
 {
 	unsigned int i, j;
 
-	for (i = 0, j = 0; j < len; i++, j += 4) 
+	for (i = 0, j = 0; j < len; i++, j += 4)
 	{
 		output[j]   = (unsigned char)(input[i] & 0xff);
 		output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
diff --git a/Foundation/src/MemoryPool.cpp b/Foundation/src/MemoryPool.cpp
index 5b6e79cfa..4ee008b7d 100644
--- a/Foundation/src/MemoryPool.cpp
+++ b/Foundation/src/MemoryPool.cpp
@@ -33,7 +33,7 @@ MemoryPool::MemoryPool(std::size_t blockSize, int preAlloc, int maxAlloc):
 	if (maxAlloc > 0 && maxAlloc < r)
 		r = maxAlloc;
 	_blocks.reserve(r);
-	
+
 	try
 	{
 		for (int i = 0; i < preAlloc; ++i)
@@ -48,7 +48,7 @@ MemoryPool::MemoryPool(std::size_t blockSize, int preAlloc, int maxAlloc):
 	}
 }
 
-	
+
 MemoryPool::~MemoryPool()
 {
 	clear();
@@ -68,7 +68,7 @@ void MemoryPool::clear()
 void* MemoryPool::get()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	if (_blocks.empty())
 	{
 		if (_maxAlloc == 0 || _allocated < _maxAlloc)
@@ -86,11 +86,11 @@ void* MemoryPool::get()
 	}
 }
 
-	
+
 void MemoryPool::release(void* ptr)
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	try
 	{
 		_blocks.push_back(reinterpret_cast<char*>(ptr));
diff --git a/Foundation/src/MemoryStream.cpp b/Foundation/src/MemoryStream.cpp
index cf3f4c325..699fc6849 100644
--- a/Foundation/src/MemoryStream.cpp
+++ b/Foundation/src/MemoryStream.cpp
@@ -30,8 +30,8 @@ MemoryIOS::~MemoryIOS()
 }
 
 
-MemoryInputStream::MemoryInputStream(const char* pBuffer, std::streamsize bufferSize): 
-	MemoryIOS(const_cast<char*>(pBuffer), bufferSize), 
+MemoryInputStream::MemoryInputStream(const char* pBuffer, std::streamsize bufferSize):
+	MemoryIOS(const_cast<char*>(pBuffer), bufferSize),
 	std::istream(&_buf)
 {
 }
@@ -42,8 +42,8 @@ MemoryInputStream::~MemoryInputStream()
 }
 
 
-MemoryOutputStream::MemoryOutputStream(char* pBuffer, std::streamsize bufferSize): 
-	MemoryIOS(pBuffer, bufferSize), 
+MemoryOutputStream::MemoryOutputStream(char* pBuffer, std::streamsize bufferSize):
+	MemoryIOS(pBuffer, bufferSize),
 	std::ostream(&_buf)
 {
 }
diff --git a/Foundation/src/Message.cpp b/Foundation/src/Message.cpp
index b0f8981b6..7de6dc354 100644
--- a/Foundation/src/Message.cpp
+++ b/Foundation/src/Message.cpp
@@ -275,6 +275,15 @@ const std::string& Message::get(const std::string& param, const std::string& def
 	return defaultValue;
 }
 
+const Message::StringMap& Message::getAll() const
+{
+	static StringMap empty;
+
+	if (_pMap)
+		return *_pMap;
+
+	return empty;
+}
 
 void Message::set(const std::string& param, const std::string& value)
 {
diff --git a/Foundation/src/Mutex_WINCE.cpp b/Foundation/src/Mutex_WINCE.cpp
index 90ea6956d..927d98d99 100644
--- a/Foundation/src/Mutex_WINCE.cpp
+++ b/Foundation/src/Mutex_WINCE.cpp
@@ -52,7 +52,7 @@ bool MutexImpl::tryLockImpl()
 	case WAIT_OBJECT_0:
 		return true;
 	default:
-		throw SystemException("cannot lock mutex");		
+		throw SystemException("cannot lock mutex");
 	}
 }
 
@@ -66,7 +66,7 @@ bool MutexImpl::tryLockImpl(long milliseconds)
 	case WAIT_OBJECT_0:
 		return true;
 	default:
-		throw SystemException("cannot lock mutex");		
+		throw SystemException("cannot lock mutex");
 	}
 }
 
diff --git a/Foundation/src/NamedEvent_WIN32U.cpp b/Foundation/src/NamedEvent_WIN32U.cpp
index 8a7ad1c18..a4fec5b7a 100644
--- a/Foundation/src/NamedEvent_WIN32U.cpp
+++ b/Foundation/src/NamedEvent_WIN32U.cpp
@@ -29,7 +29,7 @@ NamedEventImpl::NamedEventImpl(const std::string& name):
 	_event = CreateEventW(NULL, FALSE, FALSE, _uname.c_str());
 	if (!_event)
 	{
-		DWORD dwRetVal = GetLastError(); 
+		DWORD dwRetVal = GetLastError();
 		throw SystemException(format("cannot create named event %s [Error %d: %s]", _name, (int)dwRetVal, Error::getMessage(dwRetVal)));
 	}
 }
diff --git a/Foundation/src/NamedMutex_WIN32U.cpp b/Foundation/src/NamedMutex_WIN32U.cpp
index 1358658b9..40d99ed39 100644
--- a/Foundation/src/NamedMutex_WIN32U.cpp
+++ b/Foundation/src/NamedMutex_WIN32U.cpp
@@ -25,7 +25,7 @@ NamedMutexImpl::NamedMutexImpl(const std::string& name):
 {
 	UnicodeConverter::toUTF16(_name, _uname);
 	_mutex = CreateMutexW(NULL, FALSE, _uname.c_str());
-	if (!_mutex) 
+	if (!_mutex)
 		throw SystemException("cannot create named mutex", _name);
 }
 
diff --git a/Foundation/src/NestedDiagnosticContext.cpp b/Foundation/src/NestedDiagnosticContext.cpp
index fda6e921d..3be966ace 100644
--- a/Foundation/src/NestedDiagnosticContext.cpp
+++ b/Foundation/src/NestedDiagnosticContext.cpp
@@ -43,7 +43,7 @@ NestedDiagnosticContext& NestedDiagnosticContext::operator = (const NestedDiagno
 	return *this;
 }
 
-	
+
 void NestedDiagnosticContext::push(const std::string& info)
 {
 	Context ctx;
@@ -53,7 +53,7 @@ void NestedDiagnosticContext::push(const std::string& info)
 	_stack.push_back(ctx);
 }
 
-	
+
 void NestedDiagnosticContext::push(const std::string& info, int line, const char* filename)
 {
 	Context ctx;
@@ -70,7 +70,7 @@ void NestedDiagnosticContext::pop()
 		_stack.pop_back();
 }
 
-	
+
 int NestedDiagnosticContext::depth() const
 {
 	return int(_stack.size());
@@ -89,7 +89,7 @@ std::string NestedDiagnosticContext::toString() const
 	return result;
 }
 
-	
+
 void NestedDiagnosticContext::dump(std::ostream& ostr) const
 {
 	dump(ostr, "\n");
diff --git a/Foundation/src/NotificationQueue.cpp b/Foundation/src/NotificationQueue.cpp
index 7b5969c9a..88a182a38 100644
--- a/Foundation/src/NotificationQueue.cpp
+++ b/Foundation/src/NotificationQueue.cpp
@@ -53,7 +53,7 @@ void NotificationQueue::enqueueNotification(Notification::Ptr pNotification)
 		_waitQueue.pop_front();
 		pWI->pNf = pNotification;
 		pWI->nfAvailable.set();
-	}	
+	}
 }
 
 
@@ -71,7 +71,7 @@ void NotificationQueue::enqueueUrgentNotification(Notification::Ptr pNotificatio
 		_waitQueue.pop_front();
 		pWI->pNf = pNotification;
 		pWI->nfAvailable.set();
-	}	
+	}
 }
 
 
@@ -162,7 +162,7 @@ bool NotificationQueue::empty() const
 	return _nfQueue.empty();
 }
 
-	
+
 int NotificationQueue::size() const
 {
 	FastMutex::ScopedLock lock(_mutex);
@@ -173,7 +173,7 @@ int NotificationQueue::size() const
 void NotificationQueue::clear()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	_nfQueue.clear();	
+	_nfQueue.clear();
 }
 
 
diff --git a/Foundation/src/NullStream.cpp b/Foundation/src/NullStream.cpp
index e27042587..70062a5ca 100644
--- a/Foundation/src/NullStream.cpp
+++ b/Foundation/src/NullStream.cpp
@@ -27,7 +27,7 @@ NullStreamBuf::~NullStreamBuf()
 {
 }
 
-	
+
 int NullStreamBuf::readFromDevice()
 {
 	return -1;
diff --git a/Foundation/src/NumberParser.cpp b/Foundation/src/NumberParser.cpp
index 56eeb1675..ab3ec14f8 100644
--- a/Foundation/src/NumberParser.cpp
+++ b/Foundation/src/NumberParser.cpp
@@ -28,7 +28,7 @@
 	#define I64_FMT "l"
 #elif defined(_MSC_VER) || defined(__MINGW32__)
 	#define I64_FMT "I64"
-#elif defined(__APPLE__) 
+#elif defined(__APPLE__)
 	#define I64_FMT "q"
 #else
 	#define I64_FMT "ll"
@@ -201,7 +201,7 @@ bool NumberParser::parseBool(const std::string& s)
 		throw SyntaxException("Not a valid bool number", s);
 }
 
-	
+
 bool NumberParser::tryParseBool(const std::string& s, bool& value)
 {
 	int n;
@@ -226,7 +226,7 @@ bool NumberParser::tryParseBool(const std::string& s, bool& value)
 		value = true;
 		return true;
 	}
-	
+
 	if (icompare(s, "false") == 0)
 	{
 		value = false;
@@ -242,7 +242,7 @@ bool NumberParser::tryParseBool(const std::string& s, bool& value)
 		value = false;
 		return true;
 	}
-	
+
 	return false;
 }
 
diff --git a/Foundation/src/NumericString.cpp b/Foundation/src/NumericString.cpp
index 2d932e0da..3815c95b4 100644
--- a/Foundation/src/NumericString.cpp
+++ b/Foundation/src/NumericString.cpp
@@ -13,23 +13,23 @@
 
 
 #include "Poco/Bugcheck.h"
-
+#include "Poco/NumericString.h"
 
 // +++ double conversion +++
 // don't collide with standalone double_conversion library
 #define double_conversion poco_double_conversion
 #define UNIMPLEMENTED poco_bugcheck
-#include "diy-fp.cc"
+#include "double-conversion.h"
 #include "cached-powers.cc"
 #include "bignum-dtoa.cc"
 #include "bignum.cc"
 #include "fast-dtoa.cc"
 #include "fixed-dtoa.cc"
 #include "strtod.cc"
-#include "double-conversion.cc"
+#include "double-to-string.cc"
+#include "string-to-double.cc"
 // --- double conversion ---
 
-#include "Poco/NumericString.h"
 poco_static_assert(POCO_MAX_FLT_STRING_LEN == double_conversion::kMaxSignificantDecimalDigits);
 #include "Poco/String.h"
 #include <memory>
diff --git a/Foundation/src/Path.cpp b/Foundation/src/Path.cpp
index 33be9b26c..7b85a65c6 100644
--- a/Foundation/src/Path.cpp
+++ b/Foundation/src/Path.cpp
@@ -169,7 +169,7 @@ Path& Path::operator = (const char* path)
 }
 
 
-void Path::swap(Path& path)
+void Path::swap(Path& path) noexcept
 {
 	std::swap(_node, path._node);
 	std::swap(_device, path._device);
diff --git a/Foundation/src/Path_WINCE.cpp b/Foundation/src/Path_WINCE.cpp
index 750f18dda..05d9c868c 100644
--- a/Foundation/src/Path_WINCE.cpp
+++ b/Foundation/src/Path_WINCE.cpp
@@ -134,7 +134,7 @@ void PathImpl::listRootsImpl(std::vector<std::string>& roots)
 					roots.push_back(root);
 				}
 			}
-		} 
+		}
 		while (FindNextFileW(hFind, &fd));
 		FindClose(hFind);
 	}
diff --git a/Foundation/src/PatternFormatter.cpp b/Foundation/src/PatternFormatter.cpp
index f4734de47..c014eef0c 100644
--- a/Foundation/src/PatternFormatter.cpp
+++ b/Foundation/src/PatternFormatter.cpp
@@ -198,7 +198,7 @@ void PatternFormatter::parsePattern()
 	}
 }
 
-	
+
 void PatternFormatter::setProperty(const std::string& name, const std::string& value)
 {
 	if (name == PROP_PATTERN)
@@ -215,7 +215,7 @@ void PatternFormatter::setProperty(const std::string& name, const std::string& v
 		_priorityNames = value;
 		parsePriorityNames();
 	}
-	else 
+	else
 	{
 		Formatter::setProperty(name, value);
 	}
@@ -251,7 +251,7 @@ void PatternFormatter::parsePriorityNames()
 
 const std::string& PatternFormatter::getPriorityName(int prio)
 {
-	poco_assert (1 <= prio && prio <= 8);	
+	poco_assert (1 <= prio && prio <= 8);
 	return _priorities[prio];
 }
 
diff --git a/Foundation/src/Pipe.cpp b/Foundation/src/Pipe.cpp
index 8cd9eb244..ccf4cf79f 100644
--- a/Foundation/src/Pipe.cpp
+++ b/Foundation/src/Pipe.cpp
@@ -23,7 +23,7 @@ Pipe::Pipe():
 {
 }
 
-	
+
 Pipe::Pipe(const Pipe& pipe):
 	_pImpl(pipe._pImpl)
 {
diff --git a/Foundation/src/PipeImpl_WIN32.cpp b/Foundation/src/PipeImpl_WIN32.cpp
index 87dbbbf3e..ac3372116 100644
--- a/Foundation/src/PipeImpl_WIN32.cpp
+++ b/Foundation/src/PipeImpl_WIN32.cpp
@@ -25,7 +25,7 @@ PipeImpl::PipeImpl()
 	attr.nLength              = sizeof(attr);
 	attr.lpSecurityDescriptor = NULL;
 	attr.bInheritHandle       = FALSE;
-	
+
 	if (!CreatePipe(&_readHandle, &_writeHandle, &attr, 0))
 		throw CreateFileException("anonymous pipe");
 }
diff --git a/Foundation/src/PipeStream.cpp b/Foundation/src/PipeStream.cpp
index 96fb32358..9d40bd3a3 100644
--- a/Foundation/src/PipeStream.cpp
+++ b/Foundation/src/PipeStream.cpp
@@ -23,7 +23,7 @@ namespace Poco {
 //
 
 
-PipeStreamBuf::PipeStreamBuf(const Pipe& pipe, openmode mode): 
+PipeStreamBuf::PipeStreamBuf(const Pipe& pipe, openmode mode):
 	BufferedStreamBuf(STREAM_BUFFER_SIZE, mode),
 	_pipe(pipe)
 {
diff --git a/Foundation/src/PriorityNotificationQueue.cpp b/Foundation/src/PriorityNotificationQueue.cpp
index d0121160b..541611d47 100644
--- a/Foundation/src/PriorityNotificationQueue.cpp
+++ b/Foundation/src/PriorityNotificationQueue.cpp
@@ -54,7 +54,7 @@ void PriorityNotificationQueue::enqueueNotification(Notification::Ptr pNotificat
 		_waitQueue.pop_front();
 		pWI->pNf = pNotification;
 		pWI->nfAvailable.set();
-	}	
+	}
 }
 
 
@@ -145,7 +145,7 @@ bool PriorityNotificationQueue::empty() const
 	return _nfQueue.empty();
 }
 
-	
+
 int PriorityNotificationQueue::size() const
 {
 	FastMutex::ScopedLock lock(_mutex);
@@ -156,7 +156,7 @@ int PriorityNotificationQueue::size() const
 void PriorityNotificationQueue::clear()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	_nfQueue.clear();	
+	_nfQueue.clear();
 }
 
 
diff --git a/Foundation/src/RWLock.cpp b/Foundation/src/RWLock.cpp
index ba3f7d142..2937a5798 100644
--- a/Foundation/src/RWLock.cpp
+++ b/Foundation/src/RWLock.cpp
@@ -37,7 +37,7 @@ RWLock::RWLock()
 {
 }
 
-	
+
 RWLock::~RWLock()
 {
 }
diff --git a/Foundation/src/RWLock_WIN32.cpp b/Foundation/src/RWLock_WIN32.cpp
index 973b0ae3c..e4f922225 100644
--- a/Foundation/src/RWLock_WIN32.cpp
+++ b/Foundation/src/RWLock_WIN32.cpp
@@ -186,7 +186,7 @@ DWORD RWLockImpl::tryReadLockOnce()
 	HANDLE h[2];
 	h[0] = _mutex;
 	h[1] = _readEvent;
-	DWORD result = WaitForMultipleObjects(2, h, TRUE, 1); 
+	DWORD result = WaitForMultipleObjects(2, h, TRUE, 1);
 	switch (result)
 	{
 	case WAIT_OBJECT_0:
diff --git a/Foundation/src/RWLock_WINCE.cpp b/Foundation/src/RWLock_WINCE.cpp
index f383a9da5..f669605da 100644
--- a/Foundation/src/RWLock_WINCE.cpp
+++ b/Foundation/src/RWLock_WINCE.cpp
@@ -19,13 +19,13 @@
 namespace Poco {
 
 
-RWLockImpl::RWLockImpl(): 
+RWLockImpl::RWLockImpl():
 	_readerCount(0),
 	_readerWaiting(0),
 	_writerCount(0),
 	_writerWaiting(0),
 	_writeLock(false)
-	
+
 {
 	InitializeCriticalSection(&_cs);
 	_readerGreen = CreateEventW(NULL, FALSE, TRUE, NULL);
@@ -56,7 +56,7 @@ void RWLockImpl::readLockImpl()
 bool RWLockImpl::tryReadLockImpl(DWORD timeout)
 {
 	bool wait = false;
-	do 
+	do
 	{
 		EnterCriticalSection(&_cs);
 		if (!_writerCount && !_writerWaiting)
@@ -68,31 +68,31 @@ bool RWLockImpl::tryReadLockImpl(DWORD timeout)
 			}
 			_readerCount++;
 		}
-		else 
+		else
 		{
-			if (!wait) 
+			if (!wait)
 			{
 				_readerWaiting++;
 				wait = true;
 			}
 			ResetEvent(_readerGreen);
 		}
-		LeaveCriticalSection(&_cs); 
-		if (wait) 
+		LeaveCriticalSection(&_cs);
+		if (wait)
 		{
-			if (WaitForSingleObject(_readerGreen, timeout) != WAIT_OBJECT_0) 
+			if (WaitForSingleObject(_readerGreen, timeout) != WAIT_OBJECT_0)
 			{
 				EnterCriticalSection(&_cs);
 				_readerWaiting--;
-				SetEvent(_readerGreen); 
+				SetEvent(_readerGreen);
 				SetEvent(_writerGreen);
 				LeaveCriticalSection(&_cs);
 				return false;
 			}
 		}
-	} 
+	}
 	while (wait);
-   
+
 	return true;
 }
 
@@ -107,21 +107,21 @@ bool RWLockImpl::tryWriteLockImpl(DWORD timeout)
 {
 	bool wait = false;
 
-	do 
+	do
 	{
 		EnterCriticalSection(&_cs);
 		if (!_readerCount && !_writerCount)
 		{
-			if (wait) 
+			if (wait)
 			{
 				_writerWaiting--;
 				wait = false;
 			}
 			_writerCount++;
 		}
-		else 
+		else
 		{
-			if (!wait) 
+			if (!wait)
 			{
 				_writerWaiting++;
 				wait = true;
@@ -129,9 +129,9 @@ bool RWLockImpl::tryWriteLockImpl(DWORD timeout)
 			ResetEvent(_writerGreen);
 		}
 		LeaveCriticalSection(&_cs);
-		if (wait) 
+		if (wait)
 		{
-			if (WaitForSingleObject(_writerGreen, timeout) != WAIT_OBJECT_0) 
+			if (WaitForSingleObject(_writerGreen, timeout) != WAIT_OBJECT_0)
 			{
 				EnterCriticalSection(&_cs);
 				_writerWaiting--;
@@ -143,7 +143,7 @@ bool RWLockImpl::tryWriteLockImpl(DWORD timeout)
 		}
 	}
 	while (wait);
-	
+
 	_writeLock = true;
 	return true;
 }
@@ -152,7 +152,7 @@ bool RWLockImpl::tryWriteLockImpl(DWORD timeout)
 void RWLockImpl::unlockImpl()
 {
 	EnterCriticalSection(&_cs);
-	
+
 	if (_writeLock)
 	{
 		_writeLock = false;
@@ -165,8 +165,8 @@ void RWLockImpl::unlockImpl()
 	if (_writerWaiting)
 		SetEvent(_writerGreen);
 	else if (_readerWaiting)
-		SetEvent(_readerGreen);   
-		  
+		SetEvent(_readerGreen);
+
 	LeaveCriticalSection(&_cs);
 }
 
diff --git a/Foundation/src/Random.cpp b/Foundation/src/Random.cpp
index 43dd31eb1..59df7122f 100644
--- a/Foundation/src/Random.cpp
+++ b/Foundation/src/Random.cpp
@@ -14,7 +14,7 @@
 //
 //
 // Based on the FreeBSD random number generator.
-// src/lib/libc/stdlib/random.c,v 1.25 
+// src/lib/libc/stdlib/random.c,v 1.25
 //
 // Copyright (c) 1983, 1993
 // The Regents of the University of California.  All rights reserved.
@@ -206,7 +206,7 @@ void Random::seed(UInt32 x)
 	_state[0] = x;
 	if (_randType == TYPE_0)
 		lim = NSHUFF;
-	else 
+	else
 	{
 		for (i = 1; i < _randDeg; i++)
 			_state[i] = goodRand(_state[i - 1]);
@@ -267,36 +267,36 @@ void Random::initState(UInt32 s, char* argState, Int32 n)
 {
 	UInt32* intArgState = (UInt32*) argState;
 
-	if (n < BREAK_0) 
+	if (n < BREAK_0)
 	{
 		poco_bugcheck_msg("not enough state");
 		return;
 	}
-	if (n < BREAK_1) 
+	if (n < BREAK_1)
 	{
 		_randType = TYPE_0;
 		_randDeg  = DEG_0;
 		_randSep  = SEP_0;
-	} 
-	else if (n < BREAK_2) 
+	}
+	else if (n < BREAK_2)
 	{
 		_randType = TYPE_1;
 		_randDeg  = DEG_1;
 		_randSep  = SEP_1;
-	} 
-	else if (n < BREAK_3) 
+	}
+	else if (n < BREAK_3)
 	{
 		_randType = TYPE_2;
 		_randDeg  = DEG_2;
 		_randSep  = SEP_2;
-	} 
-	else if (n < BREAK_4) 
+	}
+	else if (n < BREAK_4)
 	{
 		_randType = TYPE_3;
 		_randDeg  = DEG_3;
 		_randSep  = SEP_3;
-	} 
-	else 
+	}
+	else
 	{
 		_randType = TYPE_4;
 		_randDeg = DEG_4;
@@ -334,12 +334,12 @@ UInt32 Random::next()
 	UInt32 i;
 	UInt32 *f, *r;
 
-	if (_randType == TYPE_0) 
+	if (_randType == TYPE_0)
 	{
 		i = _state[0];
 		_state[0] = i = goodRand(i) & 0x7FFFFFFF;
-	} 
-	else 
+	}
+	else
 	{
 		/*
 		 * Use local variables rather than static variables for speed.
diff --git a/Foundation/src/RandomStream.cpp b/Foundation/src/RandomStream.cpp
index 89137fe71..21ce6a378 100644
--- a/Foundation/src/RandomStream.cpp
+++ b/Foundation/src/RandomStream.cpp
@@ -51,7 +51,7 @@ int RandomBuf::readFromDevice(char* buffer, std::streamsize length)
 #else
 	#if defined(POCO_OS_FAMILY_UNIX)
 	int fd = open("/dev/urandom", O_RDONLY, 0);
-	if (fd >= 0) 
+	if (fd >= 0)
 	{
 		n = read(fd, buffer, length);
 		close(fd);
@@ -65,7 +65,7 @@ int RandomBuf::readFromDevice(char* buffer, std::streamsize length)
 		Random rnd1(256);
 		Random rnd2(64);
 		x += rnd1.next();
- 
+
 		n = 0;
 		SHA1Engine engine;
 		UInt32 t = (UInt32) std::time(NULL);
diff --git a/Foundation/src/RegularExpression.cpp b/Foundation/src/RegularExpression.cpp
index 794246f6e..0ab0cefb8 100644
--- a/Foundation/src/RegularExpression.cpp
+++ b/Foundation/src/RegularExpression.cpp
@@ -16,56 +16,104 @@
 #include "Poco/Exception.h"
 #include <sstream>
 #if defined(POCO_UNBUNDLED)
-#include <pcre.h>
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
 #else
-#include "pcre_config.h"
-#include "pcre.h"
+#include "pcre2_config.h"
+#include "pcre2.h"
 #endif
 
 
+namespace
+{
+	class MatchData
+	{
+	public:
+		MatchData(pcre2_code_8* code):
+			_match(pcre2_match_data_create_from_pattern_8(reinterpret_cast<pcre2_code_8*>(code), nullptr))
+		{
+			if (!_match) throw Poco::RegularExpressionException("cannot create match data");
+		}
+
+		~MatchData()
+		{
+			if (_match) pcre2_match_data_free_8(_match);
+		}
+
+		std::uint32_t count() const
+		{
+			return pcre2_get_ovector_count_8(_match);
+		}
+
+		const PCRE2_SIZE* data() const
+		{
+			return pcre2_get_ovector_pointer_8(_match);
+		}
+
+		operator pcre2_match_data_8*()
+		{
+			return _match;
+		}
+
+	private:
+		pcre2_match_data_8* _match;
+	};
+}
+
+
 namespace Poco {
 
 
-const int RegularExpression::OVEC_SIZE = 63; // must be multiple of 3
-
-
-RegularExpression::RegularExpression(const std::string& pattern, int options, bool study): _pcre(0), _extra(0)
+RegularExpression::RegularExpression(const std::string& pattern, int options, bool /*study*/): _pcre(0)
 {
-	const char* error;
-	int offs;
-	unsigned nmcount;
-	unsigned nmentrysz;
-	unsigned char* nmtbl;
+	int errorCode;
+	PCRE2_SIZE errorOffset;
+	unsigned nameCount;
+	unsigned nameEntrySize;
+	unsigned char* nameTable;
+
+	pcre2_compile_context_8* context = pcre2_compile_context_create_8(nullptr);
+	if (!context) throw Poco::RegularExpressionException("cannot create compile context");
+
+	if (options & RE_NEWLINE_LF)
+		pcre2_set_newline_8(context, PCRE2_NEWLINE_LF);
+	else if (options & RE_NEWLINE_CRLF)
+		pcre2_set_newline_8(context, PCRE2_NEWLINE_CRLF);
+	else if (options & RE_NEWLINE_ANY)
+		pcre2_set_newline_8(context, PCRE2_NEWLINE_ANY);
+	else if (options & RE_NEWLINE_ANYCRLF)
+		pcre2_set_newline_8(context, PCRE2_NEWLINE_ANYCRLF);
+	else // default RE_NEWLINE_CR
+		pcre2_set_newline_8(context, PCRE2_NEWLINE_CR);
+
+	_pcre = pcre2_compile_8(reinterpret_cast<const PCRE2_SPTR>(pattern.c_str()), pattern.length(), compileOptions(options), &errorCode, &errorOffset, context);
+	pcre2_compile_context_free_8(context);
 
-	_pcre = pcre_compile(pattern.c_str(), options, &error, &offs, 0);
 	if (!_pcre)
 	{
+		PCRE2_UCHAR buffer[256];
+		pcre2_get_error_message_8(errorCode, buffer, sizeof(buffer));
 		std::ostringstream msg;
-		msg << error << " (at offset " << offs << ")";
+		msg << reinterpret_cast<char*>(buffer) << " (at offset " << errorOffset << ")";
 		throw RegularExpressionException(msg.str());
 	}
-	if (study)
-		_extra = pcre_study(reinterpret_cast<pcre*>(_pcre), 0, &error);
 
-	const pcre* regex = reinterpret_cast<pcre*>(_pcre);
-	const pcre_extra* extra = reinterpret_cast<pcre_extra*>(_extra);
-	pcre_fullinfo(regex, extra, PCRE_INFO_NAMECOUNT, &nmcount);
-	pcre_fullinfo(regex, extra, PCRE_INFO_NAMEENTRYSIZE, &nmentrysz);
-	pcre_fullinfo(regex, extra, PCRE_INFO_NAMETABLE, &nmtbl);
+	pcre2_pattern_info_8(reinterpret_cast<pcre2_code_8*>(_pcre), PCRE2_INFO_NAMECOUNT, &nameCount);
+	pcre2_pattern_info_8(reinterpret_cast<pcre2_code_8*>(_pcre), PCRE2_INFO_NAMEENTRYSIZE, &nameEntrySize);
+	pcre2_pattern_info_8(reinterpret_cast<pcre2_code_8*>(_pcre), PCRE2_INFO_NAMETABLE, &nameTable);
 
-	for (int i = 0; i < nmcount; i++)
+	for (int i = 0; i < nameCount; i++)
 	{
-		unsigned char* group = nmtbl + 2 + (nmentrysz * i);
-		int n = pcre_get_stringnumber(regex, (char*) group);
-		_groups[n] = std::string((char*) group);
+		unsigned char* group = nameTable + 2 + (nameEntrySize * i);
+		int n = pcre2_substring_number_from_name_8(reinterpret_cast<pcre2_code_8*>(_pcre), group);
+		_groups[n] = std::string(reinterpret_cast<char*>(group));
 	}
 }
 
 
 RegularExpression::~RegularExpression()
 {
-	if (_pcre)  pcre_free(reinterpret_cast<pcre*>(_pcre));
-	if (_extra) pcre_free(reinterpret_cast<struct pcre_extra*>(_extra));
+	if (_pcre) pcre2_code_free_8(reinterpret_cast<pcre2_code_8*>(_pcre));
 }
 
 
@@ -73,15 +121,15 @@ int RegularExpression::match(const std::string& subject, std::string::size_type
 {
 	poco_assert (offset <= subject.length());
 
-	int ovec[OVEC_SIZE];
-	int rc = pcre_exec(reinterpret_cast<pcre*>(_pcre), reinterpret_cast<struct pcre_extra*>(_extra), subject.c_str(), int(subject.size()), int(offset), options & 0xFFFF, ovec, OVEC_SIZE);
-	if (rc == PCRE_ERROR_NOMATCH)
+	MatchData matchData(reinterpret_cast<pcre2_code_8*>(_pcre));
+	int rc = pcre2_match_8(reinterpret_cast<pcre2_code_8*>(_pcre), reinterpret_cast<const PCRE2_SPTR>(subject.c_str()), subject.size(), offset, matchOptions(options), matchData, nullptr);
+	if (rc == PCRE2_ERROR_NOMATCH)
 	{
 		mtch.offset = std::string::npos;
 		mtch.length = 0;
 		return 0;
 	}
-	else if (rc == PCRE_ERROR_BADOPTION)
+	else if (rc == PCRE2_ERROR_BADOPTION)
 	{
 		throw RegularExpressionException("bad option");
 	}
@@ -91,10 +139,11 @@ int RegularExpression::match(const std::string& subject, std::string::size_type
 	}
 	else if (rc < 0)
 	{
-		std::ostringstream msg;
-		msg << "PCRE error " << rc;
-		throw RegularExpressionException(msg.str());
+		PCRE2_UCHAR buffer[256];
+		pcre2_get_error_message_8(rc, buffer, sizeof(buffer));
+		throw RegularExpressionException(std::string(reinterpret_cast<char*>(buffer)));
 	}
+	const PCRE2_SIZE* ovec = matchData.data();
 	mtch.offset = ovec[0] < 0 ? std::string::npos : ovec[0];
 	mtch.length = ovec[1] - mtch.offset;
 	return rc;
@@ -107,13 +156,13 @@ int RegularExpression::match(const std::string& subject, std::string::size_type
 
 	matches.clear();
 
-	int ovec[OVEC_SIZE];
-	int rc = pcre_exec(reinterpret_cast<pcre*>(_pcre), reinterpret_cast<struct pcre_extra*>(_extra), subject.c_str(), int(subject.size()), int(offset), options & 0xFFFF, ovec, OVEC_SIZE);
-	if (rc == PCRE_ERROR_NOMATCH)
+	MatchData matchData(reinterpret_cast<pcre2_code_8*>(_pcre));
+	int rc = pcre2_match_8(reinterpret_cast<pcre2_code_8*>(_pcre), reinterpret_cast<const PCRE2_SPTR>(subject.c_str()), subject.size(), offset, options & 0xFFFF, matchData, nullptr);
+	if (rc == PCRE2_ERROR_NOMATCH)
 	{
 		return 0;
 	}
-	else if (rc == PCRE_ERROR_BADOPTION)
+	else if (rc == PCRE2_ERROR_BADOPTION)
 	{
 		throw RegularExpressionException("bad option");
 	}
@@ -123,11 +172,12 @@ int RegularExpression::match(const std::string& subject, std::string::size_type
 	}
 	else if (rc < 0)
 	{
-		std::ostringstream msg;
-		msg << "PCRE error " << rc;
-		throw RegularExpressionException(msg.str());
+		PCRE2_UCHAR buffer[256];
+		pcre2_get_error_message_8(rc, buffer, sizeof(buffer));
+		throw RegularExpressionException(std::string(reinterpret_cast<char*>(buffer)));
 	}
 	matches.reserve(rc);
+	const PCRE2_SIZE* ovec = matchData.data();
 	for (int i = 0; i < rc; ++i)
 	{
 		Match m;
@@ -229,13 +279,13 @@ std::string::size_type RegularExpression::substOne(std::string& subject, std::st
 {
 	if (offset >= subject.length()) return std::string::npos;
 
-	int ovec[OVEC_SIZE];
-	int rc = pcre_exec(reinterpret_cast<pcre*>(_pcre), reinterpret_cast<struct pcre_extra*>(_extra), subject.c_str(), int(subject.size()), int(offset), options & 0xFFFF, ovec, OVEC_SIZE);
-	if (rc == PCRE_ERROR_NOMATCH)
+	MatchData matchData(reinterpret_cast<pcre2_code_8*>(_pcre));
+	int rc = pcre2_match_8(reinterpret_cast<pcre2_code_8*>(_pcre), reinterpret_cast<const PCRE2_SPTR>(subject.c_str()), subject.size(), offset, matchOptions(options), matchData, nullptr);
+	if (rc == PCRE2_ERROR_NOMATCH)
 	{
 		return std::string::npos;
 	}
-	else if (rc == PCRE_ERROR_BADOPTION)
+	else if (rc == PCRE2_ERROR_BADOPTION)
 	{
 		throw RegularExpressionException("bad option");
 	}
@@ -245,10 +295,11 @@ std::string::size_type RegularExpression::substOne(std::string& subject, std::st
 	}
 	else if (rc < 0)
 	{
-		std::ostringstream msg;
-		msg << "PCRE error " << rc;
-		throw RegularExpressionException(msg.str());
+		PCRE2_UCHAR buffer[256];
+		pcre2_get_error_message_8(rc, buffer, sizeof(buffer));
+		throw RegularExpressionException(std::string(reinterpret_cast<char*>(buffer)));
 	}
+	const PCRE2_SIZE* ovec = matchData.data();
 	std::string result;
 	std::string::size_type len = subject.length();
 	std::string::size_type pos = 0;
@@ -307,4 +358,56 @@ bool RegularExpression::match(const std::string& subject, const std::string& pat
 }
 
 
+int RegularExpression::compileOptions(int options)
+{
+	int pcreOptions = 0;
+
+	if (options & RE_CASELESS)
+		pcreOptions |= PCRE2_CASELESS;
+	if (options & RE_MULTILINE)
+		pcreOptions |= PCRE2_MULTILINE;
+	if (options & RE_DOTALL)
+		pcreOptions |= PCRE2_DOTALL;
+	if (options & RE_EXTENDED)
+		pcreOptions |= PCRE2_EXTENDED;
+	if (options & RE_ANCHORED)
+		pcreOptions |= PCRE2_ANCHORED;
+	if (options & RE_DOLLAR_ENDONLY)
+		pcreOptions |= PCRE2_DOLLAR_ENDONLY;
+	if (options & RE_UNGREEDY)
+		pcreOptions |= PCRE2_UNGREEDY;
+	if (options & RE_UTF8)
+		pcreOptions |= PCRE2_UTF | PCRE2_UCP;
+	if (options & RE_NO_AUTO_CAPTURE)
+		pcreOptions |= PCRE2_NO_AUTO_CAPTURE;
+	if (options & RE_FIRSTLINE)
+		pcreOptions |= PCRE2_FIRSTLINE;
+	if (options & RE_DUPNAMES)
+		pcreOptions |= PCRE2_DUPNAMES;
+
+	return pcreOptions;
+}
+
+
+int RegularExpression::matchOptions(int options)
+{
+	int pcreOptions = 0;
+
+	if (options & RE_ANCHORED)
+		pcreOptions |= PCRE2_ANCHORED;
+	if (options & RE_NOTBOL)
+		pcreOptions |= PCRE2_NOTBOL;
+	if (options & RE_NOTEOL)
+		pcreOptions |= PCRE2_NOTEOL;
+	if (options & RE_NOTEMPTY)
+		pcreOptions |= PCRE2_NOTEMPTY;
+	if (options & RE_NO_AUTO_CAPTURE)
+		pcreOptions |= PCRE2_NO_AUTO_CAPTURE;
+	if (options & RE_NO_UTF8_CHECK)
+		pcreOptions |= PCRE2_NO_UTF_CHECK;
+
+	return pcreOptions;
+}
+
+
 } // namespace Poco
diff --git a/Foundation/src/RotateStrategy.cpp b/Foundation/src/RotateStrategy.cpp
index d3939b70f..f27eb9781 100644
--- a/Foundation/src/RotateStrategy.cpp
+++ b/Foundation/src/RotateStrategy.cpp
@@ -46,7 +46,7 @@ RotateStrategy::~RotateStrategy()
 const std::string RotateByIntervalStrategy::ROTATE_TEXT("# Log file created/rotated ");
 
 
-RotateByIntervalStrategy::RotateByIntervalStrategy(const Timespan& span): 
+RotateByIntervalStrategy::RotateByIntervalStrategy(const Timespan& span):
 	_span(span),
 	_lastRotate(0)
 {
diff --git a/Foundation/src/SHA1Engine.cpp b/Foundation/src/SHA1Engine.cpp
index fb945a6f5..71fe2d857 100644
--- a/Foundation/src/SHA1Engine.cpp
+++ b/Foundation/src/SHA1Engine.cpp
@@ -54,7 +54,7 @@ inline void SHA1Engine::byteReverse(UInt32* buffer, int byteCount)
 #endif // POCO_ARCH_LITTLE_ENDIAN
 }
 
-	
+
 void SHA1Engine::updateImpl(const void* buffer_, std::size_t count)
 {
 	const BYTE* buffer = (const BYTE*) buffer_;
@@ -71,7 +71,7 @@ void SHA1Engine::updateImpl(const void* buffer_, std::size_t count)
 	{
 		db[_context.slop++] = *(buffer++);
 		if (_context.slop == BLOCK_SIZE)
-		{ 
+		{
 			/* transform this one block */
 			SHA1_BYTE_REVERSE(_context.data, BLOCK_SIZE);
 			transform();
diff --git a/Foundation/src/SHA2Engine.cpp b/Foundation/src/SHA2Engine.cpp
index b09b30a79..84fd285f5 100644
--- a/Foundation/src/SHA2Engine.cpp
+++ b/Foundation/src/SHA2Engine.cpp
@@ -41,7 +41,6 @@ typedef struct
 		Poco::UInt64 state64[8];
 	} state;
 
-	SHA2Engine::ALGORITHM size;
 	unsigned char buffer[128];
 } HASHCONTEXT;
 
@@ -274,7 +273,7 @@ void SHA2Engine::updateImpl(const void* buffer_, std::size_t count)
 	Poco::UInt32 left = 0;
 	HASHCONTEXT* pContext = (HASHCONTEXT*)_context;
 	unsigned char* data = (unsigned char*)buffer_;
-	if (pContext->size > SHA_256)
+	if (_algorithm > SHA_256)
 	{
 		left = (Poco::UInt32)(pContext->total.total64[0] & 0x7F);
 		size_t fill = 128 - left;
@@ -323,7 +322,31 @@ void SHA2Engine::updateImpl(const void* buffer_, std::size_t count)
 
 std::size_t SHA2Engine::digestLength() const
 {
-	return (size_t)((int)_algorithm / 8);
+	size_t result = 0;
+
+	switch (_algorithm)
+	{
+	case SHA_224:
+		result = 224;
+		break;
+	case SHA_256:
+		result = 256;
+		break;
+	case SHA_384:
+		result = 384;
+		break;
+	case SHA_512:
+		result = 512;
+		break;
+	case SHA_512_224:
+		result = 224;
+		break;
+	case SHA_512_256:
+		result = 256;
+		break;
+	}
+
+	return result / 8;
 }
 
 
@@ -332,7 +355,6 @@ void SHA2Engine::reset()
 	if (_context != NULL) free(_context);
 	_context = calloc(1, sizeof(HASHCONTEXT));
 	HASHCONTEXT* pContext = (HASHCONTEXT*)_context;
-	pContext->size = _algorithm;
 	if (_algorithm == SHA_224)
 	{
 		pContext->state.state32[0] = 0xC1059ED8;
@@ -366,7 +388,7 @@ void SHA2Engine::reset()
 		pContext->state.state64[6] = UL64(0xDB0C2E0D64F98FA7);
 		pContext->state.state64[7] = UL64(0x47B5481DBEFA4FA4);
 	}
-	else
+	else if (_algorithm == SHA_512)
 	{
 		pContext->state.state64[0] = UL64(0x6A09E667F3BCC908);
 		pContext->state.state64[1] = UL64(0xBB67AE8584CAA73B);
@@ -377,6 +399,27 @@ void SHA2Engine::reset()
 		pContext->state.state64[6] = UL64(0x1F83D9ABFB41BD6B);
 		pContext->state.state64[7] = UL64(0x5BE0CD19137E2179);
 	}
+	else if (_algorithm == SHA_512_224)
+	{
+		pContext->state.state64[0] = UL64(0x8C3D37C819544DA2);
+		pContext->state.state64[1] = UL64(0x73E1996689DCD4D6);
+		pContext->state.state64[2] = UL64(0x1DFAB7AE32FF9C82);
+		pContext->state.state64[3] = UL64(0x679DD514582F9FCF);
+		pContext->state.state64[4] = UL64(0x0F6D2B697BD44DA8);
+		pContext->state.state64[5] = UL64(0x77E36F7304C48942);
+		pContext->state.state64[6] = UL64(0x3F9D85A86A1D36C8);
+		pContext->state.state64[7] = UL64(0x1112E6AD91D692A1);
+	} else
+	{
+		pContext->state.state64[0] = UL64(0x22312194FC2BF72C);
+		pContext->state.state64[1] = UL64(0x9F555FA3C84C64C2);
+		pContext->state.state64[2] = UL64(0x2393B86B6F53B151);
+		pContext->state.state64[3] = UL64(0x963877195940EABD);
+		pContext->state.state64[4] = UL64(0x96283EE2A88EFFE3);
+		pContext->state.state64[5] = UL64(0xBE5E1E2553863992);
+		pContext->state.state64[6] = UL64(0x2B0199FC2C85B8AA);
+		pContext->state.state64[7] = UL64(0x0EB72DDC81C52CA2);
+	}
 }
 
 
@@ -388,7 +431,8 @@ const DigestEngine::Digest& SHA2Engine::digest()
 	size_t last, padn;
 	unsigned char hash[64];
 	memset(hash, 0, 64);
-	if (pContext->size > SHA_256)
+
+	if (_algorithm > SHA_256)
 	{
 		unsigned char msglen[16];
 		Poco::UInt64 high = (pContext->total.total64[0] >> 61) | (pContext->total.total64[1] << 3);
@@ -405,7 +449,7 @@ const DigestEngine::Digest& SHA2Engine::digest()
 		PUT_UINT64(pContext->state.state64[3], hash, 24);
 		PUT_UINT64(pContext->state.state64[4], hash, 32);
 		PUT_UINT64(pContext->state.state64[5], hash, 40);
-		if (pContext->size > SHA_384)
+		if (_algorithm > SHA_384)
 		{
 			PUT_UINT64(pContext->state.state64[6], hash, 48);
 			PUT_UINT64(pContext->state.state64[7], hash, 56);
@@ -429,7 +473,7 @@ const DigestEngine::Digest& SHA2Engine::digest()
 		PUT_UINT32(pContext->state.state32[4], hash, 16);
 		PUT_UINT32(pContext->state.state32[5], hash, 20);
 		PUT_UINT32(pContext->state.state32[6], hash, 24);
-		if (pContext->size > SHA_224) PUT_UINT32(pContext->state.state32[7], hash, 28);
+		if (_algorithm > SHA_224) PUT_UINT32(pContext->state.state32[7], hash, 28);
 	}
 	_digest.insert(_digest.begin(), hash, hash + digestLength());
 	reset();
diff --git a/Foundation/src/Semaphore_WIN32.cpp b/Foundation/src/Semaphore_WIN32.cpp
index 2ec04a8c0..99b15a69d 100644
--- a/Foundation/src/Semaphore_WIN32.cpp
+++ b/Foundation/src/Semaphore_WIN32.cpp
@@ -57,7 +57,7 @@ bool SemaphoreImpl::waitImpl(long milliseconds)
 	case WAIT_OBJECT_0:
 		return true;
 	default:
-		throw SystemException("wait for semaphore failed");		
+		throw SystemException("wait for semaphore failed");
 	}
 }
 
diff --git a/Foundation/src/SharedLibrary.cpp b/Foundation/src/SharedLibrary.cpp
index bad305fef..a2bdce57a 100644
--- a/Foundation/src/SharedLibrary.cpp
+++ b/Foundation/src/SharedLibrary.cpp
@@ -22,7 +22,7 @@
 #include "SharedLibrary_VX.cpp"
 #elif defined(POCO_OS_FAMILY_UNIX)
 #include "SharedLibrary_UNIX.cpp"
-#elif defined(POCO_OS_FAMILY_WINDOWS) 
+#elif defined(POCO_OS_FAMILY_WINDOWS)
 #include "SharedLibrary_WIN32U.cpp"
 #endif
 
diff --git a/Foundation/src/SharedMemory_WIN32.cpp b/Foundation/src/SharedMemory_WIN32.cpp
index 65959bf85..45beaa840 100644
--- a/Foundation/src/SharedMemory_WIN32.cpp
+++ b/Foundation/src/SharedMemory_WIN32.cpp
@@ -54,7 +54,7 @@ SharedMemoryImpl::SharedMemoryImpl(const std::string& name, std::size_t size, Sh
 			dwRetVal = GetLastError();
 			throw SystemException(format("Cannot open shared memory object %s [Error %d: %s]", _name, static_cast<int>(dwRetVal), Error::getMessage(dwRetVal)));
 		}
-#endif 
+#endif
 	}
 	map();
 }
diff --git a/Foundation/src/SignalHandler.cpp b/Foundation/src/SignalHandler.cpp
index eaa1dc7ec..d405f73dd 100644
--- a/Foundation/src/SignalHandler.cpp
+++ b/Foundation/src/SignalHandler.cpp
@@ -89,7 +89,7 @@ void SignalHandler::handleSignal(int sig)
 	JumpBufferVec& jb = jumpBufferVec();
 	if (!jb.empty())
 		siglongjmp(jb.back().buf, sig);
-		
+
 	// Abort if no jump buffer registered
 	std::abort();
 }
diff --git a/Foundation/src/SimpleFileChannel.cpp b/Foundation/src/SimpleFileChannel.cpp
index 81a0deb12..e87061bac 100644
--- a/Foundation/src/SimpleFileChannel.cpp
+++ b/Foundation/src/SimpleFileChannel.cpp
@@ -30,7 +30,7 @@ const std::string SimpleFileChannel::PROP_ROTATION      = "rotation";
 const std::string SimpleFileChannel::PROP_FLUSH         = "flush";
 
 
-SimpleFileChannel::SimpleFileChannel(): 
+SimpleFileChannel::SimpleFileChannel():
 	_limit(0),
 	_flush(true),
 	_pFile(0)
@@ -64,7 +64,7 @@ SimpleFileChannel::~SimpleFileChannel()
 void SimpleFileChannel::open()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	if (!_pFile)
 	{
 		File primary(_path);
@@ -103,7 +103,7 @@ void SimpleFileChannel::log(const Message& msg)
 	_pFile->write(msg.getText(), _flush);
 }
 
-	
+
 void SimpleFileChannel::setProperty(const std::string& name, const std::string& value)
 {
 	FastMutex::ScopedLock lock(_mutex);
@@ -148,7 +148,7 @@ Timestamp SimpleFileChannel::creationDate() const
 		return 0;
 }
 
-	
+
 UInt64 SimpleFileChannel::size() const
 {
 	if (_pFile)
@@ -180,7 +180,7 @@ void SimpleFileChannel::setRotation(const std::string& rotation)
 	while (it != end && Ascii::isSpace(*it)) ++it;
 	std::string unit;
 	while (it != end && Ascii::isAlpha(*it)) unit += *it++;
-	
+
 	if (unit == "K")
 		_limit = n*1024;
 	else if (unit == "M")
diff --git a/Foundation/src/SortedDirectoryIterator.cpp b/Foundation/src/SortedDirectoryIterator.cpp
index 9cc572401..15bd8e4be 100644
--- a/Foundation/src/SortedDirectoryIterator.cpp
+++ b/Foundation/src/SortedDirectoryIterator.cpp
@@ -81,7 +81,7 @@ void SortedDirectoryIterator::scan()
 		{
 			isDir = (*this)->isDirectory();
 		}
-		catch (...) 
+		catch (...)
 		{
 		}
 		if (isDir)
diff --git a/Foundation/src/SplitterChannel.cpp b/Foundation/src/SplitterChannel.cpp
index 488297524..af1c26c16 100644
--- a/Foundation/src/SplitterChannel.cpp
+++ b/Foundation/src/SplitterChannel.cpp
@@ -97,7 +97,7 @@ void SplitterChannel::close()
 int SplitterChannel::count() const
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	return (int) _channels.size();
 }
 
diff --git a/Foundation/src/StreamChannel.cpp b/Foundation/src/StreamChannel.cpp
index 817c047a6..046db76d3 100644
--- a/Foundation/src/StreamChannel.cpp
+++ b/Foundation/src/StreamChannel.cpp
@@ -32,7 +32,7 @@ StreamChannel::~StreamChannel()
 void StreamChannel::log(const Message& msg)
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	_str << msg.getText() << std::endl;
 }
 
diff --git a/Foundation/src/StreamConverter.cpp b/Foundation/src/StreamConverter.cpp
index 452abd7f2..2433c9b9e 100644
--- a/Foundation/src/StreamConverter.cpp
+++ b/Foundation/src/StreamConverter.cpp
@@ -59,7 +59,7 @@ int StreamConverterBuf::readFromDevice()
 	_pos = 0;
 	_sequenceLength = 0;
 	int c = _pIstr->get();
-	if (c == -1) return -1;	
+	if (c == -1) return -1;
 
 	poco_assert (c < 256);
 	int uc;
@@ -134,14 +134,14 @@ int StreamConverterBuf::errors() const
 }
 
 
-StreamConverterIOS::StreamConverterIOS(std::istream& istr, const TextEncoding& inEncoding, const TextEncoding& outEncoding, int defaultChar): 
+StreamConverterIOS::StreamConverterIOS(std::istream& istr, const TextEncoding& inEncoding, const TextEncoding& outEncoding, int defaultChar):
 	_buf(istr, inEncoding, outEncoding, defaultChar)
 {
 	poco_ios_init(&_buf);
 }
 
 
-StreamConverterIOS::StreamConverterIOS(std::ostream& ostr, const TextEncoding& inEncoding, const TextEncoding& outEncoding, int defaultChar): 
+StreamConverterIOS::StreamConverterIOS(std::ostream& ostr, const TextEncoding& inEncoding, const TextEncoding& outEncoding, int defaultChar):
 	_buf(ostr, inEncoding, outEncoding, defaultChar)
 {
 	poco_ios_init(&_buf);
@@ -165,7 +165,7 @@ int StreamConverterIOS::errors() const
 }
 
 
-InputStreamConverter::InputStreamConverter(std::istream& istr, const TextEncoding& inEncoding, const TextEncoding& outEncoding, int defaultChar): 
+InputStreamConverter::InputStreamConverter(std::istream& istr, const TextEncoding& inEncoding, const TextEncoding& outEncoding, int defaultChar):
 	StreamConverterIOS(istr, inEncoding, outEncoding, defaultChar),
 	std::istream(&_buf)
 {
@@ -177,7 +177,7 @@ InputStreamConverter::~InputStreamConverter()
 }
 
 
-OutputStreamConverter::OutputStreamConverter(std::ostream& ostr, const TextEncoding& inEncoding, const TextEncoding& outEncoding, int defaultChar): 
+OutputStreamConverter::OutputStreamConverter(std::ostream& ostr, const TextEncoding& inEncoding, const TextEncoding& outEncoding, int defaultChar):
 	StreamConverterIOS(ostr, inEncoding, outEncoding, defaultChar),
 	std::ostream(&_buf)
 {
diff --git a/Foundation/src/StreamTokenizer.cpp b/Foundation/src/StreamTokenizer.cpp
index 99dc4482d..bb57d4702 100644
--- a/Foundation/src/StreamTokenizer.cpp
+++ b/Foundation/src/StreamTokenizer.cpp
@@ -66,11 +66,11 @@ void StreamTokenizer::addToken(Token* pToken, bool ignore)
 	_tokens.push_back(ti);
 }
 
-	
+
 const Token* StreamTokenizer::next()
 {
 	poco_check_ptr (_pIstr);
-	
+
 	static const int eof = std::char_traits<char>::eof();
 
 	int first = _pIstr->get();
@@ -81,7 +81,7 @@ const Token* StreamTokenizer::next()
 		if (ti.pToken->start((char) first, *_pIstr))
 		{
 			ti.pToken->finish(*_pIstr);
-			if (ti.ignore) 
+			if (ti.ignore)
 			{
 				first = _pIstr->get();
 				it = _tokens.begin();
diff --git a/Foundation/src/String.cpp b/Foundation/src/String.cpp
index 91b21087e..1e0e94314 100644
--- a/Foundation/src/String.cpp
+++ b/Foundation/src/String.cpp
@@ -26,7 +26,7 @@ int icompare(const std::string& str, std::string::size_type pos, std::string::si
 	std::string::size_type sz = str.size();
 	if (pos > sz) pos = sz;
 	if (pos + n > sz) n = sz - pos;
-	std::string::const_iterator it1  = str.begin() + pos; 
+	std::string::const_iterator it1  = str.begin() + pos;
 	std::string::const_iterator end1 = str.begin() + pos + n;
 	while (it1 != end1 && it2 != end2)
 	{
@@ -96,7 +96,7 @@ int icompare(const std::string& str, std::string::size_type pos, std::string::si
 	std::string::size_type sz = str.size();
 	if (pos > sz) pos = sz;
 	if (pos + n > sz) n = sz - pos;
-	std::string::const_iterator it  = str.begin() + pos; 
+	std::string::const_iterator it  = str.begin() + pos;
 	std::string::const_iterator end = str.begin() + pos + n;
 	while (it != end && *ptr)
 	{
@@ -159,11 +159,11 @@ std::string remove(const std::string& str, const std::string::value_type ch, std
 	return result;
 }
 
-	
+
 std::string& replaceInPlace(std::string& str, const std::string& from, const std::string& to, std::string::size_type start)
 {
 	poco_assert (from.size() > 0);
-	
+
 	std::string result;
 	std::string::size_type pos = 0;
 	result.append(str, 0, start);
diff --git a/Foundation/src/StringTokenizer.cpp b/Foundation/src/StringTokenizer.cpp
index dea7f07d5..baa830316 100644
--- a/Foundation/src/StringTokenizer.cpp
+++ b/Foundation/src/StringTokenizer.cpp
@@ -31,7 +31,7 @@ StringTokenizer::StringTokenizer(const std::string& str, const std::string& sepa
 
 	for (; it != end; ++it)
 	{
-		if (separators.find(*it) != std::string::npos) 
+		if (separators.find(*it) != std::string::npos)
 		{
 			if (doTrim) trim(token);
 			if (!token.empty() || !ignoreEmpty) _tokens.push_back(token);
@@ -50,7 +50,7 @@ StringTokenizer::StringTokenizer(const std::string& str, const std::string& sepa
 		if (doTrim) trim(token);
 		if (!token.empty() || !ignoreEmpty) _tokens.push_back(token);
 	}
-	else if (lastToken) 
+	else if (lastToken)
 	{
 		_tokens.push_back(std::string());
 	}
@@ -100,7 +100,7 @@ std::size_t StringTokenizer::count(const std::string& token) const
 
 
 std::string::size_type StringTokenizer::find(const std::string& token, std::string::size_type pos) const
-{	
+{
 	TokenVec::const_iterator it = std::find(_tokens.begin() + pos, _tokens.end(), token);
 	if (it != _tokens.end())
 	{
diff --git a/Foundation/src/SynchronizedObject.cpp b/Foundation/src/SynchronizedObject.cpp
index 6a42e6594..3a00c25c5 100644
--- a/Foundation/src/SynchronizedObject.cpp
+++ b/Foundation/src/SynchronizedObject.cpp
@@ -22,7 +22,7 @@ SynchronizedObject::SynchronizedObject()
 {
 }
 
-	
+
 SynchronizedObject::~SynchronizedObject()
 {
 }
diff --git a/Foundation/src/SyslogChannel.cpp b/Foundation/src/SyslogChannel.cpp
index 769f4982f..754d98c12 100644
--- a/Foundation/src/SyslogChannel.cpp
+++ b/Foundation/src/SyslogChannel.cpp
@@ -26,18 +26,18 @@ const std::string SyslogChannel::PROP_FACILITY = "facility";
 const std::string SyslogChannel::PROP_OPTIONS  = "options";
 
 
-SyslogChannel::SyslogChannel(): 
-	_options(SYSLOG_CONS), 
-	_facility(SYSLOG_USER), 
+SyslogChannel::SyslogChannel():
+	_options(SYSLOG_CONS),
+	_facility(SYSLOG_USER),
 	_open(false)
 {
 }
 
 
-SyslogChannel::SyslogChannel(const std::string& name, int options, int facility): 
-	_name(name), 
-	_options(options), 
-	_facility(facility), 
+SyslogChannel::SyslogChannel(const std::string& name, int options, int facility):
+	_name(name),
+	_options(options),
+	_facility(facility),
 	_open(false)
 {
 }
@@ -69,7 +69,8 @@ void SyslogChannel::close()
 void SyslogChannel::log(const Message& msg)
 {
 	if (!_open) open();
-	syslog(getPrio(msg), "%s", msg.getText().c_str());
+	const int pri = getPrio(msg) + _facility;
+	syslog(pri, "%s", msg.getText().c_str());
 }
 
 
diff --git a/Foundation/src/Task.cpp b/Foundation/src/Task.cpp
index 8949df4a4..8367d571a 100644
--- a/Foundation/src/Task.cpp
+++ b/Foundation/src/Task.cpp
@@ -57,7 +57,7 @@ void Task::run()
 {
 	TaskManager* pOwner = getOwner();
 	if (pOwner)
-		pOwner->taskStarted(this);		
+		pOwner->taskStarted(this);
 	try
 	{
 		_state = TASK_RUNNING;
@@ -129,7 +129,7 @@ void Task::postNotification(Notification* pNf)
 	poco_check_ptr (pNf);
 
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	if (_pOwner)
 		_pOwner->postNotification(pNf);
 	else if (pNf)
diff --git a/Foundation/src/TaskManager.cpp b/Foundation/src/TaskManager.cpp
index 67a3c91fe..615541ed9 100644
--- a/Foundation/src/TaskManager.cpp
+++ b/Foundation/src/TaskManager.cpp
@@ -43,10 +43,10 @@ TaskManager::~TaskManager()
 void TaskManager::start(Task* pTask)
 {
 	TaskPtr pAutoTask(pTask); // take ownership immediately
-	FastMutex::ScopedLock lock(_mutex);
-
 	pAutoTask->setOwner(this);
 	pAutoTask->setState(Task::TASK_STARTING);
+
+	FastMutex::ScopedLock lock(_mutex);
 	_taskList.push_back(pAutoTask);
 	try
 	{
@@ -83,7 +83,7 @@ void TaskManager::joinAll()
 TaskManager::TaskList TaskManager::taskList() const
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	return _taskList;
 }
 
@@ -134,7 +134,7 @@ void TaskManager::taskCancelled(Task* pTask)
 void TaskManager::taskFinished(Task* pTask)
 {
 	_nc.postNotification(new TaskFinishedNotification(pTask));
-	
+
 	FastMutex::ScopedLock lock(_mutex);
 	for (TaskList::iterator it = _taskList.begin(); it != _taskList.end(); ++it)
 	{
diff --git a/Foundation/src/TaskNotification.cpp b/Foundation/src/TaskNotification.cpp
index cbb7d4d89..c14244ca8 100644
--- a/Foundation/src/TaskNotification.cpp
+++ b/Foundation/src/TaskNotification.cpp
@@ -36,7 +36,7 @@ TaskStartedNotification::TaskStartedNotification(Task* pTask):
 {
 }
 
-	
+
 TaskStartedNotification::~TaskStartedNotification()
 {
 }
@@ -47,7 +47,7 @@ TaskCancelledNotification::TaskCancelledNotification(Task* pTask):
 {
 }
 
-	
+
 TaskCancelledNotification::~TaskCancelledNotification()
 {
 }
@@ -58,7 +58,7 @@ TaskFinishedNotification::TaskFinishedNotification(Task* pTask):
 {
 }
 
-	
+
 TaskFinishedNotification::~TaskFinishedNotification()
 {
 }
@@ -70,7 +70,7 @@ TaskFailedNotification::TaskFailedNotification(Task* pTask, const Exception& exc
 {
 }
 
-	
+
 TaskFailedNotification::~TaskFailedNotification()
 {
 	delete _pException;
@@ -83,7 +83,7 @@ TaskProgressNotification::TaskProgressNotification(Task* pTask, float progress):
 {
 }
 
-	
+
 TaskProgressNotification::~TaskProgressNotification()
 {
 }
diff --git a/Foundation/src/TeeStream.cpp b/Foundation/src/TeeStream.cpp
index b3ef72b70..da789b025 100644
--- a/Foundation/src/TeeStream.cpp
+++ b/Foundation/src/TeeStream.cpp
@@ -18,19 +18,19 @@
 namespace Poco {
 
 
-TeeStreamBuf::TeeStreamBuf(): 
+TeeStreamBuf::TeeStreamBuf():
 	_pIstr(0)
 {
 }
 
 
-TeeStreamBuf::TeeStreamBuf(std::istream& istr): 
+TeeStreamBuf::TeeStreamBuf(std::istream& istr):
 	_pIstr(&istr)
 {
 }
 
 
-TeeStreamBuf::TeeStreamBuf(std::ostream& ostr): 
+TeeStreamBuf::TeeStreamBuf(std::ostream& ostr):
 	_pIstr(0)
 {
 	_streams.push_back(&ostr);
diff --git a/Foundation/src/TemporaryFile.cpp b/Foundation/src/TemporaryFile.cpp
index c341256a5..96f4445bb 100644
--- a/Foundation/src/TemporaryFile.cpp
+++ b/Foundation/src/TemporaryFile.cpp
@@ -70,15 +70,15 @@ private:
 };
 
 
-TemporaryFile::TemporaryFile(): 
-	File(tempName()), 
+TemporaryFile::TemporaryFile():
+	File(tempName()),
 	_keep(false)
 {
 }
 
 
-TemporaryFile::TemporaryFile(const std::string& tempDir): 
-	File(tempName(tempDir)), 
+TemporaryFile::TemporaryFile(const std::string& tempDir):
+	File(tempName(tempDir)),
 	_keep(false)
 {
 }
@@ -120,7 +120,7 @@ void TemporaryFile::keepUntilExit()
 }
 
 
-namespace 
+namespace
 {
 	static TempFileCollector fc;
 }
diff --git a/Foundation/src/TextBufferIterator.cpp b/Foundation/src/TextBufferIterator.cpp
index f6338ab26..2534b3e80 100644
--- a/Foundation/src/TextBufferIterator.cpp
+++ b/Foundation/src/TextBufferIterator.cpp
@@ -86,7 +86,7 @@ TextBufferIterator& TextBufferIterator::operator = (const TextBufferIterator& it
 }
 
 
-void TextBufferIterator::swap(TextBufferIterator& it)
+void TextBufferIterator::swap(TextBufferIterator& it) noexcept
 {
 	std::swap(_pEncoding, it._pEncoding);
 	std::swap(_it, it._it);
@@ -99,7 +99,7 @@ int TextBufferIterator::operator * () const
 	poco_check_ptr (_pEncoding);
 	poco_assert (_it != _end);
 	const char* it = _it;
-	
+
 	unsigned char buffer[TextEncoding::MAX_SEQUENCE_LENGTH];
 	unsigned char* p = buffer;
 
@@ -114,9 +114,9 @@ int TextBufferIterator::operator * () const
 	while (-1 > n && (_end - it) >= -n - read)
 	{
 		while (read < -n && it != _end)
-		{ 
-			*p++ = *it++; 
-			read++; 
+		{
+			*p++ = *it++;
+			read++;
 		}
 		n = _pEncoding->queryConvert(buffer, read);
 	}
@@ -131,12 +131,12 @@ int TextBufferIterator::operator * () const
 	}
 }
 
-	
+
 TextBufferIterator& TextBufferIterator::operator ++ ()
 {
 	poco_check_ptr (_pEncoding);
 	poco_assert (_it != _end);
-	
+
 	unsigned char buffer[TextEncoding::MAX_SEQUENCE_LENGTH];
 	unsigned char* p = buffer;
 
@@ -151,16 +151,16 @@ TextBufferIterator& TextBufferIterator::operator ++ ()
 	while (-1 > n && (_end - _it) >= -n - read)
 	{
 		while (read < -n && _it != _end)
-		{ 
-			*p++ = *_it++; 
-			read++; 
+		{
+			*p++ = *_it++;
+			read++;
 		}
 		n = _pEncoding->sequenceLength(buffer, read);
 	}
 	while (read < n && _it != _end)
-	{ 
-		_it++; 
-		read++; 
+	{
+		_it++;
+		read++;
 	}
 
 	return *this;
diff --git a/Foundation/src/TextConverter.cpp b/Foundation/src/TextConverter.cpp
index 59194ed77..1e1d98968 100644
--- a/Foundation/src/TextConverter.cpp
+++ b/Foundation/src/TextConverter.cpp
@@ -71,7 +71,7 @@ int TextConverter::convert(const void* source, int length, std::string& destinat
 	const unsigned char* it  = (const unsigned char*) source;
 	const unsigned char* end = (const unsigned char*) source + length;
 	unsigned char buffer[TextEncoding::MAX_SEQUENCE_LENGTH];
-	
+
 	while (it < end)
 	{
 		int n = _inEncoding.queryConvert(it, 1);
diff --git a/Foundation/src/TextEncoding.cpp b/Foundation/src/TextEncoding.cpp
index cfd1c77ef..1e1f3d075 100644
--- a/Foundation/src/TextEncoding.cpp
+++ b/Foundation/src/TextEncoding.cpp
@@ -70,25 +70,25 @@ public:
 	void add(TextEncoding::Ptr pEncoding, const std::string& name)
 	{
 		RWLock::ScopedLock lock(_lock, true);
-	
+
 		_encodings[name] = pEncoding;
 	}
 
 	void remove(const std::string& name)
 	{
 		RWLock::ScopedLock lock(_lock, true);
-	
+
 		_encodings.erase(name);
 	}
-	
+
 	TextEncoding::Ptr find(const std::string& name) const
 	{
 		RWLock::ScopedLock lock(_lock);
-		
+
 		EncodingMap::const_iterator it = _encodings.find(name);
 		if (it != _encodings.end())
 			return it->second;
-		
+
 		for (it = _encodings.begin(); it != _encodings.end(); ++it)
 		{
 			if (it->second->isA(name))
@@ -100,9 +100,9 @@ public:
 private:
 	TextEncodingManager(const TextEncodingManager&);
 	TextEncodingManager& operator = (const TextEncodingManager&);
-	
+
 	typedef std::map<std::string, TextEncoding::Ptr, CILess> EncodingMap;
-	
+
 	EncodingMap    _encodings;
 	mutable RWLock _lock;
 };
@@ -154,7 +154,7 @@ TextEncoding& TextEncoding::byName(const std::string& encodingName)
 		throw NotFoundException(encodingName);
 }
 
-	
+
 TextEncoding::Ptr TextEncoding::find(const std::string& encodingName)
 {
 	return manager().find(encodingName);
diff --git a/Foundation/src/TextIterator.cpp b/Foundation/src/TextIterator.cpp
index 2f6a5c102..eae2ef5dd 100644
--- a/Foundation/src/TextIterator.cpp
+++ b/Foundation/src/TextIterator.cpp
@@ -83,7 +83,7 @@ TextIterator& TextIterator::operator = (const TextIterator& it)
 }
 
 
-void TextIterator::swap(TextIterator& it)
+void TextIterator::swap(TextIterator& it) noexcept
 {
 	std::swap(_pEncoding, it._pEncoding);
 	std::swap(_it, it._it);
@@ -96,7 +96,7 @@ int TextIterator::operator * () const
 	poco_check_ptr (_pEncoding);
 	poco_assert (_it != _end);
 	std::string::const_iterator it = _it;
-	
+
 	unsigned char buffer[TextEncoding::MAX_SEQUENCE_LENGTH];
 	unsigned char* p = buffer;
 
@@ -111,9 +111,9 @@ int TextIterator::operator * () const
 	while (-1 > n && (_end - it) >= -n - read)
 	{
 		while (read < -n && it != _end)
-		{ 
-			*p++ = *it++; 
-			read++; 
+		{
+			*p++ = *it++;
+			read++;
 		}
 		n = _pEncoding->queryConvert(buffer, read);
 	}
@@ -128,12 +128,12 @@ int TextIterator::operator * () const
 	}
 }
 
-	
+
 TextIterator& TextIterator::operator ++ ()
 {
 	poco_check_ptr (_pEncoding);
 	poco_assert (_it != _end);
-	
+
 	unsigned char buffer[TextEncoding::MAX_SEQUENCE_LENGTH];
 	unsigned char* p = buffer;
 
@@ -148,16 +148,16 @@ TextIterator& TextIterator::operator ++ ()
 	while (-1 > n && (_end - _it) >= -n - read)
 	{
 		while (read < -n && _it != _end)
-		{ 
-			*p++ = *_it++; 
-			read++; 
+		{
+			*p++ = *_it++;
+			read++;
 		}
 		n = _pEncoding->sequenceLength(buffer, read);
 	}
 	while (read < n && _it != _end)
-	{ 
-		_it++; 
-		read++; 
+	{
+		_it++;
+		read++;
 	}
 
 	return *this;
diff --git a/Foundation/src/ThreadLocal.cpp b/Foundation/src/ThreadLocal.cpp
index 64060a083..aa1fb2ff8 100644
--- a/Foundation/src/ThreadLocal.cpp
+++ b/Foundation/src/ThreadLocal.cpp
@@ -39,7 +39,7 @@ ThreadLocalStorage::~ThreadLocalStorage()
 {
 	for (auto& p: _map)
 	{
-		delete p.second;	
+		delete p.second;
 	}
 }
 
diff --git a/Foundation/src/ThreadPool.cpp b/Foundation/src/ThreadPool.cpp
index 4665b0045..028370f66 100644
--- a/Foundation/src/ThreadPool.cpp
+++ b/Foundation/src/ThreadPool.cpp
@@ -57,11 +57,11 @@ private:
 };
 
 
-PooledThread::PooledThread(const std::string& name, int stackSize): 
-	_idle(true), 
-	_idleTime(0), 
-	_pTarget(0), 
-	_name(name), 
+PooledThread::PooledThread(const std::string& name, int stackSize):
+	_idle(true),
+	_idleTime(0),
+	_pTarget(0),
+	_name(name),
 	_thread(name),
 	_targetCompleted(false)
 {
@@ -90,7 +90,7 @@ void PooledThread::start()
 void PooledThread::start(Thread::Priority priority, Runnable& target)
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	poco_assert (_pTarget == 0);
 
 	_pTarget = &target;
@@ -116,7 +116,7 @@ void PooledThread::start(Thread::Priority priority, Runnable& target, const std:
 	}
 	_thread.setName(fullName);
 	_thread.setPriority(priority);
-	
+
 	poco_assert (_pTarget == 0);
 
 	_pTarget = &target;
@@ -139,7 +139,7 @@ int PooledThread::idleTime()
 	return (int) (wceex_time(NULL) - _idleTime);
 #else
 	return (int) (time(NULL) - _idleTime);
-#endif	
+#endif
 }
 
 
@@ -156,7 +156,7 @@ void PooledThread::join()
 void PooledThread::activate()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	poco_assert (_idle);
 	_idle = false;
 	_targetCompleted.reset();
@@ -166,7 +166,7 @@ void PooledThread::activate()
 void PooledThread::release()
 {
 	const long JOIN_TIMEOUT = 10000;
-	
+
 	_mutex.lock();
 	_pTarget = 0;
 	_mutex.unlock();
@@ -216,7 +216,7 @@ void PooledThread::run()
 			_idleTime = wceex_time(NULL);
 #else
 			_idleTime = time(NULL);
-#endif	
+#endif
 			_idle     = true;
 			_targetCompleted.set();
 			ThreadLocalStorage::clear();
@@ -235,9 +235,9 @@ void PooledThread::run()
 ThreadPool::ThreadPool(int minCapacity,
 	int maxCapacity,
 	int idleTime,
-	int stackSize): 
-	_minCapacity(minCapacity), 
-	_maxCapacity(maxCapacity), 
+	int stackSize):
+	_minCapacity(minCapacity),
+	_maxCapacity(maxCapacity),
 	_idleTime(idleTime),
 	_serial(0),
 	_age(0),
@@ -260,8 +260,8 @@ ThreadPool::ThreadPool(const std::string& name,
 	int idleTime,
 	int stackSize):
 	_name(name),
-	_minCapacity(minCapacity), 
-	_maxCapacity(maxCapacity), 
+	_minCapacity(minCapacity),
+	_maxCapacity(maxCapacity),
 	_idleTime(idleTime),
 	_serial(0),
 	_age(0),
@@ -408,15 +408,15 @@ void ThreadPool::housekeep()
 	ThreadVec activeThreads;
 	idleThreads.reserve(_threads.size());
 	activeThreads.reserve(_threads.size());
-	
+
 	for (auto pThread: _threads)
 	{
 		if (pThread->idle())
 		{
 			if (pThread->idleTime() < _idleTime)
 				idleThreads.push_back(pThread);
-			else 
-				expiredThreads.push_back(pThread);	
+			else
+				expiredThreads.push_back(pThread);
 		}
 		else activeThreads.push_back(pThread);
 	}
@@ -496,7 +496,7 @@ public:
 	ThreadPool* pool()
 	{
 		FastMutex::ScopedLock lock(_mutex);
-		
+
 		if (!_pPool)
 		{
 			_pPool = new ThreadPool("default");
@@ -505,7 +505,7 @@ public:
 		}
 		return _pPool;
 	}
-	
+
 private:
 	ThreadPool* _pPool;
 	FastMutex   _mutex;
diff --git a/Foundation/src/Thread_POSIX.cpp b/Foundation/src/Thread_POSIX.cpp
index 477501245..ceab76e82 100644
--- a/Foundation/src/Thread_POSIX.cpp
+++ b/Foundation/src/Thread_POSIX.cpp
@@ -62,9 +62,6 @@ namespace
 #endif
 
 
-#if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES)
-
-
 namespace {
 void setThreadName(pthread_t thread, const std::string& threadName)
 {
@@ -83,9 +80,6 @@ void setThreadName(pthread_t thread, const std::string& threadName)
 }
 
 
-#endif
-
-
 namespace Poco {
 
 
@@ -188,8 +182,11 @@ void ThreadImpl::setStackSizeImpl(int size)
 
 void ThreadImpl::startImpl(SharedPtr<Runnable> pTarget)
 {
-	if (_pData->pRunnableTarget)
-		throw SystemException("thread already running");
+	{
+		FastMutex::ScopedLock l(_pData->mutex);
+		if (_pData->pRunnableTarget)
+			throw SystemException("thread already running");
+	}
 
 	pthread_attr_t attributes;
 	pthread_attr_init(&attributes);
@@ -203,12 +200,15 @@ void ThreadImpl::startImpl(SharedPtr<Runnable> pTarget)
 		}
 	}
 
-	_pData->pRunnableTarget = pTarget;
-	if (pthread_create(&_pData->thread, &attributes, runnableEntry, this))
 	{
-		_pData->pRunnableTarget = 0;
-		pthread_attr_destroy(&attributes);
-		throw SystemException("cannot start thread");
+		FastMutex::ScopedLock l(_pData->mutex);
+		_pData->pRunnableTarget = pTarget;
+		if (pthread_create(&_pData->thread, &attributes, runnableEntry, this))
+		{
+			_pData->pRunnableTarget = 0;
+			pthread_attr_destroy(&attributes);
+			throw SystemException("cannot start thread");
+		}
 	}
 	_pData->started = true;
 	pthread_attr_destroy(&attributes);
@@ -351,9 +351,7 @@ void* ThreadImpl::runnableEntry(void* pThread)
 #endif
 
 	ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread);
-#if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES)
 	setThreadName(pThreadImpl->_pData->thread, reinterpret_cast<Thread*>(pThread)->getName());
-#endif
 	AutoPtr<ThreadData> pData = pThreadImpl->_pData;
 	try
 	{
@@ -372,6 +370,7 @@ void* ThreadImpl::runnableEntry(void* pThread)
 		ErrorHandler::handle();
 	}
 
+	FastMutex::ScopedLock l(pData->mutex);
 	pData->pRunnableTarget = 0;
 	pData->done.set();
 	return 0;
diff --git a/Foundation/src/Thread_VX.cpp b/Foundation/src/Thread_VX.cpp
index 659bee4b1..9cefd4312 100644
--- a/Foundation/src/Thread_VX.cpp
+++ b/Foundation/src/Thread_VX.cpp
@@ -31,7 +31,7 @@ ThreadImpl::ThreadImpl():
 {
 }
 
-			
+
 ThreadImpl::~ThreadImpl()
 {
 }
@@ -91,7 +91,7 @@ void ThreadImpl::startImpl(Runnable& target)
 		throw SystemException("thread already running");
 
 	_pData->pRunnableTarget = &target;
-	
+
 	int stackSize = _pData->stackSize == 0 ? DEFAULT_THREAD_STACK_SIZE : _pData->stackSize;
 	int id = taskSpawn(NULL, _pData->osPrio, VX_FP_TASK, stackSize, reinterpret_cast<FUNCPTR>(runnableEntry), reinterpret_cast<int>(this), 0, 0, 0, 0, 0, 0, 0, 0, 0);
 	if (id == ERROR)
diff --git a/Foundation/src/Thread_WIN32.cpp b/Foundation/src/Thread_WIN32.cpp
index 43078c936..15bb65667 100644
--- a/Foundation/src/Thread_WIN32.cpp
+++ b/Foundation/src/Thread_WIN32.cpp
@@ -23,12 +23,12 @@
 
 namespace
 {
-	/// See <http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx> 
+	/// See <http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx>
 	/// and <http://blogs.msdn.com/b/stevejs/archive/2005/12/19/505815.aspx> for
 	/// more information on the code below.
 
 	const DWORD MS_VC_EXCEPTION = 0x406D1388;
-	
+
 	#pragma pack(push,8)
 	typedef struct tagTHREADNAME_INFO
 	{
@@ -38,7 +38,7 @@ namespace
 		DWORD dwFlags;    // Reserved for future use, must be zero.
 	} THREADNAME_INFO;
 	#pragma pack(pop)
-	
+
 	void setThreadName(DWORD dwThreadID, const char* threadName)
 	{
         THREADNAME_INFO info;
@@ -46,7 +46,7 @@ namespace
         info.szName     = threadName;
         info.dwThreadID = dwThreadID;
         info.dwFlags    = 0;
-    
+
         __try
         {
             RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
diff --git a/Foundation/src/Thread_WINCE.cpp b/Foundation/src/Thread_WINCE.cpp
index cfaefb97d..310f89419 100644
--- a/Foundation/src/Thread_WINCE.cpp
+++ b/Foundation/src/Thread_WINCE.cpp
@@ -32,7 +32,7 @@ ThreadImpl::ThreadImpl():
 {
 }
 
-			
+
 ThreadImpl::~ThreadImpl()
 {
 	if (_thread) CloseHandle(_thread);
diff --git a/Foundation/src/TimedNotificationQueue.cpp b/Foundation/src/TimedNotificationQueue.cpp
index 8160bb90d..59f92c7da 100644
--- a/Foundation/src/TimedNotificationQueue.cpp
+++ b/Foundation/src/TimedNotificationQueue.cpp
@@ -132,7 +132,7 @@ Notification* TimedNotificationQueue::waitDequeueNotification(long milliseconds)
 				{
 					return dequeueOne(it).duplicate();
 				}
-				else 
+				else
 				{
 					milliseconds -= static_cast<long>((now.elapsed() + 999)/1000);
 					continue;
@@ -176,7 +176,7 @@ bool TimedNotificationQueue::empty() const
 	return _nfQueue.empty();
 }
 
-	
+
 int TimedNotificationQueue::size() const
 {
 	FastMutex::ScopedLock lock(_mutex);
@@ -187,7 +187,7 @@ int TimedNotificationQueue::size() const
 void TimedNotificationQueue::clear()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	_nfQueue.clear();	
+	_nfQueue.clear();
 }
 
 
diff --git a/Foundation/src/Timer.cpp b/Foundation/src/Timer.cpp
index df1638455..833645278 100644
--- a/Foundation/src/Timer.cpp
+++ b/Foundation/src/Timer.cpp
@@ -21,8 +21,8 @@
 namespace Poco {
 
 
-Timer::Timer(long startInterval, long periodicInterval): 
-	_startInterval(startInterval), 
+Timer::Timer(long startInterval, long periodicInterval):
+	_startInterval(startInterval),
 	_periodicInterval(periodicInterval),
 	_skipped(0),
 	_pCallback(0)
@@ -66,8 +66,8 @@ void Timer::start(const AbstractTimerCallback& method, Thread::Priority priority
 {
 	Clock nextInvocation;
 	nextInvocation += static_cast<Clock::ClockVal>(_startInterval)*1000;
-	
-	FastMutex::ScopedLock lock(_mutex);	
+
+	FastMutex::ScopedLock lock(_mutex);
 
 	if (_pCallback)
 	{
diff --git a/Foundation/src/Timespan.cpp b/Foundation/src/Timespan.cpp
index 4397314cd..49f14bf95 100644
--- a/Foundation/src/Timespan.cpp
+++ b/Foundation/src/Timespan.cpp
@@ -31,7 +31,7 @@ Timespan::Timespan():
 {
 }
 
-	
+
 Timespan::Timespan(TimeDiff microSeconds):
 	_span(microSeconds)
 {
@@ -43,7 +43,7 @@ Timespan::Timespan(long seconds, long microSeconds):
 {
 }
 
-	
+
 Timespan::Timespan(int days, int hours, int minutes, int seconds, int microSeconds):
 	_span(TimeDiff(microSeconds) + TimeDiff(seconds)*SECONDS + TimeDiff(minutes)*MINUTES + TimeDiff(hours)*HOURS + TimeDiff(days)*DAYS)
 {
@@ -84,7 +84,7 @@ Timespan& Timespan::assign(long seconds, long microSeconds)
 }
 
 
-void Timespan::swap(Timespan& timespan)
+void Timespan::swap(Timespan& timespan) noexcept
 {
 	std::swap(_span, timespan._span);
 }
diff --git a/Foundation/src/Timestamp.cpp b/Foundation/src/Timestamp.cpp
index aca1e3494..da05a56bf 100644
--- a/Foundation/src/Timestamp.cpp
+++ b/Foundation/src/Timestamp.cpp
@@ -192,7 +192,7 @@ Timestamp& Timestamp::operator = (TimeVal tv)
 }
 
 
-void Timestamp::swap(Timestamp& timestamp)
+void Timestamp::swap(Timestamp& timestamp) noexcept
 {
 	std::swap(_ts, timestamp._ts);
 }
diff --git a/Foundation/src/Token.cpp b/Foundation/src/Token.cpp
index 98e8bb25e..c15b9a4e6 100644
--- a/Foundation/src/Token.cpp
+++ b/Foundation/src/Token.cpp
@@ -47,7 +47,7 @@ Token::Class Token::tokenClass() const
 	return INVALID_TOKEN;
 }
 
-		
+
 std::string Token::asString() const
 {
 	return _value;
diff --git a/Foundation/src/URI.cpp b/Foundation/src/URI.cpp
index 025161ae7..e64629fb2 100644
--- a/Foundation/src/URI.cpp
+++ b/Foundation/src/URI.cpp
@@ -197,7 +197,7 @@ URI& URI::operator = (const char* uri)
 }
 
 
-void URI::swap(URI& uri)
+void URI::swap(URI& uri) noexcept
 {
 	std::swap(_scheme, uri._scheme);
 	std::swap(_userInfo, uri._userInfo);
@@ -257,7 +257,7 @@ std::string URI::toString() const
 	if (!_fragment.empty())
 	{
 		uri += '#';
-		encode(_fragment, RESERVED_FRAGMENT, uri);
+		uri.append(_fragment);
 	}
 	return uri;
 }
@@ -370,7 +370,7 @@ std::string URI::getQuery() const
 }
 
 
-URI::QueryParameters URI::getQueryParameters() const
+URI::QueryParameters URI::getQueryParameters(bool plusIsSpace) const
 {
 	QueryParameters result;
 	std::string::const_iterator it(_query.begin());
@@ -381,7 +381,7 @@ URI::QueryParameters URI::getQueryParameters() const
 		std::string value;
 		while (it != end && *it != '=' && *it != '&')
 		{
-			if (*it == '+')
+			if (plusIsSpace && (*it == '+'))
 				name += ' ';
 			else
 				name += *it;
@@ -392,7 +392,7 @@ URI::QueryParameters URI::getQueryParameters() const
 			++it;
 			while (it != end && *it != '&')
 			{
-				if (*it == '+')
+				if (plusIsSpace && (*it == '+'))
 					value += ' ';
 				else
 					value += *it;
@@ -420,10 +420,24 @@ void URI::setQueryParameters(const QueryParameters& params)
 }
 
 
+std::string URI::getFragment() const
+{
+	std::string fragment;
+	decode(_fragment, fragment);
+	return fragment;
+}
+
+
 void URI::setFragment(const std::string& fragment)
 {
 	_fragment.clear();
-	decode(fragment, _fragment);
+	encode(fragment, RESERVED_FRAGMENT, _fragment);
+}
+
+
+void URI::setRawFragment(const std::string& fragment)
+{
+	_fragment = fragment;
 }
 
 
@@ -450,7 +464,7 @@ std::string URI::getPathEtc() const
 	if (!_fragment.empty())
 	{
 		pathEtc += '#';
-		encode(_fragment, RESERVED_FRAGMENT, pathEtc);
+		pathEtc += _fragment;
 	}
 	return pathEtc;
 }
@@ -882,9 +896,8 @@ void URI::parseQuery(std::string::const_iterator& it, const std::string::const_i
 
 void URI::parseFragment(std::string::const_iterator& it, const std::string::const_iterator& end)
 {
-	std::string fragment;
-	while (it != end) fragment += *it++;
-	decode(fragment, _fragment);
+	_fragment.clear();
+	while (it != end) _fragment += *it++;
 }
 
 
diff --git a/Foundation/src/URIStreamFactory.cpp b/Foundation/src/URIStreamFactory.cpp
index 7d67514db..c0ebd2361 100644
--- a/Foundation/src/URIStreamFactory.cpp
+++ b/Foundation/src/URIStreamFactory.cpp
@@ -49,7 +49,7 @@ URIRedirection& URIRedirection::operator = (const URIRedirection& redir)
 }
 
 
-void URIRedirection::swap(URIRedirection& redir)
+void URIRedirection::swap(URIRedirection& redir) noexcept
 {
 	std::swap(_uri, redir._uri);
 }
diff --git a/Foundation/src/URIStreamOpener.cpp b/Foundation/src/URIStreamOpener.cpp
index 18d30c3bb..4bb8cfdff 100644
--- a/Foundation/src/URIStreamOpener.cpp
+++ b/Foundation/src/URIStreamOpener.cpp
@@ -77,7 +77,7 @@ std::istream* URIStreamOpener::open(const std::string& pathOrURI) const
 		Path path;
 		if (path.tryParse(pathOrURI, Path::PATH_GUESS))
 			return openFile(path);
-		else 
+		else
 			throw;
 	}
 }
@@ -123,7 +123,7 @@ std::istream* URIStreamOpener::open(const std::string& basePathOrURI, const std:
 	}
 }
 
-	
+
 void URIStreamOpener::registerStreamFactory(const std::string& scheme, URIStreamFactory* pFactory)
 {
 	poco_check_ptr (pFactory);
@@ -140,7 +140,7 @@ void URIStreamOpener::registerStreamFactory(const std::string& scheme, URIStream
 void URIStreamOpener::unregisterStreamFactory(const std::string& scheme)
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	FactoryMap::iterator it = _map.find(scheme);
 	if (it != _map.end())
 	{
@@ -183,7 +183,7 @@ std::istream* URIStreamOpener::openURI(const std::string& scheme, const URI& uri
 	std::string actualScheme(scheme);
 	URI actualURI(uri);
 	int redirects = 0;
-	
+
 	while (redirects < MAX_REDIRECTS)
 	{
 		try
diff --git a/Foundation/src/UUID.cpp b/Foundation/src/UUID.cpp
index 0fc15dd6d..d42494bab 100644
--- a/Foundation/src/UUID.cpp
+++ b/Foundation/src/UUID.cpp
@@ -22,8 +22,8 @@
 namespace Poco {
 
 
-UUID::UUID(): 
-	_timeLow(0), 
+UUID::UUID():
+	_timeLow(0),
 	_timeMid(0),
 	_timeHiAndVersion(0),
 	_clockSeq(0)
@@ -33,7 +33,7 @@ UUID::UUID():
 
 
 UUID::UUID(const UUID& uuid):
-	_timeLow(uuid._timeLow), 
+	_timeLow(uuid._timeLow),
 	_timeMid(uuid._timeMid),
 	_timeHiAndVersion(uuid._timeHiAndVersion),
 	_clockSeq(uuid._clockSeq)
@@ -47,7 +47,7 @@ UUID::UUID(const std::string& uuid)
 	parse(uuid);
 }
 
-	
+
 UUID::UUID(const char* uuid)
 {
 	poco_check_ptr (uuid);
@@ -109,7 +109,7 @@ UUID& UUID::operator = (const UUID& uuid)
 }
 
 
-void UUID::swap(UUID& uuid)
+void UUID::swap(UUID& uuid) noexcept
 {
 	std::swap(_timeLow, uuid._timeLow);
 	std::swap(_timeMid, uuid._timeMid);
@@ -123,7 +123,7 @@ void UUID::parse(const std::string& uuid)
 {
 	if (!tryParse(uuid))
 		throw SyntaxException(uuid);
-}	
+}
 
 
 bool UUID::tryParse(const std::string& uuid)
@@ -134,12 +134,12 @@ bool UUID::tryParse(const std::string& uuid)
 	bool haveHyphens = false;
 	if (uuid[8] == '-' && uuid[13] == '-' && uuid[18] == '-' && uuid[23] == '-')
 	{
-		if (uuid.size() >= 36) 
+		if (uuid.size() >= 36)
 			haveHyphens = true;
 		else
 			return false;
 	}
-	
+
 	UUID newUUID;
 	std::string::const_iterator it = uuid.begin();
 	newUUID._timeLow = 0;
@@ -181,7 +181,7 @@ bool UUID::tryParse(const std::string& uuid)
 		Int16 n2 = nibble(*it++);
 		if (n2 < 0) return false;
 
-		newUUID._node[i] = (n1 << 4) | n2;			
+		newUUID._node[i] = (n1 << 4) | n2;
 	}
 	swap(newUUID);
 
@@ -265,16 +265,16 @@ int UUID::compare(const UUID& uuid) const
 	if (_clockSeq != uuid._clockSeq) return _clockSeq < uuid._clockSeq ? -1 : 1;
 	for (int i = 0; i < sizeof(_node); ++i)
 	{
-		if (_node[i] < uuid._node[i]) 
+		if (_node[i] < uuid._node[i])
 			return -1;
 		else if (_node[i] > uuid._node[i])
-			return 1;	
+			return 1;
 	}
 	return 0;
 }
 
 
-void UUID::appendHex(std::string& str, UInt8 n) 
+void UUID::appendHex(std::string& str, UInt8 n)
 {
 	static const char* digits = "0123456789abcdef";
 	str += digits[(n >> 4) & 0xF];
@@ -348,7 +348,7 @@ const UUID& UUID::dns()
 	return uuidDNS;
 }
 
-	
+
 const UUID& UUID::uri()
 {
 	return uuidURI;
diff --git a/Foundation/src/Unicode.cpp b/Foundation/src/Unicode.cpp
index 172158d37..93dbf4f27 100644
--- a/Foundation/src/Unicode.cpp
+++ b/Foundation/src/Unicode.cpp
@@ -17,8 +17,8 @@
 
 extern "C"
 {
-#include "pcre_config.h"
-#include "pcre_internal.h"
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
 }
 
 
@@ -29,7 +29,7 @@ void Unicode::properties(int ch, CharacterProperties& props)
 {
 	if (ch > UCP_MAX_CODEPOINT) ch = 0;
 	const ucd_record* ucd = GET_UCD(ch);
-	props.category = static_cast<CharacterCategory>(_pcre_ucp_gentype[ucd->chartype]);
+	props.category = static_cast<CharacterCategory>(PRIV(ucp_gentype_8)[ucd->chartype]);
 	props.type     = static_cast<CharacterType>(ucd->chartype);
 	props.script   = static_cast<Script>(ucd->script);
 }
diff --git a/Foundation/src/UnicodeConverter.cpp b/Foundation/src/UnicodeConverter.cpp
index 992c644c6..7ca9454b7 100644
--- a/Foundation/src/UnicodeConverter.cpp
+++ b/Foundation/src/UnicodeConverter.cpp
@@ -69,7 +69,7 @@ void UnicodeConverter::convert(const std::string& utf8String, UTF16String& utf16
 	UTF8Encoding utf8Encoding;
 	TextIterator it(utf8String, utf8Encoding);
 	TextIterator end(utf8String);
-	while (it != end) 
+	while (it != end)
 	{
 		int cc = *it++;
 		if (cc <= 0xffff)
diff --git a/Foundation/src/VarIterator.cpp b/Foundation/src/VarIterator.cpp
index 97ab61b2e..f4f66e395 100644
--- a/Foundation/src/VarIterator.cpp
+++ b/Foundation/src/VarIterator.cpp
@@ -27,7 +27,7 @@ namespace Dynamic {
 const std::size_t VarIterator::POSITION_END = std::numeric_limits<std::size_t>::max();
 
 
-VarIterator::VarIterator(Var* pVar, bool positionEnd): 
+VarIterator::VarIterator(Var* pVar, bool positionEnd):
 	_pVar(pVar),
 	_position(positionEnd ? POSITION_END : 0)
 {
@@ -73,7 +73,7 @@ VarIterator& VarIterator::operator = (VarIterator&& other) noexcept
 void VarIterator::swap(VarIterator& other)
 {
 	using std::swap;
-	
+
 	swap(_pVar, other._pVar);
 	swap(_position, other._position);
 }
diff --git a/Foundation/src/Windows1250Encoding.cpp b/Foundation/src/Windows1250Encoding.cpp
index c57eb179e..764d9e897 100644
--- a/Foundation/src/Windows1250Encoding.cpp
+++ b/Foundation/src/Windows1250Encoding.cpp
@@ -29,17 +29,17 @@ const char* Windows1250Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Windows1250Encoding::_charMap = 
+const TextEncoding::CharacterMap Windows1250Encoding::_charMap =
 {
 	/*          00      01      02      03      04      05      06      07      08      09      0a      0b      0c      0d      0e      0f   */
-	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
-	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
-	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
-	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
-	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
-	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
-	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
-	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
+	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
+	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
 	/* 80 */	0x20ac, 0xfffe, 0x201a, 0xfffe, 0x201e, 0x2026, 0x2020, 0x2021, 0xfffe, 0x2030, 0x0160, 0x2039, 0x015a, 0x0164, 0x017d, 0x0179,
 	/* 90 */	0xfffe, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0xfffe, 0x2122, 0x0161, 0x203a, 0x015b, 0x0165, 0x017e, 0x017a,
 	/* a0 */	0x00a0, 0x02c7, 0x02d8, 0x0141, 0x00a4, 0x0104, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x015e, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x017b,
diff --git a/Foundation/src/Windows1251Encoding.cpp b/Foundation/src/Windows1251Encoding.cpp
index 91f1d23a8..0da8ce065 100644
--- a/Foundation/src/Windows1251Encoding.cpp
+++ b/Foundation/src/Windows1251Encoding.cpp
@@ -32,14 +32,14 @@ const char* Windows1251Encoding::_names[] =
 const TextEncoding::CharacterMap Windows1251Encoding::_charMap =
 {
 	/*          00      01      02      03      04      05      06      07      08      09      0a      0b      0c      0d      0e      0f   */
-	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
-	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
-	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
-	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
-	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
-	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
-	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
-	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
+	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
+	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
 	/* 80 */	0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021, 0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f,
 	/* 90 */	0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0xfffe, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f,
 	/* a0 */	0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7, 0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407,
diff --git a/Foundation/src/Windows1252Encoding.cpp b/Foundation/src/Windows1252Encoding.cpp
index b73a19dd9..1c51cf074 100644
--- a/Foundation/src/Windows1252Encoding.cpp
+++ b/Foundation/src/Windows1252Encoding.cpp
@@ -30,25 +30,25 @@ const char* Windows1252Encoding::_names[] =
 };
 
 
-const TextEncoding::CharacterMap Windows1252Encoding::_charMap = 
+const TextEncoding::CharacterMap Windows1252Encoding::_charMap =
 {
 	/*          00      01      02      03      04      05      06      07      08      09      0a      0b      0c      0d      0e      0f   */
-	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
-	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
-	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
-	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
-	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
-	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
-	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
-	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
-	/* 80 */	0x20ac, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f, 
-	/* 90 */	0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178, 
-	/* a0 */	0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
-	/* b0 */	0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 
-	/* c0 */	0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, 
-	/* d0 */	0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, 
-	/* e0 */	0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 
-	/* f0 */	0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff, 
+	/* 00 */	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+	/* 10 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
+	/* 20 */	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+	/* 30 */	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
+	/* 40 */	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+	/* 50 */	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+	/* 60 */	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+	/* 70 */	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
+	/* 80 */	0x20ac, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f,
+	/* 90 */	0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178,
+	/* a0 */	0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
+	/* b0 */	0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
+	/* c0 */	0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
+	/* d0 */	0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
+	/* e0 */	0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
+	/* f0 */	0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff,
 };
 
 
diff --git a/Foundation/src/WindowsConsoleChannel.cpp b/Foundation/src/WindowsConsoleChannel.cpp
index 358b007ee..3659874b6 100644
--- a/Foundation/src/WindowsConsoleChannel.cpp
+++ b/Foundation/src/WindowsConsoleChannel.cpp
@@ -26,9 +26,9 @@ WindowsConsoleChannel::WindowsConsoleChannel():
 	_isFile(false),
 	_hConsole(INVALID_HANDLE_VALUE)
 {
-	_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+	_hConsole = GetStdHandle(STD_ERROR_HANDLE);
 	// check whether the console has been redirected
-	DWORD mode;	
+	DWORD mode;
 	_isFile = (GetConsoleMode(_hConsole, &mode) == 0);
 }
 
@@ -42,11 +42,11 @@ void WindowsConsoleChannel::log(const Message& msg)
 {
 	std::string text = msg.getText();
 	text += "\r\n";
-	
+
 	if (_isFile)
 	{
 		DWORD written;
-		WriteFile(_hConsole, text.data(), static_cast<DWORD>(text.size()), &written, NULL);	
+		WriteFile(_hConsole, text.data(), static_cast<DWORD>(text.size()), &written, NULL);
 	}
 	else
 	{
@@ -63,9 +63,9 @@ WindowsColorConsoleChannel::WindowsColorConsoleChannel():
 	_isFile(false),
 	_hConsole(INVALID_HANDLE_VALUE)
 {
-	_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+	_hConsole = GetStdHandle(STD_ERROR_HANDLE);
 	// check whether the console has been redirected
-	DWORD mode;	
+	DWORD mode;
 	_isFile = (GetConsoleMode(_hConsole, &mode) == 0);
 	initColors();
 }
@@ -92,7 +92,7 @@ void WindowsColorConsoleChannel::log(const Message& msg)
 	if (_isFile)
 	{
 		DWORD written;
-		WriteFile(_hConsole, text.data(), static_cast<DWORD>(text.size()), &written, NULL);	
+		WriteFile(_hConsole, text.data(), static_cast<DWORD>(text.size()), &written, NULL);
 	}
 	else
 	{
diff --git a/Foundation/src/bignum-dtoa.cc b/Foundation/src/bignum-dtoa.cc
index d99ac2aaf..15123e6a6 100644
--- a/Foundation/src/bignum-dtoa.cc
+++ b/Foundation/src/bignum-dtoa.cc
@@ -35,7 +35,7 @@
 namespace double_conversion {
 
 static int NormalizedExponent(uint64_t significand, int exponent) {
-  ASSERT(significand != 0);
+  DOUBLE_CONVERSION_ASSERT(significand != 0);
   while ((significand & Double::kHiddenBit) == 0) {
     significand = significand << 1;
     exponent = exponent - 1;
@@ -76,26 +76,26 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator,
 // Generates 'requested_digits' after the decimal point.
 static void BignumToFixed(int requested_digits, int* decimal_point,
                           Bignum* numerator, Bignum* denominator,
-                          Vector<char>(buffer), int* length);
+                          Vector<char> buffer, int* length);
 // Generates 'count' digits of numerator/denominator.
 // Once 'count' digits have been produced rounds the result depending on the
 // remainder (remainders of exactly .5 round upwards). Might update the
 // decimal_point when rounding up (for example for 0.9999).
 static void GenerateCountedDigits(int count, int* decimal_point,
                                   Bignum* numerator, Bignum* denominator,
-                                  Vector<char>(buffer), int* length);
+                                  Vector<char> buffer, int* length);
 
 
 void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits,
                 Vector<char> buffer, int* length, int* decimal_point) {
-  ASSERT(v > 0);
-  ASSERT(!Double(v).IsSpecial());
+  DOUBLE_CONVERSION_ASSERT(v > 0);
+  DOUBLE_CONVERSION_ASSERT(!Double(v).IsSpecial());
   uint64_t significand;
   int exponent;
   bool lower_boundary_is_closer;
   if (mode == BIGNUM_DTOA_SHORTEST_SINGLE) {
     float f = static_cast<float>(v);
-    ASSERT(f == v);
+    DOUBLE_CONVERSION_ASSERT(f == v);
     significand = Single(f).Significand();
     exponent = Single(f).Exponent();
     lower_boundary_is_closer = Single(f).LowerBoundaryIsCloser();
@@ -134,7 +134,7 @@ void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits,
   // 4e-324. In this case the denominator needs fewer than 324*4 binary digits.
   // The maximum double is 1.7976931348623157e308 which needs fewer than
   // 308*4 binary digits.
-  ASSERT(Bignum::kMaxSignificantBits >= 324*4);
+  DOUBLE_CONVERSION_ASSERT(Bignum::kMaxSignificantBits >= 324*4);
   InitialScaledStartValues(significand, exponent, lower_boundary_is_closer,
                            estimated_power, need_boundary_deltas,
                            &numerator, &denominator,
@@ -163,7 +163,7 @@ void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits,
                             buffer, length);
       break;
     default:
-      UNREACHABLE();
+      DOUBLE_CONVERSION_UNREACHABLE();
   }
   buffer[*length] = '\0';
 }
@@ -195,7 +195,7 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator,
   for (;;) {
     uint16_t digit;
     digit = numerator->DivideModuloIntBignum(*denominator);
-    ASSERT(digit <= 9);  // digit is a uint16_t and therefore always positive.
+    DOUBLE_CONVERSION_ASSERT(digit <= 9);  // digit is a uint16_t and therefore always positive.
     // digit = numerator / denominator (integer division).
     // numerator = numerator % denominator.
     buffer[(*length)++] = static_cast<char>(digit + '0');
@@ -241,7 +241,7 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator,
         // loop would have stopped earlier.
         // We still have an assert here in case the preconditions were not
         // satisfied.
-        ASSERT(buffer[(*length) - 1] != '9');
+        DOUBLE_CONVERSION_ASSERT(buffer[(*length) - 1] != '9');
         buffer[(*length) - 1]++;
       } else {
         // Halfway case.
@@ -252,7 +252,7 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator,
         if ((buffer[(*length) - 1] - '0') % 2 == 0) {
           // Round down => Do nothing.
         } else {
-          ASSERT(buffer[(*length) - 1] != '9');
+          DOUBLE_CONVERSION_ASSERT(buffer[(*length) - 1] != '9');
           buffer[(*length) - 1]++;
         }
       }
@@ -264,9 +264,9 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator,
       // Round up.
       // Note again that the last digit could not be '9' since this would have
       // stopped the loop earlier.
-      // We still have an ASSERT here, in case the preconditions were not
+      // We still have an DOUBLE_CONVERSION_ASSERT here, in case the preconditions were not
       // satisfied.
-      ASSERT(buffer[(*length) -1] != '9');
+      DOUBLE_CONVERSION_ASSERT(buffer[(*length) -1] != '9');
       buffer[(*length) - 1]++;
       return;
     }
@@ -276,18 +276,18 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator,
 
 // Let v = numerator / denominator < 10.
 // Then we generate 'count' digits of d = x.xxxxx... (without the decimal point)
-// from left to right. Once 'count' digits have been produced we decide wether
+// from left to right. Once 'count' digits have been produced we decide whether
 // to round up or down. Remainders of exactly .5 round upwards. Numbers such
 // as 9.999999 propagate a carry all the way, and change the
 // exponent (decimal_point), when rounding upwards.
 static void GenerateCountedDigits(int count, int* decimal_point,
                                   Bignum* numerator, Bignum* denominator,
                                   Vector<char> buffer, int* length) {
-  ASSERT(count >= 0);
+  DOUBLE_CONVERSION_ASSERT(count >= 0);
   for (int i = 0; i < count - 1; ++i) {
     uint16_t digit;
     digit = numerator->DivideModuloIntBignum(*denominator);
-    ASSERT(digit <= 9);  // digit is a uint16_t and therefore always positive.
+    DOUBLE_CONVERSION_ASSERT(digit <= 9);  // digit is a uint16_t and therefore always positive.
     // digit = numerator / denominator (integer division).
     // numerator = numerator % denominator.
     buffer[i] = static_cast<char>(digit + '0');
@@ -300,7 +300,7 @@ static void GenerateCountedDigits(int count, int* decimal_point,
   if (Bignum::PlusCompare(*numerator, *numerator, *denominator) >= 0) {
     digit++;
   }
-  ASSERT(digit <= 10);
+  DOUBLE_CONVERSION_ASSERT(digit <= 10);
   buffer[count - 1] = static_cast<char>(digit + '0');
   // Correct bad digits (in case we had a sequence of '9's). Propagate the
   // carry until we hat a non-'9' or til we reach the first digit.
@@ -325,7 +325,7 @@ static void GenerateCountedDigits(int count, int* decimal_point,
 // Input verifies:  1 <= (numerator + delta) / denominator < 10.
 static void BignumToFixed(int requested_digits, int* decimal_point,
                           Bignum* numerator, Bignum* denominator,
-                          Vector<char>(buffer), int* length) {
+                          Vector<char> buffer, int* length) {
   // Note that we have to look at more than just the requested_digits, since
   // a number could be rounded up. Example: v=0.5 with requested_digits=0.
   // Even though the power of v equals 0 we can't just stop here.
@@ -341,7 +341,7 @@ static void BignumToFixed(int requested_digits, int* decimal_point,
   } else if (-(*decimal_point) == requested_digits) {
     // We only need to verify if the number rounds down or up.
     // Ex: 0.04 and 0.06 with requested_digits == 1.
-    ASSERT(*decimal_point == -requested_digits);
+    DOUBLE_CONVERSION_ASSERT(*decimal_point == -requested_digits);
     // Initially the fraction lies in range (1, 10]. Multiply the denominator
     // by 10 so that we can compare more easily.
     denominator->Times10();
@@ -370,7 +370,7 @@ static void BignumToFixed(int requested_digits, int* decimal_point,
 // Returns an estimation of k such that 10^(k-1) <= v < 10^k where
 // v = f * 2^exponent and 2^52 <= f < 2^53.
 // v is hence a normalized double with the given exponent. The output is an
-// approximation for the exponent of the decimal approimation .digits * 10^k.
+// approximation for the exponent of the decimal approximation .digits * 10^k.
 //
 // The result might undershoot by 1 in which case 10^k <= v < 10^k+1.
 // Note: this property holds for v's upper boundary m+ too.
@@ -420,7 +420,7 @@ static void InitialScaledStartValuesPositiveExponent(
     Bignum* numerator, Bignum* denominator,
     Bignum* delta_minus, Bignum* delta_plus) {
   // A positive exponent implies a positive power.
-  ASSERT(estimated_power >= 0);
+  DOUBLE_CONVERSION_ASSERT(estimated_power >= 0);
   // Since the estimated_power is positive we simply multiply the denominator
   // by 10^estimated_power.
 
@@ -506,7 +506,7 @@ static void InitialScaledStartValuesNegativeExponentNegativePower(
   // numerator = v * 10^-estimated_power * 2 * 2^-exponent.
   // Remember: numerator has been abused as power_ten. So no need to assign it
   //  to itself.
-  ASSERT(numerator == power_ten);
+  DOUBLE_CONVERSION_ASSERT(numerator == power_ten);
   numerator->MultiplyByUInt64(significand);
 
   // denominator = 2 * 2^-exponent with exponent < 0.
@@ -548,7 +548,7 @@ static void InitialScaledStartValuesNegativeExponentNegativePower(
 //
 // Let ep == estimated_power, then the returned values will satisfy:
 //  v / 10^ep = numerator / denominator.
-//  v's boundarys m- and m+:
+//  v's boundaries m- and m+:
 //    m- / 10^ep == v / 10^ep - delta_minus / denominator
 //    m+ / 10^ep == v / 10^ep + delta_plus / denominator
 //  Or in other words:
diff --git a/Foundation/src/bignum.cc b/Foundation/src/bignum.cc
index d077eef3f..d858c16ca 100644
--- a/Foundation/src/bignum.cc
+++ b/Foundation/src/bignum.cc
@@ -25,141 +25,137 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <algorithm>
+#include <cstring>
+
 #include "bignum.h"
 #include "utils.h"
 
 namespace double_conversion {
 
-Bignum::Bignum()
-    : bigits_buffer_(), bigits_(bigits_buffer_, kBigitCapacity), used_digits_(0), exponent_(0) {
-  for (int i = 0; i < kBigitCapacity; ++i) {
-    bigits_[i] = 0;
-  }
+Bignum::Chunk& Bignum::RawBigit(const int index) {
+  DOUBLE_CONVERSION_ASSERT(static_cast<unsigned>(index) < kBigitCapacity);
+  return bigits_buffer_[index];
+}
+
+
+const Bignum::Chunk& Bignum::RawBigit(const int index) const {
+  DOUBLE_CONVERSION_ASSERT(static_cast<unsigned>(index) < kBigitCapacity);
+  return bigits_buffer_[index];
 }
 
 
 template<typename S>
-static int BitSize(S value) {
+static int BitSize(const S value) {
   (void) value;  // Mark variable as used.
   return 8 * sizeof(value);
 }
 
 // Guaranteed to lie in one Bigit.
-void Bignum::AssignUInt16(uint16_t value) {
-  ASSERT(kBigitSize >= BitSize(value));
+void Bignum::AssignUInt16(const uint16_t value) {
+  DOUBLE_CONVERSION_ASSERT(kBigitSize >= BitSize(value));
   Zero();
-  if (value == 0) return;
-
-  EnsureCapacity(1);
-  bigits_[0] = value;
-  used_digits_ = 1;
+  if (value > 0) {
+    RawBigit(0) = value;
+    used_bigits_ = 1;
+  }
 }
 
 
 void Bignum::AssignUInt64(uint64_t value) {
-  const int kUInt64Size = 64;
-
   Zero();
-  if (value == 0) return;
-
-  int needed_bigits = kUInt64Size / kBigitSize + 1;
-  EnsureCapacity(needed_bigits);
-  for (int i = 0; i < needed_bigits; ++i) {
-    bigits_[i] = value & kBigitMask;
-    value = value >> kBigitSize;
+  for(int i = 0; value > 0; ++i) {
+    RawBigit(i) = value & kBigitMask;
+    value >>= kBigitSize;
+    ++used_bigits_;
   }
-  used_digits_ = needed_bigits;
-  Clamp();
 }
 
 
 void Bignum::AssignBignum(const Bignum& other) {
   exponent_ = other.exponent_;
-  for (int i = 0; i < other.used_digits_; ++i) {
-    bigits_[i] = other.bigits_[i];
+  for (int i = 0; i < other.used_bigits_; ++i) {
+    RawBigit(i) = other.RawBigit(i);
   }
-  // Clear the excess digits (if there were any).
-  for (int i = other.used_digits_; i < used_digits_; ++i) {
-    bigits_[i] = 0;
-  }
-  used_digits_ = other.used_digits_;
+  used_bigits_ = other.used_bigits_;
 }
 
 
-static uint64_t ReadUInt64(Vector<const char> buffer,
-                           int from,
-                           int digits_to_read) {
+static uint64_t ReadUInt64(const Vector<const char> buffer,
+                           const int from,
+                           const int digits_to_read) {
   uint64_t result = 0;
   for (int i = from; i < from + digits_to_read; ++i) {
-    int digit = buffer[i] - '0';
-    ASSERT(0 <= digit && digit <= 9);
+    const int digit = buffer[i] - '0';
+    DOUBLE_CONVERSION_ASSERT(0 <= digit && digit <= 9);
     result = result * 10 + digit;
   }
   return result;
 }
 
 
-void Bignum::AssignDecimalString(Vector<const char> value) {
+void Bignum::AssignDecimalString(const Vector<const char> value) {
   // 2^64 = 18446744073709551616 > 10^19
-  const int kMaxUint64DecimalDigits = 19;
+  static const int kMaxUint64DecimalDigits = 19;
   Zero();
   int length = value.length();
-  unsigned int pos = 0;
+  unsigned pos = 0;
   // Let's just say that each digit needs 4 bits.
   while (length >= kMaxUint64DecimalDigits) {
-    uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits);
+    const uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits);
     pos += kMaxUint64DecimalDigits;
     length -= kMaxUint64DecimalDigits;
     MultiplyByPowerOfTen(kMaxUint64DecimalDigits);
     AddUInt64(digits);
   }
-  uint64_t digits = ReadUInt64(value, pos, length);
+  const uint64_t digits = ReadUInt64(value, pos, length);
   MultiplyByPowerOfTen(length);
   AddUInt64(digits);
   Clamp();
 }
 
 
-static int HexCharValue(char c) {
-  if ('0' <= c && c <= '9') return c - '0';
-  if ('a' <= c && c <= 'f') return 10 + c - 'a';
-  ASSERT('A' <= c && c <= 'F');
+static uint64_t HexCharValue(const int c) {
+  if ('0' <= c && c <= '9') {
+    return c - '0';
+  }
+  if ('a' <= c && c <= 'f') {
+    return 10 + c - 'a';
+  }
+  DOUBLE_CONVERSION_ASSERT('A' <= c && c <= 'F');
   return 10 + c - 'A';
 }
 
 
+// Unlike AssignDecimalString(), this function is "only" used
+// for unit-tests and therefore not performance critical.
 void Bignum::AssignHexString(Vector<const char> value) {
   Zero();
-  int length = value.length();
-
-  int needed_bigits = length * 4 / kBigitSize + 1;
-  EnsureCapacity(needed_bigits);
-  int string_index = length - 1;
-  for (int i = 0; i < needed_bigits - 1; ++i) {
-    // These bigits are guaranteed to be "full".
-    Chunk current_bigit = 0;
-    for (int j = 0; j < kBigitSize / 4; j++) {
-      current_bigit += HexCharValue(value[string_index--]) << (j * 4);
+  // Required capacity could be reduced by ignoring leading zeros.
+  EnsureCapacity(((value.length() * 4) + kBigitSize - 1) / kBigitSize);
+  DOUBLE_CONVERSION_ASSERT(sizeof(uint64_t) * 8 >= kBigitSize + 4);  // TODO: static_assert
+  // Accumulates converted hex digits until at least kBigitSize bits.
+  // Works with non-factor-of-four kBigitSizes.
+  uint64_t tmp = 0;  // Accumulates converted hex digits until at least
+  for (int cnt = 0; !value.is_empty(); value.pop_back()) {
+    tmp |= (HexCharValue(value.last()) << cnt);
+    if ((cnt += 4) >= kBigitSize) {
+      RawBigit(used_bigits_++) = (tmp & kBigitMask);
+      cnt -= kBigitSize;
+      tmp >>= kBigitSize;
     }
-    bigits_[i] = current_bigit;
   }
-  used_digits_ = needed_bigits - 1;
-
-  Chunk most_significant_bigit = 0;  // Could be = 0;
-  for (int j = 0; j <= string_index; ++j) {
-    most_significant_bigit <<= 4;
-    most_significant_bigit += HexCharValue(value[j]);
-  }
-  if (most_significant_bigit != 0) {
-    bigits_[used_digits_] = most_significant_bigit;
-    used_digits_++;
+  if (tmp > 0) {
+    RawBigit(used_bigits_++) = tmp;
   }
   Clamp();
 }
 
 
-void Bignum::AddUInt64(uint64_t operand) {
-  if (operand == 0) return;
+void Bignum::AddUInt64(const uint64_t operand) {
+  if (operand == 0) {
+    return;
+  }
   Bignum other;
   other.AssignUInt64(operand);
   AddBignum(other);
@@ -167,8 +163,8 @@ void Bignum::AddUInt64(uint64_t operand) {
 
 
 void Bignum::AddBignum(const Bignum& other) {
-  ASSERT(IsClamped());
-  ASSERT(other.IsClamped());
+  DOUBLE_CONVERSION_ASSERT(IsClamped());
+  DOUBLE_CONVERSION_ASSERT(other.IsClamped());
 
   // If this has a greater exponent than other append zero-bigits to this.
   // After this call exponent_ <= other.exponent_.
@@ -186,48 +182,52 @@ void Bignum::AddBignum(const Bignum& other) {
   //  cccccccccccc 0000
   // In both cases we might need a carry bigit.
 
-  EnsureCapacity(1 + Max(BigitLength(), other.BigitLength()) - exponent_);
+  EnsureCapacity(1 + (std::max)(BigitLength(), other.BigitLength()) - exponent_);
   Chunk carry = 0;
   int bigit_pos = other.exponent_ - exponent_;
-  ASSERT(bigit_pos >= 0);
-  for (int i = 0; i < other.used_digits_; ++i) {
-    Chunk sum = bigits_[bigit_pos] + other.bigits_[i] + carry;
-    bigits_[bigit_pos] = sum & kBigitMask;
-    carry = sum >> kBigitSize;
-    bigit_pos++;
+  DOUBLE_CONVERSION_ASSERT(bigit_pos >= 0);
+  for (int i = used_bigits_; i < bigit_pos; ++i) {
+    RawBigit(i) = 0;
+  }
+  for (int i = 0; i < other.used_bigits_; ++i) {
+    const Chunk my = (bigit_pos < used_bigits_) ? RawBigit(bigit_pos) : 0;
+    const Chunk sum = my + other.RawBigit(i) + carry;
+    RawBigit(bigit_pos) = sum & kBigitMask;
+    carry = sum >> kBigitSize;
+    ++bigit_pos;
   }
-
   while (carry != 0) {
-    Chunk sum = bigits_[bigit_pos] + carry;
-    bigits_[bigit_pos] = sum & kBigitMask;
+    const Chunk my = (bigit_pos < used_bigits_) ? RawBigit(bigit_pos) : 0;
+    const Chunk sum = my + carry;
+    RawBigit(bigit_pos) = sum & kBigitMask;
     carry = sum >> kBigitSize;
-    bigit_pos++;
+    ++bigit_pos;
   }
-  used_digits_ = Max(bigit_pos, used_digits_);
-  ASSERT(IsClamped());
+  used_bigits_ = (std::max)(bigit_pos, static_cast<int>(used_bigits_));
+  DOUBLE_CONVERSION_ASSERT(IsClamped());
 }
 
 
 void Bignum::SubtractBignum(const Bignum& other) {
-  ASSERT(IsClamped());
-  ASSERT(other.IsClamped());
+  DOUBLE_CONVERSION_ASSERT(IsClamped());
+  DOUBLE_CONVERSION_ASSERT(other.IsClamped());
   // We require this to be bigger than other.
-  ASSERT(LessEqual(other, *this));
+  DOUBLE_CONVERSION_ASSERT(LessEqual(other, *this));
 
   Align(other);
 
-  int offset = other.exponent_ - exponent_;
+  const int offset = other.exponent_ - exponent_;
   Chunk borrow = 0;
   int i;
-  for (i = 0; i < other.used_digits_; ++i) {
-    ASSERT((borrow == 0) || (borrow == 1));
-    Chunk difference = bigits_[i + offset] - other.bigits_[i] - borrow;
-    bigits_[i + offset] = difference & kBigitMask;
+  for (i = 0; i < other.used_bigits_; ++i) {
+    DOUBLE_CONVERSION_ASSERT((borrow == 0) || (borrow == 1));
+    const Chunk difference = RawBigit(i + offset) - other.RawBigit(i) - borrow;
+    RawBigit(i + offset) = difference & kBigitMask;
     borrow = difference >> (kChunkSize - 1);
   }
   while (borrow != 0) {
-    Chunk difference = bigits_[i + offset] - borrow;
-    bigits_[i + offset] = difference & kBigitMask;
+    const Chunk difference = RawBigit(i + offset) - borrow;
+    RawBigit(i + offset) = difference & kBigitMask;
     borrow = difference >> (kChunkSize - 1);
     ++i;
   }
@@ -235,91 +235,105 @@ void Bignum::SubtractBignum(const Bignum& other) {
 }
 
 
-void Bignum::ShiftLeft(int shift_amount) {
-  if (used_digits_ == 0) return;
-  exponent_ += shift_amount / kBigitSize;
-  int local_shift = shift_amount % kBigitSize;
-  EnsureCapacity(used_digits_ + 1);
+void Bignum::ShiftLeft(const int shift_amount) {
+  if (used_bigits_ == 0) {
+    return;
+  }
+  exponent_ += (shift_amount / kBigitSize);
+  const int local_shift = shift_amount % kBigitSize;
+  EnsureCapacity(used_bigits_ + 1);
   BigitsShiftLeft(local_shift);
 }
 
 
-void Bignum::MultiplyByUInt32(uint32_t factor) {
-  if (factor == 1) return;
+void Bignum::MultiplyByUInt32(const uint32_t factor) {
+  if (factor == 1) {
+    return;
+  }
   if (factor == 0) {
     Zero();
     return;
   }
-  if (used_digits_ == 0) return;
-
+  if (used_bigits_ == 0) {
+    return;
+  }
   // The product of a bigit with the factor is of size kBigitSize + 32.
   // Assert that this number + 1 (for the carry) fits into double chunk.
-  ASSERT(kDoubleChunkSize >= kBigitSize + 32 + 1);
+  DOUBLE_CONVERSION_ASSERT(kDoubleChunkSize >= kBigitSize + 32 + 1);
   DoubleChunk carry = 0;
-  for (int i = 0; i < used_digits_; ++i) {
-    DoubleChunk product = static_cast<DoubleChunk>(factor) * bigits_[i] + carry;
-    bigits_[i] = static_cast<Chunk>(product & kBigitMask);
+  for (int i = 0; i < used_bigits_; ++i) {
+    const DoubleChunk product = static_cast<DoubleChunk>(factor) * RawBigit(i) + carry;
+    RawBigit(i) = static_cast<Chunk>(product & kBigitMask);
     carry = (product >> kBigitSize);
   }
   while (carry != 0) {
-    EnsureCapacity(used_digits_ + 1);
-    bigits_[used_digits_] = carry & kBigitMask;
-    used_digits_++;
+    EnsureCapacity(used_bigits_ + 1);
+    RawBigit(used_bigits_) = carry & kBigitMask;
+    used_bigits_++;
     carry >>= kBigitSize;
   }
 }
 
 
-void Bignum::MultiplyByUInt64(uint64_t factor) {
-  if (factor == 1) return;
+void Bignum::MultiplyByUInt64(const uint64_t factor) {
+  if (factor == 1) {
+    return;
+  }
   if (factor == 0) {
     Zero();
     return;
   }
-  ASSERT(kBigitSize < 32);
+  if (used_bigits_ == 0) {
+    return;
+  }
+  DOUBLE_CONVERSION_ASSERT(kBigitSize < 32);
   uint64_t carry = 0;
-  uint64_t low = factor & 0xFFFFFFFF;
-  uint64_t high = factor >> 32;
-  for (int i = 0; i < used_digits_; ++i) {
-    uint64_t product_low = low * bigits_[i];
-    uint64_t product_high = high * bigits_[i];
-    uint64_t tmp = (carry & kBigitMask) + product_low;
-    bigits_[i] = tmp & kBigitMask;
+  const uint64_t low = factor & 0xFFFFFFFF;
+  const uint64_t high = factor >> 32;
+  for (int i = 0; i < used_bigits_; ++i) {
+    const uint64_t product_low = low * RawBigit(i);
+    const uint64_t product_high = high * RawBigit(i);
+    const uint64_t tmp = (carry & kBigitMask) + product_low;
+    RawBigit(i) = tmp & kBigitMask;
     carry = (carry >> kBigitSize) + (tmp >> kBigitSize) +
         (product_high << (32 - kBigitSize));
   }
   while (carry != 0) {
-    EnsureCapacity(used_digits_ + 1);
-    bigits_[used_digits_] = carry & kBigitMask;
-    used_digits_++;
+    EnsureCapacity(used_bigits_ + 1);
+    RawBigit(used_bigits_) = carry & kBigitMask;
+    used_bigits_++;
     carry >>= kBigitSize;
   }
 }
 
 
-void Bignum::MultiplyByPowerOfTen(int exponent) {
-  const uint64_t kFive27 = UINT64_2PART_C(0x6765c793, fa10079d);
-  const uint16_t kFive1 = 5;
-  const uint16_t kFive2 = kFive1 * 5;
-  const uint16_t kFive3 = kFive2 * 5;
-  const uint16_t kFive4 = kFive3 * 5;
-  const uint16_t kFive5 = kFive4 * 5;
-  const uint16_t kFive6 = kFive5 * 5;
-  const uint32_t kFive7 = kFive6 * 5;
-  const uint32_t kFive8 = kFive7 * 5;
-  const uint32_t kFive9 = kFive8 * 5;
-  const uint32_t kFive10 = kFive9 * 5;
-  const uint32_t kFive11 = kFive10 * 5;
-  const uint32_t kFive12 = kFive11 * 5;
-  const uint32_t kFive13 = kFive12 * 5;
-  const uint32_t kFive1_to_12[] =
+void Bignum::MultiplyByPowerOfTen(const int exponent) {
+  static const uint64_t kFive27 = DOUBLE_CONVERSION_UINT64_2PART_C(0x6765c793, fa10079d);
+  static const uint16_t kFive1 = 5;
+  static const uint16_t kFive2 = kFive1 * 5;
+  static const uint16_t kFive3 = kFive2 * 5;
+  static const uint16_t kFive4 = kFive3 * 5;
+  static const uint16_t kFive5 = kFive4 * 5;
+  static const uint16_t kFive6 = kFive5 * 5;
+  static const uint32_t kFive7 = kFive6 * 5;
+  static const uint32_t kFive8 = kFive7 * 5;
+  static const uint32_t kFive9 = kFive8 * 5;
+  static const uint32_t kFive10 = kFive9 * 5;
+  static const uint32_t kFive11 = kFive10 * 5;
+  static const uint32_t kFive12 = kFive11 * 5;
+  static const uint32_t kFive13 = kFive12 * 5;
+  static const uint32_t kFive1_to_12[] =
       { kFive1, kFive2, kFive3, kFive4, kFive5, kFive6,
         kFive7, kFive8, kFive9, kFive10, kFive11, kFive12 };
 
-  ASSERT(exponent >= 0);
-  if (exponent == 0) return;
-  if (used_digits_ == 0) return;
+  DOUBLE_CONVERSION_ASSERT(exponent >= 0);
 
+  if (exponent == 0) {
+    return;
+  }
+  if (used_bigits_ == 0) {
+    return;
+  }
   // We shift by exponent at the end just before returning.
   int remaining_exponent = exponent;
   while (remaining_exponent >= 27) {
@@ -338,8 +352,8 @@ void Bignum::MultiplyByPowerOfTen(int exponent) {
 
 
 void Bignum::Square() {
-  ASSERT(IsClamped());
-  int product_length = 2 * used_digits_;
+  DOUBLE_CONVERSION_ASSERT(IsClamped());
+  const int product_length = 2 * used_bigits_;
   EnsureCapacity(product_length);
 
   // Comba multiplication: compute each column separately.
@@ -354,64 +368,64 @@ void Bignum::Square() {
   //
   // Assert that the additional number of bits in a DoubleChunk are enough to
   // sum up used_digits of Bigit*Bigit.
-  if ((1 << (2 * (kChunkSize - kBigitSize))) <= used_digits_) {
-    UNIMPLEMENTED();
+  if ((1 << (2 * (kChunkSize - kBigitSize))) <= used_bigits_) {
+    DOUBLE_CONVERSION_UNIMPLEMENTED();
   }
   DoubleChunk accumulator = 0;
   // First shift the digits so we don't overwrite them.
-  int copy_offset = used_digits_;
-  for (int i = 0; i < used_digits_; ++i) {
-    bigits_[copy_offset + i] = bigits_[i];
+  const int copy_offset = used_bigits_;
+  for (int i = 0; i < used_bigits_; ++i) {
+    RawBigit(copy_offset + i) = RawBigit(i);
   }
   // We have two loops to avoid some 'if's in the loop.
-  for (int i = 0; i < used_digits_; ++i) {
+  for (int i = 0; i < used_bigits_; ++i) {
     // Process temporary digit i with power i.
     // The sum of the two indices must be equal to i.
     int bigit_index1 = i;
     int bigit_index2 = 0;
     // Sum all of the sub-products.
     while (bigit_index1 >= 0) {
-      Chunk chunk1 = bigits_[copy_offset + bigit_index1];
-      Chunk chunk2 = bigits_[copy_offset + bigit_index2];
+      const Chunk chunk1 = RawBigit(copy_offset + bigit_index1);
+      const Chunk chunk2 = RawBigit(copy_offset + bigit_index2);
       accumulator += static_cast<DoubleChunk>(chunk1) * chunk2;
       bigit_index1--;
       bigit_index2++;
     }
-    bigits_[i] = static_cast<Chunk>(accumulator) & kBigitMask;
+    RawBigit(i) = static_cast<Chunk>(accumulator) & kBigitMask;
     accumulator >>= kBigitSize;
   }
-  for (int i = used_digits_; i < product_length; ++i) {
-    int bigit_index1 = used_digits_ - 1;
+  for (int i = used_bigits_; i < product_length; ++i) {
+    int bigit_index1 = used_bigits_ - 1;
     int bigit_index2 = i - bigit_index1;
     // Invariant: sum of both indices is again equal to i.
     // Inner loop runs 0 times on last iteration, emptying accumulator.
-    while (bigit_index2 < used_digits_) {
-      Chunk chunk1 = bigits_[copy_offset + bigit_index1];
-      Chunk chunk2 = bigits_[copy_offset + bigit_index2];
+    while (bigit_index2 < used_bigits_) {
+      const Chunk chunk1 = RawBigit(copy_offset + bigit_index1);
+      const Chunk chunk2 = RawBigit(copy_offset + bigit_index2);
       accumulator += static_cast<DoubleChunk>(chunk1) * chunk2;
       bigit_index1--;
       bigit_index2++;
     }
-    // The overwritten bigits_[i] will never be read in further loop iterations,
+    // The overwritten RawBigit(i) will never be read in further loop iterations,
     // because bigit_index1 and bigit_index2 are always greater
-    // than i - used_digits_.
-    bigits_[i] = static_cast<Chunk>(accumulator) & kBigitMask;
+    // than i - used_bigits_.
+    RawBigit(i) = static_cast<Chunk>(accumulator) & kBigitMask;
     accumulator >>= kBigitSize;
   }
   // Since the result was guaranteed to lie inside the number the
   // accumulator must be 0 now.
-  ASSERT(accumulator == 0);
+  DOUBLE_CONVERSION_ASSERT(accumulator == 0);
 
   // Don't forget to update the used_digits and the exponent.
-  used_digits_ = product_length;
+  used_bigits_ = product_length;
   exponent_ *= 2;
   Clamp();
 }
 
 
-void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) {
-  ASSERT(base != 0);
-  ASSERT(power_exponent >= 0);
+void Bignum::AssignPowerUInt16(uint16_t base, const int power_exponent) {
+  DOUBLE_CONVERSION_ASSERT(base != 0);
+  DOUBLE_CONVERSION_ASSERT(power_exponent >= 0);
   if (power_exponent == 0) {
     AssignUInt16(1);
     return;
@@ -431,7 +445,7 @@ void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) {
     tmp_base >>= 1;
     bit_size++;
   }
-  int final_size = bit_size * power_exponent;
+  const int final_size = bit_size * power_exponent;
   // 1 extra bigit for the shifting, and one for rounded final_size.
   EnsureCapacity(final_size / kBigitSize + 2);
 
@@ -452,10 +466,10 @@ void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) {
     // Verify that there is enough space in this_value to perform the
     // multiplication.  The first bit_size bits must be 0.
     if ((power_exponent & mask) != 0) {
-      ASSERT(bit_size > 0);
-      uint64_t base_bits_mask =
-          ~((static_cast<uint64_t>(1) << (64 - bit_size)) - 1);
-      bool high_bits_zero = (this_value & base_bits_mask) == 0;
+      DOUBLE_CONVERSION_ASSERT(bit_size > 0);
+      const uint64_t base_bits_mask =
+        ~((static_cast<uint64_t>(1) << (64 - bit_size)) - 1);
+      const bool high_bits_zero = (this_value & base_bits_mask) == 0;
       if (high_bits_zero) {
         this_value *= base;
       } else {
@@ -485,9 +499,9 @@ void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) {
 
 // Precondition: this/other < 16bit.
 uint16_t Bignum::DivideModuloIntBignum(const Bignum& other) {
-  ASSERT(IsClamped());
-  ASSERT(other.IsClamped());
-  ASSERT(other.used_digits_ > 0);
+  DOUBLE_CONVERSION_ASSERT(IsClamped());
+  DOUBLE_CONVERSION_ASSERT(other.IsClamped());
+  DOUBLE_CONVERSION_ASSERT(other.used_bigits_ > 0);
 
   // Easy case: if we have less digits than the divisor than the result is 0.
   // Note: this handles the case where this == 0, too.
@@ -505,34 +519,34 @@ uint16_t Bignum::DivideModuloIntBignum(const Bignum& other) {
     // This naive approach is extremely inefficient if `this` divided by other
     // is big. This function is implemented for doubleToString where
     // the result should be small (less than 10).
-    ASSERT(other.bigits_[other.used_digits_ - 1] >= ((1 << kBigitSize) / 16));
-    ASSERT(bigits_[used_digits_ - 1] < 0x10000);
+    DOUBLE_CONVERSION_ASSERT(other.RawBigit(other.used_bigits_ - 1) >= ((1 << kBigitSize) / 16));
+    DOUBLE_CONVERSION_ASSERT(RawBigit(used_bigits_ - 1) < 0x10000);
     // Remove the multiples of the first digit.
     // Example this = 23 and other equals 9. -> Remove 2 multiples.
-    result += static_cast<uint16_t>(bigits_[used_digits_ - 1]);
-    SubtractTimes(other, bigits_[used_digits_ - 1]);
+    result += static_cast<uint16_t>(RawBigit(used_bigits_ - 1));
+    SubtractTimes(other, RawBigit(used_bigits_ - 1));
   }
 
-  ASSERT(BigitLength() == other.BigitLength());
+  DOUBLE_CONVERSION_ASSERT(BigitLength() == other.BigitLength());
 
   // Both bignums are at the same length now.
   // Since other has more than 0 digits we know that the access to
-  // bigits_[used_digits_ - 1] is safe.
-  Chunk this_bigit = bigits_[used_digits_ - 1];
-  Chunk other_bigit = other.bigits_[other.used_digits_ - 1];
+  // RawBigit(used_bigits_ - 1) is safe.
+  const Chunk this_bigit = RawBigit(used_bigits_ - 1);
+  const Chunk other_bigit = other.RawBigit(other.used_bigits_ - 1);
 
-  if (other.used_digits_ == 1) {
+  if (other.used_bigits_ == 1) {
     // Shortcut for easy (and common) case.
     int quotient = this_bigit / other_bigit;
-    bigits_[used_digits_ - 1] = this_bigit - other_bigit * quotient;
-    ASSERT(quotient < 0x10000);
+    RawBigit(used_bigits_ - 1) = this_bigit - other_bigit * quotient;
+    DOUBLE_CONVERSION_ASSERT(quotient < 0x10000);
     result += static_cast<uint16_t>(quotient);
     Clamp();
     return result;
   }
 
-  int division_estimate = this_bigit / (other_bigit + 1);
-  ASSERT(division_estimate < 0x10000);
+  const int division_estimate = this_bigit / (other_bigit + 1);
+  DOUBLE_CONVERSION_ASSERT(division_estimate < 0x10000);
   result += static_cast<uint16_t>(division_estimate);
   SubtractTimes(other, division_estimate);
 
@@ -552,7 +566,7 @@ uint16_t Bignum::DivideModuloIntBignum(const Bignum& other) {
 
 template<typename S>
 static int SizeInHexChars(S number) {
-  ASSERT(number > 0);
+  DOUBLE_CONVERSION_ASSERT(number > 0);
   int result = 0;
   while (number != 0) {
     number >>= 4;
@@ -562,29 +576,35 @@ static int SizeInHexChars(S number) {
 }
 
 
-static char HexCharOfValue(int value) {
-  ASSERT(0 <= value && value <= 16);
-  if (value < 10) return static_cast<char>(value + '0');
+static char HexCharOfValue(const int value) {
+  DOUBLE_CONVERSION_ASSERT(0 <= value && value <= 16);
+  if (value < 10) {
+    return static_cast<char>(value + '0');
+  }
   return static_cast<char>(value - 10 + 'A');
 }
 
 
-bool Bignum::ToHexString(char* buffer, int buffer_size) const {
-  ASSERT(IsClamped());
+bool Bignum::ToHexString(char* buffer, const int buffer_size) const {
+  DOUBLE_CONVERSION_ASSERT(IsClamped());
   // Each bigit must be printable as separate hex-character.
-  ASSERT(kBigitSize % 4 == 0);
-  const int kHexCharsPerBigit = kBigitSize / 4;
+  DOUBLE_CONVERSION_ASSERT(kBigitSize % 4 == 0);
+  static const int kHexCharsPerBigit = kBigitSize / 4;
 
-  if (used_digits_ == 0) {
-    if (buffer_size < 2) return false;
+  if (used_bigits_ == 0) {
+    if (buffer_size < 2) {
+      return false;
+    }
     buffer[0] = '0';
     buffer[1] = '\0';
     return true;
   }
   // We add 1 for the terminating '\0' character.
-  int needed_chars = (BigitLength() - 1) * kHexCharsPerBigit +
-      SizeInHexChars(bigits_[used_digits_ - 1]) + 1;
-  if (needed_chars > buffer_size) return false;
+  const int needed_chars = (BigitLength() - 1) * kHexCharsPerBigit +
+    SizeInHexChars(RawBigit(used_bigits_ - 1)) + 1;
+  if (needed_chars > buffer_size) {
+    return false;
+  }
   int string_index = needed_chars - 1;
   buffer[string_index--] = '\0';
   for (int i = 0; i < exponent_; ++i) {
@@ -592,15 +612,15 @@ bool Bignum::ToHexString(char* buffer, int buffer_size) const {
       buffer[string_index--] = '0';
     }
   }
-  for (int i = 0; i < used_digits_ - 1; ++i) {
-    Chunk current_bigit = bigits_[i];
+  for (int i = 0; i < used_bigits_ - 1; ++i) {
+    Chunk current_bigit = RawBigit(i);
     for (int j = 0; j < kHexCharsPerBigit; ++j) {
       buffer[string_index--] = HexCharOfValue(current_bigit & 0xF);
       current_bigit >>= 4;
     }
   }
   // And finally the last bigit.
-  Chunk most_significant_bigit = bigits_[used_digits_ - 1];
+  Chunk most_significant_bigit = RawBigit(used_bigits_ - 1);
   while (most_significant_bigit != 0) {
     buffer[string_index--] = HexCharOfValue(most_significant_bigit & 0xF);
     most_significant_bigit >>= 4;
@@ -609,25 +629,37 @@ bool Bignum::ToHexString(char* buffer, int buffer_size) const {
 }
 
 
-Bignum::Chunk Bignum::BigitAt(int index) const {
-  if (index >= BigitLength()) return 0;
-  if (index < exponent_) return 0;
-  return bigits_[index - exponent_];
+Bignum::Chunk Bignum::BigitOrZero(const int index) const {
+  if (index >= BigitLength()) {
+    return 0;
+  }
+  if (index < exponent_) {
+    return 0;
+  }
+  return RawBigit(index - exponent_);
 }
 
 
 int Bignum::Compare(const Bignum& a, const Bignum& b) {
-  ASSERT(a.IsClamped());
-  ASSERT(b.IsClamped());
-  int bigit_length_a = a.BigitLength();
-  int bigit_length_b = b.BigitLength();
-  if (bigit_length_a < bigit_length_b) return -1;
-  if (bigit_length_a > bigit_length_b) return +1;
-  for (int i = bigit_length_a - 1; i >= Min(a.exponent_, b.exponent_); --i) {
-    Chunk bigit_a = a.BigitAt(i);
-    Chunk bigit_b = b.BigitAt(i);
-    if (bigit_a < bigit_b) return -1;
-    if (bigit_a > bigit_b) return +1;
+  DOUBLE_CONVERSION_ASSERT(a.IsClamped());
+  DOUBLE_CONVERSION_ASSERT(b.IsClamped());
+  const int bigit_length_a = a.BigitLength();
+  const int bigit_length_b = b.BigitLength();
+  if (bigit_length_a < bigit_length_b) {
+    return -1;
+  }
+  if (bigit_length_a > bigit_length_b) {
+    return +1;
+  }
+  for (int i = bigit_length_a - 1; i >= (std::min)(a.exponent_, b.exponent_); --i) {
+    const Chunk bigit_a = a.BigitOrZero(i);
+    const Chunk bigit_b = b.BigitOrZero(i);
+    if (bigit_a < bigit_b) {
+      return -1;
+    }
+    if (bigit_a > bigit_b) {
+      return +1;
+    }
     // Otherwise they are equal up to this digit. Try the next digit.
   }
   return 0;
@@ -635,14 +667,18 @@ int Bignum::Compare(const Bignum& a, const Bignum& b) {
 
 
 int Bignum::PlusCompare(const Bignum& a, const Bignum& b, const Bignum& c) {
-  ASSERT(a.IsClamped());
-  ASSERT(b.IsClamped());
-  ASSERT(c.IsClamped());
+  DOUBLE_CONVERSION_ASSERT(a.IsClamped());
+  DOUBLE_CONVERSION_ASSERT(b.IsClamped());
+  DOUBLE_CONVERSION_ASSERT(c.IsClamped());
   if (a.BigitLength() < b.BigitLength()) {
     return PlusCompare(b, a, c);
   }
-  if (a.BigitLength() + 1 < c.BigitLength()) return -1;
-  if (a.BigitLength() > c.BigitLength()) return +1;
+  if (a.BigitLength() + 1 < c.BigitLength()) {
+    return -1;
+  }
+  if (a.BigitLength() > c.BigitLength()) {
+    return +1;
+  }
   // The exponent encodes 0-bigits. So if there are more 0-digits in 'a' than
   // 'b' has digits, then the bigit-length of 'a'+'b' must be equal to the one
   // of 'a'.
@@ -652,92 +688,83 @@ int Bignum::PlusCompare(const Bignum& a, const Bignum& b, const Bignum& c) {
 
   Chunk borrow = 0;
   // Starting at min_exponent all digits are == 0. So no need to compare them.
-  int min_exponent = Min(Min(a.exponent_, b.exponent_), c.exponent_);
+  const int min_exponent = (std::min)((std::min)(a.exponent_, b.exponent_), c.exponent_);
   for (int i = c.BigitLength() - 1; i >= min_exponent; --i) {
-    Chunk chunk_a = a.BigitAt(i);
-    Chunk chunk_b = b.BigitAt(i);
-    Chunk chunk_c = c.BigitAt(i);
-    Chunk sum = chunk_a + chunk_b;
+    const Chunk chunk_a = a.BigitOrZero(i);
+    const Chunk chunk_b = b.BigitOrZero(i);
+    const Chunk chunk_c = c.BigitOrZero(i);
+    const Chunk sum = chunk_a + chunk_b;
     if (sum > chunk_c + borrow) {
       return +1;
     } else {
       borrow = chunk_c + borrow - sum;
-      if (borrow > 1) return -1;
+      if (borrow > 1) {
+        return -1;
+      }
       borrow <<= kBigitSize;
     }
   }
-  if (borrow == 0) return 0;
+  if (borrow == 0) {
+    return 0;
+  }
   return -1;
 }
 
 
 void Bignum::Clamp() {
-  while (used_digits_ > 0 && bigits_[used_digits_ - 1] == 0) {
-    used_digits_--;
+  while (used_bigits_ > 0 && RawBigit(used_bigits_ - 1) == 0) {
+    used_bigits_--;
   }
-  if (used_digits_ == 0) {
+  if (used_bigits_ == 0) {
     // Zero.
     exponent_ = 0;
   }
 }
 
 
-bool Bignum::IsClamped() const {
-  return used_digits_ == 0 || bigits_[used_digits_ - 1] != 0;
-}
-
-
-void Bignum::Zero() {
-  for (int i = 0; i < used_digits_; ++i) {
-    bigits_[i] = 0;
-  }
-  used_digits_ = 0;
-  exponent_ = 0;
-}
-
-
 void Bignum::Align(const Bignum& other) {
   if (exponent_ > other.exponent_) {
-    // If "X" represents a "hidden" digit (by the exponent) then we are in the
+    // If "X" represents a "hidden" bigit (by the exponent) then we are in the
     // following case (a == this, b == other):
     // a:  aaaaaaXXXX   or a:   aaaaaXXX
     // b:     bbbbbbX      b: bbbbbbbbXX
     // We replace some of the hidden digits (X) of a with 0 digits.
     // a:  aaaaaa000X   or a:   aaaaa0XX
-    int zero_digits = exponent_ - other.exponent_;
-    EnsureCapacity(used_digits_ + zero_digits);
-    for (int i = used_digits_ - 1; i >= 0; --i) {
-      bigits_[i + zero_digits] = bigits_[i];
+    const int zero_bigits = exponent_ - other.exponent_;
+    EnsureCapacity(used_bigits_ + zero_bigits);
+    for (int i = used_bigits_ - 1; i >= 0; --i) {
+      RawBigit(i + zero_bigits) = RawBigit(i);
     }
-    for (int i = 0; i < zero_digits; ++i) {
-      bigits_[i] = 0;
+    for (int i = 0; i < zero_bigits; ++i) {
+      RawBigit(i) = 0;
     }
-    used_digits_ += zero_digits;
-    exponent_ -= zero_digits;
-    ASSERT(used_digits_ >= 0);
-    ASSERT(exponent_ >= 0);
+    used_bigits_ += zero_bigits;
+    exponent_ -= zero_bigits;
+
+    DOUBLE_CONVERSION_ASSERT(used_bigits_ >= 0);
+    DOUBLE_CONVERSION_ASSERT(exponent_ >= 0);
   }
 }
 
 
-void Bignum::BigitsShiftLeft(int shift_amount) {
-  ASSERT(shift_amount < kBigitSize);
-  ASSERT(shift_amount >= 0);
+void Bignum::BigitsShiftLeft(const int shift_amount) {
+  DOUBLE_CONVERSION_ASSERT(shift_amount < kBigitSize);
+  DOUBLE_CONVERSION_ASSERT(shift_amount >= 0);
   Chunk carry = 0;
-  for (int i = 0; i < used_digits_; ++i) {
-    Chunk new_carry = bigits_[i] >> (kBigitSize - shift_amount);
-    bigits_[i] = ((bigits_[i] << shift_amount) + carry) & kBigitMask;
+  for (int i = 0; i < used_bigits_; ++i) {
+    const Chunk new_carry = RawBigit(i) >> (kBigitSize - shift_amount);
+    RawBigit(i) = ((RawBigit(i) << shift_amount) + carry) & kBigitMask;
     carry = new_carry;
   }
   if (carry != 0) {
-    bigits_[used_digits_] = carry;
-    used_digits_++;
+    RawBigit(used_bigits_) = carry;
+    used_bigits_++;
   }
 }
 
 
-void Bignum::SubtractTimes(const Bignum& other, int factor) {
-  ASSERT(exponent_ <= other.exponent_);
+void Bignum::SubtractTimes(const Bignum& other, const int factor) {
+  DOUBLE_CONVERSION_ASSERT(exponent_ <= other.exponent_);
   if (factor < 3) {
     for (int i = 0; i < factor; ++i) {
       SubtractBignum(other);
@@ -745,19 +772,21 @@ void Bignum::SubtractTimes(const Bignum& other, int factor) {
     return;
   }
   Chunk borrow = 0;
-  int exponent_diff = other.exponent_ - exponent_;
-  for (int i = 0; i < other.used_digits_; ++i) {
-    DoubleChunk product = static_cast<DoubleChunk>(factor) * other.bigits_[i];
-    DoubleChunk remove = borrow + product;
-    Chunk difference = bigits_[i + exponent_diff] - (remove & kBigitMask);
-    bigits_[i + exponent_diff] = difference & kBigitMask;
+  const int exponent_diff = other.exponent_ - exponent_;
+  for (int i = 0; i < other.used_bigits_; ++i) {
+    const DoubleChunk product = static_cast<DoubleChunk>(factor) * other.RawBigit(i);
+    const DoubleChunk remove = borrow + product;
+    const Chunk difference = RawBigit(i + exponent_diff) - (remove & kBigitMask);
+    RawBigit(i + exponent_diff) = difference & kBigitMask;
     borrow = static_cast<Chunk>((difference >> (kChunkSize - 1)) +
                                 (remove >> kBigitSize));
   }
-  for (int i = other.used_digits_ + exponent_diff; i < used_digits_; ++i) {
-    if (borrow == 0) return;
-    Chunk difference = bigits_[i] - borrow;
-    bigits_[i] = difference & kBigitMask;
+  for (int i = other.used_bigits_ + exponent_diff; i < used_bigits_; ++i) {
+    if (borrow == 0) {
+      return;
+    }
+    const Chunk difference = RawBigit(i) - borrow;
+    RawBigit(i) = difference & kBigitMask;
     borrow = difference >> (kChunkSize - 1);
   }
   Clamp();
diff --git a/Foundation/src/bignum.h b/Foundation/src/bignum.h
index 7c289fa2f..14d1ca86f 100644
--- a/Foundation/src/bignum.h
+++ b/Foundation/src/bignum.h
@@ -39,26 +39,27 @@ class Bignum {
   // exponent.
   static const int kMaxSignificantBits = 3584;
 
-  Bignum();
-  void AssignUInt16(uint16_t value);
+  Bignum() : used_bigits_(0), exponent_(0) {}
+
+  void AssignUInt16(const uint16_t value);
   void AssignUInt64(uint64_t value);
   void AssignBignum(const Bignum& other);
 
-  void AssignDecimalString(Vector<const char> value);
-  void AssignHexString(Vector<const char> value);
+  void AssignDecimalString(const Vector<const char> value);
+  void AssignHexString(const Vector<const char> value);
 
-  void AssignPowerUInt16(uint16_t base, int exponent);
+  void AssignPowerUInt16(uint16_t base, const int exponent);
 
-  void AddUInt64(uint64_t operand);
+  void AddUInt64(const uint64_t operand);
   void AddBignum(const Bignum& other);
   // Precondition: this >= other.
   void SubtractBignum(const Bignum& other);
 
   void Square();
-  void ShiftLeft(int shift_amount);
-  void MultiplyByUInt32(uint32_t factor);
-  void MultiplyByUInt64(uint64_t factor);
-  void MultiplyByPowerOfTen(int exponent);
+  void ShiftLeft(const int shift_amount);
+  void MultiplyByUInt32(const uint32_t factor);
+  void MultiplyByUInt64(const uint64_t factor);
+  void MultiplyByPowerOfTen(const int exponent);
   void Times10() { return MultiplyByUInt32(10); }
   // Pseudocode:
   //  int result = this / other;
@@ -66,7 +67,7 @@ class Bignum {
   // In the worst case this function is in O(this/other).
   uint16_t DivideModuloIntBignum(const Bignum& other);
 
-  bool ToHexString(char* buffer, int buffer_size) const;
+  bool ToHexString(char* buffer, const int buffer_size) const;
 
   // Returns
   //  -1 if a < b,
@@ -110,33 +111,40 @@ class Bignum {
   // grow. There are no checks if the stack-allocated space is sufficient.
   static const int kBigitCapacity = kMaxSignificantBits / kBigitSize;
 
-  void EnsureCapacity(int size) {
+  static void EnsureCapacity(const int size) {
     if (size > kBigitCapacity) {
-      UNREACHABLE();
+      DOUBLE_CONVERSION_UNREACHABLE();
     }
   }
   void Align(const Bignum& other);
   void Clamp();
-  bool IsClamped() const;
-  void Zero();
+  bool IsClamped() const {
+    return used_bigits_ == 0 || RawBigit(used_bigits_ - 1) != 0;
+  }
+  void Zero() {
+    used_bigits_ = 0;
+    exponent_ = 0;
+  }
   // Requires this to have enough capacity (no tests done).
-  // Updates used_digits_ if necessary.
+  // Updates used_bigits_ if necessary.
   // shift_amount must be < kBigitSize.
-  void BigitsShiftLeft(int shift_amount);
-  // BigitLength includes the "hidden" digits encoded in the exponent.
-  int BigitLength() const { return used_digits_ + exponent_; }
-  Chunk BigitAt(int index) const;
-  void SubtractTimes(const Bignum& other, int factor);
+  void BigitsShiftLeft(const int shift_amount);
+  // BigitLength includes the "hidden" bigits encoded in the exponent.
+  int BigitLength() const { return used_bigits_ + exponent_; }
+  Chunk& RawBigit(const int index);
+  const Chunk& RawBigit(const int index) const;
+  Chunk BigitOrZero(const int index) const;
+  void SubtractTimes(const Bignum& other, const int factor);
 
+  // The Bignum's value is value(bigits_buffer_) * 2^(exponent_ * kBigitSize),
+  // where the value of the buffer consists of the lower kBigitSize bits of
+  // the first used_bigits_ Chunks in bigits_buffer_, first chunk has lowest
+  // significant bits.
+  int16_t used_bigits_;
+  int16_t exponent_;
   Chunk bigits_buffer_[kBigitCapacity];
-  // A vector backed by bigits_buffer_. This way accesses to the array are
-  // checked for out-of-bounds errors.
-  Vector<Chunk> bigits_;
-  int used_digits_;
-  // The Bignum's value equals value(bigits_) * 2^(exponent_ * kBigitSize).
-  int exponent_;
 
-  DC_DISALLOW_COPY_AND_ASSIGN(Bignum);
+  DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(Bignum);
 };
 
 }  // namespace double_conversion
diff --git a/Foundation/src/cached-powers.cc b/Foundation/src/cached-powers.cc
index 8ab281a1b..56bdfc9d6 100644
--- a/Foundation/src/cached-powers.cc
+++ b/Foundation/src/cached-powers.cc
@@ -35,6 +35,8 @@
 
 namespace double_conversion {
 
+namespace PowersOfTenCache {
+
 struct CachedPower {
   uint64_t significand;
   int16_t binary_exponent;
@@ -42,103 +44,99 @@ struct CachedPower {
 };
 
 static const CachedPower kCachedPowers[] = {
-  {UINT64_2PART_C(0xfa8fd5a0, 081c0288), -1220, -348},
-  {UINT64_2PART_C(0xbaaee17f, a23ebf76), -1193, -340},
-  {UINT64_2PART_C(0x8b16fb20, 3055ac76), -1166, -332},
-  {UINT64_2PART_C(0xcf42894a, 5dce35ea), -1140, -324},
-  {UINT64_2PART_C(0x9a6bb0aa, 55653b2d), -1113, -316},
-  {UINT64_2PART_C(0xe61acf03, 3d1a45df), -1087, -308},
-  {UINT64_2PART_C(0xab70fe17, c79ac6ca), -1060, -300},
-  {UINT64_2PART_C(0xff77b1fc, bebcdc4f), -1034, -292},
-  {UINT64_2PART_C(0xbe5691ef, 416bd60c), -1007, -284},
-  {UINT64_2PART_C(0x8dd01fad, 907ffc3c), -980, -276},
-  {UINT64_2PART_C(0xd3515c28, 31559a83), -954, -268},
-  {UINT64_2PART_C(0x9d71ac8f, ada6c9b5), -927, -260},
-  {UINT64_2PART_C(0xea9c2277, 23ee8bcb), -901, -252},
-  {UINT64_2PART_C(0xaecc4991, 4078536d), -874, -244},
-  {UINT64_2PART_C(0x823c1279, 5db6ce57), -847, -236},
-  {UINT64_2PART_C(0xc2109436, 4dfb5637), -821, -228},
-  {UINT64_2PART_C(0x9096ea6f, 3848984f), -794, -220},
-  {UINT64_2PART_C(0xd77485cb, 25823ac7), -768, -212},
-  {UINT64_2PART_C(0xa086cfcd, 97bf97f4), -741, -204},
-  {UINT64_2PART_C(0xef340a98, 172aace5), -715, -196},
-  {UINT64_2PART_C(0xb23867fb, 2a35b28e), -688, -188},
-  {UINT64_2PART_C(0x84c8d4df, d2c63f3b), -661, -180},
-  {UINT64_2PART_C(0xc5dd4427, 1ad3cdba), -635, -172},
-  {UINT64_2PART_C(0x936b9fce, bb25c996), -608, -164},
-  {UINT64_2PART_C(0xdbac6c24, 7d62a584), -582, -156},
-  {UINT64_2PART_C(0xa3ab6658, 0d5fdaf6), -555, -148},
-  {UINT64_2PART_C(0xf3e2f893, dec3f126), -529, -140},
-  {UINT64_2PART_C(0xb5b5ada8, aaff80b8), -502, -132},
-  {UINT64_2PART_C(0x87625f05, 6c7c4a8b), -475, -124},
-  {UINT64_2PART_C(0xc9bcff60, 34c13053), -449, -116},
-  {UINT64_2PART_C(0x964e858c, 91ba2655), -422, -108},
-  {UINT64_2PART_C(0xdff97724, 70297ebd), -396, -100},
-  {UINT64_2PART_C(0xa6dfbd9f, b8e5b88f), -369, -92},
-  {UINT64_2PART_C(0xf8a95fcf, 88747d94), -343, -84},
-  {UINT64_2PART_C(0xb9447093, 8fa89bcf), -316, -76},
-  {UINT64_2PART_C(0x8a08f0f8, bf0f156b), -289, -68},
-  {UINT64_2PART_C(0xcdb02555, 653131b6), -263, -60},
-  {UINT64_2PART_C(0x993fe2c6, d07b7fac), -236, -52},
-  {UINT64_2PART_C(0xe45c10c4, 2a2b3b06), -210, -44},
-  {UINT64_2PART_C(0xaa242499, 697392d3), -183, -36},
-  {UINT64_2PART_C(0xfd87b5f2, 8300ca0e), -157, -28},
-  {UINT64_2PART_C(0xbce50864, 92111aeb), -130, -20},
-  {UINT64_2PART_C(0x8cbccc09, 6f5088cc), -103, -12},
-  {UINT64_2PART_C(0xd1b71758, e219652c), -77, -4},
-  {UINT64_2PART_C(0x9c400000, 00000000), -50, 4},
-  {UINT64_2PART_C(0xe8d4a510, 00000000), -24, 12},
-  {UINT64_2PART_C(0xad78ebc5, ac620000), 3, 20},
-  {UINT64_2PART_C(0x813f3978, f8940984), 30, 28},
-  {UINT64_2PART_C(0xc097ce7b, c90715b3), 56, 36},
-  {UINT64_2PART_C(0x8f7e32ce, 7bea5c70), 83, 44},
-  {UINT64_2PART_C(0xd5d238a4, abe98068), 109, 52},
-  {UINT64_2PART_C(0x9f4f2726, 179a2245), 136, 60},
-  {UINT64_2PART_C(0xed63a231, d4c4fb27), 162, 68},
-  {UINT64_2PART_C(0xb0de6538, 8cc8ada8), 189, 76},
-  {UINT64_2PART_C(0x83c7088e, 1aab65db), 216, 84},
-  {UINT64_2PART_C(0xc45d1df9, 42711d9a), 242, 92},
-  {UINT64_2PART_C(0x924d692c, a61be758), 269, 100},
-  {UINT64_2PART_C(0xda01ee64, 1a708dea), 295, 108},
-  {UINT64_2PART_C(0xa26da399, 9aef774a), 322, 116},
-  {UINT64_2PART_C(0xf209787b, b47d6b85), 348, 124},
-  {UINT64_2PART_C(0xb454e4a1, 79dd1877), 375, 132},
-  {UINT64_2PART_C(0x865b8692, 5b9bc5c2), 402, 140},
-  {UINT64_2PART_C(0xc83553c5, c8965d3d), 428, 148},
-  {UINT64_2PART_C(0x952ab45c, fa97a0b3), 455, 156},
-  {UINT64_2PART_C(0xde469fbd, 99a05fe3), 481, 164},
-  {UINT64_2PART_C(0xa59bc234, db398c25), 508, 172},
-  {UINT64_2PART_C(0xf6c69a72, a3989f5c), 534, 180},
-  {UINT64_2PART_C(0xb7dcbf53, 54e9bece), 561, 188},
-  {UINT64_2PART_C(0x88fcf317, f22241e2), 588, 196},
-  {UINT64_2PART_C(0xcc20ce9b, d35c78a5), 614, 204},
-  {UINT64_2PART_C(0x98165af3, 7b2153df), 641, 212},
-  {UINT64_2PART_C(0xe2a0b5dc, 971f303a), 667, 220},
-  {UINT64_2PART_C(0xa8d9d153, 5ce3b396), 694, 228},
-  {UINT64_2PART_C(0xfb9b7cd9, a4a7443c), 720, 236},
-  {UINT64_2PART_C(0xbb764c4c, a7a44410), 747, 244},
-  {UINT64_2PART_C(0x8bab8eef, b6409c1a), 774, 252},
-  {UINT64_2PART_C(0xd01fef10, a657842c), 800, 260},
-  {UINT64_2PART_C(0x9b10a4e5, e9913129), 827, 268},
-  {UINT64_2PART_C(0xe7109bfb, a19c0c9d), 853, 276},
-  {UINT64_2PART_C(0xac2820d9, 623bf429), 880, 284},
-  {UINT64_2PART_C(0x80444b5e, 7aa7cf85), 907, 292},
-  {UINT64_2PART_C(0xbf21e440, 03acdd2d), 933, 300},
-  {UINT64_2PART_C(0x8e679c2f, 5e44ff8f), 960, 308},
-  {UINT64_2PART_C(0xd433179d, 9c8cb841), 986, 316},
-  {UINT64_2PART_C(0x9e19db92, b4e31ba9), 1013, 324},
-  {UINT64_2PART_C(0xeb96bf6e, badf77d9), 1039, 332},
-  {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xfa8fd5a0, 081c0288), -1220, -348},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xbaaee17f, a23ebf76), -1193, -340},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x8b16fb20, 3055ac76), -1166, -332},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xcf42894a, 5dce35ea), -1140, -324},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x9a6bb0aa, 55653b2d), -1113, -316},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xe61acf03, 3d1a45df), -1087, -308},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xab70fe17, c79ac6ca), -1060, -300},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xff77b1fc, bebcdc4f), -1034, -292},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xbe5691ef, 416bd60c), -1007, -284},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x8dd01fad, 907ffc3c), -980, -276},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xd3515c28, 31559a83), -954, -268},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x9d71ac8f, ada6c9b5), -927, -260},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xea9c2277, 23ee8bcb), -901, -252},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xaecc4991, 4078536d), -874, -244},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x823c1279, 5db6ce57), -847, -236},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xc2109436, 4dfb5637), -821, -228},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x9096ea6f, 3848984f), -794, -220},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xd77485cb, 25823ac7), -768, -212},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xa086cfcd, 97bf97f4), -741, -204},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xef340a98, 172aace5), -715, -196},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xb23867fb, 2a35b28e), -688, -188},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x84c8d4df, d2c63f3b), -661, -180},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xc5dd4427, 1ad3cdba), -635, -172},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x936b9fce, bb25c996), -608, -164},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xdbac6c24, 7d62a584), -582, -156},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xa3ab6658, 0d5fdaf6), -555, -148},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xf3e2f893, dec3f126), -529, -140},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xb5b5ada8, aaff80b8), -502, -132},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x87625f05, 6c7c4a8b), -475, -124},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xc9bcff60, 34c13053), -449, -116},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x964e858c, 91ba2655), -422, -108},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xdff97724, 70297ebd), -396, -100},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xa6dfbd9f, b8e5b88f), -369, -92},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xf8a95fcf, 88747d94), -343, -84},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xb9447093, 8fa89bcf), -316, -76},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x8a08f0f8, bf0f156b), -289, -68},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xcdb02555, 653131b6), -263, -60},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x993fe2c6, d07b7fac), -236, -52},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xe45c10c4, 2a2b3b06), -210, -44},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xaa242499, 697392d3), -183, -36},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xfd87b5f2, 8300ca0e), -157, -28},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xbce50864, 92111aeb), -130, -20},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x8cbccc09, 6f5088cc), -103, -12},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xd1b71758, e219652c), -77, -4},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x9c400000, 00000000), -50, 4},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xe8d4a510, 00000000), -24, 12},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xad78ebc5, ac620000), 3, 20},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x813f3978, f8940984), 30, 28},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xc097ce7b, c90715b3), 56, 36},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x8f7e32ce, 7bea5c70), 83, 44},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xd5d238a4, abe98068), 109, 52},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x9f4f2726, 179a2245), 136, 60},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xed63a231, d4c4fb27), 162, 68},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xb0de6538, 8cc8ada8), 189, 76},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x83c7088e, 1aab65db), 216, 84},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xc45d1df9, 42711d9a), 242, 92},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x924d692c, a61be758), 269, 100},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xda01ee64, 1a708dea), 295, 108},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xa26da399, 9aef774a), 322, 116},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xf209787b, b47d6b85), 348, 124},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xb454e4a1, 79dd1877), 375, 132},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x865b8692, 5b9bc5c2), 402, 140},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xc83553c5, c8965d3d), 428, 148},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x952ab45c, fa97a0b3), 455, 156},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xde469fbd, 99a05fe3), 481, 164},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xa59bc234, db398c25), 508, 172},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xf6c69a72, a3989f5c), 534, 180},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xb7dcbf53, 54e9bece), 561, 188},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x88fcf317, f22241e2), 588, 196},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xcc20ce9b, d35c78a5), 614, 204},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x98165af3, 7b2153df), 641, 212},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xe2a0b5dc, 971f303a), 667, 220},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xa8d9d153, 5ce3b396), 694, 228},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xfb9b7cd9, a4a7443c), 720, 236},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xbb764c4c, a7a44410), 747, 244},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x8bab8eef, b6409c1a), 774, 252},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xd01fef10, a657842c), 800, 260},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x9b10a4e5, e9913129), 827, 268},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xe7109bfb, a19c0c9d), 853, 276},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xac2820d9, 623bf429), 880, 284},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x80444b5e, 7aa7cf85), 907, 292},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xbf21e440, 03acdd2d), 933, 300},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x8e679c2f, 5e44ff8f), 960, 308},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xd433179d, 9c8cb841), 986, 316},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0x9e19db92, b4e31ba9), 1013, 324},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xeb96bf6e, badf77d9), 1039, 332},
+  {DOUBLE_CONVERSION_UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340},
 };
 
 static const int kCachedPowersOffset = 348;  // -1 * the first decimal_exponent.
 static const double kD_1_LOG2_10 = 0.30102999566398114;  //  1 / lg(10)
-// Difference between the decimal exponents in the table above.
-const int PowersOfTenCache::kDecimalExponentDistance = 8;
-const int PowersOfTenCache::kMinDecimalExponent = -348;
-const int PowersOfTenCache::kMaxDecimalExponent = 340;
 
-void PowersOfTenCache::GetCachedPowerForBinaryExponentRange(
+void GetCachedPowerForBinaryExponentRange(
     int min_exponent,
     int max_exponent,
     DiyFp* power,
@@ -148,28 +146,30 @@ void PowersOfTenCache::GetCachedPowerForBinaryExponentRange(
   int foo = kCachedPowersOffset;
   int index =
       (foo + static_cast<int>(k) - 1) / kDecimalExponentDistance + 1;
-  ASSERT(0 <= index && index < static_cast<int>(ARRAY_SIZE(kCachedPowers)));
+  DOUBLE_CONVERSION_ASSERT(0 <= index && index < static_cast<int>(DOUBLE_CONVERSION_ARRAY_SIZE(kCachedPowers)));
   CachedPower cached_power = kCachedPowers[index];
-  ASSERT(min_exponent <= cached_power.binary_exponent);
+  DOUBLE_CONVERSION_ASSERT(min_exponent <= cached_power.binary_exponent);
   (void) max_exponent;  // Mark variable as used.
-  ASSERT(cached_power.binary_exponent <= max_exponent);
+  DOUBLE_CONVERSION_ASSERT(cached_power.binary_exponent <= max_exponent);
   *decimal_exponent = cached_power.decimal_exponent;
   *power = DiyFp(cached_power.significand, cached_power.binary_exponent);
 }
 
 
-void PowersOfTenCache::GetCachedPowerForDecimalExponent(int requested_exponent,
-                                                        DiyFp* power,
-                                                        int* found_exponent) {
-  ASSERT(kMinDecimalExponent <= requested_exponent);
-  ASSERT(requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance);
+void GetCachedPowerForDecimalExponent(int requested_exponent,
+                                      DiyFp* power,
+                                      int* found_exponent) {
+  DOUBLE_CONVERSION_ASSERT(kMinDecimalExponent <= requested_exponent);
+  DOUBLE_CONVERSION_ASSERT(requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance);
   int index =
       (requested_exponent + kCachedPowersOffset) / kDecimalExponentDistance;
   CachedPower cached_power = kCachedPowers[index];
   *power = DiyFp(cached_power.significand, cached_power.binary_exponent);
   *found_exponent = cached_power.decimal_exponent;
-  ASSERT(*found_exponent <= requested_exponent);
-  ASSERT(requested_exponent < *found_exponent + kDecimalExponentDistance);
+  DOUBLE_CONVERSION_ASSERT(*found_exponent <= requested_exponent);
+  DOUBLE_CONVERSION_ASSERT(requested_exponent < *found_exponent + kDecimalExponentDistance);
 }
 
+}  // namespace PowersOfTenCache
+
 }  // namespace double_conversion
diff --git a/Foundation/src/cached-powers.h b/Foundation/src/cached-powers.h
index 61a50614c..f38c26d20 100644
--- a/Foundation/src/cached-powers.h
+++ b/Foundation/src/cached-powers.h
@@ -32,32 +32,32 @@
 
 namespace double_conversion {
 
-class PowersOfTenCache {
- public:
+namespace PowersOfTenCache {
 
   // Not all powers of ten are cached. The decimal exponent of two neighboring
   // cached numbers will differ by kDecimalExponentDistance.
-  static const int kDecimalExponentDistance;
+  static const int kDecimalExponentDistance = 8;
 
-  static const int kMinDecimalExponent;
-  static const int kMaxDecimalExponent;
+  static const int kMinDecimalExponent = -348;
+  static const int kMaxDecimalExponent = 340;
 
   // Returns a cached power-of-ten with a binary exponent in the range
   // [min_exponent; max_exponent] (boundaries included).
-  static void GetCachedPowerForBinaryExponentRange(int min_exponent,
-                                                   int max_exponent,
-                                                   DiyFp* power,
-                                                   int* decimal_exponent);
+  void GetCachedPowerForBinaryExponentRange(int min_exponent,
+                                            int max_exponent,
+                                            DiyFp* power,
+                                            int* decimal_exponent);
 
   // Returns a cached power of ten x ~= 10^k such that
   //   k <= decimal_exponent < k + kCachedPowersDecimalDistance.
   // The given decimal_exponent must satisfy
   //   kMinDecimalExponent <= requested_exponent, and
   //   requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance.
-  static void GetCachedPowerForDecimalExponent(int requested_exponent,
-                                               DiyFp* power,
-                                               int* found_exponent);
-};
+  void GetCachedPowerForDecimalExponent(int requested_exponent,
+                                        DiyFp* power,
+                                        int* found_exponent);
+
+}  // namespace PowersOfTenCache
 
 }  // namespace double_conversion
 
diff --git a/Foundation/src/diy-fp.cc b/Foundation/src/diy-fp.cc
deleted file mode 100644
index ddd1891b1..000000000
--- a/Foundation/src/diy-fp.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "diy-fp.h"
-#include "utils.h"
-
-namespace double_conversion {
-
-void DiyFp::Multiply(const DiyFp& other) {
-  // Simply "emulates" a 128 bit multiplication.
-  // However: the resulting number only contains 64 bits. The least
-  // significant 64 bits are only used for rounding the most significant 64
-  // bits.
-  const uint64_t kM32 = 0xFFFFFFFFU;
-  uint64_t a = f_ >> 32;
-  uint64_t b = f_ & kM32;
-  uint64_t c = other.f_ >> 32;
-  uint64_t d = other.f_ & kM32;
-  uint64_t ac = a * c;
-  uint64_t bc = b * c;
-  uint64_t ad = a * d;
-  uint64_t bd = b * d;
-  uint64_t tmp = (bd >> 32) + (ad & kM32) + (bc & kM32);
-  // By adding 1U << 31 to tmp we round the final result.
-  // Halfway cases will be round up.
-  tmp += 1U << 31;
-  uint64_t result_f = ac + (ad >> 32) + (bc >> 32) + (tmp >> 32);
-  e_ += other.e_ + 64;
-  f_ = result_f;
-}
-
-}  // namespace double_conversion
diff --git a/Foundation/src/diy-fp.h b/Foundation/src/diy-fp.h
index 2edf34674..a2200c4de 100644
--- a/Foundation/src/diy-fp.h
+++ b/Foundation/src/diy-fp.h
@@ -36,36 +36,55 @@ namespace double_conversion {
 // with a uint64 significand and an int exponent. Normalized DiyFp numbers will
 // have the most significant bit of the significand set.
 // Multiplication and Subtraction do not normalize their results.
-// DiyFp are not designed to contain special doubles (NaN and Infinity).
+// DiyFp store only non-negative numbers and are not designed to contain special
+// doubles (NaN and Infinity).
 class DiyFp {
  public:
   static const int kSignificandSize = 64;
 
   DiyFp() : f_(0), e_(0) {}
-  DiyFp(uint64_t significand, int exponent) : f_(significand), e_(exponent) {}
+  DiyFp(const uint64_t significand, const int32_t exponent) : f_(significand), e_(exponent) {}
 
-  // this = this - other.
+  // this -= other.
   // The exponents of both numbers must be the same and the significand of this
-  // must be bigger than the significand of other.
+  // must be greater or equal than the significand of other.
   // The result will not be normalized.
   void Subtract(const DiyFp& other) {
-    ASSERT(e_ == other.e_);
-    ASSERT(f_ >= other.f_);
+    DOUBLE_CONVERSION_ASSERT(e_ == other.e_);
+    DOUBLE_CONVERSION_ASSERT(f_ >= other.f_);
     f_ -= other.f_;
   }
 
   // Returns a - b.
-  // The exponents of both numbers must be the same and this must be bigger
-  // than other. The result will not be normalized.
+  // The exponents of both numbers must be the same and a must be greater
+  // or equal than b. The result will not be normalized.
   static DiyFp Minus(const DiyFp& a, const DiyFp& b) {
     DiyFp result = a;
     result.Subtract(b);
     return result;
   }
 
-
-  // this = this * other.
-  void Multiply(const DiyFp& other);
+  // this *= other.
+  void Multiply(const DiyFp& other) {
+    // Simply "emulates" a 128 bit multiplication.
+    // However: the resulting number only contains 64 bits. The least
+    // significant 64 bits are only used for rounding the most significant 64
+    // bits.
+    const uint64_t kM32 = 0xFFFFFFFFU;
+    const uint64_t a = f_ >> 32;
+    const uint64_t b = f_ & kM32;
+    const uint64_t c = other.f_ >> 32;
+    const uint64_t d = other.f_ & kM32;
+    const uint64_t ac = a * c;
+    const uint64_t bc = b * c;
+    const uint64_t ad = a * d;
+    const uint64_t bd = b * d;
+    // By adding 1U << 31 to tmp we round the final result.
+    // Halfway cases will be rounded up.
+    const uint64_t tmp = (bd >> 32) + (ad & kM32) + (bc & kM32) + (1U << 31);
+    e_ += other.e_ + 64;
+    f_ = ac + (ad >> 32) + (bc >> 32) + (tmp >> 32);
+  }
 
   // returns a * b;
   static DiyFp Times(const DiyFp& a, const DiyFp& b) {
@@ -75,13 +94,13 @@ class DiyFp {
   }
 
   void Normalize() {
-    ASSERT(f_ != 0);
+    DOUBLE_CONVERSION_ASSERT(f_ != 0);
     uint64_t significand = f_;
-    int exponent = e_;
+    int32_t exponent = e_;
 
-    // This method is mainly called for normalizing boundaries. In general
-    // boundaries need to be shifted by 10 bits. We thus optimize for this case.
-    const uint64_t k10MSBits = UINT64_2PART_C(0xFFC00000, 00000000);
+    // This method is mainly called for normalizing boundaries. In general,
+    // boundaries need to be shifted by 10 bits, and we optimize for this case.
+    const uint64_t k10MSBits = DOUBLE_CONVERSION_UINT64_2PART_C(0xFFC00000, 00000000);
     while ((significand & k10MSBits) == 0) {
       significand <<= 10;
       exponent -= 10;
@@ -101,16 +120,16 @@ class DiyFp {
   }
 
   uint64_t f() const { return f_; }
-  int e() const { return e_; }
+  int32_t e() const { return e_; }
 
   void set_f(uint64_t new_value) { f_ = new_value; }
-  void set_e(int new_value) { e_ = new_value; }
+  void set_e(int32_t new_value) { e_ = new_value; }
 
  private:
-  static const uint64_t kUint64MSB = UINT64_2PART_C(0x80000000, 00000000);
+  static const uint64_t kUint64MSB = DOUBLE_CONVERSION_UINT64_2PART_C(0x80000000, 00000000);
 
   uint64_t f_;
-  int e_;
+  int32_t e_;
 };
 
 }  // namespace double_conversion
diff --git a/Foundation/src/double-conversion.h b/Foundation/src/double-conversion.h
index 6dbc0997c..6e8884d84 100644
--- a/Foundation/src/double-conversion.h
+++ b/Foundation/src/double-conversion.h
@@ -28,549 +28,7 @@
 #ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_
 #define DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_
 
-#include "utils.h"
-
-namespace double_conversion {
-
-class DoubleToStringConverter {
- public:
-  // When calling ToFixed with a double > 10^kMaxFixedDigitsBeforePoint
-  // or a requested_digits parameter > kMaxFixedDigitsAfterPoint then the
-  // function returns false.
-  static const int kMaxFixedDigitsBeforePoint = 60;
-  static const int kMaxFixedDigitsAfterPoint = 60;
-
-  // When calling ToExponential with a requested_digits
-  // parameter > kMaxExponentialDigits then the function returns false.
-  static const int kMaxExponentialDigits = 120;
-
-  // When calling ToPrecision with a requested_digits
-  // parameter < kMinPrecisionDigits or requested_digits > kMaxPrecisionDigits
-  // then the function returns false.
-  static const int kMinPrecisionDigits = 1;
-  static const int kMaxPrecisionDigits = 120;
-
-  enum Flags {
-    NO_FLAGS = 0,
-    EMIT_POSITIVE_EXPONENT_SIGN = 1,
-    EMIT_TRAILING_DECIMAL_POINT = 2,
-    EMIT_TRAILING_ZERO_AFTER_POINT = 4,
-    UNIQUE_ZERO = 8
-  };
-
-  // Flags should be a bit-or combination of the possible Flags-enum.
-  //  - NO_FLAGS: no special flags.
-  //  - EMIT_POSITIVE_EXPONENT_SIGN: when the number is converted into exponent
-  //    form, emits a '+' for positive exponents. Example: 1.2e+2.
-  //  - EMIT_TRAILING_DECIMAL_POINT: when the input number is an integer and is
-  //    converted into decimal format then a trailing decimal point is appended.
-  //    Example: 2345.0 is converted to "2345.".
-  //  - EMIT_TRAILING_ZERO_AFTER_POINT: in addition to a trailing decimal point
-  //    emits a trailing '0'-character. This flag requires the
-  //    EXMIT_TRAILING_DECIMAL_POINT flag.
-  //    Example: 2345.0 is converted to "2345.0".
-  //  - UNIQUE_ZERO: "-0.0" is converted to "0.0".
-  //
-  // Infinity symbol and nan_symbol provide the string representation for these
-  // special values. If the string is NULL and the special value is encountered
-  // then the conversion functions return false.
-  //
-  // The exponent_character is used in exponential representations. It is
-  // usually 'e' or 'E'.
-  //
-  // When converting to the shortest representation the converter will
-  // represent input numbers in decimal format if they are in the interval
-  // [10^decimal_in_shortest_low; 10^decimal_in_shortest_high[
-  //    (lower boundary included, greater boundary excluded).
-  // Example: with decimal_in_shortest_low = -6 and
-  //               decimal_in_shortest_high = 21:
-  //   ToShortest(0.000001)  -> "0.000001"
-  //   ToShortest(0.0000001) -> "1e-7"
-  //   ToShortest(111111111111111111111.0)  -> "111111111111111110000"
-  //   ToShortest(100000000000000000000.0)  -> "100000000000000000000"
-  //   ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21"
-  //
-  // When converting to precision mode the converter may add
-  // max_leading_padding_zeroes before returning the number in exponential
-  // format.
-  // Example with max_leading_padding_zeroes_in_precision_mode = 6.
-  //   ToPrecision(0.0000012345, 2) -> "0.0000012"
-  //   ToPrecision(0.00000012345, 2) -> "1.2e-7"
-  // Similarily the converter may add up to
-  // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid
-  // returning an exponential representation. A zero added by the
-  // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit.
-  // Examples for max_trailing_padding_zeroes_in_precision_mode = 1:
-  //   ToPrecision(230.0, 2) -> "230"
-  //   ToPrecision(230.0, 2) -> "230."  with EMIT_TRAILING_DECIMAL_POINT.
-  //   ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT.
-  DoubleToStringConverter(int flags,
-                          const char* infinity_symbol,
-                          const char* nan_symbol,
-                          char exponent_character,
-                          int decimal_in_shortest_low,
-                          int decimal_in_shortest_high,
-                          int max_leading_padding_zeroes_in_precision_mode,
-                          int max_trailing_padding_zeroes_in_precision_mode)
-      : flags_(flags),
-        infinity_symbol_(infinity_symbol),
-        nan_symbol_(nan_symbol),
-        exponent_character_(exponent_character),
-        decimal_in_shortest_low_(decimal_in_shortest_low),
-        decimal_in_shortest_high_(decimal_in_shortest_high),
-        max_leading_padding_zeroes_in_precision_mode_(
-            max_leading_padding_zeroes_in_precision_mode),
-        max_trailing_padding_zeroes_in_precision_mode_(
-            max_trailing_padding_zeroes_in_precision_mode) {
-    // When 'trailing zero after the point' is set, then 'trailing point'
-    // must be set too.
-    ASSERT(((flags & EMIT_TRAILING_DECIMAL_POINT) != 0) ||
-        !((flags & EMIT_TRAILING_ZERO_AFTER_POINT) != 0));
-  }
-
-  // Returns a converter following the EcmaScript specification.
-  static const DoubleToStringConverter& EcmaScriptConverter();
-
-  // Computes the shortest string of digits that correctly represent the input
-  // number. Depending on decimal_in_shortest_low and decimal_in_shortest_high
-  // (see constructor) it then either returns a decimal representation, or an
-  // exponential representation.
-  // Example with decimal_in_shortest_low = -6,
-  //              decimal_in_shortest_high = 21,
-  //              EMIT_POSITIVE_EXPONENT_SIGN activated, and
-  //              EMIT_TRAILING_DECIMAL_POINT deactived:
-  //   ToShortest(0.000001)  -> "0.000001"
-  //   ToShortest(0.0000001) -> "1e-7"
-  //   ToShortest(111111111111111111111.0)  -> "111111111111111110000"
-  //   ToShortest(100000000000000000000.0)  -> "100000000000000000000"
-  //   ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21"
-  //
-  // Note: the conversion may round the output if the returned string
-  // is accurate enough to uniquely identify the input-number.
-  // For example the most precise representation of the double 9e59 equals
-  // "899999999999999918767229449717619953810131273674690656206848", but
-  // the converter will return the shorter (but still correct) "9e59".
-  //
-  // Returns true if the conversion succeeds. The conversion always succeeds
-  // except when the input value is special and no infinity_symbol or
-  // nan_symbol has been given to the constructor.
-  bool ToShortest(double value, StringBuilder* result_builder) const {
-    return ToShortestIeeeNumber(value, result_builder, SHORTEST);
-  }
-
-  // Same as ToShortest, but for single-precision floats.
-  bool ToShortestSingle(float value, StringBuilder* result_builder) const {
-    return ToShortestIeeeNumber(value, result_builder, SHORTEST_SINGLE);
-  }
-
-
-  // Computes a decimal representation with a fixed number of digits after the
-  // decimal point. The last emitted digit is rounded.
-  //
-  // Examples:
-  //   ToFixed(3.12, 1) -> "3.1"
-  //   ToFixed(3.1415, 3) -> "3.142"
-  //   ToFixed(1234.56789, 4) -> "1234.5679"
-  //   ToFixed(1.23, 5) -> "1.23000"
-  //   ToFixed(0.1, 4) -> "0.1000"
-  //   ToFixed(1e30, 2) -> "1000000000000000019884624838656.00"
-  //   ToFixed(0.1, 30) -> "0.100000000000000005551115123126"
-  //   ToFixed(0.1, 17) -> "0.10000000000000001"
-  //
-  // If requested_digits equals 0, then the tail of the result depends on
-  // the EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT.
-  // Examples, for requested_digits == 0,
-  //   let EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT be
-  //    - false and false: then 123.45 -> 123
-  //                             0.678 -> 1
-  //    - true and false: then 123.45 -> 123.
-  //                            0.678 -> 1.
-  //    - true and true: then 123.45 -> 123.0
-  //                           0.678 -> 1.0
-  //
-  // Returns true if the conversion succeeds. The conversion always succeeds
-  // except for the following cases:
-  //   - the input value is special and no infinity_symbol or nan_symbol has
-  //     been provided to the constructor,
-  //   - 'value' > 10^kMaxFixedDigitsBeforePoint, or
-  //   - 'requested_digits' > kMaxFixedDigitsAfterPoint.
-  // The last two conditions imply that the result will never contain more than
-  // 1 + kMaxFixedDigitsBeforePoint + 1 + kMaxFixedDigitsAfterPoint characters
-  // (one additional character for the sign, and one for the decimal point).
-  bool ToFixed(double value,
-               int requested_digits,
-               StringBuilder* result_builder) const;
-
-  // Computes a representation in exponential format with requested_digits
-  // after the decimal point. The last emitted digit is rounded.
-  // If requested_digits equals -1, then the shortest exponential representation
-  // is computed.
-  //
-  // Examples with EMIT_POSITIVE_EXPONENT_SIGN deactivated, and
-  //               exponent_character set to 'e'.
-  //   ToExponential(3.12, 1) -> "3.1e0"
-  //   ToExponential(5.0, 3) -> "5.000e0"
-  //   ToExponential(0.001, 2) -> "1.00e-3"
-  //   ToExponential(3.1415, -1) -> "3.1415e0"
-  //   ToExponential(3.1415, 4) -> "3.1415e0"
-  //   ToExponential(3.1415, 3) -> "3.142e0"
-  //   ToExponential(123456789000000, 3) -> "1.235e14"
-  //   ToExponential(1000000000000000019884624838656.0, -1) -> "1e30"
-  //   ToExponential(1000000000000000019884624838656.0, 32) ->
-  //                     "1.00000000000000001988462483865600e30"
-  //   ToExponential(1234, 0) -> "1e3"
-  //
-  // Returns true if the conversion succeeds. The conversion always succeeds
-  // except for the following cases:
-  //   - the input value is special and no infinity_symbol or nan_symbol has
-  //     been provided to the constructor,
-  //   - 'requested_digits' > kMaxExponentialDigits.
-  // The last condition implies that the result will never contain more than
-  // kMaxExponentialDigits + 8 characters (the sign, the digit before the
-  // decimal point, the decimal point, the exponent character, the
-  // exponent's sign, and at most 3 exponent digits).
-  bool ToExponential(double value,
-                     int requested_digits,
-                     StringBuilder* result_builder) const;
-
-  // Computes 'precision' leading digits of the given 'value' and returns them
-  // either in exponential or decimal format, depending on
-  // max_{leading|trailing}_padding_zeroes_in_precision_mode (given to the
-  // constructor).
-  // The last computed digit is rounded.
-  //
-  // Example with max_leading_padding_zeroes_in_precision_mode = 6.
-  //   ToPrecision(0.0000012345, 2) -> "0.0000012"
-  //   ToPrecision(0.00000012345, 2) -> "1.2e-7"
-  // Similarily the converter may add up to
-  // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid
-  // returning an exponential representation. A zero added by the
-  // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit.
-  // Examples for max_trailing_padding_zeroes_in_precision_mode = 1:
-  //   ToPrecision(230.0, 2) -> "230"
-  //   ToPrecision(230.0, 2) -> "230."  with EMIT_TRAILING_DECIMAL_POINT.
-  //   ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT.
-  // Examples for max_trailing_padding_zeroes_in_precision_mode = 3, and no
-  //    EMIT_TRAILING_ZERO_AFTER_POINT:
-  //   ToPrecision(123450.0, 6) -> "123450"
-  //   ToPrecision(123450.0, 5) -> "123450"
-  //   ToPrecision(123450.0, 4) -> "123500"
-  //   ToPrecision(123450.0, 3) -> "123000"
-  //   ToPrecision(123450.0, 2) -> "1.2e5"
-  //
-  // Returns true if the conversion succeeds. The conversion always succeeds
-  // except for the following cases:
-  //   - the input value is special and no infinity_symbol or nan_symbol has
-  //     been provided to the constructor,
-  //   - precision < kMinPericisionDigits
-  //   - precision > kMaxPrecisionDigits
-  // The last condition implies that the result will never contain more than
-  // kMaxPrecisionDigits + 7 characters (the sign, the decimal point, the
-  // exponent character, the exponent's sign, and at most 3 exponent digits).
-  bool ToPrecision(double value,
-                   int precision,
-                   StringBuilder* result_builder) const;
-
-  enum DtoaMode {
-    // Produce the shortest correct representation.
-    // For example the output of 0.299999999999999988897 is (the less accurate
-    // but correct) 0.3.
-    SHORTEST,
-    // Same as SHORTEST, but for single-precision floats.
-    SHORTEST_SINGLE,
-    // Produce a fixed number of digits after the decimal point.
-    // For instance fixed(0.1, 4) becomes 0.1000
-    // If the input number is big, the output will be big.
-    FIXED,
-    // Fixed number of digits (independent of the decimal point).
-    PRECISION
-  };
-
-  // The maximal number of digits that are needed to emit a double in base 10.
-  // A higher precision can be achieved by using more digits, but the shortest
-  // accurate representation of any double will never use more digits than
-  // kBase10MaximalLength.
-  // Note that DoubleToAscii null-terminates its input. So the given buffer
-  // should be at least kBase10MaximalLength + 1 characters long.
-  static const int kBase10MaximalLength = 17;
-
-  // Converts the given double 'v' to digit characters. 'v' must not be NaN,
-  // +Infinity, or -Infinity. In SHORTEST_SINGLE-mode this restriction also
-  // applies to 'v' after it has been casted to a single-precision float. That
-  // is, in this mode static_cast<float>(v) must not be NaN, +Infinity or
-  // -Infinity.
-  //
-  // The result should be interpreted as buffer * 10^(point-length).
-  //
-  // The digits are written to the buffer in the platform's charset, which is
-  // often UTF-8 (with ASCII-range digits) but may be another charset, such
-  // as EBCDIC.
-  //
-  // The output depends on the given mode:
-  //  - SHORTEST: produce the least amount of digits for which the internal
-  //   identity requirement is still satisfied. If the digits are printed
-  //   (together with the correct exponent) then reading this number will give
-  //   'v' again. The buffer will choose the representation that is closest to
-  //   'v'. If there are two at the same distance, than the one farther away
-  //   from 0 is chosen (halfway cases - ending with 5 - are rounded up).
-  //   In this mode the 'requested_digits' parameter is ignored.
-  //  - SHORTEST_SINGLE: same as SHORTEST but with single-precision.
-  //  - FIXED: produces digits necessary to print a given number with
-  //   'requested_digits' digits after the decimal point. The produced digits
-  //   might be too short in which case the caller has to fill the remainder
-  //   with '0's.
-  //   Example: toFixed(0.001, 5) is allowed to return buffer="1", point=-2.
-  //   Halfway cases are rounded towards +/-Infinity (away from 0). The call
-  //   toFixed(0.15, 2) thus returns buffer="2", point=0.
-  //   The returned buffer may contain digits that would be truncated from the
-  //   shortest representation of the input.
-  //  - PRECISION: produces 'requested_digits' where the first digit is not '0'.
-  //   Even though the length of produced digits usually equals
-  //   'requested_digits', the function is allowed to return fewer digits, in
-  //   which case the caller has to fill the missing digits with '0's.
-  //   Halfway cases are again rounded away from 0.
-  // DoubleToAscii expects the given buffer to be big enough to hold all
-  // digits and a terminating null-character. In SHORTEST-mode it expects a
-  // buffer of at least kBase10MaximalLength + 1. In all other modes the
-  // requested_digits parameter and the padding-zeroes limit the size of the
-  // output. Don't forget the decimal point, the exponent character and the
-  // terminating null-character when computing the maximal output size.
-  // The given length is only used in debug mode to ensure the buffer is big
-  // enough.
-  static void DoubleToAscii(double v,
-                            DtoaMode mode,
-                            int requested_digits,
-                            char* buffer,
-                            int buffer_length,
-                            bool* sign,
-                            int* length,
-                            int* point);
-
- private:
-  // Implementation for ToShortest and ToShortestSingle.
-  bool ToShortestIeeeNumber(double value,
-                            StringBuilder* result_builder,
-                            DtoaMode mode) const;
-
-  // If the value is a special value (NaN or Infinity) constructs the
-  // corresponding string using the configured infinity/nan-symbol.
-  // If either of them is NULL or the value is not special then the
-  // function returns false.
-  bool HandleSpecialValues(double value, StringBuilder* result_builder) const;
-  // Constructs an exponential representation (i.e. 1.234e56).
-  // The given exponent assumes a decimal point after the first decimal digit.
-  void CreateExponentialRepresentation(const char* decimal_digits,
-                                       int length,
-                                       int exponent,
-                                       StringBuilder* result_builder) const;
-  // Creates a decimal representation (i.e 1234.5678).
-  void CreateDecimalRepresentation(const char* decimal_digits,
-                                   int length,
-                                   int decimal_point,
-                                   int digits_after_point,
-                                   StringBuilder* result_builder) const;
-
-  const int flags_;
-  const char* const infinity_symbol_;
-  const char* const nan_symbol_;
-  const char exponent_character_;
-  const int decimal_in_shortest_low_;
-  const int decimal_in_shortest_high_;
-  const int max_leading_padding_zeroes_in_precision_mode_;
-  const int max_trailing_padding_zeroes_in_precision_mode_;
-
-  DC_DISALLOW_IMPLICIT_CONSTRUCTORS(DoubleToStringConverter);
-};
-
-
-class StringToDoubleConverter {
- public:
-  // Enumeration for allowing octals and ignoring junk when converting
-  // strings to numbers.
-  enum Flags {
-    NO_FLAGS = 0,
-    ALLOW_HEX = 1,
-    ALLOW_OCTALS = 2,
-    ALLOW_TRAILING_JUNK = 4,
-    ALLOW_LEADING_SPACES = 8,
-    ALLOW_TRAILING_SPACES = 16,
-    ALLOW_SPACES_AFTER_SIGN = 32,
-    ALLOW_CASE_INSENSIBILITY = 64,
-    ALLOW_HEX_FLOATS = 128,
-  };
-
-  static const uc16 kNoSeparator = '\0';
-
-  // Flags should be a bit-or combination of the possible Flags-enum.
-  //  - NO_FLAGS: no special flags.
-  //  - ALLOW_HEX: recognizes the prefix "0x". Hex numbers may only be integers.
-  //      Ex: StringToDouble("0x1234") -> 4660.0
-  //          In StringToDouble("0x1234.56") the characters ".56" are trailing
-  //          junk. The result of the call is hence dependent on
-  //          the ALLOW_TRAILING_JUNK flag and/or the junk value.
-  //      With this flag "0x" is a junk-string. Even with ALLOW_TRAILING_JUNK,
-  //      the string will not be parsed as "0" followed by junk.
-  //
-  //  - ALLOW_OCTALS: recognizes the prefix "0" for octals:
-  //      If a sequence of octal digits starts with '0', then the number is
-  //      read as octal integer. Octal numbers may only be integers.
-  //      Ex: StringToDouble("01234") -> 668.0
-  //          StringToDouble("012349") -> 12349.0  // Not a sequence of octal
-  //                                               // digits.
-  //          In StringToDouble("01234.56") the characters ".56" are trailing
-  //          junk. The result of the call is hence dependent on
-  //          the ALLOW_TRAILING_JUNK flag and/or the junk value.
-  //          In StringToDouble("01234e56") the characters "e56" are trailing
-  //          junk, too.
-  //  - ALLOW_TRAILING_JUNK: ignore trailing characters that are not part of
-  //      a double literal.
-  //  - ALLOW_LEADING_SPACES: skip over leading whitespace, including spaces,
-  //                          new-lines, and tabs.
-  //  - ALLOW_TRAILING_SPACES: ignore trailing whitespace.
-  //  - ALLOW_SPACES_AFTER_SIGN: ignore whitespace after the sign.
-  //       Ex: StringToDouble("-   123.2") -> -123.2.
-  //           StringToDouble("+   123.2") -> 123.2
-  //  - ALLOW_CASE_INSENSIBILITY: ignore case of characters for special values:
-  //      infinity and nan.
-  //  - ALLOW_HEX_FLOATS: allows hexadecimal float literals.
-  //      This *must* start with "0x" and separate the exponent with "p".
-  //      Examples: 0x1.2p3 == 9.0
-  //                0x10.1p0 == 16.0625
-  //      ALLOW_HEX and ALLOW_HEX_FLOATS are indendent.
-  //
-  // empty_string_value is returned when an empty string is given as input.
-  // If ALLOW_LEADING_SPACES or ALLOW_TRAILING_SPACES are set, then a string
-  // containing only spaces is converted to the 'empty_string_value', too.
-  //
-  // junk_string_value is returned when
-  //  a) ALLOW_TRAILING_JUNK is not set, and a junk character (a character not
-  //     part of a double-literal) is found.
-  //  b) ALLOW_TRAILING_JUNK is set, but the string does not start with a
-  //     double literal.
-  //
-  // infinity_symbol and nan_symbol are strings that are used to detect
-  // inputs that represent infinity and NaN. They can be null, in which case
-  // they are ignored.
-  // The conversion routine first reads any possible signs. Then it compares the
-  // following character of the input-string with the first character of
-  // the infinity, and nan-symbol. If either matches, the function assumes, that
-  // a match has been found, and expects the following input characters to match
-  // the remaining characters of the special-value symbol.
-  // This means that the following restrictions apply to special-value symbols:
-  //  - they must not start with signs ('+', or '-'),
-  //  - they must not have the same first character.
-  //  - they must not start with digits.
-  //
-  // If the separator character is not kNoSeparator, then that specific
-  // character is ignored when in between two valid digits of the significant.
-  // It is not allowed to appear in the exponent.
-  // It is not allowed to lead or trail the number.
-  // It is not allowed to appear twice next to each other.
-  //
-  // Examples:
-  //  flags = ALLOW_HEX | ALLOW_TRAILING_JUNK,
-  //  empty_string_value = 0.0,
-  //  junk_string_value = NaN,
-  //  infinity_symbol = "infinity",
-  //  nan_symbol = "nan":
-  //    StringToDouble("0x1234") -> 4660.0.
-  //    StringToDouble("0x1234K") -> 4660.0.
-  //    StringToDouble("") -> 0.0  // empty_string_value.
-  //    StringToDouble(" ") -> NaN  // junk_string_value.
-  //    StringToDouble(" 1") -> NaN  // junk_string_value.
-  //    StringToDouble("0x") -> NaN  // junk_string_value.
-  //    StringToDouble("-123.45") -> -123.45.
-  //    StringToDouble("--123.45") -> NaN  // junk_string_value.
-  //    StringToDouble("123e45") -> 123e45.
-  //    StringToDouble("123E45") -> 123e45.
-  //    StringToDouble("123e+45") -> 123e45.
-  //    StringToDouble("123E-45") -> 123e-45.
-  //    StringToDouble("123e") -> 123.0  // trailing junk ignored.
-  //    StringToDouble("123e-") -> 123.0  // trailing junk ignored.
-  //    StringToDouble("+NaN") -> NaN  // NaN string literal.
-  //    StringToDouble("-infinity") -> -inf.  // infinity literal.
-  //    StringToDouble("Infinity") -> NaN  // junk_string_value.
-  //
-  //  flags = ALLOW_OCTAL | ALLOW_LEADING_SPACES,
-  //  empty_string_value = 0.0,
-  //  junk_string_value = NaN,
-  //  infinity_symbol = NULL,
-  //  nan_symbol = NULL:
-  //    StringToDouble("0x1234") -> NaN  // junk_string_value.
-  //    StringToDouble("01234") -> 668.0.
-  //    StringToDouble("") -> 0.0  // empty_string_value.
-  //    StringToDouble(" ") -> 0.0  // empty_string_value.
-  //    StringToDouble(" 1") -> 1.0
-  //    StringToDouble("0x") -> NaN  // junk_string_value.
-  //    StringToDouble("0123e45") -> NaN  // junk_string_value.
-  //    StringToDouble("01239E45") -> 1239e45.
-  //    StringToDouble("-infinity") -> NaN  // junk_string_value.
-  //    StringToDouble("NaN") -> NaN  // junk_string_value.
-  //
-  //  flags = NO_FLAGS,
-  //  separator = ' ':
-  //    StringToDouble("1 2 3 4") -> 1234.0
-  //    StringToDouble("1  2") -> NaN // junk_string_value
-  //    StringToDouble("1 000 000.0") -> 1000000.0
-  //    StringToDouble("1.000 000") -> 1.0
-  //    StringToDouble("1.0e1 000") -> NaN // junk_string_value
-  StringToDoubleConverter(int flags,
-                          double empty_string_value,
-                          double junk_string_value,
-                          const char* infinity_symbol,
-                          const char* nan_symbol,
-                          uc16 separator = kNoSeparator)
-      : flags_(flags),
-        empty_string_value_(empty_string_value),
-        junk_string_value_(junk_string_value),
-        infinity_symbol_(infinity_symbol),
-        nan_symbol_(nan_symbol),
-        separator_(separator) {
-  }
-
-  // Performs the conversion.
-  // The output parameter 'processed_characters_count' is set to the number
-  // of characters that have been processed to read the number.
-  // Spaces than are processed with ALLOW_{LEADING|TRAILING}_SPACES are included
-  // in the 'processed_characters_count'. Trailing junk is never included.
-  double StringToDouble(const char* buffer,
-                        int length,
-                        int* processed_characters_count) const;
-
-  // Same as StringToDouble above but for 16 bit characters.
-  double StringToDouble(const uc16* buffer,
-                        int length,
-                        int* processed_characters_count) const;
-
-  // Same as StringToDouble but reads a float.
-  // Note that this is not equivalent to static_cast<float>(StringToDouble(...))
-  // due to potential double-rounding.
-  float StringToFloat(const char* buffer,
-                      int length,
-                      int* processed_characters_count) const;
-
-  // Same as StringToFloat above but for 16 bit characters.
-  float StringToFloat(const uc16* buffer,
-                      int length,
-                      int* processed_characters_count) const;
-
- private:
-  const int flags_;
-  const double empty_string_value_;
-  const double junk_string_value_;
-  const char* const infinity_symbol_;
-  const char* const nan_symbol_;
-  const uc16 separator_;
-
-  template <class Iterator>
-  double StringToIeee(Iterator start_pointer,
-                      int length,
-                      bool read_as_double,
-                      int* processed_characters_count) const;
-
-  DC_DISALLOW_IMPLICIT_CONSTRUCTORS(StringToDoubleConverter);
-};
-
-}  // namespace double_conversion
+#include "string-to-double.h"
+#include "double-to-string.h"
 
 #endif  // DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_
diff --git a/Foundation/src/double-to-string.cc b/Foundation/src/double-to-string.cc
new file mode 100644
index 000000000..9255bce17
--- /dev/null
+++ b/Foundation/src/double-to-string.cc
@@ -0,0 +1,440 @@
+// Copyright 2010 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials provided
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <algorithm>
+#include <climits>
+#include <cmath>
+
+#include "double-to-string.h"
+
+#include "bignum-dtoa.h"
+#include "fast-dtoa.h"
+#include "fixed-dtoa.h"
+#include "ieee.h"
+#include "utils.h"
+
+namespace double_conversion {
+
+const DoubleToStringConverter& DoubleToStringConverter::EcmaScriptConverter() {
+  int flags = UNIQUE_ZERO | EMIT_POSITIVE_EXPONENT_SIGN;
+  static DoubleToStringConverter converter(flags,
+                                           "Infinity",
+                                           "NaN",
+                                           'e',
+                                           -6, 21,
+                                           6, 0);
+  return converter;
+}
+
+
+bool DoubleToStringConverter::HandleSpecialValues(
+    double value,
+    StringBuilder* result_builder) const {
+  Double double_inspect(value);
+  if (double_inspect.IsInfinite()) {
+    if (infinity_symbol_ == NULL) return false;
+    if (value < 0) {
+      result_builder->AddCharacter('-');
+    }
+    result_builder->AddString(infinity_symbol_);
+    return true;
+  }
+  if (double_inspect.IsNan()) {
+    if (nan_symbol_ == NULL) return false;
+    result_builder->AddString(nan_symbol_);
+    return true;
+  }
+  return false;
+}
+
+
+void DoubleToStringConverter::CreateExponentialRepresentation(
+    const char* decimal_digits,
+    int length,
+    int exponent,
+    StringBuilder* result_builder) const {
+  DOUBLE_CONVERSION_ASSERT(length != 0);
+  result_builder->AddCharacter(decimal_digits[0]);
+  if (length != 1) {
+    result_builder->AddCharacter('.');
+    result_builder->AddSubstring(&decimal_digits[1], length-1);
+  }
+  result_builder->AddCharacter(exponent_character_);
+  if (exponent < 0) {
+    result_builder->AddCharacter('-');
+    exponent = -exponent;
+  } else {
+    if ((flags_ & EMIT_POSITIVE_EXPONENT_SIGN) != 0) {
+      result_builder->AddCharacter('+');
+    }
+  }
+  DOUBLE_CONVERSION_ASSERT(exponent < 1e4);
+  // Changing this constant requires updating the comment of DoubleToStringConverter constructor
+  const int kMaxExponentLength = 5;
+  char buffer[kMaxExponentLength + 1];
+  buffer[kMaxExponentLength] = '\0';
+  int first_char_pos = kMaxExponentLength;
+  if (exponent == 0) {
+    buffer[--first_char_pos] = '0';
+  } else {
+    while (exponent > 0) {
+      buffer[--first_char_pos] = '0' + (exponent % 10);
+      exponent /= 10;
+    }
+  }
+  // Add prefix '0' to make exponent width >= min(min_exponent_with_, kMaxExponentLength)
+  // For example: convert 1e+9 -> 1e+09, if min_exponent_with_ is set to 2
+  while(kMaxExponentLength - first_char_pos < std::min(min_exponent_width_, kMaxExponentLength)) {
+    buffer[--first_char_pos] = '0';
+  }
+  result_builder->AddSubstring(&buffer[first_char_pos],
+                               kMaxExponentLength - first_char_pos);
+}
+
+
+void DoubleToStringConverter::CreateDecimalRepresentation(
+    const char* decimal_digits,
+    int length,
+    int decimal_point,
+    int digits_after_point,
+    StringBuilder* result_builder) const {
+  // Create a representation that is padded with zeros if needed.
+  if (decimal_point <= 0) {
+      // "0.00000decimal_rep" or "0.000decimal_rep00".
+    result_builder->AddCharacter('0');
+    if (digits_after_point > 0) {
+      result_builder->AddCharacter('.');
+      result_builder->AddPadding('0', -decimal_point);
+      DOUBLE_CONVERSION_ASSERT(length <= digits_after_point - (-decimal_point));
+      result_builder->AddSubstring(decimal_digits, length);
+      int remaining_digits = digits_after_point - (-decimal_point) - length;
+      result_builder->AddPadding('0', remaining_digits);
+    }
+  } else if (decimal_point >= length) {
+    // "decimal_rep0000.00000" or "decimal_rep.0000".
+    result_builder->AddSubstring(decimal_digits, length);
+    result_builder->AddPadding('0', decimal_point - length);
+    if (digits_after_point > 0) {
+      result_builder->AddCharacter('.');
+      result_builder->AddPadding('0', digits_after_point);
+    }
+  } else {
+    // "decima.l_rep000".
+    DOUBLE_CONVERSION_ASSERT(digits_after_point > 0);
+    result_builder->AddSubstring(decimal_digits, decimal_point);
+    result_builder->AddCharacter('.');
+    DOUBLE_CONVERSION_ASSERT(length - decimal_point <= digits_after_point);
+    result_builder->AddSubstring(&decimal_digits[decimal_point],
+                                 length - decimal_point);
+    int remaining_digits = digits_after_point - (length - decimal_point);
+    result_builder->AddPadding('0', remaining_digits);
+  }
+  if (digits_after_point == 0) {
+    if ((flags_ & EMIT_TRAILING_DECIMAL_POINT) != 0) {
+      result_builder->AddCharacter('.');
+    }
+    if ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) {
+      result_builder->AddCharacter('0');
+    }
+  }
+}
+
+
+bool DoubleToStringConverter::ToShortestIeeeNumber(
+    double value,
+    StringBuilder* result_builder,
+    DoubleToStringConverter::DtoaMode mode) const {
+  DOUBLE_CONVERSION_ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE);
+  if (Double(value).IsSpecial()) {
+    return HandleSpecialValues(value, result_builder);
+  }
+
+  int decimal_point;
+  bool sign;
+  const int kDecimalRepCapacity = kBase10MaximalLength + 1;
+  char decimal_rep[kDecimalRepCapacity];
+  int decimal_rep_length;
+
+  DoubleToAscii(value, mode, 0, decimal_rep, kDecimalRepCapacity,
+                &sign, &decimal_rep_length, &decimal_point);
+
+  bool unique_zero = (flags_ & UNIQUE_ZERO) != 0;
+  if (sign && (value != 0.0 || !unique_zero)) {
+    result_builder->AddCharacter('-');
+  }
+
+  int exponent = decimal_point - 1;
+  if ((decimal_in_shortest_low_ <= exponent) &&
+      (exponent < decimal_in_shortest_high_)) {
+    CreateDecimalRepresentation(decimal_rep, decimal_rep_length,
+                                decimal_point,
+                                (std::max)(0, decimal_rep_length - decimal_point),
+                                result_builder);
+  } else {
+    CreateExponentialRepresentation(decimal_rep, decimal_rep_length, exponent,
+                                    result_builder);
+  }
+  return true;
+}
+
+
+bool DoubleToStringConverter::ToFixed(double value,
+                                      int requested_digits,
+                                      StringBuilder* result_builder) const {
+  DOUBLE_CONVERSION_ASSERT(kMaxFixedDigitsBeforePoint == 60);
+  const double kFirstNonFixed = 1e60;
+
+  if (Double(value).IsSpecial()) {
+    return HandleSpecialValues(value, result_builder);
+  }
+
+  if (requested_digits > kMaxFixedDigitsAfterPoint) return false;
+  if (value >= kFirstNonFixed || value <= -kFirstNonFixed) return false;
+
+  // Find a sufficiently precise decimal representation of n.
+  int decimal_point;
+  bool sign;
+  // Add space for the '\0' byte.
+  const int kDecimalRepCapacity =
+      kMaxFixedDigitsBeforePoint + kMaxFixedDigitsAfterPoint + 1;
+  char decimal_rep[kDecimalRepCapacity];
+  int decimal_rep_length;
+  DoubleToAscii(value, FIXED, requested_digits,
+                decimal_rep, kDecimalRepCapacity,
+                &sign, &decimal_rep_length, &decimal_point);
+
+  bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0);
+  if (sign && (value != 0.0 || !unique_zero)) {
+    result_builder->AddCharacter('-');
+  }
+
+  CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point,
+                              requested_digits, result_builder);
+  return true;
+}
+
+
+bool DoubleToStringConverter::ToExponential(
+    double value,
+    int requested_digits,
+    StringBuilder* result_builder) const {
+  if (Double(value).IsSpecial()) {
+    return HandleSpecialValues(value, result_builder);
+  }
+
+  if (requested_digits < -1) return false;
+  if (requested_digits > kMaxExponentialDigits) return false;
+
+  int decimal_point;
+  bool sign;
+  // Add space for digit before the decimal point and the '\0' character.
+  const int kDecimalRepCapacity = kMaxExponentialDigits + 2;
+  DOUBLE_CONVERSION_ASSERT(kDecimalRepCapacity > kBase10MaximalLength);
+  char decimal_rep[kDecimalRepCapacity];
+#ifndef NDEBUG
+  // Problem: there is an assert in StringBuilder::AddSubstring() that
+  // will pass this buffer to strlen(), and this buffer is not generally
+  // null-terminated.
+  memset(decimal_rep, 0, sizeof(decimal_rep));
+#endif
+  int decimal_rep_length;
+
+  if (requested_digits == -1) {
+    DoubleToAscii(value, SHORTEST, 0,
+                  decimal_rep, kDecimalRepCapacity,
+                  &sign, &decimal_rep_length, &decimal_point);
+  } else {
+    DoubleToAscii(value, PRECISION, requested_digits + 1,
+                  decimal_rep, kDecimalRepCapacity,
+                  &sign, &decimal_rep_length, &decimal_point);
+    DOUBLE_CONVERSION_ASSERT(decimal_rep_length <= requested_digits + 1);
+
+    for (int i = decimal_rep_length; i < requested_digits + 1; ++i) {
+      decimal_rep[i] = '0';
+    }
+    decimal_rep_length = requested_digits + 1;
+  }
+
+  bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0);
+  if (sign && (value != 0.0 || !unique_zero)) {
+    result_builder->AddCharacter('-');
+  }
+
+  int exponent = decimal_point - 1;
+  CreateExponentialRepresentation(decimal_rep,
+                                  decimal_rep_length,
+                                  exponent,
+                                  result_builder);
+  return true;
+}
+
+
+bool DoubleToStringConverter::ToPrecision(double value,
+                                          int precision,
+                                          StringBuilder* result_builder) const {
+  if (Double(value).IsSpecial()) {
+    return HandleSpecialValues(value, result_builder);
+  }
+
+  if (precision < kMinPrecisionDigits || precision > kMaxPrecisionDigits) {
+    return false;
+  }
+
+  // Find a sufficiently precise decimal representation of n.
+  int decimal_point;
+  bool sign;
+  // Add one for the terminating null character.
+  const int kDecimalRepCapacity = kMaxPrecisionDigits + 1;
+  char decimal_rep[kDecimalRepCapacity];
+  int decimal_rep_length;
+
+  DoubleToAscii(value, PRECISION, precision,
+                decimal_rep, kDecimalRepCapacity,
+                &sign, &decimal_rep_length, &decimal_point);
+  DOUBLE_CONVERSION_ASSERT(decimal_rep_length <= precision);
+
+  bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0);
+  if (sign && (value != 0.0 || !unique_zero)) {
+    result_builder->AddCharacter('-');
+  }
+
+  // The exponent if we print the number as x.xxeyyy. That is with the
+  // decimal point after the first digit.
+  int exponent = decimal_point - 1;
+
+  int extra_zero = ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) ? 1 : 0;
+  bool as_exponential =
+      (-decimal_point + 1 > max_leading_padding_zeroes_in_precision_mode_) ||
+      (decimal_point - precision + extra_zero >
+       max_trailing_padding_zeroes_in_precision_mode_);
+  if ((flags_ & NO_TRAILING_ZERO) != 0) {
+    // Truncate trailing zeros that occur after the decimal point (if exponential,
+    // that is everything after the first digit).
+    int stop = as_exponential ? 1 : std::max(1, decimal_point);
+    while (decimal_rep_length > stop && decimal_rep[decimal_rep_length - 1] == '0') {
+      --decimal_rep_length;
+    }
+    // Clamp precision to avoid the code below re-adding the zeros.
+    precision = std::min(precision, decimal_rep_length);
+  }
+  if (as_exponential) {
+    // Fill buffer to contain 'precision' digits.
+    // Usually the buffer is already at the correct length, but 'DoubleToAscii'
+    // is allowed to return less characters.
+    for (int i = decimal_rep_length; i < precision; ++i) {
+      decimal_rep[i] = '0';
+    }
+
+    CreateExponentialRepresentation(decimal_rep,
+                                    precision,
+                                    exponent,
+                                    result_builder);
+  } else {
+    CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point,
+                                (std::max)(0, precision - decimal_point),
+                                result_builder);
+  }
+  return true;
+}
+
+
+static BignumDtoaMode DtoaToBignumDtoaMode(
+    DoubleToStringConverter::DtoaMode dtoa_mode) {
+  switch (dtoa_mode) {
+    case DoubleToStringConverter::SHORTEST:  return BIGNUM_DTOA_SHORTEST;
+    case DoubleToStringConverter::SHORTEST_SINGLE:
+        return BIGNUM_DTOA_SHORTEST_SINGLE;
+    case DoubleToStringConverter::FIXED:     return BIGNUM_DTOA_FIXED;
+    case DoubleToStringConverter::PRECISION: return BIGNUM_DTOA_PRECISION;
+    default:
+      DOUBLE_CONVERSION_UNREACHABLE();
+  }
+}
+
+
+void DoubleToStringConverter::DoubleToAscii(double v,
+                                            DtoaMode mode,
+                                            int requested_digits,
+                                            char* buffer,
+                                            int buffer_length,
+                                            bool* sign,
+                                            int* length,
+                                            int* point) {
+  Vector<char> vector(buffer, buffer_length);
+  DOUBLE_CONVERSION_ASSERT(!Double(v).IsSpecial());
+  DOUBLE_CONVERSION_ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE || requested_digits >= 0);
+
+  if (Double(v).Sign() < 0) {
+    *sign = true;
+    v = -v;
+  } else {
+    *sign = false;
+  }
+
+  if (mode == PRECISION && requested_digits == 0) {
+    vector[0] = '\0';
+    *length = 0;
+    return;
+  }
+
+  if (v == 0) {
+    vector[0] = '0';
+    vector[1] = '\0';
+    *length = 1;
+    *point = 1;
+    return;
+  }
+
+  bool fast_worked;
+  switch (mode) {
+    case SHORTEST:
+      fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST, 0, vector, length, point);
+      break;
+    case SHORTEST_SINGLE:
+      fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST_SINGLE, 0,
+                             vector, length, point);
+      break;
+    case FIXED:
+      fast_worked = FastFixedDtoa(v, requested_digits, vector, length, point);
+      break;
+    case PRECISION:
+      fast_worked = FastDtoa(v, FAST_DTOA_PRECISION, requested_digits,
+                             vector, length, point);
+      break;
+    default:
+      fast_worked = false;
+      DOUBLE_CONVERSION_UNREACHABLE();
+  }
+  if (fast_worked) return;
+
+  // If the fast dtoa didn't succeed use the slower bignum version.
+  BignumDtoaMode bignum_mode = DtoaToBignumDtoaMode(mode);
+  BignumDtoa(v, bignum_mode, requested_digits, vector, length, point);
+  vector[*length] = '\0';
+}
+
+}  // namespace double_conversion
diff --git a/Foundation/src/double-to-string.h b/Foundation/src/double-to-string.h
new file mode 100644
index 000000000..04a4ac384
--- /dev/null
+++ b/Foundation/src/double-to-string.h
@@ -0,0 +1,445 @@
+// Copyright 2012 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials provided
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_
+#define DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_
+
+#include "utils.h"
+
+namespace double_conversion {
+
+class DoubleToStringConverter {
+ public:
+  // When calling ToFixed with a double > 10^kMaxFixedDigitsBeforePoint
+  // or a requested_digits parameter > kMaxFixedDigitsAfterPoint then the
+  // function returns false.
+  static const int kMaxFixedDigitsBeforePoint = 60;
+  static const int kMaxFixedDigitsAfterPoint = 100;
+
+  // When calling ToExponential with a requested_digits
+  // parameter > kMaxExponentialDigits then the function returns false.
+  static const int kMaxExponentialDigits = 120;
+
+  // When calling ToPrecision with a requested_digits
+  // parameter < kMinPrecisionDigits or requested_digits > kMaxPrecisionDigits
+  // then the function returns false.
+  static const int kMinPrecisionDigits = 1;
+  static const int kMaxPrecisionDigits = 120;
+
+  // The maximal number of digits that are needed to emit a double in base 10.
+  // A higher precision can be achieved by using more digits, but the shortest
+  // accurate representation of any double will never use more digits than
+  // kBase10MaximalLength.
+  // Note that DoubleToAscii null-terminates its input. So the given buffer
+  // should be at least kBase10MaximalLength + 1 characters long.
+  static const int kBase10MaximalLength = 17;
+
+  // The maximal number of digits that are needed to emit a single in base 10.
+  // A higher precision can be achieved by using more digits, but the shortest
+  // accurate representation of any single will never use more digits than
+  // kBase10MaximalLengthSingle.
+  static const int kBase10MaximalLengthSingle = 9;
+
+  // The length of the longest string that 'ToShortest' can produce when the
+  // converter is instantiated with EcmaScript defaults (see
+  // 'EcmaScriptConverter')
+  // This value does not include the trailing '\0' character.
+  // This amount of characters is needed for negative values that hit the
+  // 'decimal_in_shortest_low' limit. For example: "-0.0000033333333333333333"
+  static const int kMaxCharsEcmaScriptShortest = 25;
+
+  enum Flags {
+    NO_FLAGS = 0,
+    EMIT_POSITIVE_EXPONENT_SIGN = 1,
+    EMIT_TRAILING_DECIMAL_POINT = 2,
+    EMIT_TRAILING_ZERO_AFTER_POINT = 4,
+    UNIQUE_ZERO = 8,
+    NO_TRAILING_ZERO = 16
+  };
+
+  // Flags should be a bit-or combination of the possible Flags-enum.
+  //  - NO_FLAGS: no special flags.
+  //  - EMIT_POSITIVE_EXPONENT_SIGN: when the number is converted into exponent
+  //    form, emits a '+' for positive exponents. Example: 1.2e+2.
+  //  - EMIT_TRAILING_DECIMAL_POINT: when the input number is an integer and is
+  //    converted into decimal format then a trailing decimal point is appended.
+  //    Example: 2345.0 is converted to "2345.".
+  //  - EMIT_TRAILING_ZERO_AFTER_POINT: in addition to a trailing decimal point
+  //    emits a trailing '0'-character. This flag requires the
+  //    EMIT_TRAILING_DECIMAL_POINT flag.
+  //    Example: 2345.0 is converted to "2345.0".
+  //  - UNIQUE_ZERO: "-0.0" is converted to "0.0".
+  //  - NO_TRAILING_ZERO: Trailing zeros are removed from the fractional portion
+  //    of the result in precision mode. Matches printf's %g.
+  //    When EMIT_TRAILING_ZERO_AFTER_POINT is also given, one trailing zero is
+  //    preserved.
+  //
+  // Infinity symbol and nan_symbol provide the string representation for these
+  // special values. If the string is NULL and the special value is encountered
+  // then the conversion functions return false.
+  //
+  // The exponent_character is used in exponential representations. It is
+  // usually 'e' or 'E'.
+  //
+  // When converting to the shortest representation the converter will
+  // represent input numbers in decimal format if they are in the interval
+  // [10^decimal_in_shortest_low; 10^decimal_in_shortest_high[
+  //    (lower boundary included, greater boundary excluded).
+  // Example: with decimal_in_shortest_low = -6 and
+  //               decimal_in_shortest_high = 21:
+  //   ToShortest(0.000001)  -> "0.000001"
+  //   ToShortest(0.0000001) -> "1e-7"
+  //   ToShortest(111111111111111111111.0)  -> "111111111111111110000"
+  //   ToShortest(100000000000000000000.0)  -> "100000000000000000000"
+  //   ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21"
+  //
+  // When converting to precision mode the converter may add
+  // max_leading_padding_zeroes before returning the number in exponential
+  // format.
+  // Example with max_leading_padding_zeroes_in_precision_mode = 6.
+  //   ToPrecision(0.0000012345, 2) -> "0.0000012"
+  //   ToPrecision(0.00000012345, 2) -> "1.2e-7"
+  // Similarly the converter may add up to
+  // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid
+  // returning an exponential representation. A zero added by the
+  // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit.
+  // Examples for max_trailing_padding_zeroes_in_precision_mode = 1:
+  //   ToPrecision(230.0, 2) -> "230"
+  //   ToPrecision(230.0, 2) -> "230."  with EMIT_TRAILING_DECIMAL_POINT.
+  //   ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT.
+  //
+  // The min_exponent_width is used for exponential representations.
+  // The converter adds leading '0's to the exponent until the exponent
+  // is at least min_exponent_width digits long.
+  // The min_exponent_width is clamped to 5.
+  // As such, the exponent may never have more than 5 digits in total.
+  DoubleToStringConverter(int flags,
+                          const char* infinity_symbol,
+                          const char* nan_symbol,
+                          char exponent_character,
+                          int decimal_in_shortest_low,
+                          int decimal_in_shortest_high,
+                          int max_leading_padding_zeroes_in_precision_mode,
+                          int max_trailing_padding_zeroes_in_precision_mode,
+                          int min_exponent_width = 0)
+      : flags_(flags),
+        infinity_symbol_(infinity_symbol),
+        nan_symbol_(nan_symbol),
+        exponent_character_(exponent_character),
+        decimal_in_shortest_low_(decimal_in_shortest_low),
+        decimal_in_shortest_high_(decimal_in_shortest_high),
+        max_leading_padding_zeroes_in_precision_mode_(
+            max_leading_padding_zeroes_in_precision_mode),
+        max_trailing_padding_zeroes_in_precision_mode_(
+            max_trailing_padding_zeroes_in_precision_mode),
+        min_exponent_width_(min_exponent_width) {
+    // When 'trailing zero after the point' is set, then 'trailing point'
+    // must be set too.
+    DOUBLE_CONVERSION_ASSERT(((flags & EMIT_TRAILING_DECIMAL_POINT) != 0) ||
+        !((flags & EMIT_TRAILING_ZERO_AFTER_POINT) != 0));
+  }
+
+  // Returns a converter following the EcmaScript specification.
+  //
+  // Flags: UNIQUE_ZERO and EMIT_POSITIVE_EXPONENT_SIGN.
+  // Special values: "Infinity" and "NaN".
+  // Lower case 'e' for exponential values.
+  // decimal_in_shortest_low: -6
+  // decimal_in_shortest_high: 21
+  // max_leading_padding_zeroes_in_precision_mode: 6
+  // max_trailing_padding_zeroes_in_precision_mode: 0
+  static const DoubleToStringConverter& EcmaScriptConverter();
+
+  // Computes the shortest string of digits that correctly represent the input
+  // number. Depending on decimal_in_shortest_low and decimal_in_shortest_high
+  // (see constructor) it then either returns a decimal representation, or an
+  // exponential representation.
+  // Example with decimal_in_shortest_low = -6,
+  //              decimal_in_shortest_high = 21,
+  //              EMIT_POSITIVE_EXPONENT_SIGN activated, and
+  //              EMIT_TRAILING_DECIMAL_POINT deactivated:
+  //   ToShortest(0.000001)  -> "0.000001"
+  //   ToShortest(0.0000001) -> "1e-7"
+  //   ToShortest(111111111111111111111.0)  -> "111111111111111110000"
+  //   ToShortest(100000000000000000000.0)  -> "100000000000000000000"
+  //   ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21"
+  //
+  // Note: the conversion may round the output if the returned string
+  // is accurate enough to uniquely identify the input-number.
+  // For example the most precise representation of the double 9e59 equals
+  // "899999999999999918767229449717619953810131273674690656206848", but
+  // the converter will return the shorter (but still correct) "9e59".
+  //
+  // Returns true if the conversion succeeds. The conversion always succeeds
+  // except when the input value is special and no infinity_symbol or
+  // nan_symbol has been given to the constructor.
+  //
+  // The length of the longest result is the maximum of the length of the
+  // following string representations (each with possible examples):
+  // - NaN and negative infinity: "NaN", "-Infinity", "-inf".
+  // - -10^(decimal_in_shortest_high - 1):
+  //      "-100000000000000000000", "-1000000000000000.0"
+  // - the longest string in range [0; -10^decimal_in_shortest_low]. Generally,
+  //   this string is 3 + kBase10MaximalLength - decimal_in_shortest_low.
+  //   (Sign, '0', decimal point, padding zeroes for decimal_in_shortest_low,
+  //   and the significant digits).
+  //      "-0.0000033333333333333333", "-0.0012345678901234567"
+  // - the longest exponential representation. (A negative number with
+  //   kBase10MaximalLength significant digits).
+  //      "-1.7976931348623157e+308", "-1.7976931348623157E308"
+  // In addition, the buffer must be able to hold the trailing '\0' character.
+  bool ToShortest(double value, StringBuilder* result_builder) const {
+    return ToShortestIeeeNumber(value, result_builder, SHORTEST);
+  }
+
+  // Same as ToShortest, but for single-precision floats.
+  bool ToShortestSingle(float value, StringBuilder* result_builder) const {
+    return ToShortestIeeeNumber(value, result_builder, SHORTEST_SINGLE);
+  }
+
+
+  // Computes a decimal representation with a fixed number of digits after the
+  // decimal point. The last emitted digit is rounded.
+  //
+  // Examples:
+  //   ToFixed(3.12, 1) -> "3.1"
+  //   ToFixed(3.1415, 3) -> "3.142"
+  //   ToFixed(1234.56789, 4) -> "1234.5679"
+  //   ToFixed(1.23, 5) -> "1.23000"
+  //   ToFixed(0.1, 4) -> "0.1000"
+  //   ToFixed(1e30, 2) -> "1000000000000000019884624838656.00"
+  //   ToFixed(0.1, 30) -> "0.100000000000000005551115123126"
+  //   ToFixed(0.1, 17) -> "0.10000000000000001"
+  //
+  // If requested_digits equals 0, then the tail of the result depends on
+  // the EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT.
+  // Examples, for requested_digits == 0,
+  //   let EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT be
+  //    - false and false: then 123.45 -> 123
+  //                             0.678 -> 1
+  //    - true and false: then 123.45 -> 123.
+  //                            0.678 -> 1.
+  //    - true and true: then 123.45 -> 123.0
+  //                           0.678 -> 1.0
+  //
+  // Returns true if the conversion succeeds. The conversion always succeeds
+  // except for the following cases:
+  //   - the input value is special and no infinity_symbol or nan_symbol has
+  //     been provided to the constructor,
+  //   - 'value' > 10^kMaxFixedDigitsBeforePoint, or
+  //   - 'requested_digits' > kMaxFixedDigitsAfterPoint.
+  // The last two conditions imply that the result for non-special values never
+  // contains more than
+  //  1 + kMaxFixedDigitsBeforePoint + 1 + kMaxFixedDigitsAfterPoint characters
+  // (one additional character for the sign, and one for the decimal point).
+  // In addition, the buffer must be able to hold the trailing '\0' character.
+  bool ToFixed(double value,
+               int requested_digits,
+               StringBuilder* result_builder) const;
+
+  // Computes a representation in exponential format with requested_digits
+  // after the decimal point. The last emitted digit is rounded.
+  // If requested_digits equals -1, then the shortest exponential representation
+  // is computed.
+  //
+  // Examples with EMIT_POSITIVE_EXPONENT_SIGN deactivated, and
+  //               exponent_character set to 'e'.
+  //   ToExponential(3.12, 1) -> "3.1e0"
+  //   ToExponential(5.0, 3) -> "5.000e0"
+  //   ToExponential(0.001, 2) -> "1.00e-3"
+  //   ToExponential(3.1415, -1) -> "3.1415e0"
+  //   ToExponential(3.1415, 4) -> "3.1415e0"
+  //   ToExponential(3.1415, 3) -> "3.142e0"
+  //   ToExponential(123456789000000, 3) -> "1.235e14"
+  //   ToExponential(1000000000000000019884624838656.0, -1) -> "1e30"
+  //   ToExponential(1000000000000000019884624838656.0, 32) ->
+  //                     "1.00000000000000001988462483865600e30"
+  //   ToExponential(1234, 0) -> "1e3"
+  //
+  // Returns true if the conversion succeeds. The conversion always succeeds
+  // except for the following cases:
+  //   - the input value is special and no infinity_symbol or nan_symbol has
+  //     been provided to the constructor,
+  //   - 'requested_digits' > kMaxExponentialDigits.
+  //
+  // The last condition implies that the result never contains more than
+  // kMaxExponentialDigits + 8 characters (the sign, the digit before the
+  // decimal point, the decimal point, the exponent character, the
+  // exponent's sign, and at most 3 exponent digits).
+  // In addition, the buffer must be able to hold the trailing '\0' character.
+  bool ToExponential(double value,
+                     int requested_digits,
+                     StringBuilder* result_builder) const;
+
+
+  // Computes 'precision' leading digits of the given 'value' and returns them
+  // either in exponential or decimal format, depending on
+  // max_{leading|trailing}_padding_zeroes_in_precision_mode (given to the
+  // constructor).
+  // The last computed digit is rounded.
+  //
+  // Example with max_leading_padding_zeroes_in_precision_mode = 6.
+  //   ToPrecision(0.0000012345, 2) -> "0.0000012"
+  //   ToPrecision(0.00000012345, 2) -> "1.2e-7"
+  // Similarly the converter may add up to
+  // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid
+  // returning an exponential representation. A zero added by the
+  // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit.
+  // Examples for max_trailing_padding_zeroes_in_precision_mode = 1:
+  //   ToPrecision(230.0, 2) -> "230"
+  //   ToPrecision(230.0, 2) -> "230."  with EMIT_TRAILING_DECIMAL_POINT.
+  //   ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT.
+  // Examples for max_trailing_padding_zeroes_in_precision_mode = 3, and no
+  //    EMIT_TRAILING_ZERO_AFTER_POINT:
+  //   ToPrecision(123450.0, 6) -> "123450"
+  //   ToPrecision(123450.0, 5) -> "123450"
+  //   ToPrecision(123450.0, 4) -> "123500"
+  //   ToPrecision(123450.0, 3) -> "123000"
+  //   ToPrecision(123450.0, 2) -> "1.2e5"
+  //
+  // Returns true if the conversion succeeds. The conversion always succeeds
+  // except for the following cases:
+  //   - the input value is special and no infinity_symbol or nan_symbol has
+  //     been provided to the constructor,
+  //   - precision < kMinPericisionDigits
+  //   - precision > kMaxPrecisionDigits
+  //
+  // The last condition implies that the result never contains more than
+  // kMaxPrecisionDigits + 7 characters (the sign, the decimal point, the
+  // exponent character, the exponent's sign, and at most 3 exponent digits).
+  // In addition, the buffer must be able to hold the trailing '\0' character.
+  bool ToPrecision(double value,
+                   int precision,
+                   StringBuilder* result_builder) const;
+
+  enum DtoaMode {
+    // Produce the shortest correct representation.
+    // For example the output of 0.299999999999999988897 is (the less accurate
+    // but correct) 0.3.
+    SHORTEST,
+    // Same as SHORTEST, but for single-precision floats.
+    SHORTEST_SINGLE,
+    // Produce a fixed number of digits after the decimal point.
+    // For instance fixed(0.1, 4) becomes 0.1000
+    // If the input number is big, the output will be big.
+    FIXED,
+    // Fixed number of digits (independent of the decimal point).
+    PRECISION
+  };
+
+  // Converts the given double 'v' to digit characters. 'v' must not be NaN,
+  // +Infinity, or -Infinity. In SHORTEST_SINGLE-mode this restriction also
+  // applies to 'v' after it has been casted to a single-precision float. That
+  // is, in this mode static_cast<float>(v) must not be NaN, +Infinity or
+  // -Infinity.
+  //
+  // The result should be interpreted as buffer * 10^(point-length).
+  //
+  // The digits are written to the buffer in the platform's charset, which is
+  // often UTF-8 (with ASCII-range digits) but may be another charset, such
+  // as EBCDIC.
+  //
+  // The output depends on the given mode:
+  //  - SHORTEST: produce the least amount of digits for which the internal
+  //   identity requirement is still satisfied. If the digits are printed
+  //   (together with the correct exponent) then reading this number will give
+  //   'v' again. The buffer will choose the representation that is closest to
+  //   'v'. If there are two at the same distance, than the one farther away
+  //   from 0 is chosen (halfway cases - ending with 5 - are rounded up).
+  //   In this mode the 'requested_digits' parameter is ignored.
+  //  - SHORTEST_SINGLE: same as SHORTEST but with single-precision.
+  //  - FIXED: produces digits necessary to print a given number with
+  //   'requested_digits' digits after the decimal point. The produced digits
+  //   might be too short in which case the caller has to fill the remainder
+  //   with '0's.
+  //   Example: toFixed(0.001, 5) is allowed to return buffer="1", point=-2.
+  //   Halfway cases are rounded towards +/-Infinity (away from 0). The call
+  //   toFixed(0.15, 2) thus returns buffer="2", point=0.
+  //   The returned buffer may contain digits that would be truncated from the
+  //   shortest representation of the input.
+  //  - PRECISION: produces 'requested_digits' where the first digit is not '0'.
+  //   Even though the length of produced digits usually equals
+  //   'requested_digits', the function is allowed to return fewer digits, in
+  //   which case the caller has to fill the missing digits with '0's.
+  //   Halfway cases are again rounded away from 0.
+  // DoubleToAscii expects the given buffer to be big enough to hold all
+  // digits and a terminating null-character. In SHORTEST-mode it expects a
+  // buffer of at least kBase10MaximalLength + 1. In all other modes the
+  // requested_digits parameter and the padding-zeroes limit the size of the
+  // output. Don't forget the decimal point, the exponent character and the
+  // terminating null-character when computing the maximal output size.
+  // The given length is only used in debug mode to ensure the buffer is big
+  // enough.
+  static void DoubleToAscii(double v,
+                            DtoaMode mode,
+                            int requested_digits,
+                            char* buffer,
+                            int buffer_length,
+                            bool* sign,
+                            int* length,
+                            int* point);
+
+ private:
+  // Implementation for ToShortest and ToShortestSingle.
+  bool ToShortestIeeeNumber(double value,
+                            StringBuilder* result_builder,
+                            DtoaMode mode) const;
+
+  // If the value is a special value (NaN or Infinity) constructs the
+  // corresponding string using the configured infinity/nan-symbol.
+  // If either of them is NULL or the value is not special then the
+  // function returns false.
+  bool HandleSpecialValues(double value, StringBuilder* result_builder) const;
+  // Constructs an exponential representation (i.e. 1.234e56).
+  // The given exponent assumes a decimal point after the first decimal digit.
+  void CreateExponentialRepresentation(const char* decimal_digits,
+                                       int length,
+                                       int exponent,
+                                       StringBuilder* result_builder) const;
+  // Creates a decimal representation (i.e 1234.5678).
+  void CreateDecimalRepresentation(const char* decimal_digits,
+                                   int length,
+                                   int decimal_point,
+                                   int digits_after_point,
+                                   StringBuilder* result_builder) const;
+
+  const int flags_;
+  const char* const infinity_symbol_;
+  const char* const nan_symbol_;
+  const char exponent_character_;
+  const int decimal_in_shortest_low_;
+  const int decimal_in_shortest_high_;
+  const int max_leading_padding_zeroes_in_precision_mode_;
+  const int max_trailing_padding_zeroes_in_precision_mode_;
+  const int min_exponent_width_;
+
+  DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS(DoubleToStringConverter);
+};
+
+}  // namespace double_conversion
+
+#endif  // DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_
diff --git a/Foundation/src/fast-dtoa.cc b/Foundation/src/fast-dtoa.cc
index 61350383a..d7a23984d 100644
--- a/Foundation/src/fast-dtoa.cc
+++ b/Foundation/src/fast-dtoa.cc
@@ -138,7 +138,7 @@ static bool RoundWeed(Vector<char> buffer,
   // Conceptually rest ~= too_high - buffer
   // We need to do the following tests in this order to avoid over- and
   // underflows.
-  ASSERT(rest <= unsafe_interval);
+  DOUBLE_CONVERSION_ASSERT(rest <= unsafe_interval);
   while (rest < small_distance &&  // Negated condition 1
          unsafe_interval - rest >= ten_kappa &&  // Negated condition 2
          (rest + ten_kappa < small_distance ||  // buffer{-1} > w_high
@@ -184,7 +184,7 @@ static bool RoundWeedCounted(Vector<char> buffer,
                              uint64_t ten_kappa,
                              uint64_t unit,
                              int* kappa) {
-  ASSERT(rest < ten_kappa);
+  DOUBLE_CONVERSION_ASSERT(rest < ten_kappa);
   // The following tests are done in a specific order to avoid overflows. They
   // will work correctly with any uint64 values of rest < ten_kappa and unit.
   //
@@ -241,7 +241,7 @@ static void BiggestPowerTen(uint32_t number,
                             int number_bits,
                             uint32_t* power,
                             int* exponent_plus_one) {
-  ASSERT(number < (1u << (number_bits + 1)));
+  DOUBLE_CONVERSION_ASSERT(number < (1u << (number_bits + 1)));
   // 1233/4096 is approximately 1/lg(10).
   int exponent_plus_one_guess = ((number_bits + 1) * 1233 >> 12);
   // We increment to skip over the first entry in the kPowersOf10 table.
@@ -303,9 +303,9 @@ static bool DigitGen(DiyFp low,
                      Vector<char> buffer,
                      int* length,
                      int* kappa) {
-  ASSERT(low.e() == w.e() && w.e() == high.e());
-  ASSERT(low.f() + 1 <= high.f() - 1);
-  ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent);
+  DOUBLE_CONVERSION_ASSERT(low.e() == w.e() && w.e() == high.e());
+  DOUBLE_CONVERSION_ASSERT(low.f() + 1 <= high.f() - 1);
+  DOUBLE_CONVERSION_ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent);
   // low, w and high are imprecise, but by less than one ulp (unit in the last
   // place).
   // If we remove (resp. add) 1 ulp from low (resp. high) we are certain that
@@ -347,7 +347,7 @@ static bool DigitGen(DiyFp low,
   // that is smaller than integrals.
   while (*kappa > 0) {
     int digit = integrals / divisor;
-    ASSERT(digit <= 9);
+    DOUBLE_CONVERSION_ASSERT(digit <= 9);
     buffer[*length] = static_cast<char>('0' + digit);
     (*length)++;
     integrals %= divisor;
@@ -374,16 +374,16 @@ static bool DigitGen(DiyFp low,
   // data (like the interval or 'unit'), too.
   // Note that the multiplication by 10 does not overflow, because w.e >= -60
   // and thus one.e >= -60.
-  ASSERT(one.e() >= -60);
-  ASSERT(fractionals < one.f());
-  ASSERT(UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f());
+  DOUBLE_CONVERSION_ASSERT(one.e() >= -60);
+  DOUBLE_CONVERSION_ASSERT(fractionals < one.f());
+  DOUBLE_CONVERSION_ASSERT(DOUBLE_CONVERSION_UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f());
   for (;;) {
     fractionals *= 10;
     unit *= 10;
     unsafe_interval.set_f(unsafe_interval.f() * 10);
     // Integer division by one.
     int digit = static_cast<int>(fractionals >> -one.e());
-    ASSERT(digit <= 9);
+    DOUBLE_CONVERSION_ASSERT(digit <= 9);
     buffer[*length] = static_cast<char>('0' + digit);
     (*length)++;
     fractionals &= one.f() - 1;  // Modulo by one.
@@ -430,9 +430,9 @@ static bool DigitGenCounted(DiyFp w,
                             Vector<char> buffer,
                             int* length,
                             int* kappa) {
-  ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent);
-  ASSERT(kMinimalTargetExponent >= -60);
-  ASSERT(kMaximalTargetExponent <= -32);
+  DOUBLE_CONVERSION_ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent);
+  DOUBLE_CONVERSION_ASSERT(kMinimalTargetExponent >= -60);
+  DOUBLE_CONVERSION_ASSERT(kMaximalTargetExponent <= -32);
   // w is assumed to have an error less than 1 unit. Whenever w is scaled we
   // also scale its error.
   uint64_t w_error = 1;
@@ -458,7 +458,7 @@ static bool DigitGenCounted(DiyFp w,
   // that is smaller than 'integrals'.
   while (*kappa > 0) {
     int digit = integrals / divisor;
-    ASSERT(digit <= 9);
+    DOUBLE_CONVERSION_ASSERT(digit <= 9);
     buffer[*length] = static_cast<char>('0' + digit);
     (*length)++;
     requested_digits--;
@@ -484,15 +484,15 @@ static bool DigitGenCounted(DiyFp w,
   // data (the 'unit'), too.
   // Note that the multiplication by 10 does not overflow, because w.e >= -60
   // and thus one.e >= -60.
-  ASSERT(one.e() >= -60);
-  ASSERT(fractionals < one.f());
-  ASSERT(UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f());
+  DOUBLE_CONVERSION_ASSERT(one.e() >= -60);
+  DOUBLE_CONVERSION_ASSERT(fractionals < one.f());
+  DOUBLE_CONVERSION_ASSERT(DOUBLE_CONVERSION_UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f());
   while (requested_digits > 0 && fractionals > w_error) {
     fractionals *= 10;
     w_error *= 10;
     // Integer division by one.
     int digit = static_cast<int>(fractionals >> -one.e());
-    ASSERT(digit <= 9);
+    DOUBLE_CONVERSION_ASSERT(digit <= 9);
     buffer[*length] = static_cast<char>('0' + digit);
     (*length)++;
     requested_digits--;
@@ -530,11 +530,11 @@ static bool Grisu3(double v,
   if (mode == FAST_DTOA_SHORTEST) {
     Double(v).NormalizedBoundaries(&boundary_minus, &boundary_plus);
   } else {
-    ASSERT(mode == FAST_DTOA_SHORTEST_SINGLE);
+    DOUBLE_CONVERSION_ASSERT(mode == FAST_DTOA_SHORTEST_SINGLE);
     float single_v = static_cast<float>(v);
     Single(single_v).NormalizedBoundaries(&boundary_minus, &boundary_plus);
   }
-  ASSERT(boundary_plus.e() == w.e());
+  DOUBLE_CONVERSION_ASSERT(boundary_plus.e() == w.e());
   DiyFp ten_mk;  // Cached power of ten: 10^-k
   int mk;        // -k
   int ten_mk_minimal_binary_exponent =
@@ -545,7 +545,7 @@ static bool Grisu3(double v,
       ten_mk_minimal_binary_exponent,
       ten_mk_maximal_binary_exponent,
       &ten_mk, &mk);
-  ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() +
+  DOUBLE_CONVERSION_ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() +
           DiyFp::kSignificandSize) &&
          (kMaximalTargetExponent >= w.e() + ten_mk.e() +
           DiyFp::kSignificandSize));
@@ -559,13 +559,13 @@ static bool Grisu3(double v,
   // In other words: let f = scaled_w.f() and e = scaled_w.e(), then
   //           (f-1) * 2^e < w*10^k < (f+1) * 2^e
   DiyFp scaled_w = DiyFp::Times(w, ten_mk);
-  ASSERT(scaled_w.e() ==
+  DOUBLE_CONVERSION_ASSERT(scaled_w.e() ==
          boundary_plus.e() + ten_mk.e() + DiyFp::kSignificandSize);
   // In theory it would be possible to avoid some recomputations by computing
   // the difference between w and boundary_minus/plus (a power of 2) and to
   // compute scaled_boundary_minus/plus by subtracting/adding from
   // scaled_w. However the code becomes much less readable and the speed
-  // enhancements are not terriffic.
+  // enhancements are not terrific.
   DiyFp scaled_boundary_minus = DiyFp::Times(boundary_minus, ten_mk);
   DiyFp scaled_boundary_plus  = DiyFp::Times(boundary_plus,  ten_mk);
 
@@ -573,7 +573,7 @@ static bool Grisu3(double v,
   // v == (double) (scaled_w * 10^-mk).
   // Set decimal_exponent == -mk and pass it to DigitGen. If scaled_w is not an
   // integer than it will be updated. For instance if scaled_w == 1.23 then
-  // the buffer will be filled with "123" und the decimal_exponent will be
+  // the buffer will be filled with "123" and the decimal_exponent will be
   // decreased by 2.
   int kappa;
   bool result = DigitGen(scaled_boundary_minus, scaled_w, scaled_boundary_plus,
@@ -604,7 +604,7 @@ static bool Grisu3Counted(double v,
       ten_mk_minimal_binary_exponent,
       ten_mk_maximal_binary_exponent,
       &ten_mk, &mk);
-  ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() +
+  DOUBLE_CONVERSION_ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() +
           DiyFp::kSignificandSize) &&
          (kMaximalTargetExponent >= w.e() + ten_mk.e() +
           DiyFp::kSignificandSize));
@@ -638,8 +638,8 @@ bool FastDtoa(double v,
               Vector<char> buffer,
               int* length,
               int* decimal_point) {
-  ASSERT(v > 0);
-  ASSERT(!Double(v).IsSpecial());
+  DOUBLE_CONVERSION_ASSERT(v > 0);
+  DOUBLE_CONVERSION_ASSERT(!Double(v).IsSpecial());
 
   bool result = false;
   int decimal_exponent = 0;
@@ -653,7 +653,7 @@ bool FastDtoa(double v,
                              buffer, length, &decimal_exponent);
       break;
     default:
-      UNREACHABLE();
+      DOUBLE_CONVERSION_UNREACHABLE();
   }
   if (result) {
     *decimal_point = *length + decimal_exponent;
diff --git a/Foundation/src/fixed-dtoa.cc b/Foundation/src/fixed-dtoa.cc
index 0f989bcea..e739b1980 100644
--- a/Foundation/src/fixed-dtoa.cc
+++ b/Foundation/src/fixed-dtoa.cc
@@ -53,11 +53,11 @@ class UInt128 {
     accumulator >>= 32;
     accumulator = accumulator + (high_bits_ >> 32) * multiplicand;
     high_bits_ = (accumulator << 32) + part;
-    ASSERT((accumulator >> 32) == 0);
+    DOUBLE_CONVERSION_ASSERT((accumulator >> 32) == 0);
   }
 
   void Shift(int shift_amount) {
-    ASSERT(-64 <= shift_amount && shift_amount <= 64);
+    DOUBLE_CONVERSION_ASSERT(-64 <= shift_amount && shift_amount <= 64);
     if (shift_amount == 0) {
       return;
     } else if (shift_amount == -64) {
@@ -230,13 +230,13 @@ static void RoundUp(Vector<char> buffer, int* length, int* decimal_point) {
 static void FillFractionals(uint64_t fractionals, int exponent,
                             int fractional_count, Vector<char> buffer,
                             int* length, int* decimal_point) {
-  ASSERT(-128 <= exponent && exponent <= 0);
+  DOUBLE_CONVERSION_ASSERT(-128 <= exponent && exponent <= 0);
   // 'fractionals' is a fixed-point number, with binary point at bit
   // (-exponent). Inside the function the non-converted remainder of fractionals
   // is a fixed-point number, with binary point at bit 'point'.
   if (-exponent <= 64) {
     // One 64 bit number is sufficient.
-    ASSERT(fractionals >> 56 == 0);
+    DOUBLE_CONVERSION_ASSERT(fractionals >> 56 == 0);
     int point = -exponent;
     for (int i = 0; i < fractional_count; ++i) {
       if (fractionals == 0) break;
@@ -253,18 +253,18 @@ static void FillFractionals(uint64_t fractionals, int exponent,
       fractionals *= 5;
       point--;
       int digit = static_cast<int>(fractionals >> point);
-      ASSERT(digit <= 9);
+      DOUBLE_CONVERSION_ASSERT(digit <= 9);
       buffer[*length] = static_cast<char>('0' + digit);
       (*length)++;
       fractionals -= static_cast<uint64_t>(digit) << point;
     }
     // If the first bit after the point is set we have to round up.
-    ASSERT(fractionals == 0 || point - 1 >= 0);
+    DOUBLE_CONVERSION_ASSERT(fractionals == 0 || point - 1 >= 0);
     if ((fractionals != 0) && ((fractionals >> (point - 1)) & 1) == 1) {
       RoundUp(buffer, length, decimal_point);
     }
   } else {  // We need 128 bits.
-    ASSERT(64 < -exponent && -exponent <= 128);
+    DOUBLE_CONVERSION_ASSERT(64 < -exponent && -exponent <= 128);
     UInt128 fractionals128 = UInt128(fractionals, 0);
     fractionals128.Shift(-exponent - 64);
     int point = 128;
@@ -276,7 +276,7 @@ static void FillFractionals(uint64_t fractionals, int exponent,
       fractionals128.Multiply(5);
       point--;
       int digit = fractionals128.DivModPowerOf2(point);
-      ASSERT(digit <= 9);
+      DOUBLE_CONVERSION_ASSERT(digit <= 9);
       buffer[*length] = static_cast<char>('0' + digit);
       (*length)++;
     }
@@ -335,7 +335,7 @@ bool FastFixedDtoa(double v,
     // The quotient delivers the first digits, and the remainder fits into a 64
     // bit number.
     // Dividing by 10^17 is equivalent to dividing by 5^17*2^17.
-    const uint64_t kFive17 = UINT64_2PART_C(0xB1, A2BC2EC5);  // 5^17
+    const uint64_t kFive17 = DOUBLE_CONVERSION_UINT64_2PART_C(0xB1, A2BC2EC5);  // 5^17
     uint64_t divisor = kFive17;
     int divisor_power = 17;
     uint64_t dividend = significand;
@@ -383,7 +383,7 @@ bool FastFixedDtoa(double v,
   } else if (exponent < -128) {
     // This configuration (with at most 20 digits) means that all digits must be
     // 0.
-    ASSERT(fractional_count <= 20);
+    DOUBLE_CONVERSION_ASSERT(fractional_count <= 20);
     buffer[0] = '\0';
     *length = 0;
     *decimal_point = -fractional_count;
@@ -395,8 +395,8 @@ bool FastFixedDtoa(double v,
   TrimZeros(buffer, length, decimal_point);
   buffer[*length] = '\0';
   if ((*length) == 0) {
-    // The string is empty and the decimal_point thus has no importance. Mimick
-    // Gay's dtoa and and set it to -fractional_count.
+    // The string is empty and the decimal_point thus has no importance. Mimic
+    // Gay's dtoa and set it to -fractional_count.
     *decimal_point = -fractional_count;
   }
   return true;
diff --git a/Foundation/src/ieee.h b/Foundation/src/ieee.h
index 83274849b..9203f4d55 100644
--- a/Foundation/src/ieee.h
+++ b/Foundation/src/ieee.h
@@ -41,10 +41,11 @@ static float uint32_to_float(uint32_t d32) { return BitCast<float>(d32); }
 // Helper functions for doubles.
 class Double {
  public:
-  static const uint64_t kSignMask = UINT64_2PART_C(0x80000000, 00000000);
-  static const uint64_t kExponentMask = UINT64_2PART_C(0x7FF00000, 00000000);
-  static const uint64_t kSignificandMask = UINT64_2PART_C(0x000FFFFF, FFFFFFFF);
-  static const uint64_t kHiddenBit = UINT64_2PART_C(0x00100000, 00000000);
+  static const uint64_t kSignMask = DOUBLE_CONVERSION_UINT64_2PART_C(0x80000000, 00000000);
+  static const uint64_t kExponentMask = DOUBLE_CONVERSION_UINT64_2PART_C(0x7FF00000, 00000000);
+  static const uint64_t kSignificandMask = DOUBLE_CONVERSION_UINT64_2PART_C(0x000FFFFF, FFFFFFFF);
+  static const uint64_t kHiddenBit = DOUBLE_CONVERSION_UINT64_2PART_C(0x00100000, 00000000);
+  static const uint64_t kQuietNanBit = DOUBLE_CONVERSION_UINT64_2PART_C(0x00080000, 00000000);
   static const int kPhysicalSignificandSize = 52;  // Excludes the hidden bit.
   static const int kSignificandSize = 53;
   static const int kExponentBias = 0x3FF + kPhysicalSignificandSize;
@@ -59,14 +60,14 @@ class Double {
   // The value encoded by this Double must be greater or equal to +0.0.
   // It must not be special (infinity, or NaN).
   DiyFp AsDiyFp() const {
-    ASSERT(Sign() > 0);
-    ASSERT(!IsSpecial());
+    DOUBLE_CONVERSION_ASSERT(Sign() > 0);
+    DOUBLE_CONVERSION_ASSERT(!IsSpecial());
     return DiyFp(Significand(), Exponent());
   }
 
   // The value encoded by this Double must be strictly greater than 0.
   DiyFp AsNormalizedDiyFp() const {
-    ASSERT(value() > 0.0);
+    DOUBLE_CONVERSION_ASSERT(value() > 0.0);
     uint64_t f = Significand();
     int e = Exponent();
 
@@ -148,6 +149,23 @@ class Double {
         ((d64 & kSignificandMask) != 0);
   }
 
+  bool IsQuietNan() const {
+#if (defined(__mips__) && !defined(__mips_nan2008)) || defined(__hppa__)
+    return IsNan() && ((AsUint64() & kQuietNanBit) == 0);
+#else
+    return IsNan() && ((AsUint64() & kQuietNanBit) != 0);
+#endif
+  }
+
+  bool IsSignalingNan() const {
+#if (defined(__mips__) && !defined(__mips_nan2008)) || defined(__hppa__)
+    return IsNan() && ((AsUint64() & kQuietNanBit) != 0);
+#else
+    return IsNan() && ((AsUint64() & kQuietNanBit) == 0);
+#endif
+  }
+
+
   bool IsInfinite() const {
     uint64_t d64 = AsUint64();
     return ((d64 & kExponentMask) == kExponentMask) &&
@@ -162,7 +180,7 @@ class Double {
   // Precondition: the value encoded by this Double must be greater or equal
   // than +0.0.
   DiyFp UpperBoundary() const {
-    ASSERT(Sign() > 0);
+    DOUBLE_CONVERSION_ASSERT(Sign() > 0);
     return DiyFp(Significand() * 2 + 1, Exponent() - 1);
   }
 
@@ -171,7 +189,7 @@ class Double {
   // exponent as m_plus.
   // Precondition: the value encoded by this Double must be greater than 0.
   void NormalizedBoundaries(DiyFp* out_m_minus, DiyFp* out_m_plus) const {
-    ASSERT(value() > 0.0);
+    DOUBLE_CONVERSION_ASSERT(value() > 0.0);
     DiyFp v = this->AsDiyFp();
     DiyFp m_plus = DiyFp::Normalize(DiyFp((v.f() << 1) + 1, v.e() - 1));
     DiyFp m_minus;
@@ -225,8 +243,13 @@ class Double {
 
  private:
   static const int kDenormalExponent = -kExponentBias + 1;
-  static const uint64_t kInfinity = UINT64_2PART_C(0x7FF00000, 00000000);
-  static const uint64_t kNaN = UINT64_2PART_C(0x7FF80000, 00000000);
+  static const uint64_t kInfinity = DOUBLE_CONVERSION_UINT64_2PART_C(0x7FF00000, 00000000);
+#if (defined(__mips__) && !defined(__mips_nan2008)) || defined(__hppa__)
+  static const uint64_t kNaN = DOUBLE_CONVERSION_UINT64_2PART_C(0x7FF7FFFF, FFFFFFFF);
+#else
+  static const uint64_t kNaN = DOUBLE_CONVERSION_UINT64_2PART_C(0x7FF80000, 00000000);
+#endif
+
 
   const uint64_t d64_;
 
@@ -257,7 +280,7 @@ class Double {
         (biased_exponent << kPhysicalSignificandSize);
   }
 
-  DC_DISALLOW_COPY_AND_ASSIGN(Double);
+  DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(Double);
 };
 
 class Single {
@@ -266,6 +289,7 @@ class Single {
   static const uint32_t kExponentMask = 0x7F800000;
   static const uint32_t kSignificandMask = 0x007FFFFF;
   static const uint32_t kHiddenBit = 0x00800000;
+  static const uint32_t kQuietNanBit = 0x00400000;
   static const int kPhysicalSignificandSize = 23;  // Excludes the hidden bit.
   static const int kSignificandSize = 24;
 
@@ -276,8 +300,8 @@ class Single {
   // The value encoded by this Single must be greater or equal to +0.0.
   // It must not be special (infinity, or NaN).
   DiyFp AsDiyFp() const {
-    ASSERT(Sign() > 0);
-    ASSERT(!IsSpecial());
+    DOUBLE_CONVERSION_ASSERT(Sign() > 0);
+    DOUBLE_CONVERSION_ASSERT(!IsSpecial());
     return DiyFp(Significand(), Exponent());
   }
 
@@ -324,6 +348,23 @@ class Single {
         ((d32 & kSignificandMask) != 0);
   }
 
+  bool IsQuietNan() const {
+#if (defined(__mips__) && !defined(__mips_nan2008)) || defined(__hppa__)
+    return IsNan() && ((AsUint32() & kQuietNanBit) == 0);
+#else
+    return IsNan() && ((AsUint32() & kQuietNanBit) != 0);
+#endif
+  }
+
+  bool IsSignalingNan() const {
+#if (defined(__mips__) && !defined(__mips_nan2008)) || defined(__hppa__)
+    return IsNan() && ((AsUint32() & kQuietNanBit) != 0);
+#else
+    return IsNan() && ((AsUint32() & kQuietNanBit) == 0);
+#endif
+  }
+
+
   bool IsInfinite() const {
     uint32_t d32 = AsUint32();
     return ((d32 & kExponentMask) == kExponentMask) &&
@@ -340,7 +381,7 @@ class Single {
   // exponent as m_plus.
   // Precondition: the value encoded by this Single must be greater than 0.
   void NormalizedBoundaries(DiyFp* out_m_minus, DiyFp* out_m_plus) const {
-    ASSERT(value() > 0.0);
+    DOUBLE_CONVERSION_ASSERT(value() > 0.0);
     DiyFp v = this->AsDiyFp();
     DiyFp m_plus = DiyFp::Normalize(DiyFp((v.f() << 1) + 1, v.e() - 1));
     DiyFp m_minus;
@@ -358,7 +399,7 @@ class Single {
   // Precondition: the value encoded by this Single must be greater or equal
   // than +0.0.
   DiyFp UpperBoundary() const {
-    ASSERT(Sign() > 0);
+    DOUBLE_CONVERSION_ASSERT(Sign() > 0);
     return DiyFp(Significand() * 2 + 1, Exponent() - 1);
   }
 
@@ -390,11 +431,15 @@ class Single {
   static const int kDenormalExponent = -kExponentBias + 1;
   static const int kMaxExponent = 0xFF - kExponentBias;
   static const uint32_t kInfinity = 0x7F800000;
+#if (defined(__mips__) && !defined(__mips_nan2008)) || defined(__hppa__)
+  static const uint32_t kNaN = 0x7FBFFFFF;
+#else
   static const uint32_t kNaN = 0x7FC00000;
+#endif
 
   const uint32_t d32_;
 
-  DC_DISALLOW_COPY_AND_ASSIGN(Single);
+  DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(Single);
 };
 
 }  // namespace double_conversion
diff --git a/Foundation/src/pcre.h b/Foundation/src/pcre.h
deleted file mode 100644
index 741a55447..000000000
--- a/Foundation/src/pcre.h
+++ /dev/null
@@ -1,677 +0,0 @@
-/*************************************************
-*       Perl-Compatible Regular Expressions      *
-*************************************************/
-
-/* This is the public header file for the PCRE library, to be #included by
-applications that call the PCRE functions.
-
-           Copyright (c) 1997-2014 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-#ifndef _PCRE_H
-#define _PCRE_H
-
-/* The current PCRE version information. */
-
-#define PCRE_MAJOR          8
-#define PCRE_MINOR          44
-#define PCRE_PRERELEASE
-#define PCRE_DATE           020-02-12
-
-/* When an application links to a PCRE DLL in Windows, the symbols that are
-imported have to be identified as such. When building PCRE, the appropriate
-export setting is defined in pcre_internal.h, which includes this file. So we
-don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
-
-#if defined(_WIN32) && !defined(PCRE_STATIC)
-#  ifndef PCRE_EXP_DECL
-#    define PCRE_EXP_DECL  extern __declspec(dllimport)
-#  endif
-#  ifdef __cplusplus
-#    ifndef PCRECPP_EXP_DECL
-#      define PCRECPP_EXP_DECL  extern __declspec(dllimport)
-#    endif
-#    ifndef PCRECPP_EXP_DEFN
-#      define PCRECPP_EXP_DEFN  __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-/* By default, we use the standard "extern" declarations. */
-
-#ifndef PCRE_EXP_DECL
-#  ifdef __cplusplus
-#    define PCRE_EXP_DECL  extern "C"
-#  else
-#    define PCRE_EXP_DECL  extern
-#  endif
-#endif
-
-#ifdef __cplusplus
-#  ifndef PCRECPP_EXP_DECL
-#    define PCRECPP_EXP_DECL  extern
-#  endif
-#  ifndef PCRECPP_EXP_DEFN
-#    define PCRECPP_EXP_DEFN
-#  endif
-#endif
-
-/* Have to include stdlib.h in order to ensure that size_t is defined;
-it is needed here for malloc. */
-
-#include <stdlib.h>
-
-/* Allow for C++ users */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Public options. Some are compile-time only, some are run-time only, and some
-are both. Most of the compile-time options are saved with the compiled regex so
-that they can be inspected during studying (and therefore JIT compiling). Note
-that pcre_study() has its own set of options. Originally, all the options
-defined here used distinct bits. However, almost all the bits in a 32-bit word
-are now used, so in order to conserve them, option bits that were previously
-only recognized at matching time (i.e. by pcre_exec() or pcre_dfa_exec()) may
-also be used for compile-time options that affect only compiling and are not
-relevant for studying or JIT compiling.
-
-Some options for pcre_compile() change its behaviour but do not affect the
-behaviour of the execution functions. Other options are passed through to the
-execution functions and affect their behaviour, with or without affecting the
-behaviour of pcre_compile().
-
-Options that can be passed to pcre_compile() are tagged Cx below, with these
-variants:
-
-C1   Affects compile only
-C2   Does not affect compile; affects exec, dfa_exec
-C3   Affects compile, exec, dfa_exec
-C4   Affects compile, exec, dfa_exec, study
-C5   Affects compile, exec, study
-
-Options that can be set for pcre_exec() and/or pcre_dfa_exec() are flagged with
-E and D, respectively. They take precedence over C3, C4, and C5 settings passed
-from pcre_compile(). Those that are compatible with JIT execution are flagged
-with J. */
-
-#define PCRE_CASELESS           0x00000001  /* C1       */
-#define PCRE_MULTILINE          0x00000002  /* C1       */
-#define PCRE_DOTALL             0x00000004  /* C1       */
-#define PCRE_EXTENDED           0x00000008  /* C1       */
-#define PCRE_ANCHORED           0x00000010  /* C4 E D   */
-#define PCRE_DOLLAR_ENDONLY     0x00000020  /* C2       */
-#define PCRE_EXTRA              0x00000040  /* C1       */
-#define PCRE_NOTBOL             0x00000080  /*    E D J */
-#define PCRE_NOTEOL             0x00000100  /*    E D J */
-#define PCRE_UNGREEDY           0x00000200  /* C1       */
-#define PCRE_NOTEMPTY           0x00000400  /*    E D J */
-#define PCRE_UTF8               0x00000800  /* C4        )          */
-#define PCRE_UTF16              0x00000800  /* C4        ) Synonyms */
-#define PCRE_UTF32              0x00000800  /* C4        )          */
-#define PCRE_NO_AUTO_CAPTURE    0x00001000  /* C1       */
-#define PCRE_NO_UTF8_CHECK      0x00002000  /* C1 E D J  )          */
-#define PCRE_NO_UTF16_CHECK     0x00002000  /* C1 E D J  ) Synonyms */
-#define PCRE_NO_UTF32_CHECK     0x00002000  /* C1 E D J  )          */
-#define PCRE_AUTO_CALLOUT       0x00004000  /* C1       */
-#define PCRE_PARTIAL_SOFT       0x00008000  /*    E D J  ) Synonyms */
-#define PCRE_PARTIAL            0x00008000  /*    E D J  )          */
-
-/* This pair use the same bit. */
-#define PCRE_NEVER_UTF          0x00010000  /* C1        ) Overlaid */
-#define PCRE_DFA_SHORTEST       0x00010000  /*      D    ) Overlaid */
-
-/* This pair use the same bit. */
-#define PCRE_NO_AUTO_POSSESS    0x00020000  /* C1        ) Overlaid */
-#define PCRE_DFA_RESTART        0x00020000  /*      D    ) Overlaid */
-
-#define PCRE_FIRSTLINE          0x00040000  /* C3       */
-#define PCRE_DUPNAMES           0x00080000  /* C1       */
-#define PCRE_NEWLINE_CR         0x00100000  /* C3 E D   */
-#define PCRE_NEWLINE_LF         0x00200000  /* C3 E D   */
-#define PCRE_NEWLINE_CRLF       0x00300000  /* C3 E D   */
-#define PCRE_NEWLINE_ANY        0x00400000  /* C3 E D   */
-#define PCRE_NEWLINE_ANYCRLF    0x00500000  /* C3 E D   */
-#define PCRE_BSR_ANYCRLF        0x00800000  /* C3 E D   */
-#define PCRE_BSR_UNICODE        0x01000000  /* C3 E D   */
-#define PCRE_JAVASCRIPT_COMPAT  0x02000000  /* C5       */
-#define PCRE_NO_START_OPTIMIZE  0x04000000  /* C2 E D    ) Synonyms */
-#define PCRE_NO_START_OPTIMISE  0x04000000  /* C2 E D    )          */
-#define PCRE_PARTIAL_HARD       0x08000000  /*    E D J */
-#define PCRE_NOTEMPTY_ATSTART   0x10000000  /*    E D J */
-#define PCRE_UCP                0x20000000  /* C3       */
-
-/* Exec-time and get/set-time error codes */
-
-#define PCRE_ERROR_NOMATCH          (-1)
-#define PCRE_ERROR_NULL             (-2)
-#define PCRE_ERROR_BADOPTION        (-3)
-#define PCRE_ERROR_BADMAGIC         (-4)
-#define PCRE_ERROR_UNKNOWN_OPCODE   (-5)
-#define PCRE_ERROR_UNKNOWN_NODE     (-5)  /* For backward compatibility */
-#define PCRE_ERROR_NOMEMORY         (-6)
-#define PCRE_ERROR_NOSUBSTRING      (-7)
-#define PCRE_ERROR_MATCHLIMIT       (-8)
-#define PCRE_ERROR_CALLOUT          (-9)  /* Never used by PCRE itself */
-#define PCRE_ERROR_BADUTF8         (-10)  /* Same for 8/16/32 */
-#define PCRE_ERROR_BADUTF16        (-10)  /* Same for 8/16/32 */
-#define PCRE_ERROR_BADUTF32        (-10)  /* Same for 8/16/32 */
-#define PCRE_ERROR_BADUTF8_OFFSET  (-11)  /* Same for 8/16 */
-#define PCRE_ERROR_BADUTF16_OFFSET (-11)  /* Same for 8/16 */
-#define PCRE_ERROR_PARTIAL         (-12)
-#define PCRE_ERROR_BADPARTIAL      (-13)
-#define PCRE_ERROR_INTERNAL        (-14)
-#define PCRE_ERROR_BADCOUNT        (-15)
-#define PCRE_ERROR_DFA_UITEM       (-16)
-#define PCRE_ERROR_DFA_UCOND       (-17)
-#define PCRE_ERROR_DFA_UMLIMIT     (-18)
-#define PCRE_ERROR_DFA_WSSIZE      (-19)
-#define PCRE_ERROR_DFA_RECURSE     (-20)
-#define PCRE_ERROR_RECURSIONLIMIT  (-21)
-#define PCRE_ERROR_NULLWSLIMIT     (-22)  /* No longer actually used */
-#define PCRE_ERROR_BADNEWLINE      (-23)
-#define PCRE_ERROR_BADOFFSET       (-24)
-#define PCRE_ERROR_SHORTUTF8       (-25)
-#define PCRE_ERROR_SHORTUTF16      (-25)  /* Same for 8/16 */
-#define PCRE_ERROR_RECURSELOOP     (-26)
-#define PCRE_ERROR_JIT_STACKLIMIT  (-27)
-#define PCRE_ERROR_BADMODE         (-28)
-#define PCRE_ERROR_BADENDIANNESS   (-29)
-#define PCRE_ERROR_DFA_BADRESTART  (-30)
-#define PCRE_ERROR_JIT_BADOPTION   (-31)
-#define PCRE_ERROR_BADLENGTH       (-32)
-#define PCRE_ERROR_UNSET           (-33)
-
-/* Specific error codes for UTF-8 validity checks */
-
-#define PCRE_UTF8_ERR0               0
-#define PCRE_UTF8_ERR1               1
-#define PCRE_UTF8_ERR2               2
-#define PCRE_UTF8_ERR3               3
-#define PCRE_UTF8_ERR4               4
-#define PCRE_UTF8_ERR5               5
-#define PCRE_UTF8_ERR6               6
-#define PCRE_UTF8_ERR7               7
-#define PCRE_UTF8_ERR8               8
-#define PCRE_UTF8_ERR9               9
-#define PCRE_UTF8_ERR10             10
-#define PCRE_UTF8_ERR11             11
-#define PCRE_UTF8_ERR12             12
-#define PCRE_UTF8_ERR13             13
-#define PCRE_UTF8_ERR14             14
-#define PCRE_UTF8_ERR15             15
-#define PCRE_UTF8_ERR16             16
-#define PCRE_UTF8_ERR17             17
-#define PCRE_UTF8_ERR18             18
-#define PCRE_UTF8_ERR19             19
-#define PCRE_UTF8_ERR20             20
-#define PCRE_UTF8_ERR21             21
-#define PCRE_UTF8_ERR22             22  /* Unused (was non-character) */
-
-/* Specific error codes for UTF-16 validity checks */
-
-#define PCRE_UTF16_ERR0              0
-#define PCRE_UTF16_ERR1              1
-#define PCRE_UTF16_ERR2              2
-#define PCRE_UTF16_ERR3              3
-#define PCRE_UTF16_ERR4              4  /* Unused (was non-character) */
-
-/* Specific error codes for UTF-32 validity checks */
-
-#define PCRE_UTF32_ERR0              0
-#define PCRE_UTF32_ERR1              1
-#define PCRE_UTF32_ERR2              2  /* Unused (was non-character) */
-#define PCRE_UTF32_ERR3              3
-
-/* Request types for pcre_fullinfo() */
-
-#define PCRE_INFO_OPTIONS            0
-#define PCRE_INFO_SIZE               1
-#define PCRE_INFO_CAPTURECOUNT       2
-#define PCRE_INFO_BACKREFMAX         3
-#define PCRE_INFO_FIRSTBYTE          4
-#define PCRE_INFO_FIRSTCHAR          4  /* For backwards compatibility */
-#define PCRE_INFO_FIRSTTABLE         5
-#define PCRE_INFO_LASTLITERAL        6
-#define PCRE_INFO_NAMEENTRYSIZE      7
-#define PCRE_INFO_NAMECOUNT          8
-#define PCRE_INFO_NAMETABLE          9
-#define PCRE_INFO_STUDYSIZE         10
-#define PCRE_INFO_DEFAULT_TABLES    11
-#define PCRE_INFO_OKPARTIAL         12
-#define PCRE_INFO_JCHANGED          13
-#define PCRE_INFO_HASCRORLF         14
-#define PCRE_INFO_MINLENGTH         15
-#define PCRE_INFO_JIT               16
-#define PCRE_INFO_JITSIZE           17
-#define PCRE_INFO_MAXLOOKBEHIND     18
-#define PCRE_INFO_FIRSTCHARACTER    19
-#define PCRE_INFO_FIRSTCHARACTERFLAGS 20
-#define PCRE_INFO_REQUIREDCHAR      21
-#define PCRE_INFO_REQUIREDCHARFLAGS 22
-#define PCRE_INFO_MATCHLIMIT        23
-#define PCRE_INFO_RECURSIONLIMIT    24
-#define PCRE_INFO_MATCH_EMPTY       25
-
-/* Request types for pcre_config(). Do not re-arrange, in order to remain
-compatible. */
-
-#define PCRE_CONFIG_UTF8                    0
-#define PCRE_CONFIG_NEWLINE                 1
-#define PCRE_CONFIG_LINK_SIZE               2
-#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD  3
-#define PCRE_CONFIG_MATCH_LIMIT             4
-#define PCRE_CONFIG_STACKRECURSE            5
-#define PCRE_CONFIG_UNICODE_PROPERTIES      6
-#define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
-#define PCRE_CONFIG_BSR                     8
-#define PCRE_CONFIG_JIT                     9
-#define PCRE_CONFIG_UTF16                  10
-#define PCRE_CONFIG_JITTARGET              11
-#define PCRE_CONFIG_UTF32                  12
-#define PCRE_CONFIG_PARENS_LIMIT           13
-
-/* Request types for pcre_study(). Do not re-arrange, in order to remain
-compatible. */
-
-#define PCRE_STUDY_JIT_COMPILE                0x0001
-#define PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE   0x0002
-#define PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE   0x0004
-#define PCRE_STUDY_EXTRA_NEEDED               0x0008
-
-/* Bit flags for the pcre[16|32]_extra structure. Do not re-arrange or redefine
-these bits, just add new ones on the end, in order to remain compatible. */
-
-#define PCRE_EXTRA_STUDY_DATA             0x0001
-#define PCRE_EXTRA_MATCH_LIMIT            0x0002
-#define PCRE_EXTRA_CALLOUT_DATA           0x0004
-#define PCRE_EXTRA_TABLES                 0x0008
-#define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010
-#define PCRE_EXTRA_MARK                   0x0020
-#define PCRE_EXTRA_EXECUTABLE_JIT         0x0040
-
-/* Types */
-
-struct real_pcre8_or_16;          /* declaration; the definition is private  */
-typedef struct real_pcre8_or_16 pcre;
-
-struct real_pcre8_or_16;          /* declaration; the definition is private  */
-typedef struct real_pcre8_or_16 pcre16;
-
-struct real_pcre32;               /* declaration; the definition is private  */
-typedef struct real_pcre32 pcre32;
-
-struct real_pcre_jit_stack;       /* declaration; the definition is private  */
-typedef struct real_pcre_jit_stack pcre_jit_stack;
-
-struct real_pcre16_jit_stack;     /* declaration; the definition is private  */
-typedef struct real_pcre16_jit_stack pcre16_jit_stack;
-
-struct real_pcre32_jit_stack;     /* declaration; the definition is private  */
-typedef struct real_pcre32_jit_stack pcre32_jit_stack;
-
-/* If PCRE is compiled with 16 bit character support, PCRE_UCHAR16 must contain
-a 16 bit wide signed data type. Otherwise it can be a dummy data type since
-pcre16 functions are not implemented. There is a check for this in pcre_internal.h. */
-#ifndef PCRE_UCHAR16
-#define PCRE_UCHAR16 unsigned short
-#endif
-
-#ifndef PCRE_SPTR16
-#define PCRE_SPTR16 const PCRE_UCHAR16 *
-#endif
-
-/* If PCRE is compiled with 32 bit character support, PCRE_UCHAR32 must contain
-a 32 bit wide signed data type. Otherwise it can be a dummy data type since
-pcre32 functions are not implemented. There is a check for this in pcre_internal.h. */
-#ifndef PCRE_UCHAR32
-#define PCRE_UCHAR32 unsigned int
-#endif
-
-#ifndef PCRE_SPTR32
-#define PCRE_SPTR32 const PCRE_UCHAR32 *
-#endif
-
-/* When PCRE is compiled as a C++ library, the subject pointer type can be
-replaced with a custom type. For conventional use, the public interface is a
-const char *. */
-
-#ifndef PCRE_SPTR
-#define PCRE_SPTR const char *
-#endif
-
-/* The structure for passing additional data to pcre_exec(). This is defined in
-such as way as to be extensible. Always add new fields at the end, in order to
-remain compatible. */
-
-typedef struct pcre_extra {
-  unsigned long int flags;        /* Bits for which fields are set */
-  void *study_data;               /* Opaque data from pcre_study() */
-  unsigned long int match_limit;  /* Maximum number of calls to match() */
-  void *callout_data;             /* Data passed back in callouts */
-  const unsigned char *tables;    /* Pointer to character tables */
-  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
-  unsigned char **mark;           /* For passing back a mark pointer */
-  void *executable_jit;           /* Contains a pointer to a compiled jit code */
-} pcre_extra;
-
-/* Same structure as above, but with 16 bit char pointers. */
-
-typedef struct pcre16_extra {
-  unsigned long int flags;        /* Bits for which fields are set */
-  void *study_data;               /* Opaque data from pcre_study() */
-  unsigned long int match_limit;  /* Maximum number of calls to match() */
-  void *callout_data;             /* Data passed back in callouts */
-  const unsigned char *tables;    /* Pointer to character tables */
-  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
-  PCRE_UCHAR16 **mark;            /* For passing back a mark pointer */
-  void *executable_jit;           /* Contains a pointer to a compiled jit code */
-} pcre16_extra;
-
-/* Same structure as above, but with 32 bit char pointers. */
-
-typedef struct pcre32_extra {
-  unsigned long int flags;        /* Bits for which fields are set */
-  void *study_data;               /* Opaque data from pcre_study() */
-  unsigned long int match_limit;  /* Maximum number of calls to match() */
-  void *callout_data;             /* Data passed back in callouts */
-  const unsigned char *tables;    /* Pointer to character tables */
-  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
-  PCRE_UCHAR32 **mark;            /* For passing back a mark pointer */
-  void *executable_jit;           /* Contains a pointer to a compiled jit code */
-} pcre32_extra;
-
-/* The structure for passing out data via the pcre_callout_function. We use a
-structure so that new fields can be added on the end in future versions,
-without changing the API of the function, thereby allowing old clients to work
-without modification. */
-
-typedef struct pcre_callout_block {
-  int          version;           /* Identifies version of block */
-  /* ------------------------ Version 0 ------------------------------- */
-  int          callout_number;    /* Number compiled into pattern */
-  int         *offset_vector;     /* The offset vector */
-  PCRE_SPTR    subject;           /* The subject being matched */
-  int          subject_length;    /* The length of the subject */
-  int          start_match;       /* Offset to start of this match attempt */
-  int          current_position;  /* Where we currently are in the subject */
-  int          capture_top;       /* Max current capture */
-  int          capture_last;      /* Most recently closed capture */
-  void        *callout_data;      /* Data passed in with the call */
-  /* ------------------- Added for Version 1 -------------------------- */
-  int          pattern_position;  /* Offset to next item in the pattern */
-  int          next_item_length;  /* Length of next item in the pattern */
-  /* ------------------- Added for Version 2 -------------------------- */
-  const unsigned char *mark;      /* Pointer to current mark or NULL    */
-  /* ------------------------------------------------------------------ */
-} pcre_callout_block;
-
-/* Same structure as above, but with 16 bit char pointers. */
-
-typedef struct pcre16_callout_block {
-  int          version;           /* Identifies version of block */
-  /* ------------------------ Version 0 ------------------------------- */
-  int          callout_number;    /* Number compiled into pattern */
-  int         *offset_vector;     /* The offset vector */
-  PCRE_SPTR16  subject;           /* The subject being matched */
-  int          subject_length;    /* The length of the subject */
-  int          start_match;       /* Offset to start of this match attempt */
-  int          current_position;  /* Where we currently are in the subject */
-  int          capture_top;       /* Max current capture */
-  int          capture_last;      /* Most recently closed capture */
-  void        *callout_data;      /* Data passed in with the call */
-  /* ------------------- Added for Version 1 -------------------------- */
-  int          pattern_position;  /* Offset to next item in the pattern */
-  int          next_item_length;  /* Length of next item in the pattern */
-  /* ------------------- Added for Version 2 -------------------------- */
-  const PCRE_UCHAR16 *mark;       /* Pointer to current mark or NULL    */
-  /* ------------------------------------------------------------------ */
-} pcre16_callout_block;
-
-/* Same structure as above, but with 32 bit char pointers. */
-
-typedef struct pcre32_callout_block {
-  int          version;           /* Identifies version of block */
-  /* ------------------------ Version 0 ------------------------------- */
-  int          callout_number;    /* Number compiled into pattern */
-  int         *offset_vector;     /* The offset vector */
-  PCRE_SPTR32  subject;           /* The subject being matched */
-  int          subject_length;    /* The length of the subject */
-  int          start_match;       /* Offset to start of this match attempt */
-  int          current_position;  /* Where we currently are in the subject */
-  int          capture_top;       /* Max current capture */
-  int          capture_last;      /* Most recently closed capture */
-  void        *callout_data;      /* Data passed in with the call */
-  /* ------------------- Added for Version 1 -------------------------- */
-  int          pattern_position;  /* Offset to next item in the pattern */
-  int          next_item_length;  /* Length of next item in the pattern */
-  /* ------------------- Added for Version 2 -------------------------- */
-  const PCRE_UCHAR32 *mark;       /* Pointer to current mark or NULL    */
-  /* ------------------------------------------------------------------ */
-} pcre32_callout_block;
-
-/* Indirection for store get and free functions. These can be set to
-alternative malloc/free functions if required. Special ones are used in the
-non-recursive case for "frames". There is also an optional callout function
-that is triggered by the (?) regex item. For Virtual Pascal, these definitions
-have to take another form. */
-
-#ifndef VPCOMPAT
-PCRE_EXP_DECL void *(*pcre_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre_free)(void *);
-PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre_stack_free)(void *);
-PCRE_EXP_DECL int   (*pcre_callout)(pcre_callout_block *);
-PCRE_EXP_DECL int   (*pcre_stack_guard)(void);
-
-PCRE_EXP_DECL void *(*pcre16_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre16_free)(void *);
-PCRE_EXP_DECL void *(*pcre16_stack_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre16_stack_free)(void *);
-PCRE_EXP_DECL int   (*pcre16_callout)(pcre16_callout_block *);
-PCRE_EXP_DECL int   (*pcre16_stack_guard)(void);
-
-PCRE_EXP_DECL void *(*pcre32_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre32_free)(void *);
-PCRE_EXP_DECL void *(*pcre32_stack_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre32_stack_free)(void *);
-PCRE_EXP_DECL int   (*pcre32_callout)(pcre32_callout_block *);
-PCRE_EXP_DECL int   (*pcre32_stack_guard)(void);
-#else   /* VPCOMPAT */
-PCRE_EXP_DECL void *pcre_malloc(size_t);
-PCRE_EXP_DECL void  pcre_free(void *);
-PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
-PCRE_EXP_DECL void  pcre_stack_free(void *);
-PCRE_EXP_DECL int   pcre_callout(pcre_callout_block *);
-PCRE_EXP_DECL int   pcre_stack_guard(void);
-
-PCRE_EXP_DECL void *pcre16_malloc(size_t);
-PCRE_EXP_DECL void  pcre16_free(void *);
-PCRE_EXP_DECL void *pcre16_stack_malloc(size_t);
-PCRE_EXP_DECL void  pcre16_stack_free(void *);
-PCRE_EXP_DECL int   pcre16_callout(pcre16_callout_block *);
-PCRE_EXP_DECL int   pcre16_stack_guard(void);
-
-PCRE_EXP_DECL void *pcre32_malloc(size_t);
-PCRE_EXP_DECL void  pcre32_free(void *);
-PCRE_EXP_DECL void *pcre32_stack_malloc(size_t);
-PCRE_EXP_DECL void  pcre32_stack_free(void *);
-PCRE_EXP_DECL int   pcre32_callout(pcre32_callout_block *);
-PCRE_EXP_DECL int   pcre32_stack_guard(void);
-#endif  /* VPCOMPAT */
-
-/* User defined callback which provides a stack just before the match starts. */
-
-typedef pcre_jit_stack *(*pcre_jit_callback)(void *);
-typedef pcre16_jit_stack *(*pcre16_jit_callback)(void *);
-typedef pcre32_jit_stack *(*pcre32_jit_callback)(void *);
-
-/* Exported PCRE functions */
-
-PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *,
-                  const unsigned char *);
-PCRE_EXP_DECL pcre16 *pcre16_compile(PCRE_SPTR16, int, const char **, int *,
-                  const unsigned char *);
-PCRE_EXP_DECL pcre32 *pcre32_compile(PCRE_SPTR32, int, const char **, int *,
-                  const unsigned char *);
-PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **,
-                  int *, const unsigned char *);
-PCRE_EXP_DECL pcre16 *pcre16_compile2(PCRE_SPTR16, int, int *, const char **,
-                  int *, const unsigned char *);
-PCRE_EXP_DECL pcre32 *pcre32_compile2(PCRE_SPTR32, int, int *, const char **,
-                  int *, const unsigned char *);
-PCRE_EXP_DECL int  pcre_config(int, void *);
-PCRE_EXP_DECL int  pcre16_config(int, void *);
-PCRE_EXP_DECL int  pcre32_config(int, void *);
-PCRE_EXP_DECL int  pcre_copy_named_substring(const pcre *, const char *,
-                  int *, int, const char *, char *, int);
-PCRE_EXP_DECL int  pcre16_copy_named_substring(const pcre16 *, PCRE_SPTR16,
-                  int *, int, PCRE_SPTR16, PCRE_UCHAR16 *, int);
-PCRE_EXP_DECL int  pcre32_copy_named_substring(const pcre32 *, PCRE_SPTR32,
-                  int *, int, PCRE_SPTR32, PCRE_UCHAR32 *, int);
-PCRE_EXP_DECL int  pcre_copy_substring(const char *, int *, int, int,
-                  char *, int);
-PCRE_EXP_DECL int  pcre16_copy_substring(PCRE_SPTR16, int *, int, int,
-                  PCRE_UCHAR16 *, int);
-PCRE_EXP_DECL int  pcre32_copy_substring(PCRE_SPTR32, int *, int, int,
-                  PCRE_UCHAR32 *, int);
-PCRE_EXP_DECL int  pcre_dfa_exec(const pcre *, const pcre_extra *,
-                  const char *, int, int, int, int *, int , int *, int);
-PCRE_EXP_DECL int  pcre16_dfa_exec(const pcre16 *, const pcre16_extra *,
-                  PCRE_SPTR16, int, int, int, int *, int , int *, int);
-PCRE_EXP_DECL int  pcre32_dfa_exec(const pcre32 *, const pcre32_extra *,
-                  PCRE_SPTR32, int, int, int, int *, int , int *, int);
-PCRE_EXP_DECL int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
-                   int, int, int, int *, int);
-PCRE_EXP_DECL int  pcre16_exec(const pcre16 *, const pcre16_extra *,
-                   PCRE_SPTR16, int, int, int, int *, int);
-PCRE_EXP_DECL int  pcre32_exec(const pcre32 *, const pcre32_extra *,
-                   PCRE_SPTR32, int, int, int, int *, int);
-PCRE_EXP_DECL int  pcre_jit_exec(const pcre *, const pcre_extra *,
-                   PCRE_SPTR, int, int, int, int *, int,
-                   pcre_jit_stack *);
-PCRE_EXP_DECL int  pcre16_jit_exec(const pcre16 *, const pcre16_extra *,
-                   PCRE_SPTR16, int, int, int, int *, int,
-                   pcre16_jit_stack *);
-PCRE_EXP_DECL int  pcre32_jit_exec(const pcre32 *, const pcre32_extra *,
-                   PCRE_SPTR32, int, int, int, int *, int,
-                   pcre32_jit_stack *);
-PCRE_EXP_DECL void pcre_free_substring(const char *);
-PCRE_EXP_DECL void pcre16_free_substring(PCRE_SPTR16);
-PCRE_EXP_DECL void pcre32_free_substring(PCRE_SPTR32);
-PCRE_EXP_DECL void pcre_free_substring_list(const char **);
-PCRE_EXP_DECL void pcre16_free_substring_list(PCRE_SPTR16 *);
-PCRE_EXP_DECL void pcre32_free_substring_list(PCRE_SPTR32 *);
-PCRE_EXP_DECL int  pcre_fullinfo(const pcre *, const pcre_extra *, int,
-                  void *);
-PCRE_EXP_DECL int  pcre16_fullinfo(const pcre16 *, const pcre16_extra *, int,
-                  void *);
-PCRE_EXP_DECL int  pcre32_fullinfo(const pcre32 *, const pcre32_extra *, int,
-                  void *);
-PCRE_EXP_DECL int  pcre_get_named_substring(const pcre *, const char *,
-                  int *, int, const char *, const char **);
-PCRE_EXP_DECL int  pcre16_get_named_substring(const pcre16 *, PCRE_SPTR16,
-                  int *, int, PCRE_SPTR16, PCRE_SPTR16 *);
-PCRE_EXP_DECL int  pcre32_get_named_substring(const pcre32 *, PCRE_SPTR32,
-                  int *, int, PCRE_SPTR32, PCRE_SPTR32 *);
-PCRE_EXP_DECL int  pcre_get_stringnumber(const pcre *, const char *);
-PCRE_EXP_DECL int  pcre16_get_stringnumber(const pcre16 *, PCRE_SPTR16);
-PCRE_EXP_DECL int  pcre32_get_stringnumber(const pcre32 *, PCRE_SPTR32);
-PCRE_EXP_DECL int  pcre_get_stringtable_entries(const pcre *, const char *,
-                  char **, char **);
-PCRE_EXP_DECL int  pcre16_get_stringtable_entries(const pcre16 *, PCRE_SPTR16,
-                  PCRE_UCHAR16 **, PCRE_UCHAR16 **);
-PCRE_EXP_DECL int  pcre32_get_stringtable_entries(const pcre32 *, PCRE_SPTR32,
-                  PCRE_UCHAR32 **, PCRE_UCHAR32 **);
-PCRE_EXP_DECL int  pcre_get_substring(const char *, int *, int, int,
-                  const char **);
-PCRE_EXP_DECL int  pcre16_get_substring(PCRE_SPTR16, int *, int, int,
-                  PCRE_SPTR16 *);
-PCRE_EXP_DECL int  pcre32_get_substring(PCRE_SPTR32, int *, int, int,
-                  PCRE_SPTR32 *);
-PCRE_EXP_DECL int  pcre_get_substring_list(const char *, int *, int,
-                  const char ***);
-PCRE_EXP_DECL int  pcre16_get_substring_list(PCRE_SPTR16, int *, int,
-                  PCRE_SPTR16 **);
-PCRE_EXP_DECL int  pcre32_get_substring_list(PCRE_SPTR32, int *, int,
-                  PCRE_SPTR32 **);
-PCRE_EXP_DECL const unsigned char *pcre_maketables(void);
-PCRE_EXP_DECL const unsigned char *pcre16_maketables(void);
-PCRE_EXP_DECL const unsigned char *pcre32_maketables(void);
-PCRE_EXP_DECL int  pcre_refcount(pcre *, int);
-PCRE_EXP_DECL int  pcre16_refcount(pcre16 *, int);
-PCRE_EXP_DECL int  pcre32_refcount(pcre32 *, int);
-PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **);
-PCRE_EXP_DECL pcre16_extra *pcre16_study(const pcre16 *, int, const char **);
-PCRE_EXP_DECL pcre32_extra *pcre32_study(const pcre32 *, int, const char **);
-PCRE_EXP_DECL void pcre_free_study(pcre_extra *);
-PCRE_EXP_DECL void pcre16_free_study(pcre16_extra *);
-PCRE_EXP_DECL void pcre32_free_study(pcre32_extra *);
-PCRE_EXP_DECL const char *pcre_version(void);
-PCRE_EXP_DECL const char *pcre16_version(void);
-PCRE_EXP_DECL const char *pcre32_version(void);
-
-/* Utility functions for byte order swaps. */
-PCRE_EXP_DECL int  pcre_pattern_to_host_byte_order(pcre *, pcre_extra *,
-                  const unsigned char *);
-PCRE_EXP_DECL int  pcre16_pattern_to_host_byte_order(pcre16 *, pcre16_extra *,
-                  const unsigned char *);
-PCRE_EXP_DECL int  pcre32_pattern_to_host_byte_order(pcre32 *, pcre32_extra *,
-                  const unsigned char *);
-PCRE_EXP_DECL int  pcre16_utf16_to_host_byte_order(PCRE_UCHAR16 *,
-                  PCRE_SPTR16, int, int *, int);
-PCRE_EXP_DECL int  pcre32_utf32_to_host_byte_order(PCRE_UCHAR32 *,
-                  PCRE_SPTR32, int, int *, int);
-
-/* JIT compiler related functions. */
-
-PCRE_EXP_DECL pcre_jit_stack *pcre_jit_stack_alloc(int, int);
-PCRE_EXP_DECL pcre16_jit_stack *pcre16_jit_stack_alloc(int, int);
-PCRE_EXP_DECL pcre32_jit_stack *pcre32_jit_stack_alloc(int, int);
-PCRE_EXP_DECL void pcre_jit_stack_free(pcre_jit_stack *);
-PCRE_EXP_DECL void pcre16_jit_stack_free(pcre16_jit_stack *);
-PCRE_EXP_DECL void pcre32_jit_stack_free(pcre32_jit_stack *);
-PCRE_EXP_DECL void pcre_assign_jit_stack(pcre_extra *,
-                  pcre_jit_callback, void *);
-PCRE_EXP_DECL void pcre16_assign_jit_stack(pcre16_extra *,
-                  pcre16_jit_callback, void *);
-PCRE_EXP_DECL void pcre32_assign_jit_stack(pcre32_extra *,
-                  pcre32_jit_callback, void *);
-PCRE_EXP_DECL void pcre_jit_free_unused_memory(void);
-PCRE_EXP_DECL void pcre16_jit_free_unused_memory(void);
-PCRE_EXP_DECL void pcre32_jit_free_unused_memory(void);
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#endif /* End of pcre.h */
diff --git a/Foundation/src/pcre2.h b/Foundation/src/pcre2.h
new file mode 100644
index 000000000..1cb463378
--- /dev/null
+++ b/Foundation/src/pcre2.h
@@ -0,0 +1,993 @@
+/*************************************************
+*       Perl-Compatible Regular Expressions      *
+*************************************************/
+
+/* This is the public header file for the PCRE library, second API, to be
+#included by applications that call PCRE2 functions.
+
+           Copyright (c) 2016-2021 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef PCRE2_H_IDEMPOTENT_GUARD
+#define PCRE2_H_IDEMPOTENT_GUARD
+
+/* The current PCRE version information. */
+
+#define PCRE2_MAJOR           10
+#define PCRE2_MINOR           40
+#define PCRE2_PRERELEASE
+#define PCRE2_DATE            2022-04-14
+
+/* When an application links to a PCRE DLL in Windows, the symbols that are
+imported have to be identified as such. When building PCRE2, the appropriate
+export setting is defined in pcre2_internal.h, which includes this file. So we
+don't change existing definitions of PCRE2_EXP_DECL. */
+
+#if defined(_WIN32) && !defined(PCRE2_STATIC)
+#  ifndef PCRE2_EXP_DECL
+#    define PCRE2_EXP_DECL  extern __declspec(dllimport)
+#  endif
+#endif
+
+/* By default, we use the standard "extern" declarations. */
+
+#ifndef PCRE2_EXP_DECL
+#  ifdef __cplusplus
+#    define PCRE2_EXP_DECL  extern "C"
+#  else
+#    define PCRE2_EXP_DECL  extern
+#  endif
+#endif
+
+/* When compiling with the MSVC compiler, it is sometimes necessary to include
+a "calling convention" before exported function names. (This is secondhand
+information; I know nothing about MSVC myself). For example, something like
+
+  void __cdecl function(....)
+
+might be needed. In order so make this easy, all the exported functions have
+PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not
+set, we ensure here that it has no effect. */
+
+#ifndef PCRE2_CALL_CONVENTION
+#define PCRE2_CALL_CONVENTION
+#endif
+
+/* Have to include limits.h, stdlib.h, and inttypes.h to ensure that size_t and
+uint8_t, UCHAR_MAX, etc are defined. Some systems that do have inttypes.h do
+not have stdint.h, which is why we use inttypes.h, which according to the C
+standard is a superset of stdint.h. If inttypes.h is not available the build
+will break and the relevant values must be provided by some other means. */
+
+#include <limits.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+/* Allow for C++ users compiling this directly. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* The following option bits can be passed to pcre2_compile(), pcre2_match(),
+or pcre2_dfa_match(). PCRE2_NO_UTF_CHECK affects only the function to which it
+is passed. Put these bits at the most significant end of the options word so
+others can be added next to them */
+
+#define PCRE2_ANCHORED            0x80000000u
+#define PCRE2_NO_UTF_CHECK        0x40000000u
+#define PCRE2_ENDANCHORED         0x20000000u
+
+/* The following option bits can be passed only to pcre2_compile(). However,
+they may affect compilation, JIT compilation, and/or interpretive execution.
+The following tags indicate which:
+
+C   alters what is compiled by pcre2_compile()
+J   alters what is compiled by pcre2_jit_compile()
+M   is inspected during pcre2_match() execution
+D   is inspected during pcre2_dfa_match() execution
+*/
+
+#define PCRE2_ALLOW_EMPTY_CLASS   0x00000001u  /* C       */
+#define PCRE2_ALT_BSUX            0x00000002u  /* C       */
+#define PCRE2_AUTO_CALLOUT        0x00000004u  /* C       */
+#define PCRE2_CASELESS            0x00000008u  /* C       */
+#define PCRE2_DOLLAR_ENDONLY      0x00000010u  /*   J M D */
+#define PCRE2_DOTALL              0x00000020u  /* C       */
+#define PCRE2_DUPNAMES            0x00000040u  /* C       */
+#define PCRE2_EXTENDED            0x00000080u  /* C       */
+#define PCRE2_FIRSTLINE           0x00000100u  /*   J M D */
+#define PCRE2_MATCH_UNSET_BACKREF 0x00000200u  /* C J M   */
+#define PCRE2_MULTILINE           0x00000400u  /* C       */
+#define PCRE2_NEVER_UCP           0x00000800u  /* C       */
+#define PCRE2_NEVER_UTF           0x00001000u  /* C       */
+#define PCRE2_NO_AUTO_CAPTURE     0x00002000u  /* C       */
+#define PCRE2_NO_AUTO_POSSESS     0x00004000u  /* C       */
+#define PCRE2_NO_DOTSTAR_ANCHOR   0x00008000u  /* C       */
+#define PCRE2_NO_START_OPTIMIZE   0x00010000u  /*   J M D */
+#define PCRE2_UCP                 0x00020000u  /* C J M D */
+#define PCRE2_UNGREEDY            0x00040000u  /* C       */
+#define PCRE2_UTF                 0x00080000u  /* C J M D */
+#define PCRE2_NEVER_BACKSLASH_C   0x00100000u  /* C       */
+#define PCRE2_ALT_CIRCUMFLEX      0x00200000u  /*   J M D */
+#define PCRE2_ALT_VERBNAMES       0x00400000u  /* C       */
+#define PCRE2_USE_OFFSET_LIMIT    0x00800000u  /*   J M D */
+#define PCRE2_EXTENDED_MORE       0x01000000u  /* C       */
+#define PCRE2_LITERAL             0x02000000u  /* C       */
+#define PCRE2_MATCH_INVALID_UTF   0x04000000u  /*   J M D */
+
+/* An additional compile options word is available in the compile context. */
+
+#define PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES  0x00000001u  /* C */
+#define PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL    0x00000002u  /* C */
+#define PCRE2_EXTRA_MATCH_WORD               0x00000004u  /* C */
+#define PCRE2_EXTRA_MATCH_LINE               0x00000008u  /* C */
+#define PCRE2_EXTRA_ESCAPED_CR_IS_LF         0x00000010u  /* C */
+#define PCRE2_EXTRA_ALT_BSUX                 0x00000020u  /* C */
+#define PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK     0x00000040u  /* C */
+
+/* These are for pcre2_jit_compile(). */
+
+#define PCRE2_JIT_COMPLETE        0x00000001u  /* For full matching */
+#define PCRE2_JIT_PARTIAL_SOFT    0x00000002u
+#define PCRE2_JIT_PARTIAL_HARD    0x00000004u
+#define PCRE2_JIT_INVALID_UTF     0x00000100u
+
+/* These are for pcre2_match(), pcre2_dfa_match(), pcre2_jit_match(), and
+pcre2_substitute(). Some are allowed only for one of the functions, and in
+these cases it is noted below. Note that PCRE2_ANCHORED, PCRE2_ENDANCHORED and
+PCRE2_NO_UTF_CHECK can also be passed to these functions (though
+pcre2_jit_match() ignores the latter since it bypasses all sanity checks). */
+
+#define PCRE2_NOTBOL                      0x00000001u
+#define PCRE2_NOTEOL                      0x00000002u
+#define PCRE2_NOTEMPTY                    0x00000004u  /* ) These two must be kept */
+#define PCRE2_NOTEMPTY_ATSTART            0x00000008u  /* ) adjacent to each other. */
+#define PCRE2_PARTIAL_SOFT                0x00000010u
+#define PCRE2_PARTIAL_HARD                0x00000020u
+#define PCRE2_DFA_RESTART                 0x00000040u  /* pcre2_dfa_match() only */
+#define PCRE2_DFA_SHORTEST                0x00000080u  /* pcre2_dfa_match() only */
+#define PCRE2_SUBSTITUTE_GLOBAL           0x00000100u  /* pcre2_substitute() only */
+#define PCRE2_SUBSTITUTE_EXTENDED         0x00000200u  /* pcre2_substitute() only */
+#define PCRE2_SUBSTITUTE_UNSET_EMPTY      0x00000400u  /* pcre2_substitute() only */
+#define PCRE2_SUBSTITUTE_UNKNOWN_UNSET    0x00000800u  /* pcre2_substitute() only */
+#define PCRE2_SUBSTITUTE_OVERFLOW_LENGTH  0x00001000u  /* pcre2_substitute() only */
+#define PCRE2_NO_JIT                      0x00002000u  /* Not for pcre2_dfa_match() */
+#define PCRE2_COPY_MATCHED_SUBJECT        0x00004000u
+#define PCRE2_SUBSTITUTE_LITERAL          0x00008000u  /* pcre2_substitute() only */
+#define PCRE2_SUBSTITUTE_MATCHED          0x00010000u  /* pcre2_substitute() only */
+#define PCRE2_SUBSTITUTE_REPLACEMENT_ONLY 0x00020000u  /* pcre2_substitute() only */
+
+/* Options for pcre2_pattern_convert(). */
+
+#define PCRE2_CONVERT_UTF                    0x00000001u
+#define PCRE2_CONVERT_NO_UTF_CHECK           0x00000002u
+#define PCRE2_CONVERT_POSIX_BASIC            0x00000004u
+#define PCRE2_CONVERT_POSIX_EXTENDED         0x00000008u
+#define PCRE2_CONVERT_GLOB                   0x00000010u
+#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000030u
+#define PCRE2_CONVERT_GLOB_NO_STARSTAR       0x00000050u
+
+/* Newline and \R settings, for use in compile contexts. The newline values
+must be kept in step with values set in config.h and both sets must all be
+greater than zero. */
+
+#define PCRE2_NEWLINE_CR          1
+#define PCRE2_NEWLINE_LF          2
+#define PCRE2_NEWLINE_CRLF        3
+#define PCRE2_NEWLINE_ANY         4
+#define PCRE2_NEWLINE_ANYCRLF     5
+#define PCRE2_NEWLINE_NUL         6
+
+#define PCRE2_BSR_UNICODE         1
+#define PCRE2_BSR_ANYCRLF         2
+
+/* Error codes for pcre2_compile(). Some of these are also used by
+pcre2_pattern_convert(). */
+
+#define PCRE2_ERROR_END_BACKSLASH                  101
+#define PCRE2_ERROR_END_BACKSLASH_C                102
+#define PCRE2_ERROR_UNKNOWN_ESCAPE                 103
+#define PCRE2_ERROR_QUANTIFIER_OUT_OF_ORDER        104
+#define PCRE2_ERROR_QUANTIFIER_TOO_BIG             105
+#define PCRE2_ERROR_MISSING_SQUARE_BRACKET         106
+#define PCRE2_ERROR_ESCAPE_INVALID_IN_CLASS        107
+#define PCRE2_ERROR_CLASS_RANGE_ORDER              108
+#define PCRE2_ERROR_QUANTIFIER_INVALID             109
+#define PCRE2_ERROR_INTERNAL_UNEXPECTED_REPEAT     110
+#define PCRE2_ERROR_INVALID_AFTER_PARENS_QUERY     111
+#define PCRE2_ERROR_POSIX_CLASS_NOT_IN_CLASS       112
+#define PCRE2_ERROR_POSIX_NO_SUPPORT_COLLATING     113
+#define PCRE2_ERROR_MISSING_CLOSING_PARENTHESIS    114
+#define PCRE2_ERROR_BAD_SUBPATTERN_REFERENCE       115
+#define PCRE2_ERROR_NULL_PATTERN                   116
+#define PCRE2_ERROR_BAD_OPTIONS                    117
+#define PCRE2_ERROR_MISSING_COMMENT_CLOSING        118
+#define PCRE2_ERROR_PARENTHESES_NEST_TOO_DEEP      119
+#define PCRE2_ERROR_PATTERN_TOO_LARGE              120
+#define PCRE2_ERROR_HEAP_FAILED                    121
+#define PCRE2_ERROR_UNMATCHED_CLOSING_PARENTHESIS  122
+#define PCRE2_ERROR_INTERNAL_CODE_OVERFLOW         123
+#define PCRE2_ERROR_MISSING_CONDITION_CLOSING      124
+#define PCRE2_ERROR_LOOKBEHIND_NOT_FIXED_LENGTH    125
+#define PCRE2_ERROR_ZERO_RELATIVE_REFERENCE        126
+#define PCRE2_ERROR_TOO_MANY_CONDITION_BRANCHES    127
+#define PCRE2_ERROR_CONDITION_ASSERTION_EXPECTED   128
+#define PCRE2_ERROR_BAD_RELATIVE_REFERENCE         129
+#define PCRE2_ERROR_UNKNOWN_POSIX_CLASS            130
+#define PCRE2_ERROR_INTERNAL_STUDY_ERROR           131
+#define PCRE2_ERROR_UNICODE_NOT_SUPPORTED          132
+#define PCRE2_ERROR_PARENTHESES_STACK_CHECK        133
+#define PCRE2_ERROR_CODE_POINT_TOO_BIG             134
+#define PCRE2_ERROR_LOOKBEHIND_TOO_COMPLICATED     135
+#define PCRE2_ERROR_LOOKBEHIND_INVALID_BACKSLASH_C 136
+#define PCRE2_ERROR_UNSUPPORTED_ESCAPE_SEQUENCE    137
+#define PCRE2_ERROR_CALLOUT_NUMBER_TOO_BIG         138
+#define PCRE2_ERROR_MISSING_CALLOUT_CLOSING        139
+#define PCRE2_ERROR_ESCAPE_INVALID_IN_VERB         140
+#define PCRE2_ERROR_UNRECOGNIZED_AFTER_QUERY_P     141
+#define PCRE2_ERROR_MISSING_NAME_TERMINATOR        142
+#define PCRE2_ERROR_DUPLICATE_SUBPATTERN_NAME      143
+#define PCRE2_ERROR_INVALID_SUBPATTERN_NAME        144
+#define PCRE2_ERROR_UNICODE_PROPERTIES_UNAVAILABLE 145
+#define PCRE2_ERROR_MALFORMED_UNICODE_PROPERTY     146
+#define PCRE2_ERROR_UNKNOWN_UNICODE_PROPERTY       147
+#define PCRE2_ERROR_SUBPATTERN_NAME_TOO_LONG       148
+#define PCRE2_ERROR_TOO_MANY_NAMED_SUBPATTERNS     149
+#define PCRE2_ERROR_CLASS_INVALID_RANGE            150
+#define PCRE2_ERROR_OCTAL_BYTE_TOO_BIG             151
+#define PCRE2_ERROR_INTERNAL_OVERRAN_WORKSPACE     152
+#define PCRE2_ERROR_INTERNAL_MISSING_SUBPATTERN    153
+#define PCRE2_ERROR_DEFINE_TOO_MANY_BRANCHES       154
+#define PCRE2_ERROR_BACKSLASH_O_MISSING_BRACE      155
+#define PCRE2_ERROR_INTERNAL_UNKNOWN_NEWLINE       156
+#define PCRE2_ERROR_BACKSLASH_G_SYNTAX             157
+#define PCRE2_ERROR_PARENS_QUERY_R_MISSING_CLOSING 158
+/* Error 159 is obsolete and should now never occur */
+#define PCRE2_ERROR_VERB_ARGUMENT_NOT_ALLOWED      159
+#define PCRE2_ERROR_VERB_UNKNOWN                   160
+#define PCRE2_ERROR_SUBPATTERN_NUMBER_TOO_BIG      161
+#define PCRE2_ERROR_SUBPATTERN_NAME_EXPECTED       162
+#define PCRE2_ERROR_INTERNAL_PARSED_OVERFLOW       163
+#define PCRE2_ERROR_INVALID_OCTAL                  164
+#define PCRE2_ERROR_SUBPATTERN_NAMES_MISMATCH      165
+#define PCRE2_ERROR_MARK_MISSING_ARGUMENT          166
+#define PCRE2_ERROR_INVALID_HEXADECIMAL            167
+#define PCRE2_ERROR_BACKSLASH_C_SYNTAX             168
+#define PCRE2_ERROR_BACKSLASH_K_SYNTAX             169
+#define PCRE2_ERROR_INTERNAL_BAD_CODE_LOOKBEHINDS  170
+#define PCRE2_ERROR_BACKSLASH_N_IN_CLASS           171
+#define PCRE2_ERROR_CALLOUT_STRING_TOO_LONG        172
+#define PCRE2_ERROR_UNICODE_DISALLOWED_CODE_POINT  173
+#define PCRE2_ERROR_UTF_IS_DISABLED                174
+#define PCRE2_ERROR_UCP_IS_DISABLED                175
+#define PCRE2_ERROR_VERB_NAME_TOO_LONG             176
+#define PCRE2_ERROR_BACKSLASH_U_CODE_POINT_TOO_BIG 177
+#define PCRE2_ERROR_MISSING_OCTAL_OR_HEX_DIGITS    178
+#define PCRE2_ERROR_VERSION_CONDITION_SYNTAX       179
+#define PCRE2_ERROR_INTERNAL_BAD_CODE_AUTO_POSSESS 180
+#define PCRE2_ERROR_CALLOUT_NO_STRING_DELIMITER    181
+#define PCRE2_ERROR_CALLOUT_BAD_STRING_DELIMITER   182
+#define PCRE2_ERROR_BACKSLASH_C_CALLER_DISABLED    183
+#define PCRE2_ERROR_QUERY_BARJX_NEST_TOO_DEEP      184
+#define PCRE2_ERROR_BACKSLASH_C_LIBRARY_DISABLED   185
+#define PCRE2_ERROR_PATTERN_TOO_COMPLICATED        186
+#define PCRE2_ERROR_LOOKBEHIND_TOO_LONG            187
+#define PCRE2_ERROR_PATTERN_STRING_TOO_LONG        188
+#define PCRE2_ERROR_INTERNAL_BAD_CODE              189
+#define PCRE2_ERROR_INTERNAL_BAD_CODE_IN_SKIP      190
+#define PCRE2_ERROR_NO_SURROGATES_IN_UTF16         191
+#define PCRE2_ERROR_BAD_LITERAL_OPTIONS            192
+#define PCRE2_ERROR_SUPPORTED_ONLY_IN_UNICODE      193
+#define PCRE2_ERROR_INVALID_HYPHEN_IN_OPTIONS      194
+#define PCRE2_ERROR_ALPHA_ASSERTION_UNKNOWN        195
+#define PCRE2_ERROR_SCRIPT_RUN_NOT_AVAILABLE       196
+#define PCRE2_ERROR_TOO_MANY_CAPTURES              197
+#define PCRE2_ERROR_CONDITION_ATOMIC_ASSERTION_EXPECTED  198
+#define PCRE2_ERROR_BACKSLASH_K_IN_LOOKAROUND      199
+
+
+/* "Expected" matching error codes: no match and partial match. */
+
+#define PCRE2_ERROR_NOMATCH          (-1)
+#define PCRE2_ERROR_PARTIAL          (-2)
+
+/* Error codes for UTF-8 validity checks */
+
+#define PCRE2_ERROR_UTF8_ERR1        (-3)
+#define PCRE2_ERROR_UTF8_ERR2        (-4)
+#define PCRE2_ERROR_UTF8_ERR3        (-5)
+#define PCRE2_ERROR_UTF8_ERR4        (-6)
+#define PCRE2_ERROR_UTF8_ERR5        (-7)
+#define PCRE2_ERROR_UTF8_ERR6        (-8)
+#define PCRE2_ERROR_UTF8_ERR7        (-9)
+#define PCRE2_ERROR_UTF8_ERR8       (-10)
+#define PCRE2_ERROR_UTF8_ERR9       (-11)
+#define PCRE2_ERROR_UTF8_ERR10      (-12)
+#define PCRE2_ERROR_UTF8_ERR11      (-13)
+#define PCRE2_ERROR_UTF8_ERR12      (-14)
+#define PCRE2_ERROR_UTF8_ERR13      (-15)
+#define PCRE2_ERROR_UTF8_ERR14      (-16)
+#define PCRE2_ERROR_UTF8_ERR15      (-17)
+#define PCRE2_ERROR_UTF8_ERR16      (-18)
+#define PCRE2_ERROR_UTF8_ERR17      (-19)
+#define PCRE2_ERROR_UTF8_ERR18      (-20)
+#define PCRE2_ERROR_UTF8_ERR19      (-21)
+#define PCRE2_ERROR_UTF8_ERR20      (-22)
+#define PCRE2_ERROR_UTF8_ERR21      (-23)
+
+/* Error codes for UTF-16 validity checks */
+
+#define PCRE2_ERROR_UTF16_ERR1      (-24)
+#define PCRE2_ERROR_UTF16_ERR2      (-25)
+#define PCRE2_ERROR_UTF16_ERR3      (-26)
+
+/* Error codes for UTF-32 validity checks */
+
+#define PCRE2_ERROR_UTF32_ERR1      (-27)
+#define PCRE2_ERROR_UTF32_ERR2      (-28)
+
+/* Miscellaneous error codes for pcre2[_dfa]_match(), substring extraction
+functions, context functions, and serializing functions. They are in numerical
+order. Originally they were in alphabetical order too, but now that PCRE2 is
+released, the numbers must not be changed. */
+
+#define PCRE2_ERROR_BADDATA           (-29)
+#define PCRE2_ERROR_MIXEDTABLES       (-30)  /* Name was changed */
+#define PCRE2_ERROR_BADMAGIC          (-31)
+#define PCRE2_ERROR_BADMODE           (-32)
+#define PCRE2_ERROR_BADOFFSET         (-33)
+#define PCRE2_ERROR_BADOPTION         (-34)
+#define PCRE2_ERROR_BADREPLACEMENT    (-35)
+#define PCRE2_ERROR_BADUTFOFFSET      (-36)
+#define PCRE2_ERROR_CALLOUT           (-37)  /* Never used by PCRE2 itself */
+#define PCRE2_ERROR_DFA_BADRESTART    (-38)
+#define PCRE2_ERROR_DFA_RECURSE       (-39)
+#define PCRE2_ERROR_DFA_UCOND         (-40)
+#define PCRE2_ERROR_DFA_UFUNC         (-41)
+#define PCRE2_ERROR_DFA_UITEM         (-42)
+#define PCRE2_ERROR_DFA_WSSIZE        (-43)
+#define PCRE2_ERROR_INTERNAL          (-44)
+#define PCRE2_ERROR_JIT_BADOPTION     (-45)
+#define PCRE2_ERROR_JIT_STACKLIMIT    (-46)
+#define PCRE2_ERROR_MATCHLIMIT        (-47)
+#define PCRE2_ERROR_NOMEMORY          (-48)
+#define PCRE2_ERROR_NOSUBSTRING       (-49)
+#define PCRE2_ERROR_NOUNIQUESUBSTRING (-50)
+#define PCRE2_ERROR_NULL              (-51)
+#define PCRE2_ERROR_RECURSELOOP       (-52)
+#define PCRE2_ERROR_DEPTHLIMIT        (-53)
+#define PCRE2_ERROR_RECURSIONLIMIT    (-53)  /* Obsolete synonym */
+#define PCRE2_ERROR_UNAVAILABLE       (-54)
+#define PCRE2_ERROR_UNSET             (-55)
+#define PCRE2_ERROR_BADOFFSETLIMIT    (-56)
+#define PCRE2_ERROR_BADREPESCAPE      (-57)
+#define PCRE2_ERROR_REPMISSINGBRACE   (-58)
+#define PCRE2_ERROR_BADSUBSTITUTION   (-59)
+#define PCRE2_ERROR_BADSUBSPATTERN    (-60)
+#define PCRE2_ERROR_TOOMANYREPLACE    (-61)
+#define PCRE2_ERROR_BADSERIALIZEDDATA (-62)
+#define PCRE2_ERROR_HEAPLIMIT         (-63)
+#define PCRE2_ERROR_CONVERT_SYNTAX    (-64)
+#define PCRE2_ERROR_INTERNAL_DUPMATCH (-65)
+#define PCRE2_ERROR_DFA_UINVALID_UTF  (-66)
+
+
+/* Request types for pcre2_pattern_info() */
+
+#define PCRE2_INFO_ALLOPTIONS            0
+#define PCRE2_INFO_ARGOPTIONS            1
+#define PCRE2_INFO_BACKREFMAX            2
+#define PCRE2_INFO_BSR                   3
+#define PCRE2_INFO_CAPTURECOUNT          4
+#define PCRE2_INFO_FIRSTCODEUNIT         5
+#define PCRE2_INFO_FIRSTCODETYPE         6
+#define PCRE2_INFO_FIRSTBITMAP           7
+#define PCRE2_INFO_HASCRORLF             8
+#define PCRE2_INFO_JCHANGED              9
+#define PCRE2_INFO_JITSIZE              10
+#define PCRE2_INFO_LASTCODEUNIT         11
+#define PCRE2_INFO_LASTCODETYPE         12
+#define PCRE2_INFO_MATCHEMPTY           13
+#define PCRE2_INFO_MATCHLIMIT           14
+#define PCRE2_INFO_MAXLOOKBEHIND        15
+#define PCRE2_INFO_MINLENGTH            16
+#define PCRE2_INFO_NAMECOUNT            17
+#define PCRE2_INFO_NAMEENTRYSIZE        18
+#define PCRE2_INFO_NAMETABLE            19
+#define PCRE2_INFO_NEWLINE              20
+#define PCRE2_INFO_DEPTHLIMIT           21
+#define PCRE2_INFO_RECURSIONLIMIT       21  /* Obsolete synonym */
+#define PCRE2_INFO_SIZE                 22
+#define PCRE2_INFO_HASBACKSLASHC        23
+#define PCRE2_INFO_FRAMESIZE            24
+#define PCRE2_INFO_HEAPLIMIT            25
+#define PCRE2_INFO_EXTRAOPTIONS         26
+
+/* Request types for pcre2_config(). */
+
+#define PCRE2_CONFIG_BSR                     0
+#define PCRE2_CONFIG_JIT                     1
+#define PCRE2_CONFIG_JITTARGET               2
+#define PCRE2_CONFIG_LINKSIZE                3
+#define PCRE2_CONFIG_MATCHLIMIT              4
+#define PCRE2_CONFIG_NEWLINE                 5
+#define PCRE2_CONFIG_PARENSLIMIT             6
+#define PCRE2_CONFIG_DEPTHLIMIT              7
+#define PCRE2_CONFIG_RECURSIONLIMIT          7  /* Obsolete synonym */
+#define PCRE2_CONFIG_STACKRECURSE            8  /* Obsolete */
+#define PCRE2_CONFIG_UNICODE                 9
+#define PCRE2_CONFIG_UNICODE_VERSION        10
+#define PCRE2_CONFIG_VERSION                11
+#define PCRE2_CONFIG_HEAPLIMIT              12
+#define PCRE2_CONFIG_NEVER_BACKSLASH_C      13
+#define PCRE2_CONFIG_COMPILED_WIDTHS        14
+#define PCRE2_CONFIG_TABLES_LENGTH          15
+
+
+/* Types for code units in patterns and subject strings. */
+
+typedef uint8_t  PCRE2_UCHAR8;
+typedef uint16_t PCRE2_UCHAR16;
+typedef uint32_t PCRE2_UCHAR32;
+
+typedef const PCRE2_UCHAR8  *PCRE2_SPTR8;
+typedef const PCRE2_UCHAR16 *PCRE2_SPTR16;
+typedef const PCRE2_UCHAR32 *PCRE2_SPTR32;
+
+/* The PCRE2_SIZE type is used for all string lengths and offsets in PCRE2,
+including pattern offsets for errors and subject offsets after a match. We
+define special values to indicate zero-terminated strings and unset offsets in
+the offset vector (ovector). */
+
+#define PCRE2_SIZE            size_t
+#define PCRE2_SIZE_MAX        SIZE_MAX
+#define PCRE2_ZERO_TERMINATED (~(PCRE2_SIZE)0)
+#define PCRE2_UNSET           (~(PCRE2_SIZE)0)
+
+/* Generic types for opaque structures and JIT callback functions. These
+declarations are defined in a macro that is expanded for each width later. */
+
+#define PCRE2_TYPES_LIST \
+struct pcre2_real_general_context; \
+typedef struct pcre2_real_general_context pcre2_general_context; \
+\
+struct pcre2_real_compile_context; \
+typedef struct pcre2_real_compile_context pcre2_compile_context; \
+\
+struct pcre2_real_match_context; \
+typedef struct pcre2_real_match_context pcre2_match_context; \
+\
+struct pcre2_real_convert_context; \
+typedef struct pcre2_real_convert_context pcre2_convert_context; \
+\
+struct pcre2_real_code; \
+typedef struct pcre2_real_code pcre2_code; \
+\
+struct pcre2_real_match_data; \
+typedef struct pcre2_real_match_data pcre2_match_data; \
+\
+struct pcre2_real_jit_stack; \
+typedef struct pcre2_real_jit_stack pcre2_jit_stack; \
+\
+typedef pcre2_jit_stack *(*pcre2_jit_callback)(void *);
+
+
+/* The structures for passing out data via callout functions. We use structures
+so that new fields can be added on the end in future versions, without changing
+the API of the function, thereby allowing old clients to work without
+modification. Define the generic versions in a macro; the width-specific
+versions are generated from this macro below. */
+
+/* Flags for the callout_flags field. These are cleared after a callout. */
+
+#define PCRE2_CALLOUT_STARTMATCH    0x00000001u  /* Set for each bumpalong */
+#define PCRE2_CALLOUT_BACKTRACK     0x00000002u  /* Set after a backtrack */
+
+#define PCRE2_STRUCTURE_LIST \
+typedef struct pcre2_callout_block { \
+  uint32_t      version;           /* Identifies version of block */ \
+  /* ------------------------ Version 0 ------------------------------- */ \
+  uint32_t      callout_number;    /* Number compiled into pattern */ \
+  uint32_t      capture_top;       /* Max current capture */ \
+  uint32_t      capture_last;      /* Most recently closed capture */ \
+  PCRE2_SIZE   *offset_vector;     /* The offset vector */ \
+  PCRE2_SPTR    mark;              /* Pointer to current mark or NULL */ \
+  PCRE2_SPTR    subject;           /* The subject being matched */ \
+  PCRE2_SIZE    subject_length;    /* The length of the subject */ \
+  PCRE2_SIZE    start_match;       /* Offset to start of this match attempt */ \
+  PCRE2_SIZE    current_position;  /* Where we currently are in the subject */ \
+  PCRE2_SIZE    pattern_position;  /* Offset to next item in the pattern */ \
+  PCRE2_SIZE    next_item_length;  /* Length of next item in the pattern */ \
+  /* ------------------- Added for Version 1 -------------------------- */ \
+  PCRE2_SIZE    callout_string_offset; /* Offset to string within pattern */ \
+  PCRE2_SIZE    callout_string_length; /* Length of string compiled into pattern */ \
+  PCRE2_SPTR    callout_string;    /* String compiled into pattern */ \
+  /* ------------------- Added for Version 2 -------------------------- */ \
+  uint32_t      callout_flags;     /* See above for list */ \
+  /* ------------------------------------------------------------------ */ \
+} pcre2_callout_block; \
+\
+typedef struct pcre2_callout_enumerate_block { \
+  uint32_t      version;           /* Identifies version of block */ \
+  /* ------------------------ Version 0 ------------------------------- */ \
+  PCRE2_SIZE    pattern_position;  /* Offset to next item in the pattern */ \
+  PCRE2_SIZE    next_item_length;  /* Length of next item in the pattern */ \
+  uint32_t      callout_number;    /* Number compiled into pattern */ \
+  PCRE2_SIZE    callout_string_offset; /* Offset to string within pattern */ \
+  PCRE2_SIZE    callout_string_length; /* Length of string compiled into pattern */ \
+  PCRE2_SPTR    callout_string;    /* String compiled into pattern */ \
+  /* ------------------------------------------------------------------ */ \
+} pcre2_callout_enumerate_block; \
+\
+typedef struct pcre2_substitute_callout_block { \
+  uint32_t      version;           /* Identifies version of block */ \
+  /* ------------------------ Version 0 ------------------------------- */ \
+  PCRE2_SPTR    input;             /* Pointer to input subject string */ \
+  PCRE2_SPTR    output;            /* Pointer to output buffer */ \
+  PCRE2_SIZE    output_offsets[2]; /* Changed portion of the output */ \
+  PCRE2_SIZE   *ovector;           /* Pointer to current ovector */ \
+  uint32_t      oveccount;         /* Count of pairs set in ovector */ \
+  uint32_t      subscount;         /* Substitution number */ \
+  /* ------------------------------------------------------------------ */ \
+} pcre2_substitute_callout_block;
+
+
+/* List the generic forms of all other functions in macros, which will be
+expanded for each width below. Start with functions that give general
+information. */
+
+#define PCRE2_GENERAL_INFO_FUNCTIONS \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION pcre2_config(uint32_t, void *);
+
+
+/* Functions for manipulating contexts. */
+
+#define PCRE2_GENERAL_CONTEXT_FUNCTIONS \
+PCRE2_EXP_DECL pcre2_general_context PCRE2_CALL_CONVENTION \
+  *pcre2_general_context_copy(pcre2_general_context *); \
+PCRE2_EXP_DECL pcre2_general_context PCRE2_CALL_CONVENTION \
+  *pcre2_general_context_create(void *(*)(PCRE2_SIZE, void *), \
+    void (*)(void *, void *), void *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_general_context_free(pcre2_general_context *);
+
+#define PCRE2_COMPILE_CONTEXT_FUNCTIONS \
+PCRE2_EXP_DECL pcre2_compile_context PCRE2_CALL_CONVENTION \
+  *pcre2_compile_context_copy(pcre2_compile_context *); \
+PCRE2_EXP_DECL pcre2_compile_context PCRE2_CALL_CONVENTION \
+  *pcre2_compile_context_create(pcre2_general_context *);\
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_compile_context_free(pcre2_compile_context *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_bsr(pcre2_compile_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_character_tables(pcre2_compile_context *, const uint8_t *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_compile_extra_options(pcre2_compile_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_max_pattern_length(pcre2_compile_context *, PCRE2_SIZE); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_newline(pcre2_compile_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_parens_nest_limit(pcre2_compile_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_compile_recursion_guard(pcre2_compile_context *, \
+    int (*)(uint32_t, void *), void *);
+
+#define PCRE2_MATCH_CONTEXT_FUNCTIONS \
+PCRE2_EXP_DECL pcre2_match_context PCRE2_CALL_CONVENTION \
+  *pcre2_match_context_copy(pcre2_match_context *); \
+PCRE2_EXP_DECL pcre2_match_context PCRE2_CALL_CONVENTION \
+  *pcre2_match_context_create(pcre2_general_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_match_context_free(pcre2_match_context *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_callout(pcre2_match_context *, \
+    int (*)(pcre2_callout_block *, void *), void *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_substitute_callout(pcre2_match_context *, \
+    int (*)(pcre2_substitute_callout_block *, void *), void *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_depth_limit(pcre2_match_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_heap_limit(pcre2_match_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_match_limit(pcre2_match_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_offset_limit(pcre2_match_context *, PCRE2_SIZE); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_recursion_limit(pcre2_match_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_recursion_memory_management(pcre2_match_context *, \
+    void *(*)(PCRE2_SIZE, void *), void (*)(void *, void *), void *);
+
+#define PCRE2_CONVERT_CONTEXT_FUNCTIONS \
+PCRE2_EXP_DECL pcre2_convert_context PCRE2_CALL_CONVENTION \
+  *pcre2_convert_context_copy(pcre2_convert_context *); \
+PCRE2_EXP_DECL pcre2_convert_context PCRE2_CALL_CONVENTION \
+  *pcre2_convert_context_create(pcre2_general_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_convert_context_free(pcre2_convert_context *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_glob_escape(pcre2_convert_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_glob_separator(pcre2_convert_context *, uint32_t);
+
+
+/* Functions concerned with compiling a pattern to PCRE internal code. */
+
+#define PCRE2_COMPILE_FUNCTIONS \
+PCRE2_EXP_DECL pcre2_code PCRE2_CALL_CONVENTION \
+  *pcre2_compile(PCRE2_SPTR, PCRE2_SIZE, uint32_t, int *, PCRE2_SIZE *, \
+    pcre2_compile_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_code_free(pcre2_code *); \
+PCRE2_EXP_DECL pcre2_code PCRE2_CALL_CONVENTION \
+  *pcre2_code_copy(const pcre2_code *); \
+PCRE2_EXP_DECL pcre2_code PCRE2_CALL_CONVENTION \
+  *pcre2_code_copy_with_tables(const pcre2_code *);
+
+
+/* Functions that give information about a compiled pattern. */
+
+#define PCRE2_PATTERN_INFO_FUNCTIONS \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_pattern_info(const pcre2_code *, uint32_t, void *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_callout_enumerate(const pcre2_code *, \
+    int (*)(pcre2_callout_enumerate_block *, void *), void *);
+
+
+/* Functions for running a match and inspecting the result. */
+
+#define PCRE2_MATCH_FUNCTIONS \
+PCRE2_EXP_DECL pcre2_match_data PCRE2_CALL_CONVENTION \
+  *pcre2_match_data_create(uint32_t, pcre2_general_context *); \
+PCRE2_EXP_DECL pcre2_match_data PCRE2_CALL_CONVENTION \
+  *pcre2_match_data_create_from_pattern(const pcre2_code *, \
+    pcre2_general_context *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_dfa_match(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
+    uint32_t, pcre2_match_data *, pcre2_match_context *, int *, PCRE2_SIZE); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_match(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
+    uint32_t, pcre2_match_data *, pcre2_match_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_match_data_free(pcre2_match_data *); \
+PCRE2_EXP_DECL PCRE2_SPTR PCRE2_CALL_CONVENTION \
+  pcre2_get_mark(pcre2_match_data *); \
+PCRE2_EXP_DECL PCRE2_SIZE PCRE2_CALL_CONVENTION \
+  pcre2_get_match_data_size(pcre2_match_data *); \
+PCRE2_EXP_DECL uint32_t PCRE2_CALL_CONVENTION \
+  pcre2_get_ovector_count(pcre2_match_data *); \
+PCRE2_EXP_DECL PCRE2_SIZE PCRE2_CALL_CONVENTION \
+  *pcre2_get_ovector_pointer(pcre2_match_data *); \
+PCRE2_EXP_DECL PCRE2_SIZE PCRE2_CALL_CONVENTION \
+  pcre2_get_startchar(pcre2_match_data *);
+
+
+/* Convenience functions for handling matched substrings. */
+
+#define PCRE2_SUBSTRING_FUNCTIONS \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substring_copy_byname(pcre2_match_data *, PCRE2_SPTR, PCRE2_UCHAR *, \
+    PCRE2_SIZE *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substring_copy_bynumber(pcre2_match_data *, uint32_t, PCRE2_UCHAR *, \
+    PCRE2_SIZE *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_substring_free(PCRE2_UCHAR *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substring_get_byname(pcre2_match_data *, PCRE2_SPTR, PCRE2_UCHAR **, \
+    PCRE2_SIZE *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substring_get_bynumber(pcre2_match_data *, uint32_t, PCRE2_UCHAR **, \
+    PCRE2_SIZE *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substring_length_byname(pcre2_match_data *, PCRE2_SPTR, PCRE2_SIZE *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substring_length_bynumber(pcre2_match_data *, uint32_t, PCRE2_SIZE *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substring_nametable_scan(const pcre2_code *, PCRE2_SPTR, PCRE2_SPTR *, \
+    PCRE2_SPTR *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substring_number_from_name(const pcre2_code *, PCRE2_SPTR); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_substring_list_free(PCRE2_SPTR *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substring_list_get(pcre2_match_data *, PCRE2_UCHAR ***, PCRE2_SIZE **);
+
+/* Functions for serializing / deserializing compiled patterns. */
+
+#define PCRE2_SERIALIZE_FUNCTIONS \
+PCRE2_EXP_DECL int32_t PCRE2_CALL_CONVENTION \
+  pcre2_serialize_encode(const pcre2_code **, int32_t, uint8_t **, \
+    PCRE2_SIZE *, pcre2_general_context *); \
+PCRE2_EXP_DECL int32_t PCRE2_CALL_CONVENTION \
+  pcre2_serialize_decode(pcre2_code **, int32_t, const uint8_t *, \
+    pcre2_general_context *); \
+PCRE2_EXP_DECL int32_t PCRE2_CALL_CONVENTION \
+  pcre2_serialize_get_number_of_codes(const uint8_t *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_serialize_free(uint8_t *);
+
+
+/* Convenience function for match + substitute. */
+
+#define PCRE2_SUBSTITUTE_FUNCTION \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_substitute(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
+    uint32_t, pcre2_match_data *, pcre2_match_context *, PCRE2_SPTR, \
+    PCRE2_SIZE, PCRE2_UCHAR *, PCRE2_SIZE *);
+
+
+/* Functions for converting pattern source strings. */
+
+#define PCRE2_CONVERT_FUNCTIONS \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_pattern_convert(PCRE2_SPTR, PCRE2_SIZE, uint32_t, PCRE2_UCHAR **, \
+    PCRE2_SIZE *, pcre2_convert_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_converted_pattern_free(PCRE2_UCHAR *);
+
+
+/* Functions for JIT processing */
+
+#define PCRE2_JIT_FUNCTIONS \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_jit_compile(pcre2_code *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_jit_match(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
+    uint32_t, pcre2_match_data *, pcre2_match_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_jit_free_unused_memory(pcre2_general_context *); \
+PCRE2_EXP_DECL pcre2_jit_stack PCRE2_CALL_CONVENTION \
+  *pcre2_jit_stack_create(PCRE2_SIZE, PCRE2_SIZE, pcre2_general_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_jit_stack_assign(pcre2_match_context *, pcre2_jit_callback, void *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_jit_stack_free(pcre2_jit_stack *);
+
+
+/* Other miscellaneous functions. */
+
+#define PCRE2_OTHER_FUNCTIONS \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_get_error_message(int, PCRE2_UCHAR *, PCRE2_SIZE); \
+PCRE2_EXP_DECL const uint8_t PCRE2_CALL_CONVENTION \
+  *pcre2_maketables(pcre2_general_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_maketables_free(pcre2_general_context *, const uint8_t *);
+
+/* Define macros that generate width-specific names from generic versions. The
+three-level macro scheme is necessary to get the macros expanded when we want
+them to be. First we get the width from PCRE2_LOCAL_WIDTH, which is used for
+generating three versions of everything below. After that, PCRE2_SUFFIX will be
+re-defined to use PCRE2_CODE_UNIT_WIDTH, for use when macros such as
+pcre2_compile are called by application code. */
+
+#define PCRE2_JOIN(a,b) a ## b
+#define PCRE2_GLUE(a,b) PCRE2_JOIN(a,b)
+#define PCRE2_SUFFIX(a) PCRE2_GLUE(a,PCRE2_LOCAL_WIDTH)
+
+
+/* Data types */
+
+#define PCRE2_UCHAR                 PCRE2_SUFFIX(PCRE2_UCHAR)
+#define PCRE2_SPTR                  PCRE2_SUFFIX(PCRE2_SPTR)
+
+#define pcre2_code                  PCRE2_SUFFIX(pcre2_code_)
+#define pcre2_jit_callback          PCRE2_SUFFIX(pcre2_jit_callback_)
+#define pcre2_jit_stack             PCRE2_SUFFIX(pcre2_jit_stack_)
+
+#define pcre2_real_code             PCRE2_SUFFIX(pcre2_real_code_)
+#define pcre2_real_general_context  PCRE2_SUFFIX(pcre2_real_general_context_)
+#define pcre2_real_compile_context  PCRE2_SUFFIX(pcre2_real_compile_context_)
+#define pcre2_real_convert_context  PCRE2_SUFFIX(pcre2_real_convert_context_)
+#define pcre2_real_match_context    PCRE2_SUFFIX(pcre2_real_match_context_)
+#define pcre2_real_jit_stack        PCRE2_SUFFIX(pcre2_real_jit_stack_)
+#define pcre2_real_match_data       PCRE2_SUFFIX(pcre2_real_match_data_)
+
+
+/* Data blocks */
+
+#define pcre2_callout_block            PCRE2_SUFFIX(pcre2_callout_block_)
+#define pcre2_callout_enumerate_block  PCRE2_SUFFIX(pcre2_callout_enumerate_block_)
+#define pcre2_substitute_callout_block PCRE2_SUFFIX(pcre2_substitute_callout_block_)
+#define pcre2_general_context          PCRE2_SUFFIX(pcre2_general_context_)
+#define pcre2_compile_context          PCRE2_SUFFIX(pcre2_compile_context_)
+#define pcre2_convert_context          PCRE2_SUFFIX(pcre2_convert_context_)
+#define pcre2_match_context            PCRE2_SUFFIX(pcre2_match_context_)
+#define pcre2_match_data               PCRE2_SUFFIX(pcre2_match_data_)
+
+
+/* Functions: the complete list in alphabetical order */
+
+#define pcre2_callout_enumerate               PCRE2_SUFFIX(pcre2_callout_enumerate_)
+#define pcre2_code_copy                       PCRE2_SUFFIX(pcre2_code_copy_)
+#define pcre2_code_copy_with_tables           PCRE2_SUFFIX(pcre2_code_copy_with_tables_)
+#define pcre2_code_free                       PCRE2_SUFFIX(pcre2_code_free_)
+#define pcre2_compile                         PCRE2_SUFFIX(pcre2_compile_)
+#define pcre2_compile_context_copy            PCRE2_SUFFIX(pcre2_compile_context_copy_)
+#define pcre2_compile_context_create          PCRE2_SUFFIX(pcre2_compile_context_create_)
+#define pcre2_compile_context_free            PCRE2_SUFFIX(pcre2_compile_context_free_)
+#define pcre2_config                          PCRE2_SUFFIX(pcre2_config_)
+#define pcre2_convert_context_copy            PCRE2_SUFFIX(pcre2_convert_context_copy_)
+#define pcre2_convert_context_create          PCRE2_SUFFIX(pcre2_convert_context_create_)
+#define pcre2_convert_context_free            PCRE2_SUFFIX(pcre2_convert_context_free_)
+#define pcre2_converted_pattern_free          PCRE2_SUFFIX(pcre2_converted_pattern_free_)
+#define pcre2_dfa_match                       PCRE2_SUFFIX(pcre2_dfa_match_)
+#define pcre2_general_context_copy            PCRE2_SUFFIX(pcre2_general_context_copy_)
+#define pcre2_general_context_create          PCRE2_SUFFIX(pcre2_general_context_create_)
+#define pcre2_general_context_free            PCRE2_SUFFIX(pcre2_general_context_free_)
+#define pcre2_get_error_message               PCRE2_SUFFIX(pcre2_get_error_message_)
+#define pcre2_get_mark                        PCRE2_SUFFIX(pcre2_get_mark_)
+#define pcre2_get_match_data_size             PCRE2_SUFFIX(pcre2_get_match_data_size_)
+#define pcre2_get_ovector_pointer             PCRE2_SUFFIX(pcre2_get_ovector_pointer_)
+#define pcre2_get_ovector_count               PCRE2_SUFFIX(pcre2_get_ovector_count_)
+#define pcre2_get_startchar                   PCRE2_SUFFIX(pcre2_get_startchar_)
+#define pcre2_jit_compile                     PCRE2_SUFFIX(pcre2_jit_compile_)
+#define pcre2_jit_match                       PCRE2_SUFFIX(pcre2_jit_match_)
+#define pcre2_jit_free_unused_memory          PCRE2_SUFFIX(pcre2_jit_free_unused_memory_)
+#define pcre2_jit_stack_assign                PCRE2_SUFFIX(pcre2_jit_stack_assign_)
+#define pcre2_jit_stack_create                PCRE2_SUFFIX(pcre2_jit_stack_create_)
+#define pcre2_jit_stack_free                  PCRE2_SUFFIX(pcre2_jit_stack_free_)
+#define pcre2_maketables                      PCRE2_SUFFIX(pcre2_maketables_)
+#define pcre2_maketables_free                 PCRE2_SUFFIX(pcre2_maketables_free_)
+#define pcre2_match                           PCRE2_SUFFIX(pcre2_match_)
+#define pcre2_match_context_copy              PCRE2_SUFFIX(pcre2_match_context_copy_)
+#define pcre2_match_context_create            PCRE2_SUFFIX(pcre2_match_context_create_)
+#define pcre2_match_context_free              PCRE2_SUFFIX(pcre2_match_context_free_)
+#define pcre2_match_data_create               PCRE2_SUFFIX(pcre2_match_data_create_)
+#define pcre2_match_data_create_from_pattern  PCRE2_SUFFIX(pcre2_match_data_create_from_pattern_)
+#define pcre2_match_data_free                 PCRE2_SUFFIX(pcre2_match_data_free_)
+#define pcre2_pattern_convert                 PCRE2_SUFFIX(pcre2_pattern_convert_)
+#define pcre2_pattern_info                    PCRE2_SUFFIX(pcre2_pattern_info_)
+#define pcre2_serialize_decode                PCRE2_SUFFIX(pcre2_serialize_decode_)
+#define pcre2_serialize_encode                PCRE2_SUFFIX(pcre2_serialize_encode_)
+#define pcre2_serialize_free                  PCRE2_SUFFIX(pcre2_serialize_free_)
+#define pcre2_serialize_get_number_of_codes   PCRE2_SUFFIX(pcre2_serialize_get_number_of_codes_)
+#define pcre2_set_bsr                         PCRE2_SUFFIX(pcre2_set_bsr_)
+#define pcre2_set_callout                     PCRE2_SUFFIX(pcre2_set_callout_)
+#define pcre2_set_character_tables            PCRE2_SUFFIX(pcre2_set_character_tables_)
+#define pcre2_set_compile_extra_options       PCRE2_SUFFIX(pcre2_set_compile_extra_options_)
+#define pcre2_set_compile_recursion_guard     PCRE2_SUFFIX(pcre2_set_compile_recursion_guard_)
+#define pcre2_set_depth_limit                 PCRE2_SUFFIX(pcre2_set_depth_limit_)
+#define pcre2_set_glob_escape                 PCRE2_SUFFIX(pcre2_set_glob_escape_)
+#define pcre2_set_glob_separator              PCRE2_SUFFIX(pcre2_set_glob_separator_)
+#define pcre2_set_heap_limit                  PCRE2_SUFFIX(pcre2_set_heap_limit_)
+#define pcre2_set_match_limit                 PCRE2_SUFFIX(pcre2_set_match_limit_)
+#define pcre2_set_max_pattern_length          PCRE2_SUFFIX(pcre2_set_max_pattern_length_)
+#define pcre2_set_newline                     PCRE2_SUFFIX(pcre2_set_newline_)
+#define pcre2_set_parens_nest_limit           PCRE2_SUFFIX(pcre2_set_parens_nest_limit_)
+#define pcre2_set_offset_limit                PCRE2_SUFFIX(pcre2_set_offset_limit_)
+#define pcre2_set_substitute_callout          PCRE2_SUFFIX(pcre2_set_substitute_callout_)
+#define pcre2_substitute                      PCRE2_SUFFIX(pcre2_substitute_)
+#define pcre2_substring_copy_byname           PCRE2_SUFFIX(pcre2_substring_copy_byname_)
+#define pcre2_substring_copy_bynumber         PCRE2_SUFFIX(pcre2_substring_copy_bynumber_)
+#define pcre2_substring_free                  PCRE2_SUFFIX(pcre2_substring_free_)
+#define pcre2_substring_get_byname            PCRE2_SUFFIX(pcre2_substring_get_byname_)
+#define pcre2_substring_get_bynumber          PCRE2_SUFFIX(pcre2_substring_get_bynumber_)
+#define pcre2_substring_length_byname         PCRE2_SUFFIX(pcre2_substring_length_byname_)
+#define pcre2_substring_length_bynumber       PCRE2_SUFFIX(pcre2_substring_length_bynumber_)
+#define pcre2_substring_list_get              PCRE2_SUFFIX(pcre2_substring_list_get_)
+#define pcre2_substring_list_free             PCRE2_SUFFIX(pcre2_substring_list_free_)
+#define pcre2_substring_nametable_scan        PCRE2_SUFFIX(pcre2_substring_nametable_scan_)
+#define pcre2_substring_number_from_name      PCRE2_SUFFIX(pcre2_substring_number_from_name_)
+
+/* Keep this old function name for backwards compatibility */
+#define pcre2_set_recursion_limit PCRE2_SUFFIX(pcre2_set_recursion_limit_)
+
+/* Keep this obsolete function for backwards compatibility: it is now a noop. */
+#define pcre2_set_recursion_memory_management PCRE2_SUFFIX(pcre2_set_recursion_memory_management_)
+
+/* Now generate all three sets of width-specific structures and function
+prototypes. */
+
+#define PCRE2_TYPES_STRUCTURES_AND_FUNCTIONS \
+PCRE2_TYPES_LIST \
+PCRE2_STRUCTURE_LIST \
+PCRE2_GENERAL_INFO_FUNCTIONS \
+PCRE2_GENERAL_CONTEXT_FUNCTIONS \
+PCRE2_COMPILE_CONTEXT_FUNCTIONS \
+PCRE2_CONVERT_CONTEXT_FUNCTIONS \
+PCRE2_CONVERT_FUNCTIONS \
+PCRE2_MATCH_CONTEXT_FUNCTIONS \
+PCRE2_COMPILE_FUNCTIONS \
+PCRE2_PATTERN_INFO_FUNCTIONS \
+PCRE2_MATCH_FUNCTIONS \
+PCRE2_SUBSTRING_FUNCTIONS \
+PCRE2_SERIALIZE_FUNCTIONS \
+PCRE2_SUBSTITUTE_FUNCTION \
+PCRE2_JIT_FUNCTIONS \
+PCRE2_OTHER_FUNCTIONS
+
+#define PCRE2_LOCAL_WIDTH 8
+PCRE2_TYPES_STRUCTURES_AND_FUNCTIONS
+#undef PCRE2_LOCAL_WIDTH
+
+#define PCRE2_LOCAL_WIDTH 16
+PCRE2_TYPES_STRUCTURES_AND_FUNCTIONS
+#undef PCRE2_LOCAL_WIDTH
+
+#define PCRE2_LOCAL_WIDTH 32
+PCRE2_TYPES_STRUCTURES_AND_FUNCTIONS
+#undef PCRE2_LOCAL_WIDTH
+
+/* Undefine the list macros; they are no longer needed. */
+
+#undef PCRE2_TYPES_LIST
+#undef PCRE2_STRUCTURE_LIST
+#undef PCRE2_GENERAL_INFO_FUNCTIONS
+#undef PCRE2_GENERAL_CONTEXT_FUNCTIONS
+#undef PCRE2_COMPILE_CONTEXT_FUNCTIONS
+#undef PCRE2_CONVERT_CONTEXT_FUNCTIONS
+#undef PCRE2_MATCH_CONTEXT_FUNCTIONS
+#undef PCRE2_COMPILE_FUNCTIONS
+#undef PCRE2_PATTERN_INFO_FUNCTIONS
+#undef PCRE2_MATCH_FUNCTIONS
+#undef PCRE2_SUBSTRING_FUNCTIONS
+#undef PCRE2_SERIALIZE_FUNCTIONS
+#undef PCRE2_SUBSTITUTE_FUNCTION
+#undef PCRE2_JIT_FUNCTIONS
+#undef PCRE2_OTHER_FUNCTIONS
+#undef PCRE2_TYPES_STRUCTURES_AND_FUNCTIONS
+
+/* PCRE2_CODE_UNIT_WIDTH must be defined. If it is 8, 16, or 32, redefine
+PCRE2_SUFFIX to use it. If it is 0, undefine the other macros and make
+PCRE2_SUFFIX a no-op. Otherwise, generate an error. */
+
+#undef PCRE2_SUFFIX
+#ifndef PCRE2_CODE_UNIT_WIDTH
+#error PCRE2_CODE_UNIT_WIDTH must be defined before including pcre2.h.
+#error Use 8, 16, or 32; or 0 for a multi-width application.
+#else  /* PCRE2_CODE_UNIT_WIDTH is defined */
+#if PCRE2_CODE_UNIT_WIDTH == 8 || \
+    PCRE2_CODE_UNIT_WIDTH == 16 || \
+    PCRE2_CODE_UNIT_WIDTH == 32
+#define PCRE2_SUFFIX(a) PCRE2_GLUE(a, PCRE2_CODE_UNIT_WIDTH)
+#elif PCRE2_CODE_UNIT_WIDTH == 0
+#undef PCRE2_JOIN
+#undef PCRE2_GLUE
+#define PCRE2_SUFFIX(a) a
+#else
+#error PCRE2_CODE_UNIT_WIDTH must be 0, 8, 16, or 32.
+#endif
+#endif  /* PCRE2_CODE_UNIT_WIDTH is defined */
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#endif  /* PCRE2_H_IDEMPOTENT_GUARD */
+
+/* End of pcre2.h */
diff --git a/Foundation/src/pcre2_auto_possess.c b/Foundation/src/pcre2_auto_possess.c
new file mode 100644
index 000000000..9863d5242
--- /dev/null
+++ b/Foundation/src/pcre2_auto_possess.c
@@ -0,0 +1,1361 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2022 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* This module contains functions that scan a compiled pattern and change
+repeats into possessive repeats where possible. */
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+/*************************************************
+*        Tables for auto-possessification        *
+*************************************************/
+
+/* This table is used to check whether auto-possessification is possible
+between adjacent character-type opcodes. The left-hand (repeated) opcode is
+used to select the row, and the right-hand opcode is use to select the column.
+A value of 1 means that auto-possessification is OK. For example, the second
+value in the first row means that \D+\d can be turned into \D++\d.
+
+The Unicode property types (\P and \p) have to be present to fill out the table
+because of what their opcode values are, but the table values should always be
+zero because property types are handled separately in the code. The last four
+columns apply to items that cannot be repeated, so there is no need to have
+rows for them. Note that OP_DIGIT etc. are generated only when PCRE_UCP is
+*not* set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
+
+#define APTROWS (LAST_AUTOTAB_LEFT_OP - FIRST_AUTOTAB_OP + 1)
+#define APTCOLS (LAST_AUTOTAB_RIGHT_OP - FIRST_AUTOTAB_OP + 1)
+
+static const uint8_t autoposstab[APTROWS][APTCOLS] = {
+/* \D \d \S \s \W \w  . .+ \C \P \p \R \H \h \V \v \X \Z \z  $ $M */
+  { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \D */
+  { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \d */
+  { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \S */
+  { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \s */
+  { 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \W */
+  { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \w */
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .  */
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .+ */
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \C */
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \P */
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \p */
+  { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \R */
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \H */
+  { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \h */
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \V */
+  { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0 },  /* \v */
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }   /* \X */
+};
+
+#ifdef SUPPORT_UNICODE
+/* This table is used to check whether auto-possessification is possible
+between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP). The
+left-hand (repeated) opcode is used to select the row, and the right-hand
+opcode is used to select the column. The values are as follows:
+
+  0   Always return FALSE (never auto-possessify)
+  1   Character groups are distinct (possessify if both are OP_PROP)
+  2   Check character categories in the same group (general or particular)
+  3   TRUE if the two opcodes are not the same (PROP vs NOTPROP)
+
+  4   Check left general category vs right particular category
+  5   Check right general category vs left particular category
+
+  6   Left alphanum vs right general category
+  7   Left space vs right general category
+  8   Left word vs right general category
+
+  9   Right alphanum vs left general category
+ 10   Right space vs left general category
+ 11   Right word vs left general category
+
+ 12   Left alphanum vs right particular category
+ 13   Left space vs right particular category
+ 14   Left word vs right particular category
+
+ 15   Right alphanum vs left particular category
+ 16   Right space vs left particular category
+ 17   Right word vs left particular category
+*/
+
+static const uint8_t propposstab[PT_TABSIZE][PT_TABSIZE] = {
+/* ANY LAMP GC  PC  SC  SCX ALNUM SPACE PXSPACE WORD CLIST UCNC BIDICL BOOL */
+  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_ANY */
+  { 0,  3,  0,  0,  0,   0,    3,    1,      1,   0,    0,   0,    0,    0 },  /* PT_LAMP */
+  { 0,  0,  2,  4,  0,   0,    9,   10,     10,  11,    0,   0,    0,    0 },  /* PT_GC */
+  { 0,  0,  5,  2,  0,   0,   15,   16,     16,  17,    0,   0,    0,    0 },  /* PT_PC */
+  { 0,  0,  0,  0,  2,   2,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_SC */
+  { 0,  0,  0,  0,  2,   2,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_SCX */
+  { 0,  3,  6, 12,  0,   0,    3,    1,      1,   0,    0,   0,    0,    0 },  /* PT_ALNUM */
+  { 0,  1,  7, 13,  0,   0,    1,    3,      3,   1,    0,   0,    0,    0 },  /* PT_SPACE */
+  { 0,  1,  7, 13,  0,   0,    1,    3,      3,   1,    0,   0,    0,    0 },  /* PT_PXSPACE */
+  { 0,  0,  8, 14,  0,   0,    0,    1,      1,   3,    0,   0,    0,    0 },  /* PT_WORD */
+  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_CLIST */
+  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   3,    0,    0 },  /* PT_UCNC */
+  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_BIDICL */
+  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 }   /* PT_BOOL */
+};
+
+/* This table is used to check whether auto-possessification is possible
+between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP) when one
+specifies a general category and the other specifies a particular category. The
+row is selected by the general category and the column by the particular
+category. The value is 1 if the particular category is not part of the general
+category. */
+
+static const uint8_t catposstab[7][30] = {
+/* Cc Cf Cn Co Cs Ll Lm Lo Lt Lu Mc Me Mn Nd Nl No Pc Pd Pe Pf Pi Po Ps Sc Sk Sm So Zl Zp Zs */
+  { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* C */
+  { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* L */
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* M */
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* N */
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1 },  /* P */
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1 },  /* S */
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 }   /* Z */
+};
+
+/* This table is used when checking ALNUM, (PX)SPACE, SPACE, and WORD against
+a general or particular category. The properties in each row are those
+that apply to the character set in question. Duplication means that a little
+unnecessary work is done when checking, but this keeps things much simpler
+because they can all use the same code. For more details see the comment where
+this table is used.
+
+Note: SPACE and PXSPACE used to be different because Perl excluded VT from
+"space", but from Perl 5.18 it's included, so both categories are treated the
+same here. */
+
+static const uint8_t posspropstab[3][4] = {
+  { ucp_L, ucp_N, ucp_N, ucp_Nl },  /* ALNUM, 3rd and 4th values redundant */
+  { ucp_Z, ucp_Z, ucp_C, ucp_Cc },  /* SPACE and PXSPACE, 2nd value redundant */
+  { ucp_L, ucp_N, ucp_P, ucp_Po }   /* WORD */
+};
+#endif  /* SUPPORT_UNICODE */
+
+
+
+#ifdef SUPPORT_UNICODE
+/*************************************************
+*        Check a character and a property        *
+*************************************************/
+
+/* This function is called by compare_opcodes() when a property item is
+adjacent to a fixed character.
+
+Arguments:
+  c            the character
+  ptype        the property type
+  pdata        the data for the type
+  negated      TRUE if it's a negated property (\P or \p{^)
+
+Returns:       TRUE if auto-possessifying is OK
+*/
+
+static BOOL
+check_char_prop(uint32_t c, unsigned int ptype, unsigned int pdata,
+  BOOL negated)
+{
+BOOL ok;
+const uint32_t *p;
+const ucd_record *prop = GET_UCD(c);
+
+switch(ptype)
+  {
+  case PT_LAMP:
+  return (prop->chartype == ucp_Lu ||
+          prop->chartype == ucp_Ll ||
+          prop->chartype == ucp_Lt) == negated;
+
+  case PT_GC:
+  return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
+
+  case PT_PC:
+  return (pdata == prop->chartype) == negated;
+
+  case PT_SC:
+  return (pdata == prop->script) == negated;
+
+  case PT_SCX:
+  ok = (pdata == prop->script
+        || MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), pdata) != 0);
+  return ok == negated;
+
+  /* These are specials */
+
+  case PT_ALNUM:
+  return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
+          PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
+
+  /* Perl space used to exclude VT, but from Perl 5.18 it is included, which
+  means that Perl space and POSIX space are now identical. PCRE was changed
+  at release 8.34. */
+
+  case PT_SPACE:    /* Perl space */
+  case PT_PXSPACE:  /* POSIX space */
+  switch(c)
+    {
+    HSPACE_CASES:
+    VSPACE_CASES:
+    return negated;
+
+    default:
+    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == negated;
+    }
+  break;  /* Control never reaches here */
+
+  case PT_WORD:
+  return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
+          PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
+          c == CHAR_UNDERSCORE) == negated;
+
+  case PT_CLIST:
+  p = PRIV(ucd_caseless_sets) + prop->caseset;
+  for (;;)
+    {
+    if (c < *p) return !negated;
+    if (c == *p++) return negated;
+    }
+  break;  /* Control never reaches here */
+
+  /* Haven't yet thought these through. */
+
+  case PT_BIDICL:
+  return FALSE;
+
+  case PT_BOOL:
+  return FALSE;
+  }
+
+return FALSE;
+}
+#endif  /* SUPPORT_UNICODE */
+
+
+
+/*************************************************
+*        Base opcode of repeated opcodes         *
+*************************************************/
+
+/* Returns the base opcode for repeated single character type opcodes. If the
+opcode is not a repeated character type, it returns with the original value.
+
+Arguments:  c opcode
+Returns:    base opcode for the type
+*/
+
+static PCRE2_UCHAR
+get_repeat_base(PCRE2_UCHAR c)
+{
+return (c > OP_TYPEPOSUPTO)? c :
+       (c >= OP_TYPESTAR)?   OP_TYPESTAR :
+       (c >= OP_NOTSTARI)?   OP_NOTSTARI :
+       (c >= OP_NOTSTAR)?    OP_NOTSTAR :
+       (c >= OP_STARI)?      OP_STARI :
+                             OP_STAR;
+}
+
+
+/*************************************************
+*        Fill the character property list        *
+*************************************************/
+
+/* Checks whether the code points to an opcode that can take part in auto-
+possessification, and if so, fills a list with its properties.
+
+Arguments:
+  code        points to start of expression
+  utf         TRUE if in UTF mode
+  ucp         TRUE if in UCP mode
+  fcc         points to the case-flipping table
+  list        points to output list
+              list[0] will be filled with the opcode
+              list[1] will be non-zero if this opcode
+                can match an empty character string
+              list[2..7] depends on the opcode
+
+Returns:      points to the start of the next opcode if *code is accepted
+              NULL if *code is not accepted
+*/
+
+static PCRE2_SPTR
+get_chr_property_list(PCRE2_SPTR code, BOOL utf, BOOL ucp, const uint8_t *fcc,
+  uint32_t *list)
+{
+PCRE2_UCHAR c = *code;
+PCRE2_UCHAR base;
+PCRE2_SPTR end;
+uint32_t chr;
+
+#ifdef SUPPORT_UNICODE
+uint32_t *clist_dest;
+const uint32_t *clist_src;
+#else
+(void)utf;    /* Suppress "unused parameter" compiler warnings */
+(void)ucp;
+#endif
+
+list[0] = c;
+list[1] = FALSE;
+code++;
+
+if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
+  {
+  base = get_repeat_base(c);
+  c -= (base - OP_STAR);
+
+  if (c == OP_UPTO || c == OP_MINUPTO || c == OP_EXACT || c == OP_POSUPTO)
+    code += IMM2_SIZE;
+
+  list[1] = (c != OP_PLUS && c != OP_MINPLUS && c != OP_EXACT &&
+             c != OP_POSPLUS);
+
+  switch(base)
+    {
+    case OP_STAR:
+    list[0] = OP_CHAR;
+    break;
+
+    case OP_STARI:
+    list[0] = OP_CHARI;
+    break;
+
+    case OP_NOTSTAR:
+    list[0] = OP_NOT;
+    break;
+
+    case OP_NOTSTARI:
+    list[0] = OP_NOTI;
+    break;
+
+    case OP_TYPESTAR:
+    list[0] = *code;
+    code++;
+    break;
+    }
+  c = list[0];
+  }
+
+switch(c)
+  {
+  case OP_NOT_DIGIT:
+  case OP_DIGIT:
+  case OP_NOT_WHITESPACE:
+  case OP_WHITESPACE:
+  case OP_NOT_WORDCHAR:
+  case OP_WORDCHAR:
+  case OP_ANY:
+  case OP_ALLANY:
+  case OP_ANYNL:
+  case OP_NOT_HSPACE:
+  case OP_HSPACE:
+  case OP_NOT_VSPACE:
+  case OP_VSPACE:
+  case OP_EXTUNI:
+  case OP_EODN:
+  case OP_EOD:
+  case OP_DOLL:
+  case OP_DOLLM:
+  return code;
+
+  case OP_CHAR:
+  case OP_NOT:
+  GETCHARINCTEST(chr, code);
+  list[2] = chr;
+  list[3] = NOTACHAR;
+  return code;
+
+  case OP_CHARI:
+  case OP_NOTI:
+  list[0] = (c == OP_CHARI) ? OP_CHAR : OP_NOT;
+  GETCHARINCTEST(chr, code);
+  list[2] = chr;
+
+#ifdef SUPPORT_UNICODE
+  if (chr < 128 || (chr < 256 && !utf && !ucp))
+    list[3] = fcc[chr];
+  else
+    list[3] = UCD_OTHERCASE(chr);
+#elif defined SUPPORT_WIDE_CHARS
+  list[3] = (chr < 256) ? fcc[chr] : chr;
+#else
+  list[3] = fcc[chr];
+#endif
+
+  /* The othercase might be the same value. */
+
+  if (chr == list[3])
+    list[3] = NOTACHAR;
+  else
+    list[4] = NOTACHAR;
+  return code;
+
+#ifdef SUPPORT_UNICODE
+  case OP_PROP:
+  case OP_NOTPROP:
+  if (code[0] != PT_CLIST)
+    {
+    list[2] = code[0];
+    list[3] = code[1];
+    return code + 2;
+    }
+
+  /* Convert only if we have enough space. */
+
+  clist_src = PRIV(ucd_caseless_sets) + code[1];
+  clist_dest = list + 2;
+  code += 2;
+
+  do {
+     if (clist_dest >= list + 8)
+       {
+       /* Early return if there is not enough space. This should never
+       happen, since all clists are shorter than 5 character now. */
+       list[2] = code[0];
+       list[3] = code[1];
+       return code;
+       }
+     *clist_dest++ = *clist_src;
+     }
+  while(*clist_src++ != NOTACHAR);
+
+  /* All characters are stored. The terminating NOTACHAR is copied from the
+  clist itself. */
+
+  list[0] = (c == OP_PROP) ? OP_CHAR : OP_NOT;
+  return code;
+#endif
+
+  case OP_NCLASS:
+  case OP_CLASS:
+#ifdef SUPPORT_WIDE_CHARS
+  case OP_XCLASS:
+  if (c == OP_XCLASS)
+    end = code + GET(code, 0) - 1;
+  else
+#endif
+    end = code + 32 / sizeof(PCRE2_UCHAR);
+
+  switch(*end)
+    {
+    case OP_CRSTAR:
+    case OP_CRMINSTAR:
+    case OP_CRQUERY:
+    case OP_CRMINQUERY:
+    case OP_CRPOSSTAR:
+    case OP_CRPOSQUERY:
+    list[1] = TRUE;
+    end++;
+    break;
+
+    case OP_CRPLUS:
+    case OP_CRMINPLUS:
+    case OP_CRPOSPLUS:
+    end++;
+    break;
+
+    case OP_CRRANGE:
+    case OP_CRMINRANGE:
+    case OP_CRPOSRANGE:
+    list[1] = (GET2(end, 1) == 0);
+    end += 1 + 2 * IMM2_SIZE;
+    break;
+    }
+  list[2] = (uint32_t)(end - code);
+  return end;
+  }
+
+return NULL;    /* Opcode not accepted */
+}
+
+
+
+/*************************************************
+*    Scan further character sets for match       *
+*************************************************/
+
+/* Checks whether the base and the current opcode have a common character, in
+which case the base cannot be possessified.
+
+Arguments:
+  code        points to the byte code
+  utf         TRUE in UTF mode
+  ucp         TRUE in UCP mode
+  cb          compile data block
+  base_list   the data list of the base opcode
+  base_end    the end of the base opcode
+  rec_limit   points to recursion depth counter
+
+Returns:      TRUE if the auto-possessification is possible
+*/
+
+static BOOL
+compare_opcodes(PCRE2_SPTR code, BOOL utf, BOOL ucp, const compile_block *cb,
+  const uint32_t *base_list, PCRE2_SPTR base_end, int *rec_limit)
+{
+PCRE2_UCHAR c;
+uint32_t list[8];
+const uint32_t *chr_ptr;
+const uint32_t *ochr_ptr;
+const uint32_t *list_ptr;
+PCRE2_SPTR next_code;
+#ifdef SUPPORT_WIDE_CHARS
+PCRE2_SPTR xclass_flags;
+#endif
+const uint8_t *class_bitset;
+const uint8_t *set1, *set2, *set_end;
+uint32_t chr;
+BOOL accepted, invert_bits;
+BOOL entered_a_group = FALSE;
+
+if (--(*rec_limit) <= 0) return FALSE;  /* Recursion has gone too deep */
+
+/* Note: the base_list[1] contains whether the current opcode has a greedy
+(represented by a non-zero value) quantifier. This is a different from
+other character type lists, which store here that the character iterator
+matches to an empty string (also represented by a non-zero value). */
+
+for(;;)
+  {
+  /* All operations move the code pointer forward.
+  Therefore infinite recursions are not possible. */
+
+  c = *code;
+
+  /* Skip over callouts */
+
+  if (c == OP_CALLOUT)
+    {
+    code += PRIV(OP_lengths)[c];
+    continue;
+    }
+
+  if (c == OP_CALLOUT_STR)
+    {
+    code += GET(code, 1 + 2*LINK_SIZE);
+    continue;
+    }
+
+  /* At the end of a branch, skip to the end of the group. */
+
+  if (c == OP_ALT)
+    {
+    do code += GET(code, 1); while (*code == OP_ALT);
+    c = *code;
+    }
+
+  /* Inspect the next opcode. */
+
+  switch(c)
+    {
+    /* We can always possessify a greedy iterator at the end of the pattern,
+    which is reached after skipping over the final OP_KET. A non-greedy
+    iterator must never be possessified. */
+
+    case OP_END:
+    return base_list[1] != 0;
+
+    /* When an iterator is at the end of certain kinds of group we can inspect
+    what follows the group by skipping over the closing ket. Note that this
+    does not apply to OP_KETRMAX or OP_KETRMIN because what follows any given
+    iteration is variable (could be another iteration or could be the next
+    item). As these two opcodes are not listed in the next switch, they will
+    end up as the next code to inspect, and return FALSE by virtue of being
+    unsupported. */
+
+    case OP_KET:
+    case OP_KETRPOS:
+    /* The non-greedy case cannot be converted to a possessive form. */
+
+    if (base_list[1] == 0) return FALSE;
+
+    /* If the bracket is capturing it might be referenced by an OP_RECURSE
+    so its last iterator can never be possessified if the pattern contains
+    recursions. (This could be improved by keeping a list of group numbers that
+    are called by recursion.) */
+
+    switch(*(code - GET(code, 1)))
+      {
+      case OP_CBRA:
+      case OP_SCBRA:
+      case OP_CBRAPOS:
+      case OP_SCBRAPOS:
+      if (cb->had_recurse) return FALSE;
+      break;
+
+      /* A script run might have to backtrack if the iterated item can match
+      characters from more than one script. So give up unless repeating an
+      explicit character. */
+
+      case OP_SCRIPT_RUN:
+      if (base_list[0] != OP_CHAR && base_list[0] != OP_CHARI)
+        return FALSE;
+      break;
+
+      /* Atomic sub-patterns and assertions can always auto-possessify their
+      last iterator. However, if the group was entered as a result of checking
+      a previous iterator, this is not possible. */
+
+      case OP_ASSERT:
+      case OP_ASSERT_NOT:
+      case OP_ASSERTBACK:
+      case OP_ASSERTBACK_NOT:
+      case OP_ONCE:
+      return !entered_a_group;
+
+      /* Non-atomic assertions - don't possessify last iterator. This needs
+      more thought. */
+
+      case OP_ASSERT_NA:
+      case OP_ASSERTBACK_NA:
+      return FALSE;
+      }
+
+    /* Skip over the bracket and inspect what comes next. */
+
+    code += PRIV(OP_lengths)[c];
+    continue;
+
+    /* Handle cases where the next item is a group. */
+
+    case OP_ONCE:
+    case OP_BRA:
+    case OP_CBRA:
+    next_code = code + GET(code, 1);
+    code += PRIV(OP_lengths)[c];
+
+    /* Check each branch. We have to recurse a level for all but the last
+    branch. */
+
+    while (*next_code == OP_ALT)
+      {
+      if (!compare_opcodes(code, utf, ucp, cb, base_list, base_end, rec_limit))
+        return FALSE;
+      code = next_code + 1 + LINK_SIZE;
+      next_code += GET(next_code, 1);
+      }
+
+    entered_a_group = TRUE;
+    continue;
+
+    case OP_BRAZERO:
+    case OP_BRAMINZERO:
+
+    next_code = code + 1;
+    if (*next_code != OP_BRA && *next_code != OP_CBRA &&
+        *next_code != OP_ONCE) return FALSE;
+
+    do next_code += GET(next_code, 1); while (*next_code == OP_ALT);
+
+    /* The bracket content will be checked by the OP_BRA/OP_CBRA case above. */
+
+    next_code += 1 + LINK_SIZE;
+    if (!compare_opcodes(next_code, utf, ucp, cb, base_list, base_end,
+         rec_limit))
+      return FALSE;
+
+    code += PRIV(OP_lengths)[c];
+    continue;
+
+    /* The next opcode does not need special handling; fall through and use it
+    to see if the base can be possessified. */
+
+    default:
+    break;
+    }
+
+  /* We now have the next appropriate opcode to compare with the base. Check
+  for a supported opcode, and load its properties. */
+
+  code = get_chr_property_list(code, utf, ucp, cb->fcc, list);
+  if (code == NULL) return FALSE;    /* Unsupported */
+
+  /* If either opcode is a small character list, set pointers for comparing
+  characters from that list with another list, or with a property. */
+
+  if (base_list[0] == OP_CHAR)
+    {
+    chr_ptr = base_list + 2;
+    list_ptr = list;
+    }
+  else if (list[0] == OP_CHAR)
+    {
+    chr_ptr = list + 2;
+    list_ptr = base_list;
+    }
+
+  /* Character bitsets can also be compared to certain opcodes. */
+
+  else if (base_list[0] == OP_CLASS || list[0] == OP_CLASS
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      /* In 8 bit, non-UTF mode, OP_CLASS and OP_NCLASS are the same. */
+      || (!utf && (base_list[0] == OP_NCLASS || list[0] == OP_NCLASS))
+#endif
+      )
+    {
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    if (base_list[0] == OP_CLASS || (!utf && base_list[0] == OP_NCLASS))
+#else
+    if (base_list[0] == OP_CLASS)
+#endif
+      {
+      set1 = (uint8_t *)(base_end - base_list[2]);
+      list_ptr = list;
+      }
+    else
+      {
+      set1 = (uint8_t *)(code - list[2]);
+      list_ptr = base_list;
+      }
+
+    invert_bits = FALSE;
+    switch(list_ptr[0])
+      {
+      case OP_CLASS:
+      case OP_NCLASS:
+      set2 = (uint8_t *)
+        ((list_ptr == list ? code : base_end) - list_ptr[2]);
+      break;
+
+#ifdef SUPPORT_WIDE_CHARS
+      case OP_XCLASS:
+      xclass_flags = (list_ptr == list ? code : base_end) - list_ptr[2] + LINK_SIZE;
+      if ((*xclass_flags & XCL_HASPROP) != 0) return FALSE;
+      if ((*xclass_flags & XCL_MAP) == 0)
+        {
+        /* No bits are set for characters < 256. */
+        if (list[1] == 0) return (*xclass_flags & XCL_NOT) == 0;
+        /* Might be an empty repeat. */
+        continue;
+        }
+      set2 = (uint8_t *)(xclass_flags + 1);
+      break;
+#endif
+
+      case OP_NOT_DIGIT:
+      invert_bits = TRUE;
+      /* Fall through */
+      case OP_DIGIT:
+      set2 = (uint8_t *)(cb->cbits + cbit_digit);
+      break;
+
+      case OP_NOT_WHITESPACE:
+      invert_bits = TRUE;
+      /* Fall through */
+      case OP_WHITESPACE:
+      set2 = (uint8_t *)(cb->cbits + cbit_space);
+      break;
+
+      case OP_NOT_WORDCHAR:
+      invert_bits = TRUE;
+      /* Fall through */
+      case OP_WORDCHAR:
+      set2 = (uint8_t *)(cb->cbits + cbit_word);
+      break;
+
+      default:
+      return FALSE;
+      }
+
+    /* Because the bit sets are unaligned bytes, we need to perform byte
+    comparison here. */
+
+    set_end = set1 + 32;
+    if (invert_bits)
+      {
+      do
+        {
+        if ((*set1++ & ~(*set2++)) != 0) return FALSE;
+        }
+      while (set1 < set_end);
+      }
+    else
+      {
+      do
+        {
+        if ((*set1++ & *set2++) != 0) return FALSE;
+        }
+      while (set1 < set_end);
+      }
+
+    if (list[1] == 0) return TRUE;
+    /* Might be an empty repeat. */
+    continue;
+    }
+
+  /* Some property combinations also acceptable. Unicode property opcodes are
+  processed specially; the rest can be handled with a lookup table. */
+
+  else
+    {
+    uint32_t leftop, rightop;
+
+    leftop = base_list[0];
+    rightop = list[0];
+
+#ifdef SUPPORT_UNICODE
+    accepted = FALSE; /* Always set in non-unicode case. */
+    if (leftop == OP_PROP || leftop == OP_NOTPROP)
+      {
+      if (rightop == OP_EOD)
+        accepted = TRUE;
+      else if (rightop == OP_PROP || rightop == OP_NOTPROP)
+        {
+        int n;
+        const uint8_t *p;
+        BOOL same = leftop == rightop;
+        BOOL lisprop = leftop == OP_PROP;
+        BOOL risprop = rightop == OP_PROP;
+        BOOL bothprop = lisprop && risprop;
+
+        /* There's a table that specifies how each combination is to be
+        processed:
+          0   Always return FALSE (never auto-possessify)
+          1   Character groups are distinct (possessify if both are OP_PROP)
+          2   Check character categories in the same group (general or particular)
+          3   Return TRUE if the two opcodes are not the same
+          ... see comments below
+        */
+
+        n = propposstab[base_list[2]][list[2]];
+        switch(n)
+          {
+          case 0: break;
+          case 1: accepted = bothprop; break;
+          case 2: accepted = (base_list[3] == list[3]) != same; break;
+          case 3: accepted = !same; break;
+
+          case 4:  /* Left general category, right particular category */
+          accepted = risprop && catposstab[base_list[3]][list[3]] == same;
+          break;
+
+          case 5:  /* Right general category, left particular category */
+          accepted = lisprop && catposstab[list[3]][base_list[3]] == same;
+          break;
+
+          /* This code is logically tricky. Think hard before fiddling with it.
+          The posspropstab table has four entries per row. Each row relates to
+          one of PCRE's special properties such as ALNUM or SPACE or WORD.
+          Only WORD actually needs all four entries, but using repeats for the
+          others means they can all use the same code below.
+
+          The first two entries in each row are Unicode general categories, and
+          apply always, because all the characters they include are part of the
+          PCRE character set. The third and fourth entries are a general and a
+          particular category, respectively, that include one or more relevant
+          characters. One or the other is used, depending on whether the check
+          is for a general or a particular category. However, in both cases the
+          category contains more characters than the specials that are defined
+          for the property being tested against. Therefore, it cannot be used
+          in a NOTPROP case.
+
+          Example: the row for WORD contains ucp_L, ucp_N, ucp_P, ucp_Po.
+          Underscore is covered by ucp_P or ucp_Po. */
+
+          case 6:  /* Left alphanum vs right general category */
+          case 7:  /* Left space vs right general category */
+          case 8:  /* Left word vs right general category */
+          p = posspropstab[n-6];
+          accepted = risprop && lisprop ==
+            (list[3] != p[0] &&
+             list[3] != p[1] &&
+            (list[3] != p[2] || !lisprop));
+          break;
+
+          case 9:   /* Right alphanum vs left general category */
+          case 10:  /* Right space vs left general category */
+          case 11:  /* Right word vs left general category */
+          p = posspropstab[n-9];
+          accepted = lisprop && risprop ==
+            (base_list[3] != p[0] &&
+             base_list[3] != p[1] &&
+            (base_list[3] != p[2] || !risprop));
+          break;
+
+          case 12:  /* Left alphanum vs right particular category */
+          case 13:  /* Left space vs right particular category */
+          case 14:  /* Left word vs right particular category */
+          p = posspropstab[n-12];
+          accepted = risprop && lisprop ==
+            (catposstab[p[0]][list[3]] &&
+             catposstab[p[1]][list[3]] &&
+            (list[3] != p[3] || !lisprop));
+          break;
+
+          case 15:  /* Right alphanum vs left particular category */
+          case 16:  /* Right space vs left particular category */
+          case 17:  /* Right word vs left particular category */
+          p = posspropstab[n-15];
+          accepted = lisprop && risprop ==
+            (catposstab[p[0]][base_list[3]] &&
+             catposstab[p[1]][base_list[3]] &&
+            (base_list[3] != p[3] || !risprop));
+          break;
+          }
+        }
+      }
+
+    else
+#endif  /* SUPPORT_UNICODE */
+
+    accepted = leftop >= FIRST_AUTOTAB_OP && leftop <= LAST_AUTOTAB_LEFT_OP &&
+           rightop >= FIRST_AUTOTAB_OP && rightop <= LAST_AUTOTAB_RIGHT_OP &&
+           autoposstab[leftop - FIRST_AUTOTAB_OP][rightop - FIRST_AUTOTAB_OP];
+
+    if (!accepted) return FALSE;
+
+    if (list[1] == 0) return TRUE;
+    /* Might be an empty repeat. */
+    continue;
+    }
+
+  /* Control reaches here only if one of the items is a small character list.
+  All characters are checked against the other side. */
+
+  do
+    {
+    chr = *chr_ptr;
+
+    switch(list_ptr[0])
+      {
+      case OP_CHAR:
+      ochr_ptr = list_ptr + 2;
+      do
+        {
+        if (chr == *ochr_ptr) return FALSE;
+        ochr_ptr++;
+        }
+      while(*ochr_ptr != NOTACHAR);
+      break;
+
+      case OP_NOT:
+      ochr_ptr = list_ptr + 2;
+      do
+        {
+        if (chr == *ochr_ptr)
+          break;
+        ochr_ptr++;
+        }
+      while(*ochr_ptr != NOTACHAR);
+      if (*ochr_ptr == NOTACHAR) return FALSE;   /* Not found */
+      break;
+
+      /* Note that OP_DIGIT etc. are generated only when PCRE2_UCP is *not*
+      set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
+
+      case OP_DIGIT:
+      if (chr < 256 && (cb->ctypes[chr] & ctype_digit) != 0) return FALSE;
+      break;
+
+      case OP_NOT_DIGIT:
+      if (chr > 255 || (cb->ctypes[chr] & ctype_digit) == 0) return FALSE;
+      break;
+
+      case OP_WHITESPACE:
+      if (chr < 256 && (cb->ctypes[chr] & ctype_space) != 0) return FALSE;
+      break;
+
+      case OP_NOT_WHITESPACE:
+      if (chr > 255 || (cb->ctypes[chr] & ctype_space) == 0) return FALSE;
+      break;
+
+      case OP_WORDCHAR:
+      if (chr < 255 && (cb->ctypes[chr] & ctype_word) != 0) return FALSE;
+      break;
+
+      case OP_NOT_WORDCHAR:
+      if (chr > 255 || (cb->ctypes[chr] & ctype_word) == 0) return FALSE;
+      break;
+
+      case OP_HSPACE:
+      switch(chr)
+        {
+        HSPACE_CASES: return FALSE;
+        default: break;
+        }
+      break;
+
+      case OP_NOT_HSPACE:
+      switch(chr)
+        {
+        HSPACE_CASES: break;
+        default: return FALSE;
+        }
+      break;
+
+      case OP_ANYNL:
+      case OP_VSPACE:
+      switch(chr)
+        {
+        VSPACE_CASES: return FALSE;
+        default: break;
+        }
+      break;
+
+      case OP_NOT_VSPACE:
+      switch(chr)
+        {
+        VSPACE_CASES: break;
+        default: return FALSE;
+        }
+      break;
+
+      case OP_DOLL:
+      case OP_EODN:
+      switch (chr)
+        {
+        case CHAR_CR:
+        case CHAR_LF:
+        case CHAR_VT:
+        case CHAR_FF:
+        case CHAR_NEL:
+#ifndef EBCDIC
+        case 0x2028:
+        case 0x2029:
+#endif  /* Not EBCDIC */
+        return FALSE;
+        }
+      break;
+
+      case OP_EOD:    /* Can always possessify before \z */
+      break;
+
+#ifdef SUPPORT_UNICODE
+      case OP_PROP:
+      case OP_NOTPROP:
+      if (!check_char_prop(chr, list_ptr[2], list_ptr[3],
+            list_ptr[0] == OP_NOTPROP))
+        return FALSE;
+      break;
+#endif
+
+      case OP_NCLASS:
+      if (chr > 255) return FALSE;
+      /* Fall through */
+
+      case OP_CLASS:
+      if (chr > 255) break;
+      class_bitset = (uint8_t *)
+        ((list_ptr == list ? code : base_end) - list_ptr[2]);
+      if ((class_bitset[chr >> 3] & (1u << (chr & 7))) != 0) return FALSE;
+      break;
+
+#ifdef SUPPORT_WIDE_CHARS
+      case OP_XCLASS:
+      if (PRIV(xclass)(chr, (list_ptr == list ? code : base_end) -
+          list_ptr[2] + LINK_SIZE, utf)) return FALSE;
+      break;
+#endif
+
+      default:
+      return FALSE;
+      }
+
+    chr_ptr++;
+    }
+  while(*chr_ptr != NOTACHAR);
+
+  /* At least one character must be matched from this opcode. */
+
+  if (list[1] == 0) return TRUE;
+  }
+
+/* Control never reaches here. There used to be a fail-save return FALSE; here,
+but some compilers complain about an unreachable statement. */
+}
+
+
+
+/*************************************************
+*    Scan compiled regex for auto-possession     *
+*************************************************/
+
+/* Replaces single character iterations with their possessive alternatives
+if appropriate. This function modifies the compiled opcode! Hitting a
+non-existent opcode may indicate a bug in PCRE2, but it can also be caused if a
+bad UTF string was compiled with PCRE2_NO_UTF_CHECK. The rec_limit catches
+overly complicated or large patterns. In these cases, the check just stops,
+leaving the remainder of the pattern unpossessified.
+
+Arguments:
+  code        points to start of the byte code
+  cb          compile data block
+
+Returns:      0 for success
+              -1 if a non-existant opcode is encountered
+*/
+
+int
+PRIV(auto_possessify)(PCRE2_UCHAR *code, const compile_block *cb)
+{
+PCRE2_UCHAR c;
+PCRE2_SPTR end;
+PCRE2_UCHAR *repeat_opcode;
+uint32_t list[8];
+int rec_limit = 1000;  /* Was 10,000 but clang+ASAN uses a lot of stack. */
+BOOL utf = (cb->external_options & PCRE2_UTF) != 0;
+BOOL ucp = (cb->external_options & PCRE2_UCP) != 0;
+
+for (;;)
+  {
+  c = *code;
+
+  if (c >= OP_TABLE_LENGTH) return -1;   /* Something gone wrong */
+
+  if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
+    {
+    c -= get_repeat_base(c) - OP_STAR;
+    end = (c <= OP_MINUPTO) ?
+      get_chr_property_list(code, utf, ucp, cb->fcc, list) : NULL;
+    list[1] = c == OP_STAR || c == OP_PLUS || c == OP_QUERY || c == OP_UPTO;
+
+    if (end != NULL && compare_opcodes(end, utf, ucp, cb, list, end,
+        &rec_limit))
+      {
+      switch(c)
+        {
+        case OP_STAR:
+        *code += OP_POSSTAR - OP_STAR;
+        break;
+
+        case OP_MINSTAR:
+        *code += OP_POSSTAR - OP_MINSTAR;
+        break;
+
+        case OP_PLUS:
+        *code += OP_POSPLUS - OP_PLUS;
+        break;
+
+        case OP_MINPLUS:
+        *code += OP_POSPLUS - OP_MINPLUS;
+        break;
+
+        case OP_QUERY:
+        *code += OP_POSQUERY - OP_QUERY;
+        break;
+
+        case OP_MINQUERY:
+        *code += OP_POSQUERY - OP_MINQUERY;
+        break;
+
+        case OP_UPTO:
+        *code += OP_POSUPTO - OP_UPTO;
+        break;
+
+        case OP_MINUPTO:
+        *code += OP_POSUPTO - OP_MINUPTO;
+        break;
+        }
+      }
+    c = *code;
+    }
+  else if (c == OP_CLASS || c == OP_NCLASS || c == OP_XCLASS)
+    {
+#ifdef SUPPORT_WIDE_CHARS
+    if (c == OP_XCLASS)
+      repeat_opcode = code + GET(code, 1);
+    else
+#endif
+      repeat_opcode = code + 1 + (32 / sizeof(PCRE2_UCHAR));
+
+    c = *repeat_opcode;
+    if (c >= OP_CRSTAR && c <= OP_CRMINRANGE)
+      {
+      /* The return from get_chr_property_list() will never be NULL when
+      *code (aka c) is one of the three class opcodes. However, gcc with
+      -fanalyzer notes that a NULL return is possible, and grumbles. Hence we
+      put in a check. */
+
+      end = get_chr_property_list(code, utf, ucp, cb->fcc, list);
+      list[1] = (c & 1) == 0;
+
+      if (end != NULL &&
+          compare_opcodes(end, utf, ucp, cb, list, end, &rec_limit))
+        {
+        switch (c)
+          {
+          case OP_CRSTAR:
+          case OP_CRMINSTAR:
+          *repeat_opcode = OP_CRPOSSTAR;
+          break;
+
+          case OP_CRPLUS:
+          case OP_CRMINPLUS:
+          *repeat_opcode = OP_CRPOSPLUS;
+          break;
+
+          case OP_CRQUERY:
+          case OP_CRMINQUERY:
+          *repeat_opcode = OP_CRPOSQUERY;
+          break;
+
+          case OP_CRRANGE:
+          case OP_CRMINRANGE:
+          *repeat_opcode = OP_CRPOSRANGE;
+          break;
+          }
+        }
+      }
+    c = *code;
+    }
+
+  switch(c)
+    {
+    case OP_END:
+    return 0;
+
+    case OP_TYPESTAR:
+    case OP_TYPEMINSTAR:
+    case OP_TYPEPLUS:
+    case OP_TYPEMINPLUS:
+    case OP_TYPEQUERY:
+    case OP_TYPEMINQUERY:
+    case OP_TYPEPOSSTAR:
+    case OP_TYPEPOSPLUS:
+    case OP_TYPEPOSQUERY:
+    if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+    break;
+
+    case OP_TYPEUPTO:
+    case OP_TYPEMINUPTO:
+    case OP_TYPEEXACT:
+    case OP_TYPEPOSUPTO:
+    if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
+      code += 2;
+    break;
+
+    case OP_CALLOUT_STR:
+    code += GET(code, 1 + 2*LINK_SIZE);
+    break;
+
+#ifdef SUPPORT_WIDE_CHARS
+    case OP_XCLASS:
+    code += GET(code, 1);
+    break;
+#endif
+
+    case OP_MARK:
+    case OP_COMMIT_ARG:
+    case OP_PRUNE_ARG:
+    case OP_SKIP_ARG:
+    case OP_THEN_ARG:
+    code += code[1];
+    break;
+    }
+
+  /* Add in the fixed length from the table */
+
+  code += PRIV(OP_lengths)[c];
+
+  /* In UTF-8 and UTF-16 modes, opcodes that are followed by a character may be
+  followed by a multi-byte character. The length in the table is a minimum, so
+  we have to arrange to skip the extra code units. */
+
+#ifdef MAYBE_UTF_MULTI
+  if (utf) switch(c)
+    {
+    case OP_CHAR:
+    case OP_CHARI:
+    case OP_NOT:
+    case OP_NOTI:
+    case OP_STAR:
+    case OP_MINSTAR:
+    case OP_PLUS:
+    case OP_MINPLUS:
+    case OP_QUERY:
+    case OP_MINQUERY:
+    case OP_UPTO:
+    case OP_MINUPTO:
+    case OP_EXACT:
+    case OP_POSSTAR:
+    case OP_POSPLUS:
+    case OP_POSQUERY:
+    case OP_POSUPTO:
+    case OP_STARI:
+    case OP_MINSTARI:
+    case OP_PLUSI:
+    case OP_MINPLUSI:
+    case OP_QUERYI:
+    case OP_MINQUERYI:
+    case OP_UPTOI:
+    case OP_MINUPTOI:
+    case OP_EXACTI:
+    case OP_POSSTARI:
+    case OP_POSPLUSI:
+    case OP_POSQUERYI:
+    case OP_POSUPTOI:
+    case OP_NOTSTAR:
+    case OP_NOTMINSTAR:
+    case OP_NOTPLUS:
+    case OP_NOTMINPLUS:
+    case OP_NOTQUERY:
+    case OP_NOTMINQUERY:
+    case OP_NOTUPTO:
+    case OP_NOTMINUPTO:
+    case OP_NOTEXACT:
+    case OP_NOTPOSSTAR:
+    case OP_NOTPOSPLUS:
+    case OP_NOTPOSQUERY:
+    case OP_NOTPOSUPTO:
+    case OP_NOTSTARI:
+    case OP_NOTMINSTARI:
+    case OP_NOTPLUSI:
+    case OP_NOTMINPLUSI:
+    case OP_NOTQUERYI:
+    case OP_NOTMINQUERYI:
+    case OP_NOTUPTOI:
+    case OP_NOTMINUPTOI:
+    case OP_NOTEXACTI:
+    case OP_NOTPOSSTARI:
+    case OP_NOTPOSPLUSI:
+    case OP_NOTPOSQUERYI:
+    case OP_NOTPOSUPTOI:
+    if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
+    break;
+    }
+#else
+  (void)(utf);  /* Keep compiler happy by referencing function argument */
+#endif  /* SUPPORT_WIDE_CHARS */
+  }
+}
+
+/* End of pcre2_auto_possess.c */
diff --git a/Foundation/src/pcre_chartables.c b/Foundation/src/pcre2_chartables.c
similarity index 67%
rename from Foundation/src/pcre_chartables.c
rename to Foundation/src/pcre2_chartables.c
index b11eb25e4..5849a1983 100644
--- a/Foundation/src/pcre_chartables.c
+++ b/Foundation/src/pcre2_chartables.c
@@ -2,28 +2,33 @@
 *      Perl-Compatible Regular Expressions       *
 *************************************************/
 
-/* This file contains character tables that are used when no external tables
-are passed to PCRE by the application that calls it. The tables are used only
-for characters whose code values are less than 256.
+/* This file was automatically written by the pcre2_dftables auxiliary
+program. It contains character tables that are used when no external
+tables are passed to PCRE2 by the application that calls it. The tables
+are used only for characters whose code values are less than 256. */
 
-This is a default version of the tables that assumes ASCII encoding. A program
-called dftables (which is distributed with PCRE) can be used to build
-alternative versions of this file. This is necessary if you are running in an
-EBCDIC environment, or if you want to default to a different encoding, for
-example ISO-8859-1. When dftables is run, it creates these tables in the
-current locale. If PCRE is configured with --enable-rebuild-chartables, this
-happens automatically.
+/* This set of tables was written in the C locale. */
 
-The following #includes are present because without them gcc 4.x may remove the
-array definition from the final binary if PCRE is built into a static library
-and dead code stripping is activated. This leads to link errors. Pulling in the
-header ensures that the array gets flagged as "someone outside this compilation
-unit might reference this" and so it will always be supplied to the linker. */
+/* The pcre2_ftables program (which is distributed with PCRE2) can be used
+to build alternative versions of this file. This is necessary if you are
+running in an EBCDIC environment, or if you want to default to a different
+encoding, for example ISO-8859-1. When pcre2_dftables is run, it creates
+these tables in the "C" locale by default. This happens automatically if
+PCRE2 is configured with --enable-rebuild-chartables. However, you can run
+pcre2_dftables manually with the -L option to build tables using the LC_ALL
+locale. */
 
-#include "pcre_config.h"
-#include "pcre_internal.h"
+/* The following #include is present because without it gcc 4.x may remove
+the array definition from the final binary if PCRE2 is built into a static
+library and dead code stripping is activated. This leads to link errors.
+Pulling in the header ensures that the array gets flagged as "someone
+outside this compilation unit might reference this" and so it will always
+be supplied to the linker. */
 
-const pcre_uint8 PRIV(default_tables)[] = {
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+const uint8_t PRIV(default_tables)[] = {
 
 /* This table is a lower casing table. */
 
@@ -100,52 +105,52 @@ bytes long and the bits run from the least significant end of each byte. The
 classes that have their own maps are: space, xdigit, digit, upper, lower, word,
 graph, print, punct, and cntrl. Other classes are built from combinations. */
 
-  0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
+  0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,  /* space */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 
-  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,  /* xdigit */
   0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 
-  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,  /* digit */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* upper */
   0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* lower */
   0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 
-  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,  /* word */
   0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 
-  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,  /* graph */
   0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 
-  0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+  0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,  /* print */
   0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 
-  0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
+  0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,  /* punct */
   0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 
-  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,  /* cntrl */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -153,28 +158,27 @@ graph, print, punct, and cntrl. Other classes are built from combinations. */
 /* This table identifies various classes of character by individual bits:
   0x01   white space character
   0x02   letter
-  0x04   decimal digit
-  0x08   hexadecimal digit
+  0x04   lower case letter
+  0x08   decimal digit
   0x10   alphanumeric or '_'
-  0x80   regular expression metacharacter or binary zero
 */
 
-  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
   0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00, /*   8- 15 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
-  0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
-  0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
-  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
-  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
-  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
+  0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - '  */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ( - /  */
+  0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /*  0 - 7  */
+  0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00, /*  8 - ?  */
+  0x00,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  @ - G  */
   0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
   0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
-  0x12,0x12,0x12,0x80,0x80,0x00,0x80,0x10, /*  X - _  */
-  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
-  0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
+  0x12,0x12,0x12,0x00,0x00,0x00,0x00,0x10, /*  X - _  */
+  0x00,0x16,0x16,0x16,0x16,0x16,0x16,0x16, /*  ` - g  */
+  0x16,0x16,0x16,0x16,0x16,0x16,0x16,0x16, /*  h - o  */
+  0x16,0x16,0x16,0x16,0x16,0x16,0x16,0x16, /*  p - w  */
+  0x16,0x16,0x16,0x00,0x00,0x00,0x00,0x00, /*  x -127 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
@@ -192,4 +196,4 @@ graph, print, punct, and cntrl. Other classes are built from combinations. */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
 
-/* End of pcre_chartables.c */
+/* End of pcre2_chartables.c */
diff --git a/Foundation/src/pcre2_compile.c b/Foundation/src/pcre2_compile.c
new file mode 100644
index 000000000..9a65b2f6e
--- /dev/null
+++ b/Foundation/src/pcre2_compile.c
@@ -0,0 +1,10621 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2022 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "pcre2_config.h"
+
+#define NLBLOCK cb             /* Block containing newline information */
+#define PSSTART start_pattern  /* Field containing processed string start */
+#define PSEND   end_pattern    /* Field containing processed string end */
+
+#include "pcre2_internal.h"
+
+/* In rare error cases debugging might require calling pcre2_printint(). */
+
+#if 0
+#ifdef EBCDIC
+#define PRINTABLE(c) ((c) >= 64 && (c) < 255)
+#else
+#define PRINTABLE(c) ((c) >= 32 && (c) < 127)
+#endif
+#include "pcre2_printint.c"
+#define DEBUG_CALL_PRINTINT
+#endif
+
+/* Other debugging code can be enabled by these defines. */
+
+/* #define DEBUG_SHOW_CAPTURES */
+/* #define DEBUG_SHOW_PARSED */
+
+/* There are a few things that vary with different code unit sizes. Handle them
+by defining macros in order to minimize #if usage. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#define STRING_UTFn_RIGHTPAR     STRING_UTF8_RIGHTPAR, 5
+#define XDIGIT(c)                xdigitab[c]
+
+#else  /* Either 16-bit or 32-bit */
+#define XDIGIT(c)                (MAX_255(c)? xdigitab[c] : 0xff)
+
+#if PCRE2_CODE_UNIT_WIDTH == 16
+#define STRING_UTFn_RIGHTPAR     STRING_UTF16_RIGHTPAR, 6
+
+#else  /* 32-bit */
+#define STRING_UTFn_RIGHTPAR     STRING_UTF32_RIGHTPAR, 6
+#endif
+#endif
+
+/* Macros to store and retrieve a PCRE2_SIZE value in the parsed pattern, which
+consists of uint32_t elements. Assume that if uint32_t can't hold it, two of
+them will be able to (i.e. assume a 64-bit world). */
+
+#if PCRE2_SIZE_MAX <= UINT32_MAX
+#define PUTOFFSET(s,p) *p++ = s
+#define GETOFFSET(s,p) s = *p++
+#define GETPLUSOFFSET(s,p) s = *(++p)
+#define READPLUSOFFSET(s,p) s = p[1]
+#define SKIPOFFSET(p) p++
+#define SIZEOFFSET 1
+#else
+#define PUTOFFSET(s,p) \
+  { *p++ = (uint32_t)(s >> 32); *p++ = (uint32_t)(s & 0xffffffff); }
+#define GETOFFSET(s,p) \
+  { s = ((PCRE2_SIZE)p[0] << 32) | (PCRE2_SIZE)p[1]; p += 2; }
+#define GETPLUSOFFSET(s,p) \
+  { s = ((PCRE2_SIZE)p[1] << 32) | (PCRE2_SIZE)p[2]; p += 2; }
+#define READPLUSOFFSET(s,p) \
+  { s = ((PCRE2_SIZE)p[1] << 32) | (PCRE2_SIZE)p[2]; }
+#define SKIPOFFSET(p) p += 2
+#define SIZEOFFSET 2
+#endif
+
+/* Macros for manipulating elements of the parsed pattern vector. */
+
+#define META_CODE(x)   (x & 0xffff0000u)
+#define META_DATA(x)   (x & 0x0000ffffu)
+#define META_DIFF(x,y) ((x-y)>>16)
+
+/* Function definitions to allow mutual recursion */
+
+#ifdef SUPPORT_UNICODE
+static unsigned int
+  add_list_to_class_internal(uint8_t *, PCRE2_UCHAR **, uint32_t,
+    compile_block *, const uint32_t *, unsigned int);
+#endif
+
+static int
+  compile_regex(uint32_t, PCRE2_UCHAR **, uint32_t **, int *, uint32_t,
+    uint32_t *, uint32_t *, uint32_t *, uint32_t *, branch_chain *,
+    compile_block *, PCRE2_SIZE *);
+
+static int
+  get_branchlength(uint32_t **, int *, int *, parsed_recurse_check *,
+    compile_block *);
+
+static BOOL
+  set_lookbehind_lengths(uint32_t **, int *, int *, parsed_recurse_check *,
+    compile_block *);
+
+static int
+  check_lookbehinds(uint32_t *, uint32_t **, parsed_recurse_check *,
+    compile_block *, int *);
+
+
+/*************************************************
+*      Code parameters and static tables         *
+*************************************************/
+
+#define MAX_GROUP_NUMBER   65535u
+#define MAX_REPEAT_COUNT   65535u
+#define REPEAT_UNLIMITED   (MAX_REPEAT_COUNT+1)
+
+/* COMPILE_WORK_SIZE specifies the size of stack workspace, which is used in
+different ways in the different pattern scans. The parsing and group-
+identifying pre-scan uses it to handle nesting, and needs it to be 16-bit
+aligned for this. Having defined the size in code units, we set up
+C16_WORK_SIZE as the number of elements in the 16-bit vector.
+
+During the first compiling phase, when determining how much memory is required,
+the regex is partly compiled into this space, but the compiled parts are
+discarded as soon as they can be, so that hopefully there will never be an
+overrun. The code does, however, check for an overrun, which can occur for
+pathological patterns. The size of the workspace depends on LINK_SIZE because
+the length of compiled items varies with this.
+
+In the real compile phase, this workspace is not currently used. */
+
+#define COMPILE_WORK_SIZE (3000*LINK_SIZE)   /* Size in code units */
+
+#define C16_WORK_SIZE \
+  ((COMPILE_WORK_SIZE * sizeof(PCRE2_UCHAR))/sizeof(uint16_t))
+
+/* A uint32_t vector is used for caching information about the size of
+capturing groups, to improve performance. A default is created on the stack of
+this size. */
+
+#define GROUPINFO_DEFAULT_SIZE 256
+
+/* The overrun tests check for a slightly smaller size so that they detect the
+overrun before it actually does run off the end of the data block. */
+
+#define WORK_SIZE_SAFETY_MARGIN (100)
+
+/* This value determines the size of the initial vector that is used for
+remembering named groups during the pre-compile. It is allocated on the stack,
+but if it is too small, it is expanded, in a similar way to the workspace. The
+value is the number of slots in the list. */
+
+#define NAMED_GROUP_LIST_SIZE  20
+
+/* The pre-compiling pass over the pattern creates a parsed pattern in a vector
+of uint32_t. For short patterns this lives on the stack, with this size. Heap
+memory is used for longer patterns. */
+
+#define PARSED_PATTERN_DEFAULT_SIZE 1024
+
+/* Maximum length value to check against when making sure that the variable
+that holds the compiled pattern length does not overflow. We make it a bit less
+than INT_MAX to allow for adding in group terminating code units, so that we
+don't have to check them every time. */
+
+#define OFLOW_MAX (INT_MAX - 20)
+
+/* Code values for parsed patterns, which are stored in a vector of 32-bit
+unsigned ints. Values less than META_END are literal data values. The coding
+for identifying the item is in the top 16-bits, leaving 16 bits for the
+additional data that some of them need. The META_CODE, META_DATA, and META_DIFF
+macros are used to manipulate parsed pattern elements.
+
+NOTE: When these definitions are changed, the table of extra lengths for each
+code (meta_extra_lengths, just below) must be updated to remain in step. */
+
+#define META_END              0x80000000u  /* End of pattern */
+
+#define META_ALT              0x80010000u  /* alternation */
+#define META_ATOMIC           0x80020000u  /* atomic group */
+#define META_BACKREF          0x80030000u  /* Back ref */
+#define META_BACKREF_BYNAME   0x80040000u  /* \k'name' */
+#define META_BIGVALUE         0x80050000u  /* Next is a literal > META_END */
+#define META_CALLOUT_NUMBER   0x80060000u  /* (?C with numerical argument */
+#define META_CALLOUT_STRING   0x80070000u  /* (?C with string argument */
+#define META_CAPTURE          0x80080000u  /* Capturing parenthesis */
+#define META_CIRCUMFLEX       0x80090000u  /* ^ metacharacter */
+#define META_CLASS            0x800a0000u  /* start non-empty class */
+#define META_CLASS_EMPTY      0x800b0000u  /* empty class */
+#define META_CLASS_EMPTY_NOT  0x800c0000u  /* negative empty class */
+#define META_CLASS_END        0x800d0000u  /* end of non-empty class */
+#define META_CLASS_NOT        0x800e0000u  /* start non-empty negative class */
+#define META_COND_ASSERT      0x800f0000u  /* (?(?assertion)... */
+#define META_COND_DEFINE      0x80100000u  /* (?(DEFINE)... */
+#define META_COND_NAME        0x80110000u  /* (?(<name>)... */
+#define META_COND_NUMBER      0x80120000u  /* (?(digits)... */
+#define META_COND_RNAME       0x80130000u  /* (?(R&name)... */
+#define META_COND_RNUMBER     0x80140000u  /* (?(Rdigits)... */
+#define META_COND_VERSION     0x80150000u  /* (?(VERSION<op>x.y)... */
+#define META_DOLLAR           0x80160000u  /* $ metacharacter */
+#define META_DOT              0x80170000u  /* . metacharacter */
+#define META_ESCAPE           0x80180000u  /* \d and friends */
+#define META_KET              0x80190000u  /* closing parenthesis */
+#define META_NOCAPTURE        0x801a0000u  /* no capture parens */
+#define META_OPTIONS          0x801b0000u  /* (?i) and friends */
+#define META_POSIX            0x801c0000u  /* POSIX class item */
+#define META_POSIX_NEG        0x801d0000u  /* negative POSIX class item */
+#define META_RANGE_ESCAPED    0x801e0000u  /* range with at least one escape */
+#define META_RANGE_LITERAL    0x801f0000u  /* range defined literally */
+#define META_RECURSE          0x80200000u  /* Recursion */
+#define META_RECURSE_BYNAME   0x80210000u  /* (?&name) */
+#define META_SCRIPT_RUN       0x80220000u  /* (*script_run:...) */
+
+/* These must be kept together to make it easy to check that an assertion
+is present where expected in a conditional group. */
+
+#define META_LOOKAHEAD        0x80230000u  /* (?= */
+#define META_LOOKAHEADNOT     0x80240000u  /* (?! */
+#define META_LOOKBEHIND       0x80250000u  /* (?<= */
+#define META_LOOKBEHINDNOT    0x80260000u  /* (?<! */
+
+/* These cannot be conditions */
+
+#define META_LOOKAHEAD_NA     0x80270000u  /* (*napla: */
+#define META_LOOKBEHIND_NA    0x80280000u  /* (*naplb: */
+
+/* These must be kept in this order, with consecutive values, and the _ARG
+versions of COMMIT, PRUNE, SKIP, and THEN immediately after their non-argument
+versions. */
+
+#define META_MARK             0x80290000u  /* (*MARK) */
+#define META_ACCEPT           0x802a0000u  /* (*ACCEPT) */
+#define META_FAIL             0x802b0000u  /* (*FAIL) */
+#define META_COMMIT           0x802c0000u  /* These               */
+#define META_COMMIT_ARG       0x802d0000u  /*   pairs             */
+#define META_PRUNE            0x802e0000u  /*     must            */
+#define META_PRUNE_ARG        0x802f0000u  /*       be            */
+#define META_SKIP             0x80300000u  /*         kept        */
+#define META_SKIP_ARG         0x80310000u  /*           in        */
+#define META_THEN             0x80320000u  /*             this    */
+#define META_THEN_ARG         0x80330000u  /*               order */
+
+/* These must be kept in groups of adjacent 3 values, and all together. */
+
+#define META_ASTERISK         0x80340000u  /* *  */
+#define META_ASTERISK_PLUS    0x80350000u  /* *+ */
+#define META_ASTERISK_QUERY   0x80360000u  /* *? */
+#define META_PLUS             0x80370000u  /* +  */
+#define META_PLUS_PLUS        0x80380000u  /* ++ */
+#define META_PLUS_QUERY       0x80390000u  /* +? */
+#define META_QUERY            0x803a0000u  /* ?  */
+#define META_QUERY_PLUS       0x803b0000u  /* ?+ */
+#define META_QUERY_QUERY      0x803c0000u  /* ?? */
+#define META_MINMAX           0x803d0000u  /* {n,m}  repeat */
+#define META_MINMAX_PLUS      0x803e0000u  /* {n,m}+ repeat */
+#define META_MINMAX_QUERY     0x803f0000u  /* {n,m}? repeat */
+
+#define META_FIRST_QUANTIFIER META_ASTERISK
+#define META_LAST_QUANTIFIER  META_MINMAX_QUERY
+
+/* This is a special "meta code" that is used only to distinguish (*asr: from
+(*sr: in the table of aphabetic assertions. It is never stored in the parsed
+pattern because (*asr: is turned into (*sr:(*atomic: at that stage. There is
+therefore no need for it to have a length entry, so use a high value. */
+
+#define META_ATOMIC_SCRIPT_RUN 0x8fff0000u
+
+/* Table of extra lengths for each of the meta codes. Must be kept in step with
+the definitions above. For some items these values are a basic length to which
+a variable amount has to be added. */
+
+static unsigned char meta_extra_lengths[] = {
+  0,             /* META_END */
+  0,             /* META_ALT */
+  0,             /* META_ATOMIC */
+  0,             /* META_BACKREF - more if group is >= 10 */
+  1+SIZEOFFSET,  /* META_BACKREF_BYNAME */
+  1,             /* META_BIGVALUE */
+  3,             /* META_CALLOUT_NUMBER */
+  3+SIZEOFFSET,  /* META_CALLOUT_STRING */
+  0,             /* META_CAPTURE */
+  0,             /* META_CIRCUMFLEX */
+  0,             /* META_CLASS */
+  0,             /* META_CLASS_EMPTY */
+  0,             /* META_CLASS_EMPTY_NOT */
+  0,             /* META_CLASS_END */
+  0,             /* META_CLASS_NOT */
+  0,             /* META_COND_ASSERT */
+  SIZEOFFSET,    /* META_COND_DEFINE */
+  1+SIZEOFFSET,  /* META_COND_NAME */
+  1+SIZEOFFSET,  /* META_COND_NUMBER */
+  1+SIZEOFFSET,  /* META_COND_RNAME */
+  1+SIZEOFFSET,  /* META_COND_RNUMBER */
+  3,             /* META_COND_VERSION */
+  0,             /* META_DOLLAR */
+  0,             /* META_DOT */
+  0,             /* META_ESCAPE - more for ESC_P, ESC_p, ESC_g, ESC_k */
+  0,             /* META_KET */
+  0,             /* META_NOCAPTURE */
+  1,             /* META_OPTIONS */
+  1,             /* META_POSIX */
+  1,             /* META_POSIX_NEG */
+  0,             /* META_RANGE_ESCAPED */
+  0,             /* META_RANGE_LITERAL */
+  SIZEOFFSET,    /* META_RECURSE */
+  1+SIZEOFFSET,  /* META_RECURSE_BYNAME */
+  0,             /* META_SCRIPT_RUN */
+  0,             /* META_LOOKAHEAD */
+  0,             /* META_LOOKAHEADNOT */
+  SIZEOFFSET,    /* META_LOOKBEHIND */
+  SIZEOFFSET,    /* META_LOOKBEHINDNOT */
+  0,             /* META_LOOKAHEAD_NA */
+  SIZEOFFSET,    /* META_LOOKBEHIND_NA */
+  1,             /* META_MARK - plus the string length */
+  0,             /* META_ACCEPT */
+  0,             /* META_FAIL */
+  0,             /* META_COMMIT */
+  1,             /* META_COMMIT_ARG - plus the string length */
+  0,             /* META_PRUNE */
+  1,             /* META_PRUNE_ARG - plus the string length */
+  0,             /* META_SKIP */
+  1,             /* META_SKIP_ARG - plus the string length */
+  0,             /* META_THEN */
+  1,             /* META_THEN_ARG - plus the string length */
+  0,             /* META_ASTERISK */
+  0,             /* META_ASTERISK_PLUS */
+  0,             /* META_ASTERISK_QUERY */
+  0,             /* META_PLUS */
+  0,             /* META_PLUS_PLUS */
+  0,             /* META_PLUS_QUERY */
+  0,             /* META_QUERY */
+  0,             /* META_QUERY_PLUS */
+  0,             /* META_QUERY_QUERY */
+  2,             /* META_MINMAX */
+  2,             /* META_MINMAX_PLUS */
+  2              /* META_MINMAX_QUERY */
+};
+
+/* Types for skipping parts of a parsed pattern. */
+
+enum { PSKIP_ALT, PSKIP_CLASS, PSKIP_KET };
+
+/* Macro for setting individual bits in class bitmaps. It took some
+experimenting to figure out how to stop gcc 5.3.0 from warning with
+-Wconversion. This version gets a warning:
+
+  #define SETBIT(a,b) a[(b)/8] |= (uint8_t)(1u << ((b)&7))
+
+Let's hope the apparently less efficient version isn't actually so bad if the
+compiler is clever with identical subexpressions. */
+
+#define SETBIT(a,b) a[(b)/8] = (uint8_t)(a[(b)/8] | (1u << ((b)&7)))
+
+/* Values and flags for the unsigned xxcuflags variables that accompany xxcu
+variables, which are concerned with first and required code units. A value
+greater than or equal to REQ_NONE means "no code unit set"; otherwise the
+matching xxcu variable is set, and the low valued bits are relevant. */
+
+#define REQ_UNSET     0xffffffffu  /* Not yet found anything */
+#define REQ_NONE      0xfffffffeu  /* Found not fixed character */
+#define REQ_CASELESS  0x00000001u  /* Code unit in xxcu is caseless */
+#define REQ_VARY      0x00000002u  /* Code unit is followed by non-literal */
+
+/* These flags are used in the groupinfo vector. */
+
+#define GI_SET_FIXED_LENGTH    0x80000000u
+#define GI_NOT_FIXED_LENGTH    0x40000000u
+#define GI_FIXED_LENGTH_MASK   0x0000ffffu
+
+/* This simple test for a decimal digit works for both ASCII/Unicode and EBCDIC
+and is fast (a good compiler can turn it into a subtraction and unsigned
+comparison). */
+
+#define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
+
+/* Table to identify hex digits. The tables in chartables are dependent on the
+locale, and may mark arbitrary characters as digits. We want to recognize only
+0-9, a-z, and A-Z as hex digits, which is why we have a private table here. It
+costs 256 bytes, but it is a lot faster than doing character value tests (at
+least in some simple cases I timed), and in some applications one wants PCRE2
+to compile efficiently as well as match efficiently. The value in the table is
+the binary hex digit value, or 0xff for non-hex digits. */
+
+/* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
+UTF-8 mode. */
+
+#ifndef EBCDIC
+static const uint8_t xdigitab[] =
+  {
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*   0-  7 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*   8- 15 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  16- 23 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  24- 31 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*    - '  */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  ( - /  */
+  0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, /*  0 - 7  */
+  0x08,0x09,0xff,0xff,0xff,0xff,0xff,0xff, /*  8 - ?  */
+  0xff,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xff, /*  @ - G  */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  H - O  */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  P - W  */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  X - _  */
+  0xff,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xff, /*  ` - g  */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  h - o  */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  p - w  */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  x -127 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 128-135 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 136-143 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 144-151 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 152-159 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 160-167 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 168-175 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 176-183 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 184-191 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 192-199 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 2ff-207 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 208-215 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 216-223 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 224-231 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 232-239 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 240-247 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};/* 248-255 */
+
+#else
+
+/* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
+
+static const uint8_t xdigitab[] =
+  {
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*   0-  7  0 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*   8- 15    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  16- 23 10 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  24- 31    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  32- 39 20 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  40- 47    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  48- 55 30 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  56- 63    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*    - 71 40 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  72- |     */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  & - 87 50 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  88- 95    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  - -103 60 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 104- ?     */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 112-119 70 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 120- "     */
+  0xff,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xff, /* 128- g  80 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  h -143    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 144- p  90 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  q -159    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 160- x  A0 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  y -175    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  ^ -183 B0 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 184-191    */
+  0xff,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xff, /*  { - G  C0 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  H -207    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  } - P  D0 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  Q -223    */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  \ - X  E0 */
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /*  Y -239    */
+  0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, /*  0 - 7  F0 */
+  0x08,0x09,0xff,0xff,0xff,0xff,0xff,0xff};/*  8 -255    */
+#endif  /* EBCDIC */
+
+
+/* Table for handling alphanumeric escaped characters. Positive returns are
+simple data values; negative values are for special things like \d and so on.
+Zero means further processing is needed (for things like \x), or the escape is
+invalid. */
+
+/* This is the "normal" table for ASCII systems or for EBCDIC systems running
+in UTF-8 mode. It runs from '0' to 'z'. */
+
+#ifndef EBCDIC
+#define ESCAPES_FIRST       CHAR_0
+#define ESCAPES_LAST        CHAR_z
+#define UPPER_CASE(c)       (c-32)
+
+static const short int escapes[] = {
+     0,                       0,
+     0,                       0,
+     0,                       0,
+     0,                       0,
+     0,                       0,
+     CHAR_COLON,              CHAR_SEMICOLON,
+     CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
+     CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
+     CHAR_COMMERCIAL_AT,      -ESC_A,
+     -ESC_B,                  -ESC_C,
+     -ESC_D,                  -ESC_E,
+     0,                       -ESC_G,
+     -ESC_H,                  0,
+     0,                       -ESC_K,
+     0,                       0,
+     -ESC_N,                  0,
+     -ESC_P,                  -ESC_Q,
+     -ESC_R,                  -ESC_S,
+     0,                       0,
+     -ESC_V,                  -ESC_W,
+     -ESC_X,                  0,
+     -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
+     CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
+     CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
+     CHAR_GRAVE_ACCENT,       CHAR_BEL,
+     -ESC_b,                  0,
+     -ESC_d,                  CHAR_ESC,
+     CHAR_FF,                 0,
+     -ESC_h,                  0,
+     0,                       -ESC_k,
+     0,                       0,
+     CHAR_LF,                 0,
+     -ESC_p,                  0,
+     CHAR_CR,                 -ESC_s,
+     CHAR_HT,                 0,
+     -ESC_v,                  -ESC_w,
+     0,                       0,
+     -ESC_z
+};
+
+#else
+
+/* This is the "abnormal" table for EBCDIC systems without UTF-8 support.
+It runs from 'a' to '9'. For some minimal testing of EBCDIC features, the code
+is sometimes compiled on an ASCII system. In this case, we must not use CHAR_a
+because it is defined as 'a', which of course picks up the ASCII value. */
+
+#if 'a' == 0x81                    /* Check for a real EBCDIC environment */
+#define ESCAPES_FIRST       CHAR_a
+#define ESCAPES_LAST        CHAR_9
+#define UPPER_CASE(c)       (c+64)
+#else                              /* Testing in an ASCII environment */
+#define ESCAPES_FIRST  ((unsigned char)'\x81')   /* EBCDIC 'a' */
+#define ESCAPES_LAST   ((unsigned char)'\xf9')   /* EBCDIC '9' */
+#define UPPER_CASE(c)  (c-32)
+#endif
+
+static const short int escapes[] = {
+/*  80 */         CHAR_BEL, -ESC_b,       0, -ESC_d, CHAR_ESC, CHAR_FF,      0,
+/*  88 */ -ESC_h,        0,      0,     '{',      0,        0,       0,      0,
+/*  90 */      0,        0, -ESC_k,       0,      0,  CHAR_LF,       0, -ESC_p,
+/*  98 */      0,  CHAR_CR,      0,     '}',      0,        0,       0,      0,
+/*  A0 */      0,      '~', -ESC_s, CHAR_HT,      0,   -ESC_v,  -ESC_w,      0,
+/*  A8 */      0,   -ESC_z,      0,       0,      0,      '[',       0,      0,
+/*  B0 */      0,        0,      0,       0,      0,        0,       0,      0,
+/*  B8 */      0,        0,      0,       0,      0,      ']',     '=',    '-',
+/*  C0 */    '{',   -ESC_A, -ESC_B,  -ESC_C, -ESC_D,   -ESC_E,       0, -ESC_G,
+/*  C8 */ -ESC_H,        0,      0,       0,      0,        0,       0,      0,
+/*  D0 */    '}',        0, -ESC_K,       0,      0,   -ESC_N,       0, -ESC_P,
+/*  D8 */ -ESC_Q,   -ESC_R,      0,       0,      0,        0,       0,      0,
+/*  E0 */   '\\',        0, -ESC_S,       0,      0,   -ESC_V,  -ESC_W, -ESC_X,
+/*  E8 */      0,   -ESC_Z,      0,       0,      0,        0,       0,      0,
+/*  F0 */      0,        0,      0,       0,      0,        0,       0,      0,
+/*  F8 */      0,        0
+};
+
+/* We also need a table of characters that may follow \c in an EBCDIC
+environment for characters 0-31. */
+
+static unsigned char ebcdic_escape_c[] = "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_";
+
+#endif   /* EBCDIC */
+
+
+/* Table of special "verbs" like (*PRUNE). This is a short table, so it is
+searched linearly. Put all the names into a single string, in order to reduce
+the number of relocations when a shared library is dynamically linked. The
+string is built from string macros so that it works in UTF-8 mode on EBCDIC
+platforms. */
+
+typedef struct verbitem {
+  unsigned int len;          /* Length of verb name */
+  uint32_t meta;             /* Base META_ code */
+  int has_arg;               /* Argument requirement */
+} verbitem;
+
+static const char verbnames[] =
+  "\0"                       /* Empty name is a shorthand for MARK */
+  STRING_MARK0
+  STRING_ACCEPT0
+  STRING_F0
+  STRING_FAIL0
+  STRING_COMMIT0
+  STRING_PRUNE0
+  STRING_SKIP0
+  STRING_THEN;
+
+static const verbitem verbs[] = {
+  { 0, META_MARK,   +1 },  /* > 0 => must have an argument */
+  { 4, META_MARK,   +1 },
+  { 6, META_ACCEPT, -1 },  /* < 0 => Optional argument, convert to pre-MARK */
+  { 1, META_FAIL,   -1 },
+  { 4, META_FAIL,   -1 },
+  { 6, META_COMMIT,  0 },
+  { 5, META_PRUNE,   0 },  /* Optional argument; bump META code if found */
+  { 4, META_SKIP,    0 },
+  { 4, META_THEN,    0 }
+};
+
+static const int verbcount = sizeof(verbs)/sizeof(verbitem);
+
+/* Verb opcodes, indexed by their META code offset from META_MARK. */
+
+static const uint32_t verbops[] = {
+  OP_MARK, OP_ACCEPT, OP_FAIL, OP_COMMIT, OP_COMMIT_ARG, OP_PRUNE,
+  OP_PRUNE_ARG, OP_SKIP, OP_SKIP_ARG, OP_THEN, OP_THEN_ARG };
+
+/* Table of "alpha assertions" like (*pla:...), similar to the (*VERB) table. */
+
+typedef struct alasitem {
+  unsigned int len;          /* Length of name */
+  uint32_t meta;             /* Base META_ code */
+} alasitem;
+
+static const char alasnames[] =
+  STRING_pla0
+  STRING_plb0
+  STRING_napla0
+  STRING_naplb0
+  STRING_nla0
+  STRING_nlb0
+  STRING_positive_lookahead0
+  STRING_positive_lookbehind0
+  STRING_non_atomic_positive_lookahead0
+  STRING_non_atomic_positive_lookbehind0
+  STRING_negative_lookahead0
+  STRING_negative_lookbehind0
+  STRING_atomic0
+  STRING_sr0
+  STRING_asr0
+  STRING_script_run0
+  STRING_atomic_script_run;
+
+static const alasitem alasmeta[] = {
+  {  3, META_LOOKAHEAD         },
+  {  3, META_LOOKBEHIND        },
+  {  5, META_LOOKAHEAD_NA      },
+  {  5, META_LOOKBEHIND_NA     },
+  {  3, META_LOOKAHEADNOT      },
+  {  3, META_LOOKBEHINDNOT     },
+  { 18, META_LOOKAHEAD         },
+  { 19, META_LOOKBEHIND        },
+  { 29, META_LOOKAHEAD_NA      },
+  { 30, META_LOOKBEHIND_NA     },
+  { 18, META_LOOKAHEADNOT      },
+  { 19, META_LOOKBEHINDNOT     },
+  {  6, META_ATOMIC            },
+  {  2, META_SCRIPT_RUN        }, /* sr = script run */
+  {  3, META_ATOMIC_SCRIPT_RUN }, /* asr = atomic script run */
+  { 10, META_SCRIPT_RUN        }, /* script run */
+  { 17, META_ATOMIC_SCRIPT_RUN }  /* atomic script run */
+};
+
+static const int alascount = sizeof(alasmeta)/sizeof(alasitem);
+
+/* Offsets from OP_STAR for case-independent and negative repeat opcodes. */
+
+static uint32_t chartypeoffset[] = {
+  OP_STAR - OP_STAR,    OP_STARI - OP_STAR,
+  OP_NOTSTAR - OP_STAR, OP_NOTSTARI - OP_STAR };
+
+/* Tables of names of POSIX character classes and their lengths. The names are
+now all in a single string, to reduce the number of relocations when a shared
+library is dynamically loaded. The list of lengths is terminated by a zero
+length entry. The first three must be alpha, lower, upper, as this is assumed
+for handling case independence. The indices for graph, print, and punct are
+needed, so identify them. */
+
+static const char posix_names[] =
+  STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
+  STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
+  STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
+  STRING_word0  STRING_xdigit;
+
+static const uint8_t posix_name_lengths[] = {
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
+
+#define PC_GRAPH  8
+#define PC_PRINT  9
+#define PC_PUNCT 10
+
+/* Table of class bit maps for each POSIX class. Each class is formed from a
+base map, with an optional addition or removal of another map. Then, for some
+classes, there is some additional tweaking: for [:blank:] the vertical space
+characters are removed, and for [:alpha:] and [:alnum:] the underscore
+character is removed. The triples in the table consist of the base map offset,
+second map offset or -1 if no second map, and a non-negative value for map
+addition or a negative value for map subtraction (if there are two maps). The
+absolute value of the third field has these meanings: 0 => no tweaking, 1 =>
+remove vertical space characters, 2 => remove underscore. */
+
+static const int posix_class_maps[] = {
+  cbit_word,  cbit_digit, -2,             /* alpha */
+  cbit_lower, -1,          0,             /* lower */
+  cbit_upper, -1,          0,             /* upper */
+  cbit_word,  -1,          2,             /* alnum - word without underscore */
+  cbit_print, cbit_cntrl,  0,             /* ascii */
+  cbit_space, -1,          1,             /* blank - a GNU extension */
+  cbit_cntrl, -1,          0,             /* cntrl */
+  cbit_digit, -1,          0,             /* digit */
+  cbit_graph, -1,          0,             /* graph */
+  cbit_print, -1,          0,             /* print */
+  cbit_punct, -1,          0,             /* punct */
+  cbit_space, -1,          0,             /* space */
+  cbit_word,  -1,          0,             /* word - a Perl extension */
+  cbit_xdigit,-1,          0              /* xdigit */
+};
+
+#ifdef SUPPORT_UNICODE
+
+/* The POSIX class Unicode property substitutes that are used in UCP mode must
+be in the order of the POSIX class names, defined above. */
+
+static int posix_substitutes[] = {
+  PT_GC, ucp_L,     /* alpha */
+  PT_PC, ucp_Ll,    /* lower */
+  PT_PC, ucp_Lu,    /* upper */
+  PT_ALNUM, 0,      /* alnum */
+  -1, 0,            /* ascii, treat as non-UCP */
+  -1, 1,            /* blank, treat as \h */
+  PT_PC, ucp_Cc,    /* cntrl */
+  PT_PC, ucp_Nd,    /* digit */
+  PT_PXGRAPH, 0,    /* graph */
+  PT_PXPRINT, 0,    /* print */
+  PT_PXPUNCT, 0,    /* punct */
+  PT_PXSPACE, 0,    /* space */   /* Xps is POSIX space, but from 8.34 */
+  PT_WORD, 0,       /* word  */   /* Perl and POSIX space are the same */
+  -1, 0             /* xdigit, treat as non-UCP */
+};
+#define POSIX_SUBSIZE (sizeof(posix_substitutes) / (2*sizeof(uint32_t)))
+#endif  /* SUPPORT_UNICODE */
+
+/* Masks for checking option settings. When PCRE2_LITERAL is set, only a subset
+are allowed. */
+
+#define PUBLIC_LITERAL_COMPILE_OPTIONS \
+  (PCRE2_ANCHORED|PCRE2_AUTO_CALLOUT|PCRE2_CASELESS|PCRE2_ENDANCHORED| \
+   PCRE2_FIRSTLINE|PCRE2_LITERAL|PCRE2_MATCH_INVALID_UTF| \
+   PCRE2_NO_START_OPTIMIZE|PCRE2_NO_UTF_CHECK|PCRE2_USE_OFFSET_LIMIT|PCRE2_UTF)
+
+#define PUBLIC_COMPILE_OPTIONS \
+  (PUBLIC_LITERAL_COMPILE_OPTIONS| \
+   PCRE2_ALLOW_EMPTY_CLASS|PCRE2_ALT_BSUX|PCRE2_ALT_CIRCUMFLEX| \
+   PCRE2_ALT_VERBNAMES|PCRE2_DOLLAR_ENDONLY|PCRE2_DOTALL|PCRE2_DUPNAMES| \
+   PCRE2_EXTENDED|PCRE2_EXTENDED_MORE|PCRE2_MATCH_UNSET_BACKREF| \
+   PCRE2_MULTILINE|PCRE2_NEVER_BACKSLASH_C|PCRE2_NEVER_UCP| \
+   PCRE2_NEVER_UTF|PCRE2_NO_AUTO_CAPTURE|PCRE2_NO_AUTO_POSSESS| \
+   PCRE2_NO_DOTSTAR_ANCHOR|PCRE2_UCP|PCRE2_UNGREEDY)
+
+#define PUBLIC_LITERAL_COMPILE_EXTRA_OPTIONS \
+   (PCRE2_EXTRA_MATCH_LINE|PCRE2_EXTRA_MATCH_WORD)
+
+#define PUBLIC_COMPILE_EXTRA_OPTIONS \
+   (PUBLIC_LITERAL_COMPILE_EXTRA_OPTIONS| \
+    PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES|PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL| \
+    PCRE2_EXTRA_ESCAPED_CR_IS_LF|PCRE2_EXTRA_ALT_BSUX| \
+    PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK)
+
+/* Compile time error code numbers. They are given names so that they can more
+easily be tracked. When a new number is added, the tables called eint1 and
+eint2 in pcre2posix.c may need to be updated, and a new error text must be
+added to compile_error_texts in pcre2_error.c. Also, the error codes in
+pcre2.h.in must be updated - their values are exactly 100 greater than these
+values. */
+
+enum { ERR0 = COMPILE_ERROR_BASE,
+       ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  ERR10,
+       ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20,
+       ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29, ERR30,
+       ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39, ERR40,
+       ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49, ERR50,
+       ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59, ERR60,
+       ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69, ERR70,
+       ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79, ERR80,
+       ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERR88, ERR89, ERR90,
+       ERR91, ERR92, ERR93, ERR94, ERR95, ERR96, ERR97, ERR98, ERR99 };
+
+/* This is a table of start-of-pattern options such as (*UTF) and settings such
+as (*LIMIT_MATCH=nnnn) and (*CRLF). For completeness and backward
+compatibility, (*UTFn) is supported in the relevant libraries, but (*UTF) is
+generic and always supported. */
+
+enum { PSO_OPT,     /* Value is an option bit */
+       PSO_FLG,     /* Value is a flag bit */
+       PSO_NL,      /* Value is a newline type */
+       PSO_BSR,     /* Value is a \R type */
+       PSO_LIMH,    /* Read integer value for heap limit */
+       PSO_LIMM,    /* Read integer value for match limit */
+       PSO_LIMD };  /* Read integer value for depth limit */
+
+typedef struct pso {
+  const uint8_t *name;
+  uint16_t length;
+  uint16_t type;
+  uint32_t value;
+} pso;
+
+/* NB: STRING_UTFn_RIGHTPAR contains the length as well */
+
+static pso pso_list[] = {
+  { (uint8_t *)STRING_UTFn_RIGHTPAR,                  PSO_OPT, PCRE2_UTF },
+  { (uint8_t *)STRING_UTF_RIGHTPAR,                4, PSO_OPT, PCRE2_UTF },
+  { (uint8_t *)STRING_UCP_RIGHTPAR,                4, PSO_OPT, PCRE2_UCP },
+  { (uint8_t *)STRING_NOTEMPTY_RIGHTPAR,           9, PSO_FLG, PCRE2_NOTEMPTY_SET },
+  { (uint8_t *)STRING_NOTEMPTY_ATSTART_RIGHTPAR,  17, PSO_FLG, PCRE2_NE_ATST_SET },
+  { (uint8_t *)STRING_NO_AUTO_POSSESS_RIGHTPAR,   16, PSO_OPT, PCRE2_NO_AUTO_POSSESS },
+  { (uint8_t *)STRING_NO_DOTSTAR_ANCHOR_RIGHTPAR, 18, PSO_OPT, PCRE2_NO_DOTSTAR_ANCHOR },
+  { (uint8_t *)STRING_NO_JIT_RIGHTPAR,             7, PSO_FLG, PCRE2_NOJIT },
+  { (uint8_t *)STRING_NO_START_OPT_RIGHTPAR,      13, PSO_OPT, PCRE2_NO_START_OPTIMIZE },
+  { (uint8_t *)STRING_LIMIT_HEAP_EQ,              11, PSO_LIMH, 0 },
+  { (uint8_t *)STRING_LIMIT_MATCH_EQ,             12, PSO_LIMM, 0 },
+  { (uint8_t *)STRING_LIMIT_DEPTH_EQ,             12, PSO_LIMD, 0 },
+  { (uint8_t *)STRING_LIMIT_RECURSION_EQ,         16, PSO_LIMD, 0 },
+  { (uint8_t *)STRING_CR_RIGHTPAR,                 3, PSO_NL,  PCRE2_NEWLINE_CR },
+  { (uint8_t *)STRING_LF_RIGHTPAR,                 3, PSO_NL,  PCRE2_NEWLINE_LF },
+  { (uint8_t *)STRING_CRLF_RIGHTPAR,               5, PSO_NL,  PCRE2_NEWLINE_CRLF },
+  { (uint8_t *)STRING_ANY_RIGHTPAR,                4, PSO_NL,  PCRE2_NEWLINE_ANY },
+  { (uint8_t *)STRING_NUL_RIGHTPAR,                4, PSO_NL,  PCRE2_NEWLINE_NUL },
+  { (uint8_t *)STRING_ANYCRLF_RIGHTPAR,            8, PSO_NL,  PCRE2_NEWLINE_ANYCRLF },
+  { (uint8_t *)STRING_BSR_ANYCRLF_RIGHTPAR,       12, PSO_BSR, PCRE2_BSR_ANYCRLF },
+  { (uint8_t *)STRING_BSR_UNICODE_RIGHTPAR,       12, PSO_BSR, PCRE2_BSR_UNICODE }
+};
+
+/* This table is used when converting repeating opcodes into possessified
+versions as a result of an explicit possessive quantifier such as ++. A zero
+value means there is no possessified version - in those cases the item in
+question must be wrapped in ONCE brackets. The table is truncated at OP_CALLOUT
+because all relevant opcodes are less than that. */
+
+static const uint8_t opcode_possessify[] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0 - 15  */
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 16 - 31 */
+
+  0,                       /* NOTI */
+  OP_POSSTAR, 0,           /* STAR, MINSTAR */
+  OP_POSPLUS, 0,           /* PLUS, MINPLUS */
+  OP_POSQUERY, 0,          /* QUERY, MINQUERY */
+  OP_POSUPTO, 0,           /* UPTO, MINUPTO */
+  0,                       /* EXACT */
+  0, 0, 0, 0,              /* POS{STAR,PLUS,QUERY,UPTO} */
+
+  OP_POSSTARI, 0,          /* STARI, MINSTARI */
+  OP_POSPLUSI, 0,          /* PLUSI, MINPLUSI */
+  OP_POSQUERYI, 0,         /* QUERYI, MINQUERYI */
+  OP_POSUPTOI, 0,          /* UPTOI, MINUPTOI */
+  0,                       /* EXACTI */
+  0, 0, 0, 0,              /* POS{STARI,PLUSI,QUERYI,UPTOI} */
+
+  OP_NOTPOSSTAR, 0,        /* NOTSTAR, NOTMINSTAR */
+  OP_NOTPOSPLUS, 0,        /* NOTPLUS, NOTMINPLUS */
+  OP_NOTPOSQUERY, 0,       /* NOTQUERY, NOTMINQUERY */
+  OP_NOTPOSUPTO, 0,        /* NOTUPTO, NOTMINUPTO */
+  0,                       /* NOTEXACT */
+  0, 0, 0, 0,              /* NOTPOS{STAR,PLUS,QUERY,UPTO} */
+
+  OP_NOTPOSSTARI, 0,       /* NOTSTARI, NOTMINSTARI */
+  OP_NOTPOSPLUSI, 0,       /* NOTPLUSI, NOTMINPLUSI */
+  OP_NOTPOSQUERYI, 0,      /* NOTQUERYI, NOTMINQUERYI */
+  OP_NOTPOSUPTOI, 0,       /* NOTUPTOI, NOTMINUPTOI */
+  0,                       /* NOTEXACTI */
+  0, 0, 0, 0,              /* NOTPOS{STARI,PLUSI,QUERYI,UPTOI} */
+
+  OP_TYPEPOSSTAR, 0,       /* TYPESTAR, TYPEMINSTAR */
+  OP_TYPEPOSPLUS, 0,       /* TYPEPLUS, TYPEMINPLUS */
+  OP_TYPEPOSQUERY, 0,      /* TYPEQUERY, TYPEMINQUERY */
+  OP_TYPEPOSUPTO, 0,       /* TYPEUPTO, TYPEMINUPTO */
+  0,                       /* TYPEEXACT */
+  0, 0, 0, 0,              /* TYPEPOS{STAR,PLUS,QUERY,UPTO} */
+
+  OP_CRPOSSTAR, 0,         /* CRSTAR, CRMINSTAR */
+  OP_CRPOSPLUS, 0,         /* CRPLUS, CRMINPLUS */
+  OP_CRPOSQUERY, 0,        /* CRQUERY, CRMINQUERY */
+  OP_CRPOSRANGE, 0,        /* CRRANGE, CRMINRANGE */
+  0, 0, 0, 0,              /* CRPOS{STAR,PLUS,QUERY,RANGE} */
+
+  0, 0, 0,                 /* CLASS, NCLASS, XCLASS */
+  0, 0,                    /* REF, REFI */
+  0, 0,                    /* DNREF, DNREFI */
+  0, 0                     /* RECURSE, CALLOUT */
+};
+
+
+#ifdef DEBUG_SHOW_PARSED
+/*************************************************
+*     Show the parsed pattern for debugging      *
+*************************************************/
+
+/* For debugging the pre-scan, this code, which outputs the parsed data vector,
+can be enabled. */
+
+static void show_parsed(compile_block *cb)
+{
+uint32_t *pptr = cb->parsed_pattern;
+
+for (;;)
+  {
+  int max, min;
+  PCRE2_SIZE offset;
+  uint32_t i;
+  uint32_t length;
+  uint32_t meta_arg = META_DATA(*pptr);
+
+  fprintf(stderr, "+++ %02d %.8x ", (int)(pptr - cb->parsed_pattern), *pptr);
+
+  if (*pptr < META_END)
+    {
+    if (*pptr > 32 && *pptr < 128) fprintf(stderr, "%c", *pptr);
+    pptr++;
+    }
+
+  else switch (META_CODE(*pptr++))
+    {
+    default:
+    fprintf(stderr, "**** OOPS - unknown META value - giving up ****\n");
+    return;
+
+    case META_END:
+    fprintf(stderr, "META_END\n");
+    return;
+
+    case META_CAPTURE:
+    fprintf(stderr, "META_CAPTURE %d", meta_arg);
+    break;
+
+    case META_RECURSE:
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "META_RECURSE %d %zd", meta_arg, offset);
+    break;
+
+    case META_BACKREF:
+    if (meta_arg < 10)
+      offset = cb->small_ref_offset[meta_arg];
+    else
+      GETOFFSET(offset, pptr);
+    fprintf(stderr, "META_BACKREF %d %zd", meta_arg, offset);
+    break;
+
+    case META_ESCAPE:
+    if (meta_arg == ESC_P || meta_arg == ESC_p)
+      {
+      uint32_t ptype = *pptr >> 16;
+      uint32_t pvalue = *pptr++ & 0xffff;
+      fprintf(stderr, "META \\%c %d %d", (meta_arg == ESC_P)? 'P':'p',
+        ptype, pvalue);
+      }
+    else
+      {
+      uint32_t cc;
+      /* There's just one escape we might have here that isn't negated in the
+      escapes table. */
+      if (meta_arg == ESC_g) cc = CHAR_g;
+      else for (cc = ESCAPES_FIRST; cc <= ESCAPES_LAST; cc++)
+        {
+        if (meta_arg == (uint32_t)(-escapes[cc - ESCAPES_FIRST])) break;
+        }
+      if (cc > ESCAPES_LAST) cc = CHAR_QUESTION_MARK;
+      fprintf(stderr, "META \\%c", cc);
+      }
+    break;
+
+    case META_MINMAX:
+    min = *pptr++;
+    max = *pptr++;
+    if (max != REPEAT_UNLIMITED)
+      fprintf(stderr, "META {%d,%d}", min, max);
+    else
+      fprintf(stderr, "META {%d,}", min);
+    break;
+
+    case META_MINMAX_QUERY:
+    min = *pptr++;
+    max = *pptr++;
+    if (max != REPEAT_UNLIMITED)
+      fprintf(stderr, "META {%d,%d}?", min, max);
+    else
+      fprintf(stderr, "META {%d,}?", min);
+    break;
+
+    case META_MINMAX_PLUS:
+    min = *pptr++;
+    max = *pptr++;
+    if (max != REPEAT_UNLIMITED)
+      fprintf(stderr, "META {%d,%d}+", min, max);
+    else
+      fprintf(stderr, "META {%d,}+", min);
+    break;
+
+    case META_BIGVALUE: fprintf(stderr, "META_BIGVALUE %.8x", *pptr++); break;
+    case META_CIRCUMFLEX: fprintf(stderr, "META_CIRCUMFLEX"); break;
+    case META_COND_ASSERT: fprintf(stderr, "META_COND_ASSERT"); break;
+    case META_DOLLAR: fprintf(stderr, "META_DOLLAR"); break;
+    case META_DOT: fprintf(stderr, "META_DOT"); break;
+    case META_ASTERISK: fprintf(stderr, "META *"); break;
+    case META_ASTERISK_QUERY: fprintf(stderr, "META *?"); break;
+    case META_ASTERISK_PLUS: fprintf(stderr, "META *+"); break;
+    case META_PLUS: fprintf(stderr, "META +"); break;
+    case META_PLUS_QUERY: fprintf(stderr, "META +?"); break;
+    case META_PLUS_PLUS: fprintf(stderr, "META ++"); break;
+    case META_QUERY: fprintf(stderr, "META ?"); break;
+    case META_QUERY_QUERY: fprintf(stderr, "META ??"); break;
+    case META_QUERY_PLUS: fprintf(stderr, "META ?+"); break;
+
+    case META_ATOMIC: fprintf(stderr, "META (?>"); break;
+    case META_NOCAPTURE: fprintf(stderr, "META (?:"); break;
+    case META_LOOKAHEAD: fprintf(stderr, "META (?="); break;
+    case META_LOOKAHEADNOT: fprintf(stderr, "META (?!"); break;
+    case META_LOOKAHEAD_NA: fprintf(stderr, "META (*napla:"); break;
+    case META_SCRIPT_RUN: fprintf(stderr, "META (*sr:"); break;
+    case META_KET: fprintf(stderr, "META )"); break;
+    case META_ALT: fprintf(stderr, "META | %d", meta_arg); break;
+
+    case META_CLASS: fprintf(stderr, "META ["); break;
+    case META_CLASS_NOT: fprintf(stderr, "META [^"); break;
+    case META_CLASS_END: fprintf(stderr, "META ]"); break;
+    case META_CLASS_EMPTY: fprintf(stderr, "META []"); break;
+    case META_CLASS_EMPTY_NOT: fprintf(stderr, "META [^]"); break;
+
+    case META_RANGE_LITERAL: fprintf(stderr, "META - (literal)"); break;
+    case META_RANGE_ESCAPED: fprintf(stderr, "META - (escaped)"); break;
+
+    case META_POSIX: fprintf(stderr, "META_POSIX %d", *pptr++); break;
+    case META_POSIX_NEG: fprintf(stderr, "META_POSIX_NEG %d", *pptr++); break;
+
+    case META_ACCEPT: fprintf(stderr, "META (*ACCEPT)"); break;
+    case META_FAIL: fprintf(stderr, "META (*FAIL)"); break;
+    case META_COMMIT: fprintf(stderr, "META (*COMMIT)"); break;
+    case META_PRUNE: fprintf(stderr, "META (*PRUNE)"); break;
+    case META_SKIP: fprintf(stderr, "META (*SKIP)"); break;
+    case META_THEN: fprintf(stderr, "META (*THEN)"); break;
+
+    case META_OPTIONS: fprintf(stderr, "META_OPTIONS 0x%02x", *pptr++); break;
+
+    case META_LOOKBEHIND:
+    fprintf(stderr, "META (?<= %d offset=", meta_arg);
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    case META_LOOKBEHIND_NA:
+    fprintf(stderr, "META (*naplb: %d offset=", meta_arg);
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    case META_LOOKBEHINDNOT:
+    fprintf(stderr, "META (?<! %d offset=", meta_arg);
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    case META_CALLOUT_NUMBER:
+    fprintf(stderr, "META (?C%d) next=%d/%d", pptr[2], pptr[0],
+       pptr[1]);
+    pptr += 3;
+    break;
+
+    case META_CALLOUT_STRING:
+      {
+      uint32_t patoffset = *pptr++;    /* Offset of next pattern item */
+      uint32_t patlength = *pptr++;    /* Length of next pattern item */
+      fprintf(stderr, "META (?Cstring) length=%d offset=", *pptr++);
+      GETOFFSET(offset, pptr);
+      fprintf(stderr, "%zd next=%d/%d", offset, patoffset, patlength);
+      }
+    break;
+
+    case META_RECURSE_BYNAME:
+    fprintf(stderr, "META (?(&name) length=%d offset=", *pptr++);
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    case META_BACKREF_BYNAME:
+    fprintf(stderr, "META_BACKREF_BYNAME length=%d offset=", *pptr++);
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    case META_COND_NUMBER:
+    fprintf(stderr, "META_COND_NUMBER %d offset=", pptr[SIZEOFFSET]);
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    pptr++;
+    break;
+
+    case META_COND_DEFINE:
+    fprintf(stderr, "META (?(DEFINE) offset=");
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    case META_COND_VERSION:
+    fprintf(stderr, "META (?(VERSION%s", (*pptr++ == 0)? "=" : ">=");
+    fprintf(stderr, "%d.", *pptr++);
+    fprintf(stderr, "%d)", *pptr++);
+    break;
+
+    case META_COND_NAME:
+    fprintf(stderr, "META (?(<name>) length=%d offset=", *pptr++);
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    case META_COND_RNAME:
+    fprintf(stderr, "META (?(R&name) length=%d offset=", *pptr++);
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    /* This is kept as a name, because it might be. */
+
+    case META_COND_RNUMBER:
+    fprintf(stderr, "META (?(Rnumber) length=%d offset=", *pptr++);
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    case META_MARK:
+    fprintf(stderr, "META (*MARK:");
+    goto SHOWARG;
+
+    case META_COMMIT_ARG:
+    fprintf(stderr, "META (*COMMIT:");
+    goto SHOWARG;
+
+    case META_PRUNE_ARG:
+    fprintf(stderr, "META (*PRUNE:");
+    goto SHOWARG;
+
+    case META_SKIP_ARG:
+    fprintf(stderr, "META (*SKIP:");
+    goto SHOWARG;
+
+    case META_THEN_ARG:
+    fprintf(stderr, "META (*THEN:");
+    SHOWARG:
+    length = *pptr++;
+    for (i = 0; i < length; i++)
+      {
+      uint32_t cc = *pptr++;
+      if (cc > 32 && cc < 128) fprintf(stderr, "%c", cc);
+        else fprintf(stderr, "\\x{%x}", cc);
+      }
+    fprintf(stderr, ") length=%u", length);
+    break;
+    }
+  fprintf(stderr, "\n");
+  }
+return;
+}
+#endif  /* DEBUG_SHOW_PARSED */
+
+
+
+/*************************************************
+*               Copy compiled code               *
+*************************************************/
+
+/* Compiled JIT code cannot be copied, so the new compiled block has no
+associated JIT data. */
+
+PCRE2_EXP_DEFN pcre2_code * PCRE2_CALL_CONVENTION
+pcre2_code_copy(const pcre2_code *code)
+{
+PCRE2_SIZE* ref_count;
+pcre2_code *newcode;
+
+if (code == NULL) return NULL;
+newcode = code->memctl.malloc(code->blocksize, code->memctl.memory_data);
+if (newcode == NULL) return NULL;
+memcpy(newcode, code, code->blocksize);
+newcode->executable_jit = NULL;
+
+/* If the code is one that has been deserialized, increment the reference count
+in the decoded tables. */
+
+if ((code->flags & PCRE2_DEREF_TABLES) != 0)
+  {
+  ref_count = (PCRE2_SIZE *)(code->tables + TABLES_LENGTH);
+  (*ref_count)++;
+  }
+
+return newcode;
+}
+
+
+
+/*************************************************
+*     Copy compiled code and character tables    *
+*************************************************/
+
+/* Compiled JIT code cannot be copied, so the new compiled block has no
+associated JIT data. This version of code_copy also makes a separate copy of
+the character tables. */
+
+PCRE2_EXP_DEFN pcre2_code * PCRE2_CALL_CONVENTION
+pcre2_code_copy_with_tables(const pcre2_code *code)
+{
+PCRE2_SIZE* ref_count;
+pcre2_code *newcode;
+uint8_t *newtables;
+
+if (code == NULL) return NULL;
+newcode = code->memctl.malloc(code->blocksize, code->memctl.memory_data);
+if (newcode == NULL) return NULL;
+memcpy(newcode, code, code->blocksize);
+newcode->executable_jit = NULL;
+
+newtables = code->memctl.malloc(TABLES_LENGTH + sizeof(PCRE2_SIZE),
+  code->memctl.memory_data);
+if (newtables == NULL)
+  {
+  code->memctl.free((void *)newcode, code->memctl.memory_data);
+  return NULL;
+  }
+memcpy(newtables, code->tables, TABLES_LENGTH);
+ref_count = (PCRE2_SIZE *)(newtables + TABLES_LENGTH);
+*ref_count = 1;
+
+newcode->tables = newtables;
+newcode->flags |= PCRE2_DEREF_TABLES;
+return newcode;
+}
+
+
+
+/*************************************************
+*               Free compiled code               *
+*************************************************/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_code_free(pcre2_code *code)
+{
+PCRE2_SIZE* ref_count;
+
+if (code != NULL)
+  {
+  if (code->executable_jit != NULL)
+    PRIV(jit_free)(code->executable_jit, &code->memctl);
+
+  if ((code->flags & PCRE2_DEREF_TABLES) != 0)
+    {
+    /* Decoded tables belong to the codes after deserialization, and they must
+    be freed when there are no more references to them. The *ref_count should
+    always be > 0. */
+
+    ref_count = (PCRE2_SIZE *)(code->tables + TABLES_LENGTH);
+    if (*ref_count > 0)
+      {
+      (*ref_count)--;
+      if (*ref_count == 0)
+        code->memctl.free((void *)code->tables, code->memctl.memory_data);
+      }
+    }
+
+  code->memctl.free(code, code->memctl.memory_data);
+  }
+}
+
+
+
+/*************************************************
+*         Read a number, possibly signed         *
+*************************************************/
+
+/* This function is used to read numbers in the pattern. The initial pointer
+must be the sign or first digit of the number. When relative values (introduced
+by + or -) are allowed, they are relative group numbers, and the result must be
+greater than zero.
+
+Arguments:
+  ptrptr      points to the character pointer variable
+  ptrend      points to the end of the input string
+  allow_sign  if < 0, sign not allowed; if >= 0, sign is relative to this
+  max_value   the largest number allowed
+  max_error   the error to give for an over-large number
+  intptr      where to put the result
+  errcodeptr  where to put an error code
+
+Returns:      TRUE  - a number was read
+              FALSE - errorcode == 0 => no number was found
+                      errorcode != 0 => an error occurred
+*/
+
+static BOOL
+read_number(PCRE2_SPTR *ptrptr, PCRE2_SPTR ptrend, int32_t allow_sign,
+  uint32_t max_value, uint32_t max_error, int *intptr, int *errorcodeptr)
+{
+int sign = 0;
+uint32_t n = 0;
+PCRE2_SPTR ptr = *ptrptr;
+BOOL yield = FALSE;
+
+*errorcodeptr = 0;
+
+if (allow_sign >= 0 && ptr < ptrend)
+  {
+  if (*ptr == CHAR_PLUS)
+    {
+    sign = +1;
+    max_value -= allow_sign;
+    ptr++;
+    }
+  else if (*ptr == CHAR_MINUS)
+    {
+    sign = -1;
+    ptr++;
+    }
+  }
+
+if (ptr >= ptrend || !IS_DIGIT(*ptr)) return FALSE;
+while (ptr < ptrend && IS_DIGIT(*ptr))
+  {
+  n = n * 10 + *ptr++ - CHAR_0;
+  if (n > max_value)
+    {
+    *errorcodeptr = max_error;
+    goto EXIT;
+    }
+  }
+
+if (allow_sign >= 0 && sign != 0)
+  {
+  if (n == 0)
+    {
+    *errorcodeptr = ERR26;  /* +0 and -0 are not allowed */
+    goto EXIT;
+    }
+
+  if (sign > 0) n += allow_sign;
+  else if ((int)n > allow_sign)
+    {
+    *errorcodeptr = ERR15;  /* Non-existent subpattern */
+    goto EXIT;
+    }
+  else n = allow_sign + 1 - n;
+  }
+
+yield = TRUE;
+
+EXIT:
+*intptr = n;
+*ptrptr = ptr;
+return yield;
+}
+
+
+
+/*************************************************
+*         Read repeat counts                     *
+*************************************************/
+
+/* Read an item of the form {n,m} and return the values if non-NULL pointers
+are supplied. Repeat counts must be less than 65536 (MAX_REPEAT_COUNT); a
+larger value is used for "unlimited". We have to use signed arguments for
+read_number() because it is capable of returning a signed value.
+
+Arguments:
+  ptrptr         points to pointer to character after'{'
+  ptrend         pointer to end of input
+  minp           if not NULL, pointer to int for min
+  maxp           if not NULL, pointer to int for max (-1 if no max)
+                 returned as -1 if no max
+  errorcodeptr   points to error code variable
+
+Returns:         FALSE if not a repeat quantifier, errorcode set zero
+                 FALSE on error, with errorcode set non-zero
+                 TRUE on success, with pointer updated to point after '}'
+*/
+
+static BOOL
+read_repeat_counts(PCRE2_SPTR *ptrptr, PCRE2_SPTR ptrend, uint32_t *minp,
+  uint32_t *maxp, int *errorcodeptr)
+{
+PCRE2_SPTR p;
+BOOL yield = FALSE;
+BOOL had_comma = FALSE;
+int32_t min = 0;
+int32_t max = REPEAT_UNLIMITED; /* This value is larger than MAX_REPEAT_COUNT */
+
+/* Check the syntax */
+
+*errorcodeptr = 0;
+for (p = *ptrptr;; p++)
+  {
+  uint32_t c;
+  if (p >= ptrend) return FALSE;
+  c = *p;
+  if (IS_DIGIT(c)) continue;
+  if (c == CHAR_RIGHT_CURLY_BRACKET) break;
+  if (c == CHAR_COMMA)
+    {
+    if (had_comma) return FALSE;
+    had_comma = TRUE;
+    }
+  else return FALSE;
+  }
+
+/* The only error from read_number() is for a number that is too big. */
+
+p = *ptrptr;
+if (!read_number(&p, ptrend, -1, MAX_REPEAT_COUNT, ERR5, &min, errorcodeptr))
+  goto EXIT;
+
+if (*p == CHAR_RIGHT_CURLY_BRACKET)
+  {
+  p++;
+  max = min;
+  }
+else
+  {
+  if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
+    {
+    if (!read_number(&p, ptrend, -1, MAX_REPEAT_COUNT, ERR5, &max,
+        errorcodeptr))
+      goto EXIT;
+    if (max < min)
+      {
+      *errorcodeptr = ERR4;
+      goto EXIT;
+      }
+    }
+  p++;
+  }
+
+yield = TRUE;
+if (minp != NULL) *minp = (uint32_t)min;
+if (maxp != NULL) *maxp = (uint32_t)max;
+
+/* Update the pattern pointer */
+
+EXIT:
+*ptrptr = p;
+return yield;
+}
+
+
+
+/*************************************************
+*            Handle escapes                      *
+*************************************************/
+
+/* This function is called when a \ has been encountered. It either returns a
+positive value for a simple escape such as \d, or 0 for a data character, which
+is placed in chptr. A backreference to group n is returned as negative n. On
+entry, ptr is pointing at the character after \. On exit, it points after the
+final code unit of the escape sequence.
+
+This function is also called from pcre2_substitute() to handle escape sequences
+in replacement strings. In this case, the cb argument is NULL, and in the case
+of escapes that have further processing, only sequences that define a data
+character are recognised. The isclass argument is not relevant; the options
+argument is the final value of the compiled pattern's options.
+
+Arguments:
+  ptrptr         points to the input position pointer
+  ptrend         points to the end of the input
+  chptr          points to a returned data character
+  errorcodeptr   points to the errorcode variable (containing zero)
+  options        the current options bits
+  isclass        TRUE if inside a character class
+  cb             compile data block or NULL when called from pcre2_substitute()
+
+Returns:         zero => a data character
+                 positive => a special escape sequence
+                 negative => a numerical back reference
+                 on error, errorcodeptr is set non-zero
+*/
+
+int
+PRIV(check_escape)(PCRE2_SPTR *ptrptr, PCRE2_SPTR ptrend, uint32_t *chptr,
+  int *errorcodeptr, uint32_t options, uint32_t extra_options, BOOL isclass,
+  compile_block *cb)
+{
+BOOL utf = (options & PCRE2_UTF) != 0;
+PCRE2_SPTR ptr = *ptrptr;
+uint32_t c, cc;
+int escape = 0;
+int i;
+
+/* If backslash is at the end of the string, it's an error. */
+
+if (ptr >= ptrend)
+  {
+  *errorcodeptr = ERR1;
+  return 0;
+  }
+
+GETCHARINCTEST(c, ptr);         /* Get character value, increment pointer */
+*errorcodeptr = 0;              /* Be optimistic */
+
+/* Non-alphanumerics are literals, so we just leave the value in c. An initial
+value test saves a memory lookup for code points outside the alphanumeric
+range. */
+
+if (c < ESCAPES_FIRST || c > ESCAPES_LAST) {}  /* Definitely literal */
+
+/* Otherwise, do a table lookup. Non-zero values need little processing here. A
+positive value is a literal value for something like \n. A negative value is
+the negation of one of the ESC_ macros that is passed back for handling by the
+calling function. Some extra checking is needed for \N because only \N{U+dddd}
+is supported. If the value is zero, further processing is handled below. */
+
+else if ((i = escapes[c - ESCAPES_FIRST]) != 0)
+  {
+  if (i > 0)
+    {
+    c = (uint32_t)i;
+    if (c == CHAR_CR && (extra_options & PCRE2_EXTRA_ESCAPED_CR_IS_LF) != 0)
+      c = CHAR_LF;
+    }
+  else  /* Negative table entry */
+    {
+    escape = -i;                    /* Else return a special escape */
+    if (cb != NULL && (escape == ESC_P || escape == ESC_p || escape == ESC_X))
+      cb->external_flags |= PCRE2_HASBKPORX;   /* Note \P, \p, or \X */
+
+    /* Perl supports \N{name} for character names and \N{U+dddd} for numerical
+    Unicode code points, as well as plain \N for "not newline". PCRE does not
+    support \N{name}. However, it does support quantification such as \N{2,3},
+    so if \N{ is not followed by U+dddd we check for a quantifier. */
+
+    if (escape == ESC_N && ptr < ptrend && *ptr == CHAR_LEFT_CURLY_BRACKET)
+      {
+      PCRE2_SPTR p = ptr + 1;
+
+      /* \N{U+ can be handled by the \x{ code. However, this construction is
+      not valid in EBCDIC environments because it specifies a Unicode
+      character, not a codepoint in the local code. For example \N{U+0041}
+      must be "A" in all environments. Also, in Perl, \N{U+ forces Unicode
+      casing semantics for the entire pattern, so allow it only in UTF (i.e.
+      Unicode) mode. */
+
+      if (ptrend - p > 1 && *p == CHAR_U && p[1] == CHAR_PLUS)
+        {
+#ifdef EBCDIC
+        *errorcodeptr = ERR93;
+#else
+        if (utf)
+          {
+          ptr = p + 1;
+          escape = 0;   /* Not a fancy escape after all */
+          goto COME_FROM_NU;
+          }
+        else *errorcodeptr = ERR93;
+#endif
+        }
+
+      /* Give an error if what follows is not a quantifier, but don't override
+      an error set by the quantifier reader (e.g. number overflow). */
+
+      else
+        {
+        if (!read_repeat_counts(&p, ptrend, NULL, NULL, errorcodeptr) &&
+             *errorcodeptr == 0)
+          *errorcodeptr = ERR37;
+        }
+      }
+    }
+  }
+
+/* Escapes that need further processing, including those that are unknown, have
+a zero entry in the lookup table. When called from pcre2_substitute(), only \c,
+\o, and \x are recognized (\u and \U can never appear as they are used for case
+forcing). */
+
+else
+  {
+  int s;
+  PCRE2_SPTR oldptr;
+  BOOL overflow;
+  BOOL alt_bsux =
+    ((options & PCRE2_ALT_BSUX) | (extra_options & PCRE2_EXTRA_ALT_BSUX)) != 0;
+
+  /* Filter calls from pcre2_substitute(). */
+
+  if (cb == NULL)
+    {
+    if (c != CHAR_c && c != CHAR_o && c != CHAR_x)
+      {
+      *errorcodeptr = ERR3;
+      return 0;
+      }
+    alt_bsux = FALSE;   /* Do not modify \x handling */
+    }
+
+  switch (c)
+    {
+    /* A number of Perl escapes are not handled by PCRE. We give an explicit
+    error. */
+
+    case CHAR_F:
+    case CHAR_l:
+    case CHAR_L:
+    *errorcodeptr = ERR37;
+    break;
+
+    /* \u is unrecognized when neither PCRE2_ALT_BSUX nor PCRE2_EXTRA_ALT_BSUX
+    is set. Otherwise, \u must be followed by exactly four hex digits or, if
+    PCRE2_EXTRA_ALT_BSUX is set, by any number of hex digits in braces.
+    Otherwise it is a lowercase u letter. This gives some compatibility with
+    ECMAScript (aka JavaScript). */
+
+    case CHAR_u:
+    if (!alt_bsux) *errorcodeptr = ERR37; else
+      {
+      uint32_t xc;
+
+      if (ptr >= ptrend) break;
+      if (*ptr == CHAR_LEFT_CURLY_BRACKET &&
+          (extra_options & PCRE2_EXTRA_ALT_BSUX) != 0)
+        {
+        PCRE2_SPTR hptr = ptr + 1;
+        cc = 0;
+
+        while (hptr < ptrend && (xc = XDIGIT(*hptr)) != 0xff)
+          {
+          if ((cc & 0xf0000000) != 0)  /* Test for 32-bit overflow */
+            {
+            *errorcodeptr = ERR77;
+            ptr = hptr;   /* Show where */
+            break;        /* *hptr != } will cause another break below */
+            }
+          cc = (cc << 4) | xc;
+          hptr++;
+          }
+
+        if (hptr == ptr + 1 ||   /* No hex digits */
+            hptr >= ptrend ||    /* Hit end of input */
+            *hptr != CHAR_RIGHT_CURLY_BRACKET)  /* No } terminator */
+          break;         /* Hex escape not recognized */
+
+        c = cc;          /* Accept the code point */
+        ptr = hptr + 1;
+        }
+
+      else  /* Must be exactly 4 hex digits */
+        {
+        if (ptrend - ptr < 4) break;               /* Less than 4 chars */
+        if ((cc = XDIGIT(ptr[0])) == 0xff) break;  /* Not a hex digit */
+        if ((xc = XDIGIT(ptr[1])) == 0xff) break;  /* Not a hex digit */
+        cc = (cc << 4) | xc;
+        if ((xc = XDIGIT(ptr[2])) == 0xff) break;  /* Not a hex digit */
+        cc = (cc << 4) | xc;
+        if ((xc = XDIGIT(ptr[3])) == 0xff) break;  /* Not a hex digit */
+        c = (cc << 4) | xc;
+        ptr += 4;
+        }
+
+      if (utf)
+        {
+        if (c > 0x10ffffU) *errorcodeptr = ERR77;
+        else
+          if (c >= 0xd800 && c <= 0xdfff &&
+              (extra_options & PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES) == 0)
+                *errorcodeptr = ERR73;
+        }
+      else if (c > MAX_NON_UTF_CHAR) *errorcodeptr = ERR77;
+      }
+    break;
+
+    /* \U is unrecognized unless PCRE2_ALT_BSUX or PCRE2_EXTRA_ALT_BSUX is set,
+    in which case it is an upper case letter. */
+
+    case CHAR_U:
+    if (!alt_bsux) *errorcodeptr = ERR37;
+    break;
+
+    /* In a character class, \g is just a literal "g". Outside a character
+    class, \g must be followed by one of a number of specific things:
+
+    (1) A number, either plain or braced. If positive, it is an absolute
+    backreference. If negative, it is a relative backreference. This is a Perl
+    5.10 feature.
+
+    (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
+    is part of Perl's movement towards a unified syntax for back references. As
+    this is synonymous with \k{name}, we fudge it up by pretending it really
+    was \k{name}.
+
+    (3) For Oniguruma compatibility we also support \g followed by a name or a
+    number either in angle brackets or in single quotes. However, these are
+    (possibly recursive) subroutine calls, _not_ backreferences. We return
+    the ESC_g code.
+
+    Summary: Return a negative number for a numerical back reference, ESC_k for
+    a named back reference, and ESC_g for a named or numbered subroutine call.
+    */
+
+    case CHAR_g:
+    if (isclass) break;
+
+    if (ptr >= ptrend)
+      {
+      *errorcodeptr = ERR57;
+      break;
+      }
+
+    if (*ptr == CHAR_LESS_THAN_SIGN || *ptr == CHAR_APOSTROPHE)
+      {
+      escape = ESC_g;
+      break;
+      }
+
+    /* If there is a brace delimiter, try to read a numerical reference. If
+    there isn't one, assume we have a name and treat it as \k. */
+
+    if (*ptr == CHAR_LEFT_CURLY_BRACKET)
+      {
+      PCRE2_SPTR p = ptr + 1;
+      if (!read_number(&p, ptrend, cb->bracount, MAX_GROUP_NUMBER, ERR61, &s,
+          errorcodeptr))
+        {
+        if (*errorcodeptr == 0) escape = ESC_k;  /* No number found */
+        break;
+        }
+      if (p >= ptrend || *p != CHAR_RIGHT_CURLY_BRACKET)
+        {
+        *errorcodeptr = ERR57;
+        break;
+        }
+      ptr = p + 1;
+      }
+
+    /* Read an undelimited number */
+
+    else
+      {
+      if (!read_number(&ptr, ptrend, cb->bracount, MAX_GROUP_NUMBER, ERR61, &s,
+          errorcodeptr))
+        {
+        if (*errorcodeptr == 0) *errorcodeptr = ERR57;  /* No number found */
+        break;
+        }
+      }
+
+    if (s <= 0)
+      {
+      *errorcodeptr = ERR15;
+      break;
+      }
+
+    escape = -s;
+    break;
+
+    /* The handling of escape sequences consisting of a string of digits
+    starting with one that is not zero is not straightforward. Perl has changed
+    over the years. Nowadays \g{} for backreferences and \o{} for octal are
+    recommended to avoid the ambiguities in the old syntax.
+
+    Outside a character class, the digits are read as a decimal number. If the
+    number is less than 10, or if there are that many previous extracting left
+    brackets, it is a back reference. Otherwise, up to three octal digits are
+    read to form an escaped character code. Thus \123 is likely to be octal 123
+    (cf \0123, which is octal 012 followed by the literal 3).
+
+    Inside a character class, \ followed by a digit is always either a literal
+    8 or 9 or an octal number. */
+
+    case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
+    case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
+
+    if (!isclass)
+      {
+      oldptr = ptr;
+      ptr--;   /* Back to the digit */
+
+      /* As we know we are at a digit, the only possible error from
+      read_number() is a number that is too large to be a group number. In this
+      case we fall through handle this as not a group reference. If we have
+      read a small enough number, check for a back reference.
+
+      \1 to \9 are always back references. \8x and \9x are too; \1x to \7x
+      are octal escapes if there are not that many previous captures. */
+
+      if (read_number(&ptr, ptrend, -1, INT_MAX/10 - 1, 0, &s, errorcodeptr) &&
+          (s < 10 || oldptr[-1] >= CHAR_8 || s <= (int)cb->bracount))
+        {
+        if (s > (int)MAX_GROUP_NUMBER) *errorcodeptr = ERR61;
+          else escape = -s;     /* Indicates a back reference */
+        break;
+        }
+
+      ptr = oldptr;      /* Put the pointer back and fall through */
+      }
+
+    /* Handle a digit following \ when the number is not a back reference, or
+    we are within a character class. If the first digit is 8 or 9, Perl used to
+    generate a binary zero and then treat the digit as a following literal. At
+    least by Perl 5.18 this changed so as not to insert the binary zero. */
+
+    if (c >= CHAR_8) break;
+
+    /* Fall through */
+
+    /* \0 always starts an octal number, but we may drop through to here with a
+    larger first octal digit. The original code used just to take the least
+    significant 8 bits of octal numbers (I think this is what early Perls used
+    to do). Nowadays we allow for larger numbers in UTF-8 mode and 16-bit mode,
+    but no more than 3 octal digits. */
+
+    case CHAR_0:
+    c -= CHAR_0;
+    while(i++ < 2 && ptr < ptrend && *ptr >= CHAR_0 && *ptr <= CHAR_7)
+        c = c * 8 + *ptr++ - CHAR_0;
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    if (!utf && c > 0xff) *errorcodeptr = ERR51;
+#endif
+    break;
+
+    /* \o is a relatively new Perl feature, supporting a more general way of
+    specifying character codes in octal. The only supported form is \o{ddd}. */
+
+    case CHAR_o:
+    if (ptr >= ptrend || *ptr++ != CHAR_LEFT_CURLY_BRACKET)
+      {
+      ptr--;
+      *errorcodeptr = ERR55;
+      }
+    else if (ptr >= ptrend || *ptr == CHAR_RIGHT_CURLY_BRACKET)
+      *errorcodeptr = ERR78;
+    else
+      {
+      c = 0;
+      overflow = FALSE;
+      while (ptr < ptrend && *ptr >= CHAR_0 && *ptr <= CHAR_7)
+        {
+        cc = *ptr++;
+        if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
+#if PCRE2_CODE_UNIT_WIDTH == 32
+        if (c >= 0x20000000l) { overflow = TRUE; break; }
+#endif
+        c = (c << 3) + (cc - CHAR_0);
+#if PCRE2_CODE_UNIT_WIDTH == 8
+        if (c > (utf ? 0x10ffffU : 0xffU)) { overflow = TRUE; break; }
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+        if (c > (utf ? 0x10ffffU : 0xffffU)) { overflow = TRUE; break; }
+#elif PCRE2_CODE_UNIT_WIDTH == 32
+        if (utf && c > 0x10ffffU) { overflow = TRUE; break; }
+#endif
+        }
+      if (overflow)
+        {
+        while (ptr < ptrend && *ptr >= CHAR_0 && *ptr <= CHAR_7) ptr++;
+        *errorcodeptr = ERR34;
+        }
+      else if (ptr < ptrend && *ptr++ == CHAR_RIGHT_CURLY_BRACKET)
+        {
+        if (utf && c >= 0xd800 && c <= 0xdfff &&
+            (extra_options & PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES) == 0)
+          {
+          ptr--;
+          *errorcodeptr = ERR73;
+          }
+        }
+      else
+        {
+        ptr--;
+        *errorcodeptr = ERR64;
+        }
+      }
+    break;
+
+    /* When PCRE2_ALT_BSUX or PCRE2_EXTRA_ALT_BSUX is set, \x must be followed
+    by two hexadecimal digits. Otherwise it is a lowercase x letter. */
+
+    case CHAR_x:
+    if (alt_bsux)
+      {
+      uint32_t xc;
+      if (ptrend - ptr < 2) break;               /* Less than 2 characters */
+      if ((cc = XDIGIT(ptr[0])) == 0xff) break;  /* Not a hex digit */
+      if ((xc = XDIGIT(ptr[1])) == 0xff) break;  /* Not a hex digit */
+      c = (cc << 4) | xc;
+      ptr += 2;
+      }
+
+    /* Handle \x in Perl's style. \x{ddd} is a character code which can be
+    greater than 0xff in UTF-8 or non-8bit mode, but only if the ddd are hex
+    digits. If not, { used to be treated as a data character. However, Perl
+    seems to read hex digits up to the first non-such, and ignore the rest, so
+    that, for example \x{zz} matches a binary zero. This seems crazy, so PCRE
+    now gives an error. */
+
+    else
+      {
+      if (ptr < ptrend && *ptr == CHAR_LEFT_CURLY_BRACKET)
+        {
+#ifndef EBCDIC
+        COME_FROM_NU:
+#endif
+        if (++ptr >= ptrend || *ptr == CHAR_RIGHT_CURLY_BRACKET)
+          {
+          *errorcodeptr = ERR78;
+          break;
+          }
+        c = 0;
+        overflow = FALSE;
+
+        while (ptr < ptrend && (cc = XDIGIT(*ptr)) != 0xff)
+          {
+          ptr++;
+          if (c == 0 && cc == 0) continue;   /* Leading zeroes */
+#if PCRE2_CODE_UNIT_WIDTH == 32
+          if (c >= 0x10000000l) { overflow = TRUE; break; }
+#endif
+          c = (c << 4) | cc;
+          if ((utf && c > 0x10ffffU) || (!utf && c > MAX_NON_UTF_CHAR))
+            {
+            overflow = TRUE;
+            break;
+            }
+          }
+
+        if (overflow)
+          {
+          while (ptr < ptrend && XDIGIT(*ptr) != 0xff) ptr++;
+          *errorcodeptr = ERR34;
+          }
+        else if (ptr < ptrend && *ptr++ == CHAR_RIGHT_CURLY_BRACKET)
+          {
+          if (utf && c >= 0xd800 && c <= 0xdfff &&
+              (extra_options & PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES) == 0)
+            {
+            ptr--;
+            *errorcodeptr = ERR73;
+            }
+          }
+
+        /* If the sequence of hex digits does not end with '}', give an error.
+        We used just to recognize this construct and fall through to the normal
+        \x handling, but nowadays Perl gives an error, which seems much more
+        sensible, so we do too. */
+
+        else
+          {
+          ptr--;
+          *errorcodeptr = ERR67;
+          }
+        }   /* End of \x{} processing */
+
+      /* Read a up to two hex digits after \x */
+
+      else
+        {
+        c = 0;
+        if (ptr >= ptrend || (cc = XDIGIT(*ptr)) == 0xff) break;  /* Not a hex digit */
+        ptr++;
+        c = cc;
+        if (ptr >= ptrend || (cc = XDIGIT(*ptr)) == 0xff) break;  /* Not a hex digit */
+        ptr++;
+        c = (c << 4) | cc;
+        }     /* End of \xdd handling */
+      }       /* End of Perl-style \x handling */
+    break;
+
+    /* The handling of \c is different in ASCII and EBCDIC environments. In an
+    ASCII (or Unicode) environment, an error is given if the character
+    following \c is not a printable ASCII character. Otherwise, the following
+    character is upper-cased if it is a letter, and after that the 0x40 bit is
+    flipped. The result is the value of the escape.
+
+    In an EBCDIC environment the handling of \c is compatible with the
+    specification in the perlebcdic document. The following character must be
+    a letter or one of small number of special characters. These provide a
+    means of defining the character values 0-31.
+
+    For testing the EBCDIC handling of \c in an ASCII environment, recognize
+    the EBCDIC value of 'c' explicitly. */
+
+#if defined EBCDIC && 'a' != 0x81
+    case 0x83:
+#else
+    case CHAR_c:
+#endif
+    if (ptr >= ptrend)
+      {
+      *errorcodeptr = ERR2;
+      break;
+      }
+    c = *ptr;
+    if (c >= CHAR_a && c <= CHAR_z) c = UPPER_CASE(c);
+
+    /* Handle \c in an ASCII/Unicode environment. */
+
+#ifndef EBCDIC    /* ASCII/UTF-8 coding */
+    if (c < 32 || c > 126)  /* Excludes all non-printable ASCII */
+      {
+      *errorcodeptr = ERR68;
+      break;
+      }
+    c ^= 0x40;
+
+    /* Handle \c in an EBCDIC environment. The special case \c? is converted to
+    255 (0xff) or 95 (0x5f) if other characters suggest we are using the
+    POSIX-BC encoding. (This is the way Perl indicates that it handles \c?.)
+    The other valid sequences correspond to a list of specific characters. */
+
+#else
+    if (c == CHAR_QUESTION_MARK)
+      c = ('\\' == 188 && '`' == 74)? 0x5f : 0xff;
+    else
+      {
+      for (i = 0; i < 32; i++)
+        {
+        if (c == ebcdic_escape_c[i]) break;
+        }
+      if (i < 32) c = i; else *errorcodeptr = ERR68;
+      }
+#endif  /* EBCDIC */
+
+    ptr++;
+    break;
+
+    /* Any other alphanumeric following \ is an error. Perl gives an error only
+    if in warning mode, but PCRE doesn't have a warning mode. */
+
+    default:
+    *errorcodeptr = ERR3;
+    *ptrptr = ptr - 1;     /* Point to the character at fault */
+    return 0;
+    }
+  }
+
+/* Set the pointer to the next character before returning. */
+
+*ptrptr = ptr;
+*chptr = c;
+return escape;
+}
+
+
+
+#ifdef SUPPORT_UNICODE
+/*************************************************
+*               Handle \P and \p                 *
+*************************************************/
+
+/* This function is called after \P or \p has been encountered, provided that
+PCRE2 is compiled with support for UTF and Unicode properties. On entry, the
+contents of ptrptr are pointing after the P or p. On exit, it is left pointing
+after the final code unit of the escape sequence.
+
+Arguments:
+  ptrptr         the pattern position pointer
+  negptr         a boolean that is set TRUE for negation else FALSE
+  ptypeptr       an unsigned int that is set to the type value
+  pdataptr       an unsigned int that is set to the detailed property value
+  errorcodeptr   the error code variable
+  cb             the compile data
+
+Returns:         TRUE if the type value was found, or FALSE for an invalid type
+*/
+
+static BOOL
+get_ucp(PCRE2_SPTR *ptrptr, BOOL *negptr, uint16_t *ptypeptr,
+  uint16_t *pdataptr, int *errorcodeptr, compile_block *cb)
+{
+PCRE2_UCHAR c;
+PCRE2_SIZE i, bot, top;
+PCRE2_SPTR ptr = *ptrptr;
+PCRE2_UCHAR name[50];
+PCRE2_UCHAR *vptr = NULL;
+uint16_t ptscript = PT_NOTSCRIPT;
+
+if (ptr >= cb->end_pattern) goto ERROR_RETURN;
+c = *ptr++;
+*negptr = FALSE;
+
+/* \P or \p can be followed by a name in {}, optionally preceded by ^ for
+negation. */
+
+if (c == CHAR_LEFT_CURLY_BRACKET)
+  {
+  if (ptr >= cb->end_pattern) goto ERROR_RETURN;
+
+  if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
+    {
+    *negptr = TRUE;
+    ptr++;
+    }
+
+  for (i = 0; i < (int)(sizeof(name) / sizeof(PCRE2_UCHAR)) - 1; i++)
+    {
+    if (ptr >= cb->end_pattern) goto ERROR_RETURN;
+    c = *ptr++;
+    while (c == '_' || c == '-' || isspace(c))
+      {
+      if (ptr >= cb->end_pattern) goto ERROR_RETURN;
+      c = *ptr++;
+      }
+    if (c == CHAR_NUL) goto ERROR_RETURN;
+    if (c == CHAR_RIGHT_CURLY_BRACKET) break;
+    name[i] = tolower(c);
+    if ((c == ':' || c == '=') && vptr == NULL) vptr = name + i;
+    }
+
+  if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
+  name[i] = 0;
+  }
+
+/* If { doesn't follow \p or \P there is just one following character, which
+must be an ASCII letter. */
+
+else if (MAX_255(c) && (cb->ctypes[c] & ctype_letter) != 0)
+  {
+  name[0] = tolower(c);
+  name[1] = 0;
+  }
+else goto ERROR_RETURN;
+
+*ptrptr = ptr;
+
+/* If the property contains ':' or '=' we have class name and value separately
+specified. The following are supported:
+
+  . Bidi_Class (synonym bc), for which the property names are "bidi<name>".
+  . Script (synonym sc) for which the property name is the script name
+  . Script_Extensions (synonym scx), ditto
+
+As this is a small number, we currently just check the names directly. If this
+grows, a sorted table and a switch will be neater.
+
+For both the script properties, set a PT_xxx value so that (1) they can be
+distinguished and (2) invalid script names that happen to be the name of
+another property can be diagnosed. */
+
+if (vptr != NULL)
+  {
+  int offset = 0;
+  PCRE2_UCHAR sname[8];
+
+  *vptr = 0;   /* Terminate property name */
+  if (PRIV(strcmp_c8)(name, STRING_bidiclass) == 0 ||
+      PRIV(strcmp_c8)(name, STRING_bc) == 0)
+    {
+    offset = 4;
+    sname[0] = CHAR_b;
+    sname[1] = CHAR_i;  /* There is no strcpy_c8 function */
+    sname[2] = CHAR_d;
+    sname[3] = CHAR_i;
+    }
+
+  else if (PRIV(strcmp_c8)(name, STRING_script) == 0 ||
+           PRIV(strcmp_c8)(name, STRING_sc) == 0)
+    ptscript = PT_SC;
+
+  else if (PRIV(strcmp_c8)(name, STRING_scriptextensions) == 0 ||
+           PRIV(strcmp_c8)(name, STRING_scx) == 0)
+    ptscript = PT_SCX;
+
+  else
+    {
+    *errorcodeptr = ERR47;
+    return FALSE;
+    }
+
+  /* Adjust the string in name[] as needed */
+
+  memmove(name + offset, vptr + 1, (name + i - vptr)*sizeof(PCRE2_UCHAR));
+  if (offset != 0) memmove(name, sname, offset*sizeof(PCRE2_UCHAR));
+  }
+
+/* Search for a recognized property using binary chop. */
+
+bot = 0;
+top = PRIV(utt_size);
+
+while (bot < top)
+  {
+  int r;
+  i = (bot + top) >> 1;
+  r = PRIV(strcmp_c8)(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
+
+  /* When a matching property is found, some extra checking is needed when the
+  \p{xx:yy} syntax is used and xx is either sc or scx. */
+
+  if (r == 0)
+    {
+    *pdataptr = PRIV(utt)[i].value;
+    if (vptr == NULL || ptscript == PT_NOTSCRIPT)
+      {
+      *ptypeptr = PRIV(utt)[i].type;
+      return TRUE;
+      }
+
+    switch (PRIV(utt)[i].type)
+      {
+      case PT_SC:
+      *ptypeptr = PT_SC;
+      return TRUE;
+
+      case PT_SCX:
+      *ptypeptr = ptscript;
+      return TRUE;
+      }
+
+    break;  /* Non-script found */
+    }
+
+  if (r > 0) bot = i + 1; else top = i;
+  }
+
+*errorcodeptr = ERR47;   /* Unrecognized property */
+return FALSE;
+
+ERROR_RETURN:            /* Malformed \P or \p */
+*errorcodeptr = ERR46;
+*ptrptr = ptr;
+return FALSE;
+}
+#endif
+
+
+
+/*************************************************
+*           Check for POSIX class syntax         *
+*************************************************/
+
+/* This function is called when the sequence "[:" or "[." or "[=" is
+encountered in a character class. It checks whether this is followed by a
+sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
+reach an unescaped ']' without the special preceding character, return FALSE.
+
+Originally, this function only recognized a sequence of letters between the
+terminators, but it seems that Perl recognizes any sequence of characters,
+though of course unknown POSIX names are subsequently rejected. Perl gives an
+"Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
+didn't consider this to be a POSIX class. Likewise for [:1234:].
+
+The problem in trying to be exactly like Perl is in the handling of escapes. We
+have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
+class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
+below handles the special cases \\ and \], but does not try to do any other
+escape processing. This makes it different from Perl for cases such as
+[:l\ower:] where Perl recognizes it as the POSIX class "lower" but PCRE does
+not recognize "l\ower". This is a lesser evil than not diagnosing bad classes
+when Perl does, I think.
+
+A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
+It seems that the appearance of a nested POSIX class supersedes an apparent
+external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
+a digit. This is handled by returning FALSE if the start of a new group with
+the same terminator is encountered, since the next closing sequence must close
+the nested group, not the outer one.
+
+In Perl, unescaped square brackets may also appear as part of class names. For
+example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
+[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
+seem right at all. PCRE does not allow closing square brackets in POSIX class
+names.
+
+Arguments:
+  ptr      pointer to the character after the initial [ (colon, dot, equals)
+  ptrend   pointer to the end of the pattern
+  endptr   where to return a pointer to the terminating ':', '.', or '='
+
+Returns:   TRUE or FALSE
+*/
+
+static BOOL
+check_posix_syntax(PCRE2_SPTR ptr, PCRE2_SPTR ptrend, PCRE2_SPTR *endptr)
+{
+PCRE2_UCHAR terminator;  /* Don't combine these lines; the Solaris cc */
+terminator = *ptr++;     /* compiler warns about "non-constant" initializer. */
+
+for (; ptrend - ptr >= 2; ptr++)
+  {
+  if (*ptr == CHAR_BACKSLASH &&
+      (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET || ptr[1] == CHAR_BACKSLASH))
+    ptr++;
+
+  else if ((*ptr == CHAR_LEFT_SQUARE_BRACKET && ptr[1] == terminator) ||
+            *ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
+
+  else if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
+    {
+    *endptr = ptr;
+    return TRUE;
+    }
+  }
+
+return FALSE;
+}
+
+
+
+/*************************************************
+*          Check POSIX class name                *
+*************************************************/
+
+/* This function is called to check the name given in a POSIX-style class entry
+such as [:alnum:].
+
+Arguments:
+  ptr        points to the first letter
+  len        the length of the name
+
+Returns:     a value representing the name, or -1 if unknown
+*/
+
+static int
+check_posix_name(PCRE2_SPTR ptr, int len)
+{
+const char *pn = posix_names;
+int yield = 0;
+while (posix_name_lengths[yield] != 0)
+  {
+  if (len == posix_name_lengths[yield] &&
+    PRIV(strncmp_c8)(ptr, pn, (unsigned int)len) == 0) return yield;
+  pn += posix_name_lengths[yield] + 1;
+  yield++;
+  }
+return -1;
+}
+
+
+
+/*************************************************
+*       Read a subpattern or VERB name           *
+*************************************************/
+
+/* This function is called from parse_regex() below whenever it needs to read
+the name of a subpattern or a (*VERB) or an (*alpha_assertion). The initial
+pointer must be to the character before the name. If that character is '*' we
+are reading a verb or alpha assertion name. The pointer is updated to point
+after the name, for a VERB or alpha assertion name, or after tha name's
+terminator for a subpattern name. Returning both the offset and the name
+pointer is redundant information, but some callers use one and some the other,
+so it is simplest just to return both.
+
+Arguments:
+  ptrptr      points to the character pointer variable
+  ptrend      points to the end of the input string
+  utf         true if the input is UTF-encoded
+  terminator  the terminator of a subpattern name must be this
+  offsetptr   where to put the offset from the start of the pattern
+  nameptr     where to put a pointer to the name in the input
+  namelenptr  where to put the length of the name
+  errcodeptr  where to put an error code
+  cb          pointer to the compile data block
+
+Returns:    TRUE if a name was read
+            FALSE otherwise, with error code set
+*/
+
+static BOOL
+read_name(PCRE2_SPTR *ptrptr, PCRE2_SPTR ptrend, BOOL utf, uint32_t terminator,
+  PCRE2_SIZE *offsetptr, PCRE2_SPTR *nameptr, uint32_t *namelenptr,
+  int *errorcodeptr, compile_block *cb)
+{
+PCRE2_SPTR ptr = *ptrptr;
+BOOL is_group = (*ptr != CHAR_ASTERISK);
+
+if (++ptr >= ptrend)               /* No characters in name */
+  {
+  *errorcodeptr = is_group? ERR62: /* Subpattern name expected */
+                            ERR60; /* Verb not recognized or malformed */
+  goto FAILED;
+  }
+
+*nameptr = ptr;
+*offsetptr = (PCRE2_SIZE)(ptr - cb->start_pattern);
+
+/* In UTF mode, a group name may contain letters and decimal digits as defined
+by Unicode properties, and underscores, but must not start with a digit. */
+
+#ifdef SUPPORT_UNICODE
+if (utf && is_group)
+  {
+  uint32_t c, type;
+
+  GETCHAR(c, ptr);
+  type = UCD_CHARTYPE(c);
+
+  if (type == ucp_Nd)
+    {
+    *errorcodeptr = ERR44;
+    goto FAILED;
+    }
+
+  for(;;)
+    {
+    if (type != ucp_Nd && PRIV(ucp_gentype)[type] != ucp_L &&
+        c != CHAR_UNDERSCORE) break;
+    ptr++;
+    FORWARDCHARTEST(ptr, ptrend);
+    if (ptr >= ptrend) break;
+    GETCHAR(c, ptr);
+    type = UCD_CHARTYPE(c);
+    }
+  }
+else
+#else
+(void)utf;  /* Avoid compiler warning */
+#endif      /* SUPPORT_UNICODE */
+
+/* Handle non-group names and group names in non-UTF modes. A group name must
+not start with a digit. If either of the others start with a digit it just
+won't be recognized. */
+
+  {
+  if (is_group && IS_DIGIT(*ptr))
+    {
+    *errorcodeptr = ERR44;
+    goto FAILED;
+    }
+
+  while (ptr < ptrend && MAX_255(*ptr) && (cb->ctypes[*ptr] & ctype_word) != 0)
+    {
+    ptr++;
+    }
+  }
+
+/* Check name length */
+
+if (ptr > *nameptr + MAX_NAME_SIZE)
+  {
+  *errorcodeptr = ERR48;
+  goto FAILED;
+  }
+*namelenptr = (uint32_t)(ptr - *nameptr);
+
+/* Subpattern names must not be empty, and their terminator is checked here.
+(What follows a verb or alpha assertion name is checked separately.) */
+
+if (is_group)
+  {
+  if (ptr == *nameptr)
+    {
+    *errorcodeptr = ERR62;   /* Subpattern name expected */
+    goto FAILED;
+    }
+  if (ptr >= ptrend || *ptr != (PCRE2_UCHAR)terminator)
+    {
+    *errorcodeptr = ERR42;
+    goto FAILED;
+    }
+  ptr++;
+  }
+
+*ptrptr = ptr;
+return TRUE;
+
+FAILED:
+*ptrptr = ptr;
+return FALSE;
+}
+
+
+
+/*************************************************
+*          Manage callouts at start of cycle     *
+*************************************************/
+
+/* At the start of a new item in parse_regex() we are able to record the
+details of the previous item in a prior callout, and also to set up an
+automatic callout if enabled. Avoid having two adjacent automatic callouts,
+which would otherwise happen for items such as \Q that contribute nothing to
+the parsed pattern.
+
+Arguments:
+  ptr              current pattern pointer
+  pcalloutptr      points to a pointer to previous callout, or NULL
+  auto_callout     TRUE if auto_callouts are enabled
+  parsed_pattern   the parsed pattern pointer
+  cb               compile block
+
+Returns: possibly updated parsed_pattern pointer.
+*/
+
+static uint32_t *
+manage_callouts(PCRE2_SPTR ptr, uint32_t **pcalloutptr, BOOL auto_callout,
+  uint32_t *parsed_pattern, compile_block *cb)
+{
+uint32_t *previous_callout = *pcalloutptr;
+
+if (previous_callout != NULL) previous_callout[2] = (uint32_t)(ptr -
+  cb->start_pattern - (PCRE2_SIZE)previous_callout[1]);
+
+if (!auto_callout) previous_callout = NULL; else
+  {
+  if (previous_callout == NULL ||
+      previous_callout != parsed_pattern - 4 ||
+      previous_callout[3] != 255)
+    {
+    previous_callout = parsed_pattern;  /* Set up new automatic callout */
+    parsed_pattern += 4;
+    previous_callout[0] = META_CALLOUT_NUMBER;
+    previous_callout[2] = 0;
+    previous_callout[3] = 255;
+    }
+  previous_callout[1] = (uint32_t)(ptr - cb->start_pattern);
+  }
+
+*pcalloutptr = previous_callout;
+return parsed_pattern;
+}
+
+
+
+/*************************************************
+*      Parse regex and identify named groups     *
+*************************************************/
+
+/* This function is called first of all. It scans the pattern and does two
+things: (1) It identifies capturing groups and makes a table of named capturing
+groups so that information about them is fully available to both the compiling
+scans. (2) It writes a parsed version of the pattern with comments omitted and
+escapes processed into the parsed_pattern vector.
+
+Arguments:
+  ptr             points to the start of the pattern
+  options         compiling dynamic options (may change during the scan)
+  has_lookbehind  points to a boolean, set TRUE if a lookbehind is found
+  cb              pointer to the compile data block
+
+Returns:   zero on success or a non-zero error code, with the
+             error offset placed in the cb field
+*/
+
+/* A structure and some flags for dealing with nested groups. */
+
+typedef struct nest_save {
+  uint16_t  nest_depth;
+  uint16_t  reset_group;
+  uint16_t  max_group;
+  uint16_t  flags;
+  uint32_t  options;
+} nest_save;
+
+#define NSF_RESET          0x0001u
+#define NSF_CONDASSERT     0x0002u
+#define NSF_ATOMICSR       0x0004u
+
+/* Options that are changeable within the pattern must be tracked during
+parsing. Some (e.g. PCRE2_EXTENDED) are implemented entirely during parsing,
+but all must be tracked so that META_OPTIONS items set the correct values for
+the main compiling phase. */
+
+#define PARSE_TRACKED_OPTIONS (PCRE2_CASELESS|PCRE2_DOTALL|PCRE2_DUPNAMES| \
+  PCRE2_EXTENDED|PCRE2_EXTENDED_MORE|PCRE2_MULTILINE|PCRE2_NO_AUTO_CAPTURE| \
+  PCRE2_UNGREEDY)
+
+/* States used for analyzing ranges in character classes. The two OK values
+must be last. */
+
+enum { RANGE_NO, RANGE_STARTED, RANGE_OK_ESCAPED, RANGE_OK_LITERAL };
+
+/* Only in 32-bit mode can there be literals > META_END. A macro encapsulates
+the storing of literal values in the main parsed pattern, where they can always
+be quantified. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+#define PARSED_LITERAL(c, p) \
+  { \
+  if (c >= META_END) *p++ = META_BIGVALUE; \
+  *p++ = c; \
+  okquantifier = TRUE; \
+  }
+#else
+#define PARSED_LITERAL(c, p) *p++ = c; okquantifier = TRUE;
+#endif
+
+/* Here's the actual function. */
+
+static int parse_regex(PCRE2_SPTR ptr, uint32_t options, BOOL *has_lookbehind,
+  compile_block *cb)
+{
+uint32_t c;
+uint32_t delimiter;
+uint32_t namelen;
+uint32_t class_range_state;
+uint32_t *verblengthptr = NULL;     /* Value avoids compiler warning */
+uint32_t *verbstartptr = NULL;
+uint32_t *previous_callout = NULL;
+uint32_t *parsed_pattern = cb->parsed_pattern;
+uint32_t *parsed_pattern_end = cb->parsed_pattern_end;
+uint32_t meta_quantifier = 0;
+uint32_t add_after_mark = 0;
+uint32_t extra_options = cb->cx->extra_options;
+uint16_t nest_depth = 0;
+int after_manual_callout = 0;
+int expect_cond_assert = 0;
+int errorcode = 0;
+int escape;
+int i;
+BOOL inescq = FALSE;
+BOOL inverbname = FALSE;
+BOOL utf = (options & PCRE2_UTF) != 0;
+BOOL auto_callout = (options & PCRE2_AUTO_CALLOUT) != 0;
+BOOL isdupname;
+BOOL negate_class;
+BOOL okquantifier = FALSE;
+PCRE2_SPTR thisptr;
+PCRE2_SPTR name;
+PCRE2_SPTR ptrend = cb->end_pattern;
+PCRE2_SPTR verbnamestart = NULL;    /* Value avoids compiler warning */
+named_group *ng;
+nest_save *top_nest, *end_nests;
+
+/* Insert leading items for word and line matching (features provided for the
+benefit of pcre2grep). */
+
+if ((extra_options & PCRE2_EXTRA_MATCH_LINE) != 0)
+  {
+  *parsed_pattern++ = META_CIRCUMFLEX;
+  *parsed_pattern++ = META_NOCAPTURE;
+  }
+else if ((extra_options & PCRE2_EXTRA_MATCH_WORD) != 0)
+  {
+  *parsed_pattern++ = META_ESCAPE + ESC_b;
+  *parsed_pattern++ = META_NOCAPTURE;
+  }
+
+/* If the pattern is actually a literal string, process it separately to avoid
+cluttering up the main loop. */
+
+if ((options & PCRE2_LITERAL) != 0)
+  {
+  while (ptr < ptrend)
+    {
+    if (parsed_pattern >= parsed_pattern_end)
+      {
+      errorcode = ERR63;  /* Internal error (parsed pattern overflow) */
+      goto FAILED;
+      }
+    thisptr = ptr;
+    GETCHARINCTEST(c, ptr);
+    if (auto_callout)
+      parsed_pattern = manage_callouts(thisptr, &previous_callout,
+        auto_callout, parsed_pattern, cb);
+    PARSED_LITERAL(c, parsed_pattern);
+    }
+  goto PARSED_END;
+  }
+
+/* Process a real regex which may contain meta-characters. */
+
+top_nest = NULL;
+end_nests = (nest_save *)(cb->start_workspace + cb->workspace_size);
+
+/* The size of the nest_save structure might not be a factor of the size of the
+workspace. Therefore we must round down end_nests so as to correctly avoid
+creating a nest_save that spans the end of the workspace. */
+
+end_nests = (nest_save *)((char *)end_nests -
+  ((cb->workspace_size * sizeof(PCRE2_UCHAR)) % sizeof(nest_save)));
+
+/* PCRE2_EXTENDED_MORE implies PCRE2_EXTENDED */
+
+if ((options & PCRE2_EXTENDED_MORE) != 0) options |= PCRE2_EXTENDED;
+
+/* Now scan the pattern */
+
+while (ptr < ptrend)
+  {
+  int prev_expect_cond_assert;
+  uint32_t min_repeat, max_repeat;
+  uint32_t set, unset, *optset;
+  uint32_t terminator;
+  uint32_t prev_meta_quantifier;
+  BOOL prev_okquantifier;
+  PCRE2_SPTR tempptr;
+  PCRE2_SIZE offset;
+
+  if (parsed_pattern >= parsed_pattern_end)
+    {
+    errorcode = ERR63;  /* Internal error (parsed pattern overflow) */
+    goto FAILED;
+    }
+
+  if (nest_depth > cb->cx->parens_nest_limit)
+    {
+    errorcode = ERR19;
+    goto FAILED;        /* Parentheses too deeply nested */
+    }
+
+  /* Get next input character, save its position for callout handling. */
+
+  thisptr = ptr;
+  GETCHARINCTEST(c, ptr);
+
+  /* Copy quoted literals until \E, allowing for the possibility of automatic
+  callouts, except when processing a (*VERB) "name".  */
+
+  if (inescq)
+    {
+    if (c == CHAR_BACKSLASH && ptr < ptrend && *ptr == CHAR_E)
+      {
+      inescq = FALSE;
+      ptr++;   /* Skip E */
+      }
+    else
+      {
+      if (expect_cond_assert > 0)   /* A literal is not allowed if we are */
+        {                           /* expecting a conditional assertion, */
+        ptr--;                      /* but an empty \Q\E sequence is OK.  */
+        errorcode = ERR28;
+        goto FAILED;
+        }
+      if (inverbname)
+        {                          /* Don't use PARSED_LITERAL() because it */
+#if PCRE2_CODE_UNIT_WIDTH == 32    /* sets okquantifier. */
+        if (c >= META_END) *parsed_pattern++ = META_BIGVALUE;
+#endif
+        *parsed_pattern++ = c;
+        }
+      else
+        {
+        if (after_manual_callout-- <= 0)
+          parsed_pattern = manage_callouts(thisptr, &previous_callout,
+            auto_callout, parsed_pattern, cb);
+        PARSED_LITERAL(c, parsed_pattern);
+        }
+      meta_quantifier = 0;
+      }
+    continue;  /* Next character */
+    }
+
+  /* If we are processing the "name" part of a (*VERB:NAME) item, all
+  characters up to the closing parenthesis are literals except when
+  PCRE2_ALT_VERBNAMES is set. That causes backslash interpretation, but only \Q
+  and \E and escaped characters are allowed (no character types such as \d). If
+  PCRE2_EXTENDED is also set, we must ignore white space and # comments. Do
+  this by not entering the special (*VERB:NAME) processing - they are then
+  picked up below. Note that c is a character, not a code unit, so we must not
+  use MAX_255 to test its size because MAX_255 tests code units and is assumed
+  TRUE in 8-bit mode. */
+
+  if (inverbname &&
+       (
+        /* EITHER: not both options set */
+        ((options & (PCRE2_EXTENDED | PCRE2_ALT_VERBNAMES)) !=
+                    (PCRE2_EXTENDED | PCRE2_ALT_VERBNAMES)) ||
+#ifdef SUPPORT_UNICODE
+        /* OR: character > 255 AND not Unicode Pattern White Space */
+        (c > 255 && (c|1) != 0x200f && (c|1) != 0x2029) ||
+#endif
+        /* OR: not a # comment or isspace() white space */
+        (c < 256 && c != CHAR_NUMBER_SIGN && (cb->ctypes[c] & ctype_space) == 0
+#ifdef SUPPORT_UNICODE
+        /* and not CHAR_NEL when Unicode is supported */
+          && c != CHAR_NEL
+#endif
+       )))
+    {
+    PCRE2_SIZE verbnamelength;
+
+    switch(c)
+      {
+      default:                     /* Don't use PARSED_LITERAL() because it */
+#if PCRE2_CODE_UNIT_WIDTH == 32    /* sets okquantifier. */
+      if (c >= META_END) *parsed_pattern++ = META_BIGVALUE;
+#endif
+      *parsed_pattern++ = c;
+      break;
+
+      case CHAR_RIGHT_PARENTHESIS:
+      inverbname = FALSE;
+      /* This is the length in characters */
+      verbnamelength = (PCRE2_SIZE)(parsed_pattern - verblengthptr - 1);
+      /* But the limit on the length is in code units */
+      if (ptr - verbnamestart - 1 > (int)MAX_MARK)
+        {
+        ptr--;
+        errorcode = ERR76;
+        goto FAILED;
+        }
+      *verblengthptr = (uint32_t)verbnamelength;
+
+      /* If this name was on a verb such as (*ACCEPT) which does not continue,
+      a (*MARK) was generated for the name. We now add the original verb as the
+      next item. */
+
+      if (add_after_mark != 0)
+        {
+        *parsed_pattern++ = add_after_mark;
+        add_after_mark = 0;
+        }
+      break;
+
+      case CHAR_BACKSLASH:
+      if ((options & PCRE2_ALT_VERBNAMES) != 0)
+        {
+        escape = PRIV(check_escape)(&ptr, ptrend, &c, &errorcode, options,
+          cb->cx->extra_options, FALSE, cb);
+        if (errorcode != 0) goto FAILED;
+        }
+      else escape = 0;   /* Treat all as literal */
+
+      switch(escape)
+        {
+        case 0:                    /* Don't use PARSED_LITERAL() because it */
+#if PCRE2_CODE_UNIT_WIDTH == 32    /* sets okquantifier. */
+        if (c >= META_END) *parsed_pattern++ = META_BIGVALUE;
+#endif
+        *parsed_pattern++ = c;
+        break;
+
+        case ESC_Q:
+        inescq = TRUE;
+        break;
+
+        case ESC_E:           /* Ignore */
+        break;
+
+        default:
+        errorcode = ERR40;    /* Invalid in verb name */
+        goto FAILED;
+        }
+      }
+    continue;   /* Next character in pattern */
+    }
+
+  /* Not a verb name character. At this point we must process everything that
+  must not change the quantification state. This is mainly comments, but we
+  handle \Q and \E here as well, so that an item such as A\Q\E+ is treated as
+  A+, as in Perl. An isolated \E is ignored. */
+
+  if (c == CHAR_BACKSLASH && ptr < ptrend)
+    {
+    if (*ptr == CHAR_Q || *ptr == CHAR_E)
+      {
+      inescq = *ptr == CHAR_Q;
+      ptr++;
+      continue;
+      }
+    }
+
+  /* Skip over whitespace and # comments in extended mode. Note that c is a
+  character, not a code unit, so we must not use MAX_255 to test its size
+  because MAX_255 tests code units and is assumed TRUE in 8-bit mode. The
+  whitespace characters are those designated as "Pattern White Space" by
+  Unicode, which are the isspace() characters plus CHAR_NEL (newline), which is
+  U+0085 in Unicode, plus U+200E, U+200F, U+2028, and U+2029. These are a
+  subset of space characters that match \h and \v. */
+
+  if ((options & PCRE2_EXTENDED) != 0)
+    {
+    if (c < 256 && (cb->ctypes[c] & ctype_space) != 0) continue;
+#ifdef SUPPORT_UNICODE
+    if (c == CHAR_NEL || (c|1) == 0x200f || (c|1) == 0x2029) continue;
+#endif
+    if (c == CHAR_NUMBER_SIGN)
+      {
+      while (ptr < ptrend)
+        {
+        if (IS_NEWLINE(ptr))      /* For non-fixed-length newline cases, */
+          {                       /* IS_NEWLINE sets cb->nllen. */
+          ptr += cb->nllen;
+          break;
+          }
+        ptr++;
+#ifdef SUPPORT_UNICODE
+        if (utf) FORWARDCHARTEST(ptr, ptrend);
+#endif
+        }
+      continue;  /* Next character in pattern */
+      }
+    }
+
+  /* Skip over bracketed comments */
+
+  if (c == CHAR_LEFT_PARENTHESIS && ptrend - ptr >= 2 &&
+      ptr[0] == CHAR_QUESTION_MARK && ptr[1] == CHAR_NUMBER_SIGN)
+    {
+    while (++ptr < ptrend && *ptr != CHAR_RIGHT_PARENTHESIS);
+    if (ptr >= ptrend)
+      {
+      errorcode = ERR18;  /* A special error for missing ) in a comment */
+      goto FAILED;        /* to make it easier to debug. */
+      }
+    ptr++;
+    continue;  /* Next character in pattern */
+    }
+
+  /* If the next item is not a quantifier, fill in length of any previous
+  callout and create an auto callout if required. */
+
+  if (c != CHAR_ASTERISK && c != CHAR_PLUS && c != CHAR_QUESTION_MARK &&
+       (c != CHAR_LEFT_CURLY_BRACKET ||
+         (tempptr = ptr,
+         !read_repeat_counts(&tempptr, ptrend, NULL, NULL, &errorcode))))
+    {
+    if (after_manual_callout-- <= 0)
+      parsed_pattern = manage_callouts(thisptr, &previous_callout, auto_callout,
+        parsed_pattern, cb);
+    }
+
+  /* If expect_cond_assert is 2, we have just passed (?( and are expecting an
+  assertion, possibly preceded by a callout. If the value is 1, we have just
+  had the callout and expect an assertion. There must be at least 3 more
+  characters in all cases. When expect_cond_assert is 2, we know that the
+  current character is an opening parenthesis, as otherwise we wouldn't be
+  here. However, when it is 1, we need to check, and it's easiest just to check
+  always. Note that expect_cond_assert may be negative, since all callouts just
+  decrement it. */
+
+  if (expect_cond_assert > 0)
+    {
+    BOOL ok = c == CHAR_LEFT_PARENTHESIS && ptrend - ptr >= 3 &&
+              (ptr[0] == CHAR_QUESTION_MARK || ptr[0] == CHAR_ASTERISK);
+    if (ok)
+      {
+      if (ptr[0] == CHAR_ASTERISK)  /* New alpha assertion format, possibly */
+        {
+        ok = MAX_255(ptr[1]) && (cb->ctypes[ptr[1]] & ctype_lcletter) != 0;
+        }
+      else switch(ptr[1])  /* Traditional symbolic format */
+        {
+        case CHAR_C:
+        ok = expect_cond_assert == 2;
+        break;
+
+        case CHAR_EQUALS_SIGN:
+        case CHAR_EXCLAMATION_MARK:
+        break;
+
+        case CHAR_LESS_THAN_SIGN:
+        ok = ptr[2] == CHAR_EQUALS_SIGN || ptr[2] == CHAR_EXCLAMATION_MARK;
+        break;
+
+        default:
+        ok = FALSE;
+        }
+      }
+
+    if (!ok)
+      {
+      ptr--;   /* Adjust error offset */
+      errorcode = ERR28;
+      goto FAILED;
+      }
+    }
+
+  /* Remember whether we are expecting a conditional assertion, and set the
+  default for this item. */
+
+  prev_expect_cond_assert = expect_cond_assert;
+  expect_cond_assert = 0;
+
+  /* Remember quantification status for the previous significant item, then set
+  default for this item. */
+
+  prev_okquantifier = okquantifier;
+  prev_meta_quantifier = meta_quantifier;
+  okquantifier = FALSE;
+  meta_quantifier = 0;
+
+  /* If the previous significant item was a quantifier, adjust the parsed code
+  if there is a following modifier. The base meta value is always followed by
+  the PLUS and QUERY values, in that order. We do this here rather than after
+  reading a quantifier so that intervening comments and /x whitespace can be
+  ignored without having to replicate code. */
+
+  if (prev_meta_quantifier != 0 && (c == CHAR_QUESTION_MARK || c == CHAR_PLUS))
+    {
+    parsed_pattern[(prev_meta_quantifier == META_MINMAX)? -3 : -1] =
+      prev_meta_quantifier + ((c == CHAR_QUESTION_MARK)?
+        0x00020000u : 0x00010000u);
+    continue;  /* Next character in pattern */
+    }
+
+
+  /* Process the next item in the main part of a pattern. */
+
+  switch(c)
+    {
+    default:              /* Non-special character */
+    PARSED_LITERAL(c, parsed_pattern);
+    break;
+
+
+    /* ---- Escape sequence ---- */
+
+    case CHAR_BACKSLASH:
+    tempptr = ptr;
+    escape = PRIV(check_escape)(&ptr, ptrend, &c, &errorcode, options,
+      cb->cx->extra_options, FALSE, cb);
+    if (errorcode != 0)
+      {
+      ESCAPE_FAILED:
+      if ((extra_options & PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL) == 0)
+        goto FAILED;
+      ptr = tempptr;
+      if (ptr >= ptrend) c = CHAR_BACKSLASH; else
+        {
+        GETCHARINCTEST(c, ptr);   /* Get character value, increment pointer */
+        }
+      escape = 0;                 /* Treat as literal character */
+      }
+
+    /* The escape was a data escape or literal character. */
+
+    if (escape == 0)
+      {
+      PARSED_LITERAL(c, parsed_pattern);
+      }
+
+    /* The escape was a back (or forward) reference. We keep the offset in
+    order to give a more useful diagnostic for a bad forward reference. For
+    references to groups numbered less than 10 we can't use more than two items
+    in parsed_pattern because they may be just two characters in the input (and
+    in a 64-bit world an offset may need two elements). So for them, the offset
+    of the first occurrent is held in a special vector. */
+
+    else if (escape < 0)
+      {
+      offset = (PCRE2_SIZE)(ptr - cb->start_pattern - 1);
+      escape = -escape;
+      *parsed_pattern++ = META_BACKREF | (uint32_t)escape;
+      if (escape < 10)
+        {
+        if (cb->small_ref_offset[escape] == PCRE2_UNSET)
+          cb->small_ref_offset[escape] = offset;
+        }
+      else
+        {
+        PUTOFFSET(offset, parsed_pattern);
+        }
+      okquantifier = TRUE;
+      }
+
+    /* The escape was a character class such as \d etc. or other special
+    escape indicator such as \A or \X. Most of them generate just a single
+    parsed item, but \P and \p are followed by a 16-bit type and a 16-bit
+    value. They are supported only when Unicode is available. The type and
+    value are packed into a single 32-bit value so that the whole sequences
+    uses only two elements in the parsed_vector. This is because the same
+    coding is used if \d (for example) is turned into \p{Nd} when PCRE2_UCP is
+    set.
+
+    There are also some cases where the escape sequence is followed by a name:
+    \k{name}, \k<name>, and \k'name' are backreferences by name, and \g<name>
+    and \g'name' are subroutine calls by name; \g{name} is a synonym for
+    \k{name}. Note that \g<number> and \g'number' are handled by check_escape()
+    and returned as a negative value (handled above). A name is coded as an
+    offset into the pattern and a length. */
+
+    else switch (escape)
+      {
+      case ESC_C:
+#ifdef NEVER_BACKSLASH_C
+      errorcode = ERR85;
+      goto ESCAPE_FAILED;
+#else
+      if ((options & PCRE2_NEVER_BACKSLASH_C) != 0)
+        {
+        errorcode = ERR83;
+        goto ESCAPE_FAILED;
+        }
+#endif
+      okquantifier = TRUE;
+      *parsed_pattern++ = META_ESCAPE + escape;
+      break;
+
+      case ESC_X:
+#ifndef SUPPORT_UNICODE
+      errorcode = ERR45;   /* Supported only with Unicode support */
+      goto ESCAPE_FAILED;
+#endif
+      case ESC_H:
+      case ESC_h:
+      case ESC_N:
+      case ESC_R:
+      case ESC_V:
+      case ESC_v:
+      okquantifier = TRUE;
+      *parsed_pattern++ = META_ESCAPE + escape;
+      break;
+
+      default:  /* \A, \B, \b, \G, \K, \Z, \z cannot be quantified. */
+      *parsed_pattern++ = META_ESCAPE + escape;
+      break;
+
+      /* Escapes that change in UCP mode. Note that PCRE2_UCP will never be set
+      without Unicode support because it is checked when pcre2_compile() is
+      called. */
+
+      case ESC_d:
+      case ESC_D:
+      case ESC_s:
+      case ESC_S:
+      case ESC_w:
+      case ESC_W:
+      okquantifier = TRUE;
+      if ((options & PCRE2_UCP) == 0)
+        {
+        *parsed_pattern++ = META_ESCAPE + escape;
+        }
+      else
+        {
+        *parsed_pattern++ = META_ESCAPE +
+          ((escape == ESC_d || escape == ESC_s || escape == ESC_w)?
+            ESC_p : ESC_P);
+        switch(escape)
+          {
+          case ESC_d:
+          case ESC_D:
+          *parsed_pattern++ = (PT_PC << 16) | ucp_Nd;
+          break;
+
+          case ESC_s:
+          case ESC_S:
+          *parsed_pattern++ = PT_SPACE << 16;
+          break;
+
+          case ESC_w:
+          case ESC_W:
+          *parsed_pattern++ = PT_WORD << 16;
+          break;
+          }
+        }
+      break;
+
+      /* Unicode property matching */
+
+      case ESC_P:
+      case ESC_p:
+#ifdef SUPPORT_UNICODE
+        {
+        BOOL negated;
+        uint16_t ptype = 0, pdata = 0;
+        if (!get_ucp(&ptr, &negated, &ptype, &pdata, &errorcode, cb))
+          goto ESCAPE_FAILED;
+        if (negated) escape = (escape == ESC_P)? ESC_p : ESC_P;
+        *parsed_pattern++ = META_ESCAPE + escape;
+        *parsed_pattern++ = (ptype << 16) | pdata;
+        okquantifier = TRUE;
+        }
+#else
+      errorcode = ERR45;
+      goto ESCAPE_FAILED;
+#endif
+      break;  /* End \P and \p */
+
+      /* When \g is used with quotes or angle brackets as delimiters, it is a
+      numerical or named subroutine call, and control comes here. When used
+      with brace delimiters it is a numberical back reference and does not come
+      here because check_escape() returns it directly as a reference. \k is
+      always a named back reference. */
+
+      case ESC_g:
+      case ESC_k:
+      if (ptr >= ptrend || (*ptr != CHAR_LEFT_CURLY_BRACKET &&
+          *ptr != CHAR_LESS_THAN_SIGN && *ptr != CHAR_APOSTROPHE))
+        {
+        errorcode = (escape == ESC_g)? ERR57 : ERR69;
+        goto ESCAPE_FAILED;
+        }
+      terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
+        CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
+        CHAR_APOSTROPHE : CHAR_RIGHT_CURLY_BRACKET;
+
+      /* For a non-braced \g, check for a numerical recursion. */
+
+      if (escape == ESC_g && terminator != CHAR_RIGHT_CURLY_BRACKET)
+        {
+        PCRE2_SPTR p = ptr + 1;
+
+        if (read_number(&p, ptrend, cb->bracount, MAX_GROUP_NUMBER, ERR61, &i,
+            &errorcode))
+          {
+          if (p >= ptrend || *p != terminator)
+            {
+            errorcode = ERR57;
+            goto ESCAPE_FAILED;
+            }
+          ptr = p;
+          goto SET_RECURSION;
+          }
+        if (errorcode != 0) goto ESCAPE_FAILED;
+        }
+
+      /* Not a numerical recursion */
+
+      if (!read_name(&ptr, ptrend, utf, terminator, &offset, &name, &namelen,
+          &errorcode, cb)) goto ESCAPE_FAILED;
+
+      /* \k and \g when used with braces are back references, whereas \g used
+      with quotes or angle brackets is a recursion */
+
+      *parsed_pattern++ =
+        (escape == ESC_k || terminator == CHAR_RIGHT_CURLY_BRACKET)?
+          META_BACKREF_BYNAME : META_RECURSE_BYNAME;
+      *parsed_pattern++ = namelen;
+
+      PUTOFFSET(offset, parsed_pattern);
+      okquantifier = TRUE;
+      break;  /* End special escape processing */
+      }
+    break;    /* End escape sequence processing */
+
+
+    /* ---- Single-character special items ---- */
+
+    case CHAR_CIRCUMFLEX_ACCENT:
+    *parsed_pattern++ = META_CIRCUMFLEX;
+    break;
+
+    case CHAR_DOLLAR_SIGN:
+    *parsed_pattern++ = META_DOLLAR;
+    break;
+
+    case CHAR_DOT:
+    *parsed_pattern++ = META_DOT;
+    okquantifier = TRUE;
+    break;
+
+
+    /* ---- Single-character quantifiers ---- */
+
+    case CHAR_ASTERISK:
+    meta_quantifier = META_ASTERISK;
+    goto CHECK_QUANTIFIER;
+
+    case CHAR_PLUS:
+    meta_quantifier = META_PLUS;
+    goto CHECK_QUANTIFIER;
+
+    case CHAR_QUESTION_MARK:
+    meta_quantifier = META_QUERY;
+    goto CHECK_QUANTIFIER;
+
+
+    /* ---- Potential {n,m} quantifier ---- */
+
+    case CHAR_LEFT_CURLY_BRACKET:
+    if (!read_repeat_counts(&ptr, ptrend, &min_repeat, &max_repeat,
+        &errorcode))
+      {
+      if (errorcode != 0) goto FAILED;     /* Error in quantifier. */
+      PARSED_LITERAL(c, parsed_pattern);   /* Not a quantifier */
+      break;                               /* No more quantifier processing */
+      }
+    meta_quantifier = META_MINMAX;
+    /* Fall through */
+
+
+    /* ---- Quantifier post-processing ---- */
+
+    /* Check that a quantifier is allowed after the previous item. */
+
+    CHECK_QUANTIFIER:
+    if (!prev_okquantifier)
+      {
+      errorcode = ERR9;
+      goto FAILED_BACK;
+      }
+
+    /* Most (*VERB)s are not allowed to be quantified, but an ungreedy
+    quantifier can be useful for (*ACCEPT) - meaning "succeed on backtrack", a
+    sort of negated (*COMMIT). We therefore allow (*ACCEPT) to be quantified by
+    wrapping it in non-capturing brackets, but we have to allow for a preceding
+    (*MARK) for when (*ACCEPT) has an argument. */
+
+    if (parsed_pattern[-1] == META_ACCEPT)
+      {
+      uint32_t *p;
+      for (p = parsed_pattern - 1; p >= verbstartptr; p--) p[1] = p[0];
+      *verbstartptr = META_NOCAPTURE;
+      parsed_pattern[1] = META_KET;
+      parsed_pattern += 2;
+      }
+
+    /* Now we can put the quantifier into the parsed pattern vector. At this
+    stage, we have only the basic quantifier. The check for a following + or ?
+    modifier happens at the top of the loop, after any intervening comments
+    have been removed. */
+
+    *parsed_pattern++ = meta_quantifier;
+    if (c == CHAR_LEFT_CURLY_BRACKET)
+      {
+      *parsed_pattern++ = min_repeat;
+      *parsed_pattern++ = max_repeat;
+      }
+    break;
+
+
+    /* ---- Character class ---- */
+
+    case CHAR_LEFT_SQUARE_BRACKET:
+    okquantifier = TRUE;
+
+    /* In another (POSIX) regex library, the ugly syntax [[:<:]] and [[:>:]] is
+    used for "start of word" and "end of word". As these are otherwise illegal
+    sequences, we don't break anything by recognizing them. They are replaced
+    by \b(?=\w) and \b(?<=\w) respectively. Sequences like [a[:<:]] are
+    erroneous and are handled by the normal code below. */
+
+    if (ptrend - ptr >= 6 &&
+         (PRIV(strncmp_c8)(ptr, STRING_WEIRD_STARTWORD, 6) == 0 ||
+          PRIV(strncmp_c8)(ptr, STRING_WEIRD_ENDWORD, 6) == 0))
+      {
+      *parsed_pattern++ = META_ESCAPE + ESC_b;
+
+      if (ptr[2] == CHAR_LESS_THAN_SIGN)
+        {
+        *parsed_pattern++ = META_LOOKAHEAD;
+        }
+      else
+        {
+        *parsed_pattern++ = META_LOOKBEHIND;
+        *has_lookbehind = TRUE;
+
+        /* The offset is used only for the "non-fixed length" error; this won't
+        occur here, so just store zero. */
+
+        PUTOFFSET((PCRE2_SIZE)0, parsed_pattern);
+        }
+
+      if ((options & PCRE2_UCP) == 0)
+        *parsed_pattern++ = META_ESCAPE + ESC_w;
+      else
+        {
+        *parsed_pattern++ = META_ESCAPE + ESC_p;
+        *parsed_pattern++ = PT_WORD << 16;
+        }
+      *parsed_pattern++ = META_KET;
+      ptr += 6;
+      break;
+      }
+
+    /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
+    they are encountered at the top level, so we'll do that too. */
+
+    if (ptr < ptrend && (*ptr == CHAR_COLON || *ptr == CHAR_DOT ||
+         *ptr == CHAR_EQUALS_SIGN) &&
+        check_posix_syntax(ptr, ptrend, &tempptr))
+      {
+      errorcode = (*ptr-- == CHAR_COLON)? ERR12 : ERR13;
+      goto FAILED;
+      }
+
+    /* Process a regular character class. If the first character is '^', set
+    the negation flag. If the first few characters (either before or after ^)
+    are \Q\E or \E or space or tab in extended-more mode, we skip them too.
+    This makes for compatibility with Perl. */
+
+    negate_class = FALSE;
+    while (ptr < ptrend)
+      {
+      GETCHARINCTEST(c, ptr);
+      if (c == CHAR_BACKSLASH)
+        {
+        if (ptr < ptrend && *ptr == CHAR_E) ptr++;
+        else if (ptrend - ptr >= 3 &&
+             PRIV(strncmp_c8)(ptr, STR_Q STR_BACKSLASH STR_E, 3) == 0)
+          ptr += 3;
+        else
+          break;
+        }
+      else if ((options & PCRE2_EXTENDED_MORE) != 0 &&
+               (c == CHAR_SPACE || c == CHAR_HT))  /* Note: just these two */
+        continue;
+      else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
+        negate_class = TRUE;
+      else break;
+      }
+
+    /* Now the real contents of the class; c has the first "real" character.
+    Empty classes are permitted only if the option is set. */
+
+    if (c == CHAR_RIGHT_SQUARE_BRACKET &&
+        (cb->external_options & PCRE2_ALLOW_EMPTY_CLASS) != 0)
+      {
+      *parsed_pattern++ = negate_class? META_CLASS_EMPTY_NOT : META_CLASS_EMPTY;
+      break;  /* End of class processing */
+      }
+
+    /* Process a non-empty class. */
+
+    *parsed_pattern++ = negate_class? META_CLASS_NOT : META_CLASS;
+    class_range_state = RANGE_NO;
+
+    /* In an EBCDIC environment, Perl treats alphabetic ranges specially
+    because there are holes in the encoding, and simply using the range A-Z
+    (for example) would include the characters in the holes. This applies only
+    to ranges where both values are literal; [\xC1-\xE9] is different to [A-Z]
+    in this respect. In order to accommodate this, we keep track of whether
+    character values are literal or not, and a state variable for handling
+    ranges. */
+
+    /* Loop for the contents of the class */
+
+    for (;;)
+      {
+      BOOL char_is_literal = TRUE;
+
+      /* Inside \Q...\E everything is literal except \E */
+
+      if (inescq)
+        {
+        if (c == CHAR_BACKSLASH && ptr < ptrend && *ptr == CHAR_E)
+          {
+          inescq = FALSE;                   /* Reset literal state */
+          ptr++;                            /* Skip the 'E' */
+          goto CLASS_CONTINUE;
+          }
+        goto CLASS_LITERAL;
+        }
+
+      /* Skip over space and tab (only) in extended-more mode. */
+
+      if ((options & PCRE2_EXTENDED_MORE) != 0 &&
+          (c == CHAR_SPACE || c == CHAR_HT))
+        goto CLASS_CONTINUE;
+
+      /* Handle POSIX class names. Perl allows a negation extension of the
+      form [:^name:]. A square bracket that doesn't match the syntax is
+      treated as a literal. We also recognize the POSIX constructions
+      [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
+      5.6 and 5.8 do. */
+
+      if (c == CHAR_LEFT_SQUARE_BRACKET &&
+          ptrend - ptr >= 3 &&
+          (*ptr == CHAR_COLON || *ptr == CHAR_DOT ||
+           *ptr == CHAR_EQUALS_SIGN) &&
+          check_posix_syntax(ptr, ptrend, &tempptr))
+        {
+        BOOL posix_negate = FALSE;
+        int posix_class;
+
+        /* Perl treats a hyphen before a POSIX class as a literal, not the
+        start of a range. However, it gives a warning in its warning mode. PCRE
+        does not have a warning mode, so we give an error, because this is
+        likely an error on the user's part. */
+
+        if (class_range_state == RANGE_STARTED)
+          {
+          errorcode = ERR50;
+          goto FAILED;
+          }
+
+        if (*ptr != CHAR_COLON)
+          {
+          errorcode = ERR13;
+          goto FAILED_BACK;
+          }
+
+        if (*(++ptr) == CHAR_CIRCUMFLEX_ACCENT)
+          {
+          posix_negate = TRUE;
+          ptr++;
+          }
+
+        posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
+        if (posix_class < 0)
+          {
+          errorcode = ERR30;
+          goto FAILED;
+          }
+        ptr = tempptr + 2;
+
+        /* Perl treats a hyphen after a POSIX class as a literal, not the
+        start of a range. However, it gives a warning in its warning mode
+        unless the hyphen is the last character in the class. PCRE does not
+        have a warning mode, so we give an error, because this is likely an
+        error on the user's part. */
+
+        if (ptr < ptrend - 1 && *ptr == CHAR_MINUS &&
+            ptr[1] != CHAR_RIGHT_SQUARE_BRACKET)
+          {
+          errorcode = ERR50;
+          goto FAILED;
+          }
+
+        /* Set "a hyphen is not the start of a range" for the -] case, and also
+        in case the POSIX class is followed by \E or \Q\E (possibly repeated -
+        fuzzers do that kind of thing) and *then* a hyphen. This causes that
+        hyphen to be treated as a literal. I don't think it's worth setting up
+        special apparatus to do otherwise. */
+
+        class_range_state = RANGE_NO;
+
+        /* When PCRE2_UCP is set, some of the POSIX classes are converted to
+        use Unicode properties \p or \P or, in one case, \h or \H. The
+        substitutes table has two values per class, containing the type and
+        value of a \p or \P item. The special cases are specified with a
+        negative type: a non-zero value causes \h or \H to be used, and a zero
+        value falls through to behave like a non-UCP POSIX class. */
+
+#ifdef SUPPORT_UNICODE
+        if ((options & PCRE2_UCP) != 0)
+          {
+          int ptype = posix_substitutes[2*posix_class];
+          int pvalue = posix_substitutes[2*posix_class + 1];
+          if (ptype >= 0)
+            {
+            *parsed_pattern++ = META_ESCAPE + (posix_negate? ESC_P : ESC_p);
+            *parsed_pattern++ = (ptype << 16) | pvalue;
+            goto CLASS_CONTINUE;
+            }
+
+          if (pvalue != 0)
+            {
+            *parsed_pattern++ = META_ESCAPE + (posix_negate? ESC_H : ESC_h);
+            goto CLASS_CONTINUE;
+            }
+
+          /* Fall through */
+          }
+#endif  /* SUPPORT_UNICODE */
+
+        /* Non-UCP POSIX class */
+
+        *parsed_pattern++ = posix_negate? META_POSIX_NEG : META_POSIX;
+        *parsed_pattern++ = posix_class;
+        }
+
+      /* Handle potential start of range */
+
+      else if (c == CHAR_MINUS && class_range_state >= RANGE_OK_ESCAPED)
+        {
+        *parsed_pattern++ = (class_range_state == RANGE_OK_LITERAL)?
+          META_RANGE_LITERAL : META_RANGE_ESCAPED;
+        class_range_state = RANGE_STARTED;
+        }
+
+      /* Handle a literal character */
+
+      else if (c != CHAR_BACKSLASH)
+        {
+        CLASS_LITERAL:
+        if (class_range_state == RANGE_STARTED)
+          {
+          if (c == parsed_pattern[-2])       /* Optimize one-char range */
+            parsed_pattern--;
+          else if (parsed_pattern[-2] > c)   /* Check range is in order */
+            {
+            errorcode = ERR8;
+            goto FAILED_BACK;
+            }
+          else
+            {
+            if (!char_is_literal && parsed_pattern[-1] == META_RANGE_LITERAL)
+              parsed_pattern[-1] = META_RANGE_ESCAPED;
+            PARSED_LITERAL(c, parsed_pattern);
+            }
+          class_range_state = RANGE_NO;
+          }
+        else  /* Potential start of range */
+          {
+          class_range_state = char_is_literal?
+            RANGE_OK_LITERAL : RANGE_OK_ESCAPED;
+          PARSED_LITERAL(c, parsed_pattern);
+          }
+        }
+
+      /* Handle escapes in a class */
+
+      else
+        {
+        tempptr = ptr;
+        escape = PRIV(check_escape)(&ptr, ptrend, &c, &errorcode, options,
+          cb->cx->extra_options, TRUE, cb);
+
+        if (errorcode != 0)
+          {
+          if ((extra_options & PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL) == 0)
+            goto FAILED;
+          ptr = tempptr;
+          if (ptr >= ptrend) c = CHAR_BACKSLASH; else
+            {
+            GETCHARINCTEST(c, ptr);   /* Get character value, increment pointer */
+            }
+          escape = 0;                 /* Treat as literal character */
+          }
+
+        switch(escape)
+          {
+          case 0:  /* Escaped character code point is in c */
+          char_is_literal = FALSE;
+          goto CLASS_LITERAL;
+
+          case ESC_b:
+          c = CHAR_BS;    /* \b is backspace in a class */
+          char_is_literal = FALSE;
+          goto CLASS_LITERAL;
+
+          case ESC_Q:
+          inescq = TRUE;  /* Enter literal mode */
+          goto CLASS_CONTINUE;
+
+          case ESC_E:     /* Ignore orphan \E */
+          goto CLASS_CONTINUE;
+
+          case ESC_B:     /* Always an error in a class */
+          case ESC_R:
+          case ESC_X:
+          errorcode = ERR7;
+          ptr--;
+          goto FAILED;
+          }
+
+        /* The second part of a range can be a single-character escape
+        sequence (detected above), but not any of the other escapes. Perl
+        treats a hyphen as a literal in such circumstances. However, in Perl's
+        warning mode, a warning is given, so PCRE now faults it, as it is
+        almost certainly a mistake on the user's part. */
+
+        if (class_range_state == RANGE_STARTED)
+          {
+          errorcode = ERR50;
+          goto FAILED;  /* Not CLASS_ESCAPE_FAILED; always an error */
+          }
+
+        /* Of the remaining escapes, only those that define characters are
+        allowed in a class. None may start a range. */
+
+        class_range_state = RANGE_NO;
+        switch(escape)
+          {
+          case ESC_N:
+          errorcode = ERR71;
+          goto FAILED;
+
+          case ESC_H:
+          case ESC_h:
+          case ESC_V:
+          case ESC_v:
+          *parsed_pattern++ = META_ESCAPE + escape;
+          break;
+
+          /* These escapes are converted to Unicode property tests when
+          PCRE2_UCP is set. */
+
+          case ESC_d:
+          case ESC_D:
+          case ESC_s:
+          case ESC_S:
+          case ESC_w:
+          case ESC_W:
+          if ((options & PCRE2_UCP) == 0)
+            {
+            *parsed_pattern++ = META_ESCAPE + escape;
+            }
+          else
+            {
+            *parsed_pattern++ = META_ESCAPE +
+              ((escape == ESC_d || escape == ESC_s || escape == ESC_w)?
+                ESC_p : ESC_P);
+            switch(escape)
+              {
+              case ESC_d:
+              case ESC_D:
+              *parsed_pattern++ = (PT_PC << 16) | ucp_Nd;
+              break;
+
+              case ESC_s:
+              case ESC_S:
+              *parsed_pattern++ = PT_SPACE << 16;
+              break;
+
+              case ESC_w:
+              case ESC_W:
+              *parsed_pattern++ = PT_WORD << 16;
+              break;
+              }
+            }
+          break;
+
+          /* Explicit Unicode property matching */
+
+          case ESC_P:
+          case ESC_p:
+#ifdef SUPPORT_UNICODE
+            {
+            BOOL negated;
+            uint16_t ptype = 0, pdata = 0;
+            if (!get_ucp(&ptr, &negated, &ptype, &pdata, &errorcode, cb))
+              goto FAILED;
+            if (negated) escape = (escape == ESC_P)? ESC_p : ESC_P;
+            *parsed_pattern++ = META_ESCAPE + escape;
+            *parsed_pattern++ = (ptype << 16) | pdata;
+            }
+#else
+          errorcode = ERR45;
+          goto FAILED;
+#endif
+          break;  /* End \P and \p */
+
+          default:    /* All others are not allowed in a class */
+          errorcode = ERR7;
+          ptr--;
+          goto FAILED;
+          }
+
+        /* Perl gives a warning unless a following hyphen is the last character
+        in the class. PCRE throws an error. */
+
+        if (ptr < ptrend - 1 && *ptr == CHAR_MINUS &&
+            ptr[1] != CHAR_RIGHT_SQUARE_BRACKET)
+          {
+          errorcode = ERR50;
+          goto FAILED;
+          }
+        }
+
+      /* Proceed to next thing in the class. */
+
+      CLASS_CONTINUE:
+      if (ptr >= ptrend)
+        {
+        errorcode = ERR6;  /* Missing terminating ']' */
+        goto FAILED;
+        }
+      GETCHARINCTEST(c, ptr);
+      if (c == CHAR_RIGHT_SQUARE_BRACKET && !inescq) break;
+      }     /* End of class-processing loop */
+
+    /* -] at the end of a class is a literal '-' */
+
+    if (class_range_state == RANGE_STARTED)
+      {
+      parsed_pattern[-1] = CHAR_MINUS;
+      class_range_state = RANGE_NO;
+      }
+
+    *parsed_pattern++ = META_CLASS_END;
+    break;  /* End of character class */
+
+
+    /* ---- Opening parenthesis ---- */
+
+    case CHAR_LEFT_PARENTHESIS:
+    if (ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
+
+    /* If ( is not followed by ? it is either a capture or a special verb or an
+    alpha assertion or a positive non-atomic lookahead. */
+
+    if (*ptr != CHAR_QUESTION_MARK)
+      {
+      const char *vn;
+
+      /* Handle capturing brackets (or non-capturing if auto-capture is turned
+      off). */
+
+      if (*ptr != CHAR_ASTERISK)
+        {
+        nest_depth++;
+        if ((options & PCRE2_NO_AUTO_CAPTURE) == 0)
+          {
+          if (cb->bracount >= MAX_GROUP_NUMBER)
+            {
+            errorcode = ERR97;
+            goto FAILED;
+            }
+          cb->bracount++;
+          *parsed_pattern++ = META_CAPTURE | cb->bracount;
+          }
+        else *parsed_pattern++ = META_NOCAPTURE;
+        }
+
+      /* Do nothing for (* followed by end of pattern or ) so it gives a "bad
+      quantifier" error rather than "(*MARK) must have an argument". */
+
+      else if (ptrend - ptr <= 1 || (c = ptr[1]) == CHAR_RIGHT_PARENTHESIS)
+        break;
+
+      /* Handle "alpha assertions" such as (*pla:...). Most of these are
+      synonyms for the historical symbolic assertions, but the script run and
+      non-atomic lookaround ones are new. They are distinguished by starting
+      with a lower case letter. Checking both ends of the alphabet makes this
+      work in all character codes. */
+
+      else if (CHMAX_255(c) && (cb->ctypes[c] & ctype_lcletter) != 0)
+        {
+        uint32_t meta;
+
+        vn = alasnames;
+        if (!read_name(&ptr, ptrend, utf, 0, &offset, &name, &namelen,
+          &errorcode, cb)) goto FAILED;
+        if (ptr >= ptrend || *ptr != CHAR_COLON)
+          {
+          errorcode = ERR95;  /* Malformed */
+          goto FAILED;
+          }
+
+        /* Scan the table of alpha assertion names */
+
+        for (i = 0; i < alascount; i++)
+          {
+          if (namelen == alasmeta[i].len &&
+              PRIV(strncmp_c8)(name, vn, namelen) == 0)
+            break;
+          vn += alasmeta[i].len + 1;
+          }
+
+        if (i >= alascount)
+          {
+          errorcode = ERR95;  /* Alpha assertion not recognized */
+          goto FAILED;
+          }
+
+        /* Check for expecting an assertion condition. If so, only atomic
+        lookaround assertions are valid. */
+
+        meta = alasmeta[i].meta;
+        if (prev_expect_cond_assert > 0 &&
+            (meta < META_LOOKAHEAD || meta > META_LOOKBEHINDNOT))
+          {
+          errorcode = (meta == META_LOOKAHEAD_NA || meta == META_LOOKBEHIND_NA)?
+            ERR98 : ERR28;  /* (Atomic) assertion expected */
+          goto FAILED;
+          }
+
+        /* The lookaround alphabetic synonyms can mostly be handled by jumping
+        to the code that handles the traditional symbolic forms. */
+
+        switch(meta)
+          {
+          default:
+          errorcode = ERR89;  /* Unknown code; should never occur because */
+          goto FAILED;        /* the meta values come from a table above. */
+
+          case META_ATOMIC:
+          goto ATOMIC_GROUP;
+
+          case META_LOOKAHEAD:
+          goto POSITIVE_LOOK_AHEAD;
+
+          case META_LOOKAHEAD_NA:
+          goto POSITIVE_NONATOMIC_LOOK_AHEAD;
+
+          case META_LOOKAHEADNOT:
+          goto NEGATIVE_LOOK_AHEAD;
+
+          case META_LOOKBEHIND:
+          case META_LOOKBEHINDNOT:
+          case META_LOOKBEHIND_NA:
+          *parsed_pattern++ = meta;
+          ptr--;
+          goto POST_LOOKBEHIND;
+
+          /* The script run facilities are handled here. Unicode support is
+          required (give an error if not, as this is a security issue). Always
+          record a META_SCRIPT_RUN item. Then, for the atomic version, insert
+          META_ATOMIC and remember that we need two META_KETs at the end. */
+
+          case META_SCRIPT_RUN:
+          case META_ATOMIC_SCRIPT_RUN:
+#ifdef SUPPORT_UNICODE
+          *parsed_pattern++ = META_SCRIPT_RUN;
+          nest_depth++;
+          ptr++;
+          if (meta == META_ATOMIC_SCRIPT_RUN)
+            {
+            *parsed_pattern++ = META_ATOMIC;
+            if (top_nest == NULL) top_nest = (nest_save *)(cb->start_workspace);
+            else if (++top_nest >= end_nests)
+              {
+              errorcode = ERR84;
+              goto FAILED;
+              }
+            top_nest->nest_depth = nest_depth;
+            top_nest->flags = NSF_ATOMICSR;
+            top_nest->options = options & PARSE_TRACKED_OPTIONS;
+            }
+          break;
+#else  /* SUPPORT_UNICODE */
+          errorcode = ERR96;
+          goto FAILED;
+#endif
+          }
+        }
+
+
+      /* ---- Handle (*VERB) and (*VERB:NAME) ---- */
+
+      else
+        {
+        vn = verbnames;
+        if (!read_name(&ptr, ptrend, utf, 0, &offset, &name, &namelen,
+          &errorcode, cb)) goto FAILED;
+        if (ptr >= ptrend || (*ptr != CHAR_COLON &&
+                              *ptr != CHAR_RIGHT_PARENTHESIS))
+          {
+          errorcode = ERR60;  /* Malformed */
+          goto FAILED;
+          }
+
+        /* Scan the table of verb names */
+
+        for (i = 0; i < verbcount; i++)
+          {
+          if (namelen == verbs[i].len &&
+              PRIV(strncmp_c8)(name, vn, namelen) == 0)
+            break;
+          vn += verbs[i].len + 1;
+          }
+
+        if (i >= verbcount)
+          {
+          errorcode = ERR60;  /* Verb not recognized */
+          goto FAILED;
+          }
+
+        /* An empty argument is treated as no argument. */
+
+        if (*ptr == CHAR_COLON && ptr + 1 < ptrend &&
+             ptr[1] == CHAR_RIGHT_PARENTHESIS)
+          ptr++;    /* Advance to the closing parens */
+
+        /* Check for mandatory non-empty argument; this is (*MARK) */
+
+        if (verbs[i].has_arg > 0 && *ptr != CHAR_COLON)
+          {
+          errorcode = ERR66;
+          goto FAILED;
+          }
+
+        /* Remember where this verb, possibly with a preceding (*MARK), starts,
+        for handling quantified (*ACCEPT). */
+
+        verbstartptr = parsed_pattern;
+        okquantifier = (verbs[i].meta == META_ACCEPT);
+
+        /* It appears that Perl allows any characters whatsoever, other than a
+        closing parenthesis, to appear in arguments ("names"), so we no longer
+        insist on letters, digits, and underscores. Perl does not, however, do
+        any interpretation within arguments, and has no means of including a
+        closing parenthesis. PCRE supports escape processing but only when it
+        is requested by an option. We set inverbname TRUE here, and let the
+        main loop take care of this so that escape and \x processing is done by
+        the main code above. */
+
+        if (*ptr++ == CHAR_COLON)   /* Skip past : or ) */
+          {
+          /* Some optional arguments can be treated as a preceding (*MARK) */
+
+          if (verbs[i].has_arg < 0)
+            {
+            add_after_mark = verbs[i].meta;
+            *parsed_pattern++ = META_MARK;
+            }
+
+          /* The remaining verbs with arguments (except *MARK) need a different
+          opcode. */
+
+          else
+            {
+            *parsed_pattern++ = verbs[i].meta +
+              ((verbs[i].meta != META_MARK)? 0x00010000u:0);
+            }
+
+          /* Set up for reading the name in the main loop. */
+
+          verblengthptr = parsed_pattern++;
+          verbnamestart = ptr;
+          inverbname = TRUE;
+          }
+        else  /* No verb "name" argument */
+          {
+          *parsed_pattern++ = verbs[i].meta;
+          }
+        }     /* End of (*VERB) handling */
+      break;  /* Done with this parenthesis */
+      }       /* End of groups that don't start with (? */
+
+
+    /* ---- Items starting (? ---- */
+
+    /* The type of item is determined by what follows (?. Handle (?| and option
+    changes under "default" because both need a new block on the nest stack.
+    Comments starting with (?# are handled above. Note that there is some
+    ambiguity about the sequence (?- because if a digit follows it's a relative
+    recursion or subroutine call whereas otherwise it's an option unsetting. */
+
+    if (++ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
+
+    switch(*ptr)
+      {
+      default:
+      if (*ptr == CHAR_MINUS && ptrend - ptr > 1 && IS_DIGIT(ptr[1]))
+        goto RECURSION_BYNUMBER;  /* The + case is handled by CHAR_PLUS */
+
+      /* We now have either (?| or a (possibly empty) option setting,
+      optionally followed by a non-capturing group. */
+
+      nest_depth++;
+      if (top_nest == NULL) top_nest = (nest_save *)(cb->start_workspace);
+      else if (++top_nest >= end_nests)
+        {
+        errorcode = ERR84;
+        goto FAILED;
+        }
+      top_nest->nest_depth = nest_depth;
+      top_nest->flags = 0;
+      top_nest->options = options & PARSE_TRACKED_OPTIONS;
+
+      /* Start of non-capturing group that resets the capture count for each
+      branch. */
+
+      if (*ptr == CHAR_VERTICAL_LINE)
+        {
+        top_nest->reset_group = (uint16_t)cb->bracount;
+        top_nest->max_group = (uint16_t)cb->bracount;
+        top_nest->flags |= NSF_RESET;
+        cb->external_flags |= PCRE2_DUPCAPUSED;
+        *parsed_pattern++ = META_NOCAPTURE;
+        ptr++;
+        }
+
+      /* Scan for options imnsxJU to be set or unset. */
+
+      else
+        {
+        BOOL hyphenok = TRUE;
+        uint32_t oldoptions = options;
+
+        top_nest->reset_group = 0;
+        top_nest->max_group = 0;
+        set = unset = 0;
+        optset = &set;
+
+        /* ^ at the start unsets imnsx and disables the subsequent use of - */
+
+        if (ptr < ptrend && *ptr == CHAR_CIRCUMFLEX_ACCENT)
+          {
+          options &= ~(PCRE2_CASELESS|PCRE2_MULTILINE|PCRE2_NO_AUTO_CAPTURE|
+                       PCRE2_DOTALL|PCRE2_EXTENDED|PCRE2_EXTENDED_MORE);
+          hyphenok = FALSE;
+          ptr++;
+          }
+
+        while (ptr < ptrend && *ptr != CHAR_RIGHT_PARENTHESIS &&
+                               *ptr != CHAR_COLON)
+          {
+          switch (*ptr++)
+            {
+            case CHAR_MINUS:
+            if (!hyphenok)
+              {
+              errorcode = ERR94;
+              ptr--;  /* Correct the offset */
+              goto FAILED;
+              }
+            optset = &unset;
+            hyphenok = FALSE;
+            break;
+
+            case CHAR_J:  /* Record that it changed in the external options */
+            *optset |= PCRE2_DUPNAMES;
+            cb->external_flags |= PCRE2_JCHANGED;
+            break;
+
+            case CHAR_i: *optset |= PCRE2_CASELESS; break;
+            case CHAR_m: *optset |= PCRE2_MULTILINE; break;
+            case CHAR_n: *optset |= PCRE2_NO_AUTO_CAPTURE; break;
+            case CHAR_s: *optset |= PCRE2_DOTALL; break;
+            case CHAR_U: *optset |= PCRE2_UNGREEDY; break;
+
+            /* If x appears twice it sets the extended extended option. */
+
+            case CHAR_x:
+            *optset |= PCRE2_EXTENDED;
+            if (ptr < ptrend && *ptr == CHAR_x)
+              {
+              *optset |= PCRE2_EXTENDED_MORE;
+              ptr++;
+              }
+            break;
+
+            default:
+            errorcode = ERR11;
+            ptr--;    /* Correct the offset */
+            goto FAILED;
+            }
+          }
+
+        /* If we are setting extended without extended-more, ensure that any
+        existing extended-more gets unset. Also, unsetting extended must also
+        unset extended-more. */
+
+        if ((set & (PCRE2_EXTENDED|PCRE2_EXTENDED_MORE)) == PCRE2_EXTENDED ||
+            (unset & PCRE2_EXTENDED) != 0)
+          unset |= PCRE2_EXTENDED_MORE;
+
+        options = (options | set) & (~unset);
+
+        /* If the options ended with ')' this is not the start of a nested
+        group with option changes, so the options change at this level.
+        In this case, if the previous level set up a nest block, discard the
+        one we have just created. Otherwise adjust it for the previous level.
+        If the options ended with ':' we are starting a non-capturing group,
+        possibly with an options setting. */
+
+        if (ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
+        if (*ptr++ == CHAR_RIGHT_PARENTHESIS)
+          {
+          nest_depth--;  /* This is not a nested group after all. */
+          if (top_nest > (nest_save *)(cb->start_workspace) &&
+              (top_nest-1)->nest_depth == nest_depth) top_nest--;
+          else top_nest->nest_depth = nest_depth;
+          }
+        else *parsed_pattern++ = META_NOCAPTURE;
+
+        /* If nothing changed, no need to record. */
+
+        if (options != oldoptions)
+          {
+          *parsed_pattern++ = META_OPTIONS;
+          *parsed_pattern++ = options;
+          }
+        }     /* End options processing */
+      break;  /* End default case after (? */
+
+
+      /* ---- Python syntax support ---- */
+
+      case CHAR_P:
+      if (++ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
+
+      /* (?P<name> is the same as (?<name>, which defines a named group. */
+
+      if (*ptr == CHAR_LESS_THAN_SIGN)
+        {
+        terminator = CHAR_GREATER_THAN_SIGN;
+        goto DEFINE_NAME;
+        }
+
+      /* (?P>name) is the same as (?&name), which is a recursion or subroutine
+      call. */
+
+      if (*ptr == CHAR_GREATER_THAN_SIGN) goto RECURSE_BY_NAME;
+
+      /* (?P=name) is the same as \k<name>, a back reference by name. Anything
+      else after (?P is an error. */
+
+      if (*ptr != CHAR_EQUALS_SIGN)
+        {
+        errorcode = ERR41;
+        goto FAILED;
+        }
+      if (!read_name(&ptr, ptrend, utf, CHAR_RIGHT_PARENTHESIS, &offset, &name,
+          &namelen, &errorcode, cb)) goto FAILED;
+      *parsed_pattern++ = META_BACKREF_BYNAME;
+      *parsed_pattern++ = namelen;
+      PUTOFFSET(offset, parsed_pattern);
+      okquantifier = TRUE;
+      break;   /* End of (?P processing */
+
+
+      /* ---- Recursion/subroutine calls by number ---- */
+
+      case CHAR_R:
+      i = 0;         /* (?R) == (?R0) */
+      ptr++;
+      if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS)
+        {
+        errorcode = ERR58;
+        goto FAILED;
+        }
+      goto SET_RECURSION;
+
+      /* An item starting (?- followed by a digit comes here via the "default"
+      case because (?- followed by a non-digit is an options setting. */
+
+      case CHAR_PLUS:
+      if (ptrend - ptr < 2 || !IS_DIGIT(ptr[1]))
+        {
+        errorcode = ERR29;   /* Missing number */
+        goto FAILED;
+        }
+      /* Fall through */
+
+      case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:
+      case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
+      RECURSION_BYNUMBER:
+      if (!read_number(&ptr, ptrend,
+          (IS_DIGIT(*ptr))? -1:(int)(cb->bracount), /* + and - are relative */
+          MAX_GROUP_NUMBER, ERR61,
+          &i, &errorcode)) goto FAILED;
+      if (i < 0)  /* NB (?0) is permitted */
+        {
+        errorcode = ERR15;   /* Unknown group */
+        goto FAILED_BACK;
+        }
+      if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS)
+        goto UNCLOSED_PARENTHESIS;
+
+      SET_RECURSION:
+      *parsed_pattern++ = META_RECURSE | (uint32_t)i;
+      offset = (PCRE2_SIZE)(ptr - cb->start_pattern);
+      ptr++;
+      PUTOFFSET(offset, parsed_pattern);
+      okquantifier = TRUE;
+      break;  /* End of recursive call by number handling */
+
+
+      /* ---- Recursion/subroutine calls by name ---- */
+
+      case CHAR_AMPERSAND:
+      RECURSE_BY_NAME:
+      if (!read_name(&ptr, ptrend, utf, CHAR_RIGHT_PARENTHESIS, &offset, &name,
+          &namelen, &errorcode, cb)) goto FAILED;
+      *parsed_pattern++ = META_RECURSE_BYNAME;
+      *parsed_pattern++ = namelen;
+      PUTOFFSET(offset, parsed_pattern);
+      okquantifier = TRUE;
+      break;
+
+      /* ---- Callout with numerical or string argument ---- */
+
+      case CHAR_C:
+      if (++ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
+
+      /* If the previous item was a condition starting (?(? an assertion,
+      optionally preceded by a callout, is expected. This is checked later on,
+      during actual compilation. However we need to identify this kind of
+      assertion in this pass because it must not be qualified. The value of
+      expect_cond_assert is set to 2 after (?(? is processed. We decrement it
+      for a callout - still leaving a positive value that identifies the
+      assertion. Multiple callouts or any other items will make it zero or
+      less, which doesn't matter because they will cause an error later. */
+
+      expect_cond_assert = prev_expect_cond_assert - 1;
+
+      /* If previous_callout is not NULL, it means this follows a previous
+      callout. If it was a manual callout, do nothing; this means its "length
+      of next pattern item" field will remain zero. If it was an automatic
+      callout, abolish it. */
+
+      if (previous_callout != NULL && (options & PCRE2_AUTO_CALLOUT) != 0 &&
+          previous_callout == parsed_pattern - 4 &&
+          parsed_pattern[-1] == 255)
+        parsed_pattern = previous_callout;
+
+      /* Save for updating next pattern item length, and skip one item before
+      completing. */
+
+      previous_callout = parsed_pattern;
+      after_manual_callout = 1;
+
+      /* Handle a string argument; specific delimiter is required. */
+
+      if (*ptr != CHAR_RIGHT_PARENTHESIS && !IS_DIGIT(*ptr))
+        {
+        PCRE2_SIZE calloutlength;
+        PCRE2_SPTR startptr = ptr;
+
+        delimiter = 0;
+        for (i = 0; PRIV(callout_start_delims)[i] != 0; i++)
+          {
+          if (*ptr == PRIV(callout_start_delims)[i])
+            {
+            delimiter = PRIV(callout_end_delims)[i];
+            break;
+            }
+          }
+        if (delimiter == 0)
+          {
+          errorcode = ERR82;
+          goto FAILED;
+          }
+
+        *parsed_pattern = META_CALLOUT_STRING;
+        parsed_pattern += 3;   /* Skip pattern info */
+
+        for (;;)
+          {
+          if (++ptr >= ptrend)
+            {
+            errorcode = ERR81;
+            ptr = startptr;   /* To give a more useful message */
+            goto FAILED;
+            }
+          if (*ptr == delimiter && (++ptr >= ptrend || *ptr != delimiter))
+            break;
+          }
+
+        calloutlength = (PCRE2_SIZE)(ptr - startptr);
+        if (calloutlength > UINT32_MAX)
+          {
+          errorcode = ERR72;
+          goto FAILED;
+          }
+        *parsed_pattern++ = (uint32_t)calloutlength;
+        offset = (PCRE2_SIZE)(startptr - cb->start_pattern);
+        PUTOFFSET(offset, parsed_pattern);
+        }
+
+      /* Handle a callout with an optional numerical argument, which must be
+      less than or equal to 255. A missing argument gives 0. */
+
+      else
+        {
+        int n = 0;
+        *parsed_pattern = META_CALLOUT_NUMBER;     /* Numerical callout */
+        parsed_pattern += 3;                       /* Skip pattern info */
+        while (ptr < ptrend && IS_DIGIT(*ptr))
+          {
+          n = n * 10 + *ptr++ - CHAR_0;
+          if (n > 255)
+            {
+            errorcode = ERR38;
+            goto FAILED;
+            }
+          }
+        *parsed_pattern++ = n;
+        }
+
+      /* Both formats must have a closing parenthesis */
+
+      if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS)
+        {
+        errorcode = ERR39;
+        goto FAILED;
+        }
+      ptr++;
+
+      /* Remember the offset to the next item in the pattern, and set a default
+      length. This should get updated after the next item is read. */
+
+      previous_callout[1] = (uint32_t)(ptr - cb->start_pattern);
+      previous_callout[2] = 0;
+      break;                  /* End callout */
+
+
+      /* ---- Conditional group ---- */
+
+      /* A condition can be an assertion, a number (referring to a numbered
+      group's having been set), a name (referring to a named group), or 'R',
+      referring to overall recursion. R<digits> and R&name are also permitted
+      for recursion state tests. Numbers may be preceded by + or - to specify a
+      relative group number.
+
+      There are several syntaxes for testing a named group: (?(name)) is used
+      by Python; Perl 5.10 onwards uses (?(<name>) or (?('name')).
+
+      There are two unfortunate ambiguities. 'R' can be the recursive thing or
+      the name 'R' (and similarly for 'R' followed by digits). 'DEFINE' can be
+      the Perl DEFINE feature or the Python named test. We look for a name
+      first; if not found, we try the other case.
+
+      For compatibility with auto-callouts, we allow a callout to be specified
+      before a condition that is an assertion. */
+
+      case CHAR_LEFT_PARENTHESIS:
+      if (++ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
+      nest_depth++;
+
+      /* If the next character is ? or * there must be an assertion next
+      (optionally preceded by a callout). We do not check this here, but
+      instead we set expect_cond_assert to 2. If this is still greater than
+      zero (callouts decrement it) when the next assertion is read, it will be
+      marked as a condition that must not be repeated. A value greater than
+      zero also causes checking that an assertion (possibly with callout)
+      follows. */
+
+      if (*ptr == CHAR_QUESTION_MARK || *ptr == CHAR_ASTERISK)
+        {
+        *parsed_pattern++ = META_COND_ASSERT;
+        ptr--;   /* Pull pointer back to the opening parenthesis. */
+        expect_cond_assert = 2;
+        break;  /* End of conditional */
+        }
+
+      /* Handle (?([+-]number)... */
+
+      if (read_number(&ptr, ptrend, cb->bracount, MAX_GROUP_NUMBER, ERR61, &i,
+          &errorcode))
+        {
+        if (i <= 0)
+          {
+          errorcode = ERR15;
+          goto FAILED;
+          }
+        *parsed_pattern++ = META_COND_NUMBER;
+        offset = (PCRE2_SIZE)(ptr - cb->start_pattern - 2);
+        PUTOFFSET(offset, parsed_pattern);
+        *parsed_pattern++ = i;
+        }
+      else if (errorcode != 0) goto FAILED;   /* Number too big */
+
+      /* No number found. Handle the special case (?(VERSION[>]=n.m)... */
+
+      else if (ptrend - ptr >= 10 &&
+               PRIV(strncmp_c8)(ptr, STRING_VERSION, 7) == 0 &&
+               ptr[7] != CHAR_RIGHT_PARENTHESIS)
+        {
+        uint32_t ge = 0;
+        int major = 0;
+        int minor = 0;
+
+        ptr += 7;
+        if (*ptr == CHAR_GREATER_THAN_SIGN)
+          {
+          ge = 1;
+          ptr++;
+          }
+
+        /* NOTE: cannot write IS_DIGIT(*(++ptr)) here because IS_DIGIT
+        references its argument twice. */
+
+        if (*ptr != CHAR_EQUALS_SIGN || (ptr++, !IS_DIGIT(*ptr)))
+          goto BAD_VERSION_CONDITION;
+
+        if (!read_number(&ptr, ptrend, -1, 1000, ERR79, &major, &errorcode))
+          goto FAILED;
+
+        if (ptr >= ptrend) goto BAD_VERSION_CONDITION;
+        if (*ptr == CHAR_DOT)
+          {
+          if (++ptr >= ptrend || !IS_DIGIT(*ptr)) goto BAD_VERSION_CONDITION;
+          minor = (*ptr++ - CHAR_0) * 10;
+          if (ptr >= ptrend) goto BAD_VERSION_CONDITION;
+          if (IS_DIGIT(*ptr)) minor += *ptr++ - CHAR_0;
+          if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS)
+            goto BAD_VERSION_CONDITION;
+          }
+
+        *parsed_pattern++ = META_COND_VERSION;
+        *parsed_pattern++ = ge;
+        *parsed_pattern++ = major;
+        *parsed_pattern++ = minor;
+        }
+
+      /* All the remaining cases now require us to read a name. We cannot at
+      this stage distinguish ambiguous cases such as (?(R12) which might be a
+      recursion test by number or a name, because the named groups have not yet
+      all been identified. Those cases are treated as names, but given a
+      different META code. */
+
+      else
+        {
+        BOOL was_r_ampersand = FALSE;
+
+        if (*ptr == CHAR_R && ptrend - ptr > 1 && ptr[1] == CHAR_AMPERSAND)
+          {
+          terminator = CHAR_RIGHT_PARENTHESIS;
+          was_r_ampersand = TRUE;
+          ptr++;
+          }
+        else if (*ptr == CHAR_LESS_THAN_SIGN)
+          terminator = CHAR_GREATER_THAN_SIGN;
+        else if (*ptr == CHAR_APOSTROPHE)
+          terminator = CHAR_APOSTROPHE;
+        else
+          {
+          terminator = CHAR_RIGHT_PARENTHESIS;
+          ptr--;   /* Point to char before name */
+          }
+        if (!read_name(&ptr, ptrend, utf, terminator, &offset, &name, &namelen,
+            &errorcode, cb)) goto FAILED;
+
+        /* Handle (?(R&name) */
+
+        if (was_r_ampersand)
+          {
+          *parsed_pattern = META_COND_RNAME;
+          ptr--;   /* Back to closing parens */
+          }
+
+        /* Handle (?(name). If the name is "DEFINE" we identify it with a
+        special code. Likewise if the name consists of R followed only by
+        digits. Otherwise, handle it like a quoted name. */
+
+        else if (terminator == CHAR_RIGHT_PARENTHESIS)
+          {
+          if (namelen == 6 && PRIV(strncmp_c8)(name, STRING_DEFINE, 6) == 0)
+            *parsed_pattern = META_COND_DEFINE;
+          else
+            {
+            for (i = 1; i < (int)namelen; i++)
+              if (!IS_DIGIT(name[i])) break;
+            *parsed_pattern = (*name == CHAR_R && i >= (int)namelen)?
+              META_COND_RNUMBER : META_COND_NAME;
+            }
+          ptr--;   /* Back to closing parens */
+          }
+
+        /* Handle (?('name') or (?(<name>) */
+
+        else *parsed_pattern = META_COND_NAME;
+
+        /* All these cases except DEFINE end with the name length and offset;
+        DEFINE just has an offset (for the "too many branches" error). */
+
+        if (*parsed_pattern++ != META_COND_DEFINE) *parsed_pattern++ = namelen;
+        PUTOFFSET(offset, parsed_pattern);
+        }  /* End cases that read a name */
+
+      /* Check the closing parenthesis of the condition */
+
+      if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS)
+        {
+        errorcode = ERR24;
+        goto FAILED;
+        }
+      ptr++;
+      break;  /* End of condition processing */
+
+
+      /* ---- Atomic group ---- */
+
+      case CHAR_GREATER_THAN_SIGN:
+      ATOMIC_GROUP:                          /* Come from (*atomic: */
+      *parsed_pattern++ = META_ATOMIC;
+      nest_depth++;
+      ptr++;
+      break;
+
+
+      /* ---- Lookahead assertions ---- */
+
+      case CHAR_EQUALS_SIGN:
+      POSITIVE_LOOK_AHEAD:                   /* Come from (*pla: */
+      *parsed_pattern++ = META_LOOKAHEAD;
+      ptr++;
+      goto POST_ASSERTION;
+
+      case CHAR_ASTERISK:
+      POSITIVE_NONATOMIC_LOOK_AHEAD:         /* Come from (?* */
+      *parsed_pattern++ = META_LOOKAHEAD_NA;
+      ptr++;
+      goto POST_ASSERTION;
+
+      case CHAR_EXCLAMATION_MARK:
+      NEGATIVE_LOOK_AHEAD:                   /* Come from (*nla: */
+      *parsed_pattern++ = META_LOOKAHEADNOT;
+      ptr++;
+      goto POST_ASSERTION;
+
+
+      /* ---- Lookbehind assertions ---- */
+
+      /* (?< followed by = or ! or * is a lookbehind assertion. Otherwise (?<
+      is the start of the name of a capturing group. */
+
+      case CHAR_LESS_THAN_SIGN:
+      if (ptrend - ptr <= 1 ||
+         (ptr[1] != CHAR_EQUALS_SIGN &&
+          ptr[1] != CHAR_EXCLAMATION_MARK &&
+          ptr[1] != CHAR_ASTERISK))
+        {
+        terminator = CHAR_GREATER_THAN_SIGN;
+        goto DEFINE_NAME;
+        }
+      *parsed_pattern++ = (ptr[1] == CHAR_EQUALS_SIGN)?
+        META_LOOKBEHIND : (ptr[1] == CHAR_EXCLAMATION_MARK)?
+        META_LOOKBEHINDNOT : META_LOOKBEHIND_NA;
+
+      POST_LOOKBEHIND:           /* Come from (*plb: (*naplb: and (*nlb: */
+      *has_lookbehind = TRUE;
+      offset = (PCRE2_SIZE)(ptr - cb->start_pattern - 2);
+      PUTOFFSET(offset, parsed_pattern);
+      ptr += 2;
+      /* Fall through */
+
+      /* If the previous item was a condition starting (?(? an assertion,
+      optionally preceded by a callout, is expected. This is checked later on,
+      during actual compilation. However we need to identify this kind of
+      assertion in this pass because it must not be qualified. The value of
+      expect_cond_assert is set to 2 after (?(? is processed. We decrement it
+      for a callout - still leaving a positive value that identifies the
+      assertion. Multiple callouts or any other items will make it zero or
+      less, which doesn't matter because they will cause an error later. */
+
+      POST_ASSERTION:
+      nest_depth++;
+      if (prev_expect_cond_assert > 0)
+        {
+        if (top_nest == NULL) top_nest = (nest_save *)(cb->start_workspace);
+        else if (++top_nest >= end_nests)
+          {
+          errorcode = ERR84;
+          goto FAILED;
+          }
+        top_nest->nest_depth = nest_depth;
+        top_nest->flags = NSF_CONDASSERT;
+        top_nest->options = options & PARSE_TRACKED_OPTIONS;
+        }
+      break;
+
+
+      /* ---- Define a named group ---- */
+
+      /* A named group may be defined as (?'name') or (?<name>). In the latter
+      case we jump to DEFINE_NAME from the disambiguation of (?< above with the
+      terminator set to '>'. */
+
+      case CHAR_APOSTROPHE:
+      terminator = CHAR_APOSTROPHE;    /* Terminator */
+
+      DEFINE_NAME:
+      if (!read_name(&ptr, ptrend, utf, terminator, &offset, &name, &namelen,
+          &errorcode, cb)) goto FAILED;
+
+      /* We have a name for this capturing group. It is also assigned a number,
+      which is its primary means of identification. */
+
+      if (cb->bracount >= MAX_GROUP_NUMBER)
+        {
+        errorcode = ERR97;
+        goto FAILED;
+        }
+      cb->bracount++;
+      *parsed_pattern++ = META_CAPTURE | cb->bracount;
+      nest_depth++;
+
+      /* Check not too many names */
+
+      if (cb->names_found >= MAX_NAME_COUNT)
+        {
+        errorcode = ERR49;
+        goto FAILED;
+        }
+
+      /* Adjust the entry size to accommodate the longest name found. */
+
+      if (namelen + IMM2_SIZE + 1 > cb->name_entry_size)
+        cb->name_entry_size = (uint16_t)(namelen + IMM2_SIZE + 1);
+
+      /* Scan the list to check for duplicates. For duplicate names, if the
+      number is the same, break the loop, which causes the name to be
+      discarded; otherwise, if DUPNAMES is not set, give an error.
+      If it is set, allow the name with a different number, but continue
+      scanning in case this is a duplicate with the same number. For
+      non-duplicate names, give an error if the number is duplicated. */
+
+      isdupname = FALSE;
+      ng = cb->named_groups;
+      for (i = 0; i < cb->names_found; i++, ng++)
+        {
+        if (namelen == ng->length &&
+            PRIV(strncmp)(name, ng->name, (PCRE2_SIZE)namelen) == 0)
+          {
+          if (ng->number == cb->bracount) break;
+          if ((options & PCRE2_DUPNAMES) == 0)
+            {
+            errorcode = ERR43;
+            goto FAILED;
+            }
+          isdupname = ng->isdup = TRUE;     /* Mark as a duplicate */
+          cb->dupnames = TRUE;              /* Duplicate names exist */
+          }
+        else if (ng->number == cb->bracount)
+          {
+          errorcode = ERR65;
+          goto FAILED;
+          }
+        }
+
+      if (i < cb->names_found) break;   /* Ignore duplicate with same number */
+
+      /* Increase the list size if necessary */
+
+      if (cb->names_found >= cb->named_group_list_size)
+        {
+        uint32_t newsize = cb->named_group_list_size * 2;
+        named_group *newspace =
+          cb->cx->memctl.malloc(newsize * sizeof(named_group),
+          cb->cx->memctl.memory_data);
+        if (newspace == NULL)
+          {
+          errorcode = ERR21;
+          goto FAILED;
+          }
+
+        memcpy(newspace, cb->named_groups,
+          cb->named_group_list_size * sizeof(named_group));
+        if (cb->named_group_list_size > NAMED_GROUP_LIST_SIZE)
+          cb->cx->memctl.free((void *)cb->named_groups,
+          cb->cx->memctl.memory_data);
+        cb->named_groups = newspace;
+        cb->named_group_list_size = newsize;
+        }
+
+      /* Add this name to the list */
+
+      cb->named_groups[cb->names_found].name = name;
+      cb->named_groups[cb->names_found].length = (uint16_t)namelen;
+      cb->named_groups[cb->names_found].number = cb->bracount;
+      cb->named_groups[cb->names_found].isdup = (uint16_t)isdupname;
+      cb->names_found++;
+      break;
+      }        /* End of (? switch */
+    break;     /* End of ( handling */
+
+
+    /* ---- Branch terminators ---- */
+
+    /* Alternation: reset the capture count if we are in a (?| group. */
+
+    case CHAR_VERTICAL_LINE:
+    if (top_nest != NULL && top_nest->nest_depth == nest_depth &&
+        (top_nest->flags & NSF_RESET) != 0)
+      {
+      if (cb->bracount > top_nest->max_group)
+        top_nest->max_group = (uint16_t)cb->bracount;
+      cb->bracount = top_nest->reset_group;
+      }
+    *parsed_pattern++ = META_ALT;
+    break;
+
+    /* End of group; reset the capture count to the maximum if we are in a (?|
+    group and/or reset the options that are tracked during parsing. Disallow
+    quantifier for a condition that is an assertion. */
+
+    case CHAR_RIGHT_PARENTHESIS:
+    okquantifier = TRUE;
+    if (top_nest != NULL && top_nest->nest_depth == nest_depth)
+      {
+      options = (options & ~PARSE_TRACKED_OPTIONS) | top_nest->options;
+      if ((top_nest->flags & NSF_RESET) != 0 &&
+          top_nest->max_group > cb->bracount)
+        cb->bracount = top_nest->max_group;
+      if ((top_nest->flags & NSF_CONDASSERT) != 0)
+        okquantifier = FALSE;
+
+      if ((top_nest->flags & NSF_ATOMICSR) != 0)
+        {
+        *parsed_pattern++ = META_KET;
+        }
+
+      if (top_nest == (nest_save *)(cb->start_workspace)) top_nest = NULL;
+        else top_nest--;
+      }
+    if (nest_depth == 0)    /* Unmatched closing parenthesis */
+      {
+      errorcode = ERR22;
+      goto FAILED_BACK;
+      }
+    nest_depth--;
+    *parsed_pattern++ = META_KET;
+    break;
+    }  /* End of switch on pattern character */
+  }    /* End of main character scan loop */
+
+/* End of pattern reached. Check for missing ) at the end of a verb name. */
+
+if (inverbname && ptr >= ptrend)
+  {
+  errorcode = ERR60;
+  goto FAILED;
+  }
+
+/* Manage callout for the final item */
+
+PARSED_END:
+parsed_pattern = manage_callouts(ptr, &previous_callout, auto_callout,
+  parsed_pattern, cb);
+
+/* Insert trailing items for word and line matching (features provided for the
+benefit of pcre2grep). */
+
+if ((extra_options & PCRE2_EXTRA_MATCH_LINE) != 0)
+  {
+  *parsed_pattern++ = META_KET;
+  *parsed_pattern++ = META_DOLLAR;
+  }
+else if ((extra_options & PCRE2_EXTRA_MATCH_WORD) != 0)
+  {
+  *parsed_pattern++ = META_KET;
+  *parsed_pattern++ = META_ESCAPE + ESC_b;
+  }
+
+/* Terminate the parsed pattern, then return success if all groups are closed.
+Otherwise we have unclosed parentheses. */
+
+if (parsed_pattern >= parsed_pattern_end)
+  {
+  errorcode = ERR63;  /* Internal error (parsed pattern overflow) */
+  goto FAILED;
+  }
+
+*parsed_pattern = META_END;
+if (nest_depth == 0) return 0;
+
+UNCLOSED_PARENTHESIS:
+errorcode = ERR14;
+
+/* Come here for all failures. */
+
+FAILED:
+cb->erroroffset = (PCRE2_SIZE)(ptr - cb->start_pattern);
+return errorcode;
+
+/* Some errors need to indicate the previous character. */
+
+FAILED_BACK:
+ptr--;
+goto FAILED;
+
+/* This failure happens several times. */
+
+BAD_VERSION_CONDITION:
+errorcode = ERR79;
+goto FAILED;
+}
+
+
+
+/*************************************************
+*       Find first significant opcode            *
+*************************************************/
+
+/* This is called by several functions that scan a compiled expression looking
+for a fixed first character, or an anchoring opcode etc. It skips over things
+that do not influence this. For some calls, it makes sense to skip negative
+forward and all backward assertions, and also the \b assertion; for others it
+does not.
+
+Arguments:
+  code         pointer to the start of the group
+  skipassert   TRUE if certain assertions are to be skipped
+
+Returns:       pointer to the first significant opcode
+*/
+
+static const PCRE2_UCHAR*
+first_significant_code(PCRE2_SPTR code, BOOL skipassert)
+{
+for (;;)
+  {
+  switch ((int)*code)
+    {
+    case OP_ASSERT_NOT:
+    case OP_ASSERTBACK:
+    case OP_ASSERTBACK_NOT:
+    case OP_ASSERTBACK_NA:
+    if (!skipassert) return code;
+    do code += GET(code, 1); while (*code == OP_ALT);
+    code += PRIV(OP_lengths)[*code];
+    break;
+
+    case OP_WORD_BOUNDARY:
+    case OP_NOT_WORD_BOUNDARY:
+    if (!skipassert) return code;
+    /* Fall through */
+
+    case OP_CALLOUT:
+    case OP_CREF:
+    case OP_DNCREF:
+    case OP_RREF:
+    case OP_DNRREF:
+    case OP_FALSE:
+    case OP_TRUE:
+    code += PRIV(OP_lengths)[*code];
+    break;
+
+    case OP_CALLOUT_STR:
+    code += GET(code, 1 + 2*LINK_SIZE);
+    break;
+
+    case OP_SKIPZERO:
+    code += 2 + GET(code, 2) + LINK_SIZE;
+    break;
+
+    case OP_COND:
+    case OP_SCOND:
+    if (code[1+LINK_SIZE] != OP_FALSE ||   /* Not DEFINE */
+        code[GET(code, 1)] != OP_KET)      /* More than one branch */
+      return code;
+    code += GET(code, 1) + 1 + LINK_SIZE;
+    break;
+
+    case OP_MARK:
+    case OP_COMMIT_ARG:
+    case OP_PRUNE_ARG:
+    case OP_SKIP_ARG:
+    case OP_THEN_ARG:
+    code += code[1] + PRIV(OP_lengths)[*code];
+    break;
+
+    default:
+    return code;
+    }
+  }
+/* Control never reaches here */
+}
+
+
+
+#ifdef SUPPORT_UNICODE
+/*************************************************
+*           Get othercase range                  *
+*************************************************/
+
+/* This function is passed the start and end of a class range in UCP mode. It
+searches up the characters, looking for ranges of characters in the "other"
+case. Each call returns the next one, updating the start address. A character
+with multiple other cases is returned on its own with a special return value.
+
+Arguments:
+  cptr        points to starting character value; updated
+  d           end value
+  ocptr       where to put start of othercase range
+  odptr       where to put end of othercase range
+
+Yield:        -1 when no more
+               0 when a range is returned
+              >0 the CASESET offset for char with multiple other cases
+                in this case, ocptr contains the original
+*/
+
+static int
+get_othercase_range(uint32_t *cptr, uint32_t d, uint32_t *ocptr,
+  uint32_t *odptr)
+{
+uint32_t c, othercase, next;
+unsigned int co;
+
+/* Find the first character that has an other case. If it has multiple other
+cases, return its case offset value. */
+
+for (c = *cptr; c <= d; c++)
+  {
+  if ((co = UCD_CASESET(c)) != 0)
+    {
+    *ocptr = c++;   /* Character that has the set */
+    *cptr = c;      /* Rest of input range */
+    return (int)co;
+    }
+  if ((othercase = UCD_OTHERCASE(c)) != c) break;
+  }
+
+if (c > d) return -1;  /* Reached end of range */
+
+/* Found a character that has a single other case. Search for the end of the
+range, which is either the end of the input range, or a character that has zero
+or more than one other cases. */
+
+*ocptr = othercase;
+next = othercase + 1;
+
+for (++c; c <= d; c++)
+  {
+  if ((co = UCD_CASESET(c)) != 0 || UCD_OTHERCASE(c) != next) break;
+  next++;
+  }
+
+*odptr = next - 1;     /* End of othercase range */
+*cptr = c;             /* Rest of input range */
+return 0;
+}
+#endif  /* SUPPORT_UNICODE */
+
+
+
+/*************************************************
+* Add a character or range to a class (internal) *
+*************************************************/
+
+/* This function packages up the logic of adding a character or range of
+characters to a class. The character values in the arguments will be within the
+valid values for the current mode (8-bit, 16-bit, UTF, etc). This function is
+called only from within the "add to class" group of functions, some of which
+are recursive and mutually recursive. The external entry point is
+add_to_class().
+
+Arguments:
+  classbits     the bit map for characters < 256
+  uchardptr     points to the pointer for extra data
+  options       the options word
+  cb            compile data
+  start         start of range character
+  end           end of range character
+
+Returns:        the number of < 256 characters added
+                the pointer to extra data is updated
+*/
+
+static unsigned int
+add_to_class_internal(uint8_t *classbits, PCRE2_UCHAR **uchardptr,
+  uint32_t options, compile_block *cb, uint32_t start, uint32_t end)
+{
+uint32_t c;
+uint32_t classbits_end = (end <= 0xff ? end : 0xff);
+unsigned int n8 = 0;
+
+/* If caseless matching is required, scan the range and process alternate
+cases. In Unicode, there are 8-bit characters that have alternate cases that
+are greater than 255 and vice-versa. Sometimes we can just extend the original
+range. */
+
+if ((options & PCRE2_CASELESS) != 0)
+  {
+#ifdef SUPPORT_UNICODE
+  if ((options & (PCRE2_UTF|PCRE2_UCP)) != 0)
+    {
+    int rc;
+    uint32_t oc, od;
+
+    options &= ~PCRE2_CASELESS;   /* Remove for recursive calls */
+    c = start;
+
+    while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)
+      {
+      /* Handle a single character that has more than one other case. */
+
+      if (rc > 0) n8 += add_list_to_class_internal(classbits, uchardptr, options, cb,
+        PRIV(ucd_caseless_sets) + rc, oc);
+
+      /* Do nothing if the other case range is within the original range. */
+
+      else if (oc >= cb->class_range_start && od <= cb->class_range_end) continue;
+
+      /* Extend the original range if there is overlap, noting that if oc < c, we
+      can't have od > end because a subrange is always shorter than the basic
+      range. Otherwise, use a recursive call to add the additional range. */
+
+      else if (oc < start && od >= start - 1) start = oc; /* Extend downwards */
+      else if (od > end && oc <= end + 1)
+        {
+        end = od;       /* Extend upwards */
+        if (end > classbits_end) classbits_end = (end <= 0xff ? end : 0xff);
+        }
+      else n8 += add_to_class_internal(classbits, uchardptr, options, cb, oc, od);
+      }
+    }
+  else
+#endif  /* SUPPORT_UNICODE */
+
+  /* Not UTF mode */
+
+  for (c = start; c <= classbits_end; c++)
+    {
+    SETBIT(classbits, cb->fcc[c]);
+    n8++;
+    }
+  }
+
+/* Now handle the originally supplied range. Adjust the final value according
+to the bit length - this means that the same lists of (e.g.) horizontal spaces
+can be used in all cases. */
+
+if ((options & PCRE2_UTF) == 0 && end > MAX_NON_UTF_CHAR)
+  end = MAX_NON_UTF_CHAR;
+
+if (start > cb->class_range_start && end < cb->class_range_end) return n8;
+
+/* Use the bitmap for characters < 256. Otherwise use extra data.*/
+
+for (c = start; c <= classbits_end; c++)
+  {
+  /* Regardless of start, c will always be <= 255. */
+  SETBIT(classbits, c);
+  n8++;
+  }
+
+#ifdef SUPPORT_WIDE_CHARS
+if (start <= 0xff) start = 0xff + 1;
+
+if (end >= start)
+  {
+  PCRE2_UCHAR *uchardata = *uchardptr;
+
+#ifdef SUPPORT_UNICODE
+  if ((options & PCRE2_UTF) != 0)
+    {
+    if (start < end)
+      {
+      *uchardata++ = XCL_RANGE;
+      uchardata += PRIV(ord2utf)(start, uchardata);
+      uchardata += PRIV(ord2utf)(end, uchardata);
+      }
+    else if (start == end)
+      {
+      *uchardata++ = XCL_SINGLE;
+      uchardata += PRIV(ord2utf)(start, uchardata);
+      }
+    }
+  else
+#endif  /* SUPPORT_UNICODE */
+
+  /* Without UTF support, character values are constrained by the bit length,
+  and can only be > 256 for 16-bit and 32-bit libraries. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    {}
+#else
+  if (start < end)
+    {
+    *uchardata++ = XCL_RANGE;
+    *uchardata++ = start;
+    *uchardata++ = end;
+    }
+  else if (start == end)
+    {
+    *uchardata++ = XCL_SINGLE;
+    *uchardata++ = start;
+    }
+#endif  /* PCRE2_CODE_UNIT_WIDTH == 8 */
+  *uchardptr = uchardata;   /* Updata extra data pointer */
+  }
+#else  /* SUPPORT_WIDE_CHARS */
+  (void)uchardptr;          /* Avoid compiler warning */
+#endif /* SUPPORT_WIDE_CHARS */
+
+return n8;    /* Number of 8-bit characters */
+}
+
+
+
+#ifdef SUPPORT_UNICODE
+/*************************************************
+* Add a list of characters to a class (internal) *
+*************************************************/
+
+/* This function is used for adding a list of case-equivalent characters to a
+class when in UTF mode. This function is called only from within
+add_to_class_internal(), with which it is mutually recursive.
+
+Arguments:
+  classbits     the bit map for characters < 256
+  uchardptr     points to the pointer for extra data
+  options       the options word
+  cb            contains pointers to tables etc.
+  p             points to row of 32-bit values, terminated by NOTACHAR
+  except        character to omit; this is used when adding lists of
+                  case-equivalent characters to avoid including the one we
+                  already know about
+
+Returns:        the number of < 256 characters added
+                the pointer to extra data is updated
+*/
+
+static unsigned int
+add_list_to_class_internal(uint8_t *classbits, PCRE2_UCHAR **uchardptr,
+  uint32_t options, compile_block *cb, const uint32_t *p, unsigned int except)
+{
+unsigned int n8 = 0;
+while (p[0] < NOTACHAR)
+  {
+  unsigned int n = 0;
+  if (p[0] != except)
+    {
+    while(p[n+1] == p[0] + n + 1) n++;
+    n8 += add_to_class_internal(classbits, uchardptr, options, cb, p[0], p[n]);
+    }
+  p += n + 1;
+  }
+return n8;
+}
+#endif
+
+
+
+/*************************************************
+*   External entry point for add range to class  *
+*************************************************/
+
+/* This function sets the overall range so that the internal functions can try
+to avoid duplication when handling case-independence.
+
+Arguments:
+  classbits     the bit map for characters < 256
+  uchardptr     points to the pointer for extra data
+  options       the options word
+  cb            compile data
+  start         start of range character
+  end           end of range character
+
+Returns:        the number of < 256 characters added
+                the pointer to extra data is updated
+*/
+
+static unsigned int
+add_to_class(uint8_t *classbits, PCRE2_UCHAR **uchardptr, uint32_t options,
+  compile_block *cb, uint32_t start, uint32_t end)
+{
+cb->class_range_start = start;
+cb->class_range_end = end;
+return add_to_class_internal(classbits, uchardptr, options, cb, start, end);
+}
+
+
+/*************************************************
+*   External entry point for add list to class   *
+*************************************************/
+
+/* This function is used for adding a list of horizontal or vertical whitespace
+characters to a class. The list must be in order so that ranges of characters
+can be detected and handled appropriately. This function sets the overall range
+so that the internal functions can try to avoid duplication when handling
+case-independence.
+
+Arguments:
+  classbits     the bit map for characters < 256
+  uchardptr     points to the pointer for extra data
+  options       the options word
+  cb            contains pointers to tables etc.
+  p             points to row of 32-bit values, terminated by NOTACHAR
+  except        character to omit; this is used when adding lists of
+                  case-equivalent characters to avoid including the one we
+                  already know about
+
+Returns:        the number of < 256 characters added
+                the pointer to extra data is updated
+*/
+
+static unsigned int
+add_list_to_class(uint8_t *classbits, PCRE2_UCHAR **uchardptr, uint32_t options,
+  compile_block *cb, const uint32_t *p, unsigned int except)
+{
+unsigned int n8 = 0;
+while (p[0] < NOTACHAR)
+  {
+  unsigned int n = 0;
+  if (p[0] != except)
+    {
+    while(p[n+1] == p[0] + n + 1) n++;
+    cb->class_range_start = p[0];
+    cb->class_range_end = p[n];
+    n8 += add_to_class_internal(classbits, uchardptr, options, cb, p[0], p[n]);
+    }
+  p += n + 1;
+  }
+return n8;
+}
+
+
+
+/*************************************************
+*    Add characters not in a list to a class     *
+*************************************************/
+
+/* This function is used for adding the complement of a list of horizontal or
+vertical whitespace to a class. The list must be in order.
+
+Arguments:
+  classbits     the bit map for characters < 256
+  uchardptr     points to the pointer for extra data
+  options       the options word
+  cb            contains pointers to tables etc.
+  p             points to row of 32-bit values, terminated by NOTACHAR
+
+Returns:        the number of < 256 characters added
+                the pointer to extra data is updated
+*/
+
+static unsigned int
+add_not_list_to_class(uint8_t *classbits, PCRE2_UCHAR **uchardptr,
+  uint32_t options, compile_block *cb, const uint32_t *p)
+{
+BOOL utf = (options & PCRE2_UTF) != 0;
+unsigned int n8 = 0;
+if (p[0] > 0)
+  n8 += add_to_class(classbits, uchardptr, options, cb, 0, p[0] - 1);
+while (p[0] < NOTACHAR)
+  {
+  while (p[1] == p[0] + 1) p++;
+  n8 += add_to_class(classbits, uchardptr, options, cb, p[0] + 1,
+    (p[1] == NOTACHAR) ? (utf ? 0x10ffffu : 0xffffffffu) : p[1] - 1);
+  p++;
+  }
+return n8;
+}
+
+
+
+/*************************************************
+*    Find details of duplicate group names       *
+*************************************************/
+
+/* This is called from compile_branch() when it needs to know the index and
+count of duplicates in the names table when processing named backreferences,
+either directly, or as conditions.
+
+Arguments:
+  name          points to the name
+  length        the length of the name
+  indexptr      where to put the index
+  countptr      where to put the count of duplicates
+  errorcodeptr  where to put an error code
+  cb            the compile block
+
+Returns:        TRUE if OK, FALSE if not, error code set
+*/
+
+static BOOL
+find_dupname_details(PCRE2_SPTR name, uint32_t length, int *indexptr,
+  int *countptr, int *errorcodeptr, compile_block *cb)
+{
+uint32_t i, groupnumber;
+int count;
+PCRE2_UCHAR *slot = cb->name_table;
+
+/* Find the first entry in the table */
+
+for (i = 0; i < cb->names_found; i++)
+  {
+  if (PRIV(strncmp)(name, slot+IMM2_SIZE, length) == 0 &&
+      slot[IMM2_SIZE+length] == 0) break;
+  slot += cb->name_entry_size;
+  }
+
+/* This should not occur, because this function is called only when we know we
+have duplicate names. Give an internal error. */
+
+if (i >= cb->names_found)
+  {
+  *errorcodeptr = ERR53;
+  cb->erroroffset = name - cb->start_pattern;
+  return FALSE;
+  }
+
+/* Record the index and then see how many duplicates there are, updating the
+backref map and maximum back reference as we do. */
+
+*indexptr = i;
+count = 0;
+
+for (;;)
+  {
+  count++;
+  groupnumber = GET2(slot,0);
+  cb->backref_map |= (groupnumber < 32)? (1u << groupnumber) : 1;
+  if (groupnumber > cb->top_backref) cb->top_backref = groupnumber;
+  if (++i >= cb->names_found) break;
+  slot += cb->name_entry_size;
+  if (PRIV(strncmp)(name, slot+IMM2_SIZE, length) != 0 ||
+    (slot+IMM2_SIZE)[length] != 0) break;
+  }
+
+*countptr = count;
+return TRUE;
+}
+
+
+
+/*************************************************
+*           Compile one branch                   *
+*************************************************/
+
+/* Scan the parsed pattern, compiling it into the a vector of PCRE2_UCHAR. If
+the options are changed during the branch, the pointer is used to change the
+external options bits. This function is used during the pre-compile phase when
+we are trying to find out the amount of memory needed, as well as during the
+real compile phase. The value of lengthptr distinguishes the two phases.
+
+Arguments:
+  optionsptr        pointer to the option bits
+  codeptr           points to the pointer to the current code point
+  pptrptr           points to the current parsed pattern pointer
+  errorcodeptr      points to error code variable
+  firstcuptr        place to put the first required code unit
+  firstcuflagsptr   place to put the first code unit flags
+  reqcuptr          place to put the last required code unit
+  reqcuflagsptr     place to put the last required code unit flags
+  bcptr             points to current branch chain
+  cb                contains pointers to tables etc.
+  lengthptr         NULL during the real compile phase
+                    points to length accumulator during pre-compile phase
+
+Returns:            0 There's been an error, *errorcodeptr is non-zero
+                   +1 Success, this branch must match at least one character
+                   -1 Success, this branch may match an empty string
+*/
+
+static int
+compile_branch(uint32_t *optionsptr, PCRE2_UCHAR **codeptr, uint32_t **pptrptr,
+  int *errorcodeptr, uint32_t *firstcuptr, uint32_t *firstcuflagsptr,
+  uint32_t *reqcuptr, uint32_t *reqcuflagsptr, branch_chain *bcptr,
+  compile_block *cb, PCRE2_SIZE *lengthptr)
+{
+int bravalue = 0;
+int okreturn = -1;
+int group_return = 0;
+uint32_t repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
+uint32_t greedy_default, greedy_non_default;
+uint32_t repeat_type, op_type;
+uint32_t options = *optionsptr;               /* May change dynamically */
+uint32_t firstcu, reqcu;
+uint32_t zeroreqcu, zerofirstcu;
+uint32_t escape;
+uint32_t *pptr = *pptrptr;
+uint32_t meta, meta_arg;
+uint32_t firstcuflags, reqcuflags;
+uint32_t zeroreqcuflags, zerofirstcuflags;
+uint32_t req_caseopt, reqvary, tempreqvary;
+PCRE2_SIZE offset = 0;
+PCRE2_SIZE length_prevgroup = 0;
+PCRE2_UCHAR *code = *codeptr;
+PCRE2_UCHAR *last_code = code;
+PCRE2_UCHAR *orig_code = code;
+PCRE2_UCHAR *tempcode;
+PCRE2_UCHAR *previous = NULL;
+PCRE2_UCHAR op_previous;
+BOOL groupsetfirstcu = FALSE;
+BOOL had_accept = FALSE;
+BOOL matched_char = FALSE;
+BOOL previous_matched_char = FALSE;
+BOOL reset_caseful = FALSE;
+const uint8_t *cbits = cb->cbits;
+uint8_t classbits[32];
+
+/* We can fish out the UTF setting once and for all into a BOOL, but we must
+not do this for other options (e.g. PCRE2_EXTENDED) because they may change
+dynamically as we process the pattern. */
+
+#ifdef SUPPORT_UNICODE
+BOOL utf = (options & PCRE2_UTF) != 0;
+BOOL ucp = (options & PCRE2_UCP) != 0;
+#else  /* No Unicode support */
+BOOL utf = FALSE;
+#endif
+
+/* Helper variables for OP_XCLASS opcode (for characters > 255). We define
+class_uchardata always so that it can be passed to add_to_class() always,
+though it will not be used in non-UTF 8-bit cases. This avoids having to supply
+alternative calls for the different cases. */
+
+PCRE2_UCHAR *class_uchardata;
+#ifdef SUPPORT_WIDE_CHARS
+BOOL xclass;
+PCRE2_UCHAR *class_uchardata_base;
+#endif
+
+/* Set up the default and non-default settings for greediness */
+
+greedy_default = ((options & PCRE2_UNGREEDY) != 0);
+greedy_non_default = greedy_default ^ 1;
+
+/* Initialize no first unit, no required unit. REQ_UNSET means "no char
+matching encountered yet". It gets changed to REQ_NONE if we hit something that
+matches a non-fixed first unit; reqcu just remains unset if we never find one.
+
+When we hit a repeat whose minimum is zero, we may have to adjust these values
+to take the zero repeat into account. This is implemented by setting them to
+zerofirstcu and zeroreqcu when such a repeat is encountered. The individual
+item types that can be repeated set these backoff variables appropriately. */
+
+firstcu = reqcu = zerofirstcu = zeroreqcu = 0;
+firstcuflags = reqcuflags = zerofirstcuflags = zeroreqcuflags = REQ_UNSET;
+
+/* The variable req_caseopt contains either the REQ_CASELESS bit or zero,
+according to the current setting of the caseless flag. The REQ_CASELESS value
+leaves the lower 28 bit empty. It is added into the firstcu or reqcu variables
+to record the case status of the value. This is used only for ASCII characters.
+*/
+
+req_caseopt = ((options & PCRE2_CASELESS) != 0)? REQ_CASELESS : 0;
+
+/* Switch on next META item until the end of the branch */
+
+for (;; pptr++)
+  {
+#ifdef SUPPORT_WIDE_CHARS
+  BOOL xclass_has_prop;
+#endif
+  BOOL negate_class;
+  BOOL should_flip_negation;
+  BOOL match_all_or_no_wide_chars;
+  BOOL possessive_quantifier;
+  BOOL note_group_empty;
+  int class_has_8bitchar;
+  uint32_t mclength;
+  uint32_t skipunits;
+  uint32_t subreqcu, subfirstcu;
+  uint32_t groupnumber;
+  uint32_t verbarglen, verbculen;
+  uint32_t subreqcuflags, subfirstcuflags;
+  open_capitem *oc;
+  PCRE2_UCHAR mcbuffer[8];
+
+  /* Get next META item in the pattern and its potential argument. */
+
+  meta = META_CODE(*pptr);
+  meta_arg = META_DATA(*pptr);
+
+  /* If we are in the pre-compile phase, accumulate the length used for the
+  previous cycle of this loop, unless the next item is a quantifier. */
+
+  if (lengthptr != NULL)
+    {
+    if (code > cb->start_workspace + cb->workspace_size -
+        WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
+      {
+      *errorcodeptr = (code >= cb->start_workspace + cb->workspace_size)?
+        ERR52 : ERR86;
+      return 0;
+      }
+
+    /* There is at least one situation where code goes backwards: this is the
+    case of a zero quantifier after a class (e.g. [ab]{0}). When the quantifier
+    is processed, the whole class is eliminated. However, it is created first,
+    so we have to allow memory for it. Therefore, don't ever reduce the length
+    at this point. */
+
+    if (code < last_code) code = last_code;
+
+    /* If the next thing is not a quantifier, we add the length of the previous
+    item into the total, and reset the code pointer to the start of the
+    workspace. Otherwise leave the previous item available to be quantified. */
+
+    if (meta < META_ASTERISK || meta > META_MINMAX_QUERY)
+      {
+      if (OFLOW_MAX - *lengthptr < (PCRE2_SIZE)(code - orig_code))
+        {
+        *errorcodeptr = ERR20;   /* Integer overflow */
+        return 0;
+        }
+      *lengthptr += (PCRE2_SIZE)(code - orig_code);
+      if (*lengthptr > MAX_PATTERN_SIZE)
+        {
+        *errorcodeptr = ERR20;   /* Pattern is too large */
+        return 0;
+        }
+      code = orig_code;
+      }
+
+    /* Remember where this code item starts so we can catch the "backwards"
+    case above next time round. */
+
+    last_code = code;
+    }
+
+  /* Process the next parsed pattern item. If it is not a quantifier, remember
+  where it starts so that it can be quantified when a quantifier follows.
+  Checking for the legality of quantifiers happens in parse_regex(), except for
+  a quantifier after an assertion that is a condition. */
+
+  if (meta < META_ASTERISK || meta > META_MINMAX_QUERY)
+    {
+    previous = code;
+    if (matched_char && !had_accept) okreturn = 1;
+    }
+
+  previous_matched_char = matched_char;
+  matched_char = FALSE;
+  note_group_empty = FALSE;
+  skipunits = 0;         /* Default value for most subgroups */
+
+  switch(meta)
+    {
+    /* ===================================================================*/
+    /* The branch terminates at pattern end or | or ) */
+
+    case META_END:
+    case META_ALT:
+    case META_KET:
+    *firstcuptr = firstcu;
+    *firstcuflagsptr = firstcuflags;
+    *reqcuptr = reqcu;
+    *reqcuflagsptr = reqcuflags;
+    *codeptr = code;
+    *pptrptr = pptr;
+    return okreturn;
+
+
+    /* ===================================================================*/
+    /* Handle single-character metacharacters. In multiline mode, ^ disables
+    the setting of any following char as a first character. */
+
+    case META_CIRCUMFLEX:
+    if ((options & PCRE2_MULTILINE) != 0)
+      {
+      if (firstcuflags == REQ_UNSET)
+        zerofirstcuflags = firstcuflags = REQ_NONE;
+      *code++ = OP_CIRCM;
+      }
+    else *code++ = OP_CIRC;
+    break;
+
+    case META_DOLLAR:
+    *code++ = ((options & PCRE2_MULTILINE) != 0)? OP_DOLLM : OP_DOLL;
+    break;
+
+    /* There can never be a first char if '.' is first, whatever happens about
+    repeats. The value of reqcu doesn't change either. */
+
+    case META_DOT:
+    matched_char = TRUE;
+    if (firstcuflags == REQ_UNSET) firstcuflags = REQ_NONE;
+    zerofirstcu = firstcu;
+    zerofirstcuflags = firstcuflags;
+    zeroreqcu = reqcu;
+    zeroreqcuflags = reqcuflags;
+    *code++ = ((options & PCRE2_DOTALL) != 0)? OP_ALLANY: OP_ANY;
+    break;
+
+
+    /* ===================================================================*/
+    /* Empty character classes are allowed if PCRE2_ALLOW_EMPTY_CLASS is set.
+    Otherwise, an initial ']' is taken as a data character. When empty classes
+    are allowed, [] must always fail, so generate OP_FAIL, whereas [^] must
+    match any character, so generate OP_ALLANY. */
+
+    case META_CLASS_EMPTY:
+    case META_CLASS_EMPTY_NOT:
+    matched_char = TRUE;
+    *code++ = (meta == META_CLASS_EMPTY_NOT)? OP_ALLANY : OP_FAIL;
+    if (firstcuflags == REQ_UNSET) firstcuflags = REQ_NONE;
+    zerofirstcu = firstcu;
+    zerofirstcuflags = firstcuflags;
+    break;
+
+
+    /* ===================================================================*/
+    /* Non-empty character class. If the included characters are all < 256, we
+    build a 32-byte bitmap of the permitted characters, except in the special
+    case where there is only one such character. For negated classes, we build
+    the map as usual, then invert it at the end. However, we use a different
+    opcode so that data characters > 255 can be handled correctly.
+
+    If the class contains characters outside the 0-255 range, a different
+    opcode is compiled. It may optionally have a bit map for characters < 256,
+    but those above are are explicitly listed afterwards. A flag code unit
+    tells whether the bitmap is present, and whether this is a negated class or
+    not. */
+
+    case META_CLASS_NOT:
+    case META_CLASS:
+    matched_char = TRUE;
+    negate_class = meta == META_CLASS_NOT;
+
+    /* We can optimize the case of a single character in a class by generating
+    OP_CHAR or OP_CHARI if it's positive, or OP_NOT or OP_NOTI if it's
+    negative. In the negative case there can be no first char if this item is
+    first, whatever repeat count may follow. In the case of reqcu, save the
+    previous value for reinstating. */
+
+    /* NOTE: at present this optimization is not effective if the only
+    character in a class in 32-bit, non-UCP mode has its top bit set. */
+
+    if (pptr[1] < META_END && pptr[2] == META_CLASS_END)
+      {
+#ifdef SUPPORT_UNICODE
+      uint32_t d;
+#endif
+      uint32_t c = pptr[1];
+
+      pptr += 2;                 /* Move on to class end */
+      if (meta == META_CLASS)    /* A positive one-char class can be */
+        {                        /* handled as a normal literal character. */
+        meta = c;                /* Set up the character */
+        goto NORMAL_CHAR_SET;
+        }
+
+      /* Handle a negative one-character class */
+
+      zeroreqcu = reqcu;
+      zeroreqcuflags = reqcuflags;
+      if (firstcuflags == REQ_UNSET) firstcuflags = REQ_NONE;
+      zerofirstcu = firstcu;
+      zerofirstcuflags = firstcuflags;
+
+      /* For caseless UTF or UCP mode, check whether this character has more
+      than one other case. If so, generate a special OP_NOTPROP item instead of
+      OP_NOTI. */
+
+#ifdef SUPPORT_UNICODE
+      if ((utf||ucp) && (options & PCRE2_CASELESS) != 0 &&
+          (d = UCD_CASESET(c)) != 0)
+        {
+        *code++ = OP_NOTPROP;
+        *code++ = PT_CLIST;
+        *code++ = d;
+        break;   /* We are finished with this class */
+        }
+#endif
+      /* Char has only one other case, or UCP not available */
+
+      *code++ = ((options & PCRE2_CASELESS) != 0)? OP_NOTI: OP_NOT;
+      code += PUTCHAR(c, code);
+      break;   /* We are finished with this class */
+      }        /* End of 1-char optimization */
+
+    /* Handle character classes that contain more than just one literal
+    character. If there are exactly two characters in a positive class, see if
+    they are case partners. This can be optimized to generate a caseless single
+    character match (which also sets first/required code units if relevant). */
+
+    if (meta == META_CLASS && pptr[1] < META_END && pptr[2] < META_END &&
+        pptr[3] == META_CLASS_END)
+      {
+      uint32_t c = pptr[1];
+
+#ifdef SUPPORT_UNICODE
+      if (UCD_CASESET(c) == 0)
+#endif
+        {
+        uint32_t d;
+
+#ifdef SUPPORT_UNICODE
+        if ((utf || ucp) && c > 127) d = UCD_OTHERCASE(c); else
+#endif
+          {
+#if PCRE2_CODE_UNIT_WIDTH != 8
+          if (c > 255) d = c; else
+#endif
+          d = TABLE_GET(c, cb->fcc, c);
+          }
+
+        if (c != d && pptr[2] == d)
+          {
+          pptr += 3;                 /* Move on to class end */
+          meta = c;
+          if ((options & PCRE2_CASELESS) == 0)
+            {
+            reset_caseful = TRUE;
+            options |= PCRE2_CASELESS;
+            req_caseopt = REQ_CASELESS;
+            }
+          goto CLASS_CASELESS_CHAR;
+          }
+        }
+      }
+
+    /* If a non-extended class contains a negative special such as \S, we need
+    to flip the negation flag at the end, so that support for characters > 255
+    works correctly (they are all included in the class). An extended class may
+    need to insert specific matching or non-matching code for wide characters.
+    */
+
+    should_flip_negation = match_all_or_no_wide_chars = FALSE;
+
+    /* Extended class (xclass) will be used when characters > 255
+    might match. */
+
+#ifdef SUPPORT_WIDE_CHARS
+    xclass = FALSE;
+    class_uchardata = code + LINK_SIZE + 2;   /* For XCLASS items */
+    class_uchardata_base = class_uchardata;   /* Save the start */
+#endif
+
+    /* For optimization purposes, we track some properties of the class:
+    class_has_8bitchar will be non-zero if the class contains at least one
+    character with a code point less than 256; xclass_has_prop will be TRUE if
+    Unicode property checks are present in the class. */
+
+    class_has_8bitchar = 0;
+#ifdef SUPPORT_WIDE_CHARS
+    xclass_has_prop = FALSE;
+#endif
+
+    /* Initialize the 256-bit (32-byte) bit map to all zeros. We build the map
+    in a temporary bit of memory, in case the class contains fewer than two
+    8-bit characters because in that case the compiled code doesn't use the bit
+    map. */
+
+    memset(classbits, 0, 32 * sizeof(uint8_t));
+
+    /* Process items until META_CLASS_END is reached. */
+
+    while ((meta = *(++pptr)) != META_CLASS_END)
+      {
+      /* Handle POSIX classes such as [:alpha:] etc. */
+
+      if (meta == META_POSIX || meta == META_POSIX_NEG)
+        {
+        BOOL local_negate = (meta == META_POSIX_NEG);
+        int posix_class = *(++pptr);
+        int taboffset, tabopt;
+        uint8_t pbits[32];
+
+        should_flip_negation = local_negate;  /* Note negative special */
+
+        /* If matching is caseless, upper and lower are converted to alpha.
+        This relies on the fact that the class table starts with alpha,
+        lower, upper as the first 3 entries. */
+
+        if ((options & PCRE2_CASELESS) != 0 && posix_class <= 2)
+          posix_class = 0;
+
+        /* When PCRE2_UCP is set, some of the POSIX classes are converted to
+        different escape sequences that use Unicode properties \p or \P.
+        Others that are not available via \p or \P have to generate
+        XCL_PROP/XCL_NOTPROP directly, which is done here. */
+
+#ifdef SUPPORT_UNICODE
+        if ((options & PCRE2_UCP) != 0) switch(posix_class)
+          {
+          case PC_GRAPH:
+          case PC_PRINT:
+          case PC_PUNCT:
+          *class_uchardata++ = local_negate? XCL_NOTPROP : XCL_PROP;
+          *class_uchardata++ = (PCRE2_UCHAR)
+            ((posix_class == PC_GRAPH)? PT_PXGRAPH :
+             (posix_class == PC_PRINT)? PT_PXPRINT : PT_PXPUNCT);
+          *class_uchardata++ = 0;
+          xclass_has_prop = TRUE;
+          goto CONTINUE_CLASS;
+
+          /* For the other POSIX classes (ascii, xdigit) we are going to
+          fall through to the non-UCP case and build a bit map for
+          characters with code points less than 256. However, if we are in
+          a negated POSIX class, characters with code points greater than
+          255 must either all match or all not match, depending on whether
+          the whole class is not or is negated. For example, for
+          [[:^ascii:]... they must all match, whereas for [^[:^xdigit:]...
+          they must not.
+
+          In the special case where there are no xclass items, this is
+          automatically handled by the use of OP_CLASS or OP_NCLASS, but an
+          explicit range is needed for OP_XCLASS. Setting a flag here
+          causes the range to be generated later when it is known that
+          OP_XCLASS is required. In the 8-bit library this is relevant only in
+          utf mode, since no wide characters can exist otherwise. */
+
+          default:
+#if PCRE2_CODE_UNIT_WIDTH == 8
+          if (utf)
+#endif
+          match_all_or_no_wide_chars |= local_negate;
+          break;
+          }
+#endif  /* SUPPORT_UNICODE */
+
+        /* In the non-UCP case, or when UCP makes no difference, we build the
+        bit map for the POSIX class in a chunk of local store because we may
+        be adding and subtracting from it, and we don't want to subtract bits
+        that may be in the main map already. At the end we or the result into
+        the bit map that is being built. */
+
+        posix_class *= 3;
+
+        /* Copy in the first table (always present) */
+
+        memcpy(pbits, cbits + posix_class_maps[posix_class],
+          32 * sizeof(uint8_t));
+
+        /* If there is a second table, add or remove it as required. */
+
+        taboffset = posix_class_maps[posix_class + 1];
+        tabopt = posix_class_maps[posix_class + 2];
+
+        if (taboffset >= 0)
+          {
+          if (tabopt >= 0)
+            for (int i = 0; i < 32; i++) pbits[i] |= cbits[(int)i + taboffset];
+          else
+            for (int i = 0; i < 32; i++) pbits[i] &= ~cbits[(int)i + taboffset];
+          }
+
+        /* Now see if we need to remove any special characters. An option
+        value of 1 removes vertical space and 2 removes underscore. */
+
+        if (tabopt < 0) tabopt = -tabopt;
+        if (tabopt == 1) pbits[1] &= ~0x3c;
+          else if (tabopt == 2) pbits[11] &= 0x7f;
+
+        /* Add the POSIX table or its complement into the main table that is
+        being built and we are done. */
+
+        if (local_negate)
+          for (int i = 0; i < 32; i++) classbits[i] |= (uint8_t)(~pbits[i]);
+        else
+          for (int i = 0; i < 32; i++) classbits[i] |= pbits[i];
+
+        /* Every class contains at least one < 256 character. */
+
+        class_has_8bitchar = 1;
+        goto CONTINUE_CLASS;    /* End of POSIX handling */
+        }
+
+      /* Other than POSIX classes, the only items we should encounter are
+      \d-type escapes and literal characters (possibly as ranges). */
+
+      if (meta == META_BIGVALUE)
+        {
+        meta = *(++pptr);
+        goto CLASS_LITERAL;
+        }
+
+      /* Any other non-literal must be an escape */
+
+      if (meta >= META_END)
+        {
+        if (META_CODE(meta) != META_ESCAPE)
+          {
+#ifdef DEBUG_SHOW_PARSED
+          fprintf(stderr, "** Unrecognized parsed pattern item 0x%.8x "
+                          "in character class\n", meta);
+#endif
+          *errorcodeptr = ERR89;  /* Internal error - unrecognized. */
+          return 0;
+          }
+        escape = META_DATA(meta);
+
+        /* Every class contains at least one < 256 character. */
+
+        class_has_8bitchar++;
+
+        switch(escape)
+          {
+          case ESC_d:
+          for (int i = 0; i < 32; i++) classbits[i] |= cbits[i+cbit_digit];
+          break;
+
+          case ESC_D:
+          should_flip_negation = TRUE;
+          for (int i = 0; i < 32; i++)
+            classbits[i] |= (uint8_t)(~cbits[i+cbit_digit]);
+          break;
+
+          case ESC_w:
+          for (int i = 0; i < 32; i++) classbits[i] |= cbits[i+cbit_word];
+          break;
+
+          case ESC_W:
+          should_flip_negation = TRUE;
+          for (int i = 0; i < 32; i++)
+            classbits[i] |= (uint8_t)(~cbits[i+cbit_word]);
+          break;
+
+          /* Perl 5.004 onwards omitted VT from \s, but restored it at Perl
+          5.18. Before PCRE 8.34, we had to preserve the VT bit if it was
+          previously set by something earlier in the character class.
+          Luckily, the value of CHAR_VT is 0x0b in both ASCII and EBCDIC, so
+          we could just adjust the appropriate bit. From PCRE 8.34 we no
+          longer treat \s and \S specially. */
+
+          case ESC_s:
+          for (int i = 0; i < 32; i++) classbits[i] |= cbits[i+cbit_space];
+          break;
+
+          case ESC_S:
+          should_flip_negation = TRUE;
+          for (int i = 0; i < 32; i++)
+            classbits[i] |= (uint8_t)(~cbits[i+cbit_space]);
+          break;
+
+          /* When adding the horizontal or vertical space lists to a class, or
+          their complements, disable PCRE2_CASELESS, because it justs wastes
+          time, and in the "not-x" UTF cases can create unwanted duplicates in
+          the XCLASS list (provoked by characters that have more than one other
+          case and by both cases being in the same "not-x" sublist). */
+
+          case ESC_h:
+          (void)add_list_to_class(classbits, &class_uchardata,
+            options & ~PCRE2_CASELESS, cb, PRIV(hspace_list), NOTACHAR);
+          break;
+
+          case ESC_H:
+          (void)add_not_list_to_class(classbits, &class_uchardata,
+            options & ~PCRE2_CASELESS, cb, PRIV(hspace_list));
+          break;
+
+          case ESC_v:
+          (void)add_list_to_class(classbits, &class_uchardata,
+            options & ~PCRE2_CASELESS, cb, PRIV(vspace_list), NOTACHAR);
+          break;
+
+          case ESC_V:
+          (void)add_not_list_to_class(classbits, &class_uchardata,
+            options & ~PCRE2_CASELESS, cb, PRIV(vspace_list));
+          break;
+
+          /* If Unicode is not supported, \P and \p are not allowed and are
+          faulted at parse time, so will never appear here. */
+
+#ifdef SUPPORT_UNICODE
+          case ESC_p:
+          case ESC_P:
+            {
+            uint32_t ptype = *(++pptr) >> 16;
+            uint32_t pdata = *pptr & 0xffff;
+            *class_uchardata++ = (escape == ESC_p)? XCL_PROP : XCL_NOTPROP;
+            *class_uchardata++ = ptype;
+            *class_uchardata++ = pdata;
+            xclass_has_prop = TRUE;
+            class_has_8bitchar--;                /* Undo! */
+            }
+          break;
+#endif
+          }
+
+        goto CONTINUE_CLASS;
+        }  /* End handling \d-type escapes */
+
+      /* A literal character may be followed by a range meta. At parse time
+      there are checks for out-of-order characters, for ranges where the two
+      characters are equal, and for hyphens that cannot indicate a range. At
+      this point, therefore, no checking is needed. */
+
+      else
+        {
+        uint32_t c, d;
+
+        CLASS_LITERAL:
+        c = d = meta;
+
+        /* Remember if \r or \n were explicitly used */
+
+        if (c == CHAR_CR || c == CHAR_NL) cb->external_flags |= PCRE2_HASCRORLF;
+
+        /* Process a character range */
+
+        if (pptr[1] == META_RANGE_LITERAL || pptr[1] == META_RANGE_ESCAPED)
+          {
+#ifdef EBCDIC
+          BOOL range_is_literal = (pptr[1] == META_RANGE_LITERAL);
+#endif
+          pptr += 2;
+          d = *pptr;
+          if (d == META_BIGVALUE) d = *(++pptr);
+
+          /* Remember an explicit \r or \n, and add the range to the class. */
+
+          if (d == CHAR_CR || d == CHAR_NL) cb->external_flags |= PCRE2_HASCRORLF;
+
+          /* In an EBCDIC environment, Perl treats alphabetic ranges specially
+          because there are holes in the encoding, and simply using the range
+          A-Z (for example) would include the characters in the holes. This
+          applies only to literal ranges; [\xC1-\xE9] is different to [A-Z]. */
+
+#ifdef EBCDIC
+          if (range_is_literal &&
+               (cb->ctypes[c] & ctype_letter) != 0 &&
+               (cb->ctypes[d] & ctype_letter) != 0 &&
+               (c <= CHAR_z) == (d <= CHAR_z))
+            {
+            uint32_t uc = (d <= CHAR_z)? 0 : 64;
+            uint32_t C = c - uc;
+            uint32_t D = d - uc;
+
+            if (C <= CHAR_i)
+              {
+              class_has_8bitchar +=
+                add_to_class(classbits, &class_uchardata, options, cb, C + uc,
+                  ((D < CHAR_i)? D : CHAR_i) + uc);
+              C = CHAR_j;
+              }
+
+            if (C <= D && C <= CHAR_r)
+              {
+              class_has_8bitchar +=
+                add_to_class(classbits, &class_uchardata, options, cb, C + uc,
+                  ((D < CHAR_r)? D : CHAR_r) + uc);
+              C = CHAR_s;
+              }
+
+            if (C <= D)
+              {
+              class_has_8bitchar +=
+                add_to_class(classbits, &class_uchardata, options, cb, C + uc,
+                  D + uc);
+              }
+            }
+          else
+#endif
+          /* Not an EBCDIC special range */
+
+          class_has_8bitchar +=
+            add_to_class(classbits, &class_uchardata, options, cb, c, d);
+          goto CONTINUE_CLASS;   /* Go get the next char in the class */
+          }  /* End of range handling */
+
+
+        /* Handle a single character. */
+
+        class_has_8bitchar +=
+          add_to_class(classbits, &class_uchardata, options, cb, meta, meta);
+        }
+
+      /* Continue to the next item in the class. */
+
+      CONTINUE_CLASS:
+
+#ifdef SUPPORT_WIDE_CHARS
+      /* If any wide characters or Unicode properties have been encountered,
+      set xclass = TRUE. Then, in the pre-compile phase, accumulate the length
+      of the extra data and reset the pointer. This is so that very large
+      classes that contain a zillion wide characters or Unicode property tests
+      do not overwrite the workspace (which is on the stack). */
+
+      if (class_uchardata > class_uchardata_base)
+        {
+        xclass = TRUE;
+        if (lengthptr != NULL)
+          {
+          *lengthptr += class_uchardata - class_uchardata_base;
+          class_uchardata = class_uchardata_base;
+          }
+        }
+#endif
+
+      continue;  /* Needed to avoid error when not supporting wide chars */
+      }   /* End of main class-processing loop */
+
+    /* If this class is the first thing in the branch, there can be no first
+    char setting, whatever the repeat count. Any reqcu setting must remain
+    unchanged after any kind of repeat. */
+
+    if (firstcuflags == REQ_UNSET) firstcuflags = REQ_NONE;
+    zerofirstcu = firstcu;
+    zerofirstcuflags = firstcuflags;
+    zeroreqcu = reqcu;
+    zeroreqcuflags = reqcuflags;
+
+    /* If there are characters with values > 255, or Unicode property settings
+    (\p or \P), we have to compile an extended class, with its own opcode,
+    unless there were no property settings and there was a negated special such
+    as \S in the class, and PCRE2_UCP is not set, because in that case all
+    characters > 255 are in or not in the class, so any that were explicitly
+    given as well can be ignored.
+
+    In the UCP case, if certain negated POSIX classes ([:^ascii:] or
+    [^:xdigit:]) were present in a class, we either have to match or not match
+    all wide characters (depending on whether the whole class is or is not
+    negated). This requirement is indicated by match_all_or_no_wide_chars being
+    true. We do this by including an explicit range, which works in both cases.
+    This applies only in UTF and 16-bit and 32-bit non-UTF modes, since there
+    cannot be any wide characters in 8-bit non-UTF mode.
+
+    When there *are* properties in a positive UTF-8 or any 16-bit or 32_bit
+    class where \S etc is present without PCRE2_UCP, causing an extended class
+    to be compiled, we make sure that all characters > 255 are included by
+    forcing match_all_or_no_wide_chars to be true.
+
+    If, when generating an xclass, there are no characters < 256, we can omit
+    the bitmap in the actual compiled code. */
+
+#ifdef SUPPORT_WIDE_CHARS  /* Defined for 16/32 bits, or 8-bit with Unicode */
+    if (xclass && (
+#ifdef SUPPORT_UNICODE
+        (options & PCRE2_UCP) != 0 ||
+#endif
+        xclass_has_prop || !should_flip_negation))
+      {
+      if (match_all_or_no_wide_chars || (
+#if PCRE2_CODE_UNIT_WIDTH == 8
+           utf &&
+#endif
+           should_flip_negation && !negate_class && (options & PCRE2_UCP) == 0))
+        {
+        *class_uchardata++ = XCL_RANGE;
+        if (utf)   /* Will always be utf in the 8-bit library */
+          {
+          class_uchardata += PRIV(ord2utf)(0x100, class_uchardata);
+          class_uchardata += PRIV(ord2utf)(MAX_UTF_CODE_POINT, class_uchardata);
+          }
+        else       /* Can only happen for the 16-bit & 32-bit libraries */
+          {
+#if PCRE2_CODE_UNIT_WIDTH == 16
+          *class_uchardata++ = 0x100;
+          *class_uchardata++ = 0xffffu;
+#elif PCRE2_CODE_UNIT_WIDTH == 32
+          *class_uchardata++ = 0x100;
+          *class_uchardata++ = 0xffffffffu;
+#endif
+          }
+        }
+      *class_uchardata++ = XCL_END;    /* Marks the end of extra data */
+      *code++ = OP_XCLASS;
+      code += LINK_SIZE;
+      *code = negate_class? XCL_NOT:0;
+      if (xclass_has_prop) *code |= XCL_HASPROP;
+
+      /* If the map is required, move up the extra data to make room for it;
+      otherwise just move the code pointer to the end of the extra data. */
+
+      if (class_has_8bitchar > 0)
+        {
+        *code++ |= XCL_MAP;
+        (void)memmove(code + (32 / sizeof(PCRE2_UCHAR)), code,
+          CU2BYTES(class_uchardata - code));
+        if (negate_class && !xclass_has_prop)
+          {
+          /* Using 255 ^ instead of ~ avoids clang sanitize warning. */
+          for (int i = 0; i < 32; i++) classbits[i] = 255 ^ classbits[i];
+          }
+        memcpy(code, classbits, 32);
+        code = class_uchardata + (32 / sizeof(PCRE2_UCHAR));
+        }
+      else code = class_uchardata;
+
+      /* Now fill in the complete length of the item */
+
+      PUT(previous, 1, (int)(code - previous));
+      break;   /* End of class handling */
+      }
+#endif  /* SUPPORT_WIDE_CHARS */
+
+    /* If there are no characters > 255, or they are all to be included or
+    excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
+    whole class was negated and whether there were negative specials such as \S
+    (non-UCP) in the class. Then copy the 32-byte map into the code vector,
+    negating it if necessary. */
+
+    *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
+    if (lengthptr == NULL)    /* Save time in the pre-compile phase */
+      {
+      if (negate_class)
+        {
+       /* Using 255 ^ instead of ~ avoids clang sanitize warning. */
+       for (int i = 0; i < 32; i++) classbits[i] = 255 ^ classbits[i];
+       }
+      memcpy(code, classbits, 32);
+      }
+    code += 32 / sizeof(PCRE2_UCHAR);
+    break;  /* End of class processing */
+
+
+    /* ===================================================================*/
+    /* Deal with (*VERB)s. */
+
+    /* Check for open captures before ACCEPT and close those that are within
+    the same assertion level, also converting ACCEPT to ASSERT_ACCEPT in an
+    assertion. In the first pass, just accumulate the length required;
+    otherwise hitting (*ACCEPT) inside many nested parentheses can cause
+    workspace overflow. Do not set firstcu after *ACCEPT. */
+
+    case META_ACCEPT:
+    cb->had_accept = had_accept = TRUE;
+    for (oc = cb->open_caps;
+         oc != NULL && oc->assert_depth >= cb->assert_depth;
+         oc = oc->next)
+      {
+      if (lengthptr != NULL)
+        {
+        *lengthptr += CU2BYTES(1) + IMM2_SIZE;
+        }
+      else
+        {
+        *code++ = OP_CLOSE;
+        PUT2INC(code, 0, oc->number);
+        }
+      }
+    *code++ = (cb->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
+    if (firstcuflags == REQ_UNSET) firstcuflags = REQ_NONE;
+    break;
+
+    case META_PRUNE:
+    case META_SKIP:
+    cb->had_pruneorskip = TRUE;
+    /* Fall through */
+    case META_COMMIT:
+    case META_FAIL:
+    *code++ = verbops[(meta - META_MARK) >> 16];
+    break;
+
+    case META_THEN:
+    cb->external_flags |= PCRE2_HASTHEN;
+    *code++ = OP_THEN;
+    break;
+
+    /* Handle verbs with arguments. Arguments can be very long, especially in
+    16- and 32-bit modes, and can overflow the workspace in the first pass.
+    However, the argument length is constrained to be small enough to fit in
+    one code unit. This check happens in parse_regex(). In the first pass,
+    instead of putting the argument into memory, we just update the length
+    counter and set up an empty argument. */
+
+    case META_THEN_ARG:
+    cb->external_flags |= PCRE2_HASTHEN;
+    goto VERB_ARG;
+
+    case META_PRUNE_ARG:
+    case META_SKIP_ARG:
+    cb->had_pruneorskip = TRUE;
+    /* Fall through */
+    case META_MARK:
+    case META_COMMIT_ARG:
+    VERB_ARG:
+    *code++ = verbops[(meta - META_MARK) >> 16];
+    /* The length is in characters. */
+    verbarglen = *(++pptr);
+    verbculen = 0;
+    tempcode = code++;
+    for (int i = 0; i < (int)verbarglen; i++)
+      {
+      meta = *(++pptr);
+#ifdef SUPPORT_UNICODE
+      if (utf) mclength = PRIV(ord2utf)(meta, mcbuffer); else
+#endif
+        {
+        mclength = 1;
+        mcbuffer[0] = meta;
+        }
+      if (lengthptr != NULL) *lengthptr += mclength; else
+        {
+        memcpy(code, mcbuffer, CU2BYTES(mclength));
+        code += mclength;
+        verbculen += mclength;
+        }
+      }
+
+    *tempcode = verbculen;   /* Fill in the code unit length */
+    *code++ = 0;             /* Terminating zero */
+    break;
+
+
+    /* ===================================================================*/
+    /* Handle options change. The new setting must be passed back for use in
+    subsequent branches. Reset the greedy defaults and the case value for
+    firstcu and reqcu. */
+
+    case META_OPTIONS:
+    *optionsptr = options = *(++pptr);
+    greedy_default = ((options & PCRE2_UNGREEDY) != 0);
+    greedy_non_default = greedy_default ^ 1;
+    req_caseopt = ((options & PCRE2_CASELESS) != 0)? REQ_CASELESS : 0;
+    break;
+
+
+    /* ===================================================================*/
+    /* Handle conditional subpatterns. The case of (?(Rdigits) is ambiguous
+    because it could be a numerical check on recursion, or a name check on a
+    group's being set. The pre-pass sets up META_COND_RNUMBER as a name so that
+    we can handle it either way. We first try for a name; if not found, process
+    the number. */
+
+    case META_COND_RNUMBER:   /* (?(Rdigits) */
+    case META_COND_NAME:      /* (?(name) or (?'name') or ?(<name>) */
+    case META_COND_RNAME:     /* (?(R&name) - test for recursion */
+    bravalue = OP_COND;
+      {
+      int count, index;
+      unsigned int i;
+      PCRE2_SPTR name;
+      named_group *ng = cb->named_groups;
+      uint32_t length = *(++pptr);
+
+      GETPLUSOFFSET(offset, pptr);
+      name = cb->start_pattern + offset;
+
+      /* In the first pass, the names generated in the pre-pass are available,
+      but the main name table has not yet been created. Scan the list of names
+      generated in the pre-pass in order to get a number and whether or not
+      this name is duplicated. If it is not duplicated, we can handle it as a
+      numerical group. */
+
+      for (i = 0; i < cb->names_found; i++, ng++)
+        {
+        if (length == ng->length &&
+            PRIV(strncmp)(name, ng->name, length) == 0)
+          {
+          if (!ng->isdup)
+            {
+            code[1+LINK_SIZE] = (meta == META_COND_RNAME)? OP_RREF : OP_CREF;
+            PUT2(code, 2+LINK_SIZE, ng->number);
+            if (ng->number > cb->top_backref) cb->top_backref = ng->number;
+            skipunits = 1+IMM2_SIZE;
+            goto GROUP_PROCESS_NOTE_EMPTY;
+            }
+          break;  /* Found a duplicated name */
+          }
+        }
+
+      /* If the name was not found we have a bad reference, unless we are
+      dealing with R<digits>, which is treated as a recursion test by number.
+      */
+
+      if (i >= cb->names_found)
+        {
+        groupnumber = 0;
+        if (meta == META_COND_RNUMBER)
+          {
+          for (i = 1; i < length; i++)
+            {
+            groupnumber = groupnumber * 10 + name[i] - CHAR_0;
+            if (groupnumber > MAX_GROUP_NUMBER)
+              {
+              *errorcodeptr = ERR61;
+              cb->erroroffset = offset + i;
+              return 0;
+              }
+            }
+          }
+
+        if (meta != META_COND_RNUMBER || groupnumber > cb->bracount)
+          {
+          *errorcodeptr = ERR15;
+          cb->erroroffset = offset;
+          return 0;
+          }
+
+        /* (?Rdigits) treated as a recursion reference by number. A value of
+        zero (which is the result of both (?R) and (?R0)) means "any", and is
+        translated into RREF_ANY (which is 0xffff). */
+
+        if (groupnumber == 0) groupnumber = RREF_ANY;
+        code[1+LINK_SIZE] = OP_RREF;
+        PUT2(code, 2+LINK_SIZE, groupnumber);
+        skipunits = 1+IMM2_SIZE;
+        goto GROUP_PROCESS_NOTE_EMPTY;
+        }
+
+      /* A duplicated name was found. Note that if an R<digits> name is found
+      (META_COND_RNUMBER), it is a reference test, not a recursion test. */
+
+      code[1+LINK_SIZE] = (meta == META_COND_RNAME)? OP_RREF : OP_CREF;
+
+      /* We have a duplicated name. In the compile pass we have to search the
+      main table in order to get the index and count values. */
+
+      count = 0;  /* Values for first pass (avoids compiler warning) */
+      index = 0;
+      if (lengthptr == NULL && !find_dupname_details(name, length, &index,
+            &count, errorcodeptr, cb)) return 0;
+
+      /* Add one to the opcode to change CREF/RREF into DNCREF/DNRREF and
+      insert appropriate data values. */
+
+      code[1+LINK_SIZE]++;
+      skipunits = 1+2*IMM2_SIZE;
+      PUT2(code, 2+LINK_SIZE, index);
+      PUT2(code, 2+LINK_SIZE+IMM2_SIZE, count);
+      }
+    goto GROUP_PROCESS_NOTE_EMPTY;
+
+    /* The DEFINE condition is always false. Its internal groups may never
+    be called, so matched_char must remain false, hence the jump to
+    GROUP_PROCESS rather than GROUP_PROCESS_NOTE_EMPTY. */
+
+    case META_COND_DEFINE:
+    bravalue = OP_COND;
+    GETPLUSOFFSET(offset, pptr);
+    code[1+LINK_SIZE] = OP_DEFINE;
+    skipunits = 1;
+    goto GROUP_PROCESS;
+
+    /* Conditional test of a group's being set. */
+
+    case META_COND_NUMBER:
+    bravalue = OP_COND;
+    GETPLUSOFFSET(offset, pptr);
+    groupnumber = *(++pptr);
+    if (groupnumber > cb->bracount)
+      {
+      *errorcodeptr = ERR15;
+      cb->erroroffset = offset;
+      return 0;
+      }
+    if (groupnumber > cb->top_backref) cb->top_backref = groupnumber;
+    offset -= 2;   /* Point at initial ( for too many branches error */
+    code[1+LINK_SIZE] = OP_CREF;
+    skipunits = 1+IMM2_SIZE;
+    PUT2(code, 2+LINK_SIZE, groupnumber);
+    goto GROUP_PROCESS_NOTE_EMPTY;
+
+    /* Test for the PCRE2 version. */
+
+    case META_COND_VERSION:
+    bravalue = OP_COND;
+    if (pptr[1] > 0)
+      code[1+LINK_SIZE] = ((PCRE2_MAJOR > pptr[2]) ||
+        (PCRE2_MAJOR == pptr[2] && PCRE2_MINOR >= pptr[3]))?
+          OP_TRUE : OP_FALSE;
+    else
+      code[1+LINK_SIZE] = (PCRE2_MAJOR == pptr[2] && PCRE2_MINOR == pptr[3])?
+        OP_TRUE : OP_FALSE;
+    skipunits = 1;
+    pptr += 3;
+    goto GROUP_PROCESS_NOTE_EMPTY;
+
+    /* The condition is an assertion, possibly preceded by a callout. */
+
+    case META_COND_ASSERT:
+    bravalue = OP_COND;
+    goto GROUP_PROCESS_NOTE_EMPTY;
+
+
+    /* ===================================================================*/
+    /* Handle all kinds of nested bracketed groups. The non-capturing,
+    non-conditional cases are here; others come to GROUP_PROCESS via goto. */
+
+    case META_LOOKAHEAD:
+    bravalue = OP_ASSERT;
+    cb->assert_depth += 1;
+    goto GROUP_PROCESS;
+
+    case META_LOOKAHEAD_NA:
+    bravalue = OP_ASSERT_NA;
+    cb->assert_depth += 1;
+    goto GROUP_PROCESS;
+
+    /* Optimize (?!) to (*FAIL) unless it is quantified - which is a weird
+    thing to do, but Perl allows all assertions to be quantified, and when
+    they contain capturing parentheses there may be a potential use for
+    this feature. Not that that applies to a quantified (?!) but we allow
+    it for uniformity. */
+
+    case META_LOOKAHEADNOT:
+    if (pptr[1] == META_KET &&
+         (pptr[2] < META_ASTERISK || pptr[2] > META_MINMAX_QUERY))
+      {
+      *code++ = OP_FAIL;
+      pptr++;
+      }
+    else
+      {
+      bravalue = OP_ASSERT_NOT;
+      cb->assert_depth += 1;
+      goto GROUP_PROCESS;
+      }
+    break;
+
+    case META_LOOKBEHIND:
+    bravalue = OP_ASSERTBACK;
+    cb->assert_depth += 1;
+    goto GROUP_PROCESS;
+
+    case META_LOOKBEHINDNOT:
+    bravalue = OP_ASSERTBACK_NOT;
+    cb->assert_depth += 1;
+    goto GROUP_PROCESS;
+
+    case META_LOOKBEHIND_NA:
+    bravalue = OP_ASSERTBACK_NA;
+    cb->assert_depth += 1;
+    goto GROUP_PROCESS;
+
+    case META_ATOMIC:
+    bravalue = OP_ONCE;
+    goto GROUP_PROCESS_NOTE_EMPTY;
+
+    case META_SCRIPT_RUN:
+    bravalue = OP_SCRIPT_RUN;
+    goto GROUP_PROCESS_NOTE_EMPTY;
+
+    case META_NOCAPTURE:
+    bravalue = OP_BRA;
+    /* Fall through */
+
+    /* Process nested bracketed regex. The nesting depth is maintained for the
+    benefit of the stackguard function. The test for too deep nesting is now
+    done in parse_regex(). Assertion and DEFINE groups come to GROUP_PROCESS;
+    others come to GROUP_PROCESS_NOTE_EMPTY, to indicate that we need to take
+    note of whether or not they may match an empty string. */
+
+    GROUP_PROCESS_NOTE_EMPTY:
+    note_group_empty = TRUE;
+
+    GROUP_PROCESS:
+    cb->parens_depth += 1;
+    *code = bravalue;
+    pptr++;
+    tempcode = code;
+    tempreqvary = cb->req_varyopt;        /* Save value before group */
+    length_prevgroup = 0;                 /* Initialize for pre-compile phase */
+
+    if ((group_return =
+         compile_regex(
+         options,                         /* The option state */
+         &tempcode,                       /* Where to put code (updated) */
+         &pptr,                           /* Input pointer (updated) */
+         errorcodeptr,                    /* Where to put an error message */
+         skipunits,                       /* Skip over bracket number */
+         &subfirstcu,                     /* For possible first char */
+         &subfirstcuflags,
+         &subreqcu,                       /* For possible last char */
+         &subreqcuflags,
+         bcptr,                           /* Current branch chain */
+         cb,                              /* Compile data block */
+         (lengthptr == NULL)? NULL :      /* Actual compile phase */
+           &length_prevgroup              /* Pre-compile phase */
+         )) == 0)
+      return 0;  /* Error */
+
+    cb->parens_depth -= 1;
+
+    /* If that was a non-conditional significant group (not an assertion, not a
+    DEFINE) that matches at least one character, then the current item matches
+    a character. Conditionals are handled below. */
+
+    if (note_group_empty && bravalue != OP_COND && group_return > 0)
+      matched_char = TRUE;
+
+    /* If we've just compiled an assertion, pop the assert depth. */
+
+    if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NA)
+      cb->assert_depth -= 1;
+
+    /* At the end of compiling, code is still pointing to the start of the
+    group, while tempcode has been updated to point past the end of the group.
+    The parsed pattern pointer (pptr) is on the closing META_KET.
+
+    If this is a conditional bracket, check that there are no more than
+    two branches in the group, or just one if it's a DEFINE group. We do this
+    in the real compile phase, not in the pre-pass, where the whole group may
+    not be available. */
+
+    if (bravalue == OP_COND && lengthptr == NULL)
+      {
+      PCRE2_UCHAR *tc = code;
+      int condcount = 0;
+
+      do {
+         condcount++;
+         tc += GET(tc,1);
+         }
+      while (*tc != OP_KET);
+
+      /* A DEFINE group is never obeyed inline (the "condition" is always
+      false). It must have only one branch. Having checked this, change the
+      opcode to OP_FALSE. */
+
+      if (code[LINK_SIZE+1] == OP_DEFINE)
+        {
+        if (condcount > 1)
+          {
+          cb->erroroffset = offset;
+          *errorcodeptr = ERR54;
+          return 0;
+          }
+        code[LINK_SIZE+1] = OP_FALSE;
+        bravalue = OP_DEFINE;   /* A flag to suppress char handling below */
+        }
+
+      /* A "normal" conditional group. If there is just one branch, we must not
+      make use of its firstcu or reqcu, because this is equivalent to an
+      empty second branch. Also, it may match an empty string. If there are two
+      branches, this item must match a character if the group must. */
+
+      else
+        {
+        if (condcount > 2)
+          {
+          cb->erroroffset = offset;
+          *errorcodeptr = ERR27;
+          return 0;
+          }
+        if (condcount == 1) subfirstcuflags = subreqcuflags = REQ_NONE;
+          else if (group_return > 0) matched_char = TRUE;
+        }
+      }
+
+    /* In the pre-compile phase, update the length by the length of the group,
+    less the brackets at either end. Then reduce the compiled code to just a
+    set of non-capturing brackets so that it doesn't use much memory if it is
+    duplicated by a quantifier.*/
+
+    if (lengthptr != NULL)
+      {
+      if (OFLOW_MAX - *lengthptr < length_prevgroup - 2 - 2*LINK_SIZE)
+        {
+        *errorcodeptr = ERR20;
+        return 0;
+        }
+      *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
+      code++;   /* This already contains bravalue */
+      PUTINC(code, 0, 1 + LINK_SIZE);
+      *code++ = OP_KET;
+      PUTINC(code, 0, 1 + LINK_SIZE);
+      break;    /* No need to waste time with special character handling */
+      }
+
+    /* Otherwise update the main code pointer to the end of the group. */
+
+    code = tempcode;
+
+    /* For a DEFINE group, required and first character settings are not
+    relevant. */
+
+    if (bravalue == OP_DEFINE) break;
+
+    /* Handle updating of the required and first code units for other types of
+    group. Update for normal brackets of all kinds, and conditions with two
+    branches (see code above). If the bracket is followed by a quantifier with
+    zero repeat, we have to back off. Hence the definition of zeroreqcu and
+    zerofirstcu outside the main loop so that they can be accessed for the back
+    off. */
+
+    zeroreqcu = reqcu;
+    zeroreqcuflags = reqcuflags;
+    zerofirstcu = firstcu;
+    zerofirstcuflags = firstcuflags;
+    groupsetfirstcu = FALSE;
+
+    if (bravalue >= OP_ONCE)  /* Not an assertion */
+      {
+      /* If we have not yet set a firstcu in this branch, take it from the
+      subpattern, remembering that it was set here so that a repeat of more
+      than one can replicate it as reqcu if necessary. If the subpattern has
+      no firstcu, set "none" for the whole branch. In both cases, a zero
+      repeat forces firstcu to "none". */
+
+      if (firstcuflags == REQ_UNSET && subfirstcuflags != REQ_UNSET)
+        {
+        if (subfirstcuflags < REQ_NONE)
+          {
+          firstcu = subfirstcu;
+          firstcuflags = subfirstcuflags;
+          groupsetfirstcu = TRUE;
+          }
+        else firstcuflags = REQ_NONE;
+        zerofirstcuflags = REQ_NONE;
+        }
+
+      /* If firstcu was previously set, convert the subpattern's firstcu
+      into reqcu if there wasn't one, using the vary flag that was in
+      existence beforehand. */
+
+      else if (subfirstcuflags < REQ_NONE && subreqcuflags >= REQ_NONE)
+        {
+        subreqcu = subfirstcu;
+        subreqcuflags = subfirstcuflags | tempreqvary;
+        }
+
+      /* If the subpattern set a required code unit (or set a first code unit
+      that isn't really the first code unit - see above), set it. */
+
+      if (subreqcuflags < REQ_NONE)
+        {
+        reqcu = subreqcu;
+        reqcuflags = subreqcuflags;
+        }
+      }
+
+    /* For a forward assertion, we take the reqcu, if set, provided that the
+    group has also set a firstcu. This can be helpful if the pattern that
+    follows the assertion doesn't set a different char. For example, it's
+    useful for /(?=abcde).+/. We can't set firstcu for an assertion, however
+    because it leads to incorrect effect for patterns such as /(?=a)a.+/ when
+    the "real" "a" would then become a reqcu instead of a firstcu. This is
+    overcome by a scan at the end if there's no firstcu, looking for an
+    asserted first char. A similar effect for patterns like /(?=.*X)X$/ means
+    we must only take the reqcu when the group also set a firstcu. Otherwise,
+    in that example, 'X' ends up set for both. */
+
+    else if ((bravalue == OP_ASSERT || bravalue == OP_ASSERT_NA) &&
+             subreqcuflags < REQ_NONE && subfirstcuflags < REQ_NONE)
+      {
+      reqcu = subreqcu;
+      reqcuflags = subreqcuflags;
+      }
+
+    break;  /* End of nested group handling */
+
+
+    /* ===================================================================*/
+    /* Handle named backreferences and recursions. */
+
+    case META_BACKREF_BYNAME:
+    case META_RECURSE_BYNAME:
+      {
+      int count, index;
+      PCRE2_SPTR name;
+      BOOL is_dupname = FALSE;
+      named_group *ng = cb->named_groups;
+      uint32_t length = *(++pptr);
+
+      GETPLUSOFFSET(offset, pptr);
+      name = cb->start_pattern + offset;
+
+      /* In the first pass, the names generated in the pre-pass are available,
+      but the main name table has not yet been created. Scan the list of names
+      generated in the pre-pass in order to get a number and whether or not
+      this name is duplicated. */
+
+      groupnumber = 0;
+      for (unsigned int i = 0; i < cb->names_found; i++, ng++)
+        {
+        if (length == ng->length &&
+            PRIV(strncmp)(name, ng->name, length) == 0)
+          {
+          is_dupname = ng->isdup;
+          groupnumber = ng->number;
+
+          /* For a recursion, that's all that is needed. We can now go to
+          the code that handles numerical recursion, applying it to the first
+          group with the given name. */
+
+          if (meta == META_RECURSE_BYNAME)
+            {
+            meta_arg = groupnumber;
+            goto HANDLE_NUMERICAL_RECURSION;
+            }
+
+          /* For a back reference, update the back reference map and the
+          maximum back reference. */
+
+          cb->backref_map |= (groupnumber < 32)? (1u << groupnumber) : 1;
+          if (groupnumber > cb->top_backref)
+            cb->top_backref = groupnumber;
+          }
+        }
+
+      /* If the name was not found we have a bad reference. */
+
+      if (groupnumber == 0)
+        {
+        *errorcodeptr = ERR15;
+        cb->erroroffset = offset;
+        return 0;
+        }
+
+      /* If a back reference name is not duplicated, we can handle it as
+      a numerical reference. */
+
+      if (!is_dupname)
+        {
+        meta_arg = groupnumber;
+        goto HANDLE_SINGLE_REFERENCE;
+        }
+
+      /* If a back reference name is duplicated, we generate a different
+      opcode to a numerical back reference. In the second pass we must
+      search for the index and count in the final name table. */
+
+      count = 0;  /* Values for first pass (avoids compiler warning) */
+      index = 0;
+      if (lengthptr == NULL && !find_dupname_details(name, length, &index,
+            &count, errorcodeptr, cb)) return 0;
+
+      if (firstcuflags == REQ_UNSET) firstcuflags = REQ_NONE;
+      *code++ = ((options & PCRE2_CASELESS) != 0)? OP_DNREFI : OP_DNREF;
+      PUT2INC(code, 0, index);
+      PUT2INC(code, 0, count);
+      }
+    break;
+
+
+    /* ===================================================================*/
+    /* Handle a numerical callout. */
+
+    case META_CALLOUT_NUMBER:
+    code[0] = OP_CALLOUT;
+    PUT(code, 1, pptr[1]);               /* Offset to next pattern item */
+    PUT(code, 1 + LINK_SIZE, pptr[2]);   /* Length of next pattern item */
+    code[1 + 2*LINK_SIZE] = pptr[3];
+    pptr += 3;
+    code += PRIV(OP_lengths)[OP_CALLOUT];
+    break;
+
+
+    /* ===================================================================*/
+    /* Handle a callout with a string argument. In the pre-pass we just compute
+    the length without generating anything. The length in pptr[3] includes both
+    delimiters; in the actual compile only the first one is copied, but a
+    terminating zero is added. Any doubled delimiters within the string make
+    this an overestimate, but it is not worth bothering about. */
+
+    case META_CALLOUT_STRING:
+    if (lengthptr != NULL)
+      {
+      *lengthptr += pptr[3] + (1 + 4*LINK_SIZE);
+      pptr += 3;
+      SKIPOFFSET(pptr);
+      }
+
+    /* In the real compile we can copy the string. The starting delimiter is
+     included so that the client can discover it if they want. We also pass the
+     start offset to help a script language give better error messages. */
+
+    else
+      {
+      PCRE2_SPTR pp;
+      uint32_t delimiter;
+      uint32_t length = pptr[3];
+      PCRE2_UCHAR *callout_string = code + (1 + 4*LINK_SIZE);
+
+      code[0] = OP_CALLOUT_STR;
+      PUT(code, 1, pptr[1]);               /* Offset to next pattern item */
+      PUT(code, 1 + LINK_SIZE, pptr[2]);   /* Length of next pattern item */
+
+      pptr += 3;
+      GETPLUSOFFSET(offset, pptr);         /* Offset to string in pattern */
+      pp = cb->start_pattern + offset;
+      delimiter = *callout_string++ = *pp++;
+      if (delimiter == CHAR_LEFT_CURLY_BRACKET)
+        delimiter = CHAR_RIGHT_CURLY_BRACKET;
+      PUT(code, 1 + 3*LINK_SIZE, (int)(offset + 1));  /* One after delimiter */
+
+      /* The syntax of the pattern was checked in the parsing scan. The length
+      includes both delimiters, but we have passed the opening one just above,
+      so we reduce length before testing it. The test is for > 1 because we do
+      not want to copy the final delimiter. This also ensures that pp[1] is
+      accessible. */
+
+      while (--length > 1)
+        {
+        if (*pp == delimiter && pp[1] == delimiter)
+          {
+          *callout_string++ = delimiter;
+          pp += 2;
+          length--;
+          }
+        else *callout_string++ = *pp++;
+        }
+      *callout_string++ = CHAR_NUL;
+
+      /* Set the length of the entire item, the advance to its end. */
+
+      PUT(code, 1 + 2*LINK_SIZE, (int)(callout_string - code));
+      code = callout_string;
+      }
+    break;
+
+
+    /* ===================================================================*/
+    /* Handle repetition. The different types are all sorted out in the parsing
+    pass. */
+
+    case META_MINMAX_PLUS:
+    case META_MINMAX_QUERY:
+    case META_MINMAX:
+    repeat_min = *(++pptr);
+    repeat_max = *(++pptr);
+    goto REPEAT;
+
+    case META_ASTERISK:
+    case META_ASTERISK_PLUS:
+    case META_ASTERISK_QUERY:
+    repeat_min = 0;
+    repeat_max = REPEAT_UNLIMITED;
+    goto REPEAT;
+
+    case META_PLUS:
+    case META_PLUS_PLUS:
+    case META_PLUS_QUERY:
+    repeat_min = 1;
+    repeat_max = REPEAT_UNLIMITED;
+    goto REPEAT;
+
+    case META_QUERY:
+    case META_QUERY_PLUS:
+    case META_QUERY_QUERY:
+    repeat_min = 0;
+    repeat_max = 1;
+
+    REPEAT:
+    if (previous_matched_char && repeat_min > 0) matched_char = TRUE;
+
+    /* Remember whether this is a variable length repeat, and default to
+    single-char opcodes. */
+
+    reqvary = (repeat_min == repeat_max)? 0 : REQ_VARY;
+    op_type = 0;
+
+    /* Adjust first and required code units for a zero repeat. */
+
+    if (repeat_min == 0)
+      {
+      firstcu = zerofirstcu;
+      firstcuflags = zerofirstcuflags;
+      reqcu = zeroreqcu;
+      reqcuflags = zeroreqcuflags;
+      }
+
+    /* Note the greediness and possessiveness. */
+
+    switch (meta)
+      {
+      case META_MINMAX_PLUS:
+      case META_ASTERISK_PLUS:
+      case META_PLUS_PLUS:
+      case META_QUERY_PLUS:
+      repeat_type = 0;                  /* Force greedy */
+      possessive_quantifier = TRUE;
+      break;
+
+      case META_MINMAX_QUERY:
+      case META_ASTERISK_QUERY:
+      case META_PLUS_QUERY:
+      case META_QUERY_QUERY:
+      repeat_type = greedy_non_default;
+      possessive_quantifier = FALSE;
+      break;
+
+      default:
+      repeat_type = greedy_default;
+      possessive_quantifier = FALSE;
+      break;
+      }
+
+    /* Save start of previous item, in case we have to move it up in order to
+    insert something before it, and remember what it was. */
+
+    tempcode = previous;
+    op_previous = *previous;
+
+    /* Now handle repetition for the different types of item. If the repeat
+    minimum and the repeat maximum are both 1, we can ignore the quantifier for
+    non-parenthesized items, as they have only one alternative. For anything in
+    parentheses, we must not ignore if {1} is possessive. */
+
+    switch (op_previous)
+      {
+      /* If previous was a character or negated character match, abolish the
+      item and generate a repeat item instead. If a char item has a minimum of
+      more than one, ensure that it is set in reqcu - it might not be if a
+      sequence such as x{3} is the first thing in a branch because the x will
+      have gone into firstcu instead.  */
+
+      case OP_CHAR:
+      case OP_CHARI:
+      case OP_NOT:
+      case OP_NOTI:
+      if (repeat_max == 1 && repeat_min == 1) goto END_REPEAT;
+      op_type = chartypeoffset[op_previous - OP_CHAR];
+
+      /* Deal with UTF characters that take up more than one code unit. */
+
+#ifdef MAYBE_UTF_MULTI
+      if (utf && NOT_FIRSTCU(code[-1]))
+        {
+        PCRE2_UCHAR *lastchar = code - 1;
+        BACKCHAR(lastchar);
+        mclength = (uint32_t)(code - lastchar);   /* Length of UTF character */
+        memcpy(mcbuffer, lastchar, CU2BYTES(mclength));  /* Save the char */
+        }
+      else
+#endif  /* MAYBE_UTF_MULTI */
+
+      /* Handle the case of a single code unit - either with no UTF support, or
+      with UTF disabled, or for a single-code-unit UTF character. In the latter
+      case, for a repeated positive match, get the caseless flag for the
+      required code unit from the previous character, because a class like [Aa]
+      sets a caseless A but by now the req_caseopt flag has been reset. */
+
+        {
+        mcbuffer[0] = code[-1];
+        mclength = 1;
+        if (op_previous <= OP_CHARI && repeat_min > 1)
+          {
+          reqcu = mcbuffer[0];
+          reqcuflags = cb->req_varyopt;
+          if (op_previous == OP_CHARI) reqcuflags |= REQ_CASELESS;
+          }
+        }
+      goto OUTPUT_SINGLE_REPEAT;  /* Code shared with single character types */
+
+      /* If previous was a character class or a back reference, we put the
+      repeat stuff after it, but just skip the item if the repeat was {0,0}. */
+
+#ifdef SUPPORT_WIDE_CHARS
+      case OP_XCLASS:
+#endif
+      case OP_CLASS:
+      case OP_NCLASS:
+      case OP_REF:
+      case OP_REFI:
+      case OP_DNREF:
+      case OP_DNREFI:
+
+      if (repeat_max == 0)
+        {
+        code = previous;
+        goto END_REPEAT;
+        }
+      if (repeat_max == 1 && repeat_min == 1) goto END_REPEAT;
+
+      if (repeat_min == 0 && repeat_max == REPEAT_UNLIMITED)
+        *code++ = OP_CRSTAR + repeat_type;
+      else if (repeat_min == 1 && repeat_max == REPEAT_UNLIMITED)
+        *code++ = OP_CRPLUS + repeat_type;
+      else if (repeat_min == 0 && repeat_max == 1)
+        *code++ = OP_CRQUERY + repeat_type;
+      else
+        {
+        *code++ = OP_CRRANGE + repeat_type;
+        PUT2INC(code, 0, repeat_min);
+        if (repeat_max == REPEAT_UNLIMITED) repeat_max = 0;  /* 2-byte encoding for max */
+        PUT2INC(code, 0, repeat_max);
+        }
+      break;
+
+      /* If previous is OP_FAIL, it was generated by an empty class []
+      (PCRE2_ALLOW_EMPTY_CLASS is set). The other ways in which OP_FAIL can be
+      generated, that is by (*FAIL) or (?!), disallow a quantifier at parse
+      time. We can just ignore this repeat. */
+
+      case OP_FAIL:
+      goto END_REPEAT;
+
+      /* Prior to 10.30, repeated recursions were wrapped in OP_ONCE brackets
+      because pcre2_match() could not handle backtracking into recursively
+      called groups. Now that this backtracking is available, we no longer need
+      to do this. However, we still need to replicate recursions as we do for
+      groups so as to have independent backtracking points. We can replicate
+      for the minimum number of repeats directly. For optional repeats we now
+      wrap the recursion in OP_BRA brackets and make use of the bracket
+      repetition. */
+
+      case OP_RECURSE:
+      if (repeat_max == 1 && repeat_min == 1 && !possessive_quantifier)
+        goto END_REPEAT;
+
+      /* Generate unwrapped repeats for a non-zero minimum, except when the
+      minimum is 1 and the maximum unlimited, because that can be handled with
+      OP_BRA terminated by OP_KETRMAX/MIN. When the maximum is equal to the
+      minimum, we just need to generate the appropriate additional copies.
+      Otherwise we need to generate one more, to simulate the situation when
+      the minimum is zero. */
+
+      if (repeat_min > 0 && (repeat_min != 1 || repeat_max != REPEAT_UNLIMITED))
+        {
+        int replicate = repeat_min;
+        if (repeat_min == repeat_max) replicate--;
+
+        /* In the pre-compile phase, we don't actually do the replication. We
+        just adjust the length as if we had. Do some paranoid checks for
+        potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
+        integer type when available, otherwise double. */
+
+        if (lengthptr != NULL)
+          {
+          PCRE2_SIZE delta = replicate*(1 + LINK_SIZE);
+          if ((INT64_OR_DOUBLE)replicate*
+                (INT64_OR_DOUBLE)(1 + LINK_SIZE) >
+                  (INT64_OR_DOUBLE)INT_MAX ||
+              OFLOW_MAX - *lengthptr < delta)
+            {
+            *errorcodeptr = ERR20;
+            return 0;
+            }
+          *lengthptr += delta;
+          }
+
+        else for (int i = 0; i < replicate; i++)
+          {
+          memcpy(code, previous, CU2BYTES(1 + LINK_SIZE));
+          previous = code;
+          code += 1 + LINK_SIZE;
+          }
+
+        /* If the number of repeats is fixed, we are done. Otherwise, adjust
+        the counts and fall through. */
+
+        if (repeat_min == repeat_max) break;
+        if (repeat_max != REPEAT_UNLIMITED) repeat_max -= repeat_min;
+        repeat_min = 0;
+        }
+
+      /* Wrap the recursion call in OP_BRA brackets. */
+
+      (void)memmove(previous + 1 + LINK_SIZE, previous, CU2BYTES(1 + LINK_SIZE));
+      op_previous = *previous = OP_BRA;
+      PUT(previous, 1, 2 + 2*LINK_SIZE);
+      previous[2 + 2*LINK_SIZE] = OP_KET;
+      PUT(previous, 3 + 2*LINK_SIZE, 2 + 2*LINK_SIZE);
+      code += 2 + 2 * LINK_SIZE;
+      length_prevgroup = 3 + 3*LINK_SIZE;
+      group_return = -1;  /* Set "may match empty string" */
+
+      /* Now treat as a repeated OP_BRA. */
+      /* Fall through */
+
+      /* If previous was a bracket group, we may have to replicate it in
+      certain cases. Note that at this point we can encounter only the "basic"
+      bracket opcodes such as BRA and CBRA, as this is the place where they get
+      converted into the more special varieties such as BRAPOS and SBRA.
+      Originally, PCRE did not allow repetition of assertions, but now it does,
+      for Perl compatibility. */
+
+      case OP_ASSERT:
+      case OP_ASSERT_NOT:
+      case OP_ASSERT_NA:
+      case OP_ASSERTBACK:
+      case OP_ASSERTBACK_NOT:
+      case OP_ASSERTBACK_NA:
+      case OP_ONCE:
+      case OP_SCRIPT_RUN:
+      case OP_BRA:
+      case OP_CBRA:
+      case OP_COND:
+        {
+        int len = (int)(code - previous);
+        PCRE2_UCHAR *bralink = NULL;
+        PCRE2_UCHAR *brazeroptr = NULL;
+
+        if (repeat_max == 1 && repeat_min == 1 && !possessive_quantifier)
+          goto END_REPEAT;
+
+        /* Repeating a DEFINE group (or any group where the condition is always
+        FALSE and there is only one branch) is pointless, but Perl allows the
+        syntax, so we just ignore the repeat. */
+
+        if (op_previous == OP_COND && previous[LINK_SIZE+1] == OP_FALSE &&
+            previous[GET(previous, 1)] != OP_ALT)
+          goto END_REPEAT;
+
+        /* Perl allows all assertions to be quantified, and when they contain
+        capturing parentheses and/or are optional there are potential uses for
+        this feature. PCRE2 used to force the maximum quantifier to 1 on the
+        invalid grounds that further repetition was never useful. This was
+        always a bit pointless, since an assertion could be wrapped with a
+        repeated group to achieve the effect. General repetition is now
+        permitted, but if the maximum is unlimited it is set to one more than
+        the minimum. */
+
+        if (op_previous < OP_ONCE)    /* Assertion */
+          {
+          if (repeat_max == REPEAT_UNLIMITED) repeat_max = repeat_min + 1;
+          }
+
+        /* The case of a zero minimum is special because of the need to stick
+        OP_BRAZERO in front of it, and because the group appears once in the
+        data, whereas in other cases it appears the minimum number of times. For
+        this reason, it is simplest to treat this case separately, as otherwise
+        the code gets far too messy. There are several special subcases when the
+        minimum is zero. */
+
+        if (repeat_min == 0)
+          {
+          /* If the maximum is also zero, we used to just omit the group from
+          the output altogether, like this:
+
+          ** if (repeat_max == 0)
+          **   {
+          **   code = previous;
+          **   goto END_REPEAT;
+          **   }
+
+          However, that fails when a group or a subgroup within it is
+          referenced as a subroutine from elsewhere in the pattern, so now we
+          stick in OP_SKIPZERO in front of it so that it is skipped on
+          execution. As we don't have a list of which groups are referenced, we
+          cannot do this selectively.
+
+          If the maximum is 1 or unlimited, we just have to stick in the
+          BRAZERO and do no more at this point. */
+
+          if (repeat_max <= 1 || repeat_max == REPEAT_UNLIMITED)
+            {
+            (void)memmove(previous + 1, previous, CU2BYTES(len));
+            code++;
+            if (repeat_max == 0)
+              {
+              *previous++ = OP_SKIPZERO;
+              goto END_REPEAT;
+              }
+            brazeroptr = previous;    /* Save for possessive optimizing */
+            *previous++ = OP_BRAZERO + repeat_type;
+            }
+
+          /* If the maximum is greater than 1 and limited, we have to replicate
+          in a nested fashion, sticking OP_BRAZERO before each set of brackets.
+          The first one has to be handled carefully because it's the original
+          copy, which has to be moved up. The remainder can be handled by code
+          that is common with the non-zero minimum case below. We have to
+          adjust the value or repeat_max, since one less copy is required. */
+
+          else
+            {
+            int linkoffset;
+            (void)memmove(previous + 2 + LINK_SIZE, previous, CU2BYTES(len));
+            code += 2 + LINK_SIZE;
+            *previous++ = OP_BRAZERO + repeat_type;
+            *previous++ = OP_BRA;
+
+            /* We chain together the bracket link offset fields that have to be
+            filled in later when the ends of the brackets are reached. */
+
+            linkoffset = (bralink == NULL)? 0 : (int)(previous - bralink);
+            bralink = previous;
+            PUTINC(previous, 0, linkoffset);
+            }
+
+          if (repeat_max != REPEAT_UNLIMITED) repeat_max--;
+          }
+
+        /* If the minimum is greater than zero, replicate the group as many
+        times as necessary, and adjust the maximum to the number of subsequent
+        copies that we need. */
+
+        else
+          {
+          if (repeat_min > 1)
+            {
+            /* In the pre-compile phase, we don't actually do the replication.
+            We just adjust the length as if we had. Do some paranoid checks for
+            potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
+            integer type when available, otherwise double. */
+
+            if (lengthptr != NULL)
+              {
+              PCRE2_SIZE delta = (repeat_min - 1)*length_prevgroup;
+              if ((INT64_OR_DOUBLE)(repeat_min - 1)*
+                    (INT64_OR_DOUBLE)length_prevgroup >
+                      (INT64_OR_DOUBLE)INT_MAX ||
+                  OFLOW_MAX - *lengthptr < delta)
+                {
+                *errorcodeptr = ERR20;
+                return 0;
+                }
+              *lengthptr += delta;
+              }
+
+            /* This is compiling for real. If there is a set first code unit
+            for the group, and we have not yet set a "required code unit", set
+            it. */
+
+            else
+              {
+              if (groupsetfirstcu && reqcuflags >= REQ_NONE)
+                {
+                reqcu = firstcu;
+                reqcuflags = firstcuflags;
+                }
+              for (uint32_t i = 1; i < repeat_min; i++)
+                {
+                memcpy(code, previous, CU2BYTES(len));
+                code += len;
+                }
+              }
+            }
+
+          if (repeat_max != REPEAT_UNLIMITED) repeat_max -= repeat_min;
+          }
+
+        /* This code is common to both the zero and non-zero minimum cases. If
+        the maximum is limited, it replicates the group in a nested fashion,
+        remembering the bracket starts on a stack. In the case of a zero
+        minimum, the first one was set up above. In all cases the repeat_max
+        now specifies the number of additional copies needed. Again, we must
+        remember to replicate entries on the forward reference list. */
+
+        if (repeat_max != REPEAT_UNLIMITED)
+          {
+          /* In the pre-compile phase, we don't actually do the replication. We
+          just adjust the length as if we had. For each repetition we must add
+          1 to the length for BRAZERO and for all but the last repetition we
+          must add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
+          paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type
+          is a 64-bit integer type when available, otherwise double. */
+
+          if (lengthptr != NULL && repeat_max > 0)
+            {
+            PCRE2_SIZE delta = repeat_max*(length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
+                        2 - 2*LINK_SIZE;   /* Last one doesn't nest */
+            if ((INT64_OR_DOUBLE)repeat_max *
+                  (INT64_OR_DOUBLE)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
+                    > (INT64_OR_DOUBLE)INT_MAX ||
+                OFLOW_MAX - *lengthptr < delta)
+              {
+              *errorcodeptr = ERR20;
+              return 0;
+              }
+            *lengthptr += delta;
+            }
+
+          /* This is compiling for real */
+
+          else for (uint32_t i = repeat_max; i >= 1; i--)
+            {
+            *code++ = OP_BRAZERO + repeat_type;
+
+            /* All but the final copy start a new nesting, maintaining the
+            chain of brackets outstanding. */
+
+            if (i != 1)
+              {
+              int linkoffset;
+              *code++ = OP_BRA;
+              linkoffset = (bralink == NULL)? 0 : (int)(code - bralink);
+              bralink = code;
+              PUTINC(code, 0, linkoffset);
+              }
+
+            memcpy(code, previous, CU2BYTES(len));
+            code += len;
+            }
+
+          /* Now chain through the pending brackets, and fill in their length
+          fields (which are holding the chain links pro tem). */
+
+          while (bralink != NULL)
+            {
+            int oldlinkoffset;
+            int linkoffset = (int)(code - bralink + 1);
+            PCRE2_UCHAR *bra = code - linkoffset;
+            oldlinkoffset = GET(bra, 1);
+            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
+            *code++ = OP_KET;
+            PUTINC(code, 0, linkoffset);
+            PUT(bra, 1, linkoffset);
+            }
+          }
+
+        /* If the maximum is unlimited, set a repeater in the final copy. For
+        SCRIPT_RUN and ONCE brackets, that's all we need to do. However,
+        possessively repeated ONCE brackets can be converted into non-capturing
+        brackets, as the behaviour of (?:xx)++ is the same as (?>xx)++ and this
+        saves having to deal with possessive ONCEs specially.
+
+        Otherwise, when we are doing the actual compile phase, check to see
+        whether this group is one that could match an empty string. If so,
+        convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
+        that runtime checking can be done. [This check is also applied to ONCE
+        and SCRIPT_RUN groups at runtime, but in a different way.]
+
+        Then, if the quantifier was possessive and the bracket is not a
+        conditional, we convert the BRA code to the POS form, and the KET code
+        to KETRPOS. (It turns out to be convenient at runtime to detect this
+        kind of subpattern at both the start and at the end.) The use of
+        special opcodes makes it possible to reduce greatly the stack usage in
+        pcre2_match(). If the group is preceded by OP_BRAZERO, convert this to
+        OP_BRAPOSZERO.
+
+        Then, if the minimum number of matches is 1 or 0, cancel the possessive
+        flag so that the default action below, of wrapping everything inside
+        atomic brackets, does not happen. When the minimum is greater than 1,
+        there will be earlier copies of the group, and so we still have to wrap
+        the whole thing. */
+
+        else
+          {
+          PCRE2_UCHAR *ketcode = code - 1 - LINK_SIZE;
+          PCRE2_UCHAR *bracode = ketcode - GET(ketcode, 1);
+
+          /* Convert possessive ONCE brackets to non-capturing */
+
+          if (*bracode == OP_ONCE && possessive_quantifier) *bracode = OP_BRA;
+
+          /* For non-possessive ONCE and for SCRIPT_RUN brackets, all we need
+          to do is to set the KET. */
+
+          if (*bracode == OP_ONCE || *bracode == OP_SCRIPT_RUN)
+            *ketcode = OP_KETRMAX + repeat_type;
+
+          /* Handle non-SCRIPT_RUN and non-ONCE brackets and possessive ONCEs
+          (which have been converted to non-capturing above). */
+
+          else
+            {
+            /* In the compile phase, adjust the opcode if the group can match
+            an empty string. For a conditional group with only one branch, the
+            value of group_return will not show "could be empty", so we must
+            check that separately. */
+
+            if (lengthptr == NULL)
+              {
+              if (group_return < 0) *bracode += OP_SBRA - OP_BRA;
+              if (*bracode == OP_COND && bracode[GET(bracode,1)] != OP_ALT)
+                *bracode = OP_SCOND;
+              }
+
+            /* Handle possessive quantifiers. */
+
+            if (possessive_quantifier)
+              {
+              /* For COND brackets, we wrap the whole thing in a possessively
+              repeated non-capturing bracket, because we have not invented POS
+              versions of the COND opcodes. */
+
+              if (*bracode == OP_COND || *bracode == OP_SCOND)
+                {
+                int nlen = (int)(code - bracode);
+                (void)memmove(bracode + 1 + LINK_SIZE, bracode, CU2BYTES(nlen));
+                code += 1 + LINK_SIZE;
+                nlen += 1 + LINK_SIZE;
+                *bracode = (*bracode == OP_COND)? OP_BRAPOS : OP_SBRAPOS;
+                *code++ = OP_KETRPOS;
+                PUTINC(code, 0, nlen);
+                PUT(bracode, 1, nlen);
+                }
+
+              /* For non-COND brackets, we modify the BRA code and use KETRPOS. */
+
+              else
+                {
+                *bracode += 1;              /* Switch to xxxPOS opcodes */
+                *ketcode = OP_KETRPOS;
+                }
+
+              /* If the minimum is zero, mark it as possessive, then unset the
+              possessive flag when the minimum is 0 or 1. */
+
+              if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
+              if (repeat_min < 2) possessive_quantifier = FALSE;
+              }
+
+            /* Non-possessive quantifier */
+
+            else *ketcode = OP_KETRMAX + repeat_type;
+            }
+          }
+        }
+      break;
+
+      /* If previous was a character type match (\d or similar), abolish it and
+      create a suitable repeat item. The code is shared with single-character
+      repeats by setting op_type to add a suitable offset into repeat_type.
+      Note the the Unicode property types will be present only when
+      SUPPORT_UNICODE is defined, but we don't wrap the little bits of code
+      here because it just makes it horribly messy. */
+
+      default:
+      if (op_previous >= OP_EODN)   /* Not a character type - internal error */
+        {
+        *errorcodeptr = ERR10;
+        return 0;
+        }
+      else
+        {
+        int prop_type, prop_value;
+        PCRE2_UCHAR *oldcode;
+
+        if (repeat_max == 1 && repeat_min == 1) goto END_REPEAT;
+
+        op_type = OP_TYPESTAR - OP_STAR;      /* Use type opcodes */
+        mclength = 0;                         /* Not a character */
+
+        if (op_previous == OP_PROP || op_previous == OP_NOTPROP)
+          {
+          prop_type = previous[1];
+          prop_value = previous[2];
+          }
+        else
+          {
+          /* Come here from just above with a character in mcbuffer/mclength. */
+          OUTPUT_SINGLE_REPEAT:
+          prop_type = prop_value = -1;
+          }
+
+        /* At this point, if prop_type == prop_value == -1 we either have a
+        character in mcbuffer when mclength is greater than zero, or we have
+        mclength zero, in which case there is a non-property character type in
+        op_previous. If prop_type/value are not negative, we have a property
+        character type in op_previous. */
+
+        oldcode = code;                   /* Save where we were */
+        code = previous;                  /* Usually overwrite previous item */
+
+        /* If the maximum is zero then the minimum must also be zero; Perl allows
+        this case, so we do too - by simply omitting the item altogether. */
+
+        if (repeat_max == 0) goto END_REPEAT;
+
+        /* Combine the op_type with the repeat_type */
+
+        repeat_type += op_type;
+
+        /* A minimum of zero is handled either as the special case * or ?, or as
+        an UPTO, with the maximum given. */
+
+        if (repeat_min == 0)
+          {
+          if (repeat_max == REPEAT_UNLIMITED) *code++ = OP_STAR + repeat_type;
+            else if (repeat_max == 1) *code++ = OP_QUERY + repeat_type;
+          else
+            {
+            *code++ = OP_UPTO + repeat_type;
+            PUT2INC(code, 0, repeat_max);
+            }
+          }
+
+        /* A repeat minimum of 1 is optimized into some special cases. If the
+        maximum is unlimited, we use OP_PLUS. Otherwise, the original item is
+        left in place and, if the maximum is greater than 1, we use OP_UPTO with
+        one less than the maximum. */
+
+        else if (repeat_min == 1)
+          {
+          if (repeat_max == REPEAT_UNLIMITED)
+            *code++ = OP_PLUS + repeat_type;
+          else
+            {
+            code = oldcode;  /* Leave previous item in place */
+            if (repeat_max == 1) goto END_REPEAT;
+            *code++ = OP_UPTO + repeat_type;
+            PUT2INC(code, 0, repeat_max - 1);
+            }
+          }
+
+        /* The case {n,n} is just an EXACT, while the general case {n,m} is
+        handled as an EXACT followed by an UPTO or STAR or QUERY. */
+
+        else
+          {
+          *code++ = OP_EXACT + op_type;  /* NB EXACT doesn't have repeat_type */
+          PUT2INC(code, 0, repeat_min);
+
+          /* Unless repeat_max equals repeat_min, fill in the data for EXACT,
+          and then generate the second opcode. For a repeated Unicode property
+          match, there are two extra values that define the required property,
+          and mclength is set zero to indicate this. */
+
+          if (repeat_max != repeat_min)
+            {
+            if (mclength > 0)
+              {
+              memcpy(code, mcbuffer, CU2BYTES(mclength));
+              code += mclength;
+              }
+            else
+              {
+              *code++ = op_previous;
+              if (prop_type >= 0)
+                {
+                *code++ = prop_type;
+                *code++ = prop_value;
+                }
+              }
+
+            /* Now set up the following opcode */
+
+            if (repeat_max == REPEAT_UNLIMITED)
+              *code++ = OP_STAR + repeat_type;
+            else
+              {
+              repeat_max -= repeat_min;
+              if (repeat_max == 1)
+                {
+                *code++ = OP_QUERY + repeat_type;
+                }
+              else
+                {
+                *code++ = OP_UPTO + repeat_type;
+                PUT2INC(code, 0, repeat_max);
+                }
+              }
+            }
+          }
+
+        /* Fill in the character or character type for the final opcode. */
+
+        if (mclength > 0)
+          {
+          memcpy(code, mcbuffer, CU2BYTES(mclength));
+          code += mclength;
+          }
+        else
+          {
+          *code++ = op_previous;
+          if (prop_type >= 0)
+            {
+            *code++ = prop_type;
+            *code++ = prop_value;
+            }
+          }
+        }
+      break;
+      }  /* End of switch on different op_previous values */
+
+
+    /* If the character following a repeat is '+', possessive_quantifier is
+    TRUE. For some opcodes, there are special alternative opcodes for this
+    case. For anything else, we wrap the entire repeated item inside OP_ONCE
+    brackets. Logically, the '+' notation is just syntactic sugar, taken from
+    Sun's Java package, but the special opcodes can optimize it.
+
+    Some (but not all) possessively repeated subpatterns have already been
+    completely handled in the code just above. For them, possessive_quantifier
+    is always FALSE at this stage. Note that the repeated item starts at
+    tempcode, not at previous, which might be the first part of a string whose
+    (former) last char we repeated. */
+
+    if (possessive_quantifier)
+      {
+      int len;
+
+      /* Possessifying an EXACT quantifier has no effect, so we can ignore it.
+      However, QUERY, STAR, or UPTO may follow (for quantifiers such as {5,6},
+      {5,}, or {5,10}). We skip over an EXACT item; if the length of what
+      remains is greater than zero, there's a further opcode that can be
+      handled. If not, do nothing, leaving the EXACT alone. */
+
+      switch(*tempcode)
+        {
+        case OP_TYPEEXACT:
+        tempcode += PRIV(OP_lengths)[*tempcode] +
+          ((tempcode[1 + IMM2_SIZE] == OP_PROP
+          || tempcode[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
+        break;
+
+        /* CHAR opcodes are used for exacts whose count is 1. */
+
+        case OP_CHAR:
+        case OP_CHARI:
+        case OP_NOT:
+        case OP_NOTI:
+        case OP_EXACT:
+        case OP_EXACTI:
+        case OP_NOTEXACT:
+        case OP_NOTEXACTI:
+        tempcode += PRIV(OP_lengths)[*tempcode];
+#ifdef SUPPORT_UNICODE
+        if (utf && HAS_EXTRALEN(tempcode[-1]))
+          tempcode += GET_EXTRALEN(tempcode[-1]);
+#endif
+        break;
+
+        /* For the class opcodes, the repeat operator appears at the end;
+        adjust tempcode to point to it. */
+
+        case OP_CLASS:
+        case OP_NCLASS:
+        tempcode += 1 + 32/sizeof(PCRE2_UCHAR);
+        break;
+
+#ifdef SUPPORT_WIDE_CHARS
+        case OP_XCLASS:
+        tempcode += GET(tempcode, 1);
+        break;
+#endif
+        }
+
+      /* If tempcode is equal to code (which points to the end of the repeated
+      item), it means we have skipped an EXACT item but there is no following
+      QUERY, STAR, or UPTO; the value of len will be 0, and we do nothing. In
+      all other cases, tempcode will be pointing to the repeat opcode, and will
+      be less than code, so the value of len will be greater than 0. */
+
+      len = (int)(code - tempcode);
+      if (len > 0)
+        {
+        unsigned int repcode = *tempcode;
+
+        /* There is a table for possessifying opcodes, all of which are less
+        than OP_CALLOUT. A zero entry means there is no possessified version.
+        */
+
+        if (repcode < OP_CALLOUT && opcode_possessify[repcode] > 0)
+          *tempcode = opcode_possessify[repcode];
+
+        /* For opcode without a special possessified version, wrap the item in
+        ONCE brackets. */
+
+        else
+          {
+          (void)memmove(tempcode + 1 + LINK_SIZE, tempcode, CU2BYTES(len));
+          code += 1 + LINK_SIZE;
+          len += 1 + LINK_SIZE;
+          tempcode[0] = OP_ONCE;
+          *code++ = OP_KET;
+          PUTINC(code, 0, len);
+          PUT(tempcode, 1, len);
+          }
+        }
+      }
+
+    /* We set the "follows varying string" flag for subsequently encountered
+    reqcus if it isn't already set and we have just passed a varying length
+    item. */
+
+    END_REPEAT:
+    cb->req_varyopt |= reqvary;
+    break;
+
+
+    /* ===================================================================*/
+    /* Handle a 32-bit data character with a value greater than META_END. */
+
+    case META_BIGVALUE:
+    pptr++;
+    goto NORMAL_CHAR;
+
+
+    /* ===============================================================*/
+    /* Handle a back reference by number, which is the meta argument. The
+    pattern offsets for back references to group numbers less than 10 are held
+    in a special vector, to avoid using more than two parsed pattern elements
+    in 64-bit environments. We only need the offset to the first occurrence,
+    because if that doesn't fail, subsequent ones will also be OK. */
+
+    case META_BACKREF:
+    if (meta_arg < 10) offset = cb->small_ref_offset[meta_arg];
+      else GETPLUSOFFSET(offset, pptr);
+
+    if (meta_arg > cb->bracount)
+      {
+      cb->erroroffset = offset;
+      *errorcodeptr = ERR15;  /* Non-existent subpattern */
+      return 0;
+      }
+
+    /* Come here from named backref handling when the reference is to a
+    single group (that is, not to a duplicated name). The back reference
+    data will have already been updated. We must disable firstcu if not
+    set, to cope with cases like (?=(\w+))\1: which would otherwise set ':'
+    later. */
+
+    HANDLE_SINGLE_REFERENCE:
+    if (firstcuflags == REQ_UNSET) zerofirstcuflags = firstcuflags = REQ_NONE;
+    *code++ = ((options & PCRE2_CASELESS) != 0)? OP_REFI : OP_REF;
+    PUT2INC(code, 0, meta_arg);
+
+    /* Update the map of back references, and keep the highest one. We
+    could do this in parse_regex() for numerical back references, but not
+    for named back references, because we don't know the numbers to which
+    named back references refer. So we do it all in this function. */
+
+    cb->backref_map |= (meta_arg < 32)? (1u << meta_arg) : 1;
+    if (meta_arg > cb->top_backref) cb->top_backref = meta_arg;
+    break;
+
+
+    /* ===============================================================*/
+    /* Handle recursion by inserting the number of the called group (which is
+    the meta argument) after OP_RECURSE. At the end of compiling the pattern is
+    scanned and these numbers are replaced by offsets within the pattern. It is
+    done like this to avoid problems with forward references and adjusting
+    offsets when groups are duplicated and moved (as discovered in previous
+    implementations). Note that a recursion does not have a set first
+    character. */
+
+    case META_RECURSE:
+    GETPLUSOFFSET(offset, pptr);
+    if (meta_arg > cb->bracount)
+      {
+      cb->erroroffset = offset;
+      *errorcodeptr = ERR15;  /* Non-existent subpattern */
+      return 0;
+      }
+    HANDLE_NUMERICAL_RECURSION:
+    *code = OP_RECURSE;
+    PUT(code, 1, meta_arg);
+    code += 1 + LINK_SIZE;
+    groupsetfirstcu = FALSE;
+    cb->had_recurse = TRUE;
+    if (firstcuflags == REQ_UNSET) firstcuflags = REQ_NONE;
+    zerofirstcu = firstcu;
+    zerofirstcuflags = firstcuflags;
+    break;
+
+
+    /* ===============================================================*/
+    /* Handle capturing parentheses; the number is the meta argument. */
+
+    case META_CAPTURE:
+    bravalue = OP_CBRA;
+    skipunits = IMM2_SIZE;
+    PUT2(code, 1+LINK_SIZE, meta_arg);
+    cb->lastcapture = meta_arg;
+    goto GROUP_PROCESS_NOTE_EMPTY;
+
+
+    /* ===============================================================*/
+    /* Handle escape sequence items. For ones like \d, the ESC_values are
+    arranged to be the same as the corresponding OP_values in the default case
+    when PCRE2_UCP is not set (which is the only case in which they will appear
+    here).
+
+    Note: \Q and \E are never seen here, as they were dealt with in
+    parse_pattern(). Neither are numerical back references or recursions, which
+    were turned into META_BACKREF or META_RECURSE items, respectively. \k and
+    \g, when followed by names, are turned into META_BACKREF_BYNAME or
+    META_RECURSE_BYNAME. */
+
+    case META_ESCAPE:
+
+    /* We can test for escape sequences that consume a character because their
+    values lie between ESC_b and ESC_Z; this may have to change if any new ones
+    are ever created. For these sequences, we disable the setting of a first
+    character if it hasn't already been set. */
+
+    if (meta_arg > ESC_b && meta_arg < ESC_Z)
+      {
+      matched_char = TRUE;
+      if (firstcuflags == REQ_UNSET) firstcuflags = REQ_NONE;
+      }
+
+    /* Set values to reset to if this is followed by a zero repeat. */
+
+    zerofirstcu = firstcu;
+    zerofirstcuflags = firstcuflags;
+    zeroreqcu = reqcu;
+    zeroreqcuflags = reqcuflags;
+
+    /* If Unicode is not supported, \P and \p are not allowed and are
+    faulted at parse time, so will never appear here. */
+
+#ifdef SUPPORT_UNICODE
+    if (meta_arg == ESC_P || meta_arg == ESC_p)
+      {
+      uint32_t ptype = *(++pptr) >> 16;
+      uint32_t pdata = *pptr & 0xffff;
+
+      /* The special case of \p{Any} is compiled to OP_ALLANY so as to benefit
+      from the auto-anchoring code. */
+
+      if (meta_arg == ESC_p && ptype == PT_ANY)
+        {
+        *code++ = OP_ALLANY;
+        }
+      else
+        {
+        *code++ = (meta_arg == ESC_p)? OP_PROP : OP_NOTPROP;
+        *code++ = ptype;
+        *code++ = pdata;
+        }
+      break;  /* End META_ESCAPE */
+      }
+#endif
+
+    /* \K is forbidden in lookarounds since 10.38 because that's what Perl has
+    done. However, there's an option, in case anyone was relying on it. */
+
+    if (cb->assert_depth > 0 && meta_arg == ESC_K &&
+        (cb->cx->extra_options & PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK) == 0)
+      {
+      *errorcodeptr = ERR99;
+      return 0;
+      }
+
+    /* For the rest (including \X when Unicode is supported - if not it's
+    faulted at parse time), the OP value is the escape value when PCRE2_UCP is
+    not set; if it is set, these escapes do not show up here because they are
+    converted into Unicode property tests in parse_regex(). Note that \b and \B
+    do a one-character lookbehind, and \A also behaves as if it does. */
+
+    if (meta_arg == ESC_C) cb->external_flags |= PCRE2_HASBKC; /* Record */
+    if ((meta_arg == ESC_b || meta_arg == ESC_B || meta_arg == ESC_A) &&
+         cb->max_lookbehind == 0)
+      cb->max_lookbehind = 1;
+
+    /* In non-UTF mode, and for both 32-bit modes, we turn \C into OP_ALLANY
+    instead of OP_ANYBYTE so that it works in DFA mode and in lookbehinds. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+    *code++ = (meta_arg == ESC_C)? OP_ALLANY : meta_arg;
+#else
+    *code++ = (!utf && meta_arg == ESC_C)? OP_ALLANY : meta_arg;
+#endif
+    break;  /* End META_ESCAPE */
+
+
+    /* ===================================================================*/
+    /* Handle an unrecognized meta value. A parsed pattern value less than
+    META_END is a literal. Otherwise we have a problem. */
+
+    default:
+    if (meta >= META_END)
+      {
+#ifdef DEBUG_SHOW_PARSED
+      fprintf(stderr, "** Unrecognized parsed pattern item 0x%.8x\n", *pptr);
+#endif
+      *errorcodeptr = ERR89;  /* Internal error - unrecognized. */
+      return 0;
+      }
+
+    /* Handle a literal character. We come here by goto in the case of a
+    32-bit, non-UTF character whose value is greater than META_END. */
+
+    NORMAL_CHAR:
+    meta = *pptr;     /* Get the full 32 bits */
+    NORMAL_CHAR_SET:  /* Character is already in meta */
+    matched_char = TRUE;
+
+    /* For caseless UTF or UCP mode, check whether this character has more than
+    one other case. If so, generate a special OP_PROP item instead of OP_CHARI.
+    */
+
+#ifdef SUPPORT_UNICODE
+    if ((utf||ucp) && (options & PCRE2_CASELESS) != 0)
+      {
+      uint32_t caseset = UCD_CASESET(meta);
+      if (caseset != 0)
+        {
+        *code++ = OP_PROP;
+        *code++ = PT_CLIST;
+        *code++ = caseset;
+        if (firstcuflags == REQ_UNSET)
+          firstcuflags = zerofirstcuflags = REQ_NONE;
+        break;  /* End handling this meta item */
+        }
+      }
+#endif
+
+    /* Caseful matches, or caseless and not one of the multicase characters. We
+    come here by goto in the case of a positive class that contains only
+    case-partners of a character with just two cases; matched_char has already
+    been set TRUE and options fudged if necessary. */
+
+    CLASS_CASELESS_CHAR:
+
+    /* Get the character's code units into mcbuffer, with the length in
+    mclength. When not in UTF mode, the length is always 1. */
+
+#ifdef SUPPORT_UNICODE
+    if (utf) mclength = PRIV(ord2utf)(meta, mcbuffer); else
+#endif
+      {
+      mclength = 1;
+      mcbuffer[0] = meta;
+      }
+
+    /* Generate the appropriate code */
+
+    *code++ = ((options & PCRE2_CASELESS) != 0)? OP_CHARI : OP_CHAR;
+    memcpy(code, mcbuffer, CU2BYTES(mclength));
+    code += mclength;
+
+    /* Remember if \r or \n were seen */
+
+    if (mcbuffer[0] == CHAR_CR || mcbuffer[0] == CHAR_NL)
+      cb->external_flags |= PCRE2_HASCRORLF;
+
+    /* Set the first and required code units appropriately. If no previous
+    first code unit, set it from this character, but revert to none on a zero
+    repeat. Otherwise, leave the firstcu value alone, and don't change it on
+    a zero repeat. */
+
+    if (firstcuflags == REQ_UNSET)
+      {
+      zerofirstcuflags = REQ_NONE;
+      zeroreqcu = reqcu;
+      zeroreqcuflags = reqcuflags;
+
+      /* If the character is more than one code unit long, we can set a single
+      firstcu only if it is not to be matched caselessly. Multiple possible
+      starting code units may be picked up later in the studying code. */
+
+      if (mclength == 1 || req_caseopt == 0)
+        {
+        firstcu = mcbuffer[0];
+        firstcuflags = req_caseopt;
+        if (mclength != 1)
+          {
+          reqcu = code[-1];
+          reqcuflags = cb->req_varyopt;
+          }
+        }
+      else firstcuflags = reqcuflags = REQ_NONE;
+      }
+
+    /* firstcu was previously set; we can set reqcu only if the length is
+    1 or the matching is caseful. */
+
+    else
+      {
+      zerofirstcu = firstcu;
+      zerofirstcuflags = firstcuflags;
+      zeroreqcu = reqcu;
+      zeroreqcuflags = reqcuflags;
+      if (mclength == 1 || req_caseopt == 0)
+        {
+        reqcu = code[-1];
+        reqcuflags = req_caseopt | cb->req_varyopt;
+        }
+      }
+
+    /* If caselessness was temporarily instated, reset it. */
+
+    if (reset_caseful)
+      {
+      options &= ~PCRE2_CASELESS;
+      req_caseopt = 0;
+      reset_caseful = FALSE;
+      }
+
+    break;    /* End literal character handling */
+    }         /* End of big switch */
+  }           /* End of big loop */
+
+/* Control never reaches here. */
+}
+
+
+
+/*************************************************
+*   Compile regex: a sequence of alternatives    *
+*************************************************/
+
+/* On entry, pptr is pointing past the bracket meta, but on return it points to
+the closing bracket or META_END. The code variable is pointing at the code unit
+into which the BRA operator has been stored. This function is used during the
+pre-compile phase when we are trying to find out the amount of memory needed,
+as well as during the real compile phase. The value of lengthptr distinguishes
+the two phases.
+
+Arguments:
+  options           option bits, including any changes for this subpattern
+  codeptr           -> the address of the current code pointer
+  pptrptr           -> the address of the current parsed pattern pointer
+  errorcodeptr      -> pointer to error code variable
+  skipunits         skip this many code units at start (for brackets and OP_COND)
+  firstcuptr        place to put the first required code unit
+  firstcuflagsptr   place to put the first code unit flags
+  reqcuptr          place to put the last required code unit
+  reqcuflagsptr     place to put the last required code unit flags
+  bcptr             pointer to the chain of currently open branches
+  cb                points to the data block with tables pointers etc.
+  lengthptr         NULL during the real compile phase
+                    points to length accumulator during pre-compile phase
+
+Returns:            0 There has been an error
+                   +1 Success, this group must match at least one character
+                   -1 Success, this group may match an empty string
+*/
+
+static int
+compile_regex(uint32_t options, PCRE2_UCHAR **codeptr, uint32_t **pptrptr,
+  int *errorcodeptr, uint32_t skipunits, uint32_t *firstcuptr,
+  uint32_t *firstcuflagsptr, uint32_t *reqcuptr, uint32_t *reqcuflagsptr,
+  branch_chain *bcptr, compile_block *cb, PCRE2_SIZE *lengthptr)
+{
+PCRE2_UCHAR *code = *codeptr;
+PCRE2_UCHAR *last_branch = code;
+PCRE2_UCHAR *start_bracket = code;
+BOOL lookbehind;
+open_capitem capitem;
+int capnumber = 0;
+int okreturn = 1;
+uint32_t *pptr = *pptrptr;
+uint32_t firstcu, reqcu;
+uint32_t lookbehindlength;
+uint32_t firstcuflags, reqcuflags;
+uint32_t branchfirstcu, branchreqcu;
+uint32_t branchfirstcuflags, branchreqcuflags;
+PCRE2_SIZE length;
+branch_chain bc;
+
+/* If set, call the external function that checks for stack availability. */
+
+if (cb->cx->stack_guard != NULL &&
+    cb->cx->stack_guard(cb->parens_depth, cb->cx->stack_guard_data))
+  {
+  *errorcodeptr= ERR33;
+  return 0;
+  }
+
+/* Miscellaneous initialization */
+
+bc.outer = bcptr;
+bc.current_branch = code;
+
+firstcu = reqcu = 0;
+firstcuflags = reqcuflags = REQ_UNSET;
+
+/* Accumulate the length for use in the pre-compile phase. Start with the
+length of the BRA and KET and any extra code units that are required at the
+beginning. We accumulate in a local variable to save frequent testing of
+lengthptr for NULL. We cannot do this by looking at the value of 'code' at the
+start and end of each alternative, because compiled items are discarded during
+the pre-compile phase so that the workspace is not exceeded. */
+
+length = 2 + 2*LINK_SIZE + skipunits;
+
+/* Remember if this is a lookbehind assertion, and if it is, save its length
+and skip over the pattern offset. */
+
+lookbehind = *code == OP_ASSERTBACK ||
+             *code == OP_ASSERTBACK_NOT ||
+             *code == OP_ASSERTBACK_NA;
+
+if (lookbehind)
+  {
+  lookbehindlength = META_DATA(pptr[-1]);
+  pptr += SIZEOFFSET;
+  }
+else lookbehindlength = 0;
+
+/* If this is a capturing subpattern, add to the chain of open capturing items
+so that we can detect them if (*ACCEPT) is encountered. Note that only OP_CBRA
+need be tested here; changing this opcode to one of its variants, e.g.
+OP_SCBRAPOS, happens later, after the group has been compiled. */
+
+if (*code == OP_CBRA)
+  {
+  capnumber = GET2(code, 1 + LINK_SIZE);
+  capitem.number = capnumber;
+  capitem.next = cb->open_caps;
+  capitem.assert_depth = cb->assert_depth;
+  cb->open_caps = &capitem;
+  }
+
+/* Offset is set zero to mark that this bracket is still open */
+
+PUT(code, 1, 0);
+code += 1 + LINK_SIZE + skipunits;
+
+/* Loop for each alternative branch */
+
+for (;;)
+  {
+  int branch_return;
+
+  /* Insert OP_REVERSE if this is as lookbehind assertion. */
+
+  if (lookbehind && lookbehindlength > 0)
+    {
+    *code++ = OP_REVERSE;
+    PUTINC(code, 0, lookbehindlength);
+    length += 1 + LINK_SIZE;
+    }
+
+  /* Now compile the branch; in the pre-compile phase its length gets added
+  into the length. */
+
+  if ((branch_return =
+        compile_branch(&options, &code, &pptr, errorcodeptr, &branchfirstcu,
+          &branchfirstcuflags, &branchreqcu, &branchreqcuflags, &bc,
+          cb, (lengthptr == NULL)? NULL : &length)) == 0)
+    return 0;
+
+  /* If a branch can match an empty string, so can the whole group. */
+
+  if (branch_return < 0) okreturn = -1;
+
+  /* In the real compile phase, there is some post-processing to be done. */
+
+  if (lengthptr == NULL)
+    {
+    /* If this is the first branch, the firstcu and reqcu values for the
+    branch become the values for the regex. */
+
+    if (*last_branch != OP_ALT)
+      {
+      firstcu = branchfirstcu;
+      firstcuflags = branchfirstcuflags;
+      reqcu = branchreqcu;
+      reqcuflags = branchreqcuflags;
+      }
+
+    /* If this is not the first branch, the first char and reqcu have to
+    match the values from all the previous branches, except that if the
+    previous value for reqcu didn't have REQ_VARY set, it can still match,
+    and we set REQ_VARY for the group from this branch's value. */
+
+    else
+      {
+      /* If we previously had a firstcu, but it doesn't match the new branch,
+      we have to abandon the firstcu for the regex, but if there was
+      previously no reqcu, it takes on the value of the old firstcu. */
+
+      if (firstcuflags != branchfirstcuflags || firstcu != branchfirstcu)
+        {
+        if (firstcuflags < REQ_NONE)
+          {
+          if (reqcuflags >= REQ_NONE)
+            {
+            reqcu = firstcu;
+            reqcuflags = firstcuflags;
+            }
+          }
+        firstcuflags = REQ_NONE;
+        }
+
+      /* If we (now or from before) have no firstcu, a firstcu from the
+      branch becomes a reqcu if there isn't a branch reqcu. */
+
+      if (firstcuflags >= REQ_NONE && branchfirstcuflags < REQ_NONE &&
+          branchreqcuflags >= REQ_NONE)
+        {
+        branchreqcu = branchfirstcu;
+        branchreqcuflags = branchfirstcuflags;
+        }
+
+      /* Now ensure that the reqcus match */
+
+      if (((reqcuflags & ~REQ_VARY) != (branchreqcuflags & ~REQ_VARY)) ||
+          reqcu != branchreqcu)
+        reqcuflags = REQ_NONE;
+      else
+        {
+        reqcu = branchreqcu;
+        reqcuflags |= branchreqcuflags; /* To "or" REQ_VARY if present */
+        }
+      }
+    }
+
+  /* Handle reaching the end of the expression, either ')' or end of pattern.
+  In the real compile phase, go back through the alternative branches and
+  reverse the chain of offsets, with the field in the BRA item now becoming an
+  offset to the first alternative. If there are no alternatives, it points to
+  the end of the group. The length in the terminating ket is always the length
+  of the whole bracketed item. Return leaving the pointer at the terminating
+  char. */
+
+  if (META_CODE(*pptr) != META_ALT)
+    {
+    if (lengthptr == NULL)
+      {
+      PCRE2_SIZE branch_length = code - last_branch;
+      do
+        {
+        PCRE2_SIZE prev_length = GET(last_branch, 1);
+        PUT(last_branch, 1, branch_length);
+        branch_length = prev_length;
+        last_branch -= branch_length;
+        }
+      while (branch_length > 0);
+      }
+
+    /* Fill in the ket */
+
+    *code = OP_KET;
+    PUT(code, 1, (int)(code - start_bracket));
+    code += 1 + LINK_SIZE;
+
+    /* If it was a capturing subpattern, remove the block from the chain. */
+
+    if (capnumber > 0) cb->open_caps = cb->open_caps->next;
+
+    /* Set values to pass back */
+
+    *codeptr = code;
+    *pptrptr = pptr;
+    *firstcuptr = firstcu;
+    *firstcuflagsptr = firstcuflags;
+    *reqcuptr = reqcu;
+    *reqcuflagsptr = reqcuflags;
+    if (lengthptr != NULL)
+      {
+      if (OFLOW_MAX - *lengthptr < length)
+        {
+        *errorcodeptr = ERR20;
+        return 0;
+        }
+      *lengthptr += length;
+      }
+    return okreturn;
+    }
+
+  /* Another branch follows. In the pre-compile phase, we can move the code
+  pointer back to where it was for the start of the first branch. (That is,
+  pretend that each branch is the only one.)
+
+  In the real compile phase, insert an ALT node. Its length field points back
+  to the previous branch while the bracket remains open. At the end the chain
+  is reversed. It's done like this so that the start of the bracket has a
+  zero offset until it is closed, making it possible to detect recursion. */
+
+  if (lengthptr != NULL)
+    {
+    code = *codeptr + 1 + LINK_SIZE + skipunits;
+    length += 1 + LINK_SIZE;
+    }
+  else
+    {
+    *code = OP_ALT;
+    PUT(code, 1, (int)(code - last_branch));
+    bc.current_branch = last_branch = code;
+    code += 1 + LINK_SIZE;
+    }
+
+  /* Set the lookbehind length (if not in a lookbehind the value will be zero)
+  and then advance past the vertical bar. */
+
+  lookbehindlength = META_DATA(*pptr);
+  pptr++;
+  }
+/* Control never reaches here */
+}
+
+
+
+/*************************************************
+*          Check for anchored pattern            *
+*************************************************/
+
+/* Try to find out if this is an anchored regular expression. Consider each
+alternative branch. If they all start with OP_SOD or OP_CIRC, or with a bracket
+all of whose alternatives start with OP_SOD or OP_CIRC (recurse ad lib), then
+it's anchored. However, if this is a multiline pattern, then only OP_SOD will
+be found, because ^ generates OP_CIRCM in that mode.
+
+We can also consider a regex to be anchored if OP_SOM starts all its branches.
+This is the code for \G, which means "match at start of match position, taking
+into account the match offset".
+
+A branch is also implicitly anchored if it starts with .* and DOTALL is set,
+because that will try the rest of the pattern at all possible matching points,
+so there is no point trying again.... er ....
+
+.... except when the .* appears inside capturing parentheses, and there is a
+subsequent back reference to those parentheses. We haven't enough information
+to catch that case precisely.
+
+At first, the best we could do was to detect when .* was in capturing brackets
+and the highest back reference was greater than or equal to that level.
+However, by keeping a bitmap of the first 31 back references, we can catch some
+of the more common cases more precisely.
+
+... A second exception is when the .* appears inside an atomic group, because
+this prevents the number of characters it matches from being adjusted.
+
+Arguments:
+  code           points to start of the compiled pattern
+  bracket_map    a bitmap of which brackets we are inside while testing; this
+                   handles up to substring 31; after that we just have to take
+                   the less precise approach
+  cb             points to the compile data block
+  atomcount      atomic group level
+  inassert       TRUE if in an assertion
+
+Returns:     TRUE or FALSE
+*/
+
+static BOOL
+is_anchored(PCRE2_SPTR code, uint32_t bracket_map, compile_block *cb,
+  int atomcount, BOOL inassert)
+{
+do {
+   PCRE2_SPTR scode = first_significant_code(
+     code + PRIV(OP_lengths)[*code], FALSE);
+   int op = *scode;
+
+   /* Non-capturing brackets */
+
+   if (op == OP_BRA  || op == OP_BRAPOS ||
+       op == OP_SBRA || op == OP_SBRAPOS)
+     {
+     if (!is_anchored(scode, bracket_map, cb, atomcount, inassert))
+       return FALSE;
+     }
+
+   /* Capturing brackets */
+
+   else if (op == OP_CBRA  || op == OP_CBRAPOS ||
+            op == OP_SCBRA || op == OP_SCBRAPOS)
+     {
+     int n = GET2(scode, 1+LINK_SIZE);
+     uint32_t new_map = bracket_map | ((n < 32)? (1u << n) : 1);
+     if (!is_anchored(scode, new_map, cb, atomcount, inassert)) return FALSE;
+     }
+
+   /* Positive forward assertion */
+
+   else if (op == OP_ASSERT || op == OP_ASSERT_NA)
+     {
+     if (!is_anchored(scode, bracket_map, cb, atomcount, TRUE)) return FALSE;
+     }
+
+   /* Condition. If there is no second branch, it can't be anchored. */
+
+   else if (op == OP_COND || op == OP_SCOND)
+     {
+     if (scode[GET(scode,1)] != OP_ALT) return FALSE;
+     if (!is_anchored(scode, bracket_map, cb, atomcount, inassert))
+       return FALSE;
+     }
+
+   /* Atomic groups */
+
+   else if (op == OP_ONCE)
+     {
+     if (!is_anchored(scode, bracket_map, cb, atomcount + 1, inassert))
+       return FALSE;
+     }
+
+   /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and
+   it isn't in brackets that are or may be referenced or inside an atomic
+   group or an assertion. Also the pattern must not contain *PRUNE or *SKIP,
+   because these break the feature. Consider, for example, /(?s).*?(*PRUNE)b/
+   with the subject "aab", which matches "b", i.e. not at the start of a line.
+   There is also an option that disables auto-anchoring. */
+
+   else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||
+             op == OP_TYPEPOSSTAR))
+     {
+     if (scode[1] != OP_ALLANY || (bracket_map & cb->backref_map) != 0 ||
+         atomcount > 0 || cb->had_pruneorskip || inassert ||
+         (cb->external_options & PCRE2_NO_DOTSTAR_ANCHOR) != 0)
+       return FALSE;
+     }
+
+   /* Check for explicit anchoring */
+
+   else if (op != OP_SOD && op != OP_SOM && op != OP_CIRC) return FALSE;
+
+   code += GET(code, 1);
+   }
+while (*code == OP_ALT);   /* Loop for each alternative */
+return TRUE;
+}
+
+
+
+/*************************************************
+*         Check for starting with ^ or .*        *
+*************************************************/
+
+/* This is called to find out if every branch starts with ^ or .* so that
+"first char" processing can be done to speed things up in multiline
+matching and for non-DOTALL patterns that start with .* (which must start at
+the beginning or after \n). As in the case of is_anchored() (see above), we
+have to take account of back references to capturing brackets that contain .*
+because in that case we can't make the assumption. Also, the appearance of .*
+inside atomic brackets or in an assertion, or in a pattern that contains *PRUNE
+or *SKIP does not count, because once again the assumption no longer holds.
+
+Arguments:
+  code           points to start of the compiled pattern or a group
+  bracket_map    a bitmap of which brackets we are inside while testing; this
+                   handles up to substring 31; after that we just have to take
+                   the less precise approach
+  cb             points to the compile data
+  atomcount      atomic group level
+  inassert       TRUE if in an assertion
+
+Returns:         TRUE or FALSE
+*/
+
+static BOOL
+is_startline(PCRE2_SPTR code, unsigned int bracket_map, compile_block *cb,
+  int atomcount, BOOL inassert)
+{
+do {
+   PCRE2_SPTR scode = first_significant_code(
+     code + PRIV(OP_lengths)[*code], FALSE);
+   int op = *scode;
+
+   /* If we are at the start of a conditional assertion group, *both* the
+   conditional assertion *and* what follows the condition must satisfy the test
+   for start of line. Other kinds of condition fail. Note that there may be an
+   auto-callout at the start of a condition. */
+
+   if (op == OP_COND)
+     {
+     scode += 1 + LINK_SIZE;
+
+     if (*scode == OP_CALLOUT) scode += PRIV(OP_lengths)[OP_CALLOUT];
+       else if (*scode == OP_CALLOUT_STR) scode += GET(scode, 1 + 2*LINK_SIZE);
+
+     switch (*scode)
+       {
+       case OP_CREF:
+       case OP_DNCREF:
+       case OP_RREF:
+       case OP_DNRREF:
+       case OP_FAIL:
+       case OP_FALSE:
+       case OP_TRUE:
+       return FALSE;
+
+       default:     /* Assertion */
+       if (!is_startline(scode, bracket_map, cb, atomcount, TRUE)) return FALSE;
+       do scode += GET(scode, 1); while (*scode == OP_ALT);
+       scode += 1 + LINK_SIZE;
+       break;
+       }
+     scode = first_significant_code(scode, FALSE);
+     op = *scode;
+     }
+
+   /* Non-capturing brackets */
+
+   if (op == OP_BRA  || op == OP_BRAPOS ||
+       op == OP_SBRA || op == OP_SBRAPOS)
+     {
+     if (!is_startline(scode, bracket_map, cb, atomcount, inassert))
+       return FALSE;
+     }
+
+   /* Capturing brackets */
+
+   else if (op == OP_CBRA  || op == OP_CBRAPOS ||
+            op == OP_SCBRA || op == OP_SCBRAPOS)
+     {
+     int n = GET2(scode, 1+LINK_SIZE);
+     int new_map = bracket_map | ((n < 32)? (1u << n) : 1);
+     if (!is_startline(scode, new_map, cb, atomcount, inassert)) return FALSE;
+     }
+
+   /* Positive forward assertions */
+
+   else if (op == OP_ASSERT || op == OP_ASSERT_NA)
+     {
+     if (!is_startline(scode, bracket_map, cb, atomcount, TRUE))
+       return FALSE;
+     }
+
+   /* Atomic brackets */
+
+   else if (op == OP_ONCE)
+     {
+     if (!is_startline(scode, bracket_map, cb, atomcount + 1, inassert))
+       return FALSE;
+     }
+
+   /* .* means "start at start or after \n" if it isn't in atomic brackets or
+   brackets that may be referenced or an assertion, and as long as the pattern
+   does not contain *PRUNE or *SKIP, because these break the feature. Consider,
+   for example, /.*?a(*PRUNE)b/ with the subject "aab", which matches "ab",
+   i.e. not at the start of a line. There is also an option that disables this
+   optimization. */
+
+   else if (op == OP_TYPESTAR || op == OP_TYPEMINSTAR || op == OP_TYPEPOSSTAR)
+     {
+     if (scode[1] != OP_ANY || (bracket_map & cb->backref_map) != 0 ||
+         atomcount > 0 || cb->had_pruneorskip || inassert ||
+         (cb->external_options & PCRE2_NO_DOTSTAR_ANCHOR) != 0)
+       return FALSE;
+     }
+
+   /* Check for explicit circumflex; anything else gives a FALSE result. Note
+   in particular that this includes atomic brackets OP_ONCE because the number
+   of characters matched by .* cannot be adjusted inside them. */
+
+   else if (op != OP_CIRC && op != OP_CIRCM) return FALSE;
+
+   /* Move on to the next alternative */
+
+   code += GET(code, 1);
+   }
+while (*code == OP_ALT);  /* Loop for each alternative */
+return TRUE;
+}
+
+
+
+/*************************************************
+*   Scan compiled regex for recursion reference  *
+*************************************************/
+
+/* This function scans through a compiled pattern until it finds an instance of
+OP_RECURSE.
+
+Arguments:
+  code        points to start of expression
+  utf         TRUE in UTF mode
+
+Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
+*/
+
+static PCRE2_SPTR
+find_recurse(PCRE2_SPTR code, BOOL utf)
+{
+for (;;)
+  {
+  PCRE2_UCHAR c = *code;
+  if (c == OP_END) return NULL;
+  if (c == OP_RECURSE) return code;
+
+  /* XCLASS is used for classes that cannot be represented just by a bit map.
+  This includes negated single high-valued characters. CALLOUT_STR is used for
+  callouts with string arguments. In both cases the length in the table is
+  zero; the actual length is stored in the compiled code. */
+
+  if (c == OP_XCLASS) code += GET(code, 1);
+    else if (c == OP_CALLOUT_STR) code += GET(code, 1 + 2*LINK_SIZE);
+
+  /* Otherwise, we can get the item's length from the table, except that for
+  repeated character types, we have to test for \p and \P, which have an extra
+  two code units of parameters, and for MARK/PRUNE/SKIP/THEN with an argument,
+  we must add in its length. */
+
+  else
+    {
+    switch(c)
+      {
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSSTAR:
+      case OP_TYPEPOSPLUS:
+      case OP_TYPEPOSQUERY:
+      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+      break;
+
+      case OP_TYPEPOSUPTO:
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEEXACT:
+      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
+        code += 2;
+      break;
+
+      case OP_MARK:
+      case OP_COMMIT_ARG:
+      case OP_PRUNE_ARG:
+      case OP_SKIP_ARG:
+      case OP_THEN_ARG:
+      code += code[1];
+      break;
+      }
+
+    /* Add in the fixed length from the table */
+
+    code += PRIV(OP_lengths)[c];
+
+    /* In UTF-8 and UTF-16 modes, opcodes that are followed by a character may
+    be followed by a multi-unit character. The length in the table is a
+    minimum, so we have to arrange to skip the extra units. */
+
+#ifdef MAYBE_UTF_MULTI
+    if (utf) switch(c)
+      {
+      case OP_CHAR:
+      case OP_CHARI:
+      case OP_NOT:
+      case OP_NOTI:
+      case OP_EXACT:
+      case OP_EXACTI:
+      case OP_NOTEXACT:
+      case OP_NOTEXACTI:
+      case OP_UPTO:
+      case OP_UPTOI:
+      case OP_NOTUPTO:
+      case OP_NOTUPTOI:
+      case OP_MINUPTO:
+      case OP_MINUPTOI:
+      case OP_NOTMINUPTO:
+      case OP_NOTMINUPTOI:
+      case OP_POSUPTO:
+      case OP_POSUPTOI:
+      case OP_NOTPOSUPTO:
+      case OP_NOTPOSUPTOI:
+      case OP_STAR:
+      case OP_STARI:
+      case OP_NOTSTAR:
+      case OP_NOTSTARI:
+      case OP_MINSTAR:
+      case OP_MINSTARI:
+      case OP_NOTMINSTAR:
+      case OP_NOTMINSTARI:
+      case OP_POSSTAR:
+      case OP_POSSTARI:
+      case OP_NOTPOSSTAR:
+      case OP_NOTPOSSTARI:
+      case OP_PLUS:
+      case OP_PLUSI:
+      case OP_NOTPLUS:
+      case OP_NOTPLUSI:
+      case OP_MINPLUS:
+      case OP_MINPLUSI:
+      case OP_NOTMINPLUS:
+      case OP_NOTMINPLUSI:
+      case OP_POSPLUS:
+      case OP_POSPLUSI:
+      case OP_NOTPOSPLUS:
+      case OP_NOTPOSPLUSI:
+      case OP_QUERY:
+      case OP_QUERYI:
+      case OP_NOTQUERY:
+      case OP_NOTQUERYI:
+      case OP_MINQUERY:
+      case OP_MINQUERYI:
+      case OP_NOTMINQUERY:
+      case OP_NOTMINQUERYI:
+      case OP_POSQUERY:
+      case OP_POSQUERYI:
+      case OP_NOTPOSQUERY:
+      case OP_NOTPOSQUERYI:
+      if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
+      break;
+      }
+#else
+    (void)(utf);  /* Keep compiler happy by referencing function argument */
+#endif  /* MAYBE_UTF_MULTI */
+    }
+  }
+}
+
+
+
+/*************************************************
+*    Check for asserted fixed first code unit    *
+*************************************************/
+
+/* During compilation, the "first code unit" settings from forward assertions
+are discarded, because they can cause conflicts with actual literals that
+follow. However, if we end up without a first code unit setting for an
+unanchored pattern, it is worth scanning the regex to see if there is an
+initial asserted first code unit. If all branches start with the same asserted
+code unit, or with a non-conditional bracket all of whose alternatives start
+with the same asserted code unit (recurse ad lib), then we return that code
+unit, with the flags set to zero or REQ_CASELESS; otherwise return zero with
+REQ_NONE in the flags.
+
+Arguments:
+  code       points to start of compiled pattern
+  flags      points to the first code unit flags
+  inassert   non-zero if in an assertion
+
+Returns:     the fixed first code unit, or 0 with REQ_NONE in flags
+*/
+
+static uint32_t
+find_firstassertedcu(PCRE2_SPTR code, uint32_t *flags, uint32_t inassert)
+{
+uint32_t c = 0;
+uint32_t cflags = REQ_NONE;
+
+*flags = REQ_NONE;
+do {
+   uint32_t d;
+   uint32_t dflags;
+   int xl = (*code == OP_CBRA || *code == OP_SCBRA ||
+             *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0;
+   PCRE2_SPTR scode = first_significant_code(code + 1+LINK_SIZE + xl, TRUE);
+   PCRE2_UCHAR op = *scode;
+
+   switch(op)
+     {
+     default:
+     return 0;
+
+     case OP_BRA:
+     case OP_BRAPOS:
+     case OP_CBRA:
+     case OP_SCBRA:
+     case OP_CBRAPOS:
+     case OP_SCBRAPOS:
+     case OP_ASSERT:
+     case OP_ASSERT_NA:
+     case OP_ONCE:
+     case OP_SCRIPT_RUN:
+     d = find_firstassertedcu(scode, &dflags, inassert +
+       ((op == OP_ASSERT || op == OP_ASSERT_NA)?1:0));
+     if (dflags >= REQ_NONE) return 0;
+     if (cflags >= REQ_NONE) { c = d; cflags = dflags; }
+       else if (c != d || cflags != dflags) return 0;
+     break;
+
+     case OP_EXACT:
+     scode += IMM2_SIZE;
+     /* Fall through */
+
+     case OP_CHAR:
+     case OP_PLUS:
+     case OP_MINPLUS:
+     case OP_POSPLUS:
+     if (inassert == 0) return 0;
+     if (cflags >= REQ_NONE) { c = scode[1]; cflags = 0; }
+       else if (c != scode[1]) return 0;
+     break;
+
+     case OP_EXACTI:
+     scode += IMM2_SIZE;
+     /* Fall through */
+
+     case OP_CHARI:
+     case OP_PLUSI:
+     case OP_MINPLUSI:
+     case OP_POSPLUSI:
+     if (inassert == 0) return 0;
+
+     /* If the character is more than one code unit long, we cannot set its
+     first code unit when matching caselessly. Later scanning may pick up
+     multiple code units. */
+
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+     if (scode[1] >= 0x80) return 0;
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+     if (scode[1] >= 0xd800 && scode[1] <= 0xdfff) return 0;
+#endif
+#endif
+
+     if (cflags >= REQ_NONE) { c = scode[1]; cflags = REQ_CASELESS; }
+       else if (c != scode[1]) return 0;
+     break;
+     }
+
+   code += GET(code, 1);
+   }
+while (*code == OP_ALT);
+
+*flags = cflags;
+return c;
+}
+
+
+
+/*************************************************
+*     Add an entry to the name/number table      *
+*************************************************/
+
+/* This function is called between compiling passes to add an entry to the
+name/number table, maintaining alphabetical order. Checking for permitted
+and forbidden duplicates has already been done.
+
+Arguments:
+  cb           the compile data block
+  name         the name to add
+  length       the length of the name
+  groupno      the group number
+  tablecount   the count of names in the table so far
+
+Returns:       nothing
+*/
+
+static void
+add_name_to_table(compile_block *cb, PCRE2_SPTR name, int length,
+  unsigned int groupno, uint32_t tablecount)
+{
+uint32_t i;
+PCRE2_UCHAR *slot = cb->name_table;
+
+for (i = 0; i < tablecount; i++)
+  {
+  int crc = memcmp(name, slot+IMM2_SIZE, CU2BYTES(length));
+  if (crc == 0 && slot[IMM2_SIZE+length] != 0)
+    crc = -1; /* Current name is a substring */
+
+  /* Make space in the table and break the loop for an earlier name. For a
+  duplicate or later name, carry on. We do this for duplicates so that in the
+  simple case (when ?(| is not used) they are in order of their numbers. In all
+  cases they are in the order in which they appear in the pattern. */
+
+  if (crc < 0)
+    {
+    (void)memmove(slot + cb->name_entry_size, slot,
+      CU2BYTES((tablecount - i) * cb->name_entry_size));
+    break;
+    }
+
+  /* Continue the loop for a later or duplicate name */
+
+  slot += cb->name_entry_size;
+  }
+
+PUT2(slot, 0, groupno);
+memcpy(slot + IMM2_SIZE, name, CU2BYTES(length));
+
+/* Add a terminating zero and fill the rest of the slot with zeroes so that
+the memory is all initialized. Otherwise valgrind moans about uninitialized
+memory when saving serialized compiled patterns. */
+
+memset(slot + IMM2_SIZE + length, 0,
+  CU2BYTES(cb->name_entry_size - length - IMM2_SIZE));
+}
+
+
+
+/*************************************************
+*             Skip in parsed pattern             *
+*************************************************/
+
+/* This function is called to skip parts of the parsed pattern when finding the
+length of a lookbehind branch. It is called after (*ACCEPT) and (*FAIL) to find
+the end of the branch, it is called to skip over an internal lookaround or
+(DEFINE) group, and it is also called to skip to the end of a class, during
+which it will never encounter nested groups (but there's no need to have
+special code for that).
+
+When called to find the end of a branch or group, pptr must point to the first
+meta code inside the branch, not the branch-starting code. In other cases it
+can point to the item that causes the function to be called.
+
+Arguments:
+  pptr       current pointer to skip from
+  skiptype   PSKIP_CLASS when skipping to end of class
+             PSKIP_ALT when META_ALT ends the skip
+             PSKIP_KET when only META_KET ends the skip
+
+Returns:     new value of pptr
+             NULL if META_END is reached - should never occur
+               or for an unknown meta value - likewise
+*/
+
+static uint32_t *
+parsed_skip(uint32_t *pptr, uint32_t skiptype)
+{
+uint32_t nestlevel = 0;
+
+for (;; pptr++)
+  {
+  uint32_t meta = META_CODE(*pptr);
+
+  switch(meta)
+    {
+    default:  /* Just skip over most items */
+    if (meta < META_END) continue;  /* Literal */
+    break;
+
+    /* This should never occur. */
+
+    case META_END:
+    return NULL;
+
+    /* The data for these items is variable in length. */
+
+    case META_BACKREF:  /* Offset is present only if group >= 10 */
+    if (META_DATA(*pptr) >= 10) pptr += SIZEOFFSET;
+    break;
+
+    case META_ESCAPE:   /* A few escapes are followed by data items. */
+    switch (META_DATA(*pptr))
+      {
+      case ESC_P:
+      case ESC_p:
+      pptr += 1;
+      break;
+
+      case ESC_g:
+      case ESC_k:
+      pptr += 1 + SIZEOFFSET;
+      break;
+      }
+    break;
+
+    case META_MARK:     /* Add the length of the name. */
+    case META_COMMIT_ARG:
+    case META_PRUNE_ARG:
+    case META_SKIP_ARG:
+    case META_THEN_ARG:
+    pptr += pptr[1];
+    break;
+
+    /* These are the "active" items in this loop. */
+
+    case META_CLASS_END:
+    if (skiptype == PSKIP_CLASS) return pptr;
+    break;
+
+    case META_ATOMIC:
+    case META_CAPTURE:
+    case META_COND_ASSERT:
+    case META_COND_DEFINE:
+    case META_COND_NAME:
+    case META_COND_NUMBER:
+    case META_COND_RNAME:
+    case META_COND_RNUMBER:
+    case META_COND_VERSION:
+    case META_LOOKAHEAD:
+    case META_LOOKAHEADNOT:
+    case META_LOOKAHEAD_NA:
+    case META_LOOKBEHIND:
+    case META_LOOKBEHINDNOT:
+    case META_LOOKBEHIND_NA:
+    case META_NOCAPTURE:
+    case META_SCRIPT_RUN:
+    nestlevel++;
+    break;
+
+    case META_ALT:
+    if (nestlevel == 0 && skiptype == PSKIP_ALT) return pptr;
+    break;
+
+    case META_KET:
+    if (nestlevel == 0) return pptr;
+    nestlevel--;
+    break;
+    }
+
+  /* The extra data item length for each meta is in a table. */
+
+  meta = (meta >> 16) & 0x7fff;
+  if (meta >= sizeof(meta_extra_lengths)) return NULL;
+  pptr += meta_extra_lengths[meta];
+  }
+/* Control never reaches here */
+return pptr;
+}
+
+
+
+/*************************************************
+*       Find length of a parsed group            *
+*************************************************/
+
+/* This is called for nested groups within a branch of a lookbehind whose
+length is being computed. If all the branches in the nested group have the same
+length, that is OK. On entry, the pointer must be at the first element after
+the group initializing code. On exit it points to OP_KET. Caching is used to
+improve processing speed when the same capturing group occurs many times.
+
+Arguments:
+  pptrptr     pointer to pointer in the parsed pattern
+  isinline    FALSE if a reference or recursion; TRUE for inline group
+  errcodeptr  pointer to the errorcode
+  lcptr       pointer to the loop counter
+  group       number of captured group or -1 for a non-capturing group
+  recurses    chain of recurse_check to catch mutual recursion
+  cb          pointer to the compile data
+
+Returns:      the group length or a negative number
+*/
+
+static int
+get_grouplength(uint32_t **pptrptr, BOOL isinline, int *errcodeptr, int *lcptr,
+   int group, parsed_recurse_check *recurses, compile_block *cb)
+{
+int branchlength;
+int grouplength = -1;
+
+/* The cache can be used only if there is no possibility of there being two
+groups with the same number. We do not need to set the end pointer for a group
+that is being processed as a back reference or recursion, but we must do so for
+an inline group. */
+
+if (group > 0 && (cb->external_flags & PCRE2_DUPCAPUSED) == 0)
+  {
+  uint32_t groupinfo = cb->groupinfo[group];
+  if ((groupinfo & GI_NOT_FIXED_LENGTH) != 0) return -1;
+  if ((groupinfo & GI_SET_FIXED_LENGTH) != 0)
+    {
+    if (isinline) *pptrptr = parsed_skip(*pptrptr, PSKIP_KET);
+    return groupinfo & GI_FIXED_LENGTH_MASK;
+    }
+  }
+
+/* Scan the group. In this case we find the end pointer of necessity. */
+
+for(;;)
+  {
+  branchlength = get_branchlength(pptrptr, errcodeptr, lcptr, recurses, cb);
+  if (branchlength < 0) goto ISNOTFIXED;
+  if (grouplength == -1) grouplength = branchlength;
+    else if (grouplength != branchlength) goto ISNOTFIXED;
+  if (**pptrptr == META_KET) break;
+  *pptrptr += 1;   /* Skip META_ALT */
+  }
+
+if (group > 0)
+  cb->groupinfo[group] |= (uint32_t)(GI_SET_FIXED_LENGTH | grouplength);
+return grouplength;
+
+ISNOTFIXED:
+if (group > 0) cb->groupinfo[group] |= GI_NOT_FIXED_LENGTH;
+return -1;
+}
+
+
+
+/*************************************************
+*        Find length of a parsed branch          *
+*************************************************/
+
+/* Return a fixed length for a branch in a lookbehind, giving an error if the
+length is not fixed. On entry, *pptrptr points to the first element inside the
+branch. On exit it is set to point to the ALT or KET.
+
+Arguments:
+  pptrptr     pointer to pointer in the parsed pattern
+  errcodeptr  pointer to error code
+  lcptr       pointer to loop counter
+  recurses    chain of recurse_check to catch mutual recursion
+  cb          pointer to compile block
+
+Returns:      the length, or a negative value on error
+*/
+
+static int
+get_branchlength(uint32_t **pptrptr, int *errcodeptr, int *lcptr,
+  parsed_recurse_check *recurses, compile_block *cb)
+{
+int branchlength = 0;
+int grouplength;
+uint32_t lastitemlength = 0;
+uint32_t *pptr = *pptrptr;
+PCRE2_SIZE offset;
+parsed_recurse_check this_recurse;
+
+/* A large and/or complex regex can take too long to process. This can happen
+more often when (?| groups are present in the pattern because their length
+cannot be cached. */
+
+if ((*lcptr)++ > 2000)
+  {
+  *errcodeptr = ERR35;  /* Lookbehind is too complicated */
+  return -1;
+  }
+
+/* Scan the branch, accumulating the length. */
+
+for (;; pptr++)
+  {
+  parsed_recurse_check *r;
+  uint32_t *gptr, *gptrend;
+  uint32_t escape;
+  uint32_t group = 0;
+  uint32_t itemlength = 0;
+
+  if (*pptr < META_END)
+    {
+    itemlength = 1;
+    }
+
+  else switch (META_CODE(*pptr))
+    {
+    case META_KET:
+    case META_ALT:
+    goto EXIT;
+
+    /* (*ACCEPT) and (*FAIL) terminate the branch, but we must skip to the
+    actual termination. */
+
+    case META_ACCEPT:
+    case META_FAIL:
+    pptr = parsed_skip(pptr, PSKIP_ALT);
+    if (pptr == NULL) goto PARSED_SKIP_FAILED;
+    goto EXIT;
+
+    case META_MARK:
+    case META_COMMIT_ARG:
+    case META_PRUNE_ARG:
+    case META_SKIP_ARG:
+    case META_THEN_ARG:
+    pptr += pptr[1] + 1;
+    break;
+
+    case META_CIRCUMFLEX:
+    case META_COMMIT:
+    case META_DOLLAR:
+    case META_PRUNE:
+    case META_SKIP:
+    case META_THEN:
+    break;
+
+    case META_OPTIONS:
+    pptr += 1;
+    break;
+
+    case META_BIGVALUE:
+    itemlength = 1;
+    pptr += 1;
+    break;
+
+    case META_CLASS:
+    case META_CLASS_NOT:
+    itemlength = 1;
+    pptr = parsed_skip(pptr, PSKIP_CLASS);
+    if (pptr == NULL) goto PARSED_SKIP_FAILED;
+    break;
+
+    case META_CLASS_EMPTY_NOT:
+    case META_DOT:
+    itemlength = 1;
+    break;
+
+    case META_CALLOUT_NUMBER:
+    pptr += 3;
+    break;
+
+    case META_CALLOUT_STRING:
+    pptr += 3 + SIZEOFFSET;
+    break;
+
+    /* Only some escapes consume a character. Of those, \R and \X are never
+    allowed because they might match more than character. \C is allowed only in
+    32-bit and non-UTF 8/16-bit modes. */
+
+    case META_ESCAPE:
+    escape = META_DATA(*pptr);
+    if (escape == ESC_R || escape == ESC_X) return -1;
+    if (escape > ESC_b && escape < ESC_Z)
+      {
+#if PCRE2_CODE_UNIT_WIDTH != 32
+      if ((cb->external_options & PCRE2_UTF) != 0 && escape == ESC_C)
+        {
+        *errcodeptr = ERR36;
+        return -1;
+        }
+#endif
+      itemlength = 1;
+      if (escape == ESC_p || escape == ESC_P) pptr++;  /* Skip prop data */
+      }
+    break;
+
+    /* Lookaheads do not contribute to the length of this branch, but they may
+    contain lookbehinds within them whose lengths need to be set. */
+
+    case META_LOOKAHEAD:
+    case META_LOOKAHEADNOT:
+    case META_LOOKAHEAD_NA:
+    *errcodeptr = check_lookbehinds(pptr + 1, &pptr, recurses, cb, lcptr);
+    if (*errcodeptr != 0) return -1;
+
+    /* Ignore any qualifiers that follow a lookahead assertion. */
+
+    switch (pptr[1])
+      {
+      case META_ASTERISK:
+      case META_ASTERISK_PLUS:
+      case META_ASTERISK_QUERY:
+      case META_PLUS:
+      case META_PLUS_PLUS:
+      case META_PLUS_QUERY:
+      case META_QUERY:
+      case META_QUERY_PLUS:
+      case META_QUERY_QUERY:
+      pptr++;
+      break;
+
+      case META_MINMAX:
+      case META_MINMAX_PLUS:
+      case META_MINMAX_QUERY:
+      pptr += 3;
+      break;
+
+      default:
+      break;
+      }
+    break;
+
+    /* A nested lookbehind does not contribute any length to this lookbehind,
+    but must itself be checked and have its lengths set. */
+
+    case META_LOOKBEHIND:
+    case META_LOOKBEHINDNOT:
+    case META_LOOKBEHIND_NA:
+    if (!set_lookbehind_lengths(&pptr, errcodeptr, lcptr, recurses, cb))
+      return -1;
+    break;
+
+    /* Back references and recursions are handled by very similar code. At this
+    stage, the names generated in the parsing pass are available, but the main
+    name table has not yet been created. So for the named varieties, scan the
+    list of names in order to get the number of the first one in the pattern,
+    and whether or not this name is duplicated. */
+
+    case META_BACKREF_BYNAME:
+    if ((cb->external_options & PCRE2_MATCH_UNSET_BACKREF) != 0)
+      goto ISNOTFIXED;
+    /* Fall through */
+
+    case META_RECURSE_BYNAME:
+      {
+      int i;
+      PCRE2_SPTR name;
+      BOOL is_dupname = FALSE;
+      named_group *ng = cb->named_groups;
+      uint32_t meta_code = META_CODE(*pptr);
+      uint32_t length = *(++pptr);
+
+      GETPLUSOFFSET(offset, pptr);
+      name = cb->start_pattern + offset;
+      for (i = 0; i < cb->names_found; i++, ng++)
+        {
+        if (length == ng->length && PRIV(strncmp)(name, ng->name, length) == 0)
+          {
+          group = ng->number;
+          is_dupname = ng->isdup;
+          break;
+          }
+        }
+
+      if (group == 0)
+        {
+        *errcodeptr = ERR15;  /* Non-existent subpattern */
+        cb->erroroffset = offset;
+        return -1;
+        }
+
+      /* A numerical back reference can be fixed length if duplicate capturing
+      groups are not being used. A non-duplicate named back reference can also
+      be handled. */
+
+      if (meta_code == META_RECURSE_BYNAME ||
+          (!is_dupname && (cb->external_flags & PCRE2_DUPCAPUSED) == 0))
+        goto RECURSE_OR_BACKREF_LENGTH;  /* Handle as a numbered version. */
+      }
+    goto ISNOTFIXED;                     /* Duplicate name or number */
+
+    /* The offset values for back references < 10 are in a separate vector
+    because otherwise they would use more than two parsed pattern elements on
+    64-bit systems. */
+
+    case META_BACKREF:
+    if ((cb->external_options & PCRE2_MATCH_UNSET_BACKREF) != 0 ||
+        (cb->external_flags & PCRE2_DUPCAPUSED) != 0)
+      goto ISNOTFIXED;
+    group = META_DATA(*pptr);
+    if (group < 10)
+      {
+      offset = cb->small_ref_offset[group];
+      goto RECURSE_OR_BACKREF_LENGTH;
+      }
+
+    /* Fall through */
+    /* For groups >= 10 - picking up group twice does no harm. */
+
+    /* A true recursion implies not fixed length, but a subroutine call may
+    be OK. Back reference "recursions" are also failed. */
+
+    case META_RECURSE:
+    group = META_DATA(*pptr);
+    GETPLUSOFFSET(offset, pptr);
+
+    RECURSE_OR_BACKREF_LENGTH:
+    if (group > cb->bracount)
+      {
+      cb->erroroffset = offset;
+      *errcodeptr = ERR15;  /* Non-existent subpattern */
+      return -1;
+      }
+    if (group == 0) goto ISNOTFIXED;  /* Local recursion */
+    for (gptr = cb->parsed_pattern; *gptr != META_END; gptr++)
+      {
+      if (META_CODE(*gptr) == META_BIGVALUE) gptr++;
+        else if (*gptr == (META_CAPTURE | group)) break;
+      }
+
+    /* We must start the search for the end of the group at the first meta code
+    inside the group. Otherwise it will be treated as an enclosed group. */
+
+    gptrend = parsed_skip(gptr + 1, PSKIP_KET);
+    if (gptrend == NULL) goto PARSED_SKIP_FAILED;
+    if (pptr > gptr && pptr < gptrend) goto ISNOTFIXED;  /* Local recursion */
+    for (r = recurses; r != NULL; r = r->prev) if (r->groupptr == gptr) break;
+    if (r != NULL) goto ISNOTFIXED;   /* Mutual recursion */
+    this_recurse.prev = recurses;
+    this_recurse.groupptr = gptr;
+
+    /* We do not need to know the position of the end of the group, that is,
+    gptr is not used after the call to get_grouplength(). Setting the second
+    argument FALSE stops it scanning for the end when the length can be found
+    in the cache. */
+
+    gptr++;
+    grouplength = get_grouplength(&gptr, FALSE, errcodeptr, lcptr, group,
+      &this_recurse, cb);
+    if (grouplength < 0)
+      {
+      if (*errcodeptr == 0) goto ISNOTFIXED;
+      return -1;  /* Error already set */
+      }
+    itemlength = grouplength;
+    break;
+
+    /* A (DEFINE) group is never obeyed inline and so it does not contribute to
+    the length of this branch. Skip from the following item to the next
+    unpaired ket. */
+
+    case META_COND_DEFINE:
+    pptr = parsed_skip(pptr + 1, PSKIP_KET);
+    break;
+
+    /* Check other nested groups - advance past the initial data for each type
+    and then seek a fixed length with get_grouplength(). */
+
+    case META_COND_NAME:
+    case META_COND_NUMBER:
+    case META_COND_RNAME:
+    case META_COND_RNUMBER:
+    pptr += 2 + SIZEOFFSET;
+    goto CHECK_GROUP;
+
+    case META_COND_ASSERT:
+    pptr += 1;
+    goto CHECK_GROUP;
+
+    case META_COND_VERSION:
+    pptr += 4;
+    goto CHECK_GROUP;
+
+    case META_CAPTURE:
+    group = META_DATA(*pptr);
+    /* Fall through */
+
+    case META_ATOMIC:
+    case META_NOCAPTURE:
+    case META_SCRIPT_RUN:
+    pptr++;
+    CHECK_GROUP:
+    grouplength = get_grouplength(&pptr, TRUE, errcodeptr, lcptr, group,
+      recurses, cb);
+    if (grouplength < 0) return -1;
+    itemlength = grouplength;
+    break;
+
+    /* Exact repetition is OK; variable repetition is not. A repetition of zero
+    must subtract the length that has already been added. */
+
+    case META_MINMAX:
+    case META_MINMAX_PLUS:
+    case META_MINMAX_QUERY:
+    if (pptr[1] == pptr[2])
+      {
+      switch(pptr[1])
+        {
+        case 0:
+        branchlength -= lastitemlength;
+        break;
+
+        case 1:
+        itemlength = 0;
+        break;
+
+        default:  /* Check for integer overflow */
+        if (lastitemlength != 0 &&  /* Should not occur, but just in case */
+            INT_MAX/lastitemlength < pptr[1] - 1)
+          {
+          *errcodeptr = ERR87;  /* Integer overflow; lookbehind too big */
+          return -1;
+          }
+        itemlength = (pptr[1] - 1) * lastitemlength;
+        break;
+        }
+      pptr += 2;
+      break;
+      }
+    /* Fall through */
+
+    /* Any other item means this branch does not have a fixed length. */
+
+    default:
+    ISNOTFIXED:
+    *errcodeptr = ERR25;   /* Not fixed length */
+    return -1;
+    }
+
+  /* Add the item length to the branchlength, checking for integer overflow and
+  for the branch length exceeding the limit. */
+
+  if (INT_MAX - branchlength < (int)itemlength ||
+      (branchlength += itemlength) > LOOKBEHIND_MAX)
+    {
+    *errcodeptr = ERR87;
+    return -1;
+    }
+
+  /* Save this item length for use if the next item is a quantifier. */
+
+  lastitemlength = itemlength;
+  }
+
+EXIT:
+*pptrptr = pptr;
+return branchlength;
+
+PARSED_SKIP_FAILED:
+*errcodeptr = ERR90;
+return -1;
+}
+
+
+
+/*************************************************
+*        Set lengths in a lookbehind             *
+*************************************************/
+
+/* This function is called for each lookbehind, to set the lengths in its
+branches. An error occurs if any branch does not have a fixed length that is
+less than the maximum (65535). On exit, the pointer must be left on the final
+ket.
+
+The function also maintains the max_lookbehind value. Any lookbehind branch
+that contains a nested lookbehind may actually look further back than the
+length of the branch. The additional amount is passed back from
+get_branchlength() as an "extra" value.
+
+Arguments:
+  pptrptr     pointer to pointer in the parsed pattern
+  errcodeptr  pointer to error code
+  lcptr       pointer to loop counter
+  recurses    chain of recurse_check to catch mutual recursion
+  cb          pointer to compile block
+
+Returns:      TRUE if all is well
+              FALSE otherwise, with error code and offset set
+*/
+
+static BOOL
+set_lookbehind_lengths(uint32_t **pptrptr, int *errcodeptr, int *lcptr,
+  parsed_recurse_check *recurses, compile_block *cb)
+{
+PCRE2_SIZE offset;
+int branchlength;
+uint32_t *bptr = *pptrptr;
+
+READPLUSOFFSET(offset, bptr);  /* Offset for error messages */
+*pptrptr += SIZEOFFSET;
+
+do
+  {
+  *pptrptr += 1;
+  branchlength = get_branchlength(pptrptr, errcodeptr, lcptr, recurses, cb);
+  if (branchlength < 0)
+    {
+    /* The errorcode and offset may already be set from a nested lookbehind. */
+    if (*errcodeptr == 0) *errcodeptr = ERR25;
+    if (cb->erroroffset == PCRE2_UNSET) cb->erroroffset = offset;
+    return FALSE;
+    }
+  if (branchlength > cb->max_lookbehind) cb->max_lookbehind = branchlength;
+  *bptr |= branchlength;  /* branchlength never more than 65535 */
+  bptr = *pptrptr;
+  }
+while (*bptr == META_ALT);
+
+return TRUE;
+}
+
+
+
+/*************************************************
+*         Check parsed pattern lookbehinds       *
+*************************************************/
+
+/* This function is called at the end of parsing a pattern if any lookbehinds
+were encountered. It scans the parsed pattern for them, calling
+set_lookbehind_lengths() for each one. At the start, the errorcode is zero and
+the error offset is marked unset. The enables the functions above not to
+override settings from deeper nestings.
+
+This function is called recursively from get_branchlength() for lookaheads in
+order to process any lookbehinds that they may contain. It stops when it hits a
+non-nested closing parenthesis in this case, returning a pointer to it.
+
+Arguments
+  pptr      points to where to start (start of pattern or start of lookahead)
+  retptr    if not NULL, return the ket pointer here
+  recurses  chain of recurse_check to catch mutual recursion
+  cb        points to the compile block
+  lcptr     points to loop counter
+
+Returns:    0 on success, or an errorcode (cb->erroroffset will be set)
+*/
+
+static int
+check_lookbehinds(uint32_t *pptr, uint32_t **retptr,
+  parsed_recurse_check *recurses, compile_block *cb, int *lcptr)
+{
+int errorcode = 0;
+int nestlevel = 0;
+
+cb->erroroffset = PCRE2_UNSET;
+
+for (; *pptr != META_END; pptr++)
+  {
+  if (*pptr < META_END) continue;  /* Literal */
+
+  switch (META_CODE(*pptr))
+    {
+    default:
+    return ERR70;  /* Unrecognized meta code */
+
+    case META_ESCAPE:
+    if (*pptr - META_ESCAPE == ESC_P || *pptr - META_ESCAPE == ESC_p)
+      pptr += 1;
+    break;
+
+    case META_KET:
+    if (--nestlevel < 0)
+      {
+      if (retptr != NULL) *retptr = pptr;
+      return 0;
+      }
+    break;
+
+    case META_ATOMIC:
+    case META_CAPTURE:
+    case META_COND_ASSERT:
+    case META_LOOKAHEAD:
+    case META_LOOKAHEADNOT:
+    case META_LOOKAHEAD_NA:
+    case META_NOCAPTURE:
+    case META_SCRIPT_RUN:
+    nestlevel++;
+    break;
+
+    case META_ACCEPT:
+    case META_ALT:
+    case META_ASTERISK:
+    case META_ASTERISK_PLUS:
+    case META_ASTERISK_QUERY:
+    case META_BACKREF:
+    case META_CIRCUMFLEX:
+    case META_CLASS:
+    case META_CLASS_EMPTY:
+    case META_CLASS_EMPTY_NOT:
+    case META_CLASS_END:
+    case META_CLASS_NOT:
+    case META_COMMIT:
+    case META_DOLLAR:
+    case META_DOT:
+    case META_FAIL:
+    case META_PLUS:
+    case META_PLUS_PLUS:
+    case META_PLUS_QUERY:
+    case META_PRUNE:
+    case META_QUERY:
+    case META_QUERY_PLUS:
+    case META_QUERY_QUERY:
+    case META_RANGE_ESCAPED:
+    case META_RANGE_LITERAL:
+    case META_SKIP:
+    case META_THEN:
+    break;
+
+    case META_RECURSE:
+    pptr += SIZEOFFSET;
+    break;
+
+    case META_BACKREF_BYNAME:
+    case META_RECURSE_BYNAME:
+    pptr += 1 + SIZEOFFSET;
+    break;
+
+    case META_COND_DEFINE:
+    pptr += SIZEOFFSET;
+    nestlevel++;
+    break;
+
+    case META_COND_NAME:
+    case META_COND_NUMBER:
+    case META_COND_RNAME:
+    case META_COND_RNUMBER:
+    pptr += 1 + SIZEOFFSET;
+    nestlevel++;
+    break;
+
+    case META_COND_VERSION:
+    pptr += 3;
+    nestlevel++;
+    break;
+
+    case META_CALLOUT_STRING:
+    pptr += 3 + SIZEOFFSET;
+    break;
+
+    case META_BIGVALUE:
+    case META_OPTIONS:
+    case META_POSIX:
+    case META_POSIX_NEG:
+    pptr += 1;
+    break;
+
+    case META_MINMAX:
+    case META_MINMAX_QUERY:
+    case META_MINMAX_PLUS:
+    pptr += 2;
+    break;
+
+    case META_CALLOUT_NUMBER:
+    pptr += 3;
+    break;
+
+    case META_MARK:
+    case META_COMMIT_ARG:
+    case META_PRUNE_ARG:
+    case META_SKIP_ARG:
+    case META_THEN_ARG:
+    pptr += 1 + pptr[1];
+    break;
+
+    case META_LOOKBEHIND:
+    case META_LOOKBEHINDNOT:
+    case META_LOOKBEHIND_NA:
+    if (!set_lookbehind_lengths(&pptr, &errorcode, lcptr, recurses, cb))
+      return errorcode;
+    break;
+    }
+  }
+
+return 0;
+}
+
+
+
+/*************************************************
+*     External function to compile a pattern     *
+*************************************************/
+
+/* This function reads a regular expression in the form of a string and returns
+a pointer to a block of store holding a compiled version of the expression.
+
+Arguments:
+  pattern       the regular expression
+  patlen        the length of the pattern, or PCRE2_ZERO_TERMINATED
+  options       option bits
+  errorptr      pointer to errorcode
+  erroroffset   pointer to error offset
+  ccontext      points to a compile context or is NULL
+
+Returns:        pointer to compiled data block, or NULL on error,
+                with errorcode and erroroffset set
+*/
+
+PCRE2_EXP_DEFN pcre2_code * PCRE2_CALL_CONVENTION
+pcre2_compile(PCRE2_SPTR pattern, PCRE2_SIZE patlen, uint32_t options,
+   int *errorptr, PCRE2_SIZE *erroroffset, pcre2_compile_context *ccontext)
+{
+BOOL utf;                             /* Set TRUE for UTF mode */
+BOOL ucp;                             /* Set TRUE for UCP mode */
+BOOL has_lookbehind = FALSE;          /* Set TRUE if a lookbehind is found */
+BOOL zero_terminated;                 /* Set TRUE for zero-terminated pattern */
+pcre2_real_code *re = NULL;           /* What we will return */
+compile_block cb;                     /* "Static" compile-time data */
+const uint8_t *tables;                /* Char tables base pointer */
+
+PCRE2_UCHAR *code;                    /* Current pointer in compiled code */
+PCRE2_SPTR codestart;                 /* Start of compiled code */
+PCRE2_SPTR ptr;                       /* Current pointer in pattern */
+uint32_t *pptr;                       /* Current pointer in parsed pattern */
+
+PCRE2_SIZE length = 1;                /* Allow for final END opcode */
+PCRE2_SIZE usedlength;                /* Actual length used */
+PCRE2_SIZE re_blocksize;              /* Size of memory block */
+PCRE2_SIZE big32count = 0;            /* 32-bit literals >= 0x80000000 */
+PCRE2_SIZE parsed_size_needed;        /* Needed for parsed pattern */
+
+uint32_t firstcuflags, reqcuflags;    /* Type of first/req code unit */
+uint32_t firstcu, reqcu;              /* Value of first/req code unit */
+uint32_t setflags = 0;                /* NL and BSR set flags */
+
+uint32_t skipatstart;                 /* When checking (*UTF) etc */
+uint32_t limit_heap  = UINT32_MAX;
+uint32_t limit_match = UINT32_MAX;    /* Unset match limits */
+uint32_t limit_depth = UINT32_MAX;
+
+int newline = 0;                      /* Unset; can be set by the pattern */
+int bsr = 0;                          /* Unset; can be set by the pattern */
+int errorcode = 0;                    /* Initialize to avoid compiler warn */
+int regexrc;                          /* Return from compile */
+
+uint32_t i;                           /* Local loop counter */
+
+/* Comments at the head of this file explain about these variables. */
+
+uint32_t stack_groupinfo[GROUPINFO_DEFAULT_SIZE];
+uint32_t stack_parsed_pattern[PARSED_PATTERN_DEFAULT_SIZE];
+named_group named_groups[NAMED_GROUP_LIST_SIZE];
+
+/* The workspace is used in different ways in the different compiling phases.
+It needs to be 16-bit aligned for the preliminary parsing scan. */
+
+uint32_t c16workspace[C16_WORK_SIZE];
+PCRE2_UCHAR *cworkspace = (PCRE2_UCHAR *)c16workspace;
+
+
+/* -------------- Check arguments and set up the pattern ----------------- */
+
+/* There must be error code and offset pointers. */
+
+if (errorptr == NULL || erroroffset == NULL) return NULL;
+*errorptr = ERR0;
+*erroroffset = 0;
+
+/* There must be a pattern! */
+
+if (pattern == NULL)
+  {
+  *errorptr = ERR16;
+  return NULL;
+  }
+
+/* A NULL compile context means "use a default context" */
+
+if (ccontext == NULL)
+  ccontext = (pcre2_compile_context *)(&PRIV(default_compile_context));
+
+/* PCRE2_MATCH_INVALID_UTF implies UTF */
+
+if ((options & PCRE2_MATCH_INVALID_UTF) != 0) options |= PCRE2_UTF;
+
+/* Check that all undefined public option bits are zero. */
+
+if ((options & ~PUBLIC_COMPILE_OPTIONS) != 0 ||
+    (ccontext->extra_options & ~PUBLIC_COMPILE_EXTRA_OPTIONS) != 0)
+  {
+  *errorptr = ERR17;
+  return NULL;
+  }
+
+if ((options & PCRE2_LITERAL) != 0 &&
+    ((options & ~PUBLIC_LITERAL_COMPILE_OPTIONS) != 0 ||
+     (ccontext->extra_options & ~PUBLIC_LITERAL_COMPILE_EXTRA_OPTIONS) != 0))
+  {
+  *errorptr = ERR92;
+  return NULL;
+  }
+
+/* A zero-terminated pattern is indicated by the special length value
+PCRE2_ZERO_TERMINATED. Check for an overlong pattern. */
+
+if ((zero_terminated = (patlen == PCRE2_ZERO_TERMINATED)))
+  patlen = PRIV(strlen)(pattern);
+
+if (patlen > ccontext->max_pattern_length)
+  {
+  *errorptr = ERR88;
+  return NULL;
+  }
+
+/* From here on, all returns from this function should end up going via the
+EXIT label. */
+
+
+/* ------------ Initialize the "static" compile data -------------- */
+
+tables = (ccontext->tables != NULL)? ccontext->tables : PRIV(default_tables);
+
+cb.lcc = tables + lcc_offset;          /* Individual */
+cb.fcc = tables + fcc_offset;          /*   character */
+cb.cbits = tables + cbits_offset;      /*      tables */
+cb.ctypes = tables + ctypes_offset;
+
+cb.assert_depth = 0;
+cb.bracount = 0;
+cb.cx = ccontext;
+cb.dupnames = FALSE;
+cb.end_pattern = pattern + patlen;
+cb.erroroffset = 0;
+cb.external_flags = 0;
+cb.external_options = options;
+cb.groupinfo = stack_groupinfo;
+cb.had_recurse = FALSE;
+cb.lastcapture = 0;
+cb.max_lookbehind = 0;
+cb.name_entry_size = 0;
+cb.name_table = NULL;
+cb.named_groups = named_groups;
+cb.named_group_list_size = NAMED_GROUP_LIST_SIZE;
+cb.names_found = 0;
+cb.open_caps = NULL;
+cb.parens_depth = 0;
+cb.parsed_pattern = stack_parsed_pattern;
+cb.req_varyopt = 0;
+cb.start_code = cworkspace;
+cb.start_pattern = pattern;
+cb.start_workspace = cworkspace;
+cb.workspace_size = COMPILE_WORK_SIZE;
+
+/* Maximum back reference and backref bitmap. The bitmap records up to 31 back
+references to help in deciding whether (.*) can be treated as anchored or not.
+*/
+
+cb.top_backref = 0;
+cb.backref_map = 0;
+
+/* Escape sequences \1 to \9 are always back references, but as they are only
+two characters long, only two elements can be used in the parsed_pattern
+vector. The first contains the reference, and we'd like to use the second to
+record the offset in the pattern, so that forward references to non-existent
+groups can be diagnosed later with an offset. However, on 64-bit systems,
+PCRE2_SIZE won't fit. Instead, we have a vector of offsets for the first
+occurrence of \1 to \9, indexed by the second parsed_pattern value. All other
+references have enough space for the offset to be put into the parsed pattern.
+*/
+
+for (i = 0; i < 10; i++) cb.small_ref_offset[i] = PCRE2_UNSET;
+
+
+/* --------------- Start looking at the pattern --------------- */
+
+/* Unless PCRE2_LITERAL is set, check for global one-time option settings at
+the start of the pattern, and remember the offset to the actual regex. With
+valgrind support, make the terminator of a zero-terminated pattern
+inaccessible. This catches bugs that would otherwise only show up for
+non-zero-terminated patterns. */
+
+#ifdef SUPPORT_VALGRIND
+if (zero_terminated) VALGRIND_MAKE_MEM_NOACCESS(pattern + patlen, CU2BYTES(1));
+#endif
+
+ptr = pattern;
+skipatstart = 0;
+
+if ((options & PCRE2_LITERAL) == 0)
+  {
+  while (patlen - skipatstart >= 2 &&
+         ptr[skipatstart] == CHAR_LEFT_PARENTHESIS &&
+         ptr[skipatstart+1] == CHAR_ASTERISK)
+    {
+    for (i = 0; i < sizeof(pso_list)/sizeof(pso); i++)
+      {
+      uint32_t c, pp;
+      pso *p = pso_list + i;
+
+      if (patlen - skipatstart - 2 >= p->length &&
+          PRIV(strncmp_c8)(ptr + skipatstart + 2, (char *)(p->name),
+            p->length) == 0)
+        {
+        skipatstart += p->length + 2;
+        switch(p->type)
+          {
+          case PSO_OPT:
+          cb.external_options |= p->value;
+          break;
+
+          case PSO_FLG:
+          setflags |= p->value;
+          break;
+
+          case PSO_NL:
+          newline = p->value;
+          setflags |= PCRE2_NL_SET;
+          break;
+
+          case PSO_BSR:
+          bsr = p->value;
+          setflags |= PCRE2_BSR_SET;
+          break;
+
+          case PSO_LIMM:
+          case PSO_LIMD:
+          case PSO_LIMH:
+          c = 0;
+          pp = skipatstart;
+          if (!IS_DIGIT(ptr[pp]))
+            {
+            errorcode = ERR60;
+            ptr += pp;
+            goto HAD_EARLY_ERROR;
+            }
+          while (IS_DIGIT(ptr[pp]))
+            {
+            if (c > UINT32_MAX / 10 - 1) break;   /* Integer overflow */
+            c = c*10 + (ptr[pp++] - CHAR_0);
+            }
+          if (ptr[pp++] != CHAR_RIGHT_PARENTHESIS)
+            {
+            errorcode = ERR60;
+            ptr += pp;
+            goto HAD_EARLY_ERROR;
+            }
+          if (p->type == PSO_LIMH) limit_heap = c;
+            else if (p->type == PSO_LIMM) limit_match = c;
+            else limit_depth = c;
+          skipatstart += pp - skipatstart;
+          break;
+          }
+        break;   /* Out of the table scan loop */
+        }
+      }
+    if (i >= sizeof(pso_list)/sizeof(pso)) break;   /* Out of pso loop */
+    }
+  }
+
+/* End of pattern-start options; advance to start of real regex. */
+
+ptr += skipatstart;
+
+/* Can't support UTF or UCP if PCRE2 was built without Unicode support. */
+
+#ifndef SUPPORT_UNICODE
+if ((cb.external_options & (PCRE2_UTF|PCRE2_UCP)) != 0)
+  {
+  errorcode = ERR32;
+  goto HAD_EARLY_ERROR;
+  }
+#endif
+
+/* Check UTF. We have the original options in 'options', with that value as
+modified by (*UTF) etc in cb->external_options. The extra option
+PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES is not permitted in UTF-16 mode because the
+surrogate code points cannot be represented in UTF-16. */
+
+utf = (cb.external_options & PCRE2_UTF) != 0;
+if (utf)
+  {
+  if ((options & PCRE2_NEVER_UTF) != 0)
+    {
+    errorcode = ERR74;
+    goto HAD_EARLY_ERROR;
+    }
+  if ((options & PCRE2_NO_UTF_CHECK) == 0 &&
+       (errorcode = PRIV(valid_utf)(pattern, patlen, erroroffset)) != 0)
+    goto HAD_ERROR;  /* Offset was set by valid_utf() */
+
+#if PCRE2_CODE_UNIT_WIDTH == 16
+  if ((ccontext->extra_options & PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES) != 0)
+    {
+    errorcode = ERR91;
+    goto HAD_EARLY_ERROR;
+    }
+#endif
+  }
+
+/* Check UCP lockout. */
+
+ucp = (cb.external_options & PCRE2_UCP) != 0;
+if (ucp && (cb.external_options & PCRE2_NEVER_UCP) != 0)
+  {
+  errorcode = ERR75;
+  goto HAD_EARLY_ERROR;
+  }
+
+/* Process the BSR setting. */
+
+if (bsr == 0) bsr = ccontext->bsr_convention;
+
+/* Process the newline setting. */
+
+if (newline == 0) newline = ccontext->newline_convention;
+cb.nltype = NLTYPE_FIXED;
+switch(newline)
+  {
+  case PCRE2_NEWLINE_CR:
+  cb.nllen = 1;
+  cb.nl[0] = CHAR_CR;
+  break;
+
+  case PCRE2_NEWLINE_LF:
+  cb.nllen = 1;
+  cb.nl[0] = CHAR_NL;
+  break;
+
+  case PCRE2_NEWLINE_NUL:
+  cb.nllen = 1;
+  cb.nl[0] = CHAR_NUL;
+  break;
+
+  case PCRE2_NEWLINE_CRLF:
+  cb.nllen = 2;
+  cb.nl[0] = CHAR_CR;
+  cb.nl[1] = CHAR_NL;
+  break;
+
+  case PCRE2_NEWLINE_ANY:
+  cb.nltype = NLTYPE_ANY;
+  break;
+
+  case PCRE2_NEWLINE_ANYCRLF:
+  cb.nltype = NLTYPE_ANYCRLF;
+  break;
+
+  default:
+  errorcode = ERR56;
+  goto HAD_EARLY_ERROR;
+  }
+
+/* Pre-scan the pattern to do two things: (1) Discover the named groups and
+their numerical equivalents, so that this information is always available for
+the remaining processing. (2) At the same time, parse the pattern and put a
+processed version into the parsed_pattern vector. This has escapes interpreted
+and comments removed (amongst other things).
+
+In all but one case, when PCRE2_AUTO_CALLOUT is not set, the number of unsigned
+32-bit ints in the parsed pattern is bounded by the length of the pattern plus
+one (for the terminator) plus four if PCRE2_EXTRA_WORD or PCRE2_EXTRA_LINE is
+set. The exceptional case is when running in 32-bit, non-UTF mode, when literal
+characters greater than META_END (0x80000000) have to be coded as two units. In
+this case, therefore, we scan the pattern to check for such values. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+if (!utf)
+  {
+  PCRE2_SPTR p;
+  for (p = ptr; p < cb.end_pattern; p++) if (*p >= META_END) big32count++;
+  }
+#endif
+
+/* Ensure that the parsed pattern buffer is big enough. When PCRE2_AUTO_CALLOUT
+is set we have to assume a numerical callout (4 elements) for each character
+plus one at the end. This is overkill, but memory is plentiful these days. For
+many smaller patterns the vector on the stack (which was set up above) can be
+used. */
+
+parsed_size_needed = patlen - skipatstart + big32count;
+
+if ((ccontext->extra_options &
+     (PCRE2_EXTRA_MATCH_WORD|PCRE2_EXTRA_MATCH_LINE)) != 0)
+  parsed_size_needed += 4;
+
+if ((options & PCRE2_AUTO_CALLOUT) != 0)
+  parsed_size_needed = (parsed_size_needed + 1) * 5;
+
+if (parsed_size_needed >= PARSED_PATTERN_DEFAULT_SIZE)
+  {
+  uint32_t *heap_parsed_pattern = ccontext->memctl.malloc(
+    (parsed_size_needed + 1) * sizeof(uint32_t), ccontext->memctl.memory_data);
+  if (heap_parsed_pattern == NULL)
+    {
+    *errorptr = ERR21;
+    goto EXIT;
+    }
+  cb.parsed_pattern = heap_parsed_pattern;
+  }
+cb.parsed_pattern_end = cb.parsed_pattern + parsed_size_needed + 1;
+
+/* Do the parsing scan. */
+
+errorcode = parse_regex(ptr, cb.external_options, &has_lookbehind, &cb);
+if (errorcode != 0) goto HAD_CB_ERROR;
+
+/* Workspace is needed to remember information about numbered groups: whether a
+group can match an empty string and what its fixed length is. This is done to
+avoid the possibility of recursive references causing very long compile times
+when checking these features. Unnumbered groups do not have this exposure since
+they cannot be referenced. We use an indexed vector for this purpose. If there
+are sufficiently few groups, the default vector on the stack, as set up above,
+can be used. Otherwise we have to get/free a special vector. The vector must be
+initialized to zero. */
+
+if (cb.bracount >= GROUPINFO_DEFAULT_SIZE)
+  {
+  cb.groupinfo = ccontext->memctl.malloc(
+    (cb.bracount + 1)*sizeof(uint32_t), ccontext->memctl.memory_data);
+  if (cb.groupinfo == NULL)
+    {
+    errorcode = ERR21;
+    cb.erroroffset = 0;
+    goto HAD_CB_ERROR;
+    }
+  }
+memset(cb.groupinfo, 0, (cb.bracount + 1) * sizeof(uint32_t));
+
+/* If there were any lookbehinds, scan the parsed pattern to figure out their
+lengths. */
+
+if (has_lookbehind)
+  {
+  int loopcount = 0;
+  errorcode = check_lookbehinds(cb.parsed_pattern, NULL, NULL, &cb, &loopcount);
+  if (errorcode != 0) goto HAD_CB_ERROR;
+  }
+
+/* For debugging, there is a function that shows the parsed data vector. */
+
+#ifdef DEBUG_SHOW_PARSED
+fprintf(stderr, "+++ Pre-scan complete:\n");
+show_parsed(&cb);
+#endif
+
+/* For debugging capturing information this code can be enabled. */
+
+#ifdef DEBUG_SHOW_CAPTURES
+  {
+  named_group *ng = cb.named_groups;
+  fprintf(stderr, "+++Captures: %d\n", cb.bracount);
+  for (i = 0; i < cb.names_found; i++, ng++)
+    {
+    fprintf(stderr, "+++%3d %.*s\n", ng->number, ng->length, ng->name);
+    }
+  }
+#endif
+
+/* Pretend to compile the pattern while actually just accumulating the amount
+of memory required in the 'length' variable. This behaviour is triggered by
+passing a non-NULL final argument to compile_regex(). We pass a block of
+workspace (cworkspace) for it to compile parts of the pattern into; the
+compiled code is discarded when it is no longer needed, so hopefully this
+workspace will never overflow, though there is a test for its doing so.
+
+On error, errorcode will be set non-zero, so we don't need to look at the
+result of the function. The initial options have been put into the cb block,
+but we still have to pass a separate options variable (the first argument)
+because the options may change as the pattern is processed. */
+
+cb.erroroffset = patlen;   /* For any subsequent errors that do not set it */
+pptr = cb.parsed_pattern;
+code = cworkspace;
+*code = OP_BRA;
+
+(void)compile_regex(cb.external_options, &code, &pptr, &errorcode, 0, &firstcu,
+   &firstcuflags, &reqcu, &reqcuflags, NULL, &cb, &length);
+
+if (errorcode != 0) goto HAD_CB_ERROR;  /* Offset is in cb.erroroffset */
+
+/* This should be caught in compile_regex(), but just in case... */
+
+if (length > MAX_PATTERN_SIZE)
+  {
+  errorcode = ERR20;
+  goto HAD_CB_ERROR;
+  }
+
+/* Compute the size of, and then get and initialize, the data block for storing
+the compiled pattern and names table. Integer overflow should no longer be
+possible because nowadays we limit the maximum value of cb.names_found and
+cb.name_entry_size. */
+
+re_blocksize = sizeof(pcre2_real_code) +
+  CU2BYTES(length +
+  (PCRE2_SIZE)cb.names_found * (PCRE2_SIZE)cb.name_entry_size);
+re = (pcre2_real_code *)
+  ccontext->memctl.malloc(re_blocksize, ccontext->memctl.memory_data);
+if (re == NULL)
+  {
+  errorcode = ERR21;
+  goto HAD_CB_ERROR;
+  }
+
+/* The compiler may put padding at the end of the pcre2_real_code structure in
+order to round it up to a multiple of 4 or 8 bytes. This means that when a
+compiled pattern is copied (for example, when serialized) undefined bytes are
+read, and this annoys debuggers such as valgrind. To avoid this, we explicitly
+write to the last 8 bytes of the structure before setting the fields. */
+
+memset((char *)re + sizeof(pcre2_real_code) - 8, 0, 8);
+re->memctl = ccontext->memctl;
+re->tables = tables;
+re->executable_jit = NULL;
+memset(re->start_bitmap, 0, 32 * sizeof(uint8_t));
+re->blocksize = re_blocksize;
+re->magic_number = MAGIC_NUMBER;
+re->compile_options = options;
+re->overall_options = cb.external_options;
+re->extra_options = ccontext->extra_options;
+re->flags = PCRE2_CODE_UNIT_WIDTH/8 | cb.external_flags | setflags;
+re->limit_heap = limit_heap;
+re->limit_match = limit_match;
+re->limit_depth = limit_depth;
+re->first_codeunit = 0;
+re->last_codeunit = 0;
+re->bsr_convention = bsr;
+re->newline_convention = newline;
+re->max_lookbehind = 0;
+re->minlength = 0;
+re->top_bracket = 0;
+re->top_backref = 0;
+re->name_entry_size = cb.name_entry_size;
+re->name_count = cb.names_found;
+
+/* The basic block is immediately followed by the name table, and the compiled
+code follows after that. */
+
+codestart = (PCRE2_SPTR)((uint8_t *)re + sizeof(pcre2_real_code)) +
+  re->name_entry_size * re->name_count;
+
+/* Update the compile data block for the actual compile. The starting points of
+the name/number translation table and of the code are passed around in the
+compile data block. The start/end pattern and initial options are already set
+from the pre-compile phase, as is the name_entry_size field. */
+
+cb.parens_depth = 0;
+cb.assert_depth = 0;
+cb.lastcapture = 0;
+cb.name_table = (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code));
+cb.start_code = codestart;
+cb.req_varyopt = 0;
+cb.had_accept = FALSE;
+cb.had_pruneorskip = FALSE;
+cb.open_caps = NULL;
+
+/* If any named groups were found, create the name/number table from the list
+created in the pre-pass. */
+
+if (cb.names_found > 0)
+  {
+  named_group *ng = cb.named_groups;
+  for (i = 0; i < cb.names_found; i++, ng++)
+    add_name_to_table(&cb, ng->name, ng->length, ng->number, i);
+  }
+
+/* Set up a starting, non-extracting bracket, then compile the expression. On
+error, errorcode will be set non-zero, so we don't need to look at the result
+of the function here. */
+
+pptr = cb.parsed_pattern;
+code = (PCRE2_UCHAR *)codestart;
+*code = OP_BRA;
+regexrc = compile_regex(re->overall_options, &code, &pptr, &errorcode, 0,
+  &firstcu, &firstcuflags, &reqcu, &reqcuflags, NULL, &cb, NULL);
+if (regexrc < 0) re->flags |= PCRE2_MATCH_EMPTY;
+re->top_bracket = cb.bracount;
+re->top_backref = cb.top_backref;
+re->max_lookbehind = cb.max_lookbehind;
+
+if (cb.had_accept)
+  {
+  reqcu = 0;                     /* Must disable after (*ACCEPT) */
+  reqcuflags = REQ_NONE;
+  re->flags |= PCRE2_HASACCEPT;  /* Disables minimum length */
+  }
+
+/* Fill in the final opcode and check for disastrous overflow. If no overflow,
+but the estimated length exceeds the really used length, adjust the value of
+re->blocksize, and if valgrind support is configured, mark the extra allocated
+memory as unaddressable, so that any out-of-bound reads can be detected. */
+
+*code++ = OP_END;
+usedlength = code - codestart;
+if (usedlength > length) errorcode = ERR23; else
+  {
+  re->blocksize -= CU2BYTES(length - usedlength);
+#ifdef SUPPORT_VALGRIND
+  VALGRIND_MAKE_MEM_NOACCESS(code, CU2BYTES(length - usedlength));
+#endif
+  }
+
+/* Scan the pattern for recursion/subroutine calls and convert the group
+numbers into offsets. Maintain a small cache so that repeated groups containing
+recursions are efficiently handled. */
+
+#define RSCAN_CACHE_SIZE 8
+
+if (errorcode == 0 && cb.had_recurse)
+  {
+  PCRE2_UCHAR *rcode;
+  PCRE2_SPTR rgroup;
+  unsigned int ccount = 0;
+  int start = RSCAN_CACHE_SIZE;
+  recurse_cache rc[RSCAN_CACHE_SIZE];
+
+  for (rcode = (PCRE2_UCHAR *)find_recurse(codestart, utf);
+       rcode != NULL;
+       rcode = (PCRE2_UCHAR *)find_recurse(rcode + 1 + LINK_SIZE, utf))
+    {
+    int p, groupnumber;
+
+    groupnumber = (int)GET(rcode, 1);
+    if (groupnumber == 0) rgroup = codestart; else
+      {
+      PCRE2_SPTR search_from = codestart;
+      rgroup = NULL;
+      for (i = 0, p = start; i < ccount; i++, p = (p + 1) & 7)
+        {
+        if (groupnumber == rc[p].groupnumber)
+          {
+          rgroup = rc[p].group;
+          break;
+          }
+
+        /* Group n+1 must always start to the right of group n, so we can save
+        search time below when the new group number is greater than any of the
+        previously found groups. */
+
+        if (groupnumber > rc[p].groupnumber) search_from = rc[p].group;
+        }
+
+      if (rgroup == NULL)
+        {
+        rgroup = PRIV(find_bracket)(search_from, utf, groupnumber);
+        if (rgroup == NULL)
+          {
+          errorcode = ERR53;
+          break;
+          }
+        if (--start < 0) start = RSCAN_CACHE_SIZE - 1;
+        rc[start].groupnumber = groupnumber;
+        rc[start].group = rgroup;
+        if (ccount < RSCAN_CACHE_SIZE) ccount++;
+        }
+      }
+
+    PUT(rcode, 1, rgroup - codestart);
+    }
+  }
+
+/* In rare debugging situations we sometimes need to look at the compiled code
+at this stage. */
+
+#ifdef DEBUG_CALL_PRINTINT
+pcre2_printint(re, stderr, TRUE);
+fprintf(stderr, "Length=%lu Used=%lu\n", length, usedlength);
+#endif
+
+/* Unless disabled, check whether any single character iterators can be
+auto-possessified. The function overwrites the appropriate opcode values, so
+the type of the pointer must be cast. NOTE: the intermediate variable "temp" is
+used in this code because at least one compiler gives a warning about loss of
+"const" attribute if the cast (PCRE2_UCHAR *)codestart is used directly in the
+function call. */
+
+if (errorcode == 0 && (re->overall_options & PCRE2_NO_AUTO_POSSESS) == 0)
+  {
+  PCRE2_UCHAR *temp = (PCRE2_UCHAR *)codestart;
+  if (PRIV(auto_possessify)(temp, &cb) != 0) errorcode = ERR80;
+  }
+
+/* Failed to compile, or error while post-processing. */
+
+if (errorcode != 0) goto HAD_CB_ERROR;
+
+/* Successful compile. If the anchored option was not passed, set it if
+we can determine that the pattern is anchored by virtue of ^ characters or \A
+or anything else, such as starting with non-atomic .* when DOTALL is set and
+there are no occurrences of *PRUNE or *SKIP (though there is an option to
+disable this case). */
+
+if ((re->overall_options & PCRE2_ANCHORED) == 0 &&
+     is_anchored(codestart, 0, &cb, 0, FALSE))
+  re->overall_options |= PCRE2_ANCHORED;
+
+/* Set up the first code unit or startline flag, the required code unit, and
+then study the pattern. This code need not be obeyed if PCRE2_NO_START_OPTIMIZE
+is set, as the data it would create will not be used. Note that a first code
+unit (but not the startline flag) is useful for anchored patterns because it
+can still give a quick "no match" and also avoid searching for a last code
+unit. */
+
+if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
+  {
+  int minminlength = 0;  /* For minimal minlength from first/required CU */
+
+  /* If we do not have a first code unit, see if there is one that is asserted
+  (these are not saved during the compile because they can cause conflicts with
+  actual literals that follow). */
+
+  if (firstcuflags >= REQ_NONE)
+    firstcu = find_firstassertedcu(codestart, &firstcuflags, 0);
+
+  /* Save the data for a first code unit. The existence of one means the
+  minimum length must be at least 1. */
+
+  if (firstcuflags < REQ_NONE)
+    {
+    re->first_codeunit = firstcu;
+    re->flags |= PCRE2_FIRSTSET;
+    minminlength++;
+
+    /* Handle caseless first code units. */
+
+    if ((firstcuflags & REQ_CASELESS) != 0)
+      {
+      if (firstcu < 128 || (!utf && !ucp && firstcu < 255))
+        {
+        if (cb.fcc[firstcu] != firstcu) re->flags |= PCRE2_FIRSTCASELESS;
+        }
+
+      /* The first code unit is > 128 in UTF or UCP mode, or > 255 otherwise.
+      In 8-bit UTF mode, codepoints in the range 128-255 are introductory code
+      points and cannot have another case, but if UCP is set they may do. */
+
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      else if (ucp && !utf && UCD_OTHERCASE(firstcu) != firstcu)
+        re->flags |= PCRE2_FIRSTCASELESS;
+#else
+      else if ((utf || ucp) && firstcu <= MAX_UTF_CODE_POINT &&
+               UCD_OTHERCASE(firstcu) != firstcu)
+        re->flags |= PCRE2_FIRSTCASELESS;
+#endif
+#endif  /* SUPPORT_UNICODE */
+      }
+    }
+
+  /* When there is no first code unit, for non-anchored patterns, see if we can
+  set the PCRE2_STARTLINE flag. This is helpful for multiline matches when all
+  branches start with ^ and also when all branches start with non-atomic .* for
+  non-DOTALL matches when *PRUNE and SKIP are not present. (There is an option
+  that disables this case.) */
+
+  else if ((re->overall_options & PCRE2_ANCHORED) == 0 &&
+           is_startline(codestart, 0, &cb, 0, FALSE))
+    re->flags |= PCRE2_STARTLINE;
+
+  /* Handle the "required code unit", if one is set. In the UTF case we can
+  increment the minimum minimum length only if we are sure this really is a
+  different character and not a non-starting code unit of the first character,
+  because the minimum length count is in characters, not code units. */
+
+  if (reqcuflags < REQ_NONE)
+    {
+#if PCRE2_CODE_UNIT_WIDTH == 16
+    if ((re->overall_options & PCRE2_UTF) == 0 ||   /* Not UTF */
+        firstcuflags >= REQ_NONE ||                 /* First not set */
+        (firstcu & 0xf800) != 0xd800 ||             /* First not surrogate */
+        (reqcu & 0xfc00) != 0xdc00)                 /* Req not low surrogate */
+#elif PCRE2_CODE_UNIT_WIDTH == 8
+    if ((re->overall_options & PCRE2_UTF) == 0 ||   /* Not UTF */
+        firstcuflags >= REQ_NONE ||                 /* First not set */
+        (firstcu & 0x80) == 0 ||                    /* First is ASCII */
+        (reqcu & 0x80) == 0)                        /* Req is ASCII */
+#endif
+      {
+      minminlength++;
+      }
+
+    /* In the case of an anchored pattern, set up the value only if it follows
+    a variable length item in the pattern. */
+
+    if ((re->overall_options & PCRE2_ANCHORED) == 0 ||
+        (reqcuflags & REQ_VARY) != 0)
+      {
+      re->last_codeunit = reqcu;
+      re->flags |= PCRE2_LASTSET;
+
+      /* Handle caseless required code units as for first code units (above). */
+
+      if ((reqcuflags & REQ_CASELESS) != 0)
+        {
+        if (reqcu < 128 || (!utf && !ucp && reqcu < 255))
+          {
+          if (cb.fcc[reqcu] != reqcu) re->flags |= PCRE2_LASTCASELESS;
+          }
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      else if (ucp && !utf && UCD_OTHERCASE(reqcu) != reqcu)
+        re->flags |= PCRE2_LASTCASELESS;
+#else
+      else if ((utf || ucp) && reqcu <= MAX_UTF_CODE_POINT &&
+               UCD_OTHERCASE(reqcu) != reqcu)
+        re->flags |= PCRE2_LASTCASELESS;
+#endif
+#endif  /* SUPPORT_UNICODE */
+        }
+      }
+    }
+
+  /* Study the compiled pattern to set up information such as a bitmap of
+  starting code units and a minimum matching length. */
+
+  if (PRIV(study)(re) != 0)
+    {
+    errorcode = ERR31;
+    goto HAD_CB_ERROR;
+    }
+
+  /* If study() set a bitmap of starting code units, it implies a minimum
+  length of at least one. */
+
+  if ((re->flags & PCRE2_FIRSTMAPSET) != 0 && minminlength == 0)
+    minminlength = 1;
+
+  /* If the minimum length set (or not set) by study() is less than the minimum
+  implied by required code units, override it. */
+
+  if (re->minlength < minminlength) re->minlength = minminlength;
+  }   /* End of start-of-match optimizations. */
+
+/* Control ends up here in all cases. When running under valgrind, make a
+pattern's terminating zero defined again. If memory was obtained for the parsed
+version of the pattern, free it before returning. Also free the list of named
+groups if a larger one had to be obtained, and likewise the group information
+vector. */
+
+EXIT:
+#ifdef SUPPORT_VALGRIND
+if (zero_terminated) VALGRIND_MAKE_MEM_DEFINED(pattern + patlen, CU2BYTES(1));
+#endif
+if (cb.parsed_pattern != stack_parsed_pattern)
+  ccontext->memctl.free(cb.parsed_pattern, ccontext->memctl.memory_data);
+if (cb.named_group_list_size > NAMED_GROUP_LIST_SIZE)
+  ccontext->memctl.free((void *)cb.named_groups, ccontext->memctl.memory_data);
+if (cb.groupinfo != stack_groupinfo)
+  ccontext->memctl.free((void *)cb.groupinfo, ccontext->memctl.memory_data);
+return re;    /* Will be NULL after an error */
+
+/* Errors discovered in parse_regex() set the offset value in the compile
+block. Errors discovered before it is called must compute it from the ptr
+value. After parse_regex() is called, the offset in the compile block is set to
+the end of the pattern, but certain errors in compile_regex() may reset it if
+an offset is available in the parsed pattern. */
+
+HAD_CB_ERROR:
+ptr = pattern + cb.erroroffset;
+
+HAD_EARLY_ERROR:
+*erroroffset = ptr - pattern;
+
+HAD_ERROR:
+*errorptr = errorcode;
+pcre2_code_free(re);
+re = NULL;
+goto EXIT;
+}
+
+/* End of pcre2_compile.c */
diff --git a/Foundation/src/pcre2_config.c b/Foundation/src/pcre2_config.c
new file mode 100644
index 000000000..2bc39c613
--- /dev/null
+++ b/Foundation/src/pcre2_config.c
@@ -0,0 +1,250 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2020 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#include "pcre2_config.h"
+
+/* Save the configured link size, which is in bytes. In 16-bit and 32-bit modes
+its value gets changed by pcre2_intmodedep.h (included by pcre2_internal.h) to
+be in code units. */
+
+static int configured_link_size = LINK_SIZE;
+
+#include "pcre2_internal.h"
+
+/* These macros are the standard way of turning unquoted text into C strings.
+They allow macros like PCRE2_MAJOR to be defined without quotes, which is
+convenient for user programs that want to test their values. */
+
+#define STRING(a)  # a
+#define XSTRING(s) STRING(s)
+
+
+/*************************************************
+* Return info about what features are configured *
+*************************************************/
+
+/* If where is NULL, the length of memory required is returned.
+
+Arguments:
+  what             what information is required
+  where            where to put the information
+
+Returns:           0 if a numerical value is returned
+                   >= 0 if a string value
+                   PCRE2_ERROR_BADOPTION if "where" not recognized
+                     or JIT target requested when JIT not enabled
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_config(uint32_t what, void *where)
+{
+if (where == NULL)  /* Requests a length */
+  {
+  switch(what)
+    {
+    default:
+    return PCRE2_ERROR_BADOPTION;
+
+    case PCRE2_CONFIG_BSR:
+    case PCRE2_CONFIG_COMPILED_WIDTHS:
+    case PCRE2_CONFIG_DEPTHLIMIT:
+    case PCRE2_CONFIG_HEAPLIMIT:
+    case PCRE2_CONFIG_JIT:
+    case PCRE2_CONFIG_LINKSIZE:
+    case PCRE2_CONFIG_MATCHLIMIT:
+    case PCRE2_CONFIG_NEVER_BACKSLASH_C:
+    case PCRE2_CONFIG_NEWLINE:
+    case PCRE2_CONFIG_PARENSLIMIT:
+    case PCRE2_CONFIG_STACKRECURSE:    /* Obsolete */
+    case PCRE2_CONFIG_TABLES_LENGTH:
+    case PCRE2_CONFIG_UNICODE:
+    return sizeof(uint32_t);
+
+    /* These are handled below */
+
+    case PCRE2_CONFIG_JITTARGET:
+    case PCRE2_CONFIG_UNICODE_VERSION:
+    case PCRE2_CONFIG_VERSION:
+    break;
+    }
+  }
+
+switch (what)
+  {
+  default:
+  return PCRE2_ERROR_BADOPTION;
+
+  case PCRE2_CONFIG_BSR:
+#ifdef BSR_ANYCRLF
+  *((uint32_t *)where) = PCRE2_BSR_ANYCRLF;
+#else
+  *((uint32_t *)where) = PCRE2_BSR_UNICODE;
+#endif
+  break;
+
+  case PCRE2_CONFIG_COMPILED_WIDTHS:
+  *((uint32_t *)where) = 0
+#ifdef SUPPORT_PCRE2_8
+  + 1
+#endif
+#ifdef SUPPORT_PCRE2_16
+  + 2
+#endif
+#ifdef SUPPORT_PCRE2_32
+  + 4
+#endif
+  ;
+  break;
+
+  case PCRE2_CONFIG_DEPTHLIMIT:
+  *((uint32_t *)where) = MATCH_LIMIT_DEPTH;
+  break;
+
+  case PCRE2_CONFIG_HEAPLIMIT:
+  *((uint32_t *)where) = HEAP_LIMIT;
+  break;
+
+  case PCRE2_CONFIG_JIT:
+#ifdef SUPPORT_JIT
+  *((uint32_t *)where) = 1;
+#else
+  *((uint32_t *)where) = 0;
+#endif
+  break;
+
+  case PCRE2_CONFIG_JITTARGET:
+#ifdef SUPPORT_JIT
+    {
+    const char *v = PRIV(jit_get_target)();
+    return (int)(1 + ((where == NULL)?
+      strlen(v) : PRIV(strcpy_c8)((PCRE2_UCHAR *)where, v)));
+    }
+#else
+  return PCRE2_ERROR_BADOPTION;
+#endif
+
+  case PCRE2_CONFIG_LINKSIZE:
+  *((uint32_t *)where) = (uint32_t)configured_link_size;
+  break;
+
+  case PCRE2_CONFIG_MATCHLIMIT:
+  *((uint32_t *)where) = MATCH_LIMIT;
+  break;
+
+  case PCRE2_CONFIG_NEWLINE:
+  *((uint32_t *)where) = NEWLINE_DEFAULT;
+  break;
+
+  case PCRE2_CONFIG_NEVER_BACKSLASH_C:
+#ifdef NEVER_BACKSLASH_C
+  *((uint32_t *)where) = 1;
+#else
+  *((uint32_t *)where) = 0;
+#endif
+  break;
+
+  case PCRE2_CONFIG_PARENSLIMIT:
+  *((uint32_t *)where) = PARENS_NEST_LIMIT;
+  break;
+
+  /* This is now obsolete. The stack is no longer used via recursion for
+  handling backtracking in pcre2_match(). */
+
+  case PCRE2_CONFIG_STACKRECURSE:
+  *((uint32_t *)where) = 0;
+  break;
+
+  case PCRE2_CONFIG_TABLES_LENGTH:
+  *((uint32_t *)where) = TABLES_LENGTH;
+  break;
+
+  case PCRE2_CONFIG_UNICODE_VERSION:
+    {
+#if defined SUPPORT_UNICODE
+    const char *v = PRIV(unicode_version);
+#else
+    const char *v = "Unicode not supported";
+#endif
+    return (int)(1 + ((where == NULL)?
+      strlen(v) : PRIV(strcpy_c8)((PCRE2_UCHAR *)where, v)));
+   }
+  break;
+
+  case PCRE2_CONFIG_UNICODE:
+#if defined SUPPORT_UNICODE
+  *((uint32_t *)where) = 1;
+#else
+  *((uint32_t *)where) = 0;
+#endif
+  break;
+
+  /* The hackery in setting "v" below is to cope with the case when
+  PCRE2_PRERELEASE is set to an empty string (which it is for real releases).
+  If the second alternative is used in this case, it does not leave a space
+  before the date. On the other hand, if all four macros are put into a single
+  XSTRING when PCRE2_PRERELEASE is not empty, an unwanted space is inserted.
+  There are problems using an "obvious" approach like this:
+
+     XSTRING(PCRE2_MAJOR) "." XSTRING(PCRE_MINOR)
+     XSTRING(PCRE2_PRERELEASE) " " XSTRING(PCRE_DATE)
+
+  because, when PCRE2_PRERELEASE is empty, this leads to an attempted expansion
+  of STRING(). The C standard states: "If (before argument substitution) any
+  argument consists of no preprocessing tokens, the behavior is undefined." It
+  turns out the gcc treats this case as a single empty string - which is what
+  we really want - but Visual C grumbles about the lack of an argument for the
+  macro. Unfortunately, both are within their rights. As there seems to be no
+  way to test for a macro's value being empty at compile time, we have to
+  resort to a runtime test. */
+
+  case PCRE2_CONFIG_VERSION:
+    {
+    const char *v = (XSTRING(Z PCRE2_PRERELEASE)[1] == 0)?
+      XSTRING(PCRE2_MAJOR.PCRE2_MINOR PCRE2_DATE) :
+      XSTRING(PCRE2_MAJOR.PCRE2_MINOR) XSTRING(PCRE2_PRERELEASE PCRE2_DATE);
+    return (int)(1 + ((where == NULL)?
+      strlen(v) : PRIV(strcpy_c8)((PCRE2_UCHAR *)where, v)));
+    }
+  }
+
+return 0;
+}
+
+/* End of pcre2_config.c */
diff --git a/Foundation/src/pcre2_config.h b/Foundation/src/pcre2_config.h
new file mode 100644
index 000000000..3087804b3
--- /dev/null
+++ b/Foundation/src/pcre2_config.h
@@ -0,0 +1,458 @@
+/* src/config.h.  Generated from config.h.in by configure.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* PCRE2 is written in Standard C, but there are a few non-standard things it
+can cope with, allowing it to run on SunOS4 and other "close to standard"
+systems.
+
+In environments that support the GNU autotools, config.h.in is converted into
+config.h by the "configure" script. In environments that use CMake,
+config-cmake.in is converted into config.h. If you are going to build PCRE2 "by
+hand" without using "configure" or CMake, you should copy the distributed
+config.h.generic to config.h, and edit the macro definitions to be the way you
+need them. You must then add -DHAVE_CONFIG_H to all of your compile commands,
+so that config.h is included at the start of every source.
+
+Alternatively, you can avoid editing by using -D on the compiler command line
+to set the macro values. In this case, you do not have to set -DHAVE_CONFIG_H,
+but if you do, default values will be taken from config.h for non-boolean
+macros that are not defined on the command line.
+
+Boolean macros such as HAVE_STDLIB_H and SUPPORT_PCRE2_8 should either be
+defined (conventionally to 1) for TRUE, and not defined at all for FALSE. All
+such macros are listed as a commented #undef in config.h.generic. Macros such
+as MATCH_LIMIT, whose actual value is relevant, have defaults defined, but are
+surrounded by #ifndef/#endif lines so that the value can be overridden by -D.
+
+PCRE2 uses memmove() if HAVE_MEMMOVE is defined; otherwise it uses bcopy() if
+HAVE_BCOPY is defined. If your system has neither bcopy() nor memmove(), make
+sure both macros are undefined; an emulation function will then be used. */
+
+#define PCRE2_CODE_UNIT_WIDTH 8
+
+/* By default, the \R escape sequence matches any Unicode line ending
+   character or sequence of characters. If BSR_ANYCRLF is defined (to any
+   value), this is changed so that backslash-R matches only CR, LF, or CRLF.
+   The build-time default can be overridden by the user of PCRE2 at runtime.
+   */
+/* #undef BSR_ANYCRLF */
+
+/* Define to any value to disable the use of the z and t modifiers in
+   formatting settings such as %zu or %td (this is rarely needed). */
+/* #undef DISABLE_PERCENT_ZT */
+
+/* If you are compiling for a system that uses EBCDIC instead of ASCII
+   character codes, define this macro to any value. When EBCDIC is set, PCRE2
+   assumes that all input strings are in EBCDIC. If you do not define this
+   macro, PCRE2 will assume input strings are ASCII or UTF-8/16/32 Unicode. It
+   is not possible to build a version of PCRE2 that supports both EBCDIC and
+   UTF-8/16/32. */
+/* #undef EBCDIC */
+
+/* In an EBCDIC environment, define this macro to any value to arrange for the
+   NL character to be 0x25 instead of the default 0x15. NL plays the role that
+   LF does in an ASCII/Unicode environment. */
+/* #undef EBCDIC_NL25 */
+
+/* Define this if your compiler supports __attribute__((uninitialized)) */
+/* #undef HAVE_ATTRIBUTE_UNINITIALIZED */
+
+/* Define to 1 if you have the `bcopy' function. */
+/* #undef HAVE_BCOPY */
+
+/* Define to 1 if you have the <bzlib.h> header file. */
+/* #undef HAVE_BZLIB_H */
+
+/* Define to 1 if you have the <dirent.h> header file. */
+/* #undef HAVE_DIRENT_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define to 1 if you have the <editline/readline.h> header file. */
+/* #undef HAVE_EDITLINE_READLINE_H */
+
+/* Define to 1 if you have the <edit/readline/readline.h> header file. */
+/* #undef HAVE_EDIT_READLINE_READLINE_H */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define to 1 if you have the <limits.h> header file. */
+/* #undef HAVE_LIMITS_H */
+
+/* Define to 1 if you have the `memfd_create' function. */
+/* #undef HAVE_MEMFD_CREATE */
+
+/* Define to 1 if you have the `memmove' function. */
+/* #undef HAVE_MEMMOVE */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <minix/config.h> header file. */
+/* #undef HAVE_MINIX_CONFIG_H */
+
+/* Define to 1 if you have the `mkostemp' function. */
+/* #undef HAVE_MKOSTEMP */
+
+/* Define if you have POSIX threads libraries and header files. */
+/* #undef HAVE_PTHREAD */
+
+/* Have PTHREAD_PRIO_INHERIT. */
+/* #undef HAVE_PTHREAD_PRIO_INHERIT */
+
+/* Define to 1 if you have the <readline.h> header file. */
+/* #undef HAVE_READLINE_H */
+
+/* Define to 1 if you have the <readline/history.h> header file. */
+/* #undef HAVE_READLINE_HISTORY_H */
+
+/* Define to 1 if you have the <readline/readline.h> header file. */
+/* #undef HAVE_READLINE_READLINE_H */
+
+/* Define to 1 if you have the `realpath' function. */
+/* #undef HAVE_REALPATH */
+
+/* Define to 1 if you have the `secure_getenv' function. */
+/* #undef HAVE_SECURE_GETENV */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define to 1 if you have the <stdio.h> header file. */
+/* #undef HAVE_STDIO_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+/* #undef HAVE_STDLIB_H */
+
+/* Define to 1 if you have the `strerror' function. */
+/* #undef HAVE_STRERROR */
+
+/* Define to 1 if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
+
+/* Define to 1 if you have the <string.h> header file. */
+/* #undef HAVE_STRING_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+/* #undef HAVE_SYS_STAT_H */
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+/* #undef HAVE_SYS_TYPES_H */
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+/* #undef HAVE_SYS_WAIT_H */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #undef HAVE_UNISTD_H */
+
+/* Define to 1 if the compiler supports simple visibility declarations. */
+/* #undef HAVE_VISIBILITY */
+
+/* Define to 1 if you have the <wchar.h> header file. */
+/* #undef HAVE_WCHAR_H */
+
+/* Define to 1 if you have the <windows.h> header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* Define to 1 if you have the <zlib.h> header file. */
+/* #undef HAVE_ZLIB_H */
+
+/* This limits the amount of memory that may be used while matching a pattern.
+   It applies to both pcre2_match() and pcre2_dfa_match(). It does not apply
+   to JIT matching. The value is in kibibytes (units of 1024 bytes). */
+#ifndef HEAP_LIMIT
+#define HEAP_LIMIT 20000000
+#endif
+
+/* The value of LINK_SIZE determines the number of bytes used to store links
+   as offsets within the compiled regex. The default is 2, which allows for
+   compiled patterns up to 65535 code units long. This covers the vast
+   majority of cases. However, PCRE2 can also be compiled to use 3 or 4 bytes
+   instead. This allows for longer patterns in extreme cases. */
+#ifndef LINK_SIZE
+#define LINK_SIZE 2
+#endif
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+/* This is ignored unless you are using libtool. */
+#ifndef LT_OBJDIR
+#define LT_OBJDIR ".libs/"
+#endif
+
+/* The value of MATCH_LIMIT determines the default number of times the
+   pcre2_match() function can record a backtrack position during a single
+   matching attempt. The value is also used to limit a loop counter in
+   pcre2_dfa_match(). There is a runtime interface for setting a different
+   limit. The limit exists in order to catch runaway regular expressions that
+   take for ever to determine that they do not match. The default is set very
+   large so that it does not accidentally catch legitimate cases. */
+#ifndef MATCH_LIMIT
+#define MATCH_LIMIT 10000000
+#endif
+
+/* The above limit applies to all backtracks, whether or not they are nested.
+   In some environments it is desirable to limit the nesting of backtracking
+   (that is, the depth of tree that is searched) more strictly, in order to
+   restrict the maximum amount of heap memory that is used. The value of
+   MATCH_LIMIT_DEPTH provides this facility. To have any useful effect, it
+   must be less than the value of MATCH_LIMIT. The default is to use the same
+   value as MATCH_LIMIT. There is a runtime method for setting a different
+   limit. In the case of pcre2_dfa_match(), this limit controls the depth of
+   the internal nested function calls that are used for pattern recursions,
+   lookarounds, and atomic groups. */
+#ifndef MATCH_LIMIT_DEPTH
+#define MATCH_LIMIT_DEPTH MATCH_LIMIT
+#endif
+
+/* This limit is parameterized just in case anybody ever wants to change it.
+   Care must be taken if it is increased, because it guards against integer
+   overflow caused by enormously large patterns. */
+#ifndef MAX_NAME_COUNT
+#define MAX_NAME_COUNT 10000
+#endif
+
+/* This limit is parameterized just in case anybody ever wants to change it.
+   Care must be taken if it is increased, because it guards against integer
+   overflow caused by enormously large patterns. */
+#ifndef MAX_NAME_SIZE
+#define MAX_NAME_SIZE 32
+#endif
+
+/* Defining NEVER_BACKSLASH_C locks out the use of \C in all patterns. */
+/* #undef NEVER_BACKSLASH_C */
+
+/* The value of NEWLINE_DEFAULT determines the default newline character
+   sequence. PCRE2 client programs can override this by selecting other values
+   at run time. The valid values are 1 (CR), 2 (LF), 3 (CRLF), 4 (ANY), 5
+   (ANYCRLF), and 6 (NUL). */
+#ifndef NEWLINE_DEFAULT
+#define NEWLINE_DEFAULT 2
+#endif
+
+/* Name of package */
+#define PACKAGE "pcre2"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "PCRE2"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "PCRE2 10.40"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "pcre2"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "10.40"
+
+/* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
+   parentheses (of any kind) in a pattern. This limits the amount of system
+   stack that is used while compiling a pattern. */
+#ifndef PARENS_NEST_LIMIT
+#define PARENS_NEST_LIMIT 250
+#endif
+
+/* The value of PCRE2GREP_BUFSIZE is the starting size of the buffer used by
+   pcre2grep to hold parts of the file it is searching. The buffer will be
+   expanded up to PCRE2GREP_MAX_BUFSIZE if necessary, for files containing
+   very long lines. The actual amount of memory used by pcre2grep is three
+   times this number, because it allows for the buffering of "before" and
+   "after" lines. */
+#ifndef PCRE2GREP_BUFSIZE
+#define PCRE2GREP_BUFSIZE 20480
+#endif
+
+/* The value of PCRE2GREP_MAX_BUFSIZE specifies the maximum size of the buffer
+   used by pcre2grep to hold parts of the file it is searching. The actual
+   amount of memory used by pcre2grep is three times this number, because it
+   allows for the buffering of "before" and "after" lines. */
+#ifndef PCRE2GREP_MAX_BUFSIZE
+#define PCRE2GREP_MAX_BUFSIZE 1048576
+#endif
+
+/* Define to any value to include debugging code. */
+/* #undef PCRE2_DEBUG */
+
+/* If you are compiling for a system other than a Unix-like system or
+   Win32, and it needs some magic to be inserted before the definition
+   of a function that is exported by the library, define this macro to
+   contain the relevant magic. If you do not define this macro, a suitable
+    __declspec value is used for Windows systems; in other environments
+   "extern" is used for a C compiler and "extern C" for a C++ compiler.
+   This macro apears at the start of every exported function that is part
+   of the external API. It does not appear on functions that are "external"
+   in the C sense, but which are internal to the library. */
+/* #undef PCRE2_EXP_DEFN */
+
+/* Define to any value if linking statically (TODO: make nice with Libtool) */
+/* #undef PCRE2_STATIC */
+#ifndef PCRE2_STATIC
+#define PCRE2_STATIC 1
+#endif
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+/* #undef PTHREAD_CREATE_JOINABLE */
+
+/* Define to any non-zero number to enable support for SELinux compatible
+   executable memory allocator in JIT. Note that this will have no effect
+   unless SUPPORT_JIT is also defined. */
+/* #undef SLJIT_PROT_EXECUTABLE_ALLOCATOR */
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+/* #undef STDC_HEADERS */
+
+/* Define to any value to enable support for Just-In-Time compiling. */
+/* #undef SUPPORT_JIT */
+
+/* Define to any value to allow pcre2grep to be linked with libbz2, so that it
+   is able to handle .bz2 files. */
+/* #undef SUPPORT_LIBBZ2 */
+
+/* Define to any value to allow pcre2test to be linked with libedit. */
+/* #undef SUPPORT_LIBEDIT */
+
+/* Define to any value to allow pcre2test to be linked with libreadline. */
+/* #undef SUPPORT_LIBREADLINE */
+
+/* Define to any value to allow pcre2grep to be linked with libz, so that it
+   is able to handle .gz files. */
+/* #undef SUPPORT_LIBZ */
+
+/* Define to any value to enable callout script support in pcre2grep. */
+/* #undef SUPPORT_PCRE2GREP_CALLOUT */
+
+/* Define to any value to enable fork support in pcre2grep callout scripts.
+   This will have no effect unless SUPPORT_PCRE2GREP_CALLOUT is also defined.
+   */
+/* #undef SUPPORT_PCRE2GREP_CALLOUT_FORK */
+
+/* Define to any value to enable JIT support in pcre2grep. Note that this will
+   have no effect unless SUPPORT_JIT is also defined. */
+/* #undef SUPPORT_PCRE2GREP_JIT */
+
+/* Define to any value to enable the 16 bit PCRE2 library. */
+/* #undef SUPPORT_PCRE2_16 */
+
+/* Define to any value to enable the 32 bit PCRE2 library. */
+/* #undef SUPPORT_PCRE2_32 */
+
+/* Define to any value to enable the 8 bit PCRE2 library. */
+/* #undef SUPPORT_PCRE2_8 */
+
+/* Define to any value to enable support for Unicode and UTF encoding. This
+   will work even in an EBCDIC environment, but it is incompatible with the
+   EBCDIC macro. That is, PCRE2 can support *either* EBCDIC code *or*
+   ASCII/Unicode, but not both at once. */
+/* #undef SUPPORT_UNICODE */
+#define SUPPORT_UNICODE 1
+
+/* Define to any value for valgrind support to find invalid memory reads. */
+/* #undef SUPPORT_VALGRIND */
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# define _DARWIN_C_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# define _HPUX_ALT_XOPEN_SOCKET_API 1
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+/* # undef _MINIX */
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef _NETBSD_SOURCE
+# define _NETBSD_SOURCE 1
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+   Oddly enough, this does nothing on OpenBSD.  */
+#ifndef _OPENBSD_SOURCE
+# define _OPENBSD_SOURCE 1
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_SOURCE
+/* # undef _POSIX_SOURCE */
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_1_SOURCE
+/* # undef _POSIX_1_SOURCE */
+#endif
+/* Enable POSIX-compatible threading on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# define __STDC_WANT_IEC_60559_DFP_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# define __STDC_WANT_LIB_EXT2__ 1
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# define __STDC_WANT_MATH_SPEC_FUNCS__ 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable X/Open extensions.  Define to 500 only if necessary
+   to make mbstate_t available.  */
+#ifndef _XOPEN_SOURCE
+/* # undef _XOPEN_SOURCE */
+#endif
+
+/* Version number of package */
+#define VERSION "10.40"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to the type of a signed integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int64_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
diff --git a/Foundation/src/pcre2_context.c b/Foundation/src/pcre2_context.c
new file mode 100644
index 000000000..9a83ec31c
--- /dev/null
+++ b/Foundation/src/pcre2_context.c
@@ -0,0 +1,485 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2018 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+
+/*************************************************
+*          Default malloc/free functions         *
+*************************************************/
+
+/* Ignore the "user data" argument in each case. */
+
+static void *default_malloc(size_t size, void *data)
+{
+(void)data;
+return malloc(size);
+}
+
+
+static void default_free(void *block, void *data)
+{
+(void)data;
+free(block);
+}
+
+
+
+/*************************************************
+*        Get a block and save memory control     *
+*************************************************/
+
+/* This internal function is called to get a block of memory in which the
+memory control data is to be stored at the start for future use.
+
+Arguments:
+  size        amount of memory required
+  memctl      pointer to a memctl block or NULL
+
+Returns:      pointer to memory or NULL on failure
+*/
+
+extern void *
+PRIV(memctl_malloc)(size_t size, pcre2_memctl *memctl)
+{
+pcre2_memctl *newmemctl;
+void *yield = (memctl == NULL)? malloc(size) :
+  memctl->malloc(size, memctl->memory_data);
+if (yield == NULL) return NULL;
+newmemctl = (pcre2_memctl *)yield;
+if (memctl == NULL)
+  {
+  newmemctl->malloc = default_malloc;
+  newmemctl->free = default_free;
+  newmemctl->memory_data = NULL;
+  }
+else *newmemctl = *memctl;
+return yield;
+}
+
+
+
+/*************************************************
+*          Create and initialize contexts        *
+*************************************************/
+
+/* Initializing for compile and match contexts is done in separate, private
+functions so that these can be called from functions such as pcre2_compile()
+when an external context is not supplied. The initializing functions have an
+option to set up default memory management. */
+
+PCRE2_EXP_DEFN pcre2_general_context * PCRE2_CALL_CONVENTION
+pcre2_general_context_create(void *(*private_malloc)(size_t, void *),
+  void (*private_free)(void *, void *), void *memory_data)
+{
+pcre2_general_context *gcontext;
+if (private_malloc == NULL) private_malloc = default_malloc;
+if (private_free == NULL) private_free = default_free;
+gcontext = private_malloc(sizeof(pcre2_real_general_context), memory_data);
+if (gcontext == NULL) return NULL;
+gcontext->memctl.malloc = private_malloc;
+gcontext->memctl.free = private_free;
+gcontext->memctl.memory_data = memory_data;
+return gcontext;
+}
+
+
+/* A default compile context is set up to save having to initialize at run time
+when no context is supplied to the compile function. */
+
+const pcre2_compile_context PRIV(default_compile_context) = {
+  { default_malloc, default_free, NULL },    /* Default memory handling */
+  NULL,                                      /* Stack guard */
+  NULL,                                      /* Stack guard data */
+  PRIV(default_tables),                      /* Character tables */
+  PCRE2_UNSET,                               /* Max pattern length */
+  BSR_DEFAULT,                               /* Backslash R default */
+  NEWLINE_DEFAULT,                           /* Newline convention */
+  PARENS_NEST_LIMIT,                         /* As it says */
+  0 };                                       /* Extra options */
+
+/* The create function copies the default into the new memory, but must
+override the default memory handling functions if a gcontext was provided. */
+
+PCRE2_EXP_DEFN pcre2_compile_context * PCRE2_CALL_CONVENTION
+pcre2_compile_context_create(pcre2_general_context *gcontext)
+{
+pcre2_compile_context *ccontext = PRIV(memctl_malloc)(
+  sizeof(pcre2_real_compile_context), (pcre2_memctl *)gcontext);
+if (ccontext == NULL) return NULL;
+*ccontext = PRIV(default_compile_context);
+if (gcontext != NULL)
+  *((pcre2_memctl *)ccontext) = *((pcre2_memctl *)gcontext);
+return ccontext;
+}
+
+
+/* A default match context is set up to save having to initialize at run time
+when no context is supplied to a match function. */
+
+const pcre2_match_context PRIV(default_match_context) = {
+  { default_malloc, default_free, NULL },
+#ifdef SUPPORT_JIT
+  NULL,          /* JIT callback */
+  NULL,          /* JIT callback data */
+#endif
+  NULL,          /* Callout function */
+  NULL,          /* Callout data */
+  NULL,          /* Substitute callout function */
+  NULL,          /* Substitute callout data */
+  PCRE2_UNSET,   /* Offset limit */
+  HEAP_LIMIT,
+  MATCH_LIMIT,
+  MATCH_LIMIT_DEPTH };
+
+/* The create function copies the default into the new memory, but must
+override the default memory handling functions if a gcontext was provided. */
+
+PCRE2_EXP_DEFN pcre2_match_context * PCRE2_CALL_CONVENTION
+pcre2_match_context_create(pcre2_general_context *gcontext)
+{
+pcre2_match_context *mcontext = PRIV(memctl_malloc)(
+  sizeof(pcre2_real_match_context), (pcre2_memctl *)gcontext);
+if (mcontext == NULL) return NULL;
+*mcontext = PRIV(default_match_context);
+if (gcontext != NULL)
+  *((pcre2_memctl *)mcontext) = *((pcre2_memctl *)gcontext);
+return mcontext;
+}
+
+
+/* A default convert context is set up to save having to initialize at run time
+when no context is supplied to the convert function. */
+
+const pcre2_convert_context PRIV(default_convert_context) = {
+  { default_malloc, default_free, NULL },    /* Default memory handling */
+#ifdef _WIN32
+  CHAR_BACKSLASH,                            /* Default path separator */
+  CHAR_GRAVE_ACCENT                          /* Default escape character */
+#else  /* Not Windows */
+  CHAR_SLASH,                                /* Default path separator */
+  CHAR_BACKSLASH                             /* Default escape character */
+#endif
+  };
+
+/* The create function copies the default into the new memory, but must
+override the default memory handling functions if a gcontext was provided. */
+
+PCRE2_EXP_DEFN pcre2_convert_context * PCRE2_CALL_CONVENTION
+pcre2_convert_context_create(pcre2_general_context *gcontext)
+{
+pcre2_convert_context *ccontext = PRIV(memctl_malloc)(
+  sizeof(pcre2_real_convert_context), (pcre2_memctl *)gcontext);
+if (ccontext == NULL) return NULL;
+*ccontext = PRIV(default_convert_context);
+if (gcontext != NULL)
+  *((pcre2_memctl *)ccontext) = *((pcre2_memctl *)gcontext);
+return ccontext;
+}
+
+
+/*************************************************
+*              Context copy functions            *
+*************************************************/
+
+PCRE2_EXP_DEFN pcre2_general_context * PCRE2_CALL_CONVENTION
+pcre2_general_context_copy(pcre2_general_context *gcontext)
+{
+pcre2_general_context *new =
+  gcontext->memctl.malloc(sizeof(pcre2_real_general_context),
+  gcontext->memctl.memory_data);
+if (new == NULL) return NULL;
+memcpy(new, gcontext, sizeof(pcre2_real_general_context));
+return new;
+}
+
+
+PCRE2_EXP_DEFN pcre2_compile_context * PCRE2_CALL_CONVENTION
+pcre2_compile_context_copy(pcre2_compile_context *ccontext)
+{
+pcre2_compile_context *new =
+  ccontext->memctl.malloc(sizeof(pcre2_real_compile_context),
+  ccontext->memctl.memory_data);
+if (new == NULL) return NULL;
+memcpy(new, ccontext, sizeof(pcre2_real_compile_context));
+return new;
+}
+
+
+PCRE2_EXP_DEFN pcre2_match_context * PCRE2_CALL_CONVENTION
+pcre2_match_context_copy(pcre2_match_context *mcontext)
+{
+pcre2_match_context *new =
+  mcontext->memctl.malloc(sizeof(pcre2_real_match_context),
+  mcontext->memctl.memory_data);
+if (new == NULL) return NULL;
+memcpy(new, mcontext, sizeof(pcre2_real_match_context));
+return new;
+}
+
+
+
+PCRE2_EXP_DEFN pcre2_convert_context * PCRE2_CALL_CONVENTION
+pcre2_convert_context_copy(pcre2_convert_context *ccontext)
+{
+pcre2_convert_context *new =
+  ccontext->memctl.malloc(sizeof(pcre2_real_convert_context),
+  ccontext->memctl.memory_data);
+if (new == NULL) return NULL;
+memcpy(new, ccontext, sizeof(pcre2_real_convert_context));
+return new;
+}
+
+
+/*************************************************
+*              Context free functions            *
+*************************************************/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_general_context_free(pcre2_general_context *gcontext)
+{
+if (gcontext != NULL)
+  gcontext->memctl.free(gcontext, gcontext->memctl.memory_data);
+}
+
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_compile_context_free(pcre2_compile_context *ccontext)
+{
+if (ccontext != NULL)
+  ccontext->memctl.free(ccontext, ccontext->memctl.memory_data);
+}
+
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_match_context_free(pcre2_match_context *mcontext)
+{
+if (mcontext != NULL)
+  mcontext->memctl.free(mcontext, mcontext->memctl.memory_data);
+}
+
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_convert_context_free(pcre2_convert_context *ccontext)
+{
+if (ccontext != NULL)
+  ccontext->memctl.free(ccontext, ccontext->memctl.memory_data);
+}
+
+
+/*************************************************
+*             Set values in contexts             *
+*************************************************/
+
+/* All these functions return 0 for success or PCRE2_ERROR_BADDATA if invalid
+data is given. Only some of the functions are able to test the validity of the
+data. */
+
+
+/* ------------ Compile context ------------ */
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_character_tables(pcre2_compile_context *ccontext,
+  const uint8_t *tables)
+{
+ccontext->tables = tables;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_bsr(pcre2_compile_context *ccontext, uint32_t value)
+{
+switch(value)
+  {
+  case PCRE2_BSR_ANYCRLF:
+  case PCRE2_BSR_UNICODE:
+  ccontext->bsr_convention = value;
+  return 0;
+
+  default:
+  return PCRE2_ERROR_BADDATA;
+  }
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_max_pattern_length(pcre2_compile_context *ccontext, PCRE2_SIZE length)
+{
+ccontext->max_pattern_length = length;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_newline(pcre2_compile_context *ccontext, uint32_t newline)
+{
+switch(newline)
+  {
+  case PCRE2_NEWLINE_CR:
+  case PCRE2_NEWLINE_LF:
+  case PCRE2_NEWLINE_CRLF:
+  case PCRE2_NEWLINE_ANY:
+  case PCRE2_NEWLINE_ANYCRLF:
+  case PCRE2_NEWLINE_NUL:
+  ccontext->newline_convention = newline;
+  return 0;
+
+  default:
+  return PCRE2_ERROR_BADDATA;
+  }
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_parens_nest_limit(pcre2_compile_context *ccontext, uint32_t limit)
+{
+ccontext->parens_nest_limit = limit;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_compile_extra_options(pcre2_compile_context *ccontext, uint32_t options)
+{
+ccontext->extra_options = options;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_compile_recursion_guard(pcre2_compile_context *ccontext,
+  int (*guard)(uint32_t, void *), void *user_data)
+{
+ccontext->stack_guard = guard;
+ccontext->stack_guard_data = user_data;
+return 0;
+}
+
+
+/* ------------ Match context ------------ */
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_callout(pcre2_match_context *mcontext,
+  int (*callout)(pcre2_callout_block *, void *), void *callout_data)
+{
+mcontext->callout = callout;
+mcontext->callout_data = callout_data;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_substitute_callout(pcre2_match_context *mcontext,
+  int (*substitute_callout)(pcre2_substitute_callout_block *, void *),
+    void *substitute_callout_data)
+{
+mcontext->substitute_callout = substitute_callout;
+mcontext->substitute_callout_data = substitute_callout_data;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_heap_limit(pcre2_match_context *mcontext, uint32_t limit)
+{
+mcontext->heap_limit = limit;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_match_limit(pcre2_match_context *mcontext, uint32_t limit)
+{
+mcontext->match_limit = limit;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_depth_limit(pcre2_match_context *mcontext, uint32_t limit)
+{
+mcontext->depth_limit = limit;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_offset_limit(pcre2_match_context *mcontext, PCRE2_SIZE limit)
+{
+mcontext->offset_limit = limit;
+return 0;
+}
+
+/* This function became obsolete at release 10.30. It is kept as a synonym for
+backwards compatibility. */
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_recursion_limit(pcre2_match_context *mcontext, uint32_t limit)
+{
+return pcre2_set_depth_limit(mcontext, limit);
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_recursion_memory_management(pcre2_match_context *mcontext,
+  void *(*mymalloc)(size_t, void *), void (*myfree)(void *, void *),
+  void *mydata)
+{
+(void)mcontext;
+(void)mymalloc;
+(void)myfree;
+(void)mydata;
+return 0;
+}
+
+/* ------------ Convert context ------------ */
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_glob_separator(pcre2_convert_context *ccontext, uint32_t separator)
+{
+if (separator != CHAR_SLASH && separator != CHAR_BACKSLASH &&
+    separator != CHAR_DOT) return PCRE2_ERROR_BADDATA;
+ccontext->glob_separator = separator;
+return 0;
+}
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_glob_escape(pcre2_convert_context *ccontext, uint32_t escape)
+{
+if (escape > 255 || (escape != 0 && !ispunct(escape)))
+  return PCRE2_ERROR_BADDATA;
+ccontext->glob_escape = escape;
+return 0;
+}
+
+/* End of pcre2_context.c */
+
diff --git a/Foundation/src/pcre2_convert.c b/Foundation/src/pcre2_convert.c
new file mode 100644
index 000000000..81d6968d7
--- /dev/null
+++ b/Foundation/src/pcre2_convert.c
@@ -0,0 +1,1179 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2018 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+#define TYPE_OPTIONS (PCRE2_CONVERT_GLOB| \
+  PCRE2_CONVERT_POSIX_BASIC|PCRE2_CONVERT_POSIX_EXTENDED)
+
+#define ALL_OPTIONS (PCRE2_CONVERT_UTF|PCRE2_CONVERT_NO_UTF_CHECK| \
+  PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR| \
+  PCRE2_CONVERT_GLOB_NO_STARSTAR| \
+  TYPE_OPTIONS)
+
+#define DUMMY_BUFFER_SIZE 100
+
+/* Generated pattern fragments */
+
+#define STR_BACKSLASH_A STR_BACKSLASH STR_A
+#define STR_BACKSLASH_z STR_BACKSLASH STR_z
+#define STR_COLON_RIGHT_SQUARE_BRACKET STR_COLON STR_RIGHT_SQUARE_BRACKET
+#define STR_DOT_STAR_LOOKBEHIND STR_DOT STR_ASTERISK STR_LEFT_PARENTHESIS STR_QUESTION_MARK STR_LESS_THAN_SIGN STR_EQUALS_SIGN
+#define STR_LOOKAHEAD_NOT_DOT STR_LEFT_PARENTHESIS STR_QUESTION_MARK STR_EXCLAMATION_MARK STR_BACKSLASH STR_DOT STR_RIGHT_PARENTHESIS
+#define STR_QUERY_s STR_LEFT_PARENTHESIS STR_QUESTION_MARK STR_s STR_RIGHT_PARENTHESIS
+#define STR_STAR_NUL STR_LEFT_PARENTHESIS STR_ASTERISK STR_N STR_U STR_L STR_RIGHT_PARENTHESIS
+
+/* States for range and POSIX processing */
+
+enum { RANGE_NOT_STARTED, RANGE_STARTING, RANGE_STARTED };
+enum { POSIX_START_REGEX, POSIX_ANCHORED, POSIX_NOT_BRACKET,
+       POSIX_CLASS_NOT_STARTED, POSIX_CLASS_STARTING, POSIX_CLASS_STARTED };
+
+/* Macro to add a character string to the output buffer, checking for overflow. */
+
+#define PUTCHARS(string) \
+  { \
+  for (s = (char *)(string); *s != 0; s++) \
+    { \
+    if (p >= endp) return PCRE2_ERROR_NOMEMORY; \
+    *p++ = *s; \
+    } \
+  }
+
+/* Literals that must be escaped: \ ? * + | . ^ $ { } [ ] ( ) */
+
+static const char *pcre2_escaped_literals =
+  STR_BACKSLASH STR_QUESTION_MARK STR_ASTERISK STR_PLUS
+  STR_VERTICAL_LINE STR_DOT STR_CIRCUMFLEX_ACCENT STR_DOLLAR_SIGN
+  STR_LEFT_CURLY_BRACKET STR_RIGHT_CURLY_BRACKET
+  STR_LEFT_SQUARE_BRACKET STR_RIGHT_SQUARE_BRACKET
+  STR_LEFT_PARENTHESIS STR_RIGHT_PARENTHESIS;
+
+/* Recognized escaped metacharacters in POSIX basic patterns. */
+
+static const char *posix_meta_escapes =
+  STR_LEFT_PARENTHESIS STR_RIGHT_PARENTHESIS
+  STR_LEFT_CURLY_BRACKET STR_RIGHT_CURLY_BRACKET
+  STR_1 STR_2 STR_3 STR_4 STR_5 STR_6 STR_7 STR_8 STR_9;
+
+
+
+/*************************************************
+*           Convert a POSIX pattern              *
+*************************************************/
+
+/* This function handles both basic and extended POSIX patterns.
+
+Arguments:
+  pattype        the pattern type
+  pattern        the pattern
+  plength        length in code units
+  utf            TRUE if UTF
+  use_buffer     where to put the output
+  use_length     length of use_buffer
+  bufflenptr     where to put the used length
+  dummyrun       TRUE if a dummy run
+  ccontext       the convert context
+
+Returns:         0 => success
+                !0 => error code
+*/
+
+static int
+convert_posix(uint32_t pattype, PCRE2_SPTR pattern, PCRE2_SIZE plength,
+  BOOL utf, PCRE2_UCHAR *use_buffer, PCRE2_SIZE use_length,
+  PCRE2_SIZE *bufflenptr, BOOL dummyrun, pcre2_convert_context *ccontext)
+{
+char *s;
+PCRE2_SPTR posix = pattern;
+PCRE2_UCHAR *p = use_buffer;
+PCRE2_UCHAR *pp = p;
+PCRE2_UCHAR *endp = p + use_length - 1;  /* Allow for trailing zero */
+PCRE2_SIZE convlength = 0;
+
+uint32_t bracount = 0;
+uint32_t posix_state = POSIX_START_REGEX;
+uint32_t lastspecial = 0;
+BOOL extended = (pattype & PCRE2_CONVERT_POSIX_EXTENDED) != 0;
+BOOL nextisliteral = FALSE;
+
+(void)utf;       /* Not used when Unicode not supported */
+(void)ccontext;  /* Not currently used */
+
+/* Initialize default for error offset as end of input. */
+
+*bufflenptr = plength;
+PUTCHARS(STR_STAR_NUL);
+
+/* Now scan the input. */
+
+while (plength > 0)
+  {
+  uint32_t c, sc;
+  int clength = 1;
+
+  /* Add in the length of the last item, then, if in the dummy run, pull the
+  pointer back to the start of the (temporary) buffer and then remember the
+  start of the next item. */
+
+  convlength += p - pp;
+  if (dummyrun) p = use_buffer;
+  pp = p;
+
+  /* Pick up the next character */
+
+#ifndef SUPPORT_UNICODE
+  c = *posix;
+#else
+  GETCHARLENTEST(c, posix, clength);
+#endif
+  posix += clength;
+  plength -= clength;
+
+  sc = nextisliteral? 0 : c;
+  nextisliteral = FALSE;
+
+  /* Handle a character within a class. */
+
+  if (posix_state >= POSIX_CLASS_NOT_STARTED)
+    {
+    if (c == CHAR_RIGHT_SQUARE_BRACKET)
+      {
+      PUTCHARS(STR_RIGHT_SQUARE_BRACKET);
+      posix_state = POSIX_NOT_BRACKET;
+      }
+
+    /* Not the end of the class */
+
+    else
+      {
+      switch (posix_state)
+        {
+        case POSIX_CLASS_STARTED:
+        if (c <= 127 && islower(c)) break;  /* Remain in started state */
+        posix_state = POSIX_CLASS_NOT_STARTED;
+        if (c == CHAR_COLON  && plength > 0 &&
+            *posix == CHAR_RIGHT_SQUARE_BRACKET)
+          {
+          PUTCHARS(STR_COLON_RIGHT_SQUARE_BRACKET);
+          plength--;
+          posix++;
+          continue;    /* With next character after :] */
+          }
+        /* Fall through */
+
+        case POSIX_CLASS_NOT_STARTED:
+        if (c == CHAR_LEFT_SQUARE_BRACKET)
+          posix_state = POSIX_CLASS_STARTING;
+        break;
+
+        case POSIX_CLASS_STARTING:
+        if (c == CHAR_COLON) posix_state = POSIX_CLASS_STARTED;
+        break;
+        }
+
+      if (c == CHAR_BACKSLASH) PUTCHARS(STR_BACKSLASH);
+      if (p + clength > endp) return PCRE2_ERROR_NOMEMORY;
+      memcpy(p, posix - clength, CU2BYTES(clength));
+      p += clength;
+      }
+    }
+
+  /* Handle a character not within a class. */
+
+  else switch(sc)
+    {
+    case CHAR_LEFT_SQUARE_BRACKET:
+    PUTCHARS(STR_LEFT_SQUARE_BRACKET);
+
+#ifdef NEVER
+    /* We could handle special cases [[:<:]] and [[:>:]] (which PCRE does
+    support) but they are not part of POSIX 1003.1. */
+
+    if (plength >= 6)
+      {
+      if (posix[0] == CHAR_LEFT_SQUARE_BRACKET &&
+          posix[1] == CHAR_COLON &&
+          (posix[2] == CHAR_LESS_THAN_SIGN ||
+           posix[2] == CHAR_GREATER_THAN_SIGN) &&
+          posix[3] == CHAR_COLON &&
+          posix[4] == CHAR_RIGHT_SQUARE_BRACKET &&
+          posix[5] == CHAR_RIGHT_SQUARE_BRACKET)
+        {
+        if (p + 6 > endp) return PCRE2_ERROR_NOMEMORY;
+        memcpy(p, posix, CU2BYTES(6));
+        p += 6;
+        posix += 6;
+        plength -= 6;
+        continue;  /* With next character */
+        }
+      }
+#endif
+
+    /* Handle start of "normal" character classes */
+
+    posix_state = POSIX_CLASS_NOT_STARTED;
+
+    /* Handle ^ and ] as first characters */
+
+    if (plength > 0)
+      {
+      if (*posix == CHAR_CIRCUMFLEX_ACCENT)
+        {
+        posix++;
+        plength--;
+        PUTCHARS(STR_CIRCUMFLEX_ACCENT);
+        }
+      if (plength > 0 && *posix == CHAR_RIGHT_SQUARE_BRACKET)
+        {
+        posix++;
+        plength--;
+        PUTCHARS(STR_RIGHT_SQUARE_BRACKET);
+        }
+      }
+    break;
+
+    case CHAR_BACKSLASH:
+    if (plength == 0) return PCRE2_ERROR_END_BACKSLASH;
+    if (extended) nextisliteral = TRUE; else
+      {
+      if (*posix < 127 && strchr(posix_meta_escapes, *posix) != NULL)
+        {
+        if (isdigit(*posix)) PUTCHARS(STR_BACKSLASH);
+        if (p + 1 > endp) return PCRE2_ERROR_NOMEMORY;
+        lastspecial = *p++ = *posix++;
+        plength--;
+        }
+      else nextisliteral = TRUE;
+      }
+    break;
+
+    case CHAR_RIGHT_PARENTHESIS:
+    if (!extended || bracount == 0) goto ESCAPE_LITERAL;
+    bracount--;
+    goto COPY_SPECIAL;
+
+    case CHAR_LEFT_PARENTHESIS:
+    bracount++;
+    /* Fall through */
+
+    case CHAR_QUESTION_MARK:
+    case CHAR_PLUS:
+    case CHAR_LEFT_CURLY_BRACKET:
+    case CHAR_RIGHT_CURLY_BRACKET:
+    case CHAR_VERTICAL_LINE:
+    if (!extended) goto ESCAPE_LITERAL;
+    /* Fall through */
+
+    case CHAR_DOT:
+    case CHAR_DOLLAR_SIGN:
+    posix_state = POSIX_NOT_BRACKET;
+    COPY_SPECIAL:
+    lastspecial = c;
+    if (p + 1 > endp) return PCRE2_ERROR_NOMEMORY;
+    *p++ = c;
+    break;
+
+    case CHAR_ASTERISK:
+    if (lastspecial != CHAR_ASTERISK)
+      {
+      if (!extended && (posix_state < POSIX_NOT_BRACKET ||
+          lastspecial == CHAR_LEFT_PARENTHESIS))
+        goto ESCAPE_LITERAL;
+      goto COPY_SPECIAL;
+      }
+    break;   /* Ignore second and subsequent asterisks */
+
+    case CHAR_CIRCUMFLEX_ACCENT:
+    if (extended) goto COPY_SPECIAL;
+    if (posix_state == POSIX_START_REGEX ||
+        lastspecial == CHAR_LEFT_PARENTHESIS)
+      {
+      posix_state = POSIX_ANCHORED;
+      goto COPY_SPECIAL;
+      }
+    /* Fall through */
+
+    default:
+    if (c < 128 && strchr(pcre2_escaped_literals, c) != NULL)
+      {
+      ESCAPE_LITERAL:
+      PUTCHARS(STR_BACKSLASH);
+      }
+    lastspecial = 0xff;  /* Indicates nothing special */
+    if (p + clength > endp) return PCRE2_ERROR_NOMEMORY;
+    memcpy(p, posix - clength, CU2BYTES(clength));
+    p += clength;
+    posix_state = POSIX_NOT_BRACKET;
+    break;
+    }
+  }
+
+if (posix_state >= POSIX_CLASS_NOT_STARTED)
+  return PCRE2_ERROR_MISSING_SQUARE_BRACKET;
+convlength += p - pp;        /* Final segment */
+*bufflenptr = convlength;
+*p++ = 0;
+return 0;
+}
+
+
+/*************************************************
+*           Convert a glob pattern               *
+*************************************************/
+
+/* Context for writing the output into a buffer. */
+
+typedef struct pcre2_output_context {
+  PCRE2_UCHAR *output;                  /* current output position */
+  PCRE2_SPTR output_end;                /* output end */
+  PCRE2_SIZE output_size;               /* size of the output */
+  uint8_t out_str[8];                   /* string copied to the output */
+} pcre2_output_context;
+
+
+/* Write a character into the output.
+
+Arguments:
+  out            output context
+  chr            the next character
+*/
+
+static void
+convert_glob_write(pcre2_output_context *out, PCRE2_UCHAR chr)
+{
+out->output_size++;
+
+if (out->output < out->output_end)
+  *out->output++ = chr;
+}
+
+
+/* Write a string into the output.
+
+Arguments:
+  out            output context
+  length         length of out->out_str
+*/
+
+static void
+convert_glob_write_str(pcre2_output_context *out, PCRE2_SIZE length)
+{
+uint8_t *out_str = out->out_str;
+PCRE2_UCHAR *output = out->output;
+PCRE2_SPTR output_end = out->output_end;
+PCRE2_SIZE output_size = out->output_size;
+
+do
+  {
+  output_size++;
+
+  if (output < output_end)
+    *output++ = *out_str++;
+  }
+while (--length != 0);
+
+out->output = output;
+out->output_size = output_size;
+}
+
+
+/* Prints the separator into the output.
+
+Arguments:
+  out            output context
+  separator      glob separator
+  with_escape    backslash is needed before separator
+*/
+
+static void
+convert_glob_print_separator(pcre2_output_context *out,
+  PCRE2_UCHAR separator, BOOL with_escape)
+{
+if (with_escape)
+  convert_glob_write(out, CHAR_BACKSLASH);
+
+convert_glob_write(out, separator);
+}
+
+
+/* Prints a wildcard into the output.
+
+Arguments:
+  out            output context
+  separator      glob separator
+  with_escape    backslash is needed before separator
+*/
+
+static void
+convert_glob_print_wildcard(pcre2_output_context *out,
+  PCRE2_UCHAR separator, BOOL with_escape)
+{
+out->out_str[0] = CHAR_LEFT_SQUARE_BRACKET;
+out->out_str[1] = CHAR_CIRCUMFLEX_ACCENT;
+convert_glob_write_str(out, 2);
+
+convert_glob_print_separator(out, separator, with_escape);
+
+convert_glob_write(out, CHAR_RIGHT_SQUARE_BRACKET);
+}
+
+
+/* Parse a posix class.
+
+Arguments:
+  from           starting point of scanning the range
+  pattern_end    end of pattern
+  out            output context
+
+Returns:  >0 => class index
+          0  => malformed class
+*/
+
+static int
+convert_glob_parse_class(PCRE2_SPTR *from, PCRE2_SPTR pattern_end,
+  pcre2_output_context *out)
+{
+static const char *posix_classes = "alnum:alpha:ascii:blank:cntrl:digit:"
+  "graph:lower:print:punct:space:upper:word:xdigit:";
+PCRE2_SPTR start = *from + 1;
+PCRE2_SPTR pattern = start;
+const char *class_ptr;
+PCRE2_UCHAR c;
+int class_index;
+
+while (TRUE)
+  {
+  if (pattern >= pattern_end) return 0;
+
+  c = *pattern++;
+
+  if (c < CHAR_a || c > CHAR_z) break;
+  }
+
+if (c != CHAR_COLON || pattern >= pattern_end ||
+    *pattern != CHAR_RIGHT_SQUARE_BRACKET)
+  return 0;
+
+class_ptr = posix_classes;
+class_index = 1;
+
+while (TRUE)
+  {
+  if (*class_ptr == CHAR_NUL) return 0;
+
+  pattern = start;
+
+  while (*pattern == (PCRE2_UCHAR) *class_ptr)
+    {
+    if (*pattern == CHAR_COLON)
+      {
+      pattern += 2;
+      start -= 2;
+
+      do convert_glob_write(out, *start++); while (start < pattern);
+
+      *from = pattern;
+      return class_index;
+      }
+    pattern++;
+    class_ptr++;
+    }
+
+  while (*class_ptr != CHAR_COLON) class_ptr++;
+  class_ptr++;
+  class_index++;
+  }
+}
+
+/* Checks whether the character is in the class.
+
+Arguments:
+  class_index    class index
+  c              character
+
+Returns:   !0 => character is found in the class
+            0 => otherwise
+*/
+
+static BOOL
+convert_glob_char_in_class(int class_index, PCRE2_UCHAR c)
+{
+switch (class_index)
+  {
+  case 1: return isalnum(c);
+  case 2: return isalpha(c);
+  case 3: return 1;
+  case 4: return c == CHAR_HT || c == CHAR_SPACE;
+  case 5: return iscntrl(c);
+  case 6: return isdigit(c);
+  case 7: return isgraph(c);
+  case 8: return islower(c);
+  case 9: return isprint(c);
+  case 10: return ispunct(c);
+  case 11: return isspace(c);
+  case 12: return isupper(c);
+  case 13: return isalnum(c) || c == CHAR_UNDERSCORE;
+  default: return isxdigit(c);
+  }
+}
+
+/* Parse a range of characters.
+
+Arguments:
+  from           starting point of scanning the range
+  pattern_end    end of pattern
+  out            output context
+  separator      glob separator
+  with_escape    backslash is needed before separator
+
+Returns:         0 => success
+                !0 => error code
+*/
+
+static int
+convert_glob_parse_range(PCRE2_SPTR *from, PCRE2_SPTR pattern_end,
+  pcre2_output_context *out, BOOL utf, PCRE2_UCHAR separator,
+  BOOL with_escape, PCRE2_UCHAR escape, BOOL no_wildsep)
+{
+BOOL is_negative = FALSE;
+BOOL separator_seen = FALSE;
+BOOL has_prev_c;
+PCRE2_SPTR pattern = *from;
+PCRE2_SPTR char_start = NULL;
+uint32_t c, prev_c;
+int len, class_index;
+
+(void)utf; /* Avoid compiler warning. */
+
+if (pattern >= pattern_end)
+  {
+  *from = pattern;
+  return PCRE2_ERROR_MISSING_SQUARE_BRACKET;
+  }
+
+if (*pattern == CHAR_EXCLAMATION_MARK
+    || *pattern == CHAR_CIRCUMFLEX_ACCENT)
+  {
+  pattern++;
+
+  if (pattern >= pattern_end)
+    {
+    *from = pattern;
+    return PCRE2_ERROR_MISSING_SQUARE_BRACKET;
+    }
+
+  is_negative = TRUE;
+
+  out->out_str[0] = CHAR_LEFT_SQUARE_BRACKET;
+  out->out_str[1] = CHAR_CIRCUMFLEX_ACCENT;
+  len = 2;
+
+  if (!no_wildsep)
+    {
+    if (with_escape)
+      {
+      out->out_str[len] = CHAR_BACKSLASH;
+      len++;
+      }
+    out->out_str[len] = (uint8_t) separator;
+    }
+
+  convert_glob_write_str(out, len + 1);
+  }
+else
+  convert_glob_write(out, CHAR_LEFT_SQUARE_BRACKET);
+
+has_prev_c = FALSE;
+prev_c = 0;
+
+if (*pattern == CHAR_RIGHT_SQUARE_BRACKET)
+  {
+  out->out_str[0] = CHAR_BACKSLASH;
+  out->out_str[1] = CHAR_RIGHT_SQUARE_BRACKET;
+  convert_glob_write_str(out, 2);
+  has_prev_c = TRUE;
+  prev_c = CHAR_RIGHT_SQUARE_BRACKET;
+  pattern++;
+  }
+
+while (pattern < pattern_end)
+  {
+  char_start = pattern;
+  GETCHARINCTEST(c, pattern);
+
+  if (c == CHAR_RIGHT_SQUARE_BRACKET)
+    {
+    convert_glob_write(out, c);
+
+    if (!is_negative && !no_wildsep && separator_seen)
+      {
+      out->out_str[0] = CHAR_LEFT_PARENTHESIS;
+      out->out_str[1] = CHAR_QUESTION_MARK;
+      out->out_str[2] = CHAR_LESS_THAN_SIGN;
+      out->out_str[3] = CHAR_EXCLAMATION_MARK;
+      convert_glob_write_str(out, 4);
+
+      convert_glob_print_separator(out, separator, with_escape);
+      convert_glob_write(out, CHAR_RIGHT_PARENTHESIS);
+      }
+
+    *from = pattern;
+    return 0;
+    }
+
+  if (pattern >= pattern_end) break;
+
+  if (c == CHAR_LEFT_SQUARE_BRACKET && *pattern == CHAR_COLON)
+    {
+    *from = pattern;
+    class_index = convert_glob_parse_class(from, pattern_end, out);
+
+    if (class_index != 0)
+      {
+      pattern = *from;
+
+      has_prev_c = FALSE;
+      prev_c = 0;
+
+      if (!is_negative &&
+          convert_glob_char_in_class (class_index, separator))
+        separator_seen = TRUE;
+      continue;
+      }
+    }
+  else if (c == CHAR_MINUS && has_prev_c &&
+           *pattern != CHAR_RIGHT_SQUARE_BRACKET)
+    {
+    convert_glob_write(out, CHAR_MINUS);
+
+    char_start = pattern;
+    GETCHARINCTEST(c, pattern);
+
+    if (pattern >= pattern_end) break;
+
+    if (escape != 0 && c == escape)
+      {
+      char_start = pattern;
+      GETCHARINCTEST(c, pattern);
+      }
+    else if (c == CHAR_LEFT_SQUARE_BRACKET && *pattern == CHAR_COLON)
+      {
+      *from = pattern;
+      return PCRE2_ERROR_CONVERT_SYNTAX;
+      }
+
+    if (prev_c > c)
+      {
+      *from = pattern;
+      return PCRE2_ERROR_CONVERT_SYNTAX;
+      }
+
+    if (prev_c < separator && separator < c) separator_seen = TRUE;
+
+    has_prev_c = FALSE;
+    prev_c = 0;
+    }
+  else
+    {
+    if (escape != 0 && c == escape)
+      {
+      char_start = pattern;
+      GETCHARINCTEST(c, pattern);
+
+      if (pattern >= pattern_end) break;
+      }
+
+    has_prev_c = TRUE;
+    prev_c = c;
+    }
+
+  if (c == CHAR_LEFT_SQUARE_BRACKET || c == CHAR_RIGHT_SQUARE_BRACKET ||
+      c == CHAR_BACKSLASH || c == CHAR_MINUS)
+    convert_glob_write(out, CHAR_BACKSLASH);
+
+  if (c == separator) separator_seen = TRUE;
+
+  do convert_glob_write(out, *char_start++); while (char_start < pattern);
+  }
+
+*from = pattern;
+return PCRE2_ERROR_MISSING_SQUARE_BRACKET;
+}
+
+
+/* Prints a (*COMMIT) into the output.
+
+Arguments:
+  out            output context
+*/
+
+static void
+convert_glob_print_commit(pcre2_output_context *out)
+{
+out->out_str[0] = CHAR_LEFT_PARENTHESIS;
+out->out_str[1] = CHAR_ASTERISK;
+out->out_str[2] = CHAR_C;
+out->out_str[3] = CHAR_O;
+out->out_str[4] = CHAR_M;
+out->out_str[5] = CHAR_M;
+out->out_str[6] = CHAR_I;
+out->out_str[7] = CHAR_T;
+convert_glob_write_str(out, 8);
+convert_glob_write(out, CHAR_RIGHT_PARENTHESIS);
+}
+
+
+/* Bash glob converter.
+
+Arguments:
+  pattype        the pattern type
+  pattern        the pattern
+  plength        length in code units
+  utf            TRUE if UTF
+  use_buffer     where to put the output
+  use_length     length of use_buffer
+  bufflenptr     where to put the used length
+  dummyrun       TRUE if a dummy run
+  ccontext       the convert context
+
+Returns:         0 => success
+                !0 => error code
+*/
+
+static int
+convert_glob(uint32_t options, PCRE2_SPTR pattern, PCRE2_SIZE plength,
+  BOOL utf, PCRE2_UCHAR *use_buffer, PCRE2_SIZE use_length,
+  PCRE2_SIZE *bufflenptr, BOOL dummyrun, pcre2_convert_context *ccontext)
+{
+pcre2_output_context out;
+PCRE2_SPTR pattern_start = pattern;
+PCRE2_SPTR pattern_end = pattern + plength;
+PCRE2_UCHAR separator = ccontext->glob_separator;
+PCRE2_UCHAR escape = ccontext->glob_escape;
+PCRE2_UCHAR c;
+BOOL no_wildsep = (options & PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR) != 0;
+BOOL no_starstar = (options & PCRE2_CONVERT_GLOB_NO_STARSTAR) != 0;
+BOOL in_atomic = FALSE;
+BOOL after_starstar = FALSE;
+BOOL no_slash_z = FALSE;
+BOOL with_escape, is_start, after_separator;
+int result = 0;
+
+(void)utf; /* Avoid compiler warning. */
+
+#ifdef SUPPORT_UNICODE
+if (utf && (separator >= 128 || escape >= 128))
+  {
+  /* Currently only ASCII characters are supported. */
+  *bufflenptr = 0;
+  return PCRE2_ERROR_CONVERT_SYNTAX;
+  }
+#endif
+
+with_escape = strchr(pcre2_escaped_literals, separator) != NULL;
+
+/* Initialize default for error offset as end of input. */
+out.output = use_buffer;
+out.output_end = use_buffer + use_length;
+out.output_size = 0;
+
+out.out_str[0] = CHAR_LEFT_PARENTHESIS;
+out.out_str[1] = CHAR_QUESTION_MARK;
+out.out_str[2] = CHAR_s;
+out.out_str[3] = CHAR_RIGHT_PARENTHESIS;
+convert_glob_write_str(&out, 4);
+
+is_start = TRUE;
+
+if (pattern < pattern_end && pattern[0] == CHAR_ASTERISK)
+  {
+  if (no_wildsep)
+    is_start = FALSE;
+  else if (!no_starstar && pattern + 1 < pattern_end &&
+           pattern[1] == CHAR_ASTERISK)
+    is_start = FALSE;
+  }
+
+if (is_start)
+  {
+  out.out_str[0] = CHAR_BACKSLASH;
+  out.out_str[1] = CHAR_A;
+  convert_glob_write_str(&out, 2);
+  }
+
+while (pattern < pattern_end)
+  {
+  c = *pattern++;
+
+  if (c == CHAR_ASTERISK)
+    {
+    is_start = pattern == pattern_start + 1;
+
+    if (in_atomic)
+      {
+      convert_glob_write(&out, CHAR_RIGHT_PARENTHESIS);
+      in_atomic = FALSE;
+      }
+
+    if (!no_starstar && pattern < pattern_end && *pattern == CHAR_ASTERISK)
+      {
+      after_separator = is_start || (pattern[-2] == separator);
+
+      do pattern++; while (pattern < pattern_end &&
+                           *pattern == CHAR_ASTERISK);
+
+      if (pattern >= pattern_end)
+        {
+        no_slash_z = TRUE;
+        break;
+        }
+
+      after_starstar = TRUE;
+
+      if (after_separator && escape != 0 && *pattern == escape &&
+          pattern + 1 < pattern_end && pattern[1] == separator)
+        pattern++;
+
+      if (is_start)
+        {
+        if (*pattern != separator) continue;
+
+        out.out_str[0] = CHAR_LEFT_PARENTHESIS;
+        out.out_str[1] = CHAR_QUESTION_MARK;
+        out.out_str[2] = CHAR_COLON;
+        out.out_str[3] = CHAR_BACKSLASH;
+        out.out_str[4] = CHAR_A;
+        out.out_str[5] = CHAR_VERTICAL_LINE;
+        convert_glob_write_str(&out, 6);
+
+        convert_glob_print_separator(&out, separator, with_escape);
+        convert_glob_write(&out, CHAR_RIGHT_PARENTHESIS);
+
+        pattern++;
+        continue;
+        }
+
+      convert_glob_print_commit(&out);
+
+      if (!after_separator || *pattern != separator)
+        {
+        out.out_str[0] = CHAR_DOT;
+        out.out_str[1] = CHAR_ASTERISK;
+        out.out_str[2] = CHAR_QUESTION_MARK;
+        convert_glob_write_str(&out, 3);
+        continue;
+        }
+
+      out.out_str[0] = CHAR_LEFT_PARENTHESIS;
+      out.out_str[1] = CHAR_QUESTION_MARK;
+      out.out_str[2] = CHAR_COLON;
+      out.out_str[3] = CHAR_DOT;
+      out.out_str[4] = CHAR_ASTERISK;
+      out.out_str[5] = CHAR_QUESTION_MARK;
+
+      convert_glob_write_str(&out, 6);
+
+      convert_glob_print_separator(&out, separator, with_escape);
+
+      out.out_str[0] = CHAR_RIGHT_PARENTHESIS;
+      out.out_str[1] = CHAR_QUESTION_MARK;
+      out.out_str[2] = CHAR_QUESTION_MARK;
+      convert_glob_write_str(&out, 3);
+
+      pattern++;
+      continue;
+      }
+
+    if (pattern < pattern_end && *pattern == CHAR_ASTERISK)
+      {
+      do pattern++; while (pattern < pattern_end &&
+                           *pattern == CHAR_ASTERISK);
+      }
+
+    if (no_wildsep)
+      {
+      if (pattern >= pattern_end)
+        {
+        no_slash_z = TRUE;
+        break;
+        }
+
+      /* Start check must be after the end check. */
+      if (is_start) continue;
+      }
+
+    if (!is_start)
+      {
+      if (after_starstar)
+        {
+        out.out_str[0] = CHAR_LEFT_PARENTHESIS;
+        out.out_str[1] = CHAR_QUESTION_MARK;
+        out.out_str[2] = CHAR_GREATER_THAN_SIGN;
+        convert_glob_write_str(&out, 3);
+        in_atomic = TRUE;
+        }
+      else
+        convert_glob_print_commit(&out);
+      }
+
+    if (no_wildsep)
+      convert_glob_write(&out, CHAR_DOT);
+    else
+      convert_glob_print_wildcard(&out, separator, with_escape);
+
+    out.out_str[0] = CHAR_ASTERISK;
+    out.out_str[1] = CHAR_QUESTION_MARK;
+    if (pattern >= pattern_end)
+      out.out_str[1] = CHAR_PLUS;
+    convert_glob_write_str(&out, 2);
+    continue;
+    }
+
+  if (c == CHAR_QUESTION_MARK)
+    {
+    if (no_wildsep)
+      convert_glob_write(&out, CHAR_DOT);
+    else
+      convert_glob_print_wildcard(&out, separator, with_escape);
+    continue;
+    }
+
+  if (c == CHAR_LEFT_SQUARE_BRACKET)
+    {
+    result = convert_glob_parse_range(&pattern, pattern_end,
+      &out, utf, separator, with_escape, escape, no_wildsep);
+    if (result != 0) break;
+    continue;
+    }
+
+  if (escape != 0 && c == escape)
+    {
+    if (pattern >= pattern_end)
+      {
+      result = PCRE2_ERROR_CONVERT_SYNTAX;
+      break;
+      }
+    c = *pattern++;
+    }
+
+  if (c < 128 && strchr(pcre2_escaped_literals, c) != NULL)
+    convert_glob_write(&out, CHAR_BACKSLASH);
+
+  convert_glob_write(&out, c);
+  }
+
+if (result == 0)
+  {
+  if (!no_slash_z)
+    {
+    out.out_str[0] = CHAR_BACKSLASH;
+    out.out_str[1] = CHAR_z;
+    convert_glob_write_str(&out, 2);
+    }
+
+  if (in_atomic)
+    convert_glob_write(&out, CHAR_RIGHT_PARENTHESIS);
+
+  convert_glob_write(&out, CHAR_NUL);
+
+  if (!dummyrun && out.output_size != (PCRE2_SIZE) (out.output - use_buffer))
+    result = PCRE2_ERROR_NOMEMORY;
+  }
+
+if (result != 0)
+  {
+  *bufflenptr = pattern - pattern_start;
+  return result;
+  }
+
+*bufflenptr = out.output_size - 1;
+return 0;
+}
+
+
+/*************************************************
+*                Convert pattern                 *
+*************************************************/
+
+/* This is the external-facing function for converting other forms of pattern
+into PCRE2 regular expression patterns. On error, the bufflenptr argument is
+used to return an offset in the original pattern.
+
+Arguments:
+  pattern     the input pattern
+  plength     length of input, or PCRE2_ZERO_TERMINATED
+  options     options bits
+  buffptr     pointer to pointer to output buffer
+  bufflenptr  pointer to length of output buffer
+  ccontext    convert context or NULL
+
+Returns:      0 for success, else an error code (+ve or -ve)
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_pattern_convert(PCRE2_SPTR pattern, PCRE2_SIZE plength, uint32_t options,
+  PCRE2_UCHAR **buffptr, PCRE2_SIZE *bufflenptr,
+  pcre2_convert_context *ccontext)
+{
+int i, rc;
+PCRE2_UCHAR dummy_buffer[DUMMY_BUFFER_SIZE];
+PCRE2_UCHAR *use_buffer = dummy_buffer;
+PCRE2_SIZE use_length = DUMMY_BUFFER_SIZE;
+BOOL utf = (options & PCRE2_CONVERT_UTF) != 0;
+uint32_t pattype = options & TYPE_OPTIONS;
+
+if (pattern == NULL || bufflenptr == NULL) return PCRE2_ERROR_NULL;
+
+if ((options & ~ALL_OPTIONS) != 0 ||        /* Undefined bit set */
+    (pattype & (~pattype+1)) != pattype ||  /* More than one type set */
+    pattype == 0)                           /* No type set */
+  {
+  *bufflenptr = 0;                          /* Error offset */
+  return PCRE2_ERROR_BADOPTION;
+  }
+
+if (plength == PCRE2_ZERO_TERMINATED) plength = PRIV(strlen)(pattern);
+if (ccontext == NULL) ccontext =
+  (pcre2_convert_context *)(&PRIV(default_convert_context));
+
+/* Check UTF if required. */
+
+#ifndef SUPPORT_UNICODE
+if (utf)
+  {
+  *bufflenptr = 0;  /* Error offset */
+  return PCRE2_ERROR_UNICODE_NOT_SUPPORTED;
+  }
+#else
+if (utf && (options & PCRE2_CONVERT_NO_UTF_CHECK) == 0)
+  {
+  PCRE2_SIZE erroroffset;
+  rc = PRIV(valid_utf)(pattern, plength, &erroroffset);
+  if (rc != 0)
+    {
+    *bufflenptr = erroroffset;
+    return rc;
+    }
+  }
+#endif
+
+/* If buffptr is not NULL, and what it points to is not NULL, we are being
+provided with a buffer and a length, so set them as the buffer to use. */
+
+if (buffptr != NULL && *buffptr != NULL)
+  {
+  use_buffer = *buffptr;
+  use_length = *bufflenptr;
+  }
+
+/* Call an individual converter, either just once (if a buffer was provided or
+just the length is needed), or twice (if a memory allocation is required). */
+
+for (i = 0; i < 2; i++)
+  {
+  PCRE2_UCHAR *allocated;
+  BOOL dummyrun = buffptr == NULL || *buffptr == NULL;
+
+  switch(pattype)
+    {
+    case PCRE2_CONVERT_GLOB:
+    rc = convert_glob(options & ~PCRE2_CONVERT_GLOB, pattern, plength, utf,
+      use_buffer, use_length, bufflenptr, dummyrun, ccontext);
+    break;
+
+    case PCRE2_CONVERT_POSIX_BASIC:
+    case PCRE2_CONVERT_POSIX_EXTENDED:
+    rc = convert_posix(pattype, pattern, plength, utf, use_buffer, use_length,
+      bufflenptr, dummyrun, ccontext);
+    break;
+
+    default:
+    *bufflenptr = 0;  /* Error offset */
+    return PCRE2_ERROR_INTERNAL;
+    }
+
+  if (rc != 0 ||           /* Error */
+      buffptr == NULL ||   /* Just the length is required */
+      *buffptr != NULL)    /* Buffer was provided or allocated */
+    return rc;
+
+  /* Allocate memory for the buffer, with hidden space for an allocator at
+  the start. The next time round the loop runs the conversion for real. */
+
+  allocated = PRIV(memctl_malloc)(sizeof(pcre2_memctl) +
+    (*bufflenptr + 1)*PCRE2_CODE_UNIT_WIDTH, (pcre2_memctl *)ccontext);
+  if (allocated == NULL) return PCRE2_ERROR_NOMEMORY;
+  *buffptr = (PCRE2_UCHAR *)(((char *)allocated) + sizeof(pcre2_memctl));
+
+  use_buffer = *buffptr;
+  use_length = *bufflenptr + 1;
+  }
+
+/* Control should never get here. */
+
+return PCRE2_ERROR_INTERNAL;
+}
+
+
+/*************************************************
+*            Free converted pattern              *
+*************************************************/
+
+/* This frees a converted pattern that was put in newly-allocated memory.
+
+Argument:   the converted pattern
+Returns:    nothing
+*/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_converted_pattern_free(PCRE2_UCHAR *converted)
+{
+if (converted != NULL)
+  {
+  pcre2_memctl *memctl =
+    (pcre2_memctl *)((char *)converted - sizeof(pcre2_memctl));
+  memctl->free(memctl, memctl->memory_data);
+  }
+}
+
+/* End of pcre2_convert.c */
diff --git a/Foundation/src/pcre_dfa_exec.c b/Foundation/src/pcre2_dfa_match.c
similarity index 64%
rename from Foundation/src/pcre_dfa_exec.c
rename to Foundation/src/pcre2_dfa_match.c
index ae7c46d75..3f5946552 100644
--- a/Foundation/src/pcre_dfa_exec.c
+++ b/Foundation/src/pcre2_dfa_match.c
@@ -3,11 +3,11 @@
 *************************************************/
 
 /* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language (but see
-below for why this module is different).
+and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2017 University of Cambridge
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2022 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,8 @@ POSSIBILITY OF SUCH DAMAGE.
 -----------------------------------------------------------------------------
 */
 
-/* This module contains the external function pcre_dfa_exec(), which is an
+
+/* This module contains the external function pcre2_dfa_match(), which is an
 alternative matching function that uses a sort of DFA algorithm (not a true
 FSM). This is NOT Perl-compatible, but it has advantages in certain
 applications. */
@@ -64,27 +65,26 @@ on the stack. It did give a 13% improvement with one specially constructed
 pattern for certain subject strings, but on other strings and on many of the
 simpler patterns in the test suite it did worse. The major problem, I think,
 was the extra time to initialize the index. This had to be done for each call
-of internal_dfa_exec(). (The supplied patch used a static vector, initialized
+of internal_dfa_match(). (The supplied patch used a static vector, initialized
 only once - I suspect this was the cause of the problems with the tests.)
 
 Overall, I concluded that the gains in some cases did not outweigh the losses
 in others, so I abandoned this code. */
 
-#pragma warning( disable : 4244)  // conversion from 'int' to 'unsigned short', possible loss of data
-#pragma warning( disable : 4146)  // unary minus operator applied to unsigned type, result still unsigned
 
-#include "pcre_config.h"
+#include "pcre2_config.h"
 
-#define NLBLOCK md             /* Block containing newline information */
+#define NLBLOCK mb             /* Block containing newline information */
 #define PSSTART start_subject  /* Field containing processed string start */
 #define PSEND   end_subject    /* Field containing processed string end */
 
-#include "pcre_internal.h"
+#include "pcre2_internal.h"
 
-
-/* For use to indent debugging output */
-
-#define SP "                   "
+#define PUBLIC_DFA_MATCH_OPTIONS \
+  (PCRE2_ANCHORED|PCRE2_ENDANCHORED|PCRE2_NOTBOL|PCRE2_NOTEOL|PCRE2_NOTEMPTY| \
+   PCRE2_NOTEMPTY_ATSTART|PCRE2_NO_UTF_CHECK|PCRE2_PARTIAL_HARD| \
+   PCRE2_PARTIAL_SOFT|PCRE2_DFA_SHORTEST|PCRE2_DFA_RESTART| \
+   PCRE2_COPY_MATCHED_SUBJECT)
 
 
 /*************************************************
@@ -111,7 +111,7 @@ small value. Non-zero values in the table are the offsets from the opcode where
 the character is to be found. ***NOTE*** If the start of this table is
 modified, the three tables that follow must also be modified. */
 
-static const pcre_uint8 coptable[] = {
+static const uint8_t coptable[] = {
   0,                             /* End                                    */
   0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */
   0, 0, 0, 0, 0, 0,              /* \D, \d, \S, \s, \W, \w                 */
@@ -160,6 +160,7 @@ static const pcre_uint8 coptable[] = {
   0,                             /* DNREFI                                 */
   0,                             /* RECURSE                                */
   0,                             /* CALLOUT                                */
+  0,                             /* CALLOUT_STR                            */
   0,                             /* Alt                                    */
   0,                             /* Ket                                    */
   0,                             /* KetRmax                                */
@@ -170,17 +171,21 @@ static const pcre_uint8 coptable[] = {
   0,                             /* Assert not                             */
   0,                             /* Assert behind                          */
   0,                             /* Assert behind not                      */
-  0, 0,                          /* ONCE, ONCE_NC                          */
+  0,                             /* NA assert                              */
+  0,                             /* NA assert behind                       */
+  0,                             /* ONCE                                   */
+  0,                             /* SCRIPT_RUN                             */
   0, 0, 0, 0, 0,                 /* BRA, BRAPOS, CBRA, CBRAPOS, COND       */
   0, 0, 0, 0, 0,                 /* SBRA, SBRAPOS, SCBRA, SCBRAPOS, SCOND  */
   0, 0,                          /* CREF, DNCREF                           */
   0, 0,                          /* RREF, DNRREF                           */
-  0,                             /* DEF                                    */
+  0, 0,                          /* FALSE, TRUE                            */
   0, 0, 0,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */
   0, 0, 0,                       /* MARK, PRUNE, PRUNE_ARG                 */
   0, 0, 0, 0,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG         */
-  0, 0, 0, 0,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */
-  0, 0                           /* CLOSE, SKIPZERO  */
+  0, 0,                          /* COMMIT, COMMIT_ARG                     */
+  0, 0, 0,                       /* FAIL, ACCEPT, ASSERT_ACCEPT            */
+  0, 0, 0                        /* CLOSE, SKIPZERO, DEFINE                */
 };
 
 /* This table identifies those opcodes that inspect a character. It is used to
@@ -188,7 +193,7 @@ remember the fact that a character could have been inspected when the end of
 the subject is reached. ***NOTE*** If the start of this table is modified, the
 two tables that follow must also be modified. */
 
-static const pcre_uint8 poptable[] = {
+static const uint8_t poptable[] = {
   0,                             /* End                                    */
   0, 0, 0, 1, 1,                 /* \A, \G, \K, \B, \b                     */
   1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */
@@ -232,6 +237,7 @@ static const pcre_uint8 poptable[] = {
   0,                             /* DNREFI                                 */
   0,                             /* RECURSE                                */
   0,                             /* CALLOUT                                */
+  0,                             /* CALLOUT_STR                            */
   0,                             /* Alt                                    */
   0,                             /* Ket                                    */
   0,                             /* KetRmax                                */
@@ -242,23 +248,27 @@ static const pcre_uint8 poptable[] = {
   0,                             /* Assert not                             */
   0,                             /* Assert behind                          */
   0,                             /* Assert behind not                      */
-  0, 0,                          /* ONCE, ONCE_NC                          */
+  0,                             /* NA assert                              */
+  0,                             /* NA assert behind                       */
+  0,                             /* ONCE                                   */
+  0,                             /* SCRIPT_RUN                             */
   0, 0, 0, 0, 0,                 /* BRA, BRAPOS, CBRA, CBRAPOS, COND       */
   0, 0, 0, 0, 0,                 /* SBRA, SBRAPOS, SCBRA, SCBRAPOS, SCOND  */
   0, 0,                          /* CREF, DNCREF                           */
   0, 0,                          /* RREF, DNRREF                           */
-  0,                             /* DEF                                    */
+  0, 0,                          /* FALSE, TRUE                            */
   0, 0, 0,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */
   0, 0, 0,                       /* MARK, PRUNE, PRUNE_ARG                 */
   0, 0, 0, 0,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG         */
-  0, 0, 0, 0,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */
-  0, 0                           /* CLOSE, SKIPZERO                        */
+  0, 0,                          /* COMMIT, COMMIT_ARG                     */
+  0, 0, 0,                       /* FAIL, ACCEPT, ASSERT_ACCEPT            */
+  0, 0, 0                        /* CLOSE, SKIPZERO, DEFINE                */
 };
 
 /* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,
 and \w */
 
-static const pcre_uint8 toptable1[] = {
+static const uint8_t toptable1[] = {
   0, 0, 0, 0, 0, 0,
   ctype_digit, ctype_digit,
   ctype_space, ctype_space,
@@ -266,7 +276,7 @@ static const pcre_uint8 toptable1[] = {
   0, 0                            /* OP_ANY, OP_ALLANY */
 };
 
-static const pcre_uint8 toptable2[] = {
+static const uint8_t toptable2[] = {
   0, 0, 0, 0, 0, 0,
   ctype_digit, 0,
   ctype_space, 0,
@@ -281,7 +291,7 @@ entirely of ints because the working vector we are passed, and which we put
 these structures in, is a vector of ints. */
 
 typedef struct stateblock {
-  int offset;                     /* Offset to opcode */
+  int offset;                     /* Offset to opcode (-ve has meaning) */
   int count;                      /* Count for repeats */
   int data;                       /* Some use extra data */
 } stateblock;
@@ -289,39 +299,157 @@ typedef struct stateblock {
 #define INTS_PER_STATEBLOCK  (int)(sizeof(stateblock)/sizeof(int))
 
 
-#ifdef PCRE_DEBUG
+/* Before version 10.32 the recursive calls of internal_dfa_match() were passed
+local working space and output vectors that were created on the stack. This has
+caused issues for some patterns, especially in small-stack environments such as
+Windows. A new scheme is now in use which sets up a vector on the stack, but if
+this is too small, heap memory is used, up to the heap_limit. The main
+parameters are all numbers of ints because the workspace is a vector of ints.
+
+The size of the starting stack vector, DFA_START_RWS_SIZE, is in bytes, and is
+defined in pcre2_internal.h so as to be available to pcre2test when it is
+finding the minimum heap requirement for a match. */
+
+#define OVEC_UNIT  (sizeof(PCRE2_SIZE)/sizeof(int))
+
+#define RWS_BASE_SIZE   (DFA_START_RWS_SIZE/sizeof(int))  /* Stack vector */
+#define RWS_RSIZE       1000                    /* Work size for recursion */
+#define RWS_OVEC_RSIZE  (1000*OVEC_UNIT)        /* Ovector for recursion */
+#define RWS_OVEC_OSIZE  (2*OVEC_UNIT)           /* Ovector in other cases */
+
+/* This structure is at the start of each workspace block. */
+
+typedef struct RWS_anchor {
+  struct RWS_anchor *next;
+  uint32_t size;  /* Number of ints */
+  uint32_t free;  /* Number of ints */
+} RWS_anchor;
+
+#define RWS_ANCHOR_SIZE (sizeof(RWS_anchor)/sizeof(int))
+
+
+
 /*************************************************
-*             Print character string             *
+*               Process a callout                *
 *************************************************/
 
-/* Character string printing function for debugging.
+/* This function is called to perform a callout.
 
 Arguments:
-  p            points to string
-  length       number of bytes
-  f            where to print
+  code              current code pointer
+  offsets           points to current capture offsets
+  current_subject   start of current subject match
+  ptr               current position in subject
+  mb                the match block
+  extracode         extra code offset when called from condition
+  lengthptr         where to return the callout length
 
-Returns:       nothing
+Returns:            the return from the callout
 */
 
-static void
-pchars(const pcre_uchar *p, int length, FILE *f)
+static int
+do_callout(PCRE2_SPTR code, PCRE2_SIZE *offsets, PCRE2_SPTR current_subject,
+  PCRE2_SPTR ptr, dfa_match_block *mb, PCRE2_SIZE extracode,
+  PCRE2_SIZE *lengthptr)
 {
-pcre_uint32 c;
-while (length-- > 0)
+pcre2_callout_block *cb = mb->cb;
+
+*lengthptr = (code[extracode] == OP_CALLOUT)?
+  (PCRE2_SIZE)PRIV(OP_lengths)[OP_CALLOUT] :
+  (PCRE2_SIZE)GET(code, 1 + 2*LINK_SIZE + extracode);
+
+if (mb->callout == NULL) return 0;    /* No callout provided */
+
+/* Fixed fields in the callout block are set once and for all at the start of
+matching. */
+
+cb->offset_vector    = offsets;
+cb->start_match      = (PCRE2_SIZE)(current_subject - mb->start_subject);
+cb->current_position = (PCRE2_SIZE)(ptr - mb->start_subject);
+cb->pattern_position = GET(code, 1 + extracode);
+cb->next_item_length = GET(code, 1 + LINK_SIZE + extracode);
+
+if (code[extracode] == OP_CALLOUT)
   {
-  if (isprint(c = *(p++)))
-    fprintf(f, "%c", c);
-  else
-    fprintf(f, "\\x{%02x}", c);
+  cb->callout_number = code[1 + 2*LINK_SIZE + extracode];
+  cb->callout_string_offset = 0;
+  cb->callout_string = NULL;
+  cb->callout_string_length = 0;
   }
+else
+  {
+  cb->callout_number = 0;
+  cb->callout_string_offset = GET(code, 1 + 3*LINK_SIZE + extracode);
+  cb->callout_string = code + (1 + 4*LINK_SIZE + extracode) + 1;
+  cb->callout_string_length = *lengthptr - (1 + 4*LINK_SIZE) - 2;
+  }
+
+return (mb->callout)(cb, mb->callout_data);
 }
-#endif
 
 
 
 /*************************************************
-*    Execute a Regular Expression - DFA engine   *
+*         Expand local workspace memory          *
+*************************************************/
+
+/* This function is called when internal_dfa_match() is about to be called
+recursively and there is insufficient working space left in the current
+workspace block. If there's an existing next block, use it; otherwise get a new
+block unless the heap limit is reached.
+
+Arguments:
+  rwsptr     pointer to block pointer (updated)
+  ovecsize   space needed for an ovector
+  mb         the match block
+
+Returns:     0 rwsptr has been updated
+            !0 an error code
+*/
+
+static int
+more_workspace(RWS_anchor **rwsptr, unsigned int ovecsize, dfa_match_block *mb)
+{
+RWS_anchor *rws = *rwsptr;
+RWS_anchor *new;
+
+if (rws->next != NULL)
+  {
+  new = rws->next;
+  }
+
+/* Sizes in the RWS_anchor blocks are in units of sizeof(int), but
+mb->heap_limit and mb->heap_used are in kibibytes. Play carefully, to avoid
+overflow. */
+
+else
+  {
+  uint32_t newsize = (rws->size >= UINT32_MAX/2)? UINT32_MAX/2 : rws->size * 2;
+  uint32_t newsizeK = newsize/(1024/sizeof(int));
+
+  if (newsizeK + mb->heap_used > mb->heap_limit)
+    newsizeK = (uint32_t)(mb->heap_limit - mb->heap_used);
+  newsize = newsizeK*(1024/sizeof(int));
+
+  if (newsize < RWS_RSIZE + ovecsize + RWS_ANCHOR_SIZE)
+    return PCRE2_ERROR_HEAPLIMIT;
+  new = mb->memctl.malloc(newsize*sizeof(int), mb->memctl.memory_data);
+  if (new == NULL) return PCRE2_ERROR_NOMEMORY;
+  mb->heap_used += newsizeK;
+  new->next = NULL;
+  new->size = newsize;
+  rws->next = new;
+  }
+
+new->free = new->size - RWS_ANCHOR_SIZE;
+*rwsptr = new;
+return 0;
+}
+
+
+
+/*************************************************
+*     Match a Regular Expression - DFA engine    *
 *************************************************/
 
 /* This internal function applies a compiled pattern to a subject string,
@@ -330,7 +458,7 @@ external one, possibly multiple times if the pattern is not anchored. The
 function calls itself recursively for some kinds of subpattern.
 
 Arguments:
-  md                the match_data block with fixed information
+  mb                the match_data block with fixed information
   this_start_code   the opening bracket of this subexpression's code
   current_subject   where we currently are in the subject string
   start_offset      start offset in the subject string
@@ -354,9 +482,8 @@ for the current character, one for the following character). */
     next_active_state->offset = (x); \
     next_active_state->count  = (y); \
     next_active_state++; \
-    DPRINTF(("%.*sADD_ACTIVE(%d,%d)\n", rlevel*2-2, SP, (x), (y))); \
     } \
-  else return PCRE_ERROR_DFA_WSSIZE
+  else return PCRE2_ERROR_DFA_WSSIZE
 
 #define ADD_ACTIVE_DATA(x,y,z) \
   if (active_count++ < wscount) \
@@ -365,9 +492,8 @@ for the current character, one for the following character). */
     next_active_state->count  = (y); \
     next_active_state->data   = (z); \
     next_active_state++; \
-    DPRINTF(("%.*sADD_ACTIVE_DATA(%d,%d,%d)\n", rlevel*2-2, SP, (x), (y), (z))); \
     } \
-  else return PCRE_ERROR_DFA_WSSIZE
+  else return PCRE2_ERROR_DFA_WSSIZE
 
 #define ADD_NEW(x,y) \
   if (new_count++ < wscount) \
@@ -375,9 +501,8 @@ for the current character, one for the following character). */
     next_new_state->offset = (x); \
     next_new_state->count  = (y); \
     next_new_state++; \
-    DPRINTF(("%.*sADD_NEW(%d,%d)\n", rlevel*2-2, SP, (x), (y))); \
     } \
-  else return PCRE_ERROR_DFA_WSSIZE
+  else return PCRE2_ERROR_DFA_WSSIZE
 
 #define ADD_NEW_DATA(x,y,z) \
   if (new_count++ < wscount) \
@@ -386,95 +511,83 @@ for the current character, one for the following character). */
     next_new_state->count  = (y); \
     next_new_state->data   = (z); \
     next_new_state++; \
-    DPRINTF(("%.*sADD_NEW_DATA(%d,%d,%d) line %d\n", rlevel*2-2, SP, \
-      (x), (y), (z), __LINE__)); \
     } \
-  else return PCRE_ERROR_DFA_WSSIZE
+  else return PCRE2_ERROR_DFA_WSSIZE
 
 /* And now, here is the code */
 
 static int
-internal_dfa_exec(
-  dfa_match_data *md,
-  const pcre_uchar *this_start_code,
-  const pcre_uchar *current_subject,
-  int start_offset,
-  int *offsets,
-  int offsetcount,
+internal_dfa_match(
+  dfa_match_block *mb,
+  PCRE2_SPTR this_start_code,
+  PCRE2_SPTR current_subject,
+  PCRE2_SIZE start_offset,
+  PCRE2_SIZE *offsets,
+  uint32_t offsetcount,
   int *workspace,
   int wscount,
-  int  rlevel)
+  uint32_t rlevel,
+  int *RWS)
 {
 stateblock *active_states, *new_states, *temp_states;
 stateblock *next_active_state, *next_new_state;
-
-const pcre_uint8 *ctypes, *lcc, *fcc;
-const pcre_uchar *ptr;
-const pcre_uchar *end_code, *first_op;
-
+const uint8_t *ctypes, *lcc, *fcc;
+PCRE2_SPTR ptr;
+PCRE2_SPTR end_code;
 dfa_recursion_info new_recursive;
-
 int active_count, new_count, match_count;
 
-/* Some fields in the md block are frequently referenced, so we load them into
+/* Some fields in the mb block are frequently referenced, so we load them into
 independent variables in the hope that this will perform better. */
 
-const pcre_uchar *start_subject = md->start_subject;
-const pcre_uchar *end_subject = md->end_subject;
-const pcre_uchar *start_code = md->start_code;
+PCRE2_SPTR start_subject = mb->start_subject;
+PCRE2_SPTR end_subject = mb->end_subject;
+PCRE2_SPTR start_code = mb->start_code;
 
-#ifdef SUPPORT_UTF
-BOOL utf = (md->poptions & PCRE_UTF8) != 0;
+#ifdef SUPPORT_UNICODE
+BOOL utf = (mb->poptions & PCRE2_UTF) != 0;
+BOOL utf_or_ucp = utf || (mb->poptions & PCRE2_UCP) != 0;
 #else
 BOOL utf = FALSE;
 #endif
 
 BOOL reset_could_continue = FALSE;
 
-rlevel++;
-offsetcount &= (-2);
+if (mb->match_call_count++ >= mb->match_limit) return PCRE2_ERROR_MATCHLIMIT;
+if (rlevel++ > mb->match_limit_depth) return PCRE2_ERROR_DEPTHLIMIT;
+offsetcount &= (uint32_t)(-2);  /* Round down */
 
 wscount -= 2;
 wscount = (wscount - (wscount % (INTS_PER_STATEBLOCK * 2))) /
           (2 * INTS_PER_STATEBLOCK);
 
-DPRINTF(("\n%.*s---------------------\n"
-  "%.*sCall to internal_dfa_exec f=%d\n",
-  rlevel*2-2, SP, rlevel*2-2, SP, rlevel));
+ctypes = mb->tables + ctypes_offset;
+lcc = mb->tables + lcc_offset;
+fcc = mb->tables + fcc_offset;
 
-ctypes = md->tables + ctypes_offset;
-lcc = md->tables + lcc_offset;
-fcc = md->tables + fcc_offset;
-
-match_count = PCRE_ERROR_NOMATCH;   /* A negative number */
+match_count = PCRE2_ERROR_NOMATCH;   /* A negative number */
 
 active_states = (stateblock *)(workspace + 2);
 next_new_state = new_states = active_states + wscount;
 new_count = 0;
 
-first_op = this_start_code + 1 + LINK_SIZE +
-  ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA ||
-    *this_start_code == OP_CBRAPOS || *this_start_code == OP_SCBRAPOS)
-    ? IMM2_SIZE:0);
-
 /* The first thing in any (sub) pattern is a bracket of some sort. Push all
 the alternative states onto the list, and find out where the end is. This
 makes is possible to use this function recursively, when we want to stop at a
 matching internal ket rather than at the end.
 
-If the first opcode in the first alternative is OP_REVERSE, we are dealing with
-a backward assertion. In that case, we have to find out the maximum amount to
-move back, and set up each alternative appropriately. */
+If we are dealing with a backward assertion we have to find out the maximum
+amount to move back, and set up each alternative appropriately. */
 
-if (*first_op == OP_REVERSE)
+if (*this_start_code == OP_ASSERTBACK || *this_start_code == OP_ASSERTBACK_NOT)
   {
-  int max_back = 0;
-  int gone_back;
+  size_t max_back = 0;
+  size_t gone_back;
 
   end_code = this_start_code;
   do
     {
-    int back = GET(end_code, 2+LINK_SIZE);
+    size_t back = (size_t)GET(end_code, 2+LINK_SIZE);
     if (back > max_back) max_back = back;
     end_code += GET(end_code, 1);
     }
@@ -483,7 +596,7 @@ if (*first_op == OP_REVERSE)
   /* If we can't go back the amount required for the longest lookbehind
   pattern, go back as far as we can; some alternatives may still be viable. */
 
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
   /* In character mode we have to step back character by character */
 
   if (utf)
@@ -492,7 +605,8 @@ if (*first_op == OP_REVERSE)
       {
       if (current_subject <= start_subject) break;
       current_subject--;
-      ACROSSCHAR(current_subject > start_subject, *current_subject, current_subject--);
+      ACROSSCHAR(current_subject > start_subject, current_subject,
+        current_subject--);
       }
     }
   else
@@ -501,26 +615,28 @@ if (*first_op == OP_REVERSE)
   /* In byte-mode we can do this quickly. */
 
     {
-    gone_back = (current_subject - max_back < start_subject)?
-      (int)(current_subject - start_subject) : max_back;
+    size_t current_offset = (size_t)(current_subject - start_subject);
+    gone_back = (current_offset < max_back)? current_offset : max_back;
     current_subject -= gone_back;
     }
 
   /* Save the earliest consulted character */
 
-  if (current_subject < md->start_used_ptr)
-    md->start_used_ptr = current_subject;
+  if (current_subject < mb->start_used_ptr)
+    mb->start_used_ptr = current_subject;
 
-  /* Now we can process the individual branches. */
+  /* Now we can process the individual branches. There will be an OP_REVERSE at
+  the start of each branch, except when the length of the branch is zero. */
 
   end_code = this_start_code;
   do
     {
-    int back = GET(end_code, 2+LINK_SIZE);
+    uint32_t revlen = (end_code[1+LINK_SIZE] == OP_REVERSE)? 1 + LINK_SIZE : 0;
+    size_t back = (revlen == 0)? 0 : (size_t)GET(end_code, 2+LINK_SIZE);
     if (back <= gone_back)
       {
-      int bstate = (int)(end_code - start_code + 2 + 2*LINK_SIZE);
-      ADD_NEW_DATA(-bstate, 0, gone_back - back);
+      int bstate = (int)(end_code - start_code + 1 + LINK_SIZE + revlen);
+      ADD_NEW_DATA(-bstate, 0, (int)(gone_back - back));
       }
     end_code += GET(end_code, 1);
     }
@@ -539,12 +655,12 @@ else
 
   /* Restarting */
 
-  if (rlevel == 1 && (md->moptions & PCRE_DFA_RESTART) != 0)
+  if (rlevel == 1 && (mb->moptions & PCRE2_DFA_RESTART) != 0)
     {
     do { end_code += GET(end_code, 1); } while (*end_code == OP_ALT);
     new_count = workspace[1];
     if (!workspace[0])
-      memcpy(new_states, active_states, new_count * sizeof(stateblock));
+      memcpy(new_states, active_states, (size_t)new_count * sizeof(stateblock));
     }
 
   /* Not restarting */
@@ -567,8 +683,6 @@ else
 
 workspace[0] = 0;    /* Bit indicating which vector is current */
 
-DPRINTF(("%.*sEnd state = %d\n", rlevel*2-2, SP, (int)(end_code - start_code)));
-
 /* Loop for scanning the subject */
 
 ptr = current_subject;
@@ -576,12 +690,14 @@ for (;;)
   {
   int i, j;
   int clen, dlen;
-  pcre_uint32 c, d;
+  uint32_t c, d;
   int forced_fail = 0;
   BOOL partial_newline = FALSE;
   BOOL could_continue = reset_could_continue;
   reset_could_continue = FALSE;
 
+  if (ptr > mb->last_used_ptr) mb->last_used_ptr = ptr;
+
   /* Make the new state list into the active state list and empty the
   new state list. */
 
@@ -594,17 +710,6 @@ for (;;)
   workspace[0] ^= 1;              /* Remember for the restarting feature */
   workspace[1] = active_count;
 
-#ifdef PCRE_DEBUG
-  printf("%.*sNext character: rest of subject = \"", rlevel*2-2, SP);
-  pchars(ptr, STRLEN_UC(ptr), stdout);
-  printf("\"\n");
-
-  printf("%.*sActive states: ", rlevel*2-2, SP);
-  for (i = 0; i < active_count; i++)
-    printf("%d/%d ", active_states[i].offset, active_states[i].count);
-  printf("\n");
-#endif
-
   /* Set the pointers for adding new states */
 
   next_active_state = active_states + active_count;
@@ -617,11 +722,11 @@ for (;;)
   if (ptr < end_subject)
     {
     clen = 1;        /* Number of data items in the character */
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     GETCHARLENTEST(c, ptr, clen);
 #else
     c = *ptr;
-#endif  /* SUPPORT_UTF */
+#endif  /* SUPPORT_UNICODE */
     }
   else
     {
@@ -638,18 +743,12 @@ for (;;)
     {
     stateblock *current_state = active_states + i;
     BOOL caseless = FALSE;
-    const pcre_uchar *code;
+    PCRE2_SPTR code;
+    uint32_t codevalue;
     int state_offset = current_state->offset;
-    int codevalue, rrc;
+    int rrc;
     int count;
 
-#ifdef PCRE_DEBUG
-    printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);
-    if (clen == 0) printf("EOL\n");
-      else if (c > 32 && c < 127) printf("'%c'\n", c);
-        else printf("0x%02x\n", c);
-#endif
-
     /* A negative offset is a special case meaning "hold off going to this
     (negated) state until the number of characters in the data field have
     been skipped". If the could_continue flag was passed over from a previous
@@ -659,7 +758,6 @@ for (;;)
       {
       if (current_state->data > 0)
         {
-        DPRINTF(("%.*sSkipping this character\n", rlevel*2-2, SP));
         ADD_NEW_DATA(state_offset, current_state->count,
           current_state->data - 1);
         if (could_continue) reset_could_continue = TRUE;
@@ -679,10 +777,7 @@ for (;;)
       {
       if (active_states[j].offset == state_offset &&
           active_states[j].count == current_state->count)
-        {
-        DPRINTF(("%.*sDuplicate state: skipped\n", rlevel*2-2, SP));
         goto NEXT_ACTIVE_STATE;
-        }
       }
 
     /* The state offset is the offset to the opcode */
@@ -710,15 +805,15 @@ for (;;)
     if (coptable[codevalue] > 0)
       {
       dlen = 1;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
       if (utf) { GETCHARLEN(d, (code + coptable[codevalue]), dlen); } else
-#endif  /* SUPPORT_UTF */
+#endif  /* SUPPORT_UNICODE */
       d = code[coptable[codevalue]];
       if (codevalue >= OP_TYPESTAR)
         {
         switch(d)
           {
-          case OP_ANYBYTE: return PCRE_ERROR_DFA_UITEM;
+          case OP_ANYBYTE: return PCRE2_ERROR_DFA_UITEM;
           case OP_NOTPROP:
           case OP_PROP: codevalue += OP_PROP_EXTRA; break;
           case OP_ANYNL: codevalue += OP_ANYNL_EXTRA; break;
@@ -753,7 +848,7 @@ for (;;)
       case OP_TABLE_LENGTH +
         ((sizeof(coptable) == OP_TABLE_LENGTH) &&
          (sizeof(poptable) == OP_TABLE_LENGTH)):
-      break;
+      return 0;
 
 /* ========================================================================== */
       /* Reached a closing bracket. If not at the end of the pattern, carry
@@ -763,7 +858,7 @@ for (;;)
       using recursive calls. Thus, it never adds any new states.
 
       At the end of the (sub)pattern, unless we have an empty string and
-      PCRE_NOTEMPTY is set, or PCRE_NOTEMPTY_ATSTART is set and we are at the
+      PCRE2_NOTEMPTY is set, or PCRE2_NOTEMPTY_ATSTART is set and we are at the
       start of the subject, save the match data, shifting up all previous
       matches so we always have the longest first. */
 
@@ -776,35 +871,28 @@ for (;;)
         ADD_ACTIVE(state_offset + 1 + LINK_SIZE, 0);
         if (codevalue != OP_KET)
           {
-          ADD_ACTIVE(state_offset - GET(code, 1), 0);
+          ADD_ACTIVE(state_offset - (int)GET(code, 1), 0);
           }
         }
       else
         {
         if (ptr > current_subject ||
-            ((md->moptions & PCRE_NOTEMPTY) == 0 &&
-              ((md->moptions & PCRE_NOTEMPTY_ATSTART) == 0 ||
-                current_subject > start_subject + md->start_offset)))
+            ((mb->moptions & PCRE2_NOTEMPTY) == 0 &&
+              ((mb->moptions & PCRE2_NOTEMPTY_ATSTART) == 0 ||
+                current_subject > start_subject + mb->start_offset)))
           {
           if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;
-            else if (match_count > 0 && ++match_count * 2 > offsetcount)
+            else if (match_count > 0 && ++match_count * 2 > (int)offsetcount)
               match_count = 0;
-          count = ((match_count == 0)? offsetcount : match_count * 2) - 2;
-          if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));
+          count = ((match_count == 0)? (int)offsetcount : match_count * 2) - 2;
+          if (count > 0) (void)memmove(offsets + 2, offsets,
+            (size_t)count * sizeof(PCRE2_SIZE));
           if (offsetcount >= 2)
             {
-            offsets[0] = (int)(current_subject - start_subject);
-            offsets[1] = (int)(ptr - start_subject);
-            DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,
-              offsets[1] - offsets[0], (char *)current_subject));
-            }
-          if ((md->moptions & PCRE_DFA_SHORTEST) != 0)
-            {
-            DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"
-              "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel,
-              match_count, rlevel*2-2, SP));
-            return match_count;
+            offsets[0] = (PCRE2_SIZE)(current_subject - start_subject);
+            offsets[1] = (PCRE2_SIZE)(ptr - start_subject);
             }
+          if ((mb->moptions & PCRE2_DFA_SHORTEST) != 0) return match_count;
           }
         }
       break;
@@ -860,14 +948,15 @@ for (;;)
 
       /*-----------------------------------------------------------------*/
       case OP_CIRC:
-      if (ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0)
+      if (ptr == start_subject && (mb->moptions & PCRE2_NOTBOL) == 0)
         { ADD_ACTIVE(state_offset + 1, 0); }
       break;
 
       /*-----------------------------------------------------------------*/
       case OP_CIRCM:
-      if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||
-          (ptr != end_subject && WAS_NEWLINE(ptr)))
+      if ((ptr == start_subject && (mb->moptions & PCRE2_NOTBOL) == 0) ||
+          ((ptr != end_subject || (mb->poptions & PCRE2_ALT_CIRCUMFLEX) != 0 )
+            && WAS_NEWLINE(ptr)))
         { ADD_ACTIVE(state_offset + 1, 0); }
       break;
 
@@ -875,8 +964,8 @@ for (;;)
       case OP_EOD:
       if (ptr >= end_subject)
         {
-        if ((md->moptions & PCRE_PARTIAL_HARD) != 0)
-          could_continue = TRUE;
+        if ((mb->moptions & PCRE2_PARTIAL_HARD) != 0)
+          return PCRE2_ERROR_PARTIAL;
         else { ADD_ACTIVE(state_offset + 1, 0); }
         }
       break;
@@ -902,8 +991,8 @@ for (;;)
       case OP_ANY:
       if (clen > 0 && !IS_NEWLINE(ptr))
         {
-        if (ptr + 1 >= md->end_subject &&
-            (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
+        if (ptr + 1 >= mb->end_subject &&
+            (mb->moptions & (PCRE2_PARTIAL_HARD)) != 0 &&
             NLBLOCK->nltype == NLTYPE_FIXED &&
             NLBLOCK->nllen == 2 &&
             c == NLBLOCK->nl[0])
@@ -925,30 +1014,32 @@ for (;;)
 
       /*-----------------------------------------------------------------*/
       case OP_EODN:
-      if (clen == 0 && (md->moptions & PCRE_PARTIAL_HARD) != 0)
-        could_continue = TRUE;
-      else if (clen == 0 || (IS_NEWLINE(ptr) && ptr == end_subject - md->nllen))
-        { ADD_ACTIVE(state_offset + 1, 0); }
+      if (clen == 0 || (IS_NEWLINE(ptr) && ptr == end_subject - mb->nllen))
+        {
+        if ((mb->moptions & PCRE2_PARTIAL_HARD) != 0)
+          return PCRE2_ERROR_PARTIAL;
+        ADD_ACTIVE(state_offset + 1, 0);
+        }
       break;
 
       /*-----------------------------------------------------------------*/
       case OP_DOLL:
-      if ((md->moptions & PCRE_NOTEOL) == 0)
+      if ((mb->moptions & PCRE2_NOTEOL) == 0)
         {
-        if (clen == 0 && (md->moptions & PCRE_PARTIAL_HARD) != 0)
+        if (clen == 0 && (mb->moptions & PCRE2_PARTIAL_HARD) != 0)
           could_continue = TRUE;
         else if (clen == 0 ||
-            ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr) &&
-               (ptr == end_subject - md->nllen)
+            ((mb->poptions & PCRE2_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr) &&
+               (ptr == end_subject - mb->nllen)
             ))
           { ADD_ACTIVE(state_offset + 1, 0); }
-        else if (ptr + 1 >= md->end_subject &&
-                 (md->moptions & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) != 0 &&
+        else if (ptr + 1 >= mb->end_subject &&
+                 (mb->moptions & (PCRE2_PARTIAL_HARD|PCRE2_PARTIAL_SOFT)) != 0 &&
                  NLBLOCK->nltype == NLTYPE_FIXED &&
                  NLBLOCK->nllen == 2 &&
                  c == NLBLOCK->nl[0])
           {
-          if ((md->moptions & PCRE_PARTIAL_HARD) != 0)
+          if ((mb->moptions & PCRE2_PARTIAL_HARD) != 0)
             {
             reset_could_continue = TRUE;
             ADD_NEW_DATA(-(state_offset + 1), 0, 1);
@@ -960,20 +1051,20 @@ for (;;)
 
       /*-----------------------------------------------------------------*/
       case OP_DOLLM:
-      if ((md->moptions & PCRE_NOTEOL) == 0)
+      if ((mb->moptions & PCRE2_NOTEOL) == 0)
         {
-        if (clen == 0 && (md->moptions & PCRE_PARTIAL_HARD) != 0)
+        if (clen == 0 && (mb->moptions & PCRE2_PARTIAL_HARD) != 0)
           could_continue = TRUE;
         else if (clen == 0 ||
-            ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr)))
+            ((mb->poptions & PCRE2_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr)))
           { ADD_ACTIVE(state_offset + 1, 0); }
-        else if (ptr + 1 >= md->end_subject &&
-                 (md->moptions & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) != 0 &&
+        else if (ptr + 1 >= mb->end_subject &&
+                 (mb->moptions & (PCRE2_PARTIAL_HARD|PCRE2_PARTIAL_SOFT)) != 0 &&
                  NLBLOCK->nltype == NLTYPE_FIXED &&
                  NLBLOCK->nllen == 2 &&
                  c == NLBLOCK->nl[0])
           {
-          if ((md->moptions & PCRE_PARTIAL_HARD) != 0)
+          if ((mb->moptions & PCRE2_PARTIAL_HARD) != 0)
             {
             reset_could_continue = TRUE;
             ADD_NEW_DATA(-(state_offset + 1), 0, 1);
@@ -1012,18 +1103,18 @@ for (;;)
 
         if (ptr > start_subject)
           {
-          const pcre_uchar *temp = ptr - 1;
-          if (temp < md->start_used_ptr) md->start_used_ptr = temp;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+          PCRE2_SPTR temp = ptr - 1;
+          if (temp < mb->start_used_ptr) mb->start_used_ptr = temp;
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
           if (utf) { BACKCHAR(temp); }
 #endif
           GETCHARTEST(d, temp);
-#ifdef SUPPORT_UCP
-          if ((md->poptions & PCRE_UCP) != 0)
+#ifdef SUPPORT_UNICODE
+          if ((mb->poptions & PCRE2_UCP) != 0)
             {
             if (d == '_') left_word = TRUE; else
               {
-              int cat = UCD_CATEGORY(d);
+              uint32_t cat = UCD_CATEGORY(d);
               left_word = (cat == ucp_L || cat == ucp_N);
               }
             }
@@ -1035,12 +1126,20 @@ for (;;)
 
         if (clen > 0)
           {
-#ifdef SUPPORT_UCP
-          if ((md->poptions & PCRE_UCP) != 0)
+          if (ptr >= mb->last_used_ptr)
+            {
+            PCRE2_SPTR temp = ptr + 1;
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+            if (utf) { FORWARDCHARTEST(temp, mb->end_subject); }
+#endif
+            mb->last_used_ptr = temp;
+            }
+#ifdef SUPPORT_UNICODE
+          if ((mb->poptions & PCRE2_UCP) != 0)
             {
             if (c == '_') right_word = TRUE; else
               {
-              int cat = UCD_CATEGORY(c);
+              uint32_t cat = UCD_CATEGORY(c);
               right_word = (cat == ucp_L || cat == ucp_N);
               }
             }
@@ -1061,13 +1160,13 @@ for (;;)
       if the support is in the binary; otherwise a compile-time error occurs.
       */
 
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
       case OP_PROP:
       case OP_NOTPROP:
       if (clen > 0)
         {
         BOOL OK;
-        const pcre_uint32 *cp;
+        const uint32_t *cp;
         const ucd_record * prop = GET_UCD(c);
         switch(code[1])
           {
@@ -1092,6 +1191,11 @@ for (;;)
           OK = prop->script == code[2];
           break;
 
+          case PT_SCX:
+          OK = (prop->script == code[2] ||
+                MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), code[2]) != 0);
+          break;
+
           /* These are specials for combination cases. */
 
           case PT_ALNUM:
@@ -1139,6 +1243,15 @@ for (;;)
                c >= 0xe000;
           break;
 
+          case PT_BIDICL:
+          OK = UCD_BIDICLASS(c) == code[2];
+          break;
+
+          case PT_BOOL:
+          OK = MAPBIT(PRIV(ucd_boolprop_sets) +
+            UCD_BPROPS_PROP(prop), code[2]) != 0;
+          break;
+
           /* Should never occur, but keep compilers from grumbling. */
 
           default:
@@ -1166,8 +1279,8 @@ for (;;)
       if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
       if (clen > 0)
         {
-        if (d == OP_ANY && ptr + 1 >= md->end_subject &&
-            (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
+        if (d == OP_ANY && ptr + 1 >= mb->end_subject &&
+            (mb->moptions & (PCRE2_PARTIAL_HARD)) != 0 &&
             NLBLOCK->nltype == NLTYPE_FIXED &&
             NLBLOCK->nllen == 2 &&
             c == NLBLOCK->nl[0])
@@ -1197,8 +1310,8 @@ for (;;)
       ADD_ACTIVE(state_offset + 2, 0);
       if (clen > 0)
         {
-        if (d == OP_ANY && ptr + 1 >= md->end_subject &&
-            (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
+        if (d == OP_ANY && ptr + 1 >= mb->end_subject &&
+            (mb->moptions & (PCRE2_PARTIAL_HARD)) != 0 &&
             NLBLOCK->nltype == NLTYPE_FIXED &&
             NLBLOCK->nllen == 2 &&
             c == NLBLOCK->nl[0])
@@ -1227,8 +1340,8 @@ for (;;)
       ADD_ACTIVE(state_offset + 2, 0);
       if (clen > 0)
         {
-        if (d == OP_ANY && ptr + 1 >= md->end_subject &&
-            (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
+        if (d == OP_ANY && ptr + 1 >= mb->end_subject &&
+            (mb->moptions & (PCRE2_PARTIAL_HARD)) != 0 &&
             NLBLOCK->nltype == NLTYPE_FIXED &&
             NLBLOCK->nllen == 2 &&
             c == NLBLOCK->nl[0])
@@ -1255,8 +1368,8 @@ for (;;)
       count = current_state->count;  /* Number already matched */
       if (clen > 0)
         {
-        if (d == OP_ANY && ptr + 1 >= md->end_subject &&
-            (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
+        if (d == OP_ANY && ptr + 1 >= mb->end_subject &&
+            (mb->moptions & (PCRE2_PARTIAL_HARD)) != 0 &&
             NLBLOCK->nltype == NLTYPE_FIXED &&
             NLBLOCK->nllen == 2 &&
             c == NLBLOCK->nl[0])
@@ -1284,8 +1397,8 @@ for (;;)
       count = current_state->count;  /* Number already matched */
       if (clen > 0)
         {
-        if (d == OP_ANY && ptr + 1 >= md->end_subject &&
-            (md->moptions & (PCRE_PARTIAL_HARD)) != 0 &&
+        if (d == OP_ANY && ptr + 1 >= mb->end_subject &&
+            (mb->moptions & (PCRE2_PARTIAL_HARD)) != 0 &&
             NLBLOCK->nltype == NLTYPE_FIXED &&
             NLBLOCK->nllen == 2 &&
             c == NLBLOCK->nl[0])
@@ -1316,7 +1429,7 @@ for (;;)
       argument. It keeps the code above fast for the other cases. The argument
       is in the d variable. */
 
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
       case OP_PROP_EXTRA + OP_TYPEPLUS:
       case OP_PROP_EXTRA + OP_TYPEMINPLUS:
       case OP_PROP_EXTRA + OP_TYPEPOSPLUS:
@@ -1325,7 +1438,7 @@ for (;;)
       if (clen > 0)
         {
         BOOL OK;
-        const pcre_uint32 *cp;
+        const uint32_t *cp;
         const ucd_record * prop = GET_UCD(c);
         switch(code[2])
           {
@@ -1350,6 +1463,11 @@ for (;;)
           OK = prop->script == code[3];
           break;
 
+          case PT_SCX:
+          OK = (prop->script == code[3] ||
+                MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), code[3]) != 0);
+          break;
+
           /* These are specials for combination cases. */
 
           case PT_ALNUM:
@@ -1397,6 +1515,15 @@ for (;;)
                c >= 0xe000;
           break;
 
+          case PT_BIDICL:
+          OK = UCD_BIDICLASS(c) == code[3];
+          break;
+
+          case PT_BOOL:
+          OK = MAPBIT(PRIV(ucd_boolprop_sets) +
+            UCD_BPROPS_PROP(prop), code[3]) != 0;
+          break;
+
           /* Should never occur, but keep compilers from grumbling. */
 
           default:
@@ -1425,25 +1552,14 @@ for (;;)
       if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
       if (clen > 0)
         {
-        int lgb, rgb;
-        const pcre_uchar *nptr = ptr + clen;
         int ncount = 0;
         if (count > 0 && codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS)
           {
           active_count--;           /* Remove non-match possibility */
           next_active_state--;
           }
-        lgb = UCD_GRAPHBREAK(c);
-        while (nptr < end_subject)
-          {
-          dlen = 1;
-          if (!utf) d = *nptr; else { GETCHARLEN(d, nptr, dlen); }
-          rgb = UCD_GRAPHBREAK(d);
-          if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-          ncount++;
-          lgb = rgb;
-          nptr += dlen;
-          }
+        (void)PRIV(extuni)(c, ptr + clen, mb->start_subject, end_subject, utf,
+          &ncount);
         count++;
         ADD_NEW_DATA(-state_offset, count, ncount);
         }
@@ -1468,7 +1584,7 @@ for (;;)
           case 0x2028:
           case 0x2029:
 #endif  /* Not EBCDIC */
-          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+          if (mb->bsr_convention == PCRE2_BSR_ANYCRLF) break;
           goto ANYNL01;
 
           case CHAR_CR:
@@ -1559,7 +1675,7 @@ for (;;)
       break;
 
       /*-----------------------------------------------------------------*/
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
       case OP_PROP_EXTRA + OP_TYPEQUERY:
       case OP_PROP_EXTRA + OP_TYPEMINQUERY:
       case OP_PROP_EXTRA + OP_TYPEPOSQUERY:
@@ -1577,7 +1693,7 @@ for (;;)
       if (clen > 0)
         {
         BOOL OK;
-        const pcre_uint32 *cp;
+        const uint32_t *cp;
         const ucd_record * prop = GET_UCD(c);
         switch(code[2])
           {
@@ -1602,6 +1718,11 @@ for (;;)
           OK = prop->script == code[3];
           break;
 
+          case PT_SCX:
+          OK = (prop->script == code[3] ||
+                MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), code[3]) != 0);
+          break;
+
           /* These are specials for combination cases. */
 
           case PT_ALNUM:
@@ -1649,6 +1770,15 @@ for (;;)
                c >= 0xe000;
           break;
 
+          case PT_BIDICL:
+          OK = UCD_BIDICLASS(c) == code[3];
+          break;
+
+          case PT_BOOL:
+          OK = MAPBIT(PRIV(ucd_boolprop_sets) +
+            UCD_BPROPS_PROP(prop), code[3]) != 0;
+          break;
+
           /* Should never occur, but keep compilers from grumbling. */
 
           default:
@@ -1686,8 +1816,6 @@ for (;;)
       ADD_ACTIVE(state_offset + 2, 0);
       if (clen > 0)
         {
-        int lgb, rgb;
-        const pcre_uchar *nptr = ptr + clen;
         int ncount = 0;
         if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSSTAR ||
             codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSQUERY)
@@ -1695,17 +1823,8 @@ for (;;)
           active_count--;           /* Remove non-match possibility */
           next_active_state--;
           }
-        lgb = UCD_GRAPHBREAK(c);
-        while (nptr < end_subject)
-          {
-          dlen = 1;
-          if (!utf) d = *nptr; else { GETCHARLEN(d, nptr, dlen); }
-          rgb = UCD_GRAPHBREAK(d);
-          if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-          ncount++;
-          lgb = rgb;
-          nptr += dlen;
-          }
+        (void)PRIV(extuni)(c, ptr + clen, mb->start_subject, end_subject, utf,
+          &ncount);
         ADD_NEW_DATA(-(state_offset + count), 0, ncount);
         }
       break;
@@ -1737,7 +1856,7 @@ for (;;)
           case 0x2028:
           case 0x2029:
 #endif  /* Not EBCDIC */
-          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+          if (mb->bsr_convention == PCRE2_BSR_ANYCRLF) break;
           goto ANYNL02;
 
           case CHAR_CR:
@@ -1843,7 +1962,7 @@ for (;;)
       break;
 
       /*-----------------------------------------------------------------*/
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
       case OP_PROP_EXTRA + OP_TYPEEXACT:
       case OP_PROP_EXTRA + OP_TYPEUPTO:
       case OP_PROP_EXTRA + OP_TYPEMINUPTO:
@@ -1854,7 +1973,7 @@ for (;;)
       if (clen > 0)
         {
         BOOL OK;
-        const pcre_uint32 *cp;
+        const uint32_t *cp;
         const ucd_record * prop = GET_UCD(c);
         switch(code[1 + IMM2_SIZE + 1])
           {
@@ -1879,6 +1998,12 @@ for (;;)
           OK = prop->script == code[1 + IMM2_SIZE + 2];
           break;
 
+          case PT_SCX:
+          OK = (prop->script == code[1 + IMM2_SIZE + 2] ||
+                MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop),
+                  code[1 + IMM2_SIZE + 2]) != 0);
+          break;
+
           /* These are specials for combination cases. */
 
           case PT_ALNUM:
@@ -1926,6 +2051,15 @@ for (;;)
                c >= 0xe000;
           break;
 
+          case PT_BIDICL:
+          OK = UCD_BIDICLASS(c) == code[1 + IMM2_SIZE + 2];
+          break;
+
+          case PT_BOOL:
+          OK = MAPBIT(PRIV(ucd_boolprop_sets) +
+            UCD_BPROPS_PROP(prop), code[1 + IMM2_SIZE + 2]) != 0;
+          break;
+
           /* Should never occur, but keep compilers from grumbling. */
 
           default:
@@ -1958,26 +2092,16 @@ for (;;)
       count = current_state->count;  /* Number already matched */
       if (clen > 0)
         {
-        int lgb, rgb;
-        const pcre_uchar *nptr = ptr + clen;
+        PCRE2_SPTR nptr;
         int ncount = 0;
         if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO)
           {
           active_count--;           /* Remove non-match possibility */
           next_active_state--;
           }
-        lgb = UCD_GRAPHBREAK(c);
-        while (nptr < end_subject)
-          {
-          dlen = 1;
-          if (!utf) d = *nptr; else { GETCHARLEN(d, nptr, dlen); }
-          rgb = UCD_GRAPHBREAK(d);
-          if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-          ncount++;
-          lgb = rgb;
-          nptr += dlen;
-          }
-        if (nptr >= end_subject && (md->moptions & PCRE_PARTIAL_HARD) != 0)
+        nptr = PRIV(extuni)(c, ptr + clen, mb->start_subject, end_subject, utf,
+          &ncount);
+        if (nptr >= end_subject && (mb->moptions & PCRE2_PARTIAL_HARD) != 0)
             reset_could_continue = TRUE;
         if (++count >= (int)GET2(code, 1))
           { ADD_NEW_DATA(-(state_offset + 2 + IMM2_SIZE), 0, ncount); }
@@ -2007,7 +2131,7 @@ for (;;)
           case 0x2028:
           case 0x2029:
 #endif  /* Not EBCDIC */
-          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+          if (mb->bsr_convention == PCRE2_BSR_ANYCRLF) break;
           goto ANYNL03;
 
           case CHAR_CR:
@@ -2121,8 +2245,8 @@ for (;;)
       case OP_CHARI:
       if (clen == 0) break;
 
-#ifdef SUPPORT_UTF
-      if (utf)
+#ifdef SUPPORT_UNICODE
+      if (utf_or_ucp)
         {
         if (c == d) { ADD_NEW(state_offset + dlen + 1, 0); } else
           {
@@ -2130,20 +2254,13 @@ for (;;)
           if (c < 128)
             othercase = fcc[c];
           else
-            /* If we have Unicode property support, we can use it to test the
-            other case of the character. */
-#ifdef SUPPORT_UCP
             othercase = UCD_OTHERCASE(c);
-#else
-            othercase = NOTACHAR;
-#endif
-
           if (d == othercase) { ADD_NEW(state_offset + dlen + 1, 0); }
           }
         }
       else
-#endif  /* SUPPORT_UTF */
-      /* Not UTF mode */
+#endif  /* SUPPORT_UNICODE */
+      /* Not UTF or UCP mode */
         {
         if (TABLE_GET(c, lcc, c) == TABLE_GET(d, lcc, d))
           { ADD_NEW(state_offset + 2, 0); }
@@ -2151,7 +2268,7 @@ for (;;)
       break;
 
 
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
       /*-----------------------------------------------------------------*/
       /* This is a tricky one because it can match more than one character.
       Find out how many characters to skip, and then set up a negative state
@@ -2160,21 +2277,10 @@ for (;;)
       case OP_EXTUNI:
       if (clen > 0)
         {
-        int lgb, rgb;
-        const pcre_uchar *nptr = ptr + clen;
         int ncount = 0;
-        lgb = UCD_GRAPHBREAK(c);
-        while (nptr < end_subject)
-          {
-          dlen = 1;
-          if (!utf) d = *nptr; else { GETCHARLEN(d, nptr, dlen); }
-          rgb = UCD_GRAPHBREAK(d);
-          if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-          ncount++;
-          lgb = rgb;
-          nptr += dlen;
-          }
-        if (nptr >= end_subject && (md->moptions & PCRE_PARTIAL_HARD) != 0)
+        PCRE2_SPTR nptr = PRIV(extuni)(c, ptr + clen, mb->start_subject,
+          end_subject, utf, &ncount);
+        if (nptr >= end_subject && (mb->moptions & PCRE2_PARTIAL_HARD) != 0)
             reset_could_continue = TRUE;
         ADD_NEW_DATA(-(state_offset + 1), 0, ncount);
         }
@@ -2196,7 +2302,8 @@ for (;;)
         case 0x2028:
         case 0x2029:
 #endif  /* Not EBCDIC */
-        if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+        if (mb->bsr_convention == PCRE2_BSR_ANYCRLF) break;
+        /* Fall through */
 
         case CHAR_LF:
         ADD_NEW(state_offset + 1, 0);
@@ -2206,7 +2313,7 @@ for (;;)
         if (ptr + 1 >= end_subject)
           {
           ADD_NEW(state_offset + 1, 0);
-          if ((md->moptions & PCRE_PARTIAL_HARD) != 0)
+          if ((mb->moptions & PCRE2_PARTIAL_HARD) != 0)
             reset_could_continue = TRUE;
           }
         else if (UCHAR21TEST(ptr + 1) == CHAR_LF)
@@ -2286,18 +2393,12 @@ for (;;)
       case OP_NOTI:
       if (clen > 0)
         {
-        pcre_uint32 otherd;
-#ifdef SUPPORT_UTF
-        if (utf && d >= 128)
-          {
-#ifdef SUPPORT_UCP
+        uint32_t otherd;
+#ifdef SUPPORT_UNICODE
+        if (utf_or_ucp && d >= 128)
           otherd = UCD_OTHERCASE(d);
-#else
-          otherd = d;
-#endif  /* SUPPORT_UCP */
-          }
         else
-#endif  /* SUPPORT_UTF */
+#endif  /* SUPPORT_UNICODE */
         otherd = TABLE_GET(d, fcc, d);
         if (c != d && c != otherd)
           { ADD_NEW(state_offset + dlen + 1, 0); }
@@ -2325,18 +2426,14 @@ for (;;)
       if (count > 0) { ADD_ACTIVE(state_offset + dlen + 1, 0); }
       if (clen > 0)
         {
-        pcre_uint32 otherd = NOTACHAR;
+        uint32_t otherd = NOTACHAR;
         if (caseless)
           {
-#ifdef SUPPORT_UTF
-          if (utf && d >= 128)
-            {
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
+          if (utf_or_ucp && d >= 128)
             otherd = UCD_OTHERCASE(d);
-#endif  /* SUPPORT_UCP */
-            }
           else
-#endif  /* SUPPORT_UTF */
+#endif  /* SUPPORT_UNICODE */
           otherd = TABLE_GET(d, fcc, d);
           }
         if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
@@ -2372,18 +2469,14 @@ for (;;)
       ADD_ACTIVE(state_offset + dlen + 1, 0);
       if (clen > 0)
         {
-        pcre_uint32 otherd = NOTACHAR;
+        uint32_t otherd = NOTACHAR;
         if (caseless)
           {
-#ifdef SUPPORT_UTF
-          if (utf && d >= 128)
-            {
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
+          if (utf_or_ucp && d >= 128)
             otherd = UCD_OTHERCASE(d);
-#endif  /* SUPPORT_UCP */
-            }
           else
-#endif  /* SUPPORT_UTF */
+#endif  /* SUPPORT_UNICODE */
           otherd = TABLE_GET(d, fcc, d);
           }
         if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
@@ -2417,18 +2510,14 @@ for (;;)
       ADD_ACTIVE(state_offset + dlen + 1, 0);
       if (clen > 0)
         {
-        pcre_uint32 otherd = NOTACHAR;
+        uint32_t otherd = NOTACHAR;
         if (caseless)
           {
-#ifdef SUPPORT_UTF
-          if (utf && d >= 128)
-            {
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
+          if (utf_or_ucp && d >= 128)
             otherd = UCD_OTHERCASE(d);
-#endif  /* SUPPORT_UCP */
-            }
           else
-#endif  /* SUPPORT_UTF */
+#endif  /* SUPPORT_UNICODE */
           otherd = TABLE_GET(d, fcc, d);
           }
         if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
@@ -2454,18 +2543,14 @@ for (;;)
       count = current_state->count;  /* Number already matched */
       if (clen > 0)
         {
-        pcre_uint32 otherd = NOTACHAR;
+        uint32_t otherd = NOTACHAR;
         if (caseless)
           {
-#ifdef SUPPORT_UTF
-          if (utf && d >= 128)
-            {
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
+          if (utf_or_ucp && d >= 128)
             otherd = UCD_OTHERCASE(d);
-#endif  /* SUPPORT_UCP */
-            }
           else
-#endif  /* SUPPORT_UTF */
+#endif  /* SUPPORT_UNICODE */
           otherd = TABLE_GET(d, fcc, d);
           }
         if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
@@ -2498,18 +2583,14 @@ for (;;)
       count = current_state->count;  /* Number already matched */
       if (clen > 0)
         {
-        pcre_uint32 otherd = NOTACHAR;
+        uint32_t otherd = NOTACHAR;
         if (caseless)
           {
-#ifdef SUPPORT_UTF
-          if (utf && d >= 128)
-            {
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
+          if (utf_or_ucp && d >= 128)
             otherd = UCD_OTHERCASE(d);
-#endif  /* SUPPORT_UCP */
-            }
           else
-#endif  /* SUPPORT_UTF */
+#endif  /* SUPPORT_UNICODE */
           otherd = TABLE_GET(d, fcc, d);
           }
         if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
@@ -2537,18 +2618,18 @@ for (;;)
         {
         BOOL isinclass = FALSE;
         int next_state_offset;
-        const pcre_uchar *ecode;
+        PCRE2_SPTR ecode;
 
         /* For a simple class, there is always just a 32-byte table, and we
         can set isinclass from it. */
 
         if (codevalue != OP_XCLASS)
           {
-          ecode = code + 1 + (32 / sizeof(pcre_uchar));
+          ecode = code + 1 + (32 / sizeof(PCRE2_UCHAR));
           if (clen > 0)
             {
             isinclass = (c > 255)? (codevalue == OP_NCLASS) :
-              ((((pcre_uint8 *)(code + 1))[c/8] & (1 << (c&7))) != 0);
+              ((((uint8_t *)(code + 1))[c/8] & (1u << (c&7))) != 0);
             }
           }
 
@@ -2626,11 +2707,13 @@ for (;;)
           if (isinclass)
             {
             int max = (int)GET2(ecode, 1 + IMM2_SIZE);
+
             if (*ecode == OP_CRPOSRANGE && count >= (int)GET2(ecode, 1))
               {
               active_count--;           /* Remove non-match possibility */
               next_active_state--;
               }
+
             if (++count >= max && max != 0)   /* Max 0 => no limit */
               { ADD_NEW(next_state_offset + 1 + 2 * IMM2_SIZE, 0); }
             else
@@ -2661,24 +2744,39 @@ for (;;)
       case OP_ASSERTBACK_NOT:
         {
         int rc;
-        int local_offsets[2];
-        int local_workspace[1000];
-        const pcre_uchar *endasscode = code + GET(code, 1);
+        int *local_workspace;
+        PCRE2_SIZE *local_offsets;
+        PCRE2_SPTR endasscode = code + GET(code, 1);
+        RWS_anchor *rws = (RWS_anchor *)RWS;
+
+        if (rws->free < RWS_RSIZE + RWS_OVEC_OSIZE)
+          {
+          rc = more_workspace(&rws, RWS_OVEC_OSIZE, mb);
+          if (rc != 0) return rc;
+          RWS = (int *)rws;
+          }
+
+        local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free);
+        local_workspace = ((int *)local_offsets) + RWS_OVEC_OSIZE;
+        rws->free -= RWS_RSIZE + RWS_OVEC_OSIZE;
 
         while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);
 
-        rc = internal_dfa_exec(
-          md,                                   /* static match data */
+        rc = internal_dfa_match(
+          mb,                                   /* static match data */
           code,                                 /* this subexpression's code */
           ptr,                                  /* where we currently are */
-          (int)(ptr - start_subject),           /* start offset */
+          (PCRE2_SIZE)(ptr - start_subject),    /* start offset */
           local_offsets,                        /* offset vector */
-          sizeof(local_offsets)/sizeof(int),    /* size of same */
+          RWS_OVEC_OSIZE/OVEC_UNIT,             /* size of same */
           local_workspace,                      /* workspace vector */
-          sizeof(local_workspace)/sizeof(int),  /* size of same */
-          rlevel);                              /* function recursion level */
+          RWS_RSIZE,                            /* size of same */
+          rlevel,                               /* function recursion level */
+          RWS);                                 /* recursion workspace */
 
-        if (rc == PCRE_ERROR_DFA_UITEM) return rc;
+        rws->free += RWS_RSIZE + RWS_OVEC_OSIZE;
+
+        if (rc < 0 && rc != PCRE2_ERROR_NOMATCH) return rc;
         if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK))
             { ADD_ACTIVE((int)(endasscode + LINK_SIZE + 1 - start_code), 0); }
         }
@@ -2688,44 +2786,22 @@ for (;;)
       case OP_COND:
       case OP_SCOND:
         {
-        int local_offsets[1000];
-        int local_workspace[1000];
-        int codelink = GET(code, 1);
-        int condcode;
+        int codelink = (int)GET(code, 1);
+        PCRE2_UCHAR condcode;
 
         /* Because of the way auto-callout works during compile, a callout item
         is inserted between OP_COND and an assertion condition. This does not
         happen for the other conditions. */
 
-        if (code[LINK_SIZE+1] == OP_CALLOUT)
+        if (code[LINK_SIZE + 1] == OP_CALLOUT
+            || code[LINK_SIZE + 1] == OP_CALLOUT_STR)
           {
-          rrc = 0;
-          if (PUBL(callout) != NULL)
-            {
-            PUBL(callout_block) cb;
-            cb.version          = 1;   /* Version 1 of the callout block */
-            cb.callout_number   = code[LINK_SIZE+2];
-            cb.offset_vector    = offsets;
-#if defined COMPILE_PCRE8
-            cb.subject          = (PCRE_SPTR)start_subject;
-#elif defined COMPILE_PCRE16
-            cb.subject          = (PCRE_SPTR16)start_subject;
-#elif defined COMPILE_PCRE32
-            cb.subject          = (PCRE_SPTR32)start_subject;
-#endif
-            cb.subject_length   = (int)(end_subject - start_subject);
-            cb.start_match      = (int)(current_subject - start_subject);
-            cb.current_position = (int)(ptr - start_subject);
-            cb.pattern_position = GET(code, LINK_SIZE + 3);
-            cb.next_item_length = GET(code, 3 + 2*LINK_SIZE);
-            cb.capture_top      = 1;
-            cb.capture_last     = -1;
-            cb.callout_data     = md->callout_data;
-            cb.mark             = NULL;   /* No (*MARK) support */
-            if ((rrc = (*PUBL(callout))(&cb)) < 0) return rrc;   /* Abandon */
-            }
+          PCRE2_SIZE callout_length;
+          rrc = do_callout(code, offsets, current_subject, ptr, mb,
+            1 + LINK_SIZE, &callout_length);
+          if (rrc < 0) return rrc;                 /* Abandon */
           if (rrc > 0) break;                      /* Fail this thread */
-          code += PRIV(OP_lengths)[OP_CALLOUT];    /* Skip callout data */
+          code += callout_length;                  /* Skip callout data */
           }
 
         condcode = code[LINK_SIZE+1];
@@ -2735,23 +2811,28 @@ for (;;)
 
         if (condcode == OP_CREF || condcode == OP_DNCREF ||
             condcode == OP_DNRREF)
-          return PCRE_ERROR_DFA_UCOND;
+          return PCRE2_ERROR_DFA_UCOND;
 
         /* The DEFINE condition is always false, and the assertion (?!) is
         converted to OP_FAIL. */
 
-        if (condcode == OP_DEF || condcode == OP_FAIL)
+        if (condcode == OP_FALSE || condcode == OP_FAIL)
           { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
 
+        /* There is also an always-true condition */
+
+        else if (condcode == OP_TRUE)
+          { ADD_ACTIVE(state_offset + LINK_SIZE + 2, 0); }
+
         /* The only supported version of OP_RREF is for the value RREF_ANY,
         which means "test if in any recursion". We can't test for specifically
         recursed groups. */
 
         else if (condcode == OP_RREF)
           {
-          int value = GET2(code, LINK_SIZE + 2);
-          if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;
-          if (md->recursive != NULL)
+          unsigned int value = GET2(code, LINK_SIZE + 2);
+          if (value != RREF_ANY) return PCRE2_ERROR_DFA_UCOND;
+          if (mb->recursive != NULL)
             { ADD_ACTIVE(state_offset + LINK_SIZE + 2 + IMM2_SIZE, 0); }
           else { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
           }
@@ -2761,23 +2842,40 @@ for (;;)
         else
           {
           int rc;
-          const pcre_uchar *asscode = code + LINK_SIZE + 1;
-          const pcre_uchar *endasscode = asscode + GET(asscode, 1);
+          int *local_workspace;
+          PCRE2_SIZE *local_offsets;
+          PCRE2_SPTR asscode = code + LINK_SIZE + 1;
+          PCRE2_SPTR endasscode = asscode + GET(asscode, 1);
+          RWS_anchor *rws = (RWS_anchor *)RWS;
+
+          if (rws->free < RWS_RSIZE + RWS_OVEC_OSIZE)
+            {
+            rc = more_workspace(&rws, RWS_OVEC_OSIZE, mb);
+            if (rc != 0) return rc;
+            RWS = (int *)rws;
+            }
+
+          local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free);
+          local_workspace = ((int *)local_offsets) + RWS_OVEC_OSIZE;
+          rws->free -= RWS_RSIZE + RWS_OVEC_OSIZE;
 
           while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1);
 
-          rc = internal_dfa_exec(
-            md,                                   /* fixed match data */
+          rc = internal_dfa_match(
+            mb,                                   /* fixed match data */
             asscode,                              /* this subexpression's code */
             ptr,                                  /* where we currently are */
-            (int)(ptr - start_subject),           /* start offset */
+            (PCRE2_SIZE)(ptr - start_subject),    /* start offset */
             local_offsets,                        /* offset vector */
-            sizeof(local_offsets)/sizeof(int),    /* size of same */
+            RWS_OVEC_OSIZE/OVEC_UNIT,             /* size of same */
             local_workspace,                      /* workspace vector */
-            sizeof(local_workspace)/sizeof(int),  /* size of same */
-            rlevel);                              /* function recursion level */
+            RWS_RSIZE,                            /* size of same */
+            rlevel,                               /* function recursion level */
+            RWS);                                 /* recursion workspace */
 
-          if (rc == PCRE_ERROR_DFA_UITEM) return rc;
+          rws->free += RWS_RSIZE + RWS_OVEC_OSIZE;
+
+          if (rc < 0 && rc != PCRE2_ERROR_NOMATCH) return rc;
           if ((rc >= 0) ==
                 (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))
             { ADD_ACTIVE((int)(endasscode + LINK_SIZE + 1 - start_code), 0); }
@@ -2790,51 +2888,60 @@ for (;;)
       /*-----------------------------------------------------------------*/
       case OP_RECURSE:
         {
-        dfa_recursion_info *ri;
-        int local_offsets[1000];
-        int local_workspace[1000];
-        const pcre_uchar *callpat = start_code + GET(code, 1);
-        int recno = (callpat == md->start_code)? 0 :
-          GET2(callpat, 1 + LINK_SIZE);
         int rc;
+        int *local_workspace;
+        PCRE2_SIZE *local_offsets;
+        RWS_anchor *rws = (RWS_anchor *)RWS;
+        dfa_recursion_info *ri;
+        PCRE2_SPTR callpat = start_code + GET(code, 1);
+        uint32_t recno = (callpat == mb->start_code)? 0 :
+          GET2(callpat, 1 + LINK_SIZE);
 
-        DPRINTF(("%.*sStarting regex recursion\n", rlevel*2-2, SP));
+        if (rws->free < RWS_RSIZE + RWS_OVEC_RSIZE)
+          {
+          rc = more_workspace(&rws, RWS_OVEC_RSIZE, mb);
+          if (rc != 0) return rc;
+          RWS = (int *)rws;
+          }
+
+        local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free);
+        local_workspace = ((int *)local_offsets) + RWS_OVEC_RSIZE;
+        rws->free -= RWS_RSIZE + RWS_OVEC_RSIZE;
 
         /* Check for repeating a recursion without advancing the subject
         pointer. This should catch convoluted mutual recursions. (Some simple
         cases are caught at compile time.) */
 
-        for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
+        for (ri = mb->recursive; ri != NULL; ri = ri->prevrec)
           if (recno == ri->group_num && ptr == ri->subject_position)
-            return PCRE_ERROR_RECURSELOOP;
+            return PCRE2_ERROR_RECURSELOOP;
 
         /* Remember this recursion and where we started it so as to
         catch infinite loops. */
 
         new_recursive.group_num = recno;
         new_recursive.subject_position = ptr;
-        new_recursive.prevrec = md->recursive;
-        md->recursive = &new_recursive;
+        new_recursive.prevrec = mb->recursive;
+        mb->recursive = &new_recursive;
 
-        rc = internal_dfa_exec(
-          md,                                   /* fixed match data */
+        rc = internal_dfa_match(
+          mb,                                   /* fixed match data */
           callpat,                              /* this subexpression's code */
           ptr,                                  /* where we currently are */
-          (int)(ptr - start_subject),           /* start offset */
+          (PCRE2_SIZE)(ptr - start_subject),    /* start offset */
           local_offsets,                        /* offset vector */
-          sizeof(local_offsets)/sizeof(int),    /* size of same */
+          RWS_OVEC_RSIZE/OVEC_UNIT,             /* size of same */
           local_workspace,                      /* workspace vector */
-          sizeof(local_workspace)/sizeof(int),  /* size of same */
-          rlevel);                              /* function recursion level */
+          RWS_RSIZE,                            /* size of same */
+          rlevel,                               /* function recursion level */
+          RWS);                                 /* recursion workspace */
 
-        md->recursive = new_recursive.prevrec;  /* Done this recursion */
-
-        DPRINTF(("%.*sReturn from regex recursion: rc=%d\n", rlevel*2-2, SP,
-          rc));
+        rws->free += RWS_RSIZE + RWS_OVEC_RSIZE;
+        mb->recursive = new_recursive.prevrec;  /* Done this recursion */
 
         /* Ran out of internal offsets */
 
-        if (rc == 0) return PCRE_ERROR_DFA_RECURSE;
+        if (rc == 0) return PCRE2_ERROR_DFA_RECURSE;
 
         /* For each successful matched substring, set up the next state with a
         count of characters to skip before trying it. Note that the count is in
@@ -2844,18 +2951,19 @@ for (;;)
           {
           for (rc = rc*2 - 2; rc >= 0; rc -= 2)
             {
-            int charcount = local_offsets[rc+1] - local_offsets[rc];
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+            PCRE2_SIZE charcount = local_offsets[rc+1] - local_offsets[rc];
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
             if (utf)
               {
-              const pcre_uchar *p = start_subject + local_offsets[rc];
-              const pcre_uchar *pp = start_subject + local_offsets[rc+1];
-              while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
+              PCRE2_SPTR p = start_subject + local_offsets[rc];
+              PCRE2_SPTR pp = start_subject + local_offsets[rc+1];
+              while (p < pp) if (NOT_FIRSTCU(*p++)) charcount--;
               }
 #endif
             if (charcount > 0)
               {
-              ADD_NEW_DATA(-(state_offset + LINK_SIZE + 1), 0, (charcount - 1));
+              ADD_NEW_DATA(-(state_offset + LINK_SIZE + 1), 0,
+                (int)(charcount - 1));
               }
             else
               {
@@ -2863,7 +2971,7 @@ for (;;)
               }
             }
           }
-        else if (rc != PCRE_ERROR_NOMATCH) return rc;
+        else if (rc != PCRE2_ERROR_NOMATCH) return rc;
         }
       break;
 
@@ -2874,10 +2982,25 @@ for (;;)
       case OP_SCBRAPOS:
       case OP_BRAPOSZERO:
         {
-        int charcount, matched_count;
-        const pcre_uchar *local_ptr = ptr;
+        int rc;
+        int *local_workspace;
+        PCRE2_SIZE *local_offsets;
+        PCRE2_SIZE charcount, matched_count;
+        PCRE2_SPTR local_ptr = ptr;
+        RWS_anchor *rws = (RWS_anchor *)RWS;
         BOOL allow_zero;
 
+        if (rws->free < RWS_RSIZE + RWS_OVEC_OSIZE)
+          {
+          rc = more_workspace(&rws, RWS_OVEC_OSIZE, mb);
+          if (rc != 0) return rc;
+          RWS = (int *)rws;
+          }
+
+        local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free);
+        local_workspace = ((int *)local_offsets) + RWS_OVEC_OSIZE;
+        rws->free -= RWS_RSIZE + RWS_OVEC_OSIZE;
+
         if (codevalue == OP_BRAPOSZERO)
           {
           allow_zero = TRUE;
@@ -2890,25 +3013,23 @@ for (;;)
 
         for (matched_count = 0;; matched_count++)
           {
-          int local_offsets[2];
-          int local_workspace[1000];
-
-          int rc = internal_dfa_exec(
-            md,                                   /* fixed match data */
+          rc = internal_dfa_match(
+            mb,                                   /* fixed match data */
             code,                                 /* this subexpression's code */
             local_ptr,                            /* where we currently are */
-            (int)(ptr - start_subject),           /* start offset */
+            (PCRE2_SIZE)(ptr - start_subject),    /* start offset */
             local_offsets,                        /* offset vector */
-            sizeof(local_offsets)/sizeof(int),    /* size of same */
+            RWS_OVEC_OSIZE/OVEC_UNIT,             /* size of same */
             local_workspace,                      /* workspace vector */
-            sizeof(local_workspace)/sizeof(int),  /* size of same */
-            rlevel);                              /* function recursion level */
+            RWS_RSIZE,                            /* size of same */
+            rlevel,                               /* function recursion level */
+            RWS);                                 /* recursion workspace */
 
           /* Failed to match */
 
           if (rc < 0)
             {
-            if (rc != PCRE_ERROR_NOMATCH) return rc;
+            if (rc != PCRE2_ERROR_NOMATCH) return rc;
             break;
             }
 
@@ -2919,13 +3040,15 @@ for (;;)
           local_ptr += charcount;    /* Advance temporary position ptr */
           }
 
+        rws->free += RWS_RSIZE + RWS_OVEC_OSIZE;
+
         /* At this point we have matched the subpattern matched_count
         times, and local_ptr is pointing to the character after the end of the
         last match. */
 
         if (matched_count > 0 || allow_zero)
           {
-          const pcre_uchar *end_subpattern = code;
+          PCRE2_SPTR end_subpattern = code;
           int next_state_offset;
 
           do { end_subpattern += GET(end_subpattern, 1); }
@@ -2946,13 +3069,13 @@ for (;;)
             }
           else
             {
-            const pcre_uchar *p = ptr;
-            const pcre_uchar *pp = local_ptr;
-            charcount = (int)(pp - p);
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-            if (utf) while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
+            PCRE2_SPTR p = ptr;
+            PCRE2_SPTR pp = local_ptr;
+            charcount = (PCRE2_SIZE)(pp - p);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+            if (utf) while (p < pp) if (NOT_FIRSTCU(*p++)) charcount--;
 #endif
-            ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));
+            ADD_NEW_DATA(-next_state_offset, 0, (int)(charcount - 1));
             }
           }
         }
@@ -2960,26 +3083,41 @@ for (;;)
 
       /*-----------------------------------------------------------------*/
       case OP_ONCE:
-      case OP_ONCE_NC:
         {
-        int local_offsets[2];
-        int local_workspace[1000];
+        int rc;
+        int *local_workspace;
+        PCRE2_SIZE *local_offsets;
+        RWS_anchor *rws = (RWS_anchor *)RWS;
 
-        int rc = internal_dfa_exec(
-          md,                                   /* fixed match data */
+        if (rws->free < RWS_RSIZE + RWS_OVEC_OSIZE)
+          {
+          rc = more_workspace(&rws, RWS_OVEC_OSIZE, mb);
+          if (rc != 0) return rc;
+          RWS = (int *)rws;
+          }
+
+        local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free);
+        local_workspace = ((int *)local_offsets) + RWS_OVEC_OSIZE;
+        rws->free -= RWS_RSIZE + RWS_OVEC_OSIZE;
+
+        rc = internal_dfa_match(
+          mb,                                   /* fixed match data */
           code,                                 /* this subexpression's code */
           ptr,                                  /* where we currently are */
-          (int)(ptr - start_subject),           /* start offset */
+          (PCRE2_SIZE)(ptr - start_subject),    /* start offset */
           local_offsets,                        /* offset vector */
-          sizeof(local_offsets)/sizeof(int),    /* size of same */
+          RWS_OVEC_OSIZE/OVEC_UNIT,             /* size of same */
           local_workspace,                      /* workspace vector */
-          sizeof(local_workspace)/sizeof(int),  /* size of same */
-          rlevel);                              /* function recursion level */
+          RWS_RSIZE,                            /* size of same */
+          rlevel,                               /* function recursion level */
+          RWS);                                 /* recursion workspace */
+
+        rws->free += RWS_RSIZE + RWS_OVEC_OSIZE;
 
         if (rc >= 0)
           {
-          const pcre_uchar *end_subpattern = code;
-          int charcount = local_offsets[1] - local_offsets[0];
+          PCRE2_SPTR end_subpattern = code;
+          PCRE2_SIZE charcount = local_offsets[1] - local_offsets[0];
           int next_state_offset, repeat_state_offset;
 
           do { end_subpattern += GET(end_subpattern, 1); }
@@ -3031,20 +3169,20 @@ for (;;)
             }
           else
             {
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
             if (utf)
               {
-              const pcre_uchar *p = start_subject + local_offsets[0];
-              const pcre_uchar *pp = start_subject + local_offsets[1];
-              while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
+              PCRE2_SPTR p = start_subject + local_offsets[0];
+              PCRE2_SPTR pp = start_subject + local_offsets[1];
+              while (p < pp) if (NOT_FIRSTCU(*p++)) charcount--;
               }
 #endif
-            ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));
+            ADD_NEW_DATA(-next_state_offset, 0, (int)(charcount - 1));
             if (repeat_state_offset >= 0)
-              { ADD_NEW_DATA(-repeat_state_offset, 0, (charcount - 1)); }
+              { ADD_NEW_DATA(-repeat_state_offset, 0, (int)(charcount - 1)); }
             }
           }
-        else if (rc != PCRE_ERROR_NOMATCH) return rc;
+        else if (rc != PCRE2_ERROR_NOMATCH) return rc;
         }
       break;
 
@@ -3053,39 +3191,21 @@ for (;;)
       /* Handle callouts */
 
       case OP_CALLOUT:
-      rrc = 0;
-      if (PUBL(callout) != NULL)
+      case OP_CALLOUT_STR:
         {
-        PUBL(callout_block) cb;
-        cb.version          = 1;   /* Version 1 of the callout block */
-        cb.callout_number   = code[1];
-        cb.offset_vector    = offsets;
-#if defined COMPILE_PCRE8
-        cb.subject          = (PCRE_SPTR)start_subject;
-#elif defined COMPILE_PCRE16
-        cb.subject          = (PCRE_SPTR16)start_subject;
-#elif defined COMPILE_PCRE32
-        cb.subject          = (PCRE_SPTR32)start_subject;
-#endif
-        cb.subject_length   = (int)(end_subject - start_subject);
-        cb.start_match      = (int)(current_subject - start_subject);
-        cb.current_position = (int)(ptr - start_subject);
-        cb.pattern_position = GET(code, 2);
-        cb.next_item_length = GET(code, 2 + LINK_SIZE);
-        cb.capture_top      = 1;
-        cb.capture_last     = -1;
-        cb.callout_data     = md->callout_data;
-        cb.mark             = NULL;   /* No (*MARK) support */
-        if ((rrc = (*PUBL(callout))(&cb)) < 0) return rrc;   /* Abandon */
+        PCRE2_SIZE callout_length;
+        rrc = do_callout(code, offsets, current_subject, ptr, mb, 0,
+          &callout_length);
+        if (rrc < 0) return rrc;   /* Abandon */
+        if (rrc == 0)
+          { ADD_ACTIVE(state_offset + (int)callout_length, 0); }
         }
-      if (rrc == 0)
-        { ADD_ACTIVE(state_offset + PRIV(OP_lengths)[OP_CALLOUT], 0); }
       break;
 
 
 /* ========================================================================== */
       default:        /* Unsupported opcode */
-      return PCRE_ERROR_DFA_UITEM;
+      return PCRE2_ERROR_DFA_UITEM;
       }
 
     NEXT_ACTIVE_STATE: continue;
@@ -3094,8 +3214,8 @@ for (;;)
 
   /* We have finished the processing at the current subject character. If no
   new states have been set for the next character, we have found all the
-  matches that we are going to find. If we are at the top level and partial
-  matching has been requested, check for appropriate conditions.
+  matches that we are going to find. If partial matching has been requested,
+  check for appropriate conditions.
 
   The "forced_ fail" variable counts the number of (*F) encountered for the
   character. If it is equal to the original active_count (saved in
@@ -3107,27 +3227,26 @@ for (;;)
 
   if (new_count <= 0)
     {
-    if (rlevel == 1 &&                               /* Top level, and */
-        could_continue &&                            /* Some could go on, and */
+    if (could_continue &&                            /* Some could go on, and */
         forced_fail != workspace[1] &&               /* Not all forced fail & */
         (                                            /* either... */
-        (md->moptions & PCRE_PARTIAL_HARD) != 0      /* Hard partial */
+        (mb->moptions & PCRE2_PARTIAL_HARD) != 0      /* Hard partial */
         ||                                           /* or... */
-        ((md->moptions & PCRE_PARTIAL_SOFT) != 0 &&  /* Soft partial and */
-         match_count < 0)                            /* no matches */
+        ((mb->moptions & PCRE2_PARTIAL_SOFT) != 0 &&  /* Soft partial and */
+         match_count < 0)                             /* no matches */
         ) &&                                         /* And... */
         (
-        partial_newline ||                           /* Either partial NL */
-          (                                          /* or ... */
-          ptr >= end_subject &&                /* End of subject and */
-          ptr > md->start_used_ptr)            /* Inspected non-empty string */
+        partial_newline ||                   /* Either partial NL */
+          (                                  /* or ... */
+          ptr >= end_subject &&              /* End of subject and */
+            (                                  /* either */
+            ptr > mb->start_used_ptr ||        /* Inspected non-empty string */
+            mb->allowemptypartial              /* or pattern has lookbehind */
+            )                                  /* or could match empty */
           )
-        )
-      match_count = PCRE_ERROR_PARTIAL;
-    DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"
-      "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel, match_count,
-      rlevel*2-2, SP));
-    break;        /* In effect, "return", but see the comment below */
+        ))
+      match_count = PCRE2_ERROR_PARTIAL;
+    break;  /* Exit from loop along the subject string */
     }
 
   /* One or more states are active for the next character. */
@@ -3135,295 +3254,388 @@ for (;;)
   ptr += clen;    /* Advance to next subject character */
   }               /* Loop to move along the subject string */
 
-/* Control gets here from "break" a few lines above. We do it this way because
-if we use "return" above, we have compiler trouble. Some compilers warn if
-there's nothing here because they think the function doesn't return a value. On
-the other hand, if we put a dummy statement here, some more clever compilers
-complain that it can't be reached. Sigh. */
+/* Control gets here from "break" a few lines above. If we have a match and
+PCRE2_ENDANCHORED is set, the match fails. */
+
+if (match_count >= 0 &&
+    ((mb->moptions | mb->poptions) & PCRE2_ENDANCHORED) != 0 &&
+    ptr < end_subject)
+  match_count = PCRE2_ERROR_NOMATCH;
 
 return match_count;
 }
 
 
 
-
 /*************************************************
-*    Execute a Regular Expression - DFA engine   *
+*     Match a pattern using the DFA algorithm    *
 *************************************************/
 
-/* This external function applies a compiled re to a subject string using a DFA
-engine. This function calls the internal function multiple times if the pattern
-is not anchored.
+/* This function matches a compiled pattern to a subject string, using the
+alternate matching algorithm that finds all matches at once.
 
 Arguments:
-  argument_re     points to the compiled expression
-  extra_data      points to extra data or is NULL
-  subject         points to the subject string
-  length          length of subject string (may contain binary zeros)
-  start_offset    where to start in the subject string
-  options         option bits
-  offsets         vector of match offsets
-  offsetcount     size of same
-  workspace       workspace vector
-  wscount         size of same
+  code          points to the compiled pattern
+  subject       subject string
+  length        length of subject string
+  startoffset   where to start matching in the subject
+  options       option bits
+  match_data    points to a match data structure
+  gcontext      points to a match context
+  workspace     pointer to workspace
+  wscount       size of workspace
 
-Returns:          > 0 => number of match offset pairs placed in offsets
-                  = 0 => offsets overflowed; longest matches are present
-                   -1 => failed to match
-                 < -1 => some kind of unexpected problem
+Returns:        > 0 => number of match offset pairs placed in offsets
+                = 0 => offsets overflowed; longest matches are present
+                 -1 => failed to match
+               < -1 => some kind of unexpected problem
 */
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,
-  const char *subject, int length, int start_offset, int options, int *offsets,
-  int offsetcount, int *workspace, int wscount)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_dfa_exec(const pcre16 *argument_re, const pcre16_extra *extra_data,
-  PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets,
-  int offsetcount, int *workspace, int wscount)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_dfa_exec(const pcre32 *argument_re, const pcre32_extra *extra_data,
-  PCRE_SPTR32 subject, int length, int start_offset, int options, int *offsets,
-  int offsetcount, int *workspace, int wscount)
-#endif
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_dfa_match(const pcre2_code *code, PCRE2_SPTR subject, PCRE2_SIZE length,
+  PCRE2_SIZE start_offset, uint32_t options, pcre2_match_data *match_data,
+  pcre2_match_context *mcontext, int *workspace, PCRE2_SIZE wscount)
 {
-REAL_PCRE *re = (REAL_PCRE *)argument_re;
-dfa_match_data match_block;
-dfa_match_data *md = &match_block;
-BOOL utf, anchored, startline, firstline;
-const pcre_uchar *current_subject, *end_subject;
-const pcre_study_data *study = NULL;
+int rc;
+int was_zero_terminated = 0;
 
-const pcre_uchar *req_char_ptr;
-const pcre_uint8 *start_bits = NULL;
-BOOL has_first_char = FALSE;
-BOOL has_req_char = FALSE;
-pcre_uchar first_char = 0;
-pcre_uchar first_char2 = 0;
-pcre_uchar req_char = 0;
-pcre_uchar req_char2 = 0;
-int newline;
+const pcre2_real_code *re = (const pcre2_real_code *)code;
+
+PCRE2_SPTR start_match;
+PCRE2_SPTR end_subject;
+PCRE2_SPTR bumpalong_limit;
+PCRE2_SPTR req_cu_ptr;
+
+BOOL utf, anchored, startline, firstline;
+BOOL has_first_cu = FALSE;
+BOOL has_req_cu = FALSE;
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+PCRE2_SPTR memchr_found_first_cu = NULL;
+PCRE2_SPTR memchr_found_first_cu2 = NULL;
+#endif
+
+PCRE2_UCHAR first_cu = 0;
+PCRE2_UCHAR first_cu2 = 0;
+PCRE2_UCHAR req_cu = 0;
+PCRE2_UCHAR req_cu2 = 0;
+
+const uint8_t *start_bits = NULL;
+
+/* We need to have mb pointing to a match block, because the IS_NEWLINE macro
+is used below, and it expects NLBLOCK to be defined as a pointer. */
+
+pcre2_callout_block cb;
+dfa_match_block actual_match_block;
+dfa_match_block *mb = &actual_match_block;
+
+/* Set up a starting block of memory for use during recursive calls to
+internal_dfa_match(). By putting this on the stack, it minimizes resource use
+in the case when it is not needed. If this is too small, more memory is
+obtained from the heap. At the start of each block is an anchor structure.*/
+
+int base_recursion_workspace[RWS_BASE_SIZE];
+RWS_anchor *rws = (RWS_anchor *)base_recursion_workspace;
+rws->next = NULL;
+rws->size = RWS_BASE_SIZE;
+rws->free = RWS_BASE_SIZE - RWS_ANCHOR_SIZE;
+
+/* Recognize NULL, length 0 as an empty string. */
+
+if (subject == NULL && length == 0) subject = (PCRE2_SPTR)"";
 
 /* Plausibility checks */
 
-if ((options & ~PUBLIC_DFA_EXEC_OPTIONS) != 0) return PCRE_ERROR_BADOPTION;
-if (re == NULL || subject == NULL || workspace == NULL ||
-   (offsets == NULL && offsetcount > 0)) return PCRE_ERROR_NULL;
-if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;
-if (wscount < 20) return PCRE_ERROR_DFA_WSSIZE;
-if (length < 0) return PCRE_ERROR_BADLENGTH;
-if (start_offset < 0 || start_offset > length) return PCRE_ERROR_BADOFFSET;
+if ((options & ~PUBLIC_DFA_MATCH_OPTIONS) != 0) return PCRE2_ERROR_BADOPTION;
+if (re == NULL || subject == NULL || workspace == NULL || match_data == NULL)
+  return PCRE2_ERROR_NULL;
+
+if (length == PCRE2_ZERO_TERMINATED)
+  {
+  length = PRIV(strlen)(subject);
+  was_zero_terminated = 1;
+  }
+
+if (wscount < 20) return PCRE2_ERROR_DFA_WSSIZE;
+if (start_offset > length) return PCRE2_ERROR_BADOFFSET;
+
+/* Partial matching and PCRE2_ENDANCHORED are currently not allowed at the same
+time. */
+
+if ((options & (PCRE2_PARTIAL_HARD|PCRE2_PARTIAL_SOFT)) != 0 &&
+   ((re->overall_options | options) & PCRE2_ENDANCHORED) != 0)
+  return PCRE2_ERROR_BADOPTION;
+
+/* Invalid UTF support is not available for DFA matching. */
+
+if ((re->overall_options & PCRE2_MATCH_INVALID_UTF) != 0)
+  return PCRE2_ERROR_DFA_UINVALID_UTF;
 
 /* Check that the first field in the block is the magic number. If it is not,
-return with PCRE_ERROR_BADMAGIC. However, if the magic number is equal to
-REVERSED_MAGIC_NUMBER we return with PCRE_ERROR_BADENDIANNESS, which
-means that the pattern is likely compiled with different endianness. */
+return with PCRE2_ERROR_BADMAGIC. */
 
-if (re->magic_number != MAGIC_NUMBER)
-  return re->magic_number == REVERSED_MAGIC_NUMBER?
-    PCRE_ERROR_BADENDIANNESS:PCRE_ERROR_BADMAGIC;
-if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
+if (re->magic_number != MAGIC_NUMBER) return PCRE2_ERROR_BADMAGIC;
+
+/* Check the code unit width. */
+
+if ((re->flags & PCRE2_MODE_MASK) != PCRE2_CODE_UNIT_WIDTH/8)
+  return PCRE2_ERROR_BADMODE;
+
+/* PCRE2_NOTEMPTY and PCRE2_NOTEMPTY_ATSTART are match-time flags in the
+options variable for this function. Users of PCRE2 who are not calling the
+function directly would like to have a way of setting these flags, in the same
+way that they can set pcre2_compile() flags like PCRE2_NO_AUTOPOSSESS with
+constructions like (*NO_AUTOPOSSESS). To enable this, (*NOTEMPTY) and
+(*NOTEMPTY_ATSTART) set bits in the pattern's "flag" function which can now be
+transferred to the options for this function. The bits are guaranteed to be
+adjacent, but do not have the same values. This bit of Boolean trickery assumes
+that the match-time bits are not more significant than the flag bits. If by
+accident this is not the case, a compile-time division by zero error will
+occur. */
+
+#define FF (PCRE2_NOTEMPTY_SET|PCRE2_NE_ATST_SET)
+#define OO (PCRE2_NOTEMPTY|PCRE2_NOTEMPTY_ATSTART)
+options |= (re->flags & FF) / ((FF & (~FF+1)) / (OO & (~OO+1)));
+#undef FF
+#undef OO
 
 /* If restarting after a partial match, do some sanity checks on the contents
 of the workspace. */
 
-if ((options & PCRE_DFA_RESTART) != 0)
+if ((options & PCRE2_DFA_RESTART) != 0)
   {
   if ((workspace[0] & (-2)) != 0 || workspace[1] < 1 ||
-    workspace[1] > (wscount - 2)/INTS_PER_STATEBLOCK)
-      return PCRE_ERROR_DFA_BADRESTART;
-  }
-
-/* Set up study, callout, and table data */
-
-md->tables = re->tables;
-md->callout_data = NULL;
-
-if (extra_data != NULL)
-  {
-  unsigned long int flags = extra_data->flags;
-  if ((flags & PCRE_EXTRA_STUDY_DATA) != 0)
-    study = (const pcre_study_data *)extra_data->study_data;
-  if ((flags & PCRE_EXTRA_MATCH_LIMIT) != 0) return PCRE_ERROR_DFA_UMLIMIT;
-  if ((flags & PCRE_EXTRA_MATCH_LIMIT_RECURSION) != 0)
-    return PCRE_ERROR_DFA_UMLIMIT;
-  if ((flags & PCRE_EXTRA_CALLOUT_DATA) != 0)
-    md->callout_data = extra_data->callout_data;
-  if ((flags & PCRE_EXTRA_TABLES) != 0)
-    md->tables = extra_data->tables;
+    workspace[1] > (int)((wscount - 2)/INTS_PER_STATEBLOCK))
+      return PCRE2_ERROR_DFA_BADRESTART;
   }
 
 /* Set some local values */
 
-current_subject = (const pcre_uchar *)subject + start_offset;
-end_subject = (const pcre_uchar *)subject + length;
-req_char_ptr = current_subject - 1;
-
-#ifdef SUPPORT_UTF
-/* PCRE_UTF(16|32) have the same value as PCRE_UTF8. */
-utf = (re->options & PCRE_UTF8) != 0;
-#else
-utf = FALSE;
-#endif
-
-anchored = (options & (PCRE_ANCHORED|PCRE_DFA_RESTART)) != 0 ||
-  (re->options & PCRE_ANCHORED) != 0;
-
-/* The remaining fixed data for passing around. */
-
-md->start_code = (const pcre_uchar *)argument_re +
-    re->name_table_offset + re->name_count * re->name_entry_size;
-md->start_subject = (const pcre_uchar *)subject;
-md->end_subject = end_subject;
-md->start_offset = start_offset;
-md->moptions = options;
-md->poptions = re->options;
-
-/* If the BSR option is not set at match time, copy what was set
-at compile time. */
-
-if ((md->moptions & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) == 0)
-  {
-  if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
-    md->moptions |= re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE);
-#ifdef BSR_ANYCRLF
-  else md->moptions |= PCRE_BSR_ANYCRLF;
-#endif
-  }
-
-/* Handle different types of newline. The three bits give eight cases. If
-nothing is set at run time, whatever was used at compile time applies. */
-
-switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options : (pcre_uint32)options) &
-         PCRE_NEWLINE_BITS)
-  {
-  case 0: newline = NEWLINE; break;   /* Compile-time default */
-  case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
-  case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
-  case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
-  case PCRE_NEWLINE_ANY: newline = -1; break;
-  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
-  default: return PCRE_ERROR_BADNEWLINE;
-  }
-
-if (newline == -2)
-  {
-  md->nltype = NLTYPE_ANYCRLF;
-  }
-else if (newline < 0)
-  {
-  md->nltype = NLTYPE_ANY;
-  }
-else
-  {
-  md->nltype = NLTYPE_FIXED;
-  if (newline > 255)
-    {
-    md->nllen = 2;
-    md->nl[0] = (newline >> 8) & 255;
-    md->nl[1] = newline & 255;
-    }
-  else
-    {
-    md->nllen = 1;
-    md->nl[0] = newline;
-    }
-  }
-
-/* Check a UTF-8 string if required. Unfortunately there's no way of passing
-back the character offset. */
-
-#ifdef SUPPORT_UTF
-if (utf && (options & PCRE_NO_UTF8_CHECK) == 0)
-  {
-  int erroroffset;
-  int errorcode = PRIV(valid_utf)((pcre_uchar *)subject, length, &erroroffset);
-  if (errorcode != 0)
-    {
-    if (offsetcount >= 2)
-      {
-      offsets[0] = erroroffset;
-      offsets[1] = errorcode;
-      }
-#if defined COMPILE_PCRE8
-    return (errorcode <= PCRE_UTF8_ERR5 && (options & PCRE_PARTIAL_HARD) != 0) ?
-      PCRE_ERROR_SHORTUTF8 : PCRE_ERROR_BADUTF8;
-#elif defined COMPILE_PCRE16
-    return (errorcode <= PCRE_UTF16_ERR1 && (options & PCRE_PARTIAL_HARD) != 0) ?
-      PCRE_ERROR_SHORTUTF16 : PCRE_ERROR_BADUTF16;
-#elif defined COMPILE_PCRE32
-    return PCRE_ERROR_BADUTF32;
-#endif
-    }
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-  if (start_offset > 0 && start_offset < length &&
-        NOT_FIRSTCHAR(((PCRE_PUCHAR)subject)[start_offset]))
-    return PCRE_ERROR_BADUTF8_OFFSET;
-#endif
-  }
-#endif
-
-/* If the exec call supplied NULL for tables, use the inbuilt ones. This
-is a feature that makes it possible to save compiled regex and re-use them
-in other programs later. */
-
-if (md->tables == NULL) md->tables = PRIV(default_tables);
+utf = (re->overall_options & PCRE2_UTF) != 0;
+start_match = subject + start_offset;
+end_subject = subject + length;
+req_cu_ptr = start_match - 1;
+anchored = (options & (PCRE2_ANCHORED|PCRE2_DFA_RESTART)) != 0 ||
+  (re->overall_options & PCRE2_ANCHORED) != 0;
 
 /* The "must be at the start of a line" flags are used in a loop when finding
 where to start. */
 
-startline = (re->flags & PCRE_STARTLINE) != 0;
-firstline = (re->options & PCRE_FIRSTLINE) != 0;
+startline = (re->flags & PCRE2_STARTLINE) != 0;
+firstline = (re->overall_options & PCRE2_FIRSTLINE) != 0;
+bumpalong_limit = end_subject;
 
-/* Set up the first character to match, if available. The first_byte value is
-never set for an anchored regular expression, but the anchoring may be forced
-at run time, so we have to test for anchoring. The first char may be unset for
-an unanchored pattern, of course. If there's no first char and the pattern was
-studied, there may be a bitmap of possible first characters. */
+/* Initialize and set up the fixed fields in the callout block, with a pointer
+in the match block. */
 
-if (!anchored)
+mb->cb = &cb;
+cb.version = 2;
+cb.subject = subject;
+cb.subject_length = (PCRE2_SIZE)(end_subject - subject);
+cb.callout_flags = 0;
+cb.capture_top      = 1;      /* No capture support */
+cb.capture_last     = 0;
+cb.mark             = NULL;   /* No (*MARK) support */
+
+/* Get data from the match context, if present, and fill in the remaining
+fields in the match block. It is an error to set an offset limit without
+setting the flag at compile time. */
+
+if (mcontext == NULL)
   {
-  if ((re->flags & PCRE_FIRSTSET) != 0)
+  mb->callout = NULL;
+  mb->memctl = re->memctl;
+  mb->match_limit = PRIV(default_match_context).match_limit;
+  mb->match_limit_depth = PRIV(default_match_context).depth_limit;
+  mb->heap_limit = PRIV(default_match_context).heap_limit;
+  }
+else
+  {
+  if (mcontext->offset_limit != PCRE2_UNSET)
     {
-    has_first_char = TRUE;
-    first_char = first_char2 = (pcre_uchar)(re->first_char);
-    if ((re->flags & PCRE_FCH_CASELESS) != 0)
+    if ((re->overall_options & PCRE2_USE_OFFSET_LIMIT) == 0)
+      return PCRE2_ERROR_BADOFFSETLIMIT;
+    bumpalong_limit = subject + mcontext->offset_limit;
+    }
+  mb->callout = mcontext->callout;
+  mb->callout_data = mcontext->callout_data;
+  mb->memctl = mcontext->memctl;
+  mb->match_limit = mcontext->match_limit;
+  mb->match_limit_depth = mcontext->depth_limit;
+  mb->heap_limit = mcontext->heap_limit;
+  }
+
+if (mb->match_limit > re->limit_match)
+  mb->match_limit = re->limit_match;
+
+if (mb->match_limit_depth > re->limit_depth)
+  mb->match_limit_depth = re->limit_depth;
+
+if (mb->heap_limit > re->limit_heap)
+  mb->heap_limit = re->limit_heap;
+
+mb->start_code = (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code)) +
+  re->name_count * re->name_entry_size;
+mb->tables = re->tables;
+mb->start_subject = subject;
+mb->end_subject = end_subject;
+mb->start_offset = start_offset;
+mb->allowemptypartial = (re->max_lookbehind > 0) ||
+  (re->flags & PCRE2_MATCH_EMPTY) != 0;
+mb->moptions = options;
+mb->poptions = re->overall_options;
+mb->match_call_count = 0;
+mb->heap_used = 0;
+
+/* Process the \R and newline settings. */
+
+mb->bsr_convention = re->bsr_convention;
+mb->nltype = NLTYPE_FIXED;
+switch(re->newline_convention)
+  {
+  case PCRE2_NEWLINE_CR:
+  mb->nllen = 1;
+  mb->nl[0] = CHAR_CR;
+  break;
+
+  case PCRE2_NEWLINE_LF:
+  mb->nllen = 1;
+  mb->nl[0] = CHAR_NL;
+  break;
+
+  case PCRE2_NEWLINE_NUL:
+  mb->nllen = 1;
+  mb->nl[0] = CHAR_NUL;
+  break;
+
+  case PCRE2_NEWLINE_CRLF:
+  mb->nllen = 2;
+  mb->nl[0] = CHAR_CR;
+  mb->nl[1] = CHAR_NL;
+  break;
+
+  case PCRE2_NEWLINE_ANY:
+  mb->nltype = NLTYPE_ANY;
+  break;
+
+  case PCRE2_NEWLINE_ANYCRLF:
+  mb->nltype = NLTYPE_ANYCRLF;
+  break;
+
+  default: return PCRE2_ERROR_INTERNAL;
+  }
+
+/* Check a UTF string for validity if required. For 8-bit and 16-bit strings,
+we must also check that a starting offset does not point into the middle of a
+multiunit character. We check only the portion of the subject that is going to
+be inspected during matching - from the offset minus the maximum back reference
+to the given length. This saves time when a small part of a large subject is
+being matched by the use of a starting offset. Note that the maximum lookbehind
+is a number of characters, not code units. */
+
+#ifdef SUPPORT_UNICODE
+if (utf && (options & PCRE2_NO_UTF_CHECK) == 0)
+  {
+  PCRE2_SPTR check_subject = start_match;  /* start_match includes offset */
+
+  if (start_offset > 0)
+    {
+#if PCRE2_CODE_UNIT_WIDTH != 32
+    unsigned int i;
+    if (start_match < end_subject && NOT_FIRSTCU(*start_match))
+      return PCRE2_ERROR_BADUTFOFFSET;
+    for (i = re->max_lookbehind; i > 0 && check_subject > subject; i--)
       {
-      first_char2 = TABLE_GET(first_char, md->tables + fcc_offset, first_char);
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-      if (utf && first_char > 127)
-        first_char2 = UCD_OTHERCASE(first_char);
-#endif
+      check_subject--;
+      while (check_subject > subject &&
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      (*check_subject & 0xc0) == 0x80)
+#else  /* 16-bit */
+      (*check_subject & 0xfc00) == 0xdc00)
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
+        check_subject--;
       }
+#else   /* In the 32-bit library, one code unit equals one character. */
+    check_subject -= re->max_lookbehind;
+    if (check_subject < subject) check_subject = subject;
+#endif  /* PCRE2_CODE_UNIT_WIDTH != 32 */
     }
-  else
+
+  /* Validate the relevant portion of the subject. After an error, adjust the
+  offset to be an absolute offset in the whole string. */
+
+  match_data->rc = PRIV(valid_utf)(check_subject,
+    length - (PCRE2_SIZE)(check_subject - subject), &(match_data->startchar));
+  if (match_data->rc != 0)
     {
-    if (!startline && study != NULL &&
-         (study->flags & PCRE_STUDY_MAPPED) != 0)
-      start_bits = study->start_bits;
+    match_data->startchar += (PCRE2_SIZE)(check_subject - subject);
+    return match_data->rc;
     }
   }
+#endif  /* SUPPORT_UNICODE */
 
-/* For anchored or unanchored matches, there may be a "last known required
-character" set. */
+/* Set up the first code unit to match, if available. If there's no first code
+unit there may be a bitmap of possible first characters. */
 
-if ((re->flags & PCRE_REQCHSET) != 0)
+if ((re->flags & PCRE2_FIRSTSET) != 0)
   {
-  has_req_char = TRUE;
-  req_char = req_char2 = (pcre_uchar)(re->req_char);
-  if ((re->flags & PCRE_RCH_CASELESS) != 0)
+  has_first_cu = TRUE;
+  first_cu = first_cu2 = (PCRE2_UCHAR)(re->first_codeunit);
+  if ((re->flags & PCRE2_FIRSTCASELESS) != 0)
     {
-    req_char2 = TABLE_GET(req_char, md->tables + fcc_offset, req_char);
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-    if (utf && req_char > 127)
-      req_char2 = UCD_OTHERCASE(req_char);
+    first_cu2 = TABLE_GET(first_cu, mb->tables + fcc_offset, first_cu);
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    if (first_cu > 127 && !utf && (re->overall_options & PCRE2_UCP) != 0)
+      first_cu2 = (PCRE2_UCHAR)UCD_OTHERCASE(first_cu);
+#else
+    if (first_cu > 127 && (utf || (re->overall_options & PCRE2_UCP) != 0))
+      first_cu2 = (PCRE2_UCHAR)UCD_OTHERCASE(first_cu);
 #endif
+#endif  /* SUPPORT_UNICODE */
     }
   }
+else
+  if (!startline && (re->flags & PCRE2_FIRSTMAPSET) != 0)
+    start_bits = re->start_bitmap;
+
+/* There may be a "last known required code unit" set. */
+
+if ((re->flags & PCRE2_LASTSET) != 0)
+  {
+  has_req_cu = TRUE;
+  req_cu = req_cu2 = (PCRE2_UCHAR)(re->last_codeunit);
+  if ((re->flags & PCRE2_LASTCASELESS) != 0)
+    {
+    req_cu2 = TABLE_GET(req_cu, mb->tables + fcc_offset, req_cu);
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    if (req_cu > 127 && !utf && (re->overall_options & PCRE2_UCP) != 0)
+      req_cu2 = (PCRE2_UCHAR)UCD_OTHERCASE(req_cu);
+#else
+    if (req_cu > 127 && (utf || (re->overall_options & PCRE2_UCP) != 0))
+      req_cu2 = (PCRE2_UCHAR)UCD_OTHERCASE(req_cu);
+#endif
+#endif  /* SUPPORT_UNICODE */
+    }
+  }
+
+/* If the match data block was previously used with PCRE2_COPY_MATCHED_SUBJECT,
+free the memory that was obtained. */
+
+if ((match_data->flags & PCRE2_MD_COPIED_SUBJECT) != 0)
+  {
+  match_data->memctl.free((void *)match_data->subject,
+    match_data->memctl.memory_data);
+  match_data->flags &= ~PCRE2_MD_COPIED_SUBJECT;
+  }
+
+/* Fill in fields that are always returned in the match data. */
+
+match_data->code = re;
+match_data->subject = NULL;  /* Default for no match */
+match_data->mark = NULL;
+match_data->matchedby = PCRE2_MATCHEDBY_DFA_INTERPRETER;
 
 /* Call the main matching function, looping for a non-anchored regex after a
 failed match. If not restarting, perform certain optimizations at the start of
@@ -3431,245 +3643,416 @@ a match. */
 
 for (;;)
   {
-  int rc;
+  /* ----------------- Start of match optimizations ---------------- */
 
-  if ((options & PCRE_DFA_RESTART) == 0)
+  /* There are some optimizations that avoid running the match if a known
+  starting point is not found, or if a known later code unit is not present.
+  However, there is an option (settable at compile time) that disables
+  these, for testing and for ensuring that all callouts do actually occur.
+  The optimizations must also be avoided when restarting a DFA match. */
+
+  if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 &&
+      (options & PCRE2_DFA_RESTART) == 0)
     {
-    const pcre_uchar *save_end_subject = end_subject;
-
     /* If firstline is TRUE, the start of the match is constrained to the first
-    line of a multiline string. Implement this by temporarily adjusting
-    end_subject so that we stop scanning at a newline. If the match fails at
-    the newline, later code breaks this loop. */
+    line of a multiline string. That is, the match must be before or at the
+    first newline following the start of matching. Temporarily adjust
+    end_subject so that we stop the optimization scans for a first code unit
+    immediately after the first character of a newline (the first code unit can
+    legitimately be a newline). If the match fails at the newline, later code
+    breaks this loop. */
 
     if (firstline)
       {
-      PCRE_PUCHAR t = current_subject;
-#ifdef SUPPORT_UTF
+      PCRE2_SPTR t = start_match;
+#ifdef SUPPORT_UNICODE
       if (utf)
         {
-        while (t < md->end_subject && !IS_NEWLINE(t))
+        while (t < end_subject && !IS_NEWLINE(t))
           {
           t++;
-          ACROSSCHAR(t < end_subject, *t, t++);
+          ACROSSCHAR(t < end_subject, t, t++);
           }
         }
       else
 #endif
-      while (t < md->end_subject && !IS_NEWLINE(t)) t++;
+      while (t < end_subject && !IS_NEWLINE(t)) t++;
       end_subject = t;
       }
 
-    /* There are some optimizations that avoid running the match if a known
-    starting point is not found. However, there is an option that disables
-    these, for testing and for ensuring that all callouts do actually occur.
-    The option can be set in the regex by (*NO_START_OPT) or passed in
-    match-time options. */
+    /* Anchored: check the first code unit if one is recorded. This may seem
+    pointless but it can help in detecting a no match case without scanning for
+    the required code unit. */
 
-    if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0)
+    if (anchored)
       {
-      /* Advance to a known first pcre_uchar (i.e. data item) */
-
-      if (has_first_char)
+      if (has_first_cu || start_bits != NULL)
         {
-        if (first_char != first_char2)
+        BOOL ok = start_match < end_subject;
+        if (ok)
           {
-          pcre_uchar csc;
-          while (current_subject < end_subject &&
-                 (csc = UCHAR21TEST(current_subject)) != first_char && csc != first_char2)
-            current_subject++;
+          PCRE2_UCHAR c = UCHAR21TEST(start_match);
+          ok = has_first_cu && (c == first_cu || c == first_cu2);
+          if (!ok && start_bits != NULL)
+            {
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            if (c > 255) c = 255;
+#endif
+            ok = (start_bits[c/8] & (1u << (c&7))) != 0;
+            }
           }
+        if (!ok) break;
+        }
+      }
+
+    /* Not anchored. Advance to a unique first code unit if there is one. */
+
+    else
+      {
+      if (has_first_cu)
+        {
+        if (first_cu != first_cu2)  /* Caseless */
+          {
+          /* In 16-bit and 32_bit modes we have to do our own search, so can
+          look for both cases at once. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 8
+          PCRE2_UCHAR smc;
+          while (start_match < end_subject &&
+                (smc = UCHAR21TEST(start_match)) != first_cu &&
+                 smc != first_cu2)
+            start_match++;
+#else
+          /* In 8-bit mode, the use of memchr() gives a big speed up, even
+          though we have to call it twice in order to find the earliest
+          occurrence of the code unit in either of its cases. Caching is used
+          to remember the positions of previously found code units. This can
+          make a huge difference when the strings are very long and only one
+          case is actually present. */
+
+          PCRE2_SPTR pp1 = NULL;
+          PCRE2_SPTR pp2 = NULL;
+          PCRE2_SIZE searchlength = end_subject - start_match;
+
+          /* If we haven't got a previously found position for first_cu, or if
+          the current starting position is later, we need to do a search. If
+          the code unit is not found, set it to the end. */
+
+          if (memchr_found_first_cu == NULL ||
+              start_match > memchr_found_first_cu)
+            {
+            pp1 = memchr(start_match, first_cu, searchlength);
+            memchr_found_first_cu = (pp1 == NULL)? end_subject : pp1;
+            }
+
+          /* If the start is before a previously found position, use the
+          previous position, or NULL if a previous search failed. */
+
+          else pp1 = (memchr_found_first_cu == end_subject)? NULL :
+            memchr_found_first_cu;
+
+          /* Do the same thing for the other case. */
+
+          if (memchr_found_first_cu2 == NULL ||
+              start_match > memchr_found_first_cu2)
+            {
+            pp2 = memchr(start_match, first_cu2, searchlength);
+            memchr_found_first_cu2 = (pp2 == NULL)? end_subject : pp2;
+            }
+
+          else pp2 = (memchr_found_first_cu2 == end_subject)? NULL :
+            memchr_found_first_cu2;
+
+          /* Set the start to the end of the subject if neither case was found.
+          Otherwise, use the earlier found point. */
+
+          if (pp1 == NULL)
+            start_match = (pp2 == NULL)? end_subject : pp2;
+          else
+            start_match = (pp2 == NULL || pp1 < pp2)? pp1 : pp2;
+
+#endif  /* 8-bit handling */
+          }
+
+        /* The caseful case is much simpler. */
+
         else
-          while (current_subject < end_subject &&
-                 UCHAR21TEST(current_subject) != first_char)
-            current_subject++;
+          {
+#if PCRE2_CODE_UNIT_WIDTH != 8
+          while (start_match < end_subject && UCHAR21TEST(start_match) !=
+                 first_cu)
+            start_match++;
+#else  /* 8-bit code units */
+          start_match = memchr(start_match, first_cu, end_subject - start_match);
+          if (start_match == NULL) start_match = end_subject;
+#endif
+          }
+
+        /* If we can't find the required code unit, having reached the true end
+        of the subject, break the bumpalong loop, to force a match failure,
+        except when doing partial matching, when we let the next cycle run at
+        the end of the subject. To see why, consider the pattern /(?<=abc)def/,
+        which partially matches "abc", even though the string does not contain
+        the starting character "d". If we have not reached the true end of the
+        subject (PCRE2_FIRSTLINE caused end_subject to be temporarily modified)
+        we also let the cycle run, because the matching string is legitimately
+        allowed to start with the first code unit of a newline. */
+
+        if ((mb->moptions & (PCRE2_PARTIAL_HARD|PCRE2_PARTIAL_SOFT)) == 0 &&
+            start_match >= mb->end_subject)
+          break;
         }
 
-      /* Or to just after a linebreak for a multiline match if possible */
+      /* If there's no first code unit, advance to just after a linebreak for a
+      multiline match if required. */
 
       else if (startline)
         {
-        if (current_subject > md->start_subject + start_offset)
+        if (start_match > mb->start_subject + start_offset)
           {
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
           if (utf)
             {
-            while (current_subject < end_subject &&
-                   !WAS_NEWLINE(current_subject))
+            while (start_match < end_subject && !WAS_NEWLINE(start_match))
               {
-              current_subject++;
-              ACROSSCHAR(current_subject < end_subject, *current_subject,
-                current_subject++);
+              start_match++;
+              ACROSSCHAR(start_match < end_subject, start_match, start_match++);
               }
             }
           else
 #endif
-          while (current_subject < end_subject && !WAS_NEWLINE(current_subject))
-            current_subject++;
+          while (start_match < end_subject && !WAS_NEWLINE(start_match))
+            start_match++;
 
           /* If we have just passed a CR and the newline option is ANY or
           ANYCRLF, and we are now at a LF, advance the match position by one
-          more character. */
+          more code unit. */
 
-          if (UCHAR21TEST(current_subject - 1) == CHAR_CR &&
-               (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
-               current_subject < end_subject &&
-               UCHAR21TEST(current_subject) == CHAR_NL)
-            current_subject++;
+          if (start_match[-1] == CHAR_CR &&
+               (mb->nltype == NLTYPE_ANY || mb->nltype == NLTYPE_ANYCRLF) &&
+               start_match < end_subject &&
+               UCHAR21TEST(start_match) == CHAR_NL)
+            start_match++;
           }
         }
 
-      /* Advance to a non-unique first pcre_uchar after study */
+      /* If there's no first code unit or a requirement for a multiline line
+      start, advance to a non-unique first code unit if any have been
+      identified. The bitmap contains only 256 bits. When code units are 16 or
+      32 bits wide, all code units greater than 254 set the 255 bit. */
 
       else if (start_bits != NULL)
         {
-        while (current_subject < end_subject)
+        while (start_match < end_subject)
           {
-          register pcre_uint32 c = UCHAR21TEST(current_subject);
-#ifndef COMPILE_PCRE8
+          uint32_t c = UCHAR21TEST(start_match);
+#if PCRE2_CODE_UNIT_WIDTH != 8
           if (c > 255) c = 255;
 #endif
-          if ((start_bits[c/8] & (1 << (c&7))) != 0) break;
-          current_subject++;
+          if ((start_bits[c/8] & (1u << (c&7))) != 0) break;
+          start_match++;
           }
+
+        /* See comment above in first_cu checking about the next line. */
+
+        if ((mb->moptions & (PCRE2_PARTIAL_HARD|PCRE2_PARTIAL_SOFT)) == 0 &&
+            start_match >= mb->end_subject)
+          break;
         }
-      }
+      }  /* End of first code unit handling */
 
     /* Restore fudged end_subject */
 
-    end_subject = save_end_subject;
+    end_subject = mb->end_subject;
 
-    /* The following two optimizations are disabled for partial matching or if
-    disabling is explicitly requested (and of course, by the test above, this
-    code is not obeyed when restarting after a partial match). */
+    /* The following two optimizations are disabled for partial matching. */
 
-    if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0 &&
-        (options & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) == 0)
+    if ((mb->moptions & (PCRE2_PARTIAL_HARD|PCRE2_PARTIAL_SOFT)) == 0)
       {
-      /* If the pattern was studied, a minimum subject length may be set. This
-      is a lower bound; no actual string of that length may actually match the
-      pattern. Although the value is, strictly, in characters, we treat it as
-      in pcre_uchar units to avoid spending too much time in this optimization.
-      */
+      PCRE2_SPTR p;
 
-      if (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0 &&
-          (pcre_uint32)(end_subject - current_subject) < study->minlength)
-        return PCRE_ERROR_NOMATCH;
+      /* The minimum matching length is a lower bound; no actual string of that
+      length may actually match the pattern. Although the value is, strictly,
+      in characters, we treat it as code units to avoid spending too much time
+      in this optimization. */
 
-      /* If req_char is set, we know that that pcre_uchar must appear in the
-      subject for the match to succeed. If the first pcre_uchar is set,
-      req_char must be later in the subject; otherwise the test starts at the
-      match point. This optimization can save a huge amount of work in patterns
-      with nested unlimited repeats that aren't going to match. Writing
-      separate code for cased/caseless versions makes it go faster, as does
-      using an autoincrement and backing off on a match.
+      if (end_subject - start_match < re->minlength) goto NOMATCH_EXIT;
+
+      /* If req_cu is set, we know that that code unit must appear in the
+      subject for the match to succeed. If the first code unit is set, req_cu
+      must be later in the subject; otherwise the test starts at the match
+      point. This optimization can save a huge amount of backtracking in
+      patterns with nested unlimited repeats that aren't going to match.
+      Writing separate code for cased/caseless versions makes it go faster, as
+      does using an autoincrement and backing off on a match. As in the case of
+      the first code unit, using memchr() in the 8-bit library gives a big
+      speed up. Unlike the first_cu check above, we do not need to call
+      memchr() twice in the caseless case because we only need to check for the
+      presence of the character in either case, not find the first occurrence.
+
+      The search can be skipped if the code unit was found later than the
+      current starting point in a previous iteration of the bumpalong loop.
 
       HOWEVER: when the subject string is very, very long, searching to its end
       can take a long time, and give bad performance on quite ordinary
-      patterns. This showed up when somebody was matching /^C/ on a 32-megabyte
-      string... so we don't do this when the string is sufficiently long. */
+      patterns. This showed up when somebody was matching something like
+      /^\d+C/ on a 32-megabyte string... so we don't do this when the string is
+      sufficiently long, but it's worth searching a lot more for unanchored
+      patterns. */
 
-      if (has_req_char && end_subject - current_subject < REQ_BYTE_MAX)
+      p = start_match + (has_first_cu? 1:0);
+      if (has_req_cu && p > req_cu_ptr)
         {
-        register PCRE_PUCHAR p = current_subject + (has_first_char? 1:0);
+        PCRE2_SIZE check_length = end_subject - start_match;
 
-        /* We don't need to repeat the search if we haven't yet reached the
-        place we found it at last time. */
-
-        if (p > req_char_ptr)
+        if (check_length < REQ_CU_MAX ||
+              (!anchored && check_length < REQ_CU_MAX * 1000))
           {
-          if (req_char != req_char2)
+          if (req_cu != req_cu2)  /* Caseless */
             {
+#if PCRE2_CODE_UNIT_WIDTH != 8
             while (p < end_subject)
               {
-              register pcre_uint32 pp = UCHAR21INCTEST(p);
-              if (pp == req_char || pp == req_char2) { p--; break; }
+              uint32_t pp = UCHAR21INCTEST(p);
+              if (pp == req_cu || pp == req_cu2) { p--; break; }
               }
+#else  /* 8-bit code units */
+            PCRE2_SPTR pp = p;
+            p = memchr(pp, req_cu, end_subject - pp);
+            if (p == NULL)
+              {
+              p = memchr(pp, req_cu2, end_subject - pp);
+              if (p == NULL) p = end_subject;
+              }
+#endif /* PCRE2_CODE_UNIT_WIDTH != 8 */
             }
+
+          /* The caseful case */
+
           else
             {
+#if PCRE2_CODE_UNIT_WIDTH != 8
             while (p < end_subject)
               {
-              if (UCHAR21INCTEST(p) == req_char) { p--; break; }
+              if (UCHAR21INCTEST(p) == req_cu) { p--; break; }
               }
+
+#else  /* 8-bit code units */
+            p = memchr(p, req_cu, end_subject - p);
+            if (p == NULL) p = end_subject;
+#endif
             }
 
-          /* If we can't find the required pcre_uchar, break the matching loop,
-          which will cause a return or PCRE_ERROR_NOMATCH. */
+          /* If we can't find the required code unit, break the matching loop,
+          forcing a match failure. */
 
           if (p >= end_subject) break;
 
-          /* If we have found the required pcre_uchar, save the point where we
+          /* If we have found the required code unit, save the point where we
           found it, so that we don't search again next time round the loop if
-          the start hasn't passed this point yet. */
+          the start hasn't passed this code unit yet. */
 
-          req_char_ptr = p;
+          req_cu_ptr = p;
           }
         }
       }
-    }   /* End of optimizations that are done when not restarting */
+    }
+
+  /* ------------ End of start of match optimizations ------------ */
+
+  /* Give no match if we have passed the bumpalong limit. */
+
+  if (start_match > bumpalong_limit) break;
 
   /* OK, now we can do the business */
 
-  md->start_used_ptr = current_subject;
-  md->recursive = NULL;
+  mb->start_used_ptr = start_match;
+  mb->last_used_ptr = start_match;
+  mb->recursive = NULL;
 
-  rc = internal_dfa_exec(
-    md,                                /* fixed match data */
-    md->start_code,                    /* this subexpression's code */
-    current_subject,                   /* where we currently are */
-    start_offset,                      /* start offset in subject */
-    offsets,                           /* offset vector */
-    offsetcount,                       /* size of same */
-    workspace,                         /* workspace vector */
-    wscount,                           /* size of same */
-    0);                                /* function recurse level */
+  rc = internal_dfa_match(
+    mb,                           /* fixed match data */
+    mb->start_code,               /* this subexpression's code */
+    start_match,                  /* where we currently are */
+    start_offset,                 /* start offset in subject */
+    match_data->ovector,          /* offset vector */
+    (uint32_t)match_data->oveccount * 2,  /* actual size of same */
+    workspace,                    /* workspace vector */
+    (int)wscount,                 /* size of same */
+    0,                            /* function recurse level */
+    base_recursion_workspace);    /* initial workspace for recursion */
 
   /* Anything other than "no match" means we are done, always; otherwise, carry
   on only if not anchored. */
 
-  if (rc != PCRE_ERROR_NOMATCH || anchored)
+  if (rc != PCRE2_ERROR_NOMATCH || anchored)
     {
-    if (rc == PCRE_ERROR_PARTIAL && offsetcount >= 2)
+    if (rc == PCRE2_ERROR_PARTIAL && match_data->oveccount > 0)
       {
-      offsets[0] = (int)(md->start_used_ptr - (PCRE_PUCHAR)subject);
-      offsets[1] = (int)(end_subject - (PCRE_PUCHAR)subject);
-      if (offsetcount > 2)
-        offsets[2] = (int)(current_subject - (PCRE_PUCHAR)subject);
+      match_data->ovector[0] = (PCRE2_SIZE)(start_match - subject);
+      match_data->ovector[1] = (PCRE2_SIZE)(end_subject - subject);
       }
-    return rc;
+    match_data->leftchar = (PCRE2_SIZE)(mb->start_used_ptr - subject);
+    match_data->rightchar = (PCRE2_SIZE)( mb->last_used_ptr - subject);
+    match_data->startchar = (PCRE2_SIZE)(start_match - subject);
+    match_data->rc = rc;
+
+    if (rc >= 0 &&(options & PCRE2_COPY_MATCHED_SUBJECT) != 0)
+      {
+      length = CU2BYTES(length + was_zero_terminated);
+      match_data->subject = match_data->memctl.malloc(length,
+        match_data->memctl.memory_data);
+      if (match_data->subject == NULL) return PCRE2_ERROR_NOMEMORY;
+      memcpy((void *)match_data->subject, subject, length);
+      match_data->flags |= PCRE2_MD_COPIED_SUBJECT;
+      }
+    else
+      {
+      if (rc >= 0 || rc == PCRE2_ERROR_PARTIAL) match_data->subject = subject;
+      }
+    goto EXIT;
     }
 
   /* Advance to the next subject character unless we are at the end of a line
   and firstline is set. */
 
-  if (firstline && IS_NEWLINE(current_subject)) break;
-  current_subject++;
-#ifdef SUPPORT_UTF
+  if (firstline && IS_NEWLINE(start_match)) break;
+  start_match++;
+#ifdef SUPPORT_UNICODE
   if (utf)
     {
-    ACROSSCHAR(current_subject < end_subject, *current_subject,
-      current_subject++);
+    ACROSSCHAR(start_match < end_subject, start_match, start_match++);
     }
 #endif
-  if (current_subject > end_subject) break;
+  if (start_match > end_subject) break;
 
   /* If we have just passed a CR and we are now at a LF, and the pattern does
   not contain any explicit matches for \r or \n, and the newline option is CRLF
   or ANY or ANYCRLF, advance the match position by one more character. */
 
-  if (UCHAR21TEST(current_subject - 1) == CHAR_CR &&
-      current_subject < end_subject &&
-      UCHAR21TEST(current_subject) == CHAR_NL &&
-      (re->flags & PCRE_HASCRORLF) == 0 &&
-        (md->nltype == NLTYPE_ANY ||
-         md->nltype == NLTYPE_ANYCRLF ||
-         md->nllen == 2))
-    current_subject++;
+  if (UCHAR21TEST(start_match - 1) == CHAR_CR &&
+      start_match < end_subject &&
+      UCHAR21TEST(start_match) == CHAR_NL &&
+      (re->flags & PCRE2_HASCRORLF) == 0 &&
+        (mb->nltype == NLTYPE_ANY ||
+         mb->nltype == NLTYPE_ANYCRLF ||
+         mb->nllen == 2))
+    start_match++;
 
   }   /* "Bumpalong" loop */
 
-return PCRE_ERROR_NOMATCH;
+NOMATCH_EXIT:
+rc = PCRE2_ERROR_NOMATCH;
+
+EXIT:
+while (rws->next != NULL)
+  {
+  RWS_anchor *next = rws->next;
+  rws->next = next->next;
+  mb->memctl.free(next, mb->memctl.memory_data);
+  }
+
+return rc;
 }
 
-/* End of pcre_dfa_exec.c */
+/* End of pcre2_dfa_match.c */
diff --git a/Foundation/src/pcre2_error.c b/Foundation/src/pcre2_error.c
new file mode 100644
index 000000000..3cc1d1d3c
--- /dev/null
+++ b/Foundation/src/pcre2_error.c
@@ -0,0 +1,338 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2021 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+#define STRING(a)  # a
+#define XSTRING(s) STRING(s)
+
+/* The texts of compile-time error messages. Compile-time error numbers start
+at COMPILE_ERROR_BASE (100).
+
+This used to be a table of strings, but in order to reduce the number of
+relocations needed when a shared library is loaded dynamically, it is now one
+long string. We cannot use a table of offsets, because the lengths of inserts
+such as XSTRING(MAX_NAME_SIZE) are not known. Instead,
+pcre2_get_error_message() counts through to the one it wants - this isn't a
+performance issue because these strings are used only when there is an error.
+
+Each substring ends with \0 to insert a null character. This includes the final
+substring, so that the whole string ends with \0\0, which can be detected when
+counting through. */
+
+static const unsigned char compile_error_texts[] =
+  "no error\0"
+  "\\ at end of pattern\0"
+  "\\c at end of pattern\0"
+  "unrecognized character follows \\\0"
+  "numbers out of order in {} quantifier\0"
+  /* 5 */
+  "number too big in {} quantifier\0"
+  "missing terminating ] for character class\0"
+  "escape sequence is invalid in character class\0"
+  "range out of order in character class\0"
+  "quantifier does not follow a repeatable item\0"
+  /* 10 */
+  "internal error: unexpected repeat\0"
+  "unrecognized character after (? or (?-\0"
+  "POSIX named classes are supported only within a class\0"
+  "POSIX collating elements are not supported\0"
+  "missing closing parenthesis\0"
+  /* 15 */
+  "reference to non-existent subpattern\0"
+  "pattern passed as NULL\0"
+  "unrecognised compile-time option bit(s)\0"
+  "missing ) after (?# comment\0"
+  "parentheses are too deeply nested\0"
+  /* 20 */
+  "regular expression is too large\0"
+  "failed to allocate heap memory\0"
+  "unmatched closing parenthesis\0"
+  "internal error: code overflow\0"
+  "missing closing parenthesis for condition\0"
+  /* 25 */
+  "lookbehind assertion is not fixed length\0"
+  "a relative value of zero is not allowed\0"
+  "conditional subpattern contains more than two branches\0"
+  "assertion expected after (?( or (?(?C)\0"
+  "digit expected after (?+ or (?-\0"
+  /* 30 */
+  "unknown POSIX class name\0"
+  "internal error in pcre2_study(): should not occur\0"
+  "this version of PCRE2 does not have Unicode support\0"
+  "parentheses are too deeply nested (stack check)\0"
+  "character code point value in \\x{} or \\o{} is too large\0"
+  /* 35 */
+  "lookbehind is too complicated\0"
+  "\\C is not allowed in a lookbehind assertion in UTF-" XSTRING(PCRE2_CODE_UNIT_WIDTH) " mode\0"
+  "PCRE2 does not support \\F, \\L, \\l, \\N{name}, \\U, or \\u\0"
+  "number after (?C is greater than 255\0"
+  "closing parenthesis for (?C expected\0"
+  /* 40 */
+  "invalid escape sequence in (*VERB) name\0"
+  "unrecognized character after (?P\0"
+  "syntax error in subpattern name (missing terminator?)\0"
+  "two named subpatterns have the same name (PCRE2_DUPNAMES not set)\0"
+  "subpattern name must start with a non-digit\0"
+  /* 45 */
+  "this version of PCRE2 does not have support for \\P, \\p, or \\X\0"
+  "malformed \\P or \\p sequence\0"
+  "unknown property after \\P or \\p\0"
+  "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " code units)\0"
+  "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
+  /* 50 */
+  "invalid range in character class\0"
+  "octal value is greater than \\377 in 8-bit non-UTF-8 mode\0"
+  "internal error: overran compiling workspace\0"
+  "internal error: previously-checked referenced subpattern not found\0"
+  "DEFINE subpattern contains more than one branch\0"
+  /* 55 */
+  "missing opening brace after \\o\0"
+  "internal error: unknown newline setting\0"
+  "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
+  "(?R (recursive pattern call) must be followed by a closing parenthesis\0"
+  /* "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0" */
+  "obsolete error (should not occur)\0"  /* Was the above */
+  /* 60 */
+  "(*VERB) not recognized or malformed\0"
+  "subpattern number is too big\0"
+  "subpattern name expected\0"
+  "internal error: parsed pattern overflow\0"
+  "non-octal character in \\o{} (closing brace missing?)\0"
+  /* 65 */
+  "different names for subpatterns of the same number are not allowed\0"
+  "(*MARK) must have an argument\0"
+  "non-hex character in \\x{} (closing brace missing?)\0"
+#ifndef EBCDIC
+  "\\c must be followed by a printable ASCII character\0"
+#else
+  "\\c must be followed by a letter or one of [\\]^_?\0"
+#endif
+  "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
+  /* 70 */
+  "internal error: unknown meta code in check_lookbehinds()\0"
+  "\\N is not supported in a class\0"
+  "callout string is too long\0"
+  "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
+  "using UTF is disabled by the application\0"
+  /* 75 */
+  "using UCP is disabled by the application\0"
+  "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
+  "character code point value in \\u.... sequence is too large\0"
+  "digits missing in \\x{} or \\o{} or \\N{U+}\0"
+  "syntax error or number too big in (?(VERSION condition\0"
+  /* 80 */
+  "internal error: unknown opcode in auto_possessify()\0"
+  "missing terminating delimiter for callout with string argument\0"
+  "unrecognized string delimiter follows (?C\0"
+  "using \\C is disabled by the application\0"
+  "(?| and/or (?J: or (?x: parentheses are too deeply nested\0"
+  /* 85 */
+  "using \\C is disabled in this PCRE2 library\0"
+  "regular expression is too complicated\0"
+  "lookbehind assertion is too long\0"
+  "pattern string is longer than the limit set by the application\0"
+  "internal error: unknown code in parsed pattern\0"
+  /* 90 */
+  "internal error: bad code value in parsed_skip()\0"
+  "PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES is not allowed in UTF-16 mode\0"
+  "invalid option bits with PCRE2_LITERAL\0"
+  "\\N{U+dddd} is supported only in Unicode (UTF) mode\0"
+  "invalid hyphen in option setting\0"
+  /* 95 */
+  "(*alpha_assertion) not recognized\0"
+  "script runs require Unicode support, which this version of PCRE2 does not have\0"
+  "too many capturing groups (maximum 65535)\0"
+  "atomic assertion expected after (?( or (?(?C)\0"
+  "\\K is not allowed in lookarounds (but see PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK)\0"
+  ;
+
+/* Match-time and UTF error texts are in the same format. */
+
+static const unsigned char match_error_texts[] =
+  "no error\0"
+  "no match\0"
+  "partial match\0"
+  "UTF-8 error: 1 byte missing at end\0"
+  "UTF-8 error: 2 bytes missing at end\0"
+  /* 5 */
+  "UTF-8 error: 3 bytes missing at end\0"
+  "UTF-8 error: 4 bytes missing at end\0"
+  "UTF-8 error: 5 bytes missing at end\0"
+  "UTF-8 error: byte 2 top bits not 0x80\0"
+  "UTF-8 error: byte 3 top bits not 0x80\0"
+  /* 10 */
+  "UTF-8 error: byte 4 top bits not 0x80\0"
+  "UTF-8 error: byte 5 top bits not 0x80\0"
+  "UTF-8 error: byte 6 top bits not 0x80\0"
+  "UTF-8 error: 5-byte character is not allowed (RFC 3629)\0"
+  "UTF-8 error: 6-byte character is not allowed (RFC 3629)\0"
+  /* 15 */
+  "UTF-8 error: code points greater than 0x10ffff are not defined\0"
+  "UTF-8 error: code points 0xd800-0xdfff are not defined\0"
+  "UTF-8 error: overlong 2-byte sequence\0"
+  "UTF-8 error: overlong 3-byte sequence\0"
+  "UTF-8 error: overlong 4-byte sequence\0"
+  /* 20 */
+  "UTF-8 error: overlong 5-byte sequence\0"
+  "UTF-8 error: overlong 6-byte sequence\0"
+  "UTF-8 error: isolated byte with 0x80 bit set\0"
+  "UTF-8 error: illegal byte (0xfe or 0xff)\0"
+  "UTF-16 error: missing low surrogate at end\0"
+  /* 25 */
+  "UTF-16 error: invalid low surrogate\0"
+  "UTF-16 error: isolated low surrogate\0"
+  "UTF-32 error: code points 0xd800-0xdfff are not defined\0"
+  "UTF-32 error: code points greater than 0x10ffff are not defined\0"
+  "bad data value\0"
+  /* 30 */
+  "patterns do not all use the same character tables\0"
+  "magic number missing\0"
+  "pattern compiled in wrong mode: 8/16/32-bit error\0"
+  "bad offset value\0"
+  "bad option value\0"
+  /* 35 */
+  "invalid replacement string\0"
+  "bad offset into UTF string\0"
+  "callout error code\0"              /* Never returned by PCRE2 itself */
+  "invalid data in workspace for DFA restart\0"
+  "too much recursion for DFA matching\0"
+  /* 40 */
+  "backreference condition or recursion test is not supported for DFA matching\0"
+  "function is not supported for DFA matching\0"
+  "pattern contains an item that is not supported for DFA matching\0"
+  "workspace size exceeded in DFA matching\0"
+  "internal error - pattern overwritten?\0"
+  /* 45 */
+  "bad JIT option\0"
+  "JIT stack limit reached\0"
+  "match limit exceeded\0"
+  "no more memory\0"
+  "unknown substring\0"
+  /* 50 */
+  "non-unique substring name\0"
+  "NULL argument passed with non-zero length\0"
+  "nested recursion at the same subject position\0"
+  "matching depth limit exceeded\0"
+  "requested value is not available\0"
+  /* 55 */
+  "requested value is not set\0"
+  "offset limit set without PCRE2_USE_OFFSET_LIMIT\0"
+  "bad escape sequence in replacement string\0"
+  "expected closing curly bracket in replacement string\0"
+  "bad substitution in replacement string\0"
+  /* 60 */
+  "match with end before start or start moved backwards is not supported\0"
+  "too many replacements (more than INT_MAX)\0"
+  "bad serialized data\0"
+  "heap limit exceeded\0"
+  "invalid syntax\0"
+  /* 65 */
+  "internal error - duplicate substitution match\0"
+  "PCRE2_MATCH_INVALID_UTF is not supported for DFA matching\0"
+  ;
+
+
+/*************************************************
+*            Return error message                *
+*************************************************/
+
+/* This function copies an error message into a buffer whose units are of an
+appropriate width. Error numbers are positive for compile-time errors, and
+negative for match-time errors (except for UTF errors), but the numbers are all
+distinct.
+
+Arguments:
+  enumber       error number
+  buffer        where to put the message (zero terminated)
+  size          size of the buffer in code units
+
+Returns:        length of message if all is well
+                negative on error
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_get_error_message(int enumber, PCRE2_UCHAR *buffer, PCRE2_SIZE size)
+{
+const unsigned char *message;
+PCRE2_SIZE i;
+int n;
+
+if (size == 0) return PCRE2_ERROR_NOMEMORY;
+
+if (enumber >= COMPILE_ERROR_BASE)  /* Compile error */
+  {
+  message = compile_error_texts;
+  n = enumber - COMPILE_ERROR_BASE;
+  }
+else if (enumber < 0)               /* Match or UTF error */
+  {
+  message = match_error_texts;
+  n = -enumber;
+  }
+else                                /* Invalid error number */
+  {
+  message = (unsigned char *)"\0";  /* Empty message list */
+  n = 1;
+  }
+
+for (; n > 0; n--)
+  {
+  while (*message++ != CHAR_NUL) {};
+  if (*message == CHAR_NUL) return PCRE2_ERROR_BADDATA;
+  }
+
+for (i = 0; *message != 0; i++)
+  {
+  if (i >= size - 1)
+    {
+    buffer[i] = 0;     /* Terminate partial message */
+    return PCRE2_ERROR_NOMEMORY;
+    }
+  buffer[i] = *message++;
+  }
+
+buffer[i] = 0;
+return (int)i;
+}
+
+/* End of pcre2_error.c */
diff --git a/Foundation/src/pcre2_extuni.c b/Foundation/src/pcre2_extuni.c
new file mode 100644
index 000000000..7b08b6571
--- /dev/null
+++ b/Foundation/src/pcre2_extuni.c
@@ -0,0 +1,144 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2021 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* This module contains an internal function that is used to match a Unicode
+extended grapheme sequence. It is used by both pcre2_match() and
+pcre2_def_match(). However, it is called only when Unicode support is being
+compiled. Nevertheless, we provide a dummy function when there is no Unicode
+support, because some compilers do not like functionless source files. */
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+/* Dummy function */
+
+#ifndef SUPPORT_UNICODE
+PCRE2_SPTR
+PRIV(extuni)(uint32_t c, PCRE2_SPTR eptr, PCRE2_SPTR start_subject,
+  PCRE2_SPTR end_subject, BOOL utf, int *xcount)
+{
+(void)c;
+(void)eptr;
+(void)start_subject;
+(void)end_subject;
+(void)utf;
+(void)xcount;
+return NULL;
+}
+#else
+
+
+/*************************************************
+*      Match an extended grapheme sequence       *
+*************************************************/
+
+/*
+Arguments:
+  c              the first character
+  eptr           pointer to next character
+  start_subject  pointer to start of subject
+  end_subject    pointer to end of subject
+  utf            TRUE if in UTF mode
+  xcount         pointer to count of additional characters,
+                   or NULL if count not needed
+
+Returns:         pointer after the end of the sequence
+*/
+
+PCRE2_SPTR
+PRIV(extuni)(uint32_t c, PCRE2_SPTR eptr, PCRE2_SPTR start_subject,
+  PCRE2_SPTR end_subject, BOOL utf, int *xcount)
+{
+int lgb = UCD_GRAPHBREAK(c);
+
+while (eptr < end_subject)
+  {
+  int rgb;
+  int len = 1;
+  if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
+  rgb = UCD_GRAPHBREAK(c);
+  if ((PRIV(ucp_gbtable)[lgb] & (1u << rgb)) == 0) break;
+
+  /* Not breaking between Regional Indicators is allowed only if there
+  are an even number of preceding RIs. */
+
+  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
+    {
+    int ricount = 0;
+    PCRE2_SPTR bptr = eptr - 1;
+    if (utf) BACKCHAR(bptr);
+
+    /* bptr is pointing to the left-hand character */
+
+    while (bptr > start_subject)
+      {
+      bptr--;
+      if (utf)
+        {
+        BACKCHAR(bptr);
+        GETCHAR(c, bptr);
+        }
+      else
+      c = *bptr;
+      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator) break;
+      ricount++;
+      }
+    if ((ricount & 1) != 0) break;  /* Grapheme break required */
+    }
+
+  /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this
+  allows any number of them before a following Extended_Pictographic. */
+
+  if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) ||
+       lgb != ucp_gbExtended_Pictographic)
+    lgb = rgb;
+
+  eptr += len;
+  if (xcount != NULL) *xcount += 1;
+  }
+
+return eptr;
+}
+
+#endif  /* SUPPORT_UNICODE */
+
+/* End of pcre2_extuni.c */
diff --git a/Foundation/src/pcre2_find_bracket.c b/Foundation/src/pcre2_find_bracket.c
new file mode 100644
index 000000000..d365be8bb
--- /dev/null
+++ b/Foundation/src/pcre2_find_bracket.c
@@ -0,0 +1,216 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2018 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains a single function that scans through a compiled pattern
+until it finds a capturing bracket with the given number, or, if the number is
+negative, an instance of OP_REVERSE for a lookbehind. The function is called
+from pcre2_compile.c and also from pcre2_study.c when finding the minimum
+matching length. */
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+/*************************************************
+*    Scan compiled regex for specific bracket    *
+*************************************************/
+
+/*
+Arguments:
+  code        points to start of expression
+  utf         TRUE in UTF mode
+  number      the required bracket number or negative to find a lookbehind
+
+Returns:      pointer to the opcode for the bracket, or NULL if not found
+*/
+
+PCRE2_SPTR
+PRIV(find_bracket)(PCRE2_SPTR code, BOOL utf, int number)
+{
+for (;;)
+  {
+  PCRE2_UCHAR c = *code;
+
+  if (c == OP_END) return NULL;
+
+  /* XCLASS is used for classes that cannot be represented just by a bit map.
+  This includes negated single high-valued characters. CALLOUT_STR is used for
+  callouts with string arguments. In both cases the length in the table is
+  zero; the actual length is stored in the compiled code. */
+
+  if (c == OP_XCLASS) code += GET(code, 1);
+    else if (c == OP_CALLOUT_STR) code += GET(code, 1 + 2*LINK_SIZE);
+
+  /* Handle lookbehind */
+
+  else if (c == OP_REVERSE)
+    {
+    if (number < 0) return (PCRE2_UCHAR *)code;
+    code += PRIV(OP_lengths)[c];
+    }
+
+  /* Handle capturing bracket */
+
+  else if (c == OP_CBRA || c == OP_SCBRA ||
+           c == OP_CBRAPOS || c == OP_SCBRAPOS)
+    {
+    int n = (int)GET2(code, 1+LINK_SIZE);
+    if (n == number) return (PCRE2_UCHAR *)code;
+    code += PRIV(OP_lengths)[c];
+    }
+
+  /* Otherwise, we can get the item's length from the table, except that for
+  repeated character types, we have to test for \p and \P, which have an extra
+  two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
+  must add in its length. */
+
+  else
+    {
+    switch(c)
+      {
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSSTAR:
+      case OP_TYPEPOSPLUS:
+      case OP_TYPEPOSQUERY:
+      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+      break;
+
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEEXACT:
+      case OP_TYPEPOSUPTO:
+      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
+        code += 2;
+      break;
+
+      case OP_MARK:
+      case OP_COMMIT_ARG:
+      case OP_PRUNE_ARG:
+      case OP_SKIP_ARG:
+      case OP_THEN_ARG:
+      code += code[1];
+      break;
+      }
+
+    /* Add in the fixed length from the table */
+
+    code += PRIV(OP_lengths)[c];
+
+  /* In UTF-8 and UTF-16 modes, opcodes that are followed by a character may be
+  followed by a multi-byte character. The length in the table is a minimum, so
+  we have to arrange to skip the extra bytes. */
+
+#ifdef MAYBE_UTF_MULTI
+    if (utf) switch(c)
+      {
+      case OP_CHAR:
+      case OP_CHARI:
+      case OP_NOT:
+      case OP_NOTI:
+      case OP_EXACT:
+      case OP_EXACTI:
+      case OP_NOTEXACT:
+      case OP_NOTEXACTI:
+      case OP_UPTO:
+      case OP_UPTOI:
+      case OP_NOTUPTO:
+      case OP_NOTUPTOI:
+      case OP_MINUPTO:
+      case OP_MINUPTOI:
+      case OP_NOTMINUPTO:
+      case OP_NOTMINUPTOI:
+      case OP_POSUPTO:
+      case OP_POSUPTOI:
+      case OP_NOTPOSUPTO:
+      case OP_NOTPOSUPTOI:
+      case OP_STAR:
+      case OP_STARI:
+      case OP_NOTSTAR:
+      case OP_NOTSTARI:
+      case OP_MINSTAR:
+      case OP_MINSTARI:
+      case OP_NOTMINSTAR:
+      case OP_NOTMINSTARI:
+      case OP_POSSTAR:
+      case OP_POSSTARI:
+      case OP_NOTPOSSTAR:
+      case OP_NOTPOSSTARI:
+      case OP_PLUS:
+      case OP_PLUSI:
+      case OP_NOTPLUS:
+      case OP_NOTPLUSI:
+      case OP_MINPLUS:
+      case OP_MINPLUSI:
+      case OP_NOTMINPLUS:
+      case OP_NOTMINPLUSI:
+      case OP_POSPLUS:
+      case OP_POSPLUSI:
+      case OP_NOTPOSPLUS:
+      case OP_NOTPOSPLUSI:
+      case OP_QUERY:
+      case OP_QUERYI:
+      case OP_NOTQUERY:
+      case OP_NOTQUERYI:
+      case OP_MINQUERY:
+      case OP_MINQUERYI:
+      case OP_NOTMINQUERY:
+      case OP_NOTMINQUERYI:
+      case OP_POSQUERY:
+      case OP_POSQUERYI:
+      case OP_NOTPOSQUERY:
+      case OP_NOTPOSQUERYI:
+      if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
+      break;
+      }
+#else
+    (void)(utf);  /* Keep compiler happy by referencing function argument */
+#endif  /* MAYBE_UTF_MULTI */
+    }
+  }
+}
+
+/* End of pcre2_find_bracket.c */
diff --git a/Foundation/src/pcre2_internal.h b/Foundation/src/pcre2_internal.h
new file mode 100644
index 000000000..fe7a0e005
--- /dev/null
+++ b/Foundation/src/pcre2_internal.h
@@ -0,0 +1,2048 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE2 is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2022 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef PCRE2_INTERNAL_H_IDEMPOTENT_GUARD
+#define PCRE2_INTERNAL_H_IDEMPOTENT_GUARD
+
+/* We do not support both EBCDIC and Unicode at the same time. The "configure"
+script prevents both being selected, but not everybody uses "configure". EBCDIC
+is only supported for the 8-bit library, but the check for this has to be later
+in this file, because the first part is not width-dependent, and is included by
+pcre2test.c with CODE_UNIT_WIDTH == 0. */
+
+#if defined EBCDIC && defined SUPPORT_UNICODE
+#error The use of both EBCDIC and SUPPORT_UNICODE is not supported.
+#endif
+
+/* Standard C headers */
+
+#include <ctype.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Macros to make boolean values more obvious. The #ifndef is to pacify
+compiler warnings in environments where these macros are defined elsewhere.
+Unfortunately, there is no way to do the same for the typedef. */
+
+typedef int BOOL;
+#ifndef FALSE
+#define FALSE   0
+#define TRUE    1
+#endif
+
+/* Valgrind (memcheck) support */
+
+#ifdef SUPPORT_VALGRIND
+#include <valgrind/memcheck.h>
+#endif
+
+/* -ftrivial-auto-var-init support supports initializing all local variables
+to avoid some classes of bug, but this can cause an unacceptable slowdown
+for large on-stack arrays in hot functions. This macro lets us annotate
+such arrays. */
+
+#ifdef HAVE_ATTRIBUTE_UNINITIALIZED
+#define PCRE2_KEEP_UNINITIALIZED __attribute__((uninitialized))
+#else
+#define PCRE2_KEEP_UNINITIALIZED
+#endif
+
+/* Older versions of MSVC lack snprintf(). This define allows for
+warning/error-free compilation and testing with MSVC compilers back to at least
+MSVC 10/2010. Except for VC6 (which is missing some fundamentals and fails). */
+
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+#define snprintf _snprintf
+#endif
+
+/* When compiling a DLL for Windows, the exported symbols have to be declared
+using some MS magic. I found some useful information on this web page:
+http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the
+information there, using __declspec(dllexport) without "extern" we have a
+definition; with "extern" we have a declaration. The settings here override the
+setting in pcre2.h (which is included below); it defines only PCRE2_EXP_DECL,
+which is all that is needed for applications (they just import the symbols). We
+use:
+
+  PCRE2_EXP_DECL    for declarations
+  PCRE2_EXP_DEFN    for definitions
+
+The reason for wrapping this in #ifndef PCRE2_EXP_DECL is so that pcre2test,
+which is an application, but needs to import this file in order to "peek" at
+internals, can #include pcre2.h first to get an application's-eye view.
+
+In principle, people compiling for non-Windows, non-Unix-like (i.e. uncommon,
+special-purpose environments) might want to stick other stuff in front of
+exported symbols. That's why, in the non-Windows case, we set PCRE2_EXP_DEFN
+only if it is not already set. */
+
+#ifndef PCRE2_EXP_DECL
+#  ifdef _WIN32
+#    ifndef PCRE2_STATIC
+#      define PCRE2_EXP_DECL       extern __declspec(dllexport)
+#      define PCRE2_EXP_DEFN       __declspec(dllexport)
+#    else
+#      define PCRE2_EXP_DECL       extern
+#      define PCRE2_EXP_DEFN
+#    endif
+#  else
+#    ifdef __cplusplus
+#      define PCRE2_EXP_DECL       extern "C"
+#    else
+#      define PCRE2_EXP_DECL       extern
+#    endif
+#    ifndef PCRE2_EXP_DEFN
+#      define PCRE2_EXP_DEFN       PCRE2_EXP_DECL
+#    endif
+#  endif
+#endif
+
+/* Include the public PCRE2 header and the definitions of UCP character
+property values. This must follow the setting of PCRE2_EXP_DECL above. */
+
+#include "pcre2.h"
+#include "pcre2_ucp.h"
+
+/* When PCRE2 is compiled as a C++ library, the subject pointer can be replaced
+with a custom type. This makes it possible, for example, to allow pcre2_match()
+to process subject strings that are discontinuous by using a smart pointer
+class. It must always be possible to inspect all of the subject string in
+pcre2_match() because of the way it backtracks. */
+
+/* WARNING: This is as yet untested for PCRE2. */
+
+#ifdef CUSTOM_SUBJECT_PTR
+#undef PCRE2_SPTR
+#define PCRE2_SPTR CUSTOM_SUBJECT_PTR
+#endif
+
+/* When checking for integer overflow in pcre2_compile(), we need to handle
+large integers. If a 64-bit integer type is available, we can use that.
+Otherwise we have to cast to double, which of course requires floating point
+arithmetic. Handle this by defining a macro for the appropriate type. */
+
+#if defined INT64_MAX || defined int64_t
+#define INT64_OR_DOUBLE int64_t
+#else
+#define INT64_OR_DOUBLE double
+#endif
+
+/* External (in the C sense) functions and tables that are private to the
+libraries are always referenced using the PRIV macro. This makes it possible
+for pcre2test.c to include some of the source files from the libraries using a
+different PRIV definition to avoid name clashes. It also makes it clear in the
+code that a non-static object is being referenced. */
+
+#ifndef PRIV
+#define PRIV(name) _pcre2_##name
+#endif
+
+/* When compiling for use with the Virtual Pascal compiler, these functions
+need to have their names changed. PCRE2 must be compiled with the -DVPCOMPAT
+option on the command line. */
+
+#ifdef VPCOMPAT
+#define strlen(s)        _strlen(s)
+#define strncmp(s1,s2,m) _strncmp(s1,s2,m)
+#define memcmp(s,c,n)    _memcmp(s,c,n)
+#define memcpy(d,s,n)    _memcpy(d,s,n)
+#define memmove(d,s,n)   _memmove(d,s,n)
+#define memset(s,c,n)    _memset(s,c,n)
+#else  /* VPCOMPAT */
+
+/* Otherwise, to cope with SunOS4 and other systems that lack memmove(), define
+a macro that calls an emulating function. */
+
+#ifndef HAVE_MEMMOVE
+#undef  memmove          /* Some systems may have a macro */
+#define memmove(a, b, c) PRIV(memmove)(a, b, c)
+#endif   /* not HAVE_MEMMOVE */
+#endif   /* not VPCOMPAT */
+
+/* This is an unsigned int value that no UTF character can ever have, as
+Unicode doesn't go beyond 0x0010ffff. */
+
+#define NOTACHAR 0xffffffff
+
+/* This is the largest valid UTF/Unicode code point. */
+
+#define MAX_UTF_CODE_POINT 0x10ffff
+
+/* Compile-time positive error numbers (all except UTF errors, which are
+negative) start at this value. It should probably never be changed, in case
+some application is checking for specific numbers. There is a copy of this
+#define in pcre2posix.c (which now no longer includes this file). Ideally, a
+way of having a single definition should be found, but as the number is
+unlikely to change, this is not a pressing issue. The original reason for
+having a base other than 0 was to keep the absolute values of compile-time and
+run-time error numbers numerically different, but in the event the code does
+not rely on this. */
+
+#define COMPILE_ERROR_BASE 100
+
+/* The initial frames vector for remembering backtracking points in
+pcre2_match() is allocated on the system stack, of this size (bytes). The size
+must be a multiple of sizeof(PCRE2_SPTR) in all environments, so making it a
+multiple of 8 is best. Typical frame sizes are a few hundred bytes (it depends
+on the number of capturing parentheses) so 20KiB handles quite a few frames. A
+larger vector on the heap is obtained for patterns that need more frames. The
+maximum size of this can be limited. */
+
+#define START_FRAMES_SIZE 20480
+
+/* Similarly, for DFA matching, an initial internal workspace vector is
+allocated on the stack. */
+
+#define DFA_START_RWS_SIZE 30720
+
+/* Define the default BSR convention. */
+
+#ifdef BSR_ANYCRLF
+#define BSR_DEFAULT PCRE2_BSR_ANYCRLF
+#else
+#define BSR_DEFAULT PCRE2_BSR_UNICODE
+#endif
+
+
+/* ---------------- Basic UTF-8 macros ---------------- */
+
+/* These UTF-8 macros are always defined because they are used in pcre2test for
+handling wide characters in 16-bit and 32-bit modes, even if an 8-bit library
+is not supported. */
+
+/* Tests whether a UTF-8 code point needs extra bytes to decode. */
+
+#define HASUTF8EXTRALEN(c) ((c) >= 0xc0)
+
+/* The following macros were originally written in the form of loops that used
+data from the tables whose names start with PRIV(utf8_table). They were
+rewritten by a user so as not to use loops, because in some environments this
+gives a significant performance advantage, and it seems never to do any harm.
+*/
+
+/* Base macro to pick up the remaining bytes of a UTF-8 character, not
+advancing the pointer. */
+
+#define GETUTF8(c, eptr) \
+    { \
+    if ((c & 0x20u) == 0) \
+      c = ((c & 0x1fu) << 6) | (eptr[1] & 0x3fu); \
+    else if ((c & 0x10u) == 0) \
+      c = ((c & 0x0fu) << 12) | ((eptr[1] & 0x3fu) << 6) | (eptr[2] & 0x3fu); \
+    else if ((c & 0x08u) == 0) \
+      c = ((c & 0x07u) << 18) | ((eptr[1] & 0x3fu) << 12) | \
+      ((eptr[2] & 0x3fu) << 6) | (eptr[3] & 0x3fu); \
+    else if ((c & 0x04u) == 0) \
+      c = ((c & 0x03u) << 24) | ((eptr[1] & 0x3fu) << 18) | \
+          ((eptr[2] & 0x3fu) << 12) | ((eptr[3] & 0x3fu) << 6) | \
+          (eptr[4] & 0x3fu); \
+    else \
+      c = ((c & 0x01u) << 30) | ((eptr[1] & 0x3fu) << 24) | \
+          ((eptr[2] & 0x3fu) << 18) | ((eptr[3] & 0x3fu) << 12) | \
+          ((eptr[4] & 0x3fu) << 6) | (eptr[5] & 0x3fu); \
+    }
+
+/* Base macro to pick up the remaining bytes of a UTF-8 character, advancing
+the pointer. */
+
+#define GETUTF8INC(c, eptr) \
+    { \
+    if ((c & 0x20u) == 0) \
+      c = ((c & 0x1fu) << 6) | (*eptr++ & 0x3fu); \
+    else if ((c & 0x10u) == 0) \
+      { \
+      c = ((c & 0x0fu) << 12) | ((*eptr & 0x3fu) << 6) | (eptr[1] & 0x3fu); \
+      eptr += 2; \
+      } \
+    else if ((c & 0x08u) == 0) \
+      { \
+      c = ((c & 0x07u) << 18) | ((*eptr & 0x3fu) << 12) | \
+          ((eptr[1] & 0x3fu) << 6) | (eptr[2] & 0x3fu); \
+      eptr += 3; \
+      } \
+    else if ((c & 0x04u) == 0) \
+      { \
+      c = ((c & 0x03u) << 24) | ((*eptr & 0x3fu) << 18) | \
+          ((eptr[1] & 0x3fu) << 12) | ((eptr[2] & 0x3fu) << 6) | \
+          (eptr[3] & 0x3fu); \
+      eptr += 4; \
+      } \
+    else \
+      { \
+      c = ((c & 0x01u) << 30) | ((*eptr & 0x3fu) << 24) | \
+          ((eptr[1] & 0x3fu) << 18) | ((eptr[2] & 0x3fu) << 12) | \
+          ((eptr[3] & 0x3fu) << 6) | (eptr[4] & 0x3fu); \
+      eptr += 5; \
+      } \
+    }
+
+/* Base macro to pick up the remaining bytes of a UTF-8 character, not
+advancing the pointer, incrementing the length. */
+
+#define GETUTF8LEN(c, eptr, len) \
+    { \
+    if ((c & 0x20u) == 0) \
+      { \
+      c = ((c & 0x1fu) << 6) | (eptr[1] & 0x3fu); \
+      len++; \
+      } \
+    else if ((c & 0x10u)  == 0) \
+      { \
+      c = ((c & 0x0fu) << 12) | ((eptr[1] & 0x3fu) << 6) | (eptr[2] & 0x3fu); \
+      len += 2; \
+      } \
+    else if ((c & 0x08u)  == 0) \
+      {\
+      c = ((c & 0x07u) << 18) | ((eptr[1] & 0x3fu) << 12) | \
+          ((eptr[2] & 0x3fu) << 6) | (eptr[3] & 0x3fu); \
+      len += 3; \
+      } \
+    else if ((c & 0x04u)  == 0) \
+      { \
+      c = ((c & 0x03u) << 24) | ((eptr[1] & 0x3fu) << 18) | \
+          ((eptr[2] & 0x3fu) << 12) | ((eptr[3] & 0x3fu) << 6) | \
+          (eptr[4] & 0x3fu); \
+      len += 4; \
+      } \
+    else \
+      {\
+      c = ((c & 0x01u) << 30) | ((eptr[1] & 0x3fu) << 24) | \
+          ((eptr[2] & 0x3fu) << 18) | ((eptr[3] & 0x3fu) << 12) | \
+          ((eptr[4] & 0x3fu) << 6) | (eptr[5] & 0x3fu); \
+      len += 5; \
+      } \
+    }
+
+/* --------------- Whitespace macros ---------------- */
+
+/* Tests for Unicode horizontal and vertical whitespace characters must check a
+number of different values. Using a switch statement for this generates the
+fastest code (no loop, no memory access), and there are several places in the
+interpreter code where this happens. In order to ensure that all the case lists
+remain in step, we use macros so that there is only one place where the lists
+are defined.
+
+These values are also required as lists in pcre2_compile.c when processing \h,
+\H, \v and \V in a character class. The lists are defined in pcre2_tables.c,
+but macros that define the values are here so that all the definitions are
+together. The lists must be in ascending character order, terminated by
+NOTACHAR (which is 0xffffffff).
+
+Any changes should ensure that the various macros are kept in step with each
+other. NOTE: The values also appear in pcre2_jit_compile.c. */
+
+/* -------------- ASCII/Unicode environments -------------- */
+
+#ifndef EBCDIC
+
+/* Character U+180E (Mongolian Vowel Separator) is not included in the list of
+spaces in the Unicode file PropList.txt, and Perl does not recognize it as a
+space. However, in many other sources it is listed as a space and has been in
+PCRE (both APIs) for a long time. */
+
+#define HSPACE_LIST \
+  CHAR_HT, CHAR_SPACE, CHAR_NBSP, \
+  0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \
+  0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \
+  NOTACHAR
+
+#define HSPACE_MULTIBYTE_CASES \
+  case 0x1680:  /* OGHAM SPACE MARK */ \
+  case 0x180e:  /* MONGOLIAN VOWEL SEPARATOR */ \
+  case 0x2000:  /* EN QUAD */ \
+  case 0x2001:  /* EM QUAD */ \
+  case 0x2002:  /* EN SPACE */ \
+  case 0x2003:  /* EM SPACE */ \
+  case 0x2004:  /* THREE-PER-EM SPACE */ \
+  case 0x2005:  /* FOUR-PER-EM SPACE */ \
+  case 0x2006:  /* SIX-PER-EM SPACE */ \
+  case 0x2007:  /* FIGURE SPACE */ \
+  case 0x2008:  /* PUNCTUATION SPACE */ \
+  case 0x2009:  /* THIN SPACE */ \
+  case 0x200A:  /* HAIR SPACE */ \
+  case 0x202f:  /* NARROW NO-BREAK SPACE */ \
+  case 0x205f:  /* MEDIUM MATHEMATICAL SPACE */ \
+  case 0x3000   /* IDEOGRAPHIC SPACE */
+
+#define HSPACE_BYTE_CASES \
+  case CHAR_HT: \
+  case CHAR_SPACE: \
+  case CHAR_NBSP
+
+#define HSPACE_CASES \
+  HSPACE_BYTE_CASES: \
+  HSPACE_MULTIBYTE_CASES
+
+#define VSPACE_LIST \
+  CHAR_LF, CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, 0x2028, 0x2029, NOTACHAR
+
+#define VSPACE_MULTIBYTE_CASES \
+  case 0x2028:    /* LINE SEPARATOR */ \
+  case 0x2029     /* PARAGRAPH SEPARATOR */
+
+#define VSPACE_BYTE_CASES \
+  case CHAR_LF: \
+  case CHAR_VT: \
+  case CHAR_FF: \
+  case CHAR_CR: \
+  case CHAR_NEL
+
+#define VSPACE_CASES \
+  VSPACE_BYTE_CASES: \
+  VSPACE_MULTIBYTE_CASES
+
+/* -------------- EBCDIC environments -------------- */
+
+#else
+#define HSPACE_LIST CHAR_HT, CHAR_SPACE, CHAR_NBSP, NOTACHAR
+
+#define HSPACE_BYTE_CASES \
+  case CHAR_HT: \
+  case CHAR_SPACE: \
+  case CHAR_NBSP
+
+#define HSPACE_CASES HSPACE_BYTE_CASES
+
+#ifdef EBCDIC_NL25
+#define VSPACE_LIST \
+  CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, CHAR_LF, NOTACHAR
+#else
+#define VSPACE_LIST \
+  CHAR_VT, CHAR_FF, CHAR_CR, CHAR_LF, CHAR_NEL, NOTACHAR
+#endif
+
+#define VSPACE_BYTE_CASES \
+  case CHAR_LF: \
+  case CHAR_VT: \
+  case CHAR_FF: \
+  case CHAR_CR: \
+  case CHAR_NEL
+
+#define VSPACE_CASES VSPACE_BYTE_CASES
+#endif  /* EBCDIC */
+
+/* -------------- End of whitespace macros -------------- */
+
+
+/* PCRE2 is able to support several different kinds of newline (CR, LF, CRLF,
+"any" and "anycrlf" at present). The following macros are used to package up
+testing for newlines. NLBLOCK, PSSTART, and PSEND are defined in the various
+modules to indicate in which datablock the parameters exist, and what the
+start/end of string field names are. */
+
+#define NLTYPE_FIXED    0     /* Newline is a fixed length string */
+#define NLTYPE_ANY      1     /* Newline is any Unicode line ending */
+#define NLTYPE_ANYCRLF  2     /* Newline is CR, LF, or CRLF */
+
+/* This macro checks for a newline at the given position */
+
+#define IS_NEWLINE(p) \
+  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
+    ((p) < NLBLOCK->PSEND && \
+     PRIV(is_newline)((p), NLBLOCK->nltype, NLBLOCK->PSEND, \
+       &(NLBLOCK->nllen), utf)) \
+    : \
+    ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
+     UCHAR21TEST(p) == NLBLOCK->nl[0] && \
+     (NLBLOCK->nllen == 1 || UCHAR21TEST(p+1) == NLBLOCK->nl[1])       \
+    ) \
+  )
+
+/* This macro checks for a newline immediately preceding the given position */
+
+#define WAS_NEWLINE(p) \
+  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
+    ((p) > NLBLOCK->PSSTART && \
+     PRIV(was_newline)((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
+       &(NLBLOCK->nllen), utf)) \
+    : \
+    ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
+     UCHAR21TEST(p - NLBLOCK->nllen) == NLBLOCK->nl[0] &&              \
+     (NLBLOCK->nllen == 1 || UCHAR21TEST(p - NLBLOCK->nllen + 1) == NLBLOCK->nl[1]) \
+    ) \
+  )
+
+/* Private flags containing information about the compiled pattern. The first
+three must not be changed, because whichever is set is actually the number of
+bytes in a code unit in that mode. */
+
+#define PCRE2_MODE8         0x00000001  /* compiled in 8 bit mode */
+#define PCRE2_MODE16        0x00000002  /* compiled in 16 bit mode */
+#define PCRE2_MODE32        0x00000004  /* compiled in 32 bit mode */
+#define PCRE2_FIRSTSET      0x00000010  /* first_code unit is set */
+#define PCRE2_FIRSTCASELESS 0x00000020  /* caseless first code unit */
+#define PCRE2_FIRSTMAPSET   0x00000040  /* bitmap of first code units is set */
+#define PCRE2_LASTSET       0x00000080  /* last code unit is set */
+#define PCRE2_LASTCASELESS  0x00000100  /* caseless last code unit */
+#define PCRE2_STARTLINE     0x00000200  /* start after \n for multiline */
+#define PCRE2_JCHANGED      0x00000400  /* j option used in pattern */
+#define PCRE2_HASCRORLF     0x00000800  /* explicit \r or \n in pattern */
+#define PCRE2_HASTHEN       0x00001000  /* pattern contains (*THEN) */
+#define PCRE2_MATCH_EMPTY   0x00002000  /* pattern can match empty string */
+#define PCRE2_BSR_SET       0x00004000  /* BSR was set in the pattern */
+#define PCRE2_NL_SET        0x00008000  /* newline was set in the pattern */
+#define PCRE2_NOTEMPTY_SET  0x00010000  /* (*NOTEMPTY) used        ) keep */
+#define PCRE2_NE_ATST_SET   0x00020000  /* (*NOTEMPTY_ATSTART) used) together */
+#define PCRE2_DEREF_TABLES  0x00040000  /* release character tables */
+#define PCRE2_NOJIT         0x00080000  /* (*NOJIT) used */
+#define PCRE2_HASBKPORX     0x00100000  /* contains \P, \p, or \X */
+#define PCRE2_DUPCAPUSED    0x00200000  /* contains (?| */
+#define PCRE2_HASBKC        0x00400000  /* contains \C */
+#define PCRE2_HASACCEPT     0x00800000  /* contains (*ACCEPT) */
+
+#define PCRE2_MODE_MASK     (PCRE2_MODE8 | PCRE2_MODE16 | PCRE2_MODE32)
+
+/* Values for the matchedby field in a match data block. */
+
+enum { PCRE2_MATCHEDBY_INTERPRETER,     /* pcre2_match() */
+       PCRE2_MATCHEDBY_DFA_INTERPRETER, /* pcre2_dfa_match() */
+       PCRE2_MATCHEDBY_JIT };           /* pcre2_jit_match() */
+
+/* Values for the flags field in a match data block. */
+
+#define PCRE2_MD_COPIED_SUBJECT  0x01u
+
+/* Magic number to provide a small check against being handed junk. */
+
+#define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */
+
+/* The maximum remaining length of subject we are prepared to search for a
+req_unit match from an anchored pattern. In 8-bit mode, memchr() is used and is
+much faster than the search loop that has to be used in 16-bit and 32-bit
+modes. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#define REQ_CU_MAX       5000
+#else
+#define REQ_CU_MAX       2000
+#endif
+
+/* Offsets for the bitmap tables in the cbits set of tables. Each table
+contains a set of bits for a class map. Some classes are built by combining
+these tables. */
+
+#define cbit_space     0      /* [:space:] or \s */
+#define cbit_xdigit   32      /* [:xdigit:] */
+#define cbit_digit    64      /* [:digit:] or \d */
+#define cbit_upper    96      /* [:upper:] */
+#define cbit_lower   128      /* [:lower:] */
+#define cbit_word    160      /* [:word:] or \w */
+#define cbit_graph   192      /* [:graph:] */
+#define cbit_print   224      /* [:print:] */
+#define cbit_punct   256      /* [:punct:] */
+#define cbit_cntrl   288      /* [:cntrl:] */
+#define cbit_length  320      /* Length of the cbits table */
+
+/* Bit definitions for entries in the ctypes table. Do not change these values
+without checking pcre2_jit_compile.c, which has an assertion to ensure that
+ctype_word has the value 16. */
+
+#define ctype_space    0x01
+#define ctype_letter   0x02
+#define ctype_lcletter 0x04
+#define ctype_digit    0x08
+#define ctype_word     0x10    /* alphanumeric or '_' */
+
+/* Offsets of the various tables from the base tables pointer, and
+total length of the tables. */
+
+#define lcc_offset      0                           /* Lower case */
+#define fcc_offset    256                           /* Flip case */
+#define cbits_offset  512                           /* Character classes */
+#define ctypes_offset (cbits_offset + cbit_length)  /* Character types */
+#define TABLES_LENGTH (ctypes_offset + 256)
+
+
+/* -------------------- Character and string names ------------------------ */
+
+/* If PCRE2 is to support UTF-8 on EBCDIC platforms, we cannot use normal
+character constants like '*' because the compiler would emit their EBCDIC code,
+which is different from their ASCII/UTF-8 code. Instead we define macros for
+the characters so that they always use the ASCII/UTF-8 code when UTF-8 support
+is enabled. When UTF-8 support is not enabled, the definitions use character
+literals. Both character and string versions of each character are needed, and
+there are some longer strings as well.
+
+This means that, on EBCDIC platforms, the PCRE2 library can handle either
+EBCDIC, or UTF-8, but not both. To support both in the same compiled library
+would need different lookups depending on whether PCRE2_UTF was set or not.
+This would make it impossible to use characters in switch/case statements,
+which would reduce performance. For a theoretical use (which nobody has asked
+for) in a minority area (EBCDIC platforms), this is not sensible. Any
+application that did need both could compile two versions of the library, using
+macros to give the functions distinct names. */
+
+#ifndef SUPPORT_UNICODE
+
+/* UTF-8 support is not enabled; use the platform-dependent character literals
+so that PCRE2 works in both ASCII and EBCDIC environments, but only in non-UTF
+mode. Newline characters are problematic in EBCDIC. Though it has CR and LF
+characters, a common practice has been to use its NL (0x15) character as the
+line terminator in C-like processing environments. However, sometimes the LF
+(0x25) character is used instead, according to this Unicode document:
+
+http://unicode.org/standard/reports/tr13/tr13-5.html
+
+PCRE2 defaults EBCDIC NL to 0x15, but has a build-time option to select 0x25
+instead. Whichever is *not* chosen is defined as NEL.
+
+In both ASCII and EBCDIC environments, CHAR_NL and CHAR_LF are synonyms for the
+same code point. */
+
+#ifdef EBCDIC
+
+#ifndef EBCDIC_NL25
+#define CHAR_NL                     '\x15'
+#define CHAR_NEL                    '\x25'
+#define STR_NL                      "\x15"
+#define STR_NEL                     "\x25"
+#else
+#define CHAR_NL                     '\x25'
+#define CHAR_NEL                    '\x15'
+#define STR_NL                      "\x25"
+#define STR_NEL                     "\x15"
+#endif
+
+#define CHAR_LF                     CHAR_NL
+#define STR_LF                      STR_NL
+
+#define CHAR_ESC                    '\047'
+#define CHAR_DEL                    '\007'
+#define CHAR_NBSP                   ((unsigned char)'\x41')
+#define STR_ESC                     "\047"
+#define STR_DEL                     "\007"
+
+#else  /* Not EBCDIC */
+
+/* In ASCII/Unicode, linefeed is '\n' and we equate this to NL for
+compatibility. NEL is the Unicode newline character; make sure it is
+a positive value. */
+
+#define CHAR_LF                     '\n'
+#define CHAR_NL                     CHAR_LF
+#define CHAR_NEL                    ((unsigned char)'\x85')
+#define CHAR_ESC                    '\033'
+#define CHAR_DEL                    '\177'
+#define CHAR_NBSP                   ((unsigned char)'\xa0')
+
+#define STR_LF                      "\n"
+#define STR_NL                      STR_LF
+#define STR_NEL                     "\x85"
+#define STR_ESC                     "\033"
+#define STR_DEL                     "\177"
+
+#endif  /* EBCDIC */
+
+/* The remaining definitions work in both environments. */
+
+#define CHAR_NUL                    '\0'
+#define CHAR_HT                     '\t'
+#define CHAR_VT                     '\v'
+#define CHAR_FF                     '\f'
+#define CHAR_CR                     '\r'
+#define CHAR_BS                     '\b'
+#define CHAR_BEL                    '\a'
+
+#define CHAR_SPACE                  ' '
+#define CHAR_EXCLAMATION_MARK       '!'
+#define CHAR_QUOTATION_MARK         '"'
+#define CHAR_NUMBER_SIGN            '#'
+#define CHAR_DOLLAR_SIGN            '$'
+#define CHAR_PERCENT_SIGN           '%'
+#define CHAR_AMPERSAND              '&'
+#define CHAR_APOSTROPHE             '\''
+#define CHAR_LEFT_PARENTHESIS       '('
+#define CHAR_RIGHT_PARENTHESIS      ')'
+#define CHAR_ASTERISK               '*'
+#define CHAR_PLUS                   '+'
+#define CHAR_COMMA                  ','
+#define CHAR_MINUS                  '-'
+#define CHAR_DOT                    '.'
+#define CHAR_SLASH                  '/'
+#define CHAR_0                      '0'
+#define CHAR_1                      '1'
+#define CHAR_2                      '2'
+#define CHAR_3                      '3'
+#define CHAR_4                      '4'
+#define CHAR_5                      '5'
+#define CHAR_6                      '6'
+#define CHAR_7                      '7'
+#define CHAR_8                      '8'
+#define CHAR_9                      '9'
+#define CHAR_COLON                  ':'
+#define CHAR_SEMICOLON              ';'
+#define CHAR_LESS_THAN_SIGN         '<'
+#define CHAR_EQUALS_SIGN            '='
+#define CHAR_GREATER_THAN_SIGN      '>'
+#define CHAR_QUESTION_MARK          '?'
+#define CHAR_COMMERCIAL_AT          '@'
+#define CHAR_A                      'A'
+#define CHAR_B                      'B'
+#define CHAR_C                      'C'
+#define CHAR_D                      'D'
+#define CHAR_E                      'E'
+#define CHAR_F                      'F'
+#define CHAR_G                      'G'
+#define CHAR_H                      'H'
+#define CHAR_I                      'I'
+#define CHAR_J                      'J'
+#define CHAR_K                      'K'
+#define CHAR_L                      'L'
+#define CHAR_M                      'M'
+#define CHAR_N                      'N'
+#define CHAR_O                      'O'
+#define CHAR_P                      'P'
+#define CHAR_Q                      'Q'
+#define CHAR_R                      'R'
+#define CHAR_S                      'S'
+#define CHAR_T                      'T'
+#define CHAR_U                      'U'
+#define CHAR_V                      'V'
+#define CHAR_W                      'W'
+#define CHAR_X                      'X'
+#define CHAR_Y                      'Y'
+#define CHAR_Z                      'Z'
+#define CHAR_LEFT_SQUARE_BRACKET    '['
+#define CHAR_BACKSLASH              '\\'
+#define CHAR_RIGHT_SQUARE_BRACKET   ']'
+#define CHAR_CIRCUMFLEX_ACCENT      '^'
+#define CHAR_UNDERSCORE             '_'
+#define CHAR_GRAVE_ACCENT           '`'
+#define CHAR_a                      'a'
+#define CHAR_b                      'b'
+#define CHAR_c                      'c'
+#define CHAR_d                      'd'
+#define CHAR_e                      'e'
+#define CHAR_f                      'f'
+#define CHAR_g                      'g'
+#define CHAR_h                      'h'
+#define CHAR_i                      'i'
+#define CHAR_j                      'j'
+#define CHAR_k                      'k'
+#define CHAR_l                      'l'
+#define CHAR_m                      'm'
+#define CHAR_n                      'n'
+#define CHAR_o                      'o'
+#define CHAR_p                      'p'
+#define CHAR_q                      'q'
+#define CHAR_r                      'r'
+#define CHAR_s                      's'
+#define CHAR_t                      't'
+#define CHAR_u                      'u'
+#define CHAR_v                      'v'
+#define CHAR_w                      'w'
+#define CHAR_x                      'x'
+#define CHAR_y                      'y'
+#define CHAR_z                      'z'
+#define CHAR_LEFT_CURLY_BRACKET     '{'
+#define CHAR_VERTICAL_LINE          '|'
+#define CHAR_RIGHT_CURLY_BRACKET    '}'
+#define CHAR_TILDE                  '~'
+
+#define STR_HT                      "\t"
+#define STR_VT                      "\v"
+#define STR_FF                      "\f"
+#define STR_CR                      "\r"
+#define STR_BS                      "\b"
+#define STR_BEL                     "\a"
+
+#define STR_SPACE                   " "
+#define STR_EXCLAMATION_MARK        "!"
+#define STR_QUOTATION_MARK          "\""
+#define STR_NUMBER_SIGN             "#"
+#define STR_DOLLAR_SIGN             "$"
+#define STR_PERCENT_SIGN            "%"
+#define STR_AMPERSAND               "&"
+#define STR_APOSTROPHE              "'"
+#define STR_LEFT_PARENTHESIS        "("
+#define STR_RIGHT_PARENTHESIS       ")"
+#define STR_ASTERISK                "*"
+#define STR_PLUS                    "+"
+#define STR_COMMA                   ","
+#define STR_MINUS                   "-"
+#define STR_DOT                     "."
+#define STR_SLASH                   "/"
+#define STR_0                       "0"
+#define STR_1                       "1"
+#define STR_2                       "2"
+#define STR_3                       "3"
+#define STR_4                       "4"
+#define STR_5                       "5"
+#define STR_6                       "6"
+#define STR_7                       "7"
+#define STR_8                       "8"
+#define STR_9                       "9"
+#define STR_COLON                   ":"
+#define STR_SEMICOLON               ";"
+#define STR_LESS_THAN_SIGN          "<"
+#define STR_EQUALS_SIGN             "="
+#define STR_GREATER_THAN_SIGN       ">"
+#define STR_QUESTION_MARK           "?"
+#define STR_COMMERCIAL_AT           "@"
+#define STR_A                       "A"
+#define STR_B                       "B"
+#define STR_C                       "C"
+#define STR_D                       "D"
+#define STR_E                       "E"
+#define STR_F                       "F"
+#define STR_G                       "G"
+#define STR_H                       "H"
+#define STR_I                       "I"
+#define STR_J                       "J"
+#define STR_K                       "K"
+#define STR_L                       "L"
+#define STR_M                       "M"
+#define STR_N                       "N"
+#define STR_O                       "O"
+#define STR_P                       "P"
+#define STR_Q                       "Q"
+#define STR_R                       "R"
+#define STR_S                       "S"
+#define STR_T                       "T"
+#define STR_U                       "U"
+#define STR_V                       "V"
+#define STR_W                       "W"
+#define STR_X                       "X"
+#define STR_Y                       "Y"
+#define STR_Z                       "Z"
+#define STR_LEFT_SQUARE_BRACKET     "["
+#define STR_BACKSLASH               "\\"
+#define STR_RIGHT_SQUARE_BRACKET    "]"
+#define STR_CIRCUMFLEX_ACCENT       "^"
+#define STR_UNDERSCORE              "_"
+#define STR_GRAVE_ACCENT            "`"
+#define STR_a                       "a"
+#define STR_b                       "b"
+#define STR_c                       "c"
+#define STR_d                       "d"
+#define STR_e                       "e"
+#define STR_f                       "f"
+#define STR_g                       "g"
+#define STR_h                       "h"
+#define STR_i                       "i"
+#define STR_j                       "j"
+#define STR_k                       "k"
+#define STR_l                       "l"
+#define STR_m                       "m"
+#define STR_n                       "n"
+#define STR_o                       "o"
+#define STR_p                       "p"
+#define STR_q                       "q"
+#define STR_r                       "r"
+#define STR_s                       "s"
+#define STR_t                       "t"
+#define STR_u                       "u"
+#define STR_v                       "v"
+#define STR_w                       "w"
+#define STR_x                       "x"
+#define STR_y                       "y"
+#define STR_z                       "z"
+#define STR_LEFT_CURLY_BRACKET      "{"
+#define STR_VERTICAL_LINE           "|"
+#define STR_RIGHT_CURLY_BRACKET     "}"
+#define STR_TILDE                   "~"
+
+#define STRING_ACCEPT0               "ACCEPT\0"
+#define STRING_COMMIT0               "COMMIT\0"
+#define STRING_F0                    "F\0"
+#define STRING_FAIL0                 "FAIL\0"
+#define STRING_MARK0                 "MARK\0"
+#define STRING_PRUNE0                "PRUNE\0"
+#define STRING_SKIP0                 "SKIP\0"
+#define STRING_THEN                  "THEN"
+
+#define STRING_atomic0               "atomic\0"
+#define STRING_pla0                  "pla\0"
+#define STRING_plb0                  "plb\0"
+#define STRING_napla0                "napla\0"
+#define STRING_naplb0                "naplb\0"
+#define STRING_nla0                  "nla\0"
+#define STRING_nlb0                  "nlb\0"
+#define STRING_sr0                   "sr\0"
+#define STRING_asr0                  "asr\0"
+#define STRING_positive_lookahead0   "positive_lookahead\0"
+#define STRING_positive_lookbehind0  "positive_lookbehind\0"
+#define STRING_non_atomic_positive_lookahead0   "non_atomic_positive_lookahead\0"
+#define STRING_non_atomic_positive_lookbehind0  "non_atomic_positive_lookbehind\0"
+#define STRING_negative_lookahead0   "negative_lookahead\0"
+#define STRING_negative_lookbehind0  "negative_lookbehind\0"
+#define STRING_script_run0           "script_run\0"
+#define STRING_atomic_script_run     "atomic_script_run"
+
+#define STRING_alpha0                "alpha\0"
+#define STRING_lower0                "lower\0"
+#define STRING_upper0                "upper\0"
+#define STRING_alnum0                "alnum\0"
+#define STRING_ascii0                "ascii\0"
+#define STRING_blank0                "blank\0"
+#define STRING_cntrl0                "cntrl\0"
+#define STRING_digit0                "digit\0"
+#define STRING_graph0                "graph\0"
+#define STRING_print0                "print\0"
+#define STRING_punct0                "punct\0"
+#define STRING_space0                "space\0"
+#define STRING_word0                 "word\0"
+#define STRING_xdigit                "xdigit"
+
+#define STRING_DEFINE                "DEFINE"
+#define STRING_VERSION               "VERSION"
+#define STRING_WEIRD_STARTWORD       "[:<:]]"
+#define STRING_WEIRD_ENDWORD         "[:>:]]"
+
+#define STRING_CR_RIGHTPAR                "CR)"
+#define STRING_LF_RIGHTPAR                "LF)"
+#define STRING_CRLF_RIGHTPAR              "CRLF)"
+#define STRING_ANY_RIGHTPAR               "ANY)"
+#define STRING_ANYCRLF_RIGHTPAR           "ANYCRLF)"
+#define STRING_NUL_RIGHTPAR               "NUL)"
+#define STRING_BSR_ANYCRLF_RIGHTPAR       "BSR_ANYCRLF)"
+#define STRING_BSR_UNICODE_RIGHTPAR       "BSR_UNICODE)"
+#define STRING_UTF8_RIGHTPAR              "UTF8)"
+#define STRING_UTF16_RIGHTPAR             "UTF16)"
+#define STRING_UTF32_RIGHTPAR             "UTF32)"
+#define STRING_UTF_RIGHTPAR               "UTF)"
+#define STRING_UCP_RIGHTPAR               "UCP)"
+#define STRING_NO_AUTO_POSSESS_RIGHTPAR   "NO_AUTO_POSSESS)"
+#define STRING_NO_DOTSTAR_ANCHOR_RIGHTPAR "NO_DOTSTAR_ANCHOR)"
+#define STRING_NO_JIT_RIGHTPAR            "NO_JIT)"
+#define STRING_NO_START_OPT_RIGHTPAR      "NO_START_OPT)"
+#define STRING_NOTEMPTY_RIGHTPAR          "NOTEMPTY)"
+#define STRING_NOTEMPTY_ATSTART_RIGHTPAR  "NOTEMPTY_ATSTART)"
+#define STRING_LIMIT_HEAP_EQ              "LIMIT_HEAP="
+#define STRING_LIMIT_MATCH_EQ             "LIMIT_MATCH="
+#define STRING_LIMIT_DEPTH_EQ             "LIMIT_DEPTH="
+#define STRING_LIMIT_RECURSION_EQ         "LIMIT_RECURSION="
+#define STRING_MARK                       "MARK"
+
+#define STRING_bc                         "bc"
+#define STRING_bidiclass                  "bidiclass"
+#define STRING_sc                         "sc"
+#define STRING_script                     "script"
+#define STRING_scriptextensions           "scriptextensions"
+#define STRING_scx                        "scx"
+
+#else  /* SUPPORT_UNICODE */
+
+/* UTF-8 support is enabled; always use UTF-8 (=ASCII) character codes. This
+works in both modes non-EBCDIC platforms, and on EBCDIC platforms in UTF-8 mode
+only. */
+
+#define CHAR_HT                     '\011'
+#define CHAR_VT                     '\013'
+#define CHAR_FF                     '\014'
+#define CHAR_CR                     '\015'
+#define CHAR_LF                     '\012'
+#define CHAR_NL                     CHAR_LF
+#define CHAR_NEL                    ((unsigned char)'\x85')
+#define CHAR_BS                     '\010'
+#define CHAR_BEL                    '\007'
+#define CHAR_ESC                    '\033'
+#define CHAR_DEL                    '\177'
+
+#define CHAR_NUL                    '\0'
+#define CHAR_SPACE                  '\040'
+#define CHAR_EXCLAMATION_MARK       '\041'
+#define CHAR_QUOTATION_MARK         '\042'
+#define CHAR_NUMBER_SIGN            '\043'
+#define CHAR_DOLLAR_SIGN            '\044'
+#define CHAR_PERCENT_SIGN           '\045'
+#define CHAR_AMPERSAND              '\046'
+#define CHAR_APOSTROPHE             '\047'
+#define CHAR_LEFT_PARENTHESIS       '\050'
+#define CHAR_RIGHT_PARENTHESIS      '\051'
+#define CHAR_ASTERISK               '\052'
+#define CHAR_PLUS                   '\053'
+#define CHAR_COMMA                  '\054'
+#define CHAR_MINUS                  '\055'
+#define CHAR_DOT                    '\056'
+#define CHAR_SLASH                  '\057'
+#define CHAR_0                      '\060'
+#define CHAR_1                      '\061'
+#define CHAR_2                      '\062'
+#define CHAR_3                      '\063'
+#define CHAR_4                      '\064'
+#define CHAR_5                      '\065'
+#define CHAR_6                      '\066'
+#define CHAR_7                      '\067'
+#define CHAR_8                      '\070'
+#define CHAR_9                      '\071'
+#define CHAR_COLON                  '\072'
+#define CHAR_SEMICOLON              '\073'
+#define CHAR_LESS_THAN_SIGN         '\074'
+#define CHAR_EQUALS_SIGN            '\075'
+#define CHAR_GREATER_THAN_SIGN      '\076'
+#define CHAR_QUESTION_MARK          '\077'
+#define CHAR_COMMERCIAL_AT          '\100'
+#define CHAR_A                      '\101'
+#define CHAR_B                      '\102'
+#define CHAR_C                      '\103'
+#define CHAR_D                      '\104'
+#define CHAR_E                      '\105'
+#define CHAR_F                      '\106'
+#define CHAR_G                      '\107'
+#define CHAR_H                      '\110'
+#define CHAR_I                      '\111'
+#define CHAR_J                      '\112'
+#define CHAR_K                      '\113'
+#define CHAR_L                      '\114'
+#define CHAR_M                      '\115'
+#define CHAR_N                      '\116'
+#define CHAR_O                      '\117'
+#define CHAR_P                      '\120'
+#define CHAR_Q                      '\121'
+#define CHAR_R                      '\122'
+#define CHAR_S                      '\123'
+#define CHAR_T                      '\124'
+#define CHAR_U                      '\125'
+#define CHAR_V                      '\126'
+#define CHAR_W                      '\127'
+#define CHAR_X                      '\130'
+#define CHAR_Y                      '\131'
+#define CHAR_Z                      '\132'
+#define CHAR_LEFT_SQUARE_BRACKET    '\133'
+#define CHAR_BACKSLASH              '\134'
+#define CHAR_RIGHT_SQUARE_BRACKET   '\135'
+#define CHAR_CIRCUMFLEX_ACCENT      '\136'
+#define CHAR_UNDERSCORE             '\137'
+#define CHAR_GRAVE_ACCENT           '\140'
+#define CHAR_a                      '\141'
+#define CHAR_b                      '\142'
+#define CHAR_c                      '\143'
+#define CHAR_d                      '\144'
+#define CHAR_e                      '\145'
+#define CHAR_f                      '\146'
+#define CHAR_g                      '\147'
+#define CHAR_h                      '\150'
+#define CHAR_i                      '\151'
+#define CHAR_j                      '\152'
+#define CHAR_k                      '\153'
+#define CHAR_l                      '\154'
+#define CHAR_m                      '\155'
+#define CHAR_n                      '\156'
+#define CHAR_o                      '\157'
+#define CHAR_p                      '\160'
+#define CHAR_q                      '\161'
+#define CHAR_r                      '\162'
+#define CHAR_s                      '\163'
+#define CHAR_t                      '\164'
+#define CHAR_u                      '\165'
+#define CHAR_v                      '\166'
+#define CHAR_w                      '\167'
+#define CHAR_x                      '\170'
+#define CHAR_y                      '\171'
+#define CHAR_z                      '\172'
+#define CHAR_LEFT_CURLY_BRACKET     '\173'
+#define CHAR_VERTICAL_LINE          '\174'
+#define CHAR_RIGHT_CURLY_BRACKET    '\175'
+#define CHAR_TILDE                  '\176'
+#define CHAR_NBSP                   ((unsigned char)'\xa0')
+
+#define STR_HT                      "\011"
+#define STR_VT                      "\013"
+#define STR_FF                      "\014"
+#define STR_CR                      "\015"
+#define STR_NL                      "\012"
+#define STR_BS                      "\010"
+#define STR_BEL                     "\007"
+#define STR_ESC                     "\033"
+#define STR_DEL                     "\177"
+
+#define STR_SPACE                   "\040"
+#define STR_EXCLAMATION_MARK        "\041"
+#define STR_QUOTATION_MARK          "\042"
+#define STR_NUMBER_SIGN             "\043"
+#define STR_DOLLAR_SIGN             "\044"
+#define STR_PERCENT_SIGN            "\045"
+#define STR_AMPERSAND               "\046"
+#define STR_APOSTROPHE              "\047"
+#define STR_LEFT_PARENTHESIS        "\050"
+#define STR_RIGHT_PARENTHESIS       "\051"
+#define STR_ASTERISK                "\052"
+#define STR_PLUS                    "\053"
+#define STR_COMMA                   "\054"
+#define STR_MINUS                   "\055"
+#define STR_DOT                     "\056"
+#define STR_SLASH                   "\057"
+#define STR_0                       "\060"
+#define STR_1                       "\061"
+#define STR_2                       "\062"
+#define STR_3                       "\063"
+#define STR_4                       "\064"
+#define STR_5                       "\065"
+#define STR_6                       "\066"
+#define STR_7                       "\067"
+#define STR_8                       "\070"
+#define STR_9                       "\071"
+#define STR_COLON                   "\072"
+#define STR_SEMICOLON               "\073"
+#define STR_LESS_THAN_SIGN          "\074"
+#define STR_EQUALS_SIGN             "\075"
+#define STR_GREATER_THAN_SIGN       "\076"
+#define STR_QUESTION_MARK           "\077"
+#define STR_COMMERCIAL_AT           "\100"
+#define STR_A                       "\101"
+#define STR_B                       "\102"
+#define STR_C                       "\103"
+#define STR_D                       "\104"
+#define STR_E                       "\105"
+#define STR_F                       "\106"
+#define STR_G                       "\107"
+#define STR_H                       "\110"
+#define STR_I                       "\111"
+#define STR_J                       "\112"
+#define STR_K                       "\113"
+#define STR_L                       "\114"
+#define STR_M                       "\115"
+#define STR_N                       "\116"
+#define STR_O                       "\117"
+#define STR_P                       "\120"
+#define STR_Q                       "\121"
+#define STR_R                       "\122"
+#define STR_S                       "\123"
+#define STR_T                       "\124"
+#define STR_U                       "\125"
+#define STR_V                       "\126"
+#define STR_W                       "\127"
+#define STR_X                       "\130"
+#define STR_Y                       "\131"
+#define STR_Z                       "\132"
+#define STR_LEFT_SQUARE_BRACKET     "\133"
+#define STR_BACKSLASH               "\134"
+#define STR_RIGHT_SQUARE_BRACKET    "\135"
+#define STR_CIRCUMFLEX_ACCENT       "\136"
+#define STR_UNDERSCORE              "\137"
+#define STR_GRAVE_ACCENT            "\140"
+#define STR_a                       "\141"
+#define STR_b                       "\142"
+#define STR_c                       "\143"
+#define STR_d                       "\144"
+#define STR_e                       "\145"
+#define STR_f                       "\146"
+#define STR_g                       "\147"
+#define STR_h                       "\150"
+#define STR_i                       "\151"
+#define STR_j                       "\152"
+#define STR_k                       "\153"
+#define STR_l                       "\154"
+#define STR_m                       "\155"
+#define STR_n                       "\156"
+#define STR_o                       "\157"
+#define STR_p                       "\160"
+#define STR_q                       "\161"
+#define STR_r                       "\162"
+#define STR_s                       "\163"
+#define STR_t                       "\164"
+#define STR_u                       "\165"
+#define STR_v                       "\166"
+#define STR_w                       "\167"
+#define STR_x                       "\170"
+#define STR_y                       "\171"
+#define STR_z                       "\172"
+#define STR_LEFT_CURLY_BRACKET      "\173"
+#define STR_VERTICAL_LINE           "\174"
+#define STR_RIGHT_CURLY_BRACKET     "\175"
+#define STR_TILDE                   "\176"
+
+#define STRING_ACCEPT0               STR_A STR_C STR_C STR_E STR_P STR_T "\0"
+#define STRING_COMMIT0               STR_C STR_O STR_M STR_M STR_I STR_T "\0"
+#define STRING_F0                    STR_F "\0"
+#define STRING_FAIL0                 STR_F STR_A STR_I STR_L "\0"
+#define STRING_MARK0                 STR_M STR_A STR_R STR_K "\0"
+#define STRING_PRUNE0                STR_P STR_R STR_U STR_N STR_E "\0"
+#define STRING_SKIP0                 STR_S STR_K STR_I STR_P "\0"
+#define STRING_THEN                  STR_T STR_H STR_E STR_N
+
+#define STRING_atomic0               STR_a STR_t STR_o STR_m STR_i STR_c "\0"
+#define STRING_pla0                  STR_p STR_l STR_a "\0"
+#define STRING_plb0                  STR_p STR_l STR_b "\0"
+#define STRING_napla0                STR_n STR_a STR_p STR_l STR_a "\0"
+#define STRING_naplb0                STR_n STR_a STR_p STR_l STR_b "\0"
+#define STRING_nla0                  STR_n STR_l STR_a "\0"
+#define STRING_nlb0                  STR_n STR_l STR_b "\0"
+#define STRING_sr0                   STR_s STR_r "\0"
+#define STRING_asr0                  STR_a STR_s STR_r "\0"
+#define STRING_positive_lookahead0   STR_p STR_o STR_s STR_i STR_t STR_i STR_v STR_e STR_UNDERSCORE STR_l STR_o STR_o STR_k STR_a STR_h STR_e STR_a STR_d "\0"
+#define STRING_positive_lookbehind0  STR_p STR_o STR_s STR_i STR_t STR_i STR_v STR_e STR_UNDERSCORE STR_l STR_o STR_o STR_k STR_b STR_e STR_h STR_i STR_n STR_d "\0"
+#define STRING_non_atomic_positive_lookahead0   STR_n STR_o STR_n STR_UNDERSCORE STR_a STR_t STR_o STR_m STR_i STR_c STR_UNDERSCORE STR_p STR_o STR_s STR_i STR_t STR_i STR_v STR_e STR_UNDERSCORE STR_l STR_o STR_o STR_k STR_a STR_h STR_e STR_a STR_d "\0"
+#define STRING_non_atomic_positive_lookbehind0  STR_n STR_o STR_n STR_UNDERSCORE STR_a STR_t STR_o STR_m STR_i STR_c STR_UNDERSCORE STR_p STR_o STR_s STR_i STR_t STR_i STR_v STR_e STR_UNDERSCORE STR_l STR_o STR_o STR_k STR_b STR_e STR_h STR_i STR_n STR_d "\0"
+#define STRING_negative_lookahead0   STR_n STR_e STR_g STR_a STR_t STR_i STR_v STR_e STR_UNDERSCORE STR_l STR_o STR_o STR_k STR_a STR_h STR_e STR_a STR_d "\0"
+#define STRING_negative_lookbehind0  STR_n STR_e STR_g STR_a STR_t STR_i STR_v STR_e STR_UNDERSCORE STR_l STR_o STR_o STR_k STR_b STR_e STR_h STR_i STR_n STR_d "\0"
+#define STRING_script_run0           STR_s STR_c STR_r STR_i STR_p STR_t STR_UNDERSCORE STR_r STR_u STR_n "\0"
+#define STRING_atomic_script_run     STR_a STR_t STR_o STR_m STR_i STR_c STR_UNDERSCORE STR_s STR_c STR_r STR_i STR_p STR_t STR_UNDERSCORE STR_r STR_u STR_n
+
+#define STRING_alpha0                STR_a STR_l STR_p STR_h STR_a "\0"
+#define STRING_lower0                STR_l STR_o STR_w STR_e STR_r "\0"
+#define STRING_upper0                STR_u STR_p STR_p STR_e STR_r "\0"
+#define STRING_alnum0                STR_a STR_l STR_n STR_u STR_m "\0"
+#define STRING_ascii0                STR_a STR_s STR_c STR_i STR_i "\0"
+#define STRING_blank0                STR_b STR_l STR_a STR_n STR_k "\0"
+#define STRING_cntrl0                STR_c STR_n STR_t STR_r STR_l "\0"
+#define STRING_digit0                STR_d STR_i STR_g STR_i STR_t "\0"
+#define STRING_graph0                STR_g STR_r STR_a STR_p STR_h "\0"
+#define STRING_print0                STR_p STR_r STR_i STR_n STR_t "\0"
+#define STRING_punct0                STR_p STR_u STR_n STR_c STR_t "\0"
+#define STRING_space0                STR_s STR_p STR_a STR_c STR_e "\0"
+#define STRING_word0                 STR_w STR_o STR_r STR_d       "\0"
+#define STRING_xdigit                STR_x STR_d STR_i STR_g STR_i STR_t
+
+#define STRING_DEFINE                STR_D STR_E STR_F STR_I STR_N STR_E
+#define STRING_VERSION               STR_V STR_E STR_R STR_S STR_I STR_O STR_N
+#define STRING_WEIRD_STARTWORD       STR_LEFT_SQUARE_BRACKET STR_COLON STR_LESS_THAN_SIGN STR_COLON STR_RIGHT_SQUARE_BRACKET STR_RIGHT_SQUARE_BRACKET
+#define STRING_WEIRD_ENDWORD         STR_LEFT_SQUARE_BRACKET STR_COLON STR_GREATER_THAN_SIGN STR_COLON STR_RIGHT_SQUARE_BRACKET STR_RIGHT_SQUARE_BRACKET
+
+#define STRING_CR_RIGHTPAR                STR_C STR_R STR_RIGHT_PARENTHESIS
+#define STRING_LF_RIGHTPAR                STR_L STR_F STR_RIGHT_PARENTHESIS
+#define STRING_CRLF_RIGHTPAR              STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
+#define STRING_ANY_RIGHTPAR               STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS
+#define STRING_ANYCRLF_RIGHTPAR           STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
+#define STRING_NUL_RIGHTPAR               STR_N STR_U STR_L STR_RIGHT_PARENTHESIS
+#define STRING_BSR_ANYCRLF_RIGHTPAR       STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
+#define STRING_BSR_UNICODE_RIGHTPAR       STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS
+#define STRING_UTF8_RIGHTPAR              STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
+#define STRING_UTF16_RIGHTPAR             STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS
+#define STRING_UTF32_RIGHTPAR             STR_U STR_T STR_F STR_3 STR_2 STR_RIGHT_PARENTHESIS
+#define STRING_UTF_RIGHTPAR               STR_U STR_T STR_F STR_RIGHT_PARENTHESIS
+#define STRING_UCP_RIGHTPAR               STR_U STR_C STR_P STR_RIGHT_PARENTHESIS
+#define STRING_NO_AUTO_POSSESS_RIGHTPAR   STR_N STR_O STR_UNDERSCORE STR_A STR_U STR_T STR_O STR_UNDERSCORE STR_P STR_O STR_S STR_S STR_E STR_S STR_S STR_RIGHT_PARENTHESIS
+#define STRING_NO_DOTSTAR_ANCHOR_RIGHTPAR STR_N STR_O STR_UNDERSCORE STR_D STR_O STR_T STR_S STR_T STR_A STR_R STR_UNDERSCORE STR_A STR_N STR_C STR_H STR_O STR_R STR_RIGHT_PARENTHESIS
+#define STRING_NO_JIT_RIGHTPAR            STR_N STR_O STR_UNDERSCORE STR_J STR_I STR_T STR_RIGHT_PARENTHESIS
+#define STRING_NO_START_OPT_RIGHTPAR      STR_N STR_O STR_UNDERSCORE STR_S STR_T STR_A STR_R STR_T STR_UNDERSCORE STR_O STR_P STR_T STR_RIGHT_PARENTHESIS
+#define STRING_NOTEMPTY_RIGHTPAR          STR_N STR_O STR_T STR_E STR_M STR_P STR_T STR_Y STR_RIGHT_PARENTHESIS
+#define STRING_NOTEMPTY_ATSTART_RIGHTPAR  STR_N STR_O STR_T STR_E STR_M STR_P STR_T STR_Y STR_UNDERSCORE STR_A STR_T STR_S STR_T STR_A STR_R STR_T STR_RIGHT_PARENTHESIS
+#define STRING_LIMIT_HEAP_EQ              STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_H STR_E STR_A STR_P STR_EQUALS_SIGN
+#define STRING_LIMIT_MATCH_EQ             STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_M STR_A STR_T STR_C STR_H STR_EQUALS_SIGN
+#define STRING_LIMIT_DEPTH_EQ             STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_D STR_E STR_P STR_T STR_H STR_EQUALS_SIGN
+#define STRING_LIMIT_RECURSION_EQ         STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_R STR_E STR_C STR_U STR_R STR_S STR_I STR_O STR_N STR_EQUALS_SIGN
+#define STRING_MARK                       STR_M STR_A STR_R STR_K
+
+#define STRING_bc                         STR_b STR_c
+#define STRING_bidiclass                  STR_b STR_i STR_d STR_i STR_c STR_l STR_a STR_s STR_s
+#define STRING_sc                         STR_s STR_c
+#define STRING_script                     STR_s STR_c STR_r STR_i STR_p STR_t
+#define STRING_scriptextensions           STR_s STR_c STR_r STR_i STR_p STR_t STR_e STR_x STR_t STR_e STR_n STR_s STR_i STR_o STR_n STR_s
+#define STRING_scx                        STR_s STR_c STR_x
+
+
+#endif  /* SUPPORT_UNICODE */
+
+/* -------------------- End of character and string names -------------------*/
+
+/* -------------------- Definitions for compiled patterns -------------------*/
+
+/* Codes for different types of Unicode property. If these definitions are
+changed, the autopossessifying table in pcre2_auto_possess.c must be updated to
+match. */
+
+#define PT_ANY        0    /* Any property - matches all chars */
+#define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */
+#define PT_GC         2    /* Specified general characteristic (e.g. L) */
+#define PT_PC         3    /* Specified particular characteristic (e.g. Lu) */
+#define PT_SC         4    /* Script only (e.g. Han) */
+#define PT_SCX        5    /* Script extensions (includes SC) */
+#define PT_ALNUM      6    /* Alphanumeric - the union of L and N */
+#define PT_SPACE      7    /* Perl space - general category Z plus 9,10,12,13 */
+#define PT_PXSPACE    8    /* POSIX space - Z plus 9,10,11,12,13 */
+#define PT_WORD       9    /* Word - L plus N plus underscore */
+#define PT_CLIST     10    /* Pseudo-property: match character list */
+#define PT_UCNC      11    /* Universal Character nameable character */
+#define PT_BIDICL    12    /* Specified bidi class */
+#define PT_BOOL      13    /* Boolean property */
+#define PT_TABSIZE   14    /* Size of square table for autopossessify tests */
+
+/* The following special properties are used only in XCLASS items, when POSIX
+classes are specified and PCRE2_UCP is set - in other words, for Unicode
+handling of these classes. They are not available via the \p or \P escapes like
+those in the above list, and so they do not take part in the autopossessifying
+table. */
+
+#define PT_PXGRAPH   14    /* [:graph:] - characters that mark the paper */
+#define PT_PXPRINT   15    /* [:print:] - [:graph:] plus non-control spaces */
+#define PT_PXPUNCT   16    /* [:punct:] - punctuation characters */
+
+/* This value is used when parsing \p and \P escapes to indicate that neither
+\p{script:...} nor \p{scx:...} has been encountered. */
+
+#define PT_NOTSCRIPT 255
+
+/* Flag bits and data types for the extended class (OP_XCLASS) for classes that
+contain characters with values greater than 255. */
+
+#define XCL_NOT      0x01  /* Flag: this is a negative class */
+#define XCL_MAP      0x02  /* Flag: a 32-byte map is present */
+#define XCL_HASPROP  0x04  /* Flag: property checks are present. */
+
+#define XCL_END      0     /* Marks end of individual items */
+#define XCL_SINGLE   1     /* Single item (one multibyte char) follows */
+#define XCL_RANGE    2     /* A range (two multibyte chars) follows */
+#define XCL_PROP     3     /* Unicode property (2-byte property code follows) */
+#define XCL_NOTPROP  4     /* Unicode inverted property (ditto) */
+
+/* These are escaped items that aren't just an encoding of a particular data
+value such as \n. They must have non-zero values, as check_escape() returns 0
+for a data character. In the escapes[] table in pcre2_compile.c their values
+are negated in order to distinguish them from data values.
+
+They must appear here in the same order as in the opcode definitions below, up
+to ESC_z. There's a dummy for OP_ALLANY because it corresponds to "." in DOTALL
+mode rather than an escape sequence. It is also used for [^] in JavaScript
+compatibility mode, and for \C in non-utf mode. In non-DOTALL mode, "." behaves
+like \N.
+
+Negative numbers are used to encode a backreference (\1, \2, \3, etc.) in
+check_escape(). There are tests in the code for an escape greater than ESC_b
+and less than ESC_Z to detect the types that may be repeated. These are the
+types that consume characters. If any new escapes are put in between that don't
+consume a character, that code will have to change. */
+
+enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,
+       ESC_W, ESC_w, ESC_N, ESC_dum, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,
+       ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,
+       ESC_E, ESC_Q, ESC_g, ESC_k };
+
+
+/********************** Opcode definitions ******************/
+
+/****** NOTE NOTE NOTE ******
+
+Starting from 1 (i.e. after OP_END), the values up to OP_EOD must correspond in
+order to the list of escapes immediately above. Furthermore, values up to
+OP_DOLLM must not be changed without adjusting the table called autoposstab in
+pcre2_auto_possess.c.
+
+Whenever this list is updated, the two macro definitions that follow must be
+updated to match. The possessification table called "opcode_possessify" in
+pcre2_compile.c must also be updated, and also the tables called "coptable"
+and "poptable" in pcre2_dfa_match.c.
+
+****** NOTE NOTE NOTE ******/
+
+
+/* The values between FIRST_AUTOTAB_OP and LAST_AUTOTAB_RIGHT_OP, inclusive,
+are used in a table for deciding whether a repeated character type can be
+auto-possessified. */
+
+#define FIRST_AUTOTAB_OP       OP_NOT_DIGIT
+#define LAST_AUTOTAB_LEFT_OP   OP_EXTUNI
+#define LAST_AUTOTAB_RIGHT_OP  OP_DOLLM
+
+enum {
+  OP_END,            /* 0 End of pattern */
+
+  /* Values corresponding to backslashed metacharacters */
+
+  OP_SOD,            /* 1 Start of data: \A */
+  OP_SOM,            /* 2 Start of match (subject + offset): \G */
+  OP_SET_SOM,        /* 3 Set start of match (\K) */
+  OP_NOT_WORD_BOUNDARY,  /*  4 \B */
+  OP_WORD_BOUNDARY,      /*  5 \b */
+  OP_NOT_DIGIT,          /*  6 \D */
+  OP_DIGIT,              /*  7 \d */
+  OP_NOT_WHITESPACE,     /*  8 \S */
+  OP_WHITESPACE,         /*  9 \s */
+  OP_NOT_WORDCHAR,       /* 10 \W */
+  OP_WORDCHAR,           /* 11 \w */
+
+  OP_ANY,            /* 12 Match any character except newline (\N) */
+  OP_ALLANY,         /* 13 Match any character */
+  OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */
+  OP_NOTPROP,        /* 15 \P (not Unicode property) */
+  OP_PROP,           /* 16 \p (Unicode property) */
+  OP_ANYNL,          /* 17 \R (any newline sequence) */
+  OP_NOT_HSPACE,     /* 18 \H (not horizontal whitespace) */
+  OP_HSPACE,         /* 19 \h (horizontal whitespace) */
+  OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */
+  OP_VSPACE,         /* 21 \v (vertical whitespace) */
+  OP_EXTUNI,         /* 22 \X (extended Unicode sequence */
+  OP_EODN,           /* 23 End of data or \n at end of data (\Z) */
+  OP_EOD,            /* 24 End of data (\z) */
+
+  /* Line end assertions */
+
+  OP_DOLL,           /* 25 End of line - not multiline */
+  OP_DOLLM,          /* 26 End of line - multiline */
+  OP_CIRC,           /* 27 Start of line - not multiline */
+  OP_CIRCM,          /* 28 Start of line - multiline */
+
+  /* Single characters; caseful must precede the caseless ones, and these
+  must remain in this order, and adjacent. */
+
+  OP_CHAR,           /* 29 Match one character, casefully */
+  OP_CHARI,          /* 30 Match one character, caselessly */
+  OP_NOT,            /* 31 Match one character, not the given one, casefully */
+  OP_NOTI,           /* 32 Match one character, not the given one, caselessly */
+
+  /* The following sets of 13 opcodes must always be kept in step because
+  the offset from the first one is used to generate the others. */
+
+  /* Repeated characters; caseful must precede the caseless ones */
+
+  OP_STAR,           /* 33 The maximizing and minimizing versions of */
+  OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */
+  OP_PLUS,           /* 35 the minimizing one second. */
+  OP_MINPLUS,        /* 36 */
+  OP_QUERY,          /* 37 */
+  OP_MINQUERY,       /* 38 */
+
+  OP_UPTO,           /* 39 From 0 to n matches of one character, caseful*/
+  OP_MINUPTO,        /* 40 */
+  OP_EXACT,          /* 41 Exactly n matches */
+
+  OP_POSSTAR,        /* 42 Possessified star, caseful */
+  OP_POSPLUS,        /* 43 Possessified plus, caseful */
+  OP_POSQUERY,       /* 44 Posesssified query, caseful */
+  OP_POSUPTO,        /* 45 Possessified upto, caseful */
+
+  /* Repeated characters; caseless must follow the caseful ones */
+
+  OP_STARI,          /* 46 */
+  OP_MINSTARI,       /* 47 */
+  OP_PLUSI,          /* 48 */
+  OP_MINPLUSI,       /* 49 */
+  OP_QUERYI,         /* 50 */
+  OP_MINQUERYI,      /* 51 */
+
+  OP_UPTOI,          /* 52 From 0 to n matches of one character, caseless */
+  OP_MINUPTOI,       /* 53 */
+  OP_EXACTI,         /* 54 */
+
+  OP_POSSTARI,       /* 55 Possessified star, caseless */
+  OP_POSPLUSI,       /* 56 Possessified plus, caseless */
+  OP_POSQUERYI,      /* 57 Posesssified query, caseless */
+  OP_POSUPTOI,       /* 58 Possessified upto, caseless */
+
+  /* The negated ones must follow the non-negated ones, and match them */
+  /* Negated repeated character, caseful; must precede the caseless ones */
+
+  OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */
+  OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */
+  OP_NOTPLUS,        /* 61 the minimizing one second. They must be in */
+  OP_NOTMINPLUS,     /* 62 exactly the same order as those above. */
+  OP_NOTQUERY,       /* 63 */
+  OP_NOTMINQUERY,    /* 64 */
+
+  OP_NOTUPTO,        /* 65 From 0 to n matches, caseful */
+  OP_NOTMINUPTO,     /* 66 */
+  OP_NOTEXACT,       /* 67 Exactly n matches */
+
+  OP_NOTPOSSTAR,     /* 68 Possessified versions, caseful */
+  OP_NOTPOSPLUS,     /* 69 */
+  OP_NOTPOSQUERY,    /* 70 */
+  OP_NOTPOSUPTO,     /* 71 */
+
+  /* Negated repeated character, caseless; must follow the caseful ones */
+
+  OP_NOTSTARI,       /* 72 */
+  OP_NOTMINSTARI,    /* 73 */
+  OP_NOTPLUSI,       /* 74 */
+  OP_NOTMINPLUSI,    /* 75 */
+  OP_NOTQUERYI,      /* 76 */
+  OP_NOTMINQUERYI,   /* 77 */
+
+  OP_NOTUPTOI,       /* 78 From 0 to n matches, caseless */
+  OP_NOTMINUPTOI,    /* 79 */
+  OP_NOTEXACTI,      /* 80 Exactly n matches */
+
+  OP_NOTPOSSTARI,    /* 81 Possessified versions, caseless */
+  OP_NOTPOSPLUSI,    /* 82 */
+  OP_NOTPOSQUERYI,   /* 83 */
+  OP_NOTPOSUPTOI,    /* 84 */
+
+  /* Character types */
+
+  OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
+  OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
+  OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */
+  OP_TYPEMINPLUS,    /* 88 be in exactly the same order as those above. */
+  OP_TYPEQUERY,      /* 89 */
+  OP_TYPEMINQUERY,   /* 90 */
+
+  OP_TYPEUPTO,       /* 91 From 0 to n matches */
+  OP_TYPEMINUPTO,    /* 92 */
+  OP_TYPEEXACT,      /* 93 Exactly n matches */
+
+  OP_TYPEPOSSTAR,    /* 94 Possessified versions */
+  OP_TYPEPOSPLUS,    /* 95 */
+  OP_TYPEPOSQUERY,   /* 96 */
+  OP_TYPEPOSUPTO,    /* 97 */
+
+  /* These are used for character classes and back references; only the
+  first six are the same as the sets above. */
+
+  OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */
+  OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */
+  OP_CRPLUS,         /* 100 the minimizing one second. These codes must */
+  OP_CRMINPLUS,      /* 101 be in exactly the same order as those above. */
+  OP_CRQUERY,        /* 102 */
+  OP_CRMINQUERY,     /* 103 */
+
+  OP_CRRANGE,        /* 104 These are different to the three sets above. */
+  OP_CRMINRANGE,     /* 105 */
+
+  OP_CRPOSSTAR,      /* 106 Possessified versions */
+  OP_CRPOSPLUS,      /* 107 */
+  OP_CRPOSQUERY,     /* 108 */
+  OP_CRPOSRANGE,     /* 109 */
+
+  /* End of quantifier opcodes */
+
+  OP_CLASS,          /* 110 Match a character class, chars < 256 only */
+  OP_NCLASS,         /* 111 Same, but the bitmap was created from a negative
+                              class - the difference is relevant only when a
+                              character > 255 is encountered. */
+  OP_XCLASS,         /* 112 Extended class for handling > 255 chars within the
+                              class. This does both positive and negative. */
+  OP_REF,            /* 113 Match a back reference, casefully */
+  OP_REFI,           /* 114 Match a back reference, caselessly */
+  OP_DNREF,          /* 115 Match a duplicate name backref, casefully */
+  OP_DNREFI,         /* 116 Match a duplicate name backref, caselessly */
+  OP_RECURSE,        /* 117 Match a numbered subpattern (possibly recursive) */
+  OP_CALLOUT,        /* 118 Call out to external function if provided */
+  OP_CALLOUT_STR,    /* 119 Call out with string argument */
+
+  OP_ALT,            /* 120 Start of alternation */
+  OP_KET,            /* 121 End of group that doesn't have an unbounded repeat */
+  OP_KETRMAX,        /* 122 These two must remain together and in this */
+  OP_KETRMIN,        /* 123 order. They are for groups the repeat for ever. */
+  OP_KETRPOS,        /* 124 Possessive unlimited repeat. */
+
+  /* The assertions must come before BRA, CBRA, ONCE, and COND. */
+
+  OP_REVERSE,        /* 125 Move pointer back - used in lookbehind assertions */
+  OP_ASSERT,         /* 126 Positive lookahead */
+  OP_ASSERT_NOT,     /* 127 Negative lookahead */
+  OP_ASSERTBACK,     /* 128 Positive lookbehind */
+  OP_ASSERTBACK_NOT, /* 129 Negative lookbehind */
+  OP_ASSERT_NA,      /* 130 Positive non-atomic lookahead */
+  OP_ASSERTBACK_NA,  /* 131 Positive non-atomic lookbehind */
+
+  /* ONCE, SCRIPT_RUN, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come
+  immediately after the assertions, with ONCE first, as there's a test for >=
+  ONCE for a subpattern that isn't an assertion. The POS versions must
+  immediately follow the non-POS versions in each case. */
+
+  OP_ONCE,           /* 132 Atomic group, contains captures */
+  OP_SCRIPT_RUN,     /* 133 Non-capture, but check characters' scripts */
+  OP_BRA,            /* 134 Start of non-capturing bracket */
+  OP_BRAPOS,         /* 135 Ditto, with unlimited, possessive repeat */
+  OP_CBRA,           /* 136 Start of capturing bracket */
+  OP_CBRAPOS,        /* 137 Ditto, with unlimited, possessive repeat */
+  OP_COND,           /* 138 Conditional group */
+
+  /* These five must follow the previous five, in the same order. There's a
+  check for >= SBRA to distinguish the two sets. */
+
+  OP_SBRA,           /* 139 Start of non-capturing bracket, check empty  */
+  OP_SBRAPOS,        /* 149 Ditto, with unlimited, possessive repeat */
+  OP_SCBRA,          /* 141 Start of capturing bracket, check empty */
+  OP_SCBRAPOS,       /* 142 Ditto, with unlimited, possessive repeat */
+  OP_SCOND,          /* 143 Conditional group, check empty */
+
+  /* The next two pairs must (respectively) be kept together. */
+
+  OP_CREF,           /* 144 Used to hold a capture number as condition */
+  OP_DNCREF,         /* 145 Used to point to duplicate names as a condition */
+  OP_RREF,           /* 146 Used to hold a recursion number as condition */
+  OP_DNRREF,         /* 147 Used to point to duplicate names as a condition */
+  OP_FALSE,          /* 148 Always false (used by DEFINE and VERSION) */
+  OP_TRUE,           /* 149 Always true (used by VERSION) */
+
+  OP_BRAZERO,        /* 150 These two must remain together and in this */
+  OP_BRAMINZERO,     /* 151 order. */
+  OP_BRAPOSZERO,     /* 152 */
+
+  /* These are backtracking control verbs */
+
+  OP_MARK,           /* 153 always has an argument */
+  OP_PRUNE,          /* 154 */
+  OP_PRUNE_ARG,      /* 155 same, but with argument */
+  OP_SKIP,           /* 156 */
+  OP_SKIP_ARG,       /* 157 same, but with argument */
+  OP_THEN,           /* 158 */
+  OP_THEN_ARG,       /* 159 same, but with argument */
+  OP_COMMIT,         /* 160 */
+  OP_COMMIT_ARG,     /* 161 same, but with argument */
+
+  /* These are forced failure and success verbs. FAIL and ACCEPT do accept an
+  argument, but these cases can be compiled as, for example, (*MARK:X)(*FAIL)
+  without the need for a special opcode. */
+
+  OP_FAIL,           /* 162 */
+  OP_ACCEPT,         /* 163 */
+  OP_ASSERT_ACCEPT,  /* 164 Used inside assertions */
+  OP_CLOSE,          /* 165 Used before OP_ACCEPT to close open captures */
+
+  /* This is used to skip a subpattern with a {0} quantifier */
+
+  OP_SKIPZERO,       /* 166 */
+
+  /* This is used to identify a DEFINE group during compilation so that it can
+  be checked for having only one branch. It is changed to OP_FALSE before
+  compilation finishes. */
+
+  OP_DEFINE,         /* 167 */
+
+  /* This is not an opcode, but is used to check that tables indexed by opcode
+  are the correct length, in order to catch updating errors - there have been
+  some in the past. */
+
+  OP_TABLE_LENGTH
+
+};
+
+/* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
+definitions that follow must also be updated to match. There are also tables
+called "opcode_possessify" in pcre2_compile.c and "coptable" and "poptable" in
+pcre2_dfa_match.c that must be updated. */
+
+
+/* This macro defines textual names for all the opcodes. These are used only
+for debugging, and some of them are only partial names. The macro is referenced
+only in pcre2_printint.c, which fills out the full names in many cases (and in
+some cases doesn't actually use these names at all). */
+
+#define OP_NAME_LIST \
+  "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
+  "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
+  "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
+  "extuni",  "\\Z", "\\z",                                        \
+  "$", "$", "^", "^", "char", "chari", "not", "noti",             \
+  "*", "*?", "+", "+?", "?", "??",                                \
+  "{", "{", "{",                                                  \
+  "*+","++", "?+", "{",                                           \
+  "*", "*?", "+", "+?", "?", "??",                                \
+  "{", "{", "{",                                                  \
+  "*+","++", "?+", "{",                                           \
+  "*", "*?", "+", "+?", "?", "??",                                \
+  "{", "{", "{",                                                  \
+  "*+","++", "?+", "{",                                           \
+  "*", "*?", "+", "+?", "?", "??",                                \
+  "{", "{", "{",                                                  \
+  "*+","++", "?+", "{",                                           \
+  "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
+  "*+","++", "?+", "{",                                           \
+  "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
+  "*+","++", "?+", "{",                                           \
+  "class", "nclass", "xclass", "Ref", "Refi", "DnRef", "DnRefi",  \
+  "Recurse", "Callout", "CalloutStr",                             \
+  "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
+  "Reverse", "Assert", "Assert not",                              \
+  "Assert back", "Assert back not",                               \
+  "Non-atomic assert", "Non-atomic assert back",                  \
+  "Once",                                                         \
+  "Script run",                                                   \
+  "Bra", "BraPos", "CBra", "CBraPos",                             \
+  "Cond",                                                         \
+  "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
+  "SCond",                                                        \
+  "Cond ref", "Cond dnref", "Cond rec", "Cond dnrec",             \
+  "Cond false", "Cond true",                                      \
+  "Brazero", "Braminzero", "Braposzero",                          \
+  "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
+  "*THEN", "*THEN", "*COMMIT", "*COMMIT", "*FAIL",                \
+  "*ACCEPT", "*ASSERT_ACCEPT",                                    \
+  "Close", "Skip zero", "Define"
+
+
+/* This macro defines the length of fixed length operations in the compiled
+regex. The lengths are used when searching for specific things, and also in the
+debugging printing of a compiled regex. We use a macro so that it can be
+defined close to the definitions of the opcodes themselves.
+
+As things have been extended, some of these are no longer fixed lenths, but are
+minima instead. For example, the length of a single-character repeat may vary
+in UTF-8 mode. The code that uses this table must know about such things. */
+
+#define OP_LENGTHS \
+  1,                             /* End                                    */ \
+  1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
+  1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
+  1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \
+  3, 3,                          /* \P, \p                                 */ \
+  1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
+  1,                             /* \X                                     */ \
+  1, 1, 1, 1, 1, 1,              /* \Z, \z, $, $M ^, ^M                    */ \
+  2,                             /* Char  - the minimum length             */ \
+  2,                             /* Chari  - the minimum length            */ \
+  2,                             /* not                                    */ \
+  2,                             /* noti                                   */ \
+  /* Positive single-char repeats                             ** These are */ \
+  2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \
+  2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto, minupto             ** mode      */ \
+  2+IMM2_SIZE,                   /* exact                                  */ \
+  2, 2, 2, 2+IMM2_SIZE,          /* *+, ++, ?+, upto+                      */ \
+  2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \
+  2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto I, minupto I                      */ \
+  2+IMM2_SIZE,                   /* exact I                                */ \
+  2, 2, 2, 2+IMM2_SIZE,          /* *+I, ++I, ?+I, upto+I                  */ \
+  /* Negative single-char repeats - only for chars < 256                   */ \
+  2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
+  2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto, minupto                      */ \
+  2+IMM2_SIZE,                   /* NOT exact                              */ \
+  2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *, +, ?, upto           */ \
+  2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \
+  2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto I, minupto I                  */ \
+  2+IMM2_SIZE,                   /* NOT exact I                            */ \
+  2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *I, +I, ?I, upto I      */ \
+  /* Positive type repeats                                                 */ \
+  2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
+  2+IMM2_SIZE, 2+IMM2_SIZE,      /* Type upto, minupto                     */ \
+  2+IMM2_SIZE,                   /* Type exact                             */ \
+  2, 2, 2, 2+IMM2_SIZE,          /* Possessive *+, ++, ?+, upto+           */ \
+  /* Character class & ref repeats                                         */ \
+  1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
+  1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \
+  1, 1, 1, 1+2*IMM2_SIZE,        /* Possessive *+, ++, ?+, CRPOSRANGE      */ \
+  1+(32/sizeof(PCRE2_UCHAR)),    /* CLASS                                  */ \
+  1+(32/sizeof(PCRE2_UCHAR)),    /* NCLASS                                 */ \
+  0,                             /* XCLASS - variable length               */ \
+  1+IMM2_SIZE,                   /* REF                                    */ \
+  1+IMM2_SIZE,                   /* REFI                                   */ \
+  1+2*IMM2_SIZE,                 /* DNREF                                  */ \
+  1+2*IMM2_SIZE,                 /* DNREFI                                 */ \
+  1+LINK_SIZE,                   /* RECURSE                                */ \
+  1+2*LINK_SIZE+1,               /* CALLOUT                                */ \
+  0,                             /* CALLOUT_STR - variable length          */ \
+  1+LINK_SIZE,                   /* Alt                                    */ \
+  1+LINK_SIZE,                   /* Ket                                    */ \
+  1+LINK_SIZE,                   /* KetRmax                                */ \
+  1+LINK_SIZE,                   /* KetRmin                                */ \
+  1+LINK_SIZE,                   /* KetRpos                                */ \
+  1+LINK_SIZE,                   /* Reverse                                */ \
+  1+LINK_SIZE,                   /* Assert                                 */ \
+  1+LINK_SIZE,                   /* Assert not                             */ \
+  1+LINK_SIZE,                   /* Assert behind                          */ \
+  1+LINK_SIZE,                   /* Assert behind not                      */ \
+  1+LINK_SIZE,                   /* NA Assert                              */ \
+  1+LINK_SIZE,                   /* NA Assert behind                       */ \
+  1+LINK_SIZE,                   /* ONCE                                   */ \
+  1+LINK_SIZE,                   /* SCRIPT_RUN                             */ \
+  1+LINK_SIZE,                   /* BRA                                    */ \
+  1+LINK_SIZE,                   /* BRAPOS                                 */ \
+  1+LINK_SIZE+IMM2_SIZE,         /* CBRA                                   */ \
+  1+LINK_SIZE+IMM2_SIZE,         /* CBRAPOS                                */ \
+  1+LINK_SIZE,                   /* COND                                   */ \
+  1+LINK_SIZE,                   /* SBRA                                   */ \
+  1+LINK_SIZE,                   /* SBRAPOS                                */ \
+  1+LINK_SIZE+IMM2_SIZE,         /* SCBRA                                  */ \
+  1+LINK_SIZE+IMM2_SIZE,         /* SCBRAPOS                               */ \
+  1+LINK_SIZE,                   /* SCOND                                  */ \
+  1+IMM2_SIZE, 1+2*IMM2_SIZE,    /* CREF, DNCREF                           */ \
+  1+IMM2_SIZE, 1+2*IMM2_SIZE,    /* RREF, DNRREF                           */ \
+  1, 1,                          /* FALSE, TRUE                            */ \
+  1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
+  3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
+  1, 3,                          /* SKIP, SKIP_ARG                         */ \
+  1, 3,                          /* THEN, THEN_ARG                         */ \
+  1, 3,                          /* COMMIT, COMMIT_ARG                     */ \
+  1, 1, 1,                       /* FAIL, ACCEPT, ASSERT_ACCEPT            */ \
+  1+IMM2_SIZE, 1,                /* CLOSE, SKIPZERO                        */ \
+  1                              /* DEFINE                                 */
+
+/* A magic value for OP_RREF to indicate the "any recursion" condition. */
+
+#define RREF_ANY  0xffff
+
+
+/* ---------- Private structures that are mode-independent. ---------- */
+
+/* Structure to hold data for custom memory management. */
+
+typedef struct pcre2_memctl {
+  void *    (*malloc)(size_t, void *);
+  void      (*free)(void *, void *);
+  void      *memory_data;
+} pcre2_memctl;
+
+/* Structure for building a chain of open capturing subpatterns during
+compiling, so that instructions to close them can be compiled when (*ACCEPT) is
+encountered. */
+
+typedef struct open_capitem {
+  struct open_capitem *next;    /* Chain link */
+  uint16_t number;              /* Capture number */
+  uint16_t assert_depth;        /* Assertion depth when opened */
+} open_capitem;
+
+/* Layout of the UCP type table that translates property names into types and
+codes. Each entry used to point directly to a name, but to reduce the number of
+relocations in shared libraries, it now has an offset into a single string
+instead. */
+
+typedef struct {
+  uint16_t name_offset;
+  uint16_t type;
+  uint16_t value;
+} ucp_type_table;
+
+/* Unicode character database (UCD) record format */
+
+typedef struct {
+  uint8_t script;     /* ucp_Arabic, etc. */
+  uint8_t chartype;   /* ucp_Cc, etc. (general categories) */
+  uint8_t gbprop;     /* ucp_gbControl, etc. (grapheme break property) */
+  uint8_t caseset;    /* offset to multichar other cases or zero */
+  int32_t other_case; /* offset to other case, or zero if none */
+  uint16_t scriptx_bidiclass; /* script extension (11 bit) and bidi class (5 bit) values */
+  uint16_t bprops;    /* binary properties offset */
+} ucd_record;
+
+/* UCD access macros */
+
+#define UCD_BLOCK_SIZE 128
+#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \
+        PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
+        UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+#define GET_UCD(ch) ((ch > MAX_UTF_CODE_POINT)? \
+  PRIV(dummy_ucd_record) : REAL_GET_UCD(ch))
+#else
+#define GET_UCD(ch) REAL_GET_UCD(ch)
+#endif
+
+#define UCD_SCRIPTX_MASK 0x3ff
+#define UCD_BIDICLASS_SHIFT 11
+#define UCD_BPROPS_MASK 0xfff
+
+#define UCD_SCRIPTX_PROP(prop) ((prop)->scriptx_bidiclass & UCD_SCRIPTX_MASK)
+#define UCD_BIDICLASS_PROP(prop) ((prop)->scriptx_bidiclass >> UCD_BIDICLASS_SHIFT)
+#define UCD_BPROPS_PROP(prop) ((prop)->bprops & UCD_BPROPS_MASK)
+
+#define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
+#define UCD_SCRIPT(ch)      GET_UCD(ch)->script
+#define UCD_CATEGORY(ch)    PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
+#define UCD_GRAPHBREAK(ch)  GET_UCD(ch)->gbprop
+#define UCD_CASESET(ch)     GET_UCD(ch)->caseset
+#define UCD_OTHERCASE(ch)   ((uint32_t)((int)ch + (int)(GET_UCD(ch)->other_case)))
+#define UCD_SCRIPTX(ch)     UCD_SCRIPTX_PROP(GET_UCD(ch))
+#define UCD_BPROPS(ch)      UCD_BPROPS_PROP(GET_UCD(ch))
+#define UCD_BIDICLASS(ch)   UCD_BIDICLASS_PROP(GET_UCD(ch))
+
+/* The "scriptx" and bprops fields contain offsets into vectors of 32-bit words
+that form a bitmap representing a list of scripts or boolean properties. These
+macros test or set a bit in the map by number. */
+
+#define MAPBIT(map,n) ((map)[(n)/32]&(1u<<((n)%32)))
+#define MAPSET(map,n) ((map)[(n)/32]|=(1u<<((n)%32)))
+
+/* Header for serialized pcre2 codes. */
+
+typedef struct pcre2_serialized_data {
+  uint32_t magic;
+  uint32_t version;
+  uint32_t config;
+  int32_t  number_of_codes;
+} pcre2_serialized_data;
+
+
+
+/* ----------------- Items that need PCRE2_CODE_UNIT_WIDTH ----------------- */
+
+/* When this file is included by pcre2test, PCRE2_CODE_UNIT_WIDTH is defined as
+0, so the following items are omitted. */
+
+#if defined PCRE2_CODE_UNIT_WIDTH && PCRE2_CODE_UNIT_WIDTH != 0
+
+/* EBCDIC is supported only for the 8-bit library. */
+
+#if defined EBCDIC && PCRE2_CODE_UNIT_WIDTH != 8
+#error EBCDIC is not supported for the 16-bit or 32-bit libraries
+#endif
+
+/* This is the largest non-UTF code point. */
+
+#define MAX_NON_UTF_CHAR (0xffffffffU >> (32 - PCRE2_CODE_UNIT_WIDTH))
+
+/* Internal shared data tables and variables. These are used by more than one
+of the exported public functions. They have to be "external" in the C sense,
+but are not part of the PCRE2 public API. Although the data for some of them is
+identical in all libraries, they must have different names so that multiple
+libraries can be simultaneously linked to a single application. However, UTF-8
+tables are needed only when compiling the 8-bit library. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+extern const int              PRIV(utf8_table1)[];
+extern const int              PRIV(utf8_table1_size);
+extern const int              PRIV(utf8_table2)[];
+extern const int              PRIV(utf8_table3)[];
+extern const uint8_t          PRIV(utf8_table4)[];
+#endif
+
+#define _pcre2_OP_lengths              PCRE2_SUFFIX(_pcre2_OP_lengths_)
+#define _pcre2_callout_end_delims      PCRE2_SUFFIX(_pcre2_callout_end_delims_)
+#define _pcre2_callout_start_delims    PCRE2_SUFFIX(_pcre2_callout_start_delims_)
+#define _pcre2_default_compile_context PCRE2_SUFFIX(_pcre2_default_compile_context_)
+#define _pcre2_default_convert_context PCRE2_SUFFIX(_pcre2_default_convert_context_)
+#define _pcre2_default_match_context   PCRE2_SUFFIX(_pcre2_default_match_context_)
+#define _pcre2_default_tables          PCRE2_SUFFIX(_pcre2_default_tables_)
+#if PCRE2_CODE_UNIT_WIDTH == 32
+#define _pcre2_dummy_ucd_record        PCRE2_SUFFIX(_pcre2_dummy_ucd_record_)
+#endif
+#define _pcre2_hspace_list             PCRE2_SUFFIX(_pcre2_hspace_list_)
+#define _pcre2_vspace_list             PCRE2_SUFFIX(_pcre2_vspace_list_)
+#define _pcre2_ucd_boolprop_sets       PCRE2_SUFFIX(_pcre2_ucd_boolprop_sets_)
+#define _pcre2_ucd_caseless_sets       PCRE2_SUFFIX(_pcre2_ucd_caseless_sets_)
+#define _pcre2_ucd_digit_sets          PCRE2_SUFFIX(_pcre2_ucd_digit_sets_)
+#define _pcre2_ucd_script_sets         PCRE2_SUFFIX(_pcre2_ucd_script_sets_)
+#define _pcre2_ucd_records             PCRE2_SUFFIX(_pcre2_ucd_records_)
+#define _pcre2_ucd_stage1              PCRE2_SUFFIX(_pcre2_ucd_stage1_)
+#define _pcre2_ucd_stage2              PCRE2_SUFFIX(_pcre2_ucd_stage2_)
+#define _pcre2_ucp_gbtable             PCRE2_SUFFIX(_pcre2_ucp_gbtable_)
+#define _pcre2_ucp_gentype             PCRE2_SUFFIX(_pcre2_ucp_gentype_)
+#define _pcre2_ucp_typerange           PCRE2_SUFFIX(_pcre2_ucp_typerange_)
+#define _pcre2_unicode_version         PCRE2_SUFFIX(_pcre2_unicode_version_)
+#define _pcre2_utt                     PCRE2_SUFFIX(_pcre2_utt_)
+#define _pcre2_utt_names               PCRE2_SUFFIX(_pcre2_utt_names_)
+#define _pcre2_utt_size                PCRE2_SUFFIX(_pcre2_utt_size_)
+
+extern const uint8_t                   PRIV(OP_lengths)[];
+extern const uint32_t                  PRIV(callout_end_delims)[];
+extern const uint32_t                  PRIV(callout_start_delims)[];
+extern const pcre2_compile_context     PRIV(default_compile_context);
+extern const pcre2_convert_context     PRIV(default_convert_context);
+extern const pcre2_match_context       PRIV(default_match_context);
+extern const uint8_t                   PRIV(default_tables)[];
+extern const uint32_t                  PRIV(hspace_list)[];
+extern const uint32_t                  PRIV(vspace_list)[];
+extern const uint32_t                  PRIV(ucd_boolprop_sets)[];
+extern const uint32_t                  PRIV(ucd_caseless_sets)[];
+extern const uint32_t                  PRIV(ucd_digit_sets)[];
+extern const uint32_t                  PRIV(ucd_script_sets)[];
+extern const ucd_record                PRIV(ucd_records)[];
+#if PCRE2_CODE_UNIT_WIDTH == 32
+extern const ucd_record                PRIV(dummy_ucd_record)[];
+#endif
+extern const uint16_t                  PRIV(ucd_stage1)[];
+extern const uint16_t                  PRIV(ucd_stage2)[];
+extern const uint32_t                  PRIV(ucp_gbtable)[];
+extern const uint32_t                  PRIV(ucp_gentype)[];
+#ifdef SUPPORT_JIT
+extern const int                       PRIV(ucp_typerange)[];
+#endif
+extern const char                     *PRIV(unicode_version);
+extern const ucp_type_table            PRIV(utt)[];
+extern const char                      PRIV(utt_names)[];
+extern const size_t                    PRIV(utt_size);
+
+/* Mode-dependent macros and hidden and private structures are defined in a
+separate file so that pcre2test can include them at all supported widths. When
+compiling the library, PCRE2_CODE_UNIT_WIDTH will be defined, and we can
+include them at the appropriate width, after setting up suffix macros for the
+private structures. */
+
+#define branch_chain                 PCRE2_SUFFIX(branch_chain_)
+#define compile_block                PCRE2_SUFFIX(compile_block_)
+#define dfa_match_block              PCRE2_SUFFIX(dfa_match_block_)
+#define match_block                  PCRE2_SUFFIX(match_block_)
+#define named_group                  PCRE2_SUFFIX(named_group_)
+
+#include "pcre2_intmodedep.h"
+
+/* Private "external" functions. These are internal functions that are called
+from modules other than the one in which they are defined. They have to be
+"external" in the C sense, but are not part of the PCRE2 public API. They are
+not referenced from pcre2test, and must not be defined when no code unit width
+is available. */
+
+#define _pcre2_auto_possessify       PCRE2_SUFFIX(_pcre2_auto_possessify_)
+#define _pcre2_check_escape          PCRE2_SUFFIX(_pcre2_check_escape_)
+#define _pcre2_extuni                PCRE2_SUFFIX(_pcre2_extuni_)
+#define _pcre2_find_bracket          PCRE2_SUFFIX(_pcre2_find_bracket_)
+#define _pcre2_is_newline            PCRE2_SUFFIX(_pcre2_is_newline_)
+#define _pcre2_jit_free_rodata       PCRE2_SUFFIX(_pcre2_jit_free_rodata_)
+#define _pcre2_jit_free              PCRE2_SUFFIX(_pcre2_jit_free_)
+#define _pcre2_jit_get_size          PCRE2_SUFFIX(_pcre2_jit_get_size_)
+#define _pcre2_jit_get_target        PCRE2_SUFFIX(_pcre2_jit_get_target_)
+#define _pcre2_memctl_malloc         PCRE2_SUFFIX(_pcre2_memctl_malloc_)
+#define _pcre2_ord2utf               PCRE2_SUFFIX(_pcre2_ord2utf_)
+#define _pcre2_script_run            PCRE2_SUFFIX(_pcre2_script_run_)
+#define _pcre2_strcmp                PCRE2_SUFFIX(_pcre2_strcmp_)
+#define _pcre2_strcmp_c8             PCRE2_SUFFIX(_pcre2_strcmp_c8_)
+#define _pcre2_strcpy_c8             PCRE2_SUFFIX(_pcre2_strcpy_c8_)
+#define _pcre2_strlen                PCRE2_SUFFIX(_pcre2_strlen_)
+#define _pcre2_strncmp               PCRE2_SUFFIX(_pcre2_strncmp_)
+#define _pcre2_strncmp_c8            PCRE2_SUFFIX(_pcre2_strncmp_c8_)
+#define _pcre2_study                 PCRE2_SUFFIX(_pcre2_study_)
+#define _pcre2_valid_utf             PCRE2_SUFFIX(_pcre2_valid_utf_)
+#define _pcre2_was_newline           PCRE2_SUFFIX(_pcre2_was_newline_)
+#define _pcre2_xclass                PCRE2_SUFFIX(_pcre2_xclass_)
+
+extern int          _pcre2_auto_possessify(PCRE2_UCHAR *,
+                      const compile_block *);
+extern int          _pcre2_check_escape(PCRE2_SPTR *, PCRE2_SPTR, uint32_t *,
+                      int *, uint32_t, uint32_t, BOOL, compile_block *);
+extern PCRE2_SPTR   _pcre2_extuni(uint32_t, PCRE2_SPTR, PCRE2_SPTR, PCRE2_SPTR,
+                      BOOL, int *);
+extern PCRE2_SPTR   _pcre2_find_bracket(PCRE2_SPTR, BOOL, int);
+extern BOOL         _pcre2_is_newline(PCRE2_SPTR, uint32_t, PCRE2_SPTR,
+                      uint32_t *, BOOL);
+extern void         _pcre2_jit_free_rodata(void *, void *);
+extern void         _pcre2_jit_free(void *, pcre2_memctl *);
+extern size_t       _pcre2_jit_get_size(void *);
+const char *        _pcre2_jit_get_target(void);
+extern void *       _pcre2_memctl_malloc(size_t, pcre2_memctl *);
+extern unsigned int _pcre2_ord2utf(uint32_t, PCRE2_UCHAR *);
+extern BOOL         _pcre2_script_run(PCRE2_SPTR, PCRE2_SPTR, BOOL);
+extern int          _pcre2_strcmp(PCRE2_SPTR, PCRE2_SPTR);
+extern int          _pcre2_strcmp_c8(PCRE2_SPTR, const char *);
+extern PCRE2_SIZE   _pcre2_strcpy_c8(PCRE2_UCHAR *, const char *);
+extern PCRE2_SIZE   _pcre2_strlen(PCRE2_SPTR);
+extern int          _pcre2_strncmp(PCRE2_SPTR, PCRE2_SPTR, size_t);
+extern int          _pcre2_strncmp_c8(PCRE2_SPTR, const char *, size_t);
+extern int          _pcre2_study(pcre2_real_code *);
+extern int          _pcre2_valid_utf(PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE *);
+extern BOOL         _pcre2_was_newline(PCRE2_SPTR, uint32_t, PCRE2_SPTR,
+                      uint32_t *, BOOL);
+extern BOOL         _pcre2_xclass(uint32_t, PCRE2_SPTR, BOOL);
+
+/* This function is needed only when memmove() is not available. */
+
+#if !defined(VPCOMPAT) && !defined(HAVE_MEMMOVE)
+#define _pcre2_memmove               PCRE2_SUFFIX(_pcre2_memmove)
+extern void *       _pcre2_memmove(void *, const void *, size_t);
+#endif
+
+#endif  /* PCRE2_CODE_UNIT_WIDTH */
+#endif  /* PCRE2_INTERNAL_H_IDEMPOTENT_GUARD */
+
+/* End of pcre2_internal.h */
diff --git a/Foundation/src/pcre2_intmodedep.h b/Foundation/src/pcre2_intmodedep.h
new file mode 100644
index 000000000..f8a3d25de
--- /dev/null
+++ b/Foundation/src/pcre2_intmodedep.h
@@ -0,0 +1,934 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2018 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains mode-dependent macro and structure definitions. The
+file is #included by pcre2_internal.h if PCRE2_CODE_UNIT_WIDTH is defined.
+These mode-dependent items are kept in a separate file so that they can also be
+#included multiple times for different code unit widths by pcre2test in order
+to have access to the hidden structures at all supported widths.
+
+Some of the mode-dependent macros are required at different widths for
+different parts of the pcre2test code (in particular, the included
+pcre_printint.c file). We undefine them here so that they can be re-defined for
+multiple inclusions. Not all of these are used in pcre2test, but it's easier
+just to undefine them all. */
+
+#undef ACROSSCHAR
+#undef BACKCHAR
+#undef BYTES2CU
+#undef CHMAX_255
+#undef CU2BYTES
+#undef FORWARDCHAR
+#undef FORWARDCHARTEST
+#undef GET
+#undef GET2
+#undef GETCHAR
+#undef GETCHARINC
+#undef GETCHARINCTEST
+#undef GETCHARLEN
+#undef GETCHARLENTEST
+#undef GETCHARTEST
+#undef GET_EXTRALEN
+#undef HAS_EXTRALEN
+#undef IMM2_SIZE
+#undef MAX_255
+#undef MAX_MARK
+#undef MAX_PATTERN_SIZE
+#undef MAX_UTF_SINGLE_CU
+#undef NOT_FIRSTCU
+#undef PUT
+#undef PUT2
+#undef PUT2INC
+#undef PUTCHAR
+#undef PUTINC
+#undef TABLE_GET
+
+
+
+/* -------------------------- MACROS ----------------------------- */
+
+/* PCRE keeps offsets in its compiled code as at least 16-bit quantities
+(always stored in big-endian order in 8-bit mode) by default. These are used,
+for example, to link from the start of a subpattern to its alternatives and its
+end. The use of 16 bits per offset limits the size of an 8-bit compiled regex
+to around 64K, which is big enough for almost everybody. However, I received a
+request for an even bigger limit. For this reason, and also to make the code
+easier to maintain, the storing and loading of offsets from the compiled code
+unit string is now handled by the macros that are defined here.
+
+The macros are controlled by the value of LINK_SIZE. This defaults to 2, but
+values of 3 or 4 are also supported. */
+
+/* ------------------- 8-bit support  ------------------ */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+
+#if LINK_SIZE == 2
+#define PUT(a,n,d)   \
+  (a[n] = (PCRE2_UCHAR)((d) >> 8)), \
+  (a[(n)+1] = (PCRE2_UCHAR)((d) & 255))
+#define GET(a,n) \
+  (unsigned int)(((a)[n] << 8) | (a)[(n)+1])
+#define MAX_PATTERN_SIZE (1 << 16)
+
+#elif LINK_SIZE == 3
+#define PUT(a,n,d)       \
+  (a[n] = (PCRE2_UCHAR)((d) >> 16)),    \
+  (a[(n)+1] = (PCRE2_UCHAR)((d) >> 8)), \
+  (a[(n)+2] = (PCRE2_UCHAR)((d) & 255))
+#define GET(a,n) \
+  (unsigned int)(((a)[n] << 16) | ((a)[(n)+1] << 8) | (a)[(n)+2])
+#define MAX_PATTERN_SIZE (1 << 24)
+
+#elif LINK_SIZE == 4
+#define PUT(a,n,d)        \
+  (a[n] = (PCRE2_UCHAR)((d) >> 24)),     \
+  (a[(n)+1] = (PCRE2_UCHAR)((d) >> 16)), \
+  (a[(n)+2] = (PCRE2_UCHAR)((d) >> 8)),  \
+  (a[(n)+3] = (PCRE2_UCHAR)((d) & 255))
+#define GET(a,n) \
+  (unsigned int)(((a)[n] << 24) | ((a)[(n)+1] << 16) | ((a)[(n)+2] << 8) | (a)[(n)+3])
+#define MAX_PATTERN_SIZE (1 << 30)   /* Keep it positive */
+
+#else
+#error LINK_SIZE must be 2, 3, or 4
+#endif
+
+
+/* ------------------- 16-bit support  ------------------ */
+
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+
+#if LINK_SIZE == 2
+#undef LINK_SIZE
+#define LINK_SIZE 1
+#define PUT(a,n,d)   \
+  (a[n] = (PCRE2_UCHAR)(d))
+#define GET(a,n) \
+  (a[n])
+#define MAX_PATTERN_SIZE (1 << 16)
+
+#elif LINK_SIZE == 3 || LINK_SIZE == 4
+#undef LINK_SIZE
+#define LINK_SIZE 2
+#define PUT(a,n,d)   \
+  (a[n] = (PCRE2_UCHAR)((d) >> 16)), \
+  (a[(n)+1] = (PCRE2_UCHAR)((d) & 65535))
+#define GET(a,n) \
+  (unsigned int)(((a)[n] << 16) | (a)[(n)+1])
+#define MAX_PATTERN_SIZE (1 << 30)  /* Keep it positive */
+
+#else
+#error LINK_SIZE must be 2, 3, or 4
+#endif
+
+
+/* ------------------- 32-bit support  ------------------ */
+
+#elif PCRE2_CODE_UNIT_WIDTH == 32
+#undef LINK_SIZE
+#define LINK_SIZE 1
+#define PUT(a,n,d)   \
+  (a[n] = (d))
+#define GET(a,n) \
+  (a[n])
+#define MAX_PATTERN_SIZE (1 << 30)  /* Keep it positive */
+
+#else
+#error Unsupported compiling mode
+#endif
+
+
+/* --------------- Other mode-specific macros ----------------- */
+
+/* PCRE uses some other (at least) 16-bit quantities that do not change when
+the size of offsets changes. There are used for repeat counts and for other
+things such as capturing parenthesis numbers in back references.
+
+Define the number of code units required to hold a 16-bit count/offset, and
+macros to load and store such a value. For reasons that I do not understand,
+the expression in the 8-bit GET2 macro is treated by gcc as a signed
+expression, even when a is declared as unsigned. It seems that any kind of
+arithmetic results in a signed value. Hence the cast. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#define IMM2_SIZE 2
+#define GET2(a,n) (unsigned int)(((a)[n] << 8) | (a)[(n)+1])
+#define PUT2(a,n,d) a[n] = (d) >> 8, a[(n)+1] = (d) & 255
+
+#else  /* Code units are 16 or 32 bits */
+#define IMM2_SIZE 1
+#define GET2(a,n) a[n]
+#define PUT2(a,n,d) a[n] = d
+#endif
+
+/* Other macros that are different for 8-bit mode. The MAX_255 macro checks
+whether its argument, which is assumed to be one code unit, is less than 256.
+The CHMAX_255 macro does not assume one code unit. The maximum length of a MARK
+name must fit in one code unit; currently it is set to 255 or 65535. The
+TABLE_GET macro is used to access elements of tables containing exactly 256
+items. Its argument is a code unit. When code points can be greater than 255, a
+check is needed before accessing these tables. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#define MAX_255(c) TRUE
+#define MAX_MARK ((1u << 8) - 1)
+#define TABLE_GET(c, table, default) ((table)[c])
+#ifdef SUPPORT_UNICODE
+#define SUPPORT_WIDE_CHARS
+#define CHMAX_255(c) ((c) <= 255u)
+#else
+#define CHMAX_255(c) TRUE
+#endif  /* SUPPORT_UNICODE */
+
+#else  /* Code units are 16 or 32 bits */
+#define CHMAX_255(c) ((c) <= 255u)
+#define MAX_255(c) ((c) <= 255u)
+#define MAX_MARK ((1u << 16) - 1)
+#define SUPPORT_WIDE_CHARS
+#define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
+#endif
+
+
+/* ----------------- Character-handling macros ----------------- */
+
+/* There is a proposed future special "UTF-21" mode, in which only the lowest
+21 bits of a 32-bit character are interpreted as UTF, with the remaining 11
+high-order bits available to the application for other uses. In preparation for
+the future implementation of this mode, there are macros that load a data item
+and, if in this special mode, mask it to 21 bits. These macros all have names
+starting with UCHAR21. In all other modes, including the normal 32-bit
+library, the macros all have the same simple definitions. When the new mode is
+implemented, it is expected that these definitions will be varied appropriately
+using #ifdef when compiling the library that supports the special mode. */
+
+#define UCHAR21(eptr)        (*(eptr))
+#define UCHAR21TEST(eptr)    (*(eptr))
+#define UCHAR21INC(eptr)     (*(eptr)++)
+#define UCHAR21INCTEST(eptr) (*(eptr)++)
+
+/* When UTF encoding is being used, a character is no longer just a single
+byte in 8-bit mode or a single short in 16-bit mode. The macros for character
+handling generate simple sequences when used in the basic mode, and more
+complicated ones for UTF characters. GETCHARLENTEST and other macros are not
+used when UTF is not supported. To make sure they can never even appear when
+UTF support is omitted, we don't even define them. */
+
+#ifndef SUPPORT_UNICODE
+
+/* #define MAX_UTF_SINGLE_CU */
+/* #define HAS_EXTRALEN(c) */
+/* #define GET_EXTRALEN(c) */
+/* #define NOT_FIRSTCU(c) */
+#define GETCHAR(c, eptr) c = *eptr;
+#define GETCHARTEST(c, eptr) c = *eptr;
+#define GETCHARINC(c, eptr) c = *eptr++;
+#define GETCHARINCTEST(c, eptr) c = *eptr++;
+#define GETCHARLEN(c, eptr, len) c = *eptr;
+#define PUTCHAR(c, p) (*p = c, 1)
+/* #define GETCHARLENTEST(c, eptr, len) */
+/* #define BACKCHAR(eptr) */
+/* #define FORWARDCHAR(eptr) */
+/* #define FORWARCCHARTEST(eptr,end) */
+/* #define ACROSSCHAR(condition, eptr, action) */
+
+#else   /* SUPPORT_UNICODE */
+
+/* ------------------- 8-bit support  ------------------ */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#define MAYBE_UTF_MULTI          /* UTF chars may use multiple code units */
+
+/* The largest UTF code point that can be encoded as a single code unit. */
+
+#define MAX_UTF_SINGLE_CU 127
+
+/* Tests whether the code point needs extra characters to decode. */
+
+#define HAS_EXTRALEN(c) HASUTF8EXTRALEN(c)
+
+/* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
+Otherwise it has an undefined behaviour. */
+
+#define GET_EXTRALEN(c) (PRIV(utf8_table4)[(c) & 0x3fu])
+
+/* Returns TRUE, if the given value is not the first code unit of a UTF
+sequence. */
+
+#define NOT_FIRSTCU(c) (((c) & 0xc0u) == 0x80u)
+
+/* Get the next UTF-8 character, not advancing the pointer. This is called when
+we know we are in UTF-8 mode. */
+
+#define GETCHAR(c, eptr) \
+  c = *eptr; \
+  if (c >= 0xc0u) GETUTF8(c, eptr);
+
+/* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the
+pointer. */
+
+#define GETCHARTEST(c, eptr) \
+  c = *eptr; \
+  if (utf && c >= 0xc0u) GETUTF8(c, eptr);
+
+/* Get the next UTF-8 character, advancing the pointer. This is called when we
+know we are in UTF-8 mode. */
+
+#define GETCHARINC(c, eptr) \
+  c = *eptr++; \
+  if (c >= 0xc0u) GETUTF8INC(c, eptr);
+
+/* Get the next character, testing for UTF-8 mode, and advancing the pointer.
+This is called when we don't know if we are in UTF-8 mode. */
+
+#define GETCHARINCTEST(c, eptr) \
+  c = *eptr++; \
+  if (utf && c >= 0xc0u) GETUTF8INC(c, eptr);
+
+/* Get the next UTF-8 character, not advancing the pointer, incrementing length
+if there are extra bytes. This is called when we know we are in UTF-8 mode. */
+
+#define GETCHARLEN(c, eptr, len) \
+  c = *eptr; \
+  if (c >= 0xc0u) GETUTF8LEN(c, eptr, len);
+
+/* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the
+pointer, incrementing length if there are extra bytes. This is called when we
+do not know if we are in UTF-8 mode. */
+
+#define GETCHARLENTEST(c, eptr, len) \
+  c = *eptr; \
+  if (utf && c >= 0xc0u) GETUTF8LEN(c, eptr, len);
+
+/* If the pointer is not at the start of a character, move it back until
+it is. This is called only in UTF-8 mode - we don't put a test within the macro
+because almost all calls are already within a block of UTF-8 only code. */
+
+#define BACKCHAR(eptr) while((*eptr & 0xc0u) == 0x80u) eptr--
+
+/* Same as above, just in the other direction. */
+#define FORWARDCHAR(eptr) while((*eptr & 0xc0u) == 0x80u) eptr++
+#define FORWARDCHARTEST(eptr,end) while(eptr < end && (*eptr & 0xc0u) == 0x80u) eptr++
+
+/* Same as above, but it allows a fully customizable form. */
+#define ACROSSCHAR(condition, eptr, action) \
+  while((condition) && ((*eptr) & 0xc0u) == 0x80u) action
+
+/* Deposit a character into memory, returning the number of code units. */
+
+#define PUTCHAR(c, p) ((utf && c > MAX_UTF_SINGLE_CU)? \
+  PRIV(ord2utf)(c,p) : (*p = c, 1))
+
+
+/* ------------------- 16-bit support  ------------------ */
+
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+#define MAYBE_UTF_MULTI          /* UTF chars may use multiple code units */
+
+/* The largest UTF code point that can be encoded as a single code unit. */
+
+#define MAX_UTF_SINGLE_CU 65535
+
+/* Tests whether the code point needs extra characters to decode. */
+
+#define HAS_EXTRALEN(c) (((c) & 0xfc00u) == 0xd800u)
+
+/* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
+Otherwise it has an undefined behaviour. */
+
+#define GET_EXTRALEN(c) 1
+
+/* Returns TRUE, if the given value is not the first code unit of a UTF
+sequence. */
+
+#define NOT_FIRSTCU(c) (((c) & 0xfc00u) == 0xdc00u)
+
+/* Base macro to pick up the low surrogate of a UTF-16 character, not
+advancing the pointer. */
+
+#define GETUTF16(c, eptr) \
+   { c = (((c & 0x3ffu) << 10) | (eptr[1] & 0x3ffu)) + 0x10000u; }
+
+/* Get the next UTF-16 character, not advancing the pointer. This is called when
+we know we are in UTF-16 mode. */
+
+#define GETCHAR(c, eptr) \
+  c = *eptr; \
+  if ((c & 0xfc00u) == 0xd800u) GETUTF16(c, eptr);
+
+/* Get the next UTF-16 character, testing for UTF-16 mode, and not advancing the
+pointer. */
+
+#define GETCHARTEST(c, eptr) \
+  c = *eptr; \
+  if (utf && (c & 0xfc00u) == 0xd800u) GETUTF16(c, eptr);
+
+/* Base macro to pick up the low surrogate of a UTF-16 character, advancing
+the pointer. */
+
+#define GETUTF16INC(c, eptr) \
+   { c = (((c & 0x3ffu) << 10) | (*eptr++ & 0x3ffu)) + 0x10000u; }
+
+/* Get the next UTF-16 character, advancing the pointer. This is called when we
+know we are in UTF-16 mode. */
+
+#define GETCHARINC(c, eptr) \
+  c = *eptr++; \
+  if ((c & 0xfc00u) == 0xd800u) GETUTF16INC(c, eptr);
+
+/* Get the next character, testing for UTF-16 mode, and advancing the pointer.
+This is called when we don't know if we are in UTF-16 mode. */
+
+#define GETCHARINCTEST(c, eptr) \
+  c = *eptr++; \
+  if (utf && (c & 0xfc00u) == 0xd800u) GETUTF16INC(c, eptr);
+
+/* Base macro to pick up the low surrogate of a UTF-16 character, not
+advancing the pointer, incrementing the length. */
+
+#define GETUTF16LEN(c, eptr, len) \
+   { c = (((c & 0x3ffu) << 10) | (eptr[1] & 0x3ffu)) + 0x10000u; len++; }
+
+/* Get the next UTF-16 character, not advancing the pointer, incrementing
+length if there is a low surrogate. This is called when we know we are in
+UTF-16 mode. */
+
+#define GETCHARLEN(c, eptr, len) \
+  c = *eptr; \
+  if ((c & 0xfc00u) == 0xd800u) GETUTF16LEN(c, eptr, len);
+
+/* Get the next UTF-816character, testing for UTF-16 mode, not advancing the
+pointer, incrementing length if there is a low surrogate. This is called when
+we do not know if we are in UTF-16 mode. */
+
+#define GETCHARLENTEST(c, eptr, len) \
+  c = *eptr; \
+  if (utf && (c & 0xfc00u) == 0xd800u) GETUTF16LEN(c, eptr, len);
+
+/* If the pointer is not at the start of a character, move it back until
+it is. This is called only in UTF-16 mode - we don't put a test within the
+macro because almost all calls are already within a block of UTF-16 only
+code. */
+
+#define BACKCHAR(eptr) if ((*eptr & 0xfc00u) == 0xdc00u) eptr--
+
+/* Same as above, just in the other direction. */
+#define FORWARDCHAR(eptr) if ((*eptr & 0xfc00u) == 0xdc00u) eptr++
+#define FORWARDCHARTEST(eptr,end) if (eptr < end && (*eptr & 0xfc00u) == 0xdc00u) eptr++
+
+/* Same as above, but it allows a fully customizable form. */
+#define ACROSSCHAR(condition, eptr, action) \
+  if ((condition) && ((*eptr) & 0xfc00u) == 0xdc00u) action
+
+/* Deposit a character into memory, returning the number of code units. */
+
+#define PUTCHAR(c, p) ((utf && c > MAX_UTF_SINGLE_CU)? \
+  PRIV(ord2utf)(c,p) : (*p = c, 1))
+
+
+/* ------------------- 32-bit support  ------------------ */
+
+#else
+
+/* These are trivial for the 32-bit library, since all UTF-32 characters fit
+into one PCRE2_UCHAR unit. */
+
+#define MAX_UTF_SINGLE_CU (0x10ffffu)
+#define HAS_EXTRALEN(c) (0)
+#define GET_EXTRALEN(c) (0)
+#define NOT_FIRSTCU(c) (0)
+
+/* Get the next UTF-32 character, not advancing the pointer. This is called when
+we know we are in UTF-32 mode. */
+
+#define GETCHAR(c, eptr) \
+  c = *(eptr);
+
+/* Get the next UTF-32 character, testing for UTF-32 mode, and not advancing the
+pointer. */
+
+#define GETCHARTEST(c, eptr) \
+  c = *(eptr);
+
+/* Get the next UTF-32 character, advancing the pointer. This is called when we
+know we are in UTF-32 mode. */
+
+#define GETCHARINC(c, eptr) \
+  c = *((eptr)++);
+
+/* Get the next character, testing for UTF-32 mode, and advancing the pointer.
+This is called when we don't know if we are in UTF-32 mode. */
+
+#define GETCHARINCTEST(c, eptr) \
+  c = *((eptr)++);
+
+/* Get the next UTF-32 character, not advancing the pointer, not incrementing
+length (since all UTF-32 is of length 1). This is called when we know we are in
+UTF-32 mode. */
+
+#define GETCHARLEN(c, eptr, len) \
+  GETCHAR(c, eptr)
+
+/* Get the next UTF-32character, testing for UTF-32 mode, not advancing the
+pointer, not incrementing the length (since all UTF-32 is of length 1).
+This is called when we do not know if we are in UTF-32 mode. */
+
+#define GETCHARLENTEST(c, eptr, len) \
+  GETCHARTEST(c, eptr)
+
+/* If the pointer is not at the start of a character, move it back until
+it is. This is called only in UTF-32 mode - we don't put a test within the
+macro because almost all calls are already within a block of UTF-32 only
+code.
+
+These are all no-ops since all UTF-32 characters fit into one PCRE2_UCHAR. */
+
+#define BACKCHAR(eptr) do { } while (0)
+
+/* Same as above, just in the other direction. */
+
+#define FORWARDCHAR(eptr) do { } while (0)
+#define FORWARDCHARTEST(eptr,end) do { } while (0)
+
+/* Same as above, but it allows a fully customizable form. */
+
+#define ACROSSCHAR(condition, eptr, action) do { } while (0)
+
+/* Deposit a character into memory, returning the number of code units. */
+
+#define PUTCHAR(c, p) (*p = c, 1)
+
+#endif  /* UTF-32 character handling */
+#endif  /* SUPPORT_UNICODE */
+
+
+/* Mode-dependent macros that have the same definition in all modes. */
+
+#define CU2BYTES(x)     ((x)*((PCRE2_CODE_UNIT_WIDTH/8)))
+#define BYTES2CU(x)     ((x)/((PCRE2_CODE_UNIT_WIDTH/8)))
+#define PUTINC(a,n,d)   PUT(a,n,d), a += LINK_SIZE
+#define PUT2INC(a,n,d)  PUT2(a,n,d), a += IMM2_SIZE
+
+
+/* ----------------------- HIDDEN STRUCTURES ----------------------------- */
+
+/* NOTE: All these structures *must* start with a pcre2_memctl structure. The
+code that uses them is simpler because it assumes this. */
+
+/* The real general context structure. At present it holds only data for custom
+memory control. */
+
+typedef struct pcre2_real_general_context {
+  pcre2_memctl memctl;
+} pcre2_real_general_context;
+
+/* The real compile context structure */
+
+typedef struct pcre2_real_compile_context {
+  pcre2_memctl memctl;
+  int (*stack_guard)(uint32_t, void *);
+  void *stack_guard_data;
+  const uint8_t *tables;
+  PCRE2_SIZE max_pattern_length;
+  uint16_t bsr_convention;
+  uint16_t newline_convention;
+  uint32_t parens_nest_limit;
+  uint32_t extra_options;
+} pcre2_real_compile_context;
+
+/* The real match context structure. */
+
+typedef struct pcre2_real_match_context {
+  pcre2_memctl memctl;
+#ifdef SUPPORT_JIT
+  pcre2_jit_callback jit_callback;
+  void *jit_callback_data;
+#endif
+  int    (*callout)(pcre2_callout_block *, void *);
+  void    *callout_data;
+  int    (*substitute_callout)(pcre2_substitute_callout_block *, void *);
+  void    *substitute_callout_data;
+  PCRE2_SIZE offset_limit;
+  uint32_t heap_limit;
+  uint32_t match_limit;
+  uint32_t depth_limit;
+} pcre2_real_match_context;
+
+/* The real convert context structure. */
+
+typedef struct pcre2_real_convert_context {
+  pcre2_memctl memctl;
+  uint32_t glob_separator;
+  uint32_t glob_escape;
+} pcre2_real_convert_context;
+
+/* The real compiled code structure. The type for the blocksize field is
+defined specially because it is required in pcre2_serialize_decode() when
+copying the size from possibly unaligned memory into a variable of the same
+type. Use a macro rather than a typedef to avoid compiler warnings when this
+file is included multiple times by pcre2test. LOOKBEHIND_MAX specifies the
+largest lookbehind that is supported. (OP_REVERSE in a pattern has a 16-bit
+argument in 8-bit and 16-bit modes, so we need no more than a 16-bit field
+here.) */
+
+#undef  CODE_BLOCKSIZE_TYPE
+#define CODE_BLOCKSIZE_TYPE size_t
+
+#undef  LOOKBEHIND_MAX
+#define LOOKBEHIND_MAX UINT16_MAX
+
+typedef struct pcre2_real_code {
+  pcre2_memctl memctl;            /* Memory control fields */
+  const uint8_t *tables;          /* The character tables */
+  void    *executable_jit;        /* Pointer to JIT code */
+  uint8_t  start_bitmap[32];      /* Bitmap for starting code unit < 256 */
+  CODE_BLOCKSIZE_TYPE blocksize;  /* Total (bytes) that was malloc-ed */
+  uint32_t magic_number;          /* Paranoid and endianness check */
+  uint32_t compile_options;       /* Options passed to pcre2_compile() */
+  uint32_t overall_options;       /* Options after processing the pattern */
+  uint32_t extra_options;         /* Taken from compile_context */
+  uint32_t flags;                 /* Various state flags */
+  uint32_t limit_heap;            /* Limit set in the pattern */
+  uint32_t limit_match;           /* Limit set in the pattern */
+  uint32_t limit_depth;           /* Limit set in the pattern */
+  uint32_t first_codeunit;        /* Starting code unit */
+  uint32_t last_codeunit;         /* This codeunit must be seen */
+  uint16_t bsr_convention;        /* What \R matches */
+  uint16_t newline_convention;    /* What is a newline? */
+  uint16_t max_lookbehind;        /* Longest lookbehind (characters) */
+  uint16_t minlength;             /* Minimum length of match */
+  uint16_t top_bracket;           /* Highest numbered group */
+  uint16_t top_backref;           /* Highest numbered back reference */
+  uint16_t name_entry_size;       /* Size (code units) of table entries */
+  uint16_t name_count;            /* Number of name entries in the table */
+} pcre2_real_code;
+
+/* The real match data structure. Define ovector as large as it can ever
+actually be so that array bound checkers don't grumble. Memory for this
+structure is obtained by calling pcre2_match_data_create(), which sets the size
+as the offset of ovector plus a pair of elements for each capturable string, so
+the size varies from call to call. As the maximum number of capturing
+subpatterns is 65535 we must allow for 65536 strings to include the overall
+match. (See also the heapframe structure below.) */
+
+typedef struct pcre2_real_match_data {
+  pcre2_memctl     memctl;
+  const pcre2_real_code *code;    /* The pattern used for the match */
+  PCRE2_SPTR       subject;       /* The subject that was matched */
+  PCRE2_SPTR       mark;          /* Pointer to last mark */
+  PCRE2_SIZE       leftchar;      /* Offset to leftmost code unit */
+  PCRE2_SIZE       rightchar;     /* Offset to rightmost code unit */
+  PCRE2_SIZE       startchar;     /* Offset to starting code unit */
+  uint8_t          matchedby;     /* Type of match (normal, JIT, DFA) */
+  uint8_t          flags;         /* Various flags */
+  uint16_t         oveccount;     /* Number of pairs */
+  int              rc;            /* The return code from the match */
+  PCRE2_SIZE       ovector[131072]; /* Must be last in the structure */
+} pcre2_real_match_data;
+
+
+/* ----------------------- PRIVATE STRUCTURES ----------------------------- */
+
+/* These structures are not needed for pcre2test. */
+
+#ifndef PCRE2_PCRE2TEST
+
+/* Structures for checking for mutual recursion when scanning compiled or
+parsed code. */
+
+typedef struct recurse_check {
+  struct recurse_check *prev;
+  PCRE2_SPTR group;
+} recurse_check;
+
+typedef struct parsed_recurse_check {
+  struct parsed_recurse_check *prev;
+  uint32_t *groupptr;
+} parsed_recurse_check;
+
+/* Structure for building a cache when filling in recursion offsets. */
+
+typedef struct recurse_cache {
+  PCRE2_SPTR group;
+  int groupnumber;
+} recurse_cache;
+
+/* Structure for maintaining a chain of pointers to the currently incomplete
+branches, for testing for left recursion while compiling. */
+
+typedef struct branch_chain {
+  struct branch_chain *outer;
+  PCRE2_UCHAR *current_branch;
+} branch_chain;
+
+/* Structure for building a list of named groups during the first pass of
+compiling. */
+
+typedef struct named_group {
+  PCRE2_SPTR   name;          /* Points to the name in the pattern */
+  uint32_t     number;        /* Group number */
+  uint16_t     length;        /* Length of the name */
+  uint16_t     isdup;         /* TRUE if a duplicate */
+} named_group;
+
+/* Structure for passing "static" information around between the functions
+doing the compiling, so that they are thread-safe. */
+
+typedef struct compile_block {
+  pcre2_real_compile_context *cx;  /* Points to the compile context */
+  const uint8_t *lcc;              /* Points to lower casing table */
+  const uint8_t *fcc;              /* Points to case-flipping table */
+  const uint8_t *cbits;            /* Points to character type table */
+  const uint8_t *ctypes;           /* Points to table of type maps */
+  PCRE2_SPTR start_workspace;      /* The start of working space */
+  PCRE2_SPTR start_code;           /* The start of the compiled code */
+  PCRE2_SPTR start_pattern;        /* The start of the pattern */
+  PCRE2_SPTR end_pattern;          /* The end of the pattern */
+  PCRE2_UCHAR *name_table;         /* The name/number table */
+  PCRE2_SIZE workspace_size;       /* Size of workspace */
+  PCRE2_SIZE small_ref_offset[10]; /* Offsets for \1 to \9 */
+  PCRE2_SIZE erroroffset;          /* Offset of error in pattern */
+  uint16_t names_found;            /* Number of entries so far */
+  uint16_t name_entry_size;        /* Size of each entry */
+  uint16_t parens_depth;           /* Depth of nested parentheses */
+  uint16_t assert_depth;           /* Depth of nested assertions */
+  open_capitem *open_caps;         /* Chain of open capture items */
+  named_group *named_groups;       /* Points to vector in pre-compile */
+  uint32_t named_group_list_size;  /* Number of entries in the list */
+  uint32_t external_options;       /* External (initial) options */
+  uint32_t external_flags;         /* External flag bits to be set */
+  uint32_t bracount;               /* Count of capturing parentheses */
+  uint32_t lastcapture;            /* Last capture encountered */
+  uint32_t *parsed_pattern;        /* Parsed pattern buffer */
+  uint32_t *parsed_pattern_end;    /* Parsed pattern should not get here */
+  uint32_t *groupinfo;             /* Group info vector */
+  uint32_t top_backref;            /* Maximum back reference */
+  uint32_t backref_map;            /* Bitmap of low back refs */
+  uint32_t nltype;                 /* Newline type */
+  uint32_t nllen;                  /* Newline string length */
+  uint32_t class_range_start;      /* Overall class range start */
+  uint32_t class_range_end;        /* Overall class range end */
+  PCRE2_UCHAR nl[4];               /* Newline string when fixed length */
+  uint32_t req_varyopt;            /* "After variable item" flag for reqbyte */
+  int  max_lookbehind;             /* Maximum lookbehind (characters) */
+  BOOL had_accept;                 /* (*ACCEPT) encountered */
+  BOOL had_pruneorskip;            /* (*PRUNE) or (*SKIP) encountered */
+  BOOL had_recurse;                /* Had a recursion or subroutine call */
+  BOOL dupnames;                   /* Duplicate names exist */
+} compile_block;
+
+/* Structure for keeping the properties of the in-memory stack used
+by the JIT matcher. */
+
+typedef struct pcre2_real_jit_stack {
+  pcre2_memctl memctl;
+  void* stack;
+} pcre2_real_jit_stack;
+
+/* Structure for items in a linked list that represents an explicit recursive
+call within the pattern when running pcre2_dfa_match(). */
+
+typedef struct dfa_recursion_info {
+  struct dfa_recursion_info *prevrec;
+  PCRE2_SPTR subject_position;
+  uint32_t group_num;
+} dfa_recursion_info;
+
+/* Structure for "stack" frames that are used for remembering backtracking
+positions during matching. As these are used in a vector, with the ovector item
+being extended, the size of the structure must be a multiple of PCRE2_SIZE. The
+only way to check this at compile time is to force an error by generating an
+array with a negative size. By putting this in a typedef (which is never used),
+we don't generate any code when all is well. */
+
+typedef struct heapframe {
+
+  /* The first set of fields are variables that have to be preserved over calls
+  to RRMATCH(), but which do not need to be copied to new frames. */
+
+  PCRE2_SPTR ecode;          /* The current position in the pattern */
+  PCRE2_SPTR temp_sptr[2];   /* Used for short-term PCRE_SPTR values */
+  PCRE2_SIZE length;         /* Used for character, string, or code lengths */
+  PCRE2_SIZE back_frame;     /* Amount to subtract on RRETURN */
+  PCRE2_SIZE temp_size;      /* Used for short-term PCRE2_SIZE values */
+  uint32_t rdepth;           /* "Recursion" depth */
+  uint32_t group_frame_type; /* Type information for group frames */
+  uint32_t temp_32[4];       /* Used for short-term 32-bit or BOOL values */
+  uint8_t return_id;         /* Where to go on in internal "return" */
+  uint8_t op;                /* Processing opcode */
+
+  /* At this point, the structure is 16-bit aligned. On most architectures
+  the alignment requirement for a pointer will ensure that the eptr field below
+  is 32-bit or 64-bit aligned. However, on m68k it is fine to have a pointer
+  that is 16-bit aligned. We must therefore ensure that what comes between here
+  and eptr is an odd multiple of 16 bits so as to get back into 32-bit
+  alignment. This happens naturally when PCRE2_UCHAR is 8 bits wide, but needs
+  fudges in the other cases. In the 32-bit case the padding comes first so that
+  the occu field itself is 32-bit aligned. Without the padding, this structure
+  is no longer a multiple of PCRE2_SIZE on m68k, and the check below fails. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+  PCRE2_UCHAR occu[6];       /* Used for other case code units */
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+  PCRE2_UCHAR occu[2];       /* Used for other case code units */
+  uint8_t unused[2];         /* Ensure 32-bit alignment (see above) */
+#else
+  uint8_t unused[2];         /* Ensure 32-bit alignment (see above) */
+  PCRE2_UCHAR occu[1];       /* Used for other case code units */
+#endif
+
+  /* The rest have to be copied from the previous frame whenever a new frame
+  becomes current. The final field is specified as a large vector so that
+  runtime array bound checks don't catch references to it. However, for any
+  specific call to pcre2_match() the memory allocated for each frame structure
+  allows for exactly the right size ovector for the number of capturing
+  parentheses. (See also the comment for pcre2_real_match_data above.) */
+
+  PCRE2_SPTR eptr;           /* MUST BE FIRST */
+  PCRE2_SPTR start_match;    /* Can be adjusted by \K */
+  PCRE2_SPTR mark;           /* Most recent mark on the success path */
+  uint32_t current_recurse;  /* Current (deepest) recursion number */
+  uint32_t capture_last;     /* Most recent capture */
+  PCRE2_SIZE last_group_offset;  /* Saved offset to most recent group frame */
+  PCRE2_SIZE offset_top;     /* Offset after highest capture */
+  PCRE2_SIZE ovector[131072]; /* Must be last in the structure */
+} heapframe;
+
+/* This typedef is a check that the size of the heapframe structure is a
+multiple of PCRE2_SIZE. See various comments above. */
+
+typedef char check_heapframe_size[
+  ((sizeof(heapframe) % sizeof(PCRE2_SIZE)) == 0)? (+1):(-1)];
+
+/* Structure for computing the alignment of heapframe. */
+
+typedef struct heapframe_align {
+  char unalign;    /* Completely unalign the current offset */
+  heapframe frame; /* Offset is its alignment */
+} heapframe_align;
+
+/* This define is the minimum alignment required for a heapframe, in bytes. */
+
+#define HEAPFRAME_ALIGNMENT offsetof(heapframe_align, frame)
+
+/* Structure for passing "static" information around between the functions
+doing traditional NFA matching (pcre2_match() and friends). */
+
+typedef struct match_block {
+  pcre2_memctl memctl;            /* For general use */
+  PCRE2_SIZE frame_vector_size;   /* Size of a backtracking frame */
+  heapframe *match_frames;        /* Points to vector of frames */
+  heapframe *match_frames_top;    /* Points after the end of the vector */
+  heapframe *stack_frames;        /* The original vector on the stack */
+  PCRE2_SIZE heap_limit;          /* As it says */
+  uint32_t match_limit;           /* As it says */
+  uint32_t match_limit_depth;     /* As it says */
+  uint32_t match_call_count;      /* Number of times a new frame is created */
+  BOOL hitend;                    /* Hit the end of the subject at some point */
+  BOOL hasthen;                   /* Pattern contains (*THEN) */
+  BOOL allowemptypartial;         /* Allow empty hard partial */
+  const uint8_t *lcc;             /* Points to lower casing table */
+  const uint8_t *fcc;             /* Points to case-flipping table */
+  const uint8_t *ctypes;          /* Points to table of type maps */
+  PCRE2_SIZE start_offset;        /* The start offset value */
+  PCRE2_SIZE end_offset_top;      /* Highwater mark at end of match */
+  uint16_t partial;               /* PARTIAL options */
+  uint16_t bsr_convention;        /* \R interpretation */
+  uint16_t name_count;            /* Number of names in name table */
+  uint16_t name_entry_size;       /* Size of entry in names table */
+  PCRE2_SPTR name_table;          /* Table of group names */
+  PCRE2_SPTR start_code;          /* For use when recursing */
+  PCRE2_SPTR start_subject;       /* Start of the subject string */
+  PCRE2_SPTR check_subject;       /* Where UTF-checked from */
+  PCRE2_SPTR end_subject;         /* End of the subject string */
+  PCRE2_SPTR end_match_ptr;       /* Subject position at end match */
+  PCRE2_SPTR start_used_ptr;      /* Earliest consulted character */
+  PCRE2_SPTR last_used_ptr;       /* Latest consulted character */
+  PCRE2_SPTR mark;                /* Mark pointer to pass back on success */
+  PCRE2_SPTR nomatch_mark;        /* Mark pointer to pass back on failure */
+  PCRE2_SPTR verb_ecode_ptr;      /* For passing back info */
+  PCRE2_SPTR verb_skip_ptr;       /* For passing back a (*SKIP) name */
+  uint32_t verb_current_recurse;  /* Current recurse when (*VERB) happens */
+  uint32_t moptions;              /* Match options */
+  uint32_t poptions;              /* Pattern options */
+  uint32_t skip_arg_count;        /* For counting SKIP_ARGs */
+  uint32_t ignore_skip_arg;       /* For re-run when SKIP arg name not found */
+  uint32_t nltype;                /* Newline type */
+  uint32_t nllen;                 /* Newline string length */
+  PCRE2_UCHAR nl[4];              /* Newline string when fixed */
+  pcre2_callout_block *cb;        /* Points to a callout block */
+  void  *callout_data;            /* To pass back to callouts */
+  int (*callout)(pcre2_callout_block *,void *);  /* Callout function or NULL */
+} match_block;
+
+/* A similar structure is used for the same purpose by the DFA matching
+functions. */
+
+typedef struct dfa_match_block {
+  pcre2_memctl memctl;            /* For general use */
+  PCRE2_SPTR start_code;          /* Start of the compiled pattern */
+  PCRE2_SPTR start_subject ;      /* Start of the subject string */
+  PCRE2_SPTR end_subject;         /* End of subject string */
+  PCRE2_SPTR start_used_ptr;      /* Earliest consulted character */
+  PCRE2_SPTR last_used_ptr;       /* Latest consulted character */
+  const uint8_t *tables;          /* Character tables */
+  PCRE2_SIZE start_offset;        /* The start offset value */
+  PCRE2_SIZE heap_limit;          /* As it says */
+  PCRE2_SIZE heap_used;           /* As it says */
+  uint32_t match_limit;           /* As it says */
+  uint32_t match_limit_depth;     /* As it says */
+  uint32_t match_call_count;      /* Number of calls of internal function */
+  uint32_t moptions;              /* Match options */
+  uint32_t poptions;              /* Pattern options */
+  uint32_t nltype;                /* Newline type */
+  uint32_t nllen;                 /* Newline string length */
+  BOOL allowemptypartial;         /* Allow empty hard partial */
+  PCRE2_UCHAR nl[4];              /* Newline string when fixed */
+  uint16_t bsr_convention;        /* \R interpretation */
+  pcre2_callout_block *cb;        /* Points to a callout block */
+  void *callout_data;             /* To pass back to callouts */
+  int (*callout)(pcre2_callout_block *,void *);  /* Callout function or NULL */
+  dfa_recursion_info *recursive;  /* Linked list of recursion data */
+} dfa_match_block;
+
+#endif  /* PCRE2_PCRE2TEST */
+
+/* End of pcre2_intmodedep.h */
diff --git a/Foundation/src/pcre_jit_compile.c b/Foundation/src/pcre2_jit_compile.c
similarity index 57%
rename from Foundation/src/pcre_jit_compile.c
rename to Foundation/src/pcre2_jit_compile.c
index 8cebeaade..1b7c04dc0 100644
--- a/Foundation/src/pcre_jit_compile.c
+++ b/Foundation/src/pcre2_jit_compile.c
@@ -6,10 +6,9 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2013 University of Cambridge
-
-  The machine code generator part (this module) was written by Zoltan Herczeg
-                      Copyright (c) 2010-2013
+                    This module by Zoltan Herczeg
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2021 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -40,23 +39,39 @@ POSSIBILITY OF SUCH DAMAGE.
 -----------------------------------------------------------------------------
 */
 
-#include "pcre_config.h"
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
 
-
-#include "pcre_internal.h"
-
-#if defined SUPPORT_JIT
+#ifdef SUPPORT_JIT
 
 /* All-in-one: Since we use the JIT compiler only from here,
 we just include it. This way we don't need to touch the build
 system files. */
 
-#define SLJIT_MALLOC(size, allocator_data) (PUBL(malloc))(size)
-#define SLJIT_FREE(ptr, allocator_data) (PUBL(free))(ptr)
 #define SLJIT_CONFIG_AUTO 1
 #define SLJIT_CONFIG_STATIC 1
 #define SLJIT_VERBOSE 0
+
+#ifdef PCRE2_DEBUG
+#define SLJIT_DEBUG 1
+#else
 #define SLJIT_DEBUG 0
+#endif
+
+#define SLJIT_MALLOC(size, allocator_data) pcre2_jit_malloc(size, allocator_data)
+#define SLJIT_FREE(ptr, allocator_data) pcre2_jit_free(ptr, allocator_data)
+
+static void * pcre2_jit_malloc(size_t size, void *allocator_data)
+{
+pcre2_memctl *allocator = ((pcre2_memctl*)allocator_data);
+return allocator->malloc(size, allocator->memory_data);
+}
+
+static void pcre2_jit_free(void *ptr, void *allocator_data)
+{
+pcre2_memctl *allocator = ((pcre2_memctl*)allocator_data);
+allocator->free(ptr, allocator->memory_data);
+}
 
 #include "sljit/sljitLir.c"
 
@@ -159,28 +174,27 @@ Thus we can restore the private data to a particular point in the stack.
 typedef struct jit_arguments {
   /* Pointers first. */
   struct sljit_stack *stack;
-  const pcre_uchar *str;
-  const pcre_uchar *begin;
-  const pcre_uchar *end;
-  int *offsets;
-  pcre_uchar *mark_ptr;
+  PCRE2_SPTR str;
+  PCRE2_SPTR begin;
+  PCRE2_SPTR end;
+  pcre2_match_data *match_data;
+  PCRE2_SPTR startchar_ptr;
+  PCRE2_UCHAR *mark_ptr;
+  int (*callout)(pcre2_callout_block *, void *);
   void *callout_data;
   /* Everything else after. */
+  sljit_uw offset_limit;
   sljit_u32 limit_match;
-  int real_offset_count;
-  int offset_count;
-  sljit_u8 notbol;
-  sljit_u8 noteol;
-  sljit_u8 notempty;
-  sljit_u8 notempty_atstart;
+  sljit_u32 oveccount;
+  sljit_u32 options;
 } jit_arguments;
 
+#define JIT_NUMBER_OF_COMPILE_MODES 3
+
 typedef struct executable_functions {
   void *executable_funcs[JIT_NUMBER_OF_COMPILE_MODES];
   void *read_only_data_heads[JIT_NUMBER_OF_COMPILE_MODES];
   sljit_uw executable_sizes[JIT_NUMBER_OF_COMPILE_MODES];
-  PUBL(jit_callback) callback;
-  void *userdata;
   sljit_u32 top_bracket;
   sljit_u32 limit_match;
 } executable_functions;
@@ -196,12 +210,6 @@ typedef struct stub_list {
   struct stub_list *next;
 } stub_list;
 
-typedef struct label_addr_list {
-  struct sljit_label *label;
-  sljit_uw *update_addr;
-  struct label_addr_list *next;
-} label_addr_list;
-
 enum frame_types {
   no_frame = -1,
   no_stack = -2
@@ -212,6 +220,12 @@ enum control_types {
   type_then_trap = 1
 };
 
+enum  early_fail_types {
+  type_skip = 0,
+  type_fail = 1,
+  type_fail_range = 2
+};
+
 typedef int (SLJIT_FUNC *jit_function)(jit_arguments *args);
 
 /* The following structure is the key data type for the recursive
@@ -226,7 +240,7 @@ typedef struct backtrack_common {
   struct backtrack_common *top;
   jump_list *topbacktracks;
   /* Opcode pointer. */
-  pcre_uchar *cc;
+  PCRE2_SPTR cc;
 } backtrack_common;
 
 typedef struct assert_backtrack {
@@ -255,6 +269,8 @@ typedef struct bracket_backtrack {
     assert_backtrack *assert;
     /* For OP_ONCE. Less than 0 if not needed. */
     int framesize;
+    /* For brackets with >3 alternatives. */
+    struct sljit_put_label *matching_put_label;
   } u;
   /* Points to our private memory word on the stack. */
   int private_data_ptr;
@@ -283,7 +299,7 @@ typedef struct char_iterator_backtrack {
     jump_list *backtracks;
     struct {
       unsigned int othercasebit;
-      pcre_uchar chr;
+      PCRE2_UCHAR chr;
       BOOL enabled;
     } charpos;
   } u;
@@ -297,16 +313,25 @@ typedef struct ref_iterator_backtrack {
 
 typedef struct recurse_entry {
   struct recurse_entry *next;
-  /* Contains the function entry. */
-  struct sljit_label *entry;
-  /* Collects the calls until the function is not created. */
-  jump_list *calls;
+  /* Contains the function entry label. */
+  struct sljit_label *entry_label;
+  /* Contains the function entry label. */
+  struct sljit_label *backtrack_label;
+  /* Collects the entry calls until the function is not created. */
+  jump_list *entry_calls;
+  /* Collects the backtrack calls until the function is not created. */
+  jump_list *backtrack_calls;
   /* Points to the starting opcode. */
   sljit_sw start;
 } recurse_entry;
 
 typedef struct recurse_backtrack {
   backtrack_common common;
+  /* Return to the matching path. */
+  struct sljit_label *matchingpath;
+  /* Recursive pattern. */
+  recurse_entry *entry;
+  /* Pattern is inlined. */
   BOOL inlined_pattern;
 } recurse_backtrack;
 
@@ -325,13 +350,28 @@ typedef struct then_trap_backtrack {
   int framesize;
 } then_trap_backtrack;
 
-#define MAX_RANGE_SIZE 4
+#define MAX_N_CHARS 12
+#define MAX_DIFF_CHARS 5
+
+typedef struct fast_forward_char_data {
+  /* Number of characters in the chars array, 255 for any character. */
+  sljit_u8 count;
+  /* Number of last UTF-8 characters in the chars array. */
+  sljit_u8 last_count;
+  /* Available characters in the current position. */
+  PCRE2_UCHAR chars[MAX_DIFF_CHARS];
+} fast_forward_char_data;
+
+#define MAX_CLASS_RANGE_SIZE 4
+#define MAX_CLASS_CHARS_SIZE 3
 
 typedef struct compiler_common {
   /* The sljit ceneric compiler. */
   struct sljit_compiler *compiler;
+  /* Compiled regular expression. */
+  pcre2_real_code *re;
   /* First byte code. */
-  pcre_uchar *start;
+  PCRE2_SPTR start;
   /* Maps private data offset to each opcode. */
   sljit_s32 *private_data_ptrs;
   /* Chain list of read-only data ptrs. */
@@ -366,16 +406,21 @@ typedef struct compiler_common {
   /* Points to the last matched capture block index. */
   sljit_s32 capture_last_ptr;
   /* Fast forward skipping byte code pointer. */
-  pcre_uchar *fast_forward_bc_ptr;
+  PCRE2_SPTR fast_forward_bc_ptr;
   /* Locals used by fast fail optimization. */
-  sljit_s32 fast_fail_start_ptr;
-  sljit_s32 fast_fail_end_ptr;
+  sljit_s32 early_fail_start_ptr;
+  sljit_s32 early_fail_end_ptr;
+  /* Variables used by recursive call generator. */
+  sljit_s32 recurse_bitset_size;
+  uint8_t *recurse_bitset;
 
   /* Flipped and lower case tables. */
   const sljit_u8 *fcc;
   sljit_sw lcc;
-  /* Mode can be PCRE_STUDY_JIT_COMPILE and others. */
+  /* Mode can be PCRE2_JIT_COMPLETE and others. */
   int mode;
+  /* TRUE, when empty match is accepted for partial matching. */
+  BOOL allow_empty_partial;
   /* TRUE, when minlength is greater than 0. */
   BOOL might_be_empty;
   /* \K is found in the pattern. */
@@ -386,10 +431,10 @@ typedef struct compiler_common {
   BOOL has_then;
   /* (*SKIP) or (*SKIP:arg) is found in lookbehind assertion. */
   BOOL has_skip_in_assert_back;
-  /* Currently in recurse or negative assert. */
-  BOOL local_exit;
-  /* Currently in a positive assert. */
-  BOOL positive_assert;
+  /* Quit is redirected by recurse, negative assertion, or positive assertion in conditional block. */
+  BOOL local_quit_available;
+  /* Currently in a positive assertion. */
+  BOOL in_positive_assertion;
   /* Newline control. */
   int nltype;
   sljit_u32 nlmax;
@@ -403,24 +448,24 @@ typedef struct compiler_common {
   /* Tables. */
   sljit_sw ctypes;
   /* Named capturing brackets. */
-  pcre_uchar *name_table;
+  PCRE2_SPTR name_table;
   sljit_sw name_count;
   sljit_sw name_entry_size;
 
   /* Labels and jump lists. */
   struct sljit_label *partialmatchlabel;
   struct sljit_label *quit_label;
-  struct sljit_label *forced_quit_label;
+  struct sljit_label *abort_label;
   struct sljit_label *accept_label;
   struct sljit_label *ff_newline_shortcut;
   stub_list *stubs;
-  label_addr_list *label_addrs;
   recurse_entry *entries;
   recurse_entry *currententry;
   jump_list *partialmatch;
   jump_list *quit;
-  jump_list *positive_assert_quit;
-  jump_list *forced_quit;
+  jump_list *positive_assertion_quit;
+  jump_list *abort;
+  jump_list *failed_match;
   jump_list *accept;
   jump_list *calllimit;
   jump_list *stackalloc;
@@ -432,19 +477,28 @@ typedef struct compiler_common {
   jump_list *casefulcmp;
   jump_list *caselesscmp;
   jump_list *reset_match;
-  BOOL jscript_compat;
-#ifdef SUPPORT_UTF
+  BOOL unset_backref;
+  BOOL alt_circumflex;
+#ifdef SUPPORT_UNICODE
   BOOL utf;
-#ifdef SUPPORT_UCP
-  BOOL use_ucp;
+  BOOL invalid_utf;
+  BOOL ucp;
+  /* Points to saving area for iref. */
+  sljit_s32 iref_ptr;
   jump_list *getucd;
-#endif
-#ifdef COMPILE_PCRE8
+  jump_list *getucdtype;
+#if PCRE2_CODE_UNIT_WIDTH == 8
   jump_list *utfreadchar;
-  jump_list *utfreadchar16;
   jump_list *utfreadtype8;
+  jump_list *utfpeakcharback;
 #endif
-#endif /* SUPPORT_UTF */
+#if PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16
+  jump_list *utfreadchar_invalid;
+  jump_list *utfreadnewline_invalid;
+  jump_list *utfmoveback_invalid;
+  jump_list *utfpeakcharback_invalid;
+#endif
+#endif /* SUPPORT_UNICODE */
 } compiler_common;
 
 /* For byte_sequence_compare. */
@@ -457,24 +511,24 @@ typedef struct compare_context {
   union {
     sljit_s32 asint;
     sljit_u16 asushort;
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
     sljit_u8 asbyte;
     sljit_u8 asuchars[4];
-#elif defined COMPILE_PCRE16
+#elif PCRE2_CODE_UNIT_WIDTH == 16
     sljit_u16 asuchars[2];
-#elif defined COMPILE_PCRE32
+#elif PCRE2_CODE_UNIT_WIDTH == 32
     sljit_u32 asuchars[1];
 #endif
   } c;
   union {
     sljit_s32 asint;
     sljit_u16 asushort;
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
     sljit_u8 asbyte;
     sljit_u8 asuchars[4];
-#elif defined COMPILE_PCRE16
+#elif PCRE2_CODE_UNIT_WIDTH == 16
     sljit_u16 asuchars[2];
-#elif defined COMPILE_PCRE32
+#elif PCRE2_CODE_UNIT_WIDTH == 32
     sljit_u32 asuchars[1];
 #endif
   } oc;
@@ -505,14 +559,20 @@ typedef struct compare_context {
 #define TMP2          SLJIT_R2
 #define TMP3          SLJIT_R3
 #endif
-#define STR_PTR       SLJIT_S0
-#define STR_END       SLJIT_S1
-#define STACK_TOP     SLJIT_R1
+#define STR_PTR       SLJIT_R1
+#define STR_END       SLJIT_S0
+#define STACK_TOP     SLJIT_S1
 #define STACK_LIMIT   SLJIT_S2
 #define COUNT_MATCH   SLJIT_S3
 #define ARGUMENTS     SLJIT_S4
 #define RETURN_ADDR   SLJIT_R4
 
+#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
+#define HAS_VIRTUAL_REGISTERS 1
+#else
+#define HAS_VIRTUAL_REGISTERS 0
+#endif
+
 /* Local space layout. */
 /* These two locals can be used by the current opcode. */
 #define LOCALS0          (0 * sizeof(sljit_sw))
@@ -531,12 +591,17 @@ the start pointers when the end of the capturing group has not yet reached. */
 #define OVECTOR_PRIV(i)  (common->cbra_ptr + (i) * (sljit_sw)sizeof(sljit_sw))
 #define PRIVATE_DATA(cc) (common->private_data_ptrs[(cc) - common->start])
 
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
 #define MOV_UCHAR  SLJIT_MOV_U8
-#elif defined COMPILE_PCRE16
+#define IN_UCHARS(x) (x)
+#elif PCRE2_CODE_UNIT_WIDTH == 16
 #define MOV_UCHAR  SLJIT_MOV_U16
-#elif defined COMPILE_PCRE32
+#define UCHAR_SHIFT (1)
+#define IN_UCHARS(x) ((x) * 2)
+#elif PCRE2_CODE_UNIT_WIDTH == 32
 #define MOV_UCHAR  SLJIT_MOV_U32
+#define UCHAR_SHIFT (2)
+#define IN_UCHARS(x) ((x) * 4)
 #else
 #error Unsupported compiling mode
 #endif
@@ -548,6 +613,10 @@ the start pointers when the end of the capturing group has not yet reached. */
   sljit_emit_op1(compiler, (op), (dst), (dstw), (src), (srcw))
 #define OP2(op, dst, dstw, src1, src1w, src2, src2w) \
   sljit_emit_op2(compiler, (op), (dst), (dstw), (src1), (src1w), (src2), (src2w))
+#define OP2U(op, src1, src1w, src2, src2w) \
+  sljit_emit_op2u(compiler, (op), (src1), (src1w), (src2), (src2w))
+#define OP_SRC(op, src, srcw) \
+  sljit_emit_op_src(compiler, (op), (src), (srcw))
 #define LABEL() \
   sljit_emit_label(compiler)
 #define JUMP(type) \
@@ -564,26 +633,217 @@ the start pointers when the end of the capturing group has not yet reached. */
   sljit_set_label(sljit_emit_cmp(compiler, (type), (src1), (src1w), (src2), (src2w)), (label))
 #define OP_FLAGS(op, dst, dstw, type) \
   sljit_emit_op_flags(compiler, (op), (dst), (dstw), (type))
+#define CMOV(type, dst_reg, src, srcw) \
+  sljit_emit_cmov(compiler, (type), (dst_reg), (src), (srcw))
 #define GET_LOCAL_BASE(dst, dstw, offset) \
   sljit_get_local_base(compiler, (dst), (dstw), (offset))
 
 #define READ_CHAR_MAX 0x7fffffff
 
-#define INVALID_UTF_CHAR 888
+#define INVALID_UTF_CHAR -1
+#define UNASSIGNED_UTF_CHAR 888
 
-static pcre_uchar *bracketend(pcre_uchar *cc)
+#if defined SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+
+#define GETCHARINC_INVALID(c, ptr, end, invalid_action) \
+  { \
+  if (ptr[0] <= 0x7f) \
+    c = *ptr++; \
+  else if (ptr + 1 < end && ptr[1] >= 0x80 && ptr[1] < 0xc0) \
+    { \
+    c = ptr[1] - 0x80; \
+    \
+    if (ptr[0] >= 0xc2 && ptr[0] <= 0xdf) \
+      { \
+      c |= (ptr[0] - 0xc0) << 6; \
+      ptr += 2; \
+      } \
+    else if (ptr + 2 < end && ptr[2] >= 0x80 && ptr[2] < 0xc0) \
+      { \
+      c = c << 6 | (ptr[2] - 0x80); \
+      \
+      if (ptr[0] >= 0xe0 && ptr[0] <= 0xef) \
+        { \
+        c |= (ptr[0] - 0xe0) << 12; \
+        ptr += 3; \
+        \
+        if (c < 0x800 || (c >= 0xd800 && c < 0xe000)) \
+          { \
+          invalid_action; \
+          } \
+        } \
+      else if (ptr + 3 < end && ptr[3] >= 0x80 && ptr[3] < 0xc0) \
+        { \
+        c = c << 6 | (ptr[3] - 0x80); \
+        \
+        if (ptr[0] >= 0xf0 && ptr[0] <= 0xf4) \
+          { \
+          c |= (ptr[0] - 0xf0) << 18; \
+          ptr += 4; \
+          \
+          if (c >= 0x110000 || c < 0x10000) \
+            { \
+            invalid_action; \
+            } \
+          } \
+        else \
+          { \
+          invalid_action; \
+          } \
+        } \
+      else \
+        { \
+        invalid_action; \
+        } \
+      } \
+    else \
+      { \
+      invalid_action; \
+      } \
+    } \
+  else \
+    { \
+    invalid_action; \
+    } \
+  }
+
+#define GETCHARBACK_INVALID(c, ptr, start, invalid_action) \
+  { \
+  c = ptr[-1]; \
+  if (c <= 0x7f) \
+    ptr--; \
+  else if (ptr - 1 > start && ptr[-1] >= 0x80 && ptr[-1] < 0xc0) \
+    { \
+    c -= 0x80; \
+    \
+    if (ptr[-2] >= 0xc2 && ptr[-2] <= 0xdf) \
+      { \
+      c |= (ptr[-2] - 0xc0) << 6; \
+      ptr -= 2; \
+      } \
+    else if (ptr - 2 > start && ptr[-2] >= 0x80 && ptr[-2] < 0xc0) \
+      { \
+      c = c << 6 | (ptr[-2] - 0x80); \
+      \
+      if (ptr[-3] >= 0xe0 && ptr[-3] <= 0xef) \
+        { \
+        c |= (ptr[-3] - 0xe0) << 12; \
+        ptr -= 3; \
+        \
+        if (c < 0x800 || (c >= 0xd800 && c < 0xe000)) \
+          { \
+          invalid_action; \
+          } \
+        } \
+      else if (ptr - 3 > start && ptr[-3] >= 0x80 && ptr[-3] < 0xc0) \
+        { \
+        c = c << 6 | (ptr[-3] - 0x80); \
+        \
+        if (ptr[-4] >= 0xf0 && ptr[-4] <= 0xf4) \
+          { \
+          c |= (ptr[-4] - 0xf0) << 18; \
+          ptr -= 4; \
+          \
+          if (c >= 0x110000 || c < 0x10000) \
+            { \
+            invalid_action; \
+            } \
+          } \
+        else \
+          { \
+          invalid_action; \
+          } \
+        } \
+      else \
+        { \
+        invalid_action; \
+        } \
+      } \
+    else \
+      { \
+      invalid_action; \
+      } \
+    } \
+  else \
+    { \
+    invalid_action; \
+    } \
+  }
+
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+
+#define GETCHARINC_INVALID(c, ptr, end, invalid_action) \
+  { \
+  if (ptr[0] < 0xd800 || ptr[0] >= 0xe000) \
+    c = *ptr++; \
+  else if (ptr[0] < 0xdc00 && ptr + 1 < end && ptr[1] >= 0xdc00 && ptr[1] < 0xe000) \
+    { \
+    c = (((ptr[0] - 0xd800) << 10) | (ptr[1] - 0xdc00)) + 0x10000; \
+    ptr += 2; \
+    } \
+  else \
+    { \
+    invalid_action; \
+    } \
+  }
+
+#define GETCHARBACK_INVALID(c, ptr, start, invalid_action) \
+  { \
+  c = ptr[-1]; \
+  if (c < 0xd800 || c >= 0xe000) \
+    ptr--; \
+  else if (c >= 0xdc00 && ptr - 1 > start && ptr[-2] >= 0xd800 && ptr[-2] < 0xdc00) \
+    { \
+    c = (((ptr[-2] - 0xd800) << 10) | (c - 0xdc00)) + 0x10000; \
+    ptr -= 2; \
+    } \
+  else \
+    { \
+    invalid_action; \
+    } \
+  }
+
+
+#elif PCRE2_CODE_UNIT_WIDTH == 32
+
+#define GETCHARINC_INVALID(c, ptr, end, invalid_action) \
+  { \
+  if (ptr[0] < 0xd800 || (ptr[0] >= 0xe000 && ptr[0] < 0x110000)) \
+    c = *ptr++; \
+  else \
+    { \
+    invalid_action; \
+    } \
+  }
+
+#define GETCHARBACK_INVALID(c, ptr, start, invalid_action) \
+  { \
+  c = ptr[-1]; \
+  if (ptr[-1] < 0xd800 || (ptr[-1] >= 0xe000 && ptr[-1] < 0x110000)) \
+    ptr--; \
+  else \
+    { \
+    invalid_action; \
+    } \
+  }
+
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
+#endif /* SUPPORT_UNICODE */
+
+static PCRE2_SPTR bracketend(PCRE2_SPTR cc)
 {
-SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
+SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NA) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
 do cc += GET(cc, 1); while (*cc == OP_ALT);
 SLJIT_ASSERT(*cc >= OP_KET && *cc <= OP_KETRPOS);
 cc += 1 + LINK_SIZE;
 return cc;
 }
 
-static int no_alternatives(pcre_uchar *cc)
+static int no_alternatives(PCRE2_SPTR cc)
 {
 int count = 0;
-SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
+SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NA) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
 do
   {
   cc += GET(cc, 1);
@@ -600,13 +860,13 @@ return count;
  set_private_data_ptrs
  get_framesize
  init_frame
- get_private_data_copy_length
- copy_private_data
+ get_recurse_data_length
+ copy_recurse_data
  compile_matchingpath
  compile_backtrackingpath
 */
 
-static pcre_uchar *next_opcode(compiler_common *common, pcre_uchar *cc)
+static PCRE2_SPTR next_opcode(compiler_common *common, PCRE2_SPTR cc)
 {
 SLJIT_UNUSED_ARG(common);
 switch(*cc)
@@ -668,8 +928,10 @@ switch(*cc)
   case OP_ASSERT_NOT:
   case OP_ASSERTBACK:
   case OP_ASSERTBACK_NOT:
+  case OP_ASSERT_NA:
+  case OP_ASSERTBACK_NA:
   case OP_ONCE:
-  case OP_ONCE_NC:
+  case OP_SCRIPT_RUN:
   case OP_BRA:
   case OP_BRAPOS:
   case OP_CBRA:
@@ -684,7 +946,8 @@ switch(*cc)
   case OP_DNCREF:
   case OP_RREF:
   case OP_DNRREF:
-  case OP_DEF:
+  case OP_FALSE:
+  case OP_TRUE:
   case OP_BRAZERO:
   case OP_BRAMINZERO:
   case OP_BRAPOSZERO:
@@ -756,7 +1019,7 @@ switch(*cc)
   case OP_NOTPOSQUERYI:
   case OP_NOTPOSUPTOI:
   cc += PRIV(OP_lengths)[*cc];
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
   if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
 #endif
   return cc;
@@ -778,34 +1041,38 @@ switch(*cc)
   return cc + PRIV(OP_lengths)[*cc] - 1;
 
   case OP_ANYBYTE:
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
   if (common->utf) return NULL;
 #endif
   return cc + 1;
 
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+  case OP_CALLOUT_STR:
+  return cc + GET(cc, 1 + 2*LINK_SIZE);
+
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
   case OP_XCLASS:
   return cc + GET(cc, 1);
 #endif
 
   case OP_MARK:
+  case OP_COMMIT_ARG:
   case OP_PRUNE_ARG:
   case OP_SKIP_ARG:
   case OP_THEN_ARG:
   return cc + 1 + 2 + cc[1];
 
   default:
-  /* All opcodes are supported now! */
   SLJIT_UNREACHABLE();
   return NULL;
   }
 }
 
-static BOOL check_opcode_types(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend)
+static BOOL check_opcode_types(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend)
 {
 int count;
-pcre_uchar *slot;
-pcre_uchar *assert_back_end = cc - 1;
+PCRE2_SPTR slot;
+PCRE2_SPTR assert_back_end = cc - 1;
+PCRE2_SPTR assert_na_end = cc - 1;
 
 /* Calculate important variables (like stack size) and checks whether all opcodes are supported. */
 while (cc < ccend)
@@ -818,12 +1085,28 @@ while (cc < ccend)
     cc += 1;
     break;
 
-    case OP_REF:
     case OP_REFI:
+#ifdef SUPPORT_UNICODE
+    if (common->iref_ptr == 0)
+      {
+      common->iref_ptr = common->ovector_start;
+      common->ovector_start += 3 * sizeof(sljit_sw);
+      }
+#endif /* SUPPORT_UNICODE */
+    /* Fall through. */
+    case OP_REF:
     common->optimized_cbracket[GET2(cc, 1)] = 0;
     cc += 1 + IMM2_SIZE;
     break;
 
+    case OP_ASSERT_NA:
+    case OP_ASSERTBACK_NA:
+    slot = bracketend(cc);
+    if (slot > assert_na_end)
+      assert_na_end = slot;
+    cc += 1 + LINK_SIZE;
+    break;
+
     case OP_CBRAPOS:
     case OP_SCBRAPOS:
     common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] = 0;
@@ -834,7 +1117,7 @@ while (cc < ccend)
     case OP_SCOND:
     /* Only AUTO_CALLOUT can insert this opcode. We do
        not intend to support this case. */
-    if (cc[1 + LINK_SIZE] == OP_CALLOUT)
+    if (cc[1 + LINK_SIZE] == OP_CALLOUT || cc[1 + LINK_SIZE] == OP_CALLOUT_STR)
       return FALSE;
     cc += 1 + LINK_SIZE;
     break;
@@ -868,12 +1151,13 @@ while (cc < ccend)
     break;
 
     case OP_CALLOUT:
+    case OP_CALLOUT_STR:
     if (common->capture_last_ptr == 0)
       {
       common->capture_last_ptr = common->ovector_start;
       common->ovector_start += sizeof(sljit_sw);
       }
-    cc += 2 + 2 * LINK_SIZE;
+    cc += (*cc == OP_CALLOUT) ? PRIV(OP_lengths)[OP_CALLOUT] : GET(cc, 1 + 2*LINK_SIZE);
     break;
 
     case OP_ASSERTBACK:
@@ -888,7 +1172,11 @@ while (cc < ccend)
     common->control_head_ptr = 1;
     /* Fall through. */
 
+    case OP_COMMIT_ARG:
     case OP_PRUNE_ARG:
+    if (cc < assert_na_end)
+      return FALSE;
+    /* Fall through */
     case OP_MARK:
     if (common->mark_ptr == 0)
       {
@@ -907,6 +1195,8 @@ while (cc < ccend)
     case OP_SKIP:
     if (cc < assert_back_end)
       common->has_skip_in_assert_back = TRUE;
+    if (cc < assert_na_end)
+      return FALSE;
     cc += 1;
     break;
 
@@ -915,9 +1205,19 @@ while (cc < ccend)
     common->has_skip_arg = TRUE;
     if (cc < assert_back_end)
       common->has_skip_in_assert_back = TRUE;
+    if (cc < assert_na_end)
+      return FALSE;
     cc += 1 + 2 + cc[1];
     break;
 
+    case OP_PRUNE:
+    case OP_COMMIT:
+    case OP_ASSERT_ACCEPT:
+    if (cc < assert_na_end)
+      return FALSE;
+    cc++;
+    break;
+
     default:
     cc = next_opcode(common, cc);
     if (cc == NULL)
@@ -928,186 +1228,354 @@ while (cc < ccend)
 return TRUE;
 }
 
-static BOOL is_accelerated_repeat(pcre_uchar *cc)
+#define EARLY_FAIL_ENHANCE_MAX (1 + 3)
+
+/*
+start:
+  0 - skip / early fail allowed
+  1 - only early fail with range allowed
+  >1 - (start - 1) early fail is processed
+
+return: current number of iterators enhanced with fast fail
+*/
+static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start,
+   sljit_s32 depth, int start, BOOL fast_forward_allowed)
 {
-switch(*cc)
+PCRE2_SPTR begin = cc;
+PCRE2_SPTR next_alt;
+PCRE2_SPTR end;
+PCRE2_SPTR accelerated_start;
+BOOL prev_fast_forward_allowed;
+int result = 0;
+int count;
+
+SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA);
+SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0);
+SLJIT_ASSERT(start < EARLY_FAIL_ENHANCE_MAX);
+
+next_alt = cc + GET(cc, 1);
+if (*next_alt == OP_ALT)
+  fast_forward_allowed = FALSE;
+
+do
   {
-  case OP_TYPESTAR:
-  case OP_TYPEMINSTAR:
-  case OP_TYPEPLUS:
-  case OP_TYPEMINPLUS:
-  case OP_TYPEPOSSTAR:
-  case OP_TYPEPOSPLUS:
-  return (cc[1] != OP_ANYNL && cc[1] != OP_EXTUNI);
+  count = start;
+  cc += 1 + LINK_SIZE + ((*cc == OP_CBRA) ? IMM2_SIZE : 0);
 
-  case OP_STAR:
-  case OP_MINSTAR:
-  case OP_PLUS:
-  case OP_MINPLUS:
-  case OP_POSSTAR:
-  case OP_POSPLUS:
+  while (TRUE)
+    {
+    accelerated_start = NULL;
 
-  case OP_STARI:
-  case OP_MINSTARI:
-  case OP_PLUSI:
-  case OP_MINPLUSI:
-  case OP_POSSTARI:
-  case OP_POSPLUSI:
+    switch(*cc)
+      {
+      case OP_SOD:
+      case OP_SOM:
+      case OP_SET_SOM:
+      case OP_NOT_WORD_BOUNDARY:
+      case OP_WORD_BOUNDARY:
+      case OP_EODN:
+      case OP_EOD:
+      case OP_CIRC:
+      case OP_CIRCM:
+      case OP_DOLL:
+      case OP_DOLLM:
+      /* Zero width assertions. */
+      cc++;
+      continue;
 
-  case OP_NOTSTAR:
-  case OP_NOTMINSTAR:
-  case OP_NOTPLUS:
-  case OP_NOTMINPLUS:
-  case OP_NOTPOSSTAR:
-  case OP_NOTPOSPLUS:
+      case OP_NOT_DIGIT:
+      case OP_DIGIT:
+      case OP_NOT_WHITESPACE:
+      case OP_WHITESPACE:
+      case OP_NOT_WORDCHAR:
+      case OP_WORDCHAR:
+      case OP_ANY:
+      case OP_ALLANY:
+      case OP_ANYBYTE:
+      case OP_NOT_HSPACE:
+      case OP_HSPACE:
+      case OP_NOT_VSPACE:
+      case OP_VSPACE:
+      fast_forward_allowed = FALSE;
+      cc++;
+      continue;
 
-  case OP_NOTSTARI:
-  case OP_NOTMINSTARI:
-  case OP_NOTPLUSI:
-  case OP_NOTMINPLUSI:
-  case OP_NOTPOSSTARI:
-  case OP_NOTPOSPLUSI:
-  return TRUE;
+      case OP_ANYNL:
+      case OP_EXTUNI:
+      fast_forward_allowed = FALSE;
+      if (count == 0)
+        count = 1;
+      cc++;
+      continue;
 
-  case OP_CLASS:
-  case OP_NCLASS:
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  case OP_XCLASS:
-  cc += (*cc == OP_XCLASS) ? GET(cc, 1) : (int)(1 + (32 / sizeof(pcre_uchar)));
+      case OP_NOTPROP:
+      case OP_PROP:
+      fast_forward_allowed = FALSE;
+      cc += 1 + 2;
+      continue;
+
+      case OP_CHAR:
+      case OP_CHARI:
+      case OP_NOT:
+      case OP_NOTI:
+      fast_forward_allowed = FALSE;
+      cc += 2;
+#ifdef SUPPORT_UNICODE
+      if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+#endif
+      continue;
+
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      case OP_TYPEPOSSTAR:
+      case OP_TYPEPOSPLUS:
+      /* The type or prop opcode is skipped in the next iteration. */
+      cc += 1;
+
+      if (cc[0] != OP_ANYNL && cc[0] != OP_EXTUNI)
+        {
+        accelerated_start = cc - 1;
+        break;
+        }
+
+      if (count == 0)
+        count = 1;
+      fast_forward_allowed = FALSE;
+      continue;
+
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEEXACT:
+      case OP_TYPEPOSUPTO:
+      cc += IMM2_SIZE;
+      /* Fall through */
+
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSQUERY:
+      /* The type or prop opcode is skipped in the next iteration. */
+      fast_forward_allowed = FALSE;
+      if (count == 0)
+        count = 1;
+      cc += 1;
+      continue;
+
+      case OP_STAR:
+      case OP_MINSTAR:
+      case OP_PLUS:
+      case OP_MINPLUS:
+      case OP_POSSTAR:
+      case OP_POSPLUS:
+
+      case OP_STARI:
+      case OP_MINSTARI:
+      case OP_PLUSI:
+      case OP_MINPLUSI:
+      case OP_POSSTARI:
+      case OP_POSPLUSI:
+
+      case OP_NOTSTAR:
+      case OP_NOTMINSTAR:
+      case OP_NOTPLUS:
+      case OP_NOTMINPLUS:
+      case OP_NOTPOSSTAR:
+      case OP_NOTPOSPLUS:
+
+      case OP_NOTSTARI:
+      case OP_NOTMINSTARI:
+      case OP_NOTPLUSI:
+      case OP_NOTMINPLUSI:
+      case OP_NOTPOSSTARI:
+      case OP_NOTPOSPLUSI:
+      accelerated_start = cc;
+      cc += 2;
+#ifdef SUPPORT_UNICODE
+      if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+#endif
+      break;
+
+      case OP_UPTO:
+      case OP_MINUPTO:
+      case OP_EXACT:
+      case OP_POSUPTO:
+      case OP_UPTOI:
+      case OP_MINUPTOI:
+      case OP_EXACTI:
+      case OP_POSUPTOI:
+      case OP_NOTUPTO:
+      case OP_NOTMINUPTO:
+      case OP_NOTEXACT:
+      case OP_NOTPOSUPTO:
+      case OP_NOTUPTOI:
+      case OP_NOTMINUPTOI:
+      case OP_NOTEXACTI:
+      case OP_NOTPOSUPTOI:
+      cc += IMM2_SIZE;
+      /* Fall through */
+
+      case OP_QUERY:
+      case OP_MINQUERY:
+      case OP_POSQUERY:
+      case OP_QUERYI:
+      case OP_MINQUERYI:
+      case OP_POSQUERYI:
+      case OP_NOTQUERY:
+      case OP_NOTMINQUERY:
+      case OP_NOTPOSQUERY:
+      case OP_NOTQUERYI:
+      case OP_NOTMINQUERYI:
+      case OP_NOTPOSQUERYI:
+      fast_forward_allowed = FALSE;
+      if (count == 0)
+        count = 1;
+      cc += 2;
+#ifdef SUPPORT_UNICODE
+      if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+#endif
+      continue;
+
+      case OP_CLASS:
+      case OP_NCLASS:
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
+      case OP_XCLASS:
+      accelerated_start = cc;
+      cc += ((*cc == OP_XCLASS) ? GET(cc, 1) : (unsigned int)(1 + (32 / sizeof(PCRE2_UCHAR))));
 #else
-  cc += (1 + (32 / sizeof(pcre_uchar)));
+      accelerated_start = cc;
+      cc += (1 + (32 / sizeof(PCRE2_UCHAR)));
 #endif
 
-  switch(*cc)
-    {
-    case OP_CRSTAR:
-    case OP_CRMINSTAR:
-    case OP_CRPLUS:
-    case OP_CRMINPLUS:
-    case OP_CRPOSSTAR:
-    case OP_CRPOSPLUS:
-    return TRUE;
-    }
-  break;
-  }
-return FALSE;
-}
-
-static SLJIT_INLINE BOOL detect_fast_forward_skip(compiler_common *common, int *private_data_start)
-{
-pcre_uchar *cc = common->start;
-pcre_uchar *end;
-
-/* Skip not repeated brackets. */
-while (TRUE)
-  {
-  switch(*cc)
-    {
-    case OP_SOD:
-    case OP_SOM:
-    case OP_SET_SOM:
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_WORD_BOUNDARY:
-    case OP_EODN:
-    case OP_EOD:
-    case OP_CIRC:
-    case OP_CIRCM:
-    case OP_DOLL:
-    case OP_DOLLM:
-    /* Zero width assertions. */
-    cc++;
-    continue;
-    }
-
-  if (*cc != OP_BRA && *cc != OP_CBRA)
-    break;
-
-  end = cc + GET(cc, 1);
-  if (*end != OP_KET || PRIVATE_DATA(end) != 0)
-    return FALSE;
-  if (*cc == OP_CBRA)
-    {
-    if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
-      return FALSE;
-    cc += IMM2_SIZE;
-    }
-  cc += 1 + LINK_SIZE;
-  }
-
-if (is_accelerated_repeat(cc))
-  {
-  common->fast_forward_bc_ptr = cc;
-  common->private_data_ptrs[(cc + 1) - common->start] = *private_data_start;
-  *private_data_start += sizeof(sljit_sw);
-  return TRUE;
-  }
-return FALSE;
-}
-
-static SLJIT_INLINE void detect_fast_fail(compiler_common *common, pcre_uchar *cc, int *private_data_start, sljit_s32 depth)
-{
-  pcre_uchar *next_alt;
-
-  SLJIT_ASSERT(*cc == OP_BRA || *cc == OP_CBRA);
-
-  if (*cc == OP_CBRA && common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
-    return;
-
-  next_alt = bracketend(cc) - (1 + LINK_SIZE);
-  if (*next_alt != OP_KET || PRIVATE_DATA(next_alt) != 0)
-    return;
-
-  do
-    {
-    next_alt = cc + GET(cc, 1);
-
-    cc += 1 + LINK_SIZE + ((*cc == OP_CBRA) ? IMM2_SIZE : 0);
-
-    while (TRUE)
-      {
-      switch(*cc)
+      switch (*cc)
         {
-        case OP_SOD:
-        case OP_SOM:
-        case OP_SET_SOM:
-        case OP_NOT_WORD_BOUNDARY:
-        case OP_WORD_BOUNDARY:
-        case OP_EODN:
-        case OP_EOD:
-        case OP_CIRC:
-        case OP_CIRCM:
-        case OP_DOLL:
-        case OP_DOLLM:
-        /* Zero width assertions. */
+        case OP_CRSTAR:
+        case OP_CRMINSTAR:
+        case OP_CRPLUS:
+        case OP_CRMINPLUS:
+        case OP_CRPOSSTAR:
+        case OP_CRPOSPLUS:
         cc++;
+        break;
+
+        case OP_CRRANGE:
+        case OP_CRMINRANGE:
+        case OP_CRPOSRANGE:
+        cc += 2 * IMM2_SIZE;
+        /* Fall through */
+        case OP_CRQUERY:
+        case OP_CRMINQUERY:
+        case OP_CRPOSQUERY:
+        cc++;
+        if (count == 0)
+          count = 1;
+        /* Fall through */
+        default:
+        accelerated_start = NULL;
+        fast_forward_allowed = FALSE;
         continue;
         }
       break;
+
+      case OP_ONCE:
+      case OP_BRA:
+      case OP_CBRA:
+      end = cc + GET(cc, 1);
+
+      prev_fast_forward_allowed = fast_forward_allowed;
+      fast_forward_allowed = FALSE;
+      if (depth >= 4)
+        break;
+
+      end = bracketend(cc) - (1 + LINK_SIZE);
+      if (*end != OP_KET || (*cc == OP_CBRA && common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0))
+        break;
+
+      count = detect_early_fail(common, cc, private_data_start, depth + 1, count, prev_fast_forward_allowed);
+
+      if (PRIVATE_DATA(cc) != 0)
+        common->private_data_ptrs[begin - common->start] = 1;
+
+      if (count < EARLY_FAIL_ENHANCE_MAX)
+        {
+        cc = end + (1 + LINK_SIZE);
+        continue;
+        }
+      break;
+
+      case OP_KET:
+      SLJIT_ASSERT(PRIVATE_DATA(cc) == 0);
+      if (cc >= next_alt)
+        break;
+      cc += 1 + LINK_SIZE;
+      continue;
       }
 
-    if (depth > 0 && (*cc == OP_BRA || *cc == OP_CBRA))
-      detect_fast_fail(common, cc, private_data_start, depth - 1);
-
-    if (is_accelerated_repeat(cc))
+    if (accelerated_start != NULL)
       {
-      common->private_data_ptrs[(cc + 1) - common->start] = *private_data_start;
+      if (count == 0)
+        {
+        count++;
 
-      if (common->fast_fail_start_ptr == 0)
-        common->fast_fail_start_ptr = *private_data_start;
+        if (fast_forward_allowed)
+          {
+          common->fast_forward_bc_ptr = accelerated_start;
+          common->private_data_ptrs[(accelerated_start + 1) - common->start] = ((*private_data_start) << 3) | type_skip;
+          *private_data_start += sizeof(sljit_sw);
+          }
+        else
+          {
+          common->private_data_ptrs[(accelerated_start + 1) - common->start] = ((*private_data_start) << 3) | type_fail;
 
-      *private_data_start += sizeof(sljit_sw);
-      common->fast_fail_end_ptr = *private_data_start;
+          if (common->early_fail_start_ptr == 0)
+            common->early_fail_start_ptr = *private_data_start;
 
-      if (*private_data_start > SLJIT_MAX_LOCAL_SIZE)
-        return;
+          *private_data_start += sizeof(sljit_sw);
+          common->early_fail_end_ptr = *private_data_start;
+
+          if (*private_data_start > SLJIT_MAX_LOCAL_SIZE)
+            return EARLY_FAIL_ENHANCE_MAX;
+          }
+        }
+      else
+        {
+        common->private_data_ptrs[(accelerated_start + 1) - common->start] = ((*private_data_start) << 3) | type_fail_range;
+
+        if (common->early_fail_start_ptr == 0)
+          common->early_fail_start_ptr = *private_data_start;
+
+        *private_data_start += 2 * sizeof(sljit_sw);
+        common->early_fail_end_ptr = *private_data_start;
+
+        if (*private_data_start > SLJIT_MAX_LOCAL_SIZE)
+          return EARLY_FAIL_ENHANCE_MAX;
+        }
+
+      /* Cannot be part of a repeat. */
+      common->private_data_ptrs[begin - common->start] = 1;
+      count++;
+
+      if (count < EARLY_FAIL_ENHANCE_MAX)
+        continue;
       }
 
-    cc = next_alt;
+    break;
     }
-  while (*cc == OP_ALT);
+
+  if (*cc != OP_ALT && *cc != OP_KET)
+    result = EARLY_FAIL_ENHANCE_MAX;
+  else if (result < count)
+    result = count;
+
+  cc = next_alt;
+  next_alt = cc + GET(cc, 1);
+  }
+while (*cc == OP_ALT);
+
+return result;
 }
 
-static int get_class_iterator_size(pcre_uchar *cc)
+static int get_class_iterator_size(PCRE2_SPTR cc)
 {
 sljit_u32 min;
 sljit_u32 max;
@@ -1139,22 +1607,23 @@ switch(*cc)
   }
 }
 
-static BOOL detect_repeat(compiler_common *common, pcre_uchar *begin)
+static BOOL detect_repeat(compiler_common *common, PCRE2_SPTR begin)
 {
-pcre_uchar *end = bracketend(begin);
-pcre_uchar *next;
-pcre_uchar *next_end;
-pcre_uchar *max_end;
-pcre_uchar type;
+PCRE2_SPTR end = bracketend(begin);
+PCRE2_SPTR next;
+PCRE2_SPTR next_end;
+PCRE2_SPTR max_end;
+PCRE2_UCHAR type;
 sljit_sw length = end - begin;
-int min, max, i;
+sljit_s32 min, max, i;
 
 /* Detect fixed iterations first. */
-if (end[-(1 + LINK_SIZE)] != OP_KET)
+if (end[-(1 + LINK_SIZE)] != OP_KET || PRIVATE_DATA(begin) != 0)
   return FALSE;
 
-/* Already detected repeat. */
-if (common->private_data_ptrs[end - common->start - LINK_SIZE] != 0)
+/* /(?:AB){4,6}/ is currently converted to /(?:AB){3}(?AB){1,3}/
+ * Skip the check of the second part. */
+if (PRIVATE_DATA(end - LINK_SIZE) != 0)
   return TRUE;
 
 next = end;
@@ -1276,11 +1745,11 @@ return FALSE;
     case OP_TYPEUPTO: \
     case OP_TYPEMINUPTO:
 
-static void set_private_data_ptrs(compiler_common *common, int *private_data_start, pcre_uchar *ccend)
+static void set_private_data_ptrs(compiler_common *common, int *private_data_start, PCRE2_SPTR ccend)
 {
-pcre_uchar *cc = common->start;
-pcre_uchar *alternative;
-pcre_uchar *end = NULL;
+PCRE2_SPTR cc = common->start;
+PCRE2_SPTR alternative;
+PCRE2_SPTR end = NULL;
 int private_data_ptr = *private_data_start;
 int space, size, bracketlen;
 BOOL repeat_check = TRUE;
@@ -1293,7 +1762,8 @@ while (cc < ccend)
   if (private_data_ptr > SLJIT_MAX_LOCAL_SIZE)
     break;
 
-  if (repeat_check && (*cc == OP_ONCE || *cc == OP_ONCE_NC || *cc == OP_BRA || *cc == OP_CBRA || *cc == OP_COND))
+  /* When the bracket is prefixed by a zero iteration, skip the repeat check (at this point). */
+  if (repeat_check && (*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA || *cc == OP_COND))
     {
     if (detect_repeat(common, cc))
       {
@@ -1321,8 +1791,10 @@ while (cc < ccend)
     case OP_ASSERT_NOT:
     case OP_ASSERTBACK:
     case OP_ASSERTBACK_NOT:
+    case OP_ASSERT_NA:
+    case OP_ASSERTBACK_NA:
     case OP_ONCE:
-    case OP_ONCE_NC:
+    case OP_SCRIPT_RUN:
     case OP_BRAPOS:
     case OP_SBRA:
     case OP_SBRAPOS:
@@ -1341,6 +1813,7 @@ while (cc < ccend)
 
     case OP_COND:
     /* Might be a hidden SCOND. */
+    common->private_data_ptrs[cc - common->start] = 0;
     alternative = cc + GET(cc, 1);
     if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
       {
@@ -1362,57 +1835,57 @@ while (cc < ccend)
     case OP_BRAZERO:
     case OP_BRAMINZERO:
     case OP_BRAPOSZERO:
-    repeat_check = FALSE;
     size = 1;
+    repeat_check = FALSE;
     break;
 
     CASE_ITERATOR_PRIVATE_DATA_1
-    space = 1;
     size = -2;
+    space = 1;
     break;
 
     CASE_ITERATOR_PRIVATE_DATA_2A
-    space = 2;
     size = -2;
+    space = 2;
     break;
 
     CASE_ITERATOR_PRIVATE_DATA_2B
-    space = 2;
     size = -(2 + IMM2_SIZE);
+    space = 2;
     break;
 
     CASE_ITERATOR_TYPE_PRIVATE_DATA_1
-    space = 1;
     size = 1;
+    space = 1;
     break;
 
     CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
+    size = 1;
     if (cc[1] != OP_ANYNL && cc[1] != OP_EXTUNI)
       space = 2;
-    size = 1;
     break;
 
     case OP_TYPEUPTO:
+    size = 1 + IMM2_SIZE;
     if (cc[1 + IMM2_SIZE] != OP_ANYNL && cc[1 + IMM2_SIZE] != OP_EXTUNI)
       space = 2;
-    size = 1 + IMM2_SIZE;
     break;
 
     case OP_TYPEMINUPTO:
-    space = 2;
     size = 1 + IMM2_SIZE;
+    space = 2;
     break;
 
     case OP_CLASS:
     case OP_NCLASS:
+    size = 1 + 32 / sizeof(PCRE2_UCHAR);
     space = get_class_iterator_size(cc + size);
-    size = 1 + 32 / sizeof(pcre_uchar);
     break;
 
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
-    space = get_class_iterator_size(cc + size);
     size = GET(cc, 1);
+    space = get_class_iterator_size(cc + size);
     break;
 #endif
 
@@ -1435,7 +1908,7 @@ while (cc < ccend)
     if (size < 0)
       {
       cc += -size;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
       if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
 #endif
       }
@@ -1458,7 +1931,7 @@ while (cc < ccend)
 }
 
 /* Returns with a frame_types (always < 0) if no need for frame. */
-static int get_framesize(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, BOOL recursive, BOOL *needs_control_head)
+static int get_framesize(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend, BOOL recursive, BOOL *needs_control_head)
 {
 int length = 0;
 int possessive = 0;
@@ -1503,6 +1976,7 @@ while (cc < ccend)
     break;
 
     case OP_MARK:
+    case OP_COMMIT_ARG:
     case OP_PRUNE_ARG:
     case OP_THEN_ARG:
     SLJIT_ASSERT(common->mark_ptr != 0);
@@ -1625,7 +2099,9 @@ while (cc < ccend)
     case OP_CLASS:
     case OP_NCLASS:
     case OP_XCLASS:
+
     case OP_CALLOUT:
+    case OP_CALLOUT_STR:
 
     cc = next_opcode(common, cc);
     SLJIT_ASSERT(cc != NULL);
@@ -1641,11 +2117,11 @@ if (length > 0)
 return stack_restore ? no_frame : no_stack;
 }
 
-static void init_frame(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, int stackpos, int stacktop, BOOL recursive)
+static void init_frame(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend, int stackpos, int stacktop)
 {
 DEFINE_COMPILER;
-BOOL setsom_found = recursive;
-BOOL setmark_found = recursive;
+BOOL setsom_found = FALSE;
+BOOL setmark_found = FALSE;
 /* The last capture is a local variable even for recursions. */
 BOOL capture_last_found = FALSE;
 int offset;
@@ -1658,7 +2134,7 @@ stackpos = STACK(stackpos);
 if (ccend == NULL)
   {
   ccend = bracketend(cc) - (1 + LINK_SIZE);
-  if (recursive || (*cc != OP_CBRAPOS && *cc != OP_SCBRAPOS))
+  if (*cc != OP_CBRAPOS && *cc != OP_SCBRAPOS)
     cc = next_opcode(common, cc);
   }
 
@@ -1681,6 +2157,7 @@ while (cc < ccend)
     break;
 
     case OP_MARK:
+    case OP_COMMIT_ARG:
     case OP_PRUNE_ARG:
     case OP_THEN_ARG:
     SLJIT_ASSERT(common->mark_ptr != 0);
@@ -1763,21 +2240,154 @@ OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, 0);
 SLJIT_ASSERT(stackpos == STACK(stacktop));
 }
 
-static SLJIT_INLINE int get_private_data_copy_length(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, BOOL needs_control_head)
+#define RECURSE_TMP_REG_COUNT 3
+
+typedef struct delayed_mem_copy_status {
+  struct sljit_compiler *compiler;
+  int store_bases[RECURSE_TMP_REG_COUNT];
+  int store_offsets[RECURSE_TMP_REG_COUNT];
+  int tmp_regs[RECURSE_TMP_REG_COUNT];
+  int saved_tmp_regs[RECURSE_TMP_REG_COUNT];
+  int next_tmp_reg;
+} delayed_mem_copy_status;
+
+static void delayed_mem_copy_init(delayed_mem_copy_status *status, compiler_common *common)
 {
-int private_data_length = needs_control_head ? 3 : 2;
-int size;
-pcre_uchar *alternative;
+int i;
+
+for (i = 0; i < RECURSE_TMP_REG_COUNT; i++)
+  {
+  SLJIT_ASSERT(status->tmp_regs[i] >= 0);
+  SLJIT_ASSERT(sljit_get_register_index(status->saved_tmp_regs[i]) < 0 || status->tmp_regs[i] == status->saved_tmp_regs[i]);
+
+  status->store_bases[i] = -1;
+  }
+status->next_tmp_reg = 0;
+status->compiler = common->compiler;
+}
+
+static void delayed_mem_copy_move(delayed_mem_copy_status *status, int load_base, sljit_sw load_offset,
+  int store_base, sljit_sw store_offset)
+{
+struct sljit_compiler *compiler = status->compiler;
+int next_tmp_reg = status->next_tmp_reg;
+int tmp_reg = status->tmp_regs[next_tmp_reg];
+
+SLJIT_ASSERT(load_base > 0 && store_base > 0);
+
+if (status->store_bases[next_tmp_reg] == -1)
+  {
+  /* Preserve virtual registers. */
+  if (sljit_get_register_index(status->saved_tmp_regs[next_tmp_reg]) < 0)
+    OP1(SLJIT_MOV, status->saved_tmp_regs[next_tmp_reg], 0, tmp_reg, 0);
+  }
+else
+  OP1(SLJIT_MOV, SLJIT_MEM1(status->store_bases[next_tmp_reg]), status->store_offsets[next_tmp_reg], tmp_reg, 0);
+
+OP1(SLJIT_MOV, tmp_reg, 0, SLJIT_MEM1(load_base), load_offset);
+status->store_bases[next_tmp_reg] = store_base;
+status->store_offsets[next_tmp_reg] = store_offset;
+
+status->next_tmp_reg = (next_tmp_reg + 1) % RECURSE_TMP_REG_COUNT;
+}
+
+static void delayed_mem_copy_finish(delayed_mem_copy_status *status)
+{
+struct sljit_compiler *compiler = status->compiler;
+int next_tmp_reg = status->next_tmp_reg;
+int tmp_reg, saved_tmp_reg, i;
+
+for (i = 0; i < RECURSE_TMP_REG_COUNT; i++)
+  {
+  if (status->store_bases[next_tmp_reg] != -1)
+    {
+    tmp_reg = status->tmp_regs[next_tmp_reg];
+    saved_tmp_reg = status->saved_tmp_regs[next_tmp_reg];
+
+    OP1(SLJIT_MOV, SLJIT_MEM1(status->store_bases[next_tmp_reg]), status->store_offsets[next_tmp_reg], tmp_reg, 0);
+
+    /* Restore virtual registers. */
+    if (sljit_get_register_index(saved_tmp_reg) < 0)
+      OP1(SLJIT_MOV, tmp_reg, 0, saved_tmp_reg, 0);
+    }
+
+  next_tmp_reg = (next_tmp_reg + 1) % RECURSE_TMP_REG_COUNT;
+  }
+}
+
+#undef RECURSE_TMP_REG_COUNT
+
+static BOOL recurse_check_bit(compiler_common *common, sljit_sw bit_index)
+{
+uint8_t *byte;
+uint8_t mask;
+
+SLJIT_ASSERT((bit_index & (sizeof(sljit_sw) - 1)) == 0);
+
+bit_index >>= SLJIT_WORD_SHIFT;
+
+SLJIT_ASSERT((bit_index >> 3) < common->recurse_bitset_size);
+
+mask = 1 << (bit_index & 0x7);
+byte = common->recurse_bitset + (bit_index >> 3);
+
+if (*byte & mask)
+  return FALSE;
+
+*byte |= mask;
+return TRUE;
+}
+
+enum get_recurse_flags {
+  recurse_flag_quit_found = (1 << 0),
+  recurse_flag_accept_found = (1 << 1),
+  recurse_flag_setsom_found = (1 << 2),
+  recurse_flag_setmark_found = (1 << 3),
+  recurse_flag_control_head_found = (1 << 4),
+};
+
+static int get_recurse_data_length(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend, uint32_t *result_flags)
+{
+int length = 1;
+int size, offset;
+PCRE2_SPTR alternative;
+uint32_t recurse_flags = 0;
+
+memset(common->recurse_bitset, 0, common->recurse_bitset_size);
+
+#if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
+SLJIT_ASSERT(common->control_head_ptr != 0);
+recurse_flags |= recurse_flag_control_head_found;
+#endif
+
 /* Calculate the sum of the private machine words. */
 while (cc < ccend)
   {
   size = 0;
   switch(*cc)
     {
+    case OP_SET_SOM:
+    SLJIT_ASSERT(common->has_set_som);
+    recurse_flags |= recurse_flag_setsom_found;
+    cc += 1;
+    break;
+
+    case OP_RECURSE:
+    if (common->has_set_som)
+      recurse_flags |= recurse_flag_setsom_found;
+    if (common->mark_ptr != 0)
+      recurse_flags |= recurse_flag_setmark_found;
+    if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
+      length++;
+    cc += 1 + LINK_SIZE;
+    break;
+
     case OP_KET:
-    if (PRIVATE_DATA(cc) != 0)
+    offset = PRIVATE_DATA(cc);
+    if (offset != 0)
       {
-      private_data_length++;
+      if (recurse_check_bit(common, offset))
+        length++;
       SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
       cc += PRIVATE_DATA(cc + 1);
       }
@@ -1788,96 +2398,176 @@ while (cc < ccend)
     case OP_ASSERT_NOT:
     case OP_ASSERTBACK:
     case OP_ASSERTBACK_NOT:
+    case OP_ASSERT_NA:
+    case OP_ASSERTBACK_NA:
     case OP_ONCE:
-    case OP_ONCE_NC:
+    case OP_SCRIPT_RUN:
     case OP_BRAPOS:
     case OP_SBRA:
     case OP_SBRAPOS:
     case OP_SCOND:
-    private_data_length++;
     SLJIT_ASSERT(PRIVATE_DATA(cc) != 0);
+    if (recurse_check_bit(common, PRIVATE_DATA(cc)))
+      length++;
     cc += 1 + LINK_SIZE;
     break;
 
     case OP_CBRA:
     case OP_SCBRA:
-    if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
-      private_data_length++;
+    offset = GET2(cc, 1 + LINK_SIZE);
+    if (recurse_check_bit(common, OVECTOR(offset << 1)))
+      {
+      SLJIT_ASSERT(recurse_check_bit(common, OVECTOR((offset << 1) + 1)));
+      length += 2;
+      }
+    if (common->optimized_cbracket[offset] == 0 && recurse_check_bit(common, OVECTOR_PRIV(offset)))
+      length++;
+    if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
+      length++;
     cc += 1 + LINK_SIZE + IMM2_SIZE;
     break;
 
     case OP_CBRAPOS:
     case OP_SCBRAPOS:
-    private_data_length += 2;
+    offset = GET2(cc, 1 + LINK_SIZE);
+    if (recurse_check_bit(common, OVECTOR(offset << 1)))
+      {
+      SLJIT_ASSERT(recurse_check_bit(common, OVECTOR((offset << 1) + 1)));
+      length += 2;
+      }
+    if (recurse_check_bit(common, OVECTOR_PRIV(offset)))
+      length++;
+    if (recurse_check_bit(common, PRIVATE_DATA(cc)))
+      length++;
+    if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
+      length++;
     cc += 1 + LINK_SIZE + IMM2_SIZE;
     break;
 
     case OP_COND:
     /* Might be a hidden SCOND. */
     alternative = cc + GET(cc, 1);
-    if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
-      private_data_length++;
+    if ((*alternative == OP_KETRMAX || *alternative == OP_KETRMIN) && recurse_check_bit(common, PRIVATE_DATA(cc)))
+      length++;
     cc += 1 + LINK_SIZE;
     break;
 
     CASE_ITERATOR_PRIVATE_DATA_1
-    if (PRIVATE_DATA(cc))
-      private_data_length++;
+    offset = PRIVATE_DATA(cc);
+    if (offset != 0 && recurse_check_bit(common, offset))
+      length++;
     cc += 2;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
 #endif
     break;
 
     CASE_ITERATOR_PRIVATE_DATA_2A
-    if (PRIVATE_DATA(cc))
-      private_data_length += 2;
+    offset = PRIVATE_DATA(cc);
+    if (offset != 0 && recurse_check_bit(common, offset))
+      {
+      SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
+      length += 2;
+      }
     cc += 2;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
 #endif
     break;
 
     CASE_ITERATOR_PRIVATE_DATA_2B
-    if (PRIVATE_DATA(cc))
-      private_data_length += 2;
+    offset = PRIVATE_DATA(cc);
+    if (offset != 0 && recurse_check_bit(common, offset))
+      {
+      SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
+      length += 2;
+      }
     cc += 2 + IMM2_SIZE;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
 #endif
     break;
 
     CASE_ITERATOR_TYPE_PRIVATE_DATA_1
-    if (PRIVATE_DATA(cc))
-      private_data_length++;
+    offset = PRIVATE_DATA(cc);
+    if (offset != 0 && recurse_check_bit(common, offset))
+      length++;
     cc += 1;
     break;
 
     CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
-    if (PRIVATE_DATA(cc))
-      private_data_length += 2;
+    offset = PRIVATE_DATA(cc);
+    if (offset != 0 && recurse_check_bit(common, offset))
+      {
+      SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
+      length += 2;
+      }
     cc += 1;
     break;
 
     CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
-    if (PRIVATE_DATA(cc))
-      private_data_length += 2;
+    offset = PRIVATE_DATA(cc);
+    if (offset != 0 && recurse_check_bit(common, offset))
+      {
+      SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
+      length += 2;
+      }
     cc += 1 + IMM2_SIZE;
     break;
 
     case OP_CLASS:
     case OP_NCLASS:
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
-    size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(pcre_uchar);
+    size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(PCRE2_UCHAR);
 #else
-    size = 1 + 32 / (int)sizeof(pcre_uchar);
+    size = 1 + 32 / (int)sizeof(PCRE2_UCHAR);
 #endif
-    if (PRIVATE_DATA(cc))
-      private_data_length += get_class_iterator_size(cc + size);
+
+    offset = PRIVATE_DATA(cc);
+    if (offset != 0 && recurse_check_bit(common, offset))
+      length += get_class_iterator_size(cc + size);
     cc += size;
     break;
 
+    case OP_MARK:
+    case OP_COMMIT_ARG:
+    case OP_PRUNE_ARG:
+    case OP_THEN_ARG:
+    SLJIT_ASSERT(common->mark_ptr != 0);
+    recurse_flags |= recurse_flag_setmark_found;
+    if (common->control_head_ptr != 0)
+      recurse_flags |= recurse_flag_control_head_found;
+    if (*cc != OP_MARK)
+      recurse_flags |= recurse_flag_quit_found;
+
+    cc += 1 + 2 + cc[1];
+    break;
+
+    case OP_PRUNE:
+    case OP_SKIP:
+    case OP_COMMIT:
+    recurse_flags |= recurse_flag_quit_found;
+    cc++;
+    break;
+
+    case OP_SKIP_ARG:
+    recurse_flags |= recurse_flag_quit_found;
+    cc += 1 + 2 + cc[1];
+    break;
+
+    case OP_THEN:
+    SLJIT_ASSERT(common->control_head_ptr != 0);
+    recurse_flags |= recurse_flag_quit_found | recurse_flag_control_head_found;
+    cc++;
+    break;
+
+    case OP_ACCEPT:
+    case OP_ASSERT_ACCEPT:
+    recurse_flags |= recurse_flag_accept_found;
+    cc++;
+    break;
+
     default:
     cc = next_opcode(common, cc);
     SLJIT_ASSERT(cc != NULL);
@@ -1885,74 +2575,168 @@ while (cc < ccend)
     }
   }
 SLJIT_ASSERT(cc == ccend);
-return private_data_length;
-}
 
-static void copy_private_data(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend,
-  BOOL save, int stackptr, int stacktop, BOOL needs_control_head)
-{
-DEFINE_COMPILER;
-int srcw[2];
-int count, size;
-BOOL tmp1next = TRUE;
-BOOL tmp1empty = TRUE;
-BOOL tmp2empty = TRUE;
-pcre_uchar *alternative;
-enum {
-  loop,
-  end
-} status;
-
-status = loop;
-stackptr = STACK(stackptr);
-stacktop = STACK(stacktop - 1);
-
-if (!save)
+if (recurse_flags & recurse_flag_control_head_found)
+  length++;
+if (recurse_flags & recurse_flag_quit_found)
   {
-  stacktop -= (needs_control_head ? 2 : 1) * sizeof(sljit_sw);
-  if (stackptr < stacktop)
-    {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-    stackptr += sizeof(sljit_sw);
-    tmp1empty = FALSE;
-    }
-  if (stackptr < stacktop)
-    {
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-    stackptr += sizeof(sljit_sw);
-    tmp2empty = FALSE;
-    }
-  /* The tmp1next must be TRUE in either way. */
+  if (recurse_flags & recurse_flag_setsom_found)
+    length++;
+  if (recurse_flags & recurse_flag_setmark_found)
+    length++;
   }
 
-SLJIT_ASSERT(common->recursive_head_ptr != 0);
+*result_flags = recurse_flags;
+return length;
+}
 
-do
+enum copy_recurse_data_types {
+  recurse_copy_from_global,
+  recurse_copy_private_to_global,
+  recurse_copy_shared_to_global,
+  recurse_copy_kept_shared_to_global,
+  recurse_swap_global
+};
+
+static void copy_recurse_data(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend,
+  int type, int stackptr, int stacktop, uint32_t recurse_flags)
+{
+delayed_mem_copy_status status;
+PCRE2_SPTR alternative;
+sljit_sw private_srcw[2];
+sljit_sw shared_srcw[3];
+sljit_sw kept_shared_srcw[2];
+int private_count, shared_count, kept_shared_count;
+int from_sp, base_reg, offset, i;
+
+memset(common->recurse_bitset, 0, common->recurse_bitset_size);
+
+#if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
+SLJIT_ASSERT(common->control_head_ptr != 0);
+recurse_check_bit(common, common->control_head_ptr);
+#endif
+
+switch (type)
   {
-  count = 0;
-  if (cc >= ccend)
-    {
-    if (!save)
-      break;
+  case recurse_copy_from_global:
+  from_sp = TRUE;
+  base_reg = STACK_TOP;
+  break;
 
-    count = 1;
-    srcw[0] = common->recursive_head_ptr;
-    if (needs_control_head)
-      {
-      SLJIT_ASSERT(common->control_head_ptr != 0);
-      count = 2;
-      srcw[0] = common->control_head_ptr;
-      srcw[1] = common->recursive_head_ptr;
-      }
-    status = end;
-    }
-  else switch(*cc)
+  case recurse_copy_private_to_global:
+  case recurse_copy_shared_to_global:
+  case recurse_copy_kept_shared_to_global:
+  from_sp = FALSE;
+  base_reg = STACK_TOP;
+  break;
+
+  default:
+  SLJIT_ASSERT(type == recurse_swap_global);
+  from_sp = FALSE;
+  base_reg = TMP2;
+  break;
+  }
+
+stackptr = STACK(stackptr);
+stacktop = STACK(stacktop);
+
+status.tmp_regs[0] = TMP1;
+status.saved_tmp_regs[0] = TMP1;
+
+if (base_reg != TMP2)
+  {
+  status.tmp_regs[1] = TMP2;
+  status.saved_tmp_regs[1] = TMP2;
+  }
+else
+  {
+  status.saved_tmp_regs[1] = RETURN_ADDR;
+  if (HAS_VIRTUAL_REGISTERS)
+    status.tmp_regs[1] = STR_PTR;
+  else
+    status.tmp_regs[1] = RETURN_ADDR;
+  }
+
+status.saved_tmp_regs[2] = TMP3;
+if (HAS_VIRTUAL_REGISTERS)
+  status.tmp_regs[2] = STR_END;
+else
+  status.tmp_regs[2] = TMP3;
+
+delayed_mem_copy_init(&status, common);
+
+if (type != recurse_copy_shared_to_global && type != recurse_copy_kept_shared_to_global)
+  {
+  SLJIT_ASSERT(type == recurse_copy_from_global || type == recurse_copy_private_to_global || type == recurse_swap_global);
+
+  if (!from_sp)
+    delayed_mem_copy_move(&status, base_reg, stackptr, SLJIT_SP, common->recursive_head_ptr);
+
+  if (from_sp || type == recurse_swap_global)
+    delayed_mem_copy_move(&status, SLJIT_SP, common->recursive_head_ptr, base_reg, stackptr);
+  }
+
+stackptr += sizeof(sljit_sw);
+
+#if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
+if (type != recurse_copy_shared_to_global)
+  {
+  if (!from_sp)
+    delayed_mem_copy_move(&status, base_reg, stackptr, SLJIT_SP, common->control_head_ptr);
+
+  if (from_sp || type == recurse_swap_global)
+    delayed_mem_copy_move(&status, SLJIT_SP, common->control_head_ptr, base_reg, stackptr);
+  }
+
+stackptr += sizeof(sljit_sw);
+#endif
+
+while (cc < ccend)
+  {
+  private_count = 0;
+  shared_count = 0;
+  kept_shared_count = 0;
+
+  switch(*cc)
     {
-    case OP_KET:
-    if (PRIVATE_DATA(cc) != 0)
+    case OP_SET_SOM:
+    SLJIT_ASSERT(common->has_set_som);
+    if ((recurse_flags & recurse_flag_quit_found) && recurse_check_bit(common, OVECTOR(0)))
       {
-      count = 1;
-      srcw[0] = PRIVATE_DATA(cc);
+      kept_shared_srcw[0] = OVECTOR(0);
+      kept_shared_count = 1;
+      }
+    cc += 1;
+    break;
+
+    case OP_RECURSE:
+    if (recurse_flags & recurse_flag_quit_found)
+      {
+      if (common->has_set_som && recurse_check_bit(common, OVECTOR(0)))
+        {
+        kept_shared_srcw[0] = OVECTOR(0);
+        kept_shared_count = 1;
+        }
+      if (common->mark_ptr != 0 && recurse_check_bit(common, common->mark_ptr))
+        {
+        kept_shared_srcw[kept_shared_count] = common->mark_ptr;
+        kept_shared_count++;
+        }
+      }
+    if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
+      {
+      shared_srcw[0] = common->capture_last_ptr;
+      shared_count = 1;
+      }
+    cc += 1 + LINK_SIZE;
+    break;
+
+    case OP_KET:
+    private_srcw[0] = PRIVATE_DATA(cc);
+    if (private_srcw[0] != 0)
+      {
+      if (recurse_check_bit(common, private_srcw[0]))
+        private_count = 1;
       SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
       cc += PRIVATE_DATA(cc + 1);
       }
@@ -1963,34 +2747,74 @@ do
     case OP_ASSERT_NOT:
     case OP_ASSERTBACK:
     case OP_ASSERTBACK_NOT:
+    case OP_ASSERT_NA:
+    case OP_ASSERTBACK_NA:
     case OP_ONCE:
-    case OP_ONCE_NC:
+    case OP_SCRIPT_RUN:
     case OP_BRAPOS:
     case OP_SBRA:
     case OP_SBRAPOS:
     case OP_SCOND:
-    count = 1;
-    srcw[0] = PRIVATE_DATA(cc);
-    SLJIT_ASSERT(srcw[0] != 0);
+    private_srcw[0] = PRIVATE_DATA(cc);
+    if (recurse_check_bit(common, private_srcw[0]))
+      private_count = 1;
     cc += 1 + LINK_SIZE;
     break;
 
     case OP_CBRA:
     case OP_SCBRA:
-    if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
+    offset = GET2(cc, 1 + LINK_SIZE);
+    shared_srcw[0] = OVECTOR(offset << 1);
+    if (recurse_check_bit(common, shared_srcw[0]))
       {
-      count = 1;
-      srcw[0] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
+      shared_srcw[1] = shared_srcw[0] + sizeof(sljit_sw);
+      SLJIT_ASSERT(recurse_check_bit(common, shared_srcw[1]));
+      shared_count = 2;
       }
+
+    if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
+      {
+      shared_srcw[shared_count] = common->capture_last_ptr;
+      shared_count++;
+      }
+
+    if (common->optimized_cbracket[offset] == 0)
+      {
+      private_srcw[0] = OVECTOR_PRIV(offset);
+      if (recurse_check_bit(common, private_srcw[0]))
+        private_count = 1;
+      }
+
     cc += 1 + LINK_SIZE + IMM2_SIZE;
     break;
 
     case OP_CBRAPOS:
     case OP_SCBRAPOS:
-    count = 2;
-    srcw[0] = PRIVATE_DATA(cc);
-    srcw[1] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
-    SLJIT_ASSERT(srcw[0] != 0 && srcw[1] != 0);
+    offset = GET2(cc, 1 + LINK_SIZE);
+    shared_srcw[0] = OVECTOR(offset << 1);
+    if (recurse_check_bit(common, shared_srcw[0]))
+      {
+      shared_srcw[1] = shared_srcw[0] + sizeof(sljit_sw);
+      SLJIT_ASSERT(recurse_check_bit(common, shared_srcw[1]));
+      shared_count = 2;
+      }
+
+    if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
+      {
+      shared_srcw[shared_count] = common->capture_last_ptr;
+      shared_count++;
+      }
+
+    private_srcw[0] = PRIVATE_DATA(cc);
+    if (recurse_check_bit(common, private_srcw[0]))
+      private_count = 1;
+
+    offset = OVECTOR_PRIV(offset);
+    if (recurse_check_bit(common, offset))
+      {
+      private_srcw[private_count] = offset;
+      private_count++;
+      }
     cc += 1 + LINK_SIZE + IMM2_SIZE;
     break;
 
@@ -1999,213 +2823,221 @@ do
     alternative = cc + GET(cc, 1);
     if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
       {
-      count = 1;
-      srcw[0] = PRIVATE_DATA(cc);
-      SLJIT_ASSERT(srcw[0] != 0);
+      private_srcw[0] = PRIVATE_DATA(cc);
+      if (recurse_check_bit(common, private_srcw[0]))
+        private_count = 1;
       }
     cc += 1 + LINK_SIZE;
     break;
 
     CASE_ITERATOR_PRIVATE_DATA_1
-    if (PRIVATE_DATA(cc))
-      {
-      count = 1;
-      srcw[0] = PRIVATE_DATA(cc);
-      }
+    private_srcw[0] = PRIVATE_DATA(cc);
+    if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
+      private_count = 1;
     cc += 2;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
 #endif
     break;
 
     CASE_ITERATOR_PRIVATE_DATA_2A
-    if (PRIVATE_DATA(cc))
+    private_srcw[0] = PRIVATE_DATA(cc);
+    if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
       {
-      count = 2;
-      srcw[0] = PRIVATE_DATA(cc);
-      srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
+      private_count = 2;
+      private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
+      SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
       }
     cc += 2;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
 #endif
     break;
 
     CASE_ITERATOR_PRIVATE_DATA_2B
-    if (PRIVATE_DATA(cc))
+    private_srcw[0] = PRIVATE_DATA(cc);
+    if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
       {
-      count = 2;
-      srcw[0] = PRIVATE_DATA(cc);
-      srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
+      private_count = 2;
+      private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
+      SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
       }
     cc += 2 + IMM2_SIZE;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
 #endif
     break;
 
     CASE_ITERATOR_TYPE_PRIVATE_DATA_1
-    if (PRIVATE_DATA(cc))
-      {
-      count = 1;
-      srcw[0] = PRIVATE_DATA(cc);
-      }
+    private_srcw[0] = PRIVATE_DATA(cc);
+    if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
+      private_count = 1;
     cc += 1;
     break;
 
     CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
-    if (PRIVATE_DATA(cc))
+    private_srcw[0] = PRIVATE_DATA(cc);
+    if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
       {
-      count = 2;
-      srcw[0] = PRIVATE_DATA(cc);
-      srcw[1] = srcw[0] + sizeof(sljit_sw);
+      private_count = 2;
+      private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
+      SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
       }
     cc += 1;
     break;
 
     CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
-    if (PRIVATE_DATA(cc))
+    private_srcw[0] = PRIVATE_DATA(cc);
+    if (private_srcw[0] != 0 && recurse_check_bit(common, private_srcw[0]))
       {
-      count = 2;
-      srcw[0] = PRIVATE_DATA(cc);
-      srcw[1] = srcw[0] + sizeof(sljit_sw);
+      private_count = 2;
+      private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
+      SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
       }
     cc += 1 + IMM2_SIZE;
     break;
 
     case OP_CLASS:
     case OP_NCLASS:
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
-    size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(pcre_uchar);
+    i = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(PCRE2_UCHAR);
 #else
-    size = 1 + 32 / (int)sizeof(pcre_uchar);
+    i = 1 + 32 / (int)sizeof(PCRE2_UCHAR);
 #endif
-    if (PRIVATE_DATA(cc))
-      switch(get_class_iterator_size(cc + size))
+    if (PRIVATE_DATA(cc) != 0)
+      {
+      private_count = 1;
+      private_srcw[0] = PRIVATE_DATA(cc);
+      switch(get_class_iterator_size(cc + i))
         {
         case 1:
-        count = 1;
-        srcw[0] = PRIVATE_DATA(cc);
         break;
 
         case 2:
-        count = 2;
-        srcw[0] = PRIVATE_DATA(cc);
-        srcw[1] = srcw[0] + sizeof(sljit_sw);
+        if (recurse_check_bit(common, private_srcw[0]))
+          {
+          private_count = 2;
+          private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
+          SLJIT_ASSERT(recurse_check_bit(common, private_srcw[1]));
+          }
         break;
 
         default:
         SLJIT_UNREACHABLE();
         break;
         }
-    cc += size;
+      }
+    cc += i;
+    break;
+
+    case OP_MARK:
+    case OP_COMMIT_ARG:
+    case OP_PRUNE_ARG:
+    case OP_THEN_ARG:
+    SLJIT_ASSERT(common->mark_ptr != 0);
+    if ((recurse_flags & recurse_flag_quit_found) && recurse_check_bit(common, common->mark_ptr))
+      {
+      kept_shared_srcw[0] = common->mark_ptr;
+      kept_shared_count = 1;
+      }
+    if (common->control_head_ptr != 0 && recurse_check_bit(common, common->control_head_ptr))
+      {
+      private_srcw[0] = common->control_head_ptr;
+      private_count = 1;
+      }
+    cc += 1 + 2 + cc[1];
+    break;
+
+    case OP_THEN:
+    SLJIT_ASSERT(common->control_head_ptr != 0);
+    if (recurse_check_bit(common, common->control_head_ptr))
+      {
+      private_srcw[0] = common->control_head_ptr;
+      private_count = 1;
+      }
+    cc++;
     break;
 
     default:
     cc = next_opcode(common, cc);
     SLJIT_ASSERT(cc != NULL);
-    break;
+    continue;
     }
 
-  while (count > 0)
+  if (type != recurse_copy_shared_to_global && type != recurse_copy_kept_shared_to_global)
     {
-    count--;
-    if (save)
-      {
-      if (tmp1next)
-        {
-        if (!tmp1empty)
-          {
-          OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
-          stackptr += sizeof(sljit_sw);
-          }
-        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), srcw[count]);
-        tmp1empty = FALSE;
-        tmp1next = FALSE;
-        }
-      else
-        {
-        if (!tmp2empty)
-          {
-          OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
-          stackptr += sizeof(sljit_sw);
-          }
-        OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), srcw[count]);
-        tmp2empty = FALSE;
-        tmp1next = TRUE;
-        }
-      }
-    else
-      {
-      if (tmp1next)
-        {
-        SLJIT_ASSERT(!tmp1empty);
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), srcw[count], TMP1, 0);
-        tmp1empty = stackptr >= stacktop;
-        if (!tmp1empty)
-          {
-          OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-          stackptr += sizeof(sljit_sw);
-          }
-        tmp1next = FALSE;
-        }
-      else
-        {
-        SLJIT_ASSERT(!tmp2empty);
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), srcw[count], TMP2, 0);
-        tmp2empty = stackptr >= stacktop;
-        if (!tmp2empty)
-          {
-          OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-          stackptr += sizeof(sljit_sw);
-          }
-        tmp1next = TRUE;
-        }
-      }
-    }
-  }
-while (status != end);
+    SLJIT_ASSERT(type == recurse_copy_from_global || type == recurse_copy_private_to_global || type == recurse_swap_global);
 
-if (save)
-  {
-  if (tmp1next)
-    {
-    if (!tmp1empty)
+    for (i = 0; i < private_count; i++)
       {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
-      stackptr += sizeof(sljit_sw);
-      }
-    if (!tmp2empty)
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
+      SLJIT_ASSERT(private_srcw[i] != 0);
+
+      if (!from_sp)
+        delayed_mem_copy_move(&status, base_reg, stackptr, SLJIT_SP, private_srcw[i]);
+
+      if (from_sp || type == recurse_swap_global)
+        delayed_mem_copy_move(&status, SLJIT_SP, private_srcw[i], base_reg, stackptr);
+
       stackptr += sizeof(sljit_sw);
       }
     }
   else
+    stackptr += sizeof(sljit_sw) * private_count;
+
+  if (type != recurse_copy_private_to_global && type != recurse_copy_kept_shared_to_global)
     {
-    if (!tmp2empty)
+    SLJIT_ASSERT(type == recurse_copy_from_global || type == recurse_copy_shared_to_global || type == recurse_swap_global);
+
+    for (i = 0; i < shared_count; i++)
       {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
-      stackptr += sizeof(sljit_sw);
-      }
-    if (!tmp1empty)
-      {
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
+      SLJIT_ASSERT(shared_srcw[i] != 0);
+
+      if (!from_sp)
+        delayed_mem_copy_move(&status, base_reg, stackptr, SLJIT_SP, shared_srcw[i]);
+
+      if (from_sp || type == recurse_swap_global)
+        delayed_mem_copy_move(&status, SLJIT_SP, shared_srcw[i], base_reg, stackptr);
+
       stackptr += sizeof(sljit_sw);
       }
     }
+  else
+    stackptr += sizeof(sljit_sw) * shared_count;
+
+  if (type != recurse_copy_private_to_global && type != recurse_swap_global)
+    {
+    SLJIT_ASSERT(type == recurse_copy_from_global || type == recurse_copy_shared_to_global || type == recurse_copy_kept_shared_to_global);
+
+    for (i = 0; i < kept_shared_count; i++)
+      {
+      SLJIT_ASSERT(kept_shared_srcw[i] != 0);
+
+      if (!from_sp)
+        delayed_mem_copy_move(&status, base_reg, stackptr, SLJIT_SP, kept_shared_srcw[i]);
+
+      if (from_sp || type == recurse_swap_global)
+        delayed_mem_copy_move(&status, SLJIT_SP, kept_shared_srcw[i], base_reg, stackptr);
+
+      stackptr += sizeof(sljit_sw);
+      }
+    }
+  else
+    stackptr += sizeof(sljit_sw) * kept_shared_count;
   }
-SLJIT_ASSERT(cc == ccend && stackptr == stacktop && (save || (tmp1empty && tmp2empty)));
+
+SLJIT_ASSERT(cc == ccend && stackptr == stacktop);
+
+delayed_mem_copy_finish(&status);
 }
 
-static SLJIT_INLINE pcre_uchar *set_then_offsets(compiler_common *common, pcre_uchar *cc, sljit_u8 *current_offset)
+static SLJIT_INLINE PCRE2_SPTR set_then_offsets(compiler_common *common, PCRE2_SPTR cc, sljit_u8 *current_offset)
 {
-pcre_uchar *end = bracketend(cc);
+PCRE2_SPTR end = bracketend(cc);
 BOOL has_alternatives = cc[GET(cc, 1)] == OP_ALT;
 
 /* Assert captures then. */
-if (*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT)
+if (*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NA)
   current_offset = NULL;
 /* Conditional block does not. */
 if (*cc == OP_COND || *cc == OP_SCOND)
@@ -2217,7 +3049,7 @@ if (has_alternatives)
 
 while (cc < end)
   {
-  if ((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND))
+  if ((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NA) || (*cc >= OP_ONCE && *cc <= OP_SCOND))
     cc = set_then_offsets(common, cc, current_offset);
   else
     {
@@ -2295,20 +3127,6 @@ while (list_item)
 common->stubs = NULL;
 }
 
-static void add_label_addr(compiler_common *common, sljit_uw *update_addr)
-{
-DEFINE_COMPILER;
-label_addr_list *label_addr;
-
-label_addr = sljit_alloc_memory(compiler, sizeof(label_addr_list));
-if (label_addr == NULL)
-  return;
-label_addr->label = LABEL();
-label_addr->update_addr = update_addr;
-label_addr->next = common->label_addrs;
-common->label_addrs = label_addr;
-}
-
 static SLJIT_INLINE void count_match(compiler_common *common)
 {
 DEFINE_COMPILER;
@@ -2362,25 +3180,11 @@ common->read_only_data_head = (void *)result;
 return result + 1;
 }
 
-static void free_read_only_data(void *current, void *allocator_data)
-{
-void *next;
-
-SLJIT_UNUSED_ARG(allocator_data);
-
-while (current != NULL)
-  {
-  next = *(void**)current;
-  SLJIT_FREE(current, allocator_data);
-  current = next;
-  }
-}
-
 static SLJIT_INLINE void reset_ovector(compiler_common *common, int length)
 {
 DEFINE_COMPILER;
 struct sljit_label *loop;
-int i;
+sljit_s32 i;
 
 /* At this point we can freely use all temporary registers. */
 SLJIT_ASSERT(length > 1);
@@ -2415,16 +3219,54 @@ else
   }
 }
 
-static SLJIT_INLINE void reset_fast_fail(compiler_common *common)
+static SLJIT_INLINE void reset_early_fail(compiler_common *common)
 {
 DEFINE_COMPILER;
+sljit_u32 size = (sljit_u32)(common->early_fail_end_ptr - common->early_fail_start_ptr);
+sljit_u32 uncleared_size;
+sljit_s32 src = SLJIT_IMM;
 sljit_s32 i;
+struct sljit_label *loop;
 
-SLJIT_ASSERT(common->fast_fail_start_ptr < common->fast_fail_end_ptr);
+SLJIT_ASSERT(common->early_fail_start_ptr < common->early_fail_end_ptr);
 
-OP2(SLJIT_SUB, TMP1, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-for (i = common->fast_fail_start_ptr; i < common->fast_fail_end_ptr; i += sizeof(sljit_sw))
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), i, TMP1, 0);
+if (size == sizeof(sljit_sw))
+  {
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->early_fail_start_ptr, SLJIT_IMM, 0);
+  return;
+  }
+
+if (sljit_get_register_index(TMP3) >= 0 && !sljit_has_cpu_feature(SLJIT_HAS_ZERO_REGISTER))
+  {
+  OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 0);
+  src = TMP3;
+  }
+
+if (size <= 6 * sizeof(sljit_sw))
+  {
+  for (i = common->early_fail_start_ptr; i < common->early_fail_end_ptr; i += sizeof(sljit_sw))
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), i, src, 0);
+  return;
+  }
+
+GET_LOCAL_BASE(TMP1, 0, common->early_fail_start_ptr);
+
+uncleared_size = ((size / sizeof(sljit_sw)) % 3) * sizeof(sljit_sw);
+
+OP2(SLJIT_ADD, TMP2, 0, TMP1, 0, SLJIT_IMM, size - uncleared_size);
+
+loop = LABEL();
+OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), 0, src, 0);
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 3 * sizeof(sljit_sw));
+OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), -2 * (sljit_sw)sizeof(sljit_sw), src, 0);
+OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), -1 * (sljit_sw)sizeof(sljit_sw), src, 0);
+CMPTO(SLJIT_LESS, TMP1, 0, TMP2, 0, loop);
+
+if (uncleared_size >= sizeof(sljit_sw))
+  OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), 0, src, 0);
+
+if (uncleared_size >= 2 * sizeof(sljit_sw))
+  OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), sizeof(sljit_sw), src, 0);
 }
 
 static SLJIT_INLINE void do_reset_match(compiler_common *common, int length)
@@ -2465,17 +3307,23 @@ else
     }
   }
 
-OP1(SLJIT_MOV, STACK_TOP, 0, ARGUMENTS, 0);
+if (!HAS_VIRTUAL_REGISTERS)
+  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, stack));
+else
+  OP1(SLJIT_MOV, STACK_TOP, 0, ARGUMENTS, 0);
+
 if (common->mark_ptr != 0)
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, SLJIT_IMM, 0);
 if (common->control_head_ptr != 0)
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(STACK_TOP), SLJIT_OFFSETOF(jit_arguments, stack));
+if (HAS_VIRTUAL_REGISTERS)
+  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(STACK_TOP), SLJIT_OFFSETOF(jit_arguments, stack));
+
 OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->start_ptr);
 OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(STACK_TOP), SLJIT_OFFSETOF(struct sljit_stack, end));
 }
 
-static sljit_sw SLJIT_FUNC do_search_mark(sljit_sw *current, const pcre_uchar *skip_arg)
+static sljit_sw SLJIT_FUNC do_search_mark(sljit_sw *current, PCRE2_SPTR skip_arg)
 {
 while (current != NULL)
   {
@@ -2485,7 +3333,7 @@ while (current != NULL)
     break;
 
     case type_mark:
-    if (STRCMP_UC_UC(skip_arg, (pcre_uchar *)current[2]) == 0)
+    if (PRIV(strcmp)(skip_arg, (PCRE2_SPTR)current[2]) == 0)
       return current[3];
     break;
 
@@ -2503,27 +3351,43 @@ static SLJIT_INLINE void copy_ovector(compiler_common *common, int topbracket)
 {
 DEFINE_COMPILER;
 struct sljit_label *loop;
-struct sljit_jump *early_quit;
 BOOL has_pre;
 
 /* At this point we can freely use all registers. */
 OP1(SLJIT_MOV, SLJIT_S2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1));
 OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(1), STR_PTR, 0);
 
-OP1(SLJIT_MOV, SLJIT_R0, 0, ARGUMENTS, 0);
-if (common->mark_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
-OP1(SLJIT_MOV_S32, SLJIT_R1, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, offset_count));
-if (common->mark_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, mark_ptr), SLJIT_R2, 0);
-OP2(SLJIT_SUB, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, offsets), SLJIT_IMM, sizeof(int));
-OP1(SLJIT_MOV, SLJIT_R0, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, begin));
+if (HAS_VIRTUAL_REGISTERS)
+  {
+  OP1(SLJIT_MOV, SLJIT_R0, 0, ARGUMENTS, 0);
+  OP1(SLJIT_MOV, SLJIT_S0, 0, SLJIT_MEM1(SLJIT_SP), common->start_ptr);
+  if (common->mark_ptr != 0)
+    OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
+  OP1(SLJIT_MOV_U32, SLJIT_R1, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, oveccount));
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, startchar_ptr), SLJIT_S0, 0);
+  if (common->mark_ptr != 0)
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, mark_ptr), SLJIT_R2, 0);
+  OP2(SLJIT_ADD, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, match_data),
+    SLJIT_IMM, SLJIT_OFFSETOF(pcre2_match_data, ovector) - sizeof(PCRE2_SIZE));
+  }
+else
+  {
+  OP1(SLJIT_MOV, SLJIT_S0, 0, SLJIT_MEM1(SLJIT_SP), common->start_ptr);
+  OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, match_data));
+  if (common->mark_ptr != 0)
+    OP1(SLJIT_MOV, SLJIT_R0, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
+  OP1(SLJIT_MOV_U32, SLJIT_R1, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, oveccount));
+  OP1(SLJIT_MOV, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, startchar_ptr), SLJIT_S0, 0);
+  if (common->mark_ptr != 0)
+    OP1(SLJIT_MOV, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, mark_ptr), SLJIT_R0, 0);
+  OP2(SLJIT_ADD, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, SLJIT_OFFSETOF(pcre2_match_data, ovector) - sizeof(PCRE2_SIZE));
+  }
 
 has_pre = sljit_emit_mem(compiler, SLJIT_MOV | SLJIT_MEM_SUPP | SLJIT_MEM_PRE, SLJIT_S1, SLJIT_MEM1(SLJIT_S0), sizeof(sljit_sw)) == SLJIT_SUCCESS;
-GET_LOCAL_BASE(SLJIT_S0, 0, OVECTOR_START - (has_pre ? sizeof(sljit_sw) : 0));
 
-/* Unlikely, but possible */
-early_quit = CMP(SLJIT_EQUAL, SLJIT_R1, 0, SLJIT_IMM, 0);
+GET_LOCAL_BASE(SLJIT_S0, 0, OVECTOR_START - (has_pre ? sizeof(sljit_sw) : 0));
+OP1(SLJIT_MOV, SLJIT_R0, 0, SLJIT_MEM1(HAS_VIRTUAL_REGISTERS ? SLJIT_R0 : ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, begin));
+
 loop = LABEL();
 
 if (has_pre)
@@ -2534,17 +3398,18 @@ else
   OP2(SLJIT_ADD, SLJIT_S0, 0, SLJIT_S0, 0, SLJIT_IMM, sizeof(sljit_sw));
   }
 
-OP2(SLJIT_ADD, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, sizeof(int));
+OP2(SLJIT_ADD, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, sizeof(PCRE2_SIZE));
 OP2(SLJIT_SUB, SLJIT_S1, 0, SLJIT_S1, 0, SLJIT_R0, 0);
 /* Copy the integer value to the output buffer */
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
 OP2(SLJIT_ASHR, SLJIT_S1, 0, SLJIT_S1, 0, SLJIT_IMM, UCHAR_SHIFT);
 #endif
 
-OP1(SLJIT_MOV_S32, SLJIT_MEM1(SLJIT_R2), 0, SLJIT_S1, 0);
+SLJIT_ASSERT(sizeof(PCRE2_SIZE) == 4 || sizeof(PCRE2_SIZE) == 8);
+OP1(((sizeof(PCRE2_SIZE) == 4) ? SLJIT_MOV_U32 : SLJIT_MOV), SLJIT_MEM1(SLJIT_R2), 0, SLJIT_S1, 0);
+
 OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_IMM, 1);
 JUMPTO(SLJIT_NOT_ZERO, loop);
-JUMPHERE(early_quit);
 
 /* Calculate the return value, which is the maximum ovector value. */
 if (topbracket > 1)
@@ -2559,6 +3424,7 @@ if (topbracket > 1)
     sljit_emit_mem(compiler, SLJIT_MOV | SLJIT_MEM_PRE, SLJIT_R2, SLJIT_MEM1(SLJIT_R0), -(2 * (sljit_sw)sizeof(sljit_sw)));
     OP2(SLJIT_SUB, SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_IMM, 1);
     CMPTO(SLJIT_EQUAL, SLJIT_R2, 0, SLJIT_S2, 0, loop);
+    OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_R1, 0);
     }
   else
     {
@@ -2571,8 +3437,8 @@ if (topbracket > 1)
     OP2(SLJIT_SUB, SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_IMM, 2 * (sljit_sw)sizeof(sljit_sw));
     OP2(SLJIT_SUB, SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_IMM, 1);
     CMPTO(SLJIT_EQUAL, SLJIT_R2, 0, SLJIT_S2, 0, loop);
+    OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_R1, 0);
     }
-  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_R1, 0);
   }
 else
   OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, 1);
@@ -2581,41 +3447,37 @@ else
 static SLJIT_INLINE void return_with_partial_match(compiler_common *common, struct sljit_label *quit)
 {
 DEFINE_COMPILER;
-struct sljit_jump *jump;
+sljit_s32 mov_opcode;
+sljit_s32 arguments_reg = !HAS_VIRTUAL_REGISTERS ? ARGUMENTS : SLJIT_R1;
 
-SLJIT_COMPILE_ASSERT(STR_END == SLJIT_S1, str_end_must_be_saved_reg2);
+SLJIT_COMPILE_ASSERT(STR_END == SLJIT_S0, str_end_must_be_saved_reg0);
 SLJIT_ASSERT(common->start_used_ptr != 0 && common->start_ptr != 0
-  && (common->mode == JIT_PARTIAL_SOFT_COMPILE ? common->hit_start != 0 : common->hit_start == 0));
+  && (common->mode == PCRE2_JIT_PARTIAL_SOFT ? common->hit_start != 0 : common->hit_start == 0));
 
-OP1(SLJIT_MOV, SLJIT_R1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_PARTIAL);
-OP1(SLJIT_MOV_S32, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_R1), SLJIT_OFFSETOF(jit_arguments, real_offset_count));
-CMPTO(SLJIT_SIG_LESS, SLJIT_R2, 0, SLJIT_IMM, 2, quit);
+if (arguments_reg != ARGUMENTS)
+  OP1(SLJIT_MOV, arguments_reg, 0, ARGUMENTS, 0);
+OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_SP),
+  common->mode == PCRE2_JIT_PARTIAL_SOFT ? common->hit_start : common->start_ptr);
+OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_PARTIAL);
 
 /* Store match begin and end. */
-OP1(SLJIT_MOV, SLJIT_S0, 0, SLJIT_MEM1(SLJIT_R1), SLJIT_OFFSETOF(jit_arguments, begin));
-OP1(SLJIT_MOV, SLJIT_R1, 0, SLJIT_MEM1(SLJIT_R1), SLJIT_OFFSETOF(jit_arguments, offsets));
+OP1(SLJIT_MOV, SLJIT_S1, 0, SLJIT_MEM1(arguments_reg), SLJIT_OFFSETOF(jit_arguments, begin));
+OP1(SLJIT_MOV, SLJIT_MEM1(arguments_reg), SLJIT_OFFSETOF(jit_arguments, startchar_ptr), SLJIT_R2, 0);
+OP1(SLJIT_MOV, SLJIT_R1, 0, SLJIT_MEM1(arguments_reg), SLJIT_OFFSETOF(jit_arguments, match_data));
 
-jump = CMP(SLJIT_SIG_LESS, SLJIT_R2, 0, SLJIT_IMM, 3);
-OP2(SLJIT_SUB, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_SP), common->mode == JIT_PARTIAL_HARD_COMPILE ? common->start_ptr : (common->hit_start + (int)sizeof(sljit_sw)), SLJIT_S0, 0);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+mov_opcode = (sizeof(PCRE2_SIZE) == 4) ? SLJIT_MOV_U32 : SLJIT_MOV;
+
+OP2(SLJIT_SUB, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_S1, 0);
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
 OP2(SLJIT_ASHR, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, UCHAR_SHIFT);
 #endif
-OP1(SLJIT_MOV_S32, SLJIT_MEM1(SLJIT_R1), 2 * sizeof(int), SLJIT_R2, 0);
-JUMPHERE(jump);
+OP1(mov_opcode, SLJIT_MEM1(SLJIT_R1), SLJIT_OFFSETOF(pcre2_match_data, ovector), SLJIT_R2, 0);
 
-OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_SP), common->mode == JIT_PARTIAL_HARD_COMPILE ? common->start_used_ptr : common->hit_start);
-OP2(SLJIT_SUB, SLJIT_S1, 0, STR_END, 0, SLJIT_S0, 0);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-OP2(SLJIT_ASHR, SLJIT_S1, 0, SLJIT_S1, 0, SLJIT_IMM, UCHAR_SHIFT);
+OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_S1, 0);
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+OP2(SLJIT_ASHR, STR_END, 0, STR_END, 0, SLJIT_IMM, UCHAR_SHIFT);
 #endif
-OP1(SLJIT_MOV_S32, SLJIT_MEM1(SLJIT_R1), sizeof(int), SLJIT_S1, 0);
-
-OP2(SLJIT_SUB, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_S0, 0);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-OP2(SLJIT_ASHR, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, UCHAR_SHIFT);
-#endif
-OP1(SLJIT_MOV_S32, SLJIT_MEM1(SLJIT_R1), 0, SLJIT_R2, 0);
+OP1(mov_opcode, SLJIT_MEM1(SLJIT_R1), SLJIT_OFFSETOF(pcre2_match_data, ovector) + sizeof(PCRE2_SIZE), STR_END, 0);
 
 JUMPTO(SLJIT_JUMP, quit);
 }
@@ -2626,7 +3488,7 @@ static SLJIT_INLINE void check_start_used_ptr(compiler_common *common)
 DEFINE_COMPILER;
 struct sljit_jump *jump;
 
-if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+if (common->mode == PCRE2_JIT_PARTIAL_SOFT)
   {
   /* The value of -1 must be kept for start_used_ptr! */
   OP2(SLJIT_ADD, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, SLJIT_IMM, 1);
@@ -2636,7 +3498,7 @@ if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
   JUMPHERE(jump);
   }
-else if (common->mode == JIT_PARTIAL_HARD_COMPILE)
+else if (common->mode == PCRE2_JIT_PARTIAL_HARD)
   {
   jump = CMP(SLJIT_LESS_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
@@ -2644,26 +3506,25 @@ else if (common->mode == JIT_PARTIAL_HARD_COMPILE)
   }
 }
 
-static SLJIT_INLINE BOOL char_has_othercase(compiler_common *common, pcre_uchar *cc)
+static SLJIT_INLINE BOOL char_has_othercase(compiler_common *common, PCRE2_SPTR cc)
 {
 /* Detects if the character has an othercase. */
 unsigned int c;
 
-#ifdef SUPPORT_UTF
-if (common->utf)
+#ifdef SUPPORT_UNICODE
+if (common->utf || common->ucp)
   {
-  GETCHAR(c, cc);
-  if (c > 127)
+  if (common->utf)
     {
-#ifdef SUPPORT_UCP
-    return c != UCD_OTHERCASE(c);
-#else
-    return FALSE;
-#endif
+    GETCHAR(c, cc);
     }
-#ifndef COMPILE_PCRE8
+  else
+    c = *cc;
+
+  if (c > 127)
+    return c != UCD_OTHERCASE(c);
+
   return common->fcc[c] != c;
-#endif
   }
 else
 #endif
@@ -2674,41 +3535,35 @@ return MAX_255(c) ? common->fcc[c] != c : FALSE;
 static SLJIT_INLINE unsigned int char_othercase(compiler_common *common, unsigned int c)
 {
 /* Returns with the othercase. */
-#ifdef SUPPORT_UTF
-if (common->utf && c > 127)
-  {
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
+if ((common->utf || common->ucp) && c > 127)
   return UCD_OTHERCASE(c);
-#else
-  return c;
-#endif
-  }
 #endif
 return TABLE_GET(c, common->fcc, c);
 }
 
-static unsigned int char_get_othercase_bit(compiler_common *common, pcre_uchar *cc)
+static unsigned int char_get_othercase_bit(compiler_common *common, PCRE2_SPTR cc)
 {
 /* Detects if the character and its othercase has only 1 bit difference. */
 unsigned int c, oc, bit;
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
 int n;
 #endif
 
-#ifdef SUPPORT_UTF
-if (common->utf)
+#ifdef SUPPORT_UNICODE
+if (common->utf || common->ucp)
   {
-  GETCHAR(c, cc);
+  if (common->utf)
+    {
+    GETCHAR(c, cc);
+    }
+  else
+    c = *cc;
+
   if (c <= 127)
     oc = common->fcc[c];
   else
-    {
-#ifdef SUPPORT_UCP
     oc = UCD_OTHERCASE(c);
-#else
-    oc = c;
-#endif
-    }
   }
 else
   {
@@ -2731,9 +3586,9 @@ if (c <= 127 && bit == 0x20)
 if (!is_powerof2(bit))
   return 0;
 
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
 
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
 if (common->utf && c > 127)
   {
   n = GET_EXTRALEN(*cc);
@@ -2744,23 +3599,23 @@ if (common->utf && c > 127)
     }
   return (n << 8) | bit;
   }
-#endif /* SUPPORT_UTF */
+#endif /* SUPPORT_UNICODE */
 return (0 << 8) | bit;
 
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+#elif PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
 
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
 if (common->utf && c > 65535)
   {
-  if (bit >= (1 << 10))
+  if (bit >= (1u << 10))
     bit >>= 10;
   else
     return (bit < 256) ? ((2 << 8) | bit) : ((3 << 8) | (bit >> 8));
   }
-#endif /* SUPPORT_UTF */
-return (bit < 256) ? ((0 << 8) | bit) : ((1 << 8) | (bit >> 8));
+#endif /* SUPPORT_UNICODE */
+return (bit < 256) ? ((0u << 8) | bit) : ((1u << 8) | (bit >> 8));
 
-#endif /* COMPILE_PCRE[8|16|32] */
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
 }
 
 static void check_partial(compiler_common *common, BOOL force)
@@ -2769,17 +3624,17 @@ static void check_partial(compiler_common *common, BOOL force)
 DEFINE_COMPILER;
 struct sljit_jump *jump = NULL;
 
-SLJIT_ASSERT(!force || common->mode != JIT_COMPILE);
+SLJIT_ASSERT(!force || common->mode != PCRE2_JIT_COMPLETE);
 
-if (common->mode == JIT_COMPILE)
+if (common->mode == PCRE2_JIT_COMPLETE)
   return;
 
-if (!force)
+if (!force && !common->allow_empty_partial)
   jump = CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
-else if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+else if (common->mode == PCRE2_JIT_PARTIAL_SOFT)
   jump = CMP(SLJIT_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, SLJIT_IMM, -1);
 
-if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+if (common->mode == PCRE2_JIT_PARTIAL_SOFT)
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, 0);
 else
   {
@@ -2799,14 +3654,14 @@ static void check_str_end(compiler_common *common, jump_list **end_reached)
 DEFINE_COMPILER;
 struct sljit_jump *jump;
 
-if (common->mode == JIT_COMPILE)
+if (common->mode == PCRE2_JIT_COMPLETE)
   {
   add_jump(compiler, end_reached, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
   return;
   }
 
 jump = CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0);
-if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+if (common->mode == PCRE2_JIT_PARTIAL_SOFT)
   {
   add_jump(compiler, end_reached, CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0));
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, 0);
@@ -2828,7 +3683,7 @@ static void detect_partial_match(compiler_common *common, jump_list **backtracks
 DEFINE_COMPILER;
 struct sljit_jump *jump;
 
-if (common->mode == JIT_COMPILE)
+if (common->mode == PCRE2_JIT_COMPLETE)
   {
   add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
   return;
@@ -2836,8 +3691,12 @@ if (common->mode == JIT_COMPILE)
 
 /* Partial matching mode. */
 jump = CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0);
-add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0));
-if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+if (!common->allow_empty_partial)
+  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0));
+else if (common->mode == PCRE2_JIT_PARTIAL_SOFT)
+  add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, SLJIT_IMM, -1));
+
+if (common->mode == PCRE2_JIT_PARTIAL_SOFT)
   {
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, 0);
   add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
@@ -2852,50 +3711,387 @@ else
 JUMPHERE(jump);
 }
 
-static void peek_char(compiler_common *common, sljit_u32 max)
+static void process_partial_match(compiler_common *common)
+{
+DEFINE_COMPILER;
+struct sljit_jump *jump;
+
+/* Partial matching mode. */
+if (common->mode == PCRE2_JIT_PARTIAL_SOFT)
+  {
+  jump = CMP(SLJIT_GREATER_EQUAL, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, 0);
+  JUMPHERE(jump);
+  }
+else if (common->mode == PCRE2_JIT_PARTIAL_HARD)
+  {
+  if (common->partialmatchlabel != NULL)
+    CMPTO(SLJIT_LESS, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0, common->partialmatchlabel);
+  else
+    add_jump(compiler, &common->partialmatch, CMP(SLJIT_LESS, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0));
+  }
+}
+
+static void detect_partial_match_to(compiler_common *common, struct sljit_label *label)
+{
+DEFINE_COMPILER;
+
+CMPTO(SLJIT_LESS, STR_PTR, 0, STR_END, 0, label);
+process_partial_match(common);
+}
+
+static void peek_char(compiler_common *common, sljit_u32 max, sljit_s32 dst, sljit_sw dstw, jump_list **backtracks)
 {
 /* Reads the character into TMP1, keeps STR_PTR.
-Does not check STR_END. TMP2 Destroyed. */
+Does not check STR_END. TMP2, dst, RETURN_ADDR Destroyed. */
 DEFINE_COMPILER;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
 struct sljit_jump *jump;
-#endif
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32 */
 
 SLJIT_UNUSED_ARG(max);
+SLJIT_UNUSED_ARG(dst);
+SLJIT_UNUSED_ARG(dstw);
+SLJIT_UNUSED_ARG(backtracks);
 
-OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
 if (common->utf)
   {
   if (max < 128) return;
 
-  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
+  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x80);
+  OP1(SLJIT_MOV, dst, dstw, STR_PTR, 0);
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  add_jump(compiler, &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
+  add_jump(compiler, common->invalid_utf ? &common->utfreadchar_invalid : &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
+  OP1(SLJIT_MOV, STR_PTR, 0, dst, dstw);
+  if (backtracks && common->invalid_utf)
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR));
   JUMPHERE(jump);
   }
-#endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
+#elif PCRE2_CODE_UNIT_WIDTH == 16
 if (common->utf)
   {
   if (max < 0xd800) return;
 
   OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-  jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800 - 1);
-  /* TMP2 contains the high surrogate. */
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x40);
-  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 10);
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3ff);
-  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+
+  if (common->invalid_utf)
+    {
+    jump = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0xe000 - 0xd800);
+    OP1(SLJIT_MOV, dst, dstw, STR_PTR, 0);
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    add_jump(compiler, &common->utfreadchar_invalid, JUMP(SLJIT_FAST_CALL));
+    OP1(SLJIT_MOV, STR_PTR, 0, dst, dstw);
+    if (backtracks && common->invalid_utf)
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR));
+    }
+  else
+    {
+    /* TMP2 contains the high surrogate. */
+    jump = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800);
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
+    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 10);
+    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000 - 0xdc00);
+    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+    }
+
   JUMPHERE(jump);
   }
-#endif
+#elif PCRE2_CODE_UNIT_WIDTH == 32
+if (common->invalid_utf)
+  {
+  if (max < 0xd800) return;
+
+  if (backtracks != NULL)
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+    add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x110000));
+    add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0xe000 - 0xd800));
+    }
+  else
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+    OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x110000);
+    CMOV(SLJIT_GREATER_EQUAL, TMP1, SLJIT_IMM, INVALID_UTF_CHAR);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP2, 0, SLJIT_IMM, 0xe000 - 0xd800);
+    CMOV(SLJIT_LESS, TMP1, SLJIT_IMM, INVALID_UTF_CHAR);
+    }
+  }
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
+#endif /* SUPPORT_UNICODE */
 }
 
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+static void peek_char_back(compiler_common *common, sljit_u32 max, jump_list **backtracks)
+{
+/* Reads one character back without moving STR_PTR. TMP2 must
+contain the start of the subject buffer. Affects TMP1, TMP2, and RETURN_ADDR. */
+DEFINE_COMPILER;
+
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+struct sljit_jump *jump;
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32 */
+
+SLJIT_UNUSED_ARG(max);
+SLJIT_UNUSED_ARG(backtracks);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
+
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+if (common->utf)
+  {
+  if (max < 128) return;
+
+  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x80);
+  if (common->invalid_utf)
+    {
+    add_jump(compiler, &common->utfpeakcharback_invalid, JUMP(SLJIT_FAST_CALL));
+    if (backtracks != NULL)
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR));
+    }
+  else
+    add_jump(compiler, &common->utfpeakcharback, JUMP(SLJIT_FAST_CALL));
+  JUMPHERE(jump);
+  }
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+if (common->utf)
+  {
+  if (max < 0xd800) return;
+
+  if (common->invalid_utf)
+    {
+    jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
+    add_jump(compiler, &common->utfpeakcharback_invalid, JUMP(SLJIT_FAST_CALL));
+    if (backtracks != NULL)
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR));
+    }
+  else
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xdc00);
+    jump = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0xe000 - 0xdc00);
+    /* TMP2 contains the low surrogate. */
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+    OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x10000);
+    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 10);
+    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+    }
+    JUMPHERE(jump);
+  }
+#elif PCRE2_CODE_UNIT_WIDTH == 32
+if (common->invalid_utf)
+  {
+  OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x110000));
+  add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0xe000 - 0xd800));
+  }
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
+#endif /* SUPPORT_UNICODE */
+}
+
+#define READ_CHAR_UPDATE_STR_PTR 0x1
+#define READ_CHAR_UTF8_NEWLINE 0x2
+#define READ_CHAR_NEWLINE (READ_CHAR_UPDATE_STR_PTR | READ_CHAR_UTF8_NEWLINE)
+#define READ_CHAR_VALID_UTF 0x4
+
+static void read_char(compiler_common *common, sljit_u32 min, sljit_u32 max,
+  jump_list **backtracks, sljit_u32 options)
+{
+/* Reads the precise value of a character into TMP1, if the character is
+between min and max (c >= min && c <= max). Otherwise it returns with a value
+outside the range. Does not check STR_END. */
+DEFINE_COMPILER;
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+struct sljit_jump *jump;
+#endif
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+struct sljit_jump *jump2;
+#endif
+
+SLJIT_UNUSED_ARG(min);
+SLJIT_UNUSED_ARG(max);
+SLJIT_UNUSED_ARG(backtracks);
+SLJIT_UNUSED_ARG(options);
+SLJIT_ASSERT(min <= max);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+if (common->utf)
+  {
+  if (max < 128 && !(options & READ_CHAR_UPDATE_STR_PTR)) return;
+
+  if (common->invalid_utf && !(options & READ_CHAR_VALID_UTF))
+    {
+    jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x80);
+
+    if (options & READ_CHAR_UTF8_NEWLINE)
+      add_jump(compiler, &common->utfreadnewline_invalid, JUMP(SLJIT_FAST_CALL));
+    else
+      add_jump(compiler, &common->utfreadchar_invalid, JUMP(SLJIT_FAST_CALL));
+
+    if (backtracks != NULL)
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR));
+    JUMPHERE(jump);
+    return;
+    }
+
+  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
+  if (min >= 0x10000)
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xf0);
+    if (options & READ_CHAR_UPDATE_STR_PTR)
+      OP1(SLJIT_MOV_U8, RETURN_ADDR, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+    jump2 = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0x7);
+    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
+    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
+    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
+    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(2));
+    if (!(options & READ_CHAR_UPDATE_STR_PTR))
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(3));
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
+    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+    JUMPHERE(jump2);
+    if (options & READ_CHAR_UPDATE_STR_PTR)
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, RETURN_ADDR, 0);
+    }
+  else if (min >= 0x800 && max <= 0xffff)
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xe0);
+    if (options & READ_CHAR_UPDATE_STR_PTR)
+      OP1(SLJIT_MOV_U8, RETURN_ADDR, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+    jump2 = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xf);
+    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
+    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
+    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
+    if (!(options & READ_CHAR_UPDATE_STR_PTR))
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
+    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+    JUMPHERE(jump2);
+    if (options & READ_CHAR_UPDATE_STR_PTR)
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, RETURN_ADDR, 0);
+    }
+  else if (max >= 0x800)
+    {
+    add_jump(compiler, &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
+    }
+  else if (max < 128)
+    {
+    OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
+    }
+  else
+    {
+    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+    if (!(options & READ_CHAR_UPDATE_STR_PTR))
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    else
+      OP1(SLJIT_MOV_U8, RETURN_ADDR, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
+    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
+    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+    if (options & READ_CHAR_UPDATE_STR_PTR)
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, RETURN_ADDR, 0);
+    }
+  JUMPHERE(jump);
+  }
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+if (common->utf)
+  {
+  if (max < 0xd800 && !(options & READ_CHAR_UPDATE_STR_PTR)) return;
+
+  if (common->invalid_utf && !(options & READ_CHAR_VALID_UTF))
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+    jump = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0xe000 - 0xd800);
+
+    if (options & READ_CHAR_UTF8_NEWLINE)
+      add_jump(compiler, &common->utfreadnewline_invalid, JUMP(SLJIT_FAST_CALL));
+    else
+      add_jump(compiler, &common->utfreadchar_invalid, JUMP(SLJIT_FAST_CALL));
+
+    if (backtracks != NULL)
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR));
+    JUMPHERE(jump);
+    return;
+    }
+
+  if (max >= 0x10000)
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+    jump = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800);
+    /* TMP2 contains the high surrogate. */
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 10);
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000 - 0xdc00);
+    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+    JUMPHERE(jump);
+    return;
+    }
+
+  /* Skip low surrogate if necessary. */
+  OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+
+  if (sljit_has_cpu_feature(SLJIT_HAS_CMOV) && !HAS_VIRTUAL_REGISTERS)
+    {
+    if (options & READ_CHAR_UPDATE_STR_PTR)
+      OP2(SLJIT_ADD, RETURN_ADDR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP2, 0, SLJIT_IMM, 0x400);
+    if (options & READ_CHAR_UPDATE_STR_PTR)
+      CMOV(SLJIT_LESS, STR_PTR, RETURN_ADDR, 0);
+    if (max >= 0xd800)
+      CMOV(SLJIT_LESS, TMP1, SLJIT_IMM, 0x10000);
+    }
+  else
+    {
+    jump = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x400);
+    if (options & READ_CHAR_UPDATE_STR_PTR)
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    if (max >= 0xd800)
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0x10000);
+    JUMPHERE(jump);
+    }
+  }
+#elif PCRE2_CODE_UNIT_WIDTH == 32
+if (common->invalid_utf)
+  {
+  if (backtracks != NULL)
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+    add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x110000));
+    add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0xe000 - 0xd800));
+    }
+  else
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+    OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x110000);
+    CMOV(SLJIT_GREATER_EQUAL, TMP1, SLJIT_IMM, INVALID_UTF_CHAR);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP2, 0, SLJIT_IMM, 0xe000 - 0xd800);
+    CMOV(SLJIT_LESS, TMP1, SLJIT_IMM, INVALID_UTF_CHAR);
+    }
+  }
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
+#endif /* SUPPORT_UNICODE */
+}
+
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
 
 static BOOL is_char7_bitset(const sljit_u8 *bitset, BOOL nclass)
 {
@@ -2914,7 +4110,7 @@ while (bitset < end);
 return TRUE;
 }
 
-static void read_char7_type(compiler_common *common, BOOL full_read)
+static void read_char7_type(compiler_common *common, jump_list **backtracks, BOOL negated)
 {
 /* Reads the precise character type of a character into TMP1, if the character
 is less than 128. Otherwise it returns with zero. Does not check STR_END. The
@@ -2927,183 +4123,82 @@ SLJIT_ASSERT(common->utf);
 OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 
+/* All values > 127 are zero in ctypes. */
 OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
 
-if (full_read)
+if (negated)
   {
-  jump = CMP(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0xc0);
-  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-  JUMPHERE(jump);
-  }
-}
+  jump = CMP(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0x80);
 
-#endif /* SUPPORT_UTF && COMPILE_PCRE8 */
-
-static void read_char_range(compiler_common *common, sljit_u32 min, sljit_u32 max, BOOL update_str_ptr)
-{
-/* Reads the precise value of a character into TMP1, if the character is
-between min and max (c >= min && c <= max). Otherwise it returns with a value
-outside the range. Does not check STR_END. */
-DEFINE_COMPILER;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-struct sljit_jump *jump;
-#endif
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-struct sljit_jump *jump2;
-#endif
-
-SLJIT_UNUSED_ARG(update_str_ptr);
-SLJIT_UNUSED_ARG(min);
-SLJIT_UNUSED_ARG(max);
-SLJIT_ASSERT(min <= max);
-
-OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-if (common->utf)
-  {
-  if (max < 128 && !update_str_ptr) return;
-
-  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
-  if (min >= 0x10000)
+  if (common->invalid_utf)
     {
-    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xf0);
-    if (update_str_ptr)
-      OP1(SLJIT_MOV_U8, RETURN_ADDR, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    jump2 = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0x7);
-    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(2));
-    if (!update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(3));
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    JUMPHERE(jump2);
-    if (update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, RETURN_ADDR, 0);
-    }
-  else if (min >= 0x800 && max <= 0xffff)
-    {
-    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xe0);
-    if (update_str_ptr)
-      OP1(SLJIT_MOV_U8, RETURN_ADDR, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    jump2 = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xf);
-    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-    if (!update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    JUMPHERE(jump2);
-    if (update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, RETURN_ADDR, 0);
-    }
-  else if (max >= 0x800)
-    add_jump(compiler, (max < 0x10000) ? &common->utfreadchar16 : &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
-  else if (max < 128)
-    {
-    OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
+    add_jump(compiler, &common->utfreadchar_invalid, JUMP(SLJIT_FAST_CALL));
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR));
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
     }
   else
     {
-    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    if (!update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-    else
-      OP1(SLJIT_MOV_U8, RETURN_ADDR, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    if (update_str_ptr)
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, RETURN_ADDR, 0);
+    OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(utf8_table4) - 0xc0);
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
     }
   JUMPHERE(jump);
   }
-#endif
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
-if (common->utf)
-  {
-  if (max >= 0x10000)
-    {
-    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-    jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800 - 1);
-    /* TMP2 contains the high surrogate. */
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x40);
-    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 10);
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3ff);
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-    JUMPHERE(jump);
-    return;
-    }
-
-  if (max < 0xd800 && !update_str_ptr) return;
-
-  /* Skip low surrogate if necessary. */
-  OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-  jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800 - 1);
-  if (update_str_ptr)
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  if (max >= 0xd800)
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0x10000);
-  JUMPHERE(jump);
-  }
-#endif
 }
 
-static SLJIT_INLINE void read_char(compiler_common *common)
-{
-read_char_range(common, 0, READ_CHAR_MAX, TRUE);
-}
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8 */
 
-static void read_char8_type(compiler_common *common, BOOL update_str_ptr)
+static void read_char8_type(compiler_common *common, jump_list **backtracks, BOOL negated)
 {
 /* Reads the character type into TMP1, updates STR_PTR. Does not check STR_END. */
 DEFINE_COMPILER;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
 struct sljit_jump *jump;
 #endif
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
 struct sljit_jump *jump2;
 #endif
 
-SLJIT_UNUSED_ARG(update_str_ptr);
+SLJIT_UNUSED_ARG(backtracks);
+SLJIT_UNUSED_ARG(negated);
 
 OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
 if (common->utf)
   {
-  /* This can be an extra read in some situations, but hopefully
-  it is needed in most cases. */
+  /* The result of this read may be unused, but saves an "else" part. */
   OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
-  jump = CMP(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0xc0);
-  if (!update_str_ptr)
+  jump = CMP(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0x80);
+
+  if (!negated)
     {
+    if (common->invalid_utf)
+      add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+
     OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
     OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
+    OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xc2);
+    if (common->invalid_utf)
+      add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0xe0 - 0xc2));
+
     OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-    OP2(SLJIT_OR, TMP2, 0, TMP2, 0, TMP1, 0);
+    OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP1, 0);
+    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x80);
+    if (common->invalid_utf)
+      add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40));
+
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
+    jump2 = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 255);
+    OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
+    JUMPHERE(jump2);
+    }
+  else if (common->invalid_utf)
+    {
+    add_jump(compiler, &common->utfreadchar_invalid, JUMP(SLJIT_FAST_CALL));
+    OP1(SLJIT_MOV, TMP2, 0, TMP1, 0);
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR));
+
     OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
     jump2 = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 255);
     OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
@@ -3111,43 +4206,95 @@ if (common->utf)
     }
   else
     add_jump(compiler, &common->utfreadtype8, JUMP(SLJIT_FAST_CALL));
+
   JUMPHERE(jump);
   return;
   }
-#endif /* SUPPORT_UTF && COMPILE_PCRE8 */
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8 */
 
-#if !defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 32
+if (common->invalid_utf && negated)
+  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x110000));
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 32 */
+
+#if PCRE2_CODE_UNIT_WIDTH != 8
 /* The ctypes array contains only 256 values. */
 OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
 jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 255);
-#endif
+#endif /* PCRE2_CODE_UNIT_WIDTH != 8 */
 OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
-#if !defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH != 8
 JUMPHERE(jump);
-#endif
+#endif /* PCRE2_CODE_UNIT_WIDTH != 8 */
 
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
-if (common->utf && update_str_ptr)
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 16
+if (common->utf && negated)
   {
   /* Skip low surrogate if necessary. */
+  if (!common->invalid_utf)
+    {
+    OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xd800);
+
+    if (sljit_has_cpu_feature(SLJIT_HAS_CMOV) && !HAS_VIRTUAL_REGISTERS)
+      {
+      OP2(SLJIT_ADD, RETURN_ADDR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP2, 0, SLJIT_IMM, 0x400);
+      CMOV(SLJIT_LESS, STR_PTR, RETURN_ADDR, 0);
+      }
+    else
+      {
+      jump = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x400);
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+      JUMPHERE(jump);
+      }
+    return;
+    }
+
   OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xd800);
-  jump = CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, 0xdc00 - 0xd800 - 1);
+  jump = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0xe000 - 0xd800);
+  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x400));
+  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+
+  OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+  OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xdc00);
+  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x400));
+
   JUMPHERE(jump);
+  return;
   }
-#endif /* SUPPORT_UTF && COMPILE_PCRE16 */
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 16 */
 }
 
-static void skip_char_back(compiler_common *common)
+static void move_back(compiler_common *common, jump_list **backtracks, BOOL must_be_valid)
 {
-/* Goes one character back. Affects STR_PTR and TMP1. Does not check begin. */
+/* Goes one character back. Affects STR_PTR and TMP1. If must_be_valid is TRUE,
+TMP2 is not used. Otherwise TMP2 must contain the start of the subject buffer,
+and it is destroyed. Does not modify STR_PTR for invalid character sequences. */
 DEFINE_COMPILER;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-#if defined COMPILE_PCRE8
+
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+struct sljit_jump *jump;
+#endif
+
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
 struct sljit_label *label;
 
 if (common->utf)
   {
+  if (!must_be_valid && common->invalid_utf)
+    {
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));
+    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x80);
+    add_jump(compiler, &common->utfmoveback_invalid, JUMP(SLJIT_FAST_CALL));
+    if (backtracks != NULL)
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0));
+    JUMPHERE(jump);
+    return;
+    }
+
   label = LABEL();
   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));
   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
@@ -3155,21 +4302,54 @@ if (common->utf)
   CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0x80, label);
   return;
   }
-#elif defined COMPILE_PCRE16
+#elif PCRE2_CODE_UNIT_WIDTH == 16
 if (common->utf)
   {
   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));
   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+  if (!must_be_valid && common->invalid_utf)
+    {
+    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+    jump = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xe000 - 0xd800);
+    add_jump(compiler, &common->utfmoveback_invalid, JUMP(SLJIT_FAST_CALL));
+    if (backtracks != NULL)
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0));
+    JUMPHERE(jump);
+    return;
+    }
+
   /* Skip low surrogate if necessary. */
   OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xdc00);
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0xdc00);
   OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
+  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
   return;
   }
-#endif /* COMPILE_PCRE[8|16] */
-#endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
+#elif PCRE2_CODE_UNIT_WIDTH == 32
+if (common->invalid_utf && !must_be_valid)
+  {
+  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));
+  if (backtracks != NULL)
+    {
+    add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x110000));
+    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    return;
+    }
+
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP1, 0, SLJIT_IMM, 0x110000);
+  OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_LESS);
+  OP2(SLJIT_SHL,  TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
+  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+  return;
+  }
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
+#endif /* SUPPORT_UNICODE */
+
+SLJIT_UNUSED_ARG(backtracks);
+SLJIT_UNUSED_ARG(must_be_valid);
+
 OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 }
 
@@ -3206,91 +4386,52 @@ else
   }
 }
 
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
 
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
 static void do_utfreadchar(compiler_common *common)
 {
 /* Fast decoding a UTF-8 character. TMP1 contains the first byte
-of the character (>= 0xc0). Return char value in TMP1, length in TMP2. */
+of the character (>= 0xc0). Return char value in TMP1. */
 DEFINE_COMPILER;
 struct sljit_jump *jump;
 
 sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
 OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
 OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
 OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
 OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
 
 /* Searching for the first zero. */
-OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x800);
+OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x800);
 jump = JUMP(SLJIT_NOT_ZERO);
 /* Two byte sequence. */
+OP2(SLJIT_XOR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3000);
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(2));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 
 JUMPHERE(jump);
 OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-OP2(SLJIT_XOR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x800);
 OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
 OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
 OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
 
-OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x10000);
+OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x10000);
 jump = JUMP(SLJIT_NOT_ZERO);
 /* Three byte sequence. */
+OP2(SLJIT_XOR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xe0000);
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(3));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 
 /* Four byte sequence. */
 JUMPHERE(jump);
 OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(2));
-OP2(SLJIT_XOR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000);
-OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+OP2(SLJIT_XOR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xf0000);
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(3));
-OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(4));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-}
-
-static void do_utfreadchar16(compiler_common *common)
-{
-/* Fast decoding a UTF-8 character. TMP1 contains the first byte
-of the character (>= 0xc0). Return value in TMP1. */
-DEFINE_COMPILER;
-struct sljit_jump *jump;
-
-sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
 OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
 OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
 OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-
-/* Searching for the first zero. */
-OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x800);
-jump = JUMP(SLJIT_NOT_ZERO);
-/* Two byte sequence. */
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
-
-JUMPHERE(jump);
-OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x400);
-OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_NOT_ZERO);
-/* This code runs only in 8 bit mode. No need to shift the value. */
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
-OP2(SLJIT_XOR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x800);
-OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
-OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
-OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-/* Three byte sequence. */
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 }
 
 static void do_utfreadtype8(compiler_common *common)
@@ -3303,7 +4444,7 @@ struct sljit_jump *compare;
 
 sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
 
-OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, 0x20);
+OP2U(SLJIT_AND | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, 0x20);
 jump = JUMP(SLJIT_NOT_ZERO);
 /* Two byte sequence. */
 OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
@@ -3315,25 +4456,664 @@ OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
 OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
 OP2(SLJIT_OR, TMP2, 0, TMP2, 0, TMP1, 0);
 OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 
 JUMPHERE(compare);
 OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 
 /* We only have types for characters less than 256. */
 JUMPHERE(jump);
 OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(utf8_table4) - 0xc0);
 OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 }
 
-#endif /* COMPILE_PCRE8 */
+static void do_utfreadchar_invalid(compiler_common *common)
+{
+/* Slow decoding a UTF-8 character. TMP1 contains the first byte
+of the character (>= 0xc0). Return char value in TMP1. STR_PTR is
+undefined for invalid characters. */
+DEFINE_COMPILER;
+sljit_s32 i;
+sljit_s32 has_cmov = sljit_has_cpu_feature(SLJIT_HAS_CMOV);
+struct sljit_jump *jump;
+struct sljit_jump *buffer_end_close;
+struct sljit_label *three_byte_entry;
+struct sljit_label *exit_invalid_label;
+struct sljit_jump *exit_invalid[11];
 
-#endif /* SUPPORT_UTF */
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
 
-#ifdef SUPPORT_UCP
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc2);
+
+/* Usually more than 3 characters remained in the subject buffer. */
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(3));
+
+/* Not a valid start of a multi-byte sequence, no more bytes read. */
+exit_invalid[0] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xf5 - 0xc2);
+
+buffer_end_close = CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0);
+
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-3));
+OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+/* If TMP2 is in 0x80-0xbf range, TMP1 is also increased by (0x2 << 6). */
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x80);
+exit_invalid[1] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+
+OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x800);
+jump = JUMP(SLJIT_NOT_ZERO);
+
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(jump);
+
+/* Three-byte sequence. */
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x80);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+if (has_cmov)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+  CMOV(SLJIT_GREATER_EQUAL, TMP1, SLJIT_IMM, 0x20000);
+  exit_invalid[2] = NULL;
+  }
+else
+  exit_invalid[2] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+
+OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x10000);
+jump = JUMP(SLJIT_NOT_ZERO);
+
+three_byte_entry = LABEL();
+
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x2d800);
+if (has_cmov)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP1, 0, SLJIT_IMM, 0x800);
+  CMOV(SLJIT_LESS, TMP1, SLJIT_IMM, INVALID_UTF_CHAR - 0xd800);
+  exit_invalid[3] = NULL;
+  }
+else
+  exit_invalid[3] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x800);
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+if (has_cmov)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP1, 0, SLJIT_IMM, 0x800);
+  CMOV(SLJIT_LESS, TMP1, SLJIT_IMM, INVALID_UTF_CHAR);
+  exit_invalid[4] = NULL;
+  }
+else
+  exit_invalid[4] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x800);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(jump);
+
+/* Four-byte sequence. */
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
+OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x80);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+if (has_cmov)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+  CMOV(SLJIT_GREATER_EQUAL, TMP1, SLJIT_IMM, 0);
+  exit_invalid[5] = NULL;
+  }
+else
+  exit_invalid[5] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc10000);
+if (has_cmov)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x100000);
+  CMOV(SLJIT_GREATER_EQUAL, TMP1, SLJIT_IMM, INVALID_UTF_CHAR - 0x10000);
+  exit_invalid[6] = NULL;
+  }
+else
+  exit_invalid[6] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x100000);
+
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(buffer_end_close);
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
+exit_invalid[7] = CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0);
+
+/* Two-byte sequence. */
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
+OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+/* If TMP2 is in 0x80-0xbf range, TMP1 is also increased by (0x2 << 6). */
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x80);
+exit_invalid[8] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+
+OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x800);
+jump = JUMP(SLJIT_NOT_ZERO);
+
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+/* Three-byte sequence. */
+JUMPHERE(jump);
+exit_invalid[9] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x80);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+if (has_cmov)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+  CMOV(SLJIT_GREATER_EQUAL, TMP1, SLJIT_IMM, INVALID_UTF_CHAR);
+  exit_invalid[10] = NULL;
+  }
+else
+  exit_invalid[10] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+
+/* One will be substracted from STR_PTR later. */
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
+
+/* Four byte sequences are not possible. */
+CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x30000, three_byte_entry);
+
+exit_invalid_label = LABEL();
+for (i = 0; i < 11; i++)
+  sljit_set_label(exit_invalid[i], exit_invalid_label);
+
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+static void do_utfreadnewline_invalid(compiler_common *common)
+{
+/* Slow decoding a UTF-8 character, specialized for newlines.
+TMP1 contains the first byte of the character (>= 0xc0). Return
+char value in TMP1. */
+DEFINE_COMPILER;
+struct sljit_label *loop;
+struct sljit_label *skip_start;
+struct sljit_label *three_byte_exit;
+struct sljit_jump *jump[5];
+
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+
+if (common->nltype != NLTYPE_ANY)
+  {
+  SLJIT_ASSERT(common->nltype != NLTYPE_FIXED || common->newline < 128);
+
+  /* All newlines are ascii, just skip intermediate octets. */
+  jump[0] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+  loop = LABEL();
+  if (sljit_emit_mem(compiler, MOV_UCHAR | SLJIT_MEM_SUPP | SLJIT_MEM_POST, TMP2, SLJIT_MEM1(STR_PTR), IN_UCHARS(1)) == SLJIT_SUCCESS)
+    sljit_emit_mem(compiler, MOV_UCHAR | SLJIT_MEM_POST, TMP2, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
+  else
+    {
+    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    }
+
+  OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xc0);
+  CMPTO(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0x80, loop);
+  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+  JUMPHERE(jump[0]);
+
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+  OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+  return;
+  }
+
+jump[0] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+jump[1] = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0xc2);
+jump[2] = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0xe2);
+
+skip_start = LABEL();
+OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xc0);
+jump[3] = CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0x80);
+
+/* Skip intermediate octets. */
+loop = LABEL();
+jump[4] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xc0);
+CMPTO(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0x80, loop);
+
+JUMPHERE(jump[3]);
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+three_byte_exit = LABEL();
+JUMPHERE(jump[0]);
+JUMPHERE(jump[4]);
+
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+/* Two byte long newline: 0x85. */
+JUMPHERE(jump[1]);
+CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0x85, skip_start);
+
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0x85);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+/* Three byte long newlines: 0x2028 and 0x2029. */
+JUMPHERE(jump[2]);
+CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0x80, skip_start);
+CMPTO(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0, three_byte_exit);
+
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+OP2(SLJIT_SUB, TMP1, 0, TMP2, 0, SLJIT_IMM, 0x80);
+CMPTO(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x40, skip_start);
+
+OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0x2000);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+static void do_utfmoveback_invalid(compiler_common *common)
+{
+/* Goes one character back. */
+DEFINE_COMPILER;
+sljit_s32 i;
+struct sljit_jump *jump;
+struct sljit_jump *buffer_start_close;
+struct sljit_label *exit_ok_label;
+struct sljit_label *exit_invalid_label;
+struct sljit_jump *exit_invalid[7];
+
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(3));
+exit_invalid[0] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xc0);
+
+/* Two-byte sequence. */
+buffer_start_close = CMP(SLJIT_LESS, STR_PTR, 0, TMP2, 0);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(2));
+
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc0);
+jump = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x20);
+
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 1);
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+/* Three-byte sequence. */
+JUMPHERE(jump);
+exit_invalid[1] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, -0x40);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
+
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xe0);
+jump = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x10);
+
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 1);
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+/* Four-byte sequence. */
+JUMPHERE(jump);
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xe0 - 0x80);
+exit_invalid[2] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x40);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xf0);
+exit_invalid[3] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x05);
+
+exit_ok_label = LABEL();
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 1);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+/* Two-byte sequence. */
+JUMPHERE(buffer_start_close);
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
+
+exit_invalid[4] = CMP(SLJIT_LESS, STR_PTR, 0, TMP2, 0);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc0);
+CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x20, exit_ok_label);
+
+/* Three-byte sequence. */
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+exit_invalid[5] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, -0x40);
+exit_invalid[6] = CMP(SLJIT_LESS, STR_PTR, 0, TMP2, 0);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xe0);
+CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x10, exit_ok_label);
+
+/* Four-byte sequences are not possible. */
+
+exit_invalid_label = LABEL();
+sljit_set_label(exit_invalid[5], exit_invalid_label);
+sljit_set_label(exit_invalid[6], exit_invalid_label);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(3));
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(exit_invalid[4]);
+/* -2 + 4 = 2 */
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
+
+exit_invalid_label = LABEL();
+for (i = 0; i < 4; i++)
+  sljit_set_label(exit_invalid[i], exit_invalid_label);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(4));
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+static void do_utfpeakcharback(compiler_common *common)
+{
+/* Peak a character back. Does not modify STR_PTR. */
+DEFINE_COMPILER;
+struct sljit_jump *jump[2];
+
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc0);
+jump[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x20);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-3));
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xe0);
+jump[1] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x10);
+
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-4));
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xe0 - 0x80);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xf0);
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+
+JUMPHERE(jump[1]);
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x80);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+
+JUMPHERE(jump[0]);
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
+OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x80);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+static void do_utfpeakcharback_invalid(compiler_common *common)
+{
+/* Peak a character back. Does not modify STR_PTR. */
+DEFINE_COMPILER;
+sljit_s32 i;
+sljit_s32 has_cmov = sljit_has_cpu_feature(SLJIT_HAS_CMOV);
+struct sljit_jump *jump[2];
+struct sljit_label *two_byte_entry;
+struct sljit_label *three_byte_entry;
+struct sljit_label *exit_invalid_label;
+struct sljit_jump *exit_invalid[8];
+
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+
+OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, IN_UCHARS(3));
+exit_invalid[0] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xc0);
+jump[0] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, STR_PTR, 0);
+
+/* Two-byte sequence. */
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xc2);
+jump[1] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x1e);
+
+two_byte_entry = LABEL();
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
+/* If TMP1 is in 0x80-0xbf range, TMP1 is also increased by (0x2 << 6). */
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(jump[1]);
+OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xc2 - 0x80);
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x80);
+exit_invalid[1] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+
+/* Three-byte sequence. */
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-3));
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xe0);
+jump[1] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x10);
+
+three_byte_entry = LABEL();
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 12);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+if (has_cmov)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP1, 0, SLJIT_IMM, 0x800);
+  CMOV(SLJIT_LESS, TMP1, SLJIT_IMM, -0xd800);
+  exit_invalid[2] = NULL;
+  }
+else
+  exit_invalid[2] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x800);
+
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+if (has_cmov)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP1, 0, SLJIT_IMM, 0x800);
+  CMOV(SLJIT_LESS, TMP1, SLJIT_IMM, INVALID_UTF_CHAR);
+  exit_invalid[3] = NULL;
+  }
+else
+  exit_invalid[3] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x800);
+
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(jump[1]);
+OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xe0 - 0x80);
+exit_invalid[4] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 12);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+
+/* Four-byte sequence. */
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-4));
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xf0);
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 18);
+/* ADD is used instead of OR because of the SUB 0x10000 above. */
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+
+if (has_cmov)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x100000);
+  CMOV(SLJIT_GREATER_EQUAL, TMP1, SLJIT_IMM, INVALID_UTF_CHAR - 0x10000);
+  exit_invalid[5] = NULL;
+  }
+else
+  exit_invalid[5] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x100000);
+
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(jump[0]);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, IN_UCHARS(1));
+jump[0] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, STR_PTR, 0);
+
+/* Two-byte sequence. */
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xc2);
+CMPTO(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0x1e, two_byte_entry);
+
+OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xc2 - 0x80);
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x80);
+exit_invalid[6] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x40);
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+
+/* Three-byte sequence. */
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-3));
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xe0);
+CMPTO(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0x10, three_byte_entry);
+
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(jump[0]);
+exit_invalid[7] = CMP(SLJIT_GREATER, TMP2, 0, STR_PTR, 0);
+
+/* Two-byte sequence. */
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xc2);
+CMPTO(SLJIT_LESS, TMP2, 0, SLJIT_IMM, 0x1e, two_byte_entry);
+
+exit_invalid_label = LABEL();
+for (i = 0; i < 8; i++)
+  sljit_set_label(exit_invalid[i], exit_invalid_label);
+
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
+
+#if PCRE2_CODE_UNIT_WIDTH == 16
+
+static void do_utfreadchar_invalid(compiler_common *common)
+{
+/* Slow decoding a UTF-16 character. TMP1 contains the first half
+of the character (>= 0xd800). Return char value in TMP1. STR_PTR is
+undefined for invalid characters. */
+DEFINE_COMPILER;
+struct sljit_jump *exit_invalid[3];
+
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+
+/* TMP2 contains the high surrogate. */
+exit_invalid[0] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xdc00);
+exit_invalid[1] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 10);
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xdc00);
+OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x10000);
+exit_invalid[2] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x400);
+
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(exit_invalid[0]);
+JUMPHERE(exit_invalid[1]);
+JUMPHERE(exit_invalid[2]);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+static void do_utfreadnewline_invalid(compiler_common *common)
+{
+/* Slow decoding a UTF-16 character, specialized for newlines.
+TMP1 contains the first half of the character (>= 0xd800). Return
+char value in TMP1. */
+
+DEFINE_COMPILER;
+struct sljit_jump *exit_invalid[2];
+
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+
+/* TMP2 contains the high surrogate. */
+exit_invalid[0] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+exit_invalid[1] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xdc00);
+
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xdc00);
+OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP2, 0, SLJIT_IMM, 0x400);
+OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0x10000);
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCHAR_SHIFT);
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
+
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(exit_invalid[0]);
+JUMPHERE(exit_invalid[1]);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+static void do_utfmoveback_invalid(compiler_common *common)
+{
+/* Goes one character back. */
+DEFINE_COMPILER;
+struct sljit_jump *exit_invalid[3];
+
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+
+exit_invalid[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x400);
+exit_invalid[1] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, STR_PTR, 0);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
+OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+exit_invalid[2] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0x400);
+
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 1);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(exit_invalid[0]);
+JUMPHERE(exit_invalid[1]);
+JUMPHERE(exit_invalid[2]);
+
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+static void do_utfpeakcharback_invalid(compiler_common *common)
+{
+/* Peak a character back. Does not modify STR_PTR. */
+DEFINE_COMPILER;
+struct sljit_jump *jump;
+struct sljit_jump *exit_invalid[3];
+
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+
+jump = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xe000);
+OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, IN_UCHARS(1));
+exit_invalid[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xdc00);
+exit_invalid[1] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, STR_PTR, 0);
+
+OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000 - 0xdc00);
+OP2(SLJIT_SUB, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xd800);
+exit_invalid[2] = CMP(SLJIT_GREATER_EQUAL, TMP2, 0, SLJIT_IMM, 0x400);
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 10);
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+
+JUMPHERE(jump);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+
+JUMPHERE(exit_invalid[0]);
+JUMPHERE(exit_invalid[1]);
+JUMPHERE(exit_invalid[2]);
+
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+#endif /* PCRE2_CODE_UNIT_WIDTH == 16 */
 
 /* UCD_BLOCK_SIZE must be 128 (see the assert below). */
 #define UCD_BLOCK_MASK 127
@@ -3344,44 +5124,91 @@ static void do_getucd(compiler_common *common)
 /* Search the UCD record for the character comes in TMP1.
 Returns chartype in TMP1 and UCD offset in TMP2. */
 DEFINE_COMPILER;
-#ifdef COMPILE_PCRE32
+#if PCRE2_CODE_UNIT_WIDTH == 32
 struct sljit_jump *jump;
 #endif
 
 #if defined SLJIT_DEBUG && SLJIT_DEBUG
 /* dummy_ucd_record */
-const ucd_record *record = GET_UCD(INVALID_UTF_CHAR);
-SLJIT_ASSERT(record->script == ucp_Common && record->chartype == ucp_Cn && record->gbprop == ucp_gbOther);
+const ucd_record *record = GET_UCD(UNASSIGNED_UTF_CHAR);
+SLJIT_ASSERT(record->script == ucp_Unknown && record->chartype == ucp_Cn && record->gbprop == ucp_gbOther);
 SLJIT_ASSERT(record->caseset == 0 && record->other_case == 0);
 #endif
 
-SLJIT_ASSERT(UCD_BLOCK_SIZE == 128 && sizeof(ucd_record) == 8);
+SLJIT_ASSERT(UCD_BLOCK_SIZE == 128 && sizeof(ucd_record) == 12);
 
 sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
 
-#ifdef COMPILE_PCRE32
+#if PCRE2_CODE_UNIT_WIDTH == 32
 if (!common->utf)
   {
-  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x10ffff + 1);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, MAX_UTF_CODE_POINT + 1);
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, UNASSIGNED_UTF_CHAR);
   JUMPHERE(jump);
   }
 #endif
 
 OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
-OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
+OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
 OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);
 OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
 OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
 OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_stage2));
 OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM2(TMP2, TMP1), 1);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
-OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM2(TMP1, TMP2), 3);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 }
+
+static void do_getucdtype(compiler_common *common)
+{
+/* Search the UCD record for the character comes in TMP1.
+Returns chartype in TMP1 and UCD offset in TMP2. */
+DEFINE_COMPILER;
+#if PCRE2_CODE_UNIT_WIDTH == 32
+struct sljit_jump *jump;
 #endif
 
-static SLJIT_INLINE struct sljit_label *mainloop_entry(compiler_common *common, BOOL hascrorlf)
+#if defined SLJIT_DEBUG && SLJIT_DEBUG
+/* dummy_ucd_record */
+const ucd_record *record = GET_UCD(UNASSIGNED_UTF_CHAR);
+SLJIT_ASSERT(record->script == ucp_Unknown && record->chartype == ucp_Cn && record->gbprop == ucp_gbOther);
+SLJIT_ASSERT(record->caseset == 0 && record->other_case == 0);
+#endif
+
+SLJIT_ASSERT(UCD_BLOCK_SIZE == 128 && sizeof(ucd_record) == 12);
+
+sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+if (!common->utf)
+  {
+  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, MAX_UTF_CODE_POINT + 1);
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, UNASSIGNED_UTF_CHAR);
+  JUMPHERE(jump);
+  }
+#endif
+
+OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
+OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
+OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_stage2));
+OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM2(TMP2, TMP1), 1);
+
+/* TMP2 is multiplied by 12. Same as (TMP2 << 2) + ((TMP2 << 2) << 1). */
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
+OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 2);
+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM2(TMP1, TMP2), 1);
+
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
+}
+
+#endif /* SUPPORT_UNICODE */
+
+static SLJIT_INLINE struct sljit_label *mainloop_entry(compiler_common *common)
 {
 DEFINE_COMPILER;
 struct sljit_label *mainloop;
@@ -3389,20 +5216,26 @@ struct sljit_label *newlinelabel = NULL;
 struct sljit_jump *start;
 struct sljit_jump *end = NULL;
 struct sljit_jump *end2 = NULL;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-struct sljit_jump *singlechar;
-#endif
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+struct sljit_label *loop;
+struct sljit_jump *jump;
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32 */
 jump_list *newline = NULL;
+sljit_u32 overall_options = common->re->overall_options;
+BOOL hascrorlf = (common->re->flags & PCRE2_HASCRORLF) != 0;
 BOOL newlinecheck = FALSE;
 BOOL readuchar = FALSE;
 
-if (!(hascrorlf || (common->match_end_ptr != 0)) &&
-    (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF || common->newline > 255))
+if (!(hascrorlf || (overall_options & PCRE2_FIRSTLINE) != 0)
+    && (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF || common->newline > 255))
   newlinecheck = TRUE;
 
-if (common->match_end_ptr != 0)
+SLJIT_ASSERT(common->abort_label == NULL);
+
+if ((overall_options & PCRE2_FIRSTLINE) != 0)
   {
   /* Search for the end of the first line. */
+  SLJIT_ASSERT(common->match_end_ptr != 0);
   OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
 
   if (common->nltype == NLTYPE_FIXED && common->newline > 255)
@@ -3423,7 +5256,7 @@ if (common->match_end_ptr != 0)
     mainloop = LABEL();
     /* Continual stores does not cause data dependency. */
     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr, STR_PTR, 0);
-    read_char_range(common, common->nlmin, common->nlmax, TRUE);
+    read_char(common, common->nlmin, common->nlmax, NULL, READ_CHAR_NEWLINE);
     check_newlinechar(common, common->nltype, &newline, TRUE);
     CMPTO(SLJIT_LESS, STR_PTR, 0, STR_END, 0, mainloop);
     JUMPHERE(end);
@@ -3433,6 +5266,41 @@ if (common->match_end_ptr != 0)
 
   OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
   }
+else if ((overall_options & PCRE2_USE_OFFSET_LIMIT) != 0)
+  {
+  /* Check whether offset limit is set and valid. */
+  SLJIT_ASSERT(common->match_end_ptr != 0);
+
+  if (HAS_VIRTUAL_REGISTERS)
+    {
+    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, offset_limit));
+    }
+  else
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, offset_limit));
+
+  OP1(SLJIT_MOV, TMP2, 0, STR_END, 0);
+  end = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw) PCRE2_UNSET);
+  if (HAS_VIRTUAL_REGISTERS)
+    OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
+  else
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, begin));
+
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
+#endif /* PCRE2_CODE_UNIT_WIDTH == [16|32] */
+  if (HAS_VIRTUAL_REGISTERS)
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, begin));
+
+  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP1, 0);
+  end2 = CMP(SLJIT_LESS_EQUAL, TMP2, 0, STR_END, 0);
+  OP1(SLJIT_MOV, TMP2, 0, STR_END, 0);
+  JUMPHERE(end2);
+  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_NOMATCH);
+  add_jump(compiler, &common->abort, CMP(SLJIT_LESS, TMP2, 0, STR_PTR, 0));
+  JUMPHERE(end);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr, TMP2, 0);
+  }
 
 start = JUMP(SLJIT_JUMP);
 
@@ -3442,11 +5310,11 @@ if (newlinecheck)
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
   end = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, common->newline & 0xff);
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, common->newline & 0xff);
   OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_EQUAL);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
   OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
-#endif
+#endif /* PCRE2_CODE_UNIT_WIDTH == [16|32] */
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
   end2 = JUMP(SLJIT_JUMP);
   }
@@ -3454,9 +5322,9 @@ if (newlinecheck)
 mainloop = LABEL();
 
 /* Increasing the STR_PTR here requires one less jump in the most common case. */
-#ifdef SUPPORT_UTF
-if (common->utf) readuchar = TRUE;
-#endif
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+if (common->utf && !common->invalid_utf) readuchar = TRUE;
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32 */
 if (newlinecheck) readuchar = TRUE;
 
 if (readuchar)
@@ -3466,28 +5334,60 @@ if (newlinecheck)
   CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, newlinelabel);
 
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-#if defined COMPILE_PCRE8
-if (common->utf)
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+#if PCRE2_CODE_UNIT_WIDTH == 8
+if (common->invalid_utf)
   {
-  singlechar = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
+  /* Skip continuation code units. */
+  loop = LABEL();
+  jump = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x80);
+  CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x40, loop);
+  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+  JUMPHERE(jump);
+  }
+else if (common->utf)
+  {
+  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
   OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  JUMPHERE(singlechar);
+  JUMPHERE(jump);
   }
-#elif defined COMPILE_PCRE16
-if (common->utf)
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+if (common->invalid_utf)
   {
-  singlechar = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-  OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  JUMPHERE(singlechar);
+  /* Skip continuation code units. */
+  loop = LABEL();
+  jump = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xdc00);
+  CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x400, loop);
+  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+  JUMPHERE(jump);
   }
-#endif /* COMPILE_PCRE[8|16] */
-#endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
+else if (common->utf)
+  {
+  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+
+  if (sljit_has_cpu_feature(SLJIT_HAS_CMOV))
+    {
+    OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP1, 0, SLJIT_IMM, 0x400);
+    CMOV(SLJIT_LESS, STR_PTR, TMP2, 0);
+    }
+  else
+    {
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP1, 0, SLJIT_IMM, 0x400);
+    OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_LESS);
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+    }
+  }
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16] */
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32 */
 JUMPHERE(start);
 
 if (newlinecheck)
@@ -3499,53 +5399,55 @@ if (newlinecheck)
 return mainloop;
 }
 
-#define MAX_N_CHARS 16
-#define MAX_DIFF_CHARS 6
 
-static SLJIT_INLINE void add_prefix_char(pcre_uchar chr, pcre_uchar *chars)
+static SLJIT_INLINE void add_prefix_char(PCRE2_UCHAR chr, fast_forward_char_data *chars, BOOL last)
 {
-pcre_uchar i, len;
+sljit_u32 i, count = chars->count;
 
-len = chars[0];
-if (len == 255)
+if (count == 255)
   return;
 
-if (len == 0)
+if (count == 0)
   {
-  chars[0] = 1;
-  chars[1] = chr;
+  chars->count = 1;
+  chars->chars[0] = chr;
+
+  if (last)
+    chars->last_count = 1;
   return;
   }
 
-for (i = len; i > 0; i--)
-  if (chars[i] == chr)
+for (i = 0; i < count; i++)
+  if (chars->chars[i] == chr)
     return;
 
-if (len >= MAX_DIFF_CHARS - 1)
+if (count >= MAX_DIFF_CHARS)
   {
-  chars[0] = 255;
+  chars->count = 255;
   return;
   }
 
-len++;
-chars[len] = chr;
-chars[0] = len;
+chars->chars[count] = chr;
+chars->count = count + 1;
+
+if (last)
+  chars->last_count++;
 }
 
-static int scan_prefix(compiler_common *common, pcre_uchar *cc, pcre_uchar *chars, int max_chars, sljit_u32 *rec_count)
+static int scan_prefix(compiler_common *common, PCRE2_SPTR cc, fast_forward_char_data *chars, int max_chars, sljit_u32 *rec_count)
 {
 /* Recursive function, which scans prefix literals. */
 BOOL last, any, class, caseless;
 int len, repeat, len_save, consumed = 0;
 sljit_u32 chr; /* Any unicode character. */
 sljit_u8 *bytes, *bytes_end, byte;
-pcre_uchar *alternative, *cc_save, *oc;
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-pcre_uchar othercase[8];
-#elif defined SUPPORT_UTF && defined COMPILE_PCRE16
-pcre_uchar othercase[2];
+PCRE2_SPTR alternative, cc_save, oc;
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+PCRE2_UCHAR othercase[4];
+#elif defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 16
+PCRE2_UCHAR othercase[2];
 #else
-pcre_uchar othercase[1];
+PCRE2_UCHAR othercase[1];
 #endif
 
 repeat = 1;
@@ -3564,6 +5466,7 @@ while (TRUE)
     {
     case OP_CHARI:
     caseless = TRUE;
+    /* Fall through */
     case OP_CHAR:
     last = FALSE;
     cc++;
@@ -3588,6 +5491,8 @@ while (TRUE)
     case OP_ASSERT_NOT:
     case OP_ASSERTBACK:
     case OP_ASSERTBACK_NOT:
+    case OP_ASSERT_NA:
+    case OP_ASSERTBACK_NA:
     cc = bracketend(cc);
     continue;
 
@@ -3595,6 +5500,7 @@ while (TRUE)
     case OP_MINPLUSI:
     case OP_POSPLUSI:
     caseless = TRUE;
+    /* Fall through */
     case OP_PLUS:
     case OP_MINPLUS:
     case OP_POSPLUS:
@@ -3603,6 +5509,7 @@ while (TRUE)
 
     case OP_EXACTI:
     caseless = TRUE;
+    /* Fall through */
     case OP_EXACT:
     repeat = GET2(cc, 1);
     last = FALSE;
@@ -3613,12 +5520,13 @@ while (TRUE)
     case OP_MINQUERYI:
     case OP_POSQUERYI:
     caseless = TRUE;
+    /* Fall through */
     case OP_QUERY:
     case OP_MINQUERY:
     case OP_POSQUERY:
     len = 1;
     cc++;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf && HAS_EXTRALEN(*cc)) len += GET_EXTRALEN(*cc);
 #endif
     max_chars = scan_prefix(common, cc + len, chars, max_chars, rec_count);
@@ -3636,7 +5544,6 @@ while (TRUE)
     continue;
 
     case OP_ONCE:
-    case OP_ONCE_NC:
     case OP_BRA:
     case OP_BRAPOS:
     case OP_CBRA:
@@ -3656,7 +5563,7 @@ while (TRUE)
     continue;
 
     case OP_CLASS:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
     if (common->utf && !is_char7_bitset((const sljit_u8 *)(cc + 1), FALSE))
       return consumed;
 #endif
@@ -3664,15 +5571,15 @@ while (TRUE)
     break;
 
     case OP_NCLASS:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
     if (common->utf) return consumed;
 #endif
     class = TRUE;
     break;
 
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
     if (common->utf) return consumed;
 #endif
     any = TRUE;
@@ -3681,7 +5588,7 @@ while (TRUE)
 #endif
 
     case OP_DIGIT:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
     if (common->utf && !is_char7_bitset((const sljit_u8 *)common->ctypes - cbit_length + cbit_digit, FALSE))
       return consumed;
 #endif
@@ -3690,7 +5597,7 @@ while (TRUE)
     break;
 
     case OP_WHITESPACE:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
     if (common->utf && !is_char7_bitset((const sljit_u8 *)common->ctypes - cbit_length + cbit_space, FALSE))
       return consumed;
 #endif
@@ -3699,7 +5606,7 @@ while (TRUE)
     break;
 
     case OP_WORDCHAR:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
     if (common->utf && !is_char7_bitset((const sljit_u8 *)common->ctypes - cbit_length + cbit_word, FALSE))
       return consumed;
 #endif
@@ -3716,17 +5623,17 @@ while (TRUE)
     case OP_NOT_WORDCHAR:
     case OP_ANY:
     case OP_ALLANY:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
     if (common->utf) return consumed;
 #endif
     any = TRUE;
     cc++;
     break;
 
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     case OP_NOTPROP:
     case OP_PROP:
-#ifndef COMPILE_PCRE32
+#if PCRE2_CODE_UNIT_WIDTH != 32
     if (common->utf) return consumed;
 #endif
     any = TRUE;
@@ -3741,7 +5648,7 @@ while (TRUE)
 
     case OP_NOTEXACT:
     case OP_NOTEXACTI:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
     if (common->utf) return consumed;
 #endif
     any = TRUE;
@@ -3757,12 +5664,12 @@ while (TRUE)
     {
     do
       {
-      chars[0] = 255;
+      chars->count = 255;
 
       consumed++;
       if (--max_chars == 0)
         return consumed;
-      chars += MAX_DIFF_CHARS;
+      chars++;
       }
     while (--repeat > 0);
 
@@ -3773,7 +5680,7 @@ while (TRUE)
   if (class)
     {
     bytes = (sljit_u8*) (cc + 1);
-    cc += 1 + 32 / sizeof(pcre_uchar);
+    cc += 1 + 32 / sizeof(PCRE2_UCHAR);
 
     switch (*cc)
       {
@@ -3806,8 +5713,8 @@ while (TRUE)
     do
       {
       if (bytes[31] & 0x80)
-        chars[0] = 255;
-      else if (chars[0] != 255)
+        chars->count = 255;
+      else if (chars->count != 255)
         {
         bytes_end = bytes + 32;
         chr = 0;
@@ -3822,7 +5729,7 @@ while (TRUE)
             do
               {
               if ((byte & 0x1) != 0)
-                add_prefix_char(chr, chars);
+                add_prefix_char(chr, chars, TRUE);
               byte >>= 1;
               chr++;
               }
@@ -3830,14 +5737,14 @@ while (TRUE)
             chr = (chr + 7) & ~7;
             }
           }
-        while (chars[0] != 255 && bytes < bytes_end);
+        while (chars->count != 255 && bytes < bytes_end);
         bytes = bytes_end - 32;
         }
 
       consumed++;
       if (--max_chars == 0)
         return consumed;
-      chars += MAX_DIFF_CHARS;
+      chars++;
       }
     while (--repeat > 0);
 
@@ -3868,13 +5775,13 @@ while (TRUE)
     }
 
   len = 1;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
   if (common->utf && HAS_EXTRALEN(*cc)) len += GET_EXTRALEN(*cc);
 #endif
 
   if (caseless && char_has_othercase(common, cc))
     {
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf)
       {
       GETCHAR(chr, cc);
@@ -3885,7 +5792,12 @@ while (TRUE)
 #endif
       {
       chr = *cc;
-      othercase[0] = TABLE_GET(chr, common->fcc, chr);
+#ifdef SUPPORT_UNICODE
+      if (common->ucp && chr > 127)
+        othercase[0] = UCD_OTHERCASE(chr);
+      else
+#endif
+        othercase[0] = TABLE_GET(chr, common->fcc, chr);
       }
     }
   else
@@ -3901,17 +5813,18 @@ while (TRUE)
     oc = othercase;
     do
       {
-      chr = *cc;
-      add_prefix_char(*cc, chars);
-
-      if (caseless)
-        add_prefix_char(*oc, chars);
-
       len--;
       consumed++;
+
+      chr = *cc;
+      add_prefix_char(*cc, chars, len == 0);
+
+      if (caseless)
+        add_prefix_char(*oc, chars, len == 0);
+
       if (--max_chars == 0)
         return consumed;
-      chars += MAX_DIFF_CHARS;
+      chars++;
       cc++;
       oc++;
       }
@@ -3930,302 +5843,86 @@ while (TRUE)
   }
 }
 
-#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) && !(defined SUPPORT_VALGRIND)
-
-static sljit_s32 character_to_int32(pcre_uchar chr)
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+static void jumpto_if_not_utf_char_start(struct sljit_compiler *compiler, sljit_s32 reg, struct sljit_label *label)
 {
-sljit_s32 value = (sljit_s32)chr;
-#if defined COMPILE_PCRE8
-#define SSE2_COMPARE_TYPE_INDEX 0
-return ((unsigned int)value << 24) | ((unsigned int)value << 16) | ((unsigned int)value << 8) | (unsigned int)value;
-#elif defined COMPILE_PCRE16
-#define SSE2_COMPARE_TYPE_INDEX 1
-return ((unsigned int)value << 16) | value;
-#elif defined COMPILE_PCRE32
-#define SSE2_COMPARE_TYPE_INDEX 2
-return value;
+#if PCRE2_CODE_UNIT_WIDTH == 8
+OP2(SLJIT_AND, reg, 0, reg, 0, SLJIT_IMM, 0xc0);
+CMPTO(SLJIT_EQUAL, reg, 0, SLJIT_IMM, 0x80, label);
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+OP2(SLJIT_AND, reg, 0, reg, 0, SLJIT_IMM, 0xfc00);
+CMPTO(SLJIT_EQUAL, reg, 0, SLJIT_IMM, 0xdc00, label);
 #else
-#error "Unsupported unit width"
+#error "Unknown code width"
 #endif
 }
+#endif
 
-static SLJIT_INLINE void fast_forward_first_char2_sse2(compiler_common *common, pcre_uchar char1, pcre_uchar char2)
+#include "pcre2_jit_simd_inc.h"
+
+#ifdef JIT_HAS_FAST_FORWARD_CHAR_PAIR_SIMD
+
+static BOOL check_fast_forward_char_pair_simd(compiler_common *common, fast_forward_char_data *chars, int max)
+{
+  sljit_s32 i, j, max_i = 0, max_j = 0;
+  sljit_u32 max_pri = 0;
+  PCRE2_UCHAR a1, a2, a_pri, b1, b2, b_pri;
+
+  for (i = max - 1; i >= 1; i--)
+    {
+    if (chars[i].last_count > 2)
+      {
+      a1 = chars[i].chars[0];
+      a2 = chars[i].chars[1];
+      a_pri = chars[i].last_count;
+
+      j = i - max_fast_forward_char_pair_offset();
+      if (j < 0)
+        j = 0;
+
+      while (j < i)
+        {
+        b_pri = chars[j].last_count;
+        if (b_pri > 2 && a_pri + b_pri >= max_pri)
+          {
+          b1 = chars[j].chars[0];
+          b2 = chars[j].chars[1];
+
+          if (a1 != b1 && a1 != b2 && a2 != b1 && a2 != b2)
+            {
+            max_pri = a_pri + b_pri;
+            max_i = i;
+            max_j = j;
+            }
+          }
+        j++;
+        }
+      }
+    }
+
+if (max_pri == 0)
+  return FALSE;
+
+fast_forward_char_pair_simd(common, max_i, chars[max_i].chars[0], chars[max_i].chars[1], max_j, chars[max_j].chars[0], chars[max_j].chars[1]);
+return TRUE;
+}
+
+#endif /* JIT_HAS_FAST_FORWARD_CHAR_PAIR_SIMD */
+
+static void fast_forward_first_char2(compiler_common *common, PCRE2_UCHAR char1, PCRE2_UCHAR char2, sljit_s32 offset)
 {
 DEFINE_COMPILER;
 struct sljit_label *start;
-struct sljit_jump *quit[3];
-struct sljit_jump *nomatch;
-sljit_u8 instruction[8];
-sljit_s32 tmp1_ind = sljit_get_register_index(TMP1);
-sljit_s32 tmp2_ind = sljit_get_register_index(TMP2);
-sljit_s32 str_ptr_ind = sljit_get_register_index(STR_PTR);
-BOOL load_twice = FALSE;
-pcre_uchar bit;
-
-bit = char1 ^ char2;
-if (!is_powerof2(bit))
-  bit = 0;
-
-if ((char1 != char2) && bit == 0)
-  load_twice = TRUE;
-
-quit[0] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-
-/* First part (unaligned start) */
-
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, character_to_int32(char1 | bit));
-
-SLJIT_ASSERT(tmp1_ind < 8 && tmp2_ind == 1);
-
-/* MOVD xmm, r/m32 */
-instruction[0] = 0x66;
-instruction[1] = 0x0f;
-instruction[2] = 0x6e;
-instruction[3] = 0xc0 | (2 << 3) | tmp1_ind;
-sljit_emit_op_custom(compiler, instruction, 4);
-
-if (char1 != char2)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, character_to_int32(bit != 0 ? bit : char2));
-
-  /* MOVD xmm, r/m32 */
-  instruction[3] = 0xc0 | (3 << 3) | tmp1_ind;
-  sljit_emit_op_custom(compiler, instruction, 4);
-  }
-
-/* PSHUFD xmm1, xmm2/m128, imm8 */
-instruction[2] = 0x70;
-instruction[3] = 0xc0 | (2 << 3) | 2;
-instruction[4] = 0;
-sljit_emit_op_custom(compiler, instruction, 5);
-
-if (char1 != char2)
-  {
-  /* PSHUFD xmm1, xmm2/m128, imm8 */
-  instruction[3] = 0xc0 | (3 << 3) | 3;
-  instruction[4] = 0;
-  sljit_emit_op_custom(compiler, instruction, 5);
-  }
-
-OP2(SLJIT_AND, TMP2, 0, STR_PTR, 0, SLJIT_IMM, 0xf);
-OP2(SLJIT_AND, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, ~0xf);
-
-/* MOVDQA xmm1, xmm2/m128 */
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-
-if (str_ptr_ind < 8)
-  {
-  instruction[2] = 0x6f;
-  instruction[3] = (0 << 3) | str_ptr_ind;
-  sljit_emit_op_custom(compiler, instruction, 4);
-
-  if (load_twice)
-    {
-    instruction[3] = (1 << 3) | str_ptr_ind;
-    sljit_emit_op_custom(compiler, instruction, 4);
-    }
-  }
-else
-  {
-  instruction[1] = 0x41;
-  instruction[2] = 0x0f;
-  instruction[3] = 0x6f;
-  instruction[4] = (0 << 3) | (str_ptr_ind & 0x7);
-  sljit_emit_op_custom(compiler, instruction, 5);
-
-  if (load_twice)
-    {
-    instruction[4] = (1 << 3) | str_ptr_ind;
-    sljit_emit_op_custom(compiler, instruction, 5);
-    }
-  instruction[1] = 0x0f;
-  }
-
-#else
-
-instruction[2] = 0x6f;
-instruction[3] = (0 << 3) | str_ptr_ind;
-sljit_emit_op_custom(compiler, instruction, 4);
-
-if (load_twice)
-  {
-  instruction[3] = (1 << 3) | str_ptr_ind;
-  sljit_emit_op_custom(compiler, instruction, 4);
-  }
-
-#endif
-
-if (bit != 0)
-  {
-  /* POR xmm1, xmm2/m128 */
-  instruction[2] = 0xeb;
-  instruction[3] = 0xc0 | (0 << 3) | 3;
-  sljit_emit_op_custom(compiler, instruction, 4);
-  }
-
-/* PCMPEQB/W/D xmm1, xmm2/m128 */
-instruction[2] = 0x74 + SSE2_COMPARE_TYPE_INDEX;
-instruction[3] = 0xc0 | (0 << 3) | 2;
-sljit_emit_op_custom(compiler, instruction, 4);
-
-if (load_twice)
-  {
-  instruction[3] = 0xc0 | (1 << 3) | 3;
-  sljit_emit_op_custom(compiler, instruction, 4);
-  }
-
-/* PMOVMSKB reg, xmm */
-instruction[2] = 0xd7;
-instruction[3] = 0xc0 | (tmp1_ind << 3) | 0;
-sljit_emit_op_custom(compiler, instruction, 4);
-
-if (load_twice)
-  {
-  OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP2, 0);
-  instruction[3] = 0xc0 | (tmp2_ind << 3) | 1;
-  sljit_emit_op_custom(compiler, instruction, 4);
-
-  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-  OP1(SLJIT_MOV, TMP2, 0, RETURN_ADDR, 0);
-  }
-
-OP2(SLJIT_ASHR, TMP1, 0, TMP1, 0, TMP2, 0);
-
-/* BSF r32, r/m32 */
-instruction[0] = 0x0f;
-instruction[1] = 0xbc;
-instruction[2] = 0xc0 | (tmp1_ind << 3) | tmp1_ind;
-sljit_emit_op_custom(compiler, instruction, 3);
-sljit_set_current_flags(compiler, SLJIT_SET_Z);
-
-nomatch = JUMP(SLJIT_ZERO);
-
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-quit[1] = JUMP(SLJIT_JUMP);
-
-JUMPHERE(nomatch);
-
-start = LABEL();
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 16);
-quit[2] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-
-/* Second part (aligned) */
-
-instruction[0] = 0x66;
-instruction[1] = 0x0f;
-
-/* MOVDQA xmm1, xmm2/m128 */
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-
-if (str_ptr_ind < 8)
-  {
-  instruction[2] = 0x6f;
-  instruction[3] = (0 << 3) | str_ptr_ind;
-  sljit_emit_op_custom(compiler, instruction, 4);
-
-  if (load_twice)
-    {
-    instruction[3] = (1 << 3) | str_ptr_ind;
-    sljit_emit_op_custom(compiler, instruction, 4);
-    }
-  }
-else
-  {
-  instruction[1] = 0x41;
-  instruction[2] = 0x0f;
-  instruction[3] = 0x6f;
-  instruction[4] = (0 << 3) | (str_ptr_ind & 0x7);
-  sljit_emit_op_custom(compiler, instruction, 5);
-
-  if (load_twice)
-    {
-    instruction[4] = (1 << 3) | str_ptr_ind;
-    sljit_emit_op_custom(compiler, instruction, 5);
-    }
-  instruction[1] = 0x0f;
-  }
-
-#else
-
-instruction[2] = 0x6f;
-instruction[3] = (0 << 3) | str_ptr_ind;
-sljit_emit_op_custom(compiler, instruction, 4);
-
-if (load_twice)
-  {
-  instruction[3] = (1 << 3) | str_ptr_ind;
-  sljit_emit_op_custom(compiler, instruction, 4);
-  }
-
-#endif
-
-if (bit != 0)
-  {
-  /* POR xmm1, xmm2/m128 */
-  instruction[2] = 0xeb;
-  instruction[3] = 0xc0 | (0 << 3) | 3;
-  sljit_emit_op_custom(compiler, instruction, 4);
-  }
-
-/* PCMPEQB/W/D xmm1, xmm2/m128 */
-instruction[2] = 0x74 + SSE2_COMPARE_TYPE_INDEX;
-instruction[3] = 0xc0 | (0 << 3) | 2;
-sljit_emit_op_custom(compiler, instruction, 4);
-
-if (load_twice)
-  {
-  instruction[3] = 0xc0 | (1 << 3) | 3;
-  sljit_emit_op_custom(compiler, instruction, 4);
-  }
-
-/* PMOVMSKB reg, xmm */
-instruction[2] = 0xd7;
-instruction[3] = 0xc0 | (tmp1_ind << 3) | 0;
-sljit_emit_op_custom(compiler, instruction, 4);
-
-if (load_twice)
-  {
-  instruction[3] = 0xc0 | (tmp2_ind << 3) | 1;
-  sljit_emit_op_custom(compiler, instruction, 4);
-
-  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
-  }
-
-/* BSF r32, r/m32 */
-instruction[0] = 0x0f;
-instruction[1] = 0xbc;
-instruction[2] = 0xc0 | (tmp1_ind << 3) | tmp1_ind;
-sljit_emit_op_custom(compiler, instruction, 3);
-sljit_set_current_flags(compiler, SLJIT_SET_Z);
-
-JUMPTO(SLJIT_ZERO, start);
-
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-
-start = LABEL();
-SET_LABEL(quit[0], start);
-SET_LABEL(quit[1], start);
-SET_LABEL(quit[2], start);
-}
-
-#undef SSE2_COMPARE_TYPE_INDEX
-
-#endif
-
-static void fast_forward_first_char2(compiler_common *common, pcre_uchar char1, pcre_uchar char2, sljit_s32 offset)
-{
-DEFINE_COMPILER;
-struct sljit_label *start;
-struct sljit_jump *quit;
-struct sljit_jump *found;
-pcre_uchar mask;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-struct sljit_label *utf_start = NULL;
-struct sljit_jump *utf_quit = NULL;
-#endif
+struct sljit_jump *match;
+struct sljit_jump *partial_quit;
+PCRE2_UCHAR mask;
 BOOL has_match_end = (common->match_end_ptr != 0);
 
+SLJIT_ASSERT(common->mode == PCRE2_JIT_COMPLETE || offset == 0);
+
+if (has_match_end)
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr);
+
 if (offset > 0)
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(offset));
 
@@ -4233,66 +5930,19 @@ if (has_match_end)
   {
   OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
 
-  OP2(SLJIT_ADD, STR_END, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr, SLJIT_IMM, IN_UCHARS(offset + 1));
-  OP2(SLJIT_SUB | SLJIT_SET_GREATER, SLJIT_UNUSED, 0, STR_END, 0, TMP3, 0);
-  sljit_emit_cmov(compiler, SLJIT_GREATER, STR_END, TMP3, 0);
+  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(offset + 1));
+  OP2U(SLJIT_SUB | SLJIT_SET_GREATER, STR_END, 0, TMP1, 0);
+  CMOV(SLJIT_GREATER, STR_END, TMP1, 0);
   }
 
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-if (common->utf && offset > 0)
-  utf_start = LABEL();
-#endif
+#ifdef JIT_HAS_FAST_FORWARD_CHAR_SIMD
 
-#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) && !(defined SUPPORT_VALGRIND)
-
-/* SSE2 accelerated first character search. */
-
-if (sljit_has_cpu_feature(SLJIT_HAS_SSE2))
+if (JIT_HAS_FAST_FORWARD_CHAR_SIMD)
   {
-  fast_forward_first_char2_sse2(common, char1, char2);
+  fast_forward_char_simd(common, char1, char2, offset);
 
-  SLJIT_ASSERT(common->mode == JIT_COMPILE || offset == 0);
-  if (common->mode == JIT_COMPILE)
-    {
-    /* In complete mode, we don't need to run a match when STR_PTR == STR_END. */
-    SLJIT_ASSERT(common->forced_quit_label == NULL);
-    OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_NOMATCH);
-    add_jump(compiler, &common->forced_quit, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (common->utf && offset > 0)
-      {
-      SLJIT_ASSERT(common->mode == JIT_COMPILE);
-
-      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-offset));
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-#if defined COMPILE_PCRE8
-      OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc0);
-      CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0x80, utf_start);
-#elif defined COMPILE_PCRE16
-      OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-      CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0xdc00, utf_start);
-#else
-#error "Unknown code width"
-#endif
-      OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-      }
-#endif
-
-    if (offset > 0)
-      OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(offset));
-    }
-  else
-    {
-    OP2(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, SLJIT_UNUSED, 0, STR_PTR, 0, STR_END, 0);
-    if (has_match_end)
-      {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr);
-      sljit_emit_cmov(compiler, SLJIT_GREATER_EQUAL, STR_PTR, TMP1, 0);
-      }
-    else
-      sljit_emit_cmov(compiler, SLJIT_GREATER_EQUAL, STR_PTR, STR_END, 0);
-    }
+  if (offset > 0)
+    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(offset));
 
   if (has_match_end)
     OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
@@ -4301,88 +5951,59 @@ if (sljit_has_cpu_feature(SLJIT_HAS_SSE2))
 
 #endif
 
-quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-
 start = LABEL();
+
+partial_quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+if (common->mode == PCRE2_JIT_COMPLETE)
+  add_jump(compiler, &common->failed_match, partial_quit);
+
 OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 
 if (char1 == char2)
-  found = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, char1);
+  CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, char1, start);
 else
   {
   mask = char1 ^ char2;
   if (is_powerof2(mask))
     {
     OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, mask);
-    found = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, char1 | mask);
+    CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, char1 | mask, start);
     }
   else
     {
-    OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, char1);
-    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
-    OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, char2);
-    OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_EQUAL);
-    found = JUMP(SLJIT_NOT_ZERO);
+    match = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, char1);
+    CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, char2, start);
+    JUMPHERE(match);
     }
   }
 
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-CMPTO(SLJIT_LESS, STR_PTR, 0, STR_END, 0, start);
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-if (common->utf && offset > 0)
-  utf_quit = JUMP(SLJIT_JUMP);
-#endif
-
-JUMPHERE(found);
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
 if (common->utf && offset > 0)
   {
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-offset));
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-#if defined COMPILE_PCRE8
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc0);
-  CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0x80, utf_start);
-#elif defined COMPILE_PCRE16
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-  CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0xdc00, utf_start);
-#else
-#error "Unknown code width"
-#endif
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  JUMPHERE(utf_quit);
+  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-(offset + 1)));
+  jumpto_if_not_utf_char_start(compiler, TMP1, start);
   }
 #endif
 
-JUMPHERE(quit);
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(offset + 1));
+
+if (common->mode != PCRE2_JIT_COMPLETE)
+  JUMPHERE(partial_quit);
 
 if (has_match_end)
-  {
-  quit = CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0);
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr);
-  if (offset > 0)
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(offset));
-  JUMPHERE(quit);
   OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
-  }
-
-if (offset > 0)
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(offset));
 }
 
 static SLJIT_INLINE BOOL fast_forward_first_n_chars(compiler_common *common)
 {
 DEFINE_COMPILER;
 struct sljit_label *start;
-struct sljit_jump *quit;
 struct sljit_jump *match;
-/* bytes[0] represent the number of characters between 0
-and MAX_N_BYTES - 1, 255 represents any character. */
-pcre_uchar chars[MAX_N_CHARS * MAX_DIFF_CHARS];
+fast_forward_char_data chars[MAX_N_CHARS];
 sljit_s32 offset;
-pcre_uchar mask;
-pcre_uchar *char_set, *char_set_end;
+PCRE2_UCHAR mask;
+PCRE2_UCHAR *char_set, *char_set_end;
 int i, max, from;
 int range_right = -1, range_len;
 sljit_u8 *update_table = NULL;
@@ -4390,7 +6011,10 @@ BOOL in_range;
 sljit_u32 rec_count;
 
 for (i = 0; i < MAX_N_CHARS; i++)
-  chars[i * MAX_DIFF_CHARS] = 0;
+  {
+  chars[i].count = 0;
+  chars[i].last_count = 0;
+  }
 
 rec_count = 10000;
 max = scan_prefix(common, common->start, chars, MAX_N_CHARS, &rec_count);
@@ -4398,21 +6022,50 @@ max = scan_prefix(common, common->start, chars, MAX_N_CHARS, &rec_count);
 if (max < 1)
   return FALSE;
 
+/* Convert last_count to priority. */
+for (i = 0; i < max; i++)
+  {
+  SLJIT_ASSERT(chars[i].count > 0 && chars[i].last_count <= chars[i].count);
+
+  if (chars[i].count == 1)
+    {
+    chars[i].last_count = (chars[i].last_count == 1) ? 7 : 5;
+    /* Simplifies algorithms later. */
+    chars[i].chars[1] = chars[i].chars[0];
+    }
+  else if (chars[i].count == 2)
+    {
+    SLJIT_ASSERT(chars[i].chars[0] != chars[i].chars[1]);
+
+    if (is_powerof2(chars[i].chars[0] ^ chars[i].chars[1]))
+      chars[i].last_count = (chars[i].last_count == 2) ? 6 : 4;
+    else
+      chars[i].last_count = (chars[i].last_count == 2) ? 3 : 2;
+    }
+  else
+    chars[i].last_count = (chars[i].count == 255) ? 0 : 1;
+  }
+
+#ifdef JIT_HAS_FAST_FORWARD_CHAR_PAIR_SIMD
+if (JIT_HAS_FAST_FORWARD_CHAR_PAIR_SIMD && check_fast_forward_char_pair_simd(common, chars, max))
+  return TRUE;
+#endif
+
 in_range = FALSE;
 /* Prevent compiler "uninitialized" warning */
 from = 0;
 range_len = 4 /* minimum length */ - 1;
 for (i = 0; i <= max; i++)
   {
-  if (in_range && (i - from) > range_len && (chars[(i - 1) * MAX_DIFF_CHARS] < 255))
+  if (in_range && (i - from) > range_len && (chars[i - 1].count < 255))
     {
     range_len = i - from;
     range_right = i - 1;
     }
 
-  if (i < max && chars[i * MAX_DIFF_CHARS] < 255)
+  if (i < max && chars[i].count < 255)
     {
-    SLJIT_ASSERT(chars[i * MAX_DIFF_CHARS] > 0);
+    SLJIT_ASSERT(chars[i].count > 0);
     if (!in_range)
       {
       in_range = TRUE;
@@ -4432,16 +6085,17 @@ if (range_right >= 0)
 
   for (i = 0; i < range_len; i++)
     {
-    char_set = chars + ((range_right - i) * MAX_DIFF_CHARS);
-    SLJIT_ASSERT(char_set[0] > 0 && char_set[0] < 255);
-    char_set_end = char_set + char_set[0];
-    char_set++;
-    while (char_set <= char_set_end)
+    SLJIT_ASSERT(chars[range_right - i].count > 0 && chars[range_right - i].count < 255);
+
+    char_set = chars[range_right - i].chars;
+    char_set_end = char_set + chars[range_right - i].count;
+    do
       {
       if (update_table[(*char_set) & 0xff] > IN_UCHARS(i))
         update_table[(*char_set) & 0xff] = IN_UCHARS(i);
       char_set++;
       }
+    while (char_set < char_set_end);
     }
   }
 
@@ -4449,78 +6103,65 @@ offset = -1;
 /* Scan forward. */
 for (i = 0; i < max; i++)
   {
+  if (range_right == i)
+    continue;
+
   if (offset == -1)
     {
-    if (chars[i * MAX_DIFF_CHARS] <= 2)
+    if (chars[i].last_count >= 2)
       offset = i;
     }
-  else if (chars[offset * MAX_DIFF_CHARS] == 2 && chars[i * MAX_DIFF_CHARS] <= 2)
-    {
-    if (chars[i * MAX_DIFF_CHARS] == 1)
-      offset = i;
-    else
-      {
-      mask = chars[offset * MAX_DIFF_CHARS + 1] ^ chars[offset * MAX_DIFF_CHARS + 2];
-      if (!is_powerof2(mask))
-        {
-        mask = chars[i * MAX_DIFF_CHARS + 1] ^ chars[i * MAX_DIFF_CHARS + 2];
-        if (is_powerof2(mask))
-          offset = i;
-        }
-      }
-    }
+  else if (chars[offset].last_count < chars[i].last_count)
+    offset = i;
   }
 
+SLJIT_ASSERT(offset == -1 || (chars[offset].count >= 1 && chars[offset].count <= 2));
+
 if (range_right < 0)
   {
   if (offset < 0)
     return FALSE;
-  SLJIT_ASSERT(chars[offset * MAX_DIFF_CHARS] >= 1 && chars[offset * MAX_DIFF_CHARS] <= 2);
   /* Works regardless the value is 1 or 2. */
-  mask = chars[offset * MAX_DIFF_CHARS + chars[offset * MAX_DIFF_CHARS]];
-  fast_forward_first_char2(common, chars[offset * MAX_DIFF_CHARS + 1], mask, offset);
+  fast_forward_first_char2(common, chars[offset].chars[0], chars[offset].chars[1], offset);
   return TRUE;
   }
 
-if (range_right == offset)
-  offset = -1;
+SLJIT_ASSERT(range_right != offset);
 
-SLJIT_ASSERT(offset == -1 || (chars[offset * MAX_DIFF_CHARS] >= 1 && chars[offset * MAX_DIFF_CHARS] <= 2));
-
-max -= 1;
-SLJIT_ASSERT(max > 0);
 if (common->match_end_ptr != 0)
   {
   OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr);
   OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
-  OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
-  quit = CMP(SLJIT_LESS_EQUAL, STR_END, 0, TMP1, 0);
-  OP1(SLJIT_MOV, STR_END, 0, TMP1, 0);
-  JUMPHERE(quit);
+  OP2(SLJIT_SUB | SLJIT_SET_LESS, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
+  add_jump(compiler, &common->failed_match, JUMP(SLJIT_LESS));
+  OP2U(SLJIT_SUB | SLJIT_SET_GREATER, STR_END, 0, TMP1, 0);
+  CMOV(SLJIT_GREATER, STR_END, TMP1, 0);
   }
 else
-  OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
+  {
+  OP2(SLJIT_SUB | SLJIT_SET_LESS, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
+  add_jump(compiler, &common->failed_match, JUMP(SLJIT_LESS));
+  }
 
 SLJIT_ASSERT(range_right >= 0);
 
-#if !(defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-OP1(SLJIT_MOV, RETURN_ADDR, 0, SLJIT_IMM, (sljit_sw)update_table);
-#endif
+if (!HAS_VIRTUAL_REGISTERS)
+  OP1(SLJIT_MOV, RETURN_ADDR, 0, SLJIT_IMM, (sljit_sw)update_table);
 
 start = LABEL();
-quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+add_jump(compiler, &common->failed_match, CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0));
 
-#if defined COMPILE_PCRE8 || (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
+#if PCRE2_CODE_UNIT_WIDTH == 8 || (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
 OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(range_right));
 #else
 OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(range_right + 1) - 1);
 #endif
 
-#if !(defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM2(RETURN_ADDR, TMP1), 0);
-#else
-OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)update_table);
-#endif
+if (!HAS_VIRTUAL_REGISTERS)
+  OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM2(RETURN_ADDR, TMP1), 0);
+else
+  OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)update_table);
+
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
 CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0, start);
 
@@ -4529,26 +6170,26 @@ if (offset >= 0)
   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offset));
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 
-  if (chars[offset * MAX_DIFF_CHARS] == 1)
-    CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[offset * MAX_DIFF_CHARS + 1], start);
+  if (chars[offset].count == 1)
+    CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[offset].chars[0], start);
   else
     {
-    mask = chars[offset * MAX_DIFF_CHARS + 1] ^ chars[offset * MAX_DIFF_CHARS + 2];
+    mask = chars[offset].chars[0] ^ chars[offset].chars[1];
     if (is_powerof2(mask))
       {
       OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, mask);
-      CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[offset * MAX_DIFF_CHARS + 1] | mask, start);
+      CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[offset].chars[0] | mask, start);
       }
     else
       {
-      match = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, chars[offset * MAX_DIFF_CHARS + 1]);
-      CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[offset * MAX_DIFF_CHARS + 2], start);
+      match = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, chars[offset].chars[0]);
+      CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[offset].chars[1], start);
       JUMPHERE(match);
       }
     }
   }
 
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
 if (common->utf && offset != 0)
   {
   if (offset < 0)
@@ -4558,15 +6199,9 @@ if (common->utf && offset != 0)
     }
   else
     OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
-#if defined COMPILE_PCRE8
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc0);
-  CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0x80, start);
-#elif defined COMPILE_PCRE16
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-  CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0xdc00, start);
-#else
-#error "Unknown code width"
-#endif
+
+  jumpto_if_not_utf_char_start(compiler, TMP1, start);
+
   if (offset < 0)
     OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
   }
@@ -4575,38 +6210,24 @@ if (common->utf && offset != 0)
 if (offset >= 0)
   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 
-JUMPHERE(quit);
-
 if (common->match_end_ptr != 0)
-  {
-  if (range_right >= 0)
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr);
   OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
-  if (range_right >= 0)
-    {
-    quit = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP1, 0);
-    OP1(SLJIT_MOV, STR_PTR, 0, TMP1, 0);
-    JUMPHERE(quit);
-    }
-  }
 else
   OP2(SLJIT_ADD, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
 return TRUE;
 }
 
-#undef MAX_N_CHARS
-#undef MAX_DIFF_CHARS
-
-static SLJIT_INLINE void fast_forward_first_char(compiler_common *common, pcre_uchar first_char, BOOL caseless)
+static SLJIT_INLINE void fast_forward_first_char(compiler_common *common)
 {
-pcre_uchar oc;
+PCRE2_UCHAR first_char = (PCRE2_UCHAR)(common->re->first_codeunit);
+PCRE2_UCHAR oc;
 
 oc = first_char;
-if (caseless)
+if ((common->re->flags & PCRE2_FIRSTCASELESS) != 0)
   {
   oc = TABLE_GET(first_char, common->fcc, first_char);
-#if defined SUPPORT_UCP && !defined COMPILE_PCRE8
-  if (first_char > 127 && common->utf)
+#if defined SUPPORT_UNICODE
+  if (first_char > 127 && (common->utf || common->ucp))
     oc = UCD_OTHERCASE(first_char);
 #endif
   }
@@ -4618,9 +6239,9 @@ static SLJIT_INLINE void fast_forward_newline(compiler_common *common)
 {
 DEFINE_COMPILER;
 struct sljit_label *loop;
-struct sljit_jump *lastchar;
+struct sljit_jump *lastchar = NULL;
 struct sljit_jump *firstchar;
-struct sljit_jump *quit;
+struct sljit_jump *quit = NULL;
 struct sljit_jump *foundcr = NULL;
 struct sljit_jump *notfoundnl;
 jump_list *newline = NULL;
@@ -4633,213 +6254,308 @@ if (common->match_end_ptr != 0)
 
 if (common->nltype == NLTYPE_FIXED && common->newline > 255)
   {
-  lastchar = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
-  firstchar = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
+#ifdef JIT_HAS_FAST_FORWARD_CHAR_PAIR_SIMD
+  if (JIT_HAS_FAST_FORWARD_CHAR_PAIR_SIMD && common->mode == PCRE2_JIT_COMPLETE)
+    {
+    if (HAS_VIRTUAL_REGISTERS)
+      {
+      OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
+      }
+    else
+      {
+      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, str));
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, begin));
+      }
+    firstchar = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
 
-  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(2));
-  OP2(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, SLJIT_UNUSED, 0, STR_PTR, 0, TMP1, 0);
-  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_GREATER_EQUAL);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCHAR_SHIFT);
+    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, STR_PTR, 0, TMP1, 0);
+    OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_NOT_EQUAL);
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
 #endif
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
+    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
 
-  loop = LABEL();
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
-  OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
-  CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, loop);
-  CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, loop);
+    fast_forward_char_pair_simd(common, 1, common->newline & 0xff, common->newline & 0xff, 0, (common->newline >> 8) & 0xff, (common->newline >> 8) & 0xff);
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
+    }
+  else
+#endif /* JIT_HAS_FAST_FORWARD_CHAR_PAIR_SIMD */
+    {
+    lastchar = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+    if (HAS_VIRTUAL_REGISTERS)
+      {
+      OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
+      }
+    else
+      {
+      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, str));
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, begin));
+      }
+    firstchar = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
+
+    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(2));
+    OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, STR_PTR, 0, TMP1, 0);
+    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_GREATER_EQUAL);
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCHAR_SHIFT);
+#endif
+    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
+
+    loop = LABEL();
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
+    CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, loop);
+    CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, loop);
+
+    JUMPHERE(quit);
+    JUMPHERE(lastchar);
+    }
 
-  JUMPHERE(quit);
   JUMPHERE(firstchar);
-  JUMPHERE(lastchar);
 
   if (common->match_end_ptr != 0)
     OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
   return;
   }
 
-OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
+if (HAS_VIRTUAL_REGISTERS)
+  {
+  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
+  }
+else
+  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, str));
+
+/* Example: match /^/ to \r\n from offset 1. */
 firstchar = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
-skip_char_back(common);
+
+if (common->nltype == NLTYPE_ANY)
+  move_back(common, NULL, FALSE);
+else
+  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 
 loop = LABEL();
 common->ff_newline_shortcut = loop;
 
-read_char_range(common, common->nlmin, common->nlmax, TRUE);
-lastchar = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)
-  foundcr = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
-check_newlinechar(common, common->nltype, &newline, FALSE);
-set_jumps(newline, loop);
+#ifdef JIT_HAS_FAST_FORWARD_CHAR_SIMD
+if (JIT_HAS_FAST_FORWARD_CHAR_SIMD && (common->nltype == NLTYPE_FIXED || common->nltype == NLTYPE_ANYCRLF))
+  {
+  if (common->nltype == NLTYPE_ANYCRLF)
+    {
+    fast_forward_char_simd(common, CHAR_CR, CHAR_LF, 0);
+    if (common->mode != PCRE2_JIT_COMPLETE)
+      lastchar = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    quit = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
+    }
+   else
+    {
+    fast_forward_char_simd(common, common->newline, common->newline, 0);
+
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    if (common->mode != PCRE2_JIT_COMPLETE)
+      {
+      OP2U(SLJIT_SUB | SLJIT_SET_GREATER, STR_PTR, 0, STR_END, 0);
+      CMOV(SLJIT_GREATER, STR_PTR, STR_END, 0);
+      }
+    }
+  }
+else
+#endif /* JIT_HAS_FAST_FORWARD_CHAR_SIMD */
+  {
+  read_char(common, common->nlmin, common->nlmax, NULL, READ_CHAR_NEWLINE);
+  lastchar = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+  if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)
+    foundcr = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
+  check_newlinechar(common, common->nltype, &newline, FALSE);
+  set_jumps(newline, loop);
+  }
 
 if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)
   {
-  quit = JUMP(SLJIT_JUMP);
-  JUMPHERE(foundcr);
+  if (quit == NULL)
+    {
+    quit = JUMP(SLJIT_JUMP);
+    JUMPHERE(foundcr);
+    }
+
   notfoundnl = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_NL);
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, CHAR_NL);
   OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_EQUAL);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
   OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
 #endif
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
   JUMPHERE(notfoundnl);
   JUMPHERE(quit);
   }
-JUMPHERE(lastchar);
+
+if (lastchar)
+  JUMPHERE(lastchar);
 JUMPHERE(firstchar);
 
 if (common->match_end_ptr != 0)
   OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
 }
 
-static BOOL check_class_ranges(compiler_common *common, const sljit_u8 *bits, BOOL nclass, BOOL invert, jump_list **backtracks);
+static BOOL optimize_class(compiler_common *common, const sljit_u8 *bits, BOOL nclass, BOOL invert, jump_list **backtracks);
 
-static SLJIT_INLINE void fast_forward_start_bits(compiler_common *common, const sljit_u8 *start_bits)
+static SLJIT_INLINE void fast_forward_start_bits(compiler_common *common)
 {
 DEFINE_COMPILER;
+const sljit_u8 *start_bits = common->re->start_bitmap;
 struct sljit_label *start;
-struct sljit_jump *quit;
+struct sljit_jump *partial_quit;
+#if PCRE2_CODE_UNIT_WIDTH != 8
 struct sljit_jump *found = NULL;
-jump_list *matches = NULL;
-#ifndef COMPILE_PCRE8
-struct sljit_jump *jump;
 #endif
+jump_list *matches = NULL;
 
 if (common->match_end_ptr != 0)
   {
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr);
   OP1(SLJIT_MOV, RETURN_ADDR, 0, STR_END, 0);
-  OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr);
+  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(1));
+  OP2U(SLJIT_SUB | SLJIT_SET_GREATER, STR_END, 0, TMP1, 0);
+  CMOV(SLJIT_GREATER, STR_END, TMP1, 0);
   }
 
 start = LABEL();
-quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-#ifdef SUPPORT_UTF
-if (common->utf)
-  OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
-#endif
 
-if (!check_class_ranges(common, start_bits, (start_bits[31] & 0x80) != 0, TRUE, &matches))
+partial_quit = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+if (common->mode == PCRE2_JIT_COMPLETE)
+  add_jump(compiler, &common->failed_match, partial_quit);
+
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+if (!optimize_class(common, start_bits, (start_bits[31] & 0x80) != 0, FALSE, &matches))
   {
-#ifndef COMPILE_PCRE8
-  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 255);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 255);
-  JUMPHERE(jump);
+#if PCRE2_CODE_UNIT_WIDTH != 8
+  if ((start_bits[31] & 0x80) != 0)
+    found = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 255);
+  else
+    CMPTO(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 255, start);
+#elif defined SUPPORT_UNICODE
+  if (common->utf && is_char7_bitset(start_bits, FALSE))
+    CMPTO(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 127, start);
 #endif
   OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
   OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
   OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)start_bits);
-  OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-  OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
-  found = JUMP(SLJIT_NOT_ZERO);
+  if (!HAS_VIRTUAL_REGISTERS)
+    {
+    OP2(SLJIT_SHL, TMP3, 0, SLJIT_IMM, 1, TMP2, 0);
+    OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP3, 0);
+    }
+  else
+    {
+    OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
+    OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP2, 0);
+    }
+  JUMPTO(SLJIT_ZERO, start);
   }
+else
+  set_jumps(matches, start);
 
-#ifdef SUPPORT_UTF
-if (common->utf)
-  OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
-#endif
-OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-#ifdef SUPPORT_UTF
-#if defined COMPILE_PCRE8
-if (common->utf)
-  {
-  CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0, start);
-  OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  }
-#elif defined COMPILE_PCRE16
-if (common->utf)
-  {
-  CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xd800, start);
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
-  OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-  }
-#endif /* COMPILE_PCRE[8|16] */
-#endif /* SUPPORT_UTF */
-JUMPTO(SLJIT_JUMP, start);
+#if PCRE2_CODE_UNIT_WIDTH != 8
 if (found != NULL)
   JUMPHERE(found);
-if (matches != NULL)
-  set_jumps(matches, LABEL());
-JUMPHERE(quit);
+#endif
+
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+if (common->mode != PCRE2_JIT_COMPLETE)
+  JUMPHERE(partial_quit);
 
 if (common->match_end_ptr != 0)
   OP1(SLJIT_MOV, STR_END, 0, RETURN_ADDR, 0);
 }
 
-static SLJIT_INLINE struct sljit_jump *search_requested_char(compiler_common *common, pcre_uchar req_char, BOOL caseless, BOOL has_firstchar)
+static SLJIT_INLINE jump_list *search_requested_char(compiler_common *common, PCRE2_UCHAR req_char, BOOL caseless, BOOL has_firstchar)
 {
 DEFINE_COMPILER;
 struct sljit_label *loop;
 struct sljit_jump *toolong;
-struct sljit_jump *alreadyfound;
+struct sljit_jump *already_found;
 struct sljit_jump *found;
-struct sljit_jump *foundoc = NULL;
-struct sljit_jump *notfound;
+struct sljit_jump *found_oc = NULL;
+jump_list *not_found = NULL;
 sljit_u32 oc, bit;
 
 SLJIT_ASSERT(common->req_char_ptr != 0);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->req_char_ptr);
-OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, REQ_BYTE_MAX);
-toolong = CMP(SLJIT_LESS, TMP1, 0, STR_END, 0);
-alreadyfound = CMP(SLJIT_LESS, STR_PTR, 0, TMP2, 0);
+OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(REQ_CU_MAX) * 100);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->req_char_ptr);
+toolong = CMP(SLJIT_LESS, TMP2, 0, STR_END, 0);
+already_found = CMP(SLJIT_LESS, STR_PTR, 0, TMP1, 0);
 
 if (has_firstchar)
   OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 else
   OP1(SLJIT_MOV, TMP1, 0, STR_PTR, 0);
 
-loop = LABEL();
-notfound = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, STR_END, 0);
-
-OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(TMP1), 0);
 oc = req_char;
 if (caseless)
   {
   oc = TABLE_GET(req_char, common->fcc, req_char);
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-  if (req_char > 127 && common->utf)
+#if defined SUPPORT_UNICODE
+  if (req_char > 127 && (common->utf || common->ucp))
     oc = UCD_OTHERCASE(req_char);
 #endif
   }
-if (req_char == oc)
-  found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, req_char);
-else
+
+#ifdef JIT_HAS_FAST_REQUESTED_CHAR_SIMD
+if (JIT_HAS_FAST_REQUESTED_CHAR_SIMD)
   {
-  bit = req_char ^ oc;
-  if (is_powerof2(bit))
-    {
-    OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, bit);
-    found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, req_char | bit);
-    }
+  not_found = fast_requested_char_simd(common, req_char, oc);
+  }
+else
+#endif
+  {
+  loop = LABEL();
+  add_jump(compiler, &not_found, CMP(SLJIT_GREATER_EQUAL, TMP1, 0, STR_END, 0));
+
+  OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(TMP1), 0);
+
+  if (req_char == oc)
+    found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, req_char);
   else
     {
-    found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, req_char);
-    foundoc = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, oc);
+    bit = req_char ^ oc;
+    if (is_powerof2(bit))
+      {
+       OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, bit);
+      found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, req_char | bit);
+      }
+    else
+      {
+      found = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, req_char);
+      found_oc = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, oc);
+      }
     }
-  }
-OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(1));
-JUMPTO(SLJIT_JUMP, loop);
+  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(1));
+  JUMPTO(SLJIT_JUMP, loop);
+
+  JUMPHERE(found);
+  if (found_oc)
+    JUMPHERE(found_oc);
+  }
 
-JUMPHERE(found);
-if (foundoc)
-  JUMPHERE(foundoc);
 OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->req_char_ptr, TMP1, 0);
-JUMPHERE(alreadyfound);
+
+JUMPHERE(already_found);
 JUMPHERE(toolong);
-return notfound;
+return not_found;
 }
 
 static void do_revertframes(compiler_common *common)
@@ -4849,7 +6565,6 @@ struct sljit_jump *jump;
 struct sljit_label *mainloop;
 
 sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
-OP1(SLJIT_MOV, TMP3, 0, STACK_TOP, 0);
 GET_LOCAL_BASE(TMP1, 0, 0);
 
 /* Drop frames until we reach STACK_TOP. */
@@ -4858,22 +6573,42 @@ OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), -sizeof(sljit_sw));
 jump = CMP(SLJIT_SIG_LESS_EQUAL, TMP2, 0, SLJIT_IMM, 0);
 
 OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP1, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(STACK_TOP), -2 * sizeof(sljit_sw));
-OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), sizeof(sljit_sw), SLJIT_MEM1(STACK_TOP), -3 * sizeof(sljit_sw));
-OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 3 * sizeof(sljit_sw));
+if (HAS_VIRTUAL_REGISTERS)
+  {
+  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(STACK_TOP), -(2 * sizeof(sljit_sw)));
+  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), sizeof(sljit_sw), SLJIT_MEM1(STACK_TOP), -(3 * sizeof(sljit_sw)));
+  OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 3 * sizeof(sljit_sw));
+  }
+else
+  {
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), -(2 * sizeof(sljit_sw)));
+  OP1(SLJIT_MOV, TMP3, 0, SLJIT_MEM1(STACK_TOP), -(3 * sizeof(sljit_sw)));
+  OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 3 * sizeof(sljit_sw));
+  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, TMP1, 0);
+  GET_LOCAL_BASE(TMP1, 0, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), sizeof(sljit_sw), TMP3, 0);
+  }
 JUMPTO(SLJIT_JUMP, mainloop);
 
 JUMPHERE(jump);
 jump = CMP(SLJIT_NOT_ZERO /* SIG_LESS */, TMP2, 0, SLJIT_IMM, 0);
 /* End of reverting values. */
-OP1(SLJIT_MOV, STACK_TOP, 0, TMP3, 0);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 
 JUMPHERE(jump);
-OP1(SLJIT_NEG, TMP2, 0, TMP2, 0);
+OP2(SLJIT_SUB, TMP2, 0, SLJIT_IMM, 0, TMP2, 0);
 OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP1, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(STACK_TOP), -2 * sizeof(sljit_sw));
-OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 2 * sizeof(sljit_sw));
+if (HAS_VIRTUAL_REGISTERS)
+  {
+  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(STACK_TOP), -(2 * sizeof(sljit_sw)));
+  OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 2 * sizeof(sljit_sw));
+  }
+else
+  {
+  OP1(SLJIT_MOV, TMP3, 0, SLJIT_MEM1(STACK_TOP), -(2 * sizeof(sljit_sw)));
+  OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 2 * sizeof(sljit_sw));
+  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, TMP3, 0);
+  }
 JUMPTO(SLJIT_JUMP, mainloop);
 }
 
@@ -4882,89 +6617,121 @@ static void check_wordboundary(compiler_common *common)
 DEFINE_COMPILER;
 struct sljit_jump *skipread;
 jump_list *skipread_list = NULL;
-#if !(defined COMPILE_PCRE8) || defined SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
+struct sljit_label *valid_utf;
+jump_list *invalid_utf1 = NULL;
+#endif /* SUPPORT_UNICODE */
+jump_list *invalid_utf2 = NULL;
+#if PCRE2_CODE_UNIT_WIDTH != 8 || defined SUPPORT_UNICODE
 struct sljit_jump *jump;
-#endif
+#endif /* PCRE2_CODE_UNIT_WIDTH != 8 || SUPPORT_UNICODE */
 
 SLJIT_COMPILE_ASSERT(ctype_word == 0x10, ctype_word_must_be_16);
 
 sljit_emit_fast_enter(compiler, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-/* Get type of the previous char, and put it to LOCALS1. */
+/* Get type of the previous char, and put it to TMP3. */
 OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, SLJIT_IMM, 0);
-skipread = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP1, 0);
-skip_char_back(common);
-check_start_used_ptr(common);
-read_char(common);
+OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
+OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 0);
+skipread = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
+
+#ifdef SUPPORT_UNICODE
+if (common->invalid_utf)
+  {
+  peek_char_back(common, READ_CHAR_MAX, &invalid_utf1);
+
+  if (common->mode != PCRE2_JIT_COMPLETE)
+    {
+    OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
+    OP1(SLJIT_MOV, TMP2, 0, STR_PTR, 0);
+    move_back(common, NULL, TRUE);
+    check_start_used_ptr(common);
+    OP1(SLJIT_MOV, TMP1, 0, RETURN_ADDR, 0);
+    OP1(SLJIT_MOV, STR_PTR, 0, TMP2, 0);
+    }
+  }
+else
+#endif /* SUPPORT_UNICODE */
+  {
+  if (common->mode == PCRE2_JIT_COMPLETE)
+    peek_char_back(common, READ_CHAR_MAX, NULL);
+  else
+    {
+    move_back(common, NULL, TRUE);
+    check_start_used_ptr(common);
+    read_char(common, 0, READ_CHAR_MAX, NULL, READ_CHAR_UPDATE_STR_PTR);
+    }
+  }
 
 /* Testing char type. */
-#ifdef SUPPORT_UCP
-if (common->use_ucp)
+#ifdef SUPPORT_UNICODE
+if (common->ucp)
   {
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 1);
   jump = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_UNDERSCORE);
-  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
+  add_jump(compiler, &common->getucdtype, JUMP(SLJIT_FAST_CALL));
   OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);
-  OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
   OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
   OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);
-  OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
   JUMPHERE(jump);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, TMP2, 0);
+  OP1(SLJIT_MOV, TMP3, 0, TMP2, 0);
   }
 else
-#endif
+#endif /* SUPPORT_UNICODE */
   {
-#ifndef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH != 8
   jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-#elif defined SUPPORT_UTF
-  /* Here LOCALS1 has already been zeroed. */
+#elif defined SUPPORT_UNICODE
+  /* Here TMP3 has already been zeroed. */
   jump = NULL;
   if (common->utf)
     jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-#endif /* COMPILE_PCRE8 */
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
   OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), common->ctypes);
   OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 4 /* ctype_word */);
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, TMP1, 0);
-#ifndef COMPILE_PCRE8
+  OP2(SLJIT_AND, TMP3, 0, TMP1, 0, SLJIT_IMM, 1);
+#if PCRE2_CODE_UNIT_WIDTH != 8
   JUMPHERE(jump);
-#elif defined SUPPORT_UTF
+#elif defined SUPPORT_UNICODE
   if (jump != NULL)
     JUMPHERE(jump);
-#endif /* COMPILE_PCRE8 */
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
   }
 JUMPHERE(skipread);
 
 OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
 check_str_end(common, &skipread_list);
-peek_char(common, READ_CHAR_MAX);
+peek_char(common, READ_CHAR_MAX, SLJIT_MEM1(SLJIT_SP), LOCALS1, &invalid_utf2);
 
 /* Testing char type. This is a code duplication. */
-#ifdef SUPPORT_UCP
-if (common->use_ucp)
+#ifdef SUPPORT_UNICODE
+
+valid_utf = LABEL();
+
+if (common->ucp)
   {
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 1);
   jump = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_UNDERSCORE);
-  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
+  add_jump(compiler, &common->getucdtype, JUMP(SLJIT_FAST_CALL));
   OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);
-  OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
   OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
   OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);
-  OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
   JUMPHERE(jump);
   }
 else
-#endif
+#endif /* SUPPORT_UNICODE */
   {
-#ifndef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH != 8
   /* TMP2 may be destroyed by peek_char. */
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
   jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-#elif defined SUPPORT_UTF
+#elif defined SUPPORT_UNICODE
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
   jump = NULL;
   if (common->utf)
@@ -4973,24 +6740,44 @@ else
   OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP1), common->ctypes);
   OP2(SLJIT_LSHR, TMP2, 0, TMP2, 0, SLJIT_IMM, 4 /* ctype_word */);
   OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
-#ifndef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH != 8
   JUMPHERE(jump);
-#elif defined SUPPORT_UTF
+#elif defined SUPPORT_UNICODE
   if (jump != NULL)
     JUMPHERE(jump);
-#endif /* COMPILE_PCRE8 */
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
   }
 set_jumps(skipread_list, LABEL());
 
-OP2(SLJIT_XOR | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
-sljit_emit_fast_return(compiler, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+OP2(SLJIT_XOR | SLJIT_SET_Z, TMP2, 0, TMP2, 0, TMP3, 0);
+OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
+
+#ifdef SUPPORT_UNICODE
+if (common->invalid_utf)
+  {
+  set_jumps(invalid_utf1, LABEL());
+
+  peek_char(common, READ_CHAR_MAX, SLJIT_MEM1(SLJIT_SP), LOCALS1, NULL);
+  CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR, valid_utf);
+
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, -1);
+  OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
+
+  set_jumps(invalid_utf2, LABEL());
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+  OP1(SLJIT_MOV, TMP2, 0, TMP3, 0);
+  OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
+  }
+#endif /* SUPPORT_UNICODE */
 }
 
-static BOOL check_class_ranges(compiler_common *common, const sljit_u8 *bits, BOOL nclass, BOOL invert, jump_list **backtracks)
+static BOOL optimize_class_ranges(compiler_common *common, const sljit_u8 *bits, BOOL nclass, BOOL invert, jump_list **backtracks)
 {
 /* May destroy TMP1. */
 DEFINE_COMPILER;
-int ranges[MAX_RANGE_SIZE];
+int ranges[MAX_CLASS_RANGE_SIZE];
 sljit_u8 bit, cbit, all;
 int i, byte, length = 0;
 
@@ -5008,7 +6795,7 @@ for (i = 0; i < 256; )
     cbit = (bits[byte] >> (i & 0x7)) & 0x1;
     if (cbit != bit)
       {
-      if (length >= MAX_RANGE_SIZE)
+      if (length >= MAX_CLASS_RANGE_SIZE)
         return FALSE;
       ranges[length] = i;
       length++;
@@ -5021,7 +6808,7 @@ for (i = 0; i < 256; )
 
 if (((bit == 0) && nclass) || ((bit == 1) && !nclass))
   {
-  if (length >= MAX_RANGE_SIZE)
+  if (length >= MAX_CLASS_RANGE_SIZE)
     return FALSE;
   ranges[length] = 256;
   length++;
@@ -5138,6 +6925,115 @@ switch(length)
   }
 }
 
+static BOOL optimize_class_chars(compiler_common *common, const sljit_u8 *bits, BOOL nclass, BOOL invert, jump_list **backtracks)
+{
+/* May destroy TMP1. */
+DEFINE_COMPILER;
+uint16_t char_list[MAX_CLASS_CHARS_SIZE];
+uint8_t byte;
+sljit_s32 type;
+int i, j, k, len, c;
+
+if (!sljit_has_cpu_feature(SLJIT_HAS_CMOV))
+  return FALSE;
+
+len = 0;
+
+for (i = 0; i < 32; i++)
+  {
+  byte = bits[i];
+
+  if (nclass)
+    byte = ~byte;
+
+  j = 0;
+  while (byte != 0)
+    {
+    if (byte & 0x1)
+      {
+      c = i * 8 + j;
+
+      k = len;
+
+      if ((c & 0x20) != 0)
+        {
+        for (k = 0; k < len; k++)
+          if (char_list[k] == c - 0x20)
+            {
+            char_list[k] |= 0x120;
+            break;
+            }
+        }
+
+      if (k == len)
+        {
+        if (len >= MAX_CLASS_CHARS_SIZE)
+          return FALSE;
+
+        char_list[len++] = (uint16_t) c;
+        }
+      }
+
+    byte >>= 1;
+    j++;
+    }
+  }
+
+if (len == 0) return FALSE;  /* Should never occur, but stops analyzers complaining. */
+
+i = 0;
+j = 0;
+
+if (char_list[0] == 0)
+  {
+  i++;
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0);
+  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_ZERO);
+  }
+else
+  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
+
+while (i < len)
+  {
+  if ((char_list[i] & 0x100) != 0)
+    j++;
+  else
+    {
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, char_list[i]);
+    CMOV(SLJIT_ZERO, TMP2, TMP1, 0);
+    }
+  i++;
+  }
+
+if (j != 0)
+  {
+  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x20);
+
+  for (i = 0; i < len; i++)
+    if ((char_list[i] & 0x100) != 0)
+      {
+      j--;
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, char_list[i] & 0xff);
+      CMOV(SLJIT_ZERO, TMP2, TMP1, 0);
+      }
+  }
+
+if (invert)
+  nclass = !nclass;
+
+type = nclass ? SLJIT_NOT_EQUAL : SLJIT_EQUAL;
+add_jump(compiler, backtracks, CMP(type, TMP2, 0, SLJIT_IMM, 0));
+return TRUE;
+}
+
+static BOOL optimize_class(compiler_common *common, const sljit_u8 *bits, BOOL nclass, BOOL invert, jump_list **backtracks)
+{
+/* May destroy TMP1. */
+if (optimize_class_ranges(common, bits, nclass, invert, backtracks))
+  return TRUE;
+return optimize_class_chars(common, bits, nclass, invert, backtracks);
+}
+
 static void check_anynewline(compiler_common *common)
 {
 /* Check whether TMP1 contains a newline character. TMP2 destroyed. */
@@ -5146,23 +7042,23 @@ DEFINE_COMPILER;
 sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
 
 OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x0a);
-OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);
+OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);
 OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
-OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-#ifdef COMPILE_PCRE8
+OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+#if PCRE2_CODE_UNIT_WIDTH == 8
 if (common->utf)
   {
 #endif
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
   OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x1);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);
-#ifdef COMPILE_PCRE8
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);
+#if PCRE2_CODE_UNIT_WIDTH == 8
   }
 #endif
-#endif /* SUPPORT_UTF || COMPILE_PCRE16 || COMPILE_PCRE32 */
+#endif /* SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == [16|32] */
 OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_EQUAL);
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 }
 
 static void check_hspace(compiler_common *common)
@@ -5172,36 +7068,36 @@ DEFINE_COMPILER;
 
 sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
 
-OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x09);
+OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x09);
 OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
-OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x20);
+OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x20);
 OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xa0);
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-#ifdef COMPILE_PCRE8
+OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0xa0);
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+#if PCRE2_CODE_UNIT_WIDTH == 8
 if (common->utf)
   {
 #endif
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x1680);
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x1680);
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x180e);
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x180e);
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
   OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x2000);
-  OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x200A - 0x2000);
+  OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x200A - 0x2000);
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x202f - 0x2000);
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x202f - 0x2000);
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x205f - 0x2000);
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x205f - 0x2000);
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x3000 - 0x2000);
-#ifdef COMPILE_PCRE8
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x3000 - 0x2000);
+#if PCRE2_CODE_UNIT_WIDTH == 8
   }
 #endif
-#endif /* SUPPORT_UTF || COMPILE_PCRE16 || COMPILE_PCRE32 */
+#endif /* SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == [16|32] */
 OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_EQUAL);
 
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 }
 
 static void check_vspace(compiler_common *common)
@@ -5212,24 +7108,24 @@ DEFINE_COMPILER;
 sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
 
 OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x0a);
-OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);
+OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);
 OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
-OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-#ifdef COMPILE_PCRE8
+OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+#if PCRE2_CODE_UNIT_WIDTH == 8
 if (common->utf)
   {
 #endif
   OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
   OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x1);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);
-#ifdef COMPILE_PCRE8
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);
+#if PCRE2_CODE_UNIT_WIDTH == 8
   }
 #endif
-#endif /* SUPPORT_UTF || COMPILE_PCRE16 || COMPILE_PCRE32 */
+#endif /* SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == [16|32] */
 OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_EQUAL);
 
-sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 }
 
 static void do_casefulcmp(compiler_common *common)
@@ -5240,7 +7136,7 @@ struct sljit_label *label;
 int char1_reg;
 int char2_reg;
 
-if (sljit_get_register_index(TMP3) < 0)
+if (HAS_VIRTUAL_REGISTERS)
   {
   char1_reg = STR_END;
   char2_reg = STACK_TOP;
@@ -5309,7 +7205,7 @@ if (char1_reg == STR_END)
   OP1(SLJIT_MOV, char2_reg, 0, RETURN_ADDR, 0);
   }
 
-sljit_emit_fast_return(compiler, TMP1, 0);
+OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
 }
 
 static void do_caselesscmp(compiler_common *common)
@@ -5322,7 +7218,7 @@ int char2_reg;
 int lcc_table;
 int opt_type = 0;
 
-if (sljit_get_register_index(TMP3) < 0)
+if (HAS_VIRTUAL_REGISTERS)
   {
   char2_reg = STACK_TOP;
   lcc_table = STACK_LIMIT;
@@ -5374,16 +7270,16 @@ else
   OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(1));
   }
 
-#ifndef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH != 8
 jump = CMP(SLJIT_GREATER, char1_reg, 0, SLJIT_IMM, 255);
 #endif
 OP1(SLJIT_MOV_U8, char1_reg, 0, SLJIT_MEM2(lcc_table, char1_reg), 0);
-#ifndef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH != 8
 JUMPHERE(jump);
 jump = CMP(SLJIT_GREATER, char2_reg, 0, SLJIT_IMM, 255);
 #endif
 OP1(SLJIT_MOV_U8, char2_reg, 0, SLJIT_MEM2(lcc_table, char2_reg), 0);
-#ifndef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH != 8
 JUMPHERE(jump);
 #endif
 
@@ -5407,47 +7303,16 @@ if (char2_reg == STACK_TOP)
   }
 
 OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
-sljit_emit_fast_return(compiler, TMP1, 0);
+OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
 }
 
-#if defined SUPPORT_UTF && defined SUPPORT_UCP
-
-static const pcre_uchar * SLJIT_FUNC do_utf_caselesscmp(pcre_uchar *src1, pcre_uchar *src2, pcre_uchar *end1, pcre_uchar *end2)
-{
-/* This function would be ineffective to do in JIT level. */
-sljit_u32 c1, c2;
-const ucd_record *ur;
-const sljit_u32 *pp;
-
-while (src1 < end1)
-  {
-  if (src2 >= end2)
-    return (pcre_uchar*)1;
-  GETCHARINC(c1, src1);
-  GETCHARINC(c2, src2);
-  ur = GET_UCD(c2);
-  if (c1 != c2 && c1 != c2 + ur->other_case)
-    {
-    pp = PRIV(ucd_caseless_sets) + ur->caseset;
-    for (;;)
-      {
-      if (c1 < *pp) return NULL;
-      if (c1 == *pp++) break;
-      }
-    }
-  }
-return src2;
-}
-
-#endif /* SUPPORT_UTF && SUPPORT_UCP */
-
-static pcre_uchar *byte_sequence_compare(compiler_common *common, BOOL caseless, pcre_uchar *cc,
+static PCRE2_SPTR byte_sequence_compare(compiler_common *common, BOOL caseless, PCRE2_SPTR cc,
     compare_context *context, jump_list **backtracks)
 {
 DEFINE_COMPILER;
 unsigned int othercasebit = 0;
-pcre_uchar *othercasechar = NULL;
-#ifdef SUPPORT_UTF
+PCRE2_SPTR othercasechar = NULL;
+#ifdef SUPPORT_UNICODE
 int utflength;
 #endif
 
@@ -5456,25 +7321,25 @@ if (caseless && char_has_othercase(common, cc))
   othercasebit = char_get_othercase_bit(common, cc);
   SLJIT_ASSERT(othercasebit);
   /* Extracting bit difference info. */
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
   othercasechar = cc + (othercasebit >> 8);
   othercasebit &= 0xff;
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+#elif PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
   /* Note that this code only handles characters in the BMP. If there
   ever are characters outside the BMP whose othercase differs in only one
   bit from itself (there currently are none), this code will need to be
-  revised for COMPILE_PCRE32. */
+  revised for PCRE2_CODE_UNIT_WIDTH == 32. */
   othercasechar = cc + (othercasebit >> 9);
   if ((othercasebit & 0x100) != 0)
     othercasebit = (othercasebit & 0xff) << 8;
   else
     othercasebit &= 0xff;
-#endif /* COMPILE_PCRE[8|16|32] */
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
   }
 
 if (context->sourcereg == -1)
   {
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
 #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
   if (context->length >= 4)
     OP1(SLJIT_MOV_S32, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
@@ -5482,21 +7347,21 @@ if (context->sourcereg == -1)
     OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
   else
 #endif
-    OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#elif defined COMPILE_PCRE16
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
+#elif PCRE2_CODE_UNIT_WIDTH == 16
 #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
   if (context->length >= 4)
     OP1(SLJIT_MOV_S32, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
   else
 #endif
     OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#elif defined COMPILE_PCRE32
+#elif PCRE2_CODE_UNIT_WIDTH == 32
   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#endif /* COMPILE_PCRE[8|16|32] */
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
   context->sourcereg = TMP2;
   }
 
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
 utflength = 1;
 if (common->utf && HAS_EXTRALEN(*cc))
   utflength += GET_EXTRALEN(*cc);
@@ -5506,7 +7371,7 @@ do
 #endif
 
   context->length -= IN_UCHARS(1);
-#if (defined SLJIT_UNALIGNED && SLJIT_UNALIGNED) && (defined COMPILE_PCRE8 || defined COMPILE_PCRE16)
+#if (defined SLJIT_UNALIGNED && SLJIT_UNALIGNED) && (PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16)
 
   /* Unaligned read is supported. */
   if (othercasebit != 0 && othercasechar == cc)
@@ -5521,7 +7386,7 @@ do
     }
   context->ucharptr++;
 
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
   if (context->ucharptr >= 4 || context->length == 0 || (context->ucharptr == 2 && context->length == 1))
 #else
   if (context->ucharptr >= 2 || context->length == 0)
@@ -5531,27 +7396,27 @@ do
       OP1(SLJIT_MOV_S32, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
     else if (context->length >= 2)
       OP1(SLJIT_MOV_U16, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
     else if (context->length >= 1)
       OP1(SLJIT_MOV_U8, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#endif /* COMPILE_PCRE8 */
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
     context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;
 
     switch(context->ucharptr)
       {
-      case 4 / sizeof(pcre_uchar):
+      case 4 / sizeof(PCRE2_UCHAR):
       if (context->oc.asint != 0)
         OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asint);
       add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asint | context->oc.asint));
       break;
 
-      case 2 / sizeof(pcre_uchar):
+      case 2 / sizeof(PCRE2_UCHAR):
       if (context->oc.asushort != 0)
         OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asushort);
       add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asushort | context->oc.asushort));
       break;
 
-#ifdef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
       case 1:
       if (context->oc.asbyte != 0)
         OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asbyte);
@@ -5585,7 +7450,7 @@ do
 #endif
 
   cc++;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
   utflength--;
   }
 while (utflength > 0);
@@ -5594,7 +7459,7 @@ while (utflength > 0);
 return cc;
 }
 
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
 
 #define SET_TYPE_OFFSET(value) \
   if ((value) != typeoffset) \
@@ -5616,37 +7481,52 @@ return cc;
     } \
   charoffset = (value);
 
-static pcre_uchar *compile_char1_matchingpath(compiler_common *common, pcre_uchar type, pcre_uchar *cc, jump_list **backtracks, BOOL check_str_ptr);
+static PCRE2_SPTR compile_char1_matchingpath(compiler_common *common, PCRE2_UCHAR type, PCRE2_SPTR cc, jump_list **backtracks, BOOL check_str_ptr);
 
-static void compile_xclass_matchingpath(compiler_common *common, pcre_uchar *cc, jump_list **backtracks)
+#ifdef SUPPORT_UNICODE
+#define XCLASS_SAVE_CHAR 0x001
+#define XCLASS_CHAR_SAVED 0x002
+#define XCLASS_HAS_TYPE 0x004
+#define XCLASS_HAS_SCRIPT 0x008
+#define XCLASS_HAS_SCRIPT_EXTENSION 0x010
+#define XCLASS_HAS_BOOL 0x020
+#define XCLASS_HAS_BIDICL 0x040
+#define XCLASS_NEEDS_UCD (XCLASS_HAS_TYPE | XCLASS_HAS_SCRIPT | XCLASS_HAS_SCRIPT_EXTENSION | XCLASS_HAS_BOOL | XCLASS_HAS_BIDICL)
+#define XCLASS_SCRIPT_EXTENSION_NOTPROP 0x080
+#define XCLASS_SCRIPT_EXTENSION_RESTORE_RETURN_ADDR 0x100
+#define XCLASS_SCRIPT_EXTENSION_RESTORE_LOCALS0 0x200
+
+#endif /* SUPPORT_UNICODE */
+
+static void compile_xclass_matchingpath(compiler_common *common, PCRE2_SPTR cc, jump_list **backtracks)
 {
 DEFINE_COMPILER;
 jump_list *found = NULL;
 jump_list **list = (cc[0] & XCL_NOT) == 0 ? &found : backtracks;
 sljit_uw c, charoffset, max = 256, min = READ_CHAR_MAX;
 struct sljit_jump *jump = NULL;
-pcre_uchar *ccbegin;
+PCRE2_SPTR ccbegin;
 int compares, invertcmp, numberofcmps;
-#if defined SUPPORT_UTF && (defined COMPILE_PCRE8 || defined COMPILE_PCRE16)
+#if defined SUPPORT_UNICODE && (PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16)
 BOOL utf = common->utf;
-#endif
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == [8|16] */
 
-#ifdef SUPPORT_UCP
-BOOL needstype = FALSE, needsscript = FALSE, needschar = FALSE;
-BOOL charsaved = FALSE;
+#ifdef SUPPORT_UNICODE
+sljit_u32 unicode_status = 0;
 int typereg = TMP1;
 const sljit_u32 *other_cases;
 sljit_uw typeoffset;
-#endif
+#endif /* SUPPORT_UNICODE */
 
 /* Scanning the necessary info. */
 cc++;
 ccbegin = cc;
 compares = 0;
+
 if (cc[-1] & XCL_MAP)
   {
   min = 0;
-  cc += 32 / sizeof(pcre_uchar);
+  cc += 32 / sizeof(PCRE2_UCHAR);
   }
 
 while (*cc != XCL_END)
@@ -5658,9 +7538,9 @@ while (*cc != XCL_END)
     GETCHARINCTEST(c, cc);
     if (c > max) max = c;
     if (c < min) min = c;
-#ifdef SUPPORT_UCP
-    needschar = TRUE;
-#endif
+#ifdef SUPPORT_UNICODE
+    unicode_status |= XCLASS_SAVE_CHAR;
+#endif /* SUPPORT_UNICODE */
     }
   else if (*cc == XCL_RANGE)
     {
@@ -5669,16 +7549,16 @@ while (*cc != XCL_END)
     if (c < min) min = c;
     GETCHARINCTEST(c, cc);
     if (c > max) max = c;
-#ifdef SUPPORT_UCP
-    needschar = TRUE;
-#endif
+#ifdef SUPPORT_UNICODE
+    unicode_status |= XCLASS_SAVE_CHAR;
+#endif /* SUPPORT_UNICODE */
     }
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
   else
     {
     SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
     cc++;
-    if (*cc == PT_CLIST)
+    if (*cc == PT_CLIST && cc[-1] == XCL_PROP)
       {
       other_cases = PRIV(ucd_caseless_sets) + cc[1];
       while (*other_cases != NOTACHAR)
@@ -5711,11 +7591,21 @@ while (*cc != XCL_END)
       case PT_GC:
       case PT_PC:
       case PT_ALNUM:
-      needstype = TRUE;
+      unicode_status |= XCLASS_HAS_TYPE;
       break;
 
+      case PT_SCX:
+      unicode_status |= XCLASS_HAS_SCRIPT_EXTENSION;
+      if (cc[-1] == XCL_NOTPROP)
+        {
+        unicode_status |= XCLASS_SCRIPT_EXTENSION_NOTPROP;
+        break;
+        }
+      compares++;
+      /* Fall through */
+
       case PT_SC:
-      needsscript = TRUE;
+      unicode_status |= XCLASS_HAS_SCRIPT;
       break;
 
       case PT_SPACE:
@@ -5724,13 +7614,20 @@ while (*cc != XCL_END)
       case PT_PXGRAPH:
       case PT_PXPRINT:
       case PT_PXPUNCT:
-      needstype = TRUE;
-      needschar = TRUE;
+      unicode_status |= XCLASS_SAVE_CHAR | XCLASS_HAS_TYPE;
       break;
 
       case PT_CLIST:
       case PT_UCNC:
-      needschar = TRUE;
+      unicode_status |= XCLASS_SAVE_CHAR;
+      break;
+
+      case PT_BOOL:
+      unicode_status |= XCLASS_HAS_BOOL;
+      break;
+
+      case PT_BIDICL:
+      unicode_status |= XCLASS_HAS_BIDICL;
       break;
 
       default:
@@ -5739,33 +7636,42 @@ while (*cc != XCL_END)
       }
     cc += 2;
     }
-#endif
+#endif /* SUPPORT_UNICODE */
   }
 SLJIT_ASSERT(compares > 0);
 
 /* We are not necessary in utf mode even in 8 bit mode. */
 cc = ccbegin;
-read_char_range(common, min, max, (cc[-1] & XCL_NOT) != 0);
+if ((cc[-1] & XCL_NOT) != 0)
+  read_char(common, min, max, backtracks, READ_CHAR_UPDATE_STR_PTR);
+else
+  {
+#ifdef SUPPORT_UNICODE
+  read_char(common, min, max, (unicode_status & XCLASS_NEEDS_UCD) ? backtracks : NULL, 0);
+#else /* !SUPPORT_UNICODE */
+  read_char(common, min, max, NULL, 0);
+#endif /* SUPPORT_UNICODE */
+  }
 
 if ((cc[-1] & XCL_HASPROP) == 0)
   {
   if ((cc[-1] & XCL_MAP) != 0)
     {
     jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-    if (!check_class_ranges(common, (const sljit_u8 *)cc, (((const sljit_u8 *)cc)[31] & 0x80) != 0, TRUE, &found))
+    if (!optimize_class(common, (const sljit_u8 *)cc, (((const sljit_u8 *)cc)[31] & 0x80) != 0, TRUE, &found))
       {
       OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
       OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
       OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
       OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-      OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
+      OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP2, 0);
       add_jump(compiler, &found, JUMP(SLJIT_NOT_ZERO));
       }
 
     add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
     JUMPHERE(jump);
 
-    cc += 32 / sizeof(pcre_uchar);
+    cc += 32 / sizeof(PCRE2_UCHAR);
     }
   else
     {
@@ -5776,64 +7682,67 @@ if ((cc[-1] & XCL_HASPROP) == 0)
 else if ((cc[-1] & XCL_MAP) != 0)
   {
   OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
-#ifdef SUPPORT_UCP
-  charsaved = TRUE;
-#endif
-  if (!check_class_ranges(common, (const sljit_u8 *)cc, FALSE, TRUE, list))
+#ifdef SUPPORT_UNICODE
+  unicode_status |= XCLASS_CHAR_SAVED;
+#endif /* SUPPORT_UNICODE */
+  if (!optimize_class(common, (const sljit_u8 *)cc, FALSE, TRUE, list))
     {
-#ifdef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
     jump = NULL;
     if (common->utf)
-#endif
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
       jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
 
     OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
     OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
     OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
     OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-    OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
+    OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP2, 0);
     add_jump(compiler, list, JUMP(SLJIT_NOT_ZERO));
 
-#ifdef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
     if (common->utf)
-#endif
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
       JUMPHERE(jump);
     }
 
   OP1(SLJIT_MOV, TMP1, 0, RETURN_ADDR, 0);
-  cc += 32 / sizeof(pcre_uchar);
+  cc += 32 / sizeof(PCRE2_UCHAR);
   }
 
-#ifdef SUPPORT_UCP
-if (needstype || needsscript)
+#ifdef SUPPORT_UNICODE
+if (unicode_status & XCLASS_NEEDS_UCD)
   {
-  if (needschar && !charsaved)
+  if ((unicode_status & (XCLASS_SAVE_CHAR | XCLASS_CHAR_SAVED)) == XCLASS_SAVE_CHAR)
     OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
 
-#ifdef COMPILE_PCRE32
+#if PCRE2_CODE_UNIT_WIDTH == 32
   if (!common->utf)
     {
-    jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x10ffff + 1);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);
+    jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, MAX_UTF_CODE_POINT + 1);
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, UNASSIGNED_UTF_CHAR);
     JUMPHERE(jump);
     }
-#endif
+#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
 
   OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
-  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
+  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
+  OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
   OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);
   OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
   OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_stage2));
   OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM2(TMP2, TMP1), 1);
+  OP2(SLJIT_SHL, TMP1, 0, TMP2, 0, SLJIT_IMM, 3);
+  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 2);
+  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP1, 0);
 
-  /* Before anything else, we deal with scripts. */
-  if (needsscript)
+  ccbegin = cc;
+
+  if (unicode_status & XCLASS_HAS_BIDICL)
     {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
-    OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM2(TMP1, TMP2), 3);
-
-    ccbegin = cc;
+    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, scriptx_bidiclass));
+    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BIDICLASS_SHIFT);
 
     while (*cc != XCL_END)
       {
@@ -5852,7 +7761,7 @@ if (needstype || needsscript)
         {
         SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
         cc++;
-        if (*cc == PT_SC)
+        if (*cc == PT_BIDICL)
           {
           compares--;
           invertcmp = (compares == 0 && list != backtracks);
@@ -5868,34 +7777,183 @@ if (needstype || needsscript)
     cc = ccbegin;
     }
 
-  if (needschar)
+  if (unicode_status & XCLASS_HAS_BOOL)
     {
-    OP1(SLJIT_MOV, TMP1, 0, RETURN_ADDR, 0);
+    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, bprops));
+    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BPROPS_MASK);
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 2);
+
+    while (*cc != XCL_END)
+      {
+      if (*cc == XCL_SINGLE)
+        {
+        cc ++;
+        GETCHARINCTEST(c, cc);
+        }
+      else if (*cc == XCL_RANGE)
+        {
+        cc ++;
+        GETCHARINCTEST(c, cc);
+        GETCHARINCTEST(c, cc);
+        }
+      else
+        {
+        SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
+        cc++;
+        if (*cc == PT_BOOL)
+          {
+          compares--;
+          invertcmp = (compares == 0 && list != backtracks);
+          if (cc[-1] == XCL_NOTPROP)
+            invertcmp ^= 0x1;
+
+          OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP1), (sljit_sw)(PRIV(ucd_boolprop_sets) + (cc[1] >> 5)), SLJIT_IMM, (sljit_sw)1 << (cc[1] & 0x1f));
+          add_jump(compiler, compares > 0 ? list : backtracks, JUMP(SLJIT_NOT_ZERO ^ invertcmp));
+          }
+        cc += 2;
+        }
+      }
+
+    cc = ccbegin;
     }
 
-  if (needstype)
+  if (unicode_status & XCLASS_HAS_SCRIPT)
     {
-    if (!needschar)
+    OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
+
+    while (*cc != XCL_END)
       {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
-      OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM2(TMP1, TMP2), 3);
+      if (*cc == XCL_SINGLE)
+        {
+        cc ++;
+        GETCHARINCTEST(c, cc);
+        }
+      else if (*cc == XCL_RANGE)
+        {
+        cc ++;
+        GETCHARINCTEST(c, cc);
+        GETCHARINCTEST(c, cc);
+        }
+      else
+        {
+        SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
+        cc++;
+        switch (*cc)
+          {
+          case PT_SCX:
+          if (cc[-1] == XCL_NOTPROP)
+            break;
+          /* Fall through */
+
+          case PT_SC:
+          compares--;
+          invertcmp = (compares == 0 && list != backtracks);
+          if (cc[-1] == XCL_NOTPROP)
+            invertcmp ^= 0x1;
+
+          add_jump(compiler, compares > 0 ? list : backtracks, CMP(SLJIT_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (int)cc[1]));
+          }
+        cc += 2;
+        }
       }
-    else
+
+    cc = ccbegin;
+    }
+
+  if (unicode_status & XCLASS_HAS_SCRIPT_EXTENSION)
+    {
+    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, scriptx_bidiclass));
+    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_SCRIPTX_MASK);
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 2);
+
+    if (unicode_status & XCLASS_SCRIPT_EXTENSION_NOTPROP)
       {
-      OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 3);
-      OP1(SLJIT_MOV_U8, RETURN_ADDR, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
+      if (unicode_status & XCLASS_HAS_TYPE)
+        {
+        if (unicode_status & XCLASS_SAVE_CHAR)
+          {
+          OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, TMP2, 0);
+          unicode_status |= XCLASS_SCRIPT_EXTENSION_RESTORE_LOCALS0;
+          }
+        else
+          {
+          OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP2, 0);
+          unicode_status |= XCLASS_SCRIPT_EXTENSION_RESTORE_RETURN_ADDR;
+          }
+        }
+      OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
+      }
+
+    while (*cc != XCL_END)
+      {
+      if (*cc == XCL_SINGLE)
+        {
+        cc ++;
+        GETCHARINCTEST(c, cc);
+        }
+      else if (*cc == XCL_RANGE)
+        {
+        cc ++;
+        GETCHARINCTEST(c, cc);
+        GETCHARINCTEST(c, cc);
+        }
+      else
+        {
+        SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
+        cc++;
+        if (*cc == PT_SCX)
+          {
+          compares--;
+          invertcmp = (compares == 0 && list != backtracks);
+
+          jump = NULL;
+          if (cc[-1] == XCL_NOTPROP)
+            {
+            jump = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, (int)cc[1]);
+            if (invertcmp)
+              {
+              add_jump(compiler, backtracks, jump);
+              jump = NULL;
+              }
+            invertcmp ^= 0x1;
+            }
+
+          OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP1), (sljit_sw)(PRIV(ucd_script_sets) + (cc[1] >> 5)), SLJIT_IMM, (sljit_sw)1 << (cc[1] & 0x1f));
+          add_jump(compiler, compares > 0 ? list : backtracks, JUMP(SLJIT_NOT_ZERO ^ invertcmp));
+
+          if (jump != NULL)
+            JUMPHERE(jump);
+          }
+        cc += 2;
+        }
+      }
+
+    if (unicode_status & XCLASS_SCRIPT_EXTENSION_RESTORE_LOCALS0)
+      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+    else if (unicode_status & XCLASS_SCRIPT_EXTENSION_RESTORE_RETURN_ADDR)
+      OP1(SLJIT_MOV, TMP2, 0, RETURN_ADDR, 0);
+    cc = ccbegin;
+    }
+
+  if (unicode_status & XCLASS_SAVE_CHAR)
+    OP1(SLJIT_MOV, TMP1, 0, RETURN_ADDR, 0);
+
+  if (unicode_status & XCLASS_HAS_TYPE)
+    {
+    if (unicode_status & XCLASS_SAVE_CHAR)
       typereg = RETURN_ADDR;
-      }
+
+    OP1(SLJIT_MOV_U8, typereg, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
     }
   }
-#endif
+#endif /* SUPPORT_UNICODE */
 
 /* Generating code. */
 charoffset = 0;
 numberofcmps = 0;
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
 typeoffset = 0;
-#endif
+#endif /* SUPPORT_UNICODE */
 
 while (*cc != XCL_END)
   {
@@ -5910,13 +7968,13 @@ while (*cc != XCL_END)
 
     if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))
       {
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
       OP_FLAGS(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
       numberofcmps++;
       }
     else if (numberofcmps > 0)
       {
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
       OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_EQUAL);
       jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
       numberofcmps = 0;
@@ -5936,13 +7994,13 @@ while (*cc != XCL_END)
 
     if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))
       {
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
       OP_FLAGS(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
       numberofcmps++;
       }
     else if (numberofcmps > 0)
       {
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
       OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_LESS_EQUAL);
       jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
       numberofcmps = 0;
@@ -5953,7 +8011,7 @@ while (*cc != XCL_END)
       numberofcmps = 0;
       }
     }
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
   else
     {
     SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
@@ -5968,11 +8026,11 @@ while (*cc != XCL_END)
       break;
 
       case PT_LAMP:
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lu - typeoffset);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, ucp_Lu - typeoffset);
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Ll - typeoffset);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, ucp_Ll - typeoffset);
       OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lt - typeoffset);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, ucp_Lt - typeoffset);
       OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_EQUAL);
       jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
       break;
@@ -5988,6 +8046,9 @@ while (*cc != XCL_END)
       break;
 
       case PT_SC:
+      case PT_SCX:
+      case PT_BOOL:
+      case PT_BIDICL:
       compares++;
       /* Do nothing. */
       break;
@@ -5995,32 +8056,32 @@ while (*cc != XCL_END)
       case PT_SPACE:
       case PT_PXSPACE:
       SET_CHAR_OFFSET(9);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd - 0x9);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0xd - 0x9);
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
 
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x9);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x85 - 0x9);
       OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
 
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x180e - 0x9);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x180e - 0x9);
       OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
 
       SET_TYPE_OFFSET(ucp_Zl);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Zs - ucp_Zl);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, typereg, 0, SLJIT_IMM, ucp_Zs - ucp_Zl);
       OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_LESS_EQUAL);
       jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
       break;
 
       case PT_WORD:
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_UNDERSCORE - charoffset));
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_UNDERSCORE - charoffset));
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
       /* Fall through. */
 
       case PT_ALNUM:
       SET_TYPE_OFFSET(ucp_Ll);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, typereg, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
       OP_FLAGS((*cc == PT_ALNUM) ? SLJIT_MOV : SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
       SET_TYPE_OFFSET(ucp_Nd);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_No - ucp_Nd);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, typereg, 0, SLJIT_IMM, ucp_No - ucp_Nd);
       OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_LESS_EQUAL);
       jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
       break;
@@ -6043,7 +8104,7 @@ while (*cc != XCL_END)
           OP2(SLJIT_ADD, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)charoffset);
           OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
           }
-        OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, other_cases[1]);
+        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, other_cases[1]);
         OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
         other_cases += 2;
         }
@@ -6056,41 +8117,41 @@ while (*cc != XCL_END)
           OP2(SLJIT_ADD, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)charoffset);
           OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
           }
-        OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, other_cases[2]);
+        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, other_cases[2]);
         OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
 
-        OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(other_cases[0] - charoffset));
+        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(other_cases[0] - charoffset));
         OP_FLAGS(SLJIT_OR | ((other_cases[3] == NOTACHAR) ? SLJIT_SET_Z : 0), TMP2, 0, SLJIT_EQUAL);
 
         other_cases += 3;
         }
       else
         {
-        OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++ - charoffset));
+        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++ - charoffset));
         OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
         }
 
       while (*other_cases != NOTACHAR)
         {
-        OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++ - charoffset));
+        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++ - charoffset));
         OP_FLAGS(SLJIT_OR | ((*other_cases == NOTACHAR) ? SLJIT_SET_Z : 0), TMP2, 0, SLJIT_EQUAL);
         }
       jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
       break;
 
       case PT_UCNC:
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_DOLLAR_SIGN - charoffset));
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_DOLLAR_SIGN - charoffset));
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_COMMERCIAL_AT - charoffset));
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_COMMERCIAL_AT - charoffset));
       OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_GRAVE_ACCENT - charoffset));
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_GRAVE_ACCENT - charoffset));
       OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
 
       SET_CHAR_OFFSET(0xa0);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(0xd7ff - charoffset));
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw)(0xd7ff - charoffset));
       OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
       SET_CHAR_OFFSET(0);
-      OP2(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xe000 - 0);
+      OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xe000 - 0);
       OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_GREATER_EQUAL);
       jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
       break;
@@ -6098,20 +8159,20 @@ while (*cc != XCL_END)
       case PT_PXGRAPH:
       /* C and Z groups are the farthest two groups. */
       SET_TYPE_OFFSET(ucp_Ll);
-      OP2(SLJIT_SUB | SLJIT_SET_GREATER, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_So - ucp_Ll);
+      OP2U(SLJIT_SUB | SLJIT_SET_GREATER, typereg, 0, SLJIT_IMM, ucp_So - ucp_Ll);
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_GREATER);
 
       jump = CMP(SLJIT_NOT_EQUAL, typereg, 0, SLJIT_IMM, ucp_Cf - ucp_Ll);
 
       /* In case of ucp_Cf, we overwrite the result. */
       SET_CHAR_OFFSET(0x2066);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
 
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
       OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
 
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x180e - 0x2066);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x180e - 0x2066);
       OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
 
       JUMPHERE(jump);
@@ -6121,20 +8182,20 @@ while (*cc != XCL_END)
       case PT_PXPRINT:
       /* C and Z groups are the farthest two groups. */
       SET_TYPE_OFFSET(ucp_Ll);
-      OP2(SLJIT_SUB | SLJIT_SET_GREATER, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_So - ucp_Ll);
+      OP2U(SLJIT_SUB | SLJIT_SET_GREATER, typereg, 0, SLJIT_IMM, ucp_So - ucp_Ll);
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_GREATER);
 
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Zs - ucp_Ll);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, ucp_Zs - ucp_Ll);
       OP_FLAGS(SLJIT_AND, TMP2, 0, SLJIT_NOT_EQUAL);
 
       jump = CMP(SLJIT_NOT_EQUAL, typereg, 0, SLJIT_IMM, ucp_Cf - ucp_Ll);
 
       /* In case of ucp_Cf, we overwrite the result. */
       SET_CHAR_OFFSET(0x2066);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
 
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
       OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
 
       JUMPHERE(jump);
@@ -6143,15 +8204,15 @@ while (*cc != XCL_END)
 
       case PT_PXPUNCT:
       SET_TYPE_OFFSET(ucp_Sc);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_So - ucp_Sc);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, typereg, 0, SLJIT_IMM, ucp_So - ucp_Sc);
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
 
       SET_CHAR_OFFSET(0);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x7f);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x7f);
       OP_FLAGS(SLJIT_AND, TMP2, 0, SLJIT_LESS_EQUAL);
 
       SET_TYPE_OFFSET(ucp_Pc);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Ps - ucp_Pc);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, typereg, 0, SLJIT_IMM, ucp_Ps - ucp_Pc);
       OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_LESS_EQUAL);
       jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
       break;
@@ -6162,7 +8223,7 @@ while (*cc != XCL_END)
       }
     cc += 2;
     }
-#endif
+#endif /* SUPPORT_UNICODE */
 
   if (jump != NULL)
     add_jump(compiler, compares > 0 ? list : backtracks, jump);
@@ -6177,32 +8238,49 @@ if (found != NULL)
 
 #endif
 
-static pcre_uchar *compile_simple_assertion_matchingpath(compiler_common *common, pcre_uchar type, pcre_uchar *cc, jump_list **backtracks)
+static PCRE2_SPTR compile_simple_assertion_matchingpath(compiler_common *common, PCRE2_UCHAR type, PCRE2_SPTR cc, jump_list **backtracks)
 {
 DEFINE_COMPILER;
 int length;
 struct sljit_jump *jump[4];
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
 struct sljit_label *label;
-#endif /* SUPPORT_UTF */
+#endif /* SUPPORT_UNICODE */
 
 switch(type)
   {
   case OP_SOD:
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
+  if (HAS_VIRTUAL_REGISTERS)
+    {
+    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
+    }
+  else
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, begin));
   add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, TMP1, 0));
   return cc;
 
   case OP_SOM:
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
+  if (HAS_VIRTUAL_REGISTERS)
+    {
+    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
+    }
+  else
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, str));
   add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, TMP1, 0));
   return cc;
 
   case OP_NOT_WORD_BOUNDARY:
   case OP_WORD_BOUNDARY:
   add_jump(compiler, &common->wordboundary, JUMP(SLJIT_FAST_CALL));
+#ifdef SUPPORT_UNICODE
+  if (common->invalid_utf)
+    {
+    add_jump(compiler, backtracks, CMP((type == OP_NOT_WORD_BOUNDARY) ? SLJIT_NOT_EQUAL : SLJIT_SIG_LESS_EQUAL, TMP2, 0, SLJIT_IMM, 0));
+    return cc;
+    }
+#endif /* SUPPORT_UNICODE */
   sljit_set_current_flags(compiler, SLJIT_SET_Z);
   add_jump(compiler, backtracks, JUMP(type == OP_NOT_WORD_BOUNDARY ? SLJIT_NOT_ZERO : SLJIT_ZERO));
   return cc;
@@ -6214,14 +8292,14 @@ switch(type)
     {
     OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
     OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    if (common->mode == JIT_COMPILE)
+    if (common->mode == PCRE2_JIT_COMPLETE)
       add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, STR_END, 0));
     else
       {
       jump[1] = CMP(SLJIT_EQUAL, TMP2, 0, STR_END, 0);
-      OP2(SLJIT_SUB | SLJIT_SET_LESS, SLJIT_UNUSED, 0, TMP2, 0, STR_END, 0);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS, TMP2, 0, STR_END, 0);
       OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS);
-      OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff);
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff);
       OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_NOT_EQUAL);
       add_jump(compiler, backtracks, JUMP(SLJIT_NOT_EQUAL));
       check_partial(common, TRUE);
@@ -6244,7 +8322,7 @@ switch(type)
     OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
     jump[1] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
     OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-    OP2(SLJIT_SUB | SLJIT_SET_Z | SLJIT_SET_GREATER, SLJIT_UNUSED, 0, TMP2, 0, STR_END, 0);
+    OP2U(SLJIT_SUB | SLJIT_SET_Z | SLJIT_SET_GREATER, TMP2, 0, STR_END, 0);
     jump[2] = JUMP(SLJIT_GREATER);
     add_jump(compiler, backtracks, JUMP(SLJIT_NOT_EQUAL) /* LESS */);
     /* Equal. */
@@ -6261,30 +8339,37 @@ switch(type)
       }
     else
       {
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, STR_PTR, 0);
-      read_char_range(common, common->nlmin, common->nlmax, TRUE);
+      OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
+      read_char(common, common->nlmin, common->nlmax, backtracks, READ_CHAR_UPDATE_STR_PTR);
       add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, STR_END, 0));
       add_jump(compiler, &common->anynewline, JUMP(SLJIT_FAST_CALL));
       sljit_set_current_flags(compiler, SLJIT_SET_Z);
       add_jump(compiler, backtracks, JUMP(SLJIT_ZERO));
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
+      OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
       }
     JUMPHERE(jump[2]);
     JUMPHERE(jump[3]);
     }
   JUMPHERE(jump[0]);
-  check_partial(common, FALSE);
+  if (common->mode != PCRE2_JIT_COMPLETE)
+    check_partial(common, TRUE);
   return cc;
 
   case OP_EOD:
   add_jump(compiler, backtracks, CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0));
-  check_partial(common, FALSE);
+  if (common->mode != PCRE2_JIT_COMPLETE)
+    check_partial(common, TRUE);
   return cc;
 
   case OP_DOLL:
-  OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, noteol));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
+  if (HAS_VIRTUAL_REGISTERS)
+    {
+    OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
+    OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, options), SLJIT_IMM, PCRE2_NOTEOL);
+    }
+  else
+    OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, options), SLJIT_IMM, PCRE2_NOTEOL);
+  add_jump(compiler, backtracks, JUMP(SLJIT_NOT_ZERO));
 
   if (!common->endonly)
     compile_simple_assertion_matchingpath(common, OP_EODN, cc, backtracks);
@@ -6297,9 +8382,14 @@ switch(type)
 
   case OP_DOLLM:
   jump[1] = CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0);
-  OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, noteol));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
+  if (HAS_VIRTUAL_REGISTERS)
+    {
+    OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
+    OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, options), SLJIT_IMM, PCRE2_NOTEOL);
+    }
+  else
+    OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, options), SLJIT_IMM, PCRE2_NOTEOL);
+  add_jump(compiler, backtracks, JUMP(SLJIT_NOT_ZERO));
   check_partial(common, FALSE);
   jump[0] = JUMP(SLJIT_JUMP);
   JUMPHERE(jump[1]);
@@ -6308,7 +8398,7 @@ switch(type)
     {
     OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
     OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    if (common->mode == JIT_COMPILE)
+    if (common->mode == PCRE2_JIT_COMPLETE)
       add_jump(compiler, backtracks, CMP(SLJIT_GREATER, TMP2, 0, STR_END, 0));
     else
       {
@@ -6326,34 +8416,56 @@ switch(type)
     }
   else
     {
-    peek_char(common, common->nlmax);
+    peek_char(common, common->nlmax, TMP3, 0, NULL);
     check_newlinechar(common, common->nltype, backtracks, FALSE);
     }
   JUMPHERE(jump[0]);
   return cc;
 
   case OP_CIRC:
-  OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, begin));
-  add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, TMP1, 0));
-  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, notbol));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
+  if (HAS_VIRTUAL_REGISTERS)
+    {
+    OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, begin));
+    add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, TMP1, 0));
+    OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, options), SLJIT_IMM, PCRE2_NOTBOL);
+    add_jump(compiler, backtracks, JUMP(SLJIT_NOT_ZERO));
+    }
+  else
+    {
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, begin));
+    add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, TMP1, 0));
+    OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, options), SLJIT_IMM, PCRE2_NOTBOL);
+    add_jump(compiler, backtracks, JUMP(SLJIT_NOT_ZERO));
+    }
   return cc;
 
   case OP_CIRCM:
-  OP1(SLJIT_MOV, TMP2, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, begin));
-  jump[1] = CMP(SLJIT_GREATER, STR_PTR, 0, TMP1, 0);
-  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(jit_arguments, notbol));
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
+  /* TMP2 might be used by peek_char_back. */
+  if (HAS_VIRTUAL_REGISTERS)
+    {
+    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
+    jump[1] = CMP(SLJIT_GREATER, STR_PTR, 0, TMP2, 0);
+    OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, options), SLJIT_IMM, PCRE2_NOTBOL);
+    }
+  else
+    {
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, begin));
+    jump[1] = CMP(SLJIT_GREATER, STR_PTR, 0, TMP2, 0);
+    OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, options), SLJIT_IMM, PCRE2_NOTBOL);
+    }
+  add_jump(compiler, backtracks, JUMP(SLJIT_NOT_ZERO));
   jump[0] = JUMP(SLJIT_JUMP);
   JUMPHERE(jump[1]);
 
-  add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+  if (!common->alt_circumflex)
+    add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+
   if (common->nltype == NLTYPE_FIXED && common->newline > 255)
     {
-    OP2(SLJIT_SUB, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP2, 0, TMP1, 0));
+    OP2(SLJIT_SUB, TMP1, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
+    add_jump(compiler, backtracks, CMP(SLJIT_LESS, TMP1, 0, TMP2, 0));
     OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
     OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
     add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff));
@@ -6361,8 +8473,7 @@ switch(type)
     }
   else
     {
-    skip_char_back(common);
-    read_char_range(common, common->nlmin, common->nlmax, TRUE);
+    peek_char_back(common, common->nlmax, backtracks);
     check_newlinechar(common, common->nltype, backtracks, FALSE);
     }
   JUMPHERE(jump[0]);
@@ -6372,24 +8483,28 @@ switch(type)
   length = GET(cc, 0);
   if (length == 0)
     return cc + LINK_SIZE;
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-#ifdef SUPPORT_UTF
+  if (HAS_VIRTUAL_REGISTERS)
+    {
+    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
+    }
+  else
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, begin));
+#ifdef SUPPORT_UNICODE
   if (common->utf)
     {
-    OP1(SLJIT_MOV, TMP3, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, length);
+    OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, length);
     label = LABEL();
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP3, 0));
-    skip_char_back(common);
-    OP2(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
+    add_jump(compiler, backtracks, CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0));
+    move_back(common, backtracks, FALSE);
+    OP2(SLJIT_SUB | SLJIT_SET_Z, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
     JUMPTO(SLJIT_NOT_ZERO, label);
     }
   else
 #endif
     {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
     OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(length));
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS, STR_PTR, 0, TMP1, 0));
+    add_jump(compiler, backtracks, CMP(SLJIT_LESS, STR_PTR, 0, TMP2, 0));
     }
   check_start_used_ptr(common);
   return cc + LINK_SIZE;
@@ -6398,7 +8513,216 @@ SLJIT_UNREACHABLE();
 return cc;
 }
 
-static pcre_uchar *compile_char1_matchingpath(compiler_common *common, pcre_uchar type, pcre_uchar *cc, jump_list **backtracks, BOOL check_str_ptr)
+#ifdef SUPPORT_UNICODE
+
+#if PCRE2_CODE_UNIT_WIDTH != 32
+
+static PCRE2_SPTR SLJIT_FUNC do_extuni_utf(jit_arguments *args, PCRE2_SPTR cc)
+{
+PCRE2_SPTR start_subject = args->begin;
+PCRE2_SPTR end_subject = args->end;
+int lgb, rgb, ricount;
+PCRE2_SPTR prevcc, endcc, bptr;
+BOOL first = TRUE;
+uint32_t c;
+
+prevcc = cc;
+endcc = NULL;
+do
+  {
+  GETCHARINC(c, cc);
+  rgb = UCD_GRAPHBREAK(c);
+
+  if (first)
+    {
+    lgb = rgb;
+    endcc = cc;
+    first = FALSE;
+    continue;
+    }
+
+  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0)
+    break;
+
+  /* Not breaking between Regional Indicators is allowed only if there
+  are an even number of preceding RIs. */
+
+  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
+    {
+    ricount = 0;
+    bptr = prevcc;
+
+    /* bptr is pointing to the left-hand character */
+    while (bptr > start_subject)
+      {
+      bptr--;
+      BACKCHAR(bptr);
+      GETCHAR(c, bptr);
+
+      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator)
+        break;
+
+      ricount++;
+      }
+
+    if ((ricount & 1) != 0) break;  /* Grapheme break required */
+    }
+
+  /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this
+  allows any number of them before a following Extended_Pictographic. */
+
+  if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) ||
+       lgb != ucp_gbExtended_Pictographic)
+    lgb = rgb;
+
+  prevcc = endcc;
+  endcc = cc;
+  }
+while (cc < end_subject);
+
+return endcc;
+}
+
+#endif /* PCRE2_CODE_UNIT_WIDTH != 32 */
+
+static PCRE2_SPTR SLJIT_FUNC do_extuni_utf_invalid(jit_arguments *args, PCRE2_SPTR cc)
+{
+PCRE2_SPTR start_subject = args->begin;
+PCRE2_SPTR end_subject = args->end;
+int lgb, rgb, ricount;
+PCRE2_SPTR prevcc, endcc, bptr;
+BOOL first = TRUE;
+uint32_t c;
+
+prevcc = cc;
+endcc = NULL;
+do
+  {
+  GETCHARINC_INVALID(c, cc, end_subject, break);
+  rgb = UCD_GRAPHBREAK(c);
+
+  if (first)
+    {
+    lgb = rgb;
+    endcc = cc;
+    first = FALSE;
+    continue;
+    }
+
+  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0)
+    break;
+
+  /* Not breaking between Regional Indicators is allowed only if there
+  are an even number of preceding RIs. */
+
+  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
+    {
+    ricount = 0;
+    bptr = prevcc;
+
+    /* bptr is pointing to the left-hand character */
+    while (bptr > start_subject)
+      {
+      GETCHARBACK_INVALID(c, bptr, start_subject, break);
+
+      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator)
+        break;
+
+      ricount++;
+      }
+
+    if ((ricount & 1) != 0)
+      break;  /* Grapheme break required */
+    }
+
+  /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this
+  allows any number of them before a following Extended_Pictographic. */
+
+  if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) ||
+       lgb != ucp_gbExtended_Pictographic)
+    lgb = rgb;
+
+  prevcc = endcc;
+  endcc = cc;
+  }
+while (cc < end_subject);
+
+return endcc;
+}
+
+static PCRE2_SPTR SLJIT_FUNC do_extuni_no_utf(jit_arguments *args, PCRE2_SPTR cc)
+{
+PCRE2_SPTR start_subject = args->begin;
+PCRE2_SPTR end_subject = args->end;
+int lgb, rgb, ricount;
+PCRE2_SPTR bptr;
+uint32_t c;
+
+/* Patch by PH */
+/* GETCHARINC(c, cc); */
+c = *cc++;
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+if (c >= 0x110000)
+  return NULL;
+#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
+lgb = UCD_GRAPHBREAK(c);
+
+while (cc < end_subject)
+  {
+  c = *cc;
+#if PCRE2_CODE_UNIT_WIDTH == 32
+  if (c >= 0x110000)
+    break;
+#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
+  rgb = UCD_GRAPHBREAK(c);
+
+  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0)
+    break;
+
+  /* Not breaking between Regional Indicators is allowed only if there
+  are an even number of preceding RIs. */
+
+  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
+    {
+    ricount = 0;
+    bptr = cc - 1;
+
+    /* bptr is pointing to the left-hand character */
+    while (bptr > start_subject)
+      {
+      bptr--;
+      c = *bptr;
+#if PCRE2_CODE_UNIT_WIDTH == 32
+      if (c >= 0x110000)
+        break;
+#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
+
+      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator) break;
+
+      ricount++;
+      }
+
+    if ((ricount & 1) != 0)
+      break;  /* Grapheme break required */
+    }
+
+  /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this
+  allows any number of them before a following Extended_Pictographic. */
+
+  if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) ||
+       lgb != ucp_gbExtended_Pictographic)
+    lgb = rgb;
+
+  cc++;
+  }
+
+return cc;
+}
+
+#endif /* SUPPORT_UNICODE */
+
+static PCRE2_SPTR compile_char1_matchingpath(compiler_common *common, PCRE2_UCHAR type, PCRE2_SPTR cc, jump_list **backtracks, BOOL check_str_ptr)
 {
 DEFINE_COMPILER;
 int length;
@@ -6406,12 +8730,9 @@ unsigned int c, oc, bit;
 compare_context context;
 struct sljit_jump *jump[3];
 jump_list *end_list;
-#ifdef SUPPORT_UTF
-struct sljit_label *label;
-#ifdef SUPPORT_UCP
-pcre_uchar propdata[5];
-#endif
-#endif /* SUPPORT_UTF */
+#ifdef SUPPORT_UNICODE
+PCRE2_UCHAR propdata[5];
+#endif /* SUPPORT_UNICODE */
 
 switch(type)
   {
@@ -6420,14 +8741,14 @@ switch(type)
   /* Digits are usually 0-9, so it is worth to optimize them. */
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-  if (common->utf && is_char7_bitset((const sljit_u8 *)common->ctypes - cbit_length + cbit_digit, FALSE))
-    read_char7_type(common, type == OP_NOT_DIGIT);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+  if (common->utf && is_char7_bitset((const sljit_u8*)common->ctypes - cbit_length + cbit_digit, FALSE))
+    read_char7_type(common, backtracks, type == OP_NOT_DIGIT);
   else
 #endif
-    read_char8_type(common, type == OP_NOT_DIGIT);
+    read_char8_type(common, backtracks, type == OP_NOT_DIGIT);
     /* Flip the starting bit in the negative case. */
-  OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ctype_digit);
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, ctype_digit);
   add_jump(compiler, backtracks, JUMP(type == OP_DIGIT ? SLJIT_ZERO : SLJIT_NOT_ZERO));
   return cc;
 
@@ -6435,13 +8756,13 @@ switch(type)
   case OP_WHITESPACE:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-  if (common->utf && is_char7_bitset((const sljit_u8 *)common->ctypes - cbit_length + cbit_space, FALSE))
-    read_char7_type(common, type == OP_NOT_WHITESPACE);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+  if (common->utf && is_char7_bitset((const sljit_u8*)common->ctypes - cbit_length + cbit_space, FALSE))
+    read_char7_type(common, backtracks, type == OP_NOT_WHITESPACE);
   else
 #endif
-    read_char8_type(common, type == OP_NOT_WHITESPACE);
-  OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ctype_space);
+    read_char8_type(common, backtracks, type == OP_NOT_WHITESPACE);
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, ctype_space);
   add_jump(compiler, backtracks, JUMP(type == OP_WHITESPACE ? SLJIT_ZERO : SLJIT_NOT_ZERO));
   return cc;
 
@@ -6449,25 +8770,25 @@ switch(type)
   case OP_WORDCHAR:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-  if (common->utf && is_char7_bitset((const sljit_u8 *)common->ctypes - cbit_length + cbit_word, FALSE))
-    read_char7_type(common, type == OP_NOT_WORDCHAR);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+  if (common->utf && is_char7_bitset((const sljit_u8*)common->ctypes - cbit_length + cbit_word, FALSE))
+    read_char7_type(common, backtracks, type == OP_NOT_WORDCHAR);
   else
 #endif
-    read_char8_type(common, type == OP_NOT_WORDCHAR);
-  OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ctype_word);
+    read_char8_type(common, backtracks, type == OP_NOT_WORDCHAR);
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, ctype_word);
   add_jump(compiler, backtracks, JUMP(type == OP_WORDCHAR ? SLJIT_ZERO : SLJIT_NOT_ZERO));
   return cc;
 
   case OP_ANY:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
-  read_char_range(common, common->nlmin, common->nlmax, TRUE);
+  read_char(common, common->nlmin, common->nlmax, backtracks, READ_CHAR_UPDATE_STR_PTR);
   if (common->nltype == NLTYPE_FIXED && common->newline > 255)
     {
     jump[0] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff);
     end_list = NULL;
-    if (common->mode != JIT_PARTIAL_HARD_COMPILE)
+    if (common->mode != PCRE2_JIT_PARTIAL_HARD)
       add_jump(compiler, &end_list, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
     else
       check_str_end(common, &end_list);
@@ -6484,29 +8805,35 @@ switch(type)
   case OP_ALLANY:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
   if (common->utf)
     {
+    if (common->invalid_utf)
+      {
+      read_char(common, 0, READ_CHAR_MAX, backtracks, READ_CHAR_UPDATE_STR_PTR);
+      return cc;
+      }
+
+#if PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16
     OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
     OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-#if defined COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
     jump[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
     OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
     OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-#elif defined COMPILE_PCRE16
+#elif PCRE2_CODE_UNIT_WIDTH == 16
     jump[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
     OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
-    OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0xd800);
     OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_EQUAL);
     OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
     OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-#endif
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
     JUMPHERE(jump[0]);
-#endif /* COMPILE_PCRE[8|16] */
     return cc;
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16] */
     }
-#endif
+#endif /* SUPPORT_UNICODE */
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
   return cc;
 
@@ -6516,8 +8843,7 @@ switch(type)
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
   return cc;
 
-#ifdef SUPPORT_UTF
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
   case OP_NOTPROP:
   case OP_PROP:
   propdata[0] = XCL_HASPROP;
@@ -6529,17 +8855,16 @@ switch(type)
     detect_partial_match(common, backtracks);
   compile_xclass_matchingpath(common, propdata, backtracks);
   return cc + 2;
-#endif
 #endif
 
   case OP_ANYNL:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
-  read_char_range(common, common->bsr_nlmin, common->bsr_nlmax, FALSE);
+  read_char(common, common->bsr_nlmin, common->bsr_nlmax, NULL, 0);
   jump[0] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
   /* We don't need to handle soft partial matching case. */
   end_list = NULL;
-  if (common->mode != JIT_PARTIAL_HARD_COMPILE)
+  if (common->mode != PCRE2_JIT_PARTIAL_HARD)
     add_jump(compiler, &end_list, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
   else
     check_str_end(common, &end_list);
@@ -6558,7 +8883,12 @@ switch(type)
   case OP_HSPACE:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
-  read_char_range(common, 0x9, 0x3000, type == OP_NOT_HSPACE);
+
+  if (type == OP_NOT_HSPACE)
+    read_char(common, 0x9, 0x3000, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  else
+    read_char(common, 0x9, 0x3000, NULL, 0);
+
   add_jump(compiler, &common->hspace, JUMP(SLJIT_FAST_CALL));
   sljit_set_current_flags(compiler, SLJIT_SET_Z);
   add_jump(compiler, backtracks, JUMP(type == OP_NOT_HSPACE ? SLJIT_NOT_ZERO : SLJIT_ZERO));
@@ -6568,45 +8898,42 @@ switch(type)
   case OP_VSPACE:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
-  read_char_range(common, 0xa, 0x2029, type == OP_NOT_VSPACE);
+
+  if (type == OP_NOT_VSPACE)
+    read_char(common, 0xa, 0x2029, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  else
+    read_char(common, 0xa, 0x2029, NULL, 0);
+
   add_jump(compiler, &common->vspace, JUMP(SLJIT_FAST_CALL));
   sljit_set_current_flags(compiler, SLJIT_SET_Z);
   add_jump(compiler, backtracks, JUMP(type == OP_NOT_VSPACE ? SLJIT_NOT_ZERO : SLJIT_ZERO));
   return cc;
 
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
   case OP_EXTUNI:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
-  read_char(common);
-  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, gbprop));
-  /* Optimize register allocation: use a real register. */
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STACK_TOP, 0);
-  OP1(SLJIT_MOV_U8, STACK_TOP, 0, SLJIT_MEM2(TMP1, TMP2), 3);
 
-  label = LABEL();
-  jump[0] = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-  OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
-  read_char(common);
-  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, gbprop));
-  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM2(TMP1, TMP2), 3);
+  SLJIT_ASSERT(TMP1 == SLJIT_R0 && STR_PTR == SLJIT_R1);
+  OP1(SLJIT_MOV, SLJIT_R0, 0, ARGUMENTS, 0);
 
-  OP2(SLJIT_SHL, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 2);
-  OP1(SLJIT_MOV_U32, TMP1, 0, SLJIT_MEM1(STACK_TOP), (sljit_sw)PRIV(ucp_gbtable));
-  OP1(SLJIT_MOV, STACK_TOP, 0, TMP2, 0);
-  OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-  OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
-  JUMPTO(SLJIT_NOT_ZERO, label);
+#if PCRE2_CODE_UNIT_WIDTH != 32
+  sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM,
+    common->utf ? (common->invalid_utf ? SLJIT_FUNC_ADDR(do_extuni_utf_invalid) : SLJIT_FUNC_ADDR(do_extuni_utf)) : SLJIT_FUNC_ADDR(do_extuni_no_utf));
+  if (common->invalid_utf)
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0));
+#else
+  sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM,
+    common->invalid_utf ? SLJIT_FUNC_ADDR(do_extuni_utf_invalid) : SLJIT_FUNC_ADDR(do_extuni_no_utf));
+  if (!common->utf || common->invalid_utf)
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0));
+#endif
 
-  OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
-  JUMPHERE(jump[0]);
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_RETURN_REG, 0);
 
-  if (common->mode == JIT_PARTIAL_HARD_COMPILE)
+  if (common->mode == PCRE2_JIT_PARTIAL_HARD)
     {
-    jump[0] = CMP(SLJIT_LESS, STR_PTR, 0, STR_END, 0);
+    jump[0] = CMP(SLJIT_LESS, SLJIT_RETURN_REG, 0, STR_END, 0);
     /* Since we successfully read a char above, partial matching must occure. */
     check_partial(common, TRUE);
     JUMPHERE(jump[0]);
@@ -6617,14 +8944,18 @@ switch(type)
   case OP_CHAR:
   case OP_CHARI:
   length = 1;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
   if (common->utf && HAS_EXTRALEN(*cc)) length += GET_EXTRALEN(*cc);
 #endif
-  if (common->mode == JIT_COMPILE && check_str_ptr
-      && (type == OP_CHAR || !char_has_othercase(common, cc) || char_get_othercase_bit(common, cc) != 0))
+
+  if (check_str_ptr && common->mode != PCRE2_JIT_COMPLETE)
+    detect_partial_match(common, backtracks);
+
+  if (type == OP_CHAR || !char_has_othercase(common, cc) || char_get_othercase_bit(common, cc) != 0)
     {
     OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(length));
-    add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0));
+    if (length > 1 || (check_str_ptr && common->mode == PCRE2_JIT_COMPLETE))
+      add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0));
 
     context.length = IN_UCHARS(length);
     context.sourcereg = -1;
@@ -6634,9 +8965,7 @@ switch(type)
     return byte_sequence_compare(common, type == OP_CHARI, cc, &context, backtracks);
     }
 
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
   if (common->utf)
     {
     GETCHAR(c, cc);
@@ -6645,37 +8974,42 @@ switch(type)
 #endif
     c = *cc;
 
-  if (type == OP_CHAR || !char_has_othercase(common, cc))
-    {
-    read_char_range(common, c, c, FALSE);
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, c));
-    return cc + length;
-    }
+  SLJIT_ASSERT(type == OP_CHARI && char_has_othercase(common, cc));
+
+  if (check_str_ptr && common->mode == PCRE2_JIT_COMPLETE)
+    add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+
   oc = char_othercase(common, c);
-  read_char_range(common, c < oc ? c : oc, c > oc ? c : oc, FALSE);
-  bit = c ^ oc;
-  if (is_powerof2(bit))
+  read_char(common, c < oc ? c : oc, c > oc ? c : oc, NULL, 0);
+
+  SLJIT_ASSERT(!is_powerof2(c ^ oc));
+
+  if (sljit_has_cpu_feature(SLJIT_HAS_CMOV))
     {
-    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, bit);
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, c | bit));
-    return cc + length;
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, oc);
+    CMOV(SLJIT_EQUAL, TMP1, SLJIT_IMM, c);
+    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, c));
+    }
+  else
+    {
+    jump[0] = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c);
+    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, oc));
+    JUMPHERE(jump[0]);
     }
-  jump[0] = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c);
-  add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, oc));
-  JUMPHERE(jump[0]);
   return cc + length;
 
   case OP_NOT:
   case OP_NOTI:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
+
   length = 1;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
   if (common->utf)
     {
-#ifdef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
     c = *cc;
-    if (c < 128)
+    if (c < 128 && !common->invalid_utf)
       {
       OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
       if (type == OP_NOT || !char_has_othercase(common, cc))
@@ -6695,24 +9029,24 @@ switch(type)
       return cc + 1;
       }
     else
-#endif /* COMPILE_PCRE8 */
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
       {
       GETCHARLEN(c, cc, length);
       }
     }
   else
-#endif /* SUPPORT_UTF */
+#endif /* SUPPORT_UNICODE */
     c = *cc;
 
   if (type == OP_NOT || !char_has_othercase(common, cc))
     {
-    read_char_range(common, c, c, TRUE);
+    read_char(common, c, c, backtracks, READ_CHAR_UPDATE_STR_PTR);
     add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
     }
   else
     {
     oc = char_othercase(common, c);
-    read_char_range(common, c < oc ? c : oc, c > oc ? c : oc, TRUE);
+    read_char(common, c < oc ? c : oc, c > oc ? c : oc, backtracks, READ_CHAR_UPDATE_STR_PTR);
     bit = c ^ oc;
     if (is_powerof2(bit))
       {
@@ -6732,17 +9066,23 @@ switch(type)
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
 
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
   bit = (common->utf && is_char7_bitset((const sljit_u8 *)cc, type == OP_NCLASS)) ? 127 : 255;
-  read_char_range(common, 0, bit, type == OP_NCLASS);
+  if (type == OP_NCLASS)
+    read_char(common, 0, bit, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  else
+    read_char(common, 0, bit, NULL, 0);
 #else
-  read_char_range(common, 0, 255, type == OP_NCLASS);
+  if (type == OP_NCLASS)
+    read_char(common, 0, 255, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  else
+    read_char(common, 0, 255, NULL, 0);
 #endif
 
-  if (check_class_ranges(common, (const sljit_u8 *)cc, type == OP_NCLASS, FALSE, backtracks))
-    return cc + 32 / sizeof(pcre_uchar);
+  if (optimize_class(common, (const sljit_u8 *)cc, type == OP_NCLASS, FALSE, backtracks))
+    return cc + 32 / sizeof(PCRE2_UCHAR);
 
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
   jump[0] = NULL;
   if (common->utf)
     {
@@ -6753,29 +9093,29 @@ switch(type)
       jump[0] = NULL;
       }
     }
-#elif !defined COMPILE_PCRE8
+#elif PCRE2_CODE_UNIT_WIDTH != 8
   jump[0] = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
   if (type == OP_CLASS)
     {
     add_jump(compiler, backtracks, jump[0]);
     jump[0] = NULL;
     }
-#endif /* SUPPORT_UTF && COMPILE_PCRE8 */
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8 */
 
   OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
   OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
   OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
   OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-  OP2(SLJIT_AND | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP2, 0);
   add_jump(compiler, backtracks, JUMP(SLJIT_ZERO));
 
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
   if (jump[0] != NULL)
     JUMPHERE(jump[0]);
 #endif
-  return cc + 32 / sizeof(pcre_uchar);
+  return cc + 32 / sizeof(PCRE2_UCHAR);
 
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
   case OP_XCLASS:
   if (check_str_ptr)
     detect_partial_match(common, backtracks);
@@ -6787,12 +9127,12 @@ SLJIT_UNREACHABLE();
 return cc;
 }
 
-static SLJIT_INLINE pcre_uchar *compile_charn_matchingpath(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, jump_list **backtracks)
+static SLJIT_INLINE PCRE2_SPTR compile_charn_matchingpath(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend, jump_list **backtracks)
 {
 /* This function consumes at least one input character. */
 /* To decrease the number of length checks, we try to concatenate the fixed length character sequences. */
 DEFINE_COMPILER;
-pcre_uchar *ccbegin = cc;
+PCRE2_SPTR ccbegin = cc;
 compare_context context;
 int size;
 
@@ -6805,7 +9145,7 @@ do
   if (*cc == OP_CHAR)
     {
     size = 1;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf && HAS_EXTRALEN(cc[1]))
       size += GET_EXTRALEN(cc[1]);
 #endif
@@ -6813,7 +9153,7 @@ do
   else if (*cc == OP_CHARI)
     {
     size = 1;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (common->utf)
       {
       if (char_has_othercase(common, cc + 1) && char_get_othercase_bit(common, cc + 1) == 0)
@@ -6854,7 +9194,7 @@ return compile_char1_matchingpath(common, *cc, cc + 1, backtracks, TRUE);
 }
 
 /* Forward definitions. */
-static void compile_matchingpath(compiler_common *, pcre_uchar *, pcre_uchar *, backtrack_common *);
+static void compile_matchingpath(compiler_common *, PCRE2_SPTR, PCRE2_SPTR, backtrack_common *);
 static void compile_backtrackingpath(compiler_common *, struct backtrack_common *);
 
 #define PUSH_BACKTRACK(size, ccstart, error) \
@@ -6885,12 +9225,12 @@ static void compile_backtrackingpath(compiler_common *, struct backtrack_common
 
 #define BACKTRACK_AS(type) ((type *)backtrack)
 
-static void compile_dnref_search(compiler_common *common, pcre_uchar *cc, jump_list **backtracks)
+static void compile_dnref_search(compiler_common *common, PCRE2_SPTR cc, jump_list **backtracks)
 {
 /* The OVECTOR offset goes to TMP2. */
 DEFINE_COMPILER;
 int count = GET2(cc, 1 + IMM2_SIZE);
-pcre_uchar *slot = common->name_table + GET2(cc, 1) * common->name_entry_size;
+PCRE2_SPTR slot = common->name_table + GET2(cc, 1) * common->name_entry_size;
 unsigned int offset;
 jump_list *found = NULL;
 
@@ -6909,13 +9249,13 @@ while (count-- > 0)
 
 offset = GET2(slot, 0) << 1;
 GET_LOCAL_BASE(TMP2, 0, OVECTOR(offset));
-if (backtracks != NULL && !common->jscript_compat)
+if (backtracks != NULL && !common->unset_backref)
   add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset), TMP1, 0));
 
 set_jumps(found, LABEL());
 }
 
-static void compile_ref_matchingpath(compiler_common *common, pcre_uchar *cc, jump_list **backtracks, BOOL withchecks, BOOL emptyfail)
+static void compile_ref_matchingpath(compiler_common *common, PCRE2_SPTR cc, jump_list **backtracks, BOOL withchecks, BOOL emptyfail)
 {
 DEFINE_COMPILER;
 BOOL ref = (*cc == OP_REF || *cc == OP_REFI);
@@ -6923,55 +9263,119 @@ int offset = 0;
 struct sljit_jump *jump = NULL;
 struct sljit_jump *partial;
 struct sljit_jump *nopartial;
+#if defined SUPPORT_UNICODE
+struct sljit_label *loop;
+struct sljit_label *caseless_loop;
+jump_list *no_match = NULL;
+int source_reg = COUNT_MATCH;
+int source_end_reg = ARGUMENTS;
+int char1_reg = STACK_LIMIT;
+#endif /* SUPPORT_UNICODE */
 
 if (ref)
   {
   offset = GET2(cc, 1) << 1;
   OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset));
   /* OVECTOR(1) contains the "string begin - 1" constant. */
-  if (withchecks && !common->jscript_compat)
+  if (withchecks && !common->unset_backref)
     add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1)));
   }
 else
   OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), 0);
 
-#if defined SUPPORT_UTF && defined SUPPORT_UCP
+#if defined SUPPORT_UNICODE
 if (common->utf && *cc == OP_REFI)
   {
-  SLJIT_ASSERT(TMP1 == SLJIT_R0 && STACK_TOP == SLJIT_R1);
+  SLJIT_ASSERT(common->iref_ptr != 0);
+
   if (ref)
-    OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
   else
-    OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
 
-  if (withchecks)
-    jump = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_R2, 0);
+  if (withchecks && emptyfail)
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, TMP2, 0));
 
-  /* No free saved registers so save data on stack. */
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STACK_TOP, 0);
-  OP1(SLJIT_MOV, SLJIT_R1, 0, STR_PTR, 0);
-  OP1(SLJIT_MOV, SLJIT_R3, 0, STR_END, 0);
-  sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_RET(SW) | SLJIT_ARG1(SW) | SLJIT_ARG2(SW) | SLJIT_ARG3(SW) | SLJIT_ARG4(SW), SLJIT_IMM, SLJIT_FUNC_OFFSET(do_utf_caselesscmp));
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_RETURN_REG, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->iref_ptr, source_reg, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw), source_end_reg, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw) * 2, char1_reg, 0);
 
-  if (common->mode == JIT_COMPILE)
-    add_jump(compiler, backtracks, CMP(SLJIT_LESS_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 1));
-  else
+  OP1(SLJIT_MOV, source_reg, 0, TMP1, 0);
+  OP1(SLJIT_MOV, source_end_reg, 0, TMP2, 0);
+
+  loop = LABEL();
+  jump = CMP(SLJIT_GREATER_EQUAL, source_reg, 0, source_end_reg, 0);
+  partial = CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+
+  /* Read original character. It must be a valid UTF character. */
+  OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
+  OP1(SLJIT_MOV, STR_PTR, 0, source_reg, 0);
+
+  read_char(common, 0, READ_CHAR_MAX, NULL, READ_CHAR_UPDATE_STR_PTR | READ_CHAR_VALID_UTF);
+
+  OP1(SLJIT_MOV, source_reg, 0, STR_PTR, 0);
+  OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
+  OP1(SLJIT_MOV, char1_reg, 0, TMP1, 0);
+
+  /* Read second character. */
+  read_char(common, 0, READ_CHAR_MAX, &no_match, READ_CHAR_UPDATE_STR_PTR);
+
+  CMPTO(SLJIT_EQUAL, TMP1, 0, char1_reg, 0, loop);
+
+  OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
+
+  add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
+
+  OP2(SLJIT_SHL, TMP1, 0, TMP2, 0, SLJIT_IMM, 2);
+  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 3);
+  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP1, 0);
+
+  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records));
+
+  OP1(SLJIT_MOV_S32, TMP1, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(ucd_record, other_case));
+  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(ucd_record, caseset));
+  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP3, 0);
+  CMPTO(SLJIT_EQUAL, TMP1, 0, char1_reg, 0, loop);
+
+  add_jump(compiler, &no_match, CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
+  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 2);
+  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_caseless_sets));
+
+  caseless_loop = LABEL();
+  OP1(SLJIT_MOV_U32, TMP1, 0, SLJIT_MEM1(TMP2), 0);
+  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, sizeof(uint32_t));
+  OP2U(SLJIT_SUB | SLJIT_SET_Z | SLJIT_SET_LESS, TMP1, 0, char1_reg, 0);
+  JUMPTO(SLJIT_EQUAL, loop);
+  JUMPTO(SLJIT_LESS, caseless_loop);
+
+  set_jumps(no_match, LABEL());
+  if (common->mode == PCRE2_JIT_COMPLETE)
+    JUMPHERE(partial);
+
+  OP1(SLJIT_MOV, source_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr);
+  OP1(SLJIT_MOV, source_end_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw));
+  OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw) * 2);
+  add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
+
+  if (common->mode != PCRE2_JIT_COMPLETE)
     {
-    OP2(SLJIT_SUB | SLJIT_SET_Z | SLJIT_SET_LESS, SLJIT_UNUSED, 0, SLJIT_RETURN_REG, 0, SLJIT_IMM, 1);
+    JUMPHERE(partial);
+    OP1(SLJIT_MOV, source_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr);
+    OP1(SLJIT_MOV, source_end_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw));
+    OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw) * 2);
 
-    add_jump(compiler, backtracks, JUMP(SLJIT_LESS));
-
-    nopartial = JUMP(SLJIT_NOT_EQUAL);
-    OP1(SLJIT_MOV, STR_PTR, 0, STR_END, 0);
     check_partial(common, FALSE);
     add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-    JUMPHERE(nopartial);
     }
+
+  JUMPHERE(jump);
+  OP1(SLJIT_MOV, source_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr);
+  OP1(SLJIT_MOV, source_end_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw));
+  OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw) * 2);
+  return;
   }
 else
-#endif /* SUPPORT_UTF && SUPPORT_UCP */
+#endif /* SUPPORT_UNICODE */
   {
   if (ref)
     OP2(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), TMP1, 0);
@@ -6983,13 +9387,13 @@ else
 
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
   partial = CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0);
-  if (common->mode == JIT_COMPILE)
+  if (common->mode == PCRE2_JIT_COMPLETE)
     add_jump(compiler, backtracks, partial);
 
   add_jump(compiler, *cc == OP_REF ? &common->casefulcmp : &common->caselesscmp, JUMP(SLJIT_FAST_CALL));
   add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
 
-  if (common->mode != JIT_COMPILE)
+  if (common->mode != PCRE2_JIT_COMPLETE)
     {
     nopartial = JUMP(SLJIT_JUMP);
     JUMPHERE(partial);
@@ -7016,17 +9420,17 @@ if (jump != NULL)
   }
 }
 
-static SLJIT_INLINE pcre_uchar *compile_ref_iterator_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
+static SLJIT_INLINE PCRE2_SPTR compile_ref_iterator_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 BOOL ref = (*cc == OP_REF || *cc == OP_REFI);
 backtrack_common *backtrack;
-pcre_uchar type;
+PCRE2_UCHAR type;
 int offset = 0;
 struct sljit_label *label;
 struct sljit_jump *zerolength;
 struct sljit_jump *jump = NULL;
-pcre_uchar *ccbegin = cc;
+PCRE2_SPTR ccbegin = cc;
 int min = 0, max = 0;
 BOOL minimize;
 
@@ -7223,14 +9627,14 @@ count_match(common);
 return cc;
 }
 
-static SLJIT_INLINE pcre_uchar *compile_recurse_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
+static SLJIT_INLINE PCRE2_SPTR compile_recurse_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 backtrack_common *backtrack;
 recurse_entry *entry = common->entries;
 recurse_entry *prev = NULL;
 sljit_sw start = GET(cc, 1);
-pcre_uchar *start_cc;
+PCRE2_SPTR start_cc;
 BOOL needs_control_head;
 
 PUSH_BACKTRACK(sizeof(recurse_backtrack), cc, NULL);
@@ -7258,8 +9662,10 @@ if (entry == NULL)
   if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
     return NULL;
   entry->next = NULL;
-  entry->entry = NULL;
-  entry->calls = NULL;
+  entry->entry_label = NULL;
+  entry->backtrack_label = NULL;
+  entry->entry_calls = NULL;
+  entry->backtrack_calls = NULL;
   entry->start = start;
 
   if (prev != NULL)
@@ -7268,135 +9674,162 @@ if (entry == NULL)
     common->entries = entry;
   }
 
-if (common->has_set_som && common->mark_ptr != 0)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0));
-  allocate_stack(common, 2);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);
-  }
-else if (common->has_set_som || common->mark_ptr != 0)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->has_set_som ? (int)(OVECTOR(0)) : common->mark_ptr);
-  allocate_stack(common, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
-  }
+BACKTRACK_AS(recurse_backtrack)->entry = entry;
 
-if (entry->entry == NULL)
-  add_jump(compiler, &entry->calls, JUMP(SLJIT_FAST_CALL));
+if (entry->entry_label == NULL)
+  add_jump(compiler, &entry->entry_calls, JUMP(SLJIT_FAST_CALL));
 else
-  JUMPTO(SLJIT_FAST_CALL, entry->entry);
+  JUMPTO(SLJIT_FAST_CALL, entry->entry_label);
 /* Leave if the match is failed. */
 add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, 0));
+BACKTRACK_AS(recurse_backtrack)->matchingpath = LABEL();
 return cc + 1 + LINK_SIZE;
 }
 
-static sljit_s32 SLJIT_FUNC do_callout(struct jit_arguments *arguments, PUBL(callout_block) *callout_block, pcre_uchar **jit_ovector)
+static sljit_s32 SLJIT_FUNC do_callout(struct jit_arguments *arguments, pcre2_callout_block *callout_block, PCRE2_SPTR *jit_ovector)
 {
-const pcre_uchar *begin = arguments->begin;
-int *offset_vector = arguments->offsets;
-int offset_count = arguments->offset_count;
-int i;
+PCRE2_SPTR begin;
+PCRE2_SIZE *ovector;
+sljit_u32 oveccount, capture_top;
 
-if (PUBL(callout) == NULL)
+if (arguments->callout == NULL)
   return 0;
 
+SLJIT_COMPILE_ASSERT(sizeof (PCRE2_SIZE) <= sizeof (sljit_sw), pcre2_size_must_be_lower_than_sljit_sw_size);
+
+begin = arguments->begin;
+ovector = (PCRE2_SIZE*)(callout_block + 1);
+oveccount = callout_block->capture_top;
+
+SLJIT_ASSERT(oveccount >= 1);
+
 callout_block->version = 2;
-callout_block->callout_data = arguments->callout_data;
+callout_block->callout_flags = 0;
 
 /* Offsets in subject. */
 callout_block->subject_length = arguments->end - arguments->begin;
-callout_block->start_match = (pcre_uchar*)callout_block->subject - arguments->begin;
-callout_block->current_position = (pcre_uchar*)callout_block->offset_vector - arguments->begin;
-#if defined COMPILE_PCRE8
-callout_block->subject = (PCRE_SPTR)begin;
-#elif defined COMPILE_PCRE16
-callout_block->subject = (PCRE_SPTR16)begin;
-#elif defined COMPILE_PCRE32
-callout_block->subject = (PCRE_SPTR32)begin;
-#endif
+callout_block->start_match = jit_ovector[0] - begin;
+callout_block->current_position = (PCRE2_SPTR)callout_block->offset_vector - begin;
+callout_block->subject = begin;
 
-/* Convert and copy the JIT offset vector to the offset_vector array. */
-callout_block->capture_top = 0;
-callout_block->offset_vector = offset_vector;
-for (i = 2; i < offset_count; i += 2)
+/* Convert and copy the JIT offset vector to the ovector array. */
+callout_block->capture_top = 1;
+callout_block->offset_vector = ovector;
+
+ovector[0] = PCRE2_UNSET;
+ovector[1] = PCRE2_UNSET;
+ovector += 2;
+jit_ovector += 2;
+capture_top = 1;
+
+/* Convert pointers to sizes. */
+while (--oveccount != 0)
   {
-  offset_vector[i] = jit_ovector[i] - begin;
-  offset_vector[i + 1] = jit_ovector[i + 1] - begin;
-  if (jit_ovector[i] >= begin)
-    callout_block->capture_top = i;
+  capture_top++;
+
+  ovector[0] = (PCRE2_SIZE)(jit_ovector[0] - begin);
+  ovector[1] = (PCRE2_SIZE)(jit_ovector[1] - begin);
+
+  if (ovector[0] != PCRE2_UNSET)
+    callout_block->capture_top = capture_top;
+
+  ovector += 2;
+  jit_ovector += 2;
   }
 
-callout_block->capture_top = (callout_block->capture_top >> 1) + 1;
-if (offset_count > 0)
-  offset_vector[0] = -1;
-if (offset_count > 1)
-  offset_vector[1] = -1;
-return (*PUBL(callout))(callout_block);
+return (arguments->callout)(callout_block, arguments->callout_data);
 }
 
-/* Aligning to 8 byte. */
-#define CALLOUT_ARG_SIZE \
-    (((int)sizeof(PUBL(callout_block)) + 7) & ~7)
-
 #define CALLOUT_ARG_OFFSET(arg) \
-    SLJIT_OFFSETOF(PUBL(callout_block), arg)
+    SLJIT_OFFSETOF(pcre2_callout_block, arg)
 
-static SLJIT_INLINE pcre_uchar *compile_callout_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
+static SLJIT_INLINE PCRE2_SPTR compile_callout_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 backtrack_common *backtrack;
+sljit_s32 mov_opcode;
+unsigned int callout_length = (*cc == OP_CALLOUT)
+    ? PRIV(OP_lengths)[OP_CALLOUT] : GET(cc, 1 + 2 * LINK_SIZE);
+sljit_sw value1;
+sljit_sw value2;
+sljit_sw value3;
+sljit_uw callout_arg_size = (common->re->top_bracket + 1) * 2 * sizeof(sljit_sw);
 
 PUSH_BACKTRACK(sizeof(backtrack_common), cc, NULL);
 
-allocate_stack(common, CALLOUT_ARG_SIZE / sizeof(sljit_sw));
+callout_arg_size = (sizeof(pcre2_callout_block) + callout_arg_size + sizeof(sljit_sw) - 1) / sizeof(sljit_sw);
+
+allocate_stack(common, callout_arg_size);
 
 SLJIT_ASSERT(common->capture_last_ptr != 0);
 OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr);
 OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV_S32, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(callout_number), SLJIT_IMM, cc[1]);
-OP1(SLJIT_MOV_S32, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(capture_last), TMP2, 0);
+value1 = (*cc == OP_CALLOUT) ? cc[1 + 2 * LINK_SIZE] : 0;
+OP1(SLJIT_MOV_U32, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(callout_number), SLJIT_IMM, value1);
+OP1(SLJIT_MOV_U32, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(capture_last), TMP2, 0);
+OP1(SLJIT_MOV_U32, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(capture_top), SLJIT_IMM, common->re->top_bracket + 1);
 
 /* These pointer sized fields temporarly stores internal variables. */
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0));
 OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(offset_vector), STR_PTR, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(subject), TMP2, 0);
 
 if (common->mark_ptr != 0)
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, mark_ptr));
-OP1(SLJIT_MOV_S32, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(pattern_position), SLJIT_IMM, GET(cc, 2));
-OP1(SLJIT_MOV_S32, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(next_item_length), SLJIT_IMM, GET(cc, 2 + LINK_SIZE));
+mov_opcode = (sizeof(PCRE2_SIZE) == 4) ? SLJIT_MOV_U32 : SLJIT_MOV;
+OP1(mov_opcode, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(pattern_position), SLJIT_IMM, GET(cc, 1));
+OP1(mov_opcode, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(next_item_length), SLJIT_IMM, GET(cc, 1 + LINK_SIZE));
+
+if (*cc == OP_CALLOUT)
+  {
+  value1 = 0;
+  value2 = 0;
+  value3 = 0;
+  }
+else
+  {
+  value1 = (sljit_sw) (cc + (1 + 4*LINK_SIZE) + 1);
+  value2 = (callout_length - (1 + 4*LINK_SIZE + 2));
+  value3 = (sljit_sw) (GET(cc, 1 + 3*LINK_SIZE));
+  }
+
+OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(callout_string), SLJIT_IMM, value1);
+OP1(mov_opcode, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(callout_string_length), SLJIT_IMM, value2);
+OP1(mov_opcode, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(callout_string_offset), SLJIT_IMM, value3);
 OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(mark), (common->mark_ptr != 0) ? TMP2 : SLJIT_IMM, 0);
 
+SLJIT_ASSERT(TMP1 == SLJIT_R0 && STR_PTR == SLJIT_R1);
+
 /* Needed to save important temporary registers. */
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STACK_TOP, 0);
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STR_PTR, 0);
 /* SLJIT_R0 = arguments */
 OP1(SLJIT_MOV, SLJIT_R1, 0, STACK_TOP, 0);
 GET_LOCAL_BASE(SLJIT_R2, 0, OVECTOR_START);
-sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_RET(S32) | SLJIT_ARG1(SW) | SLJIT_ARG2(SW) | SLJIT_ARG3(SW), SLJIT_IMM, SLJIT_FUNC_OFFSET(do_callout));
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-free_stack(common, CALLOUT_ARG_SIZE / sizeof(sljit_sw));
+sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS3(32, W, W, W), SLJIT_IMM, SLJIT_FUNC_ADDR(do_callout));
+OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+free_stack(common, callout_arg_size);
 
 /* Check return value. */
-OP2(SLJIT_SUB32 | SLJIT_SET_Z | SLJIT_SET_SIG_GREATER, SLJIT_UNUSED, 0, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0);
-add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_SIG_GREATER32));
-if (common->forced_quit_label == NULL)
-  add_jump(compiler, &common->forced_quit, JUMP(SLJIT_NOT_EQUAL32) /* SIG_LESS */);
+OP2U(SLJIT_SUB32 | SLJIT_SET_Z | SLJIT_SET_SIG_GREATER, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0);
+add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_SIG_GREATER));
+if (common->abort_label == NULL)
+  add_jump(compiler, &common->abort, JUMP(SLJIT_NOT_EQUAL) /* SIG_LESS */);
 else
-  JUMPTO(SLJIT_NOT_EQUAL32 /* SIG_LESS */, common->forced_quit_label);
-return cc + 2 + 2 * LINK_SIZE;
+  JUMPTO(SLJIT_NOT_EQUAL /* SIG_LESS */, common->abort_label);
+return cc + callout_length;
 }
 
 #undef CALLOUT_ARG_SIZE
 #undef CALLOUT_ARG_OFFSET
 
-static SLJIT_INLINE BOOL assert_needs_str_ptr_saving(pcre_uchar *cc)
+static SLJIT_INLINE BOOL assert_needs_str_ptr_saving(PCRE2_SPTR cc)
 {
 while (TRUE)
   {
   switch (*cc)
     {
+    case OP_CALLOUT_STR:
+    cc += GET(cc, 1 + 2*LINK_SIZE);
+    break;
+
     case OP_NOT_WORD_BOUNDARY:
     case OP_WORD_BOUNDARY:
     case OP_CIRC:
@@ -7417,28 +9850,29 @@ while (TRUE)
   }
 }
 
-static pcre_uchar *compile_assert_matchingpath(compiler_common *common, pcre_uchar *cc, assert_backtrack *backtrack, BOOL conditional)
+static PCRE2_SPTR compile_assert_matchingpath(compiler_common *common, PCRE2_SPTR cc, assert_backtrack *backtrack, BOOL conditional)
 {
 DEFINE_COMPILER;
 int framesize;
 int extrasize;
+BOOL local_quit_available = FALSE;
 BOOL needs_control_head;
 int private_data_ptr;
 backtrack_common altbacktrack;
-pcre_uchar *ccbegin;
-pcre_uchar opcode;
-pcre_uchar bra = OP_BRA;
+PCRE2_SPTR ccbegin;
+PCRE2_UCHAR opcode;
+PCRE2_UCHAR bra = OP_BRA;
 jump_list *tmp = NULL;
 jump_list **target = (conditional) ? &backtrack->condfailed : &backtrack->common.topbacktracks;
 jump_list **found;
 /* Saving previous accept variables. */
-BOOL save_local_exit = common->local_exit;
-BOOL save_positive_assert = common->positive_assert;
+BOOL save_local_quit_available = common->local_quit_available;
+BOOL save_in_positive_assertion = common->in_positive_assertion;
 then_trap_backtrack *save_then_trap = common->then_trap;
 struct sljit_label *save_quit_label = common->quit_label;
 struct sljit_label *save_accept_label = common->accept_label;
 jump_list *save_quit = common->quit;
-jump_list *save_positive_assert_quit = common->positive_assert_quit;
+jump_list *save_positive_assertion_quit = common->positive_assertion_quit;
 jump_list *save_accept = common->accept;
 struct sljit_jump *jump;
 struct sljit_jump *brajump = NULL;
@@ -7520,21 +9954,21 @@ else
   else
     OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);
 
-  init_frame(common, ccbegin, NULL, framesize + extrasize - 1, extrasize, FALSE);
+  init_frame(common, ccbegin, NULL, framesize + extrasize - 1, extrasize);
   }
 
 memset(&altbacktrack, 0, sizeof(backtrack_common));
-if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
+if (conditional || (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT))
   {
-  /* Negative assert is stronger than positive assert. */
-  common->local_exit = TRUE;
+  /* Control verbs cannot escape from these asserts. */
+  local_quit_available = TRUE;
+  common->local_quit_available = TRUE;
   common->quit_label = NULL;
   common->quit = NULL;
-  common->positive_assert = FALSE;
   }
-else
-  common->positive_assert = TRUE;
-common->positive_assert_quit = NULL;
+
+common->in_positive_assertion = (opcode == OP_ASSERT || opcode == OP_ASSERTBACK);
+common->positive_assertion_quit = NULL;
 
 while (1)
   {
@@ -7550,16 +9984,16 @@ while (1)
   compile_matchingpath(common, ccbegin + 1 + LINK_SIZE, cc, &altbacktrack);
   if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
     {
-    if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
+    if (local_quit_available)
       {
-      common->local_exit = save_local_exit;
+      common->local_quit_available = save_local_quit_available;
       common->quit_label = save_quit_label;
       common->quit = save_quit;
       }
-    common->positive_assert = save_positive_assert;
+    common->in_positive_assertion = save_in_positive_assertion;
     common->then_trap = save_then_trap;
     common->accept_label = save_accept_label;
-    common->positive_assert_quit = save_positive_assert_quit;
+    common->positive_assertion_quit = save_positive_assertion_quit;
     common->accept = save_accept;
     return NULL;
     }
@@ -7593,6 +10027,7 @@ while (1)
       if (needs_control_head)
         OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), STACK(-framesize - 2));
       add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
+      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize - 1) * sizeof(sljit_sw));
       }
     }
 
@@ -7628,16 +10063,16 @@ while (1)
   compile_backtrackingpath(common, altbacktrack.top);
   if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
     {
-    if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
+    if (local_quit_available)
       {
-      common->local_exit = save_local_exit;
+      common->local_quit_available = save_local_quit_available;
       common->quit_label = save_quit_label;
       common->quit = save_quit;
       }
-    common->positive_assert = save_positive_assert;
+    common->in_positive_assertion = save_in_positive_assertion;
     common->then_trap = save_then_trap;
     common->accept_label = save_accept_label;
-    common->positive_assert_quit = save_positive_assert_quit;
+    common->positive_assertion_quit = save_positive_assertion_quit;
     common->accept = save_accept;
     return NULL;
     }
@@ -7650,18 +10085,18 @@ while (1)
   cc += GET(cc, 1);
   }
 
-if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
+if (local_quit_available)
   {
-  SLJIT_ASSERT(common->positive_assert_quit == NULL);
+  SLJIT_ASSERT(common->positive_assertion_quit == NULL);
   /* Makes the check less complicated below. */
-  common->positive_assert_quit = common->quit;
+  common->positive_assertion_quit = common->quit;
   }
 
 /* None of them matched. */
-if (common->positive_assert_quit != NULL)
+if (common->positive_assertion_quit != NULL)
   {
   jump = JUMP(SLJIT_JUMP);
-  set_jumps(common->positive_assert_quit, LABEL());
+  set_jumps(common->positive_assertion_quit, LABEL());
   SLJIT_ASSERT(framesize != no_stack);
   if (framesize < 0)
     OP2(SLJIT_SUB, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_IMM, extrasize * sizeof(sljit_sw));
@@ -7669,7 +10104,7 @@ if (common->positive_assert_quit != NULL)
     {
     OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
     add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-    OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + extrasize) * sizeof(sljit_sw));
+    OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (extrasize + 1) * sizeof(sljit_sw));
     }
   JUMPHERE(jump);
   }
@@ -7753,7 +10188,8 @@ if (opcode == OP_ASSERT || opcode == OP_ASSERTBACK)
         }
       else
         {
-        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), 0);
+        SLJIT_ASSERT(extrasize == 3);
+        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(-1));
         OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), bra == OP_BRAZERO ? STR_PTR : SLJIT_IMM, 0);
         }
       }
@@ -7772,7 +10208,9 @@ if (opcode == OP_ASSERT || opcode == OP_ASSERTBACK)
       {
       OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
       add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_MEM1(STACK_TOP), STACK(-framesize - 1));
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(-2));
+      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize - 1) * sizeof(sljit_sw));
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP1, 0);
       }
     set_jumps(backtrack->common.topbacktracks, LABEL());
     }
@@ -7825,21 +10263,21 @@ else
     }
   }
 
-if (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT)
+if (local_quit_available)
   {
-  common->local_exit = save_local_exit;
+  common->local_quit_available = save_local_quit_available;
   common->quit_label = save_quit_label;
   common->quit = save_quit;
   }
-common->positive_assert = save_positive_assert;
+common->in_positive_assertion = save_in_positive_assertion;
 common->then_trap = save_then_trap;
 common->accept_label = save_accept_label;
-common->positive_assert_quit = save_positive_assert_quit;
+common->positive_assertion_quit = save_positive_assertion_quit;
 common->accept = save_accept;
 return cc + 1 + LINK_SIZE;
 }
 
-static SLJIT_INLINE void match_once_common(compiler_common *common, pcre_uchar ket, int framesize, int private_data_ptr, BOOL has_alternatives, BOOL needs_control_head)
+static SLJIT_INLINE void match_once_common(compiler_common *common, PCRE2_UCHAR ket, int framesize, int private_data_ptr, BOOL has_alternatives, BOOL needs_control_head)
 {
 DEFINE_COMPILER;
 int stacksize;
@@ -7912,6 +10350,42 @@ if (common->optimized_cbracket[offset >> 1] == 0)
 return stacksize;
 }
 
+static PCRE2_SPTR SLJIT_FUNC do_script_run(PCRE2_SPTR ptr, PCRE2_SPTR endptr)
+{
+  if (PRIV(script_run)(ptr, endptr, FALSE))
+    return endptr;
+  return NULL;
+}
+
+#ifdef SUPPORT_UNICODE
+
+static PCRE2_SPTR SLJIT_FUNC do_script_run_utf(PCRE2_SPTR ptr, PCRE2_SPTR endptr)
+{
+  if (PRIV(script_run)(ptr, endptr, TRUE))
+    return endptr;
+  return NULL;
+}
+
+#endif /* SUPPORT_UNICODE */
+
+static SLJIT_INLINE void match_script_run_common(compiler_common *common, int private_data_ptr, backtrack_common *parent)
+{
+DEFINE_COMPILER;
+
+SLJIT_ASSERT(TMP1 == SLJIT_R0 && STR_PTR == SLJIT_R1);
+
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+#ifdef SUPPORT_UNICODE
+sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM,
+  common->utf ? SLJIT_FUNC_ADDR(do_script_run_utf) : SLJIT_FUNC_ADDR(do_script_run));
+#else
+sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM, SLJIT_FUNC_ADDR(do_script_run));
+#endif
+
+OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_RETURN_REG, 0);
+add_jump(compiler, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks, CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0));
+}
+
 /*
   Handling bracketed expressions is probably the most complex part.
 
@@ -7962,25 +10436,24 @@ return stacksize;
   (|)     OP_*BRA    | OP_ALT ...         M A
   (?()|)  OP_*COND   | OP_ALT             M A
   (?>|)   OP_ONCE    | OP_ALT ...         [stack trace] M A
-  (?>|)   OP_ONCE_NC | OP_ALT ...         [stack trace] M A
                                           Or nothing, if trace is unnecessary
 */
 
-static pcre_uchar *compile_bracket_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
+static PCRE2_SPTR compile_bracket_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 backtrack_common *backtrack;
-pcre_uchar opcode;
+PCRE2_UCHAR opcode;
 int private_data_ptr = 0;
 int offset = 0;
 int i, stacksize;
 int repeat_ptr = 0, repeat_length = 0;
 int repeat_type = 0, repeat_count = 0;
-pcre_uchar *ccbegin;
-pcre_uchar *matchingpath;
-pcre_uchar *slot;
-pcre_uchar bra = OP_BRA;
-pcre_uchar ket;
+PCRE2_SPTR ccbegin;
+PCRE2_SPTR matchingpath;
+PCRE2_SPTR slot;
+PCRE2_UCHAR bra = OP_BRA;
+PCRE2_UCHAR ket;
 assert_backtrack *assert;
 BOOL has_alternatives;
 BOOL needs_control_head = FALSE;
@@ -8015,13 +10488,6 @@ if (ket == OP_KET && PRIVATE_DATA(matchingpath) != 0)
     ket = OP_KETRMIN;
   }
 
-if ((opcode == OP_COND || opcode == OP_SCOND) && cc[1 + LINK_SIZE] == OP_DEF)
-  {
-  /* Drop this bracket_backtrack. */
-  parent->top = backtrack->prev;
-  return matchingpath + 1 + LINK_SIZE + repeat_length;
-  }
-
 matchingpath = ccbegin + 1 + LINK_SIZE;
 SLJIT_ASSERT(ket == OP_KET || ket == OP_KETRMAX || ket == OP_KETRMIN);
 SLJIT_ASSERT(!((bra == OP_BRAZERO && ket == OP_KETRMIN) || (bra == OP_BRAMINZERO && ket == OP_KETRMAX)));
@@ -8029,12 +10495,14 @@ cc += GET(cc, 1);
 
 has_alternatives = *cc == OP_ALT;
 if (SLJIT_UNLIKELY(opcode == OP_COND || opcode == OP_SCOND))
-  has_alternatives = (*matchingpath == OP_RREF || *matchingpath == OP_DNRREF || *matchingpath == OP_FAIL) ? FALSE : TRUE;
+  {
+  SLJIT_COMPILE_ASSERT(OP_DNRREF == OP_RREF + 1 && OP_FALSE == OP_RREF + 2 && OP_TRUE == OP_RREF + 3,
+    compile_time_checks_must_be_grouped_together);
+  has_alternatives = ((*matchingpath >= OP_RREF && *matchingpath <= OP_TRUE) || *matchingpath == OP_FAIL) ? FALSE : TRUE;
+  }
 
 if (SLJIT_UNLIKELY(opcode == OP_COND) && (*cc == OP_KETRMAX || *cc == OP_KETRMIN))
   opcode = OP_SCOND;
-if (SLJIT_UNLIKELY(opcode == OP_ONCE_NC))
-  opcode = OP_ONCE;
 
 if (opcode == OP_CBRA || opcode == OP_SCBRA)
   {
@@ -8053,7 +10521,7 @@ if (opcode == OP_CBRA || opcode == OP_SCBRA)
   BACKTRACK_AS(bracket_backtrack)->private_data_ptr = private_data_ptr;
   matchingpath += IMM2_SIZE;
   }
-else if (opcode == OP_ONCE || opcode == OP_SBRA || opcode == OP_SCOND)
+else if (opcode == OP_ASSERT_NA || opcode == OP_ASSERTBACK_NA || opcode == OP_ONCE || opcode == OP_SCRIPT_RUN || opcode == OP_SBRA || opcode == OP_SCOND)
   {
   /* Other brackets simply allocate the next entry. */
   private_data_ptr = PRIVATE_DATA(ccbegin);
@@ -8092,35 +10560,32 @@ if (bra == OP_BRAMINZERO)
     free_stack(common, 1);
     braminzero = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
     }
-  else
+  else if (opcode == OP_ONCE || opcode >= OP_SBRA)
     {
-    if (opcode == OP_ONCE || opcode >= OP_SBRA)
+    jump = CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
+    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
+    /* Nothing stored during the first run. */
+    skip = JUMP(SLJIT_JUMP);
+    JUMPHERE(jump);
+    /* Checking zero-length iteration. */
+    if (opcode != OP_ONCE || BACKTRACK_AS(bracket_backtrack)->u.framesize < 0)
       {
-      jump = CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-      /* Nothing stored during the first run. */
-      skip = JUMP(SLJIT_JUMP);
-      JUMPHERE(jump);
-      /* Checking zero-length iteration. */
-      if (opcode != OP_ONCE || BACKTRACK_AS(bracket_backtrack)->u.framesize < 0)
-        {
-        /* When we come from outside, private_data_ptr contains the previous STR_PTR. */
-        braminzero = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-        }
-      else
-        {
-        /* Except when the whole stack frame must be saved. */
-        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-        braminzero = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_MEM1(TMP1), STACK(-BACKTRACK_AS(bracket_backtrack)->u.framesize - 2));
-        }
-      JUMPHERE(skip);
+      /* When we come from outside, private_data_ptr contains the previous STR_PTR. */
+      braminzero = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
       }
     else
       {
-      jump = CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
-      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-      JUMPHERE(jump);
+      /* Except when the whole stack frame must be saved. */
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+      braminzero = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_MEM1(TMP1), STACK(-BACKTRACK_AS(bracket_backtrack)->u.framesize - 2));
       }
+    JUMPHERE(skip);
+    }
+  else
+    {
+    jump = CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
+    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
+    JUMPHERE(jump);
     }
   }
 
@@ -8137,7 +10602,7 @@ if (ket == OP_KETRMIN)
 if (ket == OP_KETRMAX)
   {
   rmax_label = LABEL();
-  if (has_alternatives && opcode != OP_ONCE && opcode < OP_SBRA && repeat_type == 0)
+  if (has_alternatives && opcode >= OP_BRA && opcode < OP_SBRA && repeat_type == 0)
     BACKTRACK_AS(bracket_backtrack)->alternative_matchingpath = rmax_label;
   }
 
@@ -8217,7 +10682,7 @@ if (opcode == OP_ONCE)
       OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP2, 0);
       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), TMP1, 0);
       }
-    init_frame(common, ccbegin, NULL, BACKTRACK_AS(bracket_backtrack)->u.framesize + stacksize, stacksize + 1, FALSE);
+    init_frame(common, ccbegin, NULL, BACKTRACK_AS(bracket_backtrack)->u.framesize + stacksize, stacksize + 1);
     }
   }
 else if (opcode == OP_CBRA || opcode == OP_SCBRA)
@@ -8241,7 +10706,7 @@ else if (opcode == OP_CBRA || opcode == OP_SCBRA)
     OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
     }
   }
-else if (opcode == OP_SBRA || opcode == OP_SCOND)
+else if (opcode == OP_ASSERT_NA || opcode == OP_ASSERTBACK_NA || opcode == OP_SCRIPT_RUN || opcode == OP_SBRA || opcode == OP_SCOND)
   {
   /* Saving the previous value. */
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
@@ -8287,13 +10752,18 @@ if (opcode == OP_COND || opcode == OP_SCOND)
     add_jump(compiler, &(BACKTRACK_AS(bracket_backtrack)->u.condfailed), JUMP(SLJIT_ZERO));
     matchingpath += 1 + 2 * IMM2_SIZE;
     }
-  else if (*matchingpath == OP_RREF || *matchingpath == OP_DNRREF || *matchingpath == OP_FAIL)
+  else if ((*matchingpath >= OP_RREF && *matchingpath <= OP_TRUE) || *matchingpath == OP_FAIL)
     {
     /* Never has other case. */
     BACKTRACK_AS(bracket_backtrack)->u.condfailed = NULL;
     SLJIT_ASSERT(!has_alternatives);
 
-    if (*matchingpath == OP_FAIL)
+    if (*matchingpath == OP_TRUE)
+      {
+      stacksize = 1;
+      matchingpath++;
+      }
+    else if (*matchingpath == OP_FALSE || *matchingpath == OP_FAIL)
       stacksize = 0;
     else if (*matchingpath == OP_RREF)
       {
@@ -8362,9 +10832,15 @@ compile_matchingpath(common, matchingpath, cc, backtrack);
 if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
   return NULL;
 
+if (opcode == OP_ASSERT_NA || opcode == OP_ASSERTBACK_NA)
+  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+
 if (opcode == OP_ONCE)
   match_once_common(common, ket, BACKTRACK_AS(bracket_backtrack)->u.framesize, private_data_ptr, has_alternatives, needs_control_head);
 
+if (opcode == OP_SCRIPT_RUN)
+  match_script_run_common(common, private_data_ptr, backtrack);
+
 stacksize = 0;
 if (repeat_type == OP_MINUPTO)
   {
@@ -8407,10 +10883,23 @@ if (ket != OP_KET || bra != OP_BRA)
 if (offset != 0)
   stacksize = match_capture_common(common, stacksize, offset, private_data_ptr);
 
+/* Skip and count the other alternatives. */
+i = 1;
+while (*cc == OP_ALT)
+  {
+  cc += GET(cc, 1);
+  i++;
+  }
+
 if (has_alternatives)
   {
   if (opcode != OP_ONCE)
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, 0);
+    {
+    if (i <= 3)
+      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, 0);
+    else
+      BACKTRACK_AS(bracket_backtrack)->u.matching_put_label = sljit_emit_put_label(compiler, SLJIT_MEM1(STACK_TOP), STACK(stacksize));
+    }
   if (ket != OP_KETRMAX)
     BACKTRACK_AS(bracket_backtrack)->alternative_matchingpath = LABEL();
   }
@@ -8434,13 +10923,15 @@ if (ket == OP_KETRMAX)
     if (opcode != OP_ONCE)
       free_stack(common, 1);
     }
-  else if (opcode == OP_ONCE || opcode >= OP_SBRA)
+  else if (opcode < OP_BRA || opcode >= OP_SBRA)
     {
     if (has_alternatives)
       BACKTRACK_AS(bracket_backtrack)->alternative_matchingpath = LABEL();
+
     /* Checking zero-length iteration. */
     if (opcode != OP_ONCE)
       {
+      /* This case includes opcodes such as OP_SCRIPT_RUN. */
       CMPTO(SLJIT_NOT_EQUAL, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STR_PTR, 0, rmax_label);
       /* Drop STR_PTR for greedy plus quantifier. */
       if (bra != OP_BRAZERO)
@@ -8486,6 +10977,7 @@ if (bra == OP_BRAMINZERO)
       {
       OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
       add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
+      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (BACKTRACK_AS(bracket_backtrack)->u.framesize - 1) * sizeof(sljit_sw));
       }
     else if (ket == OP_KETRMIN && opcode != OP_ONCE)
       free_stack(common, 1);
@@ -8496,9 +10988,6 @@ if (bra == OP_BRAMINZERO)
 if ((ket != OP_KET && bra != OP_BRAMINZERO) || bra == OP_BRAZERO)
   count_match(common);
 
-/* Skip the other alternatives. */
-while (*cc == OP_ALT)
-  cc += GET(cc, 1);
 cc += 1 + LINK_SIZE;
 
 if (opcode == OP_ONCE)
@@ -8506,16 +10995,16 @@ if (opcode == OP_ONCE)
   /* We temporarily encode the needs_control_head in the lowest bit.
      Note: on the target architectures of SLJIT the ((x << 1) >> 1) returns
      the same value for small signed numbers (including negative numbers). */
-  BACKTRACK_AS(bracket_backtrack)->u.framesize = ((unsigned int)BACKTRACK_AS(bracket_backtrack)->u.framesize << 1) | (needs_control_head ? 1 : 0);
+  BACKTRACK_AS(bracket_backtrack)->u.framesize = (int)((unsigned)BACKTRACK_AS(bracket_backtrack)->u.framesize << 1) | (needs_control_head ? 1 : 0);
   }
 return cc + repeat_length;
 }
 
-static pcre_uchar *compile_bracketpos_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
+static PCRE2_SPTR compile_bracketpos_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 backtrack_common *backtrack;
-pcre_uchar opcode;
+PCRE2_UCHAR opcode;
 int private_data_ptr;
 int cbraprivptr = 0;
 BOOL needs_control_head;
@@ -8523,7 +11012,7 @@ int framesize;
 int stacksize;
 int offset = 0;
 BOOL zero = FALSE;
-pcre_uchar *ccbegin = NULL;
+PCRE2_SPTR ccbegin = NULL;
 int stack; /* Also contains the offset of control head. */
 struct sljit_label *loop = NULL;
 struct jump_list *emptymatch = NULL;
@@ -8655,7 +11144,7 @@ else
     stack++;
     }
   OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stack), TMP1, 0);
-  init_frame(common, cc, NULL, stacksize - 1, stacksize - framesize, FALSE);
+  init_frame(common, cc, NULL, stacksize - 1, stacksize - framesize);
   stack -= 1 + (offset == 0);
   }
 
@@ -8794,7 +11283,7 @@ count_match(common);
 return cc + 1 + LINK_SIZE;
 }
 
-static SLJIT_INLINE pcre_uchar *get_iterator_parameters(compiler_common *common, pcre_uchar *cc, pcre_uchar *opcode, pcre_uchar *type, sljit_u32 *max, sljit_u32 *exact, pcre_uchar **end)
+static SLJIT_INLINE PCRE2_SPTR get_iterator_parameters(compiler_common *common, PCRE2_SPTR cc, PCRE2_UCHAR *opcode, PCRE2_UCHAR *type, sljit_u32 *max, sljit_u32 *exact, PCRE2_SPTR *end)
 {
 int class_len;
 
@@ -8835,7 +11324,7 @@ else
   SLJIT_ASSERT(*opcode == OP_CLASS || *opcode == OP_NCLASS || *opcode == OP_XCLASS);
   *type = *opcode;
   cc++;
-  class_len = (*type < OP_XCLASS) ? (int)(1 + (32 / sizeof(pcre_uchar))) : GET(cc, 0);
+  class_len = (*type < OP_XCLASS) ? (int)(1 + (32 / sizeof(PCRE2_UCHAR))) : GET(cc, 0);
   *opcode = cc[class_len - 1];
 
   if (*opcode >= OP_CRSTAR && *opcode <= OP_CRMINQUERY)
@@ -8933,25 +11422,25 @@ if (*type == OP_END)
   }
 
 *end = cc + 1;
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
 if (common->utf && HAS_EXTRALEN(*cc)) *end += GET_EXTRALEN(*cc);
 #endif
 return cc;
 }
 
-static pcre_uchar *compile_iterator_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
+static PCRE2_SPTR compile_iterator_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 backtrack_common *backtrack;
-pcre_uchar opcode;
-pcre_uchar type;
+PCRE2_UCHAR opcode;
+PCRE2_UCHAR type;
 sljit_u32 max = 0, exact;
-BOOL fast_fail;
-sljit_s32 fast_str_ptr;
+sljit_s32 early_fail_ptr = PRIVATE_DATA(cc + 1);
+sljit_s32 early_fail_type;
 BOOL charpos_enabled;
-pcre_uchar charpos_char;
+PCRE2_UCHAR charpos_char;
 unsigned int charpos_othercasebit;
-pcre_uchar *end;
+PCRE2_SPTR end;
 jump_list *no_match = NULL;
 jump_list *no_char1_match = NULL;
 struct sljit_jump *jump = NULL;
@@ -8961,21 +11450,27 @@ int base = (private_data_ptr == 0) ? SLJIT_MEM1(STACK_TOP) : SLJIT_MEM1(SLJIT_SP
 int offset0 = (private_data_ptr == 0) ? STACK(0) : private_data_ptr;
 int offset1 = (private_data_ptr == 0) ? STACK(1) : private_data_ptr + (int)sizeof(sljit_sw);
 int tmp_base, tmp_offset;
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+BOOL use_tmp;
+#endif
 
 PUSH_BACKTRACK(sizeof(char_iterator_backtrack), cc, NULL);
 
-fast_str_ptr = PRIVATE_DATA(cc + 1);
-fast_fail = TRUE;
+early_fail_type = (early_fail_ptr & 0x7);
+early_fail_ptr >>= 3;
 
-SLJIT_ASSERT(common->fast_forward_bc_ptr == NULL || fast_str_ptr == 0 || cc == common->fast_forward_bc_ptr);
+/* During recursion, these optimizations are disabled. */
+if (common->early_fail_start_ptr == 0 && common->fast_forward_bc_ptr == NULL)
+  {
+  early_fail_ptr = 0;
+  early_fail_type = type_skip;
+  }
 
-if (cc == common->fast_forward_bc_ptr)
-  fast_fail = FALSE;
-else if (common->fast_fail_start_ptr == 0)
-  fast_str_ptr = 0;
+SLJIT_ASSERT(common->fast_forward_bc_ptr != NULL || early_fail_ptr == 0
+  || (early_fail_ptr >= common->early_fail_start_ptr && early_fail_ptr <= common->early_fail_end_ptr));
 
-SLJIT_ASSERT(common->fast_forward_bc_ptr != NULL || fast_str_ptr == 0
-  || (fast_str_ptr >= common->fast_fail_start_ptr && fast_str_ptr <= common->fast_fail_end_ptr));
+if (early_fail_type == type_fail)
+  add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr));
 
 cc = get_iterator_parameters(common, cc, &opcode, &type, &max, &exact, &end);
 
@@ -8990,15 +11485,13 @@ else
   tmp_offset = POSSESSIVE0;
   }
 
-if (fast_fail && fast_str_ptr != 0)
-  add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), fast_str_ptr));
-
 /* Handle fixed part first. */
 if (exact > 1)
   {
-  SLJIT_ASSERT(fast_str_ptr == 0);
-  if (common->mode == JIT_COMPILE
-#ifdef SUPPORT_UTF
+  SLJIT_ASSERT(early_fail_ptr == 0);
+
+  if (common->mode == PCRE2_JIT_COMPLETE
+#ifdef SUPPORT_UNICODE
       && !common->utf
 #endif
       && type != OP_ANYNL && type != OP_EXTUNI)
@@ -9021,18 +11514,31 @@ if (exact > 1)
     }
   }
 else if (exact == 1)
+  {
   compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, TRUE);
 
+  if (early_fail_type == type_fail_range)
+    {
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr);
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw));
+    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, TMP2, 0);
+    OP2(SLJIT_SUB, TMP2, 0, STR_PTR, 0, TMP2, 0);
+    add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_LESS_EQUAL, TMP2, 0, TMP1, 0));
+
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw), STR_PTR, 0);
+    }
+  }
+
 switch(opcode)
   {
   case OP_STAR:
   case OP_UPTO:
-  SLJIT_ASSERT(fast_str_ptr == 0 || opcode == OP_STAR);
+  SLJIT_ASSERT(early_fail_ptr == 0 || opcode == OP_STAR);
 
   if (type == OP_ANYNL || type == OP_EXTUNI)
     {
     SLJIT_ASSERT(private_data_ptr == 0);
-    SLJIT_ASSERT(fast_str_ptr == 0);
+    SLJIT_ASSERT(early_fail_ptr == 0);
 
     allocate_stack(common, 2);
     OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
@@ -9051,180 +11557,231 @@ switch(opcode)
       OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0, TMP1, 0);
       }
 
-    /* We cannot use TMP3 because of this allocate_stack. */
+    /* We cannot use TMP3 because of allocate_stack. */
     allocate_stack(common, 1);
     OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
     JUMPTO(SLJIT_JUMP, label);
     if (jump != NULL)
       JUMPHERE(jump);
+    BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
+    break;
     }
-  else
+#ifdef SUPPORT_UNICODE
+  else if (type == OP_ALLANY && !common->invalid_utf)
+#else
+  else if (type == OP_ALLANY)
+#endif
     {
-    charpos_enabled = FALSE;
-    charpos_char = 0;
-    charpos_othercasebit = 0;
-
-    if ((type != OP_CHAR && type != OP_CHARI) && (*end == OP_CHAR || *end == OP_CHARI))
+    if (opcode == OP_STAR)
       {
-      charpos_enabled = TRUE;
-#ifdef SUPPORT_UTF
-      charpos_enabled = !common->utf || !HAS_EXTRALEN(end[1]);
+      if (private_data_ptr == 0)
+        allocate_stack(common, 2);
+
+      OP1(SLJIT_MOV, base, offset0, STR_END, 0);
+      OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
+
+      OP1(SLJIT_MOV, STR_PTR, 0, STR_END, 0);
+      process_partial_match(common);
+
+      if (early_fail_ptr != 0)
+        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_END, 0);
+      BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
+      break;
+      }
+#ifdef SUPPORT_UNICODE
+    else if (!common->utf)
+#else
+    else
 #endif
-      if (charpos_enabled && *end == OP_CHARI && char_has_othercase(common, end + 1))
+      {
+      if (private_data_ptr == 0)
+        allocate_stack(common, 2);
+
+      OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(max));
+
+      if (common->mode == PCRE2_JIT_COMPLETE)
         {
-        charpos_othercasebit = char_get_othercase_bit(common, end + 1);
-        if (charpos_othercasebit == 0)
-          charpos_enabled = FALSE;
+        OP2U(SLJIT_SUB | SLJIT_SET_GREATER, STR_PTR, 0, STR_END, 0);
+        CMOV(SLJIT_GREATER, STR_PTR, STR_END, 0);
+        }
+      else
+        {
+        jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, STR_END, 0);
+        process_partial_match(common);
+        JUMPHERE(jump);
         }
 
-      if (charpos_enabled)
-        {
-        charpos_char = end[1];
-        /* Consumpe the OP_CHAR opcode. */
-        end += 2;
-#if defined COMPILE_PCRE8
-        SLJIT_ASSERT((charpos_othercasebit >> 8) == 0);
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-        SLJIT_ASSERT((charpos_othercasebit >> 9) == 0);
-        if ((charpos_othercasebit & 0x100) != 0)
-          charpos_othercasebit = (charpos_othercasebit & 0xff) << 8;
-#endif
-        if (charpos_othercasebit != 0)
-          charpos_char |= charpos_othercasebit;
+      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
 
-        BACKTRACK_AS(char_iterator_backtrack)->u.charpos.enabled = TRUE;
-        BACKTRACK_AS(char_iterator_backtrack)->u.charpos.chr = charpos_char;
-        BACKTRACK_AS(char_iterator_backtrack)->u.charpos.othercasebit = charpos_othercasebit;
-        }
+      if (early_fail_ptr != 0)
+        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
+      BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
+      break;
+      }
+    }
+
+  charpos_enabled = FALSE;
+  charpos_char = 0;
+  charpos_othercasebit = 0;
+
+  if ((type != OP_CHAR && type != OP_CHARI) && (*end == OP_CHAR || *end == OP_CHARI))
+    {
+#ifdef SUPPORT_UNICODE
+    charpos_enabled = !common->utf || !HAS_EXTRALEN(end[1]);
+#else
+    charpos_enabled = TRUE;
+#endif
+    if (charpos_enabled && *end == OP_CHARI && char_has_othercase(common, end + 1))
+      {
+      charpos_othercasebit = char_get_othercase_bit(common, end + 1);
+      if (charpos_othercasebit == 0)
+        charpos_enabled = FALSE;
       }
 
     if (charpos_enabled)
       {
-      if (opcode == OP_UPTO)
-        OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max + 1);
-
-      /* Search the first instance of charpos_char. */
-      jump = JUMP(SLJIT_JUMP);
-      label = LABEL();
-      if (opcode == OP_UPTO)
-        {
-        OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-        add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_ZERO));
-        }
-      compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, FALSE);
-      if (fast_str_ptr != 0)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), fast_str_ptr, STR_PTR, 0);
-      JUMPHERE(jump);
-
-      detect_partial_match(common, &backtrack->topbacktracks);
-      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-      if (charpos_othercasebit != 0)
-        OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, charpos_othercasebit);
-      CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char, label);
-
-      if (private_data_ptr == 0)
-        allocate_stack(common, 2);
-      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-      OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
-      if (opcode == OP_UPTO)
-        {
-        OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-        add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
-        }
-
-      /* Search the last instance of charpos_char. */
-      label = LABEL();
-      compile_char1_matchingpath(common, type, cc, &no_match, FALSE);
-      if (fast_str_ptr != 0)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), fast_str_ptr, STR_PTR, 0);
-      detect_partial_match(common, &no_match);
-      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-      if (charpos_othercasebit != 0)
-        OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, charpos_othercasebit);
-      if (opcode == OP_STAR)
-        {
-        CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char, label);
-        OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-        }
-      else
-        {
-        jump = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char);
-        OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-        JUMPHERE(jump);
-        }
-
-      if (opcode == OP_UPTO)
-        {
-        OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-        JUMPTO(SLJIT_NOT_ZERO, label);
-        }
-      else
-        JUMPTO(SLJIT_JUMP, label);
-
-      set_jumps(no_match, LABEL());
-      OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-      }
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    else if (common->utf)
-      {
-      if (private_data_ptr == 0)
-        allocate_stack(common, 2);
-
-      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-      OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
-
-      if (opcode == OP_UPTO)
-        OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max);
-
-      label = LABEL();
-      compile_char1_matchingpath(common, type, cc, &no_match, TRUE);
-      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-
-      if (opcode == OP_UPTO)
-        {
-        OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-        JUMPTO(SLJIT_NOT_ZERO, label);
-        }
-      else
-        JUMPTO(SLJIT_JUMP, label);
-
-      set_jumps(no_match, LABEL());
-      OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-      if (fast_str_ptr != 0)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), fast_str_ptr, STR_PTR, 0);
-      }
+      charpos_char = end[1];
+      /* Consume the OP_CHAR opcode. */
+      end += 2;
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      SLJIT_ASSERT((charpos_othercasebit >> 8) == 0);
+#elif PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+      SLJIT_ASSERT((charpos_othercasebit >> 9) == 0);
+      if ((charpos_othercasebit & 0x100) != 0)
+        charpos_othercasebit = (charpos_othercasebit & 0xff) << 8;
 #endif
+      if (charpos_othercasebit != 0)
+        charpos_char |= charpos_othercasebit;
+
+      BACKTRACK_AS(char_iterator_backtrack)->u.charpos.enabled = TRUE;
+      BACKTRACK_AS(char_iterator_backtrack)->u.charpos.chr = charpos_char;
+      BACKTRACK_AS(char_iterator_backtrack)->u.charpos.othercasebit = charpos_othercasebit;
+      }
+    }
+
+  if (charpos_enabled)
+    {
+    if (opcode == OP_UPTO)
+      OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max + 1);
+
+    /* Search the first instance of charpos_char. */
+    jump = JUMP(SLJIT_JUMP);
+    label = LABEL();
+    if (opcode == OP_UPTO)
+      {
+      OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
+      add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_ZERO));
+      }
+    compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, FALSE);
+    if (early_fail_ptr != 0)
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
+    JUMPHERE(jump);
+
+    detect_partial_match(common, &backtrack->topbacktracks);
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+    if (charpos_othercasebit != 0)
+      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, charpos_othercasebit);
+    CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char, label);
+
+    if (private_data_ptr == 0)
+      allocate_stack(common, 2);
+    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+    OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
+
+    if (opcode == OP_UPTO)
+      {
+      OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
+      add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
+      }
+
+    /* Search the last instance of charpos_char. */
+    label = LABEL();
+    compile_char1_matchingpath(common, type, cc, &no_match, FALSE);
+    if (early_fail_ptr != 0)
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
+    detect_partial_match(common, &no_match);
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+    if (charpos_othercasebit != 0)
+      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, charpos_othercasebit);
+
+    if (opcode == OP_STAR)
+      {
+      CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char, label);
+      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+      JUMPTO(SLJIT_JUMP, label);
+      }
     else
       {
-      if (private_data_ptr == 0)
-        allocate_stack(common, 2);
+      jump = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char);
+      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+      JUMPHERE(jump);
+      OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
+      JUMPTO(SLJIT_NOT_ZERO, label);
+      }
 
-      OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
-      if (opcode == OP_UPTO)
-        OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max);
+    set_jumps(no_match, LABEL());
+    OP2(SLJIT_ADD, STR_PTR, 0, base, offset0, SLJIT_IMM, IN_UCHARS(1));
+    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+    }
+  else
+    {
+    if (private_data_ptr == 0)
+      allocate_stack(common, 2);
 
-      label = LABEL();
-      detect_partial_match(common, &no_match);
-      compile_char1_matchingpath(common, type, cc, &no_char1_match, FALSE);
-      if (opcode == OP_UPTO)
+    OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+    use_tmp = (!HAS_VIRTUAL_REGISTERS && opcode == OP_STAR);
+    SLJIT_ASSERT(!use_tmp || tmp_base == TMP3);
+
+    if (common->utf)
+      OP1(SLJIT_MOV, use_tmp ? TMP3 : base, use_tmp ? 0 : offset0, STR_PTR, 0);
+#endif
+    if (opcode == OP_UPTO)
+      OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max);
+
+    detect_partial_match(common, &no_match);
+    label = LABEL();
+    compile_char1_matchingpath(common, type, cc, &no_char1_match, FALSE);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+    if (common->utf)
+      OP1(SLJIT_MOV, use_tmp ? TMP3 : base, use_tmp ? 0 : offset0, STR_PTR, 0);
+#endif
+
+    if (opcode == OP_UPTO)
+      {
+      OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
+      add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
+      }
+
+    detect_partial_match_to(common, label);
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
+    set_jumps(no_char1_match, LABEL());
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+    if (common->utf)
+      {
+      set_jumps(no_match, LABEL());
+      if (use_tmp)
         {
-        OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-        JUMPTO(SLJIT_NOT_ZERO, label);
-        OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+        OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
+        OP1(SLJIT_MOV, base, offset0, TMP3, 0);
         }
       else
-        JUMPTO(SLJIT_JUMP, label);
-
-      set_jumps(no_char1_match, LABEL());
+        OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
+      }
+    else
+#endif
+      {
       OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
       set_jumps(no_match, LABEL());
       OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-      if (fast_str_ptr != 0)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), fast_str_ptr, STR_PTR, 0);
       }
+
+    if (early_fail_ptr != 0)
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
     }
+
   BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
   break;
 
@@ -9233,12 +11790,12 @@ switch(opcode)
     allocate_stack(common, 1);
   OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
   BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
-  if (fast_str_ptr != 0)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), fast_str_ptr, STR_PTR, 0);
+  if (early_fail_ptr != 0)
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
   break;
 
   case OP_MINUPTO:
-  SLJIT_ASSERT(fast_str_ptr == 0);
+  SLJIT_ASSERT(early_fail_ptr == 0);
   if (private_data_ptr == 0)
     allocate_stack(common, 2);
   OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
@@ -9248,7 +11805,7 @@ switch(opcode)
 
   case OP_QUERY:
   case OP_MINQUERY:
-  SLJIT_ASSERT(fast_str_ptr == 0);
+  SLJIT_ASSERT(early_fail_ptr == 0);
   if (private_data_ptr == 0)
     allocate_stack(common, 1);
   OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
@@ -9261,63 +11818,112 @@ switch(opcode)
   break;
 
   case OP_POSSTAR:
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE
+  if (type == OP_ALLANY && !common->invalid_utf)
+#else
+  if (type == OP_ALLANY)
+#endif
+    {
+    OP1(SLJIT_MOV, STR_PTR, 0, STR_END, 0);
+    process_partial_match(common);
+    if (early_fail_ptr != 0)
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_END, 0);
+    break;
+    }
+
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
   if (common->utf)
     {
     OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
+    detect_partial_match(common, &no_match);
     label = LABEL();
-    compile_char1_matchingpath(common, type, cc, &no_match, TRUE);
+    compile_char1_matchingpath(common, type, cc, &no_match, FALSE);
     OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
-    JUMPTO(SLJIT_JUMP, label);
+    detect_partial_match_to(common, label);
+
     set_jumps(no_match, LABEL());
     OP1(SLJIT_MOV, STR_PTR, 0, tmp_base, tmp_offset);
-    if (fast_str_ptr != 0)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), fast_str_ptr, STR_PTR, 0);
+    if (early_fail_ptr != 0)
+      {
+      if (!HAS_VIRTUAL_REGISTERS && tmp_base == TMP3)
+        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, TMP3, 0);
+      else
+        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
+      }
     break;
     }
 #endif
-  label = LABEL();
+
   detect_partial_match(common, &no_match);
+  label = LABEL();
   compile_char1_matchingpath(common, type, cc, &no_char1_match, FALSE);
-  JUMPTO(SLJIT_JUMP, label);
+  detect_partial_match_to(common, label);
+  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
   set_jumps(no_char1_match, LABEL());
   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
   set_jumps(no_match, LABEL());
-  if (fast_str_ptr != 0)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), fast_str_ptr, STR_PTR, 0);
+  if (early_fail_ptr != 0)
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
   break;
 
   case OP_POSUPTO:
-  SLJIT_ASSERT(fast_str_ptr == 0);
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+  SLJIT_ASSERT(early_fail_ptr == 0);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
   if (common->utf)
     {
     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, STR_PTR, 0);
     OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max);
+
+    detect_partial_match(common, &no_match);
     label = LABEL();
-    compile_char1_matchingpath(common, type, cc, &no_match, TRUE);
+    compile_char1_matchingpath(common, type, cc, &no_match, FALSE);
     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, STR_PTR, 0);
     OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-    JUMPTO(SLJIT_NOT_ZERO, label);
+    add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
+    detect_partial_match_to(common, label);
+
     set_jumps(no_match, LABEL());
     OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1);
     break;
     }
 #endif
+
+  if (type == OP_ALLANY)
+    {
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(max));
+
+    if (common->mode == PCRE2_JIT_COMPLETE)
+      {
+      OP2U(SLJIT_SUB | SLJIT_SET_GREATER, STR_PTR, 0, STR_END, 0);
+      CMOV(SLJIT_GREATER, STR_PTR, STR_END, 0);
+      }
+    else
+      {
+      jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, STR_END, 0);
+      process_partial_match(common);
+      JUMPHERE(jump);
+      }
+    break;
+    }
+
   OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max);
-  label = LABEL();
+
   detect_partial_match(common, &no_match);
+  label = LABEL();
   compile_char1_matchingpath(common, type, cc, &no_char1_match, FALSE);
   OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-  JUMPTO(SLJIT_NOT_ZERO, label);
+  add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
+  detect_partial_match_to(common, label);
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
   set_jumps(no_char1_match, LABEL());
   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
   set_jumps(no_match, LABEL());
   break;
 
   case OP_POSQUERY:
-  SLJIT_ASSERT(fast_str_ptr == 0);
+  SLJIT_ASSERT(early_fail_ptr == 0);
   OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
   compile_char1_matchingpath(common, type, cc, &no_match, TRUE);
   OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
@@ -9334,7 +11940,7 @@ count_match(common);
 return end;
 }
 
-static SLJIT_INLINE pcre_uchar *compile_fail_accept_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
+static SLJIT_INLINE PCRE2_SPTR compile_fail_accept_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 backtrack_common *backtrack;
@@ -9347,6 +11953,9 @@ if (*cc == OP_FAIL)
   return cc + 1;
   }
 
+if (*cc == OP_ACCEPT && common->currententry == NULL && (common->re->overall_options & PCRE2_ENDANCHORED) != 0)
+  add_jump(compiler, &common->reset_match, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, STR_END, 0));
+
 if (*cc == OP_ASSERT_ACCEPT || common->currententry != NULL || !common->might_be_empty)
   {
   /* No need to check notempty conditions. */
@@ -9361,15 +11970,24 @@ if (common->accept_label == NULL)
   add_jump(compiler, &common->accept, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0)));
 else
   CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0), common->accept_label);
-OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty));
-add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
-OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty_atstart));
-if (common->accept_label == NULL)
-  add_jump(compiler, &common->accept, CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
+
+if (HAS_VIRTUAL_REGISTERS)
+  {
+  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+  OP1(SLJIT_MOV_U32, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, options));
+  }
 else
-  CMPTO(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0, common->accept_label);
-OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
+  OP1(SLJIT_MOV_U32, TMP2, 0, SLJIT_MEM1(ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, options));
+
+OP2U(SLJIT_AND | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, PCRE2_NOTEMPTY);
+add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_NOT_ZERO));
+OP2U(SLJIT_AND | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, PCRE2_NOTEMPTY_ATSTART);
+if (common->accept_label == NULL)
+  add_jump(compiler, &common->accept, JUMP(SLJIT_ZERO));
+else
+  JUMPTO(SLJIT_ZERO, common->accept_label);
+
+OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(HAS_VIRTUAL_REGISTERS ? TMP1 : ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, str));
 if (common->accept_label == NULL)
   add_jump(compiler, &common->accept, CMP(SLJIT_NOT_EQUAL, TMP2, 0, STR_PTR, 0));
 else
@@ -9378,7 +11996,7 @@ add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_JUMP));
 return cc + 1;
 }
 
-static SLJIT_INLINE pcre_uchar *compile_close_matchingpath(compiler_common *common, pcre_uchar *cc)
+static SLJIT_INLINE PCRE2_SPTR compile_close_matchingpath(compiler_common *common, PCRE2_SPTR cc)
 {
 DEFINE_COMPILER;
 int offset = GET2(cc, 1);
@@ -9397,14 +12015,15 @@ if (!optimized_cbracket)
 return cc + 1 + IMM2_SIZE;
 }
 
-static SLJIT_INLINE pcre_uchar *compile_control_verb_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
+static SLJIT_INLINE PCRE2_SPTR compile_control_verb_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 backtrack_common *backtrack;
-pcre_uchar opcode = *cc;
-pcre_uchar *ccend = cc + 1;
+PCRE2_UCHAR opcode = *cc;
+PCRE2_SPTR ccend = cc + 1;
 
-if (opcode == OP_PRUNE_ARG || opcode == OP_SKIP_ARG || opcode == OP_THEN_ARG)
+if (opcode == OP_COMMIT_ARG || opcode == OP_PRUNE_ARG ||
+    opcode == OP_SKIP_ARG || opcode == OP_THEN_ARG)
   ccend += 2 + cc[1];
 
 PUSH_BACKTRACK(sizeof(backtrack_common), cc, NULL);
@@ -9416,20 +12035,21 @@ if (opcode == OP_SKIP)
   return ccend;
   }
 
-if (opcode == OP_PRUNE_ARG || opcode == OP_THEN_ARG)
+if (opcode == OP_COMMIT_ARG || opcode == OP_PRUNE_ARG || opcode == OP_THEN_ARG)
   {
-  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+  if (HAS_VIRTUAL_REGISTERS)
+    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)(cc + 2));
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, TMP2, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, mark_ptr), TMP2, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(HAS_VIRTUAL_REGISTERS ? TMP1 : ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, mark_ptr), TMP2, 0);
   }
 
 return ccend;
 }
 
-static pcre_uchar then_trap_opcode[1] = { OP_THEN_TRAP };
+static PCRE2_UCHAR then_trap_opcode[1] = { OP_THEN_TRAP };
 
-static SLJIT_INLINE void compile_then_trap_matchingpath(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, backtrack_common *parent)
+static SLJIT_INLINE void compile_then_trap_matchingpath(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 backtrack_common *backtrack;
@@ -9457,10 +12077,10 @@ OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(size - 3), TMP2, 0);
 
 size = BACKTRACK_AS(then_trap_backtrack)->framesize;
 if (size >= 0)
-  init_frame(common, cc, ccend, size - 1, 0, FALSE);
+  init_frame(common, cc, ccend, size - 1, 0);
 }
 
-static void compile_matchingpath(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, backtrack_common *parent)
+static void compile_matchingpath(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend, backtrack_common *parent)
 {
 DEFINE_COMPILER;
 backtrack_common *backtrack;
@@ -9529,7 +12149,7 @@ while (cc < ccend)
 
     case OP_CHAR:
     case OP_CHARI:
-    if (common->mode == JIT_COMPILE)
+    if (common->mode == PCRE2_JIT_COMPLETE)
       cc = compile_charn_matchingpath(common, cc, ccend, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks);
     else
       cc = compile_char1_matchingpath(common, *cc, cc + 1, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks, TRUE);
@@ -9605,13 +12225,13 @@ while (cc < ccend)
 
     case OP_CLASS:
     case OP_NCLASS:
-    if (cc[1 + (32 / sizeof(pcre_uchar))] >= OP_CRSTAR && cc[1 + (32 / sizeof(pcre_uchar))] <= OP_CRPOSRANGE)
+    if (cc[1 + (32 / sizeof(PCRE2_UCHAR))] >= OP_CRSTAR && cc[1 + (32 / sizeof(PCRE2_UCHAR))] <= OP_CRPOSRANGE)
       cc = compile_iterator_matchingpath(common, cc, parent);
     else
       cc = compile_char1_matchingpath(common, *cc, cc + 1, parent->top != NULL ? &parent->top->nextbacktracks : &parent->topbacktracks, TRUE);
     break;
 
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
     case OP_XCLASS:
     if (*(cc + GET(cc, 1)) >= OP_CRSTAR && *(cc + GET(cc, 1)) <= OP_CRPOSRANGE)
       cc = compile_iterator_matchingpath(common, cc, parent);
@@ -9648,6 +12268,7 @@ while (cc < ccend)
     break;
 
     case OP_CALLOUT:
+    case OP_CALLOUT_STR:
     cc = compile_callout_matchingpath(common, cc, parent);
     break;
 
@@ -9677,8 +12298,10 @@ while (cc < ccend)
     count_match(common);
     break;
 
+    case OP_ASSERT_NA:
+    case OP_ASSERTBACK_NA:
     case OP_ONCE:
-    case OP_ONCE_NC:
+    case OP_SCRIPT_RUN:
     case OP_BRA:
     case OP_CBRA:
     case OP_COND:
@@ -9711,11 +12334,12 @@ while (cc < ccend)
     SLJIT_ASSERT(common->mark_ptr != 0);
     OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->mark_ptr);
     allocate_stack(common, common->has_skip_arg ? 5 : 1);
-    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
+    if (HAS_VIRTUAL_REGISTERS)
+      OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
     OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(common->has_skip_arg ? 4 : 0), TMP2, 0);
     OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)(cc + 2));
     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, TMP2, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, mark_ptr), TMP2, 0);
+    OP1(SLJIT_MOV, SLJIT_MEM1(HAS_VIRTUAL_REGISTERS ? TMP1 : ARGUMENTS), SLJIT_OFFSETOF(jit_arguments, mark_ptr), TMP2, 0);
     if (common->has_skip_arg)
       {
       OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
@@ -9735,6 +12359,7 @@ while (cc < ccend)
     case OP_THEN:
     case OP_THEN_ARG:
     case OP_COMMIT:
+    case OP_COMMIT_ARG:
     cc = compile_control_verb_matchingpath(common, cc, parent);
     break;
 
@@ -9789,14 +12414,14 @@ SLJIT_ASSERT(cc == ccend);
 static void compile_iterator_backtrackingpath(compiler_common *common, struct backtrack_common *current)
 {
 DEFINE_COMPILER;
-pcre_uchar *cc = current->cc;
-pcre_uchar opcode;
-pcre_uchar type;
+PCRE2_SPTR cc = current->cc;
+PCRE2_UCHAR opcode;
+PCRE2_UCHAR type;
 sljit_u32 max = 0, exact;
 struct sljit_label *label = NULL;
 struct sljit_jump *jump = NULL;
 jump_list *jumplist = NULL;
-pcre_uchar *end;
+PCRE2_SPTR end;
 int private_data_ptr = PRIVATE_DATA(cc);
 int base = (private_data_ptr == 0) ? SLJIT_MEM1(STACK_TOP) : SLJIT_MEM1(SLJIT_SP);
 int offset0 = (private_data_ptr == 0) ? STACK(0) : private_data_ptr;
@@ -9831,14 +12456,14 @@ switch(opcode)
       if (CURRENT_AS(char_iterator_backtrack)->u.charpos.othercasebit != 0)
         OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, CURRENT_AS(char_iterator_backtrack)->u.charpos.othercasebit);
       CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CURRENT_AS(char_iterator_backtrack)->u.charpos.chr, CURRENT_AS(char_iterator_backtrack)->matchingpath);
-      skip_char_back(common);
+      move_back(common, NULL, TRUE);
       CMPTO(SLJIT_GREATER, STR_PTR, 0, TMP2, 0, label);
       }
     else
       {
       OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
       jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, base, offset1);
-      skip_char_back(common);
+      move_back(common, NULL, TRUE);
       OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
       JUMPTO(SLJIT_JUMP, CURRENT_AS(char_iterator_backtrack)->matchingpath);
       }
@@ -9917,9 +12542,9 @@ set_jumps(current->topbacktracks, LABEL());
 static SLJIT_INLINE void compile_ref_iterator_backtrackingpath(compiler_common *common, struct backtrack_common *current)
 {
 DEFINE_COMPILER;
-pcre_uchar *cc = current->cc;
+PCRE2_SPTR cc = current->cc;
 BOOL ref = (*cc == OP_REF || *cc == OP_REFI);
-pcre_uchar type;
+PCRE2_UCHAR type;
 
 type = cc[ref ? 1 + IMM2_SIZE : 1 + 2 * IMM2_SIZE];
 
@@ -9942,34 +12567,28 @@ free_stack(common, ref ? 2 : 3);
 static SLJIT_INLINE void compile_recurse_backtrackingpath(compiler_common *common, struct backtrack_common *current)
 {
 DEFINE_COMPILER;
+recurse_entry *entry;
 
-if (CURRENT_AS(recurse_backtrack)->inlined_pattern)
+if (!CURRENT_AS(recurse_backtrack)->inlined_pattern)
+  {
+  entry = CURRENT_AS(recurse_backtrack)->entry;
+  if (entry->backtrack_label == NULL)
+    add_jump(compiler, &entry->backtrack_calls, JUMP(SLJIT_FAST_CALL));
+  else
+    JUMPTO(SLJIT_FAST_CALL, entry->backtrack_label);
+  CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0, CURRENT_AS(recurse_backtrack)->matchingpath);
+  }
+else
   compile_backtrackingpath(common, current->top);
-set_jumps(current->topbacktracks, LABEL());
-if (CURRENT_AS(recurse_backtrack)->inlined_pattern)
-  return;
 
-if (common->has_set_som && common->mark_ptr != 0)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
-  free_stack(common, 2);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(0), TMP2, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, TMP1, 0);
-  }
-else if (common->has_set_som || common->mark_ptr != 0)
-  {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-  free_stack(common, 1);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->has_set_som ? (int)(OVECTOR(0)) : common->mark_ptr, TMP2, 0);
-  }
+set_jumps(current->topbacktracks, LABEL());
 }
 
 static void compile_assert_backtrackingpath(compiler_common *common, struct backtrack_common *current)
 {
 DEFINE_COMPILER;
-pcre_uchar *cc = current->cc;
-pcre_uchar bra = OP_BRA;
+PCRE2_SPTR cc = current->cc;
+PCRE2_UCHAR bra = OP_BRA;
 struct sljit_jump *brajump = NULL;
 
 SLJIT_ASSERT(*cc != OP_BRAMINZERO);
@@ -10015,7 +12634,9 @@ if (*cc == OP_ASSERT || *cc == OP_ASSERTBACK)
   {
   OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), CURRENT_AS(assert_backtrack)->private_data_ptr);
   add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), CURRENT_AS(assert_backtrack)->private_data_ptr, SLJIT_MEM1(STACK_TOP), STACK(-CURRENT_AS(assert_backtrack)->framesize - 1));
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(-2));
+  OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (CURRENT_AS(assert_backtrack)->framesize - 1) * sizeof(sljit_sw));
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), CURRENT_AS(assert_backtrack)->private_data_ptr, TMP1, 0);
 
   set_jumps(current->topbacktracks, LABEL());
   }
@@ -10039,22 +12660,21 @@ int opcode, stacksize, alt_count, alt_max;
 int offset = 0;
 int private_data_ptr = CURRENT_AS(bracket_backtrack)->private_data_ptr;
 int repeat_ptr = 0, repeat_type = 0, repeat_count = 0;
-pcre_uchar *cc = current->cc;
-pcre_uchar *ccbegin;
-pcre_uchar *ccprev;
-pcre_uchar bra = OP_BRA;
-pcre_uchar ket;
+PCRE2_SPTR cc = current->cc;
+PCRE2_SPTR ccbegin;
+PCRE2_SPTR ccprev;
+PCRE2_UCHAR bra = OP_BRA;
+PCRE2_UCHAR ket;
 assert_backtrack *assert;
-sljit_uw *next_update_addr = NULL;
 BOOL has_alternatives;
 BOOL needs_control_head = FALSE;
 struct sljit_jump *brazero = NULL;
-struct sljit_jump *alt1 = NULL;
-struct sljit_jump *alt2 = NULL;
+struct sljit_jump *next_alt = NULL;
 struct sljit_jump *once = NULL;
 struct sljit_jump *cond = NULL;
 struct sljit_label *rmin_label = NULL;
 struct sljit_label *exact_label = NULL;
+struct sljit_put_label *put_label = NULL;
 
 if (*cc == OP_BRAZERO || *cc == OP_BRAMINZERO)
   {
@@ -10085,8 +12705,6 @@ if (opcode == OP_CBRA || opcode == OP_SCBRA)
   offset = (GET2(ccbegin, 1 + LINK_SIZE)) << 1;
 if (SLJIT_UNLIKELY(opcode == OP_COND) && (*cc == OP_KETRMAX || *cc == OP_KETRMIN))
   opcode = OP_SCOND;
-if (SLJIT_UNLIKELY(opcode == OP_ONCE_NC))
-  opcode = OP_ONCE;
 
 alt_max = has_alternatives ? no_alternatives(ccbegin) : 0;
 
@@ -10192,6 +12810,7 @@ if (SLJIT_UNLIKELY(opcode == OP_ONCE))
     {
     OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
     add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
+    OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (CURRENT_AS(bracket_backtrack)->u.framesize - 1) * sizeof(sljit_sw));
     }
   once = JUMP(SLJIT_JUMP);
   }
@@ -10204,7 +12823,7 @@ else if (SLJIT_UNLIKELY(opcode == OP_COND) || SLJIT_UNLIKELY(opcode == OP_SCOND)
     free_stack(common, 1);
 
     alt_max = 2;
-    alt1 = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, sizeof(sljit_uw));
+    next_alt = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0);
     }
   }
 else if (has_alternatives)
@@ -10212,21 +12831,16 @@ else if (has_alternatives)
   OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
   free_stack(common, 1);
 
-  if (alt_max > 4)
+  if (alt_max > 3)
     {
-    /* Table jump if alt_max is greater than 4. */
-    next_update_addr = allocate_read_only_data(common, alt_max * sizeof(sljit_uw));
-    if (SLJIT_UNLIKELY(next_update_addr == NULL))
-      return;
-    sljit_emit_ijump(compiler, SLJIT_JUMP, SLJIT_MEM1(TMP1), (sljit_sw)next_update_addr);
-    add_label_addr(common, next_update_addr++);
+    sljit_emit_ijump(compiler, SLJIT_JUMP, TMP1, 0);
+
+    SLJIT_ASSERT(CURRENT_AS(bracket_backtrack)->u.matching_put_label);
+    sljit_set_put_label(CURRENT_AS(bracket_backtrack)->u.matching_put_label, LABEL());
+    sljit_emit_op0(compiler, SLJIT_ENDBR);
     }
   else
-    {
-    if (alt_max == 4)
-      alt2 = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_uw));
-    alt1 = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, sizeof(sljit_uw));
-    }
+    next_alt = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0);
   }
 
 COMPILE_BACKTRACKINGPATH(current->top);
@@ -10244,7 +12858,9 @@ if (SLJIT_UNLIKELY(opcode == OP_COND) || SLJIT_UNLIKELY(opcode == OP_SCOND))
       {
       OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr);
       add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr, SLJIT_MEM1(STACK_TOP), STACK(-assert->framesize - 1));
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(-2));
+      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (assert->framesize - 1) * sizeof(sljit_sw));
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr, TMP1, 0);
       }
     cond = JUMP(SLJIT_JUMP);
     set_jumps(CURRENT_AS(bracket_backtrack)->u.assert->condfailed, LABEL());
@@ -10261,7 +12877,7 @@ if (SLJIT_UNLIKELY(opcode == OP_COND) || SLJIT_UNLIKELY(opcode == OP_SCOND))
 
 if (has_alternatives)
   {
-  alt_count = sizeof(sljit_uw);
+  alt_count = 1;
   do
     {
     current->top = NULL;
@@ -10287,6 +12903,12 @@ if (has_alternatives)
       compile_matchingpath(common, ccprev, cc, current);
       if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
         return;
+
+      if (opcode == OP_ASSERT_NA || opcode == OP_ASSERTBACK_NA)
+        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+
+      if (opcode == OP_SCRIPT_RUN)
+        match_script_run_common(common, private_data_ptr, current);
       }
 
     /* Instructions after the current alternative is successfully matched. */
@@ -10337,7 +12959,12 @@ if (has_alternatives)
       stacksize = match_capture_common(common, stacksize, offset, private_data_ptr);
 
     if (opcode != OP_ONCE)
-      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, alt_count);
+      {
+      if (alt_max <= 3)
+        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, alt_count);
+      else
+        put_label = sljit_emit_put_label(compiler, SLJIT_MEM1(STACK_TOP), STACK(stacksize));
+      }
 
     if (offset != 0 && ket == OP_KETRMAX && common->optimized_cbracket[offset >> 1] != 0)
       {
@@ -10350,24 +12977,21 @@ if (has_alternatives)
 
     if (opcode != OP_ONCE)
       {
-      if (alt_max > 4)
-        add_label_addr(common, next_update_addr++);
-      else
+      if (alt_max <= 3)
         {
-        if (alt_count != 2 * sizeof(sljit_uw))
+        JUMPHERE(next_alt);
+        alt_count++;
+        if (alt_count < alt_max)
           {
-          JUMPHERE(alt1);
-          if (alt_max == 3 && alt_count == sizeof(sljit_uw))
-            alt2 = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_uw));
-          }
-        else
-          {
-          JUMPHERE(alt2);
-          if (alt_max == 4)
-            alt1 = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 3 * sizeof(sljit_uw));
+          SLJIT_ASSERT(alt_count == 2 && alt_max == 3);
+          next_alt = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 1);
           }
         }
-      alt_count += sizeof(sljit_uw);
+      else
+        {
+        sljit_set_put_label(put_label, LABEL());
+        sljit_emit_op0(compiler, SLJIT_ENDBR);
+        }
       }
 
     COMPILE_BACKTRACKINGPATH(current->top);
@@ -10385,7 +13009,9 @@ if (has_alternatives)
       {
       OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr);
       add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr, SLJIT_MEM1(STACK_TOP), STACK(-assert->framesize - 1));
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(-2));
+      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (assert->framesize - 1) * sizeof(sljit_sw));
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr, TMP1, 0);
       }
     JUMPHERE(cond);
     }
@@ -10413,7 +13039,7 @@ if (offset != 0)
     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP1, 0);
     }
   }
-else if (opcode == OP_SBRA || opcode == OP_SCOND)
+else if (opcode == OP_ASSERT_NA || opcode == OP_ASSERTBACK_NA || opcode == OP_SCRIPT_RUN || opcode == OP_SBRA || opcode == OP_SCOND)
   {
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_MEM1(STACK_TOP), STACK(0));
   free_stack(common, 1);
@@ -10521,6 +13147,7 @@ if (CURRENT_AS(bracketpos_backtrack)->framesize < 0)
 
 OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), CURRENT_AS(bracketpos_backtrack)->private_data_ptr);
 add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
+OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (CURRENT_AS(bracketpos_backtrack)->framesize - 1) * sizeof(sljit_sw));
 
 if (current->topbacktracks)
   {
@@ -10560,7 +13187,7 @@ SLJIT_ASSERT(!current->nextbacktracks && !current->topbacktracks);
 static SLJIT_INLINE void compile_control_verb_backtrackingpath(compiler_common *common, struct backtrack_common *current)
 {
 DEFINE_COMPILER;
-pcre_uchar opcode = *current->cc;
+PCRE2_UCHAR opcode = *current->cc;
 struct sljit_label *loop;
 struct sljit_jump *jump;
 
@@ -10583,15 +13210,16 @@ if (opcode == OP_THEN || opcode == OP_THEN_ARG)
     add_jump(compiler, &common->then_trap->quit, JUMP(SLJIT_JUMP));
     return;
     }
-  else if (common->positive_assert)
+  else if (!common->local_quit_available && common->in_positive_assertion)
     {
-    add_jump(compiler, &common->positive_assert_quit, JUMP(SLJIT_JUMP));
+    add_jump(compiler, &common->positive_assertion_quit, JUMP(SLJIT_JUMP));
     return;
     }
   }
 
-if (common->local_exit)
+if (common->local_quit_available)
   {
+  /* Abort match with a fail. */
   if (common->quit_label == NULL)
     add_jump(compiler, &common->quit, JUMP(SLJIT_JUMP));
   else
@@ -10601,15 +13229,13 @@ if (common->local_exit)
 
 if (opcode == OP_SKIP_ARG)
   {
-  SLJIT_ASSERT(common->control_head_ptr != 0);
+  SLJIT_ASSERT(common->control_head_ptr != 0 && TMP1 == SLJIT_R0 && STR_PTR == SLJIT_R1);
   OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STACK_TOP, 0);
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_IMM, (sljit_sw)(current->cc + 2));
-  sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_RET(SW) | SLJIT_ARG1(SW) | SLJIT_ARG2(SW), SLJIT_IMM, SLJIT_FUNC_OFFSET(do_search_mark));
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+  OP1(SLJIT_MOV, SLJIT_R1, 0, SLJIT_IMM, (sljit_sw)(current->cc + 2));
+  sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM, SLJIT_FUNC_ADDR(do_search_mark));
 
-  OP1(SLJIT_MOV, STR_PTR, 0, TMP1, 0);
-  add_jump(compiler, &common->reset_match, CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0));
+  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_R0, 0);
+  add_jump(compiler, &common->reset_match, CMP(SLJIT_NOT_EQUAL, SLJIT_R0, 0, SLJIT_IMM, 0));
   return;
   }
 
@@ -10642,7 +13268,10 @@ jump = JUMP(SLJIT_JUMP);
 set_jumps(CURRENT_AS(then_trap_backtrack)->quit, LABEL());
 /* STACK_TOP is set by THEN. */
 if (CURRENT_AS(then_trap_backtrack)->framesize >= 0)
+  {
   add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
+  OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (CURRENT_AS(then_trap_backtrack)->framesize - 1) * sizeof(sljit_sw));
+  }
 OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
 free_stack(common, 3);
 
@@ -10734,7 +13363,7 @@ while (current)
     case OP_TYPEPOSUPTO:
     case OP_CLASS:
     case OP_NCLASS:
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
 #endif
     compile_iterator_backtrackingpath(common, current);
@@ -10758,8 +13387,10 @@ while (current)
     compile_assert_backtrackingpath(common, current);
     break;
 
+    case OP_ASSERT_NA:
+    case OP_ASSERTBACK_NA:
     case OP_ONCE:
-    case OP_ONCE_NC:
+    case OP_SCRIPT_RUN:
     case OP_BRA:
     case OP_CBRA:
     case OP_COND:
@@ -10808,8 +13439,9 @@ while (current)
     break;
 
     case OP_COMMIT:
-    if (!common->local_exit)
-      OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_NOMATCH);
+    case OP_COMMIT_ARG:
+    if (!common->local_quit_available)
+      OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_NOMATCH);
     if (common->quit_label == NULL)
       add_jump(compiler, &common->quit, JUMP(SLJIT_JUMP));
     else
@@ -10817,6 +13449,7 @@ while (current)
     break;
 
     case OP_CALLOUT:
+    case OP_CALLOUT_STR:
     case OP_FAIL:
     case OP_ACCEPT:
     case OP_ASSERT_ACCEPT:
@@ -10840,42 +13473,53 @@ common->then_trap = save_then_trap;
 static SLJIT_INLINE void compile_recurse(compiler_common *common)
 {
 DEFINE_COMPILER;
-pcre_uchar *cc = common->start + common->currententry->start;
-pcre_uchar *ccbegin = cc + 1 + LINK_SIZE + (*cc == OP_BRA ? 0 : IMM2_SIZE);
-pcre_uchar *ccend = bracketend(cc) - (1 + LINK_SIZE);
-BOOL needs_control_head;
-int framesize = get_framesize(common, cc, NULL, TRUE, &needs_control_head);
-int private_data_size = get_private_data_copy_length(common, ccbegin, ccend, needs_control_head);
-int alternativesize;
-BOOL needs_frame;
+PCRE2_SPTR cc = common->start + common->currententry->start;
+PCRE2_SPTR ccbegin = cc + 1 + LINK_SIZE + (*cc == OP_BRA ? 0 : IMM2_SIZE);
+PCRE2_SPTR ccend = bracketend(cc) - (1 + LINK_SIZE);
+uint32_t recurse_flags = 0;
+int private_data_size = get_recurse_data_length(common, ccbegin, ccend, &recurse_flags);
+int alt_count, alt_max, local_size;
 backtrack_common altbacktrack;
-struct sljit_jump *jump;
+jump_list *match = NULL;
+struct sljit_jump *next_alt = NULL;
+struct sljit_jump *accept_exit = NULL;
+struct sljit_label *quit;
+struct sljit_put_label *put_label = NULL;
 
 /* Recurse captures then. */
 common->then_trap = NULL;
 
 SLJIT_ASSERT(*cc == OP_BRA || *cc == OP_CBRA || *cc == OP_CBRAPOS || *cc == OP_SCBRA || *cc == OP_SCBRAPOS);
-needs_frame = framesize >= 0;
-if (!needs_frame)
-  framesize = 0;
-alternativesize = *(cc + GET(cc, 1)) == OP_ALT ? 1 : 0;
 
-SLJIT_ASSERT(common->currententry->entry == NULL && common->recursive_head_ptr != 0);
-common->currententry->entry = LABEL();
-set_jumps(common->currententry->calls, common->currententry->entry);
+alt_max = no_alternatives(cc);
+alt_count = 0;
+
+/* Matching path. */
+SLJIT_ASSERT(common->currententry->entry_label == NULL && common->recursive_head_ptr != 0);
+common->currententry->entry_label = LABEL();
+set_jumps(common->currententry->entry_calls, common->currententry->entry_label);
 
 sljit_emit_fast_enter(compiler, TMP2, 0);
 count_match(common);
-allocate_stack(common, private_data_size + framesize + alternativesize);
-OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(private_data_size + framesize + alternativesize - 1), TMP2, 0);
-copy_private_data(common, ccbegin, ccend, TRUE, framesize + alternativesize, private_data_size + framesize + alternativesize, needs_control_head);
-if (needs_control_head)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr, STACK_TOP, 0);
-if (needs_frame)
-  init_frame(common, cc, NULL, framesize + alternativesize - 1, alternativesize, TRUE);
 
-if (alternativesize > 0)
+local_size = (alt_max > 1) ? 2 : 1;
+
+/* (Reversed) stack layout:
+   [private data][return address][optional: str ptr] ... [optional: alternative index][recursive_head_ptr] */
+
+allocate_stack(common, private_data_size + local_size);
+/* Save return address. */
+OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(local_size - 1), TMP2, 0);
+
+copy_recurse_data(common, ccbegin, ccend, recurse_copy_from_global, local_size, private_data_size + local_size, recurse_flags);
+
+/* This variable is saved and restored all time when we enter or exit from a recursive context. */
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr, STACK_TOP, 0);
+
+if (recurse_flags & recurse_flag_control_head_found)
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
+
+if (alt_max > 1)
   OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
 
 memset(&altbacktrack, 0, sizeof(backtrack_common));
@@ -10897,7 +13541,70 @@ while (1)
   if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
     return;
 
-  add_jump(compiler, &common->accept, JUMP(SLJIT_JUMP));
+  allocate_stack(common, (alt_max > 1 || (recurse_flags & recurse_flag_accept_found)) ? 2 : 1);
+  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr);
+
+  if (alt_max > 1 || (recurse_flags & recurse_flag_accept_found))
+    {
+    if (alt_max > 3)
+      put_label = sljit_emit_put_label(compiler, SLJIT_MEM1(STACK_TOP), STACK(1));
+    else
+      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, alt_count);
+    }
+
+  add_jump(compiler, &match, JUMP(SLJIT_JUMP));
+
+  if (alt_count == 0)
+    {
+    /* Backtracking path entry. */
+    SLJIT_ASSERT(common->currententry->backtrack_label == NULL);
+    common->currententry->backtrack_label = LABEL();
+    set_jumps(common->currententry->backtrack_calls, common->currententry->backtrack_label);
+
+    sljit_emit_fast_enter(compiler, TMP1, 0);
+
+    if (recurse_flags & recurse_flag_accept_found)
+      accept_exit = CMP(SLJIT_EQUAL, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, -1);
+
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
+    /* Save return address. */
+    OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), STACK(local_size - 1), TMP1, 0);
+
+    copy_recurse_data(common, ccbegin, ccend, recurse_swap_global, local_size, private_data_size + local_size, recurse_flags);
+
+    if (alt_max > 1)
+      {
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
+      free_stack(common, 2);
+
+      if (alt_max > 3)
+        {
+        sljit_emit_ijump(compiler, SLJIT_JUMP, TMP1, 0);
+        sljit_set_put_label(put_label, LABEL());
+        sljit_emit_op0(compiler, SLJIT_ENDBR);
+        }
+      else
+        next_alt = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0);
+      }
+    else
+      free_stack(common, (recurse_flags & recurse_flag_accept_found) ? 2 : 1);
+    }
+  else if (alt_max > 3)
+    {
+    sljit_set_put_label(put_label, LABEL());
+    sljit_emit_op0(compiler, SLJIT_ENDBR);
+    }
+  else
+    {
+    JUMPHERE(next_alt);
+    if (alt_count + 1 < alt_max)
+      {
+      SLJIT_ASSERT(alt_count == 1 && alt_max == 3);
+      next_alt = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 1);
+      }
+    }
+
+  alt_count++;
 
   compile_backtrackingpath(common, altbacktrack.top);
   if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
@@ -10911,76 +13618,88 @@ while (1)
   cc += GET(cc, 1);
   }
 
-/* None of them matched. */
-OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 0);
-jump = JUMP(SLJIT_JUMP);
+/* No alternative is matched. */
+
+quit = LABEL();
+
+copy_recurse_data(common, ccbegin, ccend, recurse_copy_private_to_global, local_size, private_data_size + local_size, recurse_flags);
+
+OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(local_size - 1));
+free_stack(common, private_data_size + local_size);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
+OP_SRC(SLJIT_FAST_RETURN, TMP2, 0);
 
 if (common->quit != NULL)
   {
+  SLJIT_ASSERT(recurse_flags & recurse_flag_quit_found);
+
   set_jumps(common->quit, LABEL());
   OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr);
-  if (needs_frame)
-    {
-    OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + alternativesize) * sizeof(sljit_sw));
-    add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-    OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + alternativesize) * sizeof(sljit_sw));
-    }
-  OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 0);
-  common->quit = NULL;
-  add_jump(compiler, &common->quit, JUMP(SLJIT_JUMP));
+  copy_recurse_data(common, ccbegin, ccend, recurse_copy_shared_to_global, local_size, private_data_size + local_size, recurse_flags);
+  JUMPTO(SLJIT_JUMP, quit);
   }
 
-set_jumps(common->accept, LABEL());
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr);
-if (needs_frame)
+if (recurse_flags & recurse_flag_accept_found)
   {
-  OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + alternativesize) * sizeof(sljit_sw));
-  add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-  OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize + alternativesize) * sizeof(sljit_sw));
-  }
-OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 1);
+  JUMPHERE(accept_exit);
+  free_stack(common, 2);
 
-JUMPHERE(jump);
-if (common->quit != NULL)
-  set_jumps(common->quit, LABEL());
-copy_private_data(common, ccbegin, ccend, FALSE, framesize + alternativesize, private_data_size + framesize + alternativesize, needs_control_head);
-free_stack(common, private_data_size + framesize + alternativesize);
-if (needs_control_head)
-  {
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(-3));
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(-2));
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr, TMP1, 0);
-  OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, TMP2, 0);
+  /* Save return address. */
+  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(local_size - 1), TMP1, 0);
+
+  copy_recurse_data(common, ccbegin, ccend, recurse_copy_kept_shared_to_global, local_size, private_data_size + local_size, recurse_flags);
+
+  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(local_size - 1));
+  free_stack(common, private_data_size + local_size);
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
+  OP_SRC(SLJIT_FAST_RETURN, TMP2, 0);
   }
-else
+
+if (common->accept != NULL)
   {
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(-2));
-  OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr, TMP2, 0);
+  SLJIT_ASSERT(recurse_flags & recurse_flag_accept_found);
+
+  set_jumps(common->accept, LABEL());
+
+  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), common->recursive_head_ptr);
+  OP1(SLJIT_MOV, TMP2, 0, STACK_TOP, 0);
+
+  allocate_stack(common, 2);
+  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, -1);
   }
-sljit_emit_fast_return(compiler, SLJIT_MEM1(STACK_TOP), STACK(-1));
+
+set_jumps(match, LABEL());
+
+OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
+
+copy_recurse_data(common, ccbegin, ccend, recurse_swap_global, local_size, private_data_size + local_size, recurse_flags);
+
+OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP2), STACK(local_size - 1));
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 1);
+OP_SRC(SLJIT_FAST_RETURN, TMP2, 0);
 }
 
 #undef COMPILE_BACKTRACKINGPATH
 #undef CURRENT_AS
 
-void
-PRIV(jit_compile)(const REAL_PCRE *re, PUBL(extra) *extra, int mode)
+#define PUBLIC_JIT_COMPILE_CONFIGURATION_OPTIONS \
+  (PCRE2_JIT_INVALID_UTF)
+
+static int jit_compile(pcre2_code *code, sljit_u32 mode)
 {
+pcre2_real_code *re = (pcre2_real_code *)code;
 struct sljit_compiler *compiler;
 backtrack_common rootbacktrack;
 compiler_common common_data;
 compiler_common *common = &common_data;
 const sljit_u8 *tables = re->tables;
-pcre_study_data *study;
+void *allocator_data = &re->memctl;
 int private_data_size;
-pcre_uchar *ccend;
+PCRE2_SPTR ccend;
 executable_functions *functions;
 void *executable_func;
 sljit_uw executable_size;
 sljit_uw total_length;
-label_addr_list *label_addr;
 struct sljit_label *mainloop_label = NULL;
 struct sljit_label *continue_match_label;
 struct sljit_label *empty_match_found_label = NULL;
@@ -10989,51 +13708,55 @@ struct sljit_label *reset_match_label;
 struct sljit_label *quit_label;
 struct sljit_jump *jump;
 struct sljit_jump *minlength_check_failed = NULL;
-struct sljit_jump *reqbyte_notfound = NULL;
 struct sljit_jump *empty_match = NULL;
+struct sljit_jump *end_anchor_failed = NULL;
+jump_list *reqcu_not_found = NULL;
 
-SLJIT_ASSERT((extra->flags & PCRE_EXTRA_STUDY_DATA) != 0);
-study = extra->study_data;
+SLJIT_ASSERT(tables);
 
-if (!tables)
-  tables = PRIV(default_tables);
+#if HAS_VIRTUAL_REGISTERS == 1
+SLJIT_ASSERT(sljit_get_register_index(TMP3) < 0 && sljit_get_register_index(ARGUMENTS) < 0 && sljit_get_register_index(RETURN_ADDR) < 0);
+#elif HAS_VIRTUAL_REGISTERS == 0
+SLJIT_ASSERT(sljit_get_register_index(TMP3) >= 0 && sljit_get_register_index(ARGUMENTS) >= 0 && sljit_get_register_index(RETURN_ADDR) >= 0);
+#else
+#error "Invalid value for HAS_VIRTUAL_REGISTERS"
+#endif
 
 memset(&rootbacktrack, 0, sizeof(backtrack_common));
 memset(common, 0, sizeof(compiler_common));
-rootbacktrack.cc = (pcre_uchar *)re + re->name_table_offset + re->name_count * re->name_entry_size;
+common->re = re;
+common->name_table = (PCRE2_SPTR)((uint8_t *)re + sizeof(pcre2_real_code));
+rootbacktrack.cc = common->name_table + re->name_count * re->name_entry_size;
+
+#ifdef SUPPORT_UNICODE
+common->invalid_utf = (mode & PCRE2_JIT_INVALID_UTF) != 0;
+#endif /* SUPPORT_UNICODE */
+mode &= ~PUBLIC_JIT_COMPILE_CONFIGURATION_OPTIONS;
 
 common->start = rootbacktrack.cc;
 common->read_only_data_head = NULL;
 common->fcc = tables + fcc_offset;
 common->lcc = (sljit_sw)(tables + lcc_offset);
 common->mode = mode;
-common->might_be_empty = study->minlength == 0;
+common->might_be_empty = (re->minlength == 0) || (re->flags & PCRE2_MATCH_EMPTY);
+common->allow_empty_partial = (re->max_lookbehind > 0) || (re->flags & PCRE2_MATCH_EMPTY);
 common->nltype = NLTYPE_FIXED;
-switch(re->options & PCRE_NEWLINE_BITS)
+switch(re->newline_convention)
   {
-  case 0:
-  /* Compile-time default */
-  switch(NEWLINE)
-    {
-    case -1: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANY; break;
-    case -2: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANYCRLF; break;
-    default: common->newline = NEWLINE; break;
-    }
-  break;
-  case PCRE_NEWLINE_CR: common->newline = CHAR_CR; break;
-  case PCRE_NEWLINE_LF: common->newline = CHAR_NL; break;
-  case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: common->newline = (CHAR_CR << 8) | CHAR_NL; break;
-  case PCRE_NEWLINE_ANY: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANY; break;
-  case PCRE_NEWLINE_ANYCRLF: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANYCRLF; break;
-  default: return;
+  case PCRE2_NEWLINE_CR: common->newline = CHAR_CR; break;
+  case PCRE2_NEWLINE_LF: common->newline = CHAR_NL; break;
+  case PCRE2_NEWLINE_CRLF: common->newline = (CHAR_CR << 8) | CHAR_NL; break;
+  case PCRE2_NEWLINE_ANY: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANY; break;
+  case PCRE2_NEWLINE_ANYCRLF: common->newline = (CHAR_CR << 8) | CHAR_NL; common->nltype = NLTYPE_ANYCRLF; break;
+  case PCRE2_NEWLINE_NUL: common->newline = CHAR_NUL; break;
+  default: return PCRE2_ERROR_INTERNAL;
   }
 common->nlmax = READ_CHAR_MAX;
 common->nlmin = 0;
-if ((re->options & PCRE_BSR_ANYCRLF) != 0)
-  common->bsr_nltype = NLTYPE_ANYCRLF;
-else if ((re->options & PCRE_BSR_UNICODE) != 0)
+if (re->bsr_convention == PCRE2_BSR_UNICODE)
   common->bsr_nltype = NLTYPE_ANY;
+else if (re->bsr_convention == PCRE2_BSR_ANYCRLF)
+  common->bsr_nltype = NLTYPE_ANYCRLF;
 else
   {
 #ifdef BSR_ANYCRLF
@@ -11044,18 +13767,16 @@ else
   }
 common->bsr_nlmax = READ_CHAR_MAX;
 common->bsr_nlmin = 0;
-common->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
+common->endonly = (re->overall_options & PCRE2_DOLLAR_ENDONLY) != 0;
 common->ctypes = (sljit_sw)(tables + ctypes_offset);
-common->name_table = ((pcre_uchar *)re) + re->name_table_offset;
 common->name_count = re->name_count;
 common->name_entry_size = re->name_entry_size;
-common->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;
-#ifdef SUPPORT_UTF
+common->unset_backref = (re->overall_options & PCRE2_MATCH_UNSET_BACKREF) != 0;
+common->alt_circumflex = (re->overall_options & PCRE2_ALT_CIRCUMFLEX) != 0;
+#ifdef SUPPORT_UNICODE
 /* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
-common->utf = (re->options & PCRE_UTF8) != 0;
-#ifdef SUPPORT_UCP
-common->use_ucp = (re->options & PCRE_UCP) != 0;
-#endif
+common->utf = (re->overall_options & PCRE2_UTF) != 0;
+common->ucp = (re->overall_options & PCRE2_UCP) != 0;
 if (common->utf)
   {
   if (common->nltype == NLTYPE_ANY)
@@ -11079,14 +13800,16 @@ if (common->utf)
     common->bsr_nlmax = (CHAR_CR > CHAR_NL) ? CHAR_CR : CHAR_NL;
   common->bsr_nlmin = (CHAR_CR < CHAR_NL) ? CHAR_CR : CHAR_NL;
   }
-#endif /* SUPPORT_UTF */
+else
+  common->invalid_utf = FALSE;
+#endif /* SUPPORT_UNICODE */
 ccend = bracketend(common->start);
 
 /* Calculate the local space size on the stack. */
 common->ovector_start = LIMIT_MATCH + sizeof(sljit_sw);
-common->optimized_cbracket = (sljit_u8 *)SLJIT_MALLOC(re->top_bracket + 1, compiler->allocator_data);
+common->optimized_cbracket = (sljit_u8 *)SLJIT_MALLOC(re->top_bracket + 1, allocator_data);
 if (!common->optimized_cbracket)
-  return;
+  return PCRE2_ERROR_NOMEMORY;
 #if defined DEBUG_FORCE_UNOPTIMIZED_CBRAS && DEBUG_FORCE_UNOPTIMIZED_CBRAS == 1
 memset(common->optimized_cbracket, 0, re->top_bracket + 1);
 #else
@@ -11100,27 +13823,27 @@ common->ovector_start += sizeof(sljit_sw);
 #endif
 if (!check_opcode_types(common, common->start, ccend))
   {
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  return;
+  SLJIT_FREE(common->optimized_cbracket, allocator_data);
+  return PCRE2_ERROR_NOMEMORY;
   }
 
 /* Checking flags and updating ovector_start. */
-if (mode == JIT_COMPILE && (re->flags & PCRE_REQCHSET) != 0 && (re->options & PCRE_NO_START_OPTIMIZE) == 0)
+if (mode == PCRE2_JIT_COMPLETE && (re->flags & PCRE2_LASTSET) != 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
   {
   common->req_char_ptr = common->ovector_start;
   common->ovector_start += sizeof(sljit_sw);
   }
-if (mode != JIT_COMPILE)
+if (mode != PCRE2_JIT_COMPLETE)
   {
   common->start_used_ptr = common->ovector_start;
   common->ovector_start += sizeof(sljit_sw);
-  if (mode == JIT_PARTIAL_SOFT_COMPILE)
+  if (mode == PCRE2_JIT_PARTIAL_SOFT)
     {
     common->hit_start = common->ovector_start;
-    common->ovector_start += 2 * sizeof(sljit_sw);
+    common->ovector_start += sizeof(sljit_sw);
     }
   }
-if ((re->options & PCRE_FIRSTLINE) != 0)
+if ((re->overall_options & (PCRE2_FIRSTLINE | PCRE2_USE_OFFSET_LIMIT)) != 0)
   {
   common->match_end_ptr = common->ovector_start;
   common->ovector_start += sizeof(sljit_sw);
@@ -11155,29 +13878,28 @@ SLJIT_ASSERT(!(common->req_char_ptr != 0 && common->start_used_ptr != 0));
 common->cbra_ptr = OVECTOR_START + (re->top_bracket + 1) * 2 * sizeof(sljit_sw);
 
 total_length = ccend - common->start;
-common->private_data_ptrs = (sljit_s32 *)SLJIT_MALLOC(total_length * (sizeof(sljit_s32) + (common->has_then ? 1 : 0)), compiler->allocator_data);
+common->private_data_ptrs = (sljit_s32*)SLJIT_MALLOC(total_length * (sizeof(sljit_s32) + (common->has_then ? 1 : 0)), allocator_data);
 if (!common->private_data_ptrs)
   {
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  return;
+  SLJIT_FREE(common->optimized_cbracket, allocator_data);
+  return PCRE2_ERROR_NOMEMORY;
   }
 memset(common->private_data_ptrs, 0, total_length * sizeof(sljit_s32));
 
 private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw);
-set_private_data_ptrs(common, &private_data_size, ccend);
-if ((re->options & PCRE_ANCHORED) == 0 && (re->options & PCRE_NO_START_OPTIMIZE) == 0)
-  {
-  if (!detect_fast_forward_skip(common, &private_data_size) && !common->has_skip_in_assert_back)
-    detect_fast_fail(common, common->start, &private_data_size, 4);
-  }
 
-SLJIT_ASSERT(common->fast_fail_start_ptr <= common->fast_fail_end_ptr);
+if ((re->overall_options & PCRE2_ANCHORED) == 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 && !common->has_skip_in_assert_back)
+  detect_early_fail(common, common->start, &private_data_size, 0, 0, TRUE);
+
+set_private_data_ptrs(common, &private_data_size, ccend);
+
+SLJIT_ASSERT(common->early_fail_start_ptr <= common->early_fail_end_ptr);
 
 if (private_data_size > SLJIT_MAX_LOCAL_SIZE)
   {
-  SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  return;
+  SLJIT_FREE(common->private_data_ptrs, allocator_data);
+  SLJIT_FREE(common->optimized_cbracket, allocator_data);
+  return PCRE2_ERROR_NOMEMORY;
   }
 
 if (common->has_then)
@@ -11187,17 +13909,18 @@ if (common->has_then)
   set_then_offsets(common, common->start, NULL);
   }
 
-compiler = sljit_create_compiler(NULL);
+compiler = sljit_create_compiler(allocator_data, NULL);
 if (!compiler)
   {
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-  return;
+  SLJIT_FREE(common->optimized_cbracket, allocator_data);
+  SLJIT_FREE(common->private_data_ptrs, allocator_data);
+  return PCRE2_ERROR_NOMEMORY;
   }
 common->compiler = compiler;
 
-/* Main pcre_jit_exec entry. */
-sljit_emit_enter(compiler, 0, SLJIT_ARG1(SW), 5, 5, 0, 0, private_data_size);
+/* Main pcre2_jit_exec entry. */
+SLJIT_ASSERT((private_data_size & (sizeof(sljit_sw) - 1)) == 0);
+sljit_emit_enter(compiler, 0, SLJIT_ARGS1(W, W), 5, 5, 0, 0, private_data_size);
 
 /* Register init. */
 reset_ovector(common, (re->top_bracket + 1) * 2);
@@ -11215,10 +13938,10 @@ OP1(SLJIT_MOV, STACK_LIMIT, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(struct sljit_sta
 OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
 OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LIMIT_MATCH, TMP1, 0);
 
-if (common->fast_fail_start_ptr < common->fast_fail_end_ptr)
-  reset_fast_fail(common);
+if (common->early_fail_start_ptr < common->early_fail_end_ptr)
+  reset_early_fail(common);
 
-if (mode == JIT_PARTIAL_SOFT_COMPILE)
+if (mode == PCRE2_JIT_PARTIAL_SOFT)
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, -1);
 if (common->mark_ptr != 0)
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->mark_ptr, SLJIT_IMM, 0);
@@ -11226,68 +13949,70 @@ if (common->control_head_ptr != 0)
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
 
 /* Main part of the matching */
-if ((re->options & PCRE_ANCHORED) == 0)
+if ((re->overall_options & PCRE2_ANCHORED) == 0)
   {
-  mainloop_label = mainloop_entry(common, (re->flags & PCRE_HASCRORLF) != 0);
+  mainloop_label = mainloop_entry(common);
   continue_match_label = LABEL();
   /* Forward search if possible. */
-  if ((re->options & PCRE_NO_START_OPTIMIZE) == 0)
+  if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
     {
-    if (mode == JIT_COMPILE && fast_forward_first_n_chars(common))
+    if (mode == PCRE2_JIT_COMPLETE && fast_forward_first_n_chars(common))
       ;
-    else if ((re->flags & PCRE_FIRSTSET) != 0)
-      fast_forward_first_char(common, (pcre_uchar)re->first_char, (re->flags & PCRE_FCH_CASELESS) != 0);
-    else if ((re->flags & PCRE_STARTLINE) != 0)
+    else if ((re->flags & PCRE2_FIRSTSET) != 0)
+      fast_forward_first_char(common);
+    else if ((re->flags & PCRE2_STARTLINE) != 0)
       fast_forward_newline(common);
-    else if (study != NULL && (study->flags & PCRE_STUDY_MAPPED) != 0)
-      fast_forward_start_bits(common, study->start_bits);
+    else if ((re->flags & PCRE2_FIRSTMAPSET) != 0)
+      fast_forward_start_bits(common);
     }
   }
 else
   continue_match_label = LABEL();
 
-if (mode == JIT_COMPILE && study->minlength > 0 && (re->options & PCRE_NO_START_OPTIMIZE) == 0)
+if (mode == PCRE2_JIT_COMPLETE && re->minlength > 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
   {
-  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_NOMATCH);
-  OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(study->minlength));
+  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_NOMATCH);
+  OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(re->minlength));
   minlength_check_failed = CMP(SLJIT_GREATER, TMP2, 0, STR_END, 0);
   }
 if (common->req_char_ptr != 0)
-  reqbyte_notfound = search_requested_char(common, (pcre_uchar)re->req_char, (re->flags & PCRE_RCH_CASELESS) != 0, (re->flags & PCRE_FIRSTSET) != 0);
+  reqcu_not_found = search_requested_char(common, (PCRE2_UCHAR)(re->last_codeunit), (re->flags & PCRE2_LASTCASELESS) != 0, (re->flags & PCRE2_FIRSTSET) != 0);
 
 /* Store the current STR_PTR in OVECTOR(0). */
 OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(0), STR_PTR, 0);
 /* Copy the limit of allowed recursions. */
 OP1(SLJIT_MOV, COUNT_MATCH, 0, SLJIT_MEM1(SLJIT_SP), LIMIT_MATCH);
 if (common->capture_last_ptr != 0)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr, SLJIT_IMM, -1);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->capture_last_ptr, SLJIT_IMM, 0);
 if (common->fast_forward_bc_ptr != NULL)
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), PRIVATE_DATA(common->fast_forward_bc_ptr + 1), STR_PTR, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), PRIVATE_DATA(common->fast_forward_bc_ptr + 1) >> 3, STR_PTR, 0);
 
 if (common->start_ptr != OVECTOR(0))
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_ptr, STR_PTR, 0);
 
 /* Copy the beginning of the string. */
-if (mode == JIT_PARTIAL_SOFT_COMPILE)
+if (mode == PCRE2_JIT_PARTIAL_SOFT)
   {
   jump = CMP(SLJIT_NOT_EQUAL, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, -1);
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start + sizeof(sljit_sw), STR_PTR, 0);
   JUMPHERE(jump);
   }
-else if (mode == JIT_PARTIAL_HARD_COMPILE)
+else if (mode == PCRE2_JIT_PARTIAL_HARD)
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, STR_PTR, 0);
 
 compile_matchingpath(common, common->start, ccend, &rootbacktrack);
 if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
   {
   sljit_free_compiler(compiler);
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-  free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-  return;
+  SLJIT_FREE(common->optimized_cbracket, allocator_data);
+  SLJIT_FREE(common->private_data_ptrs, allocator_data);
+  PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
+  return PCRE2_ERROR_NOMEMORY;
   }
 
+if ((re->overall_options & PCRE2_ENDANCHORED) != 0)
+  end_anchor_failed = CMP(SLJIT_NOT_EQUAL, STR_PTR, 0, STR_END, 0);
+
 if (common->might_be_empty)
   {
   empty_match = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(0));
@@ -11300,16 +14025,29 @@ if (common->accept != NULL)
 
 /* This means we have a match. Update the ovector. */
 copy_ovector(common, re->top_bracket + 1);
-common->quit_label = common->forced_quit_label = LABEL();
+common->quit_label = common->abort_label = LABEL();
 if (common->quit != NULL)
   set_jumps(common->quit, common->quit_label);
-if (common->forced_quit != NULL)
-  set_jumps(common->forced_quit, common->forced_quit_label);
+if (common->abort != NULL)
+  set_jumps(common->abort, common->abort_label);
 if (minlength_check_failed != NULL)
-  SET_LABEL(minlength_check_failed, common->forced_quit_label);
+  SET_LABEL(minlength_check_failed, common->abort_label);
+
+sljit_emit_op0(compiler, SLJIT_SKIP_FRAMES_BEFORE_RETURN);
 sljit_emit_return(compiler, SLJIT_MOV, SLJIT_RETURN_REG, 0);
 
-if (mode != JIT_COMPILE)
+if (common->failed_match != NULL)
+  {
+  SLJIT_ASSERT(common->mode == PCRE2_JIT_COMPLETE);
+  set_jumps(common->failed_match, LABEL());
+  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_NOMATCH);
+  JUMPTO(SLJIT_JUMP, common->abort_label);
+  }
+
+if ((re->overall_options & PCRE2_ENDANCHORED) != 0)
+  JUMPHERE(end_anchor_failed);
+
+if (mode != PCRE2_JIT_COMPLETE)
   {
   common->partialmatchlabel = LABEL();
   set_jumps(common->partialmatch, common->partialmatchlabel);
@@ -11322,55 +14060,64 @@ compile_backtrackingpath(common, rootbacktrack.top);
 if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
   {
   sljit_free_compiler(compiler);
-  SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-  SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-  free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-  return;
+  SLJIT_FREE(common->optimized_cbracket, allocator_data);
+  SLJIT_FREE(common->private_data_ptrs, allocator_data);
+  PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
+  return PCRE2_ERROR_NOMEMORY;
   }
 
 SLJIT_ASSERT(rootbacktrack.prev == NULL);
 reset_match_label = LABEL();
 
-if (mode == JIT_PARTIAL_SOFT_COMPILE)
+if (mode == PCRE2_JIT_PARTIAL_SOFT)
   {
   /* Update hit_start only in the first time. */
   jump = CMP(SLJIT_NOT_EQUAL, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr);
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->start_ptr);
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->start_used_ptr, SLJIT_IMM, -1);
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->hit_start, TMP1, 0);
   JUMPHERE(jump);
   }
 
 /* Check we have remaining characters. */
-if ((re->options & PCRE_ANCHORED) == 0 && (re->options & PCRE_FIRSTLINE) != 0)
+if ((re->overall_options & PCRE2_ANCHORED) == 0 && common->match_end_ptr != 0)
   {
-  SLJIT_ASSERT(common->match_end_ptr != 0);
   OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr);
   }
 
 OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP),
-    (common->fast_forward_bc_ptr != NULL) ? (PRIVATE_DATA(common->fast_forward_bc_ptr + 1)) : common->start_ptr);
+    (common->fast_forward_bc_ptr != NULL) ? (PRIVATE_DATA(common->fast_forward_bc_ptr + 1) >> 3) : common->start_ptr);
 
-if ((re->options & PCRE_ANCHORED) == 0)
+if ((re->overall_options & PCRE2_ANCHORED) == 0)
   {
   if (common->ff_newline_shortcut != NULL)
     {
-    if ((re->options & PCRE_FIRSTLINE) == 0)
-      CMPTO(SLJIT_LESS, STR_PTR, 0, STR_END, 0, common->ff_newline_shortcut);
-    /* There cannot be more newlines here. */
+    /* There cannot be more newlines if PCRE2_FIRSTLINE is set. */
+    if ((re->overall_options & PCRE2_FIRSTLINE) == 0)
+      {
+      if (common->match_end_ptr != 0)
+        {
+        OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
+        OP1(SLJIT_MOV, STR_END, 0, TMP1, 0);
+        CMPTO(SLJIT_LESS, STR_PTR, 0, TMP1, 0, common->ff_newline_shortcut);
+        OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
+        }
+      else
+        CMPTO(SLJIT_LESS, STR_PTR, 0, STR_END, 0, common->ff_newline_shortcut);
+      }
     }
   else
-    CMPTO(SLJIT_LESS, STR_PTR, 0, ((re->options & PCRE_FIRSTLINE) == 0) ? STR_END : TMP1, 0, mainloop_label);
+    CMPTO(SLJIT_LESS, STR_PTR, 0, (common->match_end_ptr == 0) ? STR_END : TMP1, 0, mainloop_label);
   }
 
 /* No more remaining characters. */
-if (reqbyte_notfound != NULL)
-  JUMPHERE(reqbyte_notfound);
+if (reqcu_not_found != NULL)
+  set_jumps(reqcu_not_found, LABEL());
 
-if (mode == JIT_PARTIAL_SOFT_COMPILE)
+if (mode == PCRE2_JIT_PARTIAL_SOFT)
   CMPTO(SLJIT_NOT_EQUAL, SLJIT_MEM1(SLJIT_SP), common->hit_start, SLJIT_IMM, -1, common->partialmatchlabel);
 
-OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_NOMATCH);
+OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_NOMATCH);
 JUMPTO(SLJIT_JUMP, common->quit_label);
 
 flush_stubs(common);
@@ -11379,37 +14126,58 @@ if (common->might_be_empty)
   {
   JUMPHERE(empty_match);
   OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty));
-  CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0, empty_match_backtrack_label);
-  OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty_atstart));
-  CMPTO(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0, empty_match_found_label);
+  OP1(SLJIT_MOV_U32, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, options));
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, PCRE2_NOTEMPTY);
+  JUMPTO(SLJIT_NOT_ZERO, empty_match_backtrack_label);
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, PCRE2_NOTEMPTY_ATSTART);
+  JUMPTO(SLJIT_ZERO, empty_match_found_label);
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
   CMPTO(SLJIT_NOT_EQUAL, TMP2, 0, STR_PTR, 0, empty_match_found_label);
   JUMPTO(SLJIT_JUMP, empty_match_backtrack_label);
   }
 
 common->fast_forward_bc_ptr = NULL;
-common->fast_fail_start_ptr = 0;
-common->fast_fail_end_ptr = 0;
+common->early_fail_start_ptr = 0;
+common->early_fail_end_ptr = 0;
 common->currententry = common->entries;
-common->local_exit = TRUE;
+common->local_quit_available = TRUE;
 quit_label = common->quit_label;
-while (common->currententry != NULL)
+if (common->currententry != NULL)
   {
-  /* Might add new entries. */
-  compile_recurse(common);
-  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
+  /* A free bit for each private data. */
+  common->recurse_bitset_size = ((private_data_size / (int)sizeof(sljit_sw)) + 7) >> 3;
+  SLJIT_ASSERT(common->recurse_bitset_size > 0);
+  common->recurse_bitset = (sljit_u8*)SLJIT_MALLOC(common->recurse_bitset_size, allocator_data);;
+
+  if (common->recurse_bitset != NULL)
     {
-    sljit_free_compiler(compiler);
-    SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-    SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
-    free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-    return;
+    do
+      {
+      /* Might add new entries. */
+      compile_recurse(common);
+      if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
+        break;
+      flush_stubs(common);
+      common->currententry = common->currententry->next;
+      }
+    while (common->currententry != NULL);
+
+    SLJIT_FREE(common->recurse_bitset, allocator_data);
+    }
+
+  if (common->currententry != NULL)
+    {
+    /* The common->recurse_bitset has been freed. */
+    SLJIT_ASSERT(sljit_get_compiler_error(compiler) || common->recurse_bitset == NULL);
+
+    sljit_free_compiler(compiler);
+    SLJIT_FREE(common->optimized_cbracket, allocator_data);
+    SLJIT_FREE(common->private_data_ptrs, allocator_data);
+    PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
+    return PCRE2_ERROR_NOMEMORY;
     }
-  flush_stubs(common);
-  common->currententry = common->currententry->next;
   }
-common->local_exit = FALSE;
+common->local_quit_available = FALSE;
 common->quit_label = quit_label;
 
 /* Allocating stack, returns with PCRE_ERROR_JIT_STACKLIMIT if fails. */
@@ -11418,31 +14186,32 @@ set_jumps(common->stackalloc, LABEL());
 /* RETURN_ADDR is not a saved register. */
 sljit_emit_fast_enter(compiler, SLJIT_MEM1(SLJIT_SP), LOCALS0);
 
-SLJIT_ASSERT(TMP1 == SLJIT_R0 && STACK_TOP == SLJIT_R1);
+SLJIT_ASSERT(TMP1 == SLJIT_R0 && STR_PTR == SLJIT_R1);
 
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, STACK_TOP, 0);
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, STR_PTR, 0);
 OP1(SLJIT_MOV, SLJIT_R0, 0, ARGUMENTS, 0);
 OP2(SLJIT_SUB, SLJIT_R1, 0, STACK_LIMIT, 0, SLJIT_IMM, STACK_GROWTH_RATE);
 OP1(SLJIT_MOV, SLJIT_R0, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, stack));
 OP1(SLJIT_MOV, STACK_LIMIT, 0, TMP2, 0);
 
-sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_RET(SW) | SLJIT_ARG1(SW) | SLJIT_ARG2(SW), SLJIT_IMM, SLJIT_FUNC_OFFSET(sljit_stack_resize));
+sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM, SLJIT_FUNC_ADDR(sljit_stack_resize));
+
 jump = CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0);
 OP1(SLJIT_MOV, TMP2, 0, STACK_LIMIT, 0);
 OP1(SLJIT_MOV, STACK_LIMIT, 0, SLJIT_RETURN_REG, 0);
 OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
-sljit_emit_fast_return(compiler, TMP1, 0);
+OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
+OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
 
 /* Allocation failed. */
 JUMPHERE(jump);
 /* We break the return address cache here, but this is a really rare case. */
-OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_JIT_STACKLIMIT);
+OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_JIT_STACKLIMIT);
 JUMPTO(SLJIT_JUMP, common->quit_label);
 
 /* Call limit reached. */
 set_jumps(common->calllimit, LABEL());
-OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_MATCHLIMIT);
+OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_MATCHLIMIT);
 JUMPTO(SLJIT_JUMP, common->quit_label);
 
 if (common->revertframes != NULL)
@@ -11488,425 +14257,250 @@ if (common->reset_match != NULL)
   OP1(SLJIT_MOV, STR_PTR, 0, TMP1, 0);
   JUMPTO(SLJIT_JUMP, reset_match_label);
   }
-#ifdef SUPPORT_UTF
-#ifdef COMPILE_PCRE8
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
 if (common->utfreadchar != NULL)
   {
   set_jumps(common->utfreadchar, LABEL());
   do_utfreadchar(common);
   }
-if (common->utfreadchar16 != NULL)
-  {
-  set_jumps(common->utfreadchar16, LABEL());
-  do_utfreadchar16(common);
-  }
 if (common->utfreadtype8 != NULL)
   {
   set_jumps(common->utfreadtype8, LABEL());
   do_utfreadtype8(common);
   }
-#endif /* COMPILE_PCRE8 */
-#endif /* SUPPORT_UTF */
-#ifdef SUPPORT_UCP
+if (common->utfpeakcharback != NULL)
+  {
+  set_jumps(common->utfpeakcharback, LABEL());
+  do_utfpeakcharback(common);
+  }
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
+#if PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16
+if (common->utfreadchar_invalid != NULL)
+  {
+  set_jumps(common->utfreadchar_invalid, LABEL());
+  do_utfreadchar_invalid(common);
+  }
+if (common->utfreadnewline_invalid != NULL)
+  {
+  set_jumps(common->utfreadnewline_invalid, LABEL());
+  do_utfreadnewline_invalid(common);
+  }
+if (common->utfmoveback_invalid)
+  {
+  set_jumps(common->utfmoveback_invalid, LABEL());
+  do_utfmoveback_invalid(common);
+  }
+if (common->utfpeakcharback_invalid)
+  {
+  set_jumps(common->utfpeakcharback_invalid, LABEL());
+  do_utfpeakcharback_invalid(common);
+  }
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16 */
 if (common->getucd != NULL)
   {
   set_jumps(common->getucd, LABEL());
   do_getucd(common);
   }
-#endif
+if (common->getucdtype != NULL)
+  {
+  set_jumps(common->getucdtype, LABEL());
+  do_getucdtype(common);
+  }
+#endif /* SUPPORT_UNICODE */
 
-SLJIT_FREE(common->optimized_cbracket, compiler->allocator_data);
-SLJIT_FREE(common->private_data_ptrs, compiler->allocator_data);
+SLJIT_FREE(common->optimized_cbracket, allocator_data);
+SLJIT_FREE(common->private_data_ptrs, allocator_data);
 
 executable_func = sljit_generate_code(compiler);
 executable_size = sljit_get_generated_code_size(compiler);
-label_addr = common->label_addrs;
-while (label_addr != NULL)
-  {
-  *label_addr->update_addr = sljit_get_label_addr(label_addr->label);
-  label_addr = label_addr->next;
-  }
 sljit_free_compiler(compiler);
+
 if (executable_func == NULL)
   {
-  free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-  return;
+  PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
+  return PCRE2_ERROR_NOMEMORY;
   }
 
 /* Reuse the function descriptor if possible. */
-if ((extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 && extra->executable_jit != NULL)
-  functions = (executable_functions *)extra->executable_jit;
+if (re->executable_jit != NULL)
+  functions = (executable_functions *)re->executable_jit;
 else
   {
-  /* Note: If your memory-checker has flagged the allocation below as a
-   * memory leak, it is probably because you either forgot to call
-   * pcre_free_study() (or pcre16_free_study()) on the pcre_extra (or
-   * pcre16_extra) object, or you called said function after having
-   * cleared the PCRE_EXTRA_EXECUTABLE_JIT bit from the "flags" field
-   * of the object. (The function will only free the JIT data if the
-   * bit remains set, as the bit indicates that the pointer to the data
-   * is valid.)
-   */
-  functions = SLJIT_MALLOC(sizeof(executable_functions), compiler->allocator_data);
+  functions = SLJIT_MALLOC(sizeof(executable_functions), allocator_data);
   if (functions == NULL)
     {
     /* This case is highly unlikely since we just recently
     freed a lot of memory. Not impossible though. */
-    sljit_free_code(executable_func);
-    free_read_only_data(common->read_only_data_head, compiler->allocator_data);
-    return;
+    sljit_free_code(executable_func, NULL);
+    PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
+    return PCRE2_ERROR_NOMEMORY;
     }
   memset(functions, 0, sizeof(executable_functions));
-  functions->top_bracket = (re->top_bracket + 1) * 2;
-  functions->limit_match = (re->flags & PCRE_MLSET) != 0 ? re->limit_match : 0;
-  extra->executable_jit = functions;
-  extra->flags |= PCRE_EXTRA_EXECUTABLE_JIT;
+  functions->top_bracket = re->top_bracket + 1;
+  functions->limit_match = re->limit_match;
+  re->executable_jit = functions;
   }
 
+/* Turn mode into an index. */
+if (mode == PCRE2_JIT_COMPLETE)
+  mode = 0;
+else
+  mode = (mode == PCRE2_JIT_PARTIAL_SOFT) ? 1 : 2;
+
+SLJIT_ASSERT(mode < JIT_NUMBER_OF_COMPILE_MODES);
 functions->executable_funcs[mode] = executable_func;
 functions->read_only_data_heads[mode] = common->read_only_data_head;
 functions->executable_sizes[mode] = executable_size;
+return 0;
 }
 
-static SLJIT_NOINLINE int jit_machine_stack_exec(jit_arguments *arguments, void *executable_func)
-{
-union {
-   void *executable_func;
-   jit_function call_executable_func;
-} convert_executable_func;
-sljit_u8 local_space[MACHINE_STACK_SIZE];
-struct sljit_stack local_stack;
-
-local_stack.min_start = local_space;
-local_stack.start = local_space;
-local_stack.end = local_space + MACHINE_STACK_SIZE;
-local_stack.top = local_space + MACHINE_STACK_SIZE;
-arguments->stack = &local_stack;
-convert_executable_func.executable_func = executable_func;
-return convert_executable_func.call_executable_func(arguments);
-}
-
-int
-PRIV(jit_exec)(const PUBL(extra) *extra_data, const pcre_uchar *subject,
-  int length, int start_offset, int options, int *offsets, int offset_count)
-{
-executable_functions *functions = (executable_functions *)extra_data->executable_jit;
-union {
-   void *executable_func;
-   jit_function call_executable_func;
-} convert_executable_func;
-jit_arguments arguments;
-int max_offset_count;
-int retval;
-int mode = JIT_COMPILE;
-
-if ((options & PCRE_PARTIAL_HARD) != 0)
-  mode = JIT_PARTIAL_HARD_COMPILE;
-else if ((options & PCRE_PARTIAL_SOFT) != 0)
-  mode = JIT_PARTIAL_SOFT_COMPILE;
-
-if (functions->executable_funcs[mode] == NULL)
-  return PCRE_ERROR_JIT_BADOPTION;
-
-/* Sanity checks should be handled by pcre_exec. */
-arguments.str = subject + start_offset;
-arguments.begin = subject;
-arguments.end = subject + length;
-arguments.mark_ptr = NULL;
-/* JIT decreases this value less frequently than the interpreter. */
-arguments.limit_match = ((extra_data->flags & PCRE_EXTRA_MATCH_LIMIT) == 0) ? MATCH_LIMIT : (sljit_u32)(extra_data->match_limit);
-if (functions->limit_match != 0 && functions->limit_match < arguments.limit_match)
-  arguments.limit_match = functions->limit_match;
-arguments.notbol = (options & PCRE_NOTBOL) != 0;
-arguments.noteol = (options & PCRE_NOTEOL) != 0;
-arguments.notempty = (options & PCRE_NOTEMPTY) != 0;
-arguments.notempty_atstart = (options & PCRE_NOTEMPTY_ATSTART) != 0;
-arguments.offsets = offsets;
-arguments.callout_data = (extra_data->flags & PCRE_EXTRA_CALLOUT_DATA) != 0 ? extra_data->callout_data : NULL;
-arguments.real_offset_count = offset_count;
-
-/* pcre_exec() rounds offset_count to a multiple of 3, and then uses only 2/3 of
-the output vector for storing captured strings, with the remainder used as
-workspace. We don't need the workspace here. For compatibility, we limit the
-number of captured strings in the same way as pcre_exec(), so that the user
-gets the same result with and without JIT. */
-
-if (offset_count != 2)
-  offset_count = ((offset_count - (offset_count % 3)) * 2) / 3;
-max_offset_count = functions->top_bracket;
-if (offset_count > max_offset_count)
-  offset_count = max_offset_count;
-arguments.offset_count = offset_count;
-
-if (functions->callback)
-  arguments.stack = (struct sljit_stack *)functions->callback(functions->userdata);
-else
-  arguments.stack = (struct sljit_stack *)functions->userdata;
-
-if (arguments.stack == NULL)
-  retval = jit_machine_stack_exec(&arguments, functions->executable_funcs[mode]);
-else
-  {
-  convert_executable_func.executable_func = functions->executable_funcs[mode];
-  retval = convert_executable_func.call_executable_func(&arguments);
-  }
-
-if (retval * 2 > offset_count)
-  retval = 0;
-if ((extra_data->flags & PCRE_EXTRA_MARK) != 0)
-  *(extra_data->mark) = arguments.mark_ptr;
-
-return retval;
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_jit_exec(const pcre *argument_re, const pcre_extra *extra_data,
-  PCRE_SPTR subject, int length, int start_offset, int options,
-  int *offsets, int offset_count, pcre_jit_stack *stack)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_jit_exec(const pcre16 *argument_re, const pcre16_extra *extra_data,
-  PCRE_SPTR16 subject, int length, int start_offset, int options,
-  int *offsets, int offset_count, pcre16_jit_stack *stack)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_jit_exec(const pcre32 *argument_re, const pcre32_extra *extra_data,
-  PCRE_SPTR32 subject, int length, int start_offset, int options,
-  int *offsets, int offset_count, pcre32_jit_stack *stack)
-#endif
-{
-pcre_uchar *subject_ptr = (pcre_uchar *)subject;
-executable_functions *functions = (executable_functions *)extra_data->executable_jit;
-union {
-   void *executable_func;
-   jit_function call_executable_func;
-} convert_executable_func;
-jit_arguments arguments;
-int max_offset_count;
-int retval;
-int mode = JIT_COMPILE;
-
-SLJIT_UNUSED_ARG(argument_re);
-
-/* Plausibility checks */
-if ((options & ~PUBLIC_JIT_EXEC_OPTIONS) != 0) return PCRE_ERROR_JIT_BADOPTION;
-
-if ((options & PCRE_PARTIAL_HARD) != 0)
-  mode = JIT_PARTIAL_HARD_COMPILE;
-else if ((options & PCRE_PARTIAL_SOFT) != 0)
-  mode = JIT_PARTIAL_SOFT_COMPILE;
-
-if (functions == NULL || functions->executable_funcs[mode] == NULL)
-  return PCRE_ERROR_JIT_BADOPTION;
-
-/* Sanity checks should be handled by pcre_exec. */
-arguments.stack = (struct sljit_stack *)stack;
-arguments.str = subject_ptr + start_offset;
-arguments.begin = subject_ptr;
-arguments.end = subject_ptr + length;
-arguments.mark_ptr = NULL;
-/* JIT decreases this value less frequently than the interpreter. */
-arguments.limit_match = ((extra_data->flags & PCRE_EXTRA_MATCH_LIMIT) == 0) ? MATCH_LIMIT : (sljit_u32)(extra_data->match_limit);
-if (functions->limit_match != 0 && functions->limit_match < arguments.limit_match)
-  arguments.limit_match = functions->limit_match;
-arguments.notbol = (options & PCRE_NOTBOL) != 0;
-arguments.noteol = (options & PCRE_NOTEOL) != 0;
-arguments.notempty = (options & PCRE_NOTEMPTY) != 0;
-arguments.notempty_atstart = (options & PCRE_NOTEMPTY_ATSTART) != 0;
-arguments.offsets = offsets;
-arguments.callout_data = (extra_data->flags & PCRE_EXTRA_CALLOUT_DATA) != 0 ? extra_data->callout_data : NULL;
-arguments.real_offset_count = offset_count;
-
-/* pcre_exec() rounds offset_count to a multiple of 3, and then uses only 2/3 of
-the output vector for storing captured strings, with the remainder used as
-workspace. We don't need the workspace here. For compatibility, we limit the
-number of captured strings in the same way as pcre_exec(), so that the user
-gets the same result with and without JIT. */
-
-if (offset_count != 2)
-  offset_count = ((offset_count - (offset_count % 3)) * 2) / 3;
-max_offset_count = functions->top_bracket;
-if (offset_count > max_offset_count)
-  offset_count = max_offset_count;
-arguments.offset_count = offset_count;
-
-convert_executable_func.executable_func = functions->executable_funcs[mode];
-retval = convert_executable_func.call_executable_func(&arguments);
-
-if (retval * 2 > offset_count)
-  retval = 0;
-if ((extra_data->flags & PCRE_EXTRA_MARK) != 0)
-  *(extra_data->mark) = arguments.mark_ptr;
-
-return retval;
-}
-
-void
-PRIV(jit_free)(void *executable_funcs)
-{
-int i;
-executable_functions *functions = (executable_functions *)executable_funcs;
-for (i = 0; i < JIT_NUMBER_OF_COMPILE_MODES; i++)
-  {
-  if (functions->executable_funcs[i] != NULL)
-    sljit_free_code(functions->executable_funcs[i]);
-  free_read_only_data(functions->read_only_data_heads[i], NULL);
-  }
-SLJIT_FREE(functions, compiler->allocator_data);
-}
-
-int
-PRIV(jit_get_size)(void *executable_funcs)
-{
-int i;
-sljit_uw size = 0;
-sljit_uw *executable_sizes = ((executable_functions *)executable_funcs)->executable_sizes;
-for (i = 0; i < JIT_NUMBER_OF_COMPILE_MODES; i++)
-  size += executable_sizes[i];
-return (int)size;
-}
-
-const char*
-PRIV(jit_get_target)(void)
-{
-return sljit_get_platform_name();
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL pcre_jit_stack *
-pcre_jit_stack_alloc(int startsize, int maxsize)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL pcre16_jit_stack *
-pcre16_jit_stack_alloc(int startsize, int maxsize)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL pcre32_jit_stack *
-pcre32_jit_stack_alloc(int startsize, int maxsize)
-#endif
-{
-if (startsize < 1 || maxsize < 1)
-  return NULL;
-if (startsize > maxsize)
-  startsize = maxsize;
-startsize = (startsize + STACK_GROWTH_RATE - 1) & ~(STACK_GROWTH_RATE - 1);
-maxsize = (maxsize + STACK_GROWTH_RATE - 1) & ~(STACK_GROWTH_RATE - 1);
-return (PUBL(jit_stack)*)sljit_allocate_stack(startsize, maxsize, NULL);
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_jit_stack_free(pcre_jit_stack *stack)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_jit_stack_free(pcre16_jit_stack *stack)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_jit_stack_free(pcre32_jit_stack *stack)
-#endif
-{
-sljit_free_stack((struct sljit_stack *)stack, NULL);
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_assign_jit_stack(pcre_extra *extra, pcre_jit_callback callback, void *userdata)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_assign_jit_stack(pcre16_extra *extra, pcre16_jit_callback callback, void *userdata)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_assign_jit_stack(pcre32_extra *extra, pcre32_jit_callback callback, void *userdata)
 #endif
+
+/*************************************************
+*        JIT compile a Regular Expression        *
+*************************************************/
+
+/* This function used JIT to convert a previously-compiled pattern into machine
+code.
+
+Arguments:
+  code          a compiled pattern
+  options       JIT option bits
+
+Returns:        0: success or (*NOJIT) was used
+               <0: an error code
+*/
+
+#define PUBLIC_JIT_COMPILE_OPTIONS \
+  (PCRE2_JIT_COMPLETE|PCRE2_JIT_PARTIAL_SOFT|PCRE2_JIT_PARTIAL_HARD|PCRE2_JIT_INVALID_UTF)
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_jit_compile(pcre2_code *code, uint32_t options)
 {
+pcre2_real_code *re = (pcre2_real_code *)code;
+#ifdef SUPPORT_JIT
 executable_functions *functions;
-if (extra != NULL &&
-    (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&
-    extra->executable_jit != NULL)
-  {
-  functions = (executable_functions *)extra->executable_jit;
-  functions->callback = callback;
-  functions->userdata = userdata;
-  }
-}
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_jit_free_unused_memory(void)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_jit_free_unused_memory(void)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_jit_free_unused_memory(void)
+static int executable_allocator_is_working = 0;
 #endif
-{
-sljit_free_unused_memory_exec();
-}
 
+if (code == NULL)
+  return PCRE2_ERROR_NULL;
+
+if ((options & ~PUBLIC_JIT_COMPILE_OPTIONS) != 0)
+  return PCRE2_ERROR_JIT_BADOPTION;
+
+/* Support for invalid UTF was first introduced in JIT, with the option
+PCRE2_JIT_INVALID_UTF. Later, support was added to the interpreter, and the
+compile-time option PCRE2_MATCH_INVALID_UTF was created. This is now the
+preferred feature, with the earlier option deprecated. However, for backward
+compatibility, if the earlier option is set, it forces the new option so that
+if JIT matching falls back to the interpreter, there is still support for
+invalid UTF. However, if this function has already been successfully called
+without PCRE2_JIT_INVALID_UTF and without PCRE2_MATCH_INVALID_UTF (meaning that
+non-invalid-supporting JIT code was compiled), give an error.
+
+If in the future support for PCRE2_JIT_INVALID_UTF is withdrawn, the following
+actions are needed:
+
+  1. Remove the definition from pcre2.h.in and from the list in
+     PUBLIC_JIT_COMPILE_OPTIONS above.
+
+  2. Replace PCRE2_JIT_INVALID_UTF with a local flag in this module.
+
+  3. Replace PCRE2_JIT_INVALID_UTF in pcre2_jit_test.c.
+
+  4. Delete the following short block of code. The setting of "re" and
+     "functions" can be moved into the JIT-only block below, but if that is
+     done, (void)re and (void)functions will be needed in the non-JIT case, to
+     avoid compiler warnings.
+*/
+
+#ifdef SUPPORT_JIT
+functions = (executable_functions *)re->executable_jit;
+#endif
+
+if ((options & PCRE2_JIT_INVALID_UTF) != 0)
+  {
+  if ((re->overall_options & PCRE2_MATCH_INVALID_UTF) == 0)
+    {
+#ifdef SUPPORT_JIT
+    if (functions != NULL) return PCRE2_ERROR_JIT_BADOPTION;
+#endif
+    re->overall_options |= PCRE2_MATCH_INVALID_UTF;
+    }
+  }
+
+/* The above tests are run with and without JIT support. This means that
+PCRE2_JIT_INVALID_UTF propagates back into the regex options (ensuring
+interpreter support) even in the absence of JIT. But now, if there is no JIT
+support, give an error return. */
+
+#ifndef SUPPORT_JIT
+return PCRE2_ERROR_JIT_BADOPTION;
 #else  /* SUPPORT_JIT */
 
-/* These are dummy functions to avoid linking errors when JIT support is not
-being compiled. */
+/* There is JIT support. Do the necessary. */
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL pcre_jit_stack *
-pcre_jit_stack_alloc(int startsize, int maxsize)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL pcre16_jit_stack *
-pcre16_jit_stack_alloc(int startsize, int maxsize)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL pcre32_jit_stack *
-pcre32_jit_stack_alloc(int startsize, int maxsize)
-#endif
-{
-(void)startsize;
-(void)maxsize;
-return NULL;
+if ((re->flags & PCRE2_NOJIT) != 0) return 0;
+
+if (executable_allocator_is_working == 0)
+  {
+  /* Checks whether the executable allocator is working. This check
+     might run multiple times in multi-threaded environments, but the
+     result should not be affected by it. */
+  void *ptr = SLJIT_MALLOC_EXEC(32, NULL);
+
+  executable_allocator_is_working = -1;
+
+  if (ptr != NULL)
+    {
+    SLJIT_FREE_EXEC(((sljit_u8*)(ptr)) + SLJIT_EXEC_OFFSET(ptr), NULL);
+    executable_allocator_is_working = 1;
+    }
+  }
+
+if (executable_allocator_is_working < 0)
+  return PCRE2_ERROR_NOMEMORY;
+
+if ((re->overall_options & PCRE2_MATCH_INVALID_UTF) != 0)
+  options |= PCRE2_JIT_INVALID_UTF;
+
+if ((options & PCRE2_JIT_COMPLETE) != 0 && (functions == NULL
+    || functions->executable_funcs[0] == NULL)) {
+  uint32_t excluded_options = (PCRE2_JIT_PARTIAL_SOFT | PCRE2_JIT_PARTIAL_HARD);
+  int result = jit_compile(code, options & ~excluded_options);
+  if (result != 0)
+    return result;
+  }
+
+if ((options & PCRE2_JIT_PARTIAL_SOFT) != 0 && (functions == NULL
+    || functions->executable_funcs[1] == NULL)) {
+  uint32_t excluded_options = (PCRE2_JIT_COMPLETE | PCRE2_JIT_PARTIAL_HARD);
+  int result = jit_compile(code, options & ~excluded_options);
+  if (result != 0)
+    return result;
+  }
+
+if ((options & PCRE2_JIT_PARTIAL_HARD) != 0 && (functions == NULL
+    || functions->executable_funcs[2] == NULL)) {
+  uint32_t excluded_options = (PCRE2_JIT_COMPLETE | PCRE2_JIT_PARTIAL_SOFT);
+  int result = jit_compile(code, options & ~excluded_options);
+  if (result != 0)
+    return result;
+  }
+
+return 0;
+
+#endif  /* SUPPORT_JIT */
 }
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_jit_stack_free(pcre_jit_stack *stack)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_jit_stack_free(pcre16_jit_stack *stack)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_jit_stack_free(pcre32_jit_stack *stack)
-#endif
-{
-(void)stack;
-}
+/* JIT compiler uses an all-in-one approach. This improves security,
+   since the code generator functions are not exported. */
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_assign_jit_stack(pcre_extra *extra, pcre_jit_callback callback, void *userdata)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_assign_jit_stack(pcre16_extra *extra, pcre16_jit_callback callback, void *userdata)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_assign_jit_stack(pcre32_extra *extra, pcre32_jit_callback callback, void *userdata)
-#endif
-{
-(void)extra;
-(void)callback;
-(void)userdata;
-}
+#define INCLUDED_FROM_PCRE2_JIT_COMPILE
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL void
-pcre_jit_free_unused_memory(void)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL void
-pcre16_jit_free_unused_memory(void)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL void
-pcre32_jit_free_unused_memory(void)
-#endif
-{
-}
+#include "pcre2_jit_match.c"
+#include "pcre2_jit_misc.c"
 
-#endif
-
-/* End of pcre_jit_compile.c */
+/* End of pcre2_jit_compile.c */
diff --git a/Foundation/src/pcre2_jit_match.c b/Foundation/src/pcre2_jit_match.c
new file mode 100644
index 000000000..1ab3af073
--- /dev/null
+++ b/Foundation/src/pcre2_jit_match.c
@@ -0,0 +1,186 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2018 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef INCLUDED_FROM_PCRE2_JIT_COMPILE
+#error This file must be included from pcre2_jit_compile.c.
+#endif
+
+#ifdef SUPPORT_JIT
+
+static SLJIT_NOINLINE int jit_machine_stack_exec(jit_arguments *arguments, jit_function executable_func)
+{
+sljit_u8 local_space[MACHINE_STACK_SIZE];
+struct sljit_stack local_stack;
+
+local_stack.min_start = local_space;
+local_stack.start = local_space;
+local_stack.end = local_space + MACHINE_STACK_SIZE;
+local_stack.top = local_space + MACHINE_STACK_SIZE;
+arguments->stack = &local_stack;
+return executable_func(arguments);
+}
+
+#endif
+
+
+/*************************************************
+*              Do a JIT pattern match            *
+*************************************************/
+
+/* This function runs a JIT pattern match.
+
+Arguments:
+  code            points to the compiled expression
+  subject         points to the subject string
+  length          length of subject string (may contain binary zeros)
+  start_offset    where to start in the subject string
+  options         option bits
+  match_data      points to a match_data block
+  mcontext        points to a match context
+
+Returns:          > 0 => success; value is the number of ovector pairs filled
+                  = 0 => success, but ovector is not big enough
+                   -1 => failed to match (PCRE_ERROR_NOMATCH)
+                 < -1 => some kind of unexpected problem
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_jit_match(const pcre2_code *code, PCRE2_SPTR subject, PCRE2_SIZE length,
+  PCRE2_SIZE start_offset, uint32_t options, pcre2_match_data *match_data,
+  pcre2_match_context *mcontext)
+{
+#ifndef SUPPORT_JIT
+
+(void)code;
+(void)subject;
+(void)length;
+(void)start_offset;
+(void)options;
+(void)match_data;
+(void)mcontext;
+return PCRE2_ERROR_JIT_BADOPTION;
+
+#else  /* SUPPORT_JIT */
+
+pcre2_real_code *re = (pcre2_real_code *)code;
+executable_functions *functions = (executable_functions *)re->executable_jit;
+pcre2_jit_stack *jit_stack;
+uint32_t oveccount = match_data->oveccount;
+uint32_t max_oveccount;
+union {
+   void *executable_func;
+   jit_function call_executable_func;
+} convert_executable_func;
+jit_arguments arguments;
+int rc;
+int index = 0;
+
+if ((options & PCRE2_PARTIAL_HARD) != 0)
+  index = 2;
+else if ((options & PCRE2_PARTIAL_SOFT) != 0)
+  index = 1;
+
+if (functions == NULL || functions->executable_funcs[index] == NULL)
+  return PCRE2_ERROR_JIT_BADOPTION;
+
+/* Sanity checks should be handled by pcre2_match. */
+arguments.str = subject + start_offset;
+arguments.begin = subject;
+arguments.end = subject + length;
+arguments.match_data = match_data;
+arguments.startchar_ptr = subject;
+arguments.mark_ptr = NULL;
+arguments.options = options;
+
+if (mcontext != NULL)
+  {
+  arguments.callout = mcontext->callout;
+  arguments.callout_data = mcontext->callout_data;
+  arguments.offset_limit = mcontext->offset_limit;
+  arguments.limit_match = (mcontext->match_limit < re->limit_match)?
+    mcontext->match_limit : re->limit_match;
+  if (mcontext->jit_callback != NULL)
+    jit_stack = mcontext->jit_callback(mcontext->jit_callback_data);
+  else
+    jit_stack = (pcre2_jit_stack *)mcontext->jit_callback_data;
+  }
+else
+  {
+  arguments.callout = NULL;
+  arguments.callout_data = NULL;
+  arguments.offset_limit = PCRE2_UNSET;
+  arguments.limit_match = (MATCH_LIMIT < re->limit_match)?
+    MATCH_LIMIT : re->limit_match;
+  jit_stack = NULL;
+  }
+
+
+max_oveccount = functions->top_bracket;
+if (oveccount > max_oveccount)
+  oveccount = max_oveccount;
+arguments.oveccount = oveccount << 1;
+
+
+convert_executable_func.executable_func = functions->executable_funcs[index];
+if (jit_stack != NULL)
+  {
+  arguments.stack = (struct sljit_stack *)(jit_stack->stack);
+  rc = convert_executable_func.call_executable_func(&arguments);
+  }
+else
+  rc = jit_machine_stack_exec(&arguments, convert_executable_func.call_executable_func);
+
+if (rc > (int)oveccount)
+  rc = 0;
+match_data->code = re;
+match_data->subject = (rc >= 0 || rc == PCRE2_ERROR_PARTIAL)? subject : NULL;
+match_data->rc = rc;
+match_data->startchar = arguments.startchar_ptr - subject;
+match_data->leftchar = 0;
+match_data->rightchar = 0;
+match_data->mark = arguments.mark_ptr;
+match_data->matchedby = PCRE2_MATCHEDBY_JIT;
+
+return match_data->rc;
+
+#endif  /* SUPPORT_JIT */
+}
+
+/* End of pcre2_jit_match.c */
diff --git a/Foundation/src/pcre2_jit_misc.c b/Foundation/src/pcre2_jit_misc.c
new file mode 100644
index 000000000..e57afad06
--- /dev/null
+++ b/Foundation/src/pcre2_jit_misc.c
@@ -0,0 +1,232 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+         New API code Copyright (c) 2016 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#ifndef INCLUDED_FROM_PCRE2_JIT_COMPILE
+#error This file must be included from pcre2_jit_compile.c.
+#endif
+
+
+
+/*************************************************
+*           Free JIT read-only data              *
+*************************************************/
+
+void
+PRIV(jit_free_rodata)(void *current, void *allocator_data)
+{
+#ifndef SUPPORT_JIT
+(void)current;
+(void)allocator_data;
+#else  /* SUPPORT_JIT */
+void *next;
+
+SLJIT_UNUSED_ARG(allocator_data);
+
+while (current != NULL)
+  {
+  next = *(void**)current;
+  SLJIT_FREE(current, allocator_data);
+  current = next;
+  }
+
+#endif /* SUPPORT_JIT */
+}
+
+/*************************************************
+*           Free JIT compiled code               *
+*************************************************/
+
+void
+PRIV(jit_free)(void *executable_jit, pcre2_memctl *memctl)
+{
+#ifndef SUPPORT_JIT
+(void)executable_jit;
+(void)memctl;
+#else  /* SUPPORT_JIT */
+
+executable_functions *functions = (executable_functions *)executable_jit;
+void *allocator_data = memctl;
+int i;
+
+for (i = 0; i < JIT_NUMBER_OF_COMPILE_MODES; i++)
+  {
+  if (functions->executable_funcs[i] != NULL)
+    sljit_free_code(functions->executable_funcs[i], NULL);
+  PRIV(jit_free_rodata)(functions->read_only_data_heads[i], allocator_data);
+  }
+
+SLJIT_FREE(functions, allocator_data);
+
+#endif /* SUPPORT_JIT */
+}
+
+
+/*************************************************
+*            Free unused JIT memory              *
+*************************************************/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_jit_free_unused_memory(pcre2_general_context *gcontext)
+{
+#ifndef SUPPORT_JIT
+(void)gcontext;     /* Suppress warning */
+#else  /* SUPPORT_JIT */
+SLJIT_UNUSED_ARG(gcontext);
+sljit_free_unused_memory_exec();
+#endif  /* SUPPORT_JIT */
+}
+
+
+
+/*************************************************
+*            Allocate a JIT stack                *
+*************************************************/
+
+PCRE2_EXP_DEFN pcre2_jit_stack * PCRE2_CALL_CONVENTION
+pcre2_jit_stack_create(size_t startsize, size_t maxsize,
+  pcre2_general_context *gcontext)
+{
+#ifndef SUPPORT_JIT
+
+(void)gcontext;
+(void)startsize;
+(void)maxsize;
+return NULL;
+
+#else  /* SUPPORT_JIT */
+
+pcre2_jit_stack *jit_stack;
+
+if (startsize == 0 || maxsize == 0 || maxsize > SIZE_MAX - STACK_GROWTH_RATE)
+  return NULL;
+if (startsize > maxsize)
+  startsize = maxsize;
+startsize = (startsize + STACK_GROWTH_RATE - 1) & ~(STACK_GROWTH_RATE - 1);
+maxsize = (maxsize + STACK_GROWTH_RATE - 1) & ~(STACK_GROWTH_RATE - 1);
+
+jit_stack = PRIV(memctl_malloc)(sizeof(pcre2_real_jit_stack), (pcre2_memctl *)gcontext);
+if (jit_stack == NULL) return NULL;
+jit_stack->stack = sljit_allocate_stack(startsize, maxsize, &jit_stack->memctl);
+if (jit_stack->stack == NULL)
+  {
+  jit_stack->memctl.free(jit_stack, jit_stack->memctl.memory_data);
+  return NULL;
+  }
+return jit_stack;
+
+#endif
+}
+
+
+/*************************************************
+*         Assign a JIT stack to a pattern        *
+*************************************************/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_jit_stack_assign(pcre2_match_context *mcontext, pcre2_jit_callback callback,
+  void *callback_data)
+{
+#ifndef SUPPORT_JIT
+(void)mcontext;
+(void)callback;
+(void)callback_data;
+#else  /* SUPPORT_JIT */
+
+if (mcontext == NULL) return;
+mcontext->jit_callback = callback;
+mcontext->jit_callback_data = callback_data;
+
+#endif  /* SUPPORT_JIT */
+}
+
+
+/*************************************************
+*               Free a JIT stack                 *
+*************************************************/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_jit_stack_free(pcre2_jit_stack *jit_stack)
+{
+#ifndef SUPPORT_JIT
+(void)jit_stack;
+#else  /* SUPPORT_JIT */
+if (jit_stack != NULL)
+  {
+  sljit_free_stack((struct sljit_stack *)(jit_stack->stack), &jit_stack->memctl);
+  jit_stack->memctl.free(jit_stack, jit_stack->memctl.memory_data);
+  }
+#endif  /* SUPPORT_JIT */
+}
+
+
+/*************************************************
+*               Get target CPU type              *
+*************************************************/
+
+const char*
+PRIV(jit_get_target)(void)
+{
+#ifndef SUPPORT_JIT
+return "JIT is not supported";
+#else  /* SUPPORT_JIT */
+return sljit_get_platform_name();
+#endif  /* SUPPORT_JIT */
+}
+
+
+/*************************************************
+*              Get size of JIT code              *
+*************************************************/
+
+size_t
+PRIV(jit_get_size)(void *executable_jit)
+{
+#ifndef SUPPORT_JIT
+(void)executable_jit;
+return 0;
+#else  /* SUPPORT_JIT */
+sljit_uw *executable_sizes = ((executable_functions *)executable_jit)->executable_sizes;
+SLJIT_COMPILE_ASSERT(JIT_NUMBER_OF_COMPILE_MODES == 3, number_of_compile_modes_changed);
+return executable_sizes[0] + executable_sizes[1] + executable_sizes[2];
+#endif
+}
+
+/* End of pcre2_jit_misc.c */
diff --git a/Foundation/src/pcre_maketables.c b/Foundation/src/pcre2_maketables.c
similarity index 56%
rename from Foundation/src/pcre_maketables.c
rename to Foundation/src/pcre2_maketables.c
index d86e391da..69278d250 100644
--- a/Foundation/src/pcre_maketables.c
+++ b/Foundation/src/pcre2_maketables.c
@@ -6,7 +6,8 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2020 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -38,52 +39,53 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 
-/* This module contains the external function pcre_maketables(), which builds
-character tables for PCRE in the current locale. The file is compiled on its
-own as part of the PCRE library. However, it is also included in the
-compilation of dftables.c, in which case the macro DFTABLES is defined. */
+/* This module contains the external function pcre2_maketables(), which builds
+character tables for PCRE2 in the current locale. The file is compiled on its
+own as part of the PCRE2 library. It is also included in the compilation of
+pcre2_dftables.c as a freestanding program, in which case the macro
+PCRE2_DFTABLES is defined. */
 
-#pragma warning( disable : 4244)  // conversion from 'int' to 'unsigned short', possible loss of data
-
-#ifndef DFTABLES
-#  include "pcre_config.h"
-#  include "pcre_internal.h"
+#ifndef PCRE2_DFTABLES    /* Compiling the library */
+#  include "pcre2_config.h"
+#  include "pcre2_internal.h"
 #endif
 
 
+
 /*************************************************
-*           Create PCRE character tables         *
+*           Create PCRE2 character tables        *
 *************************************************/
 
-/* This function builds a set of character tables for use by PCRE and returns
+/* This function builds a set of character tables for use by PCRE2 and returns
 a pointer to them. They are build using the ctype functions, and consequently
 their contents will depend upon the current locale setting. When compiled as
-part of the library, the store is obtained via PUBL(malloc)(), but when
-compiled inside dftables, use malloc().
+part of the library, the store is obtained via a general context malloc, if
+supplied, but when PCRE2_DFTABLES is defined (when compiling the pcre2_dftables
+freestanding auxiliary program) malloc() is used, and the function has a
+different name so as not to clash with the prototype in pcre2.h.
 
-Arguments:   none
+Arguments:   none when PCRE2_DFTABLES is defined
+               else a PCRE2 general context or NULL
 Returns:     pointer to the contiguous block of data
+               else NULL if memory allocation failed
 */
 
-#if defined COMPILE_PCRE8
-const unsigned char *
-pcre_maketables(void)
-#elif defined COMPILE_PCRE16
-const unsigned char *
-pcre16_maketables(void)
-#elif defined COMPILE_PCRE32
-const unsigned char *
-pcre32_maketables(void)
-#endif
+#ifdef PCRE2_DFTABLES  /* Included in freestanding pcre2_dftables program */
+static const uint8_t *maketables(void)
 {
-unsigned char *yield, *p;
-int i;
+uint8_t *yield = (uint8_t *)malloc(TABLES_LENGTH);
 
-#ifndef DFTABLES
-yield = (unsigned char*)(PUBL(malloc))(tables_length);
-#else
-yield = (unsigned char*)malloc(tables_length);
-#endif
+#else  /* Not PCRE2_DFTABLES, that is, compiling the library */
+PCRE2_EXP_DEFN const uint8_t * PCRE2_CALL_CONVENTION
+pcre2_maketables(pcre2_general_context *gcontext)
+{
+uint8_t *yield = (uint8_t *)((gcontext != NULL)?
+  gcontext->memctl.malloc(TABLES_LENGTH, gcontext->memctl.memory_data) :
+  malloc(TABLES_LENGTH));
+#endif  /* PCRE2_DFTABLES */
+
+int i;
+uint8_t *p;
 
 if (yield == NULL) return NULL;
 p = yield;
@@ -101,8 +103,8 @@ exclusive ones - in some locales things may be different.
 
 Note that the table for "space" includes everything "isspace" gives, including
 VT in the default locale. This makes it work for the POSIX class [:space:].
-From release 8.34 is is also correct for Perl space, because Perl added VT at
-release 5.18.
+From PCRE1 release 8.34 and for all PCRE2 releases it is also correct for Perl
+space, because Perl added VT at release 5.18.
 
 Note also that it is possible for a character to be alnum or alpha without
 being lower or upper, such as "male and female ordinals" (\xAA and \xBA) in the
@@ -112,44 +114,48 @@ test for alnum specially. */
 memset(p, 0, cbit_length);
 for (i = 0; i < 256; i++)
   {
-  if (isdigit(i)) p[cbit_digit  + i/8] |= 1 << (i&7);
-  if (isupper(i)) p[cbit_upper  + i/8] |= 1 << (i&7);
-  if (islower(i)) p[cbit_lower  + i/8] |= 1 << (i&7);
-  if (isalnum(i)) p[cbit_word   + i/8] |= 1 << (i&7);
-  if (i == '_')   p[cbit_word   + i/8] |= 1 << (i&7);
-  if (isspace(i)) p[cbit_space  + i/8] |= 1 << (i&7);
-  if (isxdigit(i))p[cbit_xdigit + i/8] |= 1 << (i&7);
-  if (isgraph(i)) p[cbit_graph  + i/8] |= 1 << (i&7);
-  if (isprint(i)) p[cbit_print  + i/8] |= 1 << (i&7);
-  if (ispunct(i)) p[cbit_punct  + i/8] |= 1 << (i&7);
-  if (iscntrl(i)) p[cbit_cntrl  + i/8] |= 1 << (i&7);
+  if (isdigit(i))  p[cbit_digit  + i/8] |= 1u << (i&7);
+  if (isupper(i))  p[cbit_upper  + i/8] |= 1u << (i&7);
+  if (islower(i))  p[cbit_lower  + i/8] |= 1u << (i&7);
+  if (isalnum(i))  p[cbit_word   + i/8] |= 1u << (i&7);
+  if (i == '_')    p[cbit_word   + i/8] |= 1u << (i&7);
+  if (isspace(i))  p[cbit_space  + i/8] |= 1u << (i&7);
+  if (isxdigit(i)) p[cbit_xdigit + i/8] |= 1u << (i&7);
+  if (isgraph(i))  p[cbit_graph  + i/8] |= 1u << (i&7);
+  if (isprint(i))  p[cbit_print  + i/8] |= 1u << (i&7);
+  if (ispunct(i))  p[cbit_punct  + i/8] |= 1u << (i&7);
+  if (iscntrl(i))  p[cbit_cntrl  + i/8] |= 1u << (i&7);
   }
 p += cbit_length;
 
 /* Finally, the character type table. In this, we used to exclude VT from the
 white space chars, because Perl didn't recognize it as such for \s and for
-comments within regexes. However, Perl changed at release 5.18, so PCRE changed
-at release 8.34. */
+comments within regexes. However, Perl changed at release 5.18, so PCRE1
+changed at release 8.34 and it's always been this way for PCRE2. */
 
 for (i = 0; i < 256; i++)
   {
   int x = 0;
   if (isspace(i)) x += ctype_space;
   if (isalpha(i)) x += ctype_letter;
+  if (islower(i)) x += ctype_lcletter;
   if (isdigit(i)) x += ctype_digit;
-  if (isxdigit(i)) x += ctype_xdigit;
   if (isalnum(i) || i == '_') x += ctype_word;
-
-  /* Note: strchr includes the terminating zero in the characters it considers.
-  In this instance, that is ok because we want binary zero to be flagged as a
-  meta-character, which in this sense is any character that terminates a run
-  of data characters. */
-
-  if (strchr("\\*+?{^.$|()[", i) != 0) x += ctype_meta;
   *p++ = x;
   }
 
 return yield;
 }
 
-/* End of pcre_maketables.c */
+#ifndef PCRE2_DFTABLES   /* Compiling the library */
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_maketables_free(pcre2_general_context *gcontext, const uint8_t *tables)
+{
+  if (gcontext)
+    gcontext->memctl.free((void *)tables, gcontext->memctl.memory_data);
+  else
+    free((void *)tables);
+}
+#endif
+
+/* End of pcre2_maketables.c */
diff --git a/Foundation/src/pcre2_match.c b/Foundation/src/pcre2_match.c
new file mode 100644
index 000000000..3c316c0b4
--- /dev/null
+++ b/Foundation/src/pcre2_match.c
@@ -0,0 +1,7534 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2015-2022 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "pcre2_config.h"
+
+/* These defines enable debugging code */
+
+/* #define DEBUG_FRAMES_DISPLAY */
+/* #define DEBUG_SHOW_OPS */
+/* #define DEBUG_SHOW_RMATCH */
+
+#ifdef DEBUG_FRAMES_DISPLAY
+#include <stdarg.h>
+#endif
+
+/* These defines identify the name of the block containing "static"
+information, and fields within it. */
+
+#define NLBLOCK mb              /* Block containing newline information */
+#define PSSTART start_subject   /* Field containing processed string start */
+#define PSEND   end_subject     /* Field containing processed string end */
+
+#include "pcre2_internal.h"
+
+#define RECURSE_UNSET 0xffffffffu  /* Bigger than max group number */
+
+/* Masks for identifying the public options that are permitted at match time. */
+
+#define PUBLIC_MATCH_OPTIONS \
+  (PCRE2_ANCHORED|PCRE2_ENDANCHORED|PCRE2_NOTBOL|PCRE2_NOTEOL|PCRE2_NOTEMPTY| \
+   PCRE2_NOTEMPTY_ATSTART|PCRE2_NO_UTF_CHECK|PCRE2_PARTIAL_HARD| \
+   PCRE2_PARTIAL_SOFT|PCRE2_NO_JIT|PCRE2_COPY_MATCHED_SUBJECT)
+
+#define PUBLIC_JIT_MATCH_OPTIONS \
+   (PCRE2_NO_UTF_CHECK|PCRE2_NOTBOL|PCRE2_NOTEOL|PCRE2_NOTEMPTY|\
+    PCRE2_NOTEMPTY_ATSTART|PCRE2_PARTIAL_SOFT|PCRE2_PARTIAL_HARD|\
+    PCRE2_COPY_MATCHED_SUBJECT)
+
+/* Non-error returns from and within the match() function. Error returns are
+externally defined PCRE2_ERROR_xxx codes, which are all negative. */
+
+#define MATCH_MATCH        1
+#define MATCH_NOMATCH      0
+
+/* Special internal returns used in the match() function. Make them
+sufficiently negative to avoid the external error codes. */
+
+#define MATCH_ACCEPT       (-999)
+#define MATCH_KETRPOS      (-998)
+/* The next 5 must be kept together and in sequence so that a test that checks
+for any one of them can use a range. */
+#define MATCH_COMMIT       (-997)
+#define MATCH_PRUNE        (-996)
+#define MATCH_SKIP         (-995)
+#define MATCH_SKIP_ARG     (-994)
+#define MATCH_THEN         (-993)
+#define MATCH_BACKTRACK_MAX MATCH_THEN
+#define MATCH_BACKTRACK_MIN MATCH_COMMIT
+
+/* Group frame type values. Zero means the frame is not a group frame. The
+lower 16 bits are used for data (e.g. the capture number). Group frames are
+used for most groups so that information about the start is easily available at
+the end without having to scan back through intermediate frames (backtrack
+points). */
+
+#define GF_CAPTURE     0x00010000u
+#define GF_NOCAPTURE   0x00020000u
+#define GF_CONDASSERT  0x00030000u
+#define GF_RECURSE     0x00040000u
+
+/* Masks for the identity and data parts of the group frame type. */
+
+#define GF_IDMASK(a)   ((a) & 0xffff0000u)
+#define GF_DATAMASK(a) ((a) & 0x0000ffffu)
+
+/* Repetition types */
+
+enum { REPTYPE_MIN, REPTYPE_MAX, REPTYPE_POS };
+
+/* Min and max values for the common repeats; a maximum of UINT32_MAX =>
+infinity. */
+
+static const uint32_t rep_min[] = {
+  0, 0,       /* * and *? */
+  1, 1,       /* + and +? */
+  0, 0,       /* ? and ?? */
+  0, 0,       /* dummy placefillers for OP_CR[MIN]RANGE */
+  0, 1, 0 };  /* OP_CRPOS{STAR, PLUS, QUERY} */
+
+static const uint32_t rep_max[] = {
+  UINT32_MAX, UINT32_MAX,      /* * and *? */
+  UINT32_MAX, UINT32_MAX,      /* + and +? */
+  1, 1,                        /* ? and ?? */
+  0, 0,                        /* dummy placefillers for OP_CR[MIN]RANGE */
+  UINT32_MAX, UINT32_MAX, 1 }; /* OP_CRPOS{STAR, PLUS, QUERY} */
+
+/* Repetition types - must include OP_CRPOSRANGE (not needed above) */
+
+static const uint32_t rep_typ[] = {
+  REPTYPE_MAX, REPTYPE_MIN,    /* * and *? */
+  REPTYPE_MAX, REPTYPE_MIN,    /* + and +? */
+  REPTYPE_MAX, REPTYPE_MIN,    /* ? and ?? */
+  REPTYPE_MAX, REPTYPE_MIN,    /* OP_CRRANGE and OP_CRMINRANGE */
+  REPTYPE_POS, REPTYPE_POS,    /* OP_CRPOSSTAR, OP_CRPOSPLUS */
+  REPTYPE_POS, REPTYPE_POS };  /* OP_CRPOSQUERY, OP_CRPOSRANGE */
+
+/* Numbers for RMATCH calls at backtracking points. When these lists are
+changed, the code at RETURN_SWITCH below must be updated in sync.  */
+
+enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM6,  RM7,  RM8,  RM9,  RM10,
+       RM11,  RM12, RM13, RM14, RM15, RM16, RM17, RM18, RM19, RM20,
+       RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
+       RM31,  RM32, RM33, RM34, RM35, RM36 };
+
+#ifdef SUPPORT_WIDE_CHARS
+enum { RM100=100, RM101 };
+#endif
+
+#ifdef SUPPORT_UNICODE
+enum { RM200=200, RM201, RM202, RM203, RM204, RM205, RM206, RM207,
+       RM208,     RM209, RM210, RM211, RM212, RM213, RM214, RM215,
+       RM216,     RM217, RM218, RM219, RM220, RM221, RM222, RM223,
+       RM224,     RM225 };
+#endif
+
+/* Define short names for general fields in the current backtrack frame, which
+is always pointed to by the F variable. Occasional references to fields in
+other frames are written out explicitly. There are also some fields in the
+current frame whose names start with "temp" that are used for short-term,
+localised backtracking memory. These are #defined with Lxxx names at the point
+of use and undefined afterwards. */
+
+#define Fback_frame        F->back_frame
+#define Fcapture_last      F->capture_last
+#define Fcurrent_recurse   F->current_recurse
+#define Fecode             F->ecode
+#define Feptr              F->eptr
+#define Fgroup_frame_type  F->group_frame_type
+#define Flast_group_offset F->last_group_offset
+#define Flength            F->length
+#define Fmark              F->mark
+#define Frdepth            F->rdepth
+#define Fstart_match       F->start_match
+#define Foffset_top        F->offset_top
+#define Foccu              F->occu
+#define Fop                F->op
+#define Fovector           F->ovector
+#define Freturn_id         F->return_id
+
+
+#ifdef DEBUG_FRAMES_DISPLAY
+/*************************************************
+*      Display current frames and contents       *
+*************************************************/
+
+/* This debugging function displays the current set of frames and their
+contents. It is not called automatically from anywhere, the intention being
+that calls can be inserted where necessary when debugging frame-related
+problems.
+
+Arguments:
+  f           the file to write to
+  F           the current top frame
+  P           a previous frame of interest
+  frame_size  the frame size
+  mb          points to the match block
+  s           identification text
+
+Returns:    nothing
+*/
+
+static void
+display_frames(FILE *f, heapframe *F, heapframe *P, PCRE2_SIZE frame_size,
+  match_block *mb, const char *s, ...)
+{
+uint32_t i;
+heapframe *Q;
+va_list ap;
+va_start(ap, s);
+
+fprintf(f, "FRAMES ");
+vfprintf(f, s, ap);
+va_end(ap);
+
+if (P != NULL) fprintf(f, " P=%lu",
+  ((char *)P - (char *)(mb->match_frames))/frame_size);
+fprintf(f, "\n");
+
+for (i = 0, Q = mb->match_frames;
+     Q <= F;
+     i++, Q = (heapframe *)((char *)Q + frame_size))
+  {
+  fprintf(f, "Frame %d type=%x subj=%lu code=%d back=%lu id=%d",
+    i, Q->group_frame_type, Q->eptr - mb->start_subject, *(Q->ecode),
+    Q->back_frame, Q->return_id);
+
+  if (Q->last_group_offset == PCRE2_UNSET)
+    fprintf(f, " lgoffset=unset\n");
+  else
+    fprintf(f, " lgoffset=%lu\n",  Q->last_group_offset/frame_size);
+  }
+}
+
+#endif
+
+
+
+/*************************************************
+*                Process a callout               *
+*************************************************/
+
+/* This function is called for all callouts, whether "standalone" or at the
+start of a conditional group. Feptr will be pointing to either OP_CALLOUT or
+OP_CALLOUT_STR. A callout block is allocated in pcre2_match() and initialized
+with fixed values.
+
+Arguments:
+  F          points to the current backtracking frame
+  mb         points to the match block
+  lengthptr  where to return the length of the callout item
+
+Returns:     the return from the callout
+             or 0 if no callout function exists
+*/
+
+static int
+do_callout(heapframe *F, match_block *mb, PCRE2_SIZE *lengthptr)
+{
+int rc;
+PCRE2_SIZE save0, save1;
+PCRE2_SIZE *callout_ovector;
+pcre2_callout_block *cb;
+
+*lengthptr = (*Fecode == OP_CALLOUT)?
+  PRIV(OP_lengths)[OP_CALLOUT] : GET(Fecode, 1 + 2*LINK_SIZE);
+
+if (mb->callout == NULL) return 0;   /* No callout function provided */
+
+/* The original matching code (pre 10.30) worked directly with the ovector
+passed by the user, and this was passed to callouts. Now that the working
+ovector is in the backtracking frame, it no longer needs to reserve space for
+the overall match offsets (which would waste space in the frame). For backward
+compatibility, however, we pass capture_top and offset_vector to the callout as
+if for the extended ovector, and we ensure that the first two slots are unset
+by preserving and restoring their current contents. Picky compilers complain if
+references such as Fovector[-2] are use directly, so we set up a separate
+pointer. */
+
+callout_ovector = (PCRE2_SIZE *)(Fovector) - 2;
+
+/* The cb->version, cb->subject, cb->subject_length, and cb->start_match fields
+are set externally. The first 3 never change; the last is updated for each
+bumpalong. */
+
+cb = mb->cb;
+cb->capture_top      = (uint32_t)Foffset_top/2 + 1;
+cb->capture_last     = Fcapture_last;
+cb->offset_vector    = callout_ovector;
+cb->mark             = mb->nomatch_mark;
+cb->current_position = (PCRE2_SIZE)(Feptr - mb->start_subject);
+cb->pattern_position = GET(Fecode, 1);
+cb->next_item_length = GET(Fecode, 1 + LINK_SIZE);
+
+if (*Fecode == OP_CALLOUT)  /* Numerical callout */
+  {
+  cb->callout_number = Fecode[1 + 2*LINK_SIZE];
+  cb->callout_string_offset = 0;
+  cb->callout_string = NULL;
+  cb->callout_string_length = 0;
+  }
+else  /* String callout */
+  {
+  cb->callout_number = 0;
+  cb->callout_string_offset = GET(Fecode, 1 + 3*LINK_SIZE);
+  cb->callout_string = Fecode + (1 + 4*LINK_SIZE) + 1;
+  cb->callout_string_length =
+    *lengthptr - (1 + 4*LINK_SIZE) - 2;
+  }
+
+save0 = callout_ovector[0];
+save1 = callout_ovector[1];
+callout_ovector[0] = callout_ovector[1] = PCRE2_UNSET;
+rc = mb->callout(cb, mb->callout_data);
+callout_ovector[0] = save0;
+callout_ovector[1] = save1;
+cb->callout_flags = 0;
+return rc;
+}
+
+
+
+/*************************************************
+*          Match a back-reference                *
+*************************************************/
+
+/* This function is called only when it is known that the offset lies within
+the offsets that have so far been used in the match. Note that in caseless
+UTF-8 mode, the number of subject bytes matched may be different to the number
+of reference bytes. (In theory this could also happen in UTF-16 mode, but it
+seems unlikely.)
+
+Arguments:
+  offset      index into the offset vector
+  caseless    TRUE if caseless
+  F           the current backtracking frame pointer
+  mb          points to match block
+  lengthptr   pointer for returning the length matched
+
+Returns:      = 0 sucessful match; number of code units matched is set
+              < 0 no match
+              > 0 partial match
+*/
+
+static int
+match_ref(PCRE2_SIZE offset, BOOL caseless, heapframe *F, match_block *mb,
+  PCRE2_SIZE *lengthptr)
+{
+PCRE2_SPTR p;
+PCRE2_SIZE length;
+PCRE2_SPTR eptr;
+PCRE2_SPTR eptr_start;
+
+/* Deal with an unset group. The default is no match, but there is an option to
+match an empty string. */
+
+if (offset >= Foffset_top || Fovector[offset] == PCRE2_UNSET)
+  {
+  if ((mb->poptions & PCRE2_MATCH_UNSET_BACKREF) != 0)
+    {
+    *lengthptr = 0;
+    return 0;      /* Match */
+    }
+  else return -1;  /* No match */
+  }
+
+/* Separate the caseless and UTF cases for speed. */
+
+eptr = eptr_start = Feptr;
+p = mb->start_subject + Fovector[offset];
+length = Fovector[offset+1] - Fovector[offset];
+
+if (caseless)
+  {
+#if defined SUPPORT_UNICODE
+  BOOL utf = (mb->poptions & PCRE2_UTF) != 0;
+
+  if (utf || (mb->poptions & PCRE2_UCP) != 0)
+    {
+    PCRE2_SPTR endptr = p + length;
+
+    /* Match characters up to the end of the reference. NOTE: the number of
+    code units matched may differ, because in UTF-8 there are some characters
+    whose upper and lower case codes have different numbers of bytes. For
+    example, U+023A (2 bytes in UTF-8) is the upper case version of U+2C65 (3
+    bytes in UTF-8); a sequence of 3 of the former uses 6 bytes, as does a
+    sequence of two of the latter. It is important, therefore, to check the
+    length along the reference, not along the subject (earlier code did this
+    wrong). UCP without uses Unicode properties but without UTF encoding. */
+
+    while (p < endptr)
+      {
+      uint32_t c, d;
+      const ucd_record *ur;
+      if (eptr >= mb->end_subject) return 1;   /* Partial match */
+
+      if (utf)
+        {
+        GETCHARINC(c, eptr);
+        GETCHARINC(d, p);
+        }
+      else
+        {
+        c = *eptr++;
+        d = *p++;
+        }
+
+      ur = GET_UCD(d);
+      if (c != d && c != (uint32_t)((int)d + ur->other_case))
+        {
+        const uint32_t *pp = PRIV(ucd_caseless_sets) + ur->caseset;
+        for (;;)
+          {
+          if (c < *pp) return -1;  /* No match */
+          if (c == *pp++) break;
+          }
+        }
+      }
+    }
+  else
+#endif
+
+  /* Not in UTF or UCP mode */
+    {
+    for (; length > 0; length--)
+      {
+      uint32_t cc, cp;
+      if (eptr >= mb->end_subject) return 1;   /* Partial match */
+      cc = UCHAR21TEST(eptr);
+      cp = UCHAR21TEST(p);
+      if (TABLE_GET(cp, mb->lcc, cp) != TABLE_GET(cc, mb->lcc, cc))
+        return -1;  /* No match */
+      p++;
+      eptr++;
+      }
+    }
+  }
+
+/* In the caseful case, we can just compare the code units, whether or not we
+are in UTF and/or UCP mode. When partial matching, we have to do this unit by
+unit. */
+
+else
+  {
+  if (mb->partial != 0)
+    {
+    for (; length > 0; length--)
+      {
+      if (eptr >= mb->end_subject) return 1;   /* Partial match */
+      if (UCHAR21INCTEST(p) != UCHAR21INCTEST(eptr)) return -1;  /* No match */
+      }
+    }
+
+  /* Not partial matching */
+
+  else
+    {
+    if ((PCRE2_SIZE)(mb->end_subject - eptr) < length) return 1; /* Partial */
+    if (memcmp(p, eptr, CU2BYTES(length)) != 0) return -1;  /* No match */
+    eptr += length;
+    }
+  }
+
+*lengthptr = eptr - eptr_start;
+return 0;  /* Match */
+}
+
+
+
+/******************************************************************************
+*******************************************************************************
+                   "Recursion" in the match() function
+
+The original match() function was highly recursive, but this proved to be the
+source of a number of problems over the years, mostly because of the relatively
+small system stacks that are commonly found. As new features were added to
+patterns, various kludges were invented to reduce the amount of stack used,
+making the code hard to understand in places.
+
+A version did exist that used individual frames on the heap instead of calling
+match() recursively, but this ran substantially slower. The current version is
+a refactoring that uses a vector of frames to remember backtracking points.
+This runs no slower, and possibly even a bit faster than the original recursive
+implementation. An initial vector of size START_FRAMES_SIZE (enough for maybe
+50 frames) is allocated on the system stack. If this is not big enough, the
+heap is used for a larger vector.
+
+*******************************************************************************
+******************************************************************************/
+
+
+
+
+/*************************************************
+*       Macros for the match() function          *
+*************************************************/
+
+/* These macros pack up tests that are used for partial matching several times
+in the code. The second one is used when we already know we are past the end of
+the subject. We set the "hit end" flag if the pointer is at the end of the
+subject and either (a) the pointer is past the earliest inspected character
+(i.e. something has been matched, even if not part of the actual matched
+string), or (b) the pattern contains a lookbehind. These are the conditions for
+which adding more characters may allow the current match to continue.
+
+For hard partial matching, we immediately return a partial match. Otherwise,
+carrying on means that a complete match on the current subject will be sought.
+A partial match is returned only if no complete match can be found. */
+
+#define CHECK_PARTIAL()\
+  if (Feptr >= mb->end_subject) \
+    { \
+    SCHECK_PARTIAL(); \
+    }
+
+#define SCHECK_PARTIAL()\
+  if (mb->partial != 0 && \
+      (Feptr > mb->start_used_ptr || mb->allowemptypartial)) \
+    { \
+    mb->hitend = TRUE; \
+    if (mb->partial > 1) return PCRE2_ERROR_PARTIAL; \
+    }
+
+
+/* These macros are used to implement backtracking. They simulate a recursive
+call to the match() function by means of a local vector of frames which
+remember the backtracking points. */
+
+#define RMATCH(ra,rb)\
+  {\
+  start_ecode = ra;\
+  Freturn_id = rb;\
+  goto MATCH_RECURSE;\
+  L_##rb:;\
+  }
+
+#define RRETURN(ra)\
+  {\
+  rrc = ra;\
+  goto RETURN_SWITCH;\
+  }
+
+
+
+/*************************************************
+*         Match from current position            *
+*************************************************/
+
+/* This function is called to run one match attempt at a single starting point
+in the subject.
+
+Performance note: It might be tempting to extract commonly used fields from the
+mb structure (e.g. end_subject) into individual variables to improve
+performance. Tests using gcc on a SPARC disproved this; in the first case, it
+made performance worse.
+
+Arguments:
+   start_eptr   starting character in subject
+   start_ecode  starting position in compiled code
+   ovector      pointer to the final output vector
+   oveccount    number of pairs in ovector
+   top_bracket  number of capturing parentheses in the pattern
+   frame_size   size of each backtracking frame
+   mb           pointer to "static" variables block
+
+Returns:        MATCH_MATCH if matched            )  these values are >= 0
+                MATCH_NOMATCH if failed to match  )
+                negative MATCH_xxx value for PRUNE, SKIP, etc
+                negative PCRE2_ERROR_xxx value if aborted by an error condition
+                (e.g. stopped by repeated call or depth limit)
+*/
+
+static int
+match(PCRE2_SPTR start_eptr, PCRE2_SPTR start_ecode, PCRE2_SIZE *ovector,
+  uint16_t oveccount, uint16_t top_bracket, PCRE2_SIZE frame_size,
+  match_block *mb)
+{
+/* Frame-handling variables */
+
+heapframe *F;           /* Current frame pointer */
+heapframe *N = NULL;    /* Temporary frame pointers */
+heapframe *P = NULL;
+heapframe *assert_accept_frame = NULL;  /* For passing back a frame with captures */
+PCRE2_SIZE frame_copy_size;     /* Amount to copy when creating a new frame */
+
+/* Local variables that do not need to be preserved over calls to RRMATCH(). */
+
+PCRE2_SPTR bracode;     /* Temp pointer to start of group */
+PCRE2_SIZE offset;      /* Used for group offsets */
+PCRE2_SIZE length;      /* Used for various length calculations */
+
+int rrc;                /* Return from functions & backtracking "recursions" */
+#ifdef SUPPORT_UNICODE
+int proptype;           /* Type of character property */
+#endif
+
+uint32_t i;             /* Used for local loops */
+uint32_t fc;            /* Character values */
+uint32_t number;        /* Used for group and other numbers */
+uint32_t reptype = 0;   /* Type of repetition (0 to avoid compiler warning) */
+uint32_t group_frame_type;  /* Specifies type for new group frames */
+
+BOOL condition;         /* Used in conditional groups */
+BOOL cur_is_word;       /* Used in "word" tests */
+BOOL prev_is_word;      /* Used in "word" tests */
+
+/* UTF and UCP flags */
+
+#ifdef SUPPORT_UNICODE
+BOOL utf = (mb->poptions & PCRE2_UTF) != 0;
+BOOL ucp = (mb->poptions & PCRE2_UCP) != 0;
+#else
+BOOL utf = FALSE;  /* Required for convenience even when no Unicode support */
+#endif
+
+/* This is the length of the last part of a backtracking frame that must be
+copied when a new frame is created. */
+
+frame_copy_size = frame_size - offsetof(heapframe, eptr);
+
+/* Set up the first current frame at the start of the vector, and initialize
+fields that are not reset for new frames. */
+
+F = mb->match_frames;
+Frdepth = 0;                        /* "Recursion" depth */
+Fcapture_last = 0;                  /* Number of most recent capture */
+Fcurrent_recurse = RECURSE_UNSET;   /* Not pattern recursing. */
+Fstart_match = Feptr = start_eptr;  /* Current data pointer and start match */
+Fmark = NULL;                       /* Most recent mark */
+Foffset_top = 0;                    /* End of captures within the frame */
+Flast_group_offset = PCRE2_UNSET;   /* Saved frame of most recent group */
+group_frame_type = 0;               /* Not a start of group frame */
+goto NEW_FRAME;                     /* Start processing with this frame */
+
+/* Come back here when we want to create a new frame for remembering a
+backtracking point. */
+
+MATCH_RECURSE:
+
+/* Set up a new backtracking frame. If the vector is full, get a new one
+on the heap, doubling the size, but constrained by the heap limit. */
+
+N = (heapframe *)((char *)F + frame_size);
+if (N >= mb->match_frames_top)
+  {
+  PCRE2_SIZE newsize = mb->frame_vector_size * 2;
+  heapframe *new;
+
+  if ((newsize / 1024) > mb->heap_limit)
+    {
+    PCRE2_SIZE maxsize = ((mb->heap_limit * 1024)/frame_size) * frame_size;
+    if (mb->frame_vector_size >= maxsize) return PCRE2_ERROR_HEAPLIMIT;
+    newsize = maxsize;
+    }
+
+  new = mb->memctl.malloc(newsize, mb->memctl.memory_data);
+  if (new == NULL) return PCRE2_ERROR_NOMEMORY;
+  memcpy(new, mb->match_frames, mb->frame_vector_size);
+
+  F = (heapframe *)((char *)new + ((char *)F - (char *)mb->match_frames));
+  N = (heapframe *)((char *)F + frame_size);
+
+  if (mb->match_frames != mb->stack_frames)
+    mb->memctl.free(mb->match_frames, mb->memctl.memory_data);
+  mb->match_frames = new;
+  mb->match_frames_top = (heapframe *)((char *)mb->match_frames + newsize);
+  mb->frame_vector_size = newsize;
+  }
+
+#ifdef DEBUG_SHOW_RMATCH
+fprintf(stderr, "++ RMATCH %2d frame=%d", Freturn_id, Frdepth + 1);
+if (group_frame_type != 0)
+  {
+  fprintf(stderr, " type=%x ", group_frame_type);
+  switch (GF_IDMASK(group_frame_type))
+    {
+    case GF_CAPTURE:
+    fprintf(stderr, "capture=%d", GF_DATAMASK(group_frame_type));
+    break;
+
+    case GF_NOCAPTURE:
+    fprintf(stderr, "nocapture op=%d", GF_DATAMASK(group_frame_type));
+    break;
+
+    case GF_CONDASSERT:
+    fprintf(stderr, "condassert op=%d", GF_DATAMASK(group_frame_type));
+    break;
+
+    case GF_RECURSE:
+    fprintf(stderr, "recurse=%d", GF_DATAMASK(group_frame_type));
+    break;
+
+    default:
+    fprintf(stderr, "*** unknown ***");
+    break;
+    }
+  }
+fprintf(stderr, "\n");
+#endif
+
+/* Copy those fields that must be copied into the new frame, increase the
+"recursion" depth (i.e. the new frame's index) and then make the new frame
+current. */
+
+memcpy((char *)N + offsetof(heapframe, eptr),
+       (char *)F + offsetof(heapframe, eptr),
+       frame_copy_size);
+
+N->rdepth = Frdepth + 1;
+F = N;
+
+/* Carry on processing with a new frame. */
+
+NEW_FRAME:
+Fgroup_frame_type = group_frame_type;
+Fecode = start_ecode;      /* Starting code pointer */
+Fback_frame = frame_size;  /* Default is go back one frame */
+
+/* If this is a special type of group frame, remember its offset for quick
+access at the end of the group. If this is a recursion, set a new current
+recursion value. */
+
+if (group_frame_type != 0)
+  {
+  Flast_group_offset = (char *)F - (char *)mb->match_frames;
+  if (GF_IDMASK(group_frame_type) == GF_RECURSE)
+    Fcurrent_recurse = GF_DATAMASK(group_frame_type);
+  group_frame_type = 0;
+  }
+
+
+/* ========================================================================= */
+/* This is the main processing loop. First check that we haven't recorded too
+many backtracks (search tree is too large), or that we haven't exceeded the
+recursive depth limit (used too many backtracking frames). If not, process the
+opcodes. */
+
+if (mb->match_call_count++ >= mb->match_limit) return PCRE2_ERROR_MATCHLIMIT;
+if (Frdepth >= mb->match_limit_depth) return PCRE2_ERROR_DEPTHLIMIT;
+
+for (;;)
+  {
+#ifdef DEBUG_SHOW_OPS
+fprintf(stderr, "++ op=%d\n", *Fecode);
+#endif
+
+  Fop = (uint8_t)(*Fecode);  /* Cast needed for 16-bit and 32-bit modes */
+  switch(Fop)
+    {
+    /* ===================================================================== */
+    /* Before OP_ACCEPT there may be any number of OP_CLOSE opcodes, to close
+    any currently open capturing brackets. Unlike reaching the end of a group,
+    where we know the starting frame is at the top of the chained frames, in
+    this case we have to search back for the relevant frame in case other types
+    of group that use chained frames have intervened. Multiple OP_CLOSEs always
+    come innermost first, which matches the chain order. We can ignore this in
+    a recursion, because captures are not passed out of recursions. */
+
+    case OP_CLOSE:
+    if (Fcurrent_recurse == RECURSE_UNSET)
+      {
+      number = GET2(Fecode, 1);
+      offset = Flast_group_offset;
+      for(;;)
+        {
+        if (offset == PCRE2_UNSET) return PCRE2_ERROR_INTERNAL;
+        N = (heapframe *)((char *)mb->match_frames + offset);
+        P = (heapframe *)((char *)N - frame_size);
+        if (N->group_frame_type == (GF_CAPTURE | number)) break;
+        offset = P->last_group_offset;
+        }
+      offset = (number << 1) - 2;
+      Fcapture_last = number;
+      Fovector[offset] = P->eptr - mb->start_subject;
+      Fovector[offset+1] = Feptr - mb->start_subject;
+      if (offset >= Foffset_top) Foffset_top = offset + 2;
+      }
+    Fecode += PRIV(OP_lengths)[*Fecode];
+    break;
+
+
+    /* ===================================================================== */
+    /* Real or forced end of the pattern, assertion, or recursion. In an
+    assertion ACCEPT, update the last used pointer and remember the current
+    frame so that the captures and mark can be fished out of it. */
+
+    case OP_ASSERT_ACCEPT:
+    if (Feptr > mb->last_used_ptr) mb->last_used_ptr = Feptr;
+    assert_accept_frame = F;
+    RRETURN(MATCH_ACCEPT);
+
+    /* If recursing, we have to find the most recent recursion. */
+
+    case OP_ACCEPT:
+    case OP_END:
+
+    /* Handle end of a recursion. */
+
+    if (Fcurrent_recurse != RECURSE_UNSET)
+      {
+      offset = Flast_group_offset;
+      for(;;)
+        {
+        if (offset == PCRE2_UNSET) return PCRE2_ERROR_INTERNAL;
+        N = (heapframe *)((char *)mb->match_frames + offset);
+        P = (heapframe *)((char *)N - frame_size);
+        if (GF_IDMASK(N->group_frame_type) == GF_RECURSE) break;
+        offset = P->last_group_offset;
+        }
+
+      /* N is now the frame of the recursion; the previous frame is at the
+      OP_RECURSE position. Go back there, copying the current subject position
+      and mark, and the start_match position (\K might have changed it), and
+      then move on past the OP_RECURSE. */
+
+      P->eptr = Feptr;
+      P->mark = Fmark;
+      P->start_match = Fstart_match;
+      F = P;
+      Fecode += 1 + LINK_SIZE;
+      continue;
+      }
+
+    /* Not a recursion. Fail for an empty string match if either PCRE2_NOTEMPTY
+    is set, or if PCRE2_NOTEMPTY_ATSTART is set and we have matched at the
+    start of the subject. In both cases, backtracking will then try other
+    alternatives, if any. */
+
+    if (Feptr == Fstart_match &&
+         ((mb->moptions & PCRE2_NOTEMPTY) != 0 ||
+           ((mb->moptions & PCRE2_NOTEMPTY_ATSTART) != 0 &&
+             Fstart_match == mb->start_subject + mb->start_offset)))
+      RRETURN(MATCH_NOMATCH);
+
+    /* Also fail if PCRE2_ENDANCHORED is set and the end of the match is not
+    the end of the subject. After (*ACCEPT) we fail the entire match (at this
+    position) but backtrack on reaching the end of the pattern. */
+
+    if (Feptr < mb->end_subject &&
+        ((mb->moptions | mb->poptions) & PCRE2_ENDANCHORED) != 0)
+      {
+      if (Fop == OP_END) RRETURN(MATCH_NOMATCH);
+      return MATCH_NOMATCH;
+      }
+
+    /* We have a successful match of the whole pattern. Record the result and
+    then do a direct return from the function. If there is space in the offset
+    vector, set any pairs that follow the highest-numbered captured string but
+    are less than the number of capturing groups in the pattern to PCRE2_UNSET.
+    It is documented that this happens. "Gaps" are set to PCRE2_UNSET
+    dynamically. It is only those at the end that need setting here. */
+
+    mb->end_match_ptr = Feptr;           /* Record where we ended */
+    mb->end_offset_top = Foffset_top;    /* and how many extracts were taken */
+    mb->mark = Fmark;                    /* and the last success mark */
+    if (Feptr > mb->last_used_ptr) mb->last_used_ptr = Feptr;
+
+    ovector[0] = Fstart_match - mb->start_subject;
+    ovector[1] = Feptr - mb->start_subject;
+
+    /* Set i to the smaller of the sizes of the external and frame ovectors. */
+
+    i = 2 * ((top_bracket + 1 > oveccount)? oveccount : top_bracket + 1);
+    memcpy(ovector + 2, Fovector, (i - 2) * sizeof(PCRE2_SIZE));
+    while (--i >= Foffset_top + 2) ovector[i] = PCRE2_UNSET;
+    return MATCH_MATCH;  /* Note: NOT RRETURN */
+
+
+    /*===================================================================== */
+    /* Match any single character type except newline; have to take care with
+    CRLF newlines and partial matching. */
+
+    case OP_ANY:
+    if (IS_NEWLINE(Feptr)) RRETURN(MATCH_NOMATCH);
+    if (mb->partial != 0 &&
+        Feptr == mb->end_subject - 1 &&
+        NLBLOCK->nltype == NLTYPE_FIXED &&
+        NLBLOCK->nllen == 2 &&
+        UCHAR21TEST(Feptr) == NLBLOCK->nl[0])
+      {
+      mb->hitend = TRUE;
+      if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+      }
+    /* Fall through */
+
+    /* Match any single character whatsoever. */
+
+    case OP_ALLANY:
+    if (Feptr >= mb->end_subject)  /* DO NOT merge the Feptr++ here; it must */
+      {                            /* not be updated before SCHECK_PARTIAL. */
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    Feptr++;
+#ifdef SUPPORT_UNICODE
+    if (utf) ACROSSCHAR(Feptr < mb->end_subject, Feptr, Feptr++);
+#endif
+    Fecode++;
+    break;
+
+
+    /* ===================================================================== */
+    /* Match a single code unit, even in UTF mode. This opcode really does
+    match any code unit, even newline. (It really should be called ANYCODEUNIT,
+    of course - the byte name is from pre-16 bit days.) */
+
+    case OP_ANYBYTE:
+    if (Feptr >= mb->end_subject)   /* DO NOT merge the Feptr++ here; it must */
+      {                             /* not be updated before SCHECK_PARTIAL. */
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    Feptr++;
+    Fecode++;
+    break;
+
+
+    /* ===================================================================== */
+    /* Match a single character, casefully */
+
+    case OP_CHAR:
+#ifdef SUPPORT_UNICODE
+    if (utf)
+      {
+      Flength = 1;
+      Fecode++;
+      GETCHARLEN(fc, Fecode, Flength);
+      if (Flength > (PCRE2_SIZE)(mb->end_subject - Feptr))
+        {
+        CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
+        RRETURN(MATCH_NOMATCH);
+        }
+      for (; Flength > 0; Flength--)
+        {
+        if (*Fecode++ != UCHAR21INC(Feptr)) RRETURN(MATCH_NOMATCH);
+        }
+      }
+    else
+#endif
+
+    /* Not UTF mode */
+      {
+      if (mb->end_subject - Feptr < 1)
+        {
+        SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
+        RRETURN(MATCH_NOMATCH);
+        }
+      if (Fecode[1] != *Feptr++) RRETURN(MATCH_NOMATCH);
+      Fecode += 2;
+      }
+    break;
+
+
+    /* ===================================================================== */
+    /* Match a single character, caselessly. If we are at the end of the
+    subject, give up immediately. We get here only when the pattern character
+    has at most one other case. Characters with more than two cases are coded
+    as OP_PROP with the pseudo-property PT_CLIST. */
+
+    case OP_CHARI:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+
+#ifdef SUPPORT_UNICODE
+    if (utf)
+      {
+      Flength = 1;
+      Fecode++;
+      GETCHARLEN(fc, Fecode, Flength);
+
+      /* If the pattern character's value is < 128, we know that its other case
+      (if any) is also < 128 (and therefore only one code unit long in all
+      code-unit widths), so we can use the fast lookup table. We checked above
+      that there is at least one character left in the subject. */
+
+      if (fc < 128)
+        {
+        uint32_t cc = UCHAR21(Feptr);
+        if (mb->lcc[fc] != TABLE_GET(cc, mb->lcc, cc)) RRETURN(MATCH_NOMATCH);
+        Fecode++;
+        Feptr++;
+        }
+
+      /* Otherwise we must pick up the subject character and use Unicode
+      property support to test its other case. Note that we cannot use the
+      value of "Flength" to check for sufficient bytes left, because the other
+      case of the character may have more or fewer code units. */
+
+      else
+        {
+        uint32_t dc;
+        GETCHARINC(dc, Feptr);
+        Fecode += Flength;
+        if (dc != fc && dc != UCD_OTHERCASE(fc)) RRETURN(MATCH_NOMATCH);
+        }
+      }
+
+    /* If UCP is set without UTF we must do the same as above, but with one
+    character per code unit. */
+
+    else if (ucp)
+      {
+      uint32_t cc = UCHAR21(Feptr);
+      fc = Fecode[1];
+      if (fc < 128)
+        {
+        if (mb->lcc[fc] != TABLE_GET(cc, mb->lcc, cc)) RRETURN(MATCH_NOMATCH);
+        }
+      else
+        {
+        if (cc != fc && cc != UCD_OTHERCASE(fc)) RRETURN(MATCH_NOMATCH);
+        }
+      Feptr++;
+      Fecode += 2;
+      }
+
+    else
+#endif   /* SUPPORT_UNICODE */
+
+    /* Not UTF or UCP mode; use the table for characters < 256. */
+      {
+      if (TABLE_GET(Fecode[1], mb->lcc, Fecode[1])
+          != TABLE_GET(*Feptr, mb->lcc, *Feptr)) RRETURN(MATCH_NOMATCH);
+      Feptr++;
+      Fecode += 2;
+      }
+    break;
+
+
+    /* ===================================================================== */
+    /* Match not a single character. */
+
+    case OP_NOT:
+    case OP_NOTI:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+
+#ifdef SUPPORT_UNICODE
+    if (utf)
+      {
+      uint32_t ch;
+      Fecode++;
+      GETCHARINC(ch, Fecode);
+      GETCHARINC(fc, Feptr);
+      if (ch == fc)
+        {
+        RRETURN(MATCH_NOMATCH);  /* Caseful match */
+        }
+      else if (Fop == OP_NOTI)   /* If caseless */
+        {
+        if (ch > 127)
+          ch = UCD_OTHERCASE(ch);
+        else
+          ch = (mb->fcc)[ch];
+        if (ch == fc) RRETURN(MATCH_NOMATCH);
+        }
+      }
+
+    /* UCP without UTF is as above, but with one character per code unit. */
+
+    else if (ucp)
+      {
+      uint32_t ch;
+      fc = UCHAR21INC(Feptr);
+      ch = Fecode[1];
+      Fecode += 2;
+
+      if (ch == fc)
+        {
+        RRETURN(MATCH_NOMATCH);  /* Caseful match */
+        }
+      else if (Fop == OP_NOTI)   /* If caseless */
+        {
+        if (ch > 127)
+          ch = UCD_OTHERCASE(ch);
+        else
+          ch = (mb->fcc)[ch];
+        if (ch == fc) RRETURN(MATCH_NOMATCH);
+        }
+      }
+
+    else
+#endif  /* SUPPORT_UNICODE */
+
+    /* Neither UTF nor UCP is set */
+
+      {
+      uint32_t ch = Fecode[1];
+      fc = UCHAR21INC(Feptr);
+      if (ch == fc || (Fop == OP_NOTI && TABLE_GET(ch, mb->fcc, ch) == fc))
+        RRETURN(MATCH_NOMATCH);
+      Fecode += 2;
+      }
+    break;
+
+
+    /* ===================================================================== */
+    /* Match a single character repeatedly. */
+
+#define Loclength    F->temp_size
+#define Lstart_eptr  F->temp_sptr[0]
+#define Lcharptr     F->temp_sptr[1]
+#define Lmin         F->temp_32[0]
+#define Lmax         F->temp_32[1]
+#define Lc           F->temp_32[2]
+#define Loc          F->temp_32[3]
+
+    case OP_EXACT:
+    case OP_EXACTI:
+    Lmin = Lmax = GET2(Fecode, 1);
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATCHAR;
+
+    case OP_POSUPTO:
+    case OP_POSUPTOI:
+    reptype = REPTYPE_POS;
+    Lmin = 0;
+    Lmax = GET2(Fecode, 1);
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATCHAR;
+
+    case OP_UPTO:
+    case OP_UPTOI:
+    reptype = REPTYPE_MAX;
+    Lmin = 0;
+    Lmax = GET2(Fecode, 1);
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATCHAR;
+
+    case OP_MINUPTO:
+    case OP_MINUPTOI:
+    reptype = REPTYPE_MIN;
+    Lmin = 0;
+    Lmax = GET2(Fecode, 1);
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATCHAR;
+
+    case OP_POSSTAR:
+    case OP_POSSTARI:
+    reptype = REPTYPE_POS;
+    Lmin = 0;
+    Lmax = UINT32_MAX;
+    Fecode++;
+    goto REPEATCHAR;
+
+    case OP_POSPLUS:
+    case OP_POSPLUSI:
+    reptype = REPTYPE_POS;
+    Lmin = 1;
+    Lmax = UINT32_MAX;
+    Fecode++;
+    goto REPEATCHAR;
+
+    case OP_POSQUERY:
+    case OP_POSQUERYI:
+    reptype = REPTYPE_POS;
+    Lmin = 0;
+    Lmax = 1;
+    Fecode++;
+    goto REPEATCHAR;
+
+    case OP_STAR:
+    case OP_STARI:
+    case OP_MINSTAR:
+    case OP_MINSTARI:
+    case OP_PLUS:
+    case OP_PLUSI:
+    case OP_MINPLUS:
+    case OP_MINPLUSI:
+    case OP_QUERY:
+    case OP_QUERYI:
+    case OP_MINQUERY:
+    case OP_MINQUERYI:
+    fc = *Fecode++ - ((Fop < OP_STARI)? OP_STAR : OP_STARI);
+    Lmin = rep_min[fc];
+    Lmax = rep_max[fc];
+    reptype = rep_typ[fc];
+
+    /* Common code for all repeated single-character matches. We first check
+    for the minimum number of characters. If the minimum equals the maximum, we
+    are done. Otherwise, if minimizing, check the rest of the pattern for a
+    match; if there isn't one, advance up to the maximum, one character at a
+    time.
+
+    If maximizing, advance up to the maximum number of matching characters,
+    until Feptr is past the end of the maximum run. If possessive, we are
+    then done (no backing up). Otherwise, match at this position; anything
+    other than no match is immediately returned. For nomatch, back up one
+    character, unless we are matching \R and the last thing matched was
+    \r\n, in which case, back up two code units until we reach the first
+    optional character position.
+
+    The various UTF/non-UTF and caseful/caseless cases are handled separately,
+    for speed. */
+
+    REPEATCHAR:
+#ifdef SUPPORT_UNICODE
+    if (utf)
+      {
+      Flength = 1;
+      Lcharptr = Fecode;
+      GETCHARLEN(fc, Fecode, Flength);
+      Fecode += Flength;
+
+      /* Handle multi-code-unit character matching, caseful and caseless. */
+
+      if (Flength > 1)
+        {
+        uint32_t othercase;
+
+        if (Fop >= OP_STARI &&     /* Caseless */
+            (othercase = UCD_OTHERCASE(fc)) != fc)
+          Loclength = PRIV(ord2utf)(othercase, Foccu);
+        else Loclength = 0;
+
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr <= mb->end_subject - Flength &&
+            memcmp(Feptr, Lcharptr, CU2BYTES(Flength)) == 0) Feptr += Flength;
+          else if (Loclength > 0 &&
+                   Feptr <= mb->end_subject - Loclength &&
+                   memcmp(Feptr, Foccu, CU2BYTES(Loclength)) == 0)
+            Feptr += Loclength;
+          else
+            {
+            CHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+
+        if (Lmin == Lmax) continue;
+
+        if (reptype == REPTYPE_MIN)
+          {
+          for (;;)
+            {
+            RMATCH(Fecode, RM202);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr <= mb->end_subject - Flength &&
+              memcmp(Feptr, Lcharptr, CU2BYTES(Flength)) == 0) Feptr += Flength;
+            else if (Loclength > 0 &&
+                     Feptr <= mb->end_subject - Loclength &&
+                     memcmp(Feptr, Foccu, CU2BYTES(Loclength)) == 0)
+              Feptr += Loclength;
+            else
+              {
+              CHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            }
+          /* Control never gets here */
+          }
+
+        else  /* Maximize */
+          {
+          Lstart_eptr = Feptr;
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr <= mb->end_subject - Flength &&
+                memcmp(Feptr, Lcharptr, CU2BYTES(Flength)) == 0)
+              Feptr += Flength;
+            else if (Loclength > 0 &&
+                     Feptr <= mb->end_subject - Loclength &&
+                     memcmp(Feptr, Foccu, CU2BYTES(Loclength)) == 0)
+              Feptr += Loclength;
+            else
+              {
+              CHECK_PARTIAL();
+              break;
+              }
+            }
+
+          /* After \C in UTF mode, Lstart_eptr might be in the middle of a
+          Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't
+          go too far. */
+
+          if (reptype != REPTYPE_POS) for(;;)
+            {
+            if (Feptr <= Lstart_eptr) break;
+            RMATCH(Fecode, RM203);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            Feptr--;
+            BACKCHAR(Feptr);
+            }
+          }
+        break;   /* End of repeated wide character handling */
+        }
+
+      /* Length of UTF character is 1. Put it into the preserved variable and
+      fall through to the non-UTF code. */
+
+      Lc = fc;
+      }
+    else
+#endif  /* SUPPORT_UNICODE */
+
+    /* When not in UTF mode, load a single-code-unit character. Then proceed as
+    above, using Unicode casing if either UTF or UCP is set. */
+
+    Lc = *Fecode++;
+
+    /* Caseless comparison */
+
+    if (Fop >= OP_STARI)
+      {
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#ifdef SUPPORT_UNICODE
+      if (ucp && !utf && Lc > 127) Loc = UCD_OTHERCASE(Lc);
+      else
+#endif  /* SUPPORT_UNICODE */
+      /* Lc will be < 128 in UTF-8 mode. */
+      Loc = mb->fcc[Lc];
+#else /* 16-bit & 32-bit */
+#ifdef SUPPORT_UNICODE
+      if ((utf || ucp) && Lc > 127) Loc = UCD_OTHERCASE(Lc);
+      else
+#endif  /* SUPPORT_UNICODE */
+      Loc = TABLE_GET(Lc, mb->fcc, Lc);
+#endif  /* PCRE2_CODE_UNIT_WIDTH == 8 */
+
+      for (i = 1; i <= Lmin; i++)
+        {
+        uint32_t cc;                 /* Faster than PCRE2_UCHAR */
+        if (Feptr >= mb->end_subject)
+          {
+          SCHECK_PARTIAL();
+          RRETURN(MATCH_NOMATCH);
+          }
+        cc = UCHAR21TEST(Feptr);
+        if (Lc != cc && Loc != cc) RRETURN(MATCH_NOMATCH);
+        Feptr++;
+        }
+      if (Lmin == Lmax) continue;
+
+      if (reptype == REPTYPE_MIN)
+        {
+        for (;;)
+          {
+          uint32_t cc;               /* Faster than PCRE2_UCHAR */
+          RMATCH(Fecode, RM25);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          cc = UCHAR21TEST(Feptr);
+          if (Lc != cc && Loc != cc) RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          }
+        /* Control never gets here */
+        }
+
+      else  /* Maximize */
+        {
+        Lstart_eptr = Feptr;
+        for (i = Lmin; i < Lmax; i++)
+          {
+          uint32_t cc;               /* Faster than PCRE2_UCHAR */
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            break;
+            }
+          cc = UCHAR21TEST(Feptr);
+          if (Lc != cc && Loc != cc) break;
+          Feptr++;
+          }
+        if (reptype != REPTYPE_POS) for (;;)
+          {
+          if (Feptr == Lstart_eptr) break;
+          RMATCH(Fecode, RM26);
+          Feptr--;
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          }
+        }
+      }
+
+    /* Caseful comparisons (includes all multi-byte characters) */
+
+    else
+      {
+      for (i = 1; i <= Lmin; i++)
+        {
+        if (Feptr >= mb->end_subject)
+          {
+          SCHECK_PARTIAL();
+          RRETURN(MATCH_NOMATCH);
+          }
+        if (Lc != UCHAR21INCTEST(Feptr)) RRETURN(MATCH_NOMATCH);
+        }
+
+      if (Lmin == Lmax) continue;
+
+      if (reptype == REPTYPE_MIN)
+        {
+        for (;;)
+          {
+          RMATCH(Fecode, RM27);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (Lc != UCHAR21INCTEST(Feptr)) RRETURN(MATCH_NOMATCH);
+          }
+        /* Control never gets here */
+        }
+      else  /* Maximize */
+        {
+        Lstart_eptr = Feptr;
+        for (i = Lmin; i < Lmax; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            break;
+            }
+
+          if (Lc != UCHAR21TEST(Feptr)) break;
+          Feptr++;
+          }
+
+        if (reptype != REPTYPE_POS) for (;;)
+          {
+          if (Feptr <= Lstart_eptr) break;
+          RMATCH(Fecode, RM28);
+          Feptr--;
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          }
+        }
+      }
+    break;
+
+#undef Loclength
+#undef Lstart_eptr
+#undef Lcharptr
+#undef Lmin
+#undef Lmax
+#undef Lc
+#undef Loc
+
+
+    /* ===================================================================== */
+    /* Match a negated single one-byte character repeatedly. This is almost a
+    repeat of the code for a repeated single character, but I haven't found a
+    nice way of commoning these up that doesn't require a test of the
+    positive/negative option for each character match. Maybe that wouldn't add
+    very much to the time taken, but character matching *is* what this is all
+    about... */
+
+#define Lstart_eptr  F->temp_sptr[0]
+#define Lmin         F->temp_32[0]
+#define Lmax         F->temp_32[1]
+#define Lc           F->temp_32[2]
+#define Loc          F->temp_32[3]
+
+    case OP_NOTEXACT:
+    case OP_NOTEXACTI:
+    Lmin = Lmax = GET2(Fecode, 1);
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTUPTO:
+    case OP_NOTUPTOI:
+    Lmin = 0;
+    Lmax = GET2(Fecode, 1);
+    reptype = REPTYPE_MAX;
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTMINUPTO:
+    case OP_NOTMINUPTOI:
+    Lmin = 0;
+    Lmax = GET2(Fecode, 1);
+    reptype = REPTYPE_MIN;
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSSTAR:
+    case OP_NOTPOSSTARI:
+    reptype = REPTYPE_POS;
+    Lmin = 0;
+    Lmax = UINT32_MAX;
+    Fecode++;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSPLUS:
+    case OP_NOTPOSPLUSI:
+    reptype = REPTYPE_POS;
+    Lmin = 1;
+    Lmax = UINT32_MAX;
+    Fecode++;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSQUERY:
+    case OP_NOTPOSQUERYI:
+    reptype = REPTYPE_POS;
+    Lmin = 0;
+    Lmax = 1;
+    Fecode++;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSUPTO:
+    case OP_NOTPOSUPTOI:
+    reptype = REPTYPE_POS;
+    Lmin = 0;
+    Lmax = GET2(Fecode, 1);
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTSTAR:
+    case OP_NOTSTARI:
+    case OP_NOTMINSTAR:
+    case OP_NOTMINSTARI:
+    case OP_NOTPLUS:
+    case OP_NOTPLUSI:
+    case OP_NOTMINPLUS:
+    case OP_NOTMINPLUSI:
+    case OP_NOTQUERY:
+    case OP_NOTQUERYI:
+    case OP_NOTMINQUERY:
+    case OP_NOTMINQUERYI:
+    fc = *Fecode++ - ((Fop >= OP_NOTSTARI)? OP_NOTSTARI: OP_NOTSTAR);
+    Lmin = rep_min[fc];
+    Lmax = rep_max[fc];
+    reptype = rep_typ[fc];
+
+    /* Common code for all repeated single-character non-matches. */
+
+    REPEATNOTCHAR:
+    GETCHARINCTEST(Lc, Fecode);
+
+    /* The code is duplicated for the caseless and caseful cases, for speed,
+    since matching characters is likely to be quite common. First, ensure the
+    minimum number of matches are present. If Lmin = Lmax, we are done.
+    Otherwise, if minimizing, keep trying the rest of the expression and
+    advancing one matching character if failing, up to the maximum.
+    Alternatively, if maximizing, find the maximum number of characters and
+    work backwards. */
+
+    if (Fop >= OP_NOTSTARI)     /* Caseless */
+      {
+#ifdef SUPPORT_UNICODE
+      if ((utf || ucp) && Lc > 127)
+        Loc = UCD_OTHERCASE(Lc);
+      else
+#endif /* SUPPORT_UNICODE */
+
+      Loc = TABLE_GET(Lc, mb->fcc, Lc);  /* Other case from table */
+
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        uint32_t d;
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINC(d, Feptr);
+          if (Lc == d || Loc == d) RRETURN(MATCH_NOMATCH);
+          }
+        }
+      else
+#endif  /* SUPPORT_UNICODE */
+
+      /* Not UTF mode */
+        {
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (Lc == *Feptr || Loc == *Feptr) RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          }
+        }
+
+      if (Lmin == Lmax) continue;  /* Finished for exact count */
+
+      if (reptype == REPTYPE_MIN)
+        {
+#ifdef SUPPORT_UNICODE
+        if (utf)
+          {
+          uint32_t d;
+          for (;;)
+            {
+            RMATCH(Fecode, RM204);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINC(d, Feptr);
+            if (Lc == d || Loc == d) RRETURN(MATCH_NOMATCH);
+            }
+          }
+        else
+#endif  /*SUPPORT_UNICODE */
+
+        /* Not UTF mode */
+          {
+          for (;;)
+            {
+            RMATCH(Fecode, RM29);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            if (Lc == *Feptr || Loc == *Feptr) RRETURN(MATCH_NOMATCH);
+            Feptr++;
+            }
+          }
+        /* Control never gets here */
+        }
+
+      /* Maximize case */
+
+      else
+        {
+        Lstart_eptr = Feptr;
+
+#ifdef SUPPORT_UNICODE
+        if (utf)
+          {
+          uint32_t d;
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(d, Feptr, len);
+            if (Lc == d || Loc == d) break;
+            Feptr += len;
+            }
+
+          /* After \C in UTF mode, Lstart_eptr might be in the middle of a
+          Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't
+          go too far. */
+
+          if (reptype != REPTYPE_POS) for(;;)
+            {
+            if (Feptr <= Lstart_eptr) break;
+            RMATCH(Fecode, RM205);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            Feptr--;
+            BACKCHAR(Feptr);
+            }
+          }
+        else
+#endif  /* SUPPORT_UNICODE */
+
+        /* Not UTF mode */
+          {
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (Lc == *Feptr || Loc == *Feptr) break;
+            Feptr++;
+            }
+          if (reptype != REPTYPE_POS) for (;;)
+            {
+            if (Feptr == Lstart_eptr) break;
+            RMATCH(Fecode, RM30);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            Feptr--;
+            }
+          }
+        }
+      }
+
+    /* Caseful comparisons */
+
+    else
+      {
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        uint32_t d;
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINC(d, Feptr);
+          if (Lc == d) RRETURN(MATCH_NOMATCH);
+          }
+        }
+      else
+#endif
+      /* Not UTF mode */
+        {
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (Lc == *Feptr++) RRETURN(MATCH_NOMATCH);
+          }
+        }
+
+      if (Lmin == Lmax) continue;
+
+      if (reptype == REPTYPE_MIN)
+        {
+#ifdef SUPPORT_UNICODE
+        if (utf)
+          {
+          uint32_t d;
+          for (;;)
+            {
+            RMATCH(Fecode, RM206);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINC(d, Feptr);
+            if (Lc == d) RRETURN(MATCH_NOMATCH);
+            }
+          }
+        else
+#endif
+        /* Not UTF mode */
+          {
+          for (;;)
+            {
+            RMATCH(Fecode, RM31);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            if (Lc == *Feptr++) RRETURN(MATCH_NOMATCH);
+            }
+          }
+        /* Control never gets here */
+        }
+
+      /* Maximize case */
+
+      else
+        {
+        Lstart_eptr = Feptr;
+
+#ifdef SUPPORT_UNICODE
+        if (utf)
+          {
+          uint32_t d;
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(d, Feptr, len);
+            if (Lc == d) break;
+            Feptr += len;
+            }
+
+          /* After \C in UTF mode, Lstart_eptr might be in the middle of a
+          Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't
+          go too far. */
+
+          if (reptype != REPTYPE_POS) for(;;)
+            {
+            if (Feptr <= Lstart_eptr) break;
+            RMATCH(Fecode, RM207);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            Feptr--;
+            BACKCHAR(Feptr);
+            }
+          }
+        else
+#endif
+        /* Not UTF mode */
+          {
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (Lc == *Feptr) break;
+            Feptr++;
+            }
+          if (reptype != REPTYPE_POS) for (;;)
+            {
+            if (Feptr == Lstart_eptr) break;
+            RMATCH(Fecode, RM32);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            Feptr--;
+            }
+          }
+        }
+      }
+    break;
+
+#undef Lstart_eptr
+#undef Lmin
+#undef Lmax
+#undef Lc
+#undef Loc
+
+
+    /* ===================================================================== */
+    /* Match a bit-mapped character class, possibly repeatedly. These opcodes
+    are used when all the characters in the class have values in the range
+    0-255, and either the matching is caseful, or the characters are in the
+    range 0-127 when UTF processing is enabled. The only difference between
+    OP_CLASS and OP_NCLASS occurs when a data character outside the range is
+    encountered. */
+
+#define Lmin               F->temp_32[0]
+#define Lmax               F->temp_32[1]
+#define Lstart_eptr        F->temp_sptr[0]
+#define Lbyte_map_address  F->temp_sptr[1]
+#define Lbyte_map          ((unsigned char *)Lbyte_map_address)
+
+    case OP_NCLASS:
+    case OP_CLASS:
+      {
+      Lbyte_map_address = Fecode + 1;           /* Save for matching */
+      Fecode += 1 + (32 / sizeof(PCRE2_UCHAR)); /* Advance past the item */
+
+      /* Look past the end of the item to see if there is repeat information
+      following. Then obey similar code to character type repeats. */
+
+      switch (*Fecode)
+        {
+        case OP_CRSTAR:
+        case OP_CRMINSTAR:
+        case OP_CRPLUS:
+        case OP_CRMINPLUS:
+        case OP_CRQUERY:
+        case OP_CRMINQUERY:
+        case OP_CRPOSSTAR:
+        case OP_CRPOSPLUS:
+        case OP_CRPOSQUERY:
+        fc = *Fecode++ - OP_CRSTAR;
+        Lmin = rep_min[fc];
+        Lmax = rep_max[fc];
+        reptype = rep_typ[fc];
+        break;
+
+        case OP_CRRANGE:
+        case OP_CRMINRANGE:
+        case OP_CRPOSRANGE:
+        Lmin = GET2(Fecode, 1);
+        Lmax = GET2(Fecode, 1 + IMM2_SIZE);
+        if (Lmax == 0) Lmax = UINT32_MAX;       /* Max 0 => infinity */
+        reptype = rep_typ[*Fecode - OP_CRSTAR];
+        Fecode += 1 + 2 * IMM2_SIZE;
+        break;
+
+        default:               /* No repeat follows */
+        Lmin = Lmax = 1;
+        break;
+        }
+
+      /* First, ensure the minimum number of matches are present. */
+
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINC(fc, Feptr);
+          if (fc > 255)
+            {
+            if (Fop == OP_CLASS) RRETURN(MATCH_NOMATCH);
+            }
+          else
+            if ((Lbyte_map[fc/8] & (1u << (fc&7))) == 0) RRETURN(MATCH_NOMATCH);
+          }
+        }
+      else
+#endif
+      /* Not UTF mode */
+        {
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          fc = *Feptr++;
+#if PCRE2_CODE_UNIT_WIDTH != 8
+          if (fc > 255)
+            {
+            if (Fop == OP_CLASS) RRETURN(MATCH_NOMATCH);
+            }
+          else
+#endif
+          if ((Lbyte_map[fc/8] & (1u << (fc&7))) == 0) RRETURN(MATCH_NOMATCH);
+          }
+        }
+
+      /* If Lmax == Lmin we are done. Continue with main loop. */
+
+      if (Lmin == Lmax) continue;
+
+      /* If minimizing, keep testing the rest of the expression and advancing
+      the pointer while it matches the class. */
+
+      if (reptype == REPTYPE_MIN)
+        {
+#ifdef SUPPORT_UNICODE
+        if (utf)
+          {
+          for (;;)
+            {
+            RMATCH(Fecode, RM200);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINC(fc, Feptr);
+            if (fc > 255)
+              {
+              if (Fop == OP_CLASS) RRETURN(MATCH_NOMATCH);
+              }
+            else
+              if ((Lbyte_map[fc/8] & (1u << (fc&7))) == 0) RRETURN(MATCH_NOMATCH);
+            }
+          }
+        else
+#endif
+        /* Not UTF mode */
+          {
+          for (;;)
+            {
+            RMATCH(Fecode, RM23);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            fc = *Feptr++;
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            if (fc > 255)
+              {
+              if (Fop == OP_CLASS) RRETURN(MATCH_NOMATCH);
+              }
+            else
+#endif
+            if ((Lbyte_map[fc/8] & (1u << (fc&7))) == 0) RRETURN(MATCH_NOMATCH);
+            }
+          }
+        /* Control never gets here */
+        }
+
+      /* If maximizing, find the longest possible run, then work backwards. */
+
+      else
+        {
+        Lstart_eptr = Feptr;
+
+#ifdef SUPPORT_UNICODE
+        if (utf)
+          {
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            if (fc > 255)
+              {
+              if (Fop == OP_CLASS) break;
+              }
+            else
+              if ((Lbyte_map[fc/8] & (1u << (fc&7))) == 0) break;
+            Feptr += len;
+            }
+
+          if (reptype == REPTYPE_POS) continue;    /* No backtracking */
+
+          /* After \C in UTF mode, Lstart_eptr might be in the middle of a
+          Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't
+          go too far. */
+
+          for (;;)
+            {
+            RMATCH(Fecode, RM201);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Feptr-- <= Lstart_eptr) break;  /* Tried at original position */
+            BACKCHAR(Feptr);
+            }
+          }
+        else
+#endif
+          /* Not UTF mode */
+          {
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            fc = *Feptr;
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            if (fc > 255)
+              {
+              if (Fop == OP_CLASS) break;
+              }
+            else
+#endif
+            if ((Lbyte_map[fc/8] & (1u << (fc&7))) == 0) break;
+            Feptr++;
+            }
+
+          if (reptype == REPTYPE_POS) continue;    /* No backtracking */
+
+          while (Feptr >= Lstart_eptr)
+            {
+            RMATCH(Fecode, RM24);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            Feptr--;
+            }
+          }
+
+        RRETURN(MATCH_NOMATCH);
+        }
+      }
+    /* Control never gets here */
+
+#undef Lbyte_map_address
+#undef Lbyte_map
+#undef Lstart_eptr
+#undef Lmin
+#undef Lmax
+
+
+    /* ===================================================================== */
+    /* Match an extended character class. In the 8-bit library, this opcode is
+    encountered only when UTF-8 mode mode is supported. In the 16-bit and
+    32-bit libraries, codepoints greater than 255 may be encountered even when
+    UTF is not supported. */
+
+#define Lstart_eptr  F->temp_sptr[0]
+#define Lxclass_data F->temp_sptr[1]
+#define Lmin         F->temp_32[0]
+#define Lmax         F->temp_32[1]
+
+#ifdef SUPPORT_WIDE_CHARS
+    case OP_XCLASS:
+      {
+      Lxclass_data = Fecode + 1 + LINK_SIZE;  /* Save for matching */
+      Fecode += GET(Fecode, 1);               /* Advance past the item */
+
+      switch (*Fecode)
+        {
+        case OP_CRSTAR:
+        case OP_CRMINSTAR:
+        case OP_CRPLUS:
+        case OP_CRMINPLUS:
+        case OP_CRQUERY:
+        case OP_CRMINQUERY:
+        case OP_CRPOSSTAR:
+        case OP_CRPOSPLUS:
+        case OP_CRPOSQUERY:
+        fc = *Fecode++ - OP_CRSTAR;
+        Lmin = rep_min[fc];
+        Lmax = rep_max[fc];
+        reptype = rep_typ[fc];
+        break;
+
+        case OP_CRRANGE:
+        case OP_CRMINRANGE:
+        case OP_CRPOSRANGE:
+        Lmin = GET2(Fecode, 1);
+        Lmax = GET2(Fecode, 1 + IMM2_SIZE);
+        if (Lmax == 0) Lmax = UINT32_MAX;  /* Max 0 => infinity */
+        reptype = rep_typ[*Fecode - OP_CRSTAR];
+        Fecode += 1 + 2 * IMM2_SIZE;
+        break;
+
+        default:               /* No repeat follows */
+        Lmin = Lmax = 1;
+        break;
+        }
+
+      /* First, ensure the minimum number of matches are present. */
+
+      for (i = 1; i <= Lmin; i++)
+        {
+        if (Feptr >= mb->end_subject)
+          {
+          SCHECK_PARTIAL();
+          RRETURN(MATCH_NOMATCH);
+          }
+        GETCHARINCTEST(fc, Feptr);
+        if (!PRIV(xclass)(fc, Lxclass_data, utf)) RRETURN(MATCH_NOMATCH);
+        }
+
+      /* If Lmax == Lmin we can just continue with the main loop. */
+
+      if (Lmin == Lmax) continue;
+
+      /* If minimizing, keep testing the rest of the expression and advancing
+      the pointer while it matches the class. */
+
+      if (reptype == REPTYPE_MIN)
+        {
+        for (;;)
+          {
+          RMATCH(Fecode, RM100);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINCTEST(fc, Feptr);
+          if (!PRIV(xclass)(fc, Lxclass_data, utf)) RRETURN(MATCH_NOMATCH);
+          }
+        /* Control never gets here */
+        }
+
+      /* If maximizing, find the longest possible run, then work backwards. */
+
+      else
+        {
+        Lstart_eptr = Feptr;
+        for (i = Lmin; i < Lmax; i++)
+          {
+          int len = 1;
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            break;
+            }
+#ifdef SUPPORT_UNICODE
+          GETCHARLENTEST(fc, Feptr, len);
+#else
+          fc = *Feptr;
+#endif
+          if (!PRIV(xclass)(fc, Lxclass_data, utf)) break;
+          Feptr += len;
+          }
+
+        if (reptype == REPTYPE_POS) continue;    /* No backtracking */
+
+        /* After \C in UTF mode, Lstart_eptr might be in the middle of a
+        Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't
+        go too far. */
+
+        for(;;)
+          {
+          RMATCH(Fecode, RM101);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Feptr-- <= Lstart_eptr) break;  /* Tried at original position */
+#ifdef SUPPORT_UNICODE
+          if (utf) BACKCHAR(Feptr);
+#endif
+          }
+        RRETURN(MATCH_NOMATCH);
+        }
+
+      /* Control never gets here */
+      }
+#endif  /* SUPPORT_WIDE_CHARS: end of XCLASS */
+
+#undef Lstart_eptr
+#undef Lxclass_data
+#undef Lmin
+#undef Lmax
+
+
+    /* ===================================================================== */
+    /* Match various character types when PCRE2_UCP is not set. These opcodes
+    are not generated when PCRE2_UCP is set - instead appropriate property
+    tests are compiled. */
+
+    case OP_NOT_DIGIT:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    if (CHMAX_255(fc) && (mb->ctypes[fc] & ctype_digit) != 0)
+      RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+    case OP_DIGIT:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    if (!CHMAX_255(fc) || (mb->ctypes[fc] & ctype_digit) == 0)
+      RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+    case OP_NOT_WHITESPACE:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    if (CHMAX_255(fc) && (mb->ctypes[fc] & ctype_space) != 0)
+      RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+    case OP_WHITESPACE:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    if (!CHMAX_255(fc) || (mb->ctypes[fc] & ctype_space) == 0)
+      RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+    case OP_NOT_WORDCHAR:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    if (CHMAX_255(fc) && (mb->ctypes[fc] & ctype_word) != 0)
+      RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+    case OP_WORDCHAR:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    if (!CHMAX_255(fc) || (mb->ctypes[fc] & ctype_word) == 0)
+      RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+    case OP_ANYNL:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    switch(fc)
+      {
+      default: RRETURN(MATCH_NOMATCH);
+
+      case CHAR_CR:
+      if (Feptr >= mb->end_subject)
+        {
+        SCHECK_PARTIAL();
+        }
+      else if (UCHAR21TEST(Feptr) == CHAR_LF) Feptr++;
+      break;
+
+      case CHAR_LF:
+      break;
+
+      case CHAR_VT:
+      case CHAR_FF:
+      case CHAR_NEL:
+#ifndef EBCDIC
+      case 0x2028:
+      case 0x2029:
+#endif  /* Not EBCDIC */
+      if (mb->bsr_convention == PCRE2_BSR_ANYCRLF) RRETURN(MATCH_NOMATCH);
+      break;
+      }
+    Fecode++;
+    break;
+
+    case OP_NOT_HSPACE:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    switch(fc)
+      {
+      HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
+      default: break;
+      }
+    Fecode++;
+    break;
+
+    case OP_HSPACE:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    switch(fc)
+      {
+      HSPACE_CASES: break;  /* Byte and multibyte cases */
+      default: RRETURN(MATCH_NOMATCH);
+      }
+    Fecode++;
+    break;
+
+    case OP_NOT_VSPACE:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    switch(fc)
+      {
+      VSPACE_CASES: RRETURN(MATCH_NOMATCH);
+      default: break;
+      }
+    Fecode++;
+    break;
+
+    case OP_VSPACE:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+    switch(fc)
+      {
+      VSPACE_CASES: break;
+      default: RRETURN(MATCH_NOMATCH);
+      }
+    Fecode++;
+    break;
+
+
+#ifdef SUPPORT_UNICODE
+
+    /* ===================================================================== */
+    /* Check the next character by Unicode property. We will get here only
+    if the support is in the binary; otherwise a compile-time error occurs. */
+
+    case OP_PROP:
+    case OP_NOTPROP:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    GETCHARINCTEST(fc, Feptr);
+      {
+      const uint32_t *cp;
+      const ucd_record *prop = GET_UCD(fc);
+      BOOL notmatch = Fop == OP_NOTPROP;
+
+      switch(Fecode[1])
+        {
+        case PT_ANY:
+        if (notmatch) RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_LAMP:
+        if ((prop->chartype == ucp_Lu ||
+             prop->chartype == ucp_Ll ||
+             prop->chartype == ucp_Lt) == notmatch)
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_GC:
+        if ((Fecode[2] == PRIV(ucp_gentype)[prop->chartype]) == notmatch)
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_PC:
+        if ((Fecode[2] == prop->chartype) == notmatch)
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_SC:
+        if ((Fecode[2] == prop->script) == notmatch)
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_SCX:
+          {
+          BOOL ok = (Fecode[2] == prop->script ||
+                     MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), Fecode[2]) != 0);
+          if (ok == notmatch) RRETURN(MATCH_NOMATCH);
+          }
+        break;
+
+        /* These are specials */
+
+        case PT_ALNUM:
+        if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
+             PRIV(ucp_gentype)[prop->chartype] == ucp_N) == notmatch)
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        /* Perl space used to exclude VT, but from Perl 5.18 it is included,
+        which means that Perl space and POSIX space are now identical. PCRE
+        was changed at release 8.34. */
+
+        case PT_SPACE:    /* Perl space */
+        case PT_PXSPACE:  /* POSIX space */
+        switch(fc)
+          {
+          HSPACE_CASES:
+          VSPACE_CASES:
+          if (notmatch) RRETURN(MATCH_NOMATCH);
+          break;
+
+          default:
+          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == notmatch)
+            RRETURN(MATCH_NOMATCH);
+          break;
+          }
+        break;
+
+        case PT_WORD:
+        if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
+             PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
+             fc == CHAR_UNDERSCORE) == notmatch)
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_CLIST:
+        cp = PRIV(ucd_caseless_sets) + Fecode[2];
+        for (;;)
+          {
+          if (fc < *cp)
+            { if (notmatch) break; else { RRETURN(MATCH_NOMATCH); } }
+          if (fc == *cp++)
+            { if (notmatch) { RRETURN(MATCH_NOMATCH); } else break; }
+          }
+        break;
+
+        case PT_UCNC:
+        if ((fc == CHAR_DOLLAR_SIGN || fc == CHAR_COMMERCIAL_AT ||
+             fc == CHAR_GRAVE_ACCENT || (fc >= 0xa0 && fc <= 0xd7ff) ||
+             fc >= 0xe000) == notmatch)
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_BIDICL:
+        if ((UCD_BIDICLASS_PROP(prop) == Fecode[2]) == notmatch)
+          RRETURN(MATCH_NOMATCH);
+        break;
+
+        case PT_BOOL:
+          {
+          BOOL ok = MAPBIT(PRIV(ucd_boolprop_sets) +
+            UCD_BPROPS_PROP(prop), Fecode[2]) != 0;
+          if (ok == notmatch) RRETURN(MATCH_NOMATCH);
+          }
+        break;
+
+        /* This should never occur */
+
+        default:
+        return PCRE2_ERROR_INTERNAL;
+        }
+
+      Fecode += 3;
+      }
+    break;
+
+
+    /* ===================================================================== */
+    /* Match an extended Unicode sequence. We will get here only if the support
+    is in the binary; otherwise a compile-time error occurs. */
+
+    case OP_EXTUNI:
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      RRETURN(MATCH_NOMATCH);
+      }
+    else
+      {
+      GETCHARINCTEST(fc, Feptr);
+      Feptr = PRIV(extuni)(fc, Feptr, mb->start_subject, mb->end_subject, utf,
+        NULL);
+      }
+    CHECK_PARTIAL();
+    Fecode++;
+    break;
+
+#endif  /* SUPPORT_UNICODE */
+
+
+    /* ===================================================================== */
+    /* Match a single character type repeatedly. Note that the property type
+    does not need to be in a stack frame as it is not used within an RMATCH()
+    loop. */
+
+#define Lstart_eptr  F->temp_sptr[0]
+#define Lmin         F->temp_32[0]
+#define Lmax         F->temp_32[1]
+#define Lctype       F->temp_32[2]
+#define Lpropvalue   F->temp_32[3]
+
+    case OP_TYPEEXACT:
+    Lmin = Lmax = GET2(Fecode, 1);
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATTYPE;
+
+    case OP_TYPEUPTO:
+    case OP_TYPEMINUPTO:
+    Lmin = 0;
+    Lmax = GET2(Fecode, 1);
+    reptype = (*Fecode == OP_TYPEMINUPTO)? REPTYPE_MIN : REPTYPE_MAX;
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSSTAR:
+    reptype = REPTYPE_POS;
+    Lmin = 0;
+    Lmax = UINT32_MAX;
+    Fecode++;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSPLUS:
+    reptype = REPTYPE_POS;
+    Lmin = 1;
+    Lmax = UINT32_MAX;
+    Fecode++;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSQUERY:
+    reptype = REPTYPE_POS;
+    Lmin = 0;
+    Lmax = 1;
+    Fecode++;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSUPTO:
+    reptype = REPTYPE_POS;
+    Lmin = 0;
+    Lmax = GET2(Fecode, 1);
+    Fecode += 1 + IMM2_SIZE;
+    goto REPEATTYPE;
+
+    case OP_TYPESTAR:
+    case OP_TYPEMINSTAR:
+    case OP_TYPEPLUS:
+    case OP_TYPEMINPLUS:
+    case OP_TYPEQUERY:
+    case OP_TYPEMINQUERY:
+    fc = *Fecode++ - OP_TYPESTAR;
+    Lmin = rep_min[fc];
+    Lmax = rep_max[fc];
+    reptype = rep_typ[fc];
+
+    /* Common code for all repeated character type matches. */
+
+    REPEATTYPE:
+    Lctype = *Fecode++;      /* Code for the character type */
+
+#ifdef SUPPORT_UNICODE
+    if (Lctype == OP_PROP || Lctype == OP_NOTPROP)
+      {
+      proptype = *Fecode++;
+      Lpropvalue = *Fecode++;
+      }
+    else proptype = -1;
+#endif
+
+    /* First, ensure the minimum number of matches are present. Use inline
+    code for maximizing the speed, and do the type test once at the start
+    (i.e. keep it out of the loops). As there are no calls to RMATCH in the
+    loops, we can use an ordinary variable for "notmatch". The code for UTF
+    mode is separated out for tidiness, except for Unicode property tests. */
+
+    if (Lmin > 0)
+      {
+#ifdef SUPPORT_UNICODE
+      if (proptype >= 0)  /* Property tests in all modes */
+        {
+        BOOL notmatch = Lctype == OP_NOTPROP;
+        switch(proptype)
+          {
+          case PT_ANY:
+          if (notmatch) RRETURN(MATCH_NOMATCH);
+          for (i = 1; i <= Lmin; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            }
+          break;
+
+          case PT_LAMP:
+          for (i = 1; i <= Lmin; i++)
+            {
+            int chartype;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            chartype = UCD_CHARTYPE(fc);
+            if ((chartype == ucp_Lu ||
+                 chartype == ucp_Ll ||
+                 chartype == ucp_Lt) == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_GC:
+          for (i = 1; i <= Lmin; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((UCD_CATEGORY(fc) == Lpropvalue) == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_PC:
+          for (i = 1; i <= Lmin; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((UCD_CHARTYPE(fc) == Lpropvalue) == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_SC:
+          for (i = 1; i <= Lmin; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((UCD_SCRIPT(fc) == Lpropvalue) == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_SCX:
+          for (i = 1; i <= Lmin; i++)
+            {
+            BOOL ok;
+            const ucd_record *prop;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            prop = GET_UCD(fc);
+            ok = (prop->script == Lpropvalue ||
+                  MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), Lpropvalue) != 0);
+            if (ok == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_ALNUM:
+          for (i = 1; i <= Lmin; i++)
+            {
+            int category;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            category = UCD_CATEGORY(fc);
+            if ((category == ucp_L || category == ucp_N) == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
+          which means that Perl space and POSIX space are now identical. PCRE
+          was changed at release 8.34. */
+
+          case PT_SPACE:    /* Perl space */
+          case PT_PXSPACE:  /* POSIX space */
+          for (i = 1; i <= Lmin; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            switch(fc)
+              {
+              HSPACE_CASES:
+              VSPACE_CASES:
+              if (notmatch) RRETURN(MATCH_NOMATCH);
+              break;
+
+              default:
+              if ((UCD_CATEGORY(fc) == ucp_Z) == notmatch)
+                RRETURN(MATCH_NOMATCH);
+              break;
+              }
+            }
+          break;
+
+          case PT_WORD:
+          for (i = 1; i <= Lmin; i++)
+            {
+            int category;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            category = UCD_CATEGORY(fc);
+            if ((category == ucp_L || category == ucp_N ||
+                fc == CHAR_UNDERSCORE) == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_CLIST:
+          for (i = 1; i <= Lmin; i++)
+            {
+            const uint32_t *cp;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            cp = PRIV(ucd_caseless_sets) + Lpropvalue;
+            for (;;)
+              {
+              if (fc < *cp)
+                {
+                if (notmatch) break;
+                RRETURN(MATCH_NOMATCH);
+                }
+              if (fc == *cp++)
+                {
+                if (notmatch) RRETURN(MATCH_NOMATCH);
+                break;
+                }
+              }
+            }
+          break;
+
+          case PT_UCNC:
+          for (i = 1; i <= Lmin; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((fc == CHAR_DOLLAR_SIGN || fc == CHAR_COMMERCIAL_AT ||
+                 fc == CHAR_GRAVE_ACCENT || (fc >= 0xa0 && fc <= 0xd7ff) ||
+                 fc >= 0xe000) == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_BIDICL:
+          for (i = 1; i <= Lmin; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((UCD_BIDICLASS(fc) == Lpropvalue) == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          case PT_BOOL:
+          for (i = 1; i <= Lmin; i++)
+            {
+            BOOL ok;
+            const ucd_record *prop;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            prop = GET_UCD(fc);
+            ok = MAPBIT(PRIV(ucd_boolprop_sets) +
+              UCD_BPROPS_PROP(prop), Lpropvalue) != 0;
+            if (ok == notmatch)
+              RRETURN(MATCH_NOMATCH);
+            }
+          break;
+
+          /* This should not occur */
+
+          default:
+          return PCRE2_ERROR_INTERNAL;
+          }
+        }
+
+      /* Match extended Unicode sequences. We will get here only if the
+      support is in the binary; otherwise a compile-time error occurs. */
+
+      else if (Lctype == OP_EXTUNI)
+        {
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          else
+            {
+            GETCHARINCTEST(fc, Feptr);
+            Feptr = PRIV(extuni)(fc, Feptr, mb->start_subject,
+              mb->end_subject, utf, NULL);
+            }
+          CHECK_PARTIAL();
+          }
+        }
+      else
+#endif     /* SUPPORT_UNICODE */
+
+/* Handle all other cases in UTF mode */
+
+#ifdef SUPPORT_UNICODE
+      if (utf) switch(Lctype)
+        {
+        case OP_ANY:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (IS_NEWLINE(Feptr)) RRETURN(MATCH_NOMATCH);
+          if (mb->partial != 0 &&
+              Feptr + 1 >= mb->end_subject &&
+              NLBLOCK->nltype == NLTYPE_FIXED &&
+              NLBLOCK->nllen == 2 &&
+              UCHAR21(Feptr) == NLBLOCK->nl[0])
+            {
+            mb->hitend = TRUE;
+            if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+            }
+          Feptr++;
+          ACROSSCHAR(Feptr < mb->end_subject, Feptr, Feptr++);
+          }
+        break;
+
+        case OP_ALLANY:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          Feptr++;
+          ACROSSCHAR(Feptr < mb->end_subject, Feptr, Feptr++);
+          }
+        break;
+
+        case OP_ANYBYTE:
+        if (Feptr > mb->end_subject - Lmin) RRETURN(MATCH_NOMATCH);
+        Feptr += Lmin;
+        break;
+
+        case OP_ANYNL:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINC(fc, Feptr);
+          switch(fc)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+
+            case CHAR_CR:
+            if (Feptr < mb->end_subject && UCHAR21(Feptr) == CHAR_LF) Feptr++;
+            break;
+
+            case CHAR_LF:
+            break;
+
+            case CHAR_VT:
+            case CHAR_FF:
+            case CHAR_NEL:
+#ifndef EBCDIC
+            case 0x2028:
+            case 0x2029:
+#endif  /* Not EBCDIC */
+            if (mb->bsr_convention == PCRE2_BSR_ANYCRLF) RRETURN(MATCH_NOMATCH);
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_HSPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINC(fc, Feptr);
+          switch(fc)
+            {
+            HSPACE_CASES: RRETURN(MATCH_NOMATCH);
+            default: break;
+            }
+          }
+        break;
+
+        case OP_HSPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINC(fc, Feptr);
+          switch(fc)
+            {
+            HSPACE_CASES: break;
+            default: RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_NOT_VSPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINC(fc, Feptr);
+          switch(fc)
+            {
+            VSPACE_CASES: RRETURN(MATCH_NOMATCH);
+            default: break;
+            }
+          }
+        break;
+
+        case OP_VSPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINC(fc, Feptr);
+          switch(fc)
+            {
+            VSPACE_CASES: break;
+            default: RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_NOT_DIGIT:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINC(fc, Feptr);
+          if (fc < 128 && (mb->ctypes[fc] & ctype_digit) != 0)
+            RRETURN(MATCH_NOMATCH);
+          }
+        break;
+
+        case OP_DIGIT:
+        for (i = 1; i <= Lmin; i++)
+          {
+          uint32_t cc;
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          cc = UCHAR21(Feptr);
+          if (cc >= 128 || (mb->ctypes[cc] & ctype_digit) == 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          /* No need to skip more code units - we know it has only one. */
+          }
+        break;
+
+        case OP_NOT_WHITESPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          uint32_t cc;
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          cc = UCHAR21(Feptr);
+          if (cc < 128 && (mb->ctypes[cc] & ctype_space) != 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          ACROSSCHAR(Feptr < mb->end_subject, Feptr, Feptr++);
+          }
+        break;
+
+        case OP_WHITESPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          uint32_t cc;
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          cc = UCHAR21(Feptr);
+          if (cc >= 128 || (mb->ctypes[cc] & ctype_space) == 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          /* No need to skip more code units - we know it has only one. */
+          }
+        break;
+
+        case OP_NOT_WORDCHAR:
+        for (i = 1; i <= Lmin; i++)
+          {
+          uint32_t cc;
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          cc = UCHAR21(Feptr);
+          if (cc < 128 && (mb->ctypes[cc] & ctype_word) != 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          ACROSSCHAR(Feptr < mb->end_subject, Feptr, Feptr++);
+          }
+        break;
+
+        case OP_WORDCHAR:
+        for (i = 1; i <= Lmin; i++)
+          {
+          uint32_t cc;
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          cc = UCHAR21(Feptr);
+          if (cc >= 128 || (mb->ctypes[cc] & ctype_word) == 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          /* No need to skip more code units - we know it has only one. */
+          }
+        break;
+
+        default:
+        return PCRE2_ERROR_INTERNAL;
+        }  /* End switch(Lctype) */
+
+      else
+#endif     /* SUPPORT_UNICODE */
+
+      /* Code for the non-UTF case for minimum matching of operators other
+      than OP_PROP and OP_NOTPROP. */
+
+      switch(Lctype)
+        {
+        case OP_ANY:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (IS_NEWLINE(Feptr)) RRETURN(MATCH_NOMATCH);
+          if (mb->partial != 0 &&
+              Feptr + 1 >= mb->end_subject &&
+              NLBLOCK->nltype == NLTYPE_FIXED &&
+              NLBLOCK->nllen == 2 &&
+              *Feptr == NLBLOCK->nl[0])
+            {
+            mb->hitend = TRUE;
+            if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+            }
+          Feptr++;
+          }
+        break;
+
+        case OP_ALLANY:
+        if (Feptr > mb->end_subject - Lmin)
+          {
+          SCHECK_PARTIAL();
+          RRETURN(MATCH_NOMATCH);
+          }
+        Feptr += Lmin;
+        break;
+
+        /* This OP_ANYBYTE case will never be reached because \C gets turned
+        into OP_ALLANY in non-UTF mode. Cut out the code so that coverage
+        reports don't complain about it's never being used. */
+
+/*        case OP_ANYBYTE:
+*        if (Feptr > mb->end_subject - Lmin)
+*          {
+*          SCHECK_PARTIAL();
+*          RRETURN(MATCH_NOMATCH);
+*          }
+*        Feptr += Lmin;
+*        break;
+*/
+        case OP_ANYNL:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          switch(*Feptr++)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+
+            case CHAR_CR:
+            if (Feptr < mb->end_subject && *Feptr == CHAR_LF) Feptr++;
+            break;
+
+            case CHAR_LF:
+            break;
+
+            case CHAR_VT:
+            case CHAR_FF:
+            case CHAR_NEL:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            case 0x2028:
+            case 0x2029:
+#endif
+            if (mb->bsr_convention == PCRE2_BSR_ANYCRLF) RRETURN(MATCH_NOMATCH);
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_HSPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          switch(*Feptr++)
+            {
+            default: break;
+            HSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            HSPACE_MULTIBYTE_CASES:
+#endif
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_HSPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          switch(*Feptr++)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            HSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            HSPACE_MULTIBYTE_CASES:
+#endif
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_VSPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          switch(*Feptr++)
+            {
+            VSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            VSPACE_MULTIBYTE_CASES:
+#endif
+            RRETURN(MATCH_NOMATCH);
+            default: break;
+            }
+          }
+        break;
+
+        case OP_VSPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          switch(*Feptr++)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            VSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            VSPACE_MULTIBYTE_CASES:
+#endif
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_DIGIT:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (MAX_255(*Feptr) && (mb->ctypes[*Feptr] & ctype_digit) != 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          }
+        break;
+
+        case OP_DIGIT:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (!MAX_255(*Feptr) || (mb->ctypes[*Feptr] & ctype_digit) == 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          }
+        break;
+
+        case OP_NOT_WHITESPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (MAX_255(*Feptr) && (mb->ctypes[*Feptr] & ctype_space) != 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          }
+        break;
+
+        case OP_WHITESPACE:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (!MAX_255(*Feptr) || (mb->ctypes[*Feptr] & ctype_space) == 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          }
+        break;
+
+        case OP_NOT_WORDCHAR:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (MAX_255(*Feptr) && (mb->ctypes[*Feptr] & ctype_word) != 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          }
+        break;
+
+        case OP_WORDCHAR:
+        for (i = 1; i <= Lmin; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (!MAX_255(*Feptr) || (mb->ctypes[*Feptr] & ctype_word) == 0)
+            RRETURN(MATCH_NOMATCH);
+          Feptr++;
+          }
+        break;
+
+        default:
+        return PCRE2_ERROR_INTERNAL;
+        }
+      }
+
+    /* If Lmin = Lmax we are done. Continue with the main loop. */
+
+    if (Lmin == Lmax) continue;
+
+    /* If minimizing, we have to test the rest of the pattern before each
+    subsequent match. This means we cannot use a local "notmatch" variable as
+    in the other cases. As all 4 temporary 32-bit values in the frame are
+    already in use, just test the type each time. */
+
+    if (reptype == REPTYPE_MIN)
+      {
+#ifdef SUPPORT_UNICODE
+      if (proptype >= 0)
+        {
+        switch(proptype)
+          {
+          case PT_ANY:
+          for (;;)
+            {
+            RMATCH(Fecode, RM208);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if (Lctype == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_LAMP:
+          for (;;)
+            {
+            int chartype;
+            RMATCH(Fecode, RM209);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            chartype = UCD_CHARTYPE(fc);
+            if ((chartype == ucp_Lu ||
+                 chartype == ucp_Ll ||
+                 chartype == ucp_Lt) == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_GC:
+          for (;;)
+            {
+            RMATCH(Fecode, RM210);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((UCD_CATEGORY(fc) == Lpropvalue) == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_PC:
+          for (;;)
+            {
+            RMATCH(Fecode, RM211);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((UCD_CHARTYPE(fc) == Lpropvalue) == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_SC:
+          for (;;)
+            {
+            RMATCH(Fecode, RM212);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((UCD_SCRIPT(fc) == Lpropvalue) == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_SCX:
+          for (;;)
+            {
+            BOOL ok;
+            const ucd_record *prop;
+            RMATCH(Fecode, RM225);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            prop = GET_UCD(fc);
+            ok = (prop->script == Lpropvalue
+                  || MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), Lpropvalue) != 0);
+            if (ok == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_ALNUM:
+          for (;;)
+            {
+            int category;
+            RMATCH(Fecode, RM213);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            category = UCD_CATEGORY(fc);
+            if ((category == ucp_L || category == ucp_N) == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
+          which means that Perl space and POSIX space are now identical. PCRE
+          was changed at release 8.34. */
+
+          case PT_SPACE:    /* Perl space */
+          case PT_PXSPACE:  /* POSIX space */
+          for (;;)
+            {
+            RMATCH(Fecode, RM214);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            switch(fc)
+              {
+              HSPACE_CASES:
+              VSPACE_CASES:
+              if (Lctype == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
+              break;
+
+              default:
+              if ((UCD_CATEGORY(fc) == ucp_Z) == (Lctype == OP_NOTPROP))
+                RRETURN(MATCH_NOMATCH);
+              break;
+              }
+            }
+          /* Control never gets here */
+
+          case PT_WORD:
+          for (;;)
+            {
+            int category;
+            RMATCH(Fecode, RM215);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            category = UCD_CATEGORY(fc);
+            if ((category == ucp_L ||
+                 category == ucp_N ||
+                 fc == CHAR_UNDERSCORE) == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_CLIST:
+          for (;;)
+            {
+            const uint32_t *cp;
+            RMATCH(Fecode, RM216);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            cp = PRIV(ucd_caseless_sets) + Lpropvalue;
+            for (;;)
+              {
+              if (fc < *cp)
+                {
+                if (Lctype == OP_NOTPROP) break;
+                RRETURN(MATCH_NOMATCH);
+                }
+              if (fc == *cp++)
+                {
+                if (Lctype == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
+                break;
+                }
+              }
+            }
+          /* Control never gets here */
+
+          case PT_UCNC:
+          for (;;)
+            {
+            RMATCH(Fecode, RM217);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((fc == CHAR_DOLLAR_SIGN || fc == CHAR_COMMERCIAL_AT ||
+                 fc == CHAR_GRAVE_ACCENT || (fc >= 0xa0 && fc <= 0xd7ff) ||
+                 fc >= 0xe000) == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_BIDICL:
+          for (;;)
+            {
+            RMATCH(Fecode, RM224);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            if ((UCD_BIDICLASS(fc) == Lpropvalue) == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          case PT_BOOL:
+          for (;;)
+            {
+            BOOL ok;
+            const ucd_record *prop;
+            RMATCH(Fecode, RM223);
+            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              RRETURN(MATCH_NOMATCH);
+              }
+            GETCHARINCTEST(fc, Feptr);
+            prop = GET_UCD(fc);
+            ok = MAPBIT(PRIV(ucd_boolprop_sets) +
+              UCD_BPROPS_PROP(prop), Lpropvalue) != 0;
+            if (ok == (Lctype == OP_NOTPROP))
+              RRETURN(MATCH_NOMATCH);
+            }
+          /* Control never gets here */
+
+          /* This should never occur */
+          default:
+          return PCRE2_ERROR_INTERNAL;
+          }
+        }
+
+      /* Match extended Unicode sequences. We will get here only if the
+      support is in the binary; otherwise a compile-time error occurs. */
+
+      else if (Lctype == OP_EXTUNI)
+        {
+        for (;;)
+          {
+          RMATCH(Fecode, RM218);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          else
+            {
+            GETCHARINCTEST(fc, Feptr);
+            Feptr = PRIV(extuni)(fc, Feptr, mb->start_subject, mb->end_subject,
+              utf, NULL);
+            }
+          CHECK_PARTIAL();
+          }
+        }
+      else
+#endif     /* SUPPORT_UNICODE */
+
+      /* UTF mode for non-property testing character types. */
+
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        for (;;)
+          {
+          RMATCH(Fecode, RM219);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (Lctype == OP_ANY && IS_NEWLINE(Feptr)) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(fc, Feptr);
+          switch(Lctype)
+            {
+            case OP_ANY:               /* This is the non-NL case */
+            if (mb->partial != 0 &&    /* Take care with CRLF partial */
+                Feptr >= mb->end_subject &&
+                NLBLOCK->nltype == NLTYPE_FIXED &&
+                NLBLOCK->nllen == 2 &&
+                fc == NLBLOCK->nl[0])
+              {
+              mb->hitend = TRUE;
+              if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+              }
+            break;
+
+            case OP_ALLANY:
+            case OP_ANYBYTE:
+            break;
+
+            case OP_ANYNL:
+            switch(fc)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+
+              case CHAR_CR:
+              if (Feptr < mb->end_subject && UCHAR21(Feptr) == CHAR_LF) Feptr++;
+              break;
+
+              case CHAR_LF:
+              break;
+
+              case CHAR_VT:
+              case CHAR_FF:
+              case CHAR_NEL:
+#ifndef EBCDIC
+              case 0x2028:
+              case 0x2029:
+#endif  /* Not EBCDIC */
+              if (mb->bsr_convention == PCRE2_BSR_ANYCRLF)
+                RRETURN(MATCH_NOMATCH);
+              break;
+              }
+            break;
+
+            case OP_NOT_HSPACE:
+            switch(fc)
+              {
+              HSPACE_CASES: RRETURN(MATCH_NOMATCH);
+              default: break;
+              }
+            break;
+
+            case OP_HSPACE:
+            switch(fc)
+              {
+              HSPACE_CASES: break;
+              default: RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_NOT_VSPACE:
+            switch(fc)
+              {
+              VSPACE_CASES: RRETURN(MATCH_NOMATCH);
+              default: break;
+              }
+            break;
+
+            case OP_VSPACE:
+            switch(fc)
+              {
+              VSPACE_CASES: break;
+              default: RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_NOT_DIGIT:
+            if (fc < 256 && (mb->ctypes[fc] & ctype_digit) != 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_DIGIT:
+            if (fc >= 256 || (mb->ctypes[fc] & ctype_digit) == 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_NOT_WHITESPACE:
+            if (fc < 256 && (mb->ctypes[fc] & ctype_space) != 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_WHITESPACE:
+            if (fc >= 256 || (mb->ctypes[fc] & ctype_space) == 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_NOT_WORDCHAR:
+            if (fc < 256 && (mb->ctypes[fc] & ctype_word) != 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_WORDCHAR:
+            if (fc >= 256 || (mb->ctypes[fc] & ctype_word) == 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            default:
+            return PCRE2_ERROR_INTERNAL;
+            }
+          }
+        }
+      else
+#endif  /* SUPPORT_UNICODE */
+
+      /* Not UTF mode */
+        {
+        for (;;)
+          {
+          RMATCH(Fecode, RM33);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          if (Lctype == OP_ANY && IS_NEWLINE(Feptr))
+            RRETURN(MATCH_NOMATCH);
+          fc = *Feptr++;
+          switch(Lctype)
+            {
+            case OP_ANY:               /* This is the non-NL case */
+            if (mb->partial != 0 &&    /* Take care with CRLF partial */
+                Feptr >= mb->end_subject &&
+                NLBLOCK->nltype == NLTYPE_FIXED &&
+                NLBLOCK->nllen == 2 &&
+                fc == NLBLOCK->nl[0])
+              {
+              mb->hitend = TRUE;
+              if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+              }
+            break;
+
+            case OP_ALLANY:
+            case OP_ANYBYTE:
+            break;
+
+            case OP_ANYNL:
+            switch(fc)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+
+              case CHAR_CR:
+              if (Feptr < mb->end_subject && *Feptr == CHAR_LF) Feptr++;
+              break;
+
+              case CHAR_LF:
+              break;
+
+              case CHAR_VT:
+              case CHAR_FF:
+              case CHAR_NEL:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+              case 0x2028:
+              case 0x2029:
+#endif
+              if (mb->bsr_convention == PCRE2_BSR_ANYCRLF)
+                RRETURN(MATCH_NOMATCH);
+              break;
+              }
+            break;
+
+            case OP_NOT_HSPACE:
+            switch(fc)
+              {
+              default: break;
+              HSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+              HSPACE_MULTIBYTE_CASES:
+#endif
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_HSPACE:
+            switch(fc)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              HSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+              HSPACE_MULTIBYTE_CASES:
+#endif
+              break;
+              }
+            break;
+
+            case OP_NOT_VSPACE:
+            switch(fc)
+              {
+              default: break;
+              VSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+              VSPACE_MULTIBYTE_CASES:
+#endif
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_VSPACE:
+            switch(fc)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              VSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+              VSPACE_MULTIBYTE_CASES:
+#endif
+              break;
+              }
+            break;
+
+            case OP_NOT_DIGIT:
+            if (MAX_255(fc) && (mb->ctypes[fc] & ctype_digit) != 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_DIGIT:
+            if (!MAX_255(fc) || (mb->ctypes[fc] & ctype_digit) == 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_NOT_WHITESPACE:
+            if (MAX_255(fc) && (mb->ctypes[fc] & ctype_space) != 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_WHITESPACE:
+            if (!MAX_255(fc) || (mb->ctypes[fc] & ctype_space) == 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_NOT_WORDCHAR:
+            if (MAX_255(fc) && (mb->ctypes[fc] & ctype_word) != 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            case OP_WORDCHAR:
+            if (!MAX_255(fc) || (mb->ctypes[fc] & ctype_word) == 0)
+              RRETURN(MATCH_NOMATCH);
+            break;
+
+            default:
+            return PCRE2_ERROR_INTERNAL;
+            }
+          }
+        }
+      /* Control never gets here */
+      }
+
+    /* If maximizing, it is worth using inline code for speed, doing the type
+    test once at the start (i.e. keep it out of the loops). Once again,
+    "notmatch" can be an ordinary local variable because the loops do not call
+    RMATCH. */
+
+    else
+      {
+      Lstart_eptr = Feptr;  /* Remember where we started */
+
+#ifdef SUPPORT_UNICODE
+      if (proptype >= 0)
+        {
+        BOOL notmatch = Lctype == OP_NOTPROP;
+        switch(proptype)
+          {
+          case PT_ANY:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            if (notmatch) break;
+            Feptr+= len;
+            }
+          break;
+
+          case PT_LAMP:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int chartype;
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            chartype = UCD_CHARTYPE(fc);
+            if ((chartype == ucp_Lu ||
+                 chartype == ucp_Ll ||
+                 chartype == ucp_Lt) == notmatch)
+              break;
+            Feptr+= len;
+            }
+          break;
+
+          case PT_GC:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            if ((UCD_CATEGORY(fc) == Lpropvalue) == notmatch) break;
+            Feptr+= len;
+            }
+          break;
+
+          case PT_PC:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            if ((UCD_CHARTYPE(fc) == Lpropvalue) == notmatch) break;
+            Feptr+= len;
+            }
+          break;
+
+          case PT_SC:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            if ((UCD_SCRIPT(fc) == Lpropvalue) == notmatch) break;
+            Feptr+= len;
+            }
+          break;
+
+          case PT_SCX:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            BOOL ok;
+            const ucd_record *prop;
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            prop = GET_UCD(fc);
+            ok = (prop->script == Lpropvalue ||
+                  MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), Lpropvalue) != 0);
+            if (ok == notmatch) break;
+            Feptr+= len;
+            }
+          break;
+
+          case PT_ALNUM:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int category;
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            category = UCD_CATEGORY(fc);
+            if ((category == ucp_L || category == ucp_N) == notmatch)
+              break;
+            Feptr+= len;
+            }
+          break;
+
+          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
+          which means that Perl space and POSIX space are now identical. PCRE
+          was changed at release 8.34. */
+
+          case PT_SPACE:    /* Perl space */
+          case PT_PXSPACE:  /* POSIX space */
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            switch(fc)
+              {
+              HSPACE_CASES:
+              VSPACE_CASES:
+              if (notmatch) goto ENDLOOP99;  /* Break the loop */
+              break;
+
+              default:
+              if ((UCD_CATEGORY(fc) == ucp_Z) == notmatch)
+                goto ENDLOOP99;   /* Break the loop */
+              break;
+              }
+            Feptr+= len;
+            }
+          ENDLOOP99:
+          break;
+
+          case PT_WORD:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int category;
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            category = UCD_CATEGORY(fc);
+            if ((category == ucp_L || category == ucp_N ||
+                 fc == CHAR_UNDERSCORE) == notmatch)
+              break;
+            Feptr+= len;
+            }
+          break;
+
+          case PT_CLIST:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            const uint32_t *cp;
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            cp = PRIV(ucd_caseless_sets) + Lpropvalue;
+            for (;;)
+              {
+              if (fc < *cp)
+                { if (notmatch) break; else goto GOT_MAX; }
+              if (fc == *cp++)
+                { if (notmatch) goto GOT_MAX; else break; }
+              }
+            Feptr += len;
+            }
+          GOT_MAX:
+          break;
+
+          case PT_UCNC:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            if ((fc == CHAR_DOLLAR_SIGN || fc == CHAR_COMMERCIAL_AT ||
+                 fc == CHAR_GRAVE_ACCENT || (fc >= 0xa0 && fc <= 0xd7ff) ||
+                 fc >= 0xe000) == notmatch)
+              break;
+            Feptr += len;
+            }
+          break;
+
+          case PT_BIDICL:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            if ((UCD_BIDICLASS(fc) == Lpropvalue) == notmatch) break;
+            Feptr+= len;
+            }
+          break;
+
+          case PT_BOOL:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            BOOL ok;
+            const ucd_record *prop;
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLENTEST(fc, Feptr, len);
+            prop = GET_UCD(fc);
+            ok = MAPBIT(PRIV(ucd_boolprop_sets) +
+              UCD_BPROPS_PROP(prop), Lpropvalue) != 0;
+            if (ok == notmatch) break;
+            Feptr+= len;
+            }
+          break;
+
+          default:
+          return PCRE2_ERROR_INTERNAL;
+          }
+
+        /* Feptr is now past the end of the maximum run */
+
+        if (reptype == REPTYPE_POS) continue;    /* No backtracking */
+
+        /* After \C in UTF mode, Lstart_eptr might be in the middle of a
+        Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't
+        go too far. */
+
+        for(;;)
+          {
+          if (Feptr <= Lstart_eptr) break;
+          RMATCH(Fecode, RM222);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          Feptr--;
+          if (utf) BACKCHAR(Feptr);
+          }
+        }
+
+      /* Match extended Unicode grapheme clusters. We will get here only if the
+      support is in the binary; otherwise a compile-time error occurs. */
+
+      else if (Lctype == OP_EXTUNI)
+        {
+        for (i = Lmin; i < Lmax; i++)
+          {
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            break;
+            }
+          else
+            {
+            GETCHARINCTEST(fc, Feptr);
+            Feptr = PRIV(extuni)(fc, Feptr, mb->start_subject, mb->end_subject,
+              utf, NULL);
+            }
+          CHECK_PARTIAL();
+          }
+
+        /* Feptr is now past the end of the maximum run */
+
+        if (reptype == REPTYPE_POS) continue;    /* No backtracking */
+
+        /* We use <= Lstart_eptr rather than == Lstart_eptr to detect the start
+        of the run while backtracking because the use of \C in UTF mode can
+        cause BACKCHAR to move back past Lstart_eptr. This is just palliative;
+        the use of \C in UTF mode is fraught with danger. */
+
+        for(;;)
+          {
+          int lgb, rgb;
+          PCRE2_SPTR fptr;
+
+          if (Feptr <= Lstart_eptr) break;   /* At start of char run */
+          RMATCH(Fecode, RM220);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+
+          /* Backtracking over an extended grapheme cluster involves inspecting
+          the previous two characters (if present) to see if a break is
+          permitted between them. */
+
+          Feptr--;
+          if (!utf) fc = *Feptr; else
+            {
+            BACKCHAR(Feptr);
+            GETCHAR(fc, Feptr);
+            }
+          rgb = UCD_GRAPHBREAK(fc);
+
+          for (;;)
+            {
+            if (Feptr <= Lstart_eptr) break;   /* At start of char run */
+            fptr = Feptr - 1;
+            if (!utf) fc = *fptr; else
+              {
+              BACKCHAR(fptr);
+              GETCHAR(fc, fptr);
+              }
+            lgb = UCD_GRAPHBREAK(fc);
+            if ((PRIV(ucp_gbtable)[lgb] & (1u << rgb)) == 0) break;
+            Feptr = fptr;
+            rgb = lgb;
+            }
+          }
+        }
+
+      else
+#endif   /* SUPPORT_UNICODE */
+
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        switch(Lctype)
+          {
+          case OP_ANY:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (IS_NEWLINE(Feptr)) break;
+            if (mb->partial != 0 &&    /* Take care with CRLF partial */
+                Feptr + 1 >= mb->end_subject &&
+                NLBLOCK->nltype == NLTYPE_FIXED &&
+                NLBLOCK->nllen == 2 &&
+                UCHAR21(Feptr) == NLBLOCK->nl[0])
+              {
+              mb->hitend = TRUE;
+              if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+              }
+            Feptr++;
+            ACROSSCHAR(Feptr < mb->end_subject, Feptr, Feptr++);
+            }
+          break;
+
+          case OP_ALLANY:
+          if (Lmax < UINT32_MAX)
+            {
+            for (i = Lmin; i < Lmax; i++)
+              {
+              if (Feptr >= mb->end_subject)
+                {
+                SCHECK_PARTIAL();
+                break;
+                }
+              Feptr++;
+              ACROSSCHAR(Feptr < mb->end_subject, Feptr, Feptr++);
+              }
+            }
+          else
+            {
+            Feptr = mb->end_subject;   /* Unlimited UTF-8 repeat */
+            SCHECK_PARTIAL();
+            }
+          break;
+
+          /* The "byte" (i.e. "code unit") case is the same as non-UTF */
+
+          case OP_ANYBYTE:
+          fc = Lmax - Lmin;
+          if (fc > (uint32_t)(mb->end_subject - Feptr))
+            {
+            Feptr = mb->end_subject;
+            SCHECK_PARTIAL();
+            }
+          else Feptr += fc;
+          break;
+
+          case OP_ANYNL:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            if (fc == CHAR_CR)
+              {
+              if (++Feptr >= mb->end_subject) break;
+              if (UCHAR21(Feptr) == CHAR_LF) Feptr++;
+              }
+            else
+              {
+              if (fc != CHAR_LF &&
+                  (mb->bsr_convention == PCRE2_BSR_ANYCRLF ||
+                   (fc != CHAR_VT && fc != CHAR_FF && fc != CHAR_NEL
+#ifndef EBCDIC
+                    && fc != 0x2028 && fc != 0x2029
+#endif  /* Not EBCDIC */
+                    )))
+                break;
+              Feptr += len;
+              }
+            }
+          break;
+
+          case OP_NOT_HSPACE:
+          case OP_HSPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            BOOL gotspace;
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            switch(fc)
+              {
+              HSPACE_CASES: gotspace = TRUE; break;
+              default: gotspace = FALSE; break;
+              }
+            if (gotspace == (Lctype == OP_NOT_HSPACE)) break;
+            Feptr += len;
+            }
+          break;
+
+          case OP_NOT_VSPACE:
+          case OP_VSPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            BOOL gotspace;
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            switch(fc)
+              {
+              VSPACE_CASES: gotspace = TRUE; break;
+              default: gotspace = FALSE; break;
+              }
+            if (gotspace == (Lctype == OP_NOT_VSPACE)) break;
+            Feptr += len;
+            }
+          break;
+
+          case OP_NOT_DIGIT:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            if (fc < 256 && (mb->ctypes[fc] & ctype_digit) != 0) break;
+            Feptr+= len;
+            }
+          break;
+
+          case OP_DIGIT:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            if (fc >= 256 ||(mb->ctypes[fc] & ctype_digit) == 0) break;
+            Feptr+= len;
+            }
+          break;
+
+          case OP_NOT_WHITESPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            if (fc < 256 && (mb->ctypes[fc] & ctype_space) != 0) break;
+            Feptr+= len;
+            }
+          break;
+
+          case OP_WHITESPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            if (fc >= 256 ||(mb->ctypes[fc] & ctype_space) == 0) break;
+            Feptr+= len;
+            }
+          break;
+
+          case OP_NOT_WORDCHAR:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            if (fc < 256 && (mb->ctypes[fc] & ctype_word) != 0) break;
+            Feptr+= len;
+            }
+          break;
+
+          case OP_WORDCHAR:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            int len = 1;
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            GETCHARLEN(fc, Feptr, len);
+            if (fc >= 256 || (mb->ctypes[fc] & ctype_word) == 0) break;
+            Feptr+= len;
+            }
+          break;
+
+          default:
+          return PCRE2_ERROR_INTERNAL;
+          }
+
+        if (reptype == REPTYPE_POS) continue;    /* No backtracking */
+
+        /* After \C in UTF mode, Lstart_eptr might be in the middle of a
+        Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't go
+        too far. */
+
+        for(;;)
+          {
+          if (Feptr <= Lstart_eptr) break;
+          RMATCH(Fecode, RM221);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          Feptr--;
+          BACKCHAR(Feptr);
+          if (Lctype == OP_ANYNL && Feptr > Lstart_eptr &&
+              UCHAR21(Feptr) == CHAR_NL && UCHAR21(Feptr - 1) == CHAR_CR)
+            Feptr--;
+          }
+        }
+      else
+#endif  /* SUPPORT_UNICODE */
+
+      /* Not UTF mode */
+        {
+        switch(Lctype)
+          {
+          case OP_ANY:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (IS_NEWLINE(Feptr)) break;
+            if (mb->partial != 0 &&    /* Take care with CRLF partial */
+                Feptr + 1 >= mb->end_subject &&
+                NLBLOCK->nltype == NLTYPE_FIXED &&
+                NLBLOCK->nllen == 2 &&
+                *Feptr == NLBLOCK->nl[0])
+              {
+              mb->hitend = TRUE;
+              if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+              }
+            Feptr++;
+            }
+          break;
+
+          case OP_ALLANY:
+          case OP_ANYBYTE:
+          fc = Lmax - Lmin;
+          if (fc > (uint32_t)(mb->end_subject - Feptr))
+            {
+            Feptr = mb->end_subject;
+            SCHECK_PARTIAL();
+            }
+          else Feptr += fc;
+          break;
+
+          case OP_ANYNL:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            fc = *Feptr;
+            if (fc == CHAR_CR)
+              {
+              if (++Feptr >= mb->end_subject) break;
+              if (*Feptr == CHAR_LF) Feptr++;
+              }
+            else
+              {
+              if (fc != CHAR_LF && (mb->bsr_convention == PCRE2_BSR_ANYCRLF ||
+                 (fc != CHAR_VT && fc != CHAR_FF && fc != CHAR_NEL
+#if PCRE2_CODE_UNIT_WIDTH != 8
+                 && fc != 0x2028 && fc != 0x2029
+#endif
+                 ))) break;
+              Feptr++;
+              }
+            }
+          break;
+
+          case OP_NOT_HSPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            switch(*Feptr)
+              {
+              default: Feptr++; break;
+              HSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+              HSPACE_MULTIBYTE_CASES:
+#endif
+              goto ENDLOOP00;
+              }
+            }
+          ENDLOOP00:
+          break;
+
+          case OP_HSPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            switch(*Feptr)
+              {
+              default: goto ENDLOOP01;
+              HSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+              HSPACE_MULTIBYTE_CASES:
+#endif
+              Feptr++; break;
+              }
+            }
+          ENDLOOP01:
+          break;
+
+          case OP_NOT_VSPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            switch(*Feptr)
+              {
+              default: Feptr++; break;
+              VSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+              VSPACE_MULTIBYTE_CASES:
+#endif
+              goto ENDLOOP02;
+              }
+            }
+          ENDLOOP02:
+          break;
+
+          case OP_VSPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            switch(*Feptr)
+              {
+              default: goto ENDLOOP03;
+              VSPACE_BYTE_CASES:
+#if PCRE2_CODE_UNIT_WIDTH != 8
+              VSPACE_MULTIBYTE_CASES:
+#endif
+              Feptr++; break;
+              }
+            }
+          ENDLOOP03:
+          break;
+
+          case OP_NOT_DIGIT:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (MAX_255(*Feptr) && (mb->ctypes[*Feptr] & ctype_digit) != 0)
+              break;
+            Feptr++;
+            }
+          break;
+
+          case OP_DIGIT:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (!MAX_255(*Feptr) || (mb->ctypes[*Feptr] & ctype_digit) == 0)
+              break;
+            Feptr++;
+            }
+          break;
+
+          case OP_NOT_WHITESPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (MAX_255(*Feptr) && (mb->ctypes[*Feptr] & ctype_space) != 0)
+              break;
+            Feptr++;
+            }
+          break;
+
+          case OP_WHITESPACE:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (!MAX_255(*Feptr) || (mb->ctypes[*Feptr] & ctype_space) == 0)
+              break;
+            Feptr++;
+            }
+          break;
+
+          case OP_NOT_WORDCHAR:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (MAX_255(*Feptr) && (mb->ctypes[*Feptr] & ctype_word) != 0)
+              break;
+            Feptr++;
+            }
+          break;
+
+          case OP_WORDCHAR:
+          for (i = Lmin; i < Lmax; i++)
+            {
+            if (Feptr >= mb->end_subject)
+              {
+              SCHECK_PARTIAL();
+              break;
+              }
+            if (!MAX_255(*Feptr) || (mb->ctypes[*Feptr] & ctype_word) == 0)
+              break;
+            Feptr++;
+            }
+          break;
+
+          default:
+          return PCRE2_ERROR_INTERNAL;
+          }
+
+        if (reptype == REPTYPE_POS) continue;    /* No backtracking */
+
+        for (;;)
+          {
+          if (Feptr == Lstart_eptr) break;
+          RMATCH(Fecode, RM34);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          Feptr--;
+          if (Lctype == OP_ANYNL && Feptr > Lstart_eptr && *Feptr == CHAR_LF &&
+              Feptr[-1] == CHAR_CR) Feptr--;
+          }
+        }
+      }
+    break;  /* End of repeat character type processing */
+
+#undef Lstart_eptr
+#undef Lmin
+#undef Lmax
+#undef Lctype
+#undef Lpropvalue
+
+
+    /* ===================================================================== */
+    /* Match a back reference, possibly repeatedly. Look past the end of the
+    item to see if there is repeat information following. The OP_REF and
+    OP_REFI opcodes are used for a reference to a numbered group or to a
+    non-duplicated named group. For a duplicated named group, OP_DNREF and
+    OP_DNREFI are used. In this case we must scan the list of groups to which
+    the name refers, and use the first one that is set. */
+
+#define Lmin      F->temp_32[0]
+#define Lmax      F->temp_32[1]
+#define Lcaseless F->temp_32[2]
+#define Lstart    F->temp_sptr[0]
+#define Loffset   F->temp_size
+
+    case OP_DNREF:
+    case OP_DNREFI:
+    Lcaseless = (Fop == OP_DNREFI);
+      {
+      int count = GET2(Fecode, 1+IMM2_SIZE);
+      PCRE2_SPTR slot = mb->name_table + GET2(Fecode, 1) * mb->name_entry_size;
+      Fecode += 1 + 2*IMM2_SIZE;
+
+      while (count-- > 0)
+        {
+        Loffset = (GET2(slot, 0) << 1) - 2;
+        if (Loffset < Foffset_top && Fovector[Loffset] != PCRE2_UNSET) break;
+        slot += mb->name_entry_size;
+        }
+      }
+    goto REF_REPEAT;
+
+    case OP_REF:
+    case OP_REFI:
+    Lcaseless = (Fop == OP_REFI);
+    Loffset = (GET2(Fecode, 1) << 1) - 2;
+    Fecode += 1 + IMM2_SIZE;
+
+    /* Set up for repetition, or handle the non-repeated case. The maximum and
+    minimum must be in the heap frame, but as they are short-term values, we
+    use temporary fields. */
+
+    REF_REPEAT:
+    switch (*Fecode)
+      {
+      case OP_CRSTAR:
+      case OP_CRMINSTAR:
+      case OP_CRPLUS:
+      case OP_CRMINPLUS:
+      case OP_CRQUERY:
+      case OP_CRMINQUERY:
+      fc = *Fecode++ - OP_CRSTAR;
+      Lmin = rep_min[fc];
+      Lmax = rep_max[fc];
+      reptype = rep_typ[fc];
+      break;
+
+      case OP_CRRANGE:
+      case OP_CRMINRANGE:
+      Lmin = GET2(Fecode, 1);
+      Lmax = GET2(Fecode, 1 + IMM2_SIZE);
+      reptype = rep_typ[*Fecode - OP_CRSTAR];
+      if (Lmax == 0) Lmax = UINT32_MAX;  /* Max 0 => infinity */
+      Fecode += 1 + 2 * IMM2_SIZE;
+      break;
+
+      default:                  /* No repeat follows */
+        {
+        rrc = match_ref(Loffset, Lcaseless, F, mb, &length);
+        if (rrc != 0)
+          {
+          if (rrc > 0) Feptr = mb->end_subject;   /* Partial match */
+          CHECK_PARTIAL();
+          RRETURN(MATCH_NOMATCH);
+          }
+        }
+      Feptr += length;
+      continue;              /* With the main loop */
+      }
+
+    /* Handle repeated back references. If a set group has length zero, just
+    continue with the main loop, because it matches however many times. For an
+    unset reference, if the minimum is zero, we can also just continue. We can
+    also continue if PCRE2_MATCH_UNSET_BACKREF is set, because this makes unset
+    group behave as a zero-length group. For any other unset cases, carrying
+    on will result in NOMATCH. */
+
+    if (Loffset < Foffset_top && Fovector[Loffset] != PCRE2_UNSET)
+      {
+      if (Fovector[Loffset] == Fovector[Loffset + 1]) continue;
+      }
+    else  /* Group is not set */
+      {
+      if (Lmin == 0 || (mb->poptions & PCRE2_MATCH_UNSET_BACKREF) != 0)
+        continue;
+      }
+
+    /* First, ensure the minimum number of matches are present. */
+
+    for (i = 1; i <= Lmin; i++)
+      {
+      PCRE2_SIZE slength;
+      rrc = match_ref(Loffset, Lcaseless, F, mb, &slength);
+      if (rrc != 0)
+        {
+        if (rrc > 0) Feptr = mb->end_subject;   /* Partial match */
+        CHECK_PARTIAL();
+        RRETURN(MATCH_NOMATCH);
+        }
+      Feptr += slength;
+      }
+
+    /* If min = max, we are done. They are not both allowed to be zero. */
+
+    if (Lmin == Lmax) continue;
+
+    /* If minimizing, keep trying and advancing the pointer. */
+
+    if (reptype == REPTYPE_MIN)
+      {
+      for (;;)
+        {
+        PCRE2_SIZE slength;
+        RMATCH(Fecode, RM20);
+        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+        if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+        rrc = match_ref(Loffset, Lcaseless, F, mb, &slength);
+        if (rrc != 0)
+          {
+          if (rrc > 0) Feptr = mb->end_subject;   /* Partial match */
+          CHECK_PARTIAL();
+          RRETURN(MATCH_NOMATCH);
+          }
+        Feptr += slength;
+        }
+      /* Control never gets here */
+      }
+
+    /* If maximizing, find the longest string and work backwards, as long as
+    the matched lengths for each iteration are the same. */
+
+    else
+      {
+      BOOL samelengths = TRUE;
+      Lstart = Feptr;     /* Starting position */
+      Flength = Fovector[Loffset+1] - Fovector[Loffset];
+
+      for (i = Lmin; i < Lmax; i++)
+        {
+        PCRE2_SIZE slength;
+        rrc = match_ref(Loffset, Lcaseless, F, mb, &slength);
+        if (rrc != 0)
+          {
+          /* Can't use CHECK_PARTIAL because we don't want to update Feptr in
+          the soft partial matching case. */
+
+          if (rrc > 0 && mb->partial != 0 &&
+              mb->end_subject > mb->start_used_ptr)
+            {
+            mb->hitend = TRUE;
+            if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+            }
+          break;
+          }
+
+        if (slength != Flength) samelengths = FALSE;
+        Feptr += slength;
+        }
+
+      /* If the length matched for each repetition is the same as the length of
+      the captured group, we can easily work backwards. This is the normal
+      case. However, in caseless UTF-8 mode there are pairs of case-equivalent
+      characters whose lengths (in terms of code units) differ. However, this
+      is very rare, so we handle it by re-matching fewer and fewer times. */
+
+      if (samelengths)
+        {
+        while (Feptr >= Lstart)
+          {
+          RMATCH(Fecode, RM21);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          Feptr -= Flength;
+          }
+        }
+
+      /* The rare case of non-matching lengths. Re-scan the repetition for each
+      iteration. We know that match_ref() will succeed every time. */
+
+      else
+        {
+        Lmax = i;
+        for (;;)
+          {
+          RMATCH(Fecode, RM22);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Feptr == Lstart) break; /* Failed after minimal repetition */
+          Feptr = Lstart;
+          Lmax--;
+          for (i = Lmin; i < Lmax; i++)
+            {
+            PCRE2_SIZE slength;
+            (void)match_ref(Loffset, Lcaseless, F, mb, &slength);
+            Feptr += slength;
+            }
+          }
+        }
+
+      RRETURN(MATCH_NOMATCH);
+      }
+    /* Control never gets here */
+
+#undef Lcaseless
+#undef Lmin
+#undef Lmax
+#undef Lstart
+#undef Loffset
+
+
+
+/* ========================================================================= */
+/*           Opcodes for the start of various parenthesized items            */
+/* ========================================================================= */
+
+    /* In all cases, if the result of RMATCH() is MATCH_THEN, check whether the
+    (*THEN) is within the current branch by comparing the address of OP_THEN
+    that is passed back with the end of the branch. If (*THEN) is within the
+    current branch, and the branch is one of two or more alternatives (it
+    either starts or ends with OP_ALT), we have reached the limit of THEN's
+    action, so convert the return code to NOMATCH, which will cause normal
+    backtracking to happen from now on. Otherwise, THEN is passed back to an
+    outer alternative. This implements Perl's treatment of parenthesized
+    groups, where a group not containing | does not affect the current
+    alternative, that is, (X) is NOT the same as (X|(*F)). */
+
+
+    /* ===================================================================== */
+    /* BRAZERO, BRAMINZERO and SKIPZERO occur just before a non-possessive
+    bracket group, indicating that it may occur zero times. It may repeat
+    infinitely, or not at all - i.e. it could be ()* or ()? or even (){0} in
+    the pattern. Brackets with fixed upper repeat limits are compiled as a
+    number of copies, with the optional ones preceded by BRAZERO or BRAMINZERO.
+    Possessive groups with possible zero repeats are preceded by BRAPOSZERO. */
+
+#define Lnext_ecode F->temp_sptr[0]
+
+    case OP_BRAZERO:
+    Lnext_ecode = Fecode + 1;
+    RMATCH(Lnext_ecode, RM9);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    do Lnext_ecode += GET(Lnext_ecode, 1); while (*Lnext_ecode == OP_ALT);
+    Fecode = Lnext_ecode + 1 + LINK_SIZE;
+    break;
+
+    case OP_BRAMINZERO:
+    Lnext_ecode = Fecode + 1;
+    do Lnext_ecode += GET(Lnext_ecode, 1); while (*Lnext_ecode == OP_ALT);
+    RMATCH(Lnext_ecode + 1 + LINK_SIZE, RM10);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    Fecode++;
+    break;
+
+#undef Lnext_ecode
+
+    case OP_SKIPZERO:
+    Fecode++;
+    do Fecode += GET(Fecode,1); while (*Fecode == OP_ALT);
+    Fecode += 1 + LINK_SIZE;
+    break;
+
+
+    /* ===================================================================== */
+    /* Handle possessive brackets with an unlimited repeat. The end of these
+    brackets will always be OP_KETRPOS, which returns MATCH_KETRPOS without
+    going further in the pattern. */
+
+#define Lframe_type    F->temp_32[0]
+#define Lmatched_once  F->temp_32[1]
+#define Lzero_allowed  F->temp_32[2]
+#define Lstart_eptr    F->temp_sptr[0]
+#define Lstart_group   F->temp_sptr[1]
+
+    case OP_BRAPOSZERO:
+    Lzero_allowed = TRUE;                /* Zero repeat is allowed */
+    Fecode += 1;
+    if (*Fecode == OP_CBRAPOS || *Fecode == OP_SCBRAPOS)
+      goto POSSESSIVE_CAPTURE;
+    goto POSSESSIVE_NON_CAPTURE;
+
+    case OP_BRAPOS:
+    case OP_SBRAPOS:
+    Lzero_allowed = FALSE;               /* Zero repeat not allowed */
+
+    POSSESSIVE_NON_CAPTURE:
+    Lframe_type = GF_NOCAPTURE;          /* Remembered frame type */
+    goto POSSESSIVE_GROUP;
+
+    case OP_CBRAPOS:
+    case OP_SCBRAPOS:
+    Lzero_allowed = FALSE;               /* Zero repeat not allowed */
+
+    POSSESSIVE_CAPTURE:
+    number = GET2(Fecode, 1+LINK_SIZE);
+    Lframe_type = GF_CAPTURE | number;   /* Remembered frame type */
+
+    POSSESSIVE_GROUP:
+    Lmatched_once = FALSE;               /* Never matched */
+    Lstart_group = Fecode;               /* Start of this group */
+
+    for (;;)
+      {
+      Lstart_eptr = Feptr;               /* Position at group start */
+      group_frame_type = Lframe_type;
+      RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM8);
+      if (rrc == MATCH_KETRPOS)
+        {
+        Lmatched_once = TRUE;            /* Matched at least once */
+        if (Feptr == Lstart_eptr)        /* Empty match; skip to end */
+          {
+          do Fecode += GET(Fecode, 1); while (*Fecode == OP_ALT);
+          break;
+          }
+
+        Fecode = Lstart_group;
+        continue;
+        }
+
+      /* See comment above about handling THEN. */
+
+      if (rrc == MATCH_THEN)
+        {
+        PCRE2_SPTR next_ecode = Fecode + GET(Fecode,1);
+        if (mb->verb_ecode_ptr < next_ecode &&
+            (*Fecode == OP_ALT || *next_ecode == OP_ALT))
+          rrc = MATCH_NOMATCH;
+        }
+
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      Fecode += GET(Fecode, 1);
+      if (*Fecode != OP_ALT) break;
+      }
+
+    /* Success if matched something or zero repeat allowed */
+
+    if (Lmatched_once || Lzero_allowed)
+      {
+      Fecode += 1 + LINK_SIZE;
+      break;
+      }
+
+    RRETURN(MATCH_NOMATCH);
+
+#undef Lmatched_once
+#undef Lzero_allowed
+#undef Lframe_type
+#undef Lstart_eptr
+#undef Lstart_group
+
+
+    /* ===================================================================== */
+    /* Handle non-capturing brackets that cannot match an empty string. When we
+    get to the final alternative within the brackets, as long as there are no
+    THEN's in the pattern, we can optimize by not recording a new backtracking
+    point. (Ideally we should test for a THEN within this group, but we don't
+    have that information.) Don't do this if we are at the very top level,
+    however, because that would make handling assertions and once-only brackets
+    messier when there is nothing to go back to. */
+
+#define Lframe_type F->temp_32[0]     /* Set for all that use GROUPLOOP */
+#define Lnext_branch F->temp_sptr[0]  /* Used only in OP_BRA handling */
+
+    case OP_BRA:
+    if (mb->hasthen || Frdepth == 0)
+      {
+      Lframe_type = 0;
+      goto GROUPLOOP;
+      }
+
+    for (;;)
+      {
+      Lnext_branch = Fecode + GET(Fecode, 1);
+      if (*Lnext_branch != OP_ALT) break;
+
+      /* This is never the final branch. We do not need to test for MATCH_THEN
+      here because this code is not used when there is a THEN in the pattern. */
+
+      RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM1);
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      Fecode = Lnext_branch;
+      }
+
+    /* Hit the start of the final branch. Continue at this level. */
+
+    Fecode += PRIV(OP_lengths)[*Fecode];
+    break;
+
+#undef Lnext_branch
+
+
+    /* ===================================================================== */
+    /* Handle a capturing bracket, other than those that are possessive with an
+    unlimited repeat. */
+
+    case OP_CBRA:
+    case OP_SCBRA:
+    Lframe_type = GF_CAPTURE | GET2(Fecode, 1+LINK_SIZE);
+    goto GROUPLOOP;
+
+
+    /* ===================================================================== */
+    /* Atomic groups and non-capturing brackets that can match an empty string
+    must record a backtracking point and also set up a chained frame. */
+
+    case OP_ONCE:
+    case OP_SCRIPT_RUN:
+    case OP_SBRA:
+    Lframe_type = GF_NOCAPTURE | Fop;
+
+    GROUPLOOP:
+    for (;;)
+      {
+      group_frame_type = Lframe_type;
+      RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM2);
+      if (rrc == MATCH_THEN)
+        {
+        PCRE2_SPTR next_ecode = Fecode + GET(Fecode,1);
+        if (mb->verb_ecode_ptr < next_ecode &&
+            (*Fecode == OP_ALT || *next_ecode == OP_ALT))
+          rrc = MATCH_NOMATCH;
+        }
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      Fecode += GET(Fecode, 1);
+      if (*Fecode != OP_ALT) RRETURN(MATCH_NOMATCH);
+      }
+    /* Control never reaches here. */
+
+#undef Lframe_type
+
+
+    /* ===================================================================== */
+    /* Recursion either matches the current regex, or some subexpression. The
+    offset data is the offset to the starting bracket from the start of the
+    whole pattern. (This is so that it works from duplicated subpatterns.) */
+
+#define Lframe_type F->temp_32[0]
+#define Lstart_branch F->temp_sptr[0]
+
+    case OP_RECURSE:
+    bracode = mb->start_code + GET(Fecode, 1);
+    number = (bracode == mb->start_code)? 0 : GET2(bracode, 1 + LINK_SIZE);
+
+    /* If we are already in a recursion, check for repeating the same one
+    without advancing the subject pointer. This should catch convoluted mutual
+    recursions. (Some simple cases are caught at compile time.) */
+
+    if (Fcurrent_recurse != RECURSE_UNSET)
+      {
+      offset = Flast_group_offset;
+      while (offset != PCRE2_UNSET)
+        {
+        N = (heapframe *)((char *)mb->match_frames + offset);
+        P = (heapframe *)((char *)N - frame_size);
+        if (N->group_frame_type == (GF_RECURSE | number))
+          {
+          if (Feptr == P->eptr) return PCRE2_ERROR_RECURSELOOP;
+          break;
+          }
+        offset = P->last_group_offset;
+        }
+      }
+
+    /* Now run the recursion, branch by branch. */
+
+    Lstart_branch = bracode;
+    Lframe_type = GF_RECURSE | number;
+
+    for (;;)
+      {
+      PCRE2_SPTR next_ecode;
+
+      group_frame_type = Lframe_type;
+      RMATCH(Lstart_branch + PRIV(OP_lengths)[*Lstart_branch], RM11);
+      next_ecode = Lstart_branch + GET(Lstart_branch,1);
+
+      /* Handle backtracking verbs, which are defined in a range that can
+      easily be tested for. PCRE does not allow THEN, SKIP, PRUNE or COMMIT to
+      escape beyond a recursion; they cause a NOMATCH for the entire recursion.
+
+      When one of these verbs triggers, the current recursion group number is
+      recorded. If it matches the recursion we are processing, the verb
+      happened within the recursion and we must deal with it. Otherwise it must
+      have happened after the recursion completed, and so has to be passed
+      back. See comment above about handling THEN. */
+
+      if (rrc >= MATCH_BACKTRACK_MIN && rrc <= MATCH_BACKTRACK_MAX &&
+          mb->verb_current_recurse == (Lframe_type ^ GF_RECURSE))
+        {
+        if (rrc == MATCH_THEN && mb->verb_ecode_ptr < next_ecode &&
+            (*Lstart_branch == OP_ALT || *next_ecode == OP_ALT))
+          rrc = MATCH_NOMATCH;
+        else RRETURN(MATCH_NOMATCH);
+        }
+
+      /* Note that carrying on after (*ACCEPT) in a recursion is handled in the
+      OP_ACCEPT code. Nothing needs to be done here. */
+
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      Lstart_branch = next_ecode;
+      if (*Lstart_branch != OP_ALT) RRETURN(MATCH_NOMATCH);
+      }
+    /* Control never reaches here. */
+
+#undef Lframe_type
+#undef Lstart_branch
+
+
+    /* ===================================================================== */
+    /* Positive assertions are like other groups except that PCRE doesn't allow
+    the effect of (*THEN) to escape beyond an assertion; it is therefore
+    treated as NOMATCH. (*ACCEPT) is treated as successful assertion, with its
+    captures and mark retained. Any other return is an error. */
+
+#define Lframe_type  F->temp_32[0]
+
+    case OP_ASSERT:
+    case OP_ASSERTBACK:
+    case OP_ASSERT_NA:
+    case OP_ASSERTBACK_NA:
+    Lframe_type = GF_NOCAPTURE | Fop;
+    for (;;)
+      {
+      group_frame_type = Lframe_type;
+      RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM3);
+      if (rrc == MATCH_ACCEPT)
+        {
+        memcpy(Fovector,
+              (char *)assert_accept_frame + offsetof(heapframe, ovector),
+              assert_accept_frame->offset_top * sizeof(PCRE2_SIZE));
+        Foffset_top = assert_accept_frame->offset_top;
+        Fmark = assert_accept_frame->mark;
+        break;
+        }
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+      Fecode += GET(Fecode, 1);
+      if (*Fecode != OP_ALT) RRETURN(MATCH_NOMATCH);
+      }
+
+    do Fecode += GET(Fecode, 1); while (*Fecode == OP_ALT);
+    Fecode += 1 + LINK_SIZE;
+    break;
+
+#undef Lframe_type
+
+
+    /* ===================================================================== */
+    /* Handle negative assertions. Loop for each non-matching branch as for
+    positive assertions. */
+
+#define Lframe_type  F->temp_32[0]
+
+    case OP_ASSERT_NOT:
+    case OP_ASSERTBACK_NOT:
+    Lframe_type  = GF_NOCAPTURE | Fop;
+
+    for (;;)
+      {
+      group_frame_type = Lframe_type;
+      RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM4);
+      switch(rrc)
+        {
+        case MATCH_ACCEPT:   /* Assertion matched, therefore it fails. */
+        case MATCH_MATCH:
+        RRETURN (MATCH_NOMATCH);
+
+        case MATCH_NOMATCH:  /* Branch failed, try next if present. */
+        case MATCH_THEN:
+        Fecode += GET(Fecode, 1);
+        if (*Fecode != OP_ALT) goto ASSERT_NOT_FAILED;
+        break;
+
+        case MATCH_COMMIT:   /* Assertion forced to fail, therefore continue. */
+        case MATCH_SKIP:
+        case MATCH_PRUNE:
+        do Fecode += GET(Fecode, 1); while (*Fecode == OP_ALT);
+        goto ASSERT_NOT_FAILED;
+
+        default:             /* Pass back any other return */
+        RRETURN(rrc);
+        }
+      }
+
+    /* None of the branches have matched or there was a backtrack to (*COMMIT),
+    (*SKIP), (*PRUNE), or (*THEN) in the last branch. This is success for a
+    negative assertion, so carry on. */
+
+    ASSERT_NOT_FAILED:
+    Fecode += 1 + LINK_SIZE;
+    break;
+
+#undef Lframe_type
+
+
+    /* ===================================================================== */
+    /* The callout item calls an external function, if one is provided, passing
+    details of the match so far. This is mainly for debugging, though the
+    function is able to force a failure. */
+
+    case OP_CALLOUT:
+    case OP_CALLOUT_STR:
+    rrc = do_callout(F, mb, &length);
+    if (rrc > 0) RRETURN(MATCH_NOMATCH);
+    if (rrc < 0) RRETURN(rrc);
+    Fecode += length;
+    break;
+
+
+    /* ===================================================================== */
+    /* Conditional group: compilation checked that there are no more than two
+    branches. If the condition is false, skipping the first branch takes us
+    past the end of the item if there is only one branch, but that's exactly
+    what we want. */
+
+    case OP_COND:
+    case OP_SCOND:
+
+    /* The variable Flength will be added to Fecode when the condition is
+    false, to get to the second branch. Setting it to the offset to the ALT or
+    KET, then incrementing Fecode achieves this effect. However, if the second
+    branch is non-existent, we must point to the KET so that the end of the
+    group is correctly processed. We now have Fecode pointing to the condition
+    or callout. */
+
+    Flength = GET(Fecode, 1);    /* Offset to the second branch */
+    if (Fecode[Flength] != OP_ALT) Flength -= 1 + LINK_SIZE;
+    Fecode += 1 + LINK_SIZE;     /* From this opcode */
+
+    /* Because of the way auto-callout works during compile, a callout item is
+    inserted between OP_COND and an assertion condition. Such a callout can
+    also be inserted manually. */
+
+    if (*Fecode == OP_CALLOUT || *Fecode == OP_CALLOUT_STR)
+      {
+      rrc = do_callout(F, mb, &length);
+      if (rrc > 0) RRETURN(MATCH_NOMATCH);
+      if (rrc < 0) RRETURN(rrc);
+
+      /* Advance Fecode past the callout, so it now points to the condition. We
+      must adjust Flength so that the value of Fecode+Flength is unchanged. */
+
+      Fecode += length;
+      Flength -= length;
+      }
+
+    /* Test the various possible conditions */
+
+    condition = FALSE;
+    switch(*Fecode)
+      {
+      case OP_RREF:                  /* Group recursion test */
+      if (Fcurrent_recurse != RECURSE_UNSET)
+        {
+        number = GET2(Fecode, 1);
+        condition = (number == RREF_ANY || number == Fcurrent_recurse);
+        }
+      break;
+
+      case OP_DNRREF:       /* Duplicate named group recursion test */
+      if (Fcurrent_recurse != RECURSE_UNSET)
+        {
+        int count = GET2(Fecode, 1 + IMM2_SIZE);
+        PCRE2_SPTR slot = mb->name_table + GET2(Fecode, 1) * mb->name_entry_size;
+        while (count-- > 0)
+          {
+          number = GET2(slot, 0);
+          condition = number == Fcurrent_recurse;
+          if (condition) break;
+          slot += mb->name_entry_size;
+          }
+        }
+      break;
+
+      case OP_CREF:                         /* Numbered group used test */
+      offset = (GET2(Fecode, 1) << 1) - 2;  /* Doubled ref number */
+      condition = offset < Foffset_top && Fovector[offset] != PCRE2_UNSET;
+      break;
+
+      case OP_DNCREF:      /* Duplicate named group used test */
+        {
+        int count = GET2(Fecode, 1 + IMM2_SIZE);
+        PCRE2_SPTR slot = mb->name_table + GET2(Fecode, 1) * mb->name_entry_size;
+        while (count-- > 0)
+          {
+          offset = (GET2(slot, 0) << 1) - 2;
+          condition = offset < Foffset_top && Fovector[offset] != PCRE2_UNSET;
+          if (condition) break;
+          slot += mb->name_entry_size;
+          }
+        }
+      break;
+
+      case OP_FALSE:
+      case OP_FAIL:   /* The assertion (?!) becomes OP_FAIL */
+      break;
+
+      case OP_TRUE:
+      condition = TRUE;
+      break;
+
+      /* The condition is an assertion. Run code similar to the assertion code
+      above. */
+
+#define Lpositive      F->temp_32[0]
+#define Lstart_branch  F->temp_sptr[0]
+
+      default:
+      Lpositive = (*Fecode == OP_ASSERT || *Fecode == OP_ASSERTBACK);
+      Lstart_branch = Fecode;
+
+      for (;;)
+        {
+        group_frame_type = GF_CONDASSERT | *Fecode;
+        RMATCH(Lstart_branch + PRIV(OP_lengths)[*Lstart_branch], RM5);
+
+        switch(rrc)
+          {
+          case MATCH_ACCEPT:  /* Save captures */
+          memcpy(Fovector,
+                (char *)assert_accept_frame + offsetof(heapframe, ovector),
+                assert_accept_frame->offset_top * sizeof(PCRE2_SIZE));
+          Foffset_top = assert_accept_frame->offset_top;
+
+          /* Fall through */
+          /* In the case of a match, the captures have already been put into
+          the current frame. */
+
+          case MATCH_MATCH:
+          condition = Lpositive;   /* TRUE for positive assertion */
+          break;
+
+          /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
+          assertion; it is therefore always treated as NOMATCH. */
+
+          case MATCH_NOMATCH:
+          case MATCH_THEN:
+          Lstart_branch += GET(Lstart_branch, 1);
+          if (*Lstart_branch == OP_ALT) continue;  /* Try next branch */
+          condition = !Lpositive;  /* TRUE for negative assertion */
+          break;
+
+          /* These force no match without checking other branches. */
+
+          case MATCH_COMMIT:
+          case MATCH_SKIP:
+          case MATCH_PRUNE:
+          condition = !Lpositive;
+          break;
+
+          default:
+          RRETURN(rrc);
+          }
+        break;  /* Out of the branch loop */
+        }
+
+      /* If the condition is true, find the end of the assertion so that
+      advancing past it gets us to the start of the first branch. */
+
+      if (condition)
+        {
+        do Fecode += GET(Fecode, 1); while (*Fecode == OP_ALT);
+        }
+      break;  /* End of assertion condition */
+      }
+
+#undef Lpositive
+#undef Lstart_branch
+
+    /* Choose branch according to the condition. */
+
+    Fecode += condition? PRIV(OP_lengths)[*Fecode] : Flength;
+
+    /* If the opcode is OP_SCOND it means we are at a repeated conditional
+    group that might match an empty string. We must therefore descend a level
+    so that the start is remembered for checking. For OP_COND we can just
+    continue at this level. */
+
+    if (Fop == OP_SCOND)
+      {
+      group_frame_type  = GF_NOCAPTURE | Fop;
+      RMATCH(Fecode, RM35);
+      RRETURN(rrc);
+      }
+    break;
+
+
+
+/* ========================================================================= */
+/*                  End of start of parenthesis opcodes                      */
+/* ========================================================================= */
+
+
+    /* ===================================================================== */
+    /* Move the subject pointer back. This occurs only at the start of each
+    branch of a lookbehind assertion. If we are too close to the start to move
+    back, fail. When working with UTF-8 we move back a number of characters,
+    not bytes. */
+
+    case OP_REVERSE:
+    number = GET(Fecode, 1);
+#ifdef SUPPORT_UNICODE
+    if (utf)
+      {
+      while (number-- > 0)
+        {
+        if (Feptr <= mb->check_subject) RRETURN(MATCH_NOMATCH);
+        Feptr--;
+        BACKCHAR(Feptr);
+        }
+      }
+    else
+#endif
+
+    /* No UTF-8 support, or not in UTF-8 mode: count is code unit count */
+
+      {
+      if ((ptrdiff_t)number > Feptr - mb->start_subject) RRETURN(MATCH_NOMATCH);
+      Feptr -= number;
+      }
+
+    /* Save the earliest consulted character, then skip to next opcode */
+
+    if (Feptr < mb->start_used_ptr) mb->start_used_ptr = Feptr;
+    Fecode += 1 + LINK_SIZE;
+    break;
+
+
+    /* ===================================================================== */
+    /* An alternation is the end of a branch; scan along to find the end of the
+    bracketed group. */
+
+    case OP_ALT:
+    do Fecode += GET(Fecode,1); while (*Fecode == OP_ALT);
+    break;
+
+
+    /* ===================================================================== */
+    /* The end of a parenthesized group. For all but OP_BRA and OP_COND, the
+    starting frame was added to the chained frames in order to remember the
+    starting subject position for the group. */
+
+    case OP_KET:
+    case OP_KETRMIN:
+    case OP_KETRMAX:
+    case OP_KETRPOS:
+
+    bracode = Fecode - GET(Fecode, 1);
+
+    /* Point N to the frame at the start of the most recent group.
+    Remember the subject pointer at the start of the group. */
+
+    if (*bracode != OP_BRA && *bracode != OP_COND)
+      {
+      N = (heapframe *)((char *)mb->match_frames + Flast_group_offset);
+      P = (heapframe *)((char *)N - frame_size);
+      Flast_group_offset = P->last_group_offset;
+
+#ifdef DEBUG_SHOW_RMATCH
+      fprintf(stderr, "++ KET for frame=%d type=%x prev char offset=%lu\n",
+        N->rdepth, N->group_frame_type,
+        (char *)P->eptr - (char *)mb->start_subject);
+#endif
+
+      /* If we are at the end of an assertion that is a condition, return a
+      match, discarding any intermediate backtracking points. Copy back the
+      mark setting and the captures into the frame before N so that they are
+      set on return. Doing this for all assertions, both positive and negative,
+      seems to match what Perl does. */
+
+      if (GF_IDMASK(N->group_frame_type) == GF_CONDASSERT)
+        {
+        memcpy((char *)P + offsetof(heapframe, ovector), Fovector,
+          Foffset_top * sizeof(PCRE2_SIZE));
+        P->offset_top = Foffset_top;
+        P->mark = Fmark;
+        Fback_frame = (char *)F - (char *)P;
+        RRETURN(MATCH_MATCH);
+        }
+      }
+    else P = NULL;   /* Indicates starting frame not recorded */
+
+    /* The group was not a conditional assertion. */
+
+    switch (*bracode)
+      {
+      case OP_BRA:    /* No need to do anything for these */
+      case OP_COND:
+      case OP_SCOND:
+      break;
+
+      /* Non-atomic positive assertions are like OP_BRA, except that the
+      subject pointer must be put back to where it was at the start of the
+      assertion. */
+
+      case OP_ASSERT_NA:
+      case OP_ASSERTBACK_NA:
+      if (Feptr > mb->last_used_ptr) mb->last_used_ptr = Feptr;
+      Feptr = P->eptr;
+      break;
+
+      /* Atomic positive assertions are like OP_ONCE, except that in addition
+      the subject pointer must be put back to where it was at the start of the
+      assertion. */
+
+      case OP_ASSERT:
+      case OP_ASSERTBACK:
+      if (Feptr > mb->last_used_ptr) mb->last_used_ptr = Feptr;
+      Feptr = P->eptr;
+      /* Fall through */
+
+      /* For an atomic group, discard internal backtracking points. We must
+      also ensure that any remaining branches within the top-level of the group
+      are not tried. Do this by adjusting the code pointer within the backtrack
+      frame so that it points to the final branch. */
+
+      case OP_ONCE:
+      Fback_frame = ((char *)F - (char *)P);
+      for (;;)
+        {
+        uint32_t y = GET(P->ecode,1);
+        if ((P->ecode)[y] != OP_ALT) break;
+        P->ecode += y;
+        }
+      break;
+
+      /* A matching negative assertion returns MATCH, which is turned into
+      NOMATCH at the assertion level. */
+
+      case OP_ASSERT_NOT:
+      case OP_ASSERTBACK_NOT:
+      RRETURN(MATCH_MATCH);
+
+      /* At the end of a script run, apply the script-checking rules. This code
+      will never by exercised if Unicode support it not compiled, because in
+      that environment script runs cause an error at compile time. */
+
+      case OP_SCRIPT_RUN:
+      if (!PRIV(script_run)(P->eptr, Feptr, utf)) RRETURN(MATCH_NOMATCH);
+      break;
+
+      /* Whole-pattern recursion is coded as a recurse into group 0, so it
+      won't be picked up here. Instead, we catch it when the OP_END is reached.
+      Other recursion is handled here. */
+
+      case OP_CBRA:
+      case OP_CBRAPOS:
+      case OP_SCBRA:
+      case OP_SCBRAPOS:
+      number = GET2(bracode, 1+LINK_SIZE);
+
+      /* Handle a recursively called group. We reinstate the previous set of
+      captures and then carry on after the recursion call. */
+
+      if (Fcurrent_recurse == number)
+        {
+        P = (heapframe *)((char *)N - frame_size);
+        memcpy((char *)F + offsetof(heapframe, ovector), P->ovector,
+          P->offset_top * sizeof(PCRE2_SIZE));
+        Foffset_top = P->offset_top;
+        Fcapture_last = P->capture_last;
+        Fcurrent_recurse = P->current_recurse;
+        Fecode = P->ecode + 1 + LINK_SIZE;
+        continue;  /* With next opcode */
+        }
+
+      /* Deal with actual capturing. */
+
+      offset = (number << 1) - 2;
+      Fcapture_last = number;
+      Fovector[offset] = P->eptr - mb->start_subject;
+      Fovector[offset+1] = Feptr - mb->start_subject;
+      if (offset >= Foffset_top) Foffset_top = offset + 2;
+      break;
+      }  /* End actions relating to the starting opcode */
+
+    /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
+    and return the MATCH_KETRPOS. This makes it possible to do the repeats one
+    at a time from the outer level. This must precede the empty string test -
+    in this case that test is done at the outer level. */
+
+    if (*Fecode == OP_KETRPOS)
+      {
+      memcpy((char *)P + offsetof(heapframe, eptr),
+             (char *)F + offsetof(heapframe, eptr),
+             frame_copy_size);
+      RRETURN(MATCH_KETRPOS);
+      }
+
+    /* Handle the different kinds of closing brackets. A non-repeating ket
+    needs no special action, just continuing at this level. This also happens
+    for the repeating kets if the group matched no characters, in order to
+    forcibly break infinite loops. Otherwise, the repeating kets try the rest
+    of the pattern or restart from the preceding bracket, in the appropriate
+    order. */
+
+    if (Fop != OP_KET && (P == NULL || Feptr != P->eptr))
+      {
+      if (Fop == OP_KETRMIN)
+        {
+        RMATCH(Fecode + 1 + LINK_SIZE, RM6);
+        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+        Fecode -= GET(Fecode, 1);
+        break;   /* End of ket processing */
+        }
+
+      /* Repeat the maximum number of times (KETRMAX) */
+
+      RMATCH(bracode, RM7);
+      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      }
+
+    /* Carry on at this level for a non-repeating ket, or after matching an
+    empty string, or after repeating for a maximum number of times. */
+
+    Fecode += 1 + LINK_SIZE;
+    break;
+
+
+    /* ===================================================================== */
+    /* Start and end of line assertions, not multiline mode. */
+
+    case OP_CIRC:   /* Start of line, unless PCRE2_NOTBOL is set. */
+    if (Feptr != mb->start_subject || (mb->moptions & PCRE2_NOTBOL) != 0)
+      RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+    case OP_SOD:    /* Unconditional start of subject */
+    if (Feptr != mb->start_subject) RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+    /* When PCRE2_NOTEOL is unset, assert before the subject end, or a
+    terminating newline unless PCRE2_DOLLAR_ENDONLY is set. */
+
+    case OP_DOLL:
+    if ((mb->moptions & PCRE2_NOTEOL) != 0) RRETURN(MATCH_NOMATCH);
+    if ((mb->poptions & PCRE2_DOLLAR_ENDONLY) == 0) goto ASSERT_NL_OR_EOS;
+
+    /* Fall through */
+    /* Unconditional end of subject assertion (\z) */
+
+    case OP_EOD:
+    if (Feptr < mb->end_subject) RRETURN(MATCH_NOMATCH);
+    if (mb->partial != 0)
+      {
+      mb->hitend = TRUE;
+      if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+      }
+    Fecode++;
+    break;
+
+    /* End of subject or ending \n assertion (\Z) */
+
+    case OP_EODN:
+    ASSERT_NL_OR_EOS:
+    if (Feptr < mb->end_subject &&
+        (!IS_NEWLINE(Feptr) || Feptr != mb->end_subject - mb->nllen))
+      {
+      if (mb->partial != 0 &&
+          Feptr + 1 >= mb->end_subject &&
+          NLBLOCK->nltype == NLTYPE_FIXED &&
+          NLBLOCK->nllen == 2 &&
+          UCHAR21TEST(Feptr) == NLBLOCK->nl[0])
+        {
+        mb->hitend = TRUE;
+        if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+        }
+      RRETURN(MATCH_NOMATCH);
+      }
+
+    /* Either at end of string or \n before end. */
+
+    if (mb->partial != 0)
+      {
+      mb->hitend = TRUE;
+      if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+      }
+    Fecode++;
+    break;
+
+
+    /* ===================================================================== */
+    /* Start and end of line assertions, multiline mode. */
+
+    /* Start of subject unless notbol, or after any newline except for one at
+    the very end, unless PCRE2_ALT_CIRCUMFLEX is set. */
+
+    case OP_CIRCM:
+    if ((mb->moptions & PCRE2_NOTBOL) != 0 && Feptr == mb->start_subject)
+      RRETURN(MATCH_NOMATCH);
+    if (Feptr != mb->start_subject &&
+        ((Feptr == mb->end_subject &&
+           (mb->poptions & PCRE2_ALT_CIRCUMFLEX) == 0) ||
+         !WAS_NEWLINE(Feptr)))
+      RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+    /* Assert before any newline, or before end of subject unless noteol is
+    set. */
+
+    case OP_DOLLM:
+    if (Feptr < mb->end_subject)
+      {
+      if (!IS_NEWLINE(Feptr))
+        {
+        if (mb->partial != 0 &&
+            Feptr + 1 >= mb->end_subject &&
+            NLBLOCK->nltype == NLTYPE_FIXED &&
+            NLBLOCK->nllen == 2 &&
+            UCHAR21TEST(Feptr) == NLBLOCK->nl[0])
+          {
+          mb->hitend = TRUE;
+          if (mb->partial > 1) return PCRE2_ERROR_PARTIAL;
+          }
+        RRETURN(MATCH_NOMATCH);
+        }
+      }
+    else
+      {
+      if ((mb->moptions & PCRE2_NOTEOL) != 0) RRETURN(MATCH_NOMATCH);
+      SCHECK_PARTIAL();
+      }
+    Fecode++;
+    break;
+
+
+    /* ===================================================================== */
+    /* Start of match assertion */
+
+    case OP_SOM:
+    if (Feptr != mb->start_subject + mb->start_offset) RRETURN(MATCH_NOMATCH);
+    Fecode++;
+    break;
+
+
+    /* ===================================================================== */
+    /* Reset the start of match point */
+
+    case OP_SET_SOM:
+    Fstart_match = Feptr;
+    Fecode++;
+    break;
+
+
+    /* ===================================================================== */
+    /* Word boundary assertions. Find out if the previous and current
+    characters are "word" characters. It takes a bit more work in UTF mode.
+    Characters > 255 are assumed to be "non-word" characters when PCRE2_UCP is
+    not set. When it is set, use Unicode properties if available, even when not
+    in UTF mode. Remember the earliest and latest consulted characters. */
+
+    case OP_NOT_WORD_BOUNDARY:
+    case OP_WORD_BOUNDARY:
+    if (Feptr == mb->check_subject) prev_is_word = FALSE; else
+      {
+      PCRE2_SPTR lastptr = Feptr - 1;
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        BACKCHAR(lastptr);
+        GETCHAR(fc, lastptr);
+        }
+      else
+#endif  /* SUPPORT_UNICODE */
+      fc = *lastptr;
+      if (lastptr < mb->start_used_ptr) mb->start_used_ptr = lastptr;
+#ifdef SUPPORT_UNICODE
+      if ((mb->poptions & PCRE2_UCP) != 0)
+        {
+        if (fc == '_') prev_is_word = TRUE; else
+          {
+          int cat = UCD_CATEGORY(fc);
+          prev_is_word = (cat == ucp_L || cat == ucp_N);
+          }
+        }
+      else
+#endif  /* SUPPORT_UNICODE */
+      prev_is_word = CHMAX_255(fc) && (mb->ctypes[fc] & ctype_word) != 0;
+      }
+
+    /* Get status of next character */
+
+    if (Feptr >= mb->end_subject)
+      {
+      SCHECK_PARTIAL();
+      cur_is_word = FALSE;
+      }
+    else
+      {
+      PCRE2_SPTR nextptr = Feptr + 1;
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        FORWARDCHARTEST(nextptr, mb->end_subject);
+        GETCHAR(fc, Feptr);
+        }
+      else
+#endif  /* SUPPORT_UNICODE */
+      fc = *Feptr;
+      if (nextptr > mb->last_used_ptr) mb->last_used_ptr = nextptr;
+#ifdef SUPPORT_UNICODE
+      if ((mb->poptions & PCRE2_UCP) != 0)
+        {
+        if (fc == '_') cur_is_word = TRUE; else
+          {
+          int cat = UCD_CATEGORY(fc);
+          cur_is_word = (cat == ucp_L || cat == ucp_N);
+          }
+        }
+      else
+#endif  /* SUPPORT_UNICODE */
+      cur_is_word = CHMAX_255(fc) && (mb->ctypes[fc] & ctype_word) != 0;
+      }
+
+    /* Now see if the situation is what we want */
+
+    if ((*Fecode++ == OP_WORD_BOUNDARY)?
+         cur_is_word == prev_is_word : cur_is_word != prev_is_word)
+      RRETURN(MATCH_NOMATCH);
+    break;
+
+
+    /* ===================================================================== */
+    /* Backtracking (*VERB)s, with and without arguments. Note that if the
+    pattern is successfully matched, we do not come back from RMATCH. */
+
+    case OP_MARK:
+    Fmark = mb->nomatch_mark = Fecode + 2;
+    RMATCH(Fecode + PRIV(OP_lengths)[*Fecode] + Fecode[1], RM12);
+
+    /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
+    argument, and we must check whether that argument matches this MARK's
+    argument. It is passed back in mb->verb_skip_ptr. If it does match, we
+    return MATCH_SKIP with mb->verb_skip_ptr now pointing to the subject
+    position that corresponds to this mark. Otherwise, pass back the return
+    code unaltered. */
+
+    if (rrc == MATCH_SKIP_ARG &&
+             PRIV(strcmp)(Fecode + 2, mb->verb_skip_ptr) == 0)
+      {
+      mb->verb_skip_ptr = Feptr;   /* Pass back current position */
+      RRETURN(MATCH_SKIP);
+      }
+    RRETURN(rrc);
+
+    case OP_FAIL:
+    RRETURN(MATCH_NOMATCH);
+
+    /* Record the current recursing group number in mb->verb_current_recurse
+    when a backtracking return such as MATCH_COMMIT is given. This enables the
+    recurse processing to catch verbs from within the recursion. */
+
+    case OP_COMMIT:
+    RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM13);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    mb->verb_current_recurse = Fcurrent_recurse;
+    RRETURN(MATCH_COMMIT);
+
+    case OP_COMMIT_ARG:
+    Fmark = mb->nomatch_mark = Fecode + 2;
+    RMATCH(Fecode + PRIV(OP_lengths)[*Fecode] + Fecode[1], RM36);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    mb->verb_current_recurse = Fcurrent_recurse;
+    RRETURN(MATCH_COMMIT);
+
+    case OP_PRUNE:
+    RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM14);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    mb->verb_current_recurse = Fcurrent_recurse;
+    RRETURN(MATCH_PRUNE);
+
+    case OP_PRUNE_ARG:
+    Fmark = mb->nomatch_mark = Fecode + 2;
+    RMATCH(Fecode + PRIV(OP_lengths)[*Fecode] + Fecode[1], RM15);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    mb->verb_current_recurse = Fcurrent_recurse;
+    RRETURN(MATCH_PRUNE);
+
+    case OP_SKIP:
+    RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM16);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    mb->verb_skip_ptr = Feptr;   /* Pass back current position */
+    mb->verb_current_recurse = Fcurrent_recurse;
+    RRETURN(MATCH_SKIP);
+
+    /* Note that, for Perl compatibility, SKIP with an argument does NOT set
+    nomatch_mark. When a pattern match ends with a SKIP_ARG for which there was
+    not a matching mark, we have to re-run the match, ignoring the SKIP_ARG
+    that failed and any that precede it (either they also failed, or were not
+    triggered). To do this, we maintain a count of executed SKIP_ARGs. If a
+    SKIP_ARG gets to top level, the match is re-run with mb->ignore_skip_arg
+    set to the count of the one that failed. */
+
+    case OP_SKIP_ARG:
+    mb->skip_arg_count++;
+    if (mb->skip_arg_count <= mb->ignore_skip_arg)
+      {
+      Fecode += PRIV(OP_lengths)[*Fecode] + Fecode[1];
+      break;
+      }
+    RMATCH(Fecode + PRIV(OP_lengths)[*Fecode] + Fecode[1], RM17);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+
+    /* Pass back the current skip name and return the special MATCH_SKIP_ARG
+    return code. This will either be caught by a matching MARK, or get to the
+    top, where it causes a rematch with mb->ignore_skip_arg set to the value of
+    mb->skip_arg_count. */
+
+    mb->verb_skip_ptr = Fecode + 2;
+    mb->verb_current_recurse = Fcurrent_recurse;
+    RRETURN(MATCH_SKIP_ARG);
+
+    /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
+    the branch in which it occurs can be determined. */
+
+    case OP_THEN:
+    RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM18);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    mb->verb_ecode_ptr = Fecode;
+    mb->verb_current_recurse = Fcurrent_recurse;
+    RRETURN(MATCH_THEN);
+
+    case OP_THEN_ARG:
+    Fmark = mb->nomatch_mark = Fecode + 2;
+    RMATCH(Fecode + PRIV(OP_lengths)[*Fecode] + Fecode[1], RM19);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    mb->verb_ecode_ptr = Fecode;
+    mb->verb_current_recurse = Fcurrent_recurse;
+    RRETURN(MATCH_THEN);
+
+
+    /* ===================================================================== */
+    /* There's been some horrible disaster. Arrival here can only mean there is
+    something seriously wrong in the code above or the OP_xxx definitions. */
+
+    default:
+    return PCRE2_ERROR_INTERNAL;
+    }
+
+  /* Do not insert any code in here without much thought; it is assumed
+  that "continue" in the code above comes out to here to repeat the main
+  loop. */
+
+  }  /* End of main loop */
+/* Control never reaches here */
+
+
+/* ========================================================================= */
+/* The RRETURN() macro jumps here. The number that is saved in Freturn_id
+indicates which label we actually want to return to. The value in Frdepth is
+the index number of the frame in the vector. The return value has been placed
+in rrc. */
+
+#define LBL(val) case val: goto L_RM##val;
+
+RETURN_SWITCH:
+if (Feptr > mb->last_used_ptr) mb->last_used_ptr = Feptr;
+if (Frdepth == 0) return rrc;                     /* Exit from the top level */
+F = (heapframe *)((char *)F - Fback_frame);       /* Backtrack */
+mb->cb->callout_flags |= PCRE2_CALLOUT_BACKTRACK; /* Note for callouts */
+
+#ifdef DEBUG_SHOW_RMATCH
+fprintf(stderr, "++ RETURN %d to %d\n", rrc, Freturn_id);
+#endif
+
+switch (Freturn_id)
+  {
+  LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)
+  LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(16)
+  LBL(17) LBL(18) LBL(19) LBL(20) LBL(21) LBL(22) LBL(23) LBL(24)
+  LBL(25) LBL(26) LBL(27) LBL(28) LBL(29) LBL(30) LBL(31) LBL(32)
+  LBL(33) LBL(34) LBL(35) LBL(36)
+
+#ifdef SUPPORT_WIDE_CHARS
+  LBL(100) LBL(101)
+#endif
+
+#ifdef SUPPORT_UNICODE
+  LBL(200) LBL(201) LBL(202) LBL(203) LBL(204) LBL(205) LBL(206)
+  LBL(207) LBL(208) LBL(209) LBL(210) LBL(211) LBL(212) LBL(213)
+  LBL(214) LBL(215) LBL(216) LBL(217) LBL(218) LBL(219) LBL(220)
+  LBL(221) LBL(222) LBL(223) LBL(224) LBL(225)
+#endif
+
+  default:
+  return PCRE2_ERROR_INTERNAL;
+  }
+#undef LBL
+}
+
+
+/*************************************************
+*           Match a Regular Expression           *
+*************************************************/
+
+/* This function applies a compiled pattern to a subject string and picks out
+portions of the string if it matches. Two elements in the vector are set for
+each substring: the offsets to the start and end of the substring.
+
+Arguments:
+  code            points to the compiled expression
+  subject         points to the subject string
+  length          length of subject string (may contain binary zeros)
+  start_offset    where to start in the subject string
+  options         option bits
+  match_data      points to a match_data block
+  mcontext        points a PCRE2 context
+
+Returns:          > 0 => success; value is the number of ovector pairs filled
+                  = 0 => success, but ovector is not big enough
+                  = -1 => failed to match (PCRE2_ERROR_NOMATCH)
+                  = -2 => partial match (PCRE2_ERROR_PARTIAL)
+                  < -2 => some kind of unexpected problem
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_match(const pcre2_code *code, PCRE2_SPTR subject, PCRE2_SIZE length,
+  PCRE2_SIZE start_offset, uint32_t options, pcre2_match_data *match_data,
+  pcre2_match_context *mcontext)
+{
+int rc;
+int was_zero_terminated = 0;
+const uint8_t *start_bits = NULL;
+const pcre2_real_code *re = (const pcre2_real_code *)code;
+
+BOOL anchored;
+BOOL firstline;
+BOOL has_first_cu = FALSE;
+BOOL has_req_cu = FALSE;
+BOOL startline;
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+PCRE2_SPTR memchr_found_first_cu;
+PCRE2_SPTR memchr_found_first_cu2;
+#endif
+
+PCRE2_UCHAR first_cu = 0;
+PCRE2_UCHAR first_cu2 = 0;
+PCRE2_UCHAR req_cu = 0;
+PCRE2_UCHAR req_cu2 = 0;
+
+PCRE2_SPTR bumpalong_limit;
+PCRE2_SPTR end_subject;
+PCRE2_SPTR true_end_subject;
+PCRE2_SPTR start_match;
+PCRE2_SPTR req_cu_ptr;
+PCRE2_SPTR start_partial;
+PCRE2_SPTR match_partial;
+
+#ifdef SUPPORT_JIT
+BOOL use_jit;
+#endif
+
+/* This flag is needed even when Unicode is not supported for convenience
+(it is used by the IS_NEWLINE macro). */
+
+BOOL utf = FALSE;
+
+#ifdef SUPPORT_UNICODE
+BOOL ucp = FALSE;
+BOOL allow_invalid;
+uint32_t fragment_options = 0;
+#ifdef SUPPORT_JIT
+BOOL jit_checked_utf = FALSE;
+#endif
+#endif  /* SUPPORT_UNICODE */
+
+PCRE2_SIZE frame_size;
+
+/* We need to have mb as a pointer to a match block, because the IS_NEWLINE
+macro is used below, and it expects NLBLOCK to be defined as a pointer. */
+
+pcre2_callout_block cb;
+match_block actual_match_block;
+match_block *mb = &actual_match_block;
+
+/* Allocate an initial vector of backtracking frames on the stack. If this
+proves to be too small, it is replaced by a larger one on the heap. To get a
+vector of the size required that is aligned for pointers, allocate it as a
+vector of pointers. */
+
+PCRE2_SPTR stack_frames_vector[START_FRAMES_SIZE/sizeof(PCRE2_SPTR)]
+    PCRE2_KEEP_UNINITIALIZED;
+mb->stack_frames = (heapframe *)stack_frames_vector;
+
+/* Recognize NULL, length 0 as an empty string. */
+
+if (subject == NULL && length == 0) subject = (PCRE2_SPTR)"";
+
+/* Plausibility checks */
+
+if ((options & ~PUBLIC_MATCH_OPTIONS) != 0) return PCRE2_ERROR_BADOPTION;
+if (code == NULL || subject == NULL || match_data == NULL)
+  return PCRE2_ERROR_NULL;
+
+start_match = subject + start_offset;
+req_cu_ptr = start_match - 1;
+if (length == PCRE2_ZERO_TERMINATED)
+  {
+  length = PRIV(strlen)(subject);
+  was_zero_terminated = 1;
+  }
+true_end_subject = end_subject = subject + length;
+
+if (start_offset > length) return PCRE2_ERROR_BADOFFSET;
+
+/* Check that the first field in the block is the magic number. */
+
+if (re->magic_number != MAGIC_NUMBER) return PCRE2_ERROR_BADMAGIC;
+
+/* Check the code unit width. */
+
+if ((re->flags & PCRE2_MODE_MASK) != PCRE2_CODE_UNIT_WIDTH/8)
+  return PCRE2_ERROR_BADMODE;
+
+/* PCRE2_NOTEMPTY and PCRE2_NOTEMPTY_ATSTART are match-time flags in the
+options variable for this function. Users of PCRE2 who are not calling the
+function directly would like to have a way of setting these flags, in the same
+way that they can set pcre2_compile() flags like PCRE2_NO_AUTOPOSSESS with
+constructions like (*NO_AUTOPOSSESS). To enable this, (*NOTEMPTY) and
+(*NOTEMPTY_ATSTART) set bits in the pattern's "flag" function which we now
+transfer to the options for this function. The bits are guaranteed to be
+adjacent, but do not have the same values. This bit of Boolean trickery assumes
+that the match-time bits are not more significant than the flag bits. If by
+accident this is not the case, a compile-time division by zero error will
+occur. */
+
+#define FF (PCRE2_NOTEMPTY_SET|PCRE2_NE_ATST_SET)
+#define OO (PCRE2_NOTEMPTY|PCRE2_NOTEMPTY_ATSTART)
+options |= (re->flags & FF) / ((FF & (~FF+1)) / (OO & (~OO+1)));
+#undef FF
+#undef OO
+
+/* If the pattern was successfully studied with JIT support, we will run the
+JIT executable instead of the rest of this function. Most options must be set
+at compile time for the JIT code to be usable. */
+
+#ifdef SUPPORT_JIT
+use_jit = (re->executable_jit != NULL &&
+          (options & ~PUBLIC_JIT_MATCH_OPTIONS) == 0);
+#endif
+
+/* Initialize UTF/UCP parameters. */
+
+#ifdef SUPPORT_UNICODE
+utf = (re->overall_options & PCRE2_UTF) != 0;
+allow_invalid = (re->overall_options & PCRE2_MATCH_INVALID_UTF) != 0;
+ucp = (re->overall_options & PCRE2_UCP) != 0;
+#endif  /* SUPPORT_UNICODE */
+
+/* Convert the partial matching flags into an integer. */
+
+mb->partial = ((options & PCRE2_PARTIAL_HARD) != 0)? 2 :
+              ((options & PCRE2_PARTIAL_SOFT) != 0)? 1 : 0;
+
+/* Partial matching and PCRE2_ENDANCHORED are currently not allowed at the same
+time. */
+
+if (mb->partial != 0 &&
+   ((re->overall_options | options) & PCRE2_ENDANCHORED) != 0)
+  return PCRE2_ERROR_BADOPTION;
+
+/* It is an error to set an offset limit without setting the flag at compile
+time. */
+
+if (mcontext != NULL && mcontext->offset_limit != PCRE2_UNSET &&
+     (re->overall_options & PCRE2_USE_OFFSET_LIMIT) == 0)
+  return PCRE2_ERROR_BADOFFSETLIMIT;
+
+/* If the match data block was previously used with PCRE2_COPY_MATCHED_SUBJECT,
+free the memory that was obtained. Set the field to NULL for no match cases. */
+
+if ((match_data->flags & PCRE2_MD_COPIED_SUBJECT) != 0)
+  {
+  match_data->memctl.free((void *)match_data->subject,
+    match_data->memctl.memory_data);
+  match_data->flags &= ~PCRE2_MD_COPIED_SUBJECT;
+  }
+match_data->subject = NULL;
+
+/* Zero the error offset in case the first code unit is invalid UTF. */
+
+match_data->startchar = 0;
+
+
+/* ============================= JIT matching ============================== */
+
+/* Prepare for JIT matching. Check a UTF string for validity unless no check is
+requested or invalid UTF can be handled. We check only the portion of the
+subject that might be be inspected during matching - from the offset minus the
+maximum lookbehind to the given length. This saves time when a small part of a
+large subject is being matched by the use of a starting offset. Note that the
+maximum lookbehind is a number of characters, not code units. */
+
+#ifdef SUPPORT_JIT
+if (use_jit)
+  {
+#ifdef SUPPORT_UNICODE
+  if (utf && (options & PCRE2_NO_UTF_CHECK) == 0 && !allow_invalid)
+    {
+#if PCRE2_CODE_UNIT_WIDTH != 32
+    unsigned int i;
+#endif
+
+    /* For 8-bit and 16-bit UTF, check that the first code unit is a valid
+    character start. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 32
+    if (start_match < end_subject && NOT_FIRSTCU(*start_match))
+      {
+      if (start_offset > 0) return PCRE2_ERROR_BADUTFOFFSET;
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      return PCRE2_ERROR_UTF8_ERR20;  /* Isolated 0x80 byte */
+#else
+      return PCRE2_ERROR_UTF16_ERR3;  /* Isolated low surrogate */
+#endif
+      }
+#endif  /* WIDTH != 32 */
+
+    /* Move back by the maximum lookbehind, just in case it happens at the very
+    start of matching. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 32
+    for (i = re->max_lookbehind; i > 0 && start_match > subject; i--)
+      {
+      start_match--;
+      while (start_match > subject &&
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      (*start_match & 0xc0) == 0x80)
+#else  /* 16-bit */
+      (*start_match & 0xfc00) == 0xdc00)
+#endif
+        start_match--;
+      }
+#else  /* PCRE2_CODE_UNIT_WIDTH != 32 */
+
+    /* In the 32-bit library, one code unit equals one character. However,
+    we cannot just subtract the lookbehind and then compare pointers, because
+    a very large lookbehind could create an invalid pointer. */
+
+    if (start_offset >= re->max_lookbehind)
+      start_match -= re->max_lookbehind;
+    else
+      start_match = subject;
+#endif  /* PCRE2_CODE_UNIT_WIDTH != 32 */
+
+    /* Validate the relevant portion of the subject. Adjust the offset of an
+    invalid code point to be an absolute offset in the whole string. */
+
+    match_data->rc = PRIV(valid_utf)(start_match,
+      length - (start_match - subject), &(match_data->startchar));
+    if (match_data->rc != 0)
+      {
+      match_data->startchar += start_match - subject;
+      return match_data->rc;
+      }
+    jit_checked_utf = TRUE;
+    }
+#endif  /* SUPPORT_UNICODE */
+
+  /* If JIT returns BADOPTION, which means that the selected complete or
+  partial matching mode was not compiled, fall through to the interpreter. */
+
+  rc = pcre2_jit_match(code, subject, length, start_offset, options,
+    match_data, mcontext);
+  if (rc != PCRE2_ERROR_JIT_BADOPTION)
+    {
+    if (rc >= 0 && (options & PCRE2_COPY_MATCHED_SUBJECT) != 0)
+      {
+      length = CU2BYTES(length + was_zero_terminated);
+      match_data->subject = match_data->memctl.malloc(length,
+        match_data->memctl.memory_data);
+      if (match_data->subject == NULL) return PCRE2_ERROR_NOMEMORY;
+      memcpy((void *)match_data->subject, subject, length);
+      match_data->flags |= PCRE2_MD_COPIED_SUBJECT;
+      }
+    return rc;
+    }
+  }
+#endif  /* SUPPORT_JIT */
+
+/* ========================= End of JIT matching ========================== */
+
+
+/* Proceed with non-JIT matching. The default is to allow lookbehinds to the
+start of the subject. A UTF check when there is a non-zero offset may change
+this. */
+
+mb->check_subject = subject;
+
+/* If a UTF subject string was not checked for validity in the JIT code above,
+check it here, and handle support for invalid UTF strings. The check above
+happens only when invalid UTF is not supported and PCRE2_NO_CHECK_UTF is unset.
+If we get here in those circumstances, it means the subject string is valid,
+but for some reason JIT matching was not successful. There is no need to check
+the subject again.
+
+We check only the portion of the subject that might be be inspected during
+matching - from the offset minus the maximum lookbehind to the given length.
+This saves time when a small part of a large subject is being matched by the
+use of a starting offset. Note that the maximum lookbehind is a number of
+characters, not code units.
+
+Note also that support for invalid UTF forces a check, overriding the setting
+of PCRE2_NO_CHECK_UTF. */
+
+#ifdef SUPPORT_UNICODE
+if (utf &&
+#ifdef SUPPORT_JIT
+    !jit_checked_utf &&
+#endif
+    ((options & PCRE2_NO_UTF_CHECK) == 0 || allow_invalid))
+  {
+#if PCRE2_CODE_UNIT_WIDTH != 32
+  BOOL skipped_bad_start = FALSE;
+#endif
+
+  /* For 8-bit and 16-bit UTF, check that the first code unit is a valid
+  character start. If we are handling invalid UTF, just skip over such code
+  units. Otherwise, give an appropriate error. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 32
+  if (allow_invalid)
+    {
+    while (start_match < end_subject && NOT_FIRSTCU(*start_match))
+      {
+      start_match++;
+      skipped_bad_start = TRUE;
+      }
+    }
+  else if (start_match < end_subject && NOT_FIRSTCU(*start_match))
+    {
+    if (start_offset > 0) return PCRE2_ERROR_BADUTFOFFSET;
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    return PCRE2_ERROR_UTF8_ERR20;  /* Isolated 0x80 byte */
+#else
+    return PCRE2_ERROR_UTF16_ERR3;  /* Isolated low surrogate */
+#endif
+    }
+#endif  /* WIDTH != 32 */
+
+  /* The mb->check_subject field points to the start of UTF checking;
+  lookbehinds can go back no further than this. */
+
+  mb->check_subject = start_match;
+
+  /* Move back by the maximum lookbehind, just in case it happens at the very
+  start of matching, but don't do this if we skipped bad 8-bit or 16-bit code
+  units above. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 32
+  if (!skipped_bad_start)
+    {
+    unsigned int i;
+    for (i = re->max_lookbehind; i > 0 && mb->check_subject > subject; i--)
+      {
+      mb->check_subject--;
+      while (mb->check_subject > subject &&
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      (*mb->check_subject & 0xc0) == 0x80)
+#else  /* 16-bit */
+      (*mb->check_subject & 0xfc00) == 0xdc00)
+#endif
+        mb->check_subject--;
+      }
+    }
+#else  /* PCRE2_CODE_UNIT_WIDTH != 32 */
+
+  /* In the 32-bit library, one code unit equals one character. However,
+  we cannot just subtract the lookbehind and then compare pointers, because
+  a very large lookbehind could create an invalid pointer. */
+
+  if (start_offset >= re->max_lookbehind)
+    mb->check_subject -= re->max_lookbehind;
+  else
+    mb->check_subject = subject;
+#endif  /* PCRE2_CODE_UNIT_WIDTH != 32 */
+
+  /* Validate the relevant portion of the subject. There's a loop in case we
+  encounter bad UTF in the characters preceding start_match which we are
+  scanning because of a lookbehind. */
+
+  for (;;)
+    {
+    match_data->rc = PRIV(valid_utf)(mb->check_subject,
+      length - (mb->check_subject - subject), &(match_data->startchar));
+
+    if (match_data->rc == 0) break;   /* Valid UTF string */
+
+    /* Invalid UTF string. Adjust the offset to be an absolute offset in the
+    whole string. If we are handling invalid UTF strings, set end_subject to
+    stop before the bad code unit, and set the options to "not end of line".
+    Otherwise return the error. */
+
+    match_data->startchar += mb->check_subject - subject;
+    if (!allow_invalid || match_data->rc > 0) return match_data->rc;
+    end_subject = subject + match_data->startchar;
+
+    /* If the end precedes start_match, it means there is invalid UTF in the
+    extra code units we reversed over because of a lookbehind. Advance past the
+    first bad code unit, and then skip invalid character starting code units in
+    8-bit and 16-bit modes, and try again with the original end point. */
+
+    if (end_subject < start_match)
+      {
+      mb->check_subject = end_subject + 1;
+#if PCRE2_CODE_UNIT_WIDTH != 32
+      while (mb->check_subject < start_match && NOT_FIRSTCU(*mb->check_subject))
+        mb->check_subject++;
+#endif
+      end_subject = true_end_subject;
+      }
+
+    /* Otherwise, set the not end of line option, and do the match. */
+
+    else
+      {
+      fragment_options = PCRE2_NOTEOL;
+      break;
+      }
+    }
+  }
+#endif  /* SUPPORT_UNICODE */
+
+/* A NULL match context means "use a default context", but we take the memory
+control functions from the pattern. */
+
+if (mcontext == NULL)
+  {
+  mcontext = (pcre2_match_context *)(&PRIV(default_match_context));
+  mb->memctl = re->memctl;
+  }
+else mb->memctl = mcontext->memctl;
+
+anchored = ((re->overall_options | options) & PCRE2_ANCHORED) != 0;
+firstline = (re->overall_options & PCRE2_FIRSTLINE) != 0;
+startline = (re->flags & PCRE2_STARTLINE) != 0;
+bumpalong_limit = (mcontext->offset_limit == PCRE2_UNSET)?
+  true_end_subject : subject + mcontext->offset_limit;
+
+/* Initialize and set up the fixed fields in the callout block, with a pointer
+in the match block. */
+
+mb->cb = &cb;
+cb.version = 2;
+cb.subject = subject;
+cb.subject_length = (PCRE2_SIZE)(end_subject - subject);
+cb.callout_flags = 0;
+
+/* Fill in the remaining fields in the match block, except for moptions, which
+gets set later. */
+
+mb->callout = mcontext->callout;
+mb->callout_data = mcontext->callout_data;
+
+mb->start_subject = subject;
+mb->start_offset = start_offset;
+mb->end_subject = end_subject;
+mb->hasthen = (re->flags & PCRE2_HASTHEN) != 0;
+mb->allowemptypartial = (re->max_lookbehind > 0) ||
+    (re->flags & PCRE2_MATCH_EMPTY) != 0;
+mb->poptions = re->overall_options;          /* Pattern options */
+mb->ignore_skip_arg = 0;
+mb->mark = mb->nomatch_mark = NULL;          /* In case never set */
+
+/* The name table is needed for finding all the numbers associated with a
+given name, for condition testing. The code follows the name table. */
+
+mb->name_table = (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code));
+mb->name_count = re->name_count;
+mb->name_entry_size = re->name_entry_size;
+mb->start_code = mb->name_table + re->name_count * re->name_entry_size;
+
+/* Process the \R and newline settings. */
+
+mb->bsr_convention = re->bsr_convention;
+mb->nltype = NLTYPE_FIXED;
+switch(re->newline_convention)
+  {
+  case PCRE2_NEWLINE_CR:
+  mb->nllen = 1;
+  mb->nl[0] = CHAR_CR;
+  break;
+
+  case PCRE2_NEWLINE_LF:
+  mb->nllen = 1;
+  mb->nl[0] = CHAR_NL;
+  break;
+
+  case PCRE2_NEWLINE_NUL:
+  mb->nllen = 1;
+  mb->nl[0] = CHAR_NUL;
+  break;
+
+  case PCRE2_NEWLINE_CRLF:
+  mb->nllen = 2;
+  mb->nl[0] = CHAR_CR;
+  mb->nl[1] = CHAR_NL;
+  break;
+
+  case PCRE2_NEWLINE_ANY:
+  mb->nltype = NLTYPE_ANY;
+  break;
+
+  case PCRE2_NEWLINE_ANYCRLF:
+  mb->nltype = NLTYPE_ANYCRLF;
+  break;
+
+  default: return PCRE2_ERROR_INTERNAL;
+  }
+
+/* The backtracking frames have fixed data at the front, and a PCRE2_SIZE
+vector at the end, whose size depends on the number of capturing parentheses in
+the pattern. It is not used at all if there are no capturing parentheses.
+
+  frame_size             is the total size of each frame
+  mb->frame_vector_size  is the total usable size of the vector (rounded down
+                           to a whole number of frames)
+
+The last of these is changed within the match() function if the frame vector
+has to be expanded. We therefore put it into the match block so that it is
+correct when calling match() more than once for non-anchored patterns.
+
+We must also pad frame_size for alignment to ensure subsequent frames are as
+aligned as heapframe. Whilst ovector is word-aligned due to being a PCRE2_SIZE
+array, that does not guarantee it is suitably aligned for pointers, as some
+architectures have pointers that are larger than a size_t. */
+
+frame_size = (offsetof(heapframe, ovector) +
+  re->top_bracket * 2 * sizeof(PCRE2_SIZE) + HEAPFRAME_ALIGNMENT - 1) &
+  ~(HEAPFRAME_ALIGNMENT - 1);
+
+/* Limits set in the pattern override the match context only if they are
+smaller. */
+
+mb->heap_limit = (mcontext->heap_limit < re->limit_heap)?
+  mcontext->heap_limit : re->limit_heap;
+
+mb->match_limit = (mcontext->match_limit < re->limit_match)?
+  mcontext->match_limit : re->limit_match;
+
+mb->match_limit_depth = (mcontext->depth_limit < re->limit_depth)?
+  mcontext->depth_limit : re->limit_depth;
+
+/* If a pattern has very many capturing parentheses, the frame size may be very
+large. Ensure that there are at least 10 available frames by getting an initial
+vector on the heap if necessary, except when the heap limit prevents this. Get
+fewer if possible. (The heap limit is in kibibytes.) */
+
+if (frame_size <= START_FRAMES_SIZE/10)
+  {
+  mb->match_frames = mb->stack_frames;   /* Initial frame vector on the stack */
+  mb->frame_vector_size = ((START_FRAMES_SIZE/frame_size) * frame_size);
+  }
+else
+  {
+  mb->frame_vector_size = frame_size * 10;
+  if ((mb->frame_vector_size / 1024) > mb->heap_limit)
+    {
+    if (frame_size > mb->heap_limit * 1024) return PCRE2_ERROR_HEAPLIMIT;
+    mb->frame_vector_size = ((mb->heap_limit * 1024)/frame_size) * frame_size;
+    }
+  mb->match_frames = mb->memctl.malloc(mb->frame_vector_size,
+    mb->memctl.memory_data);
+  if (mb->match_frames == NULL) return PCRE2_ERROR_NOMEMORY;
+  }
+
+mb->match_frames_top =
+  (heapframe *)((char *)mb->match_frames + mb->frame_vector_size);
+
+/* Write to the ovector within the first frame to mark every capture unset and
+to avoid uninitialized memory read errors when it is copied to a new frame. */
+
+memset((char *)(mb->match_frames) + offsetof(heapframe, ovector), 0xff,
+  frame_size - offsetof(heapframe, ovector));
+
+/* Pointers to the individual character tables */
+
+mb->lcc = re->tables + lcc_offset;
+mb->fcc = re->tables + fcc_offset;
+mb->ctypes = re->tables + ctypes_offset;
+
+/* Set up the first code unit to match, if available. If there's no first code
+unit there may be a bitmap of possible first characters. */
+
+if ((re->flags & PCRE2_FIRSTSET) != 0)
+  {
+  has_first_cu = TRUE;
+  first_cu = first_cu2 = (PCRE2_UCHAR)(re->first_codeunit);
+  if ((re->flags & PCRE2_FIRSTCASELESS) != 0)
+    {
+    first_cu2 = TABLE_GET(first_cu, mb->fcc, first_cu);
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    if (first_cu > 127 && ucp && !utf) first_cu2 = UCD_OTHERCASE(first_cu);
+#else
+    if (first_cu > 127 && (utf || ucp)) first_cu2 = UCD_OTHERCASE(first_cu);
+#endif
+#endif  /* SUPPORT_UNICODE */
+    }
+  }
+else
+  if (!startline && (re->flags & PCRE2_FIRSTMAPSET) != 0)
+    start_bits = re->start_bitmap;
+
+/* There may also be a "last known required character" set. */
+
+if ((re->flags & PCRE2_LASTSET) != 0)
+  {
+  has_req_cu = TRUE;
+  req_cu = req_cu2 = (PCRE2_UCHAR)(re->last_codeunit);
+  if ((re->flags & PCRE2_LASTCASELESS) != 0)
+    {
+    req_cu2 = TABLE_GET(req_cu, mb->fcc, req_cu);
+#ifdef SUPPORT_UNICODE
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    if (req_cu > 127 && ucp && !utf) req_cu2 = UCD_OTHERCASE(req_cu);
+#else
+    if (req_cu > 127 && (utf || ucp)) req_cu2 = UCD_OTHERCASE(req_cu);
+#endif
+#endif  /* SUPPORT_UNICODE */
+    }
+  }
+
+
+/* ==========================================================================*/
+
+/* Loop for handling unanchored repeated matching attempts; for anchored regexs
+the loop runs just once. */
+
+#ifdef SUPPORT_UNICODE
+FRAGMENT_RESTART:
+#endif
+
+start_partial = match_partial = NULL;
+mb->hitend = FALSE;
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+memchr_found_first_cu = NULL;
+memchr_found_first_cu2 = NULL;
+#endif
+
+for(;;)
+  {
+  PCRE2_SPTR new_start_match;
+
+  /* ----------------- Start of match optimizations ---------------- */
+
+  /* There are some optimizations that avoid running the match if a known
+  starting point is not found, or if a known later code unit is not present.
+  However, there is an option (settable at compile time) that disables these,
+  for testing and for ensuring that all callouts do actually occur. */
+
+  if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
+    {
+    /* If firstline is TRUE, the start of the match is constrained to the first
+    line of a multiline string. That is, the match must be before or at the
+    first newline following the start of matching. Temporarily adjust
+    end_subject so that we stop the scans for a first code unit at a newline.
+    If the match fails at the newline, later code breaks the loop. */
+
+    if (firstline)
+      {
+      PCRE2_SPTR t = start_match;
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        while (t < end_subject && !IS_NEWLINE(t))
+          {
+          t++;
+          ACROSSCHAR(t < end_subject, t, t++);
+          }
+        }
+      else
+#endif
+      while (t < end_subject && !IS_NEWLINE(t)) t++;
+      end_subject = t;
+      }
+
+    /* Anchored: check the first code unit if one is recorded. This may seem
+    pointless but it can help in detecting a no match case without scanning for
+    the required code unit. */
+
+    if (anchored)
+      {
+      if (has_first_cu || start_bits != NULL)
+        {
+        BOOL ok = start_match < end_subject;
+        if (ok)
+          {
+          PCRE2_UCHAR c = UCHAR21TEST(start_match);
+          ok = has_first_cu && (c == first_cu || c == first_cu2);
+          if (!ok && start_bits != NULL)
+            {
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            if (c > 255) c = 255;
+#endif
+            ok = (start_bits[c/8] & (1u << (c&7))) != 0;
+            }
+          }
+        if (!ok)
+          {
+          rc = MATCH_NOMATCH;
+          break;
+          }
+        }
+      }
+
+    /* Not anchored. Advance to a unique first code unit if there is one. */
+
+    else
+      {
+      if (has_first_cu)
+        {
+        if (first_cu != first_cu2)  /* Caseless */
+          {
+          /* In 16-bit and 32_bit modes we have to do our own search, so can
+          look for both cases at once. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 8
+          PCRE2_UCHAR smc;
+          while (start_match < end_subject &&
+                (smc = UCHAR21TEST(start_match)) != first_cu &&
+                 smc != first_cu2)
+            start_match++;
+#else
+          /* In 8-bit mode, the use of memchr() gives a big speed up, even
+          though we have to call it twice in order to find the earliest
+          occurrence of the code unit in either of its cases. Caching is used
+          to remember the positions of previously found code units. This can
+          make a huge difference when the strings are very long and only one
+          case is actually present. */
+
+          PCRE2_SPTR pp1 = NULL;
+          PCRE2_SPTR pp2 = NULL;
+          PCRE2_SIZE searchlength = end_subject - start_match;
+
+          /* If we haven't got a previously found position for first_cu, or if
+          the current starting position is later, we need to do a search. If
+          the code unit is not found, set it to the end. */
+
+          if (memchr_found_first_cu == NULL ||
+              start_match > memchr_found_first_cu)
+            {
+            pp1 = memchr(start_match, first_cu, searchlength);
+            memchr_found_first_cu = (pp1 == NULL)? end_subject : pp1;
+            }
+
+          /* If the start is before a previously found position, use the
+          previous position, or NULL if a previous search failed. */
+
+          else pp1 = (memchr_found_first_cu == end_subject)? NULL :
+            memchr_found_first_cu;
+
+          /* Do the same thing for the other case. */
+
+          if (memchr_found_first_cu2 == NULL ||
+              start_match > memchr_found_first_cu2)
+            {
+            pp2 = memchr(start_match, first_cu2, searchlength);
+            memchr_found_first_cu2 = (pp2 == NULL)? end_subject : pp2;
+            }
+
+          else pp2 = (memchr_found_first_cu2 == end_subject)? NULL :
+            memchr_found_first_cu2;
+
+          /* Set the start to the end of the subject if neither case was found.
+          Otherwise, use the earlier found point. */
+
+          if (pp1 == NULL)
+            start_match = (pp2 == NULL)? end_subject : pp2;
+          else
+            start_match = (pp2 == NULL || pp1 < pp2)? pp1 : pp2;
+
+#endif  /* 8-bit handling */
+          }
+
+        /* The caseful case is much simpler. */
+
+        else
+          {
+#if PCRE2_CODE_UNIT_WIDTH != 8
+          while (start_match < end_subject && UCHAR21TEST(start_match) !=
+                 first_cu)
+            start_match++;
+#else
+          start_match = memchr(start_match, first_cu, end_subject - start_match);
+          if (start_match == NULL) start_match = end_subject;
+#endif
+          }
+
+        /* If we can't find the required first code unit, having reached the
+        true end of the subject, break the bumpalong loop, to force a match
+        failure, except when doing partial matching, when we let the next cycle
+        run at the end of the subject. To see why, consider the pattern
+        /(?<=abc)def/, which partially matches "abc", even though the string
+        does not contain the starting character "d". If we have not reached the
+        true end of the subject (PCRE2_FIRSTLINE caused end_subject to be
+        temporarily modified) we also let the cycle run, because the matching
+        string is legitimately allowed to start with the first code unit of a
+        newline. */
+
+        if (mb->partial == 0 && start_match >= mb->end_subject)
+          {
+          rc = MATCH_NOMATCH;
+          break;
+          }
+        }
+
+      /* If there's no first code unit, advance to just after a linebreak for a
+      multiline match if required. */
+
+      else if (startline)
+        {
+        if (start_match > mb->start_subject + start_offset)
+          {
+#ifdef SUPPORT_UNICODE
+          if (utf)
+            {
+            while (start_match < end_subject && !WAS_NEWLINE(start_match))
+              {
+              start_match++;
+              ACROSSCHAR(start_match < end_subject, start_match, start_match++);
+              }
+            }
+          else
+#endif
+          while (start_match < end_subject && !WAS_NEWLINE(start_match))
+            start_match++;
+
+          /* If we have just passed a CR and the newline option is ANY or
+          ANYCRLF, and we are now at a LF, advance the match position by one
+          more code unit. */
+
+          if (start_match[-1] == CHAR_CR &&
+               (mb->nltype == NLTYPE_ANY || mb->nltype == NLTYPE_ANYCRLF) &&
+               start_match < end_subject &&
+               UCHAR21TEST(start_match) == CHAR_NL)
+            start_match++;
+          }
+        }
+
+      /* If there's no first code unit or a requirement for a multiline line
+      start, advance to a non-unique first code unit if any have been
+      identified. The bitmap contains only 256 bits. When code units are 16 or
+      32 bits wide, all code units greater than 254 set the 255 bit. */
+
+      else if (start_bits != NULL)
+        {
+        while (start_match < end_subject)
+          {
+          uint32_t c = UCHAR21TEST(start_match);
+#if PCRE2_CODE_UNIT_WIDTH != 8
+          if (c > 255) c = 255;
+#endif
+          if ((start_bits[c/8] & (1u << (c&7))) != 0) break;
+          start_match++;
+          }
+
+        /* See comment above in first_cu checking about the next few lines. */
+
+        if (mb->partial == 0 && start_match >= mb->end_subject)
+          {
+          rc = MATCH_NOMATCH;
+          break;
+          }
+        }
+      }   /* End first code unit handling */
+
+    /* Restore fudged end_subject */
+
+    end_subject = mb->end_subject;
+
+    /* The following two optimizations must be disabled for partial matching. */
+
+    if (mb->partial == 0)
+      {
+      PCRE2_SPTR p;
+
+      /* The minimum matching length is a lower bound; no string of that length
+      may actually match the pattern. Although the value is, strictly, in
+      characters, we treat it as code units to avoid spending too much time in
+      this optimization. */
+
+      if (end_subject - start_match < re->minlength)
+        {
+        rc = MATCH_NOMATCH;
+        break;
+        }
+
+      /* If req_cu is set, we know that that code unit must appear in the
+      subject for the (non-partial) match to succeed. If the first code unit is
+      set, req_cu must be later in the subject; otherwise the test starts at
+      the match point. This optimization can save a huge amount of backtracking
+      in patterns with nested unlimited repeats that aren't going to match.
+      Writing separate code for caseful/caseless versions makes it go faster,
+      as does using an autoincrement and backing off on a match. As in the case
+      of the first code unit, using memchr() in the 8-bit library gives a big
+      speed up. Unlike the first_cu check above, we do not need to call
+      memchr() twice in the caseless case because we only need to check for the
+      presence of the character in either case, not find the first occurrence.
+
+      The search can be skipped if the code unit was found later than the
+      current starting point in a previous iteration of the bumpalong loop.
+
+      HOWEVER: when the subject string is very, very long, searching to its end
+      can take a long time, and give bad performance on quite ordinary
+      anchored patterns. This showed up when somebody was matching something
+      like /^\d+C/ on a 32-megabyte string... so we don't do this when the
+      string is sufficiently long, but it's worth searching a lot more for
+      unanchored patterns. */
+
+      p = start_match + (has_first_cu? 1:0);
+      if (has_req_cu && p > req_cu_ptr)
+        {
+        PCRE2_SIZE check_length = end_subject - start_match;
+
+        if (check_length < REQ_CU_MAX ||
+              (!anchored && check_length < REQ_CU_MAX * 1000))
+          {
+          if (req_cu != req_cu2)  /* Caseless */
+            {
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            while (p < end_subject)
+              {
+              uint32_t pp = UCHAR21INCTEST(p);
+              if (pp == req_cu || pp == req_cu2) { p--; break; }
+              }
+#else  /* 8-bit code units */
+            PCRE2_SPTR pp = p;
+            p = memchr(pp, req_cu, end_subject - pp);
+            if (p == NULL)
+              {
+              p = memchr(pp, req_cu2, end_subject - pp);
+              if (p == NULL) p = end_subject;
+              }
+#endif /* PCRE2_CODE_UNIT_WIDTH != 8 */
+            }
+
+          /* The caseful case */
+
+          else
+            {
+#if PCRE2_CODE_UNIT_WIDTH != 8
+            while (p < end_subject)
+              {
+              if (UCHAR21INCTEST(p) == req_cu) { p--; break; }
+              }
+
+#else  /* 8-bit code units */
+            p = memchr(p, req_cu, end_subject - p);
+            if (p == NULL) p = end_subject;
+#endif
+            }
+
+          /* If we can't find the required code unit, break the bumpalong loop,
+          forcing a match failure. */
+
+          if (p >= end_subject)
+            {
+            rc = MATCH_NOMATCH;
+            break;
+            }
+
+          /* If we have found the required code unit, save the point where we
+          found it, so that we don't search again next time round the bumpalong
+          loop if the start hasn't yet passed this code unit. */
+
+          req_cu_ptr = p;
+          }
+        }
+      }
+    }
+
+  /* ------------ End of start of match optimizations ------------ */
+
+  /* Give no match if we have passed the bumpalong limit. */
+
+  if (start_match > bumpalong_limit)
+    {
+    rc = MATCH_NOMATCH;
+    break;
+    }
+
+  /* OK, we can now run the match. If "hitend" is set afterwards, remember the
+  first starting point for which a partial match was found. */
+
+  cb.start_match = (PCRE2_SIZE)(start_match - subject);
+  cb.callout_flags |= PCRE2_CALLOUT_STARTMATCH;
+
+  mb->start_used_ptr = start_match;
+  mb->last_used_ptr = start_match;
+#ifdef SUPPORT_UNICODE
+  mb->moptions = options | fragment_options;
+#else
+  mb->moptions = options;
+#endif
+  mb->match_call_count = 0;
+  mb->end_offset_top = 0;
+  mb->skip_arg_count = 0;
+
+  rc = match(start_match, mb->start_code, match_data->ovector,
+    match_data->oveccount, re->top_bracket, frame_size, mb);
+
+  if (mb->hitend && start_partial == NULL)
+    {
+    start_partial = mb->start_used_ptr;
+    match_partial = start_match;
+    }
+
+  switch(rc)
+    {
+    /* If MATCH_SKIP_ARG reaches this level it means that a MARK that matched
+    the SKIP's arg was not found. In this circumstance, Perl ignores the SKIP
+    entirely. The only way we can do that is to re-do the match at the same
+    point, with a flag to force SKIP with an argument to be ignored. Just
+    treating this case as NOMATCH does not work because it does not check other
+    alternatives in patterns such as A(*SKIP:A)B|AC when the subject is AC. */
+
+    case MATCH_SKIP_ARG:
+    new_start_match = start_match;
+    mb->ignore_skip_arg = mb->skip_arg_count;
+    break;
+
+    /* SKIP passes back the next starting point explicitly, but if it is no
+    greater than the match we have just done, treat it as NOMATCH. */
+
+    case MATCH_SKIP:
+    if (mb->verb_skip_ptr > start_match)
+      {
+      new_start_match = mb->verb_skip_ptr;
+      break;
+      }
+    /* Fall through */
+
+    /* NOMATCH and PRUNE advance by one character. THEN at this level acts
+    exactly like PRUNE. Unset ignore SKIP-with-argument. */
+
+    case MATCH_NOMATCH:
+    case MATCH_PRUNE:
+    case MATCH_THEN:
+    mb->ignore_skip_arg = 0;
+    new_start_match = start_match + 1;
+#ifdef SUPPORT_UNICODE
+    if (utf)
+      ACROSSCHAR(new_start_match < end_subject, new_start_match,
+        new_start_match++);
+#endif
+    break;
+
+    /* COMMIT disables the bumpalong, but otherwise behaves as NOMATCH. */
+
+    case MATCH_COMMIT:
+    rc = MATCH_NOMATCH;
+    goto ENDLOOP;
+
+    /* Any other return is either a match, or some kind of error. */
+
+    default:
+    goto ENDLOOP;
+    }
+
+  /* Control reaches here for the various types of "no match at this point"
+  result. Reset the code to MATCH_NOMATCH for subsequent checking. */
+
+  rc = MATCH_NOMATCH;
+
+  /* If PCRE2_FIRSTLINE is set, the match must happen before or at the first
+  newline in the subject (though it may continue over the newline). Therefore,
+  if we have just failed to match, starting at a newline, do not continue. */
+
+  if (firstline && IS_NEWLINE(start_match)) break;
+
+  /* Advance to new matching position */
+
+  start_match = new_start_match;
+
+  /* Break the loop if the pattern is anchored or if we have passed the end of
+  the subject. */
+
+  if (anchored || start_match > end_subject) break;
+
+  /* If we have just passed a CR and we are now at a LF, and the pattern does
+  not contain any explicit matches for \r or \n, and the newline option is CRLF
+  or ANY or ANYCRLF, advance the match position by one more code unit. In
+  normal matching start_match will aways be greater than the first position at
+  this stage, but a failed *SKIP can cause a return at the same point, which is
+  why the first test exists. */
+
+  if (start_match > subject + start_offset &&
+      start_match[-1] == CHAR_CR &&
+      start_match < end_subject &&
+      *start_match == CHAR_NL &&
+      (re->flags & PCRE2_HASCRORLF) == 0 &&
+        (mb->nltype == NLTYPE_ANY ||
+         mb->nltype == NLTYPE_ANYCRLF ||
+         mb->nllen == 2))
+    start_match++;
+
+  mb->mark = NULL;   /* Reset for start of next match attempt */
+  }                  /* End of for(;;) "bumpalong" loop */
+
+/* ==========================================================================*/
+
+/* When we reach here, one of the following stopping conditions is true:
+
+(1) The match succeeded, either completely, or partially;
+
+(2) The pattern is anchored or the match was failed after (*COMMIT);
+
+(3) We are past the end of the subject or the bumpalong limit;
+
+(4) PCRE2_FIRSTLINE is set and we have failed to match at a newline, because
+    this option requests that a match occur at or before the first newline in
+    the subject.
+
+(5) Some kind of error occurred.
+
+*/
+
+ENDLOOP:
+
+/* If end_subject != true_end_subject, it means we are handling invalid UTF,
+and have just processed a non-terminal fragment. If this resulted in no match
+or a partial match we must carry on to the next fragment (a partial match is
+returned to the caller only at the very end of the subject). A loop is used to
+avoid trying to match against empty fragments; if the pattern can match an
+empty string it would have done so already. */
+
+#ifdef SUPPORT_UNICODE
+if (utf && end_subject != true_end_subject &&
+    (rc == MATCH_NOMATCH || rc == PCRE2_ERROR_PARTIAL))
+  {
+  for (;;)
+    {
+    /* Advance past the first bad code unit, and then skip invalid character
+    starting code units in 8-bit and 16-bit modes. */
+
+    start_match = end_subject + 1;
+
+#if PCRE2_CODE_UNIT_WIDTH != 32
+    while (start_match < true_end_subject && NOT_FIRSTCU(*start_match))
+      start_match++;
+#endif
+
+    /* If we have hit the end of the subject, there isn't another non-empty
+    fragment, so give up. */
+
+    if (start_match >= true_end_subject)
+      {
+      rc = MATCH_NOMATCH;  /* In case it was partial */
+      break;
+      }
+
+    /* Check the rest of the subject */
+
+    mb->check_subject = start_match;
+    rc = PRIV(valid_utf)(start_match, length - (start_match - subject),
+      &(match_data->startchar));
+
+    /* The rest of the subject is valid UTF. */
+
+    if (rc == 0)
+      {
+      mb->end_subject = end_subject = true_end_subject;
+      fragment_options = PCRE2_NOTBOL;
+      goto FRAGMENT_RESTART;
+      }
+
+    /* A subsequent UTF error has been found; if the next fragment is
+    non-empty, set up to process it. Otherwise, let the loop advance. */
+
+    else if (rc < 0)
+      {
+      mb->end_subject = end_subject = start_match + match_data->startchar;
+      if (end_subject > start_match)
+        {
+        fragment_options = PCRE2_NOTBOL|PCRE2_NOTEOL;
+        goto FRAGMENT_RESTART;
+        }
+      }
+    }
+  }
+#endif  /* SUPPORT_UNICODE */
+
+/* Release an enlarged frame vector that is on the heap. */
+
+if (mb->match_frames != mb->stack_frames)
+  mb->memctl.free(mb->match_frames, mb->memctl.memory_data);
+
+/* Fill in fields that are always returned in the match data. */
+
+match_data->code = re;
+match_data->mark = mb->mark;
+match_data->matchedby = PCRE2_MATCHEDBY_INTERPRETER;
+
+/* Handle a fully successful match. Set the return code to the number of
+captured strings, or 0 if there were too many to fit into the ovector, and then
+set the remaining returned values before returning. Make a copy of the subject
+string if requested. */
+
+if (rc == MATCH_MATCH)
+  {
+  match_data->rc = ((int)mb->end_offset_top >= 2 * match_data->oveccount)?
+    0 : (int)mb->end_offset_top/2 + 1;
+  match_data->startchar = start_match - subject;
+  match_data->leftchar = mb->start_used_ptr - subject;
+  match_data->rightchar = ((mb->last_used_ptr > mb->end_match_ptr)?
+    mb->last_used_ptr : mb->end_match_ptr) - subject;
+  if ((options & PCRE2_COPY_MATCHED_SUBJECT) != 0)
+    {
+    length = CU2BYTES(length + was_zero_terminated);
+    match_data->subject = match_data->memctl.malloc(length,
+      match_data->memctl.memory_data);
+    if (match_data->subject == NULL) return PCRE2_ERROR_NOMEMORY;
+    memcpy((void *)match_data->subject, subject, length);
+    match_data->flags |= PCRE2_MD_COPIED_SUBJECT;
+    }
+  else match_data->subject = subject;
+  return match_data->rc;
+  }
+
+/* Control gets here if there has been a partial match, an error, or if the
+overall match attempt has failed at all permitted starting positions. Any mark
+data is in the nomatch_mark field. */
+
+match_data->mark = mb->nomatch_mark;
+
+/* For anything other than nomatch or partial match, just return the code. */
+
+if (rc != MATCH_NOMATCH && rc != PCRE2_ERROR_PARTIAL) match_data->rc = rc;
+
+/* Handle a partial match. If a "soft" partial match was requested, searching
+for a complete match will have continued, and the value of rc at this point
+will be MATCH_NOMATCH. For a "hard" partial match, it will already be
+PCRE2_ERROR_PARTIAL. */
+
+else if (match_partial != NULL)
+  {
+  match_data->subject = subject;
+  match_data->ovector[0] = match_partial - subject;
+  match_data->ovector[1] = end_subject - subject;
+  match_data->startchar = match_partial - subject;
+  match_data->leftchar = start_partial - subject;
+  match_data->rightchar = end_subject - subject;
+  match_data->rc = PCRE2_ERROR_PARTIAL;
+  }
+
+/* Else this is the classic nomatch case. */
+
+else match_data->rc = PCRE2_ERROR_NOMATCH;
+
+return match_data->rc;
+}
+
+/* End of pcre2_match.c */
diff --git a/Foundation/src/pcre2_match_data.c b/Foundation/src/pcre2_match_data.c
new file mode 100644
index 000000000..2a69a9df1
--- /dev/null
+++ b/Foundation/src/pcre2_match_data.c
@@ -0,0 +1,163 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2019 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+
+/*************************************************
+*  Create a match data block given ovector size  *
+*************************************************/
+
+/* A minimum of 1 is imposed on the number of ovector pairs. */
+
+PCRE2_EXP_DEFN pcre2_match_data * PCRE2_CALL_CONVENTION
+pcre2_match_data_create(uint32_t oveccount, pcre2_general_context *gcontext)
+{
+pcre2_match_data *yield;
+if (oveccount < 1) oveccount = 1;
+yield = PRIV(memctl_malloc)(
+  offsetof(pcre2_match_data, ovector) + 2*oveccount*sizeof(PCRE2_SIZE),
+  (pcre2_memctl *)gcontext);
+if (yield == NULL) return NULL;
+yield->oveccount = oveccount;
+yield->flags = 0;
+return yield;
+}
+
+
+
+/*************************************************
+*  Create a match data block using pattern data  *
+*************************************************/
+
+/* If no context is supplied, use the memory allocator from the code. */
+
+PCRE2_EXP_DEFN pcre2_match_data * PCRE2_CALL_CONVENTION
+pcre2_match_data_create_from_pattern(const pcre2_code *code,
+  pcre2_general_context *gcontext)
+{
+if (gcontext == NULL) gcontext = (pcre2_general_context *)code;
+return pcre2_match_data_create(((pcre2_real_code *)code)->top_bracket + 1,
+  gcontext);
+}
+
+
+
+/*************************************************
+*            Free a match data block             *
+*************************************************/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_match_data_free(pcre2_match_data *match_data)
+{
+if (match_data != NULL)
+  {
+  if ((match_data->flags & PCRE2_MD_COPIED_SUBJECT) != 0)
+    match_data->memctl.free((void *)match_data->subject,
+      match_data->memctl.memory_data);
+  match_data->memctl.free(match_data, match_data->memctl.memory_data);
+  }
+}
+
+
+
+/*************************************************
+*         Get last mark in match                 *
+*************************************************/
+
+PCRE2_EXP_DEFN PCRE2_SPTR PCRE2_CALL_CONVENTION
+pcre2_get_mark(pcre2_match_data *match_data)
+{
+return match_data->mark;
+}
+
+
+
+/*************************************************
+*          Get pointer to ovector                *
+*************************************************/
+
+PCRE2_EXP_DEFN PCRE2_SIZE * PCRE2_CALL_CONVENTION
+pcre2_get_ovector_pointer(pcre2_match_data *match_data)
+{
+return match_data->ovector;
+}
+
+
+
+/*************************************************
+*          Get number of ovector slots           *
+*************************************************/
+
+PCRE2_EXP_DEFN uint32_t PCRE2_CALL_CONVENTION
+pcre2_get_ovector_count(pcre2_match_data *match_data)
+{
+return match_data->oveccount;
+}
+
+
+
+/*************************************************
+*         Get starting code unit in match        *
+*************************************************/
+
+PCRE2_EXP_DEFN PCRE2_SIZE PCRE2_CALL_CONVENTION
+pcre2_get_startchar(pcre2_match_data *match_data)
+{
+return match_data->startchar;
+}
+
+
+
+/*************************************************
+*         Get size of match data block           *
+*************************************************/
+
+PCRE2_EXP_DEFN PCRE2_SIZE PCRE2_CALL_CONVENTION
+pcre2_get_match_data_size(pcre2_match_data *match_data)
+{
+return offsetof(pcre2_match_data, ovector) +
+  2 * (match_data->oveccount) * sizeof(PCRE2_SIZE);
+}
+
+/* End of pcre2_match_data.c */
diff --git a/Foundation/src/pcre_newline.c b/Foundation/src/pcre2_newline.c
similarity index 64%
rename from Foundation/src/pcre_newline.c
rename to Foundation/src/pcre2_newline.c
index 08933bfc7..5e08e08fa 100644
--- a/Foundation/src/pcre_newline.c
+++ b/Foundation/src/pcre2_newline.c
@@ -6,7 +6,8 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+         New API code Copyright (c) 2016 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -41,14 +42,14 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This module contains internal functions for testing newlines when more than
 one kind of newline is to be recognized. When a newline is found, its length is
 returned. In principle, we could implement several newline "types", each
-referring to a different set of newline characters. At present, PCRE supports
+referring to a different set of newline characters. At present, PCRE2 supports
 only NLTYPE_FIXED, which gets handled without these functions, NLTYPE_ANYCRLF,
 and NLTYPE_ANY. The full list of Unicode newline characters is taken from
 http://unicode.org/unicode/reports/tr18/. */
 
 
-#include "pcre_config.h"
-#include "pcre_internal.h"
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
 
 
 
@@ -56,8 +57,10 @@ http://unicode.org/unicode/reports/tr18/. */
 *      Check for newline at given position       *
 *************************************************/
 
-/* It is guaranteed that the initial value of ptr is less than the end of the
-string that is being processed.
+/* This function is called only via the IS_NEWLINE macro, which does so only
+when the newline type is NLTYPE_ANY or NLTYPE_ANYCRLF. The case of a fixed
+newline (NLTYPE_FIXED) is handled inline. It is guaranteed that the code unit
+pointed to by ptr is less than the end of the string.
 
 Arguments:
   ptr          pointer to possible newline
@@ -70,28 +73,30 @@ Returns:       TRUE or FALSE
 */
 
 BOOL
-PRIV(is_newline)(PCRE_PUCHAR ptr, int type, PCRE_PUCHAR endptr, int *lenptr,
-  BOOL utf)
+PRIV(is_newline)(PCRE2_SPTR ptr, uint32_t type, PCRE2_SPTR endptr,
+  uint32_t *lenptr, BOOL utf)
 {
-pcre_uint32 c;
-(void)utf;
-#ifdef SUPPORT_UTF
-if (utf)
-  {
-  GETCHAR(c, ptr);
-  }
-else
-#endif  /* SUPPORT_UTF */
-  c = *ptr;
+uint32_t c;
 
-/* Note that this function is called only for ANY or ANYCRLF. */
+#ifdef SUPPORT_UNICODE
+if (utf) { GETCHAR(c, ptr); } else c = *ptr;
+#else
+(void)utf;
+c = *ptr;
+#endif  /* SUPPORT_UNICODE */
 
 if (type == NLTYPE_ANYCRLF) switch(c)
   {
-  case CHAR_LF: *lenptr = 1; return TRUE;
-  case CHAR_CR: *lenptr = (ptr < endptr - 1 && ptr[1] == CHAR_LF)? 2 : 1;
-               return TRUE;
-  default: return FALSE;
+  case CHAR_LF:
+  *lenptr = 1;
+  return TRUE;
+
+  case CHAR_CR:
+  *lenptr = (ptr < endptr - 1 && ptr[1] == CHAR_LF)? 2 : 1;
+  return TRUE;
+
+  default:
+  return FALSE;
   }
 
 /* NLTYPE_ANY */
@@ -103,25 +108,36 @@ else switch(c)
 #endif
   case CHAR_LF:
   case CHAR_VT:
-  case CHAR_FF: *lenptr = 1; return TRUE;
+  case CHAR_FF:
+  *lenptr = 1;
+  return TRUE;
 
   case CHAR_CR:
   *lenptr = (ptr < endptr - 1 && ptr[1] == CHAR_LF)? 2 : 1;
   return TRUE;
 
 #ifndef EBCDIC
-#ifdef COMPILE_PCRE8
-  case CHAR_NEL: *lenptr = utf? 2 : 1; return TRUE;
-  case 0x2028:                                       /* LS */
-  case 0x2029: *lenptr = 3; return TRUE;             /* PS */
-#else /* COMPILE_PCRE16 || COMPILE_PCRE32 */
+#if PCRE2_CODE_UNIT_WIDTH == 8
   case CHAR_NEL:
-  case 0x2028:                                       /* LS */
-  case 0x2029: *lenptr = 1; return TRUE;             /* PS */
-#endif  /* COMPILE_PCRE8 */
-#endif  /* Not EBCDIC */
+  *lenptr = utf? 2 : 1;
+  return TRUE;
 
-  default: return FALSE;
+  case 0x2028:   /* LS */
+  case 0x2029:   /* PS */
+  *lenptr = 3;
+  return TRUE;
+
+#else  /* 16-bit or 32-bit code units */
+  case CHAR_NEL:
+  case 0x2028:   /* LS */
+  case 0x2029:   /* PS */
+  *lenptr = 1;
+  return TRUE;
+#endif
+#endif /* Not EBCDIC */
+
+  default:
+  return FALSE;
   }
 }
 
@@ -131,8 +147,10 @@ else switch(c)
 *     Check for newline at previous position     *
 *************************************************/
 
-/* It is guaranteed that the initial value of ptr is greater than the start of
-the string that is being processed.
+/* This function is called only via the WAS_NEWLINE macro, which does so only
+when the newline type is NLTYPE_ANY or NLTYPE_ANYCRLF. The case of a fixed
+newline (NLTYPE_FIXED) is handled inline. It is guaranteed that the initial
+value of ptr is greater than the start of the string that is being processed.
 
 Arguments:
   ptr          pointer to possible newline
@@ -145,23 +163,23 @@ Returns:       TRUE or FALSE
 */
 
 BOOL
-PRIV(was_newline)(PCRE_PUCHAR ptr, int type, PCRE_PUCHAR startptr, int *lenptr,
-  BOOL utf)
+PRIV(was_newline)(PCRE2_SPTR ptr, uint32_t type, PCRE2_SPTR startptr,
+  uint32_t *lenptr, BOOL utf)
 {
-pcre_uint32 c;
-(void)utf;
+uint32_t c;
 ptr--;
-#ifdef SUPPORT_UTF
+
+#ifdef SUPPORT_UNICODE
 if (utf)
   {
   BACKCHAR(ptr);
   GETCHAR(c, ptr);
   }
-else
-#endif  /* SUPPORT_UTF */
-  c = *ptr;
-
-/* Note that this function is called only for ANY or ANYCRLF. */
+else c = *ptr;
+#else
+(void)utf;
+c = *ptr;
+#endif  /* SUPPORT_UNICODE */
 
 if (type == NLTYPE_ANYCRLF) switch(c)
   {
@@ -169,8 +187,12 @@ if (type == NLTYPE_ANYCRLF) switch(c)
   *lenptr = (ptr > startptr && ptr[-1] == CHAR_CR)? 2 : 1;
   return TRUE;
 
-  case CHAR_CR: *lenptr = 1; return TRUE;
-  default: return FALSE;
+  case CHAR_CR:
+  *lenptr = 1;
+  return TRUE;
+
+  default:
+  return FALSE;
   }
 
 /* NLTYPE_ANY */
@@ -186,22 +208,33 @@ else switch(c)
 #endif
   case CHAR_VT:
   case CHAR_FF:
-  case CHAR_CR: *lenptr = 1; return TRUE;
+  case CHAR_CR:
+  *lenptr = 1;
+  return TRUE;
 
 #ifndef EBCDIC
-#ifdef COMPILE_PCRE8
-  case CHAR_NEL: *lenptr = utf? 2 : 1; return TRUE;
-  case 0x2028:                                       /* LS */
-  case 0x2029: *lenptr = 3; return TRUE;             /* PS */
-#else /* COMPILE_PCRE16 || COMPILE_PCRE32 */
+#if PCRE2_CODE_UNIT_WIDTH == 8
   case CHAR_NEL:
-  case 0x2028:                                       /* LS */
-  case 0x2029: *lenptr = 1; return TRUE;             /* PS */
-#endif  /* COMPILE_PCRE8 */
-#endif  /* NotEBCDIC */
+  *lenptr = utf? 2 : 1;
+  return TRUE;
 
-  default: return FALSE;
+  case 0x2028:   /* LS */
+  case 0x2029:   /* PS */
+  *lenptr = 3;
+  return TRUE;
+
+#else /* 16-bit or 32-bit code units */
+  case CHAR_NEL:
+  case 0x2028:   /* LS */
+  case 0x2029:   /* PS */
+  *lenptr = 1;
+  return TRUE;
+#endif
+#endif /* Not EBCDIC */
+
+  default:
+  return FALSE;
   }
 }
 
-/* End of pcre_newline.c */
+/* End of pcre2_newline.c */
diff --git a/Foundation/src/pcre_ord2utf8.c b/Foundation/src/pcre2_ord2utf.c
similarity index 65%
rename from Foundation/src/pcre_ord2utf8.c
rename to Foundation/src/pcre2_ord2utf.c
index e69e7f835..75da597a9 100644
--- a/Foundation/src/pcre_ord2utf8.c
+++ b/Foundation/src/pcre2_ord2utf.c
@@ -6,7 +6,8 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+         New API code Copyright (c) 2016 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -37,38 +38,49 @@ POSSIBILITY OF SUCH DAMAGE.
 -----------------------------------------------------------------------------
 */
 
-#pragma warning( disable : 4244)  // conversion from 'int' to 'unsigned short', possible loss of data
 
-/* This file contains a private PCRE function that converts an ordinal
-character value into a UTF8 string. */
+/* This file contains a function that converts a Unicode character code point
+into a UTF string. The behaviour is different for each code unit width. */
 
-#include "pcre_config.h"
-#define COMPILE_PCRE8
 
-#include "pcre_internal.h"
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+/* If SUPPORT_UNICODE is not defined, this function will never be called.
+Supply a dummy function because some compilers do not like empty source
+modules. */
+
+#ifndef SUPPORT_UNICODE
+unsigned int
+PRIV(ord2utf)(uint32_t cvalue, PCRE2_UCHAR *buffer)
+{
+(void)(cvalue);
+(void)(buffer);
+return 0;
+}
+#else  /* SUPPORT_UNICODE */
+
 
 /*************************************************
-*       Convert character value to UTF-8         *
+*          Convert code point to UTF             *
 *************************************************/
 
-/* This function takes an integer value in the range 0 - 0x10ffff
-and encodes it as a UTF-8 character in 1 to 4 pcre_uchars.
-
+/*
 Arguments:
   cvalue     the character value
-  buffer     pointer to buffer for result - at least 6 pcre_uchars long
+  buffer     pointer to buffer for result
 
-Returns:     number of characters placed in the buffer
+Returns:     number of code units placed in the buffer
 */
 
-unsigned
-int
-PRIV(ord2utf)(pcre_uint32 cvalue, pcre_uchar *buffer)
+unsigned int
+PRIV(ord2utf)(uint32_t cvalue, PCRE2_UCHAR *buffer)
 {
-#ifdef SUPPORT_UTF
-
-register int i, j;
+/* Convert to UTF-8 */
 
+#if PCRE2_CODE_UNIT_WIDTH == 8
+int i, j;
 for (i = 0; i < PRIV(utf8_table1_size); i++)
   if ((int)cvalue <= PRIV(utf8_table1)[i]) break;
 buffer += i;
@@ -80,13 +92,26 @@ for (j = i; j > 0; j--)
 *buffer = PRIV(utf8_table2)[i] | cvalue;
 return i + 1;
 
+/* Convert to UTF-16 */
+
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+if (cvalue <= 0xffff)
+  {
+  *buffer = (PCRE2_UCHAR)cvalue;
+  return 1;
+  }
+cvalue -= 0x10000;
+*buffer++ = 0xd800 | (cvalue >> 10);
+*buffer = 0xdc00 | (cvalue & 0x3ff);
+return 2;
+
+/* Convert to UTF-32 */
+
 #else
-
-(void)(cvalue);  /* Keep compiler happy; this function won't ever be */
-(void)(buffer);  /* called when SUPPORT_UTF is not defined. */
-return 0;
-
+*buffer = (PCRE2_UCHAR)cvalue;
+return 1;
 #endif
 }
+#endif  /* SUPPORT_UNICODE */
 
-/* End of pcre_ord2utf8.c */
+/* End of pcre_ord2utf.c */
diff --git a/Foundation/src/pcre2_pattern_info.c b/Foundation/src/pcre2_pattern_info.c
new file mode 100644
index 000000000..bee3003a4
--- /dev/null
+++ b/Foundation/src/pcre2_pattern_info.c
@@ -0,0 +1,429 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2018 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+/*************************************************
+*        Return info about compiled pattern      *
+*************************************************/
+
+/*
+Arguments:
+  code          points to compiled code
+  what          what information is required
+  where         where to put the information; if NULL, return length
+
+Returns:        0 when data returned
+                > 0 when length requested
+                < 0 on error or unset value
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_pattern_info(const pcre2_code *code, uint32_t what, void *where)
+{
+const pcre2_real_code *re = (pcre2_real_code *)code;
+
+if (where == NULL)   /* Requests field length */
+  {
+  switch(what)
+    {
+    case PCRE2_INFO_ALLOPTIONS:
+    case PCRE2_INFO_ARGOPTIONS:
+    case PCRE2_INFO_BACKREFMAX:
+    case PCRE2_INFO_BSR:
+    case PCRE2_INFO_CAPTURECOUNT:
+    case PCRE2_INFO_DEPTHLIMIT:
+    case PCRE2_INFO_EXTRAOPTIONS:
+    case PCRE2_INFO_FIRSTCODETYPE:
+    case PCRE2_INFO_FIRSTCODEUNIT:
+    case PCRE2_INFO_HASBACKSLASHC:
+    case PCRE2_INFO_HASCRORLF:
+    case PCRE2_INFO_HEAPLIMIT:
+    case PCRE2_INFO_JCHANGED:
+    case PCRE2_INFO_LASTCODETYPE:
+    case PCRE2_INFO_LASTCODEUNIT:
+    case PCRE2_INFO_MATCHEMPTY:
+    case PCRE2_INFO_MATCHLIMIT:
+    case PCRE2_INFO_MAXLOOKBEHIND:
+    case PCRE2_INFO_MINLENGTH:
+    case PCRE2_INFO_NAMEENTRYSIZE:
+    case PCRE2_INFO_NAMECOUNT:
+    case PCRE2_INFO_NEWLINE:
+    return sizeof(uint32_t);
+
+    case PCRE2_INFO_FIRSTBITMAP:
+    return sizeof(const uint8_t *);
+
+    case PCRE2_INFO_JITSIZE:
+    case PCRE2_INFO_SIZE:
+    case PCRE2_INFO_FRAMESIZE:
+    return sizeof(size_t);
+
+    case PCRE2_INFO_NAMETABLE:
+    return sizeof(PCRE2_SPTR);
+    }
+  }
+
+if (re == NULL) return PCRE2_ERROR_NULL;
+
+/* Check that the first field in the block is the magic number. If it is not,
+return with PCRE2_ERROR_BADMAGIC. */
+
+if (re->magic_number != MAGIC_NUMBER) return PCRE2_ERROR_BADMAGIC;
+
+/* Check that this pattern was compiled in the correct bit mode */
+
+if ((re->flags & (PCRE2_CODE_UNIT_WIDTH/8)) == 0) return PCRE2_ERROR_BADMODE;
+
+switch(what)
+  {
+  case PCRE2_INFO_ALLOPTIONS:
+  *((uint32_t *)where) = re->overall_options;
+  break;
+
+  case PCRE2_INFO_ARGOPTIONS:
+  *((uint32_t *)where) = re->compile_options;
+  break;
+
+  case PCRE2_INFO_BACKREFMAX:
+  *((uint32_t *)where) = re->top_backref;
+  break;
+
+  case PCRE2_INFO_BSR:
+  *((uint32_t *)where) = re->bsr_convention;
+  break;
+
+  case PCRE2_INFO_CAPTURECOUNT:
+  *((uint32_t *)where) = re->top_bracket;
+  break;
+
+  case PCRE2_INFO_DEPTHLIMIT:
+  *((uint32_t *)where) = re->limit_depth;
+  if (re->limit_depth == UINT32_MAX) return PCRE2_ERROR_UNSET;
+  break;
+
+  case PCRE2_INFO_EXTRAOPTIONS:
+  *((uint32_t *)where) = re->extra_options;
+  break;
+
+  case PCRE2_INFO_FIRSTCODETYPE:
+  *((uint32_t *)where) = ((re->flags & PCRE2_FIRSTSET) != 0)? 1 :
+                         ((re->flags & PCRE2_STARTLINE) != 0)? 2 : 0;
+  break;
+
+  case PCRE2_INFO_FIRSTCODEUNIT:
+  *((uint32_t *)where) = ((re->flags & PCRE2_FIRSTSET) != 0)?
+    re->first_codeunit : 0;
+  break;
+
+  case PCRE2_INFO_FIRSTBITMAP:
+  *((const uint8_t **)where) = ((re->flags & PCRE2_FIRSTMAPSET) != 0)?
+    &(re->start_bitmap[0]) : NULL;
+  break;
+
+  case PCRE2_INFO_FRAMESIZE:
+  *((size_t *)where) = offsetof(heapframe, ovector) +
+    re->top_bracket * 2 * sizeof(PCRE2_SIZE);
+  break;
+
+  case PCRE2_INFO_HASBACKSLASHC:
+  *((uint32_t *)where) = (re->flags & PCRE2_HASBKC) != 0;
+  break;
+
+  case PCRE2_INFO_HASCRORLF:
+  *((uint32_t *)where) = (re->flags & PCRE2_HASCRORLF) != 0;
+  break;
+
+  case PCRE2_INFO_HEAPLIMIT:
+  *((uint32_t *)where) = re->limit_heap;
+  if (re->limit_heap == UINT32_MAX) return PCRE2_ERROR_UNSET;
+  break;
+
+  case PCRE2_INFO_JCHANGED:
+  *((uint32_t *)where) = (re->flags & PCRE2_JCHANGED) != 0;
+  break;
+
+  case PCRE2_INFO_JITSIZE:
+#ifdef SUPPORT_JIT
+  *((size_t *)where) = (re->executable_jit != NULL)?
+    PRIV(jit_get_size)(re->executable_jit) : 0;
+#else
+  *((size_t *)where) = 0;
+#endif
+  break;
+
+  case PCRE2_INFO_LASTCODETYPE:
+  *((uint32_t *)where) = ((re->flags & PCRE2_LASTSET) != 0)? 1 : 0;
+  break;
+
+  case PCRE2_INFO_LASTCODEUNIT:
+  *((uint32_t *)where) = ((re->flags & PCRE2_LASTSET) != 0)?
+    re->last_codeunit : 0;
+  break;
+
+  case PCRE2_INFO_MATCHEMPTY:
+  *((uint32_t *)where) = (re->flags & PCRE2_MATCH_EMPTY) != 0;
+  break;
+
+  case PCRE2_INFO_MATCHLIMIT:
+  *((uint32_t *)where) = re->limit_match;
+  if (re->limit_match == UINT32_MAX) return PCRE2_ERROR_UNSET;
+  break;
+
+  case PCRE2_INFO_MAXLOOKBEHIND:
+  *((uint32_t *)where) = re->max_lookbehind;
+  break;
+
+  case PCRE2_INFO_MINLENGTH:
+  *((uint32_t *)where) = re->minlength;
+  break;
+
+  case PCRE2_INFO_NAMEENTRYSIZE:
+  *((uint32_t *)where) = re->name_entry_size;
+  break;
+
+  case PCRE2_INFO_NAMECOUNT:
+  *((uint32_t *)where) = re->name_count;
+  break;
+
+  case PCRE2_INFO_NAMETABLE:
+  *((PCRE2_SPTR *)where) = (PCRE2_SPTR)((char *)re + sizeof(pcre2_real_code));
+  break;
+
+  case PCRE2_INFO_NEWLINE:
+  *((uint32_t *)where) = re->newline_convention;
+  break;
+
+  case PCRE2_INFO_SIZE:
+  *((size_t *)where) = re->blocksize;
+  break;
+
+  default: return PCRE2_ERROR_BADOPTION;
+  }
+
+return 0;
+}
+
+
+
+/*************************************************
+*              Callout enumerator                *
+*************************************************/
+
+/*
+Arguments:
+  code          points to compiled code
+  callback      function called for each callout block
+  callout_data  user data passed to the callback
+
+Returns:        0 when successfully completed
+                < 0 on local error
+               != 0 for callback error
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_callout_enumerate(const pcre2_code *code,
+  int (*callback)(pcre2_callout_enumerate_block *, void *), void *callout_data)
+{
+pcre2_real_code *re = (pcre2_real_code *)code;
+pcre2_callout_enumerate_block cb;
+PCRE2_SPTR cc;
+#ifdef SUPPORT_UNICODE
+BOOL utf;
+#endif
+
+if (re == NULL) return PCRE2_ERROR_NULL;
+
+#ifdef SUPPORT_UNICODE
+utf = (re->overall_options & PCRE2_UTF) != 0;
+#endif
+
+/* Check that the first field in the block is the magic number. If it is not,
+return with PCRE2_ERROR_BADMAGIC. */
+
+if (re->magic_number != MAGIC_NUMBER) return PCRE2_ERROR_BADMAGIC;
+
+/* Check that this pattern was compiled in the correct bit mode */
+
+if ((re->flags & (PCRE2_CODE_UNIT_WIDTH/8)) == 0) return PCRE2_ERROR_BADMODE;
+
+cb.version = 0;
+cc = (PCRE2_SPTR)((uint8_t *)re + sizeof(pcre2_real_code))
+     + re->name_count * re->name_entry_size;
+
+while (TRUE)
+  {
+  int rc;
+  switch (*cc)
+    {
+    case OP_END:
+    return 0;
+
+    case OP_CHAR:
+    case OP_CHARI:
+    case OP_NOT:
+    case OP_NOTI:
+    case OP_STAR:
+    case OP_MINSTAR:
+    case OP_PLUS:
+    case OP_MINPLUS:
+    case OP_QUERY:
+    case OP_MINQUERY:
+    case OP_UPTO:
+    case OP_MINUPTO:
+    case OP_EXACT:
+    case OP_POSSTAR:
+    case OP_POSPLUS:
+    case OP_POSQUERY:
+    case OP_POSUPTO:
+    case OP_STARI:
+    case OP_MINSTARI:
+    case OP_PLUSI:
+    case OP_MINPLUSI:
+    case OP_QUERYI:
+    case OP_MINQUERYI:
+    case OP_UPTOI:
+    case OP_MINUPTOI:
+    case OP_EXACTI:
+    case OP_POSSTARI:
+    case OP_POSPLUSI:
+    case OP_POSQUERYI:
+    case OP_POSUPTOI:
+    case OP_NOTSTAR:
+    case OP_NOTMINSTAR:
+    case OP_NOTPLUS:
+    case OP_NOTMINPLUS:
+    case OP_NOTQUERY:
+    case OP_NOTMINQUERY:
+    case OP_NOTUPTO:
+    case OP_NOTMINUPTO:
+    case OP_NOTEXACT:
+    case OP_NOTPOSSTAR:
+    case OP_NOTPOSPLUS:
+    case OP_NOTPOSQUERY:
+    case OP_NOTPOSUPTO:
+    case OP_NOTSTARI:
+    case OP_NOTMINSTARI:
+    case OP_NOTPLUSI:
+    case OP_NOTMINPLUSI:
+    case OP_NOTQUERYI:
+    case OP_NOTMINQUERYI:
+    case OP_NOTUPTOI:
+    case OP_NOTMINUPTOI:
+    case OP_NOTEXACTI:
+    case OP_NOTPOSSTARI:
+    case OP_NOTPOSPLUSI:
+    case OP_NOTPOSQUERYI:
+    case OP_NOTPOSUPTOI:
+    cc += PRIV(OP_lengths)[*cc];
+#ifdef SUPPORT_UNICODE
+    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+#endif
+    break;
+
+    case OP_TYPESTAR:
+    case OP_TYPEMINSTAR:
+    case OP_TYPEPLUS:
+    case OP_TYPEMINPLUS:
+    case OP_TYPEQUERY:
+    case OP_TYPEMINQUERY:
+    case OP_TYPEUPTO:
+    case OP_TYPEMINUPTO:
+    case OP_TYPEEXACT:
+    case OP_TYPEPOSSTAR:
+    case OP_TYPEPOSPLUS:
+    case OP_TYPEPOSQUERY:
+    case OP_TYPEPOSUPTO:
+    cc += PRIV(OP_lengths)[*cc];
+#ifdef SUPPORT_UNICODE
+    if (cc[-1] == OP_PROP || cc[-1] == OP_NOTPROP) cc += 2;
+#endif
+    break;
+
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
+    case OP_XCLASS:
+    cc += GET(cc, 1);
+    break;
+#endif
+
+    case OP_MARK:
+    case OP_COMMIT_ARG:
+    case OP_PRUNE_ARG:
+    case OP_SKIP_ARG:
+    case OP_THEN_ARG:
+    cc += PRIV(OP_lengths)[*cc] + cc[1];
+    break;
+
+    case OP_CALLOUT:
+    cb.pattern_position = GET(cc, 1);
+    cb.next_item_length = GET(cc, 1 + LINK_SIZE);
+    cb.callout_number = cc[1 + 2*LINK_SIZE];
+    cb.callout_string_offset = 0;
+    cb.callout_string_length = 0;
+    cb.callout_string = NULL;
+    rc = callback(&cb, callout_data);
+    if (rc != 0) return rc;
+    cc += PRIV(OP_lengths)[*cc];
+    break;
+
+    case OP_CALLOUT_STR:
+    cb.pattern_position = GET(cc, 1);
+    cb.next_item_length = GET(cc, 1 + LINK_SIZE);
+    cb.callout_number = 0;
+    cb.callout_string_offset = GET(cc, 1 + 3*LINK_SIZE);
+    cb.callout_string_length =
+      GET(cc, 1 + 2*LINK_SIZE) - (1 + 4*LINK_SIZE) - 2;
+    cb.callout_string = cc + (1 + 4*LINK_SIZE) + 1;
+    rc = callback(&cb, callout_data);
+    if (rc != 0) return rc;
+    cc += GET(cc, 1 + 2*LINK_SIZE);
+    break;
+
+    default:
+    cc += PRIV(OP_lengths)[*cc];
+    break;
+    }
+  }
+}
+
+/* End of pcre2_pattern_info.c */
diff --git a/Foundation/src/pcre2_script_run.c b/Foundation/src/pcre2_script_run.c
new file mode 100644
index 000000000..03eba29f0
--- /dev/null
+++ b/Foundation/src/pcre2_script_run.c
@@ -0,0 +1,341 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2021 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* This module contains the function for checking a script run. */
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+/*************************************************
+*                Check script run                *
+*************************************************/
+
+/* A script run is conceptually a sequence of characters all in the same
+Unicode script. However, it isn't quite that simple. There are special rules
+for scripts that are commonly used together, and also special rules for digits.
+This function implements the appropriate checks, which is possible only when
+PCRE2 is compiled with Unicode support. The function returns TRUE if there is
+no Unicode support; however, it should never be called in that circumstance
+because an error is given by pcre2_compile() if a script run is called for in a
+version of PCRE2 compiled without Unicode support.
+
+Arguments:
+  pgr       point to the first character
+  endptr    point after the last character
+  utf       TRUE if in UTF mode
+
+Returns:    TRUE if this is a valid script run
+*/
+
+/* These are states in the checking process. */
+
+enum { SCRIPT_UNSET,          /* Requirement as yet unknown */
+       SCRIPT_MAP,            /* Bitmap contains acceptable scripts */
+       SCRIPT_HANPENDING,     /* Have had only Han characters */
+       SCRIPT_HANHIRAKATA,    /* Expect Han or Hirikata */
+       SCRIPT_HANBOPOMOFO,    /* Expect Han or Bopomofo */
+       SCRIPT_HANHANGUL       /* Expect Han or Hangul */
+       };
+
+#define UCD_MAPSIZE (ucp_Unknown/32 + 1)
+#define FULL_MAPSIZE (ucp_Script_Count/32 + 1)
+
+BOOL
+PRIV(script_run)(PCRE2_SPTR ptr, PCRE2_SPTR endptr, BOOL utf)
+{
+#ifdef SUPPORT_UNICODE
+uint32_t require_state = SCRIPT_UNSET;
+uint32_t require_map[FULL_MAPSIZE];
+uint32_t map[FULL_MAPSIZE];
+uint32_t require_digitset = 0;
+uint32_t c;
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+(void)utf;    /* Avoid compiler warning */
+#endif
+
+/* Any string containing fewer than 2 characters is a valid script run. */
+
+if (ptr >= endptr) return TRUE;
+GETCHARINCTEST(c, ptr);
+if (ptr >= endptr) return TRUE;
+
+/* Initialize the require map. This is a full-size bitmap that has a bit for
+every script, as opposed to the maps in ucd_script_sets, which only have bits
+for scripts less than ucp_Unknown - those that appear in script extension
+lists. */
+
+for (int i = 0; i < FULL_MAPSIZE; i++) require_map[i] = 0;
+
+/* Scan strings of two or more characters, checking the Unicode characteristics
+of each code point. There is special code for scripts that can be combined with
+characters from the Han Chinese script. This may be used in conjunction with
+four other scripts in these combinations:
+
+. Han with Hiragana and Katakana is allowed (for Japanese).
+. Han with Bopomofo is allowed (for Taiwanese Mandarin).
+. Han with Hangul is allowed (for Korean).
+
+If the first significant character's script is one of the four, the required
+script type is immediately known. However, if the first significant
+character's script is Han, we have to keep checking for a non-Han character.
+Hence the SCRIPT_HANPENDING state. */
+
+for (;;)
+  {
+  const ucd_record *ucd = GET_UCD(c);
+  uint32_t script = ucd->script;
+
+  /* If the script is Unknown, the string is not a valid script run. Such
+  characters can only form script runs of length one (see test above). */
+
+  if (script == ucp_Unknown) return FALSE;
+
+  /* A character without any script extensions whose script is Inherited or
+  Common is always accepted with any script. If there are extensions, the
+  following processing happens for all scripts. */
+
+  if (UCD_SCRIPTX_PROP(ucd) != 0 || (script != ucp_Inherited && script != ucp_Common))
+    {
+    BOOL OK;
+
+    /* Set up a full-sized map for this character that can include bits for all
+    scripts. Copy the scriptx map for this character (which covers those
+    scripts that appear in script extension lists), set the remaining values to
+    zero, and then, except for Common or Inherited, add this script's bit to
+    the map. */
+
+    memcpy(map, PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(ucd), UCD_MAPSIZE * sizeof(uint32_t));
+    memset(map + UCD_MAPSIZE, 0, (FULL_MAPSIZE - UCD_MAPSIZE) * sizeof(uint32_t));
+    if (script != ucp_Common && script != ucp_Inherited) MAPSET(map, script);
+
+    /* Handle the different checking states */
+
+    switch(require_state)
+      {
+      /* First significant character - it might follow Common or Inherited
+      characters that do not have any script extensions. */
+
+      case SCRIPT_UNSET:
+      switch(script)
+        {
+        case ucp_Han:
+        require_state = SCRIPT_HANPENDING;
+        break;
+
+        case ucp_Hiragana:
+        case ucp_Katakana:
+        require_state = SCRIPT_HANHIRAKATA;
+        break;
+
+        case ucp_Bopomofo:
+        require_state = SCRIPT_HANBOPOMOFO;
+        break;
+
+        case ucp_Hangul:
+        require_state = SCRIPT_HANHANGUL;
+        break;
+
+        default:
+        memcpy(require_map, map, FULL_MAPSIZE * sizeof(uint32_t));
+        require_state = SCRIPT_MAP;
+        break;
+        }
+      break;
+
+      /* The first significant character was Han. An inspection of the Unicode
+      11.0.0 files shows that there are the following types of Script Extension
+      list that involve the Han, Bopomofo, Hiragana, Katakana, and Hangul
+      scripts:
+
+      . Bopomofo + Han
+      . Han + Hiragana + Katakana
+      . Hiragana + Katakana
+      . Bopopmofo + Hangul + Han + Hiragana + Katakana
+
+      The following code tries to make sense of this. */
+
+#define FOUND_BOPOMOFO 1
+#define FOUND_HIRAGANA 2
+#define FOUND_KATAKANA 4
+#define FOUND_HANGUL   8
+
+      case SCRIPT_HANPENDING:
+      if (script != ucp_Han)   /* Another Han does nothing */
+        {
+        uint32_t chspecial = 0;
+
+        if (MAPBIT(map, ucp_Bopomofo) != 0) chspecial |= FOUND_BOPOMOFO;
+        if (MAPBIT(map, ucp_Hiragana) != 0) chspecial |= FOUND_HIRAGANA;
+        if (MAPBIT(map, ucp_Katakana) != 0) chspecial |= FOUND_KATAKANA;
+        if (MAPBIT(map, ucp_Hangul) != 0)   chspecial |= FOUND_HANGUL;
+
+        if (chspecial == 0) return FALSE;   /* Not allowed with Han */
+
+        if (chspecial == FOUND_BOPOMOFO)
+          require_state = SCRIPT_HANBOPOMOFO;
+        else if (chspecial == (FOUND_HIRAGANA|FOUND_KATAKANA))
+          require_state = SCRIPT_HANHIRAKATA;
+
+        /* Otherwise this character must be allowed with all of them, so remain
+        in the pending state. */
+        }
+      break;
+
+      /* Previously encountered one of the "with Han" scripts. Check that
+      this character is appropriate. */
+
+      case SCRIPT_HANHIRAKATA:
+      if (MAPBIT(map, ucp_Han) + MAPBIT(map, ucp_Hiragana) +
+          MAPBIT(map, ucp_Katakana) == 0) return FALSE;
+      break;
+
+      case SCRIPT_HANBOPOMOFO:
+      if (MAPBIT(map, ucp_Han) + MAPBIT(map, ucp_Bopomofo) == 0) return FALSE;
+      break;
+
+      case SCRIPT_HANHANGUL:
+      if (MAPBIT(map, ucp_Han) + MAPBIT(map, ucp_Hangul) == 0) return FALSE;
+      break;
+
+      /* Previously encountered one or more characters that are allowed with a
+      list of scripts. */
+
+      case SCRIPT_MAP:
+      OK = FALSE;
+
+      for (int i = 0; i < FULL_MAPSIZE; i++)
+        {
+        if ((require_map[i] & map[i]) != 0)
+          {
+          OK = TRUE;
+          break;
+          }
+        }
+
+      if (!OK) return FALSE;
+
+      /* The rest of the string must be in this script, but we have to
+      allow for the Han complications. */
+
+      switch(script)
+        {
+        case ucp_Han:
+        require_state = SCRIPT_HANPENDING;
+        break;
+
+        case ucp_Hiragana:
+        case ucp_Katakana:
+        require_state = SCRIPT_HANHIRAKATA;
+        break;
+
+        case ucp_Bopomofo:
+        require_state = SCRIPT_HANBOPOMOFO;
+        break;
+
+        case ucp_Hangul:
+        require_state = SCRIPT_HANHANGUL;
+        break;
+
+        /* Compute the intersection of the required list of scripts and the
+        allowed scripts for this character. */
+
+        default:
+        for (int i = 0; i < FULL_MAPSIZE; i++) require_map[i] &= map[i];
+        break;
+        }
+
+      break;
+      }
+    }   /* End checking character's script and extensions. */
+
+  /* The character is in an acceptable script. We must now ensure that all
+  decimal digits in the string come from the same set. Some scripts (e.g.
+  Common, Arabic) have more than one set of decimal digits. This code does
+  not allow mixing sets, even within the same script. The vector called
+  PRIV(ucd_digit_sets)[] contains, in its first element, the number of
+  following elements, and then, in ascending order, the code points of the
+  '9' characters in every set of 10 digits. Each set is identified by the
+  offset in the vector of its '9' character. An initial check of the first
+  value picks up ASCII digits quickly. Otherwise, a binary chop is used. */
+
+  if (ucd->chartype == ucp_Nd)
+    {
+    uint32_t digitset;
+
+    if (c <= PRIV(ucd_digit_sets)[1]) digitset = 1; else
+      {
+      int mid;
+      int bot = 1;
+      int top = PRIV(ucd_digit_sets)[0];
+      for (;;)
+        {
+        if (top <= bot + 1)    /* <= rather than == is paranoia */
+          {
+          digitset = top;
+          break;
+          }
+        mid = (top + bot) / 2;
+        if (c <= PRIV(ucd_digit_sets)[mid]) top = mid; else bot = mid;
+        }
+      }
+
+    /* A required value of 0 means "unset". */
+
+    if (require_digitset == 0) require_digitset = digitset;
+      else if (digitset != require_digitset) return FALSE;
+    }   /* End digit handling */
+
+  /* If we haven't yet got to the end, pick up the next character. */
+
+  if (ptr >= endptr) return TRUE;
+  GETCHARINCTEST(c, ptr);
+  }  /* End checking loop */
+
+#else   /* NOT SUPPORT_UNICODE */
+(void)ptr;
+(void)endptr;
+(void)utf;
+return TRUE;
+#endif  /* SUPPORT_UNICODE */
+}
+
+/* End of pcre2_script_run.c */
diff --git a/Foundation/src/pcre2_serialize.c b/Foundation/src/pcre2_serialize.c
new file mode 100644
index 000000000..a56ffa1e8
--- /dev/null
+++ b/Foundation/src/pcre2_serialize.c
@@ -0,0 +1,282 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2020 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* This module contains functions for serializing and deserializing
+a sequence of compiled codes. */
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+/* Magic number to provide a small check against being handed junk. */
+
+#define SERIALIZED_DATA_MAGIC 0x50523253u
+
+/* Deserialization is limited to the current PCRE version and
+character width. */
+
+#define SERIALIZED_DATA_VERSION \
+  ((PCRE2_MAJOR) | ((PCRE2_MINOR) << 16))
+
+#define SERIALIZED_DATA_CONFIG \
+  (sizeof(PCRE2_UCHAR) | ((sizeof(void*)) << 8) | ((sizeof(PCRE2_SIZE)) << 16))
+
+
+
+/*************************************************
+*           Serialize compiled patterns          *
+*************************************************/
+
+PCRE2_EXP_DEFN int32_t PCRE2_CALL_CONVENTION
+pcre2_serialize_encode(const pcre2_code **codes, int32_t number_of_codes,
+   uint8_t **serialized_bytes, PCRE2_SIZE *serialized_size,
+   pcre2_general_context *gcontext)
+{
+uint8_t *bytes;
+uint8_t *dst_bytes;
+int32_t i;
+PCRE2_SIZE total_size;
+const pcre2_real_code *re;
+const uint8_t *tables;
+pcre2_serialized_data *data;
+
+const pcre2_memctl *memctl = (gcontext != NULL) ?
+  &gcontext->memctl : &PRIV(default_compile_context).memctl;
+
+if (codes == NULL || serialized_bytes == NULL || serialized_size == NULL)
+  return PCRE2_ERROR_NULL;
+
+if (number_of_codes <= 0) return PCRE2_ERROR_BADDATA;
+
+/* Compute total size. */
+total_size = sizeof(pcre2_serialized_data) + TABLES_LENGTH;
+tables = NULL;
+
+for (i = 0; i < number_of_codes; i++)
+  {
+  if (codes[i] == NULL) return PCRE2_ERROR_NULL;
+  re = (const pcre2_real_code *)(codes[i]);
+  if (re->magic_number != MAGIC_NUMBER) return PCRE2_ERROR_BADMAGIC;
+  if (tables == NULL)
+    tables = re->tables;
+  else if (tables != re->tables)
+    return PCRE2_ERROR_MIXEDTABLES;
+  total_size += re->blocksize;
+  }
+
+/* Initialize the byte stream. */
+bytes = memctl->malloc(total_size + sizeof(pcre2_memctl), memctl->memory_data);
+if (bytes == NULL) return PCRE2_ERROR_NOMEMORY;
+
+/* The controller is stored as a hidden parameter. */
+memcpy(bytes, memctl, sizeof(pcre2_memctl));
+bytes += sizeof(pcre2_memctl);
+
+data = (pcre2_serialized_data *)bytes;
+data->magic = SERIALIZED_DATA_MAGIC;
+data->version = SERIALIZED_DATA_VERSION;
+data->config = SERIALIZED_DATA_CONFIG;
+data->number_of_codes = number_of_codes;
+
+/* Copy all compiled code data. */
+dst_bytes = bytes + sizeof(pcre2_serialized_data);
+memcpy(dst_bytes, tables, TABLES_LENGTH);
+dst_bytes += TABLES_LENGTH;
+
+for (i = 0; i < number_of_codes; i++)
+  {
+  re = (const pcre2_real_code *)(codes[i]);
+  (void)memcpy(dst_bytes, (char *)re, re->blocksize);
+
+  /* Certain fields in the compiled code block are re-set during
+  deserialization. In order to ensure that the serialized data stream is always
+  the same for the same pattern, set them to zero here. We can't assume the
+  copy of the pattern is correctly aligned for accessing the fields as part of
+  a structure. Note the use of sizeof(void *) in the second of these, to
+  specify the size of a pointer. If sizeof(uint8_t *) is used (tables is a
+  pointer to uint8_t), gcc gives a warning because the first argument is also a
+  pointer to uint8_t. Casting the first argument to (void *) can stop this, but
+  it didn't stop Coverity giving the same complaint. */
+
+  (void)memset(dst_bytes + offsetof(pcre2_real_code, memctl), 0,
+    sizeof(pcre2_memctl));
+  (void)memset(dst_bytes + offsetof(pcre2_real_code, tables), 0,
+    sizeof(void *));
+  (void)memset(dst_bytes + offsetof(pcre2_real_code, executable_jit), 0,
+    sizeof(void *));
+
+  dst_bytes += re->blocksize;
+  }
+
+*serialized_bytes = bytes;
+*serialized_size = total_size;
+return number_of_codes;
+}
+
+
+/*************************************************
+*          Deserialize compiled patterns         *
+*************************************************/
+
+PCRE2_EXP_DEFN int32_t PCRE2_CALL_CONVENTION
+pcre2_serialize_decode(pcre2_code **codes, int32_t number_of_codes,
+   const uint8_t *bytes, pcre2_general_context *gcontext)
+{
+const pcre2_serialized_data *data = (const pcre2_serialized_data *)bytes;
+const pcre2_memctl *memctl = (gcontext != NULL) ?
+  &gcontext->memctl : &PRIV(default_compile_context).memctl;
+
+const uint8_t *src_bytes;
+pcre2_real_code *dst_re;
+uint8_t *tables;
+int32_t i, j;
+
+/* Sanity checks. */
+
+if (data == NULL || codes == NULL) return PCRE2_ERROR_NULL;
+if (number_of_codes <= 0) return PCRE2_ERROR_BADDATA;
+if (data->number_of_codes <= 0) return PCRE2_ERROR_BADSERIALIZEDDATA;
+if (data->magic != SERIALIZED_DATA_MAGIC) return PCRE2_ERROR_BADMAGIC;
+if (data->version != SERIALIZED_DATA_VERSION) return PCRE2_ERROR_BADMODE;
+if (data->config != SERIALIZED_DATA_CONFIG) return PCRE2_ERROR_BADMODE;
+
+if (number_of_codes > data->number_of_codes)
+  number_of_codes = data->number_of_codes;
+
+src_bytes = bytes + sizeof(pcre2_serialized_data);
+
+/* Decode tables. The reference count for the tables is stored immediately
+following them. */
+
+tables = memctl->malloc(TABLES_LENGTH + sizeof(PCRE2_SIZE), memctl->memory_data);
+if (tables == NULL) return PCRE2_ERROR_NOMEMORY;
+
+memcpy(tables, src_bytes, TABLES_LENGTH);
+*(PCRE2_SIZE *)(tables + TABLES_LENGTH) = number_of_codes;
+src_bytes += TABLES_LENGTH;
+
+/* Decode the byte stream. We must not try to read the size from the compiled
+code block in the stream, because it might be unaligned, which causes errors on
+hardware such as Sparc-64 that doesn't like unaligned memory accesses. The type
+of the blocksize field is given its own name to ensure that it is the same here
+as in the block. */
+
+for (i = 0; i < number_of_codes; i++)
+  {
+  CODE_BLOCKSIZE_TYPE blocksize;
+  memcpy(&blocksize, src_bytes + offsetof(pcre2_real_code, blocksize),
+    sizeof(CODE_BLOCKSIZE_TYPE));
+  if (blocksize <= sizeof(pcre2_real_code))
+    return PCRE2_ERROR_BADSERIALIZEDDATA;
+
+  /* The allocator provided by gcontext replaces the original one. */
+
+  dst_re = (pcre2_real_code *)PRIV(memctl_malloc)(blocksize,
+    (pcre2_memctl *)gcontext);
+  if (dst_re == NULL)
+    {
+    memctl->free(tables, memctl->memory_data);
+    for (j = 0; j < i; j++)
+      {
+      memctl->free(codes[j], memctl->memory_data);
+      codes[j] = NULL;
+      }
+    return PCRE2_ERROR_NOMEMORY;
+    }
+
+  /* The new allocator must be preserved. */
+
+  memcpy(((uint8_t *)dst_re) + sizeof(pcre2_memctl),
+    src_bytes + sizeof(pcre2_memctl), blocksize - sizeof(pcre2_memctl));
+  if (dst_re->magic_number != MAGIC_NUMBER ||
+      dst_re->name_entry_size > MAX_NAME_SIZE + IMM2_SIZE + 1 ||
+      dst_re->name_count > MAX_NAME_COUNT)
+    {
+    memctl->free(dst_re, memctl->memory_data);
+    return PCRE2_ERROR_BADSERIALIZEDDATA;
+    }
+
+  /* At the moment only one table is supported. */
+
+  dst_re->tables = tables;
+  dst_re->executable_jit = NULL;
+  dst_re->flags |= PCRE2_DEREF_TABLES;
+
+  codes[i] = dst_re;
+  src_bytes += blocksize;
+  }
+
+return number_of_codes;
+}
+
+
+/*************************************************
+*    Get the number of serialized patterns       *
+*************************************************/
+
+PCRE2_EXP_DEFN int32_t PCRE2_CALL_CONVENTION
+pcre2_serialize_get_number_of_codes(const uint8_t *bytes)
+{
+const pcre2_serialized_data *data = (const pcre2_serialized_data *)bytes;
+
+if (data == NULL) return PCRE2_ERROR_NULL;
+if (data->magic != SERIALIZED_DATA_MAGIC) return PCRE2_ERROR_BADMAGIC;
+if (data->version != SERIALIZED_DATA_VERSION) return PCRE2_ERROR_BADMODE;
+if (data->config != SERIALIZED_DATA_CONFIG) return PCRE2_ERROR_BADMODE;
+
+return data->number_of_codes;
+}
+
+
+/*************************************************
+*            Free the allocated stream           *
+*************************************************/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_serialize_free(uint8_t *bytes)
+{
+if (bytes != NULL)
+  {
+  pcre2_memctl *memctl = (pcre2_memctl *)(bytes - sizeof(pcre2_memctl));
+  memctl->free(memctl, memctl->memory_data);
+  }
+}
+
+/* End of pcre2_serialize.c */
diff --git a/Foundation/src/pcre2_string_utils.c b/Foundation/src/pcre2_string_utils.c
new file mode 100644
index 000000000..41f3d2673
--- /dev/null
+++ b/Foundation/src/pcre2_string_utils.c
@@ -0,0 +1,234 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2018-2021 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* This module contains internal functions for comparing and finding the length
+of strings. These are used instead of strcmp() etc because the standard
+functions work only on 8-bit data. */
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+/*************************************************
+*    Emulated memmove() for systems without it   *
+*************************************************/
+
+/* This function can make use of bcopy() if it is available. Otherwise do it by
+steam, as there some non-Unix environments that lack both memmove() and
+bcopy(). */
+
+#if !defined(VPCOMPAT) && !defined(HAVE_MEMMOVE)
+void *
+PRIV(memmove)(void *d, const void *s, size_t n)
+{
+#ifdef HAVE_BCOPY
+bcopy(s, d, n);
+return d;
+#else
+size_t i;
+unsigned char *dest = (unsigned char *)d;
+const unsigned char *src = (const unsigned char *)s;
+if (dest > src)
+  {
+  dest += n;
+  src += n;
+  for (i = 0; i < n; ++i) *(--dest) = *(--src);
+  return (void *)dest;
+  }
+else
+  {
+  for (i = 0; i < n; ++i) *dest++ = *src++;
+  return (void *)(dest - n);
+  }
+#endif   /* not HAVE_BCOPY */
+}
+#endif   /* not VPCOMPAT && not HAVE_MEMMOVE */
+
+
+/*************************************************
+*    Compare two zero-terminated PCRE2 strings   *
+*************************************************/
+
+/*
+Arguments:
+  str1        first string
+  str2        second string
+
+Returns:      0, 1, or -1
+*/
+
+int
+PRIV(strcmp)(PCRE2_SPTR str1, PCRE2_SPTR str2)
+{
+PCRE2_UCHAR c1, c2;
+while (*str1 != '\0' || *str2 != '\0')
+  {
+  c1 = *str1++;
+  c2 = *str2++;
+  if (c1 != c2) return ((c1 > c2) << 1) - 1;
+  }
+return 0;
+}
+
+
+/*************************************************
+*  Compare zero-terminated PCRE2 & 8-bit strings *
+*************************************************/
+
+/* As the 8-bit string is almost always a literal, its type is specified as
+const char *.
+
+Arguments:
+  str1        first string
+  str2        second string
+
+Returns:      0, 1, or -1
+*/
+
+int
+PRIV(strcmp_c8)(PCRE2_SPTR str1, const char *str2)
+{
+PCRE2_UCHAR c1, c2;
+while (*str1 != '\0' || *str2 != '\0')
+  {
+  c1 = *str1++;
+  c2 = *str2++;
+  if (c1 != c2) return ((c1 > c2) << 1) - 1;
+  }
+return 0;
+}
+
+
+/*************************************************
+*    Compare two PCRE2 strings, given a length   *
+*************************************************/
+
+/*
+Arguments:
+  str1        first string
+  str2        second string
+  len         the length
+
+Returns:      0, 1, or -1
+*/
+
+int
+PRIV(strncmp)(PCRE2_SPTR str1, PCRE2_SPTR str2, size_t len)
+{
+PCRE2_UCHAR c1, c2;
+for (; len > 0; len--)
+  {
+  c1 = *str1++;
+  c2 = *str2++;
+  if (c1 != c2) return ((c1 > c2) << 1) - 1;
+  }
+return 0;
+}
+
+
+/*************************************************
+* Compare PCRE2 string to 8-bit string by length *
+*************************************************/
+
+/* As the 8-bit string is almost always a literal, its type is specified as
+const char *.
+
+Arguments:
+  str1        first string
+  str2        second string
+  len         the length
+
+Returns:      0, 1, or -1
+*/
+
+int
+PRIV(strncmp_c8)(PCRE2_SPTR str1, const char *str2, size_t len)
+{
+PCRE2_UCHAR c1, c2;
+for (; len > 0; len--)
+  {
+  c1 = *str1++;
+  c2 = *str2++;
+  if (c1 != c2) return ((c1 > c2) << 1) - 1;
+  }
+return 0;
+}
+
+
+/*************************************************
+*        Find the length of a PCRE2 string       *
+*************************************************/
+
+/*
+Argument:    the string
+Returns:     the length
+*/
+
+PCRE2_SIZE
+PRIV(strlen)(PCRE2_SPTR str)
+{
+PCRE2_SIZE c = 0;
+while (*str++ != 0) c++;
+return c;
+}
+
+
+/*************************************************
+* Copy 8-bit 0-terminated string to PCRE2 string *
+*************************************************/
+
+/* Arguments:
+  str1     buffer to receive the string
+  str2     8-bit string to be copied
+
+Returns:   the number of code units used (excluding trailing zero)
+*/
+
+PCRE2_SIZE
+PRIV(strcpy_c8)(PCRE2_UCHAR *str1, const char *str2)
+{
+PCRE2_UCHAR *t = str1;
+while (*str2 != 0) *t++ = *str2++;
+*t = 0;
+return t - str1;
+}
+
+/* End of pcre2_string_utils.c */
diff --git a/Foundation/src/pcre2_study.c b/Foundation/src/pcre2_study.c
new file mode 100644
index 000000000..0f5a64ea2
--- /dev/null
+++ b/Foundation/src/pcre2_study.c
@@ -0,0 +1,1822 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2021 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* This module contains functions for scanning a compiled pattern and
+collecting data (e.g. minimum matching length). */
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+/* The maximum remembered capturing brackets minimum. */
+
+#define MAX_CACHE_BACKREF 128
+
+/* Set a bit in the starting code unit bit map. */
+
+#define SET_BIT(c) re->start_bitmap[(c)/8] |= (1u << ((c)&7))
+
+/* Returns from set_start_bits() */
+
+enum { SSB_FAIL, SSB_DONE, SSB_CONTINUE, SSB_UNKNOWN, SSB_TOODEEP };
+
+
+/*************************************************
+*   Find the minimum subject length for a group  *
+*************************************************/
+
+/* Scan a parenthesized group and compute the minimum length of subject that
+is needed to match it. This is a lower bound; it does not mean there is a
+string of that length that matches. In UTF mode, the result is in characters
+rather than code units. The field in a compiled pattern for storing the minimum
+length is 16-bits long (on the grounds that anything longer than that is
+pathological), so we give up when we reach that amount. This also means that
+integer overflow for really crazy patterns cannot happen.
+
+Backreference minimum lengths are cached to speed up multiple references. This
+function is called only when the highest back reference in the pattern is less
+than or equal to MAX_CACHE_BACKREF, which is one less than the size of the
+caching vector. The zeroth element contains the number of the highest set
+value.
+
+Arguments:
+  re              compiled pattern block
+  code            pointer to start of group (the bracket)
+  startcode       pointer to start of the whole pattern's code
+  utf             UTF flag
+  recurses        chain of recurse_check to catch mutual recursion
+  countptr        pointer to call count (to catch over complexity)
+  backref_cache   vector for caching back references.
+
+This function is no longer called when the pattern contains (*ACCEPT); however,
+the old code for returning -1 is retained, just in case.
+
+Returns:   the minimum length
+           -1 \C in UTF-8 mode
+              or (*ACCEPT)
+              or pattern too complicated
+           -2 internal error (missing capturing bracket)
+           -3 internal error (opcode not listed)
+*/
+
+static int
+find_minlength(const pcre2_real_code *re, PCRE2_SPTR code,
+  PCRE2_SPTR startcode, BOOL utf, recurse_check *recurses, int *countptr,
+  int *backref_cache)
+{
+int length = -1;
+int branchlength = 0;
+int prev_cap_recno = -1;
+int prev_cap_d = 0;
+int prev_recurse_recno = -1;
+int prev_recurse_d = 0;
+uint32_t once_fudge = 0;
+BOOL had_recurse = FALSE;
+BOOL dupcapused = (re->flags & PCRE2_DUPCAPUSED) != 0;
+PCRE2_SPTR nextbranch = code + GET(code, 1);
+PCRE2_UCHAR *cc = (PCRE2_UCHAR *)code + 1 + LINK_SIZE;
+recurse_check this_recurse;
+
+/* If this is a "could be empty" group, its minimum length is 0. */
+
+if (*code >= OP_SBRA && *code <= OP_SCOND) return 0;
+
+/* Skip over capturing bracket number */
+
+if (*code == OP_CBRA || *code == OP_CBRAPOS) cc += IMM2_SIZE;
+
+/* A large and/or complex regex can take too long to process. */
+
+if ((*countptr)++ > 1000) return -1;
+
+/* Scan along the opcodes for this branch. If we get to the end of the branch,
+check the length against that of the other branches. If the accumulated length
+passes 16-bits, reset to that value and skip the rest of the branch. */
+
+for (;;)
+  {
+  int d, min, recno;
+  PCRE2_UCHAR op, *cs, *ce;
+
+  if (branchlength >= UINT16_MAX)
+    {
+    branchlength = UINT16_MAX;
+    cc = (PCRE2_UCHAR *)nextbranch;
+    }
+
+  op = *cc;
+  switch (op)
+    {
+    case OP_COND:
+    case OP_SCOND:
+
+    /* If there is only one branch in a condition, the implied branch has zero
+    length, so we don't add anything. This covers the DEFINE "condition"
+    automatically. If there are two branches we can treat it the same as any
+    other non-capturing subpattern. */
+
+    cs = cc + GET(cc, 1);
+    if (*cs != OP_ALT)
+      {
+      cc = cs + 1 + LINK_SIZE;
+      break;
+      }
+    goto PROCESS_NON_CAPTURE;
+
+    case OP_BRA:
+    /* There's a special case of OP_BRA, when it is wrapped round a repeated
+    OP_RECURSE. We'd like to process the latter at this level so that
+    remembering the value works for repeated cases. So we do nothing, but
+    set a fudge value to skip over the OP_KET after the recurse. */
+
+    if (cc[1+LINK_SIZE] == OP_RECURSE && cc[2*(1+LINK_SIZE)] == OP_KET)
+      {
+      once_fudge = 1 + LINK_SIZE;
+      cc += 1 + LINK_SIZE;
+      break;
+      }
+    /* Fall through */
+
+    case OP_ONCE:
+    case OP_SCRIPT_RUN:
+    case OP_SBRA:
+    case OP_BRAPOS:
+    case OP_SBRAPOS:
+    PROCESS_NON_CAPTURE:
+    d = find_minlength(re, cc, startcode, utf, recurses, countptr,
+      backref_cache);
+    if (d < 0) return d;
+    branchlength += d;
+    do cc += GET(cc, 1); while (*cc == OP_ALT);
+    cc += 1 + LINK_SIZE;
+    break;
+
+    /* To save time for repeated capturing subpatterns, we remember the
+    length of the previous one. Unfortunately we can't do the same for
+    the unnumbered ones above. Nor can we do this if (?| is present in the
+    pattern because captures with the same number are not then identical. */
+
+    case OP_CBRA:
+    case OP_SCBRA:
+    case OP_CBRAPOS:
+    case OP_SCBRAPOS:
+    recno = (int)GET2(cc, 1+LINK_SIZE);
+    if (dupcapused || recno != prev_cap_recno)
+      {
+      prev_cap_recno = recno;
+      prev_cap_d = find_minlength(re, cc, startcode, utf, recurses, countptr,
+        backref_cache);
+      if (prev_cap_d < 0) return prev_cap_d;
+      }
+    branchlength += prev_cap_d;
+    do cc += GET(cc, 1); while (*cc == OP_ALT);
+    cc += 1 + LINK_SIZE;
+    break;
+
+    /* ACCEPT makes things far too complicated; we have to give up. In fact,
+    from 10.34 onwards, if a pattern contains (*ACCEPT), this function is not
+    used. However, leave the code in place, just in case. */
+
+    case OP_ACCEPT:
+    case OP_ASSERT_ACCEPT:
+    return -1;
+
+    /* Reached end of a branch; if it's a ket it is the end of a nested
+    call. If it's ALT it is an alternation in a nested call. If it is END it's
+    the end of the outer call. All can be handled by the same code. If the
+    length of any branch is zero, there is no need to scan any subsequent
+    branches. */
+
+    case OP_ALT:
+    case OP_KET:
+    case OP_KETRMAX:
+    case OP_KETRMIN:
+    case OP_KETRPOS:
+    case OP_END:
+    if (length < 0 || (!had_recurse && branchlength < length))
+      length = branchlength;
+    if (op != OP_ALT || length == 0) return length;
+    nextbranch = cc + GET(cc, 1);
+    cc += 1 + LINK_SIZE;
+    branchlength = 0;
+    had_recurse = FALSE;
+    break;
+
+    /* Skip over assertive subpatterns */
+
+    case OP_ASSERT:
+    case OP_ASSERT_NOT:
+    case OP_ASSERTBACK:
+    case OP_ASSERTBACK_NOT:
+    case OP_ASSERT_NA:
+    case OP_ASSERTBACK_NA:
+    do cc += GET(cc, 1); while (*cc == OP_ALT);
+    /* Fall through */
+
+    /* Skip over things that don't match chars */
+
+    case OP_REVERSE:
+    case OP_CREF:
+    case OP_DNCREF:
+    case OP_RREF:
+    case OP_DNRREF:
+    case OP_FALSE:
+    case OP_TRUE:
+    case OP_CALLOUT:
+    case OP_SOD:
+    case OP_SOM:
+    case OP_EOD:
+    case OP_EODN:
+    case OP_CIRC:
+    case OP_CIRCM:
+    case OP_DOLL:
+    case OP_DOLLM:
+    case OP_NOT_WORD_BOUNDARY:
+    case OP_WORD_BOUNDARY:
+    cc += PRIV(OP_lengths)[*cc];
+    break;
+
+    case OP_CALLOUT_STR:
+    cc += GET(cc, 1 + 2*LINK_SIZE);
+    break;
+
+    /* Skip over a subpattern that has a {0} or {0,x} quantifier */
+
+    case OP_BRAZERO:
+    case OP_BRAMINZERO:
+    case OP_BRAPOSZERO:
+    case OP_SKIPZERO:
+    cc += PRIV(OP_lengths)[*cc];
+    do cc += GET(cc, 1); while (*cc == OP_ALT);
+    cc += 1 + LINK_SIZE;
+    break;
+
+    /* Handle literal characters and + repetitions */
+
+    case OP_CHAR:
+    case OP_CHARI:
+    case OP_NOT:
+    case OP_NOTI:
+    case OP_PLUS:
+    case OP_PLUSI:
+    case OP_MINPLUS:
+    case OP_MINPLUSI:
+    case OP_POSPLUS:
+    case OP_POSPLUSI:
+    case OP_NOTPLUS:
+    case OP_NOTPLUSI:
+    case OP_NOTMINPLUS:
+    case OP_NOTMINPLUSI:
+    case OP_NOTPOSPLUS:
+    case OP_NOTPOSPLUSI:
+    branchlength++;
+    cc += 2;
+#ifdef SUPPORT_UNICODE
+    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+#endif
+    break;
+
+    case OP_TYPEPLUS:
+    case OP_TYPEMINPLUS:
+    case OP_TYPEPOSPLUS:
+    branchlength++;
+    cc += (cc[1] == OP_PROP || cc[1] == OP_NOTPROP)? 4 : 2;
+    break;
+
+    /* Handle exact repetitions. The count is already in characters, but we
+    may need to skip over a multibyte character in UTF mode.  */
+
+    case OP_EXACT:
+    case OP_EXACTI:
+    case OP_NOTEXACT:
+    case OP_NOTEXACTI:
+    branchlength += GET2(cc,1);
+    cc += 2 + IMM2_SIZE;
+#ifdef SUPPORT_UNICODE
+    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+#endif
+    break;
+
+    case OP_TYPEEXACT:
+    branchlength += GET2(cc,1);
+    cc += 2 + IMM2_SIZE + ((cc[1 + IMM2_SIZE] == OP_PROP
+      || cc[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
+    break;
+
+    /* Handle single-char non-literal matchers */
+
+    case OP_PROP:
+    case OP_NOTPROP:
+    cc += 2;
+    /* Fall through */
+
+    case OP_NOT_DIGIT:
+    case OP_DIGIT:
+    case OP_NOT_WHITESPACE:
+    case OP_WHITESPACE:
+    case OP_NOT_WORDCHAR:
+    case OP_WORDCHAR:
+    case OP_ANY:
+    case OP_ALLANY:
+    case OP_EXTUNI:
+    case OP_HSPACE:
+    case OP_NOT_HSPACE:
+    case OP_VSPACE:
+    case OP_NOT_VSPACE:
+    branchlength++;
+    cc++;
+    break;
+
+    /* "Any newline" might match two characters, but it also might match just
+    one. */
+
+    case OP_ANYNL:
+    branchlength += 1;
+    cc++;
+    break;
+
+    /* The single-byte matcher means we can't proceed in UTF mode. (In
+    non-UTF mode \C will actually be turned into OP_ALLANY, so won't ever
+    appear, but leave the code, just in case.) */
+
+    case OP_ANYBYTE:
+#ifdef SUPPORT_UNICODE
+    if (utf) return -1;
+#endif
+    branchlength++;
+    cc++;
+    break;
+
+    /* For repeated character types, we have to test for \p and \P, which have
+    an extra two bytes of parameters. */
+
+    case OP_TYPESTAR:
+    case OP_TYPEMINSTAR:
+    case OP_TYPEQUERY:
+    case OP_TYPEMINQUERY:
+    case OP_TYPEPOSSTAR:
+    case OP_TYPEPOSQUERY:
+    if (cc[1] == OP_PROP || cc[1] == OP_NOTPROP) cc += 2;
+    cc += PRIV(OP_lengths)[op];
+    break;
+
+    case OP_TYPEUPTO:
+    case OP_TYPEMINUPTO:
+    case OP_TYPEPOSUPTO:
+    if (cc[1 + IMM2_SIZE] == OP_PROP
+      || cc[1 + IMM2_SIZE] == OP_NOTPROP) cc += 2;
+    cc += PRIV(OP_lengths)[op];
+    break;
+
+    /* Check a class for variable quantification */
+
+    case OP_CLASS:
+    case OP_NCLASS:
+#ifdef SUPPORT_WIDE_CHARS
+    case OP_XCLASS:
+    /* The original code caused an unsigned overflow in 64 bit systems,
+    so now we use a conditional statement. */
+    if (op == OP_XCLASS)
+      cc += GET(cc, 1);
+    else
+      cc += PRIV(OP_lengths)[OP_CLASS];
+#else
+    cc += PRIV(OP_lengths)[OP_CLASS];
+#endif
+
+    switch (*cc)
+      {
+      case OP_CRPLUS:
+      case OP_CRMINPLUS:
+      case OP_CRPOSPLUS:
+      branchlength++;
+      /* Fall through */
+
+      case OP_CRSTAR:
+      case OP_CRMINSTAR:
+      case OP_CRQUERY:
+      case OP_CRMINQUERY:
+      case OP_CRPOSSTAR:
+      case OP_CRPOSQUERY:
+      cc++;
+      break;
+
+      case OP_CRRANGE:
+      case OP_CRMINRANGE:
+      case OP_CRPOSRANGE:
+      branchlength += GET2(cc,1);
+      cc += 1 + 2 * IMM2_SIZE;
+      break;
+
+      default:
+      branchlength++;
+      break;
+      }
+    break;
+
+    /* Backreferences and subroutine calls (OP_RECURSE) are treated in the same
+    way: we find the minimum length for the subpattern. A recursion
+    (backreference or subroutine) causes an a flag to be set that causes the
+    length of this branch to be ignored. The logic is that a recursion can only
+    make sense if there is another alternative that stops the recursing. That
+    will provide the minimum length (when no recursion happens).
+
+    If PCRE2_MATCH_UNSET_BACKREF is set, a backreference to an unset bracket
+    matches an empty string (by default it causes a matching failure), so in
+    that case we must set the minimum length to zero.
+
+    For backreferenes, if duplicate numbers are present in the pattern we check
+    for a reference to a duplicate. If it is, we don't know which version will
+    be referenced, so we have to set the minimum length to zero. */
+
+    /* Duplicate named pattern back reference. */
+
+    case OP_DNREF:
+    case OP_DNREFI:
+    if (!dupcapused && (re->overall_options & PCRE2_MATCH_UNSET_BACKREF) == 0)
+      {
+      int count = GET2(cc, 1+IMM2_SIZE);
+      PCRE2_UCHAR *slot =
+        (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code)) +
+          GET2(cc, 1) * re->name_entry_size;
+
+      d = INT_MAX;
+
+      /* Scan all groups with the same name; find the shortest. */
+
+      while (count-- > 0)
+        {
+        int dd, i;
+        recno = GET2(slot, 0);
+
+        if (recno <= backref_cache[0] && backref_cache[recno] >= 0)
+          dd = backref_cache[recno];
+        else
+          {
+          ce = cs = (PCRE2_UCHAR *)PRIV(find_bracket)(startcode, utf, recno);
+          if (cs == NULL) return -2;
+          do ce += GET(ce, 1); while (*ce == OP_ALT);
+
+          dd = 0;
+          if (!dupcapused ||
+              (PCRE2_UCHAR *)PRIV(find_bracket)(ce, utf, recno) == NULL)
+            {
+            if (cc > cs && cc < ce)    /* Simple recursion */
+              {
+              had_recurse = TRUE;
+              }
+            else
+              {
+              recurse_check *r = recurses;
+              for (r = recurses; r != NULL; r = r->prev)
+                if (r->group == cs) break;
+              if (r != NULL)           /* Mutual recursion */
+                {
+                had_recurse = TRUE;
+                }
+              else
+                {
+                this_recurse.prev = recurses;  /* No recursion */
+                this_recurse.group = cs;
+                dd = find_minlength(re, cs, startcode, utf, &this_recurse,
+                  countptr, backref_cache);
+                if (dd < 0) return dd;
+                }
+              }
+            }
+
+          backref_cache[recno] = dd;
+          for (i = backref_cache[0] + 1; i < recno; i++) backref_cache[i] = -1;
+          backref_cache[0] = recno;
+          }
+
+        if (dd < d) d = dd;
+        if (d <= 0) break;    /* No point looking at any more */
+        slot += re->name_entry_size;
+        }
+      }
+    else d = 0;
+    cc += 1 + 2*IMM2_SIZE;
+    goto REPEAT_BACK_REFERENCE;
+
+    /* Single back reference by number. References by name are converted to by
+    number when there is no duplication. */
+
+    case OP_REF:
+    case OP_REFI:
+    recno = GET2(cc, 1);
+    if (recno <= backref_cache[0] && backref_cache[recno] >= 0)
+      d = backref_cache[recno];
+    else
+      {
+      int i;
+      d = 0;
+
+      if ((re->overall_options & PCRE2_MATCH_UNSET_BACKREF) == 0)
+        {
+        ce = cs = (PCRE2_UCHAR *)PRIV(find_bracket)(startcode, utf, recno);
+        if (cs == NULL) return -2;
+        do ce += GET(ce, 1); while (*ce == OP_ALT);
+
+        if (!dupcapused ||
+            (PCRE2_UCHAR *)PRIV(find_bracket)(ce, utf, recno) == NULL)
+          {
+          if (cc > cs && cc < ce)    /* Simple recursion */
+            {
+            had_recurse = TRUE;
+            }
+          else
+            {
+            recurse_check *r = recurses;
+            for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
+            if (r != NULL)           /* Mutual recursion */
+              {
+              had_recurse = TRUE;
+              }
+            else                     /* No recursion */
+              {
+              this_recurse.prev = recurses;
+              this_recurse.group = cs;
+              d = find_minlength(re, cs, startcode, utf, &this_recurse, countptr,
+                backref_cache);
+              if (d < 0) return d;
+              }
+            }
+          }
+        }
+
+      backref_cache[recno] = d;
+      for (i = backref_cache[0] + 1; i < recno; i++) backref_cache[i] = -1;
+      backref_cache[0] = recno;
+      }
+
+    cc += 1 + IMM2_SIZE;
+
+    /* Handle repeated back references */
+
+    REPEAT_BACK_REFERENCE:
+    switch (*cc)
+      {
+      case OP_CRSTAR:
+      case OP_CRMINSTAR:
+      case OP_CRQUERY:
+      case OP_CRMINQUERY:
+      case OP_CRPOSSTAR:
+      case OP_CRPOSQUERY:
+      min = 0;
+      cc++;
+      break;
+
+      case OP_CRPLUS:
+      case OP_CRMINPLUS:
+      case OP_CRPOSPLUS:
+      min = 1;
+      cc++;
+      break;
+
+      case OP_CRRANGE:
+      case OP_CRMINRANGE:
+      case OP_CRPOSRANGE:
+      min = GET2(cc, 1);
+      cc += 1 + 2 * IMM2_SIZE;
+      break;
+
+      default:
+      min = 1;
+      break;
+      }
+
+     /* Take care not to overflow: (1) min and d are ints, so check that their
+     product is not greater than INT_MAX. (2) branchlength is limited to
+     UINT16_MAX (checked at the top of the loop). */
+
+    if ((d > 0 && (INT_MAX/d) < min) || UINT16_MAX - branchlength < min*d)
+      branchlength = UINT16_MAX;
+    else branchlength += min * d;
+    break;
+
+    /* Recursion always refers to the first occurrence of a subpattern with a
+    given number. Therefore, we can always make use of caching, even when the
+    pattern contains multiple subpatterns with the same number. */
+
+    case OP_RECURSE:
+    cs = ce = (PCRE2_UCHAR *)startcode + GET(cc, 1);
+    recno = GET2(cs, 1+LINK_SIZE);
+    if (recno == prev_recurse_recno)
+      {
+      branchlength += prev_recurse_d;
+      }
+    else
+      {
+      do ce += GET(ce, 1); while (*ce == OP_ALT);
+      if (cc > cs && cc < ce)    /* Simple recursion */
+        had_recurse = TRUE;
+      else
+        {
+        recurse_check *r = recurses;
+        for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
+        if (r != NULL)          /* Mutual recursion */
+          had_recurse = TRUE;
+        else
+          {
+          this_recurse.prev = recurses;
+          this_recurse.group = cs;
+          prev_recurse_d = find_minlength(re, cs, startcode, utf, &this_recurse,
+            countptr, backref_cache);
+          if (prev_recurse_d < 0) return prev_recurse_d;
+          prev_recurse_recno = recno;
+          branchlength += prev_recurse_d;
+          }
+        }
+      }
+    cc += 1 + LINK_SIZE + once_fudge;
+    once_fudge = 0;
+    break;
+
+    /* Anything else does not or need not match a character. We can get the
+    item's length from the table, but for those that can match zero occurrences
+    of a character, we must take special action for UTF-8 characters. As it
+    happens, the "NOT" versions of these opcodes are used at present only for
+    ASCII characters, so they could be omitted from this list. However, in
+    future that may change, so we include them here so as not to leave a
+    gotcha for a future maintainer. */
+
+    case OP_UPTO:
+    case OP_UPTOI:
+    case OP_NOTUPTO:
+    case OP_NOTUPTOI:
+    case OP_MINUPTO:
+    case OP_MINUPTOI:
+    case OP_NOTMINUPTO:
+    case OP_NOTMINUPTOI:
+    case OP_POSUPTO:
+    case OP_POSUPTOI:
+    case OP_NOTPOSUPTO:
+    case OP_NOTPOSUPTOI:
+
+    case OP_STAR:
+    case OP_STARI:
+    case OP_NOTSTAR:
+    case OP_NOTSTARI:
+    case OP_MINSTAR:
+    case OP_MINSTARI:
+    case OP_NOTMINSTAR:
+    case OP_NOTMINSTARI:
+    case OP_POSSTAR:
+    case OP_POSSTARI:
+    case OP_NOTPOSSTAR:
+    case OP_NOTPOSSTARI:
+
+    case OP_QUERY:
+    case OP_QUERYI:
+    case OP_NOTQUERY:
+    case OP_NOTQUERYI:
+    case OP_MINQUERY:
+    case OP_MINQUERYI:
+    case OP_NOTMINQUERY:
+    case OP_NOTMINQUERYI:
+    case OP_POSQUERY:
+    case OP_POSQUERYI:
+    case OP_NOTPOSQUERY:
+    case OP_NOTPOSQUERYI:
+
+    cc += PRIV(OP_lengths)[op];
+#ifdef SUPPORT_UNICODE
+    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+#endif
+    break;
+
+    /* Skip these, but we need to add in the name length. */
+
+    case OP_MARK:
+    case OP_COMMIT_ARG:
+    case OP_PRUNE_ARG:
+    case OP_SKIP_ARG:
+    case OP_THEN_ARG:
+    cc += PRIV(OP_lengths)[op] + cc[1];
+    break;
+
+    /* The remaining opcodes are just skipped over. */
+
+    case OP_CLOSE:
+    case OP_COMMIT:
+    case OP_FAIL:
+    case OP_PRUNE:
+    case OP_SET_SOM:
+    case OP_SKIP:
+    case OP_THEN:
+    cc += PRIV(OP_lengths)[op];
+    break;
+
+    /* This should not occur: we list all opcodes explicitly so that when
+    new ones get added they are properly considered. */
+
+    default:
+    return -3;
+    }
+  }
+/* Control never gets here */
+}
+
+
+
+/*************************************************
+*      Set a bit and maybe its alternate case    *
+*************************************************/
+
+/* Given a character, set its first code unit's bit in the table, and also the
+corresponding bit for the other version of a letter if we are caseless.
+
+Arguments:
+  re            points to the regex block
+  p             points to the first code unit of the character
+  caseless      TRUE if caseless
+  utf           TRUE for UTF mode
+  ucp           TRUE for UCP mode
+
+Returns:        pointer after the character
+*/
+
+static PCRE2_SPTR
+set_table_bit(pcre2_real_code *re, PCRE2_SPTR p, BOOL caseless, BOOL utf,
+  BOOL ucp)
+{
+uint32_t c = *p++;   /* First code unit */
+
+(void)utf;           /* Stop compiler warnings when UTF not supported */
+(void)ucp;
+
+/* In 16-bit and 32-bit modes, code units greater than 0xff set the bit for
+0xff. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 8
+if (c > 0xff) SET_BIT(0xff); else
+#endif
+
+SET_BIT(c);
+
+/* In UTF-8 or UTF-16 mode, pick up the remaining code units in order to find
+the end of the character, even when caseless. */
+
+#ifdef SUPPORT_UNICODE
+if (utf)
+  {
+#if PCRE2_CODE_UNIT_WIDTH == 8
+  if (c >= 0xc0) GETUTF8INC(c, p);
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+  if ((c & 0xfc00) == 0xd800) GETUTF16INC(c, p);
+#endif
+  }
+#endif  /* SUPPORT_UNICODE */
+
+/* If caseless, handle the other case of the character. */
+
+if (caseless)
+  {
+#ifdef SUPPORT_UNICODE
+  if (utf || ucp)
+    {
+    c = UCD_OTHERCASE(c);
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    if (utf)
+      {
+      PCRE2_UCHAR buff[6];
+      (void)PRIV(ord2utf)(c, buff);
+      SET_BIT(buff[0]);
+      }
+    else if (c < 256) SET_BIT(c);
+#else  /* 16-bit or 32-bit mode */
+    if (c > 0xff) SET_BIT(0xff); else SET_BIT(c);
+#endif
+    }
+
+  else
+#endif  /* SUPPORT_UNICODE */
+
+  /* Not UTF or UCP */
+
+  if (MAX_255(c)) SET_BIT(re->tables[fcc_offset + c]);
+  }
+
+return p;
+}
+
+
+
+/*************************************************
+*     Set bits for a positive character type     *
+*************************************************/
+
+/* This function sets starting bits for a character type. In UTF-8 mode, we can
+only do a direct setting for bytes less than 128, as otherwise there can be
+confusion with bytes in the middle of UTF-8 characters. In a "traditional"
+environment, the tables will only recognize ASCII characters anyway, but in at
+least one Windows environment, some higher bytes bits were set in the tables.
+So we deal with that case by considering the UTF-8 encoding.
+
+Arguments:
+  re             the regex block
+  cbit type      the type of character wanted
+  table_limit    32 for non-UTF-8; 16 for UTF-8
+
+Returns:         nothing
+*/
+
+static void
+set_type_bits(pcre2_real_code *re, int cbit_type, unsigned int table_limit)
+{
+uint32_t c;
+for (c = 0; c < table_limit; c++)
+  re->start_bitmap[c] |= re->tables[c+cbits_offset+cbit_type];
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+if (table_limit == 32) return;
+for (c = 128; c < 256; c++)
+  {
+  if ((re->tables[cbits_offset + c/8] & (1u << (c&7))) != 0)
+    {
+    PCRE2_UCHAR buff[6];
+    (void)PRIV(ord2utf)(c, buff);
+    SET_BIT(buff[0]);
+    }
+  }
+#endif  /* UTF-8 */
+}
+
+
+/*************************************************
+*     Set bits for a negative character type     *
+*************************************************/
+
+/* This function sets starting bits for a negative character type such as \D.
+In UTF-8 mode, we can only do a direct setting for bytes less than 128, as
+otherwise there can be confusion with bytes in the middle of UTF-8 characters.
+Unlike in the positive case, where we can set appropriate starting bits for
+specific high-valued UTF-8 characters, in this case we have to set the bits for
+all high-valued characters. The lowest is 0xc2, but we overkill by starting at
+0xc0 (192) for simplicity.
+
+Arguments:
+  re             the regex block
+  cbit type      the type of character wanted
+  table_limit    32 for non-UTF-8; 16 for UTF-8
+
+Returns:         nothing
+*/
+
+static void
+set_nottype_bits(pcre2_real_code *re, int cbit_type, unsigned int table_limit)
+{
+uint32_t c;
+for (c = 0; c < table_limit; c++)
+  re->start_bitmap[c] |= (uint8_t)(~(re->tables[c+cbits_offset+cbit_type]));
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+if (table_limit != 32) for (c = 24; c < 32; c++) re->start_bitmap[c] = 0xff;
+#endif
+}
+
+
+
+/*************************************************
+*      Create bitmap of starting code units      *
+*************************************************/
+
+/* This function scans a compiled unanchored expression recursively and
+attempts to build a bitmap of the set of possible starting code units whose
+values are less than 256. In 16-bit and 32-bit mode, values above 255 all cause
+the 255 bit to be set. When calling set[_not]_type_bits() in UTF-8 (sic) mode
+we pass a value of 16 rather than 32 as the final argument. (See comments in
+those functions for the reason.)
+
+The SSB_CONTINUE return is useful for parenthesized groups in patterns such as
+(a*)b where the group provides some optional starting code units but scanning
+must continue at the outer level to find at least one mandatory code unit. At
+the outermost level, this function fails unless the result is SSB_DONE.
+
+We restrict recursion (for nested groups) to 1000 to avoid stack overflow
+issues.
+
+Arguments:
+  re           points to the compiled regex block
+  code         points to an expression
+  utf          TRUE if in UTF mode
+  ucp          TRUE if in UCP mode
+  depthptr     pointer to recurse depth
+
+Returns:       SSB_FAIL     => Failed to find any starting code units
+               SSB_DONE     => Found mandatory starting code units
+               SSB_CONTINUE => Found optional starting code units
+               SSB_UNKNOWN  => Hit an unrecognized opcode
+               SSB_TOODEEP  => Recursion is too deep
+*/
+
+static int
+set_start_bits(pcre2_real_code *re, PCRE2_SPTR code, BOOL utf, BOOL ucp,
+  int *depthptr)
+{
+uint32_t c;
+int yield = SSB_DONE;
+
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+int table_limit = utf? 16:32;
+#else
+int table_limit = 32;
+#endif
+
+*depthptr += 1;
+if (*depthptr > 1000) return SSB_TOODEEP;
+
+do
+  {
+  BOOL try_next = TRUE;
+  PCRE2_SPTR tcode = code + 1 + LINK_SIZE;
+
+  if (*code == OP_CBRA || *code == OP_SCBRA ||
+      *code == OP_CBRAPOS || *code == OP_SCBRAPOS) tcode += IMM2_SIZE;
+
+  while (try_next)    /* Loop for items in this branch */
+    {
+    int rc;
+    uint8_t *classmap = NULL;
+#ifdef SUPPORT_WIDE_CHARS
+    PCRE2_UCHAR xclassflags;
+#endif
+
+    switch(*tcode)
+      {
+      /* If we reach something we don't understand, it means a new opcode has
+      been created that hasn't been added to this function. Hopefully this
+      problem will be discovered during testing. */
+
+      default:
+      return SSB_UNKNOWN;
+
+      /* Fail for a valid opcode that implies no starting bits. */
+
+      case OP_ACCEPT:
+      case OP_ASSERT_ACCEPT:
+      case OP_ALLANY:
+      case OP_ANY:
+      case OP_ANYBYTE:
+      case OP_CIRCM:
+      case OP_CLOSE:
+      case OP_COMMIT:
+      case OP_COMMIT_ARG:
+      case OP_COND:
+      case OP_CREF:
+      case OP_FALSE:
+      case OP_TRUE:
+      case OP_DNCREF:
+      case OP_DNREF:
+      case OP_DNREFI:
+      case OP_DNRREF:
+      case OP_DOLL:
+      case OP_DOLLM:
+      case OP_END:
+      case OP_EOD:
+      case OP_EODN:
+      case OP_EXTUNI:
+      case OP_FAIL:
+      case OP_MARK:
+      case OP_NOT:
+      case OP_NOTEXACT:
+      case OP_NOTEXACTI:
+      case OP_NOTI:
+      case OP_NOTMINPLUS:
+      case OP_NOTMINPLUSI:
+      case OP_NOTMINQUERY:
+      case OP_NOTMINQUERYI:
+      case OP_NOTMINSTAR:
+      case OP_NOTMINSTARI:
+      case OP_NOTMINUPTO:
+      case OP_NOTMINUPTOI:
+      case OP_NOTPLUS:
+      case OP_NOTPLUSI:
+      case OP_NOTPOSPLUS:
+      case OP_NOTPOSPLUSI:
+      case OP_NOTPOSQUERY:
+      case OP_NOTPOSQUERYI:
+      case OP_NOTPOSSTAR:
+      case OP_NOTPOSSTARI:
+      case OP_NOTPOSUPTO:
+      case OP_NOTPOSUPTOI:
+      case OP_NOTPROP:
+      case OP_NOTQUERY:
+      case OP_NOTQUERYI:
+      case OP_NOTSTAR:
+      case OP_NOTSTARI:
+      case OP_NOTUPTO:
+      case OP_NOTUPTOI:
+      case OP_NOT_HSPACE:
+      case OP_NOT_VSPACE:
+      case OP_PRUNE:
+      case OP_PRUNE_ARG:
+      case OP_RECURSE:
+      case OP_REF:
+      case OP_REFI:
+      case OP_REVERSE:
+      case OP_RREF:
+      case OP_SCOND:
+      case OP_SET_SOM:
+      case OP_SKIP:
+      case OP_SKIP_ARG:
+      case OP_SOD:
+      case OP_SOM:
+      case OP_THEN:
+      case OP_THEN_ARG:
+      return SSB_FAIL;
+
+      /* OP_CIRC happens only at the start of an anchored branch (multiline ^
+      uses OP_CIRCM). Skip over it. */
+
+      case OP_CIRC:
+      tcode += PRIV(OP_lengths)[OP_CIRC];
+      break;
+
+      /* A "real" property test implies no starting bits, but the fake property
+      PT_CLIST identifies a list of characters. These lists are short, as they
+      are used for characters with more than one "other case", so there is no
+      point in recognizing them for OP_NOTPROP. */
+
+      case OP_PROP:
+      if (tcode[1] != PT_CLIST) return SSB_FAIL;
+        {
+        const uint32_t *p = PRIV(ucd_caseless_sets) + tcode[2];
+        while ((c = *p++) < NOTACHAR)
+          {
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+          if (utf)
+            {
+            PCRE2_UCHAR buff[6];
+            (void)PRIV(ord2utf)(c, buff);
+            c = buff[0];
+            }
+#endif
+          if (c > 0xff) SET_BIT(0xff); else SET_BIT(c);
+          }
+        }
+      try_next = FALSE;
+      break;
+
+      /* We can ignore word boundary tests. */
+
+      case OP_WORD_BOUNDARY:
+      case OP_NOT_WORD_BOUNDARY:
+      tcode++;
+      break;
+
+      /* If we hit a bracket or a positive lookahead assertion, recurse to set
+      bits from within the subpattern. If it can't find anything, we have to
+      give up. If it finds some mandatory character(s), we are done for this
+      branch. Otherwise, carry on scanning after the subpattern. */
+
+      case OP_BRA:
+      case OP_SBRA:
+      case OP_CBRA:
+      case OP_SCBRA:
+      case OP_BRAPOS:
+      case OP_SBRAPOS:
+      case OP_CBRAPOS:
+      case OP_SCBRAPOS:
+      case OP_ONCE:
+      case OP_SCRIPT_RUN:
+      case OP_ASSERT:
+      case OP_ASSERT_NA:
+      rc = set_start_bits(re, tcode, utf, ucp, depthptr);
+      if (rc == SSB_DONE)
+        {
+        try_next = FALSE;
+        }
+      else if (rc == SSB_CONTINUE)
+        {
+        do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
+        tcode += 1 + LINK_SIZE;
+        }
+      else return rc;   /* FAIL, UNKNOWN, or TOODEEP */
+      break;
+
+      /* If we hit ALT or KET, it means we haven't found anything mandatory in
+      this branch, though we might have found something optional. For ALT, we
+      continue with the next alternative, but we have to arrange that the final
+      result from subpattern is SSB_CONTINUE rather than SSB_DONE. For KET,
+      return SSB_CONTINUE: if this is the top level, that indicates failure,
+      but after a nested subpattern, it causes scanning to continue. */
+
+      case OP_ALT:
+      yield = SSB_CONTINUE;
+      try_next = FALSE;
+      break;
+
+      case OP_KET:
+      case OP_KETRMAX:
+      case OP_KETRMIN:
+      case OP_KETRPOS:
+      return SSB_CONTINUE;
+
+      /* Skip over callout */
+
+      case OP_CALLOUT:
+      tcode += PRIV(OP_lengths)[OP_CALLOUT];
+      break;
+
+      case OP_CALLOUT_STR:
+      tcode += GET(tcode, 1 + 2*LINK_SIZE);
+      break;
+
+      /* Skip over lookbehind and negative lookahead assertions */
+
+      case OP_ASSERT_NOT:
+      case OP_ASSERTBACK:
+      case OP_ASSERTBACK_NOT:
+      case OP_ASSERTBACK_NA:
+      do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
+      tcode += 1 + LINK_SIZE;
+      break;
+
+      /* BRAZERO does the bracket, but carries on. */
+
+      case OP_BRAZERO:
+      case OP_BRAMINZERO:
+      case OP_BRAPOSZERO:
+      rc = set_start_bits(re, ++tcode, utf, ucp, depthptr);
+      if (rc == SSB_FAIL || rc == SSB_UNKNOWN || rc == SSB_TOODEEP) return rc;
+      do tcode += GET(tcode,1); while (*tcode == OP_ALT);
+      tcode += 1 + LINK_SIZE;
+      break;
+
+      /* SKIPZERO skips the bracket. */
+
+      case OP_SKIPZERO:
+      tcode++;
+      do tcode += GET(tcode,1); while (*tcode == OP_ALT);
+      tcode += 1 + LINK_SIZE;
+      break;
+
+      /* Single-char * or ? sets the bit and tries the next item */
+
+      case OP_STAR:
+      case OP_MINSTAR:
+      case OP_POSSTAR:
+      case OP_QUERY:
+      case OP_MINQUERY:
+      case OP_POSQUERY:
+      tcode = set_table_bit(re, tcode + 1, FALSE, utf, ucp);
+      break;
+
+      case OP_STARI:
+      case OP_MINSTARI:
+      case OP_POSSTARI:
+      case OP_QUERYI:
+      case OP_MINQUERYI:
+      case OP_POSQUERYI:
+      tcode = set_table_bit(re, tcode + 1, TRUE, utf, ucp);
+      break;
+
+      /* Single-char upto sets the bit and tries the next */
+
+      case OP_UPTO:
+      case OP_MINUPTO:
+      case OP_POSUPTO:
+      tcode = set_table_bit(re, tcode + 1 + IMM2_SIZE, FALSE, utf, ucp);
+      break;
+
+      case OP_UPTOI:
+      case OP_MINUPTOI:
+      case OP_POSUPTOI:
+      tcode = set_table_bit(re, tcode + 1 + IMM2_SIZE, TRUE, utf, ucp);
+      break;
+
+      /* At least one single char sets the bit and stops */
+
+      case OP_EXACT:
+      tcode += IMM2_SIZE;
+      /* Fall through */
+      case OP_CHAR:
+      case OP_PLUS:
+      case OP_MINPLUS:
+      case OP_POSPLUS:
+      (void)set_table_bit(re, tcode + 1, FALSE, utf, ucp);
+      try_next = FALSE;
+      break;
+
+      case OP_EXACTI:
+      tcode += IMM2_SIZE;
+      /* Fall through */
+      case OP_CHARI:
+      case OP_PLUSI:
+      case OP_MINPLUSI:
+      case OP_POSPLUSI:
+      (void)set_table_bit(re, tcode + 1, TRUE, utf, ucp);
+      try_next = FALSE;
+      break;
+
+      /* Special spacing and line-terminating items. These recognize specific
+      lists of characters. The difference between VSPACE and ANYNL is that the
+      latter can match the two-character CRLF sequence, but that is not
+      relevant for finding the first character, so their code here is
+      identical. */
+
+      case OP_HSPACE:
+      SET_BIT(CHAR_HT);
+      SET_BIT(CHAR_SPACE);
+
+      /* For the 16-bit and 32-bit libraries (which can never be EBCDIC), set
+      the bits for 0xA0 and for code units >= 255, independently of UTF. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 8
+      SET_BIT(0xA0);
+      SET_BIT(0xFF);
+#else
+      /* For the 8-bit library in UTF-8 mode, set the bits for the first code
+      units of horizontal space characters. */
+
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        SET_BIT(0xC2);  /* For U+00A0 */
+        SET_BIT(0xE1);  /* For U+1680, U+180E */
+        SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */
+        SET_BIT(0xE3);  /* For U+3000 */
+        }
+      else
+#endif
+      /* For the 8-bit library not in UTF-8 mode, set the bit for 0xA0, unless
+      the code is EBCDIC. */
+        {
+#ifndef EBCDIC
+        SET_BIT(0xA0);
+#endif  /* Not EBCDIC */
+        }
+#endif  /* 8-bit support */
+
+      try_next = FALSE;
+      break;
+
+      case OP_ANYNL:
+      case OP_VSPACE:
+      SET_BIT(CHAR_LF);
+      SET_BIT(CHAR_VT);
+      SET_BIT(CHAR_FF);
+      SET_BIT(CHAR_CR);
+
+      /* For the 16-bit and 32-bit libraries (which can never be EBCDIC), set
+      the bits for NEL and for code units >= 255, independently of UTF. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 8
+      SET_BIT(CHAR_NEL);
+      SET_BIT(0xFF);
+#else
+      /* For the 8-bit library in UTF-8 mode, set the bits for the first code
+      units of vertical space characters. */
+
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        SET_BIT(0xC2);  /* For U+0085 (NEL) */
+        SET_BIT(0xE2);  /* For U+2028, U+2029 */
+        }
+      else
+#endif
+      /* For the 8-bit library not in UTF-8 mode, set the bit for NEL. */
+        {
+        SET_BIT(CHAR_NEL);
+        }
+#endif  /* 8-bit support */
+
+      try_next = FALSE;
+      break;
+
+      /* Single character types set the bits and stop. Note that if PCRE2_UCP
+      is set, we do not see these opcodes because \d etc are converted to
+      properties. Therefore, these apply in the case when only characters less
+      than 256 are recognized to match the types. */
+
+      case OP_NOT_DIGIT:
+      set_nottype_bits(re, cbit_digit, table_limit);
+      try_next = FALSE;
+      break;
+
+      case OP_DIGIT:
+      set_type_bits(re, cbit_digit, table_limit);
+      try_next = FALSE;
+      break;
+
+      case OP_NOT_WHITESPACE:
+      set_nottype_bits(re, cbit_space, table_limit);
+      try_next = FALSE;
+      break;
+
+      case OP_WHITESPACE:
+      set_type_bits(re, cbit_space, table_limit);
+      try_next = FALSE;
+      break;
+
+      case OP_NOT_WORDCHAR:
+      set_nottype_bits(re, cbit_word, table_limit);
+      try_next = FALSE;
+      break;
+
+      case OP_WORDCHAR:
+      set_type_bits(re, cbit_word, table_limit);
+      try_next = FALSE;
+      break;
+
+      /* One or more character type fudges the pointer and restarts, knowing
+      it will hit a single character type and stop there. */
+
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      case OP_TYPEPOSPLUS:
+      tcode++;
+      break;
+
+      case OP_TYPEEXACT:
+      tcode += 1 + IMM2_SIZE;
+      break;
+
+      /* Zero or more repeats of character types set the bits and then
+      try again. */
+
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEPOSUPTO:
+      tcode += IMM2_SIZE;  /* Fall through */
+
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPOSSTAR:
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSQUERY:
+      switch(tcode[1])
+        {
+        default:
+        case OP_ANY:
+        case OP_ALLANY:
+        return SSB_FAIL;
+
+        case OP_HSPACE:
+        SET_BIT(CHAR_HT);
+        SET_BIT(CHAR_SPACE);
+
+        /* For the 16-bit and 32-bit libraries (which can never be EBCDIC), set
+        the bits for 0xA0 and for code units >= 255, independently of UTF. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 8
+        SET_BIT(0xA0);
+        SET_BIT(0xFF);
+#else
+        /* For the 8-bit library in UTF-8 mode, set the bits for the first code
+        units of horizontal space characters. */
+
+#ifdef SUPPORT_UNICODE
+        if (utf)
+          {
+          SET_BIT(0xC2);  /* For U+00A0 */
+          SET_BIT(0xE1);  /* For U+1680, U+180E */
+          SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */
+          SET_BIT(0xE3);  /* For U+3000 */
+          }
+        else
+#endif
+        /* For the 8-bit library not in UTF-8 mode, set the bit for 0xA0, unless
+        the code is EBCDIC. */
+          {
+#ifndef EBCDIC
+          SET_BIT(0xA0);
+#endif  /* Not EBCDIC */
+          }
+#endif  /* 8-bit support */
+        break;
+
+        case OP_ANYNL:
+        case OP_VSPACE:
+        SET_BIT(CHAR_LF);
+        SET_BIT(CHAR_VT);
+        SET_BIT(CHAR_FF);
+        SET_BIT(CHAR_CR);
+
+        /* For the 16-bit and 32-bit libraries (which can never be EBCDIC), set
+        the bits for NEL and for code units >= 255, independently of UTF. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 8
+        SET_BIT(CHAR_NEL);
+        SET_BIT(0xFF);
+#else
+        /* For the 8-bit library in UTF-8 mode, set the bits for the first code
+        units of vertical space characters. */
+
+#ifdef SUPPORT_UNICODE
+        if (utf)
+          {
+          SET_BIT(0xC2);  /* For U+0085 (NEL) */
+          SET_BIT(0xE2);  /* For U+2028, U+2029 */
+          }
+        else
+#endif
+        /* For the 8-bit library not in UTF-8 mode, set the bit for NEL. */
+          {
+          SET_BIT(CHAR_NEL);
+          }
+#endif  /* 8-bit support */
+        break;
+
+        case OP_NOT_DIGIT:
+        set_nottype_bits(re, cbit_digit, table_limit);
+        break;
+
+        case OP_DIGIT:
+        set_type_bits(re, cbit_digit, table_limit);
+        break;
+
+        case OP_NOT_WHITESPACE:
+        set_nottype_bits(re, cbit_space, table_limit);
+        break;
+
+        case OP_WHITESPACE:
+        set_type_bits(re, cbit_space, table_limit);
+        break;
+
+        case OP_NOT_WORDCHAR:
+        set_nottype_bits(re, cbit_word, table_limit);
+        break;
+
+        case OP_WORDCHAR:
+        set_type_bits(re, cbit_word, table_limit);
+        break;
+        }
+
+      tcode += 2;
+      break;
+
+      /* Extended class: if there are any property checks, or if this is a
+      negative XCLASS without a map, give up. If there are no property checks,
+      there must be wide characters on the XCLASS list, because otherwise an
+      XCLASS would not have been created. This means that code points >= 255
+      are potential starters. In the UTF-8 case we can scan them and set bits
+      for the relevant leading bytes. */
+
+#ifdef SUPPORT_WIDE_CHARS
+      case OP_XCLASS:
+      xclassflags = tcode[1 + LINK_SIZE];
+      if ((xclassflags & XCL_HASPROP) != 0 ||
+          (xclassflags & (XCL_MAP|XCL_NOT)) == XCL_NOT)
+        return SSB_FAIL;
+
+      /* We have a positive XCLASS or a negative one without a map. Set up the
+      map pointer if there is one, and fall through. */
+
+      classmap = ((xclassflags & XCL_MAP) == 0)? NULL :
+        (uint8_t *)(tcode + 1 + LINK_SIZE + 1);
+
+      /* In UTF-8 mode, scan the character list and set bits for leading bytes,
+      then jump to handle the map. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      if (utf && (xclassflags & XCL_NOT) == 0)
+        {
+        PCRE2_UCHAR b, e;
+        PCRE2_SPTR p = tcode + 1 + LINK_SIZE + 1 + ((classmap == NULL)? 0:32);
+        tcode += GET(tcode, 1);
+
+        for (;;) switch (*p++)
+          {
+          case XCL_SINGLE:
+          b = *p++;
+          while ((*p & 0xc0) == 0x80) p++;
+          re->start_bitmap[b/8] |= (1u << (b&7));
+          break;
+
+          case XCL_RANGE:
+          b = *p++;
+          while ((*p & 0xc0) == 0x80) p++;
+          e = *p++;
+          while ((*p & 0xc0) == 0x80) p++;
+          for (; b <= e; b++)
+            re->start_bitmap[b/8] |= (1u << (b&7));
+          break;
+
+          case XCL_END:
+          goto HANDLE_CLASSMAP;
+
+          default:
+          return SSB_UNKNOWN;   /* Internal error, should not occur */
+          }
+        }
+#endif  /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8 */
+#endif  /* SUPPORT_WIDE_CHARS */
+
+      /* It seems that the fall through comment must be outside the #ifdef if
+      it is to avoid the gcc compiler warning. */
+
+      /* Fall through */
+
+      /* Enter here for a negative non-XCLASS. In the 8-bit library, if we are
+      in UTF mode, any byte with a value >= 0xc4 is a potentially valid starter
+      because it starts a character with a value > 255. In 8-bit non-UTF mode,
+      there is no difference between CLASS and NCLASS. In all other wide
+      character modes, set the 0xFF bit to indicate code units >= 255. */
+
+      case OP_NCLASS:
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+      if (utf)
+        {
+        re->start_bitmap[24] |= 0xf0;            /* Bits for 0xc4 - 0xc8 */
+        memset(re->start_bitmap+25, 0xff, 7);    /* Bits for 0xc9 - 0xff */
+        }
+#elif PCRE2_CODE_UNIT_WIDTH != 8
+      SET_BIT(0xFF);                             /* For characters >= 255 */
+#endif
+      /* Fall through */
+
+      /* Enter here for a positive non-XCLASS. If we have fallen through from
+      an XCLASS, classmap will already be set; just advance the code pointer.
+      Otherwise, set up classmap for a a non-XCLASS and advance past it. */
+
+      case OP_CLASS:
+      if (*tcode == OP_XCLASS) tcode += GET(tcode, 1); else
+        {
+        classmap = (uint8_t *)(++tcode);
+        tcode += 32 / sizeof(PCRE2_UCHAR);
+        }
+
+      /* When wide characters are supported, classmap may be NULL. In UTF-8
+      (sic) mode, the bits in a class bit map correspond to character values,
+      not to byte values. However, the bit map we are constructing is for byte
+      values. So we have to do a conversion for characters whose code point is
+      greater than 127. In fact, there are only two possible starting bytes for
+      characters in the range 128 - 255. */
+
+#if defined SUPPORT_WIDE_CHARS && PCRE2_CODE_UNIT_WIDTH == 8
+      HANDLE_CLASSMAP:
+#endif
+      if (classmap != NULL)
+        {
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+        if (utf)
+          {
+          for (c = 0; c < 16; c++) re->start_bitmap[c] |= classmap[c];
+          for (c = 128; c < 256; c++)
+            {
+            if ((classmap[c/8] & (1u << (c&7))) != 0)
+              {
+              int d = (c >> 6) | 0xc0;                 /* Set bit for this starter */
+              re->start_bitmap[d/8] |= (1u << (d&7));  /* and then skip on to the */
+              c = (c & 0xc0) + 0x40 - 1;               /* next relevant character. */
+              }
+            }
+          }
+        else
+#endif
+        /* In all modes except UTF-8, the two bit maps are compatible. */
+
+          {
+          for (c = 0; c < 32; c++) re->start_bitmap[c] |= classmap[c];
+          }
+        }
+
+      /* Act on what follows the class. For a zero minimum repeat, continue;
+      otherwise stop processing. */
+
+      switch (*tcode)
+        {
+        case OP_CRSTAR:
+        case OP_CRMINSTAR:
+        case OP_CRQUERY:
+        case OP_CRMINQUERY:
+        case OP_CRPOSSTAR:
+        case OP_CRPOSQUERY:
+        tcode++;
+        break;
+
+        case OP_CRRANGE:
+        case OP_CRMINRANGE:
+        case OP_CRPOSRANGE:
+        if (GET2(tcode, 1) == 0) tcode += 1 + 2 * IMM2_SIZE;
+          else try_next = FALSE;
+        break;
+
+        default:
+        try_next = FALSE;
+        break;
+        }
+      break; /* End of class handling case */
+      }      /* End of switch for opcodes */
+    }        /* End of try_next loop */
+
+  code += GET(code, 1);   /* Advance to next branch */
+  }
+while (*code == OP_ALT);
+
+return yield;
+}
+
+
+
+/*************************************************
+*          Study a compiled expression           *
+*************************************************/
+
+/* This function is handed a compiled expression that it must study to produce
+information that will speed up the matching.
+
+Argument:
+  re       points to the compiled expression
+
+Returns:   0 normally; non-zero should never normally occur
+           1 unknown opcode in set_start_bits
+           2 missing capturing bracket
+           3 unknown opcode in find_minlength
+*/
+
+int
+PRIV(study)(pcre2_real_code *re)
+{
+int count = 0;
+PCRE2_UCHAR *code;
+BOOL utf = (re->overall_options & PCRE2_UTF) != 0;
+BOOL ucp = (re->overall_options & PCRE2_UCP) != 0;
+
+/* Find start of compiled code */
+
+code = (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code)) +
+  re->name_entry_size * re->name_count;
+
+/* For a pattern that has a first code unit, or a multiline pattern that
+matches only at "line start", there is no point in seeking a list of starting
+code units. */
+
+if ((re->flags & (PCRE2_FIRSTSET|PCRE2_STARTLINE)) == 0)
+  {
+  int depth = 0;
+  int rc = set_start_bits(re, code, utf, ucp, &depth);
+  if (rc == SSB_UNKNOWN) return 1;
+
+  /* If a list of starting code units was set up, scan the list to see if only
+  one or two were listed. Having only one listed is rare because usually a
+  single starting code unit will have been recognized and PCRE2_FIRSTSET set.
+  If two are listed, see if they are caseless versions of the same character;
+  if so we can replace the list with a caseless first code unit. This gives
+  better performance and is plausibly worth doing for patterns such as [Ww]ord
+  or (word|WORD). */
+
+  if (rc == SSB_DONE)
+    {
+    int i;
+    int a = -1;
+    int b = -1;
+    uint8_t *p = re->start_bitmap;
+    uint32_t flags = PCRE2_FIRSTMAPSET;
+
+    for (i = 0; i < 256; p++, i += 8)
+      {
+      uint8_t x = *p;
+      if (x != 0)
+        {
+        int c;
+        uint8_t y = x & (~x + 1);   /* Least significant bit */
+        if (y != x) goto DONE;      /* More than one bit set */
+
+        /* In the 16-bit and 32-bit libraries, the bit for 0xff means "0xff and
+        all wide characters", so we cannot use it here. */
+
+#if PCRE2_CODE_UNIT_WIDTH != 8
+        if (i == 248 && x == 0x80) goto DONE;
+#endif
+
+        /* Compute the character value */
+
+        c = i;
+        switch (x)
+          {
+          case 1:   break;
+          case 2:   c += 1; break;  case 4:  c += 2; break;
+          case 8:   c += 3; break;  case 16: c += 4; break;
+          case 32:  c += 5; break;  case 64: c += 6; break;
+          case 128: c += 7; break;
+          }
+
+        /* c contains the code unit value, in the range 0-255. In 8-bit UTF
+        mode, only values < 128 can be used. In all the other cases, c is a
+        character value. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+        if (utf && c > 127) goto DONE;
+#endif
+        if (a < 0) a = c;   /* First one found, save in a */
+        else if (b < 0)     /* Second one found */
+          {
+          int d = TABLE_GET((unsigned int)c, re->tables + fcc_offset, c);
+
+#ifdef SUPPORT_UNICODE
+          if (utf || ucp)
+            {
+            if (UCD_CASESET(c) != 0) goto DONE;     /* Multiple case set */
+            if (c > 127) d = UCD_OTHERCASE(c);
+            }
+#endif  /* SUPPORT_UNICODE */
+
+          if (d != a) goto DONE;   /* Not the other case of a */
+          b = c;                   /* Save second in b */
+          }
+        else goto DONE;   /* More than two characters found */
+        }
+      }
+
+    /* Replace the start code unit bits with a first code unit, but only if it
+    is not the same as a required later code unit. This is because a search for
+    a required code unit starts after an explicit first code unit, but at a
+    code unit found from the bitmap. Patterns such as /a*a/ don't work
+    if both the start unit and required unit are the same. */
+
+    if (a >= 0 &&
+        (
+        (re->flags & PCRE2_LASTSET) == 0 ||
+          (
+          re->last_codeunit != (uint32_t)a &&
+          (b < 0 || re->last_codeunit != (uint32_t)b)
+          )
+        ))
+      {
+      re->first_codeunit = a;
+      flags = PCRE2_FIRSTSET;
+      if (b >= 0) flags |= PCRE2_FIRSTCASELESS;
+      }
+
+    DONE:
+    re->flags |= flags;
+    }
+  }
+
+/* Find the minimum length of subject string. If the pattern can match an empty
+string, the minimum length is already known. If the pattern contains (*ACCEPT)
+all bets are off, and we don't even try to find a minimum length. If there are
+more back references than the size of the vector we are going to cache them in,
+do nothing. A pattern that complicated will probably take a long time to
+analyze and may in any case turn out to be too complicated. Note that back
+reference minima are held as 16-bit numbers. */
+
+if ((re->flags & (PCRE2_MATCH_EMPTY|PCRE2_HASACCEPT)) == 0 &&
+     re->top_backref <= MAX_CACHE_BACKREF)
+  {
+  int min;
+  int backref_cache[MAX_CACHE_BACKREF+1];
+  backref_cache[0] = 0;    /* Highest one that is set */
+  min = find_minlength(re, code, code, utf, NULL, &count, backref_cache);
+  switch(min)
+    {
+    case -1:  /* \C in UTF mode or over-complex regex */
+    break;    /* Leave minlength unchanged (will be zero) */
+
+    case -2:
+    return 2; /* missing capturing bracket */
+
+    case -3:
+    return 3; /* unrecognized opcode */
+
+    default:
+    re->minlength = (min > UINT16_MAX)? UINT16_MAX : min;
+    break;
+    }
+  }
+
+return 0;
+}
+
+/* End of pcre2_study.c */
diff --git a/Foundation/src/pcre2_substitute.c b/Foundation/src/pcre2_substitute.c
new file mode 100644
index 000000000..f4124d774
--- /dev/null
+++ b/Foundation/src/pcre2_substitute.c
@@ -0,0 +1,1003 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2021 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+#define PTR_STACK_SIZE 20
+
+#define SUBSTITUTE_OPTIONS \
+  (PCRE2_SUBSTITUTE_EXTENDED|PCRE2_SUBSTITUTE_GLOBAL| \
+   PCRE2_SUBSTITUTE_LITERAL|PCRE2_SUBSTITUTE_MATCHED| \
+   PCRE2_SUBSTITUTE_OVERFLOW_LENGTH|PCRE2_SUBSTITUTE_REPLACEMENT_ONLY| \
+   PCRE2_SUBSTITUTE_UNKNOWN_UNSET|PCRE2_SUBSTITUTE_UNSET_EMPTY)
+
+
+
+/*************************************************
+*           Find end of substitute text          *
+*************************************************/
+
+/* In extended mode, we recognize ${name:+set text:unset text} and similar
+constructions. This requires the identification of unescaped : and }
+characters. This function scans for such. It must deal with nested ${
+constructions. The pointer to the text is updated, either to the required end
+character, or to where an error was detected.
+
+Arguments:
+  code      points to the compiled expression (for options)
+  ptrptr    points to the pointer to the start of the text (updated)
+  ptrend    end of the whole string
+  last      TRUE if the last expected string (only } recognized)
+
+Returns:    0 on success
+            negative error code on failure
+*/
+
+static int
+find_text_end(const pcre2_code *code, PCRE2_SPTR *ptrptr, PCRE2_SPTR ptrend,
+  BOOL last)
+{
+int rc = 0;
+uint32_t nestlevel = 0;
+BOOL literal = FALSE;
+PCRE2_SPTR ptr = *ptrptr;
+
+for (; ptr < ptrend; ptr++)
+  {
+  if (literal)
+    {
+    if (ptr[0] == CHAR_BACKSLASH && ptr < ptrend - 1 && ptr[1] == CHAR_E)
+      {
+      literal = FALSE;
+      ptr += 1;
+      }
+    }
+
+  else if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
+    {
+    if (nestlevel == 0) goto EXIT;
+    nestlevel--;
+    }
+
+  else if (*ptr == CHAR_COLON && !last && nestlevel == 0) goto EXIT;
+
+  else if (*ptr == CHAR_DOLLAR_SIGN)
+    {
+    if (ptr < ptrend - 1 && ptr[1] == CHAR_LEFT_CURLY_BRACKET)
+      {
+      nestlevel++;
+      ptr += 1;
+      }
+    }
+
+  else if (*ptr == CHAR_BACKSLASH)
+    {
+    int erc;
+    int errorcode;
+    uint32_t ch;
+
+    if (ptr < ptrend - 1) switch (ptr[1])
+      {
+      case CHAR_L:
+      case CHAR_l:
+      case CHAR_U:
+      case CHAR_u:
+      ptr += 1;
+      continue;
+      }
+
+    ptr += 1;  /* Must point after \ */
+    erc = PRIV(check_escape)(&ptr, ptrend, &ch, &errorcode,
+      code->overall_options, code->extra_options, FALSE, NULL);
+    ptr -= 1;  /* Back to last code unit of escape */
+    if (errorcode != 0)
+      {
+      rc = errorcode;
+      goto EXIT;
+      }
+
+    switch(erc)
+      {
+      case 0:      /* Data character */
+      case ESC_E:  /* Isolated \E is ignored */
+      break;
+
+      case ESC_Q:
+      literal = TRUE;
+      break;
+
+      default:
+      rc = PCRE2_ERROR_BADREPESCAPE;
+      goto EXIT;
+      }
+    }
+  }
+
+rc = PCRE2_ERROR_REPMISSINGBRACE;   /* Terminator not found */
+
+EXIT:
+*ptrptr = ptr;
+return rc;
+}
+
+
+
+/*************************************************
+*              Match and substitute              *
+*************************************************/
+
+/* This function applies a compiled re to a subject string and creates a new
+string with substitutions. The first 7 arguments are the same as for
+pcre2_match(). Either string length may be PCRE2_ZERO_TERMINATED.
+
+Arguments:
+  code            points to the compiled expression
+  subject         points to the subject string
+  length          length of subject string (may contain binary zeros)
+  start_offset    where to start in the subject string
+  options         option bits
+  match_data      points to a match_data block, or is NULL
+  context         points a PCRE2 context
+  replacement     points to the replacement string
+  rlength         length of replacement string
+  buffer          where to put the substituted string
+  blength         points to length of buffer; updated to length of string
+
+Returns:          >= 0 number of substitutions made
+                  < 0 an error code
+                  PCRE2_ERROR_BADREPLACEMENT means invalid use of $
+*/
+
+/* This macro checks for space in the buffer before copying into it. On
+overflow, either give an error immediately, or keep on, accumulating the
+length. */
+
+#define CHECKMEMCPY(from,length) \
+  { \
+  if (!overflowed && lengthleft < length) \
+    { \
+    if ((suboptions & PCRE2_SUBSTITUTE_OVERFLOW_LENGTH) == 0) goto NOROOM; \
+    overflowed = TRUE; \
+    extra_needed = length - lengthleft; \
+    } \
+  else if (overflowed) \
+    { \
+    extra_needed += length; \
+    }  \
+  else \
+    {  \
+    memcpy(buffer + buff_offset, from, CU2BYTES(length)); \
+    buff_offset += length; \
+    lengthleft -= length; \
+    } \
+  }
+
+/* Here's the function */
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substitute(const pcre2_code *code, PCRE2_SPTR subject, PCRE2_SIZE length,
+  PCRE2_SIZE start_offset, uint32_t options, pcre2_match_data *match_data,
+  pcre2_match_context *mcontext, PCRE2_SPTR replacement, PCRE2_SIZE rlength,
+  PCRE2_UCHAR *buffer, PCRE2_SIZE *blength)
+{
+int rc;
+int subs;
+int forcecase = 0;
+int forcecasereset = 0;
+uint32_t ovector_count;
+uint32_t goptions = 0;
+uint32_t suboptions;
+pcre2_match_data *internal_match_data = NULL;
+BOOL escaped_literal = FALSE;
+BOOL overflowed = FALSE;
+BOOL use_existing_match;
+BOOL replacement_only;
+#ifdef SUPPORT_UNICODE
+BOOL utf = (code->overall_options & PCRE2_UTF) != 0;
+BOOL ucp = (code->overall_options & PCRE2_UCP) != 0;
+#endif
+PCRE2_UCHAR temp[6];
+PCRE2_SPTR ptr;
+PCRE2_SPTR repend;
+PCRE2_SIZE extra_needed = 0;
+PCRE2_SIZE buff_offset, buff_length, lengthleft, fraglength;
+PCRE2_SIZE *ovector;
+PCRE2_SIZE ovecsave[3];
+pcre2_substitute_callout_block scb;
+
+/* General initialization */
+
+buff_offset = 0;
+lengthleft = buff_length = *blength;
+*blength = PCRE2_UNSET;
+ovecsave[0] = ovecsave[1] = ovecsave[2] = PCRE2_UNSET;
+
+/* Partial matching is not valid. This must come after setting *blength to
+PCRE2_UNSET, so as not to imply an offset in the replacement. */
+
+if ((options & (PCRE2_PARTIAL_HARD|PCRE2_PARTIAL_SOFT)) != 0)
+  return PCRE2_ERROR_BADOPTION;
+
+/* Validate length and find the end of the replacement. A NULL replacement of
+zero length is interpreted as an empty string. */
+
+if (replacement == NULL)
+  {
+  if (rlength != 0) return PCRE2_ERROR_NULL;
+  replacement = (PCRE2_SPTR)"";
+  }
+
+if (rlength == PCRE2_ZERO_TERMINATED) rlength = PRIV(strlen)(replacement);
+repend = replacement + rlength;
+
+/* Check for using a match that has already happened. Note that the subject
+pointer in the match data may be NULL after a no-match. */
+
+use_existing_match = ((options & PCRE2_SUBSTITUTE_MATCHED) != 0);
+replacement_only = ((options & PCRE2_SUBSTITUTE_REPLACEMENT_ONLY) != 0);
+
+/* If starting from an existing match, there must be an externally provided
+match data block. We create an internal match_data block in two cases: (a) an
+external one is not supplied (and we are not starting from an existing match);
+(b) an existing match is to be used for the first substitution. In the latter
+case, we copy the existing match into the internal block. This ensures that no
+changes are made to the existing match data block. */
+
+if (match_data == NULL)
+  {
+  pcre2_general_context *gcontext;
+  if (use_existing_match) return PCRE2_ERROR_NULL;
+  gcontext = (mcontext == NULL)?
+    (pcre2_general_context *)code :
+    (pcre2_general_context *)mcontext;
+  match_data = internal_match_data =
+    pcre2_match_data_create_from_pattern(code, gcontext);
+  if (internal_match_data == NULL) return PCRE2_ERROR_NOMEMORY;
+  }
+
+else if (use_existing_match)
+  {
+  pcre2_general_context *gcontext = (mcontext == NULL)?
+    (pcre2_general_context *)code :
+    (pcre2_general_context *)mcontext;
+  int pairs = (code->top_bracket + 1 < match_data->oveccount)?
+    code->top_bracket + 1 : match_data->oveccount;
+  internal_match_data = pcre2_match_data_create(match_data->oveccount,
+    gcontext);
+  if (internal_match_data == NULL) return PCRE2_ERROR_NOMEMORY;
+  memcpy(internal_match_data, match_data, offsetof(pcre2_match_data, ovector)
+    + 2*pairs*sizeof(PCRE2_SIZE));
+  match_data = internal_match_data;
+  }
+
+/* Remember ovector details */
+
+ovector = pcre2_get_ovector_pointer(match_data);
+ovector_count = pcre2_get_ovector_count(match_data);
+
+/* Fixed things in the callout block */
+
+scb.version = 0;
+scb.input = subject;
+scb.output = (PCRE2_SPTR)buffer;
+scb.ovector = ovector;
+
+/* A NULL subject of zero length is treated as an empty string. */
+
+if (subject == NULL)
+  {
+  if (length != 0) return PCRE2_ERROR_NULL;
+  subject = (PCRE2_SPTR)"";
+  }
+
+/* Find length of zero-terminated subject */
+
+if (length == PCRE2_ZERO_TERMINATED)
+  length = subject? PRIV(strlen)(subject) : 0;
+
+/* Check UTF replacement string if necessary. */
+
+#ifdef SUPPORT_UNICODE
+if (utf && (options & PCRE2_NO_UTF_CHECK) == 0)
+  {
+  rc = PRIV(valid_utf)(replacement, rlength, &(match_data->startchar));
+  if (rc != 0)
+    {
+    match_data->leftchar = 0;
+    goto EXIT;
+    }
+  }
+#endif  /* SUPPORT_UNICODE */
+
+/* Save the substitute options and remove them from the match options. */
+
+suboptions = options & SUBSTITUTE_OPTIONS;
+options &= ~SUBSTITUTE_OPTIONS;
+
+/* Error if the start match offset is greater than the length of the subject. */
+
+if (start_offset > length)
+  {
+  match_data->leftchar = 0;
+  rc = PCRE2_ERROR_BADOFFSET;
+  goto EXIT;
+  }
+
+/* Copy up to the start offset, unless only the replacement is required. */
+
+if (!replacement_only) CHECKMEMCPY(subject, start_offset);
+
+/* Loop for global substituting. If PCRE2_SUBSTITUTE_MATCHED is set, the first
+match is taken from the match_data that was passed in. */
+
+subs = 0;
+do
+  {
+  PCRE2_SPTR ptrstack[PTR_STACK_SIZE];
+  uint32_t ptrstackptr = 0;
+
+  if (use_existing_match)
+    {
+    rc = match_data->rc;
+    use_existing_match = FALSE;
+    }
+  else rc = pcre2_match(code, subject, length, start_offset, options|goptions,
+    match_data, mcontext);
+
+#ifdef SUPPORT_UNICODE
+  if (utf) options |= PCRE2_NO_UTF_CHECK;  /* Only need to check once */
+#endif
+
+  /* Any error other than no match returns the error code. No match when not
+  doing the special after-empty-match global rematch, or when at the end of the
+  subject, breaks the global loop. Otherwise, advance the starting point by one
+  character, copying it to the output, and try again. */
+
+  if (rc < 0)
+    {
+    PCRE2_SIZE save_start;
+
+    if (rc != PCRE2_ERROR_NOMATCH) goto EXIT;
+    if (goptions == 0 || start_offset >= length) break;
+
+    /* Advance by one code point. Then, if CRLF is a valid newline sequence and
+    we have advanced into the middle of it, advance one more code point. In
+    other words, do not start in the middle of CRLF, even if CR and LF on their
+    own are valid newlines. */
+
+    save_start = start_offset++;
+    if (subject[start_offset-1] == CHAR_CR &&
+        code->newline_convention != PCRE2_NEWLINE_CR &&
+        code->newline_convention != PCRE2_NEWLINE_LF &&
+        start_offset < length &&
+        subject[start_offset] == CHAR_LF)
+      start_offset++;
+
+    /* Otherwise, in UTF mode, advance past any secondary code points. */
+
+    else if ((code->overall_options & PCRE2_UTF) != 0)
+      {
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      while (start_offset < length && (subject[start_offset] & 0xc0) == 0x80)
+        start_offset++;
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+      while (start_offset < length &&
+            (subject[start_offset] & 0xfc00) == 0xdc00)
+        start_offset++;
+#endif
+      }
+
+    /* Copy what we have advanced past (unless not required), reset the special
+    global options, and continue to the next match. */
+
+    fraglength = start_offset - save_start;
+    if (!replacement_only) CHECKMEMCPY(subject + save_start, fraglength);
+    goptions = 0;
+    continue;
+    }
+
+  /* Handle a successful match. Matches that use \K to end before they start
+  or start before the current point in the subject are not supported. */
+
+  if (ovector[1] < ovector[0] || ovector[0] < start_offset)
+    {
+    rc = PCRE2_ERROR_BADSUBSPATTERN;
+    goto EXIT;
+    }
+
+  /* Check for the same match as previous. This is legitimate after matching an
+  empty string that starts after the initial match offset. We have tried again
+  at the match point in case the pattern is one like /(?<=\G.)/ which can never
+  match at its starting point, so running the match achieves the bumpalong. If
+  we do get the same (null) match at the original match point, it isn't such a
+  pattern, so we now do the empty string magic. In all other cases, a repeat
+  match should never occur. */
+
+  if (ovecsave[0] == ovector[0] && ovecsave[1] == ovector[1])
+    {
+    if (ovector[0] == ovector[1] && ovecsave[2] != start_offset)
+      {
+      goptions = PCRE2_NOTEMPTY_ATSTART | PCRE2_ANCHORED;
+      ovecsave[2] = start_offset;
+      continue;    /* Back to the top of the loop */
+      }
+    rc = PCRE2_ERROR_INTERNAL_DUPMATCH;
+    goto EXIT;
+    }
+
+  /* Count substitutions with a paranoid check for integer overflow; surely no
+  real call to this function would ever hit this! */
+
+  if (subs == INT_MAX)
+    {
+    rc = PCRE2_ERROR_TOOMANYREPLACE;
+    goto EXIT;
+    }
+  subs++;
+
+  /* Copy the text leading up to the match (unless not required), and remember
+  where the insert begins and how many ovector pairs are set. */
+
+  if (rc == 0) rc = ovector_count;
+  fraglength = ovector[0] - start_offset;
+  if (!replacement_only) CHECKMEMCPY(subject + start_offset, fraglength);
+  scb.output_offsets[0] = buff_offset;
+  scb.oveccount = rc;
+
+  /* Process the replacement string. If the entire replacement is literal, just
+  copy it with length check. */
+
+  ptr = replacement;
+  if ((suboptions & PCRE2_SUBSTITUTE_LITERAL) != 0)
+    {
+    CHECKMEMCPY(ptr, rlength);
+    }
+
+  /* Within a non-literal replacement, which must be scanned character by
+  character, local literal mode can be set by \Q, but only in extended mode
+  when backslashes are being interpreted. In extended mode we must handle
+  nested substrings that are to be reprocessed. */
+
+  else for (;;)
+    {
+    uint32_t ch;
+    unsigned int chlen;
+
+    /* If at the end of a nested substring, pop the stack. */
+
+    if (ptr >= repend)
+      {
+      if (ptrstackptr == 0) break;       /* End of replacement string */
+      repend = ptrstack[--ptrstackptr];
+      ptr = ptrstack[--ptrstackptr];
+      continue;
+      }
+
+    /* Handle the next character */
+
+    if (escaped_literal)
+      {
+      if (ptr[0] == CHAR_BACKSLASH && ptr < repend - 1 && ptr[1] == CHAR_E)
+        {
+        escaped_literal = FALSE;
+        ptr += 2;
+        continue;
+        }
+      goto LOADLITERAL;
+      }
+
+    /* Not in literal mode. */
+
+    if (*ptr == CHAR_DOLLAR_SIGN)
+      {
+      int group, n;
+      uint32_t special = 0;
+      BOOL inparens;
+      BOOL star;
+      PCRE2_SIZE sublength;
+      PCRE2_SPTR text1_start = NULL;
+      PCRE2_SPTR text1_end = NULL;
+      PCRE2_SPTR text2_start = NULL;
+      PCRE2_SPTR text2_end = NULL;
+      PCRE2_UCHAR next;
+      PCRE2_UCHAR name[33];
+
+      if (++ptr >= repend) goto BAD;
+      if ((next = *ptr) == CHAR_DOLLAR_SIGN) goto LOADLITERAL;
+
+      group = -1;
+      n = 0;
+      inparens = FALSE;
+      star = FALSE;
+
+      if (next == CHAR_LEFT_CURLY_BRACKET)
+        {
+        if (++ptr >= repend) goto BAD;
+        next = *ptr;
+        inparens = TRUE;
+        }
+
+      if (next == CHAR_ASTERISK)
+        {
+        if (++ptr >= repend) goto BAD;
+        next = *ptr;
+        star = TRUE;
+        }
+
+      if (!star && next >= CHAR_0 && next <= CHAR_9)
+        {
+        group = next - CHAR_0;
+        while (++ptr < repend)
+          {
+          next = *ptr;
+          if (next < CHAR_0 || next > CHAR_9) break;
+          group = group * 10 + next - CHAR_0;
+
+          /* A check for a number greater than the hightest captured group
+          is sufficient here; no need for a separate overflow check. If unknown
+          groups are to be treated as unset, just skip over any remaining
+          digits and carry on. */
+
+          if (group > code->top_bracket)
+            {
+            if ((suboptions & PCRE2_SUBSTITUTE_UNKNOWN_UNSET) != 0)
+              {
+              while (++ptr < repend && *ptr >= CHAR_0 && *ptr <= CHAR_9);
+              break;
+              }
+            else
+              {
+              rc = PCRE2_ERROR_NOSUBSTRING;
+              goto PTREXIT;
+              }
+            }
+          }
+        }
+      else
+        {
+        const uint8_t *ctypes = code->tables + ctypes_offset;
+        while (MAX_255(next) && (ctypes[next] & ctype_word) != 0)
+          {
+          name[n++] = next;
+          if (n > 32) goto BAD;
+          if (++ptr >= repend) break;
+          next = *ptr;
+          }
+        if (n == 0) goto BAD;
+        name[n] = 0;
+        }
+
+      /* In extended mode we recognize ${name:+set text:unset text} and
+      ${name:-default text}. */
+
+      if (inparens)
+        {
+        if ((suboptions & PCRE2_SUBSTITUTE_EXTENDED) != 0 &&
+             !star && ptr < repend - 2 && next == CHAR_COLON)
+          {
+          special = *(++ptr);
+          if (special != CHAR_PLUS && special != CHAR_MINUS)
+            {
+            rc = PCRE2_ERROR_BADSUBSTITUTION;
+            goto PTREXIT;
+            }
+
+          text1_start = ++ptr;
+          rc = find_text_end(code, &ptr, repend, special == CHAR_MINUS);
+          if (rc != 0) goto PTREXIT;
+          text1_end = ptr;
+
+          if (special == CHAR_PLUS && *ptr == CHAR_COLON)
+            {
+            text2_start = ++ptr;
+            rc = find_text_end(code, &ptr, repend, TRUE);
+            if (rc != 0) goto PTREXIT;
+            text2_end = ptr;
+            }
+          }
+
+        else
+          {
+          if (ptr >= repend || *ptr != CHAR_RIGHT_CURLY_BRACKET)
+            {
+            rc = PCRE2_ERROR_REPMISSINGBRACE;
+            goto PTREXIT;
+            }
+          }
+
+        ptr++;
+        }
+
+      /* Have found a syntactically correct group number or name, or *name.
+      Only *MARK is currently recognized. */
+
+      if (star)
+        {
+        if (PRIV(strcmp_c8)(name, STRING_MARK) == 0)
+          {
+          PCRE2_SPTR mark = pcre2_get_mark(match_data);
+          if (mark != NULL)
+            {
+            PCRE2_SPTR mark_start = mark;
+            while (*mark != 0) mark++;
+            fraglength = mark - mark_start;
+            CHECKMEMCPY(mark_start, fraglength);
+            }
+          }
+        else goto BAD;
+        }
+
+      /* Substitute the contents of a group. We don't use substring_copy
+      functions any more, in order to support case forcing. */
+
+      else
+        {
+        PCRE2_SPTR subptr, subptrend;
+
+        /* Find a number for a named group. In case there are duplicate names,
+        search for the first one that is set. If the name is not found when
+        PCRE2_SUBSTITUTE_UNKNOWN_EMPTY is set, set the group number to a
+        non-existent group. */
+
+        if (group < 0)
+          {
+          PCRE2_SPTR first, last, entry;
+          rc = pcre2_substring_nametable_scan(code, name, &first, &last);
+          if (rc == PCRE2_ERROR_NOSUBSTRING &&
+              (suboptions & PCRE2_SUBSTITUTE_UNKNOWN_UNSET) != 0)
+            {
+            group = code->top_bracket + 1;
+            }
+          else
+            {
+            if (rc < 0) goto PTREXIT;
+            for (entry = first; entry <= last; entry += rc)
+              {
+              uint32_t ng = GET2(entry, 0);
+              if (ng < ovector_count)
+                {
+                if (group < 0) group = ng;          /* First in ovector */
+                if (ovector[ng*2] != PCRE2_UNSET)
+                  {
+                  group = ng;                       /* First that is set */
+                  break;
+                  }
+                }
+              }
+
+            /* If group is still negative, it means we did not find a group
+            that is in the ovector. Just set the first group. */
+
+            if (group < 0) group = GET2(first, 0);
+            }
+          }
+
+        /* We now have a group that is identified by number. Find the length of
+        the captured string. If a group in a non-special substitution is unset
+        when PCRE2_SUBSTITUTE_UNSET_EMPTY is set, substitute nothing. */
+
+        rc = pcre2_substring_length_bynumber(match_data, group, &sublength);
+        if (rc < 0)
+          {
+          if (rc == PCRE2_ERROR_NOSUBSTRING &&
+              (suboptions & PCRE2_SUBSTITUTE_UNKNOWN_UNSET) != 0)
+            {
+            rc = PCRE2_ERROR_UNSET;
+            }
+          if (rc != PCRE2_ERROR_UNSET) goto PTREXIT;  /* Non-unset errors */
+          if (special == 0)                           /* Plain substitution */
+            {
+            if ((suboptions & PCRE2_SUBSTITUTE_UNSET_EMPTY) != 0) continue;
+            goto PTREXIT;                             /* Else error */
+            }
+          }
+
+        /* If special is '+' we have a 'set' and possibly an 'unset' text,
+        both of which are reprocessed when used. If special is '-' we have a
+        default text for when the group is unset; it must be reprocessed. */
+
+        if (special != 0)
+          {
+          if (special == CHAR_MINUS)
+            {
+            if (rc == 0) goto LITERAL_SUBSTITUTE;
+            text2_start = text1_start;
+            text2_end = text1_end;
+            }
+
+          if (ptrstackptr >= PTR_STACK_SIZE) goto BAD;
+          ptrstack[ptrstackptr++] = ptr;
+          ptrstack[ptrstackptr++] = repend;
+
+          if (rc == 0)
+            {
+            ptr = text1_start;
+            repend = text1_end;
+            }
+          else
+            {
+            ptr = text2_start;
+            repend = text2_end;
+            }
+          continue;
+          }
+
+        /* Otherwise we have a literal substitution of a group's contents. */
+
+        LITERAL_SUBSTITUTE:
+        subptr = subject + ovector[group*2];
+        subptrend = subject + ovector[group*2 + 1];
+
+        /* Substitute a literal string, possibly forcing alphabetic case. */
+
+        while (subptr < subptrend)
+          {
+          GETCHARINCTEST(ch, subptr);
+          if (forcecase != 0)
+            {
+#ifdef SUPPORT_UNICODE
+            if (utf || ucp)
+              {
+              uint32_t type = UCD_CHARTYPE(ch);
+              if (PRIV(ucp_gentype)[type] == ucp_L &&
+                  type != ((forcecase > 0)? ucp_Lu : ucp_Ll))
+                ch = UCD_OTHERCASE(ch);
+              }
+            else
+#endif
+              {
+              if (((code->tables + cbits_offset +
+                  ((forcecase > 0)? cbit_upper:cbit_lower)
+                  )[ch/8] & (1u << (ch%8))) == 0)
+                ch = (code->tables + fcc_offset)[ch];
+              }
+            forcecase = forcecasereset;
+            }
+
+#ifdef SUPPORT_UNICODE
+          if (utf) chlen = PRIV(ord2utf)(ch, temp); else
+#endif
+            {
+            temp[0] = ch;
+            chlen = 1;
+            }
+          CHECKMEMCPY(temp, chlen);
+          }
+        }
+      }
+
+    /* Handle an escape sequence in extended mode. We can use check_escape()
+    to process \Q, \E, \c, \o, \x and \ followed by non-alphanumerics, but
+    the case-forcing escapes are not supported in pcre2_compile() so must be
+    recognized here. */
+
+    else if ((suboptions & PCRE2_SUBSTITUTE_EXTENDED) != 0 &&
+              *ptr == CHAR_BACKSLASH)
+      {
+      int errorcode;
+
+      if (ptr < repend - 1) switch (ptr[1])
+        {
+        case CHAR_L:
+        forcecase = forcecasereset = -1;
+        ptr += 2;
+        continue;
+
+        case CHAR_l:
+        forcecase = -1;
+        forcecasereset = 0;
+        ptr += 2;
+        continue;
+
+        case CHAR_U:
+        forcecase = forcecasereset = 1;
+        ptr += 2;
+        continue;
+
+        case CHAR_u:
+        forcecase = 1;
+        forcecasereset = 0;
+        ptr += 2;
+        continue;
+
+        default:
+        break;
+        }
+
+      ptr++;  /* Point after \ */
+      rc = PRIV(check_escape)(&ptr, repend, &ch, &errorcode,
+        code->overall_options, code->extra_options, FALSE, NULL);
+      if (errorcode != 0) goto BADESCAPE;
+
+      switch(rc)
+        {
+        case ESC_E:
+        forcecase = forcecasereset = 0;
+        continue;
+
+        case ESC_Q:
+        escaped_literal = TRUE;
+        continue;
+
+        case 0:      /* Data character */
+        goto LITERAL;
+
+        default:
+        goto BADESCAPE;
+        }
+      }
+
+    /* Handle a literal code unit */
+
+    else
+      {
+      LOADLITERAL:
+      GETCHARINCTEST(ch, ptr);    /* Get character value, increment pointer */
+
+      LITERAL:
+      if (forcecase != 0)
+        {
+#ifdef SUPPORT_UNICODE
+        if (utf || ucp)
+          {
+          uint32_t type = UCD_CHARTYPE(ch);
+          if (PRIV(ucp_gentype)[type] == ucp_L &&
+              type != ((forcecase > 0)? ucp_Lu : ucp_Ll))
+            ch = UCD_OTHERCASE(ch);
+          }
+        else
+#endif
+          {
+          if (((code->tables + cbits_offset +
+              ((forcecase > 0)? cbit_upper:cbit_lower)
+              )[ch/8] & (1u << (ch%8))) == 0)
+            ch = (code->tables + fcc_offset)[ch];
+          }
+        forcecase = forcecasereset;
+        }
+
+#ifdef SUPPORT_UNICODE
+      if (utf) chlen = PRIV(ord2utf)(ch, temp); else
+#endif
+        {
+        temp[0] = ch;
+        chlen = 1;
+        }
+      CHECKMEMCPY(temp, chlen);
+      } /* End handling a literal code unit */
+    }   /* End of loop for scanning the replacement. */
+
+  /* The replacement has been copied to the output, or its size has been
+  remembered. Do the callout if there is one and we have done an actual
+  replacement. */
+
+  if (!overflowed && mcontext != NULL && mcontext->substitute_callout != NULL)
+    {
+    scb.subscount = subs;
+    scb.output_offsets[1] = buff_offset;
+    rc = mcontext->substitute_callout(&scb, mcontext->substitute_callout_data);
+
+    /* A non-zero return means cancel this substitution. Instead, copy the
+    matched string fragment. */
+
+    if (rc != 0)
+      {
+      PCRE2_SIZE newlength = scb.output_offsets[1] - scb.output_offsets[0];
+      PCRE2_SIZE oldlength = ovector[1] - ovector[0];
+
+      buff_offset -= newlength;
+      lengthleft += newlength;
+      if (!replacement_only) CHECKMEMCPY(subject + ovector[0], oldlength);
+
+      /* A negative return means do not do any more. */
+
+      if (rc < 0) suboptions &= (~PCRE2_SUBSTITUTE_GLOBAL);
+      }
+    }
+
+  /* Save the details of this match. See above for how this data is used. If we
+  matched an empty string, do the magic for global matches. Update the start
+  offset to point to the rest of the subject string. If we re-used an existing
+  match for the first match, switch to the internal match data block. */
+
+  ovecsave[0] = ovector[0];
+  ovecsave[1] = ovector[1];
+  ovecsave[2] = start_offset;
+
+  goptions = (ovector[0] != ovector[1] || ovector[0] > start_offset)? 0 :
+    PCRE2_ANCHORED|PCRE2_NOTEMPTY_ATSTART;
+  start_offset = ovector[1];
+  } while ((suboptions & PCRE2_SUBSTITUTE_GLOBAL) != 0);  /* Repeat "do" loop */
+
+/* Copy the rest of the subject unless not required, and terminate the output
+with a binary zero. */
+
+if (!replacement_only)
+  {
+  fraglength = length - start_offset;
+  CHECKMEMCPY(subject + start_offset, fraglength);
+  }
+
+temp[0] = 0;
+CHECKMEMCPY(temp, 1);
+
+/* If overflowed is set it means the PCRE2_SUBSTITUTE_OVERFLOW_LENGTH is set,
+and matching has carried on after a full buffer, in order to compute the length
+needed. Otherwise, an overflow generates an immediate error return. */
+
+if (overflowed)
+  {
+  rc = PCRE2_ERROR_NOMEMORY;
+  *blength = buff_length + extra_needed;
+  }
+
+/* After a successful execution, return the number of substitutions and set the
+length of buffer used, excluding the trailing zero. */
+
+else
+  {
+  rc = subs;
+  *blength = buff_offset - 1;
+  }
+
+EXIT:
+if (internal_match_data != NULL) pcre2_match_data_free(internal_match_data);
+  else match_data->rc = rc;
+return rc;
+
+NOROOM:
+rc = PCRE2_ERROR_NOMEMORY;
+goto EXIT;
+
+BAD:
+rc = PCRE2_ERROR_BADREPLACEMENT;
+goto PTREXIT;
+
+BADESCAPE:
+rc = PCRE2_ERROR_BADREPESCAPE;
+
+PTREXIT:
+*blength = (PCRE2_SIZE)(ptr - replacement);
+goto EXIT;
+}
+
+/* End of pcre2_substitute.c */
diff --git a/Foundation/src/pcre2_substring.c b/Foundation/src/pcre2_substring.c
new file mode 100644
index 000000000..0a21177bf
--- /dev/null
+++ b/Foundation/src/pcre2_substring.c
@@ -0,0 +1,544 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2018 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+
+
+
+/*************************************************
+*   Copy named captured string to given buffer   *
+*************************************************/
+
+/* This function copies a single captured substring into a given buffer,
+identifying it by name. If the regex permits duplicate names, the first
+substring that is set is chosen.
+
+Arguments:
+  match_data     points to the match data
+  stringname     the name of the required substring
+  buffer         where to put the substring
+  sizeptr        the size of the buffer, updated to the size of the substring
+
+Returns:         if successful: zero
+                 if not successful, a negative error code:
+                   (1) an error from nametable_scan()
+                   (2) an error from copy_bynumber()
+                   (3) PCRE2_ERROR_UNAVAILABLE: no group is in ovector
+                   (4) PCRE2_ERROR_UNSET: all named groups in ovector are unset
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substring_copy_byname(pcre2_match_data *match_data, PCRE2_SPTR stringname,
+  PCRE2_UCHAR *buffer, PCRE2_SIZE *sizeptr)
+{
+PCRE2_SPTR first, last, entry;
+int failrc, entrysize;
+if (match_data->matchedby == PCRE2_MATCHEDBY_DFA_INTERPRETER)
+  return PCRE2_ERROR_DFA_UFUNC;
+entrysize = pcre2_substring_nametable_scan(match_data->code, stringname,
+  &first, &last);
+if (entrysize < 0) return entrysize;
+failrc = PCRE2_ERROR_UNAVAILABLE;
+for (entry = first; entry <= last; entry += entrysize)
+  {
+  uint32_t n = GET2(entry, 0);
+  if (n < match_data->oveccount)
+    {
+    if (match_data->ovector[n*2] != PCRE2_UNSET)
+      return pcre2_substring_copy_bynumber(match_data, n, buffer, sizeptr);
+    failrc = PCRE2_ERROR_UNSET;
+    }
+  }
+return failrc;
+}
+
+
+
+/*************************************************
+*  Copy numbered captured string to given buffer *
+*************************************************/
+
+/* This function copies a single captured substring into a given buffer,
+identifying it by number.
+
+Arguments:
+  match_data     points to the match data
+  stringnumber   the number of the required substring
+  buffer         where to put the substring
+  sizeptr        the size of the buffer, updated to the size of the substring
+
+Returns:         if successful: 0
+                 if not successful, a negative error code:
+                   PCRE2_ERROR_NOMEMORY: buffer too small
+                   PCRE2_ERROR_NOSUBSTRING: no such substring
+                   PCRE2_ERROR_UNAVAILABLE: ovector too small
+                   PCRE2_ERROR_UNSET: substring is not set
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substring_copy_bynumber(pcre2_match_data *match_data,
+  uint32_t stringnumber, PCRE2_UCHAR *buffer, PCRE2_SIZE *sizeptr)
+{
+int rc;
+PCRE2_SIZE size;
+rc = pcre2_substring_length_bynumber(match_data, stringnumber, &size);
+if (rc < 0) return rc;
+if (size + 1 > *sizeptr) return PCRE2_ERROR_NOMEMORY;
+memcpy(buffer, match_data->subject + match_data->ovector[stringnumber*2],
+  CU2BYTES(size));
+buffer[size] = 0;
+*sizeptr = size;
+return 0;
+}
+
+
+
+/*************************************************
+*          Extract named captured string         *
+*************************************************/
+
+/* This function copies a single captured substring, identified by name, into
+new memory. If the regex permits duplicate names, the first substring that is
+set is chosen.
+
+Arguments:
+  match_data     pointer to match_data
+  stringname     the name of the required substring
+  stringptr      where to put the pointer to the new memory
+  sizeptr        where to put the length of the substring
+
+Returns:         if successful: zero
+                 if not successful, a negative value:
+                   (1) an error from nametable_scan()
+                   (2) an error from get_bynumber()
+                   (3) PCRE2_ERROR_UNAVAILABLE: no group is in ovector
+                   (4) PCRE2_ERROR_UNSET: all named groups in ovector are unset
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substring_get_byname(pcre2_match_data *match_data,
+  PCRE2_SPTR stringname, PCRE2_UCHAR **stringptr, PCRE2_SIZE *sizeptr)
+{
+PCRE2_SPTR first, last, entry;
+int failrc, entrysize;
+if (match_data->matchedby == PCRE2_MATCHEDBY_DFA_INTERPRETER)
+  return PCRE2_ERROR_DFA_UFUNC;
+entrysize = pcre2_substring_nametable_scan(match_data->code, stringname,
+  &first, &last);
+if (entrysize < 0) return entrysize;
+failrc = PCRE2_ERROR_UNAVAILABLE;
+for (entry = first; entry <= last; entry += entrysize)
+  {
+  uint32_t n = GET2(entry, 0);
+  if (n < match_data->oveccount)
+    {
+    if (match_data->ovector[n*2] != PCRE2_UNSET)
+      return pcre2_substring_get_bynumber(match_data, n, stringptr, sizeptr);
+    failrc = PCRE2_ERROR_UNSET;
+    }
+  }
+return failrc;
+}
+
+
+
+/*************************************************
+*      Extract captured string to new memory     *
+*************************************************/
+
+/* This function copies a single captured substring into a piece of new
+memory.
+
+Arguments:
+  match_data     points to match data
+  stringnumber   the number of the required substring
+  stringptr      where to put a pointer to the new memory
+  sizeptr        where to put the size of the substring
+
+Returns:         if successful: 0
+                 if not successful, a negative error code:
+                   PCRE2_ERROR_NOMEMORY: failed to get memory
+                   PCRE2_ERROR_NOSUBSTRING: no such substring
+                   PCRE2_ERROR_UNAVAILABLE: ovector too small
+                   PCRE2_ERROR_UNSET: substring is not set
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substring_get_bynumber(pcre2_match_data *match_data,
+  uint32_t stringnumber, PCRE2_UCHAR **stringptr, PCRE2_SIZE *sizeptr)
+{
+int rc;
+PCRE2_SIZE size;
+PCRE2_UCHAR *yield;
+rc = pcre2_substring_length_bynumber(match_data, stringnumber, &size);
+if (rc < 0) return rc;
+yield = PRIV(memctl_malloc)(sizeof(pcre2_memctl) +
+  (size + 1)*PCRE2_CODE_UNIT_WIDTH, (pcre2_memctl *)match_data);
+if (yield == NULL) return PCRE2_ERROR_NOMEMORY;
+yield = (PCRE2_UCHAR *)(((char *)yield) + sizeof(pcre2_memctl));
+memcpy(yield, match_data->subject + match_data->ovector[stringnumber*2],
+  CU2BYTES(size));
+yield[size] = 0;
+*stringptr = yield;
+*sizeptr = size;
+return 0;
+}
+
+
+
+/*************************************************
+*       Free memory obtained by get_substring    *
+*************************************************/
+
+/*
+Argument:     the result of a previous pcre2_substring_get_byxxx()
+Returns:      nothing
+*/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_substring_free(PCRE2_UCHAR *string)
+{
+if (string != NULL)
+  {
+  pcre2_memctl *memctl = (pcre2_memctl *)((char *)string - sizeof(pcre2_memctl));
+  memctl->free(memctl, memctl->memory_data);
+  }
+}
+
+
+
+/*************************************************
+*         Get length of a named substring        *
+*************************************************/
+
+/* This function returns the length of a named captured substring. If the regex
+permits duplicate names, the first substring that is set is chosen.
+
+Arguments:
+  match_data      pointer to match data
+  stringname      the name of the required substring
+  sizeptr         where to put the length
+
+Returns:          0 if successful, else a negative error number
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substring_length_byname(pcre2_match_data *match_data,
+  PCRE2_SPTR stringname, PCRE2_SIZE *sizeptr)
+{
+PCRE2_SPTR first, last, entry;
+int failrc, entrysize;
+if (match_data->matchedby == PCRE2_MATCHEDBY_DFA_INTERPRETER)
+  return PCRE2_ERROR_DFA_UFUNC;
+entrysize = pcre2_substring_nametable_scan(match_data->code, stringname,
+  &first, &last);
+if (entrysize < 0) return entrysize;
+failrc = PCRE2_ERROR_UNAVAILABLE;
+for (entry = first; entry <= last; entry += entrysize)
+  {
+  uint32_t n = GET2(entry, 0);
+  if (n < match_data->oveccount)
+    {
+    if (match_data->ovector[n*2] != PCRE2_UNSET)
+      return pcre2_substring_length_bynumber(match_data, n, sizeptr);
+    failrc = PCRE2_ERROR_UNSET;
+    }
+  }
+return failrc;
+}
+
+
+
+/*************************************************
+*        Get length of a numbered substring      *
+*************************************************/
+
+/* This function returns the length of a captured substring. If the start is
+beyond the end (which can happen when \K is used in an assertion), it sets the
+length to zero.
+
+Arguments:
+  match_data      pointer to match data
+  stringnumber    the number of the required substring
+  sizeptr         where to put the length, if not NULL
+
+Returns:         if successful: 0
+                 if not successful, a negative error code:
+                   PCRE2_ERROR_NOSUBSTRING: no such substring
+                   PCRE2_ERROR_UNAVAILABLE: ovector is too small
+                   PCRE2_ERROR_UNSET: substring is not set
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substring_length_bynumber(pcre2_match_data *match_data,
+  uint32_t stringnumber, PCRE2_SIZE *sizeptr)
+{
+PCRE2_SIZE left, right;
+int count = match_data->rc;
+if (count == PCRE2_ERROR_PARTIAL)
+  {
+  if (stringnumber > 0) return PCRE2_ERROR_PARTIAL;
+  count = 0;
+  }
+else if (count < 0) return count;            /* Match failed */
+
+if (match_data->matchedby != PCRE2_MATCHEDBY_DFA_INTERPRETER)
+  {
+  if (stringnumber > match_data->code->top_bracket)
+    return PCRE2_ERROR_NOSUBSTRING;
+  if (stringnumber >= match_data->oveccount)
+    return PCRE2_ERROR_UNAVAILABLE;
+  if (match_data->ovector[stringnumber*2] == PCRE2_UNSET)
+    return PCRE2_ERROR_UNSET;
+  }
+else  /* Matched using pcre2_dfa_match() */
+  {
+  if (stringnumber >= match_data->oveccount) return PCRE2_ERROR_UNAVAILABLE;
+  if (count != 0 && stringnumber >= (uint32_t)count) return PCRE2_ERROR_UNSET;
+  }
+
+left = match_data->ovector[stringnumber*2];
+right = match_data->ovector[stringnumber*2+1];
+if (sizeptr != NULL) *sizeptr = (left > right)? 0 : right - left;
+return 0;
+}
+
+
+
+/*************************************************
+*    Extract all captured strings to new memory  *
+*************************************************/
+
+/* This function gets one chunk of memory and builds a list of pointers and all
+the captured substrings in it. A NULL pointer is put on the end of the list.
+The substrings are zero-terminated, but also, if the final argument is
+non-NULL, a list of lengths is also returned. This allows binary data to be
+handled.
+
+Arguments:
+  match_data     points to the match data
+  listptr        set to point to the list of pointers
+  lengthsptr     set to point to the list of lengths (may be NULL)
+
+Returns:         if successful: 0
+                 if not successful, a negative error code:
+                   PCRE2_ERROR_NOMEMORY: failed to get memory,
+                   or a match failure code
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substring_list_get(pcre2_match_data *match_data, PCRE2_UCHAR ***listptr,
+  PCRE2_SIZE **lengthsptr)
+{
+int i, count, count2;
+PCRE2_SIZE size;
+PCRE2_SIZE *lensp;
+pcre2_memctl *memp;
+PCRE2_UCHAR **listp;
+PCRE2_UCHAR *sp;
+PCRE2_SIZE *ovector;
+
+if ((count = match_data->rc) < 0) return count;   /* Match failed */
+if (count == 0) count = match_data->oveccount;    /* Ovector too small */
+
+count2 = 2*count;
+ovector = match_data->ovector;
+size = sizeof(pcre2_memctl) + sizeof(PCRE2_UCHAR *);      /* For final NULL */
+if (lengthsptr != NULL) size += sizeof(PCRE2_SIZE) * count;  /* For lengths */
+
+for (i = 0; i < count2; i += 2)
+  {
+  size += sizeof(PCRE2_UCHAR *) + CU2BYTES(1);
+  if (ovector[i+1] > ovector[i]) size += CU2BYTES(ovector[i+1] - ovector[i]);
+  }
+
+memp = PRIV(memctl_malloc)(size, (pcre2_memctl *)match_data);
+if (memp == NULL) return PCRE2_ERROR_NOMEMORY;
+
+*listptr = listp = (PCRE2_UCHAR **)((char *)memp + sizeof(pcre2_memctl));
+lensp = (PCRE2_SIZE *)((char *)listp + sizeof(PCRE2_UCHAR *) * (count + 1));
+
+if (lengthsptr == NULL)
+  {
+  sp = (PCRE2_UCHAR *)lensp;
+  lensp = NULL;
+  }
+else
+  {
+  *lengthsptr = lensp;
+  sp = (PCRE2_UCHAR *)((char *)lensp + sizeof(PCRE2_SIZE) * count);
+  }
+
+for (i = 0; i < count2; i += 2)
+  {
+  size = (ovector[i+1] > ovector[i])? (ovector[i+1] - ovector[i]) : 0;
+
+  /* Size == 0 includes the case when the capture is unset. Avoid adding
+  PCRE2_UNSET to match_data->subject because it overflows, even though with
+  zero size calling memcpy() is harmless. */
+
+  if (size != 0) memcpy(sp, match_data->subject + ovector[i], CU2BYTES(size));
+  *listp++ = sp;
+  if (lensp != NULL) *lensp++ = size;
+  sp += size;
+  *sp++ = 0;
+  }
+
+*listp = NULL;
+return 0;
+}
+
+
+
+/*************************************************
+*   Free memory obtained by substring_list_get   *
+*************************************************/
+
+/*
+Argument:     the result of a previous pcre2_substring_list_get()
+Returns:      nothing
+*/
+
+PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
+pcre2_substring_list_free(PCRE2_SPTR *list)
+{
+if (list != NULL)
+  {
+  pcre2_memctl *memctl = (pcre2_memctl *)((char *)list - sizeof(pcre2_memctl));
+  memctl->free(memctl, memctl->memory_data);
+  }
+}
+
+
+
+/*************************************************
+*     Find (multiple) entries for named string   *
+*************************************************/
+
+/* This function scans the nametable for a given name, using binary chop. It
+returns either two pointers to the entries in the table, or, if no pointers are
+given, the number of a unique group with the given name. If duplicate names are
+permitted, and the name is not unique, an error is generated.
+
+Arguments:
+  code        the compiled regex
+  stringname  the name whose entries required
+  firstptr    where to put the pointer to the first entry
+  lastptr     where to put the pointer to the last entry
+
+Returns:      PCRE2_ERROR_NOSUBSTRING if the name is not found
+              otherwise, if firstptr and lastptr are NULL:
+                a group number for a unique substring
+                else PCRE2_ERROR_NOUNIQUESUBSTRING
+              otherwise:
+                the length of each entry, having set firstptr and lastptr
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substring_nametable_scan(const pcre2_code *code, PCRE2_SPTR stringname,
+  PCRE2_SPTR *firstptr, PCRE2_SPTR *lastptr)
+{
+uint16_t bot = 0;
+uint16_t top = code->name_count;
+uint16_t entrysize = code->name_entry_size;
+PCRE2_SPTR nametable = (PCRE2_SPTR)((char *)code + sizeof(pcre2_real_code));
+
+while (top > bot)
+  {
+  uint16_t mid = (top + bot) / 2;
+  PCRE2_SPTR entry = nametable + entrysize*mid;
+  int c = PRIV(strcmp)(stringname, entry + IMM2_SIZE);
+  if (c == 0)
+    {
+    PCRE2_SPTR first;
+    PCRE2_SPTR last;
+    PCRE2_SPTR lastentry;
+    lastentry = nametable + entrysize * (code->name_count - 1);
+    first = last = entry;
+    while (first > nametable)
+      {
+      if (PRIV(strcmp)(stringname, (first - entrysize + IMM2_SIZE)) != 0) break;
+      first -= entrysize;
+      }
+    while (last < lastentry)
+      {
+      if (PRIV(strcmp)(stringname, (last + entrysize + IMM2_SIZE)) != 0) break;
+      last += entrysize;
+      }
+    if (firstptr == NULL) return (first == last)?
+      (int)GET2(entry, 0) : PCRE2_ERROR_NOUNIQUESUBSTRING;
+    *firstptr = first;
+    *lastptr = last;
+    return entrysize;
+    }
+  if (c > 0) bot = mid + 1; else top = mid;
+  }
+
+return PCRE2_ERROR_NOSUBSTRING;
+}
+
+
+/*************************************************
+*           Find number for named string         *
+*************************************************/
+
+/* This function is a convenience wrapper for pcre2_substring_nametable_scan()
+when it is known that names are unique. If there are duplicate names, it is not
+defined which number is returned.
+
+Arguments:
+  code        the compiled regex
+  stringname  the name whose number is required
+
+Returns:      the number of the named parenthesis, or a negative number
+                PCRE2_ERROR_NOSUBSTRING if not found
+                PCRE2_ERROR_NOUNIQUESUBSTRING if not unique
+*/
+
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_substring_number_from_name(const pcre2_code *code,
+  PCRE2_SPTR stringname)
+{
+return pcre2_substring_nametable_scan(code, stringname, NULL, NULL);
+}
+
+/* End of pcre2_substring.c */
diff --git a/Foundation/src/pcre2_tables.c b/Foundation/src/pcre2_tables.c
new file mode 100644
index 000000000..e7a461679
--- /dev/null
+++ b/Foundation/src/pcre2_tables.c
@@ -0,0 +1,232 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2021 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* This module contains some fixed tables that are used by more than one of the
+PCRE2 code modules. The tables are also #included by the pcre2test program,
+which uses macros to change their names from _pcre2_xxx to xxxx, thereby
+avoiding name clashes with the library. In this case, PCRE2_PCRE2TEST is
+defined. */
+
+#ifndef PCRE2_PCRE2TEST           /* We're compiling the library */
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+#endif /* PCRE2_PCRE2TEST */
+
+/* Table of sizes for the fixed-length opcodes. It's defined in a macro so that
+the definition is next to the definition of the opcodes in pcre2_internal.h.
+This is mode-dependent, so it is skipped when this file is included by
+pcre2test. */
+
+#ifndef PCRE2_PCRE2TEST
+const uint8_t PRIV(OP_lengths)[] = { OP_LENGTHS };
+#endif
+
+/* Tables of horizontal and vertical whitespace characters, suitable for
+adding to classes. */
+
+const uint32_t PRIV(hspace_list)[] = { HSPACE_LIST };
+const uint32_t PRIV(vspace_list)[] = { VSPACE_LIST };
+
+/* These tables are the pairs of delimiters that are valid for callout string
+arguments. For each starting delimiter there must be a matching ending
+delimiter, which in fact is different only for bracket-like delimiters. */
+
+const uint32_t PRIV(callout_start_delims)[] = {
+  CHAR_GRAVE_ACCENT, CHAR_APOSTROPHE, CHAR_QUOTATION_MARK,
+  CHAR_CIRCUMFLEX_ACCENT, CHAR_PERCENT_SIGN, CHAR_NUMBER_SIGN,
+  CHAR_DOLLAR_SIGN, CHAR_LEFT_CURLY_BRACKET, 0 };
+
+const uint32_t PRIV(callout_end_delims[]) = {
+  CHAR_GRAVE_ACCENT, CHAR_APOSTROPHE, CHAR_QUOTATION_MARK,
+  CHAR_CIRCUMFLEX_ACCENT, CHAR_PERCENT_SIGN, CHAR_NUMBER_SIGN,
+  CHAR_DOLLAR_SIGN, CHAR_RIGHT_CURLY_BRACKET, 0 };
+
+
+/*************************************************
+*           Tables for UTF-8 support             *
+*************************************************/
+
+/* These tables are required by pcre2test in 16- or 32-bit mode, as well
+as for the library in 8-bit mode, because pcre2test uses UTF-8 internally for
+handling wide characters. */
+
+#if defined PCRE2_PCRE2TEST || \
+   (defined SUPPORT_UNICODE && \
+    defined PCRE2_CODE_UNIT_WIDTH && \
+    PCRE2_CODE_UNIT_WIDTH == 8)
+
+/* These are the breakpoints for different numbers of bytes in a UTF-8
+character. */
+
+const int PRIV(utf8_table1)[] =
+  { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff};
+
+const int PRIV(utf8_table1_size) = sizeof(PRIV(utf8_table1)) / sizeof(int);
+
+/* These are the indicator bits and the mask for the data bits to set in the
+first byte of a character, indexed by the number of additional bytes. */
+
+const int PRIV(utf8_table2)[] = { 0,    0xc0, 0xe0, 0xf0, 0xf8, 0xfc};
+const int PRIV(utf8_table3)[] = { 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};
+
+/* Table of the number of extra bytes, indexed by the first byte masked with
+0x3f. The highest number for a valid UTF-8 first byte is in fact 0x3d. */
+
+const uint8_t PRIV(utf8_table4)[] = {
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+  3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 };
+
+#endif /* UTF-8 support needed */
+
+/* Tables concerned with Unicode properties are relevant only when Unicode
+support is enabled. See also the pcre2_ucptables.c file, which is generated by
+a Python script from Unicode data files. */
+
+#ifdef SUPPORT_UNICODE
+
+/* Table to translate from particular type value to the general value. */
+
+const uint32_t PRIV(ucp_gentype)[] = {
+  ucp_C, ucp_C, ucp_C, ucp_C, ucp_C,  /* Cc, Cf, Cn, Co, Cs */
+  ucp_L, ucp_L, ucp_L, ucp_L, ucp_L,  /* Ll, Lu, Lm, Lo, Lt */
+  ucp_M, ucp_M, ucp_M,                /* Mc, Me, Mn */
+  ucp_N, ucp_N, ucp_N,                /* Nd, Nl, No */
+  ucp_P, ucp_P, ucp_P, ucp_P, ucp_P,  /* Pc, Pd, Pe, Pf, Pi */
+  ucp_P, ucp_P,                       /* Ps, Po */
+  ucp_S, ucp_S, ucp_S, ucp_S,         /* Sc, Sk, Sm, So */
+  ucp_Z, ucp_Z, ucp_Z                 /* Zl, Zp, Zs */
+};
+
+/* This table encodes the rules for finding the end of an extended grapheme
+cluster. Every code point has a grapheme break property which is one of the
+ucp_gbXX values defined in pcre2_ucp.h. These changed between Unicode versions
+10 and 11. The 2-dimensional table is indexed by the properties of two adjacent
+code points. The left property selects a word from the table, and the right
+property selects a bit from that word like this:
+
+  PRIV(ucp_gbtable)[left-property] & (1u << right-property)
+
+The value is non-zero if a grapheme break is NOT permitted between the relevant
+two code points. The breaking rules are as follows:
+
+1. Break at the start and end of text (pretty obviously).
+
+2. Do not break between a CR and LF; otherwise, break before and after
+   controls.
+
+3. Do not break Hangul syllable sequences, the rules for which are:
+
+    L may be followed by L, V, LV or LVT
+    LV or V may be followed by V or T
+    LVT or T may be followed by T
+
+4. Do not break before extending characters or zero-width-joiner (ZWJ).
+
+The following rules are only for extended grapheme clusters (but that's what we
+are implementing).
+
+5. Do not break before SpacingMarks.
+
+6. Do not break after Prepend characters.
+
+7. Do not break within emoji modifier sequences or emoji zwj sequences. That
+   is, do not break between characters with the Extended_Pictographic property.
+   Extend and ZWJ characters are allowed between the characters; this cannot be
+   represented in this table, the code has to deal with it.
+
+8. Do not break within emoji flag sequences. That is, do not break between
+   regional indicator (RI) symbols if there are an odd number of RI characters
+   before the break point. This table encodes "join RI characters"; the code
+   has to deal with checking for previous adjoining RIs.
+
+9. Otherwise, break everywhere.
+*/
+
+#define ESZ (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbZWJ)
+
+const uint32_t PRIV(ucp_gbtable)[] = {
+   (1u<<ucp_gbLF),                                      /*  0 CR */
+   0,                                                   /*  1 LF */
+   0,                                                   /*  2 Control */
+   ESZ,                                                 /*  3 Extend */
+   ESZ|(1u<<ucp_gbPrepend)|                             /*  4 Prepend */
+       (1u<<ucp_gbL)|(1u<<ucp_gbV)|(1u<<ucp_gbT)|
+       (1u<<ucp_gbLV)|(1u<<ucp_gbLVT)|(1u<<ucp_gbOther)|
+       (1u<<ucp_gbRegional_Indicator),
+   ESZ,                                                 /*  5 SpacingMark */
+   ESZ|(1u<<ucp_gbL)|(1u<<ucp_gbV)|(1u<<ucp_gbLV)|      /*  6 L */
+       (1u<<ucp_gbLVT),
+   ESZ|(1u<<ucp_gbV)|(1u<<ucp_gbT),                     /*  7 V */
+   ESZ|(1u<<ucp_gbT),                                   /*  8 T */
+   ESZ|(1u<<ucp_gbV)|(1u<<ucp_gbT),                     /*  9 LV */
+   ESZ|(1u<<ucp_gbT),                                   /* 10 LVT */
+   (1u<<ucp_gbRegional_Indicator),                      /* 11 Regional Indicator */
+   ESZ,                                                 /* 12 Other */
+   ESZ,                                                 /* 13 ZWJ */
+   ESZ|(1u<<ucp_gbExtended_Pictographic)                /* 14 Extended Pictographic */
+};
+
+#undef ESZ
+
+#ifdef SUPPORT_JIT
+/* This table reverses PRIV(ucp_gentype). We can save the cost
+of a memory load. */
+
+const int PRIV(ucp_typerange)[] = {
+  ucp_Cc, ucp_Cs,
+  ucp_Ll, ucp_Lu,
+  ucp_Mc, ucp_Mn,
+  ucp_Nd, ucp_No,
+  ucp_Pc, ucp_Ps,
+  ucp_Sc, ucp_So,
+  ucp_Zl, ucp_Zs,
+};
+#endif /* SUPPORT_JIT */
+
+/* Finally, include the tables that are auto-generated from the Unicode data
+files. */
+
+#include "pcre2_ucptables.c"
+
+#endif /* SUPPORT_UNICODE */
+
+/* End of pcre2_tables.c */
diff --git a/Foundation/src/pcre2_ucd.c b/Foundation/src/pcre2_ucd.c
new file mode 100644
index 000000000..74e2e9e9d
--- /dev/null
+++ b/Foundation/src/pcre2_ucd.c
@@ -0,0 +1,5394 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2022 University of Cambridge
+
+This module is auto-generated from Unicode data files. DO NOT EDIT MANUALLY!
+Instead, modify the maint/GenerateUcd.py script and run it to generate
+a new version of this code.
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* This file contains tables of Unicode properties that are extracted from
+Unicode data files. See the comments at the start of maint/GenerateUcd.py for
+details.
+
+As well as being part of the PCRE2 library, this file is #included by the
+pcre2test program, which redefines the PRIV macro to change table names from
+_pcre2_xxx to xxxx, thereby avoiding name clashes with the library. At present,
+just one of these tables is actually needed. When compiling the library, some
+headers are needed. */
+
+#ifndef PCRE2_PCRE2TEST
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+#endif /* PCRE2_PCRE2TEST */
+
+/* The tables herein are needed only when UCP support is built, and in PCRE2
+that happens automatically with UTF support. This module should not be
+referenced otherwise, so it should not matter whether it is compiled or not.
+However a comment was received about space saving - maybe the guy linked all
+the modules rather than using a library - so we include a condition to cut out
+the tables when not needed. But don't leave a totally empty module because some
+compilers barf at that. Instead, just supply some small dummy tables. */
+
+#ifndef SUPPORT_UNICODE
+const ucd_record PRIV(ucd_records)[] = {{0,0,0,0,0,0,0 }};
+const uint16_t PRIV(ucd_stage1)[] = {0};
+const uint16_t PRIV(ucd_stage2)[] = {0};
+const uint32_t PRIV(ucd_caseless_sets)[] = {0};
+#else
+
+/* Total size: 111116 bytes, block size: 128. */
+
+const char *PRIV(unicode_version) = "14.0.0";
+
+/* When recompiling tables with a new Unicode version, please check the types
+in this structure definition with those in pcre2_internal.h (the actual field
+names will be different).
+
+typedef struct {
+uint8_t property_0;
+uint8_t property_1;
+uint8_t property_2;
+uint8_t property_3;
+int32_t property_4;
+uint16_t property_5;
+uint16_t property_6;
+} ucd_record;
+*/
+
+/* If the 32-bit library is run in non-32-bit mode, character values greater
+than 0x10ffff may be encountered. For these we set up a special record. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+const ucd_record PRIV(dummy_ucd_record)[] = {{
+  ucp_Unknown,    /* script */
+  ucp_Cn,         /* type unassigned */
+  ucp_gbOther,    /* grapheme break property */
+  0,              /* case set */
+  0,              /* other case */
+  0 | (ucp_bidiL << UCD_BIDICLASS_SHIFT), /* script extension and bidi class */
+  0,              /* bool properties offset */
+  }};
+#endif
+
+/* This table contains lists of characters that are caseless sets of
+more than one character. Each list is terminated by NOTACHAR. */
+
+const uint32_t PRIV(ucd_caseless_sets)[] = {
+  NOTACHAR,
+  0x0053,  0x0073,  0x017f,  NOTACHAR,
+  0x01c4,  0x01c5,  0x01c6,  NOTACHAR,
+  0x01c7,  0x01c8,  0x01c9,  NOTACHAR,
+  0x01ca,  0x01cb,  0x01cc,  NOTACHAR,
+  0x01f1,  0x01f2,  0x01f3,  NOTACHAR,
+  0x0345,  0x0399,  0x03b9,  0x1fbe,  NOTACHAR,
+  0x00b5,  0x039c,  0x03bc,  NOTACHAR,
+  0x03a3,  0x03c2,  0x03c3,  NOTACHAR,
+  0x0392,  0x03b2,  0x03d0,  NOTACHAR,
+  0x0398,  0x03b8,  0x03d1,  0x03f4,  NOTACHAR,
+  0x03a6,  0x03c6,  0x03d5,  NOTACHAR,
+  0x03a0,  0x03c0,  0x03d6,  NOTACHAR,
+  0x039a,  0x03ba,  0x03f0,  NOTACHAR,
+  0x03a1,  0x03c1,  0x03f1,  NOTACHAR,
+  0x0395,  0x03b5,  0x03f5,  NOTACHAR,
+  0x0412,  0x0432,  0x1c80,  NOTACHAR,
+  0x0414,  0x0434,  0x1c81,  NOTACHAR,
+  0x041e,  0x043e,  0x1c82,  NOTACHAR,
+  0x0421,  0x0441,  0x1c83,  NOTACHAR,
+  0x0422,  0x0442,  0x1c84,  0x1c85,  NOTACHAR,
+  0x042a,  0x044a,  0x1c86,  NOTACHAR,
+  0x0462,  0x0463,  0x1c87,  NOTACHAR,
+  0x1e60,  0x1e61,  0x1e9b,  NOTACHAR,
+  0x03a9,  0x03c9,  0x2126,  NOTACHAR,
+  0x004b,  0x006b,  0x212a,  NOTACHAR,
+  0x00c5,  0x00e5,  0x212b,  NOTACHAR,
+  0x1c88,  0xa64a,  0xa64b,  NOTACHAR,
+};
+
+/* When #included in pcre2test, we don't need the table of digit sets, nor the
+the large main UCD tables. */
+
+#ifndef PCRE2_PCRE2TEST
+
+/* This table lists the code points for the '9' characters in each set of
+decimal digits. It is used to ensure that all the digits in a script run come
+from the same set. */
+
+const uint32_t PRIV(ucd_digit_sets)[] = {
+  66,  /* Number of subsequent values */
+  0x00039, 0x00669, 0x006f9, 0x007c9, 0x0096f, 0x009ef, 0x00a6f, 0x00aef,
+  0x00b6f, 0x00bef, 0x00c6f, 0x00cef, 0x00d6f, 0x00def, 0x00e59, 0x00ed9,
+  0x00f29, 0x01049, 0x01099, 0x017e9, 0x01819, 0x0194f, 0x019d9, 0x01a89,
+  0x01a99, 0x01b59, 0x01bb9, 0x01c49, 0x01c59, 0x0a629, 0x0a8d9, 0x0a909,
+  0x0a9d9, 0x0a9f9, 0x0aa59, 0x0abf9, 0x0ff19, 0x104a9, 0x10d39, 0x1106f,
+  0x110f9, 0x1113f, 0x111d9, 0x112f9, 0x11459, 0x114d9, 0x11659, 0x116c9,
+  0x11739, 0x118e9, 0x11959, 0x11c59, 0x11d59, 0x11da9, 0x16a69, 0x16ac9,
+  0x16b59, 0x1d7d7, 0x1d7e1, 0x1d7eb, 0x1d7f5, 0x1d7ff, 0x1e149, 0x1e2f9,
+  0x1e959, 0x1fbf9,
+};
+
+/* This vector is a list of script bitsets for the Script Extension property.
+The number of 32-bit words in each bitset is #defined in pcre2_ucp.h as
+ucd_script_sets_item_size. */
+
+const uint32_t PRIV(ucd_script_sets)[] = {
+ 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000080u, 0x00000000u, 0x00000000u,
+ 0x00000040u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x00004000u, 0x00000000u,
+ 0x00000002u, 0x00000000u, 0x00000000u,
+ 0x00800000u, 0x00000000u, 0x00000000u,
+ 0x00000001u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x00000000u, 0x00000001u,
+ 0x00000010u, 0x00000000u, 0x00000000u,
+ 0x00000008u, 0x00000004u, 0x00000000u,
+ 0x00000008u, 0x40000000u, 0x00000000u,
+ 0x00000008u, 0x00000040u, 0x00000000u,
+ 0x00000018u, 0x00000000u, 0x00000000u,
+ 0x00000028u, 0x00000000u, 0x00000000u,
+ 0x000000c0u, 0x00000000u, 0x00000000u,
+ 0x00c00000u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x00000102u, 0x00000000u,
+ 0x80000000u, 0x00000001u, 0x00000000u,
+ 0x00000004u, 0x00000008u, 0x00000000u,
+ 0x00000005u, 0x00000000u, 0x00000000u,
+ 0x00000004u, 0x00200000u, 0x00000000u,
+ 0x00000014u, 0x00000000u, 0x00000000u,
+ 0x00000040u, 0x00008000u, 0x00000000u,
+ 0x00000040u, 0x00000000u, 0x00000001u,
+ 0x00000040u, 0x00001000u, 0x00000000u,
+ 0x00000840u, 0x00000000u, 0x00000000u,
+ 0x00020001u, 0x00000000u, 0x00000000u,
+ 0x00000800u, 0x00008000u, 0x00000000u,
+ 0x00000200u, 0x00010000u, 0x00000000u,
+ 0x00000100u, 0x02000000u, 0x00000000u,
+ 0x00800001u, 0x00000000u, 0x00000000u,
+ 0x00300000u, 0x00000000u, 0x00000000u,
+ 0x00002000u, 0x00000000u, 0x00000001u,
+ 0x00080001u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x00080000u, 0x00000008u,
+ 0x00080000u, 0x00000020u, 0x00000000u,
+ 0x00000038u, 0x00000000u, 0x00000000u,
+ 0x00000028u, 0x00000000u, 0x00000002u,
+ 0x00000080u, 0x00000810u, 0x00000000u,
+ 0x40010000u, 0x00000800u, 0x00000000u,
+ 0x80000000u, 0x00000001u, 0x00000004u,
+ 0x80000000u, 0x00020001u, 0x00000000u,
+ 0x00002040u, 0x00008000u, 0x00000000u,
+ 0x00000041u, 0x00008000u, 0x00000000u,
+ 0x00b00000u, 0x00000000u, 0x00000000u,
+ 0x00010001u, 0x00000080u, 0x00000000u,
+ 0x000020c0u, 0x00008000u, 0x00000000u,
+ 0x1e000000u, 0x00000000u, 0x00000000u,
+ 0x00000040u, 0x10040200u, 0x00000000u,
+ 0x00f40000u, 0x00000000u, 0x00000000u,
+ 0x00000038u, 0x40000040u, 0x00000002u,
+ 0x01f40000u, 0x00000000u, 0x00000000u,
+ 0x00007c40u, 0x00000000u, 0x00000000u,
+ 0x00000038u, 0x44000040u, 0x00000002u,
+ 0x000034c0u, 0x01008000u, 0x00000001u,
+ 0x00000018u, 0xc4480400u, 0x00000008u,
+ 0x00000340u, 0x11952200u, 0x00000000u,
+ 0x00007fc1u, 0x01008000u, 0x00000000u,
+ 0x00007fc1u, 0x01009000u, 0x00000000u,
+ 0x00002340u, 0x11952200u, 0x00000001u,
+ 0x00006340u, 0x11952200u, 0x00000001u,
+ 0x0000ffc0u, 0x3984a010u, 0x00000001u,
+ 0x2000ffc0u, 0x3984a010u, 0x00000001u,
+};
+
+/* This vector is a list of bitsets for Boolean properties. The number of
+32_bit words in each bitset is #defined as ucd_boolprop_sets_item_size in
+pcre2_ucp.h. */
+
+const uint32_t PRIV(ucd_boolprop_sets)[] = {
+ 0x00000000u, 0x00000000u,
+ 0x00000001u, 0x00000000u,
+ 0x00000001u, 0x00020040u,
+ 0x00800001u, 0x00020040u,
+ 0x00800001u, 0x00002820u,
+ 0x00800001u, 0x00000120u,
+ 0x00830001u, 0x00000020u,
+ 0x00800001u, 0x00000020u,
+ 0x00800021u, 0x00000120u,
+ 0x00800011u, 0x00000020u,
+ 0x00800001u, 0x00000028u,
+ 0x00800001u, 0x00002020u,
+ 0x00801001u, 0x00000020u,
+ 0x00800021u, 0x00002820u,
+ 0x24830003u, 0x00040000u,
+ 0x00800021u, 0x00002020u,
+ 0x00800011u, 0x00000028u,
+ 0x648003c7u, 0x000c8000u,
+ 0x608003c5u, 0x000c8000u,
+ 0x00808021u, 0x00000028u,
+ 0x20800001u, 0x00040000u,
+ 0x00808021u, 0x00000020u,
+ 0x64800d47u, 0x000c0004u,
+ 0x60800d45u, 0x000c0004u,
+ 0x60800d45u, 0x000c1004u,
+ 0x00000000u, 0x00020040u,
+ 0x00800000u, 0x00020000u,
+ 0x00800000u, 0x00000020u,
+ 0x00808020u, 0x00000000u,
+ 0x00a10000u, 0x00000020u,
+ 0x60800044u, 0x000c0004u,
+ 0x00800010u, 0x00000120u,
+ 0x00800000u, 0x00000028u,
+ 0x00002020u, 0x00000000u,
+ 0x00800000u, 0x00000000u,
+ 0x60800dc4u, 0x000c0004u,
+ 0x20c08020u, 0x00040000u,
+ 0x608003c4u, 0x000c8000u,
+ 0x60800d44u, 0x000c0004u,
+ 0x60800d44u, 0x000c1004u,
+ 0x60804dc4u, 0x000c0004u,
+ 0x60800004u, 0x000c0000u,
+ 0x608007c4u, 0x000c8000u,
+ 0x60800bc4u, 0x000c0000u,
+ 0x60808064u, 0x000c0004u,
+ 0x60808064u, 0x000c1004u,
+ 0x60808024u, 0x000c0000u,
+ 0x60c08024u, 0x000c0000u,
+ 0x21008020u, 0x00040000u,
+ 0x21008de4u, 0x00040004u,
+ 0x21002020u, 0x00040000u,
+ 0x21000020u, 0x00040000u,
+ 0x60808064u, 0x00000004u,
+ 0x00800000u, 0x00002000u,
+ 0x20800020u, 0x00042000u,
+ 0x60800dc4u, 0x000c000cu,
+ 0x60800044u, 0x000c8008u,
+ 0x60800044u, 0x000c8000u,
+ 0x608003c4u, 0x000c8008u,
+ 0x00800000u, 0x00000008u,
+ 0x01000020u, 0x00000000u,
+ 0x00800020u, 0x00000000u,
+ 0x00800000u, 0x00002800u,
+ 0x00801000u, 0x00000000u,
+ 0x21008024u, 0x00040000u,
+ 0x21000024u, 0x00040000u,
+ 0x00000020u, 0x00000080u,
+ 0x00002028u, 0x00000000u,
+ 0x60c00024u, 0x000c0000u,
+ 0x20800000u, 0x00040000u,
+ 0x60804004u, 0x000c0000u,
+ 0x60800024u, 0x000c0000u,
+ 0x20800004u, 0x00040000u,
+ 0x23008020u, 0x00040000u,
+ 0x21000004u, 0x00040000u,
+ 0x21408020u, 0x00040000u,
+ 0x60800004u, 0x00040000u,
+ 0x23000024u, 0x00040000u,
+ 0x60800004u, 0x000c0002u,
+ 0x00800010u, 0x00000000u,
+ 0x20808000u, 0x00040000u,
+ 0x21004024u, 0x00040000u,
+ 0x20808004u, 0x00040000u,
+ 0x60800944u, 0x000c0004u,
+ 0x60802004u, 0x000c0000u,
+ 0x60800344u, 0x000c8000u,
+ 0x22808000u, 0x00040000u,
+ 0x22800000u, 0x00040000u,
+ 0x00c00000u, 0x00000000u,
+ 0x21002020u, 0x00050000u,
+ 0x61000024u, 0x000c0000u,
+ 0x23000020u, 0x00040000u,
+ 0x01008020u, 0x00000000u,
+ 0x21408024u, 0x00040000u,
+ 0x00808000u, 0x00000000u,
+ 0x60800064u, 0x000c0004u,
+ 0x60800044u, 0x000c1004u,
+ 0x60800064u, 0x000c1004u,
+ 0x01002020u, 0x00000001u,
+ 0x00022020u, 0x00000001u,
+ 0x00002028u, 0x00000040u,
+ 0x00801000u, 0x00000020u,
+ 0x00800020u, 0x00000120u,
+ 0x00800000u, 0x00000120u,
+ 0x00800020u, 0x00000020u,
+ 0x00a10000u, 0x00002820u,
+ 0x00800000u, 0x00002820u,
+ 0x20800000u, 0x00040008u,
+ 0x00800010u, 0x00000020u,
+ 0x00002020u, 0x00000008u,
+ 0x00002000u, 0x00000000u,
+ 0x00006020u, 0x00000000u,
+ 0x00801000u, 0x00000008u,
+ 0x00800010u, 0x00000008u,
+ 0x21000020u, 0x00040008u,
+ 0x01020020u, 0x00000000u,
+ 0x60800044u, 0x000c000cu,
+ 0x60800000u, 0x000c0008u,
+ 0x00a10000u, 0x00000000u,
+ 0x60800000u, 0x000c0000u,
+ 0x60800004u, 0x000c0008u,
+ 0x60a10044u, 0x000c0004u,
+ 0x60800044u, 0x000c100cu,
+ 0x00a10000u, 0x00000028u,
+ 0x00800010u, 0x00000028u,
+ 0x00801000u, 0x00000028u,
+ 0x00b10000u, 0x00000020u,
+ 0x00804010u, 0x00000020u,
+ 0x00a00000u, 0x00000020u,
+ 0x00000000u, 0x00000020u,
+ 0x008003c4u, 0x00008000u,
+ 0x00a103c4u, 0x00008000u,
+ 0x00800d44u, 0x00000004u,
+ 0x00b10000u, 0x00000028u,
+ 0x00a00000u, 0x00000028u,
+ 0x00a90000u, 0x00000020u,
+ 0x00b90000u, 0x00000020u,
+ 0x00808024u, 0x00000020u,
+ 0x00800000u, 0x00002020u,
+ 0x00800000u, 0x00000200u,
+ 0x08800000u, 0x00000000u,
+ 0x10800000u, 0x00000000u,
+ 0xe0800004u, 0x000c0000u,
+ 0x21008000u, 0x00040000u,
+ 0x00a11000u, 0x00000020u,
+ 0x60808020u, 0x00000000u,
+ 0xe0800004u, 0x000c4000u,
+ 0x60808004u, 0x000c0000u,
+ 0x60800004u, 0x00000000u,
+ 0x00000000u, 0x00000010u,
+ 0x21022020u, 0x00050000u,
+ 0x00800000u, 0x00000100u,
+ 0x00800020u, 0x00002800u,
+ 0x00800020u, 0x00002000u,
+ 0x00800020u, 0x00000100u,
+ 0x24800000u, 0x00040000u,
+ 0x648003c4u, 0x000c8000u,
+ 0x00808020u, 0x00000008u,
+ 0x64800d44u, 0x000c0004u,
+ 0x00800010u, 0x00000100u,
+ 0x61008024u, 0x00040000u,
+ 0x00000020u, 0x00000000u,
+ 0x60c00004u, 0x000c0000u,
+ 0x21400020u, 0x00040000u,
+ 0xa1000020u, 0x00040000u,
+ 0x21000000u, 0x00040000u,
+ 0x00a00000u, 0x00000000u,
+ 0x00b10000u, 0x00000000u,
+ 0x00200000u, 0x00000000u,
+ 0x00800044u, 0x00008000u,
+ 0x00a10044u, 0x00008000u,
+ 0x00930000u, 0x00000400u,
+ 0x00b90000u, 0x00000000u,
+ 0x00a90000u, 0x00000000u,
+ 0x00970020u, 0x00000000u,
+ 0x00b30000u, 0x00000000u,
+ 0x01022020u, 0x00000000u,
+};
+
+/* These are the main two-stage UCD tables. The fields in each record are:
+script (8 bits), character type (8 bits), grapheme break property (8 bits),
+offset to multichar other cases or zero (8 bits), offset to other case or zero
+(32 bits, signed), bidi class (5 bits) and script extension (11 bits) packed
+into a 16-bit field, and offset in binary properties table (16 bits). */
+
+const ucd_record PRIV(ucd_records)[] = { /* 16908 bytes, record size 12 */
+  {    69,      0,      2,      0,      0,   6144,      2, }, /*   0 */
+  {    69,      0,      2,      0,      0,  43008,      4, }, /*   1 */
+  {    69,      0,      1,      0,      0,   4096,      4, }, /*   2 */
+  {    69,      0,      2,      0,      0,  45056,      4, }, /*   3 */
+  {    69,      0,      0,      0,      0,   4096,      4, }, /*   4 */
+  {    69,      0,      2,      0,      0,   4096,      2, }, /*   5 */
+  {    69,      0,      2,      0,      0,  43008,      2, }, /*   6 */
+  {    69,     29,     12,      0,      0,  45056,      6, }, /*   7 */
+  {    69,     21,     12,      0,      0,  28672,      8, }, /*   8 */
+  {    69,     21,     12,      0,      0,  28672,     10, }, /*   9 */
+  {    69,     21,     12,      0,      0,  14336,     12, }, /*  10 */
+  {    69,     23,     12,      0,      0,  14336,     14, }, /*  11 */
+  {    69,     21,     12,      0,      0,  14336,     14, }, /*  12 */
+  {    69,     21,     12,      0,      0,  28672,     14, }, /*  13 */
+  {    69,     21,     12,      0,      0,  28672,     16, }, /*  14 */
+  {    69,     22,     12,      0,      0,  28672,     18, }, /*  15 */
+  {    69,     18,     12,      0,      0,  28672,     18, }, /*  16 */
+  {    69,     21,     12,      0,      0,  28672,     12, }, /*  17 */
+  {    69,     25,     12,      0,      0,  12288,     20, }, /*  18 */
+  {    69,     21,     12,      0,      0,   8192,     22, }, /*  19 */
+  {    69,     17,     12,      0,      0,  12288,     24, }, /*  20 */
+  {    69,     21,     12,      0,      0,   8192,     26, }, /*  21 */
+  {    69,     21,     12,      0,      0,   8192,     14, }, /*  22 */
+  {    69,     13,     12,      0,      0,  10240,     28, }, /*  23 */
+  {    69,     21,     12,      0,      0,   8192,     30, }, /*  24 */
+  {    69,     21,     12,      0,      0,  28672,     22, }, /*  25 */
+  {    69,     25,     12,      0,      0,  28672,     32, }, /*  26 */
+  {    69,     25,     12,      0,      0,  28672,     20, }, /*  27 */
+  {     0,      9,     12,      0,     32,  18432,     34, }, /*  28 */
+  {     0,      9,     12,      0,     32,  18432,     36, }, /*  29 */
+  {     0,      9,     12,    100,     32,  18432,     36, }, /*  30 */
+  {     0,      9,     12,      1,     32,  18432,     36, }, /*  31 */
+  {    69,     24,     12,      0,      0,  28672,     38, }, /*  32 */
+  {    69,     16,     12,      0,      0,  28672,     40, }, /*  33 */
+  {    69,     24,     12,      0,      0,  28672,     42, }, /*  34 */
+  {     0,      5,     12,      0,    -32,  18432,     44, }, /*  35 */
+  {     0,      5,     12,      0,    -32,  18432,     46, }, /*  36 */
+  {     0,      5,     12,      0,    -32,  18432,     48, }, /*  37 */
+  {     0,      5,     12,    100,    -32,  18432,     46, }, /*  38 */
+  {     0,      5,     12,      1,    -32,  18432,     46, }, /*  39 */
+  {    69,      0,      2,      0,      0,   6144,      0, }, /*  40 */
+  {    69,      0,      2,      0,      0,   4096,     50, }, /*  41 */
+  {    69,     29,     12,      0,      0,   8192,     52, }, /*  42 */
+  {    69,     21,     12,      0,      0,  28672,     54, }, /*  43 */
+  {    69,     23,     12,      0,      0,  14336,     54, }, /*  44 */
+  {    69,     26,     12,      0,      0,  28672,     54, }, /*  45 */
+  {    69,     24,     12,      0,      0,  28672,     56, }, /*  46 */
+  {    69,     26,     14,      0,      0,  28672,     58, }, /*  47 */
+  {     0,      7,     12,      0,      0,  18432,     60, }, /*  48 */
+  {    69,     20,     12,      0,      0,  28672,     62, }, /*  49 */
+  {    69,     25,     12,      0,      0,  28672,     64, }, /*  50 */
+  {    69,      1,      2,      0,      0,   6144,     66, }, /*  51 */
+  {    69,     26,     12,      0,      0,  14336,     54, }, /*  52 */
+  {    69,     25,     12,      0,      0,  14336,     64, }, /*  53 */
+  {    69,     15,     12,      0,      0,  10240,     68, }, /*  54 */
+  {    69,      5,     12,     26,    775,  18432,     70, }, /*  55 */
+  {    69,     21,     12,      0,      0,  28672,     72, }, /*  56 */
+  {    69,     19,     12,      0,      0,  28672,     62, }, /*  57 */
+  {    69,     15,     12,      0,      0,  28672,     68, }, /*  58 */
+  {     0,      9,     12,      0,     32,  18432,     74, }, /*  59 */
+  {     0,      9,     12,    104,     32,  18432,     74, }, /*  60 */
+  {     0,      5,     12,      0,   7615,  18432,     70, }, /*  61 */
+  {     0,      5,     12,      0,    -32,  18432,     76, }, /*  62 */
+  {     0,      5,     12,    104,    -32,  18432,     76, }, /*  63 */
+  {     0,      5,     12,      0,    121,  18432,     76, }, /*  64 */
+  {     0,      9,     12,      0,      1,  18432,     74, }, /*  65 */
+  {     0,      5,     12,      0,     -1,  18432,     76, }, /*  66 */
+  {     0,      5,     12,      0,     -1,  18432,     78, }, /*  67 */
+  {     0,      9,     12,      0,      0,  18432,     74, }, /*  68 */
+  {     0,      5,     12,      0,      0,  18432,     76, }, /*  69 */
+  {     0,      5,     12,      0,      0,  18432,     60, }, /*  70 */
+  {     0,      5,     12,      0,      0,  18432,     80, }, /*  71 */
+  {     0,      9,     12,      0,   -121,  18432,     74, }, /*  72 */
+  {     0,      5,     12,      1,   -268,  18432,     70, }, /*  73 */
+  {     0,      5,     12,      0,    195,  18432,     76, }, /*  74 */
+  {     0,      9,     12,      0,    210,  18432,     74, }, /*  75 */
+  {     0,      9,     12,      0,    206,  18432,     74, }, /*  76 */
+  {     0,      9,     12,      0,    205,  18432,     74, }, /*  77 */
+  {     0,      9,     12,      0,     79,  18432,     74, }, /*  78 */
+  {     0,      9,     12,      0,    202,  18432,     74, }, /*  79 */
+  {     0,      9,     12,      0,    203,  18432,     74, }, /*  80 */
+  {     0,      9,     12,      0,    207,  18432,     74, }, /*  81 */
+  {     0,      5,     12,      0,     97,  18432,     76, }, /*  82 */
+  {     0,      9,     12,      0,    211,  18432,     74, }, /*  83 */
+  {     0,      9,     12,      0,    209,  18432,     74, }, /*  84 */
+  {     0,      5,     12,      0,    163,  18432,     76, }, /*  85 */
+  {     0,      9,     12,      0,    213,  18432,     74, }, /*  86 */
+  {     0,      5,     12,      0,    130,  18432,     76, }, /*  87 */
+  {     0,      9,     12,      0,    214,  18432,     74, }, /*  88 */
+  {     0,      9,     12,      0,    218,  18432,     74, }, /*  89 */
+  {     0,      9,     12,      0,    217,  18432,     74, }, /*  90 */
+  {     0,      9,     12,      0,    219,  18432,     74, }, /*  91 */
+  {     0,      7,     12,      0,      0,  18432,     82, }, /*  92 */
+  {     0,      5,     12,      0,     56,  18432,     76, }, /*  93 */
+  {     0,      9,     12,      5,      2,  18432,     84, }, /*  94 */
+  {     0,      8,     12,      5,      1,  18432,     86, }, /*  95 */
+  {     0,      5,     12,      5,     -2,  18432,     76, }, /*  96 */
+  {     0,      9,     12,      9,      2,  18432,     84, }, /*  97 */
+  {     0,      8,     12,      9,      1,  18432,     86, }, /*  98 */
+  {     0,      5,     12,      9,     -2,  18432,     76, }, /*  99 */
+  {     0,      9,     12,     13,      2,  18432,     84, }, /* 100 */
+  {     0,      8,     12,     13,      1,  18432,     86, }, /* 101 */
+  {     0,      5,     12,     13,     -2,  18432,     76, }, /* 102 */
+  {     0,      5,     12,      0,    -79,  18432,     76, }, /* 103 */
+  {     0,      9,     12,     17,      2,  18432,     84, }, /* 104 */
+  {     0,      8,     12,     17,      1,  18432,     86, }, /* 105 */
+  {     0,      5,     12,     17,     -2,  18432,     76, }, /* 106 */
+  {     0,      9,     12,      0,    -97,  18432,     74, }, /* 107 */
+  {     0,      9,     12,      0,    -56,  18432,     74, }, /* 108 */
+  {     0,      9,     12,      0,   -130,  18432,     74, }, /* 109 */
+  {     0,      9,     12,      0,  10795,  18432,     74, }, /* 110 */
+  {     0,      9,     12,      0,   -163,  18432,     74, }, /* 111 */
+  {     0,      9,     12,      0,  10792,  18432,     74, }, /* 112 */
+  {     0,      5,     12,      0,  10815,  18432,     76, }, /* 113 */
+  {     0,      9,     12,      0,   -195,  18432,     74, }, /* 114 */
+  {     0,      9,     12,      0,     69,  18432,     74, }, /* 115 */
+  {     0,      9,     12,      0,     71,  18432,     74, }, /* 116 */
+  {     0,      5,     12,      0,  10783,  18432,     76, }, /* 117 */
+  {     0,      5,     12,      0,  10780,  18432,     76, }, /* 118 */
+  {     0,      5,     12,      0,  10782,  18432,     76, }, /* 119 */
+  {     0,      5,     12,      0,   -210,  18432,     76, }, /* 120 */
+  {     0,      5,     12,      0,   -206,  18432,     76, }, /* 121 */
+  {     0,      5,     12,      0,   -205,  18432,     76, }, /* 122 */
+  {     0,      5,     12,      0,   -202,  18432,     76, }, /* 123 */
+  {     0,      5,     12,      0,   -203,  18432,     76, }, /* 124 */
+  {     0,      5,     12,      0,  42319,  18432,     76, }, /* 125 */
+  {     0,      5,     12,      0,  42315,  18432,     76, }, /* 126 */
+  {     0,      5,     12,      0,   -207,  18432,     76, }, /* 127 */
+  {     0,      5,     12,      0,  42280,  18432,     76, }, /* 128 */
+  {     0,      5,     12,      0,  42308,  18432,     76, }, /* 129 */
+  {     0,      5,     12,      0,   -209,  18432,     78, }, /* 130 */
+  {     0,      5,     12,      0,   -211,  18432,     76, }, /* 131 */
+  {     0,      5,     12,      0,  10743,  18432,     76, }, /* 132 */
+  {     0,      5,     12,      0,  42305,  18432,     76, }, /* 133 */
+  {     0,      5,     12,      0,  10749,  18432,     76, }, /* 134 */
+  {     0,      5,     12,      0,   -213,  18432,     76, }, /* 135 */
+  {     0,      5,     12,      0,   -214,  18432,     76, }, /* 136 */
+  {     0,      5,     12,      0,  10727,  18432,     76, }, /* 137 */
+  {     0,      5,     12,      0,   -218,  18432,     76, }, /* 138 */
+  {     0,      5,     12,      0,  42307,  18432,     76, }, /* 139 */
+  {     0,      5,     12,      0,  42282,  18432,     76, }, /* 140 */
+  {     0,      5,     12,      0,    -69,  18432,     76, }, /* 141 */
+  {     0,      5,     12,      0,   -217,  18432,     76, }, /* 142 */
+  {     0,      5,     12,      0,    -71,  18432,     76, }, /* 143 */
+  {     0,      5,     12,      0,   -219,  18432,     76, }, /* 144 */
+  {     0,      5,     12,      0,  42261,  18432,     78, }, /* 145 */
+  {     0,      5,     12,      0,  42258,  18432,     76, }, /* 146 */
+  {     0,      6,     12,      0,      0,  18432,     88, }, /* 147 */
+  {     0,      6,     12,      0,      0,  18432,     90, }, /* 148 */
+  {    69,      6,     12,      0,      0,  28672,     92, }, /* 149 */
+  {    69,      6,     12,      0,      0,  18432,     92, }, /* 150 */
+  {    69,      6,     12,      0,      0,  18432,     88, }, /* 151 */
+  {    69,      6,     12,      0,      0,  18432,     94, }, /* 152 */
+  {    22,     24,     12,      0,      0,  28672,     56, }, /* 153 */
+  {    84,     12,      3,      0,      0,  26624,     96, }, /* 154 */
+  {    84,     12,      3,      0,      0,  26636,     96, }, /* 155 */
+  {    84,     12,      3,     21,    116,  26636,     98, }, /* 156 */
+  {    84,     12,      3,      0,      0,  26624,    100, }, /* 157 */
+  {    84,     12,      3,      0,      0,  26624,    102, }, /* 158 */
+  {    84,     12,      3,      0,      0,  26642,    102, }, /* 159 */
+  {     1,      9,     12,      0,      1,  18432,     74, }, /* 160 */
+  {     1,      5,     12,      0,     -1,  18432,     76, }, /* 161 */
+  {     1,     24,     12,      0,      0,  28672,     56, }, /* 162 */
+  {    68,      2,     12,      0,      0,  18432,      0, }, /* 163 */
+  {     1,      6,     12,      0,      0,  18432,    104, }, /* 164 */
+  {     1,      5,     12,      0,    130,  18432,     76, }, /* 165 */
+  {    69,     21,     12,      0,      0,  28672,    106, }, /* 166 */
+  {     1,      9,     12,      0,    116,  18432,     74, }, /* 167 */
+  {     1,      9,     12,      0,     38,  18432,     74, }, /* 168 */
+  {    69,     21,     12,      0,      0,  28672,    108, }, /* 169 */
+  {     1,      9,     12,      0,     37,  18432,     74, }, /* 170 */
+  {     1,      9,     12,      0,     64,  18432,     74, }, /* 171 */
+  {     1,      9,     12,      0,     63,  18432,     74, }, /* 172 */
+  {     1,      5,     12,      0,      0,  18432,     76, }, /* 173 */
+  {     1,      9,     12,      0,     32,  18432,     74, }, /* 174 */
+  {     1,      9,     12,     34,     32,  18432,     74, }, /* 175 */
+  {     1,      9,     12,     59,     32,  18432,     74, }, /* 176 */
+  {     1,      9,     12,     38,     32,  18432,     74, }, /* 177 */
+  {     1,      9,     12,     21,     32,  18432,     74, }, /* 178 */
+  {     1,      9,     12,     51,     32,  18432,     74, }, /* 179 */
+  {     1,      9,     12,     26,     32,  18432,     74, }, /* 180 */
+  {     1,      9,     12,     47,     32,  18432,     74, }, /* 181 */
+  {     1,      9,     12,     55,     32,  18432,     74, }, /* 182 */
+  {     1,      9,     12,     30,     32,  18432,     74, }, /* 183 */
+  {     1,      9,     12,     43,     32,  18432,     74, }, /* 184 */
+  {     1,      9,     12,     96,     32,  18432,     74, }, /* 185 */
+  {     1,      5,     12,      0,    -38,  18432,     76, }, /* 186 */
+  {     1,      5,     12,      0,    -37,  18432,     76, }, /* 187 */
+  {     1,      5,     12,      0,    -32,  18432,     76, }, /* 188 */
+  {     1,      5,     12,     34,    -32,  18432,     76, }, /* 189 */
+  {     1,      5,     12,     59,    -32,  18432,     76, }, /* 190 */
+  {     1,      5,     12,     38,    -32,  18432,     76, }, /* 191 */
+  {     1,      5,     12,     21,   -116,  18432,     76, }, /* 192 */
+  {     1,      5,     12,     51,    -32,  18432,     76, }, /* 193 */
+  {     1,      5,     12,     26,   -775,  18432,     76, }, /* 194 */
+  {     1,      5,     12,     47,    -32,  18432,     76, }, /* 195 */
+  {     1,      5,     12,     55,    -32,  18432,     76, }, /* 196 */
+  {     1,      5,     12,     30,      1,  18432,     70, }, /* 197 */
+  {     1,      5,     12,     30,    -32,  18432,     76, }, /* 198 */
+  {     1,      5,     12,     43,    -32,  18432,     76, }, /* 199 */
+  {     1,      5,     12,     96,    -32,  18432,     76, }, /* 200 */
+  {     1,      5,     12,      0,    -64,  18432,     76, }, /* 201 */
+  {     1,      5,     12,      0,    -63,  18432,     76, }, /* 202 */
+  {     1,      9,     12,      0,      8,  18432,     74, }, /* 203 */
+  {     1,      5,     12,     34,    -30,  18432,    110, }, /* 204 */
+  {     1,      5,     12,     38,    -25,  18432,    110, }, /* 205 */
+  {     1,      9,     12,      0,      0,  18432,    112, }, /* 206 */
+  {     1,      9,     12,      0,      0,  18432,    114, }, /* 207 */
+  {     1,      5,     12,     43,    -15,  18432,    110, }, /* 208 */
+  {     1,      5,     12,     47,    -22,  18432,     70, }, /* 209 */
+  {     1,      5,     12,      0,     -8,  18432,     76, }, /* 210 */
+  {    34,      9,     12,      0,      1,  18432,     74, }, /* 211 */
+  {    34,      5,     12,      0,     -1,  18432,     76, }, /* 212 */
+  {     1,      5,     12,     51,    -54,  18432,    110, }, /* 213 */
+  {     1,      5,     12,     55,    -48,  18432,    110, }, /* 214 */
+  {     1,      5,     12,      0,      7,  18432,     76, }, /* 215 */
+  {     1,      5,     12,      0,   -116,  18432,     78, }, /* 216 */
+  {     1,      9,     12,     38,    -60,  18432,    116, }, /* 217 */
+  {     1,      5,     12,     59,    -64,  18432,    110, }, /* 218 */
+  {     1,     25,     12,      0,      0,  28672,    118, }, /* 219 */
+  {     1,      9,     12,      0,     -7,  18432,     74, }, /* 220 */
+  {     1,      5,     12,      0,      0,  18432,     60, }, /* 221 */
+  {     1,      9,     12,      0,   -130,  18432,     74, }, /* 222 */
+  {     2,      9,     12,      0,     80,  18432,     74, }, /* 223 */
+  {     2,      9,     12,      0,     32,  18432,     74, }, /* 224 */
+  {     2,      9,     12,     63,     32,  18432,     74, }, /* 225 */
+  {     2,      9,     12,     67,     32,  18432,     74, }, /* 226 */
+  {     2,      9,     12,     71,     32,  18432,     74, }, /* 227 */
+  {     2,      9,     12,     75,     32,  18432,     74, }, /* 228 */
+  {     2,      9,     12,     79,     32,  18432,     74, }, /* 229 */
+  {     2,      9,     12,     84,     32,  18432,     74, }, /* 230 */
+  {     2,      5,     12,      0,    -32,  18432,     76, }, /* 231 */
+  {     2,      5,     12,     63,    -32,  18432,     76, }, /* 232 */
+  {     2,      5,     12,     67,    -32,  18432,     76, }, /* 233 */
+  {     2,      5,     12,     71,    -32,  18432,     76, }, /* 234 */
+  {     2,      5,     12,     75,    -32,  18432,     76, }, /* 235 */
+  {     2,      5,     12,     79,    -32,  18432,     76, }, /* 236 */
+  {     2,      5,     12,     84,    -32,  18432,     76, }, /* 237 */
+  {     2,      5,     12,      0,    -80,  18432,     76, }, /* 238 */
+  {     2,      5,     12,      0,    -80,  18432,     78, }, /* 239 */
+  {     2,      9,     12,      0,      1,  18432,     74, }, /* 240 */
+  {     2,      5,     12,      0,     -1,  18432,     76, }, /* 241 */
+  {     2,      9,     12,     88,      1,  18432,     74, }, /* 242 */
+  {     2,      5,     12,     88,     -1,  18432,     76, }, /* 243 */
+  {     2,     26,     12,      0,      0,  18432,     68, }, /* 244 */
+  {     2,     12,      3,      0,      0,  26684,     96, }, /* 245 */
+  {     2,     12,      3,      0,      0,  26678,     96, }, /* 246 */
+  {    84,     12,      3,      0,      0,  26681,     96, }, /* 247 */
+  {     2,     11,      3,      0,      0,  26624,    120, }, /* 248 */
+  {     2,      9,     12,      0,     15,  18432,     74, }, /* 249 */
+  {     2,      5,     12,      0,    -15,  18432,     76, }, /* 250 */
+  {    70,      9,     12,      0,     48,  18432,     74, }, /* 251 */
+  {    70,      6,     12,      0,      0,  18432,     92, }, /* 252 */
+  {    70,     21,     12,      0,      0,  18432,     68, }, /* 253 */
+  {    70,     21,     12,      0,      0,  18432,    122, }, /* 254 */
+  {    70,      5,     12,      0,      0,  18432,     60, }, /* 255 */
+  {    70,      5,     12,      0,    -48,  18432,     76, }, /* 256 */
+  {    70,      5,     12,      0,      0,  18432,     70, }, /* 257 */
+  {    70,     21,     12,      0,      0,  18432,    124, }, /* 258 */
+  {    70,     17,     12,      0,      0,  28672,    126, }, /* 259 */
+  {    70,     26,     12,      0,      0,  28672,     68, }, /* 260 */
+  {    70,     23,     12,      0,      0,  14336,     68, }, /* 261 */
+  {    68,      2,     12,      0,      0,  34816,      0, }, /* 262 */
+  {    71,     12,      3,      0,      0,  26624,     96, }, /* 263 */
+  {    71,     12,      3,      0,      0,  26624,    102, }, /* 264 */
+  {    71,     12,      3,      0,      0,  26624,    128, }, /* 265 */
+  {    71,     17,     12,      0,      0,  34816,    126, }, /* 266 */
+  {    71,     21,     12,      0,      0,  34816,     68, }, /* 267 */
+  {    71,     21,     12,      0,      0,  34816,    106, }, /* 268 */
+  {    71,     12,      3,      0,      0,  26624,    130, }, /* 269 */
+  {    71,      7,     12,      0,      0,  34816,     82, }, /* 270 */
+  {    71,     21,     12,      0,      0,  34816,    122, }, /* 271 */
+  {     3,      1,      4,      0,      0,   2048,    132, }, /* 272 */
+  {    69,      1,      4,      0,      0,   2048,    132, }, /* 273 */
+  {     3,     25,     12,      0,      0,  28672,    118, }, /* 274 */
+  {     3,     25,     12,      0,      0,      0,    118, }, /* 275 */
+  {     3,     21,     12,      0,      0,  14336,     68, }, /* 276 */
+  {     3,     23,     12,      0,      0,      0,     68, }, /* 277 */
+  {    69,     21,     12,      0,      0,   8342,    106, }, /* 278 */
+  {     3,     21,     12,      0,      0,      0,     68, }, /* 279 */
+  {     3,     26,     12,      0,      0,  28672,     68, }, /* 280 */
+  {     3,     12,      3,      0,      0,  26624,    130, }, /* 281 */
+  {    69,     21,     12,      0,      0,    150,    106, }, /* 282 */
+  {     3,      1,      2,      0,      0,    108,    134, }, /* 283 */
+  {     3,     21,     12,      0,      0,      0,    124, }, /* 284 */
+  {    69,     21,     12,      0,      0,    159,    124, }, /* 285 */
+  {     3,      7,     12,      0,      0,      0,     82, }, /* 286 */
+  {    69,      6,     12,      0,      0,    165,    136, }, /* 287 */
+  {    84,     12,      3,      0,      0,  26660,    128, }, /* 288 */
+  {    84,     12,      3,      0,      0,  26660,    130, }, /* 289 */
+  {     3,     12,      3,      0,      0,  26624,    128, }, /* 290 */
+  {     3,     12,      3,      0,      0,  26624,     96, }, /* 291 */
+  {     3,     13,     12,      0,      0,   2159,    138, }, /* 292 */
+  {     3,     21,     12,      0,      0,   2048,     68, }, /* 293 */
+  {     3,      7,     12,      0,      0,      0,    140, }, /* 294 */
+  {     3,     21,     12,      0,      0,     30,    124, }, /* 295 */
+  {     3,      6,     12,      0,      0,      0,     92, }, /* 296 */
+  {     3,     13,     12,      0,      0,  10240,    138, }, /* 297 */
+  {     3,     26,     12,      0,      0,      0,     68, }, /* 298 */
+  {     4,     21,     12,      0,      0,      0,    124, }, /* 299 */
+  {     4,     21,     12,      0,      0,      0,    106, }, /* 300 */
+  {     4,     21,     12,      0,      0,      0,     68, }, /* 301 */
+  {    68,      2,     12,      0,      0,      0,      0, }, /* 302 */
+  {     4,      1,      4,      0,      0,      0,    132, }, /* 303 */
+  {     4,      7,     12,      0,      0,      0,     82, }, /* 304 */
+  {     4,     12,      3,      0,      0,  26624,    130, }, /* 305 */
+  {     4,     12,      3,      0,      0,  26624,    128, }, /* 306 */
+  {     4,     12,      3,      0,      0,  26624,     96, }, /* 307 */
+  {     5,      7,     12,      0,      0,      0,     82, }, /* 308 */
+  {     5,     12,      3,      0,      0,  26624,    128, }, /* 309 */
+  {    38,     13,     12,      0,      0,  34816,    138, }, /* 310 */
+  {    38,      7,     12,      0,      0,  34816,     82, }, /* 311 */
+  {    38,     12,      3,      0,      0,  26624,     96, }, /* 312 */
+  {    38,      6,     12,      0,      0,  34816,     92, }, /* 313 */
+  {    38,     26,     12,      0,      0,  28672,     68, }, /* 314 */
+  {    38,     21,     12,      0,      0,  28672,     68, }, /* 315 */
+  {    38,     21,     12,      0,      0,  28672,    106, }, /* 316 */
+  {    38,     21,     12,      0,      0,  28672,    124, }, /* 317 */
+  {    38,      6,     12,      0,      0,  34816,    136, }, /* 318 */
+  {    38,     12,      3,      0,      0,  26624,    102, }, /* 319 */
+  {    38,     23,     12,      0,      0,  34816,     68, }, /* 320 */
+  {   110,      7,     12,      0,      0,  34816,     82, }, /* 321 */
+  {   110,     12,      3,      0,      0,  26624,    130, }, /* 322 */
+  {   110,     12,      3,      0,      0,  26624,     96, }, /* 323 */
+  {   110,      6,     12,      0,      0,  34816,    142, }, /* 324 */
+  {   110,     12,      3,      0,      0,  26624,    102, }, /* 325 */
+  {   110,     21,     12,      0,      0,  34816,    106, }, /* 326 */
+  {   110,     21,     12,      0,      0,  34816,    124, }, /* 327 */
+  {    42,      7,     12,      0,      0,  34816,     82, }, /* 328 */
+  {    42,     12,      3,      0,      0,  26624,    102, }, /* 329 */
+  {    42,     21,     12,      0,      0,  34816,    106, }, /* 330 */
+  {     3,     24,     12,      0,      0,      0,    122, }, /* 331 */
+  {     3,     12,      3,      0,      0,  26624,    102, }, /* 332 */
+  {     6,     12,      3,      0,      0,  26624,    130, }, /* 333 */
+  {     6,     10,      5,      0,      0,  18432,    144, }, /* 334 */
+  {     6,      7,     12,      0,      0,  18432,     82, }, /* 335 */
+  {     6,     12,      3,      0,      0,  26624,     96, }, /* 336 */
+  {     6,     12,      3,      0,      0,  26624,    146, }, /* 337 */
+  {    84,     12,      3,      0,      0,  26798,     96, }, /* 338 */
+  {    84,     12,      3,      0,      0,  26795,     96, }, /* 339 */
+  {    69,     21,     12,      0,      0,  18615,    124, }, /* 340 */
+  {    69,     21,     12,      0,      0,  18618,    124, }, /* 341 */
+  {     6,     13,     12,      0,      0,  18576,    138, }, /* 342 */
+  {     6,     21,     12,      0,      0,  18432,     68, }, /* 343 */
+  {     6,      6,     12,      0,      0,  18432,     92, }, /* 344 */
+  {     7,      7,     12,      0,      0,  18432,     82, }, /* 345 */
+  {     7,     12,      3,      0,      0,  26624,    130, }, /* 346 */
+  {     7,     10,      5,      0,      0,  18432,    144, }, /* 347 */
+  {     7,     12,      3,      0,      0,  26624,     96, }, /* 348 */
+  {     7,     10,      3,      0,      0,  18432,    148, }, /* 349 */
+  {     7,     12,      3,      0,      0,  26624,    146, }, /* 350 */
+  {     7,     13,     12,      0,      0,  18546,    138, }, /* 351 */
+  {     7,     23,     12,      0,      0,  14336,     68, }, /* 352 */
+  {     7,     15,     12,      0,      0,  18432,     68, }, /* 353 */
+  {     7,     26,     12,      0,      0,  18432,     68, }, /* 354 */
+  {     7,     21,     12,      0,      0,  18432,     68, }, /* 355 */
+  {     7,     12,      3,      0,      0,  26624,    102, }, /* 356 */
+  {     8,     12,      3,      0,      0,  26624,    130, }, /* 357 */
+  {     8,     10,      5,      0,      0,  18432,    144, }, /* 358 */
+  {     8,      7,     12,      0,      0,  18432,     82, }, /* 359 */
+  {     8,     12,      3,      0,      0,  26624,     96, }, /* 360 */
+  {     8,     12,      3,      0,      0,  26624,    146, }, /* 361 */
+  {     8,     13,     12,      0,      0,  18519,    138, }, /* 362 */
+  {     8,     21,     12,      0,      0,  18432,     68, }, /* 363 */
+  {     9,     12,      3,      0,      0,  26624,    130, }, /* 364 */
+  {     9,     10,      5,      0,      0,  18432,    144, }, /* 365 */
+  {     9,      7,     12,      0,      0,  18432,     82, }, /* 366 */
+  {     9,     12,      3,      0,      0,  26624,     96, }, /* 367 */
+  {     9,     12,      3,      0,      0,  26624,    146, }, /* 368 */
+  {     9,     13,     12,      0,      0,  18516,    138, }, /* 369 */
+  {     9,     21,     12,      0,      0,  18432,     68, }, /* 370 */
+  {     9,     23,     12,      0,      0,  14336,     68, }, /* 371 */
+  {    10,     12,      3,      0,      0,  26624,    130, }, /* 372 */
+  {    10,     10,      5,      0,      0,  18432,    144, }, /* 373 */
+  {    10,      7,     12,      0,      0,  18432,     82, }, /* 374 */
+  {    10,     12,      3,      0,      0,  26624,     96, }, /* 375 */
+  {    10,     10,      3,      0,      0,  18432,    148, }, /* 376 */
+  {    10,     12,      3,      0,      0,  26624,    146, }, /* 377 */
+  {    10,     12,      3,      0,      0,  26624,    150, }, /* 378 */
+  {    10,     13,     12,      0,      0,  18432,    138, }, /* 379 */
+  {    10,     26,     12,      0,      0,  18432,     68, }, /* 380 */
+  {    10,     15,     12,      0,      0,  18432,     68, }, /* 381 */
+  {    11,     12,      3,      0,      0,  26624,    130, }, /* 382 */
+  {    11,      7,     12,      0,      0,  18432,     82, }, /* 383 */
+  {    11,     10,      3,      0,      0,  18432,    148, }, /* 384 */
+  {    11,     10,      5,      0,      0,  18432,    144, }, /* 385 */
+  {    11,     12,      3,      0,      0,  26624,    146, }, /* 386 */
+  {    11,     13,     12,      0,      0,  18513,    138, }, /* 387 */
+  {    11,     15,     12,      0,      0,  18513,     68, }, /* 388 */
+  {    11,     26,     12,      0,      0,  28753,     68, }, /* 389 */
+  {    11,     26,     12,      0,      0,  28672,     68, }, /* 390 */
+  {    11,     23,     12,      0,      0,  14336,     68, }, /* 391 */
+  {    12,     12,      3,      0,      0,  26624,    130, }, /* 392 */
+  {    12,     10,      5,      0,      0,  18432,    144, }, /* 393 */
+  {    12,     12,      3,      0,      0,  26624,    102, }, /* 394 */
+  {    12,      7,     12,      0,      0,  18432,     82, }, /* 395 */
+  {    12,     12,      3,      0,      0,  26624,     96, }, /* 396 */
+  {    12,     12,      3,      0,      0,  26624,    146, }, /* 397 */
+  {    12,     13,     12,      0,      0,  18432,    138, }, /* 398 */
+  {    12,     21,     12,      0,      0,  18432,     68, }, /* 399 */
+  {    12,     15,     12,      0,      0,  28672,     68, }, /* 400 */
+  {    12,     26,     12,      0,      0,  18432,     68, }, /* 401 */
+  {    13,      7,     12,      0,      0,  18432,     82, }, /* 402 */
+  {    13,     12,      3,      0,      0,  26624,    130, }, /* 403 */
+  {    13,     10,      5,      0,      0,  18432,    144, }, /* 404 */
+  {    13,     21,     12,      0,      0,  18432,     68, }, /* 405 */
+  {    13,     12,      3,      0,      0,  26624,     96, }, /* 406 */
+  {    13,     12,      3,      0,      0,  18432,    130, }, /* 407 */
+  {    13,     10,      3,      0,      0,  18432,    148, }, /* 408 */
+  {    13,     12,      3,      0,      0,  26624,    146, }, /* 409 */
+  {    13,     13,     12,      0,      0,  18528,    138, }, /* 410 */
+  {    14,     12,      3,      0,      0,  26624,    130, }, /* 411 */
+  {    14,     10,      5,      0,      0,  18432,    144, }, /* 412 */
+  {    14,      7,     12,      0,      0,  18432,     82, }, /* 413 */
+  {    14,     12,      3,      0,      0,  26624,    146, }, /* 414 */
+  {    14,     10,      3,      0,      0,  18432,    148, }, /* 415 */
+  {    14,      7,      4,      0,      0,  18432,     82, }, /* 416 */
+  {    14,     26,     12,      0,      0,  18432,     68, }, /* 417 */
+  {    14,     15,     12,      0,      0,  18432,     68, }, /* 418 */
+  {    14,     13,     12,      0,      0,  18432,    138, }, /* 419 */
+  {    15,     12,      3,      0,      0,  26624,    130, }, /* 420 */
+  {    15,     10,      5,      0,      0,  18432,    144, }, /* 421 */
+  {    15,      7,     12,      0,      0,  18432,     82, }, /* 422 */
+  {    15,     12,      3,      0,      0,  26624,    146, }, /* 423 */
+  {    15,     10,      3,      0,      0,  18432,    148, }, /* 424 */
+  {    15,     13,     12,      0,      0,  18432,    138, }, /* 425 */
+  {    15,     21,     12,      0,      0,  18432,     68, }, /* 426 */
+  {    72,      7,     12,      0,      0,  18432,     82, }, /* 427 */
+  {    72,     12,      3,      0,      0,  26624,    130, }, /* 428 */
+  {    72,      7,      5,      0,      0,  18432,    152, }, /* 429 */
+  {    72,     12,      3,      0,      0,  26624,    154, }, /* 430 */
+  {    69,     23,     12,      0,      0,  14336,     68, }, /* 431 */
+  {    72,      7,     12,      0,      0,  18432,    156, }, /* 432 */
+  {    72,      6,     12,      0,      0,  18432,    136, }, /* 433 */
+  {    72,     12,      3,      0,      0,  26624,     96, }, /* 434 */
+  {    72,     21,     12,      0,      0,  18432,     68, }, /* 435 */
+  {    72,     13,     12,      0,      0,  18432,    138, }, /* 436 */
+  {    72,     21,     12,      0,      0,  18432,    106, }, /* 437 */
+  {    73,      7,     12,      0,      0,  18432,     82, }, /* 438 */
+  {    73,     12,      3,      0,      0,  26624,    130, }, /* 439 */
+  {    73,      7,      5,      0,      0,  18432,    152, }, /* 440 */
+  {    73,     12,      3,      0,      0,  26624,    146, }, /* 441 */
+  {    73,      7,     12,      0,      0,  18432,    156, }, /* 442 */
+  {    73,      6,     12,      0,      0,  18432,    136, }, /* 443 */
+  {    73,     12,      3,      0,      0,  26624,     96, }, /* 444 */
+  {    73,     13,     12,      0,      0,  18432,    138, }, /* 445 */
+  {    74,      7,     12,      0,      0,  18432,     82, }, /* 446 */
+  {    74,     26,     12,      0,      0,  18432,     68, }, /* 447 */
+  {    74,     21,     12,      0,      0,  18432,     68, }, /* 448 */
+  {    74,     21,     12,      0,      0,  18432,    106, }, /* 449 */
+  {    74,     12,      3,      0,      0,  26624,     96, }, /* 450 */
+  {    74,     13,     12,      0,      0,  18432,    138, }, /* 451 */
+  {    74,     15,     12,      0,      0,  18432,     68, }, /* 452 */
+  {    74,     22,     12,      0,      0,  28672,    158, }, /* 453 */
+  {    74,     18,     12,      0,      0,  28672,    158, }, /* 454 */
+  {    74,     10,      5,      0,      0,  18432,    160, }, /* 455 */
+  {    74,     12,      3,      0,      0,  26624,    130, }, /* 456 */
+  {    74,     12,      3,      0,      0,  26624,    162, }, /* 457 */
+  {    74,     10,      5,      0,      0,  18432,    144, }, /* 458 */
+  {    74,     12,      3,      0,      0,  26624,    146, }, /* 459 */
+  {    69,     26,     12,      0,      0,  18432,     68, }, /* 460 */
+  {    16,      7,     12,      0,      0,  18432,     82, }, /* 461 */
+  {    16,     10,     12,      0,      0,  18432,    144, }, /* 462 */
+  {    16,     12,      3,      0,      0,  26624,    130, }, /* 463 */
+  {    16,     10,      5,      0,      0,  18432,    144, }, /* 464 */
+  {    16,     12,      3,      0,      0,  26624,     96, }, /* 465 */
+  {    16,     12,      3,      0,      0,  26624,    146, }, /* 466 */
+  {    16,     13,     12,      0,      0,  18549,    138, }, /* 467 */
+  {    16,     21,     12,      0,      0,  18432,    124, }, /* 468 */
+  {    16,     21,     12,      0,      0,  18432,     68, }, /* 469 */
+  {    16,     10,     12,      0,      0,  18432,    164, }, /* 470 */
+  {    16,     12,      3,      0,      0,  26624,    128, }, /* 471 */
+  {    16,     13,     12,      0,      0,  18432,    138, }, /* 472 */
+  {    16,     26,     12,      0,      0,  18432,     68, }, /* 473 */
+  {    17,      9,     12,      0,   7264,  18432,     74, }, /* 474 */
+  {    17,      5,     12,      0,   3008,  18432,    166, }, /* 475 */
+  {    69,     21,     12,      0,      0,  18510,     68, }, /* 476 */
+  {    17,      6,     12,      0,      0,  18432,    142, }, /* 477 */
+  {    18,      7,      6,      0,      0,  18432,     82, }, /* 478 */
+  {    18,      7,      6,      0,      0,  18432,    168, }, /* 479 */
+  {    18,      7,      7,      0,      0,  18432,    168, }, /* 480 */
+  {    18,      7,      7,      0,      0,  18432,     82, }, /* 481 */
+  {    18,      7,      8,      0,      0,  18432,     82, }, /* 482 */
+  {    75,      7,     12,      0,      0,  18432,     82, }, /* 483 */
+  {    75,     12,      3,      0,      0,  26624,     96, }, /* 484 */
+  {    75,     21,     12,      0,      0,  18432,     68, }, /* 485 */
+  {    75,     21,     12,      0,      0,  18432,    106, }, /* 486 */
+  {    75,     21,     12,      0,      0,  18432,    124, }, /* 487 */
+  {    75,     15,     12,      0,      0,  18432,    138, }, /* 488 */
+  {    75,     15,     12,      0,      0,  18432,     68, }, /* 489 */
+  {    75,     26,     12,      0,      0,  28672,     68, }, /* 490 */
+  {    76,      9,     12,      0,  38864,  18432,    170, }, /* 491 */
+  {    76,      9,     12,      0,      8,  18432,    170, }, /* 492 */
+  {    76,      5,     12,      0,     -8,  18432,     70, }, /* 493 */
+  {    77,     17,     12,      0,      0,  28672,    126, }, /* 494 */
+  {    77,      7,     12,      0,      0,  18432,     82, }, /* 495 */
+  {    77,     26,     12,      0,      0,  18432,     68, }, /* 496 */
+  {    77,     21,     12,      0,      0,  18432,    124, }, /* 497 */
+  {    78,     29,     12,      0,      0,  45056,     52, }, /* 498 */
+  {    78,      7,     12,      0,      0,  18432,     82, }, /* 499 */
+  {    78,     22,     12,      0,      0,  28672,    158, }, /* 500 */
+  {    78,     18,     12,      0,      0,  28672,    158, }, /* 501 */
+  {    79,      7,     12,      0,      0,  18432,     82, }, /* 502 */
+  {    69,     21,     12,      0,      0,  18432,    106, }, /* 503 */
+  {    79,     14,     12,      0,      0,  18432,     82, }, /* 504 */
+  {    25,      7,     12,      0,      0,  18432,     82, }, /* 505 */
+  {    25,     12,      3,      0,      0,  26624,    130, }, /* 506 */
+  {    25,     12,      3,      0,      0,  26624,    146, }, /* 507 */
+  {    25,     10,      5,      0,      0,  18432,    172, }, /* 508 */
+  {    26,      7,     12,      0,      0,  18432,     82, }, /* 509 */
+  {    26,     12,      3,      0,      0,  26624,    130, }, /* 510 */
+  {    26,     10,      5,      0,      0,  18432,    174, }, /* 511 */
+  {    69,     21,     12,      0,      0,  18573,    124, }, /* 512 */
+  {    27,      7,     12,      0,      0,  18432,     82, }, /* 513 */
+  {    27,     12,      3,      0,      0,  26624,    130, }, /* 514 */
+  {    28,      7,     12,      0,      0,  18432,     82, }, /* 515 */
+  {    28,     12,      3,      0,      0,  26624,    130, }, /* 516 */
+  {    80,      7,     12,      0,      0,  18432,     82, }, /* 517 */
+  {    80,      7,     12,      0,      0,  18432,    140, }, /* 518 */
+  {    80,     12,      3,      0,      0,  26624,    100, }, /* 519 */
+  {    80,     10,      5,      0,      0,  18432,    144, }, /* 520 */
+  {    80,     12,      3,      0,      0,  26624,    130, }, /* 521 */
+  {    80,     12,      3,      0,      0,  26624,     96, }, /* 522 */
+  {    80,     12,      3,      0,      0,  26624,    146, }, /* 523 */
+  {    80,     21,     12,      0,      0,  18432,    106, }, /* 524 */
+  {    80,      6,     12,      0,      0,  18432,    142, }, /* 525 */
+  {    80,     21,     12,      0,      0,  18432,     68, }, /* 526 */
+  {    80,     23,     12,      0,      0,  14336,     68, }, /* 527 */
+  {    80,     13,     12,      0,      0,  18432,    138, }, /* 528 */
+  {    80,     15,     12,      0,      0,  28672,     68, }, /* 529 */
+  {    19,     21,     12,      0,      0,  28672,     68, }, /* 530 */
+  {    69,     21,     12,      0,      0,  28777,    106, }, /* 531 */
+  {    69,     21,     12,      0,      0,  28777,    124, }, /* 532 */
+  {    19,     21,     12,      0,      0,  28672,    106, }, /* 533 */
+  {    19,     17,     12,      0,      0,  28672,    126, }, /* 534 */
+  {    19,     21,     12,      0,      0,  28672,    124, }, /* 535 */
+  {    19,     21,     12,      0,      0,  28672,    176, }, /* 536 */
+  {    19,     12,      3,      0,      0,  26624,    178, }, /* 537 */
+  {    19,      1,      2,      0,      0,   6144,     66, }, /* 538 */
+  {    19,     13,     12,      0,      0,  18432,    138, }, /* 539 */
+  {    19,      7,     12,      0,      0,  18432,     82, }, /* 540 */
+  {    19,      6,     12,      0,      0,  18432,    136, }, /* 541 */
+  {    19,     12,      3,      0,      0,  26624,    180, }, /* 542 */
+  {    19,     12,      3,      0,      0,  26624,    130, }, /* 543 */
+  {    29,      7,     12,      0,      0,  18432,     82, }, /* 544 */
+  {    29,     12,      3,      0,      0,  26624,    130, }, /* 545 */
+  {    29,     10,      5,      0,      0,  18432,    144, }, /* 546 */
+  {    29,     12,      3,      0,      0,  26624,     96, }, /* 547 */
+  {    29,     26,     12,      0,      0,  28672,     68, }, /* 548 */
+  {    29,     21,     12,      0,      0,  28672,    124, }, /* 549 */
+  {    29,     13,     12,      0,      0,  18432,    138, }, /* 550 */
+  {    30,      7,     12,      0,      0,  18432,     82, }, /* 551 */
+  {    89,      7,     12,      0,      0,  18432,     82, }, /* 552 */
+  {    89,      7,     12,      0,      0,  18432,    156, }, /* 553 */
+  {    89,     13,     12,      0,      0,  18432,    138, }, /* 554 */
+  {    89,     15,     12,      0,      0,  18432,    138, }, /* 555 */
+  {    89,     26,     12,      0,      0,  28672,     68, }, /* 556 */
+  {    80,     26,     12,      0,      0,  28672,     68, }, /* 557 */
+  {    33,      7,     12,      0,      0,  18432,     82, }, /* 558 */
+  {    33,     12,      3,      0,      0,  26624,    130, }, /* 559 */
+  {    33,     10,      5,      0,      0,  18432,    144, }, /* 560 */
+  {    33,     21,     12,      0,      0,  18432,     68, }, /* 561 */
+  {   106,      7,     12,      0,      0,  18432,     82, }, /* 562 */
+  {   106,     10,      5,      0,      0,  18432,    144, }, /* 563 */
+  {   106,     12,      3,      0,      0,  26624,    130, }, /* 564 */
+  {   106,     12,      3,      0,      0,  26624,    182, }, /* 565 */
+  {   106,     10,     12,      0,      0,  18432,    144, }, /* 566 */
+  {   106,     12,      3,      0,      0,  26624,     96, }, /* 567 */
+  {   106,     13,     12,      0,      0,  18432,    138, }, /* 568 */
+  {   106,     21,     12,      0,      0,  18432,     68, }, /* 569 */
+  {   106,      6,     12,      0,      0,  18432,    136, }, /* 570 */
+  {   106,     21,     12,      0,      0,  18432,    124, }, /* 571 */
+  {    84,     11,      3,      0,      0,  26624,    184, }, /* 572 */
+  {    84,     12,      3,      0,      0,  26624,    130, }, /* 573 */
+  {    93,     12,      3,      0,      0,  26624,    130, }, /* 574 */
+  {    93,     10,      5,      0,      0,  18432,    144, }, /* 575 */
+  {    93,      7,     12,      0,      0,  18432,     82, }, /* 576 */
+  {    93,     12,      3,      0,      0,  26624,     96, }, /* 577 */
+  {    93,     10,      3,      0,      0,  18432,    148, }, /* 578 */
+  {    93,     10,      5,      0,      0,  18432,    172, }, /* 579 */
+  {    93,     13,     12,      0,      0,  18432,    138, }, /* 580 */
+  {    93,     21,     12,      0,      0,  18432,    124, }, /* 581 */
+  {    93,     21,     12,      0,      0,  18432,     68, }, /* 582 */
+  {    93,     21,     12,      0,      0,  18432,    106, }, /* 583 */
+  {    93,     26,     12,      0,      0,  18432,     68, }, /* 584 */
+  {    96,     12,      3,      0,      0,  26624,    130, }, /* 585 */
+  {    96,     10,      5,      0,      0,  18432,    144, }, /* 586 */
+  {    96,      7,     12,      0,      0,  18432,     82, }, /* 587 */
+  {    96,     10,      5,      0,      0,  18432,    172, }, /* 588 */
+  {    96,     12,      3,      0,      0,  26624,    146, }, /* 589 */
+  {    96,     13,     12,      0,      0,  18432,    138, }, /* 590 */
+  {   119,      7,     12,      0,      0,  18432,     82, }, /* 591 */
+  {   119,     12,      3,      0,      0,  26624,    102, }, /* 592 */
+  {   119,     10,      5,      0,      0,  18432,    144, }, /* 593 */
+  {   119,     12,      3,      0,      0,  26624,    130, }, /* 594 */
+  {   119,     10,      5,      0,      0,  18432,    174, }, /* 595 */
+  {   119,     21,     12,      0,      0,  18432,     68, }, /* 596 */
+  {    97,      7,     12,      0,      0,  18432,     82, }, /* 597 */
+  {    97,     10,      5,      0,      0,  18432,    144, }, /* 598 */
+  {    97,     12,      3,      0,      0,  26624,    130, }, /* 599 */
+  {    97,     12,      3,      0,      0,  26624,    186, }, /* 600 */
+  {    97,     12,      3,      0,      0,  26624,     96, }, /* 601 */
+  {    97,     21,     12,      0,      0,  18432,    124, }, /* 602 */
+  {    97,     21,     12,      0,      0,  18432,    106, }, /* 603 */
+  {    97,     13,     12,      0,      0,  18432,    138, }, /* 604 */
+  {    98,     13,     12,      0,      0,  18432,    138, }, /* 605 */
+  {    98,      7,     12,      0,      0,  18432,     82, }, /* 606 */
+  {    98,      6,     12,      0,      0,  18432,     92, }, /* 607 */
+  {    98,      6,     12,      0,      0,  18432,     94, }, /* 608 */
+  {    98,     21,     12,      0,      0,  18432,    124, }, /* 609 */
+  {     2,      5,     12,     63,  -6222,  18432,     70, }, /* 610 */
+  {     2,      5,     12,     67,  -6221,  18432,     70, }, /* 611 */
+  {     2,      5,     12,     71,  -6212,  18432,     70, }, /* 612 */
+  {     2,      5,     12,     75,  -6210,  18432,     70, }, /* 613 */
+  {     2,      5,     12,     79,  -6210,  18432,     70, }, /* 614 */
+  {     2,      5,     12,     79,  -6211,  18432,     70, }, /* 615 */
+  {     2,      5,     12,     84,  -6204,  18432,     70, }, /* 616 */
+  {     2,      5,     12,     88,  -6180,  18432,     70, }, /* 617 */
+  {     2,      5,     12,    108,  35267,  18432,     70, }, /* 618 */
+  {    17,      9,     12,      0,  -3008,  18432,     74, }, /* 619 */
+  {    96,     21,     12,      0,      0,  18432,     68, }, /* 620 */
+  {    84,     12,      3,      0,      0,  26762,     96, }, /* 621 */
+  {    84,     12,      3,      0,      0,  26630,     96, }, /* 622 */
+  {    69,     21,     12,      0,      0,  18498,    188, }, /* 623 */
+  {    84,     12,      3,      0,      0,  26666,     96, }, /* 624 */
+  {    84,     12,      3,      0,      0,  26696,     96, }, /* 625 */
+  {    84,     12,      3,      0,      0,  26780,     96, }, /* 626 */
+  {    69,     10,      5,      0,      0,  18474,    160, }, /* 627 */
+  {    69,      7,     12,      0,      0,  18501,     82, }, /* 628 */
+  {    69,      7,     12,      0,      0,  18474,     82, }, /* 629 */
+  {    69,      7,     12,      0,      0,  18438,     82, }, /* 630 */
+  {    69,      7,     12,      0,      0,  18594,     82, }, /* 631 */
+  {    69,      7,     12,      0,      0,  18498,     82, }, /* 632 */
+  {    84,     12,      3,      0,      0,  26750,     96, }, /* 633 */
+  {    69,     10,      5,      0,      0,  18435,    160, }, /* 634 */
+  {    84,     12,      3,      0,      0,  26690,     96, }, /* 635 */
+  {    69,      7,     12,      0,      0,  18453,     82, }, /* 636 */
+  {     2,      5,     12,      0,      0,  18432,     60, }, /* 637 */
+  {     1,      6,     12,      0,      0,  18432,     88, }, /* 638 */
+  {     2,      6,     12,      0,      0,  18432,    190, }, /* 639 */
+  {     0,      5,     12,      0,  35332,  18432,     76, }, /* 640 */
+  {     0,      5,     12,      0,   3814,  18432,     76, }, /* 641 */
+  {     0,      5,     12,      0,  35384,  18432,     76, }, /* 642 */
+  {     0,      5,     12,      0,      0,  18432,    192, }, /* 643 */
+  {     0,      6,     12,      0,      0,  18432,    190, }, /* 644 */
+  {     0,      6,     12,      0,      0,  18432,    194, }, /* 645 */
+  {     1,      6,     12,      0,      0,  18432,    190, }, /* 646 */
+  {    84,     12,      3,      0,      0,  26636,    102, }, /* 647 */
+  {    84,     12,      3,      0,      0,  26687,     96, }, /* 648 */
+  {    84,     12,      3,      0,      0,  26648,     96, }, /* 649 */
+  {     0,      9,     12,     92,      1,  18432,     74, }, /* 650 */
+  {     0,      5,     12,     92,     -1,  18432,     76, }, /* 651 */
+  {     0,      5,     12,      0,      0,  18432,     70, }, /* 652 */
+  {     0,      5,     12,     92,    -58,  18432,     70, }, /* 653 */
+  {     0,      9,     12,      0,  -7615,  18432,     74, }, /* 654 */
+  {     1,      5,     12,      0,      8,  18432,     76, }, /* 655 */
+  {     1,      9,     12,      0,     -8,  18432,     74, }, /* 656 */
+  {     1,      5,     12,      0,     74,  18432,     76, }, /* 657 */
+  {     1,      5,     12,      0,     86,  18432,     76, }, /* 658 */
+  {     1,      5,     12,      0,    100,  18432,     76, }, /* 659 */
+  {     1,      5,     12,      0,    128,  18432,     76, }, /* 660 */
+  {     1,      5,     12,      0,    112,  18432,     76, }, /* 661 */
+  {     1,      5,     12,      0,    126,  18432,     76, }, /* 662 */
+  {     1,      5,     12,      0,      8,  18432,     70, }, /* 663 */
+  {     1,      8,     12,      0,     -8,  18432,     86, }, /* 664 */
+  {     1,      5,     12,      0,      0,  18432,     70, }, /* 665 */
+  {     1,      5,     12,      0,      9,  18432,     70, }, /* 666 */
+  {     1,      9,     12,      0,    -74,  18432,     74, }, /* 667 */
+  {     1,      8,     12,      0,     -9,  18432,     86, }, /* 668 */
+  {     1,      5,     12,     21,  -7173,  18432,     76, }, /* 669 */
+  {     1,      9,     12,      0,    -86,  18432,     74, }, /* 670 */
+  {     1,      9,     12,      0,   -100,  18432,     74, }, /* 671 */
+  {     1,      9,     12,      0,   -112,  18432,     74, }, /* 672 */
+  {     1,      9,     12,      0,   -128,  18432,     74, }, /* 673 */
+  {     1,      9,     12,      0,   -126,  18432,     74, }, /* 674 */
+  {    69,     29,     12,      0,      0,  45056,     52, }, /* 675 */
+  {    84,      1,      3,      0,      0,   6144,    196, }, /* 676 */
+  {    84,      1,     13,      0,      0,   6144,    198, }, /* 677 */
+  {    69,      1,      2,      0,      0,  18432,    200, }, /* 678 */
+  {    69,      1,      2,      0,      0,  34816,    200, }, /* 679 */
+  {    69,     17,     12,      0,      0,  28672,    202, }, /* 680 */
+  {    69,     21,     12,      0,      0,  28672,     64, }, /* 681 */
+  {    69,     20,     12,      0,      0,  28672,    204, }, /* 682 */
+  {    69,     19,     12,      0,      0,  28672,    204, }, /* 683 */
+  {    69,     22,     12,      0,      0,  28672,    206, }, /* 684 */
+  {    69,     20,     12,      0,      0,  28672,    206, }, /* 685 */
+  {    69,     19,     12,      0,      0,  28672,    206, }, /* 686 */
+  {    69,     21,     12,      0,      0,  28672,    208, }, /* 687 */
+  {    69,     27,      2,      0,      0,  45056,     50, }, /* 688 */
+  {    69,     28,      2,      0,      0,   4096,     50, }, /* 689 */
+  {    69,      1,      2,      0,      0,  20480,    134, }, /* 690 */
+  {    69,      1,      2,      0,      0,  36864,    134, }, /* 691 */
+  {    69,      1,      2,      0,      0,  30720,    134, }, /* 692 */
+  {    69,      1,      2,      0,      0,  24576,    134, }, /* 693 */
+  {    69,      1,      2,      0,      0,  40960,    134, }, /* 694 */
+  {    69,     29,     12,      0,      0,   8291,     52, }, /* 695 */
+  {    69,     21,     12,      0,      0,  14336,     54, }, /* 696 */
+  {    69,     21,     12,      0,      0,  14336,     64, }, /* 697 */
+  {    69,     21,     14,      0,      0,  28672,    210, }, /* 698 */
+  {    69,     21,     12,      0,      0,  28672,    212, }, /* 699 */
+  {    69,     16,     12,      0,      0,  28672,    138, }, /* 700 */
+  {    69,     16,     12,      0,      0,  28672,    214, }, /* 701 */
+  {    69,     25,     12,      0,      0,   8192,     64, }, /* 702 */
+  {    69,     22,     12,      0,      0,  28672,    216, }, /* 703 */
+  {    69,     18,     12,      0,      0,  28672,    216, }, /* 704 */
+  {    69,     21,     12,      0,      0,  28672,    202, }, /* 705 */
+  {    69,      1,      2,      0,      0,   6144,    218, }, /* 706 */
+  {    68,      2,      2,      0,      0,   6144,    220, }, /* 707 */
+  {    69,      1,      2,      0,      0,  22528,    134, }, /* 708 */
+  {    69,      1,      2,      0,      0,  38912,    134, }, /* 709 */
+  {    69,      1,      2,      0,      0,  16384,    134, }, /* 710 */
+  {    69,      1,      2,      0,      0,  32768,    134, }, /* 711 */
+  {    69,      1,      2,      0,      0,   6144,    222, }, /* 712 */
+  {    69,     25,     12,      0,      0,  12288,    118, }, /* 713 */
+  {    69,     25,     12,      0,      0,  12288,    224, }, /* 714 */
+  {    69,     25,     12,      0,      0,  28672,    118, }, /* 715 */
+  {    69,     22,     12,      0,      0,  28672,    226, }, /* 716 */
+  {    69,     18,     12,      0,      0,  28672,    226, }, /* 717 */
+  {    68,      2,     12,      0,      0,  14336,      0, }, /* 718 */
+  {    84,     12,      3,      0,      0,  26624,    228, }, /* 719 */
+  {    84,     11,      3,      0,      0,  26624,    120, }, /* 720 */
+  {    84,     11,      3,      0,      0,  26624,    230, }, /* 721 */
+  {    84,     12,      3,      0,      0,  26753,    102, }, /* 722 */
+  {    69,     26,     12,      0,      0,  28672,     68, }, /* 723 */
+  {    69,      9,     12,      0,      0,  18432,    112, }, /* 724 */
+  {    69,      5,     12,      0,      0,  18432,    232, }, /* 725 */
+  {    69,     25,     12,      0,      0,  28672,    234, }, /* 726 */
+  {    69,     26,     14,      0,      0,  28672,    236, }, /* 727 */
+  {     1,      9,     12,     96,  -7517,  18432,     74, }, /* 728 */
+  {    69,     26,     12,      0,      0,  28672,    118, }, /* 729 */
+  {     0,      9,     12,    100,  -8383,  18432,     74, }, /* 730 */
+  {     0,      9,     12,    104,  -8262,  18432,     74, }, /* 731 */
+  {    69,     26,     12,      0,      0,  14336,    238, }, /* 732 */
+  {     0,      9,     12,      0,     28,  18432,     74, }, /* 733 */
+  {    69,      7,     12,      0,      0,  18432,    240, }, /* 734 */
+  {    69,      5,     14,      0,      0,  18432,    242, }, /* 735 */
+  {    69,      5,     12,      0,      0,  18432,    244, }, /* 736 */
+  {     0,      5,     12,      0,    -28,  18432,     76, }, /* 737 */
+  {     0,     14,     12,      0,     16,  18432,     74, }, /* 738 */
+  {     0,     14,     12,      0,    -16,  18432,     76, }, /* 739 */
+  {     0,     14,     12,      0,      0,  18432,     82, }, /* 740 */
+  {    69,     25,     14,      0,      0,  28672,    246, }, /* 741 */
+  {    69,     26,     14,      0,      0,  28672,    246, }, /* 742 */
+  {    69,     26,     12,      0,      0,  28672,     64, }, /* 743 */
+  {    69,     25,     12,      0,      0,  28672,    248, }, /* 744 */
+  {    69,     25,     12,      0,      0,  12288,    250, }, /* 745 */
+  {    69,     22,     12,      0,      0,  28672,    248, }, /* 746 */
+  {    69,     18,     12,      0,      0,  28672,    248, }, /* 747 */
+  {    69,     26,     14,      0,      0,  28672,    252, }, /* 748 */
+  {    69,     22,     12,      0,      0,  28672,    254, }, /* 749 */
+  {    69,     18,     12,      0,      0,  28672,    254, }, /* 750 */
+  {    69,     26,     12,      0,      0,  18432,     54, }, /* 751 */
+  {    69,     26,     14,      0,      0,  28672,    256, }, /* 752 */
+  {    68,      2,     12,      0,      0,  18432,    258, }, /* 753 */
+  {    69,     26,     12,      0,     26,  18432,    260, }, /* 754 */
+  {    69,     26,     14,      0,     26,  18432,    262, }, /* 755 */
+  {    69,     26,     12,      0,    -26,  18432,    264, }, /* 756 */
+  {    69,     25,     14,      0,      0,  28672,    266, }, /* 757 */
+  {    69,     26,     14,      0,      0,  28672,    268, }, /* 758 */
+  {    69,     26,     14,      0,      0,  28672,    270, }, /* 759 */
+  {    69,     25,     14,      0,      0,  28672,    268, }, /* 760 */
+  {    69,     26,     14,      0,      0,  18432,    256, }, /* 761 */
+  {    69,     26,     14,      0,      0,  28672,    272, }, /* 762 */
+  {    88,     26,     12,      0,      0,  18432,     54, }, /* 763 */
+  {    69,     26,     12,      0,      0,  28672,    216, }, /* 764 */
+  {    35,      9,     12,      0,     48,  18432,     74, }, /* 765 */
+  {    35,      5,     12,      0,    -48,  18432,     76, }, /* 766 */
+  {     0,      9,     12,      0, -10743,  18432,     74, }, /* 767 */
+  {     0,      9,     12,      0,  -3814,  18432,     74, }, /* 768 */
+  {     0,      9,     12,      0, -10727,  18432,     74, }, /* 769 */
+  {     0,      5,     12,      0, -10795,  18432,     76, }, /* 770 */
+  {     0,      5,     12,      0, -10792,  18432,     76, }, /* 771 */
+  {     0,      9,     12,      0, -10780,  18432,     74, }, /* 772 */
+  {     0,      9,     12,      0, -10749,  18432,     74, }, /* 773 */
+  {     0,      9,     12,      0, -10783,  18432,     74, }, /* 774 */
+  {     0,      9,     12,      0, -10782,  18432,     74, }, /* 775 */
+  {     0,      9,     12,      0, -10815,  18432,     74, }, /* 776 */
+  {    34,      5,     12,      0,      0,  18432,     60, }, /* 777 */
+  {    34,     26,     12,      0,      0,  28672,     68, }, /* 778 */
+  {    34,     12,      3,      0,      0,  26624,     96, }, /* 779 */
+  {    34,     21,     12,      0,      0,  28672,     68, }, /* 780 */
+  {    34,     15,     12,      0,      0,  28672,     68, }, /* 781 */
+  {    17,      5,     12,      0,  -7264,  18432,     76, }, /* 782 */
+  {    90,      7,     12,      0,      0,  18432,     82, }, /* 783 */
+  {    90,      6,     12,      0,      0,  18432,    142, }, /* 784 */
+  {    90,     21,     12,      0,      0,  18432,     68, }, /* 785 */
+  {    90,     12,      3,      0,      0,  26624,    182, }, /* 786 */
+  {     2,     12,      3,      0,      0,  26624,    130, }, /* 787 */
+  {    69,     20,     12,      0,      0,  28672,    216, }, /* 788 */
+  {    69,     19,     12,      0,      0,  28672,    216, }, /* 789 */
+  {    69,      6,     12,      0,      0,  28672,    274, }, /* 790 */
+  {    69,     21,     12,      0,      0,  28672,    276, }, /* 791 */
+  {    69,     21,     12,      0,      0,  28726,     54, }, /* 792 */
+  {    23,     26,     12,      0,      0,  28672,    278, }, /* 793 */
+  {    69,     26,     12,      0,      0,  28672,    280, }, /* 794 */
+  {    69,     26,     12,      0,      0,  28672,    282, }, /* 795 */
+  {    69,     21,     12,      0,      0,  28825,    276, }, /* 796 */
+  {    69,     21,     12,      0,      0,  28825,    212, }, /* 797 */
+  {    69,     21,     12,      0,      0,  28819,     54, }, /* 798 */
+  {    23,      6,     12,      0,      0,  18432,    136, }, /* 799 */
+  {    69,      7,     12,      0,      0,  18447,    284, }, /* 800 */
+  {    23,     14,     12,      0,      0,  18432,    284, }, /* 801 */
+  {    69,     22,     12,      0,      0,  28825,    216, }, /* 802 */
+  {    69,     18,     12,      0,      0,  28825,    216, }, /* 803 */
+  {    69,     22,     12,      0,      0,  28825,     62, }, /* 804 */
+  {    69,     18,     12,      0,      0,  28825,     62, }, /* 805 */
+  {    69,     26,     12,      0,      0,  28819,     54, }, /* 806 */
+  {    69,     17,     12,      0,      0,  28819,    202, }, /* 807 */
+  {    69,     22,     12,      0,      0,  28819,    206, }, /* 808 */
+  {    69,     18,     12,      0,      0,  28819,    206, }, /* 809 */
+  {    84,     12,      3,      0,      0,  26669,     96, }, /* 810 */
+  {    18,     10,      3,      0,      0,  18432,    286, }, /* 811 */
+  {    69,     17,     14,      0,      0,  28819,    288, }, /* 812 */
+  {    69,      6,     12,      0,      0,  18525,    136, }, /* 813 */
+  {    69,     26,     12,      0,      0,  28819,     68, }, /* 814 */
+  {    23,      6,     12,      0,      0,  18432,    142, }, /* 815 */
+  {    69,      7,     12,      0,      0,  18564,     82, }, /* 816 */
+  {    69,     21,     14,      0,      0,  28804,    236, }, /* 817 */
+  {    69,     26,     12,      0,      0,  28687,     68, }, /* 818 */
+  {    20,      7,     12,      0,      0,  18432,     82, }, /* 819 */
+  {    84,     12,      3,      0,      0,  26717,     96, }, /* 820 */
+  {    69,     24,     12,      0,      0,  28765,    290, }, /* 821 */
+  {    20,      6,     12,      0,      0,  18432,    136, }, /* 822 */
+  {    69,     17,     12,      0,      0,  28765,    126, }, /* 823 */
+  {    21,      7,     12,      0,      0,  18432,     82, }, /* 824 */
+  {    69,     21,     12,      0,      0,  28825,     68, }, /* 825 */
+  {    69,      6,     12,      0,      0,  18525,     94, }, /* 826 */
+  {    21,      6,     12,      0,      0,  18432,    136, }, /* 827 */
+  {    22,      7,     12,      0,      0,  18432,     82, }, /* 828 */
+  {    18,      7,     12,      0,      0,  18432,     82, }, /* 829 */
+  {    18,      7,     12,      0,      0,  18432,    168, }, /* 830 */
+  {    69,     26,     12,      0,      0,  18447,     68, }, /* 831 */
+  {    69,     15,     12,      0,      0,  18447,     68, }, /* 832 */
+  {    18,     26,     12,      0,      0,  18432,     68, }, /* 833 */
+  {    18,     26,     12,      0,      0,  28672,     68, }, /* 834 */
+  {    69,     15,     12,      0,      0,  18432,     68, }, /* 835 */
+  {    69,     26,     14,      0,      0,  18447,    236, }, /* 836 */
+  {    21,     26,     12,      0,      0,  18432,     68, }, /* 837 */
+  {    23,      7,     12,      0,      0,  18432,    292, }, /* 838 */
+  {    24,      7,     12,      0,      0,  18432,     82, }, /* 839 */
+  {    24,      6,     12,      0,      0,  18432,    136, }, /* 840 */
+  {    24,     26,     12,      0,      0,  28672,     68, }, /* 841 */
+  {   111,      7,     12,      0,      0,  18432,     82, }, /* 842 */
+  {   111,      6,     12,      0,      0,  18432,    142, }, /* 843 */
+  {   111,     21,     12,      0,      0,  18432,    106, }, /* 844 */
+  {   111,     21,     12,      0,      0,  18432,    124, }, /* 845 */
+  {    99,      7,     12,      0,      0,  18432,     82, }, /* 846 */
+  {    99,      6,     12,      0,      0,  18432,    136, }, /* 847 */
+  {    99,     21,     12,      0,      0,  28672,    106, }, /* 848 */
+  {    99,     21,     12,      0,      0,  28672,    124, }, /* 849 */
+  {    99,     13,     12,      0,      0,  18432,    138, }, /* 850 */
+  {     2,      9,     12,    108,      1,  18432,     74, }, /* 851 */
+  {     2,      5,     12,    108, -35267,  18432,     76, }, /* 852 */
+  {     2,      7,     12,      0,      0,  18432,     82, }, /* 853 */
+  {     2,     21,     12,      0,      0,  28672,     68, }, /* 854 */
+  {     2,     12,      3,      0,      0,  26624,     96, }, /* 855 */
+  {     2,      6,     12,      0,      0,  28672,     92, }, /* 856 */
+  {     2,      6,     12,      0,      0,  18432,     88, }, /* 857 */
+  {   112,      7,     12,      0,      0,  18432,     82, }, /* 858 */
+  {   112,     14,     12,      0,      0,  18432,     82, }, /* 859 */
+  {   112,     12,      3,      0,      0,  26624,     96, }, /* 860 */
+  {   112,     21,     12,      0,      0,  18432,     68, }, /* 861 */
+  {   112,     21,     12,      0,      0,  18432,    124, }, /* 862 */
+  {   112,     21,     12,      0,      0,  18432,    106, }, /* 863 */
+  {    69,     24,     12,      0,      0,  28762,     56, }, /* 864 */
+  {     0,      9,     12,      0, -35332,  18432,     74, }, /* 865 */
+  {    69,     24,     12,      0,      0,  18432,     56, }, /* 866 */
+  {     0,      9,     12,      0, -42280,  18432,     74, }, /* 867 */
+  {     0,      5,     12,      0,     48,  18432,     76, }, /* 868 */
+  {     0,      9,     12,      0, -42308,  18432,     74, }, /* 869 */
+  {     0,      9,     12,      0, -42319,  18432,     74, }, /* 870 */
+  {     0,      9,     12,      0, -42315,  18432,     74, }, /* 871 */
+  {     0,      9,     12,      0, -42305,  18432,     74, }, /* 872 */
+  {     0,      9,     12,      0, -42258,  18432,     74, }, /* 873 */
+  {     0,      9,     12,      0, -42282,  18432,     74, }, /* 874 */
+  {     0,      9,     12,      0, -42261,  18432,     74, }, /* 875 */
+  {     0,      9,     12,      0,    928,  18432,     74, }, /* 876 */
+  {     0,      9,     12,      0,    -48,  18432,     74, }, /* 877 */
+  {     0,      9,     12,      0, -42307,  18432,     74, }, /* 878 */
+  {     0,      9,     12,      0, -35384,  18432,     74, }, /* 879 */
+  {     0,      6,     12,      0,      0,  18432,    142, }, /* 880 */
+  {    36,      7,     12,      0,      0,  18432,     82, }, /* 881 */
+  {    36,     12,      3,      0,      0,  26624,    130, }, /* 882 */
+  {    36,     12,      3,      0,      0,  26624,    182, }, /* 883 */
+  {    36,     10,      5,      0,      0,  18432,    144, }, /* 884 */
+  {    36,     26,     12,      0,      0,  28672,     68, }, /* 885 */
+  {    69,     15,     12,      0,      0,  18612,     68, }, /* 886 */
+  {    69,     15,     12,      0,      0,  18609,     68, }, /* 887 */
+  {    69,     26,     12,      0,      0,  18600,     68, }, /* 888 */
+  {    69,     23,     12,      0,      0,  14504,     68, }, /* 889 */
+  {    69,     26,     12,      0,      0,  14504,     68, }, /* 890 */
+  {    37,      7,     12,      0,      0,  18432,     82, }, /* 891 */
+  {    37,     21,     12,      0,      0,  28672,     68, }, /* 892 */
+  {    37,     21,     12,      0,      0,  28672,    124, }, /* 893 */
+  {   100,     10,      5,      0,      0,  18432,    144, }, /* 894 */
+  {   100,      7,     12,      0,      0,  18432,     82, }, /* 895 */
+  {   100,     12,      3,      0,      0,  26624,    146, }, /* 896 */
+  {   100,     12,      3,      0,      0,  26624,    130, }, /* 897 */
+  {   100,     21,     12,      0,      0,  18432,    124, }, /* 898 */
+  {   100,     13,     12,      0,      0,  18432,    138, }, /* 899 */
+  {     6,     12,      3,      0,      0,  26666,     96, }, /* 900 */
+  {     6,      7,     12,      0,      0,  18507,     82, }, /* 901 */
+  {    39,     13,     12,      0,      0,  18432,    138, }, /* 902 */
+  {    39,      7,     12,      0,      0,  18432,     82, }, /* 903 */
+  {    39,     12,      3,      0,      0,  26624,    130, }, /* 904 */
+  {    39,     12,      3,      0,      0,  26624,     96, }, /* 905 */
+  {    69,     21,     12,      0,      0,  18567,    188, }, /* 906 */
+  {    39,     21,     12,      0,      0,  18432,    124, }, /* 907 */
+  {   101,      7,     12,      0,      0,  18432,     82, }, /* 908 */
+  {   101,     12,      3,      0,      0,  26624,    130, }, /* 909 */
+  {   101,     10,      5,      0,      0,  18432,    144, }, /* 910 */
+  {   101,     10,      5,      0,      0,  18432,    172, }, /* 911 */
+  {   101,     21,     12,      0,      0,  18432,     68, }, /* 912 */
+  {    40,     12,      3,      0,      0,  26624,    130, }, /* 913 */
+  {    40,     10,      5,      0,      0,  18432,    144, }, /* 914 */
+  {    40,      7,     12,      0,      0,  18432,     82, }, /* 915 */
+  {    40,     12,      3,      0,      0,  26624,     96, }, /* 916 */
+  {    40,     10,      5,      0,      0,  18432,    172, }, /* 917 */
+  {    40,     21,     12,      0,      0,  18432,     68, }, /* 918 */
+  {    40,     21,     12,      0,      0,  18432,    106, }, /* 919 */
+  {    40,     21,     12,      0,      0,  18432,    124, }, /* 920 */
+  {    69,      6,     12,      0,      0,  18480,    136, }, /* 921 */
+  {    40,     13,     12,      0,      0,  18432,    138, }, /* 922 */
+  {    16,      6,     12,      0,      0,  18432,    136, }, /* 923 */
+  {   105,      7,     12,      0,      0,  18432,     82, }, /* 924 */
+  {   105,     12,      3,      0,      0,  26624,    130, }, /* 925 */
+  {   105,     10,      5,      0,      0,  18432,    144, }, /* 926 */
+  {   105,     13,     12,      0,      0,  18432,    138, }, /* 927 */
+  {   105,     21,     12,      0,      0,  18432,     68, }, /* 928 */
+  {   105,     21,     12,      0,      0,  18432,    124, }, /* 929 */
+  {   107,      7,     12,      0,      0,  18432,     82, }, /* 930 */
+  {   107,     12,      3,      0,      0,  26624,    130, }, /* 931 */
+  {   107,      7,     12,      0,      0,  18432,    156, }, /* 932 */
+  {   107,     12,      3,      0,      0,  26624,     96, }, /* 933 */
+  {   107,      7,     12,      0,      0,  18432,    294, }, /* 934 */
+  {   107,      6,     12,      0,      0,  18432,    136, }, /* 935 */
+  {   107,     21,     12,      0,      0,  18432,     68, }, /* 936 */
+  {   107,     21,     12,      0,      0,  18432,    106, }, /* 937 */
+  {   113,      7,     12,      0,      0,  18432,     82, }, /* 938 */
+  {   113,     10,      5,      0,      0,  18432,    144, }, /* 939 */
+  {   113,     12,      3,      0,      0,  26624,    130, }, /* 940 */
+  {   113,     21,     12,      0,      0,  18432,    124, }, /* 941 */
+  {   113,      6,     12,      0,      0,  18432,    136, }, /* 942 */
+  {   113,     12,      3,      0,      0,  26624,    146, }, /* 943 */
+  {     0,      5,     12,      0,   -928,  18432,     76, }, /* 944 */
+  {     0,      6,     12,      0,      0,  18432,     92, }, /* 945 */
+  {    76,      5,     12,      0, -38864,  18432,     70, }, /* 946 */
+  {   113,     10,      5,      0,      0,  18432,    160, }, /* 947 */
+  {   113,     13,     12,      0,      0,  18432,    138, }, /* 948 */
+  {    18,      7,      9,      0,      0,  18432,     82, }, /* 949 */
+  {    18,      7,     10,      0,      0,  18432,     82, }, /* 950 */
+  {    68,      4,     12,      0,      0,  18432,      0, }, /* 951 */
+  {    68,      3,     12,      0,      0,  18432,      0, }, /* 952 */
+  {    23,      7,     12,      0,      0,  18432,    284, }, /* 953 */
+  {    71,     25,     12,      0,      0,  12288,    118, }, /* 954 */
+  {     3,      7,     12,      0,      0,      0,    296, }, /* 955 */
+  {    69,     18,     12,      0,      0,  28705,     54, }, /* 956 */
+  {    69,     22,     12,      0,      0,  28705,     54, }, /* 957 */
+  {    68,      2,     12,      0,      0,   6144,    298, }, /* 958 */
+  {     3,      7,     12,      0,      0,     39,     82, }, /* 959 */
+  {     3,     26,     12,      0,      0,  28711,     68, }, /* 960 */
+  {    84,     12,      3,      0,      0,  26624,    178, }, /* 961 */
+  {    84,     12,      3,      0,      0,  26624,    300, }, /* 962 */
+  {    69,     21,     12,      0,      0,  28672,     68, }, /* 963 */
+  {    69,     21,     12,      0,      0,  28672,    122, }, /* 964 */
+  {    69,     22,     12,      0,      0,  28672,     68, }, /* 965 */
+  {    69,     18,     12,      0,      0,  28672,     68, }, /* 966 */
+  {    69,     17,     12,      0,      0,  28672,    126, }, /* 967 */
+  {    69,     22,     12,      0,      0,  28672,    302, }, /* 968 */
+  {    69,     18,     12,      0,      0,  28672,    302, }, /* 969 */
+  {    69,     21,     12,      0,      0,   8192,    106, }, /* 970 */
+  {    69,     21,     12,      0,      0,   8192,    304, }, /* 971 */
+  {    69,     21,     12,      0,      0,   8192,    306, }, /* 972 */
+  {    69,     21,     12,      0,      0,  28672,    124, }, /* 973 */
+  {    69,     22,     12,      0,      0,  28672,    158, }, /* 974 */
+  {    69,     18,     12,      0,      0,  28672,    158, }, /* 975 */
+  {    69,     21,     12,      0,      0,  14336,     68, }, /* 976 */
+  {    69,     21,     12,      0,      0,  28672,    118, }, /* 977 */
+  {    69,     17,     12,      0,      0,  12288,    224, }, /* 978 */
+  {    69,     25,     12,      0,      0,  28672,    226, }, /* 979 */
+  {    69,     21,     12,      0,      0,  28672,    302, }, /* 980 */
+  {    69,     21,     12,      0,      0,  28672,    308, }, /* 981 */
+  {    69,     17,     12,      0,      0,  12288,    126, }, /* 982 */
+  {    69,     21,     12,      0,      0,   8192,     68, }, /* 983 */
+  {    69,     13,     12,      0,      0,  10240,    310, }, /* 984 */
+  {     0,      9,     12,      0,     32,  18432,    312, }, /* 985 */
+  {    69,     24,     12,      0,      0,  28672,    314, }, /* 986 */
+  {     0,      5,     12,      0,    -32,  18432,    316, }, /* 987 */
+  {    69,     21,     12,      0,      0,  28825,    124, }, /* 988 */
+  {    69,     22,     12,      0,      0,  28825,    318, }, /* 989 */
+  {    69,     18,     12,      0,      0,  28825,    318, }, /* 990 */
+  {    69,     21,     12,      0,      0,  28825,    106, }, /* 991 */
+  {    69,      6,      3,      0,      0,  18525,    320, }, /* 992 */
+  {    69,      1,      2,      0,      0,  28672,    322, }, /* 993 */
+  {    31,      7,     12,      0,      0,  18432,     82, }, /* 994 */
+  {    69,     21,     12,      0,      0,  18552,     68, }, /* 995 */
+  {    69,     21,     12,      0,      0,  28792,     68, }, /* 996 */
+  {    69,     21,     12,      0,      0,  18483,     68, }, /* 997 */
+  {    69,     15,     12,      0,      0,  18555,     68, }, /* 998 */
+  {    69,     26,     12,      0,      0,  18483,     68, }, /* 999 */
+  {     1,     14,     12,      0,      0,  28672,     82, }, /* 1000 */
+  {     1,     15,     12,      0,      0,  28672,     68, }, /* 1001 */
+  {     1,     26,     12,      0,      0,  28672,     68, }, /* 1002 */
+  {     1,     26,     12,      0,      0,  18432,     68, }, /* 1003 */
+  {   102,      7,     12,      0,      0,  18432,     82, }, /* 1004 */
+  {   103,      7,     12,      0,      0,  18432,     82, }, /* 1005 */
+  {    84,     12,      3,      0,      0,  26651,     96, }, /* 1006 */
+  {    69,     15,     12,      0,      0,  10267,     68, }, /* 1007 */
+  {    81,      7,     12,      0,      0,  18432,     82, }, /* 1008 */
+  {    81,     15,     12,      0,      0,  18432,     68, }, /* 1009 */
+  {    82,      7,     12,      0,      0,  18432,     82, }, /* 1010 */
+  {    82,     14,     12,      0,      0,  18432,     82, }, /* 1011 */
+  {    53,      7,     12,      0,      0,  18432,     82, }, /* 1012 */
+  {    53,     12,      3,      0,      0,  26624,    130, }, /* 1013 */
+  {    85,      7,     12,      0,      0,  18432,     82, }, /* 1014 */
+  {    85,     21,     12,      0,      0,  18432,    106, }, /* 1015 */
+  {    91,      7,     12,      0,      0,  18432,     82, }, /* 1016 */
+  {    91,     21,     12,      0,      0,  18432,    106, }, /* 1017 */
+  {    91,     14,     12,      0,      0,  18432,     82, }, /* 1018 */
+  {    83,      9,     12,      0,     40,  18432,     74, }, /* 1019 */
+  {    83,      5,     12,      0,    -40,  18432,     76, }, /* 1020 */
+  {    86,      7,     12,      0,      0,  18432,     82, }, /* 1021 */
+  {    87,      7,     12,      0,      0,  18432,     82, }, /* 1022 */
+  {    87,     13,     12,      0,      0,  18432,    138, }, /* 1023 */
+  {   145,      9,     12,      0,     40,  18432,     74, }, /* 1024 */
+  {   145,      5,     12,      0,    -40,  18432,     76, }, /* 1025 */
+  {   127,      7,     12,      0,      0,  18432,     82, }, /* 1026 */
+  {   125,      7,     12,      0,      0,  18432,     82, }, /* 1027 */
+  {   125,     21,     12,      0,      0,  18432,     68, }, /* 1028 */
+  {   161,      9,     12,      0,     39,  18432,     74, }, /* 1029 */
+  {   161,      5,     12,      0,    -39,  18432,     76, }, /* 1030 */
+  {    49,      7,     12,      0,      0,  18432,     82, }, /* 1031 */
+  {     0,      6,     12,      0,      0,  18432,     94, }, /* 1032 */
+  {    32,      7,     12,      0,      0,  34816,     82, }, /* 1033 */
+  {   114,      7,     12,      0,      0,  34816,     82, }, /* 1034 */
+  {   114,     21,     12,      0,      0,  34816,    106, }, /* 1035 */
+  {   114,     15,     12,      0,      0,  34816,     68, }, /* 1036 */
+  {   133,      7,     12,      0,      0,  34816,     82, }, /* 1037 */
+  {   133,     26,     12,      0,      0,  34816,     68, }, /* 1038 */
+  {   133,     15,     12,      0,      0,  34816,     68, }, /* 1039 */
+  {   132,      7,     12,      0,      0,  34816,     82, }, /* 1040 */
+  {   132,     15,     12,      0,      0,  34816,     68, }, /* 1041 */
+  {   139,      7,     12,      0,      0,  34816,     82, }, /* 1042 */
+  {   139,     15,     12,      0,      0,  34816,     68, }, /* 1043 */
+  {    95,      7,     12,      0,      0,  34816,     82, }, /* 1044 */
+  {    95,     15,     12,      0,      0,  34816,     68, }, /* 1045 */
+  {    95,     21,     12,      0,      0,  28672,    106, }, /* 1046 */
+  {   104,      7,     12,      0,      0,  34816,     82, }, /* 1047 */
+  {   104,     21,     12,      0,      0,  34816,     68, }, /* 1048 */
+  {   122,      7,     12,      0,      0,  34816,     82, }, /* 1049 */
+  {   121,      7,     12,      0,      0,  34816,     82, }, /* 1050 */
+  {   121,     15,     12,      0,      0,  34816,     68, }, /* 1051 */
+  {    92,      7,     12,      0,      0,  34816,     82, }, /* 1052 */
+  {    92,     12,      3,      0,      0,  26624,    130, }, /* 1053 */
+  {    92,     12,      3,      0,      0,  26624,    102, }, /* 1054 */
+  {    92,     12,      3,      0,      0,  26624,    182, }, /* 1055 */
+  {    92,     15,     12,      0,      0,  34816,     68, }, /* 1056 */
+  {    92,     21,     12,      0,      0,  34816,     68, }, /* 1057 */
+  {    92,     21,     12,      0,      0,  34816,    124, }, /* 1058 */
+  {   115,      7,     12,      0,      0,  34816,     82, }, /* 1059 */
+  {   115,     15,     12,      0,      0,  34816,     68, }, /* 1060 */
+  {   115,     21,     12,      0,      0,  34816,     68, }, /* 1061 */
+  {   131,      7,     12,      0,      0,  34816,     82, }, /* 1062 */
+  {   131,     15,     12,      0,      0,  34816,     68, }, /* 1063 */
+  {    51,      7,     12,      0,      0,  34816,     82, }, /* 1064 */
+  {    51,     26,     12,      0,      0,  34816,     68, }, /* 1065 */
+  {    51,     12,      3,      0,      0,  26624,     96, }, /* 1066 */
+  {    51,     15,     12,      0,      0,  34816,     68, }, /* 1067 */
+  {    51,     21,     12,      0,      0,  34816,    106, }, /* 1068 */
+  {    51,     21,     12,      0,      0,  34918,    106, }, /* 1069 */
+  {    51,     21,     12,      0,      0,  34816,     68, }, /* 1070 */
+  {   108,      7,     12,      0,      0,  34816,     82, }, /* 1071 */
+  {   108,     21,     12,      0,      0,  28672,     68, }, /* 1072 */
+  {   108,     21,     12,      0,      0,  28672,    106, }, /* 1073 */
+  {   116,      7,     12,      0,      0,  34816,     82, }, /* 1074 */
+  {   116,     15,     12,      0,      0,  34816,     68, }, /* 1075 */
+  {   117,      7,     12,      0,      0,  34816,     82, }, /* 1076 */
+  {   117,     15,     12,      0,      0,  34816,     68, }, /* 1077 */
+  {    54,      7,     12,      0,      0,  34816,     82, }, /* 1078 */
+  {    54,     21,     12,      0,      0,  34816,    106, }, /* 1079 */
+  {    54,     15,     12,      0,      0,  34816,     68, }, /* 1080 */
+  {   118,      7,     12,      0,      0,  34816,     82, }, /* 1081 */
+  {   140,      9,     12,      0,     64,  34816,     74, }, /* 1082 */
+  {   140,      5,     12,      0,    -64,  34816,     76, }, /* 1083 */
+  {   140,     15,     12,      0,      0,  34816,     68, }, /* 1084 */
+  {    62,      7,     12,      0,      0,      0,     82, }, /* 1085 */
+  {    62,      7,     12,      0,      0,      0,    294, }, /* 1086 */
+  {    62,     12,      3,      0,      0,  26624,    128, }, /* 1087 */
+  {    62,     13,     12,      0,      0,   2048,    138, }, /* 1088 */
+  {     3,     15,     12,      0,      0,   2048,     68, }, /* 1089 */
+  {    65,      7,     12,      0,      0,  34816,     82, }, /* 1090 */
+  {    65,     12,      3,      0,      0,  26624,    130, }, /* 1091 */
+  {    65,     17,     12,      0,      0,  34816,    126, }, /* 1092 */
+  {   152,      7,     12,      0,      0,  34816,     82, }, /* 1093 */
+  {   152,     15,     12,      0,      0,  34816,     68, }, /* 1094 */
+  {    63,      7,     12,      0,      0,      0,     82, }, /* 1095 */
+  {    63,     12,      3,      0,      0,  26624,     96, }, /* 1096 */
+  {    63,     15,     12,      0,      0,      0,     68, }, /* 1097 */
+  {    63,     21,     12,      0,      0,      0,    124, }, /* 1098 */
+  {    67,      7,     12,      0,      0,  34816,     82, }, /* 1099 */
+  {    67,     12,      3,      0,      0,  26624,     96, }, /* 1100 */
+  {    67,     21,     12,      0,      0,  34816,    124, }, /* 1101 */
+  {   156,      7,     12,      0,      0,  34816,     82, }, /* 1102 */
+  {   156,     15,     12,      0,      0,  34816,     68, }, /* 1103 */
+  {   153,      7,     12,      0,      0,  34816,     82, }, /* 1104 */
+  {   120,     10,      5,      0,      0,  18432,    144, }, /* 1105 */
+  {   120,     12,      3,      0,      0,  26624,    130, }, /* 1106 */
+  {   120,      7,     12,      0,      0,  18432,     82, }, /* 1107 */
+  {   120,     12,      3,      0,      0,  26624,    146, }, /* 1108 */
+  {   120,     21,     12,      0,      0,  18432,    124, }, /* 1109 */
+  {   120,     21,     12,      0,      0,  18432,    106, }, /* 1110 */
+  {   120,     15,     12,      0,      0,  28672,     68, }, /* 1111 */
+  {   120,     13,     12,      0,      0,  18432,    138, }, /* 1112 */
+  {   120,     12,      3,      0,      0,  26624,    182, }, /* 1113 */
+  {    41,     12,      3,      0,      0,  26624,    102, }, /* 1114 */
+  {    41,     10,      5,      0,      0,  18432,    144, }, /* 1115 */
+  {    41,      7,     12,      0,      0,  18432,     82, }, /* 1116 */
+  {    41,     12,      3,      0,      0,  26624,    130, }, /* 1117 */
+  {    41,     12,      3,      0,      0,  26624,    146, }, /* 1118 */
+  {    41,     12,      3,      0,      0,  26624,     96, }, /* 1119 */
+  {    41,     21,     12,      0,      0,  18432,     68, }, /* 1120 */
+  {    41,      1,      4,      0,      0,  18432,    132, }, /* 1121 */
+  {    41,     21,     12,      0,      0,  18432,    124, }, /* 1122 */
+  {   124,      7,     12,      0,      0,  18432,     82, }, /* 1123 */
+  {   124,     13,     12,      0,      0,  18432,    138, }, /* 1124 */
+  {    43,     12,      3,      0,      0,  26624,    130, }, /* 1125 */
+  {    43,      7,     12,      0,      0,  18432,     82, }, /* 1126 */
+  {    43,     10,      5,      0,      0,  18432,    144, }, /* 1127 */
+  {    43,     12,      3,      0,      0,  26624,    146, }, /* 1128 */
+  {    43,     13,     12,      0,      0,  18432,    138, }, /* 1129 */
+  {    43,     21,     12,      0,      0,  18432,     68, }, /* 1130 */
+  {    43,     21,     12,      0,      0,  18432,    124, }, /* 1131 */
+  {    50,      7,     12,      0,      0,  18432,     82, }, /* 1132 */
+  {    50,     12,      3,      0,      0,  26624,     96, }, /* 1133 */
+  {    50,     21,     12,      0,      0,  18432,     68, }, /* 1134 */
+  {    44,     12,      3,      0,      0,  26624,    130, }, /* 1135 */
+  {    44,     10,      5,      0,      0,  18432,    144, }, /* 1136 */
+  {    44,      7,     12,      0,      0,  18432,     82, }, /* 1137 */
+  {    44,     10,      5,      0,      0,  18432,    172, }, /* 1138 */
+  {    44,      7,      4,      0,      0,  18432,     82, }, /* 1139 */
+  {    44,     21,     12,      0,      0,  18432,    124, }, /* 1140 */
+  {    44,     21,     12,      0,      0,  18432,     68, }, /* 1141 */
+  {    44,     12,      3,      0,      0,  26624,    102, }, /* 1142 */
+  {    44,     12,      3,      0,      0,  26624,     96, }, /* 1143 */
+  {    44,     13,     12,      0,      0,  18432,    138, }, /* 1144 */
+  {    15,     15,     12,      0,      0,  18432,     68, }, /* 1145 */
+  {    48,      7,     12,      0,      0,  18432,     82, }, /* 1146 */
+  {    48,     10,      5,      0,      0,  18432,    144, }, /* 1147 */
+  {    48,     12,      3,      0,      0,  26624,    130, }, /* 1148 */
+  {    48,     10,      5,      0,      0,  18432,    172, }, /* 1149 */
+  {    48,     12,      3,      0,      0,  26624,     96, }, /* 1150 */
+  {    48,     21,     12,      0,      0,  18432,    124, }, /* 1151 */
+  {    48,     21,     12,      0,      0,  18432,    106, }, /* 1152 */
+  {    48,     21,     12,      0,      0,  18432,     68, }, /* 1153 */
+  {    57,      7,     12,      0,      0,  18432,     82, }, /* 1154 */
+  {    57,     21,     12,      0,      0,  18432,    124, }, /* 1155 */
+  {    55,      7,     12,      0,      0,  18432,     82, }, /* 1156 */
+  {    55,     12,      3,      0,      0,  26624,    130, }, /* 1157 */
+  {    55,     10,      5,      0,      0,  18432,    144, }, /* 1158 */
+  {    55,     12,      3,      0,      0,  26624,     96, }, /* 1159 */
+  {    55,     12,      3,      0,      0,  26624,    146, }, /* 1160 */
+  {    55,     13,     12,      0,      0,  18432,    138, }, /* 1161 */
+  {    47,     12,      3,      0,      0,  26624,    130, }, /* 1162 */
+  {    47,     12,      3,      0,      0,  26705,    130, }, /* 1163 */
+  {    47,     10,      5,      0,      0,  18432,    144, }, /* 1164 */
+  {    47,     10,      5,      0,      0,  18513,    144, }, /* 1165 */
+  {    47,      7,     12,      0,      0,  18432,     82, }, /* 1166 */
+  {    84,     12,      3,      0,      0,  26705,    102, }, /* 1167 */
+  {    47,     12,      3,      0,      0,  26705,     96, }, /* 1168 */
+  {    47,     10,      3,      0,      0,  18432,    148, }, /* 1169 */
+  {    47,     10,      5,      0,      0,  18432,    172, }, /* 1170 */
+  {    47,      7,     12,      0,      0,  18432,    324, }, /* 1171 */
+  {    47,     12,      3,      0,      0,  26624,     96, }, /* 1172 */
+  {   144,      7,     12,      0,      0,  18432,     82, }, /* 1173 */
+  {   144,     10,      5,      0,      0,  18432,    144, }, /* 1174 */
+  {   144,     12,      3,      0,      0,  26624,    130, }, /* 1175 */
+  {   144,     12,      3,      0,      0,  26624,    146, }, /* 1176 */
+  {   144,     12,      3,      0,      0,  26624,     96, }, /* 1177 */
+  {   144,     21,     12,      0,      0,  18432,    124, }, /* 1178 */
+  {   144,     21,     12,      0,      0,  18432,    106, }, /* 1179 */
+  {   144,     21,     12,      0,      0,  18432,     68, }, /* 1180 */
+  {   144,     13,     12,      0,      0,  18432,    138, }, /* 1181 */
+  {   144,     12,      3,      0,      0,  26624,    102, }, /* 1182 */
+  {    56,      7,     12,      0,      0,  18432,     82, }, /* 1183 */
+  {    56,     10,      3,      0,      0,  18432,    148, }, /* 1184 */
+  {    56,     10,      5,      0,      0,  18432,    144, }, /* 1185 */
+  {    56,     12,      3,      0,      0,  26624,    130, }, /* 1186 */
+  {    56,     12,      3,      0,      0,  26624,    146, }, /* 1187 */
+  {    56,     12,      3,      0,      0,  26624,     96, }, /* 1188 */
+  {    56,     21,     12,      0,      0,  18432,     68, }, /* 1189 */
+  {    56,     13,     12,      0,      0,  18432,    138, }, /* 1190 */
+  {   135,      7,     12,      0,      0,  18432,     82, }, /* 1191 */
+  {   135,     10,      3,      0,      0,  18432,    148, }, /* 1192 */
+  {   135,     10,      5,      0,      0,  18432,    144, }, /* 1193 */
+  {   135,     12,      3,      0,      0,  26624,    130, }, /* 1194 */
+  {   135,     12,      3,      0,      0,  26624,    146, }, /* 1195 */
+  {   135,     12,      3,      0,      0,  26624,     96, }, /* 1196 */
+  {   135,     21,     12,      0,      0,  18432,     68, }, /* 1197 */
+  {   135,     21,     12,      0,      0,  18432,    124, }, /* 1198 */
+  {   135,     21,     12,      0,      0,  18432,    106, }, /* 1199 */
+  {   135,     21,     12,      0,      0,  18432,    176, }, /* 1200 */
+  {    52,      7,     12,      0,      0,  18432,     82, }, /* 1201 */
+  {    52,     10,      5,      0,      0,  18432,    144, }, /* 1202 */
+  {    52,     12,      3,      0,      0,  26624,    130, }, /* 1203 */
+  {    52,     12,      3,      0,      0,  26624,    146, }, /* 1204 */
+  {    52,     21,     12,      0,      0,  18432,    124, }, /* 1205 */
+  {    52,     21,     12,      0,      0,  18432,     68, }, /* 1206 */
+  {    52,     13,     12,      0,      0,  18432,    138, }, /* 1207 */
+  {    45,      7,     12,      0,      0,  18432,     82, }, /* 1208 */
+  {    45,     12,      3,      0,      0,  26624,    130, }, /* 1209 */
+  {    45,     10,      5,      0,      0,  18432,    144, }, /* 1210 */
+  {    45,     10,      5,      0,      0,  18432,    172, }, /* 1211 */
+  {    45,     12,      3,      0,      0,  26624,     96, }, /* 1212 */
+  {    45,     21,     12,      0,      0,  18432,     68, }, /* 1213 */
+  {    45,     13,     12,      0,      0,  18432,    138, }, /* 1214 */
+  {   137,      7,     12,      0,      0,  18432,     82, }, /* 1215 */
+  {   137,     12,      3,      0,      0,  26624,    130, }, /* 1216 */
+  {   137,     10,     12,      0,      0,  18432,    144, }, /* 1217 */
+  {   137,     10,      5,      0,      0,  18432,    144, }, /* 1218 */
+  {   137,     12,      3,      0,      0,  26624,    146, }, /* 1219 */
+  {   137,     13,     12,      0,      0,  18432,    138, }, /* 1220 */
+  {   137,     15,     12,      0,      0,  18432,     68, }, /* 1221 */
+  {   137,     21,     12,      0,      0,  18432,    124, }, /* 1222 */
+  {   137,     26,     12,      0,      0,  18432,     68, }, /* 1223 */
+  {    60,      7,     12,      0,      0,  18432,     82, }, /* 1224 */
+  {    60,     10,      5,      0,      0,  18432,    144, }, /* 1225 */
+  {    60,     12,      3,      0,      0,  26624,    130, }, /* 1226 */
+  {    60,     12,      3,      0,      0,  26624,    146, }, /* 1227 */
+  {    60,     12,      3,      0,      0,  26624,     96, }, /* 1228 */
+  {    60,     21,     12,      0,      0,  18432,     68, }, /* 1229 */
+  {   136,      9,     12,      0,     32,  18432,     74, }, /* 1230 */
+  {   136,      5,     12,      0,    -32,  18432,     76, }, /* 1231 */
+  {   136,     13,     12,      0,      0,  18432,    138, }, /* 1232 */
+  {   136,     15,     12,      0,      0,  18432,     68, }, /* 1233 */
+  {   136,      7,     12,      0,      0,  18432,     82, }, /* 1234 */
+  {   157,      7,     12,      0,      0,  18432,     82, }, /* 1235 */
+  {   157,     10,      3,      0,      0,  18432,    148, }, /* 1236 */
+  {   157,     10,      5,      0,      0,  18432,    144, }, /* 1237 */
+  {   157,     12,      3,      0,      0,  26624,    130, }, /* 1238 */
+  {   157,     10,      5,      0,      0,  18432,    172, }, /* 1239 */
+  {   157,     12,      3,      0,      0,  26624,    146, }, /* 1240 */
+  {   157,      7,      4,      0,      0,  18432,     82, }, /* 1241 */
+  {   157,     12,      3,      0,      0,  26624,     96, }, /* 1242 */
+  {   157,     21,     12,      0,      0,  18432,    124, }, /* 1243 */
+  {   157,     21,     12,      0,      0,  18432,     68, }, /* 1244 */
+  {   157,     13,     12,      0,      0,  18432,    138, }, /* 1245 */
+  {    64,      7,     12,      0,      0,  18432,     82, }, /* 1246 */
+  {    64,     10,      5,      0,      0,  18432,    144, }, /* 1247 */
+  {    64,     12,      3,      0,      0,  26624,    130, }, /* 1248 */
+  {    64,     12,      3,      0,      0,  26624,    146, }, /* 1249 */
+  {    64,     21,     12,      0,      0,  18432,     68, }, /* 1250 */
+  {   149,      7,     12,      0,      0,  18432,     82, }, /* 1251 */
+  {   149,     12,      3,      0,      0,  26624,    130, }, /* 1252 */
+  {   149,     12,      3,      0,      0,  18432,    130, }, /* 1253 */
+  {   149,     12,      3,      0,      0,  26624,    102, }, /* 1254 */
+  {   149,     12,      3,      0,      0,  26624,    146, }, /* 1255 */
+  {   149,     10,      5,      0,      0,  18432,    144, }, /* 1256 */
+  {   149,      7,      4,      0,      0,  18432,     82, }, /* 1257 */
+  {   149,     21,     12,      0,      0,  18432,     68, }, /* 1258 */
+  {   149,     21,     12,      0,      0,  18432,    124, }, /* 1259 */
+  {   148,      7,     12,      0,      0,  18432,     82, }, /* 1260 */
+  {   148,     12,      3,      0,      0,  26624,    130, }, /* 1261 */
+  {   148,     10,      5,      0,      0,  18432,    144, }, /* 1262 */
+  {   148,      7,      4,      0,      0,  18432,     82, }, /* 1263 */
+  {   148,     12,      3,      0,      0,  26624,    326, }, /* 1264 */
+  {   148,     12,      3,      0,      0,  26624,    146, }, /* 1265 */
+  {   148,     21,     12,      0,      0,  18432,     68, }, /* 1266 */
+  {   148,     21,     12,      0,      0,  18432,    124, }, /* 1267 */
+  {   148,     21,     12,      0,      0,  18432,    106, }, /* 1268 */
+  {   134,      7,     12,      0,      0,  18432,     82, }, /* 1269 */
+  {   142,      7,     12,      0,      0,  18432,     82, }, /* 1270 */
+  {   142,     10,      5,      0,      0,  18432,    144, }, /* 1271 */
+  {   142,     12,      3,      0,      0,  26624,    130, }, /* 1272 */
+  {   142,     12,      3,      0,      0,  18432,    146, }, /* 1273 */
+  {   142,     21,     12,      0,      0,  18432,    124, }, /* 1274 */
+  {   142,     21,     12,      0,      0,  18432,    106, }, /* 1275 */
+  {   142,     21,     12,      0,      0,  18432,     68, }, /* 1276 */
+  {   142,     13,     12,      0,      0,  18432,    138, }, /* 1277 */
+  {   142,     15,     12,      0,      0,  18432,     68, }, /* 1278 */
+  {   143,     21,     12,      0,      0,  18432,     68, }, /* 1279 */
+  {   143,     21,     12,      0,      0,  18432,    106, }, /* 1280 */
+  {   143,      7,     12,      0,      0,  18432,     82, }, /* 1281 */
+  {   143,     12,      3,      0,      0,  26624,    130, }, /* 1282 */
+  {   143,     10,      5,      0,      0,  18432,    144, }, /* 1283 */
+  {    59,      7,     12,      0,      0,  18432,     82, }, /* 1284 */
+  {    59,     12,      3,      0,      0,  26624,    130, }, /* 1285 */
+  {    59,     12,      3,      0,      0,  26624,     96, }, /* 1286 */
+  {    59,     12,      3,      0,      0,  26624,    146, }, /* 1287 */
+  {    59,      7,      4,      0,      0,  18432,     82, }, /* 1288 */
+  {    59,     13,     12,      0,      0,  18432,    138, }, /* 1289 */
+  {    61,      7,     12,      0,      0,  18432,     82, }, /* 1290 */
+  {    61,     10,      5,      0,      0,  18432,    144, }, /* 1291 */
+  {    61,     12,      3,      0,      0,  26624,    130, }, /* 1292 */
+  {    61,     12,      3,      0,      0,  26624,    146, }, /* 1293 */
+  {    61,     13,     12,      0,      0,  18432,    138, }, /* 1294 */
+  {   150,      7,     12,      0,      0,  18432,     82, }, /* 1295 */
+  {   150,     12,      3,      0,      0,  26624,    130, }, /* 1296 */
+  {   150,     10,      5,      0,      0,  18432,    144, }, /* 1297 */
+  {   150,     21,     12,      0,      0,  18432,    124, }, /* 1298 */
+  {    11,     15,     12,      0,      0,  18432,     68, }, /* 1299 */
+  {    11,     21,     12,      0,      0,  18432,     68, }, /* 1300 */
+  {    94,      7,     12,      0,      0,  18432,     82, }, /* 1301 */
+  {    94,     14,     12,      0,      0,  18432,     82, }, /* 1302 */
+  {    94,     21,     12,      0,      0,  18432,    106, }, /* 1303 */
+  {    66,      7,     12,      0,      0,  18432,     82, }, /* 1304 */
+  {    66,     21,     12,      0,      0,  18432,     68, }, /* 1305 */
+  {   109,      7,     12,      0,      0,  18432,     82, }, /* 1306 */
+  {   109,      1,      2,      0,      0,  18432,    322, }, /* 1307 */
+  {   138,      7,     12,      0,      0,  18432,     82, }, /* 1308 */
+  {   130,      7,     12,      0,      0,  18432,     82, }, /* 1309 */
+  {   130,     13,     12,      0,      0,  18432,    138, }, /* 1310 */
+  {   130,     21,     12,      0,      0,  18432,    124, }, /* 1311 */
+  {   159,      7,     12,      0,      0,  18432,     82, }, /* 1312 */
+  {   159,     13,     12,      0,      0,  18432,    138, }, /* 1313 */
+  {   126,      7,     12,      0,      0,  18432,     82, }, /* 1314 */
+  {   126,     12,      3,      0,      0,  26624,     96, }, /* 1315 */
+  {   126,     21,     12,      0,      0,  18432,    124, }, /* 1316 */
+  {   128,      7,     12,      0,      0,  18432,     82, }, /* 1317 */
+  {   128,     12,      3,      0,      0,  26624,     96, }, /* 1318 */
+  {   128,     21,     12,      0,      0,  18432,    124, }, /* 1319 */
+  {   128,     21,     12,      0,      0,  18432,    106, }, /* 1320 */
+  {   128,     21,     12,      0,      0,  18432,     68, }, /* 1321 */
+  {   128,     26,     12,      0,      0,  18432,     68, }, /* 1322 */
+  {   128,      6,     12,      0,      0,  18432,    142, }, /* 1323 */
+  {   128,      6,     12,      0,      0,  18432,    136, }, /* 1324 */
+  {   128,     13,     12,      0,      0,  18432,    138, }, /* 1325 */
+  {   128,     15,     12,      0,      0,  18432,     68, }, /* 1326 */
+  {   151,      9,     12,      0,     32,  18432,     74, }, /* 1327 */
+  {   151,      5,     12,      0,    -32,  18432,     76, }, /* 1328 */
+  {   151,     15,     12,      0,      0,  18432,     68, }, /* 1329 */
+  {   151,     21,     12,      0,      0,  18432,    106, }, /* 1330 */
+  {   151,     21,     12,      0,      0,  18432,    124, }, /* 1331 */
+  {   151,     21,     12,      0,      0,  18432,     68, }, /* 1332 */
+  {   123,      7,     12,      0,      0,  18432,     82, }, /* 1333 */
+  {   123,     12,      3,      0,      0,  26624,    130, }, /* 1334 */
+  {   123,     10,      5,      0,      0,  18432,    144, }, /* 1335 */
+  {   123,     12,      3,      0,      0,  26624,    128, }, /* 1336 */
+  {   123,      6,     12,      0,      0,  18432,     92, }, /* 1337 */
+  {   146,      6,     12,      0,      0,  18432,    136, }, /* 1338 */
+  {   147,      6,     12,      0,      0,  18432,    136, }, /* 1339 */
+  {    23,     21,     12,      0,      0,  28672,     68, }, /* 1340 */
+  {   158,     12,      3,      0,      0,  26624,    328, }, /* 1341 */
+  {    23,     10,      5,      0,      0,  18432,    164, }, /* 1342 */
+  {   146,      7,     12,      0,      0,  18432,    284, }, /* 1343 */
+  {   158,      7,     12,      0,      0,  18432,    284, }, /* 1344 */
+  {    21,      6,     12,      0,      0,  18432,     92, }, /* 1345 */
+  {   147,      7,     12,      0,      0,  18432,    284, }, /* 1346 */
+  {    46,      7,     12,      0,      0,  18432,     82, }, /* 1347 */
+  {    46,     26,     12,      0,      0,  18432,     68, }, /* 1348 */
+  {    46,     12,      3,      0,      0,  26624,    102, }, /* 1349 */
+  {    46,     12,      3,      0,      0,  26624,    130, }, /* 1350 */
+  {    46,     21,     12,      0,      0,  18432,    124, }, /* 1351 */
+  {    69,      1,      2,      0,      0,   6153,     66, }, /* 1352 */
+  {    69,     10,      3,      0,      0,  18432,    330, }, /* 1353 */
+  {    69,     10,      5,      0,      0,  18432,    138, }, /* 1354 */
+  {    69,     10,      5,      0,      0,  18432,    160, }, /* 1355 */
+  {    69,     10,      3,      0,      0,  18432,    286, }, /* 1356 */
+  {     1,     12,      3,      0,      0,  26624,    102, }, /* 1357 */
+  {    69,     25,     12,      0,      0,  18432,    118, }, /* 1358 */
+  {    69,     13,     12,      0,      0,  10240,    214, }, /* 1359 */
+  {   141,     26,     12,      0,      0,  18432,     68, }, /* 1360 */
+  {   141,     12,      3,      0,      0,  26624,    102, }, /* 1361 */
+  {   141,     21,     12,      0,      0,  18432,    106, }, /* 1362 */
+  {   141,     21,     12,      0,      0,  18432,    124, }, /* 1363 */
+  {   141,     21,     12,      0,      0,  18432,     68, }, /* 1364 */
+  {    35,     12,      3,      0,      0,  26624,    130, }, /* 1365 */
+  {   154,      7,     12,      0,      0,  18432,     82, }, /* 1366 */
+  {   154,     12,      3,      0,      0,  26624,     96, }, /* 1367 */
+  {   154,      6,     12,      0,      0,  18432,    142, }, /* 1368 */
+  {   154,      6,     12,      0,      0,  18432,    136, }, /* 1369 */
+  {   154,     13,     12,      0,      0,  18432,    138, }, /* 1370 */
+  {   154,     26,     12,      0,      0,  18432,     68, }, /* 1371 */
+  {   160,      7,     12,      0,      0,  18432,     82, }, /* 1372 */
+  {   160,     12,      3,      0,      0,  26624,     96, }, /* 1373 */
+  {   155,      7,     12,      0,      0,  18432,     82, }, /* 1374 */
+  {   155,     12,      3,      0,      0,  26624,     96, }, /* 1375 */
+  {   155,     13,     12,      0,      0,  18432,    138, }, /* 1376 */
+  {   155,     23,     12,      0,      0,  14336,     68, }, /* 1377 */
+  {   129,      7,     12,      0,      0,  34816,     82, }, /* 1378 */
+  {   129,     15,     12,      0,      0,  34816,     68, }, /* 1379 */
+  {   129,     12,      3,      0,      0,  26624,     96, }, /* 1380 */
+  {    58,      9,     12,      0,     34,  34816,     74, }, /* 1381 */
+  {    58,      5,     12,      0,    -34,  34816,     76, }, /* 1382 */
+  {    58,     12,      3,      0,      0,  26624,    150, }, /* 1383 */
+  {    58,     12,      3,      0,      0,  26624,    130, }, /* 1384 */
+  {    58,     12,      3,      0,      0,  26624,     96, }, /* 1385 */
+  {    58,      6,     12,      0,      0,  34816,    142, }, /* 1386 */
+  {    58,     13,     12,      0,      0,  34816,    138, }, /* 1387 */
+  {    58,     21,     12,      0,      0,  34816,     68, }, /* 1388 */
+  {    69,     15,     12,      0,      0,      0,     68, }, /* 1389 */
+  {    69,     26,     12,      0,      0,      0,     68, }, /* 1390 */
+  {    69,     23,     12,      0,      0,      0,     68, }, /* 1391 */
+  {     3,      7,     12,      0,      0,      0,    240, }, /* 1392 */
+  {    69,     26,     14,      0,      0,  28672,    332, }, /* 1393 */
+  {    69,     26,     14,      0,      0,  28672,    334, }, /* 1394 */
+  {    68,      2,     14,      0,      0,  18432,    336, }, /* 1395 */
+  {    69,     26,     12,      0,      0,  18432,    338, }, /* 1396 */
+  {    69,     26,     14,      0,      0,  18432,    340, }, /* 1397 */
+  {    69,     26,     14,      0,      0,  18432,    334, }, /* 1398 */
+  {    69,     26,     11,      0,      0,  18432,    342, }, /* 1399 */
+  {    20,     26,     12,      0,      0,  18432,     68, }, /* 1400 */
+  {    69,     26,     14,      0,      0,  18432,    236, }, /* 1401 */
+  {    69,     26,     14,      0,      0,  18447,    334, }, /* 1402 */
+  {    69,     26,     14,      0,      0,  28672,    344, }, /* 1403 */
+  {    69,     26,     14,      0,      0,  28672,    346, }, /* 1404 */
+  {    69,     24,      3,      0,      0,  28672,    348, }, /* 1405 */
+  {    69,     26,     14,      0,      0,  28672,    350, }, /* 1406 */
+  {    69,     13,     12,      0,      0,  10240,    138, }, /* 1407 */
+  {    69,      1,      3,      0,      0,   6144,    352, }, /* 1408 */
+};
+
+const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, /* U+0000 */
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, /* U+0800 */
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 41, 41, 42, 43, 44, 45, /* U+1000 */
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, /* U+1800 */
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, /* U+2000 */
+ 78, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, /* U+2800 */
+ 93, 94, 95, 96, 97, 98, 99,100,101,101,101,101,101,101,101,101, /* U+3000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+3800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+4000 */
+101,101,101,101,101,101,101,101,101,101,101,102,101,101,101,101, /* U+4800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+5000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+5800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+6000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+6800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+7000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+7800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+8000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+8800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+9000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+9800 */
+103,104,104,104,104,104,104,104,104,105,106,106,107,108,109,110, /* U+A000 */
+111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,119, /* U+A800 */
+120,121,122,123,124,125,119,120,121,122,123,124,125,119,120,121, /* U+B000 */
+122,123,124,125,119,120,121,122,123,124,125,119,120,121,122,123, /* U+B800 */
+124,125,119,120,121,122,123,124,125,119,120,121,122,123,124,125, /* U+C000 */
+119,120,121,122,123,124,125,119,120,121,122,123,124,125,119,120, /* U+C800 */
+121,122,123,124,125,119,120,121,122,123,124,125,119,120,121,126, /* U+D000 */
+127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127, /* U+D800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+E000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+E800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F000 */
+128,128,129,129,130,131,132,133,134,135,136,137,138,139,140,141, /* U+F800 */
+142,143,144,145,146,147,148,149,150,151,152,153,154,154,155,156, /* U+10000 */
+157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172, /* U+10800 */
+173,174,175,176,177,178,179,146,180,181,146,182,183,184,185,146, /* U+11000 */
+186,187,188,189,190,191,146,146,192,193,194,195,146,196,146,197, /* U+11800 */
+198,198,198,198,198,198,198,199,200,198,201,146,146,146,146,146, /* U+12000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,202, /* U+12800 */
+203,203,203,203,203,203,203,203,204,146,146,146,146,146,146,146, /* U+13000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+13800 */
+146,146,146,146,146,146,146,146,205,205,205,205,206,146,146,146, /* U+14000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+14800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+15000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+15800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+16000 */
+207,207,207,207,208,209,210,211,146,146,146,146,212,213,214,215, /* U+16800 */
+216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, /* U+17000 */
+216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, /* U+17800 */
+216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,217, /* U+18000 */
+216,216,216,216,216,216,218,218,218,219,220,146,146,146,146,146, /* U+18800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+19000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+19800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+1A000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,221, /* U+1A800 */
+222,223,224,225,225,226,146,146,146,146,146,146,146,146,146,146, /* U+1B000 */
+146,146,146,146,146,146,146,146,227,228,146,146,146,146,146,146, /* U+1B800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+1C000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,229,230, /* U+1C800 */
+231,232,233,234,235,236,237,146,238,239,240,241,242,243,244,245, /* U+1D000 */
+246,246,246,246,247,248,146,146,146,146,146,146,146,146,249,146, /* U+1D800 */
+250,146,251,146,146,252,146,146,146,146,146,146,146,146,146,253, /* U+1E000 */
+254,255,256,168,168,168,168,168,257,258,259,168,260,261,168,168, /* U+1E800 */
+262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277, /* U+1F000 */
+278,279,280,281,282,283,284,285,267,267,267,267,267,267,267,286, /* U+1F800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+20000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+20800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+21000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+21800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+22000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+22800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+23000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+23800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+24000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+24800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+25000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+25800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+26000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+26800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+27000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+27800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+28000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+28800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+29000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+29800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,287,101,101, /* U+2A000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2A800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,288,101, /* U+2B000 */
+289,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2B800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2C000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,290,101,101, /* U+2C800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2D000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2D800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2E000 */
+101,101,101,101,101,101,101,291,146,146,146,146,146,146,146,146, /* U+2E800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+2F000 */
+129,129,129,129,292,146,146,146,146,146,146,146,146,146,146,293, /* U+2F800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+30000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+30800 */
+101,101,101,101,101,101,294,146,146,146,146,146,146,146,146,146, /* U+31000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+31800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+32000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+32800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+33000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+33800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+34000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+34800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+35000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+35800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+36000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+36800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+37000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+37800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+38000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+38800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+39000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+39800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3A000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3A800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3B000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3B800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3C000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3C800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3D000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3D800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3E000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3E800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3F000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+3F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+40000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+40800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+41000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+41800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+42000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+42800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+43000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+43800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+44000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+44800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+45000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+45800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+46000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+46800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+47000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+47800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+48000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+48800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+49000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+49800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4A000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4A800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4B000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4B800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4C000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4C800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4D000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4D800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4E000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4E800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4F000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+4F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+50000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+50800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+51000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+51800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+52000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+52800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+53000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+53800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+54000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+54800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+55000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+55800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+56000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+56800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+57000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+57800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+58000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+58800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+59000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+59800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5A000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5A800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5B000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5B800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5C000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5C800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5D000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5D800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5E000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5E800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5F000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+5F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+60000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+60800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+61000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+61800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+62000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+62800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+63000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+63800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+64000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+64800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+65000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+65800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+66000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+66800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+67000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+67800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+68000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+68800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+69000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+69800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6A000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6A800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6B000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6B800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6C000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6C800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6D000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6D800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6E000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6E800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6F000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+6F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+70000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+70800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+71000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+71800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+72000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+72800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+73000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+73800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+74000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+74800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+75000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+75800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+76000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+76800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+77000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+77800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+78000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+78800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+79000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+79800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7A000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7A800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7B000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7B800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7C000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7C800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7D000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7D800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7E000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7E800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7F000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+7F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+80000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+80800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+81000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+81800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+82000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+82800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+83000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+83800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+84000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+84800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+85000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+85800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+86000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+86800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+87000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+87800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+88000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+88800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+89000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+89800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8A000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8A800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8B000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8B800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8C000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8C800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8D000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8D800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8E000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8E800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8F000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+8F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+90000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+90800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+91000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+91800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+92000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+92800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+93000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+93800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+94000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+94800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+95000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+95800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+96000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+96800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+97000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+97800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+98000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+98800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+99000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+99800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9A000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9A800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9B000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9B800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9C000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9C800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9D000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9D800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9E000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9E800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9F000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+9F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A0000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A0800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A1000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A1800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A2000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A2800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A3000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A3800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A4000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A4800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A5000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A5800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A6000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A6800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A7000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A7800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A8000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A8800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A9000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A9800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AA000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AA800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AB000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AB800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AC000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AC800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AD000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AD800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AE000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AE800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AF000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+AF800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B0000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B0800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B1000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B1800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B2000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B2800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B3000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B3800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B4000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B4800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B5000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B5800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B6000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B6800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B7000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B7800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B8000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B8800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B9000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B9800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BA000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BA800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BB000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BB800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BC000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BC800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BD000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BD800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BE000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BE800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BF000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+BF800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C0000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C0800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C1000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C1800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C2000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C2800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C3000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C3800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C4000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C4800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C5000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C5800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C6000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C6800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C7000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C7800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C8000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C8800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C9000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C9800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CA000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CA800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CB000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CB800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CC000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CC800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CD000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CD800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CE000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CE800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CF000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+CF800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D0000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D0800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D1000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D1800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D2000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D2800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D3000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D3800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D4000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D4800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D5000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D5800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D6000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D6800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D7000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D7800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D8000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D8800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D9000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D9800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DA000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DA800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DB000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DB800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DC000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DC800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DD000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DD800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DE000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DE800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DF000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+DF800 */
+295,296,297,298,296,296,296,296,296,296,296,296,296,296,296,296, /* U+E0000 */
+296,296,296,296,296,296,296,296,296,296,296,296,296,296,296,296, /* U+E0800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E1000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E1800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E2000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E2800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E3000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E3800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E4000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E4800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E5000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E5800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E6000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E6800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E7000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E7800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E8000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E8800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E9000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E9800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EA000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EA800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EB000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EB800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EC000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EC800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+ED000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+ED800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EE000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EE800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EF000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,293, /* U+EF800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F0000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F0800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F1000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F1800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F2000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F2800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F3000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F3800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F4000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F4800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F5000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F5800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F6000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F6800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F7000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F7800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F8000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F8800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F9000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F9800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FA000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FA800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FB000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FB800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FC000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FC800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FD000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FD800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FE000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FE800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FF000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,299, /* U+FF800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+100000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+100800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+101000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+101800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+102000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+102800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+103000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+103800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+104000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+104800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+105000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+105800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+106000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+106800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+107000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+107800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+108000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+108800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+109000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+109800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10A000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10A800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10B000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10B800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10C000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10C800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10D000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10D800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10E000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10E800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10F000 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,299, /* U+10F800 */
+};
+
+const uint16_t PRIV(ucd_stage2)[] = { /* 76800 bytes, block = 128 */
+
+/* block 0 */
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  1,  3,  4,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  5,  5,  6,
+  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 25, 26, 27, 26,  8,
+ 13, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 30, 29, 29, 29, 29,
+ 29, 29, 29, 31, 29, 29, 29, 29, 29, 29, 29, 15, 13, 16, 32, 33,
+ 34, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 38, 36, 36, 36, 36,
+ 36, 36, 36, 39, 36, 36, 36, 36, 36, 36, 36, 15, 27, 16, 27,  0,
+
+/* block 1 */
+ 40, 40, 40, 40, 40, 41, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 42, 43, 44, 44, 44, 44, 45, 43, 46, 47, 48, 49, 50, 51, 47, 46,
+ 52, 53, 54, 54, 46, 55, 43, 56, 46, 54, 48, 57, 58, 58, 58, 43,
+ 59, 59, 59, 59, 59, 60, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+ 59, 59, 59, 59, 59, 59, 59, 50, 59, 59, 59, 59, 59, 59, 59, 61,
+ 62, 62, 62, 62, 62, 63, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+ 62, 62, 62, 62, 62, 62, 62, 50, 62, 62, 62, 62, 62, 62, 62, 64,
+
+/* block 2 */
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 67,
+ 68, 69, 65, 66, 65, 66, 65, 66, 70, 65, 66, 65, 66, 65, 66, 65,
+ 66, 65, 66, 65, 66, 65, 66, 65, 66, 71, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 72, 65, 66, 65, 66, 65, 66, 73,
+
+/* block 3 */
+ 74, 75, 65, 66, 65, 66, 76, 65, 66, 77, 77, 65, 66, 70, 78, 79,
+ 80, 65, 66, 77, 81, 82, 83, 84, 65, 66, 85, 70, 83, 86, 87, 88,
+ 65, 66, 65, 66, 65, 66, 89, 65, 66, 89, 70, 70, 65, 66, 89, 65,
+ 66, 90, 90, 65, 66, 65, 66, 91, 65, 66, 70, 92, 65, 66, 70, 93,
+ 92, 92, 92, 92, 94, 95, 96, 97, 98, 99,100,101,102, 65, 66, 65,
+ 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,103, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 69,104,105,106, 65, 66,107,108, 65, 66, 65, 66, 65, 66, 65, 66,
+
+/* block 4 */
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+109, 70, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 70, 70, 70, 70, 70, 70,110, 65, 66,111,112,113,
+113, 65, 66,114,115,116, 65, 66, 65, 67, 65, 66, 65, 66, 65, 66,
+117,118,119,120,121, 70,122,122, 70,123, 70,124,125, 70, 70, 70,
+122,126, 70,127, 70,128,129, 70,130,131,129,132,133, 70, 70,131,
+ 70,134,135, 70, 70,136, 70, 70, 70, 70, 70, 70, 70,137, 70, 70,
+
+/* block 5 */
+138, 70,139,138, 70, 70, 70,140,138,141,142,142,143, 70, 70, 70,
+ 70, 70,144, 70, 92, 70, 70, 70, 70, 70, 70, 70, 70,145,146, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+147,147,148,147,147,147,147,147,147,149,149,150,150,150,150,150,
+151,151, 46, 46, 46, 46,149,149,149,149,149,149,149,149,149,149,
+152,152, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+147,147,147,147,147, 46, 46, 46, 46, 46,153,153,149, 46,150, 46,
+ 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+
+/* block 6 */
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
+154,154,155,154,154,156,154,154,154,154,154,154,154,154,154,157,
+154,154,154,154,154,154,154,154,158,158,158,158,158,154,154,154,
+154,154,154,159,159,159,159,159,159,159,159,159,159,159,159,159,
+160,161,160,161,149,162,160,161,163,163,164,165,165,165,166,167,
+
+/* block 7 */
+163,163,163,163,162, 46,168,169,170,170,170,163,171,163,172,172,
+173,174,175,174,174,176,174,174,177,178,179,174,180,174,174,174,
+181,182,163,183,174,174,184,174,174,185,174,174,186,187,187,187,
+173,188,189,188,188,190,188,188,191,192,193,188,194,188,188,188,
+195,196,197,198,188,188,199,188,188,200,188,188,201,202,202,203,
+204,205,206,207,207,208,209,210,160,161,160,161,160,161,160,161,
+160,161,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
+213,214,215,216,217,218,219,160,161,220,160,161,221,222,222,222,
+
+/* block 8 */
+223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,
+224,224,225,224,226,224,224,224,224,224,224,224,224,224,227,224,
+224,228,229,224,224,224,224,224,224,224,230,224,224,224,224,224,
+231,231,232,231,233,231,231,231,231,231,231,231,231,231,234,231,
+231,235,236,231,231,231,231,231,231,231,237,231,231,231,231,231,
+238,238,238,238,238,238,239,238,239,238,238,238,238,238,238,238,
+240,241,242,243,240,241,240,241,240,241,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+
+/* block 9 */
+240,241,244,245,246,247,247,246,248,248,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+249,240,241,240,241,240,241,240,241,240,241,240,241,240,241,250,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+
+/* block 10 */
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+163,251,251,251,251,251,251,251,251,251,251,251,251,251,251,251,
+251,251,251,251,251,251,251,251,251,251,251,251,251,251,251,251,
+251,251,251,251,251,251,251,163,163,252,253,253,253,253,253,254,
+255,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,
+256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,
+
+/* block 11 */
+256,256,256,256,256,256,256,257,255,258,259,163,163,260,260,261,
+262,263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,
+263,263,264,263,263,263,263,263,263,263,263,263,263,263,263,263,
+265,265,265,265,265,265,265,265,265,265,265,265,265,265,266,265,
+267,265,265,268,265,269,267,269,262,262,262,262,262,262,262,262,
+270,270,270,270,270,270,270,270,270,270,270,270,270,270,270,270,
+270,270,270,270,270,270,270,270,270,270,270,262,262,262,262,270,
+270,270,270,267,271,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 12 */
+272,272,272,272,272,273,274,274,275,276,276,277,278,279,280,280,
+281,281,281,281,281,281,281,281,281,281,281,282,283,284,284,285,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+287,286,286,286,286,286,286,286,286,286,286,288,288,288,288,288,
+288,288,288,289,289,289,281,290,291,281,281,281,281,281,281,281,
+292,292,292,292,292,292,292,292,292,292,276,293,293,279,286,286,
+289,286,286,294,286,286,286,286,286,286,286,286,286,286,286,286,
+
+/* block 13 */
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,295,286,281,281,281,281,281,281,281,273,280,291,
+291,281,281,281,281,296,296,281,281,280,291,291,291,281,286,286,
+297,297,297,297,297,297,297,297,297,297,286,286,286,298,298,286,
+
+/* block 14 */
+299,299,299,300,300,300,300,300,300,300,300,301,300,301,302,303,
+304,305,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
+304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
+306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,
+307,307,307,307,307,307,307,307,307,307,307,302,302,304,304,304,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+
+/* block 15 */
+308,308,308,308,308,308,308,308,308,308,308,308,308,308,308,308,
+308,308,308,308,308,308,308,308,308,308,308,308,308,308,308,308,
+308,308,308,308,308,308,309,309,309,309,309,309,309,309,309,309,
+309,308,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
+310,310,310,310,310,310,310,310,310,310,311,311,311,311,311,311,
+311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,
+311,311,311,311,311,311,311,311,311,311,311,312,312,312,312,312,
+312,312,312,312,313,313,314,315,316,317,318,262,262,319,320,320,
+
+/* block 16 */
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,322,322,323,323,324,322,322,322,322,322,
+322,322,322,322,324,322,322,322,324,322,322,322,322,325,262,262,
+326,326,326,326,326,326,326,327,326,327,326,326,326,327,327,262,
+328,328,328,328,328,328,328,328,328,328,328,328,328,328,328,328,
+328,328,328,328,328,328,328,328,328,329,329,329,262,262,330,262,
+304,304,304,304,304,304,304,304,304,304,304,302,302,302,302,302,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+
+/* block 17 */
+286,286,286,286,286,286,286,286,331,286,286,286,286,286,286,302,
+272,272,302,302,302,302,302,302,291,291,291,291,291,291,291,291,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,296,291,291,291,291,291,291,
+291,291,291,332,281,281,281,281,281,281,281,281,281,281,281,281,
+332,332,273,290,290,290,290,290,290,290,291,291,291,291,291,291,
+290,290,290,290,290,290,290,290,290,290,290,290,290,290,290,281,
+
+/* block 18 */
+333,333,333,334,335,335,335,335,335,335,335,335,335,335,335,335,
+335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,
+335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,
+335,335,335,335,335,335,335,335,335,335,333,334,336,335,334,334,
+334,333,333,333,333,333,333,333,333,334,334,334,334,337,334,334,
+335,338,339,154,154,333,333,333,335,335,335,335,335,335,335,335,
+335,335,333,333,340,341,342,342,342,342,342,342,342,342,342,342,
+343,344,335,335,335,335,335,335,335,335,335,335,335,335,335,335,
+
+/* block 19 */
+345,346,347,347,163,345,345,345,345,345,345,345,345,163,163,345,
+345,163,163,345,345,345,345,345,345,345,345,345,345,345,345,345,
+345,345,345,345,345,345,345,345,345,163,345,345,345,345,345,345,
+345,163,345,163,163,163,345,345,345,345,163,163,348,345,349,347,
+347,346,346,346,346,163,163,347,347,163,163,347,347,350,345,163,
+163,163,163,163,163,163,163,349,163,163,163,163,345,345,163,345,
+345,345,346,346,163,163,351,351,351,351,351,351,351,351,351,351,
+345,345,352,352,353,353,353,353,353,353,354,352,345,355,356,163,
+
+/* block 20 */
+163,357,357,358,163,359,359,359,359,359,359,163,163,163,163,359,
+359,163,163,359,359,359,359,359,359,359,359,359,359,359,359,359,
+359,359,359,359,359,359,359,359,359,163,359,359,359,359,359,359,
+359,163,359,359,163,359,359,163,359,359,163,163,360,163,358,358,
+358,357,357,163,163,163,163,357,357,163,163,357,357,361,163,163,
+163,357,163,163,163,163,163,163,163,359,359,359,359,163,359,163,
+163,163,163,163,163,163,362,362,362,362,362,362,362,362,362,362,
+357,357,359,359,359,357,363,163,163,163,163,163,163,163,163,163,
+
+/* block 21 */
+163,364,364,365,163,366,366,366,366,366,366,366,366,366,163,366,
+366,366,163,366,366,366,366,366,366,366,366,366,366,366,366,366,
+366,366,366,366,366,366,366,366,366,163,366,366,366,366,366,366,
+366,163,366,366,163,366,366,366,366,366,163,163,367,366,365,365,
+365,364,364,364,364,364,163,364,364,365,163,365,365,368,163,163,
+366,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+366,366,364,364,163,163,369,369,369,369,369,369,369,369,369,369,
+370,371,163,163,163,163,163,163,163,366,364,364,364,367,367,367,
+
+/* block 22 */
+163,372,373,373,163,374,374,374,374,374,374,374,374,163,163,374,
+374,163,163,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,163,374,374,374,374,374,374,
+374,163,374,374,163,374,374,374,374,374,163,163,375,374,376,372,
+373,372,372,372,372,163,163,373,373,163,163,373,373,377,163,163,
+163,163,163,163,163,378,372,376,163,163,163,163,374,374,163,374,
+374,374,372,372,163,163,379,379,379,379,379,379,379,379,379,379,
+380,374,381,381,381,381,381,381,163,163,163,163,163,163,163,163,
+
+/* block 23 */
+163,163,382,383,163,383,383,383,383,383,383,163,163,163,383,383,
+383,163,383,383,383,383,163,163,163,383,383,163,383,163,383,383,
+163,163,163,383,383,163,163,163,383,383,383,163,163,163,383,383,
+383,383,383,383,383,383,383,383,383,383,163,163,163,163,384,385,
+382,385,385,163,163,163,385,385,385,163,385,385,385,386,163,163,
+383,163,163,163,163,163,163,384,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,387,387,387,387,387,387,387,387,387,387,
+388,388,388,389,390,390,390,390,390,391,390,163,163,163,163,163,
+
+/* block 24 */
+392,393,393,393,394,395,395,395,395,395,395,395,395,163,395,395,
+395,163,395,395,395,395,395,395,395,395,395,395,395,395,395,395,
+395,395,395,395,395,395,395,395,395,163,395,395,395,395,395,395,
+395,395,395,395,395,395,395,395,395,395,163,163,396,395,392,392,
+392,393,393,393,393,163,392,392,392,163,392,392,392,397,163,163,
+163,163,163,163,163,392,392,163,395,395,395,163,163,395,163,163,
+395,395,392,392,163,163,398,398,398,398,398,398,398,398,398,398,
+163,163,163,163,163,163,163,399,400,400,400,400,400,400,400,401,
+
+/* block 25 */
+402,403,404,404,405,402,402,402,402,402,402,402,402,163,402,402,
+402,163,402,402,402,402,402,402,402,402,402,402,402,402,402,402,
+402,402,402,402,402,402,402,402,402,163,402,402,402,402,402,402,
+402,402,402,402,163,402,402,402,402,402,163,163,406,402,404,407,
+404,404,408,404,404,163,407,404,404,163,404,404,403,409,163,163,
+163,163,163,163,163,408,408,163,163,163,163,163,163,402,402,163,
+402,402,403,403,163,163,410,410,410,410,410,410,410,410,410,410,
+163,402,402,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 26 */
+411,411,412,412,413,413,413,413,413,413,413,413,413,163,413,413,
+413,163,413,413,413,413,413,413,413,413,413,413,413,413,413,413,
+413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,
+413,413,413,413,413,413,413,413,413,413,413,414,414,413,415,412,
+412,411,411,411,411,163,412,412,412,163,412,412,412,414,416,417,
+163,163,163,163,413,413,413,415,418,418,418,418,418,418,418,413,
+413,413,411,411,163,163,419,419,419,419,419,419,419,419,419,419,
+418,418,418,418,418,418,418,418,418,417,413,413,413,413,413,413,
+
+/* block 27 */
+163,420,421,421,163,422,422,422,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422,163,163,163,422,422,422,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,
+422,422,163,422,422,422,422,422,422,422,422,422,163,422,163,163,
+422,422,422,422,422,422,422,163,163,163,423,163,163,163,163,424,
+421,421,420,420,420,163,420,163,421,421,421,421,421,421,421,424,
+163,163,163,163,163,163,425,425,425,425,425,425,425,425,425,425,
+163,163,421,421,426,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 28 */
+163,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,
+427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,
+427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,
+427,428,427,429,428,428,428,428,428,428,430,163,163,163,163,431,
+432,432,432,432,432,427,433,434,434,434,434,434,434,428,434,435,
+436,436,436,436,436,436,436,436,436,436,437,437,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 29 */
+163,438,438,163,438,163,438,438,438,438,438,163,438,438,438,438,
+438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
+438,438,438,438,163,438,163,438,438,438,438,438,438,438,438,438,
+438,439,438,440,439,439,439,439,439,439,441,439,439,438,163,163,
+442,442,442,442,442,163,443,163,444,444,444,444,444,439,163,163,
+445,445,445,445,445,445,445,445,445,445,163,163,438,438,438,438,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 30 */
+446,447,447,447,448,448,448,448,449,448,448,448,448,449,449,449,
+449,449,449,447,448,447,447,447,450,450,447,447,447,447,447,447,
+451,451,451,451,451,451,451,451,451,451,452,452,452,452,452,452,
+452,452,452,452,447,450,447,450,447,450,453,454,453,454,455,455,
+446,446,446,446,446,446,446,446,163,446,446,446,446,446,446,446,
+446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,
+446,446,446,446,446,446,446,446,446,446,446,446,446,163,163,163,
+163,456,456,456,456,456,456,457,456,457,456,456,456,456,456,458,
+
+/* block 31 */
+456,456,450,450,459,448,450,450,446,446,446,446,446,456,456,456,
+456,456,456,456,456,456,456,456,163,456,456,456,456,456,456,456,
+456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,
+456,456,456,456,456,456,456,456,456,456,456,456,456,163,447,447,
+447,447,447,447,447,447,450,447,447,447,447,447,447,163,447,447,
+448,448,448,448,448,460,460,460,460,448,448,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 32 */
+461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
+461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
+461,461,461,461,461,461,461,461,461,461,461,462,462,463,463,463,
+463,464,463,463,463,463,463,465,462,466,466,464,464,463,463,461,
+467,467,467,467,467,467,467,467,467,467,468,468,469,469,469,469,
+461,461,461,461,461,461,464,464,463,463,461,461,461,461,463,463,
+463,461,462,470,470,461,461,462,462,470,470,470,470,470,461,461,
+461,463,463,463,463,461,461,461,461,461,461,461,461,461,461,461,
+
+/* block 33 */
+461,461,463,462,464,463,463,470,470,470,470,470,470,471,461,470,
+472,472,472,472,472,472,472,472,472,472,470,470,462,463,473,473,
+474,474,474,474,474,474,474,474,474,474,474,474,474,474,474,474,
+474,474,474,474,474,474,474,474,474,474,474,474,474,474,474,474,
+474,474,474,474,474,474,163,474,163,163,163,163,163,474,163,163,
+475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,
+475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,
+475,475,475,475,475,475,475,475,475,475,475,476,477,475,475,475,
+
+/* block 34 */
+478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
+478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
+478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
+478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
+478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
+478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,479,
+480,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
+481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
+
+/* block 35 */
+481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
+481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
+481,481,481,481,481,481,481,481,482,482,482,482,482,482,482,482,
+482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
+482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
+482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
+482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
+482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
+
+/* block 36 */
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,163,483,483,483,483,163,163,
+483,483,483,483,483,483,483,163,483,163,483,483,483,483,163,163,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+
+/* block 37 */
+483,483,483,483,483,483,483,483,483,163,483,483,483,483,163,163,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,163,483,483,483,483,163,163,483,483,483,483,483,483,483,163,
+483,163,483,483,483,483,163,163,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,163,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+
+/* block 38 */
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,163,483,483,483,483,163,163,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,483,483,483,483,163,163,484,484,484,
+485,486,487,486,486,486,486,487,487,488,488,488,488,488,488,488,
+488,488,489,489,489,489,489,489,489,489,489,489,489,163,163,163,
+
+/* block 39 */
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+490,490,490,490,490,490,490,490,490,490,163,163,163,163,163,163,
+491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
+491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
+491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
+491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
+491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
+492,492,492,492,492,492,163,163,493,493,493,493,493,493,163,163,
+
+/* block 40 */
+494,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+
+/* block 41 */
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+
+/* block 42 */
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,496,497,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+
+/* block 43 */
+498,499,499,499,499,499,499,499,499,499,499,499,499,499,499,499,
+499,499,499,499,499,499,499,499,499,499,499,500,501,163,163,163,
+502,502,502,502,502,502,502,502,502,502,502,502,502,502,502,502,
+502,502,502,502,502,502,502,502,502,502,502,502,502,502,502,502,
+502,502,502,502,502,502,502,502,502,502,502,502,502,502,502,502,
+502,502,502,502,502,502,502,502,502,502,502,502,502,502,502,502,
+502,502,502,502,502,502,502,502,502,502,502,503,503,503,504,504,
+504,502,502,502,502,502,502,502,502,163,163,163,163,163,163,163,
+
+/* block 44 */
+505,505,505,505,505,505,505,505,505,505,505,505,505,505,505,505,
+505,505,506,506,507,508,163,163,163,163,163,163,163,163,163,505,
+509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,
+509,509,510,510,511,512,512,163,163,163,163,163,163,163,163,163,
+513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,
+513,513,514,514,163,163,163,163,163,163,163,163,163,163,163,163,
+515,515,515,515,515,515,515,515,515,515,515,515,515,163,515,515,
+515,163,516,516,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 45 */
+517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,
+517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,
+517,517,517,518,518,517,517,517,517,517,517,517,517,517,517,517,
+517,517,517,517,519,519,520,521,521,521,521,521,521,521,520,520,
+520,520,520,520,520,520,521,520,520,522,522,522,522,522,522,522,
+522,522,523,522,524,524,524,525,526,526,524,527,517,522,163,163,
+528,528,528,528,528,528,528,528,528,528,163,163,163,163,163,163,
+529,529,529,529,529,529,529,529,529,529,163,163,163,163,163,163,
+
+/* block 46 */
+530,530,531,532,533,531,534,530,533,535,536,537,537,537,538,537,
+539,539,539,539,539,539,539,539,539,539,163,163,163,163,163,163,
+540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,
+540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,
+540,540,540,541,540,540,540,540,540,540,540,540,540,540,540,540,
+540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,
+540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,
+540,540,540,540,540,540,540,540,540,163,163,163,163,163,163,163,
+
+/* block 47 */
+540,540,540,540,540,542,542,540,540,540,540,540,540,540,540,540,
+540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,540,
+540,540,540,540,540,540,540,540,540,543,540,163,163,163,163,163,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,163,163,163,163,163,163,163,163,163,163,
+
+/* block 48 */
+544,544,544,544,544,544,544,544,544,544,544,544,544,544,544,544,
+544,544,544,544,544,544,544,544,544,544,544,544,544,544,544,163,
+545,545,545,546,546,546,546,545,545,546,546,546,163,163,163,163,
+546,546,545,546,546,546,546,546,546,547,547,547,163,163,163,163,
+548,163,163,163,549,549,550,550,550,550,550,550,550,550,550,550,
+551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
+551,551,551,551,551,551,551,551,551,551,551,551,551,551,163,163,
+551,551,551,551,551,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 49 */
+552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
+552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
+552,552,552,552,552,552,552,552,552,552,552,552,163,163,163,163,
+552,552,552,552,552,553,553,553,552,552,553,552,552,552,552,552,
+552,552,552,552,552,552,552,552,552,552,163,163,163,163,163,163,
+554,554,554,554,554,554,554,554,554,554,555,163,163,163,556,556,
+557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,
+557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,
+
+/* block 50 */
+558,558,558,558,558,558,558,558,558,558,558,558,558,558,558,558,
+558,558,558,558,558,558,558,559,559,560,560,559,163,163,561,561,
+562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,
+562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,
+562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,
+562,562,562,562,562,563,564,563,564,564,564,564,564,564,564,163,
+565,566,564,566,566,564,564,564,564,564,564,564,564,563,563,563,
+563,563,563,564,564,567,567,567,567,567,567,567,567,163,163,567,
+
+/* block 51 */
+568,568,568,568,568,568,568,568,568,568,163,163,163,163,163,163,
+568,568,568,568,568,568,568,568,568,568,163,163,163,163,163,163,
+569,569,569,569,569,569,569,570,571,571,571,571,569,569,163,163,
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,572,573,
+573,154,154,154,154,154,154,154,154,154,154,154,573,573,573,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 52 */
+574,574,574,574,575,576,576,576,576,576,576,576,576,576,576,576,
+576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,
+576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,
+576,576,576,576,577,578,574,574,574,574,574,575,574,575,575,575,
+575,575,574,575,579,576,576,576,576,576,576,576,576,163,163,163,
+580,580,580,580,580,580,580,580,580,580,581,581,582,583,581,581,
+582,584,584,584,584,584,584,584,584,584,584,577,577,577,577,577,
+577,577,577,577,584,584,584,584,584,584,584,584,584,581,581,163,
+
+/* block 53 */
+585,585,586,587,587,587,587,587,587,587,587,587,587,587,587,587,
+587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,
+587,586,585,585,585,585,586,586,585,585,588,589,585,585,587,587,
+590,590,590,590,590,590,590,590,590,590,587,587,587,587,587,587,
+591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,
+591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,
+591,591,591,591,591,591,592,593,594,594,593,593,593,594,593,594,
+594,594,595,595,163,163,163,163,163,163,163,163,596,596,596,596,
+
+/* block 54 */
+597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,
+597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,
+597,597,597,597,598,598,598,598,598,598,598,598,599,599,599,599,
+599,599,599,599,598,598,600,601,163,163,163,602,602,603,603,603,
+604,604,604,604,604,604,604,604,604,604,163,163,163,597,597,597,
+605,605,605,605,605,605,605,605,605,605,606,606,606,606,606,606,
+606,606,606,606,606,606,606,606,606,606,606,606,606,606,606,606,
+606,606,606,606,606,606,606,606,607,607,607,608,607,607,609,609,
+
+/* block 55 */
+610,611,612,613,614,615,616,617,618,163,163,163,163,163,163,163,
+619,619,619,619,619,619,619,619,619,619,619,619,619,619,619,619,
+619,619,619,619,619,619,619,619,619,619,619,619,619,619,619,619,
+619,619,619,619,619,619,619,619,619,619,619,163,163,619,619,619,
+620,620,620,620,620,620,620,620,163,163,163,163,163,163,163,163,
+621,622,621,623,622,624,624,625,624,625,626,622,625,625,622,622,
+625,627,622,622,622,622,622,622,622,628,629,630,630,624,630,630,
+630,630,631,632,633,629,629,634,635,635,636,163,163,163,163,163,
+
+/* block 56 */
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70,221,221,221,221,221,637,147,147,147,147,
+147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,
+147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,
+147,147,147,147,147,147,147,147,147,147,147,147,147,638,638,638,
+638,638,148,147,147,147,638,638,638,638,638, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70,639,640, 70, 70, 70,641, 70, 70,
+
+/* block 57 */
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,642, 70,
+ 70, 70, 70, 70, 70, 70,643, 70, 70, 70, 70,644,644,644,644,644,
+644,644,644,644,645,644,644,644,645,644,644,644,644,644,644,644,
+644,644,644,644,644,644,644,644,644,644,644,644,644,644,644,646,
+647,647,158,158,154,154,154,154,154,154,154,154,154,154,154,154,
+158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,
+158,158,158,158,158,158,158,573,573,573,573,573,573,573,573,573,
+573,573,573,573,573,154,154,154,648,154,649,154,154,154,154,154,
+
+/* block 58 */
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 67, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+650,651, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+
+/* block 59 */
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 69, 69, 69, 69,652,653, 70, 70,654, 70,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 67, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+
+/* block 60 */
+655,655,655,655,655,655,655,655,656,656,656,656,656,656,656,656,
+655,655,655,655,655,655,163,163,656,656,656,656,656,656,163,163,
+655,655,655,655,655,655,655,655,656,656,656,656,656,656,656,656,
+655,655,655,655,655,655,655,655,656,656,656,656,656,656,656,656,
+655,655,655,655,655,655,163,163,656,656,656,656,656,656,163,163,
+173,655,173,655,173,655,173,655,163,656,163,656,163,656,163,656,
+655,655,655,655,655,655,655,655,656,656,656,656,656,656,656,656,
+657,657,658,658,658,658,659,659,660,660,661,661,662,662,163,163,
+
+/* block 61 */
+663,663,663,663,663,663,663,663,664,664,664,664,664,664,664,664,
+663,663,663,663,663,663,663,663,664,664,664,664,664,664,664,664,
+663,663,663,663,663,663,663,663,664,664,664,664,664,664,664,664,
+655,655,665,666,665,163,173,665,656,656,667,667,668,162,669,162,
+162,162,665,666,665,163,173,665,670,670,670,670,668,162,162,162,
+655,655,173,173,163,163,173,173,656,656,671,671,163,162,162,162,
+655,655,173,173,173,215,173,173,656,656,672,672,220,162,162,162,
+163,163,665,666,665,163,173,665,673,673,674,674,668,162,162,163,
+
+/* block 62 */
+675,675,675,675,675,675,675,675,675,675,675, 51,676,677,678,679,
+680,680,680,680,680,680,681, 43,682,683,684,685,685,686,684,685,
+ 43, 43, 43, 43,687, 43, 43,687,688,689,690,691,692,693,694,695,
+696,696,697,697,697, 43, 43, 43, 43, 49, 57, 43,698,699, 43,700,
+701, 43, 43, 43,702,703,704,699,699,698, 43, 43, 43, 43, 43, 43,
+ 43, 43, 50,705,700, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,675,
+ 51,706,706,706,706,707,708,709,710,711,712,712,712,712,712,712,
+ 54,645,163,163, 54, 54, 54, 54, 54, 54,713,714,715,716,717,644,
+
+/* block 63 */
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,713,714,715,716,717,163,
+644,644,644,644,644,644,644,644,644,644,644,644,644,163,163,163,
+431,431,431,431,431,431,431,431,431,431,431,431,431,431,431,431,
+431,431,431,431,431,431,431,431,431,431,431,431,431,431,431,431,
+431,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,
+719,719,719,719,719,719,719,719,719,719,719,719,719,720,720,720,
+720,719,720,721,720,719,719,158,158,158,158,719,719,719,719,719,
+722,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 64 */
+723,723,724,723,723,723,723,724,723,723,725,724,724,724,725,725,
+724,724,724,725,723,724,723,723,726,724,724,724,724,724,723,723,
+723,723,727,723,724,723,728,723,724,729,730,731,724,724,732,725,
+724,724,733,724,725,734,734,734,734,735,723,723,725,725,724,724,
+715,715,715,715,715,724,725,725,736,736,723,715,723,723,737,460,
+ 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+738,738,738,738,738,738,738,738,738,738,738,738,738,738,738,738,
+739,739,739,739,739,739,739,739,739,739,739,739,739,739,739,739,
+
+/* block 65 */
+740,740,740, 65, 66,740,740,740,740, 58,723,723,163,163,163,163,
+ 50, 50, 50, 50,741,742,742,742,742,742, 50, 50,743,743,743,743,
+ 50,743,743, 50,743,743, 50,743, 45,742,742,743,743,743, 50, 45,
+743,743, 45, 45, 45, 45,743,743, 45, 45, 45, 45,743,743,743,743,
+743,743,743,743,743,743,743,743,743,743,743,743,743,743, 50, 50,
+743,743, 50,743, 50,743,743,743,743,743,743,743, 45,743, 45, 45,
+ 45, 45, 45, 45,743,743, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+
+/* block 66 */
+ 50, 50, 50, 50, 50, 50, 50, 50,744,744,744,744,744,744, 50, 50,
+ 50, 50,745, 53, 50,744, 50, 50, 50, 50, 50, 50, 50, 50, 50,744,
+744,744,744, 50,744, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,744,744, 50, 50,
+ 50, 50, 50,744, 50,744, 50, 50, 50, 50, 50, 50,744, 50, 50, 50,
+ 50, 50,744,744,744,744, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50,744,744,744,744,744,744,744,744, 50, 50,744,744,
+744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,
+
+/* block 67 */
+744,744,744,744,744,744,744,744,744,744,744,744, 50, 50, 50,744,
+744,744,744, 50, 50, 50, 50, 50,744, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50,744,744, 50, 50,744, 50,744,744, 50,744, 50, 50, 50, 50,
+744,744,744,744,744,744,744,744,744, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50,744,744,744,744,744, 50, 50,
+744,744, 50, 50, 50, 50,744,744,744,744,744,744,744,744,744,744,
+744,744,744,744,744,744,744,744,744,744,744,744,744,744, 50, 50,
+744,744,744,744,744, 50,744,744, 50, 50,744,744,744,744,744, 50,
+
+/* block 68 */
+ 45, 45, 45, 45, 45, 45, 45, 45,746,747,746,747, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,748,748, 45, 45, 45, 45,
+ 50, 50, 45, 45, 45, 45, 45, 45, 47,749,750, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45,751,751,751,751,751,751,751,751,751,751,
+751,751,751,751,751,751,751,751,751,751,751,751,751,751,751,751,
+751,751,751,751,751,751,751,751,751,751,751,751,751,751,751,751,
+751,751,751,751,751,751,751,751,751,751,751,751,751,751,751,751,
+751,751,751,751,751,751,751,751,751,751,751, 45, 50, 45, 45, 45,
+
+/* block 69 */
+ 45, 45, 45, 45, 45, 45, 45, 45,752, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45,751, 45, 45, 45, 45, 45, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50,743,743, 45,743, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 47,
+743, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 50, 50, 50, 50,
+ 50, 50,743, 45, 45, 45, 45, 45, 45,748,748,748,748, 47, 47, 47,
+748, 47, 47,748, 45, 45, 45, 45, 47, 47, 47, 45, 45, 45, 45, 45,
+
+/* block 70 */
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45,753,753,753,753,753,753,753,753,753,
+753,753,753,753,753,753,753,753,753,753,753,753,753,753,753,753,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,753,753,753,753,753,
+753,753,753,753,753,753,753,753,753,753,753,753,753,753,753,753,
+ 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+
+/* block 71 */
+ 58, 58, 58, 58, 58, 58, 58, 58, 54, 54, 54, 54, 54, 54, 54, 54,
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,754,754,754,754,754,754,754,754,754,754,
+754,754,755,754,754,754,754,754,754,754,754,754,754,754,754,754,
+756,756,756,756,756,756,756,756,756,756,756,756,756,756,756,756,
+756,756,756,756,756,756,756,756,756,756, 58, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+
+/* block 72 */
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+
+/* block 73 */
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+743,743, 45, 45, 45, 45, 45, 45, 45, 45, 47, 47, 45, 45,743,743,
+743,743,743,743,743,743,742, 50, 45, 45, 45, 45,743,743,743,743,
+742, 50, 45, 45, 45, 45,743,743, 45, 45,743,743, 45, 45, 45,743,
+743,743,743,743, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45,743, 45,743, 45, 45,743,743,743,743,743,743, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 50, 50, 50,741,741,757,757, 50,
+
+/* block 74 */
+ 47, 47, 47, 47, 47,758,743,752,752,752,752,752,752,752, 47,752,
+752, 47,752, 45,748,748,752,752, 47,752,752,752,752,759,752,752,
+ 47,752, 47, 47,752,752, 47,752,752,752, 47,752,752,752, 47, 47,
+752,752,752,752,752,752,752,752, 47, 47, 47,752,752,752,752,752,
+742,752,742,752,752,752,752,752,748,748,748,748,748,748,748,748,
+748,748,748,748,752,752,752,752,752,752,752,752,752,752,752, 47,
+742,758,758,742,752, 47, 47,752, 47,752,752,752,752,758,758,760,
+752,752,752,752,752,752,752,752,752,752,752, 47,752,752, 47,748,
+
+/* block 75 */
+752,752,752,752,752,752, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+752,752, 47,748, 47, 47, 47, 47,752, 47,752, 47, 47,752,752,752,
+ 47,748,752,752,752,752,752, 47,752,752,748,748,761,752,752,752,
+ 47, 47,752,752,752,752,752,752,752,752,752,752,752,748,748,752,
+752,752,752,752,748,748,752,752, 47,752,752,752,752,752,748, 47,
+752, 47,752, 47,748,752,752,752,752,752,752,752,752,752,752,752,
+752,752,752,752,752,752,752,752,752, 47,748,752,752,752,752,752,
+ 47, 47,748,748, 47,748,752, 47, 47,759,748,752,752,748,752,752,
+
+/* block 76 */
+752,752, 47,752,752,748, 45, 45, 47, 47,762,762,759,759,752, 47,
+752,752, 47, 45, 47, 45, 47, 45, 45, 45, 45, 45, 45, 47, 45, 45,
+ 45, 47, 45, 45, 45, 45, 45, 45,748, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 47, 47, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 47, 45, 45, 47, 45, 45, 45, 45,748, 45,748, 45,
+ 45, 45, 45,748,748,748, 45,748, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 47, 47,752,752,752,703,704,703,704,703,704,703,704,
+703,704,703,704,703,704, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+
+/* block 77 */
+ 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 45,748,748,748, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 47, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+748, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,748,
+ 50, 50, 50,744,744,746,747, 50,744,744, 50,744, 50,744, 50, 50,
+ 50, 50, 50, 50, 50,744,744, 50, 50, 50, 50, 50,744,744,744, 50,
+ 50, 50,744,744,744,744,746,747,746,747,746,747,746,747,746,747,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+
+/* block 78 */
+763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,
+763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,
+763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,
+763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,
+763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,
+763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,
+763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,
+763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,
+
+/* block 79 */
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50,741,741, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+
+/* block 80 */
+ 50, 50, 50,746,747,746,747,746,747,746,747,746,747,746,747,746,
+747,746,747,746,747,746,747,746,747, 50, 50,744, 50, 50, 50, 50,
+744, 50, 50,744,744,744, 50, 50,744,744,744,744,744,744,744,744,
+ 50, 50, 50, 50, 50, 50, 50, 50,744, 50, 50, 50, 50, 50, 50, 50,
+744,744, 50, 50,744,744, 50, 50, 50, 50, 50, 50, 50, 50, 50,744,
+744,744,744, 50,744,744, 50, 50,746,747,746,747, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50,744,744, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50,744, 50, 50,744,744, 50, 50,746,747, 50, 50,
+
+/* block 81 */
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,744,744,744,744, 50,
+ 50, 50, 50, 50,744,744, 50, 50, 50, 50, 50, 50,744,744, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50,744,744, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50,744,744,744,744,744,744,744,
+
+/* block 82 */
+744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,
+744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,
+744,744,744, 50, 50, 50,744,744,744,744,744,744,744,744, 50,744,
+744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,
+744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,744,
+744,744,744,744,744,744,744, 50, 50, 50, 50, 50, 50, 50,744, 50,
+ 50, 50, 50,744,744,744, 50, 50, 50, 50, 50, 50,744,744,744, 50,
+ 50, 50, 50, 50, 50, 50, 50,744,744,744,744, 50, 50, 50, 50, 50,
+
+/* block 83 */
+ 45, 45, 45, 45, 45, 47, 47, 47, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,748,748, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 45, 45, 50, 50, 50, 50, 50, 50, 45, 45, 45,
+748, 45, 45, 45, 45,748, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45,753,753, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+
+/* block 84 */
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45,753, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,764, 45,
+
+/* block 85 */
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,
+766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,
+766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,
+ 65, 66,767,768,769,770,771, 65, 66, 65, 66, 65, 66,772,773,774,
+775, 70, 65, 66, 70, 65, 66, 70, 70, 70, 70, 70,645,644,776,776,
+
+/* block 86 */
+211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
+211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
+211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
+211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
+211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
+211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
+211,212,211,212,777,778,778,778,778,778,778,211,212,211,212,779,
+779,779,211,212,163,163,163,163,163,780,780,780,780,781,780,780,
+
+/* block 87 */
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,163,782,163,163,163,163,163,782,163,163,
+783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
+783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
+783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
+783,783,783,783,783,783,783,783,163,163,163,163,163,163,163,784,
+785,163,163,163,163,163,163,163,163,163,163,163,163,163,163,786,
+
+/* block 88 */
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+483,483,483,483,483,483,483,163,163,163,163,163,163,163,163,163,
+483,483,483,483,483,483,483,163,483,483,483,483,483,483,483,163,
+483,483,483,483,483,483,483,163,483,483,483,483,483,483,483,163,
+483,483,483,483,483,483,483,163,483,483,483,483,483,483,483,163,
+483,483,483,483,483,483,483,163,483,483,483,483,483,483,483,163,
+787,787,787,787,787,787,787,787,787,787,787,787,787,787,787,787,
+787,787,787,787,787,787,787,787,787,787,787,787,787,787,787,787,
+
+/* block 89 */
+ 43, 43,788,789,788,789, 43, 43, 43,788,789, 43,788,789, 43, 43,
+ 43, 43, 43, 43, 43, 43, 43,680, 43, 43,680, 43,788,789, 43, 43,
+788,789,703,704,703,704,703,704,703,704, 43, 43, 43, 43,699,790,
+ 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,680,680,699, 43, 43, 43,
+680,791,684,792, 43, 43, 43, 43, 43, 43, 43, 43,791, 43,791,791,
+ 45, 45, 43,699,699,703,704,703,704,703,704,703,704,680,753,753,
+753,753,753,753,753,753,753,753,753,753,753,753,753,753,753,753,
+753,753,753,753,753,753,753,753,753,753,753,753,753,753,753,753,
+
+/* block 90 */
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,163,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 91 */
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+
+/* block 92 */
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,
+793,793,793,793,793,793,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+794,794,795,795,794,794,794,794,794,794,794,794,163,163,163,163,
+
+/* block 93 */
+675,796,797,798,723,799,800,801,802,803,802,803,804,805,804,805,
+802,803, 45,806,802,803,802,803,802,803,802,803,807,808,809,809,
+ 45,801,801,801,801,801,801,801,801,801,810,810,810,810,811,811,
+812,813,813,813,813,813,723,814,801,801,801,815,816,817,818,818,
+163,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+
+/* block 94 */
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,163,163,820,820,821,821,822,822,819,
+823,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,825,826,827,827,824,
+
+/* block 95 */
+163,163,163,163,163,828,828,828,828,828,828,828,828,828,828,828,
+828,828,828,828,828,828,828,828,828,828,828,828,828,828,828,828,
+828,828,828,828,828,828,828,828,828,828,828,828,828,828,828,828,
+163,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
+829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
+829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
+829,829,829,829,830,829,829,829,829,829,829,829,829,829,829,829,
+829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
+
+/* block 96 */
+829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,163,
+831,831,832,832,832,832,831,831,831,831,831,831,831,831,831,831,
+828,828,828,828,828,828,828,828,828,828,828,828,828,828,828,828,
+828,828,828,828,828,828,828,828,828,828,828,828,828,828,828,828,
+818,818,818,818,818,818,818,818,818,818,818,818,818,818,818,818,
+818,818,818,818,818,818,818,818,818,818,818,818,818,818,818,818,
+818,818,818,818,163,163,163,163,163,163,163,163,163,163,163,163,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+
+/* block 97 */
+833,833,833,833,833,833,833,833,833,833,833,833,833,833,833,833,
+833,833,833,833,833,833,833,833,833,833,833,833,833,834,834,163,
+832,832,832,832,832,832,832,832,832,832,831,831,831,831,831,831,
+831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,
+831,831,831,831,831,831,831,831,835,835,835,835,835,835,835,835,
+723, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+833,833,833,833,833,833,833,833,833,833,833,833,833,833,833,833,
+833,833,833,833,833,833,833,833,833,833,833,833,834,834,834,460,
+
+/* block 98 */
+832,832,832,832,832,832,832,832,832,832,831,831,831,831,831,831,
+831,831,831,831,831,831,831,836,831,836,831,831,831,831,831,831,
+831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,
+831, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+831,831,831,831,831,831,831,831,831,831,831,831,723,723,723,723,
+837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,
+837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,
+837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,831,
+
+/* block 99 */
+837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,
+837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,
+837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,
+837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,
+837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,
+837,837,837,837,837,837,837,837,831,831,831,831,831,831,831,831,
+831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,
+831,460,460,460,460,460,460,723,723,723,723,831,831,831,831,831,
+
+/* block 100 */
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,723,723,
+831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,
+831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,723,
+
+/* block 101 */
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+
+/* block 102 */
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+
+/* block 103 */
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,840,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+
+/* block 104 */
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+
+/* block 105 */
+839,839,839,839,839,839,839,839,839,839,839,839,839,163,163,163,
+841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,
+841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,
+841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,
+841,841,841,841,841,841,841,163,163,163,163,163,163,163,163,163,
+842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,
+842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,
+842,842,842,842,842,842,842,842,843,843,843,843,843,843,844,845,
+
+/* block 106 */
+846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,
+846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,
+846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,
+846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,
+846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,
+846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,
+846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,
+846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,
+
+/* block 107 */
+846,846,846,846,846,846,846,846,846,846,846,846,847,848,849,849,
+846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,846,
+850,850,850,850,850,850,850,850,850,850,846,846,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+240,241,240,241,240,241,240,241,240,241,851,852,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,853,246,
+248,248,248,854,787,787,787,787,787,787,787,787,855,855,854,856,
+
+/* block 108 */
+240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+240,241,240,241,240,241,240,241,240,241,240,241,857,857,787,787,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,859,859,859,859,859,859,859,859,859,859,
+860,860,861,862,863,863,863,862,163,163,163,163,163,163,163,163,
+
+/* block 109 */
+864,864,864,864,864,864,864,864, 46, 46, 46, 46, 46, 46, 46, 46,
+ 46, 46, 46, 46, 46, 46, 46,149,149,149,149,149,149,149,149,149,
+ 46, 46, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 70, 70, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+644, 70, 70, 70, 70, 70, 70, 70, 70, 65, 66, 65, 66,865, 65, 66,
+
+/* block 110 */
+ 65, 66, 65, 66, 65, 66, 65, 66,149,866,866, 65, 66,867, 70, 92,
+ 65, 66, 65, 66,868, 70, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,869,870,871,872,869, 70,
+873,874,875,876, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66,877,878,879, 65, 66, 65, 66,163,163,163,163,163,
+ 65, 66,163, 70,163, 70, 65, 66, 65, 66,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,880,880,880, 65, 66, 92,147,147, 70, 92, 92, 92, 92, 92,
+
+/* block 111 */
+881,881,882,881,881,881,883,881,881,881,881,882,881,881,881,881,
+881,881,881,881,881,881,881,881,881,881,881,881,881,881,881,881,
+881,881,881,884,884,882,882,884,885,885,885,885,883,163,163,163,
+886,886,886,887,887,887,888,888,889,890,163,163,163,163,163,163,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,892,892,893,893,163,163,163,163,163,163,163,163,
+
+/* block 112 */
+894,894,895,895,895,895,895,895,895,895,895,895,895,895,895,895,
+895,895,895,895,895,895,895,895,895,895,895,895,895,895,895,895,
+895,895,895,895,895,895,895,895,895,895,895,895,895,895,895,895,
+895,895,895,895,894,894,894,894,894,894,894,894,894,894,894,894,
+894,894,894,894,896,897,163,163,163,163,163,163,163,163,898,898,
+899,899,899,899,899,899,899,899,899,899,163,163,163,163,163,163,
+336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,
+336,900,335,901,335,335,335,335,343,343,343,335,343,335,335,333,
+
+/* block 113 */
+902,902,902,902,902,902,902,902,902,902,903,903,903,903,903,903,
+903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,
+903,903,903,903,903,903,904,904,904,904,904,905,905,905,906,907,
+908,908,908,908,908,908,908,908,908,908,908,908,908,908,908,908,
+908,908,908,908,908,908,908,909,909,909,909,909,909,909,909,909,
+909,909,910,911,163,163,163,163,163,163,163,163,163,163,163,912,
+478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
+478,478,478,478,478,478,478,478,478,478,478,478,478,163,163,163,
+
+/* block 114 */
+913,913,913,914,915,915,915,915,915,915,915,915,915,915,915,915,
+915,915,915,915,915,915,915,915,915,915,915,915,915,915,915,915,
+915,915,915,915,915,915,915,915,915,915,915,915,915,915,915,915,
+915,915,915,916,914,914,913,913,913,913,914,914,913,913,914,914,
+917,918,918,918,918,918,918,919,920,920,918,918,918,918,163,921,
+922,922,922,922,922,922,922,922,922,922,163,163,163,163,918,918,
+461,461,461,461,461,471,923,461,461,461,461,461,461,461,461,461,
+472,472,472,472,472,472,472,472,472,472,461,461,461,461,461,163,
+
+/* block 115 */
+924,924,924,924,924,924,924,924,924,924,924,924,924,924,924,924,
+924,924,924,924,924,924,924,924,924,924,924,924,924,924,924,924,
+924,924,924,924,924,924,924,924,924,925,925,925,925,925,925,926,
+926,925,925,926,926,925,925,163,163,163,163,163,163,163,163,163,
+924,924,924,925,924,924,924,924,924,924,924,924,925,926,163,163,
+927,927,927,927,927,927,927,927,927,927,163,163,928,929,929,929,
+461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
+923,461,461,461,461,461,461,473,473,473,461,470,471,470,461,461,
+
+/* block 116 */
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+931,930,931,931,931,932,932,931,931,932,930,932,932,930,931,933,
+934,933,934,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,930,930,935,936,937,
+938,938,938,938,938,938,938,938,938,938,938,939,940,940,939,939,
+941,941,938,942,942,939,943,163,163,163,163,163,163,163,163,163,
+
+/* block 117 */
+163,483,483,483,483,483,483,163,163,483,483,483,483,483,483,163,
+163,483,483,483,483,483,483,163,163,163,163,163,163,163,163,163,
+483,483,483,483,483,483,483,163,483,483,483,483,483,483,483,163,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+ 70, 70, 70,944, 70, 70, 70, 70, 70, 70, 70,866,147,147,147,147,
+ 70, 70, 70, 70, 70,221, 70, 70, 70,945, 46, 46,163,163,163,163,
+946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,
+
+/* block 118 */
+946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,
+946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,
+946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,
+946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,
+938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,
+938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,
+938,938,938,939,939,940,939,939,940,939,939,941,947,943,163,163,
+948,948,948,948,948,948,948,948,948,948,163,163,163,163,163,163,
+
+/* block 119 */
+949,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,949,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,949,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,949,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+949,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+
+/* block 120 */
+950,950,950,950,950,950,950,950,950,950,950,950,949,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,949,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,949,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+949,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,949,950,950,950,
+
+/* block 121 */
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,949,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,949,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+949,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,949,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+
+/* block 122 */
+950,950,950,950,950,950,950,950,949,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,949,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+949,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,949,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,949,950,950,950,950,950,950,950,
+
+/* block 123 */
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,949,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+949,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,949,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,949,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+
+/* block 124 */
+950,950,950,950,949,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+949,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,949,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,949,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,949,950,950,950,950,950,950,950,950,950,950,950,
+
+/* block 125 */
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+949,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,949,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,949,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,949,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+
+/* block 126 */
+950,950,950,950,950,950,950,950,949,950,950,950,950,950,950,950,
+950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+950,950,950,950,163,163,163,163,163,163,163,163,163,163,163,163,
+481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
+481,481,481,481,481,481,481,163,163,163,163,482,482,482,482,482,
+482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
+482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
+482,482,482,482,482,482,482,482,482,482,482,482,163,163,163,163,
+
+/* block 127 */
+951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
+951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
+951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
+951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
+951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
+951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
+951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
+951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
+
+/* block 128 */
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+
+/* block 129 */
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+
+/* block 130 */
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,838,838,
+953,838,953,838,838,953,953,953,953,953,953,953,953,953,953,838,
+953,838,953,838,838,953,953,838,838,838,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,163,163,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+
+/* block 131 */
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 132 */
+652,652,652,652,652,652,652,163,163,163,163,163,163,163,163,163,
+163,163,163,257,257,257,257,257,163,163,163,163,163,270,265,270,
+270,270,270,270,270,270,270,270,270,954,270,270,270,270,270,270,
+270,270,270,270,270,270,270,262,270,270,270,270,270,262,270,262,
+270,270,262,270,270,262,270,270,270,270,270,270,270,270,270,270,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+
+/* block 133 */
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,331,331,331,331,331,331,331,331,331,331,331,331,331,331,
+331,331,331,302,302,302,302,302,302,302,302,302,302,302,302,302,
+302,302,302,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+
+/* block 134 */
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,955,955,
+955,955,955,955,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+
+/* block 135 */
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+
+/* block 136 */
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,956,957,
+280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+
+/* block 137 */
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+302,302,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,302,302,302,302,302,302,302,280,
+958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,
+958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,
+286,286,959,286,286,286,286,286,286,286,955,955,277,960,280,280,
+
+/* block 138 */
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,962,
+963,963,963,964,963,963,963,965,966,963,163,163,163,163,163,163,
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,855,855,
+963,967,967,700,700,965,966,965,966,965,966,965,966,965,966,965,
+966,968,969,968,969,798,798,965,966,963,963,963,963,700,700,700,
+970,166,971,163,166,972,973,973,967,974,975,974,975,974,975,976,
+963,977,713,978,979,979,715,163,977,431,976,963,163,163,163,163,
+955,286,955,286,955,302,955,286,955,286,955,286,955,286,955,286,
+
+/* block 139 */
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,302,302, 51,
+
+/* block 140 */
+163,973,980,976,431,976,963,981,974,975,963,713,970,982,971,983,
+984,984,984,984,984,984,984,984,984,984,972,166,979,715,979,973,
+963,985,985,985,985,985,985, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+ 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,974,977,975,986,700,
+ 46,987,987,987,987,987,987, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+ 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,974,715,975,715,974,
+975,988,989,990,991,825,824,824,824,824,824,824,824,824,824,824,
+826,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+
+/* block 141 */
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,992,992,
+830,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
+829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,163,
+163,163,829,829,829,829,829,829,163,163,829,829,829,829,829,829,
+163,163,829,829,829,829,829,829,163,163,829,829,829,163,163,163,
+431,431,715, 46,723,431,431,163,723,715,715,715,715,723,723,163,
+707,707,707,707,707,707,707,707,707,993,993,993,723,723,958,958,
+
+/* block 142 */
+994,994,994,994,994,994,994,994,994,994,994,994,163,994,994,994,
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,
+994,994,994,994,994,994,994,163,994,994,994,994,994,994,994,994,
+994,994,994,994,994,994,994,994,994,994,994,163,994,994,163,994,
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,163,163,
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 143 */
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,
+994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,
+994,994,994,994,994,994,994,994,994,994,994,163,163,163,163,163,
+
+/* block 144 */
+995,996,997,163,163,163,163,998,998,998,998,998,998,998,998,998,
+998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,
+998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,
+998,998,998,998,163,163,163,999,999,999,999,999,999,999,999,999,
+1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,
+1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,
+1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,
+1000,1000,1000,1000,1000,1001,1001,1001,1001,1002,1002,1002,1002,1002,1002,1002,
+
+/* block 145 */
+1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1001,1001,1002,1003,1003,163,
+723,723,723,723,723,723,723,723,723,723,723,723,723,163,163,163,
+1002,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,158,163,163,
+
+/* block 146 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 147 */
+1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,
+1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,163,163,163,
+1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,
+1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,
+1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,
+1005,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1006,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,163,163,163,163,
+
+/* block 148 */
+1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,
+1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,
+1009,1009,1009,1009,163,163,163,163,163,163,163,163,163,1008,1008,1008,
+1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,
+1010,1011,1010,1010,1010,1010,1010,1010,1010,1010,1011,163,163,163,163,163,
+1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,
+1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,
+1012,1012,1012,1012,1012,1012,1013,1013,1013,1013,1013,163,163,163,163,163,
+
+/* block 149 */
+1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,
+1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,163,1015,
+1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,
+1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,
+1016,1016,1016,1016,163,163,163,163,1016,1016,1016,1016,1016,1016,1016,1016,
+1017,1018,1018,1018,1018,1018,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 150 */
+1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,
+1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,
+1019,1019,1019,1019,1019,1019,1019,1019,1020,1020,1020,1020,1020,1020,1020,1020,
+1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,
+1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,
+1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,
+1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,
+1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,
+
+/* block 151 */
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,163,163,
+1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,163,163,163,163,163,163,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,163,163,163,163,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,163,163,163,163,
+
+/* block 152 */
+1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,
+1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,
+1026,1026,1026,1026,1026,1026,1026,1026,163,163,163,163,163,163,163,163,
+1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,
+1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,
+1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,
+1027,1027,1027,1027,163,163,163,163,163,163,163,163,163,163,163,1028,
+1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,163,1029,1029,1029,1029,
+
+/* block 153 */
+1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,163,1029,1029,1029,1029,
+1029,1029,1029,163,1029,1029,163,1030,1030,1030,1030,1030,1030,1030,1030,1030,
+1030,1030,163,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
+1030,1030,163,1030,1030,1030,1030,1030,1030,1030,163,1030,1030,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 154 */
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+
+/* block 155 */
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,1031,163,163,163,163,163,163,163,163,163,
+1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,
+1031,1031,1031,1031,1031,1031,163,163,163,163,163,163,163,163,163,163,
+1031,1031,1031,1031,1031,1031,1031,1031,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 156 */
+147,1032,1032,147,147,147,163,147,147,147,147,147,147,147,147,147,
+147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,
+147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,
+147,163,147,147,147,147,147,147,147,147,147,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 157 */
+1033,1033,1033,1033,1033,1033,262,262,1033,262,1033,1033,1033,1033,1033,1033,
+1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,
+1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,
+1033,1033,1033,1033,1033,1033,262,1033,1033,262,262,262,1033,262,262,1033,
+1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,
+1034,1034,1034,1034,1034,1034,262,1035,1036,1036,1036,1036,1036,1036,1036,1036,
+1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,
+1037,1037,1037,1037,1037,1037,1037,1038,1038,1039,1039,1039,1039,1039,1039,1039,
+
+/* block 158 */
+1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,
+1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,262,
+262,262,262,262,262,262,262,1041,1041,1041,1041,1041,1041,1041,1041,1041,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,
+1042,1042,1042,262,1042,1042,262,262,262,262,262,1043,1043,1043,1043,1043,
+
+/* block 159 */
+1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,
+1044,1044,1044,1044,1044,1044,1045,1045,1045,1045,1045,1045,262,262,262,1046,
+1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,
+1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,262,262,262,262,262,1048,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 160 */
+1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,
+1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,
+1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,
+1050,1050,1050,1050,1050,1050,1050,1050,262,262,262,262,1051,1051,1050,1050,
+1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,
+262,262,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,
+1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,
+1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,
+
+/* block 161 */
+1052,1053,1053,1053,262,1053,1053,262,262,262,262,262,1053,1053,1053,1053,
+1052,1052,1052,1052,262,1052,1052,1052,262,1052,1052,1052,1052,1052,1052,1052,
+1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,
+1052,1052,1052,1052,1052,1052,262,262,1054,1054,1054,262,262,262,262,1055,
+1056,1056,1056,1056,1056,1056,1056,1056,1056,262,262,262,262,262,262,262,
+1057,1057,1057,1057,1057,1057,1058,1058,1057,262,262,262,262,262,262,262,
+1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,
+1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1060,1060,1061,
+
+/* block 162 */
+1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,
+1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1063,1063,1063,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1064,1064,1064,1064,1064,1064,1064,1064,1065,1064,1064,1064,1064,1064,1064,1064,
+1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,
+1064,1064,1064,1064,1064,1066,1066,262,262,262,262,1067,1067,1067,1067,1067,
+1068,1068,1069,1068,1068,1068,1070,262,262,262,262,262,262,262,262,262,
+
+/* block 163 */
+1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,
+1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,
+1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,
+1071,1071,1071,1071,1071,1071,262,262,262,1072,1073,1073,1073,1073,1073,1073,
+1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,
+1074,1074,1074,1074,1074,1074,262,262,1075,1075,1075,1075,1075,1075,1075,1075,
+1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,
+1076,1076,1076,262,262,262,262,262,1077,1077,1077,1077,1077,1077,1077,1077,
+
+/* block 164 */
+1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,
+1078,1078,262,262,262,262,262,262,262,1079,1079,1079,1079,262,262,262,
+262,262,262,262,262,262,262,262,262,1080,1080,1080,1080,1080,1080,1080,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 165 */
+1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,
+1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,
+1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,
+1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,
+1081,1081,1081,1081,1081,1081,1081,1081,1081,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 166 */
+1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,
+1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,
+1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,
+1082,1082,1082,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,
+1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,
+1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,
+1083,1083,1083,262,262,262,262,262,262,262,1084,1084,1084,1084,1084,1084,
+
+/* block 167 */
+1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,
+1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,
+1085,1085,1086,1086,1087,1087,1087,1087,302,302,302,302,302,302,302,302,
+1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,302,302,302,302,302,302,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 168 */
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 169 */
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,
+1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,262,
+
+/* block 170 */
+1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,
+1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,
+1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,262,1091,1091,1092,262,262,
+1090,1090,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 171 */
+1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,
+1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1094,1094,1094,
+1094,1094,1094,1094,1094,1094,1094,1093,262,262,262,262,262,262,262,262,
+1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,
+1095,1095,1095,1095,1095,1095,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,
+1096,1097,1097,1097,1097,1098,1098,1098,1098,1098,302,302,302,302,302,302,
+302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
+1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,
+
+/* block 172 */
+1099,1099,1100,1100,1100,1100,1101,1101,1101,1101,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,
+1102,1102,1102,1102,1102,1103,1103,1103,1103,1103,1103,1103,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,
+1104,1104,1104,1104,1104,1104,1104,262,262,262,262,262,262,262,262,262,
+
+/* block 173 */
+1105,1106,1105,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1106,1106,1106,1106,1106,1106,1106,1106,
+1106,1106,1106,1106,1106,1106,1108,1109,1109,1110,1110,1110,1110,1110,163,163,
+163,163,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,
+1111,1111,1111,1111,1111,1111,1112,1112,1112,1112,1112,1112,1112,1112,1112,1112,
+1108,1107,1107,1106,1106,1107,163,163,163,163,163,163,163,163,163,1113,
+
+/* block 174 */
+1114,1114,1115,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,
+1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,
+1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,
+1115,1115,1115,1117,1117,1117,1117,1115,1115,1118,1119,1120,1120,1121,1122,1122,
+1122,1122,1117,163,163,163,163,163,163,163,163,163,163,1121,163,163,
+1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,
+1123,1123,1123,1123,1123,1123,1123,1123,1123,163,163,163,163,163,163,163,
+1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,163,163,163,163,163,163,
+
+/* block 175 */
+1125,1125,1125,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,
+1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,
+1126,1126,1126,1126,1126,1126,1126,1125,1125,1125,1125,1125,1127,1125,1125,1125,
+1125,1125,1125,1128,1128,163,1129,1129,1129,1129,1129,1129,1129,1129,1129,1129,
+1130,1131,1131,1131,1126,1127,1127,1126,163,163,163,163,163,163,163,163,
+1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,
+1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,
+1132,1132,1132,1133,1134,1134,1132,163,163,163,163,163,163,163,163,163,
+
+/* block 176 */
+1135,1135,1136,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,
+1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,
+1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,1137,
+1137,1137,1137,1136,1136,1136,1135,1135,1135,1135,1135,1135,1135,1135,1135,1136,
+1138,1137,1139,1139,1137,1140,1140,1141,1141,1142,1143,1143,1143,1140,1136,1135,
+1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1137,1141,1137,1141,1140,1140,
+163,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,
+1145,1145,1145,1145,1145,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 177 */
+1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,
+1146,1146,163,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,
+1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1147,1147,1147,1148,
+1148,1148,1147,1147,1148,1149,1150,1148,1151,1151,1152,1151,1151,1153,1148,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 178 */
+1154,1154,1154,1154,1154,1154,1154,163,1154,163,1154,1154,1154,1154,163,1154,
+1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,163,1154,
+1154,1154,1154,1154,1154,1154,1154,1154,1154,1155,163,163,163,163,163,163,
+1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,
+1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,
+1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1156,1157,
+1158,1158,1158,1157,1157,1157,1157,1157,1157,1159,1160,163,163,163,163,163,
+1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,163,163,163,163,163,163,
+
+/* block 179 */
+1162,1163,1164,1165,163,1166,1166,1166,1166,1166,1166,1166,1166,163,163,1166,
+1166,163,163,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,1166,
+1166,1166,1166,1166,1166,1166,1166,1166,1166,163,1166,1166,1166,1166,1166,1166,
+1166,163,1166,1166,163,1166,1166,1166,1166,1166,163,1167,1168,1166,1169,1164,
+1162,1164,1164,1164,1164,163,163,1164,1164,163,163,1164,1164,1170,163,163,
+1166,163,163,163,163,163,163,1169,163,163,163,163,163,1171,1166,1166,
+1166,1166,1164,1164,163,163,1172,1172,1172,1172,1172,1172,1172,163,163,163,
+1172,1172,1172,1172,1172,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 180 */
+1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,
+1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,
+1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,1173,
+1173,1173,1173,1173,1173,1174,1174,1174,1175,1175,1175,1175,1175,1175,1175,1175,
+1174,1174,1176,1175,1175,1174,1177,1173,1173,1173,1173,1178,1178,1179,1180,1180,
+1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1179,1179,163,1180,1182,1173,
+1173,1173,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 181 */
+1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,
+1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,
+1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,
+1184,1185,1185,1186,1186,1186,1186,1186,1186,1185,1186,1185,1185,1184,1185,1186,
+1186,1185,1187,1188,1183,1183,1189,1183,163,163,163,163,163,163,163,163,
+1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 182 */
+1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,
+1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,
+1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1192,
+1193,1193,1194,1194,1194,1194,163,163,1193,1193,1193,1193,1194,1194,1193,1195,
+1196,1197,1198,1198,1199,1199,1200,1200,1200,1198,1198,1198,1198,1198,1198,1198,
+1198,1198,1198,1198,1198,1198,1198,1198,1191,1191,1191,1191,1194,1194,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 183 */
+1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,
+1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,
+1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,1201,
+1202,1202,1202,1203,1203,1203,1203,1203,1203,1203,1203,1202,1202,1203,1202,1204,
+1203,1205,1205,1206,1201,163,163,163,163,163,163,163,163,163,163,163,
+1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,163,163,163,163,163,163,
+530,530,530,530,530,530,530,530,530,530,530,530,530,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 184 */
+1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,
+1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,
+1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1208,1209,1210,1209,1210,1210,
+1209,1209,1209,1209,1209,1209,1211,1212,1208,1213,163,163,163,163,163,163,
+1214,1214,1214,1214,1214,1214,1214,1214,1214,1214,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 185 */
+1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,
+1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,163,163,1216,1216,1216,
+1217,1217,1216,1216,1216,1216,1218,1216,1216,1216,1216,1219,163,163,163,163,
+1220,1220,1220,1220,1220,1220,1220,1220,1220,1220,1221,1221,1222,1222,1222,1223,
+1215,1215,1215,1215,1215,1215,1215,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 186 */
+1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,
+1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,
+1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1224,1225,1225,1225,1226,
+1226,1226,1226,1226,1226,1226,1226,1226,1225,1227,1228,1229,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 187 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
+1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
+1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,
+1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,
+1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1233,1233,1233,1233,1233,1233,
+1233,1233,1233,163,163,163,163,163,163,163,163,163,163,163,163,1234,
+
+/* block 188 */
+1235,1235,1235,1235,1235,1235,1235,163,163,1235,163,163,1235,1235,1235,1235,
+1235,1235,1235,1235,163,1235,1235,163,1235,1235,1235,1235,1235,1235,1235,1235,
+1235,1235,1235,1235,1235,1235,1235,1235,1235,1235,1235,1235,1235,1235,1235,1235,
+1236,1237,1237,1237,1237,1237,163,1237,1237,163,163,1238,1238,1239,1240,1241,
+1237,1241,1237,1242,1243,1244,1243,163,163,163,163,163,163,163,163,163,
+1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 189 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1246,1246,1246,1246,1246,1246,1246,1246,163,163,1246,1246,1246,1246,1246,1246,
+1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,
+1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,1246,
+1246,1247,1247,1247,1248,1248,1248,1248,163,163,1248,1248,1247,1247,1247,1247,
+1249,1246,1250,1246,1247,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 190 */
+1251,1252,1252,1252,1252,1252,1252,1253,1253,1252,1252,1251,1251,1251,1251,1251,
+1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,
+1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,1251,
+1251,1251,1251,1254,1255,1252,1252,1252,1252,1256,1257,1252,1252,1252,1252,1258,
+1258,1258,1259,1259,1258,1258,1258,1255,163,163,163,163,163,163,163,163,
+1260,1261,1261,1261,1261,1261,1261,1262,1262,1261,1261,1261,1260,1260,1260,1260,
+1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,
+1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,
+
+/* block 191 */
+1260,1260,1260,1260,1263,1263,1263,1263,1263,1263,1261,1261,1261,1261,1261,1261,
+1261,1261,1261,1261,1261,1261,1261,1262,1264,1265,1266,1267,1267,1260,1266,1266,
+1266,1268,1268,163,163,163,163,163,163,163,163,163,163,163,163,163,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,
+1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,
+1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,
+1269,1269,1269,1269,1269,1269,1269,1269,1269,163,163,163,163,163,163,163,
+
+/* block 192 */
+1270,1270,1270,1270,1270,1270,1270,1270,1270,163,1270,1270,1270,1270,1270,1270,
+1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,
+1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1270,1271,
+1272,1272,1272,1272,1272,1272,1272,163,1272,1272,1272,1272,1272,1272,1271,1273,
+1270,1274,1274,1275,1276,1276,163,163,163,163,163,163,163,163,163,163,
+1277,1277,1277,1277,1277,1277,1277,1277,1277,1277,1278,1278,1278,1278,1278,1278,
+1278,1278,1278,1278,1278,1278,1278,1278,1278,1278,1278,1278,1278,163,163,163,
+1279,1280,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,
+
+/* block 193 */
+1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,
+163,163,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,
+1282,1282,1282,1282,1282,1282,1282,1282,163,1283,1282,1282,1282,1282,1282,1282,
+1282,1283,1282,1282,1283,1282,1282,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 194 */
+1284,1284,1284,1284,1284,1284,1284,163,1284,1284,163,1284,1284,1284,1284,1284,
+1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,
+1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,1284,
+1284,1285,1285,1285,1285,1285,1285,163,163,163,1285,163,1285,1285,163,1285,
+1285,1285,1286,1285,1287,1287,1288,1285,163,163,163,163,163,163,163,163,
+1289,1289,1289,1289,1289,1289,1289,1289,1289,1289,163,163,163,163,163,163,
+1290,1290,1290,1290,1290,1290,163,1290,1290,163,1290,1290,1290,1290,1290,1290,
+1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,
+
+/* block 195 */
+1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1291,1291,1291,1291,1291,163,
+1292,1292,163,1291,1291,1292,1291,1293,1290,163,163,163,163,163,163,163,
+1294,1294,1294,1294,1294,1294,1294,1294,1294,1294,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 196 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1295,1295,1295,1295,1295,1295,1295,1295,1295,1295,1295,1295,1295,1295,1295,1295,
+1295,1295,1295,1296,1296,1297,1297,1298,1298,163,163,163,163,163,163,163,
+
+/* block 197 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+842,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1299,1299,1299,1299,1299,1299,1299,1299,1299,1299,1299,1299,1299,1299,1299,1299,
+388,388,1299,388,1299,390,390,390,390,390,390,390,390,391,391,391,
+391,390,390,390,390,390,390,390,390,390,390,390,390,390,390,390,
+390,390,163,163,163,163,163,163,163,163,163,163,163,163,163,1300,
+
+/* block 198 */
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+
+/* block 199 */
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 200 */
+1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,
+1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,
+1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,
+1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,
+1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,
+1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,
+1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,1302,163,
+1303,1303,1303,1303,1303,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 201 */
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,
+1301,1301,1301,1301,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 202 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,
+1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,
+1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,
+1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,
+1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,
+1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,
+1304,1305,1305,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 203 */
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+
+/* block 204 */
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,163,
+1307,1307,1307,1307,1307,1307,1307,1307,1307,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 205 */
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+
+/* block 206 */
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1308,1308,1308,1308,1308,1308,1308,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 207 */
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+
+/* block 208 */
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
+858,858,858,858,858,858,858,858,858,163,163,163,163,163,163,163,
+1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,
+1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,163,
+1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,163,163,163,163,1311,1311,
+1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,
+
+/* block 209 */
+1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,
+1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,
+1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,
+1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,163,
+1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,163,163,163,163,163,163,
+1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,
+1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,163,163,
+1315,1315,1315,1315,1315,1316,163,163,163,163,163,163,163,163,163,163,
+
+/* block 210 */
+1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
+1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
+1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
+1318,1318,1318,1318,1318,1318,1318,1319,1319,1320,1321,1321,1322,1322,1322,1322,
+1323,1323,1324,1324,1319,1322,163,163,163,163,163,163,163,163,163,163,
+1325,1325,1325,1325,1325,1325,1325,1325,1325,1325,163,1326,1326,1326,1326,1326,
+1326,1326,163,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
+1317,1317,1317,1317,1317,1317,1317,1317,163,163,163,163,163,1317,1317,1317,
+
+/* block 211 */
+1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 212 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,
+1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,
+1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,
+1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,1328,
+
+/* block 213 */
+1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,
+1329,1329,1329,1329,1329,1329,1329,1330,1331,1332,1332,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 214 */
+1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,
+1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,
+1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,
+1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,
+1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,1333,163,163,163,163,1334,
+1333,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,
+1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,
+1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,
+
+/* block 215 */
+1335,1335,1335,1335,1335,1335,1335,1335,163,163,163,163,163,163,163,1336,
+1336,1336,1336,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1338,1339,1340,799,1341,163,163,163,163,163,163,163,163,163,163,163,
+1342,1342,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 216 */
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+
+/* block 217 */
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,
+1343,1343,1343,1343,1343,1343,1343,1343,163,163,163,163,163,163,163,163,
+
+/* block 218 */
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+
+/* block 219 */
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
+1344,1344,1344,1344,1344,1344,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 220 */
+1343,1343,1343,1343,1343,1343,1343,1343,1343,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 221 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1345,1345,1345,1345,163,1345,1345,1345,1345,1345,1345,1345,163,1345,1345,163,
+
+/* block 222 */
+824,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+
+/* block 223 */
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+
+/* block 224 */
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
+824,824,824,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+819,819,819,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,824,824,824,824,163,163,163,163,163,163,163,163,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+
+/* block 225 */
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+
+/* block 226 */
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
+1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,163,163,163,163,
+
+/* block 227 */
+1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,
+1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,
+1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,
+1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,
+1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,
+1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,
+1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,163,163,163,163,163,
+1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,163,163,163,
+
+/* block 228 */
+1347,1347,1347,1347,1347,1347,1347,1347,1347,163,163,163,163,163,163,163,
+1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,163,163,1348,1349,1350,1351,
+1352,1352,1352,1352,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 229 */
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,163,163,
+154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
+154,154,154,154,154,154,154,163,163,163,163,163,163,163,163,163,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+
+/* block 230 */
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 231 */
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+
+/* block 232 */
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,163,163,163,163,163,163,163,163,163,163,
+
+/* block 233 */
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,163,163,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,1353,1354,154,154,154,460,460,460,1355,1356,1356,
+1356,1356,1356, 51, 51, 51, 51, 51, 51, 51, 51,154,154,154,154,154,
+
+/* block 234 */
+154,154,154,460,460,154,154,154,154,154,154,154,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,154,154,154,154,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,723,723,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 235 */
+1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,
+1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,
+1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,
+1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,
+1002,1002,1357,1357,1357,1002,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 236 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+835,835,835,835,835,835,835,835,835,835,835,835,835,835,835,835,
+835,835,835,835,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 237 */
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,163,163,163,163,163,163,163,163,163,
+832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,
+832,832,835,835,835,835,835,835,835,163,163,163,163,163,163,163,
+
+/* block 238 */
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,725,725,725,725,725,725,
+725,725,736,736,725,725,725,725,725,725,725,725,725,725,725,725,
+725,725,725,725,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,725,725,
+725,725,725,725,725,163,736,736,725,725,725,725,725,725,725,725,
+725,725,725,725,725,725,725,725,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+
+/* block 239 */
+724,724,725,725,725,725,725,725,725,725,736,736,725,725,725,725,
+725,725,725,725,725,725,725,725,725,725,725,725,724,163,724,724,
+163,163,724,163,163,724,724,163,163,724,724,724,724,163,724,724,
+724,724,724,724,724,724,725,725,725,725,163,725,163,725,736,736,
+725,725,725,725,163,725,725,725,725,725,725,725,725,725,725,725,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,725,725,725,725,725,725,
+725,725,736,736,725,725,725,725,725,725,725,725,725,725,725,725,
+
+/* block 240 */
+725,725,725,725,724,724,163,724,724,724,724,163,163,724,724,724,
+724,724,724,724,724,163,724,724,724,724,724,724,724,163,725,725,
+725,725,725,725,725,725,736,736,725,725,725,725,725,725,725,725,
+725,725,725,725,725,725,725,725,724,724,163,724,724,724,724,163,
+724,724,724,724,724,163,724,163,163,163,724,724,724,724,724,724,
+724,163,725,725,725,725,725,725,725,725,736,736,725,725,725,725,
+725,725,725,725,725,725,725,725,725,725,725,725,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+
+/* block 241 */
+724,724,724,724,724,724,725,725,725,725,725,725,725,725,736,736,
+725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,725,725,725,725,725,725,
+725,725,736,736,725,725,725,725,725,725,725,725,725,725,725,725,
+725,725,725,725,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,725,725,
+725,725,725,725,725,725,736,736,725,725,725,725,725,725,725,725,
+
+/* block 242 */
+725,725,725,725,725,725,725,725,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,725,725,725,725,725,725,725,725,736,736,725,725,725,725,
+725,725,725,725,725,725,725,725,725,725,725,725,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,725,725,725,725,725,725,725,725,736,736,
+725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+
+/* block 243 */
+724,724,724,724,724,724,724,724,724,724,725,725,725,725,725,725,
+725,725,736,736,725,725,725,725,725,725,725,725,725,725,725,725,
+725,725,725,725,725,725,163,163,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+724,1358,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
+725,725,725,725,725,725,725,725,725,725,725,715,725,725,725,725,
+725,725,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,1358,725,725,725,725,
+
+/* block 244 */
+725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
+725,725,725,725,725,715,725,725,725,725,725,725,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,1358,725,725,725,725,725,725,725,725,725,725,
+725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,715,
+725,725,725,725,725,725,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,1358,
+725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
+
+/* block 245 */
+725,725,725,725,725,725,725,725,725,715,725,725,725,725,725,725,
+724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+724,724,724,724,724,724,724,724,724,1358,725,725,725,725,725,725,
+725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
+725,725,725,715,725,725,725,725,725,725,724,725,163,163,1359,1359,
+1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,
+1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,
+1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,
+
+/* block 246 */
+1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,
+1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,
+1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,
+1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,
+1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,
+1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,
+1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,
+1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,
+
+/* block 247 */
+1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,
+1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,
+1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,
+1361,1361,1361,1361,1361,1361,1361,1360,1360,1360,1360,1361,1361,1361,1361,1361,
+1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,
+1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,
+1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1360,1360,1360,
+1360,1360,1360,1360,1360,1361,1360,1360,1360,1360,1360,1360,1360,1360,1360,1360,
+
+/* block 248 */
+1360,1360,1360,1360,1361,1360,1360,1362,1363,1362,1362,1364,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,1361,1361,1361,1361,1361,
+163,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,1361,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 249 */
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 92, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,643, 70, 70, 70, 70,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 250 */
+1365,1365,1365,1365,1365,1365,1365,163,1365,1365,1365,1365,1365,1365,1365,1365,
+1365,1365,1365,1365,1365,1365,1365,1365,1365,163,163,1365,1365,1365,1365,1365,
+1365,1365,163,1365,1365,163,1365,1365,1365,1365,1365,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 251 */
+1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,
+1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,
+1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,1366,163,163,163,
+1367,1367,1367,1367,1367,1367,1367,1368,1368,1368,1368,1368,1369,1369,163,163,
+1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,163,163,163,163,1366,1371,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 252 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,
+1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1373,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,
+1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,
+1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1374,1375,1375,1375,1375,
+1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,163,163,163,163,163,1377,
+
+/* block 253 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+483,483,483,483,483,483,483,163,483,483,483,483,163,483,483,163,
+483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,163,
+
+/* block 254 */
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+
+/* block 255 */
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,1378,
+1378,1378,1378,1378,1378,262,262,1379,1379,1379,1379,1379,1379,1379,1379,1379,
+1380,1380,1380,1380,1380,1380,1380,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 256 */
+1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,
+1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,
+1381,1381,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,
+1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,
+1382,1382,1382,1382,1383,1383,1383,1384,1385,1385,1385,1386,262,262,262,262,
+1387,1387,1387,1387,1387,1387,1387,1387,1387,1387,262,262,262,262,1388,1388,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 257 */
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+302,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,
+
+/* block 258 */
+1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,
+1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,
+1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1390,1389,1389,1389,
+1391,1389,1389,1389,1389,302,302,302,302,302,302,302,302,302,302,302,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 259 */
+302,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,
+1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,
+1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1390,1389,
+1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,302,302,
+302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+
+/* block 260 */
+1392,1392,1392,1392,302,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
+1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
+302,1392,1392,302,1392,302,302,1392,302,1392,1392,1392,1392,1392,1392,1392,
+1392,1392,1392,302,1392,1392,1392,1392,302,1392,302,1392,302,302,302,302,
+302,302,1392,302,302,302,302,1392,302,1392,302,1392,302,1392,1392,1392,
+302,1392,1392,302,1392,302,302,1392,302,1392,302,1392,302,1392,302,1392,
+302,1392,1392,302,1392,302,302,1392,1392,1392,1392,302,1392,1392,1392,1392,
+1392,1392,1392,302,1392,1392,1392,1392,302,1392,1392,1392,1392,302,1392,302,
+
+/* block 261 */
+1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,302,1392,1392,1392,1392,1392,
+1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,302,302,302,302,
+302,1392,1392,1392,302,1392,1392,1392,1392,1392,302,1392,1392,1392,1392,1392,
+1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,302,302,302,302,
+302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
+302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
+302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
+274,274,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
+
+/* block 262 */
+1393,1393,1393,1393,1394,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1395,1395,1395,1395,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+
+/* block 263 */
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1395,
+1395,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1395,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1394,
+1395,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+
+/* block 264 */
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 58, 58,1393,1393,1393,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,1393,
+1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,
+1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,460,460,460,460,460,460,
+1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,
+1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,723,723,1393,1393,1393,1393,
+1397,1397,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1397,1397,
+
+/* block 265 */
+1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,460,460,460,460,1398,460,
+460,1398,1398,1398,1398,1398,1398,1398,1398,1398,1398,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,1393,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1399,1399,1399,1399,1399,1399,1399,1399,1399,1399,
+1399,1399,1399,1399,1399,1399,1399,1399,1399,1399,1399,1399,1399,1399,1399,1399,
+
+/* block 266 */
+1400,1398,1401,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+460,460,460,460,460,460,460,460,460,460,1398,460,460,460,460,460,
+460,460,460,460,460,460,460,460,460,460,460,460,460,460,460,1398,
+460,460,1398,1398,1398,1398,1398,1401,1398,1398,1398,460,1395,1395,1395,1395,
+460,460,460,460,460,460,460,460,460,1395,1395,1395,1395,1395,1395,1395,
+1402,1402,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1393,1393,1393,1393,1393,1393,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+
+/* block 267 */
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+
+/* block 268 */
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,727,1393,1393,727,727,727,727,727,727,727,727,727,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,727,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,727,1394,1394,
+
+/* block 269 */
+1394,1394,1394,1394,1394,1403,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1393,1393,727,727,1393,727,727,727,1393,1393,727,727,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1403,1403,1403,1394,1394,1403,1394,1394,1403,1404,1404,727,727,1394,
+1394,1394,1394,1394,727,727,727,727,727,727,727,727,727,727,727,727,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1393,1393,727,1394,727,1393,727,1394,1394,1394,1405,1405,1405,1405,1405,
+
+/* block 270 */
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,727,
+1394,727,1403,1403,1394,1394,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
+1403,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
+1403,1403,1403,1403,1403,1403,1403,1403,1403,1394,1394,1394,1403,1394,1394,1394,
+
+/* block 271 */
+1394,1403,1403,1403,1394,1403,1403,1403,1394,1394,1394,1394,1394,1394,1394,1403,
+1394,1403,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1403,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,727,1393,1394,
+
+/* block 272 */
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,723,723,
+723,723,723,723,723,723,1393,1393,1393,727,727,1394,1394,1394,1394,1393,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1393,1393,1393,1393,1393,1393,1393,727,
+727,1393,1393,727,1404,1404,727,727,727,727,1403,1393,1393,1393,1393,1393,
+
+/* block 273 */
+1393,1393,1393,1393,1393,1393,1393,727,1393,1393,727,727,727,727,1393,1393,
+1404,1393,1393,1393,1393,1403,1403,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1394,727,1393,1393,727,1393,1393,1393,1393,1393,1393,1393,
+1393,727,727,1393,1393,1393,1393,1393,1393,1393,1393,1393,727,1393,1393,1393,
+1393,1393,727,727,727,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,727,727,727,1393,1393,1393,1393,1393,1393,1393,1393,727,727,727,1393,
+1393,727,1393,727,1393,1393,1393,1393,727,1393,1393,1393,1393,1393,1393,727,
+1393,1393,1393,727,1393,1393,1393,1393,1393,1393,727,1394,1394,1394,1394,1394,
+
+/* block 274 */
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1403,1403,1403,1394,1394,1394,1403,1403,1403,1403,1403,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+
+/* block 275 */
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1403,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1403,1403,1403,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1403,1394,1394,1394,1394,1394,1393,1393,1393,1393,1393,727,1403,727,727,727,
+1394,1394,1394,1393,1393,1394,1394,1394,1395,1395,1395,1395,1395,1394,1394,1394,
+727,727,727,727,727,727,1393,1393,1393,727,1393,1394,1394,1395,1395,1395,
+727,1393,1393,727,1394,1394,1394,1394,1394,1394,1394,1394,1394,1395,1395,1395,
+
+/* block 276 */
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+
+/* block 277 */
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,1393,1393,1393,1393,1395,1395,1395,1395,1395,1395,1395,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1395,1395,1395,1395,
+1394,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+
+/* block 278 */
+723,723,723,723,723,723,723,723,723,723,723,723,1395,1395,1395,1395,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,1395,1395,1395,1395,1395,1395,1395,1395,
+723,723,723,723,723,723,723,723,723,723,1395,1395,1395,1395,1395,1395,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+
+/* block 279 */
+723,723,723,723,723,723,723,723,1395,1395,1395,1395,1395,1395,1395,1395,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,1395,1395,
+1393,1393,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+
+/* block 280 */
+723,723,723,723,723,723,723,723,723,723,723,723,1403,1394,1394,1403,
+1394,1394,1394,1394,1394,1394,1394,1394,1403,1403,1403,1403,1403,1403,1403,1403,
+1394,1394,1394,1394,1394,1394,1403,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1394,723,1403,1403,1403,1394,
+1394,1394,1394,1394,1394,1394,723,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1403,1394,1394,1394,1394,1394,1394,1394,1394,
+
+/* block 281 */
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1406,1406,1406,1406,1394,1403,1403,1394,1403,1403,1394,1403,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1403,1403,1403,
+1394,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+
+/* block 282 */
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,
+1393,1393,1393,1393,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1395,1395,
+1394,1394,1394,1394,1394,1395,1395,1395,1394,1394,1394,1394,1394,1395,1395,1395,
+
+/* block 283 */
+1394,1394,1394,1394,1394,1394,1394,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1395,1395,1395,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1395,1395,1395,1395,1395,
+1394,1394,1394,1403,1403,1403,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1394,1394,1394,1394,1394,1394,1394,1394,1394,1394,1395,1395,1395,1395,1395,1395,
+1394,1394,1394,1394,1394,1394,1394,1394,1395,1395,1395,1395,1395,1395,1395,1395,
+1403,1403,1403,1403,1403,1403,1403,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+
+/* block 284 */
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+
+/* block 285 */
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,163,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,723,
+723,723,723,723,723,723,723,723,723,723,723,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,163,163,163,163,163,163,
+
+/* block 286 */
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
+1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,958,958,
+
+/* block 287 */
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 288 */
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,163,163,163,163,163,163,163,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+
+/* block 289 */
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,163,163,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+
+/* block 290 */
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+
+/* block 291 */
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 292 */
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,
+953,953,953,953,953,953,953,953,953,953,953,953,953,953,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 293 */
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,958,958,
+
+/* block 294 */
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
+838,838,838,838,838,838,838,838,838,838,838,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+
+/* block 295 */
+707,712,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
+1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
+1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
+1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
+1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
+1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
+
+/* block 296 */
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+
+/* block 297 */
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+
+/* block 298 */
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,
+707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,707,
+
+/* block 299 */
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+952,952,952,952,952,952,952,952,952,952,952,952,952,952,958,958,
+};
+
+#if UCD_BLOCK_SIZE != 128
+#error Please correct UCD_BLOCK_SIZE in pcre2_internal.h
+#endif
+#endif  /* SUPPORT_UNICODE */
+
+#endif  /* PCRE2_PCRE2TEST */
+
+/* End of pcre2_ucd.c */
diff --git a/Foundation/src/pcre2_ucp.h b/Foundation/src/pcre2_ucp.h
new file mode 100644
index 000000000..282238982
--- /dev/null
+++ b/Foundation/src/pcre2_ucp.h
@@ -0,0 +1,394 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2022 University of Cambridge
+
+This module is auto-generated from Unicode data files. DO NOT EDIT MANUALLY!
+Instead, modify the maint/GenerateUcpHeader.py script and run it to generate
+a new version of this code.
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef PCRE2_UCP_H_IDEMPOTENT_GUARD
+#define PCRE2_UCP_H_IDEMPOTENT_GUARD
+
+/* This file contains definitions of the Unicode property values that are
+returned by the UCD access macros and used throughout PCRE2.
+
+IMPORTANT: The specific values of the first two enums (general and particular
+character categories) are assumed by the table called catposstab in the file
+pcre2_auto_possess.c. They are unlikely to change, but should be checked after
+an update. */
+
+/* These are the general character categories. */
+
+enum {
+  ucp_C,
+  ucp_L,
+  ucp_M,
+  ucp_N,
+  ucp_P,
+  ucp_S,
+  ucp_Z,
+};
+
+/* These are the particular character categories. */
+
+enum {
+  ucp_Cc,    /* Control */
+  ucp_Cf,    /* Format */
+  ucp_Cn,    /* Unassigned */
+  ucp_Co,    /* Private use */
+  ucp_Cs,    /* Surrogate */
+  ucp_Ll,    /* Lower case letter */
+  ucp_Lm,    /* Modifier letter */
+  ucp_Lo,    /* Other letter */
+  ucp_Lt,    /* Title case letter */
+  ucp_Lu,    /* Upper case letter */
+  ucp_Mc,    /* Spacing mark */
+  ucp_Me,    /* Enclosing mark */
+  ucp_Mn,    /* Non-spacing mark */
+  ucp_Nd,    /* Decimal number */
+  ucp_Nl,    /* Letter number */
+  ucp_No,    /* Other number */
+  ucp_Pc,    /* Connector punctuation */
+  ucp_Pd,    /* Dash punctuation */
+  ucp_Pe,    /* Close punctuation */
+  ucp_Pf,    /* Final punctuation */
+  ucp_Pi,    /* Initial punctuation */
+  ucp_Po,    /* Other punctuation */
+  ucp_Ps,    /* Open punctuation */
+  ucp_Sc,    /* Currency symbol */
+  ucp_Sk,    /* Modifier symbol */
+  ucp_Sm,    /* Mathematical symbol */
+  ucp_So,    /* Other symbol */
+  ucp_Zl,    /* Line separator */
+  ucp_Zp,    /* Paragraph separator */
+  ucp_Zs,    /* Space separator */
+};
+
+/* These are Boolean properties. */
+
+enum {
+  ucp_ASCII,
+  ucp_ASCII_Hex_Digit,
+  ucp_Alphabetic,
+  ucp_Bidi_Control,
+  ucp_Bidi_Mirrored,
+  ucp_Case_Ignorable,
+  ucp_Cased,
+  ucp_Changes_When_Casefolded,
+  ucp_Changes_When_Casemapped,
+  ucp_Changes_When_Lowercased,
+  ucp_Changes_When_Titlecased,
+  ucp_Changes_When_Uppercased,
+  ucp_Dash,
+  ucp_Default_Ignorable_Code_Point,
+  ucp_Deprecated,
+  ucp_Diacritic,
+  ucp_Emoji,
+  ucp_Emoji_Component,
+  ucp_Emoji_Modifier,
+  ucp_Emoji_Modifier_Base,
+  ucp_Emoji_Presentation,
+  ucp_Extended_Pictographic,
+  ucp_Extender,
+  ucp_Grapheme_Base,
+  ucp_Grapheme_Extend,
+  ucp_Grapheme_Link,
+  ucp_Hex_Digit,
+  ucp_IDS_Binary_Operator,
+  ucp_IDS_Trinary_Operator,
+  ucp_ID_Continue,
+  ucp_ID_Start,
+  ucp_Ideographic,
+  ucp_Join_Control,
+  ucp_Logical_Order_Exception,
+  ucp_Lowercase,
+  ucp_Math,
+  ucp_Noncharacter_Code_Point,
+  ucp_Pattern_Syntax,
+  ucp_Pattern_White_Space,
+  ucp_Prepended_Concatenation_Mark,
+  ucp_Quotation_Mark,
+  ucp_Radical,
+  ucp_Regional_Indicator,
+  ucp_Sentence_Terminal,
+  ucp_Soft_Dotted,
+  ucp_Terminal_Punctuation,
+  ucp_Unified_Ideograph,
+  ucp_Uppercase,
+  ucp_Variation_Selector,
+  ucp_White_Space,
+  ucp_XID_Continue,
+  ucp_XID_Start,
+  /* This must be last */
+  ucp_Bprop_Count
+};
+
+/* Size of entries in ucd_boolprop_sets[] */
+
+#define ucd_boolprop_sets_item_size 2
+
+/* These are the bidi class values. */
+
+enum {
+  ucp_bidiAL,   /* Arabic letter */
+  ucp_bidiAN,   /* Arabic number */
+  ucp_bidiB,    /* Paragraph separator */
+  ucp_bidiBN,   /* Boundary neutral */
+  ucp_bidiCS,   /* Common separator */
+  ucp_bidiEN,   /* European number */
+  ucp_bidiES,   /* European separator */
+  ucp_bidiET,   /* European terminator */
+  ucp_bidiFSI,  /* First strong isolate */
+  ucp_bidiL,    /* Left to right */
+  ucp_bidiLRE,  /* Left to right embedding */
+  ucp_bidiLRI,  /* Left to right isolate */
+  ucp_bidiLRO,  /* Left to right override */
+  ucp_bidiNSM,  /* Non-spacing mark */
+  ucp_bidiON,   /* Other neutral */
+  ucp_bidiPDF,  /* Pop directional format */
+  ucp_bidiPDI,  /* Pop directional isolate */
+  ucp_bidiR,    /* Right to left */
+  ucp_bidiRLE,  /* Right to left embedding */
+  ucp_bidiRLI,  /* Right to left isolate */
+  ucp_bidiRLO,  /* Right to left override */
+  ucp_bidiS,    /* Segment separator */
+  ucp_bidiWS,   /* White space */
+};
+
+/* These are grapheme break properties. The Extended Pictographic property
+comes from the emoji-data.txt file. */
+
+enum {
+  ucp_gbCR,                    /*  0 */
+  ucp_gbLF,                    /*  1 */
+  ucp_gbControl,               /*  2 */
+  ucp_gbExtend,                /*  3 */
+  ucp_gbPrepend,               /*  4 */
+  ucp_gbSpacingMark,           /*  5 */
+  ucp_gbL,                     /*  6 Hangul syllable type L */
+  ucp_gbV,                     /*  7 Hangul syllable type V */
+  ucp_gbT,                     /*  8 Hangul syllable type T */
+  ucp_gbLV,                    /*  9 Hangul syllable type LV */
+  ucp_gbLVT,                   /* 10 Hangul syllable type LVT */
+  ucp_gbRegional_Indicator,    /* 11 */
+  ucp_gbOther,                 /* 12 */
+  ucp_gbZWJ,                   /* 13 */
+  ucp_gbExtended_Pictographic, /* 14 */
+};
+
+/* These are the script identifications. */
+
+enum {
+  /* Scripts which has characters in other scripts. */
+  ucp_Latin,
+  ucp_Greek,
+  ucp_Cyrillic,
+  ucp_Arabic,
+  ucp_Syriac,
+  ucp_Thaana,
+  ucp_Devanagari,
+  ucp_Bengali,
+  ucp_Gurmukhi,
+  ucp_Gujarati,
+  ucp_Oriya,
+  ucp_Tamil,
+  ucp_Telugu,
+  ucp_Kannada,
+  ucp_Malayalam,
+  ucp_Sinhala,
+  ucp_Myanmar,
+  ucp_Georgian,
+  ucp_Hangul,
+  ucp_Mongolian,
+  ucp_Hiragana,
+  ucp_Katakana,
+  ucp_Bopomofo,
+  ucp_Han,
+  ucp_Yi,
+  ucp_Tagalog,
+  ucp_Hanunoo,
+  ucp_Buhid,
+  ucp_Tagbanwa,
+  ucp_Limbu,
+  ucp_Tai_Le,
+  ucp_Linear_B,
+  ucp_Cypriot,
+  ucp_Buginese,
+  ucp_Coptic,
+  ucp_Glagolitic,
+  ucp_Syloti_Nagri,
+  ucp_Phags_Pa,
+  ucp_Nko,
+  ucp_Kayah_Li,
+  ucp_Javanese,
+  ucp_Kaithi,
+  ucp_Mandaic,
+  ucp_Chakma,
+  ucp_Sharada,
+  ucp_Takri,
+  ucp_Duployan,
+  ucp_Grantha,
+  ucp_Khojki,
+  ucp_Linear_A,
+  ucp_Mahajani,
+  ucp_Manichaean,
+  ucp_Modi,
+  ucp_Old_Permic,
+  ucp_Psalter_Pahlavi,
+  ucp_Khudawadi,
+  ucp_Tirhuta,
+  ucp_Multani,
+  ucp_Adlam,
+  ucp_Masaram_Gondi,
+  ucp_Dogra,
+  ucp_Gunjala_Gondi,
+  ucp_Hanifi_Rohingya,
+  ucp_Sogdian,
+  ucp_Nandinagari,
+  ucp_Yezidi,
+  ucp_Cypro_Minoan,
+  ucp_Old_Uyghur,
+
+  /* Scripts which has no characters in other scripts. */
+  ucp_Unknown,
+  ucp_Common,
+  ucp_Armenian,
+  ucp_Hebrew,
+  ucp_Thai,
+  ucp_Lao,
+  ucp_Tibetan,
+  ucp_Ethiopic,
+  ucp_Cherokee,
+  ucp_Canadian_Aboriginal,
+  ucp_Ogham,
+  ucp_Runic,
+  ucp_Khmer,
+  ucp_Old_Italic,
+  ucp_Gothic,
+  ucp_Deseret,
+  ucp_Inherited,
+  ucp_Ugaritic,
+  ucp_Shavian,
+  ucp_Osmanya,
+  ucp_Braille,
+  ucp_New_Tai_Lue,
+  ucp_Tifinagh,
+  ucp_Old_Persian,
+  ucp_Kharoshthi,
+  ucp_Balinese,
+  ucp_Cuneiform,
+  ucp_Phoenician,
+  ucp_Sundanese,
+  ucp_Lepcha,
+  ucp_Ol_Chiki,
+  ucp_Vai,
+  ucp_Saurashtra,
+  ucp_Rejang,
+  ucp_Lycian,
+  ucp_Carian,
+  ucp_Lydian,
+  ucp_Cham,
+  ucp_Tai_Tham,
+  ucp_Tai_Viet,
+  ucp_Avestan,
+  ucp_Egyptian_Hieroglyphs,
+  ucp_Samaritan,
+  ucp_Lisu,
+  ucp_Bamum,
+  ucp_Meetei_Mayek,
+  ucp_Imperial_Aramaic,
+  ucp_Old_South_Arabian,
+  ucp_Inscriptional_Parthian,
+  ucp_Inscriptional_Pahlavi,
+  ucp_Old_Turkic,
+  ucp_Batak,
+  ucp_Brahmi,
+  ucp_Meroitic_Cursive,
+  ucp_Meroitic_Hieroglyphs,
+  ucp_Miao,
+  ucp_Sora_Sompeng,
+  ucp_Caucasian_Albanian,
+  ucp_Bassa_Vah,
+  ucp_Elbasan,
+  ucp_Pahawh_Hmong,
+  ucp_Mende_Kikakui,
+  ucp_Mro,
+  ucp_Old_North_Arabian,
+  ucp_Nabataean,
+  ucp_Palmyrene,
+  ucp_Pau_Cin_Hau,
+  ucp_Siddham,
+  ucp_Warang_Citi,
+  ucp_Ahom,
+  ucp_Anatolian_Hieroglyphs,
+  ucp_Hatran,
+  ucp_Old_Hungarian,
+  ucp_SignWriting,
+  ucp_Bhaiksuki,
+  ucp_Marchen,
+  ucp_Newa,
+  ucp_Osage,
+  ucp_Tangut,
+  ucp_Nushu,
+  ucp_Soyombo,
+  ucp_Zanabazar_Square,
+  ucp_Makasar,
+  ucp_Medefaidrin,
+  ucp_Old_Sogdian,
+  ucp_Elymaic,
+  ucp_Nyiakeng_Puachue_Hmong,
+  ucp_Wancho,
+  ucp_Chorasmian,
+  ucp_Dives_Akuru,
+  ucp_Khitan_Small_Script,
+  ucp_Tangsa,
+  ucp_Toto,
+  ucp_Vithkuqi,
+
+  /* This must be last */
+  ucp_Script_Count
+};
+
+/* Size of entries in ucd_script_sets[] */
+
+#define ucd_script_sets_item_size 3
+
+#endif  /* PCRE2_UCP_H_IDEMPOTENT_GUARD */
+
+/* End of pcre2_ucp.h */
diff --git a/Foundation/src/pcre2_ucptables.c b/Foundation/src/pcre2_ucptables.c
new file mode 100644
index 000000000..bd1b67a9f
--- /dev/null
+++ b/Foundation/src/pcre2_ucptables.c
@@ -0,0 +1,1524 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2022 University of Cambridge
+
+This module is auto-generated from Unicode data files. DO NOT EDIT MANUALLY!
+Instead, modify the maint/GenerateUcpTables.py script and run it to generate
+a new version of this code.
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifdef SUPPORT_UNICODE
+
+/* The PRIV(utt)[] table below translates Unicode property names into type and
+code values. It is searched by binary chop, so must be in collating sequence of
+name. Originally, the table contained pointers to the name strings in the first
+field of each entry. However, that leads to a large number of relocations when
+a shared library is dynamically loaded. A significant reduction is made by
+putting all the names into a single, large string and using offsets instead.
+All letters are lower cased, and underscores are removed, in accordance with
+the "loose matching" rules that Unicode advises and Perl uses. */
+
+#define STRING_adlam0 STR_a STR_d STR_l STR_a STR_m "\0"
+#define STRING_adlm0 STR_a STR_d STR_l STR_m "\0"
+#define STRING_aghb0 STR_a STR_g STR_h STR_b "\0"
+#define STRING_ahex0 STR_a STR_h STR_e STR_x "\0"
+#define STRING_ahom0 STR_a STR_h STR_o STR_m "\0"
+#define STRING_alpha0 STR_a STR_l STR_p STR_h STR_a "\0"
+#define STRING_alphabetic0 STR_a STR_l STR_p STR_h STR_a STR_b STR_e STR_t STR_i STR_c "\0"
+#define STRING_anatolianhieroglyphs0 STR_a STR_n STR_a STR_t STR_o STR_l STR_i STR_a STR_n STR_h STR_i STR_e STR_r STR_o STR_g STR_l STR_y STR_p STR_h STR_s "\0"
+#define STRING_any0 STR_a STR_n STR_y "\0"
+#define STRING_arab0 STR_a STR_r STR_a STR_b "\0"
+#define STRING_arabic0 STR_a STR_r STR_a STR_b STR_i STR_c "\0"
+#define STRING_armenian0 STR_a STR_r STR_m STR_e STR_n STR_i STR_a STR_n "\0"
+#define STRING_armi0 STR_a STR_r STR_m STR_i "\0"
+#define STRING_armn0 STR_a STR_r STR_m STR_n "\0"
+#define STRING_ascii0 STR_a STR_s STR_c STR_i STR_i "\0"
+#define STRING_asciihexdigit0 STR_a STR_s STR_c STR_i STR_i STR_h STR_e STR_x STR_d STR_i STR_g STR_i STR_t "\0"
+#define STRING_avestan0 STR_a STR_v STR_e STR_s STR_t STR_a STR_n "\0"
+#define STRING_avst0 STR_a STR_v STR_s STR_t "\0"
+#define STRING_bali0 STR_b STR_a STR_l STR_i "\0"
+#define STRING_balinese0 STR_b STR_a STR_l STR_i STR_n STR_e STR_s STR_e "\0"
+#define STRING_bamu0 STR_b STR_a STR_m STR_u "\0"
+#define STRING_bamum0 STR_b STR_a STR_m STR_u STR_m "\0"
+#define STRING_bass0 STR_b STR_a STR_s STR_s "\0"
+#define STRING_bassavah0 STR_b STR_a STR_s STR_s STR_a STR_v STR_a STR_h "\0"
+#define STRING_batak0 STR_b STR_a STR_t STR_a STR_k "\0"
+#define STRING_batk0 STR_b STR_a STR_t STR_k "\0"
+#define STRING_beng0 STR_b STR_e STR_n STR_g "\0"
+#define STRING_bengali0 STR_b STR_e STR_n STR_g STR_a STR_l STR_i "\0"
+#define STRING_bhaiksuki0 STR_b STR_h STR_a STR_i STR_k STR_s STR_u STR_k STR_i "\0"
+#define STRING_bhks0 STR_b STR_h STR_k STR_s "\0"
+#define STRING_bidial0 STR_b STR_i STR_d STR_i STR_a STR_l "\0"
+#define STRING_bidian0 STR_b STR_i STR_d STR_i STR_a STR_n "\0"
+#define STRING_bidib0 STR_b STR_i STR_d STR_i STR_b "\0"
+#define STRING_bidibn0 STR_b STR_i STR_d STR_i STR_b STR_n "\0"
+#define STRING_bidic0 STR_b STR_i STR_d STR_i STR_c "\0"
+#define STRING_bidicontrol0 STR_b STR_i STR_d STR_i STR_c STR_o STR_n STR_t STR_r STR_o STR_l "\0"
+#define STRING_bidics0 STR_b STR_i STR_d STR_i STR_c STR_s "\0"
+#define STRING_bidien0 STR_b STR_i STR_d STR_i STR_e STR_n "\0"
+#define STRING_bidies0 STR_b STR_i STR_d STR_i STR_e STR_s "\0"
+#define STRING_bidiet0 STR_b STR_i STR_d STR_i STR_e STR_t "\0"
+#define STRING_bidifsi0 STR_b STR_i STR_d STR_i STR_f STR_s STR_i "\0"
+#define STRING_bidil0 STR_b STR_i STR_d STR_i STR_l "\0"
+#define STRING_bidilre0 STR_b STR_i STR_d STR_i STR_l STR_r STR_e "\0"
+#define STRING_bidilri0 STR_b STR_i STR_d STR_i STR_l STR_r STR_i "\0"
+#define STRING_bidilro0 STR_b STR_i STR_d STR_i STR_l STR_r STR_o "\0"
+#define STRING_bidim0 STR_b STR_i STR_d STR_i STR_m "\0"
+#define STRING_bidimirrored0 STR_b STR_i STR_d STR_i STR_m STR_i STR_r STR_r STR_o STR_r STR_e STR_d "\0"
+#define STRING_bidinsm0 STR_b STR_i STR_d STR_i STR_n STR_s STR_m "\0"
+#define STRING_bidion0 STR_b STR_i STR_d STR_i STR_o STR_n "\0"
+#define STRING_bidipdf0 STR_b STR_i STR_d STR_i STR_p STR_d STR_f "\0"
+#define STRING_bidipdi0 STR_b STR_i STR_d STR_i STR_p STR_d STR_i "\0"
+#define STRING_bidir0 STR_b STR_i STR_d STR_i STR_r "\0"
+#define STRING_bidirle0 STR_b STR_i STR_d STR_i STR_r STR_l STR_e "\0"
+#define STRING_bidirli0 STR_b STR_i STR_d STR_i STR_r STR_l STR_i "\0"
+#define STRING_bidirlo0 STR_b STR_i STR_d STR_i STR_r STR_l STR_o "\0"
+#define STRING_bidis0 STR_b STR_i STR_d STR_i STR_s "\0"
+#define STRING_bidiws0 STR_b STR_i STR_d STR_i STR_w STR_s "\0"
+#define STRING_bopo0 STR_b STR_o STR_p STR_o "\0"
+#define STRING_bopomofo0 STR_b STR_o STR_p STR_o STR_m STR_o STR_f STR_o "\0"
+#define STRING_brah0 STR_b STR_r STR_a STR_h "\0"
+#define STRING_brahmi0 STR_b STR_r STR_a STR_h STR_m STR_i "\0"
+#define STRING_brai0 STR_b STR_r STR_a STR_i "\0"
+#define STRING_braille0 STR_b STR_r STR_a STR_i STR_l STR_l STR_e "\0"
+#define STRING_bugi0 STR_b STR_u STR_g STR_i "\0"
+#define STRING_buginese0 STR_b STR_u STR_g STR_i STR_n STR_e STR_s STR_e "\0"
+#define STRING_buhd0 STR_b STR_u STR_h STR_d "\0"
+#define STRING_buhid0 STR_b STR_u STR_h STR_i STR_d "\0"
+#define STRING_c0 STR_c "\0"
+#define STRING_cakm0 STR_c STR_a STR_k STR_m "\0"
+#define STRING_canadianaboriginal0 STR_c STR_a STR_n STR_a STR_d STR_i STR_a STR_n STR_a STR_b STR_o STR_r STR_i STR_g STR_i STR_n STR_a STR_l "\0"
+#define STRING_cans0 STR_c STR_a STR_n STR_s "\0"
+#define STRING_cari0 STR_c STR_a STR_r STR_i "\0"
+#define STRING_carian0 STR_c STR_a STR_r STR_i STR_a STR_n "\0"
+#define STRING_cased0 STR_c STR_a STR_s STR_e STR_d "\0"
+#define STRING_caseignorable0 STR_c STR_a STR_s STR_e STR_i STR_g STR_n STR_o STR_r STR_a STR_b STR_l STR_e "\0"
+#define STRING_caucasianalbanian0 STR_c STR_a STR_u STR_c STR_a STR_s STR_i STR_a STR_n STR_a STR_l STR_b STR_a STR_n STR_i STR_a STR_n "\0"
+#define STRING_cc0 STR_c STR_c "\0"
+#define STRING_cf0 STR_c STR_f "\0"
+#define STRING_chakma0 STR_c STR_h STR_a STR_k STR_m STR_a "\0"
+#define STRING_cham0 STR_c STR_h STR_a STR_m "\0"
+#define STRING_changeswhencasefolded0 STR_c STR_h STR_a STR_n STR_g STR_e STR_s STR_w STR_h STR_e STR_n STR_c STR_a STR_s STR_e STR_f STR_o STR_l STR_d STR_e STR_d "\0"
+#define STRING_changeswhencasemapped0 STR_c STR_h STR_a STR_n STR_g STR_e STR_s STR_w STR_h STR_e STR_n STR_c STR_a STR_s STR_e STR_m STR_a STR_p STR_p STR_e STR_d "\0"
+#define STRING_changeswhenlowercased0 STR_c STR_h STR_a STR_n STR_g STR_e STR_s STR_w STR_h STR_e STR_n STR_l STR_o STR_w STR_e STR_r STR_c STR_a STR_s STR_e STR_d "\0"
+#define STRING_changeswhentitlecased0 STR_c STR_h STR_a STR_n STR_g STR_e STR_s STR_w STR_h STR_e STR_n STR_t STR_i STR_t STR_l STR_e STR_c STR_a STR_s STR_e STR_d "\0"
+#define STRING_changeswhenuppercased0 STR_c STR_h STR_a STR_n STR_g STR_e STR_s STR_w STR_h STR_e STR_n STR_u STR_p STR_p STR_e STR_r STR_c STR_a STR_s STR_e STR_d "\0"
+#define STRING_cher0 STR_c STR_h STR_e STR_r "\0"
+#define STRING_cherokee0 STR_c STR_h STR_e STR_r STR_o STR_k STR_e STR_e "\0"
+#define STRING_chorasmian0 STR_c STR_h STR_o STR_r STR_a STR_s STR_m STR_i STR_a STR_n "\0"
+#define STRING_chrs0 STR_c STR_h STR_r STR_s "\0"
+#define STRING_ci0 STR_c STR_i "\0"
+#define STRING_cn0 STR_c STR_n "\0"
+#define STRING_co0 STR_c STR_o "\0"
+#define STRING_common0 STR_c STR_o STR_m STR_m STR_o STR_n "\0"
+#define STRING_copt0 STR_c STR_o STR_p STR_t "\0"
+#define STRING_coptic0 STR_c STR_o STR_p STR_t STR_i STR_c "\0"
+#define STRING_cpmn0 STR_c STR_p STR_m STR_n "\0"
+#define STRING_cprt0 STR_c STR_p STR_r STR_t "\0"
+#define STRING_cs0 STR_c STR_s "\0"
+#define STRING_cuneiform0 STR_c STR_u STR_n STR_e STR_i STR_f STR_o STR_r STR_m "\0"
+#define STRING_cwcf0 STR_c STR_w STR_c STR_f "\0"
+#define STRING_cwcm0 STR_c STR_w STR_c STR_m "\0"
+#define STRING_cwl0 STR_c STR_w STR_l "\0"
+#define STRING_cwt0 STR_c STR_w STR_t "\0"
+#define STRING_cwu0 STR_c STR_w STR_u "\0"
+#define STRING_cypriot0 STR_c STR_y STR_p STR_r STR_i STR_o STR_t "\0"
+#define STRING_cyprominoan0 STR_c STR_y STR_p STR_r STR_o STR_m STR_i STR_n STR_o STR_a STR_n "\0"
+#define STRING_cyrillic0 STR_c STR_y STR_r STR_i STR_l STR_l STR_i STR_c "\0"
+#define STRING_cyrl0 STR_c STR_y STR_r STR_l "\0"
+#define STRING_dash0 STR_d STR_a STR_s STR_h "\0"
+#define STRING_defaultignorablecodepoint0 STR_d STR_e STR_f STR_a STR_u STR_l STR_t STR_i STR_g STR_n STR_o STR_r STR_a STR_b STR_l STR_e STR_c STR_o STR_d STR_e STR_p STR_o STR_i STR_n STR_t "\0"
+#define STRING_dep0 STR_d STR_e STR_p "\0"
+#define STRING_deprecated0 STR_d STR_e STR_p STR_r STR_e STR_c STR_a STR_t STR_e STR_d "\0"
+#define STRING_deseret0 STR_d STR_e STR_s STR_e STR_r STR_e STR_t "\0"
+#define STRING_deva0 STR_d STR_e STR_v STR_a "\0"
+#define STRING_devanagari0 STR_d STR_e STR_v STR_a STR_n STR_a STR_g STR_a STR_r STR_i "\0"
+#define STRING_di0 STR_d STR_i "\0"
+#define STRING_dia0 STR_d STR_i STR_a "\0"
+#define STRING_diacritic0 STR_d STR_i STR_a STR_c STR_r STR_i STR_t STR_i STR_c "\0"
+#define STRING_diak0 STR_d STR_i STR_a STR_k "\0"
+#define STRING_divesakuru0 STR_d STR_i STR_v STR_e STR_s STR_a STR_k STR_u STR_r STR_u "\0"
+#define STRING_dogr0 STR_d STR_o STR_g STR_r "\0"
+#define STRING_dogra0 STR_d STR_o STR_g STR_r STR_a "\0"
+#define STRING_dsrt0 STR_d STR_s STR_r STR_t "\0"
+#define STRING_dupl0 STR_d STR_u STR_p STR_l "\0"
+#define STRING_duployan0 STR_d STR_u STR_p STR_l STR_o STR_y STR_a STR_n "\0"
+#define STRING_ebase0 STR_e STR_b STR_a STR_s STR_e "\0"
+#define STRING_ecomp0 STR_e STR_c STR_o STR_m STR_p "\0"
+#define STRING_egyp0 STR_e STR_g STR_y STR_p "\0"
+#define STRING_egyptianhieroglyphs0 STR_e STR_g STR_y STR_p STR_t STR_i STR_a STR_n STR_h STR_i STR_e STR_r STR_o STR_g STR_l STR_y STR_p STR_h STR_s "\0"
+#define STRING_elba0 STR_e STR_l STR_b STR_a "\0"
+#define STRING_elbasan0 STR_e STR_l STR_b STR_a STR_s STR_a STR_n "\0"
+#define STRING_elym0 STR_e STR_l STR_y STR_m "\0"
+#define STRING_elymaic0 STR_e STR_l STR_y STR_m STR_a STR_i STR_c "\0"
+#define STRING_emod0 STR_e STR_m STR_o STR_d "\0"
+#define STRING_emoji0 STR_e STR_m STR_o STR_j STR_i "\0"
+#define STRING_emojicomponent0 STR_e STR_m STR_o STR_j STR_i STR_c STR_o STR_m STR_p STR_o STR_n STR_e STR_n STR_t "\0"
+#define STRING_emojimodifier0 STR_e STR_m STR_o STR_j STR_i STR_m STR_o STR_d STR_i STR_f STR_i STR_e STR_r "\0"
+#define STRING_emojimodifierbase0 STR_e STR_m STR_o STR_j STR_i STR_m STR_o STR_d STR_i STR_f STR_i STR_e STR_r STR_b STR_a STR_s STR_e "\0"
+#define STRING_emojipresentation0 STR_e STR_m STR_o STR_j STR_i STR_p STR_r STR_e STR_s STR_e STR_n STR_t STR_a STR_t STR_i STR_o STR_n "\0"
+#define STRING_epres0 STR_e STR_p STR_r STR_e STR_s "\0"
+#define STRING_ethi0 STR_e STR_t STR_h STR_i "\0"
+#define STRING_ethiopic0 STR_e STR_t STR_h STR_i STR_o STR_p STR_i STR_c "\0"
+#define STRING_ext0 STR_e STR_x STR_t "\0"
+#define STRING_extendedpictographic0 STR_e STR_x STR_t STR_e STR_n STR_d STR_e STR_d STR_p STR_i STR_c STR_t STR_o STR_g STR_r STR_a STR_p STR_h STR_i STR_c "\0"
+#define STRING_extender0 STR_e STR_x STR_t STR_e STR_n STR_d STR_e STR_r "\0"
+#define STRING_extpict0 STR_e STR_x STR_t STR_p STR_i STR_c STR_t "\0"
+#define STRING_geor0 STR_g STR_e STR_o STR_r "\0"
+#define STRING_georgian0 STR_g STR_e STR_o STR_r STR_g STR_i STR_a STR_n "\0"
+#define STRING_glag0 STR_g STR_l STR_a STR_g "\0"
+#define STRING_glagolitic0 STR_g STR_l STR_a STR_g STR_o STR_l STR_i STR_t STR_i STR_c "\0"
+#define STRING_gong0 STR_g STR_o STR_n STR_g "\0"
+#define STRING_gonm0 STR_g STR_o STR_n STR_m "\0"
+#define STRING_goth0 STR_g STR_o STR_t STR_h "\0"
+#define STRING_gothic0 STR_g STR_o STR_t STR_h STR_i STR_c "\0"
+#define STRING_gran0 STR_g STR_r STR_a STR_n "\0"
+#define STRING_grantha0 STR_g STR_r STR_a STR_n STR_t STR_h STR_a "\0"
+#define STRING_graphemebase0 STR_g STR_r STR_a STR_p STR_h STR_e STR_m STR_e STR_b STR_a STR_s STR_e "\0"
+#define STRING_graphemeextend0 STR_g STR_r STR_a STR_p STR_h STR_e STR_m STR_e STR_e STR_x STR_t STR_e STR_n STR_d "\0"
+#define STRING_graphemelink0 STR_g STR_r STR_a STR_p STR_h STR_e STR_m STR_e STR_l STR_i STR_n STR_k "\0"
+#define STRING_grbase0 STR_g STR_r STR_b STR_a STR_s STR_e "\0"
+#define STRING_greek0 STR_g STR_r STR_e STR_e STR_k "\0"
+#define STRING_grek0 STR_g STR_r STR_e STR_k "\0"
+#define STRING_grext0 STR_g STR_r STR_e STR_x STR_t "\0"
+#define STRING_grlink0 STR_g STR_r STR_l STR_i STR_n STR_k "\0"
+#define STRING_gujarati0 STR_g STR_u STR_j STR_a STR_r STR_a STR_t STR_i "\0"
+#define STRING_gujr0 STR_g STR_u STR_j STR_r "\0"
+#define STRING_gunjalagondi0 STR_g STR_u STR_n STR_j STR_a STR_l STR_a STR_g STR_o STR_n STR_d STR_i "\0"
+#define STRING_gurmukhi0 STR_g STR_u STR_r STR_m STR_u STR_k STR_h STR_i "\0"
+#define STRING_guru0 STR_g STR_u STR_r STR_u "\0"
+#define STRING_han0 STR_h STR_a STR_n "\0"
+#define STRING_hang0 STR_h STR_a STR_n STR_g "\0"
+#define STRING_hangul0 STR_h STR_a STR_n STR_g STR_u STR_l "\0"
+#define STRING_hani0 STR_h STR_a STR_n STR_i "\0"
+#define STRING_hanifirohingya0 STR_h STR_a STR_n STR_i STR_f STR_i STR_r STR_o STR_h STR_i STR_n STR_g STR_y STR_a "\0"
+#define STRING_hano0 STR_h STR_a STR_n STR_o "\0"
+#define STRING_hanunoo0 STR_h STR_a STR_n STR_u STR_n STR_o STR_o "\0"
+#define STRING_hatr0 STR_h STR_a STR_t STR_r "\0"
+#define STRING_hatran0 STR_h STR_a STR_t STR_r STR_a STR_n "\0"
+#define STRING_hebr0 STR_h STR_e STR_b STR_r "\0"
+#define STRING_hebrew0 STR_h STR_e STR_b STR_r STR_e STR_w "\0"
+#define STRING_hex0 STR_h STR_e STR_x "\0"
+#define STRING_hexdigit0 STR_h STR_e STR_x STR_d STR_i STR_g STR_i STR_t "\0"
+#define STRING_hira0 STR_h STR_i STR_r STR_a "\0"
+#define STRING_hiragana0 STR_h STR_i STR_r STR_a STR_g STR_a STR_n STR_a "\0"
+#define STRING_hluw0 STR_h STR_l STR_u STR_w "\0"
+#define STRING_hmng0 STR_h STR_m STR_n STR_g "\0"
+#define STRING_hmnp0 STR_h STR_m STR_n STR_p "\0"
+#define STRING_hung0 STR_h STR_u STR_n STR_g "\0"
+#define STRING_idc0 STR_i STR_d STR_c "\0"
+#define STRING_idcontinue0 STR_i STR_d STR_c STR_o STR_n STR_t STR_i STR_n STR_u STR_e "\0"
+#define STRING_ideo0 STR_i STR_d STR_e STR_o "\0"
+#define STRING_ideographic0 STR_i STR_d STR_e STR_o STR_g STR_r STR_a STR_p STR_h STR_i STR_c "\0"
+#define STRING_ids0 STR_i STR_d STR_s "\0"
+#define STRING_idsb0 STR_i STR_d STR_s STR_b "\0"
+#define STRING_idsbinaryoperator0 STR_i STR_d STR_s STR_b STR_i STR_n STR_a STR_r STR_y STR_o STR_p STR_e STR_r STR_a STR_t STR_o STR_r "\0"
+#define STRING_idst0 STR_i STR_d STR_s STR_t "\0"
+#define STRING_idstart0 STR_i STR_d STR_s STR_t STR_a STR_r STR_t "\0"
+#define STRING_idstrinaryoperator0 STR_i STR_d STR_s STR_t STR_r STR_i STR_n STR_a STR_r STR_y STR_o STR_p STR_e STR_r STR_a STR_t STR_o STR_r "\0"
+#define STRING_imperialaramaic0 STR_i STR_m STR_p STR_e STR_r STR_i STR_a STR_l STR_a STR_r STR_a STR_m STR_a STR_i STR_c "\0"
+#define STRING_inherited0 STR_i STR_n STR_h STR_e STR_r STR_i STR_t STR_e STR_d "\0"
+#define STRING_inscriptionalpahlavi0 STR_i STR_n STR_s STR_c STR_r STR_i STR_p STR_t STR_i STR_o STR_n STR_a STR_l STR_p STR_a STR_h STR_l STR_a STR_v STR_i "\0"
+#define STRING_inscriptionalparthian0 STR_i STR_n STR_s STR_c STR_r STR_i STR_p STR_t STR_i STR_o STR_n STR_a STR_l STR_p STR_a STR_r STR_t STR_h STR_i STR_a STR_n "\0"
+#define STRING_ital0 STR_i STR_t STR_a STR_l "\0"
+#define STRING_java0 STR_j STR_a STR_v STR_a "\0"
+#define STRING_javanese0 STR_j STR_a STR_v STR_a STR_n STR_e STR_s STR_e "\0"
+#define STRING_joinc0 STR_j STR_o STR_i STR_n STR_c "\0"
+#define STRING_joincontrol0 STR_j STR_o STR_i STR_n STR_c STR_o STR_n STR_t STR_r STR_o STR_l "\0"
+#define STRING_kaithi0 STR_k STR_a STR_i STR_t STR_h STR_i "\0"
+#define STRING_kali0 STR_k STR_a STR_l STR_i "\0"
+#define STRING_kana0 STR_k STR_a STR_n STR_a "\0"
+#define STRING_kannada0 STR_k STR_a STR_n STR_n STR_a STR_d STR_a "\0"
+#define STRING_katakana0 STR_k STR_a STR_t STR_a STR_k STR_a STR_n STR_a "\0"
+#define STRING_kayahli0 STR_k STR_a STR_y STR_a STR_h STR_l STR_i "\0"
+#define STRING_khar0 STR_k STR_h STR_a STR_r "\0"
+#define STRING_kharoshthi0 STR_k STR_h STR_a STR_r STR_o STR_s STR_h STR_t STR_h STR_i "\0"
+#define STRING_khitansmallscript0 STR_k STR_h STR_i STR_t STR_a STR_n STR_s STR_m STR_a STR_l STR_l STR_s STR_c STR_r STR_i STR_p STR_t "\0"
+#define STRING_khmer0 STR_k STR_h STR_m STR_e STR_r "\0"
+#define STRING_khmr0 STR_k STR_h STR_m STR_r "\0"
+#define STRING_khoj0 STR_k STR_h STR_o STR_j "\0"
+#define STRING_khojki0 STR_k STR_h STR_o STR_j STR_k STR_i "\0"
+#define STRING_khudawadi0 STR_k STR_h STR_u STR_d STR_a STR_w STR_a STR_d STR_i "\0"
+#define STRING_kits0 STR_k STR_i STR_t STR_s "\0"
+#define STRING_knda0 STR_k STR_n STR_d STR_a "\0"
+#define STRING_kthi0 STR_k STR_t STR_h STR_i "\0"
+#define STRING_l0 STR_l "\0"
+#define STRING_l_AMPERSAND0 STR_l STR_AMPERSAND "\0"
+#define STRING_lana0 STR_l STR_a STR_n STR_a "\0"
+#define STRING_lao0 STR_l STR_a STR_o "\0"
+#define STRING_laoo0 STR_l STR_a STR_o STR_o "\0"
+#define STRING_latin0 STR_l STR_a STR_t STR_i STR_n "\0"
+#define STRING_latn0 STR_l STR_a STR_t STR_n "\0"
+#define STRING_lc0 STR_l STR_c "\0"
+#define STRING_lepc0 STR_l STR_e STR_p STR_c "\0"
+#define STRING_lepcha0 STR_l STR_e STR_p STR_c STR_h STR_a "\0"
+#define STRING_limb0 STR_l STR_i STR_m STR_b "\0"
+#define STRING_limbu0 STR_l STR_i STR_m STR_b STR_u "\0"
+#define STRING_lina0 STR_l STR_i STR_n STR_a "\0"
+#define STRING_linb0 STR_l STR_i STR_n STR_b "\0"
+#define STRING_lineara0 STR_l STR_i STR_n STR_e STR_a STR_r STR_a "\0"
+#define STRING_linearb0 STR_l STR_i STR_n STR_e STR_a STR_r STR_b "\0"
+#define STRING_lisu0 STR_l STR_i STR_s STR_u "\0"
+#define STRING_ll0 STR_l STR_l "\0"
+#define STRING_lm0 STR_l STR_m "\0"
+#define STRING_lo0 STR_l STR_o "\0"
+#define STRING_loe0 STR_l STR_o STR_e "\0"
+#define STRING_logicalorderexception0 STR_l STR_o STR_g STR_i STR_c STR_a STR_l STR_o STR_r STR_d STR_e STR_r STR_e STR_x STR_c STR_e STR_p STR_t STR_i STR_o STR_n "\0"
+#define STRING_lower0 STR_l STR_o STR_w STR_e STR_r "\0"
+#define STRING_lowercase0 STR_l STR_o STR_w STR_e STR_r STR_c STR_a STR_s STR_e "\0"
+#define STRING_lt0 STR_l STR_t "\0"
+#define STRING_lu0 STR_l STR_u "\0"
+#define STRING_lyci0 STR_l STR_y STR_c STR_i "\0"
+#define STRING_lycian0 STR_l STR_y STR_c STR_i STR_a STR_n "\0"
+#define STRING_lydi0 STR_l STR_y STR_d STR_i "\0"
+#define STRING_lydian0 STR_l STR_y STR_d STR_i STR_a STR_n "\0"
+#define STRING_m0 STR_m "\0"
+#define STRING_mahajani0 STR_m STR_a STR_h STR_a STR_j STR_a STR_n STR_i "\0"
+#define STRING_mahj0 STR_m STR_a STR_h STR_j "\0"
+#define STRING_maka0 STR_m STR_a STR_k STR_a "\0"
+#define STRING_makasar0 STR_m STR_a STR_k STR_a STR_s STR_a STR_r "\0"
+#define STRING_malayalam0 STR_m STR_a STR_l STR_a STR_y STR_a STR_l STR_a STR_m "\0"
+#define STRING_mand0 STR_m STR_a STR_n STR_d "\0"
+#define STRING_mandaic0 STR_m STR_a STR_n STR_d STR_a STR_i STR_c "\0"
+#define STRING_mani0 STR_m STR_a STR_n STR_i "\0"
+#define STRING_manichaean0 STR_m STR_a STR_n STR_i STR_c STR_h STR_a STR_e STR_a STR_n "\0"
+#define STRING_marc0 STR_m STR_a STR_r STR_c "\0"
+#define STRING_marchen0 STR_m STR_a STR_r STR_c STR_h STR_e STR_n "\0"
+#define STRING_masaramgondi0 STR_m STR_a STR_s STR_a STR_r STR_a STR_m STR_g STR_o STR_n STR_d STR_i "\0"
+#define STRING_math0 STR_m STR_a STR_t STR_h "\0"
+#define STRING_mc0 STR_m STR_c "\0"
+#define STRING_me0 STR_m STR_e "\0"
+#define STRING_medefaidrin0 STR_m STR_e STR_d STR_e STR_f STR_a STR_i STR_d STR_r STR_i STR_n "\0"
+#define STRING_medf0 STR_m STR_e STR_d STR_f "\0"
+#define STRING_meeteimayek0 STR_m STR_e STR_e STR_t STR_e STR_i STR_m STR_a STR_y STR_e STR_k "\0"
+#define STRING_mend0 STR_m STR_e STR_n STR_d "\0"
+#define STRING_mendekikakui0 STR_m STR_e STR_n STR_d STR_e STR_k STR_i STR_k STR_a STR_k STR_u STR_i "\0"
+#define STRING_merc0 STR_m STR_e STR_r STR_c "\0"
+#define STRING_mero0 STR_m STR_e STR_r STR_o "\0"
+#define STRING_meroiticcursive0 STR_m STR_e STR_r STR_o STR_i STR_t STR_i STR_c STR_c STR_u STR_r STR_s STR_i STR_v STR_e "\0"
+#define STRING_meroitichieroglyphs0 STR_m STR_e STR_r STR_o STR_i STR_t STR_i STR_c STR_h STR_i STR_e STR_r STR_o STR_g STR_l STR_y STR_p STR_h STR_s "\0"
+#define STRING_miao0 STR_m STR_i STR_a STR_o "\0"
+#define STRING_mlym0 STR_m STR_l STR_y STR_m "\0"
+#define STRING_mn0 STR_m STR_n "\0"
+#define STRING_modi0 STR_m STR_o STR_d STR_i "\0"
+#define STRING_mong0 STR_m STR_o STR_n STR_g "\0"
+#define STRING_mongolian0 STR_m STR_o STR_n STR_g STR_o STR_l STR_i STR_a STR_n "\0"
+#define STRING_mro0 STR_m STR_r STR_o "\0"
+#define STRING_mroo0 STR_m STR_r STR_o STR_o "\0"
+#define STRING_mtei0 STR_m STR_t STR_e STR_i "\0"
+#define STRING_mult0 STR_m STR_u STR_l STR_t "\0"
+#define STRING_multani0 STR_m STR_u STR_l STR_t STR_a STR_n STR_i "\0"
+#define STRING_myanmar0 STR_m STR_y STR_a STR_n STR_m STR_a STR_r "\0"
+#define STRING_mymr0 STR_m STR_y STR_m STR_r "\0"
+#define STRING_n0 STR_n "\0"
+#define STRING_nabataean0 STR_n STR_a STR_b STR_a STR_t STR_a STR_e STR_a STR_n "\0"
+#define STRING_nand0 STR_n STR_a STR_n STR_d "\0"
+#define STRING_nandinagari0 STR_n STR_a STR_n STR_d STR_i STR_n STR_a STR_g STR_a STR_r STR_i "\0"
+#define STRING_narb0 STR_n STR_a STR_r STR_b "\0"
+#define STRING_nbat0 STR_n STR_b STR_a STR_t "\0"
+#define STRING_nchar0 STR_n STR_c STR_h STR_a STR_r "\0"
+#define STRING_nd0 STR_n STR_d "\0"
+#define STRING_newa0 STR_n STR_e STR_w STR_a "\0"
+#define STRING_newtailue0 STR_n STR_e STR_w STR_t STR_a STR_i STR_l STR_u STR_e "\0"
+#define STRING_nko0 STR_n STR_k STR_o "\0"
+#define STRING_nkoo0 STR_n STR_k STR_o STR_o "\0"
+#define STRING_nl0 STR_n STR_l "\0"
+#define STRING_no0 STR_n STR_o "\0"
+#define STRING_noncharactercodepoint0 STR_n STR_o STR_n STR_c STR_h STR_a STR_r STR_a STR_c STR_t STR_e STR_r STR_c STR_o STR_d STR_e STR_p STR_o STR_i STR_n STR_t "\0"
+#define STRING_nshu0 STR_n STR_s STR_h STR_u "\0"
+#define STRING_nushu0 STR_n STR_u STR_s STR_h STR_u "\0"
+#define STRING_nyiakengpuachuehmong0 STR_n STR_y STR_i STR_a STR_k STR_e STR_n STR_g STR_p STR_u STR_a STR_c STR_h STR_u STR_e STR_h STR_m STR_o STR_n STR_g "\0"
+#define STRING_ogam0 STR_o STR_g STR_a STR_m "\0"
+#define STRING_ogham0 STR_o STR_g STR_h STR_a STR_m "\0"
+#define STRING_olchiki0 STR_o STR_l STR_c STR_h STR_i STR_k STR_i "\0"
+#define STRING_olck0 STR_o STR_l STR_c STR_k "\0"
+#define STRING_oldhungarian0 STR_o STR_l STR_d STR_h STR_u STR_n STR_g STR_a STR_r STR_i STR_a STR_n "\0"
+#define STRING_olditalic0 STR_o STR_l STR_d STR_i STR_t STR_a STR_l STR_i STR_c "\0"
+#define STRING_oldnortharabian0 STR_o STR_l STR_d STR_n STR_o STR_r STR_t STR_h STR_a STR_r STR_a STR_b STR_i STR_a STR_n "\0"
+#define STRING_oldpermic0 STR_o STR_l STR_d STR_p STR_e STR_r STR_m STR_i STR_c "\0"
+#define STRING_oldpersian0 STR_o STR_l STR_d STR_p STR_e STR_r STR_s STR_i STR_a STR_n "\0"
+#define STRING_oldsogdian0 STR_o STR_l STR_d STR_s STR_o STR_g STR_d STR_i STR_a STR_n "\0"
+#define STRING_oldsoutharabian0 STR_o STR_l STR_d STR_s STR_o STR_u STR_t STR_h STR_a STR_r STR_a STR_b STR_i STR_a STR_n "\0"
+#define STRING_oldturkic0 STR_o STR_l STR_d STR_t STR_u STR_r STR_k STR_i STR_c "\0"
+#define STRING_olduyghur0 STR_o STR_l STR_d STR_u STR_y STR_g STR_h STR_u STR_r "\0"
+#define STRING_oriya0 STR_o STR_r STR_i STR_y STR_a "\0"
+#define STRING_orkh0 STR_o STR_r STR_k STR_h "\0"
+#define STRING_orya0 STR_o STR_r STR_y STR_a "\0"
+#define STRING_osage0 STR_o STR_s STR_a STR_g STR_e "\0"
+#define STRING_osge0 STR_o STR_s STR_g STR_e "\0"
+#define STRING_osma0 STR_o STR_s STR_m STR_a "\0"
+#define STRING_osmanya0 STR_o STR_s STR_m STR_a STR_n STR_y STR_a "\0"
+#define STRING_ougr0 STR_o STR_u STR_g STR_r "\0"
+#define STRING_p0 STR_p "\0"
+#define STRING_pahawhhmong0 STR_p STR_a STR_h STR_a STR_w STR_h STR_h STR_m STR_o STR_n STR_g "\0"
+#define STRING_palm0 STR_p STR_a STR_l STR_m "\0"
+#define STRING_palmyrene0 STR_p STR_a STR_l STR_m STR_y STR_r STR_e STR_n STR_e "\0"
+#define STRING_patsyn0 STR_p STR_a STR_t STR_s STR_y STR_n "\0"
+#define STRING_patternsyntax0 STR_p STR_a STR_t STR_t STR_e STR_r STR_n STR_s STR_y STR_n STR_t STR_a STR_x "\0"
+#define STRING_patternwhitespace0 STR_p STR_a STR_t STR_t STR_e STR_r STR_n STR_w STR_h STR_i STR_t STR_e STR_s STR_p STR_a STR_c STR_e "\0"
+#define STRING_patws0 STR_p STR_a STR_t STR_w STR_s "\0"
+#define STRING_pauc0 STR_p STR_a STR_u STR_c "\0"
+#define STRING_paucinhau0 STR_p STR_a STR_u STR_c STR_i STR_n STR_h STR_a STR_u "\0"
+#define STRING_pc0 STR_p STR_c "\0"
+#define STRING_pcm0 STR_p STR_c STR_m "\0"
+#define STRING_pd0 STR_p STR_d "\0"
+#define STRING_pe0 STR_p STR_e "\0"
+#define STRING_perm0 STR_p STR_e STR_r STR_m "\0"
+#define STRING_pf0 STR_p STR_f "\0"
+#define STRING_phag0 STR_p STR_h STR_a STR_g "\0"
+#define STRING_phagspa0 STR_p STR_h STR_a STR_g STR_s STR_p STR_a "\0"
+#define STRING_phli0 STR_p STR_h STR_l STR_i "\0"
+#define STRING_phlp0 STR_p STR_h STR_l STR_p "\0"
+#define STRING_phnx0 STR_p STR_h STR_n STR_x "\0"
+#define STRING_phoenician0 STR_p STR_h STR_o STR_e STR_n STR_i STR_c STR_i STR_a STR_n "\0"
+#define STRING_pi0 STR_p STR_i "\0"
+#define STRING_plrd0 STR_p STR_l STR_r STR_d "\0"
+#define STRING_po0 STR_p STR_o "\0"
+#define STRING_prependedconcatenationmark0 STR_p STR_r STR_e STR_p STR_e STR_n STR_d STR_e STR_d STR_c STR_o STR_n STR_c STR_a STR_t STR_e STR_n STR_a STR_t STR_i STR_o STR_n STR_m STR_a STR_r STR_k "\0"
+#define STRING_prti0 STR_p STR_r STR_t STR_i "\0"
+#define STRING_ps0 STR_p STR_s "\0"
+#define STRING_psalterpahlavi0 STR_p STR_s STR_a STR_l STR_t STR_e STR_r STR_p STR_a STR_h STR_l STR_a STR_v STR_i "\0"
+#define STRING_qaac0 STR_q STR_a STR_a STR_c "\0"
+#define STRING_qaai0 STR_q STR_a STR_a STR_i "\0"
+#define STRING_qmark0 STR_q STR_m STR_a STR_r STR_k "\0"
+#define STRING_quotationmark0 STR_q STR_u STR_o STR_t STR_a STR_t STR_i STR_o STR_n STR_m STR_a STR_r STR_k "\0"
+#define STRING_radical0 STR_r STR_a STR_d STR_i STR_c STR_a STR_l "\0"
+#define STRING_regionalindicator0 STR_r STR_e STR_g STR_i STR_o STR_n STR_a STR_l STR_i STR_n STR_d STR_i STR_c STR_a STR_t STR_o STR_r "\0"
+#define STRING_rejang0 STR_r STR_e STR_j STR_a STR_n STR_g "\0"
+#define STRING_ri0 STR_r STR_i "\0"
+#define STRING_rjng0 STR_r STR_j STR_n STR_g "\0"
+#define STRING_rohg0 STR_r STR_o STR_h STR_g "\0"
+#define STRING_runic0 STR_r STR_u STR_n STR_i STR_c "\0"
+#define STRING_runr0 STR_r STR_u STR_n STR_r "\0"
+#define STRING_s0 STR_s "\0"
+#define STRING_samaritan0 STR_s STR_a STR_m STR_a STR_r STR_i STR_t STR_a STR_n "\0"
+#define STRING_samr0 STR_s STR_a STR_m STR_r "\0"
+#define STRING_sarb0 STR_s STR_a STR_r STR_b "\0"
+#define STRING_saur0 STR_s STR_a STR_u STR_r "\0"
+#define STRING_saurashtra0 STR_s STR_a STR_u STR_r STR_a STR_s STR_h STR_t STR_r STR_a "\0"
+#define STRING_sc0 STR_s STR_c "\0"
+#define STRING_sd0 STR_s STR_d "\0"
+#define STRING_sentenceterminal0 STR_s STR_e STR_n STR_t STR_e STR_n STR_c STR_e STR_t STR_e STR_r STR_m STR_i STR_n STR_a STR_l "\0"
+#define STRING_sgnw0 STR_s STR_g STR_n STR_w "\0"
+#define STRING_sharada0 STR_s STR_h STR_a STR_r STR_a STR_d STR_a "\0"
+#define STRING_shavian0 STR_s STR_h STR_a STR_v STR_i STR_a STR_n "\0"
+#define STRING_shaw0 STR_s STR_h STR_a STR_w "\0"
+#define STRING_shrd0 STR_s STR_h STR_r STR_d "\0"
+#define STRING_sidd0 STR_s STR_i STR_d STR_d "\0"
+#define STRING_siddham0 STR_s STR_i STR_d STR_d STR_h STR_a STR_m "\0"
+#define STRING_signwriting0 STR_s STR_i STR_g STR_n STR_w STR_r STR_i STR_t STR_i STR_n STR_g "\0"
+#define STRING_sind0 STR_s STR_i STR_n STR_d "\0"
+#define STRING_sinh0 STR_s STR_i STR_n STR_h "\0"
+#define STRING_sinhala0 STR_s STR_i STR_n STR_h STR_a STR_l STR_a "\0"
+#define STRING_sk0 STR_s STR_k "\0"
+#define STRING_sm0 STR_s STR_m "\0"
+#define STRING_so0 STR_s STR_o "\0"
+#define STRING_softdotted0 STR_s STR_o STR_f STR_t STR_d STR_o STR_t STR_t STR_e STR_d "\0"
+#define STRING_sogd0 STR_s STR_o STR_g STR_d "\0"
+#define STRING_sogdian0 STR_s STR_o STR_g STR_d STR_i STR_a STR_n "\0"
+#define STRING_sogo0 STR_s STR_o STR_g STR_o "\0"
+#define STRING_sora0 STR_s STR_o STR_r STR_a "\0"
+#define STRING_sorasompeng0 STR_s STR_o STR_r STR_a STR_s STR_o STR_m STR_p STR_e STR_n STR_g "\0"
+#define STRING_soyo0 STR_s STR_o STR_y STR_o "\0"
+#define STRING_soyombo0 STR_s STR_o STR_y STR_o STR_m STR_b STR_o "\0"
+#define STRING_space0 STR_s STR_p STR_a STR_c STR_e "\0"
+#define STRING_sterm0 STR_s STR_t STR_e STR_r STR_m "\0"
+#define STRING_sund0 STR_s STR_u STR_n STR_d "\0"
+#define STRING_sundanese0 STR_s STR_u STR_n STR_d STR_a STR_n STR_e STR_s STR_e "\0"
+#define STRING_sylo0 STR_s STR_y STR_l STR_o "\0"
+#define STRING_sylotinagri0 STR_s STR_y STR_l STR_o STR_t STR_i STR_n STR_a STR_g STR_r STR_i "\0"
+#define STRING_syrc0 STR_s STR_y STR_r STR_c "\0"
+#define STRING_syriac0 STR_s STR_y STR_r STR_i STR_a STR_c "\0"
+#define STRING_tagalog0 STR_t STR_a STR_g STR_a STR_l STR_o STR_g "\0"
+#define STRING_tagb0 STR_t STR_a STR_g STR_b "\0"
+#define STRING_tagbanwa0 STR_t STR_a STR_g STR_b STR_a STR_n STR_w STR_a "\0"
+#define STRING_taile0 STR_t STR_a STR_i STR_l STR_e "\0"
+#define STRING_taitham0 STR_t STR_a STR_i STR_t STR_h STR_a STR_m "\0"
+#define STRING_taiviet0 STR_t STR_a STR_i STR_v STR_i STR_e STR_t "\0"
+#define STRING_takr0 STR_t STR_a STR_k STR_r "\0"
+#define STRING_takri0 STR_t STR_a STR_k STR_r STR_i "\0"
+#define STRING_tale0 STR_t STR_a STR_l STR_e "\0"
+#define STRING_talu0 STR_t STR_a STR_l STR_u "\0"
+#define STRING_tamil0 STR_t STR_a STR_m STR_i STR_l "\0"
+#define STRING_taml0 STR_t STR_a STR_m STR_l "\0"
+#define STRING_tang0 STR_t STR_a STR_n STR_g "\0"
+#define STRING_tangsa0 STR_t STR_a STR_n STR_g STR_s STR_a "\0"
+#define STRING_tangut0 STR_t STR_a STR_n STR_g STR_u STR_t "\0"
+#define STRING_tavt0 STR_t STR_a STR_v STR_t "\0"
+#define STRING_telu0 STR_t STR_e STR_l STR_u "\0"
+#define STRING_telugu0 STR_t STR_e STR_l STR_u STR_g STR_u "\0"
+#define STRING_term0 STR_t STR_e STR_r STR_m "\0"
+#define STRING_terminalpunctuation0 STR_t STR_e STR_r STR_m STR_i STR_n STR_a STR_l STR_p STR_u STR_n STR_c STR_t STR_u STR_a STR_t STR_i STR_o STR_n "\0"
+#define STRING_tfng0 STR_t STR_f STR_n STR_g "\0"
+#define STRING_tglg0 STR_t STR_g STR_l STR_g "\0"
+#define STRING_thaa0 STR_t STR_h STR_a STR_a "\0"
+#define STRING_thaana0 STR_t STR_h STR_a STR_a STR_n STR_a "\0"
+#define STRING_thai0 STR_t STR_h STR_a STR_i "\0"
+#define STRING_tibetan0 STR_t STR_i STR_b STR_e STR_t STR_a STR_n "\0"
+#define STRING_tibt0 STR_t STR_i STR_b STR_t "\0"
+#define STRING_tifinagh0 STR_t STR_i STR_f STR_i STR_n STR_a STR_g STR_h "\0"
+#define STRING_tirh0 STR_t STR_i STR_r STR_h "\0"
+#define STRING_tirhuta0 STR_t STR_i STR_r STR_h STR_u STR_t STR_a "\0"
+#define STRING_tnsa0 STR_t STR_n STR_s STR_a "\0"
+#define STRING_toto0 STR_t STR_o STR_t STR_o "\0"
+#define STRING_ugar0 STR_u STR_g STR_a STR_r "\0"
+#define STRING_ugaritic0 STR_u STR_g STR_a STR_r STR_i STR_t STR_i STR_c "\0"
+#define STRING_uideo0 STR_u STR_i STR_d STR_e STR_o "\0"
+#define STRING_unifiedideograph0 STR_u STR_n STR_i STR_f STR_i STR_e STR_d STR_i STR_d STR_e STR_o STR_g STR_r STR_a STR_p STR_h "\0"
+#define STRING_unknown0 STR_u STR_n STR_k STR_n STR_o STR_w STR_n "\0"
+#define STRING_upper0 STR_u STR_p STR_p STR_e STR_r "\0"
+#define STRING_uppercase0 STR_u STR_p STR_p STR_e STR_r STR_c STR_a STR_s STR_e "\0"
+#define STRING_vai0 STR_v STR_a STR_i "\0"
+#define STRING_vaii0 STR_v STR_a STR_i STR_i "\0"
+#define STRING_variationselector0 STR_v STR_a STR_r STR_i STR_a STR_t STR_i STR_o STR_n STR_s STR_e STR_l STR_e STR_c STR_t STR_o STR_r "\0"
+#define STRING_vith0 STR_v STR_i STR_t STR_h "\0"
+#define STRING_vithkuqi0 STR_v STR_i STR_t STR_h STR_k STR_u STR_q STR_i "\0"
+#define STRING_vs0 STR_v STR_s "\0"
+#define STRING_wancho0 STR_w STR_a STR_n STR_c STR_h STR_o "\0"
+#define STRING_wara0 STR_w STR_a STR_r STR_a "\0"
+#define STRING_warangciti0 STR_w STR_a STR_r STR_a STR_n STR_g STR_c STR_i STR_t STR_i "\0"
+#define STRING_wcho0 STR_w STR_c STR_h STR_o "\0"
+#define STRING_whitespace0 STR_w STR_h STR_i STR_t STR_e STR_s STR_p STR_a STR_c STR_e "\0"
+#define STRING_wspace0 STR_w STR_s STR_p STR_a STR_c STR_e "\0"
+#define STRING_xan0 STR_x STR_a STR_n "\0"
+#define STRING_xidc0 STR_x STR_i STR_d STR_c "\0"
+#define STRING_xidcontinue0 STR_x STR_i STR_d STR_c STR_o STR_n STR_t STR_i STR_n STR_u STR_e "\0"
+#define STRING_xids0 STR_x STR_i STR_d STR_s "\0"
+#define STRING_xidstart0 STR_x STR_i STR_d STR_s STR_t STR_a STR_r STR_t "\0"
+#define STRING_xpeo0 STR_x STR_p STR_e STR_o "\0"
+#define STRING_xps0 STR_x STR_p STR_s "\0"
+#define STRING_xsp0 STR_x STR_s STR_p "\0"
+#define STRING_xsux0 STR_x STR_s STR_u STR_x "\0"
+#define STRING_xuc0 STR_x STR_u STR_c "\0"
+#define STRING_xwd0 STR_x STR_w STR_d "\0"
+#define STRING_yezi0 STR_y STR_e STR_z STR_i "\0"
+#define STRING_yezidi0 STR_y STR_e STR_z STR_i STR_d STR_i "\0"
+#define STRING_yi0 STR_y STR_i "\0"
+#define STRING_yiii0 STR_y STR_i STR_i STR_i "\0"
+#define STRING_z0 STR_z "\0"
+#define STRING_zanabazarsquare0 STR_z STR_a STR_n STR_a STR_b STR_a STR_z STR_a STR_r STR_s STR_q STR_u STR_a STR_r STR_e "\0"
+#define STRING_zanb0 STR_z STR_a STR_n STR_b "\0"
+#define STRING_zinh0 STR_z STR_i STR_n STR_h "\0"
+#define STRING_zl0 STR_z STR_l "\0"
+#define STRING_zp0 STR_z STR_p "\0"
+#define STRING_zs0 STR_z STR_s "\0"
+#define STRING_zyyy0 STR_z STR_y STR_y STR_y "\0"
+#define STRING_zzzz0 STR_z STR_z STR_z STR_z "\0"
+
+const char PRIV(utt_names)[] =
+  STRING_adlam0
+  STRING_adlm0
+  STRING_aghb0
+  STRING_ahex0
+  STRING_ahom0
+  STRING_alpha0
+  STRING_alphabetic0
+  STRING_anatolianhieroglyphs0
+  STRING_any0
+  STRING_arab0
+  STRING_arabic0
+  STRING_armenian0
+  STRING_armi0
+  STRING_armn0
+  STRING_ascii0
+  STRING_asciihexdigit0
+  STRING_avestan0
+  STRING_avst0
+  STRING_bali0
+  STRING_balinese0
+  STRING_bamu0
+  STRING_bamum0
+  STRING_bass0
+  STRING_bassavah0
+  STRING_batak0
+  STRING_batk0
+  STRING_beng0
+  STRING_bengali0
+  STRING_bhaiksuki0
+  STRING_bhks0
+  STRING_bidial0
+  STRING_bidian0
+  STRING_bidib0
+  STRING_bidibn0
+  STRING_bidic0
+  STRING_bidicontrol0
+  STRING_bidics0
+  STRING_bidien0
+  STRING_bidies0
+  STRING_bidiet0
+  STRING_bidifsi0
+  STRING_bidil0
+  STRING_bidilre0
+  STRING_bidilri0
+  STRING_bidilro0
+  STRING_bidim0
+  STRING_bidimirrored0
+  STRING_bidinsm0
+  STRING_bidion0
+  STRING_bidipdf0
+  STRING_bidipdi0
+  STRING_bidir0
+  STRING_bidirle0
+  STRING_bidirli0
+  STRING_bidirlo0
+  STRING_bidis0
+  STRING_bidiws0
+  STRING_bopo0
+  STRING_bopomofo0
+  STRING_brah0
+  STRING_brahmi0
+  STRING_brai0
+  STRING_braille0
+  STRING_bugi0
+  STRING_buginese0
+  STRING_buhd0
+  STRING_buhid0
+  STRING_c0
+  STRING_cakm0
+  STRING_canadianaboriginal0
+  STRING_cans0
+  STRING_cari0
+  STRING_carian0
+  STRING_cased0
+  STRING_caseignorable0
+  STRING_caucasianalbanian0
+  STRING_cc0
+  STRING_cf0
+  STRING_chakma0
+  STRING_cham0
+  STRING_changeswhencasefolded0
+  STRING_changeswhencasemapped0
+  STRING_changeswhenlowercased0
+  STRING_changeswhentitlecased0
+  STRING_changeswhenuppercased0
+  STRING_cher0
+  STRING_cherokee0
+  STRING_chorasmian0
+  STRING_chrs0
+  STRING_ci0
+  STRING_cn0
+  STRING_co0
+  STRING_common0
+  STRING_copt0
+  STRING_coptic0
+  STRING_cpmn0
+  STRING_cprt0
+  STRING_cs0
+  STRING_cuneiform0
+  STRING_cwcf0
+  STRING_cwcm0
+  STRING_cwl0
+  STRING_cwt0
+  STRING_cwu0
+  STRING_cypriot0
+  STRING_cyprominoan0
+  STRING_cyrillic0
+  STRING_cyrl0
+  STRING_dash0
+  STRING_defaultignorablecodepoint0
+  STRING_dep0
+  STRING_deprecated0
+  STRING_deseret0
+  STRING_deva0
+  STRING_devanagari0
+  STRING_di0
+  STRING_dia0
+  STRING_diacritic0
+  STRING_diak0
+  STRING_divesakuru0
+  STRING_dogr0
+  STRING_dogra0
+  STRING_dsrt0
+  STRING_dupl0
+  STRING_duployan0
+  STRING_ebase0
+  STRING_ecomp0
+  STRING_egyp0
+  STRING_egyptianhieroglyphs0
+  STRING_elba0
+  STRING_elbasan0
+  STRING_elym0
+  STRING_elymaic0
+  STRING_emod0
+  STRING_emoji0
+  STRING_emojicomponent0
+  STRING_emojimodifier0
+  STRING_emojimodifierbase0
+  STRING_emojipresentation0
+  STRING_epres0
+  STRING_ethi0
+  STRING_ethiopic0
+  STRING_ext0
+  STRING_extendedpictographic0
+  STRING_extender0
+  STRING_extpict0
+  STRING_geor0
+  STRING_georgian0
+  STRING_glag0
+  STRING_glagolitic0
+  STRING_gong0
+  STRING_gonm0
+  STRING_goth0
+  STRING_gothic0
+  STRING_gran0
+  STRING_grantha0
+  STRING_graphemebase0
+  STRING_graphemeextend0
+  STRING_graphemelink0
+  STRING_grbase0
+  STRING_greek0
+  STRING_grek0
+  STRING_grext0
+  STRING_grlink0
+  STRING_gujarati0
+  STRING_gujr0
+  STRING_gunjalagondi0
+  STRING_gurmukhi0
+  STRING_guru0
+  STRING_han0
+  STRING_hang0
+  STRING_hangul0
+  STRING_hani0
+  STRING_hanifirohingya0
+  STRING_hano0
+  STRING_hanunoo0
+  STRING_hatr0
+  STRING_hatran0
+  STRING_hebr0
+  STRING_hebrew0
+  STRING_hex0
+  STRING_hexdigit0
+  STRING_hira0
+  STRING_hiragana0
+  STRING_hluw0
+  STRING_hmng0
+  STRING_hmnp0
+  STRING_hung0
+  STRING_idc0
+  STRING_idcontinue0
+  STRING_ideo0
+  STRING_ideographic0
+  STRING_ids0
+  STRING_idsb0
+  STRING_idsbinaryoperator0
+  STRING_idst0
+  STRING_idstart0
+  STRING_idstrinaryoperator0
+  STRING_imperialaramaic0
+  STRING_inherited0
+  STRING_inscriptionalpahlavi0
+  STRING_inscriptionalparthian0
+  STRING_ital0
+  STRING_java0
+  STRING_javanese0
+  STRING_joinc0
+  STRING_joincontrol0
+  STRING_kaithi0
+  STRING_kali0
+  STRING_kana0
+  STRING_kannada0
+  STRING_katakana0
+  STRING_kayahli0
+  STRING_khar0
+  STRING_kharoshthi0
+  STRING_khitansmallscript0
+  STRING_khmer0
+  STRING_khmr0
+  STRING_khoj0
+  STRING_khojki0
+  STRING_khudawadi0
+  STRING_kits0
+  STRING_knda0
+  STRING_kthi0
+  STRING_l0
+  STRING_l_AMPERSAND0
+  STRING_lana0
+  STRING_lao0
+  STRING_laoo0
+  STRING_latin0
+  STRING_latn0
+  STRING_lc0
+  STRING_lepc0
+  STRING_lepcha0
+  STRING_limb0
+  STRING_limbu0
+  STRING_lina0
+  STRING_linb0
+  STRING_lineara0
+  STRING_linearb0
+  STRING_lisu0
+  STRING_ll0
+  STRING_lm0
+  STRING_lo0
+  STRING_loe0
+  STRING_logicalorderexception0
+  STRING_lower0
+  STRING_lowercase0
+  STRING_lt0
+  STRING_lu0
+  STRING_lyci0
+  STRING_lycian0
+  STRING_lydi0
+  STRING_lydian0
+  STRING_m0
+  STRING_mahajani0
+  STRING_mahj0
+  STRING_maka0
+  STRING_makasar0
+  STRING_malayalam0
+  STRING_mand0
+  STRING_mandaic0
+  STRING_mani0
+  STRING_manichaean0
+  STRING_marc0
+  STRING_marchen0
+  STRING_masaramgondi0
+  STRING_math0
+  STRING_mc0
+  STRING_me0
+  STRING_medefaidrin0
+  STRING_medf0
+  STRING_meeteimayek0
+  STRING_mend0
+  STRING_mendekikakui0
+  STRING_merc0
+  STRING_mero0
+  STRING_meroiticcursive0
+  STRING_meroitichieroglyphs0
+  STRING_miao0
+  STRING_mlym0
+  STRING_mn0
+  STRING_modi0
+  STRING_mong0
+  STRING_mongolian0
+  STRING_mro0
+  STRING_mroo0
+  STRING_mtei0
+  STRING_mult0
+  STRING_multani0
+  STRING_myanmar0
+  STRING_mymr0
+  STRING_n0
+  STRING_nabataean0
+  STRING_nand0
+  STRING_nandinagari0
+  STRING_narb0
+  STRING_nbat0
+  STRING_nchar0
+  STRING_nd0
+  STRING_newa0
+  STRING_newtailue0
+  STRING_nko0
+  STRING_nkoo0
+  STRING_nl0
+  STRING_no0
+  STRING_noncharactercodepoint0
+  STRING_nshu0
+  STRING_nushu0
+  STRING_nyiakengpuachuehmong0
+  STRING_ogam0
+  STRING_ogham0
+  STRING_olchiki0
+  STRING_olck0
+  STRING_oldhungarian0
+  STRING_olditalic0
+  STRING_oldnortharabian0
+  STRING_oldpermic0
+  STRING_oldpersian0
+  STRING_oldsogdian0
+  STRING_oldsoutharabian0
+  STRING_oldturkic0
+  STRING_olduyghur0
+  STRING_oriya0
+  STRING_orkh0
+  STRING_orya0
+  STRING_osage0
+  STRING_osge0
+  STRING_osma0
+  STRING_osmanya0
+  STRING_ougr0
+  STRING_p0
+  STRING_pahawhhmong0
+  STRING_palm0
+  STRING_palmyrene0
+  STRING_patsyn0
+  STRING_patternsyntax0
+  STRING_patternwhitespace0
+  STRING_patws0
+  STRING_pauc0
+  STRING_paucinhau0
+  STRING_pc0
+  STRING_pcm0
+  STRING_pd0
+  STRING_pe0
+  STRING_perm0
+  STRING_pf0
+  STRING_phag0
+  STRING_phagspa0
+  STRING_phli0
+  STRING_phlp0
+  STRING_phnx0
+  STRING_phoenician0
+  STRING_pi0
+  STRING_plrd0
+  STRING_po0
+  STRING_prependedconcatenationmark0
+  STRING_prti0
+  STRING_ps0
+  STRING_psalterpahlavi0
+  STRING_qaac0
+  STRING_qaai0
+  STRING_qmark0
+  STRING_quotationmark0
+  STRING_radical0
+  STRING_regionalindicator0
+  STRING_rejang0
+  STRING_ri0
+  STRING_rjng0
+  STRING_rohg0
+  STRING_runic0
+  STRING_runr0
+  STRING_s0
+  STRING_samaritan0
+  STRING_samr0
+  STRING_sarb0
+  STRING_saur0
+  STRING_saurashtra0
+  STRING_sc0
+  STRING_sd0
+  STRING_sentenceterminal0
+  STRING_sgnw0
+  STRING_sharada0
+  STRING_shavian0
+  STRING_shaw0
+  STRING_shrd0
+  STRING_sidd0
+  STRING_siddham0
+  STRING_signwriting0
+  STRING_sind0
+  STRING_sinh0
+  STRING_sinhala0
+  STRING_sk0
+  STRING_sm0
+  STRING_so0
+  STRING_softdotted0
+  STRING_sogd0
+  STRING_sogdian0
+  STRING_sogo0
+  STRING_sora0
+  STRING_sorasompeng0
+  STRING_soyo0
+  STRING_soyombo0
+  STRING_space0
+  STRING_sterm0
+  STRING_sund0
+  STRING_sundanese0
+  STRING_sylo0
+  STRING_sylotinagri0
+  STRING_syrc0
+  STRING_syriac0
+  STRING_tagalog0
+  STRING_tagb0
+  STRING_tagbanwa0
+  STRING_taile0
+  STRING_taitham0
+  STRING_taiviet0
+  STRING_takr0
+  STRING_takri0
+  STRING_tale0
+  STRING_talu0
+  STRING_tamil0
+  STRING_taml0
+  STRING_tang0
+  STRING_tangsa0
+  STRING_tangut0
+  STRING_tavt0
+  STRING_telu0
+  STRING_telugu0
+  STRING_term0
+  STRING_terminalpunctuation0
+  STRING_tfng0
+  STRING_tglg0
+  STRING_thaa0
+  STRING_thaana0
+  STRING_thai0
+  STRING_tibetan0
+  STRING_tibt0
+  STRING_tifinagh0
+  STRING_tirh0
+  STRING_tirhuta0
+  STRING_tnsa0
+  STRING_toto0
+  STRING_ugar0
+  STRING_ugaritic0
+  STRING_uideo0
+  STRING_unifiedideograph0
+  STRING_unknown0
+  STRING_upper0
+  STRING_uppercase0
+  STRING_vai0
+  STRING_vaii0
+  STRING_variationselector0
+  STRING_vith0
+  STRING_vithkuqi0
+  STRING_vs0
+  STRING_wancho0
+  STRING_wara0
+  STRING_warangciti0
+  STRING_wcho0
+  STRING_whitespace0
+  STRING_wspace0
+  STRING_xan0
+  STRING_xidc0
+  STRING_xidcontinue0
+  STRING_xids0
+  STRING_xidstart0
+  STRING_xpeo0
+  STRING_xps0
+  STRING_xsp0
+  STRING_xsux0
+  STRING_xuc0
+  STRING_xwd0
+  STRING_yezi0
+  STRING_yezidi0
+  STRING_yi0
+  STRING_yiii0
+  STRING_z0
+  STRING_zanabazarsquare0
+  STRING_zanb0
+  STRING_zinh0
+  STRING_zl0
+  STRING_zp0
+  STRING_zs0
+  STRING_zyyy0
+  STRING_zzzz0;
+
+const ucp_type_table PRIV(utt)[] = {
+  {   0, PT_SCX, ucp_Adlam },
+  {   6, PT_SCX, ucp_Adlam },
+  {  11, PT_SC, ucp_Caucasian_Albanian },
+  {  16, PT_BOOL, ucp_ASCII_Hex_Digit },
+  {  21, PT_SC, ucp_Ahom },
+  {  26, PT_BOOL, ucp_Alphabetic },
+  {  32, PT_BOOL, ucp_Alphabetic },
+  {  43, PT_SC, ucp_Anatolian_Hieroglyphs },
+  {  64, PT_ANY, 0 },
+  {  68, PT_SCX, ucp_Arabic },
+  {  73, PT_SCX, ucp_Arabic },
+  {  80, PT_SC, ucp_Armenian },
+  {  89, PT_SC, ucp_Imperial_Aramaic },
+  {  94, PT_SC, ucp_Armenian },
+  {  99, PT_BOOL, ucp_ASCII },
+  { 105, PT_BOOL, ucp_ASCII_Hex_Digit },
+  { 119, PT_SC, ucp_Avestan },
+  { 127, PT_SC, ucp_Avestan },
+  { 132, PT_SC, ucp_Balinese },
+  { 137, PT_SC, ucp_Balinese },
+  { 146, PT_SC, ucp_Bamum },
+  { 151, PT_SC, ucp_Bamum },
+  { 157, PT_SC, ucp_Bassa_Vah },
+  { 162, PT_SC, ucp_Bassa_Vah },
+  { 171, PT_SC, ucp_Batak },
+  { 177, PT_SC, ucp_Batak },
+  { 182, PT_SCX, ucp_Bengali },
+  { 187, PT_SCX, ucp_Bengali },
+  { 195, PT_SC, ucp_Bhaiksuki },
+  { 205, PT_SC, ucp_Bhaiksuki },
+  { 210, PT_BIDICL, ucp_bidiAL },
+  { 217, PT_BIDICL, ucp_bidiAN },
+  { 224, PT_BIDICL, ucp_bidiB },
+  { 230, PT_BIDICL, ucp_bidiBN },
+  { 237, PT_BOOL, ucp_Bidi_Control },
+  { 243, PT_BOOL, ucp_Bidi_Control },
+  { 255, PT_BIDICL, ucp_bidiCS },
+  { 262, PT_BIDICL, ucp_bidiEN },
+  { 269, PT_BIDICL, ucp_bidiES },
+  { 276, PT_BIDICL, ucp_bidiET },
+  { 283, PT_BIDICL, ucp_bidiFSI },
+  { 291, PT_BIDICL, ucp_bidiL },
+  { 297, PT_BIDICL, ucp_bidiLRE },
+  { 305, PT_BIDICL, ucp_bidiLRI },
+  { 313, PT_BIDICL, ucp_bidiLRO },
+  { 321, PT_BOOL, ucp_Bidi_Mirrored },
+  { 327, PT_BOOL, ucp_Bidi_Mirrored },
+  { 340, PT_BIDICL, ucp_bidiNSM },
+  { 348, PT_BIDICL, ucp_bidiON },
+  { 355, PT_BIDICL, ucp_bidiPDF },
+  { 363, PT_BIDICL, ucp_bidiPDI },
+  { 371, PT_BIDICL, ucp_bidiR },
+  { 377, PT_BIDICL, ucp_bidiRLE },
+  { 385, PT_BIDICL, ucp_bidiRLI },
+  { 393, PT_BIDICL, ucp_bidiRLO },
+  { 401, PT_BIDICL, ucp_bidiS },
+  { 407, PT_BIDICL, ucp_bidiWS },
+  { 414, PT_SCX, ucp_Bopomofo },
+  { 419, PT_SCX, ucp_Bopomofo },
+  { 428, PT_SC, ucp_Brahmi },
+  { 433, PT_SC, ucp_Brahmi },
+  { 440, PT_SC, ucp_Braille },
+  { 445, PT_SC, ucp_Braille },
+  { 453, PT_SCX, ucp_Buginese },
+  { 458, PT_SCX, ucp_Buginese },
+  { 467, PT_SCX, ucp_Buhid },
+  { 472, PT_SCX, ucp_Buhid },
+  { 478, PT_GC, ucp_C },
+  { 480, PT_SCX, ucp_Chakma },
+  { 485, PT_SC, ucp_Canadian_Aboriginal },
+  { 504, PT_SC, ucp_Canadian_Aboriginal },
+  { 509, PT_SC, ucp_Carian },
+  { 514, PT_SC, ucp_Carian },
+  { 521, PT_BOOL, ucp_Cased },
+  { 527, PT_BOOL, ucp_Case_Ignorable },
+  { 541, PT_SC, ucp_Caucasian_Albanian },
+  { 559, PT_PC, ucp_Cc },
+  { 562, PT_PC, ucp_Cf },
+  { 565, PT_SCX, ucp_Chakma },
+  { 572, PT_SC, ucp_Cham },
+  { 577, PT_BOOL, ucp_Changes_When_Casefolded },
+  { 599, PT_BOOL, ucp_Changes_When_Casemapped },
+  { 621, PT_BOOL, ucp_Changes_When_Lowercased },
+  { 643, PT_BOOL, ucp_Changes_When_Titlecased },
+  { 665, PT_BOOL, ucp_Changes_When_Uppercased },
+  { 687, PT_SC, ucp_Cherokee },
+  { 692, PT_SC, ucp_Cherokee },
+  { 701, PT_SC, ucp_Chorasmian },
+  { 712, PT_SC, ucp_Chorasmian },
+  { 717, PT_BOOL, ucp_Case_Ignorable },
+  { 720, PT_PC, ucp_Cn },
+  { 723, PT_PC, ucp_Co },
+  { 726, PT_SC, ucp_Common },
+  { 733, PT_SCX, ucp_Coptic },
+  { 738, PT_SCX, ucp_Coptic },
+  { 745, PT_SCX, ucp_Cypro_Minoan },
+  { 750, PT_SCX, ucp_Cypriot },
+  { 755, PT_PC, ucp_Cs },
+  { 758, PT_SC, ucp_Cuneiform },
+  { 768, PT_BOOL, ucp_Changes_When_Casefolded },
+  { 773, PT_BOOL, ucp_Changes_When_Casemapped },
+  { 778, PT_BOOL, ucp_Changes_When_Lowercased },
+  { 782, PT_BOOL, ucp_Changes_When_Titlecased },
+  { 786, PT_BOOL, ucp_Changes_When_Uppercased },
+  { 790, PT_SCX, ucp_Cypriot },
+  { 798, PT_SCX, ucp_Cypro_Minoan },
+  { 810, PT_SCX, ucp_Cyrillic },
+  { 819, PT_SCX, ucp_Cyrillic },
+  { 824, PT_BOOL, ucp_Dash },
+  { 829, PT_BOOL, ucp_Default_Ignorable_Code_Point },
+  { 855, PT_BOOL, ucp_Deprecated },
+  { 859, PT_BOOL, ucp_Deprecated },
+  { 870, PT_SC, ucp_Deseret },
+  { 878, PT_SCX, ucp_Devanagari },
+  { 883, PT_SCX, ucp_Devanagari },
+  { 894, PT_BOOL, ucp_Default_Ignorable_Code_Point },
+  { 897, PT_BOOL, ucp_Diacritic },
+  { 901, PT_BOOL, ucp_Diacritic },
+  { 911, PT_SC, ucp_Dives_Akuru },
+  { 916, PT_SC, ucp_Dives_Akuru },
+  { 927, PT_SCX, ucp_Dogra },
+  { 932, PT_SCX, ucp_Dogra },
+  { 938, PT_SC, ucp_Deseret },
+  { 943, PT_SCX, ucp_Duployan },
+  { 948, PT_SCX, ucp_Duployan },
+  { 957, PT_BOOL, ucp_Emoji_Modifier_Base },
+  { 963, PT_BOOL, ucp_Emoji_Component },
+  { 969, PT_SC, ucp_Egyptian_Hieroglyphs },
+  { 974, PT_SC, ucp_Egyptian_Hieroglyphs },
+  { 994, PT_SC, ucp_Elbasan },
+  { 999, PT_SC, ucp_Elbasan },
+  { 1007, PT_SC, ucp_Elymaic },
+  { 1012, PT_SC, ucp_Elymaic },
+  { 1020, PT_BOOL, ucp_Emoji_Modifier },
+  { 1025, PT_BOOL, ucp_Emoji },
+  { 1031, PT_BOOL, ucp_Emoji_Component },
+  { 1046, PT_BOOL, ucp_Emoji_Modifier },
+  { 1060, PT_BOOL, ucp_Emoji_Modifier_Base },
+  { 1078, PT_BOOL, ucp_Emoji_Presentation },
+  { 1096, PT_BOOL, ucp_Emoji_Presentation },
+  { 1102, PT_SC, ucp_Ethiopic },
+  { 1107, PT_SC, ucp_Ethiopic },
+  { 1116, PT_BOOL, ucp_Extender },
+  { 1120, PT_BOOL, ucp_Extended_Pictographic },
+  { 1141, PT_BOOL, ucp_Extender },
+  { 1150, PT_BOOL, ucp_Extended_Pictographic },
+  { 1158, PT_SCX, ucp_Georgian },
+  { 1163, PT_SCX, ucp_Georgian },
+  { 1172, PT_SCX, ucp_Glagolitic },
+  { 1177, PT_SCX, ucp_Glagolitic },
+  { 1188, PT_SCX, ucp_Gunjala_Gondi },
+  { 1193, PT_SCX, ucp_Masaram_Gondi },
+  { 1198, PT_SC, ucp_Gothic },
+  { 1203, PT_SC, ucp_Gothic },
+  { 1210, PT_SCX, ucp_Grantha },
+  { 1215, PT_SCX, ucp_Grantha },
+  { 1223, PT_BOOL, ucp_Grapheme_Base },
+  { 1236, PT_BOOL, ucp_Grapheme_Extend },
+  { 1251, PT_BOOL, ucp_Grapheme_Link },
+  { 1264, PT_BOOL, ucp_Grapheme_Base },
+  { 1271, PT_SCX, ucp_Greek },
+  { 1277, PT_SCX, ucp_Greek },
+  { 1282, PT_BOOL, ucp_Grapheme_Extend },
+  { 1288, PT_BOOL, ucp_Grapheme_Link },
+  { 1295, PT_SCX, ucp_Gujarati },
+  { 1304, PT_SCX, ucp_Gujarati },
+  { 1309, PT_SCX, ucp_Gunjala_Gondi },
+  { 1322, PT_SCX, ucp_Gurmukhi },
+  { 1331, PT_SCX, ucp_Gurmukhi },
+  { 1336, PT_SCX, ucp_Han },
+  { 1340, PT_SCX, ucp_Hangul },
+  { 1345, PT_SCX, ucp_Hangul },
+  { 1352, PT_SCX, ucp_Han },
+  { 1357, PT_SCX, ucp_Hanifi_Rohingya },
+  { 1372, PT_SCX, ucp_Hanunoo },
+  { 1377, PT_SCX, ucp_Hanunoo },
+  { 1385, PT_SC, ucp_Hatran },
+  { 1390, PT_SC, ucp_Hatran },
+  { 1397, PT_SC, ucp_Hebrew },
+  { 1402, PT_SC, ucp_Hebrew },
+  { 1409, PT_BOOL, ucp_Hex_Digit },
+  { 1413, PT_BOOL, ucp_Hex_Digit },
+  { 1422, PT_SCX, ucp_Hiragana },
+  { 1427, PT_SCX, ucp_Hiragana },
+  { 1436, PT_SC, ucp_Anatolian_Hieroglyphs },
+  { 1441, PT_SC, ucp_Pahawh_Hmong },
+  { 1446, PT_SC, ucp_Nyiakeng_Puachue_Hmong },
+  { 1451, PT_SC, ucp_Old_Hungarian },
+  { 1456, PT_BOOL, ucp_ID_Continue },
+  { 1460, PT_BOOL, ucp_ID_Continue },
+  { 1471, PT_BOOL, ucp_Ideographic },
+  { 1476, PT_BOOL, ucp_Ideographic },
+  { 1488, PT_BOOL, ucp_ID_Start },
+  { 1492, PT_BOOL, ucp_IDS_Binary_Operator },
+  { 1497, PT_BOOL, ucp_IDS_Binary_Operator },
+  { 1515, PT_BOOL, ucp_IDS_Trinary_Operator },
+  { 1520, PT_BOOL, ucp_ID_Start },
+  { 1528, PT_BOOL, ucp_IDS_Trinary_Operator },
+  { 1547, PT_SC, ucp_Imperial_Aramaic },
+  { 1563, PT_SC, ucp_Inherited },
+  { 1573, PT_SC, ucp_Inscriptional_Pahlavi },
+  { 1594, PT_SC, ucp_Inscriptional_Parthian },
+  { 1616, PT_SC, ucp_Old_Italic },
+  { 1621, PT_SCX, ucp_Javanese },
+  { 1626, PT_SCX, ucp_Javanese },
+  { 1635, PT_BOOL, ucp_Join_Control },
+  { 1641, PT_BOOL, ucp_Join_Control },
+  { 1653, PT_SCX, ucp_Kaithi },
+  { 1660, PT_SCX, ucp_Kayah_Li },
+  { 1665, PT_SCX, ucp_Katakana },
+  { 1670, PT_SCX, ucp_Kannada },
+  { 1678, PT_SCX, ucp_Katakana },
+  { 1687, PT_SCX, ucp_Kayah_Li },
+  { 1695, PT_SC, ucp_Kharoshthi },
+  { 1700, PT_SC, ucp_Kharoshthi },
+  { 1711, PT_SC, ucp_Khitan_Small_Script },
+  { 1729, PT_SC, ucp_Khmer },
+  { 1735, PT_SC, ucp_Khmer },
+  { 1740, PT_SCX, ucp_Khojki },
+  { 1745, PT_SCX, ucp_Khojki },
+  { 1752, PT_SCX, ucp_Khudawadi },
+  { 1762, PT_SC, ucp_Khitan_Small_Script },
+  { 1767, PT_SCX, ucp_Kannada },
+  { 1772, PT_SCX, ucp_Kaithi },
+  { 1777, PT_GC, ucp_L },
+  { 1779, PT_LAMP, 0 },
+  { 1782, PT_SC, ucp_Tai_Tham },
+  { 1787, PT_SC, ucp_Lao },
+  { 1791, PT_SC, ucp_Lao },
+  { 1796, PT_SCX, ucp_Latin },
+  { 1802, PT_SCX, ucp_Latin },
+  { 1807, PT_LAMP, 0 },
+  { 1810, PT_SC, ucp_Lepcha },
+  { 1815, PT_SC, ucp_Lepcha },
+  { 1822, PT_SCX, ucp_Limbu },
+  { 1827, PT_SCX, ucp_Limbu },
+  { 1833, PT_SCX, ucp_Linear_A },
+  { 1838, PT_SCX, ucp_Linear_B },
+  { 1843, PT_SCX, ucp_Linear_A },
+  { 1851, PT_SCX, ucp_Linear_B },
+  { 1859, PT_SC, ucp_Lisu },
+  { 1864, PT_PC, ucp_Ll },
+  { 1867, PT_PC, ucp_Lm },
+  { 1870, PT_PC, ucp_Lo },
+  { 1873, PT_BOOL, ucp_Logical_Order_Exception },
+  { 1877, PT_BOOL, ucp_Logical_Order_Exception },
+  { 1899, PT_BOOL, ucp_Lowercase },
+  { 1905, PT_BOOL, ucp_Lowercase },
+  { 1915, PT_PC, ucp_Lt },
+  { 1918, PT_PC, ucp_Lu },
+  { 1921, PT_SC, ucp_Lycian },
+  { 1926, PT_SC, ucp_Lycian },
+  { 1933, PT_SC, ucp_Lydian },
+  { 1938, PT_SC, ucp_Lydian },
+  { 1945, PT_GC, ucp_M },
+  { 1947, PT_SCX, ucp_Mahajani },
+  { 1956, PT_SCX, ucp_Mahajani },
+  { 1961, PT_SC, ucp_Makasar },
+  { 1966, PT_SC, ucp_Makasar },
+  { 1974, PT_SCX, ucp_Malayalam },
+  { 1984, PT_SCX, ucp_Mandaic },
+  { 1989, PT_SCX, ucp_Mandaic },
+  { 1997, PT_SCX, ucp_Manichaean },
+  { 2002, PT_SCX, ucp_Manichaean },
+  { 2013, PT_SC, ucp_Marchen },
+  { 2018, PT_SC, ucp_Marchen },
+  { 2026, PT_SCX, ucp_Masaram_Gondi },
+  { 2039, PT_BOOL, ucp_Math },
+  { 2044, PT_PC, ucp_Mc },
+  { 2047, PT_PC, ucp_Me },
+  { 2050, PT_SC, ucp_Medefaidrin },
+  { 2062, PT_SC, ucp_Medefaidrin },
+  { 2067, PT_SC, ucp_Meetei_Mayek },
+  { 2079, PT_SC, ucp_Mende_Kikakui },
+  { 2084, PT_SC, ucp_Mende_Kikakui },
+  { 2097, PT_SC, ucp_Meroitic_Cursive },
+  { 2102, PT_SC, ucp_Meroitic_Hieroglyphs },
+  { 2107, PT_SC, ucp_Meroitic_Cursive },
+  { 2123, PT_SC, ucp_Meroitic_Hieroglyphs },
+  { 2143, PT_SC, ucp_Miao },
+  { 2148, PT_SCX, ucp_Malayalam },
+  { 2153, PT_PC, ucp_Mn },
+  { 2156, PT_SCX, ucp_Modi },
+  { 2161, PT_SCX, ucp_Mongolian },
+  { 2166, PT_SCX, ucp_Mongolian },
+  { 2176, PT_SC, ucp_Mro },
+  { 2180, PT_SC, ucp_Mro },
+  { 2185, PT_SC, ucp_Meetei_Mayek },
+  { 2190, PT_SCX, ucp_Multani },
+  { 2195, PT_SCX, ucp_Multani },
+  { 2203, PT_SCX, ucp_Myanmar },
+  { 2211, PT_SCX, ucp_Myanmar },
+  { 2216, PT_GC, ucp_N },
+  { 2218, PT_SC, ucp_Nabataean },
+  { 2228, PT_SCX, ucp_Nandinagari },
+  { 2233, PT_SCX, ucp_Nandinagari },
+  { 2245, PT_SC, ucp_Old_North_Arabian },
+  { 2250, PT_SC, ucp_Nabataean },
+  { 2255, PT_BOOL, ucp_Noncharacter_Code_Point },
+  { 2261, PT_PC, ucp_Nd },
+  { 2264, PT_SC, ucp_Newa },
+  { 2269, PT_SC, ucp_New_Tai_Lue },
+  { 2279, PT_SCX, ucp_Nko },
+  { 2283, PT_SCX, ucp_Nko },
+  { 2288, PT_PC, ucp_Nl },
+  { 2291, PT_PC, ucp_No },
+  { 2294, PT_BOOL, ucp_Noncharacter_Code_Point },
+  { 2316, PT_SC, ucp_Nushu },
+  { 2321, PT_SC, ucp_Nushu },
+  { 2327, PT_SC, ucp_Nyiakeng_Puachue_Hmong },
+  { 2348, PT_SC, ucp_Ogham },
+  { 2353, PT_SC, ucp_Ogham },
+  { 2359, PT_SC, ucp_Ol_Chiki },
+  { 2367, PT_SC, ucp_Ol_Chiki },
+  { 2372, PT_SC, ucp_Old_Hungarian },
+  { 2385, PT_SC, ucp_Old_Italic },
+  { 2395, PT_SC, ucp_Old_North_Arabian },
+  { 2411, PT_SCX, ucp_Old_Permic },
+  { 2421, PT_SC, ucp_Old_Persian },
+  { 2432, PT_SC, ucp_Old_Sogdian },
+  { 2443, PT_SC, ucp_Old_South_Arabian },
+  { 2459, PT_SC, ucp_Old_Turkic },
+  { 2469, PT_SCX, ucp_Old_Uyghur },
+  { 2479, PT_SCX, ucp_Oriya },
+  { 2485, PT_SC, ucp_Old_Turkic },
+  { 2490, PT_SCX, ucp_Oriya },
+  { 2495, PT_SC, ucp_Osage },
+  { 2501, PT_SC, ucp_Osage },
+  { 2506, PT_SC, ucp_Osmanya },
+  { 2511, PT_SC, ucp_Osmanya },
+  { 2519, PT_SCX, ucp_Old_Uyghur },
+  { 2524, PT_GC, ucp_P },
+  { 2526, PT_SC, ucp_Pahawh_Hmong },
+  { 2538, PT_SC, ucp_Palmyrene },
+  { 2543, PT_SC, ucp_Palmyrene },
+  { 2553, PT_BOOL, ucp_Pattern_Syntax },
+  { 2560, PT_BOOL, ucp_Pattern_Syntax },
+  { 2574, PT_BOOL, ucp_Pattern_White_Space },
+  { 2592, PT_BOOL, ucp_Pattern_White_Space },
+  { 2598, PT_SC, ucp_Pau_Cin_Hau },
+  { 2603, PT_SC, ucp_Pau_Cin_Hau },
+  { 2613, PT_PC, ucp_Pc },
+  { 2616, PT_BOOL, ucp_Prepended_Concatenation_Mark },
+  { 2620, PT_PC, ucp_Pd },
+  { 2623, PT_PC, ucp_Pe },
+  { 2626, PT_SCX, ucp_Old_Permic },
+  { 2631, PT_PC, ucp_Pf },
+  { 2634, PT_SCX, ucp_Phags_Pa },
+  { 2639, PT_SCX, ucp_Phags_Pa },
+  { 2647, PT_SC, ucp_Inscriptional_Pahlavi },
+  { 2652, PT_SCX, ucp_Psalter_Pahlavi },
+  { 2657, PT_SC, ucp_Phoenician },
+  { 2662, PT_SC, ucp_Phoenician },
+  { 2673, PT_PC, ucp_Pi },
+  { 2676, PT_SC, ucp_Miao },
+  { 2681, PT_PC, ucp_Po },
+  { 2684, PT_BOOL, ucp_Prepended_Concatenation_Mark },
+  { 2711, PT_SC, ucp_Inscriptional_Parthian },
+  { 2716, PT_PC, ucp_Ps },
+  { 2719, PT_SCX, ucp_Psalter_Pahlavi },
+  { 2734, PT_SCX, ucp_Coptic },
+  { 2739, PT_SC, ucp_Inherited },
+  { 2744, PT_BOOL, ucp_Quotation_Mark },
+  { 2750, PT_BOOL, ucp_Quotation_Mark },
+  { 2764, PT_BOOL, ucp_Radical },
+  { 2772, PT_BOOL, ucp_Regional_Indicator },
+  { 2790, PT_SC, ucp_Rejang },
+  { 2797, PT_BOOL, ucp_Regional_Indicator },
+  { 2800, PT_SC, ucp_Rejang },
+  { 2805, PT_SCX, ucp_Hanifi_Rohingya },
+  { 2810, PT_SC, ucp_Runic },
+  { 2816, PT_SC, ucp_Runic },
+  { 2821, PT_GC, ucp_S },
+  { 2823, PT_SC, ucp_Samaritan },
+  { 2833, PT_SC, ucp_Samaritan },
+  { 2838, PT_SC, ucp_Old_South_Arabian },
+  { 2843, PT_SC, ucp_Saurashtra },
+  { 2848, PT_SC, ucp_Saurashtra },
+  { 2859, PT_PC, ucp_Sc },
+  { 2862, PT_BOOL, ucp_Soft_Dotted },
+  { 2865, PT_BOOL, ucp_Sentence_Terminal },
+  { 2882, PT_SC, ucp_SignWriting },
+  { 2887, PT_SCX, ucp_Sharada },
+  { 2895, PT_SC, ucp_Shavian },
+  { 2903, PT_SC, ucp_Shavian },
+  { 2908, PT_SCX, ucp_Sharada },
+  { 2913, PT_SC, ucp_Siddham },
+  { 2918, PT_SC, ucp_Siddham },
+  { 2926, PT_SC, ucp_SignWriting },
+  { 2938, PT_SCX, ucp_Khudawadi },
+  { 2943, PT_SCX, ucp_Sinhala },
+  { 2948, PT_SCX, ucp_Sinhala },
+  { 2956, PT_PC, ucp_Sk },
+  { 2959, PT_PC, ucp_Sm },
+  { 2962, PT_PC, ucp_So },
+  { 2965, PT_BOOL, ucp_Soft_Dotted },
+  { 2976, PT_SCX, ucp_Sogdian },
+  { 2981, PT_SCX, ucp_Sogdian },
+  { 2989, PT_SC, ucp_Old_Sogdian },
+  { 2994, PT_SC, ucp_Sora_Sompeng },
+  { 2999, PT_SC, ucp_Sora_Sompeng },
+  { 3011, PT_SC, ucp_Soyombo },
+  { 3016, PT_SC, ucp_Soyombo },
+  { 3024, PT_BOOL, ucp_White_Space },
+  { 3030, PT_BOOL, ucp_Sentence_Terminal },
+  { 3036, PT_SC, ucp_Sundanese },
+  { 3041, PT_SC, ucp_Sundanese },
+  { 3051, PT_SCX, ucp_Syloti_Nagri },
+  { 3056, PT_SCX, ucp_Syloti_Nagri },
+  { 3068, PT_SCX, ucp_Syriac },
+  { 3073, PT_SCX, ucp_Syriac },
+  { 3080, PT_SCX, ucp_Tagalog },
+  { 3088, PT_SCX, ucp_Tagbanwa },
+  { 3093, PT_SCX, ucp_Tagbanwa },
+  { 3102, PT_SCX, ucp_Tai_Le },
+  { 3108, PT_SC, ucp_Tai_Tham },
+  { 3116, PT_SC, ucp_Tai_Viet },
+  { 3124, PT_SCX, ucp_Takri },
+  { 3129, PT_SCX, ucp_Takri },
+  { 3135, PT_SCX, ucp_Tai_Le },
+  { 3140, PT_SC, ucp_New_Tai_Lue },
+  { 3145, PT_SCX, ucp_Tamil },
+  { 3151, PT_SCX, ucp_Tamil },
+  { 3156, PT_SC, ucp_Tangut },
+  { 3161, PT_SC, ucp_Tangsa },
+  { 3168, PT_SC, ucp_Tangut },
+  { 3175, PT_SC, ucp_Tai_Viet },
+  { 3180, PT_SCX, ucp_Telugu },
+  { 3185, PT_SCX, ucp_Telugu },
+  { 3192, PT_BOOL, ucp_Terminal_Punctuation },
+  { 3197, PT_BOOL, ucp_Terminal_Punctuation },
+  { 3217, PT_SC, ucp_Tifinagh },
+  { 3222, PT_SCX, ucp_Tagalog },
+  { 3227, PT_SCX, ucp_Thaana },
+  { 3232, PT_SCX, ucp_Thaana },
+  { 3239, PT_SC, ucp_Thai },
+  { 3244, PT_SC, ucp_Tibetan },
+  { 3252, PT_SC, ucp_Tibetan },
+  { 3257, PT_SC, ucp_Tifinagh },
+  { 3266, PT_SCX, ucp_Tirhuta },
+  { 3271, PT_SCX, ucp_Tirhuta },
+  { 3279, PT_SC, ucp_Tangsa },
+  { 3284, PT_SC, ucp_Toto },
+  { 3289, PT_SC, ucp_Ugaritic },
+  { 3294, PT_SC, ucp_Ugaritic },
+  { 3303, PT_BOOL, ucp_Unified_Ideograph },
+  { 3309, PT_BOOL, ucp_Unified_Ideograph },
+  { 3326, PT_SC, ucp_Unknown },
+  { 3334, PT_BOOL, ucp_Uppercase },
+  { 3340, PT_BOOL, ucp_Uppercase },
+  { 3350, PT_SC, ucp_Vai },
+  { 3354, PT_SC, ucp_Vai },
+  { 3359, PT_BOOL, ucp_Variation_Selector },
+  { 3377, PT_SC, ucp_Vithkuqi },
+  { 3382, PT_SC, ucp_Vithkuqi },
+  { 3391, PT_BOOL, ucp_Variation_Selector },
+  { 3394, PT_SC, ucp_Wancho },
+  { 3401, PT_SC, ucp_Warang_Citi },
+  { 3406, PT_SC, ucp_Warang_Citi },
+  { 3417, PT_SC, ucp_Wancho },
+  { 3422, PT_BOOL, ucp_White_Space },
+  { 3433, PT_BOOL, ucp_White_Space },
+  { 3440, PT_ALNUM, 0 },
+  { 3444, PT_BOOL, ucp_XID_Continue },
+  { 3449, PT_BOOL, ucp_XID_Continue },
+  { 3461, PT_BOOL, ucp_XID_Start },
+  { 3466, PT_BOOL, ucp_XID_Start },
+  { 3475, PT_SC, ucp_Old_Persian },
+  { 3480, PT_PXSPACE, 0 },
+  { 3484, PT_SPACE, 0 },
+  { 3488, PT_SC, ucp_Cuneiform },
+  { 3493, PT_UCNC, 0 },
+  { 3497, PT_WORD, 0 },
+  { 3501, PT_SCX, ucp_Yezidi },
+  { 3506, PT_SCX, ucp_Yezidi },
+  { 3513, PT_SCX, ucp_Yi },
+  { 3516, PT_SCX, ucp_Yi },
+  { 3521, PT_GC, ucp_Z },
+  { 3523, PT_SC, ucp_Zanabazar_Square },
+  { 3539, PT_SC, ucp_Zanabazar_Square },
+  { 3544, PT_SC, ucp_Inherited },
+  { 3549, PT_PC, ucp_Zl },
+  { 3552, PT_PC, ucp_Zp },
+  { 3555, PT_PC, ucp_Zs },
+  { 3558, PT_SC, ucp_Common },
+  { 3563, PT_SC, ucp_Unknown }
+};
+
+const size_t PRIV(utt_size) = sizeof(PRIV(utt)) / sizeof(ucp_type_table);
+
+#endif /* SUPPORT_UNICODE */
+
+/* End of pcre2_ucptables.c */
diff --git a/Foundation/src/pcre_valid_utf8.c b/Foundation/src/pcre2_valid_utf.c
similarity index 51%
rename from Foundation/src/pcre_valid_utf8.c
rename to Foundation/src/pcre2_valid_utf.c
index 68bc50e14..f247b91fe 100644
--- a/Foundation/src/pcre_valid_utf8.c
+++ b/Foundation/src/pcre2_valid_utf.c
@@ -6,7 +6,8 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2013 University of Cambridge
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2020 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -38,104 +39,129 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 
-/* This module contains an internal function for validating UTF-8 character
-strings. */
+/* This module contains an internal function for validating UTF character
+strings. This file is also #included by the pcre2test program, which uses
+macros to change names from _pcre2_xxx to xxxx, thereby avoiding name clashes
+with the library. In this case, PCRE2_PCRE2TEST is defined. */
+
+#ifndef PCRE2_PCRE2TEST           /* We're compiling the library */
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
+#endif /* PCRE2_PCRE2TEST */
 
 
-#include "pcre_config.h"
-#include "pcre_internal.h"
+#ifndef SUPPORT_UNICODE
+/*************************************************
+*  Dummy function when Unicode is not supported  *
+*************************************************/
+
+/* This function should never be called when Unicode is not supported. */
+
+int
+PRIV(valid_utf)(PCRE2_SPTR string, PCRE2_SIZE length, PCRE2_SIZE *erroroffset)
+{
+(void)string;
+(void)length;
+(void)erroroffset;
+return 0;
+}
+#else  /* UTF is supported */
+
 
 
 /*************************************************
-*         Validate a UTF-8 string                *
+*           Validate a UTF string                *
 *************************************************/
 
 /* This function is called (optionally) at the start of compile or match, to
-check that a supposed UTF-8 string is actually valid. The early check means
+check that a supposed UTF string is actually valid. The early check means
 that subsequent code can assume it is dealing with a valid string. The check
 can be turned off for maximum performance, but the consequences of supplying an
 invalid string are then undefined.
 
-Originally, this function checked according to RFC 2279, allowing for values in
-the range 0 to 0x7fffffff, up to 6 bytes long, but ensuring that they were in
-the canonical format. Once somebody had pointed out RFC 3629 to me (it
-obsoletes 2279), additional restrictions were applied. The values are now
-limited to be between 0 and 0x0010ffff, no more than 4 bytes long, and the
-subrange 0xd000 to 0xdfff is excluded. However, the format of 5-byte and 6-byte
-characters is still checked.
-
-From release 8.13 more information about the details of the error are passed
-back in the returned value:
-
-PCRE_UTF8_ERR0   No error
-PCRE_UTF8_ERR1   Missing 1 byte at the end of the string
-PCRE_UTF8_ERR2   Missing 2 bytes at the end of the string
-PCRE_UTF8_ERR3   Missing 3 bytes at the end of the string
-PCRE_UTF8_ERR4   Missing 4 bytes at the end of the string
-PCRE_UTF8_ERR5   Missing 5 bytes at the end of the string
-PCRE_UTF8_ERR6   2nd-byte's two top bits are not 0x80
-PCRE_UTF8_ERR7   3rd-byte's two top bits are not 0x80
-PCRE_UTF8_ERR8   4th-byte's two top bits are not 0x80
-PCRE_UTF8_ERR9   5th-byte's two top bits are not 0x80
-PCRE_UTF8_ERR10  6th-byte's two top bits are not 0x80
-PCRE_UTF8_ERR11  5-byte character is not permitted by RFC 3629
-PCRE_UTF8_ERR12  6-byte character is not permitted by RFC 3629
-PCRE_UTF8_ERR13  4-byte character with value > 0x10ffff is not permitted
-PCRE_UTF8_ERR14  3-byte character with value 0xd000-0xdfff is not permitted
-PCRE_UTF8_ERR15  Overlong 2-byte sequence
-PCRE_UTF8_ERR16  Overlong 3-byte sequence
-PCRE_UTF8_ERR17  Overlong 4-byte sequence
-PCRE_UTF8_ERR18  Overlong 5-byte sequence (won't ever occur)
-PCRE_UTF8_ERR19  Overlong 6-byte sequence (won't ever occur)
-PCRE_UTF8_ERR20  Isolated 0x80 byte (not within UTF-8 character)
-PCRE_UTF8_ERR21  Byte with the illegal value 0xfe or 0xff
-PCRE_UTF8_ERR22  Unused (was non-character)
-
 Arguments:
   string       points to the string
-  length       length of string, or -1 if the string is zero-terminated
+  length       length of string
   errp         pointer to an error position offset variable
 
-Returns:       = 0    if the string is a valid UTF-8 string
-               > 0    otherwise, setting the offset of the bad character
+Returns:       == 0    if the string is a valid UTF string
+               != 0    otherwise, setting the offset of the bad character
 */
 
 int
-PRIV(valid_utf)(PCRE_PUCHAR string, int length, int *erroroffset)
+PRIV(valid_utf)(PCRE2_SPTR string, PCRE2_SIZE length, PCRE2_SIZE *erroroffset)
 {
-#ifdef SUPPORT_UTF
-register PCRE_PUCHAR p;
+PCRE2_SPTR p;
+uint32_t c;
 
-if (length < 0)
-  {
-  for (p = string; *p != 0; p++);
-  length = (int)(p - string);
-  }
+/* ----------------- Check a UTF-8 string ----------------- */
 
-for (p = string; length-- > 0; p++)
+#if PCRE2_CODE_UNIT_WIDTH == 8
+
+/* Originally, this function checked according to RFC 2279, allowing for values
+in the range 0 to 0x7fffffff, up to 6 bytes long, but ensuring that they were
+in the canonical format. Once somebody had pointed out RFC 3629 to me (it
+obsoletes 2279), additional restrictions were applied. The values are now
+limited to be between 0 and 0x0010ffff, no more than 4 bytes long, and the
+subrange 0xd000 to 0xdfff is excluded. However, the format of 5-byte and 6-byte
+characters is still checked. Error returns are as follows:
+
+PCRE2_ERROR_UTF8_ERR1   Missing 1 byte at the end of the string
+PCRE2_ERROR_UTF8_ERR2   Missing 2 bytes at the end of the string
+PCRE2_ERROR_UTF8_ERR3   Missing 3 bytes at the end of the string
+PCRE2_ERROR_UTF8_ERR4   Missing 4 bytes at the end of the string
+PCRE2_ERROR_UTF8_ERR5   Missing 5 bytes at the end of the string
+PCRE2_ERROR_UTF8_ERR6   2nd-byte's two top bits are not 0x80
+PCRE2_ERROR_UTF8_ERR7   3rd-byte's two top bits are not 0x80
+PCRE2_ERROR_UTF8_ERR8   4th-byte's two top bits are not 0x80
+PCRE2_ERROR_UTF8_ERR9   5th-byte's two top bits are not 0x80
+PCRE2_ERROR_UTF8_ERR10  6th-byte's two top bits are not 0x80
+PCRE2_ERROR_UTF8_ERR11  5-byte character is not permitted by RFC 3629
+PCRE2_ERROR_UTF8_ERR12  6-byte character is not permitted by RFC 3629
+PCRE2_ERROR_UTF8_ERR13  4-byte character with value > 0x10ffff is not permitted
+PCRE2_ERROR_UTF8_ERR14  3-byte character with value 0xd800-0xdfff is not permitted
+PCRE2_ERROR_UTF8_ERR15  Overlong 2-byte sequence
+PCRE2_ERROR_UTF8_ERR16  Overlong 3-byte sequence
+PCRE2_ERROR_UTF8_ERR17  Overlong 4-byte sequence
+PCRE2_ERROR_UTF8_ERR18  Overlong 5-byte sequence (won't ever occur)
+PCRE2_ERROR_UTF8_ERR19  Overlong 6-byte sequence (won't ever occur)
+PCRE2_ERROR_UTF8_ERR20  Isolated 0x80 byte (not within UTF-8 character)
+PCRE2_ERROR_UTF8_ERR21  Byte with the illegal value 0xfe or 0xff
+*/
+
+for (p = string; length > 0; p++)
   {
-  register pcre_uchar ab, c, d;
+  uint32_t ab, d;
 
   c = *p;
+  length--;
+
   if (c < 128) continue;                /* ASCII character */
 
   if (c < 0xc0)                         /* Isolated 10xx xxxx byte */
     {
-    *erroroffset = (int)(p - string);
-    return PCRE_UTF8_ERR20;
+    *erroroffset = (PCRE2_SIZE)(p - string);
+    return PCRE2_ERROR_UTF8_ERR20;
     }
 
   if (c >= 0xfe)                        /* Invalid 0xfe or 0xff bytes */
     {
-    *erroroffset = (int)(p - string);
-    return PCRE_UTF8_ERR21;
+    *erroroffset = (PCRE2_SIZE)(p - string);
+    return PCRE2_ERROR_UTF8_ERR21;
     }
 
-  ab = PRIV(utf8_table4)[c & 0x3f];     /* Number of additional bytes */
-  if (length < ab)
+  ab = PRIV(utf8_table4)[c & 0x3f];     /* Number of additional bytes (1-5) */
+  if (length < ab)                      /* Missing bytes */
     {
-    *erroroffset = (int)(p - string);          /* Missing bytes */
-    return ab - length;                 /* Codes ERR1 to ERR5 */
+    *erroroffset = (PCRE2_SIZE)(p - string);
+    switch(ab - length)
+      {
+      case 1: return PCRE2_ERROR_UTF8_ERR1;
+      case 2: return PCRE2_ERROR_UTF8_ERR2;
+      case 3: return PCRE2_ERROR_UTF8_ERR3;
+      case 4: return PCRE2_ERROR_UTF8_ERR4;
+      case 5: return PCRE2_ERROR_UTF8_ERR5;
+      }
     }
   length -= ab;                         /* Length remaining */
 
@@ -144,7 +170,7 @@ for (p = string; length-- > 0; p++)
   if (((d = *(++p)) & 0xc0) != 0x80)
     {
     *erroroffset = (int)(p - string) - 1;
-    return PCRE_UTF8_ERR6;
+    return PCRE2_ERROR_UTF8_ERR6;
     }
 
   /* For each length, check that the remaining bytes start with the 0x80 bit
@@ -159,7 +185,7 @@ for (p = string; length-- > 0; p++)
     case 1: if ((c & 0x3e) == 0)
       {
       *erroroffset = (int)(p - string) - 1;
-      return PCRE_UTF8_ERR15;
+      return PCRE2_ERROR_UTF8_ERR15;
       }
     break;
 
@@ -171,17 +197,17 @@ for (p = string; length-- > 0; p++)
     if ((*(++p) & 0xc0) != 0x80)     /* Third byte */
       {
       *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR7;
+      return PCRE2_ERROR_UTF8_ERR7;
       }
     if (c == 0xe0 && (d & 0x20) == 0)
       {
       *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR16;
+      return PCRE2_ERROR_UTF8_ERR16;
       }
     if (c == 0xed && d >= 0xa0)
       {
       *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR14;
+      return PCRE2_ERROR_UTF8_ERR14;
       }
     break;
 
@@ -193,22 +219,22 @@ for (p = string; length-- > 0; p++)
     if ((*(++p) & 0xc0) != 0x80)     /* Third byte */
       {
       *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR7;
+      return PCRE2_ERROR_UTF8_ERR7;
       }
     if ((*(++p) & 0xc0) != 0x80)     /* Fourth byte */
       {
       *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR8;
+      return PCRE2_ERROR_UTF8_ERR8;
       }
     if (c == 0xf0 && (d & 0x30) == 0)
       {
       *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR17;
+      return PCRE2_ERROR_UTF8_ERR17;
       }
     if (c > 0xf4 || (c == 0xf4 && d > 0x8f))
       {
       *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR13;
+      return PCRE2_ERROR_UTF8_ERR13;
       }
     break;
 
@@ -224,22 +250,22 @@ for (p = string; length-- > 0; p++)
     if ((*(++p) & 0xc0) != 0x80)     /* Third byte */
       {
       *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR7;
+      return PCRE2_ERROR_UTF8_ERR7;
       }
     if ((*(++p) & 0xc0) != 0x80)     /* Fourth byte */
       {
       *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR8;
+      return PCRE2_ERROR_UTF8_ERR8;
       }
     if ((*(++p) & 0xc0) != 0x80)     /* Fifth byte */
       {
       *erroroffset = (int)(p - string) - 4;
-      return PCRE_UTF8_ERR9;
+      return PCRE2_ERROR_UTF8_ERR9;
       }
     if (c == 0xf8 && (d & 0x38) == 0)
       {
       *erroroffset = (int)(p - string) - 4;
-      return PCRE_UTF8_ERR18;
+      return PCRE2_ERROR_UTF8_ERR18;
       }
     break;
 
@@ -250,27 +276,27 @@ for (p = string; length-- > 0; p++)
     if ((*(++p) & 0xc0) != 0x80)     /* Third byte */
       {
       *erroroffset = (int)(p - string) - 2;
-      return PCRE_UTF8_ERR7;
+      return PCRE2_ERROR_UTF8_ERR7;
       }
     if ((*(++p) & 0xc0) != 0x80)     /* Fourth byte */
       {
       *erroroffset = (int)(p - string) - 3;
-      return PCRE_UTF8_ERR8;
+      return PCRE2_ERROR_UTF8_ERR8;
       }
     if ((*(++p) & 0xc0) != 0x80)     /* Fifth byte */
       {
       *erroroffset = (int)(p - string) - 4;
-      return PCRE_UTF8_ERR9;
+      return PCRE2_ERROR_UTF8_ERR9;
       }
     if ((*(++p) & 0xc0) != 0x80)     /* Sixth byte */
       {
       *erroroffset = (int)(p - string) - 5;
-      return PCRE_UTF8_ERR10;
+      return PCRE2_ERROR_UTF8_ERR10;
       }
     if (c == 0xfc && (d & 0x3c) == 0)
       {
       *erroroffset = (int)(p - string) - 5;
-      return PCRE_UTF8_ERR19;
+      return PCRE2_ERROR_UTF8_ERR19;
       }
     break;
     }
@@ -282,17 +308,89 @@ for (p = string; length-- > 0; p++)
   if (ab > 3)
     {
     *erroroffset = (int)(p - string) - ab;
-    return (ab == 4)? PCRE_UTF8_ERR11 : PCRE_UTF8_ERR12;
+    return (ab == 4)? PCRE2_ERROR_UTF8_ERR11 : PCRE2_ERROR_UTF8_ERR12;
     }
   }
+return 0;
 
-#else  /* Not SUPPORT_UTF */
-(void)(string);  /* Keep picky compilers happy */
-(void)(length);
-(void)(erroroffset);
-#endif
 
-return PCRE_UTF8_ERR0;   /* This indicates success */
+/* ----------------- Check a UTF-16 string ----------------- */
+
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+
+/* There's not so much work, nor so many errors, for UTF-16.
+PCRE2_ERROR_UTF16_ERR1  Missing low surrogate at the end of the string
+PCRE2_ERROR_UTF16_ERR2  Invalid low surrogate
+PCRE2_ERROR_UTF16_ERR3  Isolated low surrogate
+*/
+
+for (p = string; length > 0; p++)
+  {
+  c = *p;
+  length--;
+
+  if ((c & 0xf800) != 0xd800)
+    {
+    /* Normal UTF-16 code point. Neither high nor low surrogate. */
+    }
+  else if ((c & 0x0400) == 0)
+    {
+    /* High surrogate. Must be a followed by a low surrogate. */
+    if (length == 0)
+      {
+      *erroroffset = p - string;
+      return PCRE2_ERROR_UTF16_ERR1;
+      }
+    p++;
+    length--;
+    if ((*p & 0xfc00) != 0xdc00)
+      {
+      *erroroffset = p - string - 1;
+      return PCRE2_ERROR_UTF16_ERR2;
+      }
+    }
+  else
+    {
+    /* Isolated low surrogate. Always an error. */
+    *erroroffset = p - string;
+    return PCRE2_ERROR_UTF16_ERR3;
+    }
+  }
+return 0;
+
+
+
+/* ----------------- Check a UTF-32 string ----------------- */
+
+#else
+
+/* There is very little to do for a UTF-32 string.
+PCRE2_ERROR_UTF32_ERR1  Surrogate character
+PCRE2_ERROR_UTF32_ERR2  Character > 0x10ffff
+*/
+
+for (p = string; length > 0; length--, p++)
+  {
+  c = *p;
+  if ((c & 0xfffff800u) != 0xd800u)
+    {
+    /* Normal UTF-32 code point. Neither high nor low surrogate. */
+    if (c > 0x10ffffu)
+      {
+      *erroroffset = p - string;
+      return PCRE2_ERROR_UTF32_ERR2;
+      }
+    }
+  else
+    {
+    /* A surrogate */
+    *erroroffset = p - string;
+    return PCRE2_ERROR_UTF32_ERR1;
+    }
+  }
+return 0;
+#endif  /* CODE_UNIT_WIDTH */
 }
+#endif  /* SUPPORT_UNICODE */
 
-/* End of pcre_valid_utf8.c */
+/* End of pcre2_valid_utf.c */
diff --git a/Foundation/src/pcre_xclass.c b/Foundation/src/pcre2_xclass.c
similarity index 81%
rename from Foundation/src/pcre_xclass.c
rename to Foundation/src/pcre2_xclass.c
index 22fc78289..59fa34667 100644
--- a/Foundation/src/pcre_xclass.c
+++ b/Foundation/src/pcre2_xclass.c
@@ -6,7 +6,8 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2013 University of Cambridge
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2022 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -37,42 +38,42 @@ POSSIBILITY OF SUCH DAMAGE.
 -----------------------------------------------------------------------------
 */
 
-
 /* This module contains an internal function that is used to match an extended
-class. It is used by both pcre_exec() and pcre_def_exec(). */
+class. It is used by pcre2_auto_possessify() and by both pcre2_match() and
+pcre2_def_match(). */
 
-#include "pcre_config.h"
-#include "pcre_internal.h"
 
+#include "pcre2_config.h"
+#include "pcre2_internal.h"
 
 /*************************************************
 *       Match character against an XCLASS        *
 *************************************************/
 
 /* This function is called to match a character against an extended class that
-might contain values > 255 and/or Unicode properties.
+might contain codepoints above 255 and/or Unicode properties.
 
 Arguments:
   c           the character
-  data        points to the flag byte of the XCLASS data
+  data        points to the flag code unit of the XCLASS data
+  utf         TRUE if in UTF mode
 
 Returns:      TRUE if character matches, else FALSE
 */
 
 BOOL
-PRIV(xclass)(pcre_uint32 c, const pcre_uchar *data, BOOL utf)
+PRIV(xclass)(uint32_t c, PCRE2_SPTR data, BOOL utf)
 {
-pcre_uchar t;
+PCRE2_UCHAR t;
 BOOL negated = (*data & XCL_NOT) != 0;
 
-(void)utf;
-#ifdef COMPILE_PCRE8
+#if PCRE2_CODE_UNIT_WIDTH == 8
 /* In 8 bit mode, this must always be TRUE. Help the compiler to know that. */
 utf = TRUE;
 #endif
 
-/* Character values < 256 are matched against a bitmap, if one is present. If
-not, we still carry on, because there may be ranges that start below 256 in the
+/* Code points < 256 are matched against a bitmap, if one is present. If not,
+we still carry on, because there may be ranges that start below 256 in the
 additional data. */
 
 if (c < 256)
@@ -80,37 +81,37 @@ if (c < 256)
   if ((*data & XCL_HASPROP) == 0)
     {
     if ((*data & XCL_MAP) == 0) return negated;
-    return (((pcre_uint8 *)(data + 1))[c/8] & (1 << (c&7))) != 0;
+    return (((uint8_t *)(data + 1))[c/8] & (1u << (c&7))) != 0;
     }
   if ((*data & XCL_MAP) != 0 &&
-    (((pcre_uint8 *)(data + 1))[c/8] & (1 << (c&7))) != 0)
+    (((uint8_t *)(data + 1))[c/8] & (1u << (c&7))) != 0)
     return !negated; /* char found */
   }
 
 /* First skip the bit map if present. Then match against the list of Unicode
 properties or large chars or ranges that end with a large char. We won't ever
-encounter XCL_PROP or XCL_NOTPROP when UCP support is not compiled. */
+encounter XCL_PROP or XCL_NOTPROP when UTF support is not compiled. */
 
-if ((*data++ & XCL_MAP) != 0) data += 32 / sizeof(pcre_uchar);
+if ((*data++ & XCL_MAP) != 0) data += 32 / sizeof(PCRE2_UCHAR);
 
 while ((t = *data++) != XCL_END)
   {
-  pcre_uint32 x, y;
+  uint32_t x, y;
   if (t == XCL_SINGLE)
     {
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (utf)
       {
       GETCHARINC(x, data); /* macro generates multiple statements */
       }
     else
 #endif
-      x = *data++;
+    x = *data++;
     if (c == x) return !negated;
     }
   else if (t == XCL_RANGE)
     {
-#ifdef SUPPORT_UTF
+#ifdef SUPPORT_UNICODE
     if (utf)
       {
       GETCHARINC(x, data); /* macro generates multiple statements */
@@ -125,11 +126,12 @@ while ((t = *data++) != XCL_END)
     if (c >= x && c <= y) return !negated;
     }
 
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UNICODE
   else  /* XCL_PROP & XCL_NOTPROP */
     {
     const ucd_record *prop = GET_UCD(c);
     BOOL isprop = t == XCL_PROP;
+    BOOL ok;
 
     switch(*data)
       {
@@ -155,6 +157,12 @@ while ((t = *data++) != XCL_END)
       if ((data[1] == prop->script) == isprop) return !negated;
       break;
 
+      case PT_SCX:
+      ok = (data[1] == prop->script ||
+            MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), data[1]) != 0);
+      if (ok == isprop) return !negated;
+      break;
+
       case PT_ALNUM:
       if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
            PRIV(ucp_gentype)[prop->chartype] == ucp_N) == isprop)
@@ -202,6 +210,17 @@ while ((t = *data++) != XCL_END)
         }
       break;
 
+      case PT_BIDICL:
+      if ((UCD_BIDICLASS_PROP(prop) == data[1]) == isprop)
+        return !negated;
+      break;
+
+      case PT_BOOL:
+      ok = MAPBIT(PRIV(ucd_boolprop_sets) +
+        UCD_BPROPS_PROP(prop), data[1]) != 0;
+      if (ok == isprop) return !negated;
+      break;
+
       /* The following three properties can occur only in an XCLASS, as there
       is no \p or \P coding for them. */
 
@@ -255,10 +274,12 @@ while ((t = *data++) != XCL_END)
 
     data += 2;
     }
-#endif  /* SUPPORT_UCP */
+#else
+  (void)utf;  /* Avoid compiler warning */
+#endif  /* SUPPORT_UNICODE */
   }
 
 return negated;   /* char did not match */
 }
 
-/* End of pcre_xclass.c */
+/* End of pcre2_xclass.c */
diff --git a/Foundation/src/pcre_byte_order.c b/Foundation/src/pcre_byte_order.c
deleted file mode 100644
index f5ba9c76f..000000000
--- a/Foundation/src/pcre_byte_order.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2014 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains an internal function that tests a compiled pattern to
-see if it was compiled with the opposite endianness. If so, it uses an
-auxiliary local function to flip the appropriate bytes. */
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-
-/*************************************************
-*             Swap byte functions                *
-*************************************************/
-
-/* The following functions swap the bytes of a pcre_uint16
-and pcre_uint32 value.
-
-Arguments:
-  value        any number
-
-Returns:       the byte swapped value
-*/
-
-static pcre_uint32
-swap_uint32(pcre_uint32 value)
-{
-return ((value & 0x000000ff) << 24) |
-       ((value & 0x0000ff00) <<  8) |
-       ((value & 0x00ff0000) >>  8) |
-       (value >> 24);
-}
-
-static pcre_uint16
-swap_uint16(pcre_uint16 value)
-{
-return (value >> 8) | (value << 8);
-}
-
-
-/*************************************************
-*       Test for a byte-flipped compiled regex   *
-*************************************************/
-
-/* This function swaps the bytes of a compiled pattern usually
-loaded form the disk. It also sets the tables pointer, which
-is likely an invalid pointer after reload.
-
-Arguments:
-  argument_re     points to the compiled expression
-  extra_data      points to extra data or is NULL
-  tables          points to the character tables or NULL
-
-Returns:          0 if the swap is successful, negative on error
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DECL int pcre_pattern_to_host_byte_order(pcre *argument_re,
-  pcre_extra *extra_data, const unsigned char *tables)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DECL int pcre16_pattern_to_host_byte_order(pcre16 *argument_re,
-  pcre16_extra *extra_data, const unsigned char *tables)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DECL int pcre32_pattern_to_host_byte_order(pcre32 *argument_re,
-  pcre32_extra *extra_data, const unsigned char *tables)
-#endif
-{
-REAL_PCRE *re = (REAL_PCRE *)argument_re;
-pcre_study_data *study;
-#ifndef COMPILE_PCRE8
-pcre_uchar *ptr;
-int length;
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
-BOOL utf;
-BOOL utf16_char;
-#endif /* SUPPORT_UTF && COMPILE_PCRE16 */
-#endif /* !COMPILE_PCRE8 */
-
-if (re == NULL) return PCRE_ERROR_NULL;
-if (re->magic_number == MAGIC_NUMBER)
-  {
-  if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
-  re->tables = tables;
-  return 0;
-  }
-
-if (re->magic_number != REVERSED_MAGIC_NUMBER) return PCRE_ERROR_BADMAGIC;
-if ((swap_uint32(re->flags) & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
-
-re->magic_number = MAGIC_NUMBER;
-re->size = swap_uint32(re->size);
-re->options = swap_uint32(re->options);
-re->flags = swap_uint32(re->flags);
-re->limit_match = swap_uint32(re->limit_match);
-re->limit_recursion = swap_uint32(re->limit_recursion);
-
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-re->first_char = swap_uint16(re->first_char);
-re->req_char = swap_uint16(re->req_char);
-#elif defined COMPILE_PCRE32
-re->first_char = swap_uint32(re->first_char);
-re->req_char = swap_uint32(re->req_char);
-#endif
-
-re->max_lookbehind = swap_uint16(re->max_lookbehind);
-re->top_bracket = swap_uint16(re->top_bracket);
-re->top_backref = swap_uint16(re->top_backref);
-re->name_table_offset = swap_uint16(re->name_table_offset);
-re->name_entry_size = swap_uint16(re->name_entry_size);
-re->name_count = swap_uint16(re->name_count);
-re->ref_count = swap_uint16(re->ref_count);
-re->tables = tables;
-
-if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_STUDY_DATA) != 0)
-  {
-  study = (pcre_study_data *)extra_data->study_data;
-  study->size = swap_uint32(study->size);
-  study->flags = swap_uint32(study->flags);
-  study->minlength = swap_uint32(study->minlength);
-  }
-
-#ifndef COMPILE_PCRE8
-ptr = (pcre_uchar *)re + re->name_table_offset;
-length = re->name_count * re->name_entry_size;
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
-utf = (re->options & PCRE_UTF16) != 0;
-utf16_char = FALSE;
-#endif /* SUPPORT_UTF && COMPILE_PCRE16 */
-
-while(TRUE)
-  {
-  /* Swap previous characters. */
-  while (length-- > 0)
-    {
-#if defined COMPILE_PCRE16
-    *ptr = swap_uint16(*ptr);
-#elif defined COMPILE_PCRE32
-    *ptr = swap_uint32(*ptr);
-#endif
-    ptr++;
-    }
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
-  if (utf16_char)
-    {
-    if (HAS_EXTRALEN(ptr[-1]))
-      {
-      /* We know that there is only one extra character in UTF-16. */
-      *ptr = swap_uint16(*ptr);
-      ptr++;
-      }
-    }
-  utf16_char = FALSE;
-#endif /* SUPPORT_UTF */
-
-  /* Get next opcode. */
-  length = 0;
-#if defined COMPILE_PCRE16
-  *ptr = swap_uint16(*ptr);
-#elif defined COMPILE_PCRE32
-  *ptr = swap_uint32(*ptr);
-#endif
-  switch (*ptr)
-    {
-    case OP_END:
-    return 0;
-
-#if defined SUPPORT_UTF && defined COMPILE_PCRE16
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-    case OP_STAR:
-    case OP_MINSTAR:
-    case OP_PLUS:
-    case OP_MINPLUS:
-    case OP_QUERY:
-    case OP_MINQUERY:
-    case OP_UPTO:
-    case OP_MINUPTO:
-    case OP_EXACT:
-    case OP_POSSTAR:
-    case OP_POSPLUS:
-    case OP_POSQUERY:
-    case OP_POSUPTO:
-    case OP_STARI:
-    case OP_MINSTARI:
-    case OP_PLUSI:
-    case OP_MINPLUSI:
-    case OP_QUERYI:
-    case OP_MINQUERYI:
-    case OP_UPTOI:
-    case OP_MINUPTOI:
-    case OP_EXACTI:
-    case OP_POSSTARI:
-    case OP_POSPLUSI:
-    case OP_POSQUERYI:
-    case OP_POSUPTOI:
-    case OP_NOTSTAR:
-    case OP_NOTMINSTAR:
-    case OP_NOTPLUS:
-    case OP_NOTMINPLUS:
-    case OP_NOTQUERY:
-    case OP_NOTMINQUERY:
-    case OP_NOTUPTO:
-    case OP_NOTMINUPTO:
-    case OP_NOTEXACT:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSUPTO:
-    case OP_NOTSTARI:
-    case OP_NOTMINSTARI:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUSI:
-    case OP_NOTQUERYI:
-    case OP_NOTMINQUERYI:
-    case OP_NOTUPTOI:
-    case OP_NOTMINUPTOI:
-    case OP_NOTEXACTI:
-    case OP_NOTPOSSTARI:
-    case OP_NOTPOSPLUSI:
-    case OP_NOTPOSQUERYI:
-    case OP_NOTPOSUPTOI:
-    if (utf) utf16_char = TRUE;
-#endif
-    /* Fall through. */
-
-    default:
-    length = PRIV(OP_lengths)[*ptr] - 1;
-    break;
-
-    case OP_CLASS:
-    case OP_NCLASS:
-    /* Skip the character bit map. */
-    ptr += 32/sizeof(pcre_uchar);
-    length = 0;
-    break;
-
-    case OP_XCLASS:
-    /* Reverse the size of the XCLASS instance. */
-    ptr++;
-#if defined COMPILE_PCRE16
-    *ptr = swap_uint16(*ptr);
-#elif defined COMPILE_PCRE32
-    *ptr = swap_uint32(*ptr);
-#endif
-#ifndef COMPILE_PCRE32
-    if (LINK_SIZE > 1)
-      {
-      /* LINK_SIZE can be 1 or 2 in 16 bit mode. */
-      ptr++;
-      *ptr = swap_uint16(*ptr);
-      }
-#endif
-    ptr++;
-    length = (GET(ptr, -LINK_SIZE)) - (1 + LINK_SIZE + 1);
-#if defined COMPILE_PCRE16
-    *ptr = swap_uint16(*ptr);
-#elif defined COMPILE_PCRE32
-    *ptr = swap_uint32(*ptr);
-#endif
-    if ((*ptr & XCL_MAP) != 0)
-      {
-      /* Skip the character bit map. */
-      ptr += 32/sizeof(pcre_uchar);
-      length -= 32/sizeof(pcre_uchar);
-      }
-    break;
-    }
-  ptr++;
-  }
-/* Control should never reach here in 16/32 bit mode. */
-#else  /* In 8-bit mode, the pattern does not need to be processed. */
-return 0;
-#endif /* !COMPILE_PCRE8 */
-}
-
-/* End of pcre_byte_order.c */
diff --git a/Foundation/src/pcre_compile.c b/Foundation/src/pcre_compile.c
deleted file mode 100644
index dfe26d200..000000000
--- a/Foundation/src/pcre_compile.c
+++ /dev/null
@@ -1,9812 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2021 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-#pragma warning( disable : 4018)  // '<' : signed/unsigned mismatch
-#pragma warning( disable : 4127)  // conditional expression is constant
-#pragma warning( disable : 4244)  // conversion from 'int' to 'unsigned short', possible loss of data
-#pragma warning( disable : 4701)  // local variable 'othercase' may be used without having been initialized
-#pragma warning( disable : 4702)  // unreachable code
-
-/* This module contains the external function pcre_compile(), along with
-supporting internal functions that are not used by other modules. */
-
-#include "pcre_config.h"
-
-#define NLBLOCK cd             /* Block containing newline information */
-#define PSSTART start_pattern  /* Field containing pattern start */
-#define PSEND   end_pattern    /* Field containing pattern end */
-
-#include "pcre_internal.h"
-
-
-/* When PCRE_DEBUG is defined, we need the pcre(16|32)_printint() function, which
-is also used by pcretest. PCRE_DEBUG is not defined when building a production
-library. We do not need to select pcre16_printint.c specially, because the
-COMPILE_PCREx macro will already be appropriately set. */
-
-#ifdef PCRE_DEBUG
-/* pcre_printint.c should not include any headers */
-#define PCRE_INCLUDED
-#include "pcre_printint.c"
-#undef PCRE_INCLUDED
-#endif
-
-
-/* Macro for setting individual bits in class bitmaps. */
-
-#define SETBIT(a,b) a[(b)/8] |= (1U << ((b)&7))
-
-/* Maximum length value to check against when making sure that the integer that
-holds the compiled pattern length does not overflow. We make it a bit less than
-INT_MAX to allow for adding in group terminating bytes, so that we don't have
-to check them every time. */
-
-#define OFLOW_MAX (INT_MAX - 20)
-
-/* Definitions to allow mutual recursion */
-
-static int
-  add_list_to_class(pcre_uint8 *, pcre_uchar **, int, compile_data *,
-    const pcre_uint32 *, unsigned int);
-
-static BOOL
-  compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
-    pcre_uint32 *, pcre_int32 *, pcre_uint32 *, pcre_int32 *, branch_chain *,
-    compile_data *, int *);
-
-
-
-/*************************************************
-*      Code parameters and static tables         *
-*************************************************/
-
-/* This value specifies the size of stack workspace that is used during the
-first pre-compile phase that determines how much memory is required. The regex
-is partly compiled into this space, but the compiled parts are discarded as
-soon as they can be, so that hopefully there will never be an overrun. The code
-does, however, check for an overrun. The largest amount I've seen used is 218,
-so this number is very generous.
-
-The same workspace is used during the second, actual compile phase for
-remembering forward references to groups so that they can be filled in at the
-end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
-is 4 there is plenty of room for most patterns. However, the memory can get
-filled up by repetitions of forward references, for example patterns like
-/(?1){0,1999}(b)/, and one user did hit the limit. The code has been changed so
-that the workspace is expanded using malloc() in this situation. The value
-below is therefore a minimum, and we put a maximum on it for safety. The
-minimum is now also defined in terms of LINK_SIZE so that the use of malloc()
-kicks in at the same number of forward references in all cases. */
-
-#define COMPILE_WORK_SIZE (2048*LINK_SIZE)
-#define COMPILE_WORK_SIZE_MAX (100*COMPILE_WORK_SIZE)
-
-/* This value determines the size of the initial vector that is used for
-remembering named groups during the pre-compile. It is allocated on the stack,
-but if it is too small, it is expanded using malloc(), in a similar way to the
-workspace. The value is the number of slots in the list. */
-
-#define NAMED_GROUP_LIST_SIZE  20
-
-/* The overrun tests check for a slightly smaller size so that they detect the
-overrun before it actually does run off the end of the data block. */
-
-#define WORK_SIZE_SAFETY_MARGIN (100)
-
-/* Private flags added to firstchar and reqchar. */
-
-#define REQ_CASELESS    (1U << 0)        /* Indicates caselessness */
-#define REQ_VARY        (1U << 1)        /* Reqchar followed non-literal item */
-/* Negative values for the firstchar and reqchar flags */
-#define REQ_UNSET       (-2)
-#define REQ_NONE        (-1)
-
-/* Repeated character flags. */
-
-#define UTF_LENGTH     0x10000000l      /* The char contains its length. */
-
-/* Table for handling escaped characters in the range '0'-'z'. Positive returns
-are simple data values; negative values are for special things like \d and so
-on. Zero means further processing is needed (for things like \x), or the escape
-is invalid. */
-
-#ifndef EBCDIC
-
-/* This is the "normal" table for ASCII systems or for EBCDIC systems running
-in UTF-8 mode. */
-
-static const short int escapes[] = {
-     0,                       0,
-     0,                       0,
-     0,                       0,
-     0,                       0,
-     0,                       0,
-     CHAR_COLON,              CHAR_SEMICOLON,
-     CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
-     CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
-     CHAR_COMMERCIAL_AT,      -ESC_A,
-     -ESC_B,                  -ESC_C,
-     -ESC_D,                  -ESC_E,
-     0,                       -ESC_G,
-     -ESC_H,                  0,
-     0,                       -ESC_K,
-     0,                       0,
-     -ESC_N,                  0,
-     -ESC_P,                  -ESC_Q,
-     -ESC_R,                  -ESC_S,
-     0,                       0,
-     -ESC_V,                  -ESC_W,
-     -ESC_X,                  0,
-     -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
-     CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
-     CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
-     CHAR_GRAVE_ACCENT,       ESC_a,
-     -ESC_b,                  0,
-     -ESC_d,                  ESC_e,
-     ESC_f,                   0,
-     -ESC_h,                  0,
-     0,                       -ESC_k,
-     0,                       0,
-     ESC_n,                   0,
-     -ESC_p,                  0,
-     ESC_r,                   -ESC_s,
-     ESC_tee,                 0,
-     -ESC_v,                  -ESC_w,
-     0,                       0,
-     -ESC_z
-};
-
-#else
-
-/* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
-
-static const short int escapes[] = {
-/*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
-/*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
-/*  58 */     0,     0,    '!',     '$',    '*',   ')',    ';',    '~',
-/*  60 */   '-',   '/',      0,       0,      0,     0,      0,      0,
-/*  68 */     0,     0,    '|',     ',',    '%',   '_',    '>',    '?',
-/*  70 */     0,     0,      0,       0,      0,     0,      0,      0,
-/*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
-/*  80 */     0, ESC_a, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,
-/*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
-/*  90 */     0,     0, -ESC_k,       0,      0, ESC_n,      0, -ESC_p,
-/*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
-/*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
-/*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
-/*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,
-/*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
-/*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
-/*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
-/*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
-/*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
-/*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
-/*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
-/*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,
-/*  F8 */     0,     0,      0,       0,      0,     0,      0,      0
-};
-
-/* We also need a table of characters that may follow \c in an EBCDIC
-environment for characters 0-31. */
-
-static unsigned char ebcdic_escape_c[] = "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_";
-
-#endif
-
-
-/* Table of special "verbs" like (*PRUNE). This is a short table, so it is
-searched linearly. Put all the names into a single string, in order to reduce
-the number of relocations when a shared library is dynamically linked. The
-string is built from string macros so that it works in UTF-8 mode on EBCDIC
-platforms. */
-
-typedef struct verbitem {
-  int   len;                 /* Length of verb name */
-  int   op;                  /* Op when no arg, or -1 if arg mandatory */
-  int   op_arg;              /* Op when arg present, or -1 if not allowed */
-} verbitem;
-
-static const char verbnames[] =
-  "\0"                       /* Empty name is a shorthand for MARK */
-  STRING_MARK0
-  STRING_ACCEPT0
-  STRING_COMMIT0
-  STRING_F0
-  STRING_FAIL0
-  STRING_PRUNE0
-  STRING_SKIP0
-  STRING_THEN;
-
-static const verbitem verbs[] = {
-  { 0, -1,        OP_MARK },
-  { 4, -1,        OP_MARK },
-  { 6, OP_ACCEPT, -1 },
-  { 6, OP_COMMIT, -1 },
-  { 1, OP_FAIL,   -1 },
-  { 4, OP_FAIL,   -1 },
-  { 5, OP_PRUNE,  OP_PRUNE_ARG },
-  { 4, OP_SKIP,   OP_SKIP_ARG  },
-  { 4, OP_THEN,   OP_THEN_ARG  }
-};
-
-static const int verbcount = sizeof(verbs)/sizeof(verbitem);
-
-
-/* Substitutes for [[:<:]] and [[:>:]], which mean start and end of word in
-another regex library. */
-
-static const pcre_uchar sub_start_of_word[] = {
-  CHAR_BACKSLASH, CHAR_b, CHAR_LEFT_PARENTHESIS, CHAR_QUESTION_MARK,
-  CHAR_EQUALS_SIGN, CHAR_BACKSLASH, CHAR_w, CHAR_RIGHT_PARENTHESIS, '\0' };
-
-static const pcre_uchar sub_end_of_word[] = {
-  CHAR_BACKSLASH, CHAR_b, CHAR_LEFT_PARENTHESIS, CHAR_QUESTION_MARK,
-  CHAR_LESS_THAN_SIGN, CHAR_EQUALS_SIGN, CHAR_BACKSLASH, CHAR_w,
-  CHAR_RIGHT_PARENTHESIS, '\0' };
-
-
-/* Tables of names of POSIX character classes and their lengths. The names are
-now all in a single string, to reduce the number of relocations when a shared
-library is dynamically loaded. The list of lengths is terminated by a zero
-length entry. The first three must be alpha, lower, upper, as this is assumed
-for handling case independence. The indices for graph, print, and punct are
-needed, so identify them. */
-
-static const char posix_names[] =
-  STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
-  STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
-  STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
-  STRING_word0  STRING_xdigit;
-
-static const pcre_uint8 posix_name_lengths[] = {
-  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
-
-#define PC_GRAPH  8
-#define PC_PRINT  9
-#define PC_PUNCT 10
-
-
-/* Table of class bit maps for each POSIX class. Each class is formed from a
-base map, with an optional addition or removal of another map. Then, for some
-classes, there is some additional tweaking: for [:blank:] the vertical space
-characters are removed, and for [:alpha:] and [:alnum:] the underscore
-character is removed. The triples in the table consist of the base map offset,
-second map offset or -1 if no second map, and a non-negative value for map
-addition or a negative value for map subtraction (if there are two maps). The
-absolute value of the third field has these meanings: 0 => no tweaking, 1 =>
-remove vertical space characters, 2 => remove underscore. */
-
-static const int posix_class_maps[] = {
-  cbit_word,  cbit_digit, -2,             /* alpha */
-  cbit_lower, -1,          0,             /* lower */
-  cbit_upper, -1,          0,             /* upper */
-  cbit_word,  -1,          2,             /* alnum - word without underscore */
-  cbit_print, cbit_cntrl,  0,             /* ascii */
-  cbit_space, -1,          1,             /* blank - a GNU extension */
-  cbit_cntrl, -1,          0,             /* cntrl */
-  cbit_digit, -1,          0,             /* digit */
-  cbit_graph, -1,          0,             /* graph */
-  cbit_print, -1,          0,             /* print */
-  cbit_punct, -1,          0,             /* punct */
-  cbit_space, -1,          0,             /* space */
-  cbit_word,  -1,          0,             /* word - a Perl extension */
-  cbit_xdigit,-1,          0              /* xdigit */
-};
-
-/* Table of substitutes for \d etc when PCRE_UCP is set. They are replaced by
-Unicode property escapes. */
-
-#ifdef SUPPORT_UCP
-static const pcre_uchar string_PNd[]  = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pNd[]  = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PXsp[] = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pXsp[] = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PXwd[] = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pXwd[] = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-
-static const pcre_uchar *substitutes[] = {
-  string_PNd,           /* \D */
-  string_pNd,           /* \d */
-  string_PXsp,          /* \S */   /* Xsp is Perl space, but from 8.34, Perl */
-  string_pXsp,          /* \s */   /* space and POSIX space are the same. */
-  string_PXwd,          /* \W */
-  string_pXwd           /* \w */
-};
-
-/* The POSIX class substitutes must be in the order of the POSIX class names,
-defined above, and there are both positive and negative cases. NULL means no
-general substitute of a Unicode property escape (\p or \P). However, for some
-POSIX classes (e.g. graph, print, punct) a special property code is compiled
-directly. */
-
-static const pcre_uchar string_pL[] =   {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pLl[] =  {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pLu[] =  {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_pXan[] = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_h[] =    {
-  CHAR_BACKSLASH, CHAR_h, '\0' };
-static const pcre_uchar string_pXps[] = {
-  CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PL[] =   {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PLl[] =  {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PLu[] =  {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_PXan[] = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-static const pcre_uchar string_H[] =    {
-  CHAR_BACKSLASH, CHAR_H, '\0' };
-static const pcre_uchar string_PXps[] = {
-  CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
-  CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
-
-static const pcre_uchar *posix_substitutes[] = {
-  string_pL,            /* alpha */
-  string_pLl,           /* lower */
-  string_pLu,           /* upper */
-  string_pXan,          /* alnum */
-  NULL,                 /* ascii */
-  string_h,             /* blank */
-  NULL,                 /* cntrl */
-  string_pNd,           /* digit */
-  NULL,                 /* graph */
-  NULL,                 /* print */
-  NULL,                 /* punct */
-  string_pXps,          /* space */   /* Xps is POSIX space, but from 8.34 */
-  string_pXwd,          /* word  */   /* Perl and POSIX space are the same */
-  NULL,                 /* xdigit */
-  /* Negated cases */
-  string_PL,            /* ^alpha */
-  string_PLl,           /* ^lower */
-  string_PLu,           /* ^upper */
-  string_PXan,          /* ^alnum */
-  NULL,                 /* ^ascii */
-  string_H,             /* ^blank */
-  NULL,                 /* ^cntrl */
-  string_PNd,           /* ^digit */
-  NULL,                 /* ^graph */
-  NULL,                 /* ^print */
-  NULL,                 /* ^punct */
-  string_PXps,          /* ^space */  /* Xps is POSIX space, but from 8.34 */
-  string_PXwd,          /* ^word */   /* Perl and POSIX space are the same */
-  NULL                  /* ^xdigit */
-};
-#define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
-#endif
-
-#define STRING(a)  # a
-#define XSTRING(s) STRING(s)
-
-/* The texts of compile-time error messages. These are "char *" because they
-are passed to the outside world. Do not ever re-use any error number, because
-they are documented. Always add a new error instead. Messages marked DEAD below
-are no longer used. This used to be a table of strings, but in order to reduce
-the number of relocations needed when a shared library is loaded dynamically,
-it is now one long string. We cannot use a table of offsets, because the
-lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
-simply count through to the one we want - this isn't a performance issue
-because these strings are used only when there is a compilation error.
-
-Each substring ends with \0 to insert a null character. This includes the final
-substring, so that the whole string ends with \0\0, which can be detected when
-counting through. */
-
-static const char error_texts[] =
-  "no error\0"
-  "\\ at end of pattern\0"
-  "\\c at end of pattern\0"
-  "unrecognized character follows \\\0"
-  "numbers out of order in {} quantifier\0"
-  /* 5 */
-  "number too big in {} quantifier\0"
-  "missing terminating ] for character class\0"
-  "invalid escape sequence in character class\0"
-  "range out of order in character class\0"
-  "nothing to repeat\0"
-  /* 10 */
-  "internal error: invalid forward reference offset\0"
-  "internal error: unexpected repeat\0"
-  "unrecognized character after (? or (?-\0"
-  "POSIX named classes are supported only within a class\0"
-  "missing )\0"
-  /* 15 */
-  "reference to non-existent subpattern\0"
-  "erroffset passed as NULL\0"
-  "unknown option bit(s) set\0"
-  "missing ) after comment\0"
-  "parentheses nested too deeply\0"  /** DEAD **/
-  /* 20 */
-  "regular expression is too large\0"
-  "failed to get memory\0"
-  "unmatched parentheses\0"
-  "internal error: code overflow\0"
-  "unrecognized character after (?<\0"
-  /* 25 */
-  "lookbehind assertion is not fixed length\0"
-  "malformed number or name after (?(\0"
-  "conditional group contains more than two branches\0"
-  "assertion expected after (?( or (?(?C)\0"
-  "(?R or (?[+-]digits must be followed by )\0"
-  /* 30 */
-  "unknown POSIX class name\0"
-  "POSIX collating elements are not supported\0"
-  "this version of PCRE is compiled without UTF support\0"
-  "spare error\0"  /** DEAD **/
-  "character value in \\x{} or \\o{} is too large\0"
-  /* 35 */
-  "invalid condition (?(0)\0"
-  "\\C not allowed in lookbehind assertion\0"
-  "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
-  "number after (?C is > 255\0"
-  "closing ) for (?C expected\0"
-  /* 40 */
-  "recursive call could loop indefinitely\0"
-  "unrecognized character after (?P\0"
-  "syntax error in subpattern name (missing terminator)\0"
-  "two named subpatterns have the same name\0"
-  "invalid UTF-8 string\0"
-  /* 45 */
-  "support for \\P, \\p, and \\X has not been compiled\0"
-  "malformed \\P or \\p sequence\0"
-  "unknown property name after \\P or \\p\0"
-  "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
-  "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
-  /* 50 */
-  "repeated subpattern is too long\0"    /** DEAD **/
-  "octal value is greater than \\377 in 8-bit non-UTF-8 mode\0"
-  "internal error: overran compiling workspace\0"
-  "internal error: previously-checked referenced subpattern not found\0"
-  "DEFINE group contains more than one branch\0"
-  /* 55 */
-  "repeating a DEFINE group is not allowed\0"  /** DEAD **/
-  "inconsistent NEWLINE options\0"
-  "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
-  "a numbered reference must not be zero\0"
-  "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
-  /* 60 */
-  "(*VERB) not recognized or malformed\0"
-  "number is too big\0"
-  "subpattern name expected\0"
-  "digit expected after (?+\0"
-  "] is an invalid data character in JavaScript compatibility mode\0"
-  /* 65 */
-  "different names for subpatterns of the same number are not allowed\0"
-  "(*MARK) must have an argument\0"
-  "this version of PCRE is not compiled with Unicode property support\0"
-#ifndef EBCDIC
-  "\\c must be followed by an ASCII character\0"
-#else
-  "\\c must be followed by a letter or one of [\\]^_?\0"
-#endif
-  "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
-  /* 70 */
-  "internal error: unknown opcode in find_fixedlength()\0"
-  "\\N is not supported in a class\0"
-  "too many forward references\0"
-  "disallowed Unicode code point (>= 0xd800 && <= 0xdfff)\0"
-  "invalid UTF-16 string\0"
-  /* 75 */
-  "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
-  "character value in \\u.... sequence is too large\0"
-  "invalid UTF-32 string\0"
-  "setting UTF is disabled by the application\0"
-  "non-hex character in \\x{} (closing brace missing?)\0"
-  /* 80 */
-  "non-octal character in \\o{} (closing brace missing?)\0"
-  "missing opening brace after \\o\0"
-  "parentheses are too deeply nested\0"
-  "invalid range in character class\0"
-  "group name must start with a non-digit\0"
-  /* 85 */
-  "parentheses are too deeply nested (stack check)\0"
-  "digits missing in \\x{} or \\o{}\0"
-  "regular expression is too complicated\0"
-  ;
-
-/* Table to identify digits and hex digits. This is used when compiling
-patterns. Note that the tables in chartables are dependent on the locale, and
-may mark arbitrary characters as digits - but the PCRE compiling code expects
-to handle only 0-9, a-z, and A-Z as digits when compiling. That is why we have
-a private table here. It costs 256 bytes, but it is a lot faster than doing
-character value tests (at least in some simple cases I timed), and in some
-applications one wants PCRE to compile efficiently as well as match
-efficiently.
-
-For convenience, we use the same bit definitions as in chartables:
-
-  0x04   decimal digit
-  0x08   hexadecimal digit
-
-Then we can use ctype_digit and ctype_xdigit in the code. */
-
-/* Using a simple comparison for decimal numbers rather than a memory read
-is much faster, and the resulting code is simpler (the compiler turns it
-into a subtraction and unsigned comparison). */
-
-#define IS_DIGIT(x) ((x) >= CHAR_0 && (x) <= CHAR_9)
-
-#ifndef EBCDIC
-
-/* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
-UTF-8 mode. */
-
-static const pcre_uint8 digitab[] =
-  {
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - '  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ( - /  */
-  0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  */
-  0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00, /*  8 - ?  */
-  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /*  @ - G  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  H - O  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  P - W  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  X - _  */
-  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /*  ` - g  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  h - o  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  p - w  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  x -127 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
-
-#else
-
-/* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
-
-static const pcre_uint8 digitab[] =
-  {
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   8- 15    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 10 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  32- 39 20 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  40- 47    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  48- 55 30 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  56- 63    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 40 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  72- |     */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 50 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  88- 95    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 60 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 104- ?     */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 70 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 120- "     */
-  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /* 128- g  80 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  h -143    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144- p  90 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  q -159    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160- x  A0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  y -175    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ^ -183 B0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191    */
-  0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, /*  { - G  C0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  H -207    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  } - P  D0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  Q -223    */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  \ - X  E0 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  Y -239    */
-  0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c, /*  0 - 7  F0 */
-  0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255    */
-
-static const pcre_uint8 ebcdic_chartab[] = { /* chartable partial dup */
-  0x80,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*   0-  7 */
-  0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
-  0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  16- 23 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
-  0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /*  32- 39 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  40- 47 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  48- 55 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  56- 63 */
-  0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 */
-  0x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /*  72- |  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 */
-  0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /*  88- 95 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 */
-  0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x80, /* 104- ?  */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 120- "  */
-  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /* 128- g  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  h -143 */
-  0x00,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* 144- p  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  q -159 */
-  0x00,0x00,0x12,0x12,0x12,0x12,0x12,0x12, /* 160- x  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  y -175 */
-  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  ^ -183 */
-  0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
-  0x80,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  { - G  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  H -207 */
-  0x00,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  } - P  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  Q -223 */
-  0x00,0x00,0x12,0x12,0x12,0x12,0x12,0x12, /*  \ - X  */
-  0x12,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /*  Y -239 */
-  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
-  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x00};/*  8 -255 */
-#endif
-
-
-/* This table is used to check whether auto-possessification is possible
-between adjacent character-type opcodes. The left-hand (repeated) opcode is
-used to select the row, and the right-hand opcode is use to select the column.
-A value of 1 means that auto-possessification is OK. For example, the second
-value in the first row means that \D+\d can be turned into \D++\d.
-
-The Unicode property types (\P and \p) have to be present to fill out the table
-because of what their opcode values are, but the table values should always be
-zero because property types are handled separately in the code. The last four
-columns apply to items that cannot be repeated, so there is no need to have
-rows for them. Note that OP_DIGIT etc. are generated only when PCRE_UCP is
-*not* set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
-
-#define APTROWS (LAST_AUTOTAB_LEFT_OP - FIRST_AUTOTAB_OP + 1)
-#define APTCOLS (LAST_AUTOTAB_RIGHT_OP - FIRST_AUTOTAB_OP + 1)
-
-static const pcre_uint8 autoposstab[APTROWS][APTCOLS] = {
-/* \D \d \S \s \W \w  . .+ \C \P \p \R \H \h \V \v \X \Z \z  $ $M */
-  { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \D */
-  { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \d */
-  { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \S */
-  { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \s */
-  { 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \W */
-  { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1 },  /* \w */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .  */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* .+ */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },  /* \C */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \P */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* \p */
-  { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \R */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 },  /* \H */
-  { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \h */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0 },  /* \V */
-  { 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0 },  /* \v */
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }   /* \X */
-};
-
-
-/* This table is used to check whether auto-possessification is possible
-between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP). The
-left-hand (repeated) opcode is used to select the row, and the right-hand
-opcode is used to select the column. The values are as follows:
-
-  0   Always return FALSE (never auto-possessify)
-  1   Character groups are distinct (possessify if both are OP_PROP)
-  2   Check character categories in the same group (general or particular)
-  3   TRUE if the two opcodes are not the same (PROP vs NOTPROP)
-
-  4   Check left general category vs right particular category
-  5   Check right general category vs left particular category
-
-  6   Left alphanum vs right general category
-  7   Left space vs right general category
-  8   Left word vs right general category
-
-  9   Right alphanum vs left general category
- 10   Right space vs left general category
- 11   Right word vs left general category
-
- 12   Left alphanum vs right particular category
- 13   Left space vs right particular category
- 14   Left word vs right particular category
-
- 15   Right alphanum vs left particular category
- 16   Right space vs left particular category
- 17   Right word vs left particular category
-*/
-
-static const pcre_uint8 propposstab[PT_TABSIZE][PT_TABSIZE] = {
-/* ANY LAMP GC  PC  SC ALNUM SPACE PXSPACE WORD CLIST UCNC */
-  { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   0 },  /* PT_ANY */
-  { 0,  3,  0,  0,  0,    3,    1,      1,   0,    0,   0 },  /* PT_LAMP */
-  { 0,  0,  2,  4,  0,    9,   10,     10,  11,    0,   0 },  /* PT_GC */
-  { 0,  0,  5,  2,  0,   15,   16,     16,  17,    0,   0 },  /* PT_PC */
-  { 0,  0,  0,  0,  2,    0,    0,      0,   0,    0,   0 },  /* PT_SC */
-  { 0,  3,  6, 12,  0,    3,    1,      1,   0,    0,   0 },  /* PT_ALNUM */
-  { 0,  1,  7, 13,  0,    1,    3,      3,   1,    0,   0 },  /* PT_SPACE */
-  { 0,  1,  7, 13,  0,    1,    3,      3,   1,    0,   0 },  /* PT_PXSPACE */
-  { 0,  0,  8, 14,  0,    0,    1,      1,   3,    0,   0 },  /* PT_WORD */
-  { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   0 },  /* PT_CLIST */
-  { 0,  0,  0,  0,  0,    0,    0,      0,   0,    0,   3 }   /* PT_UCNC */
-};
-
-/* This table is used to check whether auto-possessification is possible
-between adjacent Unicode property opcodes (OP_PROP and OP_NOTPROP) when one
-specifies a general category and the other specifies a particular category. The
-row is selected by the general category and the column by the particular
-category. The value is 1 if the particular category is not part of the general
-category. */
-
-static const pcre_uint8 catposstab[7][30] = {
-/* Cc Cf Cn Co Cs Ll Lm Lo Lt Lu Mc Me Mn Nd Nl No Pc Pd Pe Pf Pi Po Ps Sc Sk Sm So Zl Zp Zs */
-  { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* C */
-  { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* L */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* M */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },  /* N */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1 },  /* P */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1 },  /* S */
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 }   /* Z */
-};
-
-/* This table is used when checking ALNUM, (PX)SPACE, SPACE, and WORD against
-a general or particular category. The properties in each row are those
-that apply to the character set in question. Duplication means that a little
-unnecessary work is done when checking, but this keeps things much simpler
-because they can all use the same code. For more details see the comment where
-this table is used.
-
-Note: SPACE and PXSPACE used to be different because Perl excluded VT from
-"space", but from Perl 5.18 it's included, so both categories are treated the
-same here. */
-
-static const pcre_uint8 posspropstab[3][4] = {
-  { ucp_L, ucp_N, ucp_N, ucp_Nl },  /* ALNUM, 3rd and 4th values redundant */
-  { ucp_Z, ucp_Z, ucp_C, ucp_Cc },  /* SPACE and PXSPACE, 2nd value redundant */
-  { ucp_L, ucp_N, ucp_P, ucp_Po }   /* WORD */
-};
-
-/* This table is used when converting repeating opcodes into possessified
-versions as a result of an explicit possessive quantifier such as ++. A zero
-value means there is no possessified version - in those cases the item in
-question must be wrapped in ONCE brackets. The table is truncated at OP_CALLOUT
-because all relevant opcodes are less than that. */
-
-static const pcre_uint8 opcode_possessify[] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0 - 15  */
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 16 - 31 */
-
-  0,                       /* NOTI */
-  OP_POSSTAR, 0,           /* STAR, MINSTAR */
-  OP_POSPLUS, 0,           /* PLUS, MINPLUS */
-  OP_POSQUERY, 0,          /* QUERY, MINQUERY */
-  OP_POSUPTO, 0,           /* UPTO, MINUPTO */
-  0,                       /* EXACT */
-  0, 0, 0, 0,              /* POS{STAR,PLUS,QUERY,UPTO} */
-
-  OP_POSSTARI, 0,          /* STARI, MINSTARI */
-  OP_POSPLUSI, 0,          /* PLUSI, MINPLUSI */
-  OP_POSQUERYI, 0,         /* QUERYI, MINQUERYI */
-  OP_POSUPTOI, 0,          /* UPTOI, MINUPTOI */
-  0,                       /* EXACTI */
-  0, 0, 0, 0,              /* POS{STARI,PLUSI,QUERYI,UPTOI} */
-
-  OP_NOTPOSSTAR, 0,        /* NOTSTAR, NOTMINSTAR */
-  OP_NOTPOSPLUS, 0,        /* NOTPLUS, NOTMINPLUS */
-  OP_NOTPOSQUERY, 0,       /* NOTQUERY, NOTMINQUERY */
-  OP_NOTPOSUPTO, 0,        /* NOTUPTO, NOTMINUPTO */
-  0,                       /* NOTEXACT */
-  0, 0, 0, 0,              /* NOTPOS{STAR,PLUS,QUERY,UPTO} */
-
-  OP_NOTPOSSTARI, 0,       /* NOTSTARI, NOTMINSTARI */
-  OP_NOTPOSPLUSI, 0,       /* NOTPLUSI, NOTMINPLUSI */
-  OP_NOTPOSQUERYI, 0,      /* NOTQUERYI, NOTMINQUERYI */
-  OP_NOTPOSUPTOI, 0,       /* NOTUPTOI, NOTMINUPTOI */
-  0,                       /* NOTEXACTI */
-  0, 0, 0, 0,              /* NOTPOS{STARI,PLUSI,QUERYI,UPTOI} */
-
-  OP_TYPEPOSSTAR, 0,       /* TYPESTAR, TYPEMINSTAR */
-  OP_TYPEPOSPLUS, 0,       /* TYPEPLUS, TYPEMINPLUS */
-  OP_TYPEPOSQUERY, 0,      /* TYPEQUERY, TYPEMINQUERY */
-  OP_TYPEPOSUPTO, 0,       /* TYPEUPTO, TYPEMINUPTO */
-  0,                       /* TYPEEXACT */
-  0, 0, 0, 0,              /* TYPEPOS{STAR,PLUS,QUERY,UPTO} */
-
-  OP_CRPOSSTAR, 0,         /* CRSTAR, CRMINSTAR */
-  OP_CRPOSPLUS, 0,         /* CRPLUS, CRMINPLUS */
-  OP_CRPOSQUERY, 0,        /* CRQUERY, CRMINQUERY */
-  OP_CRPOSRANGE, 0,        /* CRRANGE, CRMINRANGE */
-  0, 0, 0, 0,              /* CRPOS{STAR,PLUS,QUERY,RANGE} */
-
-  0, 0, 0,                 /* CLASS, NCLASS, XCLASS */
-  0, 0,                    /* REF, REFI */
-  0, 0,                    /* DNREF, DNREFI */
-  0, 0                     /* RECURSE, CALLOUT */
-};
-
-
-
-/*************************************************
-*            Find an error text                  *
-*************************************************/
-
-/* The error texts are now all in one long string, to save on relocations. As
-some of the text is of unknown length, we can't use a table of offsets.
-Instead, just count through the strings. This is not a performance issue
-because it happens only when there has been a compilation error.
-
-Argument:   the error number
-Returns:    pointer to the error string
-*/
-
-static const char *
-find_error_text(int n)
-{
-const char *s = error_texts;
-for (; n > 0; n--)
-  {
-  while (*s++ != CHAR_NULL) {};
-  if (*s == CHAR_NULL) return "Error text not found (please report)";
-  }
-return s;
-}
-
-
-
-/*************************************************
-*           Expand the workspace                 *
-*************************************************/
-
-/* This function is called during the second compiling phase, if the number of
-forward references fills the existing workspace, which is originally a block on
-the stack. A larger block is obtained from malloc() unless the ultimate limit
-has been reached or the increase will be rather small.
-
-Argument: pointer to the compile data block
-Returns:  0 if all went well, else an error number
-*/
-
-static int
-expand_workspace(compile_data *cd)
-{
-pcre_uchar *newspace;
-int newsize = cd->workspace_size * 2;
-
-if (newsize > COMPILE_WORK_SIZE_MAX) newsize = COMPILE_WORK_SIZE_MAX;
-if (cd->workspace_size >= COMPILE_WORK_SIZE_MAX ||
-    newsize - cd->workspace_size < WORK_SIZE_SAFETY_MARGIN)
- return ERR72;
-
-newspace = (PUBL(malloc))(IN_UCHARS(newsize));
-if (newspace == NULL) return ERR21;
-memcpy(newspace, cd->start_workspace, cd->workspace_size * sizeof(pcre_uchar));
-cd->hwm = (pcre_uchar *)newspace + (cd->hwm - cd->start_workspace);
-if (cd->workspace_size > COMPILE_WORK_SIZE)
-  (PUBL(free))((void *)cd->start_workspace);
-cd->start_workspace = newspace;
-cd->workspace_size = newsize;
-return 0;
-}
-
-
-
-/*************************************************
-*            Check for counted repeat            *
-*************************************************/
-
-/* This function is called when a '{' is encountered in a place where it might
-start a quantifier. It looks ahead to see if it really is a quantifier or not.
-It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
-where the ddds are digits.
-
-Arguments:
-  p         pointer to the first char after '{'
-
-Returns:    TRUE or FALSE
-*/
-
-static BOOL
-is_counted_repeat(const pcre_uchar *p)
-{
-if (!IS_DIGIT(*p)) return FALSE;
-p++;
-while (IS_DIGIT(*p)) p++;
-if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
-
-if (*p++ != CHAR_COMMA) return FALSE;
-if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
-
-if (!IS_DIGIT(*p)) return FALSE;
-p++;
-while (IS_DIGIT(*p)) p++;
-
-return (*p == CHAR_RIGHT_CURLY_BRACKET);
-}
-
-
-
-/*************************************************
-*            Handle escapes                      *
-*************************************************/
-
-/* This function is called when a \ has been encountered. It either returns a
-positive value for a simple escape such as \n, or 0 for a data character which
-will be placed in chptr. A backreference to group n is returned as negative n.
-When UTF-8 is enabled, a positive value greater than 255 may be returned in
-chptr. On entry, ptr is pointing at the \. On exit, it is on the final
-character of the escape sequence.
-
-Arguments:
-  ptrptr         points to the pattern position pointer
-  chptr          points to a returned data character
-  errorcodeptr   points to the errorcode variable
-  bracount       number of previous extracting brackets
-  options        the options bits
-  isclass        TRUE if inside a character class
-
-Returns:         zero => a data character
-                 positive => a special escape sequence
-                 negative => a back reference
-                 on error, errorcodeptr is set
-*/
-
-static int
-check_escape(const pcre_uchar **ptrptr, pcre_uint32 *chptr, int *errorcodeptr,
-  int bracount, int options, BOOL isclass)
-{
-/* PCRE_UTF16 has the same value as PCRE_UTF8. */
-BOOL utf = (options & PCRE_UTF8) != 0;
-const pcre_uchar *ptr = *ptrptr + 1;
-pcre_uint32 c;
-int escape = 0;
-int i;
-
-GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
-ptr--;                            /* Set pointer back to the last byte */
-
-/* If backslash is at the end of the pattern, it's an error. */
-
-if (c == CHAR_NULL) *errorcodeptr = ERR1;
-
-/* Non-alphanumerics are literals. For digits or letters, do an initial lookup
-in a table. A non-zero result is something that can be returned immediately.
-Otherwise further processing may be required. */
-
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-/* Not alphanumeric */
-else if (c < CHAR_0 || c > CHAR_z) {}
-else if ((i = escapes[c - CHAR_0]) != 0)
-  { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
-
-#else           /* EBCDIC coding */
-/* Not alphanumeric */
-else if (c < CHAR_a || (!MAX_255(c) || (ebcdic_chartab[c] & 0x0E) == 0)) {}
-else if ((i = escapes[c - 0x48]) != 0)  { if (i > 0) c = (pcre_uint32)i; else escape = -i; }
-#endif
-
-/* Escapes that need further processing, or are illegal. */
-
-else
-  {
-  const pcre_uchar *oldptr;
-  BOOL braced, negated, overflow;
-  int s;
-
-  switch (c)
-    {
-    /* A number of Perl escapes are not handled by PCRE. We give an explicit
-    error. */
-
-    case CHAR_l:
-    case CHAR_L:
-    *errorcodeptr = ERR37;
-    break;
-
-    case CHAR_u:
-    if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
-      {
-      /* In JavaScript, \u must be followed by four hexadecimal numbers.
-      Otherwise it is a lowercase u letter. */
-      if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
-        && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0
-        && MAX_255(ptr[3]) && (digitab[ptr[3]] & ctype_xdigit) != 0
-        && MAX_255(ptr[4]) && (digitab[ptr[4]] & ctype_xdigit) != 0)
-        {
-        c = 0;
-        for (i = 0; i < 4; ++i)
-          {
-          register pcre_uint32 cc = *(++ptr);
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
-          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
-#else           /* EBCDIC coding */
-          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
-          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
-#endif
-          }
-
-#if defined COMPILE_PCRE8
-        if (c > (utf ? 0x10ffffU : 0xffU))
-#elif defined COMPILE_PCRE16
-        if (c > (utf ? 0x10ffffU : 0xffffU))
-#elif defined COMPILE_PCRE32
-        if (utf && c > 0x10ffffU)
-#endif
-          {
-          *errorcodeptr = ERR76;
-          }
-        else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
-        }
-      }
-    else
-      *errorcodeptr = ERR37;
-    break;
-
-    case CHAR_U:
-    /* In JavaScript, \U is an uppercase U letter. */
-    if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
-    break;
-
-    /* In a character class, \g is just a literal "g". Outside a character
-    class, \g must be followed by one of a number of specific things:
-
-    (1) A number, either plain or braced. If positive, it is an absolute
-    backreference. If negative, it is a relative backreference. This is a Perl
-    5.10 feature.
-
-    (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
-    is part of Perl's movement towards a unified syntax for back references. As
-    this is synonymous with \k{name}, we fudge it up by pretending it really
-    was \k.
-
-    (3) For Oniguruma compatibility we also support \g followed by a name or a
-    number either in angle brackets or in single quotes. However, these are
-    (possibly recursive) subroutine calls, _not_ backreferences. Just return
-    the ESC_g code (cf \k). */
-
-    case CHAR_g:
-    if (isclass) break;
-    if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
-      {
-      escape = ESC_g;
-      break;
-      }
-
-    /* Handle the Perl-compatible cases */
-
-    if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
-      {
-      const pcre_uchar *p;
-      for (p = ptr+2; *p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
-        if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
-      if (*p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET)
-        {
-        escape = ESC_k;
-        break;
-        }
-      braced = TRUE;
-      ptr++;
-      }
-    else braced = FALSE;
-
-    if (ptr[1] == CHAR_MINUS)
-      {
-      negated = TRUE;
-      ptr++;
-      }
-    else negated = FALSE;
-
-    /* The integer range is limited by the machine's int representation. */
-    s = 0;
-    overflow = FALSE;
-    while (IS_DIGIT(ptr[1]))
-      {
-      if (s > INT_MAX / 10 - 1) /* Integer overflow */
-        {
-        overflow = TRUE;
-        break;
-        }
-      s = s * 10 + (int)(*(++ptr) - CHAR_0);
-      }
-    if (overflow) /* Integer overflow */
-      {
-      while (IS_DIGIT(ptr[1]))
-        ptr++;
-      *errorcodeptr = ERR61;
-      break;
-      }
-
-    if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
-      {
-      *errorcodeptr = ERR57;
-      break;
-      }
-
-    if (s == 0)
-      {
-      *errorcodeptr = ERR58;
-      break;
-      }
-
-    if (negated)
-      {
-      if (s > bracount)
-        {
-        *errorcodeptr = ERR15;
-        break;
-        }
-      s = bracount - (s - 1);
-      }
-
-    escape = -s;
-    break;
-
-    /* The handling of escape sequences consisting of a string of digits
-    starting with one that is not zero is not straightforward. Perl has changed
-    over the years. Nowadays \g{} for backreferences and \o{} for octal are
-    recommended to avoid the ambiguities in the old syntax.
-
-    Outside a character class, the digits are read as a decimal number. If the
-    number is less than 8 (used to be 10), or if there are that many previous
-    extracting left brackets, then it is a back reference. Otherwise, up to
-    three octal digits are read to form an escaped byte. Thus \123 is likely to
-    be octal 123 (cf \0123, which is octal 012 followed by the literal 3). If
-    the octal value is greater than 377, the least significant 8 bits are
-    taken. \8 and \9 are treated as the literal characters 8 and 9.
-
-    Inside a character class, \ followed by a digit is always either a literal
-    8 or 9 or an octal number. */
-
-    case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
-    case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
-
-    if (!isclass)
-      {
-      oldptr = ptr;
-      /* The integer range is limited by the machine's int representation. */
-      s = (int)(c -CHAR_0);
-      overflow = FALSE;
-      while (IS_DIGIT(ptr[1]))
-        {
-        if (s > INT_MAX / 10 - 1) /* Integer overflow */
-          {
-          overflow = TRUE;
-          break;
-          }
-        s = s * 10 + (int)(*(++ptr) - CHAR_0);
-        }
-      if (overflow) /* Integer overflow */
-        {
-        while (IS_DIGIT(ptr[1]))
-          ptr++;
-        *errorcodeptr = ERR61;
-        break;
-        }
-      if (s < 8 || s <= bracount)  /* Check for back reference */
-        {
-        escape = -s;
-        break;
-        }
-      ptr = oldptr;      /* Put the pointer back and fall through */
-      }
-
-    /* Handle a digit following \ when the number is not a back reference. If
-    the first digit is 8 or 9, Perl used to generate a binary zero byte and
-    then treat the digit as a following literal. At least by Perl 5.18 this
-    changed so as not to insert the binary zero. */
-
-    if ((c = *ptr) >= CHAR_8) break;
-
-    /* Fall through with a digit less than 8 */
-
-    /* \0 always starts an octal number, but we may drop through to here with a
-    larger first octal digit. The original code used just to take the least
-    significant 8 bits of octal numbers (I think this is what early Perls used
-    to do). Nowadays we allow for larger numbers in UTF-8 mode and 16-bit mode,
-    but no more than 3 octal digits. */
-
-    case CHAR_0:
-    c -= CHAR_0;
-    while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
-        c = c * 8 + *(++ptr) - CHAR_0;
-#ifdef COMPILE_PCRE8
-    if (!utf && c > 0xff) *errorcodeptr = ERR51;
-#endif
-    break;
-
-    /* \o is a relatively new Perl feature, supporting a more general way of
-    specifying character codes in octal. The only supported form is \o{ddd}. */
-
-    case CHAR_o:
-    if (ptr[1] != CHAR_LEFT_CURLY_BRACKET) *errorcodeptr = ERR81; else
-    if (ptr[2] == CHAR_RIGHT_CURLY_BRACKET) *errorcodeptr = ERR86; else
-      {
-      ptr += 2;
-      c = 0;
-      overflow = FALSE;
-      while (*ptr >= CHAR_0 && *ptr <= CHAR_7)
-        {
-        register pcre_uint32 cc = *ptr++;
-        if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
-#ifdef COMPILE_PCRE32
-        if (c >= 0x20000000l) { overflow = TRUE; break; }
-#endif
-        c = (c << 3) + cc - CHAR_0 ;
-#if defined COMPILE_PCRE8
-        if (c > (utf ? 0x10ffffU : 0xffU)) { overflow = TRUE; break; }
-#elif defined COMPILE_PCRE16
-        if (c > (utf ? 0x10ffffU : 0xffffU)) { overflow = TRUE; break; }
-#elif defined COMPILE_PCRE32
-        if (utf && c > 0x10ffffU) { overflow = TRUE; break; }
-#endif
-        }
-      if (overflow)
-        {
-        while (*ptr >= CHAR_0 && *ptr <= CHAR_7) ptr++;
-        *errorcodeptr = ERR34;
-        }
-      else if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
-        {
-        if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
-        }
-      else *errorcodeptr = ERR80;
-      }
-    break;
-
-    /* \x is complicated. In JavaScript, \x must be followed by two hexadecimal
-    numbers. Otherwise it is a lowercase x letter. */
-
-    case CHAR_x:
-    if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
-      {
-      if (MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0
-        && MAX_255(ptr[2]) && (digitab[ptr[2]] & ctype_xdigit) != 0)
-        {
-        c = 0;
-        for (i = 0; i < 2; ++i)
-          {
-          register pcre_uint32 cc = *(++ptr);
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
-          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
-#else           /* EBCDIC coding */
-          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
-          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
-#endif
-          }
-        }
-      }    /* End JavaScript handling */
-
-    /* Handle \x in Perl's style. \x{ddd} is a character number which can be
-    greater than 0xff in utf or non-8bit mode, but only if the ddd are hex
-    digits. If not, { used to be treated as a data character. However, Perl
-    seems to read hex digits up to the first non-such, and ignore the rest, so
-    that, for example \x{zz} matches a binary zero. This seems crazy, so PCRE
-    now gives an error. */
-
-    else
-      {
-      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
-        {
-        ptr += 2;
-        if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
-          {
-          *errorcodeptr = ERR86;
-          break;
-          }
-        c = 0;
-        overflow = FALSE;
-        while (MAX_255(*ptr) && (digitab[*ptr] & ctype_xdigit) != 0)
-          {
-          register pcre_uint32 cc = *ptr++;
-          if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
-
-#ifdef COMPILE_PCRE32
-          if (c >= 0x10000000l) { overflow = TRUE; break; }
-#endif
-
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-          if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
-          c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
-#else           /* EBCDIC coding */
-          if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
-          c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
-#endif
-
-#if defined COMPILE_PCRE8
-          if (c > (utf ? 0x10ffffU : 0xffU)) { overflow = TRUE; break; }
-#elif defined COMPILE_PCRE16
-          if (c > (utf ? 0x10ffffU : 0xffffU)) { overflow = TRUE; break; }
-#elif defined COMPILE_PCRE32
-          if (utf && c > 0x10ffffU) { overflow = TRUE; break; }
-#endif
-          }
-
-        if (overflow)
-          {
-          while (MAX_255(*ptr) && (digitab[*ptr] & ctype_xdigit) != 0) ptr++;
-          *errorcodeptr = ERR34;
-          }
-
-        else if (*ptr == CHAR_RIGHT_CURLY_BRACKET)
-          {
-          if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
-          }
-
-        /* If the sequence of hex digits does not end with '}', give an error.
-        We used just to recognize this construct and fall through to the normal
-        \x handling, but nowadays Perl gives an error, which seems much more
-        sensible, so we do too. */
-
-        else *errorcodeptr = ERR79;
-        }   /* End of \x{} processing */
-
-      /* Read a single-byte hex-defined char (up to two hex digits after \x) */
-
-      else
-        {
-        c = 0;
-        while (i++ < 2 && MAX_255(ptr[1]) && (digitab[ptr[1]] & ctype_xdigit) != 0)
-          {
-          pcre_uint32 cc;                          /* Some compilers don't like */
-          cc = *(++ptr);                           /* ++ in initializers */
-#ifndef EBCDIC  /* ASCII/UTF-8 coding */
-          if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
-          c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
-#else           /* EBCDIC coding */
-          if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
-          c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
-#endif
-          }
-        }     /* End of \xdd handling */
-      }       /* End of Perl-style \x handling */
-    break;
-
-    /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.
-    An error is given if the byte following \c is not an ASCII character. This
-    coding is ASCII-specific, but then the whole concept of \cx is
-    ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
-
-    case CHAR_c:
-    c = *(++ptr);
-    if (c == CHAR_NULL)
-      {
-      *errorcodeptr = ERR2;
-      break;
-      }
-#ifndef EBCDIC    /* ASCII/UTF-8 coding */
-    if (c > 127)  /* Excludes all non-ASCII in either mode */
-      {
-      *errorcodeptr = ERR68;
-      break;
-      }
-    if (c >= CHAR_a && c <= CHAR_z) c -= 32;
-    c ^= 0x40;
-#else             /* EBCDIC coding */
-    if (c >= CHAR_a && c <= CHAR_z) c += 64;
-    if (c == CHAR_QUESTION_MARK)
-      c = ('\\' == 188 && '`' == 74)? 0x5f : 0xff;
-    else
-      {
-      for (i = 0; i < 32; i++)
-        {
-        if (c == ebcdic_escape_c[i]) break;
-        }
-      if (i < 32) c = i; else *errorcodeptr = ERR68;
-      }
-#endif
-    break;
-
-    /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
-    other alphanumeric following \ is an error if PCRE_EXTRA was set;
-    otherwise, for Perl compatibility, it is a literal. This code looks a bit
-    odd, but there used to be some cases other than the default, and there may
-    be again in future, so I haven't "optimized" it. */
-
-    default:
-    if ((options & PCRE_EXTRA) != 0) switch(c)
-      {
-      default:
-      *errorcodeptr = ERR3;
-      break;
-      }
-    break;
-    }
-  }
-
-/* Perl supports \N{name} for character names, as well as plain \N for "not
-newline". PCRE does not support \N{name}. However, it does support
-quantification such as \N{2,3}. */
-
-if (escape == ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
-     !is_counted_repeat(ptr+2))
-  *errorcodeptr = ERR37;
-
-/* If PCRE_UCP is set, we change the values for \d etc. */
-
-if ((options & PCRE_UCP) != 0 && escape >= ESC_D && escape <= ESC_w)
-  escape += (ESC_DU - ESC_D);
-
-/* Set the pointer to the final character before returning. */
-
-*ptrptr = ptr;
-*chptr = c;
-return escape;
-}
-
-
-
-#ifdef SUPPORT_UCP
-/*************************************************
-*               Handle \P and \p                 *
-*************************************************/
-
-/* This function is called after \P or \p has been encountered, provided that
-PCRE is compiled with support for Unicode properties. On entry, ptrptr is
-pointing at the P or p. On exit, it is pointing at the final character of the
-escape sequence.
-
-Argument:
-  ptrptr         points to the pattern position pointer
-  negptr         points to a boolean that is set TRUE for negation else FALSE
-  ptypeptr       points to an unsigned int that is set to the type value
-  pdataptr       points to an unsigned int that is set to the detailed property value
-  errorcodeptr   points to the error code variable
-
-Returns:         TRUE if the type value was found, or FALSE for an invalid type
-*/
-
-static BOOL
-get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, unsigned int *ptypeptr,
-  unsigned int *pdataptr, int *errorcodeptr)
-{
-pcre_uchar c;
-int i, bot, top;
-const pcre_uchar *ptr = *ptrptr;
-pcre_uchar name[32];
-
-c = *(++ptr);
-if (c == CHAR_NULL) goto ERROR_RETURN;
-
-*negptr = FALSE;
-
-/* \P or \p can be followed by a name in {}, optionally preceded by ^ for
-negation. */
-
-if (c == CHAR_LEFT_CURLY_BRACKET)
-  {
-  if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
-    {
-    *negptr = TRUE;
-    ptr++;
-    }
-  for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
-    {
-    c = *(++ptr);
-    if (c == CHAR_NULL) goto ERROR_RETURN;
-    if (c == CHAR_RIGHT_CURLY_BRACKET) break;
-    name[i] = c;
-    }
-  if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
-  name[i] = 0;
-  }
-
-/* Otherwise there is just one following character */
-
-else
-  {
-  name[0] = c;
-  name[1] = 0;
-  }
-
-*ptrptr = ptr;
-
-/* Search for a recognized property name using binary chop */
-
-bot = 0;
-top = PRIV(utt_size);
-
-while (bot < top)
-  {
-  int r;
-  i = (bot + top) >> 1;
-  r = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
-  if (r == 0)
-    {
-    *ptypeptr = PRIV(utt)[i].type;
-    *pdataptr = PRIV(utt)[i].value;
-    return TRUE;
-    }
-  if (r > 0) bot = i + 1; else top = i;
-  }
-
-*errorcodeptr = ERR47;
-*ptrptr = ptr;
-return FALSE;
-
-ERROR_RETURN:
-*errorcodeptr = ERR46;
-*ptrptr = ptr;
-return FALSE;
-}
-#endif
-
-
-
-/*************************************************
-*         Read repeat counts                     *
-*************************************************/
-
-/* Read an item of the form {n,m} and return the values. This is called only
-after is_counted_repeat() has confirmed that a repeat-count quantifier exists,
-so the syntax is guaranteed to be correct, but we need to check the values.
-
-Arguments:
-  p              pointer to first char after '{'
-  minp           pointer to int for min
-  maxp           pointer to int for max
-                 returned as -1 if no max
-  errorcodeptr   points to error code variable
-
-Returns:         pointer to '}' on success;
-                 current ptr on error, with errorcodeptr set non-zero
-*/
-
-static const pcre_uchar *
-read_repeat_counts(const pcre_uchar *p, int *minp, int *maxp, int *errorcodeptr)
-{
-int min = 0;
-int max = -1;
-
-while (IS_DIGIT(*p))
-  {
-  min = min * 10 + (int)(*p++ - CHAR_0);
-  if (min > 65535)
-    {
-    *errorcodeptr = ERR5;
-    return p;
-    }
-  }
-
-if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
-  {
-  if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
-    {
-    max = 0;
-    while(IS_DIGIT(*p))
-      {
-      max = max * 10 + (int)(*p++ - CHAR_0);
-      if (max > 65535)
-        {
-        *errorcodeptr = ERR5;
-        return p;
-        }
-      }
-    if (max < min)
-      {
-      *errorcodeptr = ERR4;
-      return p;
-      }
-    }
-  }
-
-*minp = min;
-*maxp = max;
-return p;
-}
-
-
-
-/*************************************************
-*      Find first significant op code            *
-*************************************************/
-
-/* This is called by several functions that scan a compiled expression looking
-for a fixed first character, or an anchoring op code etc. It skips over things
-that do not influence this. For some calls, it makes sense to skip negative
-forward and all backward assertions, and also the \b assertion; for others it
-does not.
-
-Arguments:
-  code         pointer to the start of the group
-  skipassert   TRUE if certain assertions are to be skipped
-
-Returns:       pointer to the first significant opcode
-*/
-
-static const pcre_uchar*
-first_significant_code(const pcre_uchar *code, BOOL skipassert)
-{
-for (;;)
-  {
-  switch ((int)*code)
-    {
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    if (!skipassert) return code;
-    do code += GET(code, 1); while (*code == OP_ALT);
-    code += PRIV(OP_lengths)[*code];
-    break;
-
-    case OP_WORD_BOUNDARY:
-    case OP_NOT_WORD_BOUNDARY:
-    if (!skipassert) return code;
-    /* Fall through */
-
-    case OP_CALLOUT:
-    case OP_CREF:
-    case OP_DNCREF:
-    case OP_RREF:
-    case OP_DNRREF:
-    case OP_DEF:
-    code += PRIV(OP_lengths)[*code];
-    break;
-
-    default:
-    return code;
-    }
-  }
-/* Control never reaches here */
-}
-
-
-
-/*************************************************
-*        Find the fixed length of a branch       *
-*************************************************/
-
-/* Scan a branch and compute the fixed length of subject that will match it,
-if the length is fixed. This is needed for dealing with backward assertions.
-In UTF8 mode, the result is in characters rather than bytes. The branch is
-temporarily terminated with OP_END when this function is called.
-
-This function is called when a backward assertion is encountered, so that if it
-fails, the error message can point to the correct place in the pattern.
-However, we cannot do this when the assertion contains subroutine calls,
-because they can be forward references. We solve this by remembering this case
-and doing the check at the end; a flag specifies which mode we are running in.
-
-Arguments:
-  code     points to the start of the pattern (the bracket)
-  utf      TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  atend    TRUE if called when the pattern is complete
-  cd       the "compile data" structure
-  recurses    chain of recurse_check to catch mutual recursion
-
-Returns:   the fixed length,
-             or -1 if there is no fixed length,
-             or -2 if \C was encountered (in UTF-8 mode only)
-             or -3 if an OP_RECURSE item was encountered and atend is FALSE
-             or -4 if an unknown opcode was encountered (internal error)
-*/
-
-static int
-find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd,
-  recurse_check *recurses)
-{
-int length = -1;
-recurse_check this_recurse;
-register int branchlength = 0;
-register pcre_uchar *cc = code + 1 + LINK_SIZE;
-
-/* Scan along the opcodes for this branch. If we get to the end of the
-branch, check the length against that of the other branches. */
-
-for (;;)
-  {
-  int d;
-  pcre_uchar *ce, *cs;
-  register pcre_uchar op = *cc;
-
-  switch (op)
-    {
-    /* We only need to continue for OP_CBRA (normal capturing bracket) and
-    OP_BRA (normal non-capturing bracket) because the other variants of these
-    opcodes are all concerned with unlimited repeated groups, which of course
-    are not of fixed length. */
-
-    case OP_CBRA:
-    case OP_BRA:
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    case OP_COND:
-    d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd,
-      recurses);
-    if (d < 0) return d;
-    branchlength += d;
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Reached end of a branch; if it's a ket it is the end of a nested call.
-    If it's ALT it is an alternation in a nested call. An ACCEPT is effectively
-    an ALT. If it is END it's the end of the outer call. All can be handled by
-    the same code. Note that we must not include the OP_KETRxxx opcodes here,
-    because they all imply an unlimited repeat. */
-
-    case OP_ALT:
-    case OP_KET:
-    case OP_END:
-    case OP_ACCEPT:
-    case OP_ASSERT_ACCEPT:
-    if (length < 0) length = branchlength;
-      else if (length != branchlength) return -1;
-    if (*cc != OP_ALT) return length;
-    cc += 1 + LINK_SIZE;
-    branchlength = 0;
-    break;
-
-    /* A true recursion implies not fixed length, but a subroutine call may
-    be OK. If the subroutine is a forward reference, we can't deal with
-    it until the end of the pattern, so return -3. */
-
-    case OP_RECURSE:
-    if (!atend) return -3;
-    cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
-    do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
-    if (cc > cs && cc < ce) return -1;                    /* Recursion */
-    else   /* Check for mutual recursion */
-      {
-      recurse_check *r = recurses;
-      for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
-      if (r != NULL) return -1;   /* Mutual recursion */
-      }
-    this_recurse.prev = recurses;
-    this_recurse.group = cs;
-    d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd, &this_recurse);
-    if (d < 0) return d;
-    branchlength += d;
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Skip over assertive subpatterns */
-
-    case OP_ASSERT:
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Skip over things that don't match chars */
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_SKIP_ARG:
-    case OP_THEN_ARG:
-    cc += cc[1] + PRIV(OP_lengths)[*cc];
-    break;
-
-    case OP_CALLOUT:
-    case OP_CIRC:
-    case OP_CIRCM:
-    case OP_CLOSE:
-    case OP_COMMIT:
-    case OP_CREF:
-    case OP_DEF:
-    case OP_DNCREF:
-    case OP_DNRREF:
-    case OP_DOLL:
-    case OP_DOLLM:
-    case OP_EOD:
-    case OP_EODN:
-    case OP_FAIL:
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_PRUNE:
-    case OP_REVERSE:
-    case OP_RREF:
-    case OP_SET_SOM:
-    case OP_SKIP:
-    case OP_SOD:
-    case OP_SOM:
-    case OP_THEN:
-    case OP_WORD_BOUNDARY:
-    cc += PRIV(OP_lengths)[*cc];
-    break;
-
-    /* Handle literal characters */
-
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-    branchlength++;
-    cc += 2;
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    /* Handle exact repetitions. The count is already in characters, but we
-    need to skip over a multibyte character in UTF8 mode.  */
-
-    case OP_EXACT:
-    case OP_EXACTI:
-    case OP_NOTEXACT:
-    case OP_NOTEXACTI:
-    branchlength += (int)GET2(cc,1);
-    cc += 2 + IMM2_SIZE;
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    case OP_TYPEEXACT:
-    branchlength += GET2(cc,1);
-    if (cc[1 + IMM2_SIZE] == OP_PROP || cc[1 + IMM2_SIZE] == OP_NOTPROP)
-      cc += 2;
-    cc += 1 + IMM2_SIZE + 1;
-    break;
-
-    /* Handle single-char matchers */
-
-    case OP_PROP:
-    case OP_NOTPROP:
-    cc += 2;
-    /* Fall through */
-
-    case OP_HSPACE:
-    case OP_VSPACE:
-    case OP_NOT_HSPACE:
-    case OP_NOT_VSPACE:
-    case OP_NOT_DIGIT:
-    case OP_DIGIT:
-    case OP_NOT_WHITESPACE:
-    case OP_WHITESPACE:
-    case OP_NOT_WORDCHAR:
-    case OP_WORDCHAR:
-    case OP_ANY:
-    case OP_ALLANY:
-    branchlength++;
-    cc++;
-    break;
-
-    /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
-    otherwise \C is coded as OP_ALLANY. */
-
-    case OP_ANYBYTE:
-    return -2;
-
-    /* Check a class for variable quantification */
-
-    case OP_CLASS:
-    case OP_NCLASS:
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-    case OP_XCLASS:
-    /* The original code caused an unsigned overflow in 64 bit systems,
-    so now we use a conditional statement. */
-    if (op == OP_XCLASS)
-      cc += GET(cc, 1);
-    else
-      cc += PRIV(OP_lengths)[OP_CLASS];
-#else
-    cc += PRIV(OP_lengths)[OP_CLASS];
-#endif
-
-    switch (*cc)
-      {
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRPLUS:
-      case OP_CRMINPLUS:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      case OP_CRPOSSTAR:
-      case OP_CRPOSPLUS:
-      case OP_CRPOSQUERY:
-      return -1;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      case OP_CRPOSRANGE:
-      if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
-      branchlength += (int)GET2(cc,1);
-      cc += 1 + 2 * IMM2_SIZE;
-      break;
-
-      default:
-      branchlength++;
-      }
-    break;
-
-    /* Anything else is variable length */
-
-    case OP_ANYNL:
-    case OP_BRAMINZERO:
-    case OP_BRAPOS:
-    case OP_BRAPOSZERO:
-    case OP_BRAZERO:
-    case OP_CBRAPOS:
-    case OP_EXTUNI:
-    case OP_KETRMAX:
-    case OP_KETRMIN:
-    case OP_KETRPOS:
-    case OP_MINPLUS:
-    case OP_MINPLUSI:
-    case OP_MINQUERY:
-    case OP_MINQUERYI:
-    case OP_MINSTAR:
-    case OP_MINSTARI:
-    case OP_MINUPTO:
-    case OP_MINUPTOI:
-    case OP_NOTMINPLUS:
-    case OP_NOTMINPLUSI:
-    case OP_NOTMINQUERY:
-    case OP_NOTMINQUERYI:
-    case OP_NOTMINSTAR:
-    case OP_NOTMINSTARI:
-    case OP_NOTMINUPTO:
-    case OP_NOTMINUPTOI:
-    case OP_NOTPLUS:
-    case OP_NOTPLUSI:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSPLUSI:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSQUERYI:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSSTARI:
-    case OP_NOTPOSUPTO:
-    case OP_NOTPOSUPTOI:
-    case OP_NOTQUERY:
-    case OP_NOTQUERYI:
-    case OP_NOTSTAR:
-    case OP_NOTSTARI:
-    case OP_NOTUPTO:
-    case OP_NOTUPTOI:
-    case OP_PLUS:
-    case OP_PLUSI:
-    case OP_POSPLUS:
-    case OP_POSPLUSI:
-    case OP_POSQUERY:
-    case OP_POSQUERYI:
-    case OP_POSSTAR:
-    case OP_POSSTARI:
-    case OP_POSUPTO:
-    case OP_POSUPTOI:
-    case OP_QUERY:
-    case OP_QUERYI:
-    case OP_REF:
-    case OP_REFI:
-    case OP_DNREF:
-    case OP_DNREFI:
-    case OP_SBRA:
-    case OP_SBRAPOS:
-    case OP_SCBRA:
-    case OP_SCBRAPOS:
-    case OP_SCOND:
-    case OP_SKIPZERO:
-    case OP_STAR:
-    case OP_STARI:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEPLUS:
-    case OP_TYPEPOSPLUS:
-    case OP_TYPEPOSQUERY:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEPOSUPTO:
-    case OP_TYPEQUERY:
-    case OP_TYPESTAR:
-    case OP_TYPEUPTO:
-    case OP_UPTO:
-    case OP_UPTOI:
-    return -1;
-
-    /* Catch unrecognized opcodes so that when new ones are added they
-    are not forgotten, as has happened in the past. */
-
-    default:
-    return -4;
-    }
-  }
-/* Control never gets here */
-}
-
-
-
-/*************************************************
-*    Scan compiled regex for specific bracket    *
-*************************************************/
-
-/* This little function scans through a compiled pattern until it finds a
-capturing bracket with the given number, or, if the number is negative, an
-instance of OP_REVERSE for a lookbehind. The function is global in the C sense
-so that it can be called from pcre_study() when finding the minimum matching
-length.
-
-Arguments:
-  code        points to start of expression
-  utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  number      the required bracket number or negative to find a lookbehind
-
-Returns:      pointer to the opcode for the bracket, or NULL if not found
-*/
-
-const pcre_uchar *
-PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number)
-{
-for (;;)
-  {
-  register pcre_uchar c = *code;
-
-  if (c == OP_END) return NULL;
-
-  /* XCLASS is used for classes that cannot be represented just by a bit
-  map. This includes negated single high-valued characters. The length in
-  the table is zero; the actual length is stored in the compiled code. */
-
-  if (c == OP_XCLASS) code += GET(code, 1);
-
-  /* Handle recursion */
-
-  else if (c == OP_REVERSE)
-    {
-    if (number < 0) return (pcre_uchar *)code;
-    code += PRIV(OP_lengths)[c];
-    }
-
-  /* Handle capturing bracket */
-
-  else if (c == OP_CBRA || c == OP_SCBRA ||
-           c == OP_CBRAPOS || c == OP_SCBRAPOS)
-    {
-    int n = (int)GET2(code, 1+LINK_SIZE);
-    if (n == number) return (pcre_uchar *)code;
-    code += PRIV(OP_lengths)[c];
-    }
-
-  /* Otherwise, we can get the item's length from the table, except that for
-  repeated character types, we have to test for \p and \P, which have an extra
-  two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
-  must add in its length. */
-
-  else
-    {
-    switch(c)
-      {
-      case OP_TYPESTAR:
-      case OP_TYPEMINSTAR:
-      case OP_TYPEPLUS:
-      case OP_TYPEMINPLUS:
-      case OP_TYPEQUERY:
-      case OP_TYPEMINQUERY:
-      case OP_TYPEPOSSTAR:
-      case OP_TYPEPOSPLUS:
-      case OP_TYPEPOSQUERY:
-      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
-      break;
-
-      case OP_TYPEUPTO:
-      case OP_TYPEMINUPTO:
-      case OP_TYPEEXACT:
-      case OP_TYPEPOSUPTO:
-      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
-        code += 2;
-      break;
-
-      case OP_MARK:
-      case OP_PRUNE_ARG:
-      case OP_SKIP_ARG:
-      case OP_THEN_ARG:
-      code += code[1];
-      break;
-      }
-
-    /* Add in the fixed length from the table */
-
-    code += PRIV(OP_lengths)[c];
-
-  /* In UTF-8 mode, opcodes that are followed by a character may be followed by
-  a multi-byte character. The length in the table is a minimum, so we have to
-  arrange to skip the extra bytes. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (utf) switch(c)
-      {
-      case OP_CHAR:
-      case OP_CHARI:
-      case OP_NOT:
-      case OP_NOTI:
-      case OP_EXACT:
-      case OP_EXACTI:
-      case OP_NOTEXACT:
-      case OP_NOTEXACTI:
-      case OP_UPTO:
-      case OP_UPTOI:
-      case OP_NOTUPTO:
-      case OP_NOTUPTOI:
-      case OP_MINUPTO:
-      case OP_MINUPTOI:
-      case OP_NOTMINUPTO:
-      case OP_NOTMINUPTOI:
-      case OP_POSUPTO:
-      case OP_POSUPTOI:
-      case OP_NOTPOSUPTO:
-      case OP_NOTPOSUPTOI:
-      case OP_STAR:
-      case OP_STARI:
-      case OP_NOTSTAR:
-      case OP_NOTSTARI:
-      case OP_MINSTAR:
-      case OP_MINSTARI:
-      case OP_NOTMINSTAR:
-      case OP_NOTMINSTARI:
-      case OP_POSSTAR:
-      case OP_POSSTARI:
-      case OP_NOTPOSSTAR:
-      case OP_NOTPOSSTARI:
-      case OP_PLUS:
-      case OP_PLUSI:
-      case OP_NOTPLUS:
-      case OP_NOTPLUSI:
-      case OP_MINPLUS:
-      case OP_MINPLUSI:
-      case OP_NOTMINPLUS:
-      case OP_NOTMINPLUSI:
-      case OP_POSPLUS:
-      case OP_POSPLUSI:
-      case OP_NOTPOSPLUS:
-      case OP_NOTPOSPLUSI:
-      case OP_QUERY:
-      case OP_QUERYI:
-      case OP_NOTQUERY:
-      case OP_NOTQUERYI:
-      case OP_MINQUERY:
-      case OP_MINQUERYI:
-      case OP_NOTMINQUERY:
-      case OP_NOTMINQUERYI:
-      case OP_POSQUERY:
-      case OP_POSQUERYI:
-      case OP_NOTPOSQUERY:
-      case OP_NOTPOSQUERYI:
-      if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
-      break;
-      }
-#else
-    (void)(utf);  /* Keep compiler happy by referencing function argument */
-#endif
-    }
-  }
-}
-
-
-
-/*************************************************
-*   Scan compiled regex for recursion reference  *
-*************************************************/
-
-/* This little function scans through a compiled pattern until it finds an
-instance of OP_RECURSE.
-
-Arguments:
-  code        points to start of expression
-  utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
-
-Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
-*/
-
-static const pcre_uchar *
-find_recurse(const pcre_uchar *code, BOOL utf)
-{
-for (;;)
-  {
-  register pcre_uchar c = *code;
-  if (c == OP_END) return NULL;
-  if (c == OP_RECURSE) return code;
-
-  /* XCLASS is used for classes that cannot be represented just by a bit
-  map. This includes negated single high-valued characters. The length in
-  the table is zero; the actual length is stored in the compiled code. */
-
-  if (c == OP_XCLASS) code += GET(code, 1);
-
-  /* Otherwise, we can get the item's length from the table, except that for
-  repeated character types, we have to test for \p and \P, which have an extra
-  two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
-  must add in its length. */
-
-  else
-    {
-    switch(c)
-      {
-      case OP_TYPESTAR:
-      case OP_TYPEMINSTAR:
-      case OP_TYPEPLUS:
-      case OP_TYPEMINPLUS:
-      case OP_TYPEQUERY:
-      case OP_TYPEMINQUERY:
-      case OP_TYPEPOSSTAR:
-      case OP_TYPEPOSPLUS:
-      case OP_TYPEPOSQUERY:
-      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
-      break;
-
-      case OP_TYPEPOSUPTO:
-      case OP_TYPEUPTO:
-      case OP_TYPEMINUPTO:
-      case OP_TYPEEXACT:
-      if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
-        code += 2;
-      break;
-
-      case OP_MARK:
-      case OP_PRUNE_ARG:
-      case OP_SKIP_ARG:
-      case OP_THEN_ARG:
-      code += code[1];
-      break;
-      }
-
-    /* Add in the fixed length from the table */
-
-    code += PRIV(OP_lengths)[c];
-
-    /* In UTF-8 mode, opcodes that are followed by a character may be followed
-    by a multi-byte character. The length in the table is a minimum, so we have
-    to arrange to skip the extra bytes. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (utf) switch(c)
-      {
-      case OP_CHAR:
-      case OP_CHARI:
-      case OP_NOT:
-      case OP_NOTI:
-      case OP_EXACT:
-      case OP_EXACTI:
-      case OP_NOTEXACT:
-      case OP_NOTEXACTI:
-      case OP_UPTO:
-      case OP_UPTOI:
-      case OP_NOTUPTO:
-      case OP_NOTUPTOI:
-      case OP_MINUPTO:
-      case OP_MINUPTOI:
-      case OP_NOTMINUPTO:
-      case OP_NOTMINUPTOI:
-      case OP_POSUPTO:
-      case OP_POSUPTOI:
-      case OP_NOTPOSUPTO:
-      case OP_NOTPOSUPTOI:
-      case OP_STAR:
-      case OP_STARI:
-      case OP_NOTSTAR:
-      case OP_NOTSTARI:
-      case OP_MINSTAR:
-      case OP_MINSTARI:
-      case OP_NOTMINSTAR:
-      case OP_NOTMINSTARI:
-      case OP_POSSTAR:
-      case OP_POSSTARI:
-      case OP_NOTPOSSTAR:
-      case OP_NOTPOSSTARI:
-      case OP_PLUS:
-      case OP_PLUSI:
-      case OP_NOTPLUS:
-      case OP_NOTPLUSI:
-      case OP_MINPLUS:
-      case OP_MINPLUSI:
-      case OP_NOTMINPLUS:
-      case OP_NOTMINPLUSI:
-      case OP_POSPLUS:
-      case OP_POSPLUSI:
-      case OP_NOTPOSPLUS:
-      case OP_NOTPOSPLUSI:
-      case OP_QUERY:
-      case OP_QUERYI:
-      case OP_NOTQUERY:
-      case OP_NOTQUERYI:
-      case OP_MINQUERY:
-      case OP_MINQUERYI:
-      case OP_NOTMINQUERY:
-      case OP_NOTMINQUERYI:
-      case OP_POSQUERY:
-      case OP_POSQUERYI:
-      case OP_NOTPOSQUERY:
-      case OP_NOTPOSQUERYI:
-      if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
-      break;
-      }
-#else
-    (void)(utf);  /* Keep compiler happy by referencing function argument */
-#endif
-    }
-  }
-}
-
-
-
-/*************************************************
-*    Scan compiled branch for non-emptiness      *
-*************************************************/
-
-/* This function scans through a branch of a compiled pattern to see whether it
-can match the empty string or not. It is called from could_be_empty()
-below and from compile_branch() when checking for an unlimited repeat of a
-group that can match nothing. Note that first_significant_code() skips over
-backward and negative forward assertions when its final argument is TRUE. If we
-hit an unclosed bracket, we return "empty" - this means we've struck an inner
-bracket whose current branch will already have been scanned.
-
-Arguments:
-  code        points to start of search
-  endcode     points to where to stop
-  utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
-  cd          contains pointers to tables etc.
-  recurses    chain of recurse_check to catch mutual recursion
-
-Returns:      TRUE if what is matched could be empty
-*/
-
-static BOOL
-could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
-  BOOL utf, compile_data *cd, recurse_check *recurses)
-{
-register pcre_uchar c;
-recurse_check this_recurse;
-
-for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
-     code < endcode;
-     code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
-  {
-  const pcre_uchar *ccode;
-
-  c = *code;
-
-  /* Skip over forward assertions; the other assertions are skipped by
-  first_significant_code() with a TRUE final argument. */
-
-  if (c == OP_ASSERT)
-    {
-    do code += GET(code, 1); while (*code == OP_ALT);
-    c = *code;
-    continue;
-    }
-
-  /* For a recursion/subroutine call, if its end has been reached, which
-  implies a backward reference subroutine call, we can scan it. If it's a
-  forward reference subroutine call, we can't. To detect forward reference
-  we have to scan up the list that is kept in the workspace. This function is
-  called only when doing the real compile, not during the pre-compile that
-  measures the size of the compiled pattern. */
-
-  if (c == OP_RECURSE)
-    {
-    const pcre_uchar *scode = cd->start_code + GET(code, 1);
-    const pcre_uchar *endgroup = scode;
-    BOOL empty_branch;
-
-    /* Test for forward reference or uncompleted reference. This is disabled
-    when called to scan a completed pattern by setting cd->start_workspace to
-    NULL. */
-
-    if (cd->start_workspace != NULL)
-      {
-      const pcre_uchar *tcode;
-      for (tcode = cd->start_workspace; tcode < cd->hwm; tcode += LINK_SIZE)
-        if ((int)GET(tcode, 0) == (int)(code + 1 - cd->start_code)) return TRUE;
-      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
-      }
-
-    /* If the reference is to a completed group, we need to detect whether this
-    is a recursive call, as otherwise there will be an infinite loop. If it is
-    a recursion, just skip over it. Simple recursions are easily detected. For
-    mutual recursions we keep a chain on the stack. */
-
-    do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT);
-    if (code >= scode && code <= endgroup) continue;  /* Simple recursion */
-    else
-      {
-      recurse_check *r = recurses;
-      for (r = recurses; r != NULL; r = r->prev)
-        if (r->group == scode) break;
-      if (r != NULL) continue;   /* Mutual recursion */
-      }
-
-    /* Completed reference; scan the referenced group, remembering it on the
-    stack chain to detect mutual recursions. */
-
-    empty_branch = FALSE;
-    this_recurse.prev = recurses;
-    this_recurse.group = scode;
-
-    do
-      {
-      if (could_be_empty_branch(scode, endcode, utf, cd, &this_recurse))
-        {
-        empty_branch = TRUE;
-        break;
-        }
-      scode += GET(scode, 1);
-      }
-    while (*scode == OP_ALT);
-
-    if (!empty_branch) return FALSE;  /* All branches are non-empty */
-    continue;
-    }
-
-  /* Groups with zero repeats can of course be empty; skip them. */
-
-  if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
-      c == OP_BRAPOSZERO)
-    {
-    code += PRIV(OP_lengths)[c];
-    do code += GET(code, 1); while (*code == OP_ALT);
-    c = *code;
-    continue;
-    }
-
-  /* A nested group that is already marked as "could be empty" can just be
-  skipped. */
-
-  if (c == OP_SBRA  || c == OP_SBRAPOS ||
-      c == OP_SCBRA || c == OP_SCBRAPOS)
-    {
-    do code += GET(code, 1); while (*code == OP_ALT);
-    c = *code;
-    continue;
-    }
-
-  /* For other groups, scan the branches. */
-
-  if (c == OP_BRA  || c == OP_BRAPOS ||
-      c == OP_CBRA || c == OP_CBRAPOS ||
-      c == OP_ONCE || c == OP_ONCE_NC ||
-      c == OP_COND || c == OP_SCOND)
-    {
-    BOOL empty_branch;
-    if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
-
-    /* If a conditional group has only one branch, there is a second, implied,
-    empty branch, so just skip over the conditional, because it could be empty.
-    Otherwise, scan the individual branches of the group. */
-
-    if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
-      code += GET(code, 1);
-    else
-      {
-      empty_branch = FALSE;
-      do
-        {
-        if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd,
-          recurses)) empty_branch = TRUE;
-        code += GET(code, 1);
-        }
-      while (*code == OP_ALT);
-      if (!empty_branch) return FALSE;   /* All branches are non-empty */
-      }
-
-    c = *code;
-    continue;
-    }
-
-  /* Handle the other opcodes */
-
-  switch (c)
-    {
-    /* Check for quantifiers after a class. XCLASS is used for classes that
-    cannot be represented just by a bit map. This includes negated single
-    high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
-    actual length is stored in the compiled code, so we must update "code"
-    here. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-    ccode = code += GET(code, 1);
-    goto CHECK_CLASS_REPEAT;
-#endif
-
-    case OP_CLASS:
-    case OP_NCLASS:
-    ccode = code + PRIV(OP_lengths)[OP_CLASS];
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    CHECK_CLASS_REPEAT:
-#endif
-
-    switch (*ccode)
-      {
-      case OP_CRSTAR:            /* These could be empty; continue */
-      case OP_CRMINSTAR:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      case OP_CRPOSSTAR:
-      case OP_CRPOSQUERY:
-      break;
-
-      default:                   /* Non-repeat => class must match */
-      case OP_CRPLUS:            /* These repeats aren't empty */
-      case OP_CRMINPLUS:
-      case OP_CRPOSPLUS:
-      return FALSE;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      case OP_CRPOSRANGE:
-      if (GET2(ccode, 1) > 0) return FALSE;  /* Minimum > 0 */
-      break;
-      }
-    break;
-
-    /* Opcodes that must match a character */
-
-    case OP_ANY:
-    case OP_ALLANY:
-    case OP_ANYBYTE:
-
-    case OP_PROP:
-    case OP_NOTPROP:
-    case OP_ANYNL:
-
-    case OP_NOT_HSPACE:
-    case OP_HSPACE:
-    case OP_NOT_VSPACE:
-    case OP_VSPACE:
-    case OP_EXTUNI:
-
-    case OP_NOT_DIGIT:
-    case OP_DIGIT:
-    case OP_NOT_WHITESPACE:
-    case OP_WHITESPACE:
-    case OP_NOT_WORDCHAR:
-    case OP_WORDCHAR:
-
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-
-    case OP_PLUS:
-    case OP_PLUSI:
-    case OP_MINPLUS:
-    case OP_MINPLUSI:
-
-    case OP_NOTPLUS:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUS:
-    case OP_NOTMINPLUSI:
-
-    case OP_POSPLUS:
-    case OP_POSPLUSI:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSPLUSI:
-
-    case OP_EXACT:
-    case OP_EXACTI:
-    case OP_NOTEXACT:
-    case OP_NOTEXACTI:
-
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEPOSPLUS:
-    case OP_TYPEEXACT:
-
-    return FALSE;
-
-    /* These are going to continue, as they may be empty, but we have to
-    fudge the length for the \p and \P cases. */
-
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEPOSQUERY:
-    if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
-    break;
-
-    /* Same for these */
-
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEPOSUPTO:
-    if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
-      code += 2;
-    break;
-
-    /* End of branch */
-
-    case OP_KET:
-    case OP_KETRMAX:
-    case OP_KETRMIN:
-    case OP_KETRPOS:
-    case OP_ALT:
-    return TRUE;
-
-    /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
-    MINUPTO, and POSUPTO and their caseless and negative versions may be
-    followed by a multibyte character. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    case OP_STAR:
-    case OP_STARI:
-    case OP_NOTSTAR:
-    case OP_NOTSTARI:
-
-    case OP_MINSTAR:
-    case OP_MINSTARI:
-    case OP_NOTMINSTAR:
-    case OP_NOTMINSTARI:
-
-    case OP_POSSTAR:
-    case OP_POSSTARI:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSSTARI:
-
-    case OP_QUERY:
-    case OP_QUERYI:
-    case OP_NOTQUERY:
-    case OP_NOTQUERYI:
-
-    case OP_MINQUERY:
-    case OP_MINQUERYI:
-    case OP_NOTMINQUERY:
-    case OP_NOTMINQUERYI:
-
-    case OP_POSQUERY:
-    case OP_POSQUERYI:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSQUERYI:
-
-    if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
-    break;
-
-    case OP_UPTO:
-    case OP_UPTOI:
-    case OP_NOTUPTO:
-    case OP_NOTUPTOI:
-
-    case OP_MINUPTO:
-    case OP_MINUPTOI:
-    case OP_NOTMINUPTO:
-    case OP_NOTMINUPTOI:
-
-    case OP_POSUPTO:
-    case OP_POSUPTOI:
-    case OP_NOTPOSUPTO:
-    case OP_NOTPOSUPTOI:
-
-    if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
-    break;
-#endif
-
-    /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
-    string. */
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_SKIP_ARG:
-    case OP_THEN_ARG:
-    code += code[1];
-    break;
-
-    /* None of the remaining opcodes are required to match a character. */
-
-    default:
-    break;
-    }
-  }
-
-return TRUE;
-}
-
-
-
-/*************************************************
-*    Scan compiled regex for non-emptiness       *
-*************************************************/
-
-/* This function is called to check for left recursive calls. We want to check
-the current branch of the current pattern to see if it could match the empty
-string. If it could, we must look outwards for branches at other levels,
-stopping when we pass beyond the bracket which is the subject of the recursion.
-This function is called only during the real compile, not during the
-pre-compile.
-
-Arguments:
-  code        points to start of the recursion
-  endcode     points to where to stop (current RECURSE item)
-  bcptr       points to the chain of current (unclosed) branch starts
-  utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
-  cd          pointers to tables etc
-
-Returns:      TRUE if what is matched could be empty
-*/
-
-static BOOL
-could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
-  branch_chain *bcptr, BOOL utf, compile_data *cd)
-{
-while (bcptr != NULL && bcptr->current_branch >= code)
-  {
-  if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd, NULL))
-    return FALSE;
-  bcptr = bcptr->outer;
-  }
-return TRUE;
-}
-
-
-
-/*************************************************
-*        Base opcode of repeated opcodes         *
-*************************************************/
-
-/* Returns the base opcode for repeated single character type opcodes. If the
-opcode is not a repeated character type, it returns with the original value.
-
-Arguments:  c opcode
-Returns:    base opcode for the type
-*/
-
-static pcre_uchar
-get_repeat_base(pcre_uchar c)
-{
-return (c > OP_TYPEPOSUPTO)? c :
-       (c >= OP_TYPESTAR)?   OP_TYPESTAR :
-       (c >= OP_NOTSTARI)?   OP_NOTSTARI :
-       (c >= OP_NOTSTAR)?    OP_NOTSTAR :
-       (c >= OP_STARI)?      OP_STARI :
-                             OP_STAR;
-}
-
-
-
-#ifdef SUPPORT_UCP
-/*************************************************
-*        Check a character and a property        *
-*************************************************/
-
-/* This function is called by check_auto_possessive() when a property item
-is adjacent to a fixed character.
-
-Arguments:
-  c            the character
-  ptype        the property type
-  pdata        the data for the type
-  negated      TRUE if it's a negated property (\P or \p{^)
-
-Returns:       TRUE if auto-possessifying is OK
-*/
-
-static BOOL
-check_char_prop(pcre_uint32 c, unsigned int ptype, unsigned int pdata,
-  BOOL negated)
-{
-const pcre_uint32 *p;
-const ucd_record *prop = GET_UCD(c);
-
-switch(ptype)
-  {
-  case PT_LAMP:
-  return (prop->chartype == ucp_Lu ||
-          prop->chartype == ucp_Ll ||
-          prop->chartype == ucp_Lt) == negated;
-
-  case PT_GC:
-  return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
-
-  case PT_PC:
-  return (pdata == prop->chartype) == negated;
-
-  case PT_SC:
-  return (pdata == prop->script) == negated;
-
-  /* These are specials */
-
-  case PT_ALNUM:
-  return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-          PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
-
-  /* Perl space used to exclude VT, but from Perl 5.18 it is included, which
-  means that Perl space and POSIX space are now identical. PCRE was changed
-  at release 8.34. */
-
-  case PT_SPACE:    /* Perl space */
-  case PT_PXSPACE:  /* POSIX space */
-  switch(c)
-    {
-    HSPACE_CASES:
-    VSPACE_CASES:
-    return negated;
-
-    default:
-    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == negated;
-    }
-  break;  /* Control never reaches here */
-
-  case PT_WORD:
-  return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-          PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
-          c == CHAR_UNDERSCORE) == negated;
-
-  case PT_CLIST:
-  p = PRIV(ucd_caseless_sets) + prop->caseset;
-  for (;;)
-    {
-    if (c < *p) return !negated;
-    if (c == *p++) return negated;
-    }
-  break;  /* Control never reaches here */
-  }
-
-return FALSE;
-}
-#endif  /* SUPPORT_UCP */
-
-
-
-/*************************************************
-*        Fill the character property list        *
-*************************************************/
-
-/* Checks whether the code points to an opcode that can take part in auto-
-possessification, and if so, fills a list with its properties.
-
-Arguments:
-  code        points to start of expression
-  utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
-  fcc         points to case-flipping table
-  list        points to output list
-              list[0] will be filled with the opcode
-              list[1] will be non-zero if this opcode
-                can match an empty character string
-              list[2..7] depends on the opcode
-
-Returns:      points to the start of the next opcode if *code is accepted
-              NULL if *code is not accepted
-*/
-
-static const pcre_uchar *
-get_chr_property_list(const pcre_uchar *code, BOOL utf,
-  const pcre_uint8 *fcc, pcre_uint32 *list)
-{
-pcre_uchar c = *code;
-pcre_uchar base;
-const pcre_uchar *end;
-pcre_uint32 chr;
-
-#ifdef SUPPORT_UCP
-pcre_uint32 *clist_dest;
-const pcre_uint32 *clist_src;
-#else
-utf = utf;  /* Suppress "unused parameter" compiler warning */
-#endif
-
-list[0] = c;
-list[1] = FALSE;
-code++;
-
-if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
-  {
-  base = get_repeat_base(c);
-  c -= (base - OP_STAR);
-
-  if (c == OP_UPTO || c == OP_MINUPTO || c == OP_EXACT || c == OP_POSUPTO)
-    code += IMM2_SIZE;
-
-  list[1] = (c != OP_PLUS && c != OP_MINPLUS && c != OP_EXACT && c != OP_POSPLUS);
-
-  switch(base)
-    {
-    case OP_STAR:
-    list[0] = OP_CHAR;
-    break;
-
-    case OP_STARI:
-    list[0] = OP_CHARI;
-    break;
-
-    case OP_NOTSTAR:
-    list[0] = OP_NOT;
-    break;
-
-    case OP_NOTSTARI:
-    list[0] = OP_NOTI;
-    break;
-
-    case OP_TYPESTAR:
-    list[0] = *code;
-    code++;
-    break;
-    }
-  c = list[0];
-  }
-
-switch(c)
-  {
-  case OP_NOT_DIGIT:
-  case OP_DIGIT:
-  case OP_NOT_WHITESPACE:
-  case OP_WHITESPACE:
-  case OP_NOT_WORDCHAR:
-  case OP_WORDCHAR:
-  case OP_ANY:
-  case OP_ALLANY:
-  case OP_ANYNL:
-  case OP_NOT_HSPACE:
-  case OP_HSPACE:
-  case OP_NOT_VSPACE:
-  case OP_VSPACE:
-  case OP_EXTUNI:
-  case OP_EODN:
-  case OP_EOD:
-  case OP_DOLL:
-  case OP_DOLLM:
-  return code;
-
-  case OP_CHAR:
-  case OP_NOT:
-  GETCHARINCTEST(chr, code);
-  list[2] = chr;
-  list[3] = NOTACHAR;
-  return code;
-
-  case OP_CHARI:
-  case OP_NOTI:
-  list[0] = (c == OP_CHARI) ? OP_CHAR : OP_NOT;
-  GETCHARINCTEST(chr, code);
-  list[2] = chr;
-
-#ifdef SUPPORT_UCP
-  if (chr < 128 || (chr < 256 && !utf))
-    list[3] = fcc[chr];
-  else
-    list[3] = UCD_OTHERCASE(chr);
-#elif defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  list[3] = (chr < 256) ? fcc[chr] : chr;
-#else
-  list[3] = fcc[chr];
-#endif
-
-  /* The othercase might be the same value. */
-
-  if (chr == list[3])
-    list[3] = NOTACHAR;
-  else
-    list[4] = NOTACHAR;
-  return code;
-
-#ifdef SUPPORT_UCP
-  case OP_PROP:
-  case OP_NOTPROP:
-  if (code[0] != PT_CLIST)
-    {
-    list[2] = code[0];
-    list[3] = code[1];
-    return code + 2;
-    }
-
-  /* Convert only if we have enough space. */
-
-  clist_src = PRIV(ucd_caseless_sets) + code[1];
-  clist_dest = list + 2;
-  code += 2;
-
-  do {
-     if (clist_dest >= list + 8)
-       {
-       /* Early return if there is not enough space. This should never
-       happen, since all clists are shorter than 5 character now. */
-       list[2] = code[0];
-       list[3] = code[1];
-       return code;
-       }
-     *clist_dest++ = *clist_src;
-     }
-  while(*clist_src++ != NOTACHAR);
-
-  /* All characters are stored. The terminating NOTACHAR
-  is copied form the clist itself. */
-
-  list[0] = (c == OP_PROP) ? OP_CHAR : OP_NOT;
-  return code;
-#endif
-
-  case OP_NCLASS:
-  case OP_CLASS:
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  case OP_XCLASS:
-  if (c == OP_XCLASS)
-    end = code + GET(code, 0) - 1;
-  else
-#endif
-    end = code + 32 / sizeof(pcre_uchar);
-
-  switch(*end)
-    {
-    case OP_CRSTAR:
-    case OP_CRMINSTAR:
-    case OP_CRQUERY:
-    case OP_CRMINQUERY:
-    case OP_CRPOSSTAR:
-    case OP_CRPOSQUERY:
-    list[1] = TRUE;
-    end++;
-    break;
-
-    case OP_CRPLUS:
-    case OP_CRMINPLUS:
-    case OP_CRPOSPLUS:
-    end++;
-    break;
-
-    case OP_CRRANGE:
-    case OP_CRMINRANGE:
-    case OP_CRPOSRANGE:
-    list[1] = (GET2(end, 1) == 0);
-    end += 1 + 2 * IMM2_SIZE;
-    break;
-    }
-  list[2] = (pcre_uint32)(end - code);
-  return end;
-  }
-return NULL;    /* Opcode not accepted */
-}
-
-
-
-/*************************************************
-*    Scan further character sets for match       *
-*************************************************/
-
-/* Checks whether the base and the current opcode have a common character, in
-which case the base cannot be possessified.
-
-Arguments:
-  code        points to the byte code
-  utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  cd          static compile data
-  base_list   the data list of the base opcode
-
-Returns:      TRUE if the auto-possessification is possible
-*/
-
-static BOOL
-compare_opcodes(const pcre_uchar *code, BOOL utf, const compile_data *cd,
-  const pcre_uint32 *base_list, const pcre_uchar *base_end, int *rec_limit)
-{
-pcre_uchar c;
-pcre_uint32 list[8];
-const pcre_uint32 *chr_ptr;
-const pcre_uint32 *ochr_ptr;
-const pcre_uint32 *list_ptr;
-const pcre_uchar *next_code;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-const pcre_uchar *xclass_flags;
-#endif
-const pcre_uint8 *class_bitset;
-const pcre_uint8 *set1, *set2, *set_end;
-pcre_uint32 chr;
-BOOL accepted, invert_bits;
-BOOL entered_a_group = FALSE;
-
-if (*rec_limit == 0) return FALSE;
---(*rec_limit);
-
-/* Note: the base_list[1] contains whether the current opcode has greedy
-(represented by a non-zero value) quantifier. This is a different from
-other character type lists, which stores here that the character iterator
-matches to an empty string (also represented by a non-zero value). */
-
-for(;;)
-  {
-  /* All operations move the code pointer forward.
-  Therefore infinite recursions are not possible. */
-
-  c = *code;
-
-  /* Skip over callouts */
-
-  if (c == OP_CALLOUT)
-    {
-    code += PRIV(OP_lengths)[c];
-    continue;
-    }
-
-  if (c == OP_ALT)
-    {
-    do code += GET(code, 1); while (*code == OP_ALT);
-    c = *code;
-    }
-
-  switch(c)
-    {
-    case OP_END:
-    case OP_KETRPOS:
-    /* TRUE only in greedy case. The non-greedy case could be replaced by
-    an OP_EXACT, but it is probably not worth it. (And note that OP_EXACT
-    uses more memory, which we cannot get at this stage.) */
-
-    return base_list[1] != 0;
-
-    case OP_KET:
-    /* If the bracket is capturing, and referenced by an OP_RECURSE, or
-    it is an atomic sub-pattern (assert, once, etc.) the non-greedy case
-    cannot be converted to a possessive form. */
-
-    if (base_list[1] == 0) return FALSE;
-
-    switch(*(code - GET(code, 1)))
-      {
-      case OP_ASSERT:
-      case OP_ASSERT_NOT:
-      case OP_ASSERTBACK:
-      case OP_ASSERTBACK_NOT:
-      case OP_ONCE:
-      case OP_ONCE_NC:
-      /* Atomic sub-patterns and assertions can always auto-possessify their
-      last iterator. However, if the group was entered as a result of checking
-      a previous iterator, this is not possible. */
-
-      return !entered_a_group;
-      }
-
-    code += PRIV(OP_lengths)[c];
-    continue;
-
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    case OP_BRA:
-    case OP_CBRA:
-    next_code = code + GET(code, 1);
-    code += PRIV(OP_lengths)[c];
-
-    while (*next_code == OP_ALT)
-      {
-      if (!compare_opcodes(code, utf, cd, base_list, base_end, rec_limit))
-        return FALSE;
-      code = next_code + 1 + LINK_SIZE;
-      next_code += GET(next_code, 1);
-      }
-
-    entered_a_group = TRUE;
-    continue;
-
-    case OP_BRAZERO:
-    case OP_BRAMINZERO:
-
-    next_code = code + 1;
-    if (*next_code != OP_BRA && *next_code != OP_CBRA
-        && *next_code != OP_ONCE && *next_code != OP_ONCE_NC) return FALSE;
-
-    do next_code += GET(next_code, 1); while (*next_code == OP_ALT);
-
-    /* The bracket content will be checked by the
-    OP_BRA/OP_CBRA case above. */
-    next_code += 1 + LINK_SIZE;
-    if (!compare_opcodes(next_code, utf, cd, base_list, base_end, rec_limit))
-      return FALSE;
-
-    code += PRIV(OP_lengths)[c];
-    continue;
-
-    default:
-    break;
-    }
-
-  /* Check for a supported opcode, and load its properties. */
-
-  code = get_chr_property_list(code, utf, cd->fcc, list);
-  if (code == NULL) return FALSE;    /* Unsupported */
-
-  /* If either opcode is a small character list, set pointers for comparing
-  characters from that list with another list, or with a property. */
-
-  if (base_list[0] == OP_CHAR)
-    {
-    chr_ptr = base_list + 2;
-    list_ptr = list;
-    }
-  else if (list[0] == OP_CHAR)
-    {
-    chr_ptr = list + 2;
-    list_ptr = base_list;
-    }
-
-  /* Character bitsets can also be compared to certain opcodes. */
-
-  else if (base_list[0] == OP_CLASS || list[0] == OP_CLASS
-#ifdef COMPILE_PCRE8
-      /* In 8 bit, non-UTF mode, OP_CLASS and OP_NCLASS are the same. */
-      || (!utf && (base_list[0] == OP_NCLASS || list[0] == OP_NCLASS))
-#endif
-      )
-    {
-#ifdef COMPILE_PCRE8
-    if (base_list[0] == OP_CLASS || (!utf && base_list[0] == OP_NCLASS))
-#else
-    if (base_list[0] == OP_CLASS)
-#endif
-      {
-      set1 = (pcre_uint8 *)(base_end - base_list[2]);
-      list_ptr = list;
-      }
-    else
-      {
-      set1 = (pcre_uint8 *)(code - list[2]);
-      list_ptr = base_list;
-      }
-
-    invert_bits = FALSE;
-    switch(list_ptr[0])
-      {
-      case OP_CLASS:
-      case OP_NCLASS:
-      set2 = (pcre_uint8 *)
-        ((list_ptr == list ? code : base_end) - list_ptr[2]);
-      break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      case OP_XCLASS:
-      xclass_flags = (list_ptr == list ? code : base_end) - list_ptr[2] + LINK_SIZE;
-      if ((*xclass_flags & XCL_HASPROP) != 0) return FALSE;
-      if ((*xclass_flags & XCL_MAP) == 0)
-        {
-        /* No bits are set for characters < 256. */
-        if (list[1] == 0) return (*xclass_flags & XCL_NOT) == 0;
-        /* Might be an empty repeat. */
-        continue;
-        }
-      set2 = (pcre_uint8 *)(xclass_flags + 1);
-      break;
-#endif
-
-      case OP_NOT_DIGIT:
-      invert_bits = TRUE;
-      /* Fall through */
-      case OP_DIGIT:
-      set2 = (pcre_uint8 *)(cd->cbits + cbit_digit);
-      break;
-
-      case OP_NOT_WHITESPACE:
-      invert_bits = TRUE;
-      /* Fall through */
-      case OP_WHITESPACE:
-      set2 = (pcre_uint8 *)(cd->cbits + cbit_space);
-      break;
-
-      case OP_NOT_WORDCHAR:
-      invert_bits = TRUE;
-      /* Fall through */
-      case OP_WORDCHAR:
-      set2 = (pcre_uint8 *)(cd->cbits + cbit_word);
-      break;
-
-      default:
-      return FALSE;
-      }
-
-    /* Because the sets are unaligned, we need
-    to perform byte comparison here. */
-    set_end = set1 + 32;
-    if (invert_bits)
-      {
-      do
-        {
-        if ((*set1++ & ~(*set2++)) != 0) return FALSE;
-        }
-      while (set1 < set_end);
-      }
-    else
-      {
-      do
-        {
-        if ((*set1++ & *set2++) != 0) return FALSE;
-        }
-      while (set1 < set_end);
-      }
-
-    if (list[1] == 0) return TRUE;
-    /* Might be an empty repeat. */
-    continue;
-    }
-
-  /* Some property combinations also acceptable. Unicode property opcodes are
-  processed specially; the rest can be handled with a lookup table. */
-
-  else
-    {
-    pcre_uint32 leftop, rightop;
-
-    leftop = base_list[0];
-    rightop = list[0];
-
-#ifdef SUPPORT_UCP
-    accepted = FALSE; /* Always set in non-unicode case. */
-    if (leftop == OP_PROP || leftop == OP_NOTPROP)
-      {
-      if (rightop == OP_EOD)
-        accepted = TRUE;
-      else if (rightop == OP_PROP || rightop == OP_NOTPROP)
-        {
-        int n;
-        const pcre_uint8 *p;
-        BOOL same = leftop == rightop;
-        BOOL lisprop = leftop == OP_PROP;
-        BOOL risprop = rightop == OP_PROP;
-        BOOL bothprop = lisprop && risprop;
-
-        /* There's a table that specifies how each combination is to be
-        processed:
-          0   Always return FALSE (never auto-possessify)
-          1   Character groups are distinct (possessify if both are OP_PROP)
-          2   Check character categories in the same group (general or particular)
-          3   Return TRUE if the two opcodes are not the same
-          ... see comments below
-        */
-
-        n = propposstab[base_list[2]][list[2]];
-        switch(n)
-          {
-          case 0: break;
-          case 1: accepted = bothprop; break;
-          case 2: accepted = (base_list[3] == list[3]) != same; break;
-          case 3: accepted = !same; break;
-
-          case 4:  /* Left general category, right particular category */
-          accepted = risprop && catposstab[base_list[3]][list[3]] == same;
-          break;
-
-          case 5:  /* Right general category, left particular category */
-          accepted = lisprop && catposstab[list[3]][base_list[3]] == same;
-          break;
-
-          /* This code is logically tricky. Think hard before fiddling with it.
-          The posspropstab table has four entries per row. Each row relates to
-          one of PCRE's special properties such as ALNUM or SPACE or WORD.
-          Only WORD actually needs all four entries, but using repeats for the
-          others means they can all use the same code below.
-
-          The first two entries in each row are Unicode general categories, and
-          apply always, because all the characters they include are part of the
-          PCRE character set. The third and fourth entries are a general and a
-          particular category, respectively, that include one or more relevant
-          characters. One or the other is used, depending on whether the check
-          is for a general or a particular category. However, in both cases the
-          category contains more characters than the specials that are defined
-          for the property being tested against. Therefore, it cannot be used
-          in a NOTPROP case.
-
-          Example: the row for WORD contains ucp_L, ucp_N, ucp_P, ucp_Po.
-          Underscore is covered by ucp_P or ucp_Po. */
-
-          case 6:  /* Left alphanum vs right general category */
-          case 7:  /* Left space vs right general category */
-          case 8:  /* Left word vs right general category */
-          p = posspropstab[n-6];
-          accepted = risprop && lisprop ==
-            (list[3] != p[0] &&
-             list[3] != p[1] &&
-            (list[3] != p[2] || !lisprop));
-          break;
-
-          case 9:   /* Right alphanum vs left general category */
-          case 10:  /* Right space vs left general category */
-          case 11:  /* Right word vs left general category */
-          p = posspropstab[n-9];
-          accepted = lisprop && risprop ==
-            (base_list[3] != p[0] &&
-             base_list[3] != p[1] &&
-            (base_list[3] != p[2] || !risprop));
-          break;
-
-          case 12:  /* Left alphanum vs right particular category */
-          case 13:  /* Left space vs right particular category */
-          case 14:  /* Left word vs right particular category */
-          p = posspropstab[n-12];
-          accepted = risprop && lisprop ==
-            (catposstab[p[0]][list[3]] &&
-             catposstab[p[1]][list[3]] &&
-            (list[3] != p[3] || !lisprop));
-          break;
-
-          case 15:  /* Right alphanum vs left particular category */
-          case 16:  /* Right space vs left particular category */
-          case 17:  /* Right word vs left particular category */
-          p = posspropstab[n-15];
-          accepted = lisprop && risprop ==
-            (catposstab[p[0]][base_list[3]] &&
-             catposstab[p[1]][base_list[3]] &&
-            (base_list[3] != p[3] || !risprop));
-          break;
-          }
-        }
-      }
-
-    else
-#endif  /* SUPPORT_UCP */
-
-    accepted = leftop >= FIRST_AUTOTAB_OP && leftop <= LAST_AUTOTAB_LEFT_OP &&
-           rightop >= FIRST_AUTOTAB_OP && rightop <= LAST_AUTOTAB_RIGHT_OP &&
-           autoposstab[leftop - FIRST_AUTOTAB_OP][rightop - FIRST_AUTOTAB_OP];
-
-    if (!accepted) return FALSE;
-
-    if (list[1] == 0) return TRUE;
-    /* Might be an empty repeat. */
-    continue;
-    }
-
-  /* Control reaches here only if one of the items is a small character list.
-  All characters are checked against the other side. */
-
-  do
-    {
-    chr = *chr_ptr;
-
-    switch(list_ptr[0])
-      {
-      case OP_CHAR:
-      ochr_ptr = list_ptr + 2;
-      do
-        {
-        if (chr == *ochr_ptr) return FALSE;
-        ochr_ptr++;
-        }
-      while(*ochr_ptr != NOTACHAR);
-      break;
-
-      case OP_NOT:
-      ochr_ptr = list_ptr + 2;
-      do
-        {
-        if (chr == *ochr_ptr)
-          break;
-        ochr_ptr++;
-        }
-      while(*ochr_ptr != NOTACHAR);
-      if (*ochr_ptr == NOTACHAR) return FALSE;   /* Not found */
-      break;
-
-      /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not*
-      set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
-
-      case OP_DIGIT:
-      if (chr < 256 && (cd->ctypes[chr] & ctype_digit) != 0) return FALSE;
-      break;
-
-      case OP_NOT_DIGIT:
-      if (chr > 255 || (cd->ctypes[chr] & ctype_digit) == 0) return FALSE;
-      break;
-
-      case OP_WHITESPACE:
-      if (chr < 256 && (cd->ctypes[chr] & ctype_space) != 0) return FALSE;
-      break;
-
-      case OP_NOT_WHITESPACE:
-      if (chr > 255 || (cd->ctypes[chr] & ctype_space) == 0) return FALSE;
-      break;
-
-      case OP_WORDCHAR:
-      if (chr < 255 && (cd->ctypes[chr] & ctype_word) != 0) return FALSE;
-      break;
-
-      case OP_NOT_WORDCHAR:
-      if (chr > 255 || (cd->ctypes[chr] & ctype_word) == 0) return FALSE;
-      break;
-
-      case OP_HSPACE:
-      switch(chr)
-        {
-        HSPACE_CASES: return FALSE;
-        default: break;
-        }
-      break;
-
-      case OP_NOT_HSPACE:
-      switch(chr)
-        {
-        HSPACE_CASES: break;
-        default: return FALSE;
-        }
-      break;
-
-      case OP_ANYNL:
-      case OP_VSPACE:
-      switch(chr)
-        {
-        VSPACE_CASES: return FALSE;
-        default: break;
-        }
-      break;
-
-      case OP_NOT_VSPACE:
-      switch(chr)
-        {
-        VSPACE_CASES: break;
-        default: return FALSE;
-        }
-      break;
-
-      case OP_DOLL:
-      case OP_EODN:
-      switch (chr)
-        {
-        case CHAR_CR:
-        case CHAR_LF:
-        case CHAR_VT:
-        case CHAR_FF:
-        case CHAR_NEL:
-#ifndef EBCDIC
-        case 0x2028:
-        case 0x2029:
-#endif  /* Not EBCDIC */
-        return FALSE;
-        }
-      break;
-
-      case OP_EOD:    /* Can always possessify before \z */
-      break;
-
-#ifdef SUPPORT_UCP
-      case OP_PROP:
-      case OP_NOTPROP:
-      if (!check_char_prop(chr, list_ptr[2], list_ptr[3],
-            list_ptr[0] == OP_NOTPROP))
-        return FALSE;
-      break;
-#endif
-
-      case OP_NCLASS:
-      if (chr > 255) return FALSE;
-      /* Fall through */
-
-      case OP_CLASS:
-      if (chr > 255) break;
-      class_bitset = (pcre_uint8 *)
-        ((list_ptr == list ? code : base_end) - list_ptr[2]);
-      if ((class_bitset[chr >> 3] & (1U << (chr & 7))) != 0) return FALSE;
-      break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      case OP_XCLASS:
-      if (PRIV(xclass)(chr, (list_ptr == list ? code : base_end) -
-          list_ptr[2] + LINK_SIZE, utf)) return FALSE;
-      break;
-#endif
-
-      default:
-      return FALSE;
-      }
-
-    chr_ptr++;
-    }
-  while(*chr_ptr != NOTACHAR);
-
-  /* At least one character must be matched from this opcode. */
-
-  if (list[1] == 0) return TRUE;
-  }
-
-/* Control never reaches here. There used to be a fail-save return FALSE; here,
-but some compilers complain about an unreachable statement. */
-
-}
-
-
-
-/*************************************************
-*    Scan compiled regex for auto-possession     *
-*************************************************/
-
-/* Replaces single character iterations with their possessive alternatives
-if appropriate. This function modifies the compiled opcode!
-
-Arguments:
-  code        points to start of the byte code
-  utf         TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  cd          static compile data
-
-Returns:      nothing
-*/
-
-static void
-auto_possessify(pcre_uchar *code, BOOL utf, const compile_data *cd)
-{
-register pcre_uchar c;
-const pcre_uchar *end;
-pcre_uchar *repeat_opcode;
-pcre_uint32 list[8];
-int rec_limit;
-
-for (;;)
-  {
-  c = *code;
-
-  /* When a pattern with bad UTF-8 encoding is compiled with NO_UTF_CHECK,
-  it may compile without complaining, but may get into a loop here if the code
-  pointer points to a bad value. This is, of course a documentated possibility,
-  when NO_UTF_CHECK is set, so it isn't a bug, but we can detect this case and
-  just give up on this optimization. */
-
-  if (c >= OP_TABLE_LENGTH) return;
-
-  if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
-    {
-    c -= get_repeat_base(c) - OP_STAR;
-    end = (c <= OP_MINUPTO) ?
-      get_chr_property_list(code, utf, cd->fcc, list) : NULL;
-    list[1] = c == OP_STAR || c == OP_PLUS || c == OP_QUERY || c == OP_UPTO;
-
-    rec_limit = 1000;
-    if (end != NULL && compare_opcodes(end, utf, cd, list, end, &rec_limit))
-      {
-      switch(c)
-        {
-        case OP_STAR:
-        *code += OP_POSSTAR - OP_STAR;
-        break;
-
-        case OP_MINSTAR:
-        *code += OP_POSSTAR - OP_MINSTAR;
-        break;
-
-        case OP_PLUS:
-        *code += OP_POSPLUS - OP_PLUS;
-        break;
-
-        case OP_MINPLUS:
-        *code += OP_POSPLUS - OP_MINPLUS;
-        break;
-
-        case OP_QUERY:
-        *code += OP_POSQUERY - OP_QUERY;
-        break;
-
-        case OP_MINQUERY:
-        *code += OP_POSQUERY - OP_MINQUERY;
-        break;
-
-        case OP_UPTO:
-        *code += OP_POSUPTO - OP_UPTO;
-        break;
-
-        case OP_MINUPTO:
-        *code += OP_POSUPTO - OP_MINUPTO;
-        break;
-        }
-      }
-    c = *code;
-    }
-  else if (c == OP_CLASS || c == OP_NCLASS || c == OP_XCLASS)
-    {
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    if (c == OP_XCLASS)
-      repeat_opcode = code + GET(code, 1);
-    else
-#endif
-      repeat_opcode = code + 1 + (32 / sizeof(pcre_uchar));
-
-    c = *repeat_opcode;
-    if (c >= OP_CRSTAR && c <= OP_CRMINRANGE)
-      {
-      /* end must not be NULL. */
-      end = get_chr_property_list(code, utf, cd->fcc, list);
-
-      list[1] = (c & 1) == 0;
-
-      rec_limit = 1000;
-      if (compare_opcodes(end, utf, cd, list, end, &rec_limit))
-        {
-        switch (c)
-          {
-          case OP_CRSTAR:
-          case OP_CRMINSTAR:
-          *repeat_opcode = OP_CRPOSSTAR;
-          break;
-
-          case OP_CRPLUS:
-          case OP_CRMINPLUS:
-          *repeat_opcode = OP_CRPOSPLUS;
-          break;
-
-          case OP_CRQUERY:
-          case OP_CRMINQUERY:
-          *repeat_opcode = OP_CRPOSQUERY;
-          break;
-
-          case OP_CRRANGE:
-          case OP_CRMINRANGE:
-          *repeat_opcode = OP_CRPOSRANGE;
-          break;
-          }
-        }
-      }
-    c = *code;
-    }
-
-  switch(c)
-    {
-    case OP_END:
-    return;
-
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEPOSPLUS:
-    case OP_TYPEPOSQUERY:
-    if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
-    break;
-
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEEXACT:
-    case OP_TYPEPOSUPTO:
-    if (code[1 + IMM2_SIZE] == OP_PROP || code[1 + IMM2_SIZE] == OP_NOTPROP)
-      code += 2;
-    break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-    code += GET(code, 1);
-    break;
-#endif
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_SKIP_ARG:
-    case OP_THEN_ARG:
-    code += code[1];
-    break;
-    }
-
-  /* Add in the fixed length from the table */
-
-  code += PRIV(OP_lengths)[c];
-
-  /* In UTF-8 mode, opcodes that are followed by a character may be followed by
-  a multi-byte character. The length in the table is a minimum, so we have to
-  arrange to skip the extra bytes. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-  if (utf) switch(c)
-    {
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-    case OP_STAR:
-    case OP_MINSTAR:
-    case OP_PLUS:
-    case OP_MINPLUS:
-    case OP_QUERY:
-    case OP_MINQUERY:
-    case OP_UPTO:
-    case OP_MINUPTO:
-    case OP_EXACT:
-    case OP_POSSTAR:
-    case OP_POSPLUS:
-    case OP_POSQUERY:
-    case OP_POSUPTO:
-    case OP_STARI:
-    case OP_MINSTARI:
-    case OP_PLUSI:
-    case OP_MINPLUSI:
-    case OP_QUERYI:
-    case OP_MINQUERYI:
-    case OP_UPTOI:
-    case OP_MINUPTOI:
-    case OP_EXACTI:
-    case OP_POSSTARI:
-    case OP_POSPLUSI:
-    case OP_POSQUERYI:
-    case OP_POSUPTOI:
-    case OP_NOTSTAR:
-    case OP_NOTMINSTAR:
-    case OP_NOTPLUS:
-    case OP_NOTMINPLUS:
-    case OP_NOTQUERY:
-    case OP_NOTMINQUERY:
-    case OP_NOTUPTO:
-    case OP_NOTMINUPTO:
-    case OP_NOTEXACT:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSUPTO:
-    case OP_NOTSTARI:
-    case OP_NOTMINSTARI:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUSI:
-    case OP_NOTQUERYI:
-    case OP_NOTMINQUERYI:
-    case OP_NOTUPTOI:
-    case OP_NOTMINUPTOI:
-    case OP_NOTEXACTI:
-    case OP_NOTPOSSTARI:
-    case OP_NOTPOSPLUSI:
-    case OP_NOTPOSQUERYI:
-    case OP_NOTPOSUPTOI:
-    if (HAS_EXTRALEN(code[-1])) code += GET_EXTRALEN(code[-1]);
-    break;
-    }
-#else
-  (void)(utf);  /* Keep compiler happy by referencing function argument */
-#endif
-  }
-}
-
-
-
-/*************************************************
-*           Check for POSIX class syntax         *
-*************************************************/
-
-/* This function is called when the sequence "[:" or "[." or "[=" is
-encountered in a character class. It checks whether this is followed by a
-sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
-reach an unescaped ']' without the special preceding character, return FALSE.
-
-Originally, this function only recognized a sequence of letters between the
-terminators, but it seems that Perl recognizes any sequence of characters,
-though of course unknown POSIX names are subsequently rejected. Perl gives an
-"Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
-didn't consider this to be a POSIX class. Likewise for [:1234:].
-
-The problem in trying to be exactly like Perl is in the handling of escapes. We
-have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
-class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
-below handles the special cases \\ and \], but does not try to do any other
-escape processing. This makes it different from Perl for cases such as
-[:l\ower:] where Perl recognizes it as the POSIX class "lower" but PCRE does
-not recognize "l\ower". This is a lesser evil than not diagnosing bad classes
-when Perl does, I think.
-
-A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
-It seems that the appearance of a nested POSIX class supersedes an apparent
-external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
-a digit.
-
-In Perl, unescaped square brackets may also appear as part of class names. For
-example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
-[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
-seem right at all. PCRE does not allow closing square brackets in POSIX class
-names.
-
-Arguments:
-  ptr      pointer to the initial [
-  endptr   where to return the end pointer
-
-Returns:   TRUE or FALSE
-*/
-
-static BOOL
-check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
-{
-pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */
-terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
-for (++ptr; *ptr != CHAR_NULL; ptr++)
-  {
-  if (*ptr == CHAR_BACKSLASH &&
-      (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET ||
-       ptr[1] == CHAR_BACKSLASH))
-    ptr++;
-  else if ((*ptr == CHAR_LEFT_SQUARE_BRACKET && ptr[1] == terminator) ||
-            *ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
-  else if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
-    {
-    *endptr = ptr;
-    return TRUE;
-    }
-  }
-return FALSE;
-}
-
-
-
-
-/*************************************************
-*          Check POSIX class name                *
-*************************************************/
-
-/* This function is called to check the name given in a POSIX-style class entry
-such as [:alnum:].
-
-Arguments:
-  ptr        points to the first letter
-  len        the length of the name
-
-Returns:     a value representing the name, or -1 if unknown
-*/
-
-static int
-check_posix_name(const pcre_uchar *ptr, int len)
-{
-const char *pn = posix_names;
-register int yield = 0;
-while (posix_name_lengths[yield] != 0)
-  {
-  if (len == posix_name_lengths[yield] &&
-    STRNCMP_UC_C8(ptr, pn, (unsigned int)len) == 0) return yield;
-  pn += posix_name_lengths[yield] + 1;
-  yield++;
-  }
-return -1;
-}
-
-
-/*************************************************
-*    Adjust OP_RECURSE items in repeated group   *
-*************************************************/
-
-/* OP_RECURSE items contain an offset from the start of the regex to the group
-that is referenced. This means that groups can be replicated for fixed
-repetition simply by copying (because the recursion is allowed to refer to
-earlier groups that are outside the current group). However, when a group is
-optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is
-inserted before it, after it has been compiled. This means that any OP_RECURSE
-items within it that refer to the group itself or any contained groups have to
-have their offsets adjusted. That one of the jobs of this function. Before it
-is called, the partially compiled regex must be temporarily terminated with
-OP_END.
-
-This function has been extended to cope with forward references for recursions
-and subroutine calls. It must check the list of such references for the
-group we are dealing with. If it finds that one of the recursions in the
-current group is on this list, it does not adjust the value in the reference
-(which is a group number). After the group has been scanned, all the offsets in
-the forward reference list for the group are adjusted.
-
-Arguments:
-  group      points to the start of the group
-  adjust     the amount by which the group is to be moved
-  utf        TRUE in UTF-8 / UTF-16 / UTF-32 mode
-  cd         contains pointers to tables etc.
-  save_hwm_offset   the hwm forward reference offset at the start of the group
-
-Returns:     nothing
-*/
-
-static void
-adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
-  size_t save_hwm_offset)
-{
-int offset;
-pcre_uchar *hc;
-pcre_uchar *ptr = group;
-
-while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
-  {
-  for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm;
-       hc += LINK_SIZE)
-    {
-    offset = (int)GET(hc, 0);
-    if (cd->start_code + offset == ptr + 1) break;
-    }
-
-  /* If we have not found this recursion on the forward reference list, adjust
-  the recursion's offset if it's after the start of this group. */
-
-  if (hc >= cd->hwm)
-    {
-    offset = (int)GET(ptr, 1);
-    if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
-    }
-
-  ptr += 1 + LINK_SIZE;
-  }
-
-/* Now adjust all forward reference offsets for the group. */
-
-for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm;
-     hc += LINK_SIZE)
-  {
-  offset = (int)GET(hc, 0);
-  PUT(hc, 0, offset + adjust);
-  }
-}
-
-
-
-/*************************************************
-*        Insert an automatic callout point       *
-*************************************************/
-
-/* This function is called when the PCRE_AUTO_CALLOUT option is set, to insert
-callout points before each pattern item.
-
-Arguments:
-  code           current code pointer
-  ptr            current pattern pointer
-  cd             pointers to tables etc
-
-Returns:         new code pointer
-*/
-
-static pcre_uchar *
-auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
-{
-*code++ = OP_CALLOUT;
-*code++ = 255;
-PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
-PUT(code, LINK_SIZE, 0);                       /* Default length */
-return code + 2 * LINK_SIZE;
-}
-
-
-
-/*************************************************
-*         Complete a callout item                *
-*************************************************/
-
-/* A callout item contains the length of the next item in the pattern, which
-we can't fill in till after we have reached the relevant point. This is used
-for both automatic and manual callouts.
-
-Arguments:
-  previous_callout   points to previous callout item
-  ptr                current pattern pointer
-  cd                 pointers to tables etc
-
-Returns:             nothing
-*/
-
-static void
-complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
-{
-int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
-PUT(previous_callout, 2 + LINK_SIZE, length);
-}
-
-
-
-#ifdef SUPPORT_UCP
-/*************************************************
-*           Get othercase range                  *
-*************************************************/
-
-/* This function is passed the start and end of a class range, in UTF-8 mode
-with UCP support. It searches up the characters, looking for ranges of
-characters in the "other" case. Each call returns the next one, updating the
-start address. A character with multiple other cases is returned on its own
-with a special return value.
-
-Arguments:
-  cptr        points to starting character value; updated
-  d           end value
-  ocptr       where to put start of othercase range
-  odptr       where to put end of othercase range
-
-Yield:        -1 when no more
-               0 when a range is returned
-              >0 the CASESET offset for char with multiple other cases
-                in this case, ocptr contains the original
-*/
-
-static int
-get_othercase_range(pcre_uint32 *cptr, pcre_uint32 d, pcre_uint32 *ocptr,
-  pcre_uint32 *odptr)
-{
-pcre_uint32 c, othercase, next;
-unsigned int co;
-
-/* Find the first character that has an other case. If it has multiple other
-cases, return its case offset value. */
-
-for (c = *cptr; c <= d; c++)
-  {
-  if ((co = UCD_CASESET(c)) != 0)
-    {
-    *ocptr = c++;   /* Character that has the set */
-    *cptr = c;      /* Rest of input range */
-    return (int)co;
-    }
-  if ((othercase = UCD_OTHERCASE(c)) != c) break;
-  }
-
-if (c > d) return -1;  /* Reached end of range */
-
-/* Found a character that has a single other case. Search for the end of the
-range, which is either the end of the input range, or a character that has zero
-or more than one other cases. */
-
-*ocptr = othercase;
-next = othercase + 1;
-
-for (++c; c <= d; c++)
-  {
-  if ((co = UCD_CASESET(c)) != 0 || UCD_OTHERCASE(c) != next) break;
-  next++;
-  }
-
-*odptr = next - 1;     /* End of othercase range */
-*cptr = c;             /* Rest of input range */
-return 0;
-}
-#endif  /* SUPPORT_UCP */
-
-
-
-/*************************************************
-*        Add a character or range to a class     *
-*************************************************/
-
-/* This function packages up the logic of adding a character or range of
-characters to a class. The character values in the arguments will be within the
-valid values for the current mode (8-bit, 16-bit, UTF, etc). This function is
-mutually recursive with the function immediately below.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options word
-  cd            contains pointers to tables etc.
-  start         start of range character
-  end           end of range character
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static int
-add_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
-  compile_data *cd, pcre_uint32 start, pcre_uint32 end)
-{
-pcre_uint32 c;
-pcre_uint32 classbits_end = (end <= 0xff ? end : 0xff);
-int n8 = 0;
-
-/* If caseless matching is required, scan the range and process alternate
-cases. In Unicode, there are 8-bit characters that have alternate cases that
-are greater than 255 and vice-versa. Sometimes we can just extend the original
-range. */
-
-if ((options & PCRE_CASELESS) != 0)
-  {
-#ifdef SUPPORT_UCP
-  if ((options & PCRE_UTF8) != 0)
-    {
-    int rc;
-    pcre_uint32 oc, od;
-
-    options &= ~PCRE_CASELESS;   /* Remove for recursive calls */
-    c = start;
-
-    while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)
-      {
-      /* Handle a single character that has more than one other case. */
-
-      if (rc > 0) n8 += add_list_to_class(classbits, uchardptr, options, cd,
-        PRIV(ucd_caseless_sets) + rc, oc);
-
-      /* Do nothing if the other case range is within the original range. */
-
-      else if (oc >= start && od <= end) continue;
-
-      /* Extend the original range if there is overlap, noting that if oc < c, we
-      can't have od > end because a subrange is always shorter than the basic
-      range. Otherwise, use a recursive call to add the additional range. */
-
-      else if (oc < start && od >= start - 1) start = oc; /* Extend downwards */
-      else if (od > end && oc <= end + 1)
-        {
-        end = od;       /* Extend upwards */
-        if (end > classbits_end) classbits_end = (end <= 0xff ? end : 0xff);
-        }
-      else n8 += add_to_class(classbits, uchardptr, options, cd, oc, od);
-      }
-    }
-  else
-#endif  /* SUPPORT_UCP */
-
-  /* Not UTF-mode, or no UCP */
-
-  for (c = start; c <= classbits_end; c++)
-    {
-    SETBIT(classbits, cd->fcc[c]);
-    n8++;
-    }
-  }
-
-/* Now handle the original range. Adjust the final value according to the bit
-length - this means that the same lists of (e.g.) horizontal spaces can be used
-in all cases. */
-
-#if defined COMPILE_PCRE8
-#ifdef SUPPORT_UTF
-  if ((options & PCRE_UTF8) == 0)
-#endif
-  if (end > 0xff) end = 0xff;
-
-#elif defined COMPILE_PCRE16
-#ifdef SUPPORT_UTF
-  if ((options & PCRE_UTF16) == 0)
-#endif
-  if (end > 0xffff) end = 0xffff;
-
-#endif /* COMPILE_PCRE[8|16] */
-
-/* Use the bitmap for characters < 256. Otherwise use extra data.*/
-
-for (c = start; c <= classbits_end; c++)
-  {
-  /* Regardless of start, c will always be <= 255. */
-  SETBIT(classbits, c);
-  n8++;
-  }
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-if (start <= 0xff) start = 0xff + 1;
-
-if (end >= start)
-  {
-  pcre_uchar *uchardata = *uchardptr;
-#ifdef SUPPORT_UTF
-  if ((options & PCRE_UTF8) != 0)  /* All UTFs use the same flag bit */
-    {
-    if (start < end)
-      {
-      *uchardata++ = XCL_RANGE;
-      uchardata += PRIV(ord2utf)(start, uchardata);
-      uchardata += PRIV(ord2utf)(end, uchardata);
-      }
-    else if (start == end)
-      {
-      *uchardata++ = XCL_SINGLE;
-      uchardata += PRIV(ord2utf)(start, uchardata);
-      }
-    }
-  else
-#endif  /* SUPPORT_UTF */
-
-  /* Without UTF support, character values are constrained by the bit length,
-  and can only be > 256 for 16-bit and 32-bit libraries. */
-
-#ifdef COMPILE_PCRE8
-    {}
-#else
-  if (start < end)
-    {
-    *uchardata++ = XCL_RANGE;
-    *uchardata++ = start;
-    *uchardata++ = end;
-    }
-  else if (start == end)
-    {
-    *uchardata++ = XCL_SINGLE;
-    *uchardata++ = start;
-    }
-#endif
-
-  *uchardptr = uchardata;   /* Updata extra data pointer */
-  }
-#endif /* SUPPORT_UTF || !COMPILE_PCRE8 */
-
-return n8;    /* Number of 8-bit characters */
-}
-
-
-
-
-/*************************************************
-*        Add a list of characters to a class     *
-*************************************************/
-
-/* This function is used for adding a list of case-equivalent characters to a
-class, and also for adding a list of horizontal or vertical whitespace. If the
-list is in order (which it should be), ranges of characters are detected and
-handled appropriately. This function is mutually recursive with the function
-above.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options word
-  cd            contains pointers to tables etc.
-  p             points to row of 32-bit values, terminated by NOTACHAR
-  except        character to omit; this is used when adding lists of
-                  case-equivalent characters to avoid including the one we
-                  already know about
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static int
-add_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr, int options,
-  compile_data *cd, const pcre_uint32 *p, unsigned int except)
-{
-int n8 = 0;
-while (p[0] < NOTACHAR)
-  {
-  int n = 0;
-  if (p[0] != except)
-    {
-    while(p[n+1] == p[0] + n + 1) n++;
-    n8 += add_to_class(classbits, uchardptr, options, cd, p[0], p[n]);
-    }
-  p += n + 1;
-  }
-return n8;
-}
-
-
-
-/*************************************************
-*    Add characters not in a list to a class     *
-*************************************************/
-
-/* This function is used for adding the complement of a list of horizontal or
-vertical whitespace to a class. The list must be in order.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options word
-  cd            contains pointers to tables etc.
-  p             points to row of 32-bit values, terminated by NOTACHAR
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static int
-add_not_list_to_class(pcre_uint8 *classbits, pcre_uchar **uchardptr,
-  int options, compile_data *cd, const pcre_uint32 *p)
-{
-BOOL utf = (options & PCRE_UTF8) != 0;
-int n8 = 0;
-if (p[0] > 0)
-  n8 += add_to_class(classbits, uchardptr, options, cd, 0, p[0] - 1);
-while (p[0] < NOTACHAR)
-  {
-  while (p[1] == p[0] + 1) p++;
-  n8 += add_to_class(classbits, uchardptr, options, cd, p[0] + 1,
-    (p[1] == NOTACHAR) ? (utf ? 0x10ffffu : 0xffffffffu) : p[1] - 1);
-  p++;
-  }
-return n8;
-}
-
-
-
-/*************************************************
-*           Compile one branch                   *
-*************************************************/
-
-/* Scan the pattern, compiling it into the a vector. If the options are
-changed during the branch, the pointer is used to change the external options
-bits. This function is used during the pre-compile phase when we are trying
-to find out the amount of memory needed, as well as during the real compile
-phase. The value of lengthptr distinguishes the two phases.
-
-Arguments:
-  optionsptr        pointer to the option bits
-  codeptr           points to the pointer to the current code point
-  ptrptr            points to the current pattern pointer
-  errorcodeptr      points to error code variable
-  firstcharptr      place to put the first required character
-  firstcharflagsptr place to put the first character flags, or a negative number
-  reqcharptr        place to put the last required character
-  reqcharflagsptr   place to put the last required character flags, or a negative number
-  bcptr             points to current branch chain
-  cond_depth        conditional nesting depth
-  cd                contains pointers to tables etc.
-  lengthptr         NULL during the real compile phase
-                    points to length accumulator during pre-compile phase
-
-Returns:            TRUE on success
-                    FALSE, with *errorcodeptr set non-zero on error
-*/
-
-static BOOL
-compile_branch(int *optionsptr, pcre_uchar **codeptr,
-  const pcre_uchar **ptrptr, int *errorcodeptr,
-  pcre_uint32 *firstcharptr, pcre_int32 *firstcharflagsptr,
-  pcre_uint32 *reqcharptr, pcre_int32 *reqcharflagsptr,
-  branch_chain *bcptr, int cond_depth,
-  compile_data *cd, int *lengthptr)
-{
-int repeat_type, op_type;
-int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
-int bravalue = 0;
-int greedy_default, greedy_non_default;
-pcre_uint32 firstchar, reqchar;
-pcre_int32 firstcharflags, reqcharflags;
-pcre_uint32 zeroreqchar, zerofirstchar;
-pcre_int32 zeroreqcharflags, zerofirstcharflags;
-pcre_int32 req_caseopt, reqvary, tempreqvary;
-int options = *optionsptr;               /* May change dynamically */
-int after_manual_callout = 0;
-int length_prevgroup = 0;
-register pcre_uint32 c;
-int escape;
-register pcre_uchar *code = *codeptr;
-pcre_uchar *last_code = code;
-pcre_uchar *orig_code = code;
-pcre_uchar *tempcode;
-BOOL inescq = FALSE;
-BOOL groupsetfirstchar = FALSE;
-const pcre_uchar *ptr = *ptrptr;
-const pcre_uchar *tempptr;
-const pcre_uchar *nestptr = NULL;
-pcre_uchar *previous = NULL;
-pcre_uchar *previous_callout = NULL;
-size_t item_hwm_offset = 0;
-pcre_uint8 classbits[32];
-
-/* We can fish out the UTF-8 setting once and for all into a BOOL, but we
-must not do this for other options (e.g. PCRE_EXTENDED) because they may change
-dynamically as we process the pattern. */
-
-#ifdef SUPPORT_UTF
-/* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
-BOOL utf = (options & PCRE_UTF8) != 0;
-#ifndef COMPILE_PCRE32
-pcre_uchar utf_chars[6];
-#endif
-#else
-BOOL utf = FALSE;
-#endif
-
-/* Helper variables for OP_XCLASS opcode (for characters > 255). We define
-class_uchardata always so that it can be passed to add_to_class() always,
-though it will not be used in non-UTF 8-bit cases. This avoids having to supply
-alternative calls for the different cases. */
-
-pcre_uchar *class_uchardata;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-BOOL xclass;
-pcre_uchar *class_uchardata_base;
-#endif
-
-#ifdef PCRE_DEBUG
-if (lengthptr != NULL) DPRINTF((">> start branch\n"));
-#endif
-
-/* Set up the default and non-default settings for greediness */
-
-greedy_default = ((options & PCRE_UNGREEDY) != 0);
-greedy_non_default = greedy_default ^ 1;
-
-/* Initialize no first byte, no required byte. REQ_UNSET means "no char
-matching encountered yet". It gets changed to REQ_NONE if we hit something that
-matches a non-fixed char first char; reqchar just remains unset if we never
-find one.
-
-When we hit a repeat whose minimum is zero, we may have to adjust these values
-to take the zero repeat into account. This is implemented by setting them to
-zerofirstbyte and zeroreqchar when such a repeat is encountered. The individual
-item types that can be repeated set these backoff variables appropriately. */
-
-firstchar = reqchar = zerofirstchar = zeroreqchar = 0;
-firstcharflags = reqcharflags = zerofirstcharflags = zeroreqcharflags = REQ_UNSET;
-
-/* The variable req_caseopt contains either the REQ_CASELESS value
-or zero, according to the current setting of the caseless flag. The
-REQ_CASELESS leaves the lower 28 bit empty. It is added into the
-firstchar or reqchar variables to record the case status of the
-value. This is used only for ASCII characters. */
-
-req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
-
-/* Switch on next character until the end of the branch */
-
-for (;; ptr++)
-  {
-  BOOL negate_class;
-  BOOL should_flip_negation;
-  BOOL possessive_quantifier;
-  BOOL is_quantifier;
-  BOOL is_recurse;
-  BOOL reset_bracount;
-  int class_has_8bitchar;
-  int class_one_char;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  BOOL xclass_has_prop;
-#endif
-  int newoptions;
-  int recno;
-  int refsign;
-  int skipbytes;
-  pcre_uint32 subreqchar, subfirstchar;
-  pcre_int32 subreqcharflags, subfirstcharflags;
-  int terminator;
-  unsigned int mclength;
-  unsigned int tempbracount;
-  pcre_uint32 ec;
-  pcre_uchar mcbuffer[8];
-
-  /* Come here to restart the loop without advancing the pointer. */
-
-  REDO_LOOP:
-
-  /* Get next character in the pattern */
-
-  c = *ptr;
-
-  /* If we are at the end of a nested substitution, revert to the outer level
-  string. Nesting only happens one level deep. */
-
-  if (c == CHAR_NULL && nestptr != NULL)
-    {
-    ptr = nestptr;
-    nestptr = NULL;
-    c = *ptr;
-    }
-
-  /* If we are in the pre-compile phase, accumulate the length used for the
-  previous cycle of this loop. */
-
-  if (lengthptr != NULL)
-    {
-#ifdef PCRE_DEBUG
-    if (code > cd->hwm) cd->hwm = code;                 /* High water info */
-#endif
-    if (code > cd->start_workspace + cd->workspace_size -
-        WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
-      {
-      *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)?
-        ERR52 : ERR87;
-      goto FAILED;
-      }
-
-    /* There is at least one situation where code goes backwards: this is the
-    case of a zero quantifier after a class (e.g. [ab]{0}). At compile time,
-    the class is simply eliminated. However, it is created first, so we have to
-    allow memory for it. Therefore, don't ever reduce the length at this point.
-    */
-
-    if (code < last_code) code = last_code;
-
-    /* Paranoid check for integer overflow */
-
-    if (OFLOW_MAX - *lengthptr < code - last_code)
-      {
-      *errorcodeptr = ERR20;
-      goto FAILED;
-      }
-
-    *lengthptr += (int)(code - last_code);
-    DPRINTF(("length=%d added %d c=%c (0x%x)\n", *lengthptr,
-      (int)(code - last_code), c, c));
-
-    /* If "previous" is set and it is not at the start of the work space, move
-    it back to there, in order to avoid filling up the work space. Otherwise,
-    if "previous" is NULL, reset the current code pointer to the start. */
-
-    if (previous != NULL)
-      {
-      if (previous > orig_code)
-        {
-        memmove(orig_code, previous, IN_UCHARS(code - previous));
-        code -= previous - orig_code;
-        previous = orig_code;
-        }
-      }
-    else code = orig_code;
-
-    /* Remember where this code item starts so we can pick up the length
-    next time round. */
-
-    last_code = code;
-    }
-
-  /* In the real compile phase, just check the workspace used by the forward
-  reference list. */
-
-  else if (cd->hwm > cd->start_workspace + cd->workspace_size)
-    {
-    *errorcodeptr = ERR52;
-    goto FAILED;
-    }
-
-  /* If in \Q...\E, check for the end; if not, we have a literal. Otherwise an
-  isolated \E is ignored. */
-
-  if (c != CHAR_NULL)
-    {
-    if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
-      {
-      inescq = FALSE;
-      ptr++;
-      continue;
-      }
-    else if (inescq)
-      {
-      if (previous_callout != NULL)
-        {
-        if (lengthptr == NULL)  /* Don't attempt in pre-compile phase */
-          complete_callout(previous_callout, ptr, cd);
-        previous_callout = NULL;
-        }
-      if ((options & PCRE_AUTO_CALLOUT) != 0)
-        {
-        previous_callout = code;
-        code = auto_callout(code, ptr, cd);
-        }
-      goto NORMAL_CHAR;
-      }
-
-    /* Check for the start of a \Q...\E sequence. We must do this here rather
-    than later in case it is immediately followed by \E, which turns it into a
-    "do nothing" sequence. */
-
-    if (c == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
-      {
-      inescq = TRUE;
-      ptr++;
-      continue;
-      }
-    }
-
-  /* In extended mode, skip white space and comments. */
-
-  if ((options & PCRE_EXTENDED) != 0)
-    {
-    const pcre_uchar *wscptr = ptr;
-    while (MAX_255(c) && (cd->ctypes[c] & ctype_space) != 0) c = *(++ptr);
-    if (c == CHAR_NUMBER_SIGN)
-      {
-      ptr++;
-      while (*ptr != CHAR_NULL)
-        {
-        if (IS_NEWLINE(ptr))         /* For non-fixed-length newline cases, */
-          {                          /* IS_NEWLINE sets cd->nllen. */
-          ptr += cd->nllen;
-          break;
-          }
-        ptr++;
-#ifdef SUPPORT_UTF
-        if (utf) FORWARDCHAR(ptr);
-#endif
-        }
-      }
-
-    /* If we skipped any characters, restart the loop. Otherwise, we didn't see
-    a comment. */
-
-    if (ptr > wscptr) goto REDO_LOOP;
-    }
-
-  /* Skip over (?# comments. We need to do this here because we want to know if
-  the next thing is a quantifier, and these comments may come between an item
-  and its quantifier. */
-
-  if (c == CHAR_LEFT_PARENTHESIS && ptr[1] == CHAR_QUESTION_MARK &&
-      ptr[2] == CHAR_NUMBER_SIGN)
-    {
-    ptr += 3;
-    while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
-    if (*ptr == CHAR_NULL)
-      {
-      *errorcodeptr = ERR18;
-      goto FAILED;
-      }
-    continue;
-    }
-
-  /* See if the next thing is a quantifier. */
-
-  is_quantifier =
-    c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
-    (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
-
-  /* Fill in length of a previous callout, except when the next thing is a
-  quantifier or when processing a property substitution string in UCP mode. */
-
-  if (!is_quantifier && previous_callout != NULL && nestptr == NULL &&
-       after_manual_callout-- <= 0)
-    {
-    if (lengthptr == NULL)      /* Don't attempt in pre-compile phase */
-      complete_callout(previous_callout, ptr, cd);
-    previous_callout = NULL;
-    }
-
-  /* Create auto callout, except for quantifiers, or while processing property
-  strings that are substituted for \w etc in UCP mode. */
-
-  if ((options & PCRE_AUTO_CALLOUT) != 0 && !is_quantifier && nestptr == NULL)
-    {
-    previous_callout = code;
-    code = auto_callout(code, ptr, cd);
-    }
-
-  /* Process the next pattern item. */
-
-  switch(c)
-    {
-    /* ===================================================================*/
-    case CHAR_NULL:                /* The branch terminates at string end */
-    case CHAR_VERTICAL_LINE:       /* or | or ) */
-    case CHAR_RIGHT_PARENTHESIS:
-    *firstcharptr = firstchar;
-    *firstcharflagsptr = firstcharflags;
-    *reqcharptr = reqchar;
-    *reqcharflagsptr = reqcharflags;
-    *codeptr = code;
-    *ptrptr = ptr;
-    if (lengthptr != NULL)
-      {
-      if (OFLOW_MAX - *lengthptr < code - last_code)
-        {
-        *errorcodeptr = ERR20;
-        goto FAILED;
-        }
-      *lengthptr += (int)(code - last_code);   /* To include callout length */
-      DPRINTF((">> end branch\n"));
-      }
-    return TRUE;
-
-
-    /* ===================================================================*/
-    /* Handle single-character metacharacters. In multiline mode, ^ disables
-    the setting of any following char as a first character. */
-
-    case CHAR_CIRCUMFLEX_ACCENT:
-    previous = NULL;
-    if ((options & PCRE_MULTILINE) != 0)
-      {
-      if (firstcharflags == REQ_UNSET)
-        zerofirstcharflags = firstcharflags = REQ_NONE;
-      *code++ = OP_CIRCM;
-      }
-    else *code++ = OP_CIRC;
-    break;
-
-    case CHAR_DOLLAR_SIGN:
-    previous = NULL;
-    *code++ = ((options & PCRE_MULTILINE) != 0)? OP_DOLLM : OP_DOLL;
-    break;
-
-    /* There can never be a first char if '.' is first, whatever happens about
-    repeats. The value of reqchar doesn't change either. */
-
-    case CHAR_DOT:
-    if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-    zerofirstchar = firstchar;
-    zerofirstcharflags = firstcharflags;
-    zeroreqchar = reqchar;
-    zeroreqcharflags = reqcharflags;
-    previous = code;
-    item_hwm_offset = cd->hwm - cd->start_workspace;
-    *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
-    break;
-
-
-    /* ===================================================================*/
-    /* Character classes. If the included characters are all < 256, we build a
-    32-byte bitmap of the permitted characters, except in the special case
-    where there is only one such character. For negated classes, we build the
-    map as usual, then invert it at the end. However, we use a different opcode
-    so that data characters > 255 can be handled correctly.
-
-    If the class contains characters outside the 0-255 range, a different
-    opcode is compiled. It may optionally have a bit map for characters < 256,
-    but those above are are explicitly listed afterwards. A flag byte tells
-    whether the bitmap is present, and whether this is a negated class or not.
-
-    In JavaScript compatibility mode, an isolated ']' causes an error. In
-    default (Perl) mode, it is treated as a data character. */
-
-    case CHAR_RIGHT_SQUARE_BRACKET:
-    if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
-      {
-      *errorcodeptr = ERR64;
-      goto FAILED;
-      }
-    goto NORMAL_CHAR;
-
-    /* In another (POSIX) regex library, the ugly syntax [[:<:]] and [[:>:]] is
-    used for "start of word" and "end of word". As these are otherwise illegal
-    sequences, we don't break anything by recognizing them. They are replaced
-    by \b(?=\w) and \b(?<=\w) respectively. Sequences like [a[:<:]] are
-    erroneous and are handled by the normal code below. */
-
-    case CHAR_LEFT_SQUARE_BRACKET:
-    if (STRNCMP_UC_C8(ptr+1, STRING_WEIRD_STARTWORD, 6) == 0)
-      {
-      nestptr = ptr + 7;
-      ptr = sub_start_of_word;
-      goto REDO_LOOP;
-      }
-
-    if (STRNCMP_UC_C8(ptr+1, STRING_WEIRD_ENDWORD, 6) == 0)
-      {
-      nestptr = ptr + 7;
-      ptr = sub_end_of_word;
-      goto REDO_LOOP;
-      }
-
-    /* Handle a real character class. */
-
-    previous = code;
-    item_hwm_offset = cd->hwm - cd->start_workspace;
-
-    /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
-    they are encountered at the top level, so we'll do that too. */
-
-    if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
-         ptr[1] == CHAR_EQUALS_SIGN) &&
-        check_posix_syntax(ptr, &tempptr))
-      {
-      *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
-      goto FAILED;
-      }
-
-    /* If the first character is '^', set the negation flag and skip it. Also,
-    if the first few characters (either before or after ^) are \Q\E or \E we
-    skip them too. This makes for compatibility with Perl. */
-
-    negate_class = FALSE;
-    for (;;)
-      {
-      c = *(++ptr);
-      if (c == CHAR_BACKSLASH)
-        {
-        if (ptr[1] == CHAR_E)
-          ptr++;
-        else if (STRNCMP_UC_C8(ptr + 1, STR_Q STR_BACKSLASH STR_E, 3) == 0)
-          ptr += 3;
-        else
-          break;
-        }
-      else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
-        negate_class = TRUE;
-      else break;
-      }
-
-    /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,
-    an initial ']' is taken as a data character -- the code below handles
-    that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
-    [^] must match any character, so generate OP_ALLANY. */
-
-    if (c == CHAR_RIGHT_SQUARE_BRACKET &&
-        (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
-      {
-      *code++ = negate_class? OP_ALLANY : OP_FAIL;
-      if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-      zerofirstchar = firstchar;
-      zerofirstcharflags = firstcharflags;
-      break;
-      }
-
-    /* If a class contains a negative special such as \S, we need to flip the
-    negation flag at the end, so that support for characters > 255 works
-    correctly (they are all included in the class). */
-
-    should_flip_negation = FALSE;
-
-    /* Extended class (xclass) will be used when characters > 255
-    might match. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    xclass = FALSE;
-    class_uchardata = code + LINK_SIZE + 2;   /* For XCLASS items */
-    class_uchardata_base = class_uchardata;   /* Save the start */
-#endif
-
-    /* For optimization purposes, we track some properties of the class:
-    class_has_8bitchar will be non-zero if the class contains at least one <
-    256 character; class_one_char will be 1 if the class contains just one
-    character; xclass_has_prop will be TRUE if unicode property checks
-    are present in the class. */
-
-    class_has_8bitchar = 0;
-    class_one_char = 0;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    xclass_has_prop = FALSE;
-#endif
-
-    /* Initialize the 32-char bit map to all zeros. We build the map in a
-    temporary bit of memory, in case the class contains fewer than two
-    8-bit characters because in that case the compiled code doesn't use the bit
-    map. */
-
-    memset(classbits, 0, 32 * sizeof(pcre_uint8));
-
-    /* Process characters until ] is reached. By writing this as a "do" it
-    means that an initial ] is taken as a data character. At the start of the
-    loop, c contains the first byte of the character. */
-
-    if (c != CHAR_NULL) do
-      {
-      const pcre_uchar *oldptr;
-
-#ifdef SUPPORT_UTF
-      if (utf && HAS_EXTRALEN(c))
-        {                           /* Braces are required because the */
-        GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
-        }
-#endif
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      /* In the pre-compile phase, accumulate the length of any extra
-      data and reset the pointer. This is so that very large classes that
-      contain a zillion > 255 characters no longer overwrite the work space
-      (which is on the stack). We have to remember that there was XCLASS data,
-      however. */
-
-      if (class_uchardata > class_uchardata_base) xclass = TRUE;
-
-      if (lengthptr != NULL && class_uchardata > class_uchardata_base)
-        {
-        *lengthptr += (int)(class_uchardata - class_uchardata_base);
-        class_uchardata = class_uchardata_base;
-        }
-#endif
-
-      /* Inside \Q...\E everything is literal except \E */
-
-      if (inescq)
-        {
-        if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
-          {
-          inescq = FALSE;                   /* Reset literal state */
-          ptr++;                            /* Skip the 'E' */
-          continue;                         /* Carry on with next */
-          }
-        goto CHECK_RANGE;                   /* Could be range if \E follows */
-        }
-
-      /* Handle POSIX class names. Perl allows a negation extension of the
-      form [:^name:]. A square bracket that doesn't match the syntax is
-      treated as a literal. We also recognize the POSIX constructions
-      [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
-      5.6 and 5.8 do. */
-
-      if (c == CHAR_LEFT_SQUARE_BRACKET &&
-          (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
-           ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
-        {
-        BOOL local_negate = FALSE;
-        int posix_class, taboffset, tabopt;
-        register const pcre_uint8 *cbits = cd->cbits;
-        pcre_uint8 pbits[32];
-
-        if (ptr[1] != CHAR_COLON)
-          {
-          *errorcodeptr = ERR31;
-          goto FAILED;
-          }
-
-        ptr += 2;
-        if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
-          {
-          local_negate = TRUE;
-          should_flip_negation = TRUE;  /* Note negative special */
-          ptr++;
-          }
-
-        posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
-        if (posix_class < 0)
-          {
-          *errorcodeptr = ERR30;
-          goto FAILED;
-          }
-
-        /* If matching is caseless, upper and lower are converted to
-        alpha. This relies on the fact that the class table starts with
-        alpha, lower, upper as the first 3 entries. */
-
-        if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
-          posix_class = 0;
-
-        /* When PCRE_UCP is set, some of the POSIX classes are converted to
-        different escape sequences that use Unicode properties \p or \P. Others
-        that are not available via \p or \P generate XCL_PROP/XCL_NOTPROP
-        directly. */
-
-#ifdef SUPPORT_UCP
-        if ((options & PCRE_UCP) != 0)
-          {
-          unsigned int ptype = 0;
-          int pc = posix_class + ((local_negate)? POSIX_SUBSIZE/2 : 0);
-
-          /* The posix_substitutes table specifies which POSIX classes can be
-          converted to \p or \P items. */
-
-          if (posix_substitutes[pc] != NULL)
-            {
-            nestptr = tempptr + 1;
-            ptr = posix_substitutes[pc] - 1;
-            continue;
-            }
-
-          /* There are three other classes that generate special property calls
-          that are recognized only in an XCLASS. */
-
-          else switch(posix_class)
-            {
-            case PC_GRAPH:
-            ptype = PT_PXGRAPH;
-            /* Fall through */
-            case PC_PRINT:
-            if (ptype == 0) ptype = PT_PXPRINT;
-            /* Fall through */
-            case PC_PUNCT:
-            if (ptype == 0) ptype = PT_PXPUNCT;
-            *class_uchardata++ = local_negate? XCL_NOTPROP : XCL_PROP;
-            *class_uchardata++ = ptype;
-            *class_uchardata++ = 0;
-            xclass_has_prop = TRUE;
-            ptr = tempptr + 1;
-            continue;
-
-            /* For the other POSIX classes (ascii, cntrl, xdigit) we are going
-            to fall through to the non-UCP case and build a bit map for
-            characters with code points less than 256. If we are in a negated
-            POSIX class, characters with code points greater than 255 must
-            either all match or all not match. In the special case where we
-            have not yet generated any xclass data, and this is the final item
-            in the overall class, we need do nothing: later on, the opcode
-            OP_NCLASS will be used to indicate that characters greater than 255
-            are acceptable. If we have already seen an xclass item or one may
-            follow (we have to assume that it might if this is not the end of
-            the class), explicitly list all wide codepoints, which will then
-            either not match or match, depending on whether the class is or is
-            not negated. */
-
-            default:
-            if (local_negate &&
-                (xclass || tempptr[2] != CHAR_RIGHT_SQUARE_BRACKET))
-              {
-              *class_uchardata++ = XCL_RANGE;
-              class_uchardata += PRIV(ord2utf)(0x100, class_uchardata);
-              class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
-              }
-            break;
-            }
-          }
-#endif
-        /* In the non-UCP case, or when UCP makes no difference, we build the
-        bit map for the POSIX class in a chunk of local store because we may be
-        adding and subtracting from it, and we don't want to subtract bits that
-        may be in the main map already. At the end we or the result into the
-        bit map that is being built. */
-
-        posix_class *= 3;
-
-        /* Copy in the first table (always present) */
-
-        memcpy(pbits, cbits + posix_class_maps[posix_class],
-          32 * sizeof(pcre_uint8));
-
-        /* If there is a second table, add or remove it as required. */
-
-        taboffset = posix_class_maps[posix_class + 1];
-        tabopt = posix_class_maps[posix_class + 2];
-
-        if (taboffset >= 0)
-          {
-          if (tabopt >= 0)
-            for (c = 0; c < 32; c++) pbits[c] |= cbits[c + taboffset];
-          else
-            for (c = 0; c < 32; c++) pbits[c] &= ~cbits[c + taboffset];
-          }
-
-        /* Now see if we need to remove any special characters. An option
-        value of 1 removes vertical space and 2 removes underscore. */
-
-        if (tabopt < 0) tabopt = -tabopt;
-        if (tabopt == 1) pbits[1] &= ~0x3c;
-          else if (tabopt == 2) pbits[11] &= 0x7f;
-
-        /* Add the POSIX table or its complement into the main table that is
-        being built and we are done. */
-
-        if (local_negate)
-          for (c = 0; c < 32; c++) classbits[c] |= ~pbits[c];
-        else
-          for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
-
-        ptr = tempptr + 1;
-        /* Every class contains at least one < 256 character. */
-        class_has_8bitchar = 1;
-        /* Every class contains at least two characters. */
-        class_one_char = 2;
-        continue;    /* End of POSIX syntax handling */
-        }
-
-      /* Backslash may introduce a single character, or it may introduce one
-      of the specials, which just set a flag. The sequence \b is a special
-      case. Inside a class (and only there) it is treated as backspace. We
-      assume that other escapes have more than one character in them, so
-      speculatively set both class_has_8bitchar and class_one_char bigger
-      than one. Unrecognized escapes fall through and are either treated
-      as literal characters (by default), or are faulted if
-      PCRE_EXTRA is set. */
-
-      if (c == CHAR_BACKSLASH)
-        {
-        escape = check_escape(&ptr, &ec, errorcodeptr, cd->bracount, options,
-          TRUE);
-        if (*errorcodeptr != 0) goto FAILED;
-        if (escape == 0) c = ec;
-        else if (escape == ESC_b) c = CHAR_BS; /* \b is backspace in a class */
-        else if (escape == ESC_N)          /* \N is not supported in a class */
-          {
-          *errorcodeptr = ERR71;
-          goto FAILED;
-          }
-        else if (escape == ESC_Q)            /* Handle start of quoted string */
-          {
-          if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
-            {
-            ptr += 2; /* avoid empty string */
-            }
-          else inescq = TRUE;
-          continue;
-          }
-        else if (escape == ESC_E) continue;  /* Ignore orphan \E */
-
-        else
-          {
-          register const pcre_uint8 *cbits = cd->cbits;
-          /* Every class contains at least two < 256 characters. */
-          class_has_8bitchar++;
-          /* Every class contains at least two characters. */
-          class_one_char += 2;
-
-          switch (escape)
-            {
-#ifdef SUPPORT_UCP
-            case ESC_du:     /* These are the values given for \d etc */
-            case ESC_DU:     /* when PCRE_UCP is set. We replace the */
-            case ESC_wu:     /* escape sequence with an appropriate \p */
-            case ESC_WU:     /* or \P to test Unicode properties instead */
-            case ESC_su:     /* of the default ASCII testing. */
-            case ESC_SU:
-            nestptr = ptr;
-            ptr = substitutes[escape - ESC_DU] - 1;  /* Just before substitute */
-            class_has_8bitchar--;                /* Undo! */
-            continue;
-#endif
-            case ESC_d:
-            for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
-            continue;
-
-            case ESC_D:
-            should_flip_negation = TRUE;
-            for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
-            continue;
-
-            case ESC_w:
-            for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_word];
-            continue;
-
-            case ESC_W:
-            should_flip_negation = TRUE;
-            for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
-            continue;
-
-            /* Perl 5.004 onwards omitted VT from \s, but restored it at Perl
-            5.18. Before PCRE 8.34, we had to preserve the VT bit if it was
-            previously set by something earlier in the character class.
-            Luckily, the value of CHAR_VT is 0x0b in both ASCII and EBCDIC, so
-            we could just adjust the appropriate bit. From PCRE 8.34 we no
-            longer treat \s and \S specially. */
-
-            case ESC_s:
-            for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
-            continue;
-
-            case ESC_S:
-            should_flip_negation = TRUE;
-            for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
-            continue;
-
-            /* The rest apply in both UCP and non-UCP cases. */
-
-            case ESC_h:
-            (void)add_list_to_class(classbits, &class_uchardata, options, cd,
-              PRIV(hspace_list), NOTACHAR);
-            continue;
-
-            case ESC_H:
-            (void)add_not_list_to_class(classbits, &class_uchardata, options,
-              cd, PRIV(hspace_list));
-            continue;
-
-            case ESC_v:
-            (void)add_list_to_class(classbits, &class_uchardata, options, cd,
-              PRIV(vspace_list), NOTACHAR);
-            continue;
-
-            case ESC_V:
-            (void)add_not_list_to_class(classbits, &class_uchardata, options,
-              cd, PRIV(vspace_list));
-            continue;
-
-            case ESC_p:
-            case ESC_P:
-#ifdef SUPPORT_UCP
-              {
-              BOOL negated;
-              unsigned int ptype = 0, pdata = 0;
-              if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr))
-                goto FAILED;
-              *class_uchardata++ = ((escape == ESC_p) != negated)?
-                XCL_PROP : XCL_NOTPROP;
-              *class_uchardata++ = ptype;
-              *class_uchardata++ = pdata;
-              xclass_has_prop = TRUE;
-              class_has_8bitchar--;                /* Undo! */
-              continue;
-              }
-#else
-            *errorcodeptr = ERR45;
-            goto FAILED;
-#endif
-            /* Unrecognized escapes are faulted if PCRE is running in its
-            strict mode. By default, for compatibility with Perl, they are
-            treated as literals. */
-
-            default:
-            if ((options & PCRE_EXTRA) != 0)
-              {
-              *errorcodeptr = ERR7;
-              goto FAILED;
-              }
-            class_has_8bitchar--;    /* Undo the speculative increase. */
-            class_one_char -= 2;     /* Undo the speculative increase. */
-            c = *ptr;                /* Get the final character and fall through */
-            break;
-            }
-          }
-
-        /* Fall through if the escape just defined a single character (c >= 0).
-        This may be greater than 256. */
-
-        escape = 0;
-
-        }   /* End of backslash handling */
-
-      /* A character may be followed by '-' to form a range. However, Perl does
-      not permit ']' to be the end of the range. A '-' character at the end is
-      treated as a literal. Perl ignores orphaned \E sequences entirely. The
-      code for handling \Q and \E is messy. */
-
-      CHECK_RANGE:
-      while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
-        {
-        inescq = FALSE;
-        ptr += 2;
-        }
-      oldptr = ptr;
-
-      /* Remember if \r or \n were explicitly used */
-
-      if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
-
-      /* Check for range */
-
-      if (!inescq && ptr[1] == CHAR_MINUS)
-        {
-        pcre_uint32 d;
-        ptr += 2;
-        while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
-
-        /* If we hit \Q (not followed by \E) at this point, go into escaped
-        mode. */
-
-        while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
-          {
-          ptr += 2;
-          if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
-            { ptr += 2; continue; }
-          inescq = TRUE;
-          break;
-          }
-
-        /* Minus (hyphen) at the end of a class is treated as a literal, so put
-        back the pointer and jump to handle the character that preceded it. */
-
-        if (*ptr == CHAR_NULL || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
-          {
-          ptr = oldptr;
-          goto CLASS_SINGLE_CHARACTER;
-          }
-
-        /* Otherwise, we have a potential range; pick up the next character */
-
-#ifdef SUPPORT_UTF
-        if (utf)
-          {                           /* Braces are required because the */
-          GETCHARLEN(d, ptr, ptr);    /* macro generates multiple statements */
-          }
-        else
-#endif
-        d = *ptr;  /* Not UTF-8 mode */
-
-        /* The second part of a range can be a single-character escape
-        sequence, but not any of the other escapes. Perl treats a hyphen as a
-        literal in such circumstances. However, in Perl's warning mode, a
-        warning is given, so PCRE now faults it as it is almost certainly a
-        mistake on the user's part. */
-
-        if (!inescq)
-          {
-          if (d == CHAR_BACKSLASH)
-            {
-            int descape;
-            descape = check_escape(&ptr, &d, errorcodeptr, cd->bracount, options, TRUE);
-            if (*errorcodeptr != 0) goto FAILED;
-
-            /* 0 means a character was put into d; \b is backspace; any other
-            special causes an error. */
-
-            if (descape != 0)
-              {
-              if (descape == ESC_b) d = CHAR_BS; else
-                {
-                *errorcodeptr = ERR83;
-                goto FAILED;
-                }
-              }
-            }
-
-          /* A hyphen followed by a POSIX class is treated in the same way. */
-
-          else if (d == CHAR_LEFT_SQUARE_BRACKET &&
-                   (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
-                    ptr[1] == CHAR_EQUALS_SIGN) &&
-                   check_posix_syntax(ptr, &tempptr))
-            {
-            *errorcodeptr = ERR83;
-            goto FAILED;
-            }
-          }
-
-        /* Check that the two values are in the correct order. Optimize
-        one-character ranges. */
-
-        if (d < c)
-          {
-          *errorcodeptr = ERR8;
-          goto FAILED;
-          }
-        if (d == c) goto CLASS_SINGLE_CHARACTER;  /* A few lines below */
-
-        /* We have found a character range, so single character optimizations
-        cannot be done anymore. Any value greater than 1 indicates that there
-        is more than one character. */
-
-        class_one_char = 2;
-
-        /* Remember an explicit \r or \n, and add the range to the class. */
-
-        if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
-
-        class_has_8bitchar +=
-          add_to_class(classbits, &class_uchardata, options, cd, c, d);
-
-        continue;   /* Go get the next char in the class */
-        }
-
-      /* Handle a single character - we can get here for a normal non-escape
-      char, or after \ that introduces a single character or for an apparent
-      range that isn't. Only the value 1 matters for class_one_char, so don't
-      increase it if it is already 2 or more ... just in case there's a class
-      with a zillion characters in it. */
-
-      CLASS_SINGLE_CHARACTER:
-      if (class_one_char < 2) class_one_char++;
-
-      /* If xclass_has_prop is false and class_one_char is 1, we have the first
-      single character in the class, and there have been no prior ranges, or
-      XCLASS items generated by escapes. If this is the final character in the
-      class, we can optimize by turning the item into a 1-character OP_CHAR[I]
-      if it's positive, or OP_NOT[I] if it's negative. In the positive case, it
-      can cause firstchar to be set. Otherwise, there can be no first char if
-      this item is first, whatever repeat count may follow. In the case of
-      reqchar, save the previous value for reinstating. */
-
-      if (!inescq &&
-#ifdef SUPPORT_UCP
-          !xclass_has_prop &&
-#endif
-          class_one_char == 1 && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
-        {
-        ptr++;
-        zeroreqchar = reqchar;
-        zeroreqcharflags = reqcharflags;
-
-        if (negate_class)
-          {
-#ifdef SUPPORT_UCP
-          int d;
-#endif
-          if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-          zerofirstchar = firstchar;
-          zerofirstcharflags = firstcharflags;
-
-          /* For caseless UTF-8 mode when UCP support is available, check
-          whether this character has more than one other case. If so, generate
-          a special OP_NOTPROP item instead of OP_NOTI. */
-
-#ifdef SUPPORT_UCP
-          if (utf && (options & PCRE_CASELESS) != 0 &&
-              (d = UCD_CASESET(c)) != 0)
-            {
-            *code++ = OP_NOTPROP;
-            *code++ = PT_CLIST;
-            *code++ = d;
-            }
-          else
-#endif
-          /* Char has only one other case, or UCP not available */
-
-            {
-            *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-            if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
-              code += PRIV(ord2utf)(c, code);
-            else
-#endif
-              *code++ = c;
-            }
-
-          /* We are finished with this character class */
-
-          goto END_CLASS;
-          }
-
-        /* For a single, positive character, get the value into mcbuffer, and
-        then we can handle this with the normal one-character code. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-        if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
-          mclength = PRIV(ord2utf)(c, mcbuffer);
-        else
-#endif
-          {
-          mcbuffer[0] = c;
-          mclength = 1;
-          }
-        goto ONE_CHAR;
-        }       /* End of 1-char optimization */
-
-      /* There is more than one character in the class, or an XCLASS item
-      has been generated. Add this character to the class. */
-
-      class_has_8bitchar +=
-        add_to_class(classbits, &class_uchardata, options, cd, c, c);
-      }
-
-    /* Loop until ']' reached. This "while" is the end of the "do" far above.
-    If we are at the end of an internal nested string, revert to the outer
-    string. */
-
-    while (((c = *(++ptr)) != CHAR_NULL ||
-           (nestptr != NULL &&
-             (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != CHAR_NULL)) &&
-           (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
-
-    /* Check for missing terminating ']' */
-
-    if (c == CHAR_NULL)
-      {
-      *errorcodeptr = ERR6;
-      goto FAILED;
-      }
-
-    /* We will need an XCLASS if data has been placed in class_uchardata. In
-    the second phase this is a sufficient test. However, in the pre-compile
-    phase, class_uchardata gets emptied to prevent workspace overflow, so it
-    only if the very last character in the class needs XCLASS will it contain
-    anything at this point. For this reason, xclass gets set TRUE above when
-    uchar_classdata is emptied, and that's why this code is the way it is here
-    instead of just doing a test on class_uchardata below. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    if (class_uchardata > class_uchardata_base) xclass = TRUE;
-#endif
-
-    /* If this is the first thing in the branch, there can be no first char
-    setting, whatever the repeat count. Any reqchar setting must remain
-    unchanged after any kind of repeat. */
-
-    if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-    zerofirstchar = firstchar;
-    zerofirstcharflags = firstcharflags;
-    zeroreqchar = reqchar;
-    zeroreqcharflags = reqcharflags;
-
-    /* If there are characters with values > 255, we have to compile an
-    extended class, with its own opcode, unless there was a negated special
-    such as \S in the class, and PCRE_UCP is not set, because in that case all
-    characters > 255 are in the class, so any that were explicitly given as
-    well can be ignored. If (when there are explicit characters > 255 that must
-    be listed) there are no characters < 256, we can omit the bitmap in the
-    actual compiled code. */
-
-#ifdef SUPPORT_UTF
-    if (xclass && (xclass_has_prop || !should_flip_negation ||
-        (options & PCRE_UCP) != 0))
-#elif !defined COMPILE_PCRE8
-    if (xclass && (xclass_has_prop || !should_flip_negation))
-#endif
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      {
-      /* For non-UCP wide characters, in a non-negative class containing \S or
-      similar (should_flip_negation is set), all characters greater than 255
-      must be in the class. */
-
-      if (
-#if defined COMPILE_PCRE8
-           utf &&
-#endif
-           should_flip_negation && !negate_class && (options & PCRE_UCP) == 0)
-        {
-        *class_uchardata++ = XCL_RANGE;
-        if (utf)   /* Will always be utf in the 8-bit library */
-          {
-          class_uchardata += PRIV(ord2utf)(0x100, class_uchardata);
-          class_uchardata += PRIV(ord2utf)(0x10ffff, class_uchardata);
-          }
-        else       /* Can only happen for the 16-bit & 32-bit libraries */
-          {
-#if defined COMPILE_PCRE16
-          *class_uchardata++ = 0x100;
-          *class_uchardata++ = 0xffffu;
-#elif defined COMPILE_PCRE32
-          *class_uchardata++ = 0x100;
-          *class_uchardata++ = 0xffffffffu;
-#endif
-          }
-        }
-
-      *class_uchardata++ = XCL_END;    /* Marks the end of extra data */
-      *code++ = OP_XCLASS;
-      code += LINK_SIZE;
-      *code = negate_class? XCL_NOT:0;
-      if (xclass_has_prop) *code |= XCL_HASPROP;
-
-      /* If the map is required, move up the extra data to make room for it;
-      otherwise just move the code pointer to the end of the extra data. */
-
-      if (class_has_8bitchar > 0)
-        {
-        *code++ |= XCL_MAP;
-        memmove(code + (32 / sizeof(pcre_uchar)), code,
-          IN_UCHARS(class_uchardata - code));
-        if (negate_class && !xclass_has_prop)
-          for (c = 0; c < 32; c++) classbits[c] = ~classbits[c];
-        memcpy(code, classbits, 32);
-        code = class_uchardata + (32 / sizeof(pcre_uchar));
-        }
-      else code = class_uchardata;
-
-      /* Now fill in the complete length of the item */
-
-      PUT(previous, 1, (int)(code - previous));
-      break;   /* End of class handling */
-      }
-
-    /* Even though any XCLASS list is now discarded, we must allow for
-    its memory. */
-
-    if (lengthptr != NULL)
-      *lengthptr += (int)(class_uchardata - class_uchardata_base);
-#endif
-
-    /* If there are no characters > 255, or they are all to be included or
-    excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
-    whole class was negated and whether there were negative specials such as \S
-    (non-UCP) in the class. Then copy the 32-byte map into the code vector,
-    negating it if necessary. */
-
-    *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
-    if (lengthptr == NULL)    /* Save time in the pre-compile phase */
-      {
-      if (negate_class)
-        for (c = 0; c < 32; c++) classbits[c] = ~classbits[c];
-      memcpy(code, classbits, 32);
-      }
-    code += 32 / sizeof(pcre_uchar);
-
-    END_CLASS:
-    break;
-
-
-    /* ===================================================================*/
-    /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
-    has been tested above. */
-
-    case CHAR_LEFT_CURLY_BRACKET:
-    if (!is_quantifier) goto NORMAL_CHAR;
-    ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
-    if (*errorcodeptr != 0) goto FAILED;
-    goto REPEAT;
-
-    case CHAR_ASTERISK:
-    repeat_min = 0;
-    repeat_max = -1;
-    goto REPEAT;
-
-    case CHAR_PLUS:
-    repeat_min = 1;
-    repeat_max = -1;
-    goto REPEAT;
-
-    case CHAR_QUESTION_MARK:
-    repeat_min = 0;
-    repeat_max = 1;
-
-    REPEAT:
-    if (previous == NULL)
-      {
-      *errorcodeptr = ERR9;
-      goto FAILED;
-      }
-
-    if (repeat_min == 0)
-      {
-      firstchar = zerofirstchar;    /* Adjust for zero repeat */
-      firstcharflags = zerofirstcharflags;
-      reqchar = zeroreqchar;        /* Ditto */
-      reqcharflags = zeroreqcharflags;
-      }
-
-    /* Remember whether this is a variable length repeat */
-
-    reqvary = (repeat_min == repeat_max)? 0 : REQ_VARY;
-
-    op_type = 0;                    /* Default single-char op codes */
-    possessive_quantifier = FALSE;  /* Default not possessive quantifier */
-
-    /* Save start of previous item, in case we have to move it up in order to
-    insert something before it. */
-
-    tempcode = previous;
-
-    /* Before checking for a possessive quantifier, we must skip over
-    whitespace and comments in extended mode because Perl allows white space at
-    this point. */
-
-    if ((options & PCRE_EXTENDED) != 0)
-      {
-      const pcre_uchar *p = ptr + 1;
-      for (;;)
-        {
-        while (MAX_255(*p) && (cd->ctypes[*p] & ctype_space) != 0) p++;
-        if (*p != CHAR_NUMBER_SIGN) break;
-        p++;
-        while (*p != CHAR_NULL)
-          {
-          if (IS_NEWLINE(p))         /* For non-fixed-length newline cases, */
-            {                        /* IS_NEWLINE sets cd->nllen. */
-            p += cd->nllen;
-            break;
-            }
-          p++;
-#ifdef SUPPORT_UTF
-          if (utf) FORWARDCHAR(p);
-#endif
-          }           /* Loop for comment characters */
-        }             /* Loop for multiple comments */
-      ptr = p - 1;    /* Character before the next significant one. */
-      }
-
-    /* We also need to skip over (?# comments, which are not dependent on
-    extended mode. */
-
-    if (ptr[1] == CHAR_LEFT_PARENTHESIS && ptr[2] == CHAR_QUESTION_MARK &&
-        ptr[3] == CHAR_NUMBER_SIGN)
-      {
-      ptr += 4;
-      while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
-      if (*ptr == CHAR_NULL)
-        {
-        *errorcodeptr = ERR18;
-        goto FAILED;
-        }
-      }
-
-    /* If the next character is '+', we have a possessive quantifier. This
-    implies greediness, whatever the setting of the PCRE_UNGREEDY option.
-    If the next character is '?' this is a minimizing repeat, by default,
-    but if PCRE_UNGREEDY is set, it works the other way round. We change the
-    repeat type to the non-default. */
-
-    if (ptr[1] == CHAR_PLUS)
-      {
-      repeat_type = 0;                  /* Force greedy */
-      possessive_quantifier = TRUE;
-      ptr++;
-      }
-    else if (ptr[1] == CHAR_QUESTION_MARK)
-      {
-      repeat_type = greedy_non_default;
-      ptr++;
-      }
-    else repeat_type = greedy_default;
-
-    /* If previous was a recursion call, wrap it in atomic brackets so that
-    previous becomes the atomic group. All recursions were so wrapped in the
-    past, but it no longer happens for non-repeated recursions. In fact, the
-    repeated ones could be re-implemented independently so as not to need this,
-    but for the moment we rely on the code for repeating groups. */
-
-    if (*previous == OP_RECURSE)
-      {
-      memmove(previous + 1 + LINK_SIZE, previous, IN_UCHARS(1 + LINK_SIZE));
-      *previous = OP_ONCE;
-      PUT(previous, 1, 2 + 2*LINK_SIZE);
-      previous[2 + 2*LINK_SIZE] = OP_KET;
-      PUT(previous, 3 + 2*LINK_SIZE, 2 + 2*LINK_SIZE);
-      code += 2 + 2 * LINK_SIZE;
-      length_prevgroup = 3 + 3*LINK_SIZE;
-
-      /* When actually compiling, we need to check whether this was a forward
-      reference, and if so, adjust the offset. */
-
-      if (lengthptr == NULL && cd->hwm >= cd->start_workspace + LINK_SIZE)
-        {
-        int offset = GET(cd->hwm, -LINK_SIZE);
-        if (offset == previous + 1 - cd->start_code)
-          PUT(cd->hwm, -LINK_SIZE, offset + 1 + LINK_SIZE);
-        }
-      }
-
-    /* Now handle repetition for the different types of item. */
-
-    /* If previous was a character or negated character match, abolish the item
-    and generate a repeat item instead. If a char item has a minimum of more
-    than one, ensure that it is set in reqchar - it might not be if a sequence
-    such as x{3} is the first thing in a branch because the x will have gone
-    into firstchar instead.  */
-
-    if (*previous == OP_CHAR || *previous == OP_CHARI
-        || *previous == OP_NOT || *previous == OP_NOTI)
-      {
-      switch (*previous)
-        {
-        default: /* Make compiler happy. */
-        case OP_CHAR:  op_type = OP_STAR - OP_STAR; break;
-        case OP_CHARI: op_type = OP_STARI - OP_STAR; break;
-        case OP_NOT:   op_type = OP_NOTSTAR - OP_STAR; break;
-        case OP_NOTI:  op_type = OP_NOTSTARI - OP_STAR; break;
-        }
-
-      /* Deal with UTF characters that take up more than one character. It's
-      easier to write this out separately than try to macrify it. Use c to
-      hold the length of the character in bytes, plus UTF_LENGTH to flag that
-      it's a length rather than a small character. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-      if (utf && NOT_FIRSTCHAR(code[-1]))
-        {
-        pcre_uchar *lastchar = code - 1;
-        BACKCHAR(lastchar);
-        c = (int)(code - lastchar);     /* Length of UTF-8 character */
-        memcpy(utf_chars, lastchar, IN_UCHARS(c)); /* Save the char */
-        c |= UTF_LENGTH;                /* Flag c as a length */
-        }
-      else
-#endif /* SUPPORT_UTF */
-
-      /* Handle the case of a single charater - either with no UTF support, or
-      with UTF disabled, or for a single character UTF character. */
-        {
-        c = code[-1];
-        if (*previous <= OP_CHARI && repeat_min > 1)
-          {
-          reqchar = c;
-          reqcharflags = req_caseopt | cd->req_varyopt;
-          }
-        }
-
-      goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */
-      }
-
-    /* If previous was a character type match (\d or similar), abolish it and
-    create a suitable repeat item. The code is shared with single-character
-    repeats by setting op_type to add a suitable offset into repeat_type. Note
-    the the Unicode property types will be present only when SUPPORT_UCP is
-    defined, but we don't wrap the little bits of code here because it just
-    makes it horribly messy. */
-
-    else if (*previous < OP_EODN)
-      {
-      pcre_uchar *oldcode;
-      int prop_type, prop_value;
-      op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
-      c = *previous;
-
-      OUTPUT_SINGLE_REPEAT:
-      if (*previous == OP_PROP || *previous == OP_NOTPROP)
-        {
-        prop_type = previous[1];
-        prop_value = previous[2];
-        }
-      else prop_type = prop_value = -1;
-
-      oldcode = code;
-      code = previous;                  /* Usually overwrite previous item */
-
-      /* If the maximum is zero then the minimum must also be zero; Perl allows
-      this case, so we do too - by simply omitting the item altogether. */
-
-      if (repeat_max == 0) goto END_REPEAT;
-
-      /* Combine the op_type with the repeat_type */
-
-      repeat_type += op_type;
-
-      /* A minimum of zero is handled either as the special case * or ?, or as
-      an UPTO, with the maximum given. */
-
-      if (repeat_min == 0)
-        {
-        if (repeat_max == -1) *code++ = OP_STAR + repeat_type;
-          else if (repeat_max == 1) *code++ = OP_QUERY + repeat_type;
-        else
-          {
-          *code++ = OP_UPTO + repeat_type;
-          PUT2INC(code, 0, repeat_max);
-          }
-        }
-
-      /* A repeat minimum of 1 is optimized into some special cases. If the
-      maximum is unlimited, we use OP_PLUS. Otherwise, the original item is
-      left in place and, if the maximum is greater than 1, we use OP_UPTO with
-      one less than the maximum. */
-
-      else if (repeat_min == 1)
-        {
-        if (repeat_max == -1)
-          *code++ = OP_PLUS + repeat_type;
-        else
-          {
-          code = oldcode;                 /* leave previous item in place */
-          if (repeat_max == 1) goto END_REPEAT;
-          *code++ = OP_UPTO + repeat_type;
-          PUT2INC(code, 0, repeat_max - 1);
-          }
-        }
-
-      /* The case {n,n} is just an EXACT, while the general case {n,m} is
-      handled as an EXACT followed by an UPTO. */
-
-      else
-        {
-        *code++ = OP_EXACT + op_type;  /* NB EXACT doesn't have repeat_type */
-        PUT2INC(code, 0, repeat_min);
-
-        /* If the maximum is unlimited, insert an OP_STAR. Before doing so,
-        we have to insert the character for the previous code. For a repeated
-        Unicode property match, there are two extra bytes that define the
-        required property. In UTF-8 mode, long characters have their length in
-        c, with the UTF_LENGTH bit as a flag. */
-
-        if (repeat_max < 0)
-          {
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-          if (utf && (c & UTF_LENGTH) != 0)
-            {
-            memcpy(code, utf_chars, IN_UCHARS(c & 7));
-            code += c & 7;
-            }
-          else
-#endif
-            {
-            *code++ = c;
-            if (prop_type >= 0)
-              {
-              *code++ = prop_type;
-              *code++ = prop_value;
-              }
-            }
-          *code++ = OP_STAR + repeat_type;
-          }
-
-        /* Else insert an UPTO if the max is greater than the min, again
-        preceded by the character, for the previously inserted code. If the
-        UPTO is just for 1 instance, we can use QUERY instead. */
-
-        else if (repeat_max != repeat_min)
-          {
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-          if (utf && (c & UTF_LENGTH) != 0)
-            {
-            memcpy(code, utf_chars, IN_UCHARS(c & 7));
-            code += c & 7;
-            }
-          else
-#endif
-          *code++ = c;
-          if (prop_type >= 0)
-            {
-            *code++ = prop_type;
-            *code++ = prop_value;
-            }
-          repeat_max -= repeat_min;
-
-          if (repeat_max == 1)
-            {
-            *code++ = OP_QUERY + repeat_type;
-            }
-          else
-            {
-            *code++ = OP_UPTO + repeat_type;
-            PUT2INC(code, 0, repeat_max);
-            }
-          }
-        }
-
-      /* The character or character type itself comes last in all cases. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-      if (utf && (c & UTF_LENGTH) != 0)
-        {
-        memcpy(code, utf_chars, IN_UCHARS(c & 7));
-        code += c & 7;
-        }
-      else
-#endif
-      *code++ = c;
-
-      /* For a repeated Unicode property match, there are two extra bytes that
-      define the required property. */
-
-#ifdef SUPPORT_UCP
-      if (prop_type >= 0)
-        {
-        *code++ = prop_type;
-        *code++ = prop_value;
-        }
-#endif
-      }
-
-    /* If previous was a character class or a back reference, we put the repeat
-    stuff after it, but just skip the item if the repeat was {0,0}. */
-
-    else if (*previous == OP_CLASS || *previous == OP_NCLASS ||
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-             *previous == OP_XCLASS ||
-#endif
-             *previous == OP_REF   || *previous == OP_REFI ||
-             *previous == OP_DNREF || *previous == OP_DNREFI)
-      {
-      if (repeat_max == 0)
-        {
-        code = previous;
-        goto END_REPEAT;
-        }
-
-      if (repeat_min == 0 && repeat_max == -1)
-        *code++ = OP_CRSTAR + repeat_type;
-      else if (repeat_min == 1 && repeat_max == -1)
-        *code++ = OP_CRPLUS + repeat_type;
-      else if (repeat_min == 0 && repeat_max == 1)
-        *code++ = OP_CRQUERY + repeat_type;
-      else
-        {
-        *code++ = OP_CRRANGE + repeat_type;
-        PUT2INC(code, 0, repeat_min);
-        if (repeat_max == -1) repeat_max = 0;  /* 2-byte encoding for max */
-        PUT2INC(code, 0, repeat_max);
-        }
-      }
-
-    /* If previous was a bracket group, we may have to replicate it in certain
-    cases. Note that at this point we can encounter only the "basic" bracket
-    opcodes such as BRA and CBRA, as this is the place where they get converted
-    into the more special varieties such as BRAPOS and SBRA. A test for >=
-    OP_ASSERT and <= OP_COND includes ASSERT, ASSERT_NOT, ASSERTBACK,
-    ASSERTBACK_NOT, ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND.
-    Originally, PCRE did not allow repetition of assertions, but now it does,
-    for Perl compatibility. */
-
-    else if (*previous >= OP_ASSERT && *previous <= OP_COND)
-      {
-      register int i;
-      int len = (int)(code - previous);
-      size_t base_hwm_offset = item_hwm_offset;
-      pcre_uchar *bralink = NULL;
-      pcre_uchar *brazeroptr = NULL;
-
-      /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
-      we just ignore the repeat. */
-
-      if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
-        goto END_REPEAT;
-
-      /* There is no sense in actually repeating assertions. The only potential
-      use of repetition is in cases when the assertion is optional. Therefore,
-      if the minimum is greater than zero, just ignore the repeat. If the
-      maximum is not zero or one, set it to 1. */
-
-      if (*previous < OP_ONCE)    /* Assertion */
-        {
-        if (repeat_min > 0) goto END_REPEAT;
-        if (repeat_max < 0 || repeat_max > 1) repeat_max = 1;
-        }
-
-      /* The case of a zero minimum is special because of the need to stick
-      OP_BRAZERO in front of it, and because the group appears once in the
-      data, whereas in other cases it appears the minimum number of times. For
-      this reason, it is simplest to treat this case separately, as otherwise
-      the code gets far too messy. There are several special subcases when the
-      minimum is zero. */
-
-      if (repeat_min == 0)
-        {
-        /* If the maximum is also zero, we used to just omit the group from the
-        output altogether, like this:
-
-        ** if (repeat_max == 0)
-        **   {
-        **   code = previous;
-        **   goto END_REPEAT;
-        **   }
-
-        However, that fails when a group or a subgroup within it is referenced
-        as a subroutine from elsewhere in the pattern, so now we stick in
-        OP_SKIPZERO in front of it so that it is skipped on execution. As we
-        don't have a list of which groups are referenced, we cannot do this
-        selectively.
-
-        If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
-        and do no more at this point. However, we do need to adjust any
-        OP_RECURSE calls inside the group that refer to the group itself or any
-        internal or forward referenced group, because the offset is from the
-        start of the whole regex. Temporarily terminate the pattern while doing
-        this. */
-
-        if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
-          {
-          *code = OP_END;
-          adjust_recurse(previous, 1, utf, cd, item_hwm_offset);
-          memmove(previous + 1, previous, IN_UCHARS(len));
-          code++;
-          if (repeat_max == 0)
-            {
-            *previous++ = OP_SKIPZERO;
-            goto END_REPEAT;
-            }
-          brazeroptr = previous;    /* Save for possessive optimizing */
-          *previous++ = OP_BRAZERO + repeat_type;
-          }
-
-        /* If the maximum is greater than 1 and limited, we have to replicate
-        in a nested fashion, sticking OP_BRAZERO before each set of brackets.
-        The first one has to be handled carefully because it's the original
-        copy, which has to be moved up. The remainder can be handled by code
-        that is common with the non-zero minimum case below. We have to
-        adjust the value or repeat_max, since one less copy is required. Once
-        again, we may have to adjust any OP_RECURSE calls inside the group. */
-
-        else
-          {
-          int offset;
-          *code = OP_END;
-          adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, item_hwm_offset);
-          memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len));
-          code += 2 + LINK_SIZE;
-          *previous++ = OP_BRAZERO + repeat_type;
-          *previous++ = OP_BRA;
-
-          /* We chain together the bracket offset fields that have to be
-          filled in later when the ends of the brackets are reached. */
-
-          offset = (bralink == NULL)? 0 : (int)(previous - bralink);
-          bralink = previous;
-          PUTINC(previous, 0, offset);
-          }
-
-        repeat_max--;
-        }
-
-      /* If the minimum is greater than zero, replicate the group as many
-      times as necessary, and adjust the maximum to the number of subsequent
-      copies that we need. If we set a first char from the group, and didn't
-      set a required char, copy the latter from the former. If there are any
-      forward reference subroutine calls in the group, there will be entries on
-      the workspace list; replicate these with an appropriate increment. */
-
-      else
-        {
-        if (repeat_min > 1)
-          {
-          /* In the pre-compile phase, we don't actually do the replication. We
-          just adjust the length as if we had. Do some paranoid checks for
-          potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
-          integer type when available, otherwise double. */
-
-          if (lengthptr != NULL)
-            {
-            int delta = (repeat_min - 1)*length_prevgroup;
-            if ((INT64_OR_DOUBLE)(repeat_min - 1)*
-                  (INT64_OR_DOUBLE)length_prevgroup >
-                    (INT64_OR_DOUBLE)INT_MAX ||
-                OFLOW_MAX - *lengthptr < delta)
-              {
-              *errorcodeptr = ERR20;
-              goto FAILED;
-              }
-            *lengthptr += delta;
-            }
-
-          /* This is compiling for real. If there is a set first byte for
-          the group, and we have not yet set a "required byte", set it. Make
-          sure there is enough workspace for copying forward references before
-          doing the copy. */
-
-          else
-            {
-            if (groupsetfirstchar && reqcharflags < 0)
-              {
-              reqchar = firstchar;
-              reqcharflags = firstcharflags;
-              }
-
-            for (i = 1; i < repeat_min; i++)
-              {
-              pcre_uchar *hc;
-              size_t this_hwm_offset = cd->hwm - cd->start_workspace;
-              memcpy(code, previous, IN_UCHARS(len));
-
-              while (cd->hwm > cd->start_workspace + cd->workspace_size -
-                     WORK_SIZE_SAFETY_MARGIN -
-                     (this_hwm_offset - base_hwm_offset))
-                {
-                *errorcodeptr = expand_workspace(cd);
-                if (*errorcodeptr != 0) goto FAILED;
-                }
-
-              for (hc = (pcre_uchar *)cd->start_workspace + base_hwm_offset;
-                   hc < (pcre_uchar *)cd->start_workspace + this_hwm_offset;
-                   hc += LINK_SIZE)
-                {
-                PUT(cd->hwm, 0, GET(hc, 0) + len);
-                cd->hwm += LINK_SIZE;
-                }
-              base_hwm_offset = this_hwm_offset;
-              code += len;
-              }
-            }
-          }
-
-        if (repeat_max > 0) repeat_max -= repeat_min;
-        }
-
-      /* This code is common to both the zero and non-zero minimum cases. If
-      the maximum is limited, it replicates the group in a nested fashion,
-      remembering the bracket starts on a stack. In the case of a zero minimum,
-      the first one was set up above. In all cases the repeat_max now specifies
-      the number of additional copies needed. Again, we must remember to
-      replicate entries on the forward reference list. */
-
-      if (repeat_max >= 0)
-        {
-        /* In the pre-compile phase, we don't actually do the replication. We
-        just adjust the length as if we had. For each repetition we must add 1
-        to the length for BRAZERO and for all but the last repetition we must
-        add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
-        paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is
-        a 64-bit integer type when available, otherwise double. */
-
-        if (lengthptr != NULL && repeat_max > 0)
-          {
-          int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
-                      2 - 2*LINK_SIZE;   /* Last one doesn't nest */
-          if ((INT64_OR_DOUBLE)repeat_max *
-                (INT64_OR_DOUBLE)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
-                  > (INT64_OR_DOUBLE)INT_MAX ||
-              OFLOW_MAX - *lengthptr < delta)
-            {
-            *errorcodeptr = ERR20;
-            goto FAILED;
-            }
-          *lengthptr += delta;
-          }
-
-        /* This is compiling for real */
-
-        else for (i = repeat_max - 1; i >= 0; i--)
-          {
-          pcre_uchar *hc;
-          size_t this_hwm_offset = cd->hwm - cd->start_workspace;
-
-          *code++ = OP_BRAZERO + repeat_type;
-
-          /* All but the final copy start a new nesting, maintaining the
-          chain of brackets outstanding. */
-
-          if (i != 0)
-            {
-            int offset;
-            *code++ = OP_BRA;
-            offset = (bralink == NULL)? 0 : (int)(code - bralink);
-            bralink = code;
-            PUTINC(code, 0, offset);
-            }
-
-          memcpy(code, previous, IN_UCHARS(len));
-
-          /* Ensure there is enough workspace for forward references before
-          copying them. */
-
-          while (cd->hwm > cd->start_workspace + cd->workspace_size -
-                 WORK_SIZE_SAFETY_MARGIN -
-                 (this_hwm_offset - base_hwm_offset))
-            {
-            *errorcodeptr = expand_workspace(cd);
-            if (*errorcodeptr != 0) goto FAILED;
-            }
-
-          for (hc = (pcre_uchar *)cd->start_workspace + base_hwm_offset;
-               hc < (pcre_uchar *)cd->start_workspace + this_hwm_offset;
-               hc += LINK_SIZE)
-            {
-            PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));
-            cd->hwm += LINK_SIZE;
-            }
-          base_hwm_offset = this_hwm_offset;
-          code += len;
-          }
-
-        /* Now chain through the pending brackets, and fill in their length
-        fields (which are holding the chain links pro tem). */
-
-        while (bralink != NULL)
-          {
-          int oldlinkoffset;
-          int offset = (int)(code - bralink + 1);
-          pcre_uchar *bra = code - offset;
-          oldlinkoffset = GET(bra, 1);
-          bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
-          *code++ = OP_KET;
-          PUTINC(code, 0, offset);
-          PUT(bra, 1, offset);
-          }
-        }
-
-      /* If the maximum is unlimited, set a repeater in the final copy. For
-      ONCE brackets, that's all we need to do. However, possessively repeated
-      ONCE brackets can be converted into non-capturing brackets, as the
-      behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
-      deal with possessive ONCEs specially.
-
-      Otherwise, when we are doing the actual compile phase, check to see
-      whether this group is one that could match an empty string. If so,
-      convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
-      that runtime checking can be done. [This check is also applied to ONCE
-      groups at runtime, but in a different way.]
-
-      Then, if the quantifier was possessive and the bracket is not a
-      conditional, we convert the BRA code to the POS form, and the KET code to
-      KETRPOS. (It turns out to be convenient at runtime to detect this kind of
-      subpattern at both the start and at the end.) The use of special opcodes
-      makes it possible to reduce greatly the stack usage in pcre_exec(). If
-      the group is preceded by OP_BRAZERO, convert this to OP_BRAPOSZERO.
-
-      Then, if the minimum number of matches is 1 or 0, cancel the possessive
-      flag so that the default action below, of wrapping everything inside
-      atomic brackets, does not happen. When the minimum is greater than 1,
-      there will be earlier copies of the group, and so we still have to wrap
-      the whole thing. */
-
-      else
-        {
-        pcre_uchar *ketcode = code - 1 - LINK_SIZE;
-        pcre_uchar *bracode = ketcode - GET(ketcode, 1);
-
-        /* Convert possessive ONCE brackets to non-capturing */
-
-        if ((*bracode == OP_ONCE || *bracode == OP_ONCE_NC) &&
-            possessive_quantifier) *bracode = OP_BRA;
-
-        /* For non-possessive ONCE brackets, all we need to do is to
-        set the KET. */
-
-        if (*bracode == OP_ONCE || *bracode == OP_ONCE_NC)
-          *ketcode = OP_KETRMAX + repeat_type;
-
-        /* Handle non-ONCE brackets and possessive ONCEs (which have been
-        converted to non-capturing above). */
-
-        else
-          {
-          /* In the compile phase, check for empty string matching. */
-
-          if (lengthptr == NULL)
-            {
-            pcre_uchar *scode = bracode;
-            do
-              {
-              if (could_be_empty_branch(scode, ketcode, utf, cd, NULL))
-                {
-                *bracode += OP_SBRA - OP_BRA;
-                break;
-                }
-              scode += GET(scode, 1);
-              }
-            while (*scode == OP_ALT);
-            }
-
-          /* A conditional group with only one branch has an implicit empty
-          alternative branch. */
-
-          if (*bracode == OP_COND && bracode[GET(bracode,1)] != OP_ALT)
-            *bracode = OP_SCOND;
-
-          /* Handle possessive quantifiers. */
-
-          if (possessive_quantifier)
-            {
-            /* For COND brackets, we wrap the whole thing in a possessively
-            repeated non-capturing bracket, because we have not invented POS
-            versions of the COND opcodes. Because we are moving code along, we
-            must ensure that any pending recursive references are updated. */
-
-            if (*bracode == OP_COND || *bracode == OP_SCOND)
-              {
-              int nlen = (int)(code - bracode);
-              *code = OP_END;
-              adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-              memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen));
-              code += 1 + LINK_SIZE;
-              nlen += 1 + LINK_SIZE;
-              *bracode = (*bracode == OP_COND)? OP_BRAPOS : OP_SBRAPOS;
-              *code++ = OP_KETRPOS;
-              PUTINC(code, 0, nlen);
-              PUT(bracode, 1, nlen);
-              }
-
-            /* For non-COND brackets, we modify the BRA code and use KETRPOS. */
-
-            else
-              {
-              *bracode += 1;              /* Switch to xxxPOS opcodes */
-              *ketcode = OP_KETRPOS;
-              }
-
-            /* If the minimum is zero, mark it as possessive, then unset the
-            possessive flag when the minimum is 0 or 1. */
-
-            if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
-            if (repeat_min < 2) possessive_quantifier = FALSE;
-            }
-
-          /* Non-possessive quantifier */
-
-          else *ketcode = OP_KETRMAX + repeat_type;
-          }
-        }
-      }
-
-    /* If previous is OP_FAIL, it was generated by an empty class [] in
-    JavaScript mode. The other ways in which OP_FAIL can be generated, that is
-    by (*FAIL) or (?!) set previous to NULL, which gives a "nothing to repeat"
-    error above. We can just ignore the repeat in JS case. */
-
-    else if (*previous == OP_FAIL) goto END_REPEAT;
-
-    /* Else there's some kind of shambles */
-
-    else
-      {
-      *errorcodeptr = ERR11;
-      goto FAILED;
-      }
-
-    /* If the character following a repeat is '+', possessive_quantifier is
-    TRUE. For some opcodes, there are special alternative opcodes for this
-    case. For anything else, we wrap the entire repeated item inside OP_ONCE
-    brackets. Logically, the '+' notation is just syntactic sugar, taken from
-    Sun's Java package, but the special opcodes can optimize it.
-
-    Some (but not all) possessively repeated subpatterns have already been
-    completely handled in the code just above. For them, possessive_quantifier
-    is always FALSE at this stage. Note that the repeated item starts at
-    tempcode, not at previous, which might be the first part of a string whose
-    (former) last char we repeated. */
-
-    if (possessive_quantifier)
-      {
-      int len;
-
-      /* Possessifying an EXACT quantifier has no effect, so we can ignore it.
-      However, QUERY, STAR, or UPTO may follow (for quantifiers such as {5,6},
-      {5,}, or {5,10}). We skip over an EXACT item; if the length of what
-      remains is greater than zero, there's a further opcode that can be
-      handled. If not, do nothing, leaving the EXACT alone. */
-
-      switch(*tempcode)
-        {
-        case OP_TYPEEXACT:
-        tempcode += PRIV(OP_lengths)[*tempcode] +
-          ((tempcode[1 + IMM2_SIZE] == OP_PROP
-          || tempcode[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
-        break;
-
-        /* CHAR opcodes are used for exacts whose count is 1. */
-
-        case OP_CHAR:
-        case OP_CHARI:
-        case OP_NOT:
-        case OP_NOTI:
-        case OP_EXACT:
-        case OP_EXACTI:
-        case OP_NOTEXACT:
-        case OP_NOTEXACTI:
-        tempcode += PRIV(OP_lengths)[*tempcode];
-#ifdef SUPPORT_UTF
-        if (utf && HAS_EXTRALEN(tempcode[-1]))
-          tempcode += GET_EXTRALEN(tempcode[-1]);
-#endif
-        break;
-
-        /* For the class opcodes, the repeat operator appears at the end;
-        adjust tempcode to point to it. */
-
-        case OP_CLASS:
-        case OP_NCLASS:
-        tempcode += 1 + 32/sizeof(pcre_uchar);
-        break;
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-        case OP_XCLASS:
-        tempcode += GET(tempcode, 1);
-        break;
-#endif
-        }
-
-      /* If tempcode is equal to code (which points to the end of the repeated
-      item), it means we have skipped an EXACT item but there is no following
-      QUERY, STAR, or UPTO; the value of len will be 0, and we do nothing. In
-      all other cases, tempcode will be pointing to the repeat opcode, and will
-      be less than code, so the value of len will be greater than 0. */
-
-      len = (int)(code - tempcode);
-      if (len > 0)
-        {
-        unsigned int repcode = *tempcode;
-
-        /* There is a table for possessifying opcodes, all of which are less
-        than OP_CALLOUT. A zero entry means there is no possessified version.
-        */
-
-        if (repcode < OP_CALLOUT && opcode_possessify[repcode] > 0)
-          *tempcode = opcode_possessify[repcode];
-
-        /* For opcode without a special possessified version, wrap the item in
-        ONCE brackets. Because we are moving code along, we must ensure that any
-        pending recursive references are updated. */
-
-        else
-          {
-          *code = OP_END;
-          adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-          memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
-          code += 1 + LINK_SIZE;
-          len += 1 + LINK_SIZE;
-          tempcode[0] = OP_ONCE;
-          *code++ = OP_KET;
-          PUTINC(code, 0, len);
-          PUT(tempcode, 1, len);
-          }
-        }
-
-#ifdef NEVER
-      if (len > 0) switch (*tempcode)
-        {
-        case OP_STAR:  *tempcode = OP_POSSTAR; break;
-        case OP_PLUS:  *tempcode = OP_POSPLUS; break;
-        case OP_QUERY: *tempcode = OP_POSQUERY; break;
-        case OP_UPTO:  *tempcode = OP_POSUPTO; break;
-
-        case OP_STARI:  *tempcode = OP_POSSTARI; break;
-        case OP_PLUSI:  *tempcode = OP_POSPLUSI; break;
-        case OP_QUERYI: *tempcode = OP_POSQUERYI; break;
-        case OP_UPTOI:  *tempcode = OP_POSUPTOI; break;
-
-        case OP_NOTSTAR:  *tempcode = OP_NOTPOSSTAR; break;
-        case OP_NOTPLUS:  *tempcode = OP_NOTPOSPLUS; break;
-        case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;
-        case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;
-
-        case OP_NOTSTARI:  *tempcode = OP_NOTPOSSTARI; break;
-        case OP_NOTPLUSI:  *tempcode = OP_NOTPOSPLUSI; break;
-        case OP_NOTQUERYI: *tempcode = OP_NOTPOSQUERYI; break;
-        case OP_NOTUPTOI:  *tempcode = OP_NOTPOSUPTOI; break;
-
-        case OP_TYPESTAR:  *tempcode = OP_TYPEPOSSTAR; break;
-        case OP_TYPEPLUS:  *tempcode = OP_TYPEPOSPLUS; break;
-        case OP_TYPEQUERY: *tempcode = OP_TYPEPOSQUERY; break;
-        case OP_TYPEUPTO:  *tempcode = OP_TYPEPOSUPTO; break;
-
-        case OP_CRSTAR:   *tempcode = OP_CRPOSSTAR; break;
-        case OP_CRPLUS:   *tempcode = OP_CRPOSPLUS; break;
-        case OP_CRQUERY:  *tempcode = OP_CRPOSQUERY; break;
-        case OP_CRRANGE:  *tempcode = OP_CRPOSRANGE; break;
-
-        /* Because we are moving code along, we must ensure that any
-        pending recursive references are updated. */
-
-        default:
-        *code = OP_END;
-        adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-        memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
-        code += 1 + LINK_SIZE;
-        len += 1 + LINK_SIZE;
-        tempcode[0] = OP_ONCE;
-        *code++ = OP_KET;
-        PUTINC(code, 0, len);
-        PUT(tempcode, 1, len);
-        break;
-        }
-#endif
-      }
-
-    /* In all case we no longer have a previous item. We also set the
-    "follows varying string" flag for subsequently encountered reqchars if
-    it isn't already set and we have just passed a varying length item. */
-
-    END_REPEAT:
-    previous = NULL;
-    cd->req_varyopt |= reqvary;
-    break;
-
-
-    /* ===================================================================*/
-    /* Start of nested parenthesized sub-expression, or comment or lookahead or
-    lookbehind or option setting or condition or all the other extended
-    parenthesis forms.  */
-
-    case CHAR_LEFT_PARENTHESIS:
-    ptr++;
-
-    /* Now deal with various "verbs" that can be introduced by '*'. */
-
-    if (ptr[0] == CHAR_ASTERISK && (ptr[1] == ':'
-         || (MAX_255(ptr[1]) && ((cd->ctypes[ptr[1]] & ctype_letter) != 0))))
-      {
-      int i, namelen;
-      int arglen = 0;
-      const char *vn = verbnames;
-      const pcre_uchar *name = ptr + 1;
-      const pcre_uchar *arg = NULL;
-      previous = NULL;
-      ptr++;
-      while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;
-      namelen = (int)(ptr - name);
-
-      /* It appears that Perl allows any characters whatsoever, other than
-      a closing parenthesis, to appear in arguments, so we no longer insist on
-      letters, digits, and underscores. */
-
-      if (*ptr == CHAR_COLON)
-        {
-        arg = ++ptr;
-        while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
-        arglen = (int)(ptr - arg);
-        if ((unsigned int)arglen > MAX_MARK)
-          {
-          *errorcodeptr = ERR75;
-          goto FAILED;
-          }
-        }
-
-      if (*ptr != CHAR_RIGHT_PARENTHESIS)
-        {
-        *errorcodeptr = ERR60;
-        goto FAILED;
-        }
-
-      /* Scan the table of verb names */
-
-      for (i = 0; i < verbcount; i++)
-        {
-        if (namelen == verbs[i].len &&
-            STRNCMP_UC_C8(name, vn, namelen) == 0)
-          {
-          int setverb;
-
-          /* Check for open captures before ACCEPT and convert it to
-          ASSERT_ACCEPT if in an assertion. */
-
-          if (verbs[i].op == OP_ACCEPT)
-            {
-            open_capitem *oc;
-            if (arglen != 0)
-              {
-              *errorcodeptr = ERR59;
-              goto FAILED;
-              }
-            cd->had_accept = TRUE;
-            for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-              {
-              if (lengthptr != NULL)
-                {
-#ifdef COMPILE_PCRE8
-                *lengthptr += 1 + IMM2_SIZE;
-#elif defined COMPILE_PCRE16
-                *lengthptr += 2 + IMM2_SIZE;
-#elif defined COMPILE_PCRE32
-                *lengthptr += 4 + IMM2_SIZE;
-#endif
-                }
-              else
-                {
-                *code++ = OP_CLOSE;
-                PUT2INC(code, 0, oc->number);
-                }
-              }
-            setverb = *code++ =
-              (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
-
-            /* Do not set firstchar after *ACCEPT */
-            if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-            }
-
-          /* Handle other cases with/without an argument */
-
-          else if (arglen == 0)
-            {
-            if (verbs[i].op < 0)   /* Argument is mandatory */
-              {
-              *errorcodeptr = ERR66;
-              goto FAILED;
-              }
-            setverb = *code++ = verbs[i].op;
-            }
-
-          else
-            {
-            if (verbs[i].op_arg < 0)   /* Argument is forbidden */
-              {
-              *errorcodeptr = ERR59;
-              goto FAILED;
-              }
-            setverb = *code++ = verbs[i].op_arg;
-            if (lengthptr != NULL)    /* In pass 1 just add in the length */
-              {                       /* to avoid potential workspace */
-              *lengthptr += arglen;   /* overflow. */
-              *code++ = 0;
-              }
-            else
-              {
-              *code++ = arglen;
-              memcpy(code, arg, IN_UCHARS(arglen));
-              code += arglen;
-              }
-            *code++ = 0;
-            }
-
-          switch (setverb)
-            {
-            case OP_THEN:
-            case OP_THEN_ARG:
-            cd->external_flags |= PCRE_HASTHEN;
-            break;
-
-            case OP_PRUNE:
-            case OP_PRUNE_ARG:
-            case OP_SKIP:
-            case OP_SKIP_ARG:
-            cd->had_pruneorskip = TRUE;
-            break;
-            }
-
-          break;  /* Found verb, exit loop */
-          }
-
-        vn += verbs[i].len + 1;
-        }
-
-      if (i < verbcount) continue;    /* Successfully handled a verb */
-      *errorcodeptr = ERR60;          /* Verb not recognized */
-      goto FAILED;
-      }
-
-    /* Initialize for "real" parentheses */
-
-    newoptions = options;
-    skipbytes = 0;
-    bravalue = OP_CBRA;
-    item_hwm_offset = cd->hwm - cd->start_workspace;
-    reset_bracount = FALSE;
-
-    /* Deal with the extended parentheses; all are introduced by '?', and the
-    appearance of any of them means that this is not a capturing group. */
-
-    if (*ptr == CHAR_QUESTION_MARK)
-      {
-      int i, set, unset, namelen;
-      int *optset;
-      const pcre_uchar *name;
-      pcre_uchar *slot;
-
-      switch (*(++ptr))
-        {
-        /* ------------------------------------------------------------ */
-        case CHAR_VERTICAL_LINE:  /* Reset capture count for each branch */
-        reset_bracount = TRUE;
-        cd->dupgroups = TRUE;     /* Record (?| encountered */
-        /* Fall through */
-
-        /* ------------------------------------------------------------ */
-        case CHAR_COLON:          /* Non-capturing bracket */
-        bravalue = OP_BRA;
-        ptr++;
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_LEFT_PARENTHESIS:
-        bravalue = OP_COND;       /* Conditional group */
-        tempptr = ptr;
-
-        /* A condition can be an assertion, a number (referring to a numbered
-        group's having been set), a name (referring to a named group), or 'R',
-        referring to recursion. R<digits> and R&name are also permitted for
-        recursion tests.
-
-        There are ways of testing a named group: (?(name)) is used by Python;
-        Perl 5.10 onwards uses (?(<name>) or (?('name')).
-
-        There is one unfortunate ambiguity, caused by history. 'R' can be the
-        recursive thing or the name 'R' (and similarly for 'R' followed by
-        digits). We look for a name first; if not found, we try the other case.
-
-        For compatibility with auto-callouts, we allow a callout to be
-        specified before a condition that is an assertion. First, check for the
-        syntax of a callout; if found, adjust the temporary pointer that is
-        used to check for an assertion condition. That's all that is needed! */
-
-        if (ptr[1] == CHAR_QUESTION_MARK && ptr[2] == CHAR_C)
-          {
-          for (i = 3;; i++) if (!IS_DIGIT(ptr[i])) break;
-          if (ptr[i] == CHAR_RIGHT_PARENTHESIS)
-            tempptr += i + 1;
-
-          /* tempptr should now be pointing to the opening parenthesis of the
-          assertion condition. */
-
-          if (*tempptr != CHAR_LEFT_PARENTHESIS)
-            {
-            *errorcodeptr = ERR28;
-            goto FAILED;
-            }
-          }
-
-        /* For conditions that are assertions, check the syntax, and then exit
-        the switch. This will take control down to where bracketed groups,
-        including assertions, are processed. */
-
-        if (tempptr[1] == CHAR_QUESTION_MARK &&
-              (tempptr[2] == CHAR_EQUALS_SIGN ||
-               tempptr[2] == CHAR_EXCLAMATION_MARK ||
-                 (tempptr[2] == CHAR_LESS_THAN_SIGN &&
-                   (tempptr[3] == CHAR_EQUALS_SIGN ||
-                    tempptr[3] == CHAR_EXCLAMATION_MARK))))
-          {
-          cd->iscondassert = TRUE;
-          break;
-          }
-
-        /* Other conditions use OP_CREF/OP_DNCREF/OP_RREF/OP_DNRREF, and all
-        need to skip at least 1+IMM2_SIZE bytes at the start of the group. */
-
-        code[1+LINK_SIZE] = OP_CREF;
-        skipbytes = 1+IMM2_SIZE;
-        refsign = -1;     /* => not a number */
-        namelen = -1;     /* => not a name; must set to avoid warning */
-        name = NULL;      /* Always set to avoid warning */
-        recno = 0;        /* Always set to avoid warning */
-
-        /* Check for a test for recursion in a named group. */
-
-        ptr++;
-        if (*ptr == CHAR_R && ptr[1] == CHAR_AMPERSAND)
-          {
-          terminator = -1;
-          ptr += 2;
-          code[1+LINK_SIZE] = OP_RREF;    /* Change the type of test */
-          }
-
-        /* Check for a test for a named group's having been set, using the Perl
-        syntax (?(<name>) or (?('name'), and also allow for the original PCRE
-        syntax of (?(name) or for (?(+n), (?(-n), and just (?(n). */
-
-        else if (*ptr == CHAR_LESS_THAN_SIGN)
-          {
-          terminator = CHAR_GREATER_THAN_SIGN;
-          ptr++;
-          }
-        else if (*ptr == CHAR_APOSTROPHE)
-          {
-          terminator = CHAR_APOSTROPHE;
-          ptr++;
-          }
-        else
-          {
-          terminator = CHAR_NULL;
-          if (*ptr == CHAR_MINUS || *ptr == CHAR_PLUS) refsign = *ptr++;
-            else if (IS_DIGIT(*ptr)) refsign = 0;
-          }
-
-        /* Handle a number */
-
-        if (refsign >= 0)
-          {
-          while (IS_DIGIT(*ptr))
-            {
-            if (recno > INT_MAX / 10 - 1)  /* Integer overflow */
-              {
-              while (IS_DIGIT(*ptr)) ptr++;
-              *errorcodeptr = ERR61;
-              goto FAILED;
-              }
-            recno = recno * 10 + (int)(*ptr - CHAR_0);
-            ptr++;
-            }
-          }
-
-        /* Otherwise we expect to read a name; anything else is an error. When
-        a name is one of a number of duplicates, a different opcode is used and
-        it needs more memory. Unfortunately we cannot tell whether a name is a
-        duplicate in the first pass, so we have to allow for more memory. */
-
-        else
-          {
-          if (IS_DIGIT(*ptr))
-            {
-            *errorcodeptr = ERR84;
-            goto FAILED;
-            }
-          if (!MAX_255(*ptr) || (cd->ctypes[*ptr] & ctype_word) == 0)
-            {
-            *errorcodeptr = ERR28;   /* Assertion expected */
-            goto FAILED;
-            }
-          name = ptr++;
-          while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0)
-            {
-            ptr++;
-            }
-          namelen = (int)(ptr - name);
-          if (lengthptr != NULL) skipbytes += IMM2_SIZE;
-          }
-
-        /* Check the terminator */
-
-        if ((terminator > 0 && *ptr++ != (pcre_uchar)terminator) ||
-            *ptr++ != CHAR_RIGHT_PARENTHESIS)
-          {
-          ptr--;                  /* Error offset */
-          *errorcodeptr = ERR26;  /* Malformed number or name */
-          goto FAILED;
-          }
-
-        /* Do no further checking in the pre-compile phase. */
-
-        if (lengthptr != NULL) break;
-
-        /* In the real compile we do the work of looking for the actual
-        reference. If refsign is not negative, it means we have a number in
-        recno. */
-
-        if (refsign >= 0)
-          {
-          if (recno <= 0)
-            {
-            *errorcodeptr = ERR35;
-            goto FAILED;
-            }
-          if (refsign != 0) recno = (refsign == CHAR_MINUS)?
-            cd->bracount - recno + 1 : recno + cd->bracount;
-          if (recno <= 0 || recno > cd->final_bracount)
-            {
-            *errorcodeptr = ERR15;
-            goto FAILED;
-            }
-          PUT2(code, 2+LINK_SIZE, recno);
-          if (recno > cd->top_backref) cd->top_backref = recno;
-          break;
-          }
-
-        /* Otherwise look for the name. */
-
-        slot = cd->name_table;
-        for (i = 0; i < cd->names_found; i++)
-          {
-          if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0 &&
-            slot[IMM2_SIZE+namelen] == 0) break;
-          slot += cd->name_entry_size;
-          }
-
-        /* Found the named subpattern. If the name is duplicated, add one to
-        the opcode to change CREF/RREF into DNCREF/DNRREF and insert
-        appropriate data values. Otherwise, just insert the unique subpattern
-        number. */
-
-        if (i < cd->names_found)
-          {
-          int offset = i++;
-          int count = 1;
-          recno = GET2(slot, 0);   /* Number from first found */
-          if (recno > cd->top_backref) cd->top_backref = recno;
-          for (; i < cd->names_found; i++)
-            {
-            slot += cd->name_entry_size;
-            if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) != 0 ||
-              (slot+IMM2_SIZE)[namelen] != 0) break;
-            count++;
-            }
-
-          if (count > 1)
-            {
-            PUT2(code, 2+LINK_SIZE, offset);
-            PUT2(code, 2+LINK_SIZE+IMM2_SIZE, count);
-            skipbytes += IMM2_SIZE;
-            code[1+LINK_SIZE]++;
-            }
-          else  /* Not a duplicated name */
-            {
-            PUT2(code, 2+LINK_SIZE, recno);
-            }
-          }
-
-        /* If terminator == CHAR_NULL it means that the name followed directly
-        after the opening parenthesis [e.g. (?(abc)...] and in this case there
-        are some further alternatives to try. For the cases where terminator !=
-        CHAR_NULL [things like (?(<name>... or (?('name')... or (?(R&name)... ]
-        we have now checked all the possibilities, so give an error. */
-
-        else if (terminator != CHAR_NULL)
-          {
-          *errorcodeptr = ERR15;
-          goto FAILED;
-          }
-
-        /* Check for (?(R) for recursion. Allow digits after R to specify a
-        specific group number. */
-
-        else if (*name == CHAR_R)
-          {
-          recno = 0;
-          for (i = 1; i < namelen; i++)
-            {
-            if (!IS_DIGIT(name[i]))
-              {
-              *errorcodeptr = ERR15;
-              goto FAILED;
-              }
-            if (recno > INT_MAX / 10 - 1)   /* Integer overflow */
-              {
-              *errorcodeptr = ERR61;
-              goto FAILED;
-              }
-            recno = recno * 10 + name[i] - CHAR_0;
-            }
-          if (recno == 0) recno = RREF_ANY;
-          code[1+LINK_SIZE] = OP_RREF;      /* Change test type */
-          PUT2(code, 2+LINK_SIZE, recno);
-          }
-
-        /* Similarly, check for the (?(DEFINE) "condition", which is always
-        false. */
-
-        else if (namelen == 6 && STRNCMP_UC_C8(name, STRING_DEFINE, 6) == 0)
-          {
-          code[1+LINK_SIZE] = OP_DEF;
-          skipbytes = 1;
-          }
-
-        /* Reference to an unidentified subpattern. */
-
-        else
-          {
-          *errorcodeptr = ERR15;
-          goto FAILED;
-          }
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
-        bravalue = OP_ASSERT;
-        cd->assert_depth += 1;
-        ptr++;
-        break;
-
-        /* Optimize (?!) to (*FAIL) unless it is quantified - which is a weird
-        thing to do, but Perl allows all assertions to be quantified, and when
-        they contain capturing parentheses there may be a potential use for
-        this feature. Not that that applies to a quantified (?!) but we allow
-        it for uniformity. */
-
-        /* ------------------------------------------------------------ */
-        case CHAR_EXCLAMATION_MARK:            /* Negative lookahead */
-        ptr++;
-        if (*ptr == CHAR_RIGHT_PARENTHESIS && ptr[1] != CHAR_ASTERISK &&
-             ptr[1] != CHAR_PLUS && ptr[1] != CHAR_QUESTION_MARK &&
-            (ptr[1] != CHAR_LEFT_CURLY_BRACKET || !is_counted_repeat(ptr+2)))
-          {
-          *code++ = OP_FAIL;
-          previous = NULL;
-          continue;
-          }
-        bravalue = OP_ASSERT_NOT;
-        cd->assert_depth += 1;
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_LESS_THAN_SIGN:              /* Lookbehind or named define */
-        switch (ptr[1])
-          {
-          case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
-          bravalue = OP_ASSERTBACK;
-          cd->assert_depth += 1;
-          ptr += 2;
-          break;
-
-          case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
-          bravalue = OP_ASSERTBACK_NOT;
-          cd->assert_depth += 1;
-          ptr += 2;
-          break;
-
-          default:                /* Could be name define, else bad */
-          if (MAX_255(ptr[1]) && (cd->ctypes[ptr[1]] & ctype_word) != 0)
-            goto DEFINE_NAME;
-          ptr++;                  /* Correct offset for error */
-          *errorcodeptr = ERR24;
-          goto FAILED;
-          }
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_GREATER_THAN_SIGN:           /* One-time brackets */
-        bravalue = OP_ONCE;
-        ptr++;
-        break;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_C:                 /* Callout - may be followed by digits; */
-        previous_callout = code;     /* Save for later completion */
-        after_manual_callout = 1;    /* Skip one item before completing */
-        *code++ = OP_CALLOUT;
-          {
-          int n = 0;
-          ptr++;
-          while(IS_DIGIT(*ptr))
-            {
-            n = n * 10 + *ptr++ - CHAR_0;
-            if (n > 255)
-              {
-              *errorcodeptr = ERR38;
-              goto FAILED;
-              }
-            }
-          if (*ptr != CHAR_RIGHT_PARENTHESIS)
-            {
-            *errorcodeptr = ERR39;
-            goto FAILED;
-            }
-          *code++ = n;
-          PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
-          PUT(code, LINK_SIZE, 0);                          /* Default length */
-          code += 2 * LINK_SIZE;
-          }
-        previous = NULL;
-        continue;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_P:              /* Python-style named subpattern handling */
-        if (*(++ptr) == CHAR_EQUALS_SIGN ||
-            *ptr == CHAR_GREATER_THAN_SIGN)  /* Reference or recursion */
-          {
-          is_recurse = *ptr == CHAR_GREATER_THAN_SIGN;
-          terminator = CHAR_RIGHT_PARENTHESIS;
-          goto NAMED_REF_OR_RECURSE;
-          }
-        else if (*ptr != CHAR_LESS_THAN_SIGN)  /* Test for Python-style defn */
-          {
-          *errorcodeptr = ERR41;
-          goto FAILED;
-          }
-        /* Fall through to handle (?P< as (?< is handled */
-
-
-        /* ------------------------------------------------------------ */
-        DEFINE_NAME:    /* Come here from (?< handling */
-        case CHAR_APOSTROPHE:
-        terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
-          CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
-        name = ++ptr;
-        if (IS_DIGIT(*ptr))
-          {
-          *errorcodeptr = ERR84;   /* Group name must start with non-digit */
-          goto FAILED;
-          }
-        while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
-        namelen = (int)(ptr - name);
-
-        /* In the pre-compile phase, do a syntax check, remember the longest
-        name, and then remember the group in a vector, expanding it if
-        necessary. Duplicates for the same number are skipped; other duplicates
-        are checked for validity. In the actual compile, there is nothing to
-        do. */
-
-        if (lengthptr != NULL)
-          {
-          named_group *ng;
-          pcre_uint32 number = cd->bracount + 1;
-
-          if (*ptr != (pcre_uchar)terminator)
-            {
-            *errorcodeptr = ERR42;
-            goto FAILED;
-            }
-
-          if (cd->names_found >= MAX_NAME_COUNT)
-            {
-            *errorcodeptr = ERR49;
-            goto FAILED;
-            }
-
-          if (namelen + IMM2_SIZE + 1 > cd->name_entry_size)
-            {
-            cd->name_entry_size = namelen + IMM2_SIZE + 1;
-            if (namelen > MAX_NAME_SIZE)
-              {
-              *errorcodeptr = ERR48;
-              goto FAILED;
-              }
-            }
-
-          /* Scan the list to check for duplicates. For duplicate names, if the
-          number is the same, break the loop, which causes the name to be
-          discarded; otherwise, if DUPNAMES is not set, give an error.
-          If it is set, allow the name with a different number, but continue
-          scanning in case this is a duplicate with the same number. For
-          non-duplicate names, give an error if the number is duplicated. */
-
-          ng = cd->named_groups;
-          for (i = 0; i < cd->names_found; i++, ng++)
-            {
-            if (namelen == ng->length &&
-                STRNCMP_UC_UC(name, ng->name, namelen) == 0)
-              {
-              if (ng->number == number) break;
-              if ((options & PCRE_DUPNAMES) == 0)
-                {
-                *errorcodeptr = ERR43;
-                goto FAILED;
-                }
-              cd->dupnames = TRUE;  /* Duplicate names exist */
-              }
-            else if (ng->number == number)
-              {
-              *errorcodeptr = ERR65;
-              goto FAILED;
-              }
-            }
-
-          if (i >= cd->names_found)     /* Not a duplicate with same number */
-            {
-            /* Increase the list size if necessary */
-
-            if (cd->names_found >= cd->named_group_list_size)
-              {
-              int newsize = cd->named_group_list_size * 2;
-              named_group *newspace = (PUBL(malloc))
-                (newsize * sizeof(named_group));
-
-              if (newspace == NULL)
-                {
-                *errorcodeptr = ERR21;
-                goto FAILED;
-                }
-
-              memcpy(newspace, cd->named_groups,
-                cd->named_group_list_size * sizeof(named_group));
-              if (cd->named_group_list_size > NAMED_GROUP_LIST_SIZE)
-                (PUBL(free))((void *)cd->named_groups);
-              cd->named_groups = newspace;
-              cd->named_group_list_size = newsize;
-              }
-
-            cd->named_groups[cd->names_found].name = name;
-            cd->named_groups[cd->names_found].length = namelen;
-            cd->named_groups[cd->names_found].number = number;
-            cd->names_found++;
-            }
-          }
-
-        ptr++;                    /* Move past > or ' in both passes. */
-        goto NUMBERED_GROUP;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_AMPERSAND:            /* Perl recursion/subroutine syntax */
-        terminator = CHAR_RIGHT_PARENTHESIS;
-        is_recurse = TRUE;
-        /* Fall through */
-
-        /* We come here from the Python syntax above that handles both
-        references (?P=name) and recursion (?P>name), as well as falling
-        through from the Perl recursion syntax (?&name). We also come here from
-        the Perl \k<name> or \k'name' back reference syntax and the \k{name}
-        .NET syntax, and the Oniguruma \g<...> and \g'...' subroutine syntax. */
-
-        NAMED_REF_OR_RECURSE:
-        name = ++ptr;
-        if (IS_DIGIT(*ptr))
-          {
-          *errorcodeptr = ERR84;   /* Group name must start with non-digit */
-          goto FAILED;
-          }
-        while (MAX_255(*ptr) && (cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
-        namelen = (int)(ptr - name);
-
-        /* In the pre-compile phase, do a syntax check. We used to just set
-        a dummy reference number, because it was not used in the first pass.
-        However, with the change of recursive back references to be atomic,
-        we have to look for the number so that this state can be identified, as
-        otherwise the incorrect length is computed. If it's not a backwards
-        reference, the dummy number will do. */
-
-        if (lengthptr != NULL)
-          {
-          named_group *ng;
-          recno = 0;
-
-          if (namelen == 0)
-            {
-            *errorcodeptr = ERR62;
-            goto FAILED;
-            }
-          if (*ptr != (pcre_uchar)terminator)
-            {
-            *errorcodeptr = ERR42;
-            goto FAILED;
-            }
-          if (namelen > MAX_NAME_SIZE)
-            {
-            *errorcodeptr = ERR48;
-            goto FAILED;
-            }
-
-          /* Count named back references. */
-
-          if (!is_recurse) cd->namedrefcount++;
-
-          /* We have to allow for a named reference to a duplicated name (this
-          cannot be determined until the second pass). This needs an extra
-          16-bit data item. */
-
-          *lengthptr += IMM2_SIZE;
-
-          /* If this is a forward reference and we are within a (?|...) group,
-          the reference may end up as the number of a group which we are
-          currently inside, that is, it could be a recursive reference. In the
-          real compile this will be picked up and the reference wrapped with
-          OP_ONCE to make it atomic, so we must space in case this occurs. */
-
-          /* In fact, this can happen for a non-forward reference because
-          another group with the same number might be created later. This
-          issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance
-          only mode, we finesse the bug by allowing more memory always. */
-
-          *lengthptr += 4 + 4*LINK_SIZE;
-
-          /* It is even worse than that. The current reference may be to an
-          existing named group with a different number (so apparently not
-          recursive) but which later on is also attached to a group with the
-          current number. This can only happen if $(| has been previous
-          encountered. In that case, we allow yet more memory, just in case.
-          (Again, this is fixed "properly" in PCRE2. */
-
-          if (cd->dupgroups) *lengthptr += 4 + 4*LINK_SIZE;
-
-          /* Otherwise, check for recursion here. The name table does not exist
-          in the first pass; instead we must scan the list of names encountered
-          so far in order to get the number. If the name is not found, leave
-          the value of recno as 0 for a forward reference. */
-
-          /* This patch (removing "else") fixes a problem when a reference is
-          to multiple identically named nested groups from within the nest.
-          Once again, it is not the "proper" fix, and it results in an
-          over-allocation of memory. */
-
-          /* else */
-            {
-            ng = cd->named_groups;
-            for (i = 0; i < cd->names_found; i++, ng++)
-              {
-              if (namelen == ng->length &&
-                  STRNCMP_UC_UC(name, ng->name, namelen) == 0)
-                {
-                open_capitem *oc;
-                recno = ng->number;
-                if (is_recurse) break;
-                for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-                  {
-                  if (oc->number == recno)
-                    {
-                    oc->flag = TRUE;
-                    break;
-                    }
-                  }
-                }
-              }
-            }
-          }
-
-        /* In the real compile, search the name table. We check the name
-        first, and then check that we have reached the end of the name in the
-        table. That way, if the name is longer than any in the table, the
-        comparison will fail without reading beyond the table entry. */
-
-        else
-          {
-          slot = cd->name_table;
-          for (i = 0; i < cd->names_found; i++)
-            {
-            if (STRNCMP_UC_UC(name, slot+IMM2_SIZE, namelen) == 0 &&
-                slot[IMM2_SIZE+namelen] == 0)
-              break;
-            slot += cd->name_entry_size;
-            }
-
-          if (i < cd->names_found)
-            {
-            recno = GET2(slot, 0);
-            }
-          else
-            {
-            *errorcodeptr = ERR15;
-            goto FAILED;
-            }
-          }
-
-        /* In both phases, for recursions, we can now go to the code than
-        handles numerical recursion. */
-
-        if (is_recurse) goto HANDLE_RECURSION;
-
-        /* In the second pass we must see if the name is duplicated. If so, we
-        generate a different opcode. */
-
-        if (lengthptr == NULL && cd->dupnames)
-          {
-          int count = 1;
-          unsigned int index = i;
-          pcre_uchar *cslot = slot + cd->name_entry_size;
-
-          for (i++; i < cd->names_found; i++)
-            {
-            if (STRCMP_UC_UC(slot + IMM2_SIZE, cslot + IMM2_SIZE) != 0) break;
-            count++;
-            cslot += cd->name_entry_size;
-            }
-
-          if (count > 1)
-            {
-            if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-            previous = code;
-            item_hwm_offset = cd->hwm - cd->start_workspace;
-            *code++ = ((options & PCRE_CASELESS) != 0)? OP_DNREFI : OP_DNREF;
-            PUT2INC(code, 0, index);
-            PUT2INC(code, 0, count);
-
-            /* Process each potentially referenced group. */
-
-            for (; slot < cslot; slot += cd->name_entry_size)
-              {
-              open_capitem *oc;
-              recno = GET2(slot, 0);
-              cd->backref_map |= (recno < 32)? (1U << recno) : 1;
-              if (recno > cd->top_backref) cd->top_backref = recno;
-
-              /* Check to see if this back reference is recursive, that it, it
-              is inside the group that it references. A flag is set so that the
-              group can be made atomic. */
-
-              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-                {
-                if (oc->number == recno)
-                  {
-                  oc->flag = TRUE;
-                  break;
-                  }
-                }
-              }
-
-            continue;  /* End of back ref handling */
-            }
-          }
-
-        /* First pass, or a non-duplicated name. */
-
-        goto HANDLE_REFERENCE;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_R:              /* Recursion, same as (?0) */
-        recno = 0;
-        if (*(++ptr) != CHAR_RIGHT_PARENTHESIS)
-          {
-          *errorcodeptr = ERR29;
-          goto FAILED;
-          }
-        goto HANDLE_RECURSION;
-
-
-        /* ------------------------------------------------------------ */
-        case CHAR_MINUS: case CHAR_PLUS:  /* Recursion or subroutine */
-        case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:
-        case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
-          {
-          const pcre_uchar *called;
-          terminator = CHAR_RIGHT_PARENTHESIS;
-
-          /* Come here from the \g<...> and \g'...' code (Oniguruma
-          compatibility). However, the syntax has been checked to ensure that
-          the ... are a (signed) number, so that neither ERR63 nor ERR29 will
-          be called on this path, nor with the jump to OTHER_CHAR_AFTER_QUERY
-          ever be taken. */
-
-          HANDLE_NUMERICAL_RECURSION:
-
-          if ((refsign = *ptr) == CHAR_PLUS)
-            {
-            ptr++;
-            if (!IS_DIGIT(*ptr))
-              {
-              *errorcodeptr = ERR63;
-              goto FAILED;
-              }
-            }
-          else if (refsign == CHAR_MINUS)
-            {
-            if (!IS_DIGIT(ptr[1]))
-              goto OTHER_CHAR_AFTER_QUERY;
-            ptr++;
-            }
-
-          recno = 0;
-          while(IS_DIGIT(*ptr))
-            {
-            if (recno > INT_MAX / 10 - 1) /* Integer overflow */
-              {
-              while (IS_DIGIT(*ptr)) ptr++;
-              *errorcodeptr = ERR61;
-              goto FAILED;
-              }
-            recno = recno * 10 + *ptr++ - CHAR_0;
-            }
-
-          if (*ptr != (pcre_uchar)terminator)
-            {
-            *errorcodeptr = ERR29;
-            goto FAILED;
-            }
-
-          if (refsign == CHAR_MINUS)
-            {
-            if (recno == 0)
-              {
-              *errorcodeptr = ERR58;
-              goto FAILED;
-              }
-            recno = cd->bracount - recno + 1;
-            if (recno <= 0)
-              {
-              *errorcodeptr = ERR15;
-              goto FAILED;
-              }
-            }
-          else if (refsign == CHAR_PLUS)
-            {
-            if (recno == 0)
-              {
-              *errorcodeptr = ERR58;
-              goto FAILED;
-              }
-            recno += cd->bracount;
-            }
-
-          /* Come here from code above that handles a named recursion */
-
-          HANDLE_RECURSION:
-
-          previous = code;
-          item_hwm_offset = cd->hwm - cd->start_workspace;
-          called = cd->start_code;
-
-          /* When we are actually compiling, find the bracket that is being
-          referenced. Temporarily end the regex in case it doesn't exist before
-          this point. If we end up with a forward reference, first check that
-          the bracket does occur later so we can give the error (and position)
-          now. Then remember this forward reference in the workspace so it can
-          be filled in at the end. */
-
-          if (lengthptr == NULL)
-            {
-            *code = OP_END;
-            if (recno != 0)
-              called = PRIV(find_bracket)(cd->start_code, utf, recno);
-
-            /* Forward reference */
-
-            if (called == NULL)
-              {
-              if (recno > cd->final_bracount)
-                {
-                *errorcodeptr = ERR15;
-                goto FAILED;
-                }
-
-              /* Fudge the value of "called" so that when it is inserted as an
-              offset below, what it actually inserted is the reference number
-              of the group. Then remember the forward reference. */
-
-              called = cd->start_code + recno;
-              if (cd->hwm >= cd->start_workspace + cd->workspace_size -
-                  WORK_SIZE_SAFETY_MARGIN)
-                {
-                *errorcodeptr = expand_workspace(cd);
-                if (*errorcodeptr != 0) goto FAILED;
-                }
-              PUTINC(cd->hwm, 0, (int)(code + 1 - cd->start_code));
-              }
-
-            /* If not a forward reference, and the subpattern is still open,
-            this is a recursive call. We check to see if this is a left
-            recursion that could loop for ever, and diagnose that case. We
-            must not, however, do this check if we are in a conditional
-            subpattern because the condition might be testing for recursion in
-            a pattern such as /(?(R)a+|(?R)b)/, which is perfectly valid.
-            Forever loops are also detected at runtime, so those that occur in
-            conditional subpatterns will be picked up then. */
-
-            else if (GET(called, 1) == 0 && cond_depth <= 0 &&
-                     could_be_empty(called, code, bcptr, utf, cd))
-              {
-              *errorcodeptr = ERR40;
-              goto FAILED;
-              }
-            }
-
-          /* Insert the recursion/subroutine item. It does not have a set first
-          character (relevant if it is repeated, because it will then be
-          wrapped with ONCE brackets). */
-
-          *code = OP_RECURSE;
-          PUT(code, 1, (int)(called - cd->start_code));
-          code += 1 + LINK_SIZE;
-          groupsetfirstchar = FALSE;
-          }
-
-        /* Can't determine a first byte now */
-
-        if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-        zerofirstchar = firstchar;
-        zerofirstcharflags = firstcharflags;
-        continue;
-
-
-        /* ------------------------------------------------------------ */
-        default:              /* Other characters: check option setting */
-        OTHER_CHAR_AFTER_QUERY:
-        set = unset = 0;
-        optset = &set;
-
-        while (*ptr != CHAR_RIGHT_PARENTHESIS && *ptr != CHAR_COLON)
-          {
-          switch (*ptr++)
-            {
-            case CHAR_MINUS: optset = &unset; break;
-
-            case CHAR_J:    /* Record that it changed in the external options */
-            *optset |= PCRE_DUPNAMES;
-            cd->external_flags |= PCRE_JCHANGED;
-            break;
-
-            case CHAR_i: *optset |= PCRE_CASELESS; break;
-            case CHAR_m: *optset |= PCRE_MULTILINE; break;
-            case CHAR_s: *optset |= PCRE_DOTALL; break;
-            case CHAR_x: *optset |= PCRE_EXTENDED; break;
-            case CHAR_U: *optset |= PCRE_UNGREEDY; break;
-            case CHAR_X: *optset |= PCRE_EXTRA; break;
-
-            default:  *errorcodeptr = ERR12;
-                      ptr--;    /* Correct the offset */
-                      goto FAILED;
-            }
-          }
-
-        /* Set up the changed option bits, but don't change anything yet. */
-
-        newoptions = (options | set) & (~unset);
-
-        /* If the options ended with ')' this is not the start of a nested
-        group with option changes, so the options change at this level.
-        If we are not at the pattern start, reset the greedy defaults and the
-        case value for firstchar and reqchar. */
-
-        if (*ptr == CHAR_RIGHT_PARENTHESIS)
-          {
-          greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
-          greedy_non_default = greedy_default ^ 1;
-          req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
-
-          /* Change options at this level, and pass them back for use
-          in subsequent branches. */
-
-          *optionsptr = options = newoptions;
-          previous = NULL;       /* This item can't be repeated */
-          continue;              /* It is complete */
-          }
-
-        /* If the options ended with ':' we are heading into a nested group
-        with possible change of options. Such groups are non-capturing and are
-        not assertions of any kind. All we need to do is skip over the ':';
-        the newoptions value is handled below. */
-
-        bravalue = OP_BRA;
-        ptr++;
-        }     /* End of switch for character following (? */
-      }       /* End of (? handling */
-
-    /* Opening parenthesis not followed by '*' or '?'. If PCRE_NO_AUTO_CAPTURE
-    is set, all unadorned brackets become non-capturing and behave like (?:...)
-    brackets. */
-
-    else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)
-      {
-      bravalue = OP_BRA;
-      }
-
-    /* Else we have a capturing group. */
-
-    else
-      {
-      NUMBERED_GROUP:
-      cd->bracount += 1;
-      PUT2(code, 1+LINK_SIZE, cd->bracount);
-      skipbytes = IMM2_SIZE;
-      }
-
-    /* Process nested bracketed regex. First check for parentheses nested too
-    deeply. */
-
-    if ((cd->parens_depth += 1) > PARENS_NEST_LIMIT)
-      {
-      *errorcodeptr = ERR82;
-      goto FAILED;
-      }
-
-    /* All assertions used not to be repeatable, but this was changed for Perl
-    compatibility. All kinds can now be repeated except for assertions that are
-    conditions (Perl also forbids these to be repeated). We copy code into a
-    non-register variable (tempcode) in order to be able to pass its address
-    because some compilers complain otherwise. At the start of a conditional
-    group whose condition is an assertion, cd->iscondassert is set. We unset it
-    here so as to allow assertions later in the group to be quantified. */
-
-    if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT &&
-        cd->iscondassert)
-      {
-      previous = NULL;
-      cd->iscondassert = FALSE;
-      }
-    else
-      {
-      previous = code;
-      item_hwm_offset = cd->hwm - cd->start_workspace;
-      }
-
-    *code = bravalue;
-    tempcode = code;
-    tempreqvary = cd->req_varyopt;        /* Save value before bracket */
-    tempbracount = cd->bracount;          /* Save value before bracket */
-    length_prevgroup = 0;                 /* Initialize for pre-compile phase */
-
-    if (!compile_regex(
-         newoptions,                      /* The complete new option state */
-         &tempcode,                       /* Where to put code (updated) */
-         &ptr,                            /* Input pointer (updated) */
-         errorcodeptr,                    /* Where to put an error message */
-         (bravalue == OP_ASSERTBACK ||
-          bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */
-         reset_bracount,                  /* True if (?| group */
-         skipbytes,                       /* Skip over bracket number */
-         cond_depth +
-           ((bravalue == OP_COND)?1:0),   /* Depth of condition subpatterns */
-         &subfirstchar,                   /* For possible first char */
-         &subfirstcharflags,
-         &subreqchar,                     /* For possible last char */
-         &subreqcharflags,
-         bcptr,                           /* Current branch chain */
-         cd,                              /* Tables block */
-         (lengthptr == NULL)? NULL :      /* Actual compile phase */
-           &length_prevgroup              /* Pre-compile phase */
-         ))
-      goto FAILED;
-
-    cd->parens_depth -= 1;
-
-    /* If this was an atomic group and there are no capturing groups within it,
-    generate OP_ONCE_NC instead of OP_ONCE. */
-
-    if (bravalue == OP_ONCE && cd->bracount <= tempbracount)
-      *code = OP_ONCE_NC;
-
-    if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT)
-      cd->assert_depth -= 1;
-
-    /* At the end of compiling, code is still pointing to the start of the
-    group, while tempcode has been updated to point past the end of the group.
-    The pattern pointer (ptr) is on the bracket.
-
-    If this is a conditional bracket, check that there are no more than
-    two branches in the group, or just one if it's a DEFINE group. We do this
-    in the real compile phase, not in the pre-pass, where the whole group may
-    not be available. */
-
-    if (bravalue == OP_COND && lengthptr == NULL)
-      {
-      pcre_uchar *tc = code;
-      int condcount = 0;
-
-      do {
-         condcount++;
-         tc += GET(tc,1);
-         }
-      while (*tc != OP_KET);
-
-      /* A DEFINE group is never obeyed inline (the "condition" is always
-      false). It must have only one branch. */
-
-      if (code[LINK_SIZE+1] == OP_DEF)
-        {
-        if (condcount > 1)
-          {
-          *errorcodeptr = ERR54;
-          goto FAILED;
-          }
-        bravalue = OP_DEF;   /* Just a flag to suppress char handling below */
-        }
-
-      /* A "normal" conditional group. If there is just one branch, we must not
-      make use of its firstchar or reqchar, because this is equivalent to an
-      empty second branch. */
-
-      else
-        {
-        if (condcount > 2)
-          {
-          *errorcodeptr = ERR27;
-          goto FAILED;
-          }
-        if (condcount == 1) subfirstcharflags = subreqcharflags = REQ_NONE;
-        }
-      }
-
-    /* Error if hit end of pattern */
-
-    if (*ptr != CHAR_RIGHT_PARENTHESIS)
-      {
-      *errorcodeptr = ERR14;
-      goto FAILED;
-      }
-
-    /* In the pre-compile phase, update the length by the length of the group,
-    less the brackets at either end. Then reduce the compiled code to just a
-    set of non-capturing brackets so that it doesn't use much memory if it is
-    duplicated by a quantifier.*/
-
-    if (lengthptr != NULL)
-      {
-      if (OFLOW_MAX - *lengthptr < length_prevgroup - 2 - 2*LINK_SIZE)
-        {
-        *errorcodeptr = ERR20;
-        goto FAILED;
-        }
-      *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
-      code++;   /* This already contains bravalue */
-      PUTINC(code, 0, 1 + LINK_SIZE);
-      *code++ = OP_KET;
-      PUTINC(code, 0, 1 + LINK_SIZE);
-      break;    /* No need to waste time with special character handling */
-      }
-
-    /* Otherwise update the main code pointer to the end of the group. */
-
-    code = tempcode;
-
-    /* For a DEFINE group, required and first character settings are not
-    relevant. */
-
-    if (bravalue == OP_DEF) break;
-
-    /* Handle updating of the required and first characters for other types of
-    group. Update for normal brackets of all kinds, and conditions with two
-    branches (see code above). If the bracket is followed by a quantifier with
-    zero repeat, we have to back off. Hence the definition of zeroreqchar and
-    zerofirstchar outside the main loop so that they can be accessed for the
-    back off. */
-
-    zeroreqchar = reqchar;
-    zeroreqcharflags = reqcharflags;
-    zerofirstchar = firstchar;
-    zerofirstcharflags = firstcharflags;
-    groupsetfirstchar = FALSE;
-
-    if (bravalue >= OP_ONCE)
-      {
-      /* If we have not yet set a firstchar in this branch, take it from the
-      subpattern, remembering that it was set here so that a repeat of more
-      than one can replicate it as reqchar if necessary. If the subpattern has
-      no firstchar, set "none" for the whole branch. In both cases, a zero
-      repeat forces firstchar to "none". */
-
-      if (firstcharflags == REQ_UNSET)
-        {
-        if (subfirstcharflags >= 0)
-          {
-          firstchar = subfirstchar;
-          firstcharflags = subfirstcharflags;
-          groupsetfirstchar = TRUE;
-          }
-        else firstcharflags = REQ_NONE;
-        zerofirstcharflags = REQ_NONE;
-        }
-
-      /* If firstchar was previously set, convert the subpattern's firstchar
-      into reqchar if there wasn't one, using the vary flag that was in
-      existence beforehand. */
-
-      else if (subfirstcharflags >= 0 && subreqcharflags < 0)
-        {
-        subreqchar = subfirstchar;
-        subreqcharflags = subfirstcharflags | tempreqvary;
-        }
-
-      /* If the subpattern set a required byte (or set a first byte that isn't
-      really the first byte - see above), set it. */
-
-      if (subreqcharflags >= 0)
-        {
-        reqchar = subreqchar;
-        reqcharflags = subreqcharflags;
-        }
-      }
-
-    /* For a forward assertion, we take the reqchar, if set, provided that the
-    group has also set a first char. This can be helpful if the pattern that
-    follows the assertion doesn't set a different char. For example, it's
-    useful for /(?=abcde).+/. We can't set firstchar for an assertion, however
-    because it leads to incorrect effect for patterns such as /(?=a)a.+/ when
-    the "real" "a" would then become a reqchar instead of a firstchar. This is
-    overcome by a scan at the end if there's no firstchar, looking for an
-    asserted first char. */
-
-    else if (bravalue == OP_ASSERT && subreqcharflags >= 0 &&
-             subfirstcharflags >= 0)
-      {
-      reqchar = subreqchar;
-      reqcharflags = subreqcharflags;
-      }
-    break;     /* End of processing '(' */
-
-
-    /* ===================================================================*/
-    /* Handle metasequences introduced by \. For ones like \d, the ESC_ values
-    are arranged to be the negation of the corresponding OP_values in the
-    default case when PCRE_UCP is not set. For the back references, the values
-    are negative the reference number. Only back references and those types
-    that consume a character may be repeated. We can test for values between
-    ESC_b and ESC_Z for the latter; this may have to change if any new ones are
-    ever created. */
-
-    case CHAR_BACKSLASH:
-    tempptr = ptr;
-    escape = check_escape(&ptr, &ec, errorcodeptr, cd->bracount, options, FALSE);
-    if (*errorcodeptr != 0) goto FAILED;
-
-    if (escape == 0)                  /* The escape coded a single character */
-      c = ec;
-    else
-      {
-      /* For metasequences that actually match a character, we disable the
-      setting of a first character if it hasn't already been set. */
-
-      if (firstcharflags == REQ_UNSET && escape > ESC_b && escape < ESC_Z)
-        firstcharflags = REQ_NONE;
-
-      /* Set values to reset to if this is followed by a zero repeat. */
-
-      zerofirstchar = firstchar;
-      zerofirstcharflags = firstcharflags;
-      zeroreqchar = reqchar;
-      zeroreqcharflags = reqcharflags;
-
-      /* \g<name> or \g'name' is a subroutine call by name and \g<n> or \g'n'
-      is a subroutine call by number (Oniguruma syntax). In fact, the value
-      ESC_g is returned only for these cases. So we don't need to check for <
-      or ' if the value is ESC_g. For the Perl syntax \g{n} the value is
-      -n, and for the Perl syntax \g{name} the result is ESC_k (as
-      that is a synonym for a named back reference). */
-
-      if (escape == ESC_g)
-        {
-        const pcre_uchar *p;
-        pcre_uint32 cf;
-
-        item_hwm_offset = cd->hwm - cd->start_workspace;   /* Normally this is set when '(' is read */
-        terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
-          CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
-
-        /* These two statements stop the compiler for warning about possibly
-        unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In
-        fact, because we do the check for a number below, the paths that
-        would actually be in error are never taken. */
-
-        skipbytes = 0;
-        reset_bracount = FALSE;
-
-        /* If it's not a signed or unsigned number, treat it as a name. */
-
-        cf = ptr[1];
-        if (cf != CHAR_PLUS && cf != CHAR_MINUS && !IS_DIGIT(cf))
-          {
-          is_recurse = TRUE;
-          goto NAMED_REF_OR_RECURSE;
-          }
-
-        /* Signed or unsigned number (cf = ptr[1]) is known to be plus or minus
-        or a digit. */
-
-        p = ptr + 2;
-        while (IS_DIGIT(*p)) p++;
-        if (*p != (pcre_uchar)terminator)
-          {
-          *errorcodeptr = ERR57;
-          goto FAILED;
-          }
-        ptr++;
-        goto HANDLE_NUMERICAL_RECURSION;
-        }
-
-      /* \k<name> or \k'name' is a back reference by name (Perl syntax).
-      We also support \k{name} (.NET syntax).  */
-
-      if (escape == ESC_k)
-        {
-        if ((ptr[1] != CHAR_LESS_THAN_SIGN &&
-          ptr[1] != CHAR_APOSTROPHE && ptr[1] != CHAR_LEFT_CURLY_BRACKET))
-          {
-          *errorcodeptr = ERR69;
-          goto FAILED;
-          }
-        is_recurse = FALSE;
-        terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
-          CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
-          CHAR_APOSTROPHE : CHAR_RIGHT_CURLY_BRACKET;
-        goto NAMED_REF_OR_RECURSE;
-        }
-
-      /* Back references are handled specially; must disable firstchar if
-      not set to cope with cases like (?=(\w+))\1: which would otherwise set
-      ':' later. */
-
-      if (escape < 0)
-        {
-        open_capitem *oc;
-        recno = -escape;
-
-        /* Come here from named backref handling when the reference is to a
-        single group (i.e. not to a duplicated name. */
-
-        HANDLE_REFERENCE:
-        if (firstcharflags == REQ_UNSET) zerofirstcharflags = firstcharflags = REQ_NONE;
-        previous = code;
-        item_hwm_offset = cd->hwm - cd->start_workspace;
-        *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
-        PUT2INC(code, 0, recno);
-        cd->backref_map |= (recno < 32)? (1U << recno) : 1;
-        if (recno > cd->top_backref) cd->top_backref = recno;
-
-        /* Check to see if this back reference is recursive, that it, it
-        is inside the group that it references. A flag is set so that the
-        group can be made atomic. */
-
-        for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-          {
-          if (oc->number == recno)
-            {
-            oc->flag = TRUE;
-            break;
-            }
-          }
-        }
-
-      /* So are Unicode property matches, if supported. */
-
-#ifdef SUPPORT_UCP
-      else if (escape == ESC_P || escape == ESC_p)
-        {
-        BOOL negated;
-        unsigned int ptype = 0, pdata = 0;
-        if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr))
-          goto FAILED;
-        previous = code;
-        item_hwm_offset = cd->hwm - cd->start_workspace;
-        *code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP;
-        *code++ = ptype;
-        *code++ = pdata;
-        }
-#else
-
-      /* If Unicode properties are not supported, \X, \P, and \p are not
-      allowed. */
-
-      else if (escape == ESC_X || escape == ESC_P || escape == ESC_p)
-        {
-        *errorcodeptr = ERR45;
-        goto FAILED;
-        }
-#endif
-
-      /* For the rest (including \X when Unicode properties are supported), we
-      can obtain the OP value by negating the escape value in the default
-      situation when PCRE_UCP is not set. When it *is* set, we substitute
-      Unicode property tests. Note that \b and \B do a one-character
-      lookbehind, and \A also behaves as if it does. */
-
-      else
-        {
-        if ((escape == ESC_b || escape == ESC_B || escape == ESC_A) &&
-             cd->max_lookbehind == 0)
-          cd->max_lookbehind = 1;
-#ifdef SUPPORT_UCP
-        if (escape >= ESC_DU && escape <= ESC_wu)
-          {
-          nestptr = ptr + 1;                   /* Where to resume */
-          ptr = substitutes[escape - ESC_DU] - 1;  /* Just before substitute */
-          }
-        else
-#endif
-        /* In non-UTF-8 mode, we turn \C into OP_ALLANY instead of OP_ANYBYTE
-        so that it works in DFA mode and in lookbehinds. */
-
-          {
-          previous = (escape > ESC_b && escape < ESC_Z)? code : NULL;
-          item_hwm_offset = cd->hwm - cd->start_workspace;
-          *code++ = (!utf && escape == ESC_C)? OP_ALLANY : escape;
-          }
-        }
-      continue;
-      }
-
-    /* We have a data character whose value is in c. In UTF-8 mode it may have
-    a value > 127. We set its representation in the length/buffer, and then
-    handle it as a data character. */
-
-#if defined SUPPORT_UTF && !defined COMPILE_PCRE32
-    if (utf && c > MAX_VALUE_FOR_SINGLE_CHAR)
-      mclength = PRIV(ord2utf)(c, mcbuffer);
-    else
-#endif
-
-     {
-     mcbuffer[0] = c;
-     mclength = 1;
-     }
-    goto ONE_CHAR;
-
-
-    /* ===================================================================*/
-    /* Handle a literal character. It is guaranteed not to be whitespace or #
-    when the extended flag is set. If we are in a UTF mode, it may be a
-    multi-unit literal character. */
-
-    default:
-    NORMAL_CHAR:
-    mclength = 1;
-    mcbuffer[0] = c;
-
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(c))
-      ACROSSCHAR(TRUE, ptr[1], mcbuffer[mclength++] = *(++ptr));
-#endif
-
-    /* At this point we have the character's bytes in mcbuffer, and the length
-    in mclength. When not in UTF-8 mode, the length is always 1. */
-
-    ONE_CHAR:
-    previous = code;
-    item_hwm_offset = cd->hwm - cd->start_workspace;
-
-    /* For caseless UTF-8 mode when UCP support is available, check whether
-    this character has more than one other case. If so, generate a special
-    OP_PROP item instead of OP_CHARI. */
-
-#ifdef SUPPORT_UCP
-    if (utf && (options & PCRE_CASELESS) != 0)
-      {
-      GETCHAR(c, mcbuffer);
-      if ((c = UCD_CASESET(c)) != 0)
-        {
-        *code++ = OP_PROP;
-        *code++ = PT_CLIST;
-        *code++ = c;
-        if (firstcharflags == REQ_UNSET)
-          firstcharflags = zerofirstcharflags = REQ_NONE;
-        break;
-        }
-      }
-#endif
-
-    /* Caseful matches, or not one of the multicase characters. */
-
-    *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARI : OP_CHAR;
-    for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
-
-    /* Remember if \r or \n were seen */
-
-    if (mcbuffer[0] == CHAR_CR || mcbuffer[0] == CHAR_NL)
-      cd->external_flags |= PCRE_HASCRORLF;
-
-    /* Set the first and required bytes appropriately. If no previous first
-    byte, set it from this character, but revert to none on a zero repeat.
-    Otherwise, leave the firstchar value alone, and don't change it on a zero
-    repeat. */
-
-    if (firstcharflags == REQ_UNSET)
-      {
-      zerofirstcharflags = REQ_NONE;
-      zeroreqchar = reqchar;
-      zeroreqcharflags = reqcharflags;
-
-      /* If the character is more than one byte long, we can set firstchar
-      only if it is not to be matched caselessly. */
-
-      if (mclength == 1 || req_caseopt == 0)
-        {
-        firstchar = mcbuffer[0];
-        firstcharflags = req_caseopt;
-
-        if (mclength != 1)
-          {
-          reqchar = code[-1];
-          reqcharflags = cd->req_varyopt;
-          }
-        }
-      else firstcharflags = reqcharflags = REQ_NONE;
-      }
-
-    /* firstchar was previously set; we can set reqchar only if the length is
-    1 or the matching is caseful. */
-
-    else
-      {
-      zerofirstchar = firstchar;
-      zerofirstcharflags = firstcharflags;
-      zeroreqchar = reqchar;
-      zeroreqcharflags = reqcharflags;
-      if (mclength == 1 || req_caseopt == 0)
-        {
-        reqchar = code[-1];
-        reqcharflags = req_caseopt | cd->req_varyopt;
-        }
-      }
-
-    break;            /* End of literal character handling */
-    }
-  }                   /* end of big loop */
-
-
-/* Control never reaches here by falling through, only by a goto for all the
-error states. Pass back the position in the pattern so that it can be displayed
-to the user for diagnosing the error. */
-
-FAILED:
-*ptrptr = ptr;
-return FALSE;
-}
-
-
-
-/*************************************************
-*     Compile sequence of alternatives           *
-*************************************************/
-
-/* On entry, ptr is pointing past the bracket character, but on return it
-points to the closing bracket, or vertical bar, or end of string. The code
-variable is pointing at the byte into which the BRA operator has been stored.
-This function is used during the pre-compile phase when we are trying to find
-out the amount of memory needed, as well as during the real compile phase. The
-value of lengthptr distinguishes the two phases.
-
-Arguments:
-  options           option bits, including any changes for this subpattern
-  codeptr           -> the address of the current code pointer
-  ptrptr            -> the address of the current pattern pointer
-  errorcodeptr      -> pointer to error code variable
-  lookbehind        TRUE if this is a lookbehind assertion
-  reset_bracount    TRUE to reset the count for each branch
-  skipbytes         skip this many bytes at start (for brackets and OP_COND)
-  cond_depth        depth of nesting for conditional subpatterns
-  firstcharptr      place to put the first required character
-  firstcharflagsptr place to put the first character flags, or a negative number
-  reqcharptr        place to put the last required character
-  reqcharflagsptr   place to put the last required character flags, or a negative number
-  bcptr             pointer to the chain of currently open branches
-  cd                points to the data block with tables pointers etc.
-  lengthptr         NULL during the real compile phase
-                    points to length accumulator during pre-compile phase
-
-Returns:            TRUE on success
-*/
-
-static BOOL
-compile_regex(int options, pcre_uchar **codeptr, const pcre_uchar **ptrptr,
-  int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
-  int cond_depth,
-  pcre_uint32 *firstcharptr, pcre_int32 *firstcharflagsptr,
-  pcre_uint32 *reqcharptr, pcre_int32 *reqcharflagsptr,
-  branch_chain *bcptr, compile_data *cd, int *lengthptr)
-{
-const pcre_uchar *ptr = *ptrptr;
-pcre_uchar *code = *codeptr;
-pcre_uchar *last_branch = code;
-pcre_uchar *start_bracket = code;
-pcre_uchar *reverse_count = NULL;
-open_capitem capitem;
-int capnumber = 0;
-pcre_uint32 firstchar, reqchar;
-pcre_int32 firstcharflags, reqcharflags;
-pcre_uint32 branchfirstchar, branchreqchar;
-pcre_int32 branchfirstcharflags, branchreqcharflags;
-int length;
-unsigned int orig_bracount;
-unsigned int max_bracount;
-branch_chain bc;
-size_t save_hwm_offset;
-
-/* If set, call the external function that checks for stack availability. */
-
-if (PUBL(stack_guard) != NULL && PUBL(stack_guard)())
-  {
-  *errorcodeptr= ERR85;
-  return FALSE;
-  }
-
-/* Miscellaneous initialization */
-
-bc.outer = bcptr;
-bc.current_branch = code;
-
-firstchar = reqchar = 0;
-firstcharflags = reqcharflags = REQ_UNSET;
-
-save_hwm_offset = cd->hwm - cd->start_workspace;
-
-/* Accumulate the length for use in the pre-compile phase. Start with the
-length of the BRA and KET and any extra bytes that are required at the
-beginning. We accumulate in a local variable to save frequent testing of
-lenthptr for NULL. We cannot do this by looking at the value of code at the
-start and end of each alternative, because compiled items are discarded during
-the pre-compile phase so that the work space is not exceeded. */
-
-length = 2 + 2*LINK_SIZE + skipbytes;
-
-/* WARNING: If the above line is changed for any reason, you must also change
-the code that abstracts option settings at the start of the pattern and makes
-them global. It tests the value of length for (2 + 2*LINK_SIZE) in the
-pre-compile phase to find out whether anything has yet been compiled or not. */
-
-/* If this is a capturing subpattern, add to the chain of open capturing items
-so that we can detect them if (*ACCEPT) is encountered. This is also used to
-detect groups that contain recursive back references to themselves. Note that
-only OP_CBRA need be tested here; changing this opcode to one of its variants,
-e.g. OP_SCBRAPOS, happens later, after the group has been compiled. */
-
-if (*code == OP_CBRA)
-  {
-  capnumber = GET2(code, 1 + LINK_SIZE);
-  capitem.number = capnumber;
-  capitem.next = cd->open_caps;
-  capitem.flag = FALSE;
-  cd->open_caps = &capitem;
-  }
-
-/* Offset is set zero to mark that this bracket is still open */
-
-PUT(code, 1, 0);
-code += 1 + LINK_SIZE + skipbytes;
-
-/* Loop for each alternative branch */
-
-orig_bracount = max_bracount = cd->bracount;
-for (;;)
-  {
-  /* For a (?| group, reset the capturing bracket count so that each branch
-  uses the same numbers. */
-
-  if (reset_bracount) cd->bracount = orig_bracount;
-
-  /* Set up dummy OP_REVERSE if lookbehind assertion */
-
-  if (lookbehind)
-    {
-    *code++ = OP_REVERSE;
-    reverse_count = code;
-    PUTINC(code, 0, 0);
-    length += 1 + LINK_SIZE;
-    }
-
-  /* Now compile the branch; in the pre-compile phase its length gets added
-  into the length. */
-
-  if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstchar,
-        &branchfirstcharflags, &branchreqchar, &branchreqcharflags, &bc,
-        cond_depth, cd, (lengthptr == NULL)? NULL : &length))
-    {
-    *ptrptr = ptr;
-    return FALSE;
-    }
-
-  /* Keep the highest bracket count in case (?| was used and some branch
-  has fewer than the rest. */
-
-  if (cd->bracount > max_bracount) max_bracount = cd->bracount;
-
-  /* In the real compile phase, there is some post-processing to be done. */
-
-  if (lengthptr == NULL)
-    {
-    /* If this is the first branch, the firstchar and reqchar values for the
-    branch become the values for the regex. */
-
-    if (*last_branch != OP_ALT)
-      {
-      firstchar = branchfirstchar;
-      firstcharflags = branchfirstcharflags;
-      reqchar = branchreqchar;
-      reqcharflags = branchreqcharflags;
-      }
-
-    /* If this is not the first branch, the first char and reqchar have to
-    match the values from all the previous branches, except that if the
-    previous value for reqchar didn't have REQ_VARY set, it can still match,
-    and we set REQ_VARY for the regex. */
-
-    else
-      {
-      /* If we previously had a firstchar, but it doesn't match the new branch,
-      we have to abandon the firstchar for the regex, but if there was
-      previously no reqchar, it takes on the value of the old firstchar. */
-
-      if (firstcharflags >= 0 &&
-          (firstcharflags != branchfirstcharflags || firstchar != branchfirstchar))
-        {
-        if (reqcharflags < 0)
-          {
-          reqchar = firstchar;
-          reqcharflags = firstcharflags;
-          }
-        firstcharflags = REQ_NONE;
-        }
-
-      /* If we (now or from before) have no firstchar, a firstchar from the
-      branch becomes a reqchar if there isn't a branch reqchar. */
-
-      if (firstcharflags < 0 && branchfirstcharflags >= 0 && branchreqcharflags < 0)
-        {
-        branchreqchar = branchfirstchar;
-        branchreqcharflags = branchfirstcharflags;
-        }
-
-      /* Now ensure that the reqchars match */
-
-      if (((reqcharflags & ~REQ_VARY) != (branchreqcharflags & ~REQ_VARY)) ||
-          reqchar != branchreqchar)
-        reqcharflags = REQ_NONE;
-      else
-        {
-        reqchar = branchreqchar;
-        reqcharflags |= branchreqcharflags; /* To "or" REQ_VARY */
-        }
-      }
-
-    /* If lookbehind, check that this branch matches a fixed-length string, and
-    put the length into the OP_REVERSE item. Temporarily mark the end of the
-    branch with OP_END. If the branch contains OP_RECURSE, the result is -3
-    because there may be forward references that we can't check here. Set a
-    flag to cause another lookbehind check at the end. Why not do it all at the
-    end? Because common, erroneous checks are picked up here and the offset of
-    the problem can be shown. */
-
-    if (lookbehind)
-      {
-      int fixed_length;
-      *code = OP_END;
-      fixed_length = find_fixedlength(last_branch,  (options & PCRE_UTF8) != 0,
-        FALSE, cd, NULL);
-      DPRINTF(("fixed length = %d\n", fixed_length));
-      if (fixed_length == -3)
-        {
-        cd->check_lookbehind = TRUE;
-        }
-      else if (fixed_length < 0)
-        {
-        *errorcodeptr = (fixed_length == -2)? ERR36 :
-                        (fixed_length == -4)? ERR70: ERR25;
-        *ptrptr = ptr;
-        return FALSE;
-        }
-      else
-        {
-        if (fixed_length > cd->max_lookbehind)
-          cd->max_lookbehind = fixed_length;
-        PUT(reverse_count, 0, fixed_length);
-        }
-      }
-    }
-
-  /* Reached end of expression, either ')' or end of pattern. In the real
-  compile phase, go back through the alternative branches and reverse the chain
-  of offsets, with the field in the BRA item now becoming an offset to the
-  first alternative. If there are no alternatives, it points to the end of the
-  group. The length in the terminating ket is always the length of the whole
-  bracketed item. Return leaving the pointer at the terminating char. */
-
-  if (*ptr != CHAR_VERTICAL_LINE)
-    {
-    if (lengthptr == NULL)
-      {
-      int branch_length = (int)(code - last_branch);
-      do
-        {
-        int prev_length = GET(last_branch, 1);
-        PUT(last_branch, 1, branch_length);
-        branch_length = prev_length;
-        last_branch -= branch_length;
-        }
-      while (branch_length > 0);
-      }
-
-    /* Fill in the ket */
-
-    *code = OP_KET;
-    PUT(code, 1, (int)(code - start_bracket));
-    code += 1 + LINK_SIZE;
-
-    /* If it was a capturing subpattern, check to see if it contained any
-    recursive back references. If so, we must wrap it in atomic brackets.
-    Because we are moving code along, we must ensure that any pending recursive
-    references are updated. In any event, remove the block from the chain. */
-
-    if (capnumber > 0)
-      {
-      if (cd->open_caps->flag)
-        {
-        *code = OP_END;
-        adjust_recurse(start_bracket, 1 + LINK_SIZE,
-          (options & PCRE_UTF8) != 0, cd, save_hwm_offset);
-        memmove(start_bracket + 1 + LINK_SIZE, start_bracket,
-          IN_UCHARS(code - start_bracket));
-        *start_bracket = OP_ONCE;
-        code += 1 + LINK_SIZE;
-        PUT(start_bracket, 1, (int)(code - start_bracket));
-        *code = OP_KET;
-        PUT(code, 1, (int)(code - start_bracket));
-        code += 1 + LINK_SIZE;
-        length += 2 + 2*LINK_SIZE;
-        }
-      cd->open_caps = cd->open_caps->next;
-      }
-
-    /* Retain the highest bracket number, in case resetting was used. */
-
-    cd->bracount = max_bracount;
-
-    /* Set values to pass back */
-
-    *codeptr = code;
-    *ptrptr = ptr;
-    *firstcharptr = firstchar;
-    *firstcharflagsptr = firstcharflags;
-    *reqcharptr = reqchar;
-    *reqcharflagsptr = reqcharflags;
-    if (lengthptr != NULL)
-      {
-      if (OFLOW_MAX - *lengthptr < length)
-        {
-        *errorcodeptr = ERR20;
-        return FALSE;
-        }
-      *lengthptr += length;
-      }
-    return TRUE;
-    }
-
-  /* Another branch follows. In the pre-compile phase, we can move the code
-  pointer back to where it was for the start of the first branch. (That is,
-  pretend that each branch is the only one.)
-
-  In the real compile phase, insert an ALT node. Its length field points back
-  to the previous branch while the bracket remains open. At the end the chain
-  is reversed. It's done like this so that the start of the bracket has a
-  zero offset until it is closed, making it possible to detect recursion. */
-
-  if (lengthptr != NULL)
-    {
-    code = *codeptr + 1 + LINK_SIZE + skipbytes;
-    length += 1 + LINK_SIZE;
-    }
-  else
-    {
-    *code = OP_ALT;
-    PUT(code, 1, (int)(code - last_branch));
-    bc.current_branch = last_branch = code;
-    code += 1 + LINK_SIZE;
-    }
-
-  ptr++;
-  }
-/* Control never reaches here */
-}
-
-
-
-
-/*************************************************
-*          Check for anchored expression         *
-*************************************************/
-
-/* Try to find out if this is an anchored regular expression. Consider each
-alternative branch. If they all start with OP_SOD or OP_CIRC, or with a bracket
-all of whose alternatives start with OP_SOD or OP_CIRC (recurse ad lib), then
-it's anchored. However, if this is a multiline pattern, then only OP_SOD will
-be found, because ^ generates OP_CIRCM in that mode.
-
-We can also consider a regex to be anchored if OP_SOM starts all its branches.
-This is the code for \G, which means "match at start of match position, taking
-into account the match offset".
-
-A branch is also implicitly anchored if it starts with .* and DOTALL is set,
-because that will try the rest of the pattern at all possible matching points,
-so there is no point trying again.... er ....
-
-.... except when the .* appears inside capturing parentheses, and there is a
-subsequent back reference to those parentheses. We haven't enough information
-to catch that case precisely.
-
-At first, the best we could do was to detect when .* was in capturing brackets
-and the highest back reference was greater than or equal to that level.
-However, by keeping a bitmap of the first 31 back references, we can catch some
-of the more common cases more precisely.
-
-... A second exception is when the .* appears inside an atomic group, because
-this prevents the number of characters it matches from being adjusted.
-
-Arguments:
-  code           points to start of expression (the bracket)
-  bracket_map    a bitmap of which brackets we are inside while testing; this
-                  handles up to substring 31; after that we just have to take
-                  the less precise approach
-  cd             points to the compile data block
-  atomcount      atomic group level
-
-Returns:     TRUE or FALSE
-*/
-
-static BOOL
-is_anchored(register const pcre_uchar *code, unsigned int bracket_map,
-  compile_data *cd, int atomcount)
-{
-do {
-   const pcre_uchar *scode = first_significant_code(
-     code + PRIV(OP_lengths)[*code], FALSE);
-   register int op = *scode;
-
-   /* Non-capturing brackets */
-
-   if (op == OP_BRA  || op == OP_BRAPOS ||
-       op == OP_SBRA || op == OP_SBRAPOS)
-     {
-     if (!is_anchored(scode, bracket_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Capturing brackets */
-
-   else if (op == OP_CBRA  || op == OP_CBRAPOS ||
-            op == OP_SCBRA || op == OP_SCBRAPOS)
-     {
-     int n = GET2(scode, 1+LINK_SIZE);
-     int new_map = bracket_map | ((n < 32)? (1U << n) : 1);
-     if (!is_anchored(scode, new_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Positive forward assertion */
-
-   else if (op == OP_ASSERT)
-     {
-     if (!is_anchored(scode, bracket_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Condition; not anchored if no second branch */
-
-   else if (op == OP_COND)
-     {
-     if (scode[GET(scode,1)] != OP_ALT) return FALSE;
-     if (!is_anchored(scode, bracket_map, cd, atomcount)) return FALSE;
-     }
-
-   /* Atomic groups */
-
-   else if (op == OP_ONCE || op == OP_ONCE_NC)
-     {
-     if (!is_anchored(scode, bracket_map, cd, atomcount + 1))
-       return FALSE;
-     }
-
-   /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and
-   it isn't in brackets that are or may be referenced or inside an atomic
-   group. */
-
-   else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||
-             op == OP_TYPEPOSSTAR))
-     {
-     if (scode[1] != OP_ALLANY || (bracket_map & cd->backref_map) != 0 ||
-         atomcount > 0 || cd->had_pruneorskip)
-       return FALSE;
-     }
-
-   /* Check for explicit anchoring */
-
-   else if (op != OP_SOD && op != OP_SOM && op != OP_CIRC) return FALSE;
-
-   code += GET(code, 1);
-   }
-while (*code == OP_ALT);   /* Loop for each alternative */
-return TRUE;
-}
-
-
-
-/*************************************************
-*         Check for starting with ^ or .*        *
-*************************************************/
-
-/* This is called to find out if every branch starts with ^ or .* so that
-"first char" processing can be done to speed things up in multiline
-matching and for non-DOTALL patterns that start with .* (which must start at
-the beginning or after \n). As in the case of is_anchored() (see above), we
-have to take account of back references to capturing brackets that contain .*
-because in that case we can't make the assumption. Also, the appearance of .*
-inside atomic brackets or in an assertion, or in a pattern that contains *PRUNE
-or *SKIP does not count, because once again the assumption no longer holds.
-
-Arguments:
-  code           points to start of expression (the bracket)
-  bracket_map    a bitmap of which brackets we are inside while testing; this
-                  handles up to substring 31; after that we just have to take
-                  the less precise approach
-  cd             points to the compile data
-  atomcount      atomic group level
-  inassert       TRUE if in an assertion
-
-Returns:         TRUE or FALSE
-*/
-
-static BOOL
-is_startline(const pcre_uchar *code, unsigned int bracket_map,
-  compile_data *cd, int atomcount, BOOL inassert)
-{
-do {
-   const pcre_uchar *scode = first_significant_code(
-     code + PRIV(OP_lengths)[*code], FALSE);
-   register int op = *scode;
-
-   /* If we are at the start of a conditional assertion group, *both* the
-   conditional assertion *and* what follows the condition must satisfy the test
-   for start of line. Other kinds of condition fail. Note that there may be an
-   auto-callout at the start of a condition. */
-
-   if (op == OP_COND)
-     {
-     scode += 1 + LINK_SIZE;
-     if (*scode == OP_CALLOUT) scode += PRIV(OP_lengths)[OP_CALLOUT];
-     switch (*scode)
-       {
-       case OP_CREF:
-       case OP_DNCREF:
-       case OP_RREF:
-       case OP_DNRREF:
-       case OP_DEF:
-       case OP_FAIL:
-       return FALSE;
-
-       default:     /* Assertion */
-       if (!is_startline(scode, bracket_map, cd, atomcount, TRUE)) return FALSE;
-       do scode += GET(scode, 1); while (*scode == OP_ALT);
-       scode += 1 + LINK_SIZE;
-       break;
-       }
-     scode = first_significant_code(scode, FALSE);
-     op = *scode;
-     }
-
-   /* Non-capturing brackets */
-
-   if (op == OP_BRA  || op == OP_BRAPOS ||
-       op == OP_SBRA || op == OP_SBRAPOS)
-     {
-     if (!is_startline(scode, bracket_map, cd, atomcount, inassert)) return FALSE;
-     }
-
-   /* Capturing brackets */
-
-   else if (op == OP_CBRA  || op == OP_CBRAPOS ||
-            op == OP_SCBRA || op == OP_SCBRAPOS)
-     {
-     int n = GET2(scode, 1+LINK_SIZE);
-     int new_map = bracket_map | ((n < 32)? (1U << n) : 1);
-     if (!is_startline(scode, new_map, cd, atomcount, inassert)) return FALSE;
-     }
-
-   /* Positive forward assertions */
-
-   else if (op == OP_ASSERT)
-     {
-     if (!is_startline(scode, bracket_map, cd, atomcount, TRUE)) return FALSE;
-     }
-
-   /* Atomic brackets */
-
-   else if (op == OP_ONCE || op == OP_ONCE_NC)
-     {
-     if (!is_startline(scode, bracket_map, cd, atomcount + 1, inassert)) return FALSE;
-     }
-
-   /* .* means "start at start or after \n" if it isn't in atomic brackets or
-   brackets that may be referenced or an assertion, as long as the pattern does
-   not contain *PRUNE or *SKIP, because these break the feature. Consider, for
-   example, /.*?a(*PRUNE)b/ with the subject "aab", which matches "ab", i.e.
-   not at the start of a line. */
-
-   else if (op == OP_TYPESTAR || op == OP_TYPEMINSTAR || op == OP_TYPEPOSSTAR)
-     {
-     if (scode[1] != OP_ANY || (bracket_map & cd->backref_map) != 0 ||
-         atomcount > 0 || cd->had_pruneorskip || inassert)
-       return FALSE;
-     }
-
-   /* Check for explicit circumflex; anything else gives a FALSE result. Note
-   in particular that this includes atomic brackets OP_ONCE and OP_ONCE_NC
-   because the number of characters matched by .* cannot be adjusted inside
-   them. */
-
-   else if (op != OP_CIRC && op != OP_CIRCM) return FALSE;
-
-   /* Move on to the next alternative */
-
-   code += GET(code, 1);
-   }
-while (*code == OP_ALT);  /* Loop for each alternative */
-return TRUE;
-}
-
-
-
-/*************************************************
-*       Check for asserted fixed first char      *
-*************************************************/
-
-/* During compilation, the "first char" settings from forward assertions are
-discarded, because they can cause conflicts with actual literals that follow.
-However, if we end up without a first char setting for an unanchored pattern,
-it is worth scanning the regex to see if there is an initial asserted first
-char. If all branches start with the same asserted char, or with a
-non-conditional bracket all of whose alternatives start with the same asserted
-char (recurse ad lib), then we return that char, with the flags set to zero or
-REQ_CASELESS; otherwise return zero with REQ_NONE in the flags.
-
-Arguments:
-  code       points to start of expression (the bracket)
-  flags      points to the first char flags, or to REQ_NONE
-  inassert   TRUE if in an assertion
-
-Returns:     the fixed first char, or 0 with REQ_NONE in flags
-*/
-
-static pcre_uint32
-find_firstassertedchar(const pcre_uchar *code, pcre_int32 *flags,
-  BOOL inassert)
-{
-register pcre_uint32 c = 0;
-int cflags = REQ_NONE;
-
-*flags = REQ_NONE;
-do {
-   pcre_uint32 d;
-   int dflags;
-   int xl = (*code == OP_CBRA || *code == OP_SCBRA ||
-             *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0;
-   const pcre_uchar *scode = first_significant_code(code + 1+LINK_SIZE + xl,
-     TRUE);
-   register pcre_uchar op = *scode;
-
-   switch(op)
-     {
-     default:
-     return 0;
-
-     case OP_BRA:
-     case OP_BRAPOS:
-     case OP_CBRA:
-     case OP_SCBRA:
-     case OP_CBRAPOS:
-     case OP_SCBRAPOS:
-     case OP_ASSERT:
-     case OP_ONCE:
-     case OP_ONCE_NC:
-     d = find_firstassertedchar(scode, &dflags, op == OP_ASSERT);
-     if (dflags < 0)
-       return 0;
-     if (cflags < 0) { c = d; cflags = dflags; } else if (c != d || cflags != dflags) return 0;
-     break;
-
-     case OP_EXACT:
-     scode += IMM2_SIZE;
-     /* Fall through */
-
-     case OP_CHAR:
-     case OP_PLUS:
-     case OP_MINPLUS:
-     case OP_POSPLUS:
-     if (!inassert) return 0;
-     if (cflags < 0) { c = scode[1]; cflags = 0; }
-       else if (c != scode[1]) return 0;
-     break;
-
-     case OP_EXACTI:
-     scode += IMM2_SIZE;
-     /* Fall through */
-
-     case OP_CHARI:
-     case OP_PLUSI:
-     case OP_MINPLUSI:
-     case OP_POSPLUSI:
-     if (!inassert) return 0;
-     if (cflags < 0) { c = scode[1]; cflags = REQ_CASELESS; }
-       else if (c != scode[1]) return 0;
-     break;
-     }
-
-   code += GET(code, 1);
-   }
-while (*code == OP_ALT);
-
-*flags = cflags;
-return c;
-}
-
-
-
-/*************************************************
-*     Add an entry to the name/number table      *
-*************************************************/
-
-/* This function is called between compiling passes to add an entry to the
-name/number table, maintaining alphabetical order. Checking for permitted
-and forbidden duplicates has already been done.
-
-Arguments:
-  cd           the compile data block
-  name         the name to add
-  length       the length of the name
-  groupno      the group number
-
-Returns:       nothing
-*/
-
-static void
-add_name(compile_data *cd, const pcre_uchar *name, int length,
-  unsigned int groupno)
-{
-int i;
-pcre_uchar *slot = cd->name_table;
-
-for (i = 0; i < cd->names_found; i++)
-  {
-  int crc = memcmp(name, slot+IMM2_SIZE, IN_UCHARS(length));
-  if (crc == 0 && slot[IMM2_SIZE+length] != 0)
-    crc = -1; /* Current name is a substring */
-
-  /* Make space in the table and break the loop for an earlier name. For a
-  duplicate or later name, carry on. We do this for duplicates so that in the
-  simple case (when ?(| is not used) they are in order of their numbers. In all
-  cases they are in the order in which they appear in the pattern. */
-
-  if (crc < 0)
-    {
-    memmove(slot + cd->name_entry_size, slot,
-      IN_UCHARS((cd->names_found - i) * cd->name_entry_size));
-    break;
-    }
-
-  /* Continue the loop for a later or duplicate name */
-
-  slot += cd->name_entry_size;
-  }
-
-PUT2(slot, 0, groupno);
-memcpy(slot + IMM2_SIZE, name, IN_UCHARS(length));
-slot[IMM2_SIZE + length] = 0;
-cd->names_found++;
-}
-
-
-
-/*************************************************
-*        Compile a Regular Expression            *
-*************************************************/
-
-/* This function takes a string and returns a pointer to a block of store
-holding a compiled version of the expression. The original API for this
-function had no error code return variable; it is retained for backwards
-compatibility. The new function is given a new name.
-
-Arguments:
-  pattern       the regular expression
-  options       various option bits
-  errorcodeptr  pointer to error code variable (pcre_compile2() only)
-                  can be NULL if you don't want a code value
-  errorptr      pointer to pointer to error text
-  erroroffset   ptr offset in pattern where error was detected
-  tables        pointer to character tables or NULL
-
-Returns:        pointer to compiled data block, or NULL on error,
-                with errorptr and erroroffset set
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
-pcre_compile(const char *pattern, int options, const char **errorptr,
-  int *erroroffset, const unsigned char *tables)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN pcre16 * PCRE_CALL_CONVENTION
-pcre16_compile(PCRE_SPTR16 pattern, int options, const char **errorptr,
-  int *erroroffset, const unsigned char *tables)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN pcre32 * PCRE_CALL_CONVENTION
-pcre32_compile(PCRE_SPTR32 pattern, int options, const char **errorptr,
-  int *erroroffset, const unsigned char *tables)
-#endif
-{
-#if defined COMPILE_PCRE8
-return pcre_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
-#elif defined COMPILE_PCRE16
-return pcre16_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
-#elif defined COMPILE_PCRE32
-return pcre32_compile2(pattern, options, NULL, errorptr, erroroffset, tables);
-#endif
-}
-
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
-pcre_compile2(const char *pattern, int options, int *errorcodeptr,
-  const char **errorptr, int *erroroffset, const unsigned char *tables)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN pcre16 * PCRE_CALL_CONVENTION
-pcre16_compile2(PCRE_SPTR16 pattern, int options, int *errorcodeptr,
-  const char **errorptr, int *erroroffset, const unsigned char *tables)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN pcre32 * PCRE_CALL_CONVENTION
-pcre32_compile2(PCRE_SPTR32 pattern, int options, int *errorcodeptr,
-  const char **errorptr, int *erroroffset, const unsigned char *tables)
-#endif
-{
-REAL_PCRE *re;
-int length = 1;  /* For final END opcode */
-pcre_int32 firstcharflags, reqcharflags;
-pcre_uint32 firstchar, reqchar;
-pcre_uint32 limit_match = PCRE_UINT32_MAX;
-pcre_uint32 limit_recursion = PCRE_UINT32_MAX;
-int newline;
-int errorcode = 0;
-int skipatstart = 0;
-BOOL utf;
-BOOL never_utf = FALSE;
-size_t size;
-pcre_uchar *code;
-const pcre_uchar *codestart;
-const pcre_uchar *ptr;
-compile_data compile_block;
-compile_data *cd = &compile_block;
-
-/* This space is used for "compiling" into during the first phase, when we are
-computing the amount of memory that is needed. Compiled items are thrown away
-as soon as possible, so that a fairly large buffer should be sufficient for
-this purpose. The same space is used in the second phase for remembering where
-to fill in forward references to subpatterns. That may overflow, in which case
-new memory is obtained from malloc(). */
-
-pcre_uchar cworkspace[COMPILE_WORK_SIZE];
-
-/* This vector is used for remembering name groups during the pre-compile. In a
-similar way to cworkspace, it can be expanded using malloc() if necessary. */
-
-named_group named_groups[NAMED_GROUP_LIST_SIZE];
-cd->named_groups = named_groups;
-cd->named_group_list_size = NAMED_GROUP_LIST_SIZE;
-
-/* Set this early so that early errors get offset 0. */
-
-ptr = (const pcre_uchar *)pattern;
-
-/* We can't pass back an error message if errorptr is NULL; I guess the best we
-can do is just return NULL, but we can set a code value if there is a code
-pointer. */
-
-if (errorptr == NULL)
-  {
-  if (errorcodeptr != NULL) *errorcodeptr = 99;
-  return NULL;
-  }
-
-*errorptr = NULL;
-if (errorcodeptr != NULL) *errorcodeptr = ERR0;
-
-/* However, we can give a message for this error */
-
-if (erroroffset == NULL)
-  {
-  errorcode = ERR16;
-  goto PCRE_EARLY_ERROR_RETURN2;
-  }
-
-*erroroffset = 0;
-
-/* Set up pointers to the individual character tables */
-
-if (tables == NULL) tables = PRIV(default_tables);
-cd->lcc = tables + lcc_offset;
-cd->fcc = tables + fcc_offset;
-cd->cbits = tables + cbits_offset;
-cd->ctypes = tables + ctypes_offset;
-
-/* Check that all undefined public option bits are zero */
-
-if ((options & ~PUBLIC_COMPILE_OPTIONS) != 0)
-  {
-  errorcode = ERR17;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* If PCRE_NEVER_UTF is set, remember it. */
-
-if ((options & PCRE_NEVER_UTF) != 0) never_utf = TRUE;
-
-/* Check for global one-time settings at the start of the pattern, and remember
-the offset for later. */
-
-cd->external_flags = 0;   /* Initialize here for LIMIT_MATCH/RECURSION */
-
-while (ptr[skipatstart] == CHAR_LEFT_PARENTHESIS &&
-       ptr[skipatstart+1] == CHAR_ASTERISK)
-  {
-  int newnl = 0;
-  int newbsr = 0;
-
-/* For completeness and backward compatibility, (*UTFn) is supported in the
-relevant libraries, but (*UTF) is generic and always supported. Note that
-PCRE_UTF8 == PCRE_UTF16 == PCRE_UTF32. */
-
-#ifdef COMPILE_PCRE8
-  if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UTF8_RIGHTPAR, 5) == 0)
-    { skipatstart += 7; options |= PCRE_UTF8; continue; }
-#endif
-#ifdef COMPILE_PCRE16
-  if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UTF16_RIGHTPAR, 6) == 0)
-    { skipatstart += 8; options |= PCRE_UTF16; continue; }
-#endif
-#ifdef COMPILE_PCRE32
-  if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UTF32_RIGHTPAR, 6) == 0)
-    { skipatstart += 8; options |= PCRE_UTF32; continue; }
-#endif
-
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UTF_RIGHTPAR, 4) == 0)
-    { skipatstart += 6; options |= PCRE_UTF8; continue; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UCP_RIGHTPAR, 4) == 0)
-    { skipatstart += 6; options |= PCRE_UCP; continue; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_NO_AUTO_POSSESS_RIGHTPAR, 16) == 0)
-    { skipatstart += 18; options |= PCRE_NO_AUTO_POSSESS; continue; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_NO_START_OPT_RIGHTPAR, 13) == 0)
-    { skipatstart += 15; options |= PCRE_NO_START_OPTIMIZE; continue; }
-
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_LIMIT_MATCH_EQ, 12) == 0)
-    {
-    pcre_uint32 c = 0;
-    int p = skipatstart + 14;
-    while (isdigit(ptr[p]))
-      {
-      if (c > PCRE_UINT32_MAX / 10 - 1) break;   /* Integer overflow */
-      c = c*10 + ptr[p++] - CHAR_0;
-      }
-    if (ptr[p++] != CHAR_RIGHT_PARENTHESIS) break;
-    if (c < limit_match)
-      {
-      limit_match = c;
-      cd->external_flags |= PCRE_MLSET;
-      }
-    skipatstart = p;
-    continue;
-    }
-
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_LIMIT_RECURSION_EQ, 16) == 0)
-    {
-    pcre_uint32 c = 0;
-    int p = skipatstart + 18;
-    while (isdigit(ptr[p]))
-      {
-      if (c > PCRE_UINT32_MAX / 10 - 1) break;   /* Integer overflow check */
-      c = c*10 + ptr[p++] - CHAR_0;
-      }
-    if (ptr[p++] != CHAR_RIGHT_PARENTHESIS) break;
-    if (c < limit_recursion)
-      {
-      limit_recursion = c;
-      cd->external_flags |= PCRE_RLSET;
-      }
-    skipatstart = p;
-    continue;
-    }
-
-  if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_CR_RIGHTPAR, 3) == 0)
-    { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_LF_RIGHTPAR, 3)  == 0)
-    { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_CRLF_RIGHTPAR, 5)  == 0)
-    { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_ANY_RIGHTPAR, 4) == 0)
-    { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_ANYCRLF_RIGHTPAR, 8) == 0)
-    { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
-
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_BSR_ANYCRLF_RIGHTPAR, 12) == 0)
-    { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
-  else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_BSR_UNICODE_RIGHTPAR, 12) == 0)
-    { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
-
-  if (newnl != 0)
-    options = (options & ~PCRE_NEWLINE_BITS) | newnl;
-  else if (newbsr != 0)
-    options = (options & ~(PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) | newbsr;
-  else break;
-  }
-
-/* PCRE_UTF(16|32) have the same value as PCRE_UTF8. */
-utf = (options & PCRE_UTF8) != 0;
-if (utf && never_utf)
-  {
-  errorcode = ERR78;
-  goto PCRE_EARLY_ERROR_RETURN2;
-  }
-
-/* Can't support UTF unless PCRE has been compiled to include the code. The
-return of an error code from PRIV(valid_utf)() is a new feature, introduced in
-release 8.13. It is passed back from pcre_[dfa_]exec(), but at the moment is
-not used here. */
-
-#ifdef SUPPORT_UTF
-if (utf && (options & PCRE_NO_UTF8_CHECK) == 0 &&
-     (errorcode = PRIV(valid_utf)((PCRE_PUCHAR)pattern, -1, erroroffset)) != 0)
-  {
-#if defined COMPILE_PCRE8
-  errorcode = ERR44;
-#elif defined COMPILE_PCRE16
-  errorcode = ERR74;
-#elif defined COMPILE_PCRE32
-  errorcode = ERR77;
-#endif
-  goto PCRE_EARLY_ERROR_RETURN2;
-  }
-#else
-if (utf)
-  {
-  errorcode = ERR32;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-#endif
-
-/* Can't support UCP unless PCRE has been compiled to include the code. */
-
-#ifndef SUPPORT_UCP
-if ((options & PCRE_UCP) != 0)
-  {
-  errorcode = ERR67;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-#endif
-
-/* Check validity of \R options. */
-
-if ((options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) ==
-     (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
-  {
-  errorcode = ERR56;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* Handle different types of newline. The three bits give seven cases. The
-current code allows for fixed one- or two-byte sequences, plus "any" and
-"anycrlf". */
-
-switch (options & PCRE_NEWLINE_BITS)
-  {
-  case 0: newline = NEWLINE; break;   /* Build-time default */
-  case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
-  case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
-  case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
-  case PCRE_NEWLINE_ANY: newline = -1; break;
-  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
-  default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-if (newline == -2)
-  {
-  cd->nltype = NLTYPE_ANYCRLF;
-  }
-else if (newline < 0)
-  {
-  cd->nltype = NLTYPE_ANY;
-  }
-else
-  {
-  cd->nltype = NLTYPE_FIXED;
-  if (newline > 255)
-    {
-    cd->nllen = 2;
-    cd->nl[0] = (newline >> 8) & 255;
-    cd->nl[1] = newline & 255;
-    }
-  else
-    {
-    cd->nllen = 1;
-    cd->nl[0] = newline;
-    }
-  }
-
-/* Maximum back reference and backref bitmap. The bitmap records up to 31 back
-references to help in deciding whether (.*) can be treated as anchored or not.
-*/
-
-cd->top_backref = 0;
-cd->backref_map = 0;
-
-/* Reflect pattern for debugging output */
-
-DPRINTF(("------------------------------------------------------------------\n"));
-#ifdef PCRE_DEBUG
-print_puchar(stdout, (PCRE_PUCHAR)pattern);
-#endif
-DPRINTF(("\n"));
-
-/* Pretend to compile the pattern while actually just accumulating the length
-of memory required. This behaviour is triggered by passing a non-NULL final
-argument to compile_regex(). We pass a block of workspace (cworkspace) for it
-to compile parts of the pattern into; the compiled code is discarded when it is
-no longer needed, so hopefully this workspace will never overflow, though there
-is a test for its doing so. */
-
-cd->bracount = cd->final_bracount = 0;
-cd->names_found = 0;
-cd->name_entry_size = 0;
-cd->name_table = NULL;
-cd->dupnames = FALSE;
-cd->dupgroups = FALSE;
-cd->namedrefcount = 0;
-cd->start_code = cworkspace;
-cd->hwm = cworkspace;
-cd->iscondassert = FALSE;
-cd->start_workspace = cworkspace;
-cd->workspace_size = COMPILE_WORK_SIZE;
-cd->start_pattern = (const pcre_uchar *)pattern;
-cd->end_pattern = (const pcre_uchar *)(pattern + STRLEN_UC((const pcre_uchar *)pattern));
-cd->req_varyopt = 0;
-cd->parens_depth = 0;
-cd->assert_depth = 0;
-cd->max_lookbehind = 0;
-cd->external_options = options;
-cd->open_caps = NULL;
-
-/* Now do the pre-compile. On error, errorcode will be set non-zero, so we
-don't need to look at the result of the function here. The initial options have
-been put into the cd block so that they can be changed if an option setting is
-found within the regex right at the beginning. Bringing initial option settings
-outside can help speed up starting point checks. */
-
-ptr += skipatstart;
-code = cworkspace;
-*code = OP_BRA;
-
-(void)compile_regex(cd->external_options, &code, &ptr, &errorcode, FALSE,
-  FALSE, 0, 0, &firstchar, &firstcharflags, &reqchar, &reqcharflags, NULL,
-  cd, &length);
-if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
-
-DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
-  (int)(cd->hwm - cworkspace)));
-
-if (length > MAX_PATTERN_SIZE)
-  {
-  errorcode = ERR20;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* Compute the size of the data block for storing the compiled pattern. Integer
-overflow should no longer be possible because nowadays we limit the maximum
-value of cd->names_found and cd->name_entry_size. */
-
-size = sizeof(REAL_PCRE) +
-  (length + cd->names_found * cd->name_entry_size) * sizeof(pcre_uchar);
-
-/* Get the memory. */
-
-re = (REAL_PCRE *)(PUBL(malloc))(size);
-if (re == NULL)
-  {
-  errorcode = ERR21;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* Put in the magic number, and save the sizes, initial options, internal
-flags, and character table pointer. NULL is used for the default character
-tables. The nullpad field is at the end; it's there to help in the case when a
-regex compiled on a system with 4-byte pointers is run on another with 8-byte
-pointers. */
-
-re->magic_number = MAGIC_NUMBER;
-re->size = (int)size;
-re->options = cd->external_options;
-re->flags = cd->external_flags;
-re->limit_match = limit_match;
-re->limit_recursion = limit_recursion;
-re->first_char = 0;
-re->req_char = 0;
-re->name_table_offset = sizeof(REAL_PCRE) / sizeof(pcre_uchar);
-re->name_entry_size = cd->name_entry_size;
-re->name_count = cd->names_found;
-re->ref_count = 0;
-re->tables = (tables == PRIV(default_tables))? NULL : tables;
-re->nullpad = NULL;
-#ifdef COMPILE_PCRE32
-re->dummy = 0;
-#else
-re->dummy1 = re->dummy2 = re->dummy3 = 0;
-#endif
-
-/* The starting points of the name/number translation table and of the code are
-passed around in the compile data block. The start/end pattern and initial
-options are already set from the pre-compile phase, as is the name_entry_size
-field. Reset the bracket count and the names_found field. Also reset the hwm
-field; this time it's used for remembering forward references to subpatterns.
-*/
-
-cd->final_bracount = cd->bracount;  /* Save for checking forward references */
-cd->parens_depth = 0;
-cd->assert_depth = 0;
-cd->bracount = 0;
-cd->max_lookbehind = 0;
-cd->name_table = (pcre_uchar *)re + re->name_table_offset;
-codestart = cd->name_table + re->name_entry_size * re->name_count;
-cd->start_code = codestart;
-cd->hwm = (pcre_uchar *)(cd->start_workspace);
-cd->iscondassert = FALSE;
-cd->req_varyopt = 0;
-cd->had_accept = FALSE;
-cd->had_pruneorskip = FALSE;
-cd->check_lookbehind = FALSE;
-cd->open_caps = NULL;
-
-/* If any named groups were found, create the name/number table from the list
-created in the first pass. */
-
-if (cd->names_found > 0)
-  {
-  int i = cd->names_found;
-  named_group *ng = cd->named_groups;
-  cd->names_found = 0;
-  for (; i > 0; i--, ng++)
-    add_name(cd, ng->name, ng->length, ng->number);
-  if (cd->named_group_list_size > NAMED_GROUP_LIST_SIZE)
-    (PUBL(free))((void *)cd->named_groups);
-  cd->named_group_list_size = 0;   /* So we don't free it twice */
-  }
-
-/* Set up a starting, non-extracting bracket, then compile the expression. On
-error, errorcode will be set non-zero, so we don't need to look at the result
-of the function here. */
-
-ptr = (const pcre_uchar *)pattern + skipatstart;
-code = (pcre_uchar *)codestart;
-*code = OP_BRA;
-(void)compile_regex(re->options, &code, &ptr, &errorcode, FALSE, FALSE, 0, 0,
-  &firstchar, &firstcharflags, &reqchar, &reqcharflags, NULL, cd, NULL);
-re->top_bracket = cd->bracount;
-re->top_backref = cd->top_backref;
-re->max_lookbehind = cd->max_lookbehind;
-re->flags = cd->external_flags | PCRE_MODE;
-
-if (cd->had_accept)
-  {
-  reqchar = 0;              /* Must disable after (*ACCEPT) */
-  reqcharflags = REQ_NONE;
-  }
-
-/* If not reached end of pattern on success, there's an excess bracket. */
-
-if (errorcode == 0 && *ptr != CHAR_NULL) errorcode = ERR22;
-
-/* Fill in the terminating state and check for disastrous overflow, but
-if debugging, leave the test till after things are printed out. */
-
-*code++ = OP_END;
-
-#ifndef PCRE_DEBUG
-if (code - codestart > length) errorcode = ERR23;
-#endif
-
-#ifdef SUPPORT_VALGRIND
-/* If the estimated length exceeds the really used length, mark the extra
-allocated memory as unaddressable, so that any out-of-bound reads can be
-detected. */
-VALGRIND_MAKE_MEM_NOACCESS(code, (length - (code - codestart)) * sizeof(pcre_uchar));
-#endif
-
-/* Fill in any forward references that are required. There may be repeated
-references; optimize for them, as searching a large regex takes time. */
-
-if (cd->hwm > cd->start_workspace)
-  {
-  int prev_recno = -1;
-  const pcre_uchar *groupptr = NULL;
-  while (errorcode == 0 && cd->hwm > cd->start_workspace)
-    {
-    int offset, recno;
-    cd->hwm -= LINK_SIZE;
-    offset = GET(cd->hwm, 0);
-
-    /* Check that the hwm handling hasn't gone wrong. This whole area is
-    rewritten in PCRE2 because there are some obscure cases. */
-
-    if (offset == 0 || codestart[offset-1] != OP_RECURSE)
-      {
-      errorcode = ERR10;
-      break;
-      }
-
-    recno = GET(codestart, offset);
-    if (recno != prev_recno)
-      {
-      groupptr = PRIV(find_bracket)(codestart, utf, recno);
-      prev_recno = recno;
-      }
-    if (groupptr == NULL) errorcode = ERR53;
-      else PUT(((pcre_uchar *)codestart), offset, (int)(groupptr - codestart));
-    }
-  }
-
-/* If the workspace had to be expanded, free the new memory. Set the pointer to
-NULL to indicate that forward references have been filled in. */
-
-if (cd->workspace_size > COMPILE_WORK_SIZE)
-  (PUBL(free))((void *)cd->start_workspace);
-cd->start_workspace = NULL;
-
-/* Give an error if there's back reference to a non-existent capturing
-subpattern. */
-
-if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
-
-/* Unless disabled, check whether any single character iterators can be
-auto-possessified. The function overwrites the appropriate opcode values, so
-the type of the pointer must be cast. NOTE: the intermediate variable "temp" is
-used in this code because at least one compiler gives a warning about loss of
-"const" attribute if the cast (pcre_uchar *)codestart is used directly in the
-function call. */
-
-if (errorcode == 0 && (options & PCRE_NO_AUTO_POSSESS) == 0)
-  {
-  pcre_uchar *temp = (pcre_uchar *)codestart;
-  auto_possessify(temp, utf, cd);
-  }
-
-/* If there were any lookbehind assertions that contained OP_RECURSE
-(recursions or subroutine calls), a flag is set for them to be checked here,
-because they may contain forward references. Actual recursions cannot be fixed
-length, but subroutine calls can. It is done like this so that those without
-OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
-exceptional ones forgo this. We scan the pattern to check that they are fixed
-length, and set their lengths. */
-
-if (errorcode == 0 && cd->check_lookbehind)
-  {
-  pcre_uchar *cc = (pcre_uchar *)codestart;
-
-  /* Loop, searching for OP_REVERSE items, and process those that do not have
-  their length set. (Actually, it will also re-process any that have a length
-  of zero, but that is a pathological case, and it does no harm.) When we find
-  one, we temporarily terminate the branch it is in while we scan it. */
-
-  for (cc = (pcre_uchar *)PRIV(find_bracket)(codestart, utf, -1);
-       cc != NULL;
-       cc = (pcre_uchar *)PRIV(find_bracket)(cc, utf, -1))
-    {
-    if (GET(cc, 1) == 0)
-      {
-      int fixed_length;
-      pcre_uchar *be = cc - 1 - LINK_SIZE + GET(cc, -LINK_SIZE);
-      int end_op = *be;
-      *be = OP_END;
-      fixed_length = find_fixedlength(cc, (re->options & PCRE_UTF8) != 0, TRUE,
-        cd, NULL);
-      *be = end_op;
-      DPRINTF(("fixed length = %d\n", fixed_length));
-      if (fixed_length < 0)
-        {
-        errorcode = (fixed_length == -2)? ERR36 :
-                    (fixed_length == -4)? ERR70 : ERR25;
-        break;
-        }
-      if (fixed_length > cd->max_lookbehind) cd->max_lookbehind = fixed_length;
-      PUT(cc, 1, fixed_length);
-      }
-    cc += 1 + LINK_SIZE;
-    }
-  }
-
-/* Failed to compile, or error while post-processing */
-
-if (errorcode != 0)
-  {
-  (PUBL(free))(re);
-  PCRE_EARLY_ERROR_RETURN:
-  if (cd->named_group_list_size > NAMED_GROUP_LIST_SIZE)
-    (PUBL(free))((void *)cd->named_groups);
-  *erroroffset = (int)(ptr - (const pcre_uchar *)pattern);
-  PCRE_EARLY_ERROR_RETURN2:
-  *errorptr = find_error_text(errorcode);
-  if (errorcodeptr != NULL) *errorcodeptr = errorcode;
-  return NULL;
-  }
-
-/* If the anchored option was not passed, set the flag if we can determine that
-the pattern is anchored by virtue of ^ characters or \A or anything else, such
-as starting with non-atomic .* when DOTALL is set and there are no occurrences
-of *PRUNE or *SKIP.
-
-Otherwise, if we know what the first byte has to be, save it, because that
-speeds up unanchored matches no end. If not, see if we can set the
-PCRE_STARTLINE flag. This is helpful for multiline matches when all branches
-start with ^. and also when all branches start with non-atomic .* for
-non-DOTALL matches when *PRUNE and SKIP are not present. */
-
-if ((re->options & PCRE_ANCHORED) == 0)
-  {
-  if (is_anchored(codestart, 0, cd, 0)) re->options |= PCRE_ANCHORED;
-  else
-    {
-    if (firstcharflags < 0)
-      firstchar = find_firstassertedchar(codestart, &firstcharflags, FALSE);
-    if (firstcharflags >= 0)   /* Remove caseless flag for non-caseable chars */
-      {
-#if defined COMPILE_PCRE8
-      re->first_char = firstchar & 0xff;
-#elif defined COMPILE_PCRE16
-      re->first_char = firstchar & 0xffff;
-#elif defined COMPILE_PCRE32
-      re->first_char = firstchar;
-#endif
-      if ((firstcharflags & REQ_CASELESS) != 0)
-        {
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-        /* We ignore non-ASCII first chars in 8 bit mode. */
-        if (utf)
-          {
-          if (re->first_char < 128)
-            {
-            if (cd->fcc[re->first_char] != re->first_char)
-              re->flags |= PCRE_FCH_CASELESS;
-            }
-          else if (UCD_OTHERCASE(re->first_char) != re->first_char)
-            re->flags |= PCRE_FCH_CASELESS;
-          }
-        else
-#endif
-        if (MAX_255(re->first_char)
-            && cd->fcc[re->first_char] != re->first_char)
-          re->flags |= PCRE_FCH_CASELESS;
-        }
-
-      re->flags |= PCRE_FIRSTSET;
-      }
-
-    else if (is_startline(codestart, 0, cd, 0, FALSE)) re->flags |= PCRE_STARTLINE;
-    }
-  }
-
-/* For an anchored pattern, we use the "required byte" only if it follows a
-variable length item in the regex. Remove the caseless flag for non-caseable
-bytes. */
-
-if (reqcharflags >= 0 &&
-     ((re->options & PCRE_ANCHORED) == 0 || (reqcharflags & REQ_VARY) != 0))
-  {
-#if defined COMPILE_PCRE8
-  re->req_char = reqchar & 0xff;
-#elif defined COMPILE_PCRE16
-  re->req_char = reqchar & 0xffff;
-#elif defined COMPILE_PCRE32
-  re->req_char = reqchar;
-#endif
-  if ((reqcharflags & REQ_CASELESS) != 0)
-    {
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-    /* We ignore non-ASCII first chars in 8 bit mode. */
-    if (utf)
-      {
-      if (re->req_char < 128)
-        {
-        if (cd->fcc[re->req_char] != re->req_char)
-          re->flags |= PCRE_RCH_CASELESS;
-        }
-      else if (UCD_OTHERCASE(re->req_char) != re->req_char)
-        re->flags |= PCRE_RCH_CASELESS;
-      }
-    else
-#endif
-    if (MAX_255(re->req_char) && cd->fcc[re->req_char] != re->req_char)
-      re->flags |= PCRE_RCH_CASELESS;
-    }
-
-  re->flags |= PCRE_REQCHSET;
-  }
-
-/* Print out the compiled data if debugging is enabled. This is never the
-case when building a production library. */
-
-#ifdef PCRE_DEBUG
-printf("Length = %d top_bracket = %d top_backref = %d\n",
-  length, re->top_bracket, re->top_backref);
-
-printf("Options=%08x\n", re->options);
-
-if ((re->flags & PCRE_FIRSTSET) != 0)
-  {
-  pcre_uchar ch = re->first_char;
-  const char *caseless =
-    ((re->flags & PCRE_FCH_CASELESS) == 0)? "" : " (caseless)";
-  if (PRINTABLE(ch)) printf("First char = %c%s\n", ch, caseless);
-    else printf("First char = \\x%02x%s\n", ch, caseless);
-  }
-
-if ((re->flags & PCRE_REQCHSET) != 0)
-  {
-  pcre_uchar ch = re->req_char;
-  const char *caseless =
-    ((re->flags & PCRE_RCH_CASELESS) == 0)? "" : " (caseless)";
-  if (PRINTABLE(ch)) printf("Req char = %c%s\n", ch, caseless);
-    else printf("Req char = \\x%02x%s\n", ch, caseless);
-  }
-
-#if defined COMPILE_PCRE8
-pcre_printint((pcre *)re, stdout, TRUE);
-#elif defined COMPILE_PCRE16
-pcre16_printint((pcre *)re, stdout, TRUE);
-#elif defined COMPILE_PCRE32
-pcre32_printint((pcre *)re, stdout, TRUE);
-#endif
-
-/* This check is done here in the debugging case so that the code that
-was compiled can be seen. */
-
-if (code - codestart > length)
-  {
-  (PUBL(free))(re);
-  *errorptr = find_error_text(ERR23);
-  *erroroffset = ptr - (pcre_uchar *)pattern;
-  if (errorcodeptr != NULL) *errorcodeptr = ERR23;
-  return NULL;
-  }
-#endif   /* PCRE_DEBUG */
-
-/* Check for a pattern than can match an empty string, so that this information
-can be provided to applications. */
-
-do
-  {
-  if (could_be_empty_branch(codestart, code, utf, cd, NULL))
-    {
-    re->flags |= PCRE_MATCH_EMPTY;
-    break;
-    }
-  codestart += GET(codestart, 1);
-  }
-while (*codestart == OP_ALT);
-
-#if defined COMPILE_PCRE8
-return (pcre *)re;
-#elif defined COMPILE_PCRE16
-return (pcre16 *)re;
-#elif defined COMPILE_PCRE32
-return (pcre32 *)re;
-#endif
-}
-
-/* End of pcre_compile.c */
diff --git a/Foundation/src/pcre_config.c b/Foundation/src/pcre_config.c
deleted file mode 100644
index 35c12dfc2..000000000
--- a/Foundation/src/pcre_config.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_config(). */
-
-#include "pcre_config.h"
-
-/* Keep the original link size. */
-static int real_link_size = LINK_SIZE;
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-* Return info about what features are configured *
-*************************************************/
-
-/* This function has an extensible interface so that additional items can be
-added compatibly.
-
-Arguments:
-  what             what information is required
-  where            where to put the information
-
-Returns:           0 if data returned, negative on error
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_config(int what, void *where)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_config(int what, void *where)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_config(int what, void *where)
-#endif
-{
-switch (what)
-  {
-  case PCRE_CONFIG_UTF8:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-  *((int *)where) = 0;
-  return PCRE_ERROR_BADOPTION;
-#else
-#if defined SUPPORT_UTF
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-#endif
-
-  case PCRE_CONFIG_UTF16:
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE32
-  *((int *)where) = 0;
-  return PCRE_ERROR_BADOPTION;
-#else
-#if defined SUPPORT_UTF
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-#endif
-
-  case PCRE_CONFIG_UTF32:
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-  *((int *)where) = 0;
-  return PCRE_ERROR_BADOPTION;
-#else
-#if defined SUPPORT_UTF
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-#endif
-
-  case PCRE_CONFIG_UNICODE_PROPERTIES:
-#ifdef SUPPORT_UCP
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-
-  case PCRE_CONFIG_JIT:
-#ifdef SUPPORT_JIT
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-
-  case PCRE_CONFIG_JITTARGET:
-#ifdef SUPPORT_JIT
-  *((const char **)where) = PRIV(jit_get_target)();
-#else
-  *((const char **)where) = NULL;
-#endif
-  break;
-
-  case PCRE_CONFIG_NEWLINE:
-  *((int *)where) = NEWLINE;
-  break;
-
-  case PCRE_CONFIG_BSR:
-#ifdef BSR_ANYCRLF
-  *((int *)where) = 1;
-#else
-  *((int *)where) = 0;
-#endif
-  break;
-
-  case PCRE_CONFIG_LINK_SIZE:
-  *((int *)where) = real_link_size;
-  break;
-
-  case PCRE_CONFIG_POSIX_MALLOC_THRESHOLD:
-  *((int *)where) = POSIX_MALLOC_THRESHOLD;
-  break;
-
-  case PCRE_CONFIG_PARENS_LIMIT:
-  *((unsigned long int *)where) = PARENS_NEST_LIMIT;
-  break;
-
-  case PCRE_CONFIG_MATCH_LIMIT:
-  *((unsigned long int *)where) = MATCH_LIMIT;
-  break;
-
-  case PCRE_CONFIG_MATCH_LIMIT_RECURSION:
-  *((unsigned long int *)where) = MATCH_LIMIT_RECURSION;
-  break;
-
-  case PCRE_CONFIG_STACKRECURSE:
-#ifdef NO_RECURSE
-  *((int *)where) = 0;
-#else
-  *((int *)where) = 1;
-#endif
-  break;
-
-  default: return PCRE_ERROR_BADOPTION;
-  }
-
-return 0;
-}
-
-/* End of pcre_config.c */
diff --git a/Foundation/src/pcre_config.h b/Foundation/src/pcre_config.h
deleted file mode 100644
index 7bc2274eb..000000000
--- a/Foundation/src/pcre_config.h
+++ /dev/null
@@ -1,413 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* PCRE is written in Standard C, but there are a few non-standard things it
-can cope with, allowing it to run on SunOS4 and other "close to standard"
-systems.
-
-In environments that support the GNU autotools, config.h.in is converted into
-config.h by the "configure" script. In environments that use CMake,
-config-cmake.in is converted into config.h. If you are going to build PCRE "by
-hand" without using "configure" or CMake, you should copy the distributed
-config.h.generic to config.h, and edit the macro definitions to be the way you
-need them. You must then add -DHAVE_CONFIG_H to all of your compile commands,
-so that config.h is included at the start of every source.
-
-Alternatively, you can avoid editing by using -D on the compiler command line
-to set the macro values. In this case, you do not have to set -DHAVE_CONFIG_H,
-but if you do, default values will be taken from config.h for non-boolean
-macros that are not defined on the command line.
-
-Boolean macros such as HAVE_STDLIB_H and SUPPORT_PCRE8 should either be defined
-(conventionally to 1) for TRUE, and not defined at all for FALSE. All such
-macros are listed as a commented #undef in config.h.generic. Macros such as
-MATCH_LIMIT, whose actual value is relevant, have defaults defined, but are
-surrounded by #ifndef/#endif lines so that the value can be overridden by -D.
-
-PCRE uses memmove() if HAVE_MEMMOVE is defined; otherwise it uses bcopy() if
-HAVE_BCOPY is defined. If your system has neither bcopy() nor memmove(), make
-sure both macros are undefined; an emulation function will then be used. */
-
-/* By default, the \R escape sequence matches any Unicode line ending
-   character or sequence of characters. If BSR_ANYCRLF is defined (to any
-   value), this is changed so that backslash-R matches only CR, LF, or CRLF.
-   The build-time default can be overridden by the user of PCRE at runtime. */
-/* #undef BSR_ANYCRLF */
-
-/* If you are compiling for a system that uses EBCDIC instead of ASCII
-   character codes, define this macro to any value. You must also edit the
-   NEWLINE macro below to set a suitable EBCDIC newline, commonly 21 (0x15).
-   On systems that can use "configure" or CMake to set EBCDIC, NEWLINE is
-   automatically adjusted. When EBCDIC is set, PCRE assumes that all input
-   strings are in EBCDIC. If you do not define this macro, PCRE will assume
-   input strings are ASCII or UTF-8/16/32 Unicode. It is not possible to build
-   a version of PCRE that supports both EBCDIC and UTF-8/16/32. */
-/* #undef EBCDIC */
-
-/* In an EBCDIC environment, define this macro to any value to arrange for the
-   NL character to be 0x25 instead of the default 0x15. NL plays the role that
-   LF does in an ASCII/Unicode environment. The value must also be set in the
-   NEWLINE macro below. On systems that can use "configure" or CMake to set
-   EBCDIC_NL25, the adjustment of NEWLINE is automatic. */
-/* #undef EBCDIC_NL25 */
-
-/* Define to 1 if you have the `bcopy' function. */
-/* #undef HAVE_BCOPY */
-
-/* Define to 1 if you have the <bits/type_traits.h> header file. */
-/* #undef HAVE_BITS_TYPE_TRAITS_H */
-
-/* Define to 1 if you have the <bzlib.h> header file. */
-/* #undef HAVE_BZLIB_H */
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#ifndef HAVE_DIRENT_H
-#define HAVE_DIRENT_H 0
-#endif
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#ifndef HAVE_DLFCN_H
-#define HAVE_DLFCN_H 0
-#endif
-
-/* Define to 1 if you have the <editline/readline.h> header file. */
-#ifndef HAVE_EDITLINE_READLINE_H
-#define HAVE_EDITLINE_READLINE_H 0
-#endif
-
-/* Define to 1 if you have the <edit/readline/readline.h> header file. */
-#ifndef HAVE_EDIT_READLINE_READLINE_H
-#define HAVE_EDIT_READLINE_READLINE_H 0
-#endif
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#ifndef HAVE_INTTYPES_H
-#define HAVE_INTTYPES_H 0
-#endif
-
-/* Define to 1 if you have the <limits.h> header file. */
-/* #undef HAVE_LIMITS_H */
-#ifndef HAVE_LIMITS_H
-#define HAVE_LIMITS_H 1
-#endif
-
-/* Define to 1 if the system has the type `long long'. */
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG 0
-#endif
-
-/* Define to 1 if you have the `memmove' function. */
-#ifndef HAVE_MEMMOVE
-#define HAVE_MEMMOVE 0
-#endif
-
-/* Define to 1 if you have the <memory.h> header file. */
-#ifndef HAVE_MEMORY_H
-#define HAVE_MEMORY_H 1
-#endif
-
-/* Define if you have POSIX threads libraries and header files. */
-#ifndef HAVE_PTHREAD
-#define HAVE_PTHREAD 0
-#endif
-
-/* Have PTHREAD_PRIO_INHERIT. */
-#ifndef HAVE_PTHREAD_PRIO_INHERIT
-#define HAVE_PTHREAD_PRIO_INHERIT 0
-#endif
-
-/* Define to 1 if you have the <readline/history.h> header file. */
-#ifndef HAVE_READLINE_HISTORY_H
-#define HAVE_READLINE_HISTORY_H 0
-#endif
-
-/* Define to 1 if you have the <readline/readline.h> header file. */
-#ifndef HAVE_READLINE_READLINE_H
-#define HAVE_READLINE_READLINE_H 0
-#endif
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#ifndef HAVE_STDINT_H
-#define HAVE_STDINT_H 0
-#endif
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#ifndef HAVE_STDLIB_H
-#define HAVE_STDLIB_H 1
-#endif
-
-/* Define to 1 if you have the `strerror' function. */
-#ifndef HAVE_STRERROR
-#define HAVE_STRERROR 0
-#endif
-
-/* Define to 1 if you have the <string> header file. */
-#ifndef HAVE_STRING
-#define HAVE_STRING 0
-#endif
-
-/* Define to 1 if you have the <strings.h> header file. */
-#ifndef HAVE_STRINGS_H
-#define HAVE_STRINGS_H 0
-#endif
-
-/* Define to 1 if you have the <string.h> header file. */
-#ifndef HAVE_STRING_H
-#define HAVE_STRING_H 1
-#endif
-
-/* Define to 1 if you have `strtoimax'. */
-#ifndef HAVE_STRTOIMAX
-#define HAVE_STRTOIMAX 0
-#endif
-
-/* Define to 1 if you have `strtoll'. */
-#ifndef HAVE_STRTOLL
-#define HAVE_STRTOLL 0
-#endif
-
-/* Define to 1 if you have `strtoq'. */
-#ifndef HAVE_STRTOQ
-#define HAVE_STRTOQ 0
-#endif
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#ifndef HAVE_SYS_STAT_H
-#define HAVE_SYS_STAT_H 0
-#endif
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#ifndef HAVE_SYS_TYPES_H
-#define HAVE_SYS_TYPES_H 0
-#endif
-
-/* Define to 1 if you have the <type_traits.h> header file. */
-/* #undef HAVE_TYPE_TRAITS_H */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#ifndef HAVE_UNISTD_H
-#define HAVE_UNISTD_H 0
-#endif
-
-/* Define to 1 if the system has the type `unsigned long long'. */
-#ifndef HAVE_UNSIGNED_LONG_LONG
-#define HAVE_UNSIGNED_LONG_LONG 0
-#endif
-
-/* Define to 1 if the compiler supports simple visibility declarations. */
-/* #undef HAVE_VISIBILITY */
-
-/* Define to 1 if you have the <windows.h> header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define to 1 if you have the <zlib.h> header file. */
-/* #undef HAVE_ZLIB_H */
-
-/* Define to 1 if you have `_strtoi64'. */
-/* #undef HAVE__STRTOI64 */
-
-/* The value of LINK_SIZE determines the number of bytes used to store links
-   as offsets within the compiled regex. The default is 2, which allows for
-   compiled patterns up to 64K long. This covers the vast majority of cases.
-   However, PCRE can also be compiled to use 3 or 4 bytes instead. This allows
-   for longer patterns in extreme cases. */
-#ifndef LINK_SIZE
-#define LINK_SIZE 2
-#endif
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-/* This is ignored unless you are using libtool. */
-#ifndef LT_OBJDIR
-#define LT_OBJDIR ".libs/"
-#endif
-
-/* The value of MATCH_LIMIT determines the default number of times the
-   internal match() function can be called during a single execution of
-   pcre_exec(). There is a runtime interface for setting a different limit.
-   The limit exists in order to catch runaway regular expressions that take
-   for ever to determine that they do not match. The default is set very large
-   so that it does not accidentally catch legitimate cases. */
-#ifndef MATCH_LIMIT
-#define MATCH_LIMIT 10000000
-#endif
-
-/* The above limit applies to all calls of match(), whether or not they
-   increase the recursion depth. In some environments it is desirable to limit
-   the depth of recursive calls of match() more strictly, in order to restrict
-   the maximum amount of stack (or heap, if NO_RECURSE is defined) that is
-   used. The value of MATCH_LIMIT_RECURSION applies only to recursive calls of
-   match(). To have any useful effect, it must be less than the value of
-   MATCH_LIMIT. The default is to use the same value as MATCH_LIMIT. There is
-   a runtime method for setting a different limit. */
-#ifndef MATCH_LIMIT_RECURSION
-#define MATCH_LIMIT_RECURSION MATCH_LIMIT
-#endif
-
-/* This limit is parameterized just in case anybody ever wants to change it.
-   Care must be taken if it is increased, because it guards against integer
-   overflow caused by enormously large patterns. */
-#ifndef MAX_NAME_COUNT
-#define MAX_NAME_COUNT 30000
-#endif
-
-/* This limit is parameterized just in case anybody ever wants to change it.
-   Care must be taken if it is increased, because it guards against integer
-   overflow caused by enormously large patterns. */
-#ifndef MAX_NAME_SIZE
-#define MAX_NAME_SIZE 32
-#endif
-
-/* The value of NEWLINE determines the default newline character sequence.
-   PCRE client programs can override this by selecting other values at run
-   time. In ASCII environments, the value can be 10 (LF), 13 (CR), or 3338
-   (CRLF); in EBCDIC environments the value can be 21 or 37 (LF), 13 (CR), or
-   3349 or 3365 (CRLF) because there are two alternative codepoints (0x15 and
-   0x25) that are used as the NL line terminator that is equivalent to ASCII
-   LF. In both ASCII and EBCDIC environments the value can also be -1 (ANY),
-   or -2 (ANYCRLF). */
-#ifndef NEWLINE
-#define NEWLINE 10
-#endif
-
-/* PCRE uses recursive function calls to handle backtracking while matching.
-   This can sometimes be a problem on systems that have stacks of limited
-   size. Define NO_RECURSE to any value to get a version that doesn't use
-   recursion in the match() function; instead it creates its own stack by
-   steam using pcre_recurse_malloc() to obtain memory from the heap. For more
-   detail, see the comments and other stuff just above the match() function.
-   */
-/* #undef NO_RECURSE */
-
-/* Name of package */
-#define PACKAGE "pcre"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "PCRE"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE 8.45"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "pcre"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "8.45"
-
-/* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
-   parentheses (of any kind) in a pattern. This limits the amount of system
-   stack that is used while compiling a pattern. */
-#ifndef PARENS_NEST_LIMIT
-#define PARENS_NEST_LIMIT 250
-#endif
-
-/* The value of PCREGREP_BUFSIZE determines the size of buffer used by
-   pcregrep to hold parts of the file it is searching. This is also the
-   minimum value. The actual amount of memory used by pcregrep is three times
-   this number, because it allows for the buffering of "before" and "after"
-   lines. */
-#ifndef PCREGREP_BUFSIZE
-#define PCREGREP_BUFSIZE 20480
-#endif
-
-/* If you are compiling for a system other than a Unix-like system or
-   Win32, and it needs some magic to be inserted before the definition
-   of a function that is exported by the library, define this macro to
-   contain the relevant magic. If you do not define this macro, a suitable
-    __declspec value is used for Windows systems; in other environments
-   "extern" is used for a C compiler and "extern C" for a C++ compiler.
-   This macro apears at the start of every exported function that is part
-   of the external API. It does not appear on functions that are "external"
-   in the C sense, but which are internal to the library. */
-/* #undef PCRE_EXP_DEFN */
-
-/* Define to any value if linking statically (TODO: make nice with Libtool) */
-#ifndef PCRE_STATIC
-#define PCRE_STATIC 1
-#endif
-
-/* When calling PCRE via the POSIX interface, additional working storage is
-   required for holding the pointers to capturing substrings because PCRE
-   requires three integers per substring, whereas the POSIX interface provides
-   only two. If the number of expected substrings is small, the wrapper
-   function uses space on the stack, because this is faster than using
-   malloc() for each call. The threshold above which the stack is no longer
-   used is defined by POSIX_MALLOC_THRESHOLD. */
-#ifndef POSIX_MALLOC_THRESHOLD
-#define POSIX_MALLOC_THRESHOLD 10
-#endif
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* Define to 1 if you have the ANSI C header files. */
-#ifndef STDC_HEADERS
-#define STDC_HEADERS 1
-#endif
-
-/* Define to any value to enable support for Just-In-Time compiling. */
-/* #undef SUPPORT_JIT */
-
-/* Define to any value to allow pcregrep to be linked with libbz2, so that it
-   is able to handle .bz2 files. */
-/* #undef SUPPORT_LIBBZ2 */
-
-/* Define to any value to allow pcretest to be linked with libedit. */
-/* #undef SUPPORT_LIBEDIT */
-
-/* Define to any value to allow pcretest to be linked with libreadline. */
-/* #undef SUPPORT_LIBREADLINE */
-
-/* Define to any value to allow pcregrep to be linked with libz, so that it is
-   able to handle .gz files. */
-/* #undef SUPPORT_LIBZ */
-
-/* Define to any value to enable the 16 bit PCRE library. */
-/* #undef SUPPORT_PCRE16 */
-
-/* Define to any value to enable the 32 bit PCRE library. */
-/* #undef SUPPORT_PCRE32 */
-
-/* Define to any value to enable the 8 bit PCRE library. */
-#ifndef SUPPORT_PCRE8
-#define SUPPORT_PCRE8
-#endif
-
-/* Define to any value to enable JIT support in pcregrep. */
-/* #undef SUPPORT_PCREGREP_JIT */
-
-/* Define to any value to enable support for Unicode properties. */
-#ifndef SUPPORT_UCP
-#define SUPPORT_UCP
-#endif
-
-/* Define to any value to enable support for the UTF-8/16/32 Unicode encoding.
-   This will work even in an EBCDIC environment, but it is incompatible with
-   the EBCDIC macro. That is, PCRE can support *either* EBCDIC code *or*
-   ASCII/UTF-8/16/32, but not both at once. */
-#ifndef SUPPORT_UTF8
-#define SUPPORT_UTF8
-#endif
-
-/* Define to any value for valgrind support to find invalid memory reads. */
-/* #undef SUPPORT_VALGRIND */
-
-/* Version number of package */
-#define VERSION "8.44"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to the type of a signed integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef int64_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
diff --git a/Foundation/src/pcre_exec.c b/Foundation/src/pcre_exec.c
deleted file mode 100644
index 71da52c0a..000000000
--- a/Foundation/src/pcre_exec.c
+++ /dev/null
@@ -1,7174 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2021 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* This module contains pcre_exec(), the externally visible function that does
-pattern matching using an NFA algorithm, trying to mimic Perl as closely as
-possible. There are also some static supporting functions. */
-
-#pragma warning( disable : 4127)  // conditional expression is constant
-#pragma warning( disable : 4244)  // conversion from 'int' to 'unsigned short', possible loss of data
-
-#include "pcre_config.h"
-
-#define NLBLOCK md             /* Block containing newline information */
-#define PSSTART start_subject  /* Field containing processed string start */
-#define PSEND   end_subject    /* Field containing processed string end */
-
-#include "pcre_internal.h"
-
-/* Undefine some potentially clashing cpp symbols */
-
-#undef min
-#undef max
-
-/* The md->capture_last field uses the lower 16 bits for the last captured
-substring (which can never be greater than 65535) and a bit in the top half
-to mean "capture vector overflowed". This odd way of doing things was
-implemented when it was realized that preserving and restoring the overflow bit
-whenever the last capture number was saved/restored made for a neater
-interface, and doing it this way saved on (a) another variable, which would
-have increased the stack frame size (a big NO-NO in PCRE) and (b) another
-separate set of save/restore instructions. The following defines are used in
-implementing this. */
-
-#define CAPLMASK    0x0000ffff    /* The bits used for last_capture */
-#define OVFLMASK    0xffff0000    /* The bits used for the overflow flag */
-#define OVFLBIT     0x00010000    /* The bit that is set for overflow */
-
-/* Values for setting in md->match_function_type to indicate two special types
-of call to match(). We do it this way to save on using another stack variable,
-as stack usage is to be discouraged. */
-
-#define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
-#define MATCH_CBEGROUP       2  /* Could-be-empty unlimited repeat group */
-
-/* Non-error returns from the match() function. Error returns are externally
-defined PCRE_ERROR_xxx codes, which are all negative. */
-
-#define MATCH_MATCH        1
-#define MATCH_NOMATCH      0
-
-/* Special internal returns from the match() function. Make them sufficiently
-negative to avoid the external error codes. */
-
-#define MATCH_ACCEPT       (-999)
-#define MATCH_KETRPOS      (-998)
-#define MATCH_ONCE         (-997)
-/* The next 5 must be kept together and in sequence so that a test that checks
-for any one of them can use a range. */
-#define MATCH_COMMIT       (-996)
-#define MATCH_PRUNE        (-995)
-#define MATCH_SKIP         (-994)
-#define MATCH_SKIP_ARG     (-993)
-#define MATCH_THEN         (-992)
-#define MATCH_BACKTRACK_MAX MATCH_THEN
-#define MATCH_BACKTRACK_MIN MATCH_COMMIT
-
-/* Maximum number of ints of offset to save on the stack for recursive calls.
-If the offset vector is bigger, malloc is used. This should be a multiple of 3,
-because the offset vector is always a multiple of 3 long. */
-
-#define REC_STACK_SAVE_MAX 30
-
-/* Min and max values for the common repeats; for the maxima, 0 => infinity */
-
-static const char rep_min[] = { 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, };
-static const char rep_max[] = { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, };
-
-#ifdef PCRE_DEBUG
-/*************************************************
-*        Debugging function to print chars       *
-*************************************************/
-
-/* Print a sequence of chars in printable format, stopping at the end of the
-subject if the requested.
-
-Arguments:
-  p           points to characters
-  length      number to print
-  is_subject  TRUE if printing from within md->start_subject
-  md          pointer to matching data block, if is_subject is TRUE
-
-Returns:     nothing
-*/
-
-static void
-pchars(const pcre_uchar *p, int length, BOOL is_subject, match_data *md)
-{
-pcre_uint32 c;
-BOOL utf = md->utf;
-if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
-while (length-- > 0)
-  if (isprint(c = UCHAR21INCTEST(p))) printf("%c", (char)c); else printf("\\x{%02x}", c);
-}
-#endif
-
-
-
-/*************************************************
-*          Match a back-reference                *
-*************************************************/
-
-/* Normally, if a back reference hasn't been set, the length that is passed is
-negative, so the match always fails. However, in JavaScript compatibility mode,
-the length passed is zero. Note that in caseless UTF-8 mode, the number of
-subject bytes matched may be different to the number of reference bytes.
-
-Arguments:
-  offset      index into the offset vector
-  eptr        pointer into the subject
-  length      length of reference to be matched (number of bytes)
-  md          points to match data block
-  caseless    TRUE if caseless
-
-Returns:      >= 0 the number of subject bytes matched
-              -1 no match
-              -2 partial match; always given if at end subject
-*/
-
-static int
-match_ref(int offset, register PCRE_PUCHAR eptr, int length, match_data *md,
-  BOOL caseless)
-{
-PCRE_PUCHAR eptr_start = eptr;
-register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
-#if defined SUPPORT_UTF && defined SUPPORT_UCP
-BOOL utf = md->utf;
-#endif
-
-#ifdef PCRE_DEBUG
-if (eptr >= md->end_subject)
-  printf("matching subject <null>");
-else
-  {
-  printf("matching subject ");
-  pchars(eptr, length, TRUE, md);
-  }
-printf(" against backref ");
-pchars(p, length, FALSE, md);
-printf("\n");
-#endif
-
-/* Always fail if reference not set (and not JavaScript compatible - in that
-case the length is passed as zero). */
-
-if (length < 0) return -1;
-
-/* Separate the caseless case for speed. In UTF-8 mode we can only do this
-properly if Unicode properties are supported. Otherwise, we can check only
-ASCII characters. */
-
-if (caseless)
-  {
-#if defined SUPPORT_UTF && defined SUPPORT_UCP
-  if (utf)
-    {
-    /* Match characters up to the end of the reference. NOTE: the number of
-    data units matched may differ, because in UTF-8 there are some characters
-    whose upper and lower case versions code have different numbers of bytes.
-    For example, U+023A (2 bytes in UTF-8) is the upper case version of U+2C65
-    (3 bytes in UTF-8); a sequence of 3 of the former uses 6 bytes, as does a
-    sequence of two of the latter. It is important, therefore, to check the
-    length along the reference, not along the subject (earlier code did this
-    wrong). */
-
-    PCRE_PUCHAR endptr = p + length;
-    while (p < endptr)
-      {
-      pcre_uint32 c, d;
-      const ucd_record *ur;
-      if (eptr >= md->end_subject) return -2;   /* Partial match */
-      GETCHARINC(c, eptr);
-      GETCHARINC(d, p);
-      ur = GET_UCD(d);
-      if (c != d && c != d + ur->other_case)
-        {
-        const pcre_uint32 *pp = PRIV(ucd_caseless_sets) + ur->caseset;
-        for (;;)
-          {
-          if (c < *pp) return -1;
-          if (c == *pp++) break;
-          }
-        }
-      }
-    }
-  else
-#endif
-
-  /* The same code works when not in UTF-8 mode and in UTF-8 mode when there
-  is no UCP support. */
-    {
-    while (length-- > 0)
-      {
-      pcre_uint32 cc, cp;
-      if (eptr >= md->end_subject) return -2;   /* Partial match */
-      cc = UCHAR21TEST(eptr);
-      cp = UCHAR21TEST(p);
-      if (TABLE_GET(cp, md->lcc, cp) != TABLE_GET(cc, md->lcc, cc)) return -1;
-      p++;
-      eptr++;
-      }
-    }
-  }
-
-/* In the caseful case, we can just compare the bytes, whether or not we
-are in UTF-8 mode. */
-
-else
-  {
-  while (length-- > 0)
-    {
-    if (eptr >= md->end_subject) return -2;   /* Partial match */
-    if (UCHAR21INCTEST(p) != UCHAR21INCTEST(eptr)) return -1;
-    }
-  }
-
-return (int)(eptr - eptr_start);
-}
-
-
-
-/***************************************************************************
-****************************************************************************
-                   RECURSION IN THE match() FUNCTION
-
-The match() function is highly recursive, though not every recursive call
-increases the recursive depth. Nevertheless, some regular expressions can cause
-it to recurse to a great depth. I was writing for Unix, so I just let it call
-itself recursively. This uses the stack for saving everything that has to be
-saved for a recursive call. On Unix, the stack can be large, and this works
-fine.
-
-It turns out that on some non-Unix-like systems there are problems with
-programs that use a lot of stack. (This despite the fact that every last chip
-has oodles of memory these days, and techniques for extending the stack have
-been known for decades.) So....
-
-There is a fudge, triggered by defining NO_RECURSE, which avoids recursive
-calls by keeping local variables that need to be preserved in blocks of memory
-obtained from malloc() instead instead of on the stack. Macros are used to
-achieve this so that the actual code doesn't look very different to what it
-always used to.
-
-The original heap-recursive code used longjmp(). However, it seems that this
-can be very slow on some operating systems. Following a suggestion from Stan
-Switzer, the use of longjmp() has been abolished, at the cost of having to
-provide a unique number for each call to RMATCH. There is no way of generating
-a sequence of numbers at compile time in C. I have given them names, to make
-them stand out more clearly.
-
-Crude tests on x86 Linux show a small speedup of around 5-8%. However, on
-FreeBSD, avoiding longjmp() more than halves the time taken to run the standard
-tests. Furthermore, not using longjmp() means that local dynamic variables
-don't have indeterminate values; this has meant that the frame size can be
-reduced because the result can be "passed back" by straight setting of the
-variable instead of being passed in the frame.
-****************************************************************************
-***************************************************************************/
-
-/* Numbers for RMATCH calls. When this list is changed, the code at HEAP_RETURN
-below must be updated in sync.  */
-
-enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM6,  RM7,  RM8,  RM9,  RM10,
-       RM11,  RM12, RM13, RM14, RM15, RM16, RM17, RM18, RM19, RM20,
-       RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
-       RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
-       RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
-       RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
-       RM61,  RM62, RM63, RM64, RM65, RM66, RM67 };
-
-/* These versions of the macros use the stack, as normal. There are debugging
-versions and production versions. Note that the "rw" argument of RMATCH isn't
-actually used in this definition. */
-
-#ifndef NO_RECURSE
-#define REGISTER register
-
-#ifdef PCRE_DEBUG
-#define RMATCH(ra,rb,rc,rd,re,rw) \
-  { \
-  printf("match() called in line %d\n", __LINE__); \
-  rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
-  printf("to line %d\n", __LINE__); \
-  }
-#define RRETURN(ra) \
-  { \
-  printf("match() returned %d from line %d\n", ra, __LINE__); \
-  return ra; \
-  }
-#else
-#define RMATCH(ra,rb,rc,rd,re,rw) \
-  rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
-#define RRETURN(ra) return ra
-#endif
-
-#else
-
-
-/* These versions of the macros manage a private stack on the heap. Note that
-the "rd" argument of RMATCH isn't actually used in this definition. It's the md
-argument of match(), which never changes. */
-
-#define REGISTER
-
-#define RMATCH(ra,rb,rc,rd,re,rw)\
-  {\
-  heapframe *newframe = frame->Xnextframe;\
-  if (newframe == NULL)\
-    {\
-    newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
-    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
-    newframe->Xnextframe = NULL;\
-    frame->Xnextframe = newframe;\
-    }\
-  frame->Xwhere = rw;\
-  newframe->Xeptr = ra;\
-  newframe->Xecode = rb;\
-  newframe->Xmstart = mstart;\
-  newframe->Xoffset_top = rc;\
-  newframe->Xeptrb = re;\
-  newframe->Xrdepth = frame->Xrdepth + 1;\
-  newframe->Xprevframe = frame;\
-  frame = newframe;\
-  DPRINTF(("restarting from line %d\n", __LINE__));\
-  goto HEAP_RECURSE;\
-  L_##rw:\
-  DPRINTF(("jumped back to line %d\n", __LINE__));\
-  }
-
-#define RRETURN(ra)\
-  {\
-  heapframe *oldframe = frame;\
-  frame = oldframe->Xprevframe;\
-  if (frame != NULL)\
-    {\
-    rrc = ra;\
-    goto HEAP_RETURN;\
-    }\
-  return ra;\
-  }
-
-
-/* Structure for remembering the local variables in a private frame */
-
-typedef struct heapframe {
-  struct heapframe *Xprevframe;
-  struct heapframe *Xnextframe;
-
-  /* Function arguments that may change */
-
-  PCRE_PUCHAR Xeptr;
-  const pcre_uchar *Xecode;
-  PCRE_PUCHAR Xmstart;
-  int Xoffset_top;
-  eptrblock *Xeptrb;
-  unsigned int Xrdepth;
-
-  /* Function local variables */
-
-  PCRE_PUCHAR Xcallpat;
-#ifdef SUPPORT_UTF
-  PCRE_PUCHAR Xcharptr;
-#endif
-  PCRE_PUCHAR Xdata;
-  PCRE_PUCHAR Xnext;
-  PCRE_PUCHAR Xpp;
-  PCRE_PUCHAR Xprev;
-  PCRE_PUCHAR Xsaved_eptr;
-
-  recursion_info Xnew_recursive;
-
-  BOOL Xcur_is_word;
-  BOOL Xcondition;
-  BOOL Xprev_is_word;
-
-#ifdef SUPPORT_UCP
-  int Xprop_type;
-  unsigned int Xprop_value;
-  int Xprop_fail_result;
-  int Xoclength;
-  pcre_uchar Xocchars[6];
-#endif
-
-  int Xcodelink;
-  int Xctype;
-  unsigned int Xfc;
-  int Xfi;
-  int Xlength;
-  int Xmax;
-  int Xmin;
-  unsigned int Xnumber;
-  int Xoffset;
-  unsigned int Xop;
-  pcre_int32 Xsave_capture_last;
-  int Xsave_offset1, Xsave_offset2, Xsave_offset3;
-  int Xstacksave[REC_STACK_SAVE_MAX];
-
-  eptrblock Xnewptrb;
-
-  /* Where to jump back to */
-
-  int Xwhere;
-
-} heapframe;
-
-#endif
-
-
-/***************************************************************************
-***************************************************************************/
-
-
-
-/*************************************************
-*         Match from current position            *
-*************************************************/
-
-/* This function is called recursively in many circumstances. Whenever it
-returns a negative (error) response, the outer incarnation must also return the
-same response. */
-
-/* These macros pack up tests that are used for partial matching, and which
-appear several times in the code. We set the "hit end" flag if the pointer is
-at the end of the subject and also past the start of the subject (i.e.
-something has been matched). For hard partial matching, we then return
-immediately. The second one is used when we already know we are past the end of
-the subject. */
-
-#define CHECK_PARTIAL()\
-  if (md->partial != 0 && eptr >= md->end_subject && \
-      eptr > md->start_used_ptr) \
-    { \
-    md->hitend = TRUE; \
-    if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
-    }
-
-#define SCHECK_PARTIAL()\
-  if (md->partial != 0 && eptr > md->start_used_ptr) \
-    { \
-    md->hitend = TRUE; \
-    if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
-    }
-
-
-/* Performance note: It might be tempting to extract commonly used fields from
-the md structure (e.g. utf, end_subject) into individual variables to improve
-performance. Tests using gcc on a SPARC disproved this; in the first case, it
-made performance worse.
-
-Arguments:
-   eptr        pointer to current character in subject
-   ecode       pointer to current position in compiled code
-   mstart      pointer to the current match start position (can be modified
-                 by encountering \K)
-   offset_top  current top pointer
-   md          pointer to "static" info for the match
-   eptrb       pointer to chain of blocks containing eptr at start of
-                 brackets - for testing for empty matches
-   rdepth      the recursion depth
-
-Returns:       MATCH_MATCH if matched            )  these values are >= 0
-               MATCH_NOMATCH if failed to match  )
-               a negative MATCH_xxx value for PRUNE, SKIP, etc
-               a negative PCRE_ERROR_xxx value if aborted by an error condition
-                 (e.g. stopped by repeated call or recursion limit)
-*/
-
-static int
-match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
-  PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
-  unsigned int rdepth)
-{
-/* These variables do not need to be preserved over recursion in this function,
-so they can be ordinary variables in all cases. Mark some of them with
-"register" because they are used a lot in loops. */
-
-register int  rrc;         /* Returns from recursive calls */
-register int  i;           /* Used for loops not involving calls to RMATCH() */
-register pcre_uint32 c;    /* Character values not kept over RMATCH() calls */
-register BOOL utf;         /* Local copy of UTF flag for speed */
-
-BOOL minimize, possessive; /* Quantifier options */
-BOOL caseless;
-int condcode;
-
-/* When recursion is not being used, all "local" variables that have to be
-preserved over calls to RMATCH() are part of a "frame". We set up the top-level
-frame on the stack here; subsequent instantiations are obtained from the heap
-whenever RMATCH() does a "recursion". See the macro definitions above. Putting
-the top-level on the stack rather than malloc-ing them all gives a performance
-boost in many cases where there is not much "recursion". */
-
-#ifdef NO_RECURSE
-heapframe *frame = (heapframe *)md->match_frames_base;
-
-/* Copy in the original argument variables */
-
-frame->Xeptr = eptr;
-frame->Xecode = ecode;
-frame->Xmstart = mstart;
-frame->Xoffset_top = offset_top;
-frame->Xeptrb = eptrb;
-frame->Xrdepth = rdepth;
-
-/* This is where control jumps back to to effect "recursion" */
-
-HEAP_RECURSE:
-
-/* Macros make the argument variables come from the current frame */
-
-#define eptr               frame->Xeptr
-#define ecode              frame->Xecode
-#define mstart             frame->Xmstart
-#define offset_top         frame->Xoffset_top
-#define eptrb              frame->Xeptrb
-#define rdepth             frame->Xrdepth
-
-/* Ditto for the local variables */
-
-#ifdef SUPPORT_UTF
-#define charptr            frame->Xcharptr
-#endif
-#define callpat            frame->Xcallpat
-#define codelink           frame->Xcodelink
-#define data               frame->Xdata
-#define next               frame->Xnext
-#define pp                 frame->Xpp
-#define prev               frame->Xprev
-#define saved_eptr         frame->Xsaved_eptr
-
-#define new_recursive      frame->Xnew_recursive
-
-#define cur_is_word        frame->Xcur_is_word
-#define condition          frame->Xcondition
-#define prev_is_word       frame->Xprev_is_word
-
-#ifdef SUPPORT_UCP
-#define prop_type          frame->Xprop_type
-#define prop_value         frame->Xprop_value
-#define prop_fail_result   frame->Xprop_fail_result
-#define oclength           frame->Xoclength
-#define occhars            frame->Xocchars
-#endif
-
-#define ctype              frame->Xctype
-#define fc                 frame->Xfc
-#define fi                 frame->Xfi
-#define length             frame->Xlength
-#define max                frame->Xmax
-#define min                frame->Xmin
-#define number             frame->Xnumber
-#define offset             frame->Xoffset
-#define op                 frame->Xop
-#define save_capture_last  frame->Xsave_capture_last
-#define save_offset1       frame->Xsave_offset1
-#define save_offset2       frame->Xsave_offset2
-#define save_offset3       frame->Xsave_offset3
-#define stacksave          frame->Xstacksave
-
-#define newptrb            frame->Xnewptrb
-
-/* When recursion is being used, local variables are allocated on the stack and
-get preserved during recursion in the normal way. In this environment, fi and
-i, and fc and c, can be the same variables. */
-
-#else         /* NO_RECURSE not defined */
-#define fi i
-#define fc c
-
-/* Many of the following variables are used only in small blocks of the code.
-My normal style of coding would have declared them within each of those blocks.
-However, in order to accommodate the version of this code that uses an external
-"stack" implemented on the heap, it is easier to declare them all here, so the
-declarations can be cut out in a block. The only declarations within blocks
-below are for variables that do not have to be preserved over a recursive call
-to RMATCH(). */
-
-#ifdef SUPPORT_UTF
-const pcre_uchar *charptr;
-#endif
-const pcre_uchar *callpat;
-const pcre_uchar *data;
-const pcre_uchar *next;
-PCRE_PUCHAR       pp;
-const pcre_uchar *prev;
-PCRE_PUCHAR       saved_eptr;
-
-recursion_info new_recursive;
-
-BOOL cur_is_word;
-BOOL condition;
-BOOL prev_is_word;
-
-#ifdef SUPPORT_UCP
-int prop_type;
-unsigned int prop_value;
-int prop_fail_result;
-int oclength;
-pcre_uchar occhars[6];
-#endif
-
-int codelink;
-int ctype;
-int length;
-int max;
-int min;
-unsigned int number;
-int offset;
-unsigned int op;
-pcre_int32 save_capture_last;
-int save_offset1, save_offset2, save_offset3;
-int stacksave[REC_STACK_SAVE_MAX];
-
-eptrblock newptrb;
-
-/* There is a special fudge for calling match() in a way that causes it to
-measure the size of its basic stack frame when the stack is being used for
-recursion. The second argument (ecode) being NULL triggers this behaviour. It
-cannot normally ever be NULL. The return is the negated value of the frame
-size. */
-
-if (ecode == NULL)
-  {
-  if (rdepth == 0)
-    return match((PCRE_PUCHAR)&rdepth, NULL, NULL, 0, NULL, NULL, 1);
-  else
-    {
-    int len = (int)((char *)&rdepth - (char *)eptr);
-    return (len > 0)? -len : len;
-    }
-  }
-#endif     /* NO_RECURSE */
-
-/* To save space on the stack and in the heap frame, I have doubled up on some
-of the local variables that are used only in localised parts of the code, but
-still need to be preserved over recursive calls of match(). These macros define
-the alternative names that are used. */
-
-#define allow_zero    cur_is_word
-#define cbegroup      condition
-#define code_offset   codelink
-#define condassert    condition
-#define matched_once  prev_is_word
-#define foc           number
-#define save_mark     data
-
-/* These statements are here to stop the compiler complaining about unitialized
-variables. */
-
-#ifdef SUPPORT_UCP
-prop_value = 0;
-prop_fail_result = 0;
-#endif
-
-
-/* This label is used for tail recursion, which is used in a few cases even
-when NO_RECURSE is not defined, in order to reduce the amount of stack that is
-used. Thanks to Ian Taylor for noticing this possibility and sending the
-original patch. */
-
-TAIL_RECURSE:
-
-/* OK, now we can get on with the real code of the function. Recursive calls
-are specified by the macro RMATCH and RRETURN is used to return. When
-NO_RECURSE is *not* defined, these just turn into a recursive call to match()
-and a "return", respectively (possibly with some debugging if PCRE_DEBUG is
-defined). However, RMATCH isn't like a function call because it's quite a
-complicated macro. It has to be used in one particular way. This shouldn't,
-however, impact performance when true recursion is being used. */
-
-#ifdef SUPPORT_UTF
-utf = md->utf;       /* Local copy of the flag */
-#else
-utf = FALSE;
-#endif
-
-/* First check that we haven't called match() too many times, or that we
-haven't exceeded the recursive call limit. */
-
-if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
-if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
-
-/* At the start of a group with an unlimited repeat that may match an empty
-string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
-done this way to save having to use another function argument, which would take
-up space on the stack. See also MATCH_CONDASSERT below.
-
-When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
-such remembered pointers, to be checked when we hit the closing ket, in order
-to break infinite loops that match no characters. When match() is called in
-other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
-NOT be used with tail recursion, because the memory block that is used is on
-the stack, so a new one may be required for each match(). */
-
-if (md->match_function_type == MATCH_CBEGROUP)
-  {
-  newptrb.epb_saved_eptr = eptr;
-  newptrb.epb_prev = eptrb;
-  eptrb = &newptrb;
-  md->match_function_type = 0;
-  }
-
-/* Now start processing the opcodes. */
-
-for (;;)
-  {
-  minimize = possessive = FALSE;
-  op = *ecode;
-
-  switch(op)
-    {
-    case OP_MARK:
-    md->nomatch_mark = ecode + 2;
-    md->mark = NULL;    /* In case previously set by assertion */
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
-      eptrb, RM55);
-    if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT || rrc == MATCH_KETRPOS) &&
-         md->mark == NULL) md->mark = ecode + 2;
-
-    /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
-    argument, and we must check whether that argument matches this MARK's
-    argument. It is passed back in md->start_match_ptr (an overloading of that
-    variable). If it does match, we reset that variable to the current subject
-    position and return MATCH_SKIP. Otherwise, pass back the return code
-    unaltered. */
-
-    else if (rrc == MATCH_SKIP_ARG &&
-        STRCMP_UC_UC_TEST(ecode + 2, md->start_match_ptr) == 0)
-      {
-      md->start_match_ptr = eptr;
-      RRETURN(MATCH_SKIP);
-      }
-    RRETURN(rrc);
-
-    case OP_FAIL:
-    RRETURN(MATCH_NOMATCH);
-
-    case OP_COMMIT:
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-      eptrb, RM52);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    RRETURN(MATCH_COMMIT);
-
-    case OP_PRUNE:
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-      eptrb, RM51);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    RRETURN(MATCH_PRUNE);
-
-    case OP_PRUNE_ARG:
-    md->nomatch_mark = ecode + 2;
-    md->mark = NULL;    /* In case previously set by assertion */
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
-      eptrb, RM56);
-    if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
-         md->mark == NULL) md->mark = ecode + 2;
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    RRETURN(MATCH_PRUNE);
-
-    case OP_SKIP:
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-      eptrb, RM53);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    md->start_match_ptr = eptr;   /* Pass back current position */
-    RRETURN(MATCH_SKIP);
-
-    /* Note that, for Perl compatibility, SKIP with an argument does NOT set
-    nomatch_mark. When a pattern match ends with a SKIP_ARG for which there was
-    not a matching mark, we have to re-run the match, ignoring the SKIP_ARG
-    that failed and any that precede it (either they also failed, or were not
-    triggered). To do this, we maintain a count of executed SKIP_ARGs. If a
-    SKIP_ARG gets to top level, the match is re-run with md->ignore_skip_arg
-    set to the count of the one that failed. */
-
-    case OP_SKIP_ARG:
-    md->skip_arg_count++;
-    if (md->skip_arg_count <= md->ignore_skip_arg)
-      {
-      ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
-      break;
-      }
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
-      eptrb, RM57);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-
-    /* Pass back the current skip name by overloading md->start_match_ptr and
-    returning the special MATCH_SKIP_ARG return code. This will either be
-    caught by a matching MARK, or get to the top, where it causes a rematch
-    with md->ignore_skip_arg set to the value of md->skip_arg_count. */
-
-    md->start_match_ptr = ecode + 2;
-    RRETURN(MATCH_SKIP_ARG);
-
-    /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
-    the branch in which it occurs can be determined. Overload the start of
-    match pointer to do this. */
-
-    case OP_THEN:
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-      eptrb, RM54);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    md->start_match_ptr = ecode;
-    RRETURN(MATCH_THEN);
-
-    case OP_THEN_ARG:
-    md->nomatch_mark = ecode + 2;
-    md->mark = NULL;    /* In case previously set by assertion */
-    RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
-      md, eptrb, RM58);
-    if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
-         md->mark == NULL) md->mark = ecode + 2;
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    md->start_match_ptr = ecode;
-    RRETURN(MATCH_THEN);
-
-    /* Handle an atomic group that does not contain any capturing parentheses.
-    This can be handled like an assertion. Prior to 8.13, all atomic groups
-    were handled this way. In 8.13, the code was changed as below for ONCE, so
-    that backups pass through the group and thereby reset captured values.
-    However, this uses a lot more stack, so in 8.20, atomic groups that do not
-    contain any captures generate OP_ONCE_NC, which can be handled in the old,
-    less stack intensive way.
-
-    Check the alternative branches in turn - the matching won't pass the KET
-    for this kind of subpattern. If any one branch matches, we carry on as at
-    the end of a normal bracket, leaving the subject pointer, but resetting
-    the start-of-match value in case it was changed by \K. */
-
-    case OP_ONCE_NC:
-    prev = ecode;
-    saved_eptr = eptr;
-    save_mark = md->mark;
-    do
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
-      if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
-        {
-        mstart = md->start_match_ptr;
-        break;
-        }
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode += GET(ecode,1);
-      md->mark = save_mark;
-      }
-    while (*ecode == OP_ALT);
-
-    /* If hit the end of the group (which could be repeated), fail */
-
-    if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
-
-    /* Continue as from after the group, updating the offsets high water
-    mark, since extracts may have been taken. */
-
-    do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
-
-    offset_top = md->end_offset_top;
-    eptr = md->end_match_ptr;
-
-    /* For a non-repeating ket, just continue at this level. This also
-    happens for a repeating ket if no characters were matched in the group.
-    This is the forcible breaking of infinite loops as implemented in Perl
-    5.005. */
-
-    if (*ecode == OP_KET || eptr == saved_eptr)
-      {
-      ecode += 1+LINK_SIZE;
-      break;
-      }
-
-    /* The repeating kets try the rest of the pattern or restart from the
-    preceding bracket, in the appropriate order. The second "call" of match()
-    uses tail recursion, to avoid using another stack frame. */
-
-    if (*ecode == OP_KETRMIN)
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode = prev;
-      goto TAIL_RECURSE;
-      }
-    else  /* OP_KETRMAX */
-      {
-      RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode += 1 + LINK_SIZE;
-      goto TAIL_RECURSE;
-      }
-    /* Control never gets here */
-
-    /* Handle a capturing bracket, other than those that are possessive with an
-    unlimited repeat. If there is space in the offset vector, save the current
-    subject position in the working slot at the top of the vector. We mustn't
-    change the current values of the data slot, because they may be set from a
-    previous iteration of this group, and be referred to by a reference inside
-    the group. A failure to match might occur after the group has succeeded,
-    if something later on doesn't match. For this reason, we need to restore
-    the working value and also the values of the final offsets, in case they
-    were set by a previous iteration of the same bracket.
-
-    If there isn't enough space in the offset vector, treat this as if it were
-    a non-capturing bracket. Don't worry about setting the flag for the error
-    case here; that is handled in the code for KET. */
-
-    case OP_CBRA:
-    case OP_SCBRA:
-    number = GET2(ecode, 1+LINK_SIZE);
-    offset = number << 1;
-
-#ifdef PCRE_DEBUG
-    printf("start bracket %d\n", number);
-    printf("subject=");
-    pchars(eptr, 16, TRUE, md);
-    printf("\n");
-#endif
-
-    if (offset < md->offset_max)
-      {
-      save_offset1 = md->offset_vector[offset];
-      save_offset2 = md->offset_vector[offset+1];
-      save_offset3 = md->offset_vector[md->offset_end - number];
-      save_capture_last = md->capture_last;
-      save_mark = md->mark;
-
-      DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
-      md->offset_vector[md->offset_end - number] =
-        (int)(eptr - md->start_subject);
-
-      for (;;)
-        {
-        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
-        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-          eptrb, RM1);
-        if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
-
-        /* If we backed up to a THEN, check whether it is within the current
-        branch by comparing the address of the THEN that is passed back with
-        the end of the branch. If it is within the current branch, and the
-        branch is one of two or more alternatives (it either starts or ends
-        with OP_ALT), we have reached the limit of THEN's action, so convert
-        the return code to NOMATCH, which will cause normal backtracking to
-        happen from now on. Otherwise, THEN is passed back to an outer
-        alternative. This implements Perl's treatment of parenthesized groups,
-        where a group not containing | does not affect the current alternative,
-        that is, (X) is NOT the same as (X|(*F)). */
-
-        if (rrc == MATCH_THEN)
-          {
-          next = ecode + GET(ecode,1);
-          if (md->start_match_ptr < next &&
-              (*ecode == OP_ALT || *next == OP_ALT))
-            rrc = MATCH_NOMATCH;
-          }
-
-        /* Anything other than NOMATCH is passed back. */
-
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        md->capture_last = save_capture_last;
-        ecode += GET(ecode, 1);
-        md->mark = save_mark;
-        if (*ecode != OP_ALT) break;
-        }
-
-      DPRINTF(("bracket %d failed\n", number));
-      md->offset_vector[offset] = save_offset1;
-      md->offset_vector[offset+1] = save_offset2;
-      md->offset_vector[md->offset_end - number] = save_offset3;
-
-      /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
-
-      RRETURN(rrc);
-      }
-
-    /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
-    as a non-capturing bracket. */
-
-    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-
-    DPRINTF(("insufficient capture room: treat as non-capturing\n"));
-
-    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-
-    /* Non-capturing or atomic group, except for possessive with unlimited
-    repeat and ONCE group with no captures. Loop for all the alternatives.
-
-    When we get to the final alternative within the brackets, we used to return
-    the result of a recursive call to match() whatever happened so it was
-    possible to reduce stack usage by turning this into a tail recursion,
-    except in the case of a possibly empty group. However, now that there is
-    the possiblity of (*THEN) occurring in the final alternative, this
-    optimization is no longer always possible.
-
-    We can optimize if we know there are no (*THEN)s in the pattern; at present
-    this is the best that can be done.
-
-    MATCH_ONCE is returned when the end of an atomic group is successfully
-    reached, but subsequent matching fails. It passes back up the tree (causing
-    captured values to be reset) until the original atomic group level is
-    reached. This is tested by comparing md->once_target with the start of the
-    group. At this point, the return is converted into MATCH_NOMATCH so that
-    previous backup points can be taken. */
-
-    case OP_ONCE:
-    case OP_BRA:
-    case OP_SBRA:
-    DPRINTF(("start non-capturing bracket\n"));
-
-    for (;;)
-      {
-      if (op >= OP_SBRA || op == OP_ONCE)
-        md->match_function_type = MATCH_CBEGROUP;
-
-      /* If this is not a possibly empty group, and there are no (*THEN)s in
-      the pattern, and this is the final alternative, optimize as described
-      above. */
-
-      else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
-        {
-        ecode += PRIV(OP_lengths)[*ecode];
-        goto TAIL_RECURSE;
-        }
-
-      /* In all other cases, we have to make another call to match(). */
-
-      save_mark = md->mark;
-      save_capture_last = md->capture_last;
-      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
-        RM2);
-
-      /* See comment in the code for capturing groups above about handling
-      THEN. */
-
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      if (rrc != MATCH_NOMATCH)
-        {
-        if (rrc == MATCH_ONCE)
-          {
-          const pcre_uchar *scode = ecode;
-          if (*scode != OP_ONCE)           /* If not at start, find it */
-            {
-            while (*scode == OP_ALT) scode += GET(scode, 1);
-            scode -= GET(scode, 1);
-            }
-          if (md->once_target == scode) rrc = MATCH_NOMATCH;
-          }
-        RRETURN(rrc);
-        }
-      ecode += GET(ecode, 1);
-      md->mark = save_mark;
-      if (*ecode != OP_ALT) break;
-      md->capture_last = save_capture_last;
-      }
-
-    RRETURN(MATCH_NOMATCH);
-
-    /* Handle possessive capturing brackets with an unlimited repeat. We come
-    here from BRAZERO with allow_zero set TRUE. The offset_vector values are
-    handled similarly to the normal case above. However, the matching is
-    different. The end of these brackets will always be OP_KETRPOS, which
-    returns MATCH_KETRPOS without going further in the pattern. By this means
-    we can handle the group by iteration rather than recursion, thereby
-    reducing the amount of stack needed. */
-
-    case OP_CBRAPOS:
-    case OP_SCBRAPOS:
-    allow_zero = FALSE;
-
-    POSSESSIVE_CAPTURE:
-    number = GET2(ecode, 1+LINK_SIZE);
-    offset = number << 1;
-
-#ifdef PCRE_DEBUG
-    printf("start possessive bracket %d\n", number);
-    printf("subject=");
-    pchars(eptr, 16, TRUE, md);
-    printf("\n");
-#endif
-
-    if (offset >= md->offset_max) goto POSSESSIVE_NON_CAPTURE;
-
-    matched_once = FALSE;
-    code_offset = (int)(ecode - md->start_code);
-
-    save_offset1 = md->offset_vector[offset];
-    save_offset2 = md->offset_vector[offset+1];
-    save_offset3 = md->offset_vector[md->offset_end - number];
-    save_capture_last = md->capture_last;
-
-    DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
-
-    /* Each time round the loop, save the current subject position for use
-    when the group matches. For MATCH_MATCH, the group has matched, so we
-    restart it with a new subject starting position, remembering that we had
-    at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
-    usual. If we haven't matched any alternatives in any iteration, check to
-    see if a previous iteration matched. If so, the group has matched;
-    continue from afterwards. Otherwise it has failed; restore the previous
-    capture values before returning NOMATCH. */
-
-    for (;;)
-      {
-      md->offset_vector[md->offset_end - number] =
-        (int)(eptr - md->start_subject);
-      if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
-      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-        eptrb, RM63);
-      if (rrc == MATCH_KETRPOS)
-        {
-        offset_top = md->end_offset_top;
-        ecode = md->start_code + code_offset;
-        save_capture_last = md->capture_last;
-        matched_once = TRUE;
-        mstart = md->start_match_ptr;    /* In case \K changed it */
-        if (eptr == md->end_match_ptr)   /* Matched an empty string */
-          {
-          do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
-          break;
-          }
-        eptr = md->end_match_ptr;
-        continue;
-        }
-
-      /* See comment in the code for capturing groups above about handling
-      THEN. */
-
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      md->capture_last = save_capture_last;
-      ecode += GET(ecode, 1);
-      if (*ecode != OP_ALT) break;
-      }
-
-    if (!matched_once)
-      {
-      md->offset_vector[offset] = save_offset1;
-      md->offset_vector[offset+1] = save_offset2;
-      md->offset_vector[md->offset_end - number] = save_offset3;
-      }
-
-    if (allow_zero || matched_once)
-      {
-      ecode += 1 + LINK_SIZE;
-      break;
-      }
-
-    RRETURN(MATCH_NOMATCH);
-
-    /* Non-capturing possessive bracket with unlimited repeat. We come here
-    from BRAZERO with allow_zero = TRUE. The code is similar to the above,
-    without the capturing complication. It is written out separately for speed
-    and cleanliness. */
-
-    case OP_BRAPOS:
-    case OP_SBRAPOS:
-    allow_zero = FALSE;
-
-    POSSESSIVE_NON_CAPTURE:
-    matched_once = FALSE;
-    code_offset = (int)(ecode - md->start_code);
-    save_capture_last = md->capture_last;
-
-    for (;;)
-      {
-      if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
-      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-        eptrb, RM48);
-      if (rrc == MATCH_KETRPOS)
-        {
-        offset_top = md->end_offset_top;
-        ecode = md->start_code + code_offset;
-        matched_once = TRUE;
-        mstart = md->start_match_ptr;   /* In case \K reset it */
-        if (eptr == md->end_match_ptr)  /* Matched an empty string */
-          {
-          do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
-          break;
-          }
-        eptr = md->end_match_ptr;
-        continue;
-        }
-
-      /* See comment in the code for capturing groups above about handling
-      THEN. */
-
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode += GET(ecode, 1);
-      if (*ecode != OP_ALT) break;
-      md->capture_last = save_capture_last;
-      }
-
-    if (matched_once || allow_zero)
-      {
-      ecode += 1 + LINK_SIZE;
-      break;
-      }
-    RRETURN(MATCH_NOMATCH);
-
-    /* Control never reaches here. */
-
-    /* Conditional group: compilation checked that there are no more than two
-    branches. If the condition is false, skipping the first branch takes us
-    past the end of the item if there is only one branch, but that's exactly
-    what we want. */
-
-    case OP_COND:
-    case OP_SCOND:
-
-    /* The variable codelink will be added to ecode when the condition is
-    false, to get to the second branch. Setting it to the offset to the ALT
-    or KET, then incrementing ecode achieves this effect. We now have ecode
-    pointing to the condition or callout. */
-
-    codelink = GET(ecode, 1);   /* Offset to the second branch */
-    ecode += 1 + LINK_SIZE;     /* From this opcode */
-
-    /* Because of the way auto-callout works during compile, a callout item is
-    inserted between OP_COND and an assertion condition. */
-
-    if (*ecode == OP_CALLOUT)
-      {
-      if (PUBL(callout) != NULL)
-        {
-        PUBL(callout_block) cb;
-        cb.version          = 2;   /* Version 1 of the callout block */
-        cb.callout_number   = ecode[1];
-        cb.offset_vector    = md->offset_vector;
-#if defined COMPILE_PCRE8
-        cb.subject          = (PCRE_SPTR)md->start_subject;
-#elif defined COMPILE_PCRE16
-        cb.subject          = (PCRE_SPTR16)md->start_subject;
-#elif defined COMPILE_PCRE32
-        cb.subject          = (PCRE_SPTR32)md->start_subject;
-#endif
-        cb.subject_length   = (int)(md->end_subject - md->start_subject);
-        cb.start_match      = (int)(mstart - md->start_subject);
-        cb.current_position = (int)(eptr - md->start_subject);
-        cb.pattern_position = GET(ecode, 2);
-        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
-        cb.capture_top      = offset_top/2;
-        cb.capture_last     = md->capture_last & CAPLMASK;
-        /* Internal change requires this for API compatibility. */
-        if (cb.capture_last == 0) cb.capture_last = -1;
-        cb.callout_data     = md->callout_data;
-        cb.mark             = md->nomatch_mark;
-        if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
-        if (rrc < 0) RRETURN(rrc);
-        }
-
-      /* Advance ecode past the callout, so it now points to the condition. We
-      must adjust codelink so that the value of ecode+codelink is unchanged. */
-
-      ecode += PRIV(OP_lengths)[OP_CALLOUT];
-      codelink -= PRIV(OP_lengths)[OP_CALLOUT];
-      }
-
-    /* Test the various possible conditions */
-
-    condition = FALSE;
-    switch(condcode = *ecode)
-      {
-      case OP_RREF:         /* Numbered group recursion test */
-      if (md->recursive != NULL)     /* Not recursing => FALSE */
-        {
-        unsigned int recno = GET2(ecode, 1);   /* Recursion group number*/
-        condition = (recno == RREF_ANY || recno == md->recursive->group_num);
-        }
-      break;
-
-      case OP_DNRREF:       /* Duplicate named group recursion test */
-      if (md->recursive != NULL)
-        {
-        int count = GET2(ecode, 1 + IMM2_SIZE);
-        pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
-        while (count-- > 0)
-          {
-          unsigned int recno = GET2(slot, 0);
-          condition = recno == md->recursive->group_num;
-          if (condition) break;
-          slot += md->name_entry_size;
-          }
-        }
-      break;
-
-      case OP_CREF:         /* Numbered group used test */
-      offset = GET2(ecode, 1) << 1;  /* Doubled ref number */
-      condition = offset < offset_top && md->offset_vector[offset] >= 0;
-      break;
-
-      case OP_DNCREF:      /* Duplicate named group used test */
-        {
-        int count = GET2(ecode, 1 + IMM2_SIZE);
-        pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
-        while (count-- > 0)
-          {
-          offset = GET2(slot, 0) << 1;
-          condition = offset < offset_top && md->offset_vector[offset] >= 0;
-          if (condition) break;
-          slot += md->name_entry_size;
-          }
-        }
-      break;
-
-      case OP_DEF:     /* DEFINE - always false */
-      case OP_FAIL:    /* From optimized (?!) condition */
-      break;
-
-      /* The condition is an assertion. Call match() to evaluate it - setting
-      md->match_function_type to MATCH_CONDASSERT causes it to stop at the end
-      of an assertion. */
-
-      default:
-      md->match_function_type = MATCH_CONDASSERT;
-      RMATCH(eptr, ecode, offset_top, md, NULL, RM3);
-      if (rrc == MATCH_MATCH)
-        {
-        if (md->end_offset_top > offset_top)
-          offset_top = md->end_offset_top;  /* Captures may have happened */
-        condition = TRUE;
-
-        /* Advance ecode past the assertion to the start of the first branch,
-        but adjust it so that the general choosing code below works. If the
-        assertion has a quantifier that allows zero repeats we must skip over
-        the BRAZERO. This is a lunatic thing to do, but somebody did! */
-
-        if (*ecode == OP_BRAZERO) ecode++;
-        ecode += GET(ecode, 1);
-        while (*ecode == OP_ALT) ecode += GET(ecode, 1);
-        ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];
-        }
-
-      /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
-      assertion; it is therefore treated as NOMATCH. Any other return is an
-      error. */
-
-      else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
-        {
-        RRETURN(rrc);         /* Need braces because of following else */
-        }
-      break;
-      }
-
-    /* Choose branch according to the condition */
-
-    ecode += condition? PRIV(OP_lengths)[condcode] : codelink;
-
-    /* We are now at the branch that is to be obeyed. As there is only one, we
-    can use tail recursion to avoid using another stack frame, except when
-    there is unlimited repeat of a possibly empty group. In the latter case, a
-    recursive call to match() is always required, unless the second alternative
-    doesn't exist, in which case we can just plough on. Note that, for
-    compatibility with Perl, the | in a conditional group is NOT treated as
-    creating two alternatives. If a THEN is encountered in the branch, it
-    propagates out to the enclosing alternative (unless nested in a deeper set
-    of alternatives, of course). */
-
-    if (condition || ecode[-(1+LINK_SIZE)] == OP_ALT)
-      {
-      if (op != OP_SCOND)
-        {
-        goto TAIL_RECURSE;
-        }
-
-      md->match_function_type = MATCH_CBEGROUP;
-      RMATCH(eptr, ecode, offset_top, md, eptrb, RM49);
-      RRETURN(rrc);
-      }
-
-     /* Condition false & no alternative; continue after the group. */
-
-    else
-      {
-      }
-    break;
-
-
-    /* Before OP_ACCEPT there may be any number of OP_CLOSE opcodes,
-    to close any currently open capturing brackets. */
-
-    case OP_CLOSE:
-    number = GET2(ecode, 1);   /* Must be less than 65536 */
-    offset = number << 1;
-
-#ifdef PCRE_DEBUG
-      printf("end bracket %d at *ACCEPT", number);
-      printf("\n");
-#endif
-
-    md->capture_last = (md->capture_last & OVFLMASK) | number;
-    if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
-      {
-      md->offset_vector[offset] =
-        md->offset_vector[md->offset_end - number];
-      md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
-
-      /* If this group is at or above the current highwater mark, ensure that
-      any groups between the current high water mark and this group are marked
-      unset and then update the high water mark. */
-
-      if (offset >= offset_top)
-        {
-        register int *iptr = md->offset_vector + offset_top;
-        register int *iend = md->offset_vector + offset;
-        while (iptr < iend) *iptr++ = -1;
-        offset_top = offset + 2;
-        }
-      }
-    ecode += 1 + IMM2_SIZE;
-    break;
-
-
-    /* End of the pattern, either real or forced. */
-
-    case OP_END:
-    case OP_ACCEPT:
-    case OP_ASSERT_ACCEPT:
-
-    /* If we have matched an empty string, fail if not in an assertion and not
-    in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
-    is set and we have matched at the start of the subject. In both cases,
-    backtracking will then try other alternatives, if any. */
-
-    if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
-         md->recursive == NULL &&
-         (md->notempty ||
-           (md->notempty_atstart &&
-             mstart == md->start_subject + md->start_offset)))
-      RRETURN(MATCH_NOMATCH);
-
-    /* Otherwise, we have a match. */
-
-    md->end_match_ptr = eptr;           /* Record where we ended */
-    md->end_offset_top = offset_top;    /* and how many extracts were taken */
-    md->start_match_ptr = mstart;       /* and the start (\K can modify) */
-
-    /* For some reason, the macros don't work properly if an expression is
-    given as the argument to RRETURN when the heap is in use. */
-
-    rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
-    RRETURN(rrc);
-
-    /* Assertion brackets. Check the alternative branches in turn - the
-    matching won't pass the KET for an assertion. If any one branch matches,
-    the assertion is true. Lookbehind assertions have an OP_REVERSE item at the
-    start of each branch to move the current point backwards, so the code at
-    this level is identical to the lookahead case. When the assertion is part
-    of a condition, we want to return immediately afterwards. The caller of
-    this incarnation of the match() function will have set MATCH_CONDASSERT in
-    md->match_function type, and one of these opcodes will be the first opcode
-    that is processed. We use a local variable that is preserved over calls to
-    match() to remember this case. */
-
-    case OP_ASSERT:
-    case OP_ASSERTBACK:
-    save_mark = md->mark;
-    if (md->match_function_type == MATCH_CONDASSERT)
-      {
-      condassert = TRUE;
-      md->match_function_type = 0;
-      }
-    else condassert = FALSE;
-
-    /* Loop for each branch */
-
-    do
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
-
-      /* A match means that the assertion is true; break out of the loop
-      that matches its alternatives. */
-
-      if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
-        {
-        mstart = md->start_match_ptr;   /* In case \K reset it */
-        break;
-        }
-
-      /* If not matched, restore the previous mark setting. */
-
-      md->mark = save_mark;
-
-      /* See comment in the code for capturing groups above about handling
-      THEN. */
-
-      if (rrc == MATCH_THEN)
-        {
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          rrc = MATCH_NOMATCH;
-        }
-
-      /* Anything other than NOMATCH causes the entire assertion to fail,
-      passing back the return code. This includes COMMIT, SKIP, PRUNE and an
-      uncaptured THEN, which means they take their normal effect. This
-      consistent approach does not always have exactly the same effect as in
-      Perl. */
-
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      ecode += GET(ecode, 1);
-      }
-    while (*ecode == OP_ALT);   /* Continue for next alternative */
-
-    /* If we have tried all the alternative branches, the assertion has
-    failed. If not, we broke out after a match. */
-
-    if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
-
-    /* If checking an assertion for a condition, return MATCH_MATCH. */
-
-    if (condassert) RRETURN(MATCH_MATCH);
-
-    /* Continue from after a successful assertion, updating the offsets high
-    water mark, since extracts may have been taken during the assertion. */
-
-    do ecode += GET(ecode,1); while (*ecode == OP_ALT);
-    ecode += 1 + LINK_SIZE;
-    offset_top = md->end_offset_top;
-    continue;
-
-    /* Negative assertion: all branches must fail to match for the assertion to
-    succeed. */
-
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK_NOT:
-    save_mark = md->mark;
-    if (md->match_function_type == MATCH_CONDASSERT)
-      {
-      condassert = TRUE;
-      md->match_function_type = 0;
-      }
-    else condassert = FALSE;
-
-    /* Loop for each alternative branch. */
-
-    do
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
-      md->mark = save_mark;   /* Always restore the mark setting */
-
-      switch(rrc)
-        {
-        case MATCH_MATCH:            /* A successful match means */
-        case MATCH_ACCEPT:           /* the assertion has failed. */
-        RRETURN(MATCH_NOMATCH);
-
-        case MATCH_NOMATCH:          /* Carry on with next branch */
-        break;
-
-        /* See comment in the code for capturing groups above about handling
-        THEN. */
-
-        case MATCH_THEN:
-        next = ecode + GET(ecode,1);
-        if (md->start_match_ptr < next &&
-            (*ecode == OP_ALT || *next == OP_ALT))
-          {
-          rrc = MATCH_NOMATCH;
-          break;
-          }
-        /* Otherwise fall through. */
-
-        /* COMMIT, SKIP, PRUNE, and an uncaptured THEN cause the whole
-        assertion to fail to match, without considering any more alternatives.
-        Failing to match means the assertion is true. This is a consistent
-        approach, but does not always have the same effect as in Perl. */
-
-        case MATCH_COMMIT:
-        case MATCH_SKIP:
-        case MATCH_SKIP_ARG:
-        case MATCH_PRUNE:
-        do ecode += GET(ecode,1); while (*ecode == OP_ALT);
-        goto NEG_ASSERT_TRUE;   /* Break out of alternation loop */
-
-        /* Anything else is an error */
-
-        default:
-        RRETURN(rrc);
-        }
-
-      /* Continue with next branch */
-
-      ecode += GET(ecode,1);
-      }
-    while (*ecode == OP_ALT);
-
-    /* All branches in the assertion failed to match. */
-
-    NEG_ASSERT_TRUE:
-    if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
-    ecode += 1 + LINK_SIZE;                /* Continue with current branch */
-    continue;
-
-    /* Move the subject pointer back. This occurs only at the start of
-    each branch of a lookbehind assertion. If we are too close to the start to
-    move back, this match function fails. When working with UTF-8 we move
-    back a number of characters, not bytes. */
-
-    case OP_REVERSE:
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      i = GET(ecode, 1);
-      while (i-- > 0)
-        {
-        eptr--;
-        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
-        BACKCHAR(eptr);
-        }
-      }
-    else
-#endif
-
-    /* No UTF-8 support, or not in UTF-8 mode: count is byte count */
-
-      {
-      eptr -= GET(ecode, 1);
-      if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
-      }
-
-    /* Save the earliest consulted character, then skip to next op code */
-
-    if (eptr < md->start_used_ptr) md->start_used_ptr = eptr;
-    ecode += 1 + LINK_SIZE;
-    break;
-
-    /* The callout item calls an external function, if one is provided, passing
-    details of the match so far. This is mainly for debugging, though the
-    function is able to force a failure. */
-
-    case OP_CALLOUT:
-    if (PUBL(callout) != NULL)
-      {
-      PUBL(callout_block) cb;
-      cb.version          = 2;   /* Version 1 of the callout block */
-      cb.callout_number   = ecode[1];
-      cb.offset_vector    = md->offset_vector;
-#if defined COMPILE_PCRE8
-      cb.subject          = (PCRE_SPTR)md->start_subject;
-#elif defined COMPILE_PCRE16
-      cb.subject          = (PCRE_SPTR16)md->start_subject;
-#elif defined COMPILE_PCRE32
-      cb.subject          = (PCRE_SPTR32)md->start_subject;
-#endif
-      cb.subject_length   = (int)(md->end_subject - md->start_subject);
-      cb.start_match      = (int)(mstart - md->start_subject);
-      cb.current_position = (int)(eptr - md->start_subject);
-      cb.pattern_position = GET(ecode, 2);
-      cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
-      cb.capture_top      = offset_top/2;
-      cb.capture_last     = md->capture_last & CAPLMASK;
-      /* Internal change requires this for API compatibility. */
-      if (cb.capture_last == 0) cb.capture_last = -1;
-      cb.callout_data     = md->callout_data;
-      cb.mark             = md->nomatch_mark;
-      if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
-      if (rrc < 0) RRETURN(rrc);
-      }
-    ecode += 2 + 2*LINK_SIZE;
-    break;
-
-    /* Recursion either matches the current regex, or some subexpression. The
-    offset data is the offset to the starting bracket from the start of the
-    whole pattern. (This is so that it works from duplicated subpatterns.)
-
-    The state of the capturing groups is preserved over recursion, and
-    re-instated afterwards. We don't know how many are started and not yet
-    finished (offset_top records the completed total) so we just have to save
-    all the potential data. There may be up to 65535 such values, which is too
-    large to put on the stack, but using malloc for small numbers seems
-    expensive. As a compromise, the stack is used when there are no more than
-    REC_STACK_SAVE_MAX values to store; otherwise malloc is used.
-
-    There are also other values that have to be saved. We use a chained
-    sequence of blocks that actually live on the stack. Thanks to Robin Houston
-    for the original version of this logic. It has, however, been hacked around
-    a lot, so he is not to blame for the current way it works. */
-
-    case OP_RECURSE:
-      {
-      recursion_info *ri;
-      unsigned int recno;
-
-      callpat = md->start_code + GET(ecode, 1);
-      recno = (callpat == md->start_code)? 0 :
-        GET2(callpat, 1 + LINK_SIZE);
-
-      /* Check for repeating a recursion without advancing the subject pointer.
-      This should catch convoluted mutual recursions. (Some simple cases are
-      caught at compile time.) */
-
-      for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
-        if (recno == ri->group_num && eptr == ri->subject_position)
-          RRETURN(PCRE_ERROR_RECURSELOOP);
-
-      /* Add to "recursing stack" */
-
-      new_recursive.group_num = recno;
-      new_recursive.saved_capture_last = md->capture_last;
-      new_recursive.subject_position = eptr;
-      new_recursive.prevrec = md->recursive;
-      md->recursive = &new_recursive;
-
-      /* Where to continue from afterwards */
-
-      ecode += 1 + LINK_SIZE;
-
-      /* Now save the offset data */
-
-      new_recursive.saved_max = md->offset_end;
-      if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
-        new_recursive.offset_save = stacksave;
-      else
-        {
-        new_recursive.offset_save =
-          (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
-        if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
-        }
-      memcpy(new_recursive.offset_save, md->offset_vector,
-            new_recursive.saved_max * sizeof(int));
-
-      /* OK, now we can do the recursion. After processing each alternative,
-      restore the offset data and the last captured value. If there were nested
-      recursions, md->recursive might be changed, so reset it before looping.
-      */
-
-      DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
-      cbegroup = (*callpat >= OP_SBRA);
-      do
-        {
-        if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
-        RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
-          md, eptrb, RM6);
-        memcpy(md->offset_vector, new_recursive.offset_save,
-            new_recursive.saved_max * sizeof(int));
-        md->capture_last = new_recursive.saved_capture_last;
-        md->recursive = new_recursive.prevrec;
-        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
-          {
-          DPRINTF(("Recursion matched\n"));
-          if (new_recursive.offset_save != stacksave)
-            (PUBL(free))(new_recursive.offset_save);
-
-          /* Set where we got to in the subject, and reset the start in case
-          it was changed by \K. This *is* propagated back out of a recursion,
-          for Perl compatibility. */
-
-          eptr = md->end_match_ptr;
-          mstart = md->start_match_ptr;
-          goto RECURSION_MATCHED;        /* Exit loop; end processing */
-          }
-
-        /* PCRE does not allow THEN, SKIP, PRUNE or COMMIT to escape beyond a
-        recursion; they cause a NOMATCH for the entire recursion. These codes
-        are defined in a range that can be tested for. */
-
-        if (rrc >= MATCH_BACKTRACK_MIN && rrc <= MATCH_BACKTRACK_MAX)
-          {
-          if (new_recursive.offset_save != stacksave)
-            (PUBL(free))(new_recursive.offset_save);
-          RRETURN(MATCH_NOMATCH);
-          }
-
-        /* Any return code other than NOMATCH is an error. */
-
-        if (rrc != MATCH_NOMATCH)
-          {
-          DPRINTF(("Recursion gave error %d\n", rrc));
-          if (new_recursive.offset_save != stacksave)
-            (PUBL(free))(new_recursive.offset_save);
-          RRETURN(rrc);
-          }
-
-        md->recursive = &new_recursive;
-        callpat += GET(callpat, 1);
-        }
-      while (*callpat == OP_ALT);
-
-      DPRINTF(("Recursion didn't match\n"));
-      md->recursive = new_recursive.prevrec;
-      if (new_recursive.offset_save != stacksave)
-        (PUBL(free))(new_recursive.offset_save);
-      RRETURN(MATCH_NOMATCH);
-      }
-
-    RECURSION_MATCHED:
-    break;
-
-    /* An alternation is the end of a branch; scan along to find the end of the
-    bracketed group and go to there. */
-
-    case OP_ALT:
-    do ecode += GET(ecode,1); while (*ecode == OP_ALT);
-    break;
-
-    /* BRAZERO, BRAMINZERO and SKIPZERO occur just before a bracket group,
-    indicating that it may occur zero times. It may repeat infinitely, or not
-    at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets
-    with fixed upper repeat limits are compiled as a number of copies, with the
-    optional ones preceded by BRAZERO or BRAMINZERO. */
-
-    case OP_BRAZERO:
-    next = ecode + 1;
-    RMATCH(eptr, next, offset_top, md, eptrb, RM10);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    do next += GET(next, 1); while (*next == OP_ALT);
-    ecode = next + 1 + LINK_SIZE;
-    break;
-
-    case OP_BRAMINZERO:
-    next = ecode + 1;
-    do next += GET(next, 1); while (*next == OP_ALT);
-    RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
-    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-    ecode++;
-    break;
-
-    case OP_SKIPZERO:
-    next = ecode+1;
-    do next += GET(next,1); while (*next == OP_ALT);
-    ecode = next + 1 + LINK_SIZE;
-    break;
-
-    /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
-    here; just jump to the group, with allow_zero set TRUE. */
-
-    case OP_BRAPOSZERO:
-    op = *(++ecode);
-    allow_zero = TRUE;
-    if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
-      goto POSSESSIVE_NON_CAPTURE;
-
-    /* End of a group, repeated or non-repeating. */
-
-    case OP_KET:
-    case OP_KETRMIN:
-    case OP_KETRMAX:
-    case OP_KETRPOS:
-    prev = ecode - GET(ecode, 1);
-
-    /* If this was a group that remembered the subject start, in order to break
-    infinite repeats of empty string matches, retrieve the subject start from
-    the chain. Otherwise, set it NULL. */
-
-    if (*prev >= OP_SBRA || *prev == OP_ONCE)
-      {
-      saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
-      eptrb = eptrb->epb_prev;              /* Backup to previous group */
-      }
-    else saved_eptr = NULL;
-
-    /* If we are at the end of an assertion group or a non-capturing atomic
-    group, stop matching and return MATCH_MATCH, but record the current high
-    water mark for use by positive assertions. We also need to record the match
-    start in case it was changed by \K. */
-
-    if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
-         *prev == OP_ONCE_NC)
-      {
-      md->end_match_ptr = eptr;      /* For ONCE_NC */
-      md->end_offset_top = offset_top;
-      md->start_match_ptr = mstart;
-      RRETURN(MATCH_MATCH);         /* Sets md->mark */
-      }
-
-    /* For capturing groups we have to check the group number back at the start
-    and if necessary complete handling an extraction by setting the offsets and
-    bumping the high water mark. Whole-pattern recursion is coded as a recurse
-    into group 0, so it won't be picked up here. Instead, we catch it when the
-    OP_END is reached. Other recursion is handled here. We just have to record
-    the current subject position and start match pointer and give a MATCH
-    return. */
-
-    if (*prev == OP_CBRA || *prev == OP_SCBRA ||
-        *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
-      {
-      number = GET2(prev, 1+LINK_SIZE);
-      offset = number << 1;
-
-#ifdef PCRE_DEBUG
-      printf("end bracket %d", number);
-      printf("\n");
-#endif
-
-      /* Handle a recursively called group. */
-
-      if (md->recursive != NULL && md->recursive->group_num == number)
-        {
-        md->end_match_ptr = eptr;
-        md->start_match_ptr = mstart;
-        RRETURN(MATCH_MATCH);
-        }
-
-      /* Deal with capturing */
-
-      md->capture_last = (md->capture_last & OVFLMASK) | number;
-      if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
-        {
-        /* If offset is greater than offset_top, it means that we are
-        "skipping" a capturing group, and that group's offsets must be marked
-        unset. In earlier versions of PCRE, all the offsets were unset at the
-        start of matching, but this doesn't work because atomic groups and
-        assertions can cause a value to be set that should later be unset.
-        Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
-        part of the atomic group, but this is not on the final matching path,
-        so must be unset when 2 is set. (If there is no group 2, there is no
-        problem, because offset_top will then be 2, indicating no capture.) */
-
-        if (offset > offset_top)
-          {
-          register int *iptr = md->offset_vector + offset_top;
-          register int *iend = md->offset_vector + offset;
-          while (iptr < iend) *iptr++ = -1;
-          }
-
-        /* Now make the extraction */
-
-        md->offset_vector[offset] =
-          md->offset_vector[md->offset_end - number];
-        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
-        if (offset_top <= offset) offset_top = offset + 2;
-        }
-      }
-
-    /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
-    and return the MATCH_KETRPOS. This makes it possible to do the repeats one
-    at a time from the outer level, thus saving stack. This must precede the
-    empty string test - in this case that test is done at the outer level. */
-
-    if (*ecode == OP_KETRPOS)
-      {
-      md->start_match_ptr = mstart;    /* In case \K reset it */
-      md->end_match_ptr = eptr;
-      md->end_offset_top = offset_top;
-      RRETURN(MATCH_KETRPOS);
-      }
-
-    /* For an ordinary non-repeating ket, just continue at this level. This
-    also happens for a repeating ket if no characters were matched in the
-    group. This is the forcible breaking of infinite loops as implemented in
-    Perl 5.005. For a non-repeating atomic group that includes captures,
-    establish a backup point by processing the rest of the pattern at a lower
-    level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
-    original OP_ONCE level, thereby bypassing intermediate backup points, but
-    resetting any captures that happened along the way. */
-
-    if (*ecode == OP_KET || eptr == saved_eptr)
-      {
-      if (*prev == OP_ONCE)
-        {
-        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
-        RRETURN(MATCH_ONCE);
-        }
-      ecode += 1 + LINK_SIZE;    /* Carry on at this level */
-      break;
-      }
-
-    /* The normal repeating kets try the rest of the pattern or restart from
-    the preceding bracket, in the appropriate order. In the second case, we can
-    use tail recursion to avoid using another stack frame, unless we have an
-    an atomic group or an unlimited repeat of a group that can match an empty
-    string. */
-
-    if (*ecode == OP_KETRMIN)
-      {
-      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      if (*prev == OP_ONCE)
-        {
-        RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
-        RRETURN(MATCH_ONCE);
-        }
-      if (*prev >= OP_SBRA)    /* Could match an empty string */
-        {
-        RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
-        RRETURN(rrc);
-        }
-      ecode = prev;
-      goto TAIL_RECURSE;
-      }
-    else  /* OP_KETRMAX */
-      {
-      RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
-      if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-      if (*prev == OP_ONCE)
-        {
-        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        md->once_target = prev;
-        RRETURN(MATCH_ONCE);
-        }
-      ecode += 1 + LINK_SIZE;
-      goto TAIL_RECURSE;
-      }
-    /* Control never gets here */
-
-    /* Not multiline mode: start of subject assertion, unless notbol. */
-
-    case OP_CIRC:
-    if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
-
-    /* Start of subject assertion */
-
-    case OP_SOD:
-    if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    /* Multiline mode: start of subject unless notbol, or after any newline. */
-
-    case OP_CIRCM:
-    if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
-    if (eptr != md->start_subject &&
-        (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    /* Start of match assertion */
-
-    case OP_SOM:
-    if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    /* Reset the start of match point */
-
-    case OP_SET_SOM:
-    mstart = eptr;
-    ecode++;
-    break;
-
-    /* Multiline mode: assert before any newline, or before end of subject
-    unless noteol is set. */
-
-    case OP_DOLLM:
-    if (eptr < md->end_subject)
-      {
-      if (!IS_NEWLINE(eptr))
-        {
-        if (md->partial != 0 &&
-            eptr + 1 >= md->end_subject &&
-            NLBLOCK->nltype == NLTYPE_FIXED &&
-            NLBLOCK->nllen == 2 &&
-            UCHAR21TEST(eptr) == NLBLOCK->nl[0])
-          {
-          md->hitend = TRUE;
-          if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-          }
-        RRETURN(MATCH_NOMATCH);
-        }
-      }
-    else
-      {
-      if (md->noteol) RRETURN(MATCH_NOMATCH);
-      SCHECK_PARTIAL();
-      }
-    ecode++;
-    break;
-
-    /* Not multiline mode: assert before a terminating newline or before end of
-    subject unless noteol is set. */
-
-    case OP_DOLL:
-    if (md->noteol) RRETURN(MATCH_NOMATCH);
-    if (!md->endonly) goto ASSERT_NL_OR_EOS;
-
-    /* ... else fall through for endonly */
-
-    /* End of subject assertion (\z) */
-
-    case OP_EOD:
-    if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
-    SCHECK_PARTIAL();
-    ecode++;
-    break;
-
-    /* End of subject or ending \n assertion (\Z) */
-
-    case OP_EODN:
-    ASSERT_NL_OR_EOS:
-    if (eptr < md->end_subject &&
-        (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
-      {
-      if (md->partial != 0 &&
-          eptr + 1 >= md->end_subject &&
-          NLBLOCK->nltype == NLTYPE_FIXED &&
-          NLBLOCK->nllen == 2 &&
-          UCHAR21TEST(eptr) == NLBLOCK->nl[0])
-        {
-        md->hitend = TRUE;
-        if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-        }
-      RRETURN(MATCH_NOMATCH);
-      }
-
-    /* Either at end of string or \n before end. */
-
-    SCHECK_PARTIAL();
-    ecode++;
-    break;
-
-    /* Word boundary assertions */
-
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_WORD_BOUNDARY:
-      {
-
-      /* Find out if the previous and current characters are "word" characters.
-      It takes a bit more work in UTF-8 mode. Characters > 255 are assumed to
-      be "non-word" characters. Remember the earliest consulted character for
-      partial matching. */
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        /* Get status of previous character */
-
-        if (eptr == md->start_subject) prev_is_word = FALSE; else
-          {
-          PCRE_PUCHAR lastptr = eptr - 1;
-          BACKCHAR(lastptr);
-          if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
-          GETCHAR(c, lastptr);
-#ifdef SUPPORT_UCP
-          if (md->use_ucp)
-            {
-            if (c == '_') prev_is_word = TRUE; else
-              {
-              int cat = UCD_CATEGORY(c);
-              prev_is_word = (cat == ucp_L || cat == ucp_N);
-              }
-            }
-          else
-#endif
-          prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
-          }
-
-        /* Get status of next character */
-
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          cur_is_word = FALSE;
-          }
-        else
-          {
-          GETCHAR(c, eptr);
-#ifdef SUPPORT_UCP
-          if (md->use_ucp)
-            {
-            if (c == '_') cur_is_word = TRUE; else
-              {
-              int cat = UCD_CATEGORY(c);
-              cur_is_word = (cat == ucp_L || cat == ucp_N);
-              }
-            }
-          else
-#endif
-          cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
-          }
-        }
-      else
-#endif
-
-      /* Not in UTF-8 mode, but we may still have PCRE_UCP set, and for
-      consistency with the behaviour of \w we do use it in this case. */
-
-        {
-        /* Get status of previous character */
-
-        if (eptr == md->start_subject) prev_is_word = FALSE; else
-          {
-          if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;
-#ifdef SUPPORT_UCP
-          if (md->use_ucp)
-            {
-            c = eptr[-1];
-            if (c == '_') prev_is_word = TRUE; else
-              {
-              int cat = UCD_CATEGORY(c);
-              prev_is_word = (cat == ucp_L || cat == ucp_N);
-              }
-            }
-          else
-#endif
-          prev_is_word = MAX_255(eptr[-1])
-            && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
-          }
-
-        /* Get status of next character */
-
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          cur_is_word = FALSE;
-          }
-        else
-#ifdef SUPPORT_UCP
-        if (md->use_ucp)
-          {
-          c = *eptr;
-          if (c == '_') cur_is_word = TRUE; else
-            {
-            int cat = UCD_CATEGORY(c);
-            cur_is_word = (cat == ucp_L || cat == ucp_N);
-            }
-          }
-        else
-#endif
-        cur_is_word = MAX_255(*eptr)
-          && ((md->ctypes[*eptr] & ctype_word) != 0);
-        }
-
-      /* Now see if the situation is what we want */
-
-      if ((*ecode++ == OP_WORD_BOUNDARY)?
-           cur_is_word == prev_is_word : cur_is_word != prev_is_word)
-        RRETURN(MATCH_NOMATCH);
-      }
-    break;
-
-    /* Match any single character type except newline; have to take care with
-    CRLF newlines and partial matching. */
-
-    case OP_ANY:
-    if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
-    if (md->partial != 0 &&
-        eptr == md->end_subject - 1 &&
-        NLBLOCK->nltype == NLTYPE_FIXED &&
-        NLBLOCK->nllen == 2 &&
-        UCHAR21TEST(eptr) == NLBLOCK->nl[0])
-      {
-      md->hitend = TRUE;
-      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-      }
-
-    /* Fall through */
-
-    /* Match any single character whatsoever. */
-
-    case OP_ALLANY:
-    if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
-      {                            /* not be updated before SCHECK_PARTIAL. */
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    eptr++;
-#ifdef SUPPORT_UTF
-    if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-#endif
-    ecode++;
-    break;
-
-    /* Match a single byte, even in UTF-8 mode. This opcode really does match
-    any byte, even newline, independent of the setting of PCRE_DOTALL. */
-
-    case OP_ANYBYTE:
-    if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
-      {                            /* not be updated before SCHECK_PARTIAL. */
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    eptr++;
-    ecode++;
-    break;
-
-    case OP_NOT_DIGIT:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c < 256 &&
-#endif
-       (md->ctypes[c] & ctype_digit) != 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_DIGIT:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c > 255 ||
-#endif
-       (md->ctypes[c] & ctype_digit) == 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_NOT_WHITESPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c < 256 &&
-#endif
-       (md->ctypes[c] & ctype_space) != 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_WHITESPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c > 255 ||
-#endif
-       (md->ctypes[c] & ctype_space) == 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_NOT_WORDCHAR:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c < 256 &&
-#endif
-       (md->ctypes[c] & ctype_word) != 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_WORDCHAR:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    if (
-#if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-       c > 255 ||
-#endif
-       (md->ctypes[c] & ctype_word) == 0
-       )
-      RRETURN(MATCH_NOMATCH);
-    ecode++;
-    break;
-
-    case OP_ANYNL:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      default: RRETURN(MATCH_NOMATCH);
-
-      case CHAR_CR:
-      if (eptr >= md->end_subject)
-        {
-        SCHECK_PARTIAL();
-        }
-      else if (UCHAR21TEST(eptr) == CHAR_LF) eptr++;
-      break;
-
-      case CHAR_LF:
-      break;
-
-      case CHAR_VT:
-      case CHAR_FF:
-      case CHAR_NEL:
-#ifndef EBCDIC
-      case 0x2028:
-      case 0x2029:
-#endif  /* Not EBCDIC */
-      if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-      break;
-      }
-    ecode++;
-    break;
-
-    case OP_NOT_HSPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
-      default: break;
-      }
-    ecode++;
-    break;
-
-    case OP_HSPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      HSPACE_CASES: break;  /* Byte and multibyte cases */
-      default: RRETURN(MATCH_NOMATCH);
-      }
-    ecode++;
-    break;
-
-    case OP_NOT_VSPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      VSPACE_CASES: RRETURN(MATCH_NOMATCH);
-      default: break;
-      }
-    ecode++;
-    break;
-
-    case OP_VSPACE:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-    switch(c)
-      {
-      VSPACE_CASES: break;
-      default: RRETURN(MATCH_NOMATCH);
-      }
-    ecode++;
-    break;
-
-#ifdef SUPPORT_UCP
-    /* Check the next character by Unicode property. We will get here only
-    if the support is in the binary; otherwise a compile-time error occurs. */
-
-    case OP_PROP:
-    case OP_NOTPROP:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    GETCHARINCTEST(c, eptr);
-      {
-      const pcre_uint32 *cp;
-      const ucd_record *prop = GET_UCD(c);
-
-      switch(ecode[1])
-        {
-        case PT_ANY:
-        if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_LAMP:
-        if ((prop->chartype == ucp_Lu ||
-             prop->chartype == ucp_Ll ||
-             prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_GC:
-        if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_PC:
-        if ((ecode[2] != prop->chartype) == (op == OP_PROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_SC:
-        if ((ecode[2] != prop->script) == (op == OP_PROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        /* These are specials */
-
-        case PT_ALNUM:
-        if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-             PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        /* Perl space used to exclude VT, but from Perl 5.18 it is included,
-        which means that Perl space and POSIX space are now identical. PCRE
-        was changed at release 8.34. */
-
-        case PT_SPACE:    /* Perl space */
-        case PT_PXSPACE:  /* POSIX space */
-        switch(c)
-          {
-          HSPACE_CASES:
-          VSPACE_CASES:
-          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
-          break;
-
-          default:
-          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z) ==
-            (op == OP_NOTPROP)) RRETURN(MATCH_NOMATCH);
-          break;
-          }
-        break;
-
-        case PT_WORD:
-        if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-             PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
-             c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        case PT_CLIST:
-        cp = PRIV(ucd_caseless_sets) + ecode[2];
-        for (;;)
-          {
-          if (c < *cp)
-            { if (op == OP_PROP) { RRETURN(MATCH_NOMATCH); } else break; }
-          if (c == *cp++)
-            { if (op == OP_PROP) break; else { RRETURN(MATCH_NOMATCH); } }
-          }
-        break;
-
-        case PT_UCNC:
-        if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
-             c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
-             c >= 0xe000) == (op == OP_NOTPROP))
-          RRETURN(MATCH_NOMATCH);
-        break;
-
-        /* This should never occur */
-
-        default:
-        RRETURN(PCRE_ERROR_INTERNAL);
-        }
-
-      ecode += 3;
-      }
-    break;
-
-    /* Match an extended Unicode sequence. We will get here only if the support
-    is in the binary; otherwise a compile-time error occurs. */
-
-    case OP_EXTUNI:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-    else
-      {
-      int lgb, rgb;
-      GETCHARINCTEST(c, eptr);
-      lgb = UCD_GRAPHBREAK(c);
-      while (eptr < md->end_subject)
-        {
-        int len = 1;
-        if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-        rgb = UCD_GRAPHBREAK(c);
-        if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-        lgb = rgb;
-        eptr += len;
-        }
-      }
-    CHECK_PARTIAL();
-    ecode++;
-    break;
-#endif  /* SUPPORT_UCP */
-
-
-    /* Match a back reference, possibly repeatedly. Look past the end of the
-    item to see if there is repeat information following. The code is similar
-    to that for character classes, but repeated for efficiency. Then obey
-    similar code to character type repeats - written out again for speed.
-    However, if the referenced string is the empty string, always treat
-    it as matched, any number of times (otherwise there could be infinite
-    loops). If the reference is unset, there are two possibilities:
-
-    (a) In the default, Perl-compatible state, set the length negative;
-    this ensures that every attempt at a match fails. We can't just fail
-    here, because of the possibility of quantifiers with zero minima.
-
-    (b) If the JavaScript compatibility flag is set, set the length to zero
-    so that the back reference matches an empty string.
-
-    Otherwise, set the length to the length of what was matched by the
-    referenced subpattern.
-
-    The OP_REF and OP_REFI opcodes are used for a reference to a numbered group
-    or to a non-duplicated named group. For a duplicated named group, OP_DNREF
-    and OP_DNREFI are used. In this case we must scan the list of groups to
-    which the name refers, and use the first one that is set. */
-
-    case OP_DNREF:
-    case OP_DNREFI:
-    caseless = op == OP_DNREFI;
-      {
-      int count = GET2(ecode, 1+IMM2_SIZE);
-      pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
-      ecode += 1 + 2*IMM2_SIZE;
-
-      /* Setting the default length first and initializing 'offset' avoids
-      compiler warnings in the REF_REPEAT code. */
-
-      length = (md->jscript_compat)? 0 : -1;
-      offset = 0;
-
-      while (count-- > 0)
-        {
-        offset = GET2(slot, 0) << 1;
-        if (offset < offset_top && md->offset_vector[offset] >= 0)
-          {
-          length = md->offset_vector[offset+1] - md->offset_vector[offset];
-          break;
-          }
-        slot += md->name_entry_size;
-        }
-      }
-    goto REF_REPEAT;
-
-    case OP_REF:
-    case OP_REFI:
-    caseless = op == OP_REFI;
-    offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
-    ecode += 1 + IMM2_SIZE;
-    if (offset >= offset_top || md->offset_vector[offset] < 0)
-      length = (md->jscript_compat)? 0 : -1;
-    else
-      length = md->offset_vector[offset+1] - md->offset_vector[offset];
-
-    /* Set up for repetition, or handle the non-repeated case */
-
-    REF_REPEAT:
-    switch (*ecode)
-      {
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRPLUS:
-      case OP_CRMINPLUS:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      c = *ecode++ - OP_CRSTAR;
-      minimize = (c & 1) != 0;
-      min = rep_min[c];                 /* Pick up values from tables; */
-      max = rep_max[c];                 /* zero for max => infinity */
-      if (max == 0) max = INT_MAX;
-      break;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      minimize = (*ecode == OP_CRMINRANGE);
-      min = GET2(ecode, 1);
-      max = GET2(ecode, 1 + IMM2_SIZE);
-      if (max == 0) max = INT_MAX;
-      ecode += 1 + 2 * IMM2_SIZE;
-      break;
-
-      default:               /* No repeat follows */
-      if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
-        {
-        if (length == -2) eptr = md->end_subject;   /* Partial match */
-        CHECK_PARTIAL();
-        RRETURN(MATCH_NOMATCH);
-        }
-      eptr += length;
-      continue;              /* With the main loop */
-      }
-
-    /* Handle repeated back references. If the length of the reference is
-    zero, just continue with the main loop. If the length is negative, it
-    means the reference is unset in non-Java-compatible mode. If the minimum is
-    zero, we can continue at the same level without recursion. For any other
-    minimum, carrying on will result in NOMATCH. */
-
-    if (length == 0) continue;
-    if (length < 0 && min == 0) continue;
-
-    /* First, ensure the minimum number of matches are present. We get back
-    the length of the reference string explicitly rather than passing the
-    address of eptr, so that eptr can be a register variable. */
-
-    for (i = 1; i <= min; i++)
-      {
-      int slength;
-      if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
-        {
-        if (slength == -2) eptr = md->end_subject;   /* Partial match */
-        CHECK_PARTIAL();
-        RRETURN(MATCH_NOMATCH);
-        }
-      eptr += slength;
-      }
-
-    /* If min = max, continue at the same level without recursion.
-    They are not both allowed to be zero. */
-
-    if (min == max) continue;
-
-    /* If minimizing, keep trying and advancing the pointer */
-
-    if (minimize)
-      {
-      for (fi = min;; fi++)
-        {
-        int slength;
-        RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        if (fi >= max) RRETURN(MATCH_NOMATCH);
-        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
-          {
-          if (slength == -2) eptr = md->end_subject;   /* Partial match */
-          CHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        eptr += slength;
-        }
-      /* Control never gets here */
-      }
-
-    /* If maximizing, find the longest string and work backwards */
-
-    else
-      {
-      pp = eptr;
-      for (i = min; i < max; i++)
-        {
-        int slength;
-        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
-          {
-          /* Can't use CHECK_PARTIAL because we don't want to update eptr in
-          the soft partial matching case. */
-
-          if (slength == -2 && md->partial != 0 &&
-              md->end_subject > md->start_used_ptr)
-            {
-            md->hitend = TRUE;
-            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-            }
-          break;
-          }
-        eptr += slength;
-        }
-
-      while (eptr >= pp)
-        {
-        RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-        eptr -= length;
-        }
-      RRETURN(MATCH_NOMATCH);
-      }
-    /* Control never gets here */
-
-    /* Match a bit-mapped character class, possibly repeatedly. This op code is
-    used when all the characters in the class have values in the range 0-255,
-    and either the matching is caseful, or the characters are in the range
-    0-127 when UTF-8 processing is enabled. The only difference between
-    OP_CLASS and OP_NCLASS occurs when a data character outside the range is
-    encountered.
-
-    First, look past the end of the item to see if there is repeat information
-    following. Then obey similar code to character type repeats - written out
-    again for speed. */
-
-    case OP_NCLASS:
-    case OP_CLASS:
-      {
-      /* The data variable is saved across frames, so the byte map needs to
-      be stored there. */
-#define BYTE_MAP ((pcre_uint8 *)data)
-      data = ecode + 1;                /* Save for matching */
-      ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
-
-      switch (*ecode)
-        {
-        case OP_CRSTAR:
-        case OP_CRMINSTAR:
-        case OP_CRPLUS:
-        case OP_CRMINPLUS:
-        case OP_CRQUERY:
-        case OP_CRMINQUERY:
-        case OP_CRPOSSTAR:
-        case OP_CRPOSPLUS:
-        case OP_CRPOSQUERY:
-        c = *ecode++ - OP_CRSTAR;
-        if (c < OP_CRPOSSTAR - OP_CRSTAR) minimize = (c & 1) != 0;
-        else possessive = TRUE;
-        min = rep_min[c];                 /* Pick up values from tables; */
-        max = rep_max[c];                 /* zero for max => infinity */
-        if (max == 0) max = INT_MAX;
-        break;
-
-        case OP_CRRANGE:
-        case OP_CRMINRANGE:
-        case OP_CRPOSRANGE:
-        minimize = (*ecode == OP_CRMINRANGE);
-        possessive = (*ecode == OP_CRPOSRANGE);
-        min = GET2(ecode, 1);
-        max = GET2(ecode, 1 + IMM2_SIZE);
-        if (max == 0) max = INT_MAX;
-        ecode += 1 + 2 * IMM2_SIZE;
-        break;
-
-        default:               /* No repeat follows */
-        min = max = 1;
-        break;
-        }
-
-      /* First, ensure the minimum number of matches are present. */
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          if (c > 255)
-            {
-            if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
-            }
-          else
-            if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-          }
-        }
-      else
-#endif
-      /* Not UTF mode */
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          c = *eptr++;
-#ifndef COMPILE_PCRE8
-          if (c > 255)
-            {
-            if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
-            }
-          else
-#endif
-            if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-          }
-        }
-
-      /* If max == min we can continue with the main loop without the
-      need to recurse. */
-
-      if (min == max) continue;
-
-      /* If minimizing, keep testing the rest of the expression and advancing
-      the pointer while it matches the class. */
-
-      if (minimize)
-        {
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINC(c, eptr);
-            if (c > 255)
-              {
-              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
-              }
-            else
-              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        else
-#endif
-        /* Not UTF mode */
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            c = *eptr++;
-#ifndef COMPILE_PCRE8
-            if (c > 255)
-              {
-              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
-              }
-            else
-#endif
-              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        /* Control never gets here */
-        }
-
-      /* If maximizing, find the longest possible run, then work backwards. */
-
-      else
-        {
-        pp = eptr;
-
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c > 255)
-              {
-              if (op == OP_CLASS) break;
-              }
-            else
-              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
-            eptr += len;
-            }
-
-          if (possessive) continue;    /* No backtracking */
-
-          for (;;)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (eptr-- <= pp) break;        /* Stop if tried at original pos */
-            BACKCHAR(eptr);
-            }
-          }
-        else
-#endif
-          /* Not UTF mode */
-          {
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            c = *eptr;
-#ifndef COMPILE_PCRE8
-            if (c > 255)
-              {
-              if (op == OP_CLASS) break;
-              }
-            else
-#endif
-              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
-            eptr++;
-            }
-
-          if (possessive) continue;    /* No backtracking */
-
-          while (eptr >= pp)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            }
-          }
-
-        RRETURN(MATCH_NOMATCH);
-        }
-#undef BYTE_MAP
-      }
-    /* Control never gets here */
-
-
-    /* Match an extended character class. In the 8-bit library, this opcode is
-    encountered only when UTF-8 mode mode is supported. In the 16-bit and
-    32-bit libraries, codepoints greater than 255 may be encountered even when
-    UTF is not supported. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-    case OP_XCLASS:
-      {
-      data = ecode + 1 + LINK_SIZE;                /* Save for matching */
-      ecode += GET(ecode, 1);                      /* Advance past the item */
-
-      switch (*ecode)
-        {
-        case OP_CRSTAR:
-        case OP_CRMINSTAR:
-        case OP_CRPLUS:
-        case OP_CRMINPLUS:
-        case OP_CRQUERY:
-        case OP_CRMINQUERY:
-        case OP_CRPOSSTAR:
-        case OP_CRPOSPLUS:
-        case OP_CRPOSQUERY:
-        c = *ecode++ - OP_CRSTAR;
-        if (c < OP_CRPOSSTAR - OP_CRSTAR) minimize = (c & 1) != 0;
-        else possessive = TRUE;
-        min = rep_min[c];                 /* Pick up values from tables; */
-        max = rep_max[c];                 /* zero for max => infinity */
-        if (max == 0) max = INT_MAX;
-        break;
-
-        case OP_CRRANGE:
-        case OP_CRMINRANGE:
-        case OP_CRPOSRANGE:
-        minimize = (*ecode == OP_CRMINRANGE);
-        possessive = (*ecode == OP_CRPOSRANGE);
-        min = GET2(ecode, 1);
-        max = GET2(ecode, 1 + IMM2_SIZE);
-        if (max == 0) max = INT_MAX;
-        ecode += 1 + 2 * IMM2_SIZE;
-        break;
-
-        default:               /* No repeat follows */
-        min = max = 1;
-        break;
-        }
-
-      /* First, ensure the minimum number of matches are present. */
-
-      for (i = 1; i <= min; i++)
-        {
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        GETCHARINCTEST(c, eptr);
-        if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
-        }
-
-      /* If max == min we can continue with the main loop without the
-      need to recurse. */
-
-      if (min == max) continue;
-
-      /* If minimizing, keep testing the rest of the expression and advancing
-      the pointer while it matches the class. */
-
-      if (minimize)
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINCTEST(c, eptr);
-          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
-          }
-        /* Control never gets here */
-        }
-
-      /* If maximizing, find the longest possible run, then work backwards. */
-
-      else
-        {
-        pp = eptr;
-        for (i = min; i < max; i++)
-          {
-          int len = 1;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            break;
-            }
-#ifdef SUPPORT_UTF
-          GETCHARLENTEST(c, eptr, len);
-#else
-          c = *eptr;
-#endif
-          if (!PRIV(xclass)(c, data, utf)) break;
-          eptr += len;
-          }
-
-        if (possessive) continue;    /* No backtracking */
-
-        for(;;)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (eptr-- <= pp) break;        /* Stop if tried at original pos */
-#ifdef SUPPORT_UTF
-          if (utf) BACKCHAR(eptr);
-#endif
-          }
-        RRETURN(MATCH_NOMATCH);
-        }
-
-      /* Control never gets here */
-      }
-#endif    /* End of XCLASS */
-
-    /* Match a single character, casefully */
-
-    case OP_CHAR:
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      length = 1;
-      ecode++;
-      GETCHARLEN(fc, ecode, length);
-      if (length > md->end_subject - eptr)
-        {
-        CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
-        RRETURN(MATCH_NOMATCH);
-        }
-      while (length-- > 0) if (*ecode++ != UCHAR21INC(eptr)) RRETURN(MATCH_NOMATCH);
-      }
-    else
-#endif
-    /* Not UTF mode */
-      {
-      if (md->end_subject - eptr < 1)
-        {
-        SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
-        RRETURN(MATCH_NOMATCH);
-        }
-      if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
-      ecode += 2;
-      }
-    break;
-
-    /* Match a single character, caselessly. If we are at the end of the
-    subject, give up immediately. */
-
-    case OP_CHARI:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      length = 1;
-      ecode++;
-      GETCHARLEN(fc, ecode, length);
-
-      /* If the pattern character's value is < 128, we have only one byte, and
-      we know that its other case must also be one byte long, so we can use the
-      fast lookup table. We know that there is at least one byte left in the
-      subject. */
-
-      if (fc < 128)
-        {
-        pcre_uint32 cc = UCHAR21(eptr);
-        if (md->lcc[fc] != TABLE_GET(cc, md->lcc, cc)) RRETURN(MATCH_NOMATCH);
-        ecode++;
-        eptr++;
-        }
-
-      /* Otherwise we must pick up the subject character. Note that we cannot
-      use the value of "length" to check for sufficient bytes left, because the
-      other case of the character may have more or fewer bytes.  */
-
-      else
-        {
-        pcre_uint32 dc;
-        GETCHARINC(dc, eptr);
-        ecode += length;
-
-        /* If we have Unicode property support, we can use it to test the other
-        case of the character, if there is one. */
-
-        if (fc != dc)
-          {
-#ifdef SUPPORT_UCP
-          if (dc != UCD_OTHERCASE(fc))
-#endif
-            RRETURN(MATCH_NOMATCH);
-          }
-        }
-      }
-    else
-#endif   /* SUPPORT_UTF */
-
-    /* Not UTF mode */
-      {
-      if (TABLE_GET(ecode[1], md->lcc, ecode[1])
-          != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
-      eptr++;
-      ecode += 2;
-      }
-    break;
-
-    /* Match a single character repeatedly. */
-
-    case OP_EXACT:
-    case OP_EXACTI:
-    min = max = GET2(ecode, 1);
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATCHAR;
-
-    case OP_POSUPTO:
-    case OP_POSUPTOI:
-    possessive = TRUE;
-    /* Fall through */
-
-    case OP_UPTO:
-    case OP_UPTOI:
-    case OP_MINUPTO:
-    case OP_MINUPTOI:
-    min = 0;
-    max = GET2(ecode, 1);
-    minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATCHAR;
-
-    case OP_POSSTAR:
-    case OP_POSSTARI:
-    possessive = TRUE;
-    min = 0;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATCHAR;
-
-    case OP_POSPLUS:
-    case OP_POSPLUSI:
-    possessive = TRUE;
-    min = 1;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATCHAR;
-
-    case OP_POSQUERY:
-    case OP_POSQUERYI:
-    possessive = TRUE;
-    min = 0;
-    max = 1;
-    ecode++;
-    goto REPEATCHAR;
-
-    case OP_STAR:
-    case OP_STARI:
-    case OP_MINSTAR:
-    case OP_MINSTARI:
-    case OP_PLUS:
-    case OP_PLUSI:
-    case OP_MINPLUS:
-    case OP_MINPLUSI:
-    case OP_QUERY:
-    case OP_QUERYI:
-    case OP_MINQUERY:
-    case OP_MINQUERYI:
-    c = *ecode++ - ((op < OP_STARI)? OP_STAR : OP_STARI);
-    minimize = (c & 1) != 0;
-    min = rep_min[c];                 /* Pick up values from tables; */
-    max = rep_max[c];                 /* zero for max => infinity */
-    if (max == 0) max = INT_MAX;
-
-    /* Common code for all repeated single-character matches. We first check
-    for the minimum number of characters. If the minimum equals the maximum, we
-    are done. Otherwise, if minimizing, check the rest of the pattern for a
-    match; if there isn't one, advance up to the maximum, one character at a
-    time.
-
-    If maximizing, advance up to the maximum number of matching characters,
-    until eptr is past the end of the maximum run. If possessive, we are
-    then done (no backing up). Otherwise, match at this position; anything
-    other than no match is immediately returned. For nomatch, back up one
-    character, unless we are matching \R and the last thing matched was
-    \r\n, in which case, back up two bytes. When we reach the first optional
-    character position, we can save stack by doing a tail recurse.
-
-    The various UTF/non-UTF and caseful/caseless cases are handled separately,
-    for speed. */
-
-    REPEATCHAR:
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      length = 1;
-      charptr = ecode;
-      GETCHARLEN(fc, ecode, length);
-      ecode += length;
-
-      /* Handle multibyte character matching specially here. There is
-      support for caseless matching if UCP support is present. */
-
-      if (length > 1)
-        {
-#ifdef SUPPORT_UCP
-        pcre_uint32 othercase;
-        if (op >= OP_STARI &&     /* Caseless */
-            (othercase = UCD_OTHERCASE(fc)) != fc)
-          oclength = PRIV(ord2utf)(othercase, occhars);
-        else oclength = 0;
-#endif  /* SUPPORT_UCP */
-
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr <= md->end_subject - length &&
-            memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
-#ifdef SUPPORT_UCP
-          else if (oclength > 0 &&
-                   eptr <= md->end_subject - oclength &&
-                   memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
-#endif  /* SUPPORT_UCP */
-          else
-            {
-            CHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          }
-
-        if (min == max) continue;
-
-        if (minimize)
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr <= md->end_subject - length &&
-              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
-#ifdef SUPPORT_UCP
-            else if (oclength > 0 &&
-                     eptr <= md->end_subject - oclength &&
-                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
-#endif  /* SUPPORT_UCP */
-            else
-              {
-              CHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            }
-          /* Control never gets here */
-          }
-
-        else  /* Maximize */
-          {
-          pp = eptr;
-          for (i = min; i < max; i++)
-            {
-            if (eptr <= md->end_subject - length &&
-                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
-#ifdef SUPPORT_UCP
-            else if (oclength > 0 &&
-                     eptr <= md->end_subject - oclength &&
-                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
-#endif  /* SUPPORT_UCP */
-            else
-              {
-              CHECK_PARTIAL();
-              break;
-              }
-            }
-
-          if (possessive) continue;    /* No backtracking */
-          for(;;)
-            {
-            if (eptr <= pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-#ifdef SUPPORT_UCP
-            eptr--;
-            BACKCHAR(eptr);
-#else   /* without SUPPORT_UCP */
-            eptr -= length;
-#endif  /* SUPPORT_UCP */
-            }
-          }
-        /* Control never gets here */
-        }
-
-      /* If the length of a UTF-8 character is 1, we fall through here, and
-      obey the code as for non-UTF-8 characters below, though in this case the
-      value of fc will always be < 128. */
-      }
-    else
-#endif  /* SUPPORT_UTF */
-      /* When not in UTF-8 mode, load a single-byte character. */
-      fc = *ecode++;
-
-    /* The value of fc at this point is always one character, though we may
-    or may not be in UTF mode. The code is duplicated for the caseless and
-    caseful cases, for speed, since matching characters is likely to be quite
-    common. First, ensure the minimum number of matches are present. If min =
-    max, continue at the same level without recursing. Otherwise, if
-    minimizing, keep trying the rest of the expression and advancing one
-    matching character if failing, up to the maximum. Alternatively, if
-    maximizing, find the maximum number of characters and work backwards. */
-
-    DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
-      max, (char *)eptr));
-
-    if (op >= OP_STARI)  /* Caseless */
-      {
-#ifdef COMPILE_PCRE8
-      /* fc must be < 128 if UTF is enabled. */
-      foc = md->fcc[fc];
-#else
-#ifdef SUPPORT_UTF
-#ifdef SUPPORT_UCP
-      if (utf && fc > 127)
-        foc = UCD_OTHERCASE(fc);
-#else
-      if (utf && fc > 127)
-        foc = fc;
-#endif /* SUPPORT_UCP */
-      else
-#endif /* SUPPORT_UTF */
-        foc = TABLE_GET(fc, md->fcc, fc);
-#endif /* COMPILE_PCRE8 */
-
-      for (i = 1; i <= min; i++)
-        {
-        pcre_uint32 cc;                 /* Faster than pcre_uchar */
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        cc = UCHAR21TEST(eptr);
-        if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
-        eptr++;
-        }
-      if (min == max) continue;
-      if (minimize)
-        {
-        for (fi = min;; fi++)
-          {
-          pcre_uint32 cc;               /* Faster than pcre_uchar */
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21TEST(eptr);
-          if (fc != cc && foc != cc) RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        /* Control never gets here */
-        }
-      else  /* Maximize */
-        {
-        pp = eptr;
-        for (i = min; i < max; i++)
-          {
-          pcre_uint32 cc;               /* Faster than pcre_uchar */
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            break;
-            }
-          cc = UCHAR21TEST(eptr);
-          if (fc != cc && foc != cc) break;
-          eptr++;
-          }
-        if (possessive) continue;       /* No backtracking */
-        for (;;)
-          {
-          if (eptr == pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
-          eptr--;
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          }
-        /* Control never gets here */
-        }
-      }
-
-    /* Caseful comparisons (includes all multi-byte characters) */
-
-    else
-      {
-      for (i = 1; i <= min; i++)
-        {
-        if (eptr >= md->end_subject)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        if (fc != UCHAR21INCTEST(eptr)) RRETURN(MATCH_NOMATCH);
-        }
-
-      if (min == max) continue;
-
-      if (minimize)
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (fc != UCHAR21INCTEST(eptr)) RRETURN(MATCH_NOMATCH);
-          }
-        /* Control never gets here */
-        }
-      else  /* Maximize */
-        {
-        pp = eptr;
-        for (i = min; i < max; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            break;
-            }
-          if (fc != UCHAR21TEST(eptr)) break;
-          eptr++;
-          }
-        if (possessive) continue;    /* No backtracking */
-        for (;;)
-          {
-          if (eptr == pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
-          eptr--;
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          }
-        /* Control never gets here */
-        }
-      }
-    /* Control never gets here */
-
-    /* Match a negated single one-byte character. The character we are
-    checking can be multibyte. */
-
-    case OP_NOT:
-    case OP_NOTI:
-    if (eptr >= md->end_subject)
-      {
-      SCHECK_PARTIAL();
-      RRETURN(MATCH_NOMATCH);
-      }
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      register pcre_uint32 ch, och;
-
-      ecode++;
-      GETCHARINC(ch, ecode);
-      GETCHARINC(c, eptr);
-
-      if (op == OP_NOT)
-        {
-        if (ch == c) RRETURN(MATCH_NOMATCH);
-        }
-      else
-        {
-#ifdef SUPPORT_UCP
-        if (ch > 127)
-          och = UCD_OTHERCASE(ch);
-#else
-        if (ch > 127)
-          och = ch;
-#endif /* SUPPORT_UCP */
-        else
-          och = TABLE_GET(ch, md->fcc, ch);
-        if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
-        }
-      }
-    else
-#endif
-      {
-      register pcre_uint32 ch = ecode[1];
-      c = *eptr++;
-      if (ch == c || (op == OP_NOTI && TABLE_GET(ch, md->fcc, ch) == c))
-        RRETURN(MATCH_NOMATCH);
-      ecode += 2;
-      }
-    break;
-
-    /* Match a negated single one-byte character repeatedly. This is almost a
-    repeat of the code for a repeated single character, but I haven't found a
-    nice way of commoning these up that doesn't require a test of the
-    positive/negative option for each character match. Maybe that wouldn't add
-    very much to the time taken, but character matching *is* what this is all
-    about... */
-
-    case OP_NOTEXACT:
-    case OP_NOTEXACTI:
-    min = max = GET2(ecode, 1);
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTUPTO:
-    case OP_NOTUPTOI:
-    case OP_NOTMINUPTO:
-    case OP_NOTMINUPTOI:
-    min = 0;
-    max = GET2(ecode, 1);
-    minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSSTARI:
-    possessive = TRUE;
-    min = 0;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSPLUSI:
-    possessive = TRUE;
-    min = 1;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSQUERYI:
-    possessive = TRUE;
-    min = 0;
-    max = 1;
-    ecode++;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTPOSUPTO:
-    case OP_NOTPOSUPTOI:
-    possessive = TRUE;
-    min = 0;
-    max = GET2(ecode, 1);
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATNOTCHAR;
-
-    case OP_NOTSTAR:
-    case OP_NOTSTARI:
-    case OP_NOTMINSTAR:
-    case OP_NOTMINSTARI:
-    case OP_NOTPLUS:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUS:
-    case OP_NOTMINPLUSI:
-    case OP_NOTQUERY:
-    case OP_NOTQUERYI:
-    case OP_NOTMINQUERY:
-    case OP_NOTMINQUERYI:
-    c = *ecode++ - ((op >= OP_NOTSTARI)? OP_NOTSTARI: OP_NOTSTAR);
-    minimize = (c & 1) != 0;
-    min = rep_min[c];                 /* Pick up values from tables; */
-    max = rep_max[c];                 /* zero for max => infinity */
-    if (max == 0) max = INT_MAX;
-
-    /* Common code for all repeated single-byte matches. */
-
-    REPEATNOTCHAR:
-    GETCHARINCTEST(fc, ecode);
-
-    /* The code is duplicated for the caseless and caseful cases, for speed,
-    since matching characters is likely to be quite common. First, ensure the
-    minimum number of matches are present. If min = max, continue at the same
-    level without recursing. Otherwise, if minimizing, keep trying the rest of
-    the expression and advancing one matching character if failing, up to the
-    maximum. Alternatively, if maximizing, find the maximum number of
-    characters and work backwards. */
-
-    DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,
-      max, (char *)eptr));
-
-    if (op >= OP_NOTSTARI)     /* Caseless */
-      {
-#ifdef SUPPORT_UTF
-#ifdef SUPPORT_UCP
-      if (utf && fc > 127)
-        foc = UCD_OTHERCASE(fc);
-#else
-      if (utf && fc > 127)
-        foc = fc;
-#endif /* SUPPORT_UCP */
-      else
-#endif /* SUPPORT_UTF */
-        foc = TABLE_GET(fc, md->fcc, fc);
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        register pcre_uint32 d;
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(d, eptr);
-          if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
-          }
-        }
-      else
-#endif  /* SUPPORT_UTF */
-      /* Not UTF mode */
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        }
-
-      if (min == max) continue;
-
-      if (minimize)
-        {
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          register pcre_uint32 d;
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINC(d, eptr);
-            if (fc == d || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        else
-#endif  /*SUPPORT_UTF */
-        /* Not UTF mode */
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
-            eptr++;
-            }
-          }
-        /* Control never gets here */
-        }
-
-      /* Maximize case */
-
-      else
-        {
-        pp = eptr;
-
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          register pcre_uint32 d;
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(d, eptr, len);
-            if (fc == d || (unsigned int)foc == d) break;
-            eptr += len;
-            }
-          if (possessive) continue;    /* No backtracking */
-          for(;;)
-            {
-            if (eptr <= pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            BACKCHAR(eptr);
-            }
-          }
-        else
-#endif  /* SUPPORT_UTF */
-        /* Not UTF mode */
-          {
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (fc == *eptr || foc == *eptr) break;
-            eptr++;
-            }
-          if (possessive) continue;    /* No backtracking */
-          for (;;)
-            {
-            if (eptr == pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            }
-          }
-        /* Control never gets here */
-        }
-      }
-
-    /* Caseful comparisons */
-
-    else
-      {
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        register pcre_uint32 d;
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(d, eptr);
-          if (fc == d) RRETURN(MATCH_NOMATCH);
-          }
-        }
-      else
-#endif
-      /* Not UTF mode */
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
-          }
-        }
-
-      if (min == max) continue;
-
-      if (minimize)
-        {
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          register pcre_uint32 d;
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINC(d, eptr);
-            if (fc == d) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        else
-#endif
-        /* Not UTF mode */
-          {
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
-            }
-          }
-        /* Control never gets here */
-        }
-
-      /* Maximize case */
-
-      else
-        {
-        pp = eptr;
-
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          register pcre_uint32 d;
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(d, eptr, len);
-            if (fc == d) break;
-            eptr += len;
-            }
-          if (possessive) continue;    /* No backtracking */
-          for(;;)
-            {
-            if (eptr <= pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            BACKCHAR(eptr);
-            }
-          }
-        else
-#endif
-        /* Not UTF mode */
-          {
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (fc == *eptr) break;
-            eptr++;
-            }
-          if (possessive) continue;    /* No backtracking */
-          for (;;)
-            {
-            if (eptr == pp) goto TAIL_RECURSE;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            eptr--;
-            }
-          }
-        /* Control never gets here */
-        }
-      }
-    /* Control never gets here */
-
-    /* Match a single character type repeatedly; several different opcodes
-    share code. This is very similar to the code for single characters, but we
-    repeat it in the interests of efficiency. */
-
-    case OP_TYPEEXACT:
-    min = max = GET2(ecode, 1);
-    minimize = TRUE;
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATTYPE;
-
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    min = 0;
-    max = GET2(ecode, 1);
-    minimize = *ecode == OP_TYPEMINUPTO;
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATTYPE;
-
-    case OP_TYPEPOSSTAR:
-    possessive = TRUE;
-    min = 0;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATTYPE;
-
-    case OP_TYPEPOSPLUS:
-    possessive = TRUE;
-    min = 1;
-    max = INT_MAX;
-    ecode++;
-    goto REPEATTYPE;
-
-    case OP_TYPEPOSQUERY:
-    possessive = TRUE;
-    min = 0;
-    max = 1;
-    ecode++;
-    goto REPEATTYPE;
-
-    case OP_TYPEPOSUPTO:
-    possessive = TRUE;
-    min = 0;
-    max = GET2(ecode, 1);
-    ecode += 1 + IMM2_SIZE;
-    goto REPEATTYPE;
-
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    c = *ecode++ - OP_TYPESTAR;
-    minimize = (c & 1) != 0;
-    min = rep_min[c];                 /* Pick up values from tables; */
-    max = rep_max[c];                 /* zero for max => infinity */
-    if (max == 0) max = INT_MAX;
-
-    /* Common code for all repeated single character type matches. Note that
-    in UTF-8 mode, '.' matches a character of any length, but for the other
-    character types, the valid characters are all one-byte long. */
-
-    REPEATTYPE:
-    ctype = *ecode++;      /* Code for the character type */
-
-#ifdef SUPPORT_UCP
-    if (ctype == OP_PROP || ctype == OP_NOTPROP)
-      {
-      prop_fail_result = ctype == OP_NOTPROP;
-      prop_type = *ecode++;
-      prop_value = *ecode++;
-      }
-    else prop_type = -1;
-#endif
-
-    /* First, ensure the minimum number of matches are present. Use inline
-    code for maximizing the speed, and do the type test once at the start
-    (i.e. keep it out of the loop). Separate the UTF-8 code completely as that
-    is tidier. Also separate the UCP code, which can be the same for both UTF-8
-    and single-bytes. */
-
-    if (min > 0)
-      {
-#ifdef SUPPORT_UCP
-      if (prop_type >= 0)
-        {
-        switch(prop_type)
-          {
-          case PT_ANY:
-          if (prop_fail_result) RRETURN(MATCH_NOMATCH);
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            }
-          break;
-
-          case PT_LAMP:
-          for (i = 1; i <= min; i++)
-            {
-            int chartype;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            chartype = UCD_CHARTYPE(c);
-            if ((chartype == ucp_Lu ||
-                 chartype == ucp_Ll ||
-                 chartype == ucp_Lt) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_GC:
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_PC:
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_SC:
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_ALNUM:
-          for (i = 1; i <= min; i++)
-            {
-            int category;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
-          which means that Perl space and POSIX space are now identical. PCRE
-          was changed at release 8.34. */
-
-          case PT_SPACE:    /* Perl space */
-          case PT_PXSPACE:  /* POSIX space */
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            switch(c)
-              {
-              HSPACE_CASES:
-              VSPACE_CASES:
-              if (prop_fail_result) RRETURN(MATCH_NOMATCH);
-              break;
-
-              default:
-              if ((UCD_CATEGORY(c) == ucp_Z) == prop_fail_result)
-                RRETURN(MATCH_NOMATCH);
-              break;
-              }
-            }
-          break;
-
-          case PT_WORD:
-          for (i = 1; i <= min; i++)
-            {
-            int category;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
-                   == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          case PT_CLIST:
-          for (i = 1; i <= min; i++)
-            {
-            const pcre_uint32 *cp;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            cp = PRIV(ucd_caseless_sets) + prop_value;
-            for (;;)
-              {
-              if (c < *cp)
-                { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }
-              if (c == *cp++)
-                { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }
-              }
-            }
-          break;
-
-          case PT_UCNC:
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
-                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
-                 c >= 0xe000) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          break;
-
-          /* This should not occur */
-
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-        }
-
-      /* Match extended Unicode sequences. We will get here only if the
-      support is in the binary; otherwise a compile-time error occurs. */
-
-      else if (ctype == OP_EXTUNI)
-        {
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          else
-            {
-            int lgb, rgb;
-            GETCHARINCTEST(c, eptr);
-            lgb = UCD_GRAPHBREAK(c);
-           while (eptr < md->end_subject)
-              {
-              int len = 1;
-              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-              rgb = UCD_GRAPHBREAK(c);
-              if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-              lgb = rgb;
-              eptr += len;
-              }
-            }
-          CHECK_PARTIAL();
-          }
-        }
-
-      else
-#endif     /* SUPPORT_UCP */
-
-/* Handle all other cases when the coding is UTF-8 */
-
-#ifdef SUPPORT_UTF
-      if (utf) switch(ctype)
-        {
-        case OP_ANY:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
-          if (md->partial != 0 &&
-              eptr + 1 >= md->end_subject &&
-              NLBLOCK->nltype == NLTYPE_FIXED &&
-              NLBLOCK->nllen == 2 &&
-              UCHAR21(eptr) == NLBLOCK->nl[0])
-            {
-            md->hitend = TRUE;
-            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-            }
-          eptr++;
-          ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-          }
-        break;
-
-        case OP_ALLANY:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          eptr++;
-          ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-          }
-        break;
-
-        case OP_ANYBYTE:
-        if (eptr > md->end_subject - min) RRETURN(MATCH_NOMATCH);
-        eptr += min;
-        break;
-
-        case OP_ANYNL:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            default: RRETURN(MATCH_NOMATCH);
-
-            case CHAR_CR:
-            if (eptr < md->end_subject && UCHAR21(eptr) == CHAR_LF) eptr++;
-            break;
-
-            case CHAR_LF:
-            break;
-
-            case CHAR_VT:
-            case CHAR_FF:
-            case CHAR_NEL:
-#ifndef EBCDIC
-            case 0x2028:
-            case 0x2029:
-#endif  /* Not EBCDIC */
-            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-            break;
-            }
-          }
-        break;
-
-        case OP_NOT_HSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            HSPACE_CASES: RRETURN(MATCH_NOMATCH);  /* Byte and multibyte cases */
-            default: break;
-            }
-          }
-        break;
-
-        case OP_HSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            HSPACE_CASES: break;  /* Byte and multibyte cases */
-            default: RRETURN(MATCH_NOMATCH);
-            }
-          }
-        break;
-
-        case OP_NOT_VSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            VSPACE_CASES: RRETURN(MATCH_NOMATCH);
-            default: break;
-            }
-          }
-        break;
-
-        case OP_VSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          switch(c)
-            {
-            VSPACE_CASES: break;
-            default: RRETURN(MATCH_NOMATCH);
-            }
-          }
-        break;
-
-        case OP_NOT_DIGIT:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          GETCHARINC(c, eptr);
-          if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)
-            RRETURN(MATCH_NOMATCH);
-          }
-        break;
-
-        case OP_DIGIT:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc >= 128 || (md->ctypes[cc] & ctype_digit) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          /* No need to skip more bytes - we know it's a 1-byte character */
-          }
-        break;
-
-        case OP_NOT_WHITESPACE:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc < 128 && (md->ctypes[cc] & ctype_space) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-          }
-        break;
-
-        case OP_WHITESPACE:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc >= 128 || (md->ctypes[cc] & ctype_space) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          /* No need to skip more bytes - we know it's a 1-byte character */
-          }
-        break;
-
-        case OP_NOT_WORDCHAR:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc < 128 && (md->ctypes[cc] & ctype_word) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-          }
-        break;
-
-        case OP_WORDCHAR:
-        for (i = 1; i <= min; i++)
-          {
-          pcre_uint32 cc;
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          cc = UCHAR21(eptr);
-          if (cc >= 128 || (md->ctypes[cc] & ctype_word) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          /* No need to skip more bytes - we know it's a 1-byte character */
-          }
-        break;
-
-        default:
-        RRETURN(PCRE_ERROR_INTERNAL);
-        }  /* End switch(ctype) */
-
-      else
-#endif     /* SUPPORT_UTF */
-
-      /* Code for the non-UTF-8 case for minimum matching of operators other
-      than OP_PROP and OP_NOTPROP. */
-
-      switch(ctype)
-        {
-        case OP_ANY:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
-          if (md->partial != 0 &&
-              eptr + 1 >= md->end_subject &&
-              NLBLOCK->nltype == NLTYPE_FIXED &&
-              NLBLOCK->nllen == 2 &&
-              *eptr == NLBLOCK->nl[0])
-            {
-            md->hitend = TRUE;
-            if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-            }
-          eptr++;
-          }
-        break;
-
-        case OP_ALLANY:
-        if (eptr > md->end_subject - min)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        eptr += min;
-        break;
-
-        case OP_ANYBYTE:
-        if (eptr > md->end_subject - min)
-          {
-          SCHECK_PARTIAL();
-          RRETURN(MATCH_NOMATCH);
-          }
-        eptr += min;
-        break;
-
-        case OP_ANYNL:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            default: RRETURN(MATCH_NOMATCH);
-
-            case CHAR_CR:
-            if (eptr < md->end_subject && *eptr == CHAR_LF) eptr++;
-            break;
-
-            case CHAR_LF:
-            break;
-
-            case CHAR_VT:
-            case CHAR_FF:
-            case CHAR_NEL:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            case 0x2028:
-            case 0x2029:
-#endif
-            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-            break;
-            }
-          }
-        break;
-
-        case OP_NOT_HSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            default: break;
-            HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            HSPACE_MULTIBYTE_CASES:
-#endif
-            RRETURN(MATCH_NOMATCH);
-            }
-          }
-        break;
-
-        case OP_HSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            default: RRETURN(MATCH_NOMATCH);
-            HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            HSPACE_MULTIBYTE_CASES:
-#endif
-            break;
-            }
-          }
-        break;
-
-        case OP_NOT_VSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            VSPACE_MULTIBYTE_CASES:
-#endif
-            RRETURN(MATCH_NOMATCH);
-            default: break;
-            }
-          }
-        break;
-
-        case OP_VSPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          switch(*eptr++)
-            {
-            default: RRETURN(MATCH_NOMATCH);
-            VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-            VSPACE_MULTIBYTE_CASES:
-#endif
-            break;
-            }
-          }
-        break;
-
-        case OP_NOT_DIGIT:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_digit) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_DIGIT:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_digit) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_NOT_WHITESPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_space) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_WHITESPACE:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_space) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_NOT_WORDCHAR:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_word) != 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        case OP_WORDCHAR:
-        for (i = 1; i <= min; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_word) == 0)
-            RRETURN(MATCH_NOMATCH);
-          eptr++;
-          }
-        break;
-
-        default:
-        RRETURN(PCRE_ERROR_INTERNAL);
-        }
-      }
-
-    /* If min = max, continue at the same level without recursing */
-
-    if (min == max) continue;
-
-    /* If minimizing, we have to test the rest of the pattern before each
-    subsequent match. Again, separate the UTF-8 case for speed, and also
-    separate the UCP cases. */
-
-    if (minimize)
-      {
-#ifdef SUPPORT_UCP
-      if (prop_type >= 0)
-        {
-        switch(prop_type)
-          {
-          case PT_ANY:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM36);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if (prop_fail_result) RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_LAMP:
-          for (fi = min;; fi++)
-            {
-            int chartype;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM37);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            chartype = UCD_CHARTYPE(c);
-            if ((chartype == ucp_Lu ||
-                 chartype == ucp_Ll ||
-                 chartype == ucp_Lt) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_GC:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM38);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_PC:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM39);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_SC:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM40);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_ALNUM:
-          for (fi = min;; fi++)
-            {
-            int category;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM59);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
-          which means that Perl space and POSIX space are now identical. PCRE
-          was changed at release 8.34. */
-
-          case PT_SPACE:    /* Perl space */
-          case PT_PXSPACE:  /* POSIX space */
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM61);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            switch(c)
-              {
-              HSPACE_CASES:
-              VSPACE_CASES:
-              if (prop_fail_result) RRETURN(MATCH_NOMATCH);
-              break;
-
-              default:
-              if ((UCD_CATEGORY(c) == ucp_Z) == prop_fail_result)
-                RRETURN(MATCH_NOMATCH);
-              break;
-              }
-            }
-          /* Control never gets here */
-
-          case PT_WORD:
-          for (fi = min;; fi++)
-            {
-            int category;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L ||
-                 category == ucp_N ||
-                 c == CHAR_UNDERSCORE)
-                   == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          case PT_CLIST:
-          for (fi = min;; fi++)
-            {
-            const pcre_uint32 *cp;
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM67);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            cp = PRIV(ucd_caseless_sets) + prop_value;
-            for (;;)
-              {
-              if (c < *cp)
-                { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }
-              if (c == *cp++)
-                { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }
-              }
-            }
-          /* Control never gets here */
-
-          case PT_UCNC:
-          for (fi = min;; fi++)
-            {
-            RMATCH(eptr, ecode, offset_top, md, eptrb, RM60);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (fi >= max) RRETURN(MATCH_NOMATCH);
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(c, eptr);
-            if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
-                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
-                 c >= 0xe000) == prop_fail_result)
-              RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
-          /* This should never occur */
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-        }
-
-      /* Match extended Unicode sequences. We will get here only if the
-      support is in the binary; otherwise a compile-time error occurs. */
-
-      else if (ctype == OP_EXTUNI)
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM41);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          else
-            {
-            int lgb, rgb;
-            GETCHARINCTEST(c, eptr);
-            lgb = UCD_GRAPHBREAK(c);
-            while (eptr < md->end_subject)
-              {
-              int len = 1;
-              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-              rgb = UCD_GRAPHBREAK(c);
-              if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-              lgb = rgb;
-              eptr += len;
-              }
-            }
-          CHECK_PARTIAL();
-          }
-        }
-      else
-#endif     /* SUPPORT_UCP */
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM42);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (ctype == OP_ANY && IS_NEWLINE(eptr))
-            RRETURN(MATCH_NOMATCH);
-          GETCHARINC(c, eptr);
-          switch(ctype)
-            {
-            case OP_ANY:               /* This is the non-NL case */
-            if (md->partial != 0 &&    /* Take care with CRLF partial */
-                eptr >= md->end_subject &&
-                NLBLOCK->nltype == NLTYPE_FIXED &&
-                NLBLOCK->nllen == 2 &&
-                c == NLBLOCK->nl[0])
-              {
-              md->hitend = TRUE;
-              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-              }
-            break;
-
-            case OP_ALLANY:
-            case OP_ANYBYTE:
-            break;
-
-            case OP_ANYNL:
-            switch(c)
-              {
-              default: RRETURN(MATCH_NOMATCH);
-              case CHAR_CR:
-              if (eptr < md->end_subject && UCHAR21(eptr) == CHAR_LF) eptr++;
-              break;
-
-              case CHAR_LF:
-              break;
-
-              case CHAR_VT:
-              case CHAR_FF:
-              case CHAR_NEL:
-#ifndef EBCDIC
-              case 0x2028:
-              case 0x2029:
-#endif  /* Not EBCDIC */
-              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-              break;
-              }
-            break;
-
-            case OP_NOT_HSPACE:
-            switch(c)
-              {
-              HSPACE_CASES: RRETURN(MATCH_NOMATCH);
-              default: break;
-              }
-            break;
-
-            case OP_HSPACE:
-            switch(c)
-              {
-              HSPACE_CASES: break;
-              default: RRETURN(MATCH_NOMATCH);
-              }
-            break;
-
-            case OP_NOT_VSPACE:
-            switch(c)
-              {
-              VSPACE_CASES: RRETURN(MATCH_NOMATCH);
-              default: break;
-              }
-            break;
-
-            case OP_VSPACE:
-            switch(c)
-              {
-              VSPACE_CASES: break;
-              default: RRETURN(MATCH_NOMATCH);
-              }
-            break;
-
-            case OP_NOT_DIGIT:
-            if (c < 256 && (md->ctypes[c] & ctype_digit) != 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_DIGIT:
-            if (c >= 256 || (md->ctypes[c] & ctype_digit) == 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_NOT_WHITESPACE:
-            if (c < 256 && (md->ctypes[c] & ctype_space) != 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_WHITESPACE:
-            if (c >= 256 || (md->ctypes[c] & ctype_space) == 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_NOT_WORDCHAR:
-            if (c < 256 && (md->ctypes[c] & ctype_word) != 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_WORDCHAR:
-            if (c >= 256 || (md->ctypes[c] & ctype_word) == 0)
-              RRETURN(MATCH_NOMATCH);
-            break;
-
-            default:
-            RRETURN(PCRE_ERROR_INTERNAL);
-            }
-          }
-        }
-      else
-#endif
-      /* Not UTF mode */
-        {
-        for (fi = min;; fi++)
-          {
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM43);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          if (fi >= max) RRETURN(MATCH_NOMATCH);
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            RRETURN(MATCH_NOMATCH);
-            }
-          if (ctype == OP_ANY && IS_NEWLINE(eptr))
-            RRETURN(MATCH_NOMATCH);
-          c = *eptr++;
-          switch(ctype)
-            {
-            case OP_ANY:               /* This is the non-NL case */
-            if (md->partial != 0 &&    /* Take care with CRLF partial */
-                eptr >= md->end_subject &&
-                NLBLOCK->nltype == NLTYPE_FIXED &&
-                NLBLOCK->nllen == 2 &&
-                c == NLBLOCK->nl[0])
-              {
-              md->hitend = TRUE;
-              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-              }
-            break;
-
-            case OP_ALLANY:
-            case OP_ANYBYTE:
-            break;
-
-            case OP_ANYNL:
-            switch(c)
-              {
-              default: RRETURN(MATCH_NOMATCH);
-              case CHAR_CR:
-              if (eptr < md->end_subject && *eptr == CHAR_LF) eptr++;
-              break;
-
-              case CHAR_LF:
-              break;
-
-              case CHAR_VT:
-              case CHAR_FF:
-              case CHAR_NEL:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              case 0x2028:
-              case 0x2029:
-#endif
-              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
-              break;
-              }
-            break;
-
-            case OP_NOT_HSPACE:
-            switch(c)
-              {
-              default: break;
-              HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              HSPACE_MULTIBYTE_CASES:
-#endif
-              RRETURN(MATCH_NOMATCH);
-              }
-            break;
-
-            case OP_HSPACE:
-            switch(c)
-              {
-              default: RRETURN(MATCH_NOMATCH);
-              HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              HSPACE_MULTIBYTE_CASES:
-#endif
-              break;
-              }
-            break;
-
-            case OP_NOT_VSPACE:
-            switch(c)
-              {
-              default: break;
-              VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              VSPACE_MULTIBYTE_CASES:
-#endif
-              RRETURN(MATCH_NOMATCH);
-              }
-            break;
-
-            case OP_VSPACE:
-            switch(c)
-              {
-              default: RRETURN(MATCH_NOMATCH);
-              VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              VSPACE_MULTIBYTE_CASES:
-#endif
-              break;
-              }
-            break;
-
-            case OP_NOT_DIGIT:
-            if (MAX_255(c) && (md->ctypes[c] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_DIGIT:
-            if (!MAX_255(c) || (md->ctypes[c] & ctype_digit) == 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_NOT_WHITESPACE:
-            if (MAX_255(c) && (md->ctypes[c] & ctype_space) != 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_WHITESPACE:
-            if (!MAX_255(c) || (md->ctypes[c] & ctype_space) == 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_NOT_WORDCHAR:
-            if (MAX_255(c) && (md->ctypes[c] & ctype_word) != 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            case OP_WORDCHAR:
-            if (!MAX_255(c) || (md->ctypes[c] & ctype_word) == 0) RRETURN(MATCH_NOMATCH);
-            break;
-
-            default:
-            RRETURN(PCRE_ERROR_INTERNAL);
-            }
-          }
-        }
-      /* Control never gets here */
-      }
-
-    /* If maximizing, it is worth using inline code for speed, doing the type
-    test once at the start (i.e. keep it out of the loop). Again, keep the
-    UTF-8 and UCP stuff separate. */
-
-    else
-      {
-      pp = eptr;  /* Remember where we started */
-
-#ifdef SUPPORT_UCP
-      if (prop_type >= 0)
-        {
-        switch(prop_type)
-          {
-          case PT_ANY:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if (prop_fail_result) break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_LAMP:
-          for (i = min; i < max; i++)
-            {
-            int chartype;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            chartype = UCD_CHARTYPE(c);
-            if ((chartype == ucp_Lu ||
-                 chartype == ucp_Ll ||
-                 chartype == ucp_Lt) == prop_fail_result)
-              break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_GC:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result) break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_PC:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result) break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_SC:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result) break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_ALNUM:
-          for (i = min; i < max; i++)
-            {
-            int category;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N) == prop_fail_result)
-              break;
-            eptr+= len;
-            }
-          break;
-
-          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
-          which means that Perl space and POSIX space are now identical. PCRE
-          was changed at release 8.34. */
-
-          case PT_SPACE:    /* Perl space */
-          case PT_PXSPACE:  /* POSIX space */
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            switch(c)
-              {
-              HSPACE_CASES:
-              VSPACE_CASES:
-              if (prop_fail_result) goto ENDLOOP99;  /* Break the loop */
-              break;
-
-              default:
-              if ((UCD_CATEGORY(c) == ucp_Z) == prop_fail_result)
-                goto ENDLOOP99;   /* Break the loop */
-              break;
-              }
-            eptr+= len;
-            }
-          ENDLOOP99:
-          break;
-
-          case PT_WORD:
-          for (i = min; i < max; i++)
-            {
-            int category;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            category = UCD_CATEGORY(c);
-            if ((category == ucp_L || category == ucp_N ||
-                 c == CHAR_UNDERSCORE) == prop_fail_result)
-              break;
-            eptr+= len;
-            }
-          break;
-
-          case PT_CLIST:
-          for (i = min; i < max; i++)
-            {
-            const pcre_uint32 *cp;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            cp = PRIV(ucd_caseless_sets) + prop_value;
-            for (;;)
-              {
-              if (c < *cp)
-                { if (prop_fail_result) break; else goto GOT_MAX; }
-              if (c == *cp++)
-                { if (prop_fail_result) goto GOT_MAX; else break; }
-              }
-            eptr += len;
-            }
-          GOT_MAX:
-          break;
-
-          case PT_UCNC:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(c, eptr, len);
-            if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
-                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
-                 c >= 0xe000) == prop_fail_result)
-              break;
-            eptr += len;
-            }
-          break;
-
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-
-        /* eptr is now past the end of the maximum run */
-
-        if (possessive) continue;    /* No backtracking */
-        for(;;)
-          {
-          if (eptr <= pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM44);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          eptr--;
-          if (utf) BACKCHAR(eptr);
-          }
-        }
-
-      /* Match extended Unicode grapheme clusters. We will get here only if the
-      support is in the binary; otherwise a compile-time error occurs. */
-
-      else if (ctype == OP_EXTUNI)
-        {
-        for (i = min; i < max; i++)
-          {
-          if (eptr >= md->end_subject)
-            {
-            SCHECK_PARTIAL();
-            break;
-            }
-          else
-            {
-            int lgb, rgb;
-            GETCHARINCTEST(c, eptr);
-            lgb = UCD_GRAPHBREAK(c);
-            while (eptr < md->end_subject)
-              {
-              int len = 1;
-              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-              rgb = UCD_GRAPHBREAK(c);
-              if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-              lgb = rgb;
-              eptr += len;
-              }
-            }
-          CHECK_PARTIAL();
-          }
-
-        /* eptr is now past the end of the maximum run */
-
-        if (possessive) continue;    /* No backtracking */
-
-        /* We use <= pp rather than == pp to detect the start of the run while
-        backtracking because the use of \C in UTF mode can cause BACKCHAR to
-        move back past pp. This is just palliative; the use of \C in UTF mode
-        is fraught with danger. */
-
-        for(;;)
-          {
-          int lgb, rgb;
-          PCRE_PUCHAR fptr;
-
-          if (eptr <= pp) goto TAIL_RECURSE;   /* At start of char run */
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM45);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-
-          /* Backtracking over an extended grapheme cluster involves inspecting
-          the previous two characters (if present) to see if a break is
-          permitted between them. */
-
-          eptr--;
-          if (!utf) c = *eptr; else
-            {
-            BACKCHAR(eptr);
-            GETCHAR(c, eptr);
-            }
-          rgb = UCD_GRAPHBREAK(c);
-
-          for (;;)
-            {
-            if (eptr <= pp) goto TAIL_RECURSE;   /* At start of char run */
-            fptr = eptr - 1;
-            if (!utf) c = *fptr; else
-              {
-              BACKCHAR(fptr);
-              GETCHAR(c, fptr);
-              }
-            lgb = UCD_GRAPHBREAK(c);
-            if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
-            eptr = fptr;
-            rgb = lgb;
-            }
-          }
-        }
-
-      else
-#endif   /* SUPPORT_UCP */
-
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-        switch(ctype)
-          {
-          case OP_ANY:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (IS_NEWLINE(eptr)) break;
-            if (md->partial != 0 &&    /* Take care with CRLF partial */
-                eptr + 1 >= md->end_subject &&
-                NLBLOCK->nltype == NLTYPE_FIXED &&
-                NLBLOCK->nllen == 2 &&
-                UCHAR21(eptr) == NLBLOCK->nl[0])
-              {
-              md->hitend = TRUE;
-              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-              }
-            eptr++;
-            ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-            }
-          break;
-
-          case OP_ALLANY:
-          if (max < INT_MAX)
-            {
-            for (i = min; i < max; i++)
-              {
-              if (eptr >= md->end_subject)
-                {
-                SCHECK_PARTIAL();
-                break;
-                }
-              eptr++;
-              ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
-              }
-            }
-          else
-            {
-            eptr = md->end_subject;   /* Unlimited UTF-8 repeat */
-            SCHECK_PARTIAL();
-            }
-          break;
-
-          /* The byte case is the same as non-UTF8 */
-
-          case OP_ANYBYTE:
-          c = max - min;
-          if (c > (unsigned int)(md->end_subject - eptr))
-            {
-            eptr = md->end_subject;
-            SCHECK_PARTIAL();
-            }
-          else eptr += c;
-          break;
-
-          case OP_ANYNL:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c == CHAR_CR)
-              {
-              if (++eptr >= md->end_subject) break;
-              if (UCHAR21(eptr) == CHAR_LF) eptr++;
-              }
-            else
-              {
-              if (c != CHAR_LF &&
-                  (md->bsr_anycrlf ||
-                   (c != CHAR_VT && c != CHAR_FF && c != CHAR_NEL
-#ifndef EBCDIC
-                    && c != 0x2028 && c != 0x2029
-#endif  /* Not EBCDIC */
-                    )))
-                break;
-              eptr += len;
-              }
-            }
-          break;
-
-          case OP_NOT_HSPACE:
-          case OP_HSPACE:
-          for (i = min; i < max; i++)
-            {
-            BOOL gotspace;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            switch(c)
-              {
-              HSPACE_CASES: gotspace = TRUE; break;
-              default: gotspace = FALSE; break;
-              }
-            if (gotspace == (ctype == OP_NOT_HSPACE)) break;
-            eptr += len;
-            }
-          break;
-
-          case OP_NOT_VSPACE:
-          case OP_VSPACE:
-          for (i = min; i < max; i++)
-            {
-            BOOL gotspace;
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            switch(c)
-              {
-              VSPACE_CASES: gotspace = TRUE; break;
-              default: gotspace = FALSE; break;
-              }
-            if (gotspace == (ctype == OP_NOT_VSPACE)) break;
-            eptr += len;
-            }
-          break;
-
-          case OP_NOT_DIGIT:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c < 256 && (md->ctypes[c] & ctype_digit) != 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_DIGIT:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c >= 256 ||(md->ctypes[c] & ctype_digit) == 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_NOT_WHITESPACE:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c < 256 && (md->ctypes[c] & ctype_space) != 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_WHITESPACE:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c >= 256 ||(md->ctypes[c] & ctype_space) == 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_NOT_WORDCHAR:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c < 256 && (md->ctypes[c] & ctype_word) != 0) break;
-            eptr+= len;
-            }
-          break;
-
-          case OP_WORDCHAR:
-          for (i = min; i < max; i++)
-            {
-            int len = 1;
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLEN(c, eptr, len);
-            if (c >= 256 || (md->ctypes[c] & ctype_word) == 0) break;
-            eptr+= len;
-            }
-          break;
-
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-
-        if (possessive) continue;    /* No backtracking */
-        for(;;)
-          {
-          if (eptr <= pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM46);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          eptr--;
-          BACKCHAR(eptr);
-          if (ctype == OP_ANYNL && eptr > pp  && UCHAR21(eptr) == CHAR_NL &&
-              UCHAR21(eptr - 1) == CHAR_CR) eptr--;
-          }
-        }
-      else
-#endif  /* SUPPORT_UTF */
-      /* Not UTF mode */
-        {
-        switch(ctype)
-          {
-          case OP_ANY:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (IS_NEWLINE(eptr)) break;
-            if (md->partial != 0 &&    /* Take care with CRLF partial */
-                eptr + 1 >= md->end_subject &&
-                NLBLOCK->nltype == NLTYPE_FIXED &&
-                NLBLOCK->nllen == 2 &&
-                *eptr == NLBLOCK->nl[0])
-              {
-              md->hitend = TRUE;
-              if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
-              }
-            eptr++;
-            }
-          break;
-
-          case OP_ALLANY:
-          case OP_ANYBYTE:
-          c = max - min;
-          if (c > (unsigned int)(md->end_subject - eptr))
-            {
-            eptr = md->end_subject;
-            SCHECK_PARTIAL();
-            }
-          else eptr += c;
-          break;
-
-          case OP_ANYNL:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            c = *eptr;
-            if (c == CHAR_CR)
-              {
-              if (++eptr >= md->end_subject) break;
-              if (*eptr == CHAR_LF) eptr++;
-              }
-            else
-              {
-              if (c != CHAR_LF && (md->bsr_anycrlf ||
-                 (c != CHAR_VT && c != CHAR_FF && c != CHAR_NEL
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-                 && c != 0x2028 && c != 0x2029
-#endif
-                 ))) break;
-              eptr++;
-              }
-            }
-          break;
-
-          case OP_NOT_HSPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            switch(*eptr)
-              {
-              default: eptr++; break;
-              HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              HSPACE_MULTIBYTE_CASES:
-#endif
-              goto ENDLOOP00;
-              }
-            }
-          ENDLOOP00:
-          break;
-
-          case OP_HSPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            switch(*eptr)
-              {
-              default: goto ENDLOOP01;
-              HSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              HSPACE_MULTIBYTE_CASES:
-#endif
-              eptr++; break;
-              }
-            }
-          ENDLOOP01:
-          break;
-
-          case OP_NOT_VSPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            switch(*eptr)
-              {
-              default: eptr++; break;
-              VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              VSPACE_MULTIBYTE_CASES:
-#endif
-              goto ENDLOOP02;
-              }
-            }
-          ENDLOOP02:
-          break;
-
-          case OP_VSPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            switch(*eptr)
-              {
-              default: goto ENDLOOP03;
-              VSPACE_BYTE_CASES:
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-              VSPACE_MULTIBYTE_CASES:
-#endif
-              eptr++; break;
-              }
-            }
-          ENDLOOP03:
-          break;
-
-          case OP_NOT_DIGIT:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_digit) != 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_DIGIT:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_digit) == 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_NOT_WHITESPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_space) != 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_WHITESPACE:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_space) == 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_NOT_WORDCHAR:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_word) != 0) break;
-            eptr++;
-            }
-          break;
-
-          case OP_WORDCHAR:
-          for (i = min; i < max; i++)
-            {
-            if (eptr >= md->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_word) == 0) break;
-            eptr++;
-            }
-          break;
-
-          default:
-          RRETURN(PCRE_ERROR_INTERNAL);
-          }
-
-        if (possessive) continue;    /* No backtracking */
-        for (;;)
-          {
-          if (eptr == pp) goto TAIL_RECURSE;
-          RMATCH(eptr, ecode, offset_top, md, eptrb, RM47);
-          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-          eptr--;
-          if (ctype == OP_ANYNL && eptr > pp  && *eptr == CHAR_LF &&
-              eptr[-1] == CHAR_CR) eptr--;
-          }
-        }
-
-      /* Control never gets here */
-      }
-
-    /* There's been some horrible disaster. Arrival here can only mean there is
-    something seriously wrong in the code above or the OP_xxx definitions. */
-
-    default:
-    DPRINTF(("Unknown opcode %d\n", *ecode));
-    RRETURN(PCRE_ERROR_UNKNOWN_OPCODE);
-    }
-
-  /* Do not stick any code in here without much thought; it is assumed
-  that "continue" in the code above comes out to here to repeat the main
-  loop. */
-
-  }             /* End of main loop */
-/* Control never reaches here */
-
-
-/* When compiling to use the heap rather than the stack for recursive calls to
-match(), the RRETURN() macro jumps here. The number that is saved in
-frame->Xwhere indicates which label we actually want to return to. */
-
-#ifdef NO_RECURSE
-#define LBL(val) case val: goto L_RM##val;
-HEAP_RETURN:
-switch (frame->Xwhere)
-  {
-  LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)
-  LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)
-  LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)
-  LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
-  LBL(53) LBL(54) LBL(55) LBL(56) LBL(57) LBL(58) LBL(63) LBL(64)
-  LBL(65) LBL(66)
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-  LBL(20) LBL(21)
-#endif
-#ifdef SUPPORT_UTF
-  LBL(16) LBL(18)
-  LBL(22) LBL(23) LBL(28) LBL(30)
-  LBL(32) LBL(34) LBL(42) LBL(46)
-#ifdef SUPPORT_UCP
-  LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
-  LBL(59) LBL(60) LBL(61) LBL(62) LBL(67)
-#endif  /* SUPPORT_UCP */
-#endif  /* SUPPORT_UTF */
-  default:
-  DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
-  return PCRE_ERROR_INTERNAL;
-  }
-#undef LBL
-#endif  /* NO_RECURSE */
-}
-
-
-/***************************************************************************
-****************************************************************************
-                   RECURSION IN THE match() FUNCTION
-
-Undefine all the macros that were defined above to handle this. */
-
-#ifdef NO_RECURSE
-#undef eptr
-#undef ecode
-#undef mstart
-#undef offset_top
-#undef eptrb
-#undef flags
-
-#undef callpat
-#undef charptr
-#undef data
-#undef next
-#undef pp
-#undef prev
-#undef saved_eptr
-
-#undef new_recursive
-
-#undef cur_is_word
-#undef condition
-#undef prev_is_word
-
-#undef ctype
-#undef length
-#undef max
-#undef min
-#undef number
-#undef offset
-#undef op
-#undef save_capture_last
-#undef save_offset1
-#undef save_offset2
-#undef save_offset3
-#undef stacksave
-
-#undef newptrb
-
-#endif
-
-/* These two are defined as macros in both cases */
-
-#undef fc
-#undef fi
-
-/***************************************************************************
-***************************************************************************/
-
-
-#ifdef NO_RECURSE
-/*************************************************
-*          Release allocated heap frames         *
-*************************************************/
-
-/* This function releases all the allocated frames. The base frame is on the
-machine stack, and so must not be freed.
-
-Argument: the address of the base frame
-Returns:  nothing
-*/
-
-static void
-release_match_heapframes (heapframe *frame_base)
-{
-heapframe *nextframe = frame_base->Xnextframe;
-while (nextframe != NULL)
-  {
-  heapframe *oldframe = nextframe;
-  nextframe = nextframe->Xnextframe;
-  (PUBL(stack_free))(oldframe);
-  }
-}
-#endif
-
-
-/*************************************************
-*         Execute a Regular Expression           *
-*************************************************/
-
-/* This function applies a compiled re to a subject string and picks out
-portions of the string if it matches. Two elements in the vector are set for
-each substring: the offsets to the start and end of the substring.
-
-Arguments:
-  argument_re     points to the compiled expression
-  extra_data      points to extra data or is NULL
-  subject         points to the subject string
-  length          length of subject string (may contain binary zeros)
-  start_offset    where to start in the subject string
-  options         option bits
-  offsets         points to a vector of ints to be filled in with offsets
-  offsetcount     the number of elements in the vector
-
-Returns:          > 0 => success; value is the number of elements filled in
-                  = 0 => success, but offsets is not big enough
-                   -1 => failed to match
-                 < -1 => some kind of unexpected problem
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
-  PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
-  int offsetcount)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_exec(const pcre16 *argument_re, const pcre16_extra *extra_data,
-  PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets,
-  int offsetcount)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_exec(const pcre32 *argument_re, const pcre32_extra *extra_data,
-  PCRE_SPTR32 subject, int length, int start_offset, int options, int *offsets,
-  int offsetcount)
-#endif
-{
-int rc, ocount, arg_offset_max;
-int newline;
-BOOL using_temporary_offsets = FALSE;
-BOOL anchored;
-BOOL startline;
-BOOL firstline;
-BOOL utf;
-BOOL has_first_char = FALSE;
-BOOL has_req_char = FALSE;
-pcre_uchar first_char = 0;
-pcre_uchar first_char2 = 0;
-pcre_uchar req_char = 0;
-pcre_uchar req_char2 = 0;
-match_data match_block;
-match_data *md = &match_block;
-const pcre_uint8 *tables;
-const pcre_uint8 *start_bits = NULL;
-PCRE_PUCHAR start_match = (PCRE_PUCHAR)subject + start_offset;
-PCRE_PUCHAR end_subject;
-PCRE_PUCHAR start_partial = NULL;
-PCRE_PUCHAR match_partial = NULL;
-PCRE_PUCHAR req_char_ptr = start_match - 1;
-
-const pcre_study_data *study;
-const REAL_PCRE *re = (const REAL_PCRE *)argument_re;
-
-#ifdef NO_RECURSE
-heapframe frame_zero;
-frame_zero.Xprevframe = NULL;            /* Marks the top level */
-frame_zero.Xnextframe = NULL;            /* None are allocated yet */
-md->match_frames_base = &frame_zero;
-#endif
-
-/* Check for the special magic call that measures the size of the stack used
-per recursive call of match(). Without the funny casting for sizeof, a Windows
-compiler gave this error: "unary minus operator applied to unsigned type,
-result still unsigned". Hopefully the cast fixes that. */
-
-if (re == NULL && extra_data == NULL && subject == NULL && length == -999 &&
-    start_offset == -999)
-#ifdef NO_RECURSE
-  return -((int)sizeof(heapframe));
-#else
-  return match(NULL, NULL, NULL, 0, NULL, NULL, 0);
-#endif
-
-/* Plausibility checks */
-
-if ((options & ~PUBLIC_EXEC_OPTIONS) != 0) return PCRE_ERROR_BADOPTION;
-if (re == NULL || subject == NULL || (offsets == NULL && offsetcount > 0))
-  return PCRE_ERROR_NULL;
-if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;
-if (length < 0) return PCRE_ERROR_BADLENGTH;
-if (start_offset < 0 || start_offset > length) return PCRE_ERROR_BADOFFSET;
-
-/* Check that the first field in the block is the magic number. If it is not,
-return with PCRE_ERROR_BADMAGIC. However, if the magic number is equal to
-REVERSED_MAGIC_NUMBER we return with PCRE_ERROR_BADENDIANNESS, which
-means that the pattern is likely compiled with different endianness. */
-
-if (re->magic_number != MAGIC_NUMBER)
-  return re->magic_number == REVERSED_MAGIC_NUMBER?
-    PCRE_ERROR_BADENDIANNESS:PCRE_ERROR_BADMAGIC;
-if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
-
-/* These two settings are used in the code for checking a UTF-8 string that
-follows immediately afterwards. Other values in the md block are used only
-during "normal" pcre_exec() processing, not when the JIT support is in use,
-so they are set up later. */
-
-/* PCRE_UTF16 has the same value as PCRE_UTF8. */
-utf = md->utf = (re->options & PCRE_UTF8) != 0;
-md->partial = ((options & PCRE_PARTIAL_HARD) != 0)? 2 :
-              ((options & PCRE_PARTIAL_SOFT) != 0)? 1 : 0;
-
-/* Check a UTF-8 string if required. Pass back the character offset and error
-code for an invalid string if a results vector is available. */
-
-#ifdef SUPPORT_UTF
-if (utf && (options & PCRE_NO_UTF8_CHECK) == 0)
-  {
-  int erroroffset;
-  int errorcode = PRIV(valid_utf)((PCRE_PUCHAR)subject, length, &erroroffset);
-  if (errorcode != 0)
-    {
-    if (offsetcount >= 2)
-      {
-      offsets[0] = erroroffset;
-      offsets[1] = errorcode;
-      }
-#if defined COMPILE_PCRE8
-    return (errorcode <= PCRE_UTF8_ERR5 && md->partial > 1)?
-      PCRE_ERROR_SHORTUTF8 : PCRE_ERROR_BADUTF8;
-#elif defined COMPILE_PCRE16
-    return (errorcode <= PCRE_UTF16_ERR1 && md->partial > 1)?
-      PCRE_ERROR_SHORTUTF16 : PCRE_ERROR_BADUTF16;
-#elif defined COMPILE_PCRE32
-    return PCRE_ERROR_BADUTF32;
-#endif
-    }
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-  /* Check that a start_offset points to the start of a UTF character. */
-  if (start_offset > 0 && start_offset < length &&
-      NOT_FIRSTCHAR(((PCRE_PUCHAR)subject)[start_offset]))
-    return PCRE_ERROR_BADUTF8_OFFSET;
-#endif
-  }
-#endif
-
-/* If the pattern was successfully studied with JIT support, run the JIT
-executable instead of the rest of this function. Most options must be set at
-compile time for the JIT code to be usable. Fallback to the normal code path if
-an unsupported flag is set. */
-
-#ifdef SUPPORT_JIT
-if (extra_data != NULL
-    && (extra_data->flags & (PCRE_EXTRA_EXECUTABLE_JIT |
-                             PCRE_EXTRA_TABLES)) == PCRE_EXTRA_EXECUTABLE_JIT
-    && extra_data->executable_jit != NULL
-    && (options & ~PUBLIC_JIT_EXEC_OPTIONS) == 0)
-  {
-  rc = PRIV(jit_exec)(extra_data, (const pcre_uchar *)subject, length,
-       start_offset, options, offsets, offsetcount);
-
-  /* PCRE_ERROR_NULL means that the selected normal or partial matching
-  mode is not compiled. In this case we simply fallback to interpreter. */
-
-  if (rc != PCRE_ERROR_JIT_BADOPTION) return rc;
-  }
-#endif
-
-/* Carry on with non-JIT matching. This information is for finding all the
-numbers associated with a given name, for condition testing. */
-
-md->name_table = (pcre_uchar *)re + re->name_table_offset;
-md->name_count = re->name_count;
-md->name_entry_size = re->name_entry_size;
-
-/* Fish out the optional data from the extra_data structure, first setting
-the default values. */
-
-study = NULL;
-md->match_limit = MATCH_LIMIT;
-md->match_limit_recursion = MATCH_LIMIT_RECURSION;
-md->callout_data = NULL;
-
-/* The table pointer is always in native byte order. */
-
-tables = re->tables;
-
-/* The two limit values override the defaults, whatever their value. */
-
-if (extra_data != NULL)
-  {
-  unsigned long int flags = extra_data->flags;
-  if ((flags & PCRE_EXTRA_STUDY_DATA) != 0)
-    study = (const pcre_study_data *)extra_data->study_data;
-  if ((flags & PCRE_EXTRA_MATCH_LIMIT) != 0)
-    md->match_limit = extra_data->match_limit;
-  if ((flags & PCRE_EXTRA_MATCH_LIMIT_RECURSION) != 0)
-    md->match_limit_recursion = extra_data->match_limit_recursion;
-  if ((flags & PCRE_EXTRA_CALLOUT_DATA) != 0)
-    md->callout_data = extra_data->callout_data;
-  if ((flags & PCRE_EXTRA_TABLES) != 0) tables = extra_data->tables;
-  }
-
-/* Limits in the regex override only if they are smaller. */
-
-if ((re->flags & PCRE_MLSET) != 0 && re->limit_match < md->match_limit)
-  md->match_limit = re->limit_match;
-
-if ((re->flags & PCRE_RLSET) != 0 &&
-    re->limit_recursion < md->match_limit_recursion)
-  md->match_limit_recursion = re->limit_recursion;
-
-/* If the exec call supplied NULL for tables, use the inbuilt ones. This
-is a feature that makes it possible to save compiled regex and re-use them
-in other programs later. */
-
-if (tables == NULL) tables = PRIV(default_tables);
-
-/* Set up other data */
-
-anchored = ((re->options | options) & PCRE_ANCHORED) != 0;
-startline = (re->flags & PCRE_STARTLINE) != 0;
-firstline = (re->options & PCRE_FIRSTLINE) != 0;
-
-/* The code starts after the real_pcre block and the capture name table. */
-
-md->start_code = (const pcre_uchar *)re + re->name_table_offset +
-  re->name_count * re->name_entry_size;
-
-md->start_subject = (PCRE_PUCHAR)subject;
-md->start_offset = start_offset;
-md->end_subject = md->start_subject + length;
-end_subject = md->end_subject;
-
-md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
-md->use_ucp = (re->options & PCRE_UCP) != 0;
-md->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;
-md->ignore_skip_arg = 0;
-
-/* Some options are unpacked into BOOL variables in the hope that testing
-them will be faster than individual option bits. */
-
-md->notbol = (options & PCRE_NOTBOL) != 0;
-md->noteol = (options & PCRE_NOTEOL) != 0;
-md->notempty = (options & PCRE_NOTEMPTY) != 0;
-md->notempty_atstart = (options & PCRE_NOTEMPTY_ATSTART) != 0;
-
-md->hitend = FALSE;
-md->mark = md->nomatch_mark = NULL;     /* In case never set */
-
-md->recursive = NULL;                   /* No recursion at top level */
-md->hasthen = (re->flags & PCRE_HASTHEN) != 0;
-
-md->lcc = tables + lcc_offset;
-md->fcc = tables + fcc_offset;
-md->ctypes = tables + ctypes_offset;
-
-/* Handle different \R options. */
-
-switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
-  {
-  case 0:
-  if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
-    md->bsr_anycrlf = (re->options & PCRE_BSR_ANYCRLF) != 0;
-  else
-#ifdef BSR_ANYCRLF
-  md->bsr_anycrlf = TRUE;
-#else
-  md->bsr_anycrlf = FALSE;
-#endif
-  break;
-
-  case PCRE_BSR_ANYCRLF:
-  md->bsr_anycrlf = TRUE;
-  break;
-
-  case PCRE_BSR_UNICODE:
-  md->bsr_anycrlf = FALSE;
-  break;
-
-  default: return PCRE_ERROR_BADNEWLINE;
-  }
-
-/* Handle different types of newline. The three bits give eight cases. If
-nothing is set at run time, whatever was used at compile time applies. */
-
-switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options :
-        (pcre_uint32)options) & PCRE_NEWLINE_BITS)
-  {
-  case 0: newline = NEWLINE; break;   /* Compile-time default */
-  case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
-  case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
-  case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
-  case PCRE_NEWLINE_ANY: newline = -1; break;
-  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
-  default: return PCRE_ERROR_BADNEWLINE;
-  }
-
-if (newline == -2)
-  {
-  md->nltype = NLTYPE_ANYCRLF;
-  }
-else if (newline < 0)
-  {
-  md->nltype = NLTYPE_ANY;
-  }
-else
-  {
-  md->nltype = NLTYPE_FIXED;
-  if (newline > 255)
-    {
-    md->nllen = 2;
-    md->nl[0] = (newline >> 8) & 255;
-    md->nl[1] = newline & 255;
-    }
-  else
-    {
-    md->nllen = 1;
-    md->nl[0] = newline;
-    }
-  }
-
-/* Partial matching was originally supported only for a restricted set of
-regexes; from release 8.00 there are no restrictions, but the bits are still
-defined (though never set). So there's no harm in leaving this code. */
-
-if (md->partial && (re->flags & PCRE_NOPARTIAL) != 0)
-  return PCRE_ERROR_BADPARTIAL;
-
-/* If the expression has got more back references than the offsets supplied can
-hold, we get a temporary chunk of working store to use during the matching.
-Otherwise, we can use the vector supplied, rounding down its size to a multiple
-of 3. */
-
-ocount = offsetcount - (offsetcount % 3);
-arg_offset_max = (2*ocount)/3;
-
-if (re->top_backref > 0 && re->top_backref >= ocount/3)
-  {
-  ocount = re->top_backref * 3 + 3;
-  md->offset_vector = (int *)(PUBL(malloc))(ocount * sizeof(int));
-  if (md->offset_vector == NULL) return PCRE_ERROR_NOMEMORY;
-  using_temporary_offsets = TRUE;
-  DPRINTF(("Got memory to hold back references\n"));
-  }
-else md->offset_vector = offsets;
-md->offset_end = ocount;
-md->offset_max = (2*ocount)/3;
-md->capture_last = 0;
-
-/* Reset the working variable associated with each extraction. These should
-never be used unless previously set, but they get saved and restored, and so we
-initialize them to avoid reading uninitialized locations. Also, unset the
-offsets for the matched string. This is really just for tidiness with callouts,
-in case they inspect these fields. */
-
-if (md->offset_vector != NULL)
-  {
-  register int *iptr = md->offset_vector + ocount;
-  register int *iend = iptr - re->top_bracket;
-  if (iend < md->offset_vector + 2) iend = md->offset_vector + 2;
-  while (--iptr >= iend) *iptr = -1;
-  if (offsetcount > 0) md->offset_vector[0] = -1;
-  if (offsetcount > 1) md->offset_vector[1] = -1;
-  }
-
-/* Set up the first character to match, if available. The first_char value is
-never set for an anchored regular expression, but the anchoring may be forced
-at run time, so we have to test for anchoring. The first char may be unset for
-an unanchored pattern, of course. If there's no first char and the pattern was
-studied, there may be a bitmap of possible first characters. */
-
-if (!anchored)
-  {
-  if ((re->flags & PCRE_FIRSTSET) != 0)
-    {
-    has_first_char = TRUE;
-    first_char = first_char2 = (pcre_uchar)(re->first_char);
-    if ((re->flags & PCRE_FCH_CASELESS) != 0)
-      {
-      first_char2 = TABLE_GET(first_char, md->fcc, first_char);
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-      if (utf && first_char > 127)
-        first_char2 = UCD_OTHERCASE(first_char);
-#endif
-      }
-    }
-  else
-    if (!startline && study != NULL &&
-      (study->flags & PCRE_STUDY_MAPPED) != 0)
-        start_bits = study->start_bits;
-  }
-
-/* For anchored or unanchored matches, there may be a "last known required
-character" set. */
-
-if ((re->flags & PCRE_REQCHSET) != 0)
-  {
-  has_req_char = TRUE;
-  req_char = req_char2 = (pcre_uchar)(re->req_char);
-  if ((re->flags & PCRE_RCH_CASELESS) != 0)
-    {
-    req_char2 = TABLE_GET(req_char, md->fcc, req_char);
-#if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
-    if (utf && req_char > 127)
-      req_char2 = UCD_OTHERCASE(req_char);
-#endif
-    }
-  }
-
-
-/* ==========================================================================*/
-
-/* Loop for handling unanchored repeated matching attempts; for anchored regexs
-the loop runs just once. */
-
-for(;;)
-  {
-  PCRE_PUCHAR save_end_subject = end_subject;
-  PCRE_PUCHAR new_start_match;
-
-  /* If firstline is TRUE, the start of the match is constrained to the first
-  line of a multiline string. That is, the match must be before or at the first
-  newline. Implement this by temporarily adjusting end_subject so that we stop
-  scanning at a newline. If the match fails at the newline, later code breaks
-  this loop. */
-
-  if (firstline)
-    {
-    PCRE_PUCHAR t = start_match;
-#ifdef SUPPORT_UTF
-    if (utf)
-      {
-      while (t < md->end_subject && !IS_NEWLINE(t))
-        {
-        t++;
-        ACROSSCHAR(t < end_subject, *t, t++);
-        }
-      }
-    else
-#endif
-    while (t < md->end_subject && !IS_NEWLINE(t)) t++;
-    end_subject = t;
-    }
-
-  /* There are some optimizations that avoid running the match if a known
-  starting point is not found, or if a known later character is not present.
-  However, there is an option that disables these, for testing and for ensuring
-  that all callouts do actually occur. The option can be set in the regex by
-  (*NO_START_OPT) or passed in match-time options. */
-
-  if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0)
-    {
-    /* Advance to a unique first char if there is one. */
-
-    if (has_first_char)
-      {
-      pcre_uchar smc;
-
-      if (first_char != first_char2)
-        while (start_match < end_subject &&
-          (smc = UCHAR21TEST(start_match)) != first_char && smc != first_char2)
-          start_match++;
-      else
-        while (start_match < end_subject && UCHAR21TEST(start_match) != first_char)
-          start_match++;
-      }
-
-    /* Or to just after a linebreak for a multiline match */
-
-    else if (startline)
-      {
-      if (start_match > md->start_subject + start_offset)
-        {
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-          while (start_match < end_subject && !WAS_NEWLINE(start_match))
-            {
-            start_match++;
-            ACROSSCHAR(start_match < end_subject, *start_match,
-              start_match++);
-            }
-          }
-        else
-#endif
-        while (start_match < end_subject && !WAS_NEWLINE(start_match))
-          start_match++;
-
-        /* If we have just passed a CR and the newline option is ANY or ANYCRLF,
-        and we are now at a LF, advance the match position by one more character.
-        */
-
-        if (start_match[-1] == CHAR_CR &&
-             (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
-             start_match < end_subject &&
-             UCHAR21TEST(start_match) == CHAR_NL)
-          start_match++;
-        }
-      }
-
-    /* Or to a non-unique first byte after study */
-
-    else if (start_bits != NULL)
-      {
-      while (start_match < end_subject)
-        {
-        register pcre_uint32 c = UCHAR21TEST(start_match);
-#ifndef COMPILE_PCRE8
-        if (c > 255) c = 255;
-#endif
-        if ((start_bits[c/8] & (1 << (c&7))) != 0) break;
-        start_match++;
-        }
-      }
-    }   /* Starting optimizations */
-
-  /* Restore fudged end_subject */
-
-  end_subject = save_end_subject;
-
-  /* The following two optimizations are disabled for partial matching or if
-  disabling is explicitly requested. */
-
-  if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0 && !md->partial)
-    {
-    /* If the pattern was studied, a minimum subject length may be set. This is
-    a lower bound; no actual string of that length may actually match the
-    pattern. Although the value is, strictly, in characters, we treat it as
-    bytes to avoid spending too much time in this optimization. */
-
-    if (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0 &&
-        (pcre_uint32)(end_subject - start_match) < study->minlength)
-      {
-      rc = MATCH_NOMATCH;
-      break;
-      }
-
-    /* If req_char is set, we know that that character must appear in the
-    subject for the match to succeed. If the first character is set, req_char
-    must be later in the subject; otherwise the test starts at the match point.
-    This optimization can save a huge amount of backtracking in patterns with
-    nested unlimited repeats that aren't going to match. Writing separate code
-    for cased/caseless versions makes it go faster, as does using an
-    autoincrement and backing off on a match.
-
-    HOWEVER: when the subject string is very, very long, searching to its end
-    can take a long time, and give bad performance on quite ordinary patterns.
-    This showed up when somebody was matching something like /^\d+C/ on a
-    32-megabyte string... so we don't do this when the string is sufficiently
-    long. */
-
-    if (has_req_char && end_subject - start_match < REQ_BYTE_MAX)
-      {
-      register PCRE_PUCHAR p = start_match + (has_first_char? 1:0);
-
-      /* We don't need to repeat the search if we haven't yet reached the
-      place we found it at last time. */
-
-      if (p > req_char_ptr)
-        {
-        if (req_char != req_char2)
-          {
-          while (p < end_subject)
-            {
-            register pcre_uint32 pp = UCHAR21INCTEST(p);
-            if (pp == req_char || pp == req_char2) { p--; break; }
-            }
-          }
-        else
-          {
-          while (p < end_subject)
-            {
-            if (UCHAR21INCTEST(p) == req_char) { p--; break; }
-            }
-          }
-
-        /* If we can't find the required character, break the matching loop,
-        forcing a match failure. */
-
-        if (p >= end_subject)
-          {
-          rc = MATCH_NOMATCH;
-          break;
-          }
-
-        /* If we have found the required character, save the point where we
-        found it, so that we don't search again next time round the loop if
-        the start hasn't passed this character yet. */
-
-        req_char_ptr = p;
-        }
-      }
-    }
-
-#ifdef PCRE_DEBUG  /* Sigh. Some compilers never learn. */
-  printf(">>>> Match against: ");
-  pchars(start_match, end_subject - start_match, TRUE, md);
-  printf("\n");
-#endif
-
-  /* OK, we can now run the match. If "hitend" is set afterwards, remember the
-  first starting point for which a partial match was found. */
-
-  md->start_match_ptr = start_match;
-  md->start_used_ptr = start_match;
-  md->match_call_count = 0;
-  md->match_function_type = 0;
-  md->end_offset_top = 0;
-  md->skip_arg_count = 0;
-  rc = match(start_match, md->start_code, start_match, 2, md, NULL, 0);
-  if (md->hitend && start_partial == NULL)
-    {
-    start_partial = md->start_used_ptr;
-    match_partial = start_match;
-    }
-
-  switch(rc)
-    {
-    /* If MATCH_SKIP_ARG reaches this level it means that a MARK that matched
-    the SKIP's arg was not found. In this circumstance, Perl ignores the SKIP
-    entirely. The only way we can do that is to re-do the match at the same
-    point, with a flag to force SKIP with an argument to be ignored. Just
-    treating this case as NOMATCH does not work because it does not check other
-    alternatives in patterns such as A(*SKIP:A)B|AC when the subject is AC. */
-
-    case MATCH_SKIP_ARG:
-    new_start_match = start_match;
-    md->ignore_skip_arg = md->skip_arg_count;
-    break;
-
-    /* SKIP passes back the next starting point explicitly, but if it is no
-    greater than the match we have just done, treat it as NOMATCH. */
-
-    case MATCH_SKIP:
-    if (md->start_match_ptr > start_match)
-      {
-      new_start_match = md->start_match_ptr;
-      break;
-      }
-    /* Fall through */
-
-    /* NOMATCH and PRUNE advance by one character. THEN at this level acts
-    exactly like PRUNE. Unset ignore SKIP-with-argument. */
-
-    case MATCH_NOMATCH:
-    case MATCH_PRUNE:
-    case MATCH_THEN:
-    md->ignore_skip_arg = 0;
-    new_start_match = start_match + 1;
-#ifdef SUPPORT_UTF
-    if (utf)
-      ACROSSCHAR(new_start_match < end_subject, *new_start_match,
-        new_start_match++);
-#endif
-    break;
-
-    /* COMMIT disables the bumpalong, but otherwise behaves as NOMATCH. */
-
-    case MATCH_COMMIT:
-    rc = MATCH_NOMATCH;
-    goto ENDLOOP;
-
-    /* Any other return is either a match, or some kind of error. */
-
-    default:
-    goto ENDLOOP;
-    }
-
-  /* Control reaches here for the various types of "no match at this point"
-  result. Reset the code to MATCH_NOMATCH for subsequent checking. */
-
-  rc = MATCH_NOMATCH;
-
-  /* If PCRE_FIRSTLINE is set, the match must happen before or at the first
-  newline in the subject (though it may continue over the newline). Therefore,
-  if we have just failed to match, starting at a newline, do not continue. */
-
-  if (firstline && IS_NEWLINE(start_match)) break;
-
-  /* Advance to new matching position */
-
-  start_match = new_start_match;
-
-  /* Break the loop if the pattern is anchored or if we have passed the end of
-  the subject. */
-
-  if (anchored || start_match > end_subject) break;
-
-  /* If we have just passed a CR and we are now at a LF, and the pattern does
-  not contain any explicit matches for \r or \n, and the newline option is CRLF
-  or ANY or ANYCRLF, advance the match position by one more character. In
-  normal matching start_match will aways be greater than the first position at
-  this stage, but a failed *SKIP can cause a return at the same point, which is
-  why the first test exists. */
-
-  if (start_match > (PCRE_PUCHAR)subject + start_offset &&
-      start_match[-1] == CHAR_CR &&
-      start_match < end_subject &&
-      *start_match == CHAR_NL &&
-      (re->flags & PCRE_HASCRORLF) == 0 &&
-        (md->nltype == NLTYPE_ANY ||
-         md->nltype == NLTYPE_ANYCRLF ||
-         md->nllen == 2))
-    start_match++;
-
-  md->mark = NULL;   /* Reset for start of next match attempt */
-  }                  /* End of for(;;) "bumpalong" loop */
-
-/* ==========================================================================*/
-
-/* We reach here when rc is not MATCH_NOMATCH, or if one of the stopping
-conditions is true:
-
-(1) The pattern is anchored or the match was failed by (*COMMIT);
-
-(2) We are past the end of the subject;
-
-(3) PCRE_FIRSTLINE is set and we have failed to match at a newline, because
-    this option requests that a match occur at or before the first newline in
-    the subject.
-
-When we have a match and the offset vector is big enough to deal with any
-backreferences, captured substring offsets will already be set up. In the case
-where we had to get some local store to hold offsets for backreference
-processing, copy those that we can. In this case there need not be overflow if
-certain parts of the pattern were not used, even though there are more
-capturing parentheses than vector slots. */
-
-ENDLOOP:
-
-if (rc == MATCH_MATCH || rc == MATCH_ACCEPT)
-  {
-  if (using_temporary_offsets)
-    {
-    if (arg_offset_max >= 4)
-      {
-      memcpy(offsets + 2, md->offset_vector + 2,
-        (arg_offset_max - 2) * sizeof(int));
-      DPRINTF(("Copied offsets from temporary memory\n"));
-      }
-    if (md->end_offset_top > arg_offset_max) md->capture_last |= OVFLBIT;
-    DPRINTF(("Freeing temporary memory\n"));
-    (PUBL(free))(md->offset_vector);
-    }
-
-  /* Set the return code to the number of captured strings, or 0 if there were
-  too many to fit into the vector. */
-
-  rc = ((md->capture_last & OVFLBIT) != 0 &&
-         md->end_offset_top >= arg_offset_max)?
-    0 : md->end_offset_top/2;
-
-  /* If there is space in the offset vector, set any unused pairs at the end of
-  the pattern to -1 for backwards compatibility. It is documented that this
-  happens. In earlier versions, the whole set of potential capturing offsets
-  was set to -1 each time round the loop, but this is handled differently now.
-  "Gaps" are set to -1 dynamically instead (this fixes a bug). Thus, it is only
-  those at the end that need unsetting here. We can't just unset them all at
-  the start of the whole thing because they may get set in one branch that is
-  not the final matching branch. */
-
-  if (md->end_offset_top/2 <= re->top_bracket && offsets != NULL)
-    {
-    register int *iptr, *iend;
-    int resetcount = 2 + re->top_bracket * 2;
-    if (resetcount > offsetcount) resetcount = offsetcount;
-    iptr = offsets + md->end_offset_top;
-    iend = offsets + resetcount;
-    while (iptr < iend) *iptr++ = -1;
-    }
-
-  /* If there is space, set up the whole thing as substring 0. The value of
-  md->start_match_ptr might be modified if \K was encountered on the success
-  matching path. */
-
-  if (offsetcount < 2) rc = 0; else
-    {
-    offsets[0] = (int)(md->start_match_ptr - md->start_subject);
-    offsets[1] = (int)(md->end_match_ptr - md->start_subject);
-    }
-
-  /* Return MARK data if requested */
-
-  if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_MARK) != 0)
-    *(extra_data->mark) = (pcre_uchar *)md->mark;
-  DPRINTF((">>>> returning %d\n", rc));
-#ifdef NO_RECURSE
-  release_match_heapframes(&frame_zero);
-#endif
-  return rc;
-  }
-
-/* Control gets here if there has been an error, or if the overall match
-attempt has failed at all permitted starting positions. */
-
-if (using_temporary_offsets)
-  {
-  DPRINTF(("Freeing temporary memory\n"));
-  (PUBL(free))(md->offset_vector);
-  }
-
-/* For anything other than nomatch or partial match, just return the code. */
-
-if (rc != MATCH_NOMATCH && rc != PCRE_ERROR_PARTIAL)
-  {
-  DPRINTF((">>>> error: returning %d\n", rc));
-#ifdef NO_RECURSE
-  release_match_heapframes(&frame_zero);
-#endif
-  return rc;
-  }
-
-/* Handle partial matches - disable any mark data */
-
-if (match_partial != NULL)
-  {
-  DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));
-  md->mark = NULL;
-  if (offsetcount > 1)
-    {
-    offsets[0] = (int)(start_partial - (PCRE_PUCHAR)subject);
-    offsets[1] = (int)(end_subject - (PCRE_PUCHAR)subject);
-    if (offsetcount > 2)
-      offsets[2] = (int)(match_partial - (PCRE_PUCHAR)subject);
-    }
-  rc = PCRE_ERROR_PARTIAL;
-  }
-
-/* This is the classic nomatch case */
-
-else
-  {
-  DPRINTF((">>>> returning PCRE_ERROR_NOMATCH\n"));
-  rc = PCRE_ERROR_NOMATCH;
-  }
-
-/* Return the MARK data if it has been requested. */
-
-if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_MARK) != 0)
-  *(extra_data->mark) = (pcre_uchar *)md->nomatch_mark;
-#ifdef NO_RECURSE
-  release_match_heapframes(&frame_zero);
-#endif
-return rc;
-}
-
-/* End of pcre_exec.c */
diff --git a/Foundation/src/pcre_fullinfo.c b/Foundation/src/pcre_fullinfo.c
deleted file mode 100644
index 5ad19251d..000000000
--- a/Foundation/src/pcre_fullinfo.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2013 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_fullinfo(), which returns
-information about a compiled pattern. */
-
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-
-/*************************************************
-*        Return info about compiled pattern      *
-*************************************************/
-
-/* This is a newer "info" function which has an extensible interface so
-that additional items can be added compatibly.
-
-Arguments:
-  argument_re      points to compiled code
-  extra_data       points extra data, or NULL
-  what             what information is required
-  where            where to put the information
-
-Returns:           0 if data returned, negative on error
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_fullinfo(const pcre *argument_re, const pcre_extra *extra_data,
-  int what, void *where)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_fullinfo(const pcre16 *argument_re, const pcre16_extra *extra_data,
-  int what, void *where)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_fullinfo(const pcre32 *argument_re, const pcre32_extra *extra_data,
-  int what, void *where)
-#endif
-{
-const REAL_PCRE *re = (const REAL_PCRE *)argument_re;
-const pcre_study_data *study = NULL;
-
-if (re == NULL || where == NULL) return PCRE_ERROR_NULL;
-
-if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_STUDY_DATA) != 0)
-  study = (const pcre_study_data *)extra_data->study_data;
-
-/* Check that the first field in the block is the magic number. If it is not,
-return with PCRE_ERROR_BADMAGIC. However, if the magic number is equal to
-REVERSED_MAGIC_NUMBER we return with PCRE_ERROR_BADENDIANNESS, which
-means that the pattern is likely compiled with different endianness. */
-
-if (re->magic_number != MAGIC_NUMBER)
-  return re->magic_number == REVERSED_MAGIC_NUMBER?
-    PCRE_ERROR_BADENDIANNESS:PCRE_ERROR_BADMAGIC;
-
-/* Check that this pattern was compiled in the correct bit mode */
-
-if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
-
-switch (what)
-  {
-  case PCRE_INFO_OPTIONS:
-  *((unsigned long int *)where) = re->options & PUBLIC_COMPILE_OPTIONS;
-  break;
-
-  case PCRE_INFO_SIZE:
-  *((size_t *)where) = re->size;
-  break;
-
-  case PCRE_INFO_STUDYSIZE:
-  *((size_t *)where) = (study == NULL)? 0 : study->size;
-  break;
-
-  case PCRE_INFO_JITSIZE:
-#ifdef SUPPORT_JIT
-  *((size_t *)where) =
-      (extra_data != NULL &&
-      (extra_data->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&
-      extra_data->executable_jit != NULL)?
-    PRIV(jit_get_size)(extra_data->executable_jit) : 0;
-#else
-  *((size_t *)where) = 0;
-#endif
-  break;
-
-  case PCRE_INFO_CAPTURECOUNT:
-  *((int *)where) = re->top_bracket;
-  break;
-
-  case PCRE_INFO_BACKREFMAX:
-  *((int *)where) = re->top_backref;
-  break;
-
-  case PCRE_INFO_FIRSTBYTE:
-  *((int *)where) =
-    ((re->flags & PCRE_FIRSTSET) != 0)? (int)re->first_char :
-    ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2;
-  break;
-
-  case PCRE_INFO_FIRSTCHARACTER:
-    *((pcre_uint32 *)where) =
-      (re->flags & PCRE_FIRSTSET) != 0 ? re->first_char : 0;
-    break;
-
-  case PCRE_INFO_FIRSTCHARACTERFLAGS:
-    *((int *)where) =
-      ((re->flags & PCRE_FIRSTSET) != 0) ? 1 :
-      ((re->flags & PCRE_STARTLINE) != 0) ? 2 : 0;
-    break;
-
-  /* Make sure we pass back the pointer to the bit vector in the external
-  block, not the internal copy (with flipped integer fields). */
-
-  case PCRE_INFO_FIRSTTABLE:
-  *((const pcre_uint8 **)where) =
-    (study != NULL && (study->flags & PCRE_STUDY_MAPPED) != 0)?
-      ((const pcre_study_data *)extra_data->study_data)->start_bits : NULL;
-  break;
-
-  case PCRE_INFO_MINLENGTH:
-  *((int *)where) =
-    (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0)?
-      (int)(study->minlength) : -1;
-  break;
-
-  case PCRE_INFO_JIT:
-  *((int *)where) = extra_data != NULL &&
-                    (extra_data->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&
-                    extra_data->executable_jit != NULL;
-  break;
-
-  case PCRE_INFO_LASTLITERAL:
-  *((int *)where) =
-    ((re->flags & PCRE_REQCHSET) != 0)? (int)re->req_char : -1;
-  break;
-
-  case PCRE_INFO_REQUIREDCHAR:
-    *((pcre_uint32 *)where) =
-      ((re->flags & PCRE_REQCHSET) != 0) ? re->req_char : 0;
-    break;
-
-  case PCRE_INFO_REQUIREDCHARFLAGS:
-    *((int *)where) =
-      ((re->flags & PCRE_REQCHSET) != 0);
-    break;
-
-  case PCRE_INFO_NAMEENTRYSIZE:
-  *((int *)where) = re->name_entry_size;
-  break;
-
-  case PCRE_INFO_NAMECOUNT:
-  *((int *)where) = re->name_count;
-  break;
-
-  case PCRE_INFO_NAMETABLE:
-  *((const pcre_uchar **)where) = (const pcre_uchar *)re + re->name_table_offset;
-  break;
-
-  case PCRE_INFO_DEFAULT_TABLES:
-  *((const pcre_uint8 **)where) = (const pcre_uint8 *)(PRIV(default_tables));
-  break;
-
-  /* From release 8.00 this will always return TRUE because NOPARTIAL is
-  no longer ever set (the restrictions have been removed). */
-
-  case PCRE_INFO_OKPARTIAL:
-  *((int *)where) = (re->flags & PCRE_NOPARTIAL) == 0;
-  break;
-
-  case PCRE_INFO_JCHANGED:
-  *((int *)where) = (re->flags & PCRE_JCHANGED) != 0;
-  break;
-
-  case PCRE_INFO_HASCRORLF:
-  *((int *)where) = (re->flags & PCRE_HASCRORLF) != 0;
-  break;
-
-  case PCRE_INFO_MAXLOOKBEHIND:
-  *((int *)where) = re->max_lookbehind;
-  break;
-
-  case PCRE_INFO_MATCHLIMIT:
-  if ((re->flags & PCRE_MLSET) == 0) return PCRE_ERROR_UNSET;
-  *((pcre_uint32 *)where) = re->limit_match;
-  break;
-
-  case PCRE_INFO_RECURSIONLIMIT:
-  if ((re->flags & PCRE_RLSET) == 0) return PCRE_ERROR_UNSET;
-  *((pcre_uint32 *)where) = re->limit_recursion;
-  break;
-
-  case PCRE_INFO_MATCH_EMPTY:
-  *((int *)where) = (re->flags & PCRE_MATCH_EMPTY) != 0;
-  break;
-
-  default: return PCRE_ERROR_BADOPTION;
-  }
-
-return 0;
-}
-
-/* End of pcre_fullinfo.c */
diff --git a/Foundation/src/pcre_get.c b/Foundation/src/pcre_get.c
deleted file mode 100644
index 34fcaf19c..000000000
--- a/Foundation/src/pcre_get.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains some convenience functions for extracting substrings
-from the subject string after a regex match has succeeded. The original idea
-for these functions came from Scott Wimer. */
-
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-
-/*************************************************
-*           Find number for named string         *
-*************************************************/
-
-/* This function is used by the get_first_set() function below, as well
-as being generally available. It assumes that names are unique.
-
-Arguments:
-  code        the compiled regex
-  stringname  the name whose number is required
-
-Returns:      the number of the named parentheses, or a negative number
-                (PCRE_ERROR_NOSUBSTRING) if not found
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_stringnumber(const pcre *code, const char *stringname)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_stringnumber(const pcre16 *code, PCRE_SPTR16 stringname)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_stringnumber(const pcre32 *code, PCRE_SPTR32 stringname)
-#endif
-{
-int rc;
-int entrysize;
-int top, bot;
-pcre_uchar *nametable;
-
-#ifdef COMPILE_PCRE8
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE16
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE32
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-
-bot = 0;
-while (top > bot)
-  {
-  int mid = (top + bot) / 2;
-  pcre_uchar *entry = nametable + entrysize*mid;
-  int c = STRCMP_UC_UC((pcre_uchar *)stringname,
-    (pcre_uchar *)(entry + IMM2_SIZE));
-  if (c == 0) return GET2(entry, 0);
-  if (c > 0) bot = mid + 1; else top = mid;
-  }
-
-return PCRE_ERROR_NOSUBSTRING;
-}
-
-
-
-/*************************************************
-*     Find (multiple) entries for named string   *
-*************************************************/
-
-/* This is used by the get_first_set() function below, as well as being
-generally available. It is used when duplicated names are permitted.
-
-Arguments:
-  code        the compiled regex
-  stringname  the name whose entries required
-  firstptr    where to put the pointer to the first entry
-  lastptr     where to put the pointer to the last entry
-
-Returns:      the length of each entry, or a negative number
-                (PCRE_ERROR_NOSUBSTRING) if not found
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_stringtable_entries(const pcre *code, const char *stringname,
-  char **firstptr, char **lastptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_stringtable_entries(const pcre16 *code, PCRE_SPTR16 stringname,
-  PCRE_UCHAR16 **firstptr, PCRE_UCHAR16 **lastptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_stringtable_entries(const pcre32 *code, PCRE_SPTR32 stringname,
-  PCRE_UCHAR32 **firstptr, PCRE_UCHAR32 **lastptr)
-#endif
-{
-int rc;
-int entrysize;
-int top, bot;
-pcre_uchar *nametable, *lastentry;
-
-#ifdef COMPILE_PCRE8
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE16
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE32
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-
-lastentry = nametable + entrysize * (top - 1);
-bot = 0;
-while (top > bot)
-  {
-  int mid = (top + bot) / 2;
-  pcre_uchar *entry = nametable + entrysize*mid;
-  int c = STRCMP_UC_UC((pcre_uchar *)stringname,
-    (pcre_uchar *)(entry + IMM2_SIZE));
-  if (c == 0)
-    {
-    pcre_uchar *first = entry;
-    pcre_uchar *last = entry;
-    while (first > nametable)
-      {
-      if (STRCMP_UC_UC((pcre_uchar *)stringname,
-        (pcre_uchar *)(first - entrysize + IMM2_SIZE)) != 0) break;
-      first -= entrysize;
-      }
-    while (last < lastentry)
-      {
-      if (STRCMP_UC_UC((pcre_uchar *)stringname,
-        (pcre_uchar *)(last + entrysize + IMM2_SIZE)) != 0) break;
-      last += entrysize;
-      }
-#if defined COMPILE_PCRE8
-    *firstptr = (char *)first;
-    *lastptr = (char *)last;
-#elif defined COMPILE_PCRE16
-    *firstptr = (PCRE_UCHAR16 *)first;
-    *lastptr = (PCRE_UCHAR16 *)last;
-#elif defined COMPILE_PCRE32
-    *firstptr = (PCRE_UCHAR32 *)first;
-    *lastptr = (PCRE_UCHAR32 *)last;
-#endif
-    return entrysize;
-    }
-  if (c > 0) bot = mid + 1; else top = mid;
-  }
-
-return PCRE_ERROR_NOSUBSTRING;
-}
-
-
-
-/*************************************************
-*    Find first set of multiple named strings    *
-*************************************************/
-
-/* This function allows for duplicate names in the table of named substrings.
-It returns the number of the first one that was set in a pattern match.
-
-Arguments:
-  code         the compiled regex
-  stringname   the name of the capturing substring
-  ovector      the vector of matched substrings
-  stringcount  number of captured substrings
-
-Returns:       the number of the first that is set,
-               or the number of the last one if none are set,
-               or a negative number on error
-*/
-
-#if defined COMPILE_PCRE8
-static int
-get_first_set(const pcre *code, const char *stringname, int *ovector,
-  int stringcount)
-#elif defined COMPILE_PCRE16
-static int
-get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector,
-  int stringcount)
-#elif defined COMPILE_PCRE32
-static int
-get_first_set(const pcre32 *code, PCRE_SPTR32 stringname, int *ovector,
-  int stringcount)
-#endif
-{
-const REAL_PCRE *re = (const REAL_PCRE *)code;
-int entrysize;
-pcre_uchar *entry;
-#if defined COMPILE_PCRE8
-char *first, *last;
-#elif defined COMPILE_PCRE16
-PCRE_UCHAR16 *first, *last;
-#elif defined COMPILE_PCRE32
-PCRE_UCHAR32 *first, *last;
-#endif
-
-#if defined COMPILE_PCRE8
-if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
-  return pcre_get_stringnumber(code, stringname);
-entrysize = pcre_get_stringtable_entries(code, stringname, &first, &last);
-#elif defined COMPILE_PCRE16
-if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
-  return pcre16_get_stringnumber(code, stringname);
-entrysize = pcre16_get_stringtable_entries(code, stringname, &first, &last);
-#elif defined COMPILE_PCRE32
-if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
-  return pcre32_get_stringnumber(code, stringname);
-entrysize = pcre32_get_stringtable_entries(code, stringname, &first, &last);
-#endif
-if (entrysize <= 0) return entrysize;
-for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize)
-  {
-  int n = GET2(entry, 0);
-  if (n < stringcount && ovector[n*2] >= 0) return n;
-  }
-return GET2(entry, 0);
-}
-
-
-
-
-/*************************************************
-*      Copy captured string to given buffer      *
-*************************************************/
-
-/* This function copies a single captured substring into a given buffer.
-Note that we use memcpy() rather than strncpy() in case there are binary zeros
-in the string.
-
-Arguments:
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringnumber   the number of the required substring
-  buffer         where to put the substring
-  size           the size of the buffer
-
-Returns:         if successful:
-                   the length of the copied string, not including the zero
-                   that is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) buffer too small
-                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_copy_substring(const char *subject, int *ovector, int stringcount,
-  int stringnumber, char *buffer, int size)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_copy_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_UCHAR16 *buffer, int size)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_copy_substring(PCRE_SPTR32 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_UCHAR32 *buffer, int size)
-#endif
-{
-int yield;
-if (stringnumber < 0 || stringnumber >= stringcount)
-  return PCRE_ERROR_NOSUBSTRING;
-stringnumber *= 2;
-yield = ovector[stringnumber+1] - ovector[stringnumber];
-if (size < yield + 1) return PCRE_ERROR_NOMEMORY;
-memcpy(buffer, subject + ovector[stringnumber], IN_UCHARS(yield));
-buffer[yield] = 0;
-return yield;
-}
-
-
-
-/*************************************************
-*   Copy named captured string to given buffer   *
-*************************************************/
-
-/* This function copies a single captured substring into a given buffer,
-identifying it by name. If the regex permits duplicate names, the first
-substring that is set is chosen.
-
-Arguments:
-  code           the compiled regex
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringname     the name of the required substring
-  buffer         where to put the substring
-  size           the size of the buffer
-
-Returns:         if successful:
-                   the length of the copied string, not including the zero
-                   that is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) buffer too small
-                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_copy_named_substring(const pcre *code, const char *subject,
-  int *ovector, int stringcount, const char *stringname,
-  char *buffer, int size)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_copy_named_substring(const pcre16 *code, PCRE_SPTR16 subject,
-  int *ovector, int stringcount, PCRE_SPTR16 stringname,
-  PCRE_UCHAR16 *buffer, int size)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_copy_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
-  int *ovector, int stringcount, PCRE_SPTR32 stringname,
-  PCRE_UCHAR32 *buffer, int size)
-#endif
-{
-int n = get_first_set(code, stringname, ovector, stringcount);
-if (n <= 0) return n;
-#if defined COMPILE_PCRE8
-return pcre_copy_substring(subject, ovector, stringcount, n, buffer, size);
-#elif defined COMPILE_PCRE16
-return pcre16_copy_substring(subject, ovector, stringcount, n, buffer, size);
-#elif defined COMPILE_PCRE32
-return pcre32_copy_substring(subject, ovector, stringcount, n, buffer, size);
-#endif
-}
-
-
-
-/*************************************************
-*      Copy all captured strings to new store    *
-*************************************************/
-
-/* This function gets one chunk of store and builds a list of pointers and all
-of the captured substrings in it. A NULL pointer is put on the end of the list.
-
-Arguments:
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  listptr        set to point to the list of pointers
-
-Returns:         if successful: 0
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) failed to get store
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_substring_list(const char *subject, int *ovector, int stringcount,
-  const char ***listptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_substring_list(PCRE_SPTR16 subject, int *ovector, int stringcount,
-  PCRE_SPTR16 **listptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_substring_list(PCRE_SPTR32 subject, int *ovector, int stringcount,
-  PCRE_SPTR32 **listptr)
-#endif
-{
-int i;
-int size = sizeof(pcre_uchar *);
-int double_count = stringcount * 2;
-pcre_uchar **stringlist;
-pcre_uchar *p;
-
-for (i = 0; i < double_count; i += 2)
-  {
-  size += sizeof(pcre_uchar *) + IN_UCHARS(1);
-  if (ovector[i+1] > ovector[i]) size += IN_UCHARS(ovector[i+1] - ovector[i]);
-  }
-
-stringlist = (pcre_uchar **)(PUBL(malloc))(size);
-if (stringlist == NULL) return PCRE_ERROR_NOMEMORY;
-
-#if defined COMPILE_PCRE8
-*listptr = (const char **)stringlist;
-#elif defined COMPILE_PCRE16
-*listptr = (PCRE_SPTR16 *)stringlist;
-#elif defined COMPILE_PCRE32
-*listptr = (PCRE_SPTR32 *)stringlist;
-#endif
-p = (pcre_uchar *)(stringlist + stringcount + 1);
-
-for (i = 0; i < double_count; i += 2)
-  {
-  int len = (ovector[i+1] > ovector[i])? (ovector[i+1] - ovector[i]) : 0;
-  memcpy(p, subject + ovector[i], IN_UCHARS(len));
-  *stringlist++ = p;
-  p += len;
-  *p++ = 0;
-  }
-
-*stringlist = NULL;
-return 0;
-}
-
-
-
-/*************************************************
-*   Free store obtained by get_substring_list    *
-*************************************************/
-
-/* This function exists for the benefit of people calling PCRE from non-C
-programs that can call its functions, but not free() or (PUBL(free))()
-directly.
-
-Argument:   the result of a previous pcre_get_substring_list()
-Returns:    nothing
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre_free_substring_list(const char **pointer)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre16_free_substring_list(PCRE_SPTR16 *pointer)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre32_free_substring_list(PCRE_SPTR32 *pointer)
-#endif
-{
-(PUBL(free))((void *)pointer);
-}
-
-
-
-/*************************************************
-*      Copy captured string to new store         *
-*************************************************/
-
-/* This function copies a single captured substring into a piece of new
-store
-
-Arguments:
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringnumber   the number of the required substring
-  stringptr      where to put a pointer to the substring
-
-Returns:         if successful:
-                   the length of the string, not including the zero that
-                   is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) failed to get store
-                   PCRE_ERROR_NOSUBSTRING (-7) substring not present
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_substring(const char *subject, int *ovector, int stringcount,
-  int stringnumber, const char **stringptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_SPTR16 *stringptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_substring(PCRE_SPTR32 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_SPTR32 *stringptr)
-#endif
-{
-int yield;
-pcre_uchar *substring;
-if (stringnumber < 0 || stringnumber >= stringcount)
-  return PCRE_ERROR_NOSUBSTRING;
-stringnumber *= 2;
-yield = ovector[stringnumber+1] - ovector[stringnumber];
-substring = (pcre_uchar *)(PUBL(malloc))(IN_UCHARS(yield + 1));
-if (substring == NULL) return PCRE_ERROR_NOMEMORY;
-memcpy(substring, subject + ovector[stringnumber], IN_UCHARS(yield));
-substring[yield] = 0;
-#if defined COMPILE_PCRE8
-*stringptr = (const char *)substring;
-#elif defined COMPILE_PCRE16
-*stringptr = (PCRE_SPTR16)substring;
-#elif defined COMPILE_PCRE32
-*stringptr = (PCRE_SPTR32)substring;
-#endif
-return yield;
-}
-
-
-
-/*************************************************
-*   Copy named captured string to new store      *
-*************************************************/
-
-/* This function copies a single captured substring, identified by name, into
-new store. If the regex permits duplicate names, the first substring that is
-set is chosen.
-
-Arguments:
-  code           the compiled regex
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringname     the name of the required substring
-  stringptr      where to put the pointer
-
-Returns:         if successful:
-                   the length of the copied string, not including the zero
-                   that is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) couldn't get memory
-                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_named_substring(const pcre *code, const char *subject,
-  int *ovector, int stringcount, const char *stringname,
-  const char **stringptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_named_substring(const pcre16 *code, PCRE_SPTR16 subject,
-  int *ovector, int stringcount, PCRE_SPTR16 stringname,
-  PCRE_SPTR16 *stringptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
-  int *ovector, int stringcount, PCRE_SPTR32 stringname,
-  PCRE_SPTR32 *stringptr)
-#endif
-{
-int n = get_first_set(code, stringname, ovector, stringcount);
-if (n <= 0) return n;
-#if defined COMPILE_PCRE8
-return pcre_get_substring(subject, ovector, stringcount, n, stringptr);
-#elif defined COMPILE_PCRE16
-return pcre16_get_substring(subject, ovector, stringcount, n, stringptr);
-#elif defined COMPILE_PCRE32
-return pcre32_get_substring(subject, ovector, stringcount, n, stringptr);
-#endif
-}
-
-
-
-
-/*************************************************
-*       Free store obtained by get_substring     *
-*************************************************/
-
-/* This function exists for the benefit of people calling PCRE from non-C
-programs that can call its functions, but not free() or (PUBL(free))()
-directly.
-
-Argument:   the result of a previous pcre_get_substring()
-Returns:    nothing
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre_free_substring(const char *pointer)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre16_free_substring(PCRE_SPTR16 pointer)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre32_free_substring(PCRE_SPTR32 pointer)
-#endif
-{
-(PUBL(free))((void *)pointer);
-}
-
-/* End of pcre_get.c */
diff --git a/Foundation/src/pcre_globals.c b/Foundation/src/pcre_globals.c
deleted file mode 100644
index 9b2329a32..000000000
--- a/Foundation/src/pcre_globals.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2014 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains global variables that are exported by the PCRE library.
-PCRE is thread-clean and doesn't use any global variables in the normal sense.
-However, it calls memory allocation and freeing functions via the four
-indirections below, and it can optionally do callouts, using the fifth
-indirection. These values can be changed by the caller, but are shared between
-all threads.
-
-For MS Visual Studio and Symbian OS, there are problems in initializing these
-variables to non-local functions. In these cases, therefore, an indirection via
-a local function is used.
-
-Also, when compiling for Virtual Pascal, things are done differently, and
-global variables are not used. */
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-#if defined _MSC_VER || defined  __SYMBIAN32__
-static void* LocalPcreMalloc(size_t aSize)
-  {
-  return malloc(aSize);
-  }
-static void LocalPcreFree(void* aPtr)
-  {
-  free(aPtr);
-  }
-PCRE_EXP_DATA_DEFN void *(*PUBL(malloc))(size_t) = LocalPcreMalloc;
-PCRE_EXP_DATA_DEFN void  (*PUBL(free))(void *) = LocalPcreFree;
-PCRE_EXP_DATA_DEFN void *(*PUBL(stack_malloc))(size_t) = LocalPcreMalloc;
-PCRE_EXP_DATA_DEFN void  (*PUBL(stack_free))(void *) = LocalPcreFree;
-PCRE_EXP_DATA_DEFN int   (*PUBL(callout))(PUBL(callout_block) *) = NULL;
-PCRE_EXP_DATA_DEFN int   (*PUBL(stack_guard))(void) = NULL;
-
-#elif !defined VPCOMPAT
-PCRE_EXP_DATA_DEFN void *(*PUBL(malloc))(size_t) = malloc;
-PCRE_EXP_DATA_DEFN void  (*PUBL(free))(void *) = free;
-PCRE_EXP_DATA_DEFN void *(*PUBL(stack_malloc))(size_t) = malloc;
-PCRE_EXP_DATA_DEFN void  (*PUBL(stack_free))(void *) = free;
-PCRE_EXP_DATA_DEFN int   (*PUBL(callout))(PUBL(callout_block) *) = NULL;
-PCRE_EXP_DATA_DEFN int   (*PUBL(stack_guard))(void) = NULL;
-#endif
-
-/* End of pcre_globals.c */
diff --git a/Foundation/src/pcre_internal.h b/Foundation/src/pcre_internal.h
deleted file mode 100644
index b6e6a9444..000000000
--- a/Foundation/src/pcre_internal.h
+++ /dev/null
@@ -1,2827 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2016 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* This header contains definitions that are shared between the different
-modules, but which are not relevant to the exported API. This includes some
-functions whose names all begin with "_pcre_", "_pcre16_" or "_pcre32_"
-depending on the PRIV macro. */
-
-#ifndef PCRE_INTERNAL_H
-#define PCRE_INTERNAL_H
-
-/* Define PCRE_DEBUG to get debugging output on stdout. */
-
-#if 0
-#define PCRE_DEBUG
-#endif
-
-/* PCRE is compiled as an 8 bit library if it is not requested otherwise. */
-
-#if !defined COMPILE_PCRE16 && !defined COMPILE_PCRE32
-#define COMPILE_PCRE8
-#endif
-
-/* If SUPPORT_UCP is defined, SUPPORT_UTF must also be defined. The
-"configure" script ensures this, but not everybody uses "configure". */
-
-#if defined SUPPORT_UCP && !(defined SUPPORT_UTF)
-#define SUPPORT_UTF 1
-#endif
-
-/* We define SUPPORT_UTF if SUPPORT_UTF8 is enabled for compatibility
-reasons with existing code. */
-
-#if defined SUPPORT_UTF8 && !(defined SUPPORT_UTF)
-#define SUPPORT_UTF 1
-#endif
-
-/* Fixme: SUPPORT_UTF8 should be eventually disappear from the code.
-Until then we define it if SUPPORT_UTF is defined. */
-
-#if defined SUPPORT_UTF && !(defined SUPPORT_UTF8)
-#define SUPPORT_UTF8 1
-#endif
-
-/* We do not support both EBCDIC and UTF-8/16/32 at the same time. The "configure"
-script prevents both being selected, but not everybody uses "configure". */
-
-#if defined EBCDIC && defined SUPPORT_UTF
-#error The use of both EBCDIC and SUPPORT_UTF is not supported.
-#endif
-
-/* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef
-inline, and there are *still* stupid compilers about that don't like indented
-pre-processor statements, or at least there were when I first wrote this. After
-all, it had only been about 10 years then...
-
-It turns out that the Mac Debugging.h header also defines the macro DPRINTF, so
-be absolutely sure we get our version. */
-
-#undef DPRINTF
-#ifdef PCRE_DEBUG
-#define DPRINTF(p) printf p
-#else
-#define DPRINTF(p) /* Nothing */
-#endif
-
-
-/* Standard C headers plus the external interface definition. The only time
-setjmp and stdarg are used is when NO_RECURSE is set. */
-
-#include <ctype.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Valgrind (memcheck) support */
-
-#ifdef SUPPORT_VALGRIND
-#include <valgrind/memcheck.h>
-#endif
-
-/* When compiling a DLL for Windows, the exported symbols have to be declared
-using some MS magic. I found some useful information on this web page:
-http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the
-information there, using __declspec(dllexport) without "extern" we have a
-definition; with "extern" we have a declaration. The settings here override the
-setting in pcre.h (which is included below); it defines only PCRE_EXP_DECL,
-which is all that is needed for applications (they just import the symbols). We
-use:
-
-  PCRE_EXP_DECL       for declarations
-  PCRE_EXP_DEFN       for definitions of exported functions
-  PCRE_EXP_DATA_DEFN  for definitions of exported variables
-
-The reason for the two DEFN macros is that in non-Windows environments, one
-does not want to have "extern" before variable definitions because it leads to
-compiler warnings. So we distinguish between functions and variables. In
-Windows, the two should always be the same.
-
-The reason for wrapping this in #ifndef PCRE_EXP_DECL is so that pcretest,
-which is an application, but needs to import this file in order to "peek" at
-internals, can #include pcre.h first to get an application's-eye view.
-
-In principle, people compiling for non-Windows, non-Unix-like (i.e. uncommon,
-special-purpose environments) might want to stick other stuff in front of
-exported symbols. That's why, in the non-Windows case, we set PCRE_EXP_DEFN and
-PCRE_EXP_DATA_DEFN only if they are not already set. */
-
-#ifndef PCRE_EXP_DECL
-#  ifdef _WIN32
-#    ifndef PCRE_STATIC
-#      define PCRE_EXP_DECL       extern __declspec(dllexport)
-#      define PCRE_EXP_DEFN       __declspec(dllexport)
-#      define PCRE_EXP_DATA_DEFN  __declspec(dllexport)
-#    else
-#      define PCRE_EXP_DECL       extern
-#      define PCRE_EXP_DEFN
-#      define PCRE_EXP_DATA_DEFN
-#    endif
-#  else
-#    ifdef __cplusplus
-#      define PCRE_EXP_DECL       extern "C"
-#    else
-#      define PCRE_EXP_DECL       extern
-#    endif
-#    ifndef PCRE_EXP_DEFN
-#      define PCRE_EXP_DEFN       PCRE_EXP_DECL
-#    endif
-#    ifndef PCRE_EXP_DATA_DEFN
-#      define PCRE_EXP_DATA_DEFN
-#    endif
-#  endif
-#endif
-
-/* When compiling with the MSVC compiler, it is sometimes necessary to include
-a "calling convention" before exported function names. (This is secondhand
-information; I know nothing about MSVC myself). For example, something like
-
-  void __cdecl function(....)
-
-might be needed. In order so make this easy, all the exported functions have
-PCRE_CALL_CONVENTION just before their names. It is rarely needed; if not
-set, we ensure here that it has no effect. */
-
-#ifndef PCRE_CALL_CONVENTION
-#define PCRE_CALL_CONVENTION
-#endif
-
-/* We need to have types that specify unsigned 8, 16 and 32-bit integers. We
-cannot determine these outside the compilation (e.g. by running a program as
-part of "configure") because PCRE is often cross-compiled for use on other
-systems. Instead we make use of the maximum sizes that are available at
-preprocessor time in standard C environments. */
-
-typedef unsigned char pcre_uint8;
-
-#if USHRT_MAX == 65535
-typedef unsigned short pcre_uint16;
-typedef short pcre_int16;
-#define PCRE_UINT16_MAX USHRT_MAX
-#define PCRE_INT16_MAX SHRT_MAX
-#elif UINT_MAX == 65535
-typedef unsigned int pcre_uint16;
-typedef int pcre_int16;
-#define PCRE_UINT16_MAX UINT_MAX
-#define PCRE_INT16_MAX INT_MAX
-#else
-#error Cannot determine a type for 16-bit integers
-#endif
-
-#if UINT_MAX == 4294967295U
-typedef unsigned int pcre_uint32;
-typedef int pcre_int32;
-#define PCRE_UINT32_MAX UINT_MAX
-#define PCRE_INT32_MAX INT_MAX
-#elif ULONG_MAX == 4294967295UL
-typedef unsigned long int pcre_uint32;
-typedef long int pcre_int32;
-#define PCRE_UINT32_MAX ULONG_MAX
-#define PCRE_INT32_MAX LONG_MAX
-#else
-#error Cannot determine a type for 32-bit integers
-#endif
-
-/* When checking for integer overflow in pcre_compile(), we need to handle
-large integers. If a 64-bit integer type is available, we can use that.
-Otherwise we have to cast to double, which of course requires floating point
-arithmetic. Handle this by defining a macro for the appropriate type. If
-stdint.h is available, include it; it may define INT64_MAX. Systems that do not
-have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
-by "configure". */
-
-#if HAVE_STDINT_H
-#include <stdint.h>
-#elif HAVE_INTTYPES_H || defined(__SUNPRO_C)
-#include <inttypes.h>
-#endif
-
-#if defined INT64_MAX || defined int64_t
-#define INT64_OR_DOUBLE int64_t
-#else
-#define INT64_OR_DOUBLE double
-#endif
-
-/* All character handling must be done as unsigned characters. Otherwise there
-are problems with top-bit-set characters and functions such as isspace().
-However, we leave the interface to the outside world as char * or short *,
-because that should make things easier for callers. This character type is
-called pcre_uchar.
-
-The IN_UCHARS macro multiply its argument with the byte size of the current
-pcre_uchar type. Useful for memcpy and such operations, whose require the
-byte size of their input/output buffers.
-
-The MAX_255 macro checks whether its pcre_uchar input is less than 256.
-
-The TABLE_GET macro is designed for accessing elements of tables whose contain
-exactly 256 items. When the character is able to contain more than 256
-items, some check is needed before accessing these tables.
-*/
-
-#if defined COMPILE_PCRE8
-
-typedef unsigned char pcre_uchar;
-#define IN_UCHARS(x) (x)
-#define MAX_255(c) 1
-#define TABLE_GET(c, table, default) ((table)[c])
-
-#elif defined COMPILE_PCRE16
-
-#if USHRT_MAX != 65535
-/* This is a warning message. Change PCRE_UCHAR16 to a 16 bit data type in
-pcre.h(.in) and disable (comment out) this message. */
-#error Warning: PCRE_UCHAR16 is not a 16 bit data type.
-#endif
-
-typedef pcre_uint16 pcre_uchar;
-#define UCHAR_SHIFT (1)
-#define IN_UCHARS(x) ((x) * 2)
-#define MAX_255(c) ((c) <= 255u)
-#define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
-
-#elif defined COMPILE_PCRE32
-
-typedef pcre_uint32 pcre_uchar;
-#define UCHAR_SHIFT (2)
-#define IN_UCHARS(x) ((x) * 4)
-#define MAX_255(c) ((c) <= 255u)
-#define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
-
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-/* This is an unsigned int value that no character can ever have. UTF-8
-characters only go up to 0x7fffffff (though Unicode doesn't go beyond
-0x0010ffff). */
-
-#define NOTACHAR 0xffffffff
-
-/* PCRE is able to support several different kinds of newline (CR, LF, CRLF,
-"any" and "anycrlf" at present). The following macros are used to package up
-testing for newlines. NLBLOCK, PSSTART, and PSEND are defined in the various
-modules to indicate in which datablock the parameters exist, and what the
-start/end of string field names are. */
-
-#define NLTYPE_FIXED    0     /* Newline is a fixed length string */
-#define NLTYPE_ANY      1     /* Newline is any Unicode line ending */
-#define NLTYPE_ANYCRLF  2     /* Newline is CR, LF, or CRLF */
-
-/* This macro checks for a newline at the given position */
-
-#define IS_NEWLINE(p) \
-  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
-    ((p) < NLBLOCK->PSEND && \
-     PRIV(is_newline)((p), NLBLOCK->nltype, NLBLOCK->PSEND, \
-       &(NLBLOCK->nllen), utf)) \
-    : \
-    ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
-     UCHAR21TEST(p) == NLBLOCK->nl[0] && \
-     (NLBLOCK->nllen == 1 || UCHAR21TEST(p+1) == NLBLOCK->nl[1])       \
-    ) \
-  )
-
-/* This macro checks for a newline immediately preceding the given position */
-
-#define WAS_NEWLINE(p) \
-  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
-    ((p) > NLBLOCK->PSSTART && \
-     PRIV(was_newline)((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
-       &(NLBLOCK->nllen), utf)) \
-    : \
-    ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
-     UCHAR21TEST(p - NLBLOCK->nllen) == NLBLOCK->nl[0] &&              \
-     (NLBLOCK->nllen == 1 || UCHAR21TEST(p - NLBLOCK->nllen + 1) == NLBLOCK->nl[1]) \
-    ) \
-  )
-
-/* When PCRE is compiled as a C++ library, the subject pointer can be replaced
-with a custom type. This makes it possible, for example, to allow pcre_exec()
-to process subject strings that are discontinuous by using a smart pointer
-class. It must always be possible to inspect all of the subject string in
-pcre_exec() because of the way it backtracks. Two macros are required in the
-normal case, for sign-unspecified and unsigned char pointers. The former is
-used for the external interface and appears in pcre.h, which is why its name
-must begin with PCRE_. */
-
-#ifdef CUSTOM_SUBJECT_PTR
-#define PCRE_PUCHAR CUSTOM_SUBJECT_PTR
-#else
-#define PCRE_PUCHAR const pcre_uchar *
-#endif
-
-/* Include the public PCRE header and the definitions of UCP character property
-values. */
-
-#include "pcre.h"
-#include "ucp.h"
-
-#ifdef COMPILE_PCRE32
-/* Assert that the public PCRE_UCHAR32 is a 32-bit type */
-typedef int __assert_pcre_uchar32_size[sizeof(PCRE_UCHAR32) == 4 ? 1 : -1];
-#endif
-
-/* When compiling for use with the Virtual Pascal compiler, these functions
-need to have their names changed. PCRE must be compiled with the -DVPCOMPAT
-option on the command line. */
-
-#ifdef VPCOMPAT
-#define strlen(s)        _strlen(s)
-#define strncmp(s1,s2,m) _strncmp(s1,s2,m)
-#define memcmp(s,c,n)    _memcmp(s,c,n)
-#define memcpy(d,s,n)    _memcpy(d,s,n)
-#define memmove(d,s,n)   _memmove(d,s,n)
-#define memset(s,c,n)    _memset(s,c,n)
-#else  /* VPCOMPAT */
-
-/* To cope with SunOS4 and other systems that lack memmove() but have bcopy(),
-define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY
-is set. Otherwise, include an emulating function for those systems that have
-neither (there some non-Unix environments where this is the case). */
-
-#ifndef HAVE_MEMMOVE
-#undef  memmove        /* some systems may have a macro */
-#ifdef HAVE_BCOPY
-#define memmove(a, b, c) bcopy(b, a, c)
-#else  /* HAVE_BCOPY */
-static void *
-pcre_memmove(void *d, const void *s, size_t n)
-{
-size_t i;
-unsigned char *dest = (unsigned char *)d;
-const unsigned char *src = (const unsigned char *)s;
-if (dest > src)
-  {
-  dest += n;
-  src += n;
-  for (i = 0; i < n; ++i) *(--dest) = *(--src);
-  return (void *)dest;
-  }
-else
-  {
-  for (i = 0; i < n; ++i) *dest++ = *src++;
-  return (void *)(dest - n);
-  }
-}
-#define memmove(a, b, c) pcre_memmove(a, b, c)
-#endif   /* not HAVE_BCOPY */
-#endif   /* not HAVE_MEMMOVE */
-#endif   /* not VPCOMPAT */
-
-
-/* PCRE keeps offsets in its compiled code as 2-byte quantities (always stored
-in big-endian order) by default. These are used, for example, to link from the
-start of a subpattern to its alternatives and its end. The use of 2 bytes per
-offset limits the size of the compiled regex to around 64K, which is big enough
-for almost everybody. However, I received a request for an even bigger limit.
-For this reason, and also to make the code easier to maintain, the storing and
-loading of offsets from the byte string is now handled by the macros that are
-defined here.
-
-The macros are controlled by the value of LINK_SIZE. This defaults to 2 in
-the config.h file, but can be overridden by using -D on the command line. This
-is automated on Unix systems via the "configure" command. */
-
-#if defined COMPILE_PCRE8
-
-#if LINK_SIZE == 2
-
-#define PUT(a,n,d)   \
-  (a[n] = (d) >> 8), \
-  (a[(n)+1] = (d) & 255)
-
-#define GET(a,n) \
-  (((a)[n] << 8) | (a)[(n)+1])
-
-#define MAX_PATTERN_SIZE (1 << 16)
-
-
-#elif LINK_SIZE == 3
-
-#define PUT(a,n,d)       \
-  (a[n] = (d) >> 16),    \
-  (a[(n)+1] = (d) >> 8), \
-  (a[(n)+2] = (d) & 255)
-
-#define GET(a,n) \
-  (((a)[n] << 16) | ((a)[(n)+1] << 8) | (a)[(n)+2])
-
-#define MAX_PATTERN_SIZE (1 << 24)
-
-
-#elif LINK_SIZE == 4
-
-#define PUT(a,n,d)        \
-  (a[n] = (d) >> 24),     \
-  (a[(n)+1] = (d) >> 16), \
-  (a[(n)+2] = (d) >> 8),  \
-  (a[(n)+3] = (d) & 255)
-
-#define GET(a,n) \
-  (((a)[n] << 24) | ((a)[(n)+1] << 16) | ((a)[(n)+2] << 8) | (a)[(n)+3])
-
-/* Keep it positive */
-#define MAX_PATTERN_SIZE (1 << 30)
-
-#else
-#error LINK_SIZE must be either 2, 3, or 4
-#endif
-
-#elif defined COMPILE_PCRE16
-
-#if LINK_SIZE == 2
-
-/* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
-#undef LINK_SIZE
-#define LINK_SIZE 1
-
-#define PUT(a,n,d)   \
-  (a[n] = (d))
-
-#define GET(a,n) \
-  (a[n])
-
-#define MAX_PATTERN_SIZE (1 << 16)
-
-#elif LINK_SIZE == 3 || LINK_SIZE == 4
-
-/* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
-#undef LINK_SIZE
-#define LINK_SIZE 2
-
-#define PUT(a,n,d)   \
-  (a[n] = (d) >> 16), \
-  (a[(n)+1] = (d) & 65535)
-
-#define GET(a,n) \
-  (((a)[n] << 16) | (a)[(n)+1])
-
-/* Keep it positive */
-#define MAX_PATTERN_SIZE (1 << 30)
-
-#else
-#error LINK_SIZE must be either 2, 3, or 4
-#endif
-
-#elif defined COMPILE_PCRE32
-
-/* Only supported LINK_SIZE is 4 */
-/* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
-#undef LINK_SIZE
-#define LINK_SIZE 1
-
-#define PUT(a,n,d)   \
-  (a[n] = (d))
-
-#define GET(a,n) \
-  (a[n])
-
-/* Keep it positive */
-#define MAX_PATTERN_SIZE (1 << 30)
-
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-/* Convenience macro defined in terms of the others */
-
-#define PUTINC(a,n,d)   PUT(a,n,d), a += LINK_SIZE
-
-
-/* PCRE uses some other 2-byte quantities that do not change when the size of
-offsets changes. There are used for repeat counts and for other things such as
-capturing parenthesis numbers in back references. */
-
-#if defined COMPILE_PCRE8
-
-#define IMM2_SIZE 2
-
-#define PUT2(a,n,d)   \
-  a[n] = (d) >> 8; \
-  a[(n)+1] = (d) & 255
-
-/* For reasons that I do not understand, the expression in this GET2 macro is
-treated by gcc as a signed expression, even when a is declared as unsigned. It
-seems that any kind of arithmetic results in a signed value. */
-
-#define GET2(a,n) \
-  (unsigned int)(((a)[n] << 8) | (a)[(n)+1])
-
-#elif defined COMPILE_PCRE16
-
-#define IMM2_SIZE 1
-
-#define PUT2(a,n,d)   \
-   a[n] = d
-
-#define GET2(a,n) \
-   a[n]
-
-#elif defined COMPILE_PCRE32
-
-#define IMM2_SIZE 1
-
-#define PUT2(a,n,d)   \
-   a[n] = d
-
-#define GET2(a,n) \
-   a[n]
-
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-#define PUT2INC(a,n,d)  PUT2(a,n,d), a += IMM2_SIZE
-
-/* The maximum length of a MARK name is currently one data unit; it may be
-changed in future to be a fixed number of bytes or to depend on LINK_SIZE. */
-
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-#define MAX_MARK ((1u << 16) - 1)
-#else
-#define MAX_MARK ((1u << 8) - 1)
-#endif
-
-/* There is a proposed future special "UTF-21" mode, in which only the lowest
-21 bits of a 32-bit character are interpreted as UTF, with the remaining 11
-high-order bits available to the application for other uses. In preparation for
-the future implementation of this mode, there are macros that load a data item
-and, if in this special mode, mask it to 21 bits. These macros all have names
-starting with UCHAR21. In all other modes, including the normal 32-bit
-library, the macros all have the same simple definitions. When the new mode is
-implemented, it is expected that these definitions will be varied appropriately
-using #ifdef when compiling the library that supports the special mode. */
-
-#define UCHAR21(eptr)        (*(eptr))
-#define UCHAR21TEST(eptr)    (*(eptr))
-#define UCHAR21INC(eptr)     (*(eptr)++)
-#define UCHAR21INCTEST(eptr) (*(eptr)++)
-
-/* When UTF encoding is being used, a character is no longer just a single
-byte in 8-bit mode or a single short in 16-bit mode. The macros for character
-handling generate simple sequences when used in the basic mode, and more
-complicated ones for UTF characters. GETCHARLENTEST and other macros are not
-used when UTF is not supported. To make sure they can never even appear when
-UTF support is omitted, we don't even define them. */
-
-#ifndef SUPPORT_UTF
-
-/* #define MAX_VALUE_FOR_SINGLE_CHAR */
-/* #define HAS_EXTRALEN(c) */
-/* #define GET_EXTRALEN(c) */
-/* #define NOT_FIRSTCHAR(c) */
-#define GETCHAR(c, eptr) c = *eptr;
-#define GETCHARTEST(c, eptr) c = *eptr;
-#define GETCHARINC(c, eptr) c = *eptr++;
-#define GETCHARINCTEST(c, eptr) c = *eptr++;
-#define GETCHARLEN(c, eptr, len) c = *eptr;
-/* #define GETCHARLENTEST(c, eptr, len) */
-/* #define BACKCHAR(eptr) */
-/* #define FORWARDCHAR(eptr) */
-/* #define ACROSSCHAR(condition, eptr, action) */
-
-#else   /* SUPPORT_UTF */
-
-/* Tests whether the code point needs extra characters to decode. */
-
-#define HASUTF8EXTRALEN(c) ((c) >= 0xc0)
-
-/* Base macro to pick up the remaining bytes of a UTF-8 character, not
-advancing the pointer. */
-
-#define GETUTF8(c, eptr) \
-    { \
-    if ((c & 0x20) == 0) \
-      c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
-    else if ((c & 0x10) == 0) \
-      c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
-    else if ((c & 0x08) == 0) \
-      c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
-      ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
-    else if ((c & 0x04) == 0) \
-      c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
-          ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
-          (eptr[4] & 0x3f); \
-    else \
-      c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
-          ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
-          ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
-    }
-
-/* Base macro to pick up the remaining bytes of a UTF-8 character, advancing
-the pointer. */
-
-#define GETUTF8INC(c, eptr) \
-    { \
-    if ((c & 0x20) == 0) \
-      c = ((c & 0x1f) << 6) | (*eptr++ & 0x3f); \
-    else if ((c & 0x10) == 0) \
-      { \
-      c = ((c & 0x0f) << 12) | ((*eptr & 0x3f) << 6) | (eptr[1] & 0x3f); \
-      eptr += 2; \
-      } \
-    else if ((c & 0x08) == 0) \
-      { \
-      c = ((c & 0x07) << 18) | ((*eptr & 0x3f) << 12) | \
-          ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
-      eptr += 3; \
-      } \
-    else if ((c & 0x04) == 0) \
-      { \
-      c = ((c & 0x03) << 24) | ((*eptr & 0x3f) << 18) | \
-          ((eptr[1] & 0x3f) << 12) | ((eptr[2] & 0x3f) << 6) | \
-          (eptr[3] & 0x3f); \
-      eptr += 4; \
-      } \
-    else \
-      { \
-      c = ((c & 0x01) << 30) | ((*eptr & 0x3f) << 24) | \
-          ((eptr[1] & 0x3f) << 18) | ((eptr[2] & 0x3f) << 12) | \
-          ((eptr[3] & 0x3f) << 6) | (eptr[4] & 0x3f); \
-      eptr += 5; \
-      } \
-    }
-
-#if defined COMPILE_PCRE8
-
-/* These macros were originally written in the form of loops that used data
-from the tables whose names start with PRIV(utf8_table). They were rewritten by
-a user so as not to use loops, because in some environments this gives a
-significant performance advantage, and it seems never to do any harm. */
-
-/* Tells the biggest code point which can be encoded as a single character. */
-
-#define MAX_VALUE_FOR_SINGLE_CHAR 127
-
-/* Tests whether the code point needs extra characters to decode. */
-
-#define HAS_EXTRALEN(c) ((c) >= 0xc0)
-
-/* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
-Otherwise it has an undefined behaviour. */
-
-#define GET_EXTRALEN(c) (PRIV(utf8_table4)[(c) & 0x3f])
-
-/* Returns TRUE, if the given character is not the first character
-of a UTF sequence. */
-
-#define NOT_FIRSTCHAR(c) (((c) & 0xc0) == 0x80)
-
-/* Get the next UTF-8 character, not advancing the pointer. This is called when
-we know we are in UTF-8 mode. */
-
-#define GETCHAR(c, eptr) \
-  c = *eptr; \
-  if (c >= 0xc0) GETUTF8(c, eptr);
-
-/* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the
-pointer. */
-
-#define GETCHARTEST(c, eptr) \
-  c = *eptr; \
-  if (utf && c >= 0xc0) GETUTF8(c, eptr);
-
-/* Get the next UTF-8 character, advancing the pointer. This is called when we
-know we are in UTF-8 mode. */
-
-#define GETCHARINC(c, eptr) \
-  c = *eptr++; \
-  if (c >= 0xc0) GETUTF8INC(c, eptr);
-
-/* Get the next character, testing for UTF-8 mode, and advancing the pointer.
-This is called when we don't know if we are in UTF-8 mode. */
-
-#define GETCHARINCTEST(c, eptr) \
-  c = *eptr++; \
-  if (utf && c >= 0xc0) GETUTF8INC(c, eptr);
-
-/* Base macro to pick up the remaining bytes of a UTF-8 character, not
-advancing the pointer, incrementing the length. */
-
-#define GETUTF8LEN(c, eptr, len) \
-    { \
-    if ((c & 0x20) == 0) \
-      { \
-      c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
-      len++; \
-      } \
-    else if ((c & 0x10)  == 0) \
-      { \
-      c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
-      len += 2; \
-      } \
-    else if ((c & 0x08)  == 0) \
-      {\
-      c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
-          ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
-      len += 3; \
-      } \
-    else if ((c & 0x04)  == 0) \
-      { \
-      c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
-          ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
-          (eptr[4] & 0x3f); \
-      len += 4; \
-      } \
-    else \
-      {\
-      c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
-          ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
-          ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
-      len += 5; \
-      } \
-    }
-
-/* Get the next UTF-8 character, not advancing the pointer, incrementing length
-if there are extra bytes. This is called when we know we are in UTF-8 mode. */
-
-#define GETCHARLEN(c, eptr, len) \
-  c = *eptr; \
-  if (c >= 0xc0) GETUTF8LEN(c, eptr, len);
-
-/* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the
-pointer, incrementing length if there are extra bytes. This is called when we
-do not know if we are in UTF-8 mode. */
-
-#define GETCHARLENTEST(c, eptr, len) \
-  c = *eptr; \
-  if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);
-
-/* If the pointer is not at the start of a character, move it back until
-it is. This is called only in UTF-8 mode - we don't put a test within the macro
-because almost all calls are already within a block of UTF-8 only code. */
-
-#define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
-
-/* Same as above, just in the other direction. */
-#define FORWARDCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr++
-
-/* Same as above, but it allows a fully customizable form. */
-#define ACROSSCHAR(condition, eptr, action) \
-  while((condition) && ((eptr) & 0xc0) == 0x80) action
-
-#elif defined COMPILE_PCRE16
-
-/* Tells the biggest code point which can be encoded as a single character. */
-
-#define MAX_VALUE_FOR_SINGLE_CHAR 65535
-
-/* Tests whether the code point needs extra characters to decode. */
-
-#define HAS_EXTRALEN(c) (((c) & 0xfc00) == 0xd800)
-
-/* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
-Otherwise it has an undefined behaviour. */
-
-#define GET_EXTRALEN(c) 1
-
-/* Returns TRUE, if the given character is not the first character
-of a UTF sequence. */
-
-#define NOT_FIRSTCHAR(c) (((c) & 0xfc00) == 0xdc00)
-
-/* Base macro to pick up the low surrogate of a UTF-16 character, not
-advancing the pointer. */
-
-#define GETUTF16(c, eptr) \
-   { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; }
-
-/* Get the next UTF-16 character, not advancing the pointer. This is called when
-we know we are in UTF-16 mode. */
-
-#define GETCHAR(c, eptr) \
-  c = *eptr; \
-  if ((c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
-
-/* Get the next UTF-16 character, testing for UTF-16 mode, and not advancing the
-pointer. */
-
-#define GETCHARTEST(c, eptr) \
-  c = *eptr; \
-  if (utf && (c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
-
-/* Base macro to pick up the low surrogate of a UTF-16 character, advancing
-the pointer. */
-
-#define GETUTF16INC(c, eptr) \
-   { c = (((c & 0x3ff) << 10) | (*eptr++ & 0x3ff)) + 0x10000; }
-
-/* Get the next UTF-16 character, advancing the pointer. This is called when we
-know we are in UTF-16 mode. */
-
-#define GETCHARINC(c, eptr) \
-  c = *eptr++; \
-  if ((c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
-
-/* Get the next character, testing for UTF-16 mode, and advancing the pointer.
-This is called when we don't know if we are in UTF-16 mode. */
-
-#define GETCHARINCTEST(c, eptr) \
-  c = *eptr++; \
-  if (utf && (c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
-
-/* Base macro to pick up the low surrogate of a UTF-16 character, not
-advancing the pointer, incrementing the length. */
-
-#define GETUTF16LEN(c, eptr, len) \
-   { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; len++; }
-
-/* Get the next UTF-16 character, not advancing the pointer, incrementing
-length if there is a low surrogate. This is called when we know we are in
-UTF-16 mode. */
-
-#define GETCHARLEN(c, eptr, len) \
-  c = *eptr; \
-  if ((c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
-
-/* Get the next UTF-816character, testing for UTF-16 mode, not advancing the
-pointer, incrementing length if there is a low surrogate. This is called when
-we do not know if we are in UTF-16 mode. */
-
-#define GETCHARLENTEST(c, eptr, len) \
-  c = *eptr; \
-  if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
-
-/* If the pointer is not at the start of a character, move it back until
-it is. This is called only in UTF-16 mode - we don't put a test within the
-macro because almost all calls are already within a block of UTF-16 only
-code. */
-
-#define BACKCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr--
-
-/* Same as above, just in the other direction. */
-#define FORWARDCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr++
-
-/* Same as above, but it allows a fully customizable form. */
-#define ACROSSCHAR(condition, eptr, action) \
-  if ((condition) && ((eptr) & 0xfc00) == 0xdc00) action
-
-#elif defined COMPILE_PCRE32
-
-/* These are trivial for the 32-bit library, since all UTF-32 characters fit
-into one pcre_uchar unit. */
-#define MAX_VALUE_FOR_SINGLE_CHAR (0x10ffffu)
-#define HAS_EXTRALEN(c) (0)
-#define GET_EXTRALEN(c) (0)
-#define NOT_FIRSTCHAR(c) (0)
-
-/* Get the next UTF-32 character, not advancing the pointer. This is called when
-we know we are in UTF-32 mode. */
-
-#define GETCHAR(c, eptr) \
-  c = *(eptr);
-
-/* Get the next UTF-32 character, testing for UTF-32 mode, and not advancing the
-pointer. */
-
-#define GETCHARTEST(c, eptr) \
-  c = *(eptr);
-
-/* Get the next UTF-32 character, advancing the pointer. This is called when we
-know we are in UTF-32 mode. */
-
-#define GETCHARINC(c, eptr) \
-  c = *((eptr)++);
-
-/* Get the next character, testing for UTF-32 mode, and advancing the pointer.
-This is called when we don't know if we are in UTF-32 mode. */
-
-#define GETCHARINCTEST(c, eptr) \
-  c = *((eptr)++);
-
-/* Get the next UTF-32 character, not advancing the pointer, not incrementing
-length (since all UTF-32 is of length 1). This is called when we know we are in
-UTF-32 mode. */
-
-#define GETCHARLEN(c, eptr, len) \
-  GETCHAR(c, eptr)
-
-/* Get the next UTF-32character, testing for UTF-32 mode, not advancing the
-pointer, not incrementing the length (since all UTF-32 is of length 1).
-This is called when we do not know if we are in UTF-32 mode. */
-
-#define GETCHARLENTEST(c, eptr, len) \
-  GETCHARTEST(c, eptr)
-
-/* If the pointer is not at the start of a character, move it back until
-it is. This is called only in UTF-32 mode - we don't put a test within the
-macro because almost all calls are already within a block of UTF-32 only
-code.
-These are all no-ops since all UTF-32 characters fit into one pcre_uchar. */
-
-#define BACKCHAR(eptr) do { } while (0)
-
-/* Same as above, just in the other direction. */
-#define FORWARDCHAR(eptr) do { } while (0)
-
-/* Same as above, but it allows a fully customizable form. */
-#define ACROSSCHAR(condition, eptr, action) do { } while (0)
-
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-#endif  /* SUPPORT_UTF */
-
-/* Tests for Unicode horizontal and vertical whitespace characters must check a
-number of different values. Using a switch statement for this generates the
-fastest code (no loop, no memory access), and there are several places in the
-interpreter code where this happens. In order to ensure that all the case lists
-remain in step, we use macros so that there is only one place where the lists
-are defined.
-
-These values are also required as lists in pcre_compile.c when processing \h,
-\H, \v and \V in a character class. The lists are defined in pcre_tables.c, but
-macros that define the values are here so that all the definitions are
-together. The lists must be in ascending character order, terminated by
-NOTACHAR (which is 0xffffffff).
-
-Any changes should ensure that the various macros are kept in step with each
-other. NOTE: The values also appear in pcre_jit_compile.c. */
-
-/* ------ ASCII/Unicode environments ------ */
-
-#ifndef EBCDIC
-
-#define HSPACE_LIST \
-  CHAR_HT, CHAR_SPACE, CHAR_NBSP, \
-  0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \
-  0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \
-  NOTACHAR
-
-#define HSPACE_MULTIBYTE_CASES \
-  case 0x1680:  /* OGHAM SPACE MARK */ \
-  case 0x180e:  /* MONGOLIAN VOWEL SEPARATOR */ \
-  case 0x2000:  /* EN QUAD */ \
-  case 0x2001:  /* EM QUAD */ \
-  case 0x2002:  /* EN SPACE */ \
-  case 0x2003:  /* EM SPACE */ \
-  case 0x2004:  /* THREE-PER-EM SPACE */ \
-  case 0x2005:  /* FOUR-PER-EM SPACE */ \
-  case 0x2006:  /* SIX-PER-EM SPACE */ \
-  case 0x2007:  /* FIGURE SPACE */ \
-  case 0x2008:  /* PUNCTUATION SPACE */ \
-  case 0x2009:  /* THIN SPACE */ \
-  case 0x200A:  /* HAIR SPACE */ \
-  case 0x202f:  /* NARROW NO-BREAK SPACE */ \
-  case 0x205f:  /* MEDIUM MATHEMATICAL SPACE */ \
-  case 0x3000   /* IDEOGRAPHIC SPACE */
-
-#define HSPACE_BYTE_CASES \
-  case CHAR_HT: \
-  case CHAR_SPACE: \
-  case CHAR_NBSP
-
-#define HSPACE_CASES \
-  HSPACE_BYTE_CASES: \
-  HSPACE_MULTIBYTE_CASES
-
-#define VSPACE_LIST \
-  CHAR_LF, CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, 0x2028, 0x2029, NOTACHAR
-
-#define VSPACE_MULTIBYTE_CASES \
-  case 0x2028:    /* LINE SEPARATOR */ \
-  case 0x2029     /* PARAGRAPH SEPARATOR */
-
-#define VSPACE_BYTE_CASES \
-  case CHAR_LF: \
-  case CHAR_VT: \
-  case CHAR_FF: \
-  case CHAR_CR: \
-  case CHAR_NEL
-
-#define VSPACE_CASES \
-  VSPACE_BYTE_CASES: \
-  VSPACE_MULTIBYTE_CASES
-
-/* ------ EBCDIC environments ------ */
-
-#else
-#define HSPACE_LIST CHAR_HT, CHAR_SPACE, CHAR_NBSP, NOTACHAR
-
-#define HSPACE_BYTE_CASES \
-  case CHAR_HT: \
-  case CHAR_SPACE: \
-  case CHAR_NBSP
-
-#define HSPACE_CASES HSPACE_BYTE_CASES
-
-#ifdef EBCDIC_NL25
-#define VSPACE_LIST \
-  CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, CHAR_LF, NOTACHAR
-#else
-#define VSPACE_LIST \
-  CHAR_VT, CHAR_FF, CHAR_CR, CHAR_LF, CHAR_NEL, NOTACHAR
-#endif
-
-#define VSPACE_BYTE_CASES \
-  case CHAR_LF: \
-  case CHAR_VT: \
-  case CHAR_FF: \
-  case CHAR_CR: \
-  case CHAR_NEL
-
-#define VSPACE_CASES VSPACE_BYTE_CASES
-#endif  /* EBCDIC */
-
-/* ------ End of whitespace macros ------ */
-
-
-
-/* Private flags containing information about the compiled regex. They used to
-live at the top end of the options word, but that got almost full, so they were
-moved to a 16-bit flags word - which got almost full, so now they are in a
-32-bit flags word. From release 8.00, PCRE_NOPARTIAL is unused, as the
-restrictions on partial matching have been lifted. It remains for backwards
-compatibility. */
-
-#define PCRE_MODE8         0x00000001  /* compiled in 8 bit mode */
-#define PCRE_MODE16        0x00000002  /* compiled in 16 bit mode */
-#define PCRE_MODE32        0x00000004  /* compiled in 32 bit mode */
-#define PCRE_FIRSTSET      0x00000010  /* first_char is set */
-#define PCRE_FCH_CASELESS  0x00000020  /* caseless first char */
-#define PCRE_REQCHSET      0x00000040  /* req_byte is set */
-#define PCRE_RCH_CASELESS  0x00000080  /* caseless requested char */
-#define PCRE_STARTLINE     0x00000100  /* start after \n for multiline */
-#define PCRE_NOPARTIAL     0x00000200  /* can't use partial with this regex */
-#define PCRE_JCHANGED      0x00000400  /* j option used in regex */
-#define PCRE_HASCRORLF     0x00000800  /* explicit \r or \n in pattern */
-#define PCRE_HASTHEN       0x00001000  /* pattern contains (*THEN) */
-#define PCRE_MLSET         0x00002000  /* match limit set by regex */
-#define PCRE_RLSET         0x00004000  /* recursion limit set by regex */
-#define PCRE_MATCH_EMPTY   0x00008000  /* pattern can match empty string */
-
-#if defined COMPILE_PCRE8
-#define PCRE_MODE          PCRE_MODE8
-#elif defined COMPILE_PCRE16
-#define PCRE_MODE          PCRE_MODE16
-#elif defined COMPILE_PCRE32
-#define PCRE_MODE          PCRE_MODE32
-#endif
-#define PCRE_MODE_MASK     (PCRE_MODE8 | PCRE_MODE16 | PCRE_MODE32)
-
-/* Flags for the "extra" block produced by pcre_study(). */
-
-#define PCRE_STUDY_MAPPED  0x0001  /* a map of starting chars exists */
-#define PCRE_STUDY_MINLEN  0x0002  /* a minimum length field exists */
-
-/* Masks for identifying the public options that are permitted at compile
-time, run time, or study time, respectively. */
-
-#define PCRE_NEWLINE_BITS (PCRE_NEWLINE_CR|PCRE_NEWLINE_LF|PCRE_NEWLINE_ANY| \
-                           PCRE_NEWLINE_ANYCRLF)
-
-#define PUBLIC_COMPILE_OPTIONS \
-  (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
-   PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
-   PCRE_NO_AUTO_CAPTURE|PCRE_NO_AUTO_POSSESS| \
-   PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
-   PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
-   PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE|PCRE_NEVER_UTF)
-
-#define PUBLIC_EXEC_OPTIONS \
-  (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
-   PCRE_NO_UTF8_CHECK|PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT|PCRE_NEWLINE_BITS| \
-   PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE|PCRE_NO_START_OPTIMIZE)
-
-#define PUBLIC_DFA_EXEC_OPTIONS \
-  (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
-   PCRE_NO_UTF8_CHECK|PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT|PCRE_DFA_SHORTEST| \
-   PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
-   PCRE_NO_START_OPTIMIZE)
-
-#define PUBLIC_STUDY_OPTIONS \
-   (PCRE_STUDY_JIT_COMPILE|PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE| \
-    PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE|PCRE_STUDY_EXTRA_NEEDED)
-
-#define PUBLIC_JIT_EXEC_OPTIONS \
-   (PCRE_NO_UTF8_CHECK|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|\
-    PCRE_NOTEMPTY_ATSTART|PCRE_PARTIAL_SOFT|PCRE_PARTIAL_HARD)
-
-/* Magic number to provide a small check against being handed junk. */
-
-#define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */
-
-/* This variable is used to detect a loaded regular expression
-in different endianness. */
-
-#define REVERSED_MAGIC_NUMBER  0x45524350UL   /* 'ERCP' */
-
-/* The maximum remaining length of subject we are prepared to search for a
-req_byte match. */
-
-#define REQ_BYTE_MAX 1000
-
-/* Miscellaneous definitions. The #ifndef is to pacify compiler warnings in
-environments where these macros are defined elsewhere. Unfortunately, there
-is no way to do the same for the typedef. */
-
-typedef int BOOL;
-
-#ifndef FALSE
-#define FALSE   0
-#define TRUE    1
-#endif
-
-/* If PCRE is to support UTF-8 on EBCDIC platforms, we cannot use normal
-character constants like '*' because the compiler would emit their EBCDIC code,
-which is different from their ASCII/UTF-8 code. Instead we define macros for
-the characters so that they always use the ASCII/UTF-8 code when UTF-8 support
-is enabled. When UTF-8 support is not enabled, the definitions use character
-literals. Both character and string versions of each character are needed, and
-there are some longer strings as well.
-
-This means that, on EBCDIC platforms, the PCRE library can handle either
-EBCDIC, or UTF-8, but not both. To support both in the same compiled library
-would need different lookups depending on whether PCRE_UTF8 was set or not.
-This would make it impossible to use characters in switch/case statements,
-which would reduce performance. For a theoretical use (which nobody has asked
-for) in a minority area (EBCDIC platforms), this is not sensible. Any
-application that did need both could compile two versions of the library, using
-macros to give the functions distinct names. */
-
-#ifndef SUPPORT_UTF
-
-/* UTF-8 support is not enabled; use the platform-dependent character literals
-so that PCRE works in both ASCII and EBCDIC environments, but only in non-UTF
-mode. Newline characters are problematic in EBCDIC. Though it has CR and LF
-characters, a common practice has been to use its NL (0x15) character as the
-line terminator in C-like processing environments. However, sometimes the LF
-(0x25) character is used instead, according to this Unicode document:
-
-http://unicode.org/standard/reports/tr13/tr13-5.html
-
-PCRE defaults EBCDIC NL to 0x15, but has a build-time option to select 0x25
-instead. Whichever is *not* chosen is defined as NEL.
-
-In both ASCII and EBCDIC environments, CHAR_NL and CHAR_LF are synonyms for the
-same code point. */
-
-#ifdef EBCDIC
-
-#ifndef EBCDIC_NL25
-#define CHAR_NL                     '\x15'
-#define CHAR_NEL                    '\x25'
-#define STR_NL                      "\x15"
-#define STR_NEL                     "\x25"
-#else
-#define CHAR_NL                     '\x25'
-#define CHAR_NEL                    '\x15'
-#define STR_NL                      "\x25"
-#define STR_NEL                     "\x15"
-#endif
-
-#define CHAR_LF                     CHAR_NL
-#define STR_LF                      STR_NL
-
-#define CHAR_ESC                    '\047'
-#define CHAR_DEL                    '\007'
-#define CHAR_NBSP                   '\x41'
-#define STR_ESC                     "\047"
-#define STR_DEL                     "\007"
-
-#else  /* Not EBCDIC */
-
-/* In ASCII/Unicode, linefeed is '\n' and we equate this to NL for
-compatibility. NEL is the Unicode newline character; make sure it is
-a positive value. */
-
-#define CHAR_LF                     '\n'
-#define CHAR_NL                     CHAR_LF
-#define CHAR_NEL                    ((unsigned char)'\x85')
-#define CHAR_ESC                    '\033'
-#define CHAR_DEL                    '\177'
-#define CHAR_NBSP                   ((unsigned char)'\xa0')
-
-#define STR_LF                      "\n"
-#define STR_NL                      STR_LF
-#define STR_NEL                     "\x85"
-#define STR_ESC                     "\033"
-#define STR_DEL                     "\177"
-
-#endif  /* EBCDIC */
-
-/* The remaining definitions work in both environments. */
-
-#define CHAR_NULL                   '\0'
-#define CHAR_HT                     '\t'
-#define CHAR_VT                     '\v'
-#define CHAR_FF                     '\f'
-#define CHAR_CR                     '\r'
-#define CHAR_BS                     '\b'
-#define CHAR_BEL                    '\a'
-
-#define CHAR_SPACE                  ' '
-#define CHAR_EXCLAMATION_MARK       '!'
-#define CHAR_QUOTATION_MARK         '"'
-#define CHAR_NUMBER_SIGN            '#'
-#define CHAR_DOLLAR_SIGN            '$'
-#define CHAR_PERCENT_SIGN           '%'
-#define CHAR_AMPERSAND              '&'
-#define CHAR_APOSTROPHE             '\''
-#define CHAR_LEFT_PARENTHESIS       '('
-#define CHAR_RIGHT_PARENTHESIS      ')'
-#define CHAR_ASTERISK               '*'
-#define CHAR_PLUS                   '+'
-#define CHAR_COMMA                  ','
-#define CHAR_MINUS                  '-'
-#define CHAR_DOT                    '.'
-#define CHAR_SLASH                  '/'
-#define CHAR_0                      '0'
-#define CHAR_1                      '1'
-#define CHAR_2                      '2'
-#define CHAR_3                      '3'
-#define CHAR_4                      '4'
-#define CHAR_5                      '5'
-#define CHAR_6                      '6'
-#define CHAR_7                      '7'
-#define CHAR_8                      '8'
-#define CHAR_9                      '9'
-#define CHAR_COLON                  ':'
-#define CHAR_SEMICOLON              ';'
-#define CHAR_LESS_THAN_SIGN         '<'
-#define CHAR_EQUALS_SIGN            '='
-#define CHAR_GREATER_THAN_SIGN      '>'
-#define CHAR_QUESTION_MARK          '?'
-#define CHAR_COMMERCIAL_AT          '@'
-#define CHAR_A                      'A'
-#define CHAR_B                      'B'
-#define CHAR_C                      'C'
-#define CHAR_D                      'D'
-#define CHAR_E                      'E'
-#define CHAR_F                      'F'
-#define CHAR_G                      'G'
-#define CHAR_H                      'H'
-#define CHAR_I                      'I'
-#define CHAR_J                      'J'
-#define CHAR_K                      'K'
-#define CHAR_L                      'L'
-#define CHAR_M                      'M'
-#define CHAR_N                      'N'
-#define CHAR_O                      'O'
-#define CHAR_P                      'P'
-#define CHAR_Q                      'Q'
-#define CHAR_R                      'R'
-#define CHAR_S                      'S'
-#define CHAR_T                      'T'
-#define CHAR_U                      'U'
-#define CHAR_V                      'V'
-#define CHAR_W                      'W'
-#define CHAR_X                      'X'
-#define CHAR_Y                      'Y'
-#define CHAR_Z                      'Z'
-#define CHAR_LEFT_SQUARE_BRACKET    '['
-#define CHAR_BACKSLASH              '\\'
-#define CHAR_RIGHT_SQUARE_BRACKET   ']'
-#define CHAR_CIRCUMFLEX_ACCENT      '^'
-#define CHAR_UNDERSCORE             '_'
-#define CHAR_GRAVE_ACCENT           '`'
-#define CHAR_a                      'a'
-#define CHAR_b                      'b'
-#define CHAR_c                      'c'
-#define CHAR_d                      'd'
-#define CHAR_e                      'e'
-#define CHAR_f                      'f'
-#define CHAR_g                      'g'
-#define CHAR_h                      'h'
-#define CHAR_i                      'i'
-#define CHAR_j                      'j'
-#define CHAR_k                      'k'
-#define CHAR_l                      'l'
-#define CHAR_m                      'm'
-#define CHAR_n                      'n'
-#define CHAR_o                      'o'
-#define CHAR_p                      'p'
-#define CHAR_q                      'q'
-#define CHAR_r                      'r'
-#define CHAR_s                      's'
-#define CHAR_t                      't'
-#define CHAR_u                      'u'
-#define CHAR_v                      'v'
-#define CHAR_w                      'w'
-#define CHAR_x                      'x'
-#define CHAR_y                      'y'
-#define CHAR_z                      'z'
-#define CHAR_LEFT_CURLY_BRACKET     '{'
-#define CHAR_VERTICAL_LINE          '|'
-#define CHAR_RIGHT_CURLY_BRACKET    '}'
-#define CHAR_TILDE                  '~'
-
-#define STR_HT                      "\t"
-#define STR_VT                      "\v"
-#define STR_FF                      "\f"
-#define STR_CR                      "\r"
-#define STR_BS                      "\b"
-#define STR_BEL                     "\a"
-
-#define STR_SPACE                   " "
-#define STR_EXCLAMATION_MARK        "!"
-#define STR_QUOTATION_MARK          "\""
-#define STR_NUMBER_SIGN             "#"
-#define STR_DOLLAR_SIGN             "$"
-#define STR_PERCENT_SIGN            "%"
-#define STR_AMPERSAND               "&"
-#define STR_APOSTROPHE              "'"
-#define STR_LEFT_PARENTHESIS        "("
-#define STR_RIGHT_PARENTHESIS       ")"
-#define STR_ASTERISK                "*"
-#define STR_PLUS                    "+"
-#define STR_COMMA                   ","
-#define STR_MINUS                   "-"
-#define STR_DOT                     "."
-#define STR_SLASH                   "/"
-#define STR_0                       "0"
-#define STR_1                       "1"
-#define STR_2                       "2"
-#define STR_3                       "3"
-#define STR_4                       "4"
-#define STR_5                       "5"
-#define STR_6                       "6"
-#define STR_7                       "7"
-#define STR_8                       "8"
-#define STR_9                       "9"
-#define STR_COLON                   ":"
-#define STR_SEMICOLON               ";"
-#define STR_LESS_THAN_SIGN          "<"
-#define STR_EQUALS_SIGN             "="
-#define STR_GREATER_THAN_SIGN       ">"
-#define STR_QUESTION_MARK           "?"
-#define STR_COMMERCIAL_AT           "@"
-#define STR_A                       "A"
-#define STR_B                       "B"
-#define STR_C                       "C"
-#define STR_D                       "D"
-#define STR_E                       "E"
-#define STR_F                       "F"
-#define STR_G                       "G"
-#define STR_H                       "H"
-#define STR_I                       "I"
-#define STR_J                       "J"
-#define STR_K                       "K"
-#define STR_L                       "L"
-#define STR_M                       "M"
-#define STR_N                       "N"
-#define STR_O                       "O"
-#define STR_P                       "P"
-#define STR_Q                       "Q"
-#define STR_R                       "R"
-#define STR_S                       "S"
-#define STR_T                       "T"
-#define STR_U                       "U"
-#define STR_V                       "V"
-#define STR_W                       "W"
-#define STR_X                       "X"
-#define STR_Y                       "Y"
-#define STR_Z                       "Z"
-#define STR_LEFT_SQUARE_BRACKET     "["
-#define STR_BACKSLASH               "\\"
-#define STR_RIGHT_SQUARE_BRACKET    "]"
-#define STR_CIRCUMFLEX_ACCENT       "^"
-#define STR_UNDERSCORE              "_"
-#define STR_GRAVE_ACCENT            "`"
-#define STR_a                       "a"
-#define STR_b                       "b"
-#define STR_c                       "c"
-#define STR_d                       "d"
-#define STR_e                       "e"
-#define STR_f                       "f"
-#define STR_g                       "g"
-#define STR_h                       "h"
-#define STR_i                       "i"
-#define STR_j                       "j"
-#define STR_k                       "k"
-#define STR_l                       "l"
-#define STR_m                       "m"
-#define STR_n                       "n"
-#define STR_o                       "o"
-#define STR_p                       "p"
-#define STR_q                       "q"
-#define STR_r                       "r"
-#define STR_s                       "s"
-#define STR_t                       "t"
-#define STR_u                       "u"
-#define STR_v                       "v"
-#define STR_w                       "w"
-#define STR_x                       "x"
-#define STR_y                       "y"
-#define STR_z                       "z"
-#define STR_LEFT_CURLY_BRACKET      "{"
-#define STR_VERTICAL_LINE           "|"
-#define STR_RIGHT_CURLY_BRACKET     "}"
-#define STR_TILDE                   "~"
-
-#define STRING_ACCEPT0              "ACCEPT\0"
-#define STRING_COMMIT0              "COMMIT\0"
-#define STRING_F0                   "F\0"
-#define STRING_FAIL0                "FAIL\0"
-#define STRING_MARK0                "MARK\0"
-#define STRING_PRUNE0               "PRUNE\0"
-#define STRING_SKIP0                "SKIP\0"
-#define STRING_THEN                 "THEN"
-
-#define STRING_alpha0               "alpha\0"
-#define STRING_lower0               "lower\0"
-#define STRING_upper0               "upper\0"
-#define STRING_alnum0               "alnum\0"
-#define STRING_ascii0               "ascii\0"
-#define STRING_blank0               "blank\0"
-#define STRING_cntrl0               "cntrl\0"
-#define STRING_digit0               "digit\0"
-#define STRING_graph0               "graph\0"
-#define STRING_print0               "print\0"
-#define STRING_punct0               "punct\0"
-#define STRING_space0               "space\0"
-#define STRING_word0                "word\0"
-#define STRING_xdigit               "xdigit"
-
-#define STRING_DEFINE               "DEFINE"
-#define STRING_WEIRD_STARTWORD      "[:<:]]"
-#define STRING_WEIRD_ENDWORD        "[:>:]]"
-
-#define STRING_CR_RIGHTPAR              "CR)"
-#define STRING_LF_RIGHTPAR              "LF)"
-#define STRING_CRLF_RIGHTPAR            "CRLF)"
-#define STRING_ANY_RIGHTPAR             "ANY)"
-#define STRING_ANYCRLF_RIGHTPAR         "ANYCRLF)"
-#define STRING_BSR_ANYCRLF_RIGHTPAR     "BSR_ANYCRLF)"
-#define STRING_BSR_UNICODE_RIGHTPAR     "BSR_UNICODE)"
-#define STRING_UTF8_RIGHTPAR            "UTF8)"
-#define STRING_UTF16_RIGHTPAR           "UTF16)"
-#define STRING_UTF32_RIGHTPAR           "UTF32)"
-#define STRING_UTF_RIGHTPAR             "UTF)"
-#define STRING_UCP_RIGHTPAR             "UCP)"
-#define STRING_NO_AUTO_POSSESS_RIGHTPAR "NO_AUTO_POSSESS)"
-#define STRING_NO_START_OPT_RIGHTPAR    "NO_START_OPT)"
-#define STRING_LIMIT_MATCH_EQ           "LIMIT_MATCH="
-#define STRING_LIMIT_RECURSION_EQ       "LIMIT_RECURSION="
-
-#else  /* SUPPORT_UTF */
-
-/* UTF-8 support is enabled; always use UTF-8 (=ASCII) character codes. This
-works in both modes non-EBCDIC platforms, and on EBCDIC platforms in UTF-8 mode
-only. */
-
-#define CHAR_HT                     '\011'
-#define CHAR_VT                     '\013'
-#define CHAR_FF                     '\014'
-#define CHAR_CR                     '\015'
-#define CHAR_LF                     '\012'
-#define CHAR_NL                     CHAR_LF
-#define CHAR_NEL                    ((unsigned char)'\x85')
-#define CHAR_BS                     '\010'
-#define CHAR_BEL                    '\007'
-#define CHAR_ESC                    '\033'
-#define CHAR_DEL                    '\177'
-
-#define CHAR_NULL                   '\0'
-#define CHAR_SPACE                  '\040'
-#define CHAR_EXCLAMATION_MARK       '\041'
-#define CHAR_QUOTATION_MARK         '\042'
-#define CHAR_NUMBER_SIGN            '\043'
-#define CHAR_DOLLAR_SIGN            '\044'
-#define CHAR_PERCENT_SIGN           '\045'
-#define CHAR_AMPERSAND              '\046'
-#define CHAR_APOSTROPHE             '\047'
-#define CHAR_LEFT_PARENTHESIS       '\050'
-#define CHAR_RIGHT_PARENTHESIS      '\051'
-#define CHAR_ASTERISK               '\052'
-#define CHAR_PLUS                   '\053'
-#define CHAR_COMMA                  '\054'
-#define CHAR_MINUS                  '\055'
-#define CHAR_DOT                    '\056'
-#define CHAR_SLASH                  '\057'
-#define CHAR_0                      '\060'
-#define CHAR_1                      '\061'
-#define CHAR_2                      '\062'
-#define CHAR_3                      '\063'
-#define CHAR_4                      '\064'
-#define CHAR_5                      '\065'
-#define CHAR_6                      '\066'
-#define CHAR_7                      '\067'
-#define CHAR_8                      '\070'
-#define CHAR_9                      '\071'
-#define CHAR_COLON                  '\072'
-#define CHAR_SEMICOLON              '\073'
-#define CHAR_LESS_THAN_SIGN         '\074'
-#define CHAR_EQUALS_SIGN            '\075'
-#define CHAR_GREATER_THAN_SIGN      '\076'
-#define CHAR_QUESTION_MARK          '\077'
-#define CHAR_COMMERCIAL_AT          '\100'
-#define CHAR_A                      '\101'
-#define CHAR_B                      '\102'
-#define CHAR_C                      '\103'
-#define CHAR_D                      '\104'
-#define CHAR_E                      '\105'
-#define CHAR_F                      '\106'
-#define CHAR_G                      '\107'
-#define CHAR_H                      '\110'
-#define CHAR_I                      '\111'
-#define CHAR_J                      '\112'
-#define CHAR_K                      '\113'
-#define CHAR_L                      '\114'
-#define CHAR_M                      '\115'
-#define CHAR_N                      '\116'
-#define CHAR_O                      '\117'
-#define CHAR_P                      '\120'
-#define CHAR_Q                      '\121'
-#define CHAR_R                      '\122'
-#define CHAR_S                      '\123'
-#define CHAR_T                      '\124'
-#define CHAR_U                      '\125'
-#define CHAR_V                      '\126'
-#define CHAR_W                      '\127'
-#define CHAR_X                      '\130'
-#define CHAR_Y                      '\131'
-#define CHAR_Z                      '\132'
-#define CHAR_LEFT_SQUARE_BRACKET    '\133'
-#define CHAR_BACKSLASH              '\134'
-#define CHAR_RIGHT_SQUARE_BRACKET   '\135'
-#define CHAR_CIRCUMFLEX_ACCENT      '\136'
-#define CHAR_UNDERSCORE             '\137'
-#define CHAR_GRAVE_ACCENT           '\140'
-#define CHAR_a                      '\141'
-#define CHAR_b                      '\142'
-#define CHAR_c                      '\143'
-#define CHAR_d                      '\144'
-#define CHAR_e                      '\145'
-#define CHAR_f                      '\146'
-#define CHAR_g                      '\147'
-#define CHAR_h                      '\150'
-#define CHAR_i                      '\151'
-#define CHAR_j                      '\152'
-#define CHAR_k                      '\153'
-#define CHAR_l                      '\154'
-#define CHAR_m                      '\155'
-#define CHAR_n                      '\156'
-#define CHAR_o                      '\157'
-#define CHAR_p                      '\160'
-#define CHAR_q                      '\161'
-#define CHAR_r                      '\162'
-#define CHAR_s                      '\163'
-#define CHAR_t                      '\164'
-#define CHAR_u                      '\165'
-#define CHAR_v                      '\166'
-#define CHAR_w                      '\167'
-#define CHAR_x                      '\170'
-#define CHAR_y                      '\171'
-#define CHAR_z                      '\172'
-#define CHAR_LEFT_CURLY_BRACKET     '\173'
-#define CHAR_VERTICAL_LINE          '\174'
-#define CHAR_RIGHT_CURLY_BRACKET    '\175'
-#define CHAR_TILDE                  '\176'
-#define CHAR_NBSP                   ((unsigned char)'\xa0')
-
-#define STR_HT                      "\011"
-#define STR_VT                      "\013"
-#define STR_FF                      "\014"
-#define STR_CR                      "\015"
-#define STR_NL                      "\012"
-#define STR_BS                      "\010"
-#define STR_BEL                     "\007"
-#define STR_ESC                     "\033"
-#define STR_DEL                     "\177"
-
-#define STR_SPACE                   "\040"
-#define STR_EXCLAMATION_MARK        "\041"
-#define STR_QUOTATION_MARK          "\042"
-#define STR_NUMBER_SIGN             "\043"
-#define STR_DOLLAR_SIGN             "\044"
-#define STR_PERCENT_SIGN            "\045"
-#define STR_AMPERSAND               "\046"
-#define STR_APOSTROPHE              "\047"
-#define STR_LEFT_PARENTHESIS        "\050"
-#define STR_RIGHT_PARENTHESIS       "\051"
-#define STR_ASTERISK                "\052"
-#define STR_PLUS                    "\053"
-#define STR_COMMA                   "\054"
-#define STR_MINUS                   "\055"
-#define STR_DOT                     "\056"
-#define STR_SLASH                   "\057"
-#define STR_0                       "\060"
-#define STR_1                       "\061"
-#define STR_2                       "\062"
-#define STR_3                       "\063"
-#define STR_4                       "\064"
-#define STR_5                       "\065"
-#define STR_6                       "\066"
-#define STR_7                       "\067"
-#define STR_8                       "\070"
-#define STR_9                       "\071"
-#define STR_COLON                   "\072"
-#define STR_SEMICOLON               "\073"
-#define STR_LESS_THAN_SIGN          "\074"
-#define STR_EQUALS_SIGN             "\075"
-#define STR_GREATER_THAN_SIGN       "\076"
-#define STR_QUESTION_MARK           "\077"
-#define STR_COMMERCIAL_AT           "\100"
-#define STR_A                       "\101"
-#define STR_B                       "\102"
-#define STR_C                       "\103"
-#define STR_D                       "\104"
-#define STR_E                       "\105"
-#define STR_F                       "\106"
-#define STR_G                       "\107"
-#define STR_H                       "\110"
-#define STR_I                       "\111"
-#define STR_J                       "\112"
-#define STR_K                       "\113"
-#define STR_L                       "\114"
-#define STR_M                       "\115"
-#define STR_N                       "\116"
-#define STR_O                       "\117"
-#define STR_P                       "\120"
-#define STR_Q                       "\121"
-#define STR_R                       "\122"
-#define STR_S                       "\123"
-#define STR_T                       "\124"
-#define STR_U                       "\125"
-#define STR_V                       "\126"
-#define STR_W                       "\127"
-#define STR_X                       "\130"
-#define STR_Y                       "\131"
-#define STR_Z                       "\132"
-#define STR_LEFT_SQUARE_BRACKET     "\133"
-#define STR_BACKSLASH               "\134"
-#define STR_RIGHT_SQUARE_BRACKET    "\135"
-#define STR_CIRCUMFLEX_ACCENT       "\136"
-#define STR_UNDERSCORE              "\137"
-#define STR_GRAVE_ACCENT            "\140"
-#define STR_a                       "\141"
-#define STR_b                       "\142"
-#define STR_c                       "\143"
-#define STR_d                       "\144"
-#define STR_e                       "\145"
-#define STR_f                       "\146"
-#define STR_g                       "\147"
-#define STR_h                       "\150"
-#define STR_i                       "\151"
-#define STR_j                       "\152"
-#define STR_k                       "\153"
-#define STR_l                       "\154"
-#define STR_m                       "\155"
-#define STR_n                       "\156"
-#define STR_o                       "\157"
-#define STR_p                       "\160"
-#define STR_q                       "\161"
-#define STR_r                       "\162"
-#define STR_s                       "\163"
-#define STR_t                       "\164"
-#define STR_u                       "\165"
-#define STR_v                       "\166"
-#define STR_w                       "\167"
-#define STR_x                       "\170"
-#define STR_y                       "\171"
-#define STR_z                       "\172"
-#define STR_LEFT_CURLY_BRACKET      "\173"
-#define STR_VERTICAL_LINE           "\174"
-#define STR_RIGHT_CURLY_BRACKET     "\175"
-#define STR_TILDE                   "\176"
-
-#define STRING_ACCEPT0              STR_A STR_C STR_C STR_E STR_P STR_T "\0"
-#define STRING_COMMIT0              STR_C STR_O STR_M STR_M STR_I STR_T "\0"
-#define STRING_F0                   STR_F "\0"
-#define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"
-#define STRING_MARK0                STR_M STR_A STR_R STR_K "\0"
-#define STRING_PRUNE0               STR_P STR_R STR_U STR_N STR_E "\0"
-#define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"
-#define STRING_THEN                 STR_T STR_H STR_E STR_N
-
-#define STRING_alpha0               STR_a STR_l STR_p STR_h STR_a "\0"
-#define STRING_lower0               STR_l STR_o STR_w STR_e STR_r "\0"
-#define STRING_upper0               STR_u STR_p STR_p STR_e STR_r "\0"
-#define STRING_alnum0               STR_a STR_l STR_n STR_u STR_m "\0"
-#define STRING_ascii0               STR_a STR_s STR_c STR_i STR_i "\0"
-#define STRING_blank0               STR_b STR_l STR_a STR_n STR_k "\0"
-#define STRING_cntrl0               STR_c STR_n STR_t STR_r STR_l "\0"
-#define STRING_digit0               STR_d STR_i STR_g STR_i STR_t "\0"
-#define STRING_graph0               STR_g STR_r STR_a STR_p STR_h "\0"
-#define STRING_print0               STR_p STR_r STR_i STR_n STR_t "\0"
-#define STRING_punct0               STR_p STR_u STR_n STR_c STR_t "\0"
-#define STRING_space0               STR_s STR_p STR_a STR_c STR_e "\0"
-#define STRING_word0                STR_w STR_o STR_r STR_d       "\0"
-#define STRING_xdigit               STR_x STR_d STR_i STR_g STR_i STR_t
-
-#define STRING_DEFINE               STR_D STR_E STR_F STR_I STR_N STR_E
-#define STRING_WEIRD_STARTWORD      STR_LEFT_SQUARE_BRACKET STR_COLON STR_LESS_THAN_SIGN STR_COLON STR_RIGHT_SQUARE_BRACKET STR_RIGHT_SQUARE_BRACKET
-#define STRING_WEIRD_ENDWORD        STR_LEFT_SQUARE_BRACKET STR_COLON STR_GREATER_THAN_SIGN STR_COLON STR_RIGHT_SQUARE_BRACKET STR_RIGHT_SQUARE_BRACKET
-
-#define STRING_CR_RIGHTPAR              STR_C STR_R STR_RIGHT_PARENTHESIS
-#define STRING_LF_RIGHTPAR              STR_L STR_F STR_RIGHT_PARENTHESIS
-#define STRING_CRLF_RIGHTPAR            STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
-#define STRING_ANY_RIGHTPAR             STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS
-#define STRING_ANYCRLF_RIGHTPAR         STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
-#define STRING_BSR_ANYCRLF_RIGHTPAR     STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
-#define STRING_BSR_UNICODE_RIGHTPAR     STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS
-#define STRING_UTF8_RIGHTPAR            STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
-#define STRING_UTF16_RIGHTPAR           STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS
-#define STRING_UTF32_RIGHTPAR           STR_U STR_T STR_F STR_3 STR_2 STR_RIGHT_PARENTHESIS
-#define STRING_UTF_RIGHTPAR             STR_U STR_T STR_F STR_RIGHT_PARENTHESIS
-#define STRING_UCP_RIGHTPAR             STR_U STR_C STR_P STR_RIGHT_PARENTHESIS
-#define STRING_NO_AUTO_POSSESS_RIGHTPAR STR_N STR_O STR_UNDERSCORE STR_A STR_U STR_T STR_O STR_UNDERSCORE STR_P STR_O STR_S STR_S STR_E STR_S STR_S STR_RIGHT_PARENTHESIS
-#define STRING_NO_START_OPT_RIGHTPAR    STR_N STR_O STR_UNDERSCORE STR_S STR_T STR_A STR_R STR_T STR_UNDERSCORE STR_O STR_P STR_T STR_RIGHT_PARENTHESIS
-#define STRING_LIMIT_MATCH_EQ           STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_M STR_A STR_T STR_C STR_H STR_EQUALS_SIGN
-#define STRING_LIMIT_RECURSION_EQ       STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_R STR_E STR_C STR_U STR_R STR_S STR_I STR_O STR_N STR_EQUALS_SIGN
-
-#endif  /* SUPPORT_UTF */
-
-/* Escape items that are just an encoding of a particular data value. */
-
-#ifndef ESC_a
-#define ESC_a CHAR_BEL
-#endif
-
-#ifndef ESC_e
-#define ESC_e CHAR_ESC
-#endif
-
-#ifndef ESC_f
-#define ESC_f CHAR_FF
-#endif
-
-#ifndef ESC_n
-#define ESC_n CHAR_LF
-#endif
-
-#ifndef ESC_r
-#define ESC_r CHAR_CR
-#endif
-
-/* We can't officially use ESC_t because it is a POSIX reserved identifier
-(presumably because of all the others like size_t). */
-
-#ifndef ESC_tee
-#define ESC_tee CHAR_HT
-#endif
-
-/* Codes for different types of Unicode property */
-
-#define PT_ANY        0    /* Any property - matches all chars */
-#define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */
-#define PT_GC         2    /* Specified general characteristic (e.g. L) */
-#define PT_PC         3    /* Specified particular characteristic (e.g. Lu) */
-#define PT_SC         4    /* Script (e.g. Han) */
-#define PT_ALNUM      5    /* Alphanumeric - the union of L and N */
-#define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */
-#define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */
-#define PT_WORD       8    /* Word - L plus N plus underscore */
-#define PT_CLIST      9    /* Pseudo-property: match character list */
-#define PT_UCNC      10    /* Universal Character nameable character */
-#define PT_TABSIZE   11    /* Size of square table for autopossessify tests */
-
-/* The following special properties are used only in XCLASS items, when POSIX
-classes are specified and PCRE_UCP is set - in other words, for Unicode
-handling of these classes. They are not available via the \p or \P escapes like
-those in the above list, and so they do not take part in the autopossessifying
-table. */
-
-#define PT_PXGRAPH   11    /* [:graph:] - characters that mark the paper */
-#define PT_PXPRINT   12    /* [:print:] - [:graph:] plus non-control spaces */
-#define PT_PXPUNCT   13    /* [:punct:] - punctuation characters */
-
-/* Flag bits and data types for the extended class (OP_XCLASS) for classes that
-contain characters with values greater than 255. */
-
-#define XCL_NOT       0x01    /* Flag: this is a negative class */
-#define XCL_MAP       0x02    /* Flag: a 32-byte map is present */
-#define XCL_HASPROP   0x04    /* Flag: property checks are present. */
-
-#define XCL_END       0    /* Marks end of individual items */
-#define XCL_SINGLE    1    /* Single item (one multibyte char) follows */
-#define XCL_RANGE     2    /* A range (two multibyte chars) follows */
-#define XCL_PROP      3    /* Unicode property (2-byte property code follows) */
-#define XCL_NOTPROP   4    /* Unicode inverted property (ditto) */
-
-/* These are escaped items that aren't just an encoding of a particular data
-value such as \n. They must have non-zero values, as check_escape() returns 0
-for a data character.  Also, they must appear in the same order as in the
-opcode definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it
-corresponds to "." in DOTALL mode rather than an escape sequence. It is also
-used for [^] in JavaScript compatibility mode, and for \C in non-utf mode. In
-non-DOTALL mode, "." behaves like \N.
-
-The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.
-when PCRE_UCP is set and replacement of \d etc by \p sequences is required.
-They must be contiguous, and remain in order so that the replacements can be
-looked up from a table.
-
-Negative numbers are used to encode a backreference (\1, \2, \3, etc.) in
-check_escape(). There are two tests in the code for an escape
-greater than ESC_b and less than ESC_Z to detect the types that may be
-repeated. These are the types that consume characters. If any new escapes are
-put in between that don't consume a character, that code will have to change.
-*/
-
-enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,
-       ESC_W, ESC_w, ESC_N, ESC_dum, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,
-       ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,
-       ESC_E, ESC_Q, ESC_g, ESC_k,
-       ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu };
-
-
-/********************** Opcode definitions ******************/
-
-/****** NOTE NOTE NOTE ******
-
-Starting from 1 (i.e. after OP_END), the values up to OP_EOD must correspond in
-order to the list of escapes immediately above. Furthermore, values up to
-OP_DOLLM must not be changed without adjusting the table called autoposstab in
-pcre_compile.c
-
-Whenever this list is updated, the two macro definitions that follow must be
-updated to match. The possessification table called "opcode_possessify" in
-pcre_compile.c must also be updated, and also the tables called "coptable"
-and "poptable" in pcre_dfa_exec.c.
-
-****** NOTE NOTE NOTE ******/
-
-
-/* The values between FIRST_AUTOTAB_OP and LAST_AUTOTAB_RIGHT_OP, inclusive,
-are used in a table for deciding whether a repeated character type can be
-auto-possessified. */
-
-#define FIRST_AUTOTAB_OP       OP_NOT_DIGIT
-#define LAST_AUTOTAB_LEFT_OP   OP_EXTUNI
-#define LAST_AUTOTAB_RIGHT_OP  OP_DOLLM
-
-enum {
-  OP_END,            /* 0 End of pattern */
-
-  /* Values corresponding to backslashed metacharacters */
-
-  OP_SOD,            /* 1 Start of data: \A */
-  OP_SOM,            /* 2 Start of match (subject + offset): \G */
-  OP_SET_SOM,        /* 3 Set start of match (\K) */
-  OP_NOT_WORD_BOUNDARY,  /*  4 \B */
-  OP_WORD_BOUNDARY,      /*  5 \b */
-  OP_NOT_DIGIT,          /*  6 \D */
-  OP_DIGIT,              /*  7 \d */
-  OP_NOT_WHITESPACE,     /*  8 \S */
-  OP_WHITESPACE,         /*  9 \s */
-  OP_NOT_WORDCHAR,       /* 10 \W */
-  OP_WORDCHAR,           /* 11 \w */
-
-  OP_ANY,            /* 12 Match any character except newline (\N) */
-  OP_ALLANY,         /* 13 Match any character */
-  OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */
-  OP_NOTPROP,        /* 15 \P (not Unicode property) */
-  OP_PROP,           /* 16 \p (Unicode property) */
-  OP_ANYNL,          /* 17 \R (any newline sequence) */
-  OP_NOT_HSPACE,     /* 18 \H (not horizontal whitespace) */
-  OP_HSPACE,         /* 19 \h (horizontal whitespace) */
-  OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */
-  OP_VSPACE,         /* 21 \v (vertical whitespace) */
-  OP_EXTUNI,         /* 22 \X (extended Unicode sequence */
-  OP_EODN,           /* 23 End of data or \n at end of data (\Z) */
-  OP_EOD,            /* 24 End of data (\z) */
-
-  /* Line end assertions */
-
-  OP_DOLL,           /* 25 End of line - not multiline */
-  OP_DOLLM,          /* 26 End of line - multiline */
-  OP_CIRC,           /* 27 Start of line - not multiline */
-  OP_CIRCM,          /* 28 Start of line - multiline */
-
-  /* Single characters; caseful must precede the caseless ones */
-
-  OP_CHAR,           /* 29 Match one character, casefully */
-  OP_CHARI,          /* 30 Match one character, caselessly */
-  OP_NOT,            /* 31 Match one character, not the given one, casefully */
-  OP_NOTI,           /* 32 Match one character, not the given one, caselessly */
-
-  /* The following sets of 13 opcodes must always be kept in step because
-  the offset from the first one is used to generate the others. */
-
-  /* Repeated characters; caseful must precede the caseless ones */
-
-  OP_STAR,           /* 33 The maximizing and minimizing versions of */
-  OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */
-  OP_PLUS,           /* 35 the minimizing one second. */
-  OP_MINPLUS,        /* 36 */
-  OP_QUERY,          /* 37 */
-  OP_MINQUERY,       /* 38 */
-
-  OP_UPTO,           /* 39 From 0 to n matches of one character, caseful*/
-  OP_MINUPTO,        /* 40 */
-  OP_EXACT,          /* 41 Exactly n matches */
-
-  OP_POSSTAR,        /* 42 Possessified star, caseful */
-  OP_POSPLUS,        /* 43 Possessified plus, caseful */
-  OP_POSQUERY,       /* 44 Posesssified query, caseful */
-  OP_POSUPTO,        /* 45 Possessified upto, caseful */
-
-  /* Repeated characters; caseless must follow the caseful ones */
-
-  OP_STARI,          /* 46 */
-  OP_MINSTARI,       /* 47 */
-  OP_PLUSI,          /* 48 */
-  OP_MINPLUSI,       /* 49 */
-  OP_QUERYI,         /* 50 */
-  OP_MINQUERYI,      /* 51 */
-
-  OP_UPTOI,          /* 52 From 0 to n matches of one character, caseless */
-  OP_MINUPTOI,       /* 53 */
-  OP_EXACTI,         /* 54 */
-
-  OP_POSSTARI,       /* 55 Possessified star, caseless */
-  OP_POSPLUSI,       /* 56 Possessified plus, caseless */
-  OP_POSQUERYI,      /* 57 Posesssified query, caseless */
-  OP_POSUPTOI,       /* 58 Possessified upto, caseless */
-
-  /* The negated ones must follow the non-negated ones, and match them */
-  /* Negated repeated character, caseful; must precede the caseless ones */
-
-  OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */
-  OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */
-  OP_NOTPLUS,        /* 61 the minimizing one second. They must be in */
-  OP_NOTMINPLUS,     /* 62 exactly the same order as those above. */
-  OP_NOTQUERY,       /* 63 */
-  OP_NOTMINQUERY,    /* 64 */
-
-  OP_NOTUPTO,        /* 65 From 0 to n matches, caseful */
-  OP_NOTMINUPTO,     /* 66 */
-  OP_NOTEXACT,       /* 67 Exactly n matches */
-
-  OP_NOTPOSSTAR,     /* 68 Possessified versions, caseful */
-  OP_NOTPOSPLUS,     /* 69 */
-  OP_NOTPOSQUERY,    /* 70 */
-  OP_NOTPOSUPTO,     /* 71 */
-
-  /* Negated repeated character, caseless; must follow the caseful ones */
-
-  OP_NOTSTARI,       /* 72 */
-  OP_NOTMINSTARI,    /* 73 */
-  OP_NOTPLUSI,       /* 74 */
-  OP_NOTMINPLUSI,    /* 75 */
-  OP_NOTQUERYI,      /* 76 */
-  OP_NOTMINQUERYI,   /* 77 */
-
-  OP_NOTUPTOI,       /* 78 From 0 to n matches, caseless */
-  OP_NOTMINUPTOI,    /* 79 */
-  OP_NOTEXACTI,      /* 80 Exactly n matches */
-
-  OP_NOTPOSSTARI,    /* 81 Possessified versions, caseless */
-  OP_NOTPOSPLUSI,    /* 82 */
-  OP_NOTPOSQUERYI,   /* 83 */
-  OP_NOTPOSUPTOI,    /* 84 */
-
-  /* Character types */
-
-  OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
-  OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
-  OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */
-  OP_TYPEMINPLUS,    /* 88 be in exactly the same order as those above. */
-  OP_TYPEQUERY,      /* 89 */
-  OP_TYPEMINQUERY,   /* 90 */
-
-  OP_TYPEUPTO,       /* 91 From 0 to n matches */
-  OP_TYPEMINUPTO,    /* 92 */
-  OP_TYPEEXACT,      /* 93 Exactly n matches */
-
-  OP_TYPEPOSSTAR,    /* 94 Possessified versions */
-  OP_TYPEPOSPLUS,    /* 95 */
-  OP_TYPEPOSQUERY,   /* 96 */
-  OP_TYPEPOSUPTO,    /* 97 */
-
-  /* These are used for character classes and back references; only the
-  first six are the same as the sets above. */
-
-  OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */
-  OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */
-  OP_CRPLUS,         /* 100 the minimizing one second. These codes must */
-  OP_CRMINPLUS,      /* 101 be in exactly the same order as those above. */
-  OP_CRQUERY,        /* 102 */
-  OP_CRMINQUERY,     /* 103 */
-
-  OP_CRRANGE,        /* 104 These are different to the three sets above. */
-  OP_CRMINRANGE,     /* 105 */
-
-  OP_CRPOSSTAR,      /* 106 Possessified versions */
-  OP_CRPOSPLUS,      /* 107 */
-  OP_CRPOSQUERY,     /* 108 */
-  OP_CRPOSRANGE,     /* 109 */
-
-  /* End of quantifier opcodes */
-
-  OP_CLASS,          /* 110 Match a character class, chars < 256 only */
-  OP_NCLASS,         /* 111 Same, but the bitmap was created from a negative
-                              class - the difference is relevant only when a
-                              character > 255 is encountered. */
-  OP_XCLASS,         /* 112 Extended class for handling > 255 chars within the
-                              class. This does both positive and negative. */
-  OP_REF,            /* 113 Match a back reference, casefully */
-  OP_REFI,           /* 114 Match a back reference, caselessly */
-  OP_DNREF,          /* 115 Match a duplicate name backref, casefully */
-  OP_DNREFI,         /* 116 Match a duplicate name backref, caselessly */
-  OP_RECURSE,        /* 117 Match a numbered subpattern (possibly recursive) */
-  OP_CALLOUT,        /* 118 Call out to external function if provided */
-
-  OP_ALT,            /* 119 Start of alternation */
-  OP_KET,            /* 120 End of group that doesn't have an unbounded repeat */
-  OP_KETRMAX,        /* 121 These two must remain together and in this */
-  OP_KETRMIN,        /* 122 order. They are for groups the repeat for ever. */
-  OP_KETRPOS,        /* 123 Possessive unlimited repeat. */
-
-  /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four
-  asserts must remain in order. */
-
-  OP_REVERSE,        /* 124 Move pointer back - used in lookbehind assertions */
-  OP_ASSERT,         /* 125 Positive lookahead */
-  OP_ASSERT_NOT,     /* 126 Negative lookahead */
-  OP_ASSERTBACK,     /* 127 Positive lookbehind */
-  OP_ASSERTBACK_NOT, /* 128 Negative lookbehind */
-
-  /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately
-  after the assertions, with ONCE first, as there's a test for >= ONCE for a
-  subpattern that isn't an assertion. The POS versions must immediately follow
-  the non-POS versions in each case. */
-
-  OP_ONCE,           /* 129 Atomic group, contains captures */
-  OP_ONCE_NC,        /* 130 Atomic group containing no captures */
-  OP_BRA,            /* 131 Start of non-capturing bracket */
-  OP_BRAPOS,         /* 132 Ditto, with unlimited, possessive repeat */
-  OP_CBRA,           /* 133 Start of capturing bracket */
-  OP_CBRAPOS,        /* 134 Ditto, with unlimited, possessive repeat */
-  OP_COND,           /* 135 Conditional group */
-
-  /* These five must follow the previous five, in the same order. There's a
-  check for >= SBRA to distinguish the two sets. */
-
-  OP_SBRA,           /* 136 Start of non-capturing bracket, check empty  */
-  OP_SBRAPOS,        /* 137 Ditto, with unlimited, possessive repeat */
-  OP_SCBRA,          /* 138 Start of capturing bracket, check empty */
-  OP_SCBRAPOS,       /* 139 Ditto, with unlimited, possessive repeat */
-  OP_SCOND,          /* 140 Conditional group, check empty */
-
-  /* The next two pairs must (respectively) be kept together. */
-
-  OP_CREF,           /* 141 Used to hold a capture number as condition */
-  OP_DNCREF,         /* 142 Used to point to duplicate names as a condition */
-  OP_RREF,           /* 143 Used to hold a recursion number as condition */
-  OP_DNRREF,         /* 144 Used to point to duplicate names as a condition */
-  OP_DEF,            /* 145 The DEFINE condition */
-
-  OP_BRAZERO,        /* 146 These two must remain together and in this */
-  OP_BRAMINZERO,     /* 147 order. */
-  OP_BRAPOSZERO,     /* 148 */
-
-  /* These are backtracking control verbs */
-
-  OP_MARK,           /* 149 always has an argument */
-  OP_PRUNE,          /* 150 */
-  OP_PRUNE_ARG,      /* 151 same, but with argument */
-  OP_SKIP,           /* 152 */
-  OP_SKIP_ARG,       /* 153 same, but with argument */
-  OP_THEN,           /* 154 */
-  OP_THEN_ARG,       /* 155 same, but with argument */
-  OP_COMMIT,         /* 156 */
-
-  /* These are forced failure and success verbs */
-
-  OP_FAIL,           /* 157 */
-  OP_ACCEPT,         /* 158 */
-  OP_ASSERT_ACCEPT,  /* 159 Used inside assertions */
-  OP_CLOSE,          /* 160 Used before OP_ACCEPT to close open captures */
-
-  /* This is used to skip a subpattern with a {0} quantifier */
-
-  OP_SKIPZERO,       /* 161 */
-
-  /* This is not an opcode, but is used to check that tables indexed by opcode
-  are the correct length, in order to catch updating errors - there have been
-  some in the past. */
-
-  OP_TABLE_LENGTH
-};
-
-/* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
-definitions that follow must also be updated to match. There are also tables
-called "opcode_possessify" in pcre_compile.c and "coptable" and "poptable" in
-pcre_dfa_exec.c that must be updated. */
-
-
-/* This macro defines textual names for all the opcodes. These are used only
-for debugging, and some of them are only partial names. The macro is referenced
-only in pcre_printint.c, which fills out the full names in many cases (and in
-some cases doesn't actually use these names at all). */
-
-#define OP_NAME_LIST \
-  "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
-  "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
-  "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
-  "extuni",  "\\Z", "\\z",                                        \
-  "$", "$", "^", "^", "char", "chari", "not", "noti",             \
-  "*", "*?", "+", "+?", "?", "??",                                \
-  "{", "{", "{",                                                  \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??",                                \
-  "{", "{", "{",                                                  \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??",                                \
-  "{", "{", "{",                                                  \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??",                                \
-  "{", "{", "{",                                                  \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
-  "*+","++", "?+", "{",                                           \
-  "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
-  "*+","++", "?+", "{",                                           \
-  "class", "nclass", "xclass", "Ref", "Refi", "DnRef", "DnRefi",  \
-  "Recurse", "Callout",                                           \
-  "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
-  "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \
-  "Once", "Once_NC",                                              \
-  "Bra", "BraPos", "CBra", "CBraPos",                             \
-  "Cond",                                                         \
-  "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
-  "SCond",                                                        \
-  "Cond ref", "Cond dnref", "Cond rec", "Cond dnrec", "Cond def", \
-  "Brazero", "Braminzero", "Braposzero",                          \
-  "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
-  "*THEN", "*THEN", "*COMMIT", "*FAIL",                           \
-  "*ACCEPT", "*ASSERT_ACCEPT",                                    \
-  "Close", "Skip zero"
-
-
-/* This macro defines the length of fixed length operations in the compiled
-regex. The lengths are used when searching for specific things, and also in the
-debugging printing of a compiled regex. We use a macro so that it can be
-defined close to the definitions of the opcodes themselves.
-
-As things have been extended, some of these are no longer fixed lenths, but are
-minima instead. For example, the length of a single-character repeat may vary
-in UTF-8 mode. The code that uses this table must know about such things. */
-
-#define OP_LENGTHS \
-  1,                             /* End                                    */ \
-  1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
-  1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
-  1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \
-  3, 3,                          /* \P, \p                                 */ \
-  1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
-  1,                             /* \X                                     */ \
-  1, 1, 1, 1, 1, 1,              /* \Z, \z, $, $M ^, ^M                    */ \
-  2,                             /* Char  - the minimum length             */ \
-  2,                             /* Chari  - the minimum length            */ \
-  2,                             /* not                                    */ \
-  2,                             /* noti                                   */ \
-  /* Positive single-char repeats                             ** These are */ \
-  2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto, minupto             ** mode      */ \
-  2+IMM2_SIZE,                   /* exact                                  */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* *+, ++, ?+, upto+                      */ \
-  2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto I, minupto I                      */ \
-  2+IMM2_SIZE,                   /* exact I                                */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* *+I, ++I, ?+I, upto+I                  */ \
-  /* Negative single-char repeats - only for chars < 256                   */ \
-  2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto, minupto                      */ \
-  2+IMM2_SIZE,                   /* NOT exact                              */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *, +, ?, upto           */ \
-  2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto I, minupto I                  */ \
-  2+IMM2_SIZE,                   /* NOT exact I                            */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *I, +I, ?I, upto I      */ \
-  /* Positive type repeats                                                 */ \
-  2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
-  2+IMM2_SIZE, 2+IMM2_SIZE,      /* Type upto, minupto                     */ \
-  2+IMM2_SIZE,                   /* Type exact                             */ \
-  2, 2, 2, 2+IMM2_SIZE,          /* Possessive *+, ++, ?+, upto+           */ \
-  /* Character class & ref repeats                                         */ \
-  1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
-  1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \
-  1, 1, 1, 1+2*IMM2_SIZE,        /* Possessive *+, ++, ?+, CRPOSRANGE      */ \
-  1+(32/sizeof(pcre_uchar)),     /* CLASS                                  */ \
-  1+(32/sizeof(pcre_uchar)),     /* NCLASS                                 */ \
-  0,                             /* XCLASS - variable length               */ \
-  1+IMM2_SIZE,                   /* REF                                    */ \
-  1+IMM2_SIZE,                   /* REFI                                   */ \
-  1+2*IMM2_SIZE,                 /* DNREF                                  */ \
-  1+2*IMM2_SIZE,                 /* DNREFI                                 */ \
-  1+LINK_SIZE,                   /* RECURSE                                */ \
-  2+2*LINK_SIZE,                 /* CALLOUT                                */ \
-  1+LINK_SIZE,                   /* Alt                                    */ \
-  1+LINK_SIZE,                   /* Ket                                    */ \
-  1+LINK_SIZE,                   /* KetRmax                                */ \
-  1+LINK_SIZE,                   /* KetRmin                                */ \
-  1+LINK_SIZE,                   /* KetRpos                                */ \
-  1+LINK_SIZE,                   /* Reverse                                */ \
-  1+LINK_SIZE,                   /* Assert                                 */ \
-  1+LINK_SIZE,                   /* Assert not                             */ \
-  1+LINK_SIZE,                   /* Assert behind                          */ \
-  1+LINK_SIZE,                   /* Assert behind not                      */ \
-  1+LINK_SIZE,                   /* ONCE                                   */ \
-  1+LINK_SIZE,                   /* ONCE_NC                                */ \
-  1+LINK_SIZE,                   /* BRA                                    */ \
-  1+LINK_SIZE,                   /* BRAPOS                                 */ \
-  1+LINK_SIZE+IMM2_SIZE,         /* CBRA                                   */ \
-  1+LINK_SIZE+IMM2_SIZE,         /* CBRAPOS                                */ \
-  1+LINK_SIZE,                   /* COND                                   */ \
-  1+LINK_SIZE,                   /* SBRA                                   */ \
-  1+LINK_SIZE,                   /* SBRAPOS                                */ \
-  1+LINK_SIZE+IMM2_SIZE,         /* SCBRA                                  */ \
-  1+LINK_SIZE+IMM2_SIZE,         /* SCBRAPOS                               */ \
-  1+LINK_SIZE,                   /* SCOND                                  */ \
-  1+IMM2_SIZE, 1+2*IMM2_SIZE,    /* CREF, DNCREF                           */ \
-  1+IMM2_SIZE, 1+2*IMM2_SIZE,    /* RREF, DNRREF                           */ \
-  1,                             /* DEF                                    */ \
-  1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
-  3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
-  1, 3,                          /* SKIP, SKIP_ARG                         */ \
-  1, 3,                          /* THEN, THEN_ARG                         */ \
-  1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \
-  1+IMM2_SIZE, 1                 /* CLOSE, SKIPZERO                        */
-
-/* A magic value for OP_RREF to indicate the "any recursion" condition. */
-
-#define RREF_ANY  0xffff
-
-/* Compile time error code numbers. They are given names so that they can more
-easily be tracked. When a new number is added, the table called eint in
-pcreposix.c must be updated. */
-
-enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,
-       ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,
-       ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,
-       ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
-       ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
-       ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
-       ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
-       ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79,
-       ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERRCOUNT };
-
-/* JIT compiling modes. The function list is indexed by them. */
-
-enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,
-       JIT_NUMBER_OF_COMPILE_MODES };
-
-/* The real format of the start of the pcre block; the index of names and the
-code vector run on as long as necessary after the end. We store an explicit
-offset to the name table so that if a regex is compiled on one host, saved, and
-then run on another where the size of pointers is different, all might still
-be well.
-
-The size of the structure must be a multiple of 8 bytes. For the case of
-compiled-on-4 and run-on-8, we include an extra pointer that is always NULL so
-that there are an even number of pointers which therefore are a multiple of 8
-bytes.
-
-It is necessary to fork the struct for the 32 bit library, since it needs to
-use pcre_uint32 for first_char and req_char. We can't put an ifdef inside the
-typedef because pcretest needs access to the struct of the 8-, 16- and 32-bit
-variants.
-
-*** WARNING ***
-When new fields are added to these structures, remember to adjust the code in
-pcre_byte_order.c that is concerned with swapping the byte order of the fields
-when a compiled regex is reloaded on a host with different endianness.
-*** WARNING ***
-There is also similar byte-flipping code in pcretest.c, which is used for
-testing the byte-flipping features. It must also be kept in step.
-*** WARNING ***
-*/
-
-typedef struct real_pcre8_or_16 {
-  pcre_uint32 magic_number;
-  pcre_uint32 size;               /* Total that was malloced */
-  pcre_uint32 options;            /* Public options */
-  pcre_uint32 flags;              /* Private flags */
-  pcre_uint32 limit_match;        /* Limit set from regex */
-  pcre_uint32 limit_recursion;    /* Limit set from regex */
-  pcre_uint16 first_char;         /* Starting character */
-  pcre_uint16 req_char;           /* This character must be seen */
-  pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
-  pcre_uint16 top_bracket;        /* Highest numbered group */
-  pcre_uint16 top_backref;        /* Highest numbered back reference */
-  pcre_uint16 name_table_offset;  /* Offset to name table that follows */
-  pcre_uint16 name_entry_size;    /* Size of any name items */
-  pcre_uint16 name_count;         /* Number of name items */
-  pcre_uint16 ref_count;          /* Reference count */
-  pcre_uint16 dummy1;             /* To ensure size is a multiple of 8 */
-  pcre_uint16 dummy2;             /* To ensure size is a multiple of 8 */
-  pcre_uint16 dummy3;             /* To ensure size is a multiple of 8 */
-  const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
-  void             *nullpad;      /* NULL padding */
-} real_pcre8_or_16;
-
-typedef struct real_pcre8_or_16 real_pcre;
-typedef struct real_pcre8_or_16 real_pcre16;
-
-typedef struct real_pcre32 {
-  pcre_uint32 magic_number;
-  pcre_uint32 size;               /* Total that was malloced */
-  pcre_uint32 options;            /* Public options */
-  pcre_uint32 flags;              /* Private flags */
-  pcre_uint32 limit_match;        /* Limit set from regex */
-  pcre_uint32 limit_recursion;    /* Limit set from regex */
-  pcre_uint32 first_char;         /* Starting character */
-  pcre_uint32 req_char;           /* This character must be seen */
-  pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
-  pcre_uint16 top_bracket;        /* Highest numbered group */
-  pcre_uint16 top_backref;        /* Highest numbered back reference */
-  pcre_uint16 name_table_offset;  /* Offset to name table that follows */
-  pcre_uint16 name_entry_size;    /* Size of any name items */
-  pcre_uint16 name_count;         /* Number of name items */
-  pcre_uint16 ref_count;          /* Reference count */
-  pcre_uint16 dummy;              /* To ensure size is a multiple of 8 */
-  const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
-  void             *nullpad;      /* NULL padding */
-} real_pcre32;
-
-#if defined COMPILE_PCRE8
-#define REAL_PCRE real_pcre
-#elif defined COMPILE_PCRE16
-#define REAL_PCRE real_pcre16
-#elif defined COMPILE_PCRE32
-#define REAL_PCRE real_pcre32
-#endif
-
-/* Assert that the size of REAL_PCRE is divisible by 8 */
-typedef int __assert_real_pcre_size_divisible_8[(sizeof(REAL_PCRE) % 8) == 0 ? 1 : -1];
-
-/* Needed in pcretest to access some fields in the real_pcre* structures
- * directly. They're unified for 8/16/32 bits since the structs only differ
- * after these fields; if that ever changes, need to fork those defines into
- * 8/16 and 32 bit versions. */
-#define REAL_PCRE_MAGIC(re)     (((REAL_PCRE*)re)->magic_number)
-#define REAL_PCRE_SIZE(re)      (((REAL_PCRE*)re)->size)
-#define REAL_PCRE_OPTIONS(re)   (((REAL_PCRE*)re)->options)
-#define REAL_PCRE_FLAGS(re)     (((REAL_PCRE*)re)->flags)
-
-/* The format of the block used to store data from pcre_study(). The same
-remark (see NOTE above) about extending this structure applies. */
-
-typedef struct pcre_study_data {
-  pcre_uint32 size;               /* Total that was malloced */
-  pcre_uint32 flags;              /* Private flags */
-  pcre_uint8 start_bits[32];      /* Starting char bits */
-  pcre_uint32 minlength;          /* Minimum subject length */
-} pcre_study_data;
-
-/* Structure for building a chain of open capturing subpatterns during
-compiling, so that instructions to close them can be compiled when (*ACCEPT) is
-encountered. This is also used to identify subpatterns that contain recursive
-back references to themselves, so that they can be made atomic. */
-
-typedef struct open_capitem {
-  struct open_capitem *next;    /* Chain link */
-  pcre_uint16 number;           /* Capture number */
-  pcre_uint16 flag;             /* Set TRUE if recursive back ref */
-} open_capitem;
-
-/* Structure for building a list of named groups during the first pass of
-compiling. */
-
-typedef struct named_group {
-  const pcre_uchar  *name;          /* Points to the name in the pattern */
-  int                length;        /* Length of the name */
-  pcre_uint32        number;        /* Group number */
-} named_group;
-
-/* Structure for passing "static" information around between the functions
-doing the compiling, so that they are thread-safe. */
-
-typedef struct compile_data {
-  const pcre_uint8 *lcc;            /* Points to lower casing table */
-  const pcre_uint8 *fcc;            /* Points to case-flipping table */
-  const pcre_uint8 *cbits;          /* Points to character type table */
-  const pcre_uint8 *ctypes;         /* Points to table of type maps */
-  const pcre_uchar *start_workspace;/* The start of working space */
-  const pcre_uchar *start_code;     /* The start of the compiled code */
-  const pcre_uchar *start_pattern;  /* The start of the pattern */
-  const pcre_uchar *end_pattern;    /* The end of the pattern */
-  pcre_uchar *hwm;                  /* High watermark of workspace */
-  open_capitem *open_caps;          /* Chain of open capture items */
-  named_group *named_groups;        /* Points to vector in pre-compile */
-  pcre_uchar *name_table;           /* The name/number table */
-  int  names_found;                 /* Number of entries so far */
-  int  name_entry_size;             /* Size of each entry */
-  int  named_group_list_size;       /* Number of entries in the list */
-  int  workspace_size;              /* Size of workspace */
-  unsigned int bracount;            /* Count of capturing parens as we compile */
-  int  final_bracount;              /* Saved value after first pass */
-  int  max_lookbehind;              /* Maximum lookbehind (characters) */
-  int  top_backref;                 /* Maximum back reference */
-  unsigned int backref_map;         /* Bitmap of low back refs */
-  unsigned int namedrefcount;       /* Number of backreferences by name */
-  int  parens_depth;                /* Depth of nested parentheses */
-  int  assert_depth;                /* Depth of nested assertions */
-  pcre_uint32 external_options;     /* External (initial) options */
-  pcre_uint32 external_flags;       /* External flag bits to be set */
-  int  req_varyopt;                 /* "After variable item" flag for reqbyte */
-  BOOL had_accept;                  /* (*ACCEPT) encountered */
-  BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */
-  BOOL check_lookbehind;            /* Lookbehinds need later checking */
-  BOOL dupnames;                    /* Duplicate names exist */
-  BOOL dupgroups;                   /* Duplicate groups exist: (?| found */
-  BOOL iscondassert;                /* Next assert is a condition */
-  int  nltype;                      /* Newline type */
-  int  nllen;                       /* Newline string length */
-  pcre_uchar nl[4];                 /* Newline string when fixed length */
-} compile_data;
-
-/* Structure for maintaining a chain of pointers to the currently incomplete
-branches, for testing for left recursion while compiling. */
-
-typedef struct branch_chain {
-  struct branch_chain *outer;
-  pcre_uchar *current_branch;
-} branch_chain;
-
-/* Structure for mutual recursion detection. */
-
-typedef struct recurse_check {
-  struct recurse_check *prev;
-  const pcre_uchar *group;
-} recurse_check;
-
-/* Structure for items in a linked list that represents an explicit recursive
-call within the pattern; used by pcre_exec(). */
-
-typedef struct recursion_info {
-  struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
-  unsigned int group_num;         /* Number of group that was called */
-  int *offset_save;               /* Pointer to start of saved offsets */
-  int saved_max;                  /* Number of saved offsets */
-  int saved_capture_last;         /* Last capture number */
-  PCRE_PUCHAR subject_position;   /* Position at start of recursion */
-} recursion_info;
-
-/* A similar structure for pcre_dfa_exec(). */
-
-typedef struct dfa_recursion_info {
-  struct dfa_recursion_info *prevrec;
-  int group_num;
-  PCRE_PUCHAR subject_position;
-} dfa_recursion_info;
-
-/* Structure for building a chain of data for holding the values of the subject
-pointer at the start of each subpattern, so as to detect when an empty string
-has been matched by a subpattern - to break infinite loops; used by
-pcre_exec(). */
-
-typedef struct eptrblock {
-  struct eptrblock *epb_prev;
-  PCRE_PUCHAR epb_saved_eptr;
-} eptrblock;
-
-
-/* Structure for passing "static" information around between the functions
-doing traditional NFA matching, so that they are thread-safe. */
-
-typedef struct match_data {
-  unsigned long int match_call_count;      /* As it says */
-  unsigned long int match_limit;           /* As it says */
-  unsigned long int match_limit_recursion; /* As it says */
-  int   *offset_vector;           /* Offset vector */
-  int    offset_end;              /* One past the end */
-  int    offset_max;              /* The maximum usable for return data */
-  int    nltype;                  /* Newline type */
-  int    nllen;                   /* Newline string length */
-  int    name_count;              /* Number of names in name table */
-  int    name_entry_size;         /* Size of entry in names table */
-  unsigned int skip_arg_count;    /* For counting SKIP_ARGs */
-  unsigned int ignore_skip_arg;   /* For re-run when SKIP arg name not found */
-  pcre_uchar *name_table;         /* Table of names */
-  pcre_uchar nl[4];               /* Newline string when fixed */
-  const  pcre_uint8 *lcc;         /* Points to lower casing table */
-  const  pcre_uint8 *fcc;         /* Points to case-flipping table */
-  const  pcre_uint8 *ctypes;      /* Points to table of type maps */
-  BOOL   notbol;                  /* NOTBOL flag */
-  BOOL   noteol;                  /* NOTEOL flag */
-  BOOL   utf;                     /* UTF-8 / UTF-16 flag */
-  BOOL   jscript_compat;          /* JAVASCRIPT_COMPAT flag */
-  BOOL   use_ucp;                 /* PCRE_UCP flag */
-  BOOL   endonly;                 /* Dollar not before final \n */
-  BOOL   notempty;                /* Empty string match not wanted */
-  BOOL   notempty_atstart;        /* Empty string match at start not wanted */
-  BOOL   hitend;                  /* Hit the end of the subject at some point */
-  BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */
-  BOOL   hasthen;                 /* Pattern contains (*THEN) */
-  const  pcre_uchar *start_code;  /* For use when recursing */
-  PCRE_PUCHAR start_subject;      /* Start of the subject string */
-  PCRE_PUCHAR end_subject;        /* End of the subject string */
-  PCRE_PUCHAR start_match_ptr;    /* Start of matched string */
-  PCRE_PUCHAR end_match_ptr;      /* Subject position at end match */
-  PCRE_PUCHAR start_used_ptr;     /* Earliest consulted character */
-  int    partial;                 /* PARTIAL options */
-  int    end_offset_top;          /* Highwater mark at end of match */
-  pcre_int32 capture_last;        /* Most recent capture number + overflow flag */
-  int    start_offset;            /* The start offset value */
-  int    match_function_type;     /* Set for certain special calls of MATCH() */
-  eptrblock *eptrchain;           /* Chain of eptrblocks for tail recursions */
-  int    eptrn;                   /* Next free eptrblock */
-  recursion_info *recursive;      /* Linked list of recursion data */
-  void  *callout_data;            /* To pass back to callouts */
-  const  pcre_uchar *mark;        /* Mark pointer to pass back on success */
-  const  pcre_uchar *nomatch_mark;/* Mark pointer to pass back on failure */
-  const  pcre_uchar *once_target; /* Where to back up to for atomic groups */
-#ifdef NO_RECURSE
-  void  *match_frames_base;       /* For remembering malloc'd frames */
-#endif
-} match_data;
-
-/* A similar structure is used for the same purpose by the DFA matching
-functions. */
-
-typedef struct dfa_match_data {
-  const pcre_uchar *start_code;     /* Start of the compiled pattern */
-  const pcre_uchar *start_subject ; /* Start of the subject string */
-  const pcre_uchar *end_subject;    /* End of subject string */
-  const pcre_uchar *start_used_ptr; /* Earliest consulted character */
-  const pcre_uint8 *tables;         /* Character tables */
-  int   start_offset;               /* The start offset value */
-  int   moptions;                   /* Match options */
-  int   poptions;                   /* Pattern options */
-  int   nltype;                     /* Newline type */
-  int   nllen;                      /* Newline string length */
-  pcre_uchar nl[4];                 /* Newline string when fixed */
-  void *callout_data;               /* To pass back to callouts */
-  dfa_recursion_info *recursive;    /* Linked list of recursion data */
-} dfa_match_data;
-
-/* Bit definitions for entries in the pcre_ctypes table. */
-
-#define ctype_space   0x01
-#define ctype_letter  0x02
-#define ctype_digit   0x04
-#define ctype_xdigit  0x08
-#define ctype_word    0x10   /* alphanumeric or '_' */
-#define ctype_meta    0x80   /* regexp meta char or zero (end pattern) */
-
-/* Offsets for the bitmap tables in pcre_cbits. Each table contains a set
-of bits for a class map. Some classes are built by combining these tables. */
-
-#define cbit_space     0      /* [:space:] or \s */
-#define cbit_xdigit   32      /* [:xdigit:] */
-#define cbit_digit    64      /* [:digit:] or \d */
-#define cbit_upper    96      /* [:upper:] */
-#define cbit_lower   128      /* [:lower:] */
-#define cbit_word    160      /* [:word:] or \w */
-#define cbit_graph   192      /* [:graph:] */
-#define cbit_print   224      /* [:print:] */
-#define cbit_punct   256      /* [:punct:] */
-#define cbit_cntrl   288      /* [:cntrl:] */
-#define cbit_length  320      /* Length of the cbits table */
-
-/* Offsets of the various tables from the base tables pointer, and
-total length. */
-
-#define lcc_offset      0
-#define fcc_offset    256
-#define cbits_offset  512
-#define ctypes_offset (cbits_offset + cbit_length)
-#define tables_length (ctypes_offset + 256)
-
-/* Internal function and data prefixes. */
-
-#if defined COMPILE_PCRE8
-#ifndef PUBL
-#define PUBL(name) pcre_##name
-#endif
-#ifndef PRIV
-#define PRIV(name) _pcre_##name
-#endif
-#elif defined COMPILE_PCRE16
-#ifndef PUBL
-#define PUBL(name) pcre16_##name
-#endif
-#ifndef PRIV
-#define PRIV(name) _pcre16_##name
-#endif
-#elif defined COMPILE_PCRE32
-#ifndef PUBL
-#define PUBL(name) pcre32_##name
-#endif
-#ifndef PRIV
-#define PRIV(name) _pcre32_##name
-#endif
-#else
-#error Unsupported compiling mode
-#endif /* COMPILE_PCRE[8|16|32] */
-
-/* Layout of the UCP type table that translates property names into types and
-codes. Each entry used to point directly to a name, but to reduce the number of
-relocations in shared libraries, it now has an offset into a single string
-instead. */
-
-typedef struct {
-  pcre_uint16 name_offset;
-  pcre_uint16 type;
-  pcre_uint16 value;
-} ucp_type_table;
-
-/* renamed to avoid clashes with system pcre */
-#define _pcre_utf8_table1      _poco_pcre_utf8_table1
-#define _pcre_utf8_table1_size _poco_pcre_utf8_table1_size
-#define _pcre_utf8_table2      _poco_pcre_utf8_table2
-#define _pcre_utf8_table3      _poco_pcre_utf8_table3
-#define _pcre_utf8_table4      _poco_pcre_utf8_table4
-#define _pcre_utt              _poco_pcre_utt
-#define _pcre_utt_size         _poco_pcre_utt_size
-#define _pcre_utt_names        _poco_pcre_utt_names
-#define _pcre_OP_lengths       _poco_pcre_OP_lengths
-#define _pcre_ucp_gbtable      _poco_pcre_ucp_gbtable
-#define _pcre_vspace_list      _poco_pcre_vspace_list
-#define _pcre_hspace_list      _poco_pcre_hspace_list
-
-/* Internal shared data tables. These are tables that are used by more than one
-of the exported public functions. They have to be "external" in the C sense,
-but are not part of the PCRE public API. The data for these tables is in the
-pcre_tables.c module. */
-
-#ifdef COMPILE_PCRE8
-extern const int            PRIV(utf8_table1)[];
-extern const int            PRIV(utf8_table1_size);
-extern const int            PRIV(utf8_table2)[];
-extern const int            PRIV(utf8_table3)[];
-extern const pcre_uint8     PRIV(utf8_table4)[];
-#endif /* COMPILE_PCRE8 */
-
-extern const char           PRIV(utt_names)[];
-extern const ucp_type_table PRIV(utt)[];
-extern const int            PRIV(utt_size);
-
-extern const pcre_uint8     PRIV(OP_lengths)[];
-extern const pcre_uint8     PRIV(default_tables)[];
-
-extern const pcre_uint32    PRIV(hspace_list)[];
-extern const pcre_uint32    PRIV(vspace_list)[];
-
-
-/* Internal shared functions. These are functions that are used by more than
-one of the exported public functions. They have to be "external" in the C
-sense, but are not part of the PCRE public API. */
-
-/* String comparison functions. */
-#if defined COMPILE_PCRE8
-
-#define STRCMP_UC_UC(str1, str2) \
-  strcmp((char *)(str1), (char *)(str2))
-#define STRCMP_UC_C8(str1, str2) \
-  strcmp((char *)(str1), (str2))
-#define STRNCMP_UC_UC(str1, str2, num) \
-  strncmp((char *)(str1), (char *)(str2), (num))
-#define STRNCMP_UC_C8(str1, str2, num) \
-  strncmp((char *)(str1), (str2), (num))
-#define STRLEN_UC(str) strlen((const char *)str)
-
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-
-extern int               PRIV(strcmp_uc_uc)(const pcre_uchar *,
-                           const pcre_uchar *);
-extern int               PRIV(strcmp_uc_c8)(const pcre_uchar *,
-                           const char *);
-extern int               PRIV(strncmp_uc_uc)(const pcre_uchar *,
-                           const pcre_uchar *, unsigned int num);
-extern int               PRIV(strncmp_uc_c8)(const pcre_uchar *,
-                           const char *, unsigned int num);
-extern unsigned int      PRIV(strlen_uc)(const pcre_uchar *str);
-
-#define STRCMP_UC_UC(str1, str2) \
-  PRIV(strcmp_uc_uc)((str1), (str2))
-#define STRCMP_UC_C8(str1, str2) \
-  PRIV(strcmp_uc_c8)((str1), (str2))
-#define STRNCMP_UC_UC(str1, str2, num) \
-  PRIV(strncmp_uc_uc)((str1), (str2), (num))
-#define STRNCMP_UC_C8(str1, str2, num) \
-  PRIV(strncmp_uc_c8)((str1), (str2), (num))
-#define STRLEN_UC(str) PRIV(strlen_uc)(str)
-
-#endif /* COMPILE_PCRE[8|16|32] */
-
-#if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
-
-#define STRCMP_UC_UC_TEST(str1, str2) STRCMP_UC_UC(str1, str2)
-#define STRCMP_UC_C8_TEST(str1, str2) STRCMP_UC_C8(str1, str2)
-
-#elif defined COMPILE_PCRE32
-
-extern int               PRIV(strcmp_uc_uc_utf)(const pcre_uchar *,
-                           const pcre_uchar *);
-extern int               PRIV(strcmp_uc_c8_utf)(const pcre_uchar *,
-                           const char *);
-
-#define STRCMP_UC_UC_TEST(str1, str2) \
-  (utf ? PRIV(strcmp_uc_uc_utf)((str1), (str2)) : PRIV(strcmp_uc_uc)((str1), (str2)))
-#define STRCMP_UC_C8_TEST(str1, str2) \
-  (utf ? PRIV(strcmp_uc_c8_utf)((str1), (str2)) : PRIV(strcmp_uc_c8)((str1), (str2)))
-
-#endif /* COMPILE_PCRE[8|16|32] */
-
-extern const pcre_uchar *PRIV(find_bracket)(const pcre_uchar *, BOOL, int);
-extern BOOL              PRIV(is_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
-                           int *, BOOL);
-extern unsigned int      PRIV(ord2utf)(pcre_uint32, pcre_uchar *);
-extern int               PRIV(valid_utf)(PCRE_PUCHAR, int, int *);
-extern BOOL              PRIV(was_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
-                           int *, BOOL);
-extern BOOL              PRIV(xclass)(pcre_uint32, const pcre_uchar *, BOOL);
-
-#ifdef SUPPORT_JIT
-extern void              PRIV(jit_compile)(const REAL_PCRE *,
-                           PUBL(extra) *, int);
-extern int               PRIV(jit_exec)(const PUBL(extra) *,
-                           const pcre_uchar *, int, int, int, int *, int);
-extern void              PRIV(jit_free)(void *);
-extern int               PRIV(jit_get_size)(void *);
-extern const char*       PRIV(jit_get_target)(void);
-#endif
-
-/* Unicode character database (UCD) */
-
-typedef struct {
-  pcre_uint8 script;     /* ucp_Arabic, etc. */
-  pcre_uint8 chartype;   /* ucp_Cc, etc. (general categories) */
-  pcre_uint8 gbprop;     /* ucp_gbControl, etc. (grapheme break property) */
-  pcre_uint8 caseset;    /* offset to multichar other cases or zero */
-  pcre_int32 other_case; /* offset to other case, or zero if none */
-} ucd_record;
-
-/* renamed to avoid clashes with system pcre */
-#define _pcre_ucd_records _poco_pcre_ucd_records
-#define _pcre_ucd_stage1 _poco_pcre_ucd_stage1
-#define _pcre_ucd_stage2 _poco_pcre_ucd_stage2
-#define _pcre_ucp_gentype _poco_pcre_ucp_gentype
-#define _pcre_ucd_caseless_sets _poco_pcre_ucd_caseless_sets
-
-extern const pcre_uint32 PRIV(ucd_caseless_sets)[];
-extern const ucd_record  PRIV(ucd_records)[];
-extern const pcre_uint8  PRIV(ucd_stage1)[];
-extern const pcre_uint16 PRIV(ucd_stage2)[];
-extern const pcre_uint32 PRIV(ucp_gentype)[];
-extern const pcre_uint32 PRIV(ucp_gbtable)[];
-#ifdef COMPILE_PCRE32
-extern const ucd_record  PRIV(dummy_ucd_record)[];
-#endif
-#ifdef SUPPORT_JIT
-extern const int         PRIV(ucp_typerange)[];
-#endif
-
-#ifdef SUPPORT_UCP
-/* UCD access macros */
-
-#define UCD_BLOCK_SIZE 128
-#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \
-        PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
-        UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
-
-#ifdef COMPILE_PCRE32
-#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch))
-#else
-#define GET_UCD(ch) REAL_GET_UCD(ch)
-#endif
-
-#define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
-#define UCD_SCRIPT(ch)      GET_UCD(ch)->script
-#define UCD_CATEGORY(ch)    PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
-#define UCD_GRAPHBREAK(ch)  GET_UCD(ch)->gbprop
-#define UCD_CASESET(ch)     GET_UCD(ch)->caseset
-#define UCD_OTHERCASE(ch)   ((pcre_uint32)((int)ch + (int)(GET_UCD(ch)->other_case)))
-
-#endif /* SUPPORT_UCP */
-
-#endif
-
-/* End of pcre_internal.h */
diff --git a/Foundation/src/pcre_refcount.c b/Foundation/src/pcre_refcount.c
deleted file mode 100644
index e22afe6aa..000000000
--- a/Foundation/src/pcre_refcount.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-#pragma warning( disable : 4244)  // conversion from 'int' to 'unsigned short', possible loss of data
-
-/* This module contains the external function pcre_refcount(), which is an
-auxiliary function that can be used to maintain a reference count in a compiled
-pattern data block. This might be helpful in applications where the block is
-shared by different users. */
-
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-
-/*************************************************
-*           Maintain reference count             *
-*************************************************/
-
-/* The reference count is a 16-bit field, initialized to zero. It is not
-possible to transfer a non-zero count from one host to a different host that
-has a different byte order - though I can't see why anyone in their right mind
-would ever want to do that!
-
-Arguments:
-  argument_re   points to compiled code
-  adjust        value to add to the count
-
-Returns:        the (possibly updated) count value (a non-negative number), or
-                a negative error number
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_refcount(pcre *argument_re, int adjust)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_refcount(pcre16 *argument_re, int adjust)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_refcount(pcre32 *argument_re, int adjust)
-#endif
-{
-REAL_PCRE *re = (REAL_PCRE *)argument_re;
-if (re == NULL) return PCRE_ERROR_NULL;
-if (re->magic_number != MAGIC_NUMBER) return PCRE_ERROR_BADMAGIC;
-if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
-re->ref_count = (-adjust > re->ref_count)? 0 :
-                (adjust + re->ref_count > 65535)? 65535 :
-                re->ref_count + adjust;
-return re->ref_count;
-}
-
-/* End of pcre_refcount.c */
diff --git a/Foundation/src/pcre_string_utils.c b/Foundation/src/pcre_string_utils.c
deleted file mode 100644
index 089aa6222..000000000
--- a/Foundation/src/pcre_string_utils.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2014 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains internal functions for comparing and finding the length
-of strings for different data item sizes. */
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-#ifndef COMPILE_PCRE8
-
-/*************************************************
-*           Compare string utilities             *
-*************************************************/
-
-/* The following two functions compares two strings. Basically a strcmp
-for non 8 bit characters.
-
-Arguments:
-  str1        first string
-  str2        second string
-
-Returns:      0 if both string are equal (like strcmp), 1 otherwise
-*/
-
-int
-PRIV(strcmp_uc_uc)(const pcre_uchar *str1, const pcre_uchar *str2)
-{
-pcre_uchar c1;
-pcre_uchar c2;
-
-while (*str1 != '\0' || *str2 != '\0')
-  {
-  c1 = *str1++;
-  c2 = *str2++;
-  if (c1 != c2)
-    return ((c1 > c2) << 1) - 1;
-  }
-/* Both length and characters must be equal. */
-return 0;
-}
-
-#ifdef COMPILE_PCRE32
-
-int
-PRIV(strcmp_uc_uc_utf)(const pcre_uchar *str1, const pcre_uchar *str2)
-{
-pcre_uchar c1;
-pcre_uchar c2;
-
-while (*str1 != '\0' || *str2 != '\0')
-  {
-  c1 = UCHAR21INC(str1);
-  c2 = UCHAR21INC(str2);
-  if (c1 != c2)
-    return ((c1 > c2) << 1) - 1;
-  }
-/* Both length and characters must be equal. */
-return 0;
-}
-
-#endif /* COMPILE_PCRE32 */
-
-int
-PRIV(strcmp_uc_c8)(const pcre_uchar *str1, const char *str2)
-{
-const pcre_uint8 *ustr2 = (pcre_uint8 *)str2;
-pcre_uchar c1;
-pcre_uchar c2;
-
-while (*str1 != '\0' || *ustr2 != '\0')
-  {
-  c1 = *str1++;
-  c2 = (pcre_uchar)*ustr2++;
-  if (c1 != c2)
-    return ((c1 > c2) << 1) - 1;
-  }
-/* Both length and characters must be equal. */
-return 0;
-}
-
-#ifdef COMPILE_PCRE32
-
-int
-PRIV(strcmp_uc_c8_utf)(const pcre_uchar *str1, const char *str2)
-{
-const pcre_uint8 *ustr2 = (pcre_uint8 *)str2;
-pcre_uchar c1;
-pcre_uchar c2;
-
-while (*str1 != '\0' || *ustr2 != '\0')
-  {
-  c1 = UCHAR21INC(str1);
-  c2 = (pcre_uchar)*ustr2++;
-  if (c1 != c2)
-    return ((c1 > c2) << 1) - 1;
-  }
-/* Both length and characters must be equal. */
-return 0;
-}
-
-#endif /* COMPILE_PCRE32 */
-
-/* The following two functions compares two, fixed length
-strings. Basically an strncmp for non 8 bit characters.
-
-Arguments:
-  str1        first string
-  str2        second string
-  num         size of the string
-
-Returns:      0 if both string are equal (like strcmp), 1 otherwise
-*/
-
-int
-PRIV(strncmp_uc_uc)(const pcre_uchar *str1, const pcre_uchar *str2, unsigned int num)
-{
-pcre_uchar c1;
-pcre_uchar c2;
-
-while (num-- > 0)
-  {
-  c1 = *str1++;
-  c2 = *str2++;
-  if (c1 != c2)
-    return ((c1 > c2) << 1) - 1;
-  }
-/* Both length and characters must be equal. */
-return 0;
-}
-
-int
-PRIV(strncmp_uc_c8)(const pcre_uchar *str1, const char *str2, unsigned int num)
-{
-const pcre_uint8 *ustr2 = (pcre_uint8 *)str2;
-pcre_uchar c1;
-pcre_uchar c2;
-
-while (num-- > 0)
-  {
-  c1 = *str1++;
-  c2 = (pcre_uchar)*ustr2++;
-  if (c1 != c2)
-    return ((c1 > c2) << 1) - 1;
-  }
-/* Both length and characters must be equal. */
-return 0;
-}
-
-/* The following function returns with the length of
-a zero terminated string. Basically an strlen for non 8 bit characters.
-
-Arguments:
-  str         string
-
-Returns:      length of the string
-*/
-
-unsigned int
-PRIV(strlen_uc)(const pcre_uchar *str)
-{
-unsigned int len = 0;
-while (*str++ != 0)
-  len++;
-return len;
-}
-
-#endif /* !COMPILE_PCRE8 */
-
-/* End of pcre_string_utils.c */
diff --git a/Foundation/src/pcre_study.c b/Foundation/src/pcre_study.c
deleted file mode 100644
index 3facd6fb8..000000000
--- a/Foundation/src/pcre_study.c
+++ /dev/null
@@ -1,1683 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-#pragma warning( disable : 4244)  // conversion from 'int' to 'unsigned short', possible loss of data
-
-/* This module contains the external function pcre_study(), along with local
-supporting functions. */
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-#define SET_BIT(c) start_bits[c/8] |= (1 << (c&7))
-
-/* Returns from set_start_bits() */
-
-enum { SSB_FAIL, SSB_DONE, SSB_CONTINUE, SSB_UNKNOWN };
-
-
-
-/*************************************************
-*   Find the minimum subject length for a group  *
-*************************************************/
-
-/* Scan a parenthesized group and compute the minimum length of subject that
-is needed to match it. This is a lower bound; it does not mean there is a
-string of that length that matches. In UTF8 mode, the result is in characters
-rather than bytes.
-
-Arguments:
-  re              compiled pattern block
-  code            pointer to start of group (the bracket)
-  startcode       pointer to start of the whole pattern's code
-  options         the compiling options
-  recurses        chain of recurse_check to catch mutual recursion
-  countptr        pointer to call count (to catch over complexity)
-
-Returns:   the minimum length
-           -1 if \C in UTF-8 mode or (*ACCEPT) was encountered
-           -2 internal error (missing capturing bracket)
-           -3 internal error (opcode not listed)
-*/
-
-static int
-find_minlength(const REAL_PCRE *re, const pcre_uchar *code,
-  const pcre_uchar *startcode, int options, recurse_check *recurses,
-  int *countptr)
-{
-int length = -1;
-/* PCRE_UTF16 has the same value as PCRE_UTF8. */
-BOOL utf = (options & PCRE_UTF8) != 0;
-BOOL had_recurse = FALSE;
-recurse_check this_recurse;
-register int branchlength = 0;
-register pcre_uchar *cc = (pcre_uchar *)code + 1 + LINK_SIZE;
-
-if ((*countptr)++ > 1000) return -1;   /* too complex */
-
-if (*code == OP_CBRA || *code == OP_SCBRA ||
-    *code == OP_CBRAPOS || *code == OP_SCBRAPOS) cc += IMM2_SIZE;
-
-/* Scan along the opcodes for this branch. If we get to the end of the
-branch, check the length against that of the other branches. */
-
-for (;;)
-  {
-  int d, min;
-  pcre_uchar *cs, *ce;
-  register pcre_uchar op = *cc;
-
-  switch (op)
-    {
-    case OP_COND:
-    case OP_SCOND:
-
-    /* If there is only one branch in a condition, the implied branch has zero
-    length, so we don't add anything. This covers the DEFINE "condition"
-    automatically. */
-
-    cs = cc + GET(cc, 1);
-    if (*cs != OP_ALT)
-      {
-      cc = cs + 1 + LINK_SIZE;
-      break;
-      }
-
-    /* Otherwise we can fall through and treat it the same as any other
-    subpattern. */
-
-    case OP_CBRA:
-    case OP_SCBRA:
-    case OP_BRA:
-    case OP_SBRA:
-    case OP_CBRAPOS:
-    case OP_SCBRAPOS:
-    case OP_BRAPOS:
-    case OP_SBRAPOS:
-    case OP_ONCE:
-    case OP_ONCE_NC:
-    d = find_minlength(re, cc, startcode, options, recurses, countptr);
-    if (d < 0) return d;
-    branchlength += d;
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* ACCEPT makes things far too complicated; we have to give up. */
-
-    case OP_ACCEPT:
-    case OP_ASSERT_ACCEPT:
-    return -1;
-
-    /* Reached end of a branch; if it's a ket it is the end of a nested
-    call. If it's ALT it is an alternation in a nested call. If it is END it's
-    the end of the outer call. All can be handled by the same code. If an
-    ACCEPT was previously encountered, use the length that was in force at that
-    time, and pass back the shortest ACCEPT length. */
-
-    case OP_ALT:
-    case OP_KET:
-    case OP_KETRMAX:
-    case OP_KETRMIN:
-    case OP_KETRPOS:
-    case OP_END:
-    if (length < 0 || (!had_recurse && branchlength < length))
-      length = branchlength;
-    if (op != OP_ALT) return length;
-    cc += 1 + LINK_SIZE;
-    branchlength = 0;
-    had_recurse = FALSE;
-    break;
-
-    /* Skip over assertive subpatterns */
-
-    case OP_ASSERT:
-    case OP_ASSERT_NOT:
-    case OP_ASSERTBACK:
-    case OP_ASSERTBACK_NOT:
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    /* Fall through */
-
-    /* Skip over things that don't match chars */
-
-    case OP_REVERSE:
-    case OP_CREF:
-    case OP_DNCREF:
-    case OP_RREF:
-    case OP_DNRREF:
-    case OP_DEF:
-    case OP_CALLOUT:
-    case OP_SOD:
-    case OP_SOM:
-    case OP_EOD:
-    case OP_EODN:
-    case OP_CIRC:
-    case OP_CIRCM:
-    case OP_DOLL:
-    case OP_DOLLM:
-    case OP_NOT_WORD_BOUNDARY:
-    case OP_WORD_BOUNDARY:
-    cc += PRIV(OP_lengths)[*cc];
-    break;
-
-    /* Skip over a subpattern that has a {0} or {0,x} quantifier */
-
-    case OP_BRAZERO:
-    case OP_BRAMINZERO:
-    case OP_BRAPOSZERO:
-    case OP_SKIPZERO:
-    cc += PRIV(OP_lengths)[*cc];
-    do cc += GET(cc, 1); while (*cc == OP_ALT);
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Handle literal characters and + repetitions */
-
-    case OP_CHAR:
-    case OP_CHARI:
-    case OP_NOT:
-    case OP_NOTI:
-    case OP_PLUS:
-    case OP_PLUSI:
-    case OP_MINPLUS:
-    case OP_MINPLUSI:
-    case OP_POSPLUS:
-    case OP_POSPLUSI:
-    case OP_NOTPLUS:
-    case OP_NOTPLUSI:
-    case OP_NOTMINPLUS:
-    case OP_NOTMINPLUSI:
-    case OP_NOTPOSPLUS:
-    case OP_NOTPOSPLUSI:
-    branchlength++;
-    cc += 2;
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEPOSPLUS:
-    branchlength++;
-    cc += (cc[1] == OP_PROP || cc[1] == OP_NOTPROP)? 4 : 2;
-    break;
-
-    /* Handle exact repetitions. The count is already in characters, but we
-    need to skip over a multibyte character in UTF8 mode.  */
-
-    case OP_EXACT:
-    case OP_EXACTI:
-    case OP_NOTEXACT:
-    case OP_NOTEXACTI:
-    branchlength += GET2(cc,1);
-    cc += 2 + IMM2_SIZE;
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    case OP_TYPEEXACT:
-    branchlength += GET2(cc,1);
-    cc += 2 + IMM2_SIZE + ((cc[1 + IMM2_SIZE] == OP_PROP
-      || cc[1 + IMM2_SIZE] == OP_NOTPROP)? 2 : 0);
-    break;
-
-    /* Handle single-char non-literal matchers */
-
-    case OP_PROP:
-    case OP_NOTPROP:
-    cc += 2;
-    /* Fall through */
-
-    case OP_NOT_DIGIT:
-    case OP_DIGIT:
-    case OP_NOT_WHITESPACE:
-    case OP_WHITESPACE:
-    case OP_NOT_WORDCHAR:
-    case OP_WORDCHAR:
-    case OP_ANY:
-    case OP_ALLANY:
-    case OP_EXTUNI:
-    case OP_HSPACE:
-    case OP_NOT_HSPACE:
-    case OP_VSPACE:
-    case OP_NOT_VSPACE:
-    branchlength++;
-    cc++;
-    break;
-
-    /* "Any newline" might match two characters, but it also might match just
-    one. */
-
-    case OP_ANYNL:
-    branchlength += 1;
-    cc++;
-    break;
-
-    /* The single-byte matcher means we can't proceed in UTF-8 mode. (In
-    non-UTF-8 mode \C will actually be turned into OP_ALLANY, so won't ever
-    appear, but leave the code, just in case.) */
-
-    case OP_ANYBYTE:
-#ifdef SUPPORT_UTF
-    if (utf) return -1;
-#endif
-    branchlength++;
-    cc++;
-    break;
-
-    /* For repeated character types, we have to test for \p and \P, which have
-    an extra two bytes of parameters. */
-
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    case OP_TYPEPOSSTAR:
-    case OP_TYPEPOSQUERY:
-    if (cc[1] == OP_PROP || cc[1] == OP_NOTPROP) cc += 2;
-    cc += PRIV(OP_lengths)[op];
-    break;
-
-    case OP_TYPEUPTO:
-    case OP_TYPEMINUPTO:
-    case OP_TYPEPOSUPTO:
-    if (cc[1 + IMM2_SIZE] == OP_PROP
-      || cc[1 + IMM2_SIZE] == OP_NOTPROP) cc += 2;
-    cc += PRIV(OP_lengths)[op];
-    break;
-
-    /* Check a class for variable quantification */
-
-    case OP_CLASS:
-    case OP_NCLASS:
-#if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-    case OP_XCLASS:
-    /* The original code caused an unsigned overflow in 64 bit systems,
-    so now we use a conditional statement. */
-    if (op == OP_XCLASS)
-      cc += GET(cc, 1);
-    else
-      cc += PRIV(OP_lengths)[OP_CLASS];
-#else
-    cc += PRIV(OP_lengths)[OP_CLASS];
-#endif
-
-    switch (*cc)
-      {
-      case OP_CRPLUS:
-      case OP_CRMINPLUS:
-      case OP_CRPOSPLUS:
-      branchlength++;
-      /* Fall through */
-
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      case OP_CRPOSSTAR:
-      case OP_CRPOSQUERY:
-      cc++;
-      break;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      case OP_CRPOSRANGE:
-      branchlength += GET2(cc,1);
-      cc += 1 + 2 * IMM2_SIZE;
-      break;
-
-      default:
-      branchlength++;
-      break;
-      }
-    break;
-
-    /* Backreferences and subroutine calls are treated in the same way: we find
-    the minimum length for the subpattern. A recursion, however, causes an
-    a flag to be set that causes the length of this branch to be ignored. The
-    logic is that a recursion can only make sense if there is another
-    alternation that stops the recursing. That will provide the minimum length
-    (when no recursion happens). A backreference within the group that it is
-    referencing behaves in the same way.
-
-    If PCRE_JAVASCRIPT_COMPAT is set, a backreference to an unset bracket
-    matches an empty string (by default it causes a matching failure), so in
-    that case we must set the minimum length to zero. */
-
-    case OP_DNREF:     /* Duplicate named pattern back reference */
-    case OP_DNREFI:
-    if ((options & PCRE_JAVASCRIPT_COMPAT) == 0)
-      {
-      int count = GET2(cc, 1+IMM2_SIZE);
-      pcre_uchar *slot = (pcre_uchar *)re +
-        re->name_table_offset + GET2(cc, 1) * re->name_entry_size;
-      d = INT_MAX;
-      while (count-- > 0)
-        {
-        ce = cs = (pcre_uchar *)PRIV(find_bracket)(startcode, utf, GET2(slot, 0));
-        if (cs == NULL) return -2;
-        do ce += GET(ce, 1); while (*ce == OP_ALT);
-        if (cc > cs && cc < ce)     /* Simple recursion */
-          {
-          d = 0;
-          had_recurse = TRUE;
-          break;
-          }
-        else
-          {
-          recurse_check *r = recurses;
-          for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
-          if (r != NULL)           /* Mutual recursion */
-            {
-            d = 0;
-            had_recurse = TRUE;
-            break;
-            }
-          else
-            {
-            int dd;
-            this_recurse.prev = recurses;
-            this_recurse.group = cs;
-            dd = find_minlength(re, cs, startcode, options, &this_recurse,
-              countptr);
-            if (dd < d) d = dd;
-            }
-          }
-        slot += re->name_entry_size;
-        }
-      }
-    else d = 0;
-    cc += 1 + 2*IMM2_SIZE;
-    goto REPEAT_BACK_REFERENCE;
-
-    case OP_REF:      /* Single back reference */
-    case OP_REFI:
-    if ((options & PCRE_JAVASCRIPT_COMPAT) == 0)
-      {
-      ce = cs = (pcre_uchar *)PRIV(find_bracket)(startcode, utf, GET2(cc, 1));
-      if (cs == NULL) return -2;
-      do ce += GET(ce, 1); while (*ce == OP_ALT);
-      if (cc > cs && cc < ce)    /* Simple recursion */
-        {
-        d = 0;
-        had_recurse = TRUE;
-        }
-      else
-        {
-        recurse_check *r = recurses;
-        for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
-        if (r != NULL)           /* Mutual recursion */
-          {
-          d = 0;
-          had_recurse = TRUE;
-          }
-        else
-          {
-          this_recurse.prev = recurses;
-          this_recurse.group = cs;
-          d = find_minlength(re, cs, startcode, options, &this_recurse,
-            countptr);
-          }
-        }
-      }
-    else d = 0;
-    cc += 1 + IMM2_SIZE;
-
-    /* Handle repeated back references */
-
-    REPEAT_BACK_REFERENCE:
-    switch (*cc)
-      {
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      case OP_CRPOSSTAR:
-      case OP_CRPOSQUERY:
-      min = 0;
-      cc++;
-      break;
-
-      case OP_CRPLUS:
-      case OP_CRMINPLUS:
-      case OP_CRPOSPLUS:
-      min = 1;
-      cc++;
-      break;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      case OP_CRPOSRANGE:
-      min = GET2(cc, 1);
-      cc += 1 + 2 * IMM2_SIZE;
-      break;
-
-      default:
-      min = 1;
-      break;
-      }
-
-    branchlength += min * d;
-    break;
-
-    /* We can easily detect direct recursion, but not mutual recursion. This is
-    caught by a recursion depth count. */
-
-    case OP_RECURSE:
-    cs = ce = (pcre_uchar *)startcode + GET(cc, 1);
-    do ce += GET(ce, 1); while (*ce == OP_ALT);
-    if (cc > cs && cc < ce)    /* Simple recursion */
-      had_recurse = TRUE;
-    else
-      {
-      recurse_check *r = recurses;
-      for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
-      if (r != NULL)           /* Mutual recursion */
-        had_recurse = TRUE;
-      else
-        {
-        this_recurse.prev = recurses;
-        this_recurse.group = cs;
-        branchlength += find_minlength(re, cs, startcode, options,
-          &this_recurse, countptr);
-        }
-      }
-    cc += 1 + LINK_SIZE;
-    break;
-
-    /* Anything else does not or need not match a character. We can get the
-    item's length from the table, but for those that can match zero occurrences
-    of a character, we must take special action for UTF-8 characters. As it
-    happens, the "NOT" versions of these opcodes are used at present only for
-    ASCII characters, so they could be omitted from this list. However, in
-    future that may change, so we include them here so as not to leave a
-    gotcha for a future maintainer. */
-
-    case OP_UPTO:
-    case OP_UPTOI:
-    case OP_NOTUPTO:
-    case OP_NOTUPTOI:
-    case OP_MINUPTO:
-    case OP_MINUPTOI:
-    case OP_NOTMINUPTO:
-    case OP_NOTMINUPTOI:
-    case OP_POSUPTO:
-    case OP_POSUPTOI:
-    case OP_NOTPOSUPTO:
-    case OP_NOTPOSUPTOI:
-
-    case OP_STAR:
-    case OP_STARI:
-    case OP_NOTSTAR:
-    case OP_NOTSTARI:
-    case OP_MINSTAR:
-    case OP_MINSTARI:
-    case OP_NOTMINSTAR:
-    case OP_NOTMINSTARI:
-    case OP_POSSTAR:
-    case OP_POSSTARI:
-    case OP_NOTPOSSTAR:
-    case OP_NOTPOSSTARI:
-
-    case OP_QUERY:
-    case OP_QUERYI:
-    case OP_NOTQUERY:
-    case OP_NOTQUERYI:
-    case OP_MINQUERY:
-    case OP_MINQUERYI:
-    case OP_NOTMINQUERY:
-    case OP_NOTMINQUERYI:
-    case OP_POSQUERY:
-    case OP_POSQUERYI:
-    case OP_NOTPOSQUERY:
-    case OP_NOTPOSQUERYI:
-
-    cc += PRIV(OP_lengths)[op];
-#ifdef SUPPORT_UTF
-    if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
-#endif
-    break;
-
-    /* Skip these, but we need to add in the name length. */
-
-    case OP_MARK:
-    case OP_PRUNE_ARG:
-    case OP_SKIP_ARG:
-    case OP_THEN_ARG:
-    cc += PRIV(OP_lengths)[op] + cc[1];
-    break;
-
-    /* The remaining opcodes are just skipped over. */
-
-    case OP_CLOSE:
-    case OP_COMMIT:
-    case OP_FAIL:
-    case OP_PRUNE:
-    case OP_SET_SOM:
-    case OP_SKIP:
-    case OP_THEN:
-    cc += PRIV(OP_lengths)[op];
-    break;
-
-    /* This should not occur: we list all opcodes explicitly so that when
-    new ones get added they are properly considered. */
-
-    default:
-    return -3;
-    }
-  }
-/* Control never gets here */
-}
-
-
-
-/*************************************************
-*      Set a bit and maybe its alternate case    *
-*************************************************/
-
-/* Given a character, set its first byte's bit in the table, and also the
-corresponding bit for the other version of a letter if we are caseless. In
-UTF-8 mode, for characters greater than 127, we can only do the caseless thing
-when Unicode property support is available.
-
-Arguments:
-  start_bits    points to the bit map
-  p             points to the character
-  caseless      the caseless flag
-  cd            the block with char table pointers
-  utf           TRUE for UTF-8 / UTF-16 / UTF-32 mode
-
-Returns:        pointer after the character
-*/
-
-static const pcre_uchar *
-set_table_bit(pcre_uint8 *start_bits, const pcre_uchar *p, BOOL caseless,
-  compile_data *cd, BOOL utf)
-{
-pcre_uint32 c = *p;
-
-#ifdef COMPILE_PCRE8
-SET_BIT(c);
-
-#ifdef SUPPORT_UTF
-if (utf && c > 127)
-  {
-  GETCHARINC(c, p);
-#ifdef SUPPORT_UCP
-  if (caseless)
-    {
-    pcre_uchar buff[6];
-    c = UCD_OTHERCASE(c);
-    (void)PRIV(ord2utf)(c, buff);
-    SET_BIT(buff[0]);
-    }
-#endif  /* Not SUPPORT_UCP */
-  return p;
-  }
-#else   /* Not SUPPORT_UTF */
-(void)(utf);   /* Stops warning for unused parameter */
-#endif  /* SUPPORT_UTF */
-
-/* Not UTF-8 mode, or character is less than 127. */
-
-if (caseless && (cd->ctypes[c] & ctype_letter) != 0) SET_BIT(cd->fcc[c]);
-return p + 1;
-#endif  /* COMPILE_PCRE8 */
-
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-if (c > 0xff)
-  {
-  c = 0xff;
-  caseless = FALSE;
-  }
-SET_BIT(c);
-
-#ifdef SUPPORT_UTF
-if (utf && c > 127)
-  {
-  GETCHARINC(c, p);
-#ifdef SUPPORT_UCP
-  if (caseless)
-    {
-    c = UCD_OTHERCASE(c);
-    if (c > 0xff)
-      c = 0xff;
-    SET_BIT(c);
-    }
-#endif  /* SUPPORT_UCP */
-  return p;
-  }
-#else   /* Not SUPPORT_UTF */
-(void)(utf);   /* Stops warning for unused parameter */
-#endif  /* SUPPORT_UTF */
-
-if (caseless && (cd->ctypes[c] & ctype_letter) != 0) SET_BIT(cd->fcc[c]);
-return p + 1;
-#endif
-}
-
-
-
-/*************************************************
-*     Set bits for a positive character type     *
-*************************************************/
-
-/* This function sets starting bits for a character type. In UTF-8 mode, we can
-only do a direct setting for bytes less than 128, as otherwise there can be
-confusion with bytes in the middle of UTF-8 characters. In a "traditional"
-environment, the tables will only recognize ASCII characters anyway, but in at
-least one Windows environment, some higher bytes bits were set in the tables.
-So we deal with that case by considering the UTF-8 encoding.
-
-Arguments:
-  start_bits     the starting bitmap
-  cbit type      the type of character wanted
-  table_limit    32 for non-UTF-8; 16 for UTF-8
-  cd             the block with char table pointers
-
-Returns:         nothing
-*/
-
-static void
-set_type_bits(pcre_uint8 *start_bits, int cbit_type, unsigned int table_limit,
-  compile_data *cd)
-{
-register pcre_uint32 c;
-for (c = 0; c < table_limit; c++) start_bits[c] |= cd->cbits[c+cbit_type];
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-if (table_limit == 32) return;
-for (c = 128; c < 256; c++)
-  {
-  if ((cd->cbits[c/8] & (1 << (c&7))) != 0)
-    {
-    pcre_uchar buff[6];
-    (void)PRIV(ord2utf)(c, buff);
-    SET_BIT(buff[0]);
-    }
-  }
-#endif
-}
-
-
-/*************************************************
-*     Set bits for a negative character type     *
-*************************************************/
-
-/* This function sets starting bits for a negative character type such as \D.
-In UTF-8 mode, we can only do a direct setting for bytes less than 128, as
-otherwise there can be confusion with bytes in the middle of UTF-8 characters.
-Unlike in the positive case, where we can set appropriate starting bits for
-specific high-valued UTF-8 characters, in this case we have to set the bits for
-all high-valued characters. The lowest is 0xc2, but we overkill by starting at
-0xc0 (192) for simplicity.
-
-Arguments:
-  start_bits     the starting bitmap
-  cbit type      the type of character wanted
-  table_limit    32 for non-UTF-8; 16 for UTF-8
-  cd             the block with char table pointers
-
-Returns:         nothing
-*/
-
-static void
-set_nottype_bits(pcre_uint8 *start_bits, int cbit_type, unsigned int table_limit,
-  compile_data *cd)
-{
-register pcre_uint32 c;
-for (c = 0; c < table_limit; c++) start_bits[c] |= ~cd->cbits[c+cbit_type];
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-if (table_limit != 32) for (c = 24; c < 32; c++) start_bits[c] = 0xff;
-#endif
-}
-
-
-
-/*************************************************
-*          Create bitmap of starting bytes       *
-*************************************************/
-
-/* This function scans a compiled unanchored expression recursively and
-attempts to build a bitmap of the set of possible starting bytes. As time goes
-by, we may be able to get more clever at doing this. The SSB_CONTINUE return is
-useful for parenthesized groups in patterns such as (a*)b where the group
-provides some optional starting bytes but scanning must continue at the outer
-level to find at least one mandatory byte. At the outermost level, this
-function fails unless the result is SSB_DONE.
-
-Arguments:
-  code         points to an expression
-  start_bits   points to a 32-byte table, initialized to 0
-  utf          TRUE if in UTF-8 / UTF-16 / UTF-32 mode
-  cd           the block with char table pointers
-
-Returns:       SSB_FAIL     => Failed to find any starting bytes
-               SSB_DONE     => Found mandatory starting bytes
-               SSB_CONTINUE => Found optional starting bytes
-               SSB_UNKNOWN  => Hit an unrecognized opcode
-*/
-
-static int
-set_start_bits(const pcre_uchar *code, pcre_uint8 *start_bits, BOOL utf,
-  compile_data *cd)
-{
-register pcre_uint32 c;
-int yield = SSB_DONE;
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-int table_limit = utf? 16:32;
-#else
-int table_limit = 32;
-#endif
-
-#if 0
-/* ========================================================================= */
-/* The following comment and code was inserted in January 1999. In May 2006,
-when it was observed to cause compiler warnings about unused values, I took it
-out again. If anybody is still using OS/2, they will have to put it back
-manually. */
-
-/* This next statement and the later reference to dummy are here in order to
-trick the optimizer of the IBM C compiler for OS/2 into generating correct
-code. Apparently IBM isn't going to fix the problem, and we would rather not
-disable optimization (in this module it actually makes a big difference, and
-the pcre module can use all the optimization it can get). */
-
-volatile int dummy;
-/* ========================================================================= */
-#endif
-
-do
-  {
-  BOOL try_next = TRUE;
-  const pcre_uchar *tcode = code + 1 + LINK_SIZE;
-
-  if (*code == OP_CBRA || *code == OP_SCBRA ||
-      *code == OP_CBRAPOS || *code == OP_SCBRAPOS) tcode += IMM2_SIZE;
-
-  while (try_next)    /* Loop for items in this branch */
-    {
-    int rc;
-
-    switch(*tcode)
-      {
-      /* If we reach something we don't understand, it means a new opcode has
-      been created that hasn't been added to this code. Hopefully this problem
-      will be discovered during testing. */
-
-      default:
-      return SSB_UNKNOWN;
-
-      /* Fail for a valid opcode that implies no starting bits. */
-
-      case OP_ACCEPT:
-      case OP_ASSERT_ACCEPT:
-      case OP_ALLANY:
-      case OP_ANY:
-      case OP_ANYBYTE:
-      case OP_CIRC:
-      case OP_CIRCM:
-      case OP_CLOSE:
-      case OP_COMMIT:
-      case OP_COND:
-      case OP_CREF:
-      case OP_DEF:
-      case OP_DNCREF:
-      case OP_DNREF:
-      case OP_DNREFI:
-      case OP_DNRREF:
-      case OP_DOLL:
-      case OP_DOLLM:
-      case OP_END:
-      case OP_EOD:
-      case OP_EODN:
-      case OP_EXTUNI:
-      case OP_FAIL:
-      case OP_MARK:
-      case OP_NOT:
-      case OP_NOTEXACT:
-      case OP_NOTEXACTI:
-      case OP_NOTI:
-      case OP_NOTMINPLUS:
-      case OP_NOTMINPLUSI:
-      case OP_NOTMINQUERY:
-      case OP_NOTMINQUERYI:
-      case OP_NOTMINSTAR:
-      case OP_NOTMINSTARI:
-      case OP_NOTMINUPTO:
-      case OP_NOTMINUPTOI:
-      case OP_NOTPLUS:
-      case OP_NOTPLUSI:
-      case OP_NOTPOSPLUS:
-      case OP_NOTPOSPLUSI:
-      case OP_NOTPOSQUERY:
-      case OP_NOTPOSQUERYI:
-      case OP_NOTPOSSTAR:
-      case OP_NOTPOSSTARI:
-      case OP_NOTPOSUPTO:
-      case OP_NOTPOSUPTOI:
-      case OP_NOTPROP:
-      case OP_NOTQUERY:
-      case OP_NOTQUERYI:
-      case OP_NOTSTAR:
-      case OP_NOTSTARI:
-      case OP_NOTUPTO:
-      case OP_NOTUPTOI:
-      case OP_NOT_HSPACE:
-      case OP_NOT_VSPACE:
-      case OP_PRUNE:
-      case OP_PRUNE_ARG:
-      case OP_RECURSE:
-      case OP_REF:
-      case OP_REFI:
-      case OP_REVERSE:
-      case OP_RREF:
-      case OP_SCOND:
-      case OP_SET_SOM:
-      case OP_SKIP:
-      case OP_SKIP_ARG:
-      case OP_SOD:
-      case OP_SOM:
-      case OP_THEN:
-      case OP_THEN_ARG:
-      return SSB_FAIL;
-
-      /* A "real" property test implies no starting bits, but the fake property
-      PT_CLIST identifies a list of characters. These lists are short, as they
-      are used for characters with more than one "other case", so there is no
-      point in recognizing them for OP_NOTPROP. */
-
-      case OP_PROP:
-      if (tcode[1] != PT_CLIST) return SSB_FAIL;
-        {
-        const pcre_uint32 *p = PRIV(ucd_caseless_sets) + tcode[2];
-        while ((c = *p++) < NOTACHAR)
-          {
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-          if (utf)
-            {
-            pcre_uchar buff[6];
-            (void)PRIV(ord2utf)(c, buff);
-            c = buff[0];
-            }
-#endif
-          if (c > 0xff) SET_BIT(0xff); else SET_BIT(c);
-          }
-        }
-      try_next = FALSE;
-      break;
-
-      /* We can ignore word boundary tests. */
-
-      case OP_WORD_BOUNDARY:
-      case OP_NOT_WORD_BOUNDARY:
-      tcode++;
-      break;
-
-      /* If we hit a bracket or a positive lookahead assertion, recurse to set
-      bits from within the subpattern. If it can't find anything, we have to
-      give up. If it finds some mandatory character(s), we are done for this
-      branch. Otherwise, carry on scanning after the subpattern. */
-
-      case OP_BRA:
-      case OP_SBRA:
-      case OP_CBRA:
-      case OP_SCBRA:
-      case OP_BRAPOS:
-      case OP_SBRAPOS:
-      case OP_CBRAPOS:
-      case OP_SCBRAPOS:
-      case OP_ONCE:
-      case OP_ONCE_NC:
-      case OP_ASSERT:
-      rc = set_start_bits(tcode, start_bits, utf, cd);
-      if (rc == SSB_FAIL || rc == SSB_UNKNOWN) return rc;
-      if (rc == SSB_DONE) try_next = FALSE; else
-        {
-        do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
-        tcode += 1 + LINK_SIZE;
-        }
-      break;
-
-      /* If we hit ALT or KET, it means we haven't found anything mandatory in
-      this branch, though we might have found something optional. For ALT, we
-      continue with the next alternative, but we have to arrange that the final
-      result from subpattern is SSB_CONTINUE rather than SSB_DONE. For KET,
-      return SSB_CONTINUE: if this is the top level, that indicates failure,
-      but after a nested subpattern, it causes scanning to continue. */
-
-      case OP_ALT:
-      yield = SSB_CONTINUE;
-      try_next = FALSE;
-      break;
-
-      case OP_KET:
-      case OP_KETRMAX:
-      case OP_KETRMIN:
-      case OP_KETRPOS:
-      return SSB_CONTINUE;
-
-      /* Skip over callout */
-
-      case OP_CALLOUT:
-      tcode += 2 + 2*LINK_SIZE;
-      break;
-
-      /* Skip over lookbehind and negative lookahead assertions */
-
-      case OP_ASSERT_NOT:
-      case OP_ASSERTBACK:
-      case OP_ASSERTBACK_NOT:
-      do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
-      tcode += 1 + LINK_SIZE;
-      break;
-
-      /* BRAZERO does the bracket, but carries on. */
-
-      case OP_BRAZERO:
-      case OP_BRAMINZERO:
-      case OP_BRAPOSZERO:
-      rc = set_start_bits(++tcode, start_bits, utf, cd);
-      if (rc == SSB_FAIL || rc == SSB_UNKNOWN) return rc;
-/* =========================================================================
-      See the comment at the head of this function concerning the next line,
-      which was an old fudge for the benefit of OS/2.
-      dummy = 1;
-  ========================================================================= */
-      do tcode += GET(tcode,1); while (*tcode == OP_ALT);
-      tcode += 1 + LINK_SIZE;
-      break;
-
-      /* SKIPZERO skips the bracket. */
-
-      case OP_SKIPZERO:
-      tcode++;
-      do tcode += GET(tcode,1); while (*tcode == OP_ALT);
-      tcode += 1 + LINK_SIZE;
-      break;
-
-      /* Single-char * or ? sets the bit and tries the next item */
-
-      case OP_STAR:
-      case OP_MINSTAR:
-      case OP_POSSTAR:
-      case OP_QUERY:
-      case OP_MINQUERY:
-      case OP_POSQUERY:
-      tcode = set_table_bit(start_bits, tcode + 1, FALSE, cd, utf);
-      break;
-
-      case OP_STARI:
-      case OP_MINSTARI:
-      case OP_POSSTARI:
-      case OP_QUERYI:
-      case OP_MINQUERYI:
-      case OP_POSQUERYI:
-      tcode = set_table_bit(start_bits, tcode + 1, TRUE, cd, utf);
-      break;
-
-      /* Single-char upto sets the bit and tries the next */
-
-      case OP_UPTO:
-      case OP_MINUPTO:
-      case OP_POSUPTO:
-      tcode = set_table_bit(start_bits, tcode + 1 + IMM2_SIZE, FALSE, cd, utf);
-      break;
-
-      case OP_UPTOI:
-      case OP_MINUPTOI:
-      case OP_POSUPTOI:
-      tcode = set_table_bit(start_bits, tcode + 1 + IMM2_SIZE, TRUE, cd, utf);
-      break;
-
-      /* At least one single char sets the bit and stops */
-
-      case OP_EXACT:
-      tcode += IMM2_SIZE;
-      /* Fall through */
-      case OP_CHAR:
-      case OP_PLUS:
-      case OP_MINPLUS:
-      case OP_POSPLUS:
-      (void)set_table_bit(start_bits, tcode + 1, FALSE, cd, utf);
-      try_next = FALSE;
-      break;
-
-      case OP_EXACTI:
-      tcode += IMM2_SIZE;
-      /* Fall through */
-      case OP_CHARI:
-      case OP_PLUSI:
-      case OP_MINPLUSI:
-      case OP_POSPLUSI:
-      (void)set_table_bit(start_bits, tcode + 1, TRUE, cd, utf);
-      try_next = FALSE;
-      break;
-
-      /* Special spacing and line-terminating items. These recognize specific
-      lists of characters. The difference between VSPACE and ANYNL is that the
-      latter can match the two-character CRLF sequence, but that is not
-      relevant for finding the first character, so their code here is
-      identical. */
-
-      case OP_HSPACE:
-      SET_BIT(CHAR_HT);
-      SET_BIT(CHAR_SPACE);
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-#ifdef COMPILE_PCRE8
-        SET_BIT(0xC2);  /* For U+00A0 */
-        SET_BIT(0xE1);  /* For U+1680, U+180E */
-        SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */
-        SET_BIT(0xE3);  /* For U+3000 */
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-        SET_BIT(0xA0);
-        SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE[8|16|32] */
-        }
-      else
-#endif /* SUPPORT_UTF */
-        {
-#ifndef EBCDIC
-        SET_BIT(0xA0);
-#endif  /* Not EBCDIC */
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-        SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE[16|32] */
-        }
-      try_next = FALSE;
-      break;
-
-      case OP_ANYNL:
-      case OP_VSPACE:
-      SET_BIT(CHAR_LF);
-      SET_BIT(CHAR_VT);
-      SET_BIT(CHAR_FF);
-      SET_BIT(CHAR_CR);
-#ifdef SUPPORT_UTF
-      if (utf)
-        {
-#ifdef COMPILE_PCRE8
-        SET_BIT(0xC2);  /* For U+0085 */
-        SET_BIT(0xE2);  /* For U+2028, U+2029 */
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-        SET_BIT(CHAR_NEL);
-        SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE[8|16|32] */
-        }
-      else
-#endif /* SUPPORT_UTF */
-        {
-        SET_BIT(CHAR_NEL);
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-        SET_BIT(0xFF);  /* For characters > 255 */
-#endif
-        }
-      try_next = FALSE;
-      break;
-
-      /* Single character types set the bits and stop. Note that if PCRE_UCP
-      is set, we do not see these op codes because \d etc are converted to
-      properties. Therefore, these apply in the case when only characters less
-      than 256 are recognized to match the types. */
-
-      case OP_NOT_DIGIT:
-      set_nottype_bits(start_bits, cbit_digit, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      case OP_DIGIT:
-      set_type_bits(start_bits, cbit_digit, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      /* The cbit_space table has vertical tab as whitespace; we no longer
-      have to play fancy tricks because Perl added VT to its whitespace at
-      release 5.18. PCRE added it at release 8.34. */
-
-      case OP_NOT_WHITESPACE:
-      set_nottype_bits(start_bits, cbit_space, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      case OP_WHITESPACE:
-      set_type_bits(start_bits, cbit_space, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      case OP_NOT_WORDCHAR:
-      set_nottype_bits(start_bits, cbit_word, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      case OP_WORDCHAR:
-      set_type_bits(start_bits, cbit_word, table_limit, cd);
-      try_next = FALSE;
-      break;
-
-      /* One or more character type fudges the pointer and restarts, knowing
-      it will hit a single character type and stop there. */
-
-      case OP_TYPEPLUS:
-      case OP_TYPEMINPLUS:
-      case OP_TYPEPOSPLUS:
-      tcode++;
-      break;
-
-      case OP_TYPEEXACT:
-      tcode += 1 + IMM2_SIZE;
-      break;
-
-      /* Zero or more repeats of character types set the bits and then
-      try again. */
-
-      case OP_TYPEUPTO:
-      case OP_TYPEMINUPTO:
-      case OP_TYPEPOSUPTO:
-      tcode += IMM2_SIZE;  /* Fall through */
-
-      case OP_TYPESTAR:
-      case OP_TYPEMINSTAR:
-      case OP_TYPEPOSSTAR:
-      case OP_TYPEQUERY:
-      case OP_TYPEMINQUERY:
-      case OP_TYPEPOSQUERY:
-      switch(tcode[1])
-        {
-        default:
-        case OP_ANY:
-        case OP_ALLANY:
-        return SSB_FAIL;
-
-        case OP_HSPACE:
-        SET_BIT(CHAR_HT);
-        SET_BIT(CHAR_SPACE);
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-#ifdef COMPILE_PCRE8
-          SET_BIT(0xC2);  /* For U+00A0 */
-          SET_BIT(0xE1);  /* For U+1680, U+180E */
-          SET_BIT(0xE2);  /* For U+2000 - U+200A, U+202F, U+205F */
-          SET_BIT(0xE3);  /* For U+3000 */
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-          SET_BIT(0xA0);
-          SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE[8|16|32] */
-          }
-        else
-#endif /* SUPPORT_UTF */
-#ifndef EBCDIC
-          SET_BIT(0xA0);
-#endif  /* Not EBCDIC */
-        break;
-
-        case OP_ANYNL:
-        case OP_VSPACE:
-        SET_BIT(CHAR_LF);
-        SET_BIT(CHAR_VT);
-        SET_BIT(CHAR_FF);
-        SET_BIT(CHAR_CR);
-#ifdef SUPPORT_UTF
-        if (utf)
-          {
-#ifdef COMPILE_PCRE8
-          SET_BIT(0xC2);  /* For U+0085 */
-          SET_BIT(0xE2);  /* For U+2028, U+2029 */
-#elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-          SET_BIT(CHAR_NEL);
-          SET_BIT(0xFF);  /* For characters > 255 */
-#endif  /* COMPILE_PCRE16 */
-          }
-        else
-#endif /* SUPPORT_UTF */
-          SET_BIT(CHAR_NEL);
-        break;
-
-        case OP_NOT_DIGIT:
-        set_nottype_bits(start_bits, cbit_digit, table_limit, cd);
-        break;
-
-        case OP_DIGIT:
-        set_type_bits(start_bits, cbit_digit, table_limit, cd);
-        break;
-
-        /* The cbit_space table has vertical tab as whitespace; we no longer
-        have to play fancy tricks because Perl added VT to its whitespace at
-        release 5.18. PCRE added it at release 8.34. */
-
-        case OP_NOT_WHITESPACE:
-        set_nottype_bits(start_bits, cbit_space, table_limit, cd);
-        break;
-
-        case OP_WHITESPACE:
-        set_type_bits(start_bits, cbit_space, table_limit, cd);
-        break;
-
-        case OP_NOT_WORDCHAR:
-        set_nottype_bits(start_bits, cbit_word, table_limit, cd);
-        break;
-
-        case OP_WORDCHAR:
-        set_type_bits(start_bits, cbit_word, table_limit, cd);
-        break;
-        }
-
-      tcode += 2;
-      break;
-
-      /* Character class where all the information is in a bit map: set the
-      bits and either carry on or not, according to the repeat count. If it was
-      a negative class, and we are operating with UTF-8 characters, any byte
-      with a value >= 0xc4 is a potentially valid starter because it starts a
-      character with a value > 255. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-      case OP_XCLASS:
-      if ((tcode[1 + LINK_SIZE] & XCL_HASPROP) != 0)
-        return SSB_FAIL;
-      /* All bits are set. */
-      if ((tcode[1 + LINK_SIZE] & XCL_MAP) == 0 && (tcode[1 + LINK_SIZE] & XCL_NOT) != 0)
-        return SSB_FAIL;
-#endif
-      /* Fall through */
-
-      case OP_NCLASS:
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-      if (utf)
-        {
-        start_bits[24] |= 0xf0;              /* Bits for 0xc4 - 0xc8 */
-        memset(start_bits+25, 0xff, 7);      /* Bits for 0xc9 - 0xff */
-        }
-#endif
-#if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
-      SET_BIT(0xFF);                         /* For characters > 255 */
-#endif
-      /* Fall through */
-
-      case OP_CLASS:
-        {
-        pcre_uint8 *map;
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-        map = NULL;
-        if (*tcode == OP_XCLASS)
-          {
-          if ((tcode[1 + LINK_SIZE] & XCL_MAP) != 0)
-            map = (pcre_uint8 *)(tcode + 1 + LINK_SIZE + 1);
-          tcode += GET(tcode, 1);
-          }
-        else
-#endif
-          {
-          tcode++;
-          map = (pcre_uint8 *)tcode;
-          tcode += 32 / sizeof(pcre_uchar);
-          }
-
-        /* In UTF-8 mode, the bits in a bit map correspond to character
-        values, not to byte values. However, the bit map we are constructing is
-        for byte values. So we have to do a conversion for characters whose
-        value is > 127. In fact, there are only two possible starting bytes for
-        characters in the range 128 - 255. */
-
-#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-        if (map != NULL)
-#endif
-          {
-#if defined SUPPORT_UTF && defined COMPILE_PCRE8
-          if (utf)
-            {
-            for (c = 0; c < 16; c++) start_bits[c] |= map[c];
-            for (c = 128; c < 256; c++)
-              {
-              if ((map[c/8] & (1 << (c&7))) != 0)
-                {
-                int d = (c >> 6) | 0xc0;            /* Set bit for this starter */
-                start_bits[d/8] |= (1 << (d&7));    /* and then skip on to the */
-                c = (c & 0xc0) + 0x40 - 1;          /* next relevant character. */
-                }
-              }
-            }
-          else
-#endif
-            {
-            /* In non-UTF-8 mode, the two bit maps are completely compatible. */
-            for (c = 0; c < 32; c++) start_bits[c] |= map[c];
-            }
-          }
-
-        /* Advance past the bit map, and act on what follows. For a zero
-        minimum repeat, continue; otherwise stop processing. */
-
-        switch (*tcode)
-          {
-          case OP_CRSTAR:
-          case OP_CRMINSTAR:
-          case OP_CRQUERY:
-          case OP_CRMINQUERY:
-          case OP_CRPOSSTAR:
-          case OP_CRPOSQUERY:
-          tcode++;
-          break;
-
-          case OP_CRRANGE:
-          case OP_CRMINRANGE:
-          case OP_CRPOSRANGE:
-          if (GET2(tcode, 1) == 0) tcode += 1 + 2 * IMM2_SIZE;
-            else try_next = FALSE;
-          break;
-
-          default:
-          try_next = FALSE;
-          break;
-          }
-        }
-      break; /* End of bitmap class handling */
-
-      }      /* End of switch */
-    }        /* End of try_next loop */
-
-  code += GET(code, 1);   /* Advance to next branch */
-  }
-while (*code == OP_ALT);
-return yield;
-}
-
-
-
-
-
-/*************************************************
-*          Study a compiled expression           *
-*************************************************/
-
-/* This function is handed a compiled expression that it must study to produce
-information that will speed up the matching. It returns a pcre[16]_extra block
-which then gets handed back to pcre_exec().
-
-Arguments:
-  re        points to the compiled expression
-  options   contains option bits
-  errorptr  points to where to place error messages;
-            set NULL unless error
-
-Returns:    pointer to a pcre[16]_extra block, with study_data filled in and
-              the appropriate flags set;
-            NULL on error or if no optimization possible
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN pcre_extra * PCRE_CALL_CONVENTION
-pcre_study(const pcre *external_re, int options, const char **errorptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN pcre16_extra * PCRE_CALL_CONVENTION
-pcre16_study(const pcre16 *external_re, int options, const char **errorptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN pcre32_extra * PCRE_CALL_CONVENTION
-pcre32_study(const pcre32 *external_re, int options, const char **errorptr)
-#endif
-{
-int min;
-int count = 0;
-BOOL bits_set = FALSE;
-pcre_uint8 start_bits[32];
-PUBL(extra) *extra = NULL;
-pcre_study_data *study;
-const pcre_uint8 *tables;
-pcre_uchar *code;
-compile_data compile_block;
-const REAL_PCRE *re = (const REAL_PCRE *)external_re;
-
-
-*errorptr = NULL;
-
-if (re == NULL || re->magic_number != MAGIC_NUMBER)
-  {
-  *errorptr = "argument is not a compiled regular expression";
-  return NULL;
-  }
-
-if ((re->flags & PCRE_MODE) == 0)
-  {
-#if defined COMPILE_PCRE8
-  *errorptr = "argument not compiled in 8 bit mode";
-#elif defined COMPILE_PCRE16
-  *errorptr = "argument not compiled in 16 bit mode";
-#elif defined COMPILE_PCRE32
-  *errorptr = "argument not compiled in 32 bit mode";
-#endif
-  return NULL;
-  }
-
-if ((options & ~PUBLIC_STUDY_OPTIONS) != 0)
-  {
-  *errorptr = "unknown or incorrect option bit(s) set";
-  return NULL;
-  }
-
-code = (pcre_uchar *)re + re->name_table_offset +
-  (re->name_count * re->name_entry_size);
-
-/* For an anchored pattern, or an unanchored pattern that has a first char, or
-a multiline pattern that matches only at "line starts", there is no point in
-seeking a list of starting bytes. */
-
-if ((re->options & PCRE_ANCHORED) == 0 &&
-    (re->flags & (PCRE_FIRSTSET|PCRE_STARTLINE)) == 0)
-  {
-  int rc;
-
-  /* Set the character tables in the block that is passed around */
-
-  tables = re->tables;
-
-#if defined COMPILE_PCRE8
-  if (tables == NULL)
-    (void)pcre_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
-    (void *)(&tables));
-#elif defined COMPILE_PCRE16
-  if (tables == NULL)
-    (void)pcre16_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
-    (void *)(&tables));
-#elif defined COMPILE_PCRE32
-  if (tables == NULL)
-    (void)pcre32_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
-    (void *)(&tables));
-#endif
-
-  compile_block.lcc = tables + lcc_offset;
-  compile_block.fcc = tables + fcc_offset;
-  compile_block.cbits = tables + cbits_offset;
-  compile_block.ctypes = tables + ctypes_offset;
-
-  /* See if we can find a fixed set of initial characters for the pattern. */
-
-  memset(start_bits, 0, 32 * sizeof(pcre_uint8));
-  rc = set_start_bits(code, start_bits, (re->options & PCRE_UTF8) != 0,
-    &compile_block);
-  bits_set = rc == SSB_DONE;
-  if (rc == SSB_UNKNOWN)
-    {
-    *errorptr = "internal error: opcode not recognized";
-    return NULL;
-    }
-  }
-
-/* Find the minimum length of subject string. */
-
-switch(min = find_minlength(re, code, code, re->options, NULL, &count))
-  {
-  case -2: *errorptr = "internal error: missing capturing bracket"; return NULL;
-  case -3: *errorptr = "internal error: opcode not recognized"; return NULL;
-  default: break;
-  }
-
-/* If a set of starting bytes has been identified, or if the minimum length is
-greater than zero, or if JIT optimization has been requested, or if
-PCRE_STUDY_EXTRA_NEEDED is set, get a pcre[16]_extra block and a
-pcre_study_data block. The study data is put in the latter, which is pointed to
-by the former, which may also get additional data set later by the calling
-program. At the moment, the size of pcre_study_data is fixed. We nevertheless
-save it in a field for returning via the pcre_fullinfo() function so that if it
-becomes variable in the future, we don't have to change that code. */
-
-if (bits_set || min > 0 || (options & (
-#ifdef SUPPORT_JIT
-    PCRE_STUDY_JIT_COMPILE | PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE |
-    PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE |
-#endif
-    PCRE_STUDY_EXTRA_NEEDED)) != 0)
-  {
-  extra = (PUBL(extra) *)(PUBL(malloc))
-    (sizeof(PUBL(extra)) + sizeof(pcre_study_data));
-  if (extra == NULL)
-    {
-    *errorptr = "failed to get memory";
-    return NULL;
-    }
-
-  study = (pcre_study_data *)((char *)extra + sizeof(PUBL(extra)));
-  extra->flags = PCRE_EXTRA_STUDY_DATA;
-  extra->study_data = study;
-
-  study->size = sizeof(pcre_study_data);
-  study->flags = 0;
-
-  /* Set the start bits always, to avoid unset memory errors if the
-  study data is written to a file, but set the flag only if any of the bits
-  are set, to save time looking when none are. */
-
-  if (bits_set)
-    {
-    study->flags |= PCRE_STUDY_MAPPED;
-    memcpy(study->start_bits, start_bits, sizeof(start_bits));
-    }
-  else memset(study->start_bits, 0, 32 * sizeof(pcre_uint8));
-
-#ifdef PCRE_DEBUG
-  if (bits_set)
-    {
-    pcre_uint8 *ptr = start_bits;
-    int i;
-
-    printf("Start bits:\n");
-    for (i = 0; i < 32; i++)
-      printf("%3d: %02x%s", i * 8, *ptr++, ((i + 1) & 0x7) != 0? " " : "\n");
-    }
-#endif
-
-  /* Always set the minlength value in the block, because the JIT compiler
-  makes use of it. However, don't set the bit unless the length is greater than
-  zero - the interpretive pcre_exec() and pcre_dfa_exec() needn't waste time
-  checking the zero case. */
-
-  if (min > 0)
-    {
-    study->flags |= PCRE_STUDY_MINLEN;
-    study->minlength = min;
-    }
-  else study->minlength = 0;
-
-  /* If JIT support was compiled and requested, attempt the JIT compilation.
-  If no starting bytes were found, and the minimum length is zero, and JIT
-  compilation fails, abandon the extra block and return NULL, unless
-  PCRE_STUDY_EXTRA_NEEDED is set. */
-
-#ifdef SUPPORT_JIT
-  extra->executable_jit = NULL;
-  if ((options & PCRE_STUDY_JIT_COMPILE) != 0)
-    PRIV(jit_compile)(re, extra, JIT_COMPILE);
-  if ((options & PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE) != 0)
-    PRIV(jit_compile)(re, extra, JIT_PARTIAL_SOFT_COMPILE);
-  if ((options & PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE) != 0)
-    PRIV(jit_compile)(re, extra, JIT_PARTIAL_HARD_COMPILE);
-
-  if (study->flags == 0 && (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) == 0 &&
-      (options & PCRE_STUDY_EXTRA_NEEDED) == 0)
-    {
-#if defined COMPILE_PCRE8
-    pcre_free_study(extra);
-#elif defined COMPILE_PCRE16
-    pcre16_free_study(extra);
-#elif defined COMPILE_PCRE32
-    pcre32_free_study(extra);
-#endif
-    extra = NULL;
-    }
-#endif
-  }
-
-return extra;
-}
-
-
-/*************************************************
-*          Free the study data                   *
-*************************************************/
-
-/* This function frees the memory that was obtained by pcre_study().
-
-Argument:   a pointer to the pcre[16]_extra block
-Returns:    nothing
-*/
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN void
-pcre_free_study(pcre_extra *extra)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN void
-pcre16_free_study(pcre16_extra *extra)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN void
-pcre32_free_study(pcre32_extra *extra)
-#endif
-{
-if (extra == NULL)
-  return;
-#ifdef SUPPORT_JIT
-if ((extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 &&
-     extra->executable_jit != NULL)
-  PRIV(jit_free)(extra->executable_jit);
-#endif
-PUBL(free)(extra);
-}
-
-/* End of pcre_study.c */
diff --git a/Foundation/src/pcre_tables.c b/Foundation/src/pcre_tables.c
deleted file mode 100644
index 43663a689..000000000
--- a/Foundation/src/pcre_tables.c
+++ /dev/null
@@ -1,723 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2017 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-#ifndef PCRE_INCLUDED
-
-/* This module contains some fixed tables that are used by more than one of the
-PCRE code modules. The tables are also #included by the pcretest program, which
-uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name
-clashes with the library. */
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-#endif /* PCRE_INCLUDED */
-
-/* Table of sizes for the fixed-length opcodes. It's defined in a macro so that
-the definition is next to the definition of the opcodes in pcre_internal.h. */
-
-const pcre_uint8 PRIV(OP_lengths)[] = { OP_LENGTHS };
-
-/* Tables of horizontal and vertical whitespace characters, suitable for
-adding to classes. */
-
-const pcre_uint32 PRIV(hspace_list)[] = { HSPACE_LIST };
-const pcre_uint32 PRIV(vspace_list)[] = { VSPACE_LIST };
-
-
-
-/*************************************************
-*           Tables for UTF-8 support             *
-*************************************************/
-
-/* These are the breakpoints for different numbers of bytes in a UTF-8
-character. */
-
-#if (defined SUPPORT_UTF && defined COMPILE_PCRE8) \
-  || (defined PCRE_INCLUDED && (defined SUPPORT_PCRE16 || defined SUPPORT_PCRE32))
-
-/* These tables are also required by pcretest in 16- or 32-bit mode. */
-
-const int PRIV(utf8_table1)[] =
-  { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff};
-
-const int PRIV(utf8_table1_size) = sizeof(PRIV(utf8_table1)) / sizeof(int);
-
-/* These are the indicator bits and the mask for the data bits to set in the
-first byte of a character, indexed by the number of additional bytes. */
-
-const int PRIV(utf8_table2)[] = { 0,    0xc0, 0xe0, 0xf0, 0xf8, 0xfc};
-const int PRIV(utf8_table3)[] = { 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};
-
-/* Table of the number of extra bytes, indexed by the first byte masked with
-0x3f. The highest number for a valid UTF-8 first byte is in fact 0x3d. */
-
-const pcre_uint8 PRIV(utf8_table4)[] = {
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-  3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 };
-
-#endif /* (SUPPORT_UTF && COMPILE_PCRE8) || (PCRE_INCLUDED && SUPPORT_PCRE[16|32])*/
-
-#ifdef SUPPORT_UTF
-
-/* Table to translate from particular type value to the general value. */
-
-const pcre_uint32 PRIV(ucp_gentype)[] = {
-  ucp_C, ucp_C, ucp_C, ucp_C, ucp_C,  /* Cc, Cf, Cn, Co, Cs */
-  ucp_L, ucp_L, ucp_L, ucp_L, ucp_L,  /* Ll, Lu, Lm, Lo, Lt */
-  ucp_M, ucp_M, ucp_M,                /* Mc, Me, Mn */
-  ucp_N, ucp_N, ucp_N,                /* Nd, Nl, No */
-  ucp_P, ucp_P, ucp_P, ucp_P, ucp_P,  /* Pc, Pd, Pe, Pf, Pi */
-  ucp_P, ucp_P,                       /* Ps, Po */
-  ucp_S, ucp_S, ucp_S, ucp_S,         /* Sc, Sk, Sm, So */
-  ucp_Z, ucp_Z, ucp_Z                 /* Zl, Zp, Zs */
-};
-
-/* This table encodes the rules for finding the end of an extended grapheme
-cluster. Every code point has a grapheme break property which is one of the
-ucp_gbXX values defined in ucp.h. The 2-dimensional table is indexed by the
-properties of two adjacent code points. The left property selects a word from
-the table, and the right property selects a bit from that word like this:
-
-  ucp_gbtable[left-property] & (1 << right-property)
-
-The value is non-zero if a grapheme break is NOT permitted between the relevant
-two code points. The breaking rules are as follows:
-
-1. Break at the start and end of text (pretty obviously).
-
-2. Do not break between a CR and LF; otherwise, break before and   after
-   controls.
-
-3. Do not break Hangul syllable sequences, the rules for which are:
-
-    L may be followed by L, V, LV or LVT
-    LV or V may be followed by V or T
-    LVT or T may be followed by T
-
-4. Do not break before extending characters.
-
-The next two rules are only for extended grapheme clusters (but that's what we
-are implementing).
-
-5. Do not break before SpacingMarks.
-
-6. Do not break after Prepend characters.
-
-7. Otherwise, break everywhere.
-*/
-
-const pcre_uint32 PRIV(ucp_gbtable[]) = {
-   (1<<ucp_gbLF),                                           /*  0 CR */
-   0,                                                       /*  1 LF */
-   0,                                                       /*  2 Control */
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark),                /*  3 Extend */
-   (1<<ucp_gbExtend)|(1<<ucp_gbPrepend)|                    /*  4 Prepend */
-     (1<<ucp_gbSpacingMark)|(1<<ucp_gbL)|
-     (1<<ucp_gbV)|(1<<ucp_gbT)|(1<<ucp_gbLV)|
-     (1<<ucp_gbLVT)|(1<<ucp_gbOther),
-
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark),                /*  5 SpacingMark */
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbL)|   /*  6 L */
-     (1<<ucp_gbV)|(1<<ucp_gbLV)|(1<<ucp_gbLVT),
-
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbV)|   /*  7 V */
-     (1<<ucp_gbT),
-
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbT),   /*  8 T */
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbV)|   /*  9 LV */
-     (1<<ucp_gbT),
-
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbT),   /* 10 LVT */
-   (1<<ucp_gbRegionalIndicator),                            /* 11 RegionalIndicator */
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)                 /* 12 Other */
-};
-
-#ifdef SUPPORT_JIT
-/* This table reverses PRIV(ucp_gentype). We can save the cost
-of a memory load. */
-
-const int PRIV(ucp_typerange)[] = {
-  ucp_Cc, ucp_Cs,
-  ucp_Ll, ucp_Lu,
-  ucp_Mc, ucp_Mn,
-  ucp_Nd, ucp_No,
-  ucp_Pc, ucp_Ps,
-  ucp_Sc, ucp_So,
-  ucp_Zl, ucp_Zs,
-};
-#endif /* SUPPORT_JIT */
-
-/* The pcre_utt[] table below translates Unicode property names into type and
-code values. It is searched by binary chop, so must be in collating sequence of
-name. Originally, the table contained pointers to the name strings in the first
-field of each entry. However, that leads to a large number of relocations when
-a shared library is dynamically loaded. A significant reduction is made by
-putting all the names into a single, large string and then using offsets in the
-table itself. Maintenance is more error-prone, but frequent changes to this
-data are unlikely.
-
-July 2008: There is now a script called maint/GenerateUtt.py that can be used
-to generate this data automatically instead of maintaining it by hand.
-
-The script was updated in March 2009 to generate a new EBCDIC-compliant
-version. Like all other character and string literals that are compared against
-the regular expression pattern, we must use STR_ macros instead of literal
-strings to make sure that UTF-8 support works on EBCDIC platforms. */
-
-#define STRING_Any0 STR_A STR_n STR_y "\0"
-#define STRING_Arabic0 STR_A STR_r STR_a STR_b STR_i STR_c "\0"
-#define STRING_Armenian0 STR_A STR_r STR_m STR_e STR_n STR_i STR_a STR_n "\0"
-#define STRING_Avestan0 STR_A STR_v STR_e STR_s STR_t STR_a STR_n "\0"
-#define STRING_Balinese0 STR_B STR_a STR_l STR_i STR_n STR_e STR_s STR_e "\0"
-#define STRING_Bamum0 STR_B STR_a STR_m STR_u STR_m "\0"
-#define STRING_Bassa_Vah0 STR_B STR_a STR_s STR_s STR_a STR_UNDERSCORE STR_V STR_a STR_h "\0"
-#define STRING_Batak0 STR_B STR_a STR_t STR_a STR_k "\0"
-#define STRING_Bengali0 STR_B STR_e STR_n STR_g STR_a STR_l STR_i "\0"
-#define STRING_Bopomofo0 STR_B STR_o STR_p STR_o STR_m STR_o STR_f STR_o "\0"
-#define STRING_Brahmi0 STR_B STR_r STR_a STR_h STR_m STR_i "\0"
-#define STRING_Braille0 STR_B STR_r STR_a STR_i STR_l STR_l STR_e "\0"
-#define STRING_Buginese0 STR_B STR_u STR_g STR_i STR_n STR_e STR_s STR_e "\0"
-#define STRING_Buhid0 STR_B STR_u STR_h STR_i STR_d "\0"
-#define STRING_C0 STR_C "\0"
-#define STRING_Canadian_Aboriginal0 STR_C STR_a STR_n STR_a STR_d STR_i STR_a STR_n STR_UNDERSCORE STR_A STR_b STR_o STR_r STR_i STR_g STR_i STR_n STR_a STR_l "\0"
-#define STRING_Carian0 STR_C STR_a STR_r STR_i STR_a STR_n "\0"
-#define STRING_Caucasian_Albanian0 STR_C STR_a STR_u STR_c STR_a STR_s STR_i STR_a STR_n STR_UNDERSCORE STR_A STR_l STR_b STR_a STR_n STR_i STR_a STR_n "\0"
-#define STRING_Cc0 STR_C STR_c "\0"
-#define STRING_Cf0 STR_C STR_f "\0"
-#define STRING_Chakma0 STR_C STR_h STR_a STR_k STR_m STR_a "\0"
-#define STRING_Cham0 STR_C STR_h STR_a STR_m "\0"
-#define STRING_Cherokee0 STR_C STR_h STR_e STR_r STR_o STR_k STR_e STR_e "\0"
-#define STRING_Cn0 STR_C STR_n "\0"
-#define STRING_Co0 STR_C STR_o "\0"
-#define STRING_Common0 STR_C STR_o STR_m STR_m STR_o STR_n "\0"
-#define STRING_Coptic0 STR_C STR_o STR_p STR_t STR_i STR_c "\0"
-#define STRING_Cs0 STR_C STR_s "\0"
-#define STRING_Cuneiform0 STR_C STR_u STR_n STR_e STR_i STR_f STR_o STR_r STR_m "\0"
-#define STRING_Cypriot0 STR_C STR_y STR_p STR_r STR_i STR_o STR_t "\0"
-#define STRING_Cyrillic0 STR_C STR_y STR_r STR_i STR_l STR_l STR_i STR_c "\0"
-#define STRING_Deseret0 STR_D STR_e STR_s STR_e STR_r STR_e STR_t "\0"
-#define STRING_Devanagari0 STR_D STR_e STR_v STR_a STR_n STR_a STR_g STR_a STR_r STR_i "\0"
-#define STRING_Duployan0 STR_D STR_u STR_p STR_l STR_o STR_y STR_a STR_n "\0"
-#define STRING_Egyptian_Hieroglyphs0 STR_E STR_g STR_y STR_p STR_t STR_i STR_a STR_n STR_UNDERSCORE STR_H STR_i STR_e STR_r STR_o STR_g STR_l STR_y STR_p STR_h STR_s "\0"
-#define STRING_Elbasan0 STR_E STR_l STR_b STR_a STR_s STR_a STR_n "\0"
-#define STRING_Ethiopic0 STR_E STR_t STR_h STR_i STR_o STR_p STR_i STR_c "\0"
-#define STRING_Georgian0 STR_G STR_e STR_o STR_r STR_g STR_i STR_a STR_n "\0"
-#define STRING_Glagolitic0 STR_G STR_l STR_a STR_g STR_o STR_l STR_i STR_t STR_i STR_c "\0"
-#define STRING_Gothic0 STR_G STR_o STR_t STR_h STR_i STR_c "\0"
-#define STRING_Grantha0 STR_G STR_r STR_a STR_n STR_t STR_h STR_a "\0"
-#define STRING_Greek0 STR_G STR_r STR_e STR_e STR_k "\0"
-#define STRING_Gujarati0 STR_G STR_u STR_j STR_a STR_r STR_a STR_t STR_i "\0"
-#define STRING_Gurmukhi0 STR_G STR_u STR_r STR_m STR_u STR_k STR_h STR_i "\0"
-#define STRING_Han0 STR_H STR_a STR_n "\0"
-#define STRING_Hangul0 STR_H STR_a STR_n STR_g STR_u STR_l "\0"
-#define STRING_Hanunoo0 STR_H STR_a STR_n STR_u STR_n STR_o STR_o "\0"
-#define STRING_Hebrew0 STR_H STR_e STR_b STR_r STR_e STR_w "\0"
-#define STRING_Hiragana0 STR_H STR_i STR_r STR_a STR_g STR_a STR_n STR_a "\0"
-#define STRING_Imperial_Aramaic0 STR_I STR_m STR_p STR_e STR_r STR_i STR_a STR_l STR_UNDERSCORE STR_A STR_r STR_a STR_m STR_a STR_i STR_c "\0"
-#define STRING_Inherited0 STR_I STR_n STR_h STR_e STR_r STR_i STR_t STR_e STR_d "\0"
-#define STRING_Inscriptional_Pahlavi0 STR_I STR_n STR_s STR_c STR_r STR_i STR_p STR_t STR_i STR_o STR_n STR_a STR_l STR_UNDERSCORE STR_P STR_a STR_h STR_l STR_a STR_v STR_i "\0"
-#define STRING_Inscriptional_Parthian0 STR_I STR_n STR_s STR_c STR_r STR_i STR_p STR_t STR_i STR_o STR_n STR_a STR_l STR_UNDERSCORE STR_P STR_a STR_r STR_t STR_h STR_i STR_a STR_n "\0"
-#define STRING_Javanese0 STR_J STR_a STR_v STR_a STR_n STR_e STR_s STR_e "\0"
-#define STRING_Kaithi0 STR_K STR_a STR_i STR_t STR_h STR_i "\0"
-#define STRING_Kannada0 STR_K STR_a STR_n STR_n STR_a STR_d STR_a "\0"
-#define STRING_Katakana0 STR_K STR_a STR_t STR_a STR_k STR_a STR_n STR_a "\0"
-#define STRING_Kayah_Li0 STR_K STR_a STR_y STR_a STR_h STR_UNDERSCORE STR_L STR_i "\0"
-#define STRING_Kharoshthi0 STR_K STR_h STR_a STR_r STR_o STR_s STR_h STR_t STR_h STR_i "\0"
-#define STRING_Khmer0 STR_K STR_h STR_m STR_e STR_r "\0"
-#define STRING_Khojki0 STR_K STR_h STR_o STR_j STR_k STR_i "\0"
-#define STRING_Khudawadi0 STR_K STR_h STR_u STR_d STR_a STR_w STR_a STR_d STR_i "\0"
-#define STRING_L0 STR_L "\0"
-#define STRING_L_AMPERSAND0 STR_L STR_AMPERSAND "\0"
-#define STRING_Lao0 STR_L STR_a STR_o "\0"
-#define STRING_Latin0 STR_L STR_a STR_t STR_i STR_n "\0"
-#define STRING_Lepcha0 STR_L STR_e STR_p STR_c STR_h STR_a "\0"
-#define STRING_Limbu0 STR_L STR_i STR_m STR_b STR_u "\0"
-#define STRING_Linear_A0 STR_L STR_i STR_n STR_e STR_a STR_r STR_UNDERSCORE STR_A "\0"
-#define STRING_Linear_B0 STR_L STR_i STR_n STR_e STR_a STR_r STR_UNDERSCORE STR_B "\0"
-#define STRING_Lisu0 STR_L STR_i STR_s STR_u "\0"
-#define STRING_Ll0 STR_L STR_l "\0"
-#define STRING_Lm0 STR_L STR_m "\0"
-#define STRING_Lo0 STR_L STR_o "\0"
-#define STRING_Lt0 STR_L STR_t "\0"
-#define STRING_Lu0 STR_L STR_u "\0"
-#define STRING_Lycian0 STR_L STR_y STR_c STR_i STR_a STR_n "\0"
-#define STRING_Lydian0 STR_L STR_y STR_d STR_i STR_a STR_n "\0"
-#define STRING_M0 STR_M "\0"
-#define STRING_Mahajani0 STR_M STR_a STR_h STR_a STR_j STR_a STR_n STR_i "\0"
-#define STRING_Malayalam0 STR_M STR_a STR_l STR_a STR_y STR_a STR_l STR_a STR_m "\0"
-#define STRING_Mandaic0 STR_M STR_a STR_n STR_d STR_a STR_i STR_c "\0"
-#define STRING_Manichaean0 STR_M STR_a STR_n STR_i STR_c STR_h STR_a STR_e STR_a STR_n "\0"
-#define STRING_Mc0 STR_M STR_c "\0"
-#define STRING_Me0 STR_M STR_e "\0"
-#define STRING_Meetei_Mayek0 STR_M STR_e STR_e STR_t STR_e STR_i STR_UNDERSCORE STR_M STR_a STR_y STR_e STR_k "\0"
-#define STRING_Mende_Kikakui0 STR_M STR_e STR_n STR_d STR_e STR_UNDERSCORE STR_K STR_i STR_k STR_a STR_k STR_u STR_i "\0"
-#define STRING_Meroitic_Cursive0 STR_M STR_e STR_r STR_o STR_i STR_t STR_i STR_c STR_UNDERSCORE STR_C STR_u STR_r STR_s STR_i STR_v STR_e "\0"
-#define STRING_Meroitic_Hieroglyphs0 STR_M STR_e STR_r STR_o STR_i STR_t STR_i STR_c STR_UNDERSCORE STR_H STR_i STR_e STR_r STR_o STR_g STR_l STR_y STR_p STR_h STR_s "\0"
-#define STRING_Miao0 STR_M STR_i STR_a STR_o "\0"
-#define STRING_Mn0 STR_M STR_n "\0"
-#define STRING_Modi0 STR_M STR_o STR_d STR_i "\0"
-#define STRING_Mongolian0 STR_M STR_o STR_n STR_g STR_o STR_l STR_i STR_a STR_n "\0"
-#define STRING_Mro0 STR_M STR_r STR_o "\0"
-#define STRING_Myanmar0 STR_M STR_y STR_a STR_n STR_m STR_a STR_r "\0"
-#define STRING_N0 STR_N "\0"
-#define STRING_Nabataean0 STR_N STR_a STR_b STR_a STR_t STR_a STR_e STR_a STR_n "\0"
-#define STRING_Nd0 STR_N STR_d "\0"
-#define STRING_New_Tai_Lue0 STR_N STR_e STR_w STR_UNDERSCORE STR_T STR_a STR_i STR_UNDERSCORE STR_L STR_u STR_e "\0"
-#define STRING_Nko0 STR_N STR_k STR_o "\0"
-#define STRING_Nl0 STR_N STR_l "\0"
-#define STRING_No0 STR_N STR_o "\0"
-#define STRING_Ogham0 STR_O STR_g STR_h STR_a STR_m "\0"
-#define STRING_Ol_Chiki0 STR_O STR_l STR_UNDERSCORE STR_C STR_h STR_i STR_k STR_i "\0"
-#define STRING_Old_Italic0 STR_O STR_l STR_d STR_UNDERSCORE STR_I STR_t STR_a STR_l STR_i STR_c "\0"
-#define STRING_Old_North_Arabian0 STR_O STR_l STR_d STR_UNDERSCORE STR_N STR_o STR_r STR_t STR_h STR_UNDERSCORE STR_A STR_r STR_a STR_b STR_i STR_a STR_n "\0"
-#define STRING_Old_Permic0 STR_O STR_l STR_d STR_UNDERSCORE STR_P STR_e STR_r STR_m STR_i STR_c "\0"
-#define STRING_Old_Persian0 STR_O STR_l STR_d STR_UNDERSCORE STR_P STR_e STR_r STR_s STR_i STR_a STR_n "\0"
-#define STRING_Old_South_Arabian0 STR_O STR_l STR_d STR_UNDERSCORE STR_S STR_o STR_u STR_t STR_h STR_UNDERSCORE STR_A STR_r STR_a STR_b STR_i STR_a STR_n "\0"
-#define STRING_Old_Turkic0 STR_O STR_l STR_d STR_UNDERSCORE STR_T STR_u STR_r STR_k STR_i STR_c "\0"
-#define STRING_Oriya0 STR_O STR_r STR_i STR_y STR_a "\0"
-#define STRING_Osmanya0 STR_O STR_s STR_m STR_a STR_n STR_y STR_a "\0"
-#define STRING_P0 STR_P "\0"
-#define STRING_Pahawh_Hmong0 STR_P STR_a STR_h STR_a STR_w STR_h STR_UNDERSCORE STR_H STR_m STR_o STR_n STR_g "\0"
-#define STRING_Palmyrene0 STR_P STR_a STR_l STR_m STR_y STR_r STR_e STR_n STR_e "\0"
-#define STRING_Pau_Cin_Hau0 STR_P STR_a STR_u STR_UNDERSCORE STR_C STR_i STR_n STR_UNDERSCORE STR_H STR_a STR_u "\0"
-#define STRING_Pc0 STR_P STR_c "\0"
-#define STRING_Pd0 STR_P STR_d "\0"
-#define STRING_Pe0 STR_P STR_e "\0"
-#define STRING_Pf0 STR_P STR_f "\0"
-#define STRING_Phags_Pa0 STR_P STR_h STR_a STR_g STR_s STR_UNDERSCORE STR_P STR_a "\0"
-#define STRING_Phoenician0 STR_P STR_h STR_o STR_e STR_n STR_i STR_c STR_i STR_a STR_n "\0"
-#define STRING_Pi0 STR_P STR_i "\0"
-#define STRING_Po0 STR_P STR_o "\0"
-#define STRING_Ps0 STR_P STR_s "\0"
-#define STRING_Psalter_Pahlavi0 STR_P STR_s STR_a STR_l STR_t STR_e STR_r STR_UNDERSCORE STR_P STR_a STR_h STR_l STR_a STR_v STR_i "\0"
-#define STRING_Rejang0 STR_R STR_e STR_j STR_a STR_n STR_g "\0"
-#define STRING_Runic0 STR_R STR_u STR_n STR_i STR_c "\0"
-#define STRING_S0 STR_S "\0"
-#define STRING_Samaritan0 STR_S STR_a STR_m STR_a STR_r STR_i STR_t STR_a STR_n "\0"
-#define STRING_Saurashtra0 STR_S STR_a STR_u STR_r STR_a STR_s STR_h STR_t STR_r STR_a "\0"
-#define STRING_Sc0 STR_S STR_c "\0"
-#define STRING_Sharada0 STR_S STR_h STR_a STR_r STR_a STR_d STR_a "\0"
-#define STRING_Shavian0 STR_S STR_h STR_a STR_v STR_i STR_a STR_n "\0"
-#define STRING_Siddham0 STR_S STR_i STR_d STR_d STR_h STR_a STR_m "\0"
-#define STRING_Sinhala0 STR_S STR_i STR_n STR_h STR_a STR_l STR_a "\0"
-#define STRING_Sk0 STR_S STR_k "\0"
-#define STRING_Sm0 STR_S STR_m "\0"
-#define STRING_So0 STR_S STR_o "\0"
-#define STRING_Sora_Sompeng0 STR_S STR_o STR_r STR_a STR_UNDERSCORE STR_S STR_o STR_m STR_p STR_e STR_n STR_g "\0"
-#define STRING_Sundanese0 STR_S STR_u STR_n STR_d STR_a STR_n STR_e STR_s STR_e "\0"
-#define STRING_Syloti_Nagri0 STR_S STR_y STR_l STR_o STR_t STR_i STR_UNDERSCORE STR_N STR_a STR_g STR_r STR_i "\0"
-#define STRING_Syriac0 STR_S STR_y STR_r STR_i STR_a STR_c "\0"
-#define STRING_Tagalog0 STR_T STR_a STR_g STR_a STR_l STR_o STR_g "\0"
-#define STRING_Tagbanwa0 STR_T STR_a STR_g STR_b STR_a STR_n STR_w STR_a "\0"
-#define STRING_Tai_Le0 STR_T STR_a STR_i STR_UNDERSCORE STR_L STR_e "\0"
-#define STRING_Tai_Tham0 STR_T STR_a STR_i STR_UNDERSCORE STR_T STR_h STR_a STR_m "\0"
-#define STRING_Tai_Viet0 STR_T STR_a STR_i STR_UNDERSCORE STR_V STR_i STR_e STR_t "\0"
-#define STRING_Takri0 STR_T STR_a STR_k STR_r STR_i "\0"
-#define STRING_Tamil0 STR_T STR_a STR_m STR_i STR_l "\0"
-#define STRING_Telugu0 STR_T STR_e STR_l STR_u STR_g STR_u "\0"
-#define STRING_Thaana0 STR_T STR_h STR_a STR_a STR_n STR_a "\0"
-#define STRING_Thai0 STR_T STR_h STR_a STR_i "\0"
-#define STRING_Tibetan0 STR_T STR_i STR_b STR_e STR_t STR_a STR_n "\0"
-#define STRING_Tifinagh0 STR_T STR_i STR_f STR_i STR_n STR_a STR_g STR_h "\0"
-#define STRING_Tirhuta0 STR_T STR_i STR_r STR_h STR_u STR_t STR_a "\0"
-#define STRING_Ugaritic0 STR_U STR_g STR_a STR_r STR_i STR_t STR_i STR_c "\0"
-#define STRING_Vai0 STR_V STR_a STR_i "\0"
-#define STRING_Warang_Citi0 STR_W STR_a STR_r STR_a STR_n STR_g STR_UNDERSCORE STR_C STR_i STR_t STR_i "\0"
-#define STRING_Xan0 STR_X STR_a STR_n "\0"
-#define STRING_Xps0 STR_X STR_p STR_s "\0"
-#define STRING_Xsp0 STR_X STR_s STR_p "\0"
-#define STRING_Xuc0 STR_X STR_u STR_c "\0"
-#define STRING_Xwd0 STR_X STR_w STR_d "\0"
-#define STRING_Yi0 STR_Y STR_i "\0"
-#define STRING_Z0 STR_Z "\0"
-#define STRING_Zl0 STR_Z STR_l "\0"
-#define STRING_Zp0 STR_Z STR_p "\0"
-#define STRING_Zs0 STR_Z STR_s "\0"
-
-const char PRIV(utt_names)[] =
-  STRING_Any0
-  STRING_Arabic0
-  STRING_Armenian0
-  STRING_Avestan0
-  STRING_Balinese0
-  STRING_Bamum0
-  STRING_Bassa_Vah0
-  STRING_Batak0
-  STRING_Bengali0
-  STRING_Bopomofo0
-  STRING_Brahmi0
-  STRING_Braille0
-  STRING_Buginese0
-  STRING_Buhid0
-  STRING_C0
-  STRING_Canadian_Aboriginal0
-  STRING_Carian0
-  STRING_Caucasian_Albanian0
-  STRING_Cc0
-  STRING_Cf0
-  STRING_Chakma0
-  STRING_Cham0
-  STRING_Cherokee0
-  STRING_Cn0
-  STRING_Co0
-  STRING_Common0
-  STRING_Coptic0
-  STRING_Cs0
-  STRING_Cuneiform0
-  STRING_Cypriot0
-  STRING_Cyrillic0
-  STRING_Deseret0
-  STRING_Devanagari0
-  STRING_Duployan0
-  STRING_Egyptian_Hieroglyphs0
-  STRING_Elbasan0
-  STRING_Ethiopic0
-  STRING_Georgian0
-  STRING_Glagolitic0
-  STRING_Gothic0
-  STRING_Grantha0
-  STRING_Greek0
-  STRING_Gujarati0
-  STRING_Gurmukhi0
-  STRING_Han0
-  STRING_Hangul0
-  STRING_Hanunoo0
-  STRING_Hebrew0
-  STRING_Hiragana0
-  STRING_Imperial_Aramaic0
-  STRING_Inherited0
-  STRING_Inscriptional_Pahlavi0
-  STRING_Inscriptional_Parthian0
-  STRING_Javanese0
-  STRING_Kaithi0
-  STRING_Kannada0
-  STRING_Katakana0
-  STRING_Kayah_Li0
-  STRING_Kharoshthi0
-  STRING_Khmer0
-  STRING_Khojki0
-  STRING_Khudawadi0
-  STRING_L0
-  STRING_L_AMPERSAND0
-  STRING_Lao0
-  STRING_Latin0
-  STRING_Lepcha0
-  STRING_Limbu0
-  STRING_Linear_A0
-  STRING_Linear_B0
-  STRING_Lisu0
-  STRING_Ll0
-  STRING_Lm0
-  STRING_Lo0
-  STRING_Lt0
-  STRING_Lu0
-  STRING_Lycian0
-  STRING_Lydian0
-  STRING_M0
-  STRING_Mahajani0
-  STRING_Malayalam0
-  STRING_Mandaic0
-  STRING_Manichaean0
-  STRING_Mc0
-  STRING_Me0
-  STRING_Meetei_Mayek0
-  STRING_Mende_Kikakui0
-  STRING_Meroitic_Cursive0
-  STRING_Meroitic_Hieroglyphs0
-  STRING_Miao0
-  STRING_Mn0
-  STRING_Modi0
-  STRING_Mongolian0
-  STRING_Mro0
-  STRING_Myanmar0
-  STRING_N0
-  STRING_Nabataean0
-  STRING_Nd0
-  STRING_New_Tai_Lue0
-  STRING_Nko0
-  STRING_Nl0
-  STRING_No0
-  STRING_Ogham0
-  STRING_Ol_Chiki0
-  STRING_Old_Italic0
-  STRING_Old_North_Arabian0
-  STRING_Old_Permic0
-  STRING_Old_Persian0
-  STRING_Old_South_Arabian0
-  STRING_Old_Turkic0
-  STRING_Oriya0
-  STRING_Osmanya0
-  STRING_P0
-  STRING_Pahawh_Hmong0
-  STRING_Palmyrene0
-  STRING_Pau_Cin_Hau0
-  STRING_Pc0
-  STRING_Pd0
-  STRING_Pe0
-  STRING_Pf0
-  STRING_Phags_Pa0
-  STRING_Phoenician0
-  STRING_Pi0
-  STRING_Po0
-  STRING_Ps0
-  STRING_Psalter_Pahlavi0
-  STRING_Rejang0
-  STRING_Runic0
-  STRING_S0
-  STRING_Samaritan0
-  STRING_Saurashtra0
-  STRING_Sc0
-  STRING_Sharada0
-  STRING_Shavian0
-  STRING_Siddham0
-  STRING_Sinhala0
-  STRING_Sk0
-  STRING_Sm0
-  STRING_So0
-  STRING_Sora_Sompeng0
-  STRING_Sundanese0
-  STRING_Syloti_Nagri0
-  STRING_Syriac0
-  STRING_Tagalog0
-  STRING_Tagbanwa0
-  STRING_Tai_Le0
-  STRING_Tai_Tham0
-  STRING_Tai_Viet0
-  STRING_Takri0
-  STRING_Tamil0
-  STRING_Telugu0
-  STRING_Thaana0
-  STRING_Thai0
-  STRING_Tibetan0
-  STRING_Tifinagh0
-  STRING_Tirhuta0
-  STRING_Ugaritic0
-  STRING_Vai0
-  STRING_Warang_Citi0
-  STRING_Xan0
-  STRING_Xps0
-  STRING_Xsp0
-  STRING_Xuc0
-  STRING_Xwd0
-  STRING_Yi0
-  STRING_Z0
-  STRING_Zl0
-  STRING_Zp0
-  STRING_Zs0;
-
-const ucp_type_table PRIV(utt)[] = {
-  {   0, PT_ANY, 0 },
-  {   4, PT_SC, ucp_Arabic },
-  {  11, PT_SC, ucp_Armenian },
-  {  20, PT_SC, ucp_Avestan },
-  {  28, PT_SC, ucp_Balinese },
-  {  37, PT_SC, ucp_Bamum },
-  {  43, PT_SC, ucp_Bassa_Vah },
-  {  53, PT_SC, ucp_Batak },
-  {  59, PT_SC, ucp_Bengali },
-  {  67, PT_SC, ucp_Bopomofo },
-  {  76, PT_SC, ucp_Brahmi },
-  {  83, PT_SC, ucp_Braille },
-  {  91, PT_SC, ucp_Buginese },
-  { 100, PT_SC, ucp_Buhid },
-  { 106, PT_GC, ucp_C },
-  { 108, PT_SC, ucp_Canadian_Aboriginal },
-  { 128, PT_SC, ucp_Carian },
-  { 135, PT_SC, ucp_Caucasian_Albanian },
-  { 154, PT_PC, ucp_Cc },
-  { 157, PT_PC, ucp_Cf },
-  { 160, PT_SC, ucp_Chakma },
-  { 167, PT_SC, ucp_Cham },
-  { 172, PT_SC, ucp_Cherokee },
-  { 181, PT_PC, ucp_Cn },
-  { 184, PT_PC, ucp_Co },
-  { 187, PT_SC, ucp_Common },
-  { 194, PT_SC, ucp_Coptic },
-  { 201, PT_PC, ucp_Cs },
-  { 204, PT_SC, ucp_Cuneiform },
-  { 214, PT_SC, ucp_Cypriot },
-  { 222, PT_SC, ucp_Cyrillic },
-  { 231, PT_SC, ucp_Deseret },
-  { 239, PT_SC, ucp_Devanagari },
-  { 250, PT_SC, ucp_Duployan },
-  { 259, PT_SC, ucp_Egyptian_Hieroglyphs },
-  { 280, PT_SC, ucp_Elbasan },
-  { 288, PT_SC, ucp_Ethiopic },
-  { 297, PT_SC, ucp_Georgian },
-  { 306, PT_SC, ucp_Glagolitic },
-  { 317, PT_SC, ucp_Gothic },
-  { 324, PT_SC, ucp_Grantha },
-  { 332, PT_SC, ucp_Greek },
-  { 338, PT_SC, ucp_Gujarati },
-  { 347, PT_SC, ucp_Gurmukhi },
-  { 356, PT_SC, ucp_Han },
-  { 360, PT_SC, ucp_Hangul },
-  { 367, PT_SC, ucp_Hanunoo },
-  { 375, PT_SC, ucp_Hebrew },
-  { 382, PT_SC, ucp_Hiragana },
-  { 391, PT_SC, ucp_Imperial_Aramaic },
-  { 408, PT_SC, ucp_Inherited },
-  { 418, PT_SC, ucp_Inscriptional_Pahlavi },
-  { 440, PT_SC, ucp_Inscriptional_Parthian },
-  { 463, PT_SC, ucp_Javanese },
-  { 472, PT_SC, ucp_Kaithi },
-  { 479, PT_SC, ucp_Kannada },
-  { 487, PT_SC, ucp_Katakana },
-  { 496, PT_SC, ucp_Kayah_Li },
-  { 505, PT_SC, ucp_Kharoshthi },
-  { 516, PT_SC, ucp_Khmer },
-  { 522, PT_SC, ucp_Khojki },
-  { 529, PT_SC, ucp_Khudawadi },
-  { 539, PT_GC, ucp_L },
-  { 541, PT_LAMP, 0 },
-  { 544, PT_SC, ucp_Lao },
-  { 548, PT_SC, ucp_Latin },
-  { 554, PT_SC, ucp_Lepcha },
-  { 561, PT_SC, ucp_Limbu },
-  { 567, PT_SC, ucp_Linear_A },
-  { 576, PT_SC, ucp_Linear_B },
-  { 585, PT_SC, ucp_Lisu },
-  { 590, PT_PC, ucp_Ll },
-  { 593, PT_PC, ucp_Lm },
-  { 596, PT_PC, ucp_Lo },
-  { 599, PT_PC, ucp_Lt },
-  { 602, PT_PC, ucp_Lu },
-  { 605, PT_SC, ucp_Lycian },
-  { 612, PT_SC, ucp_Lydian },
-  { 619, PT_GC, ucp_M },
-  { 621, PT_SC, ucp_Mahajani },
-  { 630, PT_SC, ucp_Malayalam },
-  { 640, PT_SC, ucp_Mandaic },
-  { 648, PT_SC, ucp_Manichaean },
-  { 659, PT_PC, ucp_Mc },
-  { 662, PT_PC, ucp_Me },
-  { 665, PT_SC, ucp_Meetei_Mayek },
-  { 678, PT_SC, ucp_Mende_Kikakui },
-  { 692, PT_SC, ucp_Meroitic_Cursive },
-  { 709, PT_SC, ucp_Meroitic_Hieroglyphs },
-  { 730, PT_SC, ucp_Miao },
-  { 735, PT_PC, ucp_Mn },
-  { 738, PT_SC, ucp_Modi },
-  { 743, PT_SC, ucp_Mongolian },
-  { 753, PT_SC, ucp_Mro },
-  { 757, PT_SC, ucp_Myanmar },
-  { 765, PT_GC, ucp_N },
-  { 767, PT_SC, ucp_Nabataean },
-  { 777, PT_PC, ucp_Nd },
-  { 780, PT_SC, ucp_New_Tai_Lue },
-  { 792, PT_SC, ucp_Nko },
-  { 796, PT_PC, ucp_Nl },
-  { 799, PT_PC, ucp_No },
-  { 802, PT_SC, ucp_Ogham },
-  { 808, PT_SC, ucp_Ol_Chiki },
-  { 817, PT_SC, ucp_Old_Italic },
-  { 828, PT_SC, ucp_Old_North_Arabian },
-  { 846, PT_SC, ucp_Old_Permic },
-  { 857, PT_SC, ucp_Old_Persian },
-  { 869, PT_SC, ucp_Old_South_Arabian },
-  { 887, PT_SC, ucp_Old_Turkic },
-  { 898, PT_SC, ucp_Oriya },
-  { 904, PT_SC, ucp_Osmanya },
-  { 912, PT_GC, ucp_P },
-  { 914, PT_SC, ucp_Pahawh_Hmong },
-  { 927, PT_SC, ucp_Palmyrene },
-  { 937, PT_SC, ucp_Pau_Cin_Hau },
-  { 949, PT_PC, ucp_Pc },
-  { 952, PT_PC, ucp_Pd },
-  { 955, PT_PC, ucp_Pe },
-  { 958, PT_PC, ucp_Pf },
-  { 961, PT_SC, ucp_Phags_Pa },
-  { 970, PT_SC, ucp_Phoenician },
-  { 981, PT_PC, ucp_Pi },
-  { 984, PT_PC, ucp_Po },
-  { 987, PT_PC, ucp_Ps },
-  { 990, PT_SC, ucp_Psalter_Pahlavi },
-  { 1006, PT_SC, ucp_Rejang },
-  { 1013, PT_SC, ucp_Runic },
-  { 1019, PT_GC, ucp_S },
-  { 1021, PT_SC, ucp_Samaritan },
-  { 1031, PT_SC, ucp_Saurashtra },
-  { 1042, PT_PC, ucp_Sc },
-  { 1045, PT_SC, ucp_Sharada },
-  { 1053, PT_SC, ucp_Shavian },
-  { 1061, PT_SC, ucp_Siddham },
-  { 1069, PT_SC, ucp_Sinhala },
-  { 1077, PT_PC, ucp_Sk },
-  { 1080, PT_PC, ucp_Sm },
-  { 1083, PT_PC, ucp_So },
-  { 1086, PT_SC, ucp_Sora_Sompeng },
-  { 1099, PT_SC, ucp_Sundanese },
-  { 1109, PT_SC, ucp_Syloti_Nagri },
-  { 1122, PT_SC, ucp_Syriac },
-  { 1129, PT_SC, ucp_Tagalog },
-  { 1137, PT_SC, ucp_Tagbanwa },
-  { 1146, PT_SC, ucp_Tai_Le },
-  { 1153, PT_SC, ucp_Tai_Tham },
-  { 1162, PT_SC, ucp_Tai_Viet },
-  { 1171, PT_SC, ucp_Takri },
-  { 1177, PT_SC, ucp_Tamil },
-  { 1183, PT_SC, ucp_Telugu },
-  { 1190, PT_SC, ucp_Thaana },
-  { 1197, PT_SC, ucp_Thai },
-  { 1202, PT_SC, ucp_Tibetan },
-  { 1210, PT_SC, ucp_Tifinagh },
-  { 1219, PT_SC, ucp_Tirhuta },
-  { 1227, PT_SC, ucp_Ugaritic },
-  { 1236, PT_SC, ucp_Vai },
-  { 1240, PT_SC, ucp_Warang_Citi },
-  { 1252, PT_ALNUM, 0 },
-  { 1256, PT_PXSPACE, 0 },
-  { 1260, PT_SPACE, 0 },
-  { 1264, PT_UCNC, 0 },
-  { 1268, PT_WORD, 0 },
-  { 1272, PT_SC, ucp_Yi },
-  { 1275, PT_GC, ucp_Z },
-  { 1277, PT_PC, ucp_Zl },
-  { 1280, PT_PC, ucp_Zp },
-  { 1283, PT_PC, ucp_Zs }
-};
-
-const int PRIV(utt_size) = sizeof(PRIV(utt)) / sizeof(ucp_type_table);
-
-#endif /* SUPPORT_UTF */
-
-/* End of pcre_tables.c */
diff --git a/Foundation/src/pcre_ucd.c b/Foundation/src/pcre_ucd.c
deleted file mode 100644
index c7e8aab48..000000000
--- a/Foundation/src/pcre_ucd.c
+++ /dev/null
@@ -1,3641 +0,0 @@
-/* This module is generated by the maint/MultiStage2.py script.
-Do not modify it by hand. Instead modify the script and run it
-to regenerate this code.
-
-As well as being part of the PCRE library, this module is #included
-by the pcretest program, which redefines the PRIV macro to change
-table names from _pcre_xxx to xxxx, thereby avoiding name clashes
-with the library. At present, just one of these tables is actually
-needed. */
-
-#ifndef PCRE_INCLUDED
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-#endif /* PCRE_INCLUDED */
-
-/* Unicode character database. */
-/* This file was autogenerated by the MultiStage2.py script. */
-/* Total size: 72576 bytes, block size: 128. */
-
-/* The tables herein are needed only when UCP support is built
-into PCRE. This module should not be referenced otherwise, so
-it should not matter whether it is compiled or not. However
-a comment was received about space saving - maybe the guy linked
-all the modules rather than using a library - so we include a
-condition to cut out the tables when not needed. But don't leave
-a totally empty module because some compilers barf at that.
-Instead, just supply small dummy tables. */
-
-#ifndef SUPPORT_UCP
-const ucd_record PRIV(ucd_records)[] = {{0,0,0,0,0 }};
-const pcre_uint8 PRIV(ucd_stage1)[] = {0};
-const pcre_uint16 PRIV(ucd_stage2)[] = {0};
-const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0};
-#else
-
-/* If the 32-bit library is run in non-32-bit mode, character values
-greater than 0x10ffff may be encountered. For these we set up a
-special record. */
-
-#ifdef COMPILE_PCRE32
-const ucd_record PRIV(dummy_ucd_record)[] = {{
-  ucp_Common,    /* script */
-  ucp_Cn,        /* type unassigned */
-  ucp_gbOther,   /* grapheme break property */
-  0,             /* case set */
-  0,             /* other case */
-  }};
-#endif
-
-/* When recompiling tables with a new Unicode version, please check the
-types in this structure definition from pcre_internal.h (the actual
-field names will be different):
-
-typedef struct {
-pcre_uint8 property_0;
-pcre_uint8 property_1;
-pcre_uint8 property_2;
-pcre_uint8 property_3;
-pcre_int32 property_4;
-} ucd_record;
-*/
-
-
-const pcre_uint32 PRIV(ucd_caseless_sets)[] = {
-  NOTACHAR,
-  0x0053,   0x0073,   0x017f,   NOTACHAR,
-  0x01c4,   0x01c5,   0x01c6,   NOTACHAR,
-  0x01c7,   0x01c8,   0x01c9,   NOTACHAR,
-  0x01ca,   0x01cb,   0x01cc,   NOTACHAR,
-  0x01f1,   0x01f2,   0x01f3,   NOTACHAR,
-  0x0345,   0x0399,   0x03b9,   0x1fbe,   NOTACHAR,
-  0x00b5,   0x039c,   0x03bc,   NOTACHAR,
-  0x03a3,   0x03c2,   0x03c3,   NOTACHAR,
-  0x0392,   0x03b2,   0x03d0,   NOTACHAR,
-  0x0398,   0x03b8,   0x03d1,   0x03f4,   NOTACHAR,
-  0x03a6,   0x03c6,   0x03d5,   NOTACHAR,
-  0x03a0,   0x03c0,   0x03d6,   NOTACHAR,
-  0x039a,   0x03ba,   0x03f0,   NOTACHAR,
-  0x03a1,   0x03c1,   0x03f1,   NOTACHAR,
-  0x0395,   0x03b5,   0x03f5,   NOTACHAR,
-  0x1e60,   0x1e61,   0x1e9b,   NOTACHAR,
-  0x03a9,   0x03c9,   0x2126,   NOTACHAR,
-  0x004b,   0x006b,   0x212a,   NOTACHAR,
-  0x00c5,   0x00e5,   0x212b,   NOTACHAR,
-};
-
-/* When #included in pcretest, we don't need this large table. */
-
-#ifndef PCRE_INCLUDED
-
-const ucd_record PRIV(ucd_records)[] = { /* 5760 bytes, record size 8 */
-  {     9,      0,      2,      0,      0, }, /*   0 */
-  {     9,      0,      1,      0,      0, }, /*   1 */
-  {     9,      0,      0,      0,      0, }, /*   2 */
-  {     9,     29,     12,      0,      0, }, /*   3 */
-  {     9,     21,     12,      0,      0, }, /*   4 */
-  {     9,     23,     12,      0,      0, }, /*   5 */
-  {     9,     22,     12,      0,      0, }, /*   6 */
-  {     9,     18,     12,      0,      0, }, /*   7 */
-  {     9,     25,     12,      0,      0, }, /*   8 */
-  {     9,     17,     12,      0,      0, }, /*   9 */
-  {     9,     13,     12,      0,      0, }, /*  10 */
-  {    33,      9,     12,      0,     32, }, /*  11 */
-  {    33,      9,     12,     71,     32, }, /*  12 */
-  {    33,      9,     12,      1,     32, }, /*  13 */
-  {     9,     24,     12,      0,      0, }, /*  14 */
-  {     9,     16,     12,      0,      0, }, /*  15 */
-  {    33,      5,     12,      0,    -32, }, /*  16 */
-  {    33,      5,     12,     71,    -32, }, /*  17 */
-  {    33,      5,     12,      1,    -32, }, /*  18 */
-  {     9,     26,     12,      0,      0, }, /*  19 */
-  {    33,      7,     12,      0,      0, }, /*  20 */
-  {     9,     20,     12,      0,      0, }, /*  21 */
-  {     9,      1,      2,      0,      0, }, /*  22 */
-  {     9,     15,     12,      0,      0, }, /*  23 */
-  {     9,      5,     12,     26,    775, }, /*  24 */
-  {     9,     19,     12,      0,      0, }, /*  25 */
-  {    33,      9,     12,     75,     32, }, /*  26 */
-  {    33,      5,     12,      0,   7615, }, /*  27 */
-  {    33,      5,     12,     75,    -32, }, /*  28 */
-  {    33,      5,     12,      0,    121, }, /*  29 */
-  {    33,      9,     12,      0,      1, }, /*  30 */
-  {    33,      5,     12,      0,     -1, }, /*  31 */
-  {    33,      9,     12,      0,      0, }, /*  32 */
-  {    33,      5,     12,      0,      0, }, /*  33 */
-  {    33,      9,     12,      0,   -121, }, /*  34 */
-  {    33,      5,     12,      1,   -268, }, /*  35 */
-  {    33,      5,     12,      0,    195, }, /*  36 */
-  {    33,      9,     12,      0,    210, }, /*  37 */
-  {    33,      9,     12,      0,    206, }, /*  38 */
-  {    33,      9,     12,      0,    205, }, /*  39 */
-  {    33,      9,     12,      0,     79, }, /*  40 */
-  {    33,      9,     12,      0,    202, }, /*  41 */
-  {    33,      9,     12,      0,    203, }, /*  42 */
-  {    33,      9,     12,      0,    207, }, /*  43 */
-  {    33,      5,     12,      0,     97, }, /*  44 */
-  {    33,      9,     12,      0,    211, }, /*  45 */
-  {    33,      9,     12,      0,    209, }, /*  46 */
-  {    33,      5,     12,      0,    163, }, /*  47 */
-  {    33,      9,     12,      0,    213, }, /*  48 */
-  {    33,      5,     12,      0,    130, }, /*  49 */
-  {    33,      9,     12,      0,    214, }, /*  50 */
-  {    33,      9,     12,      0,    218, }, /*  51 */
-  {    33,      9,     12,      0,    217, }, /*  52 */
-  {    33,      9,     12,      0,    219, }, /*  53 */
-  {    33,      5,     12,      0,     56, }, /*  54 */
-  {    33,      9,     12,      5,      2, }, /*  55 */
-  {    33,      8,     12,      5,      1, }, /*  56 */
-  {    33,      5,     12,      5,     -2, }, /*  57 */
-  {    33,      9,     12,      9,      2, }, /*  58 */
-  {    33,      8,     12,      9,      1, }, /*  59 */
-  {    33,      5,     12,      9,     -2, }, /*  60 */
-  {    33,      9,     12,     13,      2, }, /*  61 */
-  {    33,      8,     12,     13,      1, }, /*  62 */
-  {    33,      5,     12,     13,     -2, }, /*  63 */
-  {    33,      5,     12,      0,    -79, }, /*  64 */
-  {    33,      9,     12,     17,      2, }, /*  65 */
-  {    33,      8,     12,     17,      1, }, /*  66 */
-  {    33,      5,     12,     17,     -2, }, /*  67 */
-  {    33,      9,     12,      0,    -97, }, /*  68 */
-  {    33,      9,     12,      0,    -56, }, /*  69 */
-  {    33,      9,     12,      0,   -130, }, /*  70 */
-  {    33,      9,     12,      0,  10795, }, /*  71 */
-  {    33,      9,     12,      0,   -163, }, /*  72 */
-  {    33,      9,     12,      0,  10792, }, /*  73 */
-  {    33,      5,     12,      0,  10815, }, /*  74 */
-  {    33,      9,     12,      0,   -195, }, /*  75 */
-  {    33,      9,     12,      0,     69, }, /*  76 */
-  {    33,      9,     12,      0,     71, }, /*  77 */
-  {    33,      5,     12,      0,  10783, }, /*  78 */
-  {    33,      5,     12,      0,  10780, }, /*  79 */
-  {    33,      5,     12,      0,  10782, }, /*  80 */
-  {    33,      5,     12,      0,   -210, }, /*  81 */
-  {    33,      5,     12,      0,   -206, }, /*  82 */
-  {    33,      5,     12,      0,   -205, }, /*  83 */
-  {    33,      5,     12,      0,   -202, }, /*  84 */
-  {    33,      5,     12,      0,   -203, }, /*  85 */
-  {    33,      5,     12,      0,  42319, }, /*  86 */
-  {    33,      5,     12,      0,  42315, }, /*  87 */
-  {    33,      5,     12,      0,   -207, }, /*  88 */
-  {    33,      5,     12,      0,  42280, }, /*  89 */
-  {    33,      5,     12,      0,  42308, }, /*  90 */
-  {    33,      5,     12,      0,   -209, }, /*  91 */
-  {    33,      5,     12,      0,   -211, }, /*  92 */
-  {    33,      5,     12,      0,  10743, }, /*  93 */
-  {    33,      5,     12,      0,  42305, }, /*  94 */
-  {    33,      5,     12,      0,  10749, }, /*  95 */
-  {    33,      5,     12,      0,   -213, }, /*  96 */
-  {    33,      5,     12,      0,   -214, }, /*  97 */
-  {    33,      5,     12,      0,  10727, }, /*  98 */
-  {    33,      5,     12,      0,   -218, }, /*  99 */
-  {    33,      5,     12,      0,  42282, }, /* 100 */
-  {    33,      5,     12,      0,    -69, }, /* 101 */
-  {    33,      5,     12,      0,   -217, }, /* 102 */
-  {    33,      5,     12,      0,    -71, }, /* 103 */
-  {    33,      5,     12,      0,   -219, }, /* 104 */
-  {    33,      5,     12,      0,  42258, }, /* 105 */
-  {    33,      6,     12,      0,      0, }, /* 106 */
-  {     9,      6,     12,      0,      0, }, /* 107 */
-  {     3,     24,     12,      0,      0, }, /* 108 */
-  {    27,     12,      3,      0,      0, }, /* 109 */
-  {    27,     12,      3,     21,    116, }, /* 110 */
-  {    19,      9,     12,      0,      1, }, /* 111 */
-  {    19,      5,     12,      0,     -1, }, /* 112 */
-  {    19,     24,     12,      0,      0, }, /* 113 */
-  {     9,      2,     12,      0,      0, }, /* 114 */
-  {    19,      6,     12,      0,      0, }, /* 115 */
-  {    19,      5,     12,      0,    130, }, /* 116 */
-  {    19,      9,     12,      0,    116, }, /* 117 */
-  {    19,      9,     12,      0,     38, }, /* 118 */
-  {    19,      9,     12,      0,     37, }, /* 119 */
-  {    19,      9,     12,      0,     64, }, /* 120 */
-  {    19,      9,     12,      0,     63, }, /* 121 */
-  {    19,      5,     12,      0,      0, }, /* 122 */
-  {    19,      9,     12,      0,     32, }, /* 123 */
-  {    19,      9,     12,     34,     32, }, /* 124 */
-  {    19,      9,     12,     59,     32, }, /* 125 */
-  {    19,      9,     12,     38,     32, }, /* 126 */
-  {    19,      9,     12,     21,     32, }, /* 127 */
-  {    19,      9,     12,     51,     32, }, /* 128 */
-  {    19,      9,     12,     26,     32, }, /* 129 */
-  {    19,      9,     12,     47,     32, }, /* 130 */
-  {    19,      9,     12,     55,     32, }, /* 131 */
-  {    19,      9,     12,     30,     32, }, /* 132 */
-  {    19,      9,     12,     43,     32, }, /* 133 */
-  {    19,      9,     12,     67,     32, }, /* 134 */
-  {    19,      5,     12,      0,    -38, }, /* 135 */
-  {    19,      5,     12,      0,    -37, }, /* 136 */
-  {    19,      5,     12,      0,    -32, }, /* 137 */
-  {    19,      5,     12,     34,    -32, }, /* 138 */
-  {    19,      5,     12,     59,    -32, }, /* 139 */
-  {    19,      5,     12,     38,    -32, }, /* 140 */
-  {    19,      5,     12,     21,   -116, }, /* 141 */
-  {    19,      5,     12,     51,    -32, }, /* 142 */
-  {    19,      5,     12,     26,   -775, }, /* 143 */
-  {    19,      5,     12,     47,    -32, }, /* 144 */
-  {    19,      5,     12,     55,    -32, }, /* 145 */
-  {    19,      5,     12,     30,      1, }, /* 146 */
-  {    19,      5,     12,     30,    -32, }, /* 147 */
-  {    19,      5,     12,     43,    -32, }, /* 148 */
-  {    19,      5,     12,     67,    -32, }, /* 149 */
-  {    19,      5,     12,      0,    -64, }, /* 150 */
-  {    19,      5,     12,      0,    -63, }, /* 151 */
-  {    19,      9,     12,      0,      8, }, /* 152 */
-  {    19,      5,     12,     34,    -30, }, /* 153 */
-  {    19,      5,     12,     38,    -25, }, /* 154 */
-  {    19,      9,     12,      0,      0, }, /* 155 */
-  {    19,      5,     12,     43,    -15, }, /* 156 */
-  {    19,      5,     12,     47,    -22, }, /* 157 */
-  {    19,      5,     12,      0,     -8, }, /* 158 */
-  {    10,      9,     12,      0,      1, }, /* 159 */
-  {    10,      5,     12,      0,     -1, }, /* 160 */
-  {    19,      5,     12,     51,    -54, }, /* 161 */
-  {    19,      5,     12,     55,    -48, }, /* 162 */
-  {    19,      5,     12,      0,      7, }, /* 163 */
-  {    19,      5,     12,      0,   -116, }, /* 164 */
-  {    19,      9,     12,     38,    -60, }, /* 165 */
-  {    19,      5,     12,     59,    -64, }, /* 166 */
-  {    19,     25,     12,      0,      0, }, /* 167 */
-  {    19,      9,     12,      0,     -7, }, /* 168 */
-  {    19,      9,     12,      0,   -130, }, /* 169 */
-  {    12,      9,     12,      0,     80, }, /* 170 */
-  {    12,      9,     12,      0,     32, }, /* 171 */
-  {    12,      5,     12,      0,    -32, }, /* 172 */
-  {    12,      5,     12,      0,    -80, }, /* 173 */
-  {    12,      9,     12,      0,      1, }, /* 174 */
-  {    12,      5,     12,      0,     -1, }, /* 175 */
-  {    12,     26,     12,      0,      0, }, /* 176 */
-  {    12,     12,      3,      0,      0, }, /* 177 */
-  {    12,     11,      3,      0,      0, }, /* 178 */
-  {    12,      9,     12,      0,     15, }, /* 179 */
-  {    12,      5,     12,      0,    -15, }, /* 180 */
-  {     1,      9,     12,      0,     48, }, /* 181 */
-  {     1,      6,     12,      0,      0, }, /* 182 */
-  {     1,     21,     12,      0,      0, }, /* 183 */
-  {     1,      5,     12,      0,    -48, }, /* 184 */
-  {     1,      5,     12,      0,      0, }, /* 185 */
-  {     1,     17,     12,      0,      0, }, /* 186 */
-  {     1,     26,     12,      0,      0, }, /* 187 */
-  {     1,     23,     12,      0,      0, }, /* 188 */
-  {    25,     12,      3,      0,      0, }, /* 189 */
-  {    25,     17,     12,      0,      0, }, /* 190 */
-  {    25,     21,     12,      0,      0, }, /* 191 */
-  {    25,      7,     12,      0,      0, }, /* 192 */
-  {     0,      1,      2,      0,      0, }, /* 193 */
-  {     0,     25,     12,      0,      0, }, /* 194 */
-  {     0,     21,     12,      0,      0, }, /* 195 */
-  {     0,     23,     12,      0,      0, }, /* 196 */
-  {     0,     26,     12,      0,      0, }, /* 197 */
-  {     0,     12,      3,      0,      0, }, /* 198 */
-  {     0,      7,     12,      0,      0, }, /* 199 */
-  {     0,      6,     12,      0,      0, }, /* 200 */
-  {     0,     13,     12,      0,      0, }, /* 201 */
-  {    49,     21,     12,      0,      0, }, /* 202 */
-  {    49,      1,      2,      0,      0, }, /* 203 */
-  {    49,      7,     12,      0,      0, }, /* 204 */
-  {    49,     12,      3,      0,      0, }, /* 205 */
-  {    55,      7,     12,      0,      0, }, /* 206 */
-  {    55,     12,      3,      0,      0, }, /* 207 */
-  {    63,     13,     12,      0,      0, }, /* 208 */
-  {    63,      7,     12,      0,      0, }, /* 209 */
-  {    63,     12,      3,      0,      0, }, /* 210 */
-  {    63,      6,     12,      0,      0, }, /* 211 */
-  {    63,     26,     12,      0,      0, }, /* 212 */
-  {    63,     21,     12,      0,      0, }, /* 213 */
-  {    89,      7,     12,      0,      0, }, /* 214 */
-  {    89,     12,      3,      0,      0, }, /* 215 */
-  {    89,      6,     12,      0,      0, }, /* 216 */
-  {    89,     21,     12,      0,      0, }, /* 217 */
-  {    94,      7,     12,      0,      0, }, /* 218 */
-  {    94,     12,      3,      0,      0, }, /* 219 */
-  {    94,     21,     12,      0,      0, }, /* 220 */
-  {    14,     12,      3,      0,      0, }, /* 221 */
-  {    14,     10,      5,      0,      0, }, /* 222 */
-  {    14,      7,     12,      0,      0, }, /* 223 */
-  {    14,     13,     12,      0,      0, }, /* 224 */
-  {    14,     21,     12,      0,      0, }, /* 225 */
-  {    14,      6,     12,      0,      0, }, /* 226 */
-  {     2,      7,     12,      0,      0, }, /* 227 */
-  {     2,     12,      3,      0,      0, }, /* 228 */
-  {     2,     10,      5,      0,      0, }, /* 229 */
-  {     2,     10,      3,      0,      0, }, /* 230 */
-  {     2,     13,     12,      0,      0, }, /* 231 */
-  {     2,     23,     12,      0,      0, }, /* 232 */
-  {     2,     15,     12,      0,      0, }, /* 233 */
-  {     2,     26,     12,      0,      0, }, /* 234 */
-  {    21,     12,      3,      0,      0, }, /* 235 */
-  {    21,     10,      5,      0,      0, }, /* 236 */
-  {    21,      7,     12,      0,      0, }, /* 237 */
-  {    21,     13,     12,      0,      0, }, /* 238 */
-  {    20,     12,      3,      0,      0, }, /* 239 */
-  {    20,     10,      5,      0,      0, }, /* 240 */
-  {    20,      7,     12,      0,      0, }, /* 241 */
-  {    20,     13,     12,      0,      0, }, /* 242 */
-  {    20,     21,     12,      0,      0, }, /* 243 */
-  {    20,     23,     12,      0,      0, }, /* 244 */
-  {    43,     12,      3,      0,      0, }, /* 245 */
-  {    43,     10,      5,      0,      0, }, /* 246 */
-  {    43,      7,     12,      0,      0, }, /* 247 */
-  {    43,     10,      3,      0,      0, }, /* 248 */
-  {    43,     13,     12,      0,      0, }, /* 249 */
-  {    43,     26,     12,      0,      0, }, /* 250 */
-  {    43,     15,     12,      0,      0, }, /* 251 */
-  {    53,     12,      3,      0,      0, }, /* 252 */
-  {    53,      7,     12,      0,      0, }, /* 253 */
-  {    53,     10,      3,      0,      0, }, /* 254 */
-  {    53,     10,      5,      0,      0, }, /* 255 */
-  {    53,     13,     12,      0,      0, }, /* 256 */
-  {    53,     15,     12,      0,      0, }, /* 257 */
-  {    53,     26,     12,      0,      0, }, /* 258 */
-  {    53,     23,     12,      0,      0, }, /* 259 */
-  {    54,     12,      3,      0,      0, }, /* 260 */
-  {    54,     10,      5,      0,      0, }, /* 261 */
-  {    54,      7,     12,      0,      0, }, /* 262 */
-  {    54,     13,     12,      0,      0, }, /* 263 */
-  {    54,     15,     12,      0,      0, }, /* 264 */
-  {    54,     26,     12,      0,      0, }, /* 265 */
-  {    28,     12,      3,      0,      0, }, /* 266 */
-  {    28,     10,      5,      0,      0, }, /* 267 */
-  {    28,      7,     12,      0,      0, }, /* 268 */
-  {    28,     10,      3,      0,      0, }, /* 269 */
-  {    28,     13,     12,      0,      0, }, /* 270 */
-  {    36,     12,      3,      0,      0, }, /* 271 */
-  {    36,     10,      5,      0,      0, }, /* 272 */
-  {    36,      7,     12,      0,      0, }, /* 273 */
-  {    36,     10,      3,      0,      0, }, /* 274 */
-  {    36,     13,     12,      0,      0, }, /* 275 */
-  {    36,     15,     12,      0,      0, }, /* 276 */
-  {    36,     26,     12,      0,      0, }, /* 277 */
-  {    47,     10,      5,      0,      0, }, /* 278 */
-  {    47,      7,     12,      0,      0, }, /* 279 */
-  {    47,     12,      3,      0,      0, }, /* 280 */
-  {    47,     10,      3,      0,      0, }, /* 281 */
-  {    47,     13,     12,      0,      0, }, /* 282 */
-  {    47,     21,     12,      0,      0, }, /* 283 */
-  {    56,      7,     12,      0,      0, }, /* 284 */
-  {    56,     12,      3,      0,      0, }, /* 285 */
-  {    56,      7,      5,      0,      0, }, /* 286 */
-  {    56,      6,     12,      0,      0, }, /* 287 */
-  {    56,     21,     12,      0,      0, }, /* 288 */
-  {    56,     13,     12,      0,      0, }, /* 289 */
-  {    32,      7,     12,      0,      0, }, /* 290 */
-  {    32,     12,      3,      0,      0, }, /* 291 */
-  {    32,      7,      5,      0,      0, }, /* 292 */
-  {    32,      6,     12,      0,      0, }, /* 293 */
-  {    32,     13,     12,      0,      0, }, /* 294 */
-  {    57,      7,     12,      0,      0, }, /* 295 */
-  {    57,     26,     12,      0,      0, }, /* 296 */
-  {    57,     21,     12,      0,      0, }, /* 297 */
-  {    57,     12,      3,      0,      0, }, /* 298 */
-  {    57,     13,     12,      0,      0, }, /* 299 */
-  {    57,     15,     12,      0,      0, }, /* 300 */
-  {    57,     22,     12,      0,      0, }, /* 301 */
-  {    57,     18,     12,      0,      0, }, /* 302 */
-  {    57,     10,      5,      0,      0, }, /* 303 */
-  {    38,      7,     12,      0,      0, }, /* 304 */
-  {    38,     10,     12,      0,      0, }, /* 305 */
-  {    38,     12,      3,      0,      0, }, /* 306 */
-  {    38,     10,      5,      0,      0, }, /* 307 */
-  {    38,     13,     12,      0,      0, }, /* 308 */
-  {    38,     21,     12,      0,      0, }, /* 309 */
-  {    38,     26,     12,      0,      0, }, /* 310 */
-  {    16,      9,     12,      0,   7264, }, /* 311 */
-  {    16,      7,     12,      0,      0, }, /* 312 */
-  {    16,      6,     12,      0,      0, }, /* 313 */
-  {    23,      7,      6,      0,      0, }, /* 314 */
-  {    23,      7,      7,      0,      0, }, /* 315 */
-  {    23,      7,      8,      0,      0, }, /* 316 */
-  {    15,      7,     12,      0,      0, }, /* 317 */
-  {    15,     12,      3,      0,      0, }, /* 318 */
-  {    15,     21,     12,      0,      0, }, /* 319 */
-  {    15,     15,     12,      0,      0, }, /* 320 */
-  {    15,     26,     12,      0,      0, }, /* 321 */
-  {     8,      7,     12,      0,      0, }, /* 322 */
-  {     7,     17,     12,      0,      0, }, /* 323 */
-  {     7,      7,     12,      0,      0, }, /* 324 */
-  {     7,     21,     12,      0,      0, }, /* 325 */
-  {    40,     29,     12,      0,      0, }, /* 326 */
-  {    40,      7,     12,      0,      0, }, /* 327 */
-  {    40,     22,     12,      0,      0, }, /* 328 */
-  {    40,     18,     12,      0,      0, }, /* 329 */
-  {    45,      7,     12,      0,      0, }, /* 330 */
-  {    45,     14,     12,      0,      0, }, /* 331 */
-  {    50,      7,     12,      0,      0, }, /* 332 */
-  {    50,     12,      3,      0,      0, }, /* 333 */
-  {    24,      7,     12,      0,      0, }, /* 334 */
-  {    24,     12,      3,      0,      0, }, /* 335 */
-  {     6,      7,     12,      0,      0, }, /* 336 */
-  {     6,     12,      3,      0,      0, }, /* 337 */
-  {    51,      7,     12,      0,      0, }, /* 338 */
-  {    51,     12,      3,      0,      0, }, /* 339 */
-  {    31,      7,     12,      0,      0, }, /* 340 */
-  {    31,     12,      3,      0,      0, }, /* 341 */
-  {    31,     10,      5,      0,      0, }, /* 342 */
-  {    31,     21,     12,      0,      0, }, /* 343 */
-  {    31,      6,     12,      0,      0, }, /* 344 */
-  {    31,     23,     12,      0,      0, }, /* 345 */
-  {    31,     13,     12,      0,      0, }, /* 346 */
-  {    31,     15,     12,      0,      0, }, /* 347 */
-  {    37,     21,     12,      0,      0, }, /* 348 */
-  {    37,     17,     12,      0,      0, }, /* 349 */
-  {    37,     12,      3,      0,      0, }, /* 350 */
-  {    37,      1,      2,      0,      0, }, /* 351 */
-  {    37,     13,     12,      0,      0, }, /* 352 */
-  {    37,      7,     12,      0,      0, }, /* 353 */
-  {    37,      6,     12,      0,      0, }, /* 354 */
-  {    34,      7,     12,      0,      0, }, /* 355 */
-  {    34,     12,      3,      0,      0, }, /* 356 */
-  {    34,     10,      5,      0,      0, }, /* 357 */
-  {    34,     26,     12,      0,      0, }, /* 358 */
-  {    34,     21,     12,      0,      0, }, /* 359 */
-  {    34,     13,     12,      0,      0, }, /* 360 */
-  {    52,      7,     12,      0,      0, }, /* 361 */
-  {    39,      7,     12,      0,      0, }, /* 362 */
-  {    39,     10,     12,      0,      0, }, /* 363 */
-  {    39,     10,      5,      0,      0, }, /* 364 */
-  {    39,     13,     12,      0,      0, }, /* 365 */
-  {    39,     15,     12,      0,      0, }, /* 366 */
-  {    39,     26,     12,      0,      0, }, /* 367 */
-  {    31,     26,     12,      0,      0, }, /* 368 */
-  {     5,      7,     12,      0,      0, }, /* 369 */
-  {     5,     12,      3,      0,      0, }, /* 370 */
-  {     5,     10,      5,      0,      0, }, /* 371 */
-  {     5,     21,     12,      0,      0, }, /* 372 */
-  {    90,      7,     12,      0,      0, }, /* 373 */
-  {    90,     10,      5,      0,      0, }, /* 374 */
-  {    90,     12,      3,      0,      0, }, /* 375 */
-  {    90,     10,     12,      0,      0, }, /* 376 */
-  {    90,     13,     12,      0,      0, }, /* 377 */
-  {    90,     21,     12,      0,      0, }, /* 378 */
-  {    90,      6,     12,      0,      0, }, /* 379 */
-  {    27,     11,      3,      0,      0, }, /* 380 */
-  {    61,     12,      3,      0,      0, }, /* 381 */
-  {    61,     10,      5,      0,      0, }, /* 382 */
-  {    61,      7,     12,      0,      0, }, /* 383 */
-  {    61,     13,     12,      0,      0, }, /* 384 */
-  {    61,     21,     12,      0,      0, }, /* 385 */
-  {    61,     26,     12,      0,      0, }, /* 386 */
-  {    75,     12,      3,      0,      0, }, /* 387 */
-  {    75,     10,      5,      0,      0, }, /* 388 */
-  {    75,      7,     12,      0,      0, }, /* 389 */
-  {    75,     13,     12,      0,      0, }, /* 390 */
-  {    92,      7,     12,      0,      0, }, /* 391 */
-  {    92,     12,      3,      0,      0, }, /* 392 */
-  {    92,     10,      5,      0,      0, }, /* 393 */
-  {    92,     21,     12,      0,      0, }, /* 394 */
-  {    69,      7,     12,      0,      0, }, /* 395 */
-  {    69,     10,      5,      0,      0, }, /* 396 */
-  {    69,     12,      3,      0,      0, }, /* 397 */
-  {    69,     21,     12,      0,      0, }, /* 398 */
-  {    69,     13,     12,      0,      0, }, /* 399 */
-  {    72,     13,     12,      0,      0, }, /* 400 */
-  {    72,      7,     12,      0,      0, }, /* 401 */
-  {    72,      6,     12,      0,      0, }, /* 402 */
-  {    72,     21,     12,      0,      0, }, /* 403 */
-  {    75,     21,     12,      0,      0, }, /* 404 */
-  {     9,     10,      5,      0,      0, }, /* 405 */
-  {     9,      7,     12,      0,      0, }, /* 406 */
-  {    12,      5,     12,      0,      0, }, /* 407 */
-  {    12,      6,     12,      0,      0, }, /* 408 */
-  {    33,      5,     12,      0,  35332, }, /* 409 */
-  {    33,      5,     12,      0,   3814, }, /* 410 */
-  {    33,      9,     12,     63,      1, }, /* 411 */
-  {    33,      5,     12,     63,     -1, }, /* 412 */
-  {    33,      5,     12,     63,    -58, }, /* 413 */
-  {    33,      9,     12,      0,  -7615, }, /* 414 */
-  {    19,      5,     12,      0,      8, }, /* 415 */
-  {    19,      9,     12,      0,     -8, }, /* 416 */
-  {    19,      5,     12,      0,     74, }, /* 417 */
-  {    19,      5,     12,      0,     86, }, /* 418 */
-  {    19,      5,     12,      0,    100, }, /* 419 */
-  {    19,      5,     12,      0,    128, }, /* 420 */
-  {    19,      5,     12,      0,    112, }, /* 421 */
-  {    19,      5,     12,      0,    126, }, /* 422 */
-  {    19,      8,     12,      0,     -8, }, /* 423 */
-  {    19,      5,     12,      0,      9, }, /* 424 */
-  {    19,      9,     12,      0,    -74, }, /* 425 */
-  {    19,      8,     12,      0,     -9, }, /* 426 */
-  {    19,      5,     12,     21,  -7173, }, /* 427 */
-  {    19,      9,     12,      0,    -86, }, /* 428 */
-  {    19,      9,     12,      0,   -100, }, /* 429 */
-  {    19,      9,     12,      0,   -112, }, /* 430 */
-  {    19,      9,     12,      0,   -128, }, /* 431 */
-  {    19,      9,     12,      0,   -126, }, /* 432 */
-  {    27,      1,      3,      0,      0, }, /* 433 */
-  {     9,     27,      2,      0,      0, }, /* 434 */
-  {     9,     28,      2,      0,      0, }, /* 435 */
-  {     9,      2,      2,      0,      0, }, /* 436 */
-  {     9,      9,     12,      0,      0, }, /* 437 */
-  {     9,      5,     12,      0,      0, }, /* 438 */
-  {    19,      9,     12,     67,  -7517, }, /* 439 */
-  {    33,      9,     12,     71,  -8383, }, /* 440 */
-  {    33,      9,     12,     75,  -8262, }, /* 441 */
-  {    33,      9,     12,      0,     28, }, /* 442 */
-  {    33,      5,     12,      0,    -28, }, /* 443 */
-  {    33,     14,     12,      0,     16, }, /* 444 */
-  {    33,     14,     12,      0,    -16, }, /* 445 */
-  {    33,     14,     12,      0,      0, }, /* 446 */
-  {     9,     26,     12,      0,     26, }, /* 447 */
-  {     9,     26,     12,      0,    -26, }, /* 448 */
-  {     4,     26,     12,      0,      0, }, /* 449 */
-  {    17,      9,     12,      0,     48, }, /* 450 */
-  {    17,      5,     12,      0,    -48, }, /* 451 */
-  {    33,      9,     12,      0, -10743, }, /* 452 */
-  {    33,      9,     12,      0,  -3814, }, /* 453 */
-  {    33,      9,     12,      0, -10727, }, /* 454 */
-  {    33,      5,     12,      0, -10795, }, /* 455 */
-  {    33,      5,     12,      0, -10792, }, /* 456 */
-  {    33,      9,     12,      0, -10780, }, /* 457 */
-  {    33,      9,     12,      0, -10749, }, /* 458 */
-  {    33,      9,     12,      0, -10783, }, /* 459 */
-  {    33,      9,     12,      0, -10782, }, /* 460 */
-  {    33,      9,     12,      0, -10815, }, /* 461 */
-  {    10,      5,     12,      0,      0, }, /* 462 */
-  {    10,     26,     12,      0,      0, }, /* 463 */
-  {    10,     12,      3,      0,      0, }, /* 464 */
-  {    10,     21,     12,      0,      0, }, /* 465 */
-  {    10,     15,     12,      0,      0, }, /* 466 */
-  {    16,      5,     12,      0,  -7264, }, /* 467 */
-  {    58,      7,     12,      0,      0, }, /* 468 */
-  {    58,      6,     12,      0,      0, }, /* 469 */
-  {    58,     21,     12,      0,      0, }, /* 470 */
-  {    58,     12,      3,      0,      0, }, /* 471 */
-  {    22,     26,     12,      0,      0, }, /* 472 */
-  {    22,      6,     12,      0,      0, }, /* 473 */
-  {    22,     14,     12,      0,      0, }, /* 474 */
-  {    23,     10,      3,      0,      0, }, /* 475 */
-  {    26,      7,     12,      0,      0, }, /* 476 */
-  {    26,      6,     12,      0,      0, }, /* 477 */
-  {    29,      7,     12,      0,      0, }, /* 478 */
-  {    29,      6,     12,      0,      0, }, /* 479 */
-  {     3,      7,     12,      0,      0, }, /* 480 */
-  {    23,      7,     12,      0,      0, }, /* 481 */
-  {    23,     26,     12,      0,      0, }, /* 482 */
-  {    29,     26,     12,      0,      0, }, /* 483 */
-  {    22,      7,     12,      0,      0, }, /* 484 */
-  {    60,      7,     12,      0,      0, }, /* 485 */
-  {    60,      6,     12,      0,      0, }, /* 486 */
-  {    60,     26,     12,      0,      0, }, /* 487 */
-  {    85,      7,     12,      0,      0, }, /* 488 */
-  {    85,      6,     12,      0,      0, }, /* 489 */
-  {    85,     21,     12,      0,      0, }, /* 490 */
-  {    76,      7,     12,      0,      0, }, /* 491 */
-  {    76,      6,     12,      0,      0, }, /* 492 */
-  {    76,     21,     12,      0,      0, }, /* 493 */
-  {    76,     13,     12,      0,      0, }, /* 494 */
-  {    12,      7,     12,      0,      0, }, /* 495 */
-  {    12,     21,     12,      0,      0, }, /* 496 */
-  {    78,      7,     12,      0,      0, }, /* 497 */
-  {    78,     14,     12,      0,      0, }, /* 498 */
-  {    78,     12,      3,      0,      0, }, /* 499 */
-  {    78,     21,     12,      0,      0, }, /* 500 */
-  {    33,      9,     12,      0, -35332, }, /* 501 */
-  {    33,      9,     12,      0, -42280, }, /* 502 */
-  {    33,      9,     12,      0, -42308, }, /* 503 */
-  {    33,      9,     12,      0, -42319, }, /* 504 */
-  {    33,      9,     12,      0, -42315, }, /* 505 */
-  {    33,      9,     12,      0, -42305, }, /* 506 */
-  {    33,      9,     12,      0, -42258, }, /* 507 */
-  {    33,      9,     12,      0, -42282, }, /* 508 */
-  {    48,      7,     12,      0,      0, }, /* 509 */
-  {    48,     12,      3,      0,      0, }, /* 510 */
-  {    48,     10,      5,      0,      0, }, /* 511 */
-  {    48,     26,     12,      0,      0, }, /* 512 */
-  {    64,      7,     12,      0,      0, }, /* 513 */
-  {    64,     21,     12,      0,      0, }, /* 514 */
-  {    74,     10,      5,      0,      0, }, /* 515 */
-  {    74,      7,     12,      0,      0, }, /* 516 */
-  {    74,     12,      3,      0,      0, }, /* 517 */
-  {    74,     21,     12,      0,      0, }, /* 518 */
-  {    74,     13,     12,      0,      0, }, /* 519 */
-  {    68,     13,     12,      0,      0, }, /* 520 */
-  {    68,      7,     12,      0,      0, }, /* 521 */
-  {    68,     12,      3,      0,      0, }, /* 522 */
-  {    68,     21,     12,      0,      0, }, /* 523 */
-  {    73,      7,     12,      0,      0, }, /* 524 */
-  {    73,     12,      3,      0,      0, }, /* 525 */
-  {    73,     10,      5,      0,      0, }, /* 526 */
-  {    73,     21,     12,      0,      0, }, /* 527 */
-  {    83,     12,      3,      0,      0, }, /* 528 */
-  {    83,     10,      5,      0,      0, }, /* 529 */
-  {    83,      7,     12,      0,      0, }, /* 530 */
-  {    83,     21,     12,      0,      0, }, /* 531 */
-  {    83,     13,     12,      0,      0, }, /* 532 */
-  {    38,      6,     12,      0,      0, }, /* 533 */
-  {    67,      7,     12,      0,      0, }, /* 534 */
-  {    67,     12,      3,      0,      0, }, /* 535 */
-  {    67,     10,      5,      0,      0, }, /* 536 */
-  {    67,     13,     12,      0,      0, }, /* 537 */
-  {    67,     21,     12,      0,      0, }, /* 538 */
-  {    91,      7,     12,      0,      0, }, /* 539 */
-  {    91,     12,      3,      0,      0, }, /* 540 */
-  {    91,      6,     12,      0,      0, }, /* 541 */
-  {    91,     21,     12,      0,      0, }, /* 542 */
-  {    86,      7,     12,      0,      0, }, /* 543 */
-  {    86,     10,      5,      0,      0, }, /* 544 */
-  {    86,     12,      3,      0,      0, }, /* 545 */
-  {    86,     21,     12,      0,      0, }, /* 546 */
-  {    86,      6,     12,      0,      0, }, /* 547 */
-  {    86,     13,     12,      0,      0, }, /* 548 */
-  {    23,      7,      9,      0,      0, }, /* 549 */
-  {    23,      7,     10,      0,      0, }, /* 550 */
-  {     9,      4,      2,      0,      0, }, /* 551 */
-  {     9,      3,     12,      0,      0, }, /* 552 */
-  {    25,     25,     12,      0,      0, }, /* 553 */
-  {     0,     24,     12,      0,      0, }, /* 554 */
-  {     9,      6,      3,      0,      0, }, /* 555 */
-  {    35,      7,     12,      0,      0, }, /* 556 */
-  {    19,     14,     12,      0,      0, }, /* 557 */
-  {    19,     15,     12,      0,      0, }, /* 558 */
-  {    19,     26,     12,      0,      0, }, /* 559 */
-  {    70,      7,     12,      0,      0, }, /* 560 */
-  {    66,      7,     12,      0,      0, }, /* 561 */
-  {    41,      7,     12,      0,      0, }, /* 562 */
-  {    41,     15,     12,      0,      0, }, /* 563 */
-  {    18,      7,     12,      0,      0, }, /* 564 */
-  {    18,     14,     12,      0,      0, }, /* 565 */
-  {   117,      7,     12,      0,      0, }, /* 566 */
-  {   117,     12,      3,      0,      0, }, /* 567 */
-  {    59,      7,     12,      0,      0, }, /* 568 */
-  {    59,     21,     12,      0,      0, }, /* 569 */
-  {    42,      7,     12,      0,      0, }, /* 570 */
-  {    42,     21,     12,      0,      0, }, /* 571 */
-  {    42,     14,     12,      0,      0, }, /* 572 */
-  {    13,      9,     12,      0,     40, }, /* 573 */
-  {    13,      5,     12,      0,    -40, }, /* 574 */
-  {    46,      7,     12,      0,      0, }, /* 575 */
-  {    44,      7,     12,      0,      0, }, /* 576 */
-  {    44,     13,     12,      0,      0, }, /* 577 */
-  {   105,      7,     12,      0,      0, }, /* 578 */
-  {   103,      7,     12,      0,      0, }, /* 579 */
-  {   103,     21,     12,      0,      0, }, /* 580 */
-  {   109,      7,     12,      0,      0, }, /* 581 */
-  {    11,      7,     12,      0,      0, }, /* 582 */
-  {    80,      7,     12,      0,      0, }, /* 583 */
-  {    80,     21,     12,      0,      0, }, /* 584 */
-  {    80,     15,     12,      0,      0, }, /* 585 */
-  {   119,      7,     12,      0,      0, }, /* 586 */
-  {   119,     26,     12,      0,      0, }, /* 587 */
-  {   119,     15,     12,      0,      0, }, /* 588 */
-  {   115,      7,     12,      0,      0, }, /* 589 */
-  {   115,     15,     12,      0,      0, }, /* 590 */
-  {    65,      7,     12,      0,      0, }, /* 591 */
-  {    65,     15,     12,      0,      0, }, /* 592 */
-  {    65,     21,     12,      0,      0, }, /* 593 */
-  {    71,      7,     12,      0,      0, }, /* 594 */
-  {    71,     21,     12,      0,      0, }, /* 595 */
-  {    97,      7,     12,      0,      0, }, /* 596 */
-  {    96,      7,     12,      0,      0, }, /* 597 */
-  {    30,      7,     12,      0,      0, }, /* 598 */
-  {    30,     12,      3,      0,      0, }, /* 599 */
-  {    30,     15,     12,      0,      0, }, /* 600 */
-  {    30,     21,     12,      0,      0, }, /* 601 */
-  {    87,      7,     12,      0,      0, }, /* 602 */
-  {    87,     15,     12,      0,      0, }, /* 603 */
-  {    87,     21,     12,      0,      0, }, /* 604 */
-  {   116,      7,     12,      0,      0, }, /* 605 */
-  {   116,     15,     12,      0,      0, }, /* 606 */
-  {   111,      7,     12,      0,      0, }, /* 607 */
-  {   111,     26,     12,      0,      0, }, /* 608 */
-  {   111,     12,      3,      0,      0, }, /* 609 */
-  {   111,     15,     12,      0,      0, }, /* 610 */
-  {   111,     21,     12,      0,      0, }, /* 611 */
-  {    77,      7,     12,      0,      0, }, /* 612 */
-  {    77,     21,     12,      0,      0, }, /* 613 */
-  {    82,      7,     12,      0,      0, }, /* 614 */
-  {    82,     15,     12,      0,      0, }, /* 615 */
-  {    81,      7,     12,      0,      0, }, /* 616 */
-  {    81,     15,     12,      0,      0, }, /* 617 */
-  {   120,      7,     12,      0,      0, }, /* 618 */
-  {   120,     21,     12,      0,      0, }, /* 619 */
-  {   120,     15,     12,      0,      0, }, /* 620 */
-  {    88,      7,     12,      0,      0, }, /* 621 */
-  {     0,     15,     12,      0,      0, }, /* 622 */
-  {    93,     10,      5,      0,      0, }, /* 623 */
-  {    93,     12,      3,      0,      0, }, /* 624 */
-  {    93,      7,     12,      0,      0, }, /* 625 */
-  {    93,     21,     12,      0,      0, }, /* 626 */
-  {    93,     15,     12,      0,      0, }, /* 627 */
-  {    93,     13,     12,      0,      0, }, /* 628 */
-  {    84,     12,      3,      0,      0, }, /* 629 */
-  {    84,     10,      5,      0,      0, }, /* 630 */
-  {    84,      7,     12,      0,      0, }, /* 631 */
-  {    84,     21,     12,      0,      0, }, /* 632 */
-  {    84,      1,      2,      0,      0, }, /* 633 */
-  {   100,      7,     12,      0,      0, }, /* 634 */
-  {   100,     13,     12,      0,      0, }, /* 635 */
-  {    95,     12,      3,      0,      0, }, /* 636 */
-  {    95,      7,     12,      0,      0, }, /* 637 */
-  {    95,     10,      5,      0,      0, }, /* 638 */
-  {    95,     13,     12,      0,      0, }, /* 639 */
-  {    95,     21,     12,      0,      0, }, /* 640 */
-  {   110,      7,     12,      0,      0, }, /* 641 */
-  {   110,     12,      3,      0,      0, }, /* 642 */
-  {   110,     21,     12,      0,      0, }, /* 643 */
-  {    99,     12,      3,      0,      0, }, /* 644 */
-  {    99,     10,      5,      0,      0, }, /* 645 */
-  {    99,      7,     12,      0,      0, }, /* 646 */
-  {    99,     21,     12,      0,      0, }, /* 647 */
-  {    99,     13,     12,      0,      0, }, /* 648 */
-  {    47,     15,     12,      0,      0, }, /* 649 */
-  {   107,      7,     12,      0,      0, }, /* 650 */
-  {   107,     10,      5,      0,      0, }, /* 651 */
-  {   107,     12,      3,      0,      0, }, /* 652 */
-  {   107,     21,     12,      0,      0, }, /* 653 */
-  {   108,      7,     12,      0,      0, }, /* 654 */
-  {   108,     12,      3,      0,      0, }, /* 655 */
-  {   108,     10,      5,      0,      0, }, /* 656 */
-  {   108,     13,     12,      0,      0, }, /* 657 */
-  {   106,     12,      3,      0,      0, }, /* 658 */
-  {   106,     10,      5,      0,      0, }, /* 659 */
-  {   106,      7,     12,      0,      0, }, /* 660 */
-  {   106,     10,      3,      0,      0, }, /* 661 */
-  {   123,      7,     12,      0,      0, }, /* 662 */
-  {   123,     10,      3,      0,      0, }, /* 663 */
-  {   123,     10,      5,      0,      0, }, /* 664 */
-  {   123,     12,      3,      0,      0, }, /* 665 */
-  {   123,     21,     12,      0,      0, }, /* 666 */
-  {   123,     13,     12,      0,      0, }, /* 667 */
-  {   122,      7,     12,      0,      0, }, /* 668 */
-  {   122,     10,      3,      0,      0, }, /* 669 */
-  {   122,     10,      5,      0,      0, }, /* 670 */
-  {   122,     12,      3,      0,      0, }, /* 671 */
-  {   122,     21,     12,      0,      0, }, /* 672 */
-  {   113,      7,     12,      0,      0, }, /* 673 */
-  {   113,     10,      5,      0,      0, }, /* 674 */
-  {   113,     12,      3,      0,      0, }, /* 675 */
-  {   113,     21,     12,      0,      0, }, /* 676 */
-  {   113,     13,     12,      0,      0, }, /* 677 */
-  {   101,      7,     12,      0,      0, }, /* 678 */
-  {   101,     12,      3,      0,      0, }, /* 679 */
-  {   101,     10,      5,      0,      0, }, /* 680 */
-  {   101,     13,     12,      0,      0, }, /* 681 */
-  {   124,      9,     12,      0,     32, }, /* 682 */
-  {   124,      5,     12,      0,    -32, }, /* 683 */
-  {   124,     13,     12,      0,      0, }, /* 684 */
-  {   124,     15,     12,      0,      0, }, /* 685 */
-  {   124,      7,     12,      0,      0, }, /* 686 */
-  {   121,      7,     12,      0,      0, }, /* 687 */
-  {    62,      7,     12,      0,      0, }, /* 688 */
-  {    62,     14,     12,      0,      0, }, /* 689 */
-  {    62,     21,     12,      0,      0, }, /* 690 */
-  {    79,      7,     12,      0,      0, }, /* 691 */
-  {   114,      7,     12,      0,      0, }, /* 692 */
-  {   114,     13,     12,      0,      0, }, /* 693 */
-  {   114,     21,     12,      0,      0, }, /* 694 */
-  {   102,      7,     12,      0,      0, }, /* 695 */
-  {   102,     12,      3,      0,      0, }, /* 696 */
-  {   102,     21,     12,      0,      0, }, /* 697 */
-  {   118,      7,     12,      0,      0, }, /* 698 */
-  {   118,     12,      3,      0,      0, }, /* 699 */
-  {   118,     21,     12,      0,      0, }, /* 700 */
-  {   118,     26,     12,      0,      0, }, /* 701 */
-  {   118,      6,     12,      0,      0, }, /* 702 */
-  {   118,     13,     12,      0,      0, }, /* 703 */
-  {   118,     15,     12,      0,      0, }, /* 704 */
-  {    98,      7,     12,      0,      0, }, /* 705 */
-  {    98,     10,      5,      0,      0, }, /* 706 */
-  {    98,     12,      3,      0,      0, }, /* 707 */
-  {    98,      6,     12,      0,      0, }, /* 708 */
-  {   104,      7,     12,      0,      0, }, /* 709 */
-  {   104,     26,     12,      0,      0, }, /* 710 */
-  {   104,     12,      3,      0,      0, }, /* 711 */
-  {   104,     21,     12,      0,      0, }, /* 712 */
-  {     9,     10,      3,      0,      0, }, /* 713 */
-  {    19,     12,      3,      0,      0, }, /* 714 */
-  {   112,      7,     12,      0,      0, }, /* 715 */
-  {   112,     15,     12,      0,      0, }, /* 716 */
-  {   112,     12,      3,      0,      0, }, /* 717 */
-  {     9,     26,     11,      0,      0, }, /* 718 */
-  {    26,     26,     12,      0,      0, }, /* 719 */
-};
-
-const pcre_uint8 PRIV(ucd_stage1)[] = { /* 8704 bytes */
-  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, /* U+0000 */
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, /* U+0800 */
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 41, 41, 42, 43, 44, 45, /* U+1000 */
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, /* U+1800 */
- 62, 63, 64, 65, 66, 66, 67, 68, 69, 70, 71, 72, 73, 71, 74, 75, /* U+2000 */
- 76, 76, 66, 77, 66, 66, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, /* U+2800 */
- 88, 89, 90, 91, 92, 93, 94, 71, 95, 95, 95, 95, 95, 95, 95, 95, /* U+3000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+3800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+4000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 96, 95, 95, 95, 95, /* U+4800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+5000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+5800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+6000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+6800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+7000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+7800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+8000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+8800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+9000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 97, /* U+9800 */
- 98, 99, 99, 99, 99, 99, 99, 99, 99,100,101,101,102,103,104,105, /* U+A000 */
-106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,114, /* U+A800 */
-115,116,117,118,119,120,114,115,116,117,118,119,120,114,115,116, /* U+B000 */
-117,118,119,120,114,115,116,117,118,119,120,114,115,116,117,118, /* U+B800 */
-119,120,114,115,116,117,118,119,120,114,115,116,117,118,119,120, /* U+C000 */
-114,115,116,117,118,119,120,114,115,116,117,118,119,120,114,115, /* U+C800 */
-116,117,118,119,120,114,115,116,117,118,119,120,114,115,116,121, /* U+D000 */
-122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122, /* U+D800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+E000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+E800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F000 */
-123,123, 95, 95,124,125,126,127,128,128,129,130,131,132,133,134, /* U+F800 */
-135,136,137,138,139,140,141,142,143,144,145,139,146,146,147,139, /* U+10000 */
-148,149,150,151,152,153,154,155,156,139,139,139,157,139,139,139, /* U+10800 */
-158,159,160,161,162,163,164,139,139,165,139,166,167,168,139,139, /* U+11000 */
-139,169,139,139,139,170,139,139,139,139,139,139,139,139,139,139, /* U+11800 */
-171,171,171,171,171,171,171,172,173,139,139,139,139,139,139,139, /* U+12000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+12800 */
-174,174,174,174,174,174,174,174,175,139,139,139,139,139,139,139, /* U+13000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+13800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+14000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+14800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+15000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+15800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+16000 */
-176,176,176,176,177,178,179,180,139,139,139,139,139,139,181,182, /* U+16800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+17000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+17800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+18000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+18800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+19000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+19800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1A800 */
-183,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1B000 */
-139,139,139,139,139,139,139,139,184,185,139,139,139,139,139,139, /* U+1B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1C800 */
- 71,186,187,188,189,139,190,139,191,192,193,194,195,196,197,198, /* U+1D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1E000 */
-199,200,139,139,139,139,139,139,139,139,139,139,201,202,139,139, /* U+1E800 */
-203,204,205,206,207,139,208,209, 71,210,211,212,213,214,215,216, /* U+1F000 */
-217,218,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+1F800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+20000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+20800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+21000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+21800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+22000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+22800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+23000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+23800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+24000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+24800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+25000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+25800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+26000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+26800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+27000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+27800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+28000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+28800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+29000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+29800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,219, 95, 95, /* U+2A000 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, /* U+2A800 */
- 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,220, 95, /* U+2B000 */
-221,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+2F000 */
- 95, 95, 95, 95,221,139,139,139,139,139,139,139,139,139,139,139, /* U+2F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+30000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+30800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+31000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+31800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+32000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+32800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+33000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+33800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+34000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+34800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+35000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+35800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+36000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+36800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+37000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+37800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+38000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+38800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+39000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+39800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+3F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+40000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+40800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+41000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+41800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+42000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+42800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+43000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+43800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+44000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+44800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+45000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+45800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+46000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+46800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+47000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+47800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+48000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+48800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+49000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+49800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+4F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+50000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+50800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+51000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+51800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+52000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+52800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+53000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+53800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+54000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+54800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+55000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+55800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+56000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+56800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+57000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+57800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+58000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+58800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+59000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+59800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+5F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+60000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+60800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+61000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+61800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+62000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+62800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+63000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+63800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+64000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+64800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+65000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+65800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+66000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+66800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+67000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+67800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+68000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+68800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+69000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+69800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+6F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+70000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+70800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+71000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+71800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+72000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+72800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+73000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+73800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+74000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+74800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+75000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+75800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+76000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+76800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+77000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+77800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+78000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+78800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+79000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+79800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+7F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+80000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+80800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+81000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+81800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+82000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+82800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+83000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+83800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+84000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+84800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+85000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+85800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+86000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+86800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+87000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+87800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+88000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+88800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+89000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+89800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+8F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+90000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+90800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+91000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+91800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+92000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+92800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+93000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+93800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+94000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+94800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+95000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+95800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+96000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+96800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+97000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+97800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+98000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+98800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+99000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+99800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9A000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9A800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9B000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9B800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9C000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9C800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9D000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9D800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9E000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9E800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9F000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+9F800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A0000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+A9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AD000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AD800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+AF800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B0000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+B9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BD000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BD800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+BF800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C0000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+C9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CD000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CD800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+CF800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D0000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+D9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DD000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DD800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+DF800 */
-222,223,224,225,223,223,223,223,223,223,223,223,223,223,223,223, /* U+E0000 */
-223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223, /* U+E0800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E1000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E1800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E2000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E2800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E3000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E3800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E4000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E4800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E5000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E5800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E6000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E6800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E7000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E7800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E8000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E8800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E9000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+E9800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EA000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EA800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EB000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EB800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EC000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EC800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+ED000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+ED800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EE000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EE800 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EF000 */
-139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139, /* U+EF800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F0000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F0800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F1000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F1800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F2000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F2800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F3000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F3800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F4000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F4800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F5000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F5800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F6000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F6800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F7000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F7800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F8000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F8800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F9000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+F9800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FA000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FA800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FB000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FB800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FC000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FC800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FD000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FD800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FE000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FE800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+FF000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,226, /* U+FF800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+100000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+100800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+101000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+101800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+102000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+102800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+103000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+103800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+104000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+104800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+105000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+105800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+106000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+106800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+107000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+107800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+108000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+108800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+109000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+109800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10A000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10A800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10B000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10B800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10C000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10C800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10D000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10D800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10E000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10E800 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+10F000 */
-123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,226, /* U+10F800 */
-};
-
-const pcre_uint16 PRIV(ucd_stage2)[] = { /* 58112 bytes, block = 128 */
-/* block 0 */
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  4,  4,  4,  5,  4,  4,  4,  6,  7,  4,  8,  4,  9,  4,  4,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  4,  4,  8,  8,  8,  4,
-  4, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 11, 11, 11, 11,
- 11, 11, 11, 13, 11, 11, 11, 11, 11, 11, 11,  6,  4,  7, 14, 15,
- 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 16, 16, 16, 16,
- 16, 16, 16, 18, 16, 16, 16, 16, 16, 16, 16,  6,  8,  7,  8,  0,
-
-/* block 1 */
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  4,  5,  5,  5,  5, 19,  4, 14, 19, 20, 21,  8, 22, 19, 14,
- 19,  8, 23, 23, 14, 24,  4,  4, 14, 23, 20, 25, 23, 23, 23,  4,
- 11, 11, 11, 11, 11, 26, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11,  8, 11, 11, 11, 11, 11, 11, 11, 27,
- 16, 16, 16, 16, 16, 28, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16,  8, 16, 16, 16, 16, 16, 16, 16, 29,
-
-/* block 2 */
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 32, 33, 30, 31, 30, 31, 30, 31, 33, 30, 31, 30, 31, 30, 31, 30,
- 31, 30, 31, 30, 31, 30, 31, 30, 31, 33, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 34, 30, 31, 30, 31, 30, 31, 35,
-
-/* block 3 */
- 36, 37, 30, 31, 30, 31, 38, 30, 31, 39, 39, 30, 31, 33, 40, 41,
- 42, 30, 31, 39, 43, 44, 45, 46, 30, 31, 47, 33, 45, 48, 49, 50,
- 30, 31, 30, 31, 30, 31, 51, 30, 31, 51, 33, 33, 30, 31, 51, 30,
- 31, 52, 52, 30, 31, 30, 31, 53, 30, 31, 33, 20, 30, 31, 33, 54,
- 20, 20, 20, 20, 55, 56, 57, 58, 59, 60, 61, 62, 63, 30, 31, 30,
- 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 64, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 33, 65, 66, 67, 30, 31, 68, 69, 30, 31, 30, 31, 30, 31, 30, 31,
-
-/* block 4 */
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 70, 33, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 33, 33, 33, 33, 33, 33, 71, 30, 31, 72, 73, 74,
- 74, 30, 31, 75, 76, 77, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 78, 79, 80, 81, 82, 33, 83, 83, 33, 84, 33, 85, 86, 33, 33, 33,
- 83, 87, 33, 88, 33, 89, 90, 33, 91, 92, 33, 93, 94, 33, 33, 92,
- 33, 95, 96, 33, 33, 97, 33, 33, 33, 33, 33, 33, 33, 98, 33, 33,
-
-/* block 5 */
- 99, 33, 33, 99, 33, 33, 33,100, 99,101,102,102,103, 33, 33, 33,
- 33, 33,104, 33, 20, 33, 33, 33, 33, 33, 33, 33, 33, 33,105, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
-106,106,106,106,106,106,106,106,106,107,107,107,107,107,107,107,
-107,107, 14, 14, 14, 14,107,107,107,107,107,107,107,107,107,107,
-107,107, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-106,106,106,106,106, 14, 14, 14, 14, 14,108,108,107, 14,107, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-
-/* block 6 */
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,110,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-111,112,111,112,107,113,111,112,114,114,115,116,116,116,  4,117,
-
-/* block 7 */
-114,114,114,114,113, 14,118,  4,119,119,119,114,120,114,121,121,
-122,123,124,123,123,125,123,123,126,127,128,123,129,123,123,123,
-130,131,114,132,123,123,133,123,123,134,123,123,135,136,136,136,
-122,137,138,137,137,139,137,137,140,141,142,137,143,137,137,137,
-144,145,146,147,137,137,148,137,137,149,137,137,150,151,151,152,
-153,154,155,155,155,156,157,158,111,112,111,112,111,112,111,112,
-111,112,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-161,162,163,164,165,166,167,111,112,168,111,112,122,169,169,169,
-
-/* block 8 */
-170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
-171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,
-171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,
-172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,
-172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,
-173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-
-/* block 9 */
-174,175,176,177,177,109,109,177,178,178,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-179,174,175,174,175,174,175,174,175,174,175,174,175,174,175,180,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-
-/* block 10 */
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-114,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
-181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
-181,181,181,181,181,181,181,114,114,182,183,183,183,183,183,183,
-114,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,
-184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,
-
-/* block 11 */
-184,184,184,184,184,184,184,185,114,  4,186,114,114,187,187,188,
-114,189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,
-189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,
-189,189,189,189,189,189,189,189,189,189,189,189,189,189,190,189,
-191,189,189,191,189,189,191,189,114,114,114,114,114,114,114,114,
-192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,
-192,192,192,192,192,192,192,192,192,192,192,114,114,114,114,114,
-192,192,192,191,191,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 12 */
-193,193,193,193,193, 22,194,194,194,195,195,196,  4,195,197,197,
-198,198,198,198,198,198,198,198,198,198,198,  4, 22,114,195,  4,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-107,199,199,199,199,199,199,199,199,199,199,109,109,109,109,109,
-109,109,109,109,109,109,198,198,198,198,198,198,198,198,198,198,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,195,195,195,195,199,199,
-109,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 13 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,195,199,198,198,198,198,198,198,198, 22,197,198,
-198,198,198,198,198,200,200,198,198,197,198,198,198,198,199,199,
-201,201,201,201,201,201,201,201,201,201,199,199,199,197,197,199,
-
-/* block 14 */
-202,202,202,202,202,202,202,202,202,202,202,202,202,202,114,203,
-204,205,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
-204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
-205,205,205,205,205,205,205,205,205,205,205,205,205,205,205,205,
-205,205,205,205,205,205,205,205,205,205,205,114,114,204,204,204,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 15 */
-206,206,206,206,206,206,206,206,206,206,206,206,206,206,206,206,
-206,206,206,206,206,206,206,206,206,206,206,206,206,206,206,206,
-206,206,206,206,206,206,207,207,207,207,207,207,207,207,207,207,
-207,206,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-208,208,208,208,208,208,208,208,208,208,209,209,209,209,209,209,
-209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,
-209,209,209,209,209,209,209,209,209,209,209,210,210,210,210,210,
-210,210,210,210,211,211,212,213,213,213,211,114,114,114,114,114,
-
-/* block 16 */
-214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,
-214,214,214,214,214,214,215,215,215,215,216,215,215,215,215,215,
-215,215,215,215,216,215,215,215,216,215,215,215,215,215,114,114,
-217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,114,
-218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,
-218,218,218,218,218,218,218,218,218,219,219,219,114,114,220,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 17 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,198,198,198,198,198,198,198,198,198,198,198,198,
-198,198,198,198,198,198,198,198,198,198,198,198,198,198,198,198,
-
-/* block 18 */
-221,221,221,222,223,223,223,223,223,223,223,223,223,223,223,223,
-223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,
-223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,
-223,223,223,223,223,223,223,223,223,223,221,222,221,223,222,222,
-222,221,221,221,221,221,221,221,221,222,222,222,222,221,222,222,
-223,109,109,221,221,221,221,221,223,223,223,223,223,223,223,223,
-223,223,221,221,  4,  4,224,224,224,224,224,224,224,224,224,224,
-225,226,223,223,223,223,223,223,223,223,223,223,223,223,223,223,
-
-/* block 19 */
-227,228,229,229,114,227,227,227,227,227,227,227,227,114,114,227,
-227,114,114,227,227,227,227,227,227,227,227,227,227,227,227,227,
-227,227,227,227,227,227,227,227,227,114,227,227,227,227,227,227,
-227,114,227,114,114,114,227,227,227,227,114,114,228,227,230,229,
-229,228,228,228,228,114,114,229,229,114,114,229,229,228,227,114,
-114,114,114,114,114,114,114,230,114,114,114,114,227,227,114,227,
-227,227,228,228,114,114,231,231,231,231,231,231,231,231,231,231,
-227,227,232,232,233,233,233,233,233,233,234,232,114,114,114,114,
-
-/* block 20 */
-114,235,235,236,114,237,237,237,237,237,237,114,114,114,114,237,
-237,114,114,237,237,237,237,237,237,237,237,237,237,237,237,237,
-237,237,237,237,237,237,237,237,237,114,237,237,237,237,237,237,
-237,114,237,237,114,237,237,114,237,237,114,114,235,114,236,236,
-236,235,235,114,114,114,114,235,235,114,114,235,235,235,114,114,
-114,235,114,114,114,114,114,114,114,237,237,237,237,114,237,114,
-114,114,114,114,114,114,238,238,238,238,238,238,238,238,238,238,
-235,235,237,237,237,235,114,114,114,114,114,114,114,114,114,114,
-
-/* block 21 */
-114,239,239,240,114,241,241,241,241,241,241,241,241,241,114,241,
-241,241,114,241,241,241,241,241,241,241,241,241,241,241,241,241,
-241,241,241,241,241,241,241,241,241,114,241,241,241,241,241,241,
-241,114,241,241,114,241,241,241,241,241,114,114,239,241,240,240,
-240,239,239,239,239,239,114,239,239,240,114,240,240,239,114,114,
-241,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-241,241,239,239,114,114,242,242,242,242,242,242,242,242,242,242,
-243,244,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 22 */
-114,245,246,246,114,247,247,247,247,247,247,247,247,114,114,247,
-247,114,114,247,247,247,247,247,247,247,247,247,247,247,247,247,
-247,247,247,247,247,247,247,247,247,114,247,247,247,247,247,247,
-247,114,247,247,114,247,247,247,247,247,114,114,245,247,248,245,
-246,245,245,245,245,114,114,246,246,114,114,246,246,245,114,114,
-114,114,114,114,114,114,245,248,114,114,114,114,247,247,114,247,
-247,247,245,245,114,114,249,249,249,249,249,249,249,249,249,249,
-250,247,251,251,251,251,251,251,114,114,114,114,114,114,114,114,
-
-/* block 23 */
-114,114,252,253,114,253,253,253,253,253,253,114,114,114,253,253,
-253,114,253,253,253,253,114,114,114,253,253,114,253,114,253,253,
-114,114,114,253,253,114,114,114,253,253,253,114,114,114,253,253,
-253,253,253,253,253,253,253,253,253,253,114,114,114,114,254,255,
-252,255,255,114,114,114,255,255,255,114,255,255,255,252,114,114,
-253,114,114,114,114,114,114,254,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,256,256,256,256,256,256,256,256,256,256,
-257,257,257,258,258,258,258,258,258,259,258,114,114,114,114,114,
-
-/* block 24 */
-260,261,261,261,114,262,262,262,262,262,262,262,262,114,262,262,
-262,114,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,114,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,114,114,114,262,260,260,
-260,261,261,261,261,114,260,260,260,114,260,260,260,260,114,114,
-114,114,114,114,114,260,260,114,262,262,114,114,114,114,114,114,
-262,262,260,260,114,114,263,263,263,263,263,263,263,263,263,263,
-114,114,114,114,114,114,114,114,264,264,264,264,264,264,264,265,
-
-/* block 25 */
-114,266,267,267,114,268,268,268,268,268,268,268,268,114,268,268,
-268,114,268,268,268,268,268,268,268,268,268,268,268,268,268,268,
-268,268,268,268,268,268,268,268,268,114,268,268,268,268,268,268,
-268,268,268,268,114,268,268,268,268,268,114,114,266,268,267,266,
-267,267,269,267,267,114,266,267,267,114,267,267,266,266,114,114,
-114,114,114,114,114,269,269,114,114,114,114,114,114,114,268,114,
-268,268,266,266,114,114,270,270,270,270,270,270,270,270,270,270,
-114,268,268,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 26 */
-114,271,272,272,114,273,273,273,273,273,273,273,273,114,273,273,
-273,114,273,273,273,273,273,273,273,273,273,273,273,273,273,273,
-273,273,273,273,273,273,273,273,273,273,273,273,273,273,273,273,
-273,273,273,273,273,273,273,273,273,273,273,114,114,273,274,272,
-272,271,271,271,271,114,272,272,272,114,272,272,272,271,273,114,
-114,114,114,114,114,114,114,274,114,114,114,114,114,114,114,114,
-273,273,271,271,114,114,275,275,275,275,275,275,275,275,275,275,
-276,276,276,276,276,276,114,114,114,277,273,273,273,273,273,273,
-
-/* block 27 */
-114,114,278,278,114,279,279,279,279,279,279,279,279,279,279,279,
-279,279,279,279,279,279,279,114,114,114,279,279,279,279,279,279,
-279,279,279,279,279,279,279,279,279,279,279,279,279,279,279,279,
-279,279,114,279,279,279,279,279,279,279,279,279,114,279,114,114,
-279,279,279,279,279,279,279,114,114,114,280,114,114,114,114,281,
-278,278,280,280,280,114,280,114,278,278,278,278,278,278,278,281,
-114,114,114,114,114,114,282,282,282,282,282,282,282,282,282,282,
-114,114,278,278,283,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 28 */
-114,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,
-284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,
-284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,
-284,285,284,286,285,285,285,285,285,285,285,114,114,114,114,  5,
-284,284,284,284,284,284,287,285,285,285,285,285,285,285,285,288,
-289,289,289,289,289,289,289,289,289,289,288,288,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 29 */
-114,290,290,114,290,114,114,290,290,114,290,114,114,290,114,114,
-114,114,114,114,290,290,290,290,114,290,290,290,290,290,290,290,
-114,290,290,290,114,290,114,290,114,114,290,290,114,290,290,290,
-290,291,290,292,291,291,291,291,291,291,114,291,291,290,114,114,
-290,290,290,290,290,114,293,114,291,291,291,291,291,291,114,114,
-294,294,294,294,294,294,294,294,294,294,114,114,290,290,290,290,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 30 */
-295,296,296,296,297,297,297,297,297,297,297,297,297,297,297,297,
-297,297,297,296,297,296,296,296,298,298,296,296,296,296,296,296,
-299,299,299,299,299,299,299,299,299,299,300,300,300,300,300,300,
-300,300,300,300,296,298,296,298,296,298,301,302,301,302,303,303,
-295,295,295,295,295,295,295,295,114,295,295,295,295,295,295,295,
-295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
-295,295,295,295,295,295,295,295,295,295,295,295,295,114,114,114,
-114,298,298,298,298,298,298,298,298,298,298,298,298,298,298,303,
-
-/* block 31 */
-298,298,298,298,298,297,298,298,295,295,295,295,295,298,298,298,
-298,298,298,298,298,298,298,298,114,298,298,298,298,298,298,298,
-298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
-298,298,298,298,298,298,298,298,298,298,298,298,298,114,296,296,
-296,296,296,296,296,296,298,296,296,296,296,296,296,114,296,296,
-297,297,297,297,297, 19, 19, 19, 19,297,297,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 32 */
-304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
-304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
-304,304,304,304,304,304,304,304,304,304,304,305,305,306,306,306,
-306,307,306,306,306,306,306,306,305,306,306,307,307,306,306,304,
-308,308,308,308,308,308,308,308,308,308,309,309,309,309,309,309,
-304,304,304,304,304,304,307,307,306,306,304,304,304,304,306,306,
-306,304,305,305,305,304,304,305,305,305,305,305,305,305,304,304,
-304,306,306,306,306,304,304,304,304,304,304,304,304,304,304,304,
-
-/* block 33 */
-304,304,306,305,307,306,306,305,305,305,305,305,305,306,304,305,
-308,308,308,308,308,308,308,308,308,308,305,305,305,306,310,310,
-311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,
-311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,
-311,311,311,311,311,311,114,311,114,114,114,114,114,311,114,114,
-312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,
-312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,
-312,312,312,312,312,312,312,312,312,312,312,  4,313,312,312,312,
-
-/* block 34 */
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-
-/* block 35 */
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-315,315,315,315,315,315,315,315,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-
-/* block 36 */
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,114,317,317,317,317,114,114,
-317,317,317,317,317,317,317,114,317,114,317,317,317,317,114,114,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-
-/* block 37 */
-317,317,317,317,317,317,317,317,317,114,317,317,317,317,114,114,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,114,317,317,317,317,114,114,317,317,317,317,317,317,317,114,
-317,114,317,317,317,317,114,114,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-
-/* block 38 */
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,114,317,317,317,317,114,114,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,317,317,317,317,114,114,318,318,318,
-319,319,319,319,319,319,319,319,319,320,320,320,320,320,320,320,
-320,320,320,320,320,320,320,320,320,320,320,320,320,114,114,114,
-
-/* block 39 */
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-321,321,321,321,321,321,321,321,321,321,114,114,114,114,114,114,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,
-322,322,322,322,322,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 40 */
-323,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-
-/* block 41 */
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-
-/* block 42 */
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,325,325,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-
-/* block 43 */
-326,327,327,327,327,327,327,327,327,327,327,327,327,327,327,327,
-327,327,327,327,327,327,327,327,327,327,327,328,329,114,114,114,
-330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,
-330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,
-330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,
-330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,
-330,330,330,330,330,330,330,330,330,330,330,  4,  4,  4,331,331,
-331,330,330,330,330,330,330,330,330,114,114,114,114,114,114,114,
-
-/* block 44 */
-332,332,332,332,332,332,332,332,332,332,332,332,332,114,332,332,
-332,332,333,333,333,114,114,114,114,114,114,114,114,114,114,114,
-334,334,334,334,334,334,334,334,334,334,334,334,334,334,334,334,
-334,334,335,335,335,  4,  4,114,114,114,114,114,114,114,114,114,
-336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,
-336,336,337,337,114,114,114,114,114,114,114,114,114,114,114,114,
-338,338,338,338,338,338,338,338,338,338,338,338,338,114,338,338,
-338,114,339,339,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 45 */
-340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
-340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
-340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
-340,340,340,340,341,341,342,341,341,341,341,341,341,341,342,342,
-342,342,342,342,342,342,341,342,342,341,341,341,341,341,341,341,
-341,341,341,341,343,343,343,344,343,343,343,345,340,341,114,114,
-346,346,346,346,346,346,346,346,346,346,114,114,114,114,114,114,
-347,347,347,347,347,347,347,347,347,347,114,114,114,114,114,114,
-
-/* block 46 */
-348,348,  4,  4,348,  4,349,348,348,348,348,350,350,350,351,114,
-352,352,352,352,352,352,352,352,352,352,114,114,114,114,114,114,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,354,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,114,114,114,114,114,114,114,114,
-
-/* block 47 */
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,353,
-353,353,353,353,353,353,353,353,353,350,353,114,114,114,114,114,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,324,
-324,324,324,324,324,324,114,114,114,114,114,114,114,114,114,114,
-
-/* block 48 */
-355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,
-355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,114,
-356,356,356,357,357,357,357,356,356,357,357,357,114,114,114,114,
-357,357,356,357,357,357,357,357,357,356,356,356,114,114,114,114,
-358,114,114,114,359,359,360,360,360,360,360,360,360,360,360,360,
-361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,
-361,361,361,361,361,361,361,361,361,361,361,361,361,361,114,114,
-361,361,361,361,361,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 49 */
-362,362,362,362,362,362,362,362,362,362,362,362,362,362,362,362,
-362,362,362,362,362,362,362,362,362,362,362,362,362,362,362,362,
-362,362,362,362,362,362,362,362,362,362,362,362,114,114,114,114,
-363,363,363,363,363,364,364,364,363,363,364,363,363,363,363,363,
-363,362,362,362,362,362,362,362,363,363,114,114,114,114,114,114,
-365,365,365,365,365,365,365,365,365,365,366,114,114,114,367,367,
-368,368,368,368,368,368,368,368,368,368,368,368,368,368,368,368,
-368,368,368,368,368,368,368,368,368,368,368,368,368,368,368,368,
-
-/* block 50 */
-369,369,369,369,369,369,369,369,369,369,369,369,369,369,369,369,
-369,369,369,369,369,369,369,370,370,371,371,370,114,114,372,372,
-373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,
-373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,
-373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,
-373,373,373,373,373,374,375,374,375,375,375,375,375,375,375,114,
-375,376,375,376,376,375,375,375,375,375,375,375,375,374,374,374,
-374,374,374,375,375,375,375,375,375,375,375,375,375,114,114,375,
-
-/* block 51 */
-377,377,377,377,377,377,377,377,377,377,114,114,114,114,114,114,
-377,377,377,377,377,377,377,377,377,377,114,114,114,114,114,114,
-378,378,378,378,378,378,378,379,378,378,378,378,378,378,114,114,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,380,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 52 */
-381,381,381,381,382,383,383,383,383,383,383,383,383,383,383,383,
-383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
-383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
-383,383,383,383,381,382,381,381,381,381,381,382,381,382,382,382,
-382,382,381,382,382,383,383,383,383,383,383,383,114,114,114,114,
-384,384,384,384,384,384,384,384,384,384,385,385,385,385,385,385,
-385,386,386,386,386,386,386,386,386,386,386,381,381,381,381,381,
-381,381,381,381,386,386,386,386,386,386,386,386,386,114,114,114,
-
-/* block 53 */
-387,387,388,389,389,389,389,389,389,389,389,389,389,389,389,389,
-389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,
-389,388,387,387,387,387,388,388,387,387,388,387,387,387,389,389,
-390,390,390,390,390,390,390,390,390,390,389,389,389,389,389,389,
-391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,
-391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,
-391,391,391,391,391,391,392,393,392,392,393,393,393,392,393,392,
-392,392,393,393,114,114,114,114,114,114,114,114,394,394,394,394,
-
-/* block 54 */
-395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,
-395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,
-395,395,395,395,396,396,396,396,396,396,396,396,397,397,397,397,
-397,397,397,397,396,396,397,397,114,114,114,398,398,398,398,398,
-399,399,399,399,399,399,399,399,399,399,114,114,114,395,395,395,
-400,400,400,400,400,400,400,400,400,400,401,401,401,401,401,401,
-401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,
-401,401,401,401,401,401,401,401,402,402,402,402,402,402,403,403,
-
-/* block 55 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-404,404,404,404,404,404,404,404,114,114,114,114,114,114,114,114,
-109,109,109,  4,109,109,109,109,109,109,109,109,109,109,109,109,
-109,405,109,109,109,109,109,109,109,406,406,406,406,109,406,406,
-406,406,405,405,109,406,406,114,109,109,114,114,114,114,114,114,
-
-/* block 56 */
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33,122,122,122,122,122,407,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,115,115,115,
-115,115,106,106,106,106,115,115,115,115,115, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33,408,409, 33, 33, 33,410, 33, 33,
-
-/* block 57 */
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,106,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,
-106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,115,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,114,114,114,114,114,114,109,109,109,109,
-
-/* block 58 */
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
-411,412, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
-
-/* block 59 */
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 33, 33, 33, 33, 33,413, 33, 33,414, 33,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
-
-/* block 60 */
-415,415,415,415,415,415,415,415,416,416,416,416,416,416,416,416,
-415,415,415,415,415,415,114,114,416,416,416,416,416,416,114,114,
-415,415,415,415,415,415,415,415,416,416,416,416,416,416,416,416,
-415,415,415,415,415,415,415,415,416,416,416,416,416,416,416,416,
-415,415,415,415,415,415,114,114,416,416,416,416,416,416,114,114,
-122,415,122,415,122,415,122,415,114,416,114,416,114,416,114,416,
-415,415,415,415,415,415,415,415,416,416,416,416,416,416,416,416,
-417,417,418,418,418,418,419,419,420,420,421,421,422,422,114,114,
-
-/* block 61 */
-415,415,415,415,415,415,415,415,423,423,423,423,423,423,423,423,
-415,415,415,415,415,415,415,415,423,423,423,423,423,423,423,423,
-415,415,415,415,415,415,415,415,423,423,423,423,423,423,423,423,
-415,415,122,424,122,114,122,122,416,416,425,425,426,113,427,113,
-113,113,122,424,122,114,122,122,428,428,428,428,426,113,113,113,
-415,415,122,122,114,114,122,122,416,416,429,429,114,113,113,113,
-415,415,122,122,122,163,122,122,416,416,430,430,168,113,113,113,
-114,114,122,424,122,114,122,122,431,431,432,432,426,113,113,114,
-
-/* block 62 */
-  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3, 22,433,433, 22, 22,
-  9,  9,  9,  9,  9,  9,  4,  4, 21, 25,  6, 21, 21, 25,  6, 21,
-  4,  4,  4,  4,  4,  4,  4,  4,434,435, 22, 22, 22, 22, 22,  3,
-  4,  4,  4,  4,  4,  4,  4,  4,  4, 21, 25,  4,  4,  4,  4, 15,
- 15,  4,  4,  4,  8,  6,  7,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-  4,  4,  8,  4, 15,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  3,
- 22, 22, 22, 22, 22,436, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 23,106,114,114, 23, 23, 23, 23, 23, 23,  8,  8,  8,  6,  7,106,
-
-/* block 63 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,  8,  8,  8,  6,  7,114,
-106,106,106,106,106,106,106,106,106,106,106,106,106,114,114,114,
-  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-109,109,109,109,109,109,109,109,109,109,109,109,109,380,380,380,
-380,109,380,380,380,109,109,109,109,109,109,109,109,109,109,109,
-109,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 64 */
- 19, 19,437, 19, 19, 19, 19,437, 19, 19,438,437,437,437,438,438,
-437,437,437,438, 19,437, 19, 19,  8,437,437,437,437,437, 19, 19,
- 19, 19, 19, 19,437, 19,439, 19,437, 19,440,441,437,437, 19,438,
-437,437,442,437,438,406,406,406,406,438, 19, 19,438,438,437,437,
-  8,  8,  8,  8,  8,437,438,438,438,438, 19,  8, 19, 19,443, 19,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,
-445,445,445,445,445,445,445,445,445,445,445,445,445,445,445,445,
-
-/* block 65 */
-446,446,446, 30, 31,446,446,446,446, 23,114,114,114,114,114,114,
-  8,  8,  8,  8,  8, 19, 19, 19, 19, 19,  8,  8, 19, 19, 19, 19,
-  8, 19, 19,  8, 19, 19,  8, 19, 19, 19, 19, 19, 19, 19,  8, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8,  8,
- 19, 19,  8, 19,  8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-
-/* block 66 */
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-
-/* block 67 */
- 19, 19, 19, 19, 19, 19, 19, 19,  6,  7,  6,  7, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-  8,  8, 19, 19, 19, 19, 19, 19, 19,  6,  7, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8, 19, 19, 19,
-
-/* block 68 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8,  8,  8,  8,
-  8,  8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
-
-/* block 69 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-
-/* block 70 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19,447,447,447,447,447,447,447,447,447,447,
-447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,
-448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,
-448,448,448,448,448,448,448,448,448,448, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-
-/* block 71 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 72 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19,  8, 19, 19, 19, 19, 19, 19, 19, 19,
- 19,  8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19,  8,  8,  8,  8,  8,  8,  8,  8,
-
-/* block 73 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  8,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 74 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19,  6,  7,  6,  7,  6,  7,  6,  7,
-  6,  7,  6,  7,  6,  7, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-
-/* block 75 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-  8,  8,  8,  8,  8,  6,  7,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  6,  7,  6,  7,  6,  7,  6,  7,  6,  7,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-
-/* block 76 */
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
-
-/* block 77 */
-  8,  8,  8,  6,  7,  6,  7,  6,  7,  6,  7,  6,  7,  6,  7,  6,
-  7,  6,  7,  6,  7,  6,  7,  6,  7,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  6,  7,  6,  7,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  6,  7,  8,  8,
-
-/* block 78 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8, 19, 19,  8,  8,  8,  8,  8,  8, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114,114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 79 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19,114,114, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19,114, 19, 19, 19, 19, 19, 19,
- 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 80 */
-450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,
-450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,
-450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,114,
-451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,
-451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,
-451,451,451,451,451,451,451,451,451,451,451,451,451,451,451,114,
- 30, 31,452,453,454,455,456, 30, 31, 30, 31, 30, 31,457,458,459,
-460, 33, 30, 31, 33, 30, 31, 33, 33, 33, 33, 33,106,106,461,461,
-
-/* block 81 */
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,159,160,159,160,159,160,159,160,159,160,159,160,
-159,160,159,160,462,463,463,463,463,463,463,159,160,159,160,464,
-464,464,159,160,114,114,114,114,114,465,465,465,465,466,465,465,
-
-/* block 82 */
-467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,
-467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,
-467,467,467,467,467,467,114,467,114,114,114,114,114,467,114,114,
-468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,
-468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,
-468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,468,
-468,468,468,468,468,468,468,468,114,114,114,114,114,114,114,469,
-470,114,114,114,114,114,114,114,114,114,114,114,114,114,114,471,
-
-/* block 83 */
-317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,
-317,317,317,317,317,317,317,114,114,114,114,114,114,114,114,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
-177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,
-177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,
-
-/* block 84 */
-  4,  4, 21, 25, 21, 25,  4,  4,  4, 21, 25,  4, 21, 25,  4,  4,
-  4,  4,  4,  4,  4,  4,  4,  9,  4,  4,  9,  4, 21, 25,  4,  4,
- 21, 25,  6,  7,  6,  7,  6,  7,  6,  7,  4,  4,  4,  4,  4,107,
-  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  9,  9,  4,  4,  4,  4,
-  9,  4,  6,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 85 */
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,114,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 86 */
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-
-/* block 87 */
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,
-472,472,472,472,472,472,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
-
-/* block 88 */
-  3,  4,  4,  4, 19,473,406,474,  6,  7,  6,  7,  6,  7,  6,  7,
-  6,  7, 19, 19,  6,  7,  6,  7,  6,  7,  6,  7,  9,  6,  7,  7,
- 19,474,474,474,474,474,474,474,474,474,109,109,109,109,475,475,
-  9,107,107,107,107,107, 19, 19,474,474,474,473,406,  4, 19, 19,
-114,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-
-/* block 89 */
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,114,114,109,109, 14, 14,477,477,476,
-  9,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,  4,107,479,479,478,
-
-/* block 90 */
-114,114,114,114,114,480,480,480,480,480,480,480,480,480,480,480,
-480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,
-480,480,480,480,480,480,480,480,480,480,480,480,480,480,114,114,
-114,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-
-/* block 91 */
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,114,
- 19, 19, 23, 23, 23, 23, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,
-480,480,480,480,480,480,480,480,480,480,480,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-
-/* block 92 */
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,114,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 23, 23, 23, 23, 23, 23, 23, 23,
- 19, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482, 19,
-
-/* block 93 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,114,
-
-/* block 94 */
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 95 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-
-/* block 96 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 97 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 98 */
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,486,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-
-/* block 99 */
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,
-
-/* block 100 */
-485,485,485,485,485,485,485,485,485,485,485,485,485,114,114,114,
-487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,
-487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,
-487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,
-487,487,487,487,487,487,487,114,114,114,114,114,114,114,114,114,
-488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,
-488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,
-488,488,488,488,488,488,488,488,489,489,489,489,489,489,490,490,
-
-/* block 101 */
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-
-/* block 102 */
-491,491,491,491,491,491,491,491,491,491,491,491,492,493,493,493,
-491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,491,
-494,494,494,494,494,494,494,494,494,494,491,491,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,495,177,
-178,178,178,496,177,177,177,177,177,177,177,177,177,177,496,408,
-
-/* block 103 */
-174,175,174,175,174,175,174,175,174,175,174,175,174,175,174,175,
-174,175,174,175,174,175,174,175,174,175,174,175,408,408,114,177,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,498,498,498,498,498,498,498,498,498,498,
-499,499,500,500,500,500,500,500,114,114,114,114,114,114,114,114,
-
-/* block 104 */
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14,107,107,107,107,107,107,107,107,107,
- 14, 14, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 33, 33, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
-106, 33, 33, 33, 33, 33, 33, 33, 33, 30, 31, 30, 31,501, 30, 31,
-
-/* block 105 */
- 30, 31, 30, 31, 30, 31, 30, 31,107, 14, 14, 30, 31,502, 33,114,
- 30, 31, 30, 31, 33, 33, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,
- 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,503,504,505,506,114,114,
-507,508,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114, 20,106,106, 33, 20, 20, 20, 20, 20,
-
-/* block 106 */
-509,509,510,509,509,509,510,509,509,509,509,510,509,509,509,509,
-509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,
-509,509,509,511,511,510,510,511,512,512,512,512,114,114,114,114,
- 23, 23, 23, 23, 23, 23, 19, 19,  5, 19,114,114,114,114,114,114,
-513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,
-513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,
-513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,
-513,513,513,513,514,514,514,514,114,114,114,114,114,114,114,114,
-
-/* block 107 */
-515,515,516,516,516,516,516,516,516,516,516,516,516,516,516,516,
-516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,
-516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,
-516,516,516,516,515,515,515,515,515,515,515,515,515,515,515,515,
-515,515,515,515,517,114,114,114,114,114,114,114,114,114,518,518,
-519,519,519,519,519,519,519,519,519,519,114,114,114,114,114,114,
-221,221,221,221,221,221,221,221,221,221,221,221,221,221,221,221,
-221,221,223,223,223,223,223,223,225,225,225,223,114,114,114,114,
-
-/* block 108 */
-520,520,520,520,520,520,520,520,520,520,521,521,521,521,521,521,
-521,521,521,521,521,521,521,521,521,521,521,521,521,521,521,521,
-521,521,521,521,521,521,522,522,522,522,522,522,522,522,  4,523,
-524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,
-524,524,524,524,524,524,524,525,525,525,525,525,525,525,525,525,
-525,525,526,526,114,114,114,114,114,114,114,114,114,114,114,527,
-314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
-314,314,314,314,314,314,314,314,314,314,314,314,314,114,114,114,
-
-/* block 109 */
-528,528,528,529,530,530,530,530,530,530,530,530,530,530,530,530,
-530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,
-530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,
-530,530,530,528,529,529,528,528,528,528,529,529,528,529,529,529,
-529,531,531,531,531,531,531,531,531,531,531,531,531,531,114,107,
-532,532,532,532,532,532,532,532,532,532,114,114,114,114,531,531,
-304,304,304,304,304,306,533,304,304,304,304,304,304,304,304,304,
-308,308,308,308,308,308,308,308,308,308,304,304,304,304,304,114,
-
-/* block 110 */
-534,534,534,534,534,534,534,534,534,534,534,534,534,534,534,534,
-534,534,534,534,534,534,534,534,534,534,534,534,534,534,534,534,
-534,534,534,534,534,534,534,534,534,535,535,535,535,535,535,536,
-536,535,535,536,536,535,535,114,114,114,114,114,114,114,114,114,
-534,534,534,535,534,534,534,534,534,534,534,534,535,536,114,114,
-537,537,537,537,537,537,537,537,537,537,114,114,538,538,538,538,
-304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
-533,304,304,304,304,304,304,310,310,310,304,305,306,305,304,304,
-
-/* block 111 */
-539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,
-539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,
-539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,539,
-540,539,540,540,540,539,539,540,540,539,539,539,539,539,540,540,
-539,540,539,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,539,539,541,542,542,
-543,543,543,543,543,543,543,543,543,543,543,544,545,545,544,544,
-546,546,543,547,547,544,545,114,114,114,114,114,114,114,114,114,
-
-/* block 112 */
-114,317,317,317,317,317,317,114,114,317,317,317,317,317,317,114,
-114,317,317,317,317,317,317,114,114,114,114,114,114,114,114,114,
-317,317,317,317,317,317,317,114,317,317,317,317,317,317,317,114,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 14,106,106,106,106,
-114,114,114,114, 33,122,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 113 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-543,543,543,543,543,543,543,543,543,543,543,543,543,543,543,543,
-543,543,543,543,543,543,543,543,543,543,543,543,543,543,543,543,
-543,543,543,544,544,545,544,544,545,544,544,546,544,545,114,114,
-548,548,548,548,548,548,548,548,548,548,114,114,114,114,114,114,
-
-/* block 114 */
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 115 */
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-
-/* block 116 */
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 117 */
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-
-/* block 118 */
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 119 */
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 120 */
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-549,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,549,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,549,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-
-/* block 121 */
-550,550,550,550,550,550,550,550,549,550,550,550,550,550,550,550,
-550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,550,
-550,550,550,550,114,114,114,114,114,114,114,114,114,114,114,114,
-315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
-315,315,315,315,315,315,315,114,114,114,114,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,316,
-316,316,316,316,316,316,316,316,316,316,316,316,114,114,114,114,
-
-/* block 122 */
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,
-
-/* block 123 */
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-
-/* block 124 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,114,114,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-
-/* block 125 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 126 */
- 33, 33, 33, 33, 33, 33, 33,114,114,114,114,114,114,114,114,114,
-114,114,114,185,185,185,185,185,114,114,114,114,114,192,189,192,
-192,192,192,192,192,192,192,192,192,553,192,192,192,192,192,192,
-192,192,192,192,192,192,192,114,192,192,192,192,192,114,192,114,
-192,192,114,192,192,114,192,192,192,192,192,192,192,192,192,192,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 127 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,554,554,554,554,554,554,554,554,554,554,554,554,554,554,
-554,554,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 128 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 129 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,  7,  6,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-
-/* block 130 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-114,114,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-199,199,199,199,199,199,199,199,199,199,199,199,196,197,114,114,
-
-/* block 131 */
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-  4,  4,  4,  4,  4,  4,  4,  6,  7,  4,114,114,114,114,114,114,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,114,114,
-  4,  9,  9, 15, 15,  6,  7,  6,  7,  6,  7,  6,  7,  6,  7,  6,
-  7,  6,  7,  6,  7,  4,  4,  6,  7,  4,  4,  4,  4, 15, 15, 15,
-  4,  4,  4,114,  4,  4,  4,  4,  9,  6,  7,  6,  7,  6,  7,  4,
-  4,  4,  8,  9,  8,  8,  8,114,  4,  5,  4,  4,114,114,114,114,
-199,199,199,199,199,114,199,199,199,199,199,199,199,199,199,199,
-
-/* block 132 */
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,114,114, 22,
-
-/* block 133 */
-114,  4,  4,  4,  5,  4,  4,  4,  6,  7,  4,  8,  4,  9,  4,  4,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  4,  4,  8,  8,  8,  4,
-  4, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  6,  4,  7, 14, 15,
- 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  6,  8,  7,  8,  6,
-  7,  4,  6,  7,  4,  4,478,478,478,478,478,478,478,478,478,478,
-107,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-
-/* block 134 */
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,478,
-478,478,478,478,478,478,478,478,478,478,478,478,478,478,555,555,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,
-481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,114,
-114,114,481,481,481,481,481,481,114,114,481,481,481,481,481,481,
-114,114,481,481,481,481,481,481,114,114,481,481,481,114,114,114,
-  5,  5,  8, 14, 19,  5,  5,114, 19,  8,  8,  8,  8, 19, 19,114,
-436,436,436,436,436,436,436,436,436, 22, 22, 22, 19, 19,114,114,
-
-/* block 135 */
-556,556,556,556,556,556,556,556,556,556,556,556,114,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,114,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,114,556,556,114,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,114,114,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 136 */
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,
-556,556,556,556,556,556,556,556,556,556,556,114,114,114,114,114,
-
-/* block 137 */
-  4,  4,  4,114,114,114,114, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23,114,114,114, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,
-557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,
-557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,
-557,557,557,557,557,558,558,558,558,559,559,559,559,559,559,559,
-
-/* block 138 */
-559,559,559,559,559,559,559,559,559,559,558,558,559,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
-559,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,109,114,114,
-
-/* block 139 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 140 */
-560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,
-560,560,560,560,560,560,560,560,560,560,560,560,560,114,114,114,
-561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,
-561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,
-561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,561,
-561,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-109, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,114,114,114,114,
-
-/* block 141 */
-562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,
-562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,562,
-563,563,563,563,114,114,114,114,114,114,114,114,114,114,114,114,
-564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,
-564,565,564,564,564,564,564,564,564,564,565,114,114,114,114,114,
-566,566,566,566,566,566,566,566,566,566,566,566,566,566,566,566,
-566,566,566,566,566,566,566,566,566,566,566,566,566,566,566,566,
-566,566,566,566,566,566,567,567,567,567,567,114,114,114,114,114,
-
-/* block 142 */
-568,568,568,568,568,568,568,568,568,568,568,568,568,568,568,568,
-568,568,568,568,568,568,568,568,568,568,568,568,568,568,114,569,
-570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
-570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
-570,570,570,570,114,114,114,114,570,570,570,570,570,570,570,570,
-571,572,572,572,572,572,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 143 */
-573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,
-573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,
-573,573,573,573,573,573,573,573,574,574,574,574,574,574,574,574,
-574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,
-574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,
-575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,
-575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,
-575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,575,
-
-/* block 144 */
-576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,
-576,576,576,576,576,576,576,576,576,576,576,576,576,576,114,114,
-577,577,577,577,577,577,577,577,577,577,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 145 */
-578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,
-578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,
-578,578,578,578,578,578,578,578,114,114,114,114,114,114,114,114,
-579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,
-579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,
-579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,579,
-579,579,579,579,114,114,114,114,114,114,114,114,114,114,114,580,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 146 */
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-
-/* block 147 */
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,581,114,114,114,114,114,114,114,114,114,
-581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,581,
-581,581,581,581,581,581,114,114,114,114,114,114,114,114,114,114,
-581,581,581,581,581,581,581,581,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 148 */
-582,582,582,582,582,582,114,114,582,114,582,582,582,582,582,582,
-582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,
-582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,
-582,582,582,582,582,582,114,582,582,114,114,114,582,114,114,582,
-583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,
-583,583,583,583,583,583,114,584,585,585,585,585,585,585,585,585,
-586,586,586,586,586,586,586,586,586,586,586,586,586,586,586,586,
-586,586,586,586,586,586,586,587,587,588,588,588,588,588,588,588,
-
-/* block 149 */
-589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,
-589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,114,
-114,114,114,114,114,114,114,590,590,590,590,590,590,590,590,590,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 150 */
-591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,
-591,591,591,591,591,591,592,592,592,592,592,592,114,114,114,593,
-594,594,594,594,594,594,594,594,594,594,594,594,594,594,594,594,
-594,594,594,594,594,594,594,594,594,594,114,114,114,114,114,595,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 151 */
-596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,
-596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,
-597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,
-597,597,597,597,597,597,597,597,114,114,114,114,114,114,597,597,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 152 */
-598,599,599,599,114,599,599,114,114,114,114,114,599,599,599,599,
-598,598,598,598,114,598,598,598,114,598,598,598,598,598,598,598,
-598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,
-598,598,598,598,114,114,114,114,599,599,599,114,114,114,114,599,
-600,600,600,600,600,600,600,600,114,114,114,114,114,114,114,114,
-601,601,601,601,601,601,601,601,601,114,114,114,114,114,114,114,
-602,602,602,602,602,602,602,602,602,602,602,602,602,602,602,602,
-602,602,602,602,602,602,602,602,602,602,602,602,602,603,603,604,
-
-/* block 153 */
-605,605,605,605,605,605,605,605,605,605,605,605,605,605,605,605,
-605,605,605,605,605,605,605,605,605,605,605,605,605,606,606,606,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-607,607,607,607,607,607,607,607,608,607,607,607,607,607,607,607,
-607,607,607,607,607,607,607,607,607,607,607,607,607,607,607,607,
-607,607,607,607,607,609,609,114,114,114,114,610,610,610,610,610,
-611,611,611,611,611,611,611,114,114,114,114,114,114,114,114,114,
-
-/* block 154 */
-612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,
-612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,
-612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,
-612,612,612,612,612,612,114,114,114,613,613,613,613,613,613,613,
-614,614,614,614,614,614,614,614,614,614,614,614,614,614,614,614,
-614,614,614,614,614,614,114,114,615,615,615,615,615,615,615,615,
-616,616,616,616,616,616,616,616,616,616,616,616,616,616,616,616,
-616,616,616,114,114,114,114,114,617,617,617,617,617,617,617,617,
-
-/* block 155 */
-618,618,618,618,618,618,618,618,618,618,618,618,618,618,618,618,
-618,618,114,114,114,114,114,114,114,619,619,619,619,114,114,114,
-114,114,114,114,114,114,114,114,114,620,620,620,620,620,620,620,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 156 */
-621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,
-621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,
-621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,
-621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,
-621,621,621,621,621,621,621,621,621,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 157 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-622,622,622,622,622,622,622,622,622,622,622,622,622,622,622,622,
-622,622,622,622,622,622,622,622,622,622,622,622,622,622,622,114,
-
-/* block 158 */
-623,624,623,625,625,625,625,625,625,625,625,625,625,625,625,625,
-625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,
-625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,
-625,625,625,625,625,625,625,625,624,624,624,624,624,624,624,624,
-624,624,624,624,624,624,624,626,626,626,626,626,626,626,114,114,
-114,114,627,627,627,627,627,627,627,627,627,627,627,627,627,627,
-627,627,627,627,627,627,628,628,628,628,628,628,628,628,628,628,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,624,
-
-/* block 159 */
-629,629,630,631,631,631,631,631,631,631,631,631,631,631,631,631,
-631,631,631,631,631,631,631,631,631,631,631,631,631,631,631,631,
-631,631,631,631,631,631,631,631,631,631,631,631,631,631,631,631,
-630,630,630,629,629,629,629,630,630,629,629,632,632,633,632,632,
-632,632,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-634,634,634,634,634,634,634,634,634,634,634,634,634,634,634,634,
-634,634,634,634,634,634,634,634,634,114,114,114,114,114,114,114,
-635,635,635,635,635,635,635,635,635,635,114,114,114,114,114,114,
-
-/* block 160 */
-636,636,636,637,637,637,637,637,637,637,637,637,637,637,637,637,
-637,637,637,637,637,637,637,637,637,637,637,637,637,637,637,637,
-637,637,637,637,637,637,637,636,636,636,636,636,638,636,636,636,
-636,636,636,636,636,114,639,639,639,639,639,639,639,639,639,639,
-640,640,640,640,114,114,114,114,114,114,114,114,114,114,114,114,
-641,641,641,641,641,641,641,641,641,641,641,641,641,641,641,641,
-641,641,641,641,641,641,641,641,641,641,641,641,641,641,641,641,
-641,641,641,642,643,643,641,114,114,114,114,114,114,114,114,114,
-
-/* block 161 */
-644,644,645,646,646,646,646,646,646,646,646,646,646,646,646,646,
-646,646,646,646,646,646,646,646,646,646,646,646,646,646,646,646,
-646,646,646,646,646,646,646,646,646,646,646,646,646,646,646,646,
-646,646,646,645,645,645,644,644,644,644,644,644,644,644,644,645,
-645,646,646,646,646,647,647,647,647,114,114,114,114,647,114,114,
-648,648,648,648,648,648,648,648,648,648,646,114,114,114,114,114,
-114,649,649,649,649,649,649,649,649,649,649,649,649,649,649,649,
-649,649,649,649,649,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 162 */
-650,650,650,650,650,650,650,650,650,650,650,650,650,650,650,650,
-650,650,114,650,650,650,650,650,650,650,650,650,650,650,650,650,
-650,650,650,650,650,650,650,650,650,650,650,650,651,651,651,652,
-652,652,651,651,652,651,652,652,653,653,653,653,653,653,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 163 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,
-654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,
-654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,655,
-656,656,656,655,655,655,655,655,655,655,655,114,114,114,114,114,
-657,657,657,657,657,657,657,657,657,657,114,114,114,114,114,114,
-
-/* block 164 */
-114,658,659,659,114,660,660,660,660,660,660,660,660,114,114,660,
-660,114,114,660,660,660,660,660,660,660,660,660,660,660,660,660,
-660,660,660,660,660,660,660,660,660,114,660,660,660,660,660,660,
-660,114,660,660,114,660,660,660,660,660,114,114,658,660,661,659,
-658,659,659,659,659,114,114,659,659,114,114,659,659,659,114,114,
-114,114,114,114,114,114,114,661,114,114,114,114,114,660,660,660,
-660,660,659,659,114,114,658,658,658,658,658,658,658,114,114,114,
-658,658,658,658,658,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 165 */
-662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,
-662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,
-662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,
-663,664,664,665,665,665,665,665,665,664,665,664,664,663,664,665,
-665,664,665,665,662,662,666,662,114,114,114,114,114,114,114,114,
-667,667,667,667,667,667,667,667,667,667,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 166 */
-668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,
-668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,
-668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,669,
-670,670,671,671,671,671,114,114,670,670,670,670,671,671,670,671,
-671,672,672,672,672,672,672,672,672,672,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 167 */
-673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,
-673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,
-673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,
-674,674,674,675,675,675,675,675,675,675,675,674,674,675,674,675,
-675,676,676,676,673,114,114,114,114,114,114,114,114,114,114,114,
-677,677,677,677,677,677,677,677,677,677,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 168 */
-678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,
-678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,
-678,678,678,678,678,678,678,678,678,678,678,679,680,679,680,680,
-679,679,679,679,679,679,680,679,114,114,114,114,114,114,114,114,
-681,681,681,681,681,681,681,681,681,681,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 169 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-682,682,682,682,682,682,682,682,682,682,682,682,682,682,682,682,
-682,682,682,682,682,682,682,682,682,682,682,682,682,682,682,682,
-683,683,683,683,683,683,683,683,683,683,683,683,683,683,683,683,
-683,683,683,683,683,683,683,683,683,683,683,683,683,683,683,683,
-684,684,684,684,684,684,684,684,684,684,685,685,685,685,685,685,
-685,685,685,114,114,114,114,114,114,114,114,114,114,114,114,686,
-
-/* block 170 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,
-687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,
-687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,
-687,687,687,687,687,687,687,687,687,114,114,114,114,114,114,114,
-
-/* block 171 */
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-
-/* block 172 */
-688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,688,
-688,688,688,688,688,688,688,688,688,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 173 */
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,
-689,689,689,689,689,689,689,689,689,689,689,689,689,689,689,114,
-690,690,690,690,690,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 174 */
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-
-/* block 175 */
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,
-691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 176 */
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-
-/* block 177 */
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,497,
-497,497,497,497,497,497,497,497,497,114,114,114,114,114,114,114,
-692,692,692,692,692,692,692,692,692,692,692,692,692,692,692,692,
-692,692,692,692,692,692,692,692,692,692,692,692,692,692,692,114,
-693,693,693,693,693,693,693,693,693,693,114,114,114,114,694,694,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 178 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-695,695,695,695,695,695,695,695,695,695,695,695,695,695,695,695,
-695,695,695,695,695,695,695,695,695,695,695,695,695,695,114,114,
-696,696,696,696,696,697,114,114,114,114,114,114,114,114,114,114,
-
-/* block 179 */
-698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,
-698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,
-698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,
-699,699,699,699,699,699,699,700,700,700,700,700,701,701,701,701,
-702,702,702,702,700,701,114,114,114,114,114,114,114,114,114,114,
-703,703,703,703,703,703,703,703,703,703,114,704,704,704,704,704,
-704,704,114,698,698,698,698,698,698,698,698,698,698,698,698,698,
-698,698,698,698,698,698,698,698,114,114,114,114,114,698,698,698,
-
-/* block 180 */
-698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 181 */
-705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,
-705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,
-705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,
-705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,705,
-705,705,705,705,705,114,114,114,114,114,114,114,114,114,114,114,
-705,706,706,706,706,706,706,706,706,706,706,706,706,706,706,706,
-706,706,706,706,706,706,706,706,706,706,706,706,706,706,706,706,
-706,706,706,706,706,706,706,706,706,706,706,706,706,706,706,114,
-
-/* block 182 */
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,707,
-707,707,707,708,708,708,708,708,708,708,708,708,708,708,708,708,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 183 */
-478,476,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 184 */
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,709,
-709,709,709,709,709,709,709,709,709,709,709,114,114,114,114,114,
-709,709,709,709,709,709,709,709,709,709,709,709,709,114,114,114,
-
-/* block 185 */
-709,709,709,709,709,709,709,709,709,114,114,114,114,114,114,114,
-709,709,709,709,709,709,709,709,709,709,114,114,710,711,711,712,
- 22, 22, 22, 22,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 186 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,
-
-/* block 187 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19,114,114, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19,713,405,109,109,109, 19, 19, 19,405,713,713,
-713,713,713, 22, 22, 22, 22, 22, 22, 22, 22,109,109,109,109,109,
-
-/* block 188 */
-109,109,109, 19, 19,109,109,109,109,109,109,109, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,109,109,109,109, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 189 */
-559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
-559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
-559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
-559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
-559,559,714,714,714,559,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 190 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
- 23, 23,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 191 */
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,438,438,
-438,438,438,438,438,114,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-
-/* block 192 */
-437,437,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,437,114,437,437,
-114,114,437,114,114,437,437,114,114,437,437,437,437,114,437,437,
-437,437,437,437,437,437,438,438,438,438,114,438,114,438,438,438,
-438,438,438,438,114,438,438,438,438,438,438,438,438,438,438,438,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-
-/* block 193 */
-438,438,438,438,437,437,114,437,437,437,437,114,114,437,437,437,
-437,437,437,437,437,114,437,437,437,437,437,437,437,114,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,437,437,114,437,437,437,437,114,
-437,437,437,437,437,114,437,114,114,114,437,437,437,437,437,437,
-437,114,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-
-/* block 194 */
-437,437,437,437,437,437,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-
-/* block 195 */
-438,438,438,438,438,438,438,438,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-
-/* block 196 */
-437,437,437,437,437,437,437,437,437,437,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,114,114,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,  8,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,  8,438,438,438,438,
-438,438,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,  8,438,438,438,438,
-
-/* block 197 */
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,  8,438,438,438,438,438,438,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,  8,438,438,438,438,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,  8,
-438,438,438,438,438,438,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,  8,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-
-/* block 198 */
-438,438,438,438,438,438,438,438,438,  8,438,438,438,438,438,438,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,437,437,437,437,437,  8,438,438,438,438,438,438,
-438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
-438,438,438,  8,438,438,438,438,438,438,437,438,114,114, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-
-/* block 199 */
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-
-/* block 200 */
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,
-715,715,715,715,715,114,114,716,716,716,716,716,716,716,716,716,
-717,717,717,717,717,717,717,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 201 */
-199,199,199,199,114,199,199,199,199,199,199,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,
-114,199,199,114,199,114,114,199,114,199,199,199,199,199,199,199,
-199,199,199,114,199,199,199,199,114,199,114,199,114,114,114,114,
-114,114,199,114,114,114,114,199,114,199,114,199,114,199,199,199,
-114,199,199,114,199,114,114,199,114,199,114,199,114,199,114,199,
-114,199,199,114,199,114,114,199,199,199,199,114,199,199,199,199,
-199,199,199,114,199,199,199,199,114,199,199,199,199,114,199,114,
-
-/* block 202 */
-199,199,199,199,199,199,199,199,199,199,114,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,114,114,114,114,
-114,199,199,199,114,199,199,199,199,199,114,199,199,199,199,199,
-199,199,199,199,199,199,199,199,199,199,199,199,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-194,194,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 203 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 204 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,
-114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,
-
-/* block 205 */
- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 206 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,718,718,718,718,718,718,718,718,718,718,
-718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,
-
-/* block 207 */
-719, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,
- 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 208 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,
-
-/* block 209 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,
-114,114,114,114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,
-
-/* block 210 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,
-
-/* block 211 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114, 19, 19, 19, 19, 19,
-
-/* block 212 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 213 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19,114,114, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 214 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,
- 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 215 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 216 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 217 */
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-
-/* block 218 */
- 19, 19, 19, 19, 19, 19, 19, 19,114,114,114,114,114,114,114,114,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 219 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 220 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,114,114,114,114,114,114,114,114,114,114,114,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-
-/* block 221 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,114,
-
-/* block 222 */
-436, 22,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-
-/* block 223 */
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-
-/* block 224 */
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-
-/* block 225 */
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,
-
-/* block 226 */
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,114,114,
-
-};
-
-#if UCD_BLOCK_SIZE != 128
-#error Please correct UCD_BLOCK_SIZE in pcre_internal.h
-#endif
-#endif  /* SUPPORT_UCP */
-
-#endif  /* PCRE_INCLUDED */
diff --git a/Foundation/src/pcre_version.c b/Foundation/src/pcre_version.c
deleted file mode 100644
index b48b2ee20..000000000
--- a/Foundation/src/pcre_version.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_version(), which returns a
-string that identifies the PCRE version that is in use. */
-
-#include "pcre_config.h"
-#include "pcre_internal.h"
-
-
-/*************************************************
-*          Return version string                 *
-*************************************************/
-
-/* These macros are the standard way of turning unquoted text into C strings.
-They allow macros like PCRE_MAJOR to be defined without quotes, which is
-convenient for user programs that want to test its value. */
-
-#define STRING(a)  # a
-#define XSTRING(s) STRING(s)
-
-/* A problem turned up with PCRE_PRERELEASE, which is defined empty for
-production releases. Originally, it was used naively in this code:
-
-  return XSTRING(PCRE_MAJOR)
-         "." XSTRING(PCRE_MINOR)
-             XSTRING(PCRE_PRERELEASE)
-         " " XSTRING(PCRE_DATE);
-
-However, when PCRE_PRERELEASE is empty, this leads to an attempted expansion of
-STRING(). The C standard states: "If (before argument substitution) any
-argument consists of no preprocessing tokens, the behavior is undefined." It
-turns out the gcc treats this case as a single empty string - which is what we
-really want - but Visual C grumbles about the lack of an argument for the
-macro. Unfortunately, both are within their rights. To cope with both ways of
-handling this, I had resort to some messy hackery that does a test at run time.
-I could find no way of detecting that a macro is defined as an empty string at
-pre-processor time. This hack uses a standard trick for avoiding calling
-the STRING macro with an empty argument when doing the test. */
-
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION
-pcre_version(void)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION
-pcre16_version(void)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION
-pcre32_version(void)
-#endif
-{
-return (XSTRING(Z PCRE_PRERELEASE)[1] == 0)?
-  XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE) :
-  XSTRING(PCRE_MAJOR.PCRE_MINOR) XSTRING(PCRE_PRERELEASE PCRE_DATE);
-}
-
-/* End of pcre_version.c */
diff --git a/Foundation/src/double-conversion.cc b/Foundation/src/string-to-double.cc
similarity index 62%
rename from Foundation/src/double-conversion.cc
rename to Foundation/src/string-to-double.cc
index 6da28ed32..fe633aace 100644
--- a/Foundation/src/double-conversion.cc
+++ b/Foundation/src/string-to-double.cc
@@ -29,397 +29,25 @@
 #include <locale>
 #include <cmath>
 
-#include "double-conversion.h"
+#include "string-to-double.h"
 
-#include "bignum-dtoa.h"
-#include "fast-dtoa.h"
-#include "fixed-dtoa.h"
 #include "ieee.h"
 #include "strtod.h"
 #include "utils.h"
 
-namespace double_conversion {
-
-const DoubleToStringConverter& DoubleToStringConverter::EcmaScriptConverter() {
-  int flags = UNIQUE_ZERO | EMIT_POSITIVE_EXPONENT_SIGN;
-  static DoubleToStringConverter converter(flags,
-                                           "Infinity",
-                                           "NaN",
-                                           'e',
-                                           -6, 21,
-                                           6, 0);
-  return converter;
-}
-
-
-bool DoubleToStringConverter::HandleSpecialValues(
-    double value,
-    StringBuilder* result_builder) const {
-  Double double_inspect(value);
-  if (double_inspect.IsInfinite()) {
-    if (infinity_symbol_ == NULL) return false;
-    if (value < 0) {
-      result_builder->AddCharacter('-');
-    }
-    result_builder->AddString(infinity_symbol_);
-    return true;
-  }
-  if (double_inspect.IsNan()) {
-    if (nan_symbol_ == NULL) return false;
-    result_builder->AddString(nan_symbol_);
-    return true;
-  }
-  return false;
-}
-
-
-void DoubleToStringConverter::CreateExponentialRepresentation(
-    const char* decimal_digits,
-    int length,
-    int exponent,
-    StringBuilder* result_builder) const {
-  ASSERT(length != 0);
-  result_builder->AddCharacter(decimal_digits[0]);
-  if (length != 1) {
-    result_builder->AddCharacter('.');
-    result_builder->AddSubstring(&decimal_digits[1], length-1);
-  }
-  result_builder->AddCharacter(exponent_character_);
-  if (exponent < 0) {
-    result_builder->AddCharacter('-');
-    exponent = -exponent;
-  } else {
-    if ((flags_ & EMIT_POSITIVE_EXPONENT_SIGN) != 0) {
-      result_builder->AddCharacter('+');
-    }
-  }
-  if (exponent == 0) {
-    result_builder->AddCharacter('0');
-    return;
-  }
-  ASSERT(exponent < 1e4);
-  const int kMaxExponentLength = 5;
-  char buffer[kMaxExponentLength + 1];
-  buffer[kMaxExponentLength] = '\0';
-  int first_char_pos = kMaxExponentLength;
-  while (exponent > 0) {
-    buffer[--first_char_pos] = '0' + (exponent % 10);
-    exponent /= 10;
-  }
-  result_builder->AddSubstring(&buffer[first_char_pos],
-                               kMaxExponentLength - first_char_pos);
-}
-
-
-void DoubleToStringConverter::CreateDecimalRepresentation(
-    const char* decimal_digits,
-    int length,
-    int decimal_point,
-    int digits_after_point,
-    StringBuilder* result_builder) const {
-  // Create a representation that is padded with zeros if needed.
-  if (decimal_point <= 0) {
-      // "0.00000decimal_rep" or "0.000decimal_rep00".
-    result_builder->AddCharacter('0');
-    if (digits_after_point > 0) {
-      result_builder->AddCharacter('.');
-      result_builder->AddPadding('0', -decimal_point);
-      ASSERT(length <= digits_after_point - (-decimal_point));
-      result_builder->AddSubstring(decimal_digits, length);
-      int remaining_digits = digits_after_point - (-decimal_point) - length;
-      result_builder->AddPadding('0', remaining_digits);
-    }
-  } else if (decimal_point >= length) {
-    // "decimal_rep0000.00000" or "decimal_rep.0000".
-    result_builder->AddSubstring(decimal_digits, length);
-    result_builder->AddPadding('0', decimal_point - length);
-    if (digits_after_point > 0) {
-      result_builder->AddCharacter('.');
-      result_builder->AddPadding('0', digits_after_point);
-    }
-  } else {
-    // "decima.l_rep000".
-    ASSERT(digits_after_point > 0);
-    result_builder->AddSubstring(decimal_digits, decimal_point);
-    result_builder->AddCharacter('.');
-    ASSERT(length - decimal_point <= digits_after_point);
-    result_builder->AddSubstring(&decimal_digits[decimal_point],
-                                 length - decimal_point);
-    int remaining_digits = digits_after_point - (length - decimal_point);
-    result_builder->AddPadding('0', remaining_digits);
-  }
-  if (digits_after_point == 0) {
-    if ((flags_ & EMIT_TRAILING_DECIMAL_POINT) != 0) {
-      result_builder->AddCharacter('.');
-    }
-    if ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) {
-      result_builder->AddCharacter('0');
-    }
-  }
-}
-
-
-bool DoubleToStringConverter::ToShortestIeeeNumber(
-    double value,
-    StringBuilder* result_builder,
-    DoubleToStringConverter::DtoaMode mode) const {
-  ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE);
-  if (Double(value).IsSpecial()) {
-    return HandleSpecialValues(value, result_builder);
-  }
-
-  int decimal_point;
-  bool sign;
-  const int kDecimalRepCapacity = kBase10MaximalLength + 1;
-  char decimal_rep[kDecimalRepCapacity];
-  int decimal_rep_length;
-
-  DoubleToAscii(value, mode, 0, decimal_rep, kDecimalRepCapacity,
-                &sign, &decimal_rep_length, &decimal_point);
-
-  bool unique_zero = (flags_ & UNIQUE_ZERO) != 0;
-  if (sign && (value != 0.0 || !unique_zero)) {
-    result_builder->AddCharacter('-');
-  }
-
-  int exponent = decimal_point - 1;
-  if ((decimal_in_shortest_low_ <= exponent) &&
-      (exponent < decimal_in_shortest_high_)) {
-    CreateDecimalRepresentation(decimal_rep, decimal_rep_length,
-                                decimal_point,
-                                Max(0, decimal_rep_length - decimal_point),
-                                result_builder);
-  } else {
-    CreateExponentialRepresentation(decimal_rep, decimal_rep_length, exponent,
-                                    result_builder);
-  }
-  return true;
-}
-
-
-bool DoubleToStringConverter::ToFixed(double value,
-                                      int requested_digits,
-                                      StringBuilder* result_builder) const {
-  ASSERT(kMaxFixedDigitsBeforePoint == 60);
-  const double kFirstNonFixed = 1e60;
-
-  if (Double(value).IsSpecial()) {
-    return HandleSpecialValues(value, result_builder);
-  }
-
-  if (requested_digits > kMaxFixedDigitsAfterPoint) return false;
-  if (value >= kFirstNonFixed || value <= -kFirstNonFixed) return false;
-
-  // Find a sufficiently precise decimal representation of n.
-  int decimal_point;
-  bool sign;
-  // Add space for the '\0' byte.
-  const int kDecimalRepCapacity =
-      kMaxFixedDigitsBeforePoint + kMaxFixedDigitsAfterPoint + 1;
-  char decimal_rep[kDecimalRepCapacity];
-  int decimal_rep_length;
-  DoubleToAscii(value, FIXED, requested_digits,
-                decimal_rep, kDecimalRepCapacity,
-                &sign, &decimal_rep_length, &decimal_point);
-
-  bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0);
-  if (sign && (value != 0.0 || !unique_zero)) {
-    result_builder->AddCharacter('-');
-  }
-
-  CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point,
-                              requested_digits, result_builder);
-  return true;
-}
-
-
-bool DoubleToStringConverter::ToExponential(
-    double value,
-    int requested_digits,
-    StringBuilder* result_builder) const {
-  if (Double(value).IsSpecial()) {
-    return HandleSpecialValues(value, result_builder);
-  }
-
-  if (requested_digits < -1) return false;
-  if (requested_digits > kMaxExponentialDigits) return false;
-
-  int decimal_point;
-  bool sign;
-  // Add space for digit before the decimal point and the '\0' character.
-  const int kDecimalRepCapacity = kMaxExponentialDigits + 2;
-  ASSERT(kDecimalRepCapacity > kBase10MaximalLength);
-  char decimal_rep[kDecimalRepCapacity];
-#ifndef NDEBUG
-  // Problem: there is an assert in StringBuilder::AddSubstring() that
-  // will pass this buffer to strlen(), and this buffer is not generally
-  // null-terminated.
-  memset(decimal_rep, 0, sizeof(decimal_rep));
+#ifdef _MSC_VER
+#  if _MSC_VER >= 1900
+// Fix MSVC >= 2015 (_MSC_VER == 1900) warning
+// C4244: 'argument': conversion from 'const uc16' to 'char', possible loss of data
+// against Advance and friends, when instantiated with **it as char, not uc16.
+ __pragma(warning(disable: 4244))
+#  endif
+#  if _MSC_VER <= 1700 // VS2012, see IsDecimalDigitForRadix warning fix, below
+#    define VS2012_RADIXWARN
+#  endif
 #endif
-  int decimal_rep_length;
-
-  if (requested_digits == -1) {
-    DoubleToAscii(value, SHORTEST, 0,
-                  decimal_rep, kDecimalRepCapacity,
-                  &sign, &decimal_rep_length, &decimal_point);
-  } else {
-    DoubleToAscii(value, PRECISION, requested_digits + 1,
-                  decimal_rep, kDecimalRepCapacity,
-                  &sign, &decimal_rep_length, &decimal_point);
-    ASSERT(decimal_rep_length <= requested_digits + 1);
-
-    for (int i = decimal_rep_length; i < requested_digits + 1; ++i) {
-      decimal_rep[i] = '0';
-    }
-    decimal_rep_length = requested_digits + 1;
-  }
-
-  bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0);
-  if (sign && (value != 0.0 || !unique_zero)) {
-    result_builder->AddCharacter('-');
-  }
-
-  int exponent = decimal_point - 1;
-  CreateExponentialRepresentation(decimal_rep,
-                                  decimal_rep_length,
-                                  exponent,
-                                  result_builder);
-  return true;
-}
-
-
-bool DoubleToStringConverter::ToPrecision(double value,
-                                          int precision,
-                                          StringBuilder* result_builder) const {
-  if (Double(value).IsSpecial()) {
-    return HandleSpecialValues(value, result_builder);
-  }
-
-  if (precision < kMinPrecisionDigits || precision > kMaxPrecisionDigits) {
-    return false;
-  }
-
-  // Find a sufficiently precise decimal representation of n.
-  int decimal_point;
-  bool sign;
-  // Add one for the terminating null character.
-  const int kDecimalRepCapacity = kMaxPrecisionDigits + 1;
-  char decimal_rep[kDecimalRepCapacity];
-  int decimal_rep_length;
-
-  DoubleToAscii(value, PRECISION, precision,
-                decimal_rep, kDecimalRepCapacity,
-                &sign, &decimal_rep_length, &decimal_point);
-  ASSERT(decimal_rep_length <= precision);
-
-  bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0);
-  if (sign && (value != 0.0 || !unique_zero)) {
-    result_builder->AddCharacter('-');
-  }
-
-  // The exponent if we print the number as x.xxeyyy. That is with the
-  // decimal point after the first digit.
-  int exponent = decimal_point - 1;
-
-  int extra_zero = ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) ? 1 : 0;
-  if ((-decimal_point + 1 > max_leading_padding_zeroes_in_precision_mode_) ||
-      (decimal_point - precision + extra_zero >
-       max_trailing_padding_zeroes_in_precision_mode_)) {
-    // Fill buffer to contain 'precision' digits.
-    // Usually the buffer is already at the correct length, but 'DoubleToAscii'
-    // is allowed to return less characters.
-    for (int i = decimal_rep_length; i < precision; ++i) {
-      decimal_rep[i] = '0';
-    }
-
-    CreateExponentialRepresentation(decimal_rep,
-                                    precision,
-                                    exponent,
-                                    result_builder);
-  } else {
-    CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point,
-                                Max(0, precision - decimal_point),
-                                result_builder);
-  }
-  return true;
-}
-
-
-static BignumDtoaMode DtoaToBignumDtoaMode(
-    DoubleToStringConverter::DtoaMode dtoa_mode) {
-  switch (dtoa_mode) {
-    case DoubleToStringConverter::SHORTEST:  return BIGNUM_DTOA_SHORTEST;
-    case DoubleToStringConverter::SHORTEST_SINGLE:
-        return BIGNUM_DTOA_SHORTEST_SINGLE;
-    case DoubleToStringConverter::FIXED:     return BIGNUM_DTOA_FIXED;
-    case DoubleToStringConverter::PRECISION: return BIGNUM_DTOA_PRECISION;
-    default:
-      UNREACHABLE();
-  }
-}
-
-
-void DoubleToStringConverter::DoubleToAscii(double v,
-                                            DtoaMode mode,
-                                            int requested_digits,
-                                            char* buffer,
-                                            int buffer_length,
-                                            bool* sign,
-                                            int* length,
-                                            int* point) {
-  Vector<char> vector(buffer, buffer_length);
-  ASSERT(!Double(v).IsSpecial());
-  ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE || requested_digits >= 0);
-
-  if (Double(v).Sign() < 0) {
-    *sign = true;
-    v = -v;
-  } else {
-    *sign = false;
-  }
-
-  if (mode == PRECISION && requested_digits == 0) {
-    vector[0] = '\0';
-    *length = 0;
-    return;
-  }
-
-  if (v == 0) {
-    vector[0] = '0';
-    vector[1] = '\0';
-    *length = 1;
-    *point = 1;
-    return;
-  }
-
-  bool fast_worked;
-  switch (mode) {
-    case SHORTEST:
-      fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST, 0, vector, length, point);
-      break;
-    case SHORTEST_SINGLE:
-      fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST_SINGLE, 0,
-                             vector, length, point);
-      break;
-    case FIXED:
-      fast_worked = FastFixedDtoa(v, requested_digits, vector, length, point);
-      break;
-    case PRECISION:
-      fast_worked = FastDtoa(v, FAST_DTOA_PRECISION, requested_digits,
-                             vector, length, point);
-      break;
-    default:
-      fast_worked = false;
-      UNREACHABLE();
-  }
-  if (fast_worked) return;
-
-  // If the fast dtoa didn't succeed use the slower bignum version.
-  BignumDtoaMode bignum_mode = DtoaToBignumDtoaMode(mode);
-  BignumDtoa(v, bignum_mode, requested_digits, vector, length, point);
-  vector[*length] = '\0';
-}
 
+namespace double_conversion {
 
 namespace {
 
@@ -438,7 +66,7 @@ static inline bool ConsumeSubStringImpl(Iterator* current,
                                         Iterator end,
                                         const char* substring,
                                         Converter converter) {
-  ASSERT(converter(**current) == *substring);
+  DOUBLE_CONVERSION_ASSERT(converter(**current) == *substring);
   for (substring++; *substring != '\0'; substring++) {
     ++*current;
     if (*current == end || converter(**current) != *substring) {
@@ -455,8 +83,8 @@ template <class Iterator>
 static bool ConsumeSubString(Iterator* current,
                              Iterator end,
                              const char* substring,
-                             bool allow_case_insensibility) {
-  if (allow_case_insensibility) {
+                             bool allow_case_insensitivity) {
+  if (allow_case_insensitivity) {
     return ConsumeSubStringImpl(current, end, substring, ToLower);
   } else {
     return ConsumeSubStringImpl(current, end, substring, Pass);
@@ -466,8 +94,8 @@ static bool ConsumeSubString(Iterator* current,
 // Consumes first character of the str is equal to ch
 inline bool ConsumeFirstCharacter(char ch,
                                          const char* str,
-                                         bool case_insensibility) {
-  return case_insensibility ? ToLower(ch) == str[0] : ch == str[0];
+                                         bool case_insensitivity) {
+  return case_insensitivity ? ToLower(ch) == str[0] : ch == str[0];
 }
 }  // namespace
 
@@ -482,14 +110,14 @@ const int kMaxSignificantDigits = 772;
 
 
 static const char kWhitespaceTable7[] = { 32, 13, 10, 9, 11, 12 };
-static const int kWhitespaceTable7Length = ARRAY_SIZE(kWhitespaceTable7);
+static const int kWhitespaceTable7Length = DOUBLE_CONVERSION_ARRAY_SIZE(kWhitespaceTable7);
 
 
 static const uc16 kWhitespaceTable16[] = {
   160, 8232, 8233, 5760, 6158, 8192, 8193, 8194, 8195,
   8196, 8197, 8198, 8199, 8200, 8201, 8202, 8239, 8287, 12288, 65279
 };
-static const int kWhitespaceTable16Length = ARRAY_SIZE(kWhitespaceTable16);
+static const int kWhitespaceTable16Length = DOUBLE_CONVERSION_ARRAY_SIZE(kWhitespaceTable16);
 
 
 static bool isWhitespace(int x) {
@@ -533,9 +161,9 @@ static double SignedZero(bool sign) {
 //
 // The function is small and could be inlined, but VS2012 emitted a warning
 // because it constant-propagated the radix and concluded that the last
-// condition was always true. By moving it into a separate function the
-// compiler wouldn't warn anymore.
-#ifdef _MSC_VER
+// condition was always true. Moving it into a separate function and
+// suppressing optimisation keeps the compiler from warning.
+#ifdef VS2012_RADIXWARN
 #pragma optimize("",off)
 static bool IsDecimalDigitForRadix(int c, int radix) {
   return '0' <= c && c <= '9' && (c - '0') < radix;
@@ -589,7 +217,7 @@ static bool IsHexFloatString(Iterator start,
                              Iterator end,
                              uc16 separator,
                              bool allow_trailing_junk) {
-  ASSERT(start != end);
+  DOUBLE_CONVERSION_ASSERT(start != end);
 
   Iterator current = start;
 
@@ -634,8 +262,8 @@ static double RadixStringToIeee(Iterator* current,
                                 double junk_string_value,
                                 bool read_as_double,
                                 bool* result_is_junk) {
-  ASSERT(*current != end);
-  ASSERT(!parse_as_hex_float ||
+  DOUBLE_CONVERSION_ASSERT(*current != end);
+  DOUBLE_CONVERSION_ASSERT(!parse_as_hex_float ||
       IsHexFloatString(*current, end, separator, allow_trailing_junk));
 
   const int kDoubleSize = Double::kSignificandSize;
@@ -673,7 +301,7 @@ static double RadixStringToIeee(Iterator* current,
     } else if (parse_as_hex_float && **current == '.') {
       post_decimal = true;
       Advance(current, separator, radix, end);
-      ASSERT(*current != end);
+      DOUBLE_CONVERSION_ASSERT(*current != end);
       continue;
     } else if (parse_as_hex_float && (**current == 'p' || **current == 'P')) {
       break;
@@ -708,7 +336,7 @@ static double RadixStringToIeee(Iterator* current,
           // Just run over the '.'. We are just trying to see whether there is
           // a non-zero digit somewhere.
           Advance(current, separator, radix, end);
-          ASSERT(*current != end);
+          DOUBLE_CONVERSION_ASSERT(*current != end);
           post_decimal = true;
         }
         if (!isDigit(**current, radix)) break;
@@ -743,23 +371,23 @@ static double RadixStringToIeee(Iterator* current,
     if (Advance(current, separator, radix, end)) break;
   }
 
-  ASSERT(number < ((int64_t)1 << kSignificandSize));
-  ASSERT(static_cast<int64_t>(static_cast<double>(number)) == number);
+  DOUBLE_CONVERSION_ASSERT(number < ((int64_t)1 << kSignificandSize));
+  DOUBLE_CONVERSION_ASSERT(static_cast<int64_t>(static_cast<double>(number)) == number);
 
   *result_is_junk = false;
 
   if (parse_as_hex_float) {
-    ASSERT(**current == 'p' || **current == 'P');
+    DOUBLE_CONVERSION_ASSERT(**current == 'p' || **current == 'P');
     Advance(current, separator, radix, end);
-    ASSERT(*current != end);
+    DOUBLE_CONVERSION_ASSERT(*current != end);
     bool is_negative = false;
     if (**current == '+') {
       Advance(current, separator, radix, end);
-      ASSERT(*current != end);
+      DOUBLE_CONVERSION_ASSERT(*current != end);
     } else if (**current == '-') {
       is_negative = true;
       Advance(current, separator, radix, end);
-      ASSERT(*current != end);
+      DOUBLE_CONVERSION_ASSERT(*current != end);
     }
     int written_exponent = 0;
     while (IsDecimalDigitForRadix(**current, 10)) {
@@ -782,7 +410,7 @@ static double RadixStringToIeee(Iterator* current,
     return static_cast<double>(number);
   }
 
-  ASSERT(number != 0);
+  DOUBLE_CONVERSION_ASSERT(number != 0);
   double result = Double(DiyFp(number, exponent)).value();
   return sign ? -result : result;
 }
@@ -802,7 +430,7 @@ double StringToDoubleConverter::StringToIeee(
   const bool allow_leading_spaces = (flags_ & ALLOW_LEADING_SPACES) != 0;
   const bool allow_trailing_spaces = (flags_ & ALLOW_TRAILING_SPACES) != 0;
   const bool allow_spaces_after_sign = (flags_ & ALLOW_SPACES_AFTER_SIGN) != 0;
-  const bool allow_case_insensibility = (flags_ & ALLOW_CASE_INSENSIBILITY) != 0;
+  const bool allow_case_insensitivity = (flags_ & ALLOW_CASE_INSENSITIVITY) != 0;
 
   // To make sure that iterator dereferencing is valid the following
   // convention is used:
@@ -825,11 +453,6 @@ double StringToDoubleConverter::StringToIeee(
     }
   }
 
-  // The longest form of simplified number is: "-<significant digits>.1eXXX\0".
-  const int kBufferSize = kMaxSignificantDigits + 10;
-  char buffer[kBufferSize];  // NOLINT: size is known at compile time.
-  int buffer_pos = 0;
-
   // Exponent will be adjusted if insignificant digits of the integer part
   // or insignificant leading zeros of the fractional part are dropped.
   int exponent = 0;
@@ -852,8 +475,8 @@ double StringToDoubleConverter::StringToIeee(
   }
 
   if (infinity_symbol_ != NULL) {
-    if (ConsumeFirstCharacter(*current, infinity_symbol_, allow_case_insensibility)) {
-      if (!ConsumeSubString(&current, end, infinity_symbol_, allow_case_insensibility)) {
+    if (ConsumeFirstCharacter(*current, infinity_symbol_, allow_case_insensitivity)) {
+      if (!ConsumeSubString(&current, end, infinity_symbol_, allow_case_insensitivity)) {
         return junk_string_value_;
       }
 
@@ -864,15 +487,14 @@ double StringToDoubleConverter::StringToIeee(
         return junk_string_value_;
       }
 
-      ASSERT(buffer_pos == 0);
       *processed_characters_count = static_cast<int>(current - input);
       return sign ? -Double::Infinity() : Double::Infinity();
     }
   }
 
   if (nan_symbol_ != NULL) {
-    if (ConsumeFirstCharacter(*current, nan_symbol_, allow_case_insensibility)) {
-      if (!ConsumeSubString(&current, end, nan_symbol_, allow_case_insensibility)) {
+    if (ConsumeFirstCharacter(*current, nan_symbol_, allow_case_insensitivity)) {
+      if (!ConsumeSubString(&current, end, nan_symbol_, allow_case_insensitivity)) {
         return junk_string_value_;
       }
 
@@ -883,7 +505,6 @@ double StringToDoubleConverter::StringToIeee(
         return junk_string_value_;
       }
 
-      ASSERT(buffer_pos == 0);
       *processed_characters_count = static_cast<int>(current - input);
       return sign ? -Double::NaN() : Double::NaN();
     }
@@ -940,10 +561,16 @@ double StringToDoubleConverter::StringToIeee(
 
   bool octal = leading_zero && (flags_ & ALLOW_OCTALS) != 0;
 
+  // The longest form of simplified number is: "-<significant digits>.1eXXX\0".
+  const int kBufferSize = kMaxSignificantDigits + 10;
+  DOUBLE_CONVERSION_STACK_UNINITIALIZED char
+      buffer[kBufferSize];  // NOLINT: size is known at compile time.
+  int buffer_pos = 0;
+
   // Copy significant digits of the integer part (if any) to the buffer.
   while (*current >= '0' && *current <= '9') {
     if (significant_digits < kMaxSignificantDigits) {
-      ASSERT(buffer_pos < kBufferSize);
+      DOUBLE_CONVERSION_ASSERT(buffer_pos < kBufferSize);
       buffer[buffer_pos++] = static_cast<char>(*current);
       significant_digits++;
       // Will later check if it's an octal in the buffer.
@@ -988,7 +615,7 @@ double StringToDoubleConverter::StringToIeee(
     // We don't emit a '.', but adjust the exponent instead.
     while (*current >= '0' && *current <= '9') {
       if (significant_digits < kMaxSignificantDigits) {
-        ASSERT(buffer_pos < kBufferSize);
+        DOUBLE_CONVERSION_ASSERT(buffer_pos < kBufferSize);
         buffer[buffer_pos++] = static_cast<char>(*current);
         significant_digits++;
         exponent--;
@@ -1046,7 +673,7 @@ double StringToDoubleConverter::StringToIeee(
     }
 
     const int max_exponent = INT_MAX / 2;
-    ASSERT(-max_exponent / 2 <= exponent && exponent <= max_exponent / 2);
+    DOUBLE_CONVERSION_ASSERT(-max_exponent / 2 <= exponent && exponent <= max_exponent / 2);
     int num = 0;
     do {
       // Check overflow.
@@ -1089,7 +716,7 @@ double StringToDoubleConverter::StringToIeee(
                                   junk_string_value_,
                                   read_as_double,
                                   &result_is_junk);
-    ASSERT(!result_is_junk);
+    DOUBLE_CONVERSION_ASSERT(!result_is_junk);
     *processed_characters_count = static_cast<int>(current - input);
     return result;
   }
@@ -1099,14 +726,20 @@ double StringToDoubleConverter::StringToIeee(
     exponent--;
   }
 
-  ASSERT(buffer_pos < kBufferSize);
+  DOUBLE_CONVERSION_ASSERT(buffer_pos < kBufferSize);
   buffer[buffer_pos] = '\0';
 
+  // Code above ensures there are no leading zeros and the buffer has fewer than
+  // kMaxSignificantDecimalDigits characters. Trim trailing zeros.
+  Vector<const char> chars(buffer, buffer_pos);
+  chars = TrimTrailingZeros(chars);
+  exponent += buffer_pos - chars.length();
+
   double converted;
   if (read_as_double) {
-    converted = Strtod(Vector<const char>(buffer, buffer_pos), exponent);
+    converted = StrtodTrimmed(chars, exponent);
   } else {
-    converted = Strtof(Vector<const char>(buffer, buffer_pos), exponent);
+    converted = StrtofTrimmed(chars, exponent);
   }
   *processed_characters_count = static_cast<int>(current - input);
   return sign? -converted: converted;
@@ -1146,4 +779,40 @@ float StringToDoubleConverter::StringToFloat(
                                          processed_characters_count));
 }
 
+
+template<>
+double StringToDoubleConverter::StringTo<double>(
+    const char* buffer,
+    int length,
+    int* processed_characters_count) const {
+    return StringToDouble(buffer, length, processed_characters_count);
+}
+
+
+template<>
+float StringToDoubleConverter::StringTo<float>(
+    const char* buffer,
+    int length,
+    int* processed_characters_count) const {
+    return StringToFloat(buffer, length, processed_characters_count);
+}
+
+
+template<>
+double StringToDoubleConverter::StringTo<double>(
+    const uc16* buffer,
+    int length,
+    int* processed_characters_count) const {
+    return StringToDouble(buffer, length, processed_characters_count);
+}
+
+
+template<>
+float StringToDoubleConverter::StringTo<float>(
+    const uc16* buffer,
+    int length,
+    int* processed_characters_count) const {
+    return StringToFloat(buffer, length, processed_characters_count);
+}
+
 }  // namespace double_conversion
diff --git a/Foundation/src/string-to-double.h b/Foundation/src/string-to-double.h
new file mode 100644
index 000000000..fdf302d4c
--- /dev/null
+++ b/Foundation/src/string-to-double.h
@@ -0,0 +1,238 @@
+// Copyright 2012 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials provided
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_
+#define DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_
+
+#include "utils.h"
+
+namespace double_conversion {
+
+class StringToDoubleConverter {
+ public:
+  // Enumeration for allowing octals and ignoring junk when converting
+  // strings to numbers.
+  enum Flags {
+    NO_FLAGS = 0,
+    ALLOW_HEX = 1,
+    ALLOW_OCTALS = 2,
+    ALLOW_TRAILING_JUNK = 4,
+    ALLOW_LEADING_SPACES = 8,
+    ALLOW_TRAILING_SPACES = 16,
+    ALLOW_SPACES_AFTER_SIGN = 32,
+    ALLOW_CASE_INSENSITIVITY = 64,
+    ALLOW_CASE_INSENSIBILITY = 64,  // Deprecated
+    ALLOW_HEX_FLOATS = 128,
+  };
+
+  static const uc16 kNoSeparator = '\0';
+
+  // Flags should be a bit-or combination of the possible Flags-enum.
+  //  - NO_FLAGS: no special flags.
+  //  - ALLOW_HEX: recognizes the prefix "0x". Hex numbers may only be integers.
+  //      Ex: StringToDouble("0x1234") -> 4660.0
+  //          In StringToDouble("0x1234.56") the characters ".56" are trailing
+  //          junk. The result of the call is hence dependent on
+  //          the ALLOW_TRAILING_JUNK flag and/or the junk value.
+  //      With this flag "0x" is a junk-string. Even with ALLOW_TRAILING_JUNK,
+  //      the string will not be parsed as "0" followed by junk.
+  //
+  //  - ALLOW_OCTALS: recognizes the prefix "0" for octals:
+  //      If a sequence of octal digits starts with '0', then the number is
+  //      read as octal integer. Octal numbers may only be integers.
+  //      Ex: StringToDouble("01234") -> 668.0
+  //          StringToDouble("012349") -> 12349.0  // Not a sequence of octal
+  //                                               // digits.
+  //          In StringToDouble("01234.56") the characters ".56" are trailing
+  //          junk. The result of the call is hence dependent on
+  //          the ALLOW_TRAILING_JUNK flag and/or the junk value.
+  //          In StringToDouble("01234e56") the characters "e56" are trailing
+  //          junk, too.
+  //  - ALLOW_TRAILING_JUNK: ignore trailing characters that are not part of
+  //      a double literal.
+  //  - ALLOW_LEADING_SPACES: skip over leading whitespace, including spaces,
+  //                          new-lines, and tabs.
+  //  - ALLOW_TRAILING_SPACES: ignore trailing whitespace.
+  //  - ALLOW_SPACES_AFTER_SIGN: ignore whitespace after the sign.
+  //       Ex: StringToDouble("-   123.2") -> -123.2.
+  //           StringToDouble("+   123.2") -> 123.2
+  //  - ALLOW_CASE_INSENSITIVITY: ignore case of characters for special values:
+  //      infinity and nan.
+  //  - ALLOW_HEX_FLOATS: allows hexadecimal float literals.
+  //      This *must* start with "0x" and separate the exponent with "p".
+  //      Examples: 0x1.2p3 == 9.0
+  //                0x10.1p0 == 16.0625
+  //      ALLOW_HEX and ALLOW_HEX_FLOATS are indented.
+  //
+  // empty_string_value is returned when an empty string is given as input.
+  // If ALLOW_LEADING_SPACES or ALLOW_TRAILING_SPACES are set, then a string
+  // containing only spaces is converted to the 'empty_string_value', too.
+  //
+  // junk_string_value is returned when
+  //  a) ALLOW_TRAILING_JUNK is not set, and a junk character (a character not
+  //     part of a double-literal) is found.
+  //  b) ALLOW_TRAILING_JUNK is set, but the string does not start with a
+  //     double literal.
+  //
+  // infinity_symbol and nan_symbol are strings that are used to detect
+  // inputs that represent infinity and NaN. They can be null, in which case
+  // they are ignored.
+  // The conversion routine first reads any possible signs. Then it compares the
+  // following character of the input-string with the first character of
+  // the infinity, and nan-symbol. If either matches, the function assumes, that
+  // a match has been found, and expects the following input characters to match
+  // the remaining characters of the special-value symbol.
+  // This means that the following restrictions apply to special-value symbols:
+  //  - they must not start with signs ('+', or '-'),
+  //  - they must not have the same first character.
+  //  - they must not start with digits.
+  //
+  // If the separator character is not kNoSeparator, then that specific
+  // character is ignored when in between two valid digits of the significant.
+  // It is not allowed to appear in the exponent.
+  // It is not allowed to lead or trail the number.
+  // It is not allowed to appear twice next to each other.
+  //
+  // Examples:
+  //  flags = ALLOW_HEX | ALLOW_TRAILING_JUNK,
+  //  empty_string_value = 0.0,
+  //  junk_string_value = NaN,
+  //  infinity_symbol = "infinity",
+  //  nan_symbol = "nan":
+  //    StringToDouble("0x1234") -> 4660.0.
+  //    StringToDouble("0x1234K") -> 4660.0.
+  //    StringToDouble("") -> 0.0  // empty_string_value.
+  //    StringToDouble(" ") -> NaN  // junk_string_value.
+  //    StringToDouble(" 1") -> NaN  // junk_string_value.
+  //    StringToDouble("0x") -> NaN  // junk_string_value.
+  //    StringToDouble("-123.45") -> -123.45.
+  //    StringToDouble("--123.45") -> NaN  // junk_string_value.
+  //    StringToDouble("123e45") -> 123e45.
+  //    StringToDouble("123E45") -> 123e45.
+  //    StringToDouble("123e+45") -> 123e45.
+  //    StringToDouble("123E-45") -> 123e-45.
+  //    StringToDouble("123e") -> 123.0  // trailing junk ignored.
+  //    StringToDouble("123e-") -> 123.0  // trailing junk ignored.
+  //    StringToDouble("+NaN") -> NaN  // NaN string literal.
+  //    StringToDouble("-infinity") -> -inf.  // infinity literal.
+  //    StringToDouble("Infinity") -> NaN  // junk_string_value.
+  //
+  //  flags = ALLOW_OCTAL | ALLOW_LEADING_SPACES,
+  //  empty_string_value = 0.0,
+  //  junk_string_value = NaN,
+  //  infinity_symbol = NULL,
+  //  nan_symbol = NULL:
+  //    StringToDouble("0x1234") -> NaN  // junk_string_value.
+  //    StringToDouble("01234") -> 668.0.
+  //    StringToDouble("") -> 0.0  // empty_string_value.
+  //    StringToDouble(" ") -> 0.0  // empty_string_value.
+  //    StringToDouble(" 1") -> 1.0
+  //    StringToDouble("0x") -> NaN  // junk_string_value.
+  //    StringToDouble("0123e45") -> NaN  // junk_string_value.
+  //    StringToDouble("01239E45") -> 1239e45.
+  //    StringToDouble("-infinity") -> NaN  // junk_string_value.
+  //    StringToDouble("NaN") -> NaN  // junk_string_value.
+  //
+  //  flags = NO_FLAGS,
+  //  separator = ' ':
+  //    StringToDouble("1 2 3 4") -> 1234.0
+  //    StringToDouble("1  2") -> NaN // junk_string_value
+  //    StringToDouble("1 000 000.0") -> 1000000.0
+  //    StringToDouble("1.000 000") -> 1.0
+  //    StringToDouble("1.0e1 000") -> NaN // junk_string_value
+  StringToDoubleConverter(int flags,
+                          double empty_string_value,
+                          double junk_string_value,
+                          const char* infinity_symbol,
+                          const char* nan_symbol,
+                          uc16 separator = kNoSeparator)
+      : flags_(flags),
+        empty_string_value_(empty_string_value),
+        junk_string_value_(junk_string_value),
+        infinity_symbol_(infinity_symbol),
+        nan_symbol_(nan_symbol),
+        separator_(separator) {
+  }
+
+  // Performs the conversion.
+  // The output parameter 'processed_characters_count' is set to the number
+  // of characters that have been processed to read the number.
+  // Spaces than are processed with ALLOW_{LEADING|TRAILING}_SPACES are included
+  // in the 'processed_characters_count'. Trailing junk is never included.
+  double StringToDouble(const char* buffer,
+                        int length,
+                        int* processed_characters_count) const;
+
+  // Same as StringToDouble above but for 16 bit characters.
+  double StringToDouble(const uc16* buffer,
+                        int length,
+                        int* processed_characters_count) const;
+
+  // Same as StringToDouble but reads a float.
+  // Note that this is not equivalent to static_cast<float>(StringToDouble(...))
+  // due to potential double-rounding.
+  float StringToFloat(const char* buffer,
+                      int length,
+                      int* processed_characters_count) const;
+
+  // Same as StringToFloat above but for 16 bit characters.
+  float StringToFloat(const uc16* buffer,
+                      int length,
+                      int* processed_characters_count) const;
+
+  // Same as StringToDouble for T = double, and StringToFloat for T = float.
+  template <typename T>
+  T StringTo(const char* buffer,
+             int length,
+             int* processed_characters_count) const;
+
+  // Same as StringTo above but for 16 bit characters.
+  template <typename T>
+  T StringTo(const uc16* buffer,
+             int length,
+             int* processed_characters_count) const;
+
+ private:
+  const int flags_;
+  const double empty_string_value_;
+  const double junk_string_value_;
+  const char* const infinity_symbol_;
+  const char* const nan_symbol_;
+  const uc16 separator_;
+
+  template <class Iterator>
+  double StringToIeee(Iterator start_pointer,
+                      int length,
+                      bool read_as_double,
+                      int* processed_characters_count) const;
+
+  DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS(StringToDoubleConverter);
+};
+
+}  // namespace double_conversion
+
+#endif  // DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_
diff --git a/Foundation/src/strtod.cc b/Foundation/src/strtod.cc
index a75cf5d9f..5fb1b2f10 100644
--- a/Foundation/src/strtod.cc
+++ b/Foundation/src/strtod.cc
@@ -35,10 +35,12 @@
 
 namespace double_conversion {
 
+#if defined(DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS)
 // 2^53 = 9007199254740992.
 // Any integer with at most 15 decimal digits will hence fit into a double
 // (which has a 53bit significand) without loss of precision.
 static const int kMaxExactDoubleIntegerDecimalDigits = 15;
+#endif // #if defined(DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS)
 // 2^64 = 18446744073709551616 > 10^19
 static const int kMaxUint64DecimalDigits = 19;
 
@@ -52,9 +54,10 @@ static const int kMaxDecimalPower = 309;
 static const int kMinDecimalPower = -324;
 
 // 2^64 = 18446744073709551616
-static const uint64_t kMaxUint64 = UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF);
+static const uint64_t kMaxUint64 = DOUBLE_CONVERSION_UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF);
 
 
+#if defined(DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS)
 static const double exact_powers_of_ten[] = {
   1.0,  // 10^0
   10.0,
@@ -81,7 +84,8 @@ static const double exact_powers_of_ten[] = {
   // 10^22 = 0x21e19e0c9bab2400000 = 0x878678326eac9 * 2^22
   10000000000000000000000.0
 };
-static const int kExactPowersOfTenSize = ARRAY_SIZE(exact_powers_of_ten);
+static const int kExactPowersOfTenSize = DOUBLE_CONVERSION_ARRAY_SIZE(exact_powers_of_ten);
+#endif // #if defined(DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS)
 
 // Maximum number of significant digits in the decimal representation.
 // In fact the value is 772 (see conversions.cc), but to give us some margin
@@ -97,17 +101,6 @@ static Vector<const char> TrimLeadingZeros(Vector<const char> buffer) {
   return Vector<const char>(buffer.start(), 0);
 }
 
-
-static Vector<const char> TrimTrailingZeros(Vector<const char> buffer) {
-  for (int i = buffer.length() - 1; i >= 0; --i) {
-    if (buffer[i] != '0') {
-      return buffer.SubVector(0, i + 1);
-    }
-  }
-  return Vector<const char>(buffer.start(), 0);
-}
-
-
 static void CutToMaxSignificantDigits(Vector<const char> buffer,
                                        int exponent,
                                        char* significant_buffer,
@@ -117,7 +110,7 @@ static void CutToMaxSignificantDigits(Vector<const char> buffer,
   }
   // The input buffer has been trimmed. Therefore the last digit must be
   // different from '0'.
-  ASSERT(buffer[buffer.length() - 1] != '0');
+  DOUBLE_CONVERSION_ASSERT(buffer[buffer.length() - 1] != '0');
   // Set the last digit to be non-zero. This is sufficient to guarantee
   // correct rounding.
   significant_buffer[kMaxSignificantDecimalDigits - 1] = '1';
@@ -138,7 +131,7 @@ static void TrimAndCut(Vector<const char> buffer, int exponent,
   exponent += left_trimmed.length() - right_trimmed.length();
   if (right_trimmed.length() > kMaxSignificantDecimalDigits) {
     (void) space_size;  // Mark variable as used.
-    ASSERT(space_size >= kMaxSignificantDecimalDigits);
+    DOUBLE_CONVERSION_ASSERT(space_size >= kMaxSignificantDecimalDigits);
     CutToMaxSignificantDigits(right_trimmed, exponent,
                               buffer_copy_space, updated_exponent);
     *trimmed = Vector<const char>(buffer_copy_space,
@@ -161,7 +154,7 @@ static uint64_t ReadUint64(Vector<const char> buffer,
   int i = 0;
   while (i < buffer.length() && result <= (kMaxUint64 / 10 - 1)) {
     int digit = buffer[i++] - '0';
-    ASSERT(0 <= digit && digit <= 9);
+    DOUBLE_CONVERSION_ASSERT(0 <= digit && digit <= 9);
     result = 10 * result + digit;
   }
   *number_of_read_digits = i;
@@ -198,12 +191,14 @@ static bool DoubleStrtod(Vector<const char> trimmed,
                          int exponent,
                          double* result) {
 #if !defined(DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS)
+  // Avoid "unused parameter" warnings
+  (void) trimmed;
+  (void) exponent;
+  (void) result;
   // On x86 the floating-point stack can be 64 or 80 bits wide. If it is
   // 80 bits wide (as is the case on Linux) then double-rounding occurs and the
   // result is not accurate.
   // We know that Windows32 uses 64 bits and is therefore accurate.
-  // Note that the ARM simulator is compiled for 32bits. It therefore exhibits
-  // the same problem.
   return false;
 #else
   if (trimmed.length() <= kMaxExactDoubleIntegerDecimalDigits) {
@@ -217,14 +212,14 @@ static bool DoubleStrtod(Vector<const char> trimmed,
     if (exponent < 0 && -exponent < kExactPowersOfTenSize) {
       // 10^-exponent fits into a double.
       *result = static_cast<double>(ReadUint64(trimmed, &read_digits));
-      ASSERT(read_digits == trimmed.length());
+      DOUBLE_CONVERSION_ASSERT(read_digits == trimmed.length());
       *result /= exact_powers_of_ten[-exponent];
       return true;
     }
     if (0 <= exponent && exponent < kExactPowersOfTenSize) {
       // 10^exponent fits into a double.
       *result = static_cast<double>(ReadUint64(trimmed, &read_digits));
-      ASSERT(read_digits == trimmed.length());
+      DOUBLE_CONVERSION_ASSERT(read_digits == trimmed.length());
       *result *= exact_powers_of_ten[exponent];
       return true;
     }
@@ -236,7 +231,7 @@ static bool DoubleStrtod(Vector<const char> trimmed,
       // 10^remaining_digits. As a result the remaining exponent now fits
       // into a double too.
       *result = static_cast<double>(ReadUint64(trimmed, &read_digits));
-      ASSERT(read_digits == trimmed.length());
+      DOUBLE_CONVERSION_ASSERT(read_digits == trimmed.length());
       *result *= exact_powers_of_ten[remaining_digits];
       *result *= exact_powers_of_ten[exponent - remaining_digits];
       return true;
@@ -250,21 +245,21 @@ static bool DoubleStrtod(Vector<const char> trimmed,
 // Returns 10^exponent as an exact DiyFp.
 // The given exponent must be in the range [1; kDecimalExponentDistance[.
 static DiyFp AdjustmentPowerOfTen(int exponent) {
-  ASSERT(0 < exponent);
-  ASSERT(exponent < PowersOfTenCache::kDecimalExponentDistance);
+  DOUBLE_CONVERSION_ASSERT(0 < exponent);
+  DOUBLE_CONVERSION_ASSERT(exponent < PowersOfTenCache::kDecimalExponentDistance);
   // Simply hardcode the remaining powers for the given decimal exponent
   // distance.
-  ASSERT(PowersOfTenCache::kDecimalExponentDistance == 8);
+  DOUBLE_CONVERSION_ASSERT(PowersOfTenCache::kDecimalExponentDistance == 8);
   switch (exponent) {
-    case 1: return DiyFp(UINT64_2PART_C(0xa0000000, 00000000), -60);
-    case 2: return DiyFp(UINT64_2PART_C(0xc8000000, 00000000), -57);
-    case 3: return DiyFp(UINT64_2PART_C(0xfa000000, 00000000), -54);
-    case 4: return DiyFp(UINT64_2PART_C(0x9c400000, 00000000), -50);
-    case 5: return DiyFp(UINT64_2PART_C(0xc3500000, 00000000), -47);
-    case 6: return DiyFp(UINT64_2PART_C(0xf4240000, 00000000), -44);
-    case 7: return DiyFp(UINT64_2PART_C(0x98968000, 00000000), -40);
+    case 1: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xa0000000, 00000000), -60);
+    case 2: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xc8000000, 00000000), -57);
+    case 3: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xfa000000, 00000000), -54);
+    case 4: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0x9c400000, 00000000), -50);
+    case 5: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xc3500000, 00000000), -47);
+    case 6: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xf4240000, 00000000), -44);
+    case 7: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0x98968000, 00000000), -40);
     default:
-      UNREACHABLE();
+      DOUBLE_CONVERSION_UNREACHABLE();
   }
 }
 
@@ -293,7 +288,7 @@ static bool DiyFpStrtod(Vector<const char> buffer,
   input.Normalize();
   error <<= old_e - input.e();
 
-  ASSERT(exponent <= PowersOfTenCache::kMaxDecimalExponent);
+  DOUBLE_CONVERSION_ASSERT(exponent <= PowersOfTenCache::kMaxDecimalExponent);
   if (exponent < PowersOfTenCache::kMinDecimalExponent) {
     *result = 0.0;
     return true;
@@ -311,7 +306,7 @@ static bool DiyFpStrtod(Vector<const char> buffer,
     if (kMaxUint64DecimalDigits - buffer.length() >= adjustment_exponent) {
       // The product of input with the adjustment power fits into a 64 bit
       // integer.
-      ASSERT(DiyFp::kSignificandSize == 64);
+      DOUBLE_CONVERSION_ASSERT(DiyFp::kSignificandSize == 64);
     } else {
       // The adjustment power is exact. There is hence only an error of 0.5.
       error += kDenominator / 2;
@@ -353,8 +348,8 @@ static bool DiyFpStrtod(Vector<const char> buffer,
     precision_digits_count -= shift_amount;
   }
   // We use uint64_ts now. This only works if the DiyFp uses uint64_ts too.
-  ASSERT(DiyFp::kSignificandSize == 64);
-  ASSERT(precision_digits_count < 64);
+  DOUBLE_CONVERSION_ASSERT(DiyFp::kSignificandSize == 64);
+  DOUBLE_CONVERSION_ASSERT(precision_digits_count < 64);
   uint64_t one64 = 1;
   uint64_t precision_bits_mask = (one64 << precision_digits_count) - 1;
   uint64_t precision_bits = input.f() & precision_bits_mask;
@@ -393,14 +388,14 @@ static bool DiyFpStrtod(Vector<const char> buffer,
 static int CompareBufferWithDiyFp(Vector<const char> buffer,
                                   int exponent,
                                   DiyFp diy_fp) {
-  ASSERT(buffer.length() + exponent <= kMaxDecimalPower + 1);
-  ASSERT(buffer.length() + exponent > kMinDecimalPower);
-  ASSERT(buffer.length() <= kMaxSignificantDecimalDigits);
+  DOUBLE_CONVERSION_ASSERT(buffer.length() + exponent <= kMaxDecimalPower + 1);
+  DOUBLE_CONVERSION_ASSERT(buffer.length() + exponent > kMinDecimalPower);
+  DOUBLE_CONVERSION_ASSERT(buffer.length() <= kMaxSignificantDecimalDigits);
   // Make sure that the Bignum will be able to hold all our numbers.
   // Our Bignum implementation has a separate field for exponents. Shifts will
   // consume at most one bigit (< 64 bits).
   // ln(10) == 3.3219...
-  ASSERT(((kMaxDecimalPower + 1) * 333 / 100) < Bignum::kMaxSignificantBits);
+  DOUBLE_CONVERSION_ASSERT(((kMaxDecimalPower + 1) * 333 / 100) < Bignum::kMaxSignificantBits);
   Bignum buffer_bignum;
   Bignum diy_fp_bignum;
   buffer_bignum.AssignDecimalString(buffer);
@@ -446,18 +441,36 @@ static bool ComputeGuess(Vector<const char> trimmed, int exponent,
   return false;
 }
 
-double Strtod(Vector<const char> buffer, int exponent) {
-  char copy_buffer[kMaxSignificantDecimalDigits];
-  Vector<const char> trimmed;
-  int updated_exponent;
-  TrimAndCut(buffer, exponent, copy_buffer, kMaxSignificantDecimalDigits,
-             &trimmed, &updated_exponent);
-  exponent = updated_exponent;
+static bool IsDigit(const char d) {
+  return ('0' <= d) && (d <= '9');
+}
 
+static bool IsNonZeroDigit(const char d) {
+  return ('1' <= d) && (d <= '9');
+}
+
+#ifdef __has_cpp_attribute
+#if __has_cpp_attribute(maybe_unused)
+[[maybe_unused]]
+#endif
+#endif
+static bool AssertTrimmedDigits(const Vector<const char>& buffer) {
+  for(int i = 0; i < buffer.length(); ++i) {
+    if(!IsDigit(buffer[i])) {
+      return false;
+    }
+  }
+  return (buffer.length() == 0) || (IsNonZeroDigit(buffer[0]) && IsNonZeroDigit(buffer[buffer.length()-1]));
+}
+
+double StrtodTrimmed(Vector<const char> trimmed, int exponent) {
+  DOUBLE_CONVERSION_ASSERT(trimmed.length() <= kMaxSignificantDecimalDigits);
+  DOUBLE_CONVERSION_ASSERT(AssertTrimmedDigits(trimmed));
   double guess;
-  bool is_correct = ComputeGuess(trimmed, exponent, &guess);
-  if (is_correct) return guess;
-
+  const bool is_correct = ComputeGuess(trimmed, exponent, &guess);
+  if (is_correct) {
+    return guess;
+  }
   DiyFp upper_boundary = Double(guess).UpperBoundary();
   int comparison = CompareBufferWithDiyFp(trimmed, exponent, upper_boundary);
   if (comparison < 0) {
@@ -472,8 +485,17 @@ double Strtod(Vector<const char> buffer, int exponent) {
   }
 }
 
+double Strtod(Vector<const char> buffer, int exponent) {
+  char copy_buffer[kMaxSignificantDecimalDigits];
+  Vector<const char> trimmed;
+  int updated_exponent;
+  TrimAndCut(buffer, exponent, copy_buffer, kMaxSignificantDecimalDigits,
+             &trimmed, &updated_exponent);
+  return StrtodTrimmed(trimmed, updated_exponent);
+}
+
 static float SanitizedDoubletof(double d) {
-  ASSERT(d >= 0.0);
+  DOUBLE_CONVERSION_ASSERT(d >= 0.0);
   // ASAN has a sanitize check that disallows casting doubles to floats if
   // they are too big.
   // https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html#available-checks
@@ -503,6 +525,12 @@ float Strtof(Vector<const char> buffer, int exponent) {
   TrimAndCut(buffer, exponent, copy_buffer, kMaxSignificantDecimalDigits,
              &trimmed, &updated_exponent);
   exponent = updated_exponent;
+  return StrtofTrimmed(trimmed, exponent);
+}
+
+float StrtofTrimmed(Vector<const char> trimmed, int exponent) {
+  DOUBLE_CONVERSION_ASSERT(trimmed.length() <= kMaxSignificantDecimalDigits);
+  DOUBLE_CONVERSION_ASSERT(AssertTrimmedDigits(trimmed));
 
   double double_guess;
   bool is_correct = ComputeGuess(trimmed, exponent, &double_guess);
@@ -522,7 +550,7 @@ float Strtof(Vector<const char> buffer, int exponent) {
   //    low-precision (3 digits):
   //       when read from input: 123
   //       when rounded from high precision: 124.
-  // To do this we simply look at the neigbors of the correct result and see
+  // To do this we simply look at the neighbors of the correct result and see
   // if they would round to the same float. If the guess is not correct we have
   // to look at four values (since two different doubles could be the correct
   // double).
@@ -541,7 +569,7 @@ float Strtof(Vector<const char> buffer, int exponent) {
     f4 = SanitizedDoubletof(double_next2);
   }
   (void) f2;  // Mark variable as used.
-  ASSERT(f1 <= f2 && f2 <= f3 && f3 <= f4);
+  DOUBLE_CONVERSION_ASSERT(f1 <= f2 && f2 <= f3 && f3 <= f4);
 
   // If the guess doesn't lie near a single-precision boundary we can simply
   // return its float-value.
@@ -549,7 +577,7 @@ float Strtof(Vector<const char> buffer, int exponent) {
     return float_guess;
   }
 
-  ASSERT((f1 != f2 && f2 == f3 && f3 == f4) ||
+  DOUBLE_CONVERSION_ASSERT((f1 != f2 && f2 == f3 && f3 == f4) ||
          (f1 == f2 && f2 != f3 && f3 == f4) ||
          (f1 == f2 && f2 == f3 && f3 != f4));
 
diff --git a/Foundation/src/strtod.h b/Foundation/src/strtod.h
index ed0293b8f..77221fb9d 100644
--- a/Foundation/src/strtod.h
+++ b/Foundation/src/strtod.h
@@ -40,6 +40,25 @@ double Strtod(Vector<const char> buffer, int exponent);
 // contain a dot or a sign. It must not start with '0', and must not be empty.
 float Strtof(Vector<const char> buffer, int exponent);
 
+// Same as Strtod, but assumes that 'trimmed' is already trimmed, as if run
+// through TrimAndCut. That is, 'trimmed' must have no leading or trailing
+// zeros, must not be a lone zero, and must not have 'too many' digits.
+double StrtodTrimmed(Vector<const char> trimmed, int exponent);
+
+// Same as Strtof, but assumes that 'trimmed' is already trimmed, as if run
+// through TrimAndCut. That is, 'trimmed' must have no leading or trailing
+// zeros, must not be a lone zero, and must not have 'too many' digits.
+float StrtofTrimmed(Vector<const char> trimmed, int exponent);
+
+inline Vector<const char> TrimTrailingZeros(Vector<const char> buffer) {
+  for (int i = buffer.length() - 1; i >= 0; --i) {
+    if (buffer[i] != '0') {
+      return buffer.SubVector(0, i + 1);
+    }
+  }
+  return Vector<const char>(buffer.start(), 0);
+}
+
 }  // namespace double_conversion
 
 #endif  // DOUBLE_CONVERSION_STRTOD_H_
diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
index 0a222c77d..c9b6c00ed 100644
--- a/Foundation/src/utils.h
+++ b/Foundation/src/utils.h
@@ -28,17 +28,28 @@
 #ifndef DOUBLE_CONVERSION_UTILS_H_
 #define DOUBLE_CONVERSION_UTILS_H_
 
+// Use DOUBLE_CONVERSION_NON_PREFIXED_MACROS to get unprefixed macros as was
+// the case in double-conversion releases prior to 3.1.6
+
 #include <cstdlib>
 #include <cstring>
 
 #include <cassert>
-#ifndef ASSERT
-#define ASSERT(condition)         \
-    assert(condition);
+#ifndef DOUBLE_CONVERSION_ASSERT
+#define DOUBLE_CONVERSION_ASSERT(condition)         \
+    assert(condition)
 #endif
-#ifndef UNIMPLEMENTED
-#define UNIMPLEMENTED() (abort())
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(ASSERT)
+#define ASSERT DOUBLE_CONVERSION_ASSERT
 #endif
+
+#ifndef DOUBLE_CONVERSION_UNIMPLEMENTED
+#define DOUBLE_CONVERSION_UNIMPLEMENTED() (abort())
+#endif
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(UNIMPLEMENTED)
+#define UNIMPLEMENTED DOUBLE_CONVERSION_UNIMPLEMENTED
+#endif
+
 #ifndef DOUBLE_CONVERSION_NO_RETURN
 #ifdef _MSC_VER
 #define DOUBLE_CONVERSION_NO_RETURN __declspec(noreturn)
@@ -46,23 +57,50 @@
 #define DOUBLE_CONVERSION_NO_RETURN __attribute__((noreturn))
 #endif
 #endif
-#ifndef UNREACHABLE
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(NO_RETURN)
+#define NO_RETURN DOUBLE_CONVERSION_NO_RETURN
+#endif
+
+#ifndef DOUBLE_CONVERSION_UNREACHABLE
 #ifdef _MSC_VER
 void DOUBLE_CONVERSION_NO_RETURN abort_noreturn();
 inline void abort_noreturn() { abort(); }
-#define UNREACHABLE()   (abort_noreturn())
+#define DOUBLE_CONVERSION_UNREACHABLE()   (abort_noreturn())
 #else
-#define UNREACHABLE()   (abort())
+#define DOUBLE_CONVERSION_UNREACHABLE()   (abort())
 #endif
 #endif
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(UNREACHABLE)
+#define UNREACHABLE DOUBLE_CONVERSION_UNREACHABLE
+#endif
+
+// Not all compilers support __has_attribute and combining a check for both
+// ifdef and __has_attribute on the same preprocessor line isn't portable.
+#ifdef __has_attribute
+#   define DOUBLE_CONVERSION_HAS_ATTRIBUTE(x) __has_attribute(x)
+#else
+#   define DOUBLE_CONVERSION_HAS_ATTRIBUTE(x) 0
+#endif
 
 #ifndef DOUBLE_CONVERSION_UNUSED
-#ifdef __GNUC__
+#if DOUBLE_CONVERSION_HAS_ATTRIBUTE(unused)
 #define DOUBLE_CONVERSION_UNUSED __attribute__((unused))
 #else
 #define DOUBLE_CONVERSION_UNUSED
 #endif
 #endif
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(UNUSED)
+#define UNUSED DOUBLE_CONVERSION_UNUSED
+#endif
+
+#if DOUBLE_CONVERSION_HAS_ATTRIBUTE(uninitialized)
+#define DOUBLE_CONVERSION_STACK_UNINITIALIZED __attribute__((uninitialized))
+#else
+#define DOUBLE_CONVERSION_STACK_UNINITIALIZED
+#endif
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(STACK_UNINITIALIZED)
+#define STACK_UNINITIALIZED DOUBLE_CONVERSION_STACK_UNINITIALIZED
+#endif
 
 // Double operations detection based on target architecture.
 // Linux uses a 80bit wide floating point stack on x86. This induces double
@@ -94,16 +132,18 @@ int main(int argc, char** argv) {
     defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
     defined(__hppa__) || defined(__ia64__) || \
     defined(__mips__) || \
+    defined(__loongarch__) || \
+    defined(nios2) || defined(__nios2) || defined(__nios2__) || defined(__ghs) || \
     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
     defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
     defined(__SH4__) || defined(__alpha__) || \
     defined(_MIPS_ARCH_MIPS32R2) || defined(__ARMEB__) ||\
     defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
-    defined(__riscv) || \
-    defined(__or1k__) || defined(__arc__) || \
-    defined(__EMSCRIPTEN__) || \
-    defined(nios2) || defined(__nios2) || defined(__nios2__)
+    (defined(__riscv) && defined(__riscv_float_abi_double)) || defined(__e2k__) || \
+    defined(__or1k__) || defined(__arc__) || defined(__ARC64__) || \
+    defined(__microblaze__) || defined(__XTENSA__) || \
+    defined(__EMSCRIPTEN__) || defined(__wasm32__)
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
 #elif defined(__mc68000__) || \
     defined(__pnacl__) || defined(__native_client__)
@@ -118,6 +158,9 @@ int main(int argc, char** argv) {
 #else
 #error Target architecture was not detected as supported by Double-Conversion.
 #endif
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(CORRECT_DOUBLE_OPERATIONS)
+#define CORRECT_DOUBLE_OPERATIONS DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
+#endif
 
 #if defined(_WIN32) && !defined(__MINGW32__)
 
@@ -141,27 +184,35 @@ typedef uint16_t uc16;
 
 // The following macro works on both 32 and 64-bit platforms.
 // Usage: instead of writing 0x1234567890123456
-//      write UINT64_2PART_C(0x12345678,90123456);
-#define UINT64_2PART_C(a, b) (((static_cast<uint64_t>(a) << 32) + 0x##b##u))
+//      write DOUBLE_CONVERSION_UINT64_2PART_C(0x12345678,90123456);
+#define DOUBLE_CONVERSION_UINT64_2PART_C(a, b) (((static_cast<uint64_t>(a) << 32) + 0x##b##u))
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(UINT64_2PART_C)
+#define UINT64_2PART_C DOUBLE_CONVERSION_UINT64_2PART_C
+#endif
 
-
-// The expression ARRAY_SIZE(a) is a compile-time constant of type
+// The expression DOUBLE_CONVERSION_ARRAY_SIZE(a) is a compile-time constant of type
 // size_t which represents the number of elements of the given
-// array. You should only use ARRAY_SIZE on statically allocated
+// array. You should only use DOUBLE_CONVERSION_ARRAY_SIZE on statically allocated
 // arrays.
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a)                                   \
+#ifndef DOUBLE_CONVERSION_ARRAY_SIZE
+#define DOUBLE_CONVERSION_ARRAY_SIZE(a)                                   \
   ((sizeof(a) / sizeof(*(a))) /                         \
   static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
 #endif
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(ARRAY_SIZE)
+#define ARRAY_SIZE DOUBLE_CONVERSION_ARRAY_SIZE
+#endif
 
 // A macro to disallow the evil copy constructor and operator= functions
 // This should be used in the private: declarations for a class
-#ifndef DC_DISALLOW_COPY_AND_ASSIGN
-#define DC_DISALLOW_COPY_AND_ASSIGN(TypeName)      \
+#ifndef DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN
+#define DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(TypeName)      \
   TypeName(const TypeName&);                    \
   void operator=(const TypeName&)
 #endif
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(DC_DISALLOW_COPY_AND_ASSIGN)
+#define DC_DISALLOW_COPY_AND_ASSIGN DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN
+#endif
 
 // A macro to disallow all the implicit constructors, namely the
 // default constructor, copy constructor and operator= functions.
@@ -169,33 +220,20 @@ typedef uint16_t uc16;
 // This should be used in the private: declarations for a class
 // that wants to prevent anyone from instantiating it. This is
 // especially useful for classes containing only static methods.
-#ifndef DC_DISALLOW_IMPLICIT_CONSTRUCTORS
-#define DC_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
+#ifndef DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS
+#define DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
   TypeName();                                    \
-  DC_DISALLOW_COPY_AND_ASSIGN(TypeName)
+  DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(TypeName)
+#endif
+#if defined(DOUBLE_CONVERSION_NON_PREFIXED_MACROS) && !defined(DC_DISALLOW_IMPLICIT_CONSTRUCTORS)
+#define DC_DISALLOW_IMPLICIT_CONSTRUCTORS DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS
 #endif
 
 namespace double_conversion {
 
-static const int kCharSize = sizeof(char);
-
-// Returns the maximum of the two parameters.
-template <typename T>
-static T Max(T a, T b) {
-  return a < b ? b : a;
-}
-
-
-// Returns the minimum of the two parameters.
-template <typename T>
-static T Min(T a, T b) {
-  return a < b ? a : b;
-}
-
-
 inline int StrLength(const char* string) {
   size_t length = strlen(string);
-  ASSERT(length == static_cast<size_t>(static_cast<int>(length)));
+  DOUBLE_CONVERSION_ASSERT(length == static_cast<size_t>(static_cast<int>(length)));
   return static_cast<int>(length);
 }
 
@@ -205,15 +243,15 @@ class Vector {
  public:
   Vector() : start_(NULL), length_(0) {}
   Vector(T* data, int len) : start_(data), length_(len) {
-    ASSERT(len == 0 || (len > 0 && data != NULL));
+    DOUBLE_CONVERSION_ASSERT(len == 0 || (len > 0 && data != NULL));
   }
 
   // Returns a vector using the same backing storage as this one,
   // spanning from and including 'from', to but not including 'to'.
   Vector<T> SubVector(int from, int to) {
-    ASSERT(to <= length_);
-    ASSERT(from < to);
-    ASSERT(0 <= from);
+    DOUBLE_CONVERSION_ASSERT(to <= length_);
+    DOUBLE_CONVERSION_ASSERT(from < to);
+    DOUBLE_CONVERSION_ASSERT(0 <= from);
     return Vector<T>(start() + from, to - from);
   }
 
@@ -228,7 +266,7 @@ class Vector {
 
   // Access individual vector elements - checks bounds in debug mode.
   T& operator[](int index) const {
-    ASSERT(0 <= index && index < length_);
+    DOUBLE_CONVERSION_ASSERT(0 <= index && index < length_);
     return start_[index];
   }
 
@@ -236,6 +274,11 @@ class Vector {
 
   T& last() { return start_[length_ - 1]; }
 
+  void pop_back() {
+    DOUBLE_CONVERSION_ASSERT(!is_empty());
+    --length_;
+  }
+
  private:
   T* start_;
   int length_;
@@ -256,7 +299,7 @@ class StringBuilder {
 
   // Get the current position in the builder.
   int position() const {
-    ASSERT(!is_finalized());
+    DOUBLE_CONVERSION_ASSERT(!is_finalized());
     return position_;
   }
 
@@ -267,8 +310,8 @@ class StringBuilder {
   // 0-characters; use the Finalize() method to terminate the string
   // instead.
   void AddCharacter(char c) {
-    ASSERT(c != '\0');
-    ASSERT(!is_finalized() && position_ < buffer_.length());
+    DOUBLE_CONVERSION_ASSERT(c != '\0');
+    DOUBLE_CONVERSION_ASSERT(!is_finalized() && position_ < buffer_.length());
     buffer_[position_++] = c;
   }
 
@@ -281,9 +324,9 @@ class StringBuilder {
   // Add the first 'n' characters of the given string 's' to the
   // builder. The input string must have enough characters.
   void AddSubstring(const char* s, int n) {
-    ASSERT(!is_finalized() && position_ + n < buffer_.length());
-    ASSERT(static_cast<size_t>(n) <= strlen(s));
-    memmove(&buffer_[position_], s, n * kCharSize);
+    DOUBLE_CONVERSION_ASSERT(!is_finalized() && position_ + n < buffer_.length());
+    DOUBLE_CONVERSION_ASSERT(static_cast<size_t>(n) <= strlen(s));
+    memmove(&buffer_[position_], s, n);
     position_ += n;
   }
 
@@ -298,13 +341,13 @@ class StringBuilder {
 
   // Finalize the string by 0-terminating it and returning the buffer.
   char* Finalize() {
-    ASSERT(!is_finalized() && position_ < buffer_.length());
+    DOUBLE_CONVERSION_ASSERT(!is_finalized() && position_ < buffer_.length());
     buffer_[position_] = '\0';
     // Make sure nobody managed to add a 0-character to the
     // buffer while building the string.
-    ASSERT(strlen(buffer_.start()) == static_cast<size_t>(position_));
+    DOUBLE_CONVERSION_ASSERT(strlen(buffer_.start()) == static_cast<size_t>(position_));
     position_ = -1;
-    ASSERT(is_finalized());
+    DOUBLE_CONVERSION_ASSERT(is_finalized());
     return buffer_.start();
   }
 
@@ -314,7 +357,7 @@ class StringBuilder {
 
   bool is_finalized() const { return position_ < 0; }
 
-  DC_DISALLOW_IMPLICIT_CONSTRUCTORS(StringBuilder);
+  DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS(StringBuilder);
 };
 
 // The type-based aliasing rule allows the compiler to assume that pointers of
@@ -342,7 +385,7 @@ class StringBuilder {
 // enough that it can no longer see that you have cast one pointer type to
 // another thus avoiding the warning.
 template <class Dest, class Source>
-inline Dest BitCast(const Source& source) {
+Dest BitCast(const Source& source) {
   // Compile time assertion: sizeof(Dest) == sizeof(Source)
   // A compile error here means your Dest and Source have different sizes.
 #if __cplusplus >= 201103L
@@ -359,7 +402,7 @@ inline Dest BitCast(const Source& source) {
 }
 
 template <class Dest, class Source>
-inline Dest BitCast(Source* source) {
+Dest BitCast(Source* source) {
   return BitCast<Dest>(reinterpret_cast<uintptr_t>(source));
 }
 
diff --git a/Foundation/testsuite/CMakeLists.txt b/Foundation/testsuite/CMakeLists.txt
index 66305bb30..7e2c9b526 100644
--- a/Foundation/testsuite/CMakeLists.txt
+++ b/Foundation/testsuite/CMakeLists.txt
@@ -65,7 +65,7 @@ target_link_libraries(TestApp PUBLIC Poco::Foundation)
 
 # TestLibrary
 add_library(TestLibrary SHARED src/TestLibrary.cpp src/TestPlugin.cpp src/TestPlugin.h)
-set_target_properties(TestLibrary PROPERTIES PREFIX "" DEBUG_POSTFIX "") # The test requires the library named TestLibrary. By default it is prefixed with lib.
+set_target_properties(TestLibrary PROPERTIES PREFIX "" DEBUG_POSTFIX "d") # The test requires the library named TestLibrary. By default it is prefixed with lib.
 # The test is run in the runtime directory. So the TestLibrary is built there too because it is used by the tests
 set_target_properties(TestLibrary PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 target_link_libraries(TestLibrary PUBLIC Poco::Foundation)
diff --git a/Foundation/testsuite/TestApp_vs160.vcxproj b/Foundation/testsuite/TestApp_vs160.vcxproj
index 52a4c3699..941f7dbdf 100644
--- a/Foundation/testsuite/TestApp_vs160.vcxproj
+++ b/Foundation/testsuite/TestApp_vs160.vcxproj
@@ -288,7 +288,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -354,7 +354,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>
       </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -423,7 +423,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>
       </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -480,7 +480,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -534,7 +534,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -600,7 +600,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>
       </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
diff --git a/Foundation/testsuite/TestApp_vs170.vcxproj b/Foundation/testsuite/TestApp_vs170.vcxproj
index fd10c81da..c6461b28f 100644
--- a/Foundation/testsuite/TestApp_vs170.vcxproj
+++ b/Foundation/testsuite/TestApp_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -55,7 +79,6 @@
     <ProjectGuid>{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}</ProjectGuid>
     <RootNamespace>TestApp</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
@@ -70,6 +93,12 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
@@ -82,6 +111,12 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
@@ -94,6 +129,12 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
@@ -106,6 +147,12 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
@@ -118,6 +165,12 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
@@ -130,6 +183,12 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -141,6 +200,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
@@ -149,6 +212,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
@@ -157,6 +224,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
@@ -165,6 +236,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
@@ -173,6 +248,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
@@ -181,6 +260,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -188,43 +271,56 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\TestApp\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\TestApp\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">bin\static_md\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\TestApp\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">bin\static_md\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\TestApp\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">bin\static_mt\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\TestApp\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">bin\static_mt\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\TestApp\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">TestApp</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">TestApp</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestApp</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestAppd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestAppd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestAppd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestAppd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestAppd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestAppd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestAppd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestAppd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestAppd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestApp</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestApp</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestApp</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestApp</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestApp</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestApp</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>bin64\</OutDir>
     <IntDir>obj64\TestApp\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <OutDir>bin64\static_md\</OutDir>
     <IntDir>obj64\TestApp\$(Configuration)\</IntDir>
@@ -299,6 +395,32 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/FS</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>binA64\TestAppd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestAppd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -368,6 +490,40 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <AdditionalOptions>/FS</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>binA64\TestApp.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <ProgramDatabaseFile>
+      </ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -437,6 +593,40 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <AdditionalOptions>/FS</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>binA64\static_md\TestApp.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <ProgramDatabaseFile>
+      </ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -491,6 +681,32 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/FS</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>binA64\static_md\TestAppd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestAppd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -545,6 +761,32 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/FS</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>binA64\static_mt\TestAppd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestAppd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -614,6 +856,40 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <AdditionalOptions>/FS</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>binA64\static_mt\TestApp.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <ProgramDatabaseFile>
+      </ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\TestApp.cpp" />
   </ItemGroup>
diff --git a/Foundation/testsuite/TestLibrary_vs160.vcxproj b/Foundation/testsuite/TestLibrary_vs160.vcxproj
index 2122e749b..72e46c978 100644
--- a/Foundation/testsuite/TestLibrary_vs160.vcxproj
+++ b/Foundation/testsuite/TestLibrary_vs160.vcxproj
@@ -136,7 +136,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -208,7 +208,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>
       </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
diff --git a/Foundation/testsuite/TestLibrary_vs170.vcxproj b/Foundation/testsuite/TestLibrary_vs170.vcxproj
index a34e6d45c..6daae65cc 100644
--- a/Foundation/testsuite/TestLibrary_vs170.vcxproj
+++ b/Foundation/testsuite/TestLibrary_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -22,7 +30,6 @@
     <ProjectName>TestLibrary</ProjectName>
     <ProjectGuid>{0955EB03-544B-4BD4-9C10-89CF38078F5F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
@@ -35,6 +42,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -45,6 +57,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -54,12 +71,18 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -67,23 +90,30 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\TestLibrary\$(Configuration)\</IntDir>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</IgnoreImportLibrary>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\TestLibrary\$(Configuration)\</IntDir>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</IgnoreImportLibrary>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">TestLibrary</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">TestLibrary</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestLibrary</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestLibraryd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestLibraryd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestLibraryd</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>bin64\</OutDir>
     <IntDir>obj64\TestLibrary\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
     <OutDir>bin64\</OutDir>
     <IntDir>obj64\TestLibrary\$(Configuration)\</IntDir>
@@ -150,6 +180,36 @@
       </ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/FS</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestLibraryd.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestLibraryd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>
+      </ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -225,6 +285,43 @@
       </ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <AdditionalOptions>/FS</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestLibrary.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <ProgramDatabaseFile>
+      </ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>
+      </ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\TestLibrary.cpp" />
     <ClCompile Include="src\TestPlugin.cpp" />
diff --git a/Foundation/testsuite/TestSuite_vs160.vcxproj b/Foundation/testsuite/TestSuite_vs160.vcxproj
index a761b2f14..65082cfb7 100644
--- a/Foundation/testsuite/TestSuite_vs160.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs160.vcxproj
@@ -280,6 +280,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -345,6 +346,7 @@
       </DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -404,6 +406,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -469,6 +472,7 @@
       </DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -528,6 +532,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -593,6 +598,7 @@
       </DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/Foundation/testsuite/TestSuite_vs170.vcxproj b/Foundation/testsuite/TestSuite_vs170.vcxproj
index 3f2e315b4..4dcc32ca3 100644
--- a/Foundation/testsuite/TestSuite_vs170.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -55,7 +79,6 @@
     <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
@@ -68,6 +91,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -78,6 +106,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -88,6 +121,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -98,6 +136,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -108,6 +151,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -118,6 +166,11 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
@@ -126,51 +179,75 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
@@ -182,6 +259,9 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <OutDir>bin64\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -192,6 +272,9 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <OutDir>bin64\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <OutDir>bin\static_mt\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -202,6 +285,9 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <OutDir>bin64\static_mt\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <OutDir>bin\static_mt\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -212,6 +298,9 @@
     <OutDir>bin64\static_mt\</OutDir>
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <OutDir>bin\static_md\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -222,6 +311,9 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <OutDir>bin64\static_md\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <OutDir>bin\static_md\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -232,6 +324,9 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <OutDir>bin64\static_md\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -291,6 +386,35 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -356,6 +480,39 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -415,6 +572,35 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -480,6 +666,39 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -539,6 +758,35 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -604,6 +852,39 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\ActiveDispatcherTest.cpp" />
     <ClCompile Include="src\ActiveMethodTest.cpp" />
diff --git a/Foundation/testsuite/src/ActiveDispatcherTest.cpp b/Foundation/testsuite/src/ActiveDispatcherTest.cpp
index 35544fa70..9cf6c7d13 100644
--- a/Foundation/testsuite/src/ActiveDispatcherTest.cpp
+++ b/Foundation/testsuite/src/ActiveDispatcherTest.cpp
@@ -16,6 +16,8 @@
 #include "Poco/Thread.h"
 #include "Poco/Event.h"
 #include "Poco/Exception.h"
+#include "Poco/Environment.h"
+#include <iostream>
 
 
 using Poco::ActiveDispatcher;
@@ -25,6 +27,7 @@ using Poco::ActiveStarter;
 using Poco::Thread;
 using Poco::Event;
 using Poco::Exception;
+using Poco::Environment;
 
 
 namespace
@@ -39,11 +42,11 @@ namespace
 			testVoidIn(this, &ActiveObject::testVoidInImpl)
 		{
 		}
-		
+
 		~ActiveObject()
 		{
 		}
-		
+
 		ActiveMethod<int, int, ActiveObject, ActiveStarter<ActiveDispatcher> > testMethod;
 
 		ActiveMethod<void, int, ActiveObject, ActiveStarter<ActiveDispatcher> > testVoid;
@@ -51,12 +54,12 @@ namespace
 		ActiveMethod<void, void, ActiveObject, ActiveStarter<ActiveDispatcher> > testVoidInOut;
 
 		ActiveMethod<int, void, ActiveObject, ActiveStarter<ActiveDispatcher> > testVoidIn;
-		
+
 		void cont()
 		{
 			_continue.set();
 		}
-		
+
 	protected:
 		int testMethodImpl(const int& n)
 		{
@@ -81,7 +84,7 @@ namespace
 			_continue.wait();
 			return 123;
 		}
-		
+
 	private:
 		Event _continue;
 	};
@@ -195,6 +198,12 @@ void ActiveDispatcherTest::testVoidIn()
 }
 
 
+void ActiveDispatcherTest::testActiveDispatcher()
+{
+	std::cout << "(disabled on TSAN runs)";
+}
+
+
 void ActiveDispatcherTest::setUp()
 {
 }
@@ -209,13 +218,19 @@ CppUnit::Test* ActiveDispatcherTest::suite()
 {
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ActiveDispatcherTest");
 
-	CppUnit_addTest(pSuite, ActiveDispatcherTest, testWait);
-	CppUnit_addTest(pSuite, ActiveDispatcherTest, testWaitInterval);
-	CppUnit_addTest(pSuite, ActiveDispatcherTest, testTryWait);
-	CppUnit_addTest(pSuite, ActiveDispatcherTest, testFailure);
-	CppUnit_addTest(pSuite, ActiveDispatcherTest, testVoid);
-	CppUnit_addTest(pSuite, ActiveDispatcherTest, testVoidIn);
-	CppUnit_addTest(pSuite, ActiveDispatcherTest, testVoidInOut);
+	// see https://github.com/pocoproject/poco/pull/3617
+	if (!Environment::has("TSAN_OPTIONS"))
+	{
+		CppUnit_addTest(pSuite, ActiveDispatcherTest, testWait);
+		CppUnit_addTest(pSuite, ActiveDispatcherTest, testWaitInterval);
+		CppUnit_addTest(pSuite, ActiveDispatcherTest, testTryWait);
+		CppUnit_addTest(pSuite, ActiveDispatcherTest, testFailure);
+		CppUnit_addTest(pSuite, ActiveDispatcherTest, testVoid);
+		CppUnit_addTest(pSuite, ActiveDispatcherTest, testVoidIn);
+		CppUnit_addTest(pSuite, ActiveDispatcherTest, testVoidInOut);
+	}
+	else
+		CppUnit_addTest(pSuite, ActiveDispatcherTest, testActiveDispatcher);
 
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/ActiveDispatcherTest.h b/Foundation/testsuite/src/ActiveDispatcherTest.h
index cdc7567b7..dbe8e2ad2 100644
--- a/Foundation/testsuite/src/ActiveDispatcherTest.h
+++ b/Foundation/testsuite/src/ActiveDispatcherTest.h
@@ -28,6 +28,7 @@ public:
 	void testVoid();
 	void testVoidIn();
 	void testVoidInOut();
+	void testActiveDispatcher();
 
 	void setUp();
 	void tearDown();
diff --git a/Foundation/testsuite/src/ActiveMethodTest.cpp b/Foundation/testsuite/src/ActiveMethodTest.cpp
index 8c70c0819..903e13bdb 100644
--- a/Foundation/testsuite/src/ActiveMethodTest.cpp
+++ b/Foundation/testsuite/src/ActiveMethodTest.cpp
@@ -41,11 +41,11 @@ namespace
 			testVoidIn(this,&ActiveObject::testVoidInImpl)
 		{
 		}
-		
+
 		~ActiveObject()
 		{
 		}
-		
+
 		IntIntType testMethod;
 
 		VoidIntType testVoid;
@@ -53,12 +53,12 @@ namespace
 		VoidVoidType testVoidInOut;
 
 		IntVoidType testVoidIn;
-		
+
 		void cont()
 		{
 			_continue.set();
 		}
-		
+
 	protected:
 		int testMethodImpl(const int& n)
 		{
@@ -83,7 +83,7 @@ namespace
 			_continue.wait();
 			return 123;
 		}
-		
+
 	private:
 		Event _continue;
 	};
diff --git a/Foundation/testsuite/src/ActivityTest.cpp b/Foundation/testsuite/src/ActivityTest.cpp
index 7be1cdc41..11607f3e1 100644
--- a/Foundation/testsuite/src/ActivityTest.cpp
+++ b/Foundation/testsuite/src/ActivityTest.cpp
@@ -24,21 +24,21 @@ namespace
 	class ActiveObject
 	{
 	public:
-		ActiveObject(): 
+		ActiveObject():
 			_activity(this, &ActiveObject::run),
 			_count(0)
 		{
 		}
-		
+
 		~ActiveObject()
 		{
 		}
-		
+
 		Activity<ActiveObject>& activity()
 		{
 			return _activity;
 		}
-		
+
 		Poco::UInt64 count() const
 		{
 			return _count;
@@ -47,7 +47,7 @@ namespace
 	protected:
 		void run()
 		{
-			while (!_activity.isStopped()) 
+			while (!_activity.isStopped())
 				++_count;
 		}
 
@@ -56,7 +56,7 @@ namespace
 		Poco::UInt64           _count;
 	};
 }
- 
+
 
 ActivityTest::ActivityTest(const std::string& name): CppUnit::TestCase(name)
 {
diff --git a/Foundation/testsuite/src/AnyTest.cpp b/Foundation/testsuite/src/AnyTest.cpp
index b8ed75514..6a9d95c73 100644
--- a/Foundation/testsuite/src/AnyTest.cpp
+++ b/Foundation/testsuite/src/AnyTest.cpp
@@ -184,8 +184,33 @@ void AnyTest::testAnyBadCast()
 
 void AnyTest::testAnySwap()
 {
+	Any empty1, empty2;
+	assertTrue (empty1.empty());
+	assertTrue (empty2.empty());
+	empty1.swap(empty2);
+	assertTrue (empty1.empty());
+	assertTrue (empty2.empty());
+
 	std::string text = "test message";
+	empty1 = text;
+	assertTrue (!empty1.empty());
+	assertTrue (empty2.empty());
+	assertTrue (text == AnyCast<std::string>(empty1));
+
+	empty1.swap(empty2);
+	assertTrue (empty1.empty());
+	assertTrue (!empty2.empty());
+	assertTrue (text == AnyCast<std::string>(empty2));
+
 	Any original = text, swapped;
+#ifdef POCO_NO_SOO
+	assertFalse (original.local());
+#else
+	assertTrue (original.local());
+#endif
+	assertFalse (original.empty());
+	assertFalse (swapped.local());
+	assertTrue (swapped.empty());
 	std::string* originalPtr = AnyCast<std::string>(&original);
 	Any* swapResult = &original.swap(swapped);
 
@@ -194,10 +219,80 @@ void AnyTest::testAnySwap()
 	assertTrue (swapped.type() == typeid(std::string));
 	assertTrue (text == AnyCast<std::string>(swapped));
 	assertTrue (0 != originalPtr);
-#ifdef POCO_NO_SOO // pointers only match when heap-allocated
-	assertTrue (originalPtr == AnyCast<std::string>(&swapped));
-#endif
 	assertTrue (swapResult == &original);
+
+	struct BigObject
+	{
+		Poco::UInt64 one = 1;
+		Poco::UInt64 two = 2;
+		Poco::UInt64 three = 3;
+		Poco::UInt64 four = 4;
+		Poco::UInt64 five = 5;
+		Poco::UInt64 six = 6;
+		Poco::UInt64 seven = 7;
+		Poco::UInt64 eight = 8;
+		Poco::UInt64 nine = 9;
+
+		bool operator==(const BigObject& other)
+		{
+			return one == other.one &&
+				two == other.two &&
+				three == other.three &&
+				four == other.four &&
+				five == other.five &&
+				six == other.six &&
+				seven == other.seven &&
+				eight == other.eight &&
+				nine == other.nine;
+		}
+	};
+
+	poco_assert (sizeof(BigObject) > POCO_SMALL_OBJECT_SIZE);
+
+	BigObject bigObject;
+	Any bigOriginal = bigObject, swappedBig;
+	assertFalse (bigOriginal.local());
+	assertFalse (bigOriginal.empty());
+	assertFalse (swappedBig.local());
+	assertTrue (swappedBig.empty());
+	BigObject* bigPtr = AnyCast<BigObject>(&bigOriginal);
+	Any* swapBigResult = &bigOriginal.swap(swappedBig);
+
+	assertTrue (bigOriginal.empty());
+	assertTrue (!swappedBig.empty());
+	assertTrue (swappedBig.type() == typeid(BigObject));
+	assertTrue (bigObject == AnyCast<BigObject>(swappedBig));
+	assertTrue (0 != bigPtr);
+	assertTrue (swapBigResult == &bigOriginal);
+
+	// assure proper assignment behavior after swapping
+	original = text;
+	bigOriginal = bigObject;
+#ifdef POCO_NO_SOO
+	assertFalse (original.local());
+#else
+	assertTrue (original.local());
+#endif
+	assertFalse (bigOriginal.local());
+
+	Any temp = original;
+#ifdef POCO_NO_SOO
+	assertFalse (temp.local());
+#else
+	assertTrue (temp.local());
+#endif
+
+	original = bigOriginal;
+	assertTrue (bigObject == AnyCast<BigObject>(original));
+	assertFalse (original.local());
+
+	bigOriginal = temp;
+	assertTrue (text == AnyCast<std::string>(bigOriginal));
+#ifdef POCO_NO_SOO
+	assertFalse (bigOriginal.local());
+#else
+	assertTrue (bigOriginal.local());
+#endif
 }
 
 
diff --git a/Foundation/testsuite/src/ArrayTest.cpp b/Foundation/testsuite/src/ArrayTest.cpp
index ec19b419f..152ae0afa 100644
--- a/Foundation/testsuite/src/ArrayTest.cpp
+++ b/Foundation/testsuite/src/ArrayTest.cpp
@@ -90,7 +90,7 @@ void ArrayTest::testOperations()
 	}
 
 	// swap
-	Array b; 
+	Array b;
 	b.assign(10);
 	for(int i=0; i<SIZE; i++){
 		assertTrue (a[i] == 100);
@@ -226,6 +226,6 @@ CppUnit::Test* ArrayTest::suite()
 	CppUnit_addTest(pSuite, ArrayTest, testIterator);
 	CppUnit_addTest(pSuite, ArrayTest, testAlgorithm);
 	CppUnit_addTest(pSuite, ArrayTest, testMultiLevelArray);
-	
+
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/AutoReleasePoolTest.cpp b/Foundation/testsuite/src/AutoReleasePoolTest.cpp
index 2bc8d3ba0..6ac2f2dab 100644
--- a/Foundation/testsuite/src/AutoReleasePoolTest.cpp
+++ b/Foundation/testsuite/src/AutoReleasePoolTest.cpp
@@ -26,39 +26,39 @@ namespace
 		{
 			++_count;
 		}
-				
+
 		void duplicate()
 		{
 			++_rc;
 		}
-		
+
 		void release()
 		{
 			if (--_rc == 0)
 				delete this;
 		}
-		
+
 		int rc() const
 		{
 			return _rc;
 		}
-		
+
 		static int count()
 		{
 			return _count;
 		}
-		
+
 	protected:
 		~TestObj()
 		{
 			--_count;
 		}
-		
+
 	private:
 		int _rc;
 		static int _count;
 	};
-	
+
 	int TestObj::_count = 0;
 }
 
diff --git a/Foundation/testsuite/src/BasicEventTest.h b/Foundation/testsuite/src/BasicEventTest.h
index c5db16ae6..9e6f0db8e 100644
--- a/Foundation/testsuite/src/BasicEventTest.h
+++ b/Foundation/testsuite/src/BasicEventTest.h
@@ -44,7 +44,7 @@ public:
 	void testOverwriteDelegate();
 	void testAsyncNotify();
 	void testNullMutex();
-	
+
 	void setUp();
 	void tearDown();
 	static CppUnit::Test* suite();
@@ -71,7 +71,7 @@ protected:
 
 	int getCount() const;
 private:
-	int		_count;
+	std::atomic<int> _count;
 };
 
 
diff --git a/Foundation/testsuite/src/BinaryReaderWriterTest.cpp b/Foundation/testsuite/src/BinaryReaderWriterTest.cpp
index 74c82af46..3c3ad17dc 100644
--- a/Foundation/testsuite/src/BinaryReaderWriterTest.cpp
+++ b/Foundation/testsuite/src/BinaryReaderWriterTest.cpp
@@ -87,7 +87,7 @@ void BinaryReaderWriterTest::write(BinaryWriter& writer)
 	writer << (unsigned) 123456;
 	writer << (long) -1234567890;
 	writer << (unsigned long) 1234567890;
-	
+
 #if defined(POCO_HAVE_INT64)
 	writer << (Int64) -1234567890;
 	writer << (UInt64) 1234567890;
@@ -95,13 +95,13 @@ void BinaryReaderWriterTest::write(BinaryWriter& writer)
 
 	writer << (float) 1.5;
 	writer << (double) -1.5;
-	
+
 	writer << "foo";
 	writer << "";
-	
+
 	writer << std::string("bar");
 	writer << std::string();
-	
+
 	writer.write7BitEncoded((UInt32) 100);
 	writer.write7BitEncoded((UInt32) 1000);
 	writer.write7BitEncoded((UInt32) 10000);
@@ -115,7 +115,7 @@ void BinaryReaderWriterTest::write(BinaryWriter& writer)
 	writer.write7BitEncoded((UInt64) 100000);
 	writer.write7BitEncoded((UInt64) 1000000);
 #endif
-	
+
 	std::vector<int> vec;
 	vec.push_back(1);
 	vec.push_back(2);
@@ -133,7 +133,7 @@ void BinaryReaderWriterTest::read(BinaryReader& reader)
 	assertTrue (b);
 	reader >> b;
 	assertTrue (!b);
-	
+
 	char c;
 	reader >> c;
 	assertTrue (c == 'a');
@@ -166,7 +166,7 @@ void BinaryReaderWriterTest::read(BinaryReader& reader)
 	Int64 int64v;
 	reader >> int64v;
 	assertTrue (int64v == -1234567890);
-	
+
 	UInt64 uint64v;
 	reader >> uint64v;
 	assertTrue (uint64v == 1234567890);
@@ -175,11 +175,11 @@ void BinaryReaderWriterTest::read(BinaryReader& reader)
 	float floatv;
 	reader >> floatv;
 	assertTrue (floatv == 1.5);
-	
+
 	double doublev;
 	reader >> doublev;
 	assertTrue (doublev == -1.5);
-	
+
 	std::string str;
 	reader >> str;
 	assertTrue (str == "foo");
@@ -189,7 +189,7 @@ void BinaryReaderWriterTest::read(BinaryReader& reader)
 	assertTrue (str == "bar");
 	reader >> str;
 	assertTrue (str == "");
-	
+
 	UInt32 uint32v;
 	reader.read7BitEncoded(uint32v);
 	assertTrue (uint32v == 100);
diff --git a/Foundation/testsuite/src/ByteOrderTest.cpp b/Foundation/testsuite/src/ByteOrderTest.cpp
index bea2adba7..6f4e8a6a6 100644
--- a/Foundation/testsuite/src/ByteOrderTest.cpp
+++ b/Foundation/testsuite/src/ByteOrderTest.cpp
@@ -122,7 +122,7 @@ void ByteOrderTest::testByteOrderBigEndian()
 		assertTrue (norm == flip);
 	}
 	#endif
-	
+
 	{
 		Int16 norm = 4;
 		Int16 flip = ByteOrder::fromBigEndian(norm);
@@ -203,7 +203,7 @@ void ByteOrderTest::testByteOrderBigEndian()
 		assertTrue (norm == flip);
 	}
 	#endif
-	
+
 	{
 		Int16 norm = 4;
 		Int16 flip = ByteOrder::fromBigEndian(norm);
@@ -290,7 +290,7 @@ void ByteOrderTest::testByteOrderLittleEndian()
 		assertTrue (norm == flip);
 	}
 	#endif
-	
+
 	{
 		Int16 norm = 4;
 		Int16 flip = ByteOrder::toLittleEndian(norm);
@@ -371,7 +371,7 @@ void ByteOrderTest::testByteOrderLittleEndian()
 		assertTrue (norm == flip);
 	}
 	#endif
-	
+
 	{
 		Int16 norm = 4;
 		Int16 flip = ByteOrder::fromLittleEndian(norm);
@@ -458,7 +458,7 @@ void ByteOrderTest::testByteOrderNetwork()
 		assertTrue (norm == flip);
 	}
 	#endif
-	
+
 	{
 		Int16 norm = 4;
 		Int16 flip = ByteOrder::fromNetwork(norm);
@@ -539,7 +539,7 @@ void ByteOrderTest::testByteOrderNetwork()
 		assertTrue (norm == flip);
 	}
 	#endif
-	
+
 	{
 		Int16 norm = 4;
 		Int16 flip = ByteOrder::fromNetwork(norm);
diff --git a/Foundation/testsuite/src/ChannelTest.cpp b/Foundation/testsuite/src/ChannelTest.cpp
index 39f93a6c5..3a7ec81e2 100644
--- a/Foundation/testsuite/src/ChannelTest.cpp
+++ b/Foundation/testsuite/src/ChannelTest.cpp
@@ -31,6 +31,8 @@ using Poco::StreamChannel;
 using Poco::Formatter;
 using Poco::Message;
 using Poco::AutoPtr;
+using Poco::Thread;
+using Poco::Runnable;
 
 
 class SimpleFormatter: public Formatter
@@ -45,6 +47,32 @@ public:
 };
 
 
+class LogRunnable : public Runnable
+{
+public:
+	LogRunnable(AutoPtr<AsyncChannel> pAsync):
+		_pAsync(pAsync),
+		_stop(false)
+	{
+	}
+
+	void run()
+	{
+		Message msg;
+		while (!_stop) _pAsync->log(msg);
+	}
+
+	void stop()
+	{
+		_stop = true;
+	}
+
+private:
+	AutoPtr<AsyncChannel> _pAsync;
+	std::atomic<bool> _stop;
+};
+
+
 ChannelTest::ChannelTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
@@ -71,12 +99,17 @@ void ChannelTest::testAsync()
 {
 	AutoPtr<TestChannel> pChannel = new TestChannel;
 	AutoPtr<AsyncChannel> pAsync = new AsyncChannel(pChannel);
+	LogRunnable lr(pAsync);
 	pAsync->open();
+	Thread t;
+	t.start(lr);
 	Message msg;
 	pAsync->log(msg);
 	pAsync->log(msg);
 	pAsync->close();
-	assertTrue (pChannel->list().size() == 2);
+	lr.stop();
+	t.join();
+	assertTrue (pChannel->list().size() >= 2);
 }
 
 
diff --git a/Foundation/testsuite/src/ClassLoaderTest.cpp b/Foundation/testsuite/src/ClassLoaderTest.cpp
index 02a583896..a9250dfd8 100644
--- a/Foundation/testsuite/src/ClassLoaderTest.cpp
+++ b/Foundation/testsuite/src/ClassLoaderTest.cpp
@@ -45,9 +45,9 @@ void ClassLoaderTest::testClassLoader1()
 	assertTrue (cl.begin() == cl.end());
 	assertNullPtr (cl.findClass("PluginA"));
 	assertNullPtr (cl.findManifest(path));
-	
+
 	assertTrue (!cl.isLibraryLoaded(path));
-	
+
 	try
 	{
 		const ClassLoader<TestPlugin>::Meta& POCO_UNUSED meta = cl.classFor("PluginA");
@@ -89,17 +89,17 @@ void ClassLoaderTest::testClassLoader2()
 	assertNotNullPtr (cl.findClass("PluginB"));
 	assertNotNullPtr (cl.findClass("PluginC"));
 	assertNotNullPtr (cl.findManifest(path));
-	
+
 	assertTrue (cl.isLibraryLoaded(path));
 	assertTrue (cl.manifestFor(path).size() == 3);
-	
+
 	ClassLoader<TestPlugin>::Iterator it = cl.begin();
 	assertTrue (it != cl.end());
 	assertTrue (it->first == path);
 	assertTrue (it->second->size() == 3);
 	++it;
 	assertTrue (it == cl.end());
-	
+
 	TestPlugin* pPluginA = cl.classFor("PluginA").create();
 	assertTrue (pPluginA->name() == "PluginA");
 	assertTrue (!cl.classFor("PluginA").isAutoDelete(pPluginA));
@@ -108,18 +108,18 @@ void ClassLoaderTest::testClassLoader2()
 	TestPlugin* pPluginB = cl.classFor("PluginB").create();
 	assertTrue (pPluginB->name() == "PluginB");
 	delete pPluginB;
-	
+
 	pPluginB = cl.create("PluginB");
 	assertTrue (pPluginB->name() == "PluginB");
 	delete pPluginB;
-	
+
 	assertTrue (cl.canCreate("PluginA"));
 	assertTrue (cl.canCreate("PluginB"));
 	assertTrue (!cl.canCreate("PluginC"));
 
 	TestPlugin& pluginC = cl.instance("PluginC");
 	assertTrue (pluginC.name() == "PluginC");
-	
+
 	try
 	{
 		TestPlugin& POCO_UNUSED plgB = cl.instance("PluginB");
@@ -128,7 +128,7 @@ void ClassLoaderTest::testClassLoader2()
 	catch (InvalidAccessException&)
 	{
 	}
-	
+
 	try
 	{
 		TestPlugin* POCO_UNUSED pPluginC = cl.create("PluginC");
@@ -147,7 +147,7 @@ void ClassLoaderTest::testClassLoader2()
 	catch (InvalidAccessException&)
 	{
 	}
-	
+
 	const AbstractMetaObject<TestPlugin>& meta1 = cl.classFor("PluginC");
 	assertTrue (meta1.isAutoDelete(&(meta1.instance())));
 
@@ -175,16 +175,16 @@ void ClassLoaderTest::testClassLoader3()
 	cl.loadLibrary(path);
 	cl.loadLibrary(path);
 	cl.unloadLibrary(path);
-	
+
 	assertTrue (cl.manifestFor(path).size() == 3);
-	
+
 	ClassLoader<TestPlugin>::Iterator it = cl.begin();
 	assertTrue (it != cl.end());
 	assertTrue (it->first == path);
 	assertTrue (it->second->size() == 3);
 	++it;
 	assertTrue (it == cl.end());
-	
+
 	cl.unloadLibrary(path);
 	assertNullPtr (cl.findManifest(path));
 }
diff --git a/Foundation/testsuite/src/ClockTest.cpp b/Foundation/testsuite/src/ClockTest.cpp
index 04e25f679..5d359bc12 100644
--- a/Foundation/testsuite/src/ClockTest.cpp
+++ b/Foundation/testsuite/src/ClockTest.cpp
@@ -48,15 +48,15 @@ void ClockTest::testClock()
 	assertTrue (t2 <= t3);
 	Clock::ClockDiff d = (t2 - t1);
 	assertTrue (d >= 180000 && d <= 300000);
-	
+
 	Clock::ClockDiff acc = Clock::accuracy();
 	assertTrue (acc > 0 && acc < Clock::resolution());
 	std::cout << "Clock accuracy: " << acc << std::endl;
-	
+
 	t1.swap(t2);
 	assertTrue (t1 > t2);
 	t2.swap(t1);
-	
+
 	Clock now;
 	Thread::sleep(201);
 	assertTrue (now.elapsed() >= 200000);
diff --git a/Foundation/testsuite/src/ConditionTest.cpp b/Foundation/testsuite/src/ConditionTest.cpp
index a4694c3d7..d5397cab7 100644
--- a/Foundation/testsuite/src/ConditionTest.cpp
+++ b/Foundation/testsuite/src/ConditionTest.cpp
@@ -36,7 +36,7 @@ namespace
 			_mutex(mutex)
 		{
 		}
-		
+
 		void run()
 		{
 			_mutex.lock();
@@ -44,18 +44,18 @@ namespace
 			_mutex.unlock();
 			_ran = true;
 		}
-		
+
 		bool ran() const
 		{
 			return _ran;
 		}
-			
+
 	private:
 		bool _ran;
 		Condition& _cond;
 		Mutex& _mutex;
 	};
-	
+
 	class TryWaitRunnable: public Runnable
 	{
 	public:
@@ -65,7 +65,7 @@ namespace
 			_mutex(mutex)
 		{
 		}
-		
+
 		void run()
 		{
 			_mutex.lock();
@@ -75,12 +75,12 @@ namespace
 			}
 			_mutex.unlock();
 		}
-		
+
 		bool ran() const
 		{
 			return _ran;
 		}
-			
+
 	private:
 		bool _ran;
 		Condition& _cond;
@@ -106,26 +106,26 @@ void ConditionTest::testSignal()
 	Mutex mtx;
 	WaitRunnable r1(cond, mtx);
 	WaitRunnable r2(cond, mtx);
-	
+
 	Thread t1;
 	Thread t2;
-	
+
 	t1.start(r1);
 	Thread::sleep(200);
 	t2.start(r2);
-	
+
 	assertTrue (!r1.ran());
 	assertTrue (!r2.ran());
-	
+
 	cond.signal();
-	
+
 	t1.join();
 	assertTrue (r1.ran());
-	
+
 	assertTrue (!t2.tryJoin(200));
-	
+
 	cond.signal();
-	
+
 	t2.join();
 
 	assertTrue (r2.ran());
@@ -139,33 +139,33 @@ void ConditionTest::testBroadcast()
 	WaitRunnable r1(cond, mtx);
 	WaitRunnable r2(cond, mtx);
 	TryWaitRunnable r3(cond, mtx);
-	
+
 	Thread t1;
 	Thread t2;
 	Thread t3;
-	
+
 	t1.start(r1);
 	Thread::sleep(200);
 	t2.start(r2);
 	Thread::sleep(200);
 	t3.start(r3);
-	
+
 	assertTrue (!r1.ran());
 	assertTrue (!r2.ran());
 	assertTrue (!r3.ran());
-	
+
 	cond.signal();
 	t1.join();
-	
+
 	assertTrue (r1.ran());
 	assertTrue (!t2.tryJoin(500));
 	assertTrue (!t3.tryJoin(500));
-	
+
 	cond.broadcast();
-	
+
 	t2.join();
 	t3.join();
-	
+
 	assertTrue (r2.ran());
 	assertTrue (r3.ran());
 }
diff --git a/Foundation/testsuite/src/DateTimeFormatterTest.cpp b/Foundation/testsuite/src/DateTimeFormatterTest.cpp
index d7ff38b2b..e708966a4 100644
--- a/Foundation/testsuite/src/DateTimeFormatterTest.cpp
+++ b/Foundation/testsuite/src/DateTimeFormatterTest.cpp
@@ -191,7 +191,7 @@ void DateTimeFormatterTest::testTimespan()
 	Timespan ts4(0, 24, 60, 60, 1001000);
 	str = DateTimeFormatter::format(ts4);
 	assertTrue (str == "1d 01:01:01.001");
-	
+
 	Timespan ts5(2, 11, 30, 20, 0);
 	str = DateTimeFormatter::format(ts5, "%h %m %s");
 	assertTrue (str == "59 3570 214220");
diff --git a/Foundation/testsuite/src/DateTimeFormatterTest.h b/Foundation/testsuite/src/DateTimeFormatterTest.h
index d1b778abc..776c06a6b 100644
--- a/Foundation/testsuite/src/DateTimeFormatterTest.h
+++ b/Foundation/testsuite/src/DateTimeFormatterTest.h
@@ -35,7 +35,7 @@ public:
 	void testSORTABLE();
 	void testCustom();
 	void testTimespan();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Foundation/testsuite/src/DateTimeParserTest.cpp b/Foundation/testsuite/src/DateTimeParserTest.cpp
index c2c44ebc3..5a855f661 100644
--- a/Foundation/testsuite/src/DateTimeParserTest.cpp
+++ b/Foundation/testsuite/src/DateTimeParserTest.cpp
@@ -392,7 +392,7 @@ void DateTimeParserTest::testRFC850()
 	assertTrue (dt.minute() == 30);
 	assertTrue (dt.second() == 0);
 	assertTrue (tzd == -3600);
-	
+
 	dt = DateTimeParser::parse(DateTimeFormat::RFC850_FORMAT, "Wed, 12-Sep-73 02:01:12 CEST", tzd);
 	assertTrue (dt.year() == 1973);
 	assertTrue (dt.month() == 9);
@@ -484,7 +484,7 @@ void DateTimeParserTest::testCustom()
 	assertTrue (dt.minute() == 0);
 	assertTrue (dt.second() == 0);
 	assertTrue (tzd == 0);
-	
+
 	dt = DateTimeParser::parse("%m/%d/%y", "01/18/05", tzd);
 	assertTrue (dt.year() == 2005);
 	assertTrue (dt.month() == 1);
@@ -493,7 +493,7 @@ void DateTimeParserTest::testCustom()
 	assertTrue (dt.minute() == 0);
 	assertTrue (dt.second() == 0);
 	assertTrue (tzd == 0);
-	
+
 	dt = DateTimeParser::parse("%h:%M %a", "12:30 am", tzd);
 	assertTrue (dt.hour() == 0);
 	assertTrue (dt.minute() == 30);
@@ -557,7 +557,7 @@ void DateTimeParserTest::testGuess()
 	assertTrue (dt.minute() == 30);
 	assertTrue (dt.second() == 0);
 	assertTrue (tzd == 0);
-	
+
 	dt = DateTimeParser::parse("2005-01-08T12:30:00+01:00", tzd);
 	assertTrue (dt.year() == 2005);
 	assertTrue (dt.month() == 1);
@@ -640,7 +640,7 @@ void DateTimeParserTest::testGuess()
 	assertTrue (dt.minute() == 30);
 	assertTrue (dt.second() == 0);
 	assertTrue (tzd == 3600);
-	
+
 	dt = DateTimeParser::parse("Sat Jan  8 12:30:00 2005", tzd);
 	assertTrue (dt.year() == 2005);
 	assertTrue (dt.month() == 1);
diff --git a/Foundation/testsuite/src/DateTimeTest.cpp b/Foundation/testsuite/src/DateTimeTest.cpp
index 1f8cccf9e..124f340c6 100644
--- a/Foundation/testsuite/src/DateTimeTest.cpp
+++ b/Foundation/testsuite/src/DateTimeTest.cpp
@@ -81,7 +81,7 @@ void DateTimeTest::testJulian()
 	assertTrue (dt.dayOfWeek() == 4);
 	assertTrue (dt.julianDay() == 2440587.5);
 	assertTrue (dt.timestamp() == 0);
-	
+
 	dt = 2299160.5; // 1582-10-15 00:00:00 (first day of Gregorian reform, UTC base)
 	assertTrue (dt.year() == 1582);
 	assertTrue (dt.month() == 10);
@@ -131,7 +131,7 @@ void DateTimeTest::testGregorian()
 	assertTrue (dt.dayOfWeek() == 4);
 	assertTrue (dt.julianDay() == 2440587.5);
 	assertTrue (dt.timestamp() == 0);
-	
+
 	dt.assign(2001, 9, 9, 1, 46, 40);
 	assertTrue (dt.year() == 2001);
 	assertTrue (dt.month() == 9);
@@ -186,7 +186,7 @@ void DateTimeTest::testStatics()
 	assertTrue (!DateTime::isLeapYear(2001));
 	assertTrue (!DateTime::isLeapYear(1800));
 	assertTrue (!DateTime::isLeapYear(1900));
-	
+
 	assertTrue (DateTime::daysOfMonth(2000, 1) == 31);
 	assertTrue (DateTime::daysOfMonth(2000, 2) == 29);
 	assertTrue (DateTime::daysOfMonth(1999, 2) == 28);
@@ -216,9 +216,9 @@ void DateTimeTest::testCalcs()
 	assertTrue (dt1.week(DateTime::MONDAY) == 1);
 	dt1.assign(2007, 12, 31);
 	assertTrue (dt1.week(DateTime::MONDAY) == 53);
-	
+
 	// Jan 1 is Mon
-	dt1.assign(2001, 1, 1);  
+	dt1.assign(2001, 1, 1);
 	assertTrue (dt1.week() == 1);
 	dt1.assign(2001, 1, 7);
 	assertTrue (dt1.week() == 1);
@@ -252,7 +252,7 @@ void DateTimeTest::testCalcs()
 	assertTrue (dt1.week() == 3);
 	dt1.assign(2003, 1, 20);
 	assertTrue (dt1.week() == 4);
-	
+
 	// Jan 1 is Thu
 	dt1.assign(2004, 1, 1);
 	assertTrue (dt1.week() == 1);
@@ -288,7 +288,7 @@ void DateTimeTest::testCalcs()
 	assertTrue (dt1.week() == 2);
 	dt1.assign(2000, 1, 17);
 	assertTrue (dt1.week() == 3);
-	
+
 	// Jan 1 is Sun
 	dt1.assign(1995, 1, 1);
 	assertTrue (dt1.week() == 0);
@@ -309,7 +309,7 @@ void DateTimeTest::testAMPM()
 	assertTrue (dt1.isAM());
 	assertTrue (!dt1.isPM());
 	assertTrue (dt1.hourAMPM() == 12);
-	
+
 	dt1.assign(2005, 1, 1, 12, 15, 30);
 	assertTrue (!dt1.isAM());
 	assertTrue (dt1.isPM());
@@ -327,14 +327,14 @@ void DateTimeTest::testRelational()
 	DateTime dt1(2005, 1, 1, 0, 15, 30);
 	DateTime dt2(2005, 1, 2, 0, 15, 30);
 	DateTime dt3(dt1);
-	
+
 	assertTrue (dt1 < dt2);
 	assertTrue (dt1 <= dt2);
 	assertTrue (dt2 > dt1);
 	assertTrue (dt2 >= dt1);
 	assertTrue (dt1 != dt2);
 	assertTrue (!(dt1 == dt2));
-	
+
 	assertTrue (dt1 == dt3);
 	assertTrue (!(dt1 != dt3));
 	assertTrue (dt1 >= dt3);
@@ -342,38 +342,38 @@ void DateTimeTest::testRelational()
 	assertTrue (!(dt1 > dt3));
 	assertTrue (!(dt1 < dt3));
 
-	static const struct 
+	static const struct
 	{
 		int year;
-		int month;  
+		int month;
 		int day;
-	} values[] = 
+	} values[] =
 	{
-		{	1,  1,  1 }, 
-		{   10,  4,  5 }, 
+		{	1,  1,  1 },
+		{   10,  4,  5 },
 		{  100,  6,  7 },
-		{ 1000,  8,  9 }, 
-		{ 2000,  1, 31 }, 
+		{ 1000,  8,  9 },
+		{ 2000,  1, 31 },
 		{ 2002,  7,  4 },
-		{ 2002, 12, 31 }, 
-		{ 2003,  1,  1 }, 
+		{ 2002, 12, 31 },
+		{ 2003,  1,  1 },
 		{ 2003,  1,  2 },
-		{ 2003,  8,  5 }, 
-		{ 2003,  8,  6 }, 
+		{ 2003,  8,  5 },
+		{ 2003,  8,  6 },
 		{ 2003,  8,  7 },
-		{ 2004,  9,  3 }, 
-		{ 2004,  9,  4 }, 
+		{ 2004,  9,  3 },
+		{ 2004,  9,  4 },
 	};
 
 	const int num_values = sizeof values / sizeof *values;
-	for (int i = 0; i < num_values; ++i) 
+	for (int i = 0; i < num_values; ++i)
 	{
 		DateTime v;
 		const DateTime& V = v;
 		v.assign(values[i].year, values[i].month, values[i].day);
-		for (int j = 0; j < num_values; ++j) 
+		for (int j = 0; j < num_values; ++j)
 		{
-			DateTime u;  
+			DateTime u;
 			const DateTime& U = u;
 			u.assign(values[j].year, values[j].month, values[j].day);
 
@@ -390,19 +390,19 @@ void DateTimeTest::testArithmetics()
 {
 	DateTime dt1(2005, 1, 1, 0, 15, 30);
 	DateTime dt2(2005, 1, 2, 0, 15, 30);
-	
+
 	Timespan s = dt2 - dt1;
 	assertTrue (s.days() == 1);
-	
+
 	DateTime dt3 = dt1 + s;
 	assertTrue (dt3 == dt2);
-	
+
 	dt3 -= s;
 	assertTrue (dt3 == dt1);
 	dt1 += s;
 	assertTrue (dt1 == dt2);
 
-	static const struct 
+	static const struct
 	{
 		int lineNum;		// source line number
 		int year1;			// operand/result date1 year
@@ -412,11 +412,11 @@ void DateTimeTest::testArithmetics()
 		int year2;			// operand/result date2 year
 		int month2;			// operand/result date2 month
 		unsigned int day2;	// operand/result date2 day
-	} data[] = 
+	} data[] =
 	{
-		//          - - - -first- - - -           - - - second - - - 
+		//          - - - -first- - - -           - - - second - - -
 		//line no.  year   month   day   numDays  year   month   day
-		//-------   -----  -----  -----  -------  -----  -----  ----- 
+		//-------   -----  -----  -----  -------  -----  -----  -----
 		{ __LINE__,       1,     1,     1,      1,      1,     1,     2 },
 		{ __LINE__,      10,     2,    28,      1,     10,     3,     1 },
 		{ __LINE__,     100,     3,    31,      2,    100,     4,     2 },
@@ -434,7 +434,7 @@ void DateTimeTest::testArithmetics()
 	};
 
 	const int num_data = sizeof data / sizeof *data;
-	for (int di = 0; di < num_data; ++di) 
+	for (int di = 0; di < num_data; ++di)
 	{
 		const int line	 = data[di].lineNum;
 		const int num_days = data[di].numDays;
@@ -471,7 +471,7 @@ void DateTimeTest::testArithmetics()
 
 void DateTimeTest::testIncrementDecrement()
 {
-	static const struct 
+	static const struct
 	{
 		int lineNum;		// source line number
 		int year1;			// (first) date year
@@ -480,11 +480,11 @@ void DateTimeTest::testIncrementDecrement()
 		int year2;			// (second) date year
 		int month2;			// (second) date month
 		unsigned int day2;	// (second) date day
-	} data[] = 
+	} data[] =
 	{
-		 //          - - - -first- - - -    - - - second - - - 
+		 //          - - - -first- - - -    - - - second - - -
 		 //line no.  year   month   day     year   month   day
-		 //-------   -----  -----  -----    -----  -----  ----- 
+		 //-------   -----  -----  -----    -----  -----  -----
 		{ __LINE__,       1,     1,     1,       1,     1,     2 },
 		{ __LINE__,      10,     2,    28,      10,     3,     1 },
 		{ __LINE__,     100,     3,    31,     100,     4,     1 },
@@ -511,14 +511,14 @@ void DateTimeTest::testIncrementDecrement()
 	const int num_data = sizeof data / sizeof *data;
 	int di;
 
-	for (di = 0; di < num_data; ++di) 
+	for (di = 0; di < num_data; ++di)
 	{
 		const int line = data[di].lineNum;
-		DateTime x = DateTime(data[di].year1, data[di].month1, 
+		DateTime x = DateTime(data[di].year1, data[di].month1,
 							  data[di].day1);
 		// Would do pre-increment of x here.
 		const DateTime& X = x;
-		x = x + Timespan(1,0,0,0,0);  
+		x = x + Timespan(1,0,0,0,0);
 		DateTime y = x; const DateTime& Y = y;
 
 		loop_1_assert (line, data[di].year2  == X.year());
@@ -530,7 +530,7 @@ void DateTimeTest::testIncrementDecrement()
 		loop_1_assert (line, data[di].day2   == Y.day());
 	}
 
-	for (di = 0; di < num_data; ++di) 
+	for (di = 0; di < num_data; ++di)
 	{
 		const int line = data[di].lineNum;
 		DateTime x = DateTime(data[di].year1, data[di].month1, data[di].day1);
@@ -540,7 +540,7 @@ void DateTimeTest::testIncrementDecrement()
 
 		// Would do post increment of x here.
 		const DateTime& X = x;
-		x = x + Timespan(1,0,0,0,0);  
+		x = x + Timespan(1,0,0,0,0);
 
 		loop_1_assert (line, data[di].year2  == X.year());
 		loop_1_assert (line, data[di].month2 == X.month());
@@ -549,13 +549,13 @@ void DateTimeTest::testIncrementDecrement()
 		loop_1_assert (line, data[di].month1 == Y.month());
 		loop_1_assert (line, data[di].day1   == Y.day());
 	}
-			
-	for (di = 0; di < num_data; ++di) 
+
+	for (di = 0; di < num_data; ++di)
 	{
 		const int line = data[di].lineNum;
 		DateTime x = DateTime(data[di].year2, data[di].month2, data[di].day2);
 		const DateTime& X = x;
-		x = x - Timespan(1,0,0,0,0);  
+		x = x - Timespan(1,0,0,0,0);
 		DateTime y = x; DateTime Y = y;
 
 		loop_1_assert (line, data[di].year1  == X.year());
@@ -567,7 +567,7 @@ void DateTimeTest::testIncrementDecrement()
 		loop_1_assert (line, data[di].day1   == Y.day());
 	}
 
-	for (di = 0; di < num_data; ++di) 
+	for (di = 0; di < num_data; ++di)
 	{
 		const int line = data[di].lineNum;
 		DateTime x1 = DateTime(data[di].year1, data[di].month1, data[di].day1);
@@ -575,7 +575,7 @@ void DateTimeTest::testIncrementDecrement()
 		DateTime y = x; DateTime Y = y;
 		const DateTime& X = x;
 		// would post-decrement x here.
-		x = x - Timespan(1,0,0,0,0);  
+		x = x - Timespan(1,0,0,0,0);
 
 		loop_1_assert (line, data[di].year1  == X.year());
 		loop_1_assert (line, data[di].month1 == X.month());
@@ -594,7 +594,7 @@ void DateTimeTest::testSwap()
 	DateTime dt2(2005, 1, 2, 0, 15, 30);
 	DateTime dt3(2005, 1, 1, 0, 15, 30);
 	DateTime dt4(2005, 1, 2, 0, 15, 30);
-	
+
 	dt1.swap(dt2);
 	assertTrue (dt2 == dt3);
 	assertTrue (dt1 == dt4);
@@ -625,28 +625,28 @@ void DateTimeTest::testUsage()
 
 void DateTimeTest::testSetYearDay()
 {
-	static const struct 
+	static const struct
 	{
 		int d_lineNum;			// source line number
 		int d_year;				// year under test
 		unsigned int d_day;		// day-of-year under test
 		int d_expMonth;			// expected month
 		unsigned int d_expDay;	// expected day
-	} data[] = 
+	} data[] =
 	{
 		//line no.  year   dayOfYr     exp. month   exp. day
 		//-------   -----  -------     ----------   --------
-		{ __LINE__,          1,       1,          1,         1 },   
+		{ __LINE__,          1,       1,          1,         1 },
 		{ __LINE__,          1,       2,          1,         2 },
 		{ __LINE__,          1,     365,         12,        31 },
-		{ __LINE__,       1996,       1,          1,         1 },   
+		{ __LINE__,       1996,       1,          1,         1 },
 		{ __LINE__,       1996,       2,          1,         2 },
 		{ __LINE__,       1996,     365,         12,        30 },
 		{ __LINE__,       1996,     366,         12,        31 }
 	};
 
 	const int num_data = sizeof data / sizeof *data;
-	for (int di = 0; di < num_data; ++di) 
+	for (int di = 0; di < num_data; ++di)
 	{
 		const int POCO_UNUSED line = data[di].d_lineNum;
 		const int year = data[di].d_year;
@@ -672,25 +672,25 @@ void DateTimeTest::testSetYearDay()
 #endif
 	}
 
-	static const struct 
+	static const struct
 	{
 		int d_lineNum;  // source line number
 		int d_year;	 // year under test
 		int d_day;	  // day-of-year under test
 		int d_exp;	  // expected status
-	} data2[] = 
+	} data2[] =
 	{
 		//line no.  year   dayOfYr     expected value
 		//-------   -----  -------     --------------
-		{ __LINE__,          1,       1,          1 },   
+		{ __LINE__,          1,       1,          1 },
 		{ __LINE__,          1,      -1,          0 },
 		{ __LINE__,          1,       0,          0 },
 		{ __LINE__,          1,     365,          1 },
 		{ __LINE__,          1,     366,          0 },
 		{ __LINE__,          1,     367,          0 },
-		{ __LINE__,          0,       0,          0 },   
-		{ __LINE__,         -1,      -1,          0 },   
-		{ __LINE__,       1996,       1,          1 },   
+		{ __LINE__,          0,       0,          0 },
+		{ __LINE__,         -1,      -1,          0 },
+		{ __LINE__,       1996,       1,          1 },
 		{ __LINE__,       1996,       2,          1 },
 		{ __LINE__,       1996,      32,          1 },
 		{ __LINE__,       1996,     365,          1 },
@@ -699,7 +699,7 @@ void DateTimeTest::testSetYearDay()
 	};
 
 	const int num_data2 = sizeof data2 / sizeof *data2;
-	for (int di = 0; di < num_data2; ++di) 
+	for (int di = 0; di < num_data2; ++di)
 	{
 		const int POCO_UNUSED line  = data2[di].d_lineNum;
 		const int POCO_UNUSED year  = data2[di].d_year;
@@ -721,53 +721,53 @@ void DateTimeTest::testSetYearDay()
 
 void DateTimeTest::testIsValid()
 {
-	static const struct 
+	static const struct
 	{
 		int  d_lineNum;  // source line number
 		int  d_year;	 // year under test
 		int  d_month;	// month under test
 		int  d_day;	  // day under test
 		bool d_exp;	  // expected value
-	} data[] = 
+	} data[] =
 	{
 		//line no.  year   month   day     expected value
 		//-------   -----  -----  -----    --------------
-		{ __LINE__,    0,     0,     0,      false },   
-		{ __LINE__,    1,     1,     0,      false },   
-		{ __LINE__,    1,     0,     1,      false },   
-		{ __LINE__,    0,     1,     1,      true },   
-		{ __LINE__,    1,     1,    -1,      false },   
-		{ __LINE__,    1,    -1,     1,      false },   
-		{ __LINE__, 2004,     1,    32,      false },   
-		{ __LINE__, 2004,     2,    30,      false },   
-		{ __LINE__, 2004,     3,    32,      false },   
-		{ __LINE__, 2004,     4,    31,      false },   
-		{ __LINE__, 2004,     5,    32,      false },   
-		{ __LINE__, 2004,     6,    31,      false },   
-		{ __LINE__, 2004,     7,    32,      false },   
-		{ __LINE__, 2004,     8,    32,      false },   
-		{ __LINE__, 2004,     9,    31,      false },   
-		{ __LINE__, 2004,    10,    32,      false },   
-		{ __LINE__, 2004,    11,    31,      false },   
-		{ __LINE__, 2004,    12,    32,      false },   
+		{ __LINE__,    0,     0,     0,      false },
+		{ __LINE__,    1,     1,     0,      false },
+		{ __LINE__,    1,     0,     1,      false },
+		{ __LINE__,    0,     1,     1,      true },
+		{ __LINE__,    1,     1,    -1,      false },
+		{ __LINE__,    1,    -1,     1,      false },
+		{ __LINE__, 2004,     1,    32,      false },
+		{ __LINE__, 2004,     2,    30,      false },
+		{ __LINE__, 2004,     3,    32,      false },
+		{ __LINE__, 2004,     4,    31,      false },
+		{ __LINE__, 2004,     5,    32,      false },
+		{ __LINE__, 2004,     6,    31,      false },
+		{ __LINE__, 2004,     7,    32,      false },
+		{ __LINE__, 2004,     8,    32,      false },
+		{ __LINE__, 2004,     9,    31,      false },
+		{ __LINE__, 2004,    10,    32,      false },
+		{ __LINE__, 2004,    11,    31,      false },
+		{ __LINE__, 2004,    12,    32,      false },
 		{ __LINE__,    0,    12,    31,      true },
 		{ __LINE__,    0,     2,    29,      true },
-		{ __LINE__,    1,     1,     1,      true }, 
-		{ __LINE__, 2010,     1,     2,      true }, 
-		{ __LINE__, 2011,     2,     5,      true }, 
-		{ __LINE__, 2012,     3,    10,      true }, 
-		{ __LINE__, 2013,     4,    17,      true }, 
-		{ __LINE__, 2014,     5,    23,      true }, 
-		{ __LINE__, 1600,     2,    29,      true },   
-		{ __LINE__, 1700,     2,    29,      false },   
-		{ __LINE__, 1800,     2,    29,      false },   
-		{ __LINE__, 1900,     2,    29,      false },   
-		{ __LINE__, 2000,     2,    29,      true },   
-		{ __LINE__, 2100,     2,    29,      false },   
+		{ __LINE__,    1,     1,     1,      true },
+		{ __LINE__, 2010,     1,     2,      true },
+		{ __LINE__, 2011,     2,     5,      true },
+		{ __LINE__, 2012,     3,    10,      true },
+		{ __LINE__, 2013,     4,    17,      true },
+		{ __LINE__, 2014,     5,    23,      true },
+		{ __LINE__, 1600,     2,    29,      true },
+		{ __LINE__, 1700,     2,    29,      false },
+		{ __LINE__, 1800,     2,    29,      false },
+		{ __LINE__, 1900,     2,    29,      false },
+		{ __LINE__, 2000,     2,    29,      true },
+		{ __LINE__, 2100,     2,    29,      false },
 	};
 
 	const int num_data = sizeof data / sizeof *data;
-	for (int di = 0; di < num_data; ++di) 
+	for (int di = 0; di < num_data; ++di)
 	{
 		const int  line  = data[di].d_lineNum;
 		const int  year  = data[di].d_year;
@@ -785,22 +785,22 @@ void DateTimeTest::testDayOfWeek()
 {
 	typedef DateTime::DaysOfWeek DOW;
 
-	static const struct 
+	static const struct
 	{
 		int d_lineNum;	// source line number
 		int d_year;		// year under test
 		int d_month;	// month under test
 		int d_day;		// day under test
 		DOW d_expDay;	// number of days to be added
-	} data[] = 
+	} data[] =
 	{
 		//Line no.    year   month   day    expDay
 		//-------   -----  -----  -----   -------
 		{ __LINE__,  1600,   1,       1,   DateTime::SATURDAY  },
-		{ __LINE__,  1600,   1,       2,   DateTime::SUNDAY    },         
+		{ __LINE__,  1600,   1,       2,   DateTime::SUNDAY    },
 		{ __LINE__,  1600,   1,       3,   DateTime::MONDAY    },
 		{ __LINE__,  1600,   1,       4,   DateTime::TUESDAY   },
-		{ __LINE__,  1600,   1,       5,   DateTime::WEDNESDAY },     
+		{ __LINE__,  1600,   1,       5,   DateTime::WEDNESDAY },
 		{ __LINE__,  1600,   1,       6,   DateTime::THURSDAY  },
 		{ __LINE__,  1600,   1,       7,   DateTime::FRIDAY    },
 		{ __LINE__,  1600,   1,       8,   DateTime::SATURDAY  },
@@ -810,25 +810,25 @@ void DateTimeTest::testDayOfWeek()
 		{ __LINE__,  1752,   8,      30,   DateTime::WEDNESDAY },
 		{ __LINE__,  1752,   8,      31,   DateTime::THURSDAY  },
 		{ __LINE__,  1752,   9,       1,   DateTime::FRIDAY    },
-		{ __LINE__,  1752,   9,       2,   DateTime::SATURDAY  },         
+		{ __LINE__,  1752,   9,       2,   DateTime::SATURDAY  },
 		{ __LINE__,  1752,   9,      14,   DateTime::THURSDAY  },
 		{ __LINE__,  1752,   9,      15,   DateTime::FRIDAY    },
-		{ __LINE__,  1752,   9,      16,   DateTime::SATURDAY  },     
+		{ __LINE__,  1752,   9,      16,   DateTime::SATURDAY  },
 		{ __LINE__,  1752,   9,      17,   DateTime::SUNDAY    },
 		{ __LINE__,  1752,   9,      18,   DateTime::MONDAY    },
 		{ __LINE__,  1752,   9,      19,   DateTime::TUESDAY   },
 		{ __LINE__,  1999,  12,      28,   DateTime::TUESDAY   },
-		{ __LINE__,  1999,  12,      29,   DateTime::WEDNESDAY },         
+		{ __LINE__,  1999,  12,      29,   DateTime::WEDNESDAY },
 		{ __LINE__,  1999,  12,      30,   DateTime::THURSDAY  },
 		{ __LINE__,  1999,  12,      31,   DateTime::FRIDAY    },
-		{ __LINE__,  2000,   1,       1,   DateTime::SATURDAY  },     
+		{ __LINE__,  2000,   1,       1,   DateTime::SATURDAY  },
 		{ __LINE__,  2000,   1,       2,   DateTime::SUNDAY    },
 		{ __LINE__,  2000,   1,       3,   DateTime::MONDAY    },
 		{ __LINE__,  2000,   1,       4,   DateTime::TUESDAY   },
 	};
-			
+
 	const int num_data = sizeof data / sizeof *data;
-	for (int di = 0; di < num_data ; ++di) 
+	for (int di = 0; di < num_data ; ++di)
 	{
 		const int line = data[di].d_lineNum;
 		DateTime x = DateTime(data[di].d_year, data[di].d_month, data[di].d_day);
@@ -854,7 +854,7 @@ void DateTimeTest::testLeapSeconds()
 {
 	DateTime dt1(2015, 6, 30, 23, 59, 60);
 	DateTime dt2(2015, 7,  1,  0,  0,  0);
-	
+
 	assertTrue (dt1 == dt2);
 }
 
diff --git a/Foundation/testsuite/src/DigestStreamTest.cpp b/Foundation/testsuite/src/DigestStreamTest.cpp
index 8a155fe03..7dc6087a9 100644
--- a/Foundation/testsuite/src/DigestStreamTest.cpp
+++ b/Foundation/testsuite/src/DigestStreamTest.cpp
@@ -99,6 +99,6 @@ CppUnit::Test* DigestStreamTest::suite()
 	CppUnit_addTest(pSuite, DigestStreamTest, testOutputStream1);
 	CppUnit_addTest(pSuite, DigestStreamTest, testOutputStream2);
 	CppUnit_addTest(pSuite, DigestStreamTest, testToFromHex);
-	
+
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/DirectoryIteratorsTest.h b/Foundation/testsuite/src/DirectoryIteratorsTest.h
index ef907c3bf..9775de1fe 100644
--- a/Foundation/testsuite/src/DirectoryIteratorsTest.h
+++ b/Foundation/testsuite/src/DirectoryIteratorsTest.h
@@ -29,12 +29,12 @@ public:
 	void testSortedDirectoryIterator();
 	void testSimpleRecursiveDirectoryIterator();
 	void testSiblingsFirstRecursiveDirectoryIterator();
-	
+
 	void setUp();
 	void tearDown();
 
 	static CppUnit::Test* suite();
-	
+
 protected:
 	Poco::Path path() const;
 	void createSubdir(Poco::Path& p);
diff --git a/Foundation/testsuite/src/DirectoryWatcherTest.cpp b/Foundation/testsuite/src/DirectoryWatcherTest.cpp
index 708cca3f7..54ff22423 100644
--- a/Foundation/testsuite/src/DirectoryWatcherTest.cpp
+++ b/Foundation/testsuite/src/DirectoryWatcherTest.cpp
@@ -56,6 +56,7 @@ void DirectoryWatcherTest::testAdded()
 
 	Poco::Thread::sleep(2000*dw.scanInterval());
 
+	Poco::Mutex::ScopedLock l(_mutex);
 	assertTrue (_events.size() >= 1);
 	assertTrue (_events[0].callback == "onItemAdded");
 	assertTrue (Poco::Path(_events[0].path).getFileName() == "test.txt");
@@ -87,6 +88,7 @@ void DirectoryWatcherTest::testRemoved()
 
 	Poco::Thread::sleep(2000*dw.scanInterval());
 
+	Poco::Mutex::ScopedLock l(_mutex);
 	assertTrue (_events.size() >= 1);
 	assertTrue (_events[0].callback == "onItemRemoved");
 	assertTrue (Poco::Path(_events[0].path).getFileName() == "test.txt");
@@ -119,6 +121,7 @@ void DirectoryWatcherTest::testModified()
 
 	Poco::Thread::sleep(2000*dw.scanInterval());
 
+	Poco::Mutex::ScopedLock l(_mutex);
 	assertTrue (_events.size() >= 1);
 	assertTrue (_events[0].callback == "onItemModified");
 	assertTrue (Poco::Path(_events[0].path).getFileName() == "test.txt");
@@ -152,6 +155,7 @@ void DirectoryWatcherTest::testMoved()
 
 	Poco::Thread::sleep(2000*dw.scanInterval());
 
+	Poco::Mutex::ScopedLock l(_mutex);
 	if (dw.supportsMoveEvents())
 	{
 		assertTrue (_events.size() >= 2);
@@ -214,6 +218,7 @@ void DirectoryWatcherTest::testSuspend()
 
 	Poco::Thread::sleep(2000*dw.scanInterval());
 
+	Poco::Mutex::ScopedLock l(_mutex);
 	assertTrue (_events.size() == 0);
 	assertTrue (!_error);
 }
@@ -243,8 +248,11 @@ void DirectoryWatcherTest::testResume()
 	fos2 << "Again!";
 	fos2.close();
 
-	assertTrue (_events.size() == 0);
-	assertTrue (!_error);
+	{
+		Poco::Mutex::ScopedLock l(_mutex);
+		assertTrue (_events.size() == 0);
+		assertTrue (!_error);
+	}
 
 	dw.resumeEvents();
 
@@ -254,6 +262,7 @@ void DirectoryWatcherTest::testResume()
 
 	Poco::Thread::sleep(2000*dw.scanInterval());
 
+	Poco::Mutex::ScopedLock l(_mutex);
 	assertTrue (_events.size() >= 1);
 	assertTrue (_events[0].callback == "onItemModified");
 	assertTrue (Poco::Path(_events[0].path).getFileName() == "test.txt");
@@ -301,8 +310,11 @@ void DirectoryWatcherTest::testSuspendMultipleTimes()
 
 	Poco::Thread::sleep(2000*dw.scanInterval());
 
-	assertTrue (_events.size() == 0);
-	assertTrue (!_error);
+	{
+		Poco::Mutex::ScopedLock l(_mutex);
+		assertTrue (_events.size() == 0);
+		assertTrue (!_error);
+	}
 
 	dw.resumeEvents();
 	dw.resumeEvents();
@@ -313,6 +325,7 @@ void DirectoryWatcherTest::testSuspendMultipleTimes()
 
 	Poco::Thread::sleep(2000*dw.scanInterval());
 
+	Poco::Mutex::ScopedLock l(_mutex);
 	assertTrue (_events.size() >= 1);
 	assertTrue (_events[0].callback == "onItemModified");
 	assertTrue (Poco::Path(_events[0].path).getFileName() == "test.txt");
@@ -359,6 +372,8 @@ void DirectoryWatcherTest::onItemAdded(const Poco::DirectoryWatcher::DirectoryEv
 	de.callback = "onItemAdded";
 	de.path = ev.item.path();
 	de.type = ev.event;
+
+	Poco::Mutex::ScopedLock l(_mutex);
 	_events.push_back(de);
 }
 
@@ -369,6 +384,8 @@ void DirectoryWatcherTest::onItemRemoved(const Poco::DirectoryWatcher::Directory
 	de.callback = "onItemRemoved";
 	de.path = ev.item.path();
 	de.type = ev.event;
+
+	Poco::Mutex::ScopedLock l(_mutex);
 	_events.push_back(de);
 }
 
@@ -379,6 +396,8 @@ void DirectoryWatcherTest::onItemModified(const Poco::DirectoryWatcher::Director
 	de.callback = "onItemModified";
 	de.path = ev.item.path();
 	de.type = ev.event;
+
+	Poco::Mutex::ScopedLock l(_mutex);
 	_events.push_back(de);
 }
 
@@ -389,6 +408,8 @@ void DirectoryWatcherTest::onItemMovedFrom(const Poco::DirectoryWatcher::Directo
 	de.callback = "onItemMovedFrom";
 	de.path = ev.item.path();
 	de.type = ev.event;
+
+	Poco::Mutex::ScopedLock l(_mutex);
 	_events.push_back(de);
 }
 
@@ -399,12 +420,15 @@ void DirectoryWatcherTest::onItemMovedTo(const Poco::DirectoryWatcher::Directory
 	de.callback = "onItemMovedTo";
 	de.path = ev.item.path();
 	de.type = ev.event;
+
+	Poco::Mutex::ScopedLock l(_mutex);
 	_events.push_back(de);
 }
 
 
 void DirectoryWatcherTest::onError(const Poco::Exception& exc)
 {
+
 	_error = true;
 }
 
diff --git a/Foundation/testsuite/src/DirectoryWatcherTest.h b/Foundation/testsuite/src/DirectoryWatcherTest.h
index 556a15d87..9e9caab4b 100644
--- a/Foundation/testsuite/src/DirectoryWatcherTest.h
+++ b/Foundation/testsuite/src/DirectoryWatcherTest.h
@@ -22,6 +22,7 @@
 
 #include "Poco/DirectoryWatcher.h"
 #include "Poco/Path.h"
+#include "Poco/Mutex.h"
 #include "CppUnit/TestCase.h"
 
 
@@ -63,6 +64,7 @@ private:
 	};
 	std::vector<DirEvent> _events;
 	bool _error;
+	Poco::Mutex _mutex;
 };
 
 
diff --git a/Foundation/testsuite/src/ExpireCacheTest.cpp b/Foundation/testsuite/src/ExpireCacheTest.cpp
index 93640aa6d..bbb9b92d5 100644
--- a/Foundation/testsuite/src/ExpireCacheTest.cpp
+++ b/Foundation/testsuite/src/ExpireCacheTest.cpp
@@ -95,7 +95,7 @@ void ExpireCacheTest::testExpireN()
 	assertTrue (aCache.has(3));
 	tmp = aCache.get(1);
 	SharedPtr<int> tmp2 = aCache.get(3);
-	assertTrue (*tmp == 2); 
+	assertTrue (*tmp == 2);
 	assertTrue (*tmp2 == 4);
 
 	Thread::sleep(DURHALFSLEEP+25); //3|1
diff --git a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp
index 91e3a01f2..30bcab004 100644
--- a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp
+++ b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp
@@ -93,7 +93,7 @@ void ExpireLRUCacheTest::testExpireN()
 	assertTrue (aCache.has(3));
 	tmp = aCache.get(1);
 	SharedPtr<int> tmp2 = aCache.get(3);
-	assertTrue (*tmp == 2); 
+	assertTrue (*tmp == 2);
 	assertTrue (*tmp2 == 4);
 
 	Thread::sleep(DURHALFSLEEP+25); //3|1
diff --git a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp
index 4d2f806bc..95e0dfd02 100644
--- a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp
+++ b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp
@@ -42,17 +42,17 @@ void FIFOBufferStreamTest::testInput()
 	assertTrue (c == 'T');
 	c = str1.get();
 	assertTrue (c == 'h');
-	
+
 	std::string str;
 	str1 >> str;
 	assertTrue (str == "is");
-	
+
 	char buffer[32];
 	str1.read(buffer, sizeof(buffer));
 	assertTrue (str1.gcount() == 10);
 	buffer[str1.gcount()] = 0;
 	assertTrue (std::string(" is a test") == buffer);
-	
+
 	const char* data2 = "123";
 	FIFOBufferStream str2(data2, 3);
 
@@ -109,7 +109,7 @@ void FIFOBufferStreamTest::testNotify()
 	iostr >> input;
 	assertTrue (std::string("This") == input);
 	assertTrue (iostr.rdbuf()->fifoBuffer().isEmpty());
-	
+
 	assertTrue (1 == _readableToNot);
 	assertTrue (1 == _notToReadable);
 	assertTrue (1 == _writableToNot);
diff --git a/Foundation/testsuite/src/FIFOEventTest.h b/Foundation/testsuite/src/FIFOEventTest.h
index 19c3df9c8..84113cd78 100644
--- a/Foundation/testsuite/src/FIFOEventTest.h
+++ b/Foundation/testsuite/src/FIFOEventTest.h
@@ -63,7 +63,7 @@ protected:
 
 	int getCount() const;
 private:
-	int		_count;
+	std::atomic<int> _count;
 };
 
 
diff --git a/Foundation/testsuite/src/FPETest.cpp b/Foundation/testsuite/src/FPETest.cpp
index 27043ebbf..79c38218a 100644
--- a/Foundation/testsuite/src/FPETest.cpp
+++ b/Foundation/testsuite/src/FPETest.cpp
@@ -34,7 +34,7 @@ void FPETest::testClassify()
 		float b = 0.0f;
 		float nan = a/b;
 		float inf = 1.0f/b;
-		
+
 		assertTrue (FPE::isNaN(nan));
 		assertTrue (!FPE::isNaN(a));
 		assertTrue (FPE::isInfinite(inf));
@@ -45,7 +45,7 @@ void FPETest::testClassify()
 		double b = 0;
 		double nan = a/b;
 		double inf = 1.0/b;
-		
+
 		assertTrue (FPE::isNaN(nan));
 		assertTrue (!FPE::isNaN(a));
 		assertTrue (FPE::isInfinite(inf));
@@ -89,7 +89,7 @@ void FPETest::testFlags()
 #if !defined(POCO_NO_FPENVIRONMENT)
     assertTrue (FPE::isFlag(FPE::FP_DIVIDE_BY_ZERO));
 #endif
-	assertTrue (FPE::isInfinite(c)); 
+	assertTrue (FPE::isInfinite(c));
 
 	FPE::clearFlags();
 	a = 1.23456789e210;
@@ -103,7 +103,7 @@ void FPETest::testFlags()
 	FPE::clearFlags();
 	a = 1.23456789e-99;
 	b = 9.87654321e210;
-	c = div(a, b);	
+	c = div(a, b);
 #if !defined(POCO_NO_FPENVIRONMENT)
 	assertTrue (FPE::isFlag(FPE::FP_UNDERFLOW));
 #endif
@@ -123,13 +123,13 @@ void FPETest::testFlags()
 void FPETest::testRound()
 {
 #if !defined(__osf__) && !defined(__VMS) && !defined(POCO_NO_FPENVIRONMENT)
-	FPE::setRoundingMode(FPE::FP_ROUND_TONEAREST);			
+	FPE::setRoundingMode(FPE::FP_ROUND_TONEAREST);
 	assertTrue (FPE::getRoundingMode() == FPE::FP_ROUND_TONEAREST);
 	{
 		FPE env(FPE::FP_ROUND_TOWARDZERO);
 		assertTrue (FPE::getRoundingMode() == FPE::FP_ROUND_TOWARDZERO);
 	}
-	assertTrue (FPE::getRoundingMode() == FPE::FP_ROUND_TONEAREST);	
+	assertTrue (FPE::getRoundingMode() == FPE::FP_ROUND_TONEAREST);
 #endif
 }
 
diff --git a/Foundation/testsuite/src/FileChannelTest.h b/Foundation/testsuite/src/FileChannelTest.h
index c7e68d6b8..d1e00b5db 100644
--- a/Foundation/testsuite/src/FileChannelTest.h
+++ b/Foundation/testsuite/src/FileChannelTest.h
@@ -21,7 +21,7 @@
 class FileChannelTest: public CppUnit::TestCase
 {
 public:
-	enum TimeRotation 
+	enum TimeRotation
 	{
 		DAY_HOUR_MIN = 0,
 		HOUR_MIN,
diff --git a/Foundation/testsuite/src/FileTest.h b/Foundation/testsuite/src/FileTest.h
index 04a859723..b311165e2 100644
--- a/Foundation/testsuite/src/FileTest.h
+++ b/Foundation/testsuite/src/FileTest.h
@@ -42,7 +42,7 @@ public:
 	void testRenameFailIfExists();
 	void testRootDir();
 	void testLongPath();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Foundation/testsuite/src/FilesystemTestSuite.cpp b/Foundation/testsuite/src/FilesystemTestSuite.cpp
index efe212e81..5f20189e9 100644
--- a/Foundation/testsuite/src/FilesystemTestSuite.cpp
+++ b/Foundation/testsuite/src/FilesystemTestSuite.cpp
@@ -27,6 +27,6 @@ CppUnit::Test* FilesystemTestSuite::suite()
 	pSuite->addTest(DirectoryWatcherTest::suite());
 #endif // POCO_NO_INOTIFY
 	pSuite->addTest(DirectoryIteratorsTest::suite());
-	
+
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/FormatTest.cpp b/Foundation/testsuite/src/FormatTest.cpp
index 0fb5e14ce..229ecc0a2 100644
--- a/Foundation/testsuite/src/FormatTest.cpp
+++ b/Foundation/testsuite/src/FormatTest.cpp
@@ -87,12 +87,12 @@ void FormatTest::testInt()
 	assertTrue (s == "  42");
 	s = format("%04hu", hu);
 	assertTrue (s == "0042");
-	
+
 	s = format("%*hu", 4, hu);
 	assertTrue (s == "  42");
 	s = format("%0*hu", 4, hu);
 	assertTrue (s == "0042");
-	
+
 	unsigned x = 0x42;
 	s = format("%x", x);
 	assertTrue (s == "42");
@@ -126,12 +126,12 @@ void FormatTest::testInt()
 	assertTrue (s == "  42");
 	s = format("%04u", u);
 	assertTrue (s == "0042");
-	
+
 	s = format("%*u", 4, u);
 	assertTrue (s == "  42");
 	s = format("%0*u", 4, u);
 	assertTrue (s == "0042");
-	
+
 	long l = 42;
 	s = format("%ld", l);
 	assertTrue (s == "42");
@@ -152,12 +152,12 @@ void FormatTest::testInt()
 	assertTrue (s == "  42");
 	s = format("%04lu", ul);
 	assertTrue (s == "0042");
-	
+
 	s = format("%*lu", 4, ul);
 	assertTrue (s == "  42");
 	s = format("%0*lu", 4, ul);
 	assertTrue (s == "0042");
-	
+
 	unsigned long xl = 0x42;
 	s = format("%lx", xl);
 	assertTrue (s == "42");
@@ -165,12 +165,12 @@ void FormatTest::testInt()
 	assertTrue (s == "  42");
 	s = format("%04lx", xl);
 	assertTrue (s == "0042");
-	
+
 	s = format("%*lx", 4, xl);
 	assertTrue (s == "  42");
 	s = format("%0*lx", 4, xl);
 	assertTrue (s == "0042");
-	
+
 	Int64 i64 = 42;
 	s = format("%Ld", i64);
 	assertTrue (s == "42");
@@ -178,12 +178,12 @@ void FormatTest::testInt()
 	assertTrue (s == "  42");
 	s = format("%04Ld", i64);
 	assertTrue (s == "0042");
-	
+
 	s = format("%*Ld", 4, i64);
 	assertTrue (s == "  42");
 	s = format("%0*Ld", 4, i64);
 	assertTrue (s == "0042");
-	
+
 	UInt64 ui64 = 42;
 	s = format("%Lu", ui64);
 	assertTrue (s == "42");
@@ -191,18 +191,18 @@ void FormatTest::testInt()
 	assertTrue (s == "  42");
 	s = format("%04Lu", ui64);
 	assertTrue (s == "0042");
-	
+
 	s = format("%*Lu", 4, ui64);
 	assertTrue (s == "  42");
 	s = format("%0*Lu", 4, ui64);
 	assertTrue (s == "0042");
-	
+
 	x = 0xaa;
 	s = format("%x", x);
 	assertTrue (s == "aa");
 	s = format("%X", x);
 	assertTrue (s == "AA");
-	
+
 	i = 42;
 	s = format("%+d", i);
 	assertTrue (s == "+42");
@@ -221,7 +221,7 @@ void FormatTest::testInt()
 
 	s = format("%d", i);
 	assertTrue (s == "-42");
-	
+
 	x = 0x42;
 	s = format("%#x", x);
 	assertTrue (s == "0x42");
@@ -264,7 +264,7 @@ void FormatTest::testAnyInt()
 	char c = 42;
 	std::string s(format("%?i", c));
 	assertTrue (s == "42");
-	
+
 	c = 43;
 	s.clear();
 	format(s, "%?i", c);
@@ -277,35 +277,35 @@ void FormatTest::testAnyInt()
 	signed char sc = -42;
 	s = format("%?i", sc);
 	assertTrue (s == "-42");
-	
+
 	unsigned char uc = 65;
 	s = format("%?i", uc);
 	assertTrue (s == "65");
-	
+
 	short ss = -134;
 	s = format("%?i", ss);
 	assertTrue (s == "-134");
-	
+
 	unsigned short us = 200;
 	s = format("%?i", us);
 	assertTrue (s == "200");
-	
+
 	int i = -12345;
 	s = format("%?i", i);
 	assertTrue (s == "-12345");
-	
+
 	unsigned ui = 12345;
 	s = format("%?i", ui);
 	assertTrue (s == "12345");
-	
+
 	long l = -54321;
 	s = format("%?i", l);
 	assertTrue (s == "-54321");
-	
+
 	unsigned long ul = 54321;
 	s = format("%?i", ul);
 	assertTrue (s == "54321");
-	
+
 	Int64 i64 = -12345678;
 	s = format("%?i", i64);
 	assertTrue (s == "-12345678");
@@ -313,7 +313,7 @@ void FormatTest::testAnyInt()
 	UInt64 ui64 = 12345678;
 	s = format("%?i", ui64);
 	assertTrue (s == "12345678");
-	
+
 	ss = 0x42;
 	s = format("%?x", ss);
 	assertTrue (s == "42");
@@ -340,12 +340,12 @@ void FormatTest::testFloatFix()
 	assertTrue (s == "  1.50");
 	s = format("%-6.2f", d);
 	assertTrue (s == "1.50  ");
-	
+
 	s = format("%*.*f", 6, 2, d);
 	assertTrue (s == "  1.50");
 	s = format("%-*.*f", 6,2, d);
 	assertTrue (s == "1.50  ");
-	
+
 	float f = 1.5;
 	s = format("%hf", f);
 	assertTrue (s.find("1.50") == 0);
@@ -422,7 +422,7 @@ void FormatTest::testMultiple()
 
 	s = format("%%%d%%%d%%%d", 1, 2, 3);
 	assertTrue (s == "%1%2%3");
-	
+
 	s = format("%d%d%d%d", 1, 2, 3, 4);
 	assertTrue (s == "1234");
 
diff --git a/Foundation/testsuite/src/GlobTest.cpp b/Foundation/testsuite/src/GlobTest.cpp
index 3e5d40740..529fe8851 100644
--- a/Foundation/testsuite/src/GlobTest.cpp
+++ b/Foundation/testsuite/src/GlobTest.cpp
@@ -39,7 +39,7 @@ void GlobTest::testMatchChars()
 	assertTrue (!g1.match("b"));
 	assertTrue (!g1.match("aa"));
 	assertTrue (!g1.match(""));
-	
+
 	Glob g2("ab");
 	assertTrue (g2.match("ab"));
 	assertTrue (!g2.match("aab"));
@@ -54,24 +54,24 @@ void GlobTest::testMatchQM()
 	assertTrue (g1.match("b"));
 	assertTrue (!g1.match("aa"));
 	assertTrue (g1.match("."));
-	
+
 	Glob g2("\\?");
 	assertTrue (g2.match("?"));
 	assertTrue (!g2.match("a"));
 	assertTrue (!g2.match("ab"));
-	
+
 	Glob g3("a?");
 	assertTrue (g3.match("aa"));
 	assertTrue (g3.match("az"));
 	assertTrue (!g3.match("a"));
 	assertTrue (!g3.match("aaa"));
-	
+
 	Glob g4("??");
 	assertTrue (g4.match("aa"));
 	assertTrue (g4.match("ab"));
 	assertTrue (!g4.match("a"));
 	assertTrue (!g4.match("abc"));
-	
+
 	Glob g5("?a?");
 	assertTrue (g5.match("aaa"));
 	assertTrue (g5.match("bac"));
@@ -83,7 +83,7 @@ void GlobTest::testMatchQM()
 	assertTrue (g6.match("a?"));
 	assertTrue (!g6.match("az"));
 	assertTrue (!g6.match("a"));
-	
+
 	Glob g7("?", Glob::GLOB_DOT_SPECIAL);
 	assertTrue (g7.match("a"));
 	assertTrue (g7.match("b"));
@@ -100,7 +100,7 @@ void GlobTest::testMatchAsterisk()
 	assertTrue (g1.match("ab"));
 	assertTrue (g1.match("abc"));
 	assertTrue (g1.match("."));
-	
+
 	Glob g2("a*");
 	assertTrue (g2.match("a"));
 	assertTrue (g2.match("aa"));
@@ -114,7 +114,7 @@ void GlobTest::testMatchAsterisk()
 	assertTrue (g3.match("abab"));
 	assertTrue (!g3.match("ac"));
 	assertTrue (!g3.match("baab"));
-	
+
 	Glob g4("*a");
 	assertTrue (g4.match("a"));
 	assertTrue (g4.match("ba"));
@@ -124,7 +124,7 @@ void GlobTest::testMatchAsterisk()
 	assertTrue (!g4.match("b"));
 	assertTrue (!g4.match("ab"));
 	assertTrue (!g4.match("aaab"));
-	
+
 	Glob g5("a*a");
 	assertTrue (g5.match("aa"));
 	assertTrue (g5.match("aba"));
@@ -132,14 +132,14 @@ void GlobTest::testMatchAsterisk()
 	assertTrue (!g5.match("aab"));
 	assertTrue (!g5.match("aaab"));
 	assertTrue (!g5.match("baaaa"));
-	
+
 	Glob g6("a*b*c");
 	assertTrue (g6.match("abc"));
 	assertTrue (g6.match("aabbcc"));
 	assertTrue (g6.match("abcbbc"));
 	assertTrue (g6.match("aaaabbbbcccc"));
 	assertTrue (!g6.match("aaaabbbcb"));
-	
+
 	Glob g7("a*b*");
 	assertTrue (g7.match("aaabbb"));
 	assertTrue (g7.match("abababab"));
@@ -154,18 +154,18 @@ void GlobTest::testMatchAsterisk()
 	assertTrue (g1.match("a"));
 	assertTrue (g1.match("ab"));
 	assertTrue (g1.match("abc"));
-	
+
 	Glob g9("a\\*");
 	assertTrue (g9.match("a*"));
 	assertTrue (!g9.match("aa"));
 	assertTrue (!g9.match("a"));
-	
+
 	Glob g10("a*\\*");
 	assertTrue (g10.match("a*"));
 	assertTrue (g10.match("aaa*"));
 	assertTrue (!g10.match("a"));
 	assertTrue (!g10.match("aa"));
-	
+
 	Glob g11("*", Glob::GLOB_DOT_SPECIAL);
 	assertTrue (g11.match(""));
 	assertTrue (g11.match("a"));
@@ -181,35 +181,35 @@ void GlobTest::testMatchRange()
 	assertTrue (g1.match("a"));
 	assertTrue (!g1.match("b"));
 	assertTrue (!g1.match("aa"));
-	
+
 	Glob g2("[ab]");
 	assertTrue (g2.match("a"));
 	assertTrue (g2.match("b"));
 	assertTrue (!g2.match("c"));
 	assertTrue (!g2.match("ab"));
-	
+
 	Glob g3("[abc]");
 	assertTrue (g3.match("a"));
 	assertTrue (g3.match("b"));
 	assertTrue (g3.match("c"));
 	assertTrue (!g3.match("ab"));
-	
+
 	Glob g4("[a-z]");
 	assertTrue (g4.match("a"));
 	assertTrue (g4.match("z"));
 	assertTrue (!g4.match("A"));
-	
+
 	Glob g5("[!a]");
 	assertTrue (g5.match("b"));
 	assertTrue (g5.match("c"));
 	assertTrue (!g5.match("a"));
 	assertTrue (!g5.match("bb"));
-	
+
 	Glob g6("[!a-z]");
 	assertTrue (g6.match("A"));
 	assertTrue (!g6.match("a"));
 	assertTrue (!g6.match("z"));
-	
+
 	Glob g7("[0-9a-zA-Z_]");
 	assertTrue (g7.match("0"));
 	assertTrue (g7.match("1"));
@@ -222,51 +222,51 @@ void GlobTest::testMatchRange()
 	assertTrue (g7.match("Z"));
 	assertTrue (g7.match("_"));
 	assertTrue (!g7.match("-"));
-	
+
 	Glob g8("[1-3]");
 	assertTrue (g8.match("1"));
 	assertTrue (g8.match("2"));
 	assertTrue (g8.match("3"));
 	assertTrue (!g8.match("0"));
 	assertTrue (!g8.match("4"));
-	
+
 	Glob g9("[!1-3]");
 	assertTrue (g9.match("0"));
 	assertTrue (g9.match("4"));
 	assertTrue (!g9.match("1"));
 	assertTrue (!g9.match("2"));
 	assertTrue (!g9.match("3"));
-	
+
 	Glob g10("[\\!a]");
 	assertTrue (g10.match("!"));
 	assertTrue (g10.match("a"));
 	assertTrue (!g10.match("x"));
-	
+
 	Glob g11("[a\\-c]");
 	assertTrue (g11.match("a"));
 	assertTrue (g11.match("c"));
 	assertTrue (g11.match("-"));
 	assertTrue (!g11.match("b"));
-	
+
 	Glob g12("[\\]]");
 	assertTrue (g12.match("]"));
 	assertTrue (!g12.match("["));
-	
+
 	Glob g13("[[\\]]");
 	assertTrue (g13.match("["));
 	assertTrue (g13.match("]"));
 	assertTrue (!g13.match("x"));
-	
+
 	Glob g14("\\[]");
 	assertTrue (g14.match("[]"));
 	assertTrue (!g14.match("[["));
-	
+
 	Glob g15("a[bc]");
 	assertTrue (g15.match("ab"));
 	assertTrue (g15.match("ac"));
 	assertTrue (!g15.match("a"));
 	assertTrue (!g15.match("aa"));
-	
+
 	Glob g16("[ab]c");
 	assertTrue (g16.match("ac"));
 	assertTrue (g16.match("bc"));
@@ -282,24 +282,24 @@ void GlobTest::testMisc()
 	Glob g1("*.cpp");
 	assertTrue (g1.match("Glob.cpp"));
 	assertTrue (!g1.match("Glob.h"));
-	
+
 	Glob g2("*.[hc]");
 	assertTrue (g2.match("foo.c"));
 	assertTrue (g2.match("foo.h"));
 	assertTrue (!g2.match("foo.i"));
-	
+
 	Glob g3("*.*");
 	assertTrue (g3.match("foo.cpp"));
 	assertTrue (g3.match("foo.h"));
 	assertTrue (g3.match("foo."));
 	assertTrue (!g3.match("foo"));
-	
+
 	Glob g4("File*.?pp");
 	assertTrue (g4.match("File.hpp"));
 	assertTrue (g4.match("File.cpp"));
 	assertTrue (g4.match("Filesystem.hpp"));
 	assertTrue (!g4.match("File.h"));
-	
+
 	Glob g5("File*.[ch]*");
 	assertTrue (g5.match("File.hpp"));
 	assertTrue (g5.match("File.cpp"));
@@ -316,7 +316,7 @@ void GlobTest::testCaseless()
 	assertTrue (!g1.match("Glob.h"));
 	assertTrue (g1.match("Glob.CPP"));
 	assertTrue (!g1.match("Glob.H"));
-	
+
 	Glob g2("*.[hc]", Glob::GLOB_CASELESS);
 	assertTrue (g2.match("foo.c"));
 	assertTrue (g2.match("foo.h"));
@@ -324,7 +324,7 @@ void GlobTest::testCaseless()
 	assertTrue (g2.match("foo.C"));
 	assertTrue (g2.match("foo.H"));
 	assertTrue (!g2.match("foo.I"));
-		
+
 	Glob g4("File*.?pp", Glob::GLOB_CASELESS);
 	assertTrue (g4.match("file.hpp"));
 	assertTrue (g4.match("FILE.CPP"));
@@ -332,7 +332,7 @@ void GlobTest::testCaseless()
 	assertTrue (g4.match("FILESYSTEM.HPP"));
 	assertTrue (!g4.match("FILE.H"));
 	assertTrue (!g4.match("file.h"));
-	
+
 	Glob g5("File*.[ch]*", Glob::GLOB_CASELESS);
 	assertTrue (g5.match("file.hpp"));
 	assertTrue (g5.match("FILE.HPP"));
@@ -387,7 +387,7 @@ void GlobTest::testGlob()
 	createFile("globtest/testsuite/src/test.h");
 	createFile("globtest/testsuite/src/test.c");
 	createFile("globtest/testsuite/src/main.c");
-	
+
 	std::set<std::string> files;
 	Glob::glob("globtest/*", files);
 	translatePaths(files);
@@ -407,7 +407,7 @@ void GlobTest::testGlob()
 	assertTrue (files.find("globtest/include/") != files.end());
 	assertTrue (files.find("globtest/src/") != files.end());
 	assertTrue (files.find("globtest/testsuite/") != files.end());
-	
+
 	files.clear();
 	Glob::glob("globtest/*/*.[hc]", files);
 	translatePaths(files);
@@ -417,7 +417,7 @@ void GlobTest::testGlob()
 	assertTrue (files.find("globtest/src/one.c") != files.end());
 	assertTrue (files.find("globtest/src/one.c") != files.end());
 	assertTrue (files.find("globtest/src/main.c") != files.end());
-	
+
 	files.clear();
 	Glob::glob("gl?bt?st/*/*/*.c", files);
 	translatePaths(files);
@@ -431,7 +431,7 @@ void GlobTest::testGlob()
 	assertTrue (files.size() == 2);
 	assertTrue (files.find("globtest/testsuite/src/test.c") != files.end());
 	assertTrue (files.find("globtest/testsuite/src/main.c") != files.end());
-	
+
 	files.clear();
 	Glob::glob("globtest/*/src/*", files);
 	translatePaths(files);
@@ -439,7 +439,7 @@ void GlobTest::testGlob()
 	assertTrue (files.find("globtest/testsuite/src/test.h") != files.end());
 	assertTrue (files.find("globtest/testsuite/src/test.c") != files.end());
 	assertTrue (files.find("globtest/testsuite/src/main.c") != files.end());
-	
+
 	files.clear();
 	Glob::glob("globtest/*/", files);
 	translatePaths(files);
@@ -463,7 +463,7 @@ void GlobTest::testGlob()
 	translatePaths(files);
 	assertTrue (files.size() == 1);
 #endif
-	
+
 	File dir("globtest");
 	dir.remove(true);
 }
diff --git a/Foundation/testsuite/src/HMACEngineTest.cpp b/Foundation/testsuite/src/HMACEngineTest.cpp
index dc5dfc71c..be6a34e54 100644
--- a/Foundation/testsuite/src/HMACEngineTest.cpp
+++ b/Foundation/testsuite/src/HMACEngineTest.cpp
@@ -39,21 +39,21 @@ HMACEngineTest::~HMACEngineTest()
 void HMACEngineTest::testHMAC_MD5()
 {
 	// test vectors from RFC 2104
-	
+
 	std::string key(16, 0x0b);
 	std::string data("Hi There");
 	HMACEngine<MD5Engine> hmac1(key);
 	hmac1.update(data);
 	std::string digest = DigestEngine::digestToHex(hmac1.digest());
 	assertTrue (digest == "9294727a3638bb1c13f48ef8158bfc9d");
-	
+
 	key  = "Jefe";
 	data = "what do ya want for nothing?";
 	HMACEngine<MD5Engine> hmac2(key);
 	hmac2.update(data);
 	digest = DigestEngine::digestToHex(hmac2.digest());
 	assertTrue (digest == "750c783e6ab0b503eaa86e310a5db738");
-	
+
 	key  = std::string(16, std::string::value_type(0xaa));
 	data = std::string(50, std::string::value_type(0xdd));
 	HMACEngine<MD5Engine> hmac3(key);
diff --git a/Foundation/testsuite/src/HashMapTest.cpp b/Foundation/testsuite/src/HashMapTest.cpp
index e3a0f5e36..6b74c5cfd 100644
--- a/Foundation/testsuite/src/HashMapTest.cpp
+++ b/Foundation/testsuite/src/HashMapTest.cpp
@@ -35,9 +35,9 @@ void HashMapTest::testInsert()
 
 	typedef HashMap<int, int> IntMap;
 	IntMap hm;
-	
+
 	assertTrue (hm.empty());
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		std::pair<IntMap::Iterator, bool> res = hm.insert(IntMap::ValueType(i, i*2));
@@ -50,10 +50,10 @@ void HashMapTest::testInsert()
 		assertTrue (it->second == i*2);
 		assertTrue (hm.count(i) == 1);
 		assertTrue (hm.size() == i + 1);
-	}		
-	
+	}
+
 	assertTrue (!hm.empty());
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		IntMap::Iterator it = hm.find(i);
@@ -61,14 +61,14 @@ void HashMapTest::testInsert()
 		assertTrue (it->first == i);
 		assertTrue (it->second == i*2);
 	}
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		std::pair<IntMap::Iterator, bool> res = hm.insert(IntMap::ValueType(i, 0));
 		assertTrue (res.first->first == i);
 		assertTrue (res.first->second == i*2);
 		assertTrue (!res.second);
-	}		
+	}
 }
 
 
@@ -84,7 +84,7 @@ void HashMapTest::testErase()
 		hm.insert(IntMap::ValueType(i, i*2));
 	}
 	assertTrue (hm.size() == N);
-	
+
 	for (int i = 0; i < N; i += 2)
 	{
 		hm.erase(i);
@@ -92,13 +92,13 @@ void HashMapTest::testErase()
 		assertTrue (it == hm.end());
 	}
 	assertTrue (hm.size() == N/2);
-	
+
 	for (int i = 0; i < N; i += 2)
 	{
 		IntMap::Iterator it = hm.find(i);
 		assertTrue (it == hm.end());
 	}
-	
+
 	for (int i = 1; i < N; i += 2)
 	{
 		IntMap::Iterator it = hm.find(i);
@@ -110,13 +110,13 @@ void HashMapTest::testErase()
 	{
 		hm.insert(IntMap::ValueType(i, i*2));
 	}
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		IntMap::Iterator it = hm.find(i);
 		assertTrue (it != hm.end());
 		assertTrue (it->first == i);
-		assertTrue (it->second == i*2);		
+		assertTrue (it->second == i*2);
 	}
 }
 
@@ -132,7 +132,7 @@ void HashMapTest::testIterator()
 	{
 		hm.insert(IntMap::ValueType(i, i*2));
 	}
-	
+
 	std::map<int, int> values;
 	IntMap::Iterator it; // do not initialize here to test proper behavior of uninitialized iterators
 	it = hm.begin();
@@ -142,7 +142,7 @@ void HashMapTest::testIterator()
 		values[it->first] = it->second;
 		++it;
 	}
-	
+
 	assertTrue (values.size() == N);
 }
 
@@ -158,7 +158,7 @@ void HashMapTest::testConstIterator()
 	{
 		hm.insert(IntMap::ValueType(i, i*2));
 	}
-	
+
 	std::map<int, int> values;
 	IntMap::ConstIterator it = hm.begin();
 	while (it != hm.end())
@@ -167,7 +167,7 @@ void HashMapTest::testConstIterator()
 		values[it->first] = it->second;
 		++it;
 	}
-	
+
 	assertTrue (values.size() == N);
 }
 
@@ -180,12 +180,12 @@ void HashMapTest::testIndex()
 	hm[1] = 2;
 	hm[2] = 4;
 	hm[3] = 6;
-	
+
 	assertTrue (hm.size() == 3);
 	assertTrue (hm[1] == 2);
 	assertTrue (hm[2] == 4);
 	assertTrue (hm[3] == 6);
-	
+
 	try
 	{
 		const IntMap& im = hm;
diff --git a/Foundation/testsuite/src/HashSetTest.cpp b/Foundation/testsuite/src/HashSetTest.cpp
index 89dcc2e4e..603585878 100644
--- a/Foundation/testsuite/src/HashSetTest.cpp
+++ b/Foundation/testsuite/src/HashSetTest.cpp
@@ -34,9 +34,9 @@ void HashSetTest::testInsert()
 	const int N = 1000;
 
 	HashSet<int, Hash<int> > hs;
-	
+
 	assertTrue (hs.empty());
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		std::pair<HashSet<int, Hash<int> >::Iterator, bool> res = hs.insert(i);
@@ -46,23 +46,23 @@ void HashSetTest::testInsert()
 		assertTrue (it != hs.end());
 		assertTrue (*it == i);
 		assertTrue (hs.size() == i + 1);
-	}		
-	
+	}
+
 	assertTrue (!hs.empty());
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		HashSet<int, Hash<int> >::Iterator it = hs.find(i);
 		assertTrue (it != hs.end());
 		assertTrue (*it == i);
 	}
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		std::pair<HashSet<int, Hash<int> >::Iterator, bool> res = hs.insert(i);
 		assertTrue (*res.first == i);
 		assertTrue (!res.second);
-	}		
+	}
 }
 
 
@@ -77,7 +77,7 @@ void HashSetTest::testErase()
 		hs.insert(i);
 	}
 	assertTrue (hs.size() == N);
-	
+
 	for (int i = 0; i < N; i += 2)
 	{
 		hs.erase(i);
@@ -85,7 +85,7 @@ void HashSetTest::testErase()
 		assertTrue (it == hs.end());
 	}
 	assertTrue (hs.size() == N/2);
-	
+
 	for (int i = 0; i < N; i += 2)
 	{
 		HashSet<int, Hash<int> >::Iterator it = hs.find(i);
@@ -103,7 +103,7 @@ void HashSetTest::testErase()
 	{
 		hs.insert(i);
 	}
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		HashSet<int, Hash<int> >::Iterator it = hs.find(i);
@@ -123,7 +123,7 @@ void HashSetTest::testIterator()
 	{
 		hs.insert(i);
 	}
-	
+
 	std::set<int> values;
 	HashSet<int, Hash<int> >::Iterator it = hs.begin();
 	while (it != hs.end())
@@ -147,7 +147,7 @@ void HashSetTest::testConstIterator()
 	{
 		hs.insert(i);
 	}
-	
+
 	std::set<int> values;
 	HashSet<int, Hash<int> >::ConstIterator it = hs.begin();
 	while (it != hs.end())
@@ -156,7 +156,7 @@ void HashSetTest::testConstIterator()
 		values.insert(*it);
 		++it;
 	}
-	
+
 	assertTrue (values.size() == N);
 }
 
diff --git a/Foundation/testsuite/src/LinearHashTableTest.cpp b/Foundation/testsuite/src/LinearHashTableTest.cpp
index 276d831d6..5ad7a87ff 100644
--- a/Foundation/testsuite/src/LinearHashTableTest.cpp
+++ b/Foundation/testsuite/src/LinearHashTableTest.cpp
@@ -41,9 +41,9 @@ void LinearHashTableTest::testInsert()
 	const int N = 1000;
 
 	LinearHashTable<int, Hash<int> > ht;
-	
+
 	assertTrue (ht.empty());
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		std::pair<LinearHashTable<int, Hash<int> >::Iterator, bool> res = ht.insert(i);
@@ -53,18 +53,18 @@ void LinearHashTableTest::testInsert()
 		assertTrue (it != ht.end());
 		assertTrue (*it == i);
 		assertTrue (ht.size() == i + 1);
-	}		
+	}
 	assertTrue (ht.buckets() == N + 1);
-	
+
 	assertTrue (!ht.empty());
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		LinearHashTable<int, Hash<int> >::Iterator it = ht.find(i);
 		assertTrue (it != ht.end());
 		assertTrue (*it == i);
 	}
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		std::pair<LinearHashTable<int, Hash<int> >::Iterator, bool> res = ht.insert(i);
@@ -72,7 +72,7 @@ void LinearHashTableTest::testInsert()
 		assertTrue (!res.second);
 		assertTrue (ht.size() == N);
 		assertTrue (ht.buckets() == N + 1);
-	}		
+	}
 }
 
 
@@ -87,7 +87,7 @@ void LinearHashTableTest::testErase()
 		ht.insert(i);
 	}
 	assertTrue (ht.size() == N);
-	
+
 	for (int i = 0; i < N; i += 2)
 	{
 		ht.erase(i);
@@ -95,13 +95,13 @@ void LinearHashTableTest::testErase()
 		assertTrue (it == ht.end());
 	}
 	assertTrue (ht.size() == N/2);
-	
+
 	for (int i = 0; i < N; i += 2)
 	{
 		LinearHashTable<int, Hash<int> >::Iterator it = ht.find(i);
 		assertTrue (it == ht.end());
 	}
-	
+
 	for (int i = 1; i < N; i += 2)
 	{
 		LinearHashTable<int, Hash<int> >::Iterator it = ht.find(i);
@@ -113,7 +113,7 @@ void LinearHashTableTest::testErase()
 	{
 		ht.insert(i);
 	}
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		LinearHashTable<int, Hash<int> >::Iterator it = ht.find(i);
@@ -133,7 +133,7 @@ void LinearHashTableTest::testIterator()
 	{
 		ht.insert(i);
 	}
-	
+
 	std::set<int> values;
 	LinearHashTable<int, Hash<int> >::Iterator it = ht.begin();
 	while (it != ht.end())
@@ -142,7 +142,7 @@ void LinearHashTableTest::testIterator()
 		values.insert(*it);
 		++it;
 	}
-	
+
 	assertTrue (values.size() == N);
 }
 
@@ -166,9 +166,9 @@ void LinearHashTableTest::testConstIterator()
 		values.insert(*it);
 		++it;
 	}
-	
+
 	assertTrue (values.size() == N);
-	
+
 	values.clear();
 	const LinearHashTable<int, Hash<int> > cht(ht);
 
@@ -179,8 +179,8 @@ void LinearHashTableTest::testConstIterator()
 		values.insert(*cit);
 		++cit;
 	}
-	
-	assertTrue (values.size() == N);	
+
+	assertTrue (values.size() == N);
 }
 
 
@@ -199,7 +199,7 @@ void LinearHashTableTest::testPerformanceInt()
 		sw.stop();
 		std::cout << "Insert LHT: " << sw.elapsedSeconds() << std::endl;
 		sw.reset();
-		
+
 		sw.start();
 		for (int i = 0; i < N; ++i)
 		{
@@ -212,7 +212,7 @@ void LinearHashTableTest::testPerformanceInt()
 
 	{
 		HashTable<int, int> ht;
-		
+
 		sw.start();
 		for (int i = 0; i < N; ++i)
 		{
@@ -221,7 +221,7 @@ void LinearHashTableTest::testPerformanceInt()
 		sw.stop();
 		std::cout << "Insert HT: " << sw.elapsedSeconds() << std::endl;
 		sw.reset();
-		
+
 		sw.start();
 		for (int i = 0; i < N; ++i)
 		{
@@ -230,7 +230,7 @@ void LinearHashTableTest::testPerformanceInt()
 		sw.stop();
 		std::cout << "Find HT: " << sw.elapsedSeconds() << std::endl;
 	}
-	
+
 	{
 		std::set<int> s;
 		sw.start();
@@ -241,7 +241,7 @@ void LinearHashTableTest::testPerformanceInt()
 		sw.stop();
 		std::cout << "Insert set: " << sw.elapsedSeconds() << std::endl;
 		sw.reset();
-		
+
 		sw.start();
 		for (int i = 0; i < N; ++i)
 		{
@@ -251,7 +251,7 @@ void LinearHashTableTest::testPerformanceInt()
 		std::cout << "Find set: " << sw.elapsedSeconds() << std::endl;
 		sw.reset();
 	}
-	
+
 }
 
 
@@ -259,7 +259,7 @@ void LinearHashTableTest::testPerformanceStr()
 {
 	const int N = 5000000;
 	Stopwatch sw;
-	
+
 	std::vector<std::string> values;
 	for (int i = 0; i < N; ++i)
 	{
@@ -276,7 +276,7 @@ void LinearHashTableTest::testPerformanceStr()
 		sw.stop();
 		std::cout << "Insert LHT: " << sw.elapsedSeconds() << std::endl;
 		sw.reset();
-		
+
 		sw.start();
 		for (int i = 0; i < N; ++i)
 		{
@@ -289,7 +289,7 @@ void LinearHashTableTest::testPerformanceStr()
 
 	{
 		HashTable<std::string, int> ht;
-		
+
 		sw.start();
 		for (int i = 0; i < N; ++i)
 		{
@@ -298,7 +298,7 @@ void LinearHashTableTest::testPerformanceStr()
 		sw.stop();
 		std::cout << "Insert HT: " << sw.elapsedSeconds() << std::endl;
 		sw.reset();
-		
+
 		sw.start();
 		for (int i = 0; i < N; ++i)
 		{
@@ -307,7 +307,7 @@ void LinearHashTableTest::testPerformanceStr()
 		sw.stop();
 		std::cout << "Find HT: " << sw.elapsedSeconds() << std::endl;
 	}
-	
+
 	{
 		std::set<std::string> s;
 		sw.start();
@@ -318,7 +318,7 @@ void LinearHashTableTest::testPerformanceStr()
 		sw.stop();
 		std::cout << "Insert set: " << sw.elapsedSeconds() << std::endl;
 		sw.reset();
-		
+
 		sw.start();
 		for (int i = 0; i < N; ++i)
 		{
diff --git a/Foundation/testsuite/src/LinearHashTableTest.h b/Foundation/testsuite/src/LinearHashTableTest.h
index f91dba02e..a7ec64f87 100644
--- a/Foundation/testsuite/src/LinearHashTableTest.h
+++ b/Foundation/testsuite/src/LinearHashTableTest.h
@@ -30,7 +30,7 @@ public:
 	void testConstIterator();
 	void testPerformanceInt();
 	void testPerformanceStr();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Foundation/testsuite/src/ListMapTest.cpp b/Foundation/testsuite/src/ListMapTest.cpp
index 567ece63e..0ef00e0e5 100644
--- a/Foundation/testsuite/src/ListMapTest.cpp
+++ b/Foundation/testsuite/src/ListMapTest.cpp
@@ -35,9 +35,9 @@ void ListMapTest::testInsert()
 
 	typedef ListMap<int, int> IntMap;
 	IntMap hm;
-	
+
 	assertTrue (hm.empty());
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		IntMap::Iterator res = hm.insert(IntMap::ValueType(i, i*2));
@@ -48,10 +48,10 @@ void ListMapTest::testInsert()
 		assertTrue (it->first == i);
 		assertTrue (it->second == i*2);
 		assertTrue (hm.size() == i + 1);
-	}		
-	
+	}
+
 	assertTrue (!hm.empty());
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		IntMap::Iterator it = hm.find(i);
@@ -59,14 +59,14 @@ void ListMapTest::testInsert()
 		assertTrue (it->first == i);
 		assertTrue (it->second == i*2);
 	}
-	
+
 	hm.clear();
 	for (int i = 0; i < N; ++i)
 	{
 		IntMap::Iterator res = hm.insert(IntMap::ValueType(i, 0));
 		assertTrue (res->first == i);
 		assertTrue (res->second == 0);
-	}		
+	}
 }
 
 
@@ -101,7 +101,7 @@ void ListMapTest::testInsertOrder()
 	assertTrue (it != lm.end() && it->first == "bar" && it->second == 43);
 
 	++it;
-	assertTrue (it == lm.end());	 
+	assertTrue (it == lm.end());
 }
 
 
@@ -117,7 +117,7 @@ void ListMapTest::testErase()
 		hm.insert(IntMap::ValueType(i, i*2));
 	}
 	assertTrue (hm.size() == N);
-	
+
 	for (int i = 0; i < N; i += 2)
 	{
 		hm.erase(i);
@@ -125,13 +125,13 @@ void ListMapTest::testErase()
 		assertTrue (it == hm.end());
 	}
 	assertTrue (hm.size() == N/2);
-	
+
 	for (int i = 0; i < N; i += 2)
 	{
 		IntMap::Iterator it = hm.find(i);
 		assertTrue (it == hm.end());
 	}
-	
+
 	for (int i = 1; i < N; i += 2)
 	{
 		IntMap::Iterator it = hm.find(i);
@@ -143,13 +143,13 @@ void ListMapTest::testErase()
 	{
 		hm.insert(IntMap::ValueType(i, i*2));
 	}
-	
+
 	for (int i = 0; i < N; ++i)
 	{
 		IntMap::Iterator it = hm.find(i);
 		assertTrue (it != hm.end());
 		assertTrue (it->first == i);
-		assertTrue (it->second == i*2);		
+		assertTrue (it->second == i*2);
 	}
 }
 
@@ -165,7 +165,7 @@ void ListMapTest::testIterator()
 	{
 		hm.insert(IntMap::ValueType(i, i*2));
 	}
-	
+
 	std::map<int, int> values;
 	IntMap::Iterator it; // do not initialize here to test proper behavior of uninitialized iterators
 	it = hm.begin();
@@ -175,7 +175,7 @@ void ListMapTest::testIterator()
 		values[it->first] = it->second;
 		++it;
 	}
-	
+
 	assertTrue (values.size() == N);
 }
 
@@ -191,7 +191,7 @@ void ListMapTest::testConstIterator()
 	{
 		hm.insert(IntMap::ValueType(i, i*2));
 	}
-	
+
 	std::map<int, int> values;
 	IntMap::ConstIterator it = hm.begin();
 	while (it != hm.end())
@@ -200,7 +200,7 @@ void ListMapTest::testConstIterator()
 		values[it->first] = it->second;
 		++it;
 	}
-	
+
 	assertTrue (values.size() == N);
 }
 
@@ -239,12 +239,12 @@ void ListMapTest::testStringIndex()
 	hm["index1"] = "value2";
 	hm["index2"] = "value4";
 	hm["index3"] = "value6";
-	
+
 	assertTrue (hm.size() == 3);
 	assertTrue (hm["index1"] == "value2");
 	assertTrue (hm["Index2"] == "value4");
 	assertTrue (hm["inDeX3"] == "value6");
-	
+
 	try
 	{
 		const StringMap& im = hm;
diff --git a/Foundation/testsuite/src/LoggerTest.cpp b/Foundation/testsuite/src/LoggerTest.cpp
index cf6ba6563..afa33bbe0 100644
--- a/Foundation/testsuite/src/LoggerTest.cpp
+++ b/Foundation/testsuite/src/LoggerTest.cpp
@@ -48,14 +48,14 @@ void LoggerTest::testLogger()
 	assertTrue (root.information());
 	assertTrue (!root.debug());
 	assertTrue (!root.trace());
-	
+
 	root.information("Informational message");
 	assertTrue (pChannel->list().size() == 1);
 	root.warning("Warning message");
 	assertTrue (pChannel->list().size() == 2);
 	root.debug("Debug message");
 	assertTrue (pChannel->list().size() == 2);
-	
+
 	Logger& logger1 = Logger::get("Logger1");
 	Logger& logger2 = Logger::get("Logger2");
 	Logger& logger11 = Logger::get("Logger1.Logger1");
@@ -85,7 +85,7 @@ void LoggerTest::testLogger()
 	assertTrue (logger12.is(Message::PRIO_INFORMATION));
 	assertTrue (logger21.is(Message::PRIO_INFORMATION));
 	assertTrue (logger22.is(Message::PRIO_INFORMATION));
-	
+
 	Logger::setLevel("Logger2.Logger1", Message::PRIO_ERROR);
 	assertTrue (logger1.is(Message::PRIO_DEBUG));
 	assertTrue (logger11.is(Message::PRIO_DEBUG));
@@ -96,7 +96,7 @@ void LoggerTest::testLogger()
 	assertTrue (logger12.is(Message::PRIO_INFORMATION));
 	assertTrue (logger21.is(Message::PRIO_ERROR));
 	assertTrue (logger22.is(Message::PRIO_INFORMATION));
-	
+
 	Logger::setLevel("", Message::PRIO_WARNING);
 	assertTrue (root.getLevel() == Message::PRIO_WARNING);
 	assertTrue (logger1.getLevel() == Message::PRIO_WARNING);
@@ -105,7 +105,7 @@ void LoggerTest::testLogger()
 	assertTrue (logger1.getLevel() == Message::PRIO_WARNING);
 	assertTrue (logger21.getLevel() == Message::PRIO_WARNING);
 	assertTrue (logger22.getLevel() == Message::PRIO_WARNING);
-	
+
 	AutoPtr<TestChannel> pChannel2 = new TestChannel;
 	Logger::setChannel("Logger2", pChannel2);
 	assertTrue (pChannel.get()  == root.getChannel().get());
@@ -115,7 +115,7 @@ void LoggerTest::testLogger()
 	assertTrue (pChannel2.get() == logger2.getChannel().get());
 	assertTrue (pChannel2.get() == logger21.getChannel().get());
 	assertTrue (pChannel2.get() == logger22.getChannel().get());
-	
+
 	root.setLevel(Message::PRIO_TRACE);
 	pChannel->list().clear();
 	root.trace("trace");
@@ -141,7 +141,7 @@ void LoggerTest::testLogger()
 	pChannel->list().clear();
 	root.fatal("fatal");
 	assertTrue (pChannel->list().begin()->getPriority() == Message::PRIO_FATAL);
-	
+
 	root.setLevel("1");
 	assertTrue (root.getLevel() == Message::PRIO_FATAL);
 	root.setLevel("8");
@@ -256,18 +256,18 @@ void LoggerTest::testDump()
 	Logger& root = Logger::root();
 	root.setChannel(pChannel);
 	root.setLevel(Message::PRIO_INFORMATION);
-	
+
 	char buffer1[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
 	root.dump("test", buffer1, sizeof(buffer1));
 	assertTrue (pChannel->list().empty());
-	
+
 	root.setLevel(Message::PRIO_DEBUG);
 	root.dump("test", buffer1, sizeof(buffer1));
-	
+
 	std::string msg = pChannel->list().begin()->getText();
 	assertTrue (msg == "test\n0000  00 01 02 03 04 05                                 ......");
 	pChannel->clear();
-	
+
 	char buffer2[] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
@@ -276,7 +276,7 @@ void LoggerTest::testDump()
 	msg = pChannel->list().begin()->getText();
 	assertTrue (msg == "0000  00 01 02 03 04 05 06 07  08 09 0A 0B 0C 0D 0E 0F  ................");
 	pChannel->clear();
-	
+
 	char buffer3[] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
diff --git a/Foundation/testsuite/src/LoggingRegistryTest.cpp b/Foundation/testsuite/src/LoggingRegistryTest.cpp
index 5356901b1..a9a3fde48 100644
--- a/Foundation/testsuite/src/LoggingRegistryTest.cpp
+++ b/Foundation/testsuite/src/LoggingRegistryTest.cpp
@@ -38,14 +38,14 @@ LoggingRegistryTest::~LoggingRegistryTest()
 void LoggingRegistryTest::testRegister()
 {
 	LoggingRegistry& reg = LoggingRegistry::defaultRegistry();
-	
+
 	reg.clear();
-	
+
 	Channel::Ptr pC1 = new ConsoleChannel();
 	Channel::Ptr pC2 = new ConsoleChannel();
 	Formatter::Ptr pF1 = new PatternFormatter("");
 	Formatter::Ptr pF2 = new PatternFormatter("");
-	
+
 	reg.registerChannel("c1", pC1);
 	reg.registerChannel("c2", pC2);
 	reg.registerFormatter("f1", pF1);
@@ -55,12 +55,12 @@ void LoggingRegistryTest::testRegister()
 	assertTrue (pC1 == pC);
 	pC = reg.channelForName("c2");
 	assertTrue (pC2 == pC);
-	
+
 	Formatter* pF = reg.formatterForName("f1");
 	assertTrue (pF1 == pF);
 	pF = reg.formatterForName("f2");
 	assertTrue (pF2 == pF);
-	
+
 	try
 	{
 		pC = reg.channelForName("c3");
@@ -75,21 +75,21 @@ void LoggingRegistryTest::testRegister()
 void LoggingRegistryTest::testReregister()
 {
 	LoggingRegistry& reg = LoggingRegistry::defaultRegistry();
-	
+
 	reg.clear();
-	
+
 	Channel::Ptr pC1 = new ConsoleChannel();
 	Channel::Ptr pC2 = new ConsoleChannel();
 	Channel::Ptr pC1b = new ConsoleChannel();
 	AutoPtr<Formatter> pF1 = new PatternFormatter("");
 	AutoPtr<Formatter> pF2 = new PatternFormatter("");
 	AutoPtr<Formatter> pF1b = new PatternFormatter("");
-	
+
 	reg.registerChannel("c1", pC1);
 	reg.registerChannel("c2", pC2);
 	reg.registerFormatter("f1", pF1);
 	reg.registerFormatter("f2", pF2);
-	
+
 	reg.registerChannel("c1", pC1b);
 
 	Channel::Ptr pC = reg.channelForName("c1");
@@ -110,14 +110,14 @@ void LoggingRegistryTest::testReregister()
 void LoggingRegistryTest::testUnregister()
 {
 	LoggingRegistry& reg = LoggingRegistry::defaultRegistry();
-	
+
 	reg.clear();
-	
+
 	Channel::Ptr pC1 = new ConsoleChannel();
 	Channel::Ptr pC2 = new ConsoleChannel();
 	AutoPtr<Formatter> pF1 = new PatternFormatter("");
 	AutoPtr<Formatter> pF2 = new PatternFormatter("");
-	
+
 	reg.registerChannel("c1", pC1);
 	reg.registerChannel("c2", pC2);
 	reg.registerFormatter("f1", pF1);
@@ -125,7 +125,7 @@ void LoggingRegistryTest::testUnregister()
 
 	reg.unregisterChannel("c1");
 	reg.unregisterFormatter("f2");
-	
+
 	try
 	{
 		Channel::Ptr pC = reg.channelForName("c1");
diff --git a/Foundation/testsuite/src/MD4EngineTest.cpp b/Foundation/testsuite/src/MD4EngineTest.cpp
index 0e69fa613..80cf55c34 100644
--- a/Foundation/testsuite/src/MD4EngineTest.cpp
+++ b/Foundation/testsuite/src/MD4EngineTest.cpp
@@ -48,7 +48,7 @@ void MD4EngineTest::testMD4()
 
 	engine.update("abcdefghijklmnopqrstuvwxyz");
 	assertTrue (DigestEngine::digestToHex(engine.digest()) == "d79e1c308aa5bbcdeea8ed63df412da9");
-	
+
 	engine.update("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
 	engine.update("abcdefghijklmnopqrstuvwxyz0123456789");
 	assertTrue (DigestEngine::digestToHex(engine.digest()) == "043f8582f241db351ce627e153e7f0e4");
diff --git a/Foundation/testsuite/src/ManifestTest.cpp b/Foundation/testsuite/src/ManifestTest.cpp
index 524519cd3..4573db8fa 100644
--- a/Foundation/testsuite/src/ManifestTest.cpp
+++ b/Foundation/testsuite/src/ManifestTest.cpp
@@ -61,9 +61,9 @@ void ManifestTest::testManifest()
 	assertTrue (manifest.find("MfTestObject2") != manifest.end());
 	assertTrue (manifest.find("MfTestObject3") != manifest.end());
 	assertTrue (manifest.find("MfTestObject4") == manifest.end());
-	
+
 	std::set<std::string> classes;
-	
+
 	Manifest<MfTestBase>::Iterator it = manifest.begin();
 	assertTrue (it != manifest.end());
 	classes.insert(it->name());
@@ -75,11 +75,11 @@ void ManifestTest::testManifest()
 	classes.insert(it->name());
 	it++;
 	assertTrue (it == manifest.end());
-	
+
 	assertTrue (classes.find("MfTestObject1") != classes.end());
 	assertTrue (classes.find("MfTestObject2") != classes.end());
 	assertTrue (classes.find("MfTestObject3") != classes.end());
-	
+
 	manifest.clear();
 	assertTrue (manifest.empty());
 	assertTrue (manifest.size() == 0);
diff --git a/Foundation/testsuite/src/MemoryPoolTest.cpp b/Foundation/testsuite/src/MemoryPoolTest.cpp
index 3d81634a3..7687cd93c 100644
--- a/Foundation/testsuite/src/MemoryPoolTest.cpp
+++ b/Foundation/testsuite/src/MemoryPoolTest.cpp
@@ -36,11 +36,11 @@ MemoryPoolTest::~MemoryPoolTest()
 void MemoryPoolTest::testMemoryPool()
 {
 	MemoryPool pool1(100, 0, 10);
-	
+
 	assertTrue (pool1.blockSize() == 100);
 	assertTrue (pool1.allocated() == 0);
 	assertTrue (pool1.available() == 0);
-	
+
 	std::vector<void*> ptrs;
 	for (int i = 0; i < 10; ++i)
 	{
@@ -48,7 +48,7 @@ void MemoryPoolTest::testMemoryPool()
 		assertTrue (pool1.allocated() == i + 1);
 		assertTrue (pool1.available() == 0);
 	}
-	
+
 	try
 	{
 		pool1.get();
@@ -57,7 +57,7 @@ void MemoryPoolTest::testMemoryPool()
 	catch (Poco::OutOfMemoryException&)
 	{
 	}
-	
+
 	int av = 0;
 	for (std::vector<void*>::iterator it = ptrs.begin(); it != ptrs.end(); ++it)
 	{
@@ -65,7 +65,7 @@ void MemoryPoolTest::testMemoryPool()
 		++av;
 		assertTrue (pool1.available() == av);
 	}
-	
+
 	MemoryPool pool2(32, 5, 10);
 	assertTrue (pool2.available() == 5);
 	assertTrue (pool2.blockSize() == 32);
diff --git a/Foundation/testsuite/src/MemoryStreamTest.cpp b/Foundation/testsuite/src/MemoryStreamTest.cpp
index 9c705a589..f3c6ff30c 100644
--- a/Foundation/testsuite/src/MemoryStreamTest.cpp
+++ b/Foundation/testsuite/src/MemoryStreamTest.cpp
@@ -34,22 +34,22 @@ void MemoryStreamTest::testInput()
 {
 	const char* data = "This is a test";
 	MemoryInputStream istr1(data, 14);
-	
+
 	int c = istr1.get();
 	assertTrue (c == 'T');
 	c = istr1.get();
 	assertTrue (c == 'h');
-	
+
 	std::string str;
 	istr1 >> str;
 	assertTrue (str == "is");
-	
+
 	char buffer[32];
 	istr1.read(buffer, sizeof(buffer));
 	assertTrue (istr1.gcount() == 10);
 	buffer[istr1.gcount()] = 0;
 	assertTrue (std::string(" is a test") == buffer);
-	
+
 	const char* data2 = "123";
 	MemoryInputStream istr2(data2, 3);
 	c = istr2.get();
@@ -77,7 +77,7 @@ void MemoryStreamTest::testOutput()
 	ostr1 << "This is a test " << 42 << std::ends;
 	assertTrue (ostr1.charsWritten() == 18);
 	assertTrue (std::string("This is a test 42") == output);
-	
+
 	char output2[4];
 	MemoryOutputStream ostr2(output2, 4);
 	ostr2 << "test";
diff --git a/Foundation/testsuite/src/NamedMutexTest.h b/Foundation/testsuite/src/NamedMutexTest.h
index ea47e5c06..9aaaee14c 100644
--- a/Foundation/testsuite/src/NamedMutexTest.h
+++ b/Foundation/testsuite/src/NamedMutexTest.h
@@ -26,7 +26,7 @@ public:
 
 	void testLock();
 	void testTryLock();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Foundation/testsuite/src/NamedTuplesTest.cpp b/Foundation/testsuite/src/NamedTuplesTest.cpp
index 14829144f..02f1f66b9 100644
--- a/Foundation/testsuite/src/NamedTuplesTest.cpp
+++ b/Foundation/testsuite/src/NamedTuplesTest.cpp
@@ -46,14 +46,14 @@ void NamedTuplesTest::testNamedTuple1()
 {
 	typedef NamedTuple<std::string> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 1);
-	
+
 	TupleType aTuple2("string1", "1");
 	assertTrue (aTuple2["string1"] == "1");
 
@@ -81,19 +81,19 @@ void NamedTuplesTest::testNamedTuple2()
 {
 	typedef NamedTuple<std::string, int> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
-	assertTrue (aTuple["B"] == 0); 
+	assertTrue (aTuple["B"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 2);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 
 	assertTrue (aTuple != aTuple2);
 	aTuple = aTuple2;
@@ -104,7 +104,7 @@ void NamedTuplesTest::testNamedTuple2()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3.length == 2);
 
 	assertTrue (aTuple.getName(0) == "string1");
@@ -118,25 +118,25 @@ void NamedTuplesTest::testNamedTuple2()
 
 void NamedTuplesTest::testNamedTuple3()
 {
-	typedef NamedTuple<std::string, 
-		int, 
+	typedef NamedTuple<std::string,
+		int,
 		bool> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
-	assertTrue (aTuple["C"] == false); 
+	assertTrue (aTuple["C"] == false);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 3);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 
 	assertTrue (aTuple != aTuple2);
@@ -148,7 +148,7 @@ void NamedTuplesTest::testNamedTuple3()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3.length == 3);
 
@@ -163,27 +163,27 @@ void NamedTuplesTest::testNamedTuple3()
 
 void NamedTuplesTest::testNamedTuple4()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
+	typedef NamedTuple<std::string,
+		int,
+		bool,
 		float> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
-	assertTrue (aTuple["C"] == false); 
+	assertTrue (aTuple["C"] == false);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 4);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 
@@ -196,7 +196,7 @@ void NamedTuplesTest::testNamedTuple4()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3.length == 4);
 
@@ -211,30 +211,30 @@ void NamedTuplesTest::testNamedTuple4()
 
 void NamedTuplesTest::testNamedTuple5()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
+	typedef NamedTuple<std::string,
+		int,
+		bool,
+		float,
 		char> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 5);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c');
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
@@ -248,7 +248,7 @@ void NamedTuplesTest::testNamedTuple5()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3.length == 5);
@@ -264,37 +264,37 @@ void NamedTuplesTest::testNamedTuple5()
 
 void NamedTuplesTest::testNamedTuple6()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
+	typedef NamedTuple<std::string,
+		int,
+		bool,
+		float,
+		char,
 		long> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 6);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 
 	assertTrue (aTuple != aTuple2);
 	aTuple = aTuple2;
@@ -305,7 +305,7 @@ void NamedTuplesTest::testNamedTuple6()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
@@ -322,27 +322,27 @@ void NamedTuplesTest::testNamedTuple6()
 
 void NamedTuplesTest::testNamedTuple7()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
+	typedef NamedTuple<std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
 		double> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 7);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
@@ -350,11 +350,11 @@ void NamedTuplesTest::testNamedTuple7()
 		"long1", 999,
 		"double1", 1.5);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 
 	assertTrue (aTuple != aTuple2);
@@ -366,7 +366,7 @@ void NamedTuplesTest::testNamedTuple7()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
@@ -383,29 +383,29 @@ void NamedTuplesTest::testNamedTuple7()
 
 void NamedTuplesTest::testNamedTuple8()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
+	typedef NamedTuple<std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
+		double,
 		short> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 8);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
@@ -414,11 +414,11 @@ void NamedTuplesTest::testNamedTuple8()
 		"double1", 1.5,
 		"short1", 32700);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 
@@ -431,11 +431,11 @@ void NamedTuplesTest::testNamedTuple8()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3.length == 8);
 
 	assertTrue (aTuple.getName(0) == "string1");
@@ -450,22 +450,22 @@ void NamedTuplesTest::testNamedTuple8()
 
 void NamedTuplesTest::testNamedTuple9()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
+	typedef NamedTuple<std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
 		std::string> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
@@ -473,22 +473,22 @@ void NamedTuplesTest::testNamedTuple9()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 9);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2");
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
@@ -502,11 +502,11 @@ void NamedTuplesTest::testNamedTuple9()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3.length == 9);
 
@@ -521,52 +521,52 @@ void NamedTuplesTest::testNamedTuple9()
 
 void NamedTuplesTest::testNamedTuple10()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
 		int> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 10);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2 );
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 
 	assertTrue (aTuple != aTuple2);
 	aTuple = aTuple2;
@@ -577,11 +577,11 @@ void NamedTuplesTest::testNamedTuple10()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3.length == 10);
@@ -597,55 +597,55 @@ void NamedTuplesTest::testNamedTuple10()
 
 void NamedTuplesTest::testNamedTuple11()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
 		int,
 		std::string> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 11);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
 		"string3", "3");
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
 
 	assertTrue (aTuple != aTuple2);
@@ -657,11 +657,11 @@ void NamedTuplesTest::testNamedTuple11()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
@@ -678,60 +678,60 @@ void NamedTuplesTest::testNamedTuple11()
 
 void NamedTuplesTest::testNamedTuple12()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
 		int,
-		std::string, 
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
 		int> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 12);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
+		"string3", "3",
 		"int3", 3);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 
 	assertTrue (aTuple != aTuple2);
 	aTuple = aTuple2;
@@ -742,11 +742,11 @@ void NamedTuplesTest::testNamedTuple12()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
@@ -763,30 +763,30 @@ void NamedTuplesTest::testNamedTuple12()
 
 void NamedTuplesTest::testNamedTuple13()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
 		int,
-		std::string, 
-		int, 
 		bool> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
@@ -794,32 +794,32 @@ void NamedTuplesTest::testNamedTuple13()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 13);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 
 	assertTrue (aTuple != aTuple2);
@@ -831,11 +831,11 @@ void NamedTuplesTest::testNamedTuple13()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
@@ -852,31 +852,31 @@ void NamedTuplesTest::testNamedTuple13()
 
 void NamedTuplesTest::testNamedTuple14()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
 		int,
-		std::string, 
-		int, 
-		bool, 
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
+		int,
+		bool,
 		float> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
@@ -884,33 +884,33 @@ void NamedTuplesTest::testNamedTuple14()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 14);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 
@@ -923,15 +923,15 @@ void NamedTuplesTest::testNamedTuple14()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3.length == 14);
 
 	assertTrue (aTuple.getName(0) == "string1");
@@ -945,32 +945,32 @@ void NamedTuplesTest::testNamedTuple14()
 
 void NamedTuplesTest::testNamedTuple15()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
 		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
+		int,
+		bool,
+		float,
 		char> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
@@ -978,34 +978,34 @@ void NamedTuplesTest::testNamedTuple15()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 15);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c');
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
@@ -1019,15 +1019,15 @@ void NamedTuplesTest::testNamedTuple15()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3.length == 15);
 
@@ -1042,74 +1042,74 @@ void NamedTuplesTest::testNamedTuple15()
 
 void NamedTuplesTest::testNamedTuple16()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
 		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
+		int,
+		bool,
+		float,
+		char,
 		long> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 16);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2.length == 16);
 
 	assertTrue (aTuple != aTuple2);
@@ -1121,17 +1121,17 @@ void NamedTuplesTest::testNamedTuple16()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
-	assertTrue (aTuple3["char2"] == 0); 
+	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3.length == 16);
 
 	assertTrue (aTuple.getName(0) == "string1");
@@ -1145,77 +1145,77 @@ void NamedTuplesTest::testNamedTuple16()
 
 void NamedTuplesTest::testNamedTuple17()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
 		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
 		double> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 17);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2.length == 17);
 
@@ -1228,18 +1228,18 @@ void NamedTuplesTest::testNamedTuple17()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
-	assertTrue (aTuple3["long2"] == 0); 
+	assertTrue (aTuple3["long2"] == 0);
 	assertTrue (aTuple3.length == 17);
 
 	assertTrue (aTuple.getName(0) == "string1");
@@ -1253,58 +1253,58 @@ void NamedTuplesTest::testNamedTuple17()
 
 void NamedTuplesTest::testNamedTuple18()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
 		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
+		double,
 		short> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 18);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
@@ -1312,21 +1312,21 @@ void NamedTuplesTest::testNamedTuple18()
 		"double2", 2.5,
 		"short2", 32700);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2.length == 18);
@@ -1340,19 +1340,19 @@ void NamedTuplesTest::testNamedTuple18()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3.length == 18);
 
 	assertTrue (aTuple.getName(0) == "string1");
@@ -1366,40 +1366,40 @@ void NamedTuplesTest::testNamedTuple18()
 
 void NamedTuplesTest::testNamedTuple19()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
 		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
 		std::string> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -1407,42 +1407,42 @@ void NamedTuplesTest::testNamedTuple19()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 19);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4");
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
@@ -1457,19 +1457,19 @@ void NamedTuplesTest::testNamedTuple19()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3.length == 19);
 
@@ -1484,41 +1484,41 @@ void NamedTuplesTest::testNamedTuple19()
 
 void NamedTuplesTest::testNamedTuple20()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
 		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
 		int> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -1526,47 +1526,47 @@ void NamedTuplesTest::testNamedTuple20()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 20);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2.length == 20);
 
 	assertTrue (aTuple != aTuple2);
@@ -1578,19 +1578,19 @@ void NamedTuplesTest::testNamedTuple20()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3.length == 20);
@@ -1606,42 +1606,42 @@ void NamedTuplesTest::testNamedTuple20()
 
 void NamedTuplesTest::testNamedTuple21()
 {
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+	typedef NamedTuple<std::string,
 		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
+		int,
+		std::string,
+		int,
+		bool,
+		float,
+		char,
+		long,
+		double,
+		short,
+		std::string,
 		int,
 		bool> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
 	assertTrue (aTuple["C"] == false);
-	assertTrue (aTuple["E"] == 0); 
+	assertTrue (aTuple["E"] == 0);
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -1650,48 +1650,48 @@ void NamedTuplesTest::testNamedTuple21()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 21);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
 		"bool3", true);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["bool3"] == true);
 	assertTrue (aTuple2.length == 21);
 
@@ -1704,19 +1704,19 @@ void NamedTuplesTest::testNamedTuple21()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["bool3"] == false);
@@ -1757,7 +1757,7 @@ void NamedTuplesTest::testNamedTuple22()
 		int
 	> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
@@ -1766,11 +1766,11 @@ void NamedTuplesTest::testNamedTuple22()
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -1781,49 +1781,49 @@ void NamedTuplesTest::testNamedTuple22()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 22);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
-		"string5", "5", 
+		"string5", "5",
 		"int5", 5);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["string5"] == "5");
 	assertTrue (aTuple2["int5"] == 5);
 	assertTrue (aTuple2.length == 22);
@@ -1837,19 +1837,19 @@ void NamedTuplesTest::testNamedTuple22()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["string5"] == "");
@@ -1891,7 +1891,7 @@ void NamedTuplesTest::testNamedTuple23()
 		int, // 21, V
 		bool> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
@@ -1900,11 +1900,11 @@ void NamedTuplesTest::testNamedTuple23()
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -1916,52 +1916,52 @@ void NamedTuplesTest::testNamedTuple23()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 23);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
-		"string5", "5", 
+		"string5", "5",
 		"int5", 5,
 		"bool3", true);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["string5"] == "5");
-	assertTrue (aTuple2["int5"] == 5); 
+	assertTrue (aTuple2["int5"] == 5);
 	assertTrue (aTuple2["bool3"] == true);
 	assertTrue (aTuple2.length == 23);
 
@@ -1974,19 +1974,19 @@ void NamedTuplesTest::testNamedTuple23()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["string5"] == "");
@@ -2030,7 +2030,7 @@ void NamedTuplesTest::testNamedTuple24()
 		bool, // 22, W
 		float> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
@@ -2039,11 +2039,11 @@ void NamedTuplesTest::testNamedTuple24()
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -2051,58 +2051,58 @@ void NamedTuplesTest::testNamedTuple24()
 	assertTrue (aTuple["U"] == "");
 	assertTrue (aTuple["V"] == 0);
 	assertTrue (aTuple["W"] == false);
-	assertTrue (aTuple["X"] == 0); 
+	assertTrue (aTuple["X"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 24);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
-		"string5", "5", 
+		"string5", "5",
 		"int5", 5,
 		"bool3", true,
 		"float3", 3.5f);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["string5"] == "5");
-	assertTrue (aTuple2["int5"] == 5); 
+	assertTrue (aTuple2["int5"] == 5);
 	assertTrue (aTuple2["bool3"] == true);
 	assertTrue (aTuple2["float3"] == 3.5);
 	assertTrue (aTuple2.length == 24);
@@ -2116,19 +2116,19 @@ void NamedTuplesTest::testNamedTuple24()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["string5"] == "");
@@ -2173,7 +2173,7 @@ void NamedTuplesTest::testNamedTuple25()
 		char // 24, Y
 	> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
@@ -2182,11 +2182,11 @@ void NamedTuplesTest::testNamedTuple25()
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -2199,54 +2199,54 @@ void NamedTuplesTest::testNamedTuple25()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 25);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
-		"string5", "5", 
+		"string5", "5",
 		"int5", 5,
 		"bool3", true,
 		"float3", 3.5f,
 		"char3", 'c');
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["string5"] == "5");
-	assertTrue (aTuple2["int5"] == 5); 
+	assertTrue (aTuple2["int5"] == 5);
 	assertTrue (aTuple2["bool3"] == true);
 	assertTrue (aTuple2["float3"] == 3.5);
 	assertTrue (aTuple2["char3"] == 'c');
@@ -2261,19 +2261,19 @@ void NamedTuplesTest::testNamedTuple25()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["string5"] == "");
@@ -2319,7 +2319,7 @@ void NamedTuplesTest::testNamedTuple26()
 		long // 25, Z
 	> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
@@ -2328,11 +2328,11 @@ void NamedTuplesTest::testNamedTuple26()
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -2346,54 +2346,54 @@ void NamedTuplesTest::testNamedTuple26()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 26);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
-		"string5", "5", 
+		"string5", "5",
 		"int5", 5,
 		"bool3", true,
 		"float3", 3.5f,
 		"char3", 'c');
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["string5"] == "5");
-	assertTrue (aTuple2["int5"] == 5); 
+	assertTrue (aTuple2["int5"] == 5);
 	assertTrue (aTuple2["bool3"] == true);
 	assertTrue (aTuple2["float3"] == 3.5);
 	assertTrue (aTuple2["char3"] == 'c');
@@ -2408,19 +2408,19 @@ void NamedTuplesTest::testNamedTuple26()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["string5"] == "");
@@ -2467,7 +2467,7 @@ void NamedTuplesTest::testNamedTuple27()
 		double // 26, A1
 	> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
@@ -2476,11 +2476,11 @@ void NamedTuplesTest::testNamedTuple27()
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -2488,35 +2488,35 @@ void NamedTuplesTest::testNamedTuple27()
 	assertTrue (aTuple["U"] == "");
 	assertTrue (aTuple["V"] == 0);
 	assertTrue (aTuple["W"] == false);
-	assertTrue (aTuple["X"] == 0); 
+	assertTrue (aTuple["X"] == 0);
 	assertTrue (aTuple["Y"] == 0);
 	assertTrue (aTuple["Z"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 27);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
-		"string5", "5", 
+		"string5", "5",
 		"int5", 5,
 		"bool3", true,
 		"float3", 3.5f,
@@ -2524,31 +2524,31 @@ void NamedTuplesTest::testNamedTuple27()
 		"long3", 999,
 		"double3", 3.5);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["string5"] == "5");
 	assertTrue (aTuple2["int5"] == 5);
 	assertTrue (aTuple2["bool3"] == true);
 	assertTrue (aTuple2["float3"] == 3.5);
 	assertTrue (aTuple2["char3"] == 'c');
-	assertTrue (aTuple2["long3"] == 999); 
+	assertTrue (aTuple2["long3"] == 999);
 	assertTrue (aTuple2["double3"] == 3.5);
 	assertTrue (aTuple2.length == 27);
 
@@ -2561,19 +2561,19 @@ void NamedTuplesTest::testNamedTuple27()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["string5"] == "");
@@ -2621,7 +2621,7 @@ void NamedTuplesTest::testNamedTuple28()
 		short // 27, B1
 	> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
@@ -2630,11 +2630,11 @@ void NamedTuplesTest::testNamedTuple28()
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -2642,7 +2642,7 @@ void NamedTuplesTest::testNamedTuple28()
 	assertTrue (aTuple["U"] == "");
 	assertTrue (aTuple["V"] == 0);
 	assertTrue (aTuple["W"] == false);
-	assertTrue (aTuple["X"] == 0); 
+	assertTrue (aTuple["X"] == 0);
 	assertTrue (aTuple["Y"] == 0);
 	assertTrue (aTuple["Z"] == 0);
 	assertTrue (aTuple["B1"] == 0);
@@ -2650,28 +2650,28 @@ void NamedTuplesTest::testNamedTuple28()
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 28);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
-		"string5", "5", 
+		"string5", "5",
 		"int5", 5,
 		"bool3", true,
 		"float3", 3.5f,
@@ -2680,31 +2680,31 @@ void NamedTuplesTest::testNamedTuple28()
 		"double3", 3.5,
 		"short3", 3);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["string5"] == "5");
 	assertTrue (aTuple2["int5"] == 5);
 	assertTrue (aTuple2["bool3"] == true);
 	assertTrue (aTuple2["float3"] == 3.5);
 	assertTrue (aTuple2["char3"] == 'c');
-	assertTrue (aTuple2["long3"] == 999); 
+	assertTrue (aTuple2["long3"] == 999);
 	assertTrue (aTuple2["double3"] == 3.5);
 	assertTrue (aTuple2["short3"] == 3);
 	assertTrue (aTuple2.length == 28);
@@ -2718,19 +2718,19 @@ void NamedTuplesTest::testNamedTuple28()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["string5"] == "");
@@ -2779,7 +2779,7 @@ void NamedTuplesTest::testNamedTuple29()
 		std::string // C1
 	> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
@@ -2788,11 +2788,11 @@ void NamedTuplesTest::testNamedTuple29()
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -2800,71 +2800,71 @@ void NamedTuplesTest::testNamedTuple29()
 	assertTrue (aTuple["U"] == "");
 	assertTrue (aTuple["V"] == 0);
 	assertTrue (aTuple["W"] == false);
-	assertTrue (aTuple["X"] == 0); 
+	assertTrue (aTuple["X"] == 0);
 	assertTrue (aTuple["Y"] == 0);
 	assertTrue (aTuple["Z"] == 0);
-	assertTrue (aTuple["B1"] == 0); 
+	assertTrue (aTuple["B1"] == 0);
 	assertTrue (aTuple["C1"] == "");
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 29);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
-		"string5", "5", 
+		"string5", "5",
 		"int5", 5,
 		"bool3", true,
 		"float3", 3.5f,
 		"char3", 'c',
 		"long3", 999,
 		"double3", 3.5,
-		"short3", 32700, 
+		"short3", 32700,
 		"string6", "6");
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["string5"] == "5");
-	assertTrue (aTuple2["int5"] == 5); 
+	assertTrue (aTuple2["int5"] == 5);
 	assertTrue (aTuple2["bool3"] == true);
 	assertTrue (aTuple2["float3"] == 3.5);
 	assertTrue (aTuple2["char3"] == 'c');
-	assertTrue (aTuple2["long3"] == 999); 
+	assertTrue (aTuple2["long3"] == 999);
 	assertTrue (aTuple2["double3"] == 3.5);
 	assertTrue (aTuple2["short3"] == 32700);
 	assertTrue (aTuple2["string6"] == "6");
@@ -2880,19 +2880,19 @@ void NamedTuplesTest::testNamedTuple29()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["string5"] == "");
@@ -2943,7 +2943,7 @@ void NamedTuplesTest::testNamedTuple30()
 		int // D1
 	> TupleType;
 
-	TupleType aTuple; 
+	TupleType aTuple;
 
 	assertTrue (aTuple["A"] == "");
 	assertTrue (aTuple["B"] == 0);
@@ -2952,11 +2952,11 @@ void NamedTuplesTest::testNamedTuple30()
 	assertTrue (aTuple["F"] == 0);
 	assertTrue (aTuple["H"] == 0);
 	assertTrue (aTuple["I"] == "");
-	assertTrue (aTuple["J"] == 0); 
+	assertTrue (aTuple["J"] == 0);
 	assertTrue (aTuple["K"] == "");
 	assertTrue (aTuple["L"] == 0);
 	assertTrue (aTuple["M"] == false);
-	assertTrue (aTuple["O"] == 0); 
+	assertTrue (aTuple["O"] == 0);
 	assertTrue (aTuple["P"] == 0);
 	assertTrue (aTuple["R"] == 0);
 	assertTrue (aTuple["S"] == "");
@@ -2964,73 +2964,73 @@ void NamedTuplesTest::testNamedTuple30()
 	assertTrue (aTuple["U"] == "");
 	assertTrue (aTuple["V"] == 0);
 	assertTrue (aTuple["W"] == false);
-	assertTrue (aTuple["X"] == 0); 
+	assertTrue (aTuple["X"] == 0);
 	assertTrue (aTuple["Y"] == 0);
 	assertTrue (aTuple["Z"] == 0);
-	assertTrue (aTuple["B1"] == 0); 
+	assertTrue (aTuple["B1"] == 0);
 	assertTrue (aTuple["C1"] == "");
 	assertTrue (aTuple["D1"] == 0);
 
 	try { int POCO_UNUSED xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
 	catch (NotFoundException&) { }
 	assertTrue (aTuple.length == 30);
-	
-	TupleType aTuple2("string1", "1", 
+
+	TupleType aTuple2("string1", "1",
 		"int1", 1,
 		"bool1", true,
 		"float1", 1.5f,
 		"char1", 'c',
 		"long1", 999,
 		"double1", 1.5,
-		"short1", 32700, 
+		"short1", 32700,
 		"string2", "2",
 		"int2", 2,
-		"string3", "3", 
-		"int3", 3, 
+		"string3", "3",
+		"int3", 3,
 		"bool2", true,
 		"float2", 2.5,
 		"char2", 'c',
 		"long2", 999,
 		"double2", 2.5,
-		"short2", 32700, 
+		"short2", 32700,
 		"string4", "4",
 		"int4", 4,
-		"string5", "5", 
+		"string5", "5",
 		"int5", 5,
 		"bool3", true,
 		"float3", 3.5f,
 		"char3", 'c',
 		"long3", 999,
 		"double3", 3.5,
-		"short3", 32700, 
+		"short3", 32700,
 		"string6", "6",
 		"int6", 6);
 	assertTrue (aTuple2["string1"] == "1");
-	assertTrue (aTuple2["int1"] == 1); 
+	assertTrue (aTuple2["int1"] == 1);
 	assertTrue (aTuple2["bool1"] == true);
 	assertTrue (aTuple2["float1"] == 1.5);
 	assertTrue (aTuple2["char1"] == 'c');
-	assertTrue (aTuple2["long1"] == 999); 
+	assertTrue (aTuple2["long1"] == 999);
 	assertTrue (aTuple2["double1"] == 1.5);
 	assertTrue (aTuple2["short1"] == 32700);
 	assertTrue (aTuple2["string2"] == "2");
-	assertTrue (aTuple2["int2"] == 2); 
+	assertTrue (aTuple2["int2"] == 2);
 	assertTrue (aTuple2["string3"] == "3");
-	assertTrue (aTuple2["int3"] == 3); 
+	assertTrue (aTuple2["int3"] == 3);
 	assertTrue (aTuple2["bool2"] == true);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["char2"] == 'c');
-	assertTrue (aTuple2["long2"] == 999); 
+	assertTrue (aTuple2["long2"] == 999);
 	assertTrue (aTuple2["float2"] == 2.5);
 	assertTrue (aTuple2["short2"] == 32700);
 	assertTrue (aTuple2["string4"] == "4");
-	assertTrue (aTuple2["int4"] == 4); 
+	assertTrue (aTuple2["int4"] == 4);
 	assertTrue (aTuple2["string5"] == "5");
-	assertTrue (aTuple2["int5"] == 5); 
+	assertTrue (aTuple2["int5"] == 5);
 	assertTrue (aTuple2["bool3"] == true);
 	assertTrue (aTuple2["float3"] == 3.5);
 	assertTrue (aTuple2["char3"] == 'c');
-	assertTrue (aTuple2["long3"] == 999); 
+	assertTrue (aTuple2["long3"] == 999);
 	assertTrue (aTuple2["double3"] == 3.5);
 	assertTrue (aTuple2["short3"] == 32700);
 	assertTrue (aTuple2["string6"] == "6");
@@ -3047,19 +3047,19 @@ void NamedTuplesTest::testNamedTuple30()
 	TupleType aTuple3(aTuple2.names());
 	assertTrue (aTuple3.names() == aTuple2.names());
 	assertTrue (aTuple3["string1"] == "");
-	assertTrue (aTuple3["int1"] == 0); 
+	assertTrue (aTuple3["int1"] == 0);
 	assertTrue (aTuple3["bool1"] == false);
 	assertTrue (aTuple3["char1"] == 0);
 	assertTrue (aTuple3["long1"] == 0);
-	assertTrue (aTuple3["short1"] == 0); 
+	assertTrue (aTuple3["short1"] == 0);
 	assertTrue (aTuple3["string2"] == "");
 	assertTrue (aTuple3["int2"] == 0);
 	assertTrue (aTuple3["string3"] == "");
-	assertTrue (aTuple3["int3"] == 0); 
+	assertTrue (aTuple3["int3"] == 0);
 	assertTrue (aTuple3["bool2"] == false);
 	assertTrue (aTuple3["char2"] == 0);
 	assertTrue (aTuple3["long2"] == 0);
-	assertTrue (aTuple3["short2"] == 0); 
+	assertTrue (aTuple3["short2"] == 0);
 	assertTrue (aTuple3["string4"] == "");
 	assertTrue (aTuple3["int4"] == 0);
 	assertTrue (aTuple3["string5"] == "");
diff --git a/Foundation/testsuite/src/NotificationCenterTest.cpp b/Foundation/testsuite/src/NotificationCenterTest.cpp
index 9e22b1943..ad4c33727 100644
--- a/Foundation/testsuite/src/NotificationCenterTest.cpp
+++ b/Foundation/testsuite/src/NotificationCenterTest.cpp
@@ -162,7 +162,7 @@ void NotificationCenterTest::testDefaultCenter()
 void NotificationCenterTest::handle1(Poco::Notification* pNf)
 {
 	poco_check_ptr (pNf);
-	AutoPtr<Notification> nf = pNf;	
+	AutoPtr<Notification> nf = pNf;
 	_set.insert("handle1");
 }
 
@@ -170,7 +170,7 @@ void NotificationCenterTest::handle1(Poco::Notification* pNf)
 void NotificationCenterTest::handle2(Poco::Notification* pNf)
 {
 	poco_check_ptr (pNf);
-	AutoPtr<Notification> nf = pNf;	
+	AutoPtr<Notification> nf = pNf;
 	_set.insert("handle2");
 }
 
@@ -178,7 +178,7 @@ void NotificationCenterTest::handle2(Poco::Notification* pNf)
 void NotificationCenterTest::handle3(Poco::Notification* pNf)
 {
 	poco_check_ptr (pNf);
-	AutoPtr<Notification> nf = pNf;	
+	AutoPtr<Notification> nf = pNf;
 	_set.insert("handle3");
 }
 
@@ -186,7 +186,7 @@ void NotificationCenterTest::handle3(Poco::Notification* pNf)
 void NotificationCenterTest::handleTest(TestNotification* pNf)
 {
 	poco_check_ptr (pNf);
-	AutoPtr<TestNotification> nf = pNf;	
+	AutoPtr<TestNotification> nf = pNf;
 	_set.insert("handleTest");
 }
 
diff --git a/Foundation/testsuite/src/NotificationCenterTest.h b/Foundation/testsuite/src/NotificationCenterTest.h
index 95a8336c6..3f21b27da 100644
--- a/Foundation/testsuite/src/NotificationCenterTest.h
+++ b/Foundation/testsuite/src/NotificationCenterTest.h
@@ -49,7 +49,7 @@ protected:
 	void handle3(Poco::Notification* pNf);
 	void handleTest(TestNotification* pNf);
 	void handleAuto(const Poco::AutoPtr<Poco::Notification>& pNf);
-	
+
 private:
 	std::set<std::string> _set;
 };
diff --git a/Foundation/testsuite/src/NotificationQueueTest.cpp b/Foundation/testsuite/src/NotificationQueueTest.cpp
index db7a99ba6..5d8b0b729 100644
--- a/Foundation/testsuite/src/NotificationQueueTest.cpp
+++ b/Foundation/testsuite/src/NotificationQueueTest.cpp
@@ -72,7 +72,7 @@ void NotificationQueueTest::testQueueDequeue()
 	assertTrue (queue.empty());
 	assertTrue (queue.size() == 0);
 	pNf->release();
-	
+
 	queue.enqueueNotification(new QTestNotification("first"));
 	queue.enqueueNotification(new QTestNotification("second"));
 	assertTrue (!queue.empty());
@@ -97,7 +97,7 @@ void NotificationQueueTest::testQueueDequeue()
 
 void NotificationQueueTest::testQueueDequeueUrgent()
 {
-	NotificationQueue queue;	
+	NotificationQueue queue;
 	queue.enqueueNotification(new QTestNotification("first"));
 	queue.enqueueNotification(new QTestNotification("second"));
 	queue.enqueueUrgentNotification(new QTestNotification("third"));
@@ -158,7 +158,7 @@ void NotificationQueueTest::testThreads()
 	Thread t1("thread1");
 	Thread t2("thread2");
 	Thread t3("thread3");
-	
+
 	RunnableAdapter<NotificationQueueTest> ra(*this, &NotificationQueueTest::work);
 	t1.start(ra);
 	t2.start(ra);
diff --git a/Foundation/testsuite/src/NumberFormatterTest.cpp b/Foundation/testsuite/src/NumberFormatterTest.cpp
index 127c2373c..a170f279d 100644
--- a/Foundation/testsuite/src/NumberFormatterTest.cpp
+++ b/Foundation/testsuite/src/NumberFormatterTest.cpp
@@ -39,13 +39,13 @@ void NumberFormatterTest::testFormat()
 	assertTrue (NumberFormatter::format((unsigned) 123) == "123");
 	assertTrue (NumberFormatter::format((unsigned) 123, 5) == "  123");
 	assertTrue (NumberFormatter::format0((unsigned) 123, 5) == "00123");
-	
+
 	assertTrue (NumberFormatter::format((long) 123) == "123");
 	assertTrue (NumberFormatter::format((long) -123) == "-123");
 	assertTrue (NumberFormatter::format((long) -123, 5) == " -123");
 
 	assertTrue (NumberFormatter::format((unsigned long) 123) == "123");
-	assertTrue (NumberFormatter::format((unsigned long) 123, 5) == "  123");	
+	assertTrue (NumberFormatter::format((unsigned long) 123, 5) == "  123");
 
 	assertTrue (NumberFormatter::format(123) == "123");
 	assertTrue (NumberFormatter::format(-123) == "-123");
@@ -57,7 +57,7 @@ void NumberFormatterTest::testFormat()
 	assertTrue (NumberFormatter::format((Int64) -123, 5) == " -123");
 
 	assertTrue (NumberFormatter::format((UInt64) 123) == "123");
-	assertTrue (NumberFormatter::format((UInt64) 123, 5) == "  123");	
+	assertTrue (NumberFormatter::format((UInt64) 123, 5) == "  123");
 #if defined(POCO_LONG_IS_64_BIT)
 	assertTrue (NumberFormatter::format((long long) 123) == "123");
 	assertTrue (NumberFormatter::format((long long) -123) == "-123");
@@ -263,6 +263,20 @@ void NumberFormatterTest::testFormatFloat()
 	assertTrue (NumberFormatter::format(50.546, 0) == "51");
 	assertTrue (NumberFormatter::format(50.546f, 0) == "51");
 	assertTrue (NumberFormatter::format(50.546f, 2) == "50.55");
+
+	try
+	{
+		Poco::NumberFormatter::format(0.1, -1);
+		fail ("NumberFormatter::format() must throw on negative precision");
+	}
+	catch(Poco::InvalidArgumentException&){}
+
+	try
+	{
+		Poco::NumberFormatter::format(0.1, 2, -1);
+		fail ("NumberFormatter::format() must throw on negative precision");
+	}
+	catch(Poco::InvalidArgumentException&){}
 }
 
 
@@ -293,7 +307,7 @@ void NumberFormatterTest::testAppend()
 	NumberFormatter::append0(s, 123u, 5);
 	assertTrue (s == "00123");
 
-	
+
 	s.erase();
 	NumberFormatter::append(s, 123.4);
 	assertTrue (s == "123.4");
diff --git a/Foundation/testsuite/src/NumberParserTest.cpp b/Foundation/testsuite/src/NumberParserTest.cpp
index 7e7fba65d..d27c8396a 100644
--- a/Foundation/testsuite/src/NumberParserTest.cpp
+++ b/Foundation/testsuite/src/NumberParserTest.cpp
@@ -58,9 +58,9 @@ void NumberParserTest::testParse()
 	{
 		char ts = sep[i];
 
-		assertTrue (NumberParser::parse("123") == 123);
-		assertTrue (NumberParser::parse(format("123%c456", ts), ts) == 123456);
-		assertTrue (NumberParser::parse(format("1%c234%c567", ts, ts), ts) == 1234567);
+		assertEqual (NumberParser::parse("123"), 123);
+		assertEqual (NumberParser::parse(format("123%c456", ts), ts), 123456);
+		assertEqual (NumberParser::parse(format("1%c234%c567", ts, ts), ts), 1234567);
 	}
 
 	assertTrue (NumberParser::parse("+123") == 123);
@@ -137,14 +137,14 @@ void NumberParserTest::testParse()
 				double d = 1.234e100;
 				assertEqualDelta(d, NumberParser::parseFloat(format("1%c234e100", dp), dp, ts), 0.01);
 				assertEqualDelta(d, NumberParser::parseFloat(format("1%c234E+100", dp), dp, ts), 0.01);
-		
+
 				d = 1.234e-100;
 				assertEqualDelta(d, NumberParser::parseFloat(format("1%c234E-100", dp), dp, ts), 0.01);
-		
+
 				d = -1.234e100;
 				assertEqualDelta(d, NumberParser::parseFloat(format("-1%c234e+100", dp), dp, ts), 0.01);
 				assertEqualDelta(d, NumberParser::parseFloat(format("-1%c234E100", dp), dp, ts), 0.01);
-		
+
 				d = 1234.234e-100;
 				assertEqualDelta(d, NumberParser::parseFloat(format("1%c234%c234e-100", ts, dp), dp, ts), 0.01);
 				d = 12345.234e-100;
@@ -163,7 +163,7 @@ void NumberParserTest::testParse()
 			double d = 12.34e-10;
 			assertEqualDelta(d, NumberParser::parseFloat(format("12%c34e-10", dp), dp, ts), 0.01);
 			assertEqualDelta(-12.34, NumberParser::parseFloat(format("-12%c34", dp), dp, ts), 0.01);
-	
+
 			assertEqualDelta(12.34, NumberParser::parseFloat(format("12%c34", dp), dp, ts), 0.01);
 		}
 	}
@@ -188,6 +188,19 @@ void NumberParserTest::testLimits()
 	assertTrue (testLowerLimit64<Int64>());
 	assertTrue (testUpperLimit64<UInt64>());
 #endif
+
+	Poco::Int64 val1, val2;
+	// smallest 64-bit int is actually -9223372036854775808
+	// but the sign and number are parsed as two tokens,
+	// resulting in compiler warning, for explanation see
+	// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52661
+	NumberParser::tryParse64("-9223372036854775807", val1);
+	NumberParser::tryParse64("9223372036854775807", val2);
+	assertTrue (val1 == -9223372036854775807LL);
+	assertTrue (val2 == 9223372036854775807LL);
+	int i;
+	assertFalse (NumberParser::tryParse("-9223372036854775807", i));
+	assertFalse (NumberParser::tryParse("9223372036854775807", i));
 }
 
 
@@ -257,7 +270,7 @@ void NumberParserTest::testParseError()
 		NumberParser::parseHex("23z");
 		failmsg("must throw SyntaxException");
 	} catch (SyntaxException&) { }
-	
+
 #if defined(POCO_HAVE_INT64)
 
 	try
@@ -283,7 +296,7 @@ void NumberParserTest::testParseError()
 		NumberParser::parseHex64("12345z");
 		failmsg("must throw SyntaxException");
 	} catch (SyntaxException&) { }
-	
+
 	try
 	{
 		NumberParser::parseHex64(format("123%c45", ts));
@@ -300,6 +313,13 @@ void NumberParserTest::testParseError()
 	} catch (SyntaxException&) { }
 
 #endif // POCO_NO_FPENVIRONMENT
+
+	try
+	{
+		const char test[] = { char(-23), char(-108), char(-103), char(-24), char(-81), char(-81), 0 };
+		Poco::NumberParser::parse(test);
+		failmsg("must throw SyntaxException");
+	} catch (SyntaxException&) { }
 }
 
 
diff --git a/Foundation/testsuite/src/PBKDF2EngineTest.cpp b/Foundation/testsuite/src/PBKDF2EngineTest.cpp
index 12848ec73..d75a37b3d 100644
--- a/Foundation/testsuite/src/PBKDF2EngineTest.cpp
+++ b/Foundation/testsuite/src/PBKDF2EngineTest.cpp
@@ -35,20 +35,20 @@ PBKDF2EngineTest::~PBKDF2EngineTest()
 void PBKDF2EngineTest::testPBKDF2a()
 {
 	// test vector 1 from RFC 6070
-	
+
 	std::string p("password");
 	std::string s("salt");
 	PBKDF2Engine<HMACEngine<SHA1Engine> > pbkdf2(s, 1, 20);
 	pbkdf2.update(p);
 	std::string dk = DigestEngine::digestToHex(pbkdf2.digest());
-	assertTrue (dk == "0c60c80f961f0e71f3a9b524af6012062fe037a6"); 
+	assertTrue (dk == "0c60c80f961f0e71f3a9b524af6012062fe037a6");
 }
 
 
 void PBKDF2EngineTest::testPBKDF2b()
 {
 	// test vector 2 from RFC 6070
-	
+
 	std::string p("password");
 	std::string s("salt");
 	PBKDF2Engine<HMACEngine<SHA1Engine> > pbkdf2(s, 2, 20);
@@ -61,7 +61,7 @@ void PBKDF2EngineTest::testPBKDF2b()
 void PBKDF2EngineTest::testPBKDF2c()
 {
 	// test vector 3 from RFC 6070
-	
+
 	std::string p("password");
 	std::string s("salt");
 	PBKDF2Engine<HMACEngine<SHA1Engine> > pbkdf2(s, 4096, 20);
@@ -86,7 +86,7 @@ void PBKDF2EngineTest::testPBKDF2d()
 void PBKDF2EngineTest::testPBKDF2e()
 {
 	// test vector 5 from RFC 6070
-	
+
 	std::string p("passwordPASSWORDpassword");
 	std::string s("saltSALTsaltSALTsaltSALTsaltSALTsalt");
 	PBKDF2Engine<HMACEngine<SHA1Engine> > pbkdf2(s, 4096, 25);
@@ -99,7 +99,7 @@ void PBKDF2EngineTest::testPBKDF2e()
 void PBKDF2EngineTest::testPBKDF2f()
 {
 	// test vector 6 from RFC 6070
-	
+
 	std::string p("pass\0word", 9);
 	std::string s("sa\0lt", 5);
 	PBKDF2Engine<HMACEngine<SHA1Engine> > pbkdf2(s, 4096, 16);
diff --git a/Foundation/testsuite/src/PatternFormatterTest.cpp b/Foundation/testsuite/src/PatternFormatterTest.cpp
index ef8ab1885..fbf264db6 100644
--- a/Foundation/testsuite/src/PatternFormatterTest.cpp
+++ b/Foundation/testsuite/src/PatternFormatterTest.cpp
@@ -44,12 +44,12 @@ void PatternFormatterTest::testPatternFormatter()
 	msg.setTime(DateTime(2005, 1, 1, 14, 30, 15, 500).timestamp());
 	msg.setSourceFile(__FILE__);
 	msg["testParam"] = "Test Parameter";
-	
+
 	std::string result;
 	fmt.setProperty("pattern", "%Y-%m-%dT%H:%M:%S [%s] %p: %t");
 	fmt.format(msg, result);
 	assertTrue (result == "2005-01-01T14:30:15 [TestSource] Error: Test message text");
-	
+
 	result.clear();
 	fmt.setProperty("pattern", "%w, %e %b %y %H:%M:%S.%i [%s:%I:%T] %q: %t");
 	fmt.format(msg, result);
@@ -60,14 +60,14 @@ void PatternFormatterTest::testPatternFormatter()
 	fmt.format(msg, result);
 	assertTrue (result.find("2005-01-01 14:30:15 [") == 0);
 	assertTrue (result.find(":TestSource]3-Test message text") != std::string::npos);
-	
+
 	result.clear();
 	assertTrue (fmt.getProperty("times") == "UTC");
 	fmt.setProperty("times", "local");
 	fmt.format(msg, result);
 	assertTrue (result.find("2005-01-01 ") == 0);
 	assertTrue (result.find(":TestSource]3-Test message text") != std::string::npos);
-	
+
 	result.clear();
 	fmt.setProperty("pattern", "%[testParam]");
 	fmt.format(msg, result);
diff --git a/Foundation/testsuite/src/PriorityEventTest.h b/Foundation/testsuite/src/PriorityEventTest.h
index 55de9415d..480be768a 100644
--- a/Foundation/testsuite/src/PriorityEventTest.h
+++ b/Foundation/testsuite/src/PriorityEventTest.h
@@ -71,7 +71,7 @@ protected:
 
 	int getCount() const;
 private:
-	int		_count;
+	std::atomic<int> _count;
 };
 
 
diff --git a/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp b/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp
index 0c8c62582..0bf3fcc61 100644
--- a/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp
+++ b/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp
@@ -25,7 +25,7 @@ using Poco::Thread;
 using Poco::RunnableAdapter;
 
 
-namespace 
+namespace
 {
 	class QTestNotification: public Notification
 	{
@@ -72,7 +72,7 @@ void PriorityNotificationQueueTest::testQueueDequeue()
 	assertTrue (queue.empty());
 	assertTrue (queue.size() == 0);
 	pNf->release();
-	
+
 	queue.enqueueNotification(new QTestNotification("first"), 1);
 	queue.enqueueNotification(new QTestNotification("fourth"), 4);
 	queue.enqueueNotification(new QTestNotification("third"), 3);
@@ -137,11 +137,11 @@ void PriorityNotificationQueueTest::testWaitDequeue()
 void PriorityNotificationQueueTest::testThreads()
 {
 	const int NOTIFICATION_COUNT = 5000;
-	
+
 	Thread t1("thread1");
 	Thread t2("thread2");
 	Thread t3("thread3");
-	
+
 	RunnableAdapter<PriorityNotificationQueueTest> ra(*this, &PriorityNotificationQueueTest::work);
 	t1.start(ra);
 	t2.start(ra);
diff --git a/Foundation/testsuite/src/ProcessTest.cpp b/Foundation/testsuite/src/ProcessTest.cpp
index cac8718e8..2bb97e909 100644
--- a/Foundation/testsuite/src/ProcessTest.cpp
+++ b/Foundation/testsuite/src/ProcessTest.cpp
@@ -208,7 +208,7 @@ void ProcessTest::testLaunchArgs()
 			std::string expectedArg = args[argNumber];
 			if (expectedArg.npos != expectedArg.find("already quoted")) {
 				expectedArg = "already quoted \" \\";
-			} 
+			}
 			assertTrue (receivedArg == expectedArg);
 			++argNumber;
 			receivedArg = "";
diff --git a/Foundation/testsuite/src/RWLockTest.cpp b/Foundation/testsuite/src/RWLockTest.cpp
index d492473d6..98e7244e1 100644
--- a/Foundation/testsuite/src/RWLockTest.cpp
+++ b/Foundation/testsuite/src/RWLockTest.cpp
@@ -27,7 +27,7 @@ public:
 	RWLockRunnable(RWLock& lock, volatile int& counter): _lock(lock), _counter(counter), _ok(true)
 	{
 	}
-	
+
 	void run()
 	{
 		int lastCount = 0;
@@ -57,12 +57,12 @@ public:
 			_lock.unlock();
 		}
 	}
-	
+
 	bool ok() const
 	{
 		return _ok;
 	}
-	
+
 private:
 	RWLock& _lock;
 	volatile int& _counter;
@@ -76,7 +76,7 @@ public:
 	RWTryLockRunnable(RWLock& lock, volatile int& counter): _lock(lock), _counter(counter), _ok(true)
 	{
 	}
-	
+
 	void run()
 	{
 		int lastCount = 0;
@@ -106,12 +106,12 @@ public:
 			_lock.unlock();
 		}
 	}
-	
+
 	bool ok() const
 	{
 		return _ok;
 	}
-	
+
 private:
 	RWLock& _lock;
 	volatile int& _counter;
diff --git a/Foundation/testsuite/src/RandomStreamTest.cpp b/Foundation/testsuite/src/RandomStreamTest.cpp
index 73ba555e4..286e092b3 100644
--- a/Foundation/testsuite/src/RandomStreamTest.cpp
+++ b/Foundation/testsuite/src/RandomStreamTest.cpp
@@ -32,7 +32,7 @@ RandomStreamTest::~RandomStreamTest()
 void RandomStreamTest::testStream()
 {
 	RandomInputStream rnd;
-	
+
 	const int n = 16;
 	std::vector<int> d(n, 0);
 	for (int i = 0; i < 1000; ++i)
@@ -49,7 +49,7 @@ void RandomStreamTest::testStream()
 	for (int k = 0; k < n; ++k) var += (d[k] - avg)*(d[k] - avg);
 	var /= n;
 	int sd = int(std::sqrt((double) var));
-	
+
 	assertTrue (110 < avg && avg < 140);
 	assertTrue (sd < 20);
 }
diff --git a/Foundation/testsuite/src/RandomTest.cpp b/Foundation/testsuite/src/RandomTest.cpp
index 0d9ba5aed..39d5259de 100644
--- a/Foundation/testsuite/src/RandomTest.cpp
+++ b/Foundation/testsuite/src/RandomTest.cpp
@@ -48,8 +48,8 @@ void RandomTest::testSequence2()
 	Poco::Random rnd2;
 	rnd1.seed(12345);
 	rnd2.seed(54321);
-	
-	bool equals = true;	
+
+	bool equals = true;
 	for (int i = 0; i < 20; ++i)
 	{
 		if (rnd1.next() != rnd2.next())
@@ -74,7 +74,7 @@ void RandomTest::testDistribution1()
 	}
 	int sum = 0;
 	for (int k = 0; k < n; ++k) sum += d[k];
-	
+
 	assertTrue (sum == n);
 }
 
@@ -96,7 +96,7 @@ void RandomTest::testDistribution2()
 	for (int k = 0; k < n; ++k) var += (d[k] - avg)*(d[k] - avg);
 	var /= n;
 	int sd = int(std::sqrt((double) var));
-	
+
 	assertTrue (95 < avg && avg < 105);
 	assertTrue (sd < 15);
 }
@@ -119,7 +119,7 @@ void RandomTest::testDistribution3()
 	for (int k = 0; k < n; ++k) var += (d[k] - avg)*(d[k] - avg);
 	var /= n;
 	int sd = int(std::sqrt((double) var));
-	
+
 	assertTrue (95 < avg && avg < 105);
 	assertTrue (sd < 15);
 }
diff --git a/Foundation/testsuite/src/RandomTest.h b/Foundation/testsuite/src/RandomTest.h
index ab5a3f887..7250c50bb 100644
--- a/Foundation/testsuite/src/RandomTest.h
+++ b/Foundation/testsuite/src/RandomTest.h
@@ -29,7 +29,7 @@ public:
 	void testDistribution1();
 	void testDistribution2();
 	void testDistribution3();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Foundation/testsuite/src/SHA2EngineTest.cpp b/Foundation/testsuite/src/SHA2EngineTest.cpp
index 90ec4a5e7..0ba0c64d3 100644
--- a/Foundation/testsuite/src/SHA2EngineTest.cpp
+++ b/Foundation/testsuite/src/SHA2EngineTest.cpp
@@ -36,6 +36,9 @@ void SHA2EngineTest::testSHA224()
 {
 	SHA2Engine engine(SHA2Engine::SHA_224);
 
+	engine.update("");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f");
+
 	engine.update("abc");
 	assertTrue (DigestEngine::digestToHex(engine.digest()) == "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7");
 
@@ -55,6 +58,9 @@ void SHA2EngineTest::testSHA256()
 {
 	SHA2Engine engine(SHA2Engine::SHA_256);
 
+	engine.update("");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
+
 	engine.update("abc");
 	assertTrue (DigestEngine::digestToHex(engine.digest()) == "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad");
 
@@ -74,6 +80,9 @@ void SHA2EngineTest::testSHA384()
 {
 	SHA2Engine engine(SHA2Engine::SHA_384);
 
+	engine.update("");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b");
+
 	engine.update("abc");
 	assertTrue (DigestEngine::digestToHex(engine.digest()) == "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7");
 
@@ -93,6 +102,9 @@ void SHA2EngineTest::testSHA512()
 {
 	SHA2Engine engine(SHA2Engine::SHA_512);
 
+	engine.update("");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e");
+
 	engine.update("abc");
 	assertTrue (DigestEngine::digestToHex(engine.digest()) == "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f");
 
@@ -107,6 +119,47 @@ void SHA2EngineTest::testSHA512()
 	assertTrue (DigestEngine::digestToHex(engine.digest()) == "e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973ebde0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b");
 }
 
+void SHA2EngineTest::testSHA512_224()
+{
+	SHA2Engine engine(SHA2Engine::SHA_512_224);
+
+	engine.update("");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "6ed0dd02806fa89e25de060c19d3ac86cabb87d6a0ddd05c333b84f4");
+
+	engine.update("abc");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "4634270f707b6a54daae7530460842e20e37ed265ceee9a43e8924aa");
+
+	engine.update("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "e5302d6d54bb242275d1e7622d68df6eb02dedd13f564c13dbda2174");
+
+	engine.update("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "23fec5bb94d60b23308192640b0c453335d664734fe40e7268674af9");
+
+	for (int i = 0; i < 1000000; ++i)
+		engine.update('a');
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "37ab331d76f0d36de422bd0edeb22a28accd487b7a8453ae965dd287");
+}
+
+void SHA2EngineTest::testSHA512_256()
+{
+	SHA2Engine engine(SHA2Engine::SHA_512_256);
+
+	engine.update("");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "c672b8d1ef56ed28ab87c3622c5114069bdd3ad7b8f9737498d0c01ecef0967a");
+
+	engine.update("abc");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "53048e2681941ef99b2e29b76b4c7dabe4c2d0c634fc6d46e0e2f13107e7af23");
+
+	engine.update("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "bde8e1f9f19bb9fd3406c90ec6bc47bd36d8ada9f11880dbc8a22a7078b6a461");
+
+	engine.update("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu");
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "3928e184fb8690f840da3988121d31be65cb9d3ef83ee6146feac861e19b563a");
+
+	for (int i = 0; i < 1000000; ++i)
+		engine.update('a');
+	assertTrue (DigestEngine::digestToHex(engine.digest()) == "9a59a052930187a97038cae692f30708aa6491923ef5194394dc68d56c74fb21");
+}
 
 void SHA2EngineTest::setUp()
 {
@@ -126,6 +179,7 @@ CppUnit::Test* SHA2EngineTest::suite()
 	CppUnit_addTest(pSuite, SHA2EngineTest, testSHA256);
 	CppUnit_addTest(pSuite, SHA2EngineTest, testSHA384);
 	CppUnit_addTest(pSuite, SHA2EngineTest, testSHA512);
-
+	CppUnit_addTest(pSuite, SHA2EngineTest, testSHA512_224);
+	CppUnit_addTest(pSuite, SHA2EngineTest, testSHA512_256);
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/SHA2EngineTest.h b/Foundation/testsuite/src/SHA2EngineTest.h
index b1a8bf326..ffd795878 100644
--- a/Foundation/testsuite/src/SHA2EngineTest.h
+++ b/Foundation/testsuite/src/SHA2EngineTest.h
@@ -28,6 +28,8 @@ public:
 	void testSHA256();
 	void testSHA384();
 	void testSHA512();
+	void testSHA512_224();
+	void testSHA512_256();
 
 	void setUp();
 	void tearDown();
diff --git a/Foundation/testsuite/src/SemaphoreTest.cpp b/Foundation/testsuite/src/SemaphoreTest.cpp
index e6f958fa7..4537e9b7c 100644
--- a/Foundation/testsuite/src/SemaphoreTest.cpp
+++ b/Foundation/testsuite/src/SemaphoreTest.cpp
@@ -29,28 +29,28 @@ public:
 	SemaRunnable(int n, int max): _ran(false), _sema(n, max)
 	{
 	}
-	
+
 	void run()
 	{
 		_sema.wait();
 		_ran = true;
 	}
-	
+
 	bool ran() const
 	{
 		return _ran;
 	}
-	
+
 	void set()
 	{
 		_sema.set();
 	}
-	
+
 	void wait()
 	{
 		_sema.wait();
 	}
-	
+
 	void wait(long milliseconds)
 	{
 		_sema.wait(milliseconds);
@@ -60,7 +60,7 @@ public:
 	{
 		return _sema.tryWait(milliseconds);
 	}
-	
+
 private:
 	bool _ran;
 	Semaphore _sema;
@@ -100,7 +100,7 @@ void SemaphoreTest::testInitZero()
 	assertTrue (r.tryWait(0));
 	r.wait();
 	assertTrue (!r.tryWait(10));
-	
+
 	Thread t;
 	t.start(r);
 	Thread::sleep(100);
diff --git a/Foundation/testsuite/src/SharedLibraryTest.cpp b/Foundation/testsuite/src/SharedLibraryTest.cpp
index 8227d3444..4f6c70f63 100644
--- a/Foundation/testsuite/src/SharedLibraryTest.cpp
+++ b/Foundation/testsuite/src/SharedLibraryTest.cpp
@@ -48,7 +48,7 @@ void SharedLibraryTest::testSharedLibrary1()
 	assertTrue (sl.hasSymbol("pocoUninitializeLibrary"));
 	assertTrue (sl.hasSymbol("gimmeFive"));
 	assertTrue (!sl.hasSymbol("fooBar123"));
-	
+
 	void* p1 = sl.getSymbol("pocoBuildManifest");
 	assertNotNullPtr(p1);
 	try
@@ -78,7 +78,7 @@ void SharedLibraryTest::testSharedLibrary2()
 
 	GimmeFiveFunc gimmeFive = (GimmeFiveFunc) sl.getSymbol("gimmeFive");
 	assertTrue (gimmeFive() == 5);
-	
+
 	sl.unload();
 	assertTrue (!sl.isLoaded());
 }
@@ -107,7 +107,7 @@ void SharedLibraryTest::testSharedLibrary3()
 	path.append(SharedLibrary::suffix());
 	sl.load(path);
 	assertTrue (sl.isLoaded());
-	
+
 	try
 	{
 		sl.load(path);
diff --git a/Foundation/testsuite/src/SharedMemoryTest.cpp b/Foundation/testsuite/src/SharedMemoryTest.cpp
index c1a9b86fa..bc077b7f8 100644
--- a/Foundation/testsuite/src/SharedMemoryTest.cpp
+++ b/Foundation/testsuite/src/SharedMemoryTest.cpp
@@ -67,7 +67,7 @@ Poco::Path SharedMemoryTest::findDataFile(const std::string& afile)
 	Poco::File aFile(result.toString());
 	if (!aFile.exists() || (aFile.exists() && !aFile.isFile()))
 		throw Poco::FileNotFoundException("Didn't find file " + afile);
-	
+
 	return result;
 }
 
diff --git a/Foundation/testsuite/src/StopwatchTest.cpp b/Foundation/testsuite/src/StopwatchTest.cpp
index 9aa05c537..7718ee8ae 100644
--- a/Foundation/testsuite/src/StopwatchTest.cpp
+++ b/Foundation/testsuite/src/StopwatchTest.cpp
@@ -38,11 +38,11 @@ void StopwatchTest::testStopwatch()
 	Thread::sleep(200);
 	sw.stop();
 	Timestamp::TimeDiff d = sw.elapsed();
-	assertTrue (d >= 180000 && d <= 300000);	
-	sw.start();	
+	assertTrue (d >= 180000 && d <= 300000);
+	sw.start();
 	Thread::sleep(100);
 	d = sw.elapsed();
-	assertTrue (d >= 280000 && d <= 400000);	
+	assertTrue (d >= 280000 && d <= 400000);
 	Thread::sleep(100);
 	sw.stop();
 	d = sw.elapsed();
@@ -52,7 +52,7 @@ void StopwatchTest::testStopwatch()
 	Thread::sleep(200);
 	sw.stop();
 	d = sw.elapsed();
-	assertTrue (d >= 180000 && d <= 300000);	
+	assertTrue (d >= 180000 && d <= 300000);
 }
 
 
diff --git a/Foundation/testsuite/src/StreamConverterTest.cpp b/Foundation/testsuite/src/StreamConverterTest.cpp
index 0775751dc..176ae3b6e 100644
--- a/Foundation/testsuite/src/StreamConverterTest.cpp
+++ b/Foundation/testsuite/src/StreamConverterTest.cpp
@@ -40,14 +40,14 @@ StreamConverterTest::~StreamConverterTest()
 void StreamConverterTest::testIdentityASCIIIn()
 {
 	ASCIIEncoding encoding;
-	
+
 	std::istringstream istr1("");
 	std::ostringstream ostr1;
 	InputStreamConverter converter1(istr1, encoding, encoding);
 	StreamCopier::copyStream(converter1, ostr1);
 	assertTrue (ostr1.str() == "");
 	assertTrue (converter1.errors() == 0);
-	
+
 	std::istringstream istr2("foo bar");
 	std::ostringstream ostr2;
 	InputStreamConverter converter2(istr2, encoding, encoding);
@@ -67,13 +67,13 @@ void StreamConverterTest::testIdentityASCIIIn()
 void StreamConverterTest::testIdentityASCIIOut()
 {
 	ASCIIEncoding encoding;
-	
+
 	std::ostringstream ostr1;
 	OutputStreamConverter converter1(ostr1, encoding, encoding);
 	converter1 << "";
 	assertTrue (ostr1.str() == "");
 	assertTrue (converter1.errors() == 0);
-	
+
 	std::ostringstream ostr2;
 	OutputStreamConverter converter2(ostr2, encoding, encoding);
 	converter2 << "foo bar";
@@ -91,14 +91,14 @@ void StreamConverterTest::testIdentityASCIIOut()
 void StreamConverterTest::testIdentityUTF8In()
 {
 	UTF8Encoding encoding;
-	
+
 	std::istringstream istr1("");
 	std::ostringstream ostr1;
 	InputStreamConverter converter1(istr1, encoding, encoding);
 	StreamCopier::copyStream(converter1, ostr1);
 	assertTrue (ostr1.str() == "");
 	assertTrue (converter1.errors() == 0);
-	
+
 	std::istringstream istr2("foo bar");
 	std::ostringstream ostr2;
 	InputStreamConverter converter2(istr2, encoding, encoding);
@@ -112,7 +112,7 @@ void StreamConverterTest::testIdentityUTF8In()
 	StreamCopier::copyStream(converter3, ostr3);
 	assertTrue (ostr3.str() == "x");
 	assertTrue (converter3.errors() == 0);
-	
+
 	const unsigned char greek[] = {0x20, 0xce, 0xba, 0xe1, 0xbd, 0xb9, 0xcf, 0x83, 0xce, 0xbc, 0xce, 0xb5, 0x20, 0x00};
 	std::string text((const char*) greek);
 
@@ -140,13 +140,13 @@ void StreamConverterTest::testIdentityUTF8In()
 void StreamConverterTest::testIdentityUTF8Out()
 {
 	UTF8Encoding encoding;
-	
+
 	std::ostringstream ostr1;
 	OutputStreamConverter converter1(ostr1, encoding, encoding);
 	converter1 << "";
 	assertTrue (ostr1.str() == "");
 	assertTrue (converter1.errors() == 0);
-	
+
 	std::ostringstream ostr2;
 	OutputStreamConverter converter2(ostr2, encoding, encoding);
 	converter2 << "foo bar";
@@ -158,7 +158,7 @@ void StreamConverterTest::testIdentityUTF8Out()
 	converter3 << "x";
 	assertTrue (ostr3.str() == "x");
 	assertTrue (converter3.errors() == 0);
-	
+
 	const unsigned char greek[] = {0x20, 0xce, 0xba, 0xe1, 0xbd, 0xb9, 0xcf, 0x83, 0xce, 0xbc, 0xce, 0xb5, 0x20, 0x00};
 	std::string text((const char*) greek);
 
@@ -220,7 +220,7 @@ void StreamConverterTest::testLatin1toUTF8In()
 {
 	UTF8Encoding utf8Encoding;
 	Latin1Encoding latin1Encoding;
-	
+
 	const unsigned char latin1Chars[] = {'g', 252, 'n', 't', 'e', 'r', 0};
 	const unsigned char utf8Chars[]   = {'g', 195, 188, 'n', 't', 'e', 'r', 0};
 	std::string latin1Text((const char*) latin1Chars);
@@ -239,7 +239,7 @@ void StreamConverterTest::testLatin1toUTF8Out()
 {
 	UTF8Encoding utf8Encoding;
 	Latin1Encoding latin1Encoding;
-	
+
 	const unsigned char latin1Chars[] = {'g', 252, 'n', 't', 'e', 'r', 0};
 	const unsigned char utf8Chars[]   = {'g', 195, 188, 'n', 't', 'e', 'r', 0};
 	std::string latin1Text((const char*) latin1Chars);
@@ -260,7 +260,7 @@ void StreamConverterTest::testErrorsIn()
 
 	const unsigned char badChars[] = {'a', 'b', 255, 'c', 254, 0};
 	std::string badText((const char*) badChars);
-	
+
 	std::istringstream istr1(badText);
 	std::ostringstream ostr1;
 	InputStreamConverter converter1(istr1, utf8Encoding, latin1Encoding);
@@ -276,7 +276,7 @@ void StreamConverterTest::testErrorsOut()
 
 	const unsigned char badChars[] = {'a', 'b', 255, 'c', 254, 0};
 	std::string badText((const char*) badChars);
-	
+
 	std::ostringstream ostr1;
 	OutputStreamConverter converter1(ostr1, utf8Encoding, latin1Encoding);
 	converter1 << badText;
diff --git a/Foundation/testsuite/src/StreamTokenizerTest.cpp b/Foundation/testsuite/src/StreamTokenizerTest.cpp
index a13d3312d..d794da58e 100644
--- a/Foundation/testsuite/src/StreamTokenizerTest.cpp
+++ b/Foundation/testsuite/src/StreamTokenizerTest.cpp
@@ -31,7 +31,7 @@ public:
 	IdentifierToken()
 	{
 	}
-	
+
 	~IdentifierToken()
 	{
 	}
@@ -40,7 +40,7 @@ public:
 	{
 		return Token::IDENTIFIER_TOKEN;
 	}
-	
+
 	bool start(char c, std::istream& istr)
 	{
 		if (c != -1 && Ascii::isAlpha(c))
@@ -50,7 +50,7 @@ public:
 		}
 		else return false;
 	}
-	
+
 	void finish(std::istream& istr)
 	{
 		int c = istr.peek();
@@ -70,7 +70,7 @@ public:
 	IntLiteralToken()
 	{
 	}
-	
+
 	~IntLiteralToken()
 	{
 	}
@@ -79,7 +79,7 @@ public:
 	{
 		return Token::INTEGER_LITERAL_TOKEN;
 	}
-	
+
 	bool start(char c, std::istream& istr)
 	{
 		if (c != -1 && Ascii::isDigit(c))
@@ -89,7 +89,7 @@ public:
 		}
 		else return false;
 	}
-	
+
 	void finish(std::istream& istr)
 	{
 		int c = istr.peek();
@@ -121,7 +121,7 @@ void StreamTokenizerTest::testTokenizer1()
 	tokenizer.addToken(new WhitespaceToken());
 	tokenizer.addToken(new IdentifierToken());
 	tokenizer.addToken(new IntLiteralToken());
-	
+
 	const Token* next = tokenizer.next();
 	assertTrue (next->tokenClass() == Token::EOF_TOKEN);
 }
@@ -135,11 +135,11 @@ void StreamTokenizerTest::testTokenizer2()
 	tokenizer.addToken(new WhitespaceToken());
 	tokenizer.addToken(new IdentifierToken());
 	tokenizer.addToken(new IntLiteralToken());
-	
+
 	const Token* next = tokenizer.next();
 	assertTrue (next->tokenClass() == Token::IDENTIFIER_TOKEN);
 	assertTrue (next->tokenString() == "foo");
-	
+
 	next = tokenizer.next();
 	assertTrue (next->tokenClass() == Token::EOF_TOKEN);
 }
@@ -153,7 +153,7 @@ void StreamTokenizerTest::testTokenizer3()
 	tokenizer.addToken(new WhitespaceToken());
 	tokenizer.addToken(new IdentifierToken());
 	tokenizer.addToken(new IntLiteralToken());
-	
+
 	const Token* next = tokenizer.next();
 	assertTrue (next->tokenClass() == Token::IDENTIFIER_TOKEN);
 	assertTrue (next->tokenString() == "foo");
@@ -175,7 +175,7 @@ void StreamTokenizerTest::testTokenizer4()
 	tokenizer.addToken(new WhitespaceToken());
 	tokenizer.addToken(new IdentifierToken());
 	tokenizer.addToken(new IntLiteralToken());
-	
+
 	const Token* next = tokenizer.next();
 	assertTrue (next->tokenClass() == Token::IDENTIFIER_TOKEN);
 	assertTrue (next->tokenString() == "foo");
@@ -197,7 +197,7 @@ void StreamTokenizerTest::testTokenizer5()
 	tokenizer.addToken(new WhitespaceToken());
 	tokenizer.addToken(new IdentifierToken());
 	tokenizer.addToken(new IntLiteralToken());
-	
+
 	const Token* next = tokenizer.next();
 	assertTrue (next->tokenClass() == Token::IDENTIFIER_TOKEN);
 	assertTrue (next->tokenString() == "foo");
@@ -223,7 +223,7 @@ void StreamTokenizerTest::testTokenizer6()
 	tokenizer.addToken(new WhitespaceToken());
 	tokenizer.addToken(new IdentifierToken());
 	tokenizer.addToken(new IntLiteralToken());
-	
+
 	const Token* next = tokenizer.next();
 	assertTrue (next->tokenClass() == Token::IDENTIFIER_TOKEN);
 	assertTrue (next->tokenString() == "foo");
@@ -249,7 +249,7 @@ void StreamTokenizerTest::testTokenizer7()
 	tokenizer.addToken(new WhitespaceToken());
 	tokenizer.addToken(new IdentifierToken());
 	tokenizer.addToken(new IntLiteralToken());
-	
+
 	const Token* next = tokenizer.next();
 	assertTrue (next->tokenClass() == Token::IDENTIFIER_TOKEN);
 	assertTrue (next->tokenString() == "foo");
diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp
index f64298d6f..6e5e003a5 100644
--- a/Foundation/testsuite/src/StringTest.cpp
+++ b/Foundation/testsuite/src/StringTest.cpp
@@ -70,6 +70,7 @@ using Poco::MemoryInputStream;
 using Poco::Stopwatch;
 using Poco::RangeException;
 using Poco::isIntOverflow;
+using Poco::safeMultiply;
 using Poco::isSafeIntCast;
 using Poco::safeIntCast;
 using Poco::FPEnvironment;
@@ -915,121 +916,6 @@ void StringTest::testNumericLocale()
 }
 
 
-void StringTest::benchmarkStrToInt()
-{
-	Poco::Stopwatch sw;
-	std::string num = "123456789";
-	int res;
-	sw.start();
-	for (int i = 0; i < 1000000; ++i) parseStream(num, res);
-	sw.stop();
-	std::cout << "parseStream Number: " << res << std::endl;
-	double timeStream = sw.elapsed() / 1000.0;
-
-	char* pC = 0;
-	sw.restart();
-	for (int i = 0; i < 1000000; ++i) res = std::strtol(num.c_str(), &pC, 10);
-	sw.stop();
-	std::cout << "std::strtol Number: " << res << std::endl;
-	double timeStrtol = sw.elapsed() / 1000.0;
-
-	sw.restart();
-	for (int i = 0; i < 1000000; ++i) strToInt(num.c_str(), res, 10);
-	sw.stop();
-	std::cout << "strToInt Number: " << res << std::endl;
-	double timeStrToInt = sw.elapsed() / 1000.0;
-
-	sw.restart();
-	for (int i = 0; i < 1000000; ++i) std::sscanf(num.c_str(), "%d", &res);
-	sw.stop();
-	std::cout << "sscanf Number: " << res << std::endl;
-	double timeScanf = sw.elapsed() / 1000.0;
-
-	int graph;
-	std::cout << std::endl << "Timing and speedup relative to I/O stream:" << std::endl << std::endl;
-	std::cout << std::setw(14) << "Stream:\t" << std::setw(10) << std::setfill(' ') << timeStream << "[ms]" << std::endl;
-
-	std::cout << std::setw(14) << "std::strtol:\t" << std::setw(10) << std::setfill(' ') << timeStrtol << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStrtol) << '\t' ;
-	graph = (int) (timeStream / timeStrtol); for (int i = 0; i < graph; ++i) std::cout << '|';
-
-	std::cout << std::endl << std::setw(14) << "strToInt:\t" << std::setw(10) << std::setfill(' ') << timeStrToInt << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStrToInt) << '\t' ;
-	graph = (int) (timeStream / timeStrToInt); for (int i = 0; i < graph; ++i) std::cout << '|';
-
-	std::cout << std::endl << std::setw(14) << "std::sscanf:\t" << std::setw(10) << std::setfill(' ')  << timeScanf << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeScanf) << '\t' ;
-	graph = (int) (timeStream / timeScanf); for (int i = 0; i < graph; ++i) std::cout << '|';
-	std::cout << std::endl;
-}
-
-
-void StringTest::benchmarkStrToFloat()
-{
-	Poco::Stopwatch sw;
-	std::string num = "1.0372157551632929e-112";
-	std::cout << "The Number: " << num << std::endl;
-	double res;
-	sw.start();
-	for (int i = 0; i < 1000000; ++i) parseStream(num, res);
-	sw.stop();
-	std::cout << "parseStream Number: " << std::setprecision(std::numeric_limits<double>::digits10) << res << std::endl;
-	double timeStream = sw.elapsed() / 1000.0;
-
-	// standard strtod
-	char* pC = 0;
-	sw.restart();
-	for (int i = 0; i < 1000000; ++i) res = std::strtod(num.c_str(), &pC);
-	sw.stop();
-	std::cout << "std::strtod Number: " << res << std::endl;
-	double timeStdStrtod = sw.elapsed() / 1000.0;
-
-	// POCO Way
-	sw.restart();
-	char ou = 0;
-	for (int i = 0; i < 1000000; ++i) strToDouble(num, res, ou);
-	sw.stop();
-	std::cout << "strToDouble Number: " << res << std::endl;
-	double timeStrToDouble = sw.elapsed() / 1000.0;
-
-	// standard sscanf
-	sw.restart();
-	for (int i = 0; i < 1000000; ++i) std::sscanf(num.c_str(), "%lf", &res);
-	sw.stop();
-	std::cout << "sscanf Number: " << res << std::endl;
-	double timeScanf = sw.elapsed() / 1000.0;
-
-	// double-conversion Strtod
-	sw.restart();
-	for (int i = 0; i < 1000000; ++i) strToDouble(num.c_str());
-	sw.stop();
-	std::cout << "Strtod Number: " << res << std::endl;
-	double timeStrtod = sw.elapsed() / 1000.0;
-
-	int graph;
-	std::cout << std::endl << "Timing and speedup relative to I/O stream:" << std::endl << std::endl;
-	std::cout << std::setw(14) << "Stream:\t" << std::setw(10) << std::setfill(' ') << std::setprecision(4) << timeStream << "[ms]" << std::endl;
-
-	std::cout << std::setw(14) << "std::strtod:\t" << std::setw(10) << std::setfill(' ') << timeStdStrtod << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStdStrtod) << '\t' ;
-	graph = (int) (timeStream / timeStdStrtod); for (int i = 0; i < graph; ++i) std::cout << '#';
-
-	std::cout << std::endl << std::setw(14) << "strToDouble:\t" << std::setw(10) << std::setfill(' ') << timeStrToDouble << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStrToDouble) << '\t' ;
-	graph = (int) (timeStream / timeStrToDouble); for (int i = 0; i < graph; ++i) std::cout << '#';
-
-	std::cout << std::endl << std::setw(14) << "std::sscanf:\t" << std::setw(10) << std::setfill(' ')  << timeScanf << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeScanf) << '\t' ;
-	graph = (int) (timeStream / timeScanf); for (int i = 0; i < graph; ++i) std::cout << '#';
-
-	std::cout << std::endl << std::setw(14) << "StrtoD:\t" << std::setw(10) << std::setfill(' ')  << timeScanf << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStrtod) << '\t' ;
-	graph = (int) (timeStream / timeStrtod); for (int i = 0; i < graph; ++i) std::cout << '#';
-
-	std::cout << std::endl;
-}
-
-
 void StringTest::testIntToString()
 {
 	//intToStr(T number, unsigned short base, std::string& result, bool prefix = false, int width = -1, char fill = ' ', char thSep = 0)
@@ -1325,6 +1211,15 @@ void StringTest::testNumericStringLimit()
 	numericStringLowerLimit<int16_t, int8_t>();
 	numericStringLowerLimit<int32_t, int16_t>();
 	numericStringLowerLimit<int64_t, int32_t>();
+
+	multiplyOverflow<int8_t>();
+	multiplyOverflow<uint8_t>();
+	multiplyOverflow<int16_t>();
+	multiplyOverflow<uint16_t>();
+	multiplyOverflow<int32_t>();
+	multiplyOverflow<uint32_t>();
+	multiplyOverflow<int64_t>();
+	multiplyOverflow<uint64_t>();
 }
 
 
@@ -1348,63 +1243,6 @@ void formatSprintf(double value, std::string& str)
 }
 
 
-void StringTest::benchmarkFloatToStr()
-{
-	Poco::Stopwatch sw;
-	double val = 1.0372157551632929e-112;
-	std::cout << "The Number: " << std::setprecision(std::numeric_limits<double>::digits10) << val << std::endl;
-	std::string str;
-	sw.start();
-	for (int i = 0; i < 1000000; ++i) formatStream(val, str);
-	sw.stop();
-	std::cout << "formatStream Number: " << str << std::endl;
-	double timeStream = sw.elapsed() / 1000.0;
-
-	// standard sprintf
-	str = "";
-	sw.restart();
-	for (int i = 0; i < 1000000; ++i) formatSprintf(val, str);
-	sw.stop();
-	std::cout << "std::sprintf Number: " << str << std::endl;
-	double timeSprintf = sw.elapsed() / 1000.0;
-
-	// POCO Way (via double-conversion)
-	// no padding
-	sw.restart();
-	char buffer[POCO_MAX_FLT_STRING_LEN];
-	for (int i = 0; i < 1000000; ++i) doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, val);
-	sw.stop();
-	std::cout << "doubleToStr(char) Number: " << buffer << std::endl;
-	double timeDoubleToStrChar = sw.elapsed() / 1000.0;
-
-	// with padding
-	str = "";
-	sw.restart();
-	for (int i = 0; i < 1000000; ++i) doubleToStr(str, val);
-	sw.stop();
-	std::cout << "doubleToStr(std::string) Number: " << str << std::endl;
-	double timeDoubleToStrString = sw.elapsed() / 1000.0;
-
-	int graph;
-	std::cout << std::endl << "Timing and speedup relative to I/O stream:" << std::endl << std::endl;
-	std::cout << std::setw(14) << "Stream:\t" << std::setw(10) << std::setfill(' ') << std::setprecision(4) << timeStream << "[ms]" << std::endl;
-
-	std::cout << std::setw(14) << "sprintf:\t" << std::setw(10) << std::setfill(' ') << timeSprintf << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeSprintf) << '\t' ;
-	graph = (int) (timeStream / timeSprintf); for (int i = 0; i < graph; ++i) std::cout << '#';
-
-	std::cout << std::endl << std::setw(14) << "doubleToChar:\t" << std::setw(10) << std::setfill(' ') << timeDoubleToStrChar << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeDoubleToStrChar) << '\t' ;
-	graph = (int) (timeStream / timeDoubleToStrChar); for (int i = 0; i < graph; ++i) std::cout << '#';
-
-	std::cout << std::endl << std::setw(14) << "doubleToString:\t" << std::setw(10) << std::setfill(' ') << timeDoubleToStrString << "[ms]" <<
-	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeDoubleToStrString) << '\t' ;
-	graph = (int) (timeStream / timeDoubleToStrString); for (int i = 0; i < graph; ++i) std::cout << '#';
-
-	std::cout << std::endl;
-}
-
-
 void StringTest::testJSONString()
 {
 	assertTrue (toJSON("\\", false) == "\\\\");
@@ -1471,6 +1309,201 @@ void StringTest::testJSONString()
 }
 
 
+
+void StringTest::conversionBenchmarks()
+{
+	std::cout << std::endl << "===================" << std::endl;
+	benchmarkFloatToStr();
+	std::cout << "===================" << std::endl << std::endl;
+	std::cout << "===================" << std::endl;
+	benchmarkStrToFloat();
+	std::cout << "===================" << std::endl << std::endl;
+	std::cout << "===================" << std::endl;
+	benchmarkStrToInt();
+	std::cout << "===================" << std::endl << std::endl;
+}
+
+
+void StringTest::benchmarkFloatToStr()
+{
+	Poco::Stopwatch sw;
+	double val = 1.0372157551632929e-112;
+	std::cout << "The Number: " << std::setprecision(std::numeric_limits<double>::digits10) << val << std::endl;
+	std::string str;
+	sw.start();
+	for (int i = 0; i < 1000000; ++i) formatStream(val, str);
+	sw.stop();
+	std::cout << "formatStream Number: " << str << std::endl;
+	double timeStream = sw.elapsed() / 1000.0;
+
+	// standard sprintf
+	str = "";
+	sw.restart();
+	for (int i = 0; i < 1000000; ++i) formatSprintf(val, str);
+	sw.stop();
+	std::cout << "std::sprintf Number: " << str << std::endl;
+	double timeSprintf = sw.elapsed() / 1000.0;
+
+	// POCO Way (via double-conversion)
+	// no padding
+	sw.restart();
+	char buffer[POCO_MAX_FLT_STRING_LEN];
+	for (int i = 0; i < 1000000; ++i) doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, val);
+	sw.stop();
+	std::cout << "doubleToStr(char) Number: " << buffer << std::endl;
+	double timeDoubleToStrChar = sw.elapsed() / 1000.0;
+
+	// with padding
+	str = "";
+	sw.restart();
+	for (int i = 0; i < 1000000; ++i) doubleToStr(str, val);
+	sw.stop();
+	std::cout << "doubleToStr(std::string) Number: " << str << std::endl;
+	double timeDoubleToStrString = sw.elapsed() / 1000.0;
+
+	int graph;
+	std::cout << std::endl << "Timing and speedup relative to I/O stream:" << std::endl << std::endl;
+	std::cout << std::setw(14) << "Stream:\t" << std::setw(10) << std::setfill(' ') << std::setprecision(4) << timeStream << "[ms]" << std::endl;
+
+	std::cout << std::setw(14) << "sprintf:\t" << std::setw(10) << std::setfill(' ') << timeSprintf << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeSprintf) << '\t' ;
+	graph = (int) (timeStream / timeSprintf); for (int i = 0; i < graph; ++i) std::cout << '#';
+
+	std::cout << std::endl << std::setw(14) << "doubleToChar:\t" << std::setw(10) << std::setfill(' ') << timeDoubleToStrChar << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeDoubleToStrChar) << '\t' ;
+	graph = (int) (timeStream / timeDoubleToStrChar); for (int i = 0; i < graph; ++i) std::cout << '#';
+
+	std::cout << std::endl << std::setw(14) << "doubleToString:\t" << std::setw(10) << std::setfill(' ') << timeDoubleToStrString << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeDoubleToStrString) << '\t' ;
+	graph = (int) (timeStream / timeDoubleToStrString); for (int i = 0; i < graph; ++i) std::cout << '#';
+
+	std::cout << std::endl;
+}
+
+
+void StringTest::benchmarkStrToInt()
+{
+	Poco::Stopwatch sw;
+	std::string num = "123456789";
+	int res[4] = {};
+	sw.start();
+	for (int i = 0; i < 1000000; ++i) parseStream(num, res[0]);
+	sw.stop();
+	std::cout << "parseStream Number: " << res[0] << std::endl;
+	double timeStream = sw.elapsed() / 1000.0;
+
+	char* pC = 0;
+	sw.restart();
+	for (int i = 0; i < 1000000; ++i) res[1] = std::strtol(num.c_str(), &pC, 10);
+	sw.stop();
+	std::cout << "std::strtol Number: " << res[1] << std::endl;
+	double timeStrtol = sw.elapsed() / 1000.0;
+
+	sw.restart();
+	for (int i = 0; i < 1000000; ++i) strToInt(num.c_str(), res[2], 10);
+	sw.stop();
+	std::cout << "strToInt Number: " << res[2] << std::endl;
+	double timeStrToInt = sw.elapsed() / 1000.0;
+
+	sw.restart();
+	for (int i = 0; i < 1000000; ++i) std::sscanf(num.c_str(), "%d", &res[3]);
+	sw.stop();
+	std::cout << "sscanf Number: " << res[3] << std::endl;
+	double timeScanf = sw.elapsed() / 1000.0;
+
+	assertEqual (res[0], res[1]);
+	assertEqual (res[1], res[2]);
+	assertEqual (res[2], res[3]);
+
+	int graph;
+	std::cout << std::endl << "Timing and speedup relative to I/O stream:" << std::endl << std::endl;
+	std::cout << std::setw(14) << "Stream:\t" << std::setw(10) << std::setfill(' ') << timeStream << "[ms]" << std::endl;
+
+	std::cout << std::setw(14) << "std::strtol:\t" << std::setw(10) << std::setfill(' ') << timeStrtol << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStrtol) << '\t' ;
+	graph = (int) (timeStream / timeStrtol); for (int i = 0; i < graph; ++i) std::cout << '|';
+
+	std::cout << std::endl << std::setw(14) << "strToInt:\t" << std::setw(10) << std::setfill(' ') << timeStrToInt << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStrToInt) << '\t' ;
+	graph = (int) (timeStream / timeStrToInt); for (int i = 0; i < graph; ++i) std::cout << '|';
+
+	std::cout << std::endl << std::setw(14) << "std::sscanf:\t" << std::setw(10) << std::setfill(' ')  << timeScanf << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeScanf) << '\t' ;
+	graph = (int) (timeStream / timeScanf); for (int i = 0; i < graph; ++i) std::cout << '|';
+	std::cout << std::endl;
+}
+
+
+void StringTest::benchmarkStrToFloat()
+{
+	double res[5] = {};
+	Poco::Stopwatch sw;
+	std::string num = "1.0372157551632929e-112";
+	std::cout << "The Number: " << num << std::endl;
+	sw.start();
+	for (int i = 0; i < 1000000; ++i) parseStream(num, res[0]);
+	sw.stop();
+	std::cout << "parseStream Number: " << std::setprecision(std::numeric_limits<double>::digits10) << res[0] << std::endl;
+	double timeStream = sw.elapsed() / 1000.0;
+
+	// standard strtod
+	char* pC = 0;
+	sw.restart();
+	for (int i = 0; i < 1000000; ++i) res[1] = std::strtod(num.c_str(), &pC);
+	sw.stop();
+	std::cout << "std::strtod Number: " << res[1] << std::endl;
+	double timeStdStrtod = sw.elapsed() / 1000.0;
+
+	// POCO Way
+	sw.restart();
+	char ou = 0;
+	for (int i = 0; i < 1000000; ++i) strToDouble(num, res[2], ou);
+	sw.stop();
+	std::cout << "Poco::strToDouble(const string&, double&) Number: " << res[2] << std::endl;
+	double timeStrToDouble = sw.elapsed() / 1000.0;
+
+	sw.restart();
+	for (int i = 0; i < 1000000; ++i) res[3] = strToDouble(num.c_str());
+	sw.stop();
+	std::cout << "Poco::strToDouble(const char*) Number: " << res[3] << std::endl;
+	double timeStrtoD = sw.elapsed() / 1000.0;
+
+	// standard sscanf
+	sw.restart();
+	for (int i = 0; i < 1000000; ++i) std::sscanf(num.c_str(), "%lf", &res[4]);
+	sw.stop();
+	std::cout << "sscanf Number: " << res[4] << std::endl;
+	double timeScanf = sw.elapsed() / 1000.0;
+
+	assertEqual (res[0], res[1]);
+	assertEqual (res[1], res[2]);
+	assertEqual (res[2], res[3]);
+	assertEqual (res[3], res[4]);
+
+	int graph;
+	std::cout << std::endl << "Timing and speedup relative to I/O stream:" << std::endl << std::endl;
+	std::cout << std::setw(14) << "Stream:\t" << std::setw(10) << std::setfill(' ') << std::setprecision(4) << timeStream << "[ms]" << std::endl;
+
+	std::cout << std::setw(14) << "std::strtod:\t" << std::setw(10) << std::setfill(' ') << timeStdStrtod << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStdStrtod) << '\t' ;
+	graph = (int) (timeStream / timeStdStrtod); for (int i = 0; i < graph; ++i) std::cout << '#';
+
+	std::cout << std::endl << std::setw(14) << "strToDouble:\t" << std::setw(10) << std::setfill(' ') << timeStrToDouble << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStrToDouble) << '\t' ;
+	graph = (int) (timeStream / timeStrToDouble); for (int i = 0; i < graph; ++i) std::cout << '#';
+
+	std::cout << std::endl << std::setw(14) << "strToDouble:\t" << std::setw(10) << std::setfill(' ')  << timeScanf << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeStrtoD) << '\t' ;
+	graph = (int) (timeStream / timeStrtoD); for (int i = 0; i < graph; ++i) std::cout << '#';
+
+	std::cout << std::endl << std::setw(14) << "std::sscanf:\t" << std::setw(10) << std::setfill(' ')  << timeScanf << "[ms]" <<
+	std::setw(10) << std::setfill(' ')  << "Speedup: " << (timeStream / timeScanf) << '\t' ;
+	graph = (int) (timeStream / timeScanf); for (int i = 0; i < graph; ++i) std::cout << '#';
+
+	std::cout << std::endl;
+}
+
+
 void StringTest::setUp()
 {
 }
@@ -1510,12 +1543,10 @@ CppUnit::Test* StringTest::suite()
 	CppUnit_addTest(pSuite, StringTest, testNumericStringLimit);
 	CppUnit_addTest(pSuite, StringTest, testStringToFloatError);
 	CppUnit_addTest(pSuite, StringTest, testNumericLocale);
-	//CppUnit_addTest(pSuite, StringTest, benchmarkStrToFloat);
-	//CppUnit_addTest(pSuite, StringTest, benchmarkStrToInt);
 	CppUnit_addTest(pSuite, StringTest, testIntToString);
 	CppUnit_addTest(pSuite, StringTest, testFloatToString);
-	//CppUnit_addTest(pSuite, StringTest, benchmarkFloatToStr);
 	CppUnit_addTest(pSuite, StringTest, testJSONString);
+	CppUnit_addTest(pSuite, StringTest, conversionBenchmarks);
 
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/StringTest.h b/Foundation/testsuite/src/StringTest.h
index a4a8eaec6..84ef9b4c2 100644
--- a/Foundation/testsuite/src/StringTest.h
+++ b/Foundation/testsuite/src/StringTest.h
@@ -19,6 +19,7 @@
 #include "Poco/NumericString.h"
 #include "Poco/MemoryStream.h"
 #include "Poco/NumberFormatter.h"
+#include <limits>
 
 
 class StringTest: public CppUnit::TestCase
@@ -53,12 +54,14 @@ public:
 	void testNumericStringLimit();
 	void testStringToFloatError();
 	void testNumericLocale();
-	void benchmarkStrToFloat();
-	void benchmarkStrToInt();
 
 	void testIntToString();
 	void testFloatToString();
+
+	void conversionBenchmarks();
 	void benchmarkFloatToStr();
+	void benchmarkStrToFloat();
+	void benchmarkStrToInt();
 
 	void testJSONString();
 
@@ -128,7 +131,6 @@ private:
 		assertFalse(s == std::numeric_limits<Smaller>::min());
 		assertTrue(Poco::strToInt<Smaller>(val, s, 10));
 		assertTrue (s == std::numeric_limits<Smaller>::min());
-		assertTrue(s == std::numeric_limits<Smaller>::min());
 		--l; val = Poco::NumberFormatter::format(l);
 		assertFalse(Poco::strToInt<Smaller>(val, s, 10));
 		--l; val = Poco::NumberFormatter::format(l);
@@ -143,6 +145,21 @@ private:
 		assertFalse(Poco::strToInt<Smaller>(val, s, 10));
 	}
 
+	template <typename T>
+	void multiplyOverflow()
+	{
+		T m = static_cast<T>(10);
+		T t = 0;
+		T f = std::numeric_limits<T>::max()/m;
+		assertTrue (Poco::safeMultiply(t, f, m));
+		f += 1;
+		assertFalse (Poco::safeMultiply(t, f, m));
+		f = std::numeric_limits<T>::min()/m;
+		assertTrue (Poco::safeMultiply(t, f, m));
+		f -= 1;
+		assertFalse (Poco::safeMultiply(t, f, m));
+	}
+
 	template <typename T>
 	bool parseStream(const std::string& s, T& value)
 	{
diff --git a/Foundation/testsuite/src/StringTokenizerTest.cpp b/Foundation/testsuite/src/StringTokenizerTest.cpp
index 711992250..d8d3611b5 100644
--- a/Foundation/testsuite/src/StringTokenizerTest.cpp
+++ b/Foundation/testsuite/src/StringTokenizerTest.cpp
@@ -63,7 +63,7 @@ void StringTokenizerTest::testStringTokenizer()
 		assertTrue (it != st.end());
 		assertTrue (*it++ == "abc");
 		assertTrue (it == st.end());
-	}	
+	}
 	{
 		StringTokenizer st("  abc  ", "", StringTokenizer::TOK_TRIM);
 		StringTokenizer::Iterator it = st.begin();
@@ -324,7 +324,7 @@ void StringTokenizerTest::testStringTokenizer()
 		assertTrue (st.find("2") == 1);
 		assertTrue (st.find("3") == 2);
 	}
-	
+
 	{
 		Poco::StringTokenizer st(" 2- ","-", Poco::StringTokenizer::TOK_TRIM);
 		assertTrue (st.count() == 2);
@@ -337,7 +337,7 @@ void StringTokenizerTest::testStringTokenizer()
 void StringTokenizerTest::testFind()
 {
 	StringTokenizer st("0,1,2,3,3,2,1,0", ",", StringTokenizer::TOK_TRIM | StringTokenizer::TOK_IGNORE_EMPTY);
-	
+
 	assertTrue (st.count() == 8);
 	assertTrue (2 == st.count("0"));
 	assertTrue (2 == st.count("1"));
@@ -356,7 +356,7 @@ void StringTokenizerTest::testFind()
 	assertTrue (st[5] == "2");
 	assertTrue (st[6] == "1");
 	assertTrue (st[7] == "0");
-	
+
 	assertTrue (st.has("0"));
 	assertTrue (st.has("1"));
 	assertTrue (st.has("2"));
diff --git a/Foundation/testsuite/src/TaskManagerTest.cpp b/Foundation/testsuite/src/TaskManagerTest.cpp
index f8476b481..466025913 100644
--- a/Foundation/testsuite/src/TaskManagerTest.cpp
+++ b/Foundation/testsuite/src/TaskManagerTest.cpp
@@ -49,12 +49,12 @@ namespace
 	class TestTask: public Task
 	{
 	public:
-		TestTask(): 
+		TestTask():
 			Task("TestTask"),
 			_fail(false)
 		{
 		}
-		
+
 		void runTask()
 		{
 			_event.wait();
@@ -67,12 +67,12 @@ namespace
 			setProgress(1.0);
 			_event.wait();
 		}
-		
+
 		void fail()
 		{
 			_fail = true;
 		}
-		
+
 		void cont()
 		{
 			_event.set();
@@ -82,20 +82,20 @@ namespace
 		Event _event;
 		bool  _fail;
 	};
-	
+
 	class SimpleTask: public Task
 	{
 	public:
 		SimpleTask(): Task("SimpleTask")
 		{
 		}
-		
+
 		void runTask()
 		{
 			sleep(10000);
 		}
 	};
-	
+
 	class TaskObserver
 	{
 	public:
@@ -107,73 +107,73 @@ namespace
 			_progress(0.0)
 		{
 		}
-		
+
 		~TaskObserver()
 		{
 			delete _pException;
 		}
-		
+
 		void taskStarted(TaskStartedNotification* pNf)
 		{
 			_started = true;
 			pNf->release();
 		}
-		
+
 		void taskCancelled(TaskCancelledNotification* pNf)
 		{
 			_cancelled = true;
 			pNf->release();
 		}
-		
+
 		void taskFinished(TaskFinishedNotification* pNf)
 		{
 			_finished = true;
 			pNf->release();
 		}
-		
+
 		void taskFailed(TaskFailedNotification* pNf)
 		{
 			_pException = pNf->reason().clone();
 			pNf->release();
 		}
-		
+
 		void taskProgress(TaskProgressNotification* pNf)
 		{
 			_progress = pNf->progress();
 			pNf->release();
 		}
-		
+
 		bool started() const
 		{
 			return _started;
 		}
-		
+
 		bool cancelled() const
 		{
 			return _cancelled;
 		}
-		
+
 		bool finished() const
 		{
 			return _finished;
 		}
-		
+
 		float progress() const
 		{
 			return _progress;
 		}
-		
+
 		Exception* error() const
 		{
 			return _pException;
 		}
-		
+
 	private:
-		bool       _started;
-		bool       _cancelled;
-		bool       _finished;
-		Exception* _pException;
-		float      _progress;
+		std::atomic<bool> _started;
+		std::atomic<bool> _cancelled;
+		std::atomic<bool> _finished;
+		Exception*        _pException;
+		float             _progress;
 	};
 
 
@@ -181,27 +181,27 @@ namespace
 	class CustomNotificationTask: public Task
 	{
 	public:
-		CustomNotificationTask(const T& t): 
+		CustomNotificationTask(const T& t):
 			Task("CustomNotificationTask"),
 			_custom(t)
 		{
 		}
-		
+
 		void runTask()
 		{
 			sleep(10000);
 		}
-		
+
 		void setCustom(const T& custom)
 		{
 			_custom = custom;
 			postNotification(new TaskCustomNotification<T>(this, _custom));
 		}
-		
+
 	private:
 		T _custom;
 	};
-	
+
 
 	template <class C>
 	class CustomTaskObserver
@@ -210,11 +210,11 @@ namespace
 		CustomTaskObserver(const C& custom): _custom(custom)
 		{
 		}
-		
+
 		~CustomTaskObserver()
 		{
 		}
-		
+
 		void taskCustom(TaskCustomNotification<C>* pNf)
 		{
 			_custom = pNf->custom();
@@ -347,16 +347,16 @@ void TaskManagerTest::testError()
 void TaskManagerTest::testCustom()
 {
 	TaskManager tm;
-	
+
 	CustomTaskObserver<int> ti(0);
 	tm.addObserver(
 		Observer<CustomTaskObserver<int>, TaskCustomNotification<int> >
 			(ti, &CustomTaskObserver<int>::taskCustom));
-	
+
 	AutoPtr<CustomNotificationTask<int> > pCNT1 = new CustomNotificationTask<int>(0);
 	tm.start(pCNT1.duplicate());
 	assertTrue (ti.custom() == 0);
-	
+
 	for (int i = 1; i < 10; ++i)
 	{
 		pCNT1->setCustom(i);
@@ -367,7 +367,7 @@ void TaskManagerTest::testCustom()
 	tm.addObserver(
 		Observer<CustomTaskObserver<std::string>, TaskCustomNotification<std::string> >
 			(ts, &CustomTaskObserver<std::string>::taskCustom));
-	
+
 	AutoPtr<CustomNotificationTask<std::string> > pCNT2 = new CustomNotificationTask<std::string>("");
 	tm.start(pCNT2.duplicate());
 	assertTrue (tm.taskList().size() == 2);
@@ -375,17 +375,17 @@ void TaskManagerTest::testCustom()
 	std::string str("notify me");
 	pCNT2->setCustom(str);
 	assertTrue (ts.custom() == str);
-	
+
 	S s;
 	s.i = 0;
 	s.str = "";
 
 	CustomTaskObserver<S*> ptst(&s);
-	
+
 	tm.addObserver(
 		Observer<CustomTaskObserver<S*>, TaskCustomNotification<S*> >
 			(ptst, &CustomTaskObserver<S*>::taskCustom));
-	
+
 	AutoPtr<CustomNotificationTask<S*> > pCNT3 = new CustomNotificationTask<S*>(&s);
 	tm.start(pCNT3.duplicate());
 	assertTrue (tm.taskList().size() == 3);
@@ -401,11 +401,11 @@ void TaskManagerTest::testCustom()
 	s.str = "";
 
 	CustomTaskObserver<S> tst(s);
-	
+
 	tm.addObserver(
 		Observer<CustomTaskObserver<S>, TaskCustomNotification<S> >
 			(tst, &CustomTaskObserver<S>::taskCustom));
-	
+
 	AutoPtr<CustomNotificationTask<S> > pCNT4 = new CustomNotificationTask<S>(s);
 	tm.start(pCNT4.duplicate());
 	assertTrue (tm.taskList().size() == 4);
@@ -416,7 +416,7 @@ void TaskManagerTest::testCustom()
 	pCNT4->setCustom(s);
 	assertTrue (tst.custom().i == 123);
 	assertTrue (tst.custom().str == "123");
-	
+
 	AutoPtr<SimpleTask> pST = new SimpleTask;
 	tm.start(pST.duplicate());
 	assertTrue (tm.taskList().size() == 5);
@@ -433,10 +433,10 @@ void TaskManagerTest::testMultiTasks()
 	tm.start(new SimpleTask);
 	tm.start(new SimpleTask);
 	tm.start(new SimpleTask);
-	
+
 	TaskManager::TaskList list = tm.taskList();
 	assertTrue (list.size() == 3);
-	
+
 	tm.cancelAll();
 	while (tm.count() > 0) Thread::sleep(100);
 	assertTrue (tm.count() == 0);
@@ -471,7 +471,7 @@ void TaskManagerTest::testCustomThreadPool()
 	}
 
 	assertTrue (tm.count() == tp.allocated());
-	
+
 	tp.joinAll();
 }
 
diff --git a/Foundation/testsuite/src/TaskTest.cpp b/Foundation/testsuite/src/TaskTest.cpp
index 591ac06e3..2d2bd5eaa 100644
--- a/Foundation/testsuite/src/TaskTest.cpp
+++ b/Foundation/testsuite/src/TaskTest.cpp
@@ -31,7 +31,7 @@ namespace
 		TestTask(): Task("TestTask")
 		{
 		}
-		
+
 		void runTask()
 		{
 			_event.wait();
@@ -44,12 +44,12 @@ namespace
 			setProgress(1.0);
 			_event.wait();
 		}
-		
+
 		void cont()
 		{
 			_event.set();
 		}
-		
+
 	private:
 		Event _event;
 	};
diff --git a/Foundation/testsuite/src/TestChannel.h b/Foundation/testsuite/src/TestChannel.h
index f0552a9d4..c0446dcc3 100644
--- a/Foundation/testsuite/src/TestChannel.h
+++ b/Foundation/testsuite/src/TestChannel.h
@@ -26,13 +26,13 @@ public:
 
 	TestChannel();
 	~TestChannel();
-	
+
 	void log(const Poco::Message& msg);
 	MsgList& list();
 	void clear();
 	const Poco::Message& getLastMessage() const { return _lastMessage; }
-	
-private:	
+
+private:
 	MsgList _msgList;
 	Poco::Message _lastMessage;
 };
diff --git a/Foundation/testsuite/src/TestLibrary.cpp b/Foundation/testsuite/src/TestLibrary.cpp
index 4d31f1568..a00b97173 100644
--- a/Foundation/testsuite/src/TestLibrary.cpp
+++ b/Foundation/testsuite/src/TestLibrary.cpp
@@ -22,11 +22,11 @@ public:
 	PluginA()
 	{
 	}
-	
+
 	~PluginA()
 	{
 	}
-	
+
 	std::string name() const
 	{
 		return "PluginA";
@@ -40,11 +40,11 @@ public:
 	PluginB()
 	{
 	}
-	
+
 	~PluginB()
 	{
 	}
-	
+
 	std::string name() const
 	{
 		return "PluginB";
@@ -58,11 +58,11 @@ public:
 	PluginC()
 	{
 	}
-	
+
 	~PluginC()
 	{
 	}
-	
+
 	std::string name() const
 	{
 		return "PluginC";
@@ -85,7 +85,7 @@ void pocoInitializeLibrary()
 
 void pocoUninitializeLibrary()
 {
-	std::cout << "TestLibrary uninitialzing" << std::endl;
+	std::cout << "TestLibrary uninitializing" << std::endl;
 }
 
 
diff --git a/Foundation/testsuite/src/TextBufferIteratorTest.cpp b/Foundation/testsuite/src/TextBufferIteratorTest.cpp
index e7291bba5..3ff5fdc9e 100644
--- a/Foundation/testsuite/src/TextBufferIteratorTest.cpp
+++ b/Foundation/testsuite/src/TextBufferIteratorTest.cpp
@@ -39,7 +39,7 @@ void TextBufferIteratorTest::testEmptyLatin1()
 	const char* text = "";
 	TextBufferIterator it(text, encoding);
 	TextBufferIterator end(it.end());
-	
+
 	assertTrue (it == end);
 }
 
@@ -50,7 +50,7 @@ void TextBufferIteratorTest::testOneLatin1()
 	const char* text = "x";
 	TextBufferIterator it(text, encoding);
 	TextBufferIterator end(it.end());
-	
+
 	assertTrue (it != end);
 	assertTrue (*it == 'x');
 	++it;
@@ -64,7 +64,7 @@ void TextBufferIteratorTest::testLatin1()
 	const char* text = "Latin1";
 	TextBufferIterator it(text, encoding);
 	TextBufferIterator end(it.end());
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 'L');
 	assertTrue (it != end);
@@ -78,7 +78,7 @@ void TextBufferIteratorTest::testLatin1()
 	assertTrue (it != end);
 	assertTrue (*it++ == '1');
 	assertTrue (it == end);
-	
+
 	const char* empty = "";
 	it  = TextBufferIterator(empty, encoding);
 	end = it.end();
@@ -92,7 +92,7 @@ void TextBufferIteratorTest::testEmptyUTF8()
 	const char* text = "";
 	TextBufferIterator it(text, encoding);
 	TextBufferIterator end(text);
-	
+
 	assertTrue (it == end);
 }
 
@@ -100,25 +100,25 @@ void TextBufferIteratorTest::testEmptyUTF8()
 void TextBufferIteratorTest::testOneUTF8()
 {
 	UTF8Encoding encoding;
-	
+
 	// 1 byte sequence
 	const char* text = "x";
 	TextBufferIterator it(text, encoding);
 	TextBufferIterator end(it.end());
-	
+
 	assertTrue (it != end);
 	assertTrue (*it == 'x');
 	++it;
 	assertTrue (it == end);
-	
+
 	unsigned char data[Poco::TextEncoding::MAX_SEQUENCE_LENGTH];
-	
+
 	// 2 byte sequence
 	int n = encoding.convert(0xab, data, sizeof(data));
 	assertTrue (n == 2);
 	it  = TextBufferIterator(reinterpret_cast<const char*>(data), n, encoding);
 	end = it.end();
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0xab);
 	assertTrue (it == end);
@@ -128,7 +128,7 @@ void TextBufferIteratorTest::testOneUTF8()
 	assertTrue (n == 3);
 	it  = TextBufferIterator(reinterpret_cast<const char*>(data), n, encoding);
 	end = it.end();
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0xabcd);
 	assertTrue (it == end);
@@ -138,11 +138,11 @@ void TextBufferIteratorTest::testOneUTF8()
 	assertTrue (n == 4);
 	it  = TextBufferIterator(reinterpret_cast<const char*>(data), n, encoding);
 	end = it.end();
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0xabcde);
 	assertTrue (it == end);
-	
+
 	// 5 byte sequence - not supported
 	n = encoding.convert(0xabcdef, data, sizeof(data));
 	assertTrue (n == 0);
@@ -159,7 +159,7 @@ void TextBufferIteratorTest::testUTF8()
 	const unsigned char text[] = {0x20, 0xce, 0xba, 0xe1, 0xbd, 0xb9, 0xcf, 0x83, 0xce, 0xbc, 0xce, 0xb5, 0x20, 0x00};
 	TextBufferIterator it(reinterpret_cast<const char*>(text), encoding);
 	TextBufferIterator end(it.end());
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0x0020);
 	assertTrue (it != end);
@@ -180,11 +180,11 @@ void TextBufferIteratorTest::testUTF8()
 
 void TextBufferIteratorTest::testUTF8Supplementary()
 {
-	UTF8Encoding encoding; 
+	UTF8Encoding encoding;
 	const unsigned char text[] = {0x41, 0x42, 0xf0, 0x90, 0x82, 0xa4, 0xf0, 0xaf, 0xa6, 0xa0, 0xf0, 0xaf, 0xa8, 0x9d, 0x00};
 	TextBufferIterator it(reinterpret_cast<const char*>(text), encoding);
 	TextBufferIterator end(it.end());
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0x0041);
 	assertTrue (it != end);
@@ -201,11 +201,11 @@ void TextBufferIteratorTest::testUTF8Supplementary()
 
 void TextBufferIteratorTest::testUTF16Supplementary()
 {
-	UTF16Encoding encoding; 
+	UTF16Encoding encoding;
 	const Poco::UInt16 text[] = { 0x0041, 0x0042, 0xD800, 0xDCA4, 0xD87E, 0xDDA0, 0xD87E, 0xDE1D};
 	TextBufferIterator it(reinterpret_cast<const char*>(text), sizeof(text), encoding);
 	TextBufferIterator end(it.end());
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0x0041);
 	assertTrue (it != end);
@@ -227,7 +227,7 @@ void TextBufferIteratorTest::testSwap()
 	TextBufferIterator it1(text, encoding);
 	TextBufferIterator it2(text, encoding);
 	TextBufferIterator end(it1.end());
-	
+
 	assertTrue (it1 == it2);
 	it2.swap(end);
 	assertTrue (it1 != it2);
diff --git a/Foundation/testsuite/src/TextConverterTest.cpp b/Foundation/testsuite/src/TextConverterTest.cpp
index 0de7ca1ff..c905953c2 100644
--- a/Foundation/testsuite/src/TextConverterTest.cpp
+++ b/Foundation/testsuite/src/TextConverterTest.cpp
@@ -39,13 +39,13 @@ void TextConverterTest::testIdentityASCII()
 {
 	ASCIIEncoding encoding;
 	TextConverter converter(encoding, encoding);
-	
+
 	std::string empty;
 	std::string result0;
 	int errors = converter.convert(empty, result0);
 	assertTrue (result0 == empty);
 	assertTrue (errors == 0);
-	
+
 	std::string fooBar = "foo bar";
 	std::string result1;
 	errors = converter.convert(fooBar, result1);
@@ -61,7 +61,7 @@ void TextConverterTest::testIdentityASCII()
 	errors = converter.convert("", 0, result3);
 	assertTrue (result3.empty());
 	assertTrue (errors == 0);
-	
+
 	std::string x = "x";
 	std::string result4;
 	errors = converter.convert(x, result4);
@@ -79,13 +79,13 @@ void TextConverterTest::testIdentityUTF8()
 {
 	UTF8Encoding encoding;
 	TextConverter converter(encoding, encoding);
-	
+
 	std::string empty;
 	std::string result0;
 	int errors = converter.convert(empty, result0);
 	assertTrue (result0 == empty);
 	assertTrue (errors == 0);
-	
+
 	std::string fooBar = "foo bar";
 	std::string result1;
 	errors = converter.convert(fooBar, result1);
@@ -101,20 +101,20 @@ void TextConverterTest::testIdentityUTF8()
 	errors = converter.convert("", 0, result3);
 	assertTrue (result3.empty());
 	assertTrue (errors == 0);
-	
+
 	const unsigned char greek[] = {0x20, 0xce, 0xba, 0xe1, 0xbd, 0xb9, 0xcf, 0x83, 0xce, 0xbc, 0xce, 0xb5, 0x20, 0x00};
 	std::string text((const char*) greek);
-	
+
 	std::string result4;
 	errors = converter.convert(text, result4);
 	assertTrue (result4 == text);
 	assertTrue (errors == 0);
-	
+
 	std::string result5;
 	errors = converter.convert((char*) greek, 13, result5);
 	assertTrue (result5 == text);
 	assertTrue (errors == 0);
-	
+
 	std::string x = "x";
 	std::string result6;
 	errors = converter.convert(x, result6);
@@ -125,13 +125,13 @@ void TextConverterTest::testIdentityUTF8()
 	errors = converter.convert("x", 1, result7);
 	assertTrue (result7 == x);
 	assertTrue (errors == 0);
-	
+
 	std::string utfChar((char*) greek + 1, 2);
 	std::string result8;
 	errors = converter.convert(utfChar, result8);
 	assertTrue (result8 == utfChar);
 	assertTrue (errors == 0);
-	
+
 	std::string result9;
 	errors = converter.convert((char*) greek + 1, 2, result9);
 	assertTrue (result9 == utfChar);
@@ -151,7 +151,7 @@ void TextConverterTest::testUTF8toASCII()
 	int errors = converter.convert(text, result0);
 	assertTrue (result0 == " ????? AB");
 	assertTrue (errors == 0);
-	
+
 	std::string result1;
 	errors = converter.convert("abcde", 5, result1);
 	assertTrue (result1 == "abcde");
@@ -163,18 +163,18 @@ void TextConverterTest::testLatin1toUTF8()
 	Latin1Encoding latin1Encoding;
 	UTF8Encoding utf8Encoding;
 	TextConverter converter(latin1Encoding, utf8Encoding);
-	
+
 	const unsigned char latin1Chars[] = {'g', 252, 'n', 't', 'e', 'r', 0};
 	const unsigned char utf8Chars[]   = {'g', 195, 188, 'n', 't', 'e', 'r', 0};
 	std::string latin1Text((const char*) latin1Chars);
 	std::string utf8Text((const char*) utf8Chars);
-	
+
 	std::string result0;
 	int errors = converter.convert(latin1Text, result0);
 	assertTrue (result0 == utf8Text);
 	assertTrue (errors == 0);
 	assertEqual((long) result0.size(), 7);
-	
+
 	std::string result1;
 	errors = converter.convert(latin1Chars, 6, result1);
 	assertTrue (result1 == utf8Text);
@@ -319,7 +319,7 @@ void TextConverterTest::testErrors()
 
 	const unsigned char badChars[] = {'a', 'b', 255, 'c', 254, 0};
 	std::string badText((const char*) badChars);
-	
+
 	std::string result;
 	int errors = converter.convert(badText, result);
 	assertTrue (errors == 2);
diff --git a/Foundation/testsuite/src/TextEncodingTest.cpp b/Foundation/testsuite/src/TextEncodingTest.cpp
index 7f5f9d6f2..50df53497 100644
--- a/Foundation/testsuite/src/TextEncodingTest.cpp
+++ b/Foundation/testsuite/src/TextEncodingTest.cpp
@@ -38,10 +38,10 @@ void TextEncodingTest::testTextEncoding()
 {
 	TextEncoding& utf8 = TextEncoding::byName("utf8");
 	assertTrue (std::string("UTF-8") == utf8.canonicalName());
-	
+
 	TextEncoding& latin1 = TextEncoding::byName("latin1");
 	assertTrue (std::string("ISO-8859-1") == latin1.canonicalName());
-	
+
 	TextEncoding& latin2 = TextEncoding::byName("latin2");
 	assertTrue (std::string("ISO-8859-2") == latin2.canonicalName());
 
@@ -60,7 +60,7 @@ void TextEncodingTest::testTextEncoding()
 
 	TextEncoding& glob = TextEncoding::global();
 	assertTrue (std::string("UTF-8") == glob.canonicalName());
-	
+
 	TextEncoding::global(new Latin1Encoding);
 	TextEncoding& glob2 = TextEncoding::global();
 	assertTrue (std::string("ISO-8859-1") == glob2.canonicalName());
diff --git a/Foundation/testsuite/src/TextIteratorTest.cpp b/Foundation/testsuite/src/TextIteratorTest.cpp
index 3c0ec34ec..189e720a7 100644
--- a/Foundation/testsuite/src/TextIteratorTest.cpp
+++ b/Foundation/testsuite/src/TextIteratorTest.cpp
@@ -39,7 +39,7 @@ void TextIteratorTest::testEmptyLatin1()
 	std::string text;
 	TextIterator it(text, encoding);
 	TextIterator end(text);
-	
+
 	assertTrue (it == end);
 }
 
@@ -50,7 +50,7 @@ void TextIteratorTest::testOneLatin1()
 	std::string text("x");
 	TextIterator it(text, encoding);
 	TextIterator end(text);
-	
+
 	assertTrue (it != end);
 	assertTrue (*it == 'x');
 	++it;
@@ -64,7 +64,7 @@ void TextIteratorTest::testLatin1()
 	std::string text("Latin1");
 	TextIterator it(text, encoding);
 	TextIterator end(text);
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 'L');
 	assertTrue (it != end);
@@ -78,7 +78,7 @@ void TextIteratorTest::testLatin1()
 	assertTrue (it != end);
 	assertTrue (*it++ == '1');
 	assertTrue (it == end);
-	
+
 	std::string empty;
 	it  = TextIterator(empty, encoding);
 	end = TextIterator(empty);
@@ -92,7 +92,7 @@ void TextIteratorTest::testEmptyUTF8()
 	std::string text;
 	TextIterator it(text, encoding);
 	TextIterator end(text);
-	
+
 	assertTrue (it == end);
 }
 
@@ -100,26 +100,26 @@ void TextIteratorTest::testEmptyUTF8()
 void TextIteratorTest::testOneUTF8()
 {
 	UTF8Encoding encoding;
-	
+
 	// 1 byte sequence
 	std::string text("x");
 	TextIterator it(text, encoding);
 	TextIterator end(text);
-	
+
 	assertTrue (it != end);
 	assertTrue (*it == 'x');
 	++it;
 	assertTrue (it == end);
-	
+
 	unsigned char data[Poco::TextEncoding::MAX_SEQUENCE_LENGTH];
-	
+
 	// 2 byte sequence
 	int n = encoding.convert(0xab, data, sizeof(data));
 	assertTrue (n == 2);
 	text.assign((char*) data, n);
 	it  = TextIterator(text, encoding);
 	end = TextIterator(text);
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0xab);
 	assertTrue (it == end);
@@ -130,7 +130,7 @@ void TextIteratorTest::testOneUTF8()
 	text.assign((char*) data, n);
 	it  = TextIterator(text, encoding);
 	end = TextIterator(text);
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0xabcd);
 	assertTrue (it == end);
@@ -141,11 +141,11 @@ void TextIteratorTest::testOneUTF8()
 	text.assign((char*) data, n);
 	it  = TextIterator(text, encoding);
 	end = TextIterator(text);
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0xabcde);
 	assertTrue (it == end);
-	
+
 	// 5 byte sequence - not supported
 	n = encoding.convert(0xabcdef, data, sizeof(data));
 	assertTrue (n == 0);
@@ -163,7 +163,7 @@ void TextIteratorTest::testUTF8()
 	std::string text((const char*) greek);
 	TextIterator it(text, encoding);
 	TextIterator end(text);
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0x0020);
 	assertTrue (it != end);
@@ -184,12 +184,12 @@ void TextIteratorTest::testUTF8()
 
 void TextIteratorTest::testUTF8Supplementary()
 {
-	UTF8Encoding encoding; 
+	UTF8Encoding encoding;
 	const unsigned char supp[] = {0x41, 0x42, 0xf0, 0x90, 0x82, 0xa4, 0xf0, 0xaf, 0xa6, 0xa0, 0xf0, 0xaf, 0xa8, 0x9d, 0x00};
 	std::string text((const char*) supp);
 	TextIterator it(text, encoding);
 	TextIterator end(text);
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0x0041);
 	assertTrue (it != end);
@@ -206,12 +206,12 @@ void TextIteratorTest::testUTF8Supplementary()
 
 void TextIteratorTest::testUTF16Supplementary()
 {
-	UTF16Encoding encoding; 
+	UTF16Encoding encoding;
 	const Poco::UInt16 supp [] = { 0x0041, 0x0042, 0xD800, 0xDCA4, 0xD87E, 0xDDA0, 0xD87E, 0xDE1D, 0x00};
 	std::string text((const char*) supp, 16);
 	TextIterator it(text, encoding);
 	TextIterator end(text);
-	
+
 	assertTrue (it != end);
 	assertTrue (*it++ == 0x0041);
 	assertTrue (it != end);
@@ -233,7 +233,7 @@ void TextIteratorTest::testSwap()
 	TextIterator it1(text, encoding);
 	TextIterator it2(text, encoding);
 	TextIterator end(text);
-	
+
 	assertTrue (it1 == it2);
 	it2.swap(end);
 	assertTrue (it1 != it2);
diff --git a/Foundation/testsuite/src/ThreadLocalTest.cpp b/Foundation/testsuite/src/ThreadLocalTest.cpp
index 654f7dce2..ac9428248 100644
--- a/Foundation/testsuite/src/ThreadLocalTest.cpp
+++ b/Foundation/testsuite/src/ThreadLocalTest.cpp
@@ -35,12 +35,12 @@ public:
 			++(*_count);
 		_result = *_count;
 	}
-	
+
 	int result()
 	{
 		return _result;
 	}
-	
+
 private:
 	int _n;
 	int _result;
@@ -82,7 +82,7 @@ void ThreadLocalTest::testLocality()
 	t1.join();
 	t2.join();
 	t3.join();
-	
+
 	assertTrue (r1.result() == 5000);
 	assertTrue (r2.result() == 7500);
 	assertTrue (r3.result() == 6000);
diff --git a/Foundation/testsuite/src/ThreadPoolTest.cpp b/Foundation/testsuite/src/ThreadPoolTest.cpp
index c04967257..f33219f2f 100644
--- a/Foundation/testsuite/src/ThreadPoolTest.cpp
+++ b/Foundation/testsuite/src/ThreadPoolTest.cpp
@@ -76,7 +76,7 @@ void ThreadPoolTest::testThreadPool()
 	{
 		pool.start(ra);
 		failmsg("thread pool exhausted - must throw exception");
-	}	
+	}
 	catch (Poco::NoThreadAvailableException&)
 	{
 	}
@@ -84,17 +84,17 @@ void ThreadPoolTest::testThreadPool()
 	{
 		failmsg("wrong exception thrown");
 	}
-	
+
 	_event.set(); // go!!!
 	pool.joinAll();
-	
+
 	assertTrue (_count == 40000);
-	
+
 	assertTrue (pool.allocated() == 4);
 	assertTrue (pool.used() == 0);
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.available() == 4);
-	
+
 	Thread::sleep(4000);
 
 	pool.collect();
@@ -102,7 +102,7 @@ void ThreadPoolTest::testThreadPool()
 	assertTrue (pool.used() == 0);
 	assertTrue (pool.capacity() == 4);
 	assertTrue (pool.available() == 4);
-	
+
 	_count = 0;
 	_event.reset();
 	pool.start(ra);
@@ -120,7 +120,7 @@ void ThreadPoolTest::testThreadPool()
 	pool.joinAll();
 
 	assertTrue (_count == 20000);
-	
+
 	assertTrue (pool.allocated() == 2);
 	assertTrue (pool.used() == 0);
 	assertTrue (pool.capacity() == 4);
diff --git a/Foundation/testsuite/src/ThreadTest.cpp b/Foundation/testsuite/src/ThreadTest.cpp
index 06b422c58..e1346fe90 100644
--- a/Foundation/testsuite/src/ThreadTest.cpp
+++ b/Foundation/testsuite/src/ThreadTest.cpp
@@ -108,7 +108,7 @@ public:
 	}
 
 private:
-	bool _finished;
+	std::atomic<bool> _finished;
 };
 
 
@@ -140,8 +140,8 @@ public:
 	}
 
 private:
-	int _counter;
-	bool _sleepy;
+	std::atomic<int> _counter;
+	std::atomic<bool> _sleepy;
 };
 
 
diff --git a/Foundation/testsuite/src/TimedNotificationQueueTest.cpp b/Foundation/testsuite/src/TimedNotificationQueueTest.cpp
index c7fc57dc0..e9b8423fc 100644
--- a/Foundation/testsuite/src/TimedNotificationQueueTest.cpp
+++ b/Foundation/testsuite/src/TimedNotificationQueueTest.cpp
@@ -23,7 +23,7 @@ using Poco::Timestamp;
 using Poco::Clock;
 
 
-namespace 
+namespace
 {
 	class QTestNotification: public Notification
 	{
@@ -70,7 +70,7 @@ void TimedNotificationQueueTest::testDequeue()
 	assertTrue (queue.empty());
 	assertTrue (queue.size() == 0);
 	pNf->release();
-	
+
 	Poco::Clock ts1;
 	ts1 += 100000;
 	Poco::Clock ts2;
@@ -79,7 +79,7 @@ void TimedNotificationQueueTest::testDequeue()
 	ts3 += 300000;
 	Poco::Clock ts4;
 	ts4 += 400000;
-	
+
 	queue.enqueueNotification(new QTestNotification("first"), ts1);
 	queue.enqueueNotification(new QTestNotification("fourth"), ts4);
 	queue.enqueueNotification(new QTestNotification("third"), ts3);
@@ -87,7 +87,7 @@ void TimedNotificationQueueTest::testDequeue()
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 4);
 	QTestNotification* pTNf = 0;
-	while (!pTNf) 
+	while (!pTNf)
 	{
 		pTNf = dynamic_cast<QTestNotification*>(queue.dequeueNotification());
 	}
@@ -97,9 +97,9 @@ void TimedNotificationQueueTest::testDequeue()
 	assertTrue (ts1.elapsed() >= 0);
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 3);
-	
+
 	pTNf = 0;
-	while (!pTNf) 
+	while (!pTNf)
 	{
 		pTNf = dynamic_cast<QTestNotification*>(queue.dequeueNotification());
 	}
@@ -109,9 +109,9 @@ void TimedNotificationQueueTest::testDequeue()
 	assertTrue (ts2.elapsed() >= 0);
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 2);
-	
+
 	pTNf = 0;
-	while (!pTNf) 
+	while (!pTNf)
 	{
 		pTNf = dynamic_cast<QTestNotification*>(queue.dequeueNotification());
 	}
@@ -121,9 +121,9 @@ void TimedNotificationQueueTest::testDequeue()
 	assertTrue (ts3.elapsed() >= 0);
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 1);
-	
+
 	pTNf = 0;
-	while (!pTNf) 
+	while (!pTNf)
 	{
 		pTNf = dynamic_cast<QTestNotification*>(queue.dequeueNotification());
 	}
@@ -142,7 +142,7 @@ void TimedNotificationQueueTest::testDequeue()
 void TimedNotificationQueueTest::testWaitDequeue()
 {
 	TimedNotificationQueue queue;
-	
+
 	Poco::Timestamp ts1;
 	ts1 += 100000;
 	Poco::Timestamp ts2;
@@ -151,7 +151,7 @@ void TimedNotificationQueueTest::testWaitDequeue()
 	ts3 += 300000;
 	Poco::Timestamp ts4;
 	ts4 += 400000;
-	
+
 	queue.enqueueNotification(new QTestNotification("first"), ts1);
 	queue.enqueueNotification(new QTestNotification("fourth"), ts4);
 	queue.enqueueNotification(new QTestNotification("third"), ts3);
@@ -165,7 +165,7 @@ void TimedNotificationQueueTest::testWaitDequeue()
 	assertTrue (ts1.elapsed() >= 0);
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 3);
-	
+
 	pTNf = dynamic_cast<QTestNotification*>(queue.waitDequeueNotification());
 	assertNotNullPtr(pTNf);
 	assertTrue (pTNf->data() == "second");
@@ -173,7 +173,7 @@ void TimedNotificationQueueTest::testWaitDequeue()
 	assertTrue (ts2.elapsed() >= 0);
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 2);
-	
+
 	pTNf = dynamic_cast<QTestNotification*>(queue.waitDequeueNotification());
 	assertNotNullPtr(pTNf);
 	assertTrue (pTNf->data() == "third");
@@ -181,7 +181,7 @@ void TimedNotificationQueueTest::testWaitDequeue()
 	assertTrue (ts3.elapsed() >= 0);
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 1);
-	
+
 	pTNf = dynamic_cast<QTestNotification*>(queue.waitDequeueNotification());
 	assertNotNullPtr(pTNf);
 	assertTrue (pTNf->data() == "fourth");
@@ -195,7 +195,7 @@ void TimedNotificationQueueTest::testWaitDequeue()
 void TimedNotificationQueueTest::testWaitDequeueTimeout()
 {
 	TimedNotificationQueue queue;
-	
+
 	Poco::Timestamp ts1;
 	ts1 += 200000;
 	Poco::Timestamp ts2;
@@ -204,7 +204,7 @@ void TimedNotificationQueueTest::testWaitDequeueTimeout()
 	ts3 += 600000;
 	Poco::Timestamp ts4;
 	ts4 += 800000;
-	
+
 	queue.enqueueNotification(new QTestNotification("first"), ts1);
 	queue.enqueueNotification(new QTestNotification("fourth"), ts4);
 	queue.enqueueNotification(new QTestNotification("third"), ts3);
@@ -222,7 +222,7 @@ void TimedNotificationQueueTest::testWaitDequeueTimeout()
 	assertTrue (ts1.elapsed() >= 0);
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 3);
-	
+
 	pTNf = dynamic_cast<QTestNotification*>(queue.waitDequeueNotification(220));
 	assertNotNullPtr(pTNf);
 	assertTrue (pTNf->data() == "second");
@@ -230,7 +230,7 @@ void TimedNotificationQueueTest::testWaitDequeueTimeout()
 	assertTrue (ts2.elapsed() >= 0);
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 2);
-	
+
 	pTNf = dynamic_cast<QTestNotification*>(queue.waitDequeueNotification(220));
 	assertNotNullPtr(pTNf);
 	assertTrue (pTNf->data() == "third");
@@ -238,7 +238,7 @@ void TimedNotificationQueueTest::testWaitDequeueTimeout()
 	assertTrue (ts3.elapsed() >= 0);
 	assertTrue (!queue.empty());
 	assertTrue (queue.size() == 1);
-	
+
 	pTNf = dynamic_cast<QTestNotification*>(queue.waitDequeueNotification(220));
 	assertNotNullPtr(pTNf);
 	assertTrue (pTNf->data() == "fourth");
diff --git a/Foundation/testsuite/src/TimerTest.cpp b/Foundation/testsuite/src/TimerTest.cpp
index 07c5eb5a6..b9f811ce1 100644
--- a/Foundation/testsuite/src/TimerTest.cpp
+++ b/Foundation/testsuite/src/TimerTest.cpp
@@ -52,7 +52,7 @@ void TimerTest::testTimer()
 	_event.wait();
 	sw.stop();
 	assertTrue (sw.elapsed() >= 180000 && sw.elapsed() < 250000);
-	t.stop();	
+	t.stop();
 }
 
 
diff --git a/Foundation/testsuite/src/TimespanTest.cpp b/Foundation/testsuite/src/TimespanTest.cpp
index fe7eb7076..935de264c 100644
--- a/Foundation/testsuite/src/TimespanTest.cpp
+++ b/Foundation/testsuite/src/TimespanTest.cpp
@@ -38,13 +38,13 @@ void TimespanTest::testConversions()
 	assertTrue (ts.totalMinutes() == 60*24);
 	assertTrue (ts.totalHours() == 24);
 	assertTrue (ts.days() == 1);
-	
+
 	assertTrue (ts.microseconds() == 0);
 	assertTrue (ts.milliseconds() == 0);
 	assertTrue (ts.seconds() == 0);
 	assertTrue (ts.minutes() == 0);
 	assertTrue (ts.hours() == 0);
-	
+
 	ts.assign(2, 12, 30, 10, 123456);
 	assertTrue (ts.microseconds() == 456);
 	assertTrue (ts.milliseconds() == 123);
@@ -70,6 +70,10 @@ void TimespanTest::testConversions()
 	assertTrue (ts.minutes() == 30);
 	assertTrue (ts.hours() == 12);
 	assertTrue (ts.days() == 1);
+
+	ts.assign(std::chrono::minutes(62));
+	assertTrue(ts.hours() == 1);
+	assertTrue(ts.minutes() == 2);
 }
 
 
@@ -78,21 +82,21 @@ void TimespanTest::testComparisons()
 	Timespan ts1(10000000);
 	Timespan ts2(20000000);
 	Timespan ts3(20000000);
-	
+
 	assertTrue (ts1 != ts2);
 	assertTrue (!(ts1 == ts2));
 	assertTrue (ts1 <= ts2);
 	assertTrue (ts1 < ts2);
 	assertTrue (ts2 > ts1);
 	assertTrue (ts2 >= ts1);
-	
+
 	assertTrue (ts2 == ts3);
 	assertTrue (!(ts2 != ts3));
 	assertTrue (ts2 >= ts3);
 	assertTrue (ts2 <= ts3);
 	assertTrue (!(ts2 > ts3));
 	assertTrue (!(ts2 < ts3));
-	
+
 	assertTrue (ts1 == 10000000);
 	assertTrue (ts1 != 20000000);
 	assertTrue (ts1 <= 10000000);
@@ -128,7 +132,7 @@ void TimespanTest::testSwap()
 {
 	Timespan ts1(10000000);
 	Timespan ts2(50000000);
-	
+
 	assertTrue (ts1 < ts2);
 	ts1.swap(ts2);
 	assertTrue (ts2 < ts1);
diff --git a/Foundation/testsuite/src/TimestampTest.cpp b/Foundation/testsuite/src/TimestampTest.cpp
index a6bcf8b14..2a642d544 100644
--- a/Foundation/testsuite/src/TimestampTest.cpp
+++ b/Foundation/testsuite/src/TimestampTest.cpp
@@ -47,26 +47,26 @@ void TimestampTest::testTimestamp()
 	assertTrue (t2 <= t3);
 	Timestamp::TimeDiff d = (t2 - t1);
 	assertTrue (d >= 180000 && d <= 300000);
-	
+
 	t1.swap(t2);
 	assertTrue (t1 > t2);
 	t2.swap(t1);
-	
+
 	Timestamp::UtcTimeVal tv = t1.utcTime();
 	Timestamp t4 = Timestamp::fromUtcTime(tv);
 	assertTrue (t1 == t4);
-	
+
 	Timestamp epoch(0);
 	tv = epoch.utcTime();
 	assertTrue (tv >> 32 == 0x01B21DD2);
 	assertTrue ((tv & 0xFFFFFFFF) == 0x13814000);
-	
+
 	Timestamp now;
 	Thread::sleep(201);
 	assertTrue (now.elapsed() >= 200000);
 	assertTrue (now.isElapsed(200000));
 	assertTrue (!now.isElapsed(2000000));
-	
+
 #if defined(_WIN32)
 	{
 		Timestamp now;
diff --git a/Foundation/testsuite/src/TuplesTest.cpp b/Foundation/testsuite/src/TuplesTest.cpp
index 9ab65261f..fe890de84 100644
--- a/Foundation/testsuite/src/TuplesTest.cpp
+++ b/Foundation/testsuite/src/TuplesTest.cpp
@@ -60,7 +60,7 @@ void TuplesTest::testTuple1()
 	assertTrue (t.length == 1);
 	t.set<0>(-1);
 	assertTrue (t.get<0>() == -1);
-	
+
 	Tuple<int> t2(-1);
 	assertTrue (t2.get<0>() == -1);
 
@@ -228,7 +228,7 @@ void TuplesTest::testTuple6()
 {
 	Tuple<std::string, int, bool, float, char, long> aTuple;
 	assertTrue (aTuple.length == 6);
-	Tuple<std::string, int, bool, float, char, long> 
+	Tuple<std::string, int, bool, float, char, long>
 		aTuple2("1", 1, true, 3.14f, 'c', 999);
 	assertTrue (aTuple != aTuple2);
 	aTuple = aTuple2;
@@ -242,7 +242,7 @@ void TuplesTest::testTuple7()
 {
 	Tuple<std::string, int, bool, float, char, long, double> aTuple;
 	assertTrue (aTuple.length == 7);
-	Tuple<std::string, int, bool, float, char, long, double> 
+	Tuple<std::string, int, bool, float, char, long, double>
 		aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14);
 	assertTrue (aTuple != aTuple2);
 	aTuple = aTuple2;
@@ -256,7 +256,7 @@ void TuplesTest::testTuple8()
 {
 	Tuple<std::string, int, bool, float, char, long, double, short> aTuple;
 	assertTrue (aTuple.length == 8);
-	Tuple<std::string, int, bool, float, char, long, double, short> 
+	Tuple<std::string, int, bool, float, char, long, double, short>
 		aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700);
 	assertTrue (aTuple != aTuple2);
 	aTuple = aTuple2;
@@ -269,7 +269,7 @@ void TuplesTest::testTuple9()
 {
 	Tuple<std::string, int, bool, float, char, long, double, short, std::string> aTuple;
 	assertTrue (aTuple.length == 9);
-	Tuple<std::string, int, bool, float, char, long, double, short, std::string> 
+	Tuple<std::string, int, bool, float, char, long, double, short, std::string>
 		aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2");
 	assertTrue (aTuple != aTuple2);
 	aTuple = aTuple2;
@@ -296,7 +296,7 @@ void TuplesTest::testTuple10()
 
 void TuplesTest::testTuple11()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string> TupleType;
 
 	TupleType aTuple;
@@ -312,7 +312,7 @@ void TuplesTest::testTuple11()
 
 void TuplesTest::testTuple12()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int> TupleType;
 
 	TupleType aTuple;
@@ -328,7 +328,7 @@ void TuplesTest::testTuple12()
 
 void TuplesTest::testTuple13()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int, bool> TupleType;
 
 	TupleType aTuple;
@@ -344,7 +344,7 @@ void TuplesTest::testTuple13()
 
 void TuplesTest::testTuple14()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int, bool, float> TupleType;
 
 	TupleType aTuple;
@@ -360,7 +360,7 @@ void TuplesTest::testTuple14()
 
 void TuplesTest::testTuple15()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int, bool, float, char> TupleType;
 
 	TupleType aTuple;
@@ -376,7 +376,7 @@ void TuplesTest::testTuple15()
 
 void TuplesTest::testTuple16()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int, bool, float, char, long> TupleType;
 
 	TupleType aTuple;
@@ -392,7 +392,7 @@ void TuplesTest::testTuple16()
 
 void TuplesTest::testTuple17()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int, bool, float, char, long, double> TupleType;
 
 	TupleType aTuple;
@@ -408,7 +408,7 @@ void TuplesTest::testTuple17()
 
 void TuplesTest::testTuple18()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int, bool, float, char, long, double, short> TupleType;
 
 	TupleType aTuple;
@@ -424,7 +424,7 @@ void TuplesTest::testTuple18()
 
 void TuplesTest::testTuple19()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int, bool, float, char, long, double, short, std::string> TupleType;
 
 	TupleType aTuple;
@@ -440,12 +440,12 @@ void TuplesTest::testTuple19()
 
 void TuplesTest::testTuple20()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int, bool, float, char, long, double, short, std::string, int> TupleType;
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 20);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2,
 					  "1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2);
 	assertTrue (aTuple != aTuple2);
@@ -464,7 +464,7 @@ void TuplesTest::testTuple21()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 21);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5");
@@ -486,7 +486,7 @@ void TuplesTest::testTuple22()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 22);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5);
@@ -508,7 +508,7 @@ void TuplesTest::testTuple23()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 23);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true);
@@ -530,7 +530,7 @@ void TuplesTest::testTuple24()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 24);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f);
@@ -552,7 +552,7 @@ void TuplesTest::testTuple25()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 25);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c');
@@ -574,7 +574,7 @@ void TuplesTest::testTuple26()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 26);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999);
@@ -596,7 +596,7 @@ void TuplesTest::testTuple27()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 27);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14);
@@ -618,7 +618,7 @@ void TuplesTest::testTuple28()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 28);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700);
@@ -640,7 +640,7 @@ void TuplesTest::testTuple29()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 29);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6");
@@ -662,7 +662,7 @@ void TuplesTest::testTuple30()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 30);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6);
@@ -685,7 +685,7 @@ void TuplesTest::testTuple31()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 31);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -709,7 +709,7 @@ void TuplesTest::testTuple32()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 32);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -733,7 +733,7 @@ void TuplesTest::testTuple33()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 33);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -757,7 +757,7 @@ void TuplesTest::testTuple34()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 34);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -781,7 +781,7 @@ void TuplesTest::testTuple35()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 35);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -805,7 +805,7 @@ void TuplesTest::testTuple36()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 36);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -829,7 +829,7 @@ void TuplesTest::testTuple37()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 37);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -853,7 +853,7 @@ void TuplesTest::testTuple38()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 38);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -877,7 +877,7 @@ void TuplesTest::testTuple39()
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 39);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -938,7 +938,7 @@ void TuplesTest::testTuple40()
 	assertTrue (aTuple.get<38>() == "");
 	assertTrue (aTuple.get<39>() == 0);
 
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'a', 999, 33.14, 32700, "2", 2,
 					  "3", 3, true, 3.14f, 'b', 999, 33.14, 32700, "4", 4,
 					  "5", 5, true, 3.14f, 'c', 999, 33.14, 32700, "6", 6,
@@ -1063,12 +1063,12 @@ void TuplesTest::testTuple40()
 
 void TuplesTest::testTupleOrder()
 {
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int,
 		std::string, int, bool, float, char, long, double, short, std::string, int> TupleType;
 
 	TupleType aTuple;
 	assertTrue (aTuple.length == 20);
-	
+
 	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2);
 	assertTrue (aTuple != aTuple2);
 	aTuple = aTuple2;
@@ -1093,7 +1093,7 @@ void TuplesTest::testTupleOrder()
 	assertTrue (tv[2] == aTuple2);
 
 	std::sort(tv.begin(), tv.end());
-	
+
 	assertTrue (tv[0] == aTuple);
 	assertTrue (tv[1] == aTuple2);
 	assertTrue (tv[2] == aTuple3);
diff --git a/Foundation/testsuite/src/TypeListTest.cpp b/Foundation/testsuite/src/TypeListTest.cpp
index b5c2682a4..725c99063 100644
--- a/Foundation/testsuite/src/TypeListTest.cpp
+++ b/Foundation/testsuite/src/TypeListTest.cpp
@@ -247,7 +247,7 @@ const int i = 0;
 	assertTrue (typeid(TypeGetter<37, TypeVoid>::HeadType) == typeid(Void));
 	assertTrue (typeid(TypeGetter<38, TypeVoid>::HeadType) == typeid(Void));
 	assertTrue (typeid(TypeGetter<39, TypeVoid>::HeadType) == typeid(Void));
-	
+
 
 	typedef TypeOneReplacer<TypeVoid, Void, Int8>::HeadType TypeFirstReplacer;
 	assertTrue (typeid(TypeGetter<0, TypeFirstReplacer>::HeadType) == typeid(Int8));
diff --git a/Foundation/testsuite/src/URIStreamOpenerTest.cpp b/Foundation/testsuite/src/URIStreamOpenerTest.cpp
index 9d23a2bb8..9a68ea1e2 100644
--- a/Foundation/testsuite/src/URIStreamOpenerTest.cpp
+++ b/Foundation/testsuite/src/URIStreamOpenerTest.cpp
@@ -35,7 +35,7 @@ namespace
 		StringStreamFactory()
 		{
 		}
-		
+
 		std::istream* open(const URI& uri)
 		{
 			return new std::istringstream(uri.toString());
@@ -62,12 +62,12 @@ void URIStreamOpenerTest::testStreamOpenerFile()
 	assertTrue (ostr.good());
 	ostr << "Hello, world!" << std::endl;
 	ostr.close();
-	
+
 	URI uri;
 	uri.setScheme("file");
 	uri.setPath(Path(path).toString(Path::PATH_UNIX));
 	std::string uriString = uri.toString();
-	
+
 	URIStreamOpener opener;
 	std::istream* istr = opener.open(uri);
 	assertTrue (istr != 0);
@@ -84,10 +84,10 @@ void URIStreamOpenerTest::testStreamOpenerRelative()
 	assertTrue (ostr.good());
 	ostr << "Hello, world!" << std::endl;
 	ostr.close();
-	
+
 	URI uri(Path(path).toString(Path::PATH_UNIX));
 	std::string uriString = uri.toString();
-	
+
 	URIStreamOpener opener;
 	std::istream* istr = opener.open(uri);
 	assertTrue (istr != 0);
@@ -104,12 +104,12 @@ void URIStreamOpenerTest::testStreamOpenerURI()
 	assertTrue (ostr.good());
 	ostr << "Hello, world!" << std::endl;
 	ostr.close();
-	
+
 	URI uri;
 	uri.setScheme("file");
 	uri.setPath(Path(path).toString(Path::PATH_UNIX));
 	std::string uriString = uri.toString();
-	
+
 	URIStreamOpener opener;
 	std::istream* istr = opener.open(uriString);
 	assertTrue (istr != 0);
@@ -126,16 +126,16 @@ void URIStreamOpenerTest::testStreamOpenerURIResolve()
 	assertTrue (ostr.good());
 	ostr << "Hello, world!" << std::endl;
 	ostr.close();
-	
+
 	Path p(path);
 	p.makeAbsolute();
 	Path parent(p.parent());
-	
+
 	URI uri;
 	uri.setScheme("file");
 	uri.setPath(parent.toString(Path::PATH_UNIX));
 	std::string uriString = uri.toString();
-	
+
 	URIStreamOpener opener;
 	std::istream* istr = opener.open(uriString, p.getFileName());
 	assertTrue (istr != 0);
@@ -152,7 +152,7 @@ void URIStreamOpenerTest::testStreamOpenerPath()
 	assertTrue (ostr.good());
 	ostr << "Hello, world!" << std::endl;
 	ostr.close();
-		
+
 	URIStreamOpener opener;
 	std::istream* istr = opener.open(path);
 	assertTrue (istr != 0);
@@ -169,11 +169,11 @@ void URIStreamOpenerTest::testStreamOpenerPathResolve()
 	assertTrue (ostr.good());
 	ostr << "Hello, world!" << std::endl;
 	ostr.close();
-	
+
 	Path p(path);
 	Path parent(p.parent());
 	std::string base = parent.toString();
-		
+
 	URIStreamOpener opener;
 	std::istream* istr = opener.open(base, p.getFileName());
 	assertTrue (istr != 0);
diff --git a/Foundation/testsuite/src/URITest.cpp b/Foundation/testsuite/src/URITest.cpp
index f76a28397..e835b377b 100644
--- a/Foundation/testsuite/src/URITest.cpp
+++ b/Foundation/testsuite/src/URITest.cpp
@@ -743,6 +743,7 @@ void URITest::testOther()
 	assertTrue (uri.getQuery() == "q=hello%world");
 	assertTrue (uri.getRawQuery() == "q=hello%25world");
 	assertTrue (uri.getFragment() == "frag ment");
+	assertTrue (uri.getRawFragment() == "frag%20ment");
 	assertTrue (uri.toString() == "http://google.com/search?q=hello%25world#frag%20ment");
 	assertTrue (uri.getPathEtc() == "/search?q=hello%25world#frag%20ment");
 
@@ -783,8 +784,20 @@ void URITest::testOther()
 	assertTrue (uri.getQuery() == "q=hello+world");
 	assertTrue (uri.getRawQuery() == "q=hello+world");
 	assertTrue (uri.getFragment() == "frag ment");
+	assertTrue (uri.getRawFragment() == "frag%20ment");
 	assertTrue (uri.toString() == "http://google.com/search?q=hello+world#frag%20ment");
 	assertTrue (uri.getPathEtc() == "/search?q=hello+world#frag%20ment");
+
+	uri.setFragment("foo/bar");
+	assertTrue (uri.getFragment() == "foo/bar");
+	assertTrue (uri.getRawFragment() == "foo/bar");
+	assertTrue (uri.toString() == "http://google.com/search?q=hello+world#foo/bar");
+	assertTrue (uri.getPathEtc() == "/search?q=hello+world#foo/bar");
+	uri.setRawFragment("foo%2Fbar");
+	assertTrue (uri.getFragment() == "foo/bar");
+	assertTrue (uri.getRawFragment() == "foo%2Fbar");
+	assertTrue (uri.toString() == "http://google.com/search?q=hello+world#foo%2Fbar");
+	assertTrue (uri.getPathEtc() == "/search?q=hello+world#foo%2Fbar");
 }
 
 
@@ -858,6 +871,40 @@ void URITest::testQueryParameters()
 }
 
 
+void URITest::testQueryParametersPlus()
+{
+	Poco::URI uri("http://google.com/search?q=hello+world&client=safari");
+	URI::QueryParameters params = uri.getQueryParameters(false);
+	assertTrue (params.size() == 2);
+	assertTrue (params[0].first == "q");
+	assertTrue (params[0].second == "hello+world");
+	assertTrue (params[1].first == "client");
+	assertTrue (params[1].second == "safari");
+
+	uri.setQueryParameters(params);
+	assertTrue (uri.toString() == "http://google.com/search?q=hello%2Bworld&client=safari");
+
+	uri = "http://google.com/search?q=&client&";
+	params = uri.getQueryParameters();
+	assertTrue (params.size() == 2);
+	assertTrue (params[0].first == "q");
+	assertTrue (params[0].second == "");
+	assertTrue (params[1].first == "client");
+	assertTrue (params[1].second == "");
+
+	uri.setQueryParameters(params);
+	assertTrue (uri.toString() == "http://google.com/search?q=&client=");
+
+	params[0].second = "foo/bar?";
+	uri.setQueryParameters(params);
+	assertTrue (uri.toString() == "http://google.com/search?q=foo%2Fbar%3F&client=");
+
+	params[0].second = "foo&bar";
+	uri.setQueryParameters(params);
+	assertTrue (uri.toString() == "http://google.com/search?q=foo%26bar&client=");
+}
+
+
 void URITest::setUp()
 {
 }
@@ -883,6 +930,7 @@ CppUnit::Test* URITest::suite()
 	CppUnit_addTest(pSuite, URITest, testOther);
 	CppUnit_addTest(pSuite, URITest, testFromPath);
 	CppUnit_addTest(pSuite, URITest, testQueryParameters);
+	CppUnit_addTest(pSuite, URITest, testQueryParametersPlus);
 
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/URITest.h b/Foundation/testsuite/src/URITest.h
index 3c5aff255..b2135407a 100644
--- a/Foundation/testsuite/src/URITest.h
+++ b/Foundation/testsuite/src/URITest.h
@@ -35,6 +35,7 @@ public:
 	void testOther();
 	void testFromPath();
 	void testQueryParameters();
+	void testQueryParametersPlus();
 
 	void setUp();
 	void tearDown();
diff --git a/Foundation/testsuite/src/UUIDGeneratorTest.cpp b/Foundation/testsuite/src/UUIDGeneratorTest.cpp
index 1ea742e52..6c3680b30 100644
--- a/Foundation/testsuite/src/UUIDGeneratorTest.cpp
+++ b/Foundation/testsuite/src/UUIDGeneratorTest.cpp
@@ -34,7 +34,7 @@ UUIDGeneratorTest::~UUIDGeneratorTest()
 void UUIDGeneratorTest::testTimeBased()
 {
 	UUIDGenerator& gen = UUIDGenerator::defaultGenerator();
-	
+
 	std::set<UUID> uuids;
 	for (int i = 0; i < 1000; ++i)
 	{
diff --git a/Foundation/testsuite/src/UUIDGeneratorTest.h b/Foundation/testsuite/src/UUIDGeneratorTest.h
index c01223caa..210eef4cc 100644
--- a/Foundation/testsuite/src/UUIDGeneratorTest.h
+++ b/Foundation/testsuite/src/UUIDGeneratorTest.h
@@ -27,7 +27,7 @@ public:
 	void testTimeBased();
 	void testRandom();
 	void testNameBased();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Foundation/testsuite/src/UUIDTest.cpp b/Foundation/testsuite/src/UUIDTest.cpp
index baef56807..5765dc064 100644
--- a/Foundation/testsuite/src/UUIDTest.cpp
+++ b/Foundation/testsuite/src/UUIDTest.cpp
@@ -32,12 +32,12 @@ void UUIDTest::testParse()
 {
 	UUID uuid("6ba7b810-9dad-11d1-80b4-00c04fd430c8");
 	assertTrue (uuid.toString() == "6ba7b810-9dad-11d1-80b4-00c04fd430c8");
-	
+
 	uuid.parse("6BA7B810-9DAD-11D1-80B4-00C04FD430C8");
-	assertTrue (uuid.toString() == "6ba7b810-9dad-11d1-80b4-00c04fd430c8");	
+	assertTrue (uuid.toString() == "6ba7b810-9dad-11d1-80b4-00c04fd430c8");
 
 	uuid.parse("6BA7B8109DAD11D180B400C04FD430C8");
-	assertTrue (uuid.toString() == "6ba7b810-9dad-11d1-80b4-00c04fd430c8");	
+	assertTrue (uuid.toString() == "6ba7b810-9dad-11d1-80b4-00c04fd430c8");
 
 	try
 	{
@@ -102,7 +102,7 @@ void UUIDTest::testBuffer()
 	uuid.copyTo(buffer);
 	UUID uuid2;
 	uuid2.copyFrom(buffer);
-	assertTrue (uuid2.toString() == "6ba7b810-9dad-11d1-80b4-00c04fd430c8");	
+	assertTrue (uuid2.toString() == "6ba7b810-9dad-11d1-80b4-00c04fd430c8");
 }
 
 
@@ -111,7 +111,7 @@ void UUIDTest::testCompare()
 	UUID null;
 	assertTrue (null.isNull());
 	assertTrue (UUID::null().isNull());
-	
+
 	UUID uuid1 = null;
 	UUID uuid2;
 	assertTrue (uuid1.isNull());
@@ -122,7 +122,7 @@ void UUIDTest::testCompare()
 	assertTrue (!(uuid1 > null));
 	assertTrue (!(uuid1 < null));
 	assertTrue (uuid1.toString() == "00000000-0000-0000-0000-000000000000");
-	
+
 	uuid1 = UUID::dns();
 	assertTrue (!uuid1.isNull());
 	assertTrue (uuid1 != null);
@@ -139,7 +139,7 @@ void UUIDTest::testCompare()
 	assertTrue (null <= uuid1);
 	assertTrue (!(null > uuid1));
 	assertTrue (null < uuid1);
-	
+
 	uuid2 = uuid1;
 	assertTrue (uuid2 == uuid1);
 	assertTrue (!(uuid2 != uuid1));
@@ -155,7 +155,7 @@ void UUIDTest::testVersion()
 	UUID uuid("db4fa7e9-9e62-4597-99e0-b1ec0b59800e");
 	UUID::Version v = uuid.version();
 	assertTrue (v == UUID::UUID_RANDOM);
-	
+
 	uuid.parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8");
 	v = uuid.version();
 	assertTrue (v == UUID::UUID_TIME_BASED);
@@ -175,7 +175,7 @@ void UUIDTest::testVariant()
 	UUID uuid("db4fa7e9-9e62-4597-99e0-b1ec0b59800e");
 	int v = uuid.variant();
 	assertTrue (v == 2);
-	
+
 	uuid.parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8");
 	v = uuid.variant();
 	assertTrue (v == 2);
diff --git a/Foundation/testsuite/src/UnicodeConverterTest.cpp b/Foundation/testsuite/src/UnicodeConverterTest.cpp
index 3fc31a1b5..90826693b 100644
--- a/Foundation/testsuite/src/UnicodeConverterTest.cpp
+++ b/Foundation/testsuite/src/UnicodeConverterTest.cpp
@@ -37,7 +37,7 @@ UnicodeConverterTest::~UnicodeConverterTest()
 
 void UnicodeConverterTest::testUTF16()
 {
-	
+
 	runTests<UTF16String>();
 }
 
diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
index 1bf895566..a80ce418e 100644
--- a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
+++ b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
@@ -112,7 +112,7 @@ void UniqueExpireCacheTest::testAccessUpdate()
 	assertTrue (!aCache.has(3));
 	assertTrue (!aCache.has(5));
 	Thread::sleep(DURSLEEP*2);
-	
+
 	assertTrue (!aCache.has(1));
 	assertTrue (!aCache.has(3));
 	assertTrue (!aCache.has(5));
@@ -162,7 +162,7 @@ void UniqueExpireCacheTest::testExpireN()
 	assertTrue (aCache.has(3));
 	tmp = aCache.get(1);
 	SharedPtr<IntVal> tmp2 = aCache.get(3);
-	assertTrue (tmp->value == 2); 
+	assertTrue (tmp->value == 2);
 	assertTrue (tmp2->value == 4);
 
 	Thread::sleep(DURHALFSLEEP+25); //3|1
diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.h b/Foundation/testsuite/src/UniqueExpireCacheTest.h
index d0de8b42b..0f0db1f4a 100644
--- a/Foundation/testsuite/src/UniqueExpireCacheTest.h
+++ b/Foundation/testsuite/src/UniqueExpireCacheTest.h
@@ -32,7 +32,7 @@ public:
 	void testExpireN();
 	void testExpirationDecorator();
 	void testAccessUpdate();
-	
+
 	void setUp();
 	void tearDown();
 	static CppUnit::Test* suite();
diff --git a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
index 702162504..269343c1a 100644
--- a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
+++ b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
@@ -127,7 +127,7 @@ void UniqueExpireLRUCacheTest::testExpireN()
 	assertTrue (aCache.has(3));
 	tmp = aCache.get(1);
 	SharedPtr<IntVal> tmp2 = aCache.get(3);
-	assertTrue (tmp->value == 2); 
+	assertTrue (tmp->value == 2);
 	assertTrue (tmp2->value == 4);
 
 	Thread::sleep(DURHALFSLEEP+25); //3|1
diff --git a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h
index 1b5279cf4..ecda7d360 100644
--- a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h
+++ b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h
@@ -32,7 +32,7 @@ public:
 	void testCacheSize2();
 	void testCacheSizeN();
 	void testDuplicateAdd();
-	
+
 	void setUp();
 	void tearDown();
 	static CppUnit::Test* suite();
diff --git a/Foundation/testsuite/src/VarTest.cpp b/Foundation/testsuite/src/VarTest.cpp
index b3ef96df5..d922e4a39 100644
--- a/Foundation/testsuite/src/VarTest.cpp
+++ b/Foundation/testsuite/src/VarTest.cpp
@@ -1517,7 +1517,7 @@ void VarTest::testLongLong()
 
 	try
 	{
-		Int16 value2; value2 = a1.extract<Int16>();
+		POCO_UNUSED Int16 value2; value2 = a1.extract<Int16>();
 		fail("bad cast - must throw");
 	}
 	catch (Poco::BadCastException&)
@@ -1611,7 +1611,7 @@ void VarTest::testULongLong()
 
 	try
 	{
-		Int16 value2; value2 = a1.extract<Int16>();
+		POCO_UNUSED Int16 value2; value2 = a1.extract<Int16>();
 		fail("bad cast - must throw");
 	}
 	catch (Poco::BadCastException&)
diff --git a/Foundation/testsuite/src/WinCEDriver.cpp b/Foundation/testsuite/src/WinCEDriver.cpp
index 1ad0995b0..9c5104c8c 100644
--- a/Foundation/testsuite/src/WinCEDriver.cpp
+++ b/Foundation/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int wmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("FoundationTestSuite", FoundationTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/Foundation/testsuite/src/ZLibTest.cpp b/Foundation/testsuite/src/ZLibTest.cpp
index 966d2d9d4..c750d661d 100644
--- a/Foundation/testsuite/src/ZLibTest.cpp
+++ b/Foundation/testsuite/src/ZLibTest.cpp
@@ -128,13 +128,13 @@ void ZLibTest::testGzip1()
 void ZLibTest::testGzip2()
 {
 	// created with gzip ("Hello, world!"):
-	const unsigned char gzdata[] = 
+	const unsigned char gzdata[] =
 	{
-		0x1f, 0x8b, 0x08, 0x08, 0xb0, 0x73, 0xd0, 0x41, 0x00, 0x03, 0x68, 0x77, 0x00, 0xf3, 0x48, 0xcd, 
-		0xc9, 0xc9, 0xd7, 0x51, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0x51, 0xe4, 0x02, 0x00, 0x18, 0xa7, 0x55, 
+		0x1f, 0x8b, 0x08, 0x08, 0xb0, 0x73, 0xd0, 0x41, 0x00, 0x03, 0x68, 0x77, 0x00, 0xf3, 0x48, 0xcd,
+		0xc9, 0xc9, 0xd7, 0x51, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0x51, 0xe4, 0x02, 0x00, 0x18, 0xa7, 0x55,
 		0x7b, 0x0e, 0x00, 0x00, 0x00, 0x00
 	};
-	
+
 	std::string gzstr((char*) gzdata, sizeof(gzdata));
 	std::istringstream istr(gzstr);
 	InflatingInputStream inflater(istr, InflatingStreamBuf::STREAM_GZIP);
@@ -142,7 +142,7 @@ void ZLibTest::testGzip2()
 	inflater >> data;
 	assertTrue (data == "Hello,");
 	inflater >> data;
-	assertTrue (data == "world!");	
+	assertTrue (data == "world!");
 }
 
 
@@ -171,7 +171,7 @@ void ZLibTest::testGzip3()
 	inflater >> data;
 	assertTrue (data == "bcdefabcdefabcdefabcdefabcdefabcdefa");
 	inflater >> data;
-	assertTrue (data == "bcdefabcdefabcdefabcdefabcdefabcdefa");	
+	assertTrue (data == "bcdefabcdefabcdefabcdefabcdefabcdefa");
 }
 
 
diff --git a/Foundation/wcelibcex-1.0/LICENSE.txt b/Foundation/wcelibcex-1.0/LICENSE.txt
index a1a2d4ba1..8e0f7fb8a 100644
--- a/Foundation/wcelibcex-1.0/LICENSE.txt
+++ b/Foundation/wcelibcex-1.0/LICENSE.txt
@@ -7,9 +7,9 @@ http://opensource.org/licenses/mit-license.php
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation 
+to deal in the Software without restriction, including without limitation
 the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom 
+and/or sell copies of the Software, and to permit persons to whom
 the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included
diff --git a/Foundation/wcelibcex-1.0/README.txt b/Foundation/wcelibcex-1.0/README.txt
index 2d7892d68..326673833 100644
--- a/Foundation/wcelibcex-1.0/README.txt
+++ b/Foundation/wcelibcex-1.0/README.txt
@@ -19,4 +19,4 @@ COPYING.txt - copyright and provenience notice
 BUILD.txt   - building instructions
 
 Initial version of WCELIBCEX was founded and copyrighted by Taxus SI Ltd.,
-http://www.taxussi.com.pl 
+http://www.taxussi.com.pl
diff --git a/Foundation/wcelibcex-1.0/src/errno.h b/Foundation/wcelibcex-1.0/src/errno.h
index 8b1b1103c..e67313b78 100644
--- a/Foundation/wcelibcex-1.0/src/errno.h
+++ b/Foundation/wcelibcex-1.0/src/errno.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/fcntl.h b/Foundation/wcelibcex-1.0/src/fcntl.h
index f980a314e..7756f1c46 100644
--- a/Foundation/wcelibcex-1.0/src/fcntl.h
+++ b/Foundation/wcelibcex-1.0/src/fcntl.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_abort.c b/Foundation/wcelibcex-1.0/src/wce_abort.c
index 3a5274c19..1fcb02a33 100644
--- a/Foundation/wcelibcex-1.0/src/wce_abort.c
+++ b/Foundation/wcelibcex-1.0/src/wce_abort.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -42,13 +42,13 @@
 * Description:
 *
 *   The abort() function shall cause abnormal process termination to occur.
-*   Internally, mkdir() function wraps TerminateProcess call from 
+*   Internally, mkdir() function wraps TerminateProcess call from
 *   Windows CE API.
 *
 * Return:
 *
 *   The abort() function shall not return.*
-*       
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
diff --git a/Foundation/wcelibcex-1.0/src/wce_access.c b/Foundation/wcelibcex-1.0/src/wce_access.c
index 36e9f34fe..993ae72f8 100644
--- a/Foundation/wcelibcex-1.0/src/wce_access.c
+++ b/Foundation/wcelibcex-1.0/src/wce_access.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -41,7 +41,7 @@
 *
 * Return:
 *   0 if the file has the given mode
-*   –1 if the named file does not exist or is not accessible in the given mode 
+*   –1 if the named file does not exist or is not accessible in the given mode
 *   and errno set as :
 *       EACCES file's permission setting does not allow specified access
 *       ENOENT filename or path not found
@@ -78,15 +78,15 @@ int wceex_waccess( const wchar_t *path, int mode )
 *
 * Description:
 *
-* Return: 
+* Return:
 *   0 if the file has the given mode
-*   –1 if the named file does not exist or is not accessible in the given mode 
+*   –1 if the named file does not exist or is not accessible in the given mode
 *   and errno set as :
 *       EACCES file's permission setting does not allow specified access
 *       ENOENT filename or path not found
-*       
+*
 * Reference:
-* 
+*
 *******************************************************************************/
 
 int wceex_access( const char *path, int mode )
diff --git a/Foundation/wcelibcex-1.0/src/wce_asctime.c b/Foundation/wcelibcex-1.0/src/wce_asctime.c
index 542db2632..562feaf52 100644
--- a/Foundation/wcelibcex-1.0/src/wce_asctime.c
+++ b/Foundation/wcelibcex-1.0/src/wce_asctime.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -48,7 +48,7 @@
 static char __wce_asc_result[TIME_STRING_SIZE];
 
 /* Format of string returned. */
-static const char __wce_asc_format[] = "%.3s %.3s %02d %.2d:%.2d:%.2d %d\n"; 
+static const char __wce_asc_format[] = "%.3s %.3s %02d %.2d:%.2d:%.2d %d\n";
 
 
 /*******************************************************************************
@@ -64,7 +64,7 @@ static const char __wce_asc_format[] = "%.3s %.3s %02d %.2d:%.2d:%.2d %d\n";
 *   Sun, Mon, Tue, Wed, Thu, Fri, and Sat.
 *
 *   The abbreviations for the months are:
-*   Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, and Dec. 
+*   Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, and Dec.
 *
 *   The asctime() is not required to be thread-safe.
 *
@@ -72,7 +72,7 @@ static const char __wce_asc_format[] = "%.3s %.3s %02d %.2d:%.2d:%.2d %d\n";
 *
 *   IEEE Std 1003.1-2001
 *   The GNU C Library Manual
-* 
+*
 *******************************************************************************/
 char * wceex_asctime(const struct tm *tmbuff)
 {
@@ -101,9 +101,9 @@ char * wceex_asctime(const struct tm *tmbuff)
 *
 *   IEEE Std 1003.1-2001
 *   The GNU C Library Manual
-* 
+*
 *******************************************************************************/
-char * wceex_asctime_r(const struct tm *tmbuff, char *buff) 
+char * wceex_asctime_r(const struct tm *tmbuff, char *buff)
 {
     int res;
     static char wday_short[7][3] = {
@@ -113,7 +113,7 @@ char * wceex_asctime_r(const struct tm *tmbuff, char *buff)
         "Jan", "Feb", "Mar", "Apr", "May", "Jun",
         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
     };
- 
+
     if (tmbuff == NULL)
     {
         // XXX - mloskot - set errno with EINVAL
diff --git a/Foundation/wcelibcex-1.0/src/wce_bsearch.c b/Foundation/wcelibcex-1.0/src/wce_bsearch.c
index d61392ca9..b43dcfa76 100644
--- a/Foundation/wcelibcex-1.0/src/wce_bsearch.c
+++ b/Foundation/wcelibcex-1.0/src/wce_bsearch.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -41,7 +41,7 @@
 *
 * Return:
 *
-*       
+*
 * Reference:
 *   IEEE 1003.1, 2004 Edition
 *******************************************************************************/
diff --git a/Foundation/wcelibcex-1.0/src/wce_clock.c b/Foundation/wcelibcex-1.0/src/wce_clock.c
index b06c7553e..7aac06fc5 100644
--- a/Foundation/wcelibcex-1.0/src/wce_clock.c
+++ b/Foundation/wcelibcex-1.0/src/wce_clock.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -52,12 +52,12 @@
 *   CLOCKS_PER_SEC is defined to be one million in <time.h>.
 *   If the processor time used is not available or its value cannot be represented,
 *   the function shall return the value ( clock_t)-1.
-* 
+*
 * Reference:
 *
 *   IEEE Std 1003.1-2001
 *   The GNU C Library Manual
-* 
+*
 *******************************************************************************/
 
 
@@ -67,9 +67,9 @@ clock_t wceex_clock()
     __int64 ticks;
     SYSTEMTIME stCurrent;
     FILETIME   ftCurrent;
-    
+
     GetSystemTime(&stCurrent);
-    
+
     if (SystemTimeToFileTime(&stCurrent, &ftCurrent))
     {
         ticks = *(__int64*)&ftCurrent;
@@ -81,7 +81,7 @@ clock_t wceex_clock()
          */
         ticks = -1;
     }
- 
+
    return (clock_t)ticks;
 }
- 
+
diff --git a/Foundation/wcelibcex-1.0/src/wce_ctime.c b/Foundation/wcelibcex-1.0/src/wce_ctime.c
index 5b95ca10b..3af45bb71 100644
--- a/Foundation/wcelibcex-1.0/src/wce_ctime.c
+++ b/Foundation/wcelibcex-1.0/src/wce_ctime.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -56,13 +56,13 @@
 *
 *   IEEE Std 1003.1-2001
 *   The GNU C Library Manual
-* 
+*
 *******************************************************************************/
 char * wceex_ctime(const time_t *timer)
 {
    return wceex_asctime(wceex_localtime(timer));
 }
- 
+
 
 /*******************************************************************************
 * wceex_ctime_r - Convert a time value to a date and time string
@@ -86,7 +86,7 @@ char * wceex_ctime(const time_t *timer)
 *
 *   IEEE Std 1003.1-2001
 *   The GNU C Library Manual
-* 
+*
 *******************************************************************************/
 char * wceex_ctime_r(const time_t *timer, char *buf)
 {
diff --git a/Foundation/wcelibcex-1.0/src/wce_direct.h b/Foundation/wcelibcex-1.0/src/wce_direct.h
index a67491347..deab69f61 100644
--- a/Foundation/wcelibcex-1.0/src/wce_direct.h
+++ b/Foundation/wcelibcex-1.0/src/wce_direct.h
@@ -7,11 +7,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_directorymanagement.c b/Foundation/wcelibcex-1.0/src/wce_directorymanagement.c
index ad88d63ce..18d879499 100644
--- a/Foundation/wcelibcex-1.0/src/wce_directorymanagement.c
+++ b/Foundation/wcelibcex-1.0/src/wce_directorymanagement.c
@@ -1,7 +1,7 @@
 /*
  * $Id: wce_directorymanagement.c,v 1.0 2006/11/29 17:00:28 stephaned Exp $
  *
- * Defines _getcwd(), GetCurrentDirectoryW() _wgetcwd(), 
+ * Defines _getcwd(), GetCurrentDirectoryW() _wgetcwd(),
  *         _chdir(), _wchdir functions.
  *
  * Created by Stéphane Dunand (sdunand@sirap.fr)
@@ -10,11 +10,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -37,8 +37,8 @@
 #include <wce_errno.h>
 
 /*******************************************************************************
-* InitCwd - Init the current directory with the path for the file used to create 
-*           the calling process 
+* InitCwd - Init the current directory with the path for the file used to create
+*           the calling process
 *
 * Description:
 *
@@ -90,7 +90,7 @@ char* wceex_getcwd( char *buffer, int maxlen )
         return NULL;
     }
     if( InitCwd() )
-        return NULL;    
+        return NULL;
 	if( !WideCharToMultiByte( CP_ACP, 0, Cwd, -1, buffer, maxlen, NULL, NULL ) )
     {
         errno = GetLastError();
diff --git a/Foundation/wcelibcex-1.0/src/wce_errno.c b/Foundation/wcelibcex-1.0/src/wce_errno.c
index 0e6b1a8c9..96f005ccf 100644
--- a/Foundation/wcelibcex-1.0/src/wce_errno.c
+++ b/Foundation/wcelibcex-1.0/src/wce_errno.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_errno.h b/Foundation/wcelibcex-1.0/src/wce_errno.h
index 290acd4fc..683fe4502 100644
--- a/Foundation/wcelibcex-1.0/src/wce_errno.h
+++ b/Foundation/wcelibcex-1.0/src/wce_errno.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_fcntl.h b/Foundation/wcelibcex-1.0/src/wce_fcntl.h
index 47af3aa94..22667a3b5 100644
--- a/Foundation/wcelibcex-1.0/src/wce_fcntl.h
+++ b/Foundation/wcelibcex-1.0/src/wce_fcntl.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * $Id: wce_fcntl.h 20 2006-11-18 17:00:30Z mloskot $
  *
  * fcntl.h - file control options
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_findfile.c b/Foundation/wcelibcex-1.0/src/wce_findfile.c
index 525b0d195..c44f05e0d 100644
--- a/Foundation/wcelibcex-1.0/src/wce_findfile.c
+++ b/Foundation/wcelibcex-1.0/src/wce_findfile.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -48,11 +48,11 @@
 * Return:
 *
 *   XXX
-*       
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
-*   
+*
 *******************************************************************************/
 int wceex_findclose(intptr_t hFile)
 {
@@ -75,7 +75,7 @@ int wceex_findclose(intptr_t hFile)
 * Return:
 *
 *   XXX
-*       
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
@@ -87,11 +87,11 @@ intptr_t wceex_findfirst(const char *filespec, struct _finddata_t *fileinfo)
     HANDLE          hFile;
     DWORD           err;
     wchar_t         wfilename[MAX_PATH];
-    
+
     mbstowcs(wfilename, filespec, strlen(filespec) + 1);
-    
+
     /* XXX - mloskot - set errno values! */
-    
+
     hFile = FindFirstFile(wfilename, &wfd);
     if(hFile == INVALID_HANDLE_VALUE)
     {
@@ -103,26 +103,26 @@ intptr_t wceex_findfirst(const char *filespec, struct _finddata_t *fileinfo)
         case ERROR_PATH_NOT_FOUND:
             //errno = ENOENT;
             break;
-            
+
         case ERROR_NOT_ENOUGH_MEMORY:
             //errno = ENOMEM;
             break;
-            
+
         default:
             //errno = EINVAL;
             break;
         }
         return (-1);
     }
-    
+
     fileinfo->attrib = (wfd.dwFileAttributes == FILE_ATTRIBUTE_NORMAL) ? 0 : wfd.dwFileAttributes;
     fileinfo->time_create  = wceex_filetime_to_time(&wfd.ftCreationTime);
     fileinfo->time_access  = wceex_filetime_to_time(&wfd.ftLastAccessTime);
     fileinfo->time_write   = wceex_filetime_to_time(&wfd.ftLastWriteTime);
-    
+
     fileinfo->size = wfd.nFileSizeLow;
     wcstombs(fileinfo->name, wfd.cFileName, wcslen(wfd.cFileName) + 1);
-    
+
     return (intptr_t)hFile;
 }
 
@@ -136,7 +136,7 @@ intptr_t wceex_findfirst(const char *filespec, struct _finddata_t *fileinfo)
 * Return:
 *
 *   XXX
-*       
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
@@ -158,26 +158,26 @@ int wceex_findnext(intptr_t handle, struct _finddata_t *fileinfo)
         case ERROR_PATH_NOT_FOUND:
             //errno = ENOENT;
             break;
-            
+
         case ERROR_NOT_ENOUGH_MEMORY:
             //errno = ENOMEM;
             break;
-            
+
         default:
             //errno = EINVAL;
             break;
         }
         return (-1);
     }
-    
+
     fileinfo->attrib = (wfd.dwFileAttributes == FILE_ATTRIBUTE_NORMAL)? 0 : wfd.dwFileAttributes;
     fileinfo->time_create  = wceex_filetime_to_time(&wfd.ftCreationTime);
     fileinfo->time_access  = wceex_filetime_to_time(&wfd.ftLastAccessTime);
     fileinfo->time_write   = wceex_filetime_to_time(&wfd.ftLastWriteTime);
-    
+
     fileinfo->size = wfd.nFileSizeLow;
     wcstombs(fileinfo->name, wfd.cFileName, wcslen(wfd.cFileName)+1);
-    
+
     return 0;
 }
 
diff --git a/Foundation/wcelibcex-1.0/src/wce_getenv.c b/Foundation/wcelibcex-1.0/src/wce_getenv.c
index 181fa828c..ad5cef03c 100644
--- a/Foundation/wcelibcex-1.0/src/wce_getenv.c
+++ b/Foundation/wcelibcex-1.0/src/wce_getenv.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -42,7 +42,7 @@
 * Return:
 *
 *   The wceex_getenv() function ALWAYS returns NULL.*
-*       
+*
 *******************************************************************************/
 
 #include <stdlib.h>
diff --git a/Foundation/wcelibcex-1.0/src/wce_getopt.c b/Foundation/wcelibcex-1.0/src/wce_getopt.c
index 9875985da..415e031a1 100644
--- a/Foundation/wcelibcex-1.0/src/wce_getopt.c
+++ b/Foundation/wcelibcex-1.0/src/wce_getopt.c
@@ -74,8 +74,8 @@ int optreset;       /* reset getopt */
 *   A question mark (?) is returned if getopt() encounters an option
 *   character not in optstring or detects a missing argument and the first
 *   character of optstring was not a colon (:).
-*   Otherwise getopt() returns -1 when all command line options are parsed. 
-* 
+*   Otherwise getopt() returns -1 when all command line options are parsed.
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
diff --git a/Foundation/wcelibcex-1.0/src/wce_gettimeofday.c b/Foundation/wcelibcex-1.0/src/wce_gettimeofday.c
index 0b33e734a..1b03214d7 100644
--- a/Foundation/wcelibcex-1.0/src/wce_gettimeofday.c
+++ b/Foundation/wcelibcex-1.0/src/wce_gettimeofday.c
@@ -33,7 +33,7 @@
 * Reference:
 *
 *   IEEE Standard and an Open Group Technical Standard 1003.1, 2004 Edition
-* 
+*
 *******************************************************************************/
 
 int wceex_gettimeofday(struct timeval *tp, struct timezone *tzp)
@@ -59,7 +59,7 @@ int wceex_gettimeofday(struct timeval *tp, struct timezone *tzp)
     }
 
     if (NULL != tzp)
-    {   
+    {
         GetTimeZoneInformation(&tzi);
 
         tzp->tz_minuteswest = tzi.Bias;
diff --git a/Foundation/wcelibcex-1.0/src/wce_io.h b/Foundation/wcelibcex-1.0/src/wce_io.h
index aeccb7ba5..5859657d6 100644
--- a/Foundation/wcelibcex-1.0/src/wce_io.h
+++ b/Foundation/wcelibcex-1.0/src/wce_io.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_lfind.c b/Foundation/wcelibcex-1.0/src/wce_lfind.c
index a4da22169..6d49af41c 100644
--- a/Foundation/wcelibcex-1.0/src/wce_lfind.c
+++ b/Foundation/wcelibcex-1.0/src/wce_lfind.c
@@ -50,7 +50,7 @@
 * Description:
 *
 * Return:
-*       
+*
 * Reference:
 *   IEEE 1003.1, 2004 Edition
 *******************************************************************************/
diff --git a/Foundation/wcelibcex-1.0/src/wce_localtime.c b/Foundation/wcelibcex-1.0/src/wce_localtime.c
index b6f50de2a..066e11d72 100644
--- a/Foundation/wcelibcex-1.0/src/wce_localtime.c
+++ b/Foundation/wcelibcex-1.0/src/wce_localtime.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -100,7 +100,7 @@ struct tm * wceex_localtime(const time_t *timer)
 
     long tzoffset;
     TIME_ZONE_INFORMATION tzi;
-    
+
     // Retrive timezone offset in seconds
     tzoffset = 0;
 	if (GetTimeZoneInformation(&tzi) != 0xFFFFFFFF)
@@ -111,7 +111,7 @@ struct tm * wceex_localtime(const time_t *timer)
 			tzoffset += (tzi.StandardBias * 60);
         }
 	}
-    
+
     tzoffset *= -1;
     tmp = __wceex_offtime(timer, tzoffset);
 
@@ -123,7 +123,7 @@ struct tm * wceex_localtime(const time_t *timer)
 *
 * Description:
 *   This function is similar to localtime, except that the broken-down
-*   time is expressed as Coordinated Universal Time (UTC) 
+*   time is expressed as Coordinated Universal Time (UTC)
 *   rather than relative to a local time zone.
 *
 *******************************************************************************/
@@ -171,7 +171,7 @@ struct tm * __wceex_offtime(const time_t *timer, long tzoffset)
         rem += SECS_PER_DAY;
         --days;
     }
-    
+
     while (rem >= SECS_PER_DAY)
     {
         rem -= SECS_PER_DAY;
@@ -183,12 +183,12 @@ struct tm * __wceex_offtime(const time_t *timer, long tzoffset)
     tmp->tm_min = (int) (rem / SECS_PER_MIN);
     tmp->tm_sec = (int) (rem % SECS_PER_MIN);
     tmp->tm_wday = (int) ((EPOCH_WDAY + days) % DAYS_PER_WEEK);
-    
+
     if (tmp->tm_wday < 0)
         tmp->tm_wday += DAYS_PER_WEEK;
-    
+
     y = EPOCH_YEAR;
-    
+
     if (days >= 0)
     {
         for ( ; ; )
diff --git a/Foundation/wcelibcex-1.0/src/wce_mkdir.c b/Foundation/wcelibcex-1.0/src/wce_mkdir.c
index 3f6b8e671..3fa7e4c3f 100644
--- a/Foundation/wcelibcex-1.0/src/wce_mkdir.c
+++ b/Foundation/wcelibcex-1.0/src/wce_mkdir.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -42,8 +42,8 @@
 *
 * Description:
 *
-*   The mkdir() function shall create a new directory with name path. 
-*   Internally, mkdir() function wraps CreateDirectory call from 
+*   The mkdir() function shall create a new directory with name path.
+*   Internally, mkdir() function wraps CreateDirectory call from
 *   Windows CE API.
 *
 * Return:
@@ -57,7 +57,7 @@
 *******************************************************************************/
 int wceex_mkdir(const char *filename)
 {
-    int res;    
+    int res;
     size_t len;
     wchar_t *widestr;
 
@@ -66,10 +66,10 @@ int wceex_mkdir(const char *filename)
 	widestr  = (wchar_t*)malloc(sizeof(wchar_t) * len);
 
     MultiByteToWideChar( CP_ACP, 0, filename, -1, widestr, len);
-	
+
     /* Delete file using Win32 CE API call */
     res = CreateDirectory(widestr, NULL);
-	
+
     /* Free wide-char string */
     free(widestr);
 
@@ -87,8 +87,8 @@ int wceex_mkdir(const char *filename)
 *
 * Description:
 *
-*   The wmkdir() function shall create a new directory with name path. 
-*   Internally, wmkdir() function wraps CreateDirectory call from 
+*   The wmkdir() function shall create a new directory with name path.
+*   Internally, wmkdir() function wraps CreateDirectory call from
 *   Windows CE API.
 *
 * Return:
diff --git a/Foundation/wcelibcex-1.0/src/wce_mktime.c b/Foundation/wcelibcex-1.0/src/wce_mktime.c
index 180a2c1c1..312068c45 100644
--- a/Foundation/wcelibcex-1.0/src/wce_mktime.c
+++ b/Foundation/wcelibcex-1.0/src/wce_mktime.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -47,7 +47,7 @@ time_t wceex_mktime(struct tm *tmbuff)
 {
     time_t offset;
     TIME_ZONE_INFORMATION tzi;
-    
+
     offset = 0;
 
     // Retrive timezone offset in seconds
@@ -76,7 +76,7 @@ time_t wceex_mktime(struct tm *tmbuff)
 *
 * Return:
 *   Value of time if success, otherwise (time_t)-1 is returned.
-*       
+*
 *******************************************************************************/
 time_t wceex_gmmktime(struct tm *tmbuff)
 {
@@ -127,7 +127,7 @@ static time_t __wceex_mktime_internal(struct tm *tmbuff, time_t _loctime_offset)
         doy += MONTHDAYS[i];
     }
     tres += doy;
-    
+
     /* Day of year */
     tmbuff->tm_yday = doy + tmbuff->tm_mday;
 
@@ -135,7 +135,7 @@ static time_t __wceex_mktime_internal(struct tm *tmbuff, time_t _loctime_offset)
     {
         tres++;
     }
-    
+
     /* Add days of current month and convert to total to hours. */
     tres = 24 * (tres + tmbuff->tm_mday - 1) + tmbuff->tm_hour;
 
@@ -144,11 +144,11 @@ static time_t __wceex_mktime_internal(struct tm *tmbuff, time_t _loctime_offset)
 
     /* Add seconds part and convert total to seconds. */
     tres = 60 * tres + tmbuff->tm_sec;
-    
+
     /* For offset > 0 adjust time value for timezone
     given as local to UTC time difference in seconds). */
     tres += _loctime_offset;
-    
+
     return tres;
 }
 
diff --git a/Foundation/wcelibcex-1.0/src/wce_path.c b/Foundation/wcelibcex-1.0/src/wce_path.c
index 28ecd56c4..7fa304cd8 100644
--- a/Foundation/wcelibcex-1.0/src/wce_path.c
+++ b/Foundation/wcelibcex-1.0/src/wce_path.c
@@ -10,11 +10,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -48,7 +48,7 @@
 *
 *******************************************************************************/
 
-void wceex_splitpath( const char *path, 
+void wceex_splitpath( const char *path,
                       char *drive, char *dir, char *name, char *ext )
 {
     char *slash, *bslash;
@@ -107,7 +107,7 @@ void wceex_splitpath( const char *path,
 *
 *******************************************************************************/
 
-void wceex_wsplitpath( const wchar_t *path, 
+void wceex_wsplitpath( const wchar_t *path,
                        wchar_t *drive, wchar_t *dir, wchar_t *name, wchar_t *ext )
 {
     wchar_t *slash, *bslash;
@@ -306,7 +306,7 @@ void wceex_wmakepath( wchar_t *path,
 *
 *******************************************************************************/
 
-DWORD wceex_GetFullPathNameW( LPCWSTR lpFileName, DWORD nBufferLength, 
+DWORD wceex_GetFullPathNameW( LPCWSTR lpFileName, DWORD nBufferLength,
                               LPWSTR lpBuffer, LPWSTR *lpFilePart )
 {
     int up = 0, down = 0;
@@ -462,8 +462,8 @@ char* wceex_fullpath( char *absPath, const char *relPath, size_t maxLength )
         *absPath = 0;
         return NULL;
     }
-    wret = wceex_wfullpath( wabsPath, wrelPath, maxLength ); 
-    if( wret && !WideCharToMultiByte( CP_ACP, 0, wabsPath, -1, absPath, 
+    wret = wceex_wfullpath( wabsPath, wrelPath, maxLength );
+    if( wret && !WideCharToMultiByte( CP_ACP, 0, wabsPath, -1, absPath,
                                       maxLength, NULL, NULL ) )
     {
         errno = GetLastError();
diff --git a/Foundation/wcelibcex-1.0/src/wce_rename.c b/Foundation/wcelibcex-1.0/src/wce_rename.c
index a9029f0f2..3cb750bc5 100644
--- a/Foundation/wcelibcex-1.0/src/wce_rename.c
+++ b/Foundation/wcelibcex-1.0/src/wce_rename.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -50,7 +50,7 @@
 * Return:
 *
 * Upon successful completion, rename() returns 0. Otherwise, -1 is returned.
-* 
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
@@ -58,19 +58,19 @@
 *******************************************************************************/
 int wceex_rename(const char *oldfile, const char *newfile)
 {
-    int res;    
+    int res;
     size_t lenold;
     size_t lennew;
     wchar_t *wsold;
     wchar_t *wsnew;
-    
+
     /* Covert filename buffer to Unicode. */
 
     /* Old filename */
     lenold = MultiByteToWideChar (CP_ACP, 0, oldfile, -1, NULL, 0) ;
     wsold = (wchar_t*)malloc(sizeof(wchar_t) * lenold);
     MultiByteToWideChar( CP_ACP, 0, oldfile, -1, wsold, lenold);
-    
+
     /* New filename */
     lennew = MultiByteToWideChar (CP_ACP, 0, newfile, -1, NULL, 0) ;
     wsnew = (wchar_t*)malloc(sizeof(wchar_t) * lennew);
@@ -78,11 +78,11 @@ int wceex_rename(const char *oldfile, const char *newfile)
 
     /* Delete file using Win32 CE API call */
     res = MoveFile(wsold, wsnew);
-    
+
     /* Free wide-char string */
     free(wsold);
     free(wsnew);
-    
+
     if (res)
         return 0; /* success */
     else
diff --git a/Foundation/wcelibcex-1.0/src/wce_rewind.c b/Foundation/wcelibcex-1.0/src/wce_rewind.c
index 175ce1834..083eb8738 100644
--- a/Foundation/wcelibcex-1.0/src/wce_rewind.c
+++ b/Foundation/wcelibcex-1.0/src/wce_rewind.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -45,7 +45,7 @@
 *   The call rewind(stream) shall be equivalent to:
 *   (void) fseek(stream, 0L, SEEK_SET)
 *
-*   Internally, rewind() function uses SetFilePointer call from 
+*   Internally, rewind() function uses SetFilePointer call from
 *   Windows CE API.
 *
 *   Windows CE specific:
@@ -55,7 +55,7 @@
 * Return:
 *
 *   No return value.
-*       
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
@@ -70,7 +70,7 @@ void wceex_rewind(FILE * fp)
      * So, that's why dirty asserts are used to get informed about potential problems.
      */
     ret = fseek(fp, 0L, SEEK_SET);
-    
+
     assert(0 == ret);
     assert(0 == ferror(fp));
     assert(!feof(fp));
diff --git a/Foundation/wcelibcex-1.0/src/wce_rmdir.c b/Foundation/wcelibcex-1.0/src/wce_rmdir.c
index 02d2bb3dc..71fdab48f 100644
--- a/Foundation/wcelibcex-1.0/src/wce_rmdir.c
+++ b/Foundation/wcelibcex-1.0/src/wce_rmdir.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -45,7 +45,7 @@
 *
 *   The rmdir() function shall remove a directory whose name is given by path.
 *   The directory shall be removed only if it is an empty directory.
-*   Internally, mkdir() function wraps RemoveDirectory call from 
+*   Internally, mkdir() function wraps RemoveDirectory call from
 *   Windows CE API.
 *
 * Return:
@@ -55,7 +55,7 @@
 *   shall not be changed.
 *
 *   XXX - mloskot - errno is not set - todo.
-*       
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
@@ -63,7 +63,7 @@
 *******************************************************************************/
 int wceex_rmdir(const char *filename)
 {
-    int res;    
+    int res;
     size_t len;
     wchar_t *widestr;
 
@@ -71,10 +71,10 @@ int wceex_rmdir(const char *filename)
 	len = MultiByteToWideChar (CP_ACP, 0, filename, -1, NULL, 0) ;
 	widestr = (wchar_t*)malloc(sizeof(wchar_t) * len);
 	MultiByteToWideChar( CP_ACP, 0, filename, -1, widestr, len);
-	
+
 	/* Delete file using Win32 CE API call */
 	res = RemoveDirectory(widestr);
-	
+
 	/* Free wide-char string */
 	free(widestr);
 
diff --git a/Foundation/wcelibcex-1.0/src/wce_setlocale.c b/Foundation/wcelibcex-1.0/src/wce_setlocale.c
index e2bcf9a6a..9e024ad92 100644
--- a/Foundation/wcelibcex-1.0/src/wce_setlocale.c
+++ b/Foundation/wcelibcex-1.0/src/wce_setlocale.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -47,7 +47,7 @@
 * Return:
 *
 *   The wceex_setlocale() function ALWAYS returns empty string.*
-*       
+*
 *******************************************************************************/
 
 char* wceex_setlocale(int category, const char* locale)
diff --git a/Foundation/wcelibcex-1.0/src/wce_stat.c b/Foundation/wcelibcex-1.0/src/wce_stat.c
index ff5b621f3..fd219870a 100644
--- a/Foundation/wcelibcex-1.0/src/wce_stat.c
+++ b/Foundation/wcelibcex-1.0/src/wce_stat.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_stat.h b/Foundation/wcelibcex-1.0/src/wce_stat.h
index 7954dff76..c68546a56 100644
--- a/Foundation/wcelibcex-1.0/src/wce_stat.h
+++ b/Foundation/wcelibcex-1.0/src/wce_stat.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -56,14 +56,14 @@ struct stat
 	/*
      * Number of the information node (the inode) for the file (UNIX-specific).
      * On UNIX file systems, the inode describes the file date and time stamps, permissions, and content.
-     * When files are hard-linked to one another, they share the same inode. 
+     * When files are hard-linked to one another, they share the same inode.
      * The inode, and therefore st_ino, has no meaning in the FAT, HPFS, or NTFS file systems.
      */
 	unsigned short st_ino;
 
 	/*
      * Bit mask for file-mode information. The _S_IFDIR bit is set if path specifies a directory;
-	 * the _S_IFREG bit is set if path specifies an ordinary file or a device. 
+	 * the _S_IFREG bit is set if path specifies an ordinary file or a device.
 	 * User read/write bits are set according to the file's permission mode;
      * user execute bits are set according to the filename extension.
      */
@@ -78,7 +78,7 @@ struct stat
 	 * A redirected file is classified as a Windows NT file.
      */
 	short st_uid;
-	
+
     /*
      * Numeric identifier of group that owns file (UNIX-specific).
      * This field will always be zero on Windows NT systems.
@@ -108,7 +108,7 @@ struct stat
 
 /* Permission bits */
 #define	S_ISUID	         04000	       /* Set user ID on execution.  */
-#define	S_ISGID	         02000	       /* Set group ID on execution.  */ 
+#define	S_ISGID	         02000	       /* Set group ID on execution.  */
 #define S_IREAD        0000400         /* Read permission, owner */
 #define S_IWRITE       0000200         /* Write permission, owner */
 #define S_IEXEC        0000100         /* Execute/search permission, owner */
diff --git a/Foundation/wcelibcex-1.0/src/wce_stdio.h b/Foundation/wcelibcex-1.0/src/wce_stdio.h
index bf91e58f5..f60c81981 100644
--- a/Foundation/wcelibcex-1.0/src/wce_stdio.h
+++ b/Foundation/wcelibcex-1.0/src/wce_stdio.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * $Id: wce_stdio.h,v 1.2 2006/04/09 16:48:18 mloskot Exp $
  *
  * stdio.h - standard buffered input/output
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_stdlib.h b/Foundation/wcelibcex-1.0/src/wce_stdlib.h
index 6dab1923d..2087a4af6 100644
--- a/Foundation/wcelibcex-1.0/src/wce_stdlib.h
+++ b/Foundation/wcelibcex-1.0/src/wce_stdlib.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -72,9 +72,9 @@ void* wceex_lfind(const void *key, const void *base, size_t *nmemb, size_t size,
 
 /* File Management Functions */
 
-void wceex_splitpath( const char *path, 
+void wceex_splitpath( const char *path,
                       char *drive, char *dir, char *name, char *ext );
-void wceex_wsplitpath( const wchar_t *path, 
+void wceex_wsplitpath( const wchar_t *path,
                        wchar_t *drive, wchar_t *dir, wchar_t *name, wchar_t *ext );
 
 void wceex_makepath( char *path,
@@ -87,12 +87,12 @@ void wceex_wmakepath( wchar_t *path,
 char*    wceex_fullpath( char *absPath, const char *relPath, size_t maxLength );
 wchar_t* wceex_wfullpath( wchar_t *absPath, const wchar_t *relPath, size_t maxLength );
 
-DWORD wceex_GetFullPathNameW( LPCWSTR lpFileName, DWORD nBufferLength, 
+DWORD wceex_GetFullPathNameW( LPCWSTR lpFileName, DWORD nBufferLength,
                               LPWSTR lpBuffer, LPWSTR *lpFilePart );
 
 /* Dummy compilation enablers - functions that do not provide any implementation. */
 
-char* wceex_getenv(const char* varname); 
+char* wceex_getenv(const char* varname);
 
 #ifdef __cplusplus
 }
diff --git a/Foundation/wcelibcex-1.0/src/wce_strerror.c b/Foundation/wcelibcex-1.0/src/wce_strerror.c
index 97beadaf2..90b7ae908 100644
--- a/Foundation/wcelibcex-1.0/src/wce_strerror.c
+++ b/Foundation/wcelibcex-1.0/src/wce_strerror.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -38,7 +38,7 @@
 * strerror - get error message string
 *
 * Description:
-* 
+*
 *   The strerror() function shall map the error number in errnum
 *   to a locale-dependent error message string and shall return
 *   a pointer to it. Typically, the values for errnum come
diff --git a/Foundation/wcelibcex-1.0/src/wce_string.h b/Foundation/wcelibcex-1.0/src/wce_string.h
index dc71e08c5..0bdbd5ac2 100644
--- a/Foundation/wcelibcex-1.0/src/wce_string.h
+++ b/Foundation/wcelibcex-1.0/src/wce_string.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_time.c b/Foundation/wcelibcex-1.0/src/wce_time.c
index 3a082eee9..b976cdd53 100644
--- a/Foundation/wcelibcex-1.0/src/wce_time.c
+++ b/Foundation/wcelibcex-1.0/src/wce_time.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -46,7 +46,7 @@
 *
 * Return:
 *   Value of time if success, otherwise (time_t)-1 is returned.
-*       
+*
 * Reference:
 *   IEEE Standard and an Open Group Technical Standard 1003.1, 2004 Edition
 *******************************************************************************/
@@ -91,11 +91,11 @@ time_t wceex_time(time_t *timer)
 * Description:
 *   The tmbuff points to structure that contains broken-down time.
 *   Input and output times are encoded as UTC.
-*   
+*
 * Return:
 *   Specified time since the Epoch encoded as a value of type time_t.
 *   (time_t)-1 is returned if time can not be represented by time_t.
-*       
+*
 * Reference:
 *   IEEE Standard and an Open Group Technical Standard 1003.1, 2004 Edition
 *******************************************************************************/
@@ -103,12 +103,12 @@ time_t __wceex_tm_to_time_t(const struct tm *tmbuff)
 {
     time_t timer;
 
-    /* If the year is <1970 or the value is negative, the relationship is undefined */ 
+    /* If the year is <1970 or the value is negative, the relationship is undefined */
     if (tmbuff->tm_year < 70)
     {
         return (time_t) -1;
     }
-    
+
     /* If the year is >=1970 */
     /* Each and every day shall be accounted for by exactly 86400 seconds */
 
diff --git a/Foundation/wcelibcex-1.0/src/wce_time.h b/Foundation/wcelibcex-1.0/src/wce_time.h
index aa5c23e96..4b9720ea9 100644
--- a/Foundation/wcelibcex-1.0/src/wce_time.h
+++ b/Foundation/wcelibcex-1.0/src/wce_time.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -93,8 +93,8 @@ struct timezone
 
 /* tm struct members conversion units */
 #define TM_YEAR_BASE    1900    /* tm_year base year */
-#define TM_MONTH_MIN    0       /* tm_mon = 0 - January */ 
-#define TM_MONTH_MAX    11      /* tm_mon = 11 - December */ 
+#define TM_MONTH_MIN    0       /* tm_mon = 0 - January */
+#define TM_MONTH_MAX    11      /* tm_mon = 11 - December */
 
 #define MIN_SEC         60                  /* seconds in a minute */
 #define HOUR_SEC        3600                /* seconds in an hour */
@@ -142,7 +142,7 @@ int wceex_gettimeofday(struct timeval *tp, struct timezone *tzp);
 /*******************************************************************************
     Internal functions prototypes.
 *******************************************************************************/
- 
+
 /* Internal function to get time value from tm struc. */
 extern time_t __wceex_mktime_utc(struct tm *tmbuff);
 
diff --git a/Foundation/wcelibcex-1.0/src/wce_timesys.c b/Foundation/wcelibcex-1.0/src/wce_timesys.c
index 4adeda0da..946c4c44c 100644
--- a/Foundation/wcelibcex-1.0/src/wce_timesys.c
+++ b/Foundation/wcelibcex-1.0/src/wce_timesys.c
@@ -10,11 +10,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -48,8 +48,8 @@
 * Return:
 *
 *   This function shall return the specified time since the Epoch
-*   encoded as a value of type time_t. 
-*       
+*   encoded as a value of type time_t.
+*
 *******************************************************************************/
 time_t wceex_filetime_to_time(const FILETIME * pft)
 {
@@ -83,8 +83,8 @@ time_t wceex_filetime_to_time(const FILETIME * pft)
 * Return:
 *
 *   This function shall return the specified time since the Epoch
-*   encoded as a value of type time_t. 
-*       
+*   encoded as a value of type time_t.
+*
 *******************************************************************************/
 time_t wceex_local_to_time(const SYSTEMTIME *st)
 {
@@ -92,7 +92,7 @@ time_t wceex_local_to_time(const SYSTEMTIME *st)
     {
         return (time_t)-1;
     }
- 
+
     return wceex_local_to_time_r(st->wYear - TM_YEAR_BASE,
                                st->wMonth - 1,
                                st->wDay, st->wHour,
@@ -115,8 +115,8 @@ time_t wceex_local_to_time(const SYSTEMTIME *st)
 * Return:
 *
 *   This function shall return the specified time since the Epoch
-*   encoded as a value of type time_t. 
-*       
+*   encoded as a value of type time_t.
+*
 *******************************************************************************/
 time_t wceex_local_to_time_r(int year, int mon, int day, int hour, int min, int sec)
 {
diff --git a/Foundation/wcelibcex-1.0/src/wce_timesys.h b/Foundation/wcelibcex-1.0/src/wce_timesys.h
index 2fd483feb..32928b851 100644
--- a/Foundation/wcelibcex-1.0/src/wce_timesys.h
+++ b/Foundation/wcelibcex-1.0/src/wce_timesys.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_types.h b/Foundation/wcelibcex-1.0/src/wce_types.h
index f2ef2aa38..850e17b05 100644
--- a/Foundation/wcelibcex-1.0/src/wce_types.h
+++ b/Foundation/wcelibcex-1.0/src/wce_types.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_unistd.h b/Foundation/wcelibcex-1.0/src/wce_unistd.h
index 2e10a6e52..f8579f907 100644
--- a/Foundation/wcelibcex-1.0/src/wce_unistd.h
+++ b/Foundation/wcelibcex-1.0/src/wce_unistd.h
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -53,12 +53,12 @@
 
 
 /*
- * Variables used for communication with getopt() function 
+ * Variables used for communication with getopt() function
  * to the caller.
  */
 
 /* Argument associated with option */
-extern char *optarg;    
+extern char *optarg;
 
 /* Index into parent argv vector */
 extern int optind;
diff --git a/Foundation/wcelibcex-1.0/src/wce_unlink.c b/Foundation/wcelibcex-1.0/src/wce_unlink.c
index 66d7abc03..b83ecf118 100644
--- a/Foundation/wcelibcex-1.0/src/wce_unlink.c
+++ b/Foundation/wcelibcex-1.0/src/wce_unlink.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
@@ -43,7 +43,7 @@
 * Return:
 *
 *   Upon successful completion, 0 shall be returned. Otherwise, -1.
-*       
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
@@ -58,12 +58,12 @@ int wceex_unlink(const char *filename)
     /* Covert filename buffer to Unicode. */
     len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0) ;
     pWideStr = (wchar_t*)malloc(sizeof(wchar_t) * len);
-	
+
     MultiByteToWideChar(CP_ACP, 0, filename, -1, pWideStr, len);
-	
+
     /* Delete file using Win32 CE API call */
     res = DeleteFile(pWideStr);
-	
+
     /* Free wide-char string */
     free(pWideStr);
 
@@ -82,7 +82,7 @@ int wceex_unlink(const char *filename)
 * Return:
 *
 *   Upon successful completion, 0 shall be returned. Otherwise, -1.
-*       
+*
 * Reference:
 *
 *   IEEE 1003.1, 2004 Edition
diff --git a/Foundation/wcelibcex-1.0/src/wce_winbase.c b/Foundation/wcelibcex-1.0/src/wce_winbase.c
index d042d66e1..b0bb3b9fe 100644
--- a/Foundation/wcelibcex-1.0/src/wce_winbase.c
+++ b/Foundation/wcelibcex-1.0/src/wce_winbase.c
@@ -9,11 +9,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/Foundation/wcelibcex-1.0/src/wce_winbase.h b/Foundation/wcelibcex-1.0/src/wce_winbase.h
index 2713cad32..3bbe5aacf 100644
--- a/Foundation/wcelibcex-1.0/src/wce_winbase.h
+++ b/Foundation/wcelibcex-1.0/src/wce_winbase.h
@@ -7,11 +7,11 @@
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation 
+ * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom 
+ * and/or sell copies of the Software, and to permit persons to whom
  * the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
diff --git a/JSON/JSON.progen b/JSON/JSON.progen
index cbf74330d..cb3ce16f5 100644
--- a/JSON/JSON.progen
+++ b/JSON/JSON.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/JSON/JSON_vs170.sln b/JSON/JSON_vs170.sln
index b9ce8af89..18db41e77 100644
--- a/JSON/JSON_vs170.sln
+++ b/JSON/JSON_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Build.0 = release_static_md|x64
 		{0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/JSON/JSON_vs170.vcxproj b/JSON/JSON_vs170.vcxproj
index ef5343f1c..d67f34a58 100644
--- a/JSON/JSON_vs170.vcxproj
+++ b/JSON/JSON_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>JSON</ProjectName>
     <ProjectGuid>{0E7FE914-0690-3EB4-9119-93A97CC97741}</ProjectGuid>
     <RootNamespace>JSON</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoJSONA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoJSONmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoJSONmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoJSONA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoJSONmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoJSONmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoJSONd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoJSONmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoJSONmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoJSONmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoJSONmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\JSON\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\JSON\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\JSON\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\JSON\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\JSON\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\JSON\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\JSON\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\JSON\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoJSONA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoJSONA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoJSONd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoJSONA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoJSON.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoJSONmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoJSONmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoJSONmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoJSONmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoJSONmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoJSONmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -563,26 +826,38 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ClCompile Include="src\pdjson.c">
+      <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ForceConformanceInForLoopScope>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">CompileAsCpp</CompileAs>
+      <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ForceConformanceInForLoopScope>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">CompileAsCpp</CompileAs>
+      <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ForceConformanceInForLoopScope>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">CompileAsCpp</CompileAs>
+      <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ForceConformanceInForLoopScope>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">CompileAsCpp</CompileAs>
+      <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ForceConformanceInForLoopScope>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">CompileAsCpp</CompileAs>
+      <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ForceConformanceInForLoopScope>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ForceConformanceInForLoopScope>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">CompileAsCpp</CompileAs>
       <ForceConformanceInForLoopScope Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ForceConformanceInForLoopScope>
@@ -623,12 +898,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/JSON/include/Poco/JSON/Handler.h b/JSON/include/Poco/JSON/Handler.h
index 327060fe6..d756f0e32 100644
--- a/JSON/include/Poco/JSON/Handler.h
+++ b/JSON/include/Poco/JSON/Handler.h
@@ -40,7 +40,7 @@ public:
 
 	Handler();
 		/// Creates an empty Handler.
-	
+
 	virtual ~Handler();
 		/// Destroys the Handler.
 
diff --git a/JSON/include/Poco/JSON/ParseHandler.h b/JSON/include/Poco/JSON/ParseHandler.h
index 98cd69ed8..80dda16b4 100644
--- a/JSON/include/Poco/JSON/ParseHandler.h
+++ b/JSON/include/Poco/JSON/ParseHandler.h
@@ -45,7 +45,7 @@ public:
 
 	virtual void reset();
 		/// Resets the handler state.
-		
+
 	void startObject();
 		/// Handles a '{'; a new object is started.
 
diff --git a/JSON/include/Poco/JSON/PrintHandler.h b/JSON/include/Poco/JSON/PrintHandler.h
index 291c8979a..18d131c0f 100644
--- a/JSON/include/Poco/JSON/PrintHandler.h
+++ b/JSON/include/Poco/JSON/PrintHandler.h
@@ -78,7 +78,7 @@ public:
 	void value(unsigned v);
 		/// An unsigned value is read. This will only be triggered if the
 		/// value cannot fit into a signed int.
-		
+
 #if defined(POCO_HAVE_INT64)
 	void value(Int64 v);
 		/// A 64-bit integer value is read; it will be written to the output.
diff --git a/JSON/include/Poco/JSON/Query.h b/JSON/include/Poco/JSON/Query.h
index c639a3d7d..303bbec43 100644
--- a/JSON/include/Poco/JSON/Query.h
+++ b/JSON/include/Poco/JSON/Query.h
@@ -32,10 +32,10 @@ class JSON_API Query
 {
 public:
 	Query(const Dynamic::Var& source);
-		/// Creates a Query/
+		/// Creates a Query.
 		///
 		/// Source must be JSON Object, Array, Object::Ptr,
-		/// Array::Ptr or empty Var. Any other type will trigger throwing of 
+		/// Array::Ptr or empty Var. Any other type will trigger throwing of
 		/// InvalidArgumentException.
 		///
 		/// Creating Query holding Ptr will typically result in faster
@@ -45,9 +45,9 @@ public:
 		/// Destroys the Query.
 
 	Object::Ptr findObject(const std::string& path) const;
-		/// Search for an object. 
+		/// Search for an object.
 		///
-		/// When the object can't be found, a zero Ptr is returned; 
+		/// When the object can't be found, a zero Ptr is returned;
 		/// otherwise, a shared pointer to internally held object
 		/// is returned.
 		/// If object (as opposed to a pointer to object) is held
@@ -55,16 +55,16 @@ public:
 		/// returned; this may be expensive operation.
 
 	Object& findObject(const std::string& path, Object& obj) const;
-		/// Search for an object. 
+		/// Search for an object.
 		///
 		/// If object is found, it is assigned to the
-		/// Object through the reference passed in. When the object can't be 
+		/// Object through the reference passed in. When the object can't be
 		/// found, the provided Object is emptied and returned.
 
 	Array::Ptr findArray(const std::string& path) const;
-		/// Search for an array. 
+		/// Search for an array.
 		///
-		/// When the array can't be found, a zero Ptr is returned; 
+		/// When the array can't be found, a zero Ptr is returned;
 		/// otherwise, a shared pointer to internally held array
 		/// is returned.
 		/// If array (as opposed to a pointer to array) is held
@@ -72,10 +72,10 @@ public:
 		/// returned; this may be expensive operation.
 
 	Array& findArray(const std::string& path, Array& obj) const;
-		/// Search for an array. 
+		/// Search for an array.
 		///
 		/// If array is found, it is assigned to the
-		/// Object through the reference passed in. When the array can't be 
+		/// Object through the reference passed in. When the array can't be
 		/// found, the provided Object is emptied and returned.
 
 	Dynamic::Var find(const std::string& path) const;
@@ -99,8 +99,8 @@ public:
 			{
 				result = value.convert<T>();
 			}
-			catch (...) 
-			{ 
+			catch (...)
+			{
 			}
 		}
 		return result;
diff --git a/JSON/include/Poco/JSON/Template.h b/JSON/include/Poco/JSON/Template.h
index 37f0ef0d0..01ecd7ebf 100644
--- a/JSON/include/Poco/JSON/Template.h
+++ b/JSON/include/Poco/JSON/Template.h
@@ -44,19 +44,19 @@ class JSON_API Template
 	/// conditional output, etc.
 	///
 	/// All text is send to the outputstream. A command is placed
-	/// between 
+	/// between
 	///     <?
-	/// and 
+	/// and
 	///     ?>
 	/// ----
 	///
 	/// These are the available commands:
-	/// 
+	///
 	///     <? echo query ?>
 	/// ----
 	/// The result of the query is send to the output stream
 	/// This command can also be written as <?= query ?>
-	/// 
+	///
 	///     <? if query ?> <? else ?> <? endif ?>
 	/// ----
 	/// When the result of query is true, all the text between
@@ -70,7 +70,7 @@ class JSON_API Template
 	/// ----
 	/// This can be used to check the existence of the value.
 	/// Use this for example when a zero value is ok (which returns false for <? if ?>.
-	/// 
+	///
 	///     <? for variable query ?> <? endfor ?>
 	/// ----
 	/// The result of the query must be an array. For each element
diff --git a/JSON/include/Poco/JSON/TemplateCache.h b/JSON/include/Poco/JSON/TemplateCache.h
index 0f5fcf095..80a09b52a 100644
--- a/JSON/include/Poco/JSON/TemplateCache.h
+++ b/JSON/include/Poco/JSON/TemplateCache.h
@@ -42,7 +42,7 @@ public:
 	TemplateCache();
 		/// Creates an empty TemplateCache.
 		///
-		/// The cache must be created and not destroyed 
+		/// The cache must be created and not destroyed
 		/// as long as it is used.
 
 	virtual ~TemplateCache();
diff --git a/JSON/samples/Benchmark/Benchmark.progen b/JSON/samples/Benchmark/Benchmark.progen
index f117b751c..d0d81fca9 100644
--- a/JSON/samples/Benchmark/Benchmark.progen
+++ b/JSON/samples/Benchmark/Benchmark.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\JSON\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/JSON/src/Query.cpp b/JSON/src/Query.cpp
index 36c08846f..27e5ad875 100644
--- a/JSON/src/Query.cpp
+++ b/JSON/src/Query.cpp
@@ -65,7 +65,7 @@ Object& Query::findObject(const std::string& path, Object& obj) const
 		obj = *result.extract<Object::Ptr>();
 	else if (result.type() == typeid(Object))
 		obj = result.extract<Object>();
-	
+
 	return obj;
 }
 
@@ -93,7 +93,7 @@ Array& Query::findArray(const std::string& path, Array& arr) const
 		arr = *result.extract<Array::Ptr>();
 	else if (result.type() == typeid(Array))
 		arr = result.extract<Array>();
-	
+
 	return arr;
 }
 
@@ -101,6 +101,8 @@ Array& Query::findArray(const std::string& path, Array& arr) const
 Var Query::find(const std::string& path) const
 {
 	Var result = _source;
+	if (path.empty()) return result;
+	bool found = false;
 	StringTokenizer tokenizer(path, ".");
 	for (const auto& token: tokenizer)
 	{
@@ -134,14 +136,15 @@ Var Query::find(const std::string& path) const
 				{
 					Object::Ptr o = result.extract<Object::Ptr>();
 					result = o->get(name);
+					found = true;
 				}
 				else if (result.type() == typeid(Object))
 				{
 					Object o = result.extract<Object>();
 					result = o.get(name);
+					found = true;
 				}
-				else
-					result.empty();
+				else result.empty();
 
 			}
 
@@ -165,6 +168,7 @@ Var Query::find(const std::string& path) const
 			}
 		}
 	}
+	if (!found) result.empty();
 	return result;
 }
 
diff --git a/JSON/src/Stringifier.cpp b/JSON/src/Stringifier.cpp
index 633ddf675..b71625b60 100644
--- a/JSON/src/Stringifier.cpp
+++ b/JSON/src/Stringifier.cpp
@@ -62,6 +62,8 @@ void Stringifier::stringify(const Var& any, std::ostream& out, unsigned int inde
 	else if (any.isNumeric() || any.isBoolean())
 	{
 		std::string value = any.convert<std::string>();
+		if ((Poco::icompare(value, "nan") == 0) ||
+			(Poco::icompare(value, "inf") == 0)) value = "null";
 		if (any.type() == typeid(char)) formatString(value, out, options);
 		else out << value;
 	}
diff --git a/JSON/src/Template.cpp b/JSON/src/Template.cpp
index e36f9a24c..c452d6ee0 100644
--- a/JSON/src/Template.cpp
+++ b/JSON/src/Template.cpp
@@ -303,8 +303,8 @@ class IncludePart: public Part
 {
 public:
 
-	IncludePart(const Path& parentPath, const Path& path): 
-		Part(), 
+	IncludePart(const Path& parentPath, const Path& path):
+		Part(),
 		_path(path)
 	{
 		// When the path is relative, try to make it absolute based
@@ -347,16 +347,16 @@ private:
 };
 
 
-Template::Template(const Path& templatePath): 
-	_parts(0), 
-	_currentPart(0), 
+Template::Template(const Path& templatePath):
+	_parts(0),
+	_currentPart(0),
 	_templatePath(templatePath)
 {
 }
 
 
 Template::Template():
-	_parts(0), 
+	_parts(0),
 	_currentPart(0)
 {
 }
diff --git a/JSON/src/TemplateCache.cpp b/JSON/src/TemplateCache.cpp
index f4033bfb1..bb5c7e270 100644
--- a/JSON/src/TemplateCache.cpp
+++ b/JSON/src/TemplateCache.cpp
@@ -51,12 +51,12 @@ Template::Ptr TemplateCache::getTemplate(const Path& path)
 
 	Path templatePath = resolvePath(path);
 	std::string templatePathname = templatePath.toString();
-	
+
 	if (_pLogger)
 	{
 		poco_trace_f1(*_pLogger, "Path resolved to %s", templatePathname);
 	}
-	
+
 	File templateFile(templatePathname);
 
 	Template::Ptr tpl;
diff --git a/JSON/src/pdjson.c b/JSON/src/pdjson.c
index cd56715ef..37055ccce 100644
--- a/JSON/src/pdjson.c
+++ b/JSON/src/pdjson.c
@@ -555,7 +555,7 @@ read_number(json_stream *json, int c)
             json_error(json, "unexpected byte '%c' in number", c);
             return JSON_ERROR;
         }
-    } else if (strchr("123456789", c) != NULL) {
+    } else if (c >= '1' && c <= '9') {
         c = json->source.peek(&json->source);
         if (is_digit(c)) {
             if (read_digits(json) != 0)
diff --git a/JSON/src/pdjson.h b/JSON/src/pdjson.h
index 32673b71f..c0262d120 100644
--- a/JSON/src/pdjson.h
+++ b/JSON/src/pdjson.h
@@ -9,12 +9,12 @@
 extern "C" {
 #else
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-		#include <stdbool.h>
-	#else
-	#ifndef bool
-		#define bool int
-		#define true 1
-		#define false 0
+    #include <stdbool.h>
+#else
+    #ifndef bool
+        #define bool int
+        #define true 1
+        #define false 0
     #endif /* bool */
 #endif /* __STDC_VERSION__ */
 #endif /* __cplusplus */
@@ -33,7 +33,7 @@ struct json_allocator {
     void (*free)(void *);
 };
 
-typedef int (*json_user_io) (void *user);
+typedef int (*json_user_io)(void *user);
 
 typedef struct json_stream json_stream;
 typedef struct json_allocator json_allocator;
@@ -69,8 +69,8 @@ PDJSON_SYMEXPORT bool json_isspace(int c);
 /* internal */
 
 struct json_source {
-    int (*get) (struct json_source *);
-    int (*peek) (struct json_source *);
+    int (*get)(struct json_source *);
+    int (*peek)(struct json_source *);
     size_t position;
     union {
         struct {
diff --git a/JSON/testsuite/TestSuite.progen b/JSON/testsuite/TestSuite.progen
index 44179d4e4..a9a55670a 100644
--- a/JSON/testsuite/TestSuite.progen
+++ b/JSON/testsuite/TestSuite.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = iphlpapi.lib
diff --git a/JSON/testsuite/TestSuite_vs170.vcxproj b/JSON/testsuite/TestSuite_vs170.vcxproj
index f0bab9a40..f4a1d7cdd 100644
--- a/JSON/testsuite/TestSuite_vs170.vcxproj
+++ b/JSON/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{96CF3103-E49E-3F5E-A11D-6DBCDA043053}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp
index 51ce7510a..d28696406 100644
--- a/JSON/testsuite/src/JSONTest.cpp
+++ b/JSON/testsuite/src/JSONTest.cpp
@@ -1141,6 +1141,10 @@ void JSONTest::testQuery()
 
 	std::string firstChild = query.findValue("children[0]", "");
 	assertTrue (firstChild.compare("Jonas") == 0);
+	std::string secondChild = query.findValue("children[1]", "");
+	assertTrue (secondChild.compare("Ellen") == 0);
+	std::string thirdChild = query.findValue("children[2]", "");
+	assertTrue (thirdChild.empty());
 
 	Poco::DynamicStruct ds = *result.extract<Object::Ptr>();
 	assertTrue (ds["name"] == "Franky");
@@ -1195,6 +1199,22 @@ void JSONTest::testQuery()
 		fail ("must throw");
 	}
 	catch (Poco::InvalidArgumentException&) { }
+
+	json = R"json({"foo":["bar"]})json";
+	try { result = parser.parse(json); }
+	catch(JSONException& jsone)
+	{
+		fail (jsone.message());
+	}
+	Query queryFoo(result);
+	result = queryFoo.find("foo[0]");
+	assertTrue (!result.isEmpty());
+	result = queryFoo.find("foo[1]");
+	assertTrue (result.isEmpty());
+	result = queryFoo.find("[1]");
+	assertTrue (result.isEmpty());
+	result = queryFoo.find("");
+	assertTrue (result.convert<std::string>() == json);
 }
 
 
@@ -1351,6 +1371,44 @@ void JSONTest::testPrintHandler()
 	parser.parse(json);
 	assertTrue (json == ostr.str());
 
+	json=
+		"{"
+			"\"a\":100,"
+			"\"b\":234.456,"
+			"\"child\":"
+			"["
+				"{"
+					"\"id\":0,"
+					"\"name\":\"lucy_0\""
+				"},"
+				"{"
+					"\"id\":1,"
+					"\"name\":\"lucy_1\""
+				"},"
+				"{"
+					"\"id\":2,"
+					"\"name\":\"lucy_4\""
+				"},"
+				"{"
+					"\"id\":3,"
+					"\"name\":\"lucy_9\""
+				"},"
+				"{"
+					"\"id\":4,"
+					"\"name\":\"lucy_16\""
+				"}"
+			"],"
+			"\"pair\":{"
+				"\"a\":123213,"
+				"\"b\":\"weoifweifj\""
+			"},"
+			"\"str\":\"sdfsdf\""
+		"}";
+	ostr.str("");
+	pHandler->setIndent(0);
+	parser.reset();
+	parser.parse(json);
+	assertTrue (json == ostr.str());
 }
 
 
@@ -1528,6 +1586,17 @@ void JSONTest::testStringify()
 }
 
 
+void JSONTest::testStringifyNaN()
+{
+	Object::Ptr o = new Object;
+	o->set("NaN", NAN);
+	o->set("Infinity", INFINITY);
+	std::ostringstream stream;
+	o->stringify(stream, 0);
+	assertEqual (stream.str(), std::string(R"({"Infinity":null,"NaN":null})"));
+}
+
+
 void JSONTest::testStringifyPreserveOrder()
 {
 	Object presObj(Poco::JSON_PRESERVE_KEY_ORDER);
@@ -2027,6 +2096,24 @@ void JSONTest::testNonEscapeUnicode()
 	Var longEscape = object->get("longEscape");
 	assertTrue (shortEscape.convert<std::string>() == shortEscapeStr);
 	assertTrue (longEscape.convert<std::string>() == longEscapeStr);
+
+	Poco::JSON::Object::Ptr json = new Poco::JSON::Object(Poco::JSON_PRESERVE_KEY_ORDER);
+	Poco::JSON::Object::Ptr json2 = new Poco::JSON::Object(Poco::JSON_PRESERVE_KEY_ORDER);
+
+	json->set("value", 15);
+	json->set("unit", "°C");
+
+	assertFalse (json->getEscapeUnicode());
+	assertFalse (json2->getEscapeUnicode());
+	json2->set("Temperature", json);
+	std::ostringstream buffer {};
+	json->stringify(buffer);
+	std::string str = buffer.str();
+	assertEqual (str, R"({"value":15,"unit":"°C"})");
+	std::ostringstream buffer2 {};
+	json2->stringify(buffer2);
+	std::string str2 = buffer2.str();
+	assertEqual (str2, R"({"Temperature":{"value":15,"unit":"°C"}})");
 }
 
 
@@ -2285,6 +2372,7 @@ CppUnit::Test* JSONTest::suite()
 	CppUnit_addTest(pSuite, JSONTest, testComment);
 	CppUnit_addTest(pSuite, JSONTest, testPrintHandler);
 	CppUnit_addTest(pSuite, JSONTest, testStringify);
+	CppUnit_addTest(pSuite, JSONTest, testStringifyNaN);
 	CppUnit_addTest(pSuite, JSONTest, testStringifyPreserveOrder);
 	CppUnit_addTest(pSuite, JSONTest, testVarConvert);
 	CppUnit_addTest(pSuite, JSONTest, testValidJanssonFiles);
diff --git a/JSON/testsuite/src/JSONTest.h b/JSON/testsuite/src/JSONTest.h
index f541d4499..c459bc231 100644
--- a/JSON/testsuite/src/JSONTest.h
+++ b/JSON/testsuite/src/JSONTest.h
@@ -67,6 +67,7 @@ public:
 	void testComment();
 	void testPrintHandler();
 	void testStringify();
+	void testStringifyNaN();
 	void testStringifyPreserveOrder();
 	void testVarConvert();
 
diff --git a/JSON/testsuite/src/WinCEDriver.cpp b/JSON/testsuite/src/WinCEDriver.cpp
index 83e45aac9..12f962df9 100644
--- a/JSON/testsuite/src/WinCEDriver.cpp
+++ b/JSON/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int wmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("JSONTestSuite", JSONTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/JWT/JWT.progen b/JWT/JWT.progen
index 0c6a2cfd2..70f081e9e 100644
--- a/JWT/JWT.progen
+++ b/JWT/JWT.progen
@@ -11,5 +11,6 @@ vc.project.compiler.include = ..\\Foundation\\include;..\\JSON\\include;..\\Cryp
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/JWT/JWT_vs170.sln b/JWT/JWT_vs170.sln
index 33e9f1d6a..56c4b9605 100644
--- a/JWT/JWT_vs170.sln
+++ b/JWT/JWT_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_static_md|x64.Build.0 = release_static_md|x64
 		{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/JWT/JWT_vs170.vcxproj b/JWT/JWT_vs170.vcxproj
index 2af4610f8..a2c242396 100644
--- a/JWT/JWT_vs170.vcxproj
+++ b/JWT/JWT_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>JWT</ProjectName>
     <ProjectGuid>{EFE871AE-A00F-4EB5-B816-FA316EAB9DA7}</ProjectGuid>
     <RootNamespace>JWT</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoJWTA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoJWTmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoJWTmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoJWTA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoJWTmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoJWTmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoJWTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoJWTmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoJWTmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoJWTmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoJWTmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\JWT\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\JWT\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\JWT\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\JWT\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\JWT\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\JWT\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\JWT\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\JWT\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\JSON\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;JWT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoJWTA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoJWTA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoJWTd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\JSON\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;JWT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoJWTA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoJWT.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\JSON\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoJWTmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoJWTmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\JSON\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoJWTmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\JSON\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoJWTmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoJWTmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\JSON\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoJWTmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -563,12 +826,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/JWT/testsuite/TestSuite.progen b/JWT/testsuite/TestSuite.progen
index fddac3393..72c40da85 100644
--- a/JWT/testsuite/TestSuite.progen
+++ b/JWT/testsuite/TestSuite.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\JSON\\include;..\\..\\Crypto\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/JWT/testsuite/TestSuite_vs170.vcxproj b/JWT/testsuite/TestSuite_vs170.vcxproj
index b971f520e..3d5601fd7 100644
--- a/JWT/testsuite/TestSuite_vs170.vcxproj
+++ b/JWT/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{96CF3103-E49E-3F5E-A11D-6DBCDA043053}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\JSON\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\JSON\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\JSON\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\JSON\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\JSON\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\JSON\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/MongoDB/MongoDB.progen b/MongoDB/MongoDB.progen
index 00e82bc74..67595ba84 100644
--- a/MongoDB/MongoDB.progen
+++ b/MongoDB/MongoDB.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/MongoDB/MongoDB_vs170.sln b/MongoDB/MongoDB_vs170.sln
index dee800467..cbeb2032a 100644
--- a/MongoDB/MongoDB_vs170.sln
+++ b/MongoDB/MongoDB_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_md|x64.Build.0 = release_static_md|x64
 		{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/MongoDB/MongoDB_vs170.vcxproj b/MongoDB/MongoDB_vs170.vcxproj
index 2b708addc..14bc440ab 100644
--- a/MongoDB/MongoDB_vs170.vcxproj
+++ b/MongoDB/MongoDB_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>MongoDB</ProjectName>
     <ProjectGuid>{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}</ProjectGuid>
     <RootNamespace>MongoDB</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoMongoDBA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoMongoDBmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoMongoDBmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoMongoDBA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoMongoDBmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoMongoDBmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoMongoDBd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoMongoDBmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoMongoDBmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoMongoDBmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoMongoDBmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\MongoDB\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\MongoDB\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\MongoDB\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\MongoDB\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\MongoDB\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\MongoDB\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\MongoDB\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\MongoDB\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MongoDB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoMongoDBA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoMongoDBA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoMongoDBd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MongoDB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoMongoDBA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoMongoDB.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoMongoDBmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoMongoDBmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoMongoDBmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoMongoDBmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoMongoDBmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoMongoDBmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -634,12 +897,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/include/Poco/MongoDB/Array.h b/MongoDB/include/Poco/MongoDB/Array.h
index 55e262840..a3bf7f27f 100644
--- a/MongoDB/include/Poco/MongoDB/Array.h
+++ b/MongoDB/include/Poco/MongoDB/Array.h
@@ -39,8 +39,31 @@ public:
 	virtual ~Array();
 		/// Destroys the Array.
 
+	// Document template functions available for backward compatibility
+	using Document::add;
+	using Document::get;
+
 	template<typename T>
-	T get(int pos) const
+	Document& add(T value)
+		/// Creates an element with the name from the current pos and value and
+		/// adds it to the array document.
+		///
+		/// The active document is returned to allow chaining of the add methods.
+	{
+		return Document::add<T>(Poco::NumberFormatter::format(size()), value);
+	}
+
+	Document& add(const char* value)
+		/// Creates an element with a name from the current pos and value and
+		/// adds it to the array document.
+		///
+		/// The active document is returned to allow chaining of the add methods.
+	{
+		return Document::add(Poco::NumberFormatter::format(size()), value);
+	}
+
+	template<typename T>
+	T get(std::size_t pos) const
 		/// Returns the element at the given index and tries to convert
 		/// it to the template type. If the element is not found, a
 		/// Poco::NotFoundException will be thrown. If the element cannot be
@@ -50,7 +73,7 @@ public:
 	}
 
 	template<typename T>
-	T get(int pos, const T& deflt) const
+	T get(std::size_t pos, const T& deflt) const
 		/// Returns the element at the given index and tries to convert
 		/// it to the template type. If the element is not found, or
 		/// has the wrong type, the deflt argument will be returned.
@@ -58,12 +81,12 @@ public:
 		return Document::get<T>(Poco::NumberFormatter::format(pos), deflt);
 	}
 
-	Element::Ptr get(int pos) const;
+	Element::Ptr get(std::size_t pos) const;
 		/// Returns the element at the given index.
 		/// An empty element will be returned if the element is not found.
 
 	template<typename T>
-	bool isType(int pos) const
+	bool isType(std::size_t pos) const
 		/// Returns true if the type of the element equals the TypeId of ElementTrait,
 		/// otherwise false.
 	{
@@ -72,6 +95,9 @@ public:
 
 	std::string toString(int indent = 0) const;
 		/// Returns a string representation of the Array.
+
+private:
+	friend void BSONReader::read<Array::Ptr>(Array::Ptr& to);
 };
 
 
diff --git a/MongoDB/include/Poco/MongoDB/BSONWriter.h b/MongoDB/include/Poco/MongoDB/BSONWriter.h
index 01c9491e7..34441d0e2 100644
--- a/MongoDB/include/Poco/MongoDB/BSONWriter.h
+++ b/MongoDB/include/Poco/MongoDB/BSONWriter.h
@@ -30,7 +30,7 @@ class MongoDB_API BSONWriter
 	/// Class for writing BSON using a Poco::BinaryWriter.
 {
 public:
-	BSONWriter(const Poco::BinaryWriter& writer): 
+	BSONWriter(const Poco::BinaryWriter& writer):
 		_writer(writer)
 		/// Creates the BSONWriter.
 	{
diff --git a/MongoDB/include/Poco/MongoDB/Database.h b/MongoDB/include/Poco/MongoDB/Database.h
index ab276eecb..39dbecdbe 100644
--- a/MongoDB/include/Poco/MongoDB/Database.h
+++ b/MongoDB/include/Poco/MongoDB/Database.h
@@ -42,13 +42,13 @@ public:
 
 	virtual ~Database();
 		/// Destroys the Database.
-		
+
 	bool authenticate(Connection& connection, const std::string& username, const std::string& password, const std::string& method = AUTH_SCRAM_SHA1);
 		/// Authenticates against the database using the given connection,
 		/// username and password, as well as authentication method.
 		///
-		/// "MONGODB-CR" (default prior to MongoDB 3.0) and 
-		/// "SCRAM-SHA-1" (default starting in 3.0) are the only supported 
+		/// "MONGODB-CR" (default prior to MongoDB 3.0) and
+		/// "SCRAM-SHA-1" (default starting in 3.0) are the only supported
 		/// authentication methods.
 		///
 		/// Returns true if authentication was successful, otherwise false.
@@ -57,7 +57,7 @@ public:
 		/// invalid credentials.
 
 	Int64 count(Connection& connection, const std::string& collectionName) const;
-		/// Sends a count request for the given collection to MongoDB. 
+		/// Sends a count request for the given collection to MongoDB.
 		///
 		/// If the command fails, -1 is returned.
 
@@ -65,7 +65,7 @@ public:
 		/// Creates a QueryRequest for a command.
 
 	Poco::SharedPtr<Poco::MongoDB::QueryRequest> createCountRequest(const std::string& collectionName) const;
-		/// Creates a QueryRequest to count the given collection. 
+		/// Creates a QueryRequest to count the given collection.
 		/// The collectionname must not contain the database name.
 
 	Poco::SharedPtr<Poco::MongoDB::DeleteRequest> createDeleteRequest(const std::string& collectionName) const;
@@ -77,11 +77,11 @@ public:
 		/// The collectionname must not contain the database name.
 
 	Poco::SharedPtr<Poco::MongoDB::QueryRequest> createQueryRequest(const std::string& collectionName) const;
-		/// Creates a QueryRequest. 
+		/// Creates a QueryRequest.
 		/// The collectionname must not contain the database name.
 
 	Poco::SharedPtr<Poco::MongoDB::UpdateRequest> createUpdateRequest(const std::string& collectionName) const;
-		/// Creates an UpdateRequest. 
+		/// Creates an UpdateRequest.
 		/// The collectionname must not contain the database name.
 
 	Poco::MongoDB::Document::Ptr ensureIndex(Connection& connection,
@@ -104,7 +104,7 @@ public:
 
 	static const std::string AUTH_MONGODB_CR;
 		/// Default authentication mechanism prior to MongoDB 3.0.
-		
+
 	static const std::string AUTH_SCRAM_SHA1;
 		/// Default authentication mechanism for MongoDB 3.0.
 
diff --git a/MongoDB/include/Poco/MongoDB/DeleteRequest.h b/MongoDB/include/Poco/MongoDB/DeleteRequest.h
index 8f3486d07..7eecd9997 100644
--- a/MongoDB/include/Poco/MongoDB/DeleteRequest.h
+++ b/MongoDB/include/Poco/MongoDB/DeleteRequest.h
@@ -45,20 +45,20 @@ public:
 	};
 
 	DeleteRequest(const std::string& collectionName, Flags flags = DELETE_DEFAULT);
-		/// Creates a DeleteRequest for the given collection using the given flags. 
+		/// Creates a DeleteRequest for the given collection using the given flags.
 		///
-		/// The full collection name is the concatenation of the database 
-		/// name with the collection name, using a "." for the concatenation. For example, 
-		/// for the database "foo" and the collection "bar", the full collection name is 
+		/// The full collection name is the concatenation of the database
+		/// name with the collection name, using a "." for the concatenation. For example,
+		/// for the database "foo" and the collection "bar", the full collection name is
 		/// "foo.bar".
 
 	DeleteRequest(const std::string& collectionName, bool justOne);
 		/// Creates a DeleteRequest for the given collection.
-		/// 
+		///
 		/// The full collection name is the concatenation of the database
 		/// name with the collection name, using a "." for the concatenation. For example,
 		/// for the database "foo" and the collection "bar", the full collection name is
-		/// "foo.bar". 
+		/// "foo.bar".
 		///
 		/// If justOne is true, only the first matching document will
 		/// be removed (the same as using flag DELETE_SINGLE_REMOVE).
diff --git a/MongoDB/include/Poco/MongoDB/GetMoreRequest.h b/MongoDB/include/Poco/MongoDB/GetMoreRequest.h
index f6c3f65ab..4c9d5e718 100644
--- a/MongoDB/include/Poco/MongoDB/GetMoreRequest.h
+++ b/MongoDB/include/Poco/MongoDB/GetMoreRequest.h
@@ -27,16 +27,16 @@ namespace MongoDB {
 
 
 class MongoDB_API GetMoreRequest: public RequestMessage
-	/// A GetMoreRequest is used to query the database for more documents in a collection 
+	/// A GetMoreRequest is used to query the database for more documents in a collection
 	/// after a query request is send (OP_GETMORE).
 {
 public:
 	GetMoreRequest(const std::string& collectionName, Int64 cursorID);
-		/// Creates a GetMoreRequest for the give collection and cursor. 
+		/// Creates a GetMoreRequest for the give collection and cursor.
 		///
-		/// The full collection name is the concatenation of the database 
-		/// name with the collection name, using a "." for the concatenation. For example, 
-		/// for the database "foo" and the collection "bar", the full collection name is 
+		/// The full collection name is the concatenation of the database
+		/// name with the collection name, using a "." for the concatenation. For example,
+		/// for the database "foo" and the collection "bar", the full collection name is
 		/// "foo.bar". The cursorID has been returned by the response on the query request.
 		/// By default the numberToReturn is set to 100.
 
diff --git a/MongoDB/include/Poco/MongoDB/InsertRequest.h b/MongoDB/include/Poco/MongoDB/InsertRequest.h
index f9ed8a20b..ca4ff2ed8 100644
--- a/MongoDB/include/Poco/MongoDB/InsertRequest.h
+++ b/MongoDB/include/Poco/MongoDB/InsertRequest.h
@@ -36,21 +36,21 @@ public:
 	{
 		INSERT_DEFAULT = 0,
 			/// If specified, perform a normal insert operation.
-		
+
 		INSERT_CONTINUE_ON_ERROR = 1
-			/// If set, the database will not stop processing a bulk insert if one 
-			/// fails (e.g. due to duplicate IDs). This makes bulk insert behave similarly 
-			/// to a series of single inserts, except lastError will be set if any insert 
-			/// fails, not just the last one. If multiple errors occur, only the most 
+			/// If set, the database will not stop processing a bulk insert if one
+			/// fails (e.g. due to duplicate IDs). This makes bulk insert behave similarly
+			/// to a series of single inserts, except lastError will be set if any insert
+			/// fails, not just the last one. If multiple errors occur, only the most
 			/// recent will be reported.
 	};
 
 	InsertRequest(const std::string& collectionName, Flags flags = INSERT_DEFAULT);
 		/// Creates an InsertRequest.
 		///
-		/// The full collection name is the concatenation of the database 
-		/// name with the collection name, using a "." for the concatenation. For example, 
-		/// for the database "foo" and the collection "bar", the full collection name is 
+		/// The full collection name is the concatenation of the database
+		/// name with the collection name, using a "." for the concatenation. For example,
+		/// for the database "foo" and the collection "bar", the full collection name is
 		/// "foo.bar".
 
 	virtual ~InsertRequest();
diff --git a/MongoDB/include/Poco/MongoDB/KillCursorsRequest.h b/MongoDB/include/Poco/MongoDB/KillCursorsRequest.h
index 83a808535..45683233f 100644
--- a/MongoDB/include/Poco/MongoDB/KillCursorsRequest.h
+++ b/MongoDB/include/Poco/MongoDB/KillCursorsRequest.h
@@ -28,7 +28,7 @@ namespace MongoDB {
 
 class MongoDB_API KillCursorsRequest: public RequestMessage
 	/// Class for creating an OP_KILL_CURSORS client request. This
-	/// request is used to kill cursors, which are still open, 
+	/// request is used to kill cursors, which are still open,
 	/// returned by query requests.
 {
 public:
@@ -37,10 +37,10 @@ public:
 
 	virtual ~KillCursorsRequest();
 		/// Destroys the KillCursorsRequest.
-		
+
 	std::vector<Int64>& cursors();
 		/// The internal list of cursors.
-		
+
 protected:
 	void buildRequest(BinaryWriter& writer);
 	std::vector<Int64> _cursors;
@@ -53,7 +53,7 @@ protected:
 inline std::vector<Int64>& KillCursorsRequest::cursors()
 {
 	return _cursors;
-} 
+}
 
 
 } } // namespace Poco::MongoDB
diff --git a/MongoDB/include/Poco/MongoDB/Message.h b/MongoDB/include/Poco/MongoDB/Message.h
index f3f1edb43..14e216442 100644
--- a/MongoDB/include/Poco/MongoDB/Message.h
+++ b/MongoDB/include/Poco/MongoDB/Message.h
@@ -36,7 +36,7 @@ class MongoDB_API Message
 public:
 	explicit Message(MessageHeader::OpCode opcode);
 		/// Creates a Message using the given OpCode.
-	
+
 	virtual ~Message();
 		/// Destructor
 
diff --git a/MongoDB/include/Poco/MongoDB/QueryRequest.h b/MongoDB/include/Poco/MongoDB/QueryRequest.h
index 410828749..eda980b03 100644
--- a/MongoDB/include/Poco/MongoDB/QueryRequest.h
+++ b/MongoDB/include/Poco/MongoDB/QueryRequest.h
@@ -34,51 +34,51 @@ class MongoDB_API QueryRequest: public RequestMessage
 public:
 	enum Flags
 	{
-		QUERY_DEFAULT = 0, 
+		QUERY_DEFAULT = 0,
 			/// Do not set any flags.
-	
-		QUERY_TAILABLE_CURSOR = 2, 
-			/// Tailable means cursor is not closed when the last data is retrieved. 
-			/// Rather, the cursor marks the final object’s position. 
-			/// You can resume using the cursor later, from where it was located, 
-			/// if more data were received. Like any "latent cursor", the cursor may 
-			/// become invalid at some point (CursorNotFound) – for example if the final 
+
+		QUERY_TAILABLE_CURSOR = 2,
+			/// Tailable means cursor is not closed when the last data is retrieved.
+			/// Rather, the cursor marks the final object’s position.
+			/// You can resume using the cursor later, from where it was located,
+			/// if more data were received. Like any "latent cursor", the cursor may
+			/// become invalid at some point (CursorNotFound) – for example if the final
 			/// object it references were deleted.
-	
-		QUERY_SLAVE_OK = 4, 
-			/// Allow query of replica slave. Normally these return an error except 
+
+		QUERY_SLAVE_OK = 4,
+			/// Allow query of replica slave. Normally these return an error except
 			/// for namespace "local".
-			
+
 		// QUERY_OPLOG_REPLAY = 8 (internal replication use only - drivers should not implement)
-		
+
 		QUERY_NO_CURSOR_TIMEOUT = 16,
-			/// The server normally times out idle cursors after an inactivity period 
+			/// The server normally times out idle cursors after an inactivity period
 			/// (10 minutes) to prevent excess memory use. Set this option to prevent that.
-	
+
 		QUERY_AWAIT_DATA = 32,
-			/// Use with QUERY_TAILABLECURSOR. If we are at the end of the data, block for 
-			/// a while rather than returning no data. After a timeout period, we do 
+			/// Use with QUERY_TAILABLECURSOR. If we are at the end of the data, block for
+			/// a while rather than returning no data. After a timeout period, we do
 			/// return as normal.
 
 		QUERY_EXHAUST = 64,
-			/// Stream the data down full blast in multiple "more" packages, on the 
-			/// assumption that the client will fully read all data queried. 
-			/// Faster when you are pulling a lot of data and know you want to pull 
-			/// it all down. 
-			/// Note: the client is not allowed to not read all the data unless it 
+			/// Stream the data down full blast in multiple "more" packages, on the
+			/// assumption that the client will fully read all data queried.
+			/// Faster when you are pulling a lot of data and know you want to pull
+			/// it all down.
+			/// Note: the client is not allowed to not read all the data unless it
 			/// closes the connection.
 
 		QUERY_PARTIAL = 128
-			/// Get partial results from a mongos if some shards are down 
+			/// Get partial results from a mongos if some shards are down
 			/// (instead of throwing an error).
 	};
 
 	QueryRequest(const std::string& collectionName, Flags flags = QUERY_DEFAULT);
 		/// Creates a QueryRequest.
 		///
-		/// The full collection name is the concatenation of the database 
-		/// name with the collection name, using a "." for the concatenation. For example, 
-		/// for the database "foo" and the collection "bar", the full collection name is 
+		/// The full collection name is the concatenation of the database
+		/// name with the collection name, using a "." for the concatenation. For example,
+		/// for the database "foo" and the collection "bar", the full collection name is
 		/// "foo.bar".
 
 	virtual ~QueryRequest();
diff --git a/MongoDB/include/Poco/MongoDB/UpdateRequest.h b/MongoDB/include/Poco/MongoDB/UpdateRequest.h
index 0aa14bcd7..6c5c29ed3 100644
--- a/MongoDB/include/Poco/MongoDB/UpdateRequest.h
+++ b/MongoDB/include/Poco/MongoDB/UpdateRequest.h
@@ -29,7 +29,7 @@ namespace MongoDB {
 
 class UpdateRequest: public RequestMessage
 	/// This request is used to update a document in a database
-	/// using the OP_UPDATE client request. 
+	/// using the OP_UPDATE client request.
 {
 public:
 	enum Flags
@@ -37,7 +37,7 @@ public:
 		UPDATE_DEFAULT = 0,
 			/// If set, the database will insert the supplied object into the
 			/// collection if no matching document is found.
-			
+
 		UPDATE_UPSERT = 1,
 			/// If set, the database will update all matching objects in the collection.
 			/// Otherwise only updates first matching doc.
@@ -50,9 +50,9 @@ public:
 	UpdateRequest(const std::string& collectionName, Flags flags = UPDATE_DEFAULT);
 		/// Creates the UpdateRequest.
 		///
-		/// The full collection name is the concatenation of the database 
-		/// name with the collection name, using a "." for the concatenation. For example, 
-		/// for the database "foo" and the collection "bar", the full collection name is 
+		/// The full collection name is the concatenation of the database
+		/// name with the collection name, using a "." for the concatenation. For example,
+		/// for the database "foo" and the collection "bar", the full collection name is
 		/// "foo.bar".
 
 	virtual ~UpdateRequest();
diff --git a/MongoDB/samples/SQLToMongo/SQLToMongo.progen b/MongoDB/samples/SQLToMongo/SQLToMongo.progen
index 56fa02064..602fdc35e 100644
--- a/MongoDB/samples/SQLToMongo/SQLToMongo.progen
+++ b/MongoDB/samples/SQLToMongo/SQLToMongo.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Net\\include;..\\..\\..\\MongoDB\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/MongoDB/src/Array.cpp b/MongoDB/src/Array.cpp
index c6d96d137..6fff0994d 100644
--- a/MongoDB/src/Array.cpp
+++ b/MongoDB/src/Array.cpp
@@ -20,7 +20,7 @@ namespace Poco {
 namespace MongoDB {
 
 
-Array::Array(): 
+Array::Array():
 	Document()
 {
 }
@@ -31,7 +31,7 @@ Array::~Array()
 }
 
 
-Element::Ptr Array::get(int pos) const
+Element::Ptr Array::get(std::size_t pos) const
 {
 	std::string name = Poco::NumberFormatter::format(pos);
 	return Document::get(name);
diff --git a/MongoDB/src/Database.cpp b/MongoDB/src/Database.cpp
index 359dcc70f..80a7816da 100644
--- a/MongoDB/src/Database.cpp
+++ b/MongoDB/src/Database.cpp
@@ -43,7 +43,7 @@ namespace
 	std::map<std::string, std::string> parseKeyValueList(const std::string& str)
 	{
 		std::map<std::string, std::string> kvm;
-		std::string::const_iterator it = str.begin(); 
+		std::string::const_iterator it = str.begin();
 		std::string::const_iterator end = str.end();
 		while (it != end)
 		{
@@ -66,7 +66,7 @@ namespace
 		Poco::StreamCopier::copyToString(decoder, result);
 		return result;
 	}
-	
+
 	std::string encodeBase64(const std::string& data)
 	{
 		std::ostringstream ostr;
@@ -133,8 +133,8 @@ bool Database::authenticate(Connection& connection, const std::string& username,
 {
 	if (username.empty()) throw Poco::InvalidArgumentException("empty username");
 	if (password.empty()) throw Poco::InvalidArgumentException("empty password");
-	
-	if (method == AUTH_MONGODB_CR) 
+
+	if (method == AUTH_MONGODB_CR)
 		return authCR(connection, username, password);
 	else if (method == AUTH_SCRAM_SHA1)
 		return authSCRAM(connection, username, password);
@@ -167,13 +167,13 @@ bool Database::authCR(Connection& connection, const std::string& username, const
 	md5.update(username);
 	md5.update(credsDigest);
 	std::string key = digestToHexString(md5);
-	
+
 	pCommand = createCommand();
 	pCommand->selector()
 		.add<Poco::Int32>("authenticate", 1)
 		.add<std::string>("user", username)
 		.add<std::string>("nonce", nonce)
-		.add<std::string>("key", key); 
+		.add<std::string>("key", key);
 
 	connection.sendRequest(*pCommand, response);
 	if (response.documents().size() > 0)
@@ -189,20 +189,20 @@ bool Database::authSCRAM(Connection& connection, const std::string& username, co
 {
 	std::string clientNonce(createNonce());
 	std::string clientFirstMsg = Poco::format("n=%s,r=%s", username, clientNonce);
-	
+
 	Poco::SharedPtr<QueryRequest> pCommand = createCommand();
 	pCommand->selector()
 		.add<Poco::Int32>("saslStart", 1)
 		.add<std::string>("mechanism", AUTH_SCRAM_SHA1)
 		.add<Binary::Ptr>("payload", new Binary(Poco::format("n,,%s", clientFirstMsg)))
-		.add<bool>("authAuthorize", true); 
-		
+		.add<bool>("authAuthorize", true);
+
 	ResponseMessage response;
 	connection.sendRequest(*pCommand, response);
-	
+
 	Int32 conversationId = 0;
 	std::string serverFirstMsg;
-	
+
 	if (response.documents().size() > 0)
 	{
 		Document::Ptr pDoc = response.documents()[0];
@@ -215,7 +215,7 @@ bool Database::authSCRAM(Connection& connection, const std::string& username, co
 		else return false;
 	}
 	else throw Poco::ProtocolException("empty response for saslStart");
-	
+
 	std::map<std::string, std::string> kvm = parseKeyValueList(serverFirstMsg);
 	const std::string serverNonce = kvm["r"];
 	const std::string salt = decodeBase64(kvm["s"]);
@@ -223,40 +223,40 @@ bool Database::authSCRAM(Connection& connection, const std::string& username, co
 	const Poco::UInt32 dkLen = 20;
 
 	std::string hashedPassword = hashCredentials(username, password);
-		
+
 	Poco::PBKDF2Engine<Poco::HMACEngine<Poco::SHA1Engine> > pbkdf2(salt, iterations, dkLen);
 	pbkdf2.update(hashedPassword);
 	std::string saltedPassword = digestToBinaryString(pbkdf2);
-	
+
 	std::string clientFinalNoProof = Poco::format("c=biws,r=%s", serverNonce);
 	std::string authMessage = Poco::format("%s,%s,%s", clientFirstMsg, serverFirstMsg, clientFinalNoProof);
-	
+
 	Poco::HMACEngine<Poco::SHA1Engine> hmacKey(saltedPassword);
 	hmacKey.update(std::string("Client Key"));
 	std::string clientKey = digestToBinaryString(hmacKey);
-	
+
 	Poco::SHA1Engine sha1;
 	sha1.update(clientKey);
 	std::string storedKey = digestToBinaryString(sha1);
-	
+
 	Poco::HMACEngine<Poco::SHA1Engine> hmacSig(storedKey);
 	hmacSig.update(authMessage);
 	std::string clientSignature = digestToBinaryString(hmacSig);
-	
+
 	std::string clientProof(clientKey);
 	for (std::size_t i = 0; i < clientProof.size(); i++)
 	{
 		clientProof[i] ^= clientSignature[i];
 	}
-	
+
 	std::string clientFinal = Poco::format("%s,p=%s", clientFinalNoProof, encodeBase64(clientProof));
-	
+
 	pCommand = createCommand();
 	pCommand->selector()
 		.add<Poco::Int32>("saslContinue", 1)
 		.add<Poco::Int32>("conversationId", conversationId)
 		.add<Binary::Ptr>("payload", new Binary(clientFinal));
-	
+
 	std::string serverSecondMsg;
 	connection.sendRequest(*pCommand, response);
 	if (response.documents().size() > 0)
@@ -274,17 +274,17 @@ bool Database::authSCRAM(Connection& connection, const std::string& username, co
 	Poco::HMACEngine<Poco::SHA1Engine> hmacSKey(saltedPassword);
 	hmacSKey.update(std::string("Server Key"));
 	std::string serverKey = digestToBinaryString(hmacSKey);
-	
+
 	Poco::HMACEngine<Poco::SHA1Engine> hmacSSig(serverKey);
 	hmacSSig.update(authMessage);
 	std::string serverSignature = digestToBase64(hmacSSig);
-	
+
 	kvm = parseKeyValueList(serverSecondMsg);
 	std::string serverSignatureReceived = kvm["v"];
-	
-	if (serverSignature != serverSignatureReceived) 	
+
+	if (serverSignature != serverSignatureReceived)
 		throw Poco::ProtocolException("server signature verification failed");
-	
+
 	pCommand = createCommand();
 	pCommand->selector()
 		.add<Poco::Int32>("saslContinue", 1)
diff --git a/MongoDB/src/DeleteRequest.cpp b/MongoDB/src/DeleteRequest.cpp
index 67a88c333..ba75beb55 100644
--- a/MongoDB/src/DeleteRequest.cpp
+++ b/MongoDB/src/DeleteRequest.cpp
@@ -20,8 +20,8 @@ namespace MongoDB {
 
 
 DeleteRequest::DeleteRequest(const std::string& collectionName, DeleteRequest::Flags flags):
-	RequestMessage(MessageHeader::OP_DELETE), 
-	_flags(flags), 
+	RequestMessage(MessageHeader::OP_DELETE),
+	_flags(flags),
 	_fullCollectionName(collectionName),
 	_selector()
 {
diff --git a/MongoDB/src/Element.cpp b/MongoDB/src/Element.cpp
index 89629e050..f91ce2644 100644
--- a/MongoDB/src/Element.cpp
+++ b/MongoDB/src/Element.cpp
@@ -24,7 +24,7 @@ Element::Element(const std::string& name) : _name(name)
 }
 
 
-Element::~Element() 
+Element::~Element()
 {
 }
 
diff --git a/MongoDB/src/GetMoreRequest.cpp b/MongoDB/src/GetMoreRequest.cpp
index f8a6b73c6..2c1f6909e 100644
--- a/MongoDB/src/GetMoreRequest.cpp
+++ b/MongoDB/src/GetMoreRequest.cpp
@@ -21,7 +21,7 @@ namespace MongoDB {
 
 
 GetMoreRequest::GetMoreRequest(const std::string& collectionName, Int64 cursorID):
-	RequestMessage(MessageHeader::OP_GET_MORE), 
+	RequestMessage(MessageHeader::OP_GET_MORE),
 	_fullCollectionName(collectionName),
 	_numberToReturn(100),
 	_cursorID(cursorID)
diff --git a/MongoDB/src/InsertRequest.cpp b/MongoDB/src/InsertRequest.cpp
index ec8dc9cf9..65be5654b 100644
--- a/MongoDB/src/InsertRequest.cpp
+++ b/MongoDB/src/InsertRequest.cpp
@@ -20,7 +20,7 @@ namespace MongoDB {
 
 
 InsertRequest::InsertRequest(const std::string& collectionName, Flags flags):
-	RequestMessage(MessageHeader::OP_INSERT), 
+	RequestMessage(MessageHeader::OP_INSERT),
 	_flags(flags),
 	_fullCollectionName(collectionName)
 {
diff --git a/MongoDB/src/KillCursorsRequest.cpp b/MongoDB/src/KillCursorsRequest.cpp
index 6baa0e0be..448002aa1 100644
--- a/MongoDB/src/KillCursorsRequest.cpp
+++ b/MongoDB/src/KillCursorsRequest.cpp
@@ -37,7 +37,7 @@ void KillCursorsRequest::buildRequest(BinaryWriter& writer)
 	for (std::vector<Int64>::iterator it = _cursors.begin(); it != _cursors.end(); ++it)
 	{
 		writer << *it;
-	}		
+	}
 }
 
 
diff --git a/MongoDB/src/Message.cpp b/MongoDB/src/Message.cpp
index c29d282d1..7b1cb23ba 100644
--- a/MongoDB/src/Message.cpp
+++ b/MongoDB/src/Message.cpp
@@ -19,7 +19,7 @@ namespace Poco {
 namespace MongoDB {
 
 
-Message::Message(MessageHeader::OpCode opcode): 
+Message::Message(MessageHeader::OpCode opcode):
 	_header(opcode)
 {
 }
diff --git a/MongoDB/src/MessageHeader.cpp b/MongoDB/src/MessageHeader.cpp
index 222121243..56221cc10 100644
--- a/MongoDB/src/MessageHeader.cpp
+++ b/MongoDB/src/MessageHeader.cpp
@@ -20,10 +20,10 @@ namespace Poco {
 namespace MongoDB {
 
 
-MessageHeader::MessageHeader(OpCode opCode): 
-	_messageLength(0), 
-	_requestID(0), 
-	_responseTo(0), 
+MessageHeader::MessageHeader(OpCode opCode):
+	_messageLength(0),
+	_requestID(0),
+	_responseTo(0),
 	_opCode(opCode)
 {
 }
diff --git a/MongoDB/src/ObjectId.cpp b/MongoDB/src/ObjectId.cpp
index 3065a2ffc..0125c246c 100644
--- a/MongoDB/src/ObjectId.cpp
+++ b/MongoDB/src/ObjectId.cpp
@@ -32,7 +32,7 @@ ObjectId::ObjectId(const std::string& id)
 	poco_assert_dbg(id.size() == 24);
 
     const char* p = id.c_str();
-    for (std::size_t i = 0; i < 12; ++i) 
+    for (std::size_t i = 0; i < 12; ++i)
     {
 		_id[i] = fromHex(p);
 		p += 2;
diff --git a/MongoDB/src/QueryRequest.cpp b/MongoDB/src/QueryRequest.cpp
index 7044335ba..6d7d23a84 100644
--- a/MongoDB/src/QueryRequest.cpp
+++ b/MongoDB/src/QueryRequest.cpp
@@ -20,10 +20,10 @@ namespace MongoDB {
 
 
 QueryRequest::QueryRequest(const std::string& collectionName, QueryRequest::Flags flags):
-	RequestMessage(MessageHeader::OP_QUERY), 
-	_flags(flags), 
+	RequestMessage(MessageHeader::OP_QUERY),
+	_flags(flags),
 	_fullCollectionName(collectionName),
-	_numberToSkip(0), 
+	_numberToSkip(0),
 	_numberToReturn(100),
 	_selector(),
 	_returnFieldSelector()
diff --git a/MongoDB/src/RegularExpression.cpp b/MongoDB/src/RegularExpression.cpp
index e95e7da82..5f7eb6bb5 100644
--- a/MongoDB/src/RegularExpression.cpp
+++ b/MongoDB/src/RegularExpression.cpp
@@ -25,8 +25,8 @@ RegularExpression::RegularExpression()
 }
 
 
-RegularExpression::RegularExpression(const std::string& pattern, const std::string& options): 
-	_pattern(pattern), 
+RegularExpression::RegularExpression(const std::string& pattern, const std::string& options):
+	_pattern(pattern),
 	_options(options)
 {
 }
diff --git a/MongoDB/src/ReplicaSet.cpp b/MongoDB/src/ReplicaSet.cpp
index b56fea493..fce2f2bda 100644
--- a/MongoDB/src/ReplicaSet.cpp
+++ b/MongoDB/src/ReplicaSet.cpp
@@ -21,7 +21,7 @@ namespace Poco {
 namespace MongoDB {
 
 
-ReplicaSet::ReplicaSet(const std::vector<Net::SocketAddress> &addresses): 
+ReplicaSet::ReplicaSet(const std::vector<Net::SocketAddress> &addresses):
 	_addresses(addresses)
 {
 }
@@ -81,8 +81,8 @@ Connection::Ptr ReplicaSet::isMaster(const Net::SocketAddress& address)
 	{
 		conn = 0;
 	}
-	
-	return 0; 
+
+	return 0;
 }
 
 
diff --git a/MongoDB/src/ResponseMessage.cpp b/MongoDB/src/ResponseMessage.cpp
index dfc914181..e82167674 100644
--- a/MongoDB/src/ResponseMessage.cpp
+++ b/MongoDB/src/ResponseMessage.cpp
@@ -21,10 +21,10 @@ namespace MongoDB {
 
 
 ResponseMessage::ResponseMessage():
-	Message(MessageHeader::OP_REPLY), 
-	_responseFlags(0), 
-	_cursorID(0), 
-	_startingFrom(0), 
+	Message(MessageHeader::OP_REPLY),
+	_responseFlags(0),
+	_cursorID(0),
+	_startingFrom(0),
 	_numberReturned(0)
 {
 }
@@ -60,7 +60,7 @@ void ResponseMessage::read(std::istream& istr)
 	clear();
 
 	BinaryReader reader(istr, BinaryReader::LITTLE_ENDIAN_BYTE_ORDER);
-	
+
 	_header.read(reader);
 
 	reader >> _responseFlags;
diff --git a/MongoDB/src/UpdateRequest.cpp b/MongoDB/src/UpdateRequest.cpp
index 2af4621ff..7477fc752 100644
--- a/MongoDB/src/UpdateRequest.cpp
+++ b/MongoDB/src/UpdateRequest.cpp
@@ -20,7 +20,7 @@ namespace MongoDB {
 
 
 UpdateRequest::UpdateRequest(const std::string& collectionName, UpdateRequest::Flags flags):
-	RequestMessage(MessageHeader::OP_UPDATE), 
+	RequestMessage(MessageHeader::OP_UPDATE),
 	_flags(flags),
 	_fullCollectionName(collectionName),
 	_selector(),
diff --git a/MongoDB/testsuite/TestSuite.progen b/MongoDB/testsuite/TestSuite.progen
index 0aa30fc02..fb74be89f 100644
--- a/MongoDB/testsuite/TestSuite.progen
+++ b/MongoDB/testsuite/TestSuite.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/MongoDB/testsuite/TestSuite_vs170.vcxproj b/MongoDB/testsuite/TestSuite_vs170.vcxproj
index 457d23296..c2147b25c 100644
--- a/MongoDB/testsuite/TestSuite_vs170.vcxproj
+++ b/MongoDB/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{96CF3103-E49E-3F5E-A11D-6DBCDA043053}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/MongoDB/testsuite/src/MongoDBTest.cpp b/MongoDB/testsuite/src/MongoDBTest.cpp
index 9105ea9dd..949f8e302 100644
--- a/MongoDB/testsuite/src/MongoDBTest.cpp
+++ b/MongoDB/testsuite/src/MongoDBTest.cpp
@@ -10,6 +10,7 @@
 
 #include "Poco/DateTime.h"
 #include "Poco/ObjectPool.h"
+#include "Poco/MongoDB/Array.h"
 #include "Poco/MongoDB/InsertRequest.h"
 #include "Poco/MongoDB/QueryRequest.h"
 #include "Poco/MongoDB/DeleteRequest.h"
@@ -77,6 +78,41 @@ void MongoDBTest::testInsertRequest()
 	_mongo->sendRequest(request);
 }
 
+void MongoDBTest::testArray()
+{
+	Poco::MongoDB::Array::Ptr arr = new Poco::MongoDB::Array();
+
+	arr->add(std::string("First"));
+
+	Poco::DateTime birthdate;
+	birthdate.assign(1969, 3, 9);
+	arr->add(birthdate.timestamp());
+
+	arr->add(static_cast<Poco::Int32>(1993));
+	arr->add(false);
+
+	// Document-style interface
+	arr->add("4", "12.4");
+
+	assertEqual(arr->size(), 5);
+	assertTrue(arr->exists("0"));
+	assertTrue(arr->exists("1"));
+	assertTrue(arr->exists("2"));
+	assertTrue(arr->exists("3"));
+	assertFalse(arr->exists("4"));
+
+	assertEqual(arr->get<std::string>(0), "First");
+	assertEqual(arr->get<Poco::Timestamp>(1).raw(), birthdate.timestamp().raw());
+	assertEqual(arr->get<Poco::Int32>(2), 1993);
+	assertEqual(arr->get<bool>(3), false);
+	assertEqual(arr->get<std::string>(4), "12.4");
+
+	// Document-style interface
+	assertEqual(arr->get<Poco::Int32>("2"), 1993);
+	assertEqual(arr->get<std::string>("4"), "12.4");
+
+}
+
 
 void MongoDBTest::testQueryRequest()
 {
@@ -472,6 +508,7 @@ CppUnit::Test* MongoDBTest::suite()
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("MongoDBTest");
 	CppUnit_addTest(pSuite, MongoDBTest, testBuildInfo);
 	CppUnit_addTest(pSuite, MongoDBTest, testInsertRequest);
+	CppUnit_addTest(pSuite, MongoDBTest, testArray);
 	CppUnit_addTest(pSuite, MongoDBTest, testQueryRequest);
 	CppUnit_addTest(pSuite, MongoDBTest, testDBQueryRequest);
 	CppUnit_addTest(pSuite, MongoDBTest, testCountCommand);
diff --git a/MongoDB/testsuite/src/MongoDBTest.h b/MongoDB/testsuite/src/MongoDBTest.h
index 4c5954612..6ec23d728 100644
--- a/MongoDB/testsuite/src/MongoDBTest.h
+++ b/MongoDB/testsuite/src/MongoDBTest.h
@@ -27,6 +27,7 @@ public:
 	virtual ~MongoDBTest();
 
 	void testInsertRequest();
+	void testArray();
 	void testQueryRequest();
 	void testDBQueryRequest();
 	void testCountCommand();
diff --git a/MongoDB/testsuite/src/WinCEDriver.cpp b/MongoDB/testsuite/src/WinCEDriver.cpp
index 929275cbf..2fb7f34bd 100644
--- a/MongoDB/testsuite/src/WinCEDriver.cpp
+++ b/MongoDB/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int _tmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("MongoDBTestSuite", MongoDBTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/Net/CMakeLists.txt b/Net/CMakeLists.txt
index eb56e7118..237df1c3b 100644
--- a/Net/CMakeLists.txt
+++ b/Net/CMakeLists.txt
@@ -6,6 +6,10 @@ POCO_SOURCES_AUTO(SRCS ${SRCS_G})
 file(GLOB_RECURSE HDRS_G "include/*.h")
 POCO_HEADERS_AUTO(SRCS ${HDRS_G})
 
+# Platform Specific
+POCO_SOURCES_AUTO_PLAT(SRCS WIN32 src/wepoll.c)
+POCO_HEADERS_AUTO(SRCS src/wepoll.h)
+
 # Version Resource
 if(MSVC AND BUILD_SHARED_LIBS)
 	source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
diff --git a/Net/Net.progen b/Net/Net.progen
index 802f53935..50812acf6 100644
--- a/Net/Net.progen
+++ b/Net/Net.progen
@@ -12,6 +12,7 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/Net/Net_vs140.vcxproj b/Net/Net_vs140.vcxproj
index 754b54575..a4f785ca7 100644
--- a/Net/Net_vs140.vcxproj
+++ b/Net/Net_vs140.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
@@ -157,7 +157,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.25420.1</_ProjectFileVersion>
+    <_ProjectFileVersion>16.0.32002.118</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetmtd</TargetName>
@@ -644,6 +644,7 @@
     <ClInclude Include="include\Poco\Net\SocketImpl.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotification.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotifier.h"/>
+    <ClInclude Include="include\Poco\Net\SocketProactor.h"/>
     <ClInclude Include="include\Poco\Net\SocketReactor.h"/>
     <ClInclude Include="include\Poco\Net\SocketStream.h"/>
     <ClInclude Include="include\Poco\Net\SSPINTLMCredentials.h"/>
@@ -934,6 +935,9 @@
     <ClCompile Include="src\SocketNotifier.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
+    <ClCompile Include="src\SocketProactor.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
     <ClCompile Include="src\SocketReactor.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
diff --git a/Net/Net_vs140.vcxproj.filters b/Net/Net_vs140.vcxproj.filters
index 7a096490d..06c8acbf6 100644
--- a/Net/Net_vs140.vcxproj.filters
+++ b/Net/Net_vs140.vcxproj.filters
@@ -2,166 +2,166 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{0a45cf1d-405f-4e8c-8944-d9acb0d6d2d5}</UniqueIdentifier>
+      <UniqueIdentifier>{a4599d67-7537-4525-a2c2-adaa617fd1ae}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{ce0d7536-e98c-43ca-9130-e4f855c013af}</UniqueIdentifier>
+      <UniqueIdentifier>{f4edecbc-e32e-4f71-a27b-0b8031a2df58}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{4ec20ea8-9fd4-4b50-90e2-154c60d7ba51}</UniqueIdentifier>
+      <UniqueIdentifier>{010547e8-c997-4e0e-88c4-48be71f64aef}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{b8e855f7-e744-467b-9cb0-89bd1c65fcb4}</UniqueIdentifier>
+      <UniqueIdentifier>{d63184a1-8c8c-4a14-98d9-698e0c92729f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{3fb19cca-eec1-4eed-b32e-676adae615e2}</UniqueIdentifier>
+      <UniqueIdentifier>{b680f823-85fc-4343-b07c-0fa6c0c8af91}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{4199711d-858b-4f4e-9a50-153731e7001b}</UniqueIdentifier>
+      <UniqueIdentifier>{a39c7384-d3e5-4a0e-a571-a965bb4c8347}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{605c378e-32fd-4895-a46e-7b810867a1a4}</UniqueIdentifier>
+      <UniqueIdentifier>{53af12e3-e99f-446f-9298-512deee5774a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{8e112f4f-27c7-469e-84e6-0cf423067b4a}</UniqueIdentifier>
+      <UniqueIdentifier>{713e2303-58eb-4296-9cdb-f8199e63359b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{b212d74d-2fae-421b-98e9-2a6dc8cb1be1}</UniqueIdentifier>
+      <UniqueIdentifier>{1e2d1cbc-8d4b-43f9-aa3b-45a03b688bf1}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{d8fbe38e-6c77-407e-97a2-135be5740ab6}</UniqueIdentifier>
+      <UniqueIdentifier>{d444e9cc-7a5d-46a5-80eb-ad75e7ea2cb1}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{b6528ab4-9097-456f-a69c-02ef458553f9}</UniqueIdentifier>
+      <UniqueIdentifier>{32e23ed9-31bf-4da2-bd60-8c8cc56b953d}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{b60ba742-6932-40a6-901b-26187c69346a}</UniqueIdentifier>
+      <UniqueIdentifier>{75ba71a5-4a26-4323-a4a7-f3df2cd20c9c}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{413268b7-7de6-4560-ada7-4a5477d0b412}</UniqueIdentifier>
+      <UniqueIdentifier>{c4f1e93f-0f76-4583-902c-8554743dde10}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{4f5ac6d6-3be8-44e7-9e21-14cefe8d740d}</UniqueIdentifier>
+      <UniqueIdentifier>{d10dac48-0416-4d6b-871e-f600700d9f70}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{fdaf2e08-16b6-4cee-a756-d256984c9430}</UniqueIdentifier>
+      <UniqueIdentifier>{248c7dc7-d604-4a3d-bf7f-3f086e6992a3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{be918e70-e2dc-40db-a75b-67af32dcbf7b}</UniqueIdentifier>
+      <UniqueIdentifier>{70b5c725-f242-45d2-879a-8986eb12a861}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{a350553e-f804-4e03-9455-394054c2b98d}</UniqueIdentifier>
+      <UniqueIdentifier>{41080954-b6d9-4747-b66c-085ef0d0efcf}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{93939c49-48c3-489d-bbfc-66a35a7b8c6e}</UniqueIdentifier>
+      <UniqueIdentifier>{4036398d-6b93-4d3e-bbac-187de6d937c4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{1f269583-c489-426c-b084-87e6d2b7bcf0}</UniqueIdentifier>
+      <UniqueIdentifier>{a5161d3a-ef62-44e4-a207-4db4d0267957}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{55e143f8-a805-4ee9-874f-431f1fbad749}</UniqueIdentifier>
+      <UniqueIdentifier>{1948bb8f-aebb-4528-b9ed-4a42b4933e59}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{65b45d1a-3cc6-4ea7-bbfd-35402d963002}</UniqueIdentifier>
+      <UniqueIdentifier>{d9fa8b9d-6867-46aa-bbc8-9bce163bf20b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{3875c305-d680-494a-8fe3-282ec7ff4207}</UniqueIdentifier>
+      <UniqueIdentifier>{6a6efa2c-7f09-421d-bb3f-76fb57f768d5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{c2e5b43a-f466-4046-ac55-1465a492bf6a}</UniqueIdentifier>
+      <UniqueIdentifier>{8909f125-b3ae-4884-9727-dd97264cb593}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{0a833c03-9929-479c-84e1-3f002c48134c}</UniqueIdentifier>
+      <UniqueIdentifier>{e89c828a-ad9b-4595-85b7-c817996f5a8e}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{3460d085-f04f-41d5-85d6-509792fd165f}</UniqueIdentifier>
+      <UniqueIdentifier>{a0040b26-df66-4f7f-ad1e-52725066f46d}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{1b87bb5b-9c9f-4e0d-9b69-77f52a798199}</UniqueIdentifier>
+      <UniqueIdentifier>{aab649a5-6940-4bce-bb17-3e45b2009443}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{2f32031e-eede-4aa1-a602-7e4005ef9412}</UniqueIdentifier>
+      <UniqueIdentifier>{b3b4e648-e277-47cb-b287-e4eb4f6fb47d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{db5b0984-c469-49d9-aaaf-366f752f359f}</UniqueIdentifier>
+      <UniqueIdentifier>{f88e8f9d-ead5-4502-b909-8cfd9a181b40}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{20113a7a-3c13-4f23-bb68-8d8415f5876e}</UniqueIdentifier>
+      <UniqueIdentifier>{08f74d9a-7197-466f-a275-eac64092ecad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{48e377c0-8879-48d1-93f5-51836607f602}</UniqueIdentifier>
+      <UniqueIdentifier>{2596d9c2-231a-4f7b-953f-c44038b7a8d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{7f18b340-3744-444b-b7e1-6c243f903ab4}</UniqueIdentifier>
+      <UniqueIdentifier>{c1ffa27e-899e-428e-9441-c0ea0c2ab3d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{d1d1ade2-7c80-4fe3-af71-e196cd602dfc}</UniqueIdentifier>
+      <UniqueIdentifier>{a2f89df2-d020-4f58-ba24-23722673101d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{cfd54cf8-3dc1-4093-9509-a0674063f6b3}</UniqueIdentifier>
+      <UniqueIdentifier>{ba973217-4847-40ed-b192-fe1b329ebf09}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{d561e649-7e52-4479-ae70-d01cfbc057a5}</UniqueIdentifier>
+      <UniqueIdentifier>{826379f3-cf95-45cc-a992-4d28cb07adae}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{abd6027a-3fb9-4e1c-9c8f-09e0bdbf7ba6}</UniqueIdentifier>
+      <UniqueIdentifier>{6416b0a9-4221-4aaa-bc62-b91a35f753ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{4c691673-4f88-4547-b7d8-41e341f77931}</UniqueIdentifier>
+      <UniqueIdentifier>{1eed50fd-258e-44d8-a4f8-1f664678d2db}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{23098c7a-0c66-4b35-99b1-8a1bc8e07f91}</UniqueIdentifier>
+      <UniqueIdentifier>{4eefdc66-dd24-4b56-a54d-5ee07474a820}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{5bf85845-8814-4c70-a4bc-199a8ed02d66}</UniqueIdentifier>
+      <UniqueIdentifier>{0cd71e42-1840-414c-ae90-9eaac9f6c710}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{2ac4523d-0c4d-4e02-adaa-700e227380d9}</UniqueIdentifier>
+      <UniqueIdentifier>{3abf3caf-fd67-4c1a-9b35-3c4d093db45b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{621f3d52-f58f-4892-93d9-2685e5edbc35}</UniqueIdentifier>
+      <UniqueIdentifier>{0d525550-f0e2-463e-a965-9f572acb7a64}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{0a677753-c25b-4af5-b71a-504a88895d6f}</UniqueIdentifier>
+      <UniqueIdentifier>{fa129ad5-6715-4ad6-9071-a041bd812fca}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{56f9999c-2fb6-41ad-8225-b3bd826cd25b}</UniqueIdentifier>
+      <UniqueIdentifier>{558e01c9-5da7-41c8-9c42-a025d5f4fa64}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{21f8b7d0-9958-482f-bc66-b8ccfbd5d176}</UniqueIdentifier>
+      <UniqueIdentifier>{3eb8c2ad-9edd-4984-8057-453515b93b46}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{49d3a4a9-4bb2-47fa-a0cc-0348b3f21199}</UniqueIdentifier>
+      <UniqueIdentifier>{7d050e5c-3af4-437d-a0a1-70092bfd09af}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{96952ee4-3c90-4c16-a229-9dc40e8b6300}</UniqueIdentifier>
+      <UniqueIdentifier>{ecb32fce-afd7-46df-950a-705ba7a6e0cb}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth">
-      <UniqueIdentifier>{7b8d02f8-9f84-43ae-ba31-3f44da834829}</UniqueIdentifier>
+      <UniqueIdentifier>{4e126f6a-f94f-4440-9661-4ca22da868be}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Header Files">
-      <UniqueIdentifier>{9afd6926-1a61-4250-a1a9-11f3efc1c38d}</UniqueIdentifier>
+      <UniqueIdentifier>{1d23be10-2ca5-48c6-ae1e-13e3e9cd209e}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Source Files">
-      <UniqueIdentifier>{cefe4358-6cb1-4651-9b8e-4e52151dde52}</UniqueIdentifier>
+      <UniqueIdentifier>{3e3cd188-176a-4cd5-97cb-3627fa8e5d6a}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP">
-      <UniqueIdentifier>{0bc36e64-ff49-4938-90ae-ba9ba12ad27d}</UniqueIdentifier>
+      <UniqueIdentifier>{1c85e314-1894-456e-af6a-40f1fa318d16}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Source Files">
-      <UniqueIdentifier>{75c5a4e9-0459-49cc-9e2d-161eafeddb48}</UniqueIdentifier>
+      <UniqueIdentifier>{578b8dd3-f2da-447a-beb9-d4176b51c16f}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Header Files">
-      <UniqueIdentifier>{87f7a634-fb09-43fb-80f7-6424419d720b}</UniqueIdentifier>
+      <UniqueIdentifier>{f3582cf2-97d9-443f-b949-66df436cc305}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM">
-      <UniqueIdentifier>{73db6087-4396-409b-ad87-c58900587847}</UniqueIdentifier>
+      <UniqueIdentifier>{0d5f00ba-274a-430b-a5d0-850fe1b0f0eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM\Header Files">
-      <UniqueIdentifier>{b3a5b2d8-05e2-4d10-9eb4-16e60c1d6010}</UniqueIdentifier>
+      <UniqueIdentifier>{f2515da8-7903-413c-99b1-25b42e694c5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM\Source Files">
-      <UniqueIdentifier>{92f3c8cb-f970-4251-b095-7224790d7c2e}</UniqueIdentifier>
+      <UniqueIdentifier>{b58d6277-eafe-4ff6-80ea-874f76390617}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -420,6 +420,9 @@
     <ClInclude Include="include\Poco\Net\SocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\SocketProactor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\MailMessage.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>
@@ -752,6 +755,9 @@
     <ClCompile Include="src\SocketReactor.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketProactor.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MailMessage.cpp">
       <Filter>Mail\Source Files</Filter>
     </ClCompile>
diff --git a/Net/Net_vs150.vcxproj b/Net/Net_vs150.vcxproj
index b487d7a7d..884044023 100644
--- a/Net/Net_vs150.vcxproj
+++ b/Net/Net_vs150.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -56,120 +56,109 @@
     <RootNamespace>Net</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros"/>
+  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetmtd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoNet</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoNetmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoNetmt</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoNet64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoNetmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoNetmtd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoNet64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoNetmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoNetmt</TargetName>
+    <_ProjectFileVersion>16.0.32602.291</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -235,11 +224,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -268,11 +257,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -299,12 +288,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib\PocoNetmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmtd.lib</OutputFile>
@@ -325,11 +314,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmt.lib</OutputFile>
@@ -347,12 +336,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib\PocoNetmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmdd.lib</OutputFile>
@@ -373,12 +362,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib\PocoNetmd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -397,11 +386,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -430,11 +419,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -461,12 +450,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib64\PocoNetmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmtd.lib</OutputFile>
@@ -487,11 +476,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmt.lib</OutputFile>
@@ -509,12 +498,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib64\PocoNetmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmdd.lib</OutputFile>
@@ -535,450 +524,244 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Net\AbstractHTTPRequestHandler.h"/>
-    <ClInclude Include="include\Poco\Net\DatagramSocket.h"/>
-    <ClInclude Include="include\Poco\Net\DatagramSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\DialogSocket.h"/>
-    <ClInclude Include="include\Poco\Net\DNS.h"/>
-    <ClInclude Include="include\Poco\Net\FilePartSource.h"/>
-    <ClInclude Include="include\Poco\Net\FTPClientSession.h"/>
-    <ClInclude Include="include\Poco\Net\FTPStreamFactory.h"/>
-    <ClInclude Include="include\Poco\Net\HostEntry.h"/>
-    <ClInclude Include="include\Poco\Net\HTMLForm.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPAuthenticationParams.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPBasicCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPBasicStreamBuf.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPBufferAllocator.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPChunkedStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPClientSession.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPCookie.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPDigestCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPFixedLengthStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPHeaderStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPIOStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPMessage.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPNTLMCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPRequest.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPRequestHandler.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPRequestHandlerFactory.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPResponse.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServer.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerConnection.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerConnectionFactory.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerParams.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerRequest.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerRequestImpl.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerResponse.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerResponseImpl.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerSession.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPSession.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPSessionFactory.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPSessionInstantiator.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPStreamFactory.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPClient.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPEventArgs.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPPacket.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPPacketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPSocket.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPv4PacketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\IPAddress.h"/>
-    <ClInclude Include="include\Poco\Net\IPAddressImpl.h"/>
-    <ClInclude Include="include\Poco\Net\MailMessage.h"/>
-    <ClInclude Include="include\Poco\Net\MailRecipient.h"/>
-    <ClInclude Include="include\Poco\Net\MailStream.h"/>
-    <ClInclude Include="include\Poco\Net\MediaType.h"/>
-    <ClInclude Include="include\Poco\Net\MessageHeader.h"/>
-    <ClInclude Include="include\Poco\Net\MulticastSocket.h"/>
-    <ClInclude Include="include\Poco\Net\MultipartReader.h"/>
-    <ClInclude Include="include\Poco\Net\MultipartWriter.h"/>
-    <ClInclude Include="include\Poco\Net\MultiSocketPoller.h"/>
-    <ClInclude Include="include\Poco\Net\NameValueCollection.h"/>
-    <ClInclude Include="include\Poco\Net\Net.h"/>
-    <ClInclude Include="include\Poco\Net\NetException.h"/>
-    <ClInclude Include="include\Poco\Net\NetworkInterface.h"/>
-    <ClInclude Include="include\Poco\Net\NTLMCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\NTPClient.h"/>
-    <ClInclude Include="include\Poco\Net\NTPEventArgs.h"/>
-    <ClInclude Include="include\Poco\Net\NTPPacket.h"/>
-    <ClInclude Include="include\Poco\Net\NullPartHandler.h"/>
-    <ClInclude Include="include\Poco\Net\OAuth10Credentials.h"/>
-    <ClInclude Include="include\Poco\Net\OAuth20Credentials.h"/>
-    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h"/>
-    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h"/>
-    <ClInclude Include="include\Poco\Net\PartHandler.h"/>
-    <ClInclude Include="include\Poco\Net\PartSource.h"/>
-    <ClInclude Include="include\Poco\Net\PartStore.h"/>
-    <ClInclude Include="include\Poco\Net\PollSet.h"/>
-    <ClInclude Include="include\Poco\Net\POP3ClientSession.h"/>
-    <ClInclude Include="include\Poco\Net\QuotedPrintableDecoder.h"/>
-    <ClInclude Include="include\Poco\Net\QuotedPrintableEncoder.h"/>
-    <ClInclude Include="include\Poco\Net\RawSocket.h"/>
-    <ClInclude Include="include\Poco\Net\RawSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\RemoteSyslogChannel.h"/>
-    <ClInclude Include="include\Poco\Net\RemoteSyslogListener.h"/>
-    <ClInclude Include="include\Poco\Net\ServerSocket.h"/>
-    <ClInclude Include="include\Poco\Net\ServerSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\SingleSocketPoller.h"/>
-    <ClInclude Include="include\Poco\Net\SMTPChannel.h"/>
-    <ClInclude Include="include\Poco\Net\SMTPClientSession.h"/>
-    <ClInclude Include="include\Poco\Net\Socket.h"/>
-    <ClInclude Include="include\Poco\Net\SocketAcceptor.h"/>
-    <ClInclude Include="include\Poco\Net\SocketAddress.h"/>
-    <ClInclude Include="include\Poco\Net\SocketAddressImpl.h"/>
-    <ClInclude Include="include\Poco\Net\SocketConnector.h"/>
-    <ClInclude Include="include\Poco\Net\SocketDefs.h"/>
-    <ClInclude Include="include\Poco\Net\SocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\SocketNotification.h"/>
-    <ClInclude Include="include\Poco\Net\SocketNotifier.h"/>
-    <ClInclude Include="include\Poco\Net\SocketReactor.h"/>
-    <ClInclude Include="include\Poco\Net\SocketStream.h"/>
-    <ClInclude Include="include\Poco\Net\SSPINTLMCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\StreamSocket.h"/>
-    <ClInclude Include="include\Poco\Net\StreamSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\StringPartSource.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServer.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServerConnection.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServerConnectionFactory.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServerDispatcher.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServerParams.h"/>
-    <ClInclude Include="include\Poco\Net\UDPClient.h"/>
-    <ClInclude Include="include\Poco\Net\UDPHandler.h"/>
-    <ClInclude Include="include\Poco\Net\UDPServer.h"/>
-    <ClInclude Include="include\Poco\Net\UDPServerParams.h"/>
-    <ClInclude Include="include\Poco\Net\UDPSocketReader.h"/>
-    <ClInclude Include="include\Poco\Net\WebSocket.h"/>
-    <ClInclude Include="include\Poco\Net\WebSocketImpl.h"/>
+    <ClInclude Include="include\Poco\Net\AbstractHTTPRequestHandler.h" />
+    <ClInclude Include="include\Poco\Net\DatagramSocket.h" />
+    <ClInclude Include="include\Poco\Net\DatagramSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\DialogSocket.h" />
+    <ClInclude Include="include\Poco\Net\DNS.h" />
+    <ClInclude Include="include\Poco\Net\FilePartSource.h" />
+    <ClInclude Include="include\Poco\Net\FTPClientSession.h" />
+    <ClInclude Include="include\Poco\Net\FTPStreamFactory.h" />
+    <ClInclude Include="include\Poco\Net\HostEntry.h" />
+    <ClInclude Include="include\Poco\Net\HTMLForm.h" />
+    <ClInclude Include="include\Poco\Net\HTTPAuthenticationParams.h" />
+    <ClInclude Include="include\Poco\Net\HTTPBasicCredentials.h" />
+    <ClInclude Include="include\Poco\Net\HTTPBasicStreamBuf.h" />
+    <ClInclude Include="include\Poco\Net\HTTPBufferAllocator.h" />
+    <ClInclude Include="include\Poco\Net\HTTPChunkedStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPClientSession.h" />
+    <ClInclude Include="include\Poco\Net\HTTPCookie.h" />
+    <ClInclude Include="include\Poco\Net\HTTPCredentials.h" />
+    <ClInclude Include="include\Poco\Net\HTTPDigestCredentials.h" />
+    <ClInclude Include="include\Poco\Net\HTTPFixedLengthStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPHeaderStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPIOStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPMessage.h" />
+    <ClInclude Include="include\Poco\Net\HTTPNTLMCredentials.h" />
+    <ClInclude Include="include\Poco\Net\HTTPRequest.h" />
+    <ClInclude Include="include\Poco\Net\HTTPRequestHandler.h" />
+    <ClInclude Include="include\Poco\Net\HTTPRequestHandlerFactory.h" />
+    <ClInclude Include="include\Poco\Net\HTTPResponse.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServer.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerConnection.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerConnectionFactory.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerParams.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerRequest.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerRequestImpl.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerResponse.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerResponseImpl.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerSession.h" />
+    <ClInclude Include="include\Poco\Net\HTTPSession.h" />
+    <ClInclude Include="include\Poco\Net\HTTPSessionFactory.h" />
+    <ClInclude Include="include\Poco\Net\HTTPSessionInstantiator.h" />
+    <ClInclude Include="include\Poco\Net\HTTPStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPStreamFactory.h" />
+    <ClInclude Include="include\Poco\Net\ICMPClient.h" />
+    <ClInclude Include="include\Poco\Net\ICMPEventArgs.h" />
+    <ClInclude Include="include\Poco\Net\ICMPPacket.h" />
+    <ClInclude Include="include\Poco\Net\ICMPPacketImpl.h" />
+    <ClInclude Include="include\Poco\Net\ICMPSocket.h" />
+    <ClInclude Include="include\Poco\Net\ICMPSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\ICMPv4PacketImpl.h" />
+    <ClInclude Include="include\Poco\Net\IPAddress.h" />
+    <ClInclude Include="include\Poco\Net\IPAddressImpl.h" />
+    <ClInclude Include="include\Poco\Net\MailMessage.h" />
+    <ClInclude Include="include\Poco\Net\MailRecipient.h" />
+    <ClInclude Include="include\Poco\Net\MailStream.h" />
+    <ClInclude Include="include\Poco\Net\MediaType.h" />
+    <ClInclude Include="include\Poco\Net\MessageHeader.h" />
+    <ClInclude Include="include\Poco\Net\MulticastSocket.h" />
+    <ClInclude Include="include\Poco\Net\MultipartReader.h" />
+    <ClInclude Include="include\Poco\Net\MultipartWriter.h" />
+    <ClInclude Include="include\Poco\Net\MultiSocketPoller.h" />
+    <ClInclude Include="include\Poco\Net\NameValueCollection.h" />
+    <ClInclude Include="include\Poco\Net\Net.h" />
+    <ClInclude Include="include\Poco\Net\NetException.h" />
+    <ClInclude Include="include\Poco\Net\NetworkInterface.h" />
+    <ClInclude Include="include\Poco\Net\NTLMCredentials.h" />
+    <ClInclude Include="include\Poco\Net\NTPClient.h" />
+    <ClInclude Include="include\Poco\Net\NTPEventArgs.h" />
+    <ClInclude Include="include\Poco\Net\NTPPacket.h" />
+    <ClInclude Include="include\Poco\Net\NullPartHandler.h" />
+    <ClInclude Include="include\Poco\Net\OAuth10Credentials.h" />
+    <ClInclude Include="include\Poco\Net\OAuth20Credentials.h" />
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h" />
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h" />
+    <ClInclude Include="include\Poco\Net\PartHandler.h" />
+    <ClInclude Include="include\Poco\Net\PartSource.h" />
+    <ClInclude Include="include\Poco\Net\PartStore.h" />
+    <ClInclude Include="include\Poco\Net\PollSet.h" />
+    <ClInclude Include="include\Poco\Net\POP3ClientSession.h" />
+    <ClInclude Include="include\Poco\Net\QuotedPrintableDecoder.h" />
+    <ClInclude Include="include\Poco\Net\QuotedPrintableEncoder.h" />
+    <ClInclude Include="include\Poco\Net\RawSocket.h" />
+    <ClInclude Include="include\Poco\Net\RawSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\RemoteSyslogChannel.h" />
+    <ClInclude Include="include\Poco\Net\RemoteSyslogListener.h" />
+    <ClInclude Include="include\Poco\Net\ServerSocket.h" />
+    <ClInclude Include="include\Poco\Net\ServerSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\SingleSocketPoller.h" />
+    <ClInclude Include="include\Poco\Net\SMTPChannel.h" />
+    <ClInclude Include="include\Poco\Net\SMTPClientSession.h" />
+    <ClInclude Include="include\Poco\Net\Socket.h" />
+    <ClInclude Include="include\Poco\Net\SocketAcceptor.h" />
+    <ClInclude Include="include\Poco\Net\SocketAddress.h" />
+    <ClInclude Include="include\Poco\Net\SocketAddressImpl.h" />
+    <ClInclude Include="include\Poco\Net\SocketConnector.h" />
+    <ClInclude Include="include\Poco\Net\SocketDefs.h" />
+    <ClInclude Include="include\Poco\Net\SocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\SocketNotification.h" />
+    <ClInclude Include="include\Poco\Net\SocketNotifier.h" />
+    <ClInclude Include="include\Poco\Net\SocketProactor.h" />
+    <ClInclude Include="include\Poco\Net\SocketReactor.h" />
+    <ClInclude Include="include\Poco\Net\SocketStream.h" />
+    <ClInclude Include="include\Poco\Net\SSPINTLMCredentials.h" />
+    <ClInclude Include="include\Poco\Net\StreamSocket.h" />
+    <ClInclude Include="include\Poco\Net\StreamSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\StringPartSource.h" />
+    <ClInclude Include="include\Poco\Net\TCPServer.h" />
+    <ClInclude Include="include\Poco\Net\TCPServerConnection.h" />
+    <ClInclude Include="include\Poco\Net\TCPServerConnectionFactory.h" />
+    <ClInclude Include="include\Poco\Net\TCPServerDispatcher.h" />
+    <ClInclude Include="include\Poco\Net\TCPServerParams.h" />
+    <ClInclude Include="include\Poco\Net\UDPClient.h" />
+    <ClInclude Include="include\Poco\Net\UDPHandler.h" />
+    <ClInclude Include="include\Poco\Net\UDPServer.h" />
+    <ClInclude Include="include\Poco\Net\UDPServerParams.h" />
+    <ClInclude Include="include\Poco\Net\UDPSocketReader.h" />
+    <ClInclude Include="include\Poco\Net\WebSocket.h" />
+    <ClInclude Include="include\Poco\Net\WebSocketImpl.h" />
+    <ClInclude Include="src\wepoll.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\AbstractHTTPRequestHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DatagramSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DatagramSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DialogSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DNS.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FilePartSource.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPStreamFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HostEntry.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTMLForm.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPAuthenticationParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPBasicCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPBufferAllocator.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPChunkedStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCookie.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPDigestCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPFixedLengthStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPHeaderStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPIOStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPMessage.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPNTLMCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequestHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequestHandlerFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPResponse.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerConnection.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerConnectionFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerRequest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerRequestImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerResponse.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerResponseImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPSessionFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPSessionInstantiator.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPStreamFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPClient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPEventArgs.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPPacket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPPacketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPv4PacketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\IPAddress.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\IPAddressImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailMessage.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailRecipient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MediaType.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MessageHeader.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MulticastSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartReader.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartWriter.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NameValueCollection.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\Net.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetException.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetworkInterface.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTLMCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPClient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPEventArgs.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPPacket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NullPartHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth10Credentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth20Credentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PartHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PartSource.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PartStore.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PollSet.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\POP3ClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableDecoder.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableEncoder.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RawSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RawSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RemoteSyslogChannel.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RemoteSyslogListener.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ServerSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ServerSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SMTPChannel.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SMTPClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\Socket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketAddress.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketAddressImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketNotification.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketNotifier.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketReactor.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SSPINTLMCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\StreamSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\StreamSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\StringPartSource.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerConnection.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerConnectionFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerDispatcher.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPClient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPServerParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
+    <ClCompile Include="src\AbstractHTTPRequestHandler.cpp" />
+    <ClCompile Include="src\DatagramSocket.cpp" />
+    <ClCompile Include="src\DatagramSocketImpl.cpp" />
+    <ClCompile Include="src\DialogSocket.cpp" />
+    <ClCompile Include="src\DNS.cpp" />
+    <ClCompile Include="src\FilePartSource.cpp" />
+    <ClCompile Include="src\FTPClientSession.cpp" />
+    <ClCompile Include="src\FTPStreamFactory.cpp" />
+    <ClCompile Include="src\HostEntry.cpp" />
+    <ClCompile Include="src\HTMLForm.cpp" />
+    <ClCompile Include="src\HTTPAuthenticationParams.cpp" />
+    <ClCompile Include="src\HTTPBasicCredentials.cpp" />
+    <ClCompile Include="src\HTTPBufferAllocator.cpp" />
+    <ClCompile Include="src\HTTPChunkedStream.cpp" />
+    <ClCompile Include="src\HTTPClientSession.cpp" />
+    <ClCompile Include="src\HTTPCookie.cpp" />
+    <ClCompile Include="src\HTTPCredentials.cpp" />
+    <ClCompile Include="src\HTTPDigestCredentials.cpp" />
+    <ClCompile Include="src\HTTPFixedLengthStream.cpp" />
+    <ClCompile Include="src\HTTPHeaderStream.cpp" />
+    <ClCompile Include="src\HTTPIOStream.cpp" />
+    <ClCompile Include="src\HTTPMessage.cpp" />
+    <ClCompile Include="src\HTTPNTLMCredentials.cpp" />
+    <ClCompile Include="src\HTTPRequest.cpp" />
+    <ClCompile Include="src\HTTPRequestHandler.cpp" />
+    <ClCompile Include="src\HTTPRequestHandlerFactory.cpp" />
+    <ClCompile Include="src\HTTPResponse.cpp" />
+    <ClCompile Include="src\HTTPServer.cpp" />
+    <ClCompile Include="src\HTTPServerConnection.cpp" />
+    <ClCompile Include="src\HTTPServerConnectionFactory.cpp" />
+    <ClCompile Include="src\HTTPServerParams.cpp" />
+    <ClCompile Include="src\HTTPServerRequest.cpp" />
+    <ClCompile Include="src\HTTPServerRequestImpl.cpp" />
+    <ClCompile Include="src\HTTPServerResponse.cpp" />
+    <ClCompile Include="src\HTTPServerResponseImpl.cpp" />
+    <ClCompile Include="src\HTTPServerSession.cpp" />
+    <ClCompile Include="src\HTTPSession.cpp" />
+    <ClCompile Include="src\HTTPSessionFactory.cpp" />
+    <ClCompile Include="src\HTTPSessionInstantiator.cpp" />
+    <ClCompile Include="src\HTTPStream.cpp" />
+    <ClCompile Include="src\HTTPStreamFactory.cpp" />
+    <ClCompile Include="src\ICMPClient.cpp" />
+    <ClCompile Include="src\ICMPEventArgs.cpp" />
+    <ClCompile Include="src\ICMPPacket.cpp" />
+    <ClCompile Include="src\ICMPPacketImpl.cpp" />
+    <ClCompile Include="src\ICMPSocket.cpp" />
+    <ClCompile Include="src\ICMPSocketImpl.cpp" />
+    <ClCompile Include="src\ICMPv4PacketImpl.cpp" />
+    <ClCompile Include="src\IPAddress.cpp" />
+    <ClCompile Include="src\IPAddressImpl.cpp" />
+    <ClCompile Include="src\MailMessage.cpp" />
+    <ClCompile Include="src\MailRecipient.cpp" />
+    <ClCompile Include="src\MailStream.cpp" />
+    <ClCompile Include="src\MediaType.cpp" />
+    <ClCompile Include="src\MessageHeader.cpp" />
+    <ClCompile Include="src\MulticastSocket.cpp" />
+    <ClCompile Include="src\MultipartReader.cpp" />
+    <ClCompile Include="src\MultipartWriter.cpp" />
+    <ClCompile Include="src\NameValueCollection.cpp" />
+    <ClCompile Include="src\Net.cpp" />
+    <ClCompile Include="src\NetException.cpp" />
+    <ClCompile Include="src\NetworkInterface.cpp" />
+    <ClCompile Include="src\NTLMCredentials.cpp" />
+    <ClCompile Include="src\NTPClient.cpp" />
+    <ClCompile Include="src\NTPEventArgs.cpp" />
+    <ClCompile Include="src\NTPPacket.cpp" />
+    <ClCompile Include="src\NullPartHandler.cpp" />
+    <ClCompile Include="src\OAuth10Credentials.cpp" />
+    <ClCompile Include="src\OAuth20Credentials.cpp" />
+    <ClCompile Include="src\PartHandler.cpp" />
+    <ClCompile Include="src\PartSource.cpp" />
+    <ClCompile Include="src\PartStore.cpp" />
+    <ClCompile Include="src\PollSet.cpp" />
+    <ClCompile Include="src\POP3ClientSession.cpp" />
+    <ClCompile Include="src\QuotedPrintableDecoder.cpp" />
+    <ClCompile Include="src\QuotedPrintableEncoder.cpp" />
+    <ClCompile Include="src\RawSocket.cpp" />
+    <ClCompile Include="src\RawSocketImpl.cpp" />
+    <ClCompile Include="src\RemoteSyslogChannel.cpp" />
+    <ClCompile Include="src\RemoteSyslogListener.cpp" />
+    <ClCompile Include="src\ServerSocket.cpp" />
+    <ClCompile Include="src\ServerSocketImpl.cpp" />
+    <ClCompile Include="src\SMTPChannel.cpp" />
+    <ClCompile Include="src\SMTPClientSession.cpp" />
+    <ClCompile Include="src\Socket.cpp" />
+    <ClCompile Include="src\SocketAddress.cpp" />
+    <ClCompile Include="src\SocketAddressImpl.cpp" />
+    <ClCompile Include="src\SocketImpl.cpp" />
+    <ClCompile Include="src\SocketNotification.cpp" />
+    <ClCompile Include="src\SocketNotifier.cpp" />
+    <ClCompile Include="src\SocketProactor.cpp" />
+    <ClCompile Include="src\SocketReactor.cpp" />
+    <ClCompile Include="src\SocketStream.cpp" />
+    <ClCompile Include="src\SSPINTLMCredentials.cpp" />
+    <ClCompile Include="src\StreamSocket.cpp" />
+    <ClCompile Include="src\StreamSocketImpl.cpp" />
+    <ClCompile Include="src\StringPartSource.cpp" />
+    <ClCompile Include="src\TCPServer.cpp" />
+    <ClCompile Include="src\TCPServerConnection.cpp" />
+    <ClCompile Include="src\TCPServerConnectionFactory.cpp" />
+    <ClCompile Include="src\TCPServerDispatcher.cpp" />
+    <ClCompile Include="src\TCPServerParams.cpp" />
+    <ClCompile Include="src\UDPClient.cpp" />
+    <ClCompile Include="src\UDPServerParams.cpp" />
+    <ClCompile Include="src\WebSocket.cpp" />
+    <ClCompile Include="src\WebSocketImpl.cpp" />
+    <ClCompile Include="src\wepoll.c" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
@@ -992,6 +775,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
-  <ImportGroup Label="ExtensionTargets"/>
-</Project>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Net/Net_vs150.vcxproj.filters b/Net/Net_vs150.vcxproj.filters
index 05e3f9341..bfb44ef53 100644
--- a/Net/Net_vs150.vcxproj.filters
+++ b/Net/Net_vs150.vcxproj.filters
@@ -2,166 +2,166 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{239827ae-5adc-4d36-80c9-b1096233ec41}</UniqueIdentifier>
+      <UniqueIdentifier>{324e2aba-d5a3-4ba7-af4e-ba9f292c6a37}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{8101a68f-1839-4208-8527-1c833754e1cc}</UniqueIdentifier>
+      <UniqueIdentifier>{aba9dbd3-d67b-4697-8aca-fdc97cdd366c}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{d3c2746a-7784-4eca-a92f-74cf6bac55fe}</UniqueIdentifier>
+      <UniqueIdentifier>{08836dff-c6d9-477b-b168-b60c532f0ee9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{befe9a57-348a-4935-beff-d854bb86f84a}</UniqueIdentifier>
+      <UniqueIdentifier>{0cd82a1b-2a05-4d20-adf9-d9b12d353864}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{fb696397-9e24-4080-9cc9-66f3a3fd961b}</UniqueIdentifier>
+      <UniqueIdentifier>{de00d8b8-c3b3-4371-8cbc-9011f9c6a9f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{d9a6da7a-e707-4368-b438-3f76d0bdc967}</UniqueIdentifier>
+      <UniqueIdentifier>{e11c4394-ab57-4925-8cbc-2b5cc19fe0bb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{78dfc7c7-2942-4486-b2a1-ffab157202d0}</UniqueIdentifier>
+      <UniqueIdentifier>{d5d32e15-862e-49d0-8d5e-4790c0fd61c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{3677ec16-109d-4ddf-864c-eb04f9effb00}</UniqueIdentifier>
+      <UniqueIdentifier>{a6cb9dd0-7420-474b-8dcb-7f39be76e188}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{727c0655-4e6f-4279-a442-99d59ae9dad9}</UniqueIdentifier>
+      <UniqueIdentifier>{b9ee303a-fc6f-4724-b994-957529558993}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{da98e2f9-1e30-4359-be01-81f933209fdd}</UniqueIdentifier>
+      <UniqueIdentifier>{92ff9308-53be-42a6-a118-43f201f1eac8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{600f3721-177d-4d8d-aa28-347102398649}</UniqueIdentifier>
+      <UniqueIdentifier>{8e3682da-7efc-4501-8cb7-57a028640194}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{cd886491-7c68-45cf-80d9-dda75bfcf20c}</UniqueIdentifier>
+      <UniqueIdentifier>{cfd86d37-f07f-4d1b-83ce-d8f357858131}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{2407a972-dcb1-4b42-a629-517ca991a12e}</UniqueIdentifier>
+      <UniqueIdentifier>{1734d2b3-ec07-46b8-b53e-e461a7f2736f}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{af1ad2d7-279e-43c3-bce6-af7e69dc5849}</UniqueIdentifier>
+      <UniqueIdentifier>{e92c3005-3b81-4836-b6f5-c54f5b8f102c}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{da97b9f6-21fb-429c-973d-9d0e6516965e}</UniqueIdentifier>
+      <UniqueIdentifier>{b52971ad-98fa-4e8d-8fc8-fd301cbeccd3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{73c580a7-977d-4ccd-9ec0-af68aeb3a070}</UniqueIdentifier>
+      <UniqueIdentifier>{608a2e8b-63d5-475f-9504-d0a3e8ab7ae8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{6f0ac528-7b1e-431f-b450-8cdb50454176}</UniqueIdentifier>
+      <UniqueIdentifier>{60f019de-2f76-491f-8272-1cc02ad9d4d3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{44d555d4-9216-4f85-9bd7-b13d5f697ffe}</UniqueIdentifier>
+      <UniqueIdentifier>{e520f5c2-e936-44ea-852d-c509bd94fc77}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{ead5f394-5d17-40c7-ac15-6683e8af081d}</UniqueIdentifier>
+      <UniqueIdentifier>{ed78b909-324f-4e4e-979b-fde0cc6fc499}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{c7fca225-0ea7-472b-8054-47152d303a9e}</UniqueIdentifier>
+      <UniqueIdentifier>{aeef6e56-9436-4820-a091-ca974dd0f634}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{adcd85dc-690f-4fb3-8aef-07f6a27bca57}</UniqueIdentifier>
+      <UniqueIdentifier>{cdf22eb3-5642-4fd7-9ca7-ffe31f46289e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{931a36e8-e822-4c80-be45-bf2d3abe31e9}</UniqueIdentifier>
+      <UniqueIdentifier>{95e9f948-f2cc-435f-ae9a-66f41505918b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{d59bb33e-2fcd-4e59-9751-7b5df4c4dc81}</UniqueIdentifier>
+      <UniqueIdentifier>{94958031-602b-4f51-81f9-2ab4cf94fb07}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{29e0501d-bef8-45de-af8d-3ec7c03c7c8d}</UniqueIdentifier>
+      <UniqueIdentifier>{e84440c5-49f2-40bf-9ac2-652f69281480}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{0d11e281-a630-42e7-bb41-9f758f773590}</UniqueIdentifier>
+      <UniqueIdentifier>{f6077c49-4026-4ae0-9e5a-023a1820bdad}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{4ac7487d-e32c-46b2-a420-f65e78cdf554}</UniqueIdentifier>
+      <UniqueIdentifier>{2370ec32-3423-4cbb-b68f-be5002e2483b}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{316afd58-a77e-45fc-bf9f-4cc9346a1170}</UniqueIdentifier>
+      <UniqueIdentifier>{c0b40d95-69cd-4a29-afcc-6fc063270802}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{caa0b154-ed0e-449d-9752-8342f1df38f9}</UniqueIdentifier>
+      <UniqueIdentifier>{d50e28b6-5c72-422c-a27d-6a7c290aa0e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{11749f2e-0d40-4fc3-8734-412de6ca63a2}</UniqueIdentifier>
+      <UniqueIdentifier>{10308cbe-63c8-4357-bdb2-0764e4c9fb05}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{07c3605d-2512-49d0-b768-0e235538161b}</UniqueIdentifier>
+      <UniqueIdentifier>{26584053-5a1f-4fea-89ba-f34530472b7c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{663c071c-3018-4639-8d22-f950cd4522aa}</UniqueIdentifier>
+      <UniqueIdentifier>{89ddfa70-d078-453b-ae2e-eaa67a9ee292}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{b9dda1b7-cd4d-43c2-8571-edf0eae39f00}</UniqueIdentifier>
+      <UniqueIdentifier>{67b527fd-d385-440c-bda6-5e8d3522209b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{3fc7f8ec-16c3-4faa-a953-eba76071fcb0}</UniqueIdentifier>
+      <UniqueIdentifier>{99d39ae3-0587-40d0-8d77-9439e5695158}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{eea9d341-e693-4930-bc1f-8d5c2d973345}</UniqueIdentifier>
+      <UniqueIdentifier>{6ba352bc-b7aa-47ba-961c-d6686634851a}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{67efa3d7-9561-40f4-88cd-0fbb7258a1d2}</UniqueIdentifier>
+      <UniqueIdentifier>{975efe4a-dca1-48de-b73e-e6ceb1639847}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{b0fd95ae-fe17-40c8-8ab1-582aec3bf89a}</UniqueIdentifier>
+      <UniqueIdentifier>{af0b0e01-b7c3-40b8-a8e1-fc373ecc6b47}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{7e8a7042-6a66-4d91-a1da-380d499e6d31}</UniqueIdentifier>
+      <UniqueIdentifier>{3241389b-7946-454b-85ad-09d6466adab2}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{f1e8c3a8-1683-40b0-8cee-a169346bea14}</UniqueIdentifier>
+      <UniqueIdentifier>{7f853a1c-9bb2-4ea3-bf5e-82089c8d0dcc}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{a27aa5d6-2182-430f-83a8-a326e3c6deb2}</UniqueIdentifier>
+      <UniqueIdentifier>{8413cfa5-7aa7-4d3d-82ed-a7938f73ed52}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{dd4972cc-d017-4d78-beef-b34075a2f2b7}</UniqueIdentifier>
+      <UniqueIdentifier>{17e4a728-7f10-4ea2-991c-7f77bfa866cb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{9646e5fb-c236-42dd-bbe2-0b03b7c2a9fe}</UniqueIdentifier>
+      <UniqueIdentifier>{e6fd306b-a298-4245-be9c-766b70250d08}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{1cbd581a-7210-4060-aa56-30e0c6d01fe3}</UniqueIdentifier>
+      <UniqueIdentifier>{5a940ea2-c4cd-4548-8b6e-0496e99764e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{873d07fd-720a-4605-999e-589a9c029bca}</UniqueIdentifier>
+      <UniqueIdentifier>{f1697a6e-8522-40eb-8c55-c96db8935a6f}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{f065a00c-ee35-4dce-b8b5-c90a64abc51d}</UniqueIdentifier>
+      <UniqueIdentifier>{5edc5856-f993-439e-af12-1f6206e95611}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{2ed8c485-4ce4-4c72-8ded-b63f3173bd77}</UniqueIdentifier>
+      <UniqueIdentifier>{c8eb0fdc-b2b5-427c-80e0-8e6baa9a4e0f}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth">
-      <UniqueIdentifier>{3a73f811-0019-47ee-bc8a-806360a7f5e0}</UniqueIdentifier>
+      <UniqueIdentifier>{500d9a2e-e4e2-4ad3-a1eb-31fe75d64346}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Header Files">
-      <UniqueIdentifier>{00ed0031-c423-4e57-acd4-f73f566a280e}</UniqueIdentifier>
+      <UniqueIdentifier>{432b171f-f1b6-4dfd-9ce3-0a7f24da742e}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Source Files">
-      <UniqueIdentifier>{dcea2d12-dd9b-4212-953d-54418a1264ce}</UniqueIdentifier>
+      <UniqueIdentifier>{8c997592-5a3b-4558-af78-9cc89274fc95}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP">
-      <UniqueIdentifier>{30a2ef85-a849-4eb7-8072-e12fcf03b5ac}</UniqueIdentifier>
+      <UniqueIdentifier>{ac9c4b5c-40f1-48f9-9266-71f9c2a61a9b}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Source Files">
-      <UniqueIdentifier>{f5051b03-5114-4cae-8275-bddf1f9fbd74}</UniqueIdentifier>
+      <UniqueIdentifier>{bb23bb5a-76be-4fd1-9832-8fa6d3170bbf}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Header Files">
-      <UniqueIdentifier>{ed022509-d7d3-423a-a42d-fae1b15eb844}</UniqueIdentifier>
+      <UniqueIdentifier>{315ea570-f40c-4aa7-b7c2-b2f55f0861f4}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM">
-      <UniqueIdentifier>{4adbd39b-646b-496a-a1bc-4ae2aa62379c}</UniqueIdentifier>
+      <UniqueIdentifier>{df9eed1e-9954-4abf-9862-86f24e553aca}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM\Header Files">
-      <UniqueIdentifier>{c941912a-c069-435f-a7ab-eac69d08c8b7}</UniqueIdentifier>
+      <UniqueIdentifier>{fc923dd1-8c29-492a-bb0d-f62ab2ad56e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM\Source Files">
-      <UniqueIdentifier>{3fcbc27d-8b06-442a-af0a-2df69bfb2434}</UniqueIdentifier>
+      <UniqueIdentifier>{813bc6be-03b4-4563-a160-05b7e602b376}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -237,6 +237,9 @@
     <ClInclude Include="include\Poco\Net\StreamSocketImpl.h">
       <Filter>Sockets\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\wepoll.h">
+      <Filter>Sockets\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\FilePartSource.h">
       <Filter>Messages\Header Files</Filter>
     </ClInclude>
@@ -420,6 +423,9 @@
     <ClInclude Include="include\Poco\Net\SocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\SocketProactor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\MailMessage.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>
@@ -584,6 +590,9 @@
     <ClCompile Include="src\StreamSocketImpl.cpp">
       <Filter>Sockets\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\wepoll.c">
+      <Filter>Sockets\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FilePartSource.cpp">
       <Filter>Messages\Source Files</Filter>
     </ClCompile>
@@ -752,6 +761,9 @@
     <ClCompile Include="src\SocketReactor.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketProactor.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MailMessage.cpp">
       <Filter>Mail\Source Files</Filter>
     </ClCompile>
diff --git a/Net/Net_vs160.vcxproj b/Net/Net_vs160.vcxproj
index 8e78b4f7f..d38ca5890 100644
--- a/Net/Net_vs160.vcxproj
+++ b/Net/Net_vs160.vcxproj
@@ -55,121 +55,111 @@
     <ProjectGuid>{B057A1FE-09F7-465E-B8B5-E1B659051D76}</ProjectGuid>
     <RootNamespace>Net</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetmtd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoNet</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoNetmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoNetmt</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoNet64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoNetmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoNetmtd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoNet64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoNetmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoNetmt</TargetName>
+    <_ProjectFileVersion>16.0.32602.291</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -201,6 +191,7 @@
     <OutDir>..\bin64\</OutDir>
     <IntDir>obj64\Net\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>Poco$(ProjectName)64d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -210,6 +201,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\Net\$(Configuration)\</IntDir>
+    <TargetName>Poco$(ProjectName)64d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <OutDir>..\lib64\</OutDir>
@@ -218,6 +210,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\Net\$(Configuration)\</IntDir>
+    <TargetName>Poco$(ProjectName)64d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <OutDir>..\lib64\</OutDir>
@@ -239,7 +232,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -272,7 +265,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -304,7 +297,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmtd.lib</OutputFile>
@@ -329,7 +322,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmt.lib</OutputFile>
@@ -352,7 +345,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmdd.lib</OutputFile>
@@ -378,7 +371,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -401,7 +394,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -434,7 +427,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -466,7 +459,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmtd.lib</OutputFile>
@@ -491,7 +484,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmt.lib</OutputFile>
@@ -514,7 +507,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmdd.lib</OutputFile>
@@ -539,7 +532,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmd.lib</OutputFile>
@@ -663,324 +656,116 @@
     <ClInclude Include="include\Poco\Net\UDPSocketReader.h" />
     <ClInclude Include="include\Poco\Net\WebSocket.h" />
     <ClInclude Include="include\Poco\Net\WebSocketImpl.h" />
+    <ClInclude Include="src\wepoll.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\AbstractHTTPRequestHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DatagramSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DatagramSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DialogSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DNS.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FilePartSource.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPStreamFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HostEntry.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTMLForm.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPAuthenticationParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPBasicCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPBufferAllocator.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPChunkedStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCookie.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPDigestCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPFixedLengthStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPHeaderStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPIOStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPMessage.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPNTLMCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequestHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequestHandlerFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPResponse.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerConnection.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerConnectionFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerRequest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerRequestImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerResponse.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerResponseImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPSessionFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPSessionInstantiator.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPStreamFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPClient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPEventArgs.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPPacket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPPacketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPv4PacketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\IPAddress.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\IPAddressImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailMessage.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailRecipient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MediaType.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MessageHeader.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MulticastSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartReader.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartWriter.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NameValueCollection.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\Net.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetException.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetworkInterface.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTLMCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPClient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPEventArgs.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPPacket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NullPartHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth10Credentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth20Credentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PartHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PartSource.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PartStore.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PollSet.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\POP3ClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableDecoder.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableEncoder.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RawSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RawSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RemoteSyslogChannel.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RemoteSyslogListener.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ServerSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ServerSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SMTPChannel.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SMTPClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\Socket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketAddress.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketAddressImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketNotification.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketNotifier.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
+    <ClCompile Include="src\AbstractHTTPRequestHandler.cpp" />
+    <ClCompile Include="src\DatagramSocket.cpp" />
+    <ClCompile Include="src\DatagramSocketImpl.cpp" />
+    <ClCompile Include="src\DialogSocket.cpp" />
+    <ClCompile Include="src\DNS.cpp" />
+    <ClCompile Include="src\FilePartSource.cpp" />
+    <ClCompile Include="src\FTPClientSession.cpp" />
+    <ClCompile Include="src\FTPStreamFactory.cpp" />
+    <ClCompile Include="src\HostEntry.cpp" />
+    <ClCompile Include="src\HTMLForm.cpp" />
+    <ClCompile Include="src\HTTPAuthenticationParams.cpp" />
+    <ClCompile Include="src\HTTPBasicCredentials.cpp" />
+    <ClCompile Include="src\HTTPBufferAllocator.cpp" />
+    <ClCompile Include="src\HTTPChunkedStream.cpp" />
+    <ClCompile Include="src\HTTPClientSession.cpp" />
+    <ClCompile Include="src\HTTPCookie.cpp" />
+    <ClCompile Include="src\HTTPCredentials.cpp" />
+    <ClCompile Include="src\HTTPDigestCredentials.cpp" />
+    <ClCompile Include="src\HTTPFixedLengthStream.cpp" />
+    <ClCompile Include="src\HTTPHeaderStream.cpp" />
+    <ClCompile Include="src\HTTPIOStream.cpp" />
+    <ClCompile Include="src\HTTPMessage.cpp" />
+    <ClCompile Include="src\HTTPNTLMCredentials.cpp" />
+    <ClCompile Include="src\HTTPRequest.cpp" />
+    <ClCompile Include="src\HTTPRequestHandler.cpp" />
+    <ClCompile Include="src\HTTPRequestHandlerFactory.cpp" />
+    <ClCompile Include="src\HTTPResponse.cpp" />
+    <ClCompile Include="src\HTTPServer.cpp" />
+    <ClCompile Include="src\HTTPServerConnection.cpp" />
+    <ClCompile Include="src\HTTPServerConnectionFactory.cpp" />
+    <ClCompile Include="src\HTTPServerParams.cpp" />
+    <ClCompile Include="src\HTTPServerRequest.cpp" />
+    <ClCompile Include="src\HTTPServerRequestImpl.cpp" />
+    <ClCompile Include="src\HTTPServerResponse.cpp" />
+    <ClCompile Include="src\HTTPServerResponseImpl.cpp" />
+    <ClCompile Include="src\HTTPServerSession.cpp" />
+    <ClCompile Include="src\HTTPSession.cpp" />
+    <ClCompile Include="src\HTTPSessionFactory.cpp" />
+    <ClCompile Include="src\HTTPSessionInstantiator.cpp" />
+    <ClCompile Include="src\HTTPStream.cpp" />
+    <ClCompile Include="src\HTTPStreamFactory.cpp" />
+    <ClCompile Include="src\ICMPClient.cpp" />
+    <ClCompile Include="src\ICMPEventArgs.cpp" />
+    <ClCompile Include="src\ICMPPacket.cpp" />
+    <ClCompile Include="src\ICMPPacketImpl.cpp" />
+    <ClCompile Include="src\ICMPSocket.cpp" />
+    <ClCompile Include="src\ICMPSocketImpl.cpp" />
+    <ClCompile Include="src\ICMPv4PacketImpl.cpp" />
+    <ClCompile Include="src\IPAddress.cpp" />
+    <ClCompile Include="src\IPAddressImpl.cpp" />
+    <ClCompile Include="src\MailMessage.cpp" />
+    <ClCompile Include="src\MailRecipient.cpp" />
+    <ClCompile Include="src\MailStream.cpp" />
+    <ClCompile Include="src\MediaType.cpp" />
+    <ClCompile Include="src\MessageHeader.cpp" />
+    <ClCompile Include="src\MulticastSocket.cpp" />
+    <ClCompile Include="src\MultipartReader.cpp" />
+    <ClCompile Include="src\MultipartWriter.cpp" />
+    <ClCompile Include="src\NameValueCollection.cpp" />
+    <ClCompile Include="src\Net.cpp" />
+    <ClCompile Include="src\NetException.cpp" />
+    <ClCompile Include="src\NetworkInterface.cpp" />
+    <ClCompile Include="src\NTLMCredentials.cpp" />
+    <ClCompile Include="src\NTPClient.cpp" />
+    <ClCompile Include="src\NTPEventArgs.cpp" />
+    <ClCompile Include="src\NTPPacket.cpp" />
+    <ClCompile Include="src\NullPartHandler.cpp" />
+    <ClCompile Include="src\OAuth10Credentials.cpp" />
+    <ClCompile Include="src\OAuth20Credentials.cpp" />
+    <ClCompile Include="src\PartHandler.cpp" />
+    <ClCompile Include="src\PartSource.cpp" />
+    <ClCompile Include="src\PartStore.cpp" />
+    <ClCompile Include="src\PollSet.cpp" />
+    <ClCompile Include="src\POP3ClientSession.cpp" />
+    <ClCompile Include="src\QuotedPrintableDecoder.cpp" />
+    <ClCompile Include="src\QuotedPrintableEncoder.cpp" />
+    <ClCompile Include="src\RawSocket.cpp" />
+    <ClCompile Include="src\RawSocketImpl.cpp" />
+    <ClCompile Include="src\RemoteSyslogChannel.cpp" />
+    <ClCompile Include="src\RemoteSyslogListener.cpp" />
+    <ClCompile Include="src\ServerSocket.cpp" />
+    <ClCompile Include="src\ServerSocketImpl.cpp" />
+    <ClCompile Include="src\SMTPChannel.cpp" />
+    <ClCompile Include="src\SMTPClientSession.cpp" />
+    <ClCompile Include="src\Socket.cpp" />
+    <ClCompile Include="src\SocketAddress.cpp" />
+    <ClCompile Include="src\SocketAddressImpl.cpp" />
+    <ClCompile Include="src\SocketImpl.cpp" />
+    <ClCompile Include="src\SocketNotification.cpp" />
+    <ClCompile Include="src\SocketNotifier.cpp" />
     <ClCompile Include="src\SocketProactor.cpp" />
-    <ClCompile Include="src\SocketReactor.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SSPINTLMCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\StreamSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\StreamSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\StringPartSource.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerConnection.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerConnectionFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerDispatcher.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPClient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPServerParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
+    <ClCompile Include="src\SocketReactor.cpp" />
+    <ClCompile Include="src\SocketStream.cpp" />
+    <ClCompile Include="src\SSPINTLMCredentials.cpp" />
+    <ClCompile Include="src\StreamSocket.cpp" />
+    <ClCompile Include="src\StreamSocketImpl.cpp" />
+    <ClCompile Include="src\StringPartSource.cpp" />
+    <ClCompile Include="src\TCPServer.cpp" />
+    <ClCompile Include="src\TCPServerConnection.cpp" />
+    <ClCompile Include="src\TCPServerConnectionFactory.cpp" />
+    <ClCompile Include="src\TCPServerDispatcher.cpp" />
+    <ClCompile Include="src\TCPServerParams.cpp" />
+    <ClCompile Include="src\UDPClient.cpp" />
+    <ClCompile Include="src\UDPServerParams.cpp" />
+    <ClCompile Include="src\WebSocket.cpp" />
+    <ClCompile Include="src\WebSocketImpl.cpp" />
+    <ClCompile Include="src\wepoll.c" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
@@ -995,5 +780,6 @@
     </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Net/Net_vs160.vcxproj.filters b/Net/Net_vs160.vcxproj.filters
index 31a77e1f3..81b1dddee 100644
--- a/Net/Net_vs160.vcxproj.filters
+++ b/Net/Net_vs160.vcxproj.filters
@@ -2,166 +2,166 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{f3199240-37b8-4bb4-ac1c-0906329897cc}</UniqueIdentifier>
+      <UniqueIdentifier>{f06d3212-fc62-4709-bd3c-095c79001249}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{d8943613-7550-4675-82ad-0a7be1278142}</UniqueIdentifier>
+      <UniqueIdentifier>{af806f33-c17e-4d85-babf-da17a499bd65}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{6b4ebbb0-8ff8-49df-99ec-cfc91f7f8c57}</UniqueIdentifier>
+      <UniqueIdentifier>{e057e5ff-35f6-4380-ab7a-cbbefd0da9cb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{bb1ed3a0-8586-4932-899c-b8c9983b987c}</UniqueIdentifier>
+      <UniqueIdentifier>{5563ebfe-5bac-419b-8894-4a66e06e1f4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{e9a0f2ec-5ad7-4ada-b3f3-7b1569998405}</UniqueIdentifier>
+      <UniqueIdentifier>{7dedb440-dfed-4bc6-8fea-5c9f117c3808}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{970a4c84-b436-452c-8bae-5e7f2f8e56c6}</UniqueIdentifier>
+      <UniqueIdentifier>{d9805cd8-c8cf-448c-a017-7c55912e1b41}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{f3ec7881-aea2-4c14-bf4e-cc61b7a1feec}</UniqueIdentifier>
+      <UniqueIdentifier>{1c467b86-e839-465d-9623-a58c17f63f0d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{af7b292e-d534-4d98-878d-3bbd79fbdeae}</UniqueIdentifier>
+      <UniqueIdentifier>{1f28a347-0b31-41d0-85c5-0bee09d6d93c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{d49ce66e-150b-4a33-9278-173a2e04cb26}</UniqueIdentifier>
+      <UniqueIdentifier>{07d498fd-94fb-4f5f-b152-56778b28c6eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{2f6cf3fb-5dde-4b83-aa46-2c22f4ffcd9e}</UniqueIdentifier>
+      <UniqueIdentifier>{4a1afd42-7315-4316-9dd5-7e8dd04da6e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{d46b9945-fec2-4331-a7e5-425e48f382d0}</UniqueIdentifier>
+      <UniqueIdentifier>{e03a720b-ab2d-4581-96ff-bd9880c2683f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{82924c98-796c-4d58-8a4c-221f8dbf3832}</UniqueIdentifier>
+      <UniqueIdentifier>{a0d686c9-9cb1-48c4-916c-1c4748d1c338}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{37a7d1d4-ba66-441d-8397-f70863c24e57}</UniqueIdentifier>
+      <UniqueIdentifier>{a7c09398-1351-415c-805c-c9042cd050aa}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{6cd57e64-3b29-45bb-8914-ad5dcc4749d2}</UniqueIdentifier>
+      <UniqueIdentifier>{80c1c233-4275-4b11-99b7-09c236b67c59}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{490d21b5-6f9b-429a-af6c-9b09fde2fc9d}</UniqueIdentifier>
+      <UniqueIdentifier>{d9b0235d-2b80-488f-922f-f6e03db98e84}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{10e4060f-0729-4cfe-8a18-dd76c1e658a2}</UniqueIdentifier>
+      <UniqueIdentifier>{d4605b22-8a3d-49e6-a706-87bdfbfb2704}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{524f108a-ef8b-4370-8288-4757b60f56a8}</UniqueIdentifier>
+      <UniqueIdentifier>{4d91b6a0-8fcf-4494-8916-8b9508111954}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{bb1b0e28-f00f-4547-bba3-1511819f6b5d}</UniqueIdentifier>
+      <UniqueIdentifier>{41684471-d7fc-407b-8012-00fb92d90eae}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{ee4c32d5-a5f7-4a9b-a292-b6e80846f9c7}</UniqueIdentifier>
+      <UniqueIdentifier>{cd73de9e-039d-40c8-bb20-51d3313eadfd}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{d9a9d332-abe8-4eb9-a99f-f8891edcab13}</UniqueIdentifier>
+      <UniqueIdentifier>{bcc591d8-e663-40d9-8486-a64224ff6dc7}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{f7aade05-fedb-4e6e-bf3e-cbbd0dd68fcc}</UniqueIdentifier>
+      <UniqueIdentifier>{8a93a1a5-d2d3-44e7-bd58-e0d7cfe588aa}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{53882c2f-0d5a-4651-9973-0518a428b599}</UniqueIdentifier>
+      <UniqueIdentifier>{47466b38-df77-458e-a23e-e0f2a6f595fc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{8afc7fe7-a7a7-4b5f-bb6f-2b5135469ce5}</UniqueIdentifier>
+      <UniqueIdentifier>{55fa85f4-bf7c-48b1-97fd-515c5cd91b5a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{5184cf74-1921-42a1-8c0c-bf25018c7183}</UniqueIdentifier>
+      <UniqueIdentifier>{d8a5c58a-e68e-4388-b67c-f66434b953dd}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{c70f4de9-5446-400f-b8f6-d7fc95ee39ba}</UniqueIdentifier>
+      <UniqueIdentifier>{3ac122e8-9cca-4173-a62f-7790e5eb1a88}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{fd978abe-d60e-4bf3-ad05-d4dcd892bae5}</UniqueIdentifier>
+      <UniqueIdentifier>{a522f42b-9a2d-4a85-96da-a7577ab68981}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{3b507534-f333-475f-a5e1-071a158bf9be}</UniqueIdentifier>
+      <UniqueIdentifier>{1dda1c74-3efc-4107-ba68-8e69b61bb10e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{7e11a9fc-71b6-4410-b72c-860d8823fab6}</UniqueIdentifier>
+      <UniqueIdentifier>{c5b0f415-f89a-4a16-b07b-7076ccefdf9d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{08ea5b81-3864-4e31-af6b-1a523ab2413e}</UniqueIdentifier>
+      <UniqueIdentifier>{6fd9d706-01b7-416e-ac7c-5997e052616d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{3c7c4b59-c2b1-4004-9faf-b5d4f4e69a97}</UniqueIdentifier>
+      <UniqueIdentifier>{53d75179-b04d-459e-a6ec-da60f1e71447}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{bd974e0c-7d92-4145-8906-538e977bff81}</UniqueIdentifier>
+      <UniqueIdentifier>{ea5a77e8-33ce-4075-8624-3d3310f49a95}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{c4700113-cfd8-4b27-9c89-d7c39d65cd56}</UniqueIdentifier>
+      <UniqueIdentifier>{7c0617c9-c950-45c2-aba1-0b84a3614792}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{8e465dc3-3fbe-44cc-a4ea-5dcea7cea9ee}</UniqueIdentifier>
+      <UniqueIdentifier>{39906fc4-02c7-4c8e-9247-06dbc0a391db}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{74762eca-5fc1-4539-9227-2f346284b282}</UniqueIdentifier>
+      <UniqueIdentifier>{c1be6a77-9aa7-4cd7-b865-7f6f2c0b656f}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{fcf41aac-ca44-413c-ab4d-9e8149f9d7ef}</UniqueIdentifier>
+      <UniqueIdentifier>{86338a33-45fb-40d5-aa59-5163ab671cb9}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{156fa7ac-6875-47d8-b6a6-e5d0dfebb0ef}</UniqueIdentifier>
+      <UniqueIdentifier>{44c6df98-6750-41ab-ba28-8ca03a558812}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{8f4114ae-6caa-4b0d-9adb-005a7a11c908}</UniqueIdentifier>
+      <UniqueIdentifier>{3c91096b-e7a3-4642-b307-74488aea9ba3}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{31d61489-81fd-4640-a353-deec477d51b4}</UniqueIdentifier>
+      <UniqueIdentifier>{38ad1945-f32d-4508-bf73-d9bf2fe10c0e}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{3ed9fccd-14a7-4316-b1d3-5fba2feb4f3c}</UniqueIdentifier>
+      <UniqueIdentifier>{47018146-c9ca-4247-a1ff-1e6fb593529f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{be5629b7-0de6-4bc7-87f4-b0a3e1e693f9}</UniqueIdentifier>
+      <UniqueIdentifier>{e8002af3-b8e2-4c07-b346-7a9e65aba60d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{117ea39f-0765-41f6-a8a3-9eb5f3540a8e}</UniqueIdentifier>
+      <UniqueIdentifier>{64a18bfc-e244-4657-a70c-9c2964bfb74f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{46c8f502-7524-44e7-b0bf-7dc01548f81d}</UniqueIdentifier>
+      <UniqueIdentifier>{fcb6ce80-0f9b-40fb-9a1b-df5fdd4b636b}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{e6c7690d-2d9c-4b5f-a520-dee649cfc5ba}</UniqueIdentifier>
+      <UniqueIdentifier>{f226bdc0-29fd-451e-ba41-f3f239ee78f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{3817692e-d4f9-4b4e-848b-5028bf26dafb}</UniqueIdentifier>
+      <UniqueIdentifier>{f03d8270-228d-4c30-a6d4-1e7ca0bcdbf0}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{84b9b80b-432a-408e-9b59-307a74a82433}</UniqueIdentifier>
+      <UniqueIdentifier>{46032695-fc6e-4cbd-8426-991a5d36729c}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth">
-      <UniqueIdentifier>{25612bca-de52-43c2-8b17-39bfdf5d72cb}</UniqueIdentifier>
+      <UniqueIdentifier>{871f91e0-6027-4a8e-8c5f-8119745e01e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Header Files">
-      <UniqueIdentifier>{09d406e8-85f0-4f55-aa9a-8082f253b233}</UniqueIdentifier>
+      <UniqueIdentifier>{b7e70f4f-7148-4ee1-9466-6ba6cb8d0df1}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Source Files">
-      <UniqueIdentifier>{0cfdcf61-539a-4bde-b00e-00b76c709d82}</UniqueIdentifier>
+      <UniqueIdentifier>{aeadc00a-2263-47f9-9200-b7ce3da8696c}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP">
-      <UniqueIdentifier>{423210c1-5aa2-40e7-805b-aeef75e2e8b5}</UniqueIdentifier>
+      <UniqueIdentifier>{7ef2a491-cb68-46af-8727-25ce34dfc75e}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Source Files">
-      <UniqueIdentifier>{481a261d-8e84-4b3e-bb59-9d9475b422c1}</UniqueIdentifier>
+      <UniqueIdentifier>{0e9eca9c-18bc-4dee-8488-2a5a69390aa2}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Header Files">
-      <UniqueIdentifier>{235554ca-546d-4029-be23-d1f95a170375}</UniqueIdentifier>
+      <UniqueIdentifier>{0be52802-0903-4bbb-bbd4-9a96bd2b8696}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM">
-      <UniqueIdentifier>{c7051688-57f9-4df4-a1e5-ecc2fd0b4b2e}</UniqueIdentifier>
+      <UniqueIdentifier>{91c08360-748f-4064-a5b3-51b5e75e533f}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM\Header Files">
-      <UniqueIdentifier>{04ff6927-881e-440c-83cc-994b36a40f40}</UniqueIdentifier>
+      <UniqueIdentifier>{463bba10-3193-4504-a03a-ec82af13e19d}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM\Source Files">
-      <UniqueIdentifier>{851e4029-e3e4-417a-a7fa-6c81a1b887a3}</UniqueIdentifier>
+      <UniqueIdentifier>{b8b0be99-dcda-4b16-bdda-29f96f5d23a9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -237,6 +237,9 @@
     <ClInclude Include="include\Poco\Net\StreamSocketImpl.h">
       <Filter>Sockets\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\wepoll.h">
+      <Filter>Sockets\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\FilePartSource.h">
       <Filter>Messages\Header Files</Filter>
     </ClInclude>
@@ -420,6 +423,9 @@
     <ClInclude Include="include\Poco\Net\SocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\SocketProactor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\MailMessage.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>
@@ -513,9 +519,6 @@
     <ClInclude Include="include\Poco\Net\SSPINTLMCredentials.h">
       <Filter>NTLM\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Net\SocketProactor.h">
-      <Filter>Sockets\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\DNS.cpp">
@@ -587,6 +590,9 @@
     <ClCompile Include="src\StreamSocketImpl.cpp">
       <Filter>Sockets\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\wepoll.c">
+      <Filter>Sockets\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FilePartSource.cpp">
       <Filter>Messages\Source Files</Filter>
     </ClCompile>
@@ -755,6 +761,9 @@
     <ClCompile Include="src\SocketReactor.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketProactor.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MailMessage.cpp">
       <Filter>Mail\Source Files</Filter>
     </ClCompile>
@@ -833,9 +842,6 @@
     <ClCompile Include="src\SSPINTLMCredentials.cpp">
       <Filter>NTLM\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\SocketProactor.cpp">
-      <Filter>Sockets\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc" />
diff --git a/Net/Net_vs170.sln b/Net/Net_vs170.sln
index eef0fd4e9..ac5640e14 100644
--- a/Net/Net_vs170.sln
+++ b/Net/Net_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|x64.Build.0 = release_static_md|x64
 		{B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Net/Net_vs170.vcxproj b/Net/Net_vs170.vcxproj
index 5ab50ddbe..884044023 100644
--- a/Net/Net_vs170.vcxproj
+++ b/Net/Net_vs170.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -56,120 +56,109 @@
     <RootNamespace>Net</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros"/>
+  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetmtd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoNet</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoNetmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoNetmt</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoNet64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoNetmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoNetmtd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoNet64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoNetmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoNetmt</TargetName>
+    <_ProjectFileVersion>16.0.32602.291</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -235,11 +224,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -268,11 +257,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -299,12 +288,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib\PocoNetmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmtd.lib</OutputFile>
@@ -325,11 +314,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmt.lib</OutputFile>
@@ -347,12 +336,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib\PocoNetmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmdd.lib</OutputFile>
@@ -373,12 +362,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib\PocoNetmd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -397,11 +386,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -430,11 +419,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -461,12 +450,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib64\PocoNetmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmtd.lib</OutputFile>
@@ -487,11 +476,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmt.lib</OutputFile>
@@ -509,12 +498,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib64\PocoNetmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmdd.lib</OutputFile>
@@ -535,450 +524,244 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Net\AbstractHTTPRequestHandler.h"/>
-    <ClInclude Include="include\Poco\Net\DatagramSocket.h"/>
-    <ClInclude Include="include\Poco\Net\DatagramSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\DialogSocket.h"/>
-    <ClInclude Include="include\Poco\Net\DNS.h"/>
-    <ClInclude Include="include\Poco\Net\FilePartSource.h"/>
-    <ClInclude Include="include\Poco\Net\FTPClientSession.h"/>
-    <ClInclude Include="include\Poco\Net\FTPStreamFactory.h"/>
-    <ClInclude Include="include\Poco\Net\HostEntry.h"/>
-    <ClInclude Include="include\Poco\Net\HTMLForm.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPAuthenticationParams.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPBasicCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPBasicStreamBuf.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPBufferAllocator.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPChunkedStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPClientSession.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPCookie.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPDigestCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPFixedLengthStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPHeaderStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPIOStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPMessage.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPNTLMCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPRequest.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPRequestHandler.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPRequestHandlerFactory.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPResponse.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServer.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerConnection.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerConnectionFactory.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerParams.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerRequest.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerRequestImpl.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerResponse.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerResponseImpl.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPServerSession.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPSession.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPSessionFactory.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPSessionInstantiator.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPStream.h"/>
-    <ClInclude Include="include\Poco\Net\HTTPStreamFactory.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPClient.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPEventArgs.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPPacket.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPPacketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPSocket.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\ICMPv4PacketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\IPAddress.h"/>
-    <ClInclude Include="include\Poco\Net\IPAddressImpl.h"/>
-    <ClInclude Include="include\Poco\Net\MailMessage.h"/>
-    <ClInclude Include="include\Poco\Net\MailRecipient.h"/>
-    <ClInclude Include="include\Poco\Net\MailStream.h"/>
-    <ClInclude Include="include\Poco\Net\MediaType.h"/>
-    <ClInclude Include="include\Poco\Net\MessageHeader.h"/>
-    <ClInclude Include="include\Poco\Net\MulticastSocket.h"/>
-    <ClInclude Include="include\Poco\Net\MultipartReader.h"/>
-    <ClInclude Include="include\Poco\Net\MultipartWriter.h"/>
-    <ClInclude Include="include\Poco\Net\MultiSocketPoller.h"/>
-    <ClInclude Include="include\Poco\Net\NameValueCollection.h"/>
-    <ClInclude Include="include\Poco\Net\Net.h"/>
-    <ClInclude Include="include\Poco\Net\NetException.h"/>
-    <ClInclude Include="include\Poco\Net\NetworkInterface.h"/>
-    <ClInclude Include="include\Poco\Net\NTLMCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\NTPClient.h"/>
-    <ClInclude Include="include\Poco\Net\NTPEventArgs.h"/>
-    <ClInclude Include="include\Poco\Net\NTPPacket.h"/>
-    <ClInclude Include="include\Poco\Net\NullPartHandler.h"/>
-    <ClInclude Include="include\Poco\Net\OAuth10Credentials.h"/>
-    <ClInclude Include="include\Poco\Net\OAuth20Credentials.h"/>
-    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h"/>
-    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h"/>
-    <ClInclude Include="include\Poco\Net\PartHandler.h"/>
-    <ClInclude Include="include\Poco\Net\PartSource.h"/>
-    <ClInclude Include="include\Poco\Net\PartStore.h"/>
-    <ClInclude Include="include\Poco\Net\PollSet.h"/>
-    <ClInclude Include="include\Poco\Net\POP3ClientSession.h"/>
-    <ClInclude Include="include\Poco\Net\QuotedPrintableDecoder.h"/>
-    <ClInclude Include="include\Poco\Net\QuotedPrintableEncoder.h"/>
-    <ClInclude Include="include\Poco\Net\RawSocket.h"/>
-    <ClInclude Include="include\Poco\Net\RawSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\RemoteSyslogChannel.h"/>
-    <ClInclude Include="include\Poco\Net\RemoteSyslogListener.h"/>
-    <ClInclude Include="include\Poco\Net\ServerSocket.h"/>
-    <ClInclude Include="include\Poco\Net\ServerSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\SingleSocketPoller.h"/>
-    <ClInclude Include="include\Poco\Net\SMTPChannel.h"/>
-    <ClInclude Include="include\Poco\Net\SMTPClientSession.h"/>
-    <ClInclude Include="include\Poco\Net\Socket.h"/>
-    <ClInclude Include="include\Poco\Net\SocketAcceptor.h"/>
-    <ClInclude Include="include\Poco\Net\SocketAddress.h"/>
-    <ClInclude Include="include\Poco\Net\SocketAddressImpl.h"/>
-    <ClInclude Include="include\Poco\Net\SocketConnector.h"/>
-    <ClInclude Include="include\Poco\Net\SocketDefs.h"/>
-    <ClInclude Include="include\Poco\Net\SocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\SocketNotification.h"/>
-    <ClInclude Include="include\Poco\Net\SocketNotifier.h"/>
-    <ClInclude Include="include\Poco\Net\SocketReactor.h"/>
-    <ClInclude Include="include\Poco\Net\SocketStream.h"/>
-    <ClInclude Include="include\Poco\Net\SSPINTLMCredentials.h"/>
-    <ClInclude Include="include\Poco\Net\StreamSocket.h"/>
-    <ClInclude Include="include\Poco\Net\StreamSocketImpl.h"/>
-    <ClInclude Include="include\Poco\Net\StringPartSource.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServer.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServerConnection.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServerConnectionFactory.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServerDispatcher.h"/>
-    <ClInclude Include="include\Poco\Net\TCPServerParams.h"/>
-    <ClInclude Include="include\Poco\Net\UDPClient.h"/>
-    <ClInclude Include="include\Poco\Net\UDPHandler.h"/>
-    <ClInclude Include="include\Poco\Net\UDPServer.h"/>
-    <ClInclude Include="include\Poco\Net\UDPServerParams.h"/>
-    <ClInclude Include="include\Poco\Net\UDPSocketReader.h"/>
-    <ClInclude Include="include\Poco\Net\WebSocket.h"/>
-    <ClInclude Include="include\Poco\Net\WebSocketImpl.h"/>
+    <ClInclude Include="include\Poco\Net\AbstractHTTPRequestHandler.h" />
+    <ClInclude Include="include\Poco\Net\DatagramSocket.h" />
+    <ClInclude Include="include\Poco\Net\DatagramSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\DialogSocket.h" />
+    <ClInclude Include="include\Poco\Net\DNS.h" />
+    <ClInclude Include="include\Poco\Net\FilePartSource.h" />
+    <ClInclude Include="include\Poco\Net\FTPClientSession.h" />
+    <ClInclude Include="include\Poco\Net\FTPStreamFactory.h" />
+    <ClInclude Include="include\Poco\Net\HostEntry.h" />
+    <ClInclude Include="include\Poco\Net\HTMLForm.h" />
+    <ClInclude Include="include\Poco\Net\HTTPAuthenticationParams.h" />
+    <ClInclude Include="include\Poco\Net\HTTPBasicCredentials.h" />
+    <ClInclude Include="include\Poco\Net\HTTPBasicStreamBuf.h" />
+    <ClInclude Include="include\Poco\Net\HTTPBufferAllocator.h" />
+    <ClInclude Include="include\Poco\Net\HTTPChunkedStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPClientSession.h" />
+    <ClInclude Include="include\Poco\Net\HTTPCookie.h" />
+    <ClInclude Include="include\Poco\Net\HTTPCredentials.h" />
+    <ClInclude Include="include\Poco\Net\HTTPDigestCredentials.h" />
+    <ClInclude Include="include\Poco\Net\HTTPFixedLengthStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPHeaderStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPIOStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPMessage.h" />
+    <ClInclude Include="include\Poco\Net\HTTPNTLMCredentials.h" />
+    <ClInclude Include="include\Poco\Net\HTTPRequest.h" />
+    <ClInclude Include="include\Poco\Net\HTTPRequestHandler.h" />
+    <ClInclude Include="include\Poco\Net\HTTPRequestHandlerFactory.h" />
+    <ClInclude Include="include\Poco\Net\HTTPResponse.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServer.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerConnection.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerConnectionFactory.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerParams.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerRequest.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerRequestImpl.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerResponse.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerResponseImpl.h" />
+    <ClInclude Include="include\Poco\Net\HTTPServerSession.h" />
+    <ClInclude Include="include\Poco\Net\HTTPSession.h" />
+    <ClInclude Include="include\Poco\Net\HTTPSessionFactory.h" />
+    <ClInclude Include="include\Poco\Net\HTTPSessionInstantiator.h" />
+    <ClInclude Include="include\Poco\Net\HTTPStream.h" />
+    <ClInclude Include="include\Poco\Net\HTTPStreamFactory.h" />
+    <ClInclude Include="include\Poco\Net\ICMPClient.h" />
+    <ClInclude Include="include\Poco\Net\ICMPEventArgs.h" />
+    <ClInclude Include="include\Poco\Net\ICMPPacket.h" />
+    <ClInclude Include="include\Poco\Net\ICMPPacketImpl.h" />
+    <ClInclude Include="include\Poco\Net\ICMPSocket.h" />
+    <ClInclude Include="include\Poco\Net\ICMPSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\ICMPv4PacketImpl.h" />
+    <ClInclude Include="include\Poco\Net\IPAddress.h" />
+    <ClInclude Include="include\Poco\Net\IPAddressImpl.h" />
+    <ClInclude Include="include\Poco\Net\MailMessage.h" />
+    <ClInclude Include="include\Poco\Net\MailRecipient.h" />
+    <ClInclude Include="include\Poco\Net\MailStream.h" />
+    <ClInclude Include="include\Poco\Net\MediaType.h" />
+    <ClInclude Include="include\Poco\Net\MessageHeader.h" />
+    <ClInclude Include="include\Poco\Net\MulticastSocket.h" />
+    <ClInclude Include="include\Poco\Net\MultipartReader.h" />
+    <ClInclude Include="include\Poco\Net\MultipartWriter.h" />
+    <ClInclude Include="include\Poco\Net\MultiSocketPoller.h" />
+    <ClInclude Include="include\Poco\Net\NameValueCollection.h" />
+    <ClInclude Include="include\Poco\Net\Net.h" />
+    <ClInclude Include="include\Poco\Net\NetException.h" />
+    <ClInclude Include="include\Poco\Net\NetworkInterface.h" />
+    <ClInclude Include="include\Poco\Net\NTLMCredentials.h" />
+    <ClInclude Include="include\Poco\Net\NTPClient.h" />
+    <ClInclude Include="include\Poco\Net\NTPEventArgs.h" />
+    <ClInclude Include="include\Poco\Net\NTPPacket.h" />
+    <ClInclude Include="include\Poco\Net\NullPartHandler.h" />
+    <ClInclude Include="include\Poco\Net\OAuth10Credentials.h" />
+    <ClInclude Include="include\Poco\Net\OAuth20Credentials.h" />
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h" />
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h" />
+    <ClInclude Include="include\Poco\Net\PartHandler.h" />
+    <ClInclude Include="include\Poco\Net\PartSource.h" />
+    <ClInclude Include="include\Poco\Net\PartStore.h" />
+    <ClInclude Include="include\Poco\Net\PollSet.h" />
+    <ClInclude Include="include\Poco\Net\POP3ClientSession.h" />
+    <ClInclude Include="include\Poco\Net\QuotedPrintableDecoder.h" />
+    <ClInclude Include="include\Poco\Net\QuotedPrintableEncoder.h" />
+    <ClInclude Include="include\Poco\Net\RawSocket.h" />
+    <ClInclude Include="include\Poco\Net\RawSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\RemoteSyslogChannel.h" />
+    <ClInclude Include="include\Poco\Net\RemoteSyslogListener.h" />
+    <ClInclude Include="include\Poco\Net\ServerSocket.h" />
+    <ClInclude Include="include\Poco\Net\ServerSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\SingleSocketPoller.h" />
+    <ClInclude Include="include\Poco\Net\SMTPChannel.h" />
+    <ClInclude Include="include\Poco\Net\SMTPClientSession.h" />
+    <ClInclude Include="include\Poco\Net\Socket.h" />
+    <ClInclude Include="include\Poco\Net\SocketAcceptor.h" />
+    <ClInclude Include="include\Poco\Net\SocketAddress.h" />
+    <ClInclude Include="include\Poco\Net\SocketAddressImpl.h" />
+    <ClInclude Include="include\Poco\Net\SocketConnector.h" />
+    <ClInclude Include="include\Poco\Net\SocketDefs.h" />
+    <ClInclude Include="include\Poco\Net\SocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\SocketNotification.h" />
+    <ClInclude Include="include\Poco\Net\SocketNotifier.h" />
+    <ClInclude Include="include\Poco\Net\SocketProactor.h" />
+    <ClInclude Include="include\Poco\Net\SocketReactor.h" />
+    <ClInclude Include="include\Poco\Net\SocketStream.h" />
+    <ClInclude Include="include\Poco\Net\SSPINTLMCredentials.h" />
+    <ClInclude Include="include\Poco\Net\StreamSocket.h" />
+    <ClInclude Include="include\Poco\Net\StreamSocketImpl.h" />
+    <ClInclude Include="include\Poco\Net\StringPartSource.h" />
+    <ClInclude Include="include\Poco\Net\TCPServer.h" />
+    <ClInclude Include="include\Poco\Net\TCPServerConnection.h" />
+    <ClInclude Include="include\Poco\Net\TCPServerConnectionFactory.h" />
+    <ClInclude Include="include\Poco\Net\TCPServerDispatcher.h" />
+    <ClInclude Include="include\Poco\Net\TCPServerParams.h" />
+    <ClInclude Include="include\Poco\Net\UDPClient.h" />
+    <ClInclude Include="include\Poco\Net\UDPHandler.h" />
+    <ClInclude Include="include\Poco\Net\UDPServer.h" />
+    <ClInclude Include="include\Poco\Net\UDPServerParams.h" />
+    <ClInclude Include="include\Poco\Net\UDPSocketReader.h" />
+    <ClInclude Include="include\Poco\Net\WebSocket.h" />
+    <ClInclude Include="include\Poco\Net\WebSocketImpl.h" />
+    <ClInclude Include="src\wepoll.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\AbstractHTTPRequestHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DatagramSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DatagramSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DialogSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DNS.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FilePartSource.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPStreamFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HostEntry.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTMLForm.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPAuthenticationParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPBasicCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPBufferAllocator.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPChunkedStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCookie.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPDigestCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPFixedLengthStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPHeaderStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPIOStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPMessage.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPNTLMCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequestHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequestHandlerFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPResponse.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerConnection.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerConnectionFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerRequest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerRequestImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerResponse.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerResponseImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPSessionFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPSessionInstantiator.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPStreamFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPClient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPEventArgs.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPPacket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPPacketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPv4PacketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\IPAddress.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\IPAddressImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailMessage.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailRecipient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MediaType.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MessageHeader.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MulticastSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartReader.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartWriter.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NameValueCollection.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\Net.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetException.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetworkInterface.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTLMCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPClient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPEventArgs.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPPacket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NullPartHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth10Credentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth20Credentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PartHandler.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PartSource.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PartStore.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PollSet.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\POP3ClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableDecoder.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableEncoder.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RawSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RawSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RemoteSyslogChannel.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RemoteSyslogListener.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ServerSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ServerSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SMTPChannel.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SMTPClientSession.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\Socket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketAddress.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketAddressImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketNotification.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketNotifier.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketReactor.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketStream.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SSPINTLMCredentials.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\StreamSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\StreamSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\StringPartSource.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerConnection.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerConnectionFactory.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerDispatcher.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPClient.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPServerParams.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocket.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocketImpl.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
+    <ClCompile Include="src\AbstractHTTPRequestHandler.cpp" />
+    <ClCompile Include="src\DatagramSocket.cpp" />
+    <ClCompile Include="src\DatagramSocketImpl.cpp" />
+    <ClCompile Include="src\DialogSocket.cpp" />
+    <ClCompile Include="src\DNS.cpp" />
+    <ClCompile Include="src\FilePartSource.cpp" />
+    <ClCompile Include="src\FTPClientSession.cpp" />
+    <ClCompile Include="src\FTPStreamFactory.cpp" />
+    <ClCompile Include="src\HostEntry.cpp" />
+    <ClCompile Include="src\HTMLForm.cpp" />
+    <ClCompile Include="src\HTTPAuthenticationParams.cpp" />
+    <ClCompile Include="src\HTTPBasicCredentials.cpp" />
+    <ClCompile Include="src\HTTPBufferAllocator.cpp" />
+    <ClCompile Include="src\HTTPChunkedStream.cpp" />
+    <ClCompile Include="src\HTTPClientSession.cpp" />
+    <ClCompile Include="src\HTTPCookie.cpp" />
+    <ClCompile Include="src\HTTPCredentials.cpp" />
+    <ClCompile Include="src\HTTPDigestCredentials.cpp" />
+    <ClCompile Include="src\HTTPFixedLengthStream.cpp" />
+    <ClCompile Include="src\HTTPHeaderStream.cpp" />
+    <ClCompile Include="src\HTTPIOStream.cpp" />
+    <ClCompile Include="src\HTTPMessage.cpp" />
+    <ClCompile Include="src\HTTPNTLMCredentials.cpp" />
+    <ClCompile Include="src\HTTPRequest.cpp" />
+    <ClCompile Include="src\HTTPRequestHandler.cpp" />
+    <ClCompile Include="src\HTTPRequestHandlerFactory.cpp" />
+    <ClCompile Include="src\HTTPResponse.cpp" />
+    <ClCompile Include="src\HTTPServer.cpp" />
+    <ClCompile Include="src\HTTPServerConnection.cpp" />
+    <ClCompile Include="src\HTTPServerConnectionFactory.cpp" />
+    <ClCompile Include="src\HTTPServerParams.cpp" />
+    <ClCompile Include="src\HTTPServerRequest.cpp" />
+    <ClCompile Include="src\HTTPServerRequestImpl.cpp" />
+    <ClCompile Include="src\HTTPServerResponse.cpp" />
+    <ClCompile Include="src\HTTPServerResponseImpl.cpp" />
+    <ClCompile Include="src\HTTPServerSession.cpp" />
+    <ClCompile Include="src\HTTPSession.cpp" />
+    <ClCompile Include="src\HTTPSessionFactory.cpp" />
+    <ClCompile Include="src\HTTPSessionInstantiator.cpp" />
+    <ClCompile Include="src\HTTPStream.cpp" />
+    <ClCompile Include="src\HTTPStreamFactory.cpp" />
+    <ClCompile Include="src\ICMPClient.cpp" />
+    <ClCompile Include="src\ICMPEventArgs.cpp" />
+    <ClCompile Include="src\ICMPPacket.cpp" />
+    <ClCompile Include="src\ICMPPacketImpl.cpp" />
+    <ClCompile Include="src\ICMPSocket.cpp" />
+    <ClCompile Include="src\ICMPSocketImpl.cpp" />
+    <ClCompile Include="src\ICMPv4PacketImpl.cpp" />
+    <ClCompile Include="src\IPAddress.cpp" />
+    <ClCompile Include="src\IPAddressImpl.cpp" />
+    <ClCompile Include="src\MailMessage.cpp" />
+    <ClCompile Include="src\MailRecipient.cpp" />
+    <ClCompile Include="src\MailStream.cpp" />
+    <ClCompile Include="src\MediaType.cpp" />
+    <ClCompile Include="src\MessageHeader.cpp" />
+    <ClCompile Include="src\MulticastSocket.cpp" />
+    <ClCompile Include="src\MultipartReader.cpp" />
+    <ClCompile Include="src\MultipartWriter.cpp" />
+    <ClCompile Include="src\NameValueCollection.cpp" />
+    <ClCompile Include="src\Net.cpp" />
+    <ClCompile Include="src\NetException.cpp" />
+    <ClCompile Include="src\NetworkInterface.cpp" />
+    <ClCompile Include="src\NTLMCredentials.cpp" />
+    <ClCompile Include="src\NTPClient.cpp" />
+    <ClCompile Include="src\NTPEventArgs.cpp" />
+    <ClCompile Include="src\NTPPacket.cpp" />
+    <ClCompile Include="src\NullPartHandler.cpp" />
+    <ClCompile Include="src\OAuth10Credentials.cpp" />
+    <ClCompile Include="src\OAuth20Credentials.cpp" />
+    <ClCompile Include="src\PartHandler.cpp" />
+    <ClCompile Include="src\PartSource.cpp" />
+    <ClCompile Include="src\PartStore.cpp" />
+    <ClCompile Include="src\PollSet.cpp" />
+    <ClCompile Include="src\POP3ClientSession.cpp" />
+    <ClCompile Include="src\QuotedPrintableDecoder.cpp" />
+    <ClCompile Include="src\QuotedPrintableEncoder.cpp" />
+    <ClCompile Include="src\RawSocket.cpp" />
+    <ClCompile Include="src\RawSocketImpl.cpp" />
+    <ClCompile Include="src\RemoteSyslogChannel.cpp" />
+    <ClCompile Include="src\RemoteSyslogListener.cpp" />
+    <ClCompile Include="src\ServerSocket.cpp" />
+    <ClCompile Include="src\ServerSocketImpl.cpp" />
+    <ClCompile Include="src\SMTPChannel.cpp" />
+    <ClCompile Include="src\SMTPClientSession.cpp" />
+    <ClCompile Include="src\Socket.cpp" />
+    <ClCompile Include="src\SocketAddress.cpp" />
+    <ClCompile Include="src\SocketAddressImpl.cpp" />
+    <ClCompile Include="src\SocketImpl.cpp" />
+    <ClCompile Include="src\SocketNotification.cpp" />
+    <ClCompile Include="src\SocketNotifier.cpp" />
+    <ClCompile Include="src\SocketProactor.cpp" />
+    <ClCompile Include="src\SocketReactor.cpp" />
+    <ClCompile Include="src\SocketStream.cpp" />
+    <ClCompile Include="src\SSPINTLMCredentials.cpp" />
+    <ClCompile Include="src\StreamSocket.cpp" />
+    <ClCompile Include="src\StreamSocketImpl.cpp" />
+    <ClCompile Include="src\StringPartSource.cpp" />
+    <ClCompile Include="src\TCPServer.cpp" />
+    <ClCompile Include="src\TCPServerConnection.cpp" />
+    <ClCompile Include="src\TCPServerConnectionFactory.cpp" />
+    <ClCompile Include="src\TCPServerDispatcher.cpp" />
+    <ClCompile Include="src\TCPServerParams.cpp" />
+    <ClCompile Include="src\UDPClient.cpp" />
+    <ClCompile Include="src\UDPServerParams.cpp" />
+    <ClCompile Include="src\WebSocket.cpp" />
+    <ClCompile Include="src\WebSocketImpl.cpp" />
+    <ClCompile Include="src\wepoll.c" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
@@ -992,6 +775,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
-  <ImportGroup Label="ExtensionTargets"/>
-</Project>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Net/Net_vs170.vcxproj.filters b/Net/Net_vs170.vcxproj.filters
index 70df8a3b7..a81c5cd6b 100644
--- a/Net/Net_vs170.vcxproj.filters
+++ b/Net/Net_vs170.vcxproj.filters
@@ -2,166 +2,166 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{911f56bb-049d-4d4d-a0d5-7f938744fc02}</UniqueIdentifier>
+      <UniqueIdentifier>{0327a3ad-30cf-4db6-a801-53911cef2882}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{b3a5feb8-1e61-4684-93b2-e6e2729f8f59}</UniqueIdentifier>
+      <UniqueIdentifier>{5bb088f8-9b67-443b-ba87-88c89083d108}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{acb399c5-f26f-47fa-ae8b-2570e98fc6b9}</UniqueIdentifier>
+      <UniqueIdentifier>{c2212b81-c615-43ae-bc4b-538ea9acbd0c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{0d3e56ff-4aae-41e7-a383-c640af227a92}</UniqueIdentifier>
+      <UniqueIdentifier>{22aeb535-82d3-48de-bcc1-4855d0fa6957}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{a33c960c-5992-4770-9228-d803934a6f7e}</UniqueIdentifier>
+      <UniqueIdentifier>{7c491825-976b-44a7-a830-3bf552a20300}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{035f2f4c-6b45-45b6-92ad-80609486fb63}</UniqueIdentifier>
+      <UniqueIdentifier>{0ee833b1-e45b-4288-ae5e-91b76b4df09a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{801e176c-77da-4180-91bf-fbe0ba5777b9}</UniqueIdentifier>
+      <UniqueIdentifier>{972bf346-2819-4b15-a005-ee821590335d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{8398e24c-7330-4b20-a610-52070c69f3b3}</UniqueIdentifier>
+      <UniqueIdentifier>{790ee1d2-7e0b-4db9-b4a1-ed41b7577deb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{2d6e12d0-4024-4fe6-9b2f-c174efe3cea0}</UniqueIdentifier>
+      <UniqueIdentifier>{55ac476f-f77d-4bfa-a347-3e9d62a154bb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{1b40f490-ba0b-4f0b-8def-9270a19b4aa6}</UniqueIdentifier>
+      <UniqueIdentifier>{1121319e-26fe-4b5e-a99c-a9ad657feb1c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{df2c3e2b-730a-4c92-b084-ba4d680bb196}</UniqueIdentifier>
+      <UniqueIdentifier>{66afe532-112f-4a65-8a48-6c283fe312ca}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{7ca5f53a-9e26-4600-a44d-5d32483dec8b}</UniqueIdentifier>
+      <UniqueIdentifier>{010f68d2-86e0-4871-a30d-80e385d03fc9}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{c8d8d59a-1fe7-4317-8f5f-c3b8195f0eac}</UniqueIdentifier>
+      <UniqueIdentifier>{c1508524-5428-4ed9-80bd-42156bc3f7e3}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{63058a84-fcdc-48f2-816a-1011c8c1b4fc}</UniqueIdentifier>
+      <UniqueIdentifier>{512b50b6-03cd-4491-897f-8eaaceef5fa4}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{9df64c47-e030-42e2-b244-3d53f3e75fcd}</UniqueIdentifier>
+      <UniqueIdentifier>{7a34e468-42db-41db-99b6-1c5143cf4720}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{e9b7c2f2-04a3-4bb6-bb80-e31d0fab6173}</UniqueIdentifier>
+      <UniqueIdentifier>{6a67a7a9-4e13-4aa9-a393-7d2bec8dfb40}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{07e92825-c445-4add-b93d-b6f019a103c8}</UniqueIdentifier>
+      <UniqueIdentifier>{2d54ebba-8e9d-417e-9da3-e02e349e3b64}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{b886e732-7fce-4910-8681-e352fb440b7f}</UniqueIdentifier>
+      <UniqueIdentifier>{9f7d4901-70e6-4271-8063-e1fce4ab7021}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{c33c3241-ea4c-4279-bf67-407b0e61c5a7}</UniqueIdentifier>
+      <UniqueIdentifier>{06bdc7d7-2fbd-4b4d-b2aa-c9ecb51c7bc5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{0190ed6f-cc86-4218-9d17-f5717b6cf6d9}</UniqueIdentifier>
+      <UniqueIdentifier>{82980e3e-becb-4db7-9fd3-5e33aa1c8abc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{15a6d403-4a28-4c2a-a2e6-0d6e80deadfa}</UniqueIdentifier>
+      <UniqueIdentifier>{5cc883c1-7f7a-4444-81ea-fffa841fad3c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{dd132ecb-6d2c-4b5c-b4d6-5fd8302348e1}</UniqueIdentifier>
+      <UniqueIdentifier>{5069cc08-95e8-438c-a95c-3bfb44046feb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{8ba0d9dc-036b-46b5-a0ba-0ed450f82293}</UniqueIdentifier>
+      <UniqueIdentifier>{7f600cd5-030c-416a-83bd-b55f27861921}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{d152a8b3-c193-4b2e-af7f-b24e0c8f2d0d}</UniqueIdentifier>
+      <UniqueIdentifier>{5e34956e-7957-4a58-9d36-3a41b799fdd7}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{5501c616-f154-4401-9a21-cdca08ee50c7}</UniqueIdentifier>
+      <UniqueIdentifier>{b4a00fb0-4b7a-4f84-8c4f-bc3f54f0801e}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{6da235cd-b41f-4ecb-a9d5-a338a7213736}</UniqueIdentifier>
+      <UniqueIdentifier>{a4548540-c2f7-47d4-a163-7420617948da}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{3dfcda0f-7d4a-4f52-8efc-2307230d83f6}</UniqueIdentifier>
+      <UniqueIdentifier>{8772fa07-ac53-41cd-aa2b-c99d1cde05c7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{989410e5-21d1-42e7-bfa9-c44acaebc029}</UniqueIdentifier>
+      <UniqueIdentifier>{826fb5ae-5563-45ac-bce3-24414626f0a8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{08bf7247-0028-44e5-918e-2ed119a8234b}</UniqueIdentifier>
+      <UniqueIdentifier>{df60d666-f912-4618-9bba-72e28295cb94}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{9c5dc8c9-aabb-4cd8-8b74-5a17da821f02}</UniqueIdentifier>
+      <UniqueIdentifier>{1787e2b6-d541-4b16-93a2-e66e636f4770}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{f938b867-060d-4737-9f49-25ccea5b957a}</UniqueIdentifier>
+      <UniqueIdentifier>{4d782d56-61d9-423e-b668-07358c5acf2e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{dd698354-21c3-4309-a998-e37acf21a217}</UniqueIdentifier>
+      <UniqueIdentifier>{ac70d310-02cd-4084-b6e8-a8394c3da327}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{1c10f00f-d776-4da4-83e7-b41182e08a28}</UniqueIdentifier>
+      <UniqueIdentifier>{87711a59-71ae-41ed-9058-a7f975bb4cd6}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{fce5e7ec-6fd9-439e-8df8-6b908390c741}</UniqueIdentifier>
+      <UniqueIdentifier>{891c3f22-1a25-4d1c-af8c-92621b530082}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{c181296a-fc76-4b0e-a31b-418fe46a1360}</UniqueIdentifier>
+      <UniqueIdentifier>{61cd8667-c43a-42ad-80ad-2c012e3a63a8}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{5648a9a9-bc9b-42b5-9cdd-9c17e1437178}</UniqueIdentifier>
+      <UniqueIdentifier>{2d2fc73b-7622-4cdf-b9a2-431d8cef5b6d}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{be4fd9fd-85d4-4586-9e59-2b0622b04505}</UniqueIdentifier>
+      <UniqueIdentifier>{ec40a7ac-6125-4cc1-b6ae-25f245629278}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{54237d6d-6d2e-4f79-ab14-58e8dede50cc}</UniqueIdentifier>
+      <UniqueIdentifier>{50f1d5a8-30e3-44a0-a52e-5a3445aa6638}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{ff1c12e6-cd02-4643-8c60-b7e651413022}</UniqueIdentifier>
+      <UniqueIdentifier>{f5c8df69-6521-4f35-a31c-103322795b54}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{78b905a0-35ff-46f7-8062-13555ff1894f}</UniqueIdentifier>
+      <UniqueIdentifier>{8fe68575-229a-4caa-8f62-ee1cce1856fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{7d1ea7cf-6355-420b-99a7-addeeca4370c}</UniqueIdentifier>
+      <UniqueIdentifier>{d7259566-fbb7-4998-a4e4-56dae77866a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{b4c88a7d-7bea-4f64-a1bb-c3c9b8e24245}</UniqueIdentifier>
+      <UniqueIdentifier>{47d3ce03-365c-4c13-86d0-342e99ebe32c}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{02df74a1-bdc6-4076-b273-fc43fd4975da}</UniqueIdentifier>
+      <UniqueIdentifier>{1bc55eb6-3c68-44e9-a929-ae46d1d11922}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{56b6fa19-3510-4cdb-b80e-6a31d62a2aa6}</UniqueIdentifier>
+      <UniqueIdentifier>{d79dbf11-3184-4558-acb9-a94cb0f0a461}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{e6cf0135-83ac-4cb5-98c0-11491870d830}</UniqueIdentifier>
+      <UniqueIdentifier>{b99e11f4-018c-45c9-84d4-47c1c17fd78b}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth">
-      <UniqueIdentifier>{ecdb88cc-206a-407e-9f06-addbf0b0728d}</UniqueIdentifier>
+      <UniqueIdentifier>{b35c8bbe-07c0-4f48-8236-5ffde07e185d}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Header Files">
-      <UniqueIdentifier>{b543122a-99ec-4dcb-b84f-db57f26fdeca}</UniqueIdentifier>
+      <UniqueIdentifier>{b56349c5-6624-47fd-aeb6-0d48502db985}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Source Files">
-      <UniqueIdentifier>{fbced114-043b-4618-9cac-9257023a2ccb}</UniqueIdentifier>
+      <UniqueIdentifier>{6df2f132-e07c-4ec2-b2fc-10262a58892b}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP">
-      <UniqueIdentifier>{3ffb60fe-8666-4130-ae45-84381cacb212}</UniqueIdentifier>
+      <UniqueIdentifier>{a313fb55-54b0-487c-86e6-fd0b3de340f0}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Source Files">
-      <UniqueIdentifier>{abed7288-dfb0-4381-994d-62683940ca49}</UniqueIdentifier>
+      <UniqueIdentifier>{65812101-be4a-4c49-912a-49eb9ea65cca}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Header Files">
-      <UniqueIdentifier>{049036d6-7e2b-451f-9f8b-b665375bb258}</UniqueIdentifier>
+      <UniqueIdentifier>{f6c00d82-d1e8-4dd8-9fc2-b95d376662a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM">
-      <UniqueIdentifier>{d9e0f5f8-1057-49f5-ae66-4a9db6e73d67}</UniqueIdentifier>
+      <UniqueIdentifier>{34e35154-1aef-4fcf-991f-b3db9b4cbfc5}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM\Header Files">
-      <UniqueIdentifier>{f9788d4b-3688-4a29-8856-b6246c49da88}</UniqueIdentifier>
+      <UniqueIdentifier>{8c5c3d52-4e1d-4d0e-b5c6-a1199900e823}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTLM\Source Files">
-      <UniqueIdentifier>{169fb8fb-c41c-480e-a4a6-e13f271cc754}</UniqueIdentifier>
+      <UniqueIdentifier>{112649bf-0779-4de5-b573-cd0c0a2c3b78}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -237,6 +237,9 @@
     <ClInclude Include="include\Poco\Net\StreamSocketImpl.h">
       <Filter>Sockets\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\wepoll.h">
+      <Filter>Sockets\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\FilePartSource.h">
       <Filter>Messages\Header Files</Filter>
     </ClInclude>
@@ -420,6 +423,9 @@
     <ClInclude Include="include\Poco\Net\SocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\SocketProactor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\MailMessage.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>
@@ -584,6 +590,9 @@
     <ClCompile Include="src\StreamSocketImpl.cpp">
       <Filter>Sockets\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\wepoll.c">
+      <Filter>Sockets\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FilePartSource.cpp">
       <Filter>Messages\Source Files</Filter>
     </ClCompile>
@@ -752,6 +761,9 @@
     <ClCompile Include="src\SocketReactor.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketProactor.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MailMessage.cpp">
       <Filter>Mail\Source Files</Filter>
     </ClCompile>
diff --git a/Net/Net_vs90.vcproj b/Net/Net_vs90.vcproj
index 62d9aaa94..98c5c5b20 100644
--- a/Net/Net_vs90.vcproj
+++ b/Net/Net_vs90.vcproj
@@ -643,6 +643,10 @@
 					RelativePath=".\include\Poco\Net\StreamSocketImpl.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\wepoll.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Source Files"
@@ -703,6 +707,10 @@
 					RelativePath=".\src\StreamSocketImpl.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\wepoll.c"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1251,6 +1259,10 @@
 					RelativePath=".\include\Poco\Net\SocketReactor.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\Poco\Net\SocketProactor.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Source Files"
@@ -1267,6 +1279,10 @@
 					RelativePath=".\src\SocketReactor.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\SocketProactor.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1646,4 +1662,4 @@
 	</Files>
 	<Globals>
 	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file
diff --git a/Net/include/Poco/Net/AbstractHTTPRequestHandler.h b/Net/include/Poco/Net/AbstractHTTPRequestHandler.h
index 7bbc174c8..d034de724 100644
--- a/Net/include/Poco/Net/AbstractHTTPRequestHandler.h
+++ b/Net/include/Poco/Net/AbstractHTTPRequestHandler.h
@@ -30,7 +30,7 @@ class HTMLForm;
 
 
 class Net_API AbstractHTTPRequestHandler: public HTTPRequestHandler
-	/// The abstract base class for AbstractHTTPRequestHandlers 
+	/// The abstract base class for AbstractHTTPRequestHandlers
 	/// created by HTTPServer.
 	///
 	/// Derived classes must override the run() method.
@@ -41,7 +41,7 @@ class Net_API AbstractHTTPRequestHandler: public HTTPRequestHandler
 	/// HTMLForm object is created for use by subclasses.
 	///
 	/// The run() method must perform the complete handling
-	/// of the HTTP request connection. As soon as the run() 
+	/// of the HTTP request connection. As soon as the run()
 	/// method returns, the request handler object is destroyed.
 	///
 	/// A new AbstractHTTPRequestHandler object will be created for
@@ -89,7 +89,7 @@ public:
 		///            <P>message</P>
 		///         </BODY>
 		///     </HTML>
-	
+
 protected:
 	virtual void run() = 0;
 		/// Must be overridden by subclasses.
@@ -117,7 +117,7 @@ private:
 inline HTTPServerRequest& AbstractHTTPRequestHandler::request()
 {
 	poco_check_ptr (_pRequest);
-	
+
 	return *_pRequest;
 }
 
diff --git a/Net/include/Poco/Net/DatagramSocketImpl.h b/Net/include/Poco/Net/DatagramSocketImpl.h
index f9d280aa1..867af46e5 100644
--- a/Net/include/Poco/Net/DatagramSocketImpl.h
+++ b/Net/include/Poco/Net/DatagramSocketImpl.h
@@ -41,10 +41,10 @@ public:
 
 	DatagramSocketImpl(poco_socket_t sockfd);
 		/// Creates a StreamSocketImpl using the given native socket.
-		
+
 protected:
 	void init(int af);
-	
+
 	~DatagramSocketImpl();
 };
 
diff --git a/Net/include/Poco/Net/DialogSocket.h b/Net/include/Poco/Net/DialogSocket.h
index ca47b73ba..b9104d092 100644
--- a/Net/include/Poco/Net/DialogSocket.h
+++ b/Net/include/Poco/Net/DialogSocket.h
@@ -75,11 +75,11 @@ public:
 		///
 		/// Releases the socket's SocketImpl and
 		/// attaches the SocketImpl from the other socket and
-		/// increments the reference count of the SocketImpl.	
+		/// increments the reference count of the SocketImpl.
 
 	DialogSocket& operator = (const DialogSocket& socket);
 		/// Assignment operator.
-		
+
 	void sendByte(unsigned char ch);
 		/// Sends a single byte over the socket connection.
 
@@ -101,34 +101,34 @@ public:
 	void sendMessage(const std::string& message, const std::string& arg1, const std::string& arg2);
 		/// Concatenates message and args, separated by a space, appends a
 		/// CR-LF sequence, and sends the result over the socket connection.
-		
+
 	bool receiveMessage(std::string& message);
 		/// Receives a single-line message, terminated by CR-LF,
 		/// from the socket connection and appends it to response.
-		/// 
+		///
 		/// Returns true if a message has been read or false if
 		/// the connection has been closed by the peer.
-	
+
 	int receiveStatusMessage(std::string& message);
 		/// Receives a single-line or multi-line response from
 		/// the socket connection. The format must be according to
-		/// one of the response formats specified in the FTP (RFC 959) 
+		/// one of the response formats specified in the FTP (RFC 959)
 		/// or SMTP (RFC 2821) specifications.
 		///
 		/// The first line starts with a 3-digit status code.
-		/// Following the status code is either a space character (' ' ) 
+		/// Following the status code is either a space character (' ' )
 		/// (in case of a single-line response) or a minus character ('-')
 		/// in case of a multi-line response. The following lines can have
 		/// a three-digit status code followed by a minus-sign and some
 		/// text, or some arbitrary text only. The last line again begins
 		/// with a three-digit status code (which must be the same as the
-		/// one in the first line), followed by a space and some arbitrary 
+		/// one in the first line), followed by a space and some arbitrary
 		/// text. All lines must be terminated by a CR-LF sequence.
 		///
 		/// The response contains all response lines, separated by a newline
 		/// character, including the status code. The status code is returned.
 		/// If the response line does not contain a status code, 0 is returned.
-	
+
 	int get();
 		/// Reads one character from the connection.
 		///
@@ -156,7 +156,7 @@ public:
 		///
 		/// According to RFC 854, a TELNET_DM char is sent
 		/// via sendUrgent().
-		
+
 	void sendTelnetCommand(unsigned char command);
 		/// Sends a TELNET command sequence (TELNET_IAC followed
 		/// by the given command) over the connection.
@@ -198,7 +198,7 @@ private:
 		MAX_LINE_LENGTH     = 4096,
 		EOF_CHAR            = -1
 	};
-	
+
 	char* _pBuffer;
 	char* _pNext;
 	char* _pEnd;
diff --git a/Net/include/Poco/Net/FTPClientSession.h b/Net/include/Poco/Net/FTPClientSession.h
index 1e817a784..7738a67cf 100644
--- a/Net/include/Poco/Net/FTPClientSession.h
+++ b/Net/include/Poco/Net/FTPClientSession.h
@@ -58,18 +58,21 @@ public:
 		TYPE_BINARY /// TYPE I (Image/binary data)
 	};
 
-	FTPClientSession();
+	FTPClientSession(Poco::UInt16 activeDataPort = 0);
 		/// Creates an FTPClientSession.
 		///
 		/// Passive mode will be used for data transfers.
 
-	FTPClientSession(const StreamSocket& socket, bool readWelcomeMessage = true);
+	FTPClientSession(const StreamSocket& socket, bool readWelcomeMessage = true,
+		Poco::UInt16 activeDataPort = 0);
 		/// Creates an FTPClientSession using the given
 		/// connected socket for the control connection.
 		///
 		/// Passive mode will be used for data transfers.
 
-	FTPClientSession(const std::string& host, Poco::UInt16 port = FTP_PORT, const std::string& username = "", const std::string& password = "");
+	FTPClientSession(const std::string& host, Poco::UInt16 port = FTP_PORT,
+		const std::string& username = "", const std::string& password = "",
+		Poco::UInt16 activeDataPort = 0);
 		/// Creates an FTPClientSession using a socket connected
 		/// to the given host and port. If username is supplied,
 		/// login is attempted.
@@ -350,6 +353,7 @@ private:
 
 	std::string _host;
 	Poco::UInt16 _port = FTP_PORT;
+	Poco::UInt16 _activeDataPort = 0;
 	bool _passiveMode = true;
 	FileType _fileType = TYPE_BINARY;
 	bool _supports1738 = true;
diff --git a/Net/include/Poco/Net/FilePartSource.h b/Net/include/Poco/Net/FilePartSource.h
index 056718541..b7aedd6b8 100644
--- a/Net/include/Poco/Net/FilePartSource.h
+++ b/Net/include/Poco/Net/FilePartSource.h
@@ -38,7 +38,7 @@ public:
 		/// The MIME type is set to application/octet-stream.
 		///
 		/// Throws an OpenFileException if the file cannot be opened.
-	
+
 	FilePartSource(const std::string& path, const std::string& mediaType);
 		/// Creates the FilePartSource for the given
 		/// path and MIME type.
@@ -47,7 +47,7 @@ public:
 
 	FilePartSource(const std::string& path, const std::string& filename, const std::string& mediaType);
 		/// Creates the FilePartSource for the given
-		/// path and MIME type. The given filename is 
+		/// path and MIME type. The given filename is
 		/// used as part filename (see filename()) only.
 		///
 		/// Throws an OpenFileException if the file cannot be opened.
@@ -57,7 +57,7 @@ public:
 
 	std::istream& stream();
 		/// Returns a file input stream for the given file.
-		
+
 	const std::string& filename() const;
 		/// Returns the filename portion of the path.
 
diff --git a/Net/include/Poco/Net/HTTPChunkedStream.h b/Net/include/Poco/Net/HTTPChunkedStream.h
index 0d236581a..d9c8029e4 100644
--- a/Net/include/Poco/Net/HTTPChunkedStream.h
+++ b/Net/include/Poco/Net/HTTPChunkedStream.h
@@ -31,6 +31,7 @@ namespace Net {
 
 
 class HTTPSession;
+class MessageHeader;
 
 
 class Net_API HTTPChunkedStreamBuf: public HTTPBasicStreamBuf
@@ -40,7 +41,7 @@ class Net_API HTTPChunkedStreamBuf: public HTTPBasicStreamBuf
 public:
 	using openmode = HTTPBasicStreamBuf::openmode;
 
-	HTTPChunkedStreamBuf(HTTPSession& session, openmode mode);
+	HTTPChunkedStreamBuf(HTTPSession& session, openmode mode, MessageHeader* pTrailer = nullptr);
 	~HTTPChunkedStreamBuf();
 	void close();
 
@@ -53,6 +54,7 @@ private:
 	openmode        _mode;
 	std::streamsize _chunk;
 	std::string     _chunkBuffer;
+	MessageHeader*  _pTrailer;
 };
 
 
@@ -60,7 +62,7 @@ class Net_API HTTPChunkedIOS: public virtual std::ios
 	/// The base class for HTTPInputStream.
 {
 public:
-	HTTPChunkedIOS(HTTPSession& session, HTTPChunkedStreamBuf::openmode mode);
+	HTTPChunkedIOS(HTTPSession& session, HTTPChunkedStreamBuf::openmode mode, MessageHeader* pTrailer = nullptr);
 	~HTTPChunkedIOS();
 	HTTPChunkedStreamBuf* rdbuf();
 
@@ -73,12 +75,12 @@ class Net_API HTTPChunkedInputStream: public HTTPChunkedIOS, public std::istream
 	/// This class is for internal use by HTTPSession only.
 {
 public:
-	HTTPChunkedInputStream(HTTPSession& session);
+	HTTPChunkedInputStream(HTTPSession& session, MessageHeader* pTrailer = nullptr);
 	~HTTPChunkedInputStream();
-	
+
 	void* operator new(std::size_t size);
 	void operator delete(void* ptr);
-	
+
 private:
 	static Poco::MemoryPool _pool;
 };
@@ -88,12 +90,12 @@ class Net_API HTTPChunkedOutputStream: public HTTPChunkedIOS, public std::ostrea
 	/// This class is for internal use by HTTPSession only.
 {
 public:
-	HTTPChunkedOutputStream(HTTPSession& session);
+	HTTPChunkedOutputStream(HTTPSession& session, MessageHeader* pTrailer = nullptr);
 	~HTTPChunkedOutputStream();
 
 	void* operator new(std::size_t size);
 	void operator delete(void* ptr);
-	
+
 private:
 	static Poco::MemoryPool _pool;
 };
diff --git a/Net/include/Poco/Net/HTTPDigestCredentials.h b/Net/include/Poco/Net/HTTPDigestCredentials.h
index c321c9fc8..b8c5af438 100644
--- a/Net/include/Poco/Net/HTTPDigestCredentials.h
+++ b/Net/include/Poco/Net/HTTPDigestCredentials.h
@@ -120,6 +120,9 @@ public:
 		/// and HTTPAuthenticationParams by recomputing the response and comparing
 		/// it with what's in the request.
 
+	bool isAlgorithmSupported(const std::string& algorithm) const;
+		/// Check if digest algorithm is supported
+
 	static std::string createNonce();
 		/// Creates a random nonce string.
 
@@ -133,7 +136,19 @@ private:
 	void updateAuthParams(const HTTPRequest& request);
 	int updateNonceCounter(const std::string& nonce);
 
-	static const std::string DEFAULT_ALGORITHM;
+	class DigestEngineProvider;
+	
+	static const std::string MD_5_ALGORITHM;
+	static const std::string MD_5_SESS_ALGORITHM;
+	static const std::string SHA_ALGORITHM;
+	static const std::string SHA_SESS_ALGORITHM;
+	static const std::string SHA_256_ALGORITHM;
+	static const std::string SHA_256_SESS_ALGORITHM;
+	static const std::string SHA_512_256_ALGORITHM;
+	static const std::string SHA_512_256_SESS_ALGORITHM;
+	static const std::string SHA_512_ALGORITHM;
+	static const std::string SHA_512_SESS_ALGORITHM;
+	static const std::vector<std::string> SUPPORTED_ALGORITHMS;
 	static const std::string DEFAULT_QOP;
 	static const std::string NONCE_PARAM;
 	static const std::string REALM_PARAM;
diff --git a/Net/include/Poco/Net/HTTPFixedLengthStream.h b/Net/include/Poco/Net/HTTPFixedLengthStream.h
index 59ec4fd09..921fa2b7b 100644
--- a/Net/include/Poco/Net/HTTPFixedLengthStream.h
+++ b/Net/include/Poco/Net/HTTPFixedLengthStream.h
@@ -49,7 +49,7 @@ public:
 
 	HTTPFixedLengthStreamBuf(HTTPSession& session, ContentLength length, openmode mode);
 	~HTTPFixedLengthStreamBuf();
-	
+
 protected:
 	int readFromDevice(char* buffer, std::streamsize length);
 	int writeToDevice(const char* buffer, std::streamsize length);
@@ -80,10 +80,10 @@ class Net_API HTTPFixedLengthInputStream: public HTTPFixedLengthIOS, public std:
 public:
 	HTTPFixedLengthInputStream(HTTPSession& session, HTTPFixedLengthStreamBuf::ContentLength length);
 	~HTTPFixedLengthInputStream();
-	
+
 	void* operator new(std::size_t size);
 	void operator delete(void* ptr);
-	
+
 private:
 	static Poco::MemoryPool _pool;
 };
@@ -98,7 +98,7 @@ public:
 
 	void* operator new(std::size_t size);
 	void operator delete(void* ptr);
-	
+
 private:
 	static Poco::MemoryPool _pool;
 };
diff --git a/Net/include/Poco/Net/HTTPHeaderStream.h b/Net/include/Poco/Net/HTTPHeaderStream.h
index 2a570d32a..985ff56d5 100644
--- a/Net/include/Poco/Net/HTTPHeaderStream.h
+++ b/Net/include/Poco/Net/HTTPHeaderStream.h
@@ -42,7 +42,7 @@ public:
 
 	HTTPHeaderStreamBuf(HTTPSession& session, openmode mode);
 	~HTTPHeaderStreamBuf();
-	
+
 protected:
 	int readFromDevice(char* buffer, std::streamsize length);
 	int writeToDevice(const char* buffer, std::streamsize length);
@@ -75,7 +75,7 @@ public:
 
 	void* operator new(std::size_t size);
 	void operator delete(void* ptr);
-	
+
 private:
 	static Poco::MemoryPool _pool;
 };
@@ -90,7 +90,7 @@ public:
 
 	void* operator new(std::size_t size);
 	void operator delete(void* ptr);
-	
+
 private:
 	static Poco::MemoryPool _pool;
 };
diff --git a/Net/include/Poco/Net/HTTPIOStream.h b/Net/include/Poco/Net/HTTPIOStream.h
index 2c45812ae..32792ec4d 100644
--- a/Net/include/Poco/Net/HTTPIOStream.h
+++ b/Net/include/Poco/Net/HTTPIOStream.h
@@ -34,12 +34,12 @@ class Net_API HTTPResponseStreamBuf: public Poco::UnbufferedStreamBuf
 {
 public:
 	HTTPResponseStreamBuf(std::istream& istr);
-	
+
 	~HTTPResponseStreamBuf();
-		
+
 private:
 	int readFromDevice();
-	
+
 	std::istream& _istr;
 };
 
@@ -54,9 +54,9 @@ class Net_API HTTPResponseIOS: public virtual std::ios
 {
 public:
 	HTTPResponseIOS(std::istream& istr);
-	
+
 	~HTTPResponseIOS();
-	
+
 	HTTPResponseStreamBuf* rdbuf();
 
 protected:
@@ -74,9 +74,9 @@ class Net_API HTTPResponseStream: public HTTPResponseIOS, public std::istream
 {
 public:
 	HTTPResponseStream(std::istream& istr, HTTPClientSession* pSession);
-		
+
 	~HTTPResponseStream();
-	
+
 private:
 	HTTPClientSession* _pSession;
 };
diff --git a/Net/include/Poco/Net/HTTPRequestHandler.h b/Net/include/Poco/Net/HTTPRequestHandler.h
index 8a6271204..41e969553 100644
--- a/Net/include/Poco/Net/HTTPRequestHandler.h
+++ b/Net/include/Poco/Net/HTTPRequestHandler.h
@@ -30,14 +30,14 @@ class HTTPServerResponse;
 
 
 class Net_API HTTPRequestHandler
-	/// The abstract base class for HTTPRequestHandlers 
+	/// The abstract base class for HTTPRequestHandlers
 	/// created by HTTPServer.
 	///
 	/// Derived classes must override the handleRequest() method.
 	/// Furthermore, a HTTPRequestHandlerFactory must be provided.
 	///
 	/// The handleRequest() method must perform the complete handling
-	/// of the HTTP request connection. As soon as the handleRequest() 
+	/// of the HTTP request connection. As soon as the handleRequest()
 	/// method returns, the request handler object is destroyed.
 	///
 	/// A new HTTPRequestHandler object will be created for
diff --git a/Net/include/Poco/Net/HTTPRequestHandlerFactory.h b/Net/include/Poco/Net/HTTPRequestHandlerFactory.h
index 69021a626..6373a1471 100644
--- a/Net/include/Poco/Net/HTTPRequestHandlerFactory.h
+++ b/Net/include/Poco/Net/HTTPRequestHandlerFactory.h
@@ -39,7 +39,7 @@ class Net_API HTTPRequestHandlerFactory
 {
 public:
 	using Ptr = Poco::SharedPtr<HTTPRequestHandlerFactory>;
-	
+
 	HTTPRequestHandlerFactory();
 		/// Creates the HTTPRequestHandlerFactory.
 
@@ -56,8 +56,8 @@ public:
 		/// request.
 		///
 		/// If the request contains a "Expect: 100-continue" header, it's possible
-		/// to prevent the server from sending the default 100 Continue response 
-		/// by setting the status of the response object that can be obtained through 
+		/// to prevent the server from sending the default 100 Continue response
+		/// by setting the status of the response object that can be obtained through
 		/// the request object (request.response()) to something other than 200 OK.
 
 protected:
@@ -66,7 +66,7 @@ protected:
 private:
 	HTTPRequestHandlerFactory(const HTTPRequestHandlerFactory&);
 	HTTPRequestHandlerFactory& operator = (const HTTPRequestHandlerFactory&);
-	
+
 	friend class HTTPServer;
 	friend class HTTPServerConnection;
 };
diff --git a/Net/include/Poco/Net/HTTPResponse.h b/Net/include/Poco/Net/HTTPResponse.h
index 029095b2d..e42ebfa07 100644
--- a/Net/include/Poco/Net/HTTPResponse.h
+++ b/Net/include/Poco/Net/HTTPResponse.h
@@ -93,6 +93,7 @@ public:
 		HTTP_UNPROCESSABLE_ENTITY            = 422,
 		HTTP_LOCKED                          = 423,
 		HTTP_FAILED_DEPENDENCY               = 424,
+		HTTP_TOO_EARLY                       = 425,
 		HTTP_UPGRADE_REQUIRED                = 426,
 		HTTP_PRECONDITION_REQUIRED           = 428,
 		HTTP_TOO_MANY_REQUESTS               = 429,
@@ -243,6 +244,7 @@ public:
 	static const std::string HTTP_REASON_UNPROCESSABLE_ENTITY;
 	static const std::string HTTP_REASON_LOCKED;
 	static const std::string HTTP_REASON_FAILED_DEPENDENCY;
+	static const std::string HTTP_REASON_TOO_EARLY;
 	static const std::string HTTP_REASON_UPGRADE_REQUIRED;
 	static const std::string HTTP_REASON_PRECONDITION_REQUIRED;
 	static const std::string HTTP_REASON_TOO_MANY_REQUESTS;
diff --git a/Net/include/Poco/Net/HTTPServerConnection.h b/Net/include/Poco/Net/HTTPServerConnection.h
index 536889c04..fc100ba2d 100644
--- a/Net/include/Poco/Net/HTTPServerConnection.h
+++ b/Net/include/Poco/Net/HTTPServerConnection.h
@@ -43,7 +43,7 @@ public:
 
 	virtual ~HTTPServerConnection();
 		/// Destroys the HTTPServerConnection.
-		
+
 	void run();
 		/// Handles all HTTP requests coming in.
 
diff --git a/Net/include/Poco/Net/HTTPServerConnectionFactory.h b/Net/include/Poco/Net/HTTPServerConnectionFactory.h
index fc44f912c..876360c47 100644
--- a/Net/include/Poco/Net/HTTPServerConnectionFactory.h
+++ b/Net/include/Poco/Net/HTTPServerConnectionFactory.h
@@ -42,7 +42,7 @@ public:
 	TCPServerConnection* createConnection(const StreamSocket& socket);
 		/// Creates an instance of HTTPServerConnection
 		/// using the given StreamSocket.
-	
+
 private:
 	HTTPServerParams::Ptr          _pParams;
 	HTTPRequestHandlerFactory::Ptr _pFactory;
diff --git a/Net/include/Poco/Net/HTTPServerRequest.h b/Net/include/Poco/Net/HTTPServerRequest.h
index 69ffeaec0..5a1760a77 100644
--- a/Net/include/Poco/Net/HTTPServerRequest.h
+++ b/Net/include/Poco/Net/HTTPServerRequest.h
@@ -46,26 +46,26 @@ public:
 
 	~HTTPServerRequest();
 		/// Destroys the HTTPServerRequest.
-		
+
 	virtual std::istream& stream() = 0;
 		/// Returns the input stream for reading
 		/// the request body.
 		///
 		/// The stream must be valid until the HTTPServerRequest
 		/// object is destroyed.
-		
+
 	virtual const SocketAddress& clientAddress() const = 0;
 		/// Returns the client's address.
 
 	virtual const SocketAddress& serverAddress() const = 0;
 		/// Returns the server's address.
-		
+
 	virtual const HTTPServerParams& serverParams() const = 0;
 		/// Returns a reference to the server parameters.
 
 	virtual HTTPServerResponse& response() const = 0;
 		/// Returns a reference to the associated response.
-		
+
 	virtual bool secure() const = 0;
 		/// Returns true if the request is using a secure
 		/// connection. Returns false if no secure connection
diff --git a/Net/include/Poco/Net/HTTPServerRequestImpl.h b/Net/include/Poco/Net/HTTPServerRequestImpl.h
index 419adbb5e..fc406c836 100644
--- a/Net/include/Poco/Net/HTTPServerRequestImpl.h
+++ b/Net/include/Poco/Net/HTTPServerRequestImpl.h
@@ -49,39 +49,39 @@ public:
 
 	~HTTPServerRequestImpl();
 		/// Destroys the HTTPServerRequestImpl.
-		
+
 	std::istream& stream();
 		/// Returns the input stream for reading
 		/// the request body.
 		///
 		/// The stream is valid until the HTTPServerRequestImpl
 		/// object is destroyed.
-		
+
 	const SocketAddress& clientAddress() const;
 		/// Returns the client's address.
 
 	const SocketAddress& serverAddress() const;
 		/// Returns the server's address.
-		
+
 	const HTTPServerParams& serverParams() const;
 		/// Returns a reference to the server parameters.
 
 	HTTPServerResponse& response() const;
 		/// Returns a reference to the associated response.
-		
+
 	bool secure() const;
 		/// Returns true if the request is using a secure
 		/// connection. Returns false if no secure connection
 		/// is used, or if it is not known whether a secure
-		/// connection is used.		
-		
+		/// connection is used.
+
 	StreamSocket& socket();
 		/// Returns a reference to the underlying socket.
-		
+
 	StreamSocket detachSocket();
 		/// Returns the underlying socket after detaching
 		/// it from the server session.
-		
+
 	HTTPServerSession& session();
 		/// Returns the underlying HTTPServerSession.
 
@@ -101,7 +101,7 @@ private:
 inline std::istream& HTTPServerRequestImpl::stream()
 {
 	poco_check_ptr (_pStream);
-	
+
 	return *_pStream;
 }
 
diff --git a/Net/include/Poco/Net/HTTPServerResponse.h b/Net/include/Poco/Net/HTTPServerResponse.h
index 0eefe5c9a..8ffbcfa4d 100644
--- a/Net/include/Poco/Net/HTTPServerResponse.h
+++ b/Net/include/Poco/Net/HTTPServerResponse.h
@@ -53,7 +53,7 @@ public:
 	virtual void sendContinue() = 0;
 		/// Sends a 100 Continue response to the
 		/// client.
-		
+
 	virtual std::ostream& send() = 0;
 		/// Sends the response header to the client and
 		/// returns an output stream for sending the
@@ -62,20 +62,20 @@ public:
 		/// The returned stream is valid until the response
 		/// object is destroyed.
 		///
-		/// Must not be called after sendFile(), sendBuffer() 
+		/// Must not be called after sendFile(), sendBuffer()
 		/// or redirect() has been called.
-		
+
 	virtual void sendFile(const std::string& path, const std::string& mediaType) = 0;
 		/// Sends the response header to the client, followed
 		/// by the content of the given file.
 		///
-		/// Must not be called after send(), sendBuffer() 
+		/// Must not be called after send(), sendBuffer()
 		/// or redirect() has been called.
 		///
 		/// Throws a FileNotFoundException if the file
 		/// cannot be found, or an OpenFileException if
 		/// the file cannot be opened.
-		
+
 	virtual void sendBuffer(const void* pBuffer, std::size_t length) = 0;
 		/// Sends the response header to the client, followed
 		/// by the contents of the given buffer.
@@ -84,12 +84,12 @@ public:
 		/// to length and chunked transfer encoding is disabled.
 		///
 		/// If both the HTTP message header and body (from the
-		/// given buffer) fit into one single network packet, the 
+		/// given buffer) fit into one single network packet, the
 		/// complete response can be sent in one network packet.
 		///
-		/// Must not be called after send(), sendFile()  
+		/// Must not be called after send(), sendFile()
 		/// or redirect() has been called.
-		
+
 	virtual void redirect(const std::string& uri, HTTPStatus status = HTTP_FOUND) = 0;
 		/// Sets the status code, which must be one of
 		/// HTTP_MOVED_PERMANENTLY (301), HTTP_FOUND (302),
@@ -99,12 +99,12 @@ public:
 		/// the HTTP specification, must be absolute.
 		///
 		/// Must not be called after send() has been called.
-		
+
 	virtual void requireAuthentication(const std::string& realm) = 0;
 		/// Sets the status code to 401 (Unauthorized)
 		/// and sets the "WWW-Authenticate" header field
 		/// according to the given realm.
-		
+
 	virtual bool sent() const = 0;
 		/// Returns true if the response (header) has been sent.
 };
diff --git a/Net/include/Poco/Net/HTTPServerResponseImpl.h b/Net/include/Poco/Net/HTTPServerResponseImpl.h
index c5d121d85..39081182b 100644
--- a/Net/include/Poco/Net/HTTPServerResponseImpl.h
+++ b/Net/include/Poco/Net/HTTPServerResponseImpl.h
@@ -51,7 +51,7 @@ public:
 	void sendContinue();
 		/// Sends a 100 Continue response to the
 		/// client.
-		
+
 	std::ostream& send();
 		/// Sends the response header to the client and
 		/// returns an output stream for sending the
@@ -60,20 +60,20 @@ public:
 		/// The returned stream is valid until the response
 		/// object is destroyed.
 		///
-		/// Must not be called after sendFile(), sendBuffer() 
+		/// Must not be called after sendFile(), sendBuffer()
 		/// or redirect() has been called.
-		
+
 	void sendFile(const std::string& path, const std::string& mediaType);
 		/// Sends the response header to the client, followed
 		/// by the content of the given file.
 		///
-		/// Must not be called after send(), sendBuffer() 
+		/// Must not be called after send(), sendBuffer()
 		/// or redirect() has been called.
 		///
 		/// Throws a FileNotFoundException if the file
 		/// cannot be found, or an OpenFileException if
 		/// the file cannot be opened.
-		
+
 	void sendBuffer(const void* pBuffer, std::size_t length);
 		/// Sends the response header to the client, followed
 		/// by the contents of the given buffer.
@@ -82,12 +82,12 @@ public:
 		/// to length and chunked transfer encoding is disabled.
 		///
 		/// If both the HTTP message header and body (from the
-		/// given buffer) fit into one single network packet, the 
+		/// given buffer) fit into one single network packet, the
 		/// complete response can be sent in one network packet.
 		///
-		/// Must not be called after send(), sendFile()  
+		/// Must not be called after send(), sendFile()
 		/// or redirect() has been called.
-		
+
 	void redirect(const std::string& uri, HTTPStatus status = HTTP_FOUND);
 		/// Sets the status code, which must be one of
 		/// HTTP_MOVED_PERMANENTLY (301), HTTP_FOUND (302),
@@ -97,23 +97,23 @@ public:
 		/// the HTTP specification, must be absolute.
 		///
 		/// Must not be called after send() has been called.
-		
+
 	void requireAuthentication(const std::string& realm);
 		/// Sets the status code to 401 (Unauthorized)
 		/// and sets the "WWW-Authenticate" header field
 		/// according to the given realm.
-		
+
 	bool sent() const;
 		/// Returns true if the response (header) has been sent.
 
 protected:
 	void attachRequest(HTTPServerRequestImpl* pRequest);
-	
+
 private:
 	HTTPServerSession& _session;
 	HTTPServerRequestImpl* _pRequest;
 	std::ostream*      _pStream;
-	
+
 	friend class HTTPServerRequestImpl;
 };
 
diff --git a/Net/include/Poco/Net/HTTPServerSession.h b/Net/include/Poco/Net/HTTPServerSession.h
index 8b169bf55..ad7abd270 100644
--- a/Net/include/Poco/Net/HTTPServerSession.h
+++ b/Net/include/Poco/Net/HTTPServerSession.h
@@ -41,19 +41,19 @@ public:
 
 	virtual ~HTTPServerSession();
 		/// Destroys the HTTPServerSession.
-				
+
 	bool hasMoreRequests();
 		/// Returns true if there are requests available.
-	
+
 	bool canKeepAlive() const;
 		/// Returns true if the session can be kept alive.
-	
+
 	SocketAddress clientAddress();
 		/// Returns the client's address.
-		
+
 	SocketAddress serverAddress();
 		/// Returns the server's address.
-		
+
 private:
 	bool           _firstRequest;
 	Poco::Timespan _keepAliveTimeout;
diff --git a/Net/include/Poco/Net/HTTPSession.h b/Net/include/Poco/Net/HTTPSession.h
index f3215514b..c0db0f299 100644
--- a/Net/include/Poco/Net/HTTPSession.h
+++ b/Net/include/Poco/Net/HTTPSession.h
@@ -19,6 +19,7 @@
 
 
 #include "Poco/Net/Net.h"
+#include "Poco/Net/MessageHeader.h"
 #include "Poco/Net/StreamSocket.h"
 #include "Poco/Timespan.h"
 #include "Poco/Exception.h"
@@ -47,43 +48,61 @@ public:
 		///
 		/// If the keep-alive flag is enabled, persistent
 		/// HTTP/1.1 connections are supported.
-		
+
 	bool getKeepAlive() const;
 		/// Returns the value of the keep-alive flag for
 		/// this session.
 
 	void setTimeout(const Poco::Timespan& timeout);
 		/// Sets the timeout for the HTTP session.
-		
+
 	void setTimeout(const Poco::Timespan& connectionTimeout, const Poco::Timespan& sendTimeout, const Poco::Timespan& receiveTimeout);
 		/// Sets different timeouts for the HTTP session.
 
 	Poco::Timespan getTimeout() const;
 		/// Returns the timeout for the HTTP session.
 
+	void setConnectTimeout(const Poco::Timespan& timeout);
+		/// Sets the connect timeout.
+
+	Poco::Timespan getConnectTimeout() const;
+		/// Gets the connect timeout.
+
+	void setSendTimeout(const Poco::Timespan& timeout);
+		/// Sets the send timeout.
+
+	Poco::Timespan getSendTimeout() const;
+		/// Gets the send timeout.
+
+	void setReceiveTimeout(const Poco::Timespan& timeout);
+		/// Sets the receive timeout.
+
+	Poco::Timespan getReceiveTimeout() const;
+		/// Gets the receive timeout.
+
 	bool connected() const;
 		/// Returns true if the underlying socket is connected.
 
 	virtual void abort();
 		/// Aborts a session in progress by shutting down
 		/// and closing the underlying socket.
-		
+
 	const Poco::Exception* networkException() const;
 		/// If sending or receiving data over the underlying
 		/// socket connection resulted in an exception, a
 		/// pointer to this exception is returned.
-		/// 
+		///
 		/// Otherwise, NULL is returned.
 
 	void attachSessionData(const Poco::Any& data);
-		/// Allows to attach an application-specific data 
+		/// Allows to attach an application-specific data
 		/// item to the session.
 		///
 		/// On the server side, this can be used to manage
 		/// data that must be maintained over the entire
 		/// lifetime of a persistent connection (that is,
 		/// multiple requests sent over the same connection).
-	
+
 	const Poco::Any& sessionData() const;
 		/// Returns the data attached with attachSessionData(),
 		/// or an empty Poco::Any if no user data has been
@@ -93,7 +112,7 @@ public:
 	{
 		HTTP_PORT = 80
 	};
-	
+
 	StreamSocket detachSocket();
 		/// Detaches the socket from the session.
 		///
@@ -102,7 +121,7 @@ public:
 
 	StreamSocket& socket();
 		/// Returns a reference to the underlying socket.
-		
+
 	void drainBuffer(Poco::Buffer<char>& buffer);
 		/// Copies all bytes remaining in the internal buffer to the
 		/// given Poco::Buffer, resizing it as necessary.
@@ -111,6 +130,26 @@ public:
 		/// obtain any data already read from the socket, but not
 		/// yet processed.
 
+	const MessageHeader& requestTrailer() const;
+		/// Returns the trailer for a request sent using chunked
+		/// transfer encoding. This method must be called after
+		/// the entire content of the message has been read.
+
+	MessageHeader& requestTrailer();
+		/// Returns the trailer for a request sent using chunked
+		/// transfer encoding. The trailer fields to be sent must be set
+		/// before the request body has been fully written.
+
+	const MessageHeader& responseTrailer() const;
+		/// Returns the trailer for a response sent using chunked
+		/// transfer encoding. This method must be called after
+		/// the entire content of the message has been read.
+
+	MessageHeader& responseTrailer();
+		/// Returns the trailer for a response sent using chunked
+		/// transfer encoding. The trailer fields to be sent must be set
+		/// before the response body has been fully written.
+
 protected:
 	HTTPSession();
 		/// Creates a HTTP session using an
@@ -136,31 +175,31 @@ protected:
 		/// Returns the next byte in the buffer.
 		/// Reads more data from the socket if there are
 		/// no bytes left in the buffer.
-		
+
 	int peek();
 		/// Peeks at the next character in the buffer.
 		/// Reads more data from the socket if there are
 		/// no bytes left in the buffer.
-		
+
 	virtual int read(char* buffer, std::streamsize length);
 		/// Reads up to length bytes.
 		///
 		/// If there is data in the buffer, this data
 		/// is returned. Otherwise, data is read from
 		/// the socket to avoid unnecessary buffering.
-	
+
 	virtual int write(const char* buffer, std::streamsize length);
 		/// Writes data to the socket.
 
 	int receive(char* buffer, int length);
 		/// Reads up to length bytes.
-		
+
 	int buffered() const;
 		/// Returns the number of bytes in the buffer.
 
 	void refill();
 		/// Refills the internal buffer.
-		
+
 	virtual void connect(const SocketAddress& address);
 		/// Connects the underlying socket to the given address
 		/// and sets the socket's receive timeout.
@@ -175,7 +214,7 @@ protected:
 
 	void close();
 		/// Closes the underlying socket.
-		
+
 	void setException(const Poco::Exception& exc);
 		/// Stores a clone of the exception.
 
@@ -188,10 +227,10 @@ private:
 		HTTP_DEFAULT_TIMEOUT = 60000000,
 		HTTP_DEFAULT_CONNECTION_TIMEOUT = 30000000
 	};
-	
+
 	HTTPSession(const HTTPSession&);
 	HTTPSession& operator = (const HTTPSession&);
-	
+
 	StreamSocket     _socket;
 	char*            _pBuffer;
 	char*            _pCurrent;
@@ -201,8 +240,10 @@ private:
 	Poco::Timespan   _receiveTimeout;
 	Poco::Timespan   _sendTimeout;
 	Poco::Exception* _pException;
+	MessageHeader    _requestTrailer;
+	MessageHeader    _responseTrailer;
 	Poco::Any        _data;
-	
+
 	friend class HTTPStreamBuf;
 	friend class HTTPHeaderStreamBuf;
 	friend class HTTPFixedLengthStreamBuf;
@@ -225,6 +266,42 @@ inline Poco::Timespan HTTPSession::getTimeout() const
 }
 
 
+inline void HTTPSession::setConnectTimeout(const Poco::Timespan& timeout)
+{
+	_connectionTimeout = timeout;
+}
+
+
+inline Poco::Timespan HTTPSession::getConnectTimeout() const
+{
+	return _connectionTimeout;
+}
+
+
+inline void HTTPSession::setSendTimeout(const Poco::Timespan& timeout)
+{
+	_sendTimeout = timeout;
+}
+
+
+inline Poco::Timespan HTTPSession::getSendTimeout() const
+{
+	return _sendTimeout;
+}
+
+
+inline void HTTPSession::setReceiveTimeout(const Poco::Timespan& timeout)
+{
+	_receiveTimeout = timeout;
+}
+
+
+inline Poco::Timespan HTTPSession::getReceiveTimeout() const
+{
+	return _receiveTimeout;
+}
+
+
 inline StreamSocket& HTTPSession::socket()
 {
 	return _socket;
@@ -249,6 +326,30 @@ inline const Poco::Any& HTTPSession::sessionData() const
 }
 
 
+inline const MessageHeader& HTTPSession::requestTrailer() const
+{
+	return _requestTrailer;
+}
+
+
+inline MessageHeader& HTTPSession::requestTrailer()
+{
+	return _requestTrailer;
+}
+
+
+inline const MessageHeader& HTTPSession::responseTrailer() const
+{
+	return _responseTrailer;
+}
+
+
+inline MessageHeader& HTTPSession::responseTrailer()
+{
+	return _responseTrailer;
+}
+
+
 } } // namespace Poco::Net
 
 
diff --git a/Net/include/Poco/Net/HTTPStream.h b/Net/include/Poco/Net/HTTPStream.h
index c365bb732..2837c24cf 100644
--- a/Net/include/Poco/Net/HTTPStream.h
+++ b/Net/include/Poco/Net/HTTPStream.h
@@ -43,7 +43,7 @@ public:
 	HTTPStreamBuf(HTTPSession& session, openmode mode);
 	~HTTPStreamBuf();
 	void close();
-	
+
 protected:
 	int readFromDevice(char* buffer, std::streamsize length);
 	int writeToDevice(const char* buffer, std::streamsize length);
@@ -76,7 +76,7 @@ public:
 
 	void* operator new(std::size_t size);
 	void operator delete(void* ptr);
-	
+
 private:
 	static Poco::MemoryPool _pool;
 };
@@ -91,7 +91,7 @@ public:
 
 	void* operator new(std::size_t size);
 	void operator delete(void* ptr);
-	
+
 private:
 	static Poco::MemoryPool _pool;
 };
diff --git a/Net/include/Poco/Net/HTTPStreamFactory.h b/Net/include/Poco/Net/HTTPStreamFactory.h
index df4a5f333..05beaab3a 100644
--- a/Net/include/Poco/Net/HTTPStreamFactory.h
+++ b/Net/include/Poco/Net/HTTPStreamFactory.h
@@ -49,7 +49,7 @@ public:
 
 	virtual ~HTTPStreamFactory();
 		/// Destroys the HTTPStreamFactory.
-		
+
 	virtual std::istream* open(const Poco::URI& uri);
 		/// Creates and opens a HTTP stream for the given URI.
 		/// The URI must be a http://... URI.
@@ -60,25 +60,25 @@ public:
 		/// location is automatically resolved, as long
 		/// as the redirect location is still accessible
 		/// via the HTTP protocol. If a redirection to
-		/// a non http://... URI is received, a 
+		/// a non http://... URI is received, a
 		/// UnsupportedRedirectException exception is thrown.
 		/// The offending URI can then be obtained via the message()
 		/// method of UnsupportedRedirectException.
-		
+
 	static void registerFactory();
 		/// Registers the HTTPStreamFactory with the
-		/// default URIStreamOpener instance.	
+		/// default URIStreamOpener instance.
 
 	static void unregisterFactory();
 		/// Unregisters the HTTPStreamFactory with the
-		/// default URIStreamOpener instance.	
-		
+		/// default URIStreamOpener instance.
+
 private:
 	enum
 	{
 		MAX_REDIRECTS = 10
 	};
-	
+
 	std::string  _proxyHost;
 	Poco::UInt16 _proxyPort;
 	std::string  _proxyUsername;
diff --git a/Net/include/Poco/Net/HostEntry.h b/Net/include/Poco/Net/HostEntry.h
index e07d63924..f194ca659 100644
--- a/Net/include/Poco/Net/HostEntry.h
+++ b/Net/include/Poco/Net/HostEntry.h
@@ -36,10 +36,10 @@ class Net_API HostEntry
 public:
 	using AliasList = std::vector<std::string>;
 	using AddressList = std::vector<IPAddress>;
-	
+
 	HostEntry();
 		/// Creates an empty HostEntry.
-		
+
 	HostEntry(struct hostent* entry);
 		/// Creates the HostEntry from the data in a hostent structure.
 
@@ -58,8 +58,8 @@ public:
 	HostEntry& operator = (const HostEntry& entry);
 		/// Assigns another HostEntry.
 
-	void swap(HostEntry& hostEntry);
-		/// Swaps the HostEntry with another one.	
+	void swap(HostEntry& hostEntry) noexcept;
+		/// Swaps the HostEntry with another one.
 
 	~HostEntry();
 		/// Destroys the HostEntry.
@@ -111,7 +111,7 @@ inline const HostEntry::AddressList& HostEntry::addresses() const
 }
 
 
-inline void swap(HostEntry& h1, HostEntry& h2)
+inline void swap(HostEntry& h1, HostEntry& h2) noexcept
 {
 	h1.swap(h2);
 }
diff --git a/Net/include/Poco/Net/ICMPClient.h b/Net/include/Poco/Net/ICMPClient.h
index 31867629b..cc421b451 100644
--- a/Net/include/Poco/Net/ICMPClient.h
+++ b/Net/include/Poco/Net/ICMPClient.h
@@ -34,7 +34,7 @@ class Net_API ICMPClient
 	///
 	/// The events are available when class is instantiated
 	///	and non-static member functions are called.
-	/// 
+	///
 	///	A "lightweight" alternative is direct (without instantiation)
 	///	use of static member functions.
 {
@@ -53,13 +53,13 @@ public:
 	int ping(SocketAddress& address, int repeat = 1) const;
 		/// Pings the specified address [repeat] times.
 		/// Notifications are posted for events.
-		/// 
+		///
 		/// Returns the number of valid replies.
 
 	int ping(const std::string& address, int repeat = 1) const;
 		/// Calls ICMPClient::ping(SocketAddress&, int) and
 		/// returns the result.
-		/// 
+		///
 		/// Returns the number of valid replies.
 
 	static int ping(SocketAddress& address,
@@ -70,7 +70,7 @@ public:
 		int timeout = 100000);
 		/// Pings the specified address [repeat] times.
 		/// Notifications are not posted for events.
-		/// 
+		///
 		/// Returns the number of valid replies.
 
 	static int pingIPv4(const std::string& address,
@@ -80,7 +80,7 @@ public:
 		int timeout = 100000);
 		/// Calls ICMPClient::ping(SocketAddress&, int) and
 		/// returns the result.
-		/// 
+		///
 		/// Returns the number of valid replies.
 
 private:
diff --git a/Net/include/Poco/Net/ICMPEventArgs.h b/Net/include/Poco/Net/ICMPEventArgs.h
index 2a663eb32..b846b3020 100644
--- a/Net/include/Poco/Net/ICMPEventArgs.h
+++ b/Net/include/Poco/Net/ICMPEventArgs.h
@@ -31,7 +31,7 @@ namespace Net {
 class Net_API ICMPEventArgs
 	/// The purpose of the ICMPEventArgs class is to be used as template parameter
 	/// to instantiate event members in ICMPClient class.
-	/// When clients register for an event notification, the reference to the class is 
+	/// When clients register for an event notification, the reference to the class is
 	///	passed to the handler function to provide information about the event.
 {
 public:
@@ -43,7 +43,7 @@ public:
 
 	std::string hostName() const;
 		/// Tries to resolve the target IP address into host name.
-		/// If unsuccessful, all exceptions are silently ignored and 
+		/// If unsuccessful, all exceptions are silently ignored and
 		///	the IP address is returned.
 
 	std::string hostAddress() const;
diff --git a/Net/include/Poco/Net/ICMPPacket.h b/Net/include/Poco/Net/ICMPPacket.h
index 2ded61b27..d98a5330d 100644
--- a/Net/include/Poco/Net/ICMPPacket.h
+++ b/Net/include/Poco/Net/ICMPPacket.h
@@ -28,7 +28,7 @@ namespace Net {
 
 
 class Net_API ICMPPacket
-	/// This class is the ICMP packet abstraction. 
+	/// This class is the ICMP packet abstraction.
 {
 public:
 	ICMPPacket(SocketAddress::Family family, int dataSize = 48);
@@ -57,13 +57,13 @@ public:
 
 	struct timeval time(Poco::UInt8* buffer = 0, int length = 0) const;
 		/// Returns current epoch time if either buffer or length are equal to zero.
-		/// Otherwise, it extracts the time value from the supplied buffer and 
+		/// Otherwise, it extracts the time value from the supplied buffer and
 		/// returns the extracted value.
 		///
 		/// Supplied buffer includes IP header, ICMP header and data.
 
 	bool validReplyID(Poco::UInt8* buffer, int length) const;
-		/// Returns true if the extracted id is recognized 
+		/// Returns true if the extracted id is recognized
 		/// (equals the process id).
 		///
 		/// Supplied buffer includes IP header, ICMP header and data.
diff --git a/Net/include/Poco/Net/ICMPSocket.h b/Net/include/Poco/Net/ICMPSocket.h
index aef888520..ca2e38b22 100644
--- a/Net/include/Poco/Net/ICMPSocket.h
+++ b/Net/include/Poco/Net/ICMPSocket.h
@@ -51,7 +51,7 @@ public:
 		///
 		/// Releases the socket's SocketImpl and
 		/// attaches the SocketImpl from the other socket and
-		/// increments the reference count of the SocketImpl.	
+		/// increments the reference count of the SocketImpl.
 
 	int sendTo(const SocketAddress& address, int flags = 0);
 		/// Sends an ICMP request through
@@ -63,7 +63,7 @@ public:
 		/// Receives data from the socket.
 		/// Stores the address of the sender in address.
 		///
-		/// Returns the time elapsed since the originating 
+		/// Returns the time elapsed since the originating
 		/// request was sent.
 
 	int dataSize() const;
diff --git a/Net/include/Poco/Net/ICMPSocketImpl.h b/Net/include/Poco/Net/ICMPSocketImpl.h
index 4d6d9b903..639e614e9 100644
--- a/Net/include/Poco/Net/ICMPSocketImpl.h
+++ b/Net/include/Poco/Net/ICMPSocketImpl.h
@@ -41,7 +41,7 @@ public:
 		/// Sends an ICMP request through the socket to the given address.
 		///
 		/// Returns the number of bytes sent.
-	
+
 	int receiveFrom(void*, int, SocketAddress& address, int flags = 0);
 		/// Receives data from the socket.
 		/// Stores the address of the sender in address.
diff --git a/Net/include/Poco/Net/IPAddress.h b/Net/include/Poco/Net/IPAddress.h
index e993f42c3..3858ab5ee 100644
--- a/Net/include/Poco/Net/IPAddress.h
+++ b/Net/include/Poco/Net/IPAddress.h
@@ -43,7 +43,7 @@ class Net_API IPAddress
 	///
 	/// Relational operators (==, !=, <, <=, >, >=) are
 	/// supported. However, you must not interpret any
-	/// special meaning into the result of these 
+	/// special meaning into the result of these
 	/// operations, other than that the results are
 	/// consistent.
 	///
@@ -72,7 +72,7 @@ public:
 #if defined(POCO_HAVE_IPv6)
 	static const Family IPv6 = AddressFamily::IPv6;
 #endif
-	
+
 	IPAddress();
 		/// Creates a wildcard (zero) IPv4 IPAddress.
 
@@ -90,7 +90,7 @@ public:
 		/// Creates an IPAddress from the string containing
 		/// an IP address in presentation format (dotted decimal
 		/// for IPv4, hex string for IPv6).
-		/// 
+		///
 		/// Depending on the format of addr, either an IPv4 or
 		/// an IPv6 address is created.
 		///
@@ -105,12 +105,12 @@ public:
 
 	IPAddress(const void* addr, poco_socklen_t length);
 		/// Creates an IPAddress from a native internet address.
-		/// A pointer to a in_addr or a in6_addr structure may be 
+		/// A pointer to a in_addr or a in6_addr structure may be
 		/// passed.
 
 	IPAddress(const void* addr, poco_socklen_t length, Poco::UInt32 scope);
 		/// Creates an IPAddress from a native internet address.
-		/// A pointer to a in_addr or a in6_addr structure may be 
+		/// A pointer to a in_addr or a in6_addr structure may be
 		/// passed. Additionally, for an IPv6 address, a scope ID
 		/// may be specified. The scope ID will be ignored if an IPv4
 		/// address is specified.
@@ -159,23 +159,23 @@ public:
 		///
 		/// Textual representation of IPv6 address is one of the following forms:
 		///
-		/// The preferred form is x:x:x:x:x:x:x:x, where the 'x's are the hexadecimal 
+		/// The preferred form is x:x:x:x:x:x:x:x, where the 'x's are the hexadecimal
 		/// values of the eight 16-bit pieces of the address. This is the full form.
 		/// Example: 1080:0:0:0:8:600:200A:425C
 		///
-		/// It is not necessary to write the leading zeros in an individual field. 
+		/// It is not necessary to write the leading zeros in an individual field.
 		/// However, there must be at least one numeral in every field, except as described below.
-		/// 
-		/// It is common for IPv6 addresses to contain long strings of zero bits. 
-		/// In order to make writing addresses containing zero bits easier, a special syntax is 
-		/// available to compress the zeros. The use of "::" indicates multiple groups of 16-bits of zeros. 
-		/// The "::" can only appear once in an address. The "::" can also be used to compress the leading 
+		///
+		/// It is common for IPv6 addresses to contain long strings of zero bits.
+		/// In order to make writing addresses containing zero bits easier, a special syntax is
+		/// available to compress the zeros. The use of "::" indicates multiple groups of 16-bits of zeros.
+		/// The "::" can only appear once in an address. The "::" can also be used to compress the leading
 		/// and/or trailing zeros in an address. Example: 1080::8:600:200A:425C
 		///
 		/// For dealing with IPv4 compatible addresses in a mixed environment,
-		/// a special syntax is available: x:x:x:x:x:x:d.d.d.d, where the 'x's are the 
-		/// hexadecimal values of the six high-order 16-bit pieces of the address, 
-		/// and the 'd's are the decimal values of the four low-order 8-bit pieces of the 
+		/// a special syntax is available: x:x:x:x:x:x:d.d.d.d, where the 'x's are the
+		/// hexadecimal values of the six high-order 16-bit pieces of the address,
+		/// and the 'd's are the decimal values of the four low-order 8-bit pieces of the
 		/// standard IPv4 representation address. Example: ::FFFF:192.168.1.120
 		///
 		/// If an IPv6 address contains a non-zero scope identifier, it is added
@@ -183,11 +183,11 @@ public:
 		/// the numeric value (which specifies an interface index) is directly
 		/// appended. On Unix platforms, the name of the interface corresponding
 		/// to the index (interpretation of the scope identifier) is added.
-	
+
 	bool isWildcard() const;
 		/// Returns true iff the address is a wildcard (all zero)
 		/// address.
-		
+
 	bool isBroadcast() const;
 		/// Returns true iff the address is a broadcast address.
 		///
@@ -195,14 +195,14 @@ public:
 		/// address, all bits are one.
 		///
 		/// For an IPv6 address, returns always false.
-	
+
 	bool isLoopback() const;
 		/// Returns true iff the address is a loopback address.
 		///
 		/// For IPv4, the loopback address is 127.0.0.1.
 		///
 		/// For IPv6, the loopback address is ::1.
-	
+
 	bool isMulticast() const;
 		/// Returns true iff the address is a multicast address.
 		///
@@ -212,13 +212,13 @@ public:
 		///
 		/// IPv6 multicast addresses are in the
 		/// FFxx:x:x:x:x:x:x:x range.
-		
+
 	bool isUnicast() const;
 		/// Returns true iff the address is a unicast address.
 		///
 		/// An address is unicast if it is neither a wildcard,
 		/// broadcast or multicast address.
-		
+
 	bool isLinkLocal() const;
 		/// Returns true iff the address is a link local unicast address.
 		///
@@ -227,18 +227,18 @@ public:
 		///
 		/// IPv6 link local addresses have 1111 1110 10 as the first
 		/// 10 bits, followed by 54 zeros.
-		
+
 	bool isSiteLocal() const;
 		/// Returns true iff the address is a site local unicast address.
 		///
 		/// IPv4 site local addresses are in on of the 10.0.0.0/24,
 		/// 192.168.0.0/16 or 172.16.0.0 to 172.31.255.255 ranges.
 		///
-		/// Originally, IPv6 site-local addresses had FEC0/10 (1111 1110 11) 
-		/// prefix (RFC 4291), followed by 38 zeros. Interfaces using  
+		/// Originally, IPv6 site-local addresses had FEC0/10 (1111 1110 11)
+		/// prefix (RFC 4291), followed by 38 zeros. Interfaces using
 		/// this mask are supported, but obsolete; RFC 4193 prescribes
 		/// fc00::/7 (1111 110) as local unicast prefix.
-		
+
 	bool isIPv4Compatible() const;
 		/// Returns true iff the address is IPv4 compatible.
 		///
@@ -253,16 +253,16 @@ public:
 		/// For IPv4 addresses, this is always true.
 		///
 		/// For IPv6, the address must be in the ::FFFF:x:x range.
-	
+
 	bool isWellKnownMC() const;
 		/// Returns true iff the address is a well-known multicast address.
 		///
-		/// For IPv4, well-known multicast addresses are in the 
+		/// For IPv4, well-known multicast addresses are in the
 		/// 224.0.0.0/8 range.
 		///
-		/// For IPv6, well-known multicast addresses are in the 
+		/// For IPv6, well-known multicast addresses are in the
 		/// FF0x:x:x:x:x:x:x:x range.
-	
+
 	bool isNodeLocalMC() const;
 		/// Returns true iff the address is a node-local multicast address.
 		///
@@ -271,7 +271,7 @@ public:
 		///
 		/// For IPv6, node-local multicast addresses are in the
 		/// FFx1:x:x:x:x:x:x:x range.
-	
+
 	bool isLinkLocalMC() const;
 		/// Returns true iff the address is a link-local multicast address.
 		///
@@ -303,13 +303,13 @@ public:
 	bool isGlobalMC() const;
 		/// Returns true iff the address is a global multicast address.
 		///
-		/// For IPv4, global multicast addresses are in the 
+		/// For IPv4, global multicast addresses are in the
 		/// 224.0.1.0 to 238.255.255.255 range.
 		///
 		/// For IPv6, global multicast addresses are in the
 		/// FFxF:x:x:x:x:x:x:x range.
-	
-	bool operator == (const IPAddress& addr) const;	
+
+	bool operator == (const IPAddress& addr) const;
 	bool operator != (const IPAddress& addr) const;
 	bool operator <  (const IPAddress& addr) const;
 	bool operator <= (const IPAddress& addr) const;
@@ -319,36 +319,36 @@ public:
 	IPAddress operator | (const IPAddress& addr) const;
 	IPAddress operator ^ (const IPAddress& addr) const;
 	IPAddress operator ~ () const;
-		
+
 	poco_socklen_t length() const;
-		/// Returns the length in bytes of the internal socket address structure.	
-		
+		/// Returns the length in bytes of the internal socket address structure.
+
 	const void* addr() const;
 		/// Returns the internal address structure.
-		
+
 	int af() const;
 		/// Returns the address family (AF_INET or AF_INET6) of the address.
 
 	unsigned prefixLength() const;
 		/// Returns the prefix length.
-		
+
 	void mask(const IPAddress& mask);
 		/// Masks the IP address using the given netmask, which is usually
 		/// a IPv4 subnet mask. Only supported for IPv4 addresses.
 		///
 		/// The new address is (address & mask).
-		
+
 	void mask(const IPAddress& mask, const IPAddress& set);
 		/// Masks the IP address using the given netmask, which is usually
 		/// a IPv4 subnet mask. Only supported for IPv4 addresses.
 		///
 		/// The new address is (address & mask) | (set & ~mask).
-		
+
 	static IPAddress parse(const std::string& addr);
 		/// Creates an IPAddress from the string containing
 		/// an IP address in presentation format (dotted decimal
 		/// for IPv4, hex string for IPv6).
-		/// 
+		///
 		/// Depending on the format of addr, either an IPv4 or
 		/// an IPv6 address is created.
 		///
@@ -368,13 +368,13 @@ public:
 
 	static IPAddress wildcard(Family family = IPv4);
 		/// Returns a wildcard IPv4 or IPv6 address (0.0.0.0).
-		
+
 	static IPAddress broadcast();
 		/// Returns a broadcast IPv4 address (255.255.255.255).
 
 	enum
 	{
-		MAX_ADDRESS_LENGTH = 
+		MAX_ADDRESS_LENGTH =
 #if defined(POCO_HAVE_IPv6)
 			sizeof(struct in6_addr)
 #else
diff --git a/Net/include/Poco/Net/IPAddressImpl.h b/Net/include/Poco/Net/IPAddressImpl.h
index 17843556e..4cd6f4076 100644
--- a/Net/include/Poco/Net/IPAddressImpl.h
+++ b/Net/include/Poco/Net/IPAddressImpl.h
@@ -33,7 +33,7 @@ class IPAddressImpl : public Poco::RefCountedObject
 {
 public:
 	using Family = AddressFamily::Family;
-	
+
 	virtual ~IPAddressImpl();
 
 	virtual IPAddressImpl* clone() const = 0;
@@ -112,7 +112,7 @@ public:
 	bool operator == (const IPv4AddressImpl& addr) const;
 	bool operator != (const IPv4AddressImpl& addr) const;
 
-private:	
+private:
 	struct in_addr _addr;
 };
 
diff --git a/Net/include/Poco/Net/MailRecipient.h b/Net/include/Poco/Net/MailRecipient.h
index 7b146141a..30d8442a6 100644
--- a/Net/include/Poco/Net/MailRecipient.h
+++ b/Net/include/Poco/Net/MailRecipient.h
@@ -43,10 +43,10 @@ public:
 
 	MailRecipient();
 		/// Creates an empty MailRecipient.
-		
+
 	MailRecipient(const MailRecipient& recipient);
 		/// Creates a MailRecipient by copying another one.
-		
+
 	MailRecipient(RecipientType type, const std::string& address);
 		/// Creates a MailRecipient of the given type.
 
@@ -55,28 +55,28 @@ public:
 
 	~MailRecipient();
 		/// Destroys the MailRecipient.
-		
+
 	MailRecipient& operator = (const MailRecipient& recipient);
 		/// Assigns another recipient.
-		
-	void swap(MailRecipient& recipient);
+
+	void swap(MailRecipient& recipient) noexcept;
 		/// Exchanges the content of two recipients.
 
 	RecipientType getType() const;
 		/// Returns the type of the recipient.
-		
+
 	void setType(RecipientType type);
 		/// Sets the type of the recipient.
-		
+
 	const std::string& getAddress() const;
 		/// Returns the address of the recipient.
-		
+
 	void setAddress(const std::string& address);
 		/// Sets the address of the recipient.
-		
+
 	const std::string& getRealName() const;
 		/// Returns the real name of the recipient.
-		
+
 	void setRealName(const std::string& realName);
 		/// Sets the real name of the recipient.
 
@@ -108,7 +108,7 @@ inline const std::string& MailRecipient::getRealName() const
 }
 
 
-inline void swap(MailRecipient& r1, MailRecipient& r2)
+inline void swap(MailRecipient& r1, MailRecipient& r2) noexcept
 {
 	r1.swap(r2);
 }
diff --git a/Net/include/Poco/Net/MailStream.h b/Net/include/Poco/Net/MailStream.h
index bc674b014..e6500cd7c 100644
--- a/Net/include/Poco/Net/MailStream.h
+++ b/Net/include/Poco/Net/MailStream.h
@@ -29,7 +29,7 @@ namespace Net {
 
 
 class Net_API MailStreamBuf: public Poco::UnbufferedStreamBuf
-	/// The sole purpose of this stream buffer is to replace 
+	/// The sole purpose of this stream buffer is to replace
 	/// a "\r\n.\r\n" character sequence with a "\r\n..\r\n" sequence for
 	/// output streams and vice-versa for input streams.
 	///
@@ -50,11 +50,11 @@ public:
 
 	~MailStreamBuf();
 		/// Destroys the MailStreamBuf.
-		
+
 	void close();
 		/// Writes the terminating period, followed by
 		/// CR-LF.
-		
+
 protected:
 	int readFromDevice();
 	int writeToDevice(char c);
@@ -71,7 +71,7 @@ private:
 		ST_CR_LF_DOT_CR,
 		ST_CR_LF_DOT_CR_LF
 	};
-	
+
 	std::istream* _pIstr;
 	std::ostream* _pOstr;
 	std::string   _buffer;
@@ -82,7 +82,7 @@ private:
 class Net_API MailIOS: public virtual std::ios
 	/// The base class for MailInputStream and MailOutputStream.
 	///
-	/// This class provides common methods and is also needed to ensure 
+	/// This class provides common methods and is also needed to ensure
 	/// the correct initialization order of the stream buffer and base classes.
 {
 public:
diff --git a/Net/include/Poco/Net/MediaType.h b/Net/include/Poco/Net/MediaType.h
index 08f3eeaf3..f08e32339 100644
--- a/Net/include/Poco/Net/MediaType.h
+++ b/Net/include/Poco/Net/MediaType.h
@@ -37,7 +37,7 @@ public:
 	MediaType(const std::string& mediaType);
 		/// Creates the MediaType from the given string, which
 		/// must have the format <type>/<subtype>{;<parameter>=<value>}.
-		
+
 	MediaType(const std::string& type, const std::string& subType);
 		/// Creates the MediaType, using the given type and subtype.
 
@@ -55,51 +55,51 @@ public:
 
 	MediaType& operator = (MediaType&& mediaType) noexcept;
 		/// Assigns another media type.
-		
+
 	MediaType& operator = (const std::string& mediaType);
 		/// Assigns another media type.
-		
-	void swap(MediaType& mediaType);
+
+	void swap(MediaType& mediaType) noexcept;
 		/// Swaps the MediaType with another one.
-		
+
 	void setType(const std::string& type);
 		/// Sets the top-level type.
-		
+
 	const std::string& getType() const;
 		/// Returns the top-level type.
-		
+
 	void setSubType(const std::string& subType);
 		/// Sets the sub type.
-		
+
 	const std::string& getSubType() const;
 		/// Returns the sub type.
-		
+
 	void setParameter(const std::string& name, const std::string& value);
 		/// Sets the parameter with the given name.
-		
+
 	const std::string& getParameter(const std::string& name) const;
 		/// Returns the parameter with the given name.
 		///
 		/// Throws a NotFoundException if the parameter does not exist.
-		
+
 	bool hasParameter(const std::string& name) const;
 		/// Returns true iff a parameter with the given name exists.
-		
+
 	void removeParameter(const std::string& name);
-		/// Removes the parameter with the given name.	
-		
+		/// Removes the parameter with the given name.
+
 	const NameValueCollection& parameters() const;
 		/// Returns the parameters.
-		
+
 	std::string toString() const;
 		/// Returns the string representation of the media type
 		/// which is <type>/<subtype>{;<parameter>=<value>}
-		
+
 	bool matches(const MediaType& mediaType) const;
 		/// Returns true iff the type and subtype match
 		/// the type and subtype of the given media type.
 		/// Matching is case insensitive.
-		
+
 	bool matches(const std::string& type, const std::string& subType) const;
 		/// Returns true iff the type and subtype match
 		/// the given type and subtype.
@@ -132,10 +132,10 @@ public:
 
 protected:
 	void parse(const std::string& mediaType);
-		
+
 private:
 	MediaType();
-	
+
 	std::string         _type;
 	std::string         _subType;
 	NameValueCollection _parameters;
@@ -163,7 +163,7 @@ inline const NameValueCollection& MediaType::parameters() const
 }
 
 
-inline void swap(MediaType& m1, MediaType& m2)
+inline void swap(MediaType& m1, MediaType& m2) noexcept
 {
 	m1.swap(m2);
 }
diff --git a/Net/include/Poco/Net/MessageHeader.h b/Net/include/Poco/Net/MessageHeader.h
index f36ad51e6..2500b2bb9 100644
--- a/Net/include/Poco/Net/MessageHeader.h
+++ b/Net/include/Poco/Net/MessageHeader.h
@@ -35,7 +35,7 @@ class Net_API MessageHeader: public NameValueCollection
 	///
 	/// The name is case-insensitive.
 	///
-	/// There can be more than one name-value pair with the 
+	/// There can be more than one name-value pair with the
 	/// same name.
 	///
 	/// MessageHeader supports writing and reading the
@@ -67,9 +67,9 @@ public:
 		///
 		/// The format is one name-value pair per line, with
 		/// name and value separated by a colon and lines
-		/// delimited by a carriage return and a linefeed 
+		/// delimited by a carriage return and a linefeed
 		/// character. See RFC 2822 for details.
-		
+
 	virtual void read(std::istream& istr);
 		/// Reads the message header from the given input stream.
 		///
@@ -86,13 +86,13 @@ public:
 		///
 		/// Throws a MessageException if the input stream is
 		/// malformed.
-		
+
 	int getFieldLimit() const;
 		/// Returns the maximum number of header fields
 		/// allowed.
 		///
 		/// See setFieldLimit() for more information.
-		
+
 	void setFieldLimit(int limit);
 		/// Sets the maximum number of header fields
 		/// allowed. This limit is used to defend certain
@@ -100,7 +100,27 @@ public:
 		/// Specify 0 for unlimited (not recommended).
 		///
 		/// The default limit is 100.
-	
+
+	int getNameLengthLimit() const;
+		/// Returns the maximum length of a field name.
+		///
+		/// See setNameLengthLimit() for more information.
+
+	void setNameLengthLimit(int limit);
+		/// Sets the maximum length of a field name.
+		///
+		/// The default limit is 256.
+
+	int getValueLengthLimit() const;
+		/// Returns the maximum length of a field value.
+		///
+		/// See setValueLengthLimit() for more information.
+
+	void setValueLengthLimit(int limit);
+		/// Sets the maximum length of a field value.
+		///
+		/// The default limit is 8192.
+
 	bool hasToken(const std::string& fieldName, const std::string& token) const;
 		/// Returns true iff the field with the given fieldName contains
 		/// the given token. Tokens in a header field are expected to be
@@ -110,7 +130,7 @@ public:
 		/// Splits the given string into separate elements. Elements are expected
 		/// to be separated by commas.
 		///
-		/// For example, the string 
+		/// For example, the string
 		///   text/plain; q=0.5, text/html, text/x-dvi; q=0.8
 		/// is split into the elements
 		///   text/plain; q=0.5
@@ -120,7 +140,7 @@ public:
 		/// Commas enclosed in double quotes do not split elements.
 		///
 		/// If ignoreEmpty is true, empty elements are not returned.
-		
+
 	static void splitParameters(const std::string& s, std::string& value, NameValueCollection& parameters);
 		/// Splits the given string into a value and a collection of parameters.
 		/// Parameters are expected to be separated by semicolons.
@@ -144,22 +164,25 @@ public:
 		/// Checks if the value must be quoted. If so, the value is
 		/// appended to result, enclosed in double-quotes.
 		/// Otherwise, the value is appended to result as-is.
-		
+
 	static void decodeRFC2047(const std::string& ins, std::string& outs, const std::string& charset = "UTF-8");
 	static std::string decodeWord(const std::string& text, const std::string& charset = "UTF-8");
 	        /// Decode RFC2047 string.
 
-		
+
 private:
 	enum Limits
 		/// Limits for basic sanity checks when reading a header
 	{
-		MAX_NAME_LENGTH  = 256,
-		MAX_VALUE_LENGTH = 8192,
-		DFL_FIELD_LIMIT  = 100
+		DFL_NAME_LENGTH_LIMIT  = 256,
+		DFL_VALUE_LENGTH_LIMIT = 8192,
+		DFL_FIELD_LIMIT = 100
 	};
-	
+
 	int _fieldLimit;
+	int _nameLengthLimit;
+	int _valueLengthLimit;
+
 };
 
 
diff --git a/Net/include/Poco/Net/MulticastSocket.h b/Net/include/Poco/Net/MulticastSocket.h
index 6ae465775..0bc4f4a1d 100644
--- a/Net/include/Poco/Net/MulticastSocket.h
+++ b/Net/include/Poco/Net/MulticastSocket.h
@@ -47,7 +47,7 @@ public:
 		/// Notice: The behavior of this constructor has changed
 		/// in release 2.0. Previously, the constructor created
 		/// an unbound IPv4 multicast socket.
-		
+
 	explicit MulticastSocket(SocketAddress::Family family);
 		/// Creates an unconnected datagram socket.
 		///
@@ -107,7 +107,7 @@ public:
 
 	unsigned getTimeToLive() const;
 		/// Returns the TTL/hop limit for outgoing packets.
-		
+
 	void joinGroup(const IPAddress& groupAddress);
 		/// Joins the specified multicast group at the default interface.
 
diff --git a/Net/include/Poco/Net/MultipartReader.h b/Net/include/Poco/Net/MultipartReader.h
index 5f972dcba..c025065f2 100644
--- a/Net/include/Poco/Net/MultipartReader.h
+++ b/Net/include/Poco/Net/MultipartReader.h
@@ -37,12 +37,12 @@ public:
 	MultipartStreamBuf(std::istream& istr, const std::string& boundary);
 	~MultipartStreamBuf();
 	bool lastPart() const;
-	
+
 protected:
 	int readFromDevice(char* buffer, std::streamsize length);
 
 private:
-	enum 
+	enum
 	{
 		STREAM_BUFFER_SIZE = 1024
 	};
@@ -98,7 +98,7 @@ class Net_API MultipartReader
 public:
 	explicit MultipartReader(std::istream& istr);
 		/// Creates the MultipartReader and attaches it to the
-		/// given input stream. 
+		/// given input stream.
 		///
 		/// The boundary string is determined from the input
 		/// stream. The message must not contain a preamble
@@ -119,13 +119,13 @@ public:
 		/// Throws an MultipartException if there are no more parts
 		/// available, or if no boundary line can be found in
 		/// the input stream.
-		
+
 	bool hasNextPart();
 		/// Returns true iff more parts are available.
 		///
 		/// Before the first call to nextPart(), returns
 		/// always true.
-		
+
 	std::istream& stream() const;
 		/// Returns a reference to the reader's stream that
 		/// can be used to read the current part.
@@ -142,7 +142,7 @@ protected:
 	void guessBoundary();
 	void parseHeader(MessageHeader& messageHeader);
 	bool readLine(std::string& line, std::string::size_type n);
-	
+
 private:
 	MultipartReader();
 	MultipartReader(const MultipartReader&);
diff --git a/Net/include/Poco/Net/MultipartWriter.h b/Net/include/Poco/Net/MultipartWriter.h
index 97b3fd235..cfd37bd4b 100644
--- a/Net/include/Poco/Net/MultipartWriter.h
+++ b/Net/include/Poco/Net/MultipartWriter.h
@@ -40,7 +40,7 @@ class Net_API MultipartWriter
 	/// a MultipartWriter object.
 	/// Then, for each part, call nextPart() and
 	/// write the content to the output stream.
-	/// Repeat for all parts. 
+	/// Repeat for all parts.
 	/// After the last part has been written,
 	/// call close() to finish the multipart message.
 {
@@ -57,12 +57,12 @@ public:
 
 	~MultipartWriter();
 		/// Destroys the MultipartWriter.
-		
+
 	void nextPart(const MessageHeader& header);
 		/// Opens a new message part and writes
 		/// the message boundary string, followed
 		/// by the message header to the stream.
-		
+
 	void close();
 		/// Closes the multipart message and writes
 		/// the terminating boundary string.
@@ -82,7 +82,7 @@ public:
 		/// MIME_boundary_XXXXXXXXXXXX, where
 		/// XXXXXXXXXXXX is a random hexadecimal
 		/// number.
-		
+
 private:
 	MultipartWriter();
 	MultipartWriter(const MultipartWriter&);
diff --git a/Net/include/Poco/Net/NTPClient.h b/Net/include/Poco/Net/NTPClient.h
index 044a486a7..f7d60d477 100644
--- a/Net/include/Poco/Net/NTPClient.h
+++ b/Net/include/Poco/Net/NTPClient.h
@@ -43,13 +43,13 @@ public:
 	int request(SocketAddress& address) const;
 		/// Request the time from the server at address.
 		/// Notifications are posted for events.
-		/// 
+		///
 		/// Returns the number of valid replies.
 
 	int request(const std::string& address) const;
 		/// Request the time from the server at address.
 		/// Notifications are posted for events.
-		/// 
+		///
 		/// Returns the number of valid replies.
 
 private:
diff --git a/Net/include/Poco/Net/NTPEventArgs.h b/Net/include/Poco/Net/NTPEventArgs.h
index 89c12751c..2593467ed 100644
--- a/Net/include/Poco/Net/NTPEventArgs.h
+++ b/Net/include/Poco/Net/NTPEventArgs.h
@@ -30,7 +30,7 @@ namespace Net {
 class Net_API NTPEventArgs
 	/// The purpose of the NTPEventArgs class is to be used as template parameter
 	/// to instantiate event members in NTPClient class.
-	/// When clients register for an event notification, the reference to the class is 
+	/// When clients register for an event notification, the reference to the class is
 	///	passed to the handler function to provide information about the event.
 {
 public:
@@ -42,7 +42,7 @@ public:
 
 	std::string hostName() const;
 		/// Tries to resolve the target IP address into host name.
-		/// If unsuccessful, all exceptions are silently ignored and 
+		/// If unsuccessful, all exceptions are silently ignored and
 		///	the IP address is returned.
 
 	std::string hostAddress() const;
diff --git a/Net/include/Poco/Net/NTPPacket.h b/Net/include/Poco/Net/NTPPacket.h
index 4dae34788..c2a9d261d 100644
--- a/Net/include/Poco/Net/NTPPacket.h
+++ b/Net/include/Poco/Net/NTPPacket.h
@@ -27,7 +27,7 @@ namespace Net {
 
 
 class Net_API NTPPacket
-	/// This class is the NTP packet abstraction. 
+	/// This class is the NTP packet abstraction.
 {
 public:
 	NTPPacket();
diff --git a/Net/include/Poco/Net/NameValueCollection.h b/Net/include/Poco/Net/NameValueCollection.h
index a2219afa8..bd1993a5a 100644
--- a/Net/include/Poco/Net/NameValueCollection.h
+++ b/Net/include/Poco/Net/NameValueCollection.h
@@ -34,14 +34,14 @@ class Net_API NameValueCollection
 	///
 	/// The name is case-insensitive.
 	///
-	/// There can be more than one name-value pair with the 
+	/// There can be more than one name-value pair with the
 	/// same name.
 {
 public:
 	using HeaderMap = Poco::ListMap<std::string, std::string>;
 	using Iterator = HeaderMap::Iterator;
 	using ConstIterator = HeaderMap::ConstIterator;
-	
+
 	NameValueCollection();
 		/// Creates an empty NameValueCollection.
 
@@ -59,21 +59,21 @@ public:
 
 	NameValueCollection& operator = (NameValueCollection&& nvc) noexcept;
 		/// Moves the name-value pairs of another NameValueCollection to this one.
-		
-	void swap(NameValueCollection& nvc);
+
+	void swap(NameValueCollection& nvc) noexcept;
 		/// Swaps the NameValueCollection with another one.
-		
+
 	const std::string& operator [] (const std::string& name) const;
 		/// Returns the value of the (first) name-value pair with the given name.
 		///
 		/// Throws a NotFoundException if the name-value pair does not exist.
-		
-	void set(const std::string& name, const std::string& value);	
+
+	void set(const std::string& name, const std::string& value);
 		/// Sets the value of the (first) name-value pair with the given name.
-		
+
 	void add(const std::string& name, const std::string& value);
 		/// Adds a new name-value pair with the given name and value.
-		
+
 	const std::string& get(const std::string& name) const;
 		/// Returns the value of the first name-value pair with the given name.
 		///
@@ -90,15 +90,15 @@ public:
 	ConstIterator find(const std::string& name) const;
 		/// Returns an iterator pointing to the first name-value pair
 		/// with the given name.
-		
+
 	ConstIterator begin() const;
 		/// Returns an iterator pointing to the begin of
 		/// the name-value pair collection.
-		
+
 	ConstIterator end() const;
-		/// Returns an iterator pointing to the end of 
+		/// Returns an iterator pointing to the end of
 		/// the name-value pair collection.
-		
+
 	bool empty() const;
 		/// Returns true iff the header does not have any content.
 
@@ -120,7 +120,7 @@ private:
 //
 // inlines
 //
-inline void swap(NameValueCollection& nvc1, NameValueCollection& nvc2)
+inline void swap(NameValueCollection& nvc1, NameValueCollection& nvc2) noexcept
 {
 	nvc1.swap(nvc2);
 }
diff --git a/Net/include/Poco/Net/Net.h b/Net/include/Poco/Net/Net.h
index 29d795188..58e052af3 100644
--- a/Net/include/Poco/Net/Net.h
+++ b/Net/include/Poco/Net/Net.h
@@ -132,6 +132,11 @@ POCO_NET_FORCE_SYMBOL(pocoNetworkInitializer)
 #endif
 
 
+#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_WINDOWS_NT)
+	#define POCO_HAVE_FD_EPOLL 1
+#endif
+
+
 #if defined(POCO_OS_FAMILY_BSD)
 	#ifndef POCO_HAVE_FD_POLL
 		#define POCO_HAVE_FD_POLL 1
@@ -139,17 +144,4 @@ POCO_NET_FORCE_SYMBOL(pocoNetworkInitializer)
 #endif
 
 
-#if defined(POCO_OS_FAMILY_WINDOWS)
-	#ifndef POCO_HAVE_FD_POLL
-		// WSAPoll wants POLLOUT flag in order to return POLERR when there is no
-		// server on the other side. Windows default is multi-fd_set select, WSAPoll
-		// is disabled and not considered a production-grade code.
-		// see https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsapoll
-		// This is the version where the WSAPoll was (allegedly) fixed.
-		#if defined(WDK_NTDDI_VERSION) && (WDK_NTDDI_VERSION >= NTDDI_WIN10_VB)
-			//#define POCO_HAVE_FD_POLL 1
-		#endif
-	#endif
-#endif
-
 #endif // Net_Net_INCLUDED
diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h
index 17e10fdf6..1ea864425 100644
--- a/Net/include/Poco/Net/NetworkInterface.h
+++ b/Net/include/Poco/Net/NetworkInterface.h
@@ -40,18 +40,18 @@ class NetworkInterfaceImpl;
 
 class Net_API NetworkInterface
 	/// This class represents a network interface.
-	/// 
+	///
 	/// NetworkInterface is used with MulticastSocket to specify
 	/// multicast interfaces for sending and receiving multicast
 	/// messages.
-	/// 
+	///
 	/// The class also provides static member functions for
 	/// enumerating or searching network interfaces and their
 	/// respective configuration values.
 	///
 	/// On Windows, detection capabilities vary depending on the
 	/// OS version/service pack. Although the best effort is made
-	/// not to attempt access to non-existent features through a 
+	/// not to attempt access to non-existent features through a
 	/// combination of compile/runtime checks, when running binaries
 	/// compiled on a newer version of the OS on an older one
 	/// problems may occur; if possible, it is best to run
@@ -110,7 +110,7 @@ public:
 		///
 		/// The name is empty, the IP address is the wildcard
 		/// address and the index is max value of unsigned integer.
-	
+
 	NetworkInterface(const NetworkInterface& interfc);
 		/// Creates the NetworkInterface by copying another one.
 
@@ -119,28 +119,28 @@ public:
 
 	NetworkInterface& operator = (const NetworkInterface& interfc);
 		/// Assigns another NetworkInterface.
-	
+
 	bool operator < (const NetworkInterface& other) const;
 		/// Operator less-than.
-	
+
 	bool operator == (const NetworkInterface& other) const;
 		/// Operator equal. Compares interface indices.
 
-	void swap(NetworkInterface& other);
-		/// Swaps the NetworkInterface with another one.	
-		
+	void swap(NetworkInterface& other) noexcept;
+		/// Swaps the NetworkInterface with another one.
+
 	unsigned index() const;
 		/// Returns the interface OS index.
-		
+
 	const std::string& name() const;
 		/// Returns the interface name.
-		
+
 	const std::string& displayName() const;
 		/// Returns the interface display name.
 		///
 		/// On Windows platforms, this is currently the network adapter
 		/// name. This may change to the "friendly name" of the network
-		/// connection in a future version, however. 
+		/// connection in a future version, however.
 		///
 		/// On other platforms this is the same as name().
 
@@ -148,7 +148,7 @@ public:
 		/// Returns the interface adapter name.
 		///
 		/// On Windows platforms, this is the network adapter LUID.
-		/// The adapter name is used by some Windows Net APIs like DHCP. 
+		/// The adapter name is used by some Windows Net APIs like DHCP.
 		///
 		/// On other platforms this is the same as name().
 
@@ -199,7 +199,7 @@ public:
 		/// Returns true if the interface supports IPv4.
 
 	bool supportsIPv6() const;
-		/// Returns true if the interface supports IPv6.	
+		/// Returns true if the interface supports IPv6.
 
 	bool supportsBroadcast() const;
 		/// Returns true if the interface supports broadcast.
@@ -221,7 +221,7 @@ public:
 
 	static NetworkInterface forName(const std::string& name, bool requireIPv6 = false);
 		/// Returns the NetworkInterface for the given name.
-		/// 
+		///
 		/// If requireIPv6 is false, an IPv4 interface is returned.
 		/// Otherwise, an IPv6 interface is returned.
 		///
@@ -230,14 +230,14 @@ public:
 
 	static NetworkInterface forName(const std::string& name, IPVersion ipVersion);
 		/// Returns the NetworkInterface for the given name.
-		/// 
+		///
 		/// The ipVersion argument can be used to specify whether
-		/// an IPv4 (IPv4_ONLY) or IPv6 (IPv6_ONLY) interface is required, 
+		/// an IPv4 (IPv4_ONLY) or IPv6 (IPv6_ONLY) interface is required,
 		/// or whether the caller does not care (IPv4_OR_IPv6).
 		///
 		/// Throws an InterfaceNotFoundException if an interface
 		/// with the give name does not exist.
-		
+
 	static NetworkInterface forAddress(const IPAddress& address);
 		/// Returns the NetworkInterface for the given IP address.
 		///
@@ -277,7 +277,7 @@ public:
 		/// Otherwise, both interfaces being up and down are returned.
 		///
 		/// If there are multiple addresses bound to one interface,
-		/// they are contained within the NetworkInterface (second) 
+		/// they are contained within the NetworkInterface (second)
 		/// member of the pair.
 
 protected:
diff --git a/Net/include/Poco/Net/NullPartHandler.h b/Net/include/Poco/Net/NullPartHandler.h
index 21c45c680..1b3b7bccb 100644
--- a/Net/include/Poco/Net/NullPartHandler.h
+++ b/Net/include/Poco/Net/NullPartHandler.h
@@ -32,10 +32,10 @@ class Net_API NullPartHandler: public PartHandler
 public:
 	NullPartHandler();
 		/// Creates the NullPartHandler.
-	
+
 	~NullPartHandler();
 		/// Destroys the NullPartHandler.
-	
+
 	void handlePart(const MessageHeader& header, std::istream& stream);
 		/// Reads and discards all data from the stream.
 };
diff --git a/Net/include/Poco/Net/OAuth10Credentials.h b/Net/include/Poco/Net/OAuth10Credentials.h
index 1402d40d5..d9e16ce9c 100644
--- a/Net/include/Poco/Net/OAuth10Credentials.h
+++ b/Net/include/Poco/Net/OAuth10Credentials.h
@@ -33,7 +33,7 @@ class HTMLForm;
 class Net_API OAuth10Credentials
 	/// This class implements OAuth 1.0A authentication for HTTP requests,
 	/// according to RFC 5849.
-	/// 
+	///
 	/// Only PLAINTEXT and HMAC-SHA1 signature methods are
 	/// supported. The RSA-SHA1 signature method is not supported.
 	///
@@ -68,9 +68,9 @@ class Net_API OAuth10Credentials
 	///   7. The response will contain the request token and request token secret.
 	///      These can be extracted from the response body using a HTMLForm object.
 	///
-	/// Requesting the access token and secret (temporary credentials) from the server 
-	/// is analogous to signing a client request using consumer key, consumer secret, 
-	/// request token and request token secret. 
+	/// Requesting the access token and secret (temporary credentials) from the server
+	/// is analogous to signing a client request using consumer key, consumer secret,
+	/// request token and request token secret.
 	/// The server response will contain the access token and access token secret,
 	/// which can again be extracted from the response body using a HTMLForm object.
 	///
@@ -80,7 +80,7 @@ class Net_API OAuth10Credentials
 	///      HTTPRequest object. This will extract the consumer key and token (if
 	///      provided).
 	///   2. Provide the consumer secret and token secret (if required) matching the
-	///      consumer key and token to the OAuth10Credentials object using the 
+	///      consumer key and token to the OAuth10Credentials object using the
 	///      setter methods.
 	///   3. Create an URI object containing the full request URI.
 	///   4. Call verify() to verify the signature.
@@ -95,7 +95,7 @@ public:
 		SIGN_PLAINTEXT, /// OAuth 1.0A PLAINTEXT signature method
 		SIGN_HMAC_SHA1  /// OAuth 1.0A HMAC-SHA1 signature method
 	};
-	
+
 	OAuth10Credentials();
 		/// Creates an empty OAuth10Credentials object.
 
@@ -105,7 +105,7 @@ public:
 		/// The token and tokenSecret will be left empty.
 
 	OAuth10Credentials(const std::string& consumerKey, const std::string& consumerSecret, const std::string& token, const std::string& tokenSecret);
-		/// Creates an OAuth10Credentials object with the given consumer key and 
+		/// Creates an OAuth10Credentials object with the given consumer key and
 		/// consumer secret, as well as token and token secret.
 
 	explicit OAuth10Credentials(const HTTPRequest& request);
@@ -121,50 +121,50 @@ public:
 
 	void setConsumerKey(const std::string& consumerKey);
 		/// Sets the consumer key.
-		
+
 	const std::string& getConsumerKey() const;
 		/// Returns the consumer key.
 
 	void setConsumerSecret(const std::string& consumerSecret);
 		/// Sets the consumer secret.
-		
+
 	const std::string& getConsumerSecret() const;
 		/// Returns the consumer secret.
-		
+
 	void setToken(const std::string& token);
 		/// Sets the token.
-		
+
 	const std::string& getToken() const;
 		/// Returns the token.
 
 	void setTokenSecret(const std::string& tokenSecret);
 		/// Sets the token.
-		
+
 	const std::string& getTokenSecret() const;
 		/// Returns the token secret.
-		
+
 	void setRealm(const std::string& realm);
 		/// Sets the optional realm to be included in the Authorization header.
-		
+
 	const std::string& getRealm() const;
 		/// Returns the optional realm to be included in the Authorization header.
-		
+
 	void setCallback(const std::string& uri);
 		/// Sets the callback URI.
-		
+
 	const std::string& getCallback() const;
 		/// Returns the callback URI.
-				
+
 	void authenticate(HTTPRequest& request, const Poco::URI& uri, SignatureMethod method = SIGN_HMAC_SHA1);
 		/// Adds an OAuth 1.0A Authentication header to the given request, using
 		/// the given signature method.
-		
+
 	void authenticate(HTTPRequest& request, const Poco::URI& uri, const Poco::Net::HTMLForm& params, SignatureMethod method = SIGN_HMAC_SHA1);
 		/// Adds an OAuth 1.0A Authentication header to the given request, using
 		/// the given signature method.
 
 	bool verify(const HTTPRequest& request, const Poco::URI& uri);
-		/// Verifies the signature of the given request. 
+		/// Verifies the signature of the given request.
 		///
 		/// The consumer key, consumer secret, token and token secret must have been set.
 		///
@@ -172,9 +172,9 @@ public:
 		///
 		/// Throws a NotAuthenticatedException if the request does not contain OAuth
 		/// credentials, or in case of an unsupported OAuth version or signature method.
-		
+
 	bool verify(const HTTPRequest& request, const Poco::URI& uri, const Poco::Net::HTMLForm& params);
-		/// Verifies the signature of the given request. 
+		/// Verifies the signature of the given request.
 		///
 		/// The consumer key, consumer secret, token and token secret must have been set.
 		///
@@ -209,7 +209,7 @@ protected:
 	std::string createSignature(const Poco::Net::HTTPRequest& request, const std::string& uri, const Poco::Net::HTMLForm& params, const std::string& nonce, const std::string& timestamp) const;
 		/// Creates a OAuth signature for the given request and its parameters, according
 		/// to <https://dev.twitter.com/docs/auth/creating-signature>.
-		
+
 	static std::string percentEncode(const std::string& str);
 		/// Percent-encodes the given string according to Twitter API's rules,
 		/// given in <https://dev.twitter.com/docs/auth/percent-encoding-parameters>.
@@ -217,7 +217,7 @@ protected:
 private:
 	OAuth10Credentials(const OAuth10Credentials&);
 	OAuth10Credentials& operator = (const OAuth10Credentials&);
-	
+
 	std::string _consumerKey;
 	std::string _consumerSecret;
 	std::string _token;
diff --git a/Net/include/Poco/Net/OAuth20Credentials.h b/Net/include/Poco/Net/OAuth20Credentials.h
index 6935f2dfa..8da9e7813 100644
--- a/Net/include/Poco/Net/OAuth20Credentials.h
+++ b/Net/include/Poco/Net/OAuth20Credentials.h
@@ -30,7 +30,7 @@ class HTTPRequest;
 
 class Net_API OAuth20Credentials
 	/// This class implements OAuth 2.0 authentication for HTTP requests,
-	/// via Bearer tokens in the Authorization header, 
+	/// via Bearer tokens in the Authorization header,
 	/// according to RFC 6749 and RFC 6750.
 	///
 	/// To add an Authorization header containing a bearer token
@@ -42,7 +42,7 @@ class Net_API OAuth20Credentials
 	/// object containing a "Bearer" Authorization header and
 	/// calling getBearerToken().
 	///
-	/// The authorization header scheme can be changed from 
+	/// The authorization header scheme can be changed from
 	/// "Bearer" to a custom value. For example, GitHub uses
 	/// the "token" scheme.
 {
@@ -82,16 +82,16 @@ public:
 
 	void setBearerToken(const std::string& bearerToken);
 		/// Sets the bearer token.
-		
+
 	const std::string& getBearerToken() const;
 		/// Returns the bearer token.
 
 	void setScheme(const std::string& scheme);
 		/// Sets the Authorization header scheme.
-		
+
 	const std::string& getScheme() const;
 		/// Returns the Authorization header scheme.
-		
+
 	void authenticate(HTTPRequest& request);
 		/// Adds an Authorization header containing the bearer token to
 		/// the HTTPRequest.
@@ -101,11 +101,11 @@ public:
 protected:
 	void extractBearerToken(const HTTPRequest& request);
 		/// Extracts the bearer token from the HTTPRequest.
-		
+
 private:
 	OAuth20Credentials(const OAuth20Credentials&);
 	OAuth20Credentials& operator = (const OAuth20Credentials&);
-	
+
 	std::string _bearerToken;
 	std::string _scheme;
 };
diff --git a/Net/include/Poco/Net/POP3ClientSession.h b/Net/include/Poco/Net/POP3ClientSession.h
index b944ed8cf..a5be846c5 100644
--- a/Net/include/Poco/Net/POP3ClientSession.h
+++ b/Net/include/Poco/Net/POP3ClientSession.h
@@ -44,14 +44,14 @@ public:
 	{
 		POP3_PORT = 110
 	};
-	
+
 	struct MessageInfo
 		/// Information returned by listMessages().
 	{
 		int id;
 		int size;
 	};
-	
+
 	using MessageInfoVec = std::vector<MessageInfo>;
 
 	explicit POP3ClientSession(const StreamSocket& socket);
@@ -68,7 +68,7 @@ public:
 
 	void setTimeout(const Poco::Timespan& timeout);
 		/// Sets the timeout for socket read operations.
-		
+
 	Poco::Timespan getTimeout() const;
 		/// Returns the timeout for socket read operations.
 
@@ -80,7 +80,7 @@ public:
 		/// NetException in case of a general network communication failure.
 
 	void close();
-		/// Sends a QUIT command and closes the connection to the server.	
+		/// Sends a QUIT command and closes the connection to the server.
 		///
 		/// Throws a POP3Exception in case of a POP3-specific error, or a
 		/// NetException in case of a general network communication failure.
@@ -172,7 +172,7 @@ public:
 
 protected:
 	static bool isPositive(const std::string& response);
-	
+
 private:
 	DialogSocket _socket;
 	bool         _isOpen;
diff --git a/Net/include/Poco/Net/ParallelSocketAcceptor.h b/Net/include/Poco/Net/ParallelSocketAcceptor.h
index 54c53030d..ee6a140f3 100644
--- a/Net/include/Poco/Net/ParallelSocketAcceptor.h
+++ b/Net/include/Poco/Net/ParallelSocketAcceptor.h
@@ -42,14 +42,14 @@ namespace Net {
 template <class ServiceHandler, class SR>
 class ParallelSocketAcceptor
 	/// This class implements the Acceptor part of the Acceptor-Connector design pattern.
-	/// Only the difference from single-threaded version is documented here, For full 
+	/// Only the difference from single-threaded version is documented here, For full
 	/// description see Poco::Net::SocketAcceptor documentation.
-	/// 
+	///
 	/// This is a multi-threaded version of SocketAcceptor, it differs from the
 	/// single-threaded version in number of reactors (defaulting to number of processors)
 	/// that can be specified at construction time and is rotated in a round-robin fashion
-	/// by event handler. See ParallelSocketAcceptor::onAccept and 
-	/// ParallelSocketAcceptor::createServiceHandler documentation and implementation for 
+	/// by event handler. See ParallelSocketAcceptor::onAccept and
+	/// ParallelSocketAcceptor::createServiceHandler documentation and implementation for
 	/// details.
 {
 public:
@@ -57,12 +57,14 @@ public:
 	using Observer = Poco::Observer<ParallelSocketAcceptor, ReadableNotification>;
 
 	explicit ParallelSocketAcceptor(ServerSocket& socket,
-		unsigned threads = Poco::Environment::processorCount()):
+		unsigned threads = Poco::Environment::processorCount(),
+		const std::string& threadName = ""):
+		_threadName(threadName),
 		_socket(socket),
 		_pReactor(0),
 		_threads(threads),
 		_next(0)
-		/// Creates a ParallelSocketAcceptor using the given ServerSocket, 
+		/// Creates a ParallelSocketAcceptor using the given ServerSocket,
 		/// sets number of threads and populates the reactors vector.
 	{
 		init();
@@ -70,13 +72,14 @@ public:
 
 	ParallelSocketAcceptor(ServerSocket& socket,
 		SocketReactor& reactor,
-		unsigned threads = Poco::Environment::processorCount()):
+		unsigned threads = Poco::Environment::processorCount(), const std::string& threadName = ""):
+		_threadName(threadName),
 		_socket(socket),
 		_pReactor(&reactor),
 		_threads(threads),
 		_next(0)
-		/// Creates a ParallelSocketAcceptor using the given ServerSocket, sets the 
-		/// number of threads, populates the reactors vector and registers itself 
+		/// Creates a ParallelSocketAcceptor using the given ServerSocket, sets the
+		/// number of threads, populates the reactors vector and registers itself
 		/// with the given SocketReactor.
 	{
 		init();
@@ -110,7 +113,7 @@ public:
 		///
 		/// A subclass can override this function to e.g.
 		/// register an event handler for timeout event.
-		/// 
+		///
 		/// The overriding method must either call the base class
 		/// implementation or register the accept handler on its own.
 	{
@@ -120,13 +123,13 @@ public:
 			_pReactor->addEventHandler(_socket, Observer(*this, &ParallelSocketAcceptor::onAccept));
 		}
 	}
-	
+
 	virtual void unregisterAcceptor()
 		/// Unregisters the ParallelSocketAcceptor.
 		///
 		/// A subclass can override this function to e.g.
 		/// unregister its event handler for a timeout event.
-		/// 
+		///
 		/// The overriding method must either call the base class
 		/// implementation or unregister the accept handler on its own.
 	{
@@ -135,7 +138,7 @@ public:
 			_pReactor->removeEventHandler(_socket, Observer(*this, &ParallelSocketAcceptor::onAccept));
 		}
 	}
-	
+
 	void onAccept(ReadableNotification* pNotification)
 		/// Accepts connection and creates event handler.
 	{
@@ -202,7 +205,7 @@ protected:
 		poco_assert (_threads > 0);
 
 		for (unsigned i = 0; i < _threads; ++i)
-			_reactors.push_back(new ParallelReactor);
+			_reactors.push_back(new ParallelReactor(_threadName + "#" + std::to_string(i)));
 	}
 
 	ReactorVec& reactors()
@@ -228,6 +231,8 @@ private:
 	ParallelSocketAcceptor(const ParallelSocketAcceptor&);
 	ParallelSocketAcceptor& operator = (const ParallelSocketAcceptor&);
 
+	std::string _threadName;
+		/// Name prefix of sub SocketReactor threads
 	ServerSocket   _socket;
 	SocketReactor* _pReactor;
 	unsigned       _threads;
diff --git a/Net/include/Poco/Net/ParallelSocketReactor.h b/Net/include/Poco/Net/ParallelSocketReactor.h
index 2c268cad0..15f737ae9 100644
--- a/Net/include/Poco/Net/ParallelSocketReactor.h
+++ b/Net/include/Poco/Net/ParallelSocketReactor.h
@@ -48,17 +48,21 @@ class ParallelSocketReactor: public SR
 public:
 	using Ptr = Poco::SharedPtr<ParallelSocketReactor>;
 
-	ParallelSocketReactor()
+	ParallelSocketReactor(const std::string& threadName = "")
 	{
 		_thread.start(*this);
+		if (!threadName.empty())
+			_thread.setName(threadName);
 	}
-	
-	ParallelSocketReactor(const Poco::Timespan& timeout):
+
+	ParallelSocketReactor(const Poco::Timespan& timeout, const std::string& threadName = ""):
 		SR(timeout)
 	{
 		_thread.start(*this);
+		if (!threadName.empty())
+			_thread.setName(threadName);
 	}
-	
+
 	~ParallelSocketReactor()
 	{
 		try
@@ -71,14 +75,14 @@ public:
 			poco_unexpected();
 		}
 	}
-	
+
 protected:
 	void onIdle()
 	{
 		SR::onIdle();
 		Poco::Thread::yield();
 	}
-	
+
 private:
 	Poco::Thread _thread;
 };
diff --git a/Net/include/Poco/Net/PartHandler.h b/Net/include/Poco/Net/PartHandler.h
index 941dd0305..4255daef7 100644
--- a/Net/include/Poco/Net/PartHandler.h
+++ b/Net/include/Poco/Net/PartHandler.h
@@ -32,8 +32,8 @@ class MessageHeader;
 class Net_API PartHandler
 	/// The base class for all part or attachment handlers.
 	///
-	/// Part handlers are used for handling email parts and 
-	/// attachments in MIME multipart messages, as well as file 
+	/// Part handlers are used for handling email parts and
+	/// attachments in MIME multipart messages, as well as file
 	/// uploads via HTML forms.
 	///
 	/// Subclasses must override handlePart().
@@ -48,7 +48,7 @@ public:
 		/// from header depends on the kind of part.
 		///
 		/// The content of the part can be read from stream.
-		
+
 protected:
 	PartHandler();
 		/// Creates the PartHandler.
diff --git a/Net/include/Poco/Net/PollSet.h b/Net/include/Poco/Net/PollSet.h
index 75764afd8..b412bd800 100644
--- a/Net/include/Poco/Net/PollSet.h
+++ b/Net/include/Poco/Net/PollSet.h
@@ -39,9 +39,9 @@ class Net_API PollSet
 public:
 	enum Mode
 	{
-		POLL_READ  = 0x01,
-		POLL_WRITE = 0x02,
-		POLL_ERROR = 0x04
+		POLL_READ  = Socket::SELECT_READ,
+		POLL_WRITE = Socket::SELECT_WRITE,
+		POLL_ERROR = Socket::SELECT_ERROR
 	};
 
 	using SocketModeMap = std::map<Poco::Net::Socket, int>;
@@ -56,12 +56,36 @@ public:
 		/// Adds the given socket to the set, for polling with
 		/// the given mode, which can be an OR'd combination of
 		/// POLL_READ, POLL_WRITE and POLL_ERROR.
+		/// Subsequent socket additions to the PollSet are mode-cumulative,
+		/// so the following code:
+		///
+		/// StreamSocket ss;
+		/// PollSet ps;
+		/// ps.add(ss, PollSet::POLL_READ);
+		/// ps.add(ss, PollSet::POLL_WRITE);
+		///
+		/// shall result in the socket being monitored for read and write,
+		/// equivalent to this:
+		///
+		/// ps.update(ss, PollSet::POLL_READ | PollSet::POLL_WRITE);
 
 	void remove(const Poco::Net::Socket& socket);
 		/// Removes the given socket from the set.
 
 	void update(const Poco::Net::Socket& socket, int mode);
-		/// Updates the mode of the given socket.
+		/// Updates the mode of the given socket. If socket does
+		/// not exist in the PollSet, it is silently added. For
+		/// an existing socket, any prior mode is overwritten.
+		/// Updating socket is non-mode-cumulative.
+		///
+		/// The following code:
+		///
+		/// StreamSocket ss;
+		/// PollSet ps;
+		/// ps.update(ss, PollSet::POLL_READ);
+		/// ps.update(ss, PollSet::POLL_WRITE);
+		///
+		/// shall result in the socket being monitored for write only.
 
 	bool has(const Socket& socket) const;
 		/// Returns true if socket is registered for polling.
@@ -79,10 +103,11 @@ public:
 		/// their state changed.
 
 	int count() const;
-		/// Returns the numberof sockets monitored.
+		/// Returns the number of sockets monitored.
 
 	void wakeUp();
 		/// Wakes up a waiting PollSet.
+		/// Any errors that occur during this call are ignored.
 		/// On platforms/implementations where this functionality
 		/// is not available, it does nothing.
 private:
diff --git a/Net/include/Poco/Net/QuotedPrintableDecoder.h b/Net/include/Poco/Net/QuotedPrintableDecoder.h
index b456660f6..6b32a1dff 100644
--- a/Net/include/Poco/Net/QuotedPrintableDecoder.h
+++ b/Net/include/Poco/Net/QuotedPrintableDecoder.h
@@ -28,11 +28,11 @@ namespace Net {
 
 
 class Net_API QuotedPrintableDecoderBuf: public Poco::UnbufferedStreamBuf
-	/// This streambuf decodes all quoted-printable (see RFC 2045) 
+	/// This streambuf decodes all quoted-printable (see RFC 2045)
 	/// encoded data read from the istream connected to it.
 	///
-	/// Note: For performance reasons, the characters 
-	/// are read directly from the given istream's 
+	/// Note: For performance reasons, the characters
+	/// are read directly from the given istream's
 	/// underlying streambuf, so the state
 	/// of the istream will not reflect that of
 	/// its streambuf.
@@ -40,7 +40,7 @@ class Net_API QuotedPrintableDecoderBuf: public Poco::UnbufferedStreamBuf
 public:
 	QuotedPrintableDecoderBuf(std::istream& istr);
 	~QuotedPrintableDecoderBuf();
-	
+
 private:
 	int readFromDevice();
 
@@ -68,8 +68,8 @@ class Net_API QuotedPrintableDecoder: public QuotedPrintableDecoderIOS, public s
 	/// This istream decodes all quoted-printable (see RFC 2045)
 	/// encoded data read from the istream connected to it.
 	///
-	/// Note: For performance reasons, the characters 
-	/// are read directly from the given istream's 
+	/// Note: For performance reasons, the characters
+	/// are read directly from the given istream's
 	/// underlying streambuf, so the state
 	/// of the istream will not reflect that of
 	/// its streambuf.
diff --git a/Net/include/Poco/Net/QuotedPrintableEncoder.h b/Net/include/Poco/Net/QuotedPrintableEncoder.h
index d0e7d7454..58d56d0c5 100644
--- a/Net/include/Poco/Net/QuotedPrintableEncoder.h
+++ b/Net/include/Poco/Net/QuotedPrintableEncoder.h
@@ -36,7 +36,7 @@ public:
 	QuotedPrintableEncoderBuf(std::ostream& ostr);
 	~QuotedPrintableEncoderBuf();
 	int close();
-	
+
 private:
 	int writeToDevice(char c);
 	void writeEncoded(char c);
diff --git a/Net/include/Poco/Net/RawSocket.h b/Net/include/Poco/Net/RawSocket.h
index 3d0d018b2..3382860e4 100644
--- a/Net/include/Poco/Net/RawSocket.h
+++ b/Net/include/Poco/Net/RawSocket.h
@@ -114,7 +114,7 @@ public:
 		/// Bind a local address to the socket.
 		///
 		/// This is usually only done when establishing a server
-		/// socket. 
+		/// socket.
 		///
 		/// If reuseAddress is true, sets the SO_REUSEADDR
 		/// socket option.
@@ -125,7 +125,7 @@ public:
 		/// Bind a local address to the socket.
 		///
 		/// This is usually only done when establishing a server
-		/// socket. 
+		/// socket.
 		///
 		/// If reuseAddress is true, sets the SO_REUSEADDR
 		/// socket option.
@@ -167,7 +167,7 @@ public:
 		///
 		/// Setting this flag allows sending datagrams to
 		/// the broadcast address.
-	
+
 	bool getBroadcast() const;
 		/// Returns the value of the SO_BROADCAST socket option.
 
diff --git a/Net/include/Poco/Net/RawSocketImpl.h b/Net/include/Poco/Net/RawSocketImpl.h
index df10b6458..fe781f5a5 100644
--- a/Net/include/Poco/Net/RawSocketImpl.h
+++ b/Net/include/Poco/Net/RawSocketImpl.h
@@ -32,7 +32,7 @@ class Net_API RawSocketImpl: public SocketImpl
 public:
 	RawSocketImpl();
 		/// Creates an unconnected IPv4 raw socket with IPPROTO_RAW.
-		
+
 	RawSocketImpl(SocketAddress::Family family, int proto = IPPROTO_RAW);
 		/// Creates an unconnected raw socket.
 		///
@@ -41,11 +41,11 @@ public:
 
 	RawSocketImpl(poco_socket_t sockfd);
 		/// Creates a RawSocketImpl using the given native socket.
-				
+
 protected:
 	void init(int af);
 	void init2(int af, int proto);
-	
+
 	~RawSocketImpl();
 };
 
diff --git a/Net/include/Poco/Net/RemoteSyslogChannel.h b/Net/include/Poco/Net/RemoteSyslogChannel.h
index 64a0db83c..95cbd9dbd 100644
--- a/Net/include/Poco/Net/RemoteSyslogChannel.h
+++ b/Net/include/Poco/Net/RemoteSyslogChannel.h
@@ -132,6 +132,9 @@ public:
 	static void registerChannel();
 		/// Registers the channel with the global LoggingFactory.
 
+	static const char* facilityToString(Facility facility);
+		/// Returns the string describing the SyslogFacility
+
 	static const std::string PROP_NAME;
 	static const std::string PROP_FACILITY;
 	static const std::string PROP_FORMAT;
diff --git a/Net/include/Poco/Net/RemoteSyslogListener.h b/Net/include/Poco/Net/RemoteSyslogListener.h
index d55f5591d..7124a4548 100644
--- a/Net/include/Poco/Net/RemoteSyslogListener.h
+++ b/Net/include/Poco/Net/RemoteSyslogListener.h
@@ -110,8 +110,9 @@ public:
 	static const std::string PROP_THREADS;
 	static const std::string PROP_BUFFER;
 
-    static const std::string LOG_PROP_APP;
-    static const std::string LOG_PROP_HOST;
+	static const std::string LOG_PROP_FACILITY;
+	static const std::string LOG_PROP_APP;
+	static const std::string LOG_PROP_HOST;
 	static const std::string LOG_PROP_STRUCTURED_DATA;
 
 protected:
diff --git a/Net/include/Poco/Net/SMTPChannel.h b/Net/include/Poco/Net/SMTPChannel.h
index 10f43ad30..4e51469f8 100644
--- a/Net/include/Poco/Net/SMTPChannel.h
+++ b/Net/include/Poco/Net/SMTPChannel.h
@@ -36,19 +36,19 @@ public:
 
 	SMTPChannel();
 		/// Creates a SMTPChannel.
-		
+
 	SMTPChannel(const std::string& mailhost, const std::string& sender, const std::string& recipient);
 		/// Creates a SMTPChannel with the given target mailhost, sender, and recipient.
-	
+
 	void open();
 		/// Opens the SMTPChannel.
-		
+
 	void close();
 		/// Closes the SMTPChannel.
-		
+
 	void log(const Message& msg);
 		/// Sends the message's text to the recipient.
-		
+
 	void setProperty(const std::string& name, const std::string& value);
 		/// Sets the property with the given value.
 		///
@@ -59,11 +59,11 @@ public:
 		///     * local:      If true, local time is used. Default is true.
 		///     * attachment: Filename of the file to attach.
 		///     * type:       Content type of the file to attach.
-		///     * delete:     Boolean value indicating whether to delete 
+		///     * delete:     Boolean value indicating whether to delete
 		///                   the attachment file after sending.
-		///     * throw:      Boolean value indicating whether to throw 
+		///     * throw:      Boolean value indicating whether to throw
 		///                   exception upon failure.
-		
+
 	std::string getProperty(const std::string& name) const;
 		/// Returns the value of the property with the given name.
 
diff --git a/Net/include/Poco/Net/ServerSocket.h b/Net/include/Poco/Net/ServerSocket.h
index d8aca6790..bd9fb8eee 100644
--- a/Net/include/Poco/Net/ServerSocket.h
+++ b/Net/include/Poco/Net/ServerSocket.h
@@ -68,7 +68,7 @@ public:
 		///
 		/// Releases the socket's SocketImpl and
 		/// attaches the SocketImpl from the other socket and
-		/// increments the reference count of the SocketImpl.	
+		/// increments the reference count of the SocketImpl.
 
 	virtual void bind(const SocketAddress& address, bool reuseAddress = false);
 		/// Binds a local address to the socket.
@@ -97,7 +97,7 @@ public:
 		/// Binds a local port to the socket.
 		///
 		/// This is usually only done when establishing a server
-		/// socket. 
+		/// socket.
 		///
 		/// If reuseAddress is true, sets the SO_REUSEADDR
 		/// socket option.
@@ -106,7 +106,7 @@ public:
 		/// Binds a local port to the socket.
 		///
 		/// This is usually only done when establishing a server
-		/// socket. 
+		/// socket.
 		///
 		/// If reuseAddress is true, sets the SO_REUSEADDR
 		/// socket option.
@@ -155,7 +155,7 @@ public:
 		/// Binds a local IPv6 port to the socket.
 		///
 		/// This is usually only done when establishing a server
-		/// socket. 
+		/// socket.
 		///
 		/// If reuseAddress is true, sets the SO_REUSEADDR
 		/// socket option.
@@ -166,12 +166,12 @@ public:
 		///
 		/// If the library has not been built with IPv6 support,
 		/// a Poco::NotImplementedException will be thrown.
-		
+
 	virtual void bind6(Poco::UInt16 port, bool reuseAddress, bool reusePort, bool ipV6Only);
 		/// Binds a local IPv6 port to the socket.
 		///
 		/// This is usually only done when establishing a server
-		/// socket. 
+		/// socket.
 		///
 		/// If reuseAddress is true, sets the SO_REUSEADDR
 		/// socket option.
diff --git a/Net/include/Poco/Net/Socket.h b/Net/include/Poco/Net/Socket.h
index 3eb962453..be1bf606a 100644
--- a/Net/include/Poco/Net/Socket.h
+++ b/Net/include/Poco/Net/Socket.h
@@ -22,6 +22,11 @@
 #include "Poco/Net/SocketImpl.h"
 #include <vector>
 
+#ifdef POCO_NEW_STATE_ON_MOVE
+	#define POCO_CHECK_NEW_STATE_ON_MOVE poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+#else
+	#define POCO_CHECK_NEW_STATE_ON_MOVE
+#endif
 
 namespace Poco {
 namespace Net {
@@ -83,7 +88,7 @@ public:
 	virtual ~Socket();
 		/// Destroys the Socket and releases the
 		/// SocketImpl.
-		
+
 	bool operator == (const Socket& socket) const;
 		/// Returns true if both sockets share the same
 		/// SocketImpl, false otherwise.
@@ -94,7 +99,7 @@ public:
 
 	bool operator <  (const Socket& socket) const;
 		/// Compares the SocketImpl pointers.
-	
+
 	bool operator <= (const Socket& socket) const;
 		/// Compares the SocketImpl pointers.
 
@@ -125,8 +130,9 @@ public:
 	void close();
 		/// Closes the socket.
 
+	//@deprecated
 	static int select(SocketList& readList, SocketList& writeList, SocketList& exceptList, const Poco::Timespan& timeout);
-		/// Determines the status of one or more sockets, 
+		/// Determines the status of one or more sockets,
 		/// using a call to select().
 		///
 		/// ReadList contains the list of sockets which should be
@@ -140,7 +146,7 @@ public:
 		///
 		/// Returns the number of sockets ready.
 		///
-		/// After return, 
+		/// After return,
 		///   * readList contains those sockets ready for reading,
 		///   * writeList contains those sockets ready for writing,
 		///   * exceptList contains those sockets with a pending error.
@@ -154,11 +160,14 @@ public:
 		/// the closed socket will not be included in any list.
 		/// In this case, the return value may be greater than the sum
 		/// of all sockets in all list.
+		///
+		/// This function is deprecated and may be removed in the future releases,
+		/// please use PollSet class instead.
 
 	bool poll(const Poco::Timespan& timeout, int mode) const;
-		/// Determines the status of the socket, using a 
+		/// Determines the status of the socket, using a
 		/// call to poll() or select().
-		/// 
+		///
 		/// The mode argument is constructed by combining the values
 		/// of the SelectMode enumeration.
 		///
@@ -174,7 +183,7 @@ public:
 
 	void setSendBufferSize(int size);
 		/// Sets the size of the send buffer.
-		
+
 	int getSendBufferSize() const;
 		/// Returns the size of the send buffer.
 		///
@@ -184,7 +193,7 @@ public:
 
 	void setReceiveBufferSize(int size);
 		/// Sets the size of the receive buffer.
-		
+
 	int getReceiveBufferSize() const;
 		/// Returns the size of the receive buffer.
 		///
@@ -194,7 +203,7 @@ public:
 
 	void setSendTimeout(const Poco::Timespan& timeout);
 		/// Sets the send timeout for the socket.
-	
+
 	Poco::Timespan getSendTimeout() const;
 		/// Returns the send timeout for the socket.
 		///
@@ -207,7 +216,7 @@ public:
 		///
 		/// On systems that do not support SO_RCVTIMEO, a
 		/// workaround using poll() is provided.
-	
+
 	Poco::Timespan getReceiveTimeout() const;
 		/// Returns the receive timeout for the socket.
 		///
@@ -226,56 +235,56 @@ public:
 	void setOption(int level, int option, unsigned char value);
 		/// Sets the socket option specified by level and option
 		/// to the given integer value.
-		
+
 	void setOption(int level, int option, const Poco::Timespan& value);
 		/// Sets the socket option specified by level and option
 		/// to the given time value.
-		
+
 	void setOption(int level, int option, const IPAddress& value);
 		/// Sets the socket option specified by level and option
 		/// to the given time value.
 
 	void getOption(int level, int option, int& value) const;
-		/// Returns the value of the socket option 
+		/// Returns the value of the socket option
 		/// specified by level and option.
 
 	void getOption(int level, int option, unsigned& value) const;
-		/// Returns the value of the socket option 
+		/// Returns the value of the socket option
 		/// specified by level and option.
 
 	void getOption(int level, int option, unsigned char& value) const;
-		/// Returns the value of the socket option 
+		/// Returns the value of the socket option
 		/// specified by level and option.
 
 	void getOption(int level, int option, Poco::Timespan& value) const;
-		/// Returns the value of the socket option 
+		/// Returns the value of the socket option
 		/// specified by level and option.
-	
+
 	void getOption(int level, int option, IPAddress& value) const;
-		/// Returns the value of the socket option 
+		/// Returns the value of the socket option
 		/// specified by level and option.
 
 	void setLinger(bool on, int seconds);
 		/// Sets the value of the SO_LINGER socket option.
-		
+
 	void getLinger(bool& on, int& seconds) const;
 		/// Returns the value of the SO_LINGER socket option.
-	
+
 	void setNoDelay(bool flag);
 		/// Sets the value of the TCP_NODELAY socket option.
-		
+
 	bool getNoDelay() const;
 		/// Returns the value of the TCP_NODELAY socket option.
-	
+
 	void setKeepAlive(bool flag);
 		/// Sets the value of the SO_KEEPALIVE socket option.
-		
+
 	bool getKeepAlive() const;
 		/// Returns the value of the SO_KEEPALIVE socket option.
-	
+
 	void setReuseAddress(bool flag);
 		/// Sets the value of the SO_REUSEADDR socket option.
-	
+
 	bool getReuseAddress() const;
 		/// Returns the value of the SO_REUSEADDR socket option.
 
@@ -283,16 +292,16 @@ public:
 		/// Sets the value of the SO_REUSEPORT socket option.
 		/// Does nothing if the socket implementation does not
 		/// support SO_REUSEPORT.
-	
+
 	bool getReusePort() const;
 		/// Returns the value of the SO_REUSEPORT socket option.
 		///
 		/// Returns false if the socket implementation does not
 		/// support SO_REUSEPORT.
-		
+
 	void setOOBInline(bool flag);
 		/// Sets the value of the SO_OOBINLINE socket option.
-	
+
 	bool getOOBInline() const;
 		/// Returns the value of the SO_OOBINLINE socket option.
 
@@ -302,25 +311,25 @@ public:
 
 	bool getBlocking() const;
 		/// Returns the blocking mode of the socket.
-		/// This method will only work if the blocking modes of 
+		/// This method will only work if the blocking modes of
 		/// the socket are changed via the setBlocking method!
 
 	SocketAddress address() const;
 		/// Returns the IP address and port number of the socket.
-		
+
 	SocketAddress peerAddress() const;
 		/// Returns the IP address and port number of the peer socket.
 
 	SocketImpl* impl() const;
 		/// Returns the SocketImpl for this socket.
-		
+
 	bool secure() const;
 		/// Returns true iff the socket's connection is secure
 		/// (using SSL or TLS).
-		
+
 	static bool supportsIPv4();
 		/// Returns true if the system supports IPv4.
-		
+
 	static bool supportsIPv6();
 		/// Returns true if the system supports IPv6.
 
@@ -375,6 +384,9 @@ public:
 	static int lastError();
 		/// Returns the last error code.
 
+	static std::string lastErrorDesc();
+		/// Returns the last error description.
+
 	static void error();
 		/// Throws an appropriate exception for the last error.
 
@@ -485,7 +497,7 @@ inline void Socket::close()
 
 inline bool Socket::poll(const Poco::Timespan& timeout, int mode) const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->poll(timeout, mode);
 }
@@ -493,7 +505,7 @@ inline bool Socket::poll(const Poco::Timespan& timeout, int mode) const
 
 inline int Socket::available() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->available();
 }
@@ -501,7 +513,7 @@ inline int Socket::available() const
 
 inline int Socket::getError() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getError();
 }
@@ -509,15 +521,15 @@ inline int Socket::getError() const
 
 inline void Socket::setSendBufferSize(int size)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setSendBufferSize(size);
 }
 
-	
+
 inline int Socket::getSendBufferSize() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getSendBufferSize();
 }
@@ -525,15 +537,15 @@ inline int Socket::getSendBufferSize() const
 
 inline void Socket::setReceiveBufferSize(int size)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setReceiveBufferSize(size);
 }
 
-	
+
 inline int Socket::getReceiveBufferSize() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getReceiveBufferSize();
 }
@@ -541,7 +553,7 @@ inline int Socket::getReceiveBufferSize() const
 
 inline void Socket::setSendTimeout(const Poco::Timespan& timeout)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setSendTimeout(timeout);
 }
@@ -549,7 +561,7 @@ inline void Socket::setSendTimeout(const Poco::Timespan& timeout)
 
 inline Poco::Timespan Socket::getSendTimeout() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getSendTimeout();
 }
@@ -557,7 +569,7 @@ inline Poco::Timespan Socket::getSendTimeout() const
 
 inline void Socket::setReceiveTimeout(const Poco::Timespan& timeout)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setReceiveTimeout(timeout);
 }
@@ -565,7 +577,7 @@ inline void Socket::setReceiveTimeout(const Poco::Timespan& timeout)
 
 inline Poco::Timespan Socket::getReceiveTimeout() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getReceiveTimeout();
 }
@@ -573,7 +585,7 @@ inline Poco::Timespan Socket::getReceiveTimeout() const
 
 inline void Socket::setOption(int level, int option, int value)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setOption(level, option, value);
 }
@@ -581,7 +593,7 @@ inline void Socket::setOption(int level, int option, int value)
 
 inline void Socket::setOption(int level, int option, unsigned value)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setOption(level, option, value);
 }
@@ -589,7 +601,7 @@ inline void Socket::setOption(int level, int option, unsigned value)
 
 inline void Socket::setOption(int level, int option, unsigned char value)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setOption(level, option, value);
 }
@@ -597,7 +609,7 @@ inline void Socket::setOption(int level, int option, unsigned char value)
 
 inline void Socket::setOption(int level, int option, const Poco::Timespan& value)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setOption(level, option, value);
 }
@@ -605,7 +617,7 @@ inline void Socket::setOption(int level, int option, const Poco::Timespan& value
 
 inline void Socket::setOption(int level, int option, const IPAddress& value)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setOption(level, option, value);
 }
@@ -613,7 +625,7 @@ inline void Socket::setOption(int level, int option, const IPAddress& value)
 
 inline void Socket::getOption(int level, int option, int& value) const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->getOption(level, option, value);
 }
@@ -621,7 +633,7 @@ inline void Socket::getOption(int level, int option, int& value) const
 
 inline void Socket::getOption(int level, int option, unsigned& value) const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->getOption(level, option, value);
 }
@@ -629,7 +641,7 @@ inline void Socket::getOption(int level, int option, unsigned& value) const
 
 inline void Socket::getOption(int level, int option, unsigned char& value) const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->getOption(level, option, value);
 }
@@ -637,7 +649,7 @@ inline void Socket::getOption(int level, int option, unsigned char& value) const
 
 inline void Socket::getOption(int level, int option, Poco::Timespan& value) const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->getOption(level, option, value);
 }
@@ -645,7 +657,7 @@ inline void Socket::getOption(int level, int option, Poco::Timespan& value) cons
 
 inline void Socket::getOption(int level, int option, IPAddress& value) const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->getOption(level, option, value);
 }
@@ -653,15 +665,15 @@ inline void Socket::getOption(int level, int option, IPAddress& value) const
 
 inline void Socket::setLinger(bool on, int seconds)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setLinger(on, seconds);
 }
 
-	
+
 inline void Socket::getLinger(bool& on, int& seconds) const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->getLinger(on, seconds);
 }
@@ -669,15 +681,15 @@ inline void Socket::getLinger(bool& on, int& seconds) const
 
 inline void Socket::setNoDelay(bool flag)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setNoDelay(flag);
 }
 
-	
+
 inline bool Socket::getNoDelay() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getNoDelay();
 }
@@ -685,15 +697,15 @@ inline bool Socket::getNoDelay() const
 
 inline void Socket::setKeepAlive(bool flag)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setKeepAlive(flag);
 }
 
-	
+
 inline bool Socket::getKeepAlive() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getKeepAlive();
 }
@@ -701,7 +713,7 @@ inline bool Socket::getKeepAlive() const
 
 inline void Socket::setReuseAddress(bool flag)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setReuseAddress(flag);
 }
@@ -709,7 +721,7 @@ inline void Socket::setReuseAddress(bool flag)
 
 inline bool Socket::getReuseAddress() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getReuseAddress();
 }
@@ -717,7 +729,7 @@ inline bool Socket::getReuseAddress() const
 
 inline void Socket::setReusePort(bool flag)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setReusePort(flag);
 }
@@ -725,15 +737,15 @@ inline void Socket::setReusePort(bool flag)
 
 inline bool Socket::getReusePort() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getReusePort();
 }
 
-	
+
 inline void Socket::setOOBInline(bool flag)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setOOBInline(flag);
 }
@@ -741,7 +753,7 @@ inline void Socket::setOOBInline(bool flag)
 
 inline bool Socket::getOOBInline() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getOOBInline();
 }
@@ -749,7 +761,7 @@ inline bool Socket::getOOBInline() const
 
 inline void Socket::setBlocking(bool flag)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->setBlocking(flag);
 }
@@ -757,7 +769,7 @@ inline void Socket::setBlocking(bool flag)
 
 inline bool Socket::getBlocking() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->getBlocking();
 }
@@ -771,7 +783,7 @@ inline SocketImpl* Socket::impl() const
 
 inline poco_socket_t Socket::sockfd() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->sockfd();
 }
@@ -779,7 +791,7 @@ inline poco_socket_t Socket::sockfd() const
 
 inline SocketAddress Socket::address() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->address();
 }
@@ -787,7 +799,7 @@ inline SocketAddress Socket::address() const
 
 inline SocketAddress Socket::peerAddress() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->peerAddress();
 }
@@ -795,7 +807,7 @@ inline SocketAddress Socket::peerAddress() const
 
 inline bool Socket::secure() const
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	return _pImpl->secure();
 }
@@ -819,7 +831,7 @@ inline bool Socket::supportsIPv6()
 
 inline void Socket::init(int af)
 {
-	poco_assert_dbg(POCO_NEW_STATE_ON_MOVE && _pImpl);
+	POCO_CHECK_NEW_STATE_ON_MOVE;
 
 	_pImpl->init(af);
 }
diff --git a/Net/include/Poco/Net/SocketAcceptor.h b/Net/include/Poco/Net/SocketAcceptor.h
index aee12682c..837ace3c7 100644
--- a/Net/include/Poco/Net/SocketAcceptor.h
+++ b/Net/include/Poco/Net/SocketAcceptor.h
@@ -42,7 +42,7 @@ class SocketAcceptor
 	/// The Acceptor-Connector design pattern decouples connection
 	/// establishment and service initialization in a distributed system
 	/// from the processing performed once a service is initialized.
-	/// This decoupling is achieved with three components: Acceptors, 
+	/// This decoupling is achieved with three components: Acceptors,
 	/// Connectors and Service Handlers.
 	/// The SocketAcceptor passively waits for connection requests (usually
 	/// from a remote Connector) and establishes a connection upon
@@ -113,7 +113,7 @@ public:
 		///
 		/// A subclass can override this function to e.g.
 		/// register an event handler for timeout event.
-		/// 
+		///
 		/// If acceptor was constructed without providing reactor to it,
 		/// the override of this method must either call the base class
 		/// implementation or directly register the accept handler with
@@ -125,13 +125,13 @@ public:
 			_pReactor->addEventHandler(_socket, Observer(*this, &SocketAcceptor::onAccept));
 		}
 	}
-	
+
 	virtual void unregisterAcceptor()
 		/// Unregisters the SocketAcceptor.
 		///
 		/// A subclass can override this function to e.g.
 		/// unregister its event handler for a timeout event.
-		/// 
+		///
 		/// If the accept handler was registered with the reactor,
 		/// the overriding method must either call the base class
 		/// implementation or directly unregister the accept handler.
@@ -141,7 +141,7 @@ public:
 			_pReactor->removeEventHandler(_socket, Observer(*this, &SocketAcceptor::onAccept));
 		}
 	}
-	
+
 	void onAccept(ReadableNotification* pNotification)
 		/// Accepts connection and creates event handler.
 	{
@@ -150,7 +150,7 @@ public:
 		_pReactor->wakeUp();
 		createServiceHandler(sock);
 	}
-	
+
 protected:
 	virtual ServiceHandler* createServiceHandler(StreamSocket& socket)
 		/// Create and initialize a new ServiceHandler instance.
@@ -179,7 +179,7 @@ private:
 	SocketAcceptor();
 	SocketAcceptor(const SocketAcceptor&);
 	SocketAcceptor& operator = (const SocketAcceptor&);
-	
+
 	ServerSocket   _socket;
 	SocketReactor* _pReactor;
 };
diff --git a/Net/include/Poco/Net/SocketConnector.h b/Net/include/Poco/Net/SocketConnector.h
index 7c8a718f2..15d01e908 100644
--- a/Net/include/Poco/Net/SocketConnector.h
+++ b/Net/include/Poco/Net/SocketConnector.h
@@ -43,7 +43,7 @@ class SocketConnector
 	/// The Acceptor-Connector design pattern decouples connection
 	/// establishment and service initialization in a distributed system
 	/// from the processing performed once a service is initialized.
-	/// This decoupling is achieved with three components: Acceptors, 
+	/// This decoupling is achieved with three components: Acceptors,
 	/// Connectors and Service Handlers.
 	/// The Connector actively establishes a connection with a remote
 	/// server socket (usually managed by an Acceptor) and initializes
@@ -51,10 +51,10 @@ class SocketConnector
 	///
 	/// The SocketConnector sets up a StreamSocket, initiates a non-blocking
 	/// connect operation and registers itself for ReadableNotification, WritableNotification
-	/// and ErrorNotification. ReadableNotification or WritableNotification denote the successful 
+	/// and ErrorNotification. ReadableNotification or WritableNotification denote the successful
 	/// establishment of the connection.
 	///
-	/// When the StreamSocket becomes readable or writeable, the SocketConnector 
+	/// When the StreamSocket becomes readable or writeable, the SocketConnector
 	/// creates a ServiceHandler to service the connection and unregisters
 	/// itself.
 	///
@@ -140,7 +140,7 @@ public:
 		if (err) onError(err);
 		else onConnect();
 	}
-	
+
 	void onWritable(WritableNotification* pNotification)
 	{
 		unregisterConnector();
@@ -176,7 +176,7 @@ protected:
 		/// Subclasses can override this method.
 	{
 	}
-	
+
 	SocketReactor* reactor()
 		/// Returns a pointer to the SocketReactor where
 		/// this SocketConnector is registered.
diff --git a/Net/include/Poco/Net/SocketNotification.h b/Net/include/Poco/Net/SocketNotification.h
index 7b857ecfe..c89d3704f 100644
--- a/Net/include/Poco/Net/SocketNotification.h
+++ b/Net/include/Poco/Net/SocketNotification.h
@@ -40,19 +40,19 @@ public:
 
 	virtual ~SocketNotification();
 		/// Destroys the SocketNotification.
-		
+
 	SocketReactor& source() const;
-		/// Returns the SocketReactor that generated the notification.	
-		
+		/// Returns the SocketReactor that generated the notification.
+
 	Socket socket() const;
 		/// Returns the socket that caused the notification.
 
 private:
 	void setSocket(const Socket& socket);
-	
+
 	SocketReactor* _pReactor;
 	Socket         _socket;
-	
+
 	friend class SocketNotifier;
 };
 
@@ -140,7 +140,7 @@ inline SocketReactor& SocketNotification::source() const
 	return *_pReactor;
 }
 
-	
+
 inline Socket SocketNotification::socket() const
 {
 	return _socket;
diff --git a/Net/include/Poco/Net/SocketNotifier.h b/Net/include/Poco/Net/SocketNotifier.h
index f9b61cbdf..64a5e66c6 100644
--- a/Net/include/Poco/Net/SocketNotifier.h
+++ b/Net/include/Poco/Net/SocketNotifier.h
@@ -42,25 +42,25 @@ class Net_API SocketNotifier: public Poco::RefCountedObject
 public:
 	explicit SocketNotifier(const Socket& socket);
 		/// Creates the SocketNotifier for the given socket.
-		
+
 	void addObserver(SocketReactor* pReactor, const Poco::AbstractObserver& observer);
-		/// Adds the given observer. 
-		
+		/// Adds the given observer.
+
 	void removeObserver(SocketReactor* pReactor, const Poco::AbstractObserver& observer);
-		/// Removes the given observer. 
-		
+		/// Removes the given observer.
+
 	bool hasObserver(const Poco::AbstractObserver& observer) const;
 		/// Returns true if the given observer is registered.
-		
+
 	bool accepts(SocketNotification* pNotification);
 		/// Returns true if there is at least one observer for the given notification.
-		
+
 	void dispatch(SocketNotification* pNotification);
 		/// Dispatches the notification to all observers.
-		
+
 	bool hasObservers() const;
 		/// Returns true if there are subscribers.
-		
+
 	std::size_t countObservers() const;
 		/// Returns the number of subscribers;
 
diff --git a/Net/include/Poco/Net/SocketProactor.h b/Net/include/Poco/Net/SocketProactor.h
index 2d3258f6a..403010b90 100644
--- a/Net/include/Poco/Net/SocketProactor.h
+++ b/Net/include/Poco/Net/SocketProactor.h
@@ -319,6 +319,7 @@ private:
 			/// Runs the next I/O completion handler in the queue.
 		{
 			IONotification* pNf = dynamic_cast<IONotification*>(_nq.waitDequeueNotification());
+			if (_activity.isStopped()) return false;
 			if (pNf)
 			{
 				try
diff --git a/Net/include/Poco/Net/SocketReactor.h b/Net/include/Poco/Net/SocketReactor.h
index 2644f946f..8ee7bd9d0 100644
--- a/Net/include/Poco/Net/SocketReactor.h
+++ b/Net/include/Poco/Net/SocketReactor.h
@@ -62,7 +62,7 @@ class Net_API SocketReactor: public Poco::Runnable
 	/// is no base class for event handlers) can be registered
 	/// with the addEventHandler() method and deregistered with
 	/// the removeEventHandler() method.
-	/// 
+	///
 	/// An event handler is always registered for a certain socket,
 	/// which is given in the call to addEventHandler(). Any method
 	/// of the event handler class can be registered to handle the
@@ -75,9 +75,9 @@ class Net_API SocketReactor: public Poco::Runnable
 	/// If an event is detected, the corresponding event handler
 	/// is invoked. There are five event types (and corresponding
 	/// notification classes) defined: ReadableNotification, WritableNotification,
-	/// ErrorNotification, TimeoutNotification, IdleNotification and 
+	/// ErrorNotification, TimeoutNotification, IdleNotification and
 	/// ShutdownNotification.
-	/// 
+	///
 	/// The ReadableNotification will be dispatched if a socket becomes
 	/// readable. The WritableNotification will be dispatched if a socket
 	/// becomes writable. The ErrorNotification will be dispatched if
@@ -97,13 +97,13 @@ class Net_API SocketReactor: public Poco::Runnable
 	/// called repeatedly in a loop, it is recommended to do a
 	/// short sleep or yield in the event handler.
 	///
-	/// Finally, when the SocketReactor is about to shut down (as a result 
+	/// Finally, when the SocketReactor is about to shut down (as a result
 	/// of stop() being called), it dispatches a ShutdownNotification
 	/// to all event handlers. This is done in the onShutdown() method
 	/// which can be overridded by subclasses to perform custom
 	/// shutdown processing.
 	///
-	/// The SocketReactor is implemented so that it can 
+	/// The SocketReactor is implemented so that it can
 	/// run in its own thread. It is also possible to run
 	/// multiple SocketReactors in parallel, as long as
 	/// they work on different sockets.
@@ -126,7 +126,7 @@ public:
 	void run();
 		/// Runs the SocketReactor. The reactor will run
 		/// until stop() is called (in a separate thread).
-		
+
 	void stop();
 		/// Stops the SocketReactor.
 		///
@@ -137,16 +137,16 @@ public:
 		/// Wakes up idle reactor.
 
 	void setTimeout(const Poco::Timespan& timeout);
-		/// Sets the timeout. 
+		/// Sets the timeout.
 		///
-		/// If no other event occurs for the given timeout 
+		/// If no other event occurs for the given timeout
 		/// interval, a timeout event is sent to all event listeners.
 		///
 		/// The default timeout is 250 milliseconds;
 		///
 		/// The timeout is passed to the Socket::select()
 		/// method.
-		
+
 	const Poco::Timespan& getTimeout() const;
 		/// Returns the timeout.
 
@@ -202,7 +202,7 @@ protected:
 	void dispatch(const Socket& socket, SocketNotification* pNotification);
 		/// Dispatches the given notification to all observers
 		/// registered for the given socket.
-		
+
 	void dispatch(SocketNotification* pNotification);
 		/// Dispatches the given notification to all observers.
 
diff --git a/Net/include/Poco/Net/SocketStream.h b/Net/include/Poco/Net/SocketStream.h
index 5a9a62c0e..d8faca9b2 100644
--- a/Net/include/Poco/Net/SocketStream.h
+++ b/Net/include/Poco/Net/SocketStream.h
@@ -44,16 +44,16 @@ public:
 
 	~SocketStreamBuf();
 		/// Destroys the SocketStreamBuf.
-		
+
 	StreamSocketImpl* socketImpl() const;
 		/// Returns the internal SocketImpl.
-	
+
 protected:
 	int readFromDevice(char* buffer, std::streamsize length);
 	int writeToDevice(const char* buffer, std::streamsize length);
 
 private:
-	enum 
+	enum
 	{
 		STREAM_BUFFER_SIZE = 1024
 	};
@@ -75,18 +75,18 @@ public:
 		///
 		/// The socket's SocketImpl must be a StreamSocketImpl,
 		/// otherwise an InvalidArgumentException is thrown.
-		
+
 	~SocketIOS();
 		/// Destroys the SocketIOS.
 		///
 		/// Flushes the buffer, but does not close the socket.
-		
+
 	SocketStreamBuf* rdbuf();
 		/// Returns a pointer to the internal SocketStreamBuf.
-		
+
 	void close();
 		/// Flushes the stream and closes the socket.
-		
+
 	StreamSocket socket() const;
 		/// Returns the underlying socket.
 
diff --git a/Net/include/Poco/Net/StreamSocketImpl.h b/Net/include/Poco/Net/StreamSocketImpl.h
index eb4196983..a60a9826b 100644
--- a/Net/include/Poco/Net/StreamSocketImpl.h
+++ b/Net/include/Poco/Net/StreamSocketImpl.h
@@ -36,10 +36,10 @@ public:
 	explicit StreamSocketImpl(SocketAddress::Family addressFamily);
 		/// Creates a SocketImpl, with the underlying
 		/// socket initialized for the given address family.
-		
+
 	StreamSocketImpl(poco_socket_t sockfd);
 		/// Creates a StreamSocketImpl using the given native socket.
-		
+
 	virtual int sendBytes(const void* buffer, int length, int flags = 0);
 		/// Ensures that all data in buffer is sent if the socket
 		/// is blocking. In case of a non-blocking socket, sends as
diff --git a/Net/include/Poco/Net/StringPartSource.h b/Net/include/Poco/Net/StringPartSource.h
index 8f2b478dc..344955a0a 100644
--- a/Net/include/Poco/Net/StringPartSource.h
+++ b/Net/include/Poco/Net/StringPartSource.h
@@ -35,7 +35,7 @@ public:
 		/// Creates the StringPartSource for the given string.
 		///
 		/// The MIME type is set to text/plain.
-	
+
 	StringPartSource(const std::string& str, const std::string& mediaType);
 		/// Creates the StringPartSource for the given
 		/// string and MIME type.
@@ -49,7 +49,7 @@ public:
 
 	std::istream& stream();
 		/// Returns a string input stream for the string.
-		
+
 	const std::string& filename() const;
 		/// Returns the filename portion of the path.
 
@@ -59,7 +59,7 @@ public:
 private:
 	std::istringstream _istr;
 	std::string        _filename;
-	
+
 	StringPartSource(const StringPartSource&);
 	StringPartSource& operator = (const StringPartSource&);
 };
diff --git a/Net/include/Poco/Net/TCPServer.h b/Net/include/Poco/Net/TCPServer.h
index c0b1cae01..8c22964d5 100644
--- a/Net/include/Poco/Net/TCPServer.h
+++ b/Net/include/Poco/Net/TCPServer.h
@@ -27,6 +27,7 @@
 #include "Poco/Runnable.h"
 #include "Poco/Thread.h"
 #include "Poco/ThreadPool.h"
+#include <atomic>
 
 
 namespace Poco {
@@ -48,7 +49,7 @@ class Net_API TCPServerConnectionFilter: public Poco::RefCountedObject
 {
 public:
 	using Ptr = Poco::AutoPtr<TCPServerConnectionFilter>;
-	
+
 	virtual bool accept(const StreamSocket& socket) = 0;
 		/// Returns true if the given StreamSocket connection should
 		/// be handled, and passed on to the TCPServerDispatcher.
@@ -92,7 +93,7 @@ class Net_API TCPServer: public Poco::Runnable
 	/// on the number of connections waiting to be served.
 	///
 	/// It is possible to specify a maximum number of queued connections.
-	/// This prevents the connection queue from overflowing in the 
+	/// This prevents the connection queue from overflowing in the
 	/// case of an extreme server load. In such a case, connections that
 	/// cannot be queued are silently and immediately closed.
 	///
@@ -150,7 +151,7 @@ public:
 
 	const TCPServerParams& params() const;
 		/// Returns a const reference to the TCPServerParam object
-		/// used by the server's TCPServerDispatcher.	
+		/// used by the server's TCPServerDispatcher.
 
 	void start();
 		/// Starts the server. A new thread will be
@@ -167,7 +168,7 @@ public:
 		/// Already handled connections will continue to be served.
 		///
 		/// Once the server has been stopped, it cannot be restarted.
-		
+
 	int currentThreads() const;
 		/// Returns the number of currently used connection threads.
 
@@ -176,13 +177,13 @@ public:
 
 	int totalConnections() const;
 		/// Returns the total number of handled connections.
-		
+
 	int currentConnections() const;
 		/// Returns the number of currently handled connections.
 
 	int maxConcurrentConnections() const;
-		/// Returns the maximum number of concurrently handled connections.	
-		
+		/// Returns the maximum number of concurrently handled connections.
+
 	int queuedConnections() const;
 		/// Returns the number of queued connections.
 
@@ -203,9 +204,9 @@ public:
 		/// be set before the TCPServer is started. Trying to set
 		/// the filter after start() has been called will trigger
 		/// an assertion.
-		
+
 	TCPServerConnectionFilter::Ptr getConnectionFilter() const;
-		/// Returns the TCPServerConnectionFilter set with setConnectionFilter(), 
+		/// Returns the TCPServerConnectionFilter set with setConnectionFilter(),
 		/// or null pointer if no filter has been set.
 
 protected:
@@ -222,12 +223,12 @@ private:
 	TCPServer();
 	TCPServer(const TCPServer&);
 	TCPServer& operator = (const TCPServer&);
-	
+
 	ServerSocket _socket;
 	TCPServerDispatcher* _pDispatcher;
 	TCPServerConnectionFilter::Ptr _pConnectionFilter;
 	Poco::Thread _thread;
-	bool _stopped;
+	std::atomic<bool> _stopped;
 };
 
 
diff --git a/Net/include/Poco/Net/TCPServerConnection.h b/Net/include/Poco/Net/TCPServerConnection.h
index 380edcc16..d4420b38d 100644
--- a/Net/include/Poco/Net/TCPServerConnection.h
+++ b/Net/include/Poco/Net/TCPServerConnection.h
@@ -64,9 +64,9 @@ private:
 	TCPServerConnection();
 	TCPServerConnection(const TCPServerConnection&);
 	TCPServerConnection& operator = (const TCPServerConnection&);
-	
+
 	StreamSocket _socket;
-	
+
 	friend class TCPServerDispatcher;
 };
 
diff --git a/Net/include/Poco/Net/TCPServerConnectionFactory.h b/Net/include/Poco/Net/TCPServerConnectionFactory.h
index 234174fdf..380cb2dbd 100644
--- a/Net/include/Poco/Net/TCPServerConnectionFactory.h
+++ b/Net/include/Poco/Net/TCPServerConnectionFactory.h
@@ -44,7 +44,7 @@ class Net_API TCPServerConnectionFactory
 {
 public:
 	using Ptr = Poco::SharedPtr<TCPServerConnectionFactory>;
-	
+
 	virtual ~TCPServerConnectionFactory();
 		/// Destroys the TCPServerConnectionFactory.
 
@@ -71,11 +71,11 @@ public:
 	TCPServerConnectionFactoryImpl()
 	{
 	}
-	
+
 	~TCPServerConnectionFactoryImpl()
 	{
 	}
-	
+
 	TCPServerConnection* createConnection(const StreamSocket& socket)
 	{
 		return new S(socket);
diff --git a/Net/include/Poco/Net/TCPServerDispatcher.h b/Net/include/Poco/Net/TCPServerDispatcher.h
index 3c46d0f26..8070b2973 100644
--- a/Net/include/Poco/Net/TCPServerDispatcher.h
+++ b/Net/include/Poco/Net/TCPServerDispatcher.h
@@ -26,6 +26,7 @@
 #include "Poco/NotificationQueue.h"
 #include "Poco/ThreadPool.h"
 #include "Poco/Mutex.h"
+#include <atomic>
 
 
 namespace Poco {
@@ -50,35 +51,35 @@ public:
 	void release();
 		/// Decrements the object's reference count
 		/// and deletes the object if the count
-		/// reaches zero.	
+		/// reaches zero.
 
 	void run();
 		/// Runs the dispatcher.
-		
+
 	void enqueue(const StreamSocket& socket);
 		/// Queues the given socket connection.
 
 	void stop();
 		/// Stops the dispatcher.
-			
+
 	int currentThreads() const;
 		/// Returns the number of currently used threads.
 
 	int maxThreads() const;
 		/// Returns the maximum number of threads available.
-		
+
 	int totalConnections() const;
 		/// Returns the total number of handled connections.
-		
+
 	int currentConnections() const;
-		/// Returns the number of currently handled connections.	
+		/// Returns the number of currently handled connections.
 
 	int maxConcurrentConnections() const;
-		/// Returns the maximum number of concurrently handled connections.	
-		
+		/// Returns the maximum number of concurrently handled connections.
+
 	int queuedConnections() const;
-		/// Returns the number of queued connections.	
-	
+		/// Returns the number of queued connections.
+
 	int refusedConnections() const;
 		/// Returns the number of refused connections.
 
@@ -91,7 +92,7 @@ protected:
 
 	void beginConnection();
 		/// Updates the performance counters.
-		
+
 	void endConnection();
 		/// Updates the performance counters.
 
@@ -100,14 +101,38 @@ private:
 	TCPServerDispatcher(const TCPServerDispatcher&);
 	TCPServerDispatcher& operator = (const TCPServerDispatcher&);
 
-	int _rc;
+	class ThreadCountWatcher
+	{
+	public:
+		ThreadCountWatcher(TCPServerDispatcher* pDisp) : _pDisp(pDisp)
+		{
+		}
+
+		~ThreadCountWatcher()
+		{
+			FastMutex::ScopedLock lock(_pDisp->_mutex);
+			if (_pDisp->_currentThreads > 1 && _pDisp->_queue.empty())
+			{
+				--_pDisp->_currentThreads;
+			}
+		}
+
+		private:
+			ThreadCountWatcher();
+			ThreadCountWatcher(const ThreadCountWatcher&);
+			ThreadCountWatcher& operator=(const ThreadCountWatcher&);
+
+			TCPServerDispatcher* _pDisp;
+	};
+
+	std::atomic<int> _rc;
 	TCPServerParams::Ptr _pParams;
-	int  _currentThreads;
-	int  _totalConnections;
-	int  _currentConnections;
-	int  _maxConcurrentConnections;
-	int  _refusedConnections;
-	bool _stopped;
+	std::atomic<int>  _currentThreads;
+	std::atomic<int>  _totalConnections;
+	std::atomic<int>  _currentConnections;
+	std::atomic<int>  _maxConcurrentConnections;
+	std::atomic<int>  _refusedConnections;
+	std::atomic<bool> _stopped;
 	Poco::NotificationQueue         _queue;
 	TCPServerConnectionFactory::Ptr _pConnectionFactory;
 	Poco::ThreadPool&               _threadPool;
diff --git a/Net/include/Poco/Net/TCPServerParams.h b/Net/include/Poco/Net/TCPServerParams.h
index 1495d7a34..362b9c6ee 100644
--- a/Net/include/Poco/Net/TCPServerParams.h
+++ b/Net/include/Poco/Net/TCPServerParams.h
@@ -37,7 +37,7 @@ class Net_API TCPServerParams: public Poco::RefCountedObject
 {
 public:
 	using Ptr = Poco::AutoPtr<TCPServerParams>;
-	
+
 	TCPServerParams();
 		/// Creates the TCPServerParams.
 		///
@@ -51,7 +51,7 @@ public:
 		/// it is terminated.
 		///
 		/// The default idle time is 10 seconds;
-		
+
 	const Poco::Timespan& getThreadIdleTime() const;
 		/// Returns the maximum thread idle time.
 
@@ -63,7 +63,7 @@ public:
 		/// in the queue, new connections will be silently discarded.
 		///
 		/// The default number is 64.
-		
+
 	int getMaxQueued() const;
 		/// Returns the maximum number of queued connections.
 
@@ -79,18 +79,18 @@ public:
 		/// The thread pool used by the TCPServerDispatcher
 		/// must at least have the capacity for the given
 		/// number of threads.
-		
+
 	int getMaxThreads() const;
 		/// Returns the maximum number of simultaneous threads
-		/// available for this TCPServerDispatcher.	
-		
+		/// available for this TCPServerDispatcher.
+
 	void setThreadPriority(Poco::Thread::Priority prio);
-		/// Sets the priority of TCP server threads 
+		/// Sets the priority of TCP server threads
 		/// created by TCPServer.
-		
+
 	Poco::Thread::Priority getThreadPriority() const;
 		/// Returns the priority of TCP server threads
-		/// created by TCPServer. 
+		/// created by TCPServer.
 
 protected:
 	virtual ~TCPServerParams();
diff --git a/Net/include/Poco/Net/UDPClient.h b/Net/include/Poco/Net/UDPClient.h
index ecd8d076b..98889e45d 100644
--- a/Net/include/Poco/Net/UDPClient.h
+++ b/Net/include/Poco/Net/UDPClient.h
@@ -86,7 +86,7 @@ private:
 	DatagramSocket      _socket;
 	SocketAddress       _address;
 	Thread*             _pThread;
-	bool                _stop;
+	std::atomic<bool>   _stop;
 	Poco::AtomicCounter _dataBacklog;
 	Poco::AtomicCounter _errorBacklog;
 };
diff --git a/Net/include/Poco/Net/UDPHandler.h b/Net/include/Poco/Net/UDPHandler.h
index 02795e4a5..09730f521 100644
--- a/Net/include/Poco/Net/UDPHandler.h
+++ b/Net/include/Poco/Net/UDPHandler.h
@@ -30,6 +30,7 @@
 #include "Poco/StringTokenizer.h"
 #include <deque>
 #include <cstring>
+#include <atomic>
 
 
 namespace Poco {
@@ -44,11 +45,12 @@ template <std::size_t S = POCO_UDP_BUF_SIZE>
 class UDPHandlerImpl: public Runnable, public RefCountedObject
 	/// UDP handler handles the data that arrives to the UDP server.
 	/// The class is thread-safe and runs in its own thread, so many handlers
-	/// can be used in parallel.Handler manages and provides the storage
+	/// can be used in parallel. Handler manages and provides the storage
 	/// (fixed-size memory blocks of S size) to the reader, which signals back
 	/// to the handler when there is data or error ready for processing.
 	/// Typically, user will inherit from this class and override processData()
-	/// and processError() members to do the actual work.
+	/// and processError() members to do the actual work. To auto-start the handler,
+	/// the inheriting class can call start() in the constructor.
 {
 public:
 	typedef UDPMsgSizeT             MsgSizeT;
@@ -76,7 +78,6 @@ public:
 		_pErr(pErr)
 		/// Creates the UDPHandlerImpl.
 	{
-		_thread.start(*this);
 	}
 
 	~UDPHandlerImpl()
@@ -143,9 +144,9 @@ public:
 	}
 
 	void notify()
-		/// Sets the ready event.
+		/// Sets the data ready event.
 	{
-		_ready.set();
+		_dataReady.set();
 	}
 
 	void run()
@@ -153,28 +154,31 @@ public:
 	{
 		while (!_stop)
 		{
-			_ready.wait();
+			_dataReady.wait();
 			if (_stop) break;
 			if (_mutex.tryLock(10))
 			{
-				BufMap::iterator it = _buffers.begin();
-				BufMap::iterator end = _buffers.end();
-				for (; it != end; ++it)
+				if (!_stop)
 				{
-					BufList::iterator lIt = it->second.begin();
-					BufList::iterator lEnd = it->second.end();
-					for (; lIt != lEnd; ++lIt)
+					BufMap::iterator it = _buffers.begin();
+					BufMap::iterator end = _buffers.end();
+					for (; it != end; ++it)
 					{
-						if (hasData(*lIt))
+						BufList::iterator lIt = it->second.begin();
+						BufList::iterator lEnd = it->second.end();
+						for (; lIt != lEnd; ++lIt)
 						{
-							processData(*lIt);
-							--_dataBacklog;
-							setIdle(*lIt);
-						}
-						else if (isError(*lIt))
-						{
-							processError(*lIt);
-							++_errorBacklog;
+							if (hasData(*lIt))
+							{
+								processData(*lIt);
+								--_dataBacklog;
+								setIdle(*lIt);
+							}
+							else if (isError(*lIt))
+							{
+								processError(*lIt);
+								++_errorBacklog;
+							}
 						}
 					}
 				}
@@ -188,7 +192,7 @@ public:
 		/// Signals the handler to stop.
 	{
 		_stop = true;
-		_ready.set();
+		_dataReady.set();
 	}
 
 	bool stopped() const
@@ -329,6 +333,12 @@ public:
 		setIdle(buf);
 	}
 
+	void start()
+		/// Stars the handler run in thread.
+	{
+		_thread.start(*this);
+	}
+
 private:
 	typedef std::deque<char*>                BufList;
 	typedef std::map<poco_socket_t, BufList> BufMap;
@@ -355,10 +365,10 @@ private:
 		*ret = _buffers[sock].back();
 	}
 
-	Poco::Event       _ready;
+	Poco::Event       _dataReady;
 	Poco::Thread      _thread;
-	bool              _stop;
-	bool              _done;
+	std::atomic<bool> _stop;
+	std::atomic<bool> _done;
 	BufMap            _buffers;
 	BufIt             _bufIt;
 	std::size_t       _bufListSize;
diff --git a/Net/include/Poco/Net/UDPServer.h b/Net/include/Poco/Net/UDPServer.h
index 1742dedc9..a65036745 100644
--- a/Net/include/Poco/Net/UDPServer.h
+++ b/Net/include/Poco/Net/UDPServer.h
@@ -90,9 +90,9 @@ public:
 	}
 
 private:
-	P            _poller;
+	P _poller;
 	Poco::Thread _thread;
-	bool         _stop;
+	std::atomic<bool> _stop;
 };
 
 
diff --git a/Net/include/Poco/Net/WebSocket.h b/Net/include/Poco/Net/WebSocket.h
index 183daf6d2..e6cf92746 100644
--- a/Net/include/Poco/Net/WebSocket.h
+++ b/Net/include/Poco/Net/WebSocket.h
@@ -278,6 +278,9 @@ public:
 		/// after any previous content in buffer.
 		/// The buffer will be grown as necessary.
 		///
+		/// See the note below if you want the received data
+		/// to be stored at the beginning of the buffer.
+		///
 		/// The frame's payload size must not exceed the
 		/// maximum payload size set with setMaxPayloadSize().
 		/// If it does, a WebSocketException (WS_ERR_PAYLOAD_TOO_BIG)
@@ -304,6 +307,13 @@ public:
 		///
 		/// The frame flags and opcode (FrameFlags and FrameOpcodes)
 		/// is stored in flags.
+		///
+		/// Note: Since the data received from the WebSocket is appended
+		/// to the given Poco::Buffer, the buffer passed to this method
+		/// should be created with a size of 0, or resize(0) should be
+		/// called on the buffer beforehand, if the expectation is that
+		/// the received data is stored starting at the beginning of the
+		/// buffer.
 
 	Mode mode() const;
 		/// Returns WS_SERVER if the WebSocket is a server-side
diff --git a/Net/include/Poco/Net/WebSocketImpl.h b/Net/include/Poco/Net/WebSocketImpl.h
index fa1284d5b..71f6fd92b 100644
--- a/Net/include/Poco/Net/WebSocketImpl.h
+++ b/Net/include/Poco/Net/WebSocketImpl.h
@@ -45,7 +45,7 @@ public:
 
 	virtual int receiveBytes(void* buffer, int length, int flags);
 		/// Receives a WebSocket protocol frame.
-		
+
 	virtual int receiveBytes(Poco::Buffer<char>& buffer, int flags = 0, const Poco::Timespan& span = 0);
 		/// Receives a WebSocket protocol frame.
 
diff --git a/Net/samples/CMakeLists.txt b/Net/samples/CMakeLists.txt
index 9cf2a0457..fc7067670 100644
--- a/Net/samples/CMakeLists.txt
+++ b/Net/samples/CMakeLists.txt
@@ -10,4 +10,6 @@ add_subdirectory(WebSocketServer)
 add_subdirectory(dict)
 add_subdirectory(download)
 add_subdirectory(httpget)
+add_subdirectory(tcpserver)
+add_subdirectory(ifconfig)
 
diff --git a/Net/samples/EchoServer/EchoServer.progen b/Net/samples/EchoServer/EchoServer.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/EchoServer/EchoServer.progen
+++ b/Net/samples/EchoServer/EchoServer.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/EchoServer/src/EchoServer.cpp b/Net/samples/EchoServer/src/EchoServer.cpp
index 788be41a4..71cffa47c 100644
--- a/Net/samples/EchoServer/src/EchoServer.cpp
+++ b/Net/samples/EchoServer/src/EchoServer.cpp
@@ -51,7 +51,7 @@ class EchoServiceHandler
 	/// data availability. To ensure non-blocking behavior and alleviate spurious
 	/// socket writability callback triggering when no data to be sent is available,
 	/// FIFO buffers are used. I/O FIFOBuffer sends notifications on transitions
-	/// from [1] non-readable (i.e. empty) to readable, [2] writable to non-writable 
+	/// from [1] non-readable (i.e. empty) to readable, [2] writable to non-writable
 	/// (i.e. full) and [3] non-writable (i.e. full) to writable.
 	/// Based on these notifications, the handler member functions react by
 	/// enabling/disabling respective reactor framework notifications.
@@ -72,7 +72,7 @@ public:
 		_fifoOut.readable += delegate(this, &EchoServiceHandler::onFIFOOutReadable);
 		_fifoIn.writable += delegate(this, &EchoServiceHandler::onFIFOInWritable);
 	}
-	
+
 	~EchoServiceHandler()
 	{
 		Application& app = Application::instance();
@@ -90,7 +90,7 @@ public:
 		_fifoOut.readable -= delegate(this, &EchoServiceHandler::onFIFOOutReadable);
 		_fifoIn.writable -= delegate(this, &EchoServiceHandler::onFIFOInWritable);
 	}
-	
+
 	void onFIFOOutReadable(bool& b)
 	{
 		if (b)
@@ -98,7 +98,7 @@ public:
 		else
 			_reactor.removeEventHandler(_socket, NObserver<EchoServiceHandler, WritableNotification>(*this, &EchoServiceHandler::onSocketWritable));
 	}
-	
+
 	void onFIFOInWritable(bool& b)
 	{
 		if (b)
@@ -106,7 +106,7 @@ public:
 		else
 			_reactor.removeEventHandler(_socket, NObserver<EchoServiceHandler, ReadableNotification>(*this, &EchoServiceHandler::onSocketReadable));
 	}
-	
+
 	void onSocketReadable(const AutoPtr<ReadableNotification>& pNf)
 	{
 		try
@@ -128,7 +128,7 @@ public:
 			delete this;
 		}
 	}
-	
+
 	void onSocketWritable(const AutoPtr<WritableNotification>& pNf)
 	{
 		try
@@ -147,13 +147,13 @@ public:
 	{
 		delete this;
 	}
-	
+
 private:
 	enum
 	{
 		BUFFER_SIZE = 1024
 	};
-	
+
 	StreamSocket   _socket;
 	SocketReactor& _reactor;
 	FIFOBuffer     _fifoIn;
@@ -184,7 +184,7 @@ public:
 	EchoServer(): _helpRequested(false)
 	{
 	}
-	
+
 	~EchoServer()
 	{
 	}
@@ -195,7 +195,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		ServerApplication::initialize(self);
 	}
-		
+
 	void uninitialize()
 	{
 		ServerApplication::uninitialize();
@@ -204,7 +204,7 @@ protected:
 	void defineOptions(OptionSet& options)
 	{
 		ServerApplication::defineOptions(options);
-		
+
 		options.addOption(
 			Option("help", "h", "display help information on command line arguments")
 				.required(false)
@@ -238,14 +238,14 @@ protected:
 		{
 			// get parameters from configuration file
 			unsigned short port = (unsigned short) config().getInt("EchoServer.port", 9977);
-			
+
 			// set-up a server socket
 			ServerSocket svs(port);
 			// set-up a SocketReactor...
 			SocketReactor reactor;
 			// ... and a SocketAcceptor
 			SocketAcceptor<EchoServiceHandler> acceptor(svs, reactor);
-			// run the reactor in its own thread so that we can wait for 
+			// run the reactor in its own thread so that we can wait for
 			// a termination request
 			Thread thread;
 			thread.start(reactor);
@@ -257,7 +257,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/Net/samples/HTTPFormServer/HTTPFormServer.progen b/Net/samples/HTTPFormServer/HTTPFormServer.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/HTTPFormServer/HTTPFormServer.progen
+++ b/Net/samples/HTTPFormServer/HTTPFormServer.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/HTTPFormServer/src/HTTPFormServer.cpp b/Net/samples/HTTPFormServer/src/HTTPFormServer.cpp
index ce22719fe..2b948ce69 100644
--- a/Net/samples/HTTPFormServer/src/HTTPFormServer.cpp
+++ b/Net/samples/HTTPFormServer/src/HTTPFormServer.cpp
@@ -59,7 +59,7 @@ public:
 		_length(0)
 	{
 	}
-	
+
 	void handlePart(const MessageHeader& header, std::istream& stream)
 	{
 		_type = header.get("Content-Type", "(unspecified)");
@@ -71,18 +71,18 @@ public:
 			_name = params.get("name", "(unnamed)");
 			_fileName = params.get("filename", "(unnamed)");
 		}
-		
+
 		CountingInputStream istr(stream);
 		NullOutputStream ostr;
 		StreamCopier::copyStream(istr, ostr);
 		_length = istr.chars();
 	}
-	
+
 	int length() const
 	{
 		return _length;
 	}
-	
+
 	const std::string& name() const
 	{
 		return _name;
@@ -92,12 +92,12 @@ public:
 	{
 		return _fileName;
 	}
-	
+
 	const std::string& contentType() const
 	{
 		return _type;
 	}
-	
+
 private:
 	int _length;
 	std::string _type;
@@ -110,10 +110,10 @@ class FormRequestHandler: public HTTPRequestHandler
 	/// Return a HTML document with the current date and time.
 {
 public:
-	FormRequestHandler() 
+	FormRequestHandler()
 	{
 	}
-	
+
 	void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
 	{
 		Application& app = Application::instance();
@@ -126,7 +126,7 @@ public:
 		response.setContentType("text/html");
 
 		std::ostream& ostr = response.send();
-		
+
 		ostr <<
 			"<html>\n"
 			"<head>\n"
@@ -149,7 +149,7 @@ public:
 			"<input type=\"file\" name=\"file\" size=\"31\"> \n"
 			"<input type=\"submit\" value=\"Upload\">\n"
 			"</form>\n";
-			
+
 		ostr << "<h2>Request</h2><p>\n";
 		ostr << "Method: " << request.getMethod() << "<br>\n";
 		ostr << "URI: " << request.getURI() << "<br>\n";
@@ -172,7 +172,7 @@ public:
 			}
 			ostr << "</p>";
 		}
-		
+
 		if (!partHandler.name().empty())
 		{
 			ostr << "<h2>Upload</h2><p>\n";
@@ -224,7 +224,7 @@ public:
 	HTTPFormServer(): _helpRequested(false)
 	{
 	}
-	
+
 	~HTTPFormServer()
 	{
 	}
@@ -235,7 +235,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		ServerApplication::initialize(self);
 	}
-		
+
 	void uninitialize()
 	{
 		ServerApplication::uninitialize();
@@ -244,7 +244,7 @@ protected:
 	void defineOptions(OptionSet& options)
 	{
 		ServerApplication::defineOptions(options);
-		
+
 		options.addOption(
 			Option("help", "h", "display help information on command line arguments")
 				.required(false)
@@ -277,7 +277,7 @@ protected:
 		else
 		{
 			unsigned short port = (unsigned short) config().getInt("HTTPFormServer.port", 9980);
-			
+
 			// set-up a server socket
 			ServerSocket svs(port);
 			// set-up a HTTPServer instance
@@ -291,7 +291,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest.progen b/Net/samples/HTTPLoadTest/HTTPLoadTest.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/HTTPLoadTest/HTTPLoadTest.progen
+++ b/Net/samples/HTTPLoadTest/HTTPLoadTest.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp b/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp
index d9df29f6f..99b2cf7f0 100644
--- a/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp
+++ b/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp
@@ -62,11 +62,11 @@ class HTTPClient : public Runnable
 {
 public:
 	HTTPClient(const URI& uri, int repetitions, bool cookies=false, bool verbose=false):
-	  _uri(uri), 
-	  _verbose(verbose), 
-	  _cookies(cookies), 
-	  _repetitions(repetitions), 
-	  _usec(0), 
+	  _uri(uri),
+	  _verbose(verbose),
+	  _cookies(cookies),
+	  _repetitions(repetitions),
+	  _usec(0),
 	  _success(0)
 	{
 		_gRepetitions += _repetitions;
@@ -91,7 +91,7 @@ public:
 
 				HTTPClientSession session(_uri.getHost(), _uri.getPort());
 				HTTPRequest req(HTTPRequest::HTTP_GET, path, HTTPMessage::HTTP_1_1);
-				
+
 				if (_cookies)
 				{
 					NameValueCollection nvc;
@@ -116,8 +116,8 @@ public:
 				if (_verbose)
 				{
 					FastMutex::ScopedLock lock(_mutex);
-					std::cout 
-					<< _uri.toString() << ' ' << res.getStatus() << ' ' << res.getReason() 
+					std::cout
+					<< _uri.toString() << ' ' << res.getStatus() << ' ' << res.getReason()
 					<< ' ' << usec/1000.0 << "ms" << std::endl;
 				}
 
@@ -129,7 +129,7 @@ public:
 				std::cerr << exc.displayText() << std::endl;
 			}
 		}
-		
+
 		{
 			FastMutex::ScopedLock lock(_mutex);
 			_gSuccess += _success;
@@ -183,10 +183,10 @@ void HTTPClient::printStats(std::string uri, int repetitions, int success, Poco:
 {
 	FastMutex::ScopedLock lock(_mutex);
 
-	std::cout << std::endl << "--------------" << std::endl 
-		<< "Statistics for " << uri << std::endl << "--------------" 
+	std::cout << std::endl << "--------------" << std::endl
+		<< "Statistics for " << uri << std::endl << "--------------"
 		<< std::endl
-		<< repetitions << " attempts, " << success << " succesful (" 
+		<< repetitions << " attempts, " << success << " succesful ("
 		<<  ((float) success / (float) repetitions) * 100.0 << "%)" << std::endl
 		<< "Avg response time: " << ((float) usec / (float) repetitions) / 1000.0 << "ms, " << std::endl
 		<< "Avg requests/second handled: " << ((float) success  /((float) usec / 1000000.0)) << std::endl
@@ -201,35 +201,35 @@ class HTTPLoadTest: public Application
 	/// more information.
 {
 public:
-	HTTPLoadTest(): 
-		_helpRequested(false), 
-		_verbose(false), 
+	HTTPLoadTest():
+		_helpRequested(false),
+		_verbose(false),
 		_cookies(false),
-		_repetitions(1), 
+		_repetitions(1),
 		_threads(1)
 	{
 	}
 
-protected:	
+protected:
 	void initialize(Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Application::initialize(self);
 		// add your own initialization code here
 	}
-	
+
 	void uninitialize()
 	{
 		// add your own uninitialization code here
 		Application::uninitialize();
 	}
-	
+
 	void reinitialize(Application& self)
 	{
 		Application::reinitialize(self);
 		// add your own reinitialization code here
 	}
-	
+
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -254,7 +254,7 @@ protected:
 				.required(true)
 				.repeatable(false)
 				.argument("uri"));
-				
+
 		options.addOption(
 			Option("repetitions", "r", "fetch repetitions")
 				.required(false)
@@ -267,7 +267,7 @@ protected:
 				.repeatable(false)
 				.argument("threads"));
 	}
-	
+
 	void handleOption(const std::string& name, const std::string& value)
 	{
 		Application::handleOption(name, value);
@@ -285,7 +285,7 @@ protected:
 		else if (name == "threads")
 			_threads = NumberParser::parse(value);
 	}
-	
+
 	void displayHelp()
 	{
 		HelpFormatter helpFormatter(options());
@@ -294,7 +294,7 @@ protected:
 		helpFormatter.setHeader("A sample application that demonstrates some of the features of the Poco::Util::Application class.");
 		helpFormatter.format(std::cout);
 	}
-	
+
 	void defineProperty(const std::string& def)
 	{
 		std::string name;
@@ -342,10 +342,10 @@ protected:
 
 			HTTPClient::printStats(_uri, HTTPClient::totalAttempts(), HTTPClient::totalSuccessCount(), sw.elapsed());
 		}
-		
+
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 	bool _verbose;
diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer.progen b/Net/samples/HTTPTimeServer/HTTPTimeServer.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/HTTPTimeServer/HTTPTimeServer.progen
+++ b/Net/samples/HTTPTimeServer/HTTPTimeServer.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp b/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp
index 94a47a91d..3289c3d1e 100644
--- a/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp
+++ b/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp
@@ -52,11 +52,11 @@ class TimeRequestHandler: public HTTPRequestHandler
 	/// Return a HTML document with the current date and time.
 {
 public:
-	TimeRequestHandler(const std::string& format): 
+	TimeRequestHandler(const std::string& format):
 		_format(format)
 	{
 	}
-	
+
 	void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
 	{
 		Application& app = Application::instance();
@@ -75,7 +75,7 @@ public:
 		ostr << dt;
 		ostr << "</p></body></html>";
 	}
-	
+
 private:
 	std::string _format;
 };
@@ -96,7 +96,7 @@ public:
 		else
 			return 0;
 	}
-	
+
 private:
 	std::string _format;
 };
@@ -125,7 +125,7 @@ public:
 	HTTPTimeServer(): _helpRequested(false)
 	{
 	}
-	
+
 	~HTTPTimeServer()
 	{
 	}
@@ -136,7 +136,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		ServerApplication::initialize(self);
 	}
-		
+
 	void uninitialize()
 	{
 		ServerApplication::uninitialize();
@@ -145,7 +145,7 @@ protected:
 	void defineOptions(OptionSet& options)
 	{
 		ServerApplication::defineOptions(options);
-		
+
 		options.addOption(
 			Option("help", "h", "display help information on command line arguments")
 				.required(false)
@@ -183,11 +183,11 @@ protected:
 			int maxQueued  = config().getInt("HTTPTimeServer.maxQueued", 100);
 			int maxThreads = config().getInt("HTTPTimeServer.maxThreads", 16);
 			ThreadPool::defaultPool().addCapacity(maxThreads);
-			
+
 			HTTPServerParams* pParams = new HTTPServerParams;
 			pParams->setMaxQueued(maxQueued);
 			pParams->setMaxThreads(maxThreads);
-			
+
 			// set-up a server socket
 			ServerSocket svs(port);
 			// set-up a HTTPServer instance
@@ -201,7 +201,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/Net/samples/Mail/Mail.progen b/Net/samples/Mail/Mail.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/Mail/Mail.progen
+++ b/Net/samples/Mail/Mail.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/Mail/src/Mail.cpp b/Net/samples/Mail/src/Mail.cpp
index 3a8b52c3b..b95a324a7 100644
--- a/Net/samples/Mail/src/Mail.cpp
+++ b/Net/samples/Mail/src/Mail.cpp
@@ -43,11 +43,11 @@ int main(int argc, char** argv)
 		std::cerr << "       using the SMTP server at <mailhost>." << std::endl;
 		return 1;
 	}
-	
+
 	std::string mailhost(argv[1]);
 	std::string sender(argv[2]);
 	std::string recipient(argv[3]);
-	
+
 	try
 	{
 		MailMessage message;
@@ -62,7 +62,7 @@ int main(int argc, char** argv)
 		std::string logo(reinterpret_cast<const char*>(PocoLogo), sizeof(PocoLogo));
 		message.addContent(new StringPartSource(content));
 		message.addAttachment("logo", new StringPartSource(logo, "image/gif"));
-		
+
 		SMTPClientSession session(mailhost);
 		session.login();
 		session.sendMessage(message);
diff --git a/Net/samples/Mail/src/PocoLogo.hpp b/Net/samples/Mail/src/PocoLogo.hpp
index a1b39a593..31e2b7fa8 100644
--- a/Net/samples/Mail/src/PocoLogo.hpp
+++ b/Net/samples/Mail/src/PocoLogo.hpp
@@ -1,134 +1,134 @@
 // The C++ Portable Components logo in GIF format
 
-0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0xa0, 0x00, 0x85, 0x00, 0xa2, 0x00, 0x00, 0xd1, 0xdd, 0xe4, 
-0x45, 0x9b, 0xca, 0x41, 0x55, 0x61, 0x8a, 0x96, 0x9e, 0xa2, 0xbc, 0xcc, 0x00, 0x1b, 0x2c, 0x00, 
-0x75, 0xb6, 0xff, 0xff, 0xff, 0x21, 0xf9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 
-0x00, 0x00, 0xa0, 0x00, 0x85, 0x00, 0x00, 0x03, 0xff, 0x78, 0xba, 0xdc, 0xfe, 0x30, 0xca, 0x49, 
-0xab, 0xbd, 0x38, 0xeb, 0xcd, 0xbb, 0xff, 0x60, 0x28, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 
-0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x2b, 0x40, 0xdc, 0x78, 0xae, 0xef, 0x04, 0xe0, 0xda, 0xbc, 
-0xe0, 0x0e, 0xe0, 0xeb, 0x00, 0x06, 0xc5, 0xc5, 0x6d, 0x72, 0x4b, 0x76, 0x08, 0x01, 0x83, 0x74, 
-0x4a, 0xad, 0x5a, 0xab, 0x01, 0x27, 0x09, 0x10, 0xbd, 0x7a, 0xbf, 0x86, 0x40, 0x6f, 0x33, 0x28, 
-0x10, 0x1a, 0x85, 0x82, 0x44, 0x90, 0x2e, 0x68, 0x2f, 0xb6, 0x2e, 0x78, 0x7e, 0x15, 0x8f, 0xe2, 
-0xf4, 0xbc, 0xd5, 0x8e, 0x29, 0x9f, 0x09, 0x48, 0x07, 0x69, 0x11, 0x65, 0x02, 0x6c, 0x03, 0x1b, 
-0x72, 0x7a, 0x8b, 0x54, 0x67, 0x1f, 0x8a, 0x8c, 0x8c, 0x59, 0x17, 0x7e, 0x82, 0x66, 0x96, 0x11, 
-0x69, 0x3e, 0x05, 0x02, 0x19, 0x5c, 0x91, 0xa0, 0x53, 0x8e, 0x1c, 0x90, 0xa1, 0x8b, 0xa3, 0x13, 
-0x95, 0x69, 0x67, 0x83, 0x0c, 0x36, 0x0a, 0x9a, 0x82, 0x9d, 0x70, 0xa6, 0xb5, 0x93, 0x19, 0x04, 
-0xb5, 0xb6, 0x15, 0xaa, 0x97, 0xad, 0x0b, 0x6c, 0xac, 0x6e, 0xb2, 0x17, 0xb9, 0xba, 0xb5, 0x6f, 
-0x12, 0xc6, 0xc7, 0xa6, 0xc9, 0x0c, 0xbd, 0x3d, 0xbf, 0x0a, 0xc1, 0x96, 0x3e, 0x44, 0x16, 0xcb, 
-0xcc, 0xa0, 0x01, 0xb4, 0xda, 0xa6, 0xdc, 0x12, 0x65, 0x9c, 0x69, 0x86, 0x9c, 0x0d, 0xd4, 0xb1, 
-0xdd, 0xde, 0xa1, 0xe0, 0x4c, 0xeb, 0xbb, 0xe1, 0x6d, 0x6d, 0x02, 0x5a, 0xe2, 0x6c, 0xb3, 0x17, 
-0xa5, 0xef, 0x7a, 0xed, 0x11, 0xfb, 0xb5, 0xa8, 0x1e, 0x10, 0x19, 0xe8, 0x8c, 0x0d, 0x27, 0x67, 
-0x10, 0xb2, 0xfd, 0x63, 0x84, 0xf0, 0x80, 0xc2, 0x85, 0x8b, 0x1a, 0xc2, 0x09, 0x48, 0x01, 0x00, 
-0xc4, 0x50, 0x14, 0x17, 0x58, 0xbc, 0xb8, 0x0d, 0xff, 0x83, 0x21, 0x11, 0xfa, 0xbc, 0x88, 0x21, 
-0x48, 0xb2, 0x24, 0x91, 0x1b, 0x21, 0xaf, 0x38, 0x7b, 0xf8, 0xa5, 0x87, 0xc9, 0x97, 0x04, 0xa1, 
-0x44, 0xbc, 0x20, 0x4d, 0xe3, 0x90, 0x09, 0xfc, 0x3e, 0x7c, 0xa2, 0x93, 0xf1, 0x80, 0x9e, 0x9e, 
-0x18, 0x36, 0xf2, 0xa4, 0xa9, 0xa6, 0x81, 0x38, 0x79, 0x35, 0x1b, 0x08, 0x05, 0x23, 0xb1, 0x58, 
-0x9e, 0x07, 0x2c, 0xad, 0x34, 0x75, 0x3a, 0xa7, 0xdf, 0x84, 0x9a, 0xe2, 0x06, 0x68, 0xdd, 0x8a, 
-0x28, 0x42, 0x54, 0x2a, 0x53, 0xf3, 0x0d, 0x6d, 0x90, 0x72, 0x4a, 0x58, 0xaa, 0x4c, 0x2d, 0xd4, 
-0x3c, 0x94, 0xa1, 0xac, 0x01, 0xa0, 0x1d, 0xdc, 0x5a, 0xf5, 0x39, 0x07, 0x2e, 0x87, 0xa5, 0x5e, 
-0xec, 0x2a, 0x00, 0xb0, 0xf6, 0x12, 0x06, 0xb7, 0x67, 0xd5, 0x7d, 0x51, 0x5a, 0x15, 0xc5, 0x57, 
-0x29, 0x73, 0x01, 0x71, 0x1d, 0x70, 0xef, 0x9c, 0xdf, 0x0b, 0x85, 0x4f, 0xb8, 0x25, 0x0c, 0x66, 
-0xae, 0x08, 0xbc, 0x7b, 0x1c, 0x1c, 0x45, 0x1a, 0x90, 0x9a, 0xe0, 0x3a, 0x28, 0x00, 0xbb, 0x8a, 
-0x2c, 0xb9, 0xb2, 0x03, 0x02, 0x86, 0x52, 0x0b, 0x08, 0xe4, 0x58, 0xef, 0x68, 0x30, 0xae, 0x13, 
-0xcd, 0x71, 0x82, 0xb9, 0x4a, 0x6c, 0xd9, 0x5f, 0x2c, 0x5b, 0xf0, 0x6c, 0xa1, 0x76, 0xa3, 0xd0, 
-0xb3, 0x5f, 0xb7, 0x4c, 0x51, 0x56, 0x77, 0x85, 0x57, 0x41, 0xeb, 0x02, 0x4f, 0xab, 0x51, 0xf9, 
-0x72, 0x91, 0x0f, 0xb2, 0xda, 0x0b, 0x0c, 0xc1, 0xb7, 0xa8, 0xe7, 0x5e, 0x28, 0x0f, 0xc7, 0x9e, 
-0xd9, 0x28, 0x39, 0xa4, 0xf8, 0x34, 0x1a, 0x94, 0x17, 0x5e, 0x7b, 0xde, 0x13, 0xd6, 0xa7, 0x98, 
-0xbf, 0x72, 0x5b, 0x43, 0x71, 0xcd, 0xbe, 0xcc, 0xf0, 0x2d, 0xcf, 0x17, 0x29, 0xb9, 0x08, 0xe9, 
-0xdf, 0x96, 0x36, 0x2d, 0xfc, 0x3c, 0x77, 0x2c, 0xff, 0xf0, 0x09, 0x23, 0x8c, 0x63, 0x02, 0xdc, 
-0x54, 0x9d, 0x73, 0x24, 0xb8, 0xa5, 0x5f, 0x7f, 0xec, 0x11, 0xc7, 0xdf, 0x33, 0xf1, 0x0d, 0xc8, 
-0x00, 0x6f, 0xc7, 0x21, 0x08, 0xd2, 0x53, 0xeb, 0x59, 0xd1, 0x5e, 0x5b, 0x0f, 0x2e, 0x00, 0x0d, 
-0x26, 0x13, 0x3e, 0x56, 0x21, 0x6c, 0x97, 0xc9, 0x44, 0xc7, 0x5c, 0xf9, 0x6d, 0xf8, 0x57, 0x87, 
-0x0a, 0xf8, 0x01, 0x80, 0x21, 0xd1, 0x14, 0x05, 0x8c, 0x88, 0x15, 0x39, 0xc7, 0x45, 0x00, 0x38, 
-0xe6, 0xa8, 0xe3, 0x8e, 0x3c, 0x46, 0x22, 0x90, 0x85, 0x25, 0xbc, 0xe7, 0x9d, 0x7d, 0x7d, 0xb5, 
-0x97, 0xa2, 0x02, 0x87, 0xbd, 0x93, 0xd1, 0x91, 0xff, 0x51, 0x31, 0xd7, 0x66, 0xe4, 0x11, 0x98, 
-0x1c, 0x89, 0x07, 0x28, 0xe8, 0x4d, 0x32, 0x4c, 0xee, 0x07, 0x9d, 0x52, 0x30, 0x35, 0x40, 0xc0, 
-0x3c, 0xa9, 0x99, 0x73, 0x20, 0x95, 0x56, 0x32, 0xd3, 0x53, 0x96, 0x26, 0x08, 0x79, 0x97, 0x6a, 
-0xe5, 0x94, 0xc7, 0xa0, 0x86, 0x0a, 0x94, 0xa9, 0x8b, 0x71, 0x68, 0x06, 0xc9, 0xa2, 0x87, 0x6c, 
-0x7e, 0xa4, 0x93, 0x73, 0x72, 0x9a, 0x02, 0x57, 0x9d, 0x09, 0xde, 0xf9, 0x22, 0x91, 0x32, 0x1a, 
-0xc1, 0x27, 0x47, 0xc6, 0xed, 0x05, 0x64, 0xa0, 0xb9, 0xc1, 0x47, 0xcf, 0x11, 0x05, 0x20, 0x51, 
-0x0f, 0x3d, 0xe7, 0x74, 0xf5, 0x23, 0x99, 0x17, 0x25, 0xaa, 0x28, 0x95, 0x5a, 0x82, 0xe6, 0x9d, 
-0x23, 0x65, 0x58, 0x1a, 0x62, 0x40, 0x49, 0x35, 0x87, 0xe9, 0x3f, 0xb7, 0x4c, 0x00, 0xe8, 0x08, 
-0x6a, 0x7a, 0xe8, 0x57, 0xa8, 0x0f, 0x50, 0x63, 0xc8, 0x26, 0x6e, 0x9a, 0xba, 0x5d, 0x9f, 0x3f, 
-0x7d, 0x06, 0x27, 0x0a, 0xa4, 0xb9, 0x0a, 0x6a, 0xa4, 0xb1, 0xc6, 0x47, 0x2b, 0x7e, 0x87, 0xae, 
-0x93, 0xea, 0x88, 0x8d, 0xa2, 0xd7, 0x6b, 0x8b, 0xff, 0xaf, 0x02, 0xeb, 0x00, 0x3a, 0xc3, 0x88, 
-0x79, 0xe9, 0x76, 0x37, 0xf2, 0x68, 0xed, 0xb5, 0x62, 0x8c, 0xa1, 0x41, 0x7e, 0x9a, 0x3e, 0xb1, 
-0xec, 0x01, 0x85, 0xf4, 0x10, 0xea, 0x35, 0xa3, 0x56, 0x43, 0xcc, 0x98, 0xdb, 0xd1, 0x60, 0xeb, 
-0x60, 0x27, 0x8c, 0xe5, 0x0a, 0xa1, 0xe5, 0x1d, 0x52, 0x9f, 0x0d, 0xd2, 0x3a, 0xb0, 0xea, 0x0c, 
-0xee, 0x8e, 0x90, 0xa4, 0x01, 0xc9, 0xa0, 0x66, 0x5f, 0x79, 0x50, 0xb6, 0x21, 0x6a, 0x86, 0xb6, 
-0xa9, 0x4b, 0x56, 0xbe, 0x20, 0xe4, 0x17, 0x86, 0x04, 0x26, 0x9d, 0x96, 0xe7, 0xc0, 0x04, 0xff, 
-0x66, 0xb0, 0x12, 0x79, 0x50, 0xe7, 0x55, 0x1e, 0x2a, 0xee, 0xc9, 0xe9, 0xc4, 0x74, 0x21, 0xbc, 
-0xc1, 0xbe, 0x52, 0x38, 0x73, 0x44, 0x9e, 0xb5, 0x7a, 0xb2, 0xa8, 0xba, 0x20, 0x23, 0x86, 0xed, 
-0xca, 0x38, 0x2e, 0xa2, 0x5b, 0x7d, 0xff, 0xda, 0xcb, 0x18, 0x9b, 0x10, 0xaf, 0xdb, 0x20, 0xc7, 
-0x0b, 0xe0, 0xca, 0x51, 0x4f, 0x85, 0x48, 0x34, 0x28, 0x91, 0xc4, 0x6e, 0xcc, 0x71, 0xca, 0x1c, 
-0x21, 0x46, 0x08, 0x8d, 0xd1, 0x71, 0x32, 0x80, 0x62, 0x5a, 0x01, 0x75, 0xaf, 0xba, 0x3a, 0xa3, 
-0x1a, 0x8f, 0x5e, 0x14, 0xd6, 0x28, 0x34, 0xc7, 0x0a, 0x17, 0xcd, 0xef, 0xd4, 0x14, 0x54, 0xad, 
-0xea, 0xc9, 0x13, 0x13, 0xbd, 0x90, 0xa6, 0x95, 0x4c, 0xe0, 0x35, 0xc3, 0x60, 0x4f, 0x9c, 0xf5, 
-0x42, 0x7a, 0x95, 0xbd, 0x06, 0xd2, 0x68, 0x5f, 0x8d, 0xb3, 0x43, 0x5a, 0xef, 0xca, 0x04, 0xa5, 
-0x66, 0xd7, 0x6b, 0x75, 0xba, 0x73, 0x33, 0x60, 0xa2, 0xd6, 0x7c, 0xe8, 0x4b, 0x0e, 0xcd, 0x41, 
-0xf3, 0xdd, 0xb7, 0xdf, 0x5a, 0xab, 0x38, 0xf3, 0x9f, 0xe3, 0xcd, 0x53, 0xb8, 0x7f, 0x87, 0xdb, 
-0x1b, 0x75, 0x1e, 0xc7, 0xee, 0x26, 0x4f, 0xc6, 0xff, 0x11, 0x94, 0x65, 0x31, 0x0d, 0x71, 0xb4, 
-0x6c, 0x0b, 0x8e, 0xda, 0xe2, 0xa2, 0xf4, 0x3d, 0x38, 0x44, 0x6e, 0xfa, 0x0c, 0x65, 0x37, 0x0e, 
-0x95, 0x6a, 0xac, 0x9d, 0xee, 0xfa, 0x07, 0xa9, 0x93, 0x03, 0x71, 0xe3, 0xe4, 0x6c, 0xfe, 0xfa, 
-0xed, 0xe0, 0xfa, 0xc5, 0x46, 0x32, 0xe1, 0xe2, 0xc0, 0x16, 0xee, 0xc0, 0x53, 0xa2, 0x7b, 0xa1, 
-0xe5, 0x6a, 0xa4, 0x77, 0xf0, 0xc8, 0x27, 0x4d, 0xa9, 0x56, 0x10, 0x54, 0x7d, 0xbc, 0x11, 0x4c, 
-0x2f, 0x26, 0xfd, 0xf4, 0xd4, 0x6b, 0x65, 0xbb, 0x40, 0xd1, 0x57, 0x4f, 0x7d, 0xe8, 0x1b, 0xfc, 
-0x0c, 0x5e, 0x6b, 0x68, 0x94, 0x3c, 0x11, 0xed, 0x84, 0x96, 0x6f, 0xfe, 0x7d, 0x1e, 0xd8, 0x40, 
-0xfe, 0xf9, 0xe5, 0xaf, 0x66, 0xfb, 0xc8, 0x79, 0x82, 0xcf, 0xc0, 0xf3, 0xbd, 0x05, 0xcc, 0xfe, 
-0xfd, 0x40, 0x77, 0x60, 0x3f, 0xfe, 0xe7, 0xb7, 0x5e, 0xc2, 0xef, 0x48, 0xa2, 0x9f, 0xaa, 0xd6, 
-0xc7, 0xbf, 0x02, 0x96, 0xaa, 0x22, 0x04, 0x34, 0xe0, 0xf9, 0xf0, 0x16, 0x94, 0x81, 0x24, 0x64, 
-0x70, 0xe5, 0x80, 0x1b, 0x13, 0x14, 0x48, 0x41, 0xa4, 0x6c, 0x2b, 0x81, 0x15, 0x34, 0x5f, 0xcd, 
-0x12, 0x42, 0xbb, 0x9a, 0xf9, 0x4b, 0x1e, 0x1b, 0x8c, 0x47, 0x06, 0x33, 0x28, 0xba, 0x11, 0x52, 
-0xd0, 0x35, 0x30, 0x43, 0xca, 0x06, 0x09, 0xb2, 0x01, 0x0c, 0x9a, 0xf0, 0x7c, 0x7d, 0x78, 0x61, 
-0x05, 0xc5, 0xe7, 0xaa, 0x47, 0x11, 0xa1, 0x10, 0x26, 0x70, 0xa1, 0x0c, 0xcb, 0x27, 0xbc, 0x1d, 
-0x52, 0x90, 0x86, 0xb9, 0x23, 0x15, 0xf1, 0x90, 0x64, 0x3d, 0x0d, 0xec, 0xcf, 0x87, 0x30, 0xac, 
-0xc0, 0x97, 0x90, 0x78, 0x42, 0xae, 0xcd, 0x6f, 0x88, 0xe3, 0x61, 0xa0, 0x12, 0x99, 0xa8, 0xc0, 
-0xe3, 0x50, 0xb1, 0x82, 0x08, 0x71, 0x1b, 0x2c, 0xff, 0x88, 0x17, 0xae, 0xc6, 0x5c, 0x40, 0x87, 
-0x57, 0x94, 0x07, 0x2f, 0xc2, 0xa8, 0x40, 0xf1, 0x69, 0xb1, 0x3e, 0xf2, 0x13, 0x20, 0x7c, 0xc8, 
-0x78, 0x3f, 0x20, 0x1e, 0x20, 0x85, 0x6c, 0xc4, 0xdf, 0x06, 0x7b, 0x77, 0x03, 0x2f, 0xce, 0xc8, 
-0x11, 0x7a, 0xaa, 0x08, 0xff, 0x0a, 0xe4, 0x12, 0x98, 0xf8, 0xb1, 0x4b, 0x5d, 0xc3, 0xdf, 0x6a, 
-0xfa, 0xf8, 0xc7, 0x98, 0x30, 0x86, 0x7f, 0x05, 0x21, 0x52, 0x67, 0x74, 0xe7, 0xc6, 0x69, 0xb4, 
-0xf1, 0x7a, 0x20, 0x58, 0x22, 0xfb, 0x42, 0xd8, 0x43, 0xf6, 0x01, 0x65, 0x66, 0x86, 0xf0, 0x9f, 
-0x23, 0x1d, 0x71, 0x40, 0xa5, 0x3c, 0xd2, 0x60, 0x3a, 0x94, 0xa2, 0x07, 0x3e, 0xa8, 0x41, 0x0f, 
-0xdc, 0x83, 0x08, 0xb3, 0x22, 0xd7, 0x03, 0x17, 0xa8, 0x36, 0xf6, 0x89, 0x12, 0x04, 0x2e, 0xa4, 
-0xa1, 0x2a, 0xa1, 0x02, 0x2f, 0x11, 0xb6, 0x0f, 0x6b, 0x96, 0x34, 0x81, 0x24, 0xcb, 0xd7, 0x2f, 
-0x81, 0x29, 0x83, 0x7c, 0x34, 0x3c, 0x62, 0x1a, 0x28, 0xe9, 0x82, 0x5d, 0x12, 0xa9, 0x91, 0x2d, 
-0x3c, 0x1f, 0x45, 0xea, 0x63, 0x10, 0x62, 0x66, 0xc0, 0x85, 0x90, 0x14, 0x81, 0x31, 0xed, 0xe3, 
-0x4c, 0x0e, 0x08, 0xd3, 0x59, 0x10, 0x42, 0x04, 0x1a, 0x47, 0x00, 0x4d, 0x8e, 0x5d, 0xb3, 0x9a, 
-0xdd, 0xeb, 0x5f, 0x80, 0x1c, 0xf9, 0x4b, 0xc2, 0x45, 0xc0, 0x85, 0x38, 0xfb, 0x66, 0x0a, 0x58, 
-0xf9, 0x29, 0x72, 0x0a, 0x64, 0x7d, 0x34, 0xc4, 0x20, 0x32, 0x57, 0xa0, 0x4e, 0x14, 0xb0, 0x13, 
-0x42, 0x78, 0x1c, 0xa2, 0x23, 0x0b, 0x54, 0x92, 0xb7, 0xdd, 0xd2, 0x9b, 0xe2, 0xb4, 0xa7, 0xf9, 
-0xdc, 0x04, 0xab, 0x03, 0xe4, 0x51, 0x7e, 0x5f, 0x1c, 0x68, 0x3a, 0x03, 0x7a, 0x82, 0x7b, 0x2a, 
-0x61, 0x98, 0xd2, 0x43, 0xa8, 0xe5, 0xfe, 0x39, 0xff, 0xb1, 0x7a, 0x36, 0x54, 0xa1, 0x6b, 0xb4, 
-0x8f, 0x44, 0x2b, 0x20, 0xcf, 0x85, 0x96, 0x52, 0xa0, 0x14, 0x55, 0x8a, 0xf4, 0x16, 0xb9, 0xa1, 
-0x8e, 0x02, 0xf4, 0xa3, 0x26, 0x80, 0x63, 0xcc, 0x38, 0x60, 0xc7, 0x89, 0xd6, 0xf2, 0xa4, 0xe5, 
-0x03, 0xe7, 0xb6, 0x1c, 0x5a, 0x42, 0x4e, 0xb0, 0xc9, 0x9f, 0x2f, 0xad, 0x28, 0x43, 0x4b, 0xa0, 
-0xd2, 0xef, 0xdd, 0x25, 0xa7, 0xc1, 0x0a, 0xa9, 0xba, 0x2c, 0xca, 0x53, 0x9a, 0x7a, 0xe4, 0x20, 
-0xfd, 0x3c, 0x27, 0x46, 0x75, 0x8a, 0xd2, 0xa2, 0x2e, 0x55, 0x03, 0x67, 0xc3, 0xe9, 0x31, 0x3d, 
-0x1a, 0x53, 0x14, 0xf4, 0x34, 0x4a, 0x2c, 0x95, 0xa0, 0x52, 0x85, 0x4a, 0x03, 0xa2, 0x6e, 0xc1, 
-0xa8, 0x46, 0xd9, 0xe0, 0x3d, 0x46, 0x2a, 0xd5, 0x95, 0x32, 0xb5, 0xaa, 0xe8, 0x01, 0xeb, 0x13, 
-0xab, 0xc3, 0xc3, 0xad, 0x02, 0x75, 0xa8, 0x3b, 0xfd, 0xea, 0x53, 0x95, 0xb2, 0xc4, 0x26, 0xd8, 
-0x8b, 0x64, 0xf1, 0x9c, 0x6b, 0x57, 0xe3, 0x7a, 0x07, 0xb5, 0x1a, 0x54, 0x85, 0x21, 0x30, 0xe9, 
-0x59, 0x09, 0x25, 0x53, 0x4f, 0xf8, 0xf5, 0x90, 0x91, 0xd2, 0x64, 0x56, 0xb9, 0x8a, 0x3a, 0xbe, 
-0x5e, 0xc6, 0xaf, 0x5b, 0xc4, 0x0f, 0x26, 0x07, 0x99, 0x37, 0xf3, 0x51, 0x95, 0xb0, 0x86, 0x81, 
-0x2c, 0xb8, 0x36, 0x38, 0xcd, 0x55, 0x94, 0xd5, 0x3e, 0xd1, 0x0c, 0x81, 0x57, 0x47, 0x30, 0xda, 
-0x84, 0xe2, 0x0d, 0x52, 0x79, 0x35, 0x5f, 0x68, 0x23, 0xa9, 0xd9, 0x0e, 0xb8, 0x90, 0x98, 0xb3, 
-0x2c, 0xde, 0x5e, 0xd4, 0x58, 0xda, 0x18, 0x74, 0x16, 0xab, 0x4e, 0x55, 0x6d, 0xde, 0x9a, 0x47, 
-0x23, 0xda, 0xb2, 0x6f, 0xb5, 0xe9, 0xfb, 0xad, 0x09, 0xae, 0xa9, 0x4f, 0x57, 0xec, 0x2e, 0x58, 
-0xa4, 0xa2, 0xe1, 0x6d, 0xc9, 0x03, 0xdc, 0x0e, 0xff, 0xb8, 0xb2, 0xb9, 0x0e, 0x71, 0x65, 0x59, 
-0x49, 0xfa, 0x2e, 0x59, 0xe2, 0x0f, 0xba, 0x46, 0xbc, 0x1f, 0x70, 0x89, 0xab, 0xd5, 0xbf, 0x0e, 
-0x6e, 0x91, 0x7c, 0xac, 0x23, 0x36, 0x79, 0x7b, 0xbf, 0xc2, 0x96, 0x60, 0xb9, 0xe4, 0xc1, 0x9c, 
-0x46, 0xb8, 0x3b, 0x8c, 0xab, 0x14, 0xf7, 0xaa, 0x76, 0x41, 0x2f, 0x35, 0xb5, 0x47, 0x5f, 0xfa, 
-0x4a, 0x04, 0x8c, 0x4a, 0xab, 0x2f, 0xf5, 0xf0, 0xab, 0x46, 0x60, 0x88, 0xef, 0x45, 0xe6, 0x4c, 
-0x45, 0x1c, 0xdb, 0xa8, 0xaa, 0x01, 0x17, 0x10, 0xbb, 0xcf, 0x34, 0xb0, 0x5e, 0x9f, 0xa5, 0xe0, 
-0x49, 0x86, 0xad, 0xc1, 0x6f, 0xa5, 0x25, 0x84, 0x23, 0xec, 0x37, 0x4d, 0x1e, 0xd4, 0x21, 0x16, 
-0x06, 0x27, 0x7f, 0xaf, 0xd8, 0x48, 0xf6, 0xb2, 0xb1, 0x21, 0x5a, 0x04, 0xd1, 0x1d, 0xd1, 0x50, 
-0xdc, 0xa0, 0x4e, 0x18, 0x7d, 0x81, 0x3c, 0xb1, 0x2f, 0x9d, 0xb8, 0x80, 0x22, 0x85, 0x2f, 0x86, 
-0x2a, 0x9e, 0xa7, 0x87, 0x99, 0xd8, 0xb6, 0xde, 0x12, 0xcf, 0x79, 0xf3, 0x74, 0xe4, 0x89, 0x73, 
-0xbc, 0xe1, 0x1d, 0xba, 0x26, 0xc4, 0x2e, 0x9e, 0x5f, 0x8e, 0x99, 0x35, 0xe1, 0x21, 0xcf, 0xf8, 
-0x85, 0xb1, 0x01, 0xf2, 0x8d, 0x7b, 0x3b, 0xe4, 0xbd, 0xf4, 0xd8, 0x84, 0x4d, 0xf6, 0x1e, 0x19, 
-0x0b, 0x4b, 0x47, 0x7f, 0xc5, 0x8b, 0x13, 0x39, 0x00, 0xe0, 0x05, 0x15, 0xdc, 0x64, 0x27, 0x87, 
-0x51, 0xb1, 0x05, 0x26, 0xd2, 0xc0, 0xe0, 0xab, 0x13, 0xc4, 0x4e, 0x79, 0x94, 0x66, 0x86, 0x32, 
-0x98, 0x8f, 0xd3, 0xb8, 0x02, 0xbd, 0x33, 0xbd, 0x77, 0x00, 0x82, 0x10, 0xe6, 0x4c, 0x67, 0xe0, 
-0x9e, 0x84, 0xce, 0x42, 0x70, 0x60, 0xf2, 0xf6, 0xcc, 0xe7, 0x3e, 0xfb, 0xf9, 0xcf, 0x80, 0x0e, 
+0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0xa0, 0x00, 0x85, 0x00, 0xa2, 0x00, 0x00, 0xd1, 0xdd, 0xe4,
+0x45, 0x9b, 0xca, 0x41, 0x55, 0x61, 0x8a, 0x96, 0x9e, 0xa2, 0xbc, 0xcc, 0x00, 0x1b, 0x2c, 0x00,
+0x75, 0xb6, 0xff, 0xff, 0xff, 0x21, 0xf9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00,
+0x00, 0x00, 0xa0, 0x00, 0x85, 0x00, 0x00, 0x03, 0xff, 0x78, 0xba, 0xdc, 0xfe, 0x30, 0xca, 0x49,
+0xab, 0xbd, 0x38, 0xeb, 0xcd, 0xbb, 0xff, 0x60, 0x28, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae,
+0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x2b, 0x40, 0xdc, 0x78, 0xae, 0xef, 0x04, 0xe0, 0xda, 0xbc,
+0xe0, 0x0e, 0xe0, 0xeb, 0x00, 0x06, 0xc5, 0xc5, 0x6d, 0x72, 0x4b, 0x76, 0x08, 0x01, 0x83, 0x74,
+0x4a, 0xad, 0x5a, 0xab, 0x01, 0x27, 0x09, 0x10, 0xbd, 0x7a, 0xbf, 0x86, 0x40, 0x6f, 0x33, 0x28,
+0x10, 0x1a, 0x85, 0x82, 0x44, 0x90, 0x2e, 0x68, 0x2f, 0xb6, 0x2e, 0x78, 0x7e, 0x15, 0x8f, 0xe2,
+0xf4, 0xbc, 0xd5, 0x8e, 0x29, 0x9f, 0x09, 0x48, 0x07, 0x69, 0x11, 0x65, 0x02, 0x6c, 0x03, 0x1b,
+0x72, 0x7a, 0x8b, 0x54, 0x67, 0x1f, 0x8a, 0x8c, 0x8c, 0x59, 0x17, 0x7e, 0x82, 0x66, 0x96, 0x11,
+0x69, 0x3e, 0x05, 0x02, 0x19, 0x5c, 0x91, 0xa0, 0x53, 0x8e, 0x1c, 0x90, 0xa1, 0x8b, 0xa3, 0x13,
+0x95, 0x69, 0x67, 0x83, 0x0c, 0x36, 0x0a, 0x9a, 0x82, 0x9d, 0x70, 0xa6, 0xb5, 0x93, 0x19, 0x04,
+0xb5, 0xb6, 0x15, 0xaa, 0x97, 0xad, 0x0b, 0x6c, 0xac, 0x6e, 0xb2, 0x17, 0xb9, 0xba, 0xb5, 0x6f,
+0x12, 0xc6, 0xc7, 0xa6, 0xc9, 0x0c, 0xbd, 0x3d, 0xbf, 0x0a, 0xc1, 0x96, 0x3e, 0x44, 0x16, 0xcb,
+0xcc, 0xa0, 0x01, 0xb4, 0xda, 0xa6, 0xdc, 0x12, 0x65, 0x9c, 0x69, 0x86, 0x9c, 0x0d, 0xd4, 0xb1,
+0xdd, 0xde, 0xa1, 0xe0, 0x4c, 0xeb, 0xbb, 0xe1, 0x6d, 0x6d, 0x02, 0x5a, 0xe2, 0x6c, 0xb3, 0x17,
+0xa5, 0xef, 0x7a, 0xed, 0x11, 0xfb, 0xb5, 0xa8, 0x1e, 0x10, 0x19, 0xe8, 0x8c, 0x0d, 0x27, 0x67,
+0x10, 0xb2, 0xfd, 0x63, 0x84, 0xf0, 0x80, 0xc2, 0x85, 0x8b, 0x1a, 0xc2, 0x09, 0x48, 0x01, 0x00,
+0xc4, 0x50, 0x14, 0x17, 0x58, 0xbc, 0xb8, 0x0d, 0xff, 0x83, 0x21, 0x11, 0xfa, 0xbc, 0x88, 0x21,
+0x48, 0xb2, 0x24, 0x91, 0x1b, 0x21, 0xaf, 0x38, 0x7b, 0xf8, 0xa5, 0x87, 0xc9, 0x97, 0x04, 0xa1,
+0x44, 0xbc, 0x20, 0x4d, 0xe3, 0x90, 0x09, 0xfc, 0x3e, 0x7c, 0xa2, 0x93, 0xf1, 0x80, 0x9e, 0x9e,
+0x18, 0x36, 0xf2, 0xa4, 0xa9, 0xa6, 0x81, 0x38, 0x79, 0x35, 0x1b, 0x08, 0x05, 0x23, 0xb1, 0x58,
+0x9e, 0x07, 0x2c, 0xad, 0x34, 0x75, 0x3a, 0xa7, 0xdf, 0x84, 0x9a, 0xe2, 0x06, 0x68, 0xdd, 0x8a,
+0x28, 0x42, 0x54, 0x2a, 0x53, 0xf3, 0x0d, 0x6d, 0x90, 0x72, 0x4a, 0x58, 0xaa, 0x4c, 0x2d, 0xd4,
+0x3c, 0x94, 0xa1, 0xac, 0x01, 0xa0, 0x1d, 0xdc, 0x5a, 0xf5, 0x39, 0x07, 0x2e, 0x87, 0xa5, 0x5e,
+0xec, 0x2a, 0x00, 0xb0, 0xf6, 0x12, 0x06, 0xb7, 0x67, 0xd5, 0x7d, 0x51, 0x5a, 0x15, 0xc5, 0x57,
+0x29, 0x73, 0x01, 0x71, 0x1d, 0x70, 0xef, 0x9c, 0xdf, 0x0b, 0x85, 0x4f, 0xb8, 0x25, 0x0c, 0x66,
+0xae, 0x08, 0xbc, 0x7b, 0x1c, 0x1c, 0x45, 0x1a, 0x90, 0x9a, 0xe0, 0x3a, 0x28, 0x00, 0xbb, 0x8a,
+0x2c, 0xb9, 0xb2, 0x03, 0x02, 0x86, 0x52, 0x0b, 0x08, 0xe4, 0x58, 0xef, 0x68, 0x30, 0xae, 0x13,
+0xcd, 0x71, 0x82, 0xb9, 0x4a, 0x6c, 0xd9, 0x5f, 0x2c, 0x5b, 0xf0, 0x6c, 0xa1, 0x76, 0xa3, 0xd0,
+0xb3, 0x5f, 0xb7, 0x4c, 0x51, 0x56, 0x77, 0x85, 0x57, 0x41, 0xeb, 0x02, 0x4f, 0xab, 0x51, 0xf9,
+0x72, 0x91, 0x0f, 0xb2, 0xda, 0x0b, 0x0c, 0xc1, 0xb7, 0xa8, 0xe7, 0x5e, 0x28, 0x0f, 0xc7, 0x9e,
+0xd9, 0x28, 0x39, 0xa4, 0xf8, 0x34, 0x1a, 0x94, 0x17, 0x5e, 0x7b, 0xde, 0x13, 0xd6, 0xa7, 0x98,
+0xbf, 0x72, 0x5b, 0x43, 0x71, 0xcd, 0xbe, 0xcc, 0xf0, 0x2d, 0xcf, 0x17, 0x29, 0xb9, 0x08, 0xe9,
+0xdf, 0x96, 0x36, 0x2d, 0xfc, 0x3c, 0x77, 0x2c, 0xff, 0xf0, 0x09, 0x23, 0x8c, 0x63, 0x02, 0xdc,
+0x54, 0x9d, 0x73, 0x24, 0xb8, 0xa5, 0x5f, 0x7f, 0xec, 0x11, 0xc7, 0xdf, 0x33, 0xf1, 0x0d, 0xc8,
+0x00, 0x6f, 0xc7, 0x21, 0x08, 0xd2, 0x53, 0xeb, 0x59, 0xd1, 0x5e, 0x5b, 0x0f, 0x2e, 0x00, 0x0d,
+0x26, 0x13, 0x3e, 0x56, 0x21, 0x6c, 0x97, 0xc9, 0x44, 0xc7, 0x5c, 0xf9, 0x6d, 0xf8, 0x57, 0x87,
+0x0a, 0xf8, 0x01, 0x80, 0x21, 0xd1, 0x14, 0x05, 0x8c, 0x88, 0x15, 0x39, 0xc7, 0x45, 0x00, 0x38,
+0xe6, 0xa8, 0xe3, 0x8e, 0x3c, 0x46, 0x22, 0x90, 0x85, 0x25, 0xbc, 0xe7, 0x9d, 0x7d, 0x7d, 0xb5,
+0x97, 0xa2, 0x02, 0x87, 0xbd, 0x93, 0xd1, 0x91, 0xff, 0x51, 0x31, 0xd7, 0x66, 0xe4, 0x11, 0x98,
+0x1c, 0x89, 0x07, 0x28, 0xe8, 0x4d, 0x32, 0x4c, 0xee, 0x07, 0x9d, 0x52, 0x30, 0x35, 0x40, 0xc0,
+0x3c, 0xa9, 0x99, 0x73, 0x20, 0x95, 0x56, 0x32, 0xd3, 0x53, 0x96, 0x26, 0x08, 0x79, 0x97, 0x6a,
+0xe5, 0x94, 0xc7, 0xa0, 0x86, 0x0a, 0x94, 0xa9, 0x8b, 0x71, 0x68, 0x06, 0xc9, 0xa2, 0x87, 0x6c,
+0x7e, 0xa4, 0x93, 0x73, 0x72, 0x9a, 0x02, 0x57, 0x9d, 0x09, 0xde, 0xf9, 0x22, 0x91, 0x32, 0x1a,
+0xc1, 0x27, 0x47, 0xc6, 0xed, 0x05, 0x64, 0xa0, 0xb9, 0xc1, 0x47, 0xcf, 0x11, 0x05, 0x20, 0x51,
+0x0f, 0x3d, 0xe7, 0x74, 0xf5, 0x23, 0x99, 0x17, 0x25, 0xaa, 0x28, 0x95, 0x5a, 0x82, 0xe6, 0x9d,
+0x23, 0x65, 0x58, 0x1a, 0x62, 0x40, 0x49, 0x35, 0x87, 0xe9, 0x3f, 0xb7, 0x4c, 0x00, 0xe8, 0x08,
+0x6a, 0x7a, 0xe8, 0x57, 0xa8, 0x0f, 0x50, 0x63, 0xc8, 0x26, 0x6e, 0x9a, 0xba, 0x5d, 0x9f, 0x3f,
+0x7d, 0x06, 0x27, 0x0a, 0xa4, 0xb9, 0x0a, 0x6a, 0xa4, 0xb1, 0xc6, 0x47, 0x2b, 0x7e, 0x87, 0xae,
+0x93, 0xea, 0x88, 0x8d, 0xa2, 0xd7, 0x6b, 0x8b, 0xff, 0xaf, 0x02, 0xeb, 0x00, 0x3a, 0xc3, 0x88,
+0x79, 0xe9, 0x76, 0x37, 0xf2, 0x68, 0xed, 0xb5, 0x62, 0x8c, 0xa1, 0x41, 0x7e, 0x9a, 0x3e, 0xb1,
+0xec, 0x01, 0x85, 0xf4, 0x10, 0xea, 0x35, 0xa3, 0x56, 0x43, 0xcc, 0x98, 0xdb, 0xd1, 0x60, 0xeb,
+0x60, 0x27, 0x8c, 0xe5, 0x0a, 0xa1, 0xe5, 0x1d, 0x52, 0x9f, 0x0d, 0xd2, 0x3a, 0xb0, 0xea, 0x0c,
+0xee, 0x8e, 0x90, 0xa4, 0x01, 0xc9, 0xa0, 0x66, 0x5f, 0x79, 0x50, 0xb6, 0x21, 0x6a, 0x86, 0xb6,
+0xa9, 0x4b, 0x56, 0xbe, 0x20, 0xe4, 0x17, 0x86, 0x04, 0x26, 0x9d, 0x96, 0xe7, 0xc0, 0x04, 0xff,
+0x66, 0xb0, 0x12, 0x79, 0x50, 0xe7, 0x55, 0x1e, 0x2a, 0xee, 0xc9, 0xe9, 0xc4, 0x74, 0x21, 0xbc,
+0xc1, 0xbe, 0x52, 0x38, 0x73, 0x44, 0x9e, 0xb5, 0x7a, 0xb2, 0xa8, 0xba, 0x20, 0x23, 0x86, 0xed,
+0xca, 0x38, 0x2e, 0xa2, 0x5b, 0x7d, 0xff, 0xda, 0xcb, 0x18, 0x9b, 0x10, 0xaf, 0xdb, 0x20, 0xc7,
+0x0b, 0xe0, 0xca, 0x51, 0x4f, 0x85, 0x48, 0x34, 0x28, 0x91, 0xc4, 0x6e, 0xcc, 0x71, 0xca, 0x1c,
+0x21, 0x46, 0x08, 0x8d, 0xd1, 0x71, 0x32, 0x80, 0x62, 0x5a, 0x01, 0x75, 0xaf, 0xba, 0x3a, 0xa3,
+0x1a, 0x8f, 0x5e, 0x14, 0xd6, 0x28, 0x34, 0xc7, 0x0a, 0x17, 0xcd, 0xef, 0xd4, 0x14, 0x54, 0xad,
+0xea, 0xc9, 0x13, 0x13, 0xbd, 0x90, 0xa6, 0x95, 0x4c, 0xe0, 0x35, 0xc3, 0x60, 0x4f, 0x9c, 0xf5,
+0x42, 0x7a, 0x95, 0xbd, 0x06, 0xd2, 0x68, 0x5f, 0x8d, 0xb3, 0x43, 0x5a, 0xef, 0xca, 0x04, 0xa5,
+0x66, 0xd7, 0x6b, 0x75, 0xba, 0x73, 0x33, 0x60, 0xa2, 0xd6, 0x7c, 0xe8, 0x4b, 0x0e, 0xcd, 0x41,
+0xf3, 0xdd, 0xb7, 0xdf, 0x5a, 0xab, 0x38, 0xf3, 0x9f, 0xe3, 0xcd, 0x53, 0xb8, 0x7f, 0x87, 0xdb,
+0x1b, 0x75, 0x1e, 0xc7, 0xee, 0x26, 0x4f, 0xc6, 0xff, 0x11, 0x94, 0x65, 0x31, 0x0d, 0x71, 0xb4,
+0x6c, 0x0b, 0x8e, 0xda, 0xe2, 0xa2, 0xf4, 0x3d, 0x38, 0x44, 0x6e, 0xfa, 0x0c, 0x65, 0x37, 0x0e,
+0x95, 0x6a, 0xac, 0x9d, 0xee, 0xfa, 0x07, 0xa9, 0x93, 0x03, 0x71, 0xe3, 0xe4, 0x6c, 0xfe, 0xfa,
+0xed, 0xe0, 0xfa, 0xc5, 0x46, 0x32, 0xe1, 0xe2, 0xc0, 0x16, 0xee, 0xc0, 0x53, 0xa2, 0x7b, 0xa1,
+0xe5, 0x6a, 0xa4, 0x77, 0xf0, 0xc8, 0x27, 0x4d, 0xa9, 0x56, 0x10, 0x54, 0x7d, 0xbc, 0x11, 0x4c,
+0x2f, 0x26, 0xfd, 0xf4, 0xd4, 0x6b, 0x65, 0xbb, 0x40, 0xd1, 0x57, 0x4f, 0x7d, 0xe8, 0x1b, 0xfc,
+0x0c, 0x5e, 0x6b, 0x68, 0x94, 0x3c, 0x11, 0xed, 0x84, 0x96, 0x6f, 0xfe, 0x7d, 0x1e, 0xd8, 0x40,
+0xfe, 0xf9, 0xe5, 0xaf, 0x66, 0xfb, 0xc8, 0x79, 0x82, 0xcf, 0xc0, 0xf3, 0xbd, 0x05, 0xcc, 0xfe,
+0xfd, 0x40, 0x77, 0x60, 0x3f, 0xfe, 0xe7, 0xb7, 0x5e, 0xc2, 0xef, 0x48, 0xa2, 0x9f, 0xaa, 0xd6,
+0xc7, 0xbf, 0x02, 0x96, 0xaa, 0x22, 0x04, 0x34, 0xe0, 0xf9, 0xf0, 0x16, 0x94, 0x81, 0x24, 0x64,
+0x70, 0xe5, 0x80, 0x1b, 0x13, 0x14, 0x48, 0x41, 0xa4, 0x6c, 0x2b, 0x81, 0x15, 0x34, 0x5f, 0xcd,
+0x12, 0x42, 0xbb, 0x9a, 0xf9, 0x4b, 0x1e, 0x1b, 0x8c, 0x47, 0x06, 0x33, 0x28, 0xba, 0x11, 0x52,
+0xd0, 0x35, 0x30, 0x43, 0xca, 0x06, 0x09, 0xb2, 0x01, 0x0c, 0x9a, 0xf0, 0x7c, 0x7d, 0x78, 0x61,
+0x05, 0xc5, 0xe7, 0xaa, 0x47, 0x11, 0xa1, 0x10, 0x26, 0x70, 0xa1, 0x0c, 0xcb, 0x27, 0xbc, 0x1d,
+0x52, 0x90, 0x86, 0xb9, 0x23, 0x15, 0xf1, 0x90, 0x64, 0x3d, 0x0d, 0xec, 0xcf, 0x87, 0x30, 0xac,
+0xc0, 0x97, 0x90, 0x78, 0x42, 0xae, 0xcd, 0x6f, 0x88, 0xe3, 0x61, 0xa0, 0x12, 0x99, 0xa8, 0xc0,
+0xe3, 0x50, 0xb1, 0x82, 0x08, 0x71, 0x1b, 0x2c, 0xff, 0x88, 0x17, 0xae, 0xc6, 0x5c, 0x40, 0x87,
+0x57, 0x94, 0x07, 0x2f, 0xc2, 0xa8, 0x40, 0xf1, 0x69, 0xb1, 0x3e, 0xf2, 0x13, 0x20, 0x7c, 0xc8,
+0x78, 0x3f, 0x20, 0x1e, 0x20, 0x85, 0x6c, 0xc4, 0xdf, 0x06, 0x7b, 0x77, 0x03, 0x2f, 0xce, 0xc8,
+0x11, 0x7a, 0xaa, 0x08, 0xff, 0x0a, 0xe4, 0x12, 0x98, 0xf8, 0xb1, 0x4b, 0x5d, 0xc3, 0xdf, 0x6a,
+0xfa, 0xf8, 0xc7, 0x98, 0x30, 0x86, 0x7f, 0x05, 0x21, 0x52, 0x67, 0x74, 0xe7, 0xc6, 0x69, 0xb4,
+0xf1, 0x7a, 0x20, 0x58, 0x22, 0xfb, 0x42, 0xd8, 0x43, 0xf6, 0x01, 0x65, 0x66, 0x86, 0xf0, 0x9f,
+0x23, 0x1d, 0x71, 0x40, 0xa5, 0x3c, 0xd2, 0x60, 0x3a, 0x94, 0xa2, 0x07, 0x3e, 0xa8, 0x41, 0x0f,
+0xdc, 0x83, 0x08, 0xb3, 0x22, 0xd7, 0x03, 0x17, 0xa8, 0x36, 0xf6, 0x89, 0x12, 0x04, 0x2e, 0xa4,
+0xa1, 0x2a, 0xa1, 0x02, 0x2f, 0x11, 0xb6, 0x0f, 0x6b, 0x96, 0x34, 0x81, 0x24, 0xcb, 0xd7, 0x2f,
+0x81, 0x29, 0x83, 0x7c, 0x34, 0x3c, 0x62, 0x1a, 0x28, 0xe9, 0x82, 0x5d, 0x12, 0xa9, 0x91, 0x2d,
+0x3c, 0x1f, 0x45, 0xea, 0x63, 0x10, 0x62, 0x66, 0xc0, 0x85, 0x90, 0x14, 0x81, 0x31, 0xed, 0xe3,
+0x4c, 0x0e, 0x08, 0xd3, 0x59, 0x10, 0x42, 0x04, 0x1a, 0x47, 0x00, 0x4d, 0x8e, 0x5d, 0xb3, 0x9a,
+0xdd, 0xeb, 0x5f, 0x80, 0x1c, 0xf9, 0x4b, 0xc2, 0x45, 0xc0, 0x85, 0x38, 0xfb, 0x66, 0x0a, 0x58,
+0xf9, 0x29, 0x72, 0x0a, 0x64, 0x7d, 0x34, 0xc4, 0x20, 0x32, 0x57, 0xa0, 0x4e, 0x14, 0xb0, 0x13,
+0x42, 0x78, 0x1c, 0xa2, 0x23, 0x0b, 0x54, 0x92, 0xb7, 0xdd, 0xd2, 0x9b, 0xe2, 0xb4, 0xa7, 0xf9,
+0xdc, 0x04, 0xab, 0x03, 0xe4, 0x51, 0x7e, 0x5f, 0x1c, 0x68, 0x3a, 0x03, 0x7a, 0x82, 0x7b, 0x2a,
+0x61, 0x98, 0xd2, 0x43, 0xa8, 0xe5, 0xfe, 0x39, 0xff, 0xb1, 0x7a, 0x36, 0x54, 0xa1, 0x6b, 0xb4,
+0x8f, 0x44, 0x2b, 0x20, 0xcf, 0x85, 0x96, 0x52, 0xa0, 0x14, 0x55, 0x8a, 0xf4, 0x16, 0xb9, 0xa1,
+0x8e, 0x02, 0xf4, 0xa3, 0x26, 0x80, 0x63, 0xcc, 0x38, 0x60, 0xc7, 0x89, 0xd6, 0xf2, 0xa4, 0xe5,
+0x03, 0xe7, 0xb6, 0x1c, 0x5a, 0x42, 0x4e, 0xb0, 0xc9, 0x9f, 0x2f, 0xad, 0x28, 0x43, 0x4b, 0xa0,
+0xd2, 0xef, 0xdd, 0x25, 0xa7, 0xc1, 0x0a, 0xa9, 0xba, 0x2c, 0xca, 0x53, 0x9a, 0x7a, 0xe4, 0x20,
+0xfd, 0x3c, 0x27, 0x46, 0x75, 0x8a, 0xd2, 0xa2, 0x2e, 0x55, 0x03, 0x67, 0xc3, 0xe9, 0x31, 0x3d,
+0x1a, 0x53, 0x14, 0xf4, 0x34, 0x4a, 0x2c, 0x95, 0xa0, 0x52, 0x85, 0x4a, 0x03, 0xa2, 0x6e, 0xc1,
+0xa8, 0x46, 0xd9, 0xe0, 0x3d, 0x46, 0x2a, 0xd5, 0x95, 0x32, 0xb5, 0xaa, 0xe8, 0x01, 0xeb, 0x13,
+0xab, 0xc3, 0xc3, 0xad, 0x02, 0x75, 0xa8, 0x3b, 0xfd, 0xea, 0x53, 0x95, 0xb2, 0xc4, 0x26, 0xd8,
+0x8b, 0x64, 0xf1, 0x9c, 0x6b, 0x57, 0xe3, 0x7a, 0x07, 0xb5, 0x1a, 0x54, 0x85, 0x21, 0x30, 0xe9,
+0x59, 0x09, 0x25, 0x53, 0x4f, 0xf8, 0xf5, 0x90, 0x91, 0xd2, 0x64, 0x56, 0xb9, 0x8a, 0x3a, 0xbe,
+0x5e, 0xc6, 0xaf, 0x5b, 0xc4, 0x0f, 0x26, 0x07, 0x99, 0x37, 0xf3, 0x51, 0x95, 0xb0, 0x86, 0x81,
+0x2c, 0xb8, 0x36, 0x38, 0xcd, 0x55, 0x94, 0xd5, 0x3e, 0xd1, 0x0c, 0x81, 0x57, 0x47, 0x30, 0xda,
+0x84, 0xe2, 0x0d, 0x52, 0x79, 0x35, 0x5f, 0x68, 0x23, 0xa9, 0xd9, 0x0e, 0xb8, 0x90, 0x98, 0xb3,
+0x2c, 0xde, 0x5e, 0xd4, 0x58, 0xda, 0x18, 0x74, 0x16, 0xab, 0x4e, 0x55, 0x6d, 0xde, 0x9a, 0x47,
+0x23, 0xda, 0xb2, 0x6f, 0xb5, 0xe9, 0xfb, 0xad, 0x09, 0xae, 0xa9, 0x4f, 0x57, 0xec, 0x2e, 0x58,
+0xa4, 0xa2, 0xe1, 0x6d, 0xc9, 0x03, 0xdc, 0x0e, 0xff, 0xb8, 0xb2, 0xb9, 0x0e, 0x71, 0x65, 0x59,
+0x49, 0xfa, 0x2e, 0x59, 0xe2, 0x0f, 0xba, 0x46, 0xbc, 0x1f, 0x70, 0x89, 0xab, 0xd5, 0xbf, 0x0e,
+0x6e, 0x91, 0x7c, 0xac, 0x23, 0x36, 0x79, 0x7b, 0xbf, 0xc2, 0x96, 0x60, 0xb9, 0xe4, 0xc1, 0x9c,
+0x46, 0xb8, 0x3b, 0x8c, 0xab, 0x14, 0xf7, 0xaa, 0x76, 0x41, 0x2f, 0x35, 0xb5, 0x47, 0x5f, 0xfa,
+0x4a, 0x04, 0x8c, 0x4a, 0xab, 0x2f, 0xf5, 0xf0, 0xab, 0x46, 0x60, 0x88, 0xef, 0x45, 0xe6, 0x4c,
+0x45, 0x1c, 0xdb, 0xa8, 0xaa, 0x01, 0x17, 0x10, 0xbb, 0xcf, 0x34, 0xb0, 0x5e, 0x9f, 0xa5, 0xe0,
+0x49, 0x86, 0xad, 0xc1, 0x6f, 0xa5, 0x25, 0x84, 0x23, 0xec, 0x37, 0x4d, 0x1e, 0xd4, 0x21, 0x16,
+0x06, 0x27, 0x7f, 0xaf, 0xd8, 0x48, 0xf6, 0xb2, 0xb1, 0x21, 0x5a, 0x04, 0xd1, 0x1d, 0xd1, 0x50,
+0xdc, 0xa0, 0x4e, 0x18, 0x7d, 0x81, 0x3c, 0xb1, 0x2f, 0x9d, 0xb8, 0x80, 0x22, 0x85, 0x2f, 0x86,
+0x2a, 0x9e, 0xa7, 0x87, 0x99, 0xd8, 0xb6, 0xde, 0x12, 0xcf, 0x79, 0xf3, 0x74, 0xe4, 0x89, 0x73,
+0xbc, 0xe1, 0x1d, 0xba, 0x26, 0xc4, 0x2e, 0x9e, 0x5f, 0x8e, 0x99, 0x35, 0xe1, 0x21, 0xcf, 0xf8,
+0x85, 0xb1, 0x01, 0xf2, 0x8d, 0x7b, 0x3b, 0xe4, 0xbd, 0xf4, 0xd8, 0x84, 0x4d, 0xf6, 0x1e, 0x19,
+0x0b, 0x4b, 0x47, 0x7f, 0xc5, 0x8b, 0x13, 0x39, 0x00, 0xe0, 0x05, 0x15, 0xdc, 0x64, 0x27, 0x87,
+0x51, 0xb1, 0x05, 0x26, 0xd2, 0xc0, 0xe0, 0xab, 0x13, 0xc4, 0x4e, 0x79, 0x94, 0x66, 0x86, 0x32,
+0x98, 0x8f, 0xd3, 0xb8, 0x02, 0xbd, 0x33, 0xbd, 0x77, 0x00, 0x82, 0x10, 0xe6, 0x4c, 0x67, 0xe0,
+0x9e, 0x84, 0xce, 0x42, 0x70, 0x60, 0xf2, 0xf6, 0xcc, 0xe7, 0x3e, 0xfb, 0xf9, 0xcf, 0x80, 0x0e,
 0xb4, 0xa0, 0x07, 0x4d, 0xe8, 0x42, 0x97, 0x20, 0x01, 0x01, 0x00, 0x3b
diff --git a/Net/samples/Ping/Ping.progen b/Net/samples/Ping/Ping.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/Ping/Ping.progen
+++ b/Net/samples/Ping/Ping.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/Ping/src/Ping.cpp b/Net/samples/Ping/src/Ping.cpp
index c93865218..4ee833101 100644
--- a/Net/samples/Ping/src/Ping.cpp
+++ b/Net/samples/Ping/src/Ping.cpp
@@ -41,33 +41,33 @@ using Poco::Delegate;
 
 
 class Ping: public Application
-	/// This sample demonstrates the Poco::Net::ICMPClient in conjunction with 
+	/// This sample demonstrates the Poco::Net::ICMPClient in conjunction with
 	/// Poco Foundation C#-like events functionality.
 	///
 	/// Try Ping --help (on Unix platforms) or Ping /help (elsewhere) for
 	/// more information.
 {
 public:
-	Ping(): 
-		_helpRequested(false), 
+	Ping():
+		_helpRequested(false),
 		_icmpClient(IPAddress::IPv4),
-		_repetitions(4), 
+		_repetitions(4),
 		_target("localhost")
 	{
 	}
 
-protected:	
+protected:
 	void initialize(Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Application::initialize(self);
-		
+
 		_icmpClient.pingBegin += delegate(this, &Ping::onBegin);
 		_icmpClient.pingReply += delegate(this, &Ping::onReply);
 		_icmpClient.pingError += delegate(this, &Ping::onError);
 		_icmpClient.pingEnd   += delegate(this, &Ping::onEnd);
 	}
-	
+
 	void uninitialize()
 	{
 		_icmpClient.pingBegin -= delegate(this, &Ping::onBegin);
@@ -92,14 +92,14 @@ protected:
 				.required(false)
 				.repeatable(false)
 				.argument("repetitions"));
-				
+
 		options.addOption(
 			Option("target", "t", "define the target address")
 				.required(false)
 				.repeatable(false)
 				.argument("target"));
 	}
-	
+
 	void handleOption(const std::string& name, const std::string& value)
 	{
 		Application::handleOption(name, value);
@@ -111,7 +111,7 @@ protected:
 		else if (name == "target")
 			_target = value;
 	}
-	
+
 	void displayHelp()
 	{
 		HelpFormatter helpFormatter(options());
@@ -126,11 +126,11 @@ protected:
 
 	int main(const std::vector<std::string>& args)
 	{
-		if (_helpRequested) 
+		if (_helpRequested)
 			displayHelp();
-		else 
+		else
 			_icmpClient.ping(_target, _repetitions);
-		
+
 		return Application::EXIT_OK;
 	}
 
@@ -138,7 +138,7 @@ protected:
 	void onBegin(const void* pSender, ICMPEventArgs& args)
 	{
 		std::ostringstream os;
-		os << "Pinging " << args.hostName() << " [" << args.hostAddress() << "] with " << args.dataSize() << " bytes of data:" 
+		os << "Pinging " << args.hostName() << " [" << args.hostAddress() << "] with " << args.dataSize() << " bytes of data:"
 		   << std::endl << "---------------------------------------------" << std::endl;
 		logger().information(os.str());
 	}
@@ -147,7 +147,7 @@ protected:
 	{
 		std::ostringstream os;
 		os << "Reply from " << args.hostAddress()
-		   << " bytes=" << args.dataSize() 
+		   << " bytes=" << args.dataSize()
 		   << " time=" << args.replyTime() << "ms"
 		   << " TTL=" << args.ttl();
 		logger().information(os.str());
@@ -167,8 +167,8 @@ protected:
 		   << std::endl << "Packets: Sent=" << args.sent() << ", Received=" << args.received()
 		   << " Lost=" << args.repetitions() - args.received() << " (" << 100.0 - args.percent() << "% loss),"
 		   << std::endl << "Approximate round trip times in milliseconds: " << std::endl
-		   << "Minimum=" << args.minRTT() << "ms, Maximum=" << args.maxRTT()  
-		   << "ms, Average=" << args.avgRTT() << "ms" 
+		   << "Minimum=" << args.minRTT() << "ms, Maximum=" << args.maxRTT()
+		   << "ms, Average=" << args.avgRTT() << "ms"
 		   << std::endl << "------------------------------------------";
 		logger().information(os.str());
 	}
diff --git a/Net/samples/SMTPLogger/SMTPLogger.progen b/Net/samples/SMTPLogger/SMTPLogger.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/SMTPLogger/SMTPLogger.progen
+++ b/Net/samples/SMTPLogger/SMTPLogger.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/SMTPLogger/src/SMTPLogger.cpp b/Net/samples/SMTPLogger/src/SMTPLogger.cpp
index 05d01b5de..1331a38dd 100644
--- a/Net/samples/SMTPLogger/src/SMTPLogger.cpp
+++ b/Net/samples/SMTPLogger/src/SMTPLogger.cpp
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
 		std::cerr << "       the SMTP server at <mailhost>." << std::endl;
 		return 1;
 	}
-	
+
 	std::string mailhost(argv[1]);
 	std::string sender(argv[2]);
 	std::string recipient(argv[3]);
diff --git a/Net/samples/TimeServer/TimeServer.progen b/Net/samples/TimeServer/TimeServer.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/TimeServer/TimeServer.progen
+++ b/Net/samples/TimeServer/TimeServer.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/TimeServer/src/TimeServer.cpp b/Net/samples/TimeServer/src/TimeServer.cpp
index e9a2fcd63..05bd354bc 100644
--- a/Net/samples/TimeServer/src/TimeServer.cpp
+++ b/Net/samples/TimeServer/src/TimeServer.cpp
@@ -48,12 +48,12 @@ class TimeServerConnection: public TCPServerConnection
 	/// A string with the current date and time is sent back to the client.
 {
 public:
-	TimeServerConnection(const StreamSocket& s, const std::string& format): 
+	TimeServerConnection(const StreamSocket& s, const std::string& format):
 		TCPServerConnection(s),
 		_format(format)
 	{
 	}
-	
+
 	void run()
 	{
 		Application& app = Application::instance();
@@ -70,7 +70,7 @@ public:
 			app.logger().log(exc);
 		}
 	}
-	
+
 private:
 	std::string _format;
 };
@@ -84,7 +84,7 @@ public:
 		_format(format)
 	{
 	}
-	
+
 	TCPServerConnection* createConnection(const StreamSocket& socket)
 	{
 		return new TimeServerConnection(socket, _format);
@@ -118,7 +118,7 @@ public:
 	TimeServer(): _helpRequested(false)
 	{
 	}
-	
+
 	~TimeServer()
 	{
 	}
@@ -129,7 +129,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		ServerApplication::initialize(self);
 	}
-		
+
 	void uninitialize()
 	{
 		ServerApplication::uninitialize();
@@ -138,7 +138,7 @@ protected:
 	void defineOptions(OptionSet& options)
 	{
 		ServerApplication::defineOptions(options);
-		
+
 		options.addOption(
 			Option("help", "h", "display help information on command line arguments")
 				.required(false)
@@ -173,7 +173,7 @@ protected:
 			// get parameters from configuration file
 			unsigned short port = (unsigned short) config().getInt("TimeServer.port", 9911);
 			std::string format(config().getString("TimeServer.format", DateTimeFormat::ISO8601_FORMAT));
-			
+
 			// set-up a server socket
 			ServerSocket svs(port);
 			// set-up a TCPServer instance
@@ -187,7 +187,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/Net/samples/WebSocketServer/WebSocketServer.progen b/Net/samples/WebSocketServer/WebSocketServer.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/WebSocketServer/WebSocketServer.progen
+++ b/Net/samples/WebSocketServer/WebSocketServer.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/WebSocketServer/src/WebSocketServer.cpp b/Net/samples/WebSocketServer/src/WebSocketServer.cpp
index d49770d34..66936a7f8 100644
--- a/Net/samples/WebSocketServer/src/WebSocketServer.cpp
+++ b/Net/samples/WebSocketServer/src/WebSocketServer.cpp
@@ -147,7 +147,7 @@ public:
 	HTTPRequestHandler* createRequestHandler(const HTTPServerRequest& request)
 	{
 		Application& app = Application::instance();
-		app.logger().information("Request from " 
+		app.logger().information("Request from "
 			+ request.clientAddress().toString()
 			+ ": "
 			+ request.getMethod()
@@ -155,12 +155,12 @@ public:
 			+ request.getURI()
 			+ " "
 			+ request.getVersion());
-			
+
 		for (HTTPServerRequest::ConstIterator it = request.begin(); it != request.end(); ++it)
 		{
 			app.logger().information(it->first + ": " + it->second);
 		}
-		
+
 		if(request.find("Upgrade") != request.end() && Poco::icompare(request["Upgrade"], "websocket") == 0)
 			return new WebSocketRequestHandler;
 		else
@@ -192,7 +192,7 @@ public:
 	WebSocketServer(): _helpRequested(false)
 	{
 	}
-	
+
 	~WebSocketServer()
 	{
 	}
@@ -203,7 +203,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		ServerApplication::initialize(self);
 	}
-		
+
 	void uninitialize()
 	{
 		ServerApplication::uninitialize();
@@ -212,7 +212,7 @@ protected:
 	void defineOptions(OptionSet& options)
 	{
 		ServerApplication::defineOptions(options);
-		
+
 		options.addOption(
 			Option("help", "h", "display help information on command line arguments")
 				.required(false)
@@ -246,7 +246,7 @@ protected:
 		{
 			// get parameters from configuration file
 			unsigned short port = (unsigned short) config().getInt("WebSocketServer.port", 9980);
-			
+
 			// set-up a server socket
 			ServerSocket svs(port);
 			// set-up a HTTPServer instance
@@ -260,7 +260,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/Net/samples/dict/dict.progen b/Net/samples/dict/dict.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/dict/dict.progen
+++ b/Net/samples/dict/dict.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/dict/src/dict.cpp b/Net/samples/dict/src/dict.cpp
index 2e0c21d63..8920be78e 100644
--- a/Net/samples/dict/src/dict.cpp
+++ b/Net/samples/dict/src/dict.cpp
@@ -31,7 +31,7 @@ int main(int argc, char** argv)
 {
 	const std::string HOST("dict.org");
 	const unsigned short PORT = 2628;
-	
+
 	if (argc != 2)
 	{
 		Path p(argv[0]);
@@ -40,13 +40,13 @@ int main(int argc, char** argv)
 		return 1;
 	}
 	std::string term(argv[1]);
-	
+
 	try
 	{
 		SocketAddress sa(HOST, PORT);
 		StreamSocket sock(sa);
 		SocketStream str(sock);
-		
+
 		str << "DEFINE ! " << term << "\r\n" << std::flush;
 		str << "QUIT\r\n" << std::flush;
 
@@ -58,6 +58,6 @@ int main(int argc, char** argv)
 		std::cerr << exc.displayText() << std::endl;
 		return 1;
 	}
-	
+
 	return 0;
 }
diff --git a/Net/samples/download/download.progen b/Net/samples/download/download.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/download/download.progen
+++ b/Net/samples/download/download.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/httpget/httpget.progen b/Net/samples/httpget/httpget.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/httpget/httpget.progen
+++ b/Net/samples/httpget/httpget.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/ifconfig/ifconfig.progen b/Net/samples/ifconfig/ifconfig.progen
index dd7209c7a..c610dc055 100644
--- a/Net/samples/ifconfig/ifconfig.progen
+++ b/Net/samples/ifconfig/ifconfig.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/samples/tcpserver/tcpserver.progen b/Net/samples/tcpserver/tcpserver.progen
index 7da6ac8e2..9ffca51c2 100644
--- a/Net/samples/tcpserver/tcpserver.progen
+++ b/Net/samples/tcpserver/tcpserver.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Net/src/FTPClientSession.cpp b/Net/src/FTPClientSession.cpp
index d77fb39b4..cb22e58d3 100644
--- a/Net/src/FTPClientSession.cpp
+++ b/Net/src/FTPClientSession.cpp
@@ -28,10 +28,11 @@ namespace Poco {
 namespace Net {
 
 
-FTPClientSession::FTPClientSession():
+FTPClientSession::FTPClientSession(Poco::UInt16 activeDataPort):
 	_pControlSocket(0),
 	_pDataStream(0),
 	_port(FTP_PORT),
+	_activeDataPort(activeDataPort),
 	_passiveMode(true),
 	_fileType(TYPE_BINARY),
 	_supports1738(true),
@@ -42,11 +43,14 @@ FTPClientSession::FTPClientSession():
 }
 
 
-FTPClientSession::FTPClientSession(const StreamSocket& socket, bool readWelcomeMessage):
+FTPClientSession::FTPClientSession(const StreamSocket& socket,
+	bool readWelcomeMessage,
+	Poco::UInt16 activeDataPort):
 	_pControlSocket(new DialogSocket(socket)),
 	_pDataStream(0),
 	_host(socket.address().host().toString()),
 	_port(socket.address().port()),
+	_activeDataPort(activeDataPort),
 	_passiveMode(true),
 	_fileType(TYPE_BINARY),
 	_supports1738(true),
@@ -69,11 +73,13 @@ FTPClientSession::FTPClientSession(const StreamSocket& socket, bool readWelcomeM
 FTPClientSession::FTPClientSession(const std::string& host,
 	Poco::UInt16 port,
 	const std::string& username,
-	const std::string& password):
+	const std::string& password,
+	Poco::UInt16 activeDataPort):
 	_pControlSocket(new DialogSocket(SocketAddress(host, port))),
 	_pDataStream(0),
 	_host(host),
 	_port(port),
+	_activeDataPort(activeDataPort),
 	_passiveMode(true),
 	_fileType(TYPE_BINARY),
 	_supports1738(true),
@@ -452,7 +458,7 @@ StreamSocket FTPClientSession::activeDataConnection(const std::string& command,
 	if (!isOpen())
 		throw FTPException("Connection is closed.");
 
-	ServerSocket server(SocketAddress(_pControlSocket->address().host(), 0));
+	ServerSocket server(SocketAddress(_pControlSocket->address().host(), _activeDataPort));
 	sendPortCommand(server.address());
 	std::string response;
 	int status = sendCommand(command, arg, response);
diff --git a/Net/src/FTPStreamFactory.cpp b/Net/src/FTPStreamFactory.cpp
index b557e2f75..48dcdd7cb 100644
--- a/Net/src/FTPStreamFactory.cpp
+++ b/Net/src/FTPStreamFactory.cpp
@@ -41,17 +41,17 @@ public:
 		// make sure exceptions from underlying string propagate
 		_istr.exceptions(std::ios::badbit);
 	}
-	
+
 	~FTPStreamBuf()
 	{
 	}
-		
+
 private:
 	int readFromDevice()
 	{
 		return _istr.get();
 	}
-	
+
 	std::istream& _istr;
 };
 
@@ -64,11 +64,11 @@ public:
 	{
 		poco_ios_init(&_buf);
 	}
-	
+
 	~FTPIOS()
 	{
 	}
-	
+
 	FTPStreamBuf* rdbuf()
 	{
 		return &_buf;
@@ -88,12 +88,12 @@ public:
 		_pSession(pSession)
 	{
 	}
-		
+
 	~FTPStream()
 	{
 		delete _pSession;
 	}
-	
+
 private:
 	FTPClientSession* _pSession;
 };
@@ -133,15 +133,15 @@ std::istream* FTPStreamFactory::open(const URI& uri)
 		std::string username;
 		std::string password;
 		getUserInfo(uri, username, password);
-		
+
 		std::string path;
 		char        type;
 		getPathAndType(uri, path, type);
-			
+
 		pSession->login(username, password);
 		if (type == 'a')
 			pSession->setFileType(FTPClientSession::TYPE_TEXT);
-			
+
 		Path p(path, Path::PATH_UNIX);
 		p.makeFile();
 		for (int i = 0; i < p.depth(); ++i)
@@ -163,19 +163,19 @@ void FTPStreamFactory::setAnonymousPassword(const std::string& password)
 	_anonymousPassword = password;
 }
 
-	
+
 const std::string& FTPStreamFactory::getAnonymousPassword()
 {
 	return _anonymousPassword;
 }
 
-	
+
 void FTPStreamFactory::setPasswordProvider(FTPPasswordProvider* pProvider)
 {
 	_pPasswordProvider = pProvider;
 }
 
-	
+
 FTPPasswordProvider* FTPStreamFactory::getPasswordProvider()
 {
 	return _pPasswordProvider;
diff --git a/Net/src/HTTPChunkedStream.cpp b/Net/src/HTTPChunkedStream.cpp
index 18158cf7d..413691144 100644
--- a/Net/src/HTTPChunkedStream.cpp
+++ b/Net/src/HTTPChunkedStream.cpp
@@ -13,6 +13,7 @@
 
 
 #include "Poco/Net/HTTPChunkedStream.h"
+#include "Poco/Net/HTTPStream.h"
 #include "Poco/Net/HTTPSession.h"
 #include "Poco/NumberFormatter.h"
 #include "Poco/NumberParser.h"
@@ -32,11 +33,12 @@ namespace Net {
 //
 
 
-HTTPChunkedStreamBuf::HTTPChunkedStreamBuf(HTTPSession& session, openmode mode):
+HTTPChunkedStreamBuf::HTTPChunkedStreamBuf(HTTPSession& session, openmode mode, MessageHeader* pTrailer):
 	HTTPBasicStreamBuf(HTTPBufferAllocator::BUFFER_SIZE, mode),
 	_session(session),
 	_mode(mode),
-	_chunk(0)
+	_chunk(0),
+	_pTrailer(pTrailer)
 {
 }
 
@@ -51,7 +53,16 @@ void HTTPChunkedStreamBuf::close()
 	if (_mode & std::ios::out)
 	{
 		sync();
-		_session.write("0\r\n\r\n", 5);
+		_session.write("0\r\n", 3);
+		if (_pTrailer && !_pTrailer->empty())
+		{
+			HTTPOutputStream hos(_session);
+			_pTrailer->write(hos);
+		}
+		else
+		{
+			_session.write("\r\n", 2);
+		}
 	}
 }
 
@@ -81,10 +92,27 @@ int HTTPChunkedStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 		if (n > 0) _chunk -= n;
 		return n;
 	}
-	else 
+	else
 	{
-		int ch = _session.get();
-		while (ch != eof && ch != '\n') ch = _session.get();
+		int ch = _session.peek();
+		if (ch != eof && ch != '\r' && ch != '\n')
+		{
+			HTTPInputStream his(_session);
+			if (_pTrailer)
+			{
+				_pTrailer->read(his);
+			}
+			else
+			{
+				MessageHeader trailer;
+				trailer.read(his);
+			}
+		}
+		else
+		{
+			ch = _session.get();
+			while (ch != eof && ch != '\n') ch = _session.get();
+		}
 		return 0;
 	}
 }
@@ -107,8 +135,8 @@ int HTTPChunkedStreamBuf::writeToDevice(const char* buffer, std::streamsize leng
 //
 
 
-HTTPChunkedIOS::HTTPChunkedIOS(HTTPSession& session, HTTPChunkedStreamBuf::openmode mode):
-	_buf(session, mode)
+HTTPChunkedIOS::HTTPChunkedIOS(HTTPSession& session, HTTPChunkedStreamBuf::openmode mode, MessageHeader* pTrailer):
+	_buf(session, mode, pTrailer)
 {
 	poco_ios_init(&_buf);
 }
@@ -140,8 +168,8 @@ HTTPChunkedStreamBuf* HTTPChunkedIOS::rdbuf()
 Poco::MemoryPool HTTPChunkedInputStream::_pool(sizeof(HTTPChunkedInputStream));
 
 
-HTTPChunkedInputStream::HTTPChunkedInputStream(HTTPSession& session):
-	HTTPChunkedIOS(session, std::ios::in),
+HTTPChunkedInputStream::HTTPChunkedInputStream(HTTPSession& session, MessageHeader* pTrailer):
+	HTTPChunkedIOS(session, std::ios::in, pTrailer),
 	std::istream(&_buf)
 {
 }
@@ -179,8 +207,8 @@ void HTTPChunkedInputStream::operator delete(void* ptr)
 Poco::MemoryPool HTTPChunkedOutputStream::_pool(sizeof(HTTPChunkedOutputStream));
 
 
-HTTPChunkedOutputStream::HTTPChunkedOutputStream(HTTPSession& session):
-	HTTPChunkedIOS(session, std::ios::out),
+HTTPChunkedOutputStream::HTTPChunkedOutputStream(HTTPSession& session, MessageHeader* pTrailer):
+	HTTPChunkedIOS(session, std::ios::out, pTrailer),
 	std::ostream(&_buf)
 {
 }
diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp
index 1b406e4ed..7197e26ad 100644
--- a/Net/src/HTTPClientSession.cpp
+++ b/Net/src/HTTPClientSession.cpp
@@ -309,7 +309,7 @@ std::ostream& HTTPClientSession::sendRequestImpl(const HTTPRequest& request)
 	{
 		HTTPHeaderOutputStream hos(*this);
 		request.write(hos);
-		_pRequestStream = new HTTPChunkedOutputStream(*this);
+		_pRequestStream = new HTTPChunkedOutputStream(*this, &requestTrailer());
 	}
 	else if (request.hasContentLength())
 	{
@@ -349,6 +349,7 @@ void HTTPClientSession::flushRequest()
 std::istream& HTTPClientSession::receiveResponse(HTTPResponse& response)
 {
 	flushRequest();
+	responseTrailer().clear();
 	if (!_responseReceived)
 	{
 		do
@@ -376,7 +377,7 @@ std::istream& HTTPClientSession::receiveResponse(HTTPResponse& response)
 	if (!_expectResponseBody || response.getStatus() < 200 || response.getStatus() == HTTPResponse::HTTP_NO_CONTENT || response.getStatus() == HTTPResponse::HTTP_NOT_MODIFIED)
 		_pResponseStream = new HTTPFixedLengthInputStream(*this, 0);
 	else if (response.getChunkedTransferEncoding())
-		_pResponseStream = new HTTPChunkedInputStream(*this);
+		_pResponseStream = new HTTPChunkedInputStream(*this, &responseTrailer());
 	else if (response.hasContentLength())
 #if defined(POCO_HAVE_INT64)
 		_pResponseStream = new HTTPFixedLengthInputStream(*this, response.getContentLength64());
diff --git a/Net/src/HTTPDigestCredentials.cpp b/Net/src/HTTPDigestCredentials.cpp
index ac810a6a2..b8543c56e 100644
--- a/Net/src/HTTPDigestCredentials.cpp
+++ b/Net/src/HTTPDigestCredentials.cpp
@@ -18,12 +18,15 @@
 #include "Poco/DateTimeFormatter.h"
 #include "Poco/Exception.h"
 #include "Poco/MD5Engine.h"
+#include "Poco/SHA1Engine.h"
+#include "Poco/SHA2Engine.h"
 #include "Poco/Net/HTTPDigestCredentials.h"
 #include "Poco/Net/HTTPRequest.h"
 #include "Poco/Net/HTTPResponse.h"
 #include "Poco/NumberFormatter.h"
 #include "Poco/StringTokenizer.h"
 
+#include <iostream>
 
 namespace
 {
@@ -68,7 +71,28 @@ namespace Net {
 
 
 const std::string HTTPDigestCredentials::SCHEME = "Digest";
-const std::string HTTPDigestCredentials::DEFAULT_ALGORITHM("MD5");
+const std::vector<std::string> HTTPDigestCredentials::SUPPORTED_ALGORITHMS = {
+	"MD5",
+	"MD5-sess",
+	"SHA",
+	"SHA-sess",
+	"SHA-256",
+	"SHA-256-sess",
+	"SHA-512-256",
+	"SHA-512-256-sess",
+	"SHA-512",
+	"SHA-512-sess"
+};
+const std::string HTTPDigestCredentials::MD_5_ALGORITHM = "MD5";
+const std::string HTTPDigestCredentials::MD_5_SESS_ALGORITHM = "MD5-sess";
+const std::string HTTPDigestCredentials::SHA_ALGORITHM = "SHA";
+const std::string HTTPDigestCredentials::SHA_SESS_ALGORITHM = "SHA-sess";
+const std::string HTTPDigestCredentials::SHA_256_ALGORITHM = "SHA-256";
+const std::string HTTPDigestCredentials::SHA_256_SESS_ALGORITHM = "SHA-256-sess";
+const std::string HTTPDigestCredentials::SHA_512_256_ALGORITHM = "SHA-512-256";
+const std::string HTTPDigestCredentials::SHA_512_256_SESS_ALGORITHM = "SHA-512-256-sess";
+const std::string HTTPDigestCredentials::SHA_512_ALGORITHM = "SHA-512";
+const std::string HTTPDigestCredentials::SHA_512_SESS_ALGORITHM = "SHA-512-sess";
 const std::string HTTPDigestCredentials::DEFAULT_QOP("");
 const std::string HTTPDigestCredentials::NONCE_PARAM("nonce");
 const std::string HTTPDigestCredentials::REALM_PARAM("realm");
@@ -84,6 +108,44 @@ const std::string HTTPDigestCredentials::NC_PARAM("nc");
 int HTTPDigestCredentials::_nonceCounter(0);
 Poco::FastMutex HTTPDigestCredentials::_nonceMutex;
 
+class HTTPDigestCredentials::DigestEngineProvider {
+public:
+	DigestEngineProvider(std::string algorithm): _algorithm(algorithm) {
+		_isSessionAlgorithm = _algorithm.find("sess") != std::string::npos;
+	}
+
+	DigestEngine& engine() {
+		if (icompare(_algorithm, SHA_ALGORITHM) == 0 || icompare(_algorithm, SHA_SESS_ALGORITHM) == 0)
+		{
+			return _sha1Engine;
+		}
+		if (icompare(_algorithm, SHA_256_ALGORITHM) == 0 || icompare(_algorithm, SHA_256_SESS_ALGORITHM) == 0)
+		{
+			return _sha256Engine;
+		} else if (icompare(_algorithm, SHA_512_256_ALGORITHM) == 0 || icompare(_algorithm, SHA_512_256_SESS_ALGORITHM) == 0)
+		{
+			return _sha512_256Engine;
+		} else if (icompare(_algorithm, SHA_512_ALGORITHM) == 0 || icompare(_algorithm, SHA_512_SESS_ALGORITHM) == 0)
+		{
+			return _sha512;
+		}
+		else {
+			return _md5Engine;
+		}
+	}
+
+	bool isSessionAlgorithm() {
+		return _isSessionAlgorithm;
+	}
+private:
+	std::string _algorithm;
+	SHA1Engine _sha1Engine;
+	MD5Engine _md5Engine;
+	SHA2Engine _sha256Engine { SHA2Engine::ALGORITHM::SHA_256 };
+	SHA2Engine _sha512_256Engine { SHA2Engine::ALGORITHM::SHA_512_256 };
+	SHA2Engine _sha512 { SHA2Engine::ALGORITHM::SHA_512 };
+	bool _isSessionAlgorithm;
+};
 
 HTTPDigestCredentials::HTTPDigestCredentials()
 {
@@ -191,11 +253,6 @@ void HTTPDigestCredentials::createAuthParams(const HTTPRequest& request, const H
 	if (!responseAuthParams.has(NONCE_PARAM) || !responseAuthParams.has(REALM_PARAM))
 		throw InvalidArgumentException("Invalid HTTP authentication parameters");
 
-	const std::string& algorithm = responseAuthParams.get(ALGORITHM_PARAM, DEFAULT_ALGORITHM);
-
-	if (icompare(algorithm, DEFAULT_ALGORITHM) != 0)
-		throw NotImplementedException("Unsupported digest algorithm", algorithm);
-
 	const std::string& nonce = responseAuthParams.get(NONCE_PARAM);
 	const std::string& qop = responseAuthParams.get(QOP_PARAM, DEFAULT_QOP);
 	const std::string& realm = responseAuthParams.getRealm();
@@ -208,6 +265,10 @@ void HTTPDigestCredentials::createAuthParams(const HTTPRequest& request, const H
 	{
 		_requestAuthParams.set(OPAQUE_PARAM, responseAuthParams.get(OPAQUE_PARAM));
 	}
+	if (responseAuthParams.has(ALGORITHM_PARAM))
+	{
+		_requestAuthParams.set(ALGORITHM_PARAM, responseAuthParams.get(ALGORITHM_PARAM));
+	}
 
 	if (qop.empty())
 	{
@@ -233,10 +294,8 @@ void HTTPDigestCredentials::createAuthParams(const HTTPRequest& request, const H
 	}
 }
 
-
 void HTTPDigestCredentials::updateAuthParams(const HTTPRequest& request)
 {
-	MD5Engine engine;
 	const std::string qop = _requestAuthParams.get(QOP_PARAM, DEFAULT_QOP);
 	const std::string realm = _requestAuthParams.getRealm();
 	const std::string nonce = _requestAuthParams.get(NONCE_PARAM);
@@ -245,6 +304,11 @@ void HTTPDigestCredentials::updateAuthParams(const HTTPRequest& request)
 
 	if (qop.empty())
 	{
+		/// Assume that https://tools.ietf.org/html/rfc7616 does not supported 
+		/// and still using https://tools.ietf.org/html/rfc2069#section-2.4	
+
+		MD5Engine engine;
+
 		const std::string ha1 = digest(engine, _username, realm, _password);
 		const std::string ha2 = digest(engine, request.getMethod(), request.getURI());
 
@@ -252,13 +316,28 @@ void HTTPDigestCredentials::updateAuthParams(const HTTPRequest& request)
 	}
 	else if (icompare(qop, AUTH_PARAM) == 0)
 	{
-		const std::string cnonce = _requestAuthParams.get(CNONCE_PARAM);
+		const std::string algorithm = _requestAuthParams.get(ALGORITHM_PARAM, MD_5_ALGORITHM);
 
-		const std::string ha1 = digest(engine, _username, realm, _password);
-		const std::string ha2 = digest(engine, request.getMethod(), request.getURI());
+		if (!isAlgorithmSupported(algorithm)) {
+			throw NotImplementedException("Unsupported digest algorithm", algorithm);
+		}
+
+		const std::string cnonce = _requestAuthParams.get(CNONCE_PARAM);
 		const std::string nc = formatNonceCounter(updateNonceCounter(nonce));
 
+		DigestEngineProvider engineProvider(algorithm);
+		DigestEngine &engine = engineProvider.engine();
+
+		std::string ha1 = digest(engine, _username, realm, _password);
+
+		if (engineProvider.isSessionAlgorithm()) {
+			ha1 = digest(engine, ha1, nonce, cnonce);
+		}
+
+		const std::string ha2 = digest(engine, request.getMethod(), request.getURI());  
+		
 		_requestAuthParams.set(NC_PARAM, nc);
+		_requestAuthParams.set(CNONCE_PARAM, cnonce);
 		_requestAuthParams.set(RESPONSE_PARAM, digest(engine, ha1, nonce, nc, cnonce, qop, ha2));
 	}
 }
@@ -277,18 +356,34 @@ bool HTTPDigestCredentials::verifyAuthParams(const HTTPRequest& request, const H
 	const std::string& realm = params.getRealm();
 	const std::string& qop   = params.get(QOP_PARAM, DEFAULT_QOP);
 	std::string response;
-	MD5Engine engine;
 	if (qop.empty())
 	{
+		MD5Engine engine;
+
 		const std::string ha1 = digest(engine, _username, realm, _password);
 		const std::string ha2 = digest(engine, request.getMethod(), request.getURI());
 		response = digest(engine, ha1, nonce, ha2);
 	}
 	else if (icompare(qop, AUTH_PARAM) == 0)
 	{
+		const std::string& algorithm = params.get(ALGORITHM_PARAM, MD_5_ALGORITHM);
+		
+		if (!isAlgorithmSupported(algorithm)) {
+			throw NotImplementedException("Unsupported digest algorithm", algorithm);
+		}
+
+		DigestEngineProvider engineProvider(algorithm);
+		DigestEngine& engine = engineProvider.engine();
+
 		const std::string& cnonce = params.get(CNONCE_PARAM);
 		const std::string& nc = params.get(NC_PARAM);
-		const std::string ha1 = digest(engine, _username, realm, _password);
+
+		std::string ha1 = digest(engine, _username, realm, _password);
+
+		if (engineProvider.isSessionAlgorithm()) {
+			ha1 = digest(engine, ha1, nonce, cnonce);
+		}
+
 		const std::string ha2 = digest(engine, request.getMethod(), request.getURI());
 		response = digest(engine, ha1, nonce, nc, cnonce, qop, ha2);
 	}
@@ -309,5 +404,15 @@ int HTTPDigestCredentials::updateNonceCounter(const std::string& nonce)
 	return iter->second;
 }
 
+bool HTTPDigestCredentials::isAlgorithmSupported(const std::string& algorithm) const
+{
+	bool isAlgorithmSupported = std::find_if(std::begin(SUPPORTED_ALGORITHMS), 
+											std::end(SUPPORTED_ALGORITHMS),
+											[&algorithm](const std::string& supportedAlgorithm) {
+		return icompare(algorithm, supportedAlgorithm) == 0;
+	}) != std::end(SUPPORTED_ALGORITHMS);
+
+	return isAlgorithmSupported;
+}
 
 } } // namespace Poco::Net
diff --git a/Net/src/HTTPResponse.cpp b/Net/src/HTTPResponse.cpp
index e19076d6d..07496e46d 100644
--- a/Net/src/HTTPResponse.cpp
+++ b/Net/src/HTTPResponse.cpp
@@ -81,6 +81,7 @@ const std::string HTTPResponse::HTTP_REASON_MISDIRECTED_REQUEST             = "M
 const std::string HTTPResponse::HTTP_REASON_UNPROCESSABLE_ENTITY            = "Unprocessable Entity";
 const std::string HTTPResponse::HTTP_REASON_LOCKED                          = "Locked";
 const std::string HTTPResponse::HTTP_REASON_FAILED_DEPENDENCY               = "Failed Dependency";
+const std::string HTTPResponse::HTTP_REASON_TOO_EARLY                       = "Too Early";
 const std::string HTTPResponse::HTTP_REASON_UPGRADE_REQUIRED                = "Upgrade Required";
 const std::string HTTPResponse::HTTP_REASON_PRECONDITION_REQUIRED           = "Precondition Required";
 const std::string HTTPResponse::HTTP_REASON_TOO_MANY_REQUESTS               = "Too Many Requests";
@@ -363,6 +364,8 @@ const std::string& HTTPResponse::getReasonForStatus(HTTPStatus status)
 		return HTTP_REASON_LOCKED;
 	case HTTP_FAILED_DEPENDENCY:
 		return HTTP_REASON_FAILED_DEPENDENCY;
+	case HTTP_TOO_EARLY:
+		return HTTP_REASON_TOO_EARLY;
 	case HTTP_UPGRADE_REQUIRED:
 		return HTTP_REASON_UPGRADE_REQUIRED;
 	case HTTP_PRECONDITION_REQUIRED:
diff --git a/Net/src/HTTPServerConnection.cpp b/Net/src/HTTPServerConnection.cpp
index eb822812c..3fd934540 100644
--- a/Net/src/HTTPServerConnection.cpp
+++ b/Net/src/HTTPServerConnection.cpp
@@ -76,6 +76,8 @@ void HTTPServerConnection::run()
 					response.set("Server", server);
 				try
 				{
+					session.requestTrailer().clear();
+					session.responseTrailer().clear();
 					std::unique_ptr<HTTPRequestHandler> pHandler(_pFactory->createRequestHandler(request));
 					if (pHandler.get())
 					{
diff --git a/Net/src/HTTPServerParams.cpp b/Net/src/HTTPServerParams.cpp
index cc8716111..34742c72b 100644
--- a/Net/src/HTTPServerParams.cpp
+++ b/Net/src/HTTPServerParams.cpp
@@ -32,12 +32,12 @@ HTTPServerParams::~HTTPServerParams()
 {
 }
 
-	
+
 void HTTPServerParams::setServerName(const std::string& serverName)
 {
 	_serverName = serverName;
 }
-	
+
 
 void HTTPServerParams::setSoftwareVersion(const std::string& softwareVersion)
 {
@@ -50,24 +50,24 @@ void HTTPServerParams::setTimeout(const Poco::Timespan& timeout)
 	_timeout = timeout;
 }
 
-	
+
 void HTTPServerParams::setKeepAlive(bool keepAlive)
 {
 	_keepAlive = keepAlive;
 }
 
-	
+
 void HTTPServerParams::setKeepAliveTimeout(const Poco::Timespan& timeout)
 {
 	_keepAliveTimeout = timeout;
 }
 
-	
+
 void HTTPServerParams::setMaxKeepAliveRequests(int maxKeepAliveRequests)
 {
 	poco_assert (maxKeepAliveRequests >= 0);
 	_maxKeepAliveRequests = maxKeepAliveRequests;
 }
-	
+
 
 } } // namespace Poco::Net
diff --git a/Net/src/HTTPServerRequestImpl.cpp b/Net/src/HTTPServerRequestImpl.cpp
index d8ea7398c..e27abd8ee 100644
--- a/Net/src/HTTPServerRequestImpl.cpp
+++ b/Net/src/HTTPServerRequestImpl.cpp
@@ -41,13 +41,13 @@ HTTPServerRequestImpl::HTTPServerRequestImpl(HTTPServerResponseImpl& response, H
 
 	HTTPHeaderInputStream hs(session);
 	read(hs);
-	
+
 	// Now that we know socket is still connected, obtain addresses
 	_clientAddress = session.clientAddress();
 	_serverAddress = session.serverAddress();
-	
+
 	if (getChunkedTransferEncoding())
-		_pStream = new HTTPChunkedInputStream(session);
+		_pStream = new HTTPChunkedInputStream(session, &session.requestTrailer());
 	else if (hasContentLength())
 #if defined(POCO_HAVE_INT64)
 		_pStream = new HTTPFixedLengthInputStream(session, getContentLength64());
diff --git a/Net/src/HTTPServerResponseImpl.cpp b/Net/src/HTTPServerResponseImpl.cpp
index 83a51877d..20dfcc016 100644
--- a/Net/src/HTTPServerResponseImpl.cpp
+++ b/Net/src/HTTPServerResponseImpl.cpp
@@ -82,13 +82,13 @@ std::ostream& HTTPServerResponseImpl::send()
 	{
 		HTTPHeaderOutputStream hs(_session);
 		write(hs);
-		_pStream = new HTTPChunkedOutputStream(_session);
+		_pStream = new HTTPChunkedOutputStream(_session, &_session.responseTrailer());
 	}
 	else if (hasContentLength())
 	{
 		Poco::CountingOutputStream cs;
 		write(cs);
-#if defined(POCO_HAVE_INT64)	
+#if defined(POCO_HAVE_INT64)
 		_pStream = new HTTPFixedLengthOutputStream(_session, getContentLength64() + cs.chars());
 #else
 		_pStream = new HTTPFixedLengthOutputStream(_session, getContentLength() + cs.chars());
@@ -113,7 +113,7 @@ void HTTPServerResponseImpl::sendFile(const std::string& path, const std::string
 	Timestamp dateTime    = f.getLastModified();
 	File::FileSize length = f.getSize();
 	set("Last-Modified", DateTimeFormatter::format(dateTime, DateTimeFormat::HTTP_FORMAT));
-#if defined(POCO_HAVE_INT64)	
+#if defined(POCO_HAVE_INT64)
 	setContentLength64(length);
 #else
 	setContentLength(static_cast<int>(length));
@@ -141,7 +141,7 @@ void HTTPServerResponseImpl::sendBuffer(const void* pBuffer, std::size_t length)
 
 	setContentLength(static_cast<int>(length));
 	setChunkedTransferEncoding(false);
-	
+
 	_pStream = new HTTPHeaderOutputStream(_session);
 	write(*_pStream);
 	if (_pRequest && _pRequest->getMethod() != HTTPRequest::HTTP_HEAD)
@@ -169,7 +169,7 @@ void HTTPServerResponseImpl::redirect(const std::string& uri, HTTPStatus status)
 void HTTPServerResponseImpl::requireAuthentication(const std::string& realm)
 {
 	poco_assert (!_pStream);
-	
+
 	setStatusAndReason(HTTPResponse::HTTP_UNAUTHORIZED);
 	std::string auth("Basic realm=\"");
 	auth.append(realm);
diff --git a/Net/src/HTTPServerSession.cpp b/Net/src/HTTPServerSession.cpp
index f6d3c4e5b..dda32b605 100644
--- a/Net/src/HTTPServerSession.cpp
+++ b/Net/src/HTTPServerSession.cpp
@@ -47,7 +47,7 @@ bool HTTPServerSession::hasMoreRequests()
 	}
 	else if (_maxKeepAliveRequests != 0 && getKeepAlive())
 	{
-		if (_maxKeepAliveRequests > 0) 
+		if (_maxKeepAliveRequests > 0)
 			--_maxKeepAliveRequests;
 		return buffered() > 0 || socket().poll(_keepAliveTimeout, Socket::SELECT_READ);
 	}
diff --git a/Net/src/HTTPSession.cpp b/Net/src/HTTPSession.cpp
index 1eedeb088..478a0ad78 100644
--- a/Net/src/HTTPSession.cpp
+++ b/Net/src/HTTPSession.cpp
@@ -111,14 +111,14 @@ int HTTPSession::get()
 {
 	if (_pCurrent == _pEnd)
 		refill();
-	
+
 	if (_pCurrent < _pEnd)
 		return *_pCurrent++;
 	else
 		return std::char_traits<char>::eof();
 }
 
-	
+
 int HTTPSession::peek()
 {
 	if (_pCurrent == _pEnd)
@@ -130,7 +130,7 @@ int HTTPSession::peek()
 		return std::char_traits<char>::eof();
 }
 
-	
+
 int HTTPSession::read(char* buffer, std::streamsize length)
 {
 	if (_pCurrent < _pEnd)
diff --git a/Net/src/HTTPStreamFactory.cpp b/Net/src/HTTPStreamFactory.cpp
index ee77d98ec..8143e97ec 100644
--- a/Net/src/HTTPStreamFactory.cpp
+++ b/Net/src/HTTPStreamFactory.cpp
@@ -85,7 +85,7 @@ std::istream* HTTPStreamFactory::open(const URI& uri)
 			if (!pSession)
 			{
 				pSession = new HTTPClientSession(resolvedURI.getHost(), resolvedURI.getPort());
-			
+
 				if (proxyUri.empty())
 				{
 					if (!_proxyHost.empty())
@@ -103,28 +103,28 @@ std::istream* HTTPStreamFactory::open(const URI& uri)
 					}
 				}
 			}
-						
+
 			std::string path = resolvedURI.getPathAndQuery();
 			if (path.empty()) path = "/";
 			HTTPRequest req(HTTPRequest::HTTP_GET, path, HTTPMessage::HTTP_1_1);
-			
+
 			if (authorize)
 			{
 				HTTPCredentials::extractCredentials(uri, username, password);
 				HTTPCredentials cred(username, password);
 				cred.authenticate(req, res);
 			}
-			
-			req.set("User-Agent", Poco::format("poco/%d.%d.%d", 
+
+			req.set("User-Agent", Poco::format("poco/%d.%d.%d",
 				(POCO_VERSION >> 24) & 0xFF,
 				(POCO_VERSION >> 16) & 0xFF,
 				(POCO_VERSION >> 8) & 0xFF));
 			req.set("Accept", "*/*");
-			
+
 			pSession->sendRequest(req);
 			std::istream& rs = pSession->receiveResponse(res);
-			bool moved = (res.getStatus() == HTTPResponse::HTTP_MOVED_PERMANENTLY || 
-						  res.getStatus() == HTTPResponse::HTTP_FOUND || 
+			bool moved = (res.getStatus() == HTTPResponse::HTTP_MOVED_PERMANENTLY ||
+						  res.getStatus() == HTTPResponse::HTTP_FOUND ||
 						  res.getStatus() == HTTPResponse::HTTP_SEE_OTHER ||
 						  res.getStatus() == HTTPResponse::HTTP_TEMPORARY_REDIRECT);
 			if (moved)
@@ -142,13 +142,13 @@ std::istream* HTTPStreamFactory::open(const URI& uri)
 			}
 			else if (res.getStatus() == HTTPResponse::HTTP_USE_PROXY && !retry)
 			{
-				// The requested resource MUST be accessed through the proxy 
-				// given by the Location field. The Location field gives the 
-				// URI of the proxy. The recipient is expected to repeat this 
+				// The requested resource MUST be accessed through the proxy
+				// given by the Location field. The Location field gives the
+				// URI of the proxy. The recipient is expected to repeat this
 				// single request via the proxy. 305 responses MUST only be generated by origin servers.
 				// only use for one single request!
 				proxyUri.resolve(res.get("Location"));
-				delete pSession; 
+				delete pSession;
 				pSession = 0;
 				retry = true; // only allow useproxy once
 			}
diff --git a/Net/src/HostEntry.cpp b/Net/src/HostEntry.cpp
index a93deb564..79a1d7cae 100644
--- a/Net/src/HostEntry.cpp
+++ b/Net/src/HostEntry.cpp
@@ -30,7 +30,7 @@ HostEntry::HostEntry(struct hostent* entry)
 {
 	poco_check_ptr (entry);
 
-	_name = entry->h_name;	
+	_name = entry->h_name;
 	char** alias = entry->h_aliases;
 	if (alias)
 	{
@@ -61,7 +61,7 @@ HostEntry::HostEntry(struct hostent* entry)
 HostEntry::HostEntry(struct addrinfo* ainfo)
 {
 	poco_check_ptr (ainfo);
-	
+
 	for (struct addrinfo* ai = ainfo; ai; ai = ai->ai_next)
 	{
 		if (ai->ai_canonname)
@@ -123,7 +123,7 @@ HostEntry& HostEntry::operator = (const HostEntry& entry)
 }
 
 
-void HostEntry::swap(HostEntry& hostEntry)
+void HostEntry::swap(HostEntry& hostEntry) noexcept
 {
 	std::swap(_name, hostEntry._name);
 	std::swap(_aliases, hostEntry._aliases);
diff --git a/Net/src/ICMPEventArgs.cpp b/Net/src/ICMPEventArgs.cpp
index 3a219f9d7..2fc15bbee 100644
--- a/Net/src/ICMPEventArgs.cpp
+++ b/Net/src/ICMPEventArgs.cpp
@@ -31,11 +31,11 @@ namespace Net {
 
 
 ICMPEventArgs::ICMPEventArgs(const SocketAddress& address, int repetitions, int dataSize, int ttl):
-	_address(address), 
+	_address(address),
 	_sent(0),
-	_dataSize(dataSize), 
-	_ttl(ttl), 
-	_rtt(repetitions, 0), 
+	_dataSize(dataSize),
+	_ttl(ttl),
+	_rtt(repetitions, 0),
 	_errors(repetitions)
 {
 }
@@ -52,10 +52,10 @@ std::string ICMPEventArgs::hostName() const
 	{
 		return DNS::resolve(_address.host().toString()).name();
 	}
-	catch (HostNotFoundException&) 
+	catch (HostNotFoundException&)
 	{
 	}
-	catch (NoAddressFoundException&) 
+	catch (NoAddressFoundException&)
 	{
 	}
 	catch (DNSException&)
@@ -101,7 +101,7 @@ int ICMPEventArgs::received() const
 {
 	int received = 0;
 
-	for (int i = 0; i < _rtt.size(); ++i) 
+	for (int i = 0; i < _rtt.size(); ++i)
 	{
 		if (_rtt[i]) ++received;
 	}
@@ -111,7 +111,7 @@ int ICMPEventArgs::received() const
 
 void ICMPEventArgs::setError(int index, const std::string& text)
 {
-	if (index >= _errors.size()) 
+	if (index >= _errors.size())
 		throw InvalidArgumentException("Supplied index exceeds vector capacity.");
 
 	_errors[index] = text;
@@ -120,7 +120,7 @@ void ICMPEventArgs::setError(int index, const std::string& text)
 
 const std::string& ICMPEventArgs::error(int index) const
 {
-	if (0 == _errors.size()) 
+	if (0 == _errors.size())
 		throw InvalidArgumentException("Supplied index exceeds vector capacity.");
 
 	if (-1 == index) index = _sent - 1;
@@ -131,7 +131,7 @@ const std::string& ICMPEventArgs::error(int index) const
 
 void ICMPEventArgs::setReplyTime(int index, int time)
 {
-	if (index >= _rtt.size()) 
+	if (index >= _rtt.size())
 		throw InvalidArgumentException("Supplied index exceeds array capacity.");
 	if (0 == time) time = 1;
 	_rtt[index] = time;
@@ -140,7 +140,7 @@ void ICMPEventArgs::setReplyTime(int index, int time)
 
 int ICMPEventArgs::replyTime(int index) const
 {
-	if (0 == _rtt.size()) 
+	if (0 == _rtt.size())
 		throw InvalidArgumentException("Supplied index exceeds array capacity.");
 
 	if (-1 == index) index = _sent - 1;
@@ -152,7 +152,7 @@ int ICMPEventArgs::replyTime(int index) const
 int ICMPEventArgs::avgRTT() const
 {
 	if (0 == _rtt.size()) return 0;
-	
+
 	return (int) (std::accumulate(_rtt.begin(), _rtt.end(), 0) / _rtt.size());
 }
 
diff --git a/Net/src/ICMPPacketImpl.cpp b/Net/src/ICMPPacketImpl.cpp
index 2534546ae..8ecb63bd6 100644
--- a/Net/src/ICMPPacketImpl.cpp
+++ b/Net/src/ICMPPacketImpl.cpp
@@ -81,13 +81,13 @@ unsigned short ICMPPacketImpl::checksum(UInt16 *addr, Int32 len)
 	UInt16 answer;
 	Int32 sum = 0;
 
-	while (nleft > 1)  
+	while (nleft > 1)
 	{
 		sum   += *w++;
 		nleft -= sizeof(UInt16);
 	}
 
-	if (nleft == 1) 
+	if (nleft == 1)
 	{
 		UInt16 u = 0;
 		*(UInt8*) (&u) = *(UInt8*) w;
diff --git a/Net/src/ICMPSocket.cpp b/Net/src/ICMPSocket.cpp
index 7d4bd7898..ac06c7ee2 100644
--- a/Net/src/ICMPSocket.cpp
+++ b/Net/src/ICMPSocket.cpp
@@ -25,13 +25,13 @@ namespace Poco {
 namespace Net {
 
 
-ICMPSocket::ICMPSocket(IPAddress::Family family, int dataSize, int ttl, int timeout): 
+ICMPSocket::ICMPSocket(IPAddress::Family family, int dataSize, int ttl, int timeout):
 	Socket(new ICMPSocketImpl(family, dataSize, ttl, timeout))
 {
 }
 
 
-ICMPSocket::ICMPSocket(const Socket& socket): 
+ICMPSocket::ICMPSocket(const Socket& socket):
 	Socket(socket)
 {
 	if (!dynamic_cast<ICMPSocketImpl*>(impl()))
@@ -39,7 +39,7 @@ ICMPSocket::ICMPSocket(const Socket& socket):
 }
 
 
-ICMPSocket::ICMPSocket(SocketImpl* pImpl): 
+ICMPSocket::ICMPSocket(SocketImpl* pImpl):
 	Socket(pImpl)
 {
 	if (!dynamic_cast<ICMPSocketImpl*>(impl()))
diff --git a/Net/src/IPAddress.cpp b/Net/src/IPAddress.cpp
index 164386c4b..0ad28c242 100644
--- a/Net/src/IPAddress.cpp
+++ b/Net/src/IPAddress.cpp
@@ -236,7 +236,7 @@ IPAddress& IPAddress::operator = (const IPAddress& addr)
 		else if (addr.family() == IPAddress::IPv6)
 			newIPv6(addr.addr(), addr.scope());
 #endif
-		else 
+		else
 			throw Poco::InvalidArgumentException("Invalid or unsupported address family");
 	}
 	return *this;
@@ -261,7 +261,7 @@ Poco::UInt32 IPAddress::scope() const
 	return pImpl()->scope();
 }
 
-	
+
 std::string IPAddress::toString() const
 {
 	return pImpl()->toString();
@@ -291,13 +291,13 @@ bool IPAddress::isMulticast() const
 	return pImpl()->isMulticast();
 }
 
-	
+
 bool IPAddress::isUnicast() const
 {
 	return !isWildcard() && !isBroadcast() && !isMulticast();
 }
 
-	
+
 bool IPAddress::isLinkLocal() const
 {
 	return pImpl()->isLinkLocal();
@@ -513,7 +513,7 @@ poco_socklen_t IPAddress::length() const
 	return pImpl()->length();
 }
 
-	
+
 const void* IPAddress::addr() const
 {
 	return pImpl()->addr();
diff --git a/Net/src/IPAddressImpl.cpp b/Net/src/IPAddressImpl.cpp
index 03b55ec45..b94b7e94d 100644
--- a/Net/src/IPAddressImpl.cpp
+++ b/Net/src/IPAddressImpl.cpp
@@ -40,8 +40,8 @@ namespace {
 template <typename T>
 unsigned maskBits(T val, unsigned size)
 	/// Returns the length of the mask (number of bits set in val).
-	/// The val should be either all zeros or two contiguos areas of 1s and 0s. 
-	/// The algorithm ignores invalid non-contiguous series of 1s and treats val 
+	/// The val should be either all zeros or two contiguos areas of 1s and 0s.
+	/// The algorithm ignores invalid non-contiguous series of 1s and treats val
 	/// as if all bits between MSb and last non-zero bit are set to 1.
 {
 	unsigned count = 0;
@@ -261,7 +261,7 @@ bool IPv4AddressImpl::isGlobalMC() const
 IPv4AddressImpl IPv4AddressImpl::parse(const std::string& addr)
 {
 	if (addr.empty()) return IPv4AddressImpl();
-#if defined(_WIN32) 
+#if defined(_WIN32)
 	struct in_addr ia;
 	ia.s_addr = inet_addr(addr.c_str());
 	if (ia.s_addr == INADDR_NONE && addr != "255.255.255.255")
@@ -290,7 +290,7 @@ IPv4AddressImpl IPv4AddressImpl::parse(const std::string& addr)
 void IPv4AddressImpl::mask(const IPAddressImpl* pMask, const IPAddressImpl* pSet)
 {
 	poco_assert (pMask->af() == AF_INET && pSet->af() == AF_INET);
-	
+
 	_addr.s_addr &= static_cast<const IPv4AddressImpl*>(pMask)->_addr.s_addr;
 	_addr.s_addr |= static_cast<const IPv4AddressImpl*>(pSet)->_addr.s_addr & ~static_cast<const IPv4AddressImpl*>(pMask)->_addr.s_addr;
 }
@@ -394,7 +394,7 @@ IPv6AddressImpl::IPv6AddressImpl(unsigned prefix):
 {
 	unsigned i = 0;
 #ifdef POCO_OS_FAMILY_WINDOWS
-	for (; prefix >= 16; ++i, prefix -= 16) 
+	for (; prefix >= 16; ++i, prefix -= 16)
 	{
 		_addr.s6_addr16[i] = 0xffff;
 	}
@@ -407,7 +407,7 @@ IPv6AddressImpl::IPv6AddressImpl(unsigned prefix):
 		_addr.s6_addr16[i++] = 0;
 	}
 #else
-	for (; prefix >= 32; ++i, prefix -= 32) 
+	for (; prefix >= 32; ++i, prefix -= 32)
 	{
 		_addr.s6_addr32[i] = 0xffffffff;
 	}
@@ -551,7 +551,7 @@ Poco::UInt32 IPv6AddressImpl::scope() const
 bool IPv6AddressImpl::isWildcard() const
 {
 	const UInt16* words = reinterpret_cast<const UInt16*>(&_addr);
-	return words[0] == 0 && words[1] == 0 && words[2] == 0 && words[3] == 0 && 
+	return words[0] == 0 && words[1] == 0 && words[2] == 0 && words[3] == 0 &&
 		words[4] == 0 && words[5] == 0 && words[6] == 0 && words[7] == 0;
 }
 
@@ -568,7 +568,7 @@ bool IPv6AddressImpl::isLoopback() const
     	return (ByteOrder::fromNetwork(_addr.s6_addr[6]) & 0xFF000000) == 0x7F000000;
 
 	const UInt16* words = reinterpret_cast<const UInt16*>(&_addr);
-	return words[0] == 0 && words[1] == 0 && words[2] == 0 && words[3] == 0 && 
+	return words[0] == 0 && words[1] == 0 && words[2] == 0 && words[3] == 0 &&
 		words[4] == 0 && words[5] == 0 && words[6] == 0 && ByteOrder::fromNetwork(words[7]) == 0x0001;
 }
 
@@ -732,9 +732,9 @@ IPv6AddressImpl IPv6AddressImpl::operator & (const IPv6AddressImpl& addr) const
 
 IPv6AddressImpl IPv6AddressImpl::operator | (const IPv6AddressImpl& addr) const
 {
-	if (_scope != addr._scope) 
+	if (_scope != addr._scope)
 		throw Poco::InvalidArgumentException("Scope ID of passed IPv6 address does not match with the source one.");
-    
+
 	IPv6AddressImpl result(*this);
 #ifdef POCO_OS_FAMILY_WINDOWS
 	result._addr.s6_addr16[0] |= addr._addr.s6_addr16[0];
@@ -759,7 +759,7 @@ IPv6AddressImpl IPv6AddressImpl::operator ^ (const IPv6AddressImpl& addr) const
 {
 	if (_scope != addr._scope)
 		throw Poco::InvalidArgumentException("Scope ID of passed IPv6 address does not match  with the source one.");
-    
+
 	IPv6AddressImpl result(*this);
 
 #ifdef POCO_OS_FAMILY_WINDOWS
diff --git a/Net/src/MailMessage.cpp b/Net/src/MailMessage.cpp
index ebdc2b28f..97d7e79e1 100644
--- a/Net/src/MailMessage.cpp
+++ b/Net/src/MailMessage.cpp
@@ -52,7 +52,7 @@ namespace Net {
 namespace
 {
 	class MultiPartHandler: public PartHandler
-		/// This is a default part handler for multipart messages, used when there 
+		/// This is a default part handler for multipart messages, used when there
 		/// is no external handler provided to he MailMessage. This handler
 		/// will handle all types of message parts, including attachments.
 	{
@@ -65,14 +65,14 @@ namespace
 			/// in its entirety, including attachments.
 		{
 		}
-		
+
 		~MultiPartHandler()
 			/// Destroys string part handler.
 		{
 		}
-		
+
 		void handlePart(const MessageHeader& header, std::istream& stream)
-			/// Handles a part. If message pointer was provided at construction time, 
+			/// Handles a part. If message pointer was provided at construction time,
 			/// the message pointed to will be properly populated so it could be written
 			/// back out at a later point in time.
 		{
@@ -97,7 +97,7 @@ namespace
 				std::string filename;
 				if (!contentDisp.empty())
 					filename = getParamFromHeader(contentDisp, "filename");
-				if (filename.empty()) 
+				if (filename.empty())
 					filename = getParamFromHeader(contentType, "name");
 				PartSource* pPS = _pMsg->createPartStore(tmp, contentType, filename);
 				poco_check_ptr (pPS);
@@ -108,13 +108,13 @@ namespace
 				{
 					if (!added && MailMessage::HEADER_CONTENT_DISPOSITION == it->first)
 					{
-						if (it->second == "inline") 
+						if (it->second == "inline")
 							_pMsg->addContent(pPS, cte);
-						else 
+						else
 							_pMsg->addAttachment("", pPS, cte);
 						added = true;
 					}
-					
+
 					pPS->headers().set(it->first, it->second);
 				}
 
@@ -127,7 +127,7 @@ namespace
 				if (!added) delete pPS;
 			}
 		}
-		
+
 	private:
 		std::string getParamFromHeader(const std::string& header, const std::string& param)
 		{
@@ -159,12 +159,12 @@ namespace
 			/// The content parameter represents the part content.
 		{
 		}
-		
+
 		~StringPartHandler()
 			/// Destroys string part handler.
 		{
 		}
-		
+
 		void handlePart(const MessageHeader& header, std::istream& stream)
 			/// Handles a part.
 		{
@@ -172,7 +172,7 @@ namespace
 			Poco::StreamCopier::copyToString(stream, tmp);
 			_str.append(tmp);
 		}
-		
+
 	private:
 		std::string& _str;
 	};
@@ -198,7 +198,7 @@ const std::string MailMessage::CTE_QUOTED_PRINTABLE("quoted-printable");
 const std::string MailMessage::CTE_BASE64("base64");
 
 
-MailMessage::MailMessage(PartStoreFactory* pStoreFactory): 
+MailMessage::MailMessage(PartStoreFactory* pStoreFactory):
 	_encoding(),
 	_pStoreFactory(pStoreFactory)
 {
@@ -216,7 +216,7 @@ MailMessage::~MailMessage()
 	}
 }
 
-	
+
 void MailMessage::addRecipient(const MailRecipient& recipient)
 {
 	_recipients.push_back(recipient);
@@ -234,7 +234,7 @@ void MailMessage::setSender(const std::string& sender)
 	set(HEADER_FROM, sender);
 }
 
-	
+
 const std::string& MailMessage::getSender() const
 {
 	if (has(HEADER_FROM))
@@ -243,13 +243,13 @@ const std::string& MailMessage::getSender() const
 		return EMPTY_HEADER;
 }
 
-	
+
 void MailMessage::setSubject(const std::string& subject)
 {
 	set(HEADER_SUBJECT, subject);
 }
 
-	
+
 const std::string& MailMessage::getSubject() const
 {
 	if (has(HEADER_SUBJECT))
@@ -272,13 +272,13 @@ void MailMessage::setContentType(const std::string& mediaType)
 	set(HEADER_CONTENT_TYPE, mediaType);
 }
 
-	
+
 void MailMessage::setContentType(const MediaType& mediaType)
 {
 	setContentType(mediaType.toString());
 }
 
-	
+
 const std::string& MailMessage::getContentType() const
 {
 	if (has(HEADER_CONTENT_TYPE))
@@ -293,7 +293,7 @@ void MailMessage::setDate(const Poco::Timestamp& dateTime)
 	set(HEADER_DATE, DateTimeFormatter::format(dateTime, DateTimeFormat::RFC1123_FORMAT));
 }
 
-	
+
 Poco::Timestamp MailMessage::getDate() const
 {
 	const std::string& dateTime = get(HEADER_DATE);
@@ -301,7 +301,7 @@ Poco::Timestamp MailMessage::getDate() const
 	return DateTimeParser::parse(dateTime, tzd).timestamp();
 }
 
-	
+
 bool MailMessage::isMultipart() const
 {
 	MediaType mediaType = getContentType();
@@ -328,7 +328,7 @@ void MailMessage::addContent(PartSource* pSource, ContentTransferEncoding encodi
 	addPart("", pSource, CONTENT_INLINE, encoding);
 }
 
-	
+
 void MailMessage::addAttachment(const std::string& name, PartSource* pSource, ContentTransferEncoding encoding)
 {
 	addPart(name, pSource, CONTENT_ATTACHMENT, encoding);
@@ -388,7 +388,7 @@ void MailMessage::makeMultipart()
 	if (!isMultipart())
 	{
 		MediaType mediaType("multipart", "mixed");
-		setContentType(mediaType);	
+		setContentType(mediaType);
 	}
 }
 
@@ -408,7 +408,7 @@ void MailMessage::writeMultipart(MessageHeader& header, std::ostream& ostr) cons
 	header.set(HEADER_CONTENT_TYPE, mediaType.toString());
 	header.set(HEADER_MIME_VERSION, "1.0");
 	writeHeader(header, ostr);
-	
+
 	MultipartWriter writer(ostr, _boundary);
 	for (const auto& part: _parts)
 	{
@@ -542,7 +542,7 @@ void MailMessage::setRecipientHeaders(MessageHeader& headers) const
 	std::string to;
 	std::string cc;
 	std::string bcc;
-	
+
 	for (const auto& rec: _recipients)
 	{
 		switch (rec.getType())
@@ -622,7 +622,7 @@ std::string MailMessage::encodeWord(const std::string& text, const std::string&
 		}
 	}
 	if (!containsNonASCII) return text;
-	
+
 	std::string encodedText;
 	std::string::size_type lineLength = 0;
 	for (auto ch: text)
@@ -680,7 +680,7 @@ std::string MailMessage::encodeWord(const std::string& text, const std::string&
 	if (lineLength > 0)
 	{
 		encodedText += "?=";
-	}	
+	}
 	return encodedText;
 }
 
diff --git a/Net/src/MailRecipient.cpp b/Net/src/MailRecipient.cpp
index 1f6672810..63cff056c 100644
--- a/Net/src/MailRecipient.cpp
+++ b/Net/src/MailRecipient.cpp
@@ -25,7 +25,7 @@ MailRecipient::MailRecipient():
 {
 }
 
-	
+
 MailRecipient::MailRecipient(const MailRecipient& recipient):
 	_address(recipient._address),
 	_realName(recipient._realName),
@@ -33,7 +33,7 @@ MailRecipient::MailRecipient(const MailRecipient& recipient):
 {
 }
 
-	
+
 MailRecipient::MailRecipient(RecipientType type, const std::string& address):
 	_address(address),
 	_type(type)
@@ -53,7 +53,7 @@ MailRecipient::~MailRecipient()
 {
 }
 
-	
+
 MailRecipient& MailRecipient::operator = (const MailRecipient& recipient)
 {
 	if (this != &recipient)
@@ -65,26 +65,26 @@ MailRecipient& MailRecipient::operator = (const MailRecipient& recipient)
 }
 
 
-void MailRecipient::swap(MailRecipient& recipient)
+void MailRecipient::swap(MailRecipient& recipient) noexcept
 {
 	std::swap(_type, recipient._type);
 	std::swap(_address, recipient._address);
 	std::swap(_realName, recipient._realName);
 }
 
-	
+
 void MailRecipient::setType(RecipientType type)
 {
 	_type = type;
 }
 
-	
+
 void MailRecipient::setAddress(const std::string& address)
 {
 	_address = address;
 }
 
-	
+
 void MailRecipient::setRealName(const std::string& realName)
 {
 	_realName = realName;
diff --git a/Net/src/MailStream.cpp b/Net/src/MailStream.cpp
index 8cd8fa44d..278e591c7 100644
--- a/Net/src/MailStream.cpp
+++ b/Net/src/MailStream.cpp
@@ -20,7 +20,7 @@ namespace Net {
 
 
 MailStreamBuf::MailStreamBuf(std::istream& istr):
-	_pIstr(&istr), 
+	_pIstr(&istr),
 	_pOstr(0),
 	_state(ST_CR_LF)
 {
@@ -28,7 +28,7 @@ MailStreamBuf::MailStreamBuf(std::istream& istr):
 
 
 MailStreamBuf::MailStreamBuf(std::ostream& ostr):
-	_pIstr(0), 
+	_pIstr(0),
 	_pOstr(&ostr),
 	_state(ST_CR_LF)
 {
@@ -53,7 +53,7 @@ void MailStreamBuf::close()
 	}
 }
 
-		
+
 int MailStreamBuf::readFromDevice()
 {
 	int c = std::char_traits<char>::eof();
@@ -194,8 +194,8 @@ MailStreamBuf* MailIOS::rdbuf()
 }
 
 
-MailInputStream::MailInputStream(std::istream& istr): 
-	MailIOS(istr), 
+MailInputStream::MailInputStream(std::istream& istr):
+	MailIOS(istr),
 	std::istream(&_buf)
 {
 }
@@ -206,8 +206,8 @@ MailInputStream::~MailInputStream()
 }
 
 
-MailOutputStream::MailOutputStream(std::ostream& ostr): 
-	MailIOS(ostr), 
+MailOutputStream::MailOutputStream(std::ostream& ostr):
+	MailIOS(ostr),
 	std::ostream(&_buf)
 {
 }
diff --git a/Net/src/MediaType.cpp b/Net/src/MediaType.cpp
index 9c34d0c17..a2fdb18fe 100644
--- a/Net/src/MediaType.cpp
+++ b/Net/src/MediaType.cpp
@@ -89,7 +89,7 @@ MediaType& MediaType::operator = (const std::string& mediaType)
 }
 
 
-void MediaType::swap(MediaType& mediaType)
+void MediaType::swap(MediaType& mediaType) noexcept
 {
 	std::swap(_type, mediaType._type);
 	std::swap(_subType, mediaType._subType);
diff --git a/Net/src/MessageHeader.cpp b/Net/src/MessageHeader.cpp
index 8cfb2bcbb..bddb11c3a 100644
--- a/Net/src/MessageHeader.cpp
+++ b/Net/src/MessageHeader.cpp
@@ -28,14 +28,18 @@ namespace Net {
 
 
 MessageHeader::MessageHeader():
-	_fieldLimit(DFL_FIELD_LIMIT)
+	_fieldLimit(DFL_FIELD_LIMIT),
+	_nameLengthLimit(DFL_NAME_LENGTH_LIMIT),
+	_valueLengthLimit(DFL_VALUE_LENGTH_LIMIT)
 {
 }
 
 
 MessageHeader::MessageHeader(const MessageHeader& messageHeader):
 	NameValueCollection(messageHeader),
-	_fieldLimit(DFL_FIELD_LIMIT)
+	_fieldLimit(DFL_FIELD_LIMIT),
+	_nameLengthLimit(DFL_NAME_LENGTH_LIMIT),
+	_valueLengthLimit(DFL_VALUE_LENGTH_LIMIT)
 {
 }
 
@@ -80,12 +84,12 @@ void MessageHeader::read(std::istream& istr)
 			throw MessageException("Too many header fields");
 		name.clear();
 		value.clear();
-		while (ch != eof && ch != ':' && ch != '\n' && name.length() < MAX_NAME_LENGTH) { name += ch; ch = buf.sbumpc(); }
+		while (ch != eof && ch != ':' && ch != '\n' && name.length() < _nameLengthLimit) { name += ch; ch = buf.sbumpc(); }
 		if (ch == '\n') { ch = buf.sbumpc(); continue; } // ignore invalid header lines
 		if (ch != ':') throw MessageException("Field name too long/no colon found");
 		if (ch != eof) ch = buf.sbumpc(); // ':'
 		while (ch != eof && Poco::Ascii::isSpace(ch) && ch != '\r' && ch != '\n') ch = buf.sbumpc();
-		while (ch != eof && ch != '\r' && ch != '\n' && value.length() < MAX_VALUE_LENGTH) { value += ch; ch = buf.sbumpc(); }
+		while (ch != eof && ch != '\r' && ch != '\n' && value.length() < _valueLengthLimit) { value += ch; ch = buf.sbumpc(); }
 		if (ch == '\r') ch = buf.sbumpc();
 		if (ch == '\n')
 			ch = buf.sbumpc();
@@ -93,7 +97,7 @@ void MessageHeader::read(std::istream& istr)
 			throw MessageException("Field value too long/no CRLF found");
 		while (ch == ' ' || ch == '\t') // folding
 		{
-			while (ch != eof && ch != '\r' && ch != '\n' && value.length() < MAX_VALUE_LENGTH) { value += ch; ch = buf.sbumpc(); }
+			while (ch != eof && ch != '\r' && ch != '\n' && value.length() < _valueLengthLimit) { value += ch; ch = buf.sbumpc(); }
 			if (ch == '\r') ch = buf.sbumpc();
 			if (ch == '\n')
 				ch = buf.sbumpc();
@@ -104,7 +108,8 @@ void MessageHeader::read(std::istream& istr)
 		add(name, decodeWord(value));
 		++fields;
 	}
-	istr.putback(ch);
+	if (istr.good() && ch != eof)
+		istr.putback(ch);
 }
 
 
@@ -113,15 +118,41 @@ int MessageHeader::getFieldLimit() const
 	return _fieldLimit;
 }
 
-	
+
 void MessageHeader::setFieldLimit(int limit)
 {
 	poco_assert (limit >= 0);
-	
+
 	_fieldLimit = limit;
 }
 
 
+int MessageHeader::getNameLengthLimit() const
+{
+	return _nameLengthLimit;
+}
+
+void MessageHeader::setNameLengthLimit(int limit)
+{
+	poco_assert(limit >= 0);
+
+	_nameLengthLimit = limit;
+}
+
+
+int MessageHeader::getValueLengthLimit() const
+{
+	return _valueLengthLimit;
+}
+
+void MessageHeader::setValueLengthLimit(int limit)
+{
+	poco_assert(limit >= 0);
+
+	_valueLengthLimit = limit;
+}
+
+
 bool MessageHeader::hasToken(const std::string& fieldName, const std::string& token) const
 {
 	std::string field = get(fieldName, "");
@@ -257,7 +288,7 @@ void MessageHeader::quote(const std::string& value, std::string& result, bool al
 }
 
 
-void MessageHeader::decodeRFC2047(const std::string& ins, std::string& outs, const std::string& charset_to) 
+void MessageHeader::decodeRFC2047(const std::string& ins, std::string& outs, const std::string& charset_to)
 {
 	std::string tempout;
 	StringTokenizer tokens(ins, "?");
@@ -268,18 +299,18 @@ void MessageHeader::decodeRFC2047(const std::string& ins, std::string& outs, con
 
 	std::istringstream istr(text);
 
-	if (encoding == "B") 
+	if (encoding == "B")
 	{
 		// Base64 encoding.
 		Base64Decoder decoder(istr);
 		for (char c; decoder.get(c); tempout += c) {}
 	}
-	else if (encoding == "Q") 
+	else if (encoding == "Q")
 	{
-		// Quoted encoding.				
-		for (char c; istr.get(c);) 
+		// Quoted encoding.
+		for (char c; istr.get(c);)
 		{
-			if (c == '_') 
+			if (c == '_')
 			{
 				//RFC 2047  _ is a space.
 				tempout += " ";
@@ -287,11 +318,11 @@ void MessageHeader::decodeRFC2047(const std::string& ins, std::string& outs, con
 			}
 
 			// FIXME: check that we have enought chars-
-			if (c == '=') 
+			if (c == '=')
 			{
 				// The next two chars are hex representation of the complete byte.
 				std::string hex;
-				for (int i = 0; i < 2; i++) 
+				for (int i = 0; i < 2; i++)
 				{
 					istr.get(c);
 					hex += c;
@@ -303,7 +334,7 @@ void MessageHeader::decodeRFC2047(const std::string& ins, std::string& outs, con
 			tempout += c;
 		}
 	}
-	else 
+	else
 	{
 		// Wrong encoding
 		outs = ins;
@@ -311,22 +342,22 @@ void MessageHeader::decodeRFC2047(const std::string& ins, std::string& outs, con
 	}
 
 	// convert to the right charset.
-	if (charset != charset_to) 
+	if (charset != charset_to)
 	{
-		try 
+		try
 		{
 			TextEncoding& enc = TextEncoding::byName(charset);
 			TextEncoding& dec = TextEncoding::byName(charset_to);
 			TextConverter converter(enc, dec);
 			converter.convert(tempout, outs);
 		}
-		catch (...) 
+		catch (...)
 		{
 			// FIXME: Unsuported encoding...
 			outs = tempout;
 		}
 	}
-	else 
+	else
 	{
 		// Not conversion necesary.
 		outs = tempout;
@@ -339,7 +370,7 @@ std::string MessageHeader::decodeWord(const std::string& text, const std::string
 	std::string outs, tmp = text;
 	do {
 		std::string tmp2;
-		// find the begining of the next rfc2047 chunk 
+		// find the begining of the next rfc2047 chunk
 		size_t pos = tmp.find("=?");
 		if (pos == std::string::npos) {
 			// No more found, return
diff --git a/Net/src/MulticastSocket.cpp b/Net/src/MulticastSocket.cpp
index 8c6fa50b4..f624026f4 100644
--- a/Net/src/MulticastSocket.cpp
+++ b/Net/src/MulticastSocket.cpp
@@ -24,10 +24,10 @@
 
 #if defined(hpux) && defined(_XOPEN_SOURCE_EXTENDED) && defined(POCO_HPUX_IP_MREQ_HACK)
 // netinet/in.h does not define struct ip_mreq if
-// _XOPEN_SOURCE_EXTENDED is #define'd in HP-UX 11.x 
+// _XOPEN_SOURCE_EXTENDED is #define'd in HP-UX 11.x
 // versions prior to 11.30. Compile with -DPOCO_HPUX_IP_MREQ_HACK
 // if you experience problems.
-struct ip_mreq 
+struct ip_mreq
 {
 	struct in_addr imr_multiaddr;
 	struct in_addr imr_interface;
@@ -97,7 +97,7 @@ void MulticastSocket::setInterface(const NetworkInterface& interfc)
 	else throw UnsupportedFamilyException("Unknown or unsupported socket family.");
 }
 
-	
+
 NetworkInterface MulticastSocket::getInterface() const
 {
 	try
@@ -118,7 +118,7 @@ NetworkInterface MulticastSocket::getInterface() const
 	}
 }
 
-	
+
 void MulticastSocket::setLoopback(bool flag)
 {
 	if (address().af() == AF_INET)
@@ -135,7 +135,7 @@ void MulticastSocket::setLoopback(bool flag)
 	}
 }
 
-	
+
 bool MulticastSocket::getLoopback() const
 {
 	bool flag = false;
@@ -156,7 +156,7 @@ bool MulticastSocket::getLoopback() const
 	return flag;
 }
 
-	
+
 void MulticastSocket::setTimeToLive(unsigned value)
 {
 	if (address().af() == AF_INET)
@@ -172,7 +172,7 @@ void MulticastSocket::setTimeToLive(unsigned value)
 	}
 }
 
-	
+
 unsigned MulticastSocket::getTimeToLive() const
 {
 	unsigned ttl(0);
@@ -191,13 +191,13 @@ unsigned MulticastSocket::getTimeToLive() const
 	return ttl;
 }
 
-	
+
 void MulticastSocket::joinGroup(const IPAddress& groupAddress)
 {
 	joinGroup(groupAddress, findFirstInterface(groupAddress));
 }
 
-	
+
 void MulticastSocket::joinGroup(const IPAddress& groupAddress, const NetworkInterface& interfc)
 {
 	if (groupAddress.af() == AF_INET)
@@ -254,14 +254,14 @@ NetworkInterface MulticastSocket::findFirstInterface(const IPAddress& groupAddre
 	throw NotFoundException("No multicast-eligible network interface found.");
 }
 
-	
+
 void MulticastSocket::leaveGroup(const IPAddress& groupAddress)
 {
 	NetworkInterface intf;
 	leaveGroup(groupAddress, intf);
 }
 
-	
+
 void MulticastSocket::leaveGroup(const IPAddress& groupAddress, const NetworkInterface& interfc)
 {
 	if (groupAddress.af() == AF_INET)
diff --git a/Net/src/MultipartReader.cpp b/Net/src/MultipartReader.cpp
index 29408cd08..24f42c341 100644
--- a/Net/src/MultipartReader.cpp
+++ b/Net/src/MultipartReader.cpp
@@ -88,7 +88,7 @@ int MultipartStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 					{
 						buf.sbumpc(); // '\n'
 					}
-					return 0;					
+					return 0;
 				}
 				else if (ch == '-' && buf.sgetc() == '-')
 				{
@@ -105,6 +105,7 @@ int MultipartStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 		*buffer++ = (char) buf.sbumpc(); ++n;
 		ch = buf.sgetc();
 	}
+	if (ch == eof) _lastPart = true;
 	return n;
 }
 
@@ -218,11 +219,11 @@ bool MultipartReader::hasNextPart()
 	return (!_pMPI || !_pMPI->lastPart()) && _istr.good();
 }
 
-	
+
 std::istream& MultipartReader::stream() const
 {
 	poco_check_ptr (_pMPI);
-	
+
 	return *_pMPI;
 }
 
diff --git a/Net/src/NTPClient.cpp b/Net/src/NTPClient.cpp
index 4d5dbab59..0a41b75ad 100644
--- a/Net/src/NTPClient.cpp
+++ b/Net/src/NTPClient.cpp
@@ -26,7 +26,7 @@ namespace Poco {
 namespace Net {
 
 
-NTPClient::NTPClient(IPAddress::Family family, int timeout): 
+NTPClient::NTPClient(IPAddress::Family family, int timeout):
 	_family(family), _timeout(timeout)
 {
 }
diff --git a/Net/src/NTPEventArgs.cpp b/Net/src/NTPEventArgs.cpp
index 21c57b877..c59f6eb44 100644
--- a/Net/src/NTPEventArgs.cpp
+++ b/Net/src/NTPEventArgs.cpp
@@ -46,10 +46,10 @@ std::string NTPEventArgs::hostName() const
 	{
 		return DNS::resolve(_address.host().toString()).name();
 	}
-	catch (HostNotFoundException&) 
+	catch (HostNotFoundException&)
 	{
 	}
-	catch (NoAddressFoundException&) 
+	catch (NoAddressFoundException&)
 	{
 	}
 	catch (DNSException&)
diff --git a/Net/src/NTPPacket.cpp b/Net/src/NTPPacket.cpp
index 2f7aec830..3022c4af5 100644
--- a/Net/src/NTPPacket.cpp
+++ b/Net/src/NTPPacket.cpp
@@ -27,7 +27,7 @@ namespace Net {
 #else
 #pragma pack(1)
 #endif
-struct NTPPacketData 
+struct NTPPacketData
 {
 	Poco::Int8 mode:3;
 	Poco::Int8 vn:3;
@@ -149,9 +149,10 @@ Poco::Timestamp NTPPacket::transmitTime() const
 Poco::Timestamp NTPPacket::convertTime(Poco::Int64 tm) const
 {
 	const unsigned long seventyYears = 2208988800UL;
-	Poco::UInt32 secsSince1900 = UInt32(Poco::ByteOrder::toLittleEndian(tm) >> 32);
-	unsigned long epoch = secsSince1900 - seventyYears;
-	return Poco::Timestamp::fromEpochTime(epoch);
+	Poco::UInt64 ntpTime = Poco::ByteOrder::toLittleEndian(tm);
+	Poco::UInt64 secs = ((ntpTime >> 32) - seventyYears) * 1000000;
+	Poco::UInt64 frac = ((ntpTime & 0xFFFFFFFF) * 1000000) >> 32;
+	return Poco::Timestamp(secs+frac);
 }
 
 
diff --git a/Net/src/NameValueCollection.cpp b/Net/src/NameValueCollection.cpp
index d4cad798c..f30985880 100644
--- a/Net/src/NameValueCollection.cpp
+++ b/Net/src/NameValueCollection.cpp
@@ -63,12 +63,12 @@ NameValueCollection& NameValueCollection::operator = (NameValueCollection&& nvc)
 }
 
 
-void NameValueCollection::swap(NameValueCollection& nvc)
+void NameValueCollection::swap(NameValueCollection& nvc) noexcept
 {
 	std::swap(_map, nvc._map);
 }
 
-	
+
 const std::string& NameValueCollection::operator [] (const std::string& name) const
 {
 	ConstIterator it = _map.find(name);
@@ -78,8 +78,8 @@ const std::string& NameValueCollection::operator [] (const std::string& name) co
 		throw NotFoundException(name);
 }
 
-	
-void NameValueCollection::set(const std::string& name, const std::string& value)	
+
+void NameValueCollection::set(const std::string& name, const std::string& value)
 {
 	Iterator it = _map.find(name);
 	if (it != _map.end())
@@ -88,13 +88,13 @@ void NameValueCollection::set(const std::string& name, const std::string& value)
 		_map.insert(HeaderMap::ValueType(name, value));
 }
 
-	
+
 void NameValueCollection::add(const std::string& name, const std::string& value)
 {
 	_map.insert(HeaderMap::ValueType(name, value));
 }
 
-	
+
 const std::string& NameValueCollection::get(const std::string& name) const
 {
 	ConstIterator it = _map.find(name);
@@ -126,19 +126,19 @@ NameValueCollection::ConstIterator NameValueCollection::find(const std::string&
 	return _map.find(name);
 }
 
-	
+
 NameValueCollection::ConstIterator NameValueCollection::begin() const
 {
 	return _map.begin();
 }
 
-	
+
 NameValueCollection::ConstIterator NameValueCollection::end() const
 {
 	return _map.end();
 }
 
-	
+
 bool NameValueCollection::empty() const
 {
 	return _map.empty();
diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp
index 3edd6e43d..460250da9 100644
--- a/Net/src/NetworkInterface.cpp
+++ b/Net/src/NetworkInterface.cpp
@@ -637,7 +637,7 @@ NetworkInterface& NetworkInterface::operator = (const NetworkInterface& interfc)
 }
 
 
-void NetworkInterface::swap(NetworkInterface& other)
+void NetworkInterface::swap(NetworkInterface& other) noexcept
 {
 	using std::swap;
 	swap(_pImpl, other._pImpl);
diff --git a/Net/src/OAuth10Credentials.cpp b/Net/src/OAuth10Credentials.cpp
index a60310ed6..cc077a036 100644
--- a/Net/src/OAuth10Credentials.cpp
+++ b/Net/src/OAuth10Credentials.cpp
@@ -128,7 +128,7 @@ void OAuth10Credentials::authenticate(HTTPRequest& request, const Poco::URI& uri
 	authenticate(request, uri, emptyParams, method);
 }
 
-	
+
 void OAuth10Credentials::authenticate(HTTPRequest& request, const Poco::URI& uri, const Poco::Net::HTMLForm& params, SignatureMethod method)
 {
 	if (method == SIGN_PLAINTEXT)
@@ -165,27 +165,27 @@ bool OAuth10Credentials::verify(const HTTPRequest& request, const Poco::URI& uri
 
 			std::string version = oauthParams.get("oauth_version", "1.0");
 			if (version != "1.0") throw NotAuthenticatedException("Unsupported OAuth version", version);
-			
+
 			_consumerKey.clear();
 			std::string consumerKey = oauthParams.get("oauth_consumer_key", "");
 			URI::decode(consumerKey, _consumerKey);
-			
+
 			_token.clear();
 			std::string token = oauthParams.get("oauth_token", "");
 			URI::decode(token, _token);
-			
+
 			_callback.clear();
 			std::string callback = oauthParams.get("oauth_callback", "");
 			URI::decode(callback, _callback);
-			
+
 			std::string nonceEnc = oauthParams.get("oauth_nonce", "");
 			std::string nonce;
 			URI::decode(nonceEnc, nonce);
-			
+
 			std::string timestamp = oauthParams.get("oauth_timestamp", "");
-			
+
 			std::string method = oauthParams.get("oauth_signature_method", "");
-			
+
 			std::string signatureEnc = oauthParams.get("oauth_signature", "");
 			std::string signature;
 			URI::decode(signatureEnc, signature);
@@ -205,8 +205,8 @@ bool OAuth10Credentials::verify(const HTTPRequest& request, const Poco::URI& uri
 				refSignature = createSignature(request, uriWithoutQuery.toString(), params, nonce, timestamp);
 			}
 			else throw NotAuthenticatedException("Unsupported OAuth signature method", method);
-			
-			return refSignature == signature;			
+
+			return refSignature == signature;
 		}
 		else throw NotAuthenticatedException("No OAuth credentials found in Authorization header");
 	}
@@ -226,7 +226,7 @@ void OAuth10Credentials::signPlaintext(Poco::Net::HTTPRequest& request) const
 	std::string signature(percentEncode(_consumerSecret));
 	signature += '&';
 	signature += percentEncode(_tokenSecret);
-	
+
 	std::string authorization(SCHEME);
 	if (!_realm.empty())
 	{
@@ -322,7 +322,7 @@ std::string OAuth10Credentials::createSignature(const Poco::Net::HTTPRequest& re
 	{
 		paramsMap[percentEncode(p.first)] = percentEncode(p.second);
 	}
-	
+
 	std::string paramsString;
 	for (auto it = paramsMap.begin(); it != paramsMap.end(); ++it)
 	{
@@ -331,18 +331,18 @@ std::string OAuth10Credentials::createSignature(const Poco::Net::HTTPRequest& re
 		paramsString += "=";
 		paramsString += it->second;
 	}
-	
+
 	std::string signatureBase = request.getMethod();
 	signatureBase += '&';
 	signatureBase += percentEncode(uri);
 	signatureBase += '&';
 	signatureBase += percentEncode(paramsString);
-	
+
 	std::string signingKey;
 	signingKey += percentEncode(_consumerSecret);
 	signingKey += '&';
 	signingKey += percentEncode(_tokenSecret);
-	
+
 	Poco::HMACEngine<Poco::SHA1Engine> hmacEngine(signingKey);
 	hmacEngine.update(signatureBase);
 	Poco::DigestEngine::Digest digest = hmacEngine.digest();
diff --git a/Net/src/OAuth20Credentials.cpp b/Net/src/OAuth20Credentials.cpp
index 392115ad5..63e824b77 100644
--- a/Net/src/OAuth20Credentials.cpp
+++ b/Net/src/OAuth20Credentials.cpp
@@ -75,7 +75,7 @@ void OAuth20Credentials::setScheme(const std::string& scheme)
 	_scheme = scheme;
 }
 
-	
+
 void OAuth20Credentials::authenticate(HTTPRequest& request)
 {
 	std::string auth(_scheme);
diff --git a/Net/src/POP3ClientSession.cpp b/Net/src/POP3ClientSession.cpp
index 159f2108c..83ef3e787 100644
--- a/Net/src/POP3ClientSession.cpp
+++ b/Net/src/POP3ClientSession.cpp
@@ -39,17 +39,17 @@ public:
 		_socket(socket)
 	{
 	}
-	
+
 	~DialogStreamBuf()
 	{
 	}
-		
+
 private:
 	int readFromDevice()
 	{
 		return _socket.get();
 	}
-	
+
 	DialogSocket& _socket;
 };
 
@@ -62,11 +62,11 @@ public:
 	{
 		poco_ios_init(&_buf);
 	}
-	
+
 	~DialogIOS()
 	{
 	}
-	
+
 	DialogStreamBuf* rdbuf()
 	{
 		return &_buf;
@@ -85,7 +85,7 @@ public:
 		std::istream(&_buf)
 	{
 	}
-		
+
 	~DialogInputStream()
 	{
 	}
@@ -99,7 +99,7 @@ POP3ClientSession::POP3ClientSession(const StreamSocket& socket):
 }
 
 
-POP3ClientSession::POP3ClientSession(const std::string& host, Poco::UInt16 port):	
+POP3ClientSession::POP3ClientSession(const std::string& host, Poco::UInt16 port):
 	_socket(SocketAddress(host, port)),
 	_isOpen(true)
 {
@@ -123,7 +123,7 @@ void POP3ClientSession::setTimeout(const Poco::Timespan& timeout)
 	_socket.setReceiveTimeout(timeout);
 }
 
-	
+
 Poco::Timespan POP3ClientSession::getTimeout() const
 {
 	return _socket.getReceiveTimeout();
diff --git a/Net/src/PartSource.cpp b/Net/src/PartSource.cpp
index 22f6c6682..839668d70 100644
--- a/Net/src/PartSource.cpp
+++ b/Net/src/PartSource.cpp
@@ -27,7 +27,7 @@ PartSource::PartSource():
 {
 }
 
-	
+
 PartSource::PartSource(const std::string& mediaType):
 	_mediaType(mediaType)
 {
diff --git a/Net/src/PollSet.cpp b/Net/src/PollSet.cpp
index 40c98d182..c60fa867e 100644
--- a/Net/src/PollSet.cpp
+++ b/Net/src/PollSet.cpp
@@ -19,11 +19,18 @@
 
 
 #if defined(POCO_HAVE_FD_EPOLL)
-	#include <sys/epoll.h>
-	#include <sys/eventfd.h>
+	#ifdef POCO_OS_FAMILY_WINDOWS
+		#include "Poco/Net/ServerSocket.h"
+		#include "Poco/Net/SocketAddress.h"
+		#include "wepoll.h"
+	#else
+		#include <sys/epoll.h>
+		#include <sys/eventfd.h>
+	#endif
 #elif defined(POCO_HAVE_FD_POLL)
 	#ifndef _WIN32
 		#include <poll.h>
+		#include "Poco/Pipe.h"
 	#endif
 #endif
 
@@ -34,18 +41,38 @@ namespace Net {
 
 #if defined(POCO_HAVE_FD_EPOLL)
 
+//
+// Implementation using epoll (Linux) or wepoll (Windows)
+//
+
+
+#ifdef WEPOLL_H_
+
+namespace {
+
+int close(HANDLE h)
+{
+	return epoll_close(h);
+}
+
+}
+
+#endif // WEPOLL_H_
+
 
-//
-// Linux implementation using epoll
-//
 class PollSetImpl
 {
 public:
-	PollSetImpl(): _epollfd(epoll_create(1)),
-		_events(1024),
-		_eventfd(eventfd(0, 0))
+	using Mutex = Poco::SpinlockMutex;
+	using ScopedLock = Mutex::ScopedLock;
+	using SocketMode = std::pair<Socket, int>;
+	using SocketMap = std::map<void*, SocketMode>;
+
+	PollSetImpl(): _events(1024),
+		_eventfd(eventfd(_port, 0)),
+		_epollfd(epoll_create(1))
 	{
-		int err = addImpl(_eventfd, PollSet::POLL_READ, 0);
+		int err = addFD(_eventfd, PollSet::POLL_READ, EPOLL_CTL_ADD);
 		if ((err) || (_epollfd < 0))
 		{
 			SocketImpl::error();
@@ -54,86 +81,76 @@ public:
 
 	~PollSetImpl()
 	{
-		if (_epollfd >= 0) ::close(_epollfd);
-		if (_eventfd >= 0) ::close(_eventfd);
+#ifdef WEPOLL_H_
+		if (_eventfd >= 0) eventfd(_port, _eventfd);
+#else
+		if (_eventfd > 0) close(_eventfd.exchange(0));
+#endif
+		if (_epollfd >= 0) close(_epollfd);
 	}
 
 	void add(const Socket& socket, int mode)
 	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
-
-		SocketImpl* sockImpl = socket.impl();
-
-		int err = addImpl(sockImpl->sockfd(), mode, sockImpl);
-
+		int newMode = getNewMode(socket.impl(), mode);
+		int err = addImpl(socket, newMode);
 		if (err)
 		{
-			if (errno == EEXIST) update(socket, mode);
+			if (errno == EEXIST) update(socket, newMode);
 			else SocketImpl::error();
 		}
+	}
 
-		if (_socketMap.find(sockImpl) == _socketMap.end())
-			_socketMap[sockImpl] = socket;
+	void update(const Socket& socket, int mode)
+	{
+		int err = updateImpl(socket, mode);
+		if (err) SocketImpl::error();
 	}
 
 	void remove(const Socket& socket)
 	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
-
 		poco_socket_t fd = socket.impl()->sockfd();
 		struct epoll_event ev;
 		ev.events = 0;
 		ev.data.ptr = 0;
+
 		int err = epoll_ctl(_epollfd, EPOLL_CTL_DEL, fd, &ev);
 		if (err) SocketImpl::error();
-
+		ScopedLock lock(_mutex);
 		_socketMap.erase(socket.impl());
 	}
 
 	bool has(const Socket& socket) const
 	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
 		SocketImpl* sockImpl = socket.impl();
+		ScopedLock lock(_mutex);
 		return sockImpl &&
 			(_socketMap.find(sockImpl) != _socketMap.end());
 	}
 
 	bool empty() const
 	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
+		ScopedLock lock(_mutex);
 		return _socketMap.empty();
 	}
 
-	void update(const Socket& socket, int mode)
-	{
-		poco_socket_t fd = socket.impl()->sockfd();
-		struct epoll_event ev;
-		ev.events = 0;
-		if (mode & PollSet::POLL_READ)
-			ev.events |= EPOLLIN;
-		if (mode & PollSet::POLL_WRITE)
-			ev.events |= EPOLLOUT;
-		if (mode & PollSet::POLL_ERROR)
-			ev.events |= EPOLLERR;
-		ev.data.ptr = socket.impl();
-		int err = epoll_ctl(_epollfd, EPOLL_CTL_MOD, fd, &ev);
-		if (err)
-		{
-			SocketImpl::error();
-		}
-	}
-
 	void clear()
 	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
-
-		::close(_epollfd);
-		_socketMap.clear();
-		_epollfd = epoll_create(1);
-		if (_epollfd < 0)
 		{
-			SocketImpl::error();
+			ScopedLock lock(_mutex);
+
+			close(_epollfd);
+			_socketMap.clear();
+			_epollfd = epoll_create(1);
+			if (_epollfd < 0) SocketImpl::error();
 		}
+#ifdef WEPOLL_H_
+		eventfd(_port, _eventfd);
+		_eventfd = eventfd(_port);
+#else
+		close(_eventfd.exchange(0));
+		_eventfd = eventfd(0, 0);
+#endif
+		addFD(_eventfd, PollSet::POLL_READ, EPOLL_CTL_ADD);
 	}
 
 	PollSet::SocketModeMap poll(const Poco::Timespan& timeout)
@@ -141,11 +158,18 @@ public:
 		PollSet::SocketModeMap result;
 		Poco::Timespan remainingTime(timeout);
 		int rc;
+		ScopedLock lock(_mutex);
 		do
 		{
 			Poco::Timestamp start;
-			rc = epoll_wait(_epollfd, &_events[0], _events.size(), remainingTime.totalMilliseconds());
+			rc = epoll_wait(_epollfd, &_events[0],
+				static_cast<int>(_events.size()), static_cast<int>(remainingTime.totalMilliseconds()));
 			if (rc == 0) return result;
+
+			// if we are hitting the events limit, resize it; even without resizing, the subseqent
+			// calls would round-robin through the remaining ready sockets, but it's better to give
+			// the call enough room once we start hitting the boundary
+			if (rc >= _events.size()) _events.resize(_events.size()*2);
 			if (rc < 0 && SocketImpl::lastError() == POCO_EINTR)
 			{
 				Poco::Timestamp end;
@@ -159,21 +183,19 @@ public:
 		while (rc < 0 && SocketImpl::lastError() == POCO_EINTR);
 		if (rc < 0) SocketImpl::error();
 
-		Poco::FastMutex::ScopedLock lock(_mutex);
-
 		for (int i = 0; i < rc; i++)
 		{
 			if (_events[i].data.ptr) // skip eventfd
 			{
-				std::map<void *, Socket>::iterator it = _socketMap.find(_events[i].data.ptr);
+				SocketMap::iterator it = _socketMap.find(_events[i].data.ptr);
 				if (it != _socketMap.end())
 				{
 					if (_events[i].events & EPOLLIN)
-						result[it->second] |= PollSet::POLL_READ;
+						result[it->second.first] |= PollSet::POLL_READ;
 					if (_events[i].events & EPOLLOUT)
-						result[it->second] |= PollSet::POLL_WRITE;
+						result[it->second.first] |= PollSet::POLL_WRITE;
 					if (_events[i].events & EPOLLERR)
-						result[it->second] |= PollSet::POLL_ERROR;
+						result[it->second.first] |= PollSet::POLL_ERROR;
 				}
 			}
 		}
@@ -183,21 +205,60 @@ public:
 
 	void wakeUp()
 	{
+#ifdef WEPOLL_H_
+		StreamSocket ss(SocketAddress("127.0.0.1", _port));
+#else
 		uint64_t val = 1;
-		int n = ::write(_eventfd, &val, sizeof(val));
-		if (n < 0) Socket::error();
+		// This is guaranteed to write into a valid fd,
+		// or 0 (meaning PollSet is being destroyed).
+		// Errors are ignored.
+		write(_eventfd, &val, sizeof(val));
+#endif
 	}
 
 	int count() const
 	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
+		ScopedLock lock(_mutex);
 		return static_cast<int>(_socketMap.size());
 	}
 
 private:
-	int addImpl(int fd, int mode, void* ptr)
+	int getNewMode(SocketImpl* sockImpl, int mode)
 	{
-		struct epoll_event ev;
+		ScopedLock lock(_mutex);
+		auto it = _socketMap.find(sockImpl);
+		if (it != _socketMap.end())
+			mode |= it->second.second;
+		return mode;
+	}
+
+	void socketMapUpdate(const Socket& socket, int mode)
+	{
+		SocketImpl* sockImpl = socket.impl();
+		ScopedLock lock(_mutex);
+		_socketMap[sockImpl] = {socket, mode};
+	}
+
+	int updateImpl(const Socket& socket, int mode)
+	{
+		SocketImpl* sockImpl = socket.impl();
+		int ret = addFD(static_cast<int>(sockImpl->sockfd()), mode, EPOLL_CTL_MOD, sockImpl);
+		if (ret == 0) socketMapUpdate(socket, mode);
+		return ret;
+	}
+
+	int addImpl(const Socket& socket, int mode)
+	{
+		SocketImpl* sockImpl = socket.impl();
+		int newMode = getNewMode(sockImpl, mode);
+		int ret = addFD(static_cast<int>(sockImpl->sockfd()), newMode, EPOLL_CTL_ADD, sockImpl);
+		if (ret == 0) socketMapUpdate(socket, newMode);
+		return ret;
+	}
+
+	int addFD(int fd, int mode, int op, void* ptr = 0)
+	{
+		struct epoll_event ev{};
 		ev.events = 0;
 		if (mode & PollSet::POLL_READ)
 			ev.events |= EPOLLIN;
@@ -206,14 +267,41 @@ private:
 		if (mode & PollSet::POLL_ERROR)
 			ev.events |= EPOLLERR;
 		ev.data.ptr = ptr;
-		return epoll_ctl(_epollfd, EPOLL_CTL_ADD, fd, &ev);
+		return epoll_ctl(_epollfd, op, fd, &ev);
 	}
 
-	mutable Poco::FastMutex         _mutex;
-	int                             _epollfd;
-	std::map<void*, Socket>         _socketMap;
+#ifdef WEPOLL_H_
+
+	int eventfd(int& port, int rmFD = 0)
+	{
+		if (rmFD == 0)
+		{
+			_pSocket = new ServerSocket(SocketAddress("127.0.0.1", 0));
+			port = _pSocket->address().port();
+			return static_cast<int>(_pSocket->impl()->sockfd());
+		}
+		else
+		{
+			delete _pSocket;
+			_pSocket = 0;
+			port = 0;
+		}
+		return 0;
+	}
+
+#endif // WEPOLL_H_
+
+	mutable Mutex _mutex;
+	SocketMap _socketMap;
 	std::vector<struct epoll_event> _events;
-	int                             _eventfd;
+	int _port = 0;
+	std::atomic<int> _eventfd;
+#ifdef WEPOLL_H_
+	std::atomic <HANDLE> _epollfd;
+	ServerSocket* _pSocket;
+#else
+	std::atomic<int> _epollfd;
+#endif
 };
 
 
@@ -226,11 +314,22 @@ private:
 class PollSetImpl
 {
 public:
+	PollSetImpl()
+	{
+		pollfd fd{_pipe.readHandle(), POLLIN, 0};
+		_pollfds.push_back(fd);
+	}
+
+	~PollSetImpl()
+	{
+		_pipe.close();
+	}
+
 	void add(const Socket& socket, int mode)
 	{
 		Poco::FastMutex::ScopedLock lock(_mutex);
 		poco_socket_t fd = socket.impl()->sockfd();
-		_addMap[fd] = mode;
+		_addMap[fd] |= mode;
 		_removeSet.erase(fd);
 		_socketMap[fd] = socket;
 	}
@@ -280,7 +379,7 @@ public:
 		_socketMap.clear();
 		_addMap.clear();
 		_removeSet.clear();
-		_pollfds.clear();
+		_pollfds.reserve(1);
 	}
 
 	PollSet::SocketModeMap poll(const Poco::Timespan& timeout)
@@ -322,11 +421,7 @@ public:
 		do
 		{
 			Poco::Timestamp start;
-#ifdef _WIN32
-			rc = WSAPoll(&_pollfds[0], static_cast<ULONG>(_pollfds.size()), static_cast<INT>(remainingTime.totalMilliseconds()));
-#else
 			rc = ::poll(&_pollfds[0], _pollfds.size(), remainingTime.totalMilliseconds());
-#endif
 			if (rc < 0 && SocketImpl::lastError() == POCO_EINTR)
 			{
 				Poco::Timestamp end;
@@ -341,20 +436,22 @@ public:
 		if (rc < 0) SocketImpl::error();
 
 		{
+			if (_pollfds[0].revents & POLLIN)
+			{
+				char c;
+				_pipe.readBytes(&c, 1);
+			}
+
 			Poco::FastMutex::ScopedLock lock(_mutex);
 
 			if (!_socketMap.empty())
 			{
-				for (auto it = _pollfds.begin(); it != _pollfds.end(); ++it)
+				for (auto it = _pollfds.begin() + 1; it != _pollfds.end(); ++it)
 				{
 					std::map<poco_socket_t, Socket>::const_iterator its = _socketMap.find(it->fd);
 					if (its != _socketMap.end())
 					{
-						if ((it->revents & POLLIN)
-#ifdef _WIN32
-							|| (it->revents & POLLHUP)
-#endif
-							)
+						if (it->revents & POLLIN)
 							result[its->second] |= PollSet::POLL_READ;
 						if (it->revents & POLLOUT)
 							result[its->second] |= PollSet::POLL_WRITE;
@@ -371,7 +468,8 @@ public:
 
 	void wakeUp()
 	{
-		// TODO
+		char c = 1;
+		_pipe.writeBytes(&c, 1);
 	}
 
 	int count() const
@@ -396,300 +494,7 @@ private:
 	std::map<poco_socket_t, int>    _addMap;
 	std::set<poco_socket_t>         _removeSet;
 	std::vector<pollfd>             _pollfds;
-};
-
-
-#else
-
-
-#ifdef POCO_OS_FAMILY_WINDOWS
-
-
-//
-// Windows-specific implementation using select()
-// The size of select set is determined at compile
-// time (see FD_SETSIZE in SocketDefs.h).
-//
-// This implementation works around that limit by
-// having multiple socket descriptor sets and,
-// when needed, calling select() multiple times.
-// To avoid multiple sets situtation, the FD_SETSIZE
-// can be increased, however then Poco::Net library
-// must be recompiled in order for the new setting
-// to be in effect.
-//
-
-
-class PollSetImpl
-{
-public:
-	PollSetImpl() : _fdRead(1, {0, {0}}),
-		_fdWrite(1, {0, {0}}),
-		_fdExcept(1, {0, {0}}),
-		_pFDRead(std::make_unique<fd_set>()),
-		_pFDWrite(std::make_unique<fd_set>()),
-		_pFDExcept(std::make_unique<fd_set>()),
-		_nfd(0)
-	{
-	}
-
-	void add(const Socket& socket, int mode)
-	{
-		Poco::Net::SocketImpl* pImpl = socket.impl();
-		poco_check_ptr(pImpl);
-		Poco::FastMutex::ScopedLock lock(_mutex);
-		_map[socket] = mode;
-		setMode(pImpl->sockfd(), mode);
-	}
-
-	void remove(const Socket& socket)
-	{
-		Poco::Net::SocketImpl* pImpl = socket.impl();
-		poco_check_ptr(pImpl);
-		Poco::FastMutex::ScopedLock lock(_mutex);
-		remove(pImpl->sockfd());
-		_map.erase(socket);
-	}
-
-	bool has(const Socket& socket) const
-	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
-		return _map.find(socket) != _map.end();
-	}
-
-	bool empty() const
-	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
-		return _map.empty();
-	}
-
-	void update(const Socket& socket, int mode)
-	{
-		Poco::Net::SocketImpl* pImpl = socket.impl();
-		poco_check_ptr(pImpl);
-		SOCKET fd = pImpl->sockfd();
-		Poco::FastMutex::ScopedLock lock(_mutex);
-		_map[socket] = mode;
-		setMode(fd, mode);
-		if (!(mode & PollSet::POLL_READ)) remove(fd, _fdRead);
-		if (!(mode & PollSet::POLL_WRITE)) remove(fd, _fdWrite);
-		if (!(mode & PollSet::POLL_ERROR)) remove(fd, _fdExcept);
-	}
-
-	void clear()
-	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
-		_map.clear();
-		for (auto& fd : _fdRead) std::memset(&fd, 0, sizeof(fd));
-		for (auto& fd : _fdWrite) std::memset(&fd, 0, sizeof(fd));
-		for (auto& fd : _fdExcept) std::memset(&fd, 0, sizeof(fd));
-		_nfd = 0;
-	}
-
-	PollSet::SocketModeMap poll(const Poco::Timespan& timeout)
-	{
-		Poco::Timestamp start;
-		poco_assert_dbg(_fdRead.size() == _fdWrite.size());
-		poco_assert_dbg(_fdWrite.size() == _fdExcept.size());
-
-		PollSet::SocketModeMap result;
-		if (_nfd == 0) return result;
-
-		Poco::Timespan remainingTime(timeout);
-		struct timeval tv {0, 1000};
-
-		Poco::FastMutex::ScopedLock lock(_mutex);
-
-		auto readIt = _fdRead.begin();
-		auto writeIt = _fdWrite.begin();
-		auto exceptIt = _fdExcept.begin();
-		do
-		{
-			std::memcpy(_pFDRead.get(), &*readIt, sizeof(fd_set));
-			std::memcpy(_pFDWrite.get(), &*writeIt, sizeof(fd_set));
-			std::memcpy(_pFDExcept.get(), &*exceptIt, sizeof(fd_set));
-
-			int rc;
-			do
-			{
-				rc = ::select((int)_nfd + 1, _pFDRead.get(), _pFDWrite.get(), _pFDExcept.get(), &tv);
-			} while (rc < 0 && SocketImpl::lastError() == POCO_EINTR);
-			if (rc < 0) SocketImpl::error();
-			else if (rc > 0)
-			{
-				for (auto it = _map.begin(); it != _map.end(); ++it)
-				{
-					poco_socket_t fd = it->first.impl()->sockfd();
-					if (fd != POCO_INVALID_SOCKET)
-					{
-						if (FD_ISSET(fd, _pFDRead.get()))
-						{
-							result[it->first] |= PollSet::POLL_READ;
-						}
-						if (FD_ISSET(fd, _pFDWrite.get()))
-						{
-							result[it->first] |= PollSet::POLL_WRITE;
-						}
-						if (FD_ISSET(fd, _pFDExcept.get()))
-						{
-							result[it->first] |= PollSet::POLL_ERROR;
-						}
-					}
-				}
-			}
-
-			Timespan elapsed = Timestamp() - start;
-			if (++readIt == _fdRead.end())
-			{
-				if ((rc > 0) || (elapsed.totalMilliseconds() > timeout.totalMilliseconds()))
-					break;
-				readIt = _fdRead.begin();
-				writeIt = _fdWrite.begin();
-				exceptIt = _fdExcept.begin();
-			}
-			else
-			{
-				++writeIt;
-				++exceptIt;
-			}
-
-			Poco::UInt64 tOut = (((Poco::UInt64)tv.tv_sec * 1000000) + tv.tv_usec) * 2;
-			Poco::Timespan left = timeout - elapsed;
-			if (tOut > left.totalMicroseconds())
-				tOut = left.totalMicroseconds();
-
-			tv.tv_sec = static_cast<long>(tOut / 1000000);
-			tv.tv_usec = tOut % 1000000;
-		} while (true);
-
-		return result;
-	}
-
-	int count() const
-	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
-		return static_cast<int>(_map.size());
-	}
-
-	void wakeUp()
-	{
-		// TODO
-	}
-
-private:
-
-	void setMode(std::vector<fd_set>& fdSet, SOCKET fd)
-	{
-		SOCKET* pFD = 0;
-		for (auto& fdr : fdSet)
-		{
-			SOCKET* begin = fdr.fd_array;
-			SOCKET* end = fdr.fd_array + fdr.fd_count;
-			pFD = std::find(begin, end, fd);
-			if (end != pFD)
-			{
-				FD_SET(fd, &fdr);
-				if (fd > _nfd) _nfd = fd;
-				return;
-			}
-		}
-		// not found, insert at first free location
-		for (auto& fdr : fdSet)
-		{
-			if (fdr.fd_count < FD_SETSIZE)
-			{
-				fdr.fd_count++;
-				fdr.fd_array[fdr.fd_count-1] = fd;
-				if (fd > _nfd) _nfd = fd;
-				return;
-			}
-		}
-		// all fd sets are full; insert another one
-		fdSet.push_back({0, {0}});
-		fd_set& fds = fdSet.back();
-		fds.fd_count = 1;
-		fds.fd_array[0] = fd;
-		if (fd > _nfd) _nfd = fd;
-	}
-
-	void setMode(SOCKET fd, int mode)
-	{
-		if (mode & PollSet::POLL_READ) setMode(_fdRead, fd);
-		if (mode & PollSet::POLL_WRITE) setMode(_fdWrite, fd);
-		if (mode & PollSet::POLL_ERROR) setMode(_fdExcept, fd);
-	}
-
-	void remove(SOCKET fd, std::vector<fd_set>& fdSets)
-	{
-		bool newNFD = false;
-		for (auto& fdSet : fdSets)
-		{
-			if (fdSet.fd_count)
-			{
-				newNFD = (fd == _nfd);
-				int i = 0;
-				for (; i < fdSet.fd_count; ++i)
-				{
-					if (fdSet.fd_array[i] == fd)
-					{
-						if (i == (fdSet.fd_count-1))
-						{
-							fdSet.fd_array[i] = 0;
-						}
-						else
-						{
-							for (; i < fdSet.fd_count-1; ++i)
-							{
-								fdSet.fd_array[i] = fdSet.fd_array[i+1];
-								if (newNFD && fdSet.fd_array[i] > _nfd)
-									_nfd = fdSet.fd_array[i];
-							}
-						}
-						fdSet.fd_array[fdSet.fd_count-1] = 0;
-						fdSet.fd_count--;
-						break;
-					}
-					if (newNFD && fdSet.fd_array[i] > _nfd)
-						_nfd = fdSet.fd_array[i];
-				}
-			}
-		}
-		if (newNFD)
-		{
-			findNFD(_fdRead);
-			findNFD(_fdWrite);
-			findNFD(_fdExcept);
-		}
-	}
-
-	void findNFD(std::vector<fd_set>& fdSets)
-	{
-		for (auto& fdSet : fdSets)
-		{
-			for (int i = 0; i < fdSet.fd_count; ++i)
-			{
-				if (fdSet.fd_array[i] > _nfd)
-					_nfd = fdSet.fd_array[i];
-			}
-		}
-	}
-
-	void remove(SOCKET fd)
-	{
-		remove(fd, _fdRead);
-		remove(fd, _fdWrite);
-		remove(fd, _fdExcept);
-	}
-
-	mutable Poco::FastMutex _mutex;
-	PollSet::SocketModeMap  _map;
-	SOCKET                  _nfd;
-	std::vector<fd_set>     _fdRead;
-	std::vector<fd_set>     _fdWrite;
-	std::vector<fd_set>     _fdExcept;
-	std::unique_ptr<fd_set> _pFDRead;
-	std::unique_ptr<fd_set> _pFDWrite;
-	std::unique_ptr<fd_set> _pFDExcept;
+	Poco::Pipe                      _pipe;
 };
 
 
@@ -844,9 +649,6 @@ private:
 };
 
 
-#endif // POCO_OS_FAMILY_WINDOWS
-
-
 #endif
 
 
diff --git a/Net/src/QuotedPrintableDecoder.cpp b/Net/src/QuotedPrintableDecoder.cpp
index 4f8b3c672..aff6e7ef1 100644
--- a/Net/src/QuotedPrintableDecoder.cpp
+++ b/Net/src/QuotedPrintableDecoder.cpp
@@ -27,7 +27,7 @@ namespace Poco {
 namespace Net {
 
 
-QuotedPrintableDecoderBuf::QuotedPrintableDecoderBuf(std::istream& istr): 
+QuotedPrintableDecoderBuf::QuotedPrintableDecoderBuf(std::istream& istr):
 	_buf(*istr.rdbuf())
 {
 }
@@ -87,8 +87,8 @@ QuotedPrintableDecoderBuf* QuotedPrintableDecoderIOS::rdbuf()
 }
 
 
-QuotedPrintableDecoder::QuotedPrintableDecoder(std::istream& istr): 
-	QuotedPrintableDecoderIOS(istr), 
+QuotedPrintableDecoder::QuotedPrintableDecoder(std::istream& istr):
+	QuotedPrintableDecoderIOS(istr),
 	std::istream(&_buf)
 {
 }
diff --git a/Net/src/QuotedPrintableEncoder.cpp b/Net/src/QuotedPrintableEncoder.cpp
index a71eb154f..eefef85bf 100644
--- a/Net/src/QuotedPrintableEncoder.cpp
+++ b/Net/src/QuotedPrintableEncoder.cpp
@@ -24,7 +24,7 @@ namespace Poco {
 namespace Net {
 
 
-QuotedPrintableEncoderBuf::QuotedPrintableEncoderBuf(std::ostream& ostr): 
+QuotedPrintableEncoderBuf::QuotedPrintableEncoderBuf(std::ostream& ostr):
 	_pending(-1),
 	_lineLength(0),
 	_ostr(ostr)
@@ -135,8 +135,8 @@ QuotedPrintableEncoderBuf* QuotedPrintableEncoderIOS::rdbuf()
 }
 
 
-QuotedPrintableEncoder::QuotedPrintableEncoder(std::ostream& ostr): 
-	QuotedPrintableEncoderIOS(ostr), 
+QuotedPrintableEncoder::QuotedPrintableEncoder(std::ostream& ostr):
+	QuotedPrintableEncoderIOS(ostr),
 	std::ostream(&_buf)
 {
 }
diff --git a/Net/src/RawSocket.cpp b/Net/src/RawSocket.cpp
index 7966a3fd2..eb8689b27 100644
--- a/Net/src/RawSocket.cpp
+++ b/Net/src/RawSocket.cpp
@@ -24,19 +24,19 @@ namespace Poco {
 namespace Net {
 
 
-RawSocket::RawSocket(): 
+RawSocket::RawSocket():
 	Socket(new RawSocketImpl)
 {
 }
 
 
-RawSocket::RawSocket(SocketAddress::Family family, int proto): 
+RawSocket::RawSocket(SocketAddress::Family family, int proto):
 	Socket(new RawSocketImpl(family, proto))
 {
 }
 
 
-RawSocket::RawSocket(const SocketAddress& address, bool reuseAddress): 
+RawSocket::RawSocket(const SocketAddress& address, bool reuseAddress):
 	Socket(new RawSocketImpl(address.family()))
 {
 	bind(address, reuseAddress);
@@ -54,11 +54,13 @@ RawSocket::RawSocket(const RawSocket& socket): Socket(socket)
 {
 }
 
+#ifdef POCO_NEW_STATE_ON_MOVE
 
 RawSocket::RawSocket(RawSocket&& socket): Socket(std::move(socket))
 {
 }
 
+#endif // POCO_NEW_STATE_ON_MOVE
 
 RawSocket::RawSocket(SocketImpl* pImpl): Socket(pImpl)
 {
@@ -82,6 +84,8 @@ RawSocket& RawSocket::operator = (const Socket& socket)
 }
 
 
+#ifdef POCO_NEW_STATE_ON_MOVE
+
 RawSocket& RawSocket::operator = (Socket&& socket)
 {
 	if (dynamic_cast<RawSocketImpl*>(socket.impl()))
@@ -91,6 +95,7 @@ RawSocket& RawSocket::operator = (Socket&& socket)
 	return *this;
 }
 
+#endif // POCO_NEW_STATE_ON_MOVE
 
 RawSocket& RawSocket::operator = (const RawSocket& socket)
 {
@@ -99,12 +104,15 @@ RawSocket& RawSocket::operator = (const RawSocket& socket)
 }
 
 
+#ifdef POCO_NEW_STATE_ON_MOVE
+
 RawSocket& RawSocket::operator = (RawSocket&& socket)
 {
 	Socket::operator = (std::move(socket));
 	return *this;
 }
 
+#endif // POCO_NEW_STATE_ON_MOVE
 
 void RawSocket::connect(const SocketAddress& address)
 {
diff --git a/Net/src/RawSocketImpl.cpp b/Net/src/RawSocketImpl.cpp
index c7fb248ef..bc9e4b685 100644
--- a/Net/src/RawSocketImpl.cpp
+++ b/Net/src/RawSocketImpl.cpp
@@ -41,8 +41,8 @@ RawSocketImpl::RawSocketImpl(SocketAddress::Family family, int proto)
 
 }
 
-	
-RawSocketImpl::RawSocketImpl(poco_socket_t sockfd): 
+
+RawSocketImpl::RawSocketImpl(poco_socket_t sockfd):
 	SocketImpl(sockfd)
 {
 }
diff --git a/Net/src/RemoteSyslogChannel.cpp b/Net/src/RemoteSyslogChannel.cpp
index 3efc30d1c..e1a5b1d26 100644
--- a/Net/src/RemoteSyslogChannel.cpp
+++ b/Net/src/RemoteSyslogChannel.cpp
@@ -49,7 +49,7 @@ RemoteSyslogChannel::RemoteSyslogChannel():
 {
 }
 
-		
+
 RemoteSyslogChannel::RemoteSyslogChannel(const std::string& address, const std::string& name, int facility, bool bsdFormat):
 	_logHost(address),
 	_name(name),
@@ -107,7 +107,7 @@ void RemoteSyslogChannel::open()
 	_open = true;
 }
 
-	
+
 void RemoteSyslogChannel::close()
 {
 	if (_open)
@@ -117,7 +117,7 @@ void RemoteSyslogChannel::close()
 	}
 }
 
-	
+
 void RemoteSyslogChannel::log(const Message& msg)
 {
 	Poco::FastMutex::ScopedLock lock(_mutex);
@@ -163,7 +163,7 @@ void RemoteSyslogChannel::log(const Message& msg)
 	_socket.sendTo(m.data(), static_cast<int>(m.size()), _socketAddress);
 }
 
-	
+
 void RemoteSyslogChannel::setProperty(const std::string& name, const std::string& value)
 {
 	if (name == PROP_NAME)
@@ -180,7 +180,7 @@ void RemoteSyslogChannel::setProperty(const std::string& name, const std::string
 			facility = Poco::toUpper(value.substr(7));
 		else
 			facility = Poco::toUpper(value);
-		
+
 		if (facility == "KERN")
 			_facility = SYSLOG_KERN;
 		else if (facility == "USER")
@@ -252,7 +252,7 @@ void RemoteSyslogChannel::setProperty(const std::string& name, const std::string
 	}
 }
 
-	
+
 std::string RemoteSyslogChannel::getProperty(const std::string& name) const
 {
 	if (name == PROP_NAME)
@@ -362,6 +362,63 @@ int RemoteSyslogChannel::getPrio(const Message& msg)
 	}
 }
 
+const char* RemoteSyslogChannel::facilityToString(const Facility facility)
+{
+	switch(facility)
+	{
+	case RemoteSyslogChannel::SYSLOG_KERN:
+		return "KERN";
+	case RemoteSyslogChannel::SYSLOG_USER:
+		return "USER";
+	case RemoteSyslogChannel::SYSLOG_MAIL:
+		return "MAIL";
+	case RemoteSyslogChannel::SYSLOG_DAEMON:
+		return "DAEMON";
+	case RemoteSyslogChannel::SYSLOG_AUTH:
+		return "AUTH";
+	case RemoteSyslogChannel::SYSLOG_SYSLOG:
+		return "SYSLOG";
+	case RemoteSyslogChannel::SYSLOG_LPR:
+		return "LPR";
+	case RemoteSyslogChannel::SYSLOG_NEWS:
+		return "NEWS";
+	case RemoteSyslogChannel::SYSLOG_UUCP:
+		return "UUCP";
+	case RemoteSyslogChannel::SYSLOG_CRON:
+		return "CRON";
+	case RemoteSyslogChannel::SYSLOG_AUTHPRIV:
+		return "AUTHPRIV";
+	case RemoteSyslogChannel::SYSLOG_FTP:
+		return "FTP";
+	case RemoteSyslogChannel::SYSLOG_NTP:
+		return "NTP";
+	case RemoteSyslogChannel::SYSLOG_LOGAUDIT:
+		return "LOGAUDIT";
+	case RemoteSyslogChannel::SYSLOG_LOGALERT:
+		return "LOGALERT";
+	case RemoteSyslogChannel::SYSLOG_CLOCK:
+		return "CLOCK";
+	case RemoteSyslogChannel::SYSLOG_LOCAL0:
+		return "LOCAL0";
+	case RemoteSyslogChannel::SYSLOG_LOCAL1:
+		return "LOCAL1";
+	case RemoteSyslogChannel::SYSLOG_LOCAL2:
+		return "LOCAL2";
+	case RemoteSyslogChannel::SYSLOG_LOCAL3:
+		return "LOCAL3";
+	case RemoteSyslogChannel::SYSLOG_LOCAL4:
+		return "LOCAL4";
+	case RemoteSyslogChannel::SYSLOG_LOCAL5:
+		return "LOCAL5";
+	case RemoteSyslogChannel::SYSLOG_LOCAL6:
+		return "LOCAL6";
+	case RemoteSyslogChannel::SYSLOG_LOCAL7:
+		return "LOCAL7";
+	default:
+		return "";
+	}
+}
+
 
 void RemoteSyslogChannel::registerChannel()
 {
diff --git a/Net/src/RemoteSyslogListener.cpp b/Net/src/RemoteSyslogListener.cpp
index ca2afed1f..65ba45ca7 100644
--- a/Net/src/RemoteSyslogListener.cpp
+++ b/Net/src/RemoteSyslogListener.cpp
@@ -96,7 +96,7 @@ public:
 private:
 	Poco::NotificationQueue& _queue;
 	DatagramSocket           _socket;
-	bool                     _stopped;
+	std::atomic<bool>        _stopped;
 };
 
 
@@ -190,7 +190,7 @@ private:
 
 private:
 	Poco::NotificationQueue& _queue;
-	bool                     _stopped;
+	std::atomic<bool>        _stopped;
 	RemoteSyslogListener*    _pListener;
 };
 
@@ -312,6 +312,7 @@ void SyslogParser::parseNew(const std::string& line, RemoteSyslogChannel::Severi
 	int tzd = 0;
 	bool hasDate = Poco::DateTimeParser::tryParse(RemoteSyslogChannel::SYSLOG_TIMEFORMAT, timeStr, date, tzd);
 	Poco::Message logEntry(msgId, messageText, prio);
+	logEntry[RemoteSyslogListener::LOG_PROP_FACILITY] = RemoteSyslogChannel::facilityToString(fac);
 	logEntry[RemoteSyslogListener::LOG_PROP_HOST] = hostName;
 	logEntry[RemoteSyslogListener::LOG_PROP_APP] = appName;
 	logEntry[RemoteSyslogListener::LOG_PROP_STRUCTURED_DATA] = sd;
@@ -390,6 +391,7 @@ void SyslogParser::parseBSD(const std::string& line, RemoteSyslogChannel::Severi
 	pos = line.size();
 	Poco::Message logEntry(hostName, messageText, prio);
 	logEntry.setTime(date.timestamp());
+	logEntry[RemoteSyslogListener::LOG_PROP_FACILITY] = RemoteSyslogChannel::facilityToString(fac);
 	message.swap(logEntry);
 }
 
@@ -501,6 +503,7 @@ const std::string RemoteSyslogListener::PROP_REUSE_PORT("reusePort");
 const std::string RemoteSyslogListener::PROP_THREADS("threads");
 const std::string RemoteSyslogListener::PROP_BUFFER("buffer");
 
+const std::string RemoteSyslogListener::LOG_PROP_FACILITY("facility");
 const std::string RemoteSyslogListener::LOG_PROP_APP("app");
 const std::string RemoteSyslogListener::LOG_PROP_HOST("host");
 const std::string RemoteSyslogListener::LOG_PROP_STRUCTURED_DATA("structured-data");
diff --git a/Net/src/SMTPChannel.cpp b/Net/src/SMTPChannel.cpp
index a498179a4..f4d14eb67 100644
--- a/Net/src/SMTPChannel.cpp
+++ b/Net/src/SMTPChannel.cpp
@@ -52,7 +52,7 @@ SMTPChannel::SMTPChannel():
 {
 }
 
-		
+
 SMTPChannel::SMTPChannel(const std::string& mailhost, const std::string& sender, const std::string& recipient):
 	_mailHost(mailhost),
 	_sender(sender),
@@ -82,12 +82,12 @@ void SMTPChannel::open()
 {
 }
 
-	
+
 void SMTPChannel::close()
 {
 }
 
-	
+
 void SMTPChannel::log(const Message& msg)
 {
 	try
@@ -116,7 +116,7 @@ void SMTPChannel::log(const Message& msg)
 			<< "Message text: " << msg.getText() << "\r\n\r\n";
 
 		message.addContent(new StringPartSource(content.str()));
-	
+
 		if (!_attachment.empty())
 		{
 			{
@@ -132,7 +132,7 @@ void SMTPChannel::log(const Message& msg)
 					fis.seekg(std::ios::beg);
 					fis.read(pMem, size);
 					message.addAttachment(_attachment,
-						new StringPartSource(std::string(pMem, static_cast<SST>(size)), 
+						new StringPartSource(std::string(pMem, static_cast<SST>(size)),
 							_type,
 							_attachment));
 
@@ -146,54 +146,54 @@ void SMTPChannel::log(const Message& msg)
 		session.login();
 		session.sendMessage(message);
 		session.close();
-	} 
-	catch (Exception&) 
-	{ 
-		if (_throw) throw; 
+	}
+	catch (Exception&)
+	{
+		if (_throw) throw;
 	}
 }
 
-	
+
 void SMTPChannel::setProperty(const std::string& name, const std::string& value)
 {
-	if (name == PROP_MAILHOST) 
+	if (name == PROP_MAILHOST)
 		_mailHost = value;
-	else if (name == PROP_SENDER) 
+	else if (name == PROP_SENDER)
 		_sender = value;
-	else if (name == PROP_RECIPIENT) 
+	else if (name == PROP_RECIPIENT)
 		_recipient = value;
-	else if (name == PROP_LOCAL) 
+	else if (name == PROP_LOCAL)
 		_local = isTrue(value);
-	else if (name == PROP_ATTACHMENT) 
+	else if (name == PROP_ATTACHMENT)
 		_attachment = value;
-	else if (name == PROP_TYPE) 
+	else if (name == PROP_TYPE)
 		_type = value;
-	else if (name == PROP_DELETE) 
+	else if (name == PROP_DELETE)
 		_delete = isTrue(value);
-	else if (name == PROP_THROW) 
+	else if (name == PROP_THROW)
 		_throw = isTrue(value);
-	else 
+	else
 		Channel::setProperty(name, value);
 }
 
-	
+
 std::string SMTPChannel::getProperty(const std::string& name) const
 {
-	if (name == PROP_MAILHOST) 
+	if (name == PROP_MAILHOST)
 		return _mailHost;
-	else if (name == PROP_SENDER) 
+	else if (name == PROP_SENDER)
 		return _sender;
-	else if (name == PROP_RECIPIENT) 
+	else if (name == PROP_RECIPIENT)
 		return _recipient;
-	else if (name == PROP_LOCAL) 
+	else if (name == PROP_LOCAL)
 		return _local ? "true" : "false";
-	else if (name == PROP_ATTACHMENT) 
+	else if (name == PROP_ATTACHMENT)
 		return _attachment;
-	else if (name == PROP_TYPE) 
+	else if (name == PROP_TYPE)
 		return _type;
-	else if (name == PROP_DELETE) 
+	else if (name == PROP_DELETE)
 		return _delete ? "true" : "false";
-	else if (name == PROP_THROW) 
+	else if (name == PROP_THROW)
 		return _throw ? "true" : "false";
 	else
 		return Channel::getProperty(name);
@@ -202,7 +202,7 @@ std::string SMTPChannel::getProperty(const std::string& name) const
 
 void SMTPChannel::registerChannel()
 {
-	Poco::LoggingFactory::defaultFactory().registerChannelClass("SMTPChannel", 
+	Poco::LoggingFactory::defaultFactory().registerChannelClass("SMTPChannel",
 		new Poco::Instantiator<SMTPChannel, Poco::Channel>);
 }
 
diff --git a/Net/src/ServerSocket.cpp b/Net/src/ServerSocket.cpp
index 349cad3d4..b5cc4572c 100644
--- a/Net/src/ServerSocket.cpp
+++ b/Net/src/ServerSocket.cpp
@@ -123,7 +123,7 @@ void ServerSocket::bind6(Poco::UInt16 port, bool reuseAddress, bool ipV6Only)
 #endif // POCO_HAVE_IPv6
 }
 
-	
+
 void ServerSocket::bind6(Poco::UInt16 port, bool reuseAddress, bool reusePort, bool ipV6Only)
 {
 #if defined(POCO_HAVE_IPv6)
@@ -135,7 +135,7 @@ void ServerSocket::bind6(Poco::UInt16 port, bool reuseAddress, bool reusePort, b
 #endif // POCO_HAVE_IPv6
 }
 
-	
+
 void ServerSocket::listen(int backlog)
 {
 	impl()->listen(backlog);
diff --git a/Net/src/Socket.cpp b/Net/src/Socket.cpp
index 3e66e2220..b848cb6a0 100644
--- a/Net/src/Socket.cpp
+++ b/Net/src/Socket.cpp
@@ -14,12 +14,14 @@
 
 #include "Poco/Net/Socket.h"
 #include "Poco/Net/StreamSocketImpl.h"
+#include "Poco/Net/PollSet.h"
 #include "Poco/Timestamp.h"
+#include "Poco/Error.h"
 #include <algorithm>
 #include <string.h> // FD_SET needs memset on some platforms, so we can't use <cstring>
-#if defined(POCO_HAVE_FD_EPOLL)
-	#include <sys/epoll.h>
-#elif defined(POCO_HAVE_FD_POLL)
+
+
+#if defined(POCO_HAVE_FD_POLL)
 	#include "Poco/SharedPtr.h"
 	#ifndef _WIN32
 		#include <poll.h>
@@ -101,133 +103,22 @@ int Socket::select(SocketList& readList, SocketList& writeList, SocketList& exce
 	int epollSize = readList.size() + writeList.size() + exceptList.size();
 	if (epollSize == 0) return 0;
 
-	int epollfd = -1;
+	PollSet ps;
+	for (const auto& s : readList) ps.add(s, PollSet::POLL_READ);
+	for (const auto& s : writeList) ps.add(s, PollSet::POLL_WRITE);
+
+	readList.clear();
+	writeList.clear();
+	exceptList.clear();
+
+	PollSet::SocketModeMap sm = ps.poll(timeout);
+	for (const auto& s : sm)
 	{
-		struct epoll_event eventsIn[epollSize];
-		memset(eventsIn, 0, sizeof(eventsIn));
-		struct epoll_event* eventLast = eventsIn;
-		for (SocketList::iterator it = readList.begin(); it != readList.end(); ++it)
-		{
-			poco_socket_t sockfd = it->sockfd();
-			if (sockfd != POCO_INVALID_SOCKET)
-			{
-				struct epoll_event* e = eventsIn;
-				for (; e != eventLast; ++e)
-				{
-					if (reinterpret_cast<Socket*>(e->data.ptr)->sockfd() == sockfd)
-						break;
-				}
-				if (e == eventLast)
-				{
-					e->data.ptr = &(*it);
-					++eventLast;
-				}
-				e->events |= EPOLLIN;
-			}
-		}
-
-		for (SocketList::iterator it = writeList.begin(); it != writeList.end(); ++it)
-		{
-			poco_socket_t sockfd = it->sockfd();
-			if (sockfd != POCO_INVALID_SOCKET)
-			{
-				struct epoll_event* e = eventsIn;
-				for (; e != eventLast; ++e)
-				{
-					if (reinterpret_cast<Socket*>(e->data.ptr)->sockfd() == sockfd)
-						break;
-				}
-				if (e == eventLast)
-				{
-					e->data.ptr = &(*it);
-					++eventLast;
-				}
-				e->events |= EPOLLOUT;
-			}
-		}
-
-		for (SocketList::iterator it = exceptList.begin(); it != exceptList.end(); ++it)
-		{
-			poco_socket_t sockfd = it->sockfd();
-			if (sockfd != POCO_INVALID_SOCKET)
-			{
-				struct epoll_event* e = eventsIn;
-				for (; e != eventLast; ++e)
-				{
-					if (reinterpret_cast<Socket*>(e->data.ptr)->sockfd() == sockfd)
-						break;
-				}
-				if (e == eventLast)
-				{
-					e->data.ptr = &(*it);
-					++eventLast;
-				}
-				e->events |= EPOLLERR;
-			}
-		}
-
-		epollSize = eventLast - eventsIn;
-		if (epollSize == 0) return 0;
-
-		epollfd = epoll_create(1);
-		if (epollfd < 0)
-		{
-			SocketImpl::error("Can't create epoll queue");
-		}
-
-		for (struct epoll_event* e = eventsIn; e != eventLast; ++e)
-		{
-			poco_socket_t sockfd = reinterpret_cast<Socket*>(e->data.ptr)->sockfd();
-			if (sockfd != POCO_INVALID_SOCKET)
-			{
-				if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sockfd, e) < 0)
-				{
-					::close(epollfd);
-					SocketImpl::error("Can't insert socket to epoll queue");
-				}
-			}
-		}
+		if (s.second & PollSet::POLL_READ) readList.push_back(s.first);
+		if (s.second & PollSet::POLL_WRITE) writeList.push_back(s.first);
+		if (s.second & PollSet::POLL_ERROR) exceptList.push_back(s.first);
 	}
 
-	struct epoll_event eventsOut[epollSize];
-	memset(eventsOut, 0, sizeof(eventsOut));
-
-	Poco::Timespan remainingTime(timeout);
-	int rc;
-	do
-	{
-		Poco::Timestamp start;
-		rc = epoll_wait(epollfd, eventsOut, epollSize, remainingTime.totalMilliseconds());
-		if (rc < 0 && SocketImpl::lastError() == POCO_EINTR)
-		{
- 			Poco::Timestamp end;
-			Poco::Timespan waited = end - start;
-			if (waited < remainingTime)
-				remainingTime -= waited;
-			else
-				remainingTime = 0;
-		}
-	}
-	while (rc < 0 && SocketImpl::lastError() == POCO_EINTR);
-
-	::close(epollfd);
-	if (rc < 0) SocketImpl::error();
-
- 	SocketList readyReadList;
-	SocketList readyWriteList;
-	SocketList readyExceptList;
-	for (int n = 0; n < rc; ++n)
-	{
-		if (eventsOut[n].events & EPOLLERR)
-			readyExceptList.push_back(*reinterpret_cast<Socket*>(eventsOut[n].data.ptr));
-		if (eventsOut[n].events & EPOLLIN)
-			readyReadList.push_back(*reinterpret_cast<Socket*>(eventsOut[n].data.ptr));
-		if (eventsOut[n].events & EPOLLOUT)
-			readyWriteList.push_back(*reinterpret_cast<Socket*>(eventsOut[n].data.ptr));
-	}
-	std::swap(readList, readyReadList);
-	std::swap(writeList, readyWriteList);
-	std::swap(exceptList, readyExceptList);
 	return readList.size() + writeList.size() + exceptList.size();
 
 #elif defined(POCO_HAVE_FD_POLL)
@@ -502,6 +393,12 @@ int Socket::lastError()
 }
 
 
+std::string Socket::lastErrorDesc()
+{
+	return Error::getMessage(SocketImpl::lastError());
+}
+
+
 void Socket::error()
 {
 	SocketImpl::error();
diff --git a/Net/src/SocketImpl.cpp b/Net/src/SocketImpl.cpp
index 3bbe95cfb..173673886 100644
--- a/Net/src/SocketImpl.cpp
+++ b/Net/src/SocketImpl.cpp
@@ -21,7 +21,12 @@
 
 
 #if defined(POCO_HAVE_FD_EPOLL)
-	#include <sys/epoll.h>
+	#ifdef POCO_OS_FAMILY_WINDOWS
+		#include "wepoll.h"
+	#else
+		#include <sys/epoll.h>
+		#include <sys/eventfd.h>
+	#endif
 #elif defined(POCO_HAVE_FD_POLL)
 	#ifndef _WIN32
 		#include <poll.h>
@@ -52,6 +57,20 @@ using Poco::NumberFormatter;
 using Poco::Timespan;
 
 
+#ifdef WEPOLL_H_
+
+namespace {
+
+	int close(HANDLE h)
+	{
+		return epoll_close(h);
+	}
+
+}
+
+#endif // WEPOLL_H_
+
+
 namespace Poco {
 namespace Net {
 
@@ -622,8 +641,11 @@ bool SocketImpl::poll(const Poco::Timespan& timeout, int mode)
 	if (sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
 
 #if defined(POCO_HAVE_FD_EPOLL)
-
+#ifdef WEPOLL_H_
+	HANDLE epollfd = epoll_create(1);
+#else
 	int epollfd = epoll_create(1);
+#endif
 	if (epollfd < 0)
 	{
 		error("Can't create epoll queue");
diff --git a/Net/src/SocketNotification.cpp b/Net/src/SocketNotification.cpp
index db92323e2..82a9962d2 100644
--- a/Net/src/SocketNotification.cpp
+++ b/Net/src/SocketNotification.cpp
@@ -36,7 +36,7 @@ void SocketNotification::setSocket(const Socket& socket)
 }
 
 
-ReadableNotification::ReadableNotification(SocketReactor* pReactor): 
+ReadableNotification::ReadableNotification(SocketReactor* pReactor):
 	SocketNotification(pReactor)
 {
 }
@@ -47,7 +47,7 @@ ReadableNotification::~ReadableNotification()
 }
 
 
-WritableNotification::WritableNotification(SocketReactor* pReactor): 
+WritableNotification::WritableNotification(SocketReactor* pReactor):
 	SocketNotification(pReactor)
 {
 }
@@ -58,7 +58,7 @@ WritableNotification::~WritableNotification()
 }
 
 
-ErrorNotification::ErrorNotification(SocketReactor* pReactor): 
+ErrorNotification::ErrorNotification(SocketReactor* pReactor):
 	SocketNotification(pReactor)
 {
 }
@@ -69,7 +69,7 @@ ErrorNotification::~ErrorNotification()
 }
 
 
-TimeoutNotification::TimeoutNotification(SocketReactor* pReactor): 
+TimeoutNotification::TimeoutNotification(SocketReactor* pReactor):
 	SocketNotification(pReactor)
 {
 }
@@ -80,7 +80,7 @@ TimeoutNotification::~TimeoutNotification()
 }
 
 
-IdleNotification::IdleNotification(SocketReactor* pReactor): 
+IdleNotification::IdleNotification(SocketReactor* pReactor):
 	SocketNotification(pReactor)
 {
 }
@@ -91,7 +91,7 @@ IdleNotification::~IdleNotification()
 }
 
 
-ShutdownNotification::ShutdownNotification(SocketReactor* pReactor): 
+ShutdownNotification::ShutdownNotification(SocketReactor* pReactor):
 	SocketNotification(pReactor)
 {
 }
diff --git a/Net/src/SocketReactor.cpp b/Net/src/SocketReactor.cpp
index f79c8a840..dd5406a30 100644
--- a/Net/src/SocketReactor.cpp
+++ b/Net/src/SocketReactor.cpp
@@ -138,7 +138,11 @@ void SocketReactor::stop()
 
 void SocketReactor::wakeUp()
 {
-	if (_pThread) _pThread->wakeUp();
+	if (_pThread && _pThread != Thread::current())
+	{
+		_pThread->wakeUp();
+		_pollSet.wakeUp();
+	}
 }
 
 
diff --git a/Net/src/SocketStream.cpp b/Net/src/SocketStream.cpp
index 77ae8c244..5fc5d3f39 100644
--- a/Net/src/SocketStream.cpp
+++ b/Net/src/SocketStream.cpp
@@ -30,12 +30,12 @@ namespace Net {
 //
 
 
-SocketStreamBuf::SocketStreamBuf(const Socket& socket): 
+SocketStreamBuf::SocketStreamBuf(const Socket& socket):
 	BufferedBidirectionalStreamBuf(STREAM_BUFFER_SIZE, std::ios::in | std::ios::out),
 	_pImpl(dynamic_cast<StreamSocketImpl*>(socket.impl()))
 {
 	if (_pImpl)
-		_pImpl->duplicate(); 
+		_pImpl->duplicate();
 	else
 		throw InvalidArgumentException("Invalid or null SocketImpl passed to SocketStreamBuf");
 }
diff --git a/Net/src/StreamSocket.cpp b/Net/src/StreamSocket.cpp
index 62654fccf..efb31f83f 100644
--- a/Net/src/StreamSocket.cpp
+++ b/Net/src/StreamSocket.cpp
@@ -145,7 +145,7 @@ void StreamSocket::shutdownReceive()
 	impl()->shutdownReceive();
 }
 
-	
+
 void StreamSocket::shutdownSend()
 {
 	impl()->shutdownSend();
diff --git a/Net/src/StreamSocketImpl.cpp b/Net/src/StreamSocketImpl.cpp
index 8116942db..6e86c8fcc 100644
--- a/Net/src/StreamSocketImpl.cpp
+++ b/Net/src/StreamSocketImpl.cpp
@@ -62,7 +62,7 @@ int StreamSocketImpl::sendBytes(const void* buffer, int length, int flags)
 	{
 		int n = SocketImpl::sendBytes(p, remaining, flags);
 		poco_assert_dbg (n >= 0);
-		p += n; 
+		p += n;
 		sent += n;
 		remaining -= n;
 		if (blocking && remaining > 0)
diff --git a/Net/src/StringPartSource.cpp b/Net/src/StringPartSource.cpp
index a512449f6..a63465c5b 100644
--- a/Net/src/StringPartSource.cpp
+++ b/Net/src/StringPartSource.cpp
@@ -51,7 +51,7 @@ std::istream& StringPartSource::stream()
 	return _istr;
 }
 
-	
+
 const std::string& StringPartSource::filename() const
 {
 	return _filename;
diff --git a/Net/src/TCPServer.cpp b/Net/src/TCPServer.cpp
index 7a7282f78..71c91f756 100644
--- a/Net/src/TCPServer.cpp
+++ b/Net/src/TCPServer.cpp
@@ -47,7 +47,7 @@ TCPServer::TCPServer(TCPServerConnectionFactory::Ptr pFactory, Poco::UInt16 port
 	_socket(ServerSocket(portNumber)),
 	_thread(threadName(_socket)),
 	_stopped(true)
-{	
+{
 	Poco::ThreadPool& pool = Poco::ThreadPool::defaultPool();
 	if (pParams)
 	{
@@ -55,7 +55,7 @@ TCPServer::TCPServer(TCPServerConnectionFactory::Ptr pFactory, Poco::UInt16 port
 		if (toAdd > 0) pool.addCapacity(toAdd);
 	}
 	_pDispatcher = new TCPServerDispatcher(pFactory, pool, pParams);
-	
+
 }
 
 
@@ -111,7 +111,7 @@ void TCPServer::start()
 	_thread.start(*this);
 }
 
-	
+
 void TCPServer::stop()
 {
 	if (!_stopped)
@@ -135,7 +135,7 @@ void TCPServer::run()
 				try
 				{
 					StreamSocket ss = _socket.acceptConnection();
-					
+
 					if (!_pConnectionFilter || _pConnectionFilter->accept(ss))
 					{
 						// enable nodelay per default: OSX really needs that
@@ -167,7 +167,7 @@ void TCPServer::run()
 			ErrorHandler::handle(exc);
 			// possibly a resource issue since poll() failed;
 			// give some time to recover before trying again
-			Poco::Thread::sleep(50); 
+			Poco::Thread::sleep(50);
 		}
 	}
 }
@@ -184,7 +184,7 @@ int TCPServer::maxThreads() const
 	return _pDispatcher->maxThreads();
 }
 
-	
+
 int TCPServer::totalConnections() const
 {
 	return _pDispatcher->totalConnections();
@@ -202,7 +202,7 @@ int TCPServer::maxConcurrentConnections() const
 	return _pDispatcher->maxConcurrentConnections();
 }
 
-	
+
 int TCPServer::queuedConnections() const
 {
 	return _pDispatcher->queuedConnections();
diff --git a/Net/src/TCPServerDispatcher.cpp b/Net/src/TCPServerDispatcher.cpp
index 9259c8ab7..5055dc244 100644
--- a/Net/src/TCPServerDispatcher.cpp
+++ b/Net/src/TCPServerDispatcher.cpp
@@ -16,6 +16,7 @@
 #include "Poco/Net/TCPServerConnectionFactory.h"
 #include "Poco/Notification.h"
 #include "Poco/AutoPtr.h"
+#include "Poco/ErrorHandler.h"
 #include <memory>
 
 
@@ -84,18 +85,13 @@ TCPServerDispatcher::~TCPServerDispatcher()
 
 void TCPServerDispatcher::duplicate()
 {
-	_mutex.lock();
 	++_rc;
-	_mutex.unlock();
 }
 
 
 void TCPServerDispatcher::release()
 {
-	_mutex.lock();
-	int rc = --_rc;
-	_mutex.unlock();
-	if (rc == 0) delete this;
+	if (--_rc == 0) delete this;
 }
 
 
@@ -107,26 +103,29 @@ void TCPServerDispatcher::run()
 
 	for (;;)
 	{
-		AutoPtr<Notification> pNf = _queue.waitDequeueNotification(idleTime);
-		if (pNf)
 		{
-			TCPConnectionNotification* pCNf = dynamic_cast<TCPConnectionNotification*>(pNf.get());
-			if (pCNf)
+			ThreadCountWatcher tcw(this);
+			try
 			{
-				std::unique_ptr<TCPServerConnection> pConnection(_pConnectionFactory->createConnection(pCNf->socket()));
-				poco_check_ptr(pConnection.get());
-				beginConnection();
-				pConnection->start();
-				endConnection();
+				AutoPtr<Notification> pNf = _queue.waitDequeueNotification(idleTime);
+				if (pNf)
+				{
+					TCPConnectionNotification* pCNf = dynamic_cast<TCPConnectionNotification*>(pNf.get());
+					if (pCNf)
+					{
+						std::unique_ptr<TCPServerConnection> pConnection(_pConnectionFactory->createConnection(pCNf->socket()));
+						poco_check_ptr(pConnection.get());
+						beginConnection();
+						pConnection->start();
+						endConnection();
+					}
+				}
 			}
+			catch (Poco::Exception &exc) { ErrorHandler::handle(exc); }
+			catch (std::exception &exc)  { ErrorHandler::handle(exc); }
+			catch (...)                  { ErrorHandler::handle();    }
 		}
-
-		FastMutex::ScopedLock lock(_mutex);
-		if (_stopped || (_currentThreads > 1 && _queue.empty()))
-		{
-			--_currentThreads;
-			break;
-		}
+		if (_stopped || (_currentThreads > 1 && _queue.empty())) break;
 	}
 }
 
@@ -180,8 +179,6 @@ void TCPServerDispatcher::stop()
 
 int TCPServerDispatcher::currentThreads() const
 {
-	FastMutex::ScopedLock lock(_mutex);
-
 	return _currentThreads;
 }
 
@@ -195,24 +192,18 @@ int TCPServerDispatcher::maxThreads() const
 
 int TCPServerDispatcher::totalConnections() const
 {
-	FastMutex::ScopedLock lock(_mutex);
-
 	return _totalConnections;
 }
 
 
 int TCPServerDispatcher::currentConnections() const
 {
-	FastMutex::ScopedLock lock(_mutex);
-
 	return _currentConnections;
 }
 
 
 int TCPServerDispatcher::maxConcurrentConnections() const
 {
-	FastMutex::ScopedLock lock(_mutex);
-
 	return _maxConcurrentConnections;
 }
 
@@ -225,8 +216,6 @@ int TCPServerDispatcher::queuedConnections() const
 
 int TCPServerDispatcher::refusedConnections() const
 {
-	FastMutex::ScopedLock lock(_mutex);
-
 	return _refusedConnections;
 }
 
@@ -238,14 +227,12 @@ void TCPServerDispatcher::beginConnection()
 	++_totalConnections;
 	++_currentConnections;
 	if (_currentConnections > _maxConcurrentConnections)
-		_maxConcurrentConnections = _currentConnections;
+		_maxConcurrentConnections.store(_currentConnections);
 }
 
 
 void TCPServerDispatcher::endConnection()
 {
-	FastMutex::ScopedLock lock(_mutex);
-
 	--_currentConnections;
 }
 
diff --git a/Net/src/WebSocket.cpp b/Net/src/WebSocket.cpp
index 46f2dacb6..d9686aa85 100644
--- a/Net/src/WebSocket.cpp
+++ b/Net/src/WebSocket.cpp
@@ -65,6 +65,8 @@ WebSocket::WebSocket(const Socket& socket):
 }
 
 
+#ifdef POCO_NEW_STATE_ON_MOVE
+
 WebSocket::WebSocket(Socket&& socket):
 	StreamSocket(std::move(socket))
 {
@@ -73,14 +75,16 @@ WebSocket::WebSocket(Socket&& socket):
 }
 
 
-WebSocket::WebSocket(const WebSocket& socket):
-	StreamSocket(socket)
+WebSocket::WebSocket(WebSocket&& socket):
+	StreamSocket(std::move(socket))
 {
 }
 
+#endif // POCO_NEW_STATE_ON_MOVE
 
-WebSocket::WebSocket(WebSocket&& socket):
-	StreamSocket(std::move(socket))
+
+WebSocket::WebSocket(const WebSocket& socket):
+	StreamSocket(socket)
 {
 }
 
@@ -100,6 +104,8 @@ WebSocket& WebSocket::operator = (const Socket& socket)
 }
 
 
+#ifdef POCO_NEW_STATE_ON_MOVE
+
 WebSocket& WebSocket::operator = (Socket&& socket)
 {
 	if (dynamic_cast<WebSocketImpl*>(socket.impl()))
@@ -110,19 +116,21 @@ WebSocket& WebSocket::operator = (Socket&& socket)
 }
 
 
-WebSocket& WebSocket::operator = (const WebSocket& socket)
-{
-	Socket::operator = (socket);
-	return *this;
-}
-
-
 WebSocket& WebSocket::operator = (WebSocket&& socket)
 {
 	Socket::operator = (std::move(socket));
 	return *this;
 }
 
+#endif // POCO_NEW_STATE_ON_MOVE
+
+
+WebSocket& WebSocket::operator = (const WebSocket& socket)
+{
+	Socket::operator = (socket);
+	return *this;
+}
+
 
 void WebSocket::shutdown()
 {
diff --git a/Net/src/wepoll.c b/Net/src/wepoll.c
new file mode 100644
index 000000000..186d3f2d4
--- /dev/null
+++ b/Net/src/wepoll.c
@@ -0,0 +1,2253 @@
+/*
+ * wepoll - epoll for Windows
+ * https://github.com/piscisaureus/wepoll
+ *
+ * Copyright 2012-2020, Bert Belder <bertbelder@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WEPOLL_EXPORT
+#define WEPOLL_EXPORT
+#endif
+
+#include <stdint.h>
+
+enum EPOLL_EVENTS {
+  EPOLLIN      = (int) (1U <<  0),
+  EPOLLPRI     = (int) (1U <<  1),
+  EPOLLOUT     = (int) (1U <<  2),
+  EPOLLERR     = (int) (1U <<  3),
+  EPOLLHUP     = (int) (1U <<  4),
+  EPOLLRDNORM  = (int) (1U <<  6),
+  EPOLLRDBAND  = (int) (1U <<  7),
+  EPOLLWRNORM  = (int) (1U <<  8),
+  EPOLLWRBAND  = (int) (1U <<  9),
+  EPOLLMSG     = (int) (1U << 10), /* Never reported. */
+  EPOLLRDHUP   = (int) (1U << 13),
+  EPOLLONESHOT = (int) (1U << 31)
+};
+
+#define EPOLLIN      (1U <<  0)
+#define EPOLLPRI     (1U <<  1)
+#define EPOLLOUT     (1U <<  2)
+#define EPOLLERR     (1U <<  3)
+#define EPOLLHUP     (1U <<  4)
+#define EPOLLRDNORM  (1U <<  6)
+#define EPOLLRDBAND  (1U <<  7)
+#define EPOLLWRNORM  (1U <<  8)
+#define EPOLLWRBAND  (1U <<  9)
+#define EPOLLMSG     (1U << 10)
+#define EPOLLRDHUP   (1U << 13)
+#define EPOLLONESHOT (1U << 31)
+
+#define EPOLL_CTL_ADD 1
+#define EPOLL_CTL_MOD 2
+#define EPOLL_CTL_DEL 3
+
+typedef void* HANDLE;
+typedef uintptr_t SOCKET;
+
+typedef union epoll_data {
+  void* ptr;
+  int fd;
+  uint32_t u32;
+  uint64_t u64;
+  SOCKET sock; /* Windows specific */
+  HANDLE hnd;  /* Windows specific */
+} epoll_data_t;
+
+struct epoll_event {
+  uint32_t events;   /* Epoll events and flags */
+  epoll_data_t data; /* User data variable */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WEPOLL_EXPORT HANDLE epoll_create(int size);
+WEPOLL_EXPORT HANDLE epoll_create1(int flags);
+
+WEPOLL_EXPORT int epoll_close(HANDLE ephnd);
+
+WEPOLL_EXPORT int epoll_ctl(HANDLE ephnd,
+                            int op,
+                            SOCKET sock,
+                            struct epoll_event* event);
+
+WEPOLL_EXPORT int epoll_wait(HANDLE ephnd,
+                             struct epoll_event* events,
+                             int maxevents,
+                             int timeout);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include <assert.h>
+
+#include <stdlib.h>
+
+#define WEPOLL_INTERNAL static
+#define WEPOLL_INTERNAL_EXTERN static
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonportable-system-include-path"
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#elif defined(_MSC_VER)
+#pragma warning(push, 1)
+#endif
+
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#elif defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+WEPOLL_INTERNAL int nt_global_init(void);
+
+typedef LONG NTSTATUS;
+typedef NTSTATUS* PNTSTATUS;
+
+#ifndef NT_SUCCESS
+#define NT_SUCCESS(status) (((NTSTATUS)(status)) >= 0)
+#endif
+
+#ifndef STATUS_SUCCESS
+#define STATUS_SUCCESS ((NTSTATUS) 0x00000000L)
+#endif
+
+#ifndef STATUS_PENDING
+#define STATUS_PENDING ((NTSTATUS) 0x00000103L)
+#endif
+
+#ifndef STATUS_CANCELLED
+#define STATUS_CANCELLED ((NTSTATUS) 0xC0000120L)
+#endif
+
+#ifndef STATUS_NOT_FOUND
+#define STATUS_NOT_FOUND ((NTSTATUS) 0xC0000225L)
+#endif
+
+typedef struct _IO_STATUS_BLOCK {
+  NTSTATUS Status;
+  ULONG_PTR Information;
+} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
+
+typedef VOID(NTAPI* PIO_APC_ROUTINE)(PVOID ApcContext,
+                                     PIO_STATUS_BLOCK IoStatusBlock,
+                                     ULONG Reserved);
+
+typedef struct _UNICODE_STRING {
+  USHORT Length;
+  USHORT MaximumLength;
+  PWSTR Buffer;
+} UNICODE_STRING, *PUNICODE_STRING;
+
+#define RTL_CONSTANT_STRING(s) \
+  { sizeof(s) - sizeof((s)[0]), sizeof(s), s }
+
+typedef struct _OBJECT_ATTRIBUTES {
+  ULONG Length;
+  HANDLE RootDirectory;
+  PUNICODE_STRING ObjectName;
+  ULONG Attributes;
+  PVOID SecurityDescriptor;
+  PVOID SecurityQualityOfService;
+} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
+
+#define RTL_CONSTANT_OBJECT_ATTRIBUTES(ObjectName, Attributes) \
+  { sizeof(OBJECT_ATTRIBUTES), NULL, ObjectName, Attributes, NULL, NULL }
+
+#ifndef FILE_OPEN
+#define FILE_OPEN 0x00000001UL
+#endif
+
+#define KEYEDEVENT_WAIT 0x00000001UL
+#define KEYEDEVENT_WAKE 0x00000002UL
+#define KEYEDEVENT_ALL_ACCESS \
+  (STANDARD_RIGHTS_REQUIRED | KEYEDEVENT_WAIT | KEYEDEVENT_WAKE)
+
+#define NT_NTDLL_IMPORT_LIST(X)           \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtCancelIoFileEx,                     \
+    (HANDLE FileHandle,                   \
+     PIO_STATUS_BLOCK IoRequestToCancel,  \
+     PIO_STATUS_BLOCK IoStatusBlock))     \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtCreateFile,                         \
+    (PHANDLE FileHandle,                  \
+     ACCESS_MASK DesiredAccess,           \
+     POBJECT_ATTRIBUTES ObjectAttributes, \
+     PIO_STATUS_BLOCK IoStatusBlock,      \
+     PLARGE_INTEGER AllocationSize,       \
+     ULONG FileAttributes,                \
+     ULONG ShareAccess,                   \
+     ULONG CreateDisposition,             \
+     ULONG CreateOptions,                 \
+     PVOID EaBuffer,                      \
+     ULONG EaLength))                     \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtCreateKeyedEvent,                   \
+    (PHANDLE KeyedEventHandle,            \
+     ACCESS_MASK DesiredAccess,           \
+     POBJECT_ATTRIBUTES ObjectAttributes, \
+     ULONG Flags))                        \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtDeviceIoControlFile,                \
+    (HANDLE FileHandle,                   \
+     HANDLE Event,                        \
+     PIO_APC_ROUTINE ApcRoutine,          \
+     PVOID ApcContext,                    \
+     PIO_STATUS_BLOCK IoStatusBlock,      \
+     ULONG IoControlCode,                 \
+     PVOID InputBuffer,                   \
+     ULONG InputBufferLength,             \
+     PVOID OutputBuffer,                  \
+     ULONG OutputBufferLength))           \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtReleaseKeyedEvent,                  \
+    (HANDLE KeyedEventHandle,             \
+     PVOID KeyValue,                      \
+     BOOLEAN Alertable,                   \
+     PLARGE_INTEGER Timeout))             \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtWaitForKeyedEvent,                  \
+    (HANDLE KeyedEventHandle,             \
+     PVOID KeyValue,                      \
+     BOOLEAN Alertable,                   \
+     PLARGE_INTEGER Timeout))             \
+                                          \
+  X(ULONG, WINAPI, RtlNtStatusToDosError, (NTSTATUS Status))
+
+#define X(return_type, attributes, name, parameters) \
+  WEPOLL_INTERNAL_EXTERN return_type(attributes* name) parameters;
+NT_NTDLL_IMPORT_LIST(X)
+#undef X
+
+#define AFD_POLL_RECEIVE           0x0001
+#define AFD_POLL_RECEIVE_EXPEDITED 0x0002
+#define AFD_POLL_SEND              0x0004
+#define AFD_POLL_DISCONNECT        0x0008
+#define AFD_POLL_ABORT             0x0010
+#define AFD_POLL_LOCAL_CLOSE       0x0020
+#define AFD_POLL_ACCEPT            0x0080
+#define AFD_POLL_CONNECT_FAIL      0x0100
+
+typedef struct _AFD_POLL_HANDLE_INFO {
+  HANDLE Handle;
+  ULONG Events;
+  NTSTATUS Status;
+} AFD_POLL_HANDLE_INFO, *PAFD_POLL_HANDLE_INFO;
+
+typedef struct _AFD_POLL_INFO {
+  LARGE_INTEGER Timeout;
+  ULONG NumberOfHandles;
+  ULONG Exclusive;
+  AFD_POLL_HANDLE_INFO Handles[1];
+} AFD_POLL_INFO, *PAFD_POLL_INFO;
+
+WEPOLL_INTERNAL int afd_create_device_handle(HANDLE iocp_handle,
+                                             HANDLE* afd_device_handle_out);
+
+WEPOLL_INTERNAL int afd_poll(HANDLE afd_device_handle,
+                             AFD_POLL_INFO* poll_info,
+                             IO_STATUS_BLOCK* io_status_block);
+WEPOLL_INTERNAL int afd_cancel_poll(HANDLE afd_device_handle,
+                                    IO_STATUS_BLOCK* io_status_block);
+
+#define return_map_error(value) \
+  do {                          \
+    err_map_win_error();        \
+    return (value);             \
+  } while (0)
+
+#define return_set_error(value, error) \
+  do {                                 \
+    err_set_win_error(error);          \
+    return (value);                    \
+  } while (0)
+
+WEPOLL_INTERNAL void err_map_win_error(void);
+WEPOLL_INTERNAL void err_set_win_error(DWORD error);
+WEPOLL_INTERNAL int err_check_handle(HANDLE handle);
+
+#define IOCTL_AFD_POLL 0x00012024
+
+static UNICODE_STRING afd__device_name =
+    RTL_CONSTANT_STRING(L"\\Device\\Afd\\Wepoll");
+
+static OBJECT_ATTRIBUTES afd__device_attributes =
+    RTL_CONSTANT_OBJECT_ATTRIBUTES(&afd__device_name, 0);
+
+int afd_create_device_handle(HANDLE iocp_handle,
+                             HANDLE* afd_device_handle_out) {
+  HANDLE afd_device_handle;
+  IO_STATUS_BLOCK iosb;
+  NTSTATUS status;
+
+  /* By opening \Device\Afd without specifying any extended attributes, we'll
+   * get a handle that lets us talk to the AFD driver, but that doesn't have an
+   * associated endpoint (so it's not a socket). */
+  status = NtCreateFile(&afd_device_handle,
+                        SYNCHRONIZE,
+                        &afd__device_attributes,
+                        &iosb,
+                        NULL,
+                        0,
+                        FILE_SHARE_READ | FILE_SHARE_WRITE,
+                        FILE_OPEN,
+                        0,
+                        NULL,
+                        0);
+  if (status != STATUS_SUCCESS)
+    return_set_error(-1, RtlNtStatusToDosError(status));
+
+  if (CreateIoCompletionPort(afd_device_handle, iocp_handle, 0, 0) == NULL)
+    goto error;
+
+  if (!SetFileCompletionNotificationModes(afd_device_handle,
+                                          FILE_SKIP_SET_EVENT_ON_HANDLE))
+    goto error;
+
+  *afd_device_handle_out = afd_device_handle;
+  return 0;
+
+error:
+  CloseHandle(afd_device_handle);
+  return_map_error(-1);
+}
+
+int afd_poll(HANDLE afd_device_handle,
+             AFD_POLL_INFO* poll_info,
+             IO_STATUS_BLOCK* io_status_block) {
+  NTSTATUS status;
+
+  /* Blocking operation is not supported. */
+  assert(io_status_block != NULL);
+
+  io_status_block->Status = STATUS_PENDING;
+  status = NtDeviceIoControlFile(afd_device_handle,
+                                 NULL,
+                                 NULL,
+                                 io_status_block,
+                                 io_status_block,
+                                 IOCTL_AFD_POLL,
+                                 poll_info,
+                                 sizeof *poll_info,
+                                 poll_info,
+                                 sizeof *poll_info);
+
+  if (status == STATUS_SUCCESS)
+    return 0;
+  else if (status == STATUS_PENDING)
+    return_set_error(-1, ERROR_IO_PENDING);
+  else
+    return_set_error(-1, RtlNtStatusToDosError(status));
+}
+
+int afd_cancel_poll(HANDLE afd_device_handle,
+                    IO_STATUS_BLOCK* io_status_block) {
+  NTSTATUS cancel_status;
+  IO_STATUS_BLOCK cancel_iosb;
+
+  /* If the poll operation has already completed or has been cancelled earlier,
+   * there's nothing left for us to do. */
+  if (io_status_block->Status != STATUS_PENDING)
+    return 0;
+
+  cancel_status =
+      NtCancelIoFileEx(afd_device_handle, io_status_block, &cancel_iosb);
+
+  /* NtCancelIoFileEx() may return STATUS_NOT_FOUND if the operation completed
+   * just before calling NtCancelIoFileEx(). This is not an error. */
+  if (cancel_status == STATUS_SUCCESS || cancel_status == STATUS_NOT_FOUND)
+    return 0;
+  else
+    return_set_error(-1, RtlNtStatusToDosError(cancel_status));
+}
+
+WEPOLL_INTERNAL int epoll_global_init(void);
+
+WEPOLL_INTERNAL int init(void);
+
+typedef struct port_state port_state_t;
+typedef struct queue queue_t;
+typedef struct sock_state sock_state_t;
+typedef struct ts_tree_node ts_tree_node_t;
+
+WEPOLL_INTERNAL port_state_t* port_new(HANDLE* iocp_handle_out);
+WEPOLL_INTERNAL int port_close(port_state_t* port_state);
+WEPOLL_INTERNAL int port_delete(port_state_t* port_state);
+
+WEPOLL_INTERNAL int port_wait(port_state_t* port_state,
+                              struct epoll_event* events,
+                              int maxevents,
+                              int timeout);
+
+WEPOLL_INTERNAL int port_ctl(port_state_t* port_state,
+                             int op,
+                             SOCKET sock,
+                             struct epoll_event* ev);
+
+WEPOLL_INTERNAL int port_register_socket(port_state_t* port_state,
+                                         sock_state_t* sock_state,
+                                         SOCKET socket);
+WEPOLL_INTERNAL void port_unregister_socket(port_state_t* port_state,
+                                            sock_state_t* sock_state);
+WEPOLL_INTERNAL sock_state_t* port_find_socket(port_state_t* port_state,
+                                               SOCKET socket);
+
+WEPOLL_INTERNAL void port_request_socket_update(port_state_t* port_state,
+                                                sock_state_t* sock_state);
+WEPOLL_INTERNAL void port_cancel_socket_update(port_state_t* port_state,
+                                               sock_state_t* sock_state);
+
+WEPOLL_INTERNAL void port_add_deleted_socket(port_state_t* port_state,
+                                             sock_state_t* sock_state);
+WEPOLL_INTERNAL void port_remove_deleted_socket(port_state_t* port_state,
+                                                sock_state_t* sock_state);
+
+WEPOLL_INTERNAL HANDLE port_get_iocp_handle(port_state_t* port_state);
+WEPOLL_INTERNAL queue_t* port_get_poll_group_queue(port_state_t* port_state);
+
+WEPOLL_INTERNAL port_state_t* port_state_from_handle_tree_node(
+    ts_tree_node_t* tree_node);
+WEPOLL_INTERNAL ts_tree_node_t* port_state_to_handle_tree_node(
+    port_state_t* port_state);
+
+/* The reflock is a special kind of lock that normally prevents a chunk of
+ * memory from being freed, but does allow the chunk of memory to eventually be
+ * released in a coordinated fashion.
+ *
+ * Under normal operation, threads increase and decrease the reference count,
+ * which are wait-free operations.
+ *
+ * Exactly once during the reflock's lifecycle, a thread holding a reference to
+ * the lock may "destroy" the lock; this operation blocks until all other
+ * threads holding a reference to the lock have dereferenced it. After
+ * "destroy" returns, the calling thread may assume that no other threads have
+ * a reference to the lock.
+ *
+ * Attemmpting to lock or destroy a lock after reflock_unref_and_destroy() has
+ * been called is invalid and results in undefined behavior. Therefore the user
+ * should use another lock to guarantee that this can't happen.
+ */
+
+typedef struct reflock {
+  volatile long state; /* 32-bit Interlocked APIs operate on `long` values. */
+} reflock_t;
+
+WEPOLL_INTERNAL int reflock_global_init(void);
+
+WEPOLL_INTERNAL void reflock_init(reflock_t* reflock);
+WEPOLL_INTERNAL void reflock_ref(reflock_t* reflock);
+WEPOLL_INTERNAL void reflock_unref(reflock_t* reflock);
+WEPOLL_INTERNAL void reflock_unref_and_destroy(reflock_t* reflock);
+
+#include <stdbool.h>
+
+/* N.b.: the tree functions do not set errno or LastError when they fail. Each
+ * of the API functions has at most one failure mode. It is up to the caller to
+ * set an appropriate error code when necessary. */
+
+typedef struct tree tree_t;
+typedef struct tree_node tree_node_t;
+
+typedef struct tree {
+  tree_node_t* root;
+} tree_t;
+
+typedef struct tree_node {
+  tree_node_t* left;
+  tree_node_t* right;
+  tree_node_t* parent;
+  uintptr_t key;
+  bool red;
+} tree_node_t;
+
+WEPOLL_INTERNAL void tree_init(tree_t* tree);
+WEPOLL_INTERNAL void tree_node_init(tree_node_t* node);
+
+WEPOLL_INTERNAL int tree_add(tree_t* tree, tree_node_t* node, uintptr_t key);
+WEPOLL_INTERNAL void tree_del(tree_t* tree, tree_node_t* node);
+
+WEPOLL_INTERNAL tree_node_t* tree_find(const tree_t* tree, uintptr_t key);
+WEPOLL_INTERNAL tree_node_t* tree_root(const tree_t* tree);
+
+typedef struct ts_tree {
+  tree_t tree;
+  SRWLOCK lock;
+} ts_tree_t;
+
+typedef struct ts_tree_node {
+  tree_node_t tree_node;
+  reflock_t reflock;
+} ts_tree_node_t;
+
+WEPOLL_INTERNAL void ts_tree_init(ts_tree_t* rtl);
+WEPOLL_INTERNAL void ts_tree_node_init(ts_tree_node_t* node);
+
+WEPOLL_INTERNAL int ts_tree_add(ts_tree_t* ts_tree,
+                                ts_tree_node_t* node,
+                                uintptr_t key);
+
+WEPOLL_INTERNAL ts_tree_node_t* ts_tree_del_and_ref(ts_tree_t* ts_tree,
+                                                    uintptr_t key);
+WEPOLL_INTERNAL ts_tree_node_t* ts_tree_find_and_ref(ts_tree_t* ts_tree,
+                                                     uintptr_t key);
+
+WEPOLL_INTERNAL void ts_tree_node_unref(ts_tree_node_t* node);
+WEPOLL_INTERNAL void ts_tree_node_unref_and_destroy(ts_tree_node_t* node);
+
+static ts_tree_t epoll__handle_tree;
+
+int epoll_global_init(void) {
+  ts_tree_init(&epoll__handle_tree);
+  return 0;
+}
+
+static HANDLE epoll__create(void) {
+  port_state_t* port_state;
+  HANDLE ephnd;
+  ts_tree_node_t* tree_node;
+
+  if (init() < 0)
+    return NULL;
+
+  port_state = port_new(&ephnd);
+  if (port_state == NULL)
+    return NULL;
+
+  tree_node = port_state_to_handle_tree_node(port_state);
+  if (ts_tree_add(&epoll__handle_tree, tree_node, (uintptr_t) ephnd) < 0) {
+    /* This should never happen. */
+    port_delete(port_state);
+    return_set_error(NULL, ERROR_ALREADY_EXISTS);
+  }
+
+  return ephnd;
+}
+
+HANDLE epoll_create(int size) {
+  if (size <= 0)
+    return_set_error(NULL, ERROR_INVALID_PARAMETER);
+
+  return epoll__create();
+}
+
+HANDLE epoll_create1(int flags) {
+  if (flags != 0)
+    return_set_error(NULL, ERROR_INVALID_PARAMETER);
+
+  return epoll__create();
+}
+
+int epoll_close(HANDLE ephnd) {
+  ts_tree_node_t* tree_node;
+  port_state_t* port_state;
+
+  if (init() < 0)
+    return -1;
+
+  tree_node = ts_tree_del_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
+  if (tree_node == NULL) {
+    err_set_win_error(ERROR_INVALID_PARAMETER);
+    goto err;
+  }
+
+  port_state = port_state_from_handle_tree_node(tree_node);
+  port_close(port_state);
+
+  ts_tree_node_unref_and_destroy(tree_node);
+
+  return port_delete(port_state);
+
+err:
+  err_check_handle(ephnd);
+  return -1;
+}
+
+int epoll_ctl(HANDLE ephnd, int op, SOCKET sock, struct epoll_event* ev) {
+  ts_tree_node_t* tree_node;
+  port_state_t* port_state;
+  int r;
+
+  if (init() < 0)
+    return -1;
+
+  tree_node = ts_tree_find_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
+  if (tree_node == NULL) {
+    err_set_win_error(ERROR_INVALID_PARAMETER);
+    goto err;
+  }
+
+  port_state = port_state_from_handle_tree_node(tree_node);
+  r = port_ctl(port_state, op, sock, ev);
+
+  ts_tree_node_unref(tree_node);
+
+  if (r < 0)
+    goto err;
+
+  return 0;
+
+err:
+  /* On Linux, in the case of epoll_ctl(), EBADF takes priority over other
+   * errors. Wepoll mimics this behavior. */
+  err_check_handle(ephnd);
+  err_check_handle((HANDLE) sock);
+  return -1;
+}
+
+int epoll_wait(HANDLE ephnd,
+               struct epoll_event* events,
+               int maxevents,
+               int timeout) {
+  ts_tree_node_t* tree_node;
+  port_state_t* port_state;
+  int num_events;
+
+  if (maxevents <= 0)
+    return_set_error(-1, ERROR_INVALID_PARAMETER);
+
+  if (init() < 0)
+    return -1;
+
+  tree_node = ts_tree_find_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
+  if (tree_node == NULL) {
+    err_set_win_error(ERROR_INVALID_PARAMETER);
+    goto err;
+  }
+
+  port_state = port_state_from_handle_tree_node(tree_node);
+  num_events = port_wait(port_state, events, maxevents, timeout);
+
+  ts_tree_node_unref(tree_node);
+
+  if (num_events < 0)
+    goto err;
+
+  return num_events;
+
+err:
+  err_check_handle(ephnd);
+  return -1;
+}
+
+#include <errno.h>
+
+#define ERR__ERRNO_MAPPINGS(X)               \
+  X(ERROR_ACCESS_DENIED, EACCES)             \
+  X(ERROR_ALREADY_EXISTS, EEXIST)            \
+  X(ERROR_BAD_COMMAND, EACCES)               \
+  X(ERROR_BAD_EXE_FORMAT, ENOEXEC)           \
+  X(ERROR_BAD_LENGTH, EACCES)                \
+  X(ERROR_BAD_NETPATH, ENOENT)               \
+  X(ERROR_BAD_NET_NAME, ENOENT)              \
+  X(ERROR_BAD_NET_RESP, ENETDOWN)            \
+  X(ERROR_BAD_PATHNAME, ENOENT)              \
+  X(ERROR_BROKEN_PIPE, EPIPE)                \
+  X(ERROR_CANNOT_MAKE, EACCES)               \
+  X(ERROR_COMMITMENT_LIMIT, ENOMEM)          \
+  X(ERROR_CONNECTION_ABORTED, ECONNABORTED)  \
+  X(ERROR_CONNECTION_ACTIVE, EISCONN)        \
+  X(ERROR_CONNECTION_REFUSED, ECONNREFUSED)  \
+  X(ERROR_CRC, EACCES)                       \
+  X(ERROR_DIR_NOT_EMPTY, ENOTEMPTY)          \
+  X(ERROR_DISK_FULL, ENOSPC)                 \
+  X(ERROR_DUP_NAME, EADDRINUSE)              \
+  X(ERROR_FILENAME_EXCED_RANGE, ENOENT)      \
+  X(ERROR_FILE_NOT_FOUND, ENOENT)            \
+  X(ERROR_GEN_FAILURE, EACCES)               \
+  X(ERROR_GRACEFUL_DISCONNECT, EPIPE)        \
+  X(ERROR_HOST_DOWN, EHOSTUNREACH)           \
+  X(ERROR_HOST_UNREACHABLE, EHOSTUNREACH)    \
+  X(ERROR_INSUFFICIENT_BUFFER, EFAULT)       \
+  X(ERROR_INVALID_ADDRESS, EADDRNOTAVAIL)    \
+  X(ERROR_INVALID_FUNCTION, EINVAL)          \
+  X(ERROR_INVALID_HANDLE, EBADF)             \
+  X(ERROR_INVALID_NETNAME, EADDRNOTAVAIL)    \
+  X(ERROR_INVALID_PARAMETER, EINVAL)         \
+  X(ERROR_INVALID_USER_BUFFER, EMSGSIZE)     \
+  X(ERROR_IO_PENDING, EINPROGRESS)           \
+  X(ERROR_LOCK_VIOLATION, EACCES)            \
+  X(ERROR_MORE_DATA, EMSGSIZE)               \
+  X(ERROR_NETNAME_DELETED, ECONNABORTED)     \
+  X(ERROR_NETWORK_ACCESS_DENIED, EACCES)     \
+  X(ERROR_NETWORK_BUSY, ENETDOWN)            \
+  X(ERROR_NETWORK_UNREACHABLE, ENETUNREACH)  \
+  X(ERROR_NOACCESS, EFAULT)                  \
+  X(ERROR_NONPAGED_SYSTEM_RESOURCES, ENOMEM) \
+  X(ERROR_NOT_ENOUGH_MEMORY, ENOMEM)         \
+  X(ERROR_NOT_ENOUGH_QUOTA, ENOMEM)          \
+  X(ERROR_NOT_FOUND, ENOENT)                 \
+  X(ERROR_NOT_LOCKED, EACCES)                \
+  X(ERROR_NOT_READY, EACCES)                 \
+  X(ERROR_NOT_SAME_DEVICE, EXDEV)            \
+  X(ERROR_NOT_SUPPORTED, ENOTSUP)            \
+  X(ERROR_NO_MORE_FILES, ENOENT)             \
+  X(ERROR_NO_SYSTEM_RESOURCES, ENOMEM)       \
+  X(ERROR_OPERATION_ABORTED, EINTR)          \
+  X(ERROR_OUT_OF_PAPER, EACCES)              \
+  X(ERROR_PAGED_SYSTEM_RESOURCES, ENOMEM)    \
+  X(ERROR_PAGEFILE_QUOTA, ENOMEM)            \
+  X(ERROR_PATH_NOT_FOUND, ENOENT)            \
+  X(ERROR_PIPE_NOT_CONNECTED, EPIPE)         \
+  X(ERROR_PORT_UNREACHABLE, ECONNRESET)      \
+  X(ERROR_PROTOCOL_UNREACHABLE, ENETUNREACH) \
+  X(ERROR_REM_NOT_LIST, ECONNREFUSED)        \
+  X(ERROR_REQUEST_ABORTED, EINTR)            \
+  X(ERROR_REQ_NOT_ACCEP, EWOULDBLOCK)        \
+  X(ERROR_SECTOR_NOT_FOUND, EACCES)          \
+  X(ERROR_SEM_TIMEOUT, ETIMEDOUT)            \
+  X(ERROR_SHARING_VIOLATION, EACCES)         \
+  X(ERROR_TOO_MANY_NAMES, ENOMEM)            \
+  X(ERROR_TOO_MANY_OPEN_FILES, EMFILE)       \
+  X(ERROR_UNEXP_NET_ERR, ECONNABORTED)       \
+  X(ERROR_WAIT_NO_CHILDREN, ECHILD)          \
+  X(ERROR_WORKING_SET_QUOTA, ENOMEM)         \
+  X(ERROR_WRITE_PROTECT, EACCES)             \
+  X(ERROR_WRONG_DISK, EACCES)                \
+  X(WSAEACCES, EACCES)                       \
+  X(WSAEADDRINUSE, EADDRINUSE)               \
+  X(WSAEADDRNOTAVAIL, EADDRNOTAVAIL)         \
+  X(WSAEAFNOSUPPORT, EAFNOSUPPORT)           \
+  X(WSAECONNABORTED, ECONNABORTED)           \
+  X(WSAECONNREFUSED, ECONNREFUSED)           \
+  X(WSAECONNRESET, ECONNRESET)               \
+  X(WSAEDISCON, EPIPE)                       \
+  X(WSAEFAULT, EFAULT)                       \
+  X(WSAEHOSTDOWN, EHOSTUNREACH)              \
+  X(WSAEHOSTUNREACH, EHOSTUNREACH)           \
+  X(WSAEINPROGRESS, EBUSY)                   \
+  X(WSAEINTR, EINTR)                         \
+  X(WSAEINVAL, EINVAL)                       \
+  X(WSAEISCONN, EISCONN)                     \
+  X(WSAEMSGSIZE, EMSGSIZE)                   \
+  X(WSAENETDOWN, ENETDOWN)                   \
+  X(WSAENETRESET, EHOSTUNREACH)              \
+  X(WSAENETUNREACH, ENETUNREACH)             \
+  X(WSAENOBUFS, ENOMEM)                      \
+  X(WSAENOTCONN, ENOTCONN)                   \
+  X(WSAENOTSOCK, ENOTSOCK)                   \
+  X(WSAEOPNOTSUPP, EOPNOTSUPP)               \
+  X(WSAEPROCLIM, ENOMEM)                     \
+  X(WSAESHUTDOWN, EPIPE)                     \
+  X(WSAETIMEDOUT, ETIMEDOUT)                 \
+  X(WSAEWOULDBLOCK, EWOULDBLOCK)             \
+  X(WSANOTINITIALISED, ENETDOWN)             \
+  X(WSASYSNOTREADY, ENETDOWN)                \
+  X(WSAVERNOTSUPPORTED, ENOSYS)
+
+static errno_t err__map_win_error_to_errno(DWORD error) {
+  switch (error) {
+#define X(error_sym, errno_sym) \
+  case error_sym:               \
+    return errno_sym;
+    ERR__ERRNO_MAPPINGS(X)
+#undef X
+  }
+  return EINVAL;
+}
+
+void err_map_win_error(void) {
+  errno = err__map_win_error_to_errno(GetLastError());
+}
+
+void err_set_win_error(DWORD error) {
+  SetLastError(error);
+  errno = err__map_win_error_to_errno(error);
+}
+
+int err_check_handle(HANDLE handle) {
+  DWORD flags;
+
+  /* GetHandleInformation() succeeds when passed INVALID_HANDLE_VALUE, so check
+   * for this condition explicitly. */
+  if (handle == INVALID_HANDLE_VALUE)
+    return_set_error(-1, ERROR_INVALID_HANDLE);
+
+  if (!GetHandleInformation(handle, &flags))
+    return_map_error(-1);
+
+  return 0;
+}
+
+#include <stddef.h>
+
+#define array_count(a) (sizeof(a) / (sizeof((a)[0])))
+
+#define container_of(ptr, type, member) \
+  ((type*) ((uintptr_t) (ptr) - offsetof(type, member)))
+
+#define unused_var(v) ((void) (v))
+
+/* Polyfill `inline` for older versions of msvc (up to Visual Studio 2013) */
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define inline __inline
+#endif
+
+WEPOLL_INTERNAL int ws_global_init(void);
+WEPOLL_INTERNAL SOCKET ws_get_base_socket(SOCKET socket);
+
+static bool init__done = false;
+static INIT_ONCE init__once = INIT_ONCE_STATIC_INIT;
+
+static BOOL CALLBACK init__once_callback(INIT_ONCE* once,
+                                         void* parameter,
+                                         void** context) {
+  unused_var(once);
+  unused_var(parameter);
+  unused_var(context);
+
+  /* N.b. that initialization order matters here. */
+  if (ws_global_init() < 0 || nt_global_init() < 0 ||
+      reflock_global_init() < 0 || epoll_global_init() < 0)
+    return FALSE;
+
+  init__done = true;
+  return TRUE;
+}
+
+int init(void) {
+  if (!init__done &&
+      !InitOnceExecuteOnce(&init__once, init__once_callback, NULL, NULL))
+    /* `InitOnceExecuteOnce()` itself is infallible, and it doesn't set any
+     * error code when the once-callback returns FALSE. We return -1 here to
+     * indicate that global initialization failed; the failing init function is
+     * resposible for setting `errno` and calling `SetLastError()`. */
+    return -1;
+
+  return 0;
+}
+
+/* Set up a workaround for the following problem:
+ *   FARPROC addr = GetProcAddress(...);
+ *   MY_FUNC func = (MY_FUNC) addr;          <-- GCC 8 warning/error.
+ *   MY_FUNC func = (MY_FUNC) (void*) addr;  <-- MSVC  warning/error.
+ * To compile cleanly with either compiler, do casts with this "bridge" type:
+ *   MY_FUNC func = (MY_FUNC) (nt__fn_ptr_cast_t) addr; */
+#ifdef __GNUC__
+typedef void* nt__fn_ptr_cast_t;
+#else
+typedef FARPROC nt__fn_ptr_cast_t;
+#endif
+
+#define X(return_type, attributes, name, parameters) \
+  WEPOLL_INTERNAL return_type(attributes* name) parameters = NULL;
+NT_NTDLL_IMPORT_LIST(X)
+#undef X
+
+int nt_global_init(void) {
+  HMODULE ntdll;
+  FARPROC fn_ptr;
+
+  ntdll = GetModuleHandleW(L"ntdll.dll");
+  if (ntdll == NULL)
+    return -1;
+
+#define X(return_type, attributes, name, parameters) \
+  fn_ptr = GetProcAddress(ntdll, #name);             \
+  if (fn_ptr == NULL)                                \
+    return -1;                                       \
+  name = (return_type(attributes*) parameters)(nt__fn_ptr_cast_t) fn_ptr;
+  NT_NTDLL_IMPORT_LIST(X)
+#undef X
+
+  return 0;
+}
+
+#include <string.h>
+
+typedef struct poll_group poll_group_t;
+
+typedef struct queue_node queue_node_t;
+
+WEPOLL_INTERNAL poll_group_t* poll_group_acquire(port_state_t* port);
+WEPOLL_INTERNAL void poll_group_release(poll_group_t* poll_group);
+
+WEPOLL_INTERNAL void poll_group_delete(poll_group_t* poll_group);
+
+WEPOLL_INTERNAL poll_group_t* poll_group_from_queue_node(
+    queue_node_t* queue_node);
+WEPOLL_INTERNAL HANDLE
+    poll_group_get_afd_device_handle(poll_group_t* poll_group);
+
+typedef struct queue_node {
+  queue_node_t* prev;
+  queue_node_t* next;
+} queue_node_t;
+
+typedef struct queue {
+  queue_node_t head;
+} queue_t;
+
+WEPOLL_INTERNAL void queue_init(queue_t* queue);
+WEPOLL_INTERNAL void queue_node_init(queue_node_t* node);
+
+WEPOLL_INTERNAL queue_node_t* queue_first(const queue_t* queue);
+WEPOLL_INTERNAL queue_node_t* queue_last(const queue_t* queue);
+
+WEPOLL_INTERNAL void queue_prepend(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_append(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_move_to_start(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_move_to_end(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_remove(queue_node_t* node);
+
+WEPOLL_INTERNAL bool queue_is_empty(const queue_t* queue);
+WEPOLL_INTERNAL bool queue_is_enqueued(const queue_node_t* node);
+
+#define POLL_GROUP__MAX_GROUP_SIZE 32
+
+typedef struct poll_group {
+  port_state_t* port_state;
+  queue_node_t queue_node;
+  HANDLE afd_device_handle;
+  size_t group_size;
+} poll_group_t;
+
+static poll_group_t* poll_group__new(port_state_t* port_state) {
+  HANDLE iocp_handle = port_get_iocp_handle(port_state);
+  queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
+
+  poll_group_t* poll_group = malloc(sizeof *poll_group);
+  if (poll_group == NULL)
+    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
+
+  memset(poll_group, 0, sizeof *poll_group);
+
+  queue_node_init(&poll_group->queue_node);
+  poll_group->port_state = port_state;
+
+  if (afd_create_device_handle(iocp_handle, &poll_group->afd_device_handle) <
+      0) {
+    free(poll_group);
+    return NULL;
+  }
+
+  queue_append(poll_group_queue, &poll_group->queue_node);
+
+  return poll_group;
+}
+
+void poll_group_delete(poll_group_t* poll_group) {
+  assert(poll_group->group_size == 0);
+  CloseHandle(poll_group->afd_device_handle);
+  queue_remove(&poll_group->queue_node);
+  free(poll_group);
+}
+
+poll_group_t* poll_group_from_queue_node(queue_node_t* queue_node) {
+  return container_of(queue_node, poll_group_t, queue_node);
+}
+
+HANDLE poll_group_get_afd_device_handle(poll_group_t* poll_group) {
+  return poll_group->afd_device_handle;
+}
+
+poll_group_t* poll_group_acquire(port_state_t* port_state) {
+  queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
+  poll_group_t* poll_group =
+      !queue_is_empty(poll_group_queue)
+          ? container_of(
+                queue_last(poll_group_queue), poll_group_t, queue_node)
+          : NULL;
+
+  if (poll_group == NULL ||
+      poll_group->group_size >= POLL_GROUP__MAX_GROUP_SIZE)
+    poll_group = poll_group__new(port_state);
+  if (poll_group == NULL)
+    return NULL;
+
+  if (++poll_group->group_size == POLL_GROUP__MAX_GROUP_SIZE)
+    queue_move_to_start(poll_group_queue, &poll_group->queue_node);
+
+  return poll_group;
+}
+
+void poll_group_release(poll_group_t* poll_group) {
+  port_state_t* port_state = poll_group->port_state;
+  queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
+
+  poll_group->group_size--;
+  assert(poll_group->group_size < POLL_GROUP__MAX_GROUP_SIZE);
+
+  queue_move_to_end(poll_group_queue, &poll_group->queue_node);
+
+  /* Poll groups are currently only freed when the epoll port is closed. */
+}
+
+WEPOLL_INTERNAL sock_state_t* sock_new(port_state_t* port_state,
+                                       SOCKET socket);
+WEPOLL_INTERNAL void sock_delete(port_state_t* port_state,
+                                 sock_state_t* sock_state);
+WEPOLL_INTERNAL void sock_force_delete(port_state_t* port_state,
+                                       sock_state_t* sock_state);
+
+WEPOLL_INTERNAL int sock_set_event(port_state_t* port_state,
+                                   sock_state_t* sock_state,
+                                   const struct epoll_event* ev);
+
+WEPOLL_INTERNAL int sock_update(port_state_t* port_state,
+                                sock_state_t* sock_state);
+WEPOLL_INTERNAL int sock_feed_event(port_state_t* port_state,
+                                    IO_STATUS_BLOCK* io_status_block,
+                                    struct epoll_event* ev);
+
+WEPOLL_INTERNAL sock_state_t* sock_state_from_queue_node(
+    queue_node_t* queue_node);
+WEPOLL_INTERNAL queue_node_t* sock_state_to_queue_node(
+    sock_state_t* sock_state);
+WEPOLL_INTERNAL sock_state_t* sock_state_from_tree_node(
+    tree_node_t* tree_node);
+WEPOLL_INTERNAL tree_node_t* sock_state_to_tree_node(sock_state_t* sock_state);
+
+#define PORT__MAX_ON_STACK_COMPLETIONS 256
+
+typedef struct port_state {
+  HANDLE iocp_handle;
+  tree_t sock_tree;
+  queue_t sock_update_queue;
+  queue_t sock_deleted_queue;
+  queue_t poll_group_queue;
+  ts_tree_node_t handle_tree_node;
+  CRITICAL_SECTION lock;
+  size_t active_poll_count;
+} port_state_t;
+
+static inline port_state_t* port__alloc(void) {
+  port_state_t* port_state = malloc(sizeof *port_state);
+  if (port_state == NULL)
+    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
+
+  return port_state;
+}
+
+static inline void port__free(port_state_t* port) {
+  assert(port != NULL);
+  free(port);
+}
+
+static inline HANDLE port__create_iocp(void) {
+  HANDLE iocp_handle =
+      CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
+  if (iocp_handle == NULL)
+    return_map_error(NULL);
+
+  return iocp_handle;
+}
+
+port_state_t* port_new(HANDLE* iocp_handle_out) {
+  port_state_t* port_state;
+  HANDLE iocp_handle;
+
+  port_state = port__alloc();
+  if (port_state == NULL)
+    goto err1;
+
+  iocp_handle = port__create_iocp();
+  if (iocp_handle == NULL)
+    goto err2;
+
+  memset(port_state, 0, sizeof *port_state);
+
+  port_state->iocp_handle = iocp_handle;
+  tree_init(&port_state->sock_tree);
+  queue_init(&port_state->sock_update_queue);
+  queue_init(&port_state->sock_deleted_queue);
+  queue_init(&port_state->poll_group_queue);
+  ts_tree_node_init(&port_state->handle_tree_node);
+  InitializeCriticalSection(&port_state->lock);
+
+  *iocp_handle_out = iocp_handle;
+  return port_state;
+
+err2:
+  port__free(port_state);
+err1:
+  return NULL;
+}
+
+static inline int port__close_iocp(port_state_t* port_state) {
+  HANDLE iocp_handle = port_state->iocp_handle;
+  port_state->iocp_handle = NULL;
+
+  if (!CloseHandle(iocp_handle))
+    return_map_error(-1);
+
+  return 0;
+}
+
+int port_close(port_state_t* port_state) {
+  int result;
+
+  EnterCriticalSection(&port_state->lock);
+  result = port__close_iocp(port_state);
+  LeaveCriticalSection(&port_state->lock);
+
+  return result;
+}
+
+int port_delete(port_state_t* port_state) {
+  tree_node_t* tree_node;
+  queue_node_t* queue_node;
+
+  /* At this point the IOCP port should have been closed. */
+  assert(port_state->iocp_handle == NULL);
+
+  while ((tree_node = tree_root(&port_state->sock_tree)) != NULL) {
+    sock_state_t* sock_state = sock_state_from_tree_node(tree_node);
+    sock_force_delete(port_state, sock_state);
+  }
+
+  while ((queue_node = queue_first(&port_state->sock_deleted_queue)) != NULL) {
+    sock_state_t* sock_state = sock_state_from_queue_node(queue_node);
+    sock_force_delete(port_state, sock_state);
+  }
+
+  while ((queue_node = queue_first(&port_state->poll_group_queue)) != NULL) {
+    poll_group_t* poll_group = poll_group_from_queue_node(queue_node);
+    poll_group_delete(poll_group);
+  }
+
+  assert(queue_is_empty(&port_state->sock_update_queue));
+
+  DeleteCriticalSection(&port_state->lock);
+
+  port__free(port_state);
+
+  return 0;
+}
+
+static int port__update_events(port_state_t* port_state) {
+  queue_t* sock_update_queue = &port_state->sock_update_queue;
+
+  /* Walk the queue, submitting new poll requests for every socket that needs
+   * it. */
+  while (!queue_is_empty(sock_update_queue)) {
+    queue_node_t* queue_node = queue_first(sock_update_queue);
+    sock_state_t* sock_state = sock_state_from_queue_node(queue_node);
+
+    if (sock_update(port_state, sock_state) < 0)
+      return -1;
+
+    /* sock_update() removes the socket from the update queue. */
+  }
+
+  return 0;
+}
+
+static inline void port__update_events_if_polling(port_state_t* port_state) {
+  if (port_state->active_poll_count > 0)
+    port__update_events(port_state);
+}
+
+static inline int port__feed_events(port_state_t* port_state,
+                                    struct epoll_event* epoll_events,
+                                    OVERLAPPED_ENTRY* iocp_events,
+                                    DWORD iocp_event_count) {
+  int epoll_event_count = 0;
+  DWORD i;
+
+  for (i = 0; i < iocp_event_count; i++) {
+    IO_STATUS_BLOCK* io_status_block =
+        (IO_STATUS_BLOCK*) iocp_events[i].lpOverlapped;
+    struct epoll_event* ev = &epoll_events[epoll_event_count];
+
+    epoll_event_count += sock_feed_event(port_state, io_status_block, ev);
+  }
+
+  return epoll_event_count;
+}
+
+static inline int port__poll(port_state_t* port_state,
+                             struct epoll_event* epoll_events,
+                             OVERLAPPED_ENTRY* iocp_events,
+                             DWORD maxevents,
+                             DWORD timeout) {
+  DWORD completion_count;
+
+  if (port__update_events(port_state) < 0)
+    return -1;
+
+  port_state->active_poll_count++;
+
+  LeaveCriticalSection(&port_state->lock);
+
+  BOOL r = GetQueuedCompletionStatusEx(port_state->iocp_handle,
+                                       iocp_events,
+                                       maxevents,
+                                       &completion_count,
+                                       timeout,
+                                       FALSE);
+
+  EnterCriticalSection(&port_state->lock);
+
+  port_state->active_poll_count--;
+
+  if (!r)
+    return_map_error(-1);
+
+  return port__feed_events(
+      port_state, epoll_events, iocp_events, completion_count);
+}
+
+int port_wait(port_state_t* port_state,
+              struct epoll_event* events,
+              int maxevents,
+              int timeout) {
+  OVERLAPPED_ENTRY stack_iocp_events[PORT__MAX_ON_STACK_COMPLETIONS];
+  OVERLAPPED_ENTRY* iocp_events;
+  uint64_t due = 0;
+  DWORD gqcs_timeout;
+  int result;
+
+  /* Check whether `maxevents` is in range. */
+  if (maxevents <= 0)
+    return_set_error(-1, ERROR_INVALID_PARAMETER);
+
+  /* Decide whether the IOCP completion list can live on the stack, or allocate
+   * memory for it on the heap. */
+  if ((size_t) maxevents <= array_count(stack_iocp_events)) {
+    iocp_events = stack_iocp_events;
+  } else if ((iocp_events =
+                  malloc((size_t) maxevents * sizeof *iocp_events)) == NULL) {
+    iocp_events = stack_iocp_events;
+    maxevents = array_count(stack_iocp_events);
+  }
+
+  /* Compute the timeout for GetQueuedCompletionStatus, and the wait end
+   * time, if the user specified a timeout other than zero or infinite. */
+  if (timeout > 0) {
+    due = GetTickCount64() + (uint64_t) timeout;
+    gqcs_timeout = (DWORD) timeout;
+  } else if (timeout == 0) {
+    gqcs_timeout = 0;
+  } else {
+    gqcs_timeout = INFINITE;
+  }
+
+  EnterCriticalSection(&port_state->lock);
+
+  /* Dequeue completion packets until either at least one interesting event
+   * has been discovered, or the timeout is reached. */
+  for (;;) {
+    uint64_t now;
+
+    result = port__poll(
+        port_state, events, iocp_events, (DWORD) maxevents, gqcs_timeout);
+    if (result < 0 || result > 0)
+      break; /* Result, error, or time-out. */
+
+    if (timeout < 0)
+      continue; /* When timeout is negative, never time out. */
+
+    /* Update time. */
+    now = GetTickCount64();
+
+    /* Do not allow the due time to be in the past. */
+    if (now >= due) {
+      SetLastError(WAIT_TIMEOUT);
+      break;
+    }
+
+    /* Recompute time-out argument for GetQueuedCompletionStatus. */
+    gqcs_timeout = (DWORD)(due - now);
+  }
+
+  port__update_events_if_polling(port_state);
+
+  LeaveCriticalSection(&port_state->lock);
+
+  if (iocp_events != stack_iocp_events)
+    free(iocp_events);
+
+  if (result >= 0)
+    return result;
+  else if (GetLastError() == WAIT_TIMEOUT)
+    return 0;
+  else
+    return -1;
+}
+
+static inline int port__ctl_add(port_state_t* port_state,
+                                SOCKET sock,
+                                struct epoll_event* ev) {
+  sock_state_t* sock_state = sock_new(port_state, sock);
+  if (sock_state == NULL)
+    return -1;
+
+  if (sock_set_event(port_state, sock_state, ev) < 0) {
+    sock_delete(port_state, sock_state);
+    return -1;
+  }
+
+  port__update_events_if_polling(port_state);
+
+  return 0;
+}
+
+static inline int port__ctl_mod(port_state_t* port_state,
+                                SOCKET sock,
+                                struct epoll_event* ev) {
+  sock_state_t* sock_state = port_find_socket(port_state, sock);
+  if (sock_state == NULL)
+    return -1;
+
+  if (sock_set_event(port_state, sock_state, ev) < 0)
+    return -1;
+
+  port__update_events_if_polling(port_state);
+
+  return 0;
+}
+
+static inline int port__ctl_del(port_state_t* port_state, SOCKET sock) {
+  sock_state_t* sock_state = port_find_socket(port_state, sock);
+  if (sock_state == NULL)
+    return -1;
+
+  sock_delete(port_state, sock_state);
+
+  return 0;
+}
+
+static inline int port__ctl_op(port_state_t* port_state,
+                               int op,
+                               SOCKET sock,
+                               struct epoll_event* ev) {
+  switch (op) {
+    case EPOLL_CTL_ADD:
+      return port__ctl_add(port_state, sock, ev);
+    case EPOLL_CTL_MOD:
+      return port__ctl_mod(port_state, sock, ev);
+    case EPOLL_CTL_DEL:
+      return port__ctl_del(port_state, sock);
+    default:
+      return_set_error(-1, ERROR_INVALID_PARAMETER);
+  }
+}
+
+int port_ctl(port_state_t* port_state,
+             int op,
+             SOCKET sock,
+             struct epoll_event* ev) {
+  int result;
+
+  EnterCriticalSection(&port_state->lock);
+  result = port__ctl_op(port_state, op, sock, ev);
+  LeaveCriticalSection(&port_state->lock);
+
+  return result;
+}
+
+int port_register_socket(port_state_t* port_state,
+                         sock_state_t* sock_state,
+                         SOCKET socket) {
+  if (tree_add(&port_state->sock_tree,
+               sock_state_to_tree_node(sock_state),
+               socket) < 0)
+    return_set_error(-1, ERROR_ALREADY_EXISTS);
+  return 0;
+}
+
+void port_unregister_socket(port_state_t* port_state,
+                            sock_state_t* sock_state) {
+  tree_del(&port_state->sock_tree, sock_state_to_tree_node(sock_state));
+}
+
+sock_state_t* port_find_socket(port_state_t* port_state, SOCKET socket) {
+  tree_node_t* tree_node = tree_find(&port_state->sock_tree, socket);
+  if (tree_node == NULL)
+    return_set_error(NULL, ERROR_NOT_FOUND);
+  return sock_state_from_tree_node(tree_node);
+}
+
+void port_request_socket_update(port_state_t* port_state,
+                                sock_state_t* sock_state) {
+  if (queue_is_enqueued(sock_state_to_queue_node(sock_state)))
+    return;
+  queue_append(&port_state->sock_update_queue,
+               sock_state_to_queue_node(sock_state));
+}
+
+void port_cancel_socket_update(port_state_t* port_state,
+                               sock_state_t* sock_state) {
+  unused_var(port_state);
+  if (!queue_is_enqueued(sock_state_to_queue_node(sock_state)))
+    return;
+  queue_remove(sock_state_to_queue_node(sock_state));
+}
+
+void port_add_deleted_socket(port_state_t* port_state,
+                             sock_state_t* sock_state) {
+  if (queue_is_enqueued(sock_state_to_queue_node(sock_state)))
+    return;
+  queue_append(&port_state->sock_deleted_queue,
+               sock_state_to_queue_node(sock_state));
+}
+
+void port_remove_deleted_socket(port_state_t* port_state,
+                                sock_state_t* sock_state) {
+  unused_var(port_state);
+  if (!queue_is_enqueued(sock_state_to_queue_node(sock_state)))
+    return;
+  queue_remove(sock_state_to_queue_node(sock_state));
+}
+
+HANDLE port_get_iocp_handle(port_state_t* port_state) {
+  assert(port_state->iocp_handle != NULL);
+  return port_state->iocp_handle;
+}
+
+queue_t* port_get_poll_group_queue(port_state_t* port_state) {
+  return &port_state->poll_group_queue;
+}
+
+port_state_t* port_state_from_handle_tree_node(ts_tree_node_t* tree_node) {
+  return container_of(tree_node, port_state_t, handle_tree_node);
+}
+
+ts_tree_node_t* port_state_to_handle_tree_node(port_state_t* port_state) {
+  return &port_state->handle_tree_node;
+}
+
+void queue_init(queue_t* queue) {
+  queue_node_init(&queue->head);
+}
+
+void queue_node_init(queue_node_t* node) {
+  node->prev = node;
+  node->next = node;
+}
+
+static inline void queue__detach_node(queue_node_t* node) {
+  node->prev->next = node->next;
+  node->next->prev = node->prev;
+}
+
+queue_node_t* queue_first(const queue_t* queue) {
+  return !queue_is_empty(queue) ? queue->head.next : NULL;
+}
+
+queue_node_t* queue_last(const queue_t* queue) {
+  return !queue_is_empty(queue) ? queue->head.prev : NULL;
+}
+
+void queue_prepend(queue_t* queue, queue_node_t* node) {
+  node->next = queue->head.next;
+  node->prev = &queue->head;
+  node->next->prev = node;
+  queue->head.next = node;
+}
+
+void queue_append(queue_t* queue, queue_node_t* node) {
+  node->next = &queue->head;
+  node->prev = queue->head.prev;
+  node->prev->next = node;
+  queue->head.prev = node;
+}
+
+void queue_move_to_start(queue_t* queue, queue_node_t* node) {
+  queue__detach_node(node);
+  queue_prepend(queue, node);
+}
+
+void queue_move_to_end(queue_t* queue, queue_node_t* node) {
+  queue__detach_node(node);
+  queue_append(queue, node);
+}
+
+void queue_remove(queue_node_t* node) {
+  queue__detach_node(node);
+  queue_node_init(node);
+}
+
+bool queue_is_empty(const queue_t* queue) {
+  return !queue_is_enqueued(&queue->head);
+}
+
+bool queue_is_enqueued(const queue_node_t* node) {
+  return node->prev != node;
+}
+
+#define REFLOCK__REF          ((long) 0x00000001UL)
+#define REFLOCK__REF_MASK     ((long) 0x0fffffffUL)
+#define REFLOCK__DESTROY      ((long) 0x10000000UL)
+#define REFLOCK__DESTROY_MASK ((long) 0xf0000000UL)
+#define REFLOCK__POISON       ((long) 0x300dead0UL)
+
+static HANDLE reflock__keyed_event = NULL;
+
+int reflock_global_init(void) {
+  NTSTATUS status = NtCreateKeyedEvent(
+      &reflock__keyed_event, KEYEDEVENT_ALL_ACCESS, NULL, 0);
+  if (status != STATUS_SUCCESS)
+    return_set_error(-1, RtlNtStatusToDosError(status));
+  return 0;
+}
+
+void reflock_init(reflock_t* reflock) {
+  reflock->state = 0;
+}
+
+static void reflock__signal_event(void* address) {
+  NTSTATUS status =
+      NtReleaseKeyedEvent(reflock__keyed_event, address, FALSE, NULL);
+  if (status != STATUS_SUCCESS)
+    abort();
+}
+
+static void reflock__await_event(void* address) {
+  NTSTATUS status =
+      NtWaitForKeyedEvent(reflock__keyed_event, address, FALSE, NULL);
+  if (status != STATUS_SUCCESS)
+    abort();
+}
+
+void reflock_ref(reflock_t* reflock) {
+  long state = InterlockedAdd(&reflock->state, REFLOCK__REF);
+
+  /* Verify that the counter didn't overflow and the lock isn't destroyed. */
+  assert((state & REFLOCK__DESTROY_MASK) == 0);
+  unused_var(state);
+}
+
+void reflock_unref(reflock_t* reflock) {
+  long state = InterlockedAdd(&reflock->state, -REFLOCK__REF);
+
+  /* Verify that the lock was referenced and not already destroyed. */
+  assert((state & REFLOCK__DESTROY_MASK & ~REFLOCK__DESTROY) == 0);
+
+  if (state == REFLOCK__DESTROY)
+    reflock__signal_event(reflock);
+}
+
+void reflock_unref_and_destroy(reflock_t* reflock) {
+  long state =
+      InterlockedAdd(&reflock->state, REFLOCK__DESTROY - REFLOCK__REF);
+  long ref_count = state & REFLOCK__REF_MASK;
+
+  /* Verify that the lock was referenced and not already destroyed. */
+  assert((state & REFLOCK__DESTROY_MASK) == REFLOCK__DESTROY);
+
+  if (ref_count != 0)
+    reflock__await_event(reflock);
+
+  state = InterlockedExchange(&reflock->state, REFLOCK__POISON);
+  assert(state == REFLOCK__DESTROY);
+}
+
+#define SOCK__KNOWN_EPOLL_EVENTS                                       \
+  (EPOLLIN | EPOLLPRI | EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLRDNORM | \
+   EPOLLRDBAND | EPOLLWRNORM | EPOLLWRBAND | EPOLLMSG | EPOLLRDHUP)
+
+typedef enum sock__poll_status {
+  SOCK__POLL_IDLE = 0,
+  SOCK__POLL_PENDING,
+  SOCK__POLL_CANCELLED
+} sock__poll_status_t;
+
+typedef struct sock_state {
+  IO_STATUS_BLOCK io_status_block;
+  AFD_POLL_INFO poll_info;
+  queue_node_t queue_node;
+  tree_node_t tree_node;
+  poll_group_t* poll_group;
+  SOCKET base_socket;
+  epoll_data_t user_data;
+  uint32_t user_events;
+  uint32_t pending_events;
+  sock__poll_status_t poll_status;
+  bool delete_pending;
+} sock_state_t;
+
+static inline sock_state_t* sock__alloc(void) {
+  sock_state_t* sock_state = malloc(sizeof *sock_state);
+  if (sock_state == NULL)
+    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
+  return sock_state;
+}
+
+static inline void sock__free(sock_state_t* sock_state) {
+  assert(sock_state != NULL);
+  free(sock_state);
+}
+
+static inline int sock__cancel_poll(sock_state_t* sock_state) {
+  assert(sock_state->poll_status == SOCK__POLL_PENDING);
+
+  if (afd_cancel_poll(poll_group_get_afd_device_handle(sock_state->poll_group),
+                      &sock_state->io_status_block) < 0)
+    return -1;
+
+  sock_state->poll_status = SOCK__POLL_CANCELLED;
+  sock_state->pending_events = 0;
+  return 0;
+}
+
+sock_state_t* sock_new(port_state_t* port_state, SOCKET socket) {
+  SOCKET base_socket;
+  poll_group_t* poll_group;
+  sock_state_t* sock_state;
+
+  if (socket == 0 || socket == INVALID_SOCKET)
+    return_set_error(NULL, ERROR_INVALID_HANDLE);
+
+  base_socket = ws_get_base_socket(socket);
+  if (base_socket == INVALID_SOCKET)
+    return NULL;
+
+  poll_group = poll_group_acquire(port_state);
+  if (poll_group == NULL)
+    return NULL;
+
+  sock_state = sock__alloc();
+  if (sock_state == NULL)
+    goto err1;
+
+  memset(sock_state, 0, sizeof *sock_state);
+
+  sock_state->base_socket = base_socket;
+  sock_state->poll_group = poll_group;
+
+  tree_node_init(&sock_state->tree_node);
+  queue_node_init(&sock_state->queue_node);
+
+  if (port_register_socket(port_state, sock_state, socket) < 0)
+    goto err2;
+
+  return sock_state;
+
+err2:
+  sock__free(sock_state);
+err1:
+  poll_group_release(poll_group);
+
+  return NULL;
+}
+
+static int sock__delete(port_state_t* port_state,
+                        sock_state_t* sock_state,
+                        bool force) {
+  if (!sock_state->delete_pending) {
+    if (sock_state->poll_status == SOCK__POLL_PENDING)
+      sock__cancel_poll(sock_state);
+
+    port_cancel_socket_update(port_state, sock_state);
+    port_unregister_socket(port_state, sock_state);
+
+    sock_state->delete_pending = true;
+  }
+
+  /* If the poll request still needs to complete, the sock_state object can't
+   * be free()d yet. `sock_feed_event()` or `port_close()` will take care
+   * of this later. */
+  if (force || sock_state->poll_status == SOCK__POLL_IDLE) {
+    /* Free the sock_state now. */
+    port_remove_deleted_socket(port_state, sock_state);
+    poll_group_release(sock_state->poll_group);
+    sock__free(sock_state);
+  } else {
+    /* Free the socket later. */
+    port_add_deleted_socket(port_state, sock_state);
+  }
+
+  return 0;
+}
+
+void sock_delete(port_state_t* port_state, sock_state_t* sock_state) {
+  sock__delete(port_state, sock_state, false);
+}
+
+void sock_force_delete(port_state_t* port_state, sock_state_t* sock_state) {
+  sock__delete(port_state, sock_state, true);
+}
+
+int sock_set_event(port_state_t* port_state,
+                   sock_state_t* sock_state,
+                   const struct epoll_event* ev) {
+  /* EPOLLERR and EPOLLHUP are always reported, even when not requested by the
+   * caller. However they are disabled after a event has been reported for a
+   * socket for which the EPOLLONESHOT flag was set. */
+  uint32_t events = ev->events | EPOLLERR | EPOLLHUP;
+
+  sock_state->user_events = events;
+  sock_state->user_data = ev->data;
+
+  if ((events & SOCK__KNOWN_EPOLL_EVENTS & ~sock_state->pending_events) != 0)
+    port_request_socket_update(port_state, sock_state);
+
+  return 0;
+}
+
+static inline DWORD sock__epoll_events_to_afd_events(uint32_t epoll_events) {
+  /* Always monitor for AFD_POLL_LOCAL_CLOSE, which is triggered when the
+   * socket is closed with closesocket() or CloseHandle(). */
+  DWORD afd_events = AFD_POLL_LOCAL_CLOSE;
+
+  if (epoll_events & (EPOLLIN | EPOLLRDNORM))
+    afd_events |= AFD_POLL_RECEIVE | AFD_POLL_ACCEPT;
+  if (epoll_events & (EPOLLPRI | EPOLLRDBAND))
+    afd_events |= AFD_POLL_RECEIVE_EXPEDITED;
+  if (epoll_events & (EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND))
+    afd_events |= AFD_POLL_SEND;
+  if (epoll_events & (EPOLLIN | EPOLLRDNORM | EPOLLRDHUP))
+    afd_events |= AFD_POLL_DISCONNECT;
+  if (epoll_events & EPOLLHUP)
+    afd_events |= AFD_POLL_ABORT;
+  if (epoll_events & EPOLLERR)
+    afd_events |= AFD_POLL_CONNECT_FAIL;
+
+  return afd_events;
+}
+
+static inline uint32_t sock__afd_events_to_epoll_events(DWORD afd_events) {
+  uint32_t epoll_events = 0;
+
+  if (afd_events & (AFD_POLL_RECEIVE | AFD_POLL_ACCEPT))
+    epoll_events |= EPOLLIN | EPOLLRDNORM;
+  if (afd_events & AFD_POLL_RECEIVE_EXPEDITED)
+    epoll_events |= EPOLLPRI | EPOLLRDBAND;
+  if (afd_events & AFD_POLL_SEND)
+    epoll_events |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
+  if (afd_events & AFD_POLL_DISCONNECT)
+    epoll_events |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
+  if (afd_events & AFD_POLL_ABORT)
+    epoll_events |= EPOLLHUP;
+  if (afd_events & AFD_POLL_CONNECT_FAIL)
+    /* Linux reports all these events after connect() has failed. */
+    epoll_events |=
+        EPOLLIN | EPOLLOUT | EPOLLERR | EPOLLRDNORM | EPOLLWRNORM | EPOLLRDHUP;
+
+  return epoll_events;
+}
+
+int sock_update(port_state_t* port_state, sock_state_t* sock_state) {
+  assert(!sock_state->delete_pending);
+
+  if ((sock_state->poll_status == SOCK__POLL_PENDING) &&
+      (sock_state->user_events & SOCK__KNOWN_EPOLL_EVENTS &
+       ~sock_state->pending_events) == 0) {
+    /* All the events the user is interested in are already being monitored by
+     * the pending poll operation. It might spuriously complete because of an
+     * event that we're no longer interested in; when that happens we'll submit
+     * a new poll operation with the updated event mask. */
+
+  } else if (sock_state->poll_status == SOCK__POLL_PENDING) {
+    /* A poll operation is already pending, but it's not monitoring for all the
+     * events that the user is interested in. Therefore, cancel the pending
+     * poll operation; when we receive it's completion package, a new poll
+     * operation will be submitted with the correct event mask. */
+    if (sock__cancel_poll(sock_state) < 0)
+      return -1;
+
+  } else if (sock_state->poll_status == SOCK__POLL_CANCELLED) {
+    /* The poll operation has already been cancelled, we're still waiting for
+     * it to return. For now, there's nothing that needs to be done. */
+
+  } else if (sock_state->poll_status == SOCK__POLL_IDLE) {
+    /* No poll operation is pending; start one. */
+    sock_state->poll_info.Exclusive = FALSE;
+    sock_state->poll_info.NumberOfHandles = 1;
+    sock_state->poll_info.Timeout.QuadPart = INT64_MAX;
+    sock_state->poll_info.Handles[0].Handle = (HANDLE) sock_state->base_socket;
+    sock_state->poll_info.Handles[0].Status = 0;
+    sock_state->poll_info.Handles[0].Events =
+        sock__epoll_events_to_afd_events(sock_state->user_events);
+
+    if (afd_poll(poll_group_get_afd_device_handle(sock_state->poll_group),
+                 &sock_state->poll_info,
+                 &sock_state->io_status_block) < 0) {
+      switch (GetLastError()) {
+        case ERROR_IO_PENDING:
+          /* Overlapped poll operation in progress; this is expected. */
+          break;
+        case ERROR_INVALID_HANDLE:
+          /* Socket closed; it'll be dropped from the epoll set. */
+          return sock__delete(port_state, sock_state, false);
+        default:
+          /* Other errors are propagated to the caller. */
+          return_map_error(-1);
+      }
+    }
+
+    /* The poll request was successfully submitted. */
+    sock_state->poll_status = SOCK__POLL_PENDING;
+    sock_state->pending_events = sock_state->user_events;
+
+  } else {
+    /* Unreachable. */
+    assert(false);
+  }
+
+  port_cancel_socket_update(port_state, sock_state);
+  return 0;
+}
+
+int sock_feed_event(port_state_t* port_state,
+                    IO_STATUS_BLOCK* io_status_block,
+                    struct epoll_event* ev) {
+  sock_state_t* sock_state =
+      container_of(io_status_block, sock_state_t, io_status_block);
+  AFD_POLL_INFO* poll_info = &sock_state->poll_info;
+  uint32_t epoll_events = 0;
+
+  sock_state->poll_status = SOCK__POLL_IDLE;
+  sock_state->pending_events = 0;
+
+  if (sock_state->delete_pending) {
+    /* Socket has been deleted earlier and can now be freed. */
+    return sock__delete(port_state, sock_state, false);
+
+  } else if (io_status_block->Status == STATUS_CANCELLED) {
+    /* The poll request was cancelled by CancelIoEx. */
+
+  } else if (!NT_SUCCESS(io_status_block->Status)) {
+    /* The overlapped request itself failed in an unexpected way. */
+    epoll_events = EPOLLERR;
+
+  } else if (poll_info->NumberOfHandles < 1) {
+    /* This poll operation succeeded but didn't report any socket events. */
+
+  } else if (poll_info->Handles[0].Events & AFD_POLL_LOCAL_CLOSE) {
+    /* The poll operation reported that the socket was closed. */
+    return sock__delete(port_state, sock_state, false);
+
+  } else {
+    /* Events related to our socket were reported. */
+    epoll_events =
+        sock__afd_events_to_epoll_events(poll_info->Handles[0].Events);
+  }
+
+  /* Requeue the socket so a new poll request will be submitted. */
+  port_request_socket_update(port_state, sock_state);
+
+  /* Filter out events that the user didn't ask for. */
+  epoll_events &= sock_state->user_events;
+
+  /* Return if there are no epoll events to report. */
+  if (epoll_events == 0)
+    return 0;
+
+  /* If the the socket has the EPOLLONESHOT flag set, unmonitor all events,
+   * even EPOLLERR and EPOLLHUP. But always keep looking for closed sockets. */
+  if (sock_state->user_events & EPOLLONESHOT)
+    sock_state->user_events = 0;
+
+  ev->data = sock_state->user_data;
+  ev->events = epoll_events;
+  return 1;
+}
+
+sock_state_t* sock_state_from_queue_node(queue_node_t* queue_node) {
+  return container_of(queue_node, sock_state_t, queue_node);
+}
+
+queue_node_t* sock_state_to_queue_node(sock_state_t* sock_state) {
+  return &sock_state->queue_node;
+}
+
+sock_state_t* sock_state_from_tree_node(tree_node_t* tree_node) {
+  return container_of(tree_node, sock_state_t, tree_node);
+}
+
+tree_node_t* sock_state_to_tree_node(sock_state_t* sock_state) {
+  return &sock_state->tree_node;
+}
+
+void ts_tree_init(ts_tree_t* ts_tree) {
+  tree_init(&ts_tree->tree);
+  InitializeSRWLock(&ts_tree->lock);
+}
+
+void ts_tree_node_init(ts_tree_node_t* node) {
+  tree_node_init(&node->tree_node);
+  reflock_init(&node->reflock);
+}
+
+int ts_tree_add(ts_tree_t* ts_tree, ts_tree_node_t* node, uintptr_t key) {
+  int r;
+
+  AcquireSRWLockExclusive(&ts_tree->lock);
+  r = tree_add(&ts_tree->tree, &node->tree_node, key);
+  ReleaseSRWLockExclusive(&ts_tree->lock);
+
+  return r;
+}
+
+static inline ts_tree_node_t* ts_tree__find_node(ts_tree_t* ts_tree,
+                                                 uintptr_t key) {
+  tree_node_t* tree_node = tree_find(&ts_tree->tree, key);
+  if (tree_node == NULL)
+    return NULL;
+
+  return container_of(tree_node, ts_tree_node_t, tree_node);
+}
+
+ts_tree_node_t* ts_tree_del_and_ref(ts_tree_t* ts_tree, uintptr_t key) {
+  ts_tree_node_t* ts_tree_node;
+
+  AcquireSRWLockExclusive(&ts_tree->lock);
+
+  ts_tree_node = ts_tree__find_node(ts_tree, key);
+  if (ts_tree_node != NULL) {
+    tree_del(&ts_tree->tree, &ts_tree_node->tree_node);
+    reflock_ref(&ts_tree_node->reflock);
+  }
+
+  ReleaseSRWLockExclusive(&ts_tree->lock);
+
+  return ts_tree_node;
+}
+
+ts_tree_node_t* ts_tree_find_and_ref(ts_tree_t* ts_tree, uintptr_t key) {
+  ts_tree_node_t* ts_tree_node;
+
+  AcquireSRWLockShared(&ts_tree->lock);
+
+  ts_tree_node = ts_tree__find_node(ts_tree, key);
+  if (ts_tree_node != NULL)
+    reflock_ref(&ts_tree_node->reflock);
+
+  ReleaseSRWLockShared(&ts_tree->lock);
+
+  return ts_tree_node;
+}
+
+void ts_tree_node_unref(ts_tree_node_t* node) {
+  reflock_unref(&node->reflock);
+}
+
+void ts_tree_node_unref_and_destroy(ts_tree_node_t* node) {
+  reflock_unref_and_destroy(&node->reflock);
+}
+
+void tree_init(tree_t* tree) {
+  memset(tree, 0, sizeof *tree);
+}
+
+void tree_node_init(tree_node_t* node) {
+  memset(node, 0, sizeof *node);
+}
+
+#define TREE__ROTATE(cis, trans)   \
+  tree_node_t* p = node;           \
+  tree_node_t* q = node->trans;    \
+  tree_node_t* parent = p->parent; \
+                                   \
+  if (parent) {                    \
+    if (parent->left == p)         \
+      parent->left = q;            \
+    else                           \
+      parent->right = q;           \
+  } else {                         \
+    tree->root = q;                \
+  }                                \
+                                   \
+  q->parent = parent;              \
+  p->parent = q;                   \
+  p->trans = q->cis;               \
+  if (p->trans)                    \
+    p->trans->parent = p;          \
+  q->cis = p;
+
+static inline void tree__rotate_left(tree_t* tree, tree_node_t* node) {
+  TREE__ROTATE(left, right)
+}
+
+static inline void tree__rotate_right(tree_t* tree, tree_node_t* node) {
+  TREE__ROTATE(right, left)
+}
+
+#define TREE__INSERT_OR_DESCEND(side) \
+  if (parent->side) {                 \
+    parent = parent->side;            \
+  } else {                            \
+    parent->side = node;              \
+    break;                            \
+  }
+
+#define TREE__REBALANCE_AFTER_INSERT(cis, trans) \
+  tree_node_t* grandparent = parent->parent;     \
+  tree_node_t* uncle = grandparent->trans;       \
+                                                 \
+  if (uncle && uncle->red) {                     \
+    parent->red = uncle->red = false;            \
+    grandparent->red = true;                     \
+    node = grandparent;                          \
+  } else {                                       \
+    if (node == parent->trans) {                 \
+      tree__rotate_##cis(tree, parent);          \
+      node = parent;                             \
+      parent = node->parent;                     \
+    }                                            \
+    parent->red = false;                         \
+    grandparent->red = true;                     \
+    tree__rotate_##trans(tree, grandparent);     \
+  }
+
+int tree_add(tree_t* tree, tree_node_t* node, uintptr_t key) {
+  tree_node_t* parent;
+
+  parent = tree->root;
+  if (parent) {
+    for (;;) {
+      if (key < parent->key) {
+        TREE__INSERT_OR_DESCEND(left)
+      } else if (key > parent->key) {
+        TREE__INSERT_OR_DESCEND(right)
+      } else {
+        return -1;
+      }
+    }
+  } else {
+    tree->root = node;
+  }
+
+  node->key = key;
+  node->left = node->right = NULL;
+  node->parent = parent;
+  node->red = true;
+
+  for (; parent && parent->red; parent = node->parent) {
+    if (parent == parent->parent->left) {
+      TREE__REBALANCE_AFTER_INSERT(left, right)
+    } else {
+      TREE__REBALANCE_AFTER_INSERT(right, left)
+    }
+  }
+  tree->root->red = false;
+
+  return 0;
+}
+
+#define TREE__REBALANCE_AFTER_REMOVE(cis, trans)   \
+  tree_node_t* sibling = parent->trans;            \
+                                                   \
+  if (sibling->red) {                              \
+    sibling->red = false;                          \
+    parent->red = true;                            \
+    tree__rotate_##cis(tree, parent);              \
+    sibling = parent->trans;                       \
+  }                                                \
+  if ((sibling->left && sibling->left->red) ||     \
+      (sibling->right && sibling->right->red)) {   \
+    if (!sibling->trans || !sibling->trans->red) { \
+      sibling->cis->red = false;                   \
+      sibling->red = true;                         \
+      tree__rotate_##trans(tree, sibling);         \
+      sibling = parent->trans;                     \
+    }                                              \
+    sibling->red = parent->red;                    \
+    parent->red = sibling->trans->red = false;     \
+    tree__rotate_##cis(tree, parent);              \
+    node = tree->root;                             \
+    break;                                         \
+  }                                                \
+  sibling->red = true;
+
+void tree_del(tree_t* tree, tree_node_t* node) {
+  tree_node_t* parent = node->parent;
+  tree_node_t* left = node->left;
+  tree_node_t* right = node->right;
+  tree_node_t* next;
+  bool red;
+
+  if (!left) {
+    next = right;
+  } else if (!right) {
+    next = left;
+  } else {
+    next = right;
+    while (next->left)
+      next = next->left;
+  }
+
+  if (parent) {
+    if (parent->left == node)
+      parent->left = next;
+    else
+      parent->right = next;
+  } else {
+    tree->root = next;
+  }
+
+  if (left && right) {
+    red = next->red;
+    next->red = node->red;
+    next->left = left;
+    left->parent = next;
+    if (next != right) {
+      parent = next->parent;
+      next->parent = node->parent;
+      node = next->right;
+      parent->left = node;
+      next->right = right;
+      right->parent = next;
+    } else {
+      next->parent = parent;
+      parent = next;
+      node = next->right;
+    }
+  } else {
+    red = node->red;
+    node = next;
+  }
+
+  if (node)
+    node->parent = parent;
+  if (red)
+    return;
+  if (node && node->red) {
+    node->red = false;
+    return;
+  }
+
+  do {
+    if (node == tree->root)
+      break;
+    if (node == parent->left) {
+      TREE__REBALANCE_AFTER_REMOVE(left, right)
+    } else {
+      TREE__REBALANCE_AFTER_REMOVE(right, left)
+    }
+    node = parent;
+    parent = parent->parent;
+  } while (!node->red);
+
+  if (node)
+    node->red = false;
+}
+
+tree_node_t* tree_find(const tree_t* tree, uintptr_t key) {
+  tree_node_t* node = tree->root;
+  while (node) {
+    if (key < node->key)
+      node = node->left;
+    else if (key > node->key)
+      node = node->right;
+    else
+      return node;
+  }
+  return NULL;
+}
+
+tree_node_t* tree_root(const tree_t* tree) {
+  return tree->root;
+}
+
+#ifndef SIO_BSP_HANDLE_POLL
+#define SIO_BSP_HANDLE_POLL 0x4800001D
+#endif
+
+#ifndef SIO_BASE_HANDLE
+#define SIO_BASE_HANDLE 0x48000022
+#endif
+
+int ws_global_init(void) {
+  int r;
+  WSADATA wsa_data;
+
+  r = WSAStartup(MAKEWORD(2, 2), &wsa_data);
+  if (r != 0)
+    return_set_error(-1, (DWORD) r);
+
+  return 0;
+}
+
+static inline SOCKET ws__ioctl_get_bsp_socket(SOCKET socket, DWORD ioctl) {
+  SOCKET bsp_socket;
+  DWORD bytes;
+
+  if (WSAIoctl(socket,
+               ioctl,
+               NULL,
+               0,
+               &bsp_socket,
+               sizeof bsp_socket,
+               &bytes,
+               NULL,
+               NULL) != SOCKET_ERROR)
+    return bsp_socket;
+  else
+    return INVALID_SOCKET;
+}
+
+SOCKET ws_get_base_socket(SOCKET socket) {
+  SOCKET base_socket;
+  DWORD error;
+
+  for (;;) {
+    base_socket = ws__ioctl_get_bsp_socket(socket, SIO_BASE_HANDLE);
+    if (base_socket != INVALID_SOCKET)
+      return base_socket;
+
+    error = GetLastError();
+    if (error == WSAENOTSOCK)
+      return_set_error(INVALID_SOCKET, error);
+
+    /* Even though Microsoft documentation clearly states that LSPs should
+     * never intercept the `SIO_BASE_HANDLE` ioctl [1], Komodia based LSPs do
+     * so anyway, breaking it, with the apparent intention of preventing LSP
+     * bypass [2]. Fortunately they don't handle `SIO_BSP_HANDLE_POLL`, which
+     * will at least let us obtain the socket associated with the next winsock
+     * protocol chain entry. If this succeeds, loop around and call
+     * `SIO_BASE_HANDLE` again with the returned BSP socket, to make sure that
+     * we unwrap all layers and retrieve the actual base socket.
+     *  [1] https://docs.microsoft.com/en-us/windows/win32/winsock/winsock-ioctls
+     *  [2] https://www.komodia.com/newwiki/index.php?title=Komodia%27s_Redirector_bug_fixes#Version_2.2.2.6
+     */
+    base_socket = ws__ioctl_get_bsp_socket(socket, SIO_BSP_HANDLE_POLL);
+    if (base_socket != INVALID_SOCKET && base_socket != socket)
+      socket = base_socket;
+    else
+      return_set_error(INVALID_SOCKET, error);
+  }
+}
diff --git a/Net/src/wepoll.h b/Net/src/wepoll.h
new file mode 100644
index 000000000..03e2cfb37
--- /dev/null
+++ b/Net/src/wepoll.h
@@ -0,0 +1,114 @@
+/*
+ * wepoll - epoll for Windows
+ * https://github.com/piscisaureus/wepoll
+ *
+ * Copyright 2012-2020, Bert Belder <bertbelder@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WEPOLL_H_
+#define WEPOLL_H_
+
+#ifndef WEPOLL_EXPORT
+#define WEPOLL_EXPORT
+#endif
+
+#include <stdint.h>
+
+enum EPOLL_EVENTS {
+  EPOLLIN      = (int) (1U <<  0),
+  EPOLLPRI     = (int) (1U <<  1),
+  EPOLLOUT     = (int) (1U <<  2),
+  EPOLLERR     = (int) (1U <<  3),
+  EPOLLHUP     = (int) (1U <<  4),
+  EPOLLRDNORM  = (int) (1U <<  6),
+  EPOLLRDBAND  = (int) (1U <<  7),
+  EPOLLWRNORM  = (int) (1U <<  8),
+  EPOLLWRBAND  = (int) (1U <<  9),
+  EPOLLMSG     = (int) (1U << 10), /* Never reported. */
+  EPOLLRDHUP   = (int) (1U << 13),
+  EPOLLONESHOT = (int) (1U << 31)
+};
+
+#define EPOLLIN      (1U <<  0)
+#define EPOLLPRI     (1U <<  1)
+#define EPOLLOUT     (1U <<  2)
+#define EPOLLERR     (1U <<  3)
+#define EPOLLHUP     (1U <<  4)
+#define EPOLLRDNORM  (1U <<  6)
+#define EPOLLRDBAND  (1U <<  7)
+#define EPOLLWRNORM  (1U <<  8)
+#define EPOLLWRBAND  (1U <<  9)
+#define EPOLLMSG     (1U << 10)
+#define EPOLLRDHUP   (1U << 13)
+#define EPOLLONESHOT (1U << 31)
+
+#define EPOLL_CTL_ADD 1
+#define EPOLL_CTL_MOD 2
+#define EPOLL_CTL_DEL 3
+
+typedef void* HANDLE;
+typedef uintptr_t SOCKET;
+
+typedef union epoll_data {
+  void* ptr;
+  int fd;
+  uint32_t u32;
+  uint64_t u64;
+  SOCKET sock; /* Windows specific */
+  HANDLE hnd;  /* Windows specific */
+} epoll_data_t;
+
+struct epoll_event {
+  uint32_t events;   /* Epoll events and flags */
+  epoll_data_t data; /* User data variable */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WEPOLL_EXPORT HANDLE epoll_create(int size);
+WEPOLL_EXPORT HANDLE epoll_create1(int flags);
+
+WEPOLL_EXPORT int epoll_close(HANDLE ephnd);
+
+WEPOLL_EXPORT int epoll_ctl(HANDLE ephnd,
+                            int op,
+                            SOCKET sock,
+                            struct epoll_event* event);
+
+WEPOLL_EXPORT int epoll_wait(HANDLE ephnd,
+                             struct epoll_event* events,
+                             int maxevents,
+                             int timeout);
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* WEPOLL_H_ */
diff --git a/Net/testsuite/Makefile b/Net/testsuite/Makefile
index 0723c668c..0070233e9 100644
--- a/Net/testsuite/Makefile
+++ b/Net/testsuite/Makefile
@@ -19,7 +19,8 @@ objects = \
 	MediaTypeTest QuotedPrintableTest DialogSocketTest \
 	HTTPClientTestSuite FTPClientTestSuite FTPClientSessionTest \
 	FTPStreamFactoryTest DialogServer \
-	SocketReactorTest ReactorTestSuite SocketProactorTest \
+	SocketReactorTest SocketConnectorTest ReactorTestSuite \
+	SocketProactorTest \
 	MailTestSuite MailMessageTest MailStreamTest \
 	SMTPClientSessionTest POP3ClientSessionTest \
 	RawSocketTest ICMPClientTest ICMPSocketTest ICMPClientTestSuite \
diff --git a/Net/testsuite/TestSuite.progen b/Net/testsuite/TestSuite.progen
index 8035acff1..f65485977 100644
--- a/Net/testsuite/TestSuite.progen
+++ b/Net/testsuite/TestSuite.progen
@@ -7,5 +7,6 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = iphlpapi.lib
 vc.project.linker.dependencies.Win32 = ws2_32.lib
diff --git a/Net/testsuite/TestSuite_vs150.vcxproj b/Net/testsuite/TestSuite_vs150.vcxproj
index 1da787fc9..0d63842aa 100644
--- a/Net/testsuite/TestSuite_vs150.vcxproj
+++ b/Net/testsuite/TestSuite_vs150.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -56,120 +56,109 @@
     <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros"/>
+  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
+    <_ProjectFileVersion>16.0.32602.291</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
@@ -243,11 +232,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -275,11 +264,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -304,11 +293,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -336,11 +325,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -365,11 +354,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -397,11 +386,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -426,11 +415,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -458,11 +447,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -487,11 +476,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -519,11 +508,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -548,11 +537,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -580,11 +569,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -598,268 +587,143 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="src\DatagramSocketTest.h"/>
-    <ClInclude Include="src\DialogServer.h"/>
-    <ClInclude Include="src\DialogSocketTest.h"/>
-    <ClInclude Include="src\DNSTest.h"/>
-    <ClInclude Include="src\EchoServer.h"/>
-    <ClInclude Include="src\FTPClientSessionTest.h"/>
-    <ClInclude Include="src\FTPClientTestSuite.h"/>
-    <ClInclude Include="src\FTPStreamFactoryTest.h"/>
-    <ClInclude Include="src\HTMLFormTest.h"/>
-    <ClInclude Include="src\HTMLTestSuite.h"/>
-    <ClInclude Include="src\HTTPClientSessionTest.h"/>
-    <ClInclude Include="src\HTTPClientTestSuite.h"/>
-    <ClInclude Include="src\HTTPCookieTest.h"/>
-    <ClInclude Include="src\HTTPCredentialsTest.h"/>
-    <ClInclude Include="src\HTTPRequestTest.h"/>
-    <ClInclude Include="src\HTTPResponseTest.h"/>
-    <ClInclude Include="src\HTTPServerTest.h"/>
-    <ClInclude Include="src\HTTPServerTestSuite.h"/>
-    <ClInclude Include="src\HTTPStreamFactoryTest.h"/>
-    <ClInclude Include="src\HTTPTestServer.h"/>
-    <ClInclude Include="src\HTTPTestSuite.h"/>
-    <ClInclude Include="src\ICMPClientTest.h"/>
-    <ClInclude Include="src\ICMPClientTestSuite.h"/>
-    <ClInclude Include="src\ICMPSocketTest.h"/>
-    <ClInclude Include="src\IPAddressTest.h"/>
-    <ClInclude Include="src\MailMessageTest.h"/>
-    <ClInclude Include="src\MailStreamTest.h"/>
-    <ClInclude Include="src\MailTestSuite.h"/>
-    <ClInclude Include="src\MediaTypeTest.h"/>
-    <ClInclude Include="src\MessageHeaderTest.h"/>
-    <ClInclude Include="src\MessagesTestSuite.h"/>
-    <ClInclude Include="src\MulticastEchoServer.h"/>
-    <ClInclude Include="src\MulticastSocketTest.h"/>
-    <ClInclude Include="src\MultipartReaderTest.h"/>
-    <ClInclude Include="src\MultipartWriterTest.h"/>
-    <ClInclude Include="src\NameValueCollectionTest.h"/>
-    <ClInclude Include="src\NetCoreTestSuite.h"/>
-    <ClInclude Include="src\NetTestSuite.h"/>
-    <ClInclude Include="src\NetworkInterfaceTest.h"/>
-    <ClInclude Include="src\NTLMCredentialsTest.h"/>
-    <ClInclude Include="src\NTPClientTest.h"/>
-    <ClInclude Include="src\NTPClientTestSuite.h"/>
-    <ClInclude Include="src\OAuth10CredentialsTest.h"/>
-    <ClInclude Include="src\OAuth20CredentialsTest.h"/>
-    <ClInclude Include="src\OAuthTestSuite.h"/>
-    <ClInclude Include="src\PollSetTest.h"/>
-    <ClInclude Include="src\POP3ClientSessionTest.h"/>
-    <ClInclude Include="src\QuotedPrintableTest.h"/>
-    <ClInclude Include="src\RawSocketTest.h"/>
-    <ClInclude Include="src\ReactorTestSuite.h"/>
-    <ClInclude Include="src\SMTPClientSessionTest.h"/>
-    <ClInclude Include="src\SocketAddressTest.h"/>
-    <ClInclude Include="src\SocketReactorTest.h"/>
-    <ClInclude Include="src\SocketsTestSuite.h"/>
-    <ClInclude Include="src\SocketStreamTest.h"/>
-    <ClInclude Include="src\SocketTest.h"/>
-    <ClInclude Include="src\SyslogTest.h"/>
-    <ClInclude Include="src\TCPServerTest.h"/>
-    <ClInclude Include="src\TCPServerTestSuite.h"/>
-    <ClInclude Include="src\UDPEchoServer.h"/>
-    <ClInclude Include="src\UDPServerTest.h"/>
-    <ClInclude Include="src\UDPServerTestSuite.h"/>
-    <ClInclude Include="src\WebSocketTest.h"/>
-    <ClInclude Include="src\WebSocketTestSuite.h"/>
+    <ClInclude Include="src\DatagramSocketTest.h" />
+    <ClInclude Include="src\DialogServer.h" />
+    <ClInclude Include="src\DialogSocketTest.h" />
+    <ClInclude Include="src\DNSTest.h" />
+    <ClInclude Include="src\EchoServer.h" />
+    <ClInclude Include="src\FTPClientSessionTest.h" />
+    <ClInclude Include="src\FTPClientTestSuite.h" />
+    <ClInclude Include="src\FTPStreamFactoryTest.h" />
+    <ClInclude Include="src\HTMLFormTest.h" />
+    <ClInclude Include="src\HTMLTestSuite.h" />
+    <ClInclude Include="src\HTTPClientSessionTest.h" />
+    <ClInclude Include="src\HTTPClientTestSuite.h" />
+    <ClInclude Include="src\HTTPCookieTest.h" />
+    <ClInclude Include="src\HTTPCredentialsTest.h" />
+    <ClInclude Include="src\HTTPRequestTest.h" />
+    <ClInclude Include="src\HTTPResponseTest.h" />
+    <ClInclude Include="src\HTTPServerTest.h" />
+    <ClInclude Include="src\HTTPServerTestSuite.h" />
+    <ClInclude Include="src\HTTPStreamFactoryTest.h" />
+    <ClInclude Include="src\HTTPTestServer.h" />
+    <ClInclude Include="src\HTTPTestSuite.h" />
+    <ClInclude Include="src\ICMPClientTest.h" />
+    <ClInclude Include="src\ICMPClientTestSuite.h" />
+    <ClInclude Include="src\ICMPSocketTest.h" />
+    <ClInclude Include="src\IPAddressTest.h" />
+    <ClInclude Include="src\MailMessageTest.h" />
+    <ClInclude Include="src\MailStreamTest.h" />
+    <ClInclude Include="src\MailTestSuite.h" />
+    <ClInclude Include="src\MediaTypeTest.h" />
+    <ClInclude Include="src\MessageHeaderTest.h" />
+    <ClInclude Include="src\MessagesTestSuite.h" />
+    <ClInclude Include="src\MulticastEchoServer.h" />
+    <ClInclude Include="src\MulticastSocketTest.h" />
+    <ClInclude Include="src\MultipartReaderTest.h" />
+    <ClInclude Include="src\MultipartWriterTest.h" />
+    <ClInclude Include="src\NameValueCollectionTest.h" />
+    <ClInclude Include="src\NetCoreTestSuite.h" />
+    <ClInclude Include="src\NetTestSuite.h" />
+    <ClInclude Include="src\NetworkInterfaceTest.h" />
+    <ClInclude Include="src\NTLMCredentialsTest.h" />
+    <ClInclude Include="src\NTPClientTest.h" />
+    <ClInclude Include="src\NTPClientTestSuite.h" />
+    <ClInclude Include="src\OAuth10CredentialsTest.h" />
+    <ClInclude Include="src\OAuth20CredentialsTest.h" />
+    <ClInclude Include="src\OAuthTestSuite.h" />
+    <ClInclude Include="src\PollSetTest.h" />
+    <ClInclude Include="src\POP3ClientSessionTest.h" />
+    <ClInclude Include="src\QuotedPrintableTest.h" />
+    <ClInclude Include="src\RawSocketTest.h" />
+    <ClInclude Include="src\ReactorTestSuite.h" />
+    <ClInclude Include="src\SMTPClientSessionTest.h" />
+    <ClInclude Include="src\SocketAddressTest.h" />
+    <ClInclude Include="src\SocketConnectorTest.h" />
+    <ClInclude Include="src\SocketProactorTest.h" />
+    <ClInclude Include="src\SocketReactorTest.h" />
+    <ClInclude Include="src\SocketsTestSuite.h" />
+    <ClInclude Include="src\SocketStreamTest.h" />
+    <ClInclude Include="src\SocketTest.h" />
+    <ClInclude Include="src\SyslogTest.h" />
+    <ClInclude Include="src\TCPServerTest.h" />
+    <ClInclude Include="src\TCPServerTestSuite.h" />
+    <ClInclude Include="src\UDPEchoServer.h" />
+    <ClInclude Include="src\UDPServerTest.h" />
+    <ClInclude Include="src\UDPServerTestSuite.h" />
+    <ClInclude Include="src\WebSocketTest.h" />
+    <ClInclude Include="src\WebSocketTestSuite.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\DatagramSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DialogServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DialogSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DNSTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\Driver.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\EchoServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPStreamFactoryTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTMLFormTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTMLTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCookieTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequestTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPResponseTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPStreamFactoryTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPTestServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPClientTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\IPAddressTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailMessageTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailStreamTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MediaTypeTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MessageHeaderTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MessagesTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MulticastEchoServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MulticastSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartReaderTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartWriterTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NameValueCollectionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetCoreTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetworkInterfaceTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTLMCredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPClientTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth10CredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth20CredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuthTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PollSetTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\POP3ClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RawSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ReactorTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SMTPClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketAddressTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketReactorTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketsTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketStreamTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SyslogTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPEchoServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPServerTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPServerTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocketTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
+    <ClCompile Include="src\DatagramSocketTest.cpp" />
+    <ClCompile Include="src\DialogServer.cpp" />
+    <ClCompile Include="src\DialogSocketTest.cpp" />
+    <ClCompile Include="src\DNSTest.cpp" />
+    <ClCompile Include="src\Driver.cpp" />
+    <ClCompile Include="src\EchoServer.cpp" />
+    <ClCompile Include="src\FTPClientSessionTest.cpp" />
+    <ClCompile Include="src\FTPClientTestSuite.cpp" />
+    <ClCompile Include="src\FTPStreamFactoryTest.cpp" />
+    <ClCompile Include="src\HTMLFormTest.cpp" />
+    <ClCompile Include="src\HTMLTestSuite.cpp" />
+    <ClCompile Include="src\HTTPClientSessionTest.cpp" />
+    <ClCompile Include="src\HTTPClientTestSuite.cpp" />
+    <ClCompile Include="src\HTTPCookieTest.cpp" />
+    <ClCompile Include="src\HTTPCredentialsTest.cpp" />
+    <ClCompile Include="src\HTTPRequestTest.cpp" />
+    <ClCompile Include="src\HTTPResponseTest.cpp" />
+    <ClCompile Include="src\HTTPServerTest.cpp" />
+    <ClCompile Include="src\HTTPServerTestSuite.cpp" />
+    <ClCompile Include="src\HTTPStreamFactoryTest.cpp" />
+    <ClCompile Include="src\HTTPTestServer.cpp" />
+    <ClCompile Include="src\HTTPTestSuite.cpp" />
+    <ClCompile Include="src\ICMPClientTest.cpp" />
+    <ClCompile Include="src\ICMPClientTestSuite.cpp" />
+    <ClCompile Include="src\ICMPSocketTest.cpp" />
+    <ClCompile Include="src\IPAddressTest.cpp" />
+    <ClCompile Include="src\MailMessageTest.cpp" />
+    <ClCompile Include="src\MailStreamTest.cpp" />
+    <ClCompile Include="src\MailTestSuite.cpp" />
+    <ClCompile Include="src\MediaTypeTest.cpp" />
+    <ClCompile Include="src\MessageHeaderTest.cpp" />
+    <ClCompile Include="src\MessagesTestSuite.cpp" />
+    <ClCompile Include="src\MulticastEchoServer.cpp" />
+    <ClCompile Include="src\MulticastSocketTest.cpp" />
+    <ClCompile Include="src\MultipartReaderTest.cpp" />
+    <ClCompile Include="src\MultipartWriterTest.cpp" />
+    <ClCompile Include="src\NameValueCollectionTest.cpp" />
+    <ClCompile Include="src\NetCoreTestSuite.cpp" />
+    <ClCompile Include="src\NetTestSuite.cpp" />
+    <ClCompile Include="src\NetworkInterfaceTest.cpp" />
+    <ClCompile Include="src\NTLMCredentialsTest.cpp" />
+    <ClCompile Include="src\NTPClientTest.cpp" />
+    <ClCompile Include="src\NTPClientTestSuite.cpp" />
+    <ClCompile Include="src\OAuth10CredentialsTest.cpp" />
+    <ClCompile Include="src\OAuth20CredentialsTest.cpp" />
+    <ClCompile Include="src\OAuthTestSuite.cpp" />
+    <ClCompile Include="src\PollSetTest.cpp" />
+    <ClCompile Include="src\POP3ClientSessionTest.cpp" />
+    <ClCompile Include="src\QuotedPrintableTest.cpp" />
+    <ClCompile Include="src\RawSocketTest.cpp" />
+    <ClCompile Include="src\ReactorTestSuite.cpp" />
+    <ClCompile Include="src\SMTPClientSessionTest.cpp" />
+    <ClCompile Include="src\SocketAddressTest.cpp" />
+    <ClCompile Include="src\SocketConnectorTest.cpp" />
+    <ClCompile Include="src\SocketProactorTest.cpp" />
+    <ClCompile Include="src\SocketReactorTest.cpp" />
+    <ClCompile Include="src\SocketsTestSuite.cpp" />
+    <ClCompile Include="src\SocketStreamTest.cpp" />
+    <ClCompile Include="src\SocketTest.cpp" />
+    <ClCompile Include="src\SyslogTest.cpp" />
+    <ClCompile Include="src\TCPServerTest.cpp" />
+    <ClCompile Include="src\TCPServerTestSuite.cpp" />
+    <ClCompile Include="src\UDPEchoServer.cpp" />
+    <ClCompile Include="src\UDPServerTest.cpp" />
+    <ClCompile Include="src\UDPServerTestSuite.cpp" />
+    <ClCompile Include="src\WebSocketTest.cpp" />
+    <ClCompile Include="src\WebSocketTestSuite.cpp" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
-  <ImportGroup Label="ExtensionTargets"/>
-</Project>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Net/testsuite/TestSuite_vs150.vcxproj.filters b/Net/testsuite/TestSuite_vs150.vcxproj.filters
index 81f19d736..ca59260d4 100644
--- a/Net/testsuite/TestSuite_vs150.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs150.vcxproj.filters
@@ -2,172 +2,172 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{622ba277-a191-45e4-be4d-b0c9634aae2a}</UniqueIdentifier>
+      <UniqueIdentifier>{96f14e15-814c-4289-abea-e829b3d3b60d}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{b988e6c9-804a-4688-a317-b2ec7fb6a1d6}</UniqueIdentifier>
+      <UniqueIdentifier>{c06a4c37-b293-43eb-bb8b-14816b1082c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{1c8d6d1a-2a86-4319-825d-57d72ed5be7e}</UniqueIdentifier>
+      <UniqueIdentifier>{4a3b9db1-16f4-4d13-8157-3cc3a7a7d580}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{161f9d3f-3600-4728-bc5e-316da9795ff8}</UniqueIdentifier>
+      <UniqueIdentifier>{b2999ec8-cd74-461d-a1a2-35d796e00578}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ac02c0d6-c130-4249-9b88-e1e2241528ed}</UniqueIdentifier>
+      <UniqueIdentifier>{4dc23a9a-a4cd-4b30-8b66-8bcef117e052}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{c8b1d3f2-67be-4b6c-9a3e-c7f681204369}</UniqueIdentifier>
+      <UniqueIdentifier>{39a278fe-fd8e-49e6-a785-4adb054f80e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{fca74574-ebb7-4b9d-8107-0160aad38a51}</UniqueIdentifier>
+      <UniqueIdentifier>{93cdb6e9-2604-44dc-8fe3-5a5eb24851a0}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{4a90f67a-ce30-493b-bc2d-fdb4ec6022a0}</UniqueIdentifier>
+      <UniqueIdentifier>{7ee54e59-a03a-4da5-a09f-54e6a81772bd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{79e1d000-adea-47a6-80b2-2e1eb656f37f}</UniqueIdentifier>
+      <UniqueIdentifier>{0c2bcd77-b533-4f82-8dd4-e3eeebb6d021}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{f792bde2-f64f-4641-826b-73565b73d7c8}</UniqueIdentifier>
+      <UniqueIdentifier>{7ec5729e-cca0-43ca-88c2-9a3d09fcda02}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{7fd6b663-b256-4344-b727-a10bd3969a3f}</UniqueIdentifier>
+      <UniqueIdentifier>{a9adab65-db3e-4bc2-89f2-ff794b18a9ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{7011dda2-614e-4220-b8fe-37fb957e491f}</UniqueIdentifier>
+      <UniqueIdentifier>{4023275d-3429-416e-948e-def4f98a6160}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{dc379e2f-3309-4627-b249-64837bea0684}</UniqueIdentifier>
+      <UniqueIdentifier>{569d9a23-832d-47a0-a5cd-838612de62a2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{35f107fb-8aed-42dc-a048-0b7cfe2a8358}</UniqueIdentifier>
+      <UniqueIdentifier>{d2b8533c-1aaa-49c0-88b8-d847ecf4a146}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{44aa1462-1a4b-4432-92a1-99689bc524dd}</UniqueIdentifier>
+      <UniqueIdentifier>{f9fb1f18-9c37-43ff-99db-436ee94e38d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{a997bdca-0c5c-420e-954d-1245fe0af3a9}</UniqueIdentifier>
+      <UniqueIdentifier>{3208329c-2707-493f-b750-4940b78cb78a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{378356d8-4f3f-423d-8bfa-d1ecce02dd60}</UniqueIdentifier>
+      <UniqueIdentifier>{659ed528-6cf1-4444-92ef-23aa0bbf675d}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{37b2db36-1de3-434d-a5ee-b91d685dc225}</UniqueIdentifier>
+      <UniqueIdentifier>{30c0386a-45af-4223-b822-1cc9d695b35b}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{cb9f5c49-610a-4737-8b83-0f3e687efbb2}</UniqueIdentifier>
+      <UniqueIdentifier>{979d2fc8-0eca-4b74-b898-d8f79d88a19d}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{71f8d2a9-361b-4e88-b9ed-8e974d03d6c5}</UniqueIdentifier>
+      <UniqueIdentifier>{bb1a0294-9b8f-4107-8d4a-4241e65e7418}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{2e959e74-d55d-450a-8860-6db234dd4916}</UniqueIdentifier>
+      <UniqueIdentifier>{e9a5d533-e965-4745-b51e-aafa331b5b16}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{804e9b7e-c1b1-4cb8-ad14-b159de2c4e53}</UniqueIdentifier>
+      <UniqueIdentifier>{6792084c-89e0-4168-84a2-d50879660267}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{ebc9766b-4375-4a56-9469-5c29c730607f}</UniqueIdentifier>
+      <UniqueIdentifier>{6771c8ef-5970-48d0-b5ef-d20a4af9c7a0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{0a95781f-7fcc-4a8c-b21b-6666392f150c}</UniqueIdentifier>
+      <UniqueIdentifier>{d439ba84-6278-4c1c-b5c2-b09d6a143391}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{8d731e3a-6f29-448a-b27c-95c557bd9d85}</UniqueIdentifier>
+      <UniqueIdentifier>{0d42a251-1f30-4b56-ada1-698f6d3b8732}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{6c343779-354c-4581-93c8-8a39316eaef7}</UniqueIdentifier>
+      <UniqueIdentifier>{f42f60bb-c2d7-4116-827c-fa13562d7ecc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{f01cd53d-2f73-4ea5-9864-caa20ce1429b}</UniqueIdentifier>
+      <UniqueIdentifier>{6d42fb23-de81-499a-a9d4-0d4b1fda2130}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{bca2d7d7-6ee8-45dd-965a-969097c0cbbd}</UniqueIdentifier>
+      <UniqueIdentifier>{d4ba9f84-b833-41d8-8738-25a4d5c762fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{e6446708-9ff2-4aee-b43d-b36cf779619b}</UniqueIdentifier>
+      <UniqueIdentifier>{73815ea0-843e-45ae-8fcb-8c5d5cb43def}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{10fe3129-3d2e-4529-b7ed-9f80378cc34e}</UniqueIdentifier>
+      <UniqueIdentifier>{e69138c0-5256-48f5-8245-667ed2074aee}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{dcf405bb-f42a-402c-93d5-6c6499d9560d}</UniqueIdentifier>
+      <UniqueIdentifier>{de7024c9-967f-4548-acc9-aa9a0d4a2233}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{947205b8-420a-4c55-93bb-8f0fbf91a0df}</UniqueIdentifier>
+      <UniqueIdentifier>{4662b1a8-f31e-49ac-86a2-43ff6f18c4ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{74eb0a31-b0d6-499a-94c3-3b7311b95e60}</UniqueIdentifier>
+      <UniqueIdentifier>{f5ee2a9b-28fd-4f0d-a470-b56c93817af6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{72e6e2a6-e072-48cd-9ce9-ace17c4ccffb}</UniqueIdentifier>
+      <UniqueIdentifier>{be916e59-b8a8-49d5-a1d9-fe4ec09b557c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{c8a70797-7336-4edf-baa5-82987ea81a2e}</UniqueIdentifier>
+      <UniqueIdentifier>{6d061e4a-a7e9-4fb8-9dcc-22c40d170167}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{2207a262-010d-46f1-b374-49be8dc6ed45}</UniqueIdentifier>
+      <UniqueIdentifier>{5bc87c88-b8a1-43b9-8872-00db48dbe766}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{283db660-d575-4df5-9bff-541801664ebe}</UniqueIdentifier>
+      <UniqueIdentifier>{28c693e8-b038-4ae0-bb98-9d8c164bcefc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{073b550b-d77e-41b7-977f-004a21501922}</UniqueIdentifier>
+      <UniqueIdentifier>{9d0c793e-4e60-4970-adb4-5aebbd9e9323}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{b3c92e30-fbb0-4cd0-a2ea-107fe77799df}</UniqueIdentifier>
+      <UniqueIdentifier>{e83b0755-7b3a-40bc-9a78-de68d7f7c125}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{f560cb9a-5e6d-4886-9d98-51b551c23a27}</UniqueIdentifier>
+      <UniqueIdentifier>{0e507ca9-1538-4170-bfe5-1f09bb5b2bec}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{d5d1c60e-abb4-48c6-9c6f-adb0a11e47db}</UniqueIdentifier>
+      <UniqueIdentifier>{2717e923-8f4c-4d2b-8e4f-81dca96801c6}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{8e4804ca-223b-48f2-ac89-fbacc8c250ef}</UniqueIdentifier>
+      <UniqueIdentifier>{2f1e77d0-cde4-4084-baf9-84a11226b874}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{e6e23ca2-4c0b-4cb5-ab56-492808cdc4c4}</UniqueIdentifier>
+      <UniqueIdentifier>{667dba9d-a815-4a2e-8c69-6d59ff02fee7}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{1e2d9162-aeb9-4c6f-87f4-e2fd921fead3}</UniqueIdentifier>
+      <UniqueIdentifier>{1e8006ae-8f33-40c0-842b-ba5870b2d59f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{1aec120d-a164-4801-8ce8-2a07c66e949b}</UniqueIdentifier>
+      <UniqueIdentifier>{6d54692c-5892-4f9a-abae-070158e64e35}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{fc560f2a-0deb-4b0e-89e9-a9cc45efb839}</UniqueIdentifier>
+      <UniqueIdentifier>{4cace072-1c95-4d12-9691-301e4f9c809d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{60126318-8b4e-40b0-abef-596fb8325889}</UniqueIdentifier>
+      <UniqueIdentifier>{95863a72-6780-403c-b324-8ecb6a7f77a8}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{fd382fec-1d47-4a46-b748-cadbd24b328d}</UniqueIdentifier>
+      <UniqueIdentifier>{732e449c-3404-4b30-902c-e93c5d70c4d7}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{93aec30b-4d67-4e45-bf30-5009162a00a8}</UniqueIdentifier>
+      <UniqueIdentifier>{667f145c-7e55-4ea6-97ad-ac93604789ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{091ca473-b07f-440d-8529-ff49698f165a}</UniqueIdentifier>
+      <UniqueIdentifier>{4924cbab-95da-462a-a689-748b407b293b}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth">
-      <UniqueIdentifier>{d812eedb-b616-448f-af07-6a13f0d82117}</UniqueIdentifier>
+      <UniqueIdentifier>{90cd5600-34dd-4d3d-aadf-e2f459418a70}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Header Files">
-      <UniqueIdentifier>{63a2c039-855d-476c-8b25-f6e12802831f}</UniqueIdentifier>
+      <UniqueIdentifier>{078f2145-c2c7-42dd-9922-671b2ef2f89e}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Source Files">
-      <UniqueIdentifier>{c15f795b-fe8e-4f77-88f4-c61ca7771e0f}</UniqueIdentifier>
+      <UniqueIdentifier>{5c69730c-de7f-48b9-b4fb-4fa75f547eaa}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP">
-      <UniqueIdentifier>{33883842-d74a-4b75-ae61-26e7877c77e1}</UniqueIdentifier>
+      <UniqueIdentifier>{c7d3eb75-2cf8-46e7-bc76-b0d62aed0b10}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Source Files">
-      <UniqueIdentifier>{3e6c33d7-2d63-48e9-b78c-acf9bc745ca4}</UniqueIdentifier>
+      <UniqueIdentifier>{ed08e706-78fa-435b-863a-02177dcb5e67}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Header Files">
-      <UniqueIdentifier>{3cdaed90-d152-4ce6-a0a8-6978a3b6e2d6}</UniqueIdentifier>
+      <UniqueIdentifier>{1f474979-aae7-49ed-8ee3-8182a45fc581}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -306,9 +306,15 @@
     <ClInclude Include="src\ReactorTestSuite.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SocketConnectorTest.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\SocketReactorTest.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SocketProactorTest.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\MailMessageTest.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>
@@ -503,9 +509,15 @@
     <ClCompile Include="src\ReactorTestSuite.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketConnectorTest.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\SocketReactorTest.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketProactorTest.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MailMessageTest.cpp">
       <Filter>Mail\Source Files</Filter>
     </ClCompile>
diff --git a/Net/testsuite/TestSuite_vs160.vcxproj b/Net/testsuite/TestSuite_vs160.vcxproj
index 8e913a5eb..5db41bb88 100644
--- a/Net/testsuite/TestSuite_vs160.vcxproj
+++ b/Net/testsuite/TestSuite_vs160.vcxproj
@@ -55,121 +55,111 @@
     <ProjectGuid>{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
+    <_ProjectFileVersion>16.0.32602.291</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
@@ -205,6 +195,7 @@
     <OutDir>bin64\</OutDir>
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
     <OutDir>bin64\</OutDir>
@@ -215,6 +206,7 @@
     <OutDir>bin64\static_mt\</OutDir>
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <OutDir>bin64\static_mt\</OutDir>
@@ -225,6 +217,7 @@
     <OutDir>bin64\static_md\</OutDir>
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <OutDir>bin64\static_md\</OutDir>
@@ -247,7 +240,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -279,7 +272,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -308,7 +301,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -340,7 +333,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -369,7 +362,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -401,7 +394,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -430,7 +423,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -462,7 +455,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -491,7 +484,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -523,7 +516,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -552,7 +545,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -584,7 +577,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -650,6 +643,7 @@
     <ClInclude Include="src\ReactorTestSuite.h" />
     <ClInclude Include="src\SMTPClientSessionTest.h" />
     <ClInclude Include="src\SocketAddressTest.h" />
+    <ClInclude Include="src\SocketConnectorTest.h" />
     <ClInclude Include="src\SocketProactorTest.h" />
     <ClInclude Include="src\SocketReactorTest.h" />
     <ClInclude Include="src\SocketsTestSuite.h" />
@@ -665,203 +659,75 @@
     <ClInclude Include="src\WebSocketTestSuite.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\DatagramSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DialogServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DialogSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DNSTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\Driver.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\EchoServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPStreamFactoryTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTMLFormTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTMLTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCookieTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequestTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPResponseTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPStreamFactoryTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPTestServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPClientTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\IPAddressTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailMessageTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailStreamTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MediaTypeTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MessageHeaderTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MessagesTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MulticastEchoServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MulticastSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartReaderTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartWriterTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NameValueCollectionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetCoreTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetworkInterfaceTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTLMCredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPClientTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth10CredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth20CredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuthTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PollSetTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\POP3ClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RawSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ReactorTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SMTPClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketAddressTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
+    <ClCompile Include="src\DatagramSocketTest.cpp" />
+    <ClCompile Include="src\DialogServer.cpp" />
+    <ClCompile Include="src\DialogSocketTest.cpp" />
+    <ClCompile Include="src\DNSTest.cpp" />
+    <ClCompile Include="src\Driver.cpp" />
+    <ClCompile Include="src\EchoServer.cpp" />
+    <ClCompile Include="src\FTPClientSessionTest.cpp" />
+    <ClCompile Include="src\FTPClientTestSuite.cpp" />
+    <ClCompile Include="src\FTPStreamFactoryTest.cpp" />
+    <ClCompile Include="src\HTMLFormTest.cpp" />
+    <ClCompile Include="src\HTMLTestSuite.cpp" />
+    <ClCompile Include="src\HTTPClientSessionTest.cpp" />
+    <ClCompile Include="src\HTTPClientTestSuite.cpp" />
+    <ClCompile Include="src\HTTPCookieTest.cpp" />
+    <ClCompile Include="src\HTTPCredentialsTest.cpp" />
+    <ClCompile Include="src\HTTPRequestTest.cpp" />
+    <ClCompile Include="src\HTTPResponseTest.cpp" />
+    <ClCompile Include="src\HTTPServerTest.cpp" />
+    <ClCompile Include="src\HTTPServerTestSuite.cpp" />
+    <ClCompile Include="src\HTTPStreamFactoryTest.cpp" />
+    <ClCompile Include="src\HTTPTestServer.cpp" />
+    <ClCompile Include="src\HTTPTestSuite.cpp" />
+    <ClCompile Include="src\ICMPClientTest.cpp" />
+    <ClCompile Include="src\ICMPClientTestSuite.cpp" />
+    <ClCompile Include="src\ICMPSocketTest.cpp" />
+    <ClCompile Include="src\IPAddressTest.cpp" />
+    <ClCompile Include="src\MailMessageTest.cpp" />
+    <ClCompile Include="src\MailStreamTest.cpp" />
+    <ClCompile Include="src\MailTestSuite.cpp" />
+    <ClCompile Include="src\MediaTypeTest.cpp" />
+    <ClCompile Include="src\MessageHeaderTest.cpp" />
+    <ClCompile Include="src\MessagesTestSuite.cpp" />
+    <ClCompile Include="src\MulticastEchoServer.cpp" />
+    <ClCompile Include="src\MulticastSocketTest.cpp" />
+    <ClCompile Include="src\MultipartReaderTest.cpp" />
+    <ClCompile Include="src\MultipartWriterTest.cpp" />
+    <ClCompile Include="src\NameValueCollectionTest.cpp" />
+    <ClCompile Include="src\NetCoreTestSuite.cpp" />
+    <ClCompile Include="src\NetTestSuite.cpp" />
+    <ClCompile Include="src\NetworkInterfaceTest.cpp" />
+    <ClCompile Include="src\NTLMCredentialsTest.cpp" />
+    <ClCompile Include="src\NTPClientTest.cpp" />
+    <ClCompile Include="src\NTPClientTestSuite.cpp" />
+    <ClCompile Include="src\OAuth10CredentialsTest.cpp" />
+    <ClCompile Include="src\OAuth20CredentialsTest.cpp" />
+    <ClCompile Include="src\OAuthTestSuite.cpp" />
+    <ClCompile Include="src\PollSetTest.cpp" />
+    <ClCompile Include="src\POP3ClientSessionTest.cpp" />
+    <ClCompile Include="src\QuotedPrintableTest.cpp" />
+    <ClCompile Include="src\RawSocketTest.cpp" />
+    <ClCompile Include="src\ReactorTestSuite.cpp" />
+    <ClCompile Include="src\SMTPClientSessionTest.cpp" />
+    <ClCompile Include="src\SocketAddressTest.cpp" />
+    <ClCompile Include="src\SocketConnectorTest.cpp" />
     <ClCompile Include="src\SocketProactorTest.cpp" />
-    <ClCompile Include="src\SocketReactorTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketsTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketStreamTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SyslogTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPEchoServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPServerTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPServerTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocketTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
+    <ClCompile Include="src\SocketReactorTest.cpp" />
+    <ClCompile Include="src\SocketsTestSuite.cpp" />
+    <ClCompile Include="src\SocketStreamTest.cpp" />
+    <ClCompile Include="src\SocketTest.cpp" />
+    <ClCompile Include="src\SyslogTest.cpp" />
+    <ClCompile Include="src\TCPServerTest.cpp" />
+    <ClCompile Include="src\TCPServerTestSuite.cpp" />
+    <ClCompile Include="src\UDPEchoServer.cpp" />
+    <ClCompile Include="src\UDPServerTest.cpp" />
+    <ClCompile Include="src\UDPServerTestSuite.cpp" />
+    <ClCompile Include="src\WebSocketTest.cpp" />
+    <ClCompile Include="src\WebSocketTestSuite.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Net/testsuite/TestSuite_vs160.vcxproj.filters b/Net/testsuite/TestSuite_vs160.vcxproj.filters
index 5d348b9cf..fe97098c4 100644
--- a/Net/testsuite/TestSuite_vs160.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs160.vcxproj.filters
@@ -2,172 +2,172 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{5404fe11-1839-42cf-b51b-5e9b1bf04564}</UniqueIdentifier>
+      <UniqueIdentifier>{5dbf52e2-36b3-4227-bdfc-313e4c904adc}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{10186ea1-7b50-4382-a510-7b7827a7207c}</UniqueIdentifier>
+      <UniqueIdentifier>{58ab66cd-dbbe-4e72-93f8-6efefe8f3995}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{ae58791f-549f-4b44-a83e-1c8e981425d9}</UniqueIdentifier>
+      <UniqueIdentifier>{b6a24e46-eb3d-4436-b7b6-4fe5873d4fd0}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{b5e10af2-6504-4d51-b9bb-8fdcc895740e}</UniqueIdentifier>
+      <UniqueIdentifier>{eee07f06-f40a-4d2b-90ee-28f693cc0dff}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{83d98686-03a5-4c51-834e-c617171b2372}</UniqueIdentifier>
+      <UniqueIdentifier>{f31edf18-4407-4e08-aa97-8dc117ef9c91}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{7c7b7a3c-be0a-4c00-b81d-8d5636a94767}</UniqueIdentifier>
+      <UniqueIdentifier>{aae585db-82e2-4111-8b20-e7b35a96c904}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{85626f7e-1bc7-4e2a-bded-b47552f95574}</UniqueIdentifier>
+      <UniqueIdentifier>{6d1f01b7-6aa6-4297-a304-1b2564620b53}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{e08a68c0-01cd-4753-958b-f4f6e5d27627}</UniqueIdentifier>
+      <UniqueIdentifier>{97a2650f-435a-4293-bfde-6fdae1251e05}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{bd610a87-2c11-4b32-9bd9-042a244125fc}</UniqueIdentifier>
+      <UniqueIdentifier>{544c7b99-bea0-409e-970e-5cd4d7cb8b78}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{dec36758-f59d-4e4c-a25f-60302fb31b87}</UniqueIdentifier>
+      <UniqueIdentifier>{cd90a289-8d18-40ee-8a7e-85184fe5cf1c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{2ddff7b2-4071-4aa1-abbd-2756fcbc8795}</UniqueIdentifier>
+      <UniqueIdentifier>{fc005db9-81d8-4b28-98d3-bbd6acc497b3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{f2c1ecd0-fd56-4db2-b974-2b354f181b85}</UniqueIdentifier>
+      <UniqueIdentifier>{9a67a4bf-571c-41cc-a611-de9d6cc397f3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{d986b7e9-9850-43e6-bb62-35b020b45498}</UniqueIdentifier>
+      <UniqueIdentifier>{3cd09893-9446-4981-8413-9f70611e6f72}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{78d5fa55-df7f-4ac0-acc3-84eb2c3f2790}</UniqueIdentifier>
+      <UniqueIdentifier>{f6d55c6d-3b92-47de-8f77-ad154548ec09}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{37a26ed5-0669-4b93-b073-4ad2ddd74711}</UniqueIdentifier>
+      <UniqueIdentifier>{ce179bde-8991-45ea-86b7-e229230cdebb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{3b5a355c-5a87-48ea-99ff-90d03acdc416}</UniqueIdentifier>
+      <UniqueIdentifier>{fbc550e6-b854-4257-be7b-cf4f02cc31ae}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{408f258a-a4b2-4a72-8e60-f4ef1e332f3a}</UniqueIdentifier>
+      <UniqueIdentifier>{89ffa61e-c01e-4c15-9da8-58fb4fe362f1}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{8e863afc-c74d-4bf8-97d6-7d18904b3508}</UniqueIdentifier>
+      <UniqueIdentifier>{0a9fd4be-af13-49b1-b892-205c93523ead}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{fb04e1c3-43c7-48e4-89d2-44d6d94dc04d}</UniqueIdentifier>
+      <UniqueIdentifier>{2e2f50ee-e05e-4b6e-b591-ad83996d2dfb}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{44d881cd-afce-4c66-8d8a-dcd23d2d87e1}</UniqueIdentifier>
+      <UniqueIdentifier>{09e946ef-06a5-44c9-a73f-de3b695bbc72}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{5c5e3271-c1f7-4c28-8ead-aa6e9bee6748}</UniqueIdentifier>
+      <UniqueIdentifier>{4ef2273d-2d80-442b-bdbe-5dd047fae2c7}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{c4a7c94f-7e34-4cd6-a241-950f0741556f}</UniqueIdentifier>
+      <UniqueIdentifier>{2207492d-3e67-45f6-944f-0be8c7efbd15}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{aa27a296-ccc2-4c88-adf3-42adc36260e8}</UniqueIdentifier>
+      <UniqueIdentifier>{0a8f6c27-4102-45ac-b91e-d0e5fdaa1a6d}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{55bb0826-ebfa-4cf2-a47a-ae75b9cdeed9}</UniqueIdentifier>
+      <UniqueIdentifier>{aab2565e-5ffe-49a2-b625-9e618ca84ad7}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{fa6cf3da-cf9d-4bef-8db7-152f22829f4d}</UniqueIdentifier>
+      <UniqueIdentifier>{c77e3731-e407-407c-af72-320628244900}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{9e2454f2-772e-4427-98f4-f0f4ce0c6925}</UniqueIdentifier>
+      <UniqueIdentifier>{d11ef2a6-c79a-4fb0-9833-f21b21bc3ebd}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{b6d09883-3564-495d-b791-2e40a176fc61}</UniqueIdentifier>
+      <UniqueIdentifier>{898d6c2d-db0c-46dc-9ce6-201dee10b76f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{e6aafcd8-9d02-4bbb-83c5-ea9ad3fef134}</UniqueIdentifier>
+      <UniqueIdentifier>{880bbec3-2850-4a37-8047-b2679330e5ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{e3a724a8-20a5-429e-9d40-8858a9d01f0c}</UniqueIdentifier>
+      <UniqueIdentifier>{12cf9be6-71df-48ed-98a5-c3aea1c5b269}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{33437c8a-12d1-4e8b-b07c-a3f323fd0c20}</UniqueIdentifier>
+      <UniqueIdentifier>{135927d4-fa42-49f1-8dec-0ec71eaca427}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{6868bd64-4e26-4f39-9b08-2f91808366df}</UniqueIdentifier>
+      <UniqueIdentifier>{62676cf3-e39f-400b-a1d7-52881e8105c0}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{e74c2849-e607-4bb4-87e6-64afebdeb545}</UniqueIdentifier>
+      <UniqueIdentifier>{3511a634-fa99-4892-b4e2-7547c842d934}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{13e2d91e-f72a-4514-9583-e4dc6b9689b4}</UniqueIdentifier>
+      <UniqueIdentifier>{04d2b390-eb35-4a00-8d91-866e807e7086}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{cc0ac382-4e88-4138-8024-ad74e9afc620}</UniqueIdentifier>
+      <UniqueIdentifier>{69bf1aea-2f85-4cec-be08-1e5977368372}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{47311622-fec5-4776-9a58-6fbd1e3483f8}</UniqueIdentifier>
+      <UniqueIdentifier>{46cbecec-83dc-4625-8091-61403d9ac93e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{aea5befd-5e2a-447c-b18e-2740e2acee4f}</UniqueIdentifier>
+      <UniqueIdentifier>{457a32db-452d-4687-af86-1706d713f84d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{36e4ed28-695d-459a-a3f7-2c2721fe2436}</UniqueIdentifier>
+      <UniqueIdentifier>{7000fb97-acce-4573-882e-a64413896e0d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{722b1dd1-df29-4355-a6f5-1f815c8a725b}</UniqueIdentifier>
+      <UniqueIdentifier>{fa99694a-a128-4713-ad97-54430747efae}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{dbac1bff-a6c6-4df1-bdb4-5735cf8449eb}</UniqueIdentifier>
+      <UniqueIdentifier>{683b8298-1187-4b29-8d68-2eb626c4b626}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{79c4656f-eeb7-4c3d-8407-1248c85ed8e4}</UniqueIdentifier>
+      <UniqueIdentifier>{603d6d0c-4fc3-4919-95df-ba61733b8a55}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{365c6961-c825-4a86-8174-a94127246964}</UniqueIdentifier>
+      <UniqueIdentifier>{a3dc0316-7858-4aa7-a509-e2b45144546a}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{915093c8-89bb-447f-9c20-b3201217d614}</UniqueIdentifier>
+      <UniqueIdentifier>{7c386d3e-213f-44ba-a4c9-2e8efbb18b11}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{2463d6e8-5890-47c3-ade5-eabaf4f28d28}</UniqueIdentifier>
+      <UniqueIdentifier>{a116cee8-ebbc-4d58-9c9e-f4c6907e5d67}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{76b06a55-58f5-4882-99f1-d4090e04749a}</UniqueIdentifier>
+      <UniqueIdentifier>{d51c8ca0-f358-4f10-9545-755d6fe64863}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{658b80fd-2488-4dca-b6a5-5a611a7ce819}</UniqueIdentifier>
+      <UniqueIdentifier>{a6d4b915-5f2f-46be-bea9-a38c80446035}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{46be7d47-7ac6-4967-b70d-00c565725876}</UniqueIdentifier>
+      <UniqueIdentifier>{55342d23-3ff9-4215-b7b5-f9df4427fc83}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{113f49c9-3a26-4e27-a74a-8e06ddfe3bce}</UniqueIdentifier>
+      <UniqueIdentifier>{62bf02c3-14b1-4846-b20c-03cd34209c14}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{203af477-d3f1-4677-a83d-043d0b814a9e}</UniqueIdentifier>
+      <UniqueIdentifier>{72e0e2b0-e862-4f3c-911b-b75701e2af0e}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{60f8307a-59f6-43c9-a2a3-7c088bc6fa48}</UniqueIdentifier>
+      <UniqueIdentifier>{ccafe570-fb71-4f94-b264-559d438441a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{205fd53a-8f6d-43fc-9cbc-a515103cceab}</UniqueIdentifier>
+      <UniqueIdentifier>{7356f94b-bbd2-420b-82bb-531102b60423}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth">
-      <UniqueIdentifier>{716a737b-4d0a-4cca-80e1-1fe840cf7024}</UniqueIdentifier>
+      <UniqueIdentifier>{60fe25d9-e477-480c-8482-53d4e5dc741e}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Header Files">
-      <UniqueIdentifier>{aaf8c364-18ba-44e2-a505-277d026c6cb2}</UniqueIdentifier>
+      <UniqueIdentifier>{836ab19d-2c5c-4a5a-b12a-345b5be436ca}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Source Files">
-      <UniqueIdentifier>{80ea117a-55f1-482e-898a-aae547fe7052}</UniqueIdentifier>
+      <UniqueIdentifier>{ad8b86e3-5082-48ee-997e-c324ab280ab2}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP">
-      <UniqueIdentifier>{2c91a081-22d1-488b-a95d-1679abf51bb0}</UniqueIdentifier>
+      <UniqueIdentifier>{62b25f88-b27d-4512-aab3-a751400e70d7}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Source Files">
-      <UniqueIdentifier>{ba630b21-48b6-43d2-a754-91edddd56cc6}</UniqueIdentifier>
+      <UniqueIdentifier>{240bfb70-e011-4cb4-a0cc-84d54c20e4a0}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Header Files">
-      <UniqueIdentifier>{6b80eeab-e573-445f-ae9c-5c3825660733}</UniqueIdentifier>
+      <UniqueIdentifier>{9cfe2823-6f90-4154-9e97-9bf7495b2479}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -306,9 +306,15 @@
     <ClInclude Include="src\ReactorTestSuite.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SocketConnectorTest.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\SocketReactorTest.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SocketProactorTest.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\MailMessageTest.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>
@@ -363,9 +369,6 @@
     <ClInclude Include="src\UDPServerTestSuite.h">
       <Filter>UDP\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\SocketProactorTest.h">
-      <Filter>Sockets\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\DNSTest.cpp">
@@ -506,9 +509,15 @@
     <ClCompile Include="src\ReactorTestSuite.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketConnectorTest.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\SocketReactorTest.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketProactorTest.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MailMessageTest.cpp">
       <Filter>Mail\Source Files</Filter>
     </ClCompile>
@@ -563,8 +572,5 @@
     <ClCompile Include="src\UDPServerTestSuite.cpp">
       <Filter>UDP\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\SocketProactorTest.cpp">
-      <Filter>Sockets\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Net/testsuite/TestSuite_vs170.vcxproj b/Net/testsuite/TestSuite_vs170.vcxproj
index 7ca673c7d..0d63842aa 100644
--- a/Net/testsuite/TestSuite_vs170.vcxproj
+++ b/Net/testsuite/TestSuite_vs170.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -56,120 +56,109 @@
     <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros"/>
+  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
+    <_ProjectFileVersion>16.0.32602.291</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
@@ -243,11 +232,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -275,11 +264,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -304,11 +293,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -336,11 +325,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -365,11 +354,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -397,11 +386,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -426,11 +415,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -458,11 +447,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -487,11 +476,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -519,11 +508,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -548,11 +537,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -580,11 +569,11 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
       <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -598,268 +587,143 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="src\DatagramSocketTest.h"/>
-    <ClInclude Include="src\DialogServer.h"/>
-    <ClInclude Include="src\DialogSocketTest.h"/>
-    <ClInclude Include="src\DNSTest.h"/>
-    <ClInclude Include="src\EchoServer.h"/>
-    <ClInclude Include="src\FTPClientSessionTest.h"/>
-    <ClInclude Include="src\FTPClientTestSuite.h"/>
-    <ClInclude Include="src\FTPStreamFactoryTest.h"/>
-    <ClInclude Include="src\HTMLFormTest.h"/>
-    <ClInclude Include="src\HTMLTestSuite.h"/>
-    <ClInclude Include="src\HTTPClientSessionTest.h"/>
-    <ClInclude Include="src\HTTPClientTestSuite.h"/>
-    <ClInclude Include="src\HTTPCookieTest.h"/>
-    <ClInclude Include="src\HTTPCredentialsTest.h"/>
-    <ClInclude Include="src\HTTPRequestTest.h"/>
-    <ClInclude Include="src\HTTPResponseTest.h"/>
-    <ClInclude Include="src\HTTPServerTest.h"/>
-    <ClInclude Include="src\HTTPServerTestSuite.h"/>
-    <ClInclude Include="src\HTTPStreamFactoryTest.h"/>
-    <ClInclude Include="src\HTTPTestServer.h"/>
-    <ClInclude Include="src\HTTPTestSuite.h"/>
-    <ClInclude Include="src\ICMPClientTest.h"/>
-    <ClInclude Include="src\ICMPClientTestSuite.h"/>
-    <ClInclude Include="src\ICMPSocketTest.h"/>
-    <ClInclude Include="src\IPAddressTest.h"/>
-    <ClInclude Include="src\MailMessageTest.h"/>
-    <ClInclude Include="src\MailStreamTest.h"/>
-    <ClInclude Include="src\MailTestSuite.h"/>
-    <ClInclude Include="src\MediaTypeTest.h"/>
-    <ClInclude Include="src\MessageHeaderTest.h"/>
-    <ClInclude Include="src\MessagesTestSuite.h"/>
-    <ClInclude Include="src\MulticastEchoServer.h"/>
-    <ClInclude Include="src\MulticastSocketTest.h"/>
-    <ClInclude Include="src\MultipartReaderTest.h"/>
-    <ClInclude Include="src\MultipartWriterTest.h"/>
-    <ClInclude Include="src\NameValueCollectionTest.h"/>
-    <ClInclude Include="src\NetCoreTestSuite.h"/>
-    <ClInclude Include="src\NetTestSuite.h"/>
-    <ClInclude Include="src\NetworkInterfaceTest.h"/>
-    <ClInclude Include="src\NTLMCredentialsTest.h"/>
-    <ClInclude Include="src\NTPClientTest.h"/>
-    <ClInclude Include="src\NTPClientTestSuite.h"/>
-    <ClInclude Include="src\OAuth10CredentialsTest.h"/>
-    <ClInclude Include="src\OAuth20CredentialsTest.h"/>
-    <ClInclude Include="src\OAuthTestSuite.h"/>
-    <ClInclude Include="src\PollSetTest.h"/>
-    <ClInclude Include="src\POP3ClientSessionTest.h"/>
-    <ClInclude Include="src\QuotedPrintableTest.h"/>
-    <ClInclude Include="src\RawSocketTest.h"/>
-    <ClInclude Include="src\ReactorTestSuite.h"/>
-    <ClInclude Include="src\SMTPClientSessionTest.h"/>
-    <ClInclude Include="src\SocketAddressTest.h"/>
-    <ClInclude Include="src\SocketReactorTest.h"/>
-    <ClInclude Include="src\SocketsTestSuite.h"/>
-    <ClInclude Include="src\SocketStreamTest.h"/>
-    <ClInclude Include="src\SocketTest.h"/>
-    <ClInclude Include="src\SyslogTest.h"/>
-    <ClInclude Include="src\TCPServerTest.h"/>
-    <ClInclude Include="src\TCPServerTestSuite.h"/>
-    <ClInclude Include="src\UDPEchoServer.h"/>
-    <ClInclude Include="src\UDPServerTest.h"/>
-    <ClInclude Include="src\UDPServerTestSuite.h"/>
-    <ClInclude Include="src\WebSocketTest.h"/>
-    <ClInclude Include="src\WebSocketTestSuite.h"/>
+    <ClInclude Include="src\DatagramSocketTest.h" />
+    <ClInclude Include="src\DialogServer.h" />
+    <ClInclude Include="src\DialogSocketTest.h" />
+    <ClInclude Include="src\DNSTest.h" />
+    <ClInclude Include="src\EchoServer.h" />
+    <ClInclude Include="src\FTPClientSessionTest.h" />
+    <ClInclude Include="src\FTPClientTestSuite.h" />
+    <ClInclude Include="src\FTPStreamFactoryTest.h" />
+    <ClInclude Include="src\HTMLFormTest.h" />
+    <ClInclude Include="src\HTMLTestSuite.h" />
+    <ClInclude Include="src\HTTPClientSessionTest.h" />
+    <ClInclude Include="src\HTTPClientTestSuite.h" />
+    <ClInclude Include="src\HTTPCookieTest.h" />
+    <ClInclude Include="src\HTTPCredentialsTest.h" />
+    <ClInclude Include="src\HTTPRequestTest.h" />
+    <ClInclude Include="src\HTTPResponseTest.h" />
+    <ClInclude Include="src\HTTPServerTest.h" />
+    <ClInclude Include="src\HTTPServerTestSuite.h" />
+    <ClInclude Include="src\HTTPStreamFactoryTest.h" />
+    <ClInclude Include="src\HTTPTestServer.h" />
+    <ClInclude Include="src\HTTPTestSuite.h" />
+    <ClInclude Include="src\ICMPClientTest.h" />
+    <ClInclude Include="src\ICMPClientTestSuite.h" />
+    <ClInclude Include="src\ICMPSocketTest.h" />
+    <ClInclude Include="src\IPAddressTest.h" />
+    <ClInclude Include="src\MailMessageTest.h" />
+    <ClInclude Include="src\MailStreamTest.h" />
+    <ClInclude Include="src\MailTestSuite.h" />
+    <ClInclude Include="src\MediaTypeTest.h" />
+    <ClInclude Include="src\MessageHeaderTest.h" />
+    <ClInclude Include="src\MessagesTestSuite.h" />
+    <ClInclude Include="src\MulticastEchoServer.h" />
+    <ClInclude Include="src\MulticastSocketTest.h" />
+    <ClInclude Include="src\MultipartReaderTest.h" />
+    <ClInclude Include="src\MultipartWriterTest.h" />
+    <ClInclude Include="src\NameValueCollectionTest.h" />
+    <ClInclude Include="src\NetCoreTestSuite.h" />
+    <ClInclude Include="src\NetTestSuite.h" />
+    <ClInclude Include="src\NetworkInterfaceTest.h" />
+    <ClInclude Include="src\NTLMCredentialsTest.h" />
+    <ClInclude Include="src\NTPClientTest.h" />
+    <ClInclude Include="src\NTPClientTestSuite.h" />
+    <ClInclude Include="src\OAuth10CredentialsTest.h" />
+    <ClInclude Include="src\OAuth20CredentialsTest.h" />
+    <ClInclude Include="src\OAuthTestSuite.h" />
+    <ClInclude Include="src\PollSetTest.h" />
+    <ClInclude Include="src\POP3ClientSessionTest.h" />
+    <ClInclude Include="src\QuotedPrintableTest.h" />
+    <ClInclude Include="src\RawSocketTest.h" />
+    <ClInclude Include="src\ReactorTestSuite.h" />
+    <ClInclude Include="src\SMTPClientSessionTest.h" />
+    <ClInclude Include="src\SocketAddressTest.h" />
+    <ClInclude Include="src\SocketConnectorTest.h" />
+    <ClInclude Include="src\SocketProactorTest.h" />
+    <ClInclude Include="src\SocketReactorTest.h" />
+    <ClInclude Include="src\SocketsTestSuite.h" />
+    <ClInclude Include="src\SocketStreamTest.h" />
+    <ClInclude Include="src\SocketTest.h" />
+    <ClInclude Include="src\SyslogTest.h" />
+    <ClInclude Include="src\TCPServerTest.h" />
+    <ClInclude Include="src\TCPServerTestSuite.h" />
+    <ClInclude Include="src\UDPEchoServer.h" />
+    <ClInclude Include="src\UDPServerTest.h" />
+    <ClInclude Include="src\UDPServerTestSuite.h" />
+    <ClInclude Include="src\WebSocketTest.h" />
+    <ClInclude Include="src\WebSocketTestSuite.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\DatagramSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DialogServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DialogSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\DNSTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\Driver.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\EchoServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\FTPStreamFactoryTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTMLFormTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTMLTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCookieTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPCredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPRequestTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPResponseTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPServerTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPStreamFactoryTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPTestServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\HTTPTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPClientTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ICMPSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\IPAddressTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailMessageTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailStreamTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MailTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MediaTypeTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MessageHeaderTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MessagesTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MulticastEchoServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MulticastSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartReaderTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\MultipartWriterTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NameValueCollectionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetCoreTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NetworkInterfaceTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTLMCredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPClientTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\NTPClientTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth10CredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuth20CredentialsTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\OAuthTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\PollSetTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\POP3ClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\RawSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\ReactorTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SMTPClientSessionTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketAddressTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketReactorTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketsTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketStreamTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\SyslogTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\TCPServerTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPEchoServer.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPServerTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\UDPServerTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocketTest.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ClCompile Include="src\WebSocketTestSuite.cpp">
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
+    <ClCompile Include="src\DatagramSocketTest.cpp" />
+    <ClCompile Include="src\DialogServer.cpp" />
+    <ClCompile Include="src\DialogSocketTest.cpp" />
+    <ClCompile Include="src\DNSTest.cpp" />
+    <ClCompile Include="src\Driver.cpp" />
+    <ClCompile Include="src\EchoServer.cpp" />
+    <ClCompile Include="src\FTPClientSessionTest.cpp" />
+    <ClCompile Include="src\FTPClientTestSuite.cpp" />
+    <ClCompile Include="src\FTPStreamFactoryTest.cpp" />
+    <ClCompile Include="src\HTMLFormTest.cpp" />
+    <ClCompile Include="src\HTMLTestSuite.cpp" />
+    <ClCompile Include="src\HTTPClientSessionTest.cpp" />
+    <ClCompile Include="src\HTTPClientTestSuite.cpp" />
+    <ClCompile Include="src\HTTPCookieTest.cpp" />
+    <ClCompile Include="src\HTTPCredentialsTest.cpp" />
+    <ClCompile Include="src\HTTPRequestTest.cpp" />
+    <ClCompile Include="src\HTTPResponseTest.cpp" />
+    <ClCompile Include="src\HTTPServerTest.cpp" />
+    <ClCompile Include="src\HTTPServerTestSuite.cpp" />
+    <ClCompile Include="src\HTTPStreamFactoryTest.cpp" />
+    <ClCompile Include="src\HTTPTestServer.cpp" />
+    <ClCompile Include="src\HTTPTestSuite.cpp" />
+    <ClCompile Include="src\ICMPClientTest.cpp" />
+    <ClCompile Include="src\ICMPClientTestSuite.cpp" />
+    <ClCompile Include="src\ICMPSocketTest.cpp" />
+    <ClCompile Include="src\IPAddressTest.cpp" />
+    <ClCompile Include="src\MailMessageTest.cpp" />
+    <ClCompile Include="src\MailStreamTest.cpp" />
+    <ClCompile Include="src\MailTestSuite.cpp" />
+    <ClCompile Include="src\MediaTypeTest.cpp" />
+    <ClCompile Include="src\MessageHeaderTest.cpp" />
+    <ClCompile Include="src\MessagesTestSuite.cpp" />
+    <ClCompile Include="src\MulticastEchoServer.cpp" />
+    <ClCompile Include="src\MulticastSocketTest.cpp" />
+    <ClCompile Include="src\MultipartReaderTest.cpp" />
+    <ClCompile Include="src\MultipartWriterTest.cpp" />
+    <ClCompile Include="src\NameValueCollectionTest.cpp" />
+    <ClCompile Include="src\NetCoreTestSuite.cpp" />
+    <ClCompile Include="src\NetTestSuite.cpp" />
+    <ClCompile Include="src\NetworkInterfaceTest.cpp" />
+    <ClCompile Include="src\NTLMCredentialsTest.cpp" />
+    <ClCompile Include="src\NTPClientTest.cpp" />
+    <ClCompile Include="src\NTPClientTestSuite.cpp" />
+    <ClCompile Include="src\OAuth10CredentialsTest.cpp" />
+    <ClCompile Include="src\OAuth20CredentialsTest.cpp" />
+    <ClCompile Include="src\OAuthTestSuite.cpp" />
+    <ClCompile Include="src\PollSetTest.cpp" />
+    <ClCompile Include="src\POP3ClientSessionTest.cpp" />
+    <ClCompile Include="src\QuotedPrintableTest.cpp" />
+    <ClCompile Include="src\RawSocketTest.cpp" />
+    <ClCompile Include="src\ReactorTestSuite.cpp" />
+    <ClCompile Include="src\SMTPClientSessionTest.cpp" />
+    <ClCompile Include="src\SocketAddressTest.cpp" />
+    <ClCompile Include="src\SocketConnectorTest.cpp" />
+    <ClCompile Include="src\SocketProactorTest.cpp" />
+    <ClCompile Include="src\SocketReactorTest.cpp" />
+    <ClCompile Include="src\SocketsTestSuite.cpp" />
+    <ClCompile Include="src\SocketStreamTest.cpp" />
+    <ClCompile Include="src\SocketTest.cpp" />
+    <ClCompile Include="src\SyslogTest.cpp" />
+    <ClCompile Include="src\TCPServerTest.cpp" />
+    <ClCompile Include="src\TCPServerTestSuite.cpp" />
+    <ClCompile Include="src\UDPEchoServer.cpp" />
+    <ClCompile Include="src\UDPServerTest.cpp" />
+    <ClCompile Include="src\UDPServerTestSuite.cpp" />
+    <ClCompile Include="src\WebSocketTest.cpp" />
+    <ClCompile Include="src\WebSocketTestSuite.cpp" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
-  <ImportGroup Label="ExtensionTargets"/>
-</Project>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Net/testsuite/TestSuite_vs170.vcxproj.filters b/Net/testsuite/TestSuite_vs170.vcxproj.filters
index 9a6fca15e..4771142e6 100644
--- a/Net/testsuite/TestSuite_vs170.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs170.vcxproj.filters
@@ -2,172 +2,172 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{80a23f01-4531-4f3b-a8ca-fe78c03b1408}</UniqueIdentifier>
+      <UniqueIdentifier>{bb5f99a4-076d-40f6-bd03-b605e2f78942}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{b305921d-e7cf-4a81-99e3-adfe8d0a537c}</UniqueIdentifier>
+      <UniqueIdentifier>{370ee1f9-94d6-46c9-9cfd-ae9a82e4215e}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{dccbf492-f74a-4d6c-bb87-8003ff3a9e9d}</UniqueIdentifier>
+      <UniqueIdentifier>{659db2c3-80b4-4646-9df5-9ea4def9cb97}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{07b95595-e829-42ef-b837-8cad68d8f193}</UniqueIdentifier>
+      <UniqueIdentifier>{135d073c-c9d2-46f3-9f18-8692661c6a80}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{0fc30d77-4358-4f87-90c0-d714a0eb19b9}</UniqueIdentifier>
+      <UniqueIdentifier>{4cea6005-eb6b-4067-8254-b2c023c162b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{f0f54f17-cada-443d-9d03-7b1418289ed8}</UniqueIdentifier>
+      <UniqueIdentifier>{3718fde6-4856-4136-8951-ec466b8db23d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{dcb3c123-083f-4ee0-98be-799a2d2366fd}</UniqueIdentifier>
+      <UniqueIdentifier>{ef1aacf2-69b0-4f45-a2fa-d6273e7de591}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{1b435f0d-5fa5-431f-bd17-766e2a2459cd}</UniqueIdentifier>
+      <UniqueIdentifier>{4379c133-cd56-4860-9c0e-1c3169ab30ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{43d2f8eb-4cda-46bc-9585-3dadfc88a950}</UniqueIdentifier>
+      <UniqueIdentifier>{c913a0b8-78bf-41ad-bded-a1f9a8b37902}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{28a66a03-7776-4eec-bba2-f87359f6d809}</UniqueIdentifier>
+      <UniqueIdentifier>{057f1290-2c76-46e8-8dfc-da11d02253ef}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{f3b535f9-1e70-4cde-b4e9-5eb67644cd33}</UniqueIdentifier>
+      <UniqueIdentifier>{5a50683c-8e6a-400b-a50f-9eb7b74a6b12}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{4bb6a7fe-876f-44a6-9e17-0333ab6c1d7f}</UniqueIdentifier>
+      <UniqueIdentifier>{32ed4d09-4da4-4316-8211-0dabc2ecba44}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{4cc8c197-7e23-4c1c-8b7a-2a2dba8de2af}</UniqueIdentifier>
+      <UniqueIdentifier>{a9b5b4c6-2436-46aa-bc18-79d150dc29c7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{8623dea2-813f-4205-8a6c-715b91e61a2c}</UniqueIdentifier>
+      <UniqueIdentifier>{ca0b80f5-478b-497c-bf9e-7bb0d3b0eb62}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{719153b6-2c83-45f3-8cfc-fc80a73567ae}</UniqueIdentifier>
+      <UniqueIdentifier>{7f42dbcb-7c13-42ff-9f99-d4ce0d333515}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{53477182-261e-4727-8b9d-9539e7a1edff}</UniqueIdentifier>
+      <UniqueIdentifier>{a8ace8af-b953-4ee5-9e7a-3cd7a54a78c0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{4b7f1319-a364-47f3-9ae4-8811e883a192}</UniqueIdentifier>
+      <UniqueIdentifier>{ea6141c5-7525-4a5b-b339-cd124ed4f22b}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{3ba1dd27-4c82-4eab-ad4a-5e1ed20f28bf}</UniqueIdentifier>
+      <UniqueIdentifier>{53842cf1-f516-431d-8eb5-e82dd686a69a}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{edbb5a8c-0318-4710-b88b-ae719d68f077}</UniqueIdentifier>
+      <UniqueIdentifier>{b416b22f-fbf5-40c0-87db-11757f720182}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{03f9312f-dae4-4fb4-a28c-a4ce5da2624d}</UniqueIdentifier>
+      <UniqueIdentifier>{61beb9b6-7056-4521-84b3-fae105421be5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{3b810fae-162f-4bcc-8234-9fcefdba2cf6}</UniqueIdentifier>
+      <UniqueIdentifier>{0e63a36b-a325-42da-8557-9be5b90249f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{21b9cc82-6773-48d4-aa63-3cff40ab1ec2}</UniqueIdentifier>
+      <UniqueIdentifier>{f1394d79-96e4-4eed-bfc4-d20f25b9430b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{370a8827-d61e-4399-8eb2-33701b7021c4}</UniqueIdentifier>
+      <UniqueIdentifier>{ddabcfb2-56ba-49be-adb7-af8fb9d3ef97}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{6c02c84c-25bc-49e1-86db-abff65560751}</UniqueIdentifier>
+      <UniqueIdentifier>{021d4d11-8236-4574-a893-53d52a246d4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{30c64a4d-748a-4a68-97d3-cde3e52b557d}</UniqueIdentifier>
+      <UniqueIdentifier>{3ce8c86d-1258-488f-84be-7e95b3e0a540}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{1f3f1846-5369-4466-9418-fc889ca52f69}</UniqueIdentifier>
+      <UniqueIdentifier>{10ac33f6-f9c0-4caa-8bf4-e0d27328842d}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{7ca19ff0-c7a3-4b9b-8495-c3ec1fc50a9f}</UniqueIdentifier>
+      <UniqueIdentifier>{244449a7-8c64-48e7-9112-209ef80e7cc3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{e042b21a-6bcf-4f43-ba85-3086cbbee2a8}</UniqueIdentifier>
+      <UniqueIdentifier>{39201469-efa7-45cc-89d4-41e6126221e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{84e40084-f0b8-4a21-8904-2faa832bdd03}</UniqueIdentifier>
+      <UniqueIdentifier>{1f58cb9c-30a1-4dff-813a-c315c41e1540}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{d0de955f-29d4-4a81-955a-3c784c01cf7e}</UniqueIdentifier>
+      <UniqueIdentifier>{dbc10ea1-5b42-469b-9358-ff12f39d8682}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{819ea085-061f-4ea8-9028-98568051d097}</UniqueIdentifier>
+      <UniqueIdentifier>{2f616086-6096-4c84-9622-6fffc25be1e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{d8ccb88d-e769-47a8-b36f-9aeea80bd691}</UniqueIdentifier>
+      <UniqueIdentifier>{f9cd5b41-fc85-4e81-a08b-69f11f9aa058}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{a3d082d9-39ec-4c11-87f0-7f58579a359b}</UniqueIdentifier>
+      <UniqueIdentifier>{0a43d4b7-1310-420d-9d69-b1deb7e0be39}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{e4eddd0f-9e2b-4f64-bedc-b86737d4092a}</UniqueIdentifier>
+      <UniqueIdentifier>{aa486584-1762-4de5-abc4-0bca8749ef07}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{9cfd54aa-2da9-4edf-bb59-0d602c93ccb2}</UniqueIdentifier>
+      <UniqueIdentifier>{800eea8c-e13c-40aa-a581-b3af74ef6a74}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{3b904c33-c3a2-4d87-82af-17f854c42055}</UniqueIdentifier>
+      <UniqueIdentifier>{897be9b0-379b-4005-b6ec-c633df4aa0a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{fa8639c1-4c30-47a0-9f9c-231d40f2cb50}</UniqueIdentifier>
+      <UniqueIdentifier>{5326e350-6c82-4b47-b8bb-acf10c40f9a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{0ee3c1d2-93c4-487b-b28b-cfbb55fd6ece}</UniqueIdentifier>
+      <UniqueIdentifier>{f2edd76d-ba16-4ee2-a68b-7d9e9f800879}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{604f1097-7648-4148-a82c-a120fd6c188c}</UniqueIdentifier>
+      <UniqueIdentifier>{db1a8466-0305-4faa-9fe6-20fa535c1d80}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{1d707628-bf82-4192-96f9-422ee627964b}</UniqueIdentifier>
+      <UniqueIdentifier>{2d22c5e1-721b-4d19-b698-8773ddc4dabc}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{8a697d9f-806f-459d-8c5d-7d7c932d3770}</UniqueIdentifier>
+      <UniqueIdentifier>{0bbba14e-6a39-455c-aec1-15af68b3bc73}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{20cf1891-7950-407a-a6c7-2492512d55f7}</UniqueIdentifier>
+      <UniqueIdentifier>{c92f3301-00f6-4491-beba-14937b1f3e68}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{dc2a5cf2-dc5b-4241-a7b5-9609e5d967f6}</UniqueIdentifier>
+      <UniqueIdentifier>{f6af5476-f273-4302-9e9b-5b6d0d1cbfb2}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{e2ddc463-cabd-4107-9676-225e0e09976a}</UniqueIdentifier>
+      <UniqueIdentifier>{804c7c07-44a1-4d61-be02-c6cc8b279420}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{8d645c2f-f0ff-4fed-bab0-358fbccbacd2}</UniqueIdentifier>
+      <UniqueIdentifier>{b8618dd9-3ad3-4ace-94e8-a74c69d9d2e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{23a616c5-b310-4469-b7b1-31af5f9e9b26}</UniqueIdentifier>
+      <UniqueIdentifier>{5696d5bc-86ff-43a9-b49c-9f9d45940500}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{3e6292d5-dbe3-41f5-a72f-11503458171f}</UniqueIdentifier>
+      <UniqueIdentifier>{08a48a0b-85b2-43c9-b359-f08ae91631d5}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{c6646cf7-b42b-400a-ab97-ee2ff5643b87}</UniqueIdentifier>
+      <UniqueIdentifier>{c5cf5e44-9907-4ecd-9fcd-075c862a0282}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{5c950f05-6893-4d55-b76f-842d86c30521}</UniqueIdentifier>
+      <UniqueIdentifier>{ebe4a4ae-edae-4c4f-9f4c-c05da0288028}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{6abc6401-3ba5-4db7-bee7-874a0aac149e}</UniqueIdentifier>
+      <UniqueIdentifier>{57c8332e-5bc0-464a-ba23-717a5ad8d7e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth">
-      <UniqueIdentifier>{8853ce9e-ec54-45cf-9ffd-65d449b53bc8}</UniqueIdentifier>
+      <UniqueIdentifier>{d8b00c86-03af-40df-8e84-2ba586a9e97c}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Header Files">
-      <UniqueIdentifier>{4f56fe61-0453-4599-afc4-030494d65493}</UniqueIdentifier>
+      <UniqueIdentifier>{0ed1b87d-86e0-4883-9889-f8ca060cb9ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="OAuth\Source Files">
-      <UniqueIdentifier>{ee96aa55-9832-429f-b733-d58d354cf6a3}</UniqueIdentifier>
+      <UniqueIdentifier>{f3304f4b-f410-46d9-879d-66f81e13e1cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP">
-      <UniqueIdentifier>{560db2da-4e78-4912-83e3-dd6de45228b1}</UniqueIdentifier>
+      <UniqueIdentifier>{fa35d4ea-24c8-4d08-a14d-d92fd1cb7d9f}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Source Files">
-      <UniqueIdentifier>{92ebe717-b3ae-404d-97cd-ee8ea4522544}</UniqueIdentifier>
+      <UniqueIdentifier>{494ab2d2-7191-46ce-adfa-12fe16cd45e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="UDP\Header Files">
-      <UniqueIdentifier>{83c2c157-48a3-48f3-b876-ca52b860fb69}</UniqueIdentifier>
+      <UniqueIdentifier>{3cb06642-ffbd-4684-b1f0-cfe3f3ad4bff}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -306,9 +306,15 @@
     <ClInclude Include="src\ReactorTestSuite.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SocketConnectorTest.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\SocketReactorTest.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SocketProactorTest.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\MailMessageTest.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>
@@ -503,9 +509,15 @@
     <ClCompile Include="src\ReactorTestSuite.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketConnectorTest.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\SocketReactorTest.cpp">
       <Filter>Reactor\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SocketProactorTest.cpp">
+      <Filter>Reactor\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MailMessageTest.cpp">
       <Filter>Mail\Source Files</Filter>
     </ClCompile>
diff --git a/Net/testsuite/TestSuite_vs90.vcproj b/Net/testsuite/TestSuite_vs90.vcproj
index 465fc9dc9..68d782f5e 100644
--- a/Net/testsuite/TestSuite_vs90.vcproj
+++ b/Net/testsuite/TestSuite_vs90.vcproj
@@ -1050,10 +1050,18 @@
 					RelativePath=".\src\ReactorTestSuite.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\SocketConnectorTest.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\SocketReactorTest.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\SocketProactorTest.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Source Files"
@@ -1062,10 +1070,18 @@
 					RelativePath=".\src\ReactorTestSuite.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\SocketConnectorTest.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\SocketReactorTest.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\SocketProactorTest.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1299,4 +1315,4 @@
 	</Files>
 	<Globals>
 	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file
diff --git a/Net/testsuite/src/DNSTest.cpp b/Net/testsuite/src/DNSTest.cpp
index 9f442edcc..12ad53080 100644
--- a/Net/testsuite/src/DNSTest.cpp
+++ b/Net/testsuite/src/DNSTest.cpp
@@ -104,11 +104,11 @@ void DNSTest::testResolve()
 
 void DNSTest::testEncodeIDN()
 {
-	std::string idn("d\xc3\xb6m\xc3\xa4in.example"); // d"om"ain.example 
+	std::string idn("d\xc3\xb6m\xc3\xa4in.example"); // d"om"ain.example
 	assertTrue (DNS::isIDN(idn));
 	assertTrue (DNS::encodeIDN(idn) == "xn--dmin-moa0i.example");
 
-	idn = ".d\xc3\xb6m\xc3\xa4in.example"; // .d"om"ain.example 
+	idn = ".d\xc3\xb6m\xc3\xa4in.example"; // .d"om"ain.example
 	assertTrue (DNS::isIDN(idn));
 	assertTrue (DNS::encodeIDN(idn) == ".xn--dmin-moa0i.example");
 
@@ -154,11 +154,11 @@ void DNSTest::testDecodeIDN()
 {
 	std::string enc("xn--dmin-moa0i.example");
 	assertTrue (DNS::isEncodedIDN(enc));
-	assertTrue (DNS::decodeIDN(enc) == "d\xc3\xb6m\xc3\xa4in.example"); // d"om"ain.example 
+	assertTrue (DNS::decodeIDN(enc) == "d\xc3\xb6m\xc3\xa4in.example"); // d"om"ain.example
 
 	enc = ".xn--dmin-moa0i.example";
 	assertTrue (DNS::isEncodedIDN(enc));
-	assertTrue (DNS::decodeIDN(enc) == ".d\xc3\xb6m\xc3\xa4in.example"); // .d"om"ain.example 
+	assertTrue (DNS::decodeIDN(enc) == ".d\xc3\xb6m\xc3\xa4in.example"); // .d"om"ain.example
 
 	enc = "xn--dmin-moa0i.example.";
 	assertTrue (DNS::isEncodedIDN(enc));
diff --git a/Net/testsuite/src/DialogServer.cpp b/Net/testsuite/src/DialogServer.cpp
index 12416827b..36cc1889f 100644
--- a/Net/testsuite/src/DialogServer.cpp
+++ b/Net/testsuite/src/DialogServer.cpp
@@ -97,7 +97,7 @@ void DialogServer::run()
 const std::string& DialogServer::lastCommand() const
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	static const std::string EMPTY;
 	if (_lastCommands.empty())
 		return EMPTY;
@@ -145,7 +145,7 @@ void DialogServer::addResponse(const std::string& response)
 	_nextResponses.push_back(response);
 }
 
-	
+
 void DialogServer::clearCommands()
 {
 	FastMutex::ScopedLock lock(_mutex);
@@ -153,11 +153,11 @@ void DialogServer::clearCommands()
 	_lastCommands.clear();
 }
 
-		
+
 void DialogServer::clearResponses()
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	_nextResponses.clear();
 }
 
diff --git a/Net/testsuite/src/DialogServer.h b/Net/testsuite/src/DialogServer.h
index 8c1e0e0ba..09fccb76e 100644
--- a/Net/testsuite/src/DialogServer.h
+++ b/Net/testsuite/src/DialogServer.h
@@ -36,10 +36,10 @@ public:
 	Poco::UInt16 port() const;
 		/// Returns the port the echo server is
 		/// listening on.
-		
+
 	void run();
 		/// Does the work.
-		
+
 	const std::string& lastCommand() const;
 		/// Returns the last command received by the server.
 
@@ -52,29 +52,29 @@ public:
 
 	const std::vector<std::string>& lastCommands() const;
 		/// Returns the last command received by the server.
-		
+
 	void addResponse(const std::string& response);
 		/// Sets the next response returned by the server.
-	
+
 	void clearCommands();
 		/// Clears all commands.
-		
+
 	void clearResponses();
 		/// Clears all responses.
-		
+
 	void log(bool flag);
 		/// Enables or disables logging to stdout.
-	
+
 private:
 	Poco::Net::ServerSocket  _socket;
 	Poco::Thread             _thread;
 	Poco::Event              _ready;
 	mutable Poco::FastMutex  _mutex;
-	bool                     _stop;
+	std::atomic<bool>        _stop;
 	std::vector<std::string> _nextResponses;
 	std::vector<std::string> _lastCommands;
-	bool                     _acceptCommands;
-	bool                     _log;
+	std::atomic<bool>        _acceptCommands;
+	std::atomic<bool>        _log;
 };
 
 
diff --git a/Net/testsuite/src/DialogSocketTest.cpp b/Net/testsuite/src/DialogSocketTest.cpp
index 2b6a5538c..35828ed10 100644
--- a/Net/testsuite/src/DialogSocketTest.cpp
+++ b/Net/testsuite/src/DialogSocketTest.cpp
@@ -45,11 +45,11 @@ void DialogSocketTest::testDialogSocket()
 	ds.sendString("Hello, World!\n");
 	ds.receiveMessage(str);
 	assertTrue (str == "Hello, World!");
-	
+
 	ds.sendMessage("EHLO", "appinf.com");
 	ds.receiveMessage(str);
 	assertTrue (str == "EHLO appinf.com");
-	
+
 	ds.sendMessage("PUT", "local.txt", "remote.txt");
 	ds.receiveMessage(str);
 	assertTrue (str == "PUT local.txt remote.txt");
@@ -58,12 +58,12 @@ void DialogSocketTest::testDialogSocket()
 	int status = ds.receiveStatusMessage(str);
 	assertTrue (status == 220);
 	assertTrue (str == "220 Hello, world!");
-	
+
 	ds.sendString("220-line1\r\n220 line2\r\n");
 	status = ds.receiveStatusMessage(str);
 	assertTrue (status == 220);
 	assertTrue (str == "220-line1\n220 line2");
-	
+
 	ds.sendString("220-line1\r\nline2\r\n220 line3\r\n");
 	status = ds.receiveStatusMessage(str);
 	assertTrue (status == 220);
@@ -73,7 +73,7 @@ void DialogSocketTest::testDialogSocket()
 	status = ds.receiveStatusMessage(str);
 	assertTrue (status == 0);
 	assertTrue (str == "Hello, world!");
-	
+
 	ds.sendString("Header\nMore Bytes");
 	status = ds.receiveStatusMessage(str);
 	assertTrue (status == 0);
diff --git a/Net/testsuite/src/EchoServer.h b/Net/testsuite/src/EchoServer.h
index 4ff35baee..3df637450 100644
--- a/Net/testsuite/src/EchoServer.h
+++ b/Net/testsuite/src/EchoServer.h
@@ -18,6 +18,7 @@
 #include "Poco/Net/ServerSocket.h"
 #include "Poco/Thread.h"
 #include "Poco/Event.h"
+#include <atomic>
 
 
 class EchoServer: public Poco::Runnable
@@ -50,8 +51,8 @@ private:
 	Poco::Net::ServerSocket _socket;
 	Poco::Thread _thread;
 	Poco::Event  _ready;
-	bool         _stop;
-	bool         _done;
+	std::atomic<bool> _stop;
+	std::atomic<bool> _done;
 };
 
 
diff --git a/Net/testsuite/src/FTPClientSessionTest.cpp b/Net/testsuite/src/FTPClientSessionTest.cpp
index ba804bd24..c2382f9e7 100644
--- a/Net/testsuite/src/FTPClientSessionTest.cpp
+++ b/Net/testsuite/src/FTPClientSessionTest.cpp
@@ -42,9 +42,9 @@ namespace
 			_session(session)
 		{
 		}
-		
+
 		ActiveMethod<std::string, std::string, ActiveDownloader> download;
-		
+
 	protected:
 		std::string downloadImp(const std::string& path)
 		{
@@ -54,7 +54,7 @@ namespace
 			_session.endDownload();
 			return ostr.str();
 		}
-		
+
 	private:
 		FTPClientSession& _session;
 	};
@@ -83,7 +83,7 @@ void FTPClientSessionTest::login(DialogServer& server, FTPClientSession& session
 	assertTrue (cmd == "PASS password");
 	cmd = server.popCommand();
 	assertTrue (cmd == "TYPE I");
-	
+
 	assertTrue (session.getFileType() == FTPClientSession::TYPE_BINARY);
 }
 
@@ -179,7 +179,7 @@ void FTPClientSessionTest::testLoginFailed1()
 	catch (FTPException&)
 	{
 	}
-	server.addResponse("221 Good Bye");	
+	server.addResponse("221 Good Bye");
 	session.close();
 }
 
@@ -219,7 +219,7 @@ void FTPClientSessionTest::testCommands()
 	assertTrue (cmd == "PASS password");
 	cmd = server.popCommand();
 	assertTrue (cmd == "TYPE I");
-	
+
 	// systemType
 	server.clearCommands();
 	server.addResponse("215 UNIX Type: L8 Version: dummyFTP 1.0");
@@ -227,7 +227,7 @@ void FTPClientSessionTest::testCommands()
 	cmd = server.popCommand();
 	assertTrue (cmd == "SYST");
 	assertTrue (type == "UNIX Type: L8 Version: dummyFTP 1.0");
-	
+
 	// getWorkingDirectory
 	server.addResponse("257 \"/usr/test\" is current directory");
 	std::string cwd = session.getWorkingDirectory();
@@ -241,18 +241,18 @@ void FTPClientSessionTest::testCommands()
 	cmd = server.popCommand();
 	assertTrue (cmd == "PWD");
 	assertTrue (cwd == "\"quote\"");
-	
+
 	// setWorkingDirectory
 	server.addResponse("250 CWD OK");
 	session.setWorkingDirectory("test");
 	cmd = server.popCommand();
 	assertTrue (cmd == "CWD test");
-	
+
 	server.addResponse("250 CDUP OK");
 	session.cdup();
 	cmd = server.popCommand();
 	assertTrue (cmd == "CDUP");
-	
+
 	// rename
 	server.addResponse("350 File exists, send destination name");
 	server.addResponse("250 Rename OK");
@@ -261,7 +261,7 @@ void FTPClientSessionTest::testCommands()
 	assertTrue (cmd == "RNFR old.txt");
 	cmd = server.popCommand();
 	assertTrue (cmd == "RNTO new.txt");
-	
+
 	// rename (failing)
 	server.addResponse("550 not found");
 	try
@@ -273,7 +273,7 @@ void FTPClientSessionTest::testCommands()
 	{
 	}
 	server.clearCommands();
-	
+
 	// remove
 	server.addResponse("250 delete ok");
 	session.remove("test.txt");
@@ -327,7 +327,7 @@ void FTPClientSessionTest::testCommands()
 	{
 	}
 	server.clearCommands();
-		
+
 	server.addResponse("221 Good Bye");
 	session.close();
 }
@@ -344,17 +344,17 @@ void FTPClientSessionTest::testDownloadPORT()
 	session.setPassive(false);
 	session.login("user", "password");
 	server.clearCommands();
-	
+
 	server.addResponse("500 EPRT not understood");
 	server.addResponse("200 PORT OK");
 	server.addResponse("150 Sending data\r\n226 Transfer complete");
 
 	ActiveDownloader dl(session);
 	ActiveResult<std::string> result = dl.download("test.txt");
-		
+
 	std::string cmd = server.popCommandWait();
 	assertTrue (cmd.substr(0, 4) == "EPRT");
-	
+
 	cmd = server.popCommandWait();
 	assertTrue (cmd.substr(0, 4) == "PORT");
 
@@ -382,7 +382,7 @@ void FTPClientSessionTest::testDownloadPORT()
 	result.wait();
 	std::string received = result.data();
 	assertTrue (received == data);
-	
+
 	server.addResponse("221 Good Bye");
 	session.close();
 }
@@ -399,26 +399,26 @@ void FTPClientSessionTest::testDownloadEPRT()
 	session.setPassive(false);
 	session.login("user", "password");
 	server.clearCommands();
-	
+
 	server.addResponse("200 EPRT OK");
 	server.addResponse("150 Sending data\r\n226 Transfer complete");
 
 	ActiveDownloader dl(session);
 	ActiveResult<std::string> result = dl.download("test.txt");
-		
+
 	std::string cmd = server.popCommandWait();
 	assertTrue (cmd.substr(0, 4) == "EPRT");
-	
+
 	std::string dummy;
 	char c;
 	int d;
 	int port;
 	std::istringstream istr(cmd);
 	istr >> dummy >> c >> d >> c >> d >> c >> d >> c >> d >> c >> d >> c >> port >> c;
-	
+
 	cmd = server.popCommandWait();
 	assertTrue (cmd == "RETR test.txt");
-	
+
 	SocketAddress sa("127.0.0.1", (Poco::UInt16) port);
 	DialogSocket dataSock;
 	dataSock.connect(sa);
@@ -430,7 +430,7 @@ void FTPClientSessionTest::testDownloadEPRT()
 	result.wait();
 	std::string received = result.data();
 	assertTrue (received == data);
-	
+
 	server.addResponse("221 Good Bye");
 	session.close();
 }
@@ -463,7 +463,7 @@ void FTPClientSessionTest::testDownloadPASV()
 	session.endDownload();
 	std::string s(dataStr.str());
 	assertTrue (s == "This is some data\r\n");
-	
+
 	server.addResponse("221 Good Bye");
 	session.close();
 }
@@ -493,12 +493,12 @@ void FTPClientSessionTest::testDownloadEPSV()
 	session.endDownload();
 	std::string s(dataStr.str());
 	assertTrue (s == "This is some data\r\n");
-	
+
 	std::string cmd = server.popCommand();
 	assertTrue (cmd.substr(0, 4) == "EPSV");
 	cmd = server.popCommand();
 	assertTrue (cmd == "RETR test.txt");
-	
+
 	server.addResponse("221 Good Bye");
 	session.close();
 }
@@ -561,12 +561,12 @@ void FTPClientSessionTest::testList()
 	session.endList();
 	std::string s(dataStr.str());
 	assertTrue (s == "file1\r\nfile2\r\n");
-	
+
 	std::string cmd = server.popCommand();
 	assertTrue (cmd.substr(0, 4) == "EPSV");
 	cmd = server.popCommand();
 	assertTrue (cmd == "NLST");
-	
+
 	server.addResponse("221 Good Bye");
 	session.close();
 }
diff --git a/Net/testsuite/src/FTPClientSessionTest.h b/Net/testsuite/src/FTPClientSessionTest.h
index 3b71415e5..d3a058dd8 100644
--- a/Net/testsuite/src/FTPClientSessionTest.h
+++ b/Net/testsuite/src/FTPClientSessionTest.h
@@ -45,7 +45,7 @@ public:
 	void testDownloadEPSV();
 	void testUpload();
 	void testList();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Net/testsuite/src/HTTPClientSessionTest.cpp b/Net/testsuite/src/HTTPClientSessionTest.cpp
index fa178e959..b7bf375e4 100644
--- a/Net/testsuite/src/HTTPClientSessionTest.cpp
+++ b/Net/testsuite/src/HTTPClientSessionTest.cpp
@@ -206,7 +206,7 @@ void HTTPClientSessionTest::testKeepAlive()
 	assertTrue (response.getKeepAlive());
 	std::ostringstream ostr1;
 	assertTrue (StreamCopier::copyStream(rs1, ostr1) == 0);
-	
+
 	request.setMethod(HTTPRequest::HTTP_GET);
 	request.setURI("/small");
 	s.sendRequest(request);
@@ -216,7 +216,7 @@ void HTTPClientSessionTest::testKeepAlive()
 	std::ostringstream ostr2;
 	StreamCopier::copyStream(rs2, ostr2);
 	assertTrue (ostr2.str() == HTTPTestServer::SMALL_BODY);
-	
+
 	request.setMethod(HTTPRequest::HTTP_GET);
 	request.setURI("/large");
 	s.sendRequest(request);
@@ -240,6 +240,25 @@ void HTTPClientSessionTest::testKeepAlive()
 }
 
 
+void HTTPClientSessionTest::testTrailer()
+{
+	HTTPTestServer srv;
+	HTTPClientSession s("127.0.0.1", srv.port());
+	s.setKeepAlive(true);
+	HTTPRequest request(HTTPRequest::HTTP_GET, "/trailer", HTTPMessage::HTTP_1_1);
+	s.sendRequest(request);
+	HTTPResponse response;
+	std::istream& rs = s.receiveResponse(response);
+	assertTrue (response.getContentType() == "text/plain");
+	std::ostringstream ostr;
+	StreamCopier::copyStream(rs, ostr);
+	assertTrue (ostr.str() == HTTPTestServer::LARGE_BODY);
+	assertTrue (!s.responseTrailer().empty());
+	assertTrue (s.responseTrailer().get("Trailer-1") == "Value 1");
+	assertTrue (s.responseTrailer().get("Trailer-2") == "Value 2");
+}
+
+
 void HTTPClientSessionTest::testProxy()
 {
 	HTTPTestServer srv;
@@ -273,7 +292,7 @@ void HTTPClientSessionTest::testProxyAuth()
 	StreamCopier::copyStream(rs, ostr);
 	assertTrue (ostr.str() == HTTPTestServer::LARGE_BODY);
 	std::string r = srv.lastRequest();
-	assertTrue (r.find("Proxy-Authorization: Basic dXNlcjpwYXNz\r\n") != std::string::npos);	
+	assertTrue (r.find("Proxy-Authorization: Basic dXNlcjpwYXNz\r\n") != std::string::npos);
 }
 
 
@@ -283,15 +302,15 @@ void HTTPClientSessionTest::testBypassProxy()
 	proxyConfig.host = "proxy.domain.com";
 	proxyConfig.port = 80;
 	proxyConfig.nonProxyHosts = "localhost|127\\.0\\.0\\.1";
-	
+
 	HTTPClientSession s1("127.0.0.1", 80);
 	s1.setProxyConfig(proxyConfig);
 	assertTrue (s1.bypassProxy());
-	
+
 	HTTPClientSession s2("127.0.0.1", 80);
 	s2.setProxyConfig(proxyConfig);
 	assertTrue (s2.bypassProxy());
-	
+
 	HTTPClientSession s3("www.appinf.com", 80);
 	s3.setProxyConfig(proxyConfig);
 	assertTrue (!s3.bypassProxy());
@@ -363,6 +382,7 @@ CppUnit::Test* HTTPClientSessionTest::suite()
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testPostSmallClose);
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testPostLargeClose);
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testKeepAlive);
+	CppUnit_addTest(pSuite, HTTPClientSessionTest, testTrailer);
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testProxy);
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testProxyAuth);
 	CppUnit_addTest(pSuite, HTTPClientSessionTest, testBypassProxy);
diff --git a/Net/testsuite/src/HTTPClientSessionTest.h b/Net/testsuite/src/HTTPClientSessionTest.h
index dce5d634c..ecc7b50e4 100644
--- a/Net/testsuite/src/HTTPClientSessionTest.h
+++ b/Net/testsuite/src/HTTPClientSessionTest.h
@@ -34,6 +34,7 @@ public:
 	void testPostSmallClose();
 	void testPostLargeClose();
 	void testKeepAlive();
+	void testTrailer();
 	void testProxy();
 	void testProxyAuth();
 	void testBypassProxy();
diff --git a/Net/testsuite/src/HTTPCredentialsTest.cpp b/Net/testsuite/src/HTTPCredentialsTest.cpp
index f9738b768..d0c0dce27 100644
--- a/Net/testsuite/src/HTTPCredentialsTest.cpp
+++ b/Net/testsuite/src/HTTPCredentialsTest.cpp
@@ -214,6 +214,45 @@ void HTTPCredentialsTest::testDigestCredentialsQoP()
 	assertTrue (params.size() == 9);
 }
 
+void HTTPCredentialsTest::testDigestCredentialsQoPSHA256()
+{
+	HTTPDigestCredentials creds("user", "s3cr3t");
+	HTTPRequest request(HTTPRequest::HTTP_GET, "/digest/");
+	HTTPResponse response;
+	response.set("WWW-Authenticate", "Digest realm=\"TestDigest\", nonce=\"212573bb90170538efad012978ab811f%lu\", opaque=\"opaque\", qop=\"auth,auth-int\", algorithm=SHA-256");
+	creds.authenticate(request, response);
+	
+	HTTPAuthenticationParams params(request);
+	assertTrue (params["nonce"] == "212573bb90170538efad012978ab811f%lu");
+	assertTrue (params["realm"] == "TestDigest");
+	assertTrue (params["response"] != "40e4889cfbd0e561f71e3107a2863bc4");
+	assertTrue (params["uri"] == "/digest/");
+	assertTrue (params["username"] == "user");
+	assertTrue (params["opaque"] == "opaque");
+	assertTrue (params["cnonce"] != "");
+	assertTrue (params["nc"] == "00000001");
+	assertTrue (params["qop"] == "auth");
+	assertTrue (params["algorithm"] == "SHA-256");
+	assertTrue (params.size() == 10);
+
+	std::string cnonce = params["cnonce"];
+	std::string aresp = params["response"];
+
+	params.clear();
+
+	creds.updateAuthInfo(request);
+	params.fromRequest(request);
+	assertTrue (params["nonce"] == "212573bb90170538efad012978ab811f%lu");
+	assertTrue (params["realm"] == "TestDigest");
+	assertTrue (params["response"] != aresp);
+	assertTrue (params["uri"] == "/digest/");
+	assertTrue (params["username"] == "user");
+	assertTrue (params["opaque"] == "opaque");
+	assertTrue (params["cnonce"] == cnonce);
+	assertTrue (params["nc"] == "00000002");
+	assertTrue (params["qop"] == "auth");
+	assertTrue (params.size() == 10);
+}
 
 void HTTPCredentialsTest::testCredentialsBasic()
 {
@@ -311,6 +350,43 @@ void HTTPCredentialsTest::testVerifyAuthInfoQoP()
 	assertTrue (!creds.verifyAuthInfo(request));
 }
 
+void HTTPCredentialsTest::testVerifyAuthInfoQoPSHA256() {
+	HTTPDigestCredentials sha256Creds("user", "s3cr3t");
+	HTTPRequest sha256Request(HTTPRequest::HTTP_GET, "/digest/");
+	HTTPResponse sha256Response;
+	sha256Response.set("WWW-Authenticate", "Digest realm=\"TestDigest\", nonce=\"212573bb90170538efad012978ab811f%lu\", opaque=\"opaque\", qop=\"auth,auth-int\", algorithm=SHA-256");
+	sha256Creds.authenticate(sha256Request, sha256Response);
+	assertTrue (sha256Creds.verifyAuthInfo(sha256Request));
+
+	sha256Request.set("Authorization", "Digest cnonce=\"f9c80ffd1c3bc4ee47ed92b704ba75a4\", nc=00000001, nonce=\"212573bb90170538efad012978ab811f%lu\", opaque=\"opaque\", qop=\"auth\", realm=\"TestDigest\", response=\"ff0e90b9aa019120ea0ed6e23ce95d9a\", uri=\"/digest/\", username=\"user\", algorithm=SHA-256");
+	assertTrue (!sha256Creds.verifyAuthInfo(sha256Request));
+
+	HTTPDigestCredentials sha256SessCreds("user", "s3cr3t");
+	HTTPRequest sha256SessRequest(HTTPRequest::HTTP_GET, "/digest/");
+	HTTPResponse sha256SessResponse;
+	sha256SessResponse.set("WWW-Authenticate", "Digest realm=\"TestDigest\", nonce=\"212573bb90170538efad012978ab811f%lu\", opaque=\"opaque\", qop=\"auth,auth-int\", algorithm=SHA-256-sess");
+	sha256SessCreds.authenticate(sha256SessRequest, sha256SessResponse);
+	assertTrue (sha256SessCreds.verifyAuthInfo(sha256SessRequest));
+
+	sha256SessRequest.set("Authorization", "Digest cnonce=\"f9c80ffd1c3bc4ee47ed92b704ba75a4\", nc=00000001, nonce=\"212573bb90170538efad012978ab811f%lu\", opaque=\"opaque\", qop=\"auth\", realm=\"TestDigest\", response=\"ff0e90b9aa019120ea0ed6e23ce95d9a\", uri=\"/digest/\", username=\"user\", algorithm=SHA-256-sess");
+	assertTrue (!sha256SessCreds.verifyAuthInfo(sha256SessRequest));
+}
+
+void HTTPCredentialsTest::testIsAlgorithmSupported() {
+	HTTPDigestCredentials sha256Creds("user", "s3cr3t");
+
+	assertTrue (sha256Creds.isAlgorithmSupported("MD5"));
+	assertTrue (sha256Creds.isAlgorithmSupported("MD5-sess"));
+	assertTrue (sha256Creds.isAlgorithmSupported("SHA"));
+	assertTrue (sha256Creds.isAlgorithmSupported("SHA-sess"));
+	assertTrue (sha256Creds.isAlgorithmSupported("SHA-256"));
+	assertTrue (sha256Creds.isAlgorithmSupported("SHA-256-sess"));
+	assertTrue (sha256Creds.isAlgorithmSupported("SHA-512-256"));
+	assertTrue (sha256Creds.isAlgorithmSupported("SHA-512-256-sess"));
+	assertTrue (sha256Creds.isAlgorithmSupported("SHA-512"));
+	assertTrue (sha256Creds.isAlgorithmSupported("SHA-512-sess"));
+	assertFalse (sha256Creds.isAlgorithmSupported("random_algorithm"));
+}
 
 void HTTPCredentialsTest::setUp()
 {
@@ -333,6 +409,7 @@ CppUnit::Test* HTTPCredentialsTest::suite()
 	CppUnit_addTest(pSuite, HTTPCredentialsTest, testAuthenticationParamsMultipleHeaders);
 	CppUnit_addTest(pSuite, HTTPCredentialsTest, testDigestCredentials);
 	CppUnit_addTest(pSuite, HTTPCredentialsTest, testDigestCredentialsQoP);
+	CppUnit_addTest(pSuite, HTTPCredentialsTest, testDigestCredentialsQoPSHA256);
 	CppUnit_addTest(pSuite, HTTPCredentialsTest, testCredentialsBasic);
 	CppUnit_addTest(pSuite, HTTPCredentialsTest, testProxyCredentialsBasic);
 	CppUnit_addTest(pSuite, HTTPCredentialsTest, testCredentialsDigest);
@@ -341,6 +418,8 @@ CppUnit::Test* HTTPCredentialsTest::suite()
 	CppUnit_addTest(pSuite, HTTPCredentialsTest, testExtractCredentials);
 	CppUnit_addTest(pSuite, HTTPCredentialsTest, testVerifyAuthInfo);
 	CppUnit_addTest(pSuite, HTTPCredentialsTest, testVerifyAuthInfoQoP);
+	CppUnit_addTest(pSuite, HTTPCredentialsTest, testVerifyAuthInfoQoPSHA256);
+	CppUnit_addTest(pSuite, HTTPCredentialsTest, testIsAlgorithmSupported);
 
 	return pSuite;
 }
diff --git a/Net/testsuite/src/HTTPCredentialsTest.h b/Net/testsuite/src/HTTPCredentialsTest.h
index 56c9cb0d5..ba8a0f07a 100644
--- a/Net/testsuite/src/HTTPCredentialsTest.h
+++ b/Net/testsuite/src/HTTPCredentialsTest.h
@@ -31,6 +31,7 @@ public:
 	void testAuthenticationParamsMultipleHeaders();
 	void testDigestCredentials();
 	void testDigestCredentialsQoP();
+	void testDigestCredentialsQoPSHA256();
 	void testCredentialsBasic();
 	void testProxyCredentialsBasic();
 	void testCredentialsDigest();
@@ -39,6 +40,8 @@ public:
 	void testExtractCredentials();
 	void testVerifyAuthInfo();
 	void testVerifyAuthInfoQoP();
+	void testVerifyAuthInfoQoPSHA256();
+	void testIsAlgorithmSupported();
 
 	void setUp();
 	void tearDown();
diff --git a/Net/testsuite/src/HTTPRequestTest.cpp b/Net/testsuite/src/HTTPRequestTest.cpp
index db03e4afb..437c18116 100644
--- a/Net/testsuite/src/HTTPRequestTest.cpp
+++ b/Net/testsuite/src/HTTPRequestTest.cpp
@@ -209,22 +209,22 @@ void HTTPRequestTest::testCookies()
 	cookies1.add("cookie1", "value1");
 	request1.setCookies(cookies1);
 	assertTrue (request1["Cookie"] == "cookie1=value1");
-	
+
 	HTTPRequest request2;
 	NameValueCollection cookies2;
 	cookies2.add("cookie2", "value2");
 	cookies2.add("cookie3", "value3");
 	request2.setCookies(cookies2);
 	assertTrue (request2["Cookie"] == "cookie2=value2; cookie3=value3");
-	
+
 	request1.setCookies(cookies2);
 	NameValueCollection cookies3;
 	request1.getCookies(cookies3);
 	assertTrue (cookies3.size() == 3);
 	assertTrue (cookies3["cookie1"] == "value1");
 	assertTrue (cookies3["cookie2"] == "value2");
-	assertTrue (cookies3["cookie3"] == "value3");	
-	
+	assertTrue (cookies3["cookie3"] == "value3");
+
 	HTTPRequest request3;
 	request3.add("Cookie", "cookie1=value1");
 	request3.add("cookie", "cookie2=value2");
@@ -232,7 +232,7 @@ void HTTPRequestTest::testCookies()
 	request3.getCookies(cookies4);
 	assertTrue (cookies4.size() == 2);
 	assertTrue (cookies4["cookie1"] == "value1");
-	assertTrue (cookies4["cookie2"] == "value2");	
+	assertTrue (cookies4["cookie2"] == "value2");
 }
 
 
diff --git a/Net/testsuite/src/HTTPRequestTest.h b/Net/testsuite/src/HTTPRequestTest.h
index 5e9d73a3b..070e0cc6e 100644
--- a/Net/testsuite/src/HTTPRequestTest.h
+++ b/Net/testsuite/src/HTTPRequestTest.h
@@ -36,7 +36,7 @@ public:
 	void testInvalid2();
 	void testInvalid3();
 	void testCookies();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Net/testsuite/src/HTTPServerTest.cpp b/Net/testsuite/src/HTTPServerTest.cpp
index ac22c06dc..3379188ca 100644
--- a/Net/testsuite/src/HTTPServerTest.cpp
+++ b/Net/testsuite/src/HTTPServerTest.cpp
@@ -18,8 +18,10 @@
 #include "Poco/Net/HTTPClientSession.h"
 #include "Poco/Net/HTTPRequest.h"
 #include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerRequestImpl.h"
 #include "Poco/Net/HTTPResponse.h"
 #include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/HTTPServerSession.h"
 #include "Poco/Net/ServerSocket.h"
 #include "Poco/StreamCopier.h"
 #include <sstream>
@@ -51,15 +53,15 @@ namespace
 				response.setChunkedTransferEncoding(true);
 			else if (request.getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH)
 				response.setContentLength(request.getContentLength());
-			
+
 			response.setContentType(request.getContentType());
-			
+
 			std::istream& istr = request.stream();
 			std::ostream& ostr = response.send();
 			StreamCopier::copyStream(istr, ostr);
 		}
 	};
-	
+
 	class EchoHeaderRequestHandler: public HTTPRequestHandler
 	{
 	public:
@@ -93,7 +95,7 @@ namespace
 			response.send();
 		}
 	};
-	
+
 	class BufferRequestHandler: public HTTPRequestHandler
 	{
 	public:
@@ -103,7 +105,22 @@ namespace
 			response.sendBuffer(data.data(), data.length());
 		}
 	};
-	
+
+	class TrailerRequestHandler: public HTTPRequestHandler
+	{
+	public:
+		void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
+		{
+			std::string data("xxxxxxxxxx");
+
+			response.setChunkedTransferEncoding(true);
+			Poco::Net::MessageHeader& trailer = static_cast<Poco::Net::HTTPServerRequestImpl&>(request).session().responseTrailer();
+			trailer.set("Trailer-1", "Value 1");
+			trailer.set("Trailer-2", "Value 2");
+			response.send() << data;
+		}
+	};
+
 	class RequestHandlerFactory: public HTTPRequestHandlerFactory
 	{
 	public:
@@ -114,11 +131,13 @@ namespace
 			else if (request.getURI() == "/echoHeader")
 				return new EchoHeaderRequestHandler;
 			else if (request.getURI() == "/redirect")
-				return new RedirectRequestHandler();
+				return new RedirectRequestHandler;
 			else if (request.getURI() == "/auth")
-				return new AuthRequestHandler();
+				return new AuthRequestHandler;
 			else if (request.getURI() == "/buffer")
-				return new BufferRequestHandler();
+				return new BufferRequestHandler;
+			else if (request.getURI() == "/trailer")
+				return new TrailerRequestHandler;
 			else
 				return 0;
 		}
@@ -143,7 +162,7 @@ void HTTPServerTest::testIdentityRequest()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	std::string body(5000, 'x');
 	HTTPRequest request("POST", "/echoBody");
@@ -166,7 +185,7 @@ void HTTPServerTest::testPutIdentityRequest()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	std::string body(5000, 'x');
 	HTTPRequest request("PUT", "/echoBody");
@@ -189,7 +208,7 @@ void HTTPServerTest::testChunkedRequest()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	std::string body(5000, 'x');
 	HTTPRequest request("POST", "/echoBody");
@@ -213,7 +232,7 @@ void HTTPServerTest::testClosedRequest()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	std::string body(5000, 'x');
 	HTTPRequest request("POST", "/echoBody");
@@ -233,7 +252,7 @@ void HTTPServerTest::testIdentityRequestKeepAlive()
 {
 	HTTPServer srv(new RequestHandlerFactory, 8008);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", srv.socket().address().port());
 	cs.setKeepAlive(true);
 	std::string body(5000, 'x');
@@ -248,7 +267,7 @@ void HTTPServerTest::testIdentityRequestKeepAlive()
 	assertTrue (response.getContentType() == "text/plain");
 	assertTrue (response.getKeepAlive());
 	assertTrue (rbody == body);
-	
+
 	body.assign(1000, 'y');
 	request.setContentLength((int) body.length());
 	request.setKeepAlive(false);
@@ -264,7 +283,7 @@ void HTTPServerTest::testChunkedRequestKeepAlive()
 {
 	HTTPServer srv(new RequestHandlerFactory, 8009);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", srv.socket().address().port());
 	cs.setKeepAlive(true);
 	std::string body(5000, 'x');
@@ -296,7 +315,7 @@ void HTTPServerTest::testClosedRequestKeepAlive()
 {
 	HTTPServer srv(new RequestHandlerFactory, 8010);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", srv.socket().address().port());
 	std::string body(5000, 'x');
 	HTTPRequest request("POST", "/echoBody");
@@ -321,7 +340,7 @@ void HTTPServerTest::testMaxKeepAlive()
 	pParams->setMaxKeepAliveRequests(4);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	cs.setKeepAlive(true);
 	HTTPRequest request("POST", "/echoBody", HTTPMessage::HTTP_1_1);
@@ -377,7 +396,7 @@ void HTTPServerTest::testKeepAliveTimeout()
 	pParams->setKeepAliveTimeout(Poco::Timespan(3, 0));
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	cs.setKeepAlive(true);
 	cs.setKeepAliveTimeout(Poco::Timespan(2, 0));
@@ -421,7 +440,7 @@ void HTTPServerTest::test100Continue()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	std::string body(5000, 'x');
 	HTTPRequest request("POST", "/echoBody");
@@ -445,7 +464,7 @@ void HTTPServerTest::testRedirect()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	HTTPRequest request("GET", "/redirect");
 	cs.sendRequest(request);
@@ -465,7 +484,7 @@ void HTTPServerTest::testAuth()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	HTTPRequest request("GET", "/auth");
 	cs.sendRequest(request);
@@ -485,7 +504,7 @@ void HTTPServerTest::testNotImpl()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	HTTPRequest request("GET", "/notImpl");
 	cs.sendRequest(request);
@@ -504,7 +523,7 @@ void HTTPServerTest::testBuffer()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPClientSession cs("127.0.0.1", svs.address().port());
 	HTTPRequest request("GET", "/buffer");
 	cs.sendRequest(request);
@@ -516,6 +535,28 @@ void HTTPServerTest::testBuffer()
 }
 
 
+void HTTPServerTest::testChunkedTrailer()
+{
+	ServerSocket svs(0);
+	HTTPServerParams* pParams = new HTTPServerParams;
+	pParams->setKeepAlive(false);
+	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
+	srv.start();
+
+	HTTPClientSession cs("127.0.0.1", svs.address().port());
+	HTTPRequest request("GET", "/trailer");
+	cs.sendRequest(request);
+	HTTPResponse response;
+	std::string rbody;
+	cs.receiveResponse(response) >> rbody;
+	assertTrue (response.getStatus() == HTTPResponse::HTTP_OK);
+	assertTrue (rbody == "xxxxxxxxxx");
+	assertTrue (!cs.responseTrailer().empty());
+	assertTrue (cs.responseTrailer().get("Trailer-1") == "Value 1");
+	assertTrue (cs.responseTrailer().get("Trailer-2") == "Value 2");
+}
+
+
 void HTTPServerTest::setUp()
 {
 }
@@ -544,6 +585,7 @@ CppUnit::Test* HTTPServerTest::suite()
 	CppUnit_addTest(pSuite, HTTPServerTest, testAuth);
 	CppUnit_addTest(pSuite, HTTPServerTest, testNotImpl);
 	CppUnit_addTest(pSuite, HTTPServerTest, testBuffer);
+	CppUnit_addTest(pSuite, HTTPServerTest, testChunkedTrailer);
 
 	return pSuite;
 }
diff --git a/Net/testsuite/src/HTTPServerTest.h b/Net/testsuite/src/HTTPServerTest.h
index e2b6e0d3e..3ba58b24b 100644
--- a/Net/testsuite/src/HTTPServerTest.h
+++ b/Net/testsuite/src/HTTPServerTest.h
@@ -38,6 +38,7 @@ public:
 	void testAuth();
 	void testNotImpl();
 	void testBuffer();
+	void testChunkedTrailer();
 
 	void setUp();
 	void tearDown();
diff --git a/Net/testsuite/src/HTTPTestServer.cpp b/Net/testsuite/src/HTTPTestServer.cpp
index 342192d44..7cfd68670 100644
--- a/Net/testsuite/src/HTTPTestServer.cpp
+++ b/Net/testsuite/src/HTTPTestServer.cpp
@@ -101,7 +101,7 @@ void HTTPTestServer::run()
 
 bool HTTPTestServer::requestComplete() const
 {
-	return ((_lastRequest.substr(0, 3) == "GET" || _lastRequest.substr(0, 4) == "HEAD") && 
+	return ((_lastRequest.substr(0, 3) == "GET" || _lastRequest.substr(0, 4) == "HEAD") &&
 	        (_lastRequest.find("\r\n\r\n") != std::string::npos)) ||
 	        (_lastRequest.find("\r\n0\r\n") != std::string::npos);
 }
@@ -117,7 +117,7 @@ std::string HTTPTestServer::handleRequest() const
 		std::string body(SMALL_BODY);
 		response.append("HTTP/1.0 200 OK\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n");
 		response.append("Connection: Close\r\n");
@@ -132,7 +132,7 @@ std::string HTTPTestServer::handleRequest() const
 		std::string body(LARGE_BODY);
 		response.append("HTTP/1.0 200 OK\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n");
 		response.append("Connection: Close\r\n");
@@ -150,7 +150,7 @@ std::string HTTPTestServer::handleRequest() const
 		response.append("Content-Type: text/plain\r\n");
 		if (_lastRequest.find("Content-Length") != std::string::npos)
 		{
-			response.append("Content-Length: "); 
+			response.append("Content-Length: ");
 			response.append(NumberFormatter::format((int) body.size()));
 			response.append("\r\n");
 		}
@@ -180,7 +180,7 @@ std::string HTTPTestServer::handleRequest() const
 		response.append("Content-Type: text/plain\r\n");
 		if (_lastRequest.find("Content-Length") != std::string::npos)
 		{
-			response.append("Content-Length: "); 
+			response.append("Content-Length: ");
 			response.append(NumberFormatter::format((int) body.size()));
 			response.append("\r\n");
 		}
@@ -198,13 +198,13 @@ std::string HTTPTestServer::handleRequest() const
 		response.append("HTTP/1.1 200 OK\r\n");
 		response.append("Connection: keep-alive\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n\r\n");
 		response.append("HTTP/1.1 200 OK\r\n");
 		response.append("Connection: Keep-Alive\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n\r\n");
 		response.append(body);
@@ -220,10 +220,25 @@ std::string HTTPTestServer::handleRequest() const
 		response.append("HTTP/1.1 200 OK\r\n");
 		response.append("Connection: close\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n\r\n");
 	}
+	else if (_lastRequest.substr(0, 12) == "GET /trailer")
+	{
+		std::string body(LARGE_BODY);
+		response.append("HTTP/1.1 200 OK\r\n");
+		response.append("Connection: keep-alive\r\n");
+		response.append("Content-Type: text/plain\r\n");
+		response.append("Transfer-Encoding: chunked\r\n\r\n");
+		response.append(NumberFormatter::formatHex((unsigned) body.length()));
+		response.append("\r\n");
+		response.append(body);
+		response.append("\r\n0\r\n");
+		response.append("Trailer-1: Value 1\r\n");
+		response.append("Trailer-2: Value 2\r\n");
+		response.append("\r\n");
+	}
 	else if (_lastRequest.substr(0, 13) == "GET /redirect")
 	{
 		response.append("HTTP/1.0 302 Found\r\n");
@@ -241,7 +256,7 @@ std::string HTTPTestServer::handleRequest() const
 		std::string body(SMALL_BODY);
 		response.append("HTTP/1.0 200 OK\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n");
 		response.append("Connection: Close\r\n");
diff --git a/Net/testsuite/src/HTTPTestServer.h b/Net/testsuite/src/HTTPTestServer.h
index d3a0fd632..4bb647887 100644
--- a/Net/testsuite/src/HTTPTestServer.h
+++ b/Net/testsuite/src/HTTPTestServer.h
@@ -33,15 +33,15 @@ public:
 	Poco::UInt16 port() const;
 		/// Returns the port the echo server is
 		/// listening on.
-		
+
 	void run();
 		/// Does the work.
-		
+
 	const std::string& lastRequest() const;
 		/// Returns the last request.
 
 	static const std::string SMALL_BODY;
-	static const std::string LARGE_BODY;	
+	static const std::string LARGE_BODY;
 
 protected:
 	bool requestComplete() const;
@@ -51,7 +51,7 @@ private:
 	Poco::Net::ServerSocket  _socket;
 	Poco::Thread _thread;
 	Poco::Event  _ready;
-	bool         _stop;
+	std::atomic<bool> _stop;
 	std::string  _lastRequest;
 };
 
diff --git a/Net/testsuite/src/ICMPClientTest.cpp b/Net/testsuite/src/ICMPClientTest.cpp
index 391339a8c..99b40aaae 100644
--- a/Net/testsuite/src/ICMPClientTest.cpp
+++ b/Net/testsuite/src/ICMPClientTest.cpp
@@ -35,7 +35,7 @@ using Poco::AutoPtr;
 Poco::FastMutex ICMPClientTest::_mutex;
 
 
-ICMPClientTest::ICMPClientTest(const std::string& name): 
+ICMPClientTest::ICMPClientTest(const std::string& name):
 	CppUnit::TestCase(name)
 {
 }
@@ -132,8 +132,8 @@ void ICMPClientTest::onBegin(const void* pSender, ICMPEventArgs& args)
 {
 	Poco::FastMutex::ScopedLock l(_mutex);
 	std::ostringstream os;
-	os << std::endl << "Pinging " << args.hostName() << " [" << args.hostAddress() << "] with " 
-		<< args.dataSize() << " bytes of data:" 
+	os << std::endl << "Pinging " << args.hostName() << " [" << args.hostAddress() << "] with "
+		<< args.dataSize() << " bytes of data:"
 		<< std::endl << "-------------------------------------------------------" << std::endl;
 	std::cout << os.str() << std::endl;
 }
@@ -144,7 +144,7 @@ void ICMPClientTest::onReply(const void* pSender, ICMPEventArgs& args)
 	Poco::FastMutex::ScopedLock l(_mutex);
 	std::ostringstream os;
 	os << "Reply from " << args.hostAddress()
-		<< " bytes=" << args.dataSize() 
+		<< " bytes=" << args.dataSize()
 		<< " time=" << args.replyTime() << "ms"
 		<< " TTL=" << args.ttl();
 	std::cout << os.str() << std::endl;
@@ -169,8 +169,8 @@ void ICMPClientTest::onEnd(const void* pSender, ICMPEventArgs& args)
 		<< std::endl << "Packets: Sent=" << args.sent() << ", Received=" << received
 		<< " Lost=" << args.repetitions() - received << " (" << 100.0 - args.percent() << "% loss),"
 		<< std::endl << "Approximate round trip times in milliseconds: " << std::endl
-		<< "Minimum=" << args.minRTT() << "ms, Maximum=" << args.maxRTT()  
-		<< "ms, Average=" << args.avgRTT() << "ms" 
+		<< "Minimum=" << args.minRTT() << "ms, Maximum=" << args.maxRTT()
+		<< "ms, Average=" << args.avgRTT() << "ms"
 		<< std::endl << "-----------------------------------------------" << std::endl;
 	std::cout << os.str() << std::endl;
 }
diff --git a/Net/testsuite/src/IPAddressTest.cpp b/Net/testsuite/src/IPAddressTest.cpp
index ea5f87bd2..90f398822 100644
--- a/Net/testsuite/src/IPAddressTest.cpp
+++ b/Net/testsuite/src/IPAddressTest.cpp
@@ -40,7 +40,7 @@ void IPAddressTest::testStringConv()
 	IPAddress ia2(std::move(ia02));
 	assertTrue (ia2.family() == IPAddress::IPv4);
 	assertTrue (ia2.toString() == "192.168.1.120");
-	
+
 	IPAddress ia3("255.255.255.255");
 	assertTrue (ia3.family() == IPAddress::IPv4);
 	assertTrue (ia3.toString() == "255.255.255.255");
@@ -72,7 +72,7 @@ void IPAddressTest::testStringConv6()
 	IPAddress ia2(std::move(ia02));
 	assertTrue (ia2.family() == IPAddress::IPv6);
 	assertTrue (ia2.toString() == "1080::8:600:200a:425c");
-	
+
 	IPAddress ia3("::192.168.1.120");
 	assertTrue (ia3.family() == IPAddress::IPv6);
 	assertTrue (ia3.toString() == "::192.168.1.120");
@@ -159,7 +159,7 @@ void IPAddressTest::testClassification()
 	assertTrue (!ip1.isSiteLocalMC());
 	assertTrue (!ip1.isOrgLocalMC());
 	assertTrue (!ip1.isGlobalMC());
-		
+
 	IPAddress ip2("255.255.255.255"); // broadcast
 	assertTrue (!ip2.isWildcard());
 	assertTrue (ip2.isBroadcast());
@@ -174,7 +174,7 @@ void IPAddressTest::testClassification()
 	assertTrue (!ip2.isSiteLocalMC());
 	assertTrue (!ip2.isOrgLocalMC());
 	assertTrue (!ip2.isGlobalMC());
-	
+
 	IPAddress ip3("127.0.0.1"); // loopback
 	assertTrue (!ip3.isWildcard());
 	assertTrue (!ip3.isBroadcast());
@@ -363,7 +363,7 @@ void IPAddressTest::testClassification6()
 	assertTrue (!ip1.isSiteLocalMC());
 	assertTrue (!ip1.isOrgLocalMC());
 	assertTrue (!ip1.isGlobalMC());
-		
+
 	IPAddress ip3("::1"); // loopback
 	assertTrue (!ip3.isWildcard());
 	assertTrue (!ip3.isBroadcast());
@@ -500,7 +500,7 @@ void IPAddressTest::testMCClassification6()
 	assertTrue (!ip1.isSiteLocal());
 	assertTrue (ip1.isWellKnownMC());
 	assertTrue (!ip1.isNodeLocalMC());
-	assertTrue (ip1.isLinkLocalMC()); 
+	assertTrue (ip1.isLinkLocalMC());
 	assertTrue (!ip1.isSiteLocalMC());
 	assertTrue (!ip1.isOrgLocalMC());
 	assertTrue (!ip1.isGlobalMC());
@@ -518,7 +518,7 @@ void IPAddressTest::testMCClassification6()
 	assertTrue (!ip2.isLinkLocalMC());
 	assertTrue (!ip2.isSiteLocalMC());
 	assertTrue (!ip2.isOrgLocalMC());
-	assertTrue (!ip2.isGlobalMC()); 
+	assertTrue (!ip2.isGlobalMC());
 
 	IPAddress ip3("ff05:0:0:0:0:0:0:FB"); // site local unicast
 	assertTrue (!ip3.isWildcard());
@@ -560,7 +560,7 @@ void IPAddressTest::testMCClassification6()
 	assertTrue (!ip5.isSiteLocal());
 	assertTrue (!ip5.isWellKnownMC());
 	assertTrue (!ip5.isNodeLocalMC());
-	assertTrue (!ip5.isLinkLocalMC()); 
+	assertTrue (!ip5.isLinkLocalMC());
 	assertTrue (!ip5.isSiteLocalMC());
 	assertTrue (!ip5.isOrgLocalMC());
 	assertTrue (ip5.isGlobalMC());
@@ -574,7 +574,7 @@ void IPAddressTest::testRelationals()
 	IPAddress ip2(ip1);
 	IPAddress ip3;
 	IPAddress ip4("10.0.0.138");
-	
+
 	assertTrue (ip1 != ip4);
 	assertTrue (ip1 == ip2);
 	assertTrue (!(ip1 != ip2));
@@ -587,7 +587,7 @@ void IPAddressTest::testRelationals()
 	assertTrue (!(ip1 <= ip4));
 	assertTrue (!(ip4 > ip1));
 	assertTrue (!(ip4 >= ip1));
-	
+
 	ip3 = ip1;
 	assertTrue (ip1 == ip3);
 	ip3 = ip4;
diff --git a/Net/testsuite/src/MailMessageTest.cpp b/Net/testsuite/src/MailMessageTest.cpp
index 7c1977e79..81b236a21 100644
--- a/Net/testsuite/src/MailMessageTest.cpp
+++ b/Net/testsuite/src/MailMessageTest.cpp
@@ -12,6 +12,7 @@
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
 #include "Poco/Net/MailMessage.h"
+#include "Poco/Net/MailStream.h"
 #include "Poco/Net/MailRecipient.h"
 #include "Poco/Net/PartHandler.h"
 #include "Poco/Net/StringPartSource.h"
@@ -20,11 +21,16 @@
 #include "Poco/Timestamp.h"
 #include "Poco/FileStream.h"
 #include "Poco/String.h"
+#include "Poco/TemporaryFile.h"
 #include <sstream>
+#include <fstream>
 #include <vector>
+#include <iostream>
 
 
 using Poco::Net::MailMessage;
+using Poco::Net::MailInputStream;
+using Poco::Net::MailOutputStream;
 using Poco::Net::MailRecipient;
 using Poco::Net::MessageHeader;
 using Poco::Net::PartHandler;
@@ -36,6 +42,7 @@ using Poco::Timestamp;
 using Poco::FileInputStream;
 using Poco::replaceInPlace;
 using Poco::icompare;
+using Poco::TemporaryFile;
 
 
 namespace
@@ -46,7 +53,7 @@ namespace
 		StringPartHandler()
 		{
 		}
-		
+
 		void handlePart(const MessageHeader& header, std::istream& stream)
 		{
 			_disp.push_back(header["Content-Disposition"]);
@@ -60,7 +67,7 @@ namespace
 			}
 			_data.push_back(data);
 		}
-		
+
 		const std::vector<std::string>& data() const
 		{
 			return _data;
@@ -75,7 +82,7 @@ namespace
 		{
 			return _type;
 		}
-		
+
 	private:
 		std::vector<std::string> _data;
 		std::vector<std::string> _disp;
@@ -115,14 +122,14 @@ void MailMessageTest::testWriteQP()
 	);
 	Timestamp ts(0);
 	message.setDate(ts);
-	
+
 	assertTrue (!message.isMultipart());
-	
+
 	std::ostringstream str;
 	message.write(str);
 	std::string s = str.str();
 
-	assertTrue (s == 
+	assertTrue (s ==
 		"Date: Thu, 1 Jan 1970 00:00:00 GMT\r\n"
 		"Content-Type: text/plain\r\n"
 		"Subject: Test Message\r\n"
@@ -154,11 +161,11 @@ void MailMessageTest::testWrite8Bit()
 	);
 	Timestamp ts(0);
 	message.setDate(ts);
-	
+
 	std::ostringstream str;
 	message.write(str);
 	std::string s = str.str();
-	assertTrue (s == 
+	assertTrue (s ==
 		"Date: Thu, 1 Jan 1970 00:00:00 GMT\r\n"
 		"Content-Type: text/plain\r\n"
 		"Subject: Test Message\r\n"
@@ -190,7 +197,7 @@ void MailMessageTest::testWriteBase64()
 	std::ostringstream str;
 	message.write(str);
 	std::string s = str.str();
-	assertTrue (s == 
+	assertTrue (s ==
 		"Date: Thu, 1 Jan 1970 00:00:00 GMT\r\n"
 		"Content-Type: text/plain\r\n"
 		"Subject: Test Message\r\n"
@@ -226,11 +233,11 @@ void MailMessageTest::testWriteManyRecipients()
 	);
 	Timestamp ts(0);
 	message.setDate(ts);
-	
+
 	std::ostringstream str;
 	message.write(str);
 	std::string s = str.str();
-	assertTrue (s == 
+	assertTrue (s ==
 		"Date: Thu, 1 Jan 1970 00:00:00 GMT\r\n"
 		"Content-Type: text/plain\r\n"
 		"Subject: Test Message\r\n"
@@ -321,13 +328,13 @@ void MailMessageTest::testReadQP()
 		"his should be enough.\r\n"
 		"And here is some more =3Dfe.\r\n"
 	);
-	
+
 	MailMessage message;
 	message.read(istr);
-	
+
 	assertTrue (message.getSender() == "poco@appinf.com");
 	assertTrue (message.getContentType() == "text/plain");
-	assertTrue (message.getContent() == 
+	assertTrue (message.getContent() ==
 		"Hello, world!\r\n"
 		"This is a test for the MailMessage class.\r\n"
 		"To test the quoted-printable encoding, we'll put an extra long line here. This should be enough.\r\n"
@@ -361,6 +368,55 @@ void MailMessageTest::testReadDefaultTransferEncoding()
 }
 
 
+void MailMessageTest::testContentDisposition()
+{
+	/*
+	// see https://github.com/pocoproject/poco/issues/3650
+	// Note "Content-disposition" casing,
+	// "Content-type" or "Content-transfer-encoding" do not cause problem
+	auto rawMessage =
+		"Date: Wed, 29 Jun 2022 08:25:48 GMT" "\r\n"
+		"Content-Type: multipart/mixed; boundary=MIME_boundary_5DBC66DE2780DE93" "\r\n"
+		"From: mySenderName<sender@send.pl>" "\r\n"
+		"Subject: mySubjct" "\r\n"
+		"To: <aja@o.pl>" "\r\n"
+		"Mime-Version: 1.0" "\r\n"
+		"\r\n"
+		"--MIME_boundary_5DBC66DE2780DE93" "\r\n"
+		"Content-Type: text/plain; charset=UTF-8" "\r\n"
+		"Content-Transfer-Encoding: quoted-printable" "\r\n"
+		"Content-Disposition: inline" "\r\n"
+		"\r\n"
+		"MyRealContent" "\r\n"
+		"--MIME_boundary_5DBC66DE2780DE93" "\r\n"
+		"Content-Type: text/plain; name=Plik" "\r\n"
+		"Content-Transfer-Encoding: base64" "\r\n"
+		"Content-disposition: attachment; filename=attachment.txt" "\r\n"
+		"\r\n"
+		"TXlBdHRhY2htZW50" "\r\n"
+		"--MIME_boundary_5DBC66DE2780DE93--" "\r\n"
+		"." "\r\n";
+
+	Poco::Net::MailMessage  message;
+	//Convert raw message to message
+	std::istringstream is(rawMessage);
+	MailInputStream mis(is);
+	message.read(mis);
+
+	//get raw message again:
+	std::ostringstream oss;
+	MailOutputStream mos(oss);
+	message.write(mos);
+	mos.close();
+	auto plainMessage = oss.str();
+
+	assertEqual(rawMessage, plainMessage);
+
+	//std::cout << plain_message <<std::endl;
+*/
+}
+
+
 void MailMessageTest::testRead8Bit()
 {
 	std::istringstream istr(
@@ -374,13 +430,13 @@ void MailMessageTest::testRead8Bit()
 		"Hello, world!\r\n"
 		"This is a test for the MailMessage class.\r\n"
 	);
-	
+
 	MailMessage message;
 	message.read(istr);
-	
+
 	assertTrue (message.getSender() == "poco@appinf.com");
 	assertTrue (message.getContentType() == "text/plain");
-	assertTrue (message.getContent() == 
+	assertTrue (message.getContent() ==
 		"Hello, world!\r\n"
 		"This is a test for the MailMessage class.\r\n"
 	);
@@ -413,11 +469,11 @@ void MailMessageTest::testReadMultiPart()
 		"VGhpcyBpcyBzb21lIGJpbmFyeSBkYXRhLiBSZWFsbHku\r\n"
 		"--MIME_boundary_01234567--\r\n"
 	);
-	
+
 	StringPartHandler handler;
 	MailMessage message;
 	message.read(istr, handler);
-	
+
 	assertTrue (handler.data().size() == 2);
 	assertTrue (handler.data()[0] == "Hello World!\r\n");
 	assertTrue (handler.type()[0] == "text/plain");
@@ -455,10 +511,10 @@ void MailMessageTest::testReadMultiPartWithAttachmentNames()
 		"VGhpcyBpcyBzb21lIGJpbmFyeSBkYXRhLiBSZWFsbHku\r\n"
 		"--MIME_boundary_01234567--\r\n"
 	);
-	
+
 	MailMessage message;
 	message.read(istr);
-	
+
 	assertTrue (message.parts().size() == 2);
 	assertTrue (message.parts()[1].name == "sample");
 	assertTrue (message.parts()[1].pSource->filename() == "sample.dat");
@@ -506,6 +562,54 @@ void MailMessageTest::testReadMultiPartDefaultTransferEncoding()
 }
 
 
+void MailMessageTest::testReadMultiPartNoFinalBoundaryFromFile()
+{
+	std::string data(
+		"Content-Type: multipart/mixed; boundary=MIME_boundary_01234567\r\n"
+		"Date: Thu, 1 Jan 1970 00:00:00 GMT\r\n"
+		"From: poco@appinf.com\r\n"
+		"Mime-Version: 1.0\r\n"
+		"Subject: Test Message\r\n"
+		"To: John Doe <john.doe@no.where>\r\n"
+		"\r\n"
+		"\r\n"
+		"--MIME_boundary_01234567\r\n"
+		"Content-Disposition: inline\r\n"
+		"Content-Transfer-Encoding: 8bit\r\n"
+		"Content-Type: text/plain\r\n"
+		"\r\n"
+		"Hello World!\r\n"
+		"\r\n"
+		"--MIME_boundary_01234567\r\n"
+		"Content-Disposition: attachment; filename=sample.dat\r\n"
+		"Content-Transfer-Encoding: base64\r\n"
+		"Content-Type: application/octet-stream; name=sample\r\n"
+		"\r\n"
+		"VGhpcyBpcyBzb21lIGJpbmFyeSBkYXRhLiBSZWFsbHku\r\n"
+	);
+
+	// The problem occurs during reading message from file.
+	// (For stringstreams it works fine.)
+	// https://github.com/pocoproject/poco/issues/2401
+	TemporaryFile file;
+	std::ofstream(file.path()) << data;
+	std::ifstream istr(file.path());
+
+	StringPartHandler handler;
+	MailMessage message;
+	message.read(istr, handler);
+
+	assertTrue (handler.data().size() == 2);
+	assertTrue (handler.data()[0] == "Hello World!\r\n");
+	assertTrue (handler.type()[0] == "text/plain");
+	assertTrue (handler.disp()[0] == "inline");
+
+	assertTrue (handler.data()[1] == "This is some binary data. Really.");
+	assertTrue (handler.type()[1] == "application/octet-stream; name=sample");
+	assertTrue (handler.disp()[1] == "attachment; filename=sample.dat");
+}
+
+
 void MailMessageTest::testReadWriteMultiPart()
 {
 	std::string msgin(
@@ -539,7 +643,7 @@ void MailMessageTest::testReadWriteMultiPart()
 
 	message.read(istr);
 	message.write(ostr);
-	
+
 	std::string msgout(ostr.str());
 	assertTrue (msgout == msgin);
 }
@@ -578,7 +682,7 @@ void MailMessageTest::testReadWriteMultiPartStore()
 	MailMessage message(&pfsf);
 
 	message.read(istr);
-	
+
 	MailMessage::PartVec::const_iterator it = message.parts().begin();
 	MailMessage::PartVec::const_iterator end = message.parts().end();
 	for (; it != end; ++it)
@@ -593,7 +697,7 @@ void MailMessageTest::testReadWriteMultiPartStore()
 			// filename is not the same as attachment name
 			std::size_t sz = (path.size() > filename.size()) ? filename.size() : path.size();
 			assertTrue (0 != icompare(path, path.size() - sz, sz, path));
-			
+
 			Poco::FileInputStream fis(path);
 			assertTrue (fis.good());
 			std::string read;
@@ -604,7 +708,7 @@ void MailMessageTest::testReadWriteMultiPartStore()
 			assertTrue (read == "This is some binary data. Really.");
 		}
 	}
-	
+
 	message.write(ostr);
 	std::string msgout(ostr.str());
 	assertTrue (msgout == msgin);
@@ -616,11 +720,11 @@ void MailMessageTest::testEncodeWord()
 	std::string plain("this is pure ASCII");
 	std::string encoded = MailMessage::encodeWord(plain, "ISO-8859-1");
 	assertTrue (encoded == plain);
-	
+
 	plain = "This text contains German Umlauts: \304\326";
 	encoded = MailMessage::encodeWord(plain, "ISO-8859-1");
 	assertTrue (encoded == "=?ISO-8859-1?q?This_text_contains_German_Umlauts=3A_=C4=D6?=");
-	
+
 	plain = "This text contains German Umlauts: \304\326. "
 	        "It is also a very long text. Longer than 75 "
 	        "characters. Long enough to become three lines "
@@ -654,9 +758,11 @@ CppUnit::Test* MailMessageTest::suite()
 	CppUnit_addTest(pSuite, MailMessageTest, testWriteMultiPart);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadQP);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadDefaultTransferEncoding);
+	CppUnit_addTest(pSuite, MailMessageTest, testContentDisposition);
 	CppUnit_addTest(pSuite, MailMessageTest, testRead8Bit);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadMultiPart);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadMultiPartDefaultTransferEncoding);
+	CppUnit_addTest(pSuite, MailMessageTest, testReadMultiPartNoFinalBoundaryFromFile);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadWriteMultiPart);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadWriteMultiPartStore);
 	CppUnit_addTest(pSuite, MailMessageTest, testEncodeWord);
diff --git a/Net/testsuite/src/MailMessageTest.h b/Net/testsuite/src/MailMessageTest.h
index 52c8a20b2..e99fe5ef5 100644
--- a/Net/testsuite/src/MailMessageTest.h
+++ b/Net/testsuite/src/MailMessageTest.h
@@ -32,11 +32,13 @@ public:
 	void testReadWriteMultiPart();
 	void testReadWriteMultiPartStore();
 	void testReadDefaultTransferEncoding();
+	void testContentDisposition();
 	void testReadQP();
 	void testRead8Bit();
 	void testReadMultiPart();
 	void testReadMultiPartWithAttachmentNames();
 	void testReadMultiPartDefaultTransferEncoding();
+	void testReadMultiPartNoFinalBoundaryFromFile();
 	void testEncodeWord();
 
 	void setUp();
diff --git a/Net/testsuite/src/MailStreamTest.cpp b/Net/testsuite/src/MailStreamTest.cpp
index bea3b4af4..7b23abe46 100644
--- a/Net/testsuite/src/MailStreamTest.cpp
+++ b/Net/testsuite/src/MailStreamTest.cpp
@@ -45,7 +45,7 @@ void MailStreamTest::testMailInputStream()
 		"..\r\n"
 		".\r\n"
 	);
-	
+
 	MailInputStream mis(istr);
 	std::ostringstream ostr;
 	StreamCopier::copyStream(mis, ostr);
@@ -60,7 +60,7 @@ void MailStreamTest::testMailInputStream()
 		".This line starts with a period.\r\n"
 		".and this one too\r\n"
 		".\r\n"
-	);	
+	);
 }
 
 
@@ -78,13 +78,13 @@ void MailStreamTest::testMailOutputStream()
 		".and this one too\r\n"
 		".\r\n"
 	);
-	
+
 	std::ostringstream ostr;
 	MailOutputStream mos(ostr);
 	mos << msg;
 	mos.close();
 	std::string s(ostr.str());
-	assertTrue (s == 
+	assertTrue (s ==
 		"From: john.doe@no.domain\r\n"
 		"To: jane.doe@no.domain\r\n"
 		"Subject: test\r\n"
diff --git a/Net/testsuite/src/MessageHeaderTest.cpp b/Net/testsuite/src/MessageHeaderTest.cpp
index e3c8bd374..cb4cd75d5 100644
--- a/Net/testsuite/src/MessageHeaderTest.cpp
+++ b/Net/testsuite/src/MessageHeaderTest.cpp
@@ -37,7 +37,7 @@ void MessageHeaderTest::testWrite()
 	mh.set("name1", "value1");
 	mh.set("name2", "value2");
 	mh.set("name3", "value3");
-	
+
 	std::ostringstream ostr;
 	mh.write(ostr);
 	std::string s = ostr.str();
@@ -217,12 +217,12 @@ void MessageHeaderTest::testSplitElements()
 	std::vector<std::string> v;
 	MessageHeader::splitElements(s, v);
 	assertTrue (v.empty());
-	
+
 	s = "foo";
 	MessageHeader::splitElements(s, v);
 	assertTrue (v.size() == 1);
 	assertTrue (v[0] == "foo");
-	
+
 	s = "  foo ";
 	MessageHeader::splitElements(s, v);
 	assertTrue (v.size() == 1);
@@ -233,7 +233,7 @@ void MessageHeaderTest::testSplitElements()
 	assertTrue (v.size() == 2);
 	assertTrue (v[0] == "foo");
 	assertTrue (v[1] == "bar");
-	
+
 	s = "foo,,bar";
 	MessageHeader::splitElements(s, v);
 	assertTrue (v.size() == 2);
@@ -257,7 +257,7 @@ void MessageHeaderTest::testSplitElements()
 	assertTrue (v.size() == 2);
 	assertTrue (v[0] == "foo; param=\"a,b\"");
 	assertTrue (v[1] == "bar; param=\"c,d\"");
-	
+
 	s = "foo, bar, f00, baz";
 	MessageHeader::splitElements(s, v);
 	assertTrue (v.size() == 4);
@@ -265,26 +265,26 @@ void MessageHeaderTest::testSplitElements()
 	assertTrue (v[1] == "bar");
 	assertTrue (v[2] == "f00");
 	assertTrue (v[3] == "baz");
-	
+
 	s = "a,b,c";
 	MessageHeader::splitElements(s, v);
 	assertTrue (v.size() == 3);
 	assertTrue (v[0] == "a");
 	assertTrue (v[1] == "b");
 	assertTrue (v[2] == "c");
-	
+
 	s = "a=\"value=\\\\\\\"foo, bar\\\\\\\"\",b=foo";
 	MessageHeader::splitElements(s, v);
 	assertTrue (v.size() == 2);
 	assertTrue (v[0] == "a=\"value=\\\"foo, bar\\\"\"");
 	assertTrue (v[1] == "b=foo");
-	
+
 	s = "a=\\\",b=\\\"";
 	MessageHeader::splitElements(s, v);
 	assertTrue (v.size() == 2);
 	assertTrue (v[0] == "a=\"");
 	assertTrue (v[1] == "b=\"");
-	
+
 }
 
 
@@ -293,46 +293,46 @@ void MessageHeaderTest::testSplitParameters()
 	std::string s;
 	std::string v;
 	NameValueCollection p;
-	
+
 	MessageHeader::splitParameters(s, v, p);
 	assertTrue (v.empty());
 	assertTrue (p.empty());
-	
+
 	s = "multipart/related";
 	MessageHeader::splitParameters(s, v, p);
 	assertTrue (v == "multipart/related");
 	assertTrue (p.empty());
-	
+
 	s = "multipart/related; boundary=MIME_boundary_01234567";
 	MessageHeader::splitParameters(s, v, p);
 	assertTrue (v == "multipart/related");
 	assertTrue (p.size() == 1);
 	assertTrue (p["boundary"] == "MIME_boundary_01234567");
-	
+
 	s = "multipart/related; boundary=\"MIME_boundary_76543210\"";
 	MessageHeader::splitParameters(s, v, p);
 	assertTrue (v == "multipart/related");
 	assertTrue (p.size() == 1);
 	assertTrue (p["boundary"] == "MIME_boundary_76543210");
-	
+
 	s = "text/plain; charset=us-ascii";
 	MessageHeader::splitParameters(s, v, p);
 	assertTrue (v == "text/plain");
 	assertTrue (p.size() == 1);
 	assertTrue (p["charset"] == "us-ascii");
-	
+
 	s = "value; p1=foo; p2=bar";
 	MessageHeader::splitParameters(s, v, p);
 	assertTrue (v == "value");
 	assertTrue (p.size() == 2);
 	assertTrue (p["p1"] == "foo");
 	assertTrue (p["p2"] == "bar");
-	
+
 	s = "value; p1=\"foo; bar\"";
 	MessageHeader::splitParameters(s, v, p);
 	assertTrue (v == "value");
 	assertTrue (p.size() == 1);
-	assertTrue (p["p1"] == "foo; bar");	
+	assertTrue (p["p1"] == "foo; bar");
 
 	s = "value ; p1=foo ; p2=bar ";
 	MessageHeader::splitParameters(s, v, p);
@@ -360,6 +360,38 @@ void MessageHeaderTest::testFieldLimit()
 }
 
 
+void MessageHeaderTest::testNameLengthLimit()
+{
+	std::string s("name1: value1\r\n");
+	std::istringstream istr(s);
+	MessageHeader mh;
+	mh.setNameLengthLimit(2);
+	try
+	{
+		mh.read(istr);
+		fail("Name length limit exceeded - must throw");
+	}
+	catch (MessageException&)
+	{
+	}
+}
+
+void MessageHeaderTest::testValueLengthLimit()
+{
+	std::string s("name1: value1\r\n");
+	std::istringstream istr(s);
+	MessageHeader mh;
+	mh.setValueLengthLimit(2);
+	try
+	{
+		mh.read(istr);
+		fail("Value length limit exceeded - must throw");
+	}
+	catch (MessageException&)
+	{
+	}
+}
+
 void MessageHeaderTest::testDecodeWord()
 {
 	std::string coded("this is pure ASCII");
diff --git a/Net/testsuite/src/MessageHeaderTest.h b/Net/testsuite/src/MessageHeaderTest.h
index e6f017436..98d9220d7 100644
--- a/Net/testsuite/src/MessageHeaderTest.h
+++ b/Net/testsuite/src/MessageHeaderTest.h
@@ -40,6 +40,8 @@ public:
 	void testSplitElements();
 	void testSplitParameters();
 	void testFieldLimit();
+	void testNameLengthLimit();
+	void testValueLengthLimit();
 	void testDecodeWord();
 
 	void setUp();
diff --git a/Net/testsuite/src/MulticastEchoServer.cpp b/Net/testsuite/src/MulticastEchoServer.cpp
index d2b67eef8..9ed68abf3 100644
--- a/Net/testsuite/src/MulticastEchoServer.cpp
+++ b/Net/testsuite/src/MulticastEchoServer.cpp
@@ -93,9 +93,9 @@ Poco::Net::NetworkInterface MulticastEchoServer::findInterface()
 	NetworkInterface::Map m = NetworkInterface::map();
 	for (NetworkInterface::Map::const_iterator it = m.begin(); it != m.end(); ++it)
 	{
-		if (it->second.supportsIPv4() && 
-			it->second.firstAddress(IPAddress::IPv4).isUnicast() && 
-			!it->second.isLoopback() && 
+		if (it->second.supportsIPv4() &&
+			it->second.firstAddress(IPAddress::IPv4).isUnicast() &&
+			!it->second.isLoopback() &&
 			!it->second.isPointToPoint())
 		{
 			return it->second;
diff --git a/Net/testsuite/src/MulticastEchoServer.h b/Net/testsuite/src/MulticastEchoServer.h
index 03f1f2be3..da2b49d14 100644
--- a/Net/testsuite/src/MulticastEchoServer.h
+++ b/Net/testsuite/src/MulticastEchoServer.h
@@ -40,28 +40,28 @@ public:
 	Poco::UInt16 port() const;
 		/// Returns the port the echo server is
 		/// listening on.
-		
+
 	void run();
 		/// Does the work.
-		
+
 	const Poco::Net::SocketAddress& group() const;
 		/// Returns the group address where the server listens.
-	
+
 	const Poco::Net::NetworkInterface& interfc() const;
 		/// Returns the network interface for multicasting.
-	
-protected:	
+
+protected:
 	static Poco::Net::NetworkInterface findInterface();
 		/// Finds an appropriate network interface for
 		/// multicasting.
-	
+
 private:
 	Poco::Net::MulticastSocket  _socket;
 	Poco::Net::SocketAddress    _group;
 	Poco::Net::NetworkInterface _if;
 	Poco::Thread _thread;
 	Poco::Event  _ready;
-	bool         _stop;
+	std::atomic<bool> _stop;
 };
 
 
diff --git a/Net/testsuite/src/MultipartWriterTest.cpp b/Net/testsuite/src/MultipartWriterTest.cpp
index 6889a4500..d0a61e8bc 100644
--- a/Net/testsuite/src/MultipartWriterTest.cpp
+++ b/Net/testsuite/src/MultipartWriterTest.cpp
@@ -40,7 +40,7 @@ void MultipartWriterTest::testWriteOnePart()
 	w.nextPart(h);
 	ostr << "this is part 1";
 	w.close();
-	std::string s = ostr.str();	
+	std::string s = ostr.str();
 	assertTrue (s == "--MIME_boundary_01234567\r\nname1: value1\r\n\r\nthis is part 1\r\n--MIME_boundary_01234567--\r\n");
 }
 
@@ -57,7 +57,7 @@ void MultipartWriterTest::testWriteTwoParts()
 	w.nextPart(h);
 	ostr << "this is part 2";
 	w.close();
-	std::string s = ostr.str();	
+	std::string s = ostr.str();
 	assertTrue (s == "--MIME_boundary_01234567\r\nname1: value1\r\n\r\nthis is part 1\r\n--MIME_boundary_01234567\r\n\r\nthis is part 2\r\n--MIME_boundary_01234567--\r\n");
 }
 
diff --git a/Net/testsuite/src/NTPClientTest.cpp b/Net/testsuite/src/NTPClientTest.cpp
index e0c772c87..6b3deb549 100644
--- a/Net/testsuite/src/NTPClientTest.cpp
+++ b/Net/testsuite/src/NTPClientTest.cpp
@@ -34,7 +34,7 @@ using Poco::Delegate;
 using Poco::AutoPtr;
 
 
-NTPClientTest::NTPClientTest(const std::string& name): 
+NTPClientTest::NTPClientTest(const std::string& name):
 	CppUnit::TestCase(name),
 	_ntpClient(IPAddress::IPv4)
 {
@@ -75,8 +75,8 @@ void NTPClientTest::tearDown()
 void NTPClientTest::onResponse(const void* pSender, NTPEventArgs& args)
 {
 	std::ostringstream os;
-	os << std::endl << "Received from " << args.hostName() << " [" << args.hostAddress() << "] with " 
-		<< Poco::DateTimeFormatter::format(args.packet().referenceTime(), Poco::DateTimeFormat::ISO8601_FORMAT) << " reference typestamp" 
+	os << std::endl << "Received from " << args.hostName() << " [" << args.hostAddress() << "] with "
+		<< Poco::DateTimeFormatter::format(args.packet().referenceTime(), Poco::DateTimeFormat::ISO8601_FORMAT) << " reference typestamp"
 		<< std::endl;
 	std::cout << os.str() << std::endl;
 }
diff --git a/Net/testsuite/src/NameValueCollectionTest.cpp b/Net/testsuite/src/NameValueCollectionTest.cpp
index 4b033e6e7..b144a4229 100644
--- a/Net/testsuite/src/NameValueCollectionTest.cpp
+++ b/Net/testsuite/src/NameValueCollectionTest.cpp
@@ -32,21 +32,21 @@ NameValueCollectionTest::~NameValueCollectionTest()
 void NameValueCollectionTest::testNameValueCollection()
 {
 	NameValueCollection nvc;
-	
+
 	assertTrue (nvc.empty());
 	assertTrue (nvc.size() == 0);
-	
+
 	nvc.set("name", "value");
 	assertTrue (!nvc.empty());
 	assertTrue (nvc["name"] == "value");
 	assertTrue (nvc["Name"] == "value");
-	
+
 	nvc.set("name2", "value2");
 	assertTrue (nvc.get("name2") == "value2");
 	assertTrue (nvc.get("NAME2") == "value2");
-	
+
 	assertTrue (nvc.size() == 2);
-	
+
 	try
 	{
 		std::string value = nvc.get("name3");
@@ -64,19 +64,19 @@ void NameValueCollectionTest::testNameValueCollection()
 	catch (NotFoundException&)
 	{
 	}
-	
+
 	assertTrue (nvc.get("name", "default") == "value");
 	assertTrue (nvc.get("name3", "default") == "default");
 
 	assertTrue (nvc.has("name"));
 	assertTrue (nvc.has("name2"));
-	assertTrue (!nvc.has("name3"));	
-	
+	assertTrue (!nvc.has("name3"));
+
 	nvc.add("name3", "value3");
 	assertTrue (nvc.get("name3") == "value3");
-	
+
 	nvc.add("name3", "value31");
-	
+
 	NameValueCollection::ConstIterator it = nvc.find("Name3");
 	assertTrue (it != nvc.end());
 	std::string v1 = it->second;
@@ -85,23 +85,23 @@ void NameValueCollectionTest::testNameValueCollection()
 	assertTrue (it != nvc.end());
 	std::string v2 = it->second;
 	assertTrue (it->first == "name3");
-	
+
 	assertTrue ((v1 == "value3" && v2 == "value31") || (v1 == "value31" && v2 == "value3"));
-	
+
 	nvc.erase("name3");
 	assertTrue (!nvc.has("name3"));
 	assertTrue (nvc.find("name3") == nvc.end());
-	
+
 	it = nvc.begin();
 	assertTrue (it != nvc.end());
 	++it;
 	assertTrue (it != nvc.end());
 	++it;
 	assertTrue (it == nvc.end());
-	
+
 	nvc.clear();
 	assertTrue (nvc.empty());
-	
+
 	assertTrue (nvc.size() == 0);
 }
 
diff --git a/Net/testsuite/src/OAuth10CredentialsTest.cpp b/Net/testsuite/src/OAuth10CredentialsTest.cpp
index 700ec5435..ded97efb8 100644
--- a/Net/testsuite/src/OAuth10CredentialsTest.cpp
+++ b/Net/testsuite/src/OAuth10CredentialsTest.cpp
@@ -43,7 +43,7 @@ void OAuth10CredentialsTest::testCallback()
 	//
 	// POST /oauth/request_token HTTP/1.1
 	// Host: api.twitter.com
-	// Authorization: 
+	// Authorization:
 	//         OAuth oauth_callback="http%3A%2F%2Flocalhost%2Fsign-in-with-twitter%2F",
 	//               oauth_consumer_key="cChZNFj6T5R0TigYB9yd1w",
 	//               oauth_nonce="ea9ec8429b68d6b77cd5600adbbb0456",
@@ -52,16 +52,16 @@ void OAuth10CredentialsTest::testCallback()
 	//               oauth_timestamp="1318467427",
 	//               oauth_version="1.0"
 
-	
+
 	URI uri("https://api.twitter.com/oauth/request_token");
 	OAuth10Credentials creds("cChZNFj6T5R0TigYB9yd1w", "L8qq9PZyRg6ieKGEKhZolGC0vJWLw8iEJ88DRdyOg");
 	creds.setCallback("http://localhost/sign-in-with-twitter/");
 	creds.nonceAndTimestampForTesting("ea9ec8429b68d6b77cd5600adbbb0456", "1318467427");
 	HTTPRequest request(HTTPRequest::HTTP_POST, uri.getPathEtc());
-		
+
 	creds.authenticate(request, uri);
 
-	std::string auth = request.get("Authorization");	
+	std::string auth = request.get("Authorization");
 	assertTrue (auth == "OAuth"
 		" oauth_consumer_key=\"cChZNFj6T5R0TigYB9yd1w\","
 		" oauth_nonce=\"ea9ec8429b68d6b77cd5600adbbb0456\","
@@ -77,38 +77,38 @@ void OAuth10CredentialsTest::testParams()
 {
 	// Note: Request taken from <https://dev.twitter.com/oauth/overview/authorizing-requests>
 	// and <https://dev.twitter.com/oauth/overview/creating-signatures>.
-	// 
+	//
 	// POST /1/statuses/update.json?include_entities=true HTTP/1.1
 	// Content-Type: application/x-www-form-urlencoded
-	// Authorization: 
-	//         OAuth oauth_consumer_key="xvz1evFS4wEEPTGEFPHBog", 
-	//               oauth_nonce="kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg", 
-	//               oauth_signature="tnnArxj06cWHq44gCs1OSKk%2FjLY%3D", 
-	//               oauth_signature_method="HMAC-SHA1", 
-	//               oauth_timestamp="1318622958", 
-	//               oauth_token="370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb", 
+	// Authorization:
+	//         OAuth oauth_consumer_key="xvz1evFS4wEEPTGEFPHBog",
+	//               oauth_nonce="kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg",
+	//               oauth_signature="tnnArxj06cWHq44gCs1OSKk%2FjLY%3D",
+	//               oauth_signature_method="HMAC-SHA1",
+	//               oauth_timestamp="1318622958",
+	//               oauth_token="370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb",
 	//               oauth_version="1.0"
 	// Content-Length: 76
 	// Host: api.twitter.com
-	// 
+	//
 	// status=Hello%20Ladies%20%2b%20Gentlemen%2c%20a%20signed%20OAuth%20request%21
 
 	URI uri("https://api.twitter.com/1/statuses/update.json?include_entities=true");
 	OAuth10Credentials creds(
-		"xvz1evFS4wEEPTGEFPHBog", 
-		"kAcSOqF21Fu85e7zjz7ZN2U4ZRhfV3WpwPAoE3Z7kBw", 
-		"370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb", 
+		"xvz1evFS4wEEPTGEFPHBog",
+		"kAcSOqF21Fu85e7zjz7ZN2U4ZRhfV3WpwPAoE3Z7kBw",
+		"370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb",
 		"LswwdoUaIvS8ltyTt5jkRh4J50vUPVVHtR2YPi5kE"
 	);
 	creds.nonceAndTimestampForTesting("kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg", "1318622958");
 	HTTPRequest request(HTTPRequest::HTTP_POST, uri.getPathEtc());
-	
+
 	HTMLForm params;
 	params.set("include_entities", "true");
 	params.set("status", "Hello Ladies + Gentlemen, a signed OAuth request!");
-	
+
 	creds.authenticate(request, uri, params);
-	
+
 	std::string auth = request.get("Authorization");
 	assertTrue (auth == "OAuth"
 		" oauth_consumer_key=\"xvz1evFS4wEEPTGEFPHBog\","
@@ -128,37 +128,37 @@ void OAuth10CredentialsTest::testRealm()
 	//
 	// POST /1/statuses/update.json?include_entities=true HTTP/1.1
 	// Content-Type: application/x-www-form-urlencoded
-	// Authorization: 
+	// Authorization:
 	//         OAuth realm="Twitter API"
-	//               oauth_consumer_key="xvz1evFS4wEEPTGEFPHBog", 
-	//               oauth_nonce="kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg", 
-	//               oauth_signature="tnnArxj06cWHq44gCs1OSKk%2FjLY%3D", 
-	//               oauth_signature_method="HMAC-SHA1", 
-	//               oauth_timestamp="1318622958", 
-	//               oauth_token="370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb", 
+	//               oauth_consumer_key="xvz1evFS4wEEPTGEFPHBog",
+	//               oauth_nonce="kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg",
+	//               oauth_signature="tnnArxj06cWHq44gCs1OSKk%2FjLY%3D",
+	//               oauth_signature_method="HMAC-SHA1",
+	//               oauth_timestamp="1318622958",
+	//               oauth_token="370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb",
 	//               oauth_version="1.0"
 	// Content-Length: 76
 	// Host: api.twitter.com
-	// 
+	//
 	// status=Hello%20Ladies%20%2b%20Gentlemen%2c%20a%20signed%20OAuth%20request%21
 
 	URI uri("https://api.twitter.com/1/statuses/update.json?include_entities=true");
 	OAuth10Credentials creds(
-		"xvz1evFS4wEEPTGEFPHBog", 
-		"kAcSOqF21Fu85e7zjz7ZN2U4ZRhfV3WpwPAoE3Z7kBw", 
-		"370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb", 
+		"xvz1evFS4wEEPTGEFPHBog",
+		"kAcSOqF21Fu85e7zjz7ZN2U4ZRhfV3WpwPAoE3Z7kBw",
+		"370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb",
 		"LswwdoUaIvS8ltyTt5jkRh4J50vUPVVHtR2YPi5kE"
 	);
 	creds.setRealm("Twitter API");
 	creds.nonceAndTimestampForTesting("kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg", "1318622958");
 	HTTPRequest request(HTTPRequest::HTTP_POST, uri.getPathEtc());
-	
+
 	HTMLForm params;
 	params.set("include_entities", "true");
 	params.set("status", "Hello Ladies + Gentlemen, a signed OAuth request!");
-	
+
 	creds.authenticate(request, uri, params);
-	
+
 	std::string auth = request.get("Authorization");
 	assertTrue (auth == "OAuth"
 		" realm=\"Twitter API\","
@@ -178,11 +178,11 @@ void OAuth10CredentialsTest::testPlaintext()
 	OAuth10Credentials creds("consumerKey", "consumerSecret");
 	creds.setCallback("http://localhost/sign-in-with-twitter/");
 	HTTPRequest request(HTTPRequest::HTTP_POST, uri.getPathEtc());
-		
+
 	creds.authenticate(request, uri, OAuth10Credentials::SIGN_PLAINTEXT);
 
-	std::string auth = request.get("Authorization");	
-	
+	std::string auth = request.get("Authorization");
+
 	assertTrue (auth == "OAuth"
 		" oauth_consumer_key=\"consumerKey\","
 		" oauth_signature=\"consumerSecret%26\","
@@ -204,17 +204,17 @@ void OAuth10CredentialsTest::testVerify()
 		" oauth_timestamp=\"1318622958\","
 		" oauth_token=\"370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb\","
 		" oauth_version=\"1.0\"");
-	
+
 	OAuth10Credentials creds(request);
 	assertTrue (creds.getConsumerKey() == "xvz1evFS4wEEPTGEFPHBog");
 	assertTrue (creds.getToken() == "370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb");
 	creds.setConsumerSecret("kAcSOqF21Fu85e7zjz7ZN2U4ZRhfV3WpwPAoE3Z7kBw");
 	creds.setTokenSecret("LswwdoUaIvS8ltyTt5jkRh4J50vUPVVHtR2YPi5kE");
-	
+
 	HTMLForm params;
 	params.read(uri.getRawQuery());
 	params.read("status=Hello%20Ladies%20%2b%20Gentlemen%2c%20a%20signed%20OAuth%20request%21");
-	
+
 	assertTrue (creds.verify(request, uri, params));
 }
 
@@ -229,11 +229,11 @@ void OAuth10CredentialsTest::testVerifyPlaintext()
 		" oauth_signature_method=\"PLAINTEXT\","
 		" oauth_callback=\"http%3A%2F%2Flocalhost%2Fsign-in-with-twitter%2F\","
 		" oauth_version=\"1.0\"");
-	
+
 	OAuth10Credentials creds(request);
 	assertTrue (creds.getConsumerKey() == "consumerKey");
 	creds.setConsumerSecret("consumerSecret");
-	
+
 	assertTrue (creds.verify(request, uri));
 	assertTrue (creds.getCallback() == "http://localhost/sign-in-with-twitter/");
 }
diff --git a/Net/testsuite/src/OAuth20CredentialsTest.cpp b/Net/testsuite/src/OAuth20CredentialsTest.cpp
index 9278ecf73..c6b8bfdac 100644
--- a/Net/testsuite/src/OAuth20CredentialsTest.cpp
+++ b/Net/testsuite/src/OAuth20CredentialsTest.cpp
@@ -36,7 +36,7 @@ void OAuth20CredentialsTest::testAuthorize()
 	OAuth20Credentials creds("s3cr3tt0k3n");
 	HTTPRequest request(HTTPRequest::HTTP_GET, "/");
 	creds.authenticate(request);
-	std::string auth = request.get("Authorization");	
+	std::string auth = request.get("Authorization");
 	assertTrue (auth == "Bearer s3cr3tt0k3n");
 }
 
@@ -46,7 +46,7 @@ void OAuth20CredentialsTest::testAuthorizeCustomScheme()
 	OAuth20Credentials creds("s3cr3tt0k3n", "token");
 	HTTPRequest request(HTTPRequest::HTTP_GET, "/");
 	creds.authenticate(request);
-	std::string auth = request.get("Authorization");	
+	std::string auth = request.get("Authorization");
 	assertTrue (auth == "token s3cr3tt0k3n");
 }
 
diff --git a/Net/testsuite/src/PollSetTest.cpp b/Net/testsuite/src/PollSetTest.cpp
index 9c2c41e7a..76f724081 100644
--- a/Net/testsuite/src/PollSetTest.cpp
+++ b/Net/testsuite/src/PollSetTest.cpp
@@ -38,7 +38,8 @@ class Poller : public Poco::Runnable
 {
 public:
 	Poller(PollSet& pollSet, const Timespan& timeout): _pollSet(pollSet),
-		_timeout(timeout)
+		_timeout(timeout),
+		_running(false)
 	{
 	}
 
@@ -57,7 +58,7 @@ public:
 private:
 	PollSet& _pollSet;
 	Timespan _timeout;
-	bool _running = false;
+	std::atomic<bool> _running;
 };
 
 
@@ -74,6 +75,95 @@ PollSetTest::~PollSetTest()
 }
 
 
+void PollSetTest::testAddUpdate()
+{
+	EchoServer echoServer1;
+	EchoServer echoServer2;
+	StreamSocket ss1;
+	StreamSocket ss2;
+
+	ss1.connect(SocketAddress("127.0.0.1", echoServer1.port()));
+	ss2.connect(SocketAddress("127.0.0.1", echoServer2.port()));
+
+	PollSet ps;
+	assertTrue(ps.empty());
+	ps.add(ss1, PollSet::POLL_READ);
+	assertTrue(!ps.empty());
+	assertTrue(ps.has(ss1));
+	assertTrue(!ps.has(ss2));
+
+	// nothing readable
+	Stopwatch sw;
+	sw.start();
+	Timespan timeout(1000000);
+	assertTrue (ps.poll(timeout).empty());
+	assertTrue (sw.elapsed() >= 900000);
+	sw.restart();
+
+	ps.add(ss2, PollSet::POLL_READ);
+	assertTrue(!ps.empty());
+	assertTrue(ps.has(ss1));
+	assertTrue(ps.has(ss2));
+
+	// ss1 must be writable, if polled for
+	ps.add(ss1, PollSet::POLL_WRITE);
+	PollSet::SocketModeMap sm = ps.poll(timeout);
+	assertTrue (sm.find(ss1) != sm.end());
+	assertTrue (sm.find(ss2) == sm.end());
+	assertTrue (sm.find(ss1)->second & PollSet::POLL_WRITE);
+	assertTrue (sw.elapsed() < 1100000);
+
+	ps.add(ss1, PollSet::POLL_READ);
+
+	ss1.setBlocking(true);
+	ss1.sendBytes("hello", 5);
+	while (!ss1.poll(Timespan(0, 10000), Socket::SELECT_READ))
+		Poco::Thread::sleep(10);
+	sw.restart();
+	sm = ps.poll(timeout);
+	assertTrue (sm.find(ss1) != sm.end());
+	assertTrue (sm.find(ss2) == sm.end());
+	assertTrue (sm.find(ss1)->second & PollSet::POLL_READ);
+	assertTrue (sw.elapsed() < 1100000);
+
+	char buffer[256];
+	int n = ss1.receiveBytes(buffer, sizeof(buffer));
+	assertTrue (n == 5);
+	assertTrue (std::string(buffer, n) == "hello");
+
+	ss2.setBlocking(true);
+	ss2.sendBytes("HELLO", 5);
+	sw.restart();
+	ps.remove(ss1);
+	sm = ps.poll(timeout);
+	assertTrue (sm.find(ss1) == sm.end());
+	assertTrue (sm.find(ss2) != sm.end());
+	assertTrue (sm.find(ss2)->second & PollSet::POLL_READ);
+	assertTrue (sw.elapsed() < 1100000);
+
+	n = ss2.receiveBytes(buffer, sizeof(buffer));
+	assertTrue (n == 5);
+	assertTrue (std::string(buffer, n) == "HELLO");
+
+	ps.remove(ss2);
+	assertTrue(ps.empty());
+	assertTrue(!ps.has(ss1));
+	assertTrue(!ps.has(ss2));
+
+	ss2.sendBytes("HELLO", 5);
+	sw.restart();
+	sm = ps.poll(timeout);
+	assertTrue (sm.empty());
+
+	n = ss2.receiveBytes(buffer, sizeof(buffer));
+	assertTrue (n == 5);
+	assertTrue (std::string(buffer, n) == "HELLO");
+
+	ss1.close();
+	ss2.close();
+}
+
+
 void PollSetTest::testTimeout()
 {
 	EchoServer echoServer;
@@ -121,15 +211,16 @@ void PollSetTest::testPollNB()
 	PollSet::SocketModeMap sm;
 	while (sm.empty()) sm = ps.poll(timeout);
 	assertTrue(sm.find(ss1) != sm.end());
-	assertTrue(sm.find(ss1)->second | PollSet::POLL_WRITE);
+	assertTrue(sm.find(ss1)->second & PollSet::POLL_WRITE);
 
 	ss1.setBlocking(true);
 	ss1.sendBytes("hello", 5);
+	while (!ss1.poll(Timespan(0, 10000), Socket::SELECT_READ))
+		Poco::Thread::sleep(10);
 	char buffer[256];
-
 	sm = ps.poll(timeout);
 	assertTrue(sm.find(ss1) != sm.end());
-	assertTrue(sm.find(ss1)->second | PollSet::POLL_READ);
+	assertTrue(sm.find(ss1)->second & PollSet::POLL_READ);
 
 	int n = ss1.receiveBytes(buffer, sizeof(buffer));
 	assertTrue(n == 5);
@@ -179,12 +270,14 @@ void PollSetTest::testPoll()
 
 	ss1.setBlocking(true);
 	ss1.sendBytes("hello", 5);
+	while (!ss1.poll(Timespan(0, 10000), Socket::SELECT_READ))
+		Poco::Thread::sleep(10);
 	char buffer[256];
 	sw.restart();
 	sm = ps.poll(timeout);
 	assertTrue (sm.find(ss1) != sm.end());
 	assertTrue (sm.find(ss2) == sm.end());
-	assertTrue (sm.find(ss1)->second | PollSet::POLL_READ);
+	assertTrue (sm.find(ss1)->second & PollSet::POLL_READ);
 	assertTrue (sw.elapsed() < 1100000);
 
 	int n = ss1.receiveBytes(buffer, sizeof(buffer));
@@ -193,11 +286,13 @@ void PollSetTest::testPoll()
 
 	ss2.setBlocking(true);
 	ss2.sendBytes("HELLO", 5);
+	while (!ss2.poll(Timespan(0, 10000), Socket::SELECT_READ))
+		Poco::Thread::sleep(10);
 	sw.restart();
 	sm = ps.poll(timeout);
 	assertTrue (sm.find(ss1) == sm.end());
 	assertTrue (sm.find(ss2) != sm.end());
-	assertTrue (sm.find(ss2)->second | PollSet::POLL_READ);
+	assertTrue (sm.find(ss2)->second & PollSet::POLL_READ);
 	assertTrue (sw.elapsed() < 1100000);
 
 	n = ss2.receiveBytes(buffer, sizeof(buffer));
@@ -205,6 +300,7 @@ void PollSetTest::testPoll()
 	assertTrue (std::string(buffer, n) == "HELLO");
 
 	ps.remove(ss2);
+	ps.update(ss1, Socket::SELECT_READ);
 	assertTrue(!ps.empty());
 	assertTrue(ps.has(ss1));
 	assertTrue(!ps.has(ss2));
@@ -245,7 +341,7 @@ void PollSetTest::testPollNoServer()
 	} while (sm.size() < 2);
 	assertTrue(sm.size() == 2);
 	for (auto s : sm)
-		assertTrue(0 != (s.second | PollSet::POLL_ERROR));
+		assertTrue(0 != (s.second & PollSet::POLL_ERROR));
 }
 
 
@@ -287,7 +383,7 @@ void PollSetTest::testPollClosedServer()
 
 void PollSetTest::testPollSetWakeUp()
 {
-#if defined(POCO_HAVE_FD_EPOLL)
+#if defined(POCO_HAVE_FD_EPOLL) || defined (POCO_HAVE_FD_POLL)
 	PollSet ps;
 	Timespan timeout(100000000); // 100 seconds
 	Poller poller(ps, timeout);
@@ -303,7 +399,36 @@ void PollSetTest::testPollSetWakeUp()
 	assertTrue(sw.elapsedSeconds() < 1);
 #else // TODO: other implementations
 	std::cout << "not implemented";
-#endif // POCO_HAVE_FD_EPOLL
+#endif // POCO_HAVE_FD_EPOLL || POCO_HAVE_FD_EPOLL
+}
+
+
+void PollSetTest::testClear()
+{
+	EchoServer echoServer;
+	StreamSocket ss;
+	ss.connect(SocketAddress("127.0.0.1", echoServer.port()));
+	PollSet ps;
+
+	ps.add(ss, PollSet::POLL_READ);
+	PollSet::SocketModeMap sm = ps.poll(0);
+	assertTrue(sm.empty());
+
+	ss.sendBytes("hello", 5);
+	assertTrue(ps.poll(100000).size() == 1);
+
+	char buffer[5];
+	ss.receiveBytes(buffer, sizeof(buffer));
+
+	ps.clear();
+	ps.add(ss, PollSet::POLL_READ);
+	sm = ps.poll(0);
+	assertTrue(sm.empty());
+
+	ss.sendBytes(buffer, 5);
+	assertTrue(ps.poll(100000).size() == 1);
+
+	ss.receiveBytes(buffer, sizeof(buffer));
 }
 
 
@@ -321,12 +446,14 @@ CppUnit::Test* PollSetTest::suite()
 {
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("PollSetTest");
 
+	CppUnit_addTest(pSuite, PollSetTest, testAddUpdate);
 	CppUnit_addTest(pSuite, PollSetTest, testTimeout);
 	CppUnit_addTest(pSuite, PollSetTest, testPollNB);
 	CppUnit_addTest(pSuite, PollSetTest, testPoll);
 	CppUnit_addTest(pSuite, PollSetTest, testPollNoServer);
 	CppUnit_addTest(pSuite, PollSetTest, testPollClosedServer);
 	CppUnit_addTest(pSuite, PollSetTest, testPollSetWakeUp);
+	CppUnit_addTest(pSuite, PollSetTest, testClear);
 
 	return pSuite;
 }
diff --git a/Net/testsuite/src/PollSetTest.h b/Net/testsuite/src/PollSetTest.h
index cd8fe2478..fa074618a 100644
--- a/Net/testsuite/src/PollSetTest.h
+++ b/Net/testsuite/src/PollSetTest.h
@@ -24,12 +24,14 @@ public:
 	PollSetTest(const std::string& name);
 	~PollSetTest();
 
+	void testAddUpdate();
 	void testTimeout();
 	void testPollNB();
 	void testPoll();
 	void testPollNoServer();
 	void testPollClosedServer();
 	void testPollSetWakeUp();
+	void testClear();
 
 	void setUp();
 	void tearDown();
diff --git a/Net/testsuite/src/QuotedPrintableTest.cpp b/Net/testsuite/src/QuotedPrintableTest.cpp
index fb7daf98a..135dc6e6d 100644
--- a/Net/testsuite/src/QuotedPrintableTest.cpp
+++ b/Net/testsuite/src/QuotedPrintableTest.cpp
@@ -34,7 +34,7 @@ void QuotedPrintableTest::testEncode()
 {
 	std::ostringstream ostr;
 	QuotedPrintableEncoder encoder(ostr);
-	
+
 	encoder <<
 		"Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\r\n"
 		"Proin id odio sit amet metus dignissim porttitor. \r\n"
diff --git a/Net/testsuite/src/QuotedPrintableTest.h b/Net/testsuite/src/QuotedPrintableTest.h
index f40dcc1a1..61b2c925b 100644
--- a/Net/testsuite/src/QuotedPrintableTest.h
+++ b/Net/testsuite/src/QuotedPrintableTest.h
@@ -26,7 +26,7 @@ public:
 
 	void testEncode();
 	void testDecode();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Net/testsuite/src/RawSocketTest.cpp b/Net/testsuite/src/RawSocketTest.cpp
index 4ac2fb86f..036bf40a1 100644
--- a/Net/testsuite/src/RawSocketTest.cpp
+++ b/Net/testsuite/src/RawSocketTest.cpp
@@ -60,14 +60,14 @@ void RawSocketTest::testEchoIPv4()
 	assertTrue (5 == (n - shift));
 	assertTrue ("hello" == std::string((char*)ptr, 5));
 
-	rs.close(); 
+	rs.close();
 }
 
 
 void RawSocketTest::testSendToReceiveFromIPv4()
 {
 	RawSocket rs(IPAddress::IPv4);
-	
+
 	int n = rs.sendTo("hello", 5, SocketAddress("127.0.0.1", 0));
 	assertTrue (n == 5);
 
@@ -91,7 +91,10 @@ void RawSocketTest::testEchoIPv4Move()
 	rs0.connect(sa);
 
 	RawSocket rs(std::move(rs0));
+#ifdef POCO_NEW_STATE_ON_MOVE
 	assertTrue (rs0.impl() == nullptr);
+#endif // POCO_NEW_STATE_ON_MOVE
+
 	int n = rs.sendBytes("hello", 5);
 	assertTrue (5 == n);
 
diff --git a/Net/testsuite/src/ReactorTestSuite.cpp b/Net/testsuite/src/ReactorTestSuite.cpp
index 2e9db3011..569f295a0 100644
--- a/Net/testsuite/src/ReactorTestSuite.cpp
+++ b/Net/testsuite/src/ReactorTestSuite.cpp
@@ -10,6 +10,7 @@
 
 #include "ReactorTestSuite.h"
 #include "SocketReactorTest.h"
+#include "SocketConnectorTest.h"
 
 
 CppUnit::Test* ReactorTestSuite::suite()
@@ -17,6 +18,7 @@ CppUnit::Test* ReactorTestSuite::suite()
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ReactorTestSuite");
 
 	pSuite->addTest(SocketReactorTest::suite());
+	pSuite->addTest(SocketConnectorTest::suite());
 
 	return pSuite;
 }
diff --git a/Net/testsuite/src/SMTPClientSessionTest.cpp b/Net/testsuite/src/SMTPClientSessionTest.cpp
index e4894ad00..07a34c574 100644
--- a/Net/testsuite/src/SMTPClientSessionTest.cpp
+++ b/Net/testsuite/src/SMTPClientSessionTest.cpp
@@ -300,7 +300,7 @@ void SMTPClientSessionTest::testSendFailed()
 	catch (SMTPException&)
 	{
 	}
-	
+
 	session.close();
 }
 
diff --git a/Net/testsuite/src/SMTPClientSessionTest.h b/Net/testsuite/src/SMTPClientSessionTest.h
index 0721a48ba..61f9c25d6 100644
--- a/Net/testsuite/src/SMTPClientSessionTest.h
+++ b/Net/testsuite/src/SMTPClientSessionTest.h
@@ -31,7 +31,7 @@ public:
 	void testSendMultiRecipient();
 	void testMultiSeparateRecipient();
 	void testSendFailed();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/Net/testsuite/src/SocketConnectorTest.cpp b/Net/testsuite/src/SocketConnectorTest.cpp
new file mode 100644
index 000000000..1d8af8986
--- /dev/null
+++ b/Net/testsuite/src/SocketConnectorTest.cpp
@@ -0,0 +1,170 @@
+//
+// SocketConnectorTest.cpp
+//
+// Copyright (c) 2005-2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include "SocketConnectorTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Net/SocketReactor.h"
+#include "Poco/Net/SocketNotification.h"
+#include "Poco/Net/SocketConnector.h"
+#include "Poco/Net/SocketAcceptor.h"
+#include "Poco/Net/StreamSocket.h"
+#include "Poco/Net/ServerSocket.h"
+#include "Poco/Net/SocketAddress.h"
+#include "Poco/Observer.h"
+#include <iostream>
+
+
+using Poco::Net::SocketReactor;
+using Poco::Net::SocketConnector;
+using Poco::Net::SocketAcceptor;
+using Poco::Net::StreamSocket;
+using Poco::Net::ServerSocket;
+using Poco::Net::SocketAddress;
+using Poco::Net::SocketNotification;
+using Poco::Net::ReadableNotification;
+using Poco::Net::WritableNotification;
+using Poco::Net::TimeoutNotification;
+using Poco::Net::ShutdownNotification;
+using Poco::Observer;
+
+
+namespace
+{
+	class EchoServiceHandler
+	{
+	public:
+		EchoServiceHandler(StreamSocket& socket, SocketReactor& reactor):
+			_socket(socket),
+			_reactor(reactor)
+		{
+			_reactor.addEventHandler(_socket, Observer<EchoServiceHandler, ReadableNotification>(*this, &EchoServiceHandler::onReadable));
+		}
+		
+		~EchoServiceHandler()
+		{
+			_reactor.removeEventHandler(_socket, Observer<EchoServiceHandler, ReadableNotification>(*this, &EchoServiceHandler::onReadable));
+		}
+		
+		void onReadable(ReadableNotification* pNf)
+		{
+			pNf->release();
+			char buffer[8];
+			int n = _socket.receiveBytes(buffer, sizeof(buffer));
+			if (n > 0) _socket.sendBytes(buffer, n);
+			else delete this;
+		}
+		
+	private:
+		StreamSocket   _socket;
+		SocketReactor& _reactor;
+	};
+	
+	class ClientServiceHandler
+	{
+	public:
+		ClientServiceHandler(StreamSocket& socket, SocketReactor& reactor):
+			_socket(socket),
+			_reactor(reactor),
+			_or(*this, &ClientServiceHandler::onReadable),
+			_ow(*this, &ClientServiceHandler::onWritable)
+		{
+			_reactor.addEventHandler(_socket, _or);
+			_reactor.addEventHandler(_socket, _ow);
+
+			doSomething();
+		}
+		
+		~ClientServiceHandler()
+		{
+		}
+
+		void doSomething()
+		{
+			Thread::sleep(100);
+		}
+
+		void onReadable(ReadableNotification* pNf)
+		{
+			pNf->release();
+			char buffer[32];
+			int n = _socket.receiveBytes(buffer, sizeof(buffer));
+			if (n <= 0)
+			{
+				_reactor.removeEventHandler(_socket, _or);
+				delete this;
+			}
+		}
+		
+		void onWritable(WritableNotification* pNf)
+		{
+			pNf->release();
+			_reactor.removeEventHandler(_socket, _ow);
+			std::string data(5, 'x');
+			_socket.sendBytes(data.data(), (int) data.length());
+			_socket.shutdownSend();
+		}
+		
+		StreamSocket                                         _socket;
+		SocketReactor&                                       _reactor;
+		Observer<ClientServiceHandler, ReadableNotification> _or;
+		Observer<ClientServiceHandler, WritableNotification> _ow;
+	};
+}
+
+SocketConnectorTest::SocketConnectorTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+SocketConnectorTest::~SocketConnectorTest()
+{
+}
+
+
+void SocketConnectorTest::testUnregisterConnector()
+{
+	SocketAddress ssa;
+	ServerSocket ss(ssa);
+	SocketReactor reactor1;
+	SocketReactor reactor2;
+	SocketAcceptor<EchoServiceHandler> acceptor(ss, reactor1);
+	Poco::Thread th;
+	th.start(reactor1);
+	SocketAddress sa("127.0.0.1", ss.address().port());
+	SocketConnector<ClientServiceHandler> connector(sa, reactor2);
+	Poco::Thread th2;
+	th2.start(reactor2);
+	Thread::sleep(200);
+	reactor1.stop();
+	reactor2.stop();
+	th.join();
+	th2.join();
+}
+
+
+void SocketConnectorTest::setUp()
+{
+}
+
+
+void SocketConnectorTest::tearDown()
+{
+}
+
+
+CppUnit::Test* SocketConnectorTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SocketConnectorTest");
+
+	CppUnit_addTest(pSuite, SocketConnectorTest, testUnregisterConnector);
+
+	return pSuite;
+}
diff --git a/Net/testsuite/src/SocketConnectorTest.h b/Net/testsuite/src/SocketConnectorTest.h
new file mode 100644
index 000000000..075beb96f
--- /dev/null
+++ b/Net/testsuite/src/SocketConnectorTest.h
@@ -0,0 +1,36 @@
+//
+// SocketConnectorTest.h
+//
+// Definition of the SocketConnectorTest class.
+//
+// Copyright (c) 2005-2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef SocketConnectorTest_INCLUDED
+#define SocketConnectorTest_INCLUDED
+
+
+#include "Poco/Net/Net.h"
+#include "CppUnit/TestCase.h"
+
+
+class SocketConnectorTest: public CppUnit::TestCase
+{
+public:
+	SocketConnectorTest(const std::string& name);
+	~SocketConnectorTest();
+
+	void testUnregisterConnector();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+};
+
+
+#endif // SocketConnectorTest_INCLUDED
diff --git a/Net/testsuite/src/SocketProactorTest.cpp b/Net/testsuite/src/SocketProactorTest.cpp
index 1c611dfe9..cf8e75a50 100644
--- a/Net/testsuite/src/SocketProactorTest.cpp
+++ b/Net/testsuite/src/SocketProactorTest.cpp
@@ -16,6 +16,7 @@
 #include "Poco/Net/DatagramSocket.h"
 #include "Poco/Net/ServerSocket.h"
 #include "Poco/Timestamp.h"
+#include "Poco/Stopwatch.h"
 #include <iostream>
 
 using Poco::Net::SocketProactor;
@@ -25,6 +26,7 @@ using Poco::Net::ServerSocket;
 using Poco::Net::SocketAddress;
 using Poco::Thread;
 using Poco::Timestamp;
+using Poco::Stopwatch;
 
 
 SocketProactorTest::SocketProactorTest(const std::string& name): CppUnit::TestCase(name)
@@ -54,7 +56,7 @@ void SocketProactorTest::testTCPSocketProactor()
 	};
 	proactor.addSend(s, SocketProactor::Buffer(hello.begin(), hello.end()), onSendCompletion);
 	SocketProactor::Buffer buf(hello.size(), 0);
-	bool received = false, receivePassed = false;
+	std::atomic<bool> received(false), receivePassed(false);
 	auto onRecvCompletion = [&](std::error_code err, int bytes)
 	{
 		receivePassed = (err.value() == 0) &&
@@ -63,7 +65,14 @@ void SocketProactorTest::testTCPSocketProactor()
 		received = true;
 	};
 	proactor.addReceive(s, buf, onRecvCompletion);
-	while (!received) proactor.poll();
+	Stopwatch sw;
+	sw.start();
+	while (!received)
+	{
+		if (sw.elapsedSeconds() > 1)
+			fail("SocketProactor receive completion timed out.", __LINE__, __FILE__);
+		proactor.poll();
+	}
 
 	assertTrue (sent);
 	assertTrue (sendPassed);
@@ -82,8 +91,11 @@ void SocketProactorTest::testTCPSocketProactor()
 	proactor.addSend(s, SocketProactor::Buffer(hello.begin(), hello.end()), nullptr);
 	proactor.addReceive(s, buf, nullptr);
 	int handled = 0, handledTot = 0;
+	sw.restart();
 	do
 	{
+		if (sw.elapsedSeconds() > 1)
+			fail("SocketProactor receive completion timed out.", __LINE__, __FILE__);
 		proactor.poll(&handled);
 		handledTot += handled;
 	}
@@ -95,8 +107,8 @@ void SocketProactorTest::testTCPSocketProactor()
 	assertFalse (received);
 	assertFalse (receivePassed);
 
-	bool error = false;
-	bool errorPassed = false;
+	std::atomic<bool> error(false);
+	std::atomic<bool> errorPassed(false);
 	auto onError = [&](std::error_code err, int bytes)
 	{
 		errorPassed = (err.value() != 0) && (bytes == 0);
@@ -107,7 +119,13 @@ void SocketProactorTest::testTCPSocketProactor()
 	errSock.connectNB(SocketAddress("127.0.0.1", 0xFFEE));
 	proactor.addSend(errSock, SocketProactor::Buffer(hello.begin(), hello.end()), onError);
 	Thread::sleep(100);
-	while (!error) proactor.poll();
+	sw.restart();
+	while (!error)
+	{
+		if (sw.elapsedSeconds() > 1)
+			fail("SocketProactor send completion timed out.", __LINE__, __FILE__);
+		proactor.poll();
+	}
 	assertTrue (error);
 	assertTrue(errorPassed);
 }
@@ -133,7 +151,7 @@ void SocketProactorTest::testUDPSocketProactor()
 		SocketAddress("127.0.0.1", echoServer.port()),
 		onSendCompletion);
 	Poco::Net::SocketProactor::Buffer buf(hello.size(), 0);
-	bool received = false, receivePassed = false;
+	std::atomic<bool> received(false), receivePassed(false);
 	SocketAddress sa;
 	auto onRecvCompletion = [&](std::error_code err, int bytes)
 	{
@@ -145,7 +163,14 @@ void SocketProactorTest::testUDPSocketProactor()
 		received = true;
 	};
 	proactor.addReceiveFrom(s, buf, sa, onRecvCompletion);
-	while (!received) proactor.poll();
+	Stopwatch sw;
+	sw.start();
+	while (!received)
+	{
+		if (sw.elapsedSeconds() > 1)
+			fail("SocketProactor receive completion timed out.", __LINE__, __FILE__);
+		proactor.poll();
+	}
 
 	assertTrue (sent);
 	assertTrue (sendPassed);
@@ -167,8 +192,11 @@ void SocketProactorTest::testUDPSocketProactor()
 		nullptr);
 	proactor.addReceiveFrom(s, buf, sa, nullptr);
 	int handled = 0, handledTot = 0;
+	sw.restart();
 	do
 	{
+		if (sw.elapsedSeconds() > 1)
+			fail("SocketProactor receiveFrom timed out.", __LINE__, __FILE__);
 		proactor.poll(&handled);
 		handledTot += handled;
 	} while (handledTot < 2);
@@ -201,7 +229,7 @@ void SocketProactorTest::testSocketProactorStartStop()
 		SocketAddress("127.0.0.1", echoServer.port()),
 		onSendCompletion);
 	Poco::Net::SocketProactor::Buffer buf(hello.size(), 0);
-	bool received = false, receivePassed = false;
+	std::atomic<bool> received(false), receivePassed(false);
 	SocketAddress sa;
 	auto onRecvCompletion = [&](std::error_code err, int bytes)
 	{
@@ -215,7 +243,14 @@ void SocketProactorTest::testSocketProactorStartStop()
 	};
 	proactor.addReceiveFrom(s, buf, sa, onRecvCompletion);
 
-	while (!received) proactor.poll();
+	Stopwatch sw;
+	sw.start();
+	while (!received)
+	{
+		if (sw.elapsedSeconds() > 1)
+			fail("SocketProactor receiveFrom timed out.", __LINE__, __FILE__);
+		proactor.poll();
+	}
 
 	assertTrue (sent);
 	assertTrue (sendPassed);
@@ -241,7 +276,13 @@ void SocketProactorTest::testSocketProactorStartStop()
 		SocketAddress("127.0.0.1", echoServer.port()),
 		onSendCompletion);
 	proactor.addReceiveFrom(s, buf, sa, onRecvCompletion);
-	while (!received) proactor.poll();
+	sw.restart();
+	while (!received)
+	{
+		if (sw.elapsedSeconds() > 1)
+			fail("SocketProactor receiveFrom timed out.", __LINE__, __FILE__);
+		proactor.poll();
+	}
 
 	assertTrue(std::string(buf.begin(), buf.end()) == hello);
 	assertTrue (sent);
diff --git a/Net/testsuite/src/SocketStreamTest.cpp b/Net/testsuite/src/SocketStreamTest.cpp
index dad5a1e5c..99954b3c6 100644
--- a/Net/testsuite/src/SocketStreamTest.cpp
+++ b/Net/testsuite/src/SocketStreamTest.cpp
@@ -111,11 +111,11 @@ void SocketStreamTest::testEOF()
 		assertTrue (str.gcount() == 5);
 		assertTrue (std::string(buffer, 5) == "hello");
 	}
-	
+
 	int c = str.get();
 	assertTrue (c == -1);
 	assertTrue (str.eof());
-	
+
 	ss.close();
 }
 
diff --git a/Net/testsuite/src/SocketTest.cpp b/Net/testsuite/src/SocketTest.cpp
index 2d668095d..e09dc7a4d 100644
--- a/Net/testsuite/src/SocketTest.cpp
+++ b/Net/testsuite/src/SocketTest.cpp
@@ -179,7 +179,7 @@ void SocketTest::testFIFOBuffer()
 
 	n = ss.receiveBytes(f);
 	assertTrue (n == 5);
-	
+
 	assertTrue (2 == _notToReadable);
 	assertTrue (1 == _readableToNot);
 	assertTrue (1 == _notToWritable);
@@ -292,14 +292,14 @@ void SocketTest::testAssign()
 	ServerSocket serv;
 	StreamSocket ss1;
 	StreamSocket ss2;
-	
+
 	assertTrue (ss1 != ss2);
 	StreamSocket ss3(ss1);
 	assertTrue (ss1 == ss3);
 	ss3 = ss2;
 	assertTrue (ss1 != ss3);
 	assertTrue (ss2 == ss3);
-	
+
 	try
 	{
 		ss1 = serv;
@@ -308,7 +308,7 @@ void SocketTest::testAssign()
 	catch (InvalidArgumentException&)
 	{
 	}
-	
+
 	try
 	{
 		StreamSocket ss4(serv);
@@ -326,7 +326,7 @@ void SocketTest::testAssign()
 	catch (InvalidArgumentException&)
 	{
 	}
-	
+
 	try
 	{
 		ServerSocket serv2(ss1);
@@ -343,7 +343,7 @@ void SocketTest::testTimeout()
 	EchoServer echoServer;
 	StreamSocket ss;
 	ss.connect(SocketAddress("127.0.0.1", echoServer.port()));
-	
+
 	Timespan timeout0 = ss.getReceiveTimeout();
 	Timespan timeout(250000);
 	ss.setReceiveTimeout(timeout);
@@ -351,7 +351,7 @@ void SocketTest::testTimeout()
 	std::cout << "original receive timeout:  " << timeout0.totalMicroseconds() << std::endl;
 	std::cout << "requested receive timeout: " << timeout.totalMicroseconds() << std::endl;
 	std::cout << "actual receive timeout:    " << timeout1.totalMicroseconds() << std::endl;
-	
+
 	// some socket implementations adjust the timeout value
 	// assertTrue (ss.getReceiveTimeout() == timeout);
 	Stopwatch sw;
@@ -366,7 +366,7 @@ void SocketTest::testTimeout()
 	{
 	}
 	assertTrue (sw.elapsed() < 1000000);
-	
+
 	timeout0 = ss.getSendTimeout();
 	ss.setSendTimeout(timeout);
 	timeout1 = ss.getSendTimeout();
@@ -382,7 +382,7 @@ void SocketTest::testBufferSize()
 	EchoServer echoServer;
 	SocketAddress sa("127.0.0.1", 1234);
 	StreamSocket ss(sa.family());
-	
+
 	int osz = ss.getSendBufferSize();
 	int rsz = 32000;
 	ss.setSendBufferSize(rsz);
@@ -390,7 +390,7 @@ void SocketTest::testBufferSize()
 	std::cout << "original send buffer size:  " << osz << std::endl;
 	std::cout << "requested send buffer size: " << rsz << std::endl;
 	std::cout << "actual send buffer size:    " << asz << std::endl;
-	
+
 	osz = ss.getReceiveBufferSize();
 	ss.setReceiveBufferSize(rsz);
 	asz = ss.getReceiveBufferSize();
@@ -414,17 +414,17 @@ void SocketTest::testOptions()
 	ss.setLinger(false, 0);
 	ss.getLinger(f, t);
 	assertTrue (!f);
-	
+
 	ss.setNoDelay(true);
 	assertTrue (ss.getNoDelay());
 	ss.setNoDelay(false);
 	assertTrue (!ss.getNoDelay());
-	
+
 	ss.setKeepAlive(true);
 	assertTrue (ss.getKeepAlive());
 	ss.setKeepAlive(false);
 	assertTrue (!ss.getKeepAlive());
-	
+
 	ss.setOOBInline(true);
 	assertTrue (ss.getOOBInline());
 	ss.setOOBInline(false);
@@ -449,7 +449,7 @@ void SocketTest::testSelect()
 	assertTrue (readList.empty());
 	assertTrue (writeList.empty());
 	assertTrue (exceptList.empty());
-	
+
 	ss.sendBytes("hello", 5);
 
 	ss.poll(timeout, Socket::SELECT_READ);
@@ -477,7 +477,7 @@ void SocketTest::testSelect2()
 	EchoServer echoServer2;
 	StreamSocket ss1(SocketAddress("127.0.0.1", echoServer1.port()));
 	StreamSocket ss2(SocketAddress("127.0.0.1", echoServer2.port()));
-	
+
 	Socket::SocketList readList;
 	Socket::SocketList writeList;
 	Socket::SocketList exceptList;
@@ -488,7 +488,7 @@ void SocketTest::testSelect2()
 	assertTrue (readList.empty());
 	assertTrue (writeList.empty());
 	assertTrue (exceptList.empty());
-	
+
 	ss1.sendBytes("hello", 5);
 
 	ss1.poll(timeout, Socket::SELECT_READ);
@@ -514,8 +514,8 @@ void SocketTest::testSelect2()
 	assertTrue (Socket::select(readList, writeList, exceptList, timeout) == 2);
 	assertTrue (readList.empty());
 	assertTrue (writeList.size() == 2);
-	assertTrue (writeList[0] == ss1);
-	assertTrue (writeList[1] == ss2);
+	assertTrue (writeList[0] == ss1 || writeList[1] == ss1);
+	assertTrue (writeList[0] == ss2 || writeList[1] == ss2);
 	assertTrue (exceptList.empty());
 
 	ss1.close();
diff --git a/Net/testsuite/src/SyslogTest.cpp b/Net/testsuite/src/SyslogTest.cpp
index fe3b7659e..543d69a5f 100644
--- a/Net/testsuite/src/SyslogTest.cpp
+++ b/Net/testsuite/src/SyslogTest.cpp
@@ -28,7 +28,7 @@ class CachingChannel: public Poco::Channel
 {
 public:
 	typedef std::list<Poco::Message> Messages;
-	
+
 	CachingChannel(std::size_t n = 100);
 		/// Creates the CachingChannel. Caches n messages in memory
 
@@ -63,6 +63,7 @@ std::size_t CachingChannel::getMaxSize() const
 
 std::size_t CachingChannel::getCurrentSize() const
 {
+	Poco::FastMutex::ScopedLock lock(_mutex);
 	return _size;
 }
 
@@ -144,6 +145,44 @@ void SyslogTest::testListener()
 	assertTrue (msgs[0].getPriority() == Poco::Message::PRIO_CRITICAL);
 }
 
+void SyslogTest::testChannelFacility()
+{
+	Poco::AutoPtr<RemoteSyslogChannel> channel = new RemoteSyslogChannel();
+	channel->setProperty("loghost", "127.0.0.1:51400");
+	channel->setProperty("facility", "KERN");
+	channel->open();
+	Poco::AutoPtr<RemoteSyslogListener> listener = new RemoteSyslogListener(51400);
+	listener->open();
+	auto pCL = Poco::makeAuto<CachingChannel>();
+	listener->addChannel(pCL);
+	assertTrue (pCL->getCurrentSize() == 0);
+	Poco::Message msg("asource", "amessage", Poco::Message::PRIO_CRITICAL);
+	channel->log(msg);
+	channel->setProperty("facility", "USER");
+	msg.setText("asecondmessage");
+	channel->log(msg);
+	assertFalse (msg.has("facility"));
+	Poco::Thread::sleep(1000);
+	listener->close();
+	channel->close();
+	assertTrue (pCL->getCurrentSize() == 2);
+	std::vector<Poco::Message> msgs;
+	pCL->getMessages(msgs, 0, 10);
+
+	assertTrue (msgs.size() == 2);
+
+	assertTrue (msgs[1].getSource() == "asource");
+	assertTrue (msgs[1].getText() == "amessage");
+	assertTrue (msgs[1].getPriority() == Poco::Message::PRIO_CRITICAL);
+	assertTrue (msgs[1].has("facility"));
+	assertTrue (msgs[1].get("facility") == "KERN");
+
+	assertTrue (msgs[0].getSource() == "asource");
+	assertTrue (msgs[0].getText() == "asecondmessage");
+	assertTrue (msgs[0].getPriority() == Poco::Message::PRIO_CRITICAL);
+	assertTrue (msgs[0].has("facility"));
+	assertTrue (msgs[0].get("facility") == "USER");
+}
 
 void SyslogTest::testChannelOpenClose()
 {
@@ -262,6 +301,7 @@ CppUnit::Test* SyslogTest::suite()
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SyslogTest");
 
 	CppUnit_addTest(pSuite, SyslogTest, testListener);
+	CppUnit_addTest(pSuite, SyslogTest, testChannelFacility);
 	CppUnit_addTest(pSuite, SyslogTest, testChannelOpenClose);
 	CppUnit_addTest(pSuite, SyslogTest, testOldBSD);
 	CppUnit_addTest(pSuite, SyslogTest, testStructuredData);
diff --git a/Net/testsuite/src/SyslogTest.h b/Net/testsuite/src/SyslogTest.h
index 60cb09656..6c84d624e 100644
--- a/Net/testsuite/src/SyslogTest.h
+++ b/Net/testsuite/src/SyslogTest.h
@@ -25,6 +25,7 @@ public:
 	~SyslogTest();
 
 	void testListener();
+	void testChannelFacility();
 	void testChannelOpenClose();
 	void testOldBSD();
 	void testStructuredData();
diff --git a/Net/testsuite/src/TCPServerTest.cpp b/Net/testsuite/src/TCPServerTest.cpp
index 97f715622..195b4162a 100644
--- a/Net/testsuite/src/TCPServerTest.cpp
+++ b/Net/testsuite/src/TCPServerTest.cpp
@@ -41,7 +41,7 @@ namespace
 		EchoConnection(const StreamSocket& s): TCPServerConnection(s)
 		{
 		}
-		
+
 		void run()
 		{
 			StreamSocket& ss = socket();
@@ -61,7 +61,7 @@ namespace
 			}
 		}
 	};
-	
+
 	class RejectFilter: public TCPServerConnectionFilter
 	{
 	public:
@@ -91,7 +91,7 @@ void TCPServerTest::testOneConnection()
 	assertTrue (srv.currentThreads() == 0);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 0);
-	
+
 	SocketAddress sa("127.0.0.1", srv.socket().address().port());
 	StreamSocket ss1(sa);
 	std::string data("hello, world");
@@ -118,7 +118,7 @@ void TCPServerTest::testTwoConnections()
 	assertTrue (srv.currentThreads() == 0);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 0);
-	
+
 	SocketAddress sa("127.0.0.1", srv.socket().address().port());
 	StreamSocket ss1(sa);
 	StreamSocket ss2(sa);
@@ -134,7 +134,7 @@ void TCPServerTest::testTwoConnections()
 	n = ss2.receiveBytes(buffer, sizeof(buffer));
 	assertTrue (n > 0);
 	assertTrue (std::string(buffer, n) == data);
-	
+
 	assertTrue (srv.currentConnections() == 2);
 	assertTrue (srv.currentThreads() == 2);
 	assertTrue (srv.queuedConnections() == 0);
@@ -166,7 +166,7 @@ void TCPServerTest::testMultiConnections()
 	assertTrue (srv.maxThreads() >= 4);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 0);
-	
+
 	SocketAddress sa("127.0.0.1", svs.address().port());
 	StreamSocket ss1(sa);
 	StreamSocket ss2(sa);
@@ -194,19 +194,19 @@ void TCPServerTest::testMultiConnections()
 	n = ss4.receiveBytes(buffer, sizeof(buffer));
 	assertTrue (n > 0);
 	assertTrue (std::string(buffer, n) == data);
-	
+
 	assertTrue (srv.currentConnections() == 4);
 	assertTrue (srv.currentThreads() == 4);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 4);
-	
+
 	StreamSocket ss5(sa);
 	Thread::sleep(200);
 	assertTrue (srv.queuedConnections() == 1);
 	StreamSocket ss6(sa);
 	Thread::sleep(200);
 	assertTrue (srv.queuedConnections() == 2);
-	
+
 	ss1.close();
 	Thread::sleep(2000);
 	assertTrue (srv.currentConnections() == 4);
@@ -220,7 +220,7 @@ void TCPServerTest::testMultiConnections()
 	assertTrue (srv.currentThreads() == 4);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 6);
-	
+
 	ss3.close();
 	Thread::sleep(2000);
 	assertTrue (srv.currentConnections() == 3);
@@ -262,7 +262,7 @@ void TCPServerTest::testFilter()
 	assertTrue (srv.currentThreads() == 0);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 0);
-	
+
 	SocketAddress sa("127.0.0.1", srv.socket().address().port());
 	StreamSocket ss(sa);
 
diff --git a/Net/testsuite/src/UDPEchoServer.h b/Net/testsuite/src/UDPEchoServer.h
index ec8885fac..01b1db943 100644
--- a/Net/testsuite/src/UDPEchoServer.h
+++ b/Net/testsuite/src/UDPEchoServer.h
@@ -38,10 +38,10 @@ public:
 	Poco::UInt16 port() const;
 		/// Returns the port the echo server is
 		/// listening on.
-		
+
 	Poco::Net::SocketAddress address() const;
-		/// Returns the address of the server.	
-		
+		/// Returns the address of the server.
+
 	void run();
 		/// Does the work.
 
@@ -49,7 +49,7 @@ private:
 	Poco::Net::DatagramSocket _socket;
 	Poco::Thread _thread;
 	Poco::Event  _ready;
-	bool         _stop;
+	std::atomic<bool> _stop;
 };
 
 
diff --git a/Net/testsuite/src/UDPServerTest.cpp b/Net/testsuite/src/UDPServerTest.cpp
index 40cec1f84..1e82cc33a 100644
--- a/Net/testsuite/src/UDPServerTest.cpp
+++ b/Net/testsuite/src/UDPServerTest.cpp
@@ -45,7 +45,10 @@ namespace
 {
 	struct TestUDPHandler : public Poco::Net::UDPHandler
 	{
-		TestUDPHandler() : counter(0), errCounter(0) {}
+		TestUDPHandler() : counter(0), errCounter(0)
+		{
+			start();
+		}
 
 		void processData(char *buf)
 		{
diff --git a/Net/testsuite/src/WebSocketTest.cpp b/Net/testsuite/src/WebSocketTest.cpp
index 116bb266e..664bc4ff0 100644
--- a/Net/testsuite/src/WebSocketTest.cpp
+++ b/Net/testsuite/src/WebSocketTest.cpp
@@ -81,7 +81,7 @@ namespace
 	private:
 		std::size_t _bufSize;
 	};
-	
+
 	class WebSocketRequestHandlerFactory: public Poco::Net::HTTPRequestHandlerFactory
 	{
 	public:
@@ -115,15 +115,17 @@ void WebSocketTest::testWebSocket()
 	Poco::Net::ServerSocket ss(0);
 	Poco::Net::HTTPServer server(new WebSocketRequestHandlerFactory, ss, new Poco::Net::HTTPServerParams);
 	server.start();
-	
+
 	Poco::Thread::sleep(200);
-	
+
 	HTTPClientSession cs("127.0.0.1", ss.address().port());
 	HTTPRequest request(HTTPRequest::HTTP_GET, "/ws", HTTPRequest::HTTP_1_1);
 	HTTPResponse response;
 	WebSocket ws0 = WebSocket(cs, request, response);
 	WebSocket ws(std::move(ws0));
+#ifdef POCO_NEW_STATE_ON_MOVE
 	assertTrue(ws0.impl() == nullptr);
+#endif
 
 	std::string payload("x");
 	ws.sendFrame(payload.data(), (int) payload.size());
@@ -176,19 +178,19 @@ void WebSocketTest::testWebSocket()
 	assertTrue (n == payload.size());
 	assertTrue (payload.compare(0, payload.size(), buffer, n) == 0);
 	assertTrue (flags == WebSocket::FRAME_TEXT);
-	
+
 	payload = "Hello, universe!";
 	ws.sendFrame(payload.data(), (int) payload.size(), WebSocket::FRAME_BINARY);
 	n = ws.receiveFrame(buffer, sizeof(buffer), flags);
 	assertTrue (n == payload.size());
 	assertTrue (payload.compare(0, payload.size(), buffer, n) == 0);
 	assertTrue (flags == WebSocket::FRAME_BINARY);
-	
+
 	ws.shutdown();
 	n = ws.receiveFrame(buffer, sizeof(buffer), flags);
 	assertTrue (n == 2);
 	assertTrue ((flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE);
-	
+
 	server.stop();
 }
 
@@ -200,9 +202,9 @@ void WebSocketTest::testWebSocketLarge()
 	Poco::Net::ServerSocket ss(0);
 	Poco::Net::HTTPServer server(new WebSocketRequestHandlerFactory(msgSize), ss, new Poco::Net::HTTPServerParams);
 	server.start();
-	
+
 	Poco::Thread::sleep(200);
-	
+
 	HTTPClientSession cs("127.0.0.1", ss.address().port());
 	HTTPRequest request(HTTPRequest::HTTP_GET, "/ws", HTTPRequest::HTTP_1_1);
 	HTTPResponse response;
diff --git a/Net/testsuite/src/WinCEDriver.cpp b/Net/testsuite/src/WinCEDriver.cpp
index c17cce87c..e1b3bf516 100644
--- a/Net/testsuite/src/WinCEDriver.cpp
+++ b/Net/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int wmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("NetTestSuite", NetTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen
index 21dff5893..507316953 100644
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen
@@ -12,6 +12,7 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared = NetSSL_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.sln b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.sln
index 8a5e86ebd..de6533955 100644
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.sln
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64
 		{5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj
index 5cd0374e3..a4745f63e 100644
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>NetSSL_OpenSSL</ProjectName>
     <ProjectGuid>{5AECC55E-A469-11DA-8DA6-005056C00008}</ProjectGuid>
     <RootNamespace>NetSSL_OpenSSL</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoNetSSLA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoNetSSLmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoNetSSLmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoNetSSLA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoNetSSLmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoNetSSLmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetSSLd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetSSLmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetSSLmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoNetSSLmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoNetSSLmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\NetSSL_OpenSSL\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\NetSSL_OpenSSL\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\NetSSL_OpenSSL\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\NetSSL_OpenSSL\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\NetSSL_OpenSSL\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\NetSSL_OpenSSL\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\NetSSL_OpenSSL\$(Configuration)\</IntDir>
@@ -223,6 +328,166 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\NetSSL_OpenSSL\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoNetSSLA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoNetSSLA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoNetSSLd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoNetSSLA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoNetSSL.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoNetSSLmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoNetSSLmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoNetSSLmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoNetSSLmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoNetSSLmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoNetSSLmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -668,12 +933,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_OpenSSL/doc/howtobuild.txt b/NetSSL_OpenSSL/doc/howtobuild.txt
index 0b353b624..483166780 100644
--- a/NetSSL_OpenSSL/doc/howtobuild.txt
+++ b/NetSSL_OpenSSL/doc/howtobuild.txt
@@ -26,7 +26,7 @@ use a binary (prebuild) release, for example the
 one from Shining Light Productions that comes with
 a Windows installer.
 
-1. Download OpenSSL (at least v0.98a) from: 
+1. Download OpenSSL (at least v0.98a) from:
    http://www.slproweb.com/products/Win32OpenSSL.html
 2. Install OpenSSL (we assume you install to c:\OpenSSL)
 3. Start Visual Studio, go to Tools->Options, under Projects->VC++ Directories
diff --git a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h
index 5e3699c3c..0bfbe3e1c 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h
@@ -32,7 +32,7 @@ class NetSSL_API CertificateHandlerFactory
 	/// A CertificateHandlerFactory is responsible for creating InvalidCertificateHandlers.
 	///
 	/// You don't need to access this class directly. Use the macro
-	///     POCO_REGISTER_CHFACTORY(namespace, InvalidCertificateHandlerName) 
+	///     POCO_REGISTER_CHFACTORY(namespace, InvalidCertificateHandlerName)
 	/// instead (see the documentation of InvalidCertificateHandler for an example).
 {
 public:
@@ -50,7 +50,7 @@ public:
 class NetSSL_API CertificateHandlerFactoryRegistrar
 	/// Registrar class which automatically registers CertificateHandlerFactory at the CertificateHandlerFactoryMgr.
 	/// You don't need to access this class directly. Use the macro
-	///     POCO_REGISTER_CHFACTORY(namespace, InvalidCertificateHandlerName) 
+	///     POCO_REGISTER_CHFACTORY(namespace, InvalidCertificateHandlerName)
 	/// instead (see the documentation of InvalidCertificateHandler for an example).
 {
 public:
diff --git a/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h b/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h
index c58962c47..35d2c9217 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h
@@ -28,7 +28,7 @@ namespace Net {
 
 class NetSSL_API ConsoleCertificateHandler: public InvalidCertificateHandler
 	/// A ConsoleCertificateHandler is invoked whenever an error occurs verifying the certificate.
-	/// 
+	///
 	/// The certificate is printed to stdout and the user is asked via console if he wants to accept it.
 {
 public:
diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h
index ff0d89994..81344b1e5 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h
@@ -74,7 +74,7 @@ public:
 	{
 		HTTPS_PORT = 443
 	};
-	
+
 	HTTPSClientSession();
 		/// Creates an unconnected HTTPSClientSession.
 
@@ -122,25 +122,25 @@ public:
 	~HTTPSClientSession();
 		/// Destroys the HTTPSClientSession and closes
 		/// the underlying socket.
-	
+
 	bool secure() const;
 		/// Return true iff the session uses SSL or TLS,
 		/// or false otherwise.
-		
+
 	X509Certificate serverCertificate();
 		/// Returns the server's certificate.
 		///
 		/// The certificate is available after the first request has been sent.
-		
+
 	Session::Ptr sslSession();
-		/// Returns the SSL Session object for the current 
+		/// Returns the SSL Session object for the current
 		/// connection, if session caching has been enabled for
-		/// the HTTPSClientSession's Context. A null pointer is 
+		/// the HTTPSClientSession's Context. A null pointer is
 		/// returned otherwise.
 		///
 		/// The Session object can be obtained after the first request has
 		/// been sent.
-		
+
 	// HTTPSession
 	void abort();
 
@@ -153,7 +153,7 @@ protected:
 private:
 	HTTPSClientSession(const HTTPSClientSession&);
 	HTTPSClientSession& operator = (const HTTPSClientSession&);
-	
+
 	Context::Ptr _pContext;
 	Session::Ptr _pSession;
 };
diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h
index 2fd3515c8..044cfdaed 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h
@@ -49,27 +49,27 @@ public:
 
 	~HTTPSStreamFactory();
 		/// Destroys the HTTPSStreamFactory.
-		
+
 	std::istream* open(const Poco::URI& uri);
 		/// Creates and opens a HTTPS stream for the given URI.
 		/// The URI must be a https://... URI.
 		///
 		/// Throws a NetException if anything goes wrong.
-		
+
 	static void registerFactory();
 		/// Registers the HTTPSStreamFactory with the
-		/// default URIStreamOpener instance.	
+		/// default URIStreamOpener instance.
 
 	static void unregisterFactory();
 		/// Unregisters the HTTPSStreamFactory with the
-		/// default URIStreamOpener instance.	
-		
+		/// default URIStreamOpener instance.
+
 private:
 	enum
 	{
 		MAX_REDIRECTS = 10
 	};
-	
+
 	std::string  _proxyHost;
 	Poco::UInt16 _proxyPort;
 	std::string  _proxyUsername;
diff --git a/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h b/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h
index 274cdbff5..21e7a585c 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h
@@ -27,7 +27,7 @@ namespace Net {
 
 
 class NetSSL_API KeyFileHandler: public PrivateKeyPassphraseHandler
-	/// An implementation of PrivateKeyPassphraseHandler that 
+	/// An implementation of PrivateKeyPassphraseHandler that
 	/// reads the key for a certificate from a configuration file
 	/// under the path "openSSL.privateKeyPassphraseHandler.options.password".
 {
diff --git a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h
index ae793fde9..444ab4b8c 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h
@@ -71,7 +71,7 @@ void NetSSL_API initializeSSL();
 	/// libraries, by calling Poco::Crypto::OpenSSLInitializer::initialize().
 	///
 	/// Should be called before using any class from the NetSSL library.
-	/// The NetSSL will be initialized automatically, through 
+	/// The NetSSL will be initialized automatically, through
 	/// Poco::Crypto::OpenSSLInitializer instances or similar mechanisms
 	/// when creating Context or SSLManager instances.
 	/// However, it is recommended to call initializeSSL()
@@ -80,10 +80,10 @@ void NetSSL_API initializeSSL();
 	/// Can be called multiple times; however, for every call to
 	/// initializeSSL(), a matching call to uninitializeSSL()
 	/// must be performed.
-	
+
 
 void NetSSL_API uninitializeSSL();
-	/// Uninitializes the NetSSL library by calling 
+	/// Uninitializes the NetSSL library by calling
 	/// Poco::Crypto::OpenSSLInitializer::uninitialize() and
 	/// shutting down the SSLManager.
 
diff --git a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h
index 9c0fa37fa..706a5992d 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h
@@ -32,7 +32,7 @@ class NetSSL_API PrivateKeyFactory
 	/// A PrivateKeyFactory is responsible for creating PrivateKeyPassphraseHandlers.
 	///
 	/// You don't need to access this class directly. Use the macro
-	///     POCO_REGISTER_KEYFACTORY(namespace, PrivateKeyPassphraseHandlerName) 
+	///     POCO_REGISTER_KEYFACTORY(namespace, PrivateKeyPassphraseHandlerName)
 	/// instead (see the documentation of PrivateKeyPassphraseHandler for an example).
 {
 public:
@@ -51,7 +51,7 @@ class NetSSL_API PrivateKeyFactoryRegistrar
 	/// Registrar class which automatically registers PrivateKeyFactories at the PrivateKeyFactoryMgr.
 	///
 	/// You don't need to access this class directly. Use the macro
-	///     POCO_REGISTER_KEYFACTORY(namespace, PrivateKeyPassphraseHandlerName) 
+	///     POCO_REGISTER_KEYFACTORY(namespace, PrivateKeyPassphraseHandlerName)
 	/// instead (see the documentation of PrivateKeyPassphraseHandler for an example).
 
 {
diff --git a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h
index 726703f78..350acf121 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h
@@ -29,9 +29,9 @@ class NetSSL_API PrivateKeyPassphraseHandler
 	/// A passphrase handler is needed whenever the private key of a certificate is loaded and the certificate is protected
 	/// by a passphrase. The PrivateKeyPassphraseHandler's task is to provide that passphrase.
 	/// One can install one's own PrivateKeyPassphraseHandler by implementing this interface. Note that
-	/// in the implementation file of the subclass the following code must be present (assuming you use the namespace My_API 
+	/// in the implementation file of the subclass the following code must be present (assuming you use the namespace My_API
 	/// and the name of your handler class is MyGuiHandler):
-	///    
+	///
 	///    #include "Poco/Net/PrivateKeyFactory.h"
 	///    ...
 	///    POCO_REGISTER_KEYFACTORY(My_API, MyGuiHandler)
@@ -42,7 +42,7 @@ class NetSSL_API PrivateKeyPassphraseHandler
 	///
 	/// or in case one's application extends Poco::Util::Application one can use an XML configuration and put the following entry
 	/// under the path openSSL.privateKeyPassphraseHandler:
-	///    
+	///
 	///    <privateKeyPassphraseHandler>
 	///        <name>MyGuiHandler</name>
 	///        <options>
diff --git a/NetSSL_OpenSSL/include/Poco/Net/RejectCertificateHandler.h b/NetSSL_OpenSSL/include/Poco/Net/RejectCertificateHandler.h
index b170ad50b..7eff4459b 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/RejectCertificateHandler.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/RejectCertificateHandler.h
@@ -27,7 +27,7 @@ namespace Net {
 
 
 class NetSSL_API RejectCertificateHandler: public InvalidCertificateHandler
-	/// A RejectCertificateHandler is invoked whenever an error 
+	/// A RejectCertificateHandler is invoked whenever an error
 	/// occurs verifying the certificate. It always rejects
 	/// the certificate.
 {
diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h
index 2b89c45cb..2ac8cdf71 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h
@@ -91,7 +91,7 @@ public:
 		///
 		/// Releases the socket's SocketImpl and
 		/// attaches the SocketImpl from the other socket and
-		/// increments the reference count of the SocketImpl.	
+		/// increments the reference count of the SocketImpl.
 
 	StreamSocket acceptConnection(SocketAddress& clientAddr);
 		/// Get the next completed connection from the
diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h
index 7bc7514b8..a12447fbe 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h
@@ -161,6 +161,15 @@ public:
 		/// underlying TCP connection. No orderly SSL shutdown
 		/// is performed.
 
+	void setBlocking(bool flag);
+		/// Sets the socket in blocking mode if flag is true,
+		/// disables blocking mode if flag is false.
+
+	bool getBlocking() const;
+		/// Returns the blocking mode of the socket.
+		/// This method will only work if the blocking modes of
+		/// the socket are changed via the setBlocking method!
+
 	int sendBytes(const void* buffer, int length, int flags = 0);
 		/// Sends the contents of the given buffer through
 		/// the socket. Any specified flags are ignored.
diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h
index 059be1bbe..016757bea 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h
@@ -34,7 +34,7 @@ class NetSSL_API SecureStreamSocket: public StreamSocket
 	///
 	/// A few notes about nonblocking IO:
 	/// sendBytes() and receiveBytes() can return a
-	/// negative value when using a nonblocking socket, which means 
+	/// negative value when using a nonblocking socket, which means
 	/// a SSL handshake is currently in progress and more data
 	/// needs to be read or written for the handshake to continue.
 	/// If sendBytes() or receiveBytes() return ERR_SSL_WANT_WRITE,
@@ -43,7 +43,7 @@ class NetSSL_API SecureStreamSocket: public StreamSocket
 	/// ERR_SSL_WANT_READ is returned, receiveBytes() must be called
 	/// as soon as data is available for reading (indicated by select()).
 	///
-	/// The SSL handshake is delayed until the first sendBytes() or 
+	/// The SSL handshake is delayed until the first sendBytes() or
 	/// receiveBytes() operation is performed on the socket. No automatic
 	/// post connection check (checking the peer certificate for a valid
 	/// hostname) is performed when using nonblocking I/O. To manually
@@ -56,7 +56,7 @@ public:
 		ERR_SSL_WANT_READ  = -1,
 		ERR_SSL_WANT_WRITE = -2
 	};
-	
+
 	SecureStreamSocket();
 		/// Creates an unconnected secure stream socket
 		/// using the default client SSL context.
@@ -83,17 +83,17 @@ public:
 		/// agrees to reuse the session).
 
 	explicit SecureStreamSocket(const SocketAddress& address);
-		/// Creates a secure stream socket using the default 
+		/// Creates a secure stream socket using the default
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 
 	SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext);
-		/// Creates a secure stream socket using the given 
+		/// Creates a secure stream socket using the given
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 
 	SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext, Session::Ptr pSession);
-		/// Creates a secure stream socket using the given 
+		/// Creates a secure stream socket using the given
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 		///
@@ -102,21 +102,21 @@ public:
 		/// agrees to reuse the session).
 
 	SecureStreamSocket(const SocketAddress& address, const std::string& hostName);
-		/// Creates a secure stream socket using the default 
+		/// Creates a secure stream socket using the default
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 		///
 		/// The given host name is used for certificate verification.
 
 	SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext);
-		/// Creates a secure stream socket using the given 
+		/// Creates a secure stream socket using the given
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 		///
 		/// The given host name is used for certificate verification.
 
 	SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession);
-		/// Creates a secure stream socket using the given 
+		/// Creates a secure stream socket using the given
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 		///
@@ -140,8 +140,8 @@ public:
 		///
 		/// Releases the socket's SocketImpl and
 		/// attaches the SocketImpl from the other socket and
-		/// increments the reference count of the SocketImpl.	
-	
+		/// increments the reference count of the SocketImpl.
+
 	bool havePeerCertificate() const;
 		/// Returns true iff the peer has presented a
 		/// certificate.
@@ -151,10 +151,10 @@ public:
 		///
 		/// Throws a SSLException if the peer did not
 		/// present a certificate.
-		
+
 	void setPeerHostName(const std::string& hostName);
 		/// Sets the peer's host name used for certificate validation.
-		
+
 	const std::string& getPeerHostName() const;
 		/// Returns the peer's host name used for certificate validation.
 
@@ -198,15 +198,15 @@ public:
 
 	Context::Ptr context() const;
 		/// Returns the SSL context used by this socket.
-		
+
 	void setLazyHandshake(bool flag = true);
 		/// Enable lazy SSL handshake. If enabled, the SSL handshake
 		/// will be performed the first time date is sent or
 		/// received over the connection.
-		
+
 	bool getLazyHandshake() const;
 		/// Returns true if setLazyHandshake(true) has been called.
-		
+
 	void verifyPeerCertificate();
 		/// Performs post-connect (or post-accept) peer certificate validation,
 		/// using the peer host name set with setPeerHostName(), or the peer's
@@ -221,7 +221,7 @@ public:
 		///
 		/// Should only be used for non-blocking connections, after the
 		/// initial SSL handshake has been performed (see completeHandshake()).
-		
+
 	int completeHandshake();
 		/// Completes the SSL handshake.
 		///
@@ -240,7 +240,7 @@ public:
 		/// is enabled).
 		///
 		/// If no connection is established, returns null.
-		
+
 	void useSession(Session::Ptr pSession);
 		/// Sets the SSL session to use for the next
 		/// connection. Setting a previously saved Session
@@ -250,15 +250,15 @@ public:
 		/// can be given.
 		///
 		/// Must be called before connect() to be effective.
-		
+
 	bool sessionWasReused();
 		/// Returns true iff a reused session was negotiated during
 		/// the handshake.
-		
+
 	void abort();
 		/// Aborts the SSL connection by closing the underlying
 		/// TCP connection. No orderly SSL shutdown is performed.
-		
+
 protected:
 	SecureStreamSocket(SocketImpl* pImpl);
 
diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h
index 72fe6c9dc..8114b036f 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h
@@ -45,7 +45,7 @@ public:
 		/// Throws a Poco::InvalidAccessException.
 
 	void connect(const SocketAddress& address);
-		/// Initializes the socket and establishes a connection to 
+		/// Initializes the socket and establishes a connection to
 		/// the TCP server at the given address.
 		///
 		/// Can also be used for UDP sockets. In this case, no
@@ -53,19 +53,19 @@ public:
 		/// packets are restricted to the specified address.
 
 	void connect(const SocketAddress& address, const Poco::Timespan& timeout);
-		/// Initializes the socket, sets the socket timeout and 
+		/// Initializes the socket, sets the socket timeout and
 		/// establishes a connection to the TCP server at the given address.
 
 	void connectNB(const SocketAddress& address);
-		/// Initializes the socket and establishes a connection to 
+		/// Initializes the socket and establishes a connection to
 		/// the TCP server at the given address. Prior to opening the
 		/// connection the socket is set to nonblocking mode.
-		
+
 	void bind(const SocketAddress& address, bool reuseAddress = false);
 		/// Not supported by a SecureStreamSocket.
 		///
 		/// Throws a Poco::InvalidAccessException.
-		
+
 	void listen(int backlog = 64);
 		/// Not supported by a SecureStreamSocket.
 		///
@@ -73,30 +73,30 @@ public:
 
 	void close();
 		/// Close the socket.
-	
+
 	int sendBytes(const void* buffer, int length, int flags = 0);
 		/// Sends the contents of the given buffer through
 		/// the socket. Any specified flags are ignored.
 		///
 		/// Returns the number of bytes sent, which may be
 		/// less than the number of bytes specified.
-	
+
 	int receiveBytes(void* buffer, int length, int flags = 0);
 		/// Receives data from the socket and stores it
 		/// in buffer. Up to length bytes are received.
 		///
 		/// Returns the number of bytes received.
-	
+
 	int sendTo(const void* buffer, int length, const SocketAddress& address, int flags = 0);
 		/// Not supported by a SecureStreamSocket.
 		///
 		/// Throws a Poco::InvalidAccessException.
-	
+
 	int receiveFrom(void* buffer, int length, SocketAddress& address, int flags = 0);
 		/// Not supported by a SecureStreamSocket.
 		///
 		/// Throws a Poco::InvalidAccessException.
-	
+
 	void sendUrgent(unsigned char data);
 		/// Not supported by a SecureStreamSocket.
 		///
@@ -115,27 +115,27 @@ public:
 		///
 		/// Since SSL does not support a half shutdown, this does
 		/// nothing.
-		
+
 	void shutdownSend();
 		/// Shuts down the receiving part of the socket connection.
 		///
 		/// Since SSL does not support a half shutdown, this does
 		/// nothing.
-		
+
 	void shutdown();
 		/// Shuts down the SSL connection.
-		
+
 	void abort();
 		/// Aborts the connection by closing the underlying
 		/// TCP connection. No orderly SSL shutdown is performed.
-		
+
 	bool secure() const;
 		/// Returns true iff the socket's connection is secure
 		/// (using SSL or TLS).
 
 	void setPeerHostName(const std::string& hostName);
 		/// Sets the peer host name for certificate validation purposes.
-		
+
 	const std::string& getPeerHostName() const;
 		/// Returns the peer host name.
 
@@ -148,7 +148,7 @@ public:
 		///
 		/// Throws a SSLException if the peer did not
 		/// present a certificate.
-		
+
 	Context::Ptr context() const;
 		/// Returns the SSL context used by this socket.
 
@@ -156,7 +156,7 @@ public:
 		/// Enable lazy SSL handshake. If enabled, the SSL handshake
 		/// will be performed the first time date is sent or
 		/// received over the connection.
-		
+
 	bool getLazyHandshake() const;
 		/// Returns true if setLazyHandshake(true) has been called.
 
@@ -173,7 +173,7 @@ public:
 		///
 		/// If the SSL connection was the result of an accept(),
 		/// the server-side handshake is completed, otherwise
-		/// a client-side handshake is performed. 
+		/// a client-side handshake is performed.
 
 	Session::Ptr currentSession();
 		/// Returns the SSL session of the current connection,
@@ -181,7 +181,7 @@ public:
 		/// is enabled).
 		///
 		/// If no connection is established, returns null.
-		
+
 	void useSession(Session::Ptr pSession);
 		/// Sets the SSL session to use for the next
 		/// connection. Setting a previously saved Session
@@ -191,18 +191,18 @@ public:
 		/// can be given.
 		///
 		/// Must be called before connect() to be effective.
-		
+
 	bool sessionWasReused();
 		/// Returns true iff a reused session was negotiated during
 		/// the handshake.
-		
+
 protected:
 	void acceptSSL();
 		/// Performs a SSL server-side handshake.
-	
+
 	void connectSSL();
 		/// Performs a SSL client-side handshake on an already connected TCP socket.
-	
+
 	~SecureStreamSocketImpl();
 		/// Destroys the SecureStreamSocketImpl.
 
@@ -250,13 +250,13 @@ inline Session::Ptr SecureStreamSocketImpl::currentSession()
 	return _impl.currentSession();
 }
 
-	
+
 inline void SecureStreamSocketImpl::useSession(Session::Ptr pSession)
 {
 	_impl.useSession(pSession);
 }
 
-	
+
 inline bool SecureStreamSocketImpl::sessionWasReused()
 {
 	return _impl.sessionWasReused();
diff --git a/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h b/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h
index 741ba0ef9..9651fefec 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h
@@ -48,13 +48,13 @@ public:
 
 	explicit X509Certificate(X509* pCert);
 		/// Creates the X509Certificate from an existing
-		/// OpenSSL certificate. Ownership is taken of 
+		/// OpenSSL certificate. Ownership is taken of
 		/// the certificate.
 
 	X509Certificate(X509* pCert, bool shared);
 		/// Creates the X509Certificate from an existing
-		/// OpenSSL certificate. Ownership is taken of 
-		/// the certificate. If shared is true, the 
+		/// OpenSSL certificate. Ownership is taken of
+		/// the certificate. If shared is true, the
 		/// certificate's reference count is incremented.
 
 	X509Certificate(const Poco::Crypto::X509Certificate& cert);
@@ -84,9 +84,9 @@ public:
 		/// For this check to be successful, the certificate must contain
 		/// a domain name that matches the domain name
 		/// of the host.
-		/// 
+		///
 		/// Returns true if verification succeeded, or false otherwise.
-		
+
 	static bool verify(const Poco::Crypto::X509Certificate& cert, const std::string& hostName);
 		/// Verifies the validity of the certificate against the host name.
 		///
@@ -95,11 +95,11 @@ public:
 		/// of the host.
 		///
 		/// Returns true if verification succeeded, or false otherwise.
-		
+
 protected:
 	static bool containsWildcards(const std::string& commonName);
 	static bool matchWildcard(const std::string& alias, const std::string& hostName);
-	
+
 private:
 	enum
 	{
diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen
index cb847a518..6c28cacf4 100644
--- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen
+++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp b/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp
index 692b461ab..1233ca646 100644
--- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp
+++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp
@@ -66,11 +66,11 @@ class TimeRequestHandler: public HTTPRequestHandler
 	/// Return a HTML document with the current date and time.
 {
 public:
-	TimeRequestHandler(const std::string& format): 
+	TimeRequestHandler(const std::string& format):
 		_format(format)
 	{
 	}
-	
+
 	void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
 	{
 		Application& app = Application::instance();
@@ -86,7 +86,7 @@ public:
 		{
 			app.logger().information("No client certificate available.");
 		}
-		
+
 		Timestamp now;
 		std::string dt(DateTimeFormatter::format(now, _format));
 
@@ -100,7 +100,7 @@ public:
 		ostr << dt;
 		ostr << "</p></body></html>";
 	}
-	
+
 private:
 	std::string _format;
 };
@@ -121,7 +121,7 @@ public:
 		else
 			return 0;
 	}
-	
+
 private:
 	std::string _format;
 };
@@ -151,7 +151,7 @@ public:
 	{
 		Poco::Net::initializeSSL();
 	}
-	
+
 	~HTTPSTimeServer()
 	{
 		Poco::Net::uninitializeSSL();
@@ -163,7 +163,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		ServerApplication::initialize(self);
 	}
-		
+
 	void uninitialize()
 	{
 		ServerApplication::uninitialize();
@@ -172,7 +172,7 @@ protected:
 	void defineOptions(OptionSet& options)
 	{
 		ServerApplication::defineOptions(options);
-		
+
 		options.addOption(
 			Option("help", "h", "display help information on command line arguments")
 				.required(false)
@@ -207,7 +207,7 @@ protected:
 			// get parameters from configuration file
 			unsigned short port = (unsigned short) config().getInt("HTTPSTimeServer.port", 9443);
 			std::string format(config().getString("HTTPSTimeServer.format", DateTimeFormat::SORTABLE_FORMAT));
-			
+
 			// set-up a server socket
 			SecureServerSocket svs(port);
 			// set-up a HTTPServer instance
@@ -221,7 +221,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/NetSSL_OpenSSL/samples/Mail/Mail.progen b/NetSSL_OpenSSL/samples/Mail/Mail.progen
index cb847a518..6c28cacf4 100644
--- a/NetSSL_OpenSSL/samples/Mail/Mail.progen
+++ b/NetSSL_OpenSSL/samples/Mail/Mail.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_OpenSSL/samples/Mail/src/Mail.cpp b/NetSSL_OpenSSL/samples/Mail/src/Mail.cpp
index 288e83942..6a3072d9c 100644
--- a/NetSSL_OpenSSL/samples/Mail/src/Mail.cpp
+++ b/NetSSL_OpenSSL/samples/Mail/src/Mail.cpp
@@ -46,7 +46,7 @@ public:
 	{
 		Poco::Net::initializeSSL();
 	}
-	
+
 	~SSLInitializer()
 	{
 		Poco::Net::uninitializeSSL();
@@ -72,16 +72,16 @@ int main(int argc, char** argv)
 		std::cerr << "       using a secure connection to the SMTP server at <mailhost>." << std::endl;
 		return 1;
 	}
-	
+
 	std::string mailhost(argv[1]);
 	std::string sender(argv[2]);
 	std::string recipient(argv[3]);
 	std::string username(argc >= 5 ? argv[4] : "");
 	std::string password(argc >= 6 ? argv[5] : "");
-	
+
 	try
 	{
-		// Note: we must create the passphrase handler prior Context 
+		// Note: we must create the passphrase handler prior Context
 		SharedPtr<InvalidCertificateHandler> pCert = new ConsoleCertificateHandler(false); // ask the user via console
 		Context::Ptr pContext = new Context(Context::CLIENT_USE, "", "", "", Context::VERIFY_RELAXED, 9, true, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
 		SSLManager::instance().initializeClient(0, pCert, pContext);
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
 		std::string logo(reinterpret_cast<const char*>(PocoLogo), sizeof(PocoLogo));
 		message.addContent(new StringPartSource(content));
 		message.addAttachment("logo", new StringPartSource(logo, "image/gif"));
-		
+
 		SecureSMTPClientSession session(mailhost);
 		session.login();
 		session.startTLS(pContext);
diff --git a/NetSSL_OpenSSL/samples/Mail/src/PocoLogo.hpp b/NetSSL_OpenSSL/samples/Mail/src/PocoLogo.hpp
index a1b39a593..31e2b7fa8 100644
--- a/NetSSL_OpenSSL/samples/Mail/src/PocoLogo.hpp
+++ b/NetSSL_OpenSSL/samples/Mail/src/PocoLogo.hpp
@@ -1,134 +1,134 @@
 // The C++ Portable Components logo in GIF format
 
-0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0xa0, 0x00, 0x85, 0x00, 0xa2, 0x00, 0x00, 0xd1, 0xdd, 0xe4, 
-0x45, 0x9b, 0xca, 0x41, 0x55, 0x61, 0x8a, 0x96, 0x9e, 0xa2, 0xbc, 0xcc, 0x00, 0x1b, 0x2c, 0x00, 
-0x75, 0xb6, 0xff, 0xff, 0xff, 0x21, 0xf9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 
-0x00, 0x00, 0xa0, 0x00, 0x85, 0x00, 0x00, 0x03, 0xff, 0x78, 0xba, 0xdc, 0xfe, 0x30, 0xca, 0x49, 
-0xab, 0xbd, 0x38, 0xeb, 0xcd, 0xbb, 0xff, 0x60, 0x28, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 
-0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x2b, 0x40, 0xdc, 0x78, 0xae, 0xef, 0x04, 0xe0, 0xda, 0xbc, 
-0xe0, 0x0e, 0xe0, 0xeb, 0x00, 0x06, 0xc5, 0xc5, 0x6d, 0x72, 0x4b, 0x76, 0x08, 0x01, 0x83, 0x74, 
-0x4a, 0xad, 0x5a, 0xab, 0x01, 0x27, 0x09, 0x10, 0xbd, 0x7a, 0xbf, 0x86, 0x40, 0x6f, 0x33, 0x28, 
-0x10, 0x1a, 0x85, 0x82, 0x44, 0x90, 0x2e, 0x68, 0x2f, 0xb6, 0x2e, 0x78, 0x7e, 0x15, 0x8f, 0xe2, 
-0xf4, 0xbc, 0xd5, 0x8e, 0x29, 0x9f, 0x09, 0x48, 0x07, 0x69, 0x11, 0x65, 0x02, 0x6c, 0x03, 0x1b, 
-0x72, 0x7a, 0x8b, 0x54, 0x67, 0x1f, 0x8a, 0x8c, 0x8c, 0x59, 0x17, 0x7e, 0x82, 0x66, 0x96, 0x11, 
-0x69, 0x3e, 0x05, 0x02, 0x19, 0x5c, 0x91, 0xa0, 0x53, 0x8e, 0x1c, 0x90, 0xa1, 0x8b, 0xa3, 0x13, 
-0x95, 0x69, 0x67, 0x83, 0x0c, 0x36, 0x0a, 0x9a, 0x82, 0x9d, 0x70, 0xa6, 0xb5, 0x93, 0x19, 0x04, 
-0xb5, 0xb6, 0x15, 0xaa, 0x97, 0xad, 0x0b, 0x6c, 0xac, 0x6e, 0xb2, 0x17, 0xb9, 0xba, 0xb5, 0x6f, 
-0x12, 0xc6, 0xc7, 0xa6, 0xc9, 0x0c, 0xbd, 0x3d, 0xbf, 0x0a, 0xc1, 0x96, 0x3e, 0x44, 0x16, 0xcb, 
-0xcc, 0xa0, 0x01, 0xb4, 0xda, 0xa6, 0xdc, 0x12, 0x65, 0x9c, 0x69, 0x86, 0x9c, 0x0d, 0xd4, 0xb1, 
-0xdd, 0xde, 0xa1, 0xe0, 0x4c, 0xeb, 0xbb, 0xe1, 0x6d, 0x6d, 0x02, 0x5a, 0xe2, 0x6c, 0xb3, 0x17, 
-0xa5, 0xef, 0x7a, 0xed, 0x11, 0xfb, 0xb5, 0xa8, 0x1e, 0x10, 0x19, 0xe8, 0x8c, 0x0d, 0x27, 0x67, 
-0x10, 0xb2, 0xfd, 0x63, 0x84, 0xf0, 0x80, 0xc2, 0x85, 0x8b, 0x1a, 0xc2, 0x09, 0x48, 0x01, 0x00, 
-0xc4, 0x50, 0x14, 0x17, 0x58, 0xbc, 0xb8, 0x0d, 0xff, 0x83, 0x21, 0x11, 0xfa, 0xbc, 0x88, 0x21, 
-0x48, 0xb2, 0x24, 0x91, 0x1b, 0x21, 0xaf, 0x38, 0x7b, 0xf8, 0xa5, 0x87, 0xc9, 0x97, 0x04, 0xa1, 
-0x44, 0xbc, 0x20, 0x4d, 0xe3, 0x90, 0x09, 0xfc, 0x3e, 0x7c, 0xa2, 0x93, 0xf1, 0x80, 0x9e, 0x9e, 
-0x18, 0x36, 0xf2, 0xa4, 0xa9, 0xa6, 0x81, 0x38, 0x79, 0x35, 0x1b, 0x08, 0x05, 0x23, 0xb1, 0x58, 
-0x9e, 0x07, 0x2c, 0xad, 0x34, 0x75, 0x3a, 0xa7, 0xdf, 0x84, 0x9a, 0xe2, 0x06, 0x68, 0xdd, 0x8a, 
-0x28, 0x42, 0x54, 0x2a, 0x53, 0xf3, 0x0d, 0x6d, 0x90, 0x72, 0x4a, 0x58, 0xaa, 0x4c, 0x2d, 0xd4, 
-0x3c, 0x94, 0xa1, 0xac, 0x01, 0xa0, 0x1d, 0xdc, 0x5a, 0xf5, 0x39, 0x07, 0x2e, 0x87, 0xa5, 0x5e, 
-0xec, 0x2a, 0x00, 0xb0, 0xf6, 0x12, 0x06, 0xb7, 0x67, 0xd5, 0x7d, 0x51, 0x5a, 0x15, 0xc5, 0x57, 
-0x29, 0x73, 0x01, 0x71, 0x1d, 0x70, 0xef, 0x9c, 0xdf, 0x0b, 0x85, 0x4f, 0xb8, 0x25, 0x0c, 0x66, 
-0xae, 0x08, 0xbc, 0x7b, 0x1c, 0x1c, 0x45, 0x1a, 0x90, 0x9a, 0xe0, 0x3a, 0x28, 0x00, 0xbb, 0x8a, 
-0x2c, 0xb9, 0xb2, 0x03, 0x02, 0x86, 0x52, 0x0b, 0x08, 0xe4, 0x58, 0xef, 0x68, 0x30, 0xae, 0x13, 
-0xcd, 0x71, 0x82, 0xb9, 0x4a, 0x6c, 0xd9, 0x5f, 0x2c, 0x5b, 0xf0, 0x6c, 0xa1, 0x76, 0xa3, 0xd0, 
-0xb3, 0x5f, 0xb7, 0x4c, 0x51, 0x56, 0x77, 0x85, 0x57, 0x41, 0xeb, 0x02, 0x4f, 0xab, 0x51, 0xf9, 
-0x72, 0x91, 0x0f, 0xb2, 0xda, 0x0b, 0x0c, 0xc1, 0xb7, 0xa8, 0xe7, 0x5e, 0x28, 0x0f, 0xc7, 0x9e, 
-0xd9, 0x28, 0x39, 0xa4, 0xf8, 0x34, 0x1a, 0x94, 0x17, 0x5e, 0x7b, 0xde, 0x13, 0xd6, 0xa7, 0x98, 
-0xbf, 0x72, 0x5b, 0x43, 0x71, 0xcd, 0xbe, 0xcc, 0xf0, 0x2d, 0xcf, 0x17, 0x29, 0xb9, 0x08, 0xe9, 
-0xdf, 0x96, 0x36, 0x2d, 0xfc, 0x3c, 0x77, 0x2c, 0xff, 0xf0, 0x09, 0x23, 0x8c, 0x63, 0x02, 0xdc, 
-0x54, 0x9d, 0x73, 0x24, 0xb8, 0xa5, 0x5f, 0x7f, 0xec, 0x11, 0xc7, 0xdf, 0x33, 0xf1, 0x0d, 0xc8, 
-0x00, 0x6f, 0xc7, 0x21, 0x08, 0xd2, 0x53, 0xeb, 0x59, 0xd1, 0x5e, 0x5b, 0x0f, 0x2e, 0x00, 0x0d, 
-0x26, 0x13, 0x3e, 0x56, 0x21, 0x6c, 0x97, 0xc9, 0x44, 0xc7, 0x5c, 0xf9, 0x6d, 0xf8, 0x57, 0x87, 
-0x0a, 0xf8, 0x01, 0x80, 0x21, 0xd1, 0x14, 0x05, 0x8c, 0x88, 0x15, 0x39, 0xc7, 0x45, 0x00, 0x38, 
-0xe6, 0xa8, 0xe3, 0x8e, 0x3c, 0x46, 0x22, 0x90, 0x85, 0x25, 0xbc, 0xe7, 0x9d, 0x7d, 0x7d, 0xb5, 
-0x97, 0xa2, 0x02, 0x87, 0xbd, 0x93, 0xd1, 0x91, 0xff, 0x51, 0x31, 0xd7, 0x66, 0xe4, 0x11, 0x98, 
-0x1c, 0x89, 0x07, 0x28, 0xe8, 0x4d, 0x32, 0x4c, 0xee, 0x07, 0x9d, 0x52, 0x30, 0x35, 0x40, 0xc0, 
-0x3c, 0xa9, 0x99, 0x73, 0x20, 0x95, 0x56, 0x32, 0xd3, 0x53, 0x96, 0x26, 0x08, 0x79, 0x97, 0x6a, 
-0xe5, 0x94, 0xc7, 0xa0, 0x86, 0x0a, 0x94, 0xa9, 0x8b, 0x71, 0x68, 0x06, 0xc9, 0xa2, 0x87, 0x6c, 
-0x7e, 0xa4, 0x93, 0x73, 0x72, 0x9a, 0x02, 0x57, 0x9d, 0x09, 0xde, 0xf9, 0x22, 0x91, 0x32, 0x1a, 
-0xc1, 0x27, 0x47, 0xc6, 0xed, 0x05, 0x64, 0xa0, 0xb9, 0xc1, 0x47, 0xcf, 0x11, 0x05, 0x20, 0x51, 
-0x0f, 0x3d, 0xe7, 0x74, 0xf5, 0x23, 0x99, 0x17, 0x25, 0xaa, 0x28, 0x95, 0x5a, 0x82, 0xe6, 0x9d, 
-0x23, 0x65, 0x58, 0x1a, 0x62, 0x40, 0x49, 0x35, 0x87, 0xe9, 0x3f, 0xb7, 0x4c, 0x00, 0xe8, 0x08, 
-0x6a, 0x7a, 0xe8, 0x57, 0xa8, 0x0f, 0x50, 0x63, 0xc8, 0x26, 0x6e, 0x9a, 0xba, 0x5d, 0x9f, 0x3f, 
-0x7d, 0x06, 0x27, 0x0a, 0xa4, 0xb9, 0x0a, 0x6a, 0xa4, 0xb1, 0xc6, 0x47, 0x2b, 0x7e, 0x87, 0xae, 
-0x93, 0xea, 0x88, 0x8d, 0xa2, 0xd7, 0x6b, 0x8b, 0xff, 0xaf, 0x02, 0xeb, 0x00, 0x3a, 0xc3, 0x88, 
-0x79, 0xe9, 0x76, 0x37, 0xf2, 0x68, 0xed, 0xb5, 0x62, 0x8c, 0xa1, 0x41, 0x7e, 0x9a, 0x3e, 0xb1, 
-0xec, 0x01, 0x85, 0xf4, 0x10, 0xea, 0x35, 0xa3, 0x56, 0x43, 0xcc, 0x98, 0xdb, 0xd1, 0x60, 0xeb, 
-0x60, 0x27, 0x8c, 0xe5, 0x0a, 0xa1, 0xe5, 0x1d, 0x52, 0x9f, 0x0d, 0xd2, 0x3a, 0xb0, 0xea, 0x0c, 
-0xee, 0x8e, 0x90, 0xa4, 0x01, 0xc9, 0xa0, 0x66, 0x5f, 0x79, 0x50, 0xb6, 0x21, 0x6a, 0x86, 0xb6, 
-0xa9, 0x4b, 0x56, 0xbe, 0x20, 0xe4, 0x17, 0x86, 0x04, 0x26, 0x9d, 0x96, 0xe7, 0xc0, 0x04, 0xff, 
-0x66, 0xb0, 0x12, 0x79, 0x50, 0xe7, 0x55, 0x1e, 0x2a, 0xee, 0xc9, 0xe9, 0xc4, 0x74, 0x21, 0xbc, 
-0xc1, 0xbe, 0x52, 0x38, 0x73, 0x44, 0x9e, 0xb5, 0x7a, 0xb2, 0xa8, 0xba, 0x20, 0x23, 0x86, 0xed, 
-0xca, 0x38, 0x2e, 0xa2, 0x5b, 0x7d, 0xff, 0xda, 0xcb, 0x18, 0x9b, 0x10, 0xaf, 0xdb, 0x20, 0xc7, 
-0x0b, 0xe0, 0xca, 0x51, 0x4f, 0x85, 0x48, 0x34, 0x28, 0x91, 0xc4, 0x6e, 0xcc, 0x71, 0xca, 0x1c, 
-0x21, 0x46, 0x08, 0x8d, 0xd1, 0x71, 0x32, 0x80, 0x62, 0x5a, 0x01, 0x75, 0xaf, 0xba, 0x3a, 0xa3, 
-0x1a, 0x8f, 0x5e, 0x14, 0xd6, 0x28, 0x34, 0xc7, 0x0a, 0x17, 0xcd, 0xef, 0xd4, 0x14, 0x54, 0xad, 
-0xea, 0xc9, 0x13, 0x13, 0xbd, 0x90, 0xa6, 0x95, 0x4c, 0xe0, 0x35, 0xc3, 0x60, 0x4f, 0x9c, 0xf5, 
-0x42, 0x7a, 0x95, 0xbd, 0x06, 0xd2, 0x68, 0x5f, 0x8d, 0xb3, 0x43, 0x5a, 0xef, 0xca, 0x04, 0xa5, 
-0x66, 0xd7, 0x6b, 0x75, 0xba, 0x73, 0x33, 0x60, 0xa2, 0xd6, 0x7c, 0xe8, 0x4b, 0x0e, 0xcd, 0x41, 
-0xf3, 0xdd, 0xb7, 0xdf, 0x5a, 0xab, 0x38, 0xf3, 0x9f, 0xe3, 0xcd, 0x53, 0xb8, 0x7f, 0x87, 0xdb, 
-0x1b, 0x75, 0x1e, 0xc7, 0xee, 0x26, 0x4f, 0xc6, 0xff, 0x11, 0x94, 0x65, 0x31, 0x0d, 0x71, 0xb4, 
-0x6c, 0x0b, 0x8e, 0xda, 0xe2, 0xa2, 0xf4, 0x3d, 0x38, 0x44, 0x6e, 0xfa, 0x0c, 0x65, 0x37, 0x0e, 
-0x95, 0x6a, 0xac, 0x9d, 0xee, 0xfa, 0x07, 0xa9, 0x93, 0x03, 0x71, 0xe3, 0xe4, 0x6c, 0xfe, 0xfa, 
-0xed, 0xe0, 0xfa, 0xc5, 0x46, 0x32, 0xe1, 0xe2, 0xc0, 0x16, 0xee, 0xc0, 0x53, 0xa2, 0x7b, 0xa1, 
-0xe5, 0x6a, 0xa4, 0x77, 0xf0, 0xc8, 0x27, 0x4d, 0xa9, 0x56, 0x10, 0x54, 0x7d, 0xbc, 0x11, 0x4c, 
-0x2f, 0x26, 0xfd, 0xf4, 0xd4, 0x6b, 0x65, 0xbb, 0x40, 0xd1, 0x57, 0x4f, 0x7d, 0xe8, 0x1b, 0xfc, 
-0x0c, 0x5e, 0x6b, 0x68, 0x94, 0x3c, 0x11, 0xed, 0x84, 0x96, 0x6f, 0xfe, 0x7d, 0x1e, 0xd8, 0x40, 
-0xfe, 0xf9, 0xe5, 0xaf, 0x66, 0xfb, 0xc8, 0x79, 0x82, 0xcf, 0xc0, 0xf3, 0xbd, 0x05, 0xcc, 0xfe, 
-0xfd, 0x40, 0x77, 0x60, 0x3f, 0xfe, 0xe7, 0xb7, 0x5e, 0xc2, 0xef, 0x48, 0xa2, 0x9f, 0xaa, 0xd6, 
-0xc7, 0xbf, 0x02, 0x96, 0xaa, 0x22, 0x04, 0x34, 0xe0, 0xf9, 0xf0, 0x16, 0x94, 0x81, 0x24, 0x64, 
-0x70, 0xe5, 0x80, 0x1b, 0x13, 0x14, 0x48, 0x41, 0xa4, 0x6c, 0x2b, 0x81, 0x15, 0x34, 0x5f, 0xcd, 
-0x12, 0x42, 0xbb, 0x9a, 0xf9, 0x4b, 0x1e, 0x1b, 0x8c, 0x47, 0x06, 0x33, 0x28, 0xba, 0x11, 0x52, 
-0xd0, 0x35, 0x30, 0x43, 0xca, 0x06, 0x09, 0xb2, 0x01, 0x0c, 0x9a, 0xf0, 0x7c, 0x7d, 0x78, 0x61, 
-0x05, 0xc5, 0xe7, 0xaa, 0x47, 0x11, 0xa1, 0x10, 0x26, 0x70, 0xa1, 0x0c, 0xcb, 0x27, 0xbc, 0x1d, 
-0x52, 0x90, 0x86, 0xb9, 0x23, 0x15, 0xf1, 0x90, 0x64, 0x3d, 0x0d, 0xec, 0xcf, 0x87, 0x30, 0xac, 
-0xc0, 0x97, 0x90, 0x78, 0x42, 0xae, 0xcd, 0x6f, 0x88, 0xe3, 0x61, 0xa0, 0x12, 0x99, 0xa8, 0xc0, 
-0xe3, 0x50, 0xb1, 0x82, 0x08, 0x71, 0x1b, 0x2c, 0xff, 0x88, 0x17, 0xae, 0xc6, 0x5c, 0x40, 0x87, 
-0x57, 0x94, 0x07, 0x2f, 0xc2, 0xa8, 0x40, 0xf1, 0x69, 0xb1, 0x3e, 0xf2, 0x13, 0x20, 0x7c, 0xc8, 
-0x78, 0x3f, 0x20, 0x1e, 0x20, 0x85, 0x6c, 0xc4, 0xdf, 0x06, 0x7b, 0x77, 0x03, 0x2f, 0xce, 0xc8, 
-0x11, 0x7a, 0xaa, 0x08, 0xff, 0x0a, 0xe4, 0x12, 0x98, 0xf8, 0xb1, 0x4b, 0x5d, 0xc3, 0xdf, 0x6a, 
-0xfa, 0xf8, 0xc7, 0x98, 0x30, 0x86, 0x7f, 0x05, 0x21, 0x52, 0x67, 0x74, 0xe7, 0xc6, 0x69, 0xb4, 
-0xf1, 0x7a, 0x20, 0x58, 0x22, 0xfb, 0x42, 0xd8, 0x43, 0xf6, 0x01, 0x65, 0x66, 0x86, 0xf0, 0x9f, 
-0x23, 0x1d, 0x71, 0x40, 0xa5, 0x3c, 0xd2, 0x60, 0x3a, 0x94, 0xa2, 0x07, 0x3e, 0xa8, 0x41, 0x0f, 
-0xdc, 0x83, 0x08, 0xb3, 0x22, 0xd7, 0x03, 0x17, 0xa8, 0x36, 0xf6, 0x89, 0x12, 0x04, 0x2e, 0xa4, 
-0xa1, 0x2a, 0xa1, 0x02, 0x2f, 0x11, 0xb6, 0x0f, 0x6b, 0x96, 0x34, 0x81, 0x24, 0xcb, 0xd7, 0x2f, 
-0x81, 0x29, 0x83, 0x7c, 0x34, 0x3c, 0x62, 0x1a, 0x28, 0xe9, 0x82, 0x5d, 0x12, 0xa9, 0x91, 0x2d, 
-0x3c, 0x1f, 0x45, 0xea, 0x63, 0x10, 0x62, 0x66, 0xc0, 0x85, 0x90, 0x14, 0x81, 0x31, 0xed, 0xe3, 
-0x4c, 0x0e, 0x08, 0xd3, 0x59, 0x10, 0x42, 0x04, 0x1a, 0x47, 0x00, 0x4d, 0x8e, 0x5d, 0xb3, 0x9a, 
-0xdd, 0xeb, 0x5f, 0x80, 0x1c, 0xf9, 0x4b, 0xc2, 0x45, 0xc0, 0x85, 0x38, 0xfb, 0x66, 0x0a, 0x58, 
-0xf9, 0x29, 0x72, 0x0a, 0x64, 0x7d, 0x34, 0xc4, 0x20, 0x32, 0x57, 0xa0, 0x4e, 0x14, 0xb0, 0x13, 
-0x42, 0x78, 0x1c, 0xa2, 0x23, 0x0b, 0x54, 0x92, 0xb7, 0xdd, 0xd2, 0x9b, 0xe2, 0xb4, 0xa7, 0xf9, 
-0xdc, 0x04, 0xab, 0x03, 0xe4, 0x51, 0x7e, 0x5f, 0x1c, 0x68, 0x3a, 0x03, 0x7a, 0x82, 0x7b, 0x2a, 
-0x61, 0x98, 0xd2, 0x43, 0xa8, 0xe5, 0xfe, 0x39, 0xff, 0xb1, 0x7a, 0x36, 0x54, 0xa1, 0x6b, 0xb4, 
-0x8f, 0x44, 0x2b, 0x20, 0xcf, 0x85, 0x96, 0x52, 0xa0, 0x14, 0x55, 0x8a, 0xf4, 0x16, 0xb9, 0xa1, 
-0x8e, 0x02, 0xf4, 0xa3, 0x26, 0x80, 0x63, 0xcc, 0x38, 0x60, 0xc7, 0x89, 0xd6, 0xf2, 0xa4, 0xe5, 
-0x03, 0xe7, 0xb6, 0x1c, 0x5a, 0x42, 0x4e, 0xb0, 0xc9, 0x9f, 0x2f, 0xad, 0x28, 0x43, 0x4b, 0xa0, 
-0xd2, 0xef, 0xdd, 0x25, 0xa7, 0xc1, 0x0a, 0xa9, 0xba, 0x2c, 0xca, 0x53, 0x9a, 0x7a, 0xe4, 0x20, 
-0xfd, 0x3c, 0x27, 0x46, 0x75, 0x8a, 0xd2, 0xa2, 0x2e, 0x55, 0x03, 0x67, 0xc3, 0xe9, 0x31, 0x3d, 
-0x1a, 0x53, 0x14, 0xf4, 0x34, 0x4a, 0x2c, 0x95, 0xa0, 0x52, 0x85, 0x4a, 0x03, 0xa2, 0x6e, 0xc1, 
-0xa8, 0x46, 0xd9, 0xe0, 0x3d, 0x46, 0x2a, 0xd5, 0x95, 0x32, 0xb5, 0xaa, 0xe8, 0x01, 0xeb, 0x13, 
-0xab, 0xc3, 0xc3, 0xad, 0x02, 0x75, 0xa8, 0x3b, 0xfd, 0xea, 0x53, 0x95, 0xb2, 0xc4, 0x26, 0xd8, 
-0x8b, 0x64, 0xf1, 0x9c, 0x6b, 0x57, 0xe3, 0x7a, 0x07, 0xb5, 0x1a, 0x54, 0x85, 0x21, 0x30, 0xe9, 
-0x59, 0x09, 0x25, 0x53, 0x4f, 0xf8, 0xf5, 0x90, 0x91, 0xd2, 0x64, 0x56, 0xb9, 0x8a, 0x3a, 0xbe, 
-0x5e, 0xc6, 0xaf, 0x5b, 0xc4, 0x0f, 0x26, 0x07, 0x99, 0x37, 0xf3, 0x51, 0x95, 0xb0, 0x86, 0x81, 
-0x2c, 0xb8, 0x36, 0x38, 0xcd, 0x55, 0x94, 0xd5, 0x3e, 0xd1, 0x0c, 0x81, 0x57, 0x47, 0x30, 0xda, 
-0x84, 0xe2, 0x0d, 0x52, 0x79, 0x35, 0x5f, 0x68, 0x23, 0xa9, 0xd9, 0x0e, 0xb8, 0x90, 0x98, 0xb3, 
-0x2c, 0xde, 0x5e, 0xd4, 0x58, 0xda, 0x18, 0x74, 0x16, 0xab, 0x4e, 0x55, 0x6d, 0xde, 0x9a, 0x47, 
-0x23, 0xda, 0xb2, 0x6f, 0xb5, 0xe9, 0xfb, 0xad, 0x09, 0xae, 0xa9, 0x4f, 0x57, 0xec, 0x2e, 0x58, 
-0xa4, 0xa2, 0xe1, 0x6d, 0xc9, 0x03, 0xdc, 0x0e, 0xff, 0xb8, 0xb2, 0xb9, 0x0e, 0x71, 0x65, 0x59, 
-0x49, 0xfa, 0x2e, 0x59, 0xe2, 0x0f, 0xba, 0x46, 0xbc, 0x1f, 0x70, 0x89, 0xab, 0xd5, 0xbf, 0x0e, 
-0x6e, 0x91, 0x7c, 0xac, 0x23, 0x36, 0x79, 0x7b, 0xbf, 0xc2, 0x96, 0x60, 0xb9, 0xe4, 0xc1, 0x9c, 
-0x46, 0xb8, 0x3b, 0x8c, 0xab, 0x14, 0xf7, 0xaa, 0x76, 0x41, 0x2f, 0x35, 0xb5, 0x47, 0x5f, 0xfa, 
-0x4a, 0x04, 0x8c, 0x4a, 0xab, 0x2f, 0xf5, 0xf0, 0xab, 0x46, 0x60, 0x88, 0xef, 0x45, 0xe6, 0x4c, 
-0x45, 0x1c, 0xdb, 0xa8, 0xaa, 0x01, 0x17, 0x10, 0xbb, 0xcf, 0x34, 0xb0, 0x5e, 0x9f, 0xa5, 0xe0, 
-0x49, 0x86, 0xad, 0xc1, 0x6f, 0xa5, 0x25, 0x84, 0x23, 0xec, 0x37, 0x4d, 0x1e, 0xd4, 0x21, 0x16, 
-0x06, 0x27, 0x7f, 0xaf, 0xd8, 0x48, 0xf6, 0xb2, 0xb1, 0x21, 0x5a, 0x04, 0xd1, 0x1d, 0xd1, 0x50, 
-0xdc, 0xa0, 0x4e, 0x18, 0x7d, 0x81, 0x3c, 0xb1, 0x2f, 0x9d, 0xb8, 0x80, 0x22, 0x85, 0x2f, 0x86, 
-0x2a, 0x9e, 0xa7, 0x87, 0x99, 0xd8, 0xb6, 0xde, 0x12, 0xcf, 0x79, 0xf3, 0x74, 0xe4, 0x89, 0x73, 
-0xbc, 0xe1, 0x1d, 0xba, 0x26, 0xc4, 0x2e, 0x9e, 0x5f, 0x8e, 0x99, 0x35, 0xe1, 0x21, 0xcf, 0xf8, 
-0x85, 0xb1, 0x01, 0xf2, 0x8d, 0x7b, 0x3b, 0xe4, 0xbd, 0xf4, 0xd8, 0x84, 0x4d, 0xf6, 0x1e, 0x19, 
-0x0b, 0x4b, 0x47, 0x7f, 0xc5, 0x8b, 0x13, 0x39, 0x00, 0xe0, 0x05, 0x15, 0xdc, 0x64, 0x27, 0x87, 
-0x51, 0xb1, 0x05, 0x26, 0xd2, 0xc0, 0xe0, 0xab, 0x13, 0xc4, 0x4e, 0x79, 0x94, 0x66, 0x86, 0x32, 
-0x98, 0x8f, 0xd3, 0xb8, 0x02, 0xbd, 0x33, 0xbd, 0x77, 0x00, 0x82, 0x10, 0xe6, 0x4c, 0x67, 0xe0, 
-0x9e, 0x84, 0xce, 0x42, 0x70, 0x60, 0xf2, 0xf6, 0xcc, 0xe7, 0x3e, 0xfb, 0xf9, 0xcf, 0x80, 0x0e, 
+0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0xa0, 0x00, 0x85, 0x00, 0xa2, 0x00, 0x00, 0xd1, 0xdd, 0xe4,
+0x45, 0x9b, 0xca, 0x41, 0x55, 0x61, 0x8a, 0x96, 0x9e, 0xa2, 0xbc, 0xcc, 0x00, 0x1b, 0x2c, 0x00,
+0x75, 0xb6, 0xff, 0xff, 0xff, 0x21, 0xf9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00,
+0x00, 0x00, 0xa0, 0x00, 0x85, 0x00, 0x00, 0x03, 0xff, 0x78, 0xba, 0xdc, 0xfe, 0x30, 0xca, 0x49,
+0xab, 0xbd, 0x38, 0xeb, 0xcd, 0xbb, 0xff, 0x60, 0x28, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae,
+0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x2b, 0x40, 0xdc, 0x78, 0xae, 0xef, 0x04, 0xe0, 0xda, 0xbc,
+0xe0, 0x0e, 0xe0, 0xeb, 0x00, 0x06, 0xc5, 0xc5, 0x6d, 0x72, 0x4b, 0x76, 0x08, 0x01, 0x83, 0x74,
+0x4a, 0xad, 0x5a, 0xab, 0x01, 0x27, 0x09, 0x10, 0xbd, 0x7a, 0xbf, 0x86, 0x40, 0x6f, 0x33, 0x28,
+0x10, 0x1a, 0x85, 0x82, 0x44, 0x90, 0x2e, 0x68, 0x2f, 0xb6, 0x2e, 0x78, 0x7e, 0x15, 0x8f, 0xe2,
+0xf4, 0xbc, 0xd5, 0x8e, 0x29, 0x9f, 0x09, 0x48, 0x07, 0x69, 0x11, 0x65, 0x02, 0x6c, 0x03, 0x1b,
+0x72, 0x7a, 0x8b, 0x54, 0x67, 0x1f, 0x8a, 0x8c, 0x8c, 0x59, 0x17, 0x7e, 0x82, 0x66, 0x96, 0x11,
+0x69, 0x3e, 0x05, 0x02, 0x19, 0x5c, 0x91, 0xa0, 0x53, 0x8e, 0x1c, 0x90, 0xa1, 0x8b, 0xa3, 0x13,
+0x95, 0x69, 0x67, 0x83, 0x0c, 0x36, 0x0a, 0x9a, 0x82, 0x9d, 0x70, 0xa6, 0xb5, 0x93, 0x19, 0x04,
+0xb5, 0xb6, 0x15, 0xaa, 0x97, 0xad, 0x0b, 0x6c, 0xac, 0x6e, 0xb2, 0x17, 0xb9, 0xba, 0xb5, 0x6f,
+0x12, 0xc6, 0xc7, 0xa6, 0xc9, 0x0c, 0xbd, 0x3d, 0xbf, 0x0a, 0xc1, 0x96, 0x3e, 0x44, 0x16, 0xcb,
+0xcc, 0xa0, 0x01, 0xb4, 0xda, 0xa6, 0xdc, 0x12, 0x65, 0x9c, 0x69, 0x86, 0x9c, 0x0d, 0xd4, 0xb1,
+0xdd, 0xde, 0xa1, 0xe0, 0x4c, 0xeb, 0xbb, 0xe1, 0x6d, 0x6d, 0x02, 0x5a, 0xe2, 0x6c, 0xb3, 0x17,
+0xa5, 0xef, 0x7a, 0xed, 0x11, 0xfb, 0xb5, 0xa8, 0x1e, 0x10, 0x19, 0xe8, 0x8c, 0x0d, 0x27, 0x67,
+0x10, 0xb2, 0xfd, 0x63, 0x84, 0xf0, 0x80, 0xc2, 0x85, 0x8b, 0x1a, 0xc2, 0x09, 0x48, 0x01, 0x00,
+0xc4, 0x50, 0x14, 0x17, 0x58, 0xbc, 0xb8, 0x0d, 0xff, 0x83, 0x21, 0x11, 0xfa, 0xbc, 0x88, 0x21,
+0x48, 0xb2, 0x24, 0x91, 0x1b, 0x21, 0xaf, 0x38, 0x7b, 0xf8, 0xa5, 0x87, 0xc9, 0x97, 0x04, 0xa1,
+0x44, 0xbc, 0x20, 0x4d, 0xe3, 0x90, 0x09, 0xfc, 0x3e, 0x7c, 0xa2, 0x93, 0xf1, 0x80, 0x9e, 0x9e,
+0x18, 0x36, 0xf2, 0xa4, 0xa9, 0xa6, 0x81, 0x38, 0x79, 0x35, 0x1b, 0x08, 0x05, 0x23, 0xb1, 0x58,
+0x9e, 0x07, 0x2c, 0xad, 0x34, 0x75, 0x3a, 0xa7, 0xdf, 0x84, 0x9a, 0xe2, 0x06, 0x68, 0xdd, 0x8a,
+0x28, 0x42, 0x54, 0x2a, 0x53, 0xf3, 0x0d, 0x6d, 0x90, 0x72, 0x4a, 0x58, 0xaa, 0x4c, 0x2d, 0xd4,
+0x3c, 0x94, 0xa1, 0xac, 0x01, 0xa0, 0x1d, 0xdc, 0x5a, 0xf5, 0x39, 0x07, 0x2e, 0x87, 0xa5, 0x5e,
+0xec, 0x2a, 0x00, 0xb0, 0xf6, 0x12, 0x06, 0xb7, 0x67, 0xd5, 0x7d, 0x51, 0x5a, 0x15, 0xc5, 0x57,
+0x29, 0x73, 0x01, 0x71, 0x1d, 0x70, 0xef, 0x9c, 0xdf, 0x0b, 0x85, 0x4f, 0xb8, 0x25, 0x0c, 0x66,
+0xae, 0x08, 0xbc, 0x7b, 0x1c, 0x1c, 0x45, 0x1a, 0x90, 0x9a, 0xe0, 0x3a, 0x28, 0x00, 0xbb, 0x8a,
+0x2c, 0xb9, 0xb2, 0x03, 0x02, 0x86, 0x52, 0x0b, 0x08, 0xe4, 0x58, 0xef, 0x68, 0x30, 0xae, 0x13,
+0xcd, 0x71, 0x82, 0xb9, 0x4a, 0x6c, 0xd9, 0x5f, 0x2c, 0x5b, 0xf0, 0x6c, 0xa1, 0x76, 0xa3, 0xd0,
+0xb3, 0x5f, 0xb7, 0x4c, 0x51, 0x56, 0x77, 0x85, 0x57, 0x41, 0xeb, 0x02, 0x4f, 0xab, 0x51, 0xf9,
+0x72, 0x91, 0x0f, 0xb2, 0xda, 0x0b, 0x0c, 0xc1, 0xb7, 0xa8, 0xe7, 0x5e, 0x28, 0x0f, 0xc7, 0x9e,
+0xd9, 0x28, 0x39, 0xa4, 0xf8, 0x34, 0x1a, 0x94, 0x17, 0x5e, 0x7b, 0xde, 0x13, 0xd6, 0xa7, 0x98,
+0xbf, 0x72, 0x5b, 0x43, 0x71, 0xcd, 0xbe, 0xcc, 0xf0, 0x2d, 0xcf, 0x17, 0x29, 0xb9, 0x08, 0xe9,
+0xdf, 0x96, 0x36, 0x2d, 0xfc, 0x3c, 0x77, 0x2c, 0xff, 0xf0, 0x09, 0x23, 0x8c, 0x63, 0x02, 0xdc,
+0x54, 0x9d, 0x73, 0x24, 0xb8, 0xa5, 0x5f, 0x7f, 0xec, 0x11, 0xc7, 0xdf, 0x33, 0xf1, 0x0d, 0xc8,
+0x00, 0x6f, 0xc7, 0x21, 0x08, 0xd2, 0x53, 0xeb, 0x59, 0xd1, 0x5e, 0x5b, 0x0f, 0x2e, 0x00, 0x0d,
+0x26, 0x13, 0x3e, 0x56, 0x21, 0x6c, 0x97, 0xc9, 0x44, 0xc7, 0x5c, 0xf9, 0x6d, 0xf8, 0x57, 0x87,
+0x0a, 0xf8, 0x01, 0x80, 0x21, 0xd1, 0x14, 0x05, 0x8c, 0x88, 0x15, 0x39, 0xc7, 0x45, 0x00, 0x38,
+0xe6, 0xa8, 0xe3, 0x8e, 0x3c, 0x46, 0x22, 0x90, 0x85, 0x25, 0xbc, 0xe7, 0x9d, 0x7d, 0x7d, 0xb5,
+0x97, 0xa2, 0x02, 0x87, 0xbd, 0x93, 0xd1, 0x91, 0xff, 0x51, 0x31, 0xd7, 0x66, 0xe4, 0x11, 0x98,
+0x1c, 0x89, 0x07, 0x28, 0xe8, 0x4d, 0x32, 0x4c, 0xee, 0x07, 0x9d, 0x52, 0x30, 0x35, 0x40, 0xc0,
+0x3c, 0xa9, 0x99, 0x73, 0x20, 0x95, 0x56, 0x32, 0xd3, 0x53, 0x96, 0x26, 0x08, 0x79, 0x97, 0x6a,
+0xe5, 0x94, 0xc7, 0xa0, 0x86, 0x0a, 0x94, 0xa9, 0x8b, 0x71, 0x68, 0x06, 0xc9, 0xa2, 0x87, 0x6c,
+0x7e, 0xa4, 0x93, 0x73, 0x72, 0x9a, 0x02, 0x57, 0x9d, 0x09, 0xde, 0xf9, 0x22, 0x91, 0x32, 0x1a,
+0xc1, 0x27, 0x47, 0xc6, 0xed, 0x05, 0x64, 0xa0, 0xb9, 0xc1, 0x47, 0xcf, 0x11, 0x05, 0x20, 0x51,
+0x0f, 0x3d, 0xe7, 0x74, 0xf5, 0x23, 0x99, 0x17, 0x25, 0xaa, 0x28, 0x95, 0x5a, 0x82, 0xe6, 0x9d,
+0x23, 0x65, 0x58, 0x1a, 0x62, 0x40, 0x49, 0x35, 0x87, 0xe9, 0x3f, 0xb7, 0x4c, 0x00, 0xe8, 0x08,
+0x6a, 0x7a, 0xe8, 0x57, 0xa8, 0x0f, 0x50, 0x63, 0xc8, 0x26, 0x6e, 0x9a, 0xba, 0x5d, 0x9f, 0x3f,
+0x7d, 0x06, 0x27, 0x0a, 0xa4, 0xb9, 0x0a, 0x6a, 0xa4, 0xb1, 0xc6, 0x47, 0x2b, 0x7e, 0x87, 0xae,
+0x93, 0xea, 0x88, 0x8d, 0xa2, 0xd7, 0x6b, 0x8b, 0xff, 0xaf, 0x02, 0xeb, 0x00, 0x3a, 0xc3, 0x88,
+0x79, 0xe9, 0x76, 0x37, 0xf2, 0x68, 0xed, 0xb5, 0x62, 0x8c, 0xa1, 0x41, 0x7e, 0x9a, 0x3e, 0xb1,
+0xec, 0x01, 0x85, 0xf4, 0x10, 0xea, 0x35, 0xa3, 0x56, 0x43, 0xcc, 0x98, 0xdb, 0xd1, 0x60, 0xeb,
+0x60, 0x27, 0x8c, 0xe5, 0x0a, 0xa1, 0xe5, 0x1d, 0x52, 0x9f, 0x0d, 0xd2, 0x3a, 0xb0, 0xea, 0x0c,
+0xee, 0x8e, 0x90, 0xa4, 0x01, 0xc9, 0xa0, 0x66, 0x5f, 0x79, 0x50, 0xb6, 0x21, 0x6a, 0x86, 0xb6,
+0xa9, 0x4b, 0x56, 0xbe, 0x20, 0xe4, 0x17, 0x86, 0x04, 0x26, 0x9d, 0x96, 0xe7, 0xc0, 0x04, 0xff,
+0x66, 0xb0, 0x12, 0x79, 0x50, 0xe7, 0x55, 0x1e, 0x2a, 0xee, 0xc9, 0xe9, 0xc4, 0x74, 0x21, 0xbc,
+0xc1, 0xbe, 0x52, 0x38, 0x73, 0x44, 0x9e, 0xb5, 0x7a, 0xb2, 0xa8, 0xba, 0x20, 0x23, 0x86, 0xed,
+0xca, 0x38, 0x2e, 0xa2, 0x5b, 0x7d, 0xff, 0xda, 0xcb, 0x18, 0x9b, 0x10, 0xaf, 0xdb, 0x20, 0xc7,
+0x0b, 0xe0, 0xca, 0x51, 0x4f, 0x85, 0x48, 0x34, 0x28, 0x91, 0xc4, 0x6e, 0xcc, 0x71, 0xca, 0x1c,
+0x21, 0x46, 0x08, 0x8d, 0xd1, 0x71, 0x32, 0x80, 0x62, 0x5a, 0x01, 0x75, 0xaf, 0xba, 0x3a, 0xa3,
+0x1a, 0x8f, 0x5e, 0x14, 0xd6, 0x28, 0x34, 0xc7, 0x0a, 0x17, 0xcd, 0xef, 0xd4, 0x14, 0x54, 0xad,
+0xea, 0xc9, 0x13, 0x13, 0xbd, 0x90, 0xa6, 0x95, 0x4c, 0xe0, 0x35, 0xc3, 0x60, 0x4f, 0x9c, 0xf5,
+0x42, 0x7a, 0x95, 0xbd, 0x06, 0xd2, 0x68, 0x5f, 0x8d, 0xb3, 0x43, 0x5a, 0xef, 0xca, 0x04, 0xa5,
+0x66, 0xd7, 0x6b, 0x75, 0xba, 0x73, 0x33, 0x60, 0xa2, 0xd6, 0x7c, 0xe8, 0x4b, 0x0e, 0xcd, 0x41,
+0xf3, 0xdd, 0xb7, 0xdf, 0x5a, 0xab, 0x38, 0xf3, 0x9f, 0xe3, 0xcd, 0x53, 0xb8, 0x7f, 0x87, 0xdb,
+0x1b, 0x75, 0x1e, 0xc7, 0xee, 0x26, 0x4f, 0xc6, 0xff, 0x11, 0x94, 0x65, 0x31, 0x0d, 0x71, 0xb4,
+0x6c, 0x0b, 0x8e, 0xda, 0xe2, 0xa2, 0xf4, 0x3d, 0x38, 0x44, 0x6e, 0xfa, 0x0c, 0x65, 0x37, 0x0e,
+0x95, 0x6a, 0xac, 0x9d, 0xee, 0xfa, 0x07, 0xa9, 0x93, 0x03, 0x71, 0xe3, 0xe4, 0x6c, 0xfe, 0xfa,
+0xed, 0xe0, 0xfa, 0xc5, 0x46, 0x32, 0xe1, 0xe2, 0xc0, 0x16, 0xee, 0xc0, 0x53, 0xa2, 0x7b, 0xa1,
+0xe5, 0x6a, 0xa4, 0x77, 0xf0, 0xc8, 0x27, 0x4d, 0xa9, 0x56, 0x10, 0x54, 0x7d, 0xbc, 0x11, 0x4c,
+0x2f, 0x26, 0xfd, 0xf4, 0xd4, 0x6b, 0x65, 0xbb, 0x40, 0xd1, 0x57, 0x4f, 0x7d, 0xe8, 0x1b, 0xfc,
+0x0c, 0x5e, 0x6b, 0x68, 0x94, 0x3c, 0x11, 0xed, 0x84, 0x96, 0x6f, 0xfe, 0x7d, 0x1e, 0xd8, 0x40,
+0xfe, 0xf9, 0xe5, 0xaf, 0x66, 0xfb, 0xc8, 0x79, 0x82, 0xcf, 0xc0, 0xf3, 0xbd, 0x05, 0xcc, 0xfe,
+0xfd, 0x40, 0x77, 0x60, 0x3f, 0xfe, 0xe7, 0xb7, 0x5e, 0xc2, 0xef, 0x48, 0xa2, 0x9f, 0xaa, 0xd6,
+0xc7, 0xbf, 0x02, 0x96, 0xaa, 0x22, 0x04, 0x34, 0xe0, 0xf9, 0xf0, 0x16, 0x94, 0x81, 0x24, 0x64,
+0x70, 0xe5, 0x80, 0x1b, 0x13, 0x14, 0x48, 0x41, 0xa4, 0x6c, 0x2b, 0x81, 0x15, 0x34, 0x5f, 0xcd,
+0x12, 0x42, 0xbb, 0x9a, 0xf9, 0x4b, 0x1e, 0x1b, 0x8c, 0x47, 0x06, 0x33, 0x28, 0xba, 0x11, 0x52,
+0xd0, 0x35, 0x30, 0x43, 0xca, 0x06, 0x09, 0xb2, 0x01, 0x0c, 0x9a, 0xf0, 0x7c, 0x7d, 0x78, 0x61,
+0x05, 0xc5, 0xe7, 0xaa, 0x47, 0x11, 0xa1, 0x10, 0x26, 0x70, 0xa1, 0x0c, 0xcb, 0x27, 0xbc, 0x1d,
+0x52, 0x90, 0x86, 0xb9, 0x23, 0x15, 0xf1, 0x90, 0x64, 0x3d, 0x0d, 0xec, 0xcf, 0x87, 0x30, 0xac,
+0xc0, 0x97, 0x90, 0x78, 0x42, 0xae, 0xcd, 0x6f, 0x88, 0xe3, 0x61, 0xa0, 0x12, 0x99, 0xa8, 0xc0,
+0xe3, 0x50, 0xb1, 0x82, 0x08, 0x71, 0x1b, 0x2c, 0xff, 0x88, 0x17, 0xae, 0xc6, 0x5c, 0x40, 0x87,
+0x57, 0x94, 0x07, 0x2f, 0xc2, 0xa8, 0x40, 0xf1, 0x69, 0xb1, 0x3e, 0xf2, 0x13, 0x20, 0x7c, 0xc8,
+0x78, 0x3f, 0x20, 0x1e, 0x20, 0x85, 0x6c, 0xc4, 0xdf, 0x06, 0x7b, 0x77, 0x03, 0x2f, 0xce, 0xc8,
+0x11, 0x7a, 0xaa, 0x08, 0xff, 0x0a, 0xe4, 0x12, 0x98, 0xf8, 0xb1, 0x4b, 0x5d, 0xc3, 0xdf, 0x6a,
+0xfa, 0xf8, 0xc7, 0x98, 0x30, 0x86, 0x7f, 0x05, 0x21, 0x52, 0x67, 0x74, 0xe7, 0xc6, 0x69, 0xb4,
+0xf1, 0x7a, 0x20, 0x58, 0x22, 0xfb, 0x42, 0xd8, 0x43, 0xf6, 0x01, 0x65, 0x66, 0x86, 0xf0, 0x9f,
+0x23, 0x1d, 0x71, 0x40, 0xa5, 0x3c, 0xd2, 0x60, 0x3a, 0x94, 0xa2, 0x07, 0x3e, 0xa8, 0x41, 0x0f,
+0xdc, 0x83, 0x08, 0xb3, 0x22, 0xd7, 0x03, 0x17, 0xa8, 0x36, 0xf6, 0x89, 0x12, 0x04, 0x2e, 0xa4,
+0xa1, 0x2a, 0xa1, 0x02, 0x2f, 0x11, 0xb6, 0x0f, 0x6b, 0x96, 0x34, 0x81, 0x24, 0xcb, 0xd7, 0x2f,
+0x81, 0x29, 0x83, 0x7c, 0x34, 0x3c, 0x62, 0x1a, 0x28, 0xe9, 0x82, 0x5d, 0x12, 0xa9, 0x91, 0x2d,
+0x3c, 0x1f, 0x45, 0xea, 0x63, 0x10, 0x62, 0x66, 0xc0, 0x85, 0x90, 0x14, 0x81, 0x31, 0xed, 0xe3,
+0x4c, 0x0e, 0x08, 0xd3, 0x59, 0x10, 0x42, 0x04, 0x1a, 0x47, 0x00, 0x4d, 0x8e, 0x5d, 0xb3, 0x9a,
+0xdd, 0xeb, 0x5f, 0x80, 0x1c, 0xf9, 0x4b, 0xc2, 0x45, 0xc0, 0x85, 0x38, 0xfb, 0x66, 0x0a, 0x58,
+0xf9, 0x29, 0x72, 0x0a, 0x64, 0x7d, 0x34, 0xc4, 0x20, 0x32, 0x57, 0xa0, 0x4e, 0x14, 0xb0, 0x13,
+0x42, 0x78, 0x1c, 0xa2, 0x23, 0x0b, 0x54, 0x92, 0xb7, 0xdd, 0xd2, 0x9b, 0xe2, 0xb4, 0xa7, 0xf9,
+0xdc, 0x04, 0xab, 0x03, 0xe4, 0x51, 0x7e, 0x5f, 0x1c, 0x68, 0x3a, 0x03, 0x7a, 0x82, 0x7b, 0x2a,
+0x61, 0x98, 0xd2, 0x43, 0xa8, 0xe5, 0xfe, 0x39, 0xff, 0xb1, 0x7a, 0x36, 0x54, 0xa1, 0x6b, 0xb4,
+0x8f, 0x44, 0x2b, 0x20, 0xcf, 0x85, 0x96, 0x52, 0xa0, 0x14, 0x55, 0x8a, 0xf4, 0x16, 0xb9, 0xa1,
+0x8e, 0x02, 0xf4, 0xa3, 0x26, 0x80, 0x63, 0xcc, 0x38, 0x60, 0xc7, 0x89, 0xd6, 0xf2, 0xa4, 0xe5,
+0x03, 0xe7, 0xb6, 0x1c, 0x5a, 0x42, 0x4e, 0xb0, 0xc9, 0x9f, 0x2f, 0xad, 0x28, 0x43, 0x4b, 0xa0,
+0xd2, 0xef, 0xdd, 0x25, 0xa7, 0xc1, 0x0a, 0xa9, 0xba, 0x2c, 0xca, 0x53, 0x9a, 0x7a, 0xe4, 0x20,
+0xfd, 0x3c, 0x27, 0x46, 0x75, 0x8a, 0xd2, 0xa2, 0x2e, 0x55, 0x03, 0x67, 0xc3, 0xe9, 0x31, 0x3d,
+0x1a, 0x53, 0x14, 0xf4, 0x34, 0x4a, 0x2c, 0x95, 0xa0, 0x52, 0x85, 0x4a, 0x03, 0xa2, 0x6e, 0xc1,
+0xa8, 0x46, 0xd9, 0xe0, 0x3d, 0x46, 0x2a, 0xd5, 0x95, 0x32, 0xb5, 0xaa, 0xe8, 0x01, 0xeb, 0x13,
+0xab, 0xc3, 0xc3, 0xad, 0x02, 0x75, 0xa8, 0x3b, 0xfd, 0xea, 0x53, 0x95, 0xb2, 0xc4, 0x26, 0xd8,
+0x8b, 0x64, 0xf1, 0x9c, 0x6b, 0x57, 0xe3, 0x7a, 0x07, 0xb5, 0x1a, 0x54, 0x85, 0x21, 0x30, 0xe9,
+0x59, 0x09, 0x25, 0x53, 0x4f, 0xf8, 0xf5, 0x90, 0x91, 0xd2, 0x64, 0x56, 0xb9, 0x8a, 0x3a, 0xbe,
+0x5e, 0xc6, 0xaf, 0x5b, 0xc4, 0x0f, 0x26, 0x07, 0x99, 0x37, 0xf3, 0x51, 0x95, 0xb0, 0x86, 0x81,
+0x2c, 0xb8, 0x36, 0x38, 0xcd, 0x55, 0x94, 0xd5, 0x3e, 0xd1, 0x0c, 0x81, 0x57, 0x47, 0x30, 0xda,
+0x84, 0xe2, 0x0d, 0x52, 0x79, 0x35, 0x5f, 0x68, 0x23, 0xa9, 0xd9, 0x0e, 0xb8, 0x90, 0x98, 0xb3,
+0x2c, 0xde, 0x5e, 0xd4, 0x58, 0xda, 0x18, 0x74, 0x16, 0xab, 0x4e, 0x55, 0x6d, 0xde, 0x9a, 0x47,
+0x23, 0xda, 0xb2, 0x6f, 0xb5, 0xe9, 0xfb, 0xad, 0x09, 0xae, 0xa9, 0x4f, 0x57, 0xec, 0x2e, 0x58,
+0xa4, 0xa2, 0xe1, 0x6d, 0xc9, 0x03, 0xdc, 0x0e, 0xff, 0xb8, 0xb2, 0xb9, 0x0e, 0x71, 0x65, 0x59,
+0x49, 0xfa, 0x2e, 0x59, 0xe2, 0x0f, 0xba, 0x46, 0xbc, 0x1f, 0x70, 0x89, 0xab, 0xd5, 0xbf, 0x0e,
+0x6e, 0x91, 0x7c, 0xac, 0x23, 0x36, 0x79, 0x7b, 0xbf, 0xc2, 0x96, 0x60, 0xb9, 0xe4, 0xc1, 0x9c,
+0x46, 0xb8, 0x3b, 0x8c, 0xab, 0x14, 0xf7, 0xaa, 0x76, 0x41, 0x2f, 0x35, 0xb5, 0x47, 0x5f, 0xfa,
+0x4a, 0x04, 0x8c, 0x4a, 0xab, 0x2f, 0xf5, 0xf0, 0xab, 0x46, 0x60, 0x88, 0xef, 0x45, 0xe6, 0x4c,
+0x45, 0x1c, 0xdb, 0xa8, 0xaa, 0x01, 0x17, 0x10, 0xbb, 0xcf, 0x34, 0xb0, 0x5e, 0x9f, 0xa5, 0xe0,
+0x49, 0x86, 0xad, 0xc1, 0x6f, 0xa5, 0x25, 0x84, 0x23, 0xec, 0x37, 0x4d, 0x1e, 0xd4, 0x21, 0x16,
+0x06, 0x27, 0x7f, 0xaf, 0xd8, 0x48, 0xf6, 0xb2, 0xb1, 0x21, 0x5a, 0x04, 0xd1, 0x1d, 0xd1, 0x50,
+0xdc, 0xa0, 0x4e, 0x18, 0x7d, 0x81, 0x3c, 0xb1, 0x2f, 0x9d, 0xb8, 0x80, 0x22, 0x85, 0x2f, 0x86,
+0x2a, 0x9e, 0xa7, 0x87, 0x99, 0xd8, 0xb6, 0xde, 0x12, 0xcf, 0x79, 0xf3, 0x74, 0xe4, 0x89, 0x73,
+0xbc, 0xe1, 0x1d, 0xba, 0x26, 0xc4, 0x2e, 0x9e, 0x5f, 0x8e, 0x99, 0x35, 0xe1, 0x21, 0xcf, 0xf8,
+0x85, 0xb1, 0x01, 0xf2, 0x8d, 0x7b, 0x3b, 0xe4, 0xbd, 0xf4, 0xd8, 0x84, 0x4d, 0xf6, 0x1e, 0x19,
+0x0b, 0x4b, 0x47, 0x7f, 0xc5, 0x8b, 0x13, 0x39, 0x00, 0xe0, 0x05, 0x15, 0xdc, 0x64, 0x27, 0x87,
+0x51, 0xb1, 0x05, 0x26, 0xd2, 0xc0, 0xe0, 0xab, 0x13, 0xc4, 0x4e, 0x79, 0x94, 0x66, 0x86, 0x32,
+0x98, 0x8f, 0xd3, 0xb8, 0x02, 0xbd, 0x33, 0xbd, 0x77, 0x00, 0x82, 0x10, 0xe6, 0x4c, 0x67, 0xe0,
+0x9e, 0x84, 0xce, 0x42, 0x70, 0x60, 0xf2, 0xf6, 0xcc, 0xe7, 0x3e, 0xfb, 0xf9, 0xcf, 0x80, 0x0e,
 0xb4, 0xa0, 0x07, 0x4d, 0xe8, 0x42, 0x97, 0x20, 0x01, 0x01, 0x00, 0x3b
diff --git a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen
index cb847a518..6c28cacf4 100644
--- a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen
+++ b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen
index 72bca2828..aab070e1a 100644
--- a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen
+++ b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\JSON\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_OpenSSL/samples/TwitterClient/src/TweetApp.cpp b/NetSSL_OpenSSL/samples/TwitterClient/src/TweetApp.cpp
index 557a2b5d0..6c41d5e20 100644
--- a/NetSSL_OpenSSL/samples/TwitterClient/src/TweetApp.cpp
+++ b/NetSSL_OpenSSL/samples/TwitterClient/src/TweetApp.cpp
@@ -33,8 +33,8 @@ public:
 	TweetApp()
 	{
 	}
-	
-protected:	
+
+protected:
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -51,14 +51,14 @@ protected:
 				.repeatable(false)
 				.argument("message")
 				.callback(OptionCallback<TweetApp>(this, &TweetApp::handleMessage)));
-				
+
 		options.addOption(
 			Option("ckey", "c", "Specify the Twitter consumer key.")
 				.required(true)
 				.repeatable(false)
 				.argument("consumer key")
 				.callback(OptionCallback<TweetApp>(this, &TweetApp::handleConsumerKey)));
-				
+
 		options.addOption(
 			Option("csecret", "s", "Specify the Twitter consumer secret.")
 				.required(true)
@@ -80,18 +80,18 @@ protected:
 				.argument("access token secret")
 				.callback(OptionCallback<TweetApp>(this, &TweetApp::handleAccessTokenSecret)));
 	}
-	
+
 	void handleHelp(const std::string& name, const std::string& value)
 	{
 		displayHelp();
 		stopOptionsProcessing();
 	}
-	
+
 	void handleConsumerKey(const std::string& name, const std::string& value)
 	{
 		_consumerKey = value;
 	}
-	
+
 	void handleConsumerSecret(const std::string& name, const std::string& value)
 	{
 		_consumerSecret = value;
@@ -106,12 +106,12 @@ protected:
 	{
 		_accessTokenSecret = value;
 	}
-	
+
 	void handleMessage(const std::string& name, const std::string& value)
 	{
 		_message = value;
 	}
-		
+
 	void displayHelp()
 	{
 		HelpFormatter helpFormatter(options());
@@ -120,7 +120,7 @@ protected:
 		helpFormatter.setHeader("A simple Twitter command line client for posting status updates.");
 		helpFormatter.format(std::cout);
 	}
-	
+
 	int main(const std::vector<std::string>& args)
 	{
 		try
diff --git a/NetSSL_OpenSSL/samples/TwitterClient/src/Twitter.cpp b/NetSSL_OpenSSL/samples/TwitterClient/src/Twitter.cpp
index 94a6ac2e2..16b936207 100644
--- a/NetSSL_OpenSSL/samples/TwitterClient/src/Twitter.cpp
+++ b/NetSSL_OpenSSL/samples/TwitterClient/src/Twitter.cpp
@@ -29,13 +29,13 @@ Twitter::Twitter():
 {
 }
 
-	
+
 Twitter::Twitter(const std::string& twitterURI):
 	_uri(twitterURI)
 {
 }
 
-	
+
 Twitter::~Twitter()
 {
 }
@@ -49,7 +49,7 @@ void Twitter::login(const std::string& consumerKey, const std::string& consumerS
 	_tokenSecret    = tokenSecret;
 }
 
-	
+
 Poco::Int64 Twitter::update(const std::string& status)
 {
 	Poco::Net::HTMLForm form;
@@ -64,23 +64,23 @@ Poco::AutoPtr<Poco::Util::AbstractConfiguration> Twitter::invoke(const std::stri
 	// Create the request URI.
 	// We use the JSON version of the Twitter API.
 	Poco::URI uri(_uri + twitterMethod + ".json");
-	
+
 	Poco::Net::HTTPSClientSession session(uri.getHost(), uri.getPort());
 	Poco::Net::HTTPRequest req(httpMethod, uri.getPath(), Poco::Net::HTTPMessage::HTTP_1_1);
-	
+
 	// Sign request
 	Poco::Net::OAuth10Credentials creds(_consumerKey, _consumerSecret, _token, _tokenSecret);
 	creds.authenticate(req, uri, form);
-	
+
 	// Send the request.
 	form.prepareSubmit(req);
 	std::ostream& ostr = session.sendRequest(req);
 	form.write(ostr);
-	
+
 	// Receive the response.
 	Poco::Net::HTTPResponse res;
 	std::istream& rs = session.receiveResponse(res);
-	
+
 	Poco::AutoPtr<Poco::Util::JSONConfiguration> pResult = new Poco::Util::JSONConfiguration(rs);
 
 	// If everything went fine, return the JSON document.
diff --git a/NetSSL_OpenSSL/samples/TwitterClient/src/Twitter.h b/NetSSL_OpenSSL/samples/TwitterClient/src/Twitter.h
index a8b4c2c13..a41d6cd30 100644
--- a/NetSSL_OpenSSL/samples/TwitterClient/src/Twitter.h
+++ b/NetSSL_OpenSSL/samples/TwitterClient/src/Twitter.h
@@ -23,23 +23,23 @@
 class Twitter
 	/// A simple implementation of a Twitter API client
 	/// (see <http://dev.twitter.com> for more information).
-	/// 
+	///
 	/// Currently, only the update message is supported.
 {
 public:
 	Twitter();
 		/// Creates the Twitter object, using
 		/// the default Twitter API URI (<http://api.twitter.com/1.1/statuses/>).
-		
+
 	Twitter(const std::string& twitterURI);
 		/// Creates the Twitter object using the given Twitter API URI.
-		
+
 	~Twitter();
 		/// Destroys the Twitter object.
-		
+
 	void login(const std::string& consumerKey, const std::string& consumerSecret, const std::string& token, const std::string& tokenSecret);
 		/// Specifies the OAuth authentication information used in all API calls.
-		
+
 	Poco::Int64 update(const std::string& status);
 		/// Updates the user's status.
 		///
@@ -53,13 +53,13 @@ public:
 		/// Returns a Poco::Util::JSONConfiguration with the server's response if the
 		/// server's HTTP response status code is 200 (OK).
 		/// Otherwise, throws a Poco::ApplicationException.
-	
+
 	static const std::string TWITTER_URI;
 
 private:
 	Twitter(const Twitter&);
 	Twitter& operator = (const Twitter&);
-	
+
 	std::string _uri;
 	std::string _consumerKey;
 	std::string _consumerSecret;
diff --git a/NetSSL_OpenSSL/samples/download/doc/readme.txt b/NetSSL_OpenSSL/samples/download/doc/readme.txt
index b51ff561f..78616d100 100644
--- a/NetSSL_OpenSSL/samples/download/doc/readme.txt
+++ b/NetSSL_OpenSSL/samples/download/doc/readme.txt
@@ -1,3 +1,3 @@
 The password for the example certificates used is always >secret<.
-The working directory for the download sample is "samples/download", 
-trying to start it in "bin" will lead to errors (any.pem, rootcert.pem not found).
\ No newline at end of file
+The working directory for the download sample is "samples/download",
+trying to start it in "bin" will lead to errors (any.pem, rootcert.pem not found).
diff --git a/NetSSL_OpenSSL/samples/download/download.progen b/NetSSL_OpenSSL/samples/download/download.progen
index cb847a518..6c28cacf4 100644
--- a/NetSSL_OpenSSL/samples/download/download.progen
+++ b/NetSSL_OpenSSL/samples/download/download.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp b/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp
index a89bbea11..24461f1d5 100644
--- a/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp
+++ b/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp
@@ -42,14 +42,14 @@ void CertificateHandlerFactoryMgr::setFactory(const std::string& name, Certifica
 		delete pFactory;
 	poco_assert(success);
 }
-		
+
 
 bool CertificateHandlerFactoryMgr::hasFactory(const std::string& name) const
 {
 	return _factories.find(name) != _factories.end();
 }
-		
-	
+
+
 const CertificateHandlerFactory* CertificateHandlerFactoryMgr::getFactory(const std::string& name) const
 {
 	FactoriesMap::const_iterator it = _factories.find(name);
diff --git a/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp b/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp
index 6ef20e63f..05a5f1b9b 100644
--- a/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp
+++ b/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp
@@ -80,7 +80,7 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 		int redirects = 0;
 		std::string username;
 		std::string password;
-		
+
 		do
 		{
 			if (!pSession)
@@ -110,7 +110,7 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 			std::string path = resolvedURI.getPathAndQuery();
 			if (path.empty()) path = "/";
 			HTTPRequest req(HTTPRequest::HTTP_GET, path, HTTPMessage::HTTP_1_1);
-			
+
 			if (authorize)
 			{
 				HTTPCredentials::extractCredentials(uri, username, password);
@@ -118,7 +118,7 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 				cred.authenticate(req, res);
 			}
 
-			req.set("User-Agent", Poco::format("poco/%d.%d.%d", 
+			req.set("User-Agent", Poco::format("poco/%d.%d.%d",
 				(POCO_VERSION >> 24) & 0xFF,
 				(POCO_VERSION >> 16) & 0xFF,
 				(POCO_VERSION >> 8) & 0xFF));
@@ -126,8 +126,8 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 
 			pSession->sendRequest(req);
 			std::istream& rs = pSession->receiveResponse(res);
-			bool moved = (res.getStatus() == HTTPResponse::HTTP_MOVED_PERMANENTLY || 
-			              res.getStatus() == HTTPResponse::HTTP_FOUND || 
+			bool moved = (res.getStatus() == HTTPResponse::HTTP_MOVED_PERMANENTLY ||
+			              res.getStatus() == HTTPResponse::HTTP_FOUND ||
 			              res.getStatus() == HTTPResponse::HTTP_SEE_OTHER ||
 						  res.getStatus() == HTTPResponse::HTTP_TEMPORARY_REDIRECT);
 			if (moved)
@@ -138,7 +138,7 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 					resolvedURI.setUserInfo(username + ":" + password);
 					authorize = false;
 				}
-				delete pSession; 
+				delete pSession;
 				pSession = 0;
 				++redirects;
 				retry = true;
@@ -149,13 +149,13 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 			}
 			else if (res.getStatus() == HTTPResponse::HTTP_USEPROXY && !retry)
 			{
-				// The requested resource MUST be accessed through the proxy 
-				// given by the Location field. The Location field gives the 
-				// URI of the proxy. The recipient is expected to repeat this 
+				// The requested resource MUST be accessed through the proxy
+				// given by the Location field. The Location field gives the
+				// URI of the proxy. The recipient is expected to repeat this
 				// single request via the proxy. 305 responses MUST only be generated by origin servers.
 				// only use for one single request!
 				proxyUri.resolve(res.get("Location"));
-				delete pSession; 
+				delete pSession;
 				pSession = 0;
 				retry = true; // only allow useproxy once
 			}
diff --git a/NetSSL_OpenSSL/src/KeyFileHandler.cpp b/NetSSL_OpenSSL/src/KeyFileHandler.cpp
index c06485aef..349cf664d 100644
--- a/NetSSL_OpenSSL/src/KeyFileHandler.cpp
+++ b/NetSSL_OpenSSL/src/KeyFileHandler.cpp
@@ -45,7 +45,7 @@ void KeyFileHandler::onPrivateKeyRequested(const void* pSender, std::string& pri
 		std::string prefix = serverSide() ? SSLManager::CFG_SERVER_PREFIX : SSLManager::CFG_CLIENT_PREFIX;
 		if (!config.hasProperty(prefix + CFG_PRIV_KEY_FILE))
 			throw Poco::Util::EmptyOptionException(std::string("Missing Configuration Entry: ") + prefix + CFG_PRIV_KEY_FILE);
-		
+
 		privateKey = config.getString(prefix + CFG_PRIV_KEY_FILE);
 	}
 	catch (Poco::NullPointerException&)
diff --git a/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp b/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp
index 94b4ad34b..cc49ecbab 100644
--- a/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp
+++ b/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp
@@ -40,14 +40,14 @@ void PrivateKeyFactoryMgr::setFactory(const std::string& name, PrivateKeyFactory
 		delete pFactory;
 	poco_assert(success);
 }
-		
+
 
 bool PrivateKeyFactoryMgr::hasFactory(const std::string& name) const
 {
 	return _factories.find(name) != _factories.end();
 }
-		
-	
+
+
 const PrivateKeyFactory* PrivateKeyFactoryMgr::getFactory(const std::string& name) const
 {
 	FactoriesMap::const_iterator it = _factories.find(name);
diff --git a/NetSSL_OpenSSL/src/SecureServerSocket.cpp b/NetSSL_OpenSSL/src/SecureServerSocket.cpp
index a394304ac..66bf09679 100644
--- a/NetSSL_OpenSSL/src/SecureServerSocket.cpp
+++ b/NetSSL_OpenSSL/src/SecureServerSocket.cpp
@@ -26,7 +26,7 @@ namespace Poco {
 namespace Net {
 
 
-SecureServerSocket::SecureServerSocket(): 
+SecureServerSocket::SecureServerSocket():
 	ServerSocket(new SecureServerSocketImpl(SSLManager::instance().defaultServerContext()), true)
 {
 }
@@ -38,7 +38,7 @@ SecureServerSocket::SecureServerSocket(Context::Ptr pContext):
 }
 
 
-SecureServerSocket::SecureServerSocket(const Socket& socket): 
+SecureServerSocket::SecureServerSocket(const Socket& socket):
 	ServerSocket(socket)
 {
 	if (!dynamic_cast<SecureServerSocketImpl*>(impl()))
@@ -46,7 +46,7 @@ SecureServerSocket::SecureServerSocket(const Socket& socket):
 }
 
 
-SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog): 
+SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog):
 	ServerSocket(new SecureServerSocketImpl(SSLManager::instance().defaultServerContext()), true)
 {
 	impl()->bind(address, true);
@@ -54,7 +54,7 @@ SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog
 }
 
 
-SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog, Context::Ptr pContext): 
+SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog, Context::Ptr pContext):
 	ServerSocket(new SecureServerSocketImpl(pContext), true)
 {
 	impl()->bind(address, true);
@@ -62,7 +62,7 @@ SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog
 }
 
 
-SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog): 
+SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog):
 	ServerSocket(new SecureServerSocketImpl(SSLManager::instance().defaultServerContext()), true)
 {
 	IPAddress wildcardAddr;
@@ -71,7 +71,7 @@ SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog):
 	impl()->listen(backlog);
 }
 
-SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog, Context::Ptr pContext): 
+SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog, Context::Ptr pContext):
 	ServerSocket(new SecureServerSocketImpl(pContext), true)
 {
 	IPAddress wildcardAddr;
diff --git a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
index d38ff39d2..edbd61d77 100644
--- a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
+++ b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
@@ -311,6 +311,22 @@ void SecureSocketImpl::close()
 }
 
 
+void SecureSocketImpl::setBlocking(bool flag)
+{
+	poco_check_ptr (_pSocket);
+
+	_pSocket->setBlocking(flag);
+}
+
+
+bool SecureSocketImpl::getBlocking() const
+{
+	poco_check_ptr (_pSocket);
+
+	return _pSocket->getBlocking();
+}
+
+
 int SecureSocketImpl::sendBytes(const void* buffer, int length, int flags)
 {
 	poco_assert (_pSocket->initialized());
diff --git a/NetSSL_OpenSSL/src/SecureStreamSocket.cpp b/NetSSL_OpenSSL/src/SecureStreamSocket.cpp
index f4766ca6f..86120ea11 100644
--- a/NetSSL_OpenSSL/src/SecureStreamSocket.cpp
+++ b/NetSSL_OpenSSL/src/SecureStreamSocket.cpp
@@ -26,33 +26,33 @@ namespace Poco {
 namespace Net {
 
 
-SecureStreamSocket::SecureStreamSocket(): 
+SecureStreamSocket::SecureStreamSocket():
 	StreamSocket(new SecureStreamSocketImpl(SSLManager::instance().defaultClientContext()))
 {
 }
 
 
-SecureStreamSocket::SecureStreamSocket(Context::Ptr pContext): 
+SecureStreamSocket::SecureStreamSocket(Context::Ptr pContext):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 }
 
 
-SecureStreamSocket::SecureStreamSocket(Context::Ptr pContext, Session::Ptr pSession): 
+SecureStreamSocket::SecureStreamSocket(Context::Ptr pContext, Session::Ptr pSession):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	useSession(pSession);
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address):
 	StreamSocket(new SecureStreamSocketImpl(SSLManager::instance().defaultClientContext()))
 {
 	connect(address);
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName):
 	StreamSocket(new SecureStreamSocketImpl(SSLManager::instance().defaultClientContext()))
 {
 	static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
@@ -60,14 +60,14 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	connect(address);
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext, Session::Ptr pSession): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext, Session::Ptr pSession):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	useSession(pSession);
@@ -75,7 +75,7 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Pt
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
@@ -83,7 +83,7 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
@@ -92,7 +92,7 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const Socket& socket): 
+SecureStreamSocket::SecureStreamSocket(const Socket& socket):
 	StreamSocket(socket)
 {
 	if (!dynamic_cast<SecureStreamSocketImpl*>(impl()))
@@ -100,7 +100,7 @@ SecureStreamSocket::SecureStreamSocket(const Socket& socket):
 }
 
 
-SecureStreamSocket::SecureStreamSocket(SocketImpl* pImpl): 
+SecureStreamSocket::SecureStreamSocket(SocketImpl* pImpl):
 	StreamSocket(pImpl)
 {
 	if (!dynamic_cast<SecureStreamSocketImpl*>(impl()))
@@ -140,7 +140,7 @@ void SecureStreamSocket::setPeerHostName(const std::string& hostName)
 	static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
 }
 
-	
+
 const std::string& SecureStreamSocket::getPeerHostName() const
 {
 	return static_cast<SecureStreamSocketImpl*>(impl())->getPeerHostName();
@@ -235,7 +235,7 @@ void SecureStreamSocket::setLazyHandshake(bool flag)
 	static_cast<SecureStreamSocketImpl*>(impl())->setLazyHandshake(flag);
 }
 
-	
+
 bool SecureStreamSocket::getLazyHandshake() const
 {
 	return static_cast<SecureStreamSocketImpl*>(impl())->getLazyHandshake();
@@ -265,13 +265,13 @@ Session::Ptr SecureStreamSocket::currentSession()
 	return static_cast<SecureStreamSocketImpl*>(impl())->currentSession();
 }
 
-	
+
 void SecureStreamSocket::useSession(Session::Ptr pSession)
 {
 	static_cast<SecureStreamSocketImpl*>(impl())->useSession(pSession);
 }
 
-	
+
 bool SecureStreamSocket::sessionWasReused()
 {
 	return static_cast<SecureStreamSocketImpl*>(impl())->sessionWasReused();
diff --git a/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp
index b467cf418..29d111abe 100644
--- a/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp
+++ b/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp
@@ -74,7 +74,7 @@ void SecureStreamSocketImpl::connect(const SocketAddress& address, const Poco::T
 	_impl.connect(address, timeout, !_lazyHandshake);
 	reset(_impl.sockfd());
 }
-	
+
 
 void SecureStreamSocketImpl::connectNB(const SocketAddress& address)
 {
@@ -87,19 +87,19 @@ void SecureStreamSocketImpl::connectSSL()
 {
 	_impl.connectSSL(!_lazyHandshake);
 }
-	
+
 
 void SecureStreamSocketImpl::bind(const SocketAddress& address, bool reuseAddress)
 {
 	throw Poco::InvalidAccessException("Cannot bind() a SecureStreamSocketImpl");
 }
 
-	
+
 void SecureStreamSocketImpl::listen(int backlog)
 {
 	throw Poco::InvalidAccessException("Cannot listen() on a SecureStreamSocketImpl");
 }
-	
+
 
 void SecureStreamSocketImpl::close()
 {
@@ -155,12 +155,12 @@ void SecureStreamSocketImpl::shutdownReceive()
 {
 }
 
-	
+
 void SecureStreamSocketImpl::shutdownSend()
 {
 }
 
-	
+
 void SecureStreamSocketImpl::shutdown()
 {
 	_impl.shutdown();
@@ -200,7 +200,7 @@ void SecureStreamSocketImpl::setLazyHandshake(bool flag)
 	_lazyHandshake = flag;
 }
 
-	
+
 bool SecureStreamSocketImpl::getLazyHandshake() const
 {
 	return _lazyHandshake;
diff --git a/NetSSL_OpenSSL/src/Session.cpp b/NetSSL_OpenSSL/src/Session.cpp
index 96a507d94..e16fc23df 100644
--- a/NetSSL_OpenSSL/src/Session.cpp
+++ b/NetSSL_OpenSSL/src/Session.cpp
@@ -14,7 +14,7 @@
 
 #if defined(__APPLE__)
 // Some OpenSSL functions are deprecated in OS X 10.7
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" 
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite.progen b/NetSSL_OpenSSL/testsuite/TestSuite.progen
index 1b8f3c2d8..61b90bc37 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite.progen
+++ b/NetSSL_OpenSSL/testsuite/TestSuite.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include;..\\..\\Net\\include;..\\..\\Crypto\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj
index 800373665..d966bf453 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{B2B88092-5BCE-4AC0-941E-88167138B4A7}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/NetSSL_OpenSSL/testsuite/src/DialogServer.cpp b/NetSSL_OpenSSL/testsuite/src/DialogServer.cpp
index beb0a7971..f19a3727d 100644
--- a/NetSSL_OpenSSL/testsuite/src/DialogServer.cpp
+++ b/NetSSL_OpenSSL/testsuite/src/DialogServer.cpp
@@ -72,7 +72,7 @@ void handleDataSSLrequest(DialogSocket& ds, bool ssl, Session::Ptr& sslSession)
 				ds = sss;
 			}
 		}
-		catch (Exception& exc) 
+		catch (Exception& exc)
 		{
 			std::cout << exc.displayText() << std::endl;
 		}
diff --git a/NetSSL_OpenSSL/testsuite/src/DialogServer.h b/NetSSL_OpenSSL/testsuite/src/DialogServer.h
index 2c03f0428..270a260f4 100644
--- a/NetSSL_OpenSSL/testsuite/src/DialogServer.h
+++ b/NetSSL_OpenSSL/testsuite/src/DialogServer.h
@@ -37,10 +37,10 @@ public:
 	Poco::UInt16 port() const;
 		/// Returns the port the echo server is
 		/// listening on.
-		
+
 	void run();
 		/// Does the work.
-		
+
 	const std::string& lastCommand() const;
 		/// Returns the last command received by the server.
 
@@ -53,28 +53,28 @@ public:
 
 	const std::vector<std::string>& lastCommands() const;
 		/// Returns the last command received by the server.
-		
+
 	void addResponse(const std::string& response);
 		/// Sets the next response returned by the server.
-	
+
 	void clearCommands();
 		/// Clears all commands.
-		
+
 	void clearResponses();
 		/// Clears all responses.
-		
+
 	void log(bool flag);
 		/// Enables or disables logging to stdout.
 
 	Poco::Net::Session::Ptr getSslSession();
 	void setSslSession(Poco::Net::Session::Ptr cSession);
-	
+
 private:
 	Poco::Net::ServerSocket _socket;
 	Poco::Thread             _thread;
 	Poco::Event              _ready;
 	mutable Poco::FastMutex  _mutex;
-	bool                     _stop;
+	std::atomic<bool>        _stop;
 	std::vector<std::string> _nextResponses;
 	std::vector<std::string> _lastCommands;
 	bool                     _acceptCommands;
diff --git a/NetSSL_OpenSSL/testsuite/src/Driver.cpp b/NetSSL_OpenSSL/testsuite/src/Driver.cpp
index a6866dc31..cadbd5e29 100644
--- a/NetSSL_OpenSSL/testsuite/src/Driver.cpp
+++ b/NetSSL_OpenSSL/testsuite/src/Driver.cpp
@@ -40,7 +40,7 @@ public:
 		CppUnitPocoExceptionText (exc);
 		return runner.run(_targs, exc) ? 0 : 1;
 	}
-	
+
 	void setup(int argc, char** argv)
 	{
 		init(1, argv);
@@ -54,7 +54,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		Poco::Util::Application::initialize(self);
 	}
-	
+
 private:
 	std::vector<std::string> _targs;
 };
diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp
index 40507d29f..f78a4130d 100644
--- a/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp
+++ b/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp
@@ -112,7 +112,7 @@ void HTTPSTestServer::run()
 
 bool HTTPSTestServer::requestComplete() const
 {
-	return ((_lastRequest.substr(0, 3) == "GET" || _lastRequest.substr(0, 4) == "HEAD") && 
+	return ((_lastRequest.substr(0, 3) == "GET" || _lastRequest.substr(0, 4) == "HEAD") &&
 	       (_lastRequest.find("\r\n\r\n") != std::string::npos)) ||
 	       (_lastRequest.find("\r\n0\r\n") != std::string::npos);
 }
@@ -128,7 +128,7 @@ std::string HTTPSTestServer::handleRequest() const
 		std::string body(SMALL_BODY);
 		response.append("HTTP/1.0 200 OK\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n");
 		response.append("Connection: Close\r\n");
@@ -143,7 +143,7 @@ std::string HTTPSTestServer::handleRequest() const
 		std::string body(LARGE_BODY);
 		response.append("HTTP/1.0 200 OK\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n");
 		response.append("Connection: Close\r\n");
@@ -171,7 +171,7 @@ std::string HTTPSTestServer::handleRequest() const
 		response.append("Content-Type: text/plain\r\n");
 		if (_lastRequest.find("Content-Length") != std::string::npos)
 		{
-			response.append("Content-Length: "); 
+			response.append("Content-Length: ");
 			response.append(NumberFormatter::format((int) body.size()));
 			response.append("\r\n");
 		}
@@ -192,13 +192,13 @@ std::string HTTPSTestServer::handleRequest() const
 		response.append("HTTP/1.1 200 OK\r\n");
 		response.append("Connection: keep-alive\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n\r\n");
 		response.append("HTTP/1.1 200 OK\r\n");
 		response.append("Connection: Keep-Alive\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n\r\n");
 		response.append(body);
@@ -214,7 +214,7 @@ std::string HTTPSTestServer::handleRequest() const
 		response.append("HTTP/1.1 200 OK\r\n");
 		response.append("Connection: close\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n\r\n");
 	}
@@ -235,7 +235,7 @@ std::string HTTPSTestServer::handleRequest() const
 		std::string body(SMALL_BODY);
 		response.append("HTTP/1.0 200 OK\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n");
 		response.append("Connection: Close\r\n");
diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h b/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h
index 9f897f4f9..9f90bb550 100644
--- a/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h
+++ b/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h
@@ -36,15 +36,15 @@ public:
 	Poco::UInt16 port() const;
 		/// Returns the port the echo server is
 		/// listening on.
-		
+
 	void run();
 		/// Does the work.
-		
+
 	const std::string& lastRequest() const;
 		/// Returns the last request.
 
 	static const std::string SMALL_BODY;
-	static const std::string LARGE_BODY;	
+	static const std::string LARGE_BODY;
 
 protected:
 	bool requestComplete() const;
@@ -54,7 +54,7 @@ private:
 	Poco::Net::SecureServerSocket _socket;
 	Poco::Thread _thread;
 	Poco::Event  _ready;
-	bool         _stop;
+	std::atomic<bool> _stop;
 	std::string  _lastRequest;
 };
 
diff --git a/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp b/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp
index e6cd0f0c2..970b39b9e 100644
--- a/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp
+++ b/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp
@@ -39,14 +39,14 @@ public:
 		runner.addTest("NetSSLTestSuite", NetSSLTestSuite::suite());
 		return runner.run(_targs) ? 0 : 1;
 	}
-	
+
 	void setup(const std::vector<std::string>& args)
 	{
 		char* argv[] =
 		{
 			const_cast<char*>(args[0].c_str())
 		};
-		
+
 		init(1, argv);
 		for (std::size_t i = 0; i < args.size(); ++i)
 			_targs.push_back(args[i]);
@@ -58,7 +58,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		Poco::Util::Application::initialize(self);
 	}
-	
+
 private:
 	std::vector<std::string> _targs;
 };
diff --git a/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp b/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp
index 17b684e67..409b1f553 100644
--- a/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp
+++ b/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp
@@ -39,14 +39,14 @@ public:
 		runner.run();
 		return 0;
 	}
-	
+
 protected:
 	void initialize(Poco::Util::Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Poco::Util::Application::initialize(self);
 	}
-	
+
 private:
 	std::vector<std::string> _targs;
 };
diff --git a/NetSSL_Win/NetSSL_Win.progen b/NetSSL_Win/NetSSL_Win.progen
index df2b7aee1..4e149bcb0 100644
--- a/NetSSL_Win/NetSSL_Win.progen
+++ b/NetSSL_Win/NetSSL_Win.progen
@@ -12,6 +12,7 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib Crypt32.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_Win/NetSSL_Win_vs170.sln b/NetSSL_Win/NetSSL_Win_vs170.sln
index 609d838cf..83b3087b6 100644
--- a/NetSSL_Win/NetSSL_Win_vs170.sln
+++ b/NetSSL_Win/NetSSL_Win_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{A097DC74-A5FC-4A0B-804E-B18892426E77}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_static_md|x64.Build.0 = release_static_md|x64
 		{A097DC74-A5FC-4A0B-804E-B18892426E77}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/NetSSL_Win/NetSSL_Win_vs170.vcxproj b/NetSSL_Win/NetSSL_Win_vs170.vcxproj
index 92c48ab02..528f67752 100644
--- a/NetSSL_Win/NetSSL_Win_vs170.vcxproj
+++ b/NetSSL_Win/NetSSL_Win_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>NetSSL_Win</ProjectName>
     <ProjectGuid>{A097DC74-A5FC-4A0B-804E-B18892426E77}</ProjectGuid>
     <RootNamespace>NetSSL_Win</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoNetSSLWinA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoNetSSLWinmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoNetSSLWinmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoNetSSLWinA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoNetSSLWinmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoNetSSLWinmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetSSLWind</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetSSLWinmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetSSLWinmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoNetSSLWinmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoNetSSLWinmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\NetSSL_Win\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\NetSSL_Win\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\NetSSL_Win\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\NetSSL_Win\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\NetSSL_Win\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\NetSSL_Win\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\NetSSL_Win\$(Configuration)\</IntDir>
@@ -223,6 +328,166 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\NetSSL_Win\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_Win_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoNetSSLWinA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoNetSSLWinA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoNetSSLWind.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_Win_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoNetSSLWinA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoNetSSLWin.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoNetSSLWinmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoNetSSLWinmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoNetSSLWinmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoNetSSLWinmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoNetSSLWinmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoNetSSLWinmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -661,12 +926,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/NetSSL_Win/doc/README.txt b/NetSSL_Win/doc/README.txt
index ef3152e76..3f01666cb 100644
--- a/NetSSL_Win/doc/README.txt
+++ b/NetSSL_Win/doc/README.txt
@@ -1,11 +1,11 @@
 About NetSSL_Win
 ================
 
-NetSSL_Win is an implementation of the POCO NetSSL library based on Windows 
+NetSSL_Win is an implementation of the POCO NetSSL library based on Windows
 Schannel. The original NetSSL implementation is based on OpenSSL and thus
 has a few OpenSSL-isms in the interface. Generally, source code based
 on NetSSL_OpenSSL can be easily ported to use NetSSL_Win. Just a few
-minor code changes are required, due to differences in the API. 
+minor code changes are required, due to differences in the API.
 These are discussed below:
 
   - Context: The Context constructor uses different arguments. While
@@ -18,7 +18,7 @@ These are discussed below:
     must be setup.
     Please refer to the header file documentation for more information.
     Furthermore, the following Context methods are not available in NetSSL_Win:
-    addChainCertificate(), disableStatelessSessionResumption(), 
+    addChainCertificate(), disableStatelessSessionResumption(),
     enableSessionCache(),flushSessionCache(),
     getSessionCacheSize(), getSessionTimeout(),
     setSessionCacheSize(), setSessionTimeout(), sslContext(),
@@ -26,7 +26,7 @@ These are discussed below:
 
   - SSLManager: The configuration properties used to configure the SSLManager
     are different from the ones used in NetSSL_OpenSSL. Please see the
-    SSLManager header file for more information. 
+    SSLManager header file for more information.
     The isFIPSEnabled() method is not available.
 
   - X509Certificate: Saving a certificate is not supported.
@@ -39,8 +39,8 @@ The test suite and samples expect a certificate/private key file named
 any.pfx, located in the current working directory. This can be changed
 by editing the testrunner.xml/TestSuite.xml configuration files.
 Alternatively, a certificate from the Windows certificate store can be used.
-A suitable self-signed certificate can be created using the Windows 
-IIS administration console, then exported to a file, and re-imported into 
+A suitable self-signed certificate can be created using the Windows
+IIS administration console, then exported to a file, and re-imported into
 the user's personal store.
 
 To create the certificate, follow these steps:
@@ -54,7 +54,7 @@ To create the certificate, follow these steps:
   6. Export the certificate by right-clicking it and chosing "Export...".
   7. In Explorer, double-click the exported certificate file (.pfx)
      to launch the Certificate Import Wizard.
-  8. Import the certificate into your personal store by 
+  8. Import the certificate into your personal store by
      selecting "Place all certificates in the following store" and
      selecting the "Personal" store in the import wizard.
 
@@ -63,7 +63,7 @@ Windows Embedded Compact
 ------------------------
 
 Windows Embedded Compact does not support the following Schannel
-features: 
+features:
   - certificate revocation checking (Context::OPT_PERFORM_REVOCATION_CHECK)
   - TLS 1.1 and 1.2 (Context::TLSV1_1_CLIENT_USE, etc.)
   - disabling weak security algorithms (Context::OPT_USE_STRONG_CRYPTO)
diff --git a/NetSSL_Win/include/Poco/Net/AcceptCertificateHandler.h b/NetSSL_Win/include/Poco/Net/AcceptCertificateHandler.h
index b6b1e0dfd..775d16073 100644
--- a/NetSSL_Win/include/Poco/Net/AcceptCertificateHandler.h
+++ b/NetSSL_Win/include/Poco/Net/AcceptCertificateHandler.h
@@ -27,7 +27,7 @@ namespace Net {
 
 
 class NetSSL_Win_API AcceptCertificateHandler: public InvalidCertificateHandler
-	/// A AcceptCertificateHandler is invoked whenever an error 
+	/// A AcceptCertificateHandler is invoked whenever an error
 	/// occurs verifying the certificate. It always accepts
 	/// the certificate.
 	///
diff --git a/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h b/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h
index f9f6b330d..d7b37df74 100644
--- a/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h
+++ b/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h
@@ -33,7 +33,7 @@ namespace Poco {
 namespace Net {
 
 
-template <int numBufs> 
+template <int numBufs>
 class AutoSecBufferDesc: public SecBufferDesc
 	/// AutoSecBufferDesc is a helper class for automatic initialization and release of SecBuffer objects.
 {
@@ -45,7 +45,7 @@ public:
 	{
 		poco_check_ptr (_pSec);
 		poco_static_assert (numBufs > 0);
-		
+
 		initBuffers();
 		cBuffers = numBufs;
 		pBuffers = _buffers;
diff --git a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h
index 62f1a5ce4..954b1ecf5 100644
--- a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h
+++ b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h
@@ -32,7 +32,7 @@ class NetSSL_Win_API CertificateHandlerFactory
 	/// A CertificateHandlerFactory is responsible for creating InvalidCertificateHandlers.
 	///
 	/// You don't need to access this class directly. Use the macro
-	///     POCO_REGISTER_CHFACTORY(namespace, InvalidCertificateHandlerName) 
+	///     POCO_REGISTER_CHFACTORY(namespace, InvalidCertificateHandlerName)
 	/// instead (see the documentation of InvalidCertificateHandler for an example).
 {
 public:
@@ -50,7 +50,7 @@ public:
 class NetSSL_Win_API CertificateHandlerFactoryRegistrar
 	/// Registrar class which automatically registers CertificateHandlerFactory at the CertificateHandlerFactoryMgr.
 	/// You don't need to access this class directly. Use the macro
-	///     POCO_REGISTER_CHFACTORY(namespace, InvalidCertificateHandlerName) 
+	///     POCO_REGISTER_CHFACTORY(namespace, InvalidCertificateHandlerName)
 	/// instead (see the documentation of InvalidCertificateHandler for an example).
 {
 public:
diff --git a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactoryMgr.h b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactoryMgr.h
index ce9b27595..6c1ca3ac1 100644
--- a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactoryMgr.h
+++ b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactoryMgr.h
@@ -33,7 +33,7 @@ class NetSSL_Win_API CertificateHandlerFactoryMgr
 {
 public:
 	using FactoriesMap = std::map<std::string, Poco::SharedPtr<CertificateHandlerFactory>>;
-	
+
 	CertificateHandlerFactoryMgr();
 		/// Creates the CertificateHandlerFactoryMgr.
 
@@ -46,12 +46,12 @@ public:
 
 	bool hasFactory(const std::string& name) const;
 		/// Returns true if for the given name a factory is already registered
-	
+
 	const CertificateHandlerFactory* getFactory(const std::string& name) const;
 		/// Returns NULL if for the given name a factory does not exist, otherwise the factory is returned
 
 	void removeFactory(const std::string& name);
-		/// Removes the factory from the manager. 
+		/// Removes the factory from the manager.
 
 private:
 	FactoriesMap _factories;
diff --git a/NetSSL_Win/include/Poco/Net/ConsoleCertificateHandler.h b/NetSSL_Win/include/Poco/Net/ConsoleCertificateHandler.h
index 1ec128dca..264276021 100644
--- a/NetSSL_Win/include/Poco/Net/ConsoleCertificateHandler.h
+++ b/NetSSL_Win/include/Poco/Net/ConsoleCertificateHandler.h
@@ -28,7 +28,7 @@ namespace Net {
 
 class NetSSL_Win_API ConsoleCertificateHandler: public InvalidCertificateHandler
 	/// A ConsoleCertificateHandler is invoked whenever an error occurs verifying the certificate.
-	/// 
+	///
 	/// The certificate is printed to stdout and the user is asked via console if he wants to accept it.
 {
 public:
diff --git a/NetSSL_Win/include/Poco/Net/Context.h b/NetSSL_Win/include/Poco/Net/Context.h
index ec53fbc79..a917b6022 100644
--- a/NetSSL_Win/include/Poco/Net/Context.h
+++ b/NetSSL_Win/include/Poco/Net/Context.h
@@ -68,37 +68,37 @@ public:
 		TLSV1_3_SERVER_USE  /// DEPRECATED. Context is used by a server requiring TLSv1.3. Not supported on Windows Embedded Compact.
 	};
 
-	enum VerificationMode 
+	enum VerificationMode
 	{
-		VERIFY_NONE    = 0, 
-			/// Server: The server will not send a client certificate 
-			/// request to the client, so the client will not send a certificate. 
+		VERIFY_NONE    = 0,
+			/// Server: The server will not send a client certificate
+			/// request to the client, so the client will not send a certificate.
 			///
-			/// Client: If not using an anonymous cipher (by default disabled), 
+			/// Client: If not using an anonymous cipher (by default disabled),
 			/// the server will send a certificate which will be checked, but
 			/// the result of the check will be ignored.
 
-		VERIFY_RELAXED = 1, 
-			/// Server: The server sends a client certificate request to the 
-			/// client. The certificate returned (if any) is checked. 
-			/// If the verification process fails, the TLS/SSL handshake is 
-			/// immediately terminated with an alert message containing the 
-			/// reason for the verification failure. 
-			///
-			/// Client: The server certificate is verified, if one is provided. 
+		VERIFY_RELAXED = 1,
+			/// Server: The server sends a client certificate request to the
+			/// client. The certificate returned (if any) is checked.
 			/// If the verification process fails, the TLS/SSL handshake is
-			/// immediately terminated with an alert message containing the 
-			/// reason for the verification failure. 
+			/// immediately terminated with an alert message containing the
+			/// reason for the verification failure.
+			///
+			/// Client: The server certificate is verified, if one is provided.
+			/// If the verification process fails, the TLS/SSL handshake is
+			/// immediately terminated with an alert message containing the
+			/// reason for the verification failure.
 
 		VERIFY_STRICT  = 2,
-			/// Server: If the client did not return a certificate, the TLS/SSL 
+			/// Server: If the client did not return a certificate, the TLS/SSL
 			/// handshake is immediately terminated with a handshake failure
-			/// alert. 
+			/// alert.
 			///
-			/// Client: Same as VERIFY_RELAXED. 
+			/// Client: Same as VERIFY_RELAXED.
 
 		VERIFY_ONCE    = 1
-			/// Same as VERIFY_RELAXED (provided for interface compatibility with 
+			/// Same as VERIFY_RELAXED (provided for interface compatibility with
 			/// the OpenSSL implementation.
 	};
 
@@ -122,26 +122,26 @@ public:
 			/// If specified, the windows machine certificate store is used (server only).
 			/// Otherwise, the user's certificate store is used.
 		OPT_USE_STRONG_CRYPTO           = 0x08,
-			/// Disable known weak cryptographic algorithms, cipher suites, and 
-			/// SSL/TLS protocol versions that may be otherwise enabled for better interoperability. 
+			/// Disable known weak cryptographic algorithms, cipher suites, and
+			/// SSL/TLS protocol versions that may be otherwise enabled for better interoperability.
 		OPT_LOAD_CERT_FROM_FILE         = 0x10,
-			/// Load certificate and private key from a PKCS #12 (.pfx) file, 
+			/// Load certificate and private key from a PKCS #12 (.pfx) file,
 			/// and not from the certificate store.
 		OPT_DEFAULTS                    = OPT_PERFORM_REVOCATION_CHECK | OPT_TRUST_ROOTS_WIN_CERT_STORE | OPT_USE_STRONG_CRYPTO
 	};
 
 	Context(Usage usage,
-		const std::string& certificateNameOrPath, 
+		const std::string& certificateNameOrPath,
 		VerificationMode verMode = VERIFY_RELAXED,
 		int options = OPT_DEFAULTS,
 		const std::string& certificateStoreName = CERT_STORE_MY);
 			/// Creates a Context.
-			/// 
+			///
 			///   * usage specifies whether the context is used by a client or server,
 			///     as well as which protocol to use.
 			///   * certificateNameOrPath specifies either the subject name of the certificate to use,
 			///     or the path of a PKCS #12 file containing the certificate and corresponding private key.
-			///     If a subject name is specified, the certificate must be located in the certificate 
+			///     If a subject name is specified, the certificate must be located in the certificate
 			///     store specified by certificateStoreName. If a path is given, the OPT_LOAD_CERT_FROM_FILE
 			///     option must be set.
 			///   * verificationMode specifies whether and how peer certificates are validated.
@@ -153,7 +153,7 @@ public:
 			/// Note: you can use OpenSSL to convert a certificate and private key in PEM format
 			/// into PKCS #12 format required to import into the Context:
 			///
-			///     openssl pkcs12 -export -inkey cert.key -in cert.crt -out cert.pfx 
+			///     openssl pkcs12 -export -inkey cert.key -in cert.crt -out cert.pfx
 
 	~Context();
 		/// Destroys the Context.
@@ -176,9 +176,9 @@ public:
 		/// extended certificate verification.
 		///
 		/// See X509Certificate::verify() for more information.
-		
+
 	bool extendedCertificateVerificationEnabled() const;
-		/// Returns true iff automatic extended certificate 
+		/// Returns true iff automatic extended certificate
 		/// verification is enabled.
 
 	int options() const;
diff --git a/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h b/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h
index 2101b9590..0aa66e2fc 100644
--- a/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h
+++ b/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h
@@ -74,7 +74,7 @@ public:
 	{
 		HTTPS_PORT = 443
 	};
-	
+
 	HTTPSClientSession();
 		/// Creates an unconnected HTTPSClientSession.
 
@@ -122,25 +122,25 @@ public:
 	~HTTPSClientSession();
 		/// Destroys the HTTPSClientSession and closes
 		/// the underlying socket.
-	
+
 	bool secure() const;
 		/// Return true iff the session uses SSL or TLS,
 		/// or false otherwise.
-		
+
 	X509Certificate serverCertificate();
 		/// Returns the server's certificate.
 		///
 		/// The certificate is available after the first request has been sent.
-		
+
 	Session::Ptr sslSession();
-		/// Returns the SSL Session object for the current 
+		/// Returns the SSL Session object for the current
 		/// connection, if session caching has been enabled for
-		/// the HTTPSClientSession's Context. A null pointer is 
+		/// the HTTPSClientSession's Context. A null pointer is
 		/// returned otherwise.
 		///
 		/// The Session object can be obtained after the first request has
 		/// been sent.
-		
+
 	// HTTPSession
 	void abort();
 
@@ -153,7 +153,7 @@ protected:
 private:
 	HTTPSClientSession(const HTTPSClientSession&);
 	HTTPSClientSession& operator = (const HTTPSClientSession&);
-	
+
 	Context::Ptr _pContext;
 	Session::Ptr _pSession;
 };
diff --git a/NetSSL_Win/include/Poco/Net/HTTPSStreamFactory.h b/NetSSL_Win/include/Poco/Net/HTTPSStreamFactory.h
index 3dfa627e0..7c1a3c1cc 100644
--- a/NetSSL_Win/include/Poco/Net/HTTPSStreamFactory.h
+++ b/NetSSL_Win/include/Poco/Net/HTTPSStreamFactory.h
@@ -49,27 +49,27 @@ public:
 
 	~HTTPSStreamFactory();
 		/// Destroys the HTTPSStreamFactory.
-		
+
 	std::istream* open(const Poco::URI& uri);
 		/// Creates and opens a HTTPS stream for the given URI.
 		/// The URI must be a https://... URI.
 		///
 		/// Throws a NetException if anything goes wrong.
-		
+
 	static void registerFactory();
 		/// Registers the HTTPSStreamFactory with the
-		/// default URIStreamOpener instance.	
+		/// default URIStreamOpener instance.
 
 	static void unregisterFactory();
 		/// Unregisters the HTTPSStreamFactory with the
-		/// default URIStreamOpener instance.	
-		
+		/// default URIStreamOpener instance.
+
 private:
 	enum
 	{
 		MAX_REDIRECTS = 10
 	};
-	
+
 	std::string  _proxyHost;
 	Poco::UInt16 _proxyPort;
 	std::string  _proxyUsername;
diff --git a/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h b/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h
index 26f0f1daf..6c16f8bb5 100644
--- a/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h
+++ b/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h
@@ -30,9 +30,9 @@ class NetSSL_Win_API InvalidCertificateHandler
 	/// A InvalidCertificateHandler is invoked whenever an error occurs verifying the certificate. It allows the user
 	/// to inspect and accept/reject the certificate.
 	/// One can install one's own InvalidCertificateHandler by implementing this interface. Note that
-	/// in the implementation file of the subclass the following code must be present (assuming you use the namespace My_API 
+	/// in the implementation file of the subclass the following code must be present (assuming you use the namespace My_API
 	/// and the name of your handler class is MyGuiHandler):
-	///    
+	///
 	///    #include "Poco/Net/CertificateHandlerFactory.h"
 	///    ...
 	///    POCO_REGISTER_CHFACTORY(My_API, MyGuiHandler)
@@ -43,7 +43,7 @@ class NetSSL_Win_API InvalidCertificateHandler
 	///
 	/// or in case one uses Poco::Util::Application one can rely on an XML configuration and put the following entry
 	/// under the path openSSL.invalidCertificateHandler:
-	///    
+	///
 	///    <invalidCertificateHandler>
 	///        <name>MyGuiHandler<name>
 	///        <options>
@@ -56,7 +56,7 @@ class NetSSL_Win_API InvalidCertificateHandler
 public:
 	InvalidCertificateHandler(bool handleErrorsOnServerSide);
 		/// Creates the InvalidCertificateHandler.
-		/// 
+		///
 		/// Set handleErrorsOnServerSide to true if the certificate handler is used on the server side.
 		/// Automatically registers at one of the SSLManager::VerificationError events.
 
diff --git a/NetSSL_Win/include/Poco/Net/KeyFileHandler.h b/NetSSL_Win/include/Poco/Net/KeyFileHandler.h
index 6faa28a77..af33ff1fc 100644
--- a/NetSSL_Win/include/Poco/Net/KeyFileHandler.h
+++ b/NetSSL_Win/include/Poco/Net/KeyFileHandler.h
@@ -27,7 +27,7 @@ namespace Net {
 
 
 class NetSSL_Win_API KeyFileHandler: public PrivateKeyPassphraseHandler
-	/// An implementation of PrivateKeyPassphraseHandler that 
+	/// An implementation of PrivateKeyPassphraseHandler that
 	/// reads the key for a certificate from a configuration file
 	/// under the path "openSSL.privateKeyPassphraseHandler.options.password".
 {
diff --git a/NetSSL_Win/include/Poco/Net/NetSSL.h b/NetSSL_Win/include/Poco/Net/NetSSL.h
index 380f7ef14..3abaa6444 100644
--- a/NetSSL_Win/include/Poco/Net/NetSSL.h
+++ b/NetSSL_Win/include/Poco/Net/NetSSL.h
@@ -76,7 +76,7 @@ void NetSSL_Win_API initializeSSL();
 	/// Can be called multiple times; however, for every call to
 	/// initializeSSL(), a matching call to uninitializeSSL()
 	/// must be performed.
-	
+
 
 void NetSSL_Win_API uninitializeSSL();
 	/// Uninitializes the NetSSL library and
diff --git a/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h b/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h
index 096c7a227..5210da3ad 100644
--- a/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h
+++ b/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h
@@ -32,7 +32,7 @@ class NetSSL_Win_API PrivateKeyFactory
 	/// A PrivateKeyFactory is responsible for creating PrivateKeyPassphraseHandlers.
 	///
 	/// You don't need to access this class directly. Use the macro
-	///     POCO_REGISTER_KEYFACTORY(namespace, PrivateKeyPassphraseHandlerName) 
+	///     POCO_REGISTER_KEYFACTORY(namespace, PrivateKeyPassphraseHandlerName)
 	/// instead (see the documentation of PrivateKeyPassphraseHandler for an example).
 {
 public:
@@ -51,7 +51,7 @@ class NetSSL_Win_API PrivateKeyFactoryRegistrar
 	/// Registrar class which automatically registers PrivateKeyFactories at the PrivateKeyFactoryMgr.
 	///
 	/// You don't need to access this class directly. Use the macro
-	///     POCO_REGISTER_KEYFACTORY(namespace, PrivateKeyPassphraseHandlerName) 
+	///     POCO_REGISTER_KEYFACTORY(namespace, PrivateKeyPassphraseHandlerName)
 	/// instead (see the documentation of PrivateKeyPassphraseHandler for an example).
 
 {
diff --git a/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h b/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h
index bfde829d1..a3ed0d30b 100644
--- a/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h
+++ b/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h
@@ -33,7 +33,7 @@ class NetSSL_Win_API PrivateKeyFactoryMgr
 {
 public:
 	using FactoriesMap = std::map<std::string, Poco::SharedPtr<PrivateKeyFactory>>;
-	
+
 	PrivateKeyFactoryMgr();
 		/// Creates the PrivateKeyFactoryMgr.
 
@@ -46,12 +46,12 @@ public:
 
 	bool hasFactory(const std::string& name) const;
 		/// Returns true if for the given name a factory is already registered
-	
+
 	const PrivateKeyFactory* getFactory(const std::string& name) const;
 		/// Returns NULL if for the given name a factory does not exist, otherwise the factory is returned
 
 	void removeFactory(const std::string& name);
-		/// Removes the factory from the manager. 
+		/// Removes the factory from the manager.
 
 private:
 	FactoriesMap _factories;
diff --git a/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h b/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h
index 6f49afa78..2b9d6a0a5 100644
--- a/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h
+++ b/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h
@@ -29,9 +29,9 @@ class NetSSL_Win_API PrivateKeyPassphraseHandler
 	/// A passphrase handler is needed whenever the private key of a certificate is loaded and the certificate is protected
 	/// by a passphrase. The PrivateKeyPassphraseHandler's task is to provide that passphrase.
 	/// One can install one's own PrivateKeyPassphraseHandler by implementing this interface. Note that
-	/// in the implementation file of the subclass the following code must be present (assuming you use the namespace My_API 
+	/// in the implementation file of the subclass the following code must be present (assuming you use the namespace My_API
 	/// and the name of your handler class is MyGuiHandler):
-	///    
+	///
 	///    #include "Poco/Net/PrivateKeyFactory.h"
 	///    ...
 	///    POCO_REGISTER_KEYFACTORY(My_API, MyGuiHandler)
@@ -42,7 +42,7 @@ class NetSSL_Win_API PrivateKeyPassphraseHandler
 	///
 	/// or in case one's application extends Poco::Util::Application one can use an XML configuration and put the following entry
 	/// under the path openSSL.privateKeyPassphraseHandler:
-	///    
+	///
 	///    <privateKeyPassphraseHandler>
 	///        <name>MyGuiHandler</name>
 	///        <options>
diff --git a/NetSSL_Win/include/Poco/Net/RejectCertificateHandler.h b/NetSSL_Win/include/Poco/Net/RejectCertificateHandler.h
index 19cd929f8..32eba4e7b 100644
--- a/NetSSL_Win/include/Poco/Net/RejectCertificateHandler.h
+++ b/NetSSL_Win/include/Poco/Net/RejectCertificateHandler.h
@@ -27,7 +27,7 @@ namespace Net {
 
 
 class NetSSL_Win_API RejectCertificateHandler: public InvalidCertificateHandler
-	/// A RejectCertificateHandler is invoked whenever an error 
+	/// A RejectCertificateHandler is invoked whenever an error
 	/// occurs verifying the certificate. It always rejects
 	/// the certificate.
 {
diff --git a/NetSSL_Win/include/Poco/Net/SSLManager.h b/NetSSL_Win/include/Poco/Net/SSLManager.h
index 6122a06ac..97cec9fe7 100644
--- a/NetSSL_Win/include/Poco/Net/SSLManager.h
+++ b/NetSSL_Win/include/Poco/Net/SSLManager.h
@@ -46,7 +46,7 @@ class Context;
 
 
 class NetSSL_Win_API SSLManager
-	/// SSLManager is a singleton for holding the default server/client 
+	/// SSLManager is a singleton for holding the default server/client
 	/// Context and handling callbacks for certificate verification errors
 	/// and private key passphrases.
 	///
@@ -66,7 +66,7 @@ class NetSSL_Win_API SSLManager
 	/// ClientVerificationError and PrivateKeyPassphraseRequired events
 	/// must be registered.
 	///
-	/// An exemplary documentation which sets either the server or client default context and creates 
+	/// An exemplary documentation which sets either the server or client default context and creates
 	/// a PrivateKeyPassphraseHandler that reads the password from the XML file looks like this:
 	///
 	///    <AppConfig>
@@ -100,28 +100,28 @@ class NetSSL_Win_API SSLManager
 	/// Following is a list of supported configuration properties. Property names must always
 	/// be prefixed with openSSL.server or openSSL.client. Some properties are only supported
 	/// for servers.
-	/// 
+	///
 	///    - certificateName (string): The subject name of the certificate to use. The certificate must
-	///      be available in the Windows user or machine certificate store.  
+	///      be available in the Windows user or machine certificate store.
 	///    - certificatePath (string): The path of a certificate and private key file in PKCS #12 format.
-	///    - certificateStore (string): The certificate store location to use. 
+	///    - certificateStore (string): The certificate store location to use.
 	///      Valid values are "MY", "Root", "Trust" or "CA". Defaults to "MY".
 	///    - verificationMode (string): Specifies whether and how peer certificates are validated (see
 	///      the Context class for details). Valid values are "none", "relaxed", "strict". Defaults to "relaxed".
-	///    - revocationCheck (boolean): Enable or disable checking of certificates against revocation list. 
+	///    - revocationCheck (boolean): Enable or disable checking of certificates against revocation list.
 	///      Defaults to true. Not supported (ignored) on Windows Embedded Compact.
 	///    - trustRoots (boolean): Trust root certificates from Windows root certificate store. Defaults to true.
 	///    - useMachineStore (boolean): Use Windows machine certificate store instead of user store (server only).
 	///      Special user privileges may be required. Defaults to false.
-	///    - useStrongCrypto (boolean): Disable known weak cryptographic algorithms, cipher suites, and 
-	///      SSL/TLS protocol versions that may be otherwise enabled for better interoperability. 
+	///    - useStrongCrypto (boolean): Disable known weak cryptographic algorithms, cipher suites, and
+	///      SSL/TLS protocol versions that may be otherwise enabled for better interoperability.
 	///      Defaults to true.
 	///    - privateKeyPassphraseHandler.name (string): The name of the class (subclass of PrivateKeyPassphraseHandler)
 	///      used for obtaining the passphrase for accessing the private key.
 	///    - privateKeyPassphraseHandler.options.password (string): The password to be used by KeyFileHandler.
 	///    - invalidCertificateHandler.name: The name of the class (subclass of CertificateHandler)
 	///      used for confirming invalid certificates.
-	///    - requireTLSv1 (boolean): Require a TLSv1 connection. 
+	///    - requireTLSv1 (boolean): Require a TLSv1 connection.
 	///    - requireTLSv1_1 (boolean): Require a TLSv1.1 connection. Not supported on Windows Embedded Compact.
 	///    - requireTLSv1_2 (boolean): Require a TLSv1.2 connection. Not supported on Windows Embedded Compact.
 {
@@ -149,7 +149,7 @@ public:
 		/// pCertificateHandler can be 0. However, in this case, event delegates
 		/// must be registered with the ServerVerificationError event.
 		///
-		/// Note: Always create the handlers (or register the corresponding event delegates) before creating 
+		/// Note: Always create the handlers (or register the corresponding event delegates) before creating
 		/// the Context.
 		///
 		/// Valid initialization code would be:
@@ -164,7 +164,7 @@ public:
 		/// pCertificateHandler can be 0. However, in this case, event delegates
 		/// must be registered with the ClientVerificationError event.
 		///
-		/// Note: Always create the handlers (or register the corresponding event delegates) before creating 
+		/// Note: Always create the handlers (or register the corresponding event delegates) before creating
 		/// the Context, as during creation of the Context the passphrase for the private key might be needed.
 		///
 		/// Valid initialization code would be:
@@ -173,13 +173,13 @@ public:
 		///     SSLManager::instance().initializeClient(pInvalidCertHandler, pContext);
 
 	Context::Ptr defaultServerContext();
-		/// Returns the default Context used by the server. 
+		/// Returns the default Context used by the server.
 		///
 		/// Unless initializeServer() has been called, the first call to this method initializes the default Context
 		/// from the application configuration.
 
 	Context::Ptr defaultClientContext();
-		/// Returns the default Context used by the client. 
+		/// Returns the default Context used by the client.
 		///
 		/// Unless initializeClient() has been called, the first call to this method initializes the default Context
 		/// from the application configuration.
@@ -201,11 +201,11 @@ public:
 		/// If none is set, it will try to auto-initialize one from an application configuration.
 
 	PrivateKeyFactoryMgr& privateKeyFactoryMgr();
-		/// Returns the private key factory manager which stores the 
+		/// Returns the private key factory manager which stores the
 		/// factories for the different registered passphrase handlers for private keys.
 
 	CertificateHandlerFactoryMgr& certificateHandlerFactoryMgr();
-		/// Returns the CertificateHandlerFactoryMgr which stores the 
+		/// Returns the CertificateHandlerFactoryMgr which stores the
 		/// factories for the different registered certificate handlers.
 
 	void shutdown();
diff --git a/NetSSL_Win/include/Poco/Net/SecureServerSocket.h b/NetSSL_Win/include/Poco/Net/SecureServerSocket.h
index 6e54a383a..0ededfa64 100644
--- a/NetSSL_Win/include/Poco/Net/SecureServerSocket.h
+++ b/NetSSL_Win/include/Poco/Net/SecureServerSocket.h
@@ -91,7 +91,7 @@ public:
 		///
 		/// Releases the socket's SocketImpl and
 		/// attaches the SocketImpl from the other socket and
-		/// increments the reference count of the SocketImpl.	
+		/// increments the reference count of the SocketImpl.
 
 	StreamSocket acceptConnection(SocketAddress& clientAddr);
 		/// Get the next completed connection from the
diff --git a/NetSSL_Win/include/Poco/Net/SecureStreamSocket.h b/NetSSL_Win/include/Poco/Net/SecureStreamSocket.h
index be9dfdde5..902c42d65 100644
--- a/NetSSL_Win/include/Poco/Net/SecureStreamSocket.h
+++ b/NetSSL_Win/include/Poco/Net/SecureStreamSocket.h
@@ -34,7 +34,7 @@ class NetSSL_Win_API SecureStreamSocket: public StreamSocket
 	///
 	/// A few notes about nonblocking IO:
 	/// sendBytes() and receiveBytes() can return a
-	/// negative value when using a nonblocking socket, which means 
+	/// negative value when using a nonblocking socket, which means
 	/// a SSL handshake is currently in progress and more data
 	/// needs to be read or written for the handshake to continue.
 	/// If sendBytes() or receiveBytes() return ERR_SSL_WANT_WRITE,
@@ -43,7 +43,7 @@ class NetSSL_Win_API SecureStreamSocket: public StreamSocket
 	/// ERR_SSL_WANT_READ is returned, receiveBytes() must be called
 	/// as soon as data is available for reading (indicated by select()).
 	///
-	/// The SSL handshake is delayed until the first sendBytes() or 
+	/// The SSL handshake is delayed until the first sendBytes() or
 	/// receiveBytes() operation is performed on the socket. No automatic
 	/// post connection check (checking the peer certificate for a valid
 	/// hostname) is performed when using nonblocking I/O. To manually
@@ -56,7 +56,7 @@ public:
 		ERR_SSL_WANT_READ  = -1,
 		ERR_SSL_WANT_WRITE = -2
 	};
-	
+
 	SecureStreamSocket();
 		/// Creates an unconnected secure stream socket
 		/// using the default client SSL context.
@@ -83,17 +83,17 @@ public:
 		/// agrees to reuse the session).
 
 	explicit SecureStreamSocket(const SocketAddress& address);
-		/// Creates a secure stream socket using the default 
+		/// Creates a secure stream socket using the default
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 
 	SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext);
-		/// Creates a secure stream socket using the given 
+		/// Creates a secure stream socket using the given
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 
 	SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext, Session::Ptr pSession);
-		/// Creates a secure stream socket using the given 
+		/// Creates a secure stream socket using the given
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 		///
@@ -102,21 +102,21 @@ public:
 		/// agrees to reuse the session).
 
 	SecureStreamSocket(const SocketAddress& address, const std::string& hostName);
-		/// Creates a secure stream socket using the default 
+		/// Creates a secure stream socket using the default
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 		///
 		/// The given host name is used for certificate verification.
 
 	SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext);
-		/// Creates a secure stream socket using the given 
+		/// Creates a secure stream socket using the given
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 		///
 		/// The given host name is used for certificate verification.
 
 	SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession);
-		/// Creates a secure stream socket using the given 
+		/// Creates a secure stream socket using the given
 		/// client SSL context and connects it to
 		/// the socket specified by address.
 		///
@@ -140,8 +140,8 @@ public:
 		///
 		/// Releases the socket's SocketImpl and
 		/// attaches the SocketImpl from the other socket and
-		/// increments the reference count of the SocketImpl.	
-	
+		/// increments the reference count of the SocketImpl.
+
 	bool havePeerCertificate() const;
 		/// Returns true iff the peer has presented a
 		/// certificate.
@@ -151,10 +151,10 @@ public:
 		///
 		/// Throws a SSLException if the peer did not
 		/// present a certificate.
-		
+
 	void setPeerHostName(const std::string& hostName);
 		/// Sets the peer's host name used for certificate validation.
-		
+
 	const std::string& getPeerHostName() const;
 		/// Returns the peer's host name used for certificate validation.
 
@@ -198,15 +198,15 @@ public:
 
 	Context::Ptr context() const;
 		/// Returns the SSL context used by this socket.
-		
+
 	void setLazyHandshake(bool flag = true);
 		/// Enable lazy SSL handshake. If enabled, the SSL handshake
 		/// will be performed the first time date is sent or
 		/// received over the connection.
-		
+
 	bool getLazyHandshake() const;
 		/// Returns true if setLazyHandshake(true) has been called.
-		
+
 	void verifyPeerCertificate();
 		/// Performs post-connect (or post-accept) peer certificate validation,
 		/// using the peer host name set with setPeerHostName(), or the peer's
@@ -221,7 +221,7 @@ public:
 		///
 		/// Should only be used for non-blocking connections, after the
 		/// initial SSL handshake has been performed (see completeHandshake()).
-		
+
 	int completeHandshake();
 		/// Completes the SSL handshake.
 		///
@@ -240,7 +240,7 @@ public:
 		/// is enabled).
 		///
 		/// If no connection is established, returns null.
-		
+
 	void useSession(Session::Ptr pSession);
 		/// Sets the SSL session to use for the next
 		/// connection. Setting a previously saved Session
@@ -250,15 +250,15 @@ public:
 		/// can be given.
 		///
 		/// Must be called before connect() to be effective.
-		
+
 	bool sessionWasReused();
 		/// Returns true iff a reused session was negotiated during
 		/// the handshake.
-		
+
 	void abort();
 		/// Aborts the SSL connection by closing the underlying
 		/// TCP connection. No orderly SSL shutdown is performed.
-		
+
 protected:
 	SecureStreamSocket(SocketImpl* pImpl);
 
diff --git a/NetSSL_Win/include/Poco/Net/SecureStreamSocketImpl.h b/NetSSL_Win/include/Poco/Net/SecureStreamSocketImpl.h
index 01b346254..96ef86e41 100644
--- a/NetSSL_Win/include/Poco/Net/SecureStreamSocketImpl.h
+++ b/NetSSL_Win/include/Poco/Net/SecureStreamSocketImpl.h
@@ -46,7 +46,7 @@ public:
 		/// Throws a Poco::InvalidAccessException.
 
 	void connect(const SocketAddress& address);
-		/// Initializes the socket and establishes a connection to 
+		/// Initializes the socket and establishes a connection to
 		/// the TCP server at the given address.
 		///
 		/// Can also be used for UDP sockets. In this case, no
@@ -54,19 +54,19 @@ public:
 		/// packets are restricted to the specified address.
 
 	void connect(const SocketAddress& address, const Poco::Timespan& timeout);
-		/// Initializes the socket, sets the socket timeout and 
+		/// Initializes the socket, sets the socket timeout and
 		/// establishes a connection to the TCP server at the given address.
 
 	void connectNB(const SocketAddress& address);
-		/// Initializes the socket and establishes a connection to 
+		/// Initializes the socket and establishes a connection to
 		/// the TCP server at the given address. Prior to opening the
 		/// connection the socket is set to nonblocking mode.
-		
+
 	void bind(const SocketAddress& address, bool reuseAddress = false);
 		/// Not supported by a SecureStreamSocket.
 		///
 		/// Throws a Poco::InvalidAccessException.
-		
+
 	void listen(int backlog = 64);
 		/// Not supported by a SecureStreamSocket.
 		///
@@ -74,30 +74,30 @@ public:
 
 	void close();
 		/// Close the socket.
-	
+
 	int sendBytes(const void* buffer, int length, int flags = 0);
 		/// Sends the contents of the given buffer through
 		/// the socket. Any specified flags are ignored.
 		///
 		/// Returns the number of bytes sent, which may be
 		/// less than the number of bytes specified.
-	
+
 	int receiveBytes(void* buffer, int length, int flags = 0);
 		/// Receives data from the socket and stores it
 		/// in buffer. Up to length bytes are received.
 		///
 		/// Returns the number of bytes received.
-	
+
 	int sendTo(const void* buffer, int length, const SocketAddress& address, int flags = 0);
 		/// Not supported by a SecureStreamSocket.
 		///
 		/// Throws a Poco::InvalidAccessException.
-	
+
 	int receiveFrom(void* buffer, int length, SocketAddress& address, int flags = 0);
 		/// Not supported by a SecureStreamSocket.
 		///
 		/// Throws a Poco::InvalidAccessException.
-	
+
 	void sendUrgent(unsigned char data);
 		/// Not supported by a SecureStreamSocket.
 		///
@@ -116,27 +116,27 @@ public:
 		///
 		/// Since SSL does not support a half shutdown, this does
 		/// nothing.
-		
+
 	void shutdownSend();
 		/// Shuts down the receiving part of the socket connection.
 		///
 		/// Since SSL does not support a half shutdown, this does
 		/// nothing.
-		
+
 	void shutdown();
 		/// Shuts down the SSL connection.
-		
+
 	void abort();
 		/// Aborts the connection by closing the underlying
 		/// TCP connection. No orderly SSL shutdown is performed.
-		
+
 	bool secure() const;
 		/// Returns true iff the socket's connection is secure
 		/// (using SSL or TLS).
 
 	void setPeerHostName(const std::string& hostName);
 		/// Sets the peer host name for certificate validation purposes.
-		
+
 	const std::string& getPeerHostName() const;
 		/// Returns the peer host name.
 
@@ -149,7 +149,7 @@ public:
 		///
 		/// Throws a SSLException if the peer did not
 		/// present a certificate.
-		
+
 	Context::Ptr context() const;
 		/// Returns the SSL context used by this socket.
 
@@ -157,7 +157,7 @@ public:
 		/// Enable lazy SSL handshake. If enabled, the SSL handshake
 		/// will be performed the first time date is sent or
 		/// received over the connection.
-		
+
 	bool getLazyHandshake() const;
 		/// Returns true if setLazyHandshake(true) has been called.
 
@@ -174,7 +174,7 @@ public:
 		///
 		/// If the SSL connection was the result of an accept(),
 		/// the server-side handshake is completed, otherwise
-		/// a client-side handshake is performed. 
+		/// a client-side handshake is performed.
 
 	Session::Ptr currentSession();
 		/// Returns the SSL session of the current connection,
@@ -182,7 +182,7 @@ public:
 		/// is enabled).
 		///
 		/// If no connection is established, returns null.
-		
+
 	void useSession(Session::Ptr pSession);
 		/// Sets the SSL session to use for the next
 		/// connection. Setting a previously saved Session
@@ -192,18 +192,18 @@ public:
 		/// can be given.
 		///
 		/// Must be called before connect() to be effective.
-		
+
 	bool sessionWasReused();
 		/// Returns true iff a reused session was negotiated during
 		/// the handshake.
-		
+
 protected:
 	void acceptSSL();
 		/// Performs a SSL server-side handshake.
-	
+
 	void connectSSL();
 		/// Performs a SSL client-side handshake on an already connected TCP socket.
-	
+
 	~SecureStreamSocketImpl();
 		/// Destroys the SecureStreamSocketImpl.
 
@@ -251,13 +251,13 @@ inline Session::Ptr SecureStreamSocketImpl::currentSession()
 	return Session::Ptr();//_impl.currentSession();
 }
 
-	
+
 inline void SecureStreamSocketImpl::useSession(Session::Ptr pSession)
 {
 	//_impl.useSession(pSession);
 }
 
-	
+
 inline bool SecureStreamSocketImpl::sessionWasReused()
 {
 	return false;//_impl.sessionWasReused();
diff --git a/NetSSL_Win/include/Poco/Net/Session.h b/NetSSL_Win/include/Poco/Net/Session.h
index 3582fc1d9..e96ba3de3 100644
--- a/NetSSL_Win/include/Poco/Net/Session.h
+++ b/NetSSL_Win/include/Poco/Net/Session.h
@@ -38,11 +38,11 @@ class NetSSL_Win_API Session: public Poco::RefCountedObject
 public:
 	using Ptr = Poco::AutoPtr<Session>;
 
-protected:	
+protected:
 	Session();
 		/// Creates a new Session object, using the given
-		/// SSL_SESSION object. 
-		/// 
+		/// SSL_SESSION object.
+		///
 		/// The SSL_SESSION's reference count is not changed.
 
 	~Session();
diff --git a/NetSSL_Win/include/Poco/Net/X509Certificate.h b/NetSSL_Win/include/Poco/Net/X509Certificate.h
index 2258790c2..e5efd8281 100644
--- a/NetSSL_Win/include/Poco/Net/X509Certificate.h
+++ b/NetSSL_Win/include/Poco/Net/X509Certificate.h
@@ -44,9 +44,9 @@ public:
 		NID_LOCALITY_NAME,
 		NID_STATE_OR_PROVINCE,
 		NID_ORGANIZATION_NAME,
-		NID_ORGANIZATION_UNIT_NAME	
+		NID_ORGANIZATION_UNIT_NAME
 	};
-	
+
 	explicit X509Certificate(const std::string& certPath);
 		/// Creates the X509Certificate object by reading
 		/// a certificate in PEM or DER format from a file.
@@ -64,13 +64,13 @@ public:
 
 	explicit X509Certificate(PCCERT_CONTEXT pCert);
 		/// Creates the X509Certificate from an existing
-		/// WinCrypt certificate. Ownership is taken of 
+		/// WinCrypt certificate. Ownership is taken of
 		/// the certificate.
 
 	X509Certificate(PCCERT_CONTEXT pCert, bool shared);
 		/// Creates the X509Certificate from an existing
-		/// WinCrypt certificate. Ownership is taken of 
-		/// the certificate. If shared is true, the 
+		/// WinCrypt certificate. Ownership is taken of
+		/// the certificate. If shared is true, the
 		/// certificate's reference count is incremented.
 
 	X509Certificate(const X509Certificate& cert);
@@ -85,20 +85,20 @@ public:
 	X509Certificate& operator = (X509Certificate&& cert) noexcept;
 		/// Move-assigns a certificate.
  
-	void swap(X509Certificate& cert);
+	void swap(X509Certificate& cert) noexcept;
 		/// Exchanges the certificate with another one.
 
 	~X509Certificate();
 		/// Destroys the X509Certificate.
 
 	const std::string& issuerName() const;
-		/// Returns the certificate issuer's distinguished name. 
-		
+		/// Returns the certificate issuer's distinguished name.
+
 	std::string issuerName(NID nid) const;
 		/// Extracts the information specified by the given
 		/// NID (name identifier) from the certificate issuer's
 		/// distinguished name.
-		
+
 	const std::string& subjectName() const;
 		/// Returns the certificate subject's distinguished name.
 
@@ -106,21 +106,21 @@ public:
 		/// Extracts the information specified by the given
 		/// NID (name identifier) from the certificate subject's
 		/// distinguished name.
-		
+
 	std::string commonName() const;
 		/// Returns the common name stored in the certificate
 		/// subject's distinguished name.
-		
+
 	void extractNames(std::string& commonName, std::set<std::string>& domainNames) const;
 		/// Extracts the common name and the alias domain names from the
 		/// certificate.
-		
+
 	Poco::DateTime validFrom() const;
 		/// Returns the date and time the certificate is valid from.
-		
+
 	Poco::DateTime expiresOn() const;
 		/// Returns the date and time the certificate expires.
-		
+
 	bool issuedBy(const X509Certificate& issuerCertificate) const;
 		/// Checks whether the certificate has been issued by
 		/// the issuer given by issuerCertificate. This can be
@@ -138,9 +138,9 @@ public:
 		/// For this check to be successful, the certificate must contain
 		/// a domain name that matches the domain name
 		/// of the host.
-		/// 
+		///
 		/// Returns true if verification succeeded, or false otherwise.
-		
+
 	static bool verify(const Poco::Net::X509Certificate& cert, const std::string& hostName);
 		/// Verifies the validity of the certificate against the host name.
 		///
@@ -156,7 +156,7 @@ public:
 protected:
 	void init();
 		/// Extracts issuer and subject name from the certificate.
-	
+
 	static void* nid2oid(NID nid);
 		/// Returns the OID for the given NID.
 
diff --git a/NetSSL_Win/samples/HTTPSTimeServer/HTTPSTimeServer.progen b/NetSSL_Win/samples/HTTPSTimeServer/HTTPSTimeServer.progen
index b9523f1e1..9225aa0c3 100644
--- a/NetSSL_Win/samples/HTTPSTimeServer/HTTPSTimeServer.progen
+++ b/NetSSL_Win/samples/HTTPSTimeServer/HTTPSTimeServer.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_Win\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_Win/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp b/NetSSL_Win/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp
index 290d9e162..e3ef32b49 100644
--- a/NetSSL_Win/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp
+++ b/NetSSL_Win/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp
@@ -63,11 +63,11 @@ class TimeRequestHandler: public HTTPRequestHandler
 	/// Return a HTML document with the current date and time.
 {
 public:
-	TimeRequestHandler(const std::string& format): 
+	TimeRequestHandler(const std::string& format):
 		_format(format)
 	{
 	}
-	
+
 	void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
 	{
 		Application& app = Application::instance();
@@ -83,7 +83,7 @@ public:
 		{
 			app.logger().information("No client certificate available.");
 		}
-		
+
 		Timestamp now;
 		std::string dt(DateTimeFormatter::format(now, _format));
 
@@ -97,7 +97,7 @@ public:
 		ostr << dt;
 		ostr << "</p></body></html>";
 	}
-	
+
 private:
 	std::string _format;
 };
@@ -118,7 +118,7 @@ public:
 		else
 			return 0;
 	}
-	
+
 private:
 	std::string _format;
 };
@@ -148,7 +148,7 @@ public:
 	{
 		Poco::Net::initializeSSL();
 	}
-	
+
 	~HTTPSTimeServer()
 	{
 		Poco::Net::uninitializeSSL();
@@ -160,7 +160,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		ServerApplication::initialize(self);
 	}
-		
+
 	void uninitialize()
 	{
 		ServerApplication::uninitialize();
@@ -169,7 +169,7 @@ protected:
 	void defineOptions(OptionSet& options)
 	{
 		ServerApplication::defineOptions(options);
-		
+
 		options.addOption(
 			Option("help", "h", "display help information on command line arguments")
 				.required(false)
@@ -204,7 +204,7 @@ protected:
 			// get parameters from configuration file
 			unsigned short port = (unsigned short) config().getInt("HTTPSTimeServer.port", 9443);
 			std::string format(config().getString("HTTPSTimeServer.format", DateTimeFormat::SORTABLE_FORMAT));
-			
+
 			// set-up a server socket
 			SecureServerSocket svs(port);
 			// set-up a HTTPServer instance
@@ -218,7 +218,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/NetSSL_Win/samples/Mail/Mail.progen b/NetSSL_Win/samples/Mail/Mail.progen
index b9523f1e1..9225aa0c3 100644
--- a/NetSSL_Win/samples/Mail/Mail.progen
+++ b/NetSSL_Win/samples/Mail/Mail.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_Win\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_Win/samples/Mail/src/Mail.cpp b/NetSSL_Win/samples/Mail/src/Mail.cpp
index aeb3c3024..f7e3d60fc 100644
--- a/NetSSL_Win/samples/Mail/src/Mail.cpp
+++ b/NetSSL_Win/samples/Mail/src/Mail.cpp
@@ -44,7 +44,7 @@ public:
 	{
 		Poco::Net::initializeSSL();
 	}
-	
+
 	~SSLInitializer()
 	{
 		Poco::Net::uninitializeSSL();
@@ -70,16 +70,16 @@ int main(int argc, char** argv)
 		std::cerr << "       using a secure connection to the SMTP server at <mailhost>." << std::endl;
 		return 1;
 	}
-	
+
 	std::string mailhost(argv[1]);
 	std::string sender(argv[2]);
 	std::string recipient(argv[3]);
 	std::string username(argc >= 5 ? argv[4] : "");
 	std::string password(argc >= 6 ? argv[5] : "");
-	
+
 	try
 	{
-		// Note: we must create the passphrase handler prior Context 
+		// Note: we must create the passphrase handler prior Context
 		SharedPtr<InvalidCertificateHandler> pCert = new ConsoleCertificateHandler(false); // ask the user via console
 		Context::Ptr pContext = new Context(Context::CLIENT_USE, "");
 		SSLManager::instance().initializeClient(0, pCert, pContext);
@@ -96,7 +96,7 @@ int main(int argc, char** argv)
 		std::string logo(reinterpret_cast<const char*>(PocoLogo), sizeof(PocoLogo));
 		message.addContent(new StringPartSource(content));
 		message.addAttachment("logo", new StringPartSource(logo, "image/gif"));
-		
+
 		SecureSMTPClientSession session(mailhost);
 		session.login();
 		session.startTLS(pContext);
diff --git a/NetSSL_Win/samples/Mail/src/PocoLogo.hpp b/NetSSL_Win/samples/Mail/src/PocoLogo.hpp
index a1b39a593..31e2b7fa8 100644
--- a/NetSSL_Win/samples/Mail/src/PocoLogo.hpp
+++ b/NetSSL_Win/samples/Mail/src/PocoLogo.hpp
@@ -1,134 +1,134 @@
 // The C++ Portable Components logo in GIF format
 
-0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0xa0, 0x00, 0x85, 0x00, 0xa2, 0x00, 0x00, 0xd1, 0xdd, 0xe4, 
-0x45, 0x9b, 0xca, 0x41, 0x55, 0x61, 0x8a, 0x96, 0x9e, 0xa2, 0xbc, 0xcc, 0x00, 0x1b, 0x2c, 0x00, 
-0x75, 0xb6, 0xff, 0xff, 0xff, 0x21, 0xf9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 
-0x00, 0x00, 0xa0, 0x00, 0x85, 0x00, 0x00, 0x03, 0xff, 0x78, 0xba, 0xdc, 0xfe, 0x30, 0xca, 0x49, 
-0xab, 0xbd, 0x38, 0xeb, 0xcd, 0xbb, 0xff, 0x60, 0x28, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 
-0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x2b, 0x40, 0xdc, 0x78, 0xae, 0xef, 0x04, 0xe0, 0xda, 0xbc, 
-0xe0, 0x0e, 0xe0, 0xeb, 0x00, 0x06, 0xc5, 0xc5, 0x6d, 0x72, 0x4b, 0x76, 0x08, 0x01, 0x83, 0x74, 
-0x4a, 0xad, 0x5a, 0xab, 0x01, 0x27, 0x09, 0x10, 0xbd, 0x7a, 0xbf, 0x86, 0x40, 0x6f, 0x33, 0x28, 
-0x10, 0x1a, 0x85, 0x82, 0x44, 0x90, 0x2e, 0x68, 0x2f, 0xb6, 0x2e, 0x78, 0x7e, 0x15, 0x8f, 0xe2, 
-0xf4, 0xbc, 0xd5, 0x8e, 0x29, 0x9f, 0x09, 0x48, 0x07, 0x69, 0x11, 0x65, 0x02, 0x6c, 0x03, 0x1b, 
-0x72, 0x7a, 0x8b, 0x54, 0x67, 0x1f, 0x8a, 0x8c, 0x8c, 0x59, 0x17, 0x7e, 0x82, 0x66, 0x96, 0x11, 
-0x69, 0x3e, 0x05, 0x02, 0x19, 0x5c, 0x91, 0xa0, 0x53, 0x8e, 0x1c, 0x90, 0xa1, 0x8b, 0xa3, 0x13, 
-0x95, 0x69, 0x67, 0x83, 0x0c, 0x36, 0x0a, 0x9a, 0x82, 0x9d, 0x70, 0xa6, 0xb5, 0x93, 0x19, 0x04, 
-0xb5, 0xb6, 0x15, 0xaa, 0x97, 0xad, 0x0b, 0x6c, 0xac, 0x6e, 0xb2, 0x17, 0xb9, 0xba, 0xb5, 0x6f, 
-0x12, 0xc6, 0xc7, 0xa6, 0xc9, 0x0c, 0xbd, 0x3d, 0xbf, 0x0a, 0xc1, 0x96, 0x3e, 0x44, 0x16, 0xcb, 
-0xcc, 0xa0, 0x01, 0xb4, 0xda, 0xa6, 0xdc, 0x12, 0x65, 0x9c, 0x69, 0x86, 0x9c, 0x0d, 0xd4, 0xb1, 
-0xdd, 0xde, 0xa1, 0xe0, 0x4c, 0xeb, 0xbb, 0xe1, 0x6d, 0x6d, 0x02, 0x5a, 0xe2, 0x6c, 0xb3, 0x17, 
-0xa5, 0xef, 0x7a, 0xed, 0x11, 0xfb, 0xb5, 0xa8, 0x1e, 0x10, 0x19, 0xe8, 0x8c, 0x0d, 0x27, 0x67, 
-0x10, 0xb2, 0xfd, 0x63, 0x84, 0xf0, 0x80, 0xc2, 0x85, 0x8b, 0x1a, 0xc2, 0x09, 0x48, 0x01, 0x00, 
-0xc4, 0x50, 0x14, 0x17, 0x58, 0xbc, 0xb8, 0x0d, 0xff, 0x83, 0x21, 0x11, 0xfa, 0xbc, 0x88, 0x21, 
-0x48, 0xb2, 0x24, 0x91, 0x1b, 0x21, 0xaf, 0x38, 0x7b, 0xf8, 0xa5, 0x87, 0xc9, 0x97, 0x04, 0xa1, 
-0x44, 0xbc, 0x20, 0x4d, 0xe3, 0x90, 0x09, 0xfc, 0x3e, 0x7c, 0xa2, 0x93, 0xf1, 0x80, 0x9e, 0x9e, 
-0x18, 0x36, 0xf2, 0xa4, 0xa9, 0xa6, 0x81, 0x38, 0x79, 0x35, 0x1b, 0x08, 0x05, 0x23, 0xb1, 0x58, 
-0x9e, 0x07, 0x2c, 0xad, 0x34, 0x75, 0x3a, 0xa7, 0xdf, 0x84, 0x9a, 0xe2, 0x06, 0x68, 0xdd, 0x8a, 
-0x28, 0x42, 0x54, 0x2a, 0x53, 0xf3, 0x0d, 0x6d, 0x90, 0x72, 0x4a, 0x58, 0xaa, 0x4c, 0x2d, 0xd4, 
-0x3c, 0x94, 0xa1, 0xac, 0x01, 0xa0, 0x1d, 0xdc, 0x5a, 0xf5, 0x39, 0x07, 0x2e, 0x87, 0xa5, 0x5e, 
-0xec, 0x2a, 0x00, 0xb0, 0xf6, 0x12, 0x06, 0xb7, 0x67, 0xd5, 0x7d, 0x51, 0x5a, 0x15, 0xc5, 0x57, 
-0x29, 0x73, 0x01, 0x71, 0x1d, 0x70, 0xef, 0x9c, 0xdf, 0x0b, 0x85, 0x4f, 0xb8, 0x25, 0x0c, 0x66, 
-0xae, 0x08, 0xbc, 0x7b, 0x1c, 0x1c, 0x45, 0x1a, 0x90, 0x9a, 0xe0, 0x3a, 0x28, 0x00, 0xbb, 0x8a, 
-0x2c, 0xb9, 0xb2, 0x03, 0x02, 0x86, 0x52, 0x0b, 0x08, 0xe4, 0x58, 0xef, 0x68, 0x30, 0xae, 0x13, 
-0xcd, 0x71, 0x82, 0xb9, 0x4a, 0x6c, 0xd9, 0x5f, 0x2c, 0x5b, 0xf0, 0x6c, 0xa1, 0x76, 0xa3, 0xd0, 
-0xb3, 0x5f, 0xb7, 0x4c, 0x51, 0x56, 0x77, 0x85, 0x57, 0x41, 0xeb, 0x02, 0x4f, 0xab, 0x51, 0xf9, 
-0x72, 0x91, 0x0f, 0xb2, 0xda, 0x0b, 0x0c, 0xc1, 0xb7, 0xa8, 0xe7, 0x5e, 0x28, 0x0f, 0xc7, 0x9e, 
-0xd9, 0x28, 0x39, 0xa4, 0xf8, 0x34, 0x1a, 0x94, 0x17, 0x5e, 0x7b, 0xde, 0x13, 0xd6, 0xa7, 0x98, 
-0xbf, 0x72, 0x5b, 0x43, 0x71, 0xcd, 0xbe, 0xcc, 0xf0, 0x2d, 0xcf, 0x17, 0x29, 0xb9, 0x08, 0xe9, 
-0xdf, 0x96, 0x36, 0x2d, 0xfc, 0x3c, 0x77, 0x2c, 0xff, 0xf0, 0x09, 0x23, 0x8c, 0x63, 0x02, 0xdc, 
-0x54, 0x9d, 0x73, 0x24, 0xb8, 0xa5, 0x5f, 0x7f, 0xec, 0x11, 0xc7, 0xdf, 0x33, 0xf1, 0x0d, 0xc8, 
-0x00, 0x6f, 0xc7, 0x21, 0x08, 0xd2, 0x53, 0xeb, 0x59, 0xd1, 0x5e, 0x5b, 0x0f, 0x2e, 0x00, 0x0d, 
-0x26, 0x13, 0x3e, 0x56, 0x21, 0x6c, 0x97, 0xc9, 0x44, 0xc7, 0x5c, 0xf9, 0x6d, 0xf8, 0x57, 0x87, 
-0x0a, 0xf8, 0x01, 0x80, 0x21, 0xd1, 0x14, 0x05, 0x8c, 0x88, 0x15, 0x39, 0xc7, 0x45, 0x00, 0x38, 
-0xe6, 0xa8, 0xe3, 0x8e, 0x3c, 0x46, 0x22, 0x90, 0x85, 0x25, 0xbc, 0xe7, 0x9d, 0x7d, 0x7d, 0xb5, 
-0x97, 0xa2, 0x02, 0x87, 0xbd, 0x93, 0xd1, 0x91, 0xff, 0x51, 0x31, 0xd7, 0x66, 0xe4, 0x11, 0x98, 
-0x1c, 0x89, 0x07, 0x28, 0xe8, 0x4d, 0x32, 0x4c, 0xee, 0x07, 0x9d, 0x52, 0x30, 0x35, 0x40, 0xc0, 
-0x3c, 0xa9, 0x99, 0x73, 0x20, 0x95, 0x56, 0x32, 0xd3, 0x53, 0x96, 0x26, 0x08, 0x79, 0x97, 0x6a, 
-0xe5, 0x94, 0xc7, 0xa0, 0x86, 0x0a, 0x94, 0xa9, 0x8b, 0x71, 0x68, 0x06, 0xc9, 0xa2, 0x87, 0x6c, 
-0x7e, 0xa4, 0x93, 0x73, 0x72, 0x9a, 0x02, 0x57, 0x9d, 0x09, 0xde, 0xf9, 0x22, 0x91, 0x32, 0x1a, 
-0xc1, 0x27, 0x47, 0xc6, 0xed, 0x05, 0x64, 0xa0, 0xb9, 0xc1, 0x47, 0xcf, 0x11, 0x05, 0x20, 0x51, 
-0x0f, 0x3d, 0xe7, 0x74, 0xf5, 0x23, 0x99, 0x17, 0x25, 0xaa, 0x28, 0x95, 0x5a, 0x82, 0xe6, 0x9d, 
-0x23, 0x65, 0x58, 0x1a, 0x62, 0x40, 0x49, 0x35, 0x87, 0xe9, 0x3f, 0xb7, 0x4c, 0x00, 0xe8, 0x08, 
-0x6a, 0x7a, 0xe8, 0x57, 0xa8, 0x0f, 0x50, 0x63, 0xc8, 0x26, 0x6e, 0x9a, 0xba, 0x5d, 0x9f, 0x3f, 
-0x7d, 0x06, 0x27, 0x0a, 0xa4, 0xb9, 0x0a, 0x6a, 0xa4, 0xb1, 0xc6, 0x47, 0x2b, 0x7e, 0x87, 0xae, 
-0x93, 0xea, 0x88, 0x8d, 0xa2, 0xd7, 0x6b, 0x8b, 0xff, 0xaf, 0x02, 0xeb, 0x00, 0x3a, 0xc3, 0x88, 
-0x79, 0xe9, 0x76, 0x37, 0xf2, 0x68, 0xed, 0xb5, 0x62, 0x8c, 0xa1, 0x41, 0x7e, 0x9a, 0x3e, 0xb1, 
-0xec, 0x01, 0x85, 0xf4, 0x10, 0xea, 0x35, 0xa3, 0x56, 0x43, 0xcc, 0x98, 0xdb, 0xd1, 0x60, 0xeb, 
-0x60, 0x27, 0x8c, 0xe5, 0x0a, 0xa1, 0xe5, 0x1d, 0x52, 0x9f, 0x0d, 0xd2, 0x3a, 0xb0, 0xea, 0x0c, 
-0xee, 0x8e, 0x90, 0xa4, 0x01, 0xc9, 0xa0, 0x66, 0x5f, 0x79, 0x50, 0xb6, 0x21, 0x6a, 0x86, 0xb6, 
-0xa9, 0x4b, 0x56, 0xbe, 0x20, 0xe4, 0x17, 0x86, 0x04, 0x26, 0x9d, 0x96, 0xe7, 0xc0, 0x04, 0xff, 
-0x66, 0xb0, 0x12, 0x79, 0x50, 0xe7, 0x55, 0x1e, 0x2a, 0xee, 0xc9, 0xe9, 0xc4, 0x74, 0x21, 0xbc, 
-0xc1, 0xbe, 0x52, 0x38, 0x73, 0x44, 0x9e, 0xb5, 0x7a, 0xb2, 0xa8, 0xba, 0x20, 0x23, 0x86, 0xed, 
-0xca, 0x38, 0x2e, 0xa2, 0x5b, 0x7d, 0xff, 0xda, 0xcb, 0x18, 0x9b, 0x10, 0xaf, 0xdb, 0x20, 0xc7, 
-0x0b, 0xe0, 0xca, 0x51, 0x4f, 0x85, 0x48, 0x34, 0x28, 0x91, 0xc4, 0x6e, 0xcc, 0x71, 0xca, 0x1c, 
-0x21, 0x46, 0x08, 0x8d, 0xd1, 0x71, 0x32, 0x80, 0x62, 0x5a, 0x01, 0x75, 0xaf, 0xba, 0x3a, 0xa3, 
-0x1a, 0x8f, 0x5e, 0x14, 0xd6, 0x28, 0x34, 0xc7, 0x0a, 0x17, 0xcd, 0xef, 0xd4, 0x14, 0x54, 0xad, 
-0xea, 0xc9, 0x13, 0x13, 0xbd, 0x90, 0xa6, 0x95, 0x4c, 0xe0, 0x35, 0xc3, 0x60, 0x4f, 0x9c, 0xf5, 
-0x42, 0x7a, 0x95, 0xbd, 0x06, 0xd2, 0x68, 0x5f, 0x8d, 0xb3, 0x43, 0x5a, 0xef, 0xca, 0x04, 0xa5, 
-0x66, 0xd7, 0x6b, 0x75, 0xba, 0x73, 0x33, 0x60, 0xa2, 0xd6, 0x7c, 0xe8, 0x4b, 0x0e, 0xcd, 0x41, 
-0xf3, 0xdd, 0xb7, 0xdf, 0x5a, 0xab, 0x38, 0xf3, 0x9f, 0xe3, 0xcd, 0x53, 0xb8, 0x7f, 0x87, 0xdb, 
-0x1b, 0x75, 0x1e, 0xc7, 0xee, 0x26, 0x4f, 0xc6, 0xff, 0x11, 0x94, 0x65, 0x31, 0x0d, 0x71, 0xb4, 
-0x6c, 0x0b, 0x8e, 0xda, 0xe2, 0xa2, 0xf4, 0x3d, 0x38, 0x44, 0x6e, 0xfa, 0x0c, 0x65, 0x37, 0x0e, 
-0x95, 0x6a, 0xac, 0x9d, 0xee, 0xfa, 0x07, 0xa9, 0x93, 0x03, 0x71, 0xe3, 0xe4, 0x6c, 0xfe, 0xfa, 
-0xed, 0xe0, 0xfa, 0xc5, 0x46, 0x32, 0xe1, 0xe2, 0xc0, 0x16, 0xee, 0xc0, 0x53, 0xa2, 0x7b, 0xa1, 
-0xe5, 0x6a, 0xa4, 0x77, 0xf0, 0xc8, 0x27, 0x4d, 0xa9, 0x56, 0x10, 0x54, 0x7d, 0xbc, 0x11, 0x4c, 
-0x2f, 0x26, 0xfd, 0xf4, 0xd4, 0x6b, 0x65, 0xbb, 0x40, 0xd1, 0x57, 0x4f, 0x7d, 0xe8, 0x1b, 0xfc, 
-0x0c, 0x5e, 0x6b, 0x68, 0x94, 0x3c, 0x11, 0xed, 0x84, 0x96, 0x6f, 0xfe, 0x7d, 0x1e, 0xd8, 0x40, 
-0xfe, 0xf9, 0xe5, 0xaf, 0x66, 0xfb, 0xc8, 0x79, 0x82, 0xcf, 0xc0, 0xf3, 0xbd, 0x05, 0xcc, 0xfe, 
-0xfd, 0x40, 0x77, 0x60, 0x3f, 0xfe, 0xe7, 0xb7, 0x5e, 0xc2, 0xef, 0x48, 0xa2, 0x9f, 0xaa, 0xd6, 
-0xc7, 0xbf, 0x02, 0x96, 0xaa, 0x22, 0x04, 0x34, 0xe0, 0xf9, 0xf0, 0x16, 0x94, 0x81, 0x24, 0x64, 
-0x70, 0xe5, 0x80, 0x1b, 0x13, 0x14, 0x48, 0x41, 0xa4, 0x6c, 0x2b, 0x81, 0x15, 0x34, 0x5f, 0xcd, 
-0x12, 0x42, 0xbb, 0x9a, 0xf9, 0x4b, 0x1e, 0x1b, 0x8c, 0x47, 0x06, 0x33, 0x28, 0xba, 0x11, 0x52, 
-0xd0, 0x35, 0x30, 0x43, 0xca, 0x06, 0x09, 0xb2, 0x01, 0x0c, 0x9a, 0xf0, 0x7c, 0x7d, 0x78, 0x61, 
-0x05, 0xc5, 0xe7, 0xaa, 0x47, 0x11, 0xa1, 0x10, 0x26, 0x70, 0xa1, 0x0c, 0xcb, 0x27, 0xbc, 0x1d, 
-0x52, 0x90, 0x86, 0xb9, 0x23, 0x15, 0xf1, 0x90, 0x64, 0x3d, 0x0d, 0xec, 0xcf, 0x87, 0x30, 0xac, 
-0xc0, 0x97, 0x90, 0x78, 0x42, 0xae, 0xcd, 0x6f, 0x88, 0xe3, 0x61, 0xa0, 0x12, 0x99, 0xa8, 0xc0, 
-0xe3, 0x50, 0xb1, 0x82, 0x08, 0x71, 0x1b, 0x2c, 0xff, 0x88, 0x17, 0xae, 0xc6, 0x5c, 0x40, 0x87, 
-0x57, 0x94, 0x07, 0x2f, 0xc2, 0xa8, 0x40, 0xf1, 0x69, 0xb1, 0x3e, 0xf2, 0x13, 0x20, 0x7c, 0xc8, 
-0x78, 0x3f, 0x20, 0x1e, 0x20, 0x85, 0x6c, 0xc4, 0xdf, 0x06, 0x7b, 0x77, 0x03, 0x2f, 0xce, 0xc8, 
-0x11, 0x7a, 0xaa, 0x08, 0xff, 0x0a, 0xe4, 0x12, 0x98, 0xf8, 0xb1, 0x4b, 0x5d, 0xc3, 0xdf, 0x6a, 
-0xfa, 0xf8, 0xc7, 0x98, 0x30, 0x86, 0x7f, 0x05, 0x21, 0x52, 0x67, 0x74, 0xe7, 0xc6, 0x69, 0xb4, 
-0xf1, 0x7a, 0x20, 0x58, 0x22, 0xfb, 0x42, 0xd8, 0x43, 0xf6, 0x01, 0x65, 0x66, 0x86, 0xf0, 0x9f, 
-0x23, 0x1d, 0x71, 0x40, 0xa5, 0x3c, 0xd2, 0x60, 0x3a, 0x94, 0xa2, 0x07, 0x3e, 0xa8, 0x41, 0x0f, 
-0xdc, 0x83, 0x08, 0xb3, 0x22, 0xd7, 0x03, 0x17, 0xa8, 0x36, 0xf6, 0x89, 0x12, 0x04, 0x2e, 0xa4, 
-0xa1, 0x2a, 0xa1, 0x02, 0x2f, 0x11, 0xb6, 0x0f, 0x6b, 0x96, 0x34, 0x81, 0x24, 0xcb, 0xd7, 0x2f, 
-0x81, 0x29, 0x83, 0x7c, 0x34, 0x3c, 0x62, 0x1a, 0x28, 0xe9, 0x82, 0x5d, 0x12, 0xa9, 0x91, 0x2d, 
-0x3c, 0x1f, 0x45, 0xea, 0x63, 0x10, 0x62, 0x66, 0xc0, 0x85, 0x90, 0x14, 0x81, 0x31, 0xed, 0xe3, 
-0x4c, 0x0e, 0x08, 0xd3, 0x59, 0x10, 0x42, 0x04, 0x1a, 0x47, 0x00, 0x4d, 0x8e, 0x5d, 0xb3, 0x9a, 
-0xdd, 0xeb, 0x5f, 0x80, 0x1c, 0xf9, 0x4b, 0xc2, 0x45, 0xc0, 0x85, 0x38, 0xfb, 0x66, 0x0a, 0x58, 
-0xf9, 0x29, 0x72, 0x0a, 0x64, 0x7d, 0x34, 0xc4, 0x20, 0x32, 0x57, 0xa0, 0x4e, 0x14, 0xb0, 0x13, 
-0x42, 0x78, 0x1c, 0xa2, 0x23, 0x0b, 0x54, 0x92, 0xb7, 0xdd, 0xd2, 0x9b, 0xe2, 0xb4, 0xa7, 0xf9, 
-0xdc, 0x04, 0xab, 0x03, 0xe4, 0x51, 0x7e, 0x5f, 0x1c, 0x68, 0x3a, 0x03, 0x7a, 0x82, 0x7b, 0x2a, 
-0x61, 0x98, 0xd2, 0x43, 0xa8, 0xe5, 0xfe, 0x39, 0xff, 0xb1, 0x7a, 0x36, 0x54, 0xa1, 0x6b, 0xb4, 
-0x8f, 0x44, 0x2b, 0x20, 0xcf, 0x85, 0x96, 0x52, 0xa0, 0x14, 0x55, 0x8a, 0xf4, 0x16, 0xb9, 0xa1, 
-0x8e, 0x02, 0xf4, 0xa3, 0x26, 0x80, 0x63, 0xcc, 0x38, 0x60, 0xc7, 0x89, 0xd6, 0xf2, 0xa4, 0xe5, 
-0x03, 0xe7, 0xb6, 0x1c, 0x5a, 0x42, 0x4e, 0xb0, 0xc9, 0x9f, 0x2f, 0xad, 0x28, 0x43, 0x4b, 0xa0, 
-0xd2, 0xef, 0xdd, 0x25, 0xa7, 0xc1, 0x0a, 0xa9, 0xba, 0x2c, 0xca, 0x53, 0x9a, 0x7a, 0xe4, 0x20, 
-0xfd, 0x3c, 0x27, 0x46, 0x75, 0x8a, 0xd2, 0xa2, 0x2e, 0x55, 0x03, 0x67, 0xc3, 0xe9, 0x31, 0x3d, 
-0x1a, 0x53, 0x14, 0xf4, 0x34, 0x4a, 0x2c, 0x95, 0xa0, 0x52, 0x85, 0x4a, 0x03, 0xa2, 0x6e, 0xc1, 
-0xa8, 0x46, 0xd9, 0xe0, 0x3d, 0x46, 0x2a, 0xd5, 0x95, 0x32, 0xb5, 0xaa, 0xe8, 0x01, 0xeb, 0x13, 
-0xab, 0xc3, 0xc3, 0xad, 0x02, 0x75, 0xa8, 0x3b, 0xfd, 0xea, 0x53, 0x95, 0xb2, 0xc4, 0x26, 0xd8, 
-0x8b, 0x64, 0xf1, 0x9c, 0x6b, 0x57, 0xe3, 0x7a, 0x07, 0xb5, 0x1a, 0x54, 0x85, 0x21, 0x30, 0xe9, 
-0x59, 0x09, 0x25, 0x53, 0x4f, 0xf8, 0xf5, 0x90, 0x91, 0xd2, 0x64, 0x56, 0xb9, 0x8a, 0x3a, 0xbe, 
-0x5e, 0xc6, 0xaf, 0x5b, 0xc4, 0x0f, 0x26, 0x07, 0x99, 0x37, 0xf3, 0x51, 0x95, 0xb0, 0x86, 0x81, 
-0x2c, 0xb8, 0x36, 0x38, 0xcd, 0x55, 0x94, 0xd5, 0x3e, 0xd1, 0x0c, 0x81, 0x57, 0x47, 0x30, 0xda, 
-0x84, 0xe2, 0x0d, 0x52, 0x79, 0x35, 0x5f, 0x68, 0x23, 0xa9, 0xd9, 0x0e, 0xb8, 0x90, 0x98, 0xb3, 
-0x2c, 0xde, 0x5e, 0xd4, 0x58, 0xda, 0x18, 0x74, 0x16, 0xab, 0x4e, 0x55, 0x6d, 0xde, 0x9a, 0x47, 
-0x23, 0xda, 0xb2, 0x6f, 0xb5, 0xe9, 0xfb, 0xad, 0x09, 0xae, 0xa9, 0x4f, 0x57, 0xec, 0x2e, 0x58, 
-0xa4, 0xa2, 0xe1, 0x6d, 0xc9, 0x03, 0xdc, 0x0e, 0xff, 0xb8, 0xb2, 0xb9, 0x0e, 0x71, 0x65, 0x59, 
-0x49, 0xfa, 0x2e, 0x59, 0xe2, 0x0f, 0xba, 0x46, 0xbc, 0x1f, 0x70, 0x89, 0xab, 0xd5, 0xbf, 0x0e, 
-0x6e, 0x91, 0x7c, 0xac, 0x23, 0x36, 0x79, 0x7b, 0xbf, 0xc2, 0x96, 0x60, 0xb9, 0xe4, 0xc1, 0x9c, 
-0x46, 0xb8, 0x3b, 0x8c, 0xab, 0x14, 0xf7, 0xaa, 0x76, 0x41, 0x2f, 0x35, 0xb5, 0x47, 0x5f, 0xfa, 
-0x4a, 0x04, 0x8c, 0x4a, 0xab, 0x2f, 0xf5, 0xf0, 0xab, 0x46, 0x60, 0x88, 0xef, 0x45, 0xe6, 0x4c, 
-0x45, 0x1c, 0xdb, 0xa8, 0xaa, 0x01, 0x17, 0x10, 0xbb, 0xcf, 0x34, 0xb0, 0x5e, 0x9f, 0xa5, 0xe0, 
-0x49, 0x86, 0xad, 0xc1, 0x6f, 0xa5, 0x25, 0x84, 0x23, 0xec, 0x37, 0x4d, 0x1e, 0xd4, 0x21, 0x16, 
-0x06, 0x27, 0x7f, 0xaf, 0xd8, 0x48, 0xf6, 0xb2, 0xb1, 0x21, 0x5a, 0x04, 0xd1, 0x1d, 0xd1, 0x50, 
-0xdc, 0xa0, 0x4e, 0x18, 0x7d, 0x81, 0x3c, 0xb1, 0x2f, 0x9d, 0xb8, 0x80, 0x22, 0x85, 0x2f, 0x86, 
-0x2a, 0x9e, 0xa7, 0x87, 0x99, 0xd8, 0xb6, 0xde, 0x12, 0xcf, 0x79, 0xf3, 0x74, 0xe4, 0x89, 0x73, 
-0xbc, 0xe1, 0x1d, 0xba, 0x26, 0xc4, 0x2e, 0x9e, 0x5f, 0x8e, 0x99, 0x35, 0xe1, 0x21, 0xcf, 0xf8, 
-0x85, 0xb1, 0x01, 0xf2, 0x8d, 0x7b, 0x3b, 0xe4, 0xbd, 0xf4, 0xd8, 0x84, 0x4d, 0xf6, 0x1e, 0x19, 
-0x0b, 0x4b, 0x47, 0x7f, 0xc5, 0x8b, 0x13, 0x39, 0x00, 0xe0, 0x05, 0x15, 0xdc, 0x64, 0x27, 0x87, 
-0x51, 0xb1, 0x05, 0x26, 0xd2, 0xc0, 0xe0, 0xab, 0x13, 0xc4, 0x4e, 0x79, 0x94, 0x66, 0x86, 0x32, 
-0x98, 0x8f, 0xd3, 0xb8, 0x02, 0xbd, 0x33, 0xbd, 0x77, 0x00, 0x82, 0x10, 0xe6, 0x4c, 0x67, 0xe0, 
-0x9e, 0x84, 0xce, 0x42, 0x70, 0x60, 0xf2, 0xf6, 0xcc, 0xe7, 0x3e, 0xfb, 0xf9, 0xcf, 0x80, 0x0e, 
+0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0xa0, 0x00, 0x85, 0x00, 0xa2, 0x00, 0x00, 0xd1, 0xdd, 0xe4,
+0x45, 0x9b, 0xca, 0x41, 0x55, 0x61, 0x8a, 0x96, 0x9e, 0xa2, 0xbc, 0xcc, 0x00, 0x1b, 0x2c, 0x00,
+0x75, 0xb6, 0xff, 0xff, 0xff, 0x21, 0xf9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00,
+0x00, 0x00, 0xa0, 0x00, 0x85, 0x00, 0x00, 0x03, 0xff, 0x78, 0xba, 0xdc, 0xfe, 0x30, 0xca, 0x49,
+0xab, 0xbd, 0x38, 0xeb, 0xcd, 0xbb, 0xff, 0x60, 0x28, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae,
+0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x2b, 0x40, 0xdc, 0x78, 0xae, 0xef, 0x04, 0xe0, 0xda, 0xbc,
+0xe0, 0x0e, 0xe0, 0xeb, 0x00, 0x06, 0xc5, 0xc5, 0x6d, 0x72, 0x4b, 0x76, 0x08, 0x01, 0x83, 0x74,
+0x4a, 0xad, 0x5a, 0xab, 0x01, 0x27, 0x09, 0x10, 0xbd, 0x7a, 0xbf, 0x86, 0x40, 0x6f, 0x33, 0x28,
+0x10, 0x1a, 0x85, 0x82, 0x44, 0x90, 0x2e, 0x68, 0x2f, 0xb6, 0x2e, 0x78, 0x7e, 0x15, 0x8f, 0xe2,
+0xf4, 0xbc, 0xd5, 0x8e, 0x29, 0x9f, 0x09, 0x48, 0x07, 0x69, 0x11, 0x65, 0x02, 0x6c, 0x03, 0x1b,
+0x72, 0x7a, 0x8b, 0x54, 0x67, 0x1f, 0x8a, 0x8c, 0x8c, 0x59, 0x17, 0x7e, 0x82, 0x66, 0x96, 0x11,
+0x69, 0x3e, 0x05, 0x02, 0x19, 0x5c, 0x91, 0xa0, 0x53, 0x8e, 0x1c, 0x90, 0xa1, 0x8b, 0xa3, 0x13,
+0x95, 0x69, 0x67, 0x83, 0x0c, 0x36, 0x0a, 0x9a, 0x82, 0x9d, 0x70, 0xa6, 0xb5, 0x93, 0x19, 0x04,
+0xb5, 0xb6, 0x15, 0xaa, 0x97, 0xad, 0x0b, 0x6c, 0xac, 0x6e, 0xb2, 0x17, 0xb9, 0xba, 0xb5, 0x6f,
+0x12, 0xc6, 0xc7, 0xa6, 0xc9, 0x0c, 0xbd, 0x3d, 0xbf, 0x0a, 0xc1, 0x96, 0x3e, 0x44, 0x16, 0xcb,
+0xcc, 0xa0, 0x01, 0xb4, 0xda, 0xa6, 0xdc, 0x12, 0x65, 0x9c, 0x69, 0x86, 0x9c, 0x0d, 0xd4, 0xb1,
+0xdd, 0xde, 0xa1, 0xe0, 0x4c, 0xeb, 0xbb, 0xe1, 0x6d, 0x6d, 0x02, 0x5a, 0xe2, 0x6c, 0xb3, 0x17,
+0xa5, 0xef, 0x7a, 0xed, 0x11, 0xfb, 0xb5, 0xa8, 0x1e, 0x10, 0x19, 0xe8, 0x8c, 0x0d, 0x27, 0x67,
+0x10, 0xb2, 0xfd, 0x63, 0x84, 0xf0, 0x80, 0xc2, 0x85, 0x8b, 0x1a, 0xc2, 0x09, 0x48, 0x01, 0x00,
+0xc4, 0x50, 0x14, 0x17, 0x58, 0xbc, 0xb8, 0x0d, 0xff, 0x83, 0x21, 0x11, 0xfa, 0xbc, 0x88, 0x21,
+0x48, 0xb2, 0x24, 0x91, 0x1b, 0x21, 0xaf, 0x38, 0x7b, 0xf8, 0xa5, 0x87, 0xc9, 0x97, 0x04, 0xa1,
+0x44, 0xbc, 0x20, 0x4d, 0xe3, 0x90, 0x09, 0xfc, 0x3e, 0x7c, 0xa2, 0x93, 0xf1, 0x80, 0x9e, 0x9e,
+0x18, 0x36, 0xf2, 0xa4, 0xa9, 0xa6, 0x81, 0x38, 0x79, 0x35, 0x1b, 0x08, 0x05, 0x23, 0xb1, 0x58,
+0x9e, 0x07, 0x2c, 0xad, 0x34, 0x75, 0x3a, 0xa7, 0xdf, 0x84, 0x9a, 0xe2, 0x06, 0x68, 0xdd, 0x8a,
+0x28, 0x42, 0x54, 0x2a, 0x53, 0xf3, 0x0d, 0x6d, 0x90, 0x72, 0x4a, 0x58, 0xaa, 0x4c, 0x2d, 0xd4,
+0x3c, 0x94, 0xa1, 0xac, 0x01, 0xa0, 0x1d, 0xdc, 0x5a, 0xf5, 0x39, 0x07, 0x2e, 0x87, 0xa5, 0x5e,
+0xec, 0x2a, 0x00, 0xb0, 0xf6, 0x12, 0x06, 0xb7, 0x67, 0xd5, 0x7d, 0x51, 0x5a, 0x15, 0xc5, 0x57,
+0x29, 0x73, 0x01, 0x71, 0x1d, 0x70, 0xef, 0x9c, 0xdf, 0x0b, 0x85, 0x4f, 0xb8, 0x25, 0x0c, 0x66,
+0xae, 0x08, 0xbc, 0x7b, 0x1c, 0x1c, 0x45, 0x1a, 0x90, 0x9a, 0xe0, 0x3a, 0x28, 0x00, 0xbb, 0x8a,
+0x2c, 0xb9, 0xb2, 0x03, 0x02, 0x86, 0x52, 0x0b, 0x08, 0xe4, 0x58, 0xef, 0x68, 0x30, 0xae, 0x13,
+0xcd, 0x71, 0x82, 0xb9, 0x4a, 0x6c, 0xd9, 0x5f, 0x2c, 0x5b, 0xf0, 0x6c, 0xa1, 0x76, 0xa3, 0xd0,
+0xb3, 0x5f, 0xb7, 0x4c, 0x51, 0x56, 0x77, 0x85, 0x57, 0x41, 0xeb, 0x02, 0x4f, 0xab, 0x51, 0xf9,
+0x72, 0x91, 0x0f, 0xb2, 0xda, 0x0b, 0x0c, 0xc1, 0xb7, 0xa8, 0xe7, 0x5e, 0x28, 0x0f, 0xc7, 0x9e,
+0xd9, 0x28, 0x39, 0xa4, 0xf8, 0x34, 0x1a, 0x94, 0x17, 0x5e, 0x7b, 0xde, 0x13, 0xd6, 0xa7, 0x98,
+0xbf, 0x72, 0x5b, 0x43, 0x71, 0xcd, 0xbe, 0xcc, 0xf0, 0x2d, 0xcf, 0x17, 0x29, 0xb9, 0x08, 0xe9,
+0xdf, 0x96, 0x36, 0x2d, 0xfc, 0x3c, 0x77, 0x2c, 0xff, 0xf0, 0x09, 0x23, 0x8c, 0x63, 0x02, 0xdc,
+0x54, 0x9d, 0x73, 0x24, 0xb8, 0xa5, 0x5f, 0x7f, 0xec, 0x11, 0xc7, 0xdf, 0x33, 0xf1, 0x0d, 0xc8,
+0x00, 0x6f, 0xc7, 0x21, 0x08, 0xd2, 0x53, 0xeb, 0x59, 0xd1, 0x5e, 0x5b, 0x0f, 0x2e, 0x00, 0x0d,
+0x26, 0x13, 0x3e, 0x56, 0x21, 0x6c, 0x97, 0xc9, 0x44, 0xc7, 0x5c, 0xf9, 0x6d, 0xf8, 0x57, 0x87,
+0x0a, 0xf8, 0x01, 0x80, 0x21, 0xd1, 0x14, 0x05, 0x8c, 0x88, 0x15, 0x39, 0xc7, 0x45, 0x00, 0x38,
+0xe6, 0xa8, 0xe3, 0x8e, 0x3c, 0x46, 0x22, 0x90, 0x85, 0x25, 0xbc, 0xe7, 0x9d, 0x7d, 0x7d, 0xb5,
+0x97, 0xa2, 0x02, 0x87, 0xbd, 0x93, 0xd1, 0x91, 0xff, 0x51, 0x31, 0xd7, 0x66, 0xe4, 0x11, 0x98,
+0x1c, 0x89, 0x07, 0x28, 0xe8, 0x4d, 0x32, 0x4c, 0xee, 0x07, 0x9d, 0x52, 0x30, 0x35, 0x40, 0xc0,
+0x3c, 0xa9, 0x99, 0x73, 0x20, 0x95, 0x56, 0x32, 0xd3, 0x53, 0x96, 0x26, 0x08, 0x79, 0x97, 0x6a,
+0xe5, 0x94, 0xc7, 0xa0, 0x86, 0x0a, 0x94, 0xa9, 0x8b, 0x71, 0x68, 0x06, 0xc9, 0xa2, 0x87, 0x6c,
+0x7e, 0xa4, 0x93, 0x73, 0x72, 0x9a, 0x02, 0x57, 0x9d, 0x09, 0xde, 0xf9, 0x22, 0x91, 0x32, 0x1a,
+0xc1, 0x27, 0x47, 0xc6, 0xed, 0x05, 0x64, 0xa0, 0xb9, 0xc1, 0x47, 0xcf, 0x11, 0x05, 0x20, 0x51,
+0x0f, 0x3d, 0xe7, 0x74, 0xf5, 0x23, 0x99, 0x17, 0x25, 0xaa, 0x28, 0x95, 0x5a, 0x82, 0xe6, 0x9d,
+0x23, 0x65, 0x58, 0x1a, 0x62, 0x40, 0x49, 0x35, 0x87, 0xe9, 0x3f, 0xb7, 0x4c, 0x00, 0xe8, 0x08,
+0x6a, 0x7a, 0xe8, 0x57, 0xa8, 0x0f, 0x50, 0x63, 0xc8, 0x26, 0x6e, 0x9a, 0xba, 0x5d, 0x9f, 0x3f,
+0x7d, 0x06, 0x27, 0x0a, 0xa4, 0xb9, 0x0a, 0x6a, 0xa4, 0xb1, 0xc6, 0x47, 0x2b, 0x7e, 0x87, 0xae,
+0x93, 0xea, 0x88, 0x8d, 0xa2, 0xd7, 0x6b, 0x8b, 0xff, 0xaf, 0x02, 0xeb, 0x00, 0x3a, 0xc3, 0x88,
+0x79, 0xe9, 0x76, 0x37, 0xf2, 0x68, 0xed, 0xb5, 0x62, 0x8c, 0xa1, 0x41, 0x7e, 0x9a, 0x3e, 0xb1,
+0xec, 0x01, 0x85, 0xf4, 0x10, 0xea, 0x35, 0xa3, 0x56, 0x43, 0xcc, 0x98, 0xdb, 0xd1, 0x60, 0xeb,
+0x60, 0x27, 0x8c, 0xe5, 0x0a, 0xa1, 0xe5, 0x1d, 0x52, 0x9f, 0x0d, 0xd2, 0x3a, 0xb0, 0xea, 0x0c,
+0xee, 0x8e, 0x90, 0xa4, 0x01, 0xc9, 0xa0, 0x66, 0x5f, 0x79, 0x50, 0xb6, 0x21, 0x6a, 0x86, 0xb6,
+0xa9, 0x4b, 0x56, 0xbe, 0x20, 0xe4, 0x17, 0x86, 0x04, 0x26, 0x9d, 0x96, 0xe7, 0xc0, 0x04, 0xff,
+0x66, 0xb0, 0x12, 0x79, 0x50, 0xe7, 0x55, 0x1e, 0x2a, 0xee, 0xc9, 0xe9, 0xc4, 0x74, 0x21, 0xbc,
+0xc1, 0xbe, 0x52, 0x38, 0x73, 0x44, 0x9e, 0xb5, 0x7a, 0xb2, 0xa8, 0xba, 0x20, 0x23, 0x86, 0xed,
+0xca, 0x38, 0x2e, 0xa2, 0x5b, 0x7d, 0xff, 0xda, 0xcb, 0x18, 0x9b, 0x10, 0xaf, 0xdb, 0x20, 0xc7,
+0x0b, 0xe0, 0xca, 0x51, 0x4f, 0x85, 0x48, 0x34, 0x28, 0x91, 0xc4, 0x6e, 0xcc, 0x71, 0xca, 0x1c,
+0x21, 0x46, 0x08, 0x8d, 0xd1, 0x71, 0x32, 0x80, 0x62, 0x5a, 0x01, 0x75, 0xaf, 0xba, 0x3a, 0xa3,
+0x1a, 0x8f, 0x5e, 0x14, 0xd6, 0x28, 0x34, 0xc7, 0x0a, 0x17, 0xcd, 0xef, 0xd4, 0x14, 0x54, 0xad,
+0xea, 0xc9, 0x13, 0x13, 0xbd, 0x90, 0xa6, 0x95, 0x4c, 0xe0, 0x35, 0xc3, 0x60, 0x4f, 0x9c, 0xf5,
+0x42, 0x7a, 0x95, 0xbd, 0x06, 0xd2, 0x68, 0x5f, 0x8d, 0xb3, 0x43, 0x5a, 0xef, 0xca, 0x04, 0xa5,
+0x66, 0xd7, 0x6b, 0x75, 0xba, 0x73, 0x33, 0x60, 0xa2, 0xd6, 0x7c, 0xe8, 0x4b, 0x0e, 0xcd, 0x41,
+0xf3, 0xdd, 0xb7, 0xdf, 0x5a, 0xab, 0x38, 0xf3, 0x9f, 0xe3, 0xcd, 0x53, 0xb8, 0x7f, 0x87, 0xdb,
+0x1b, 0x75, 0x1e, 0xc7, 0xee, 0x26, 0x4f, 0xc6, 0xff, 0x11, 0x94, 0x65, 0x31, 0x0d, 0x71, 0xb4,
+0x6c, 0x0b, 0x8e, 0xda, 0xe2, 0xa2, 0xf4, 0x3d, 0x38, 0x44, 0x6e, 0xfa, 0x0c, 0x65, 0x37, 0x0e,
+0x95, 0x6a, 0xac, 0x9d, 0xee, 0xfa, 0x07, 0xa9, 0x93, 0x03, 0x71, 0xe3, 0xe4, 0x6c, 0xfe, 0xfa,
+0xed, 0xe0, 0xfa, 0xc5, 0x46, 0x32, 0xe1, 0xe2, 0xc0, 0x16, 0xee, 0xc0, 0x53, 0xa2, 0x7b, 0xa1,
+0xe5, 0x6a, 0xa4, 0x77, 0xf0, 0xc8, 0x27, 0x4d, 0xa9, 0x56, 0x10, 0x54, 0x7d, 0xbc, 0x11, 0x4c,
+0x2f, 0x26, 0xfd, 0xf4, 0xd4, 0x6b, 0x65, 0xbb, 0x40, 0xd1, 0x57, 0x4f, 0x7d, 0xe8, 0x1b, 0xfc,
+0x0c, 0x5e, 0x6b, 0x68, 0x94, 0x3c, 0x11, 0xed, 0x84, 0x96, 0x6f, 0xfe, 0x7d, 0x1e, 0xd8, 0x40,
+0xfe, 0xf9, 0xe5, 0xaf, 0x66, 0xfb, 0xc8, 0x79, 0x82, 0xcf, 0xc0, 0xf3, 0xbd, 0x05, 0xcc, 0xfe,
+0xfd, 0x40, 0x77, 0x60, 0x3f, 0xfe, 0xe7, 0xb7, 0x5e, 0xc2, 0xef, 0x48, 0xa2, 0x9f, 0xaa, 0xd6,
+0xc7, 0xbf, 0x02, 0x96, 0xaa, 0x22, 0x04, 0x34, 0xe0, 0xf9, 0xf0, 0x16, 0x94, 0x81, 0x24, 0x64,
+0x70, 0xe5, 0x80, 0x1b, 0x13, 0x14, 0x48, 0x41, 0xa4, 0x6c, 0x2b, 0x81, 0x15, 0x34, 0x5f, 0xcd,
+0x12, 0x42, 0xbb, 0x9a, 0xf9, 0x4b, 0x1e, 0x1b, 0x8c, 0x47, 0x06, 0x33, 0x28, 0xba, 0x11, 0x52,
+0xd0, 0x35, 0x30, 0x43, 0xca, 0x06, 0x09, 0xb2, 0x01, 0x0c, 0x9a, 0xf0, 0x7c, 0x7d, 0x78, 0x61,
+0x05, 0xc5, 0xe7, 0xaa, 0x47, 0x11, 0xa1, 0x10, 0x26, 0x70, 0xa1, 0x0c, 0xcb, 0x27, 0xbc, 0x1d,
+0x52, 0x90, 0x86, 0xb9, 0x23, 0x15, 0xf1, 0x90, 0x64, 0x3d, 0x0d, 0xec, 0xcf, 0x87, 0x30, 0xac,
+0xc0, 0x97, 0x90, 0x78, 0x42, 0xae, 0xcd, 0x6f, 0x88, 0xe3, 0x61, 0xa0, 0x12, 0x99, 0xa8, 0xc0,
+0xe3, 0x50, 0xb1, 0x82, 0x08, 0x71, 0x1b, 0x2c, 0xff, 0x88, 0x17, 0xae, 0xc6, 0x5c, 0x40, 0x87,
+0x57, 0x94, 0x07, 0x2f, 0xc2, 0xa8, 0x40, 0xf1, 0x69, 0xb1, 0x3e, 0xf2, 0x13, 0x20, 0x7c, 0xc8,
+0x78, 0x3f, 0x20, 0x1e, 0x20, 0x85, 0x6c, 0xc4, 0xdf, 0x06, 0x7b, 0x77, 0x03, 0x2f, 0xce, 0xc8,
+0x11, 0x7a, 0xaa, 0x08, 0xff, 0x0a, 0xe4, 0x12, 0x98, 0xf8, 0xb1, 0x4b, 0x5d, 0xc3, 0xdf, 0x6a,
+0xfa, 0xf8, 0xc7, 0x98, 0x30, 0x86, 0x7f, 0x05, 0x21, 0x52, 0x67, 0x74, 0xe7, 0xc6, 0x69, 0xb4,
+0xf1, 0x7a, 0x20, 0x58, 0x22, 0xfb, 0x42, 0xd8, 0x43, 0xf6, 0x01, 0x65, 0x66, 0x86, 0xf0, 0x9f,
+0x23, 0x1d, 0x71, 0x40, 0xa5, 0x3c, 0xd2, 0x60, 0x3a, 0x94, 0xa2, 0x07, 0x3e, 0xa8, 0x41, 0x0f,
+0xdc, 0x83, 0x08, 0xb3, 0x22, 0xd7, 0x03, 0x17, 0xa8, 0x36, 0xf6, 0x89, 0x12, 0x04, 0x2e, 0xa4,
+0xa1, 0x2a, 0xa1, 0x02, 0x2f, 0x11, 0xb6, 0x0f, 0x6b, 0x96, 0x34, 0x81, 0x24, 0xcb, 0xd7, 0x2f,
+0x81, 0x29, 0x83, 0x7c, 0x34, 0x3c, 0x62, 0x1a, 0x28, 0xe9, 0x82, 0x5d, 0x12, 0xa9, 0x91, 0x2d,
+0x3c, 0x1f, 0x45, 0xea, 0x63, 0x10, 0x62, 0x66, 0xc0, 0x85, 0x90, 0x14, 0x81, 0x31, 0xed, 0xe3,
+0x4c, 0x0e, 0x08, 0xd3, 0x59, 0x10, 0x42, 0x04, 0x1a, 0x47, 0x00, 0x4d, 0x8e, 0x5d, 0xb3, 0x9a,
+0xdd, 0xeb, 0x5f, 0x80, 0x1c, 0xf9, 0x4b, 0xc2, 0x45, 0xc0, 0x85, 0x38, 0xfb, 0x66, 0x0a, 0x58,
+0xf9, 0x29, 0x72, 0x0a, 0x64, 0x7d, 0x34, 0xc4, 0x20, 0x32, 0x57, 0xa0, 0x4e, 0x14, 0xb0, 0x13,
+0x42, 0x78, 0x1c, 0xa2, 0x23, 0x0b, 0x54, 0x92, 0xb7, 0xdd, 0xd2, 0x9b, 0xe2, 0xb4, 0xa7, 0xf9,
+0xdc, 0x04, 0xab, 0x03, 0xe4, 0x51, 0x7e, 0x5f, 0x1c, 0x68, 0x3a, 0x03, 0x7a, 0x82, 0x7b, 0x2a,
+0x61, 0x98, 0xd2, 0x43, 0xa8, 0xe5, 0xfe, 0x39, 0xff, 0xb1, 0x7a, 0x36, 0x54, 0xa1, 0x6b, 0xb4,
+0x8f, 0x44, 0x2b, 0x20, 0xcf, 0x85, 0x96, 0x52, 0xa0, 0x14, 0x55, 0x8a, 0xf4, 0x16, 0xb9, 0xa1,
+0x8e, 0x02, 0xf4, 0xa3, 0x26, 0x80, 0x63, 0xcc, 0x38, 0x60, 0xc7, 0x89, 0xd6, 0xf2, 0xa4, 0xe5,
+0x03, 0xe7, 0xb6, 0x1c, 0x5a, 0x42, 0x4e, 0xb0, 0xc9, 0x9f, 0x2f, 0xad, 0x28, 0x43, 0x4b, 0xa0,
+0xd2, 0xef, 0xdd, 0x25, 0xa7, 0xc1, 0x0a, 0xa9, 0xba, 0x2c, 0xca, 0x53, 0x9a, 0x7a, 0xe4, 0x20,
+0xfd, 0x3c, 0x27, 0x46, 0x75, 0x8a, 0xd2, 0xa2, 0x2e, 0x55, 0x03, 0x67, 0xc3, 0xe9, 0x31, 0x3d,
+0x1a, 0x53, 0x14, 0xf4, 0x34, 0x4a, 0x2c, 0x95, 0xa0, 0x52, 0x85, 0x4a, 0x03, 0xa2, 0x6e, 0xc1,
+0xa8, 0x46, 0xd9, 0xe0, 0x3d, 0x46, 0x2a, 0xd5, 0x95, 0x32, 0xb5, 0xaa, 0xe8, 0x01, 0xeb, 0x13,
+0xab, 0xc3, 0xc3, 0xad, 0x02, 0x75, 0xa8, 0x3b, 0xfd, 0xea, 0x53, 0x95, 0xb2, 0xc4, 0x26, 0xd8,
+0x8b, 0x64, 0xf1, 0x9c, 0x6b, 0x57, 0xe3, 0x7a, 0x07, 0xb5, 0x1a, 0x54, 0x85, 0x21, 0x30, 0xe9,
+0x59, 0x09, 0x25, 0x53, 0x4f, 0xf8, 0xf5, 0x90, 0x91, 0xd2, 0x64, 0x56, 0xb9, 0x8a, 0x3a, 0xbe,
+0x5e, 0xc6, 0xaf, 0x5b, 0xc4, 0x0f, 0x26, 0x07, 0x99, 0x37, 0xf3, 0x51, 0x95, 0xb0, 0x86, 0x81,
+0x2c, 0xb8, 0x36, 0x38, 0xcd, 0x55, 0x94, 0xd5, 0x3e, 0xd1, 0x0c, 0x81, 0x57, 0x47, 0x30, 0xda,
+0x84, 0xe2, 0x0d, 0x52, 0x79, 0x35, 0x5f, 0x68, 0x23, 0xa9, 0xd9, 0x0e, 0xb8, 0x90, 0x98, 0xb3,
+0x2c, 0xde, 0x5e, 0xd4, 0x58, 0xda, 0x18, 0x74, 0x16, 0xab, 0x4e, 0x55, 0x6d, 0xde, 0x9a, 0x47,
+0x23, 0xda, 0xb2, 0x6f, 0xb5, 0xe9, 0xfb, 0xad, 0x09, 0xae, 0xa9, 0x4f, 0x57, 0xec, 0x2e, 0x58,
+0xa4, 0xa2, 0xe1, 0x6d, 0xc9, 0x03, 0xdc, 0x0e, 0xff, 0xb8, 0xb2, 0xb9, 0x0e, 0x71, 0x65, 0x59,
+0x49, 0xfa, 0x2e, 0x59, 0xe2, 0x0f, 0xba, 0x46, 0xbc, 0x1f, 0x70, 0x89, 0xab, 0xd5, 0xbf, 0x0e,
+0x6e, 0x91, 0x7c, 0xac, 0x23, 0x36, 0x79, 0x7b, 0xbf, 0xc2, 0x96, 0x60, 0xb9, 0xe4, 0xc1, 0x9c,
+0x46, 0xb8, 0x3b, 0x8c, 0xab, 0x14, 0xf7, 0xaa, 0x76, 0x41, 0x2f, 0x35, 0xb5, 0x47, 0x5f, 0xfa,
+0x4a, 0x04, 0x8c, 0x4a, 0xab, 0x2f, 0xf5, 0xf0, 0xab, 0x46, 0x60, 0x88, 0xef, 0x45, 0xe6, 0x4c,
+0x45, 0x1c, 0xdb, 0xa8, 0xaa, 0x01, 0x17, 0x10, 0xbb, 0xcf, 0x34, 0xb0, 0x5e, 0x9f, 0xa5, 0xe0,
+0x49, 0x86, 0xad, 0xc1, 0x6f, 0xa5, 0x25, 0x84, 0x23, 0xec, 0x37, 0x4d, 0x1e, 0xd4, 0x21, 0x16,
+0x06, 0x27, 0x7f, 0xaf, 0xd8, 0x48, 0xf6, 0xb2, 0xb1, 0x21, 0x5a, 0x04, 0xd1, 0x1d, 0xd1, 0x50,
+0xdc, 0xa0, 0x4e, 0x18, 0x7d, 0x81, 0x3c, 0xb1, 0x2f, 0x9d, 0xb8, 0x80, 0x22, 0x85, 0x2f, 0x86,
+0x2a, 0x9e, 0xa7, 0x87, 0x99, 0xd8, 0xb6, 0xde, 0x12, 0xcf, 0x79, 0xf3, 0x74, 0xe4, 0x89, 0x73,
+0xbc, 0xe1, 0x1d, 0xba, 0x26, 0xc4, 0x2e, 0x9e, 0x5f, 0x8e, 0x99, 0x35, 0xe1, 0x21, 0xcf, 0xf8,
+0x85, 0xb1, 0x01, 0xf2, 0x8d, 0x7b, 0x3b, 0xe4, 0xbd, 0xf4, 0xd8, 0x84, 0x4d, 0xf6, 0x1e, 0x19,
+0x0b, 0x4b, 0x47, 0x7f, 0xc5, 0x8b, 0x13, 0x39, 0x00, 0xe0, 0x05, 0x15, 0xdc, 0x64, 0x27, 0x87,
+0x51, 0xb1, 0x05, 0x26, 0xd2, 0xc0, 0xe0, 0xab, 0x13, 0xc4, 0x4e, 0x79, 0x94, 0x66, 0x86, 0x32,
+0x98, 0x8f, 0xd3, 0xb8, 0x02, 0xbd, 0x33, 0xbd, 0x77, 0x00, 0x82, 0x10, 0xe6, 0x4c, 0x67, 0xe0,
+0x9e, 0x84, 0xce, 0x42, 0x70, 0x60, 0xf2, 0xf6, 0xcc, 0xe7, 0x3e, 0xfb, 0xf9, 0xcf, 0x80, 0x0e,
 0xb4, 0xa0, 0x07, 0x4d, 0xe8, 0x42, 0x97, 0x20, 0x01, 0x01, 0x00, 0x3b
diff --git a/NetSSL_Win/samples/download/download.progen b/NetSSL_Win/samples/download/download.progen
index b9523f1e1..9225aa0c3 100644
--- a/NetSSL_Win/samples/download/download.progen
+++ b/NetSSL_Win/samples/download/download.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_Win\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_Win/src/CertificateHandlerFactoryMgr.cpp b/NetSSL_Win/src/CertificateHandlerFactoryMgr.cpp
index 5e9ecfa31..06d56abdd 100644
--- a/NetSSL_Win/src/CertificateHandlerFactoryMgr.cpp
+++ b/NetSSL_Win/src/CertificateHandlerFactoryMgr.cpp
@@ -42,14 +42,14 @@ void CertificateHandlerFactoryMgr::setFactory(const std::string& name, Certifica
 		delete pFactory;
 	poco_assert(success);
 }
-		
+
 
 bool CertificateHandlerFactoryMgr::hasFactory(const std::string& name) const
 {
 	return _factories.find(name) != _factories.end();
 }
-		
-	
+
+
 const CertificateHandlerFactory* CertificateHandlerFactoryMgr::getFactory(const std::string& name) const
 {
 	FactoriesMap::const_iterator it = _factories.find(name);
diff --git a/NetSSL_Win/src/HTTPSClientSession.cpp b/NetSSL_Win/src/HTTPSClientSession.cpp
index 22417d2e3..7848cd7e3 100644
--- a/NetSSL_Win/src/HTTPSClientSession.cpp
+++ b/NetSSL_Win/src/HTTPSClientSession.cpp
@@ -174,7 +174,7 @@ int HTTPSClientSession::read(char* buffer, std::streamsize length)
 	try
 	{
 		return HTTPSession::read(buffer, length);
-	} 
+	}
 	catch(SSLConnectionUnexpectedlyClosedException&)
 	{
 		return 0;
diff --git a/NetSSL_Win/src/HTTPSStreamFactory.cpp b/NetSSL_Win/src/HTTPSStreamFactory.cpp
index 6f07e8d84..ec1d43f9e 100644
--- a/NetSSL_Win/src/HTTPSStreamFactory.cpp
+++ b/NetSSL_Win/src/HTTPSStreamFactory.cpp
@@ -78,7 +78,7 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 		int redirects = 0;
 		std::string username;
 		std::string password;
-		
+
 		do
 		{
 			if (!pSession)
@@ -107,7 +107,7 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 			std::string path = resolvedURI.getPathAndQuery();
 			if (path.empty()) path = "/";
 			HTTPRequest req(HTTPRequest::HTTP_GET, path, HTTPMessage::HTTP_1_1);
-			
+
 			if (authorize)
 			{
 				HTTPCredentials::extractCredentials(uri, username, password);
@@ -117,8 +117,8 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 
 			pSession->sendRequest(req);
 			std::istream& rs = pSession->receiveResponse(res);
-			bool moved = (res.getStatus() == HTTPResponse::HTTP_MOVED_PERMANENTLY || 
-			              res.getStatus() == HTTPResponse::HTTP_FOUND || 
+			bool moved = (res.getStatus() == HTTPResponse::HTTP_MOVED_PERMANENTLY ||
+			              res.getStatus() == HTTPResponse::HTTP_FOUND ||
 			              res.getStatus() == HTTPResponse::HTTP_SEE_OTHER ||
 						  res.getStatus() == HTTPResponse::HTTP_TEMPORARY_REDIRECT);
 			if (moved)
@@ -129,7 +129,7 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 					resolvedURI.setUserInfo(username + ":" + password);
 					authorize = false;
 				}
-				delete pSession; 
+				delete pSession;
 				pSession = 0;
 				++redirects;
 				retry = true;
@@ -140,9 +140,9 @@ std::istream* HTTPSStreamFactory::open(const URI& uri)
 			}
 			else if (res.getStatus() == HTTPResponse::HTTP_USEPROXY && !retry)
 			{
-				// The requested resource MUST be accessed through the proxy 
-				// given by the Location field. The Location field gives the 
-				// URI of the proxy. The recipient is expected to repeat this 
+				// The requested resource MUST be accessed through the proxy
+				// given by the Location field. The Location field gives the
+				// URI of the proxy. The recipient is expected to repeat this
 				// single request via the proxy. 305 responses MUST only be generated by origin servers.
 				// only use for one single request!
 				proxyUri.resolve(res.get("Location"));
diff --git a/NetSSL_Win/src/KeyFileHandler.cpp b/NetSSL_Win/src/KeyFileHandler.cpp
index 2264f78be..1930c9123 100644
--- a/NetSSL_Win/src/KeyFileHandler.cpp
+++ b/NetSSL_Win/src/KeyFileHandler.cpp
@@ -45,7 +45,7 @@ void KeyFileHandler::onPrivateKeyRequested(const void* pSender, std::string& pri
 		std::string prefix = serverSide() ? SSLManager::CFG_SERVER_PREFIX : SSLManager::CFG_CLIENT_PREFIX;
 		if (!config.hasProperty(prefix + CFG_PRIV_KEY_FILE))
 			throw Poco::Util::EmptyOptionException(std::string("Missing Configuration Entry: ") + prefix + CFG_PRIV_KEY_FILE);
-		
+
 		privateKey = config.getString(prefix + CFG_PRIV_KEY_FILE);
 	}
 	catch (Poco::NullPointerException&)
diff --git a/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp b/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp
index f91eadb80..7a19faead 100644
--- a/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp
+++ b/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp
@@ -40,14 +40,14 @@ void PrivateKeyFactoryMgr::setFactory(const std::string& name, PrivateKeyFactory
 		delete pFactory;
 	poco_assert(success);
 }
-		
+
 
 bool PrivateKeyFactoryMgr::hasFactory(const std::string& name) const
 {
 	return _factories.find(name) != _factories.end();
 }
-		
-	
+
+
 const PrivateKeyFactory* PrivateKeyFactoryMgr::getFactory(const std::string& name) const
 {
 	FactoriesMap::const_iterator it = _factories.find(name);
diff --git a/NetSSL_Win/src/SSLManager.cpp b/NetSSL_Win/src/SSLManager.cpp
index 75827bac0..853a1b5b0 100644
--- a/NetSSL_Win/src/SSLManager.cpp
+++ b/NetSSL_Win/src/SSLManager.cpp
@@ -129,7 +129,7 @@ Context::Ptr SSLManager::defaultClientContext()
 		try
 		{
 			initDefaultContext(false);
-		} 
+		}
 		catch (Poco::IllegalStateException&)
 		{
 			_ptrClientCertificateHandler = new RejectCertificateHandler(false);
@@ -221,7 +221,7 @@ void SSLManager::initDefaultContext(bool server)
 	if (trustRoots) options |= Context::OPT_TRUST_ROOTS_WIN_CERT_STORE;
 	if (useMachineStore) options |= Context::OPT_USE_MACHINE_STORE;
 	if (useStrongCrypto) options |= Context::OPT_USE_STRONG_CRYPTO;
-	if (!certPath.empty()) 
+	if (!certPath.empty())
 	{
 		options |= Context::OPT_LOAD_CERT_FROM_FILE;
 		certName = certPath;
@@ -270,7 +270,7 @@ void SSLManager::initPassphraseHandler(bool server)
 {
 	if (server && _ptrServerPassphraseHandler) return;
 	if (!server && _ptrClientPassphraseHandler) return;
-	
+
 	std::string prefix = server ? CFG_SERVER_PREFIX : CFG_CLIENT_PREFIX;
 	Poco::Util::AbstractConfiguration& config = appConfig();
 
@@ -352,7 +352,7 @@ void SSLManager::loadSecurityLibrary()
 #if defined(_WIN32_WCE)
 	dllPath = L"Secur32.dll";
 #else
-	if (VerInfo.dwPlatformId == VER_PLATFORM_WIN32_NT 
+	if (VerInfo.dwPlatformId == VER_PLATFORM_WIN32_NT
 		&& VerInfo.dwMajorVersion == 4)
 	{
 		dllPath = L"Security.dll";
@@ -432,7 +432,7 @@ Poco::Util::AbstractConfiguration& SSLManager::appConfig()
 void initializeSSL()
 {
 }
-	
+
 
 void uninitializeSSL()
 {
diff --git a/NetSSL_Win/src/SecureServerSocket.cpp b/NetSSL_Win/src/SecureServerSocket.cpp
index f4732a468..45dd1df83 100644
--- a/NetSSL_Win/src/SecureServerSocket.cpp
+++ b/NetSSL_Win/src/SecureServerSocket.cpp
@@ -26,7 +26,7 @@ namespace Poco {
 namespace Net {
 
 
-SecureServerSocket::SecureServerSocket(): 
+SecureServerSocket::SecureServerSocket():
 	ServerSocket(new SecureServerSocketImpl(SSLManager::instance().defaultServerContext()), true)
 {
 }
@@ -38,7 +38,7 @@ SecureServerSocket::SecureServerSocket(Context::Ptr pContext):
 }
 
 
-SecureServerSocket::SecureServerSocket(const Socket& socket): 
+SecureServerSocket::SecureServerSocket(const Socket& socket):
 	ServerSocket(socket)
 {
 	if (!dynamic_cast<SecureServerSocketImpl*>(impl()))
@@ -46,7 +46,7 @@ SecureServerSocket::SecureServerSocket(const Socket& socket):
 }
 
 
-SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog): 
+SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog):
 	ServerSocket(new SecureServerSocketImpl(SSLManager::instance().defaultServerContext()), true)
 {
 	impl()->bind(address, true);
@@ -54,7 +54,7 @@ SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog
 }
 
 
-SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog, Context::Ptr pContext): 
+SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog, Context::Ptr pContext):
 	ServerSocket(new SecureServerSocketImpl(pContext), true)
 {
 	impl()->bind(address, true);
@@ -62,7 +62,7 @@ SecureServerSocket::SecureServerSocket(const SocketAddress& address, int backlog
 }
 
 
-SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog): 
+SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog):
 	ServerSocket(new SecureServerSocketImpl(SSLManager::instance().defaultServerContext()), true)
 {
 	IPAddress wildcardAddr;
@@ -71,7 +71,7 @@ SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog):
 	impl()->listen(backlog);
 }
 
-SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog, Context::Ptr pContext): 
+SecureServerSocket::SecureServerSocket(Poco::UInt16 port, int backlog, Context::Ptr pContext):
 	ServerSocket(new SecureServerSocketImpl(pContext), true)
 {
 	IPAddress wildcardAddr;
diff --git a/NetSSL_Win/src/SecureStreamSocket.cpp b/NetSSL_Win/src/SecureStreamSocket.cpp
index 178fcdb7b..0edac8ef8 100644
--- a/NetSSL_Win/src/SecureStreamSocket.cpp
+++ b/NetSSL_Win/src/SecureStreamSocket.cpp
@@ -26,33 +26,33 @@ namespace Poco {
 namespace Net {
 
 
-SecureStreamSocket::SecureStreamSocket(): 
+SecureStreamSocket::SecureStreamSocket():
 	StreamSocket(new SecureStreamSocketImpl(SSLManager::instance().defaultClientContext()))
 {
 }
 
 
-SecureStreamSocket::SecureStreamSocket(Context::Ptr pContext): 
+SecureStreamSocket::SecureStreamSocket(Context::Ptr pContext):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 }
 
 
-SecureStreamSocket::SecureStreamSocket(Context::Ptr pContext, Session::Ptr pSession): 
+SecureStreamSocket::SecureStreamSocket(Context::Ptr pContext, Session::Ptr pSession):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	useSession(pSession);
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address):
 	StreamSocket(new SecureStreamSocketImpl(SSLManager::instance().defaultClientContext()))
 {
 	connect(address);
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName):
 	StreamSocket(new SecureStreamSocketImpl(SSLManager::instance().defaultClientContext()))
 {
 	static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
@@ -60,14 +60,14 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	connect(address);
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext, Session::Ptr pSession): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext, Session::Ptr pSession):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	useSession(pSession);
@@ -75,7 +75,7 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Pt
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
@@ -83,7 +83,7 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession): 
+SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession):
 	StreamSocket(new SecureStreamSocketImpl(pContext))
 {
 	static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
@@ -92,7 +92,7 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::
 }
 
 
-SecureStreamSocket::SecureStreamSocket(const Socket& socket): 
+SecureStreamSocket::SecureStreamSocket(const Socket& socket):
 	StreamSocket(socket)
 {
 	if (!dynamic_cast<SecureStreamSocketImpl*>(impl()))
@@ -100,7 +100,7 @@ SecureStreamSocket::SecureStreamSocket(const Socket& socket):
 }
 
 
-SecureStreamSocket::SecureStreamSocket(SocketImpl* pImpl): 
+SecureStreamSocket::SecureStreamSocket(SocketImpl* pImpl):
 	StreamSocket(pImpl)
 {
 	if (!dynamic_cast<SecureStreamSocketImpl*>(impl()))
@@ -140,7 +140,7 @@ void SecureStreamSocket::setPeerHostName(const std::string& hostName)
 	static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
 }
 
-	
+
 const std::string& SecureStreamSocket::getPeerHostName() const
 {
 	return static_cast<SecureStreamSocketImpl*>(impl())->getPeerHostName();
@@ -217,7 +217,7 @@ void SecureStreamSocket::setLazyHandshake(bool flag)
 	static_cast<SecureStreamSocketImpl*>(impl())->setLazyHandshake(flag);
 }
 
-	
+
 bool SecureStreamSocket::getLazyHandshake() const
 {
 	return static_cast<SecureStreamSocketImpl*>(impl())->getLazyHandshake();
@@ -247,13 +247,13 @@ Session::Ptr SecureStreamSocket::currentSession()
 	return static_cast<SecureStreamSocketImpl*>(impl())->currentSession();
 }
 
-	
+
 void SecureStreamSocket::useSession(Session::Ptr pSession)
 {
 	static_cast<SecureStreamSocketImpl*>(impl())->useSession(pSession);
 }
 
-	
+
 bool SecureStreamSocket::sessionWasReused()
 {
 	return static_cast<SecureStreamSocketImpl*>(impl())->sessionWasReused();
diff --git a/NetSSL_Win/src/SecureStreamSocketImpl.cpp b/NetSSL_Win/src/SecureStreamSocketImpl.cpp
index c8cfeb35a..04edfbf19 100644
--- a/NetSSL_Win/src/SecureStreamSocketImpl.cpp
+++ b/NetSSL_Win/src/SecureStreamSocketImpl.cpp
@@ -67,7 +67,7 @@ void SecureStreamSocketImpl::connect(const SocketAddress& address, const Poco::T
 	_impl.connect(address, timeout, !_lazyHandshake);
 	reset(_impl.sockfd());
 }
-	
+
 
 void SecureStreamSocketImpl::connectNB(const SocketAddress& address)
 {
@@ -80,19 +80,19 @@ void SecureStreamSocketImpl::connectSSL()
 {
 	_impl.connectSSL(!_lazyHandshake);
 }
-	
+
 
 void SecureStreamSocketImpl::bind(const SocketAddress& address, bool reuseAddress)
 {
 	throw Poco::InvalidAccessException("Cannot bind() a SecureStreamSocketImpl");
 }
 
-	
+
 void SecureStreamSocketImpl::listen(int backlog)
 {
 	throw Poco::InvalidAccessException("Cannot listen() on a SecureStreamSocketImpl");
 }
-	
+
 
 void SecureStreamSocketImpl::close()
 {
@@ -148,12 +148,12 @@ void SecureStreamSocketImpl::shutdownReceive()
 {
 }
 
-	
+
 void SecureStreamSocketImpl::shutdownSend()
 {
 }
 
-	
+
 void SecureStreamSocketImpl::shutdown()
 {
 	_impl.shutdown();
@@ -187,7 +187,7 @@ void SecureStreamSocketImpl::setLazyHandshake(bool flag)
 	_lazyHandshake = flag;
 }
 
-	
+
 bool SecureStreamSocketImpl::getLazyHandshake() const
 {
 	return _lazyHandshake;
diff --git a/NetSSL_Win/src/Session.cpp b/NetSSL_Win/src/Session.cpp
index 93e47bd62..0393ae095 100644
--- a/NetSSL_Win/src/Session.cpp
+++ b/NetSSL_Win/src/Session.cpp
@@ -14,7 +14,7 @@
 
 #if defined(__APPLE__)
 // Some OpenSSL functions are deprecated in OS X 10.7
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" 
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 
diff --git a/NetSSL_Win/src/X509Certificate.cpp b/NetSSL_Win/src/X509Certificate.cpp
index c8a9c9fc9..1e0a32278 100644
--- a/NetSSL_Win/src/X509Certificate.cpp
+++ b/NetSSL_Win/src/X509Certificate.cpp
@@ -116,7 +116,7 @@ X509Certificate& X509Certificate::operator = (X509Certificate&& cert) noexcept
 }
 
 
-void X509Certificate::swap(X509Certificate& cert)
+void X509Certificate::swap(X509Certificate& cert) noexcept
 {
 	using std::swap;
 	swap(cert._issuerName, _issuerName);
diff --git a/NetSSL_Win/testsuite/TestSuite.progen b/NetSSL_Win/testsuite/TestSuite.progen
index 1f05cc1c6..f22128754 100644
--- a/NetSSL_Win/testsuite/TestSuite.progen
+++ b/NetSSL_Win/testsuite/TestSuite.progen
@@ -7,6 +7,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include;..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
diff --git a/NetSSL_Win/testsuite/TestSuite_vs170.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs170.vcxproj
index cee487864..70084ac73 100644
--- a/NetSSL_Win/testsuite/TestSuite_vs170.vcxproj
+++ b/NetSSL_Win/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/NetSSL_Win/testsuite/src/Driver.cpp b/NetSSL_Win/testsuite/src/Driver.cpp
index 06bd112f8..745aeb55f 100644
--- a/NetSSL_Win/testsuite/src/Driver.cpp
+++ b/NetSSL_Win/testsuite/src/Driver.cpp
@@ -39,7 +39,7 @@ public:
 		runner.addTest("NetSSLTestSuite", NetSSLTestSuite::suite());
 		return runner.run(_targs) ? 0 : 1;
 	}
-	
+
 	void setup(int argc, char** argv)
 	{
 		init(1, argv);
@@ -53,7 +53,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		Poco::Util::Application::initialize(self);
 	}
-	
+
 private:
 	std::vector<std::string> _targs;
 };
diff --git a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp
index 1b7c5633d..8c3b2ccac 100644
--- a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp
+++ b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp
@@ -50,7 +50,7 @@ public:
 	TestRequestHandler()
 	{
 	}
-	
+
 	void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
 	{
 		response.setChunkedTransferEncoding(true);
@@ -251,7 +251,7 @@ void HTTPSClientSessionTest::testKeepAlive()
 	assertTrue (response.getKeepAlive());
 	std::ostringstream ostr1;
 	assertTrue (StreamCopier::copyStream(rs1, ostr1) == 0);
-	
+
 	request.setMethod(HTTPRequest::HTTP_GET);
 	request.setURI("/small");
 	s.sendRequest(request);
@@ -261,7 +261,7 @@ void HTTPSClientSessionTest::testKeepAlive()
 	std::ostringstream ostr2;
 	StreamCopier::copyStream(rs2, ostr2);
 	assertTrue (ostr2.str() == HTTPSTestServer::SMALL_BODY);
-	
+
 	request.setMethod(HTTPRequest::HTTP_GET);
 	request.setURI("/large");
 	s.sendRequest(request);
@@ -304,7 +304,7 @@ void HTTPSClientSessionTest::testInterop()
 	cert.extractNames(commonName, domainNames);
 
 	assertTrue (commonName == "secure.appinf.com" || commonName == "*.appinf.com");
-	assertTrue (domainNames.find("appinf.com") != domainNames.end() 
+	assertTrue (domainNames.find("appinf.com") != domainNames.end()
 		 || domainNames.find("*.appinf.com") != domainNames.end());
 }
 
@@ -314,7 +314,7 @@ void HTTPSClientSessionTest::testProxy()
 	HTTPSTestServer srv;
 	HTTPSClientSession s("secure.appinf.com");
 	s.setProxy(
-		Application::instance().config().getString("testsuite.proxy.host"), 
+		Application::instance().config().getString("testsuite.proxy.host"),
 		Application::instance().config().getInt("testsuite.proxy.port")
 	);
 	HTTPRequest request(HTTPRequest::HTTP_GET, "/public/poco/NetSSL.txt");
@@ -335,10 +335,10 @@ void HTTPSClientSessionTest::testCachedSession()
 	// ensure OpenSSL machinery is fully setup
 	Context::Ptr pDefaultServerContext = SSLManager::instance().defaultServerContext();
 	Context::Ptr pDefaultClientContext = SSLManager::instance().defaultClientContext();
-	
+
 	Context::Ptr pServerContext = new Context(
 		Context::SERVER_USE,
-		"");	
+		"");
 	//pServerContext->enableSessionCache(true, "TestSuite");
 	//pServerContext->setSessionTimeout(10);
 	//pServerContext->setSessionCacheSize(1000);
@@ -347,7 +347,7 @@ void HTTPSClientSessionTest::testCachedSession()
 	HTTPSTestServer srv(pServerContext);
 
 	Context::Ptr pClientContext = new Context(
-		Context::CLIENT_USE, 
+		Context::CLIENT_USE,
 		"");
 	//pClientContext->enableSessionCache(true);
 
@@ -374,7 +374,7 @@ void HTTPSClientSessionTest::testCachedSession()
 	std::ostringstream ostr2;
 	StreamCopier::copyStream(rs2, ostr2);
 	assertTrue (ostr2.str() == HTTPSTestServer::SMALL_BODY);
-	
+
 	assertTrue (pSession1 == pSession2);
 
 	HTTPRequest request3(HTTPRequest::HTTP_GET, "/small");
@@ -392,7 +392,7 @@ void HTTPSClientSessionTest::testCachedSession()
 
 	Thread::sleep(15000); // wait for session to expire
 	//pServerContext->flushSessionCache();
-	
+
 	HTTPRequest request4(HTTPRequest::HTTP_GET, "/small");
 	s2.sendRequest(request4);
 	Session::Ptr pSession4 = s2.sslSession();
diff --git a/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp b/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp
index dbeceef48..7ecf75d81 100644
--- a/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp
+++ b/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp
@@ -51,15 +51,15 @@ namespace
 				response.setChunkedTransferEncoding(true);
 			else if (request.getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH)
 				response.setContentLength(request.getContentLength());
-			
+
 			response.setContentType(request.getContentType());
-			
+
 			std::istream& istr = request.stream();
 			std::ostream& ostr = response.send();
 			StreamCopier::copyStream(istr, ostr);
 		}
 	};
-	
+
 	class EchoHeaderRequestHandler: public HTTPRequestHandler
 	{
 	public:
@@ -93,7 +93,7 @@ namespace
 			response.send();
 		}
 	};
-	
+
 	class RequestHandlerFactory: public HTTPRequestHandlerFactory
 	{
 	public:
@@ -131,7 +131,7 @@ void HTTPSServerTest::testIdentityRequest()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPSClientSession cs("127.0.0.1", svs.address().port());
 	std::string body(5000, 'x');
 	HTTPRequest request("POST", "/echoBody");
@@ -154,7 +154,7 @@ void HTTPSServerTest::testChunkedRequest()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPSClientSession cs("127.0.0.1", svs.address().port());
 	std::string body(5000, 'x');
 	HTTPRequest request("POST", "/echoBody");
@@ -178,7 +178,7 @@ void HTTPSServerTest::testIdentityRequestKeepAlive()
 	pParams->setKeepAlive(true);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPSClientSession cs("127.0.0.1", svs.address().port());
 	cs.setKeepAlive(true);
 	std::string body(5000, 'x');
@@ -193,7 +193,7 @@ void HTTPSServerTest::testIdentityRequestKeepAlive()
 	assertTrue (response.getContentType() == "text/plain");
 	assertTrue (response.getKeepAlive());
 	assertTrue (rbody == body);
-	
+
 	body.assign(1000, 'y');
 	request.setContentLength((int) body.length());
 	request.setKeepAlive(false);
@@ -213,7 +213,7 @@ void HTTPSServerTest::testChunkedRequestKeepAlive()
 	pParams->setKeepAlive(true);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPSClientSession cs("127.0.0.1", svs.address().port());
 	cs.setKeepAlive(true);
 	std::string body(5000, 'x');
@@ -248,7 +248,7 @@ void HTTPSServerTest::test100Continue()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPSClientSession cs("127.0.0.1", svs.address().port());
 	std::string body(5000, 'x');
 	HTTPRequest request("POST", "/echoBody");
@@ -272,7 +272,7 @@ void HTTPSServerTest::testRedirect()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPSClientSession cs("127.0.0.1", svs.address().port());
 	HTTPRequest request("GET", "/redirect");
 	cs.sendRequest(request);
@@ -292,7 +292,7 @@ void HTTPSServerTest::testAuth()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPSClientSession cs("127.0.0.1", svs.address().port());
 	HTTPRequest request("GET", "/auth");
 	cs.sendRequest(request);
@@ -312,7 +312,7 @@ void HTTPSServerTest::testNotImpl()
 	pParams->setKeepAlive(false);
 	HTTPServer srv(new RequestHandlerFactory, svs, pParams);
 	srv.start();
-	
+
 	HTTPSClientSession cs("127.0.0.1", svs.address().port());
 	HTTPRequest request("GET", "/notImpl");
 	cs.sendRequest(request);
diff --git a/NetSSL_Win/testsuite/src/HTTPSTestServer.cpp b/NetSSL_Win/testsuite/src/HTTPSTestServer.cpp
index abe5133f2..199303a03 100644
--- a/NetSSL_Win/testsuite/src/HTTPSTestServer.cpp
+++ b/NetSSL_Win/testsuite/src/HTTPSTestServer.cpp
@@ -106,7 +106,7 @@ void HTTPSTestServer::run()
 
 bool HTTPSTestServer::requestComplete() const
 {
-	return ((_lastRequest.substr(0, 3) == "GET" || _lastRequest.substr(0, 4) == "HEAD") && 
+	return ((_lastRequest.substr(0, 3) == "GET" || _lastRequest.substr(0, 4) == "HEAD") &&
 	       (_lastRequest.find("\r\n\r\n") != std::string::npos)) ||
 	       (_lastRequest.find("\r\n0\r\n") != std::string::npos);
 }
@@ -122,7 +122,7 @@ std::string HTTPSTestServer::handleRequest() const
 		std::string body(SMALL_BODY);
 		response.append("HTTP/1.0 200 OK\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n");
 		response.append("Connection: Close\r\n");
@@ -137,7 +137,7 @@ std::string HTTPSTestServer::handleRequest() const
 		std::string body(LARGE_BODY);
 		response.append("HTTP/1.0 200 OK\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n");
 		response.append("Connection: Close\r\n");
@@ -154,7 +154,7 @@ std::string HTTPSTestServer::handleRequest() const
 		response.append("Content-Type: text/plain\r\n");
 		if (_lastRequest.find("Content-Length") != std::string::npos)
 		{
-			response.append("Content-Length: "); 
+			response.append("Content-Length: ");
 			response.append(NumberFormatter::format((int) body.size()));
 			response.append("\r\n");
 		}
@@ -175,13 +175,13 @@ std::string HTTPSTestServer::handleRequest() const
 		response.append("HTTP/1.1 200 OK\r\n");
 		response.append("Connection: keep-alive\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n\r\n");
 		response.append("HTTP/1.1 200 OK\r\n");
 		response.append("Connection: Keep-Alive\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n\r\n");
 		response.append(body);
@@ -197,7 +197,7 @@ std::string HTTPSTestServer::handleRequest() const
 		response.append("HTTP/1.1 200 OK\r\n");
 		response.append("Connection: close\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n\r\n");
 	}
@@ -218,7 +218,7 @@ std::string HTTPSTestServer::handleRequest() const
 		std::string body(SMALL_BODY);
 		response.append("HTTP/1.0 200 OK\r\n");
 		response.append("Content-Type: text/plain\r\n");
-		response.append("Content-Length: "); 
+		response.append("Content-Length: ");
 		response.append(NumberFormatter::format((int) body.size()));
 		response.append("\r\n");
 		response.append("Connection: Close\r\n");
diff --git a/NetSSL_Win/testsuite/src/HTTPSTestServer.h b/NetSSL_Win/testsuite/src/HTTPSTestServer.h
index a384249f5..51ce73d71 100644
--- a/NetSSL_Win/testsuite/src/HTTPSTestServer.h
+++ b/NetSSL_Win/testsuite/src/HTTPSTestServer.h
@@ -36,15 +36,15 @@ public:
 	Poco::UInt16 port() const;
 		/// Returns the port the echo server is
 		/// listening on.
-		
+
 	void run();
 		/// Does the work.
-		
+
 	const std::string& lastRequest() const;
 		/// Returns the last request.
 
 	static const std::string SMALL_BODY;
-	static const std::string LARGE_BODY;	
+	static const std::string LARGE_BODY;
 
 protected:
 	bool requestComplete() const;
diff --git a/NetSSL_Win/testsuite/src/TCPServerTest.cpp b/NetSSL_Win/testsuite/src/TCPServerTest.cpp
index ec505d98d..75cce0dd7 100644
--- a/NetSSL_Win/testsuite/src/TCPServerTest.cpp
+++ b/NetSSL_Win/testsuite/src/TCPServerTest.cpp
@@ -50,7 +50,7 @@ namespace
 		EchoConnection(const StreamSocket& s): TCPServerConnection(s)
 		{
 		}
-		
+
 		void run()
 		{
 			StreamSocket& ss = socket();
@@ -92,7 +92,7 @@ void TCPServerTest::testOneConnection()
 	assertTrue (srv.currentThreads() == 0);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 0);
-	
+
 	SocketAddress sa("127.0.0.1", svs.address().port());
 	SecureStreamSocket ss1(sa);
 	std::string data("hello, world");
@@ -120,7 +120,7 @@ void TCPServerTest::testTwoConnections()
 	assertTrue (srv.currentThreads() == 0);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 0);
-	
+
 	SocketAddress sa("127.0.0.1", svs.address().port());
 	SecureStreamSocket ss1(sa);
 	SecureStreamSocket ss2(sa);
@@ -136,7 +136,7 @@ void TCPServerTest::testTwoConnections()
 	n = ss2.receiveBytes(buffer, sizeof(buffer));
 	assertTrue (n > 0);
 	assertTrue (std::string(buffer, n) == data);
-	
+
 	assertTrue (srv.currentConnections() == 2);
 	assertTrue (srv.currentThreads() == 2);
 	assertTrue (srv.queuedConnections() == 0);
@@ -167,7 +167,7 @@ void TCPServerTest::testMultiConnections()
 	assertTrue (srv.currentThreads() == 0);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 0);
-	
+
 	SocketAddress sa("127.0.0.1", svs.address().port());
 	SecureStreamSocket ss1(sa);
 	SecureStreamSocket ss2(sa);
@@ -195,12 +195,12 @@ void TCPServerTest::testMultiConnections()
 	n = ss4.receiveBytes(buffer, sizeof(buffer));
 	assertTrue (n > 0);
 	assertTrue (std::string(buffer, n) == data);
-	
+
 	assertTrue (srv.currentConnections() == 4);
 	assertTrue (srv.currentThreads() == 4);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 4);
-	
+
 	SecureStreamSocket ss5;
 	ss5.setLazyHandshake();
 	ss5.connect(sa);
@@ -211,7 +211,7 @@ void TCPServerTest::testMultiConnections()
 	ss6.connect(sa);
 	Thread::sleep(200);
 	assertTrue (srv.queuedConnections() == 2);
-	
+
 	ss1.close();
 	Thread::sleep(300);
 	assertTrue (srv.currentConnections() == 4);
@@ -225,7 +225,7 @@ void TCPServerTest::testMultiConnections()
 	assertTrue (srv.currentThreads() == 4);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 6);
-	
+
 	ss3.close();
 	Thread::sleep(300);
 	assertTrue (srv.currentConnections() == 3);
@@ -256,7 +256,7 @@ void TCPServerTest::testReuseSocket()
 	assertTrue (srv.currentThreads() == 0);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 0);
-	
+
 	SocketAddress sa("127.0.0.1", svs.address().port());
 	SecureStreamSocket ss1(sa);
 	std::string data("hello, world");
@@ -292,15 +292,15 @@ void TCPServerTest::testReuseSession()
 	// ensure SSL machinery is fully setup
 	Context::Ptr pDefaultServerContext = SSLManager::instance().defaultServerContext();
 	Context::Ptr pDefaultClientContext = SSLManager::instance().defaultClientContext();
-	
+
 	Context::Ptr pServerContext = new Context(
-		Context::SERVER_USE, 
-		"test.appinf.com");	
+		Context::SERVER_USE,
+		"test.appinf.com");
 	//pServerContext->enableSessionCache(true, "TestSuite");
 	//pServerContext->setSessionTimeout(10);
 	//pServerContext->setSessionCacheSize(1000);
 	//pServerContext->disableStatelessSessionResumption();
-	
+
 	SecureServerSocket svs(0, 64, pServerContext);
 	TCPServer srv(new TCPServerConnectionFactoryImpl<EchoConnection>(), svs);
 	srv.start();
@@ -308,12 +308,12 @@ void TCPServerTest::testReuseSession()
 	assertTrue (srv.currentThreads() == 0);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 0);
-	
+
 	Context::Ptr pClientContext = new Context(
-		Context::CLIENT_USE, 
+		Context::CLIENT_USE,
 		"");
 	//pClientContext->enableSessionCache(true);
-	
+
 	SocketAddress sa("127.0.0.1", svs.address().port());
 	SecureStreamSocket ss1(sa, pClientContext);
 	assertTrue (!ss1.sessionWasReused());
@@ -327,9 +327,9 @@ void TCPServerTest::testReuseSession()
 	assertTrue (srv.currentThreads() == 1);
 	assertTrue (srv.queuedConnections() == 0);
 	assertTrue (srv.totalConnections() == 1);
-	
+
 	Session::Ptr pSession = ss1.currentSession();
-	
+
 	ss1.close();
 	Thread::sleep(300);
 	assertTrue (srv.currentConnections() == 0);
@@ -351,7 +351,7 @@ void TCPServerTest::testReuseSession()
 
 	Thread::sleep(15000); // wait for session to expire
 	//pServerContext->flushSessionCache();
-	
+
 	ss1.useSession(pSession);
 	ss1.connect(sa);
 	assertTrue (!ss1.sessionWasReused());
diff --git a/NetSSL_Win/testsuite/src/WinCEDriver.cpp b/NetSSL_Win/testsuite/src/WinCEDriver.cpp
index 5303f4967..990a47c8e 100644
--- a/NetSSL_Win/testsuite/src/WinCEDriver.cpp
+++ b/NetSSL_Win/testsuite/src/WinCEDriver.cpp
@@ -40,14 +40,14 @@ public:
 		runner.addTest("NetSSLTestSuite", NetSSLTestSuite::suite());
 		return runner.run(_targs) ? 0 : 1;
 	}
-	
+
 	void setup(const std::vector<std::string>& args)
 	{
 		char* argv[] =
 		{
 			const_cast<char*>(args[0].c_str())
 		};
-		
+
 		init(1, argv);
 		for (std::size_t i = 0; i < args.size(); ++i)
 			_targs.push_back(args[i]);
@@ -59,7 +59,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		Poco::Util::Application::initialize(self);
 	}
-	
+
 private:
 	std::vector<std::string> _targs;
 };
diff --git a/NetSSL_Win/testsuite/src/WinDriver.cpp b/NetSSL_Win/testsuite/src/WinDriver.cpp
index 06562adb6..babc7c3f6 100644
--- a/NetSSL_Win/testsuite/src/WinDriver.cpp
+++ b/NetSSL_Win/testsuite/src/WinDriver.cpp
@@ -39,14 +39,14 @@ public:
 		runner.run();
 		return 0;
 	}
-	
+
 protected:
 	void initialize(Poco::Util::Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Poco::Util::Application::initialize(self);
 	}
-	
+
 private:
 	std::vector<std::string> _targs;
 };
diff --git a/PDF/PDF.progen b/PDF/PDF.progen
index f615fc50b..12898d52a 100644
--- a/PDF/PDF.progen
+++ b/PDF/PDF.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared = _CRT_SECURE_NO_WARNINGS;${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/PDF/PDF_vs170.sln b/PDF/PDF_vs170.sln
index 39886df78..ab09b75b2 100644
--- a/PDF/PDF_vs170.sln
+++ b/PDF/PDF_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Build.0 = release_static_md|x64
 		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/PDF/PDF_vs170.vcxproj b/PDF/PDF_vs170.vcxproj
index 29bd8fa5f..2152f12af 100644
--- a/PDF/PDF_vs170.vcxproj
+++ b/PDF/PDF_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>PDF</ProjectName>
     <ProjectGuid>{E12E5C71-79A4-495A-848F-F1710111E610}</ProjectGuid>
     <RootNamespace>PDF</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoPDFA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoPDFmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoPDFmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoPDFA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoPDFmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoPDFmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoPDFd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoPDFmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoPDFmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoPDFmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoPDFmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\PDF\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\PDF\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\PDF\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\PDF\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\PDF\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\PDF\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\PDF\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\PDF\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;.\include\Poco\PDF;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoPDFA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoPDFA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoPDFd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;.\include\Poco\PDF;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoPDFA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoPDF.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;.\include\Poco\PDF;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoPDFmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoPDFmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;.\include\Poco\PDF;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoPDFmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;.\include\Poco\PDF;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoPDFmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoPDFmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;.\include\Poco\PDF;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoPDFmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -902,12 +1165,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/PDF/include/Poco/PDF/Destination.h b/PDF/include/Poco/PDF/Destination.h
index bc37b5a0c..4a1665ea2 100644
--- a/PDF/include/Poco/PDF/Destination.h
+++ b/PDF/include/Poco/PDF/Destination.h
@@ -40,7 +40,7 @@ public:
 		/// Sets the position and zoom for destination.
 
 	void fit();
-		/// Sets the appearance of the page to displaying entire page within the window. 
+		/// Sets the appearance of the page to displaying entire page within the window.
 
 	void fitHorizontal(float top);
 		/// Defines the appearance of a page to magnifying to fit the height of the
@@ -58,7 +58,7 @@ public:
 
 	void fitWindow();
 		/// Sets the appearance of the page to magnifying to fit  the bounding box of
-		/// the page within the window. 
+		/// the page within the window.
 
 	void fitWindowHorizontal(float top);
 		/// Defines the appearance of a page to magnifying to fit the width of the
diff --git a/PDF/include/Poco/PDF/Document.h b/PDF/include/Poco/PDF/Document.h
index c9ea94668..ff087b6c2 100644
--- a/PDF/include/Poco/PDF/Document.h
+++ b/PDF/include/Poco/PDF/Document.h
@@ -74,26 +74,26 @@ public:
 
 	enum PageLayout
 	{
-		PAGE_LAYOUT_SINGLE = HPDF_PAGE_LAYOUT_SINGLE, 
+		PAGE_LAYOUT_SINGLE = HPDF_PAGE_LAYOUT_SINGLE,
 			/// Only one page is displayed.
 		PAGE_LAYOUT_ONE_COLUMN = HPDF_PAGE_LAYOUT_ONE_COLUMN,
 			/// Display the pages in one column.
 		PAGE_LAYOUT_TWO_COLUMN_LEFT = HPDF_PAGE_LAYOUT_TWO_COLUMN_LEFT,
-			/// Display the pages in two column. The page of the odd number is displayed left. 
+			/// Display the pages in two column. The page of the odd number is displayed left.
 		PAGE_LAYOUT_TWO_COLUMN_RIGHT = HPDF_PAGE_LAYOUT_TWO_COLUMN_RIGHT
-			/// Display the pages in two column. The page of the odd number is displayed right.  
+			/// Display the pages in two column. The page of the odd number is displayed right.
 	};
 
 	enum PageMode
 	{
-		PAGE_MODE_USE_NONE = HPDF_PAGE_MODE_USE_NONE, 
-			/// Display the document with neither outline nor thumbnail.  
+		PAGE_MODE_USE_NONE = HPDF_PAGE_MODE_USE_NONE,
+			/// Display the document with neither outline nor thumbnail.
 		PAGE_MODE_USE_OUTLINE = HPDF_PAGE_MODE_USE_OUTLINE,
 			/// Display the document with outline pain.
 		PAGE_MODE_USE_THUMBS = HPDF_PAGE_MODE_USE_THUMBS,
 			///Display the document with thumbnail pain.
 		PAGE_MODE_FULL_SCREEN = HPDF_PAGE_MODE_FULL_SCREEN
-			/// Display the document with full screen mode. 
+			/// Display the document with full screen mode.
 	};
 
 	enum Compression
@@ -101,13 +101,13 @@ public:
 		COMPRESSION_NONE = HPDF_COMP_NONE,
 			/// All contents are not compressed.
 		COMPRESSION_TEXT = HPDF_COMP_TEXT,
-			/// Compress the contents stream of the page.  
+			/// Compress the contents stream of the page.
 		COMPRESSION_IMAGE = HPDF_COMP_IMAGE,
-			/// Compress the streams of the image objects. 
+			/// Compress the streams of the image objects.
 		COMPRESSION_METADATA = HPDF_COMP_METADATA,
 			/// Other stream datas (fonts, cmaps and so on)  are compressed.
-		COMPRESSION_ALL = HPDF_COMP_ALL 	
-			/// All stream datas are compressed. 
+		COMPRESSION_ALL = HPDF_COMP_ALL
+			/// All stream datas are compressed.
 			/// (Same as HPDF_COMP_TEXT | HPDF_COMP_IMAGE | HPDF_COMP_METADATA)
 	};
 
@@ -118,7 +118,7 @@ public:
 			/// The length of key is automatically set to 5(40bit).
 		ENCRYPT_R3 = HPDF_ENCRYPT_R3
 			/// Use "Revision 3" algorithm.
-			/// Between 5(40bit) and 16(128bit) can be specified for length of the key. 
+			/// Between 5(40bit) and 16(128bit) can be specified for length of the key.
 	};
 
 	enum PageNumberStyle
@@ -167,11 +167,11 @@ public:
 		/// the sz argument.
 
 	SizeType size();
-		/// Resets the document stream, reads the document into the stream and 
+		/// Resets the document stream, reads the document into the stream and
 		/// returns the document data size.
 
 	void setPages(std::size_t pagePerPages);
-		/// Sets the number of pages per page. 
+		/// Sets the number of pages per page.
 		/// See HARU library HPDF_SetPagesConfiguration API call
 		/// documentation for detailed explanation.
 
@@ -220,7 +220,7 @@ public:
 
 	std::string loadTTFont(const std::string& fileName, bool embed, int index = -1);
 		/// Loads true type font from file. Returns font name.
-		/// If the embed parameter is true, the glyph data of the font is embedded, 
+		/// If the embed parameter is true, the glyph data of the font is embedded,
 		/// otherwise only the matrix data is included in PDF file.
 
 	const Image& loadPNGImage(const std::string& fileName);
@@ -228,9 +228,9 @@ public:
 
 	const Image& loadPNGImageInfo(const std::string& fileName);
 		/// Loads the specified PNG image information from the file and returns reference to it.
-		/// Unlike loadPNGImage, this function does not load the whole data immediately. 
-		/// Only size and color properties are loaded. The image data is loaded just before the 
-		/// image object is written to PDF, and the loaded data is deleted immediately. 
+		/// Unlike loadPNGImage, this function does not load the whole data immediately.
+		/// Only size and color properties are loaded. The image data is loaded just before the
+		/// image object is written to PDF, and the loaded data is deleted immediately.
 
 	const Image& loadJPEGImage(const std::string& fileName);
 		/// Loads the specified PNG image from the file and returns reference to it.
@@ -284,7 +284,7 @@ public:
 		/// Creates extended graphic state object.
 		/// Bumps up the version of PDF to 1.4.
 		/// NOTE:
-		/// In Acrobat Reader 5.0, when ExtGState object is used combined with HPDF_Page_Concat(), 
+		/// In Acrobat Reader 5.0, when ExtGState object is used combined with HPDF_Page_Concat(),
 		/// there is a case that cannot be correctly displayed.
 
 	const Outline& createOutline(const std::string& title, const Outline& outline, const Encoder& encoder);
@@ -292,7 +292,7 @@ public:
 
 	void setInfo(Info info, const std::string& value);
 		/// Sets the document info.
- 
+
 	void setInfo(Info info, const LocalDateTime& dt);
 		/// Sets the document creation or moidification date.
 
diff --git a/PDF/include/Poco/PDF/Encoder.h b/PDF/include/Poco/PDF/Encoder.h
index 5ef334ab6..36e9e30cd 100644
--- a/PDF/include/Poco/PDF/Encoder.h
+++ b/PDF/include/Poco/PDF/Encoder.h
@@ -32,7 +32,7 @@ class PDF_API Encoder: public Resource<HPDF_Encoder>
 {
 public:
 	enum Type
-	{		
+	{
 		ENCODER_TYPE_SINGLE_BYTE = HPDF_ENCODER_TYPE_SINGLE_BYTE,
 			/// This encoder is an encoder for single byte characters.
 		ENCODER_TYPE_DOUBLE_BYTE = HPDF_ENCODER_TYPE_DOUBLE_BYTE,
@@ -73,10 +73,10 @@ public:
 		/// Returns the type of an encoding object.
 
 	ByteType getByteType(const std::string& text, int index = 0) const;
-		/// Returns the type of byte in the text at position index 
+		/// Returns the type of byte in the text at position index
 
 	WriteMode writeMode();
-		/// Returns the writing mode for the encoding object. 
+		/// Returns the writing mode for the encoding object.
 };
 
 
@@ -95,7 +95,7 @@ inline Encoder::ByteType Encoder::getByteType(const std::string& text, int index
 	if (index < 0)
 		throw InvalidArgumentException("Negative values not allowed.");
 
-	return static_cast<ByteType>(HPDF_Encoder_GetByteType(handle(), 
+	return static_cast<ByteType>(HPDF_Encoder_GetByteType(handle(),
 		text.c_str(),
 		static_cast<HPDF_UINT>(index)));
 }
diff --git a/PDF/include/Poco/PDF/Font.h b/PDF/include/Poco/PDF/Font.h
index 023b7ec39..8302d31a8 100755
--- a/PDF/include/Poco/PDF/Font.h
+++ b/PDF/include/Poco/PDF/Font.h
@@ -118,8 +118,8 @@ inline int Font::upperHeight() const
 
 inline TextWidth Font::textWidth(const std::string& text)
 {
-	return HPDF_Font_TextWidth(handle(), 
-		reinterpret_cast<const HPDF_BYTE*>(text.data()), 
+	return HPDF_Font_TextWidth(handle(),
+		reinterpret_cast<const HPDF_BYTE*>(text.data()),
 		static_cast<HPDF_UINT>(text.size()));
 }
 
diff --git a/PDF/include/Poco/PDF/Page.h b/PDF/include/Poco/PDF/Page.h
index a249fcf91..846a6bb79 100644
--- a/PDF/include/Poco/PDF/Page.h
+++ b/PDF/include/Poco/PDF/Page.h
@@ -49,21 +49,21 @@ public:
 	enum Size
 	{
 		PAGE_SIZE_LETTER = HPDF_PAGE_SIZE_LETTER, 
-			/// 8½ x 11 (Inches), 612 x 792 px
+			/// 8� x 11 (Inches), 612 x 792 px
 		PAGE_SIZE_LEGAL = HPDF_PAGE_SIZE_LEGAL,
-			/// 8½ x 14 (Inches), 612 x 1008 px
+			/// 8� x 14 (Inches), 612 x 1008 px
 		PAGE_SIZE_A3 = HPDF_PAGE_SIZE_A3,
-			/// 297 × 420 (mm), 841.89 x 1199.551 px
+			/// 297 � 420 (mm), 841.89 x 1199.551 px
 		PAGE_SIZE_A4 = HPDF_PAGE_SIZE_A4,
-			/// 210 × 297 (mm), 595.276 x 841.89 px
+			/// 210 � 297 (mm), 595.276 x 841.89 px
 		PAGE_SIZE_A5 = HPDF_PAGE_SIZE_A5,
-			/// 148 × 210 (mm), 419.528 x 595.276 px
+			/// 148 � 210 (mm), 419.528 x 595.276 px
 		PAGE_SIZE_B4 = HPDF_PAGE_SIZE_B4,
-			/// 250 × 353 (mm), 708.661 x 1000.63 px
+			/// 250 � 353 (mm), 708.661 x 1000.63 px
 		PAGE_SIZE_B5 = HPDF_PAGE_SIZE_B5,
-			/// 176 × 250 (mm), 498.898 x 708.661 px
+			/// 176 � 250 (mm), 498.898 x 708.661 px
 		PAGE_SIZE_EXECUTIVE = HPDF_PAGE_SIZE_EXECUTIVE,
-			/// 7½ x 10½ (Inches), 522 x 756 px
+			/// 7� x 10� (Inches), 522 x 756 px
 		PAGE_SIZE_US4x6 = HPDF_PAGE_SIZE_US4x6,
 			/// 4 x 6 (Inches), 288 x 432 px
 		PAGE_SIZE_US4x8 = HPDF_PAGE_SIZE_US4x8,
@@ -165,7 +165,7 @@ public:
 	bool operator == (const Page& other) const;
 		/// Equality operator.
 
-	void swap(Page& other);
+	void swap(Page& other) noexcept;
 		/// Swaps this page with another.
 
 	void setWidth(float value);
@@ -230,9 +230,9 @@ public:
 	void writeNextLine(const std::string& text);
 		/// Moves the current text position to the start of the next line and
 		/// prints the text at the current position on the page.
-	
+
 	void writeNextLineEx(float wordSpace, float charSpace, const std::string& text);
-		/// Moves the current text position to the start of the next line, sets the word spacing, 
+		/// Moves the current text position to the start of the next line, sets the word spacing,
 		/// character spacing and prints the text at the current position on the page.
 
 	int writeOnceInRectangle(float left,
@@ -241,7 +241,7 @@ public:
 		float bottom,
 		const std::string& text,
 		TextAlignment align = TEXT_ALIGN_LEFT);
-		/// Begins, writes and ends text objectinside the specified region. 
+		/// Begins, writes and ends text objectinside the specified region.
 		/// Returns the number of characters written.
 
 	int writeInRectangle(float left,
@@ -250,7 +250,7 @@ public:
 		float bottom,
 		const std::string& text,
 		TextAlignment align);
-		/// Writes the text inside the specified region. 
+		/// Writes the text inside the specified region.
 		/// Returns the number of characters written.
 
 	void drawImage(Image image, float x, float y, float width, float height);
@@ -259,18 +259,18 @@ public:
 	const Destination& createDestination(const std::string& name);
 		/// Creates ad returns reference to destination.
 
-	const TextAnnotation& createTextAnnotation(const std::string& name, 
+	const TextAnnotation& createTextAnnotation(const std::string& name,
 		const Rectangle& rect,
 		const std::string& text,
 		const Encoder& encoder);
 		/// Creates ad returns reference to text annotation.
 
-	const LinkAnnotation& createLinkAnnotation(const std::string& name, 
+	const LinkAnnotation& createLinkAnnotation(const std::string& name,
 		const Rectangle& rect,
 		const Destination& dest);
 		/// Creates ad returns reference to destination link annotation.
 
-	const LinkAnnotation& createURILinkAnnotation(const std::string& name, 
+	const LinkAnnotation& createURILinkAnnotation(const std::string& name,
 		const Rectangle& rect,
 		const std::string& uri);
 		/// Creates ad returns reference to URI annotation.
@@ -301,23 +301,23 @@ public:
 		/// Appends a path from the current point to the specified point..
 
 	void curveTo(const std::vector<float>& values);
-		/// Appends a Bézier curve to the current path using two specified points.
+		/// Appends a B�zier curve to the current path using two specified points.
 		/// The point (x1, y1) and the point (x2, y2) are used as the control points 
-		/// for a Bézier curve and current point is moved to the point (x3, y3)
+		/// for a B�zier curve and current point is moved to the point (x3, y3)
 
 	void curveToRight(float x2, float y2, float x3, float y3);
-		/// Appends a Bézier curve to the right of the current point using two specified points.
+		/// Appends a B�zier curve to the right of the current point using two specified points.
 		/// The current point and the point (x2, y2) are used as the control points 
-		/// for a Bézier curve and current point is moved to the point (x3, y3)
+		/// for a B�zier curve and current point is moved to the point (x3, y3)
 
 	void curveToLeft(float x2, float y2, float x3, float y3);
-		/// Appends a Bézier curve to the left of the current point using two specified points.
+		/// Appends a B�zier curve to the left of the current point using two specified points.
 		/// The current point and the point (x2, y2) are used as the control points 
-		/// for a Bézier curve and current point is moved to the point (x3, y3)
+		/// for a B�zier curve and current point is moved to the point (x3, y3)
 
 	void closePath();
 		/// Appends a straight line from the current point to the start point of sub path.
-		/// The current point is moved to the start point of sub path. 
+		/// The current point is moved to the start point of sub path.
 
 	void rectangle(float x, float y, float width, float height);
 		/// Draws a rectangle.
@@ -350,7 +350,7 @@ public:
 		/// Fills the current path using the even-odd rule and then paints it.
 
 	void closeFillAndStroke();
-		/// Closes the current path, fills the current path using the nonzero winding number 
+		/// Closes the current path, fills the current path using the nonzero winding number
 		/// rule and then paints it.
 
 	void closeFillAndEOStroke();
@@ -373,22 +373,22 @@ public:
 
 	void moveTextPos(float x, float y);
 		/// Moves the current text position to the start of the next line
-		/// using specified offset values. If the start position of the current 
+		/// using specified offset values. If the start position of the current
 		/// line is (x1, y1), the start of the next line is (x1 + x, y1 + y).
-	
+
 	void moveTextNextLine(float x, float y);
-		/// Moves the current text position to the start of the next line 
-		/// using specified offset values, and sets the text leading to -y. 
-		/// If the start position of the current line is (x1, y1), the start 
-		/// of the next line is (x1 + x, y1 + y). 
+		/// Moves the current text position to the start of the next line
+		/// using specified offset values, and sets the text leading to -y.
+		/// If the start position of the current line is (x1, y1), the start
+		/// of the next line is (x1 + x, y1 + y).
 
 	void moveTextNextLine();
 		/// Moves the current text position to the start of the next line.
-		/// If the start position of the current line is (x1, y1), the start of 
+		/// If the start position of the current line is (x1, y1), the start of
 		/// the next line is (x1, y1 - text leading).
 		///
 		/// NOTE:
-		/// Since the default value of Text Leading is 0,  an application has to 
+		/// Since the default value of Text Leading is 0,  an application has to
 		/// invoke HPDF_Page_SetTextLeading() before HPDF_Page_MoveTextPos2() to set
 		/// text leading.
 
@@ -639,7 +639,7 @@ inline void Page::restoreGraphics()
 
 inline void Page::concatenate(const std::vector<float>& values)
 {
-	if (values.size() < 6) 
+	if (values.size() < 6)
 		throw InvalidArgumentException("Needs six values");
 
 	HPDF_Page_Concat(_page,
@@ -666,7 +666,7 @@ inline void Page::lineTo(float x, float y)
 
 inline void Page::curveTo(const std::vector<float>& values)
 {
-	if (values.size() < 6) 
+	if (values.size() < 6)
 		throw InvalidArgumentException("Needs six values");
 
 	HPDF_Page_CurveTo(_page,
@@ -786,13 +786,13 @@ inline void Page::moveTextPos(float x, float y)
 	HPDF_Page_MoveTextPos(_page, x, y);
 }
 
-	
+
 inline void Page::moveTextNextLine(float x, float y)
 {
 	HPDF_Page_MoveTextPos2(_page, x, y);
 }
 
-	
+
 inline void Page::moveTextNextLine()
 {
 	HPDF_Page_MoveToNextLine(_page);
@@ -873,7 +873,7 @@ inline DashMode Page::getDashMode() const
 
 inline void Page::setDashMode(const PatternVec& pattern, int paramNo, int phase) const
 {
-	HPDF_Page_SetDash(_page, &pattern[0], 
+	HPDF_Page_SetDash(_page, &pattern[0],
 		static_cast<HPDF_UINT>(paramNo),
 		static_cast<HPDF_UINT>(phase));
 }
diff --git a/PDF/include/Poco/PDF/Resource.h b/PDF/include/Poco/PDF/Resource.h
index d020fa645..993f08d70 100644
--- a/PDF/include/Poco/PDF/Resource.h
+++ b/PDF/include/Poco/PDF/Resource.h
@@ -33,7 +33,7 @@ class Resource
 public:
 	typedef R Type;
 
-	Resource(HPDF_Doc* pPDF, const R& resource, const std::string& name = ""): 
+	Resource(HPDF_Doc* pPDF, const R& resource, const std::string& name = ""):
 		_pPDF(pPDF),
 		_resource(resource),
 		_name(name)
@@ -41,7 +41,7 @@ public:
 	{
 	}
 
-	Resource(const Resource& other): 
+	Resource(const Resource& other):
 		_pPDF(other._pPDF),
 		_resource(other._resource),
 		_name(other._name)
@@ -74,10 +74,10 @@ public:
 		return _pPDF == other._pPDF && _resource == other._resource;
 	}
 
-	void swap(Resource& other)
+	void swap(Resource& other) noexcept
 	{
 		using std::swap;
-		
+
 		swap(_pPDF, other._pPDF);
 		swap(_resource, other._resource);
 		swap(_name, other._name);
diff --git a/PDF/include/Poco/PDF/hpdf.h b/PDF/include/Poco/PDF/hpdf.h
index e369f6744..fc8b1f0c9 100644
--- a/PDF/include/Poco/PDF/hpdf.h
+++ b/PDF/include/Poco/PDF/hpdf.h
@@ -621,7 +621,7 @@ HPDF_EXPORT(HPDF_STATUS)
 HPDF_TextMarkupAnnot_SetQuadPoints ( HPDF_Annotation annot, HPDF_Point lb, HPDF_Point rb, HPDF_Point rt, HPDF_Point lt); /* l-left, r-right, b-bottom, t-top positions */
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_Annot_Set3DView  ( HPDF_MMgr mmgr, 
+HPDF_Annot_Set3DView  ( HPDF_MMgr mmgr,
 					 	HPDF_Annotation	annot,
 					 	HPDF_Annotation	annot3d,
 					 	HPDF_Dict			view);
@@ -643,8 +643,8 @@ HPDF_EXPORT(HPDF_STATUS)
 HPDF_FreeTextAnnot_SetDefaultStyle (HPDF_Annotation  annot, const char* style);
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_LineAnnot_SetPosition (HPDF_Annotation annot, 
-							HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle, 
+HPDF_LineAnnot_SetPosition (HPDF_Annotation annot,
+							HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle,
 							HPDF_Point endPoint, HPDF_LineAnnotEndingStyle endStyle);
 
 HPDF_EXPORT(HPDF_STATUS)
@@ -686,29 +686,29 @@ HPDF_Page_CreatePD33DMeasure(HPDF_Page       page,
   					        );
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DMeasure_SetName(HPDF_3DMeasure measure, 
+HPDF_3DMeasure_SetName(HPDF_3DMeasure measure,
 					   const char* name);
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DMeasure_SetColor(HPDF_3DMeasure measure, 
+HPDF_3DMeasure_SetColor(HPDF_3DMeasure measure,
 						   HPDF_RGBColor color);
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DMeasure_SetTextSize(HPDF_3DMeasure measure, 
+HPDF_3DMeasure_SetTextSize(HPDF_3DMeasure measure,
 							  HPDF_REAL textsize);
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DC3DMeasure_SetTextBoxSize(HPDF_3DMeasure measure, 
+HPDF_3DC3DMeasure_SetTextBoxSize(HPDF_3DMeasure measure,
 							 HPDF_INT32 x,
 							 HPDF_INT32 y);
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DC3DMeasure_SetText(HPDF_3DMeasure measure, 
+HPDF_3DC3DMeasure_SetText(HPDF_3DMeasure measure,
 						  const char* text,
 						  HPDF_Encoder encoder);
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DC3DMeasure_SetProjectionAnotation(HPDF_3DMeasure measure, 
+HPDF_3DC3DMeasure_SetProjectionAnotation(HPDF_3DMeasure measure,
 										 HPDF_Annotation projectionanotation);
 
 /*--------------------------------------------------------------------------*/
@@ -1551,14 +1551,14 @@ HPDF_EXPORT(HPDF_OutputIntent)
 HPDF_ICC_LoadIccFromMem (HPDF_Doc   pdf,
                         HPDF_MMgr   mmgr,
                         HPDF_Stream iccdata,
-                        HPDF_Xref   xref, 
+                        HPDF_Xref   xref,
                         int         numcomponent);
 
 HPDF_EXPORT(HPDF_OutputIntent)
 HPDF_LoadIccProfileFromFile  (HPDF_Doc  pdf,
                             const char* icc_file_name,
                                    int  numcomponent);
-                                   
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/PDF/include/Poco/PDF/hpdf_3dmeasure.h b/PDF/include/Poco/PDF/hpdf_3dmeasure.h
index ebfa7b077..ee8517bfd 100644
--- a/PDF/include/Poco/PDF/hpdf_3dmeasure.h
+++ b/PDF/include/Poco/PDF/hpdf_3dmeasure.h
@@ -34,7 +34,7 @@ HPDF_3DC3DMeasure_New(HPDF_MMgr mmgr,
 		              HPDF_Point3D    firstanchorpoint,
 		              HPDF_Point3D    textanchorpoint
 		);
-             
+
 HPDF_3DMeasure
 HPDF_PD33DMeasure_New(HPDF_MMgr mmgr,
 					  HPDF_Xref xref,
diff --git a/PDF/include/Poco/PDF/hpdf_exdata.h b/PDF/include/Poco/PDF/hpdf_exdata.h
index 8d92e7909..d08e67edb 100644
--- a/PDF/include/Poco/PDF/hpdf_exdata.h
+++ b/PDF/include/Poco/PDF/hpdf_exdata.h
@@ -31,7 +31,7 @@ HPDF_ExData
 HPDF_3DAnnotExData_New(HPDF_MMgr mmgr,
 					   HPDF_Xref xref );
 
-         
+
 
 #ifdef __cplusplus
 }
diff --git a/PDF/include/Poco/PDF/hpdf_ext_gstate.h b/PDF/include/Poco/PDF/hpdf_ext_gstate.h
index 7dae6d4bd..64cab041c 100644
--- a/PDF/include/Poco/PDF/hpdf_ext_gstate.h
+++ b/PDF/include/Poco/PDF/hpdf_ext_gstate.h
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 HPDF_Dict
-HPDF_ExtGState_New  (HPDF_MMgr   mmgr, 
+HPDF_ExtGState_New  (HPDF_MMgr   mmgr,
                      HPDF_Xref   xref);
 
 
diff --git a/PDF/include/Poco/PDF/hpdf_pages.h b/PDF/include/Poco/PDF/hpdf_pages.h
index 44b816c2c..196be37df 100644
--- a/PDF/include/Poco/PDF/hpdf_pages.h
+++ b/PDF/include/Poco/PDF/hpdf_pages.h
@@ -65,7 +65,7 @@ typedef struct _HPDF_PageAttr_Rec {
     HPDF_Stream        stream;
     HPDF_Xref          xref;
     HPDF_UINT          compression_mode;
-	HPDF_PDFVer       *ver; 
+	HPDF_PDFVer       *ver;
 } HPDF_PageAttr_Rec;
 
 
diff --git a/PDF/include/Poco/PDF/hpdf_pdfa.h b/PDF/include/Poco/PDF/hpdf_pdfa.h
index 8566a3745..8840f5196 100644
--- a/PDF/include/Poco/PDF/hpdf_pdfa.h
+++ b/PDF/include/Poco/PDF/hpdf_pdfa.h
@@ -33,7 +33,7 @@ HPDF_PDFA_AppendOutputIntents(HPDF_Doc pdf, const char *iccname, HPDF_Dict iccdi
 HPDF_STATUS
 HPDF_PDFA_SetPDFAConformance (HPDF_Doc pdf,
 			      HPDF_PDFAType pdfatype);
-			      
+
 HPDF_STATUS
 HPDF_PDFA_GenerateID(HPDF_Doc);
 #ifdef __cplusplus
diff --git a/PDF/include/Poco/PDF/hpdf_types.h b/PDF/include/Poco/PDF/hpdf_types.h
index 8b3e0a893..04a082951 100644
--- a/PDF/include/Poco/PDF/hpdf_types.h
+++ b/PDF/include/Poco/PDF/hpdf_types.h
@@ -152,7 +152,7 @@ typedef enum _HPDF_InfoType {
 
 /* PDF-A Types */
 
-typedef enum _HPDF_PDFA_TYPE 
+typedef enum _HPDF_PDFA_TYPE
 {
     HPDF_PDFA_1A = 0,
     HPDF_PDFA_1B = 1
@@ -499,7 +499,7 @@ typedef enum _HPDF_TransitionStyle {
     HPDF_TS_GLITTER_TOP_LEFT_TO_BOTTOM_RIGHT,
     HPDF_TS_REPLACE,
     HPDF_TS_EOF
-} HPDF_TransitionStyle; 
+} HPDF_TransitionStyle;
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/PDF/include/Poco/PDF/png.h b/PDF/include/Poco/PDF/png.h
index 3ac393ea3..307244945 100644
--- a/PDF/include/Poco/PDF/png.h
+++ b/PDF/include/Poco/PDF/png.h
@@ -400,7 +400,7 @@
 #define PNG_LIBPNG_BUILD_RC       3
 #define PNG_LIBPNG_BUILD_STABLE   4
 #define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
-  
+
 /* Release-Specific Flags */
 #define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
                                        PNG_LIBPNG_BUILD_STABLE only */
@@ -431,12 +431,12 @@
 /* Ref MSDN: Private as priority over Special
  * VS_FF_PRIVATEBUILD File *was not* built using standard release
  * procedures. If this value is given, the StringFileInfo block must
- * contain a PrivateBuild string. 
+ * contain a PrivateBuild string.
  *
  * VS_FF_SPECIALBUILD File *was* built by the original company using
  * standard release procedures but is a variation of the standard
  * file of the same version number. If this value is given, the
- * StringFileInfo block must contain a SpecialBuild string. 
+ * StringFileInfo block must contain a SpecialBuild string.
  */
 
 #if defined(PNG_USER_PRIVATEBUILD)
diff --git a/PDF/include/Poco/PDF/pngconf.h b/PDF/include/Poco/PDF/pngconf.h
index c40507446..b4bf1ba17 100644
--- a/PDF/include/Poco/PDF/pngconf.h
+++ b/PDF/include/Poco/PDF/pngconf.h
@@ -19,7 +19,7 @@
 
 #define PNG_1_2_X
 
-/* 
+/*
  * PNG_USER_CONFIG has to be defined on the compiler command line. This
  * includes the resource compiler for Windows DLL configurations.
  */
@@ -39,7 +39,7 @@
 
 /*
  * Added at libpng-1.2.8
- *  
+ *
  * If you create a private DLL you need to define in "pngusr.h" the followings:
  * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
  *        the DLL was built>
@@ -50,8 +50,8 @@
  *        number and must match your private DLL name>
  *  e.g. // private DLL "libpng13gx.dll"
  *       #define PNG_USER_DLLFNAME_POSTFIX "gx"
- * 
- * The following macros are also at your disposal if you want to complete the 
+ *
+ * The following macros are also at your disposal if you want to complete the
  * DLL VERSIONINFO structure.
  * - PNG_USER_VERSIONINFO_COMMENTS
  * - PNG_USER_VERSIONINFO_COMPANYNAME
@@ -147,9 +147,9 @@
  * 'Cygwin' defines/defaults:
  *   PNG_BUILD_DLL -- (ignored) building the dll
  *   (no define)   -- (ignored) building an application, linking to the dll
- *   PNG_STATIC    -- (ignored) building the static lib, or building an 
+ *   PNG_STATIC    -- (ignored) building the static lib, or building an
  *                    application that links to the static lib.
- *   ALL_STATIC    -- (ignored) building various static libs, or building an 
+ *   ALL_STATIC    -- (ignored) building various static libs, or building an
  *                    application that links to the static libs.
  * Thus,
  * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
@@ -162,12 +162,12 @@
  *   PNG_BUILD_DLL
  *   PNG_STATIC
  *   (nothing) == PNG_USE_DLL
- * 
+ *
  * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
- *   of auto-import in binutils, we no longer need to worry about 
+ *   of auto-import in binutils, we no longer need to worry about
  *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,
  *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
- *   to __declspec() stuff.  However, we DO need to worry about 
+ *   to __declspec() stuff.  However, we DO need to worry about
  *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults
  *   such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
  */
@@ -211,8 +211,8 @@
 #        if !defined(PNG_DLL)
 #          define PNG_DLL
 #        endif
-#      endif  
-#    endif  
+#      endif
+#    endif
 #  endif
 #endif
 
@@ -731,7 +731,7 @@
 #  define PNG_EASY_ACCESS_SUPPORTED
 #endif
 
-/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0 
+/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
  * and removed from version 1.2.20.  The following will be removed
  * from libpng-1.4.0
 */
@@ -1306,7 +1306,7 @@ typedef z_stream FAR *  png_zstreamp;
 #  define PNGAPI __cdecl
 #  undef PNG_IMPEXP
 #  define PNG_IMPEXP
-#endif  
+#endif
 
 /* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
  * you may get warnings regarding the linkage of png_zalloc and png_zfree.
diff --git a/PDF/samples/Image/Image.progen b/PDF/samples/Image/Image.progen
index 5b36b4b27..ae20fcfeb 100644
--- a/PDF/samples/Image/Image.progen
+++ b/PDF/samples/Image/Image.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\PDF\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies =
diff --git a/PDF/samples/Template/Template.progen b/PDF/samples/Template/Template.progen
index ae70c9743..8ec52a56c 100644
--- a/PDF/samples/Template/Template.progen
+++ b/PDF/samples/Template/Template.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\PDF\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies =
diff --git a/PDF/samples/Text/Text.progen b/PDF/samples/Text/Text.progen
index 5b36b4b27..ae20fcfeb 100644
--- a/PDF/samples/Text/Text.progen
+++ b/PDF/samples/Text/Text.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\PDF\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies =
diff --git a/PDF/src/AttributedString.cpp b/PDF/src/AttributedString.cpp
index 07879d0ef..59318c542 100644
--- a/PDF/src/AttributedString.cpp
+++ b/PDF/src/AttributedString.cpp
@@ -18,7 +18,7 @@ AttributedString::AttributedString():
 }
 
 
-AttributedString::AttributedString(const char* content): 
+AttributedString::AttributedString(const char* content):
 	_content(content),
 	_align(ALIGN_LEFT),
 	_style(STYLE_PLAIN),
@@ -29,8 +29,8 @@ AttributedString::AttributedString(const char* content):
 
 
 AttributedString::AttributedString(const std::string& content, Alignment align, int style):
-	_content(content), 
-	_align(align), 
+	_content(content),
+	_align(align),
 	_style(static_cast<Style>(style)),
 	_fontName("Helvetica"),
 	_fontSize(10)
diff --git a/PDF/src/Destination.cpp b/PDF/src/Destination.cpp
index ddfef4d8d..192f6eab5 100644
--- a/PDF/src/Destination.cpp
+++ b/PDF/src/Destination.cpp
@@ -21,7 +21,7 @@ namespace PDF {
 
 Destination::Destination(HPDF_Doc* pPDF,
 	const HPDF_Destination& destination,
-	const std::string& name): 
+	const std::string& name):
 	Resource<HPDF_Destination>(pPDF, destination, name)
 {
 }
diff --git a/PDF/src/Document.cpp b/PDF/src/Document.cpp
index a96a219ed..4e56101ed 100644
--- a/PDF/src/Document.cpp
+++ b/PDF/src/Document.cpp
@@ -30,7 +30,7 @@ namespace PDF {
 Document::Document(const std::string fileName,
 	Poco::UInt32 pageCount,
 	Page::Size pageSize,
-	Page::Orientation orientation): 
+	Page::Orientation orientation):
 	_pdf(HPDF_New(HPDF_Error_Handler, 0)),
 	_fileName(fileName),
 	_pRawData(0),
@@ -42,7 +42,7 @@ Document::Document(const std::string fileName,
 
 Document::Document(Poco::UInt32 pageCount,
 	Page::Size pageSize,
-	Page::Orientation orientation): 
+	Page::Orientation orientation):
 	_pdf(HPDF_New(HPDF_Error_Handler, 0)),
 	_pRawData(0),
 	_size(0)
@@ -142,7 +142,7 @@ const Page& Document::getCurrentPage()
 const Font& Document::loadFont(const std::string& name, const std::string& encoding)
 {
 	Font font(&_pdf, HPDF_GetFont(_pdf, name.c_str(), encoding.empty() ? 0 : encoding.c_str()));
-	std::pair<FontContainer::iterator, bool> ret = 
+	std::pair<FontContainer::iterator, bool> ret =
 		_fonts.insert(FontContainer::value_type(name, font));
 
 	if (ret.second) return ret.first->second;
@@ -176,9 +176,9 @@ std::string Document::loadTTFont(const std::string& fileName, bool embed, int in
 	}
 	else if (index >= 0)
 	{
-		return HPDF_LoadTTFontFromFile2(_pdf, 
-			fileName.c_str(), 
-			static_cast<HPDF_UINT>(index), 
+		return HPDF_LoadTTFontFromFile2(_pdf,
+			fileName.c_str(),
+			static_cast<HPDF_UINT>(index),
 			embed ? HPDF_TRUE : HPDF_FALSE);
 	}
 	else
@@ -206,7 +206,7 @@ const Image& Document::loadPNGImageImpl(const std::string& fileName, bool doLoad
 		if (it.second) return it.first->second;
 		else throw IllegalStateException("Could not insert image.");
 	}
-	else 
+	else
 		throw NotFoundException("File not found: " + fileName);
 }
 
@@ -223,7 +223,7 @@ const Image& Document::loadJPEGImage(const std::string& fileName)
 		if (it.second) return it.first->second;
 		else throw IllegalStateException("Could not insert image.");
 	}
-	else 
+	else
 		throw NotFoundException("File not found: " + fileName);
 }
 
@@ -245,7 +245,7 @@ const Encoder& Document::loadEncoder(const std::string& name)
 	if (_encoders.end() == it) return it->second;
 
 	Encoder enc(&_pdf, HPDF_GetEncoder(_pdf, name.c_str()), name);
-	std::pair<EncoderContainer::iterator, bool> ret = 
+	std::pair<EncoderContainer::iterator, bool> ret =
 		_encoders.insert(EncoderContainer::value_type(name, enc));
 
 	if (ret.second) return ret.first->second;
@@ -266,7 +266,7 @@ const Encoder& Document::getCurrentEncoder()
 
 		if (ret.second) return ret.first->second;
 	}
-	
+
 	return it->second;
 }
 
@@ -318,7 +318,7 @@ void Document::setInfo(Info info, const std::string& value)
 {
 	if (INFO_CREATION_DATE == info || INFO_MOD_DATE == info)
 		throw InvalidArgumentException("Can not set document date.");
-	
+
 	HPDF_SetInfoAttr(_pdf, static_cast<HPDF_InfoType>(info), value.c_str());
 }
 
diff --git a/PDF/src/Encoder.cpp b/PDF/src/Encoder.cpp
index 1d05fc246..d4bc352ba 100644
--- a/PDF/src/Encoder.cpp
+++ b/PDF/src/Encoder.cpp
@@ -21,7 +21,7 @@ namespace PDF {
 
 Encoder::Encoder(HPDF_Doc* pPDF,
 	const HPDF_Encoder& encoder,
-	const std::string& name): 
+	const std::string& name):
 	Resource<HPDF_Encoder>(pPDF, encoder, name)
 {
 }
diff --git a/PDF/src/Font.cpp b/PDF/src/Font.cpp
index fcbbc4769..9affe0ff9 100755
--- a/PDF/src/Font.cpp
+++ b/PDF/src/Font.cpp
@@ -19,7 +19,7 @@ namespace Poco {
 namespace PDF {
 
 
-Font::Font(HPDF_Doc* pPDF, HPDF_Font font): 
+Font::Font(HPDF_Doc* pPDF, HPDF_Font font):
 	Resource<HPDF_Font>(pPDF, font, HPDF_Font_GetFontName(font))
 {
 }
diff --git a/PDF/src/Image.cpp b/PDF/src/Image.cpp
index dcd05970b..760f96db7 100644
--- a/PDF/src/Image.cpp
+++ b/PDF/src/Image.cpp
@@ -19,7 +19,7 @@ namespace Poco {
 namespace PDF {
 
 
-Image::Image(HPDF_Doc* pPDF, const HPDF_Image& resource, const std::string& name): 
+Image::Image(HPDF_Doc* pPDF, const HPDF_Image& resource, const std::string& name):
 	Resource<HPDF_Image>(pPDF, resource, name)
 {
 }
diff --git a/PDF/src/LinkAnnotation.cpp b/PDF/src/LinkAnnotation.cpp
index a0390214e..e95ba78a2 100644
--- a/PDF/src/LinkAnnotation.cpp
+++ b/PDF/src/LinkAnnotation.cpp
@@ -22,7 +22,7 @@ namespace PDF {
 
 LinkAnnotation::LinkAnnotation(HPDF_Doc* pPDF,
 	const HPDF_Annotation& annotation,
-	const std::string& name): 
+	const std::string& name):
 	Resource<HPDF_Annotation>(pPDF, annotation, name)
 {
 }
diff --git a/PDF/src/Outline.cpp b/PDF/src/Outline.cpp
index 69a874033..7500bd301 100644
--- a/PDF/src/Outline.cpp
+++ b/PDF/src/Outline.cpp
@@ -20,7 +20,7 @@ namespace Poco {
 namespace PDF {
 
 
-Outline::Outline(HPDF_Doc* pPDF, const HPDF_Outline& outline, const std::string& name): 
+Outline::Outline(HPDF_Doc* pPDF, const HPDF_Outline& outline, const std::string& name):
 	Resource<HPDF_Outline>(pPDF, outline, name)
 {
 	open();
diff --git a/PDF/src/PDFException.cpp b/PDF/src/PDFException.cpp
index 7f109faaf..f192bde33 100644
--- a/PDF/src/PDFException.cpp
+++ b/PDF/src/PDFException.cpp
@@ -26,20 +26,20 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 {
 	switch (error_no)
 	{
-	case HPDF_ARRAY_COUNT_ERR: 
+	case HPDF_ARRAY_COUNT_ERR:
 		throw InvalidArgumentException("Internal error. The consistency of the data was lost.");
-	case HPDF_ARRAY_ITEM_NOT_FOUND: 
+	case HPDF_ARRAY_ITEM_NOT_FOUND:
 		throw NotFoundException("Internal error. The consistency of the data was lost.");
 	case HPDF_ARRAY_ITEM_UNEXPECTED_TYPE:
 		throw InvalidArgumentException("Internal error. The consistency of the data was lost.");
 	case HPDF_BINARY_LENGTH_ERR:
 		throw InvalidArgumentException("The length of the data exceeds HPDF_LIMIT_MAX_STRING_LEN.");
 	case HPDF_CANNOT_GET_PALLET:
-		throw NotFoundException("Cannot get a pallet data from PNG image."); 
+		throw NotFoundException("Cannot get a pallet data from PNG image.");
 	case HPDF_DICT_COUNT_ERR:
 		throw InvalidArgumentException("The count of elements of a dictionary exceeds HPDF_LIMIT_MAX_DICT_ELEMENT");
 	case HPDF_DICT_ITEM_NOT_FOUND:
-		throw NotFoundException("Internal error. The consistency of the data was lost."); 
+		throw NotFoundException("Internal error. The consistency of the data was lost.");
 	case HPDF_DICT_ITEM_UNEXPECTED_TYPE:
 		throw InvalidArgumentException("Internal error. The consistency of the data was lost.");
 	case HPDF_DICT_STREAM_LENGTH_NOT_FOUND:
@@ -47,7 +47,7 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 	case HPDF_DOC_ENCRYPTDICT_NOT_FOUND:
 		throw NotFoundException("HPDF_SetPermission() OR HPDF_SetEncryptMode() was called before a password is set.");
 	case HPDF_DOC_INVALID_OBJECT:
-		throw IllegalStateException("Internal error. The consistency of the data was lost.");  
+		throw IllegalStateException("Internal error. The consistency of the data was lost.");
 	case HPDF_DUPLICATE_REGISTRATION:
 		throw IllegalStateException("Tried to register a font that has been registered.");
 	case HPDF_EXCEED_JWW_CODE_NUM_LIMIT:
@@ -55,7 +55,7 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 	case HPDF_ENCRYPT_INVALID_PASSWORD:
 		throw IllegalStateException("Tried to set the owner password to NULL.");
 	case HPDF_ERR_UNKNOWN_CLASS:
-		throw InvalidArgumentException("Internal error. The consistency of the data was lost."); 
+		throw InvalidArgumentException("Internal error. The consistency of the data was lost.");
 	case HPDF_EXCEED_GSTATE_LIMIT:
 		throw IllegalStateException("The depth of the stack exceeded HPDF_LIMIT_MAX_GSTATE.");
 	case HPDF_FAILD_TO_ALLOC_MEM:
@@ -65,13 +65,13 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 	case HPDF_FILE_OPEN_ERROR:
 		throw IOException("Cannot open a file. (A detailed code is set.)");
 	case HPDF_FONT_EXISTS:
-		throw IllegalStateException("Tried to load a font that has been registered."); 
+		throw IllegalStateException("Tried to load a font that has been registered.");
 	case HPDF_FONT_INVALID_WIDTHS_TABLE:
-		throw IllegalStateException("The format of a font-file is invalid. Internal error. The consistency of the data was lost.");  
+		throw IllegalStateException("The format of a font-file is invalid. Internal error. The consistency of the data was lost.");
 	case HPDF_INVALID_AFM_HEADER:
 		throw IllegalStateException("Cannot recognize a header of an afm file.");
 	case HPDF_INVALID_ANNOTATION:
-		throw IllegalStateException("The specified annotation handle is invalid."); 
+		throw IllegalStateException("The specified annotation handle is invalid.");
 	case HPDF_INVALID_BIT_PER_COMPONENT:
 		throw IllegalStateException("Bit-per-component of a image which was set as mask-image is invalid.");
 	case HPDF_INVALID_CHAR_MATRICS_DATA:
@@ -79,11 +79,11 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 	case HPDF_INVALID_COLOR_SPACE:
 		switch (detail_no)
 		{
-		case 1: 
+		case 1:
 			throw InvalidArgumentException("The color_space parameter of HPDF_LoadRawImage is invalid.");
-		case 2: 
+		case 2:
 			throw InvalidArgumentException("Color-space of a image which was set as mask-image is invalid.");
-		case 3: 
+		case 3:
 			throw InvalidArgumentException("The function which is invalid in the present color-space was invoked.");
 		default:
 			throw PDFException();
@@ -109,7 +109,7 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 	case HPDF_INVALID_FONTDEF_DATA:
 		switch (detail_no)
 		{
-		case 1: 
+		case 1:
 			throw InvalidArgumentException("An invalid font handle was set.");
 		case 2:
 			throw InvalidArgumentException("Unsupported font format.");
@@ -131,7 +131,7 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 		{
 		case 1:
 			throw IllegalStateException("An invalid object is set.");
-		case 2: 
+		case 2:
 			throw IllegalStateException("Internal error. The consistency of the data was lost.");
 		default:
 			throw PDFException();
@@ -167,15 +167,15 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 	case HPDF_INVALID_WX_DATA:
 		throw IOException("Cannot read a width-data from an afm file.");
 	case HPDF_ITEM_NOT_FOUND:
-		throw NotFoundException("Internal error. The consistency of the data was lost."); 
+		throw NotFoundException("Internal error. The consistency of the data was lost.");
 	case HPDF_LIBPNG_ERROR:
 		throw IOException("An error has returned from PNGLIB while loading an image.");
 	case HPDF_NAME_INVALID_VALUE:
 		throw InvalidArgumentException("Internal error. The consistency of the data was lost.");
 	case HPDF_NAME_OUT_OF_RANGE:
-		throw InvalidArgumentException("Internal error. The consistency of the data was lost.");  
+		throw InvalidArgumentException("Internal error. The consistency of the data was lost.");
 	case HPDF_PAGES_MISSING_KIDS_ENTRY:
-		throw IllegalStateException("Internal error. The consistency of the data was lost.");  
+		throw IllegalStateException("Internal error. The consistency of the data was lost.");
 	case HPDF_PAGE_CANNOT_FIND_OBJECT:
 		throw NotFoundException("Internal error. The consistency of the data was lost.");
 	case HPDF_PAGE_CANNOT_GET_ROOT_PAGES:
@@ -197,7 +197,7 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 	case HPDF_PAGE_INVALID_ROTATE_VALUE:
 		throw InvalidArgumentException("The specified value is not a multiple of 90.");
 	case HPDF_PAGE_INVALID_SIZE:
-		throw InvalidArgumentException("An invalid page-size was set.");  
+		throw InvalidArgumentException("An invalid page-size was set.");
 	case HPDF_PAGE_INVALID_XOBJECT:
 		throw InvalidArgumentException("An invalid image-handle was set.");
 	case HPDF_PAGE_OUT_OF_RANGE:
@@ -219,7 +219,7 @@ void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_
 	case HPDF_TTF_INVALID_FOMAT:
 		throw InvalidArgumentException("Unsupported ttf format.");
 	case HPDF_TTF_MISSING_TABLE:
-		throw InvalidArgumentException("Unsupported ttf format. (cannot find a necessary table)");  
+		throw InvalidArgumentException("Unsupported ttf format. (cannot find a necessary table)");
 	case HPDF_UNSUPPORTED_FONT_TYPE:
 		throw InvalidArgumentException("Internal error. The consistency of the data was lost.");
 	case HPDF_UNSUPPORTED_FUNC:
diff --git a/PDF/src/Page.cpp b/PDF/src/Page.cpp
index 6f7fd49c1..81bb6f019 100755
--- a/PDF/src/Page.cpp
+++ b/PDF/src/Page.cpp
@@ -67,7 +67,7 @@ bool Page::operator == (const Page& other) const
 }
 
 
-void Page::swap(Page& other)
+void Page::swap(Page& other) noexcept
 {
 	using std::swap;
 
@@ -141,11 +141,11 @@ void Page::setRotation(int angle)
 const Destination& Page::createDestination(const std::string& name)
 {
 	DestinationContainer::iterator it = _destinations.find(name);
-	if (_destinations.end() != it) 
+	if (_destinations.end() != it)
 		throw InvalidArgumentException("Destination already exists.");
 
 	Destination dest(&_pDocument->handle(), HPDF_Page_CreateDestination(_page), name);
-	std::pair<DestinationContainer::iterator, bool> ret = 
+	std::pair<DestinationContainer::iterator, bool> ret =
 		_destinations.insert(DestinationContainer::value_type(name, dest));
 
 	if (ret.second) return ret.first->second;
@@ -154,20 +154,20 @@ const Destination& Page::createDestination(const std::string& name)
 }
 
 
-const TextAnnotation& Page::createTextAnnotation(const std::string& name, 
+const TextAnnotation& Page::createTextAnnotation(const std::string& name,
 	const Rectangle& rect,
 	const std::string& text,
 	const Encoder& encoder)
 {
 	TextAnnotationContainer::iterator it = _textAnnotations.find(name);
-	if (_textAnnotations.end() != it) 
+	if (_textAnnotations.end() != it)
 		throw InvalidArgumentException("Annotation already exists.");
 
 	TextAnnotation ann(&_pDocument->handle(),
 		HPDF_Page_CreateTextAnnot(_page, rect, text.c_str(), encoder),
 		name);
 
-	std::pair<TextAnnotationContainer::iterator, bool> ret = 
+	std::pair<TextAnnotationContainer::iterator, bool> ret =
 		_textAnnotations.insert(TextAnnotationContainer::value_type(name, ann));
 
 	if (ret.second) return ret.first->second;
@@ -176,18 +176,18 @@ const TextAnnotation& Page::createTextAnnotation(const std::string& name,
 }
 
 
-const LinkAnnotation& Page::createLinkAnnotation(const std::string& name, 
+const LinkAnnotation& Page::createLinkAnnotation(const std::string& name,
 	const Rectangle& rect,
 	const Destination& dest)
 {
 	LinkAnnotationContainer::iterator it = _linkAnnotations.find(name);
-	if (_linkAnnotations.end() != it) 
+	if (_linkAnnotations.end() != it)
 		throw InvalidArgumentException("Annotation already exists.");
 
 	LinkAnnotation ann(&_pDocument->handle(),
 		HPDF_Page_CreateLinkAnnot(_page, rect, dest),
 		name);
-	std::pair<LinkAnnotationContainer::iterator, bool> ret = 
+	std::pair<LinkAnnotationContainer::iterator, bool> ret =
 		_linkAnnotations.insert(LinkAnnotationContainer::value_type(name, ann));
 
 	if (ret.second) return ret.first->second;
@@ -196,18 +196,18 @@ const LinkAnnotation& Page::createLinkAnnotation(const std::string& name,
 }
 
 
-const LinkAnnotation& Page::createURILinkAnnotation(const std::string& name, 
+const LinkAnnotation& Page::createURILinkAnnotation(const std::string& name,
 	const Rectangle& rect,
 	const std::string& uri)
 {
 	LinkAnnotationContainer::iterator it = _linkAnnotations.find(name);
-	if (_linkAnnotations.end() != it) 
+	if (_linkAnnotations.end() != it)
 		throw InvalidArgumentException("Annotation already exists.");
 
 	LinkAnnotation ann(&_pDocument->handle(),
 		HPDF_Page_CreateURILinkAnnot(_page, rect, uri.c_str()),
 		name);
-	std::pair<LinkAnnotationContainer::iterator, bool> ret = 
+	std::pair<LinkAnnotationContainer::iterator, bool> ret =
 		_linkAnnotations.insert(LinkAnnotationContainer::value_type(name, ann));
 
 	if (ret.second) return ret.first->second;
diff --git a/PDF/src/TextAnnotation.cpp b/PDF/src/TextAnnotation.cpp
index 0b8d7f132..d2e9f3d9c 100644
--- a/PDF/src/TextAnnotation.cpp
+++ b/PDF/src/TextAnnotation.cpp
@@ -22,7 +22,7 @@ namespace PDF {
 
 TextAnnotation::TextAnnotation(HPDF_Doc* pPDF,
 	const HPDF_Annotation& annotation,
-	const std::string& name): 
+	const std::string& name):
 	Resource<HPDF_Annotation>(pPDF, annotation, name)
 {
 	open();
diff --git a/PDF/src/XMLTemplate.cpp b/PDF/src/XMLTemplate.cpp
index 871f19a02..8b9d102f5 100755
--- a/PDF/src/XMLTemplate.cpp
+++ b/PDF/src/XMLTemplate.cpp
@@ -457,7 +457,7 @@ public:
 		AttributedString::Alignment align = AttributedString::ALIGN_LEFT;
 		int style = AttributedString::STYLE_PLAIN;
 
-		
+
 		std::string fontFamily = _styles.getString("font-family");
 		float       fontSize = _styles.getFloat("font-size");
 		std::string textAlign = _styles.getString("text-align", "left");
diff --git a/PDF/src/hpdf_3dmeasure.c b/PDF/src/hpdf_3dmeasure.c
index aaa1e811d..a8335f6a6 100644
--- a/PDF/src/hpdf_3dmeasure.c
+++ b/PDF/src/hpdf_3dmeasure.c
@@ -81,7 +81,7 @@ HPDF_3DC3DMeasure_New(HPDF_MMgr mmgr,
 
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DMeasure_SetColor(HPDF_3DMeasure measure, 
+HPDF_3DMeasure_SetColor(HPDF_3DMeasure measure,
 						   HPDF_RGBColor color)
 {
 	HPDF_Array array;
@@ -105,7 +105,7 @@ HPDF_3DMeasure_SetColor(HPDF_3DMeasure measure,
 
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DMeasure_SetTextSize(HPDF_3DMeasure measure, 
+HPDF_3DMeasure_SetTextSize(HPDF_3DMeasure measure,
 						   HPDF_REAL textsize)
 {
 	HPDF_STATUS ret = HPDF_OK;
@@ -117,7 +117,7 @@ HPDF_3DMeasure_SetTextSize(HPDF_3DMeasure measure,
 
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DMeasure_SetName(HPDF_3DMeasure measure, 
+HPDF_3DMeasure_SetName(HPDF_3DMeasure measure,
 					   const char* name)
 {
 	HPDF_STATUS ret = HPDF_OK;
@@ -133,7 +133,7 @@ HPDF_3DMeasure_SetName(HPDF_3DMeasure measure,
 }
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DC3DMeasure_SetTextBoxSize(HPDF_3DMeasure measure, 
+HPDF_3DC3DMeasure_SetTextBoxSize(HPDF_3DMeasure measure,
 							 HPDF_INT32 x,
 							 HPDF_INT32 y)
 {
@@ -155,7 +155,7 @@ HPDF_3DC3DMeasure_SetTextBoxSize(HPDF_3DMeasure measure,
 }
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DC3DMeasure_SetText(HPDF_3DMeasure measure, 
+HPDF_3DC3DMeasure_SetText(HPDF_3DMeasure measure,
 						  const char* text,
 						  HPDF_Encoder encoder)
 {
@@ -172,7 +172,7 @@ HPDF_3DC3DMeasure_SetText(HPDF_3DMeasure measure,
 }
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DC3DMeasure_SetProjectionAnotation(HPDF_3DMeasure measure, 
+HPDF_3DC3DMeasure_SetProjectionAnotation(HPDF_3DMeasure measure,
 						                 HPDF_Annotation projectionanotation)
 {
 	HPDF_STATUS ret = HPDF_OK;
diff --git a/PDF/src/hpdf_annotation.c b/PDF/src/hpdf_annotation.c
index f90500619..b24617a1d 100644
--- a/PDF/src/hpdf_annotation.c
+++ b/PDF/src/hpdf_annotation.c
@@ -378,7 +378,7 @@ HPDF_3DAnnot_New    (HPDF_MMgr        mmgr,
     if (!annot) {
         return NULL;
     }
-    
+
     HPDF_Dict_Add(annot, "Contents", HPDF_String_New (mmgr, "3D Model", NULL));
 
     action = HPDF_Dict_New (mmgr);
@@ -533,7 +533,7 @@ HPDF_Annot_SetGrayColor (HPDF_Annotation annot, HPDF_REAL color)
 
     if (ret != HPDF_OK)
         return HPDF_Error_GetCode ( annot->error);
-    
+
     return HPDF_OK;
 }
 
@@ -550,7 +550,7 @@ HPDF_Annot_SetNoColor (HPDF_Annotation annot)
         return HPDF_Error_GetCode ( annot->error);
 
     ret = HPDF_Dict_Add (annot, "C", cArray);
-    
+
     return ret;
 }
 
@@ -788,7 +788,7 @@ CheckSubType (HPDF_Annotation  annot,
 }
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_Annot_Set3DView ( HPDF_MMgr mmgr, 
+HPDF_Annot_Set3DView ( HPDF_MMgr mmgr,
                      HPDF_Annotation    annot,
                      HPDF_Annotation    annot3d,
                      HPDF_Dict            view3d)
@@ -796,11 +796,11 @@ HPDF_Annot_Set3DView ( HPDF_MMgr mmgr,
     HPDF_Proxy proxyView3d;
     HPDF_Dict exData = HPDF_Dict_New( mmgr);
     HPDF_STATUS retS = HPDF_OK;
-    
+
     retS += HPDF_Dict_AddName( exData, "Type", "ExData");
     retS += HPDF_Dict_AddName( exData, "Subtype", "Markup3D");
     retS += HPDF_Dict_Add( exData, "3DA", annot3d);
-    
+
     proxyView3d = HPDF_Proxy_New( mmgr, view3d);
 
     retS += HPDF_Dict_Add( exData, "3DV", proxyView3d);
@@ -833,7 +833,7 @@ HPDF_Annotation
 HPDF_StampAnnot_New (HPDF_MMgr         mmgr,
                      HPDF_Xref         xref,
                      HPDF_Rect         rect,
-                     HPDF_StampAnnotName name,                     
+                     HPDF_StampAnnotName name,
                      const char*       text,
                      HPDF_Encoder       encoder)
 {
@@ -847,7 +847,7 @@ HPDF_StampAnnot_New (HPDF_MMgr         mmgr,
 
     if (HPDF_Dict_AddName ( annot, "Name", HPDF_STAMP_ANNOT_NAME_NAMES[name]) != HPDF_OK)
         return NULL;
-    
+
     s = HPDF_String_New (mmgr, text, encoder);
     if (!s)
         return NULL;
@@ -891,7 +891,7 @@ HPDF_TextMarkupAnnot_SetQuadPoints ( HPDF_Annotation annot, HPDF_Point lb, HPDF_
     HPDF_STATUS ret = HPDF_OK;
 
     HPDF_PTRACE((" HPDF_TextMarkupAnnot_SetQuadPoints\n"));
-    
+
     quadPoints = HPDF_Array_New ( annot->mmgr);
     if ( !quadPoints)
         return HPDF_Error_GetCode ( annot->error);
@@ -946,7 +946,7 @@ HPDF_MarkupAnnot_SetRectDiff (HPDF_Annotation  annot, HPDF_Rect  rect) /* RD ent
     HPDF_REAL tmp;
 
     HPDF_PTRACE((" HPDF_MarkupAnnot_SetRectDiff\n"));
-    
+
     array = HPDF_Array_New ( annot->mmgr);
     if ( !array)
         return HPDF_Error_GetCode ( annot->error);
@@ -977,9 +977,9 @@ HPDF_FreeTextAnnot_SetDefaultStyle (HPDF_Annotation  annot,
 {
     HPDF_String s;
     HPDF_STATUS ret = HPDF_OK;
-    
+
     HPDF_PTRACE((" HPDF_FreeTextAnnot_SetDefaultStyle\n"));
-    
+
     s = HPDF_String_New ( annot->mmgr, style, NULL);
     if ( !s)
         return HPDF_Error_GetCode ( annot->error);
@@ -996,7 +996,7 @@ HPDF_FreeTextAnnot_Set3PointCalloutLine ( HPDF_Annotation annot, HPDF_Point star
     HPDF_STATUS ret = HPDF_OK;
 
     HPDF_PTRACE((" HPDF_FreeTextAnnot_Set3PointCalloutLine\n"));
-    
+
     clPoints = HPDF_Array_New ( annot->mmgr);
     if ( !clPoints)
         return HPDF_Error_GetCode ( annot->error);
@@ -1024,7 +1024,7 @@ HPDF_FreeTextAnnot_Set2PointCalloutLine ( HPDF_Annotation annot, HPDF_Point star
     HPDF_STATUS ret = HPDF_OK;
 
     HPDF_PTRACE((" HPDF_FreeTextAnnot_Set3PointCalloutLine\n"));
-    
+
     clPoints = HPDF_Array_New ( annot->mmgr);
     if ( !clPoints)
         return HPDF_Error_GetCode ( annot->error);
@@ -1050,15 +1050,15 @@ HPDF_MarkupAnnot_SetCloudEffect (HPDF_Annotation  annot, HPDF_INT cloudIntensity
     HPDF_STATUS ret = HPDF_OK;
 
     HPDF_PTRACE((" HPDF_MarkupAnnot_SetCloudEffect\n"));
-    
+
     borderEffect = HPDF_Dict_New ( annot->mmgr);
     if (!borderEffect)
         return HPDF_Error_GetCode ( annot->error);
-    
+
     ret += HPDF_Dict_Add ( annot, "BE", borderEffect);
     ret += HPDF_Dict_AddName ( borderEffect, "S", "C");
     ret += HPDF_Dict_AddNumber ( borderEffect, "I", cloudIntensity);
-    
+
     if (ret != HPDF_OK)
         return HPDF_Error_GetCode (annot->error);
 
@@ -1066,8 +1066,8 @@ HPDF_MarkupAnnot_SetCloudEffect (HPDF_Annotation  annot, HPDF_INT cloudIntensity
 }
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_LineAnnot_SetPosition (HPDF_Annotation annot, 
-                            HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle, 
+HPDF_LineAnnot_SetPosition (HPDF_Annotation annot,
+                            HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle,
                             HPDF_Point endPoint, HPDF_LineAnnotEndingStyle endStyle)
 {
     HPDF_Array lineEndPoints;
@@ -1113,7 +1113,7 @@ HPDF_LineAnnot_SetLeader (HPDF_Annotation annot, HPDF_INT leaderLen, HPDF_INT le
     HPDF_STATUS ret = HPDF_OK;
 
     HPDF_PTRACE((" HPDF_LineAnnot_SetLeader\n"));
-    
+
     ret += HPDF_Dict_AddNumber ( annot, "LL", leaderLen);
     ret += HPDF_Dict_AddNumber ( annot, "LLE", leaderExtLen);
     ret += HPDF_Dict_AddNumber ( annot, "LLO", leaderOffsetLen);
@@ -1130,7 +1130,7 @@ HPDF_LineAnnot_SetCaption (HPDF_Annotation annot, HPDF_BOOL showCaption, HPDF_Li
     HPDF_STATUS ret = HPDF_OK;
     HPDF_Array capOffset;
     HPDF_PTRACE((" HPDF_LineAnnot_SetCaption\n"));
-    
+
     ret += HPDF_Dict_AddBoolean ( annot, "Cap", showCaption);
     ret += HPDF_Dict_AddName( annot, "CP", HPDF_LINE_ANNOT_CAP_POSITION_NAMES[(HPDF_INT)position]);
 
diff --git a/PDF/src/hpdf_encoder_utf.c b/PDF/src/hpdf_encoder_utf.c
index b8dd7342f..876ca39e9 100644
--- a/PDF/src/hpdf_encoder_utf.c
+++ b/PDF/src/hpdf_encoder_utf.c
@@ -242,7 +242,7 @@ UTF8_Init  (HPDF_Encoder  encoder)
                 HPDF_LIMIT_MAX_NAME_LEN);
     attr->suppliment = 0;
     attr->writing_mode = HPDF_WMODE_HORIZONTAL;
-    
+
     /* Not sure about this
     attr->uid_offset = 0;
     attr->xuid[0] = 0;
diff --git a/PDF/src/hpdf_exdata.c b/PDF/src/hpdf_exdata.c
index d63aab249..f66177bea 100644
--- a/PDF/src/hpdf_exdata.c
+++ b/PDF/src/hpdf_exdata.c
@@ -55,7 +55,7 @@ HPDF_3DAnnotExData_New(HPDF_MMgr mmgr,
 
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_3DAnnotExData_Set3DMeasurement(HPDF_ExData exdata, 
+HPDF_3DAnnotExData_Set3DMeasurement(HPDF_ExData exdata,
 						   HPDF_3DMeasure measure)
 {
 	HPDF_STATUS ret = HPDF_OK;
diff --git a/PDF/src/hpdf_ext_gstate.c b/PDF/src/hpdf_ext_gstate.c
index 60347d04e..86376251b 100644
--- a/PDF/src/hpdf_ext_gstate.c
+++ b/PDF/src/hpdf_ext_gstate.c
@@ -39,7 +39,7 @@ static const char * const HPDF_BM_NAMES[] = {
 HPDF_BOOL
 HPDF_ExtGState_Validate  (HPDF_ExtGState  ext_gstate)
 {
-    if (!ext_gstate || (ext_gstate->header.obj_class != 
+    if (!ext_gstate || (ext_gstate->header.obj_class !=
                 (HPDF_OSUBCLASS_EXT_GSTATE | HPDF_OCLASS_DICT) &&
                 ext_gstate->header.obj_class !=
                  (HPDF_OSUBCLASS_EXT_GSTATE_R | HPDF_OCLASS_DICT)))
@@ -54,8 +54,8 @@ ExtGState_Check  (HPDF_ExtGState  ext_gstate)
 {
     if (!HPDF_ExtGState_Validate (ext_gstate))
         return HPDF_INVALID_OBJECT;
-    
-    if (ext_gstate->header.obj_class == 
+
+    if (ext_gstate->header.obj_class ==
             (HPDF_OSUBCLASS_EXT_GSTATE_R | HPDF_OCLASS_DICT))
         return HPDF_RaiseError (ext_gstate->error, HPDF_EXT_GSTATE_READ_ONLY,
                 0);
@@ -65,7 +65,7 @@ ExtGState_Check  (HPDF_ExtGState  ext_gstate)
 
 
 HPDF_Dict
-HPDF_ExtGState_New  (HPDF_MMgr   mmgr, 
+HPDF_ExtGState_New  (HPDF_MMgr   mmgr,
                      HPDF_Xref   xref)
 {
     HPDF_Dict obj = HPDF_Dict_New (mmgr);
@@ -92,12 +92,12 @@ HPDF_ExtGState_SetAlphaStroke  (HPDF_ExtGState   ext_gstate,
                                 HPDF_REAL        value)
 {
     HPDF_STATUS ret = ExtGState_Check (ext_gstate);
-    
+
     if (ret != HPDF_OK)
         return ret;
-    
+
     if (value < 0 || value > 1.0f)
-        return HPDF_RaiseError (ext_gstate->error, 
+        return HPDF_RaiseError (ext_gstate->error,
                 HPDF_EXT_GSTATE_OUT_OF_RANGE, 0);
 
     return HPDF_Dict_AddReal (ext_gstate, "CA", value);
@@ -109,12 +109,12 @@ HPDF_ExtGState_SetAlphaFill  (HPDF_ExtGState   ext_gstate,
                               HPDF_REAL        value)
 {
     HPDF_STATUS ret = ExtGState_Check (ext_gstate);
-    
+
     if (ret != HPDF_OK)
         return ret;
 
     if (value < 0 || value > 1.0f)
-        return HPDF_RaiseError (ext_gstate->error, 
+        return HPDF_RaiseError (ext_gstate->error,
                 HPDF_EXT_GSTATE_OUT_OF_RANGE, 0);
 
     return HPDF_Dict_AddReal (ext_gstate, "ca", value);
@@ -126,12 +126,12 @@ HPDF_ExtGState_SetBlendMode  (HPDF_ExtGState   ext_gstate,
                               HPDF_BlendMode   bmode)
 {
     HPDF_STATUS ret = ExtGState_Check (ext_gstate);
-    
+
     if (ret != HPDF_OK)
         return ret;
 
     if ((int)bmode < 0 || (int)bmode > (int)HPDF_BM_EOF)
-        return HPDF_RaiseError (ext_gstate->error, 
+        return HPDF_RaiseError (ext_gstate->error,
                 HPDF_EXT_GSTATE_OUT_OF_RANGE, 0);
 
     return HPDF_Dict_AddName (ext_gstate, "BM", HPDF_BM_NAMES[(int)bmode]);
@@ -143,7 +143,7 @@ HPDF_ExtGState_SetStrokeAdjustment  (HPDF_ExtGState   ext_gstate,
                                      HPDF_BOOL        value)
 {
     HPDF_STATUS ret = ExtGState_Check (ext_gstate);
-    
+
     if (ret != HPDF_OK)
         return ret;
 
diff --git a/PDF/src/hpdf_image_ccitt.c b/PDF/src/hpdf_image_ccitt.c
index 86727637d..6b955e39b 100644
--- a/PDF/src/hpdf_image_ccitt.c
+++ b/PDF/src/hpdf_image_ccitt.c
@@ -99,7 +99,7 @@ struct _HPDF_CCITT_Data {
 	tsize_t		tif_rawdatasize;/* # of bytes in raw data buffer */
 	tsize_t		tif_rawcc;	/* bytes unread from raw buffer */
 	tidata_t	tif_rawcp;	/* current spot in raw buffer */
-	tidata_t	tif_rawdata;	/* raw data buffer */	
+	tidata_t	tif_rawdata;	/* raw data buffer */
 
 } HPDF_CCITT_Data;
 
@@ -124,7 +124,7 @@ static HPDF_STATUS HPDF_InitCCITTFax3(struct _HPDF_CCITT_Data *pData)
 	/*
 	 * Override parent get/set field methods.
 	 */
-	sp->groupoptions = 0;	
+	sp->groupoptions = 0;
 	sp->recvparams = 0;
 	sp->subaddress = NULL;
 	sp->faxdcs = NULL;
@@ -209,7 +209,7 @@ HPDF_Fax3SetupState(struct _HPDF_CCITT_Data *pData, HPDF_UINT          width,
 /*
  * Reset encoding state at the start of a strip.
  */
-static HPDF_STATUS 
+static HPDF_STATUS
 HPDF_Fax3PreEncode(struct _HPDF_CCITT_Data *pData/*, tsample_t s*/)
 {
 	HPDF_Fax3CodecState* sp = EncoderState(pData);
@@ -230,8 +230,8 @@ HPDF_Fax3PreEncode(struct _HPDF_CCITT_Data *pData/*, tsample_t s*/)
 	return HPDF_OK;
 }
 
-static HPDF_STATUS 
-HPDF_CCITT_AppendToStream(HPDF_Stream  dst, 	
+static HPDF_STATUS
+HPDF_CCITT_AppendToStream(HPDF_Stream  dst,
 						  tidata_t	tif_rawdata,
 						  tsize_t	tif_rawcc)
 {
@@ -245,7 +245,7 @@ HPDF_CCITT_AppendToStream(HPDF_Stream  dst,
  * called by ``encodestrip routines'' w/o concern
  * for infinite recursion.
  */
-static HPDF_STATUS 
+static HPDF_STATUS
 HPDF_CCITT_FlushData(struct _HPDF_CCITT_Data *pData)
 {
 	if (pData->tif_rawcc > 0) {
@@ -533,7 +533,7 @@ find1span(unsigned char* bp, int32 bs, int32 be)
 
 
 /*
-void 
+void
 HPDF_Fax3PostEncode(struct _HPDF_CCITT_Data *pData)
 {
 	HPDF_Fax3CodecState* sp = EncoderState(pData);
@@ -561,7 +561,7 @@ static const tableentry vcodes[7] = {
  * 2d-encode a row of pixels.  Consult the CCITT
  * documentation for the algorithm.
  */
-static HPDF_STATUS 
+static HPDF_STATUS
 HPDF_Fax3Encode2DRow(struct _HPDF_CCITT_Data *pData, unsigned char* bp, unsigned char* rp, uint32 bits)
 {
 #define	PIXEL(buf,ix)	((((buf)[(ix)>>3]) >> (7-((ix)&7))) & 1)
@@ -606,7 +606,7 @@ HPDF_Fax3Encode2DRow(struct _HPDF_CCITT_Data *pData, unsigned char* bp, unsigned
 /*
  * Encode the requested amount of data.
  */
-static HPDF_STATUS 
+static HPDF_STATUS
 HPDF_Fax4Encode(struct _HPDF_CCITT_Data *pData, tidata_t bp, tsize_t cc/*, tsample_t s*/)
 {
 	HPDF_Fax3CodecState *sp = EncoderState(pData);
@@ -631,14 +631,14 @@ HPDF_Fax4PostEncode(struct _HPDF_CCITT_Data *pData)
 	HPDF_Fax3PutBits(pData, EOL, 12);
 	HPDF_Fax3PutBits(pData, EOL, 12);
 	/*if (sp->bit != 8)
-		HPDF_Fax3FlushBits(pData, sp);	
+		HPDF_Fax3FlushBits(pData, sp);
 		*/
 	HPDF_CCITT_FlushData(pData);
 }
 
 
 
-HPDF_STATUS 
+HPDF_STATUS
 HPDF_Stream_CcittToStream( const HPDF_BYTE   *buf,
                             HPDF_Stream  dst,
 							HPDF_Encrypt  e,
@@ -663,7 +663,7 @@ HPDF_Stream_CcittToStream( const HPDF_BYTE   *buf,
 		pBufPos = buf+(line_width*(height-1));
 		pBufEnd= buf-line_width;
 		lineIncrement = -((int)line_width);
-	}	
+	}
 
 	memset(&data, 0, sizeof(struct _HPDF_CCITT_Data));
 	data.dst = dst;
@@ -750,7 +750,7 @@ HPDF_Image_Load1BitImageFromMem  (HPDF_MMgr        mmgr,
 /*
  * Load image from buffer
  * line_width - width of the line in bytes
- * top_is_first - image orientation: 
+ * top_is_first - image orientation:
  *      TRUE if image is oriented TOP-BOTTOM;
  *      FALSE if image is oriented BOTTOM-TOP
  */
@@ -783,7 +783,7 @@ HPDF_Image_LoadRaw1BitImageFromMem  (HPDF_Doc           pdf,
 		if(image->filterParams==NULL) {
 			return NULL;
 		}
-		
+
 		/* pure 2D encoding, default is 0 */
 		HPDF_Dict_AddNumber (image->filterParams, "K", -1);
 		/* default is 1728 */
diff --git a/PDF/src/hpdf_image_png.c b/PDF/src/hpdf_image_png.c
index 3a35f5c3c..de9345a59 100644
--- a/PDF/src/hpdf_image_png.c
+++ b/PDF/src/hpdf_image_png.c
@@ -474,7 +474,7 @@ LoadPngData  (HPDF_Dict     image,
 		HPDF_Dict smask;
 		png_bytep smask_data;
 
-		if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) || 
+		if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ||
 			!png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL)) {
 			goto no_transparent_color_in_palette;
 		}
@@ -534,7 +534,7 @@ LoadPngData  (HPDF_Dict     image,
 
 no_transparent_color_in_palette:
 
-	/* read images with alpha channel right away 
+	/* read images with alpha channel right away
 	   we have to do this because image transparent mask must be added to the Xref */
 	if (xref && PNG_COLOR_MASK_ALPHA & color_type) {
 		HPDF_Dict smask;
diff --git a/PDF/src/hpdf_page_operator.c b/PDF/src/hpdf_page_operator.c
index 23f592077..3a383a94e 100644
--- a/PDF/src/hpdf_page_operator.c
+++ b/PDF/src/hpdf_page_operator.c
@@ -2830,7 +2830,7 @@ HPDF_Page_New_Content_Stream  (HPDF_Page page,
 
     /* check if there is already an array of contents */
     contents_array = (HPDF_Array) HPDF_Dict_GetItem(page,"Contents", HPDF_OCLASS_ARRAY);
-    if (!contents_array) {	
+    if (!contents_array) {
         HPDF_Error_Reset (page->error);
         /* no contents_array already -- create one
            and replace current single contents item */
@@ -2851,7 +2851,7 @@ HPDF_Page_New_Content_Stream  (HPDF_Page page,
 
     ret += HPDF_Array_Add (contents_array,attr->contents);
 
-    /* return the value of the new stream, so that 
+    /* return the value of the new stream, so that
        the application can use it as a shared contents stream */
     if (ret == HPDF_OK && new_stream != NULL)
         *new_stream = attr->contents;
@@ -2879,7 +2879,7 @@ HPDF_Page_Insert_Shared_Content_Stream  (HPDF_Page page,
 
     /* check if there is already an array of contents */
     contents_array = (HPDF_Array) HPDF_Dict_GetItem(page,"Contents", HPDF_OCLASS_ARRAY);
-    if (!contents_array) {	
+    if (!contents_array) {
         HPDF_PageAttr attr;
         HPDF_Error_Reset (page->error);
         /* no contents_array already -- create one
diff --git a/PDF/src/hpdf_pages.c b/PDF/src/hpdf_pages.c
index fcc9b5cc4..d1a2bbb3d 100644
--- a/PDF/src/hpdf_pages.c
+++ b/PDF/src/hpdf_pages.c
@@ -695,7 +695,7 @@ AddAnnotation  (HPDF_Page        page,
         if (ret != HPDF_OK)
             return ret;
     }
-    
+
     if ((ret = HPDF_Array_Add (array, annot)) != HPDF_OK)
        return ret;
 
@@ -1225,7 +1225,7 @@ HPDF_Page_GetCurrentTextPos (HPDF_Page  page)
         if (attr->gmode & HPDF_GMODE_TEXT_OBJECT)
             pos = attr->text_pos;
     }
-    
+
     return pos;
 }
 
@@ -1893,7 +1893,7 @@ HPDF_Page_Create3DC3DMeasure(HPDF_Page page,
 	attr = (HPDF_PageAttr)page->attr;
 
 	measure = HPDF_3DC3DMeasure_New(page->mmgr, attr->xref, firstanchorpoint, textanchorpoint);
-	if ( !measure) 
+	if ( !measure)
 		HPDF_CheckError (page->error);
 
 	return measure;
@@ -1921,9 +1921,9 @@ HPDF_Page_CreatePD33DMeasure(HPDF_Page       page,
 
 	attr = (HPDF_PageAttr)page->attr;
 
-	measure = HPDF_PD33DMeasure_New(page->mmgr, 
-		attr->xref, 
-		annotationPlaneNormal, 
+	measure = HPDF_PD33DMeasure_New(page->mmgr,
+		attr->xref,
+		annotationPlaneNormal,
 		firstAnchorPoint,
 		secondAnchorPoint,
 		leaderLinesDirection,
@@ -1932,7 +1932,7 @@ HPDF_Page_CreatePD33DMeasure(HPDF_Page       page,
 		value,
 		unitsString
 		);
-	if ( !measure) 
+	if ( !measure)
 		HPDF_CheckError (page->error);
 
 	return measure;
@@ -1953,7 +1953,7 @@ HPDF_Page_Create3DAnnotExData(HPDF_Page page)
 	attr = (HPDF_PageAttr)page->attr;
 
 	exData = HPDF_3DAnnotExData_New(page->mmgr, attr->xref);
-	if ( !exData) 
+	if ( !exData)
 		HPDF_CheckError (page->error);
 
 	return exData;
diff --git a/PDF/src/hpdf_pdfa.c b/PDF/src/hpdf_pdfa.c
index df06d1c13..c712a4eb9 100644
--- a/PDF/src/hpdf_pdfa.c
+++ b/PDF/src/hpdf_pdfa.c
@@ -283,7 +283,7 @@ HPDF_PDFA_SetPDFAConformance (HPDF_Doc pdf,HPDF_PDFAType pdfatype)
     return HPDF_OK;
 }
 
-/* Generate an ID for the trailer dict, PDF/A needs this. 
+/* Generate an ID for the trailer dict, PDF/A needs this.
    TODO: Better algorithm for generate unique ID.
 */
 HPDF_STATUS
@@ -293,32 +293,32 @@ HPDF_PDFA_GenerateID(HPDF_Doc pdf)
     HPDF_BYTE *currentTime;
     HPDF_BYTE idkey[HPDF_MD5_KEY_LEN];
     HPDF_MD5_CTX md5_ctx;
-    time_t ltime; 
+    time_t ltime;
 
-    ltime = time(NULL); 
+    ltime = time(NULL);
     currentTime = (HPDF_BYTE *)ctime(&ltime);
-        
+
     id = HPDF_Dict_GetItem(pdf->trailer, "ID", HPDF_OCLASS_ARRAY);
     if (!id) {
        id = HPDF_Array_New(pdf->mmgr);
 
        if (!id || HPDF_Dict_Add(pdf->trailer, "ID", id) != HPDF_OK)
          return pdf->error.error_no;
-       
+
        HPDF_MD5Init(&md5_ctx);
        HPDF_MD5Update(&md5_ctx, (HPDF_BYTE *) "libHaru", sizeof("libHaru") - 1);
        HPDF_MD5Update(&md5_ctx, currentTime, HPDF_StrLen((const char *)currentTime, -1));
        HPDF_MD5Final(idkey, &md5_ctx);
-       
+
        if (HPDF_Array_Add (id, HPDF_Binary_New (pdf->mmgr, idkey, HPDF_MD5_KEY_LEN)) != HPDF_OK)
          return pdf->error.error_no;
 
        if (HPDF_Array_Add (id, HPDF_Binary_New (pdf->mmgr,idkey,HPDF_MD5_KEY_LEN)) != HPDF_OK)
          return pdf->error.error_no;
-    
+
        return HPDF_OK;
     }
-    
+
     return HPDF_OK;
 }
 
diff --git a/PDF/src/hpdf_streams.c b/PDF/src/hpdf_streams.c
index d73c1fc90..8d386f456 100644
--- a/PDF/src/hpdf_streams.c
+++ b/PDF/src/hpdf_streams.c
@@ -432,9 +432,9 @@ HPDF_Stream_WriteEscapeText2  (HPDF_Stream    stream,
 
     HPDF_PTRACE((" HPDF_Stream_WriteEscapeText2\n"));
 
-   /* The following block is commented out because it violates "PDF Spec 7.3.4.2 Literal Strings". 
-	* It states that the two matching parentheses must still be present to represent an empty 
-	* string of zero length. 
+   /* The following block is commented out because it violates "PDF Spec 7.3.4.2 Literal Strings".
+	* It states that the two matching parentheses must still be present to represent an empty
+	* string of zero length.
 	*/
    /*
     if (!len)
diff --git a/PDF/src/hpdf_u3d.c b/PDF/src/hpdf_u3d.c
index a028f6115..bc0b47532 100644
--- a/PDF/src/hpdf_u3d.c
+++ b/PDF/src/hpdf_u3d.c
@@ -246,7 +246,7 @@ HPDF_EXPORT(HPDF_Dict) HPDF_Create3DView(HPDF_MMgr mmgr, const char *name)
 
 	HPDF_PTRACE ((" HPDF_Create3DView\n"));
 
-	if (name == NULL || name[0] == '\0') { 
+	if (name == NULL || name[0] == '\0') {
 		return NULL;
 	}
 
@@ -260,7 +260,7 @@ HPDF_EXPORT(HPDF_Dict) HPDF_Create3DView(HPDF_MMgr mmgr, const char *name)
 		HPDF_Dict_Free (view);
 		return NULL;
 	}
-	
+
 	ret = HPDF_Dict_Add (view, "XN", HPDF_String_New (mmgr, name, NULL));
 	if (ret != HPDF_OK) {
 		HPDF_Dict_Free (view);
@@ -344,7 +344,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_U3D_SetDefault3DView(HPDF_U3D u3d, const char *nam
 HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_AddNode(HPDF_Dict view, const char *name, HPDF_REAL opacity, HPDF_BOOL visible)
 {
 	HPDF_Array nodes = NULL;
-	HPDF_Dict  node; 
+	HPDF_Dict  node;
 	HPDF_STATUS ret = HPDF_OK;
 
 	HPDF_PTRACE ((" HPDF_3DView_AddNode\n"));
@@ -461,7 +461,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetLighting(HPDF_Dict view, const char *sch
 
 HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetBackgroundColor(HPDF_Dict view, HPDF_REAL r, HPDF_REAL g, HPDF_REAL b)
 {
-	HPDF_Array  color; 
+	HPDF_Array  color;
 	HPDF_STATUS ret = HPDF_OK;
 	HPDF_Dict background;
 
@@ -630,7 +630,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetCamera(HPDF_Dict view, HPDF_REAL coox, H
 	HPDF_REAL upx, upy, upz;
 	HPDF_REAL transx, transy, transz;
 
-	HPDF_Array  matrix; 
+	HPDF_Array  matrix;
 	HPDF_STATUS ret = HPDF_OK;
 
 	HPDF_PTRACE ((" HPDF_3DView_SetCamera\n"));
@@ -643,7 +643,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetCamera(HPDF_Dict view, HPDF_REAL coox, H
 	viewx = -c2cx;
 	viewy = -c2cy;
 	viewz = -c2cz;
-	
+
 	/* c2c = (0, -1, 0) by default */
 	if (viewx == 0.0 && viewy == 0.0 && viewz == 0.0) {
 		viewy = 1.0;
@@ -671,7 +671,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetCamera(HPDF_Dict view, HPDF_REAL coox, H
 		upy =-1.0f;
 		upz = 0.0f;
 	}
-	
+
 	if ( fabs(viewx) + fabs(viewy) != 0.0f) /* other views than top and bottom*/
 	{
 		/* up-vector = up_world - (up_world dot view) view*/
@@ -708,7 +708,7 @@ HPDF_EXPORT(HPDF_STATUS) HPDF_3DView_SetCamera(HPDF_Dict view, HPDF_REAL coox, H
 		upy = upyprime;
 		upz = upzprime;
 	}
-	
+
 	/* translation vector*/
 	roo = (HPDF_REAL)fabs(roo);
 	if (roo == 0.0) {
@@ -783,7 +783,7 @@ HPDF_Dict HPDF_3DView_New( HPDF_MMgr  mmgr, HPDF_Xref  xref, HPDF_U3D u3d, const
 
 	HPDF_PTRACE ((" HPDF_3DView_New\n"));
 
-	if (name == NULL || name[0] == '\0') { 
+	if (name == NULL || name[0] == '\0') {
 		return NULL;
 	}
 
@@ -800,7 +800,7 @@ HPDF_Dict HPDF_3DView_New( HPDF_MMgr  mmgr, HPDF_Xref  xref, HPDF_U3D u3d, const
 		HPDF_Dict_Free (view);
 		return NULL;
 	}
-	
+
 	ret = HPDF_Dict_Add (view, "XN", HPDF_String_New (mmgr, name, NULL));
 	if (ret != HPDF_OK) {
 		HPDF_Dict_Free (view);
diff --git a/PDF/src/pngget.c b/PDF/src/pngget.c
index a0e90bb6a..0b2a69515 100644
--- a/PDF/src/pngget.c
+++ b/PDF/src/pngget.c
@@ -896,6 +896,6 @@ png_get_user_height_max (png_structp png_ptr)
     return (png_ptr? png_ptr->user_height_max : 0);
 }
 #endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
- 
+
 
 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/PDF/src/pngpread.c b/PDF/src/pngpread.c
index 8f4b7d179..c5ad75c33 100644
--- a/PDF/src/pngpread.c
+++ b/PDF/src/pngpread.c
@@ -1491,7 +1491,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
       }
 #endif
       png_memcpy((png_charp)png_ptr->unknown_chunk.name,
-                 (png_charp)png_ptr->chunk_name, 
+                 (png_charp)png_ptr->chunk_name,
                  png_sizeof(png_ptr->unknown_chunk.name));
       png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name)-1]='\0';
 
diff --git a/PDF/src/pngrtran.c b/PDF/src/pngrtran.c
index cda392154..96ca4a146 100644
--- a/PDF/src/pngrtran.c
+++ b/PDF/src/pngrtran.c
@@ -1319,7 +1319,7 @@ png_do_read_transformations(png_structp png_ptr)
       if(rgb_error)
       {
          png_ptr->rgb_to_gray_status=1;
-         if((png_ptr->transformations & PNG_RGB_TO_GRAY) == 
+         if((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
              PNG_RGB_TO_GRAY_WARN)
             png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
          if((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
@@ -3824,7 +3824,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,
                dp = row + (row_info->rowbytes << 1) - 1;
                for (i = 0; i < row_width; i++)
                {
-                  if (*(sp-1) == gray_high && *(sp) == gray_low) 
+                  if (*(sp-1) == gray_high && *(sp) == gray_low)
                   {
                      *dp-- = 0;
                      *dp-- = 0;
diff --git a/PDF/src/pngrutil.c b/PDF/src/pngrutil.c
index 5e40aca48..dfb2365da 100644
--- a/PDF/src/pngrutil.c
+++ b/PDF/src/pngrutil.c
@@ -2224,7 +2224,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
        }
 #endif
        png_memcpy((png_charp)png_ptr->unknown_chunk.name,
-                  (png_charp)png_ptr->chunk_name, 
+                  (png_charp)png_ptr->chunk_name,
                   png_sizeof(png_ptr->unknown_chunk.name));
        png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name)-1] = '\0';
        png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
diff --git a/PDF/src/pngset.c b/PDF/src/pngset.c
index f8f9b7e3b..d598d4d1b 100644
--- a/PDF/src/pngset.c
+++ b/PDF/src/pngset.c
@@ -1040,8 +1040,8 @@ png_set_unknown_chunks(png_structp png_ptr,
         png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
         png_unknown_chunkp from = unknowns + i;
 
-        png_memcpy((png_charp)to->name, 
-                   (png_charp)from->name, 
+        png_memcpy((png_charp)to->name,
+                   (png_charp)from->name,
                    png_sizeof(from->name));
         to->name[png_sizeof(to->name)-1] = '\0';
 
diff --git a/PDF/src/pngtest.c b/PDF/src/pngtest.c
index dd2946bf4..7abd8a2c5 100644
--- a/PDF/src/pngtest.c
+++ b/PDF/src/pngtest.c
@@ -1007,7 +1007,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
             pointed to by png_convert_to_rfc1123() gets free'ed before
             we use it */
          png_memcpy(tIME_string,
-                    png_convert_to_rfc1123(read_ptr, mod_time), 
+                    png_convert_to_rfc1123(read_ptr, mod_time),
                     png_sizeof(tIME_string));
          tIME_string[png_sizeof(tIME_string)-1] = '\0';
          tIME_chunk_present++;
diff --git a/PDF/src/t4.h b/PDF/src/t4.h
index f306e155d..1e2437e7f 100644
--- a/PDF/src/t4.h
+++ b/PDF/src/t4.h
@@ -4,23 +4,23 @@
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
  *
- * Permission to use, copy, modify, distribute, and sell this software and 
+ * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation for any purpose is hereby granted without fee, provided
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
  * publicity relating to the software without the specific, prior written
  * permission of Sam Leffler and Silicon Graphics.
- * 
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
- * 
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
  * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
  * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
  * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
 
diff --git a/PDF/testsuite/TestSuite.progen b/PDF/testsuite/TestSuite.progen
index 832c91b48..17f326951 100644
--- a/PDF/testsuite/TestSuite.progen
+++ b/PDF/testsuite/TestSuite.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = iphlpapi.lib
diff --git a/PDF/testsuite/TestSuite_vs170.vcxproj b/PDF/testsuite/TestSuite_vs170.vcxproj
index 7debc2b13..ecb544376 100644
--- a/PDF/testsuite/TestSuite_vs170.vcxproj
+++ b/PDF/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{24134877-368D-11DB-9FBC-00123FC423B5}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/PageCompiler/File2Page/File2Page.progen b/PageCompiler/File2Page/File2Page.progen
index 3f58cab2e..8dd0d26ff 100644
--- a/PageCompiler/File2Page/File2Page.progen
+++ b/PageCompiler/File2Page/File2Page.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared =
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib
 vc.solution.create = true
diff --git a/PageCompiler/File2Page/File2Page_vs170.sln b/PageCompiler/File2Page/File2Page_vs170.sln
index 8d924a557..5d6124e5d 100644
--- a/PageCompiler/File2Page/File2Page_vs170.sln
+++ b/PageCompiler/File2Page/File2Page_vs170.sln
@@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File2Page", "File2Page_vs17
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -18,6 +24,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/PageCompiler/File2Page/File2Page_vs170.vcxproj b/PageCompiler/File2Page/File2Page_vs170.vcxproj
index 6e872fe43..f0f31e589 100644
--- a/PageCompiler/File2Page/File2Page_vs170.vcxproj
+++ b/PageCompiler/File2Page/File2Page_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>File2Page</ProjectName>
     <ProjectGuid>{8BD05B6C-A179-40F1-BD17-6EA813055883}</ProjectGuid>
     <RootNamespace>File2Page</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">f2cpspd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">f2cpspd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">f2cpspd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">f2cpsp</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">f2cpsp</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">f2cpsp</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">f2cpspd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">f2cpspd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">f2cpspd</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">f2cpsp</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">f2cpsp</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\File2Page\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\File2Page\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\File2Page\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\File2Page\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\File2Page\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\File2Page\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\File2Page\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\File2Page\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\f2cpspd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\f2cpspd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\f2cpsp.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\f2cpspd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\f2cpspd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\f2cpsp.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\f2cpspd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\f2cpspd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\f2cpsp.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/PageCompiler/File2Page/src/File2Page.cpp b/PageCompiler/File2Page/src/File2Page.cpp
index 32ca76498..bc54bbf48 100644
--- a/PageCompiler/File2Page/src/File2Page.cpp
+++ b/PageCompiler/File2Page/src/File2Page.cpp
@@ -41,26 +41,26 @@ public:
 	{
 	}
 
-protected:	
+protected:
 	void initialize(Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Application::initialize(self);
 		// add your own initialization code here
 	}
-	
+
 	void uninitialize()
 	{
 		// add your own uninitialization code here
 		Application::uninitialize();
 	}
-	
+
 	void reinitialize(Application& self)
 	{
 		Application::reinitialize(self);
 		// add your own reinitialization code here
 	}
-	
+
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -84,7 +84,7 @@ protected:
 				.repeatable(false)
 				.argument("language")
 				.callback(OptionCallback<File2PageApp>(this, &File2PageApp::handleContentLang)));
-								
+
 		options.addOption(
 			Option("class", "c", "Specify the handler class name.")
 				.required(false)
@@ -98,7 +98,7 @@ protected:
 				.repeatable(false)
 				.argument("namespace-name")
 				.callback(OptionCallback<File2PageApp>(this, &File2PageApp::handleNamespace)));
-	
+
 		options.addOption(
 			Option("output", "o", "Specify the output file name.")
 				.required(false)
@@ -113,14 +113,14 @@ protected:
 				.argument("path")
 				.callback(OptionCallback<File2PageApp>(this, &File2PageApp::handlePath)));
 	}
-	
+
 	void handleHelp(const std::string& name, const std::string& value)
 	{
 		_helpRequested = true;
 		displayHelp();
 		stopOptionsProcessing();
 	}
-	
+
 	void handleContentType(const std::string& name, const std::string& value)
 	{
 		_contentType = value;
@@ -130,7 +130,7 @@ protected:
 	{
 		_contentLang = value;
 	}
-	
+
 	void handleClassName(const std::string& name, const std::string& value)
 	{
 		_clazz = value;
@@ -140,7 +140,7 @@ protected:
 	{
 		_namespace = value;
 	}
-				
+
 	void handleOutput(const std::string& name, const std::string& value)
 	{
 		_output = value;
@@ -160,7 +160,7 @@ protected:
 		helpFormatter.setIndent(8);
 		helpFormatter.format(std::cout);
 	}
-	
+
 	void convert(const std::string& path)
 	{
 		Poco::Path p(path);
@@ -243,7 +243,7 @@ protected:
 		     << "\tresponseStream.write(reinterpret_cast<const char*>(data), sizeof(data));\n"
 		     << "%>";
 	}
-	
+
 	std::string extToContentType(const std::string& ext)
 	{
 		if (ext == "jpg" || ext == "jpeg")
@@ -267,7 +267,7 @@ protected:
 		else
 			return "application/binary";
 	}
-	
+
 	int main(const std::vector<std::string>& args)
 	{
 		if (!_helpRequested)
@@ -279,7 +279,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-		
+
 private:
 	bool _helpRequested;
 	std::string _contentType;
diff --git a/PageCompiler/PageCompiler.progen b/PageCompiler/PageCompiler.progen
index 15948e84c..4535e63db 100644
--- a/PageCompiler/PageCompiler.progen
+++ b/PageCompiler/PageCompiler.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared =
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib
 vc.solution.create = true
diff --git a/PageCompiler/PageCompiler_vs170.sln b/PageCompiler/PageCompiler_vs170.sln
index 5087a20dd..2a1218cbb 100644
--- a/PageCompiler/PageCompiler_vs170.sln
+++ b/PageCompiler/PageCompiler_vs170.sln
@@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PageCompiler", "PageCompile
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -18,6 +24,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/PageCompiler/PageCompiler_vs170.vcxproj b/PageCompiler/PageCompiler_vs170.vcxproj
index d05d009fc..bb533086d 100644
--- a/PageCompiler/PageCompiler_vs170.vcxproj
+++ b/PageCompiler/PageCompiler_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>PageCompiler</ProjectName>
     <ProjectGuid>{E12E5C71-79A4-495A-848F-F1710111E610}</ProjectGuid>
     <RootNamespace>PageCompiler</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">cpspcd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">cpspcd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">cpspcd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">cpspc</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">cpspc</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">cpspc</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">cpspcd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">cpspcd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">cpspcd</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">cpspc</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">cpspc</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\PageCompiler\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\PageCompiler\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\PageCompiler\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\PageCompiler\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\PageCompiler\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\PageCompiler\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\PageCompiler\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\PageCompiler\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\cpspcd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\cpspcd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\cpspc.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\cpspcd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\cpspcd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\cpspc.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\cpspcd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\cpspcd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\cpspc.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/PageCompiler/cpspc.properties b/PageCompiler/cpspc.properties
index ff4761581..922a58011 100644
--- a/PageCompiler/cpspc.properties
+++ b/PageCompiler/cpspc.properties
@@ -1 +1 @@
-PageCompiler.fileHeader = //\n// ${outputFileName}\n//\n// This file has been generated from ${inputFileName} on ${dateTime}.\n// 
+PageCompiler.fileHeader = //\n// ${outputFileName}\n//\n// This file has been generated from ${inputFileName} on ${dateTime}.\n//
diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer.progen b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer.progen
index dd7209c7a..c610dc055 100644
--- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer.progen
+++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/PageCompiler/samples/HTTPTimeServer/src/HTTPTimeServerApp.cpp b/PageCompiler/samples/HTTPTimeServer/src/HTTPTimeServerApp.cpp
index 97984482e..c047710e5 100644
--- a/PageCompiler/samples/HTTPTimeServer/src/HTTPTimeServerApp.cpp
+++ b/PageCompiler/samples/HTTPTimeServer/src/HTTPTimeServerApp.cpp
@@ -76,7 +76,7 @@ public:
 	HTTPTimeServerApp(): _helpRequested(false)
 	{
 	}
-	
+
 	~HTTPTimeServerApp()
 	{
 	}
@@ -87,7 +87,7 @@ protected:
 		loadConfiguration(); // load default configuration files, if present
 		ServerApplication::initialize(self);
 	}
-		
+
 	void uninitialize()
 	{
 		ServerApplication::uninitialize();
@@ -96,7 +96,7 @@ protected:
 	void defineOptions(OptionSet& options)
 	{
 		ServerApplication::defineOptions(options);
-		
+
 		options.addOption(
 			Option("help", "h", "display help information on command line arguments")
 				.required(false)
@@ -130,7 +130,7 @@ protected:
 		{
 			// get parameters from configuration file
 			unsigned short port = (unsigned short) config().getInt("HTTPTimeServer.port", 9980);
-			
+
 			// set-up a server socket
 			ServerSocket svs(port);
 			// set-up a HTTPServer instance
@@ -144,7 +144,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/PageCompiler/src/CodeWriter.h b/PageCompiler/src/CodeWriter.h
index 6b64b5bce..801b7cda3 100644
--- a/PageCompiler/src/CodeWriter.h
+++ b/PageCompiler/src/CodeWriter.h
@@ -21,7 +21,7 @@ class Page;
 
 class CodeWriter
 	/// This class implements the code generator for
-	/// generating C++ header and implementation files 
+	/// generating C++ header and implementation files
 	/// from C++ Server Pages.
 {
 public:
@@ -39,7 +39,7 @@ public:
 
 	const Page& page() const;
 		/// Returns a const reference to the Page.
-		
+
 	const std::string& clazz() const;
 		/// Returns the name of the handler class.
 
@@ -57,7 +57,7 @@ protected:
 	virtual void writeResponse(std::ostream& ostr);
 	virtual void writeContent(std::ostream& ostr);
 	virtual void writeManifest(std::ostream& ostr);
-	
+
 	void beginGuard(std::ostream& ostr, const std::string& headerFileName);
 	void endGuard(std::ostream& ostr, const std::string& headerFileName);
 	void beginNamespace(std::ostream& ostr);
diff --git a/PageCompiler/src/Page.cpp b/PageCompiler/src/Page.cpp
index 6755584de..50920c119 100644
--- a/PageCompiler/src/Page.cpp
+++ b/PageCompiler/src/Page.cpp
@@ -29,7 +29,7 @@ bool Page::getBool(const std::string& property, bool deflt) const
 	{
 		const std::string& value = get(property);
 		return Poco::icompare(value, "true") == 0
-		    || Poco::icompare(value, "yes") == 0 
+		    || Poco::icompare(value, "yes") == 0
 		    || Poco::icompare(value, "on") == 0;
 	}
 	else return deflt;
diff --git a/PageCompiler/src/Page.h b/PageCompiler/src/Page.h
index f6b4e1520..e79f86df1 100644
--- a/PageCompiler/src/Page.h
+++ b/PageCompiler/src/Page.h
@@ -23,7 +23,7 @@ class Page: public Poco::Net::NameValueCollection
 public:
 	Page();
 		/// Creates a Page.
-	
+
 	~Page();
 		/// Destroys the Page.
 
@@ -50,7 +50,7 @@ public:
 
 	const std::stringstream& preHandler() const;
 		/// Returns the request prehandler code.
-		
+
 	bool getBool(const std::string& property, bool deflt = false) const;
 		/// Returns the boolean value of the given property.
 		///
@@ -61,10 +61,10 @@ public:
 		///    - on
 		///
 		/// Otherwise, the return value will be false.
-		
+
 	int getInt(const std::string& property, int deflt = 0) const;
 		/// Returns the integer value of the given property.
-		
+
 private:
 	Page(const Page&);
 	Page& operator = (const Page&);
diff --git a/PageCompiler/src/PageReader.h b/PageCompiler/src/PageReader.h
index 9589a5eaf..8bfdaeb1e 100644
--- a/PageCompiler/src/PageReader.h
+++ b/PageCompiler/src/PageReader.h
@@ -35,7 +35,7 @@ public:
 	~PageReader();
 		/// Destroys the PageReader.
 
-	void parse(std::istream& pageStream);	
+	void parse(std::istream& pageStream);
 		/// Parses a HTML file containing server page directives,
 		/// converts the file into C++ code and adds the code
 		/// to the reader's Page object. Also parses page
@@ -74,7 +74,7 @@ protected:
 
 protected:
 	void generateLineDirective(std::ostream& ostr);
-	
+
 private:
 	PageReader();
 	PageReader(const PageReader&);
diff --git a/PocoDoc/PocoDoc.progen b/PocoDoc/PocoDoc.progen
index 72e25d421..555286756 100644
--- a/PocoDoc/PocoDoc.progen
+++ b/PocoDoc/PocoDoc.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared =
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib
 vc.solution.create = true
diff --git a/PocoDoc/PocoDoc_vs170.sln b/PocoDoc/PocoDoc_vs170.sln
index 198a33441..392203c35 100644
--- a/PocoDoc/PocoDoc_vs170.sln
+++ b/PocoDoc/PocoDoc_vs170.sln
@@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PocoDoc", "PocoDoc_vs170.vc
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -18,6 +24,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/PocoDoc/PocoDoc_vs170.vcxproj b/PocoDoc/PocoDoc_vs170.vcxproj
index c4202b2a0..83e5e101d 100644
--- a/PocoDoc/PocoDoc_vs170.vcxproj
+++ b/PocoDoc/PocoDoc_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>PocoDoc</ProjectName>
     <ProjectGuid>{18BCF3CC-9474-4D1C-9445-F783A49D886B}</ProjectGuid>
     <RootNamespace>PocoDoc</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDocd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDocd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDocd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoDoc</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoDoc</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoDoc</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDocd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDocd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDocd</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoDoc</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoDoc</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\PocoDoc\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\PocoDoc\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\PocoDoc\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\PocoDoc\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\PocoDoc\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\PocoDoc\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\PocoDoc\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\PocoDoc\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\PocoDocd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\PocoDocd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\PocoDoc.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\PocoDocd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\PocoDocd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\PocoDoc.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\PocoDocd.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\PocoDocd.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\PocoDoc.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/PocoDoc/cfg/mkdoc-poco.xml b/PocoDoc/cfg/mkdoc-poco.xml
index 3b57f7a06..31669d789 100644
--- a/PocoDoc/cfg/mkdoc-poco.xml
+++ b/PocoDoc/cfg/mkdoc-poco.xml
@@ -104,5 +104,5 @@
 				<pattern>%s: [%p] %t</pattern>
 			</c1>
 		</channels>
-	</logging>	
+	</logging>
 </AppConfig>
diff --git a/PocoDoc/cfg/mkdocumentation.xml b/PocoDoc/cfg/mkdocumentation.xml
index 235009294..5c72451a8 100644
--- a/PocoDoc/cfg/mkdocumentation.xml
+++ b/PocoDoc/cfg/mkdocumentation.xml
@@ -103,5 +103,5 @@
 				<pattern>%s: [%p] %t</pattern>
 			</c1>
 		</channels>
-	</logging>	
+	</logging>
 </AppConfig>
diff --git a/PocoDoc/pages/samplePage.page b/PocoDoc/pages/samplePage.page
index dd98e351c..7dae39950 100644
--- a/PocoDoc/pages/samplePage.page
+++ b/PocoDoc/pages/samplePage.page
@@ -22,7 +22,7 @@ Here is some sample code:
     	std::cout << "Hello, world!" << std::endl;
     	return 0;
     }
-    
+
 !Another Paragraph
 Here we're -- showing <*italic text*>, <!bold text!> and <[teletype text]>.
 We can even do <*<!bold italic text!>*>!
diff --git a/PocoDoc/resources/css/styles.css b/PocoDoc/resources/css/styles.css
index abc3b068d..ac0475567 100644
--- a/PocoDoc/resources/css/styles.css
+++ b/PocoDoc/resources/css/styles.css
@@ -16,10 +16,10 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
-time, mark, audio, video 
+time, mark, audio, video
 {
 	margin: 0;
 	padding: 0;
@@ -30,40 +30,40 @@ time, mark, audio, video
 }
 
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section 
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section
 {
 	display: block;
 }
 
-body 
+body
 {
 	line-height: 1;
 }
 
-ol, ul 
+ol, ul
 {
 	list-style: none;
 }
 
-blockquote, q 
+blockquote, q
 {
 	quotes: none;
 }
 
-blockquote:before, blockquote:after, q:before, q:after 
+blockquote:before, blockquote:after, q:before, q:after
 {
 	content: '';
 	content: none;
 }
 
-table 
+table
 {
 	border-collapse: collapse;
 	border-spacing: 0;
 }
 
-body 
+body
 {
     margin: 0;
     color: #000000;
@@ -75,24 +75,24 @@ body
 
 p, h1, h2, h3, h4, h5, h6, ul, ol, li, td, th, address, blockquote, strong, b, emph, i
 {
-	font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, sans-serif; 
+	font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, sans-serif;
 }
 
 p, ul, ol, address, blockquote, h6
 {
-	color: black; 
-	font-size: 1em; 
-	line-height: 1.5em; 
-	margin-top: 1.0em; 
+	color: black;
+	font-size: 1em;
+	line-height: 1.5em;
+	margin-top: 1.0em;
 	margin-bottom: 1.0em;
 }
 
 h1
 {
-	color: black; 
-	font-size: 1.5em; 
+	color: black;
+	font-size: 1.5em;
 	line-height: 2em;
-	font-weight: 300; 
+	font-weight: 300;
 	margin-top: 12px;
 	margin-right: 0;
 	margin-bottom: 12px;
@@ -101,7 +101,7 @@ h1
 h1.category, h1.namespace
 {
 	font-size: 1.2em;
-	line-height: 1.2em; 
+	line-height: 1.2em;
 	font-weight: 300;
 	margin-top: 0px;
 	margin-bottom: 8px;
@@ -114,7 +114,7 @@ h1.category, h1.namespace
 h1.title, h1.symbol
 {
 	font-size: 1.5em;
-	line-height: 1.2em; 
+	line-height: 1.2em;
 	font-weight: 300;
 	margin-top: 0;
 	margin-bottom: 0;
@@ -127,7 +127,7 @@ h1.title, h1.symbol
 h1.template
 {
 	font-size: 1.2em;
-	line-height: 1.2em; 
+	line-height: 1.2em;
 	font-weight: 300;
 	margin-top: 0;
 	margin-bottom: 0;
@@ -172,9 +172,9 @@ div.body
 
 #navigation
 {
-	position: absolute; 
-	left: 0; 
-	width: 300px; 
+	position: absolute;
+	left: 0;
+	width: 300px;
 	padding-left: 16px;
 	padding-right: 16px;
 	overflow-y: visible;
@@ -183,17 +183,17 @@ div.body
 
 #navigation iframe
 {
-	width: 300px; 
-	margin: 0; 
-	padding: 0; 
+	width: 300px;
+	margin: 0;
+	padding: 0;
 	border: 0;
 	overflow-y: visible;
 }
 
 #content
 {
-	position: absolute; 
-	left: 332px; 
+	position: absolute;
+	left: 332px;
 	right: 0;
 	padding-left: 16px;
 	padding-right: 16px;
@@ -203,7 +203,7 @@ div.body
 
 pre
 {
-	color: #141414; 
+	color: #141414;
 	background: #F4F4F4;
 	font-size: 0.9em;
 	line-height: 1.5em;
@@ -225,26 +225,26 @@ pre
 
 tt
 {
-	color: #141414; 
+	color: #141414;
 	background: #F4F4F4;
 	font-size: 0.9em;
 	line-height: 1.5em;
 	font-family: "Lucida Console", "Monaco", Courier, "Courier New", monospace;
 }
 
-h2 
+h2
 {
-	color: black; 
-	font-size: 1.25em; 
+	color: black;
+	font-size: 1.25em;
 	font-weight: 600;
-	margin-top: 1.5em; 
-	margin-bottom: 0em; 
+	margin-top: 1.5em;
+	margin-bottom: 0em;
 }
 
 h3
 {
 	color: black;
-	font-size: 1.15em; 
+	font-size: 1.15em;
 	font-weight: 600;
 	margin-top: 1.0em;
 	margin-right: 0;
@@ -262,7 +262,7 @@ h3
 h3.overview
 {
 	color: black;
-	font-size: 1.25em; 
+	font-size: 1.25em;
 	margin-top: 1.5em;
 	margin-right: 0;
 	margin-bottom: 0;
@@ -276,11 +276,11 @@ h3.overview
 
 h4
 {
-	color: #444; 
+	color: #444;
 	font-size: 1.1em;
-	font-weight: 600; 
-	margin-top: 1.0em; 
-	margin-bottom: 0; 
+	font-weight: 600;
+	margin-top: 1.0em;
+	margin-bottom: 0;
 }
 
 p.decl
@@ -435,174 +435,174 @@ emph, i
 
 .address
 {
-	line-height: 11pt; 
+	line-height: 11pt;
 	margin-bottom: 4px;
 }
 
-.footer 
+.footer
 {
-	font-size: 0.8em; 
-	font-family: Verdana, Arial, Helvetica, sans-serif; 
-	text-align: left; 
-	line-height: 1.4em; 
+	font-size: 0.8em;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	text-align: left;
+	line-height: 1.4em;
 	margin-top: 32px;
 	margin-left: 0;
 	margin-right: 0;
 	margin-bottom: 10px;
 }
 
-a:link 
-{ 
+a:link
+{
     color: #138AC4;
     text-decoration: underline;
 }
 
-a:visited 
-{ 
-    color: #138AC4;
-    text-decoration: underline; 
-}
-
-a:active 
-{ 
+a:visited
+{
     color: #138AC4;
     text-decoration: underline;
 }
 
-a:hover 
-{ 
+a:active
+{
     color: #138AC4;
-    text-decoration: underline;  
+    text-decoration: underline;
 }
 
-a.namespace:link 
-{ 
+a:hover
+{
+    color: #138AC4;
+    text-decoration: underline;
+}
+
+a.namespace:link
+{
     color: white;
     text-decoration: none;
 }
 
-a.namespace:visited 
-{ 
+a.namespace:visited
+{
     color: white;
-    text-decoration: none; 
+    text-decoration: none;
 }
 
-a.namespace:active 
-{ 
+a.namespace:active
+{
     color: white;
     text-decoration: underline;
 }
 
-a.namespace:hover 
-{ 
+a.namespace:hover
+{
     color: white;
-    text-decoration: underline;  
+    text-decoration: underline;
 }
 
-a.class:link 
-{ 
+a.class:link
+{
     color: black;
     text-decoration: none;
 }
 
-a.class:visited 
-{ 
+a.class:visited
+{
     color: black;
-    text-decoration: none; 
+    text-decoration: none;
 }
 
-a.class:active 
-{ 
+a.class:active
+{
     color: #138AC4;
     text-decoration: underline;
 }
 
-a.class:hover 
-{ 
-    color: #138AC4;
-    text-decoration: underline;  
-}
-
-a.footer:link 
-{ 
+a.class:hover
+{
     color: #138AC4;
     text-decoration: underline;
 }
 
-a.footer:visited 
-{ 
-    color: #138AC4;
-    text-decoration: underline; 
-}
-
-a.footer:active 
-{ 
+a.footer:link
+{
     color: #138AC4;
     text-decoration: underline;
 }
 
-a.footer:hover 
-{ 
+a.footer:visited
+{
     color: #138AC4;
-    text-decoration: underline;  
+    text-decoration: underline;
+}
+
+a.footer:active
+{
+    color: #138AC4;
+    text-decoration: underline;
+}
+
+a.footer:hover
+{
+    color: #138AC4;
+    text-decoration: underline;
 }
 
 h3.overview a:link, h3.overview a:visited
-{ 
+{
     color: black;
     text-decoration: none;
 }
 
 h3.overview a:active, h3.overview a:hover
-{ 
+{
     color: #138AC4;
     text-decoration: none;
 }
 
 h2 a:link, h3 a:link, h4 a:link
-{ 
+{
     color: black;
     text-decoration: none;
 }
 
 h2 a:visited, h3 a:visited, h4 a:visited
-{ 
+{
     color: black;
-    text-decoration: none; 
+    text-decoration: none;
 }
 
 h2 a:active, h3 a:active, h4 a:active
-{ 
+{
     color: black;
     text-decoration: none;
 }
 
 h2 a:hover, h3 a:hover, h4 a:hover
-{ 
+{
     color: black;
     text-decoration: none;
 }
 
 li.level1 a:link, li.level2 a:link, li.level3 a:link
-{ 
+{
     color: #138AC4;
     text-decoration: underline;
 }
 
 li.level1 a:visited, li.level2 a:visited, li.level3 a:visited
-{ 
+{
     color: #138AC4;
     text-decoration: underline;
 }
 
 li.level1 a:active, li.level2 a:active, li.level3 a:active
-{ 
+{
     color: #138AC4;
     text-decoration: underline;
 }
 
 li.level1 a:hover, li.level2 a:hover, li.level3 a:hover
-{ 
+{
     color: #138AC4;
     text-decoration: underline;
 }
@@ -615,11 +615,11 @@ li.level1 a:hover, li.level2 a:hover, li.level3 a:hover
 
 .imagecaption
 {
-	font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, sans-serif; 
-	color: black; 
-	font-size: 0.8em; 
-	line-height: 1.4em; 
+	font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, sans-serif;
+	color: black;
+	font-size: 0.8em;
+	line-height: 1.4em;
 	font-style: italic;
-	margin-top: 4px; 
+	margin-top: 4px;
 	margin-bottom: 0px;
 }
diff --git a/PocoDoc/resources/js/CollapsibleLists.js b/PocoDoc/resources/js/CollapsibleLists.js
index 66ca0ecb8..0a11d50fb 100644
--- a/PocoDoc/resources/js/CollapsibleLists.js
+++ b/PocoDoc/resources/js/CollapsibleLists.js
@@ -46,13 +46,13 @@ var CollapsibleLists =
             }
 
           }
-          
+
           var id = getParameterByName('expand');
           if (id){
-          
+
              var node = document.getElementById(id);
              if (node){
-             
+
                 expand(node);
              }
           }
@@ -101,9 +101,9 @@ var CollapsibleLists =
         }
 
       };
-      
+
       /* Expands a node.
-       * 
+       *
        * node - the node containing the unordered list elements
        */
       function expand(node){
@@ -186,13 +186,13 @@ var CollapsibleLists =
           node.className += ' collapsibleList' + (open ? 'Open' : 'Closed');
         }
       }
-      
+
       /* Get a URL query string parameter.
        *
        * name - the parameter name
        */
       function getParameterByName(name){
-      
+
          name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
          var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
              results = regex.exec(location.search);
diff --git a/PocoDoc/resources/js/iframeResizer.contentWindow.js b/PocoDoc/resources/js/iframeResizer.contentWindow.js
index c1c3b2ab0..9ff7c5a40 100755
--- a/PocoDoc/resources/js/iframeResizer.contentWindow.js
+++ b/PocoDoc/resources/js/iframeResizer.contentWindow.js
@@ -118,7 +118,7 @@
 	}
 
 	function setMargin(){
-		//If called via V1 script, convert bodyMargin from int to str 
+		//If called via V1 script, convert bodyMargin from int to str
 		if (undefined === bodyMarginStr){
 			bodyMarginStr = bodyMargin+'px';
 		}
diff --git a/PocoDoc/src/DocWriter.cpp b/PocoDoc/src/DocWriter.cpp
index 40067d52c..76f668f90 100644
--- a/PocoDoc/src/DocWriter.cpp
+++ b/PocoDoc/src/DocWriter.cpp
@@ -1400,7 +1400,10 @@ void DocWriter::nextToken(std::string::const_iterator& it, const std::string::co
 	{
 		token += *it++;
 		if (it != end && std::ispunct(*it)) token += *it++;
-		if (it != end && std::ispunct(*it)) token += *it++;
+		if (token != "<[" && token != "<*" && token != "<!")
+		{
+			if (it != end && std::ispunct(*it)) token += *it++;
+		}
 	}
 	else if (it != end && *it == '[')
 	{
diff --git a/PocoDoc/src/DocWriter.h b/PocoDoc/src/DocWriter.h
index ae4478c2b..56bc16ecf 100644
--- a/PocoDoc/src/DocWriter.h
+++ b/PocoDoc/src/DocWriter.h
@@ -47,13 +47,13 @@ public:
 
 	~DocWriter();
 		/// Destroys the DocWriter.
-		
+
 	void write();
 		/// Writes all documentation files.
-		
+
 	void writeEclipseTOC();
 		/// Write Eclipse Table-Of-Contents XML files.
-		
+
 	void addPage(const std::string& path);
 		/// Adds a page.
 
@@ -66,7 +66,7 @@ protected:
 		TEXT_LITERAL,
 		TEXT_WHITESPACE
 	};
-	
+
 	struct Page
 	{
 		std::string path;
@@ -74,14 +74,14 @@ protected:
 		std::string title;
 		std::string category;
 	};
-	
+
 	enum
 	{
 		MAX_TITLE_LEVEL = 3,
 		PAGE_INDEX_COLUMNS = 2,
 		NAMESPACE_INDEX_COLUMNS = 4
 	};
-	
+
 	enum
 	{
 		NO_CUSTOM_HTML = 1,
@@ -94,10 +94,10 @@ protected:
 		int level;
 		int id;
 	};
-	
+
 	typedef std::vector<TOCEntry> TOC;
-	typedef std::map<std::string, Poco::CppParser::Function*> MethodMap;	
-	typedef std::map<std::string, std::string> StringMap;	
+	typedef std::map<std::string, Poco::CppParser::Function*> MethodMap;
+	typedef std::map<std::string, std::string> StringMap;
 	typedef std::map<std::string, Page> PageMap;
 
 	void writePages();
@@ -108,10 +108,10 @@ protected:
 	void writeCategoryIndex(std::ostream& ostr, const std::string& category, const std::string& target);
 	void writePageIndex(std::ostream& ostr);
 	void writeNameSpaceIndex(std::ostream& ostr);
-	
+
 	void writeClass(const Poco::CppParser::Struct* pStruct);
 	void writeNameSpace(const Poco::CppParser::NameSpace* pNameSpace);
-	
+
 	void writeNavigation();
 	void writePackage(const std::string& file, const std::string& library, const std::string& package);
 
@@ -196,11 +196,11 @@ protected:
 	static std::string projectURI(const std::string& id);
 
 	static Poco::Logger& logger();
-	
+
 	static const std::string RFC_URI;
 	static const std::string GITHUB_POCO_URI;
-	
-private:	
+
+private:
 	bool _prettifyCode;
 	bool _noFrames;
 	bool _htmlMode;
@@ -212,10 +212,10 @@ private:
 	bool _pendingLine;
 	int  _indent;
 	int  _titleId;
-	
+
 	static std::string _language;
 	static StringMap   _strings;
-	
+
 	static Poco::Logger* _pLogger;
 };
 
diff --git a/ProGen/ProGen.progen b/ProGen/ProGen.progen
index 9c79c9ec7..0cb9602be 100644
--- a/ProGen/ProGen.progen
+++ b/ProGen/ProGen.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared =
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib
 vc.solution.create = true
diff --git a/ProGen/ProGen_vs170.sln b/ProGen/ProGen_vs170.sln
index 7f2a958c4..9fdd409bd 100644
--- a/ProGen/ProGen_vs170.sln
+++ b/ProGen/ProGen_vs170.sln
@@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProGen", "ProGen_vs170.vcxp
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -18,6 +24,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/ProGen/ProGen_vs170.vcxproj b/ProGen/ProGen_vs170.vcxproj
index cd7fbf4d0..89953fc63 100644
--- a/ProGen/ProGen_vs170.vcxproj
+++ b/ProGen/ProGen_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>ProGen</ProjectName>
     <ProjectGuid>{48D690D9-6520-4F30-A298-3132548716D0}</ProjectGuid>
     <RootNamespace>ProGen</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">progend</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">progend</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">progend</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">progen</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">progen</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">progen</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">progend</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">progend</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">progend</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">progen</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">progen</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\ProGen\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\ProGen\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\ProGen\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\ProGen\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\ProGen\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\ProGen\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\ProGen\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\ProGen\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\progend.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\progend.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\progen.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\progend.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\progend.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\progen.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\progend.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\progend.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\progen.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/ProGen/progen.bat b/ProGen/progen.bat
index e51934879..f3bd69a3f 100644
--- a/ProGen/progen.bat
+++ b/ProGen/progen.bat
@@ -1,5 +1,5 @@
 @echo off
-setlocal EnableDelayedExpansion EnableExtensions        
+setlocal EnableDelayedExpansion EnableExtensions
 if "%POCO_BASE%"=="" (
 	echo POCO_BASE not set
 	goto :exit
diff --git a/ProGen/rebuildall32.bat b/ProGen/rebuildall32.bat
index 8efd9d630..1b95d28a3 100644
--- a/ProGen/rebuildall32.bat
+++ b/ProGen/rebuildall32.bat
@@ -1,5 +1,5 @@
 @echo off
-setlocal EnableDelayedExpansion EnableExtensions        
+setlocal EnableDelayedExpansion EnableExtensions
 if "%POCO_BASE%"=="" (
 	echo POCO_BASE not set
 	goto :exit
diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp
index c3c2c6aa1..236f4f0c2 100644
--- a/ProGen/src/ProGen.cpp
+++ b/ProGen/src/ProGen.cpp
@@ -60,19 +60,19 @@ using Poco::StringTokenizer;
 class ProGenApp: public Application
 {
 public:
-	ProGenApp(): 
+	ProGenApp():
 		_helpRequested(false),
 		_outputDir(Poco::Path::current())
 	{
 	}
 
-protected:	
+protected:
 	void initialize(Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Application::initialize(self);
 	}
-	
+
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -84,7 +84,7 @@ protected:
 				.callback(OptionCallback<ProGenApp>(this, &ProGenApp::handleHelp)));
 
 		options.addOption(
-			Option("define", "D", 
+			Option("define", "D",
 				"Define a configuration property. A configuration property "
 				"defined with this option can be referenced in the project "
 				"properties file, using the following syntax: ${<name>}.")
@@ -92,7 +92,7 @@ protected:
 				.repeatable(true)
 				.argument("<name>=<value>")
 				.callback(OptionCallback<ProGenApp>(this, &ProGenApp::handleDefine)));
-				
+
 		options.addOption(
 			Option("output-dir", "o", "Write project files to directory <dir>.")
 				.required(false)
@@ -114,23 +114,23 @@ protected:
 				.argument("<tool>{,<tool>}")
 				.callback(OptionCallback<ProGenApp>(this, &ProGenApp::handleTool)));
 	}
-	
+
 	void handleHelp(const std::string& name, const std::string& value)
 	{
 		_helpRequested = true;
 		stopOptionsProcessing();
 	}
-	
+
 	void handleDefine(const std::string& name, const std::string& value)
 	{
 		defineProperty(value);
 	}
-	
+
 	void handleOutputDir(const std::string& name, const std::string& value)
 	{
 		_outputDir = value;
 	}
-	
+
 	void handlePlatform(const std::string& name, const std::string& value)
 	{
 		Poco::StringTokenizer tok(value, ",;", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
@@ -163,7 +163,7 @@ protected:
 		);
 		helpFormatter.format(std::cout);
 	}
-	
+
 	void defineProperty(const std::string& def)
 	{
 		std::string name;
@@ -177,7 +177,7 @@ protected:
 		else name = def;
 		config().setString(name, value);
 	}
-	
+
 	Poco::AutoPtr<Poco::Util::PropertyFileConfiguration> loadProjectConfig(const Poco::Path& configPath)
 	{
 		Poco::AutoPtr<Poco::Util::PropertyFileConfiguration> pConfig = new Poco::Util::PropertyFileConfiguration(configPath.toString());
@@ -188,7 +188,7 @@ protected:
 		pConfig->setString("vc.project.guidFromName", Poco::toUpper(nameUUID.toString()));
 		return pConfig;
 	}
-	
+
 	void expandAttributes(Poco::XML::Element* pRootElement, Poco::Util::AbstractConfiguration& properties)
 	{
 		Poco::XML::TreeWalker walker(pRootElement, Poco::XML::NodeFilter::SHOW_ELEMENT);
@@ -205,7 +205,7 @@ protected:
 			pNode = walker.nextNode();
 		}
 	}
-	
+
 	void setProperty(Poco::Util::AbstractConfiguration& properties, const std::string& name, const Poco::Util::AbstractConfiguration& projectConfig, const std::string& projectConfigName, const std::string& platformName, const std::string& archName, const std::string& configName, const std::string& delim = ";")
 	{
 		std::string value = projectConfig.getString(projectConfigName, "");
@@ -247,7 +247,7 @@ protected:
 
 		properties.setString(name, value);
 	}
-	
+
 	void fixFileConfigurations(Poco::XML::Node* pFilesElem, const std::string& configs, const std::set<std::string>& archs)
 	{
 		Poco::AutoPtr<Poco::XML::NodeList> pFileElems = static_cast<Poco::XML::Element*>(pFilesElem)->getElementsByTagName("File");
@@ -281,7 +281,7 @@ protected:
 			}
 		}
 	}
-	
+
 	void replaceFiles(Poco::XML::Node* pFilesElem, const std::string& replacements)
 	{
 		Poco::StringTokenizer replacementsTok(replacements, ",;", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
@@ -304,11 +304,11 @@ protected:
 			}
 		}
 	}
-	
+
 	void generateSolution(const Poco::Path& solutionPath, const Poco::Util::AbstractConfiguration& projectConfig, const Poco::Util::AbstractConfiguration& templateProps, const std::string& platform, const std::string& tool)
 	{
 		std::string solutionGUID(config().getString("progen.solution.applicationGUID"));
-		
+
 		Poco::File solutionFile(solutionPath.toString());
 		if (solutionFile.exists())
 		{
@@ -336,7 +336,7 @@ protected:
 			generateSolution80(solutionStream, solutionPath, solutionGUID, projectConfig, templateProps, platform, tool);
 		}
 	}
-	
+
 	void generateSolution80(std::ostream& solutionStream, const Poco::Path& solutionPath, const std::string& solutionGUID, const Poco::Util::AbstractConfiguration& projectConfig, const Poco::Util::AbstractConfiguration& templateProps, const std::string& platform, const std::string& tool)
 	{
 		std::vector<std::string> dependencies;
@@ -351,7 +351,7 @@ protected:
 			solutionStream << "EndProject\r\n";
 			dependencies.push_back(projectGUID);
 			includesHaveDependencies = true;
-		}	
+		}
 		std::string includes = projectConfig.getString("vc.solution.include", "");
 		Poco::StringTokenizer includesTokenizer(includes, ",;", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
 		for (const auto& incl: includesTokenizer)
@@ -375,10 +375,10 @@ protected:
 			solutionStream << "EndProject\r\n";
 			dependencies.push_back(projectGUID);
 		}
-		
+
 		solutionStream << "Global\r\n";
 		solutionStream << "\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n";
-	
+
 		Poco::StringTokenizer archTok(templateProps.getString("project.architectures"), ";,", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
 		std::set<std::string> archs(archTok.begin(), archTok.end());
 
@@ -409,7 +409,7 @@ protected:
 		solutionStream << "\tGlobalSection(SolutionProperties) = preSolution\r\n";
 		solutionStream << "\t\tHideSolutionNode = FALSE\r\n";
 		solutionStream << "\tEndGlobalSection\r\n";
-		solutionStream << "EndGlobal\r\n";		
+		solutionStream << "EndGlobal\r\n";
 	}
 
 	void fix2010Project(Poco::AutoPtr<Poco::XML::Document> pProjectDoc, const std::set<std::string>& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps)
@@ -497,7 +497,7 @@ protected:
 			pClCompileElem->appendChild(pMultiProcessorCompilationElem);
 		}
 	}
-	
+
 	void fix2012Project(Poco::AutoPtr<Poco::XML::Document> pProjectDoc, const std::set<std::string>& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps)
 	{
 		fix2010Project(pProjectDoc, configSet, platform, projectProps, templateProps);
@@ -614,7 +614,7 @@ protected:
 			pParentNode->removeChild(pNode);
 		}
 	}
-	
+
 	void writeProject(Poco::AutoPtr<Poco::XML::Document> pProjectDoc, const std::string& path)
 	{
 		Poco::XML::DOMWriter writer;
@@ -623,21 +623,21 @@ protected:
 		writer.setIndent("  ");
 		writer.writeNode(path, pProjectDoc);
 	}
-	
+
 	void generateProject(const Poco::Util::AbstractConfiguration& projectConfig, const Poco::Path& projectPath, const Poco::Path& templatePath, const std::string& platform, const std::string& tool)
 	{
 		Poco::File templateDir(templatePath);
 		if (templateDir.exists())
 		{
 			logger().information("Generating using templates from: " + templatePath.toString());
-			
+
 			Poco::Path projectTemplatePath(templatePath);
 			projectTemplatePath.setFileName("project.template");
 
 			Poco::Path templatePropsPath(templatePath);
 			templatePropsPath.setFileName("project.properties");
 			Poco::AutoPtr<Poco::Util::PropertyFileConfiguration> pTemplateProps = new Poco::Util::PropertyFileConfiguration(templatePropsPath.toString());
-			
+
 			if (projectConfig.hasProperty("vc.project.name"))
 			{
 				Poco::StringTokenizer archTok(pTemplateProps->getString("project.architectures"), ";,", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
@@ -652,7 +652,7 @@ protected:
 				domParser.setFeature(Poco::XML::DOMParser::FEATURE_FILTER_WHITESPACE, true);
 				Poco::AutoPtr<Poco::XML::Document> pPrototypeDoc = domParser.parse(prototypePath.toString());
 				Poco::AutoPtr<Poco::XML::Document> pProjectDoc = domParser.parse(projectTemplatePath.toString());
-				
+
 				Poco::AutoPtr<Poco::Util::MapConfiguration> pProps = new Poco::Util::MapConfiguration;
 				pProps->setString("project.guid", projectConfig.getString("vc.project.guid"));
 				pProps->setString("project.name", projectConfig.getString("vc.project.name"));
@@ -662,22 +662,22 @@ protected:
 				pProps->setString("project.platform", pTemplateProps->getString("project.platform", platform));
 				pProps->setString("project.targetPlatform", pTemplateProps->getString("project.targetPlatform", "WINDOWS_NT"));
 				expandAttributes(pProjectDoc->documentElement(), *pProps);
-				
-				Poco::XML::Node* pFilesElement = pPrototypeDoc->getNodeByPath("//Files"); 
+
+				Poco::XML::Node* pFilesElement = pPrototypeDoc->getNodeByPath("//Files");
 				if (!pFilesElement) throw Poco::NotFoundException("No Files element found in prototype document");
 				pFilesElement = pProjectDoc->importNode(pFilesElement, true);
-				
+
 				fixFileConfigurations(pFilesElement, projectConfig.getString("vc.project.configurations", ""), archs);
 				replaceFiles(pFilesElement, pTemplateProps->getString("project.replaceSourceFiles", ""));
-				
-				Poco::XML::Node* pOldFilesElement = pProjectDoc->getNodeByPath("//Files"); 
+
+				Poco::XML::Node* pOldFilesElement = pProjectDoc->getNodeByPath("//Files");
 				if (!pOldFilesElement) throw Poco::NotFoundException("No Files element found in project document template");
 
-				Poco::XML::Node* pConfigurationsElement = pProjectDoc->getNodeByPath("//Configurations"); 
+				Poco::XML::Node* pConfigurationsElement = pProjectDoc->getNodeByPath("//Configurations");
 				if (!pConfigurationsElement) throw Poco::NotFoundException("No Configurations element found in project document template");
 
 				pProjectDoc->documentElement()->replaceChild(pFilesElement, pOldFilesElement);
-				
+
 				std::set<std::string> configSet;
 				Poco::StringTokenizer configs(projectConfig.getString("vc.project.configurations", ""), ",;", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
 				for (const auto& arch: archs)
@@ -710,13 +710,13 @@ protected:
 							expandedDependencies += lib;
 						}
 						pProps->setString("configuration.linker.dependencies", expandedDependencies);
-					
+
 						Poco::Path configPath(templatePath);
 						configPath.setBaseName(config + "-" + arch);
 						configPath.setExtension("template");
 						Poco::AutoPtr<Poco::XML::Document> pConfigDoc = domParser.parse(configPath.toString());
 						Poco::XML::Element* pConfigElem = pConfigDoc->documentElement();
-					
+
 						std::string prebuild = pProps->getString("configuration.prebuild", "");
 						if (!prebuild.empty())
 						{
@@ -736,13 +736,13 @@ protected:
 								static_cast<Poco::XML::Element*>(pPostBuildNode)->setAttribute("CommandLine", postbuild);
 							}
 						}
-					
+
 						expandAttributes(pConfigElem, *pProps);
 						pConfigElem = static_cast<Poco::XML::Element*>(pProjectDoc->importNode(pConfigElem, true));
 						pConfigurationsElement->appendChild(pConfigElem);
 					}
 				}
-				
+
 				std::string vcprojName = projectConfig.getString("vc.project.name");
 				vcprojName.append(pTemplateProps->getString("project.suffix", ""));
 				Poco::Path vcprojPath(projectPath);
@@ -770,7 +770,7 @@ protected:
 				serializer.setContentHandler(&writer);
 				serializer.serialize(pProjectDoc);
 				vcprojStream.close();
-				
+
 				std::string postprocess = pTemplateProps->getString("project.postprocess", "");
 				if (!postprocess.empty())
 				{
@@ -932,21 +932,21 @@ protected:
 			logger().information("Template directory missing: " + templatePath.toString());
 		}
 	}
-	
+
 	void process(const std::string& configPath)
 	{
 		Poco::Path projectPath(configPath);
 		Poco::AutoPtr<Poco::Util::PropertyFileConfiguration> pProjectConfig = loadProjectConfig(projectPath);
-		
+
 		Poco::StringTokenizer platforms(pProjectConfig->getString("vc.project.platforms", ""), ",;", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
-				
+
 		Poco::Path templateBasePath(config().getString("progen.templatePath"));
 		templateBasePath.makeDirectory();
-		
+
 		Poco::File templateDir(templateBasePath);
 		std::vector<std::string> tools;
 		templateDir.list(tools);
-		
+
 		for (const auto& tool: tools)
 		{
 			if (_tools.empty() || _tools.find(tool) != _tools.end())
diff --git a/ProGen/src/VSXMLWriter.cpp b/ProGen/src/VSXMLWriter.cpp
index e40f5ab04..ba6837a39 100644
--- a/ProGen/src/VSXMLWriter.cpp
+++ b/ProGen/src/VSXMLWriter.cpp
@@ -25,7 +25,7 @@ VSXMLWriter::~VSXMLWriter()
 {
 }
 
-	
+
 void VSXMLWriter::setDocumentLocator(const Poco::XML::Locator* loc)
 {
 }
@@ -87,7 +87,7 @@ void VSXMLWriter::startElement(const Poco::XML::XMLString& namespaceURI, const P
 				if (attributes.getQName(i) != "Name")
 				{
 					std::string value = attributes.getValue(i);
-					if (_convertBool && (value == "true" || value == "false"))	
+					if (_convertBool && (value == "true" || value == "false"))
 						value = Poco::toUpper(value);
 					sortedAttributes.addAttribute(attributes.getURI(i), attributes.getLocalName(i), attributes.getQName(i), attributes.getType(i), value);
 				}
diff --git a/ProGen/src/VSXMLWriter.h b/ProGen/src/VSXMLWriter.h
index cbf395271..5f0a21a56 100644
--- a/ProGen/src/VSXMLWriter.h
+++ b/ProGen/src/VSXMLWriter.h
@@ -28,7 +28,7 @@ class VSXMLWriter: public Poco::XML::ContentHandler
 public:
 	VSXMLWriter(std::ostream& ostr, bool convertBool);
 	~VSXMLWriter();
-		
+
 	// ContentHandler
 	void setDocumentLocator(const Poco::XML::Locator* loc);
 	void startDocument();
diff --git a/Prometheus/Prometheus.progen b/Prometheus/Prometheus.progen
index ee8af33f1..cfe4ce225 100644
--- a/Prometheus/Prometheus.progen
+++ b/Prometheus/Prometheus.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/Prometheus/Prometheus_vs170.sln b/Prometheus/Prometheus_vs170.sln
index 1e942dc74..c766d9151 100644
--- a/Prometheus/Prometheus_vs170.sln
+++ b/Prometheus/Prometheus_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_static_md|x64.Build.0 = release_static_md|x64
 		{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{04B69538-1444-4A22-A98D-3C69CD7B44DA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Prometheus/Prometheus_vs170.vcxproj b/Prometheus/Prometheus_vs170.vcxproj
index a0a23affe..3aecfb120 100644
--- a/Prometheus/Prometheus_vs170.vcxproj
+++ b/Prometheus/Prometheus_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>Prometheus</ProjectName>
     <ProjectGuid>{FAB67DE6-17E1-40F5-8FAC-A77A87DA034C}</ProjectGuid>
     <RootNamespace>Prometheus</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoPrometheusA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoPrometheusmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoPrometheusmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoPrometheusA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoPrometheusmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoPrometheusmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoPrometheusd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoPrometheusmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoPrometheusmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoPrometheusmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoPrometheusmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Prometheus\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Prometheus\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Prometheus\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Prometheus\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Prometheus\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Prometheus\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\Prometheus\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\Prometheus\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Prometheus_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoPrometheusA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoPrometheusA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoPrometheusd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Prometheus_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoPrometheusA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoPrometheus.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoPrometheusmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoPrometheusmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoPrometheusmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoPrometheusmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoPrometheusmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include; ..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoPrometheusmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -604,12 +867,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Prometheus/samples/MetricsSample/MetricsSample.progen b/Prometheus/samples/MetricsSample/MetricsSample.progen
index 576db0374..db3ccc99f 100644
--- a/Prometheus/samples/MetricsSample/MetricsSample.progen
+++ b/Prometheus/samples/MetricsSample/MetricsSample.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Util\\include;..\\..\\..\\XML\\include;..\\..\\..\\JSON\\include;..\\..\\..\\Net\\include;..\\..\\..\\Prometheus\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Prometheus/testsuite/TestSuite.progen b/Prometheus/testsuite/TestSuite.progen
index 4d498e045..3fd46be00 100644
--- a/Prometheus/testsuite/TestSuite.progen
+++ b/Prometheus/testsuite/TestSuite.progen
@@ -7,3 +7,4 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Net\\include;..\\..\\Prometheus\\include;.\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
\ No newline at end of file
diff --git a/Prometheus/testsuite/TestSuite_vs170.vcxproj b/Prometheus/testsuite/TestSuite_vs170.vcxproj
index c25df4d25..e762b32ad 100644
--- a/Prometheus/testsuite/TestSuite_vs170.vcxproj
+++ b/Prometheus/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{04B69538-1444-4A22-A98D-3C69CD7B44DA}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;..\..\Prometheus\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;..\..\Prometheus\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;..\..\Prometheus\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;..\..\Prometheus\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;..\..\Prometheus\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;..\..\Prometheus\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/README b/README
index 79c93f6f5..0b73625d4 100644
--- a/README
+++ b/README
@@ -150,6 +150,23 @@ If you cannot or do not want to build with CMake, there are other options,
 described in the following.
 
 
+BUILDING - USING VCPKG
+===================
+
+You can download and install poco using the vcpkg(https://github.com/Microsoft/vcpkg)
+dependency manager:
+
+$ git clone https://github.com/Microsoft/vcpkg.git
+$ cd vcpkg
+$ ./bootstrap-vcpkg.sh
+$ ./vcpkg integrate install
+$ ./vcpkg install poco
+
+The poco port in vcpkg is kept up to date by Microsoft team members and community contributors.
+If the version is out of date, please create an issue or pull request(https://github.com/Microsoft/vcpkg)
+on the vcpkg repository.
+
+
 BUILDING ON WINDOWS
 ===================
 
diff --git a/README.md b/README.md
index 0743e28df..e7c36e5c9 100644
--- a/README.md
+++ b/README.md
@@ -125,6 +125,22 @@ The default install location is `/usr/local/` on Linux and macOS and
 the `CMAKE_INSTALL_PREFIX` CMake variable.
 
 
+#### Building and Installing - Using vcpkg
+
+You can download and install poco using the [vcpkg](https://github.com/Microsoft/vcpkg) dependency manager:
+
+```
+$ git clone https://github.com/Microsoft/vcpkg.git
+$ cd vcpkg
+$ ./bootstrap-vcpkg.sh
+$ ./vcpkg integrate install
+$ ./vcpkg install poco
+```
+The poco port in vcpkg is kept up to date by Microsoft team members and community contributors.
+If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg)
+on the vcpkg repository.
+
+
 ### Building Without CMake
 
 If you do not want to or cannot use CMake, POCO can also be built with Visual Studio
diff --git a/Redis/Redis.progen b/Redis/Redis.progen
index f4c331b2a..a3300cd1f 100644
--- a/Redis/Redis.progen
+++ b/Redis/Redis.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines =
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/Redis/Redis_vs170.sln b/Redis/Redis_vs170.sln
index d786dad9a..b01ea3227 100644
--- a/Redis/Redis_vs170.sln
+++ b/Redis/Redis_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{12E39EE2-7049-312D-B390-7568D727CA25}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Build.0 = release_static_md|x64
 		{12E39EE2-7049-312D-B390-7568D727CA25}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Redis/Redis_vs170.vcxproj b/Redis/Redis_vs170.vcxproj
index e2780472a..57c87e1fd 100644
--- a/Redis/Redis_vs170.vcxproj
+++ b/Redis/Redis_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>Redis</ProjectName>
     <ProjectGuid>{12E39EE2-7049-312D-B390-7568D727CA25}</ProjectGuid>
     <RootNamespace>Redis</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoRedisA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoRedismdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoRedismtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoRedisA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoRedismd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoRedismt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoRedisd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoRedismdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoRedismtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoRedismd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoRedismt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Redis\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Redis\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Redis\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Redis\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Redis\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Redis\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\Redis\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\Redis\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoRedisA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoRedisA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoRedisd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Redis_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoRedisA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoRedis.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoRedismtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoRedismtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoRedismt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoRedismdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoRedismdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoRedismd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -584,12 +847,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Redis/include/Poco/Redis/Client.h b/Redis/include/Poco/Redis/Client.h
index 079947e9b..009cd1899 100644
--- a/Redis/include/Poco/Redis/Client.h
+++ b/Redis/include/Poco/Redis/Client.h
@@ -87,6 +87,11 @@ public:
 	Client(const Net::SocketAddress& addrs);
 		/// Constructor which connects to the given Redis host/port.
 
+	Client(const Net::StreamSocket& socket);
+		/// Constructor which connects using an existing TCP
+		/// connection. This can be used to connect via TLS, if the
+		/// given socket is a Poco::Net::SecureStreamSocket.
+
 	virtual ~Client();
 		/// Destroys the Client.
 
@@ -113,6 +118,11 @@ public:
 	void connect(const Net::SocketAddress& addrs, const Timespan& timeout);
 		/// Connects to the given Redis server.
 
+	void connect(const Net::StreamSocket& socket);
+		/// Connects to the given Redis server using an existing TCP
+		/// connection. This can be used to connect via TLS, if the
+		/// given socket is a Poco::Net::SecureStreamSocket.
+
 	void disconnect();
 		/// Disconnects from the Redis server.
 
diff --git a/Redis/include/Poco/Redis/Command.h b/Redis/include/Poco/Redis/Command.h
index f5cbd3c55..5c0a5d38e 100644
--- a/Redis/include/Poco/Redis/Command.h
+++ b/Redis/include/Poco/Redis/Command.h
@@ -270,6 +270,12 @@ public:
 
 	static Command discard();
 		/// Creates and returns a DISCARD command.
+
+	static Command auth(const std::string& password);
+		/// Creates and returns an AUTH command with the given password.
+
+	static Command auth(const std::string& username, const std::string& password);
+		/// Creates and returns an AUTH command with the given password.
 };
 
 
diff --git a/Redis/src/Array.cpp b/Redis/src/Array.cpp
index 47938d5b4..a1b958db0 100644
--- a/Redis/src/Array.cpp
+++ b/Redis/src/Array.cpp
@@ -26,7 +26,7 @@ Array::Array()
 }
 
 
-Array::Array(const Array& copy): 
+Array::Array(const Array& copy):
 	_elements(copy._elements)
 {
 }
diff --git a/Redis/src/AsyncReader.cpp b/Redis/src/AsyncReader.cpp
index d59d418ac..31f2545d4 100644
--- a/Redis/src/AsyncReader.cpp
+++ b/Redis/src/AsyncReader.cpp
@@ -21,7 +21,7 @@ namespace Poco {
 namespace Redis {
 
 
-AsyncReader::AsyncReader(Client& client): 
+AsyncReader::AsyncReader(Client& client):
 	_client(client),
 	_activity(this, &AsyncReader::runActivity)
 {
diff --git a/Redis/src/Client.cpp b/Redis/src/Client.cpp
index 6d28f6a29..60b97f4e5 100644
--- a/Redis/src/Client.cpp
+++ b/Redis/src/Client.cpp
@@ -61,6 +61,16 @@ Client::Client(const Net::SocketAddress& addrs):
 }
 
 
+Client::Client(const Net::StreamSocket& socket):
+	_address(),
+	_socket(),
+	_input(0),
+	_output(0)
+{
+	connect(socket);
+}
+
+
 Client::~Client()
 {
 	delete _input;
@@ -133,6 +143,18 @@ void Client::connect(const Net::SocketAddress& addrs, const Timespan& timeout)
 }
 
 
+void Client::connect(const Poco::Net::StreamSocket& socket)
+{
+	poco_assert(! _input);
+	poco_assert(! _output);
+
+	_address = socket.peerAddress();
+	_socket = socket;
+	_input = new RedisInputStream(_socket);
+	_output = new RedisOutputStream(_socket);
+}
+
+
 void Client::disconnect()
 {
 	delete _input;
diff --git a/Redis/src/Command.cpp b/Redis/src/Command.cpp
index 6ed9c04e8..ac34ac454 100644
--- a/Redis/src/Command.cpp
+++ b/Redis/src/Command.cpp
@@ -735,4 +735,22 @@ Command Command::discard()
 }
 
 
+Command Command::auth(const std::string& password)
+{
+	Command cmd("AUTH");
+	cmd << password;
+
+	return cmd;
+}
+
+
+Command Command::auth(const std::string& username, const std::string& password)
+{
+	Command cmd("AUTH");
+	cmd << username << password;
+
+	return cmd;
+}
+
+
 } } // namespace Poco::Redis
diff --git a/Redis/testsuite/TestSuite.progen b/Redis/testsuite/TestSuite.progen
index 0aa30fc02..fb74be89f 100644
--- a/Redis/testsuite/TestSuite.progen
+++ b/Redis/testsuite/TestSuite.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Redis/testsuite/TestSuite_vs170.vcxproj b/Redis/testsuite/TestSuite_vs170.vcxproj
index bba73f382..d286edb51 100644
--- a/Redis/testsuite/TestSuite_vs170.vcxproj
+++ b/Redis/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{96CF3103-E49E-3F5E-A11D-6DBCDA043053}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Redis/testsuite/src/RedisTest.cpp b/Redis/testsuite/src/RedisTest.cpp
index fb65fc05a..45e5900a3 100644
--- a/Redis/testsuite/src/RedisTest.cpp
+++ b/Redis/testsuite/src/RedisTest.cpp
@@ -287,7 +287,7 @@ void RedisTest::testDECR()
 
 	try
 	{
-		Poco::Int64 result = _redis.execute<Poco::Int64>(decr);
+		_redis.execute<Poco::Int64>(decr);
 		fail("This must fail");
 	}
 	catch (RedisException& e)
diff --git a/Redis/testsuite/src/WinCEDriver.cpp b/Redis/testsuite/src/WinCEDriver.cpp
index 4c3268608..156391d69 100644
--- a/Redis/testsuite/src/WinCEDriver.cpp
+++ b/Redis/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int _tmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("RedisTestSuite", RedisTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/SevenZip/SevenZip.progen b/SevenZip/SevenZip.progen
index f3c4a093e..704a7a428 100644
--- a/SevenZip/SevenZip.progen
+++ b/SevenZip/SevenZip.progen
@@ -13,4 +13,5 @@ vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.disableWarnings = 4244;4267
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
diff --git a/SevenZip/SevenZip_vs170.sln b/SevenZip/SevenZip_vs170.sln
index 08c9e0ee6..d0eac7047 100644
--- a/SevenZip/SevenZip_vs170.sln
+++ b/SevenZip/SevenZip_vs170.sln
@@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SevenZip", "SevenZip_vs170.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -18,6 +24,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/SevenZip/SevenZip_vs170.vcxproj b/SevenZip/SevenZip_vs170.vcxproj
index 076dc5168..19d5b8cc3 100644
--- a/SevenZip/SevenZip_vs170.vcxproj
+++ b/SevenZip/SevenZip_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>SevenZip</ProjectName>
     <ProjectGuid>{BBDBC9A3-15CD-495B-9B16-D03CFBFB8D2D}</ProjectGuid>
     <RootNamespace>SevenZip</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoSevenZipA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoSevenZipmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoSevenZipmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoSevenZipA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoSevenZipmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoSevenZipmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoSevenZipd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoSevenZipmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoSevenZipmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoSevenZipmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoSevenZipmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\SevenZip\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\SevenZip\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\SevenZip\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\SevenZip\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\SevenZip\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\SevenZip\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\SevenZip\$(Configuration)\</IntDir>
@@ -223,6 +328,170 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\SevenZip\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SevenZip_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoSevenZipA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoSevenZipA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoSevenZipd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SevenZip_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoSevenZipA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoSevenZip.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoSevenZipmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoSevenZipmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoSevenZipmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoSevenZipmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoSevenZipmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoSevenZipmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -630,12 +899,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/SevenZip/include/Poco/SevenZip/Archive.h b/SevenZip/include/Poco/SevenZip/Archive.h
index e119d2156..ec5a0e9bf 100644
--- a/SevenZip/include/Poco/SevenZip/Archive.h
+++ b/SevenZip/include/Poco/SevenZip/Archive.h
@@ -33,7 +33,7 @@ class ArchiveImpl;
 
 
 class SevenZip_API Archive
-	/// This class represents a 7-Zip archive. 
+	/// This class represents a 7-Zip archive.
 	///
 	/// The Archive class can be used to enumerate entries in a
 	/// 7-Zip archive, and to extract files or directories from
@@ -43,42 +43,42 @@ public:
 	typedef std::vector<ArchiveEntry> EntryVec;
 	typedef EntryVec::iterator Iterator;
 	typedef EntryVec::const_iterator ConstIterator;
-	
+
 	struct ExtractedEventArgs
 	{
 		ArchiveEntry entry;
 		std::string extractedPath;
 	};
-	
+
 	struct FailedEventArgs
 	{
 		ArchiveEntry entry;
 		Poco::Exception* pException;
 	};
-		
+
 	Poco::BasicEvent<const ExtractedEventArgs> extracted;
 		/// Fired when an archive entry has been successfully extracted.
-		
+
 	Poco::BasicEvent<const FailedEventArgs> failed;
 		/// Fired when extracting an archive entry failed.
 
 	Archive(const std::string& path);
 		/// Creates an Archive object for the 7-Zip archive
-		/// with the given path. 
-		
+		/// with the given path.
+
 	~Archive();
 		/// Destroys the Archive.
-	
+
 	const std::string& path() const;
 		/// Returns the path of the archive in the filesystem.
-		
+
 	std::size_t size() const;
 		/// Returns the number of entries in the archive.
-	
+
 	ConstIterator begin() const;
 		/// Returns an iterator for iterating over the
 		/// file or directory entries in the archive.
-		
+
 	ConstIterator end() const;
 		/// Returns the end iterator.
 
@@ -90,10 +90,10 @@ public:
 		///
 		/// Progress and errors for single entries will be reported
 		/// via the extracted and failed events.
-		
+
 	std::string extract(const ArchiveEntry& entry, const std::string& destPath);
 		/// Extracts a specific entry to the given path.
-		/// 
+		///
 		/// Directories will be created as necessary. File attributes
 		/// will not be restored.
 		///
diff --git a/SevenZip/include/Poco/SevenZip/ArchiveEntry.h b/SevenZip/include/Poco/SevenZip/ArchiveEntry.h
index 278161cd3..22e05fe20 100644
--- a/SevenZip/include/Poco/SevenZip/ArchiveEntry.h
+++ b/SevenZip/include/Poco/SevenZip/ArchiveEntry.h
@@ -40,7 +40,7 @@ public:
 		ENTRY_FILE      = 0,   /// The entry represents an ordinary file.
 		ENTRY_DIRECTORY = 1    /// The entry represents a directory.
 	};
-	
+
 	enum EntryAttributes
 	{
 		ATTR_READONLY  = 0x01, /// The file or directory is read-only.
@@ -55,25 +55,25 @@ public:
 
 	ArchiveEntry(const ArchiveEntry& entry);
 		/// Creates an ArchiveEntry by copying another one.
-		
+
 	~ArchiveEntry();
 		/// Destroys the ArchiveEntry.
-		
+
 	ArchiveEntry& operator = (const ArchiveEntry& entry);
 		/// Assignment operator.
-	
-	void swap(ArchiveEntry& entry);
+
+	void swap(ArchiveEntry& entry) noexcept;
 		/// Swaps the entry with another one.
-	
+
 	EntryType type() const;
-		/// Returns the type of the entry.	
-		
+		/// Returns the type of the entry.
+
 	const std::string& path() const;
 		/// Return the UTF-8 encoded path.
-		
+
 	Poco::UInt64 size() const;
 		/// Returns the original size of the file.
-		
+
 	Poco::Timestamp lastModified() const;
 		/// Returns the date and time of last modification.
 
@@ -81,10 +81,10 @@ public:
 		/// Returns the entry attributes as a bitmask.
 		///
 		/// See the EntryAttributes enumeration for valid values.
-		
+
 	bool isFile() const;
 		/// Returns true iff the entry represents a file.
-		
+
 	bool isDirectory() const;
 		/// Returns true iff the entry represents a directory.
 
@@ -102,7 +102,7 @@ private:
 	Poco::Timestamp _lastModified;
 	Poco::UInt32 _attributes;
 	Poco::UInt32 _index;
-	
+
 	friend class ArchiveImpl;
 };
 
@@ -121,13 +121,13 @@ inline const std::string& ArchiveEntry::path() const
 	return _path;
 }
 
-	
+
 inline Poco::UInt64 ArchiveEntry::size() const
 {
 	return _size;
 }
 
-	
+
 inline Poco::Timestamp ArchiveEntry::lastModified() const
 {
 	return _lastModified;
diff --git a/SevenZip/samples/un7zip/src/un7zip.cpp b/SevenZip/samples/un7zip/src/un7zip.cpp
index d3c6b91b0..f86192a33 100644
--- a/SevenZip/samples/un7zip/src/un7zip.cpp
+++ b/SevenZip/samples/un7zip/src/un7zip.cpp
@@ -34,33 +34,33 @@ using Poco::Util::OptionCallback;
 class Un7zipApp: public Application
 {
 public:
-	Un7zipApp(): 
+	Un7zipApp():
 		_helpRequested(false),
 		_list(false),
 		_extract(false)
 	{
 	}
 
-protected:	
+protected:
 	void initialize(Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Application::initialize(self);
 		// add your own initialization code here
 	}
-	
+
 	void uninitialize()
 	{
 		// add your own uninitialization code here
 		Application::uninitialize();
 	}
-	
+
 	void reinitialize(Application& self)
 	{
 		Application::reinitialize(self);
 		// add your own reinitialization code here
 	}
-	
+
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -77,7 +77,7 @@ protected:
 				.repeatable(false)
 				.argument("path")
 				.callback(OptionCallback<Un7zipApp>(this, &Un7zipApp::handleOutput)));
-				
+
 		options.addOption(
 			Option("list", "l", "List files and directories in archive.")
 				.required(false)
@@ -91,7 +91,7 @@ protected:
 				.argument("file", false)
 				.callback(OptionCallback<Un7zipApp>(this, &Un7zipApp::handleExtract)));
 	}
-	
+
 	void handleHelp(const std::string& name, const std::string& value)
 	{
 		_helpRequested = true;
@@ -103,18 +103,18 @@ protected:
 	{
 		_outputPath = value;
 	}
-	
+
 	void handleList(const std::string& name, const std::string& value)
 	{
 		_list = true;
 	}
-	
+
 	void handleExtract(const std::string& name, const std::string& value)
 	{
 		_extract = true;
 		_extractFile = value;
 	}
-	
+
 	void displayHelp()
 	{
 		HelpFormatter helpFormatter(options());
@@ -123,12 +123,12 @@ protected:
 		helpFormatter.setHeader("A application that demonstrates usage of Poco::SevenZip::Archive.");
 		helpFormatter.format(std::cout);
 	}
-	
+
 	void onExtracted(const Poco::SevenZip::Archive::ExtractedEventArgs& args)
 	{
 		std::cout << "Extracted: " << args.entry.path() << " ===> " << args.extractedPath << std::endl;
 	}
-	
+
 	void onFailed(const Poco::SevenZip::Archive::FailedEventArgs& args)
 	{
 		std::cout << "Failed: " << args.entry.path() << ": " << args.pException->displayText() << std::endl;
@@ -139,28 +139,28 @@ protected:
 		if (!_helpRequested && !args.empty())
 		{
 			Poco::SevenZip::Archive archive(args[0]);
-			
+
 			if (_list)
 			{
 				for (Poco::SevenZip::Archive::ConstIterator it = archive.begin(); it != archive.end(); ++it)
 				{
-					std::cout 
-						<< (it->isFile() ? '-' : 'd') 
+					std::cout
+						<< (it->isFile() ? '-' : 'd')
 						<< " "
 						<< Poco::DateTimeFormatter::format(it->lastModified(), Poco::DateTimeFormat::SORTABLE_FORMAT)
-						<< " " 
+						<< " "
 						<< std::setw(12) << it->size()
-						<< " " 
+						<< " "
 						<< it->path()
 						<< std::endl;
 				}
 			}
-			
+
 			if (_extract)
-			{			
+			{
 				archive.extracted += Poco::delegate(this, &Un7zipApp::onExtracted);
 				archive.failed += Poco::delegate(this, &Un7zipApp::onFailed);
-			
+
 				if (_extractFile.empty())
 				{
 					archive.extract(_outputPath);
@@ -179,7 +179,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 	std::string _outputPath;
diff --git a/SevenZip/samples/un7zip/un7zip.progen b/SevenZip/samples/un7zip/un7zip.progen
index 60a7878af..be513ad17 100644
--- a/SevenZip/samples/un7zip/un7zip.progen
+++ b/SevenZip/samples/un7zip/un7zip.progen
@@ -7,3 +7,4 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\SevenZip\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
diff --git a/SevenZip/src/7z.h b/SevenZip/src/7z.h
index 01c4cac6a..91c8b3ff0 100755
--- a/SevenZip/src/7z.h
+++ b/SevenZip/src/7z.h
@@ -136,17 +136,17 @@ void SzAr_Free(CSzAr *p, ISzAlloc *alloc);
       *outBufferSize
     You can consider "*outBuffer" as cache of solid block. If your archive is solid,
     it will increase decompression speed.
-  
+
     If you use external function, you can declare these 3 cache variables
     (blockIndex, outBuffer, outBufferSize) as static in that external function.
-    
+
     Free *outBuffer and set *outBuffer to 0, if you want to flush cache.
 */
 
 typedef struct
 {
   CSzAr db;
-  
+
   UInt64 startPosAfterHeader;
   UInt64 dataPos;
 
diff --git a/SevenZip/src/7zCrc.c b/SevenZip/src/7zCrc.c
index cd94201be..d82bc7ec5 100755
--- a/SevenZip/src/7zCrc.c
+++ b/SevenZip/src/7zCrc.c
@@ -52,11 +52,11 @@ void MY_FAST_CALL CrcGenerateTable()
     UInt32 r = g_CrcTable[i - 256];
     g_CrcTable[i] = g_CrcTable[r & 0xFF] ^ (r >> 8);
   }
-  
+
   #ifdef MY_CPU_LE
 
   g_CrcUpdate = CrcUpdateT4;
-  
+
   #if CRC_NUM_TABLES == 8
   if (!CPU_Is_InOrder())
     g_CrcUpdate = CrcUpdateT8;
diff --git a/SevenZip/src/7zFile.c b/SevenZip/src/7zFile.c
index a66c9e9d0..8eb02b502 100755
--- a/SevenZip/src/7zFile.c
+++ b/SevenZip/src/7zFile.c
@@ -120,12 +120,12 @@ WRes File_Read(CSzFile *p, void *data, size_t *size)
   return 0;
 
   #else
-  
+
   *size = fread(data, 1, originalSize, p->file);
   if (*size == originalSize)
     return 0;
   return ferror(p->file);
-  
+
   #endif
 }
 
@@ -134,7 +134,7 @@ WRes File_Write(CSzFile *p, const void *data, size_t *size)
   size_t originalSize = *size;
   if (originalSize == 0)
     return 0;
-  
+
   #ifdef USE_WINDOWS_FILE
 
   *size = 0;
@@ -160,7 +160,7 @@ WRes File_Write(CSzFile *p, const void *data, size_t *size)
   if (*size == originalSize)
     return 0;
   return ferror(p->file);
-  
+
   #endif
 }
 
@@ -190,7 +190,7 @@ WRes File_Seek(CSzFile *p, Int64 *pos, ESzSeek origin)
   return 0;
 
   #else
-  
+
   int moveMethod;
   int res;
   switch (origin)
@@ -203,14 +203,14 @@ WRes File_Seek(CSzFile *p, Int64 *pos, ESzSeek origin)
   res = fseek(p->file, (long)*pos, moveMethod);
   *pos = ftell(p->file);
   return res;
-  
+
   #endif
 }
 
 WRes File_GetLength(CSzFile *p, UInt64 *length)
 {
   #ifdef USE_WINDOWS_FILE
-  
+
   DWORD sizeHigh;
   DWORD sizeLow = GetFileSize(p->handle, &sizeHigh);
   if (sizeLow == 0xFFFFFFFF)
@@ -221,15 +221,15 @@ WRes File_GetLength(CSzFile *p, UInt64 *length)
   }
   *length = (((UInt64)sizeHigh) << 32) + sizeLow;
   return 0;
-  
+
   #else
-  
+
   long pos = ftell(p->file);
   int res = fseek(p->file, 0, SEEK_END);
   *length = ftell(p->file);
   fseek(p->file, pos, SEEK_SET);
   return res;
-  
+
   #endif
 }
 
diff --git a/SevenZip/src/7zIn.c b/SevenZip/src/7zIn.c
index ec93a43ff..d7256dde7 100755
--- a/SevenZip/src/7zIn.c
+++ b/SevenZip/src/7zIn.c
@@ -537,12 +537,12 @@ static SRes SzGetNextFolderItem(CSzData *sd, CSzFolder *folder, ISzAlloc *alloc)
 {
   UInt32 numCoders, numBindPairs, numPackStreams, i;
   UInt32 numInStreams = 0, numOutStreams = 0;
-  
+
   RINOK(SzReadNumber32(sd, &numCoders));
   if (numCoders > NUM_FOLDER_CODERS_MAX)
     return SZ_ERROR_UNSUPPORTED;
   folder->NumCoders = numCoders;
-  
+
   MY_ALLOC(CSzCoderInfo, folder->Coders, (size_t)numCoders, alloc);
 
   for (i = 0; i < numCoders; i++)
@@ -810,7 +810,7 @@ static SRes SzReadSubStreamsInfo(
       numDigests += numSubstreams;
   }
 
- 
+
   si = 0;
   for (;;)
   {
@@ -963,8 +963,8 @@ static SRes SzReadHeader2(
     RINOK(SzReadArchiveProperties(sd));
     RINOK(SzReadID(sd, &type));
   }
- 
- 
+
+
   if (type == k7zIdMainStreamsInfo)
   {
     RINOK(SzReadStreamsInfo(sd,
@@ -982,7 +982,7 @@ static SRes SzReadHeader2(
     return SZ_OK;
   if (type != k7zIdFilesInfo)
     return SZ_ERROR_ARCHIVE;
-  
+
   RINOK(SzReadNumber32(sd, &numFiles));
   p->db.NumFiles = numFiles;
 
@@ -1165,19 +1165,19 @@ static SRes SzReadAndDecodePackedStreams2(
   RINOK(SzReadStreamsInfo(sd, &dataStartPos, p,
       &numUnpackStreams,  unpackSizes, digestsDefined, digests,
       allocTemp, allocTemp));
-  
+
   dataStartPos += baseOffset;
   if (p->NumFolders != 1)
     return SZ_ERROR_ARCHIVE;
 
   folder = p->Folders;
   unpackSize = SzFolder_GetUnpackSize(folder);
-  
+
   RINOK(LookInStream_SeekTo(inStream, dataStartPos));
 
   if (!Buf_Create(outBuffer, (size_t)unpackSize, allocTemp))
     return SZ_ERROR_MEM;
-  
+
   res = SzFolder_Decode(folder, p->PackSizes,
           inStream, dataStartPos,
           outBuffer->data, (size_t)unpackSize, allocTemp);
@@ -1240,7 +1240,7 @@ static SRes SzArEx_Open2(
   nextHeaderCRC = GetUi32(header + 28);
 
   p->startPosAfterHeader = startArcPos + k7zStartHeaderSize;
-  
+
   if (CrcCalc(header + 12, 20) != GetUi32(header + 8))
     return SZ_ERROR_CRC;
 
@@ -1356,9 +1356,9 @@ SRes SzArEx_Extract(
     *blockIndex = folderIndex;
     IAlloc_Free(allocMain, *outBuffer);
     *outBuffer = 0;
-    
+
     RINOK(LookInStream_SeekTo(inStream, startOffset));
-    
+
     if (res == SZ_OK)
     {
       *outBufferSize = unpackSize;
diff --git a/SevenZip/src/Alloc.c b/SevenZip/src/Alloc.c
index 358a7b526..152b62328 100755
--- a/SevenZip/src/Alloc.c
+++ b/SevenZip/src/Alloc.c
@@ -99,7 +99,7 @@ void *BigAlloc(size_t size)
   #ifdef _SZ_ALLOC_DEBUG
   fprintf(stderr, "\nAlloc_Big %10d bytes;  count = %10d", size, g_allocCountBig++);
   #endif
-  
+
   #ifdef _7ZIP_LARGE_PAGES
   if (g_LargePageSize != 0 && g_LargePageSize <= (1 << 30) && size >= (1 << 18))
   {
@@ -118,7 +118,7 @@ void BigFree(void *address)
   if (address != 0)
     fprintf(stderr, "\nFree_Big; count = %10d", --g_allocCountBig);
   #endif
-  
+
   if (address == 0)
     return;
   VirtualFree(address, 0, MEM_RELEASE);
diff --git a/SevenZip/src/ArchiveEntry.cpp b/SevenZip/src/ArchiveEntry.cpp
index edc5d74c3..f39378152 100644
--- a/SevenZip/src/ArchiveEntry.cpp
+++ b/SevenZip/src/ArchiveEntry.cpp
@@ -51,12 +51,12 @@ ArchiveEntry::ArchiveEntry(const ArchiveEntry& entry):
 {
 }
 
-	
+
 ArchiveEntry::~ArchiveEntry()
 {
 }
 
-	
+
 ArchiveEntry& ArchiveEntry::operator = (const ArchiveEntry& entry)
 {
 	ArchiveEntry temp(entry);
@@ -65,7 +65,7 @@ ArchiveEntry& ArchiveEntry::operator = (const ArchiveEntry& entry)
 }
 
 
-void ArchiveEntry::swap(ArchiveEntry& entry)
+void ArchiveEntry::swap(ArchiveEntry& entry) noexcept
 {
 	std::swap(_type, entry._type);
 	std::swap(_path, entry._path);
diff --git a/SevenZip/src/Bra.c b/SevenZip/src/Bra.c
index 2e47b1413..e78e6f97b 100755
--- a/SevenZip/src/Bra.c
+++ b/SevenZip/src/Bra.c
@@ -48,14 +48,14 @@ SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
         ((UInt32)data[i + 0] << 11) |
         (((UInt32)data[i + 3] & 0x7) << 8) |
         (data[i + 2]);
-      
+
       src <<= 1;
       if (encoding)
         dest = ip + (UInt32)i + src;
       else
         dest = src - (ip + (UInt32)i);
       dest >>= 1;
-      
+
       data[i + 1] = (Byte)(0xF0 | ((dest >> 19) & 0x7));
       data[i + 0] = (Byte)(dest >> 11);
       data[i + 3] = (Byte)(0xF8 | ((dest >> 8) & 0x7));
@@ -80,7 +80,7 @@ SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
         ((UInt32)data[i + 1] << 16) |
         ((UInt32)data[i + 2] << 8) |
         ((UInt32)data[i + 3] & (~3));
-      
+
       UInt32 dest;
       if (encoding)
         dest = ip + (UInt32)i + src;
@@ -113,14 +113,14 @@ SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
         ((UInt32)data[i + 2] << 8) |
         ((UInt32)data[i + 3]);
       UInt32 dest;
-      
+
       src <<= 2;
       if (encoding)
         dest = ip + i + src;
       else
         dest = src - (ip + i);
       dest >>= 2;
-      
+
       dest = (((0 - ((dest >> 22) & 1)) << 22) & 0x3FFFFFFF) | (dest & 0x3FFFFF) | 0x40000000;
 
       data[i + 0] = (Byte)(dest >> 24);
diff --git a/SevenZip/src/Bra.h b/SevenZip/src/Bra.h
index 5748c1c05..aac20a696 100755
--- a/SevenZip/src/Bra.h
+++ b/SevenZip/src/Bra.h
@@ -13,23 +13,23 @@ extern "C" {
 /*
 These functions convert relative addresses to absolute addresses
 in CALL instructions to increase the compression ratio.
-  
+
   In:
     data     - data buffer
     size     - size of data
     ip       - current virtual Instruction Pinter (IP) value
     state    - state variable for x86 converter
     encoding - 0 (for decoding), 1 (for encoding)
-  
+
   Out:
     state    - state variable for x86 converter
 
   Returns:
     The number of processed bytes. If you call these functions with multiple calls,
     you must start next call with first byte after block of processed bytes.
-  
+
   Type   Endian  Alignment  LookAhead
-  
+
   x86    little      1          4
   ARMT   little      2          2
   ARM    little      4          0
diff --git a/SevenZip/src/BraIA64.c b/SevenZip/src/BraIA64.c
index 0b4ee85bc..07fa7ba40 100755
--- a/SevenZip/src/BraIA64.c
+++ b/SevenZip/src/BraIA64.c
@@ -42,20 +42,20 @@ SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
         UInt32 src = (UInt32)((instNorm >> 13) & 0xFFFFF);
         UInt32 dest;
         src |= ((UInt32)(instNorm >> 36) & 1) << 20;
-        
+
         src <<= 4;
-        
+
         if (encoding)
           dest = ip + (UInt32)i + src;
         else
           dest = src - (ip + (UInt32)i);
-        
+
         dest >>= 4;
-        
+
         instNorm &= ~((UInt64)(0x8FFFFF) << 13);
         instNorm |= ((UInt64)(dest & 0xFFFFF) << 13);
         instNorm |= ((UInt64)(dest & 0x100000) << (36 - 20));
-        
+
         instruction &= (1 << bitRes) - 1;
         instruction |= (instNorm << bitRes);
         for (j = 0; j < 6; j++)
diff --git a/SevenZip/src/CpuArch.c b/SevenZip/src/CpuArch.c
index dd5c23560..0e094b86d 100755
--- a/SevenZip/src/CpuArch.c
+++ b/SevenZip/src/CpuArch.c
@@ -81,7 +81,7 @@ static void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d)
     : "0" (function)) ;
 
   #endif
-  
+
   #else
 
   int CPUInfo[4];
diff --git a/SevenZip/src/LzFind.c b/SevenZip/src/LzFind.c
index e3ecb0542..e753d04c6 100755
--- a/SevenZip/src/LzFind.c
+++ b/SevenZip/src/LzFind.c
@@ -512,7 +512,7 @@ static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
 
   delta2 = p->pos - p->hash[hash2Value];
   curMatch = p->hash[kFix3HashSize + hashValue];
-  
+
   p->hash[hash2Value] =
   p->hash[kFix3HashSize + hashValue] = p->pos;
 
@@ -546,7 +546,7 @@ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
   delta2 = p->pos - p->hash[                hash2Value];
   delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
   curMatch = p->hash[kFix4HashSize + hashValue];
-  
+
   p->hash[                hash2Value] =
   p->hash[kFix3HashSize + hash3Value] =
   p->hash[kFix4HashSize + hashValue] = p->pos;
diff --git a/SevenZip/src/LzFindMt.c b/SevenZip/src/LzFindMt.c
index aa41ed98a..0f7b314f4 100755
--- a/SevenZip/src/LzFindMt.c
+++ b/SevenZip/src/LzFindMt.c
@@ -58,7 +58,7 @@ void MtSync_StopWriting(CMtSync *p)
     p->csWasEntered = False;
   }
   Semaphore_Release1(&p->freeSemaphore);
- 
+
   Event_Wait(&p->wasStopped);
 
   while (myNumBlocks++ != p->numProcessedBlocks)
@@ -108,12 +108,12 @@ static SRes MtSync_Create2(CMtSync *p, unsigned (MY_STD_CALL *startAddress)(void
   RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->canStart));
   RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStarted));
   RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStopped));
-  
+
   RINOK_THREAD(Semaphore_Create(&p->freeSemaphore, numBlocks, numBlocks));
   RINOK_THREAD(Semaphore_Create(&p->filledSemaphore, 0, numBlocks));
 
   p->needStart = True;
-  
+
   RINOK_THREAD(Thread_Create(&p->thread, startAddress, obj));
   p->wasCreated = True;
   return SZ_OK;
@@ -385,7 +385,7 @@ void BtFillBlock(CMatchFinderMt *p, UInt32 globalBlockIndex)
     CriticalSection_Enter(&sync->cs);
     sync->csWasEntered = True;
   }
-  
+
   BtGetMatches(p, p->btBuf + (globalBlockIndex & kMtBtNumBlocksMask) * kMtBtBlockSize);
 
   if (p->pos > kMtMaxValForNormalize - kMtBtBlockSize)
@@ -561,7 +561,7 @@ UInt32 * MixMatches2(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
   const Byte *cur = p->pointerToCurPos;
   UInt32 lzPos = p->lzPos;
   MT_HASH2_CALC
-      
+
   curMatch2 = hash[hash2Value];
   hash[hash2Value] = lzPos;
 
@@ -584,7 +584,7 @@ UInt32 * MixMatches3(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
 
   curMatch2 = hash[                hash2Value];
   curMatch3 = hash[kFix3HashSize + hash3Value];
-  
+
   hash[                hash2Value] =
   hash[kFix3HashSize + hash3Value] =
     lzPos;
@@ -616,11 +616,11 @@ UInt32 *MixMatches4(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
   const Byte *cur = p->pointerToCurPos;
   UInt32 lzPos = p->lzPos;
   MT_HASH4_CALC
-      
+
   curMatch2 = hash[                hash2Value];
   curMatch3 = hash[kFix3HashSize + hash3Value];
   curMatch4 = hash[kFix4HashSize + hash4Value];
-  
+
   hash[                hash2Value] =
   hash[kFix3HashSize + hash3Value] =
   hash[kFix4HashSize + hash4Value] =
diff --git a/SevenZip/src/LzFindMt.h b/SevenZip/src/LzFindMt.h
index b985af5fe..63133b1b9 100755
--- a/SevenZip/src/LzFindMt.h
+++ b/SevenZip/src/LzFindMt.h
@@ -62,7 +62,7 @@ typedef struct _CMatchFinderMt
   const UInt32 *crc;
 
   Mf_Mix_Matches MixMatchesFunc;
-  
+
   /* LZ + BT */
   CMtSync btSync;
   Byte btDummy[kMtCacheLineDummy];
@@ -85,7 +85,7 @@ typedef struct _CMatchFinderMt
   /* BT + Hash */
   CMtSync hashSync;
   /* Byte hashDummy[kMtCacheLineDummy]; */
-  
+
   /* Hash */
   Mf_GetHeads GetHeadsFunc;
   CMatchFinder *MatchFinder;
diff --git a/SevenZip/src/Lzma2Dec.c b/SevenZip/src/Lzma2Dec.c
index f3a6b821d..d2f8c8884 100755
--- a/SevenZip/src/Lzma2Dec.c
+++ b/SevenZip/src/Lzma2Dec.c
@@ -114,17 +114,17 @@ static ELzma2State Lzma2Dec_UpdateState(CLzma2Dec *p, Byte b)
       else
         p->unpackSize = (UInt32)(p->control & 0x1F) << 16;
       return LZMA2_STATE_UNPACK0;
-    
+
     case LZMA2_STATE_UNPACK0:
       p->unpackSize |= (UInt32)b << 8;
       return LZMA2_STATE_UNPACK1;
-    
+
     case LZMA2_STATE_UNPACK1:
       p->unpackSize |= (UInt32)b;
       p->unpackSize++;
       PRF(printf(" %8d", p->unpackSize));
       return (LZMA2_IS_UNCOMPRESSED_STATE(p)) ? LZMA2_STATE_DATA : LZMA2_STATE_PACK0;
-    
+
     case LZMA2_STATE_PACK0:
       p->packSize = (UInt32)b << 8;
       return LZMA2_STATE_PACK1;
@@ -199,7 +199,7 @@ SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit,
       SizeT destSizeCur = dicLimit - dicPos;
       SizeT srcSizeCur = inSize - *srcLen;
       ELzmaFinishMode curFinishMode = LZMA_FINISH_ANY;
-      
+
       if (p->unpackSize <= destSizeCur)
       {
         destSizeCur = (SizeT)p->unpackSize;
@@ -250,7 +250,7 @@ SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit,
           Bool initState = (mode > 0);
           if ((!initDic && p->needInitDic) || (!initState && p->needInitState))
             return SZ_ERROR_DATA;
-          
+
           LzmaDec_InitDicAndState(&p->decoder, initDic, initState);
           p->needInitDic = False;
           p->needInitState = False;
@@ -258,9 +258,9 @@ SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit,
         }
         if (srcSizeCur > p->packSize)
           srcSizeCur = (SizeT)p->packSize;
-          
+
         res = LzmaDec_DecodeToDic(&p->decoder, dicPos + destSizeCur, src, &srcSizeCur, curFinishMode, status);
-        
+
         src += srcSizeCur;
         *srcLen += srcSizeCur;
         p->packSize -= (UInt32)srcSizeCur;
diff --git a/SevenZip/src/Lzma2Enc.c b/SevenZip/src/Lzma2Enc.c
index e97597f63..868695516 100755
--- a/SevenZip/src/Lzma2Enc.c
+++ b/SevenZip/src/Lzma2Enc.c
@@ -83,11 +83,11 @@ static SRes Lzma2EncInt_EncodeSubblock(CLzma2EncInt *p, Byte *outBuf,
   if (packSize < lzHeaderSize)
     return SZ_ERROR_OUTPUT_EOF;
   packSize -= lzHeaderSize;
-  
+
   LzmaEnc_SaveState(p->enc);
   res = LzmaEnc_CodeOneMemBlock(p->enc, p->needInitState,
       outBuf + lzHeaderSize, &packSize, LZMA2_PACK_SIZE_MAX, &unpackSize);
-  
+
   PRF(printf("\npackSize = %7d unpackSize = %7d  ", packSize, unpackSize));
 
   if (unpackSize == 0)
@@ -146,10 +146,10 @@ static SRes Lzma2EncInt_EncodeSubblock(CLzma2EncInt *p, Byte *outBuf,
     outBuf[destPos++] = (Byte)u;
     outBuf[destPos++] = (Byte)(pm >> 8);
     outBuf[destPos++] = (Byte)pm;
-    
+
     if (p->needInitProp)
       outBuf[destPos++] = p->props;
-    
+
     p->needInitProp = False;
     p->needInitState = False;
     destPos += packSize;
@@ -244,7 +244,7 @@ typedef struct
 {
   Byte propEncoded;
   CLzma2EncProps props;
-  
+
   Byte *outBuf;
 
   ISzAlloc *alloc;
@@ -322,10 +322,10 @@ static SRes MtCallbackImp_Code(void *pp, unsigned index, Byte *dest, size_t *des
     if (srcSize != 0)
     {
       RINOK(Lzma2EncInt_Init(p, &mainEncoder->props));
-     
+
       RINOK(LzmaEnc_MemPrepare(p->enc, src, srcSize, LZMA2_KEEP_WINDOW_SIZE,
           mainEncoder->alloc, mainEncoder->allocBig));
-     
+
       while (p->srcPos < srcSize)
       {
         size_t packSize = destLim - *destSize;
@@ -460,7 +460,7 @@ SRes Lzma2Enc_Encode(CLzma2EncHandle pp,
 
     mtCallback.funcTable.Code = MtCallbackImp_Code;
     mtCallback.lzma2Enc = p;
-    
+
     p->mtCoder.progress = progress;
     p->mtCoder.inStream = inStream;
     p->mtCoder.outStream = outStream;
@@ -470,7 +470,7 @@ SRes Lzma2Enc_Encode(CLzma2EncHandle pp,
     p->mtCoder.blockSize = p->props.blockSize;
     p->mtCoder.destBlockSize = p->props.blockSize + (p->props.blockSize >> 10) + 16;
     p->mtCoder.numThreads = p->props.numBlockThreads;
-    
+
     return MtCoder_Code(&p->mtCoder);
   }
   #endif
diff --git a/SevenZip/src/Lzma86Enc.c b/SevenZip/src/Lzma86Enc.c
index 2ea4ac2da..45b96b68e 100755
--- a/SevenZip/src/Lzma86Enc.c
+++ b/SevenZip/src/Lzma86Enc.c
@@ -26,7 +26,7 @@ int Lzma86_Encode(Byte *dest, size_t *destLen, const Byte *src, size_t srcLen,
   LzmaEncProps_Init(&props);
   props.level = level;
   props.dictSize = dictSize;
-  
+
   *destLen = 0;
   if (outSize2 < LZMA86_HEADER_SIZE)
     return SZ_ERROR_OUTPUT_EOF;
@@ -78,12 +78,12 @@ int Lzma86_Encode(Byte *dest, size_t *destLen, const Byte *src, size_t srcLen,
         break;
       if (useFilter && i == 0)
         curModeIsFiltered = True;
-      
+
       curRes = LzmaEncode(dest + LZMA86_HEADER_SIZE, &outSizeProcessed,
           curModeIsFiltered ? filteredStream : src, srcLen,
           &props, dest + 1, &outPropsSize, 0,
           NULL, &g_Alloc, &g_Alloc);
-      
+
       if (curRes != SZ_ERROR_OUTPUT_EOF)
       {
         if (curRes != SZ_OK)
diff --git a/SevenZip/src/LzmaDec.c b/SevenZip/src/LzmaDec.c
index 8c1a1486d..1e9f2f2bd 100755
--- a/SevenZip/src/LzmaDec.c
+++ b/SevenZip/src/LzmaDec.c
@@ -141,7 +141,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
   Byte *dic = p->dic;
   SizeT dicBufSize = p->dicBufSize;
   SizeT dicPos = p->dicPos;
-  
+
   UInt32 processedPos = p->processedPos;
   UInt32 checkDicSize = p->checkDicSize;
   unsigned len = 0;
@@ -324,7 +324,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
             {
               NORMALIZE
               range >>= 1;
-              
+
               {
                 UInt32 t;
                 code -= range;
@@ -723,7 +723,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
   SizeT inSize = *srcLen;
   (*srcLen) = 0;
   LzmaDec_WriteRem(p, dicLimit);
-  
+
   *status = LZMA_STATUS_NOT_SPECIFIED;
 
   while (p->remainLen != kMatchSpecLenStart)
@@ -769,7 +769,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
 
       if (p->needInitState)
         LzmaDec_InitStateReal(p);
-  
+
       if (p->tempBufSize == 0)
       {
         SizeT processed;
@@ -900,12 +900,12 @@ SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
 {
   UInt32 dicSize;
   Byte d;
-  
+
   if (size < LZMA_PROPS_SIZE)
     return SZ_ERROR_UNSUPPORTED;
   else
     dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
- 
+
   if (dicSize < LZMA_DIC_MIN)
     dicSize = LZMA_DIC_MIN;
   p->dicSize = dicSize;
diff --git a/SevenZip/src/LzmaDec.h b/SevenZip/src/LzmaDec.h
index bf7f084ba..7927acd0d 100755
--- a/SevenZip/src/LzmaDec.h
+++ b/SevenZip/src/LzmaDec.h
@@ -130,7 +130,7 @@ LzmaDec_Allocate* can return:
   SZ_ERROR_MEM         - Memory allocation error
   SZ_ERROR_UNSUPPORTED - Unsupported properties
 */
-   
+
 SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
 void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
 
@@ -159,7 +159,7 @@ void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
 */
 
 /* LzmaDec_DecodeToDic
-   
+
    The decoding to internal dictionary buffer (CLzmaDec::dic).
    You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
 
diff --git a/SevenZip/src/LzmaEnc.c b/SevenZip/src/LzmaEnc.c
index ef26e0cfd..17d63f38c 100755
--- a/SevenZip/src/LzmaEnc.c
+++ b/SevenZip/src/LzmaEnc.c
@@ -119,7 +119,7 @@ void LzmaEnc_FastPosInit(Byte *g_FastPos)
   int c = 2, slotFast;
   g_FastPos[0] = 0;
   g_FastPos[1] = 1;
-  
+
   for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
   {
     UInt32 k = (1 << ((slotFast >> 1) - 1));
@@ -256,7 +256,7 @@ typedef struct
   CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
   CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
   CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-  
+
   CLenPriceEnc lenEnc;
   CLenPriceEnc repLenEnc;
 
@@ -279,7 +279,7 @@ typedef struct
   #ifndef _7ZIP_ST
   Byte pad[128];
   #endif
-  
+
   UInt32 optimumEndIndex;
   UInt32 optimumCurrentIndex;
 
@@ -287,7 +287,7 @@ typedef struct
   UInt32 numPairs;
   UInt32 numAvail;
   COptimal opt[kNumOpts];
-  
+
   #ifndef LZMA_LOG_BSR
   Byte g_FastPos[1 << kNumLogBits];
   #endif
@@ -321,14 +321,14 @@ typedef struct
   CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
   CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
   CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-  
+
   CLenPriceEnc lenEnc;
   CLenPriceEnc repLenEnc;
 
   unsigned lclp;
 
   Bool fastMode;
-  
+
   CRangeEnc rc;
 
   Bool writeEndMark;
@@ -917,10 +917,10 @@ static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
     {
       UInt32 posPrev = posMem;
       UInt32 backCur = backMem;
-      
+
       backMem = p->opt[posPrev].backPrev;
       posMem = p->opt[posPrev].posPrev;
-      
+
       p->opt[posPrev].backPrev = backCur;
       p->opt[posPrev].posPrev = cur;
       cur = posPrev;
@@ -951,7 +951,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
     return lenRes;
   }
   p->optimumCurrentIndex = p->optimumEndIndex = 0;
-  
+
   if (p->additionalOffset == 0)
     mainLen = ReadMatchDistances(p, &numPairs);
   else
@@ -1249,7 +1249,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
 
     matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
     repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
-    
+
     if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
     {
       UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
@@ -1311,7 +1311,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
         }
       }
     }
-    
+
     startLen = 2; /* speed optimization */
     {
     UInt32 repIndex;
@@ -1342,10 +1342,10 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
       }
       while (--lenTest >= 2);
       lenTest = lenTestTemp;
-      
+
       if (repIndex == 0)
         startLen = lenTest + 1;
-        
+
       /* if (_maxMode) */
         {
           UInt32 lenTest2 = lenTest + 1;
@@ -1369,7 +1369,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
             nextRepMatchPrice = curAndLenCharPrice +
                 GET_PRICE_1(p->isMatch[state2][posStateNext]) +
                 GET_PRICE_1(p->isRep[state2]);
-            
+
             /* for (; lenTest2 >= 2; lenTest2--) */
             {
               UInt32 curAndLenPrice;
@@ -1424,7 +1424,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
           curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
         else
           curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
-        
+
         opt = &p->opt[cur + lenTest];
         if (curAndLenPrice < opt->price)
         {
@@ -1458,7 +1458,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
             nextRepMatchPrice = curAndLenCharPrice +
                 GET_PRICE_1(p->isMatch[state2][posStateNext]) +
                 GET_PRICE_1(p->isRep[state2]);
-            
+
             /* for (; lenTest2 >= 2; lenTest2--) */
             {
               UInt32 offset = cur + lenTest + 1 + lenTest2;
@@ -1570,7 +1570,7 @@ static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
     MovePos(p, repLen - 1);
     return repLen;
   }
-  
+
   if (mainLen < 2 || numAvail <= 2)
     return 1;
 
@@ -1584,7 +1584,7 @@ static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
         (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
       return 1;
   }
-  
+
   data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
   for (i = 0; i < LZMA_NUM_REPS; i++)
   {
@@ -1845,7 +1845,7 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
         pos -= LZMA_NUM_REPS;
         GetPosSlot(pos, posSlot);
         RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
-        
+
         if (posSlot >= kStartPosModelIndex)
         {
           UInt32 footerBits = ((posSlot >> 1) - 1);
@@ -2150,7 +2150,7 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
   p->rc.outStream = &outStream.funcTable;
 
   res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
-  
+
   *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
   *destLen -= outStream.rem;
   if (outStream.overflow)
diff --git a/SevenZip/src/LzmaLib.h b/SevenZip/src/LzmaLib.h
index 76c99ce75..2a3efe161 100755
--- a/SevenZip/src/LzmaLib.h
+++ b/SevenZip/src/LzmaLib.h
@@ -38,7 +38,7 @@ outPropsSize -
   LZMA Encoder will use defult values for any parameter, if it is
   -1  for any from: level, loc, lp, pb, fb, numThreads
    0  for dictSize
-  
+
 level - compression level: 0 <= level <= 9;
 
   level dictSize algo  fb
@@ -50,7 +50,7 @@ level - compression level: 0 <= level <= 9;
     5:    16 MB   1    32
     6:    32 MB   1    32
     7+:   64 MB   1    64
- 
+
   The default value for "level" is 5.
 
   algo = 0 means fast method
diff --git a/SevenZip/src/MtCoder.c b/SevenZip/src/MtCoder.c
index 946fbbc70..c6a992a64 100755
--- a/SevenZip/src/MtCoder.c
+++ b/SevenZip/src/MtCoder.c
@@ -190,9 +190,9 @@ static SRes MtThread_Process(CMtThread *p, Bool *stop)
   *stop = True;
   if (Event_Wait(&p->canRead) != 0)
     return SZ_ERROR_THREAD;
-  
+
   next = GET_NEXT_THREAD(p);
-  
+
   if (p->stopReading)
   {
     next->stopReading = True;
diff --git a/SevenZip/src/MtCoder.h b/SevenZip/src/MtCoder.h
index f0f06da28..e2cbdc3ab 100755
--- a/SevenZip/src/MtCoder.h
+++ b/SevenZip/src/MtCoder.h
@@ -14,7 +14,7 @@ typedef struct
   CAutoResetEvent startEvent;
   CAutoResetEvent finishedEvent;
   int stop;
-  
+
   THREAD_FUNC_TYPE func;
   LPVOID param;
   THREAD_FUNC_RET_TYPE res;
@@ -75,7 +75,7 @@ typedef struct _CMtCoder
   size_t blockSize;
   size_t destBlockSize;
   unsigned numThreads;
-  
+
   ISeqInStream *inStream;
   ISeqOutStream *outStream;
   ICompressProgress *progress;
diff --git a/SevenZip/src/Ppmd.h b/SevenZip/src/Ppmd.h
index 9cbc46647..db8a16d63 100755
--- a/SevenZip/src/Ppmd.h
+++ b/SevenZip/src/Ppmd.h
@@ -82,5 +82,5 @@ typedef
   p[i+7] = p[i+6] = p[i+5] = p[i+4] = p[i+3] = p[i+2] = p[i+1] = p[i+0] = ~(size_t)0; }}
 
 EXTERN_C_END
- 
+
 #endif
diff --git a/SevenZip/src/Ppmd7.c b/SevenZip/src/Ppmd7.c
index 060d86d2e..8e9fb73b5 100755
--- a/SevenZip/src/Ppmd7.c
+++ b/SevenZip/src/Ppmd7.c
@@ -148,7 +148,7 @@ static void GlueFreeBlocks(CPpmd7 *p)
   #else
   CPpmd7_Node_Ref head = p->AlignOffset + p->Size;
   #endif
-  
+
   CPpmd7_Node_Ref n = head;
   unsigned i;
 
@@ -175,7 +175,7 @@ static void GlueFreeBlocks(CPpmd7 *p)
   NODE(n)->Prev = head;
   if (p->LoUnit != p->HiUnit)
     ((CPpmd7_Node *)p->LoUnit)->Stamp = 1;
-  
+
   /* Glue free blocks */
   while (n != head)
   {
@@ -193,7 +193,7 @@ static void GlueFreeBlocks(CPpmd7 *p)
     }
     n = node->Next;
   }
-  
+
   /* Fill lists of free blocks */
   for (n = NODE(head)->Next; n != head;)
   {
@@ -319,7 +319,7 @@ static void RestartModel(CPpmd7 *p)
       for (m = 0; m < 64; m += 8)
         dest[m] = val;
     }
-  
+
   for (i = 0; i < 25; i++)
     for (k = 0; k < 16; k++)
     {
@@ -345,10 +345,10 @@ static CTX_PTR CreateSuccessors(CPpmd7 *p, Bool skip)
   CPpmd_Byte_Ref upBranch = (CPpmd_Byte_Ref)SUCCESSOR(p->FoundState);
   CPpmd_State *ps[PPMD7_MAX_ORDER];
   unsigned numPs = 0;
-  
+
   if (!skip)
     ps[numPs++] = p->FoundState;
-  
+
   while (c->Suffix)
   {
     CPpmd_Void_Ref successor;
@@ -370,10 +370,10 @@ static CTX_PTR CreateSuccessors(CPpmd7 *p, Bool skip)
     }
     ps[numPs++] = s;
   }
-  
+
   upState.Symbol = *(const Byte *)Ppmd7_GetPtr(p, upBranch);
   SetSuccessor(&upState, upBranch + 1);
-  
+
   if (c->NumStats == 1)
     upState.Freq = ONE_STATE(c)->Freq;
   else
@@ -407,7 +407,7 @@ static CTX_PTR CreateSuccessors(CPpmd7 *p, Bool skip)
     c = c1;
   }
   while (numPs != 0);
-  
+
   return c;
 }
 
@@ -423,11 +423,11 @@ static void UpdateModel(CPpmd7 *p)
   CPpmd_Void_Ref successor, fSuccessor = SUCCESSOR(p->FoundState);
   CTX_PTR c;
   unsigned s0, ns;
-  
+
   if (p->FoundState->Freq < MAX_FREQ / 4 && p->MinContext->Suffix != 0)
   {
     c = SUFFIX(p->MinContext);
-    
+
     if (c->NumStats == 1)
     {
       CPpmd_State *s = ONE_STATE(c);
@@ -465,7 +465,7 @@ static void UpdateModel(CPpmd7 *p)
     SetSuccessor(p->FoundState, REF(p->MinContext));
     return;
   }
-  
+
   *p->Text++ = p->FoundState->Symbol;
   successor = REF(p->Text);
   if (p->Text >= p->UnitsStart)
@@ -473,7 +473,7 @@ static void UpdateModel(CPpmd7 *p)
     RestartModel(p);
     return;
   }
-  
+
   if (fSuccessor)
   {
     if (fSuccessor <= successor)
@@ -497,9 +497,9 @@ static void UpdateModel(CPpmd7 *p)
     SetSuccessor(p->FoundState, successor);
     fSuccessor = REF(p->MinContext);
   }
-  
+
   s0 = p->MinContext->SummFreq - (ns = p->MinContext->NumStats) - (p->FoundState->Freq - 1);
-  
+
   for (c = p->MaxContext; c != p->MinContext; c = SUFFIX(c))
   {
     unsigned ns1;
@@ -566,7 +566,7 @@ static void UpdateModel(CPpmd7 *p)
   }
   p->MaxContext = p->MinContext = CTX(fSuccessor);
 }
-  
+
 static void Rescale(CPpmd7 *p)
 {
   unsigned i, adder, sumFreq, escFreq;
@@ -583,7 +583,7 @@ static void Rescale(CPpmd7 *p)
   adder = (p->OrderFall != 0);
   s->Freq = (Byte)((s->Freq + adder) >> 1);
   sumFreq = s->Freq;
-  
+
   i = p->MinContext->NumStats - 1;
   do
   {
@@ -601,7 +601,7 @@ static void Rescale(CPpmd7 *p)
     }
   }
   while (--i);
-  
+
   if (s->Freq == 0)
   {
     unsigned numStats = p->MinContext->NumStats;
diff --git a/SevenZip/src/Ppmd7.h b/SevenZip/src/Ppmd7.h
index 96521c31f..fa4225e2d 100755
--- a/SevenZip/src/Ppmd7.h
+++ b/SevenZip/src/Ppmd7.h
@@ -136,5 +136,5 @@ void Ppmd7z_RangeEnc_FlushData(CPpmd7z_RangeEnc *p);
 void Ppmd7_EncodeSymbol(CPpmd7 *p, CPpmd7z_RangeEnc *rc, int symbol);
 
 EXTERN_C_END
- 
+
 #endif
diff --git a/SevenZip/src/Ppmd7Dec.c b/SevenZip/src/Ppmd7Dec.c
index 68438d5ce..dc31b4f3a 100755
--- a/SevenZip/src/Ppmd7Dec.c
+++ b/SevenZip/src/Ppmd7Dec.c
@@ -160,11 +160,11 @@ int Ppmd7_DecodeSymbol(CPpmd7 *p, IPpmd7_RangeDec *rc)
       i -= k;
     }
     while (i != num);
-    
+
     see = Ppmd7_MakeEscFreq(p, numMasked, &freqSum);
     freqSum += hiCnt;
     count = rc->GetThreshold(rc, freqSum);
-    
+
     if (count < hiCnt)
     {
       Byte symbol;
diff --git a/SevenZip/src/Ppmd7Enc.c b/SevenZip/src/Ppmd7Enc.c
index 8247757d0..51a36b017 100755
--- a/SevenZip/src/Ppmd7Enc.c
+++ b/SevenZip/src/Ppmd7Enc.c
@@ -104,7 +104,7 @@ void Ppmd7_EncodeSymbol(CPpmd7 *p, CPpmd7z_RangeEnc *rc, int symbol)
       sum += s->Freq;
     }
     while (--i);
-    
+
     p->HiBitsFlag = p->HB2Flag[p->FoundState->Symbol];
     PPMD_SetAllBitsIn256Bytes(charMask);
     MASK(s->Symbol) = 0;
@@ -149,7 +149,7 @@ void Ppmd7_EncodeSymbol(CPpmd7 *p, CPpmd7z_RangeEnc *rc, int symbol)
       p->MinContext = Ppmd7_GetContext(p, p->MinContext->Suffix);
     }
     while (p->MinContext->NumStats == numMasked);
-    
+
     see = Ppmd7_MakeEscFreq(p, numMasked, &escFreq);
     s = Ppmd7_GetStats(p, p->MinContext);
     sum = 0;
@@ -178,7 +178,7 @@ void Ppmd7_EncodeSymbol(CPpmd7 *p, CPpmd7z_RangeEnc *rc, int symbol)
       s++;
     }
     while (--i);
-    
+
     RangeEnc_Encode(rc, sum, escFreq, sum + escFreq);
     see->Summ = (UInt16)(see->Summ + sum + escFreq);
   }
diff --git a/SevenZip/src/Sha256.c b/SevenZip/src/Sha256.c
index eb4fc61fc..8b824744c 100755
--- a/SevenZip/src/Sha256.c
+++ b/SevenZip/src/Sha256.c
@@ -133,7 +133,7 @@ static void Sha256_Transform(UInt32 *state, const UInt32 *data)
   for (j = 0; j < 8; j++)
     state[j] += T[j];
   #endif
-  
+
   /* Wipe variables */
   /* memset(W, 0, sizeof(W)); */
   /* memset(T, 0, sizeof(T)); */
diff --git a/SevenZip/src/Xz.h b/SevenZip/src/Xz.h
index 0f7a822c3..45481cfdf 100755
--- a/SevenZip/src/Xz.h
+++ b/SevenZip/src/Xz.h
@@ -199,7 +199,7 @@ typedef struct
   unsigned indexPreSize;
 
   CXzStreamFlags streamFlags;
-  
+
   UInt32 blockHeaderSize;
   UInt64 packSize;
   UInt64 unpackSize;
diff --git a/SevenZip/src/XzDec.c b/SevenZip/src/XzDec.c
index 113e2cdf0..5a4a9a1ca 100755
--- a/SevenZip/src/XzDec.c
+++ b/SevenZip/src/XzDec.c
@@ -421,7 +421,7 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen,
       const Byte *srcCur;
       int srcFinishedCur;
       int encodingWasFinished;
-      
+
       if (i == 0)
       {
         srcCur = src;
@@ -434,7 +434,7 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen,
         srcLenCur = p->size[i - 1] - p->pos[i - 1];
         srcFinishedCur = p->finished[i - 1];
       }
-      
+
       if (i == p->numCoders - 1)
       {
         destCur = dest;
@@ -447,7 +447,7 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen,
         destCur = p->buf + (CODER_BUF_SIZE * i);
         destLenCur = CODER_BUF_SIZE;
       }
-      
+
       res = coder->Code(coder->p, destCur, &destLenCur, srcCur, &srcLenCur, srcFinishedCur, finishMode, &encodingWasFinished);
 
       if (!encodingWasFinished)
@@ -474,7 +474,7 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen,
         p->pos[i] = 0;
         p->finished[i] = encodingWasFinished;
       }
-      
+
       if (res != SZ_OK)
         return res;
 
@@ -637,20 +637,20 @@ SRes XzUnpacker_Code(CXzUnpacker *p, Byte *dest, SizeT *destLen,
         *status = CODER_STATUS_NOT_FINISHED;
         return SZ_OK;
       }
-      
+
       res = MixCoder_Code(&p->decoder, dest, &destLen2, src, &srcLen2, False, finishMode, status);
       XzCheck_Update(&p->check, dest, destLen2);
-      
+
       (*srcLen) += srcLen2;
       src += srcLen2;
       p->packSize += srcLen2;
-      
+
       (*destLen) += destLen2;
       dest += destLen2;
       p->unpackSize += destLen2;
-      
+
       RINOK(res);
-      
+
       if (*status == CODER_STATUS_FINISHED_WITH_MARK)
       {
         Byte temp[32];
@@ -659,14 +659,14 @@ SRes XzUnpacker_Code(CXzUnpacker *p, Byte *dest, SizeT *destLen,
         Sha256_Update(&p->sha, temp, num);
         p->indexSize += num;
         p->numBlocks++;
-        
+
         p->state = XZ_STATE_BLOCK_FOOTER;
         p->pos = 0;
         p->alignPos = 0;
       }
       else if (srcLen2 == 0 && destLen2 == 0)
         return SZ_OK;
-      
+
       continue;
     }
 
@@ -872,7 +872,7 @@ SRes XzUnpacker_Code(CXzUnpacker *p, Byte *dest, SizeT *destLen,
         }
         break;
       }
-      
+
       case XZ_STATE_BLOCK: break; /* to disable GCC warning */
     }
   }
diff --git a/SevenZip/src/XzEnc.c b/SevenZip/src/XzEnc.c
index 56cfd579c..8a206f4b9 100755
--- a/SevenZip/src/XzEnc.c
+++ b/SevenZip/src/XzEnc.c
@@ -409,10 +409,10 @@ static SRes Xz_Compress(CXzStream *xz, CLzma2WithFilters *lzmaf,
     int filterIndex = 0;
     CXzFilter *filter = NULL;
     const CXzFilterProps *fp = props->filterProps;
-    
+
     XzBlock_ClearFlags(&block);
     XzBlock_SetNumFilters(&block, 1 + (fp ? 1 : 0));
-    
+
     if (fp)
     {
       filter = &block.filters[filterIndex++];
@@ -440,13 +440,13 @@ static SRes Xz_Compress(CXzStream *xz, CLzma2WithFilters *lzmaf,
     seqSizeOutStream.p.Write = MyWrite;
     seqSizeOutStream.realStream = outStream;
     seqSizeOutStream.processed = 0;
-    
+
     RINOK(XzBlock_WriteHeader(&block, &seqSizeOutStream.p));
-    
+
     checkInStream.p.Read = SeqCheckInStream_Read;
     checkInStream.realStream = inStream;
     SeqCheckInStream_Init(&checkInStream, XzFlags_GetCheckType(xz->flags));
-    
+
     if (fp)
     {
       #ifdef USE_SUBBLOCK
diff --git a/SevenZip/src/XzIn.c b/SevenZip/src/XzIn.c
index 4ba87a2cf..adb24c0ea 100755
--- a/SevenZip/src/XzIn.c
+++ b/SevenZip/src/XzIn.c
@@ -88,7 +88,7 @@ static SRes Xz_ReadIndex2(CXzStream *p, const Byte *buf, size_t size, ISzAlloc *
     if (numBlocks != numBlocks64 || numBlocks * 2 > size)
       return SZ_ERROR_ARCHIVE;
   }
-  
+
   crcStartPos = pos;
   Xz_Free(p, alloc);
   if (numBlocks != 0)
@@ -149,7 +149,7 @@ static SRes Xz_ReadBackward(CXzStream *p, ILookInStream *stream, Int64 *startOff
   RINOK(SeekFromCur(stream, startOffset));
 
   RINOK(LookInStream_Read2(stream, buf, XZ_STREAM_FOOTER_SIZE, SZ_ERROR_NO_ARCHIVE));
-  
+
   if (memcmp(buf + 10, XZ_FOOTER_SIG, XZ_FOOTER_SIG_SIZE) != 0)
   {
     UInt32 total = 0;
@@ -185,7 +185,7 @@ static SRes Xz_ReadBackward(CXzStream *p, ILookInStream *stream, Int64 *startOff
     if (memcmp(buf + 10, XZ_FOOTER_SIG, XZ_FOOTER_SIG_SIZE) != 0)
       return SZ_ERROR_NO_ARCHIVE;
   }
-  
+
   p->flags = (CXzStreamFlags)GetBe16(buf + 8);
 
   if (!XzFlags_IsSupported(p->flags))
diff --git a/Util/Util.progen b/Util/Util.progen
index 50e5451b3..465e2dbdb 100644
--- a/Util/Util.progen
+++ b/Util/Util.progen
@@ -8,6 +8,7 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\Foundation\\include;..\\XML\\include;..\\JSON\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.compiler.defines =
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
diff --git a/Util/Util_vs170.sln b/Util/Util_vs170.sln
index 5f295523f..70f4846a1 100644
--- a/Util/Util_vs170.sln
+++ b/Util/Util_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.Build.0 = release_static_md|x64
 		{6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Util/Util_vs170.vcxproj b/Util/Util_vs170.vcxproj
index 02b1894ca..d594a0b6b 100644
--- a/Util/Util_vs170.vcxproj
+++ b/Util/Util_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>Util</ProjectName>
     <ProjectGuid>{6FF56CDB-787A-4714-A28C-919003F9FA6C}</ProjectGuid>
     <RootNamespace>Util</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoUtilA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoUtilmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoUtilmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoUtilA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoUtilmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoUtilmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoUtild</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoUtilmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoUtilmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoUtilmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoUtilmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Util\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Util\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Util\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Util\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Util\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Util\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\Util\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\Util\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoUtilA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoUtilA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoUtild.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoUtilA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoUtil.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoUtilmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoUtilmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoUtilmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoUtilmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoUtilmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoUtilmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -672,12 +935,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Util/Util_vs90.vcproj b/Util/Util_vs90.vcproj
index bf81a867d..fcf6c3da2 100644
--- a/Util/Util_vs90.vcproj
+++ b/Util/Util_vs90.vcproj
@@ -574,6 +574,7 @@
 				<File
 					RelativePath=".\include\Poco\Util\LocalConfigurationView.h"
 					>
+				</File>
 				<File
 					RelativePath=".\include\Poco\Util\LoggingConfigurator.h"
 					>
@@ -629,6 +630,7 @@
 				<File
 					RelativePath=".\src\LocalConfigurationView.cpp"
 					>
+				</File>
 				<File
 					RelativePath=".\src\LoggingConfigurator.cpp"
 					>
diff --git a/Util/include/Poco/Util/AbstractConfiguration.h b/Util/include/Poco/Util/AbstractConfiguration.h
index 3276056ee..42aec09b3 100644
--- a/Util/include/Poco/Util/AbstractConfiguration.h
+++ b/Util/include/Poco/Util/AbstractConfiguration.h
@@ -49,7 +49,7 @@ class Util_API AbstractConfiguration: public Poco::RefCountedObject
 public:
 	using Keys = std::vector<std::string>;
 	using Ptr = AutoPtr<AbstractConfiguration>;
-	
+
 	class KeyValue
 		/// A key-value pair, used as event argument.
 	{
@@ -59,27 +59,27 @@ public:
 			_value(value)
 		{
 		}
-		
+
 		const std::string& key() const
 		{
 			return _key;
 		}
-		
+
 		const std::string& value() const
 		{
 			return _value;
 		}
-		
+
 		std::string& value()
 		{
 			return _value;
 		}
-	
+
 	private:
 		const std::string& _key;
 		std::string& _value;
 	};
-	
+
 	Poco::BasicEvent<KeyValue> propertyChanging;
 		/// Fired before a property value is changed or
 		/// a new property is created.
@@ -101,7 +101,7 @@ public:
 		/// Note: This will even be fired if the key
 		/// does not exist and the remove operation will
 		/// fail with an exception.
-		
+
 	Poco::BasicEvent<const std::string> propertyRemoved;
 		/// Fired after a property has been removed by
 		/// a call to remove().
@@ -121,13 +121,13 @@ public:
 		/// Returns true iff the property with the given key exists.
 		///
 		/// Same as hasProperty().
-		
+
 	std::string getString(const std::string& key) const;
 		/// Returns the string value of the property with the given name.
 		/// Throws a NotFoundException if the key does not exist.
 		/// If the value contains references to other properties (${<property>}), these
 		/// are expanded.
-		
+
 	std::string getString(const std::string& key, const std::string& defaultValue) const;
 		/// If a property with the given key exists, returns the property's string value,
 		/// otherwise returns the given default value.
@@ -138,12 +138,12 @@ public:
 		/// Returns the raw string value of the property with the given name.
 		/// Throws a NotFoundException if the key does not exist.
 		/// References to other properties are not expanded.
-		
+
 	std::string getRawString(const std::string& key, const std::string& defaultValue) const;
 		/// If a property with the given key exists, returns the property's raw string value,
 		/// otherwise returns the given default value.
 		/// References to other properties are not expanded.
-		
+
 	int getInt(const std::string& key) const;
 		/// Returns the int value of the property with the given name.
 		/// Throws a NotFoundException if the key does not exist.
@@ -152,7 +152,7 @@ public:
 		/// Numbers starting with 0x are treated as hexadecimal.
 		/// If the value contains references to other properties (${<property>}), these
 		/// are expanded.
-		
+
 	unsigned int getUInt(const std::string& key) const;
 		/// Returns the unsigned int value of the property with the given name.
 		/// Throws a NotFoundException if the key does not exist.
@@ -161,7 +161,7 @@ public:
 		/// Numbers starting with 0x are treated as hexadecimal.
 		/// If the value contains references to other properties (${<property>}), these
 		/// are expanded.
-		
+
 	int getInt(const std::string& key, int defaultValue) const;
 		/// If a property with the given key exists, returns the property's int value,
 		/// otherwise returns the given default value.
@@ -170,7 +170,7 @@ public:
 		/// Numbers starting with 0x are treated as hexadecimal.
 		/// If the value contains references to other properties (${<property>}), these
 		/// are expanded.
-		
+
 	unsigned int getUInt(const std::string& key, unsigned int defaultValue) const;
 		/// If a property with the given key exists, returns the property's unsigned int
 		/// value, otherwise returns the given default value.
@@ -227,7 +227,7 @@ public:
 		/// to a double.
 		/// If the value contains references to other properties (${<property>}), these
 		/// are expanded.
-		
+
 	double getDouble(const std::string& key, double defaultValue) const;
 		/// If a property with the given key exists, returns the property's double value,
 		/// otherwise returns the given default value.
@@ -243,7 +243,7 @@ public:
 		/// to a boolean.
 		/// If the value contains references to other properties (${<property>}), these
 		/// are expanded.
-		
+
 	bool getBool(const std::string& key, bool defaultValue) const;
 		/// If a property with the given key exists, returns the property's boolean value,
 		/// otherwise returns the given default value.
@@ -255,15 +255,15 @@ public:
 		/// Case does not matter.
 		/// If the value contains references to other properties (${<property>}), these
 		/// are expanded.
-		
+
 	virtual void setString(const std::string& key, const std::string& value);
 		/// Sets the property with the given key to the given value.
 		/// An already existing value for the key is overwritten.
-		
+
 	virtual void setInt(const std::string& key, int value);
 		/// Sets the property with the given key to the given value.
 		/// An already existing value for the key is overwritten.
-		
+
 	virtual void setUInt(const std::string& key, unsigned int value);
 		/// Sets the property with the given key to the given value.
 		/// An already existing value for the key is overwritten.
@@ -287,14 +287,14 @@ public:
 	virtual void setBool(const std::string& key, bool value);
 		/// Sets the property with the given key to the given value.
 		/// An already existing value for the key is overwritten.
-		
+
 	void keys(Keys& range) const;
 		/// Returns in range the names of all keys at root level.
 
 	void keys(const std::string& key, Keys& range) const;
 		/// Returns in range the names of all subkeys under the given key.
 		/// If an empty key is passed, all root level keys are returned.
-	
+
 	const Ptr createView(const std::string& prefix) const;
 		/// Creates a non-mutable view (see ConfigurationView) into the configuration.
 
@@ -319,13 +319,13 @@ public:
 		/// Removes the property with the given key.
 		///
 		/// Does nothing if the key does not exist.
-		
+
 	void enableEvents(bool enable = true);
 		/// Enables (or disables) events.
-		
+
 	bool eventsEnabled() const;
 		/// Returns true iff events are enabled.
-	
+
 protected:
 	virtual bool getRaw(const std::string& key, std::string& value) const = 0;
 		/// If the property with the given key exists, stores the property's value
@@ -338,11 +338,11 @@ protected:
 		/// An already existing value for the key is overwritten.
 		///
 		/// Must be overridden by subclasses.
-		
+
 	virtual void enumerate(const std::string& key, Keys& range) const = 0;
 		/// Returns in range the names of all subkeys under the given key.
 		/// If an empty key is passed, all root level keys are returned.
-		
+
 	virtual void removeRaw(const std::string& key);
 		/// Removes the property with the given key.
 		///
@@ -373,7 +373,7 @@ protected:
 
 	static bool parseBool(const std::string& value);
 	void setRawWithEvent(const std::string& key, std::string value);
-	
+
 	virtual ~AbstractConfiguration();
 
 private:
@@ -386,7 +386,7 @@ private:
 	mutable int _depth;
 	bool        _eventsEnabled;
 	mutable Poco::Mutex _mutex;
-	
+
 	friend class LayeredConfiguration;
 	friend class ConfigurationView;
 	friend class LocalConfigurationView;
diff --git a/Util/include/Poco/Util/ConfigurationMapper.h b/Util/include/Poco/Util/ConfigurationMapper.h
index 370ebf84c..df006720c 100644
--- a/Util/include/Poco/Util/ConfigurationMapper.h
+++ b/Util/include/Poco/Util/ConfigurationMapper.h
@@ -29,7 +29,7 @@ namespace Util {
 class Util_API ConfigurationMapper: public AbstractConfiguration
 	/// This configuration maps a property hierarchy into another
 	/// hierarchy.
-	/// 
+	///
 	/// For example, given a configuration with the following properties:
 	///     config.value1
 	///     config.value2
@@ -73,9 +73,9 @@ protected:
 	void setRaw(const std::string& key, const std::string& value);
 	void enumerate(const std::string& key, Keys& range) const;
 	void removeRaw(const std::string& key);
-	
+
 	std::string translateKey(const std::string& key) const;
-	
+
 	~ConfigurationMapper();
 
 private:
diff --git a/Util/include/Poco/Util/ConfigurationView.h b/Util/include/Poco/Util/ConfigurationView.h
index 6c9221d7c..2f1240baa 100644
--- a/Util/include/Poco/Util/ConfigurationView.h
+++ b/Util/include/Poco/Util/ConfigurationView.h
@@ -27,9 +27,9 @@ namespace Util {
 
 
 class Util_API ConfigurationView: public AbstractConfiguration
-	/// This configuration implements a "view" into a sub-hierarchy 
+	/// This configuration implements a "view" into a sub-hierarchy
 	/// of another configuration.
-	/// 
+	///
 	/// For example, given a configuration with the following properties:
 	///     config.value1
 	///     config.value2
@@ -62,9 +62,9 @@ protected:
 	void setRaw(const std::string& key, const std::string& value);
 	void enumerate(const std::string& key, Keys& range) const;
 	void removeRaw(const std::string& key);
-	
+
 	std::string translateKey(const std::string& key) const;
-	
+
 	~ConfigurationView();
 
 private:
diff --git a/Util/include/Poco/Util/FilesystemConfiguration.h b/Util/include/Poco/Util/FilesystemConfiguration.h
index d0a171898..21bcca18b 100644
--- a/Util/include/Poco/Util/FilesystemConfiguration.h
+++ b/Util/include/Poco/Util/FilesystemConfiguration.h
@@ -38,7 +38,7 @@ class Util_API FilesystemConfiguration: public AbstractConfiguration
 	/// All changes to properties are immediately persisted in the filesystem.
 	///
 	/// For example, a configuration consisting of the properties
-	/// 
+	///
 	///   logging.loggers.root.channel.class = ConsoleChannel
 	///   logging.loggers.app.name = Application
 	///   logging.loggers.app.channel = c1
@@ -63,7 +63,7 @@ class Util_API FilesystemConfiguration: public AbstractConfiguration
 	///                         class/
 	///                               data ("PatternFormatter")
 	///                         pattern/
-	///                                 data ("[%p] %t")                      
+	///                                 data ("[%p] %t")
 {
 public:
 	FilesystemConfiguration(const std::string& path);
diff --git a/Util/include/Poco/Util/HelpFormatter.h b/Util/include/Poco/Util/HelpFormatter.h
index 3d79ec011..444fbfbc4 100644
--- a/Util/include/Poco/Util/HelpFormatter.h
+++ b/Util/include/Poco/Util/HelpFormatter.h
@@ -36,7 +36,7 @@ class Util_API HelpFormatter
 public:
 	HelpFormatter(const OptionSet& options);
 		/// Creates the HelpFormatter, using the given
-		/// options. 
+		/// options.
 		///
 		/// The HelpFormatter just stores a reference
 		/// to the given OptionSet, so the OptionSet must not
@@ -47,34 +47,34 @@ public:
 
 	void setCommand(const std::string& command);
 		/// Sets the command name.
-		
+
 	const std::string& getCommand() const;
 		/// Returns the command name.
-		
+
 	void setUsage(const std::string& usage);
 		/// Sets the usage string.
-		
+
 	const std::string& getUsage() const;
 		/// Returns the usage string.
-		
+
 	void setHeader(const std::string& header);
 		/// Sets the header string.
-		
+
 	const std::string& getHeader() const;
 		/// Returns the header string.
-		
+
 	void setFooter(const std::string& footer);
 		/// Sets the footer string.
-		
+
 	const std::string& getFooter() const;
 		/// Returns the footer string.
 
 	void format(std::ostream& ostr) const;
 		/// Writes the formatted help text to the given stream.
-	
+
 	void setWidth(int width);
 		/// Sets the line width for the formatted help text.
-		
+
 	int getWidth() const;
 		/// Returns the line width for the formatted help text.
 		///
@@ -85,10 +85,10 @@ public:
 
 	int getIndent() const;
 		/// Returns the indentation for description continuation lines.
-		
+
 	void setAutoIndent();
 		/// Sets the indentation for description continuation lines so that
-		/// the description text is left-aligned. 
+		/// the description text is left-aligned.
 
 	void setUnixStyle(bool flag);
 		/// Enables Unix-style options. Both short and long option names
@@ -97,14 +97,14 @@ public:
 		///
 		/// After calling setUnixStyle(), setAutoIndent() should be called
 		/// as well to ensure proper help text formatting.
-		
+
 	bool isUnixStyle() const;
 		/// Returns if Unix-style options are set.
 
 	std::string shortPrefix() const;
 		/// Returns the platform-specific prefix for short options.
 		/// "-" on Unix, "/" on Windows and OpenVMS.
-	
+
 	std::string longPrefix() const;
 		/// Returns the platform-specific prefix for long options.
 		/// "--" on Unix, "/" on Windows and OpenVMS.
@@ -129,10 +129,10 @@ protected:
 
 	void formatWord(std::ostream& ostr, int& pos, const std::string& word, int indent) const;
 		/// Formats the given word.
-	
+
 	void clearWord(std::ostream& ostr, int& pos, std::string& word, int indent) const;
 		/// Formats and then clears the given word.
-	
+
 private:
 	HelpFormatter(const HelpFormatter&);
 	HelpFormatter& operator = (const HelpFormatter&);
@@ -145,7 +145,7 @@ private:
 	std::string _header;
 	std::string _footer;
 	bool _unixStyle;
-	
+
 	static const int TAB_WIDTH;
 	static const int LINE_WIDTH;
 };
diff --git a/Util/include/Poco/Util/IniFileConfiguration.h b/Util/include/Poco/Util/IniFileConfiguration.h
index 94ea5da33..0493d3cbd 100644
--- a/Util/include/Poco/Util/IniFileConfiguration.h
+++ b/Util/include/Poco/Util/IniFileConfiguration.h
@@ -56,17 +56,17 @@ public:
 	IniFileConfiguration(std::istream& istr);
 		/// Creates an IniFileConfiguration and loads the configuration data
 		/// from the given stream, which must be in initialization file format.
-		
+
 	IniFileConfiguration(const std::string& path);
 		/// Creates an IniFileConfiguration and loads the configuration data
 		/// from the given file, which must be in initialization file format.
-		
+
 	void load(std::istream& istr);
-		/// Loads the configuration data from the given stream, which 
+		/// Loads the configuration data from the given stream, which
 		/// must be in initialization file format.
-		
+
 	void load(const std::string& path);
-		/// Loads the configuration data from the given file, which 
+		/// Loads the configuration data from the given file, which
 		/// must be in initialization file format.
 
 protected:
@@ -84,7 +84,7 @@ private:
 		bool operator () (const std::string& s1, const std::string& s2) const;
 	};
 	typedef std::map<std::string, std::string, ICompare> IStringMap;
-	
+
 	IStringMap _map;
 	std::string _sectionKey;
 };
diff --git a/Util/include/Poco/Util/JSONConfiguration.h b/Util/include/Poco/Util/JSONConfiguration.h
index d1fa53ece..ff4944f2c 100644
--- a/Util/include/Poco/Util/JSONConfiguration.h
+++ b/Util/include/Poco/Util/JSONConfiguration.h
@@ -108,10 +108,10 @@ public:
 
 
 	virtual void setString(const std::string& key, const std::string& value);
-	
 
-	virtual void removeRaw(const std::string& key);	
-	
+
+	virtual void removeRaw(const std::string& key);
+
 
 protected:
 
diff --git a/Util/include/Poco/Util/LayeredConfiguration.h b/Util/include/Poco/Util/LayeredConfiguration.h
index c705da771..84f2e7275 100644
--- a/Util/include/Poco/Util/LayeredConfiguration.h
+++ b/Util/include/Poco/Util/LayeredConfiguration.h
@@ -35,8 +35,8 @@ class Util_API LayeredConfiguration: public AbstractConfiguration
 	/// all added configurations are searched, in order of their priority.
 	/// Configurations with lower priority values have precedence.
 	///
-	/// When setting a property, the property is always written to the first writeable 
-	/// configuration (see addWriteable()). 
+	/// When setting a property, the property is always written to the first writeable
+	/// configuration (see addWriteable()).
 	/// If no writeable configuration has been added to the LayeredConfiguration, and an
 	/// attempt is made to set a property, a RuntimeException is thrown.
 	///
@@ -51,7 +51,7 @@ public:
 
 	LayeredConfiguration();
 		/// Creates the LayeredConfiguration.
-		
+
 	void add(AbstractConfiguration::Ptr pConfig);
 		/// Adds a read-only configuration to the back of the LayeredConfiguration.
 		/// The LayeredConfiguration takes shared ownership of the given configuration.
@@ -92,8 +92,8 @@ public:
 		///
 		/// Does nothing if the given configuration is not part of the
 		/// LayeredConfiguration.
-		
-protected:	
+
+protected:
 	struct ConfigItem
 	{
 		typedef AbstractConfiguration::Ptr ACPtr;
@@ -107,11 +107,11 @@ protected:
 	void setRaw(const std::string& key, const std::string& value);
 	void enumerate(const std::string& key, Keys& range) const;
 	void removeRaw(const std::string& key);
-	
+
 	int lowest() const;
 	int highest() const;
 	void insert(const ConfigItem& item);
-	
+
 	~LayeredConfiguration();
 
 private:
@@ -119,7 +119,7 @@ private:
 	LayeredConfiguration& operator = (const LayeredConfiguration&);
 
 	typedef std::list<ConfigItem> ConfigList;
-	
+
 	ConfigList _configs;
 };
 
diff --git a/Util/include/Poco/Util/LocalConfigurationView.h b/Util/include/Poco/Util/LocalConfigurationView.h
index febb309ce..7d5b6f383 100644
--- a/Util/include/Poco/Util/LocalConfigurationView.h
+++ b/Util/include/Poco/Util/LocalConfigurationView.h
@@ -20,53 +20,52 @@
 #include "Poco/Util/Util.h"
 
 namespace Poco {
-    namespace Util {
+namespace Util {
 
-        class Util_API LocalConfigurationView : public AbstractConfiguration
-        /// This configuration implements a "view" into a sub-hierarchy
-        /// of another configuration.
-        ///
-        /// For example, given a configuration with the following properties:
-        ///     config.value1
-        ///     config.value2
-        ///     config.sub.value1
-        ///     config.sub.value2
-        /// and a LocalConfigurationView with the prefix "config", then
-        /// the above properties will be available via the view as
-        ///     value1
-        ///     value2
-        ///     sub.value1
-        ///     sub.value2
-        ///
-        /// A LocalConfigurationView is most useful in combination with a
-        /// LayeredConfiguration.
-        ///
-        /// The LocalConfigurationView only searches for the properties in the viewed Space.
-        {
-           public:
-            LocalConfigurationView(const std::string& prefix, AbstractConfiguration::Ptr pConfig);
-            /// Creates the LocalConfigurationView. The LocalConfigurationView
-            /// retains (shared) ownership of the passed configuration.
 
-           protected:
-            bool getRaw(const std::string& key, std::string& value) const;
-            void setRaw(const std::string& key, const std::string& value);
-            void enumerate(const std::string& key, Keys& range) const;
-            void removeRaw(const std::string& key);
+class Util_API LocalConfigurationView : public AbstractConfiguration
+	/// This configuration implements a "view" into a sub-hierarchy
+	/// of another configuration.
+	///
+	/// For example, given a configuration with the following properties:
+	///	 config.value1
+	///	 config.value2
+	///	 config.sub.value1
+	///	 config.sub.value2
+	/// and a LocalConfigurationView with the prefix "config", then
+	/// the above properties will be available via the view as
+	///	 value1
+	///	 value2
+	///	 sub.value1
+	///	 sub.value2
+	///
+	/// A LocalConfigurationView is most useful in combination with a
+	/// LayeredConfiguration.
+	///
+	/// The LocalConfigurationView only searches for the properties in the viewed Space.
+{
+public:
+	LocalConfigurationView(const std::string& prefix, AbstractConfiguration::Ptr pConfig);
+		/// Creates the LocalConfigurationView. The LocalConfigurationView
+		/// retains (shared) ownership of the passed configuration.
 
-            std::string translateKey(const std::string& key) const;
+protected:
+	bool getRaw(const std::string& key, std::string& value) const;
+	void setRaw(const std::string& key, const std::string& value);
+	void enumerate(const std::string& key, Keys& range) const;
+	void removeRaw(const std::string& key);
+	std::string translateKey(const std::string& key) const;
+	~LocalConfigurationView();
 
-            ~LocalConfigurationView();
+private:
+	LocalConfigurationView(const LocalConfigurationView&);
+	LocalConfigurationView& operator=(const LocalConfigurationView&);
+	std::string _prefix;
+	AbstractConfiguration::Ptr _pConfig;
+};
 
-           private:
-            LocalConfigurationView(const LocalConfigurationView&);
-            LocalConfigurationView& operator=(const LocalConfigurationView&);
 
-            std::string _prefix;
-            AbstractConfiguration::Ptr _pConfig;
-        };
+}} // namespace Poco::Util
 
-    }  // namespace Util
-}  // namespace Poco
 
 #endif  // Util_LocalConfigurationView_INCLUDED
diff --git a/Util/include/Poco/Util/LoggingConfigurator.h b/Util/include/Poco/Util/LoggingConfigurator.h
index e10b7b4df..a3847d5ae 100644
--- a/Util/include/Poco/Util/LoggingConfigurator.h
+++ b/Util/include/Poco/Util/LoggingConfigurator.h
@@ -32,17 +32,17 @@ class Util_API LoggingConfigurator
 	/// This utility class uses a configuration object to configure the
 	/// logging subsystem of an application.
 	///
-	/// The LoggingConfigurator sets up and connects formatters, channels 
+	/// The LoggingConfigurator sets up and connects formatters, channels
 	/// and loggers. To accomplish its work, the LoggingConfigurator relies on the
 	/// functionality provided by the LoggingFactory and LoggingRegistry classes.
 	///
 	/// The LoggingConfigurator expects all configuration data to be under a root
 	/// property named "logging".
-	/// 
+	///
 	/// Configuring Formatters
 	///
-	/// A formatter is configured using the "logging.formatters" property. Every 
-	/// formatter has an internal name, which is only used for referring to it 
+	/// A formatter is configured using the "logging.formatters" property. Every
+	/// formatter has an internal name, which is only used for referring to it
 	/// during configuration time. This name becomes part of the property name.
 	/// Every formatter has a mandatory "class" property, which specifies the actual
 	/// class implementing the formatter. Any other properties are passed on to
@@ -68,11 +68,11 @@ class Util_API LoggingConfigurator
 	/// formatter definition. In either case, when a "formatter" property is
 	/// present, the channel is automatically "wrapped" in a FormattingChannel
 	/// object.
-	/// 
+	///
 	/// Similarly, a channel supports also a "pattern" property, which results
 	/// in the automatic instantiation of a FormattingChannel object with a
 	/// connected PatternFormatter.
-	/// 
+	///
 	/// Examples:
 	///     logging.channels.c1.class = ConsoleChannel
 	///     logging.channels.c1.formatter = f1
@@ -109,7 +109,7 @@ public:
 
 	~LoggingConfigurator();
 		/// Destroys the LoggingConfigurator.
-		
+
 	void configure(AbstractConfiguration::Ptr pConfig);
 		/// Configures the logging subsystem based on
 		/// the given configuration.
@@ -125,7 +125,7 @@ private:
 	Poco::Channel::Ptr createChannel(AbstractConfiguration::Ptr pConfig);
 	void configureChannel(Channel::Ptr pChannel, AbstractConfiguration::Ptr pConfig);
 	void configureLogger(AbstractConfiguration::Ptr pConfig);
-	
+
 	LoggingConfigurator(const LoggingConfigurator&);
 	LoggingConfigurator& operator = (const LoggingConfigurator&);
 };
diff --git a/Util/include/Poco/Util/LoggingSubsystem.h b/Util/include/Poco/Util/LoggingSubsystem.h
index 53e8c9a8b..d85ffd5d1 100644
--- a/Util/include/Poco/Util/LoggingSubsystem.h
+++ b/Util/include/Poco/Util/LoggingSubsystem.h
@@ -38,7 +38,7 @@ class Util_API LoggingSubsystem: public Subsystem
 public:
 	LoggingSubsystem();
 	const char* name() const;
-	
+
 protected:
 	void initialize(Application& self);
 	void uninitialize();
diff --git a/Util/include/Poco/Util/MapConfiguration.h b/Util/include/Poco/Util/MapConfiguration.h
index ac725cd15..af929b783 100644
--- a/Util/include/Poco/Util/MapConfiguration.h
+++ b/Util/include/Poco/Util/MapConfiguration.h
@@ -53,7 +53,7 @@ protected:
 	iterator begin() const;
 	iterator end() const;
 
-private:	
+private:
 	StringMap _map;
 };
 
diff --git a/Util/include/Poco/Util/Option.h b/Util/include/Poco/Util/Option.h
index 74c9a4f97..bd270d52e 100644
--- a/Util/include/Poco/Util/Option.h
+++ b/Util/include/Poco/Util/Option.h
@@ -91,7 +91,7 @@ public:
 	Option& operator = (const Option& option);
 		/// Assignment operator.
 
-	void swap(Option& option);
+	void swap(Option& option) noexcept;
 		/// Swaps the option with another one.
 
 	Option& shortName(const std::string& name);
diff --git a/Util/include/Poco/Util/OptionCallback.h b/Util/include/Poco/Util/OptionCallback.h
index 63dd4a30e..40dd84c76 100644
--- a/Util/include/Poco/Util/OptionCallback.h
+++ b/Util/include/Poco/Util/OptionCallback.h
@@ -31,7 +31,7 @@ class Util_API AbstractOptionCallback
 public:
 	virtual void invoke(const std::string& name, const std::string& value) const = 0;
 		/// Invokes the callback member function.
-		
+
 	virtual AbstractOptionCallback* clone() const = 0;
 		/// Creates and returns a copy of the object.
 
@@ -61,7 +61,7 @@ public:
 	{
 		poco_check_ptr (pObject);
 	}
-	
+
 	OptionCallback(const OptionCallback& cb):
 		AbstractOptionCallback(cb),
 		_pObject(cb._pObject),
@@ -69,12 +69,12 @@ public:
 		/// Creates an OptionCallback from another one.
 	{
 	}
-	
+
 	~OptionCallback()
 		/// Destroys the OptionCallback.
 	{
 	}
-	
+
 	OptionCallback& operator = (const OptionCallback& cb)
 	{
 		if (&cb != this)
@@ -84,20 +84,20 @@ public:
 		}
 		return *this;
 	}
-	
+
 	void invoke(const std::string& name, const std::string& value) const
 	{
 		(_pObject->*_method)(name, value);
 	}
-	
+
 	AbstractOptionCallback* clone() const
 	{
 		return new OptionCallback(_pObject, _method);
 	}
-	
+
 private:
 	OptionCallback();
-	
+
 	C* _pObject;
 	Callback _method;
 };
diff --git a/Util/include/Poco/Util/OptionProcessor.h b/Util/include/Poco/Util/OptionProcessor.h
index 47e5eb873..4b932f293 100644
--- a/Util/include/Poco/Util/OptionProcessor.h
+++ b/Util/include/Poco/Util/OptionProcessor.h
@@ -56,7 +56,7 @@ class Util_API OptionProcessor
 	/// In Unix mode, the option prefix is a dash '-'. A dash must be followed
 	/// by a short option name, or another dash, followed by a (partial)
 	/// long option name.
-	/// In default mode, the option prefix is a slash '/', followed by 
+	/// In default mode, the option prefix is a slash '/', followed by
 	/// a (partial) long option name.
 	/// If the special option '--' is encountered in Unix mode, all following
 	/// options are ignored.
@@ -64,7 +64,7 @@ class Util_API OptionProcessor
 	/// Option arguments can be specified in three ways. If a Unix short option
 	/// ("-o") is given, the argument directly follows the option name, without
 	/// any delimiting character or space ("-ovalue"). In default option mode, or if a
-	/// Unix long option ("--option") is given, the option argument is 
+	/// Unix long option ("--option") is given, the option argument is
 	/// delimited from the option name with either an equal sign ('=') or
 	/// a colon (':'), as in "--option=value" or "/option:value". Finally,
 	/// a required option argument can be specified on the command line after the
@@ -97,7 +97,7 @@ public:
 		/// Examines and processes the given command line argument.
 		///
 		/// If the argument begins with an option prefix, the option is processed
-		/// and true is returned. The full option name is stored in optionName and the 
+		/// and true is returned. The full option name is stored in optionName and the
 		/// option argument, if present, is stored in optionArg.
 		///
 		/// If the option does not begin with an option prefix, false is returned.
@@ -112,7 +112,7 @@ private:
 	bool processUnix(const std::string& argument, std::string& optionName, std::string& optionArg);
 	bool processDefault(const std::string& argument, std::string& optionName, std::string& optionArg);
 	bool processCommon(const std::string& option, bool isShort, std::string& optionName, std::string& optionArg);
-	
+
 	const OptionSet& _options;
 	bool _unixStyle;
 	bool _ignore;
diff --git a/Util/include/Poco/Util/OptionSet.h b/Util/include/Poco/Util/OptionSet.h
index 170b0cbb7..39b7b9ca6 100644
--- a/Util/include/Poco/Util/OptionSet.h
+++ b/Util/include/Poco/Util/OptionSet.h
@@ -48,7 +48,7 @@ public:
 
 	void addOption(const Option& option);
 		/// Adds an option to the collection.
-	
+
 	bool hasOption(const std::string& name, bool matchShort = false) const;
 		/// Returns a true iff an option with the given name exists.
 		///
@@ -58,7 +58,7 @@ public:
 		/// The name must either match the short or full name of an
 		/// option. Comparison case sensitive for the short name and
 		/// not case sensitive for the full name.
-		
+
 	const Option& getOption(const std::string& name, bool matchShort = false) const;
 		/// Returns a reference to the option with the given name.
 		///
@@ -73,11 +73,11 @@ public:
 
 	Iterator begin() const;
 		/// Supports iterating over all options.
-		
+
 	Iterator end() const;
 		/// Supports iterating over all options.
-	
-private:	
+
+private:
 	OptionVec _options;
 };
 
diff --git a/Util/include/Poco/Util/PropertyFileConfiguration.h b/Util/include/Poco/Util/PropertyFileConfiguration.h
index bf478d9d2..e16933422 100644
--- a/Util/include/Poco/Util/PropertyFileConfiguration.h
+++ b/Util/include/Poco/Util/PropertyFileConfiguration.h
@@ -61,19 +61,19 @@ public:
 	PropertyFileConfiguration(std::istream& istr);
 		/// Creates an PropertyFileConfiguration and loads the configuration data
 		/// from the given stream, which must be in properties file format.
-		
+
 	PropertyFileConfiguration(const std::string& path);
 		/// Creates an PropertyFileConfiguration and loads the configuration data
 		/// from the given file, which must be in properties file format.
-		
+
 	void load(std::istream& istr);
-		/// Loads the configuration data from the given stream, which 
+		/// Loads the configuration data from the given stream, which
 		/// must be in properties file format.
-		
+
 	void load(const std::string& path);
-		/// Loads the configuration data from the given file, which 
+		/// Loads the configuration data from the given file, which
 		/// must be in properties file format.
-		
+
 	void save(std::ostream& ostr) const;
 		/// Writes the configuration data to the given stream.
 		///
@@ -86,7 +86,7 @@ public:
 
 protected:
 	~PropertyFileConfiguration();
-	
+
 private:
 	void parseLine(std::istream& istr);
 	static int readChar(std::istream& istr);
diff --git a/Util/include/Poco/Util/RegExpValidator.h b/Util/include/Poco/Util/RegExpValidator.h
index 81e5d4ad9..b93c7edb9 100644
--- a/Util/include/Poco/Util/RegExpValidator.h
+++ b/Util/include/Poco/Util/RegExpValidator.h
@@ -44,7 +44,7 @@ public:
 private:
 	RegExpValidator();
 
-	std::string _regexp;	
+	std::string _regexp;
 };
 
 
diff --git a/Util/include/Poco/Util/ServerApplication.h b/Util/include/Poco/Util/ServerApplication.h
index 0fd30983e..85c4ed19d 100644
--- a/Util/include/Poco/Util/ServerApplication.h
+++ b/Util/include/Poco/Util/ServerApplication.h
@@ -81,7 +81,7 @@ class Util_API ServerApplication: public Application
 	///
 	/// An application can determine whether it is running as a service by checking
 	/// for the "application.runAsService" configuration property.
-	/// 
+	///
 	///     if (config().getBool("application.runAsService", false))
 	///     {
 	///         // do service specific things
@@ -103,7 +103,7 @@ class Util_API ServerApplication: public Application
 	/// command line option. A daemon, when launched, immediately
 	/// forks off a background process that does the actual work. After launching
 	/// the background process, the foreground process exits.
-	/// 
+	///
 	/// After the initialization is complete, but before entering the main() method,
 	/// the current working directory for the daemon process is changed to the root
 	/// directory ("/"), as it is common practice for daemon processes. Therefore, be
@@ -119,8 +119,8 @@ class Util_API ServerApplication: public Application
 	///     }
 	///
 	/// When running as a daemon, specifying the --pidfile option (e.g.,
-	/// --pidfile=/var/run/sample.pid) may be useful to record the process ID of 
-	/// the daemon in a file. The PID file will be removed when the daemon process 
+	/// --pidfile=/var/run/sample.pid) may be useful to record the process ID of
+	/// the daemon in a file. The PID file will be removed when the daemon process
 	/// terminates (but not, if it crashes).
 {
 public:
@@ -129,7 +129,7 @@ public:
 
 	~ServerApplication();
 		/// Destroys the ServerApplication.
-		
+
 	bool isInteractive() const;
 		/// Returns true if the application runs from the command line.
 		/// Returns false if the application runs as a Unix daemon
@@ -138,7 +138,7 @@ public:
 	int run(int argc, char** argv);
 		/// Runs the application by performing additional initializations
 		/// and calling the main() method.
-		
+
 	int run(const std::vector<std::string>& args);
 		/// Runs the application by performing additional initializations
 		/// and calling the main() method.
@@ -154,10 +154,10 @@ public:
 
 	static void terminate();
 		/// Sends a friendly termination request to the application.
-		/// If the application's main thread is waiting in 
+		/// If the application's main thread is waiting in
 		/// waitForTerminationRequest(), this method will return
 		/// and the application can shut down.
-		
+
 protected:
 	int run();
 	void waitForTerminationRequest();
@@ -198,16 +198,16 @@ private:
 	void handleUnregisterService(const std::string& name, const std::string& value);
 	void handleDisplayName(const std::string& name, const std::string& value);
 	void handleDescription(const std::string& name, const std::string& value);
-	void handleStartup(const std::string& name, const std::string& value);	
-	
+	void handleStartup(const std::string& name, const std::string& value);
+
 	Action      _action;
 	std::string _displayName;
 	std::string _description;
 	std::string _startup;
 
 	static Poco::Event           _terminated;
-	static SERVICE_STATUS        _serviceStatus; 
-	static SERVICE_STATUS_HANDLE _serviceStatusHandle; 
+	static SERVICE_STATUS        _serviceStatus;
+	static SERVICE_STATUS_HANDLE _serviceStatusHandle;
 #endif // _WIN32_WCE
 	static Poco::NamedEvent      _terminate;
 #endif
diff --git a/Util/include/Poco/Util/SystemConfiguration.h b/Util/include/Poco/Util/SystemConfiguration.h
index e80dc6ef2..66374d9aa 100644
--- a/Util/include/Poco/Util/SystemConfiguration.h
+++ b/Util/include/Poco/Util/SystemConfiguration.h
@@ -27,7 +27,7 @@ namespace Util {
 
 
 class Util_API SystemConfiguration: public AbstractConfiguration
-	/// This class implements a Configuration interface to 
+	/// This class implements a Configuration interface to
 	/// various system properties and environment variables.
 	///
 	/// The following properties are supported:
@@ -35,7 +35,7 @@ class Util_API SystemConfiguration: public AbstractConfiguration
 	///   - system.osVersion: the operating system version
 	///   - system.osArchitecture: the operating system architecture
 	///   - system.nodeName: the node (or host) name
-	///   - system.nodeId: system ID, based on the Ethernet address (format "xxxxxxxxxxxx") 
+	///   - system.nodeId: system ID, based on the Ethernet address (format "xxxxxxxxxxxx")
 	///     of the first Ethernet adapter found on the system.
 	///   - system.currentDir: the current working directory
 	///   - system.homeDir: the user's home directory
@@ -51,9 +51,9 @@ class Util_API SystemConfiguration: public AbstractConfiguration
 	///
 	/// An attempt to set a system variable will result in an
 	/// InvalidAccessException being thrown.
-	/// 
-	/// Enumerating environment variables is not supported. 
-	/// An attempt to call keys("system.env") will return an empty range. 
+	///
+	/// Enumerating environment variables is not supported.
+	/// An attempt to call keys("system.env") will return an empty range.
 	///
 	/// Removing key is not supported. An attempt to remove a key results
 	/// in a NotImplementedException being thrown.
diff --git a/Util/include/Poco/Util/TimerTask.h b/Util/include/Poco/Util/TimerTask.h
index 564fe0cf1..4164f7039 100644
--- a/Util/include/Poco/Util/TimerTask.h
+++ b/Util/include/Poco/Util/TimerTask.h
@@ -23,6 +23,7 @@
 #include "Poco/RefCountedObject.h"
 #include "Poco/AutoPtr.h"
 #include "Poco/Timestamp.h"
+#include "Poco/Mutex.h"
 
 
 namespace Poco {
@@ -62,6 +63,9 @@ public:
 		///
 		/// Returns 0 if the timer has never been executed.
 
+	void updateLastExecution();
+		/// Updates the last execution of the timer task.
+
 protected:
 	~TimerTask();
 		/// Destroys the TimerTask.
@@ -71,9 +75,8 @@ private:
 	TimerTask& operator = (const TimerTask&);
 
 	Poco::Timestamp _lastExecution;
-	bool _isCancelled;
-
-	friend class TaskNotification;
+	std::atomic<bool> _isCancelled;
+	mutable FastMutex _mutex;
 };
 
 
@@ -114,10 +117,18 @@ inline bool TimerTask::isCancelled() const
 
 inline Poco::Timestamp TimerTask::lastExecution() const
 {
+	FastMutex::ScopedLock l(_mutex);
 	return _lastExecution;
 }
 
 
+inline void TimerTask::updateLastExecution()
+{
+	FastMutex::ScopedLock l(_mutex);
+	_lastExecution.update();
+}
+
+
 } } // namespace Poco::Util
 
 
diff --git a/Util/include/Poco/Util/TimerTaskAdapter.h b/Util/include/Poco/Util/TimerTaskAdapter.h
index 32ff3b981..21c75066d 100644
--- a/Util/include/Poco/Util/TimerTaskAdapter.h
+++ b/Util/include/Poco/Util/TimerTaskAdapter.h
@@ -30,31 +30,31 @@ template <class C>
 class TimerTaskAdapter: public TimerTask
 	/// This class template simplifies the implementation
 	/// of TimerTask objects by allowing a member function
-	/// of an object to be called as task. 
+	/// of an object to be called as task.
 {
 public:
 	typedef void (C::*Callback)(TimerTask&);
-	
+
 	TimerTaskAdapter(C& object, Callback method): _pObject(&object), _method(method)
-		/// Creates the TimerTaskAdapter, using the given 
+		/// Creates the TimerTaskAdapter, using the given
 		/// object and its member function as task target.
 		///
 		/// The member function must accept one argument,
 		/// a reference to a TimerTask object.
 	{
 	}
-	
+
 	void run()
 	{
 		(_pObject->*_method)(*this);
 	}
-			
+
 protected:
 	~TimerTaskAdapter()
 		/// Destroys the TimerTaskAdapter.
 	{
 	}
-	
+
 private:
 	TimerTaskAdapter();
 
diff --git a/Util/include/Poco/Util/Units.h b/Util/include/Poco/Util/Units.h
index e7f3869dd..458aae9f2 100644
--- a/Util/include/Poco/Util/Units.h
+++ b/Util/include/Poco/Util/Units.h
@@ -42,8 +42,8 @@ namespace Units {
 
 namespace Internal
 {
-	template <typename T1, typename T2> struct Convert;	
-	struct None; 
+	template <typename T1, typename T2> struct Convert;
+	struct None;
 	template <int Num, int Den, int Div=Num/Den, int Mod=Num%Den>
 	struct FixedPower;
 }
@@ -80,7 +80,7 @@ class Value
 	///   - U is the unit of the Value
 	///
 	/// This class is usually not used directly;
-	/// client code should use the typedef'd 
+	/// client code should use the typedef'd
 	/// instantiations defined in the Values and
 	/// Constants namespace.
 	///
@@ -103,25 +103,25 @@ public:
 	typedef V ValueType;
 	typedef U Unit;
 
-	Value(): _rep() 
-	{ 
+	Value(): _rep()
+	{
 	}
 
-	explicit Value(const ValueType& v): _rep(v) 
-	{ 
+	explicit Value(const ValueType& v): _rep(v)
+	{
 	}
-	
+
 	template <typename OV, typename OU>
 	Value(const Value<OV, OU>& v):
 		_rep(Internal::Convert<OU, U>::fn(v.get()))
 	{
 	}
 
-	const ValueType& get() const 
-	{ 
-		return _rep; 
+	const ValueType& get() const
+	{
+		return _rep;
 	}
-	 
+
 	template <typename OV, typename OU>
 	Value& operator = (const Value<OV, OU>& other)
 	{
@@ -231,30 +231,30 @@ public:
 		return get() >= Value(other).get();
 	}
 
-	Value& operator ++ () 
-	{ 
-		++_rep; 
-		return *this; 
+	Value& operator ++ ()
+	{
+		++_rep;
+		return *this;
 	}
 
-	Value operator ++ (int) 
-	{ 
-		Value v = *this; 
-		++_rep; 
-		return v; 
+	Value operator ++ (int)
+	{
+		Value v = *this;
+		++_rep;
+		return v;
 	}
 
-	Value& operator -- () 
-	{ 
-		--_rep; 
-		return *this; 
+	Value& operator -- ()
+	{
+		--_rep;
+		return *this;
 	}
 
-	Value operator -- (int) 
-	{ 
-		Value v = *this; 
-		--_rep; 
-		return v; 
+	Value operator -- (int)
+	{
+		Value v = *this;
+		--_rep;
+		return v;
 	}
 
 private:
@@ -312,7 +312,7 @@ namespace Internal
 	template <typename U>
 	struct ScalingFactor;
 
-	template <typename T1, typename T2> 
+	template <typename T1, typename T2>
 	struct Convert3
 		/// Converts T1 to T2.
 		/// Stage 3 - performed after Stage 1 and Stage 2.
@@ -328,7 +328,7 @@ namespace Internal
 		}
 	};
 
-	template <typename T1, typename T2> 
+	template <typename T1, typename T2>
 	struct Convert2
 		/// Converts T1 to T2.
 		/// Template matches the first argument (T1),
@@ -341,7 +341,7 @@ namespace Internal
 		}
 	};
 
-	template <typename T1, typename T2> 
+	template <typename T1, typename T2>
 	struct Convert
 		/// Converts T1 to T2.
 		/// If you really want to implement your own conversion routine,
@@ -365,7 +365,7 @@ namespace Internal
 		template <typename U>
 		static const U& fn(const U& u) { return u; }
 	};
-	
+
 	template <typename T>
 	struct Convert3<T, T>
 		// Convert to same type.
@@ -384,7 +384,7 @@ namespace Internal
 			return Convert<T, U>::fn((v * Den)/Num);
 		}
 	};
-	
+
 	template <typename T, typename U, int Num, int Den>
 	struct Convert3<T, Scale<U, Num, Den> >
 		// Convert to a scaled Unit.
@@ -433,8 +433,8 @@ namespace Internal
 	{
 		static const int num = 1;
 		static const int den = 1;
-	}; 
- 
+	};
+
 	template <typename Term, typename U, int N, int D>
 	struct CountTerms<Term, Scale<U, N, D> >
 		// CountTerms ignores scaling factors - that is taken care of by ScalingFactor.
@@ -476,7 +476,7 @@ namespace Internal
 	struct CheckTermsEqual
 		/// Counts the power of the Unit Term in Units T1 and T2.
 		/// Reports if they are equal, using equality of fractions.
-		/// Does a depth-first search of the Unit "Term", 
+		/// Does a depth-first search of the Unit "Term",
 		/// or counts the terms in the default case.
 	{
 		typedef CountTerms<Term, T1> count1;
@@ -526,7 +526,7 @@ namespace Internal
 	template <int Num, int Den, int Div, int Mod>
 	struct FixedPower
 		/// A functor that raises a Value to the power Num/Den.
-		/// The template is specialised for efficiency 
+		/// The template is specialised for efficiency
 		/// so that we don't always have to call the std::power function.
 	{
 		template <typename T> static T Power(const T& t)
@@ -678,7 +678,7 @@ namespace Internal
 		/// The default Unit formatting mechanism.
 	{
 		template <typename Stream>
-		static void fn(Stream &os) 
+		static void fn(Stream &os)
 		{
 			os << "Units";
 		}
@@ -691,7 +691,7 @@ struct OutputUnit
 	/// Functor to write Unit text to stream.
 {
 	template <typename Stream>
-	static void fn(Stream &os) 
+	static void fn(Stream &os)
 	{
 		Internal::OutputUnit2<U>::fn(os);
 	}
@@ -707,11 +707,11 @@ namespace Internal
 	struct OutputUnit2< Compose<U1,U2> >
 	{
 		template <typename Stream>
-		static void fn(Stream &os) 
-		{ 
-			OutputUnit<U1>::fn(os); 
+		static void fn(Stream &os)
+		{
+			OutputUnit<U1>::fn(os);
 			os << '.';
-			OutputUnit<U2>::fn(os); 
+			OutputUnit<U2>::fn(os);
 		}
 	};
 
@@ -719,10 +719,10 @@ namespace Internal
 	struct OutputUnit2< Power<U, Num, Den > >
 	{
 		template <typename Stream>
-		static void fn(Stream &os) 
-		{ 
+		static void fn(Stream &os)
+		{
 			if(Num!=Den) os << '(';
-			OutputUnit<U>::fn(os); 
+			OutputUnit<U>::fn(os);
 			if(Num!=Den)
 			{
 				os << ')';
@@ -739,10 +739,10 @@ namespace Internal
 	struct OutputUnit2< Translate<U, Num, Den > >
 	{
 		template <typename Stream>
-		static void fn(Stream &os) 
-		{ 
+		static void fn(Stream &os)
+		{
 			os << '(';
-			OutputUnit<U>::fn(os); 
+			OutputUnit<U>::fn(os);
 			os << '+' << Num;
 			if(Den!=1) os << '/' << Den;
 			os << ')';
@@ -753,13 +753,13 @@ namespace Internal
 	struct OutputUnit2< Scale<U, Num, Den > >
 	{
 		template <typename Stream>
-		static void fn(Stream &os) 
-		{ 
+		static void fn(Stream &os)
+		{
 			os << Den;
 			if(Num != 1)
 				os << '/' << Num;
 			os << '.';
-			OutputUnit<U>::fn(os); 
+			OutputUnit<U>::fn(os);
 		}
 	};
 } // namespace Internal
@@ -893,15 +893,15 @@ namespace Units
 	{
 	public:
 		template <typename T>
-		Prefix(const T& val, double multiplier = 1, const std::string& prefix = ""): 
+		Prefix(const T& val, double multiplier = 1, const std::string& prefix = ""):
 			_pHolder(new Holder<T>(val)),
 			_multiplier(multiplier),
 			_prefix(prefix)
-		{ 
+		{
 		}
 
 		double value() const
-		{ 
+		{
 			return _pHolder->get() * _multiplier;
 		}
 
@@ -931,7 +931,7 @@ namespace Units
 		{
 			typedef Value<typename U::ValueType, typename U::Unit> ValueType;
 
-			Holder (const U& val): _val(ValueType(val)) 
+			Holder (const U& val): _val(ValueType(val))
 			{
 			}
 
@@ -997,7 +997,7 @@ namespace Units
 	typedef Scale<minute, 1, 60> hour;
 	typedef Scale<hour, 1, 24> day;
 	typedef Scale<day, 1, 7> week;
-	struct month;	// No fixed ratio with week 
+	struct month;	// No fixed ratio with week
 	typedef Scale<month, 1, 12> year;
 	typedef Scale<year, 1, 100> century;
 	typedef Scale<year, 1, 1000> millennium;
@@ -1213,7 +1213,7 @@ namespace Values
 	DEFINE_PREFIX_CLASS (kilo, .001, "k")
 	DEFINE_PREFIX_CLASS (mega, 1e-6, "M")
 	DEFINE_PREFIX_CLASS (giga, 1e-9, "G")
-	DEFINE_PREFIX_CLASS (tera, 1e-12, "T") 
+	DEFINE_PREFIX_CLASS (tera, 1e-12, "T")
 	DEFINE_PREFIX_CLASS (peta, 1e-15, "P")
 	DEFINE_PREFIX_CLASS (exa, 1e-18, "E")
 	DEFINE_PREFIX_CLASS (zetta, 1e-21, "Z")
diff --git a/Util/include/Poco/Util/WinRegistryConfiguration.h b/Util/include/Poco/Util/WinRegistryConfiguration.h
index e7e49fc9e..0dfebe2aa 100644
--- a/Util/include/Poco/Util/WinRegistryConfiguration.h
+++ b/Util/include/Poco/Util/WinRegistryConfiguration.h
@@ -36,7 +36,7 @@ class Util_API WinRegistryConfiguration: public AbstractConfiguration
 {
 public:
 	WinRegistryConfiguration(const std::string& rootPath, REGSAM extraSam = 0);
-		/// Creates the WinRegistryConfiguration. 
+		/// Creates the WinRegistryConfiguration.
 		/// The rootPath must start with one of the root key names
 		/// like HKEY_CLASSES_ROOT, e.g. HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services.
 		/// All further keys are relative to the root path and can be
diff --git a/Util/include/Poco/Util/WinService.h b/Util/include/Poco/Util/WinService.h
index 06bc46aa2..8068e9bb4 100644
--- a/Util/include/Poco/Util/WinService.h
+++ b/Util/include/Poco/Util/WinService.h
@@ -46,8 +46,8 @@ public:
 		SVC_MANUAL_START,
 		SVC_DISABLED
 	};
-	
-	enum FailureActionType 
+
+	enum FailureActionType
 	{
 		SVC_NONE,
 		SVC_REBOOT,
@@ -55,7 +55,7 @@ public:
 		SVC_RUN_COMMAND
 	};
 
-	struct FailureAction 
+	struct FailureAction
 	{
 		FailureActionType type;
 		int delay;
@@ -83,7 +83,7 @@ public:
 		/// Returns the service's display name.
 
 	std::string path() const;
-		/// Returns the path to the service executable. 
+		/// Returns the path to the service executable.
 		///
 		/// Throws a NotFoundException if the service has not been registered.
 
@@ -92,7 +92,7 @@ public:
 		/// and the given displayName.
 		///
 		/// Throws a ExistsException if the service has already been registered.
-		
+
 	void registerService(const std::string& path);
 		/// Creates a Windows service with the executable specified by path
 		/// and the given displayName. The service name is used as display name.
@@ -100,7 +100,7 @@ public:
 		/// Throws a ExistsException if the service has already been registered.
 
 	void unregisterService();
-		/// Deletes the Windows service. 
+		/// Deletes the Windows service.
 		///
 		/// Throws a NotFoundException if the service has not been registered.
 
@@ -112,7 +112,7 @@ public:
 
 	bool isStopped() const;
 		/// Returns true if the service is currently stopped.
-		
+
 	void start();
 		/// Starts the service.
 		/// Does nothing if the service is already running.
@@ -127,7 +127,7 @@ public:
 
 	void setStartup(Startup startup);
 		/// Sets the startup mode for the service.
-		
+
 	Startup getStartup() const;
 		/// Returns the startup mode for the service.
 
@@ -138,10 +138,10 @@ public:
 
 	FailureActionTypeVector getFailureActions() const;
 		/// Returns the Failure Actions for the service.
-		
+
 	void setDescription(const std::string& description);
 		/// Sets the service description in the registry.
-		
+
 	std::string getDescription() const;
 		/// Returns the service description from the registry.
 
diff --git a/Util/include/Poco/Util/XMLConfiguration.h b/Util/include/Poco/Util/XMLConfiguration.h
index c47505e67..702f6b0b7 100644
--- a/Util/include/Poco/Util/XMLConfiguration.h
+++ b/Util/include/Poco/Util/XMLConfiguration.h
@@ -41,9 +41,9 @@ class Util_API XMLConfiguration: public AbstractConfiguration
 	/// from an XML document. An XPath-like syntax for property
 	/// names is supported to allow full access to the XML document.
 	/// XML namespaces are not supported. The name of the root element
-	/// of the XML document is not significant and ignored. 
+	/// of the XML document is not significant and ignored.
 	/// Periods in tag names are not supported.
-	/// 
+	///
 	/// Given the following XML document as an example:
 	///
 	///     <config>
@@ -120,7 +120,7 @@ public:
 	XMLConfiguration(const Poco::XML::Document* pDocument, char delim);
 		/// Creates the XMLConfiguration using the given XML document.
 		/// Uses the given delimiter char instead of the default '.'.
-		
+
 	XMLConfiguration(const Poco::XML::Node* pNode);
 		/// Creates the XMLConfiguration using the given XML node.
 
@@ -134,18 +134,18 @@ public:
 
 	void load(Poco::XML::InputSource* pInputSource, unsigned long namePoolSize);
 		/// Loads the XML document containing the configuration data
-		/// from the given InputSource. Uses the give namePoolSize (which 
+		/// from the given InputSource. Uses the give namePoolSize (which
 		/// should be a suitable prime like 251, 509, 1021, 4093) for the
 		/// internal DOM Document's name pool.
 
 	void load(std::istream& istr);
 		/// Loads the XML document containing the configuration data
 		/// from the given stream.
-		
+
 	void load(const std::string& path);
 		/// Loads the XML document containing the configuration data
 		/// from the given file.
-		
+
 	void load(const Poco::XML::Document* pDocument);
 		/// Loads the XML document containing the configuration data
 		/// from the given XML document.
@@ -153,11 +153,11 @@ public:
 	void load(const Poco::XML::Node* pNode);
 		/// Loads the XML document containing the configuration data
 		/// from the given XML node.
-	
+
 	void loadEmpty(const std::string& rootElementName);
 		/// Loads an empty XML document containing only the
 		/// root element with the given name.
-		
+
 	void save(const std::string& path) const;
 		/// Writes the XML document containing the configuration data
 		/// to the file given by path.
diff --git a/Util/samples/SampleApp/SampleApp.progen b/Util/samples/SampleApp/SampleApp.progen
index 023119889..36407c412 100644
--- a/Util/samples/SampleApp/SampleApp.progen
+++ b/Util/samples/SampleApp/SampleApp.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Util/samples/SampleApp/src/SampleApp.cpp b/Util/samples/SampleApp/src/SampleApp.cpp
index 373186981..d9e5ed97f 100644
--- a/Util/samples/SampleApp/src/SampleApp.cpp
+++ b/Util/samples/SampleApp/src/SampleApp.cpp
@@ -41,26 +41,26 @@ public:
 	{
 	}
 
-protected:	
+protected:
 	void initialize(Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Application::initialize(self);
 		// add your own initialization code here
 	}
-	
+
 	void uninitialize()
 	{
 		// add your own uninitialization code here
 		Application::uninitialize();
 	}
-	
+
 	void reinitialize(Application& self)
 	{
 		Application::reinitialize(self);
 		// add your own reinitialization code here
 	}
-	
+
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -77,7 +77,7 @@ protected:
 				.repeatable(true)
 				.argument("name=value")
 				.callback(OptionCallback<SampleApp>(this, &SampleApp::handleDefine)));
-				
+
 		options.addOption(
 			Option("config-file", "f", "load configuration data from a file")
 				.required(false)
@@ -92,24 +92,24 @@ protected:
 				.argument("value")
 				.binding("test.property"));
 	}
-	
+
 	void handleHelp(const std::string& name, const std::string& value)
 	{
 		_helpRequested = true;
 		displayHelp();
 		stopOptionsProcessing();
 	}
-	
+
 	void handleDefine(const std::string& name, const std::string& value)
 	{
 		defineProperty(value);
 	}
-	
+
 	void handleConfig(const std::string& name, const std::string& value)
 	{
 		loadConfiguration(value);
 	}
-		
+
 	void displayHelp()
 	{
 		HelpFormatter helpFormatter(options());
@@ -118,7 +118,7 @@ protected:
 		helpFormatter.setHeader("A sample application that demonstrates some of the features of the Poco::Util::Application class.");
 		helpFormatter.format(std::cout);
 	}
-	
+
 	void defineProperty(const std::string& def)
 	{
 		std::string name;
@@ -154,7 +154,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 	void printProperties(const std::string& base)
 	{
 		AbstractConfiguration::Keys keys;
@@ -181,7 +181,7 @@ protected:
 			}
 		}
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/Util/samples/SampleServer/SampleServer.progen b/Util/samples/SampleServer/SampleServer.progen
index 023119889..36407c412 100644
--- a/Util/samples/SampleServer/SampleServer.progen
+++ b/Util/samples/SampleServer/SampleServer.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Util/samples/SampleServer/src/SampleServer.cpp b/Util/samples/SampleServer/src/SampleServer.cpp
index 7065b851f..7dce1b7b5 100644
--- a/Util/samples/SampleServer/src/SampleServer.cpp
+++ b/Util/samples/SampleServer/src/SampleServer.cpp
@@ -37,7 +37,7 @@ public:
 	SampleTask(): Task("SampleTask")
 	{
 	}
-	
+
 	void runTask()
 	{
 		Application& app = Application::instance();
@@ -55,7 +55,7 @@ public:
 	SampleServer(): _helpRequested(false)
 	{
 	}
-	
+
 	~SampleServer()
 	{
 	}
@@ -67,7 +67,7 @@ protected:
 		ServerApplication::initialize(self);
 		logger().information("starting up");
 	}
-		
+
 	void uninitialize()
 	{
 		logger().information("shutting down");
@@ -77,7 +77,7 @@ protected:
 	void defineOptions(OptionSet& options)
 	{
 		ServerApplication::defineOptions(options);
-		
+
 		options.addOption(
 			Option("help", "h", "display help information on command line arguments")
 				.required(false)
@@ -113,7 +113,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 };
diff --git a/Util/samples/Units/Makefile b/Util/samples/Units/Makefile
index 6712b0045..3cf339b6f 100644
--- a/Util/samples/Units/Makefile
+++ b/Util/samples/Units/Makefile
@@ -10,6 +10,6 @@ objects = Units
 
 target         = Units
 target_version = 1
-target_libs    = 
+target_libs    =
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Util/samples/Units/Units.progen b/Util/samples/Units/Units.progen
index d06cf34f2..bb80bca91 100644
--- a/Util/samples/Units/Units.progen
+++ b/Util/samples/Units/Units.progen
@@ -7,3 +7,4 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Util\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
diff --git a/Util/samples/Units/src/Units.cpp b/Util/samples/Units/src/Units.cpp
index 0917ec9d3..e44f8129f 100644
--- a/Util/samples/Units/src/Units.cpp
+++ b/Util/samples/Units/src/Units.cpp
@@ -48,46 +48,46 @@ int main()
 
 	m l = cm(42);
 	std::cout << cm(42) << " == " << l << " == " << milli(l) << std::endl;
-	std::cout << "Area of circle with radius " << l << 
+	std::cout << "Area of circle with radius " << l <<
 		" is " << mm2(square(l) * pi) << std::endl;
 
 	SpecificWeight sw(9.81); // water
 
-	std::cout << "Volume of a water cube with side size " << m(0.1) << 
-		" is " << liter(cube(m(0.1))) << 
+	std::cout << "Volume of a water cube with side size " << m(0.1) <<
+		" is " << liter(cube(m(0.1))) <<
 		" and weighs " << N(sw * cube(m(.1))) << std::endl;
 
 	m radius_equator(6378135);
 	m radius_pole(6356750);
 	m3 vol((pi * square(radius_equator) * radius_pole) * 4/3);
 
-	std::cout << "Volume of Earth is " << vol 
+	std::cout << "Volume of Earth is " << vol
 		<< " (" << yotta(liter(vol)) << ")" << std::endl;
 	std::cout << "It takes " << minute(AU/c) << " for a Sun beam to reach Earth." << std::endl;
 
 
-	std::cout << std::endl << m(1) << " is:" << std::endl; 
-	std::cout << "-------------" << std::endl; 
+	std::cout << std::endl << m(1) << " is:" << std::endl;
+	std::cout << "-------------" << std::endl;
 
-	std::cout << deca(m(1)) << std::endl; 
+	std::cout << deca(m(1)) << std::endl;
 	std::cout << hecto(m(1)) << std::endl;
-	std::cout << kilo(m(1)) << std::endl; 
-	std::cout << mega(m(1)) << std::endl; 
-	std::cout << giga(m(1)) << std::endl; 
-	std::cout << tera(m(1)) << std::endl; 
-	std::cout << peta(m(1)) << std::endl; 
-	std::cout << exa(m(1)) << std::endl; 
+	std::cout << kilo(m(1)) << std::endl;
+	std::cout << mega(m(1)) << std::endl;
+	std::cout << giga(m(1)) << std::endl;
+	std::cout << tera(m(1)) << std::endl;
+	std::cout << peta(m(1)) << std::endl;
+	std::cout << exa(m(1)) << std::endl;
 	std::cout << zetta(m(1)) << std::endl;
 	std::cout << yotta(m(1)) << std::endl;
-				 
-	std::cout << deci(m(1)) << std::endl; 
+
+	std::cout << deci(m(1)) << std::endl;
 	std::cout << centi(m(1)) << std::endl;
 	std::cout << milli(m(1)) << std::endl;
 	std::cout << micro(m(1)) << std::endl;
-	std::cout << nano(m(1)) << std::endl; 
-	std::cout << pico(m(1)) << std::endl; 
+	std::cout << nano(m(1)) << std::endl;
+	std::cout << pico(m(1)) << std::endl;
 	std::cout << femto(m(1)) << std::endl;
-	std::cout << atto(m(1)) << std::endl; 
+	std::cout << atto(m(1)) << std::endl;
 	std::cout << zepto(m(1)) << std::endl;
 	std::cout << yocto(m(1)) << std::endl;
 
diff --git a/Util/samples/pkill/pkill.progen b/Util/samples/pkill/pkill.progen
index 023119889..36407c412 100644
--- a/Util/samples/pkill/pkill.progen
+++ b/Util/samples/pkill/pkill.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Util/samples/pkill/src/pkill.cpp b/Util/samples/pkill/src/pkill.cpp
index 1f02eecd2..acfc131dd 100644
--- a/Util/samples/pkill/src/pkill.cpp
+++ b/Util/samples/pkill/src/pkill.cpp
@@ -29,13 +29,13 @@ using Poco::Util::OptionCallback;
 class ProcessKillerApp: public Application
 {
 public:
-	ProcessKillerApp(): 
+	ProcessKillerApp():
 		_helpRequested(false),
 		_friendly(false)
 	{
 	}
 
-protected:		
+protected:
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -52,18 +52,18 @@ protected:
 				.repeatable(false)
 				.callback(OptionCallback<ProcessKillerApp>(this, &ProcessKillerApp::handleFriendly)));
 	}
-	
+
 	void handleHelp(const std::string& name, const std::string& value)
 	{
 		_helpRequested = true;
 		stopOptionsProcessing();
 	}
-	
+
 	void handleFriendly(const std::string& name, const std::string& value)
 	{
 		_friendly = true;
 	}
-			
+
 	void displayHelp()
 	{
 		HelpFormatter helpFormatter(options());
@@ -73,7 +73,7 @@ protected:
 		helpFormatter.setFooter("Note that the friendly option only works with applications using Poco::Util::ServerApplication::waitForTerminationRequest().");
 		helpFormatter.format(std::cout);
 	}
-	
+
 	int main(const std::vector<std::string>& args)
 	{
 		if (_helpRequested || args.empty())
@@ -93,7 +93,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-		
+
 private:
 	bool _helpRequested;
 	bool _friendly;
diff --git a/Util/src/AbstractConfiguration.cpp b/Util/src/AbstractConfiguration.cpp
index 285d90249..bdb854f64 100644
--- a/Util/src/AbstractConfiguration.cpp
+++ b/Util/src/AbstractConfiguration.cpp
@@ -34,7 +34,7 @@ namespace Poco {
 namespace Util {
 
 
-AbstractConfiguration::AbstractConfiguration(): 
+AbstractConfiguration::AbstractConfiguration():
 	_depth(0),
 	_eventsEnabled(true)
 {
@@ -66,7 +66,7 @@ bool AbstractConfiguration::has(const std::string& key) const
 	return hasProperty(key);
 }
 
-	
+
 std::string AbstractConfiguration::getString(const std::string& key) const
 {
 	Mutex::ScopedLock lock(_mutex);
@@ -78,7 +78,7 @@ std::string AbstractConfiguration::getString(const std::string& key) const
 		throw NotFoundException(key);
 }
 
-	
+
 std::string AbstractConfiguration::getString(const std::string& key, const std::string& defaultValue) const
 {
 	Mutex::ScopedLock lock(_mutex);
@@ -102,10 +102,10 @@ std::string AbstractConfiguration::getRawString(const std::string& key) const
 		throw NotFoundException(key);
 }
 
-	
+
 std::string AbstractConfiguration::getRawString(const std::string& key, const std::string& defaultValue) const
 {
-	
+
 	Mutex::ScopedLock lock(_mutex);
 
 	std::string value;
@@ -115,7 +115,7 @@ std::string AbstractConfiguration::getRawString(const std::string& key, const st
 		return defaultValue;
 }
 
-	
+
 int AbstractConfiguration::getInt(const std::string& key) const
 {
 	Mutex::ScopedLock lock(_mutex);
@@ -127,7 +127,7 @@ int AbstractConfiguration::getInt(const std::string& key) const
 		throw NotFoundException(key);
 }
 
-	
+
 int AbstractConfiguration::getInt(const std::string& key, int defaultValue) const
 {
 	Mutex::ScopedLock lock(_mutex);
@@ -229,7 +229,7 @@ double AbstractConfiguration::getDouble(const std::string& key) const
 		throw NotFoundException(key);
 }
 
-	
+
 double AbstractConfiguration::getDouble(const std::string& key, double defaultValue) const
 {
 	Mutex::ScopedLock lock(_mutex);
@@ -271,13 +271,13 @@ void AbstractConfiguration::setString(const std::string& key, const std::string&
 	setRawWithEvent(key, value);
 }
 
-	
+
 void AbstractConfiguration::setInt(const std::string& key, int value)
 {
 	setRawWithEvent(key, NumberFormatter::format(value));
 }
 
-	
+
 void AbstractConfiguration::setUInt(const std::string& key, unsigned int value)
 {
 	setRawWithEvent(key, NumberFormatter::format(value));
@@ -370,12 +370,12 @@ namespace
 		{
 			++_count;
 		}
-		
+
 		~AutoCounter()
 		{
 			--_count;
 		}
-		
+
 	private:
 		int& _count;
 	};
@@ -397,7 +397,7 @@ void AbstractConfiguration::remove(const std::string& key)
 		propertyRemoving(this, key);
 	}
 	{
-		
+
 		Mutex::ScopedLock lock(_mutex);
 		removeRaw(key);
 	}
@@ -413,7 +413,7 @@ void AbstractConfiguration::enableEvents(bool enable)
 	_eventsEnabled = enable;
 }
 
-	
+
 bool AbstractConfiguration::eventsEnabled() const
 {
 	return _eventsEnabled;
@@ -523,7 +523,7 @@ bool AbstractConfiguration::parseBool(const std::string& value)
 		return false;
 	else if (icompare(value, "off") == 0)
 		return false;
-	else 
+	else
 		throw SyntaxException("Cannot convert to boolean", value);
 }
 
diff --git a/Util/src/ConfigurationMapper.cpp b/Util/src/ConfigurationMapper.cpp
index caeb7db29..53c99905b 100644
--- a/Util/src/ConfigurationMapper.cpp
+++ b/Util/src/ConfigurationMapper.cpp
@@ -46,7 +46,7 @@ bool ConfigurationMapper::getRaw(const std::string& key, std::string& value) con
 void ConfigurationMapper::setRaw(const std::string& key, const std::string& value)
 {
 	std::string translatedKey = translateKey(key);
-	_pConfig->setRaw(translatedKey, value); 
+	_pConfig->setRaw(translatedKey, value);
 }
 
 
diff --git a/Util/src/ConfigurationView.cpp b/Util/src/ConfigurationView.cpp
index 152b50532..2f81f5ffe 100644
--- a/Util/src/ConfigurationView.cpp
+++ b/Util/src/ConfigurationView.cpp
@@ -42,7 +42,7 @@ bool ConfigurationView::getRaw(const std::string& key, std::string& value) const
 void ConfigurationView::setRaw(const std::string& key, const std::string& value)
 {
 	std::string translatedKey = translateKey(key);
-	_pConfig->setRaw(translatedKey, value); 
+	_pConfig->setRaw(translatedKey, value);
 }
 
 
diff --git a/Util/src/FilesystemConfiguration.cpp b/Util/src/FilesystemConfiguration.cpp
index 8e3b58ad0..db2450e51 100644
--- a/Util/src/FilesystemConfiguration.cpp
+++ b/Util/src/FilesystemConfiguration.cpp
@@ -119,7 +119,7 @@ Path FilesystemConfiguration::keyToPath(const std::string& key) const
 	for (const auto& tok: tokenizer)
 	{
 		result.pushDirectory(tok);
-	}	
+	}
 	return result;
 }
 
diff --git a/Util/src/HelpFormatter.cpp b/Util/src/HelpFormatter.cpp
index c51099a63..fb962e2f6 100644
--- a/Util/src/HelpFormatter.cpp
+++ b/Util/src/HelpFormatter.cpp
@@ -25,7 +25,7 @@ const int HelpFormatter::TAB_WIDTH  = 4;
 const int HelpFormatter::LINE_WIDTH = 78;
 
 
-HelpFormatter::HelpFormatter(const OptionSet& options): 
+HelpFormatter::HelpFormatter(const OptionSet& options):
 	_options(options),
 	_width(LINE_WIDTH),
 	_indent(0),
@@ -94,7 +94,7 @@ void HelpFormatter::format(std::ostream& ostr) const
 void HelpFormatter::setWidth(int width)
 {
 	poco_assert (width > 0);
-	
+
 	_width = width;
 }
 
@@ -102,7 +102,7 @@ void HelpFormatter::setWidth(int width)
 void HelpFormatter::setIndent(int indent)
 {
 	poco_assert (indent >= 0 && indent < _width);
-	
+
 	_indent = indent;
 }
 
@@ -240,7 +240,7 @@ void HelpFormatter::formatText(std::ostream& ostr, const std::string& text, int
 			clearWord(ostr, pos, word, indent);
 			if (pos < _width) { ostr << ' '; ++pos; }
 		}
-		else 
+		else
 		{
 			if (word.length() == maxWordLen)
 			{
diff --git a/Util/src/IniFileConfiguration.cpp b/Util/src/IniFileConfiguration.cpp
index 54a0130d5..67aeb0fbf 100644
--- a/Util/src/IniFileConfiguration.cpp
+++ b/Util/src/IniFileConfiguration.cpp
@@ -45,7 +45,7 @@ IniFileConfiguration::IniFileConfiguration(std::istream& istr)
 	load(istr);
 }
 
-	
+
 IniFileConfiguration::IniFileConfiguration(const std::string& path)
 {
 	load(path);
@@ -66,7 +66,7 @@ void IniFileConfiguration::load(std::istream& istr)
 		parseLine(istr);
 	}
 }
-	
+
 
 void IniFileConfiguration::load(const std::string& path)
 {
@@ -148,7 +148,7 @@ bool IniFileConfiguration::ICompare::operator () (const std::string& s1, const s
 
 void IniFileConfiguration::parseLine(std::istream& istr)
 {
-	static const int eof = std::char_traits<char>::eof(); 
+	static const int eof = std::char_traits<char>::eof();
 
 	int c = istr.get();
 	while (c != eof && Poco::Ascii::isSpace(c)) c = istr.get();
diff --git a/Util/src/JSONConfiguration.cpp b/Util/src/JSONConfiguration.cpp
index 282ac8ce5..78b9dcb61 100644
--- a/Util/src/JSONConfiguration.cpp
+++ b/Util/src/JSONConfiguration.cpp
@@ -70,7 +70,7 @@ void JSONConfiguration::load(std::istream& istr)
 	JSON::Parser parser;
 	parser.parse(istr);
 	DynamicAny result = parser.result();
-	if ( result.type() == typeid(JSON::Object::Ptr) )
+	if (result.type() == typeid(JSON::Object::Ptr))
 	{
 		_object = result.extract<JSON::Object::Ptr>();
 	}
@@ -89,7 +89,7 @@ bool JSONConfiguration::getRaw(const std::string & key, std::string & value) con
 {
 	JSON::Query query(_object);
 	Poco::DynamicAny result = query.find(key);
-	if ( ! result.isEmpty() )
+	if (!result.isEmpty())
 	{
 		value = result.convert<std::string>();
 		return true;
@@ -106,9 +106,9 @@ void JSONConfiguration::getIndexes(std::string& name, std::vector<int>& indexes)
 	int firstOffset = -1;
 	int offset = 0;
 	RegularExpression regex("\\[([0-9]+)\\]");
-	while(regex.match(name, offset, matches) > 0 )
+	while(regex.match(name, offset, matches) > 0)
 	{
-		if ( firstOffset == -1 )
+		if (firstOffset == -1)
 		{
 			firstOffset = static_cast<int>(matches[0].offset);
 		}
@@ -117,7 +117,7 @@ void JSONConfiguration::getIndexes(std::string& name, std::vector<int>& indexes)
 		offset = static_cast<int>(matches[0].offset + matches[0].length);
 	}
 
-	if ( firstOffset != -1 )
+	if (firstOffset != -1)
 	{
 		name = name.substr(0, firstOffset);
 	}
@@ -139,9 +139,9 @@ JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::stri
 
 		DynamicAny result = currentObject->get(name);
 
-		if ( result.isEmpty() ) // Not found
+		if (result.isEmpty()) // Not found
 		{
-			if ( indexes.empty() ) // We want an object, create it
+			if (indexes.empty()) // We want an object, create it
 			{
 				JSON::Object::Ptr newObject = new JSON::Object();
 				currentObject->set(name, newObject);
@@ -155,12 +155,12 @@ JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::stri
 				for(std::vector<int>::iterator it = indexes.begin(); it != indexes.end(); ++it)
 				{
 					newArray = new JSON::Array();
-					if ( topArray.isNull() )
+					if (topArray.isNull())
 					{
 						topArray = newArray;
 					}
 
-					if ( ! parentArray.isNull() )
+					if (! parentArray.isNull())
 					{
 						parentArray->add(newArray);
 					}
@@ -181,9 +181,9 @@ JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::stri
 		}
 		else // We have a value
 		{
-			if ( indexes.empty() ) // We want an object
+			if (indexes.empty()) // We want an object
 			{
-				if ( result.type() == typeid(JSON::Object::Ptr) )
+				if (result.type() == typeid(JSON::Object::Ptr))
 				{
 					currentObject = result.extract<JSON::Object::Ptr>();
 				}
@@ -194,7 +194,7 @@ JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::stri
 			}
 			else
 			{
-				if ( result.type() == typeid(JSON::Array::Ptr) )
+				if (result.type() == typeid(JSON::Array::Ptr))
 				{
 					JSON::Array::Ptr arr = result.extract<JSON::Array::Ptr>();
 
@@ -202,7 +202,7 @@ JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::stri
 					{
 						JSON::Array::Ptr currentArray = arr;
 						arr = arr->getArray(*it);
-						if ( arr.isNull() )
+						if (arr.isNull())
 						{
 							arr = new JSON::Array();
 							currentArray->add(arr);
@@ -210,7 +210,7 @@ JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::stri
 					}
 
 					result = arr->get(*indexes.rbegin());
-					if ( result.isEmpty() ) // Index doesn't exist
+					if (result.isEmpty()) // Index doesn't exist
 					{
 						JSON::Object::Ptr newObject = new JSON::Object();
 						arr->add(newObject);
@@ -218,7 +218,7 @@ JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::stri
 					}
 					else // Index is available
 					{
-						if ( result.type() == typeid(JSON::Object::Ptr) )
+						if (result.type() == typeid(JSON::Object::Ptr))
 						{
 							currentObject = result.extract<JSON::Object::Ptr>();
 						}
@@ -243,34 +243,34 @@ void JSONConfiguration::setValue(const std::string& key, const Poco::DynamicAny&
 {
 
 	std::string sValue;
-	
+
 	value.convert<std::string>(sValue);
 	KeyValue kv(key, sValue);
-	
+
 	if (eventsEnabled())
 	{
 		propertyChanging(this, kv);
 	}
-	
+
 	std::string lastPart;
 	JSON::Object::Ptr parentObject = findStart(key, lastPart);
 
 	std::vector<int> indexes;
 	getIndexes(lastPart, indexes);
 
-	if ( indexes.empty() ) // No Array
+	if (indexes.empty()) // No Array
 	{
 		parentObject->set(lastPart, value);
 	}
 	else
 	{
 		DynamicAny result = parentObject->get(lastPart);
-		if ( result.isEmpty() )
+		if (result.isEmpty())
 		{
 			result = JSON::Array::Ptr(new JSON::Array());
 			parentObject->set(lastPart, result);
 		}
-		else if ( result.type() != typeid(JSON::Array::Ptr) )
+		else if (result.type() != typeid(JSON::Array::Ptr))
 		{
 			throw SyntaxException("Expected a JSON array");
 		}
@@ -279,7 +279,7 @@ void JSONConfiguration::setValue(const std::string& key, const Poco::DynamicAny&
 		for(std::vector<int>::iterator it = indexes.begin(); it != indexes.end() - 1; ++it)
 		{
 			JSON::Array::Ptr nextArray = arr->getArray(*it);
-			if ( nextArray.isNull()  )
+			if (nextArray.isNull())
 			{
 				for(int i = static_cast<int>(arr->size()); i <= *it; ++i)
 				{
@@ -335,7 +335,7 @@ void JSONConfiguration::enumerate(const std::string& key, Keys& range) const
 {
 	JSON::Query query(_object);
 	Poco::DynamicAny result = query.find(key);
-	if ( result.type() == typeid(JSON::Object::Ptr) )
+	if (result.type() == typeid(JSON::Object::Ptr))
 	{
 		JSON::Object::Ptr object = result.extract<JSON::Object::Ptr>();
 		object->getNames(range);
@@ -352,13 +352,13 @@ void JSONConfiguration::save(std::ostream& ostr, unsigned int indent) const
 void JSONConfiguration::removeRaw(const std::string& key)
 
 {
-	
+
 	std::string lastPart;
 	JSON::Object::Ptr parentObject = findStart(key, lastPart);
 	std::vector<int> indexes;
 	getIndexes(lastPart, indexes);
 
-	if ( indexes.empty() ) // No Array
+	if (indexes.empty()) // No Array
 	{
 		parentObject->remove(lastPart);
 	}
diff --git a/Util/src/LayeredConfiguration.cpp b/Util/src/LayeredConfiguration.cpp
index e27f4ae8e..bdbd827a1 100644
--- a/Util/src/LayeredConfiguration.cpp
+++ b/Util/src/LayeredConfiguration.cpp
@@ -78,7 +78,7 @@ void LayeredConfiguration::add(AbstractConfiguration::Ptr pConfig, const std::st
 	item.priority  = priority;
 	item.writeable = writeable;
 	item.label     = label;
-	
+
 	ConfigList::iterator it = _configs.begin();
 	while (it != _configs.end() && it->priority < priority) ++it;
 	_configs.insert(it, item);
@@ -124,7 +124,7 @@ void LayeredConfiguration::setRaw(const std::string& key, const std::string& val
 	{
 		if (conf.writeable)
 		{
-			conf.pConfig->setRaw(key, value); 
+			conf.pConfig->setRaw(key, value);
 			return;
 		}
 	}
diff --git a/Util/src/LocalConfigurationView.cpp b/Util/src/LocalConfigurationView.cpp
index 10b414c61..7f8f923be 100644
--- a/Util/src/LocalConfigurationView.cpp
+++ b/Util/src/LocalConfigurationView.cpp
@@ -13,43 +13,58 @@
 
 #include "Poco/Util/LocalConfigurationView.h"
 
+
 namespace Poco {
-    namespace Util {
+namespace Util {
 
-        LocalConfigurationView::LocalConfigurationView(const std::string& prefix, AbstractConfiguration::Ptr pConfig) : _prefix(prefix),
-                                                                                                                        _pConfig(pConfig) {
-            poco_check_ptr(pConfig);
-        }
 
-        LocalConfigurationView::~LocalConfigurationView() {
-        }
+LocalConfigurationView::LocalConfigurationView(const std::string& prefix, AbstractConfiguration::Ptr pConfig) :
+	_prefix(prefix), _pConfig(pConfig)
+{
+	poco_check_ptr(pConfig);
+}
 
-        bool LocalConfigurationView::getRaw(const std::string& key, std::string& value) const {
-            std::string translatedKey = translateKey(key);
-            return _pConfig->getRaw(translatedKey, value);
-        }
 
-        void LocalConfigurationView::setRaw(const std::string& key, const std::string& value) {
-            std::string translatedKey = translateKey(key);
-            _pConfig->setRaw(translatedKey, value);
-        }
+LocalConfigurationView::~LocalConfigurationView()
+{
+}
 
-        void LocalConfigurationView::enumerate(const std::string& key, Keys& range) const {
-            std::string translatedKey = translateKey(key);
-            _pConfig->enumerate(translatedKey, range);
-        }
 
-        void LocalConfigurationView::removeRaw(const std::string& key) {
-            std::string translatedKey = translateKey(key);
-            _pConfig->remove(translatedKey);
-        }
+bool LocalConfigurationView::getRaw(const std::string& key, std::string& value) const
+{
+	std::string translatedKey = translateKey(key);
+	return _pConfig->getRaw(translatedKey, value);
+}
 
-        std::string LocalConfigurationView::translateKey(const std::string& key) const {
-            std::string result = _prefix;
-            if (!result.empty() && !key.empty() && key[0] != '[') result += '.';
-            result += key;
-            return result;
-        }
 
-    }  // namespace Util
-}  // namespace Poco
+void LocalConfigurationView::setRaw(const std::string& key, const std::string& value)
+{
+	std::string translatedKey = translateKey(key);
+	_pConfig->setRaw(translatedKey, value);
+}
+
+
+void LocalConfigurationView::enumerate(const std::string& key, Keys& range) const
+{
+	std::string translatedKey = translateKey(key);
+	_pConfig->enumerate(translatedKey, range);
+}
+
+
+void LocalConfigurationView::removeRaw(const std::string& key)
+{
+	std::string translatedKey = translateKey(key);
+	_pConfig->remove(translatedKey);
+}
+
+
+std::string LocalConfigurationView::translateKey(const std::string& key) const
+{
+	std::string result = _prefix;
+	if (!result.empty() && !key.empty() && key[0] != '[') result += '.';
+	result += key;
+	return result;
+}
+
+
+}}  // namespace Poco::Util
diff --git a/Util/src/LoggingConfigurator.cpp b/Util/src/LoggingConfigurator.cpp
index fcab9aabb..c6d787a1b 100644
--- a/Util/src/LoggingConfigurator.cpp
+++ b/Util/src/LoggingConfigurator.cpp
@@ -102,7 +102,7 @@ void LoggingConfigurator::configureLoggers(AbstractConfiguration::Ptr pConfig)
 	AbstractConfiguration::Keys loggers;
 	pConfig->keys(loggers);
 	// use a map to sort loggers by their name, ensuring initialization in correct order (parents before children)
-	LoggerMap loggerMap; 
+	LoggerMap loggerMap;
 	for (const auto& l: loggers)
 	{
 		AutoPtr<AbstractConfiguration> pLoggerConfig(pConfig->createView(l));
@@ -123,7 +123,7 @@ Formatter::Ptr LoggingConfigurator::createFormatter(AbstractConfiguration::Ptr p
 	for (const auto& p: props)
 	{
 		if (p != "class")
-			pFormatter->setProperty(p, pConfig->getString(p));		
+			pFormatter->setProperty(p, pConfig->getString(p));
 	}
 	return pFormatter;
 }
@@ -147,7 +147,7 @@ Channel::Ptr LoggingConfigurator::createChannel(AbstractConfiguration::Ptr pConf
 			AutoPtr<FormattingChannel> pFormattingChannel(new FormattingChannel(0, pChannel));
 			if (pConfig->hasProperty("formatter.class"))
 			{
-				AutoPtr<AbstractConfiguration> pFormatterConfig(pConfig->createView(p));	
+				AutoPtr<AbstractConfiguration> pFormatterConfig(pConfig->createView(p));
 				AutoPtr<Formatter> pFormatter(createFormatter(pFormatterConfig));
 				pFormattingChannel->setFormatter(pFormatter);
 			}
@@ -182,7 +182,7 @@ void LoggingConfigurator::configureLogger(AbstractConfiguration::Ptr pConfig)
 	{
 		if (p == "channel" && pConfig->hasProperty("channel.class"))
 		{
-			AutoPtr<AbstractConfiguration> pChannelConfig(pConfig->createView(p));	
+			AutoPtr<AbstractConfiguration> pChannelConfig(pConfig->createView(p));
 			AutoPtr<Channel> pChannel(createChannel(pChannelConfig));
 			configureChannel(pChannel, pChannelConfig);
 			Logger::setChannel(logger.name(), pChannel);
diff --git a/Util/src/LoggingSubsystem.cpp b/Util/src/LoggingSubsystem.cpp
index 5fc60d6a1..fbc483426 100644
--- a/Util/src/LoggingSubsystem.cpp
+++ b/Util/src/LoggingSubsystem.cpp
@@ -40,7 +40,7 @@ const char* LoggingSubsystem::name() const
 	return "Logging Subsystem";
 }
 
-	
+
 void LoggingSubsystem::initialize(Application& app)
 {
 	LoggingConfigurator configurator;
diff --git a/Util/src/Option.cpp b/Util/src/Option.cpp
index 58f19f454..5f7c4951d 100644
--- a/Util/src/Option.cpp
+++ b/Util/src/Option.cpp
@@ -113,7 +113,7 @@ Option& Option::operator = (const Option& option)
 }
 
 
-void Option::swap(Option& option)
+void Option::swap(Option& option) noexcept
 {
 	std::swap(_shortName, option._shortName);
 	std::swap(_fullName, option._fullName);
diff --git a/Util/src/OptionProcessor.cpp b/Util/src/OptionProcessor.cpp
index e6fc970e9..ca1fbde3c 100644
--- a/Util/src/OptionProcessor.cpp
+++ b/Util/src/OptionProcessor.cpp
@@ -22,7 +22,7 @@ namespace Poco {
 namespace Util {
 
 
-OptionProcessor::OptionProcessor(const OptionSet& options): 
+OptionProcessor::OptionProcessor(const OptionSet& options):
 	_options(options),
 	_unixStyle(true),
 	_ignore(false)
diff --git a/Util/src/OptionSet.cpp b/Util/src/OptionSet.cpp
index e82f493e0..3cf6b2ccc 100644
--- a/Util/src/OptionSet.cpp
+++ b/Util/src/OptionSet.cpp
@@ -78,7 +78,7 @@ bool OptionSet::hasOption(const std::string& name, bool matchShort) const
 	return found;
 }
 
-	
+
 const Option& OptionSet::getOption(const std::string& name, bool matchShort) const
 {
 	const Option* pOption = 0;
diff --git a/Util/src/PropertyFileConfiguration.cpp b/Util/src/PropertyFileConfiguration.cpp
index 88eccae55..253984935 100644
--- a/Util/src/PropertyFileConfiguration.cpp
+++ b/Util/src/PropertyFileConfiguration.cpp
@@ -39,7 +39,7 @@ PropertyFileConfiguration::PropertyFileConfiguration(std::istream& istr)
 	load(istr);
 }
 
-	
+
 PropertyFileConfiguration::PropertyFileConfiguration(const std::string& path)
 {
 	load(path);
@@ -50,7 +50,7 @@ PropertyFileConfiguration::~PropertyFileConfiguration()
 {
 }
 
-	
+
 void PropertyFileConfiguration::load(std::istream& istr)
 {
 	clear();
@@ -60,7 +60,7 @@ void PropertyFileConfiguration::load(std::istream& istr)
 	}
 }
 
-	
+
 void PropertyFileConfiguration::load(const std::string& path)
 {
 	Poco::FileInputStream istr(path);
@@ -125,7 +125,7 @@ void PropertyFileConfiguration::save(const std::string& path) const
 
 void PropertyFileConfiguration::parseLine(std::istream& istr)
 {
-	static const int eof = std::char_traits<char>::eof(); 
+	static const int eof = std::char_traits<char>::eof();
 
 	int c = istr.get();
 	while (c != eof && Poco::Ascii::isSpace(c)) c = istr.get();
diff --git a/Util/src/Timer.cpp b/Util/src/Timer.cpp
index 3de4821c1..bab2c8e4e 100644
--- a/Util/src/Timer.cpp
+++ b/Util/src/Timer.cpp
@@ -135,7 +135,7 @@ public:
 		{
 			try
 			{
-				_pTask->_lastExecution.update();
+				_pTask->updateLastExecution();
 				_pTask->run();
 			}
 			catch (Exception& exc)
diff --git a/Util/src/WinService.cpp b/Util/src/WinService.cpp
index 3bdf3ca7a..6e231bbd9 100644
--- a/Util/src/WinService.cpp
+++ b/Util/src/WinService.cpp
@@ -102,7 +102,7 @@ void WinService::registerService(const std::string& path, const std::string& dis
 	_svcHandle = CreateServiceW(
 		_scmHandle,
 		uname.c_str(),
-		udisplayName.c_str(), 
+		udisplayName.c_str(),
 		SERVICE_ALL_ACCESS,
 		SERVICE_WIN32_OWN_PROCESS,
 		SERVICE_DEMAND_START,
@@ -113,7 +113,7 @@ void WinService::registerService(const std::string& path, const std::string& dis
 		throw SystemException("cannot register service", _name);
 }
 
-	
+
 void WinService::registerService(const std::string& path)
 {
 	registerService(path, _name);
@@ -144,7 +144,7 @@ bool WinService::isRunning() const
 	return ss.dwCurrentState == SERVICE_RUNNING;
 }
 
-bool WinService::isStopped() const 
+bool WinService::isStopped() const
 {
 	open();
 	SERVICE_STATUS ss;
@@ -153,7 +153,7 @@ bool WinService::isStopped() const
 	return ss.dwCurrentState == SERVICE_STOPPED;
 }
 
-	
+
 void WinService::start()
 {
 	open();
@@ -209,7 +209,7 @@ void WinService::setStartup(WinService::Startup startup)
 	}
 }
 
-	
+
 WinService::Startup WinService::getStartup() const
 {
 	POCO_LPQUERY_SERVICE_CONFIG pSvcConfig = config();
@@ -252,15 +252,15 @@ void WinService::setFailureActions(FailureActionVector failureActions, const std
 	Poco::UnicodeConverter::toUTF16(rebootMessage, urebootMessage);
 	std::vector<wchar_t> rebootMessageVector{ urebootMessage.begin(), urebootMessage.end() };
 	rebootMessageVector.push_back('\0');
-	
+
 	std::wstring uComamnd;
 	Poco::UnicodeConverter::toUTF16(command, uComamnd);
 	std::vector<wchar_t> commandVector{ uComamnd.begin(), uComamnd.end() };
 	commandVector.push_back('\0');
 
-	for (auto i = 0; i < failureActions.size(); i++) 		
+	for (auto i = 0; i < failureActions.size(); i++)
 	{
-		switch (failureActions[i].type) 
+		switch (failureActions[i].type)
 		{
 		case SVC_REBOOT:
 			actions[i].Type = SC_ACTION_REBOOT;
@@ -311,15 +311,15 @@ WinService::FailureActionTypeVector WinService::getFailureActions() const {
 			} else throw SystemException("cannot query service configuration", _name);
 		}
 	}
-	catch (...) 
+	catch (...)
 	{
 		LocalFree(pSvcFailureAction);
 		throw;
 	}
 	FailureActionTypeVector result(3, SVC_NONE);
-	for (auto i = 0; i < pSvcFailureAction->cActions; i++) 
+	for (auto i = 0; i < pSvcFailureAction->cActions; i++)
 	{
-		switch (pSvcFailureAction->lpsaActions->Type) 
+		switch (pSvcFailureAction->lpsaActions->Type)
 		{
 		case SC_ACTION_NONE:
 			result[i] = SVC_NONE;
diff --git a/Util/src/XMLConfiguration.cpp b/Util/src/XMLConfiguration.cpp
index a4b655b9d..2e2766bbd 100644
--- a/Util/src/XMLConfiguration.cpp
+++ b/Util/src/XMLConfiguration.cpp
@@ -103,7 +103,7 @@ XMLConfiguration::XMLConfiguration(const Poco::XML::Document* pDocument, char de
 	load(pDocument);
 }
 
-	
+
 XMLConfiguration::XMLConfiguration(const Poco::XML::Node* pNode):
 	_delim('.')
 {
@@ -126,7 +126,7 @@ XMLConfiguration::~XMLConfiguration()
 void XMLConfiguration::load(Poco::XML::InputSource* pInputSource, unsigned long namePoolSize)
 {
 	poco_check_ptr (pInputSource);
-	
+
 	Poco::XML::DOMParser parser(namePoolSize);
 	parser.setFeature(Poco::XML::XMLReader::FEATURE_NAMESPACES, false);
 	parser.setFeature(Poco::XML::DOMParser::FEATURE_FILTER_WHITESPACE, true);
@@ -144,21 +144,21 @@ void XMLConfiguration::load(Poco::XML::InputSource* pInputSource)
 void XMLConfiguration::load(std::istream& istr)
 {
 	Poco::XML::InputSource src(istr);
-	load(&src);	
+	load(&src);
 }
 
 
 void XMLConfiguration::load(const std::string& path)
 {
 	Poco::XML::InputSource src(path);
-	load(&src);	
+	load(&src);
 }
 
-	
+
 void XMLConfiguration::load(const Poco::XML::Document* pDocument)
 {
 	poco_check_ptr (pDocument);
-	
+
 	_pDocument = Poco::XML::AutoPtr<Poco::XML::Document>(const_cast<Poco::XML::Document*>(pDocument), true);
 	_pRoot     = Poco::XML::AutoPtr<Poco::XML::Node>(pDocument->documentElement(), true);
 }
@@ -265,7 +265,7 @@ void XMLConfiguration::setRaw(const std::string& key, const std::string& value)
 void XMLConfiguration::enumerate(const std::string& key, Keys& range) const
 {
 	using Poco::NumberFormatter;
-	
+
 	std::multiset<std::string> keys;
 	const Poco::XML::Node* pNode = findNode(key);
 	if (pNode)
diff --git a/Util/testsuite/TestSuite.progen b/Util/testsuite/TestSuite.progen
index 84aad8afa..c734b414d 100644
--- a/Util/testsuite/TestSuite.progen
+++ b/Util/testsuite/TestSuite.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\JSON\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = iphlpapi.lib
diff --git a/Util/testsuite/TestSuite_vs170.vcxproj b/Util/testsuite/TestSuite_vs170.vcxproj
index 9b087deca..18b2f8709 100644
--- a/Util/testsuite/TestSuite_vs170.vcxproj
+++ b/Util/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{E40E738C-447B-40F4-A878-EBA9A2459270}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -607,7 +899,7 @@
     <ClInclude Include="src\IniFileConfigurationTest.h"/>
     <ClInclude Include="src\JSONConfigurationTest.h"/>
     <ClInclude Include="src\LayeredConfigurationTest.h"/>
-    <ClInclude Include="src\LocalConfigurationViewTest.h"/>
+    <ClInclude Include="src\LocalConfigurationTest.h"/>
     <ClInclude Include="src\LoggingConfiguratorTest.h"/>
     <ClInclude Include="src\MapConfigurationTest.h"/>
     <ClInclude Include="src\OptionProcessorTest.h"/>
diff --git a/Util/testsuite/src/AbstractConfigurationTest.cpp b/Util/testsuite/src/AbstractConfigurationTest.cpp
index 55e3b8604..dfddfeb16 100644
--- a/Util/testsuite/src/AbstractConfigurationTest.cpp
+++ b/Util/testsuite/src/AbstractConfigurationTest.cpp
@@ -55,14 +55,14 @@ void AbstractConfigurationTest::testHasProperty()
 void AbstractConfigurationTest::testGetString()
 {
 	AutoPtr<AbstractConfiguration> pConf = createConfiguration();
-	
+
 	assertTrue (pConf->getString("prop1") == "foo");
 	assertTrue (pConf->getString("prop2") == "bar");
 	assertTrue (pConf->getString("prop3.string1") == "foo");
 	assertTrue (pConf->getString("prop3.string2") == "bar");
 	assertTrue (pConf->getString("ref1") == "foobar");
 	assertTrue (pConf->getRawString("ref1") == "${prop3.string1}${prop3.string2}");
-	
+
 	try
 	{
 		std::string res = pConf->getString("foo");
@@ -71,7 +71,7 @@ void AbstractConfigurationTest::testGetString()
 	catch (Poco::NotFoundException&)
 	{
 	}
-	
+
 	assertTrue (pConf->getString("prop1", "FOO") == "foo");
 	assertTrue (pConf->getString("prop2", "BAR") == "bar");
 	assertTrue (pConf->getString("prop3.string1", "FOO") == "foo");
@@ -89,7 +89,7 @@ void AbstractConfigurationTest::testGetInt()
 	assertTrue (pConf->getInt("prop4.hex") == 0x1f);
 	assertTrue (pConf->getUInt("prop4.hex") == 0x1f);
 	assertTrue (pConf->getInt("ref2") == 42);
-	
+
 	try
 	{
 		pConf->getInt("prop1");
@@ -98,7 +98,7 @@ void AbstractConfigurationTest::testGetInt()
 	catch (Poco::SyntaxException&)
 	{
 	}
-	
+
 	assertTrue (pConf->getInt("prop4.int1", 100) == 42);
 	assertTrue (pConf->getInt("prop4.int2", 100) == -42);
 	assertTrue (pConf->getInt("prop4.int3", 100) == 100);
@@ -140,7 +140,7 @@ void AbstractConfigurationTest::testGetDouble()
 
 	assertTrue (pConf->getDouble("prop4.double1") == 1);
 	assertTrue (pConf->getDouble("prop4.double2") == -1.5);
-	
+
 	try
 	{
 		pConf->getDouble("prop1");
@@ -149,7 +149,7 @@ void AbstractConfigurationTest::testGetDouble()
 	catch (Poco::SyntaxException&)
 	{
 	}
-	
+
 	assertTrue (pConf->getDouble("prop4.double1", 123.5) == 1);
 	assertTrue (pConf->getDouble("prop4.double2", 123.5) == -1.5);
 	assertTrue (pConf->getDouble("prop4.double3", 123.5) == 123.5);
@@ -191,7 +191,7 @@ void AbstractConfigurationTest::testExpand()
 
 	assertTrue (pConf->getString("ref1") == "foobar");
 	assertTrue (pConf->getInt("ref2") == 42);
-	
+
 	try
 	{
 		std::string s = pConf->getString("ref3");
@@ -200,16 +200,16 @@ void AbstractConfigurationTest::testExpand()
 	catch (Poco::CircularReferenceException&)
 	{
 	}
-	
+
 	assertTrue (pConf->getString("ref5") == "${refx}");
 	assertTrue (pConf->getString("ref6") == "${refx}");
-	
+
 	assertTrue (pConf->expand("answer=${prop4.int1}") == "answer=42");
 	assertTrue (pConf->expand("bool5='${prop4.bool5}'") == "bool5='Yes'");
 	assertTrue (pConf->expand("undef='${undef}'") == "undef='${undef}'");
 	assertTrue (pConf->expand("deep='${ref1}'") == "deep='foobar'");
 	assertTrue (pConf->expand("deep='${ref7}'") == "deep='foobar'");
-	
+
 	assertTrue (pConf->getString("dollar.atend") == "foo$");
 	assertTrue (pConf->getString("dollar.middle") == "foo$bar");
 }
@@ -261,7 +261,7 @@ void AbstractConfigurationTest::testSetDouble()
 	pConf->setDouble("set.double1", 1.5);
 	pConf->setDouble("set.double2", -1.5);
 	assertTrue (pConf->getDouble("set.double1") == 1.5);
-	assertTrue (pConf->getDouble("set.double2") == -1.5);	
+	assertTrue (pConf->getDouble("set.double2") == -1.5);
 }
 
 
@@ -282,25 +282,25 @@ void AbstractConfigurationTest::testChangeEvents()
 
 	pConf->propertyChanging += Poco::delegate(this, &AbstractConfigurationTest::onPropertyChanging);
 	pConf->propertyChanged += Poco::delegate(this, &AbstractConfigurationTest::onPropertyChanged);
-	
+
 	pConf->setString("set.string1", "foobar");
 	assertTrue (_changingKey == "set.string1");
 	assertTrue (_changingValue == "foobar");
 	assertTrue (_changedKey == "set.string1");
 	assertTrue (_changedValue == "foobar");
-	
+
 	pConf->setInt("set.int1", 42);
 	assertTrue (_changingKey == "set.int1");
 	assertTrue (_changingValue == "42");
 	assertTrue (_changedKey == "set.int1");
 	assertTrue (_changedValue == "42");
-	
+
 	pConf->setDouble("set.double1", 1.5);
 	assertTrue (_changingKey == "set.double1");
 	assertTrue (_changingValue == "1.5");
 	assertTrue (_changedKey == "set.double1");
 	assertTrue (_changedValue == "1.5");
-	
+
 	pConf->setBool("set.bool1", true);
 	assertTrue (_changingKey == "set.bool1");
 	assertTrue (_changingValue == "true");
@@ -344,7 +344,7 @@ void AbstractConfigurationTest::testKeys()
 
 	pConf->keys("prop1", keys);
 	assertTrue (keys.empty());
-	
+
 	pConf->keys("prop3", keys);
 	assertTrue (keys.size() == 2);
 	assertTrue (std::find(keys.begin(), keys.end(), "string1") != keys.end());
@@ -398,7 +398,7 @@ void AbstractConfigurationTest::testRemove()
 AbstractConfiguration::Ptr AbstractConfigurationTest::createConfiguration() const
 {
 	AbstractConfiguration::Ptr pConfig = allocConfiguration();
-	
+
 	pConfig->setString("prop1", "foo");
 	pConfig->setString("prop2", "bar");
 	pConfig->setString("prop3.string1", "foo");
diff --git a/Util/testsuite/src/AbstractConfigurationTest.h b/Util/testsuite/src/AbstractConfigurationTest.h
index f083c0844..5fa9568d0 100644
--- a/Util/testsuite/src/AbstractConfigurationTest.h
+++ b/Util/testsuite/src/AbstractConfigurationTest.h
@@ -44,10 +44,10 @@ public:
 	void testRemove();
 	void testChangeEvents();
 	void testRemoveEvents();
-	
+
 	void setUp();
 	void tearDown();
-	
+
 	void onPropertyChanging(const void*, Poco::Util::AbstractConfiguration::KeyValue& kv);
 	void onPropertyChanged(const void*, const Poco::Util::AbstractConfiguration::KeyValue& kv);
 	void onPropertyRemoving(const void*, const std::string& key);
diff --git a/Util/testsuite/src/ConfigurationMapperTest.cpp b/Util/testsuite/src/ConfigurationMapperTest.cpp
index 5383b9dcc..2ddd24531 100644
--- a/Util/testsuite/src/ConfigurationMapperTest.cpp
+++ b/Util/testsuite/src/ConfigurationMapperTest.cpp
@@ -52,10 +52,10 @@ void ConfigurationMapperTest::testMapper1()
 	assertTrue (std::find(keys.begin(), keys.end(), "string2") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "sub1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "sub2") != keys.end());
-	
+
 	assertTrue (pMapper->getString("prop5.string1") == "foo");
 	assertTrue (pMapper->getString("prop5.sub1.string1") == "FOO");
-	
+
 	pMapper->setString("prop5.string3", "baz");
 	assertTrue (pMapper->getString("prop5.string3") == "baz");
 	assertTrue (pConf->getString("prop5.string3") == "baz");
@@ -92,7 +92,7 @@ void ConfigurationMapperTest::testMapper2()
 
 	assertTrue (pMapper->getString("root.conf.string1") == "foo");
 	assertTrue (pMapper->getString("root.conf.sub1.string1") == "FOO");
-	
+
 	pMapper->setString("root.conf.string3", "baz");
 	assertTrue (pMapper->getString("root.conf.string3") == "baz");
 	assertTrue (pConf->getString("prop5.string3") == "baz");
@@ -126,10 +126,10 @@ void ConfigurationMapperTest::testMapper3()
 	assertTrue (std::find(keys.begin(), keys.end(), "string2") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "sub1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "sub2") != keys.end());
-	
+
 	assertTrue (pMapper->getString("root.prop5.string1") == "foo");
 	assertTrue (pMapper->getString("root.prop5.sub1.string1") == "FOO");
-	
+
 	pMapper->setString("root.prop5.string3", "baz");
 	assertTrue (pMapper->getString("root.prop5.string3") == "baz");
 	assertTrue (pConf->getString("prop5.string3") == "baz");
@@ -155,10 +155,10 @@ void ConfigurationMapperTest::testMapper4()
 	assertTrue (std::find(keys.begin(), keys.end(), "string2") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "sub1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "sub2") != keys.end());
-	
+
 	assertTrue (pMapper->getString("string1") == "foo");
 	assertTrue (pMapper->getString("sub1.string1") == "FOO");
-	
+
 	pMapper->setString("string3", "baz");
 	assertTrue (pMapper->getString("string3") == "baz");
 	assertTrue (pConf->getString("prop5.string3") == "baz");
diff --git a/Util/testsuite/src/ConfigurationViewTest.cpp b/Util/testsuite/src/ConfigurationViewTest.cpp
index 029dd9513..7d019fa5b 100644
--- a/Util/testsuite/src/ConfigurationViewTest.cpp
+++ b/Util/testsuite/src/ConfigurationViewTest.cpp
@@ -46,13 +46,13 @@ void ConfigurationViewTest::testView()
 	assertTrue (std::find(keys.begin(), keys.end(), "prop2") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop3") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop4") != keys.end());
-	
+
 	assertTrue (pView->getString("prop1") == "foo");
 	assertTrue (pView->getString("prop3.string1") == "foo");
-	
+
 	pView->setString("prop6", "foobar");
 	assertTrue (pConf->getString("prop6") == "foobar");
-	
+
 	pView = pConf->createView("prop1");
 	pView->keys(keys);
 	assertTrue (keys.empty());
@@ -66,7 +66,7 @@ void ConfigurationViewTest::testView()
 	assertTrue (keys.size() == 2);
 	assertTrue (std::find(keys.begin(), keys.end(), "string1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "string2") != keys.end());
-	
+
 	assertTrue (pView->getString("string1") == "foo");
 	assertTrue (pView->getString("string2") == "bar");
 
@@ -80,7 +80,7 @@ void ConfigurationViewTest::testView()
 	assertTrue (std::find(keys.begin(), keys.end(), "string1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "sub1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "sub2") != keys.end());
-	
+
 	assertTrue (pView->getString("sub1.string1") == "FOO");
 	assertTrue (pView->getString("sub2.string2") == "Bar");
 
@@ -89,10 +89,10 @@ void ConfigurationViewTest::testView()
 	assertTrue (keys.size() == 2);
 	assertTrue (std::find(keys.begin(), keys.end(), "string1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "string2") != keys.end());
-	
+
 	assertTrue (pView->getString("string1") == "FOO");
 	assertTrue (pView->getString("string2") == "BAR");
-	
+
 	pView->setString("string3", "foobar");
 	assertTrue (pConf->getString("prop5.sub1.string3") == "foobar");
 
diff --git a/Util/testsuite/src/FilesystemConfigurationTest.cpp b/Util/testsuite/src/FilesystemConfigurationTest.cpp
index 7f185f1db..48d8bbb95 100644
--- a/Util/testsuite/src/FilesystemConfigurationTest.cpp
+++ b/Util/testsuite/src/FilesystemConfigurationTest.cpp
@@ -36,7 +36,7 @@ FilesystemConfigurationTest::~FilesystemConfigurationTest()
 void FilesystemConfigurationTest::testFilesystemConfiguration()
 {
 	AutoPtr<FilesystemConfiguration> config = new FilesystemConfiguration(_path.toString());
-	
+
 	config->setString("logging.loggers.root.channel.class", "ConsoleChannel");
 	config->setString("logging.loggers.app.name", "Application");
 	config->setString("logging.loggers.app.channel", "c1");
@@ -52,7 +52,7 @@ void FilesystemConfigurationTest::testFilesystemConfiguration()
 
 	config->setString("logging.loggers.app.channel", "c2");
 	assertTrue (config->getString("logging.loggers.app.channel") == "c2");
-	
+
 	AbstractConfiguration::Keys keys;
 	config->keys(keys);
 	assertTrue (keys.size() == 1);
@@ -72,7 +72,7 @@ void FilesystemConfigurationTest::testFilesystemConfiguration()
 	assertTrue (keys.size() == 2);
 	assertTrue (std::find(keys.begin(), keys.end(), "class") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "pattern") != keys.end());
-	
+
 	assertTrue (config->hasProperty("logging.loggers.root.channel.class"));
 	config->clear();
 	assertTrue (!config->hasProperty("logging.loggers.root.channel.class"));
diff --git a/Util/testsuite/src/HelpFormatterTest.cpp b/Util/testsuite/src/HelpFormatterTest.cpp
index 7ea98a89a..1bd80cf6d 100644
--- a/Util/testsuite/src/HelpFormatterTest.cpp
+++ b/Util/testsuite/src/HelpFormatterTest.cpp
@@ -40,7 +40,7 @@ void HelpFormatterTest::testHelpFormatter()
 			.required(false)
 			.repeatable(true)
 			.argument("path"));
-			
+
 	set.addOption(
 		Option("library-dir", "L", "specify a search path for locating library files (this option has a very long description)")
 			.required(false)
@@ -56,7 +56,7 @@ void HelpFormatterTest::testHelpFormatter()
 		.description("enable verbose mode")
 		.required(false)
 		.repeatable(false));
-		
+
 	set.addOption(
 		Option("optimize", "O")
 		.description("enable optimization")
@@ -66,10 +66,10 @@ void HelpFormatterTest::testHelpFormatter()
 
 	HelpFormatter formatter(set);
 	formatter.format(std::cout);
-	
+
 	formatter.setCommand("cc");
 	formatter.format(std::cout);
-	
+
 	formatter.setUsage("OPTIONS FILES");
 	formatter.setHeader("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. "
 		"Vivamus volutpat imperdiet massa. Nulla at ipsum vitae risus facilisis posuere. "
@@ -79,10 +79,10 @@ void HelpFormatterTest::testHelpFormatter()
 		"Etiam odio dolor, fermentum quis, mollis nec, sodales sed, tellus. "
 		"Quisque consequat orci eu augue. Aliquam ac nibh ac neque hendrerit iaculis.");
 	formatter.format(std::cout);
-	
+
 	formatter.setUnixStyle(false);
 	formatter.format(std::cout);
-	
+
 	formatter.setHeader("");
 	formatter.setFooter("tab: a\tb\tcde\tf\n\ta\n\t\tb");
 	formatter.format(std::cout);
diff --git a/Util/testsuite/src/IniFileConfigurationTest.cpp b/Util/testsuite/src/IniFileConfigurationTest.cpp
index 4c47574ba..b27e9732b 100644
--- a/Util/testsuite/src/IniFileConfigurationTest.cpp
+++ b/Util/testsuite/src/IniFileConfigurationTest.cpp
@@ -37,7 +37,7 @@ IniFileConfigurationTest::~IniFileConfigurationTest()
 
 void IniFileConfigurationTest::testLoad()
 {
-	static const std::string iniFile = 
+	static const std::string iniFile =
 		"; comment\n"
 		"  ; comment  \n"
 		"prop1=value1\n"
@@ -51,10 +51,10 @@ void IniFileConfigurationTest::testLoad()
 		"prop1 = value 5\n"
 		"\t   \n"
 		"Prop2 = value6";
-		
-	std::istringstream istr(iniFile);	
+
+	std::istringstream istr(iniFile);
 	AutoPtr<IniFileConfiguration> pConf = new IniFileConfiguration(istr);
-	
+
 	assertTrue (pConf->getString("prop1") == "value1");
 	assertTrue (pConf->getString("prop2") == "value2");
 	assertTrue (pConf->getString("section1.prop1") == "value3");
@@ -62,7 +62,7 @@ void IniFileConfigurationTest::testLoad()
 	assertTrue (pConf->getString("section 2.prop1") == "value 5");
 	assertTrue (pConf->getString("section 2.prop2") == "value6");
 	assertTrue (pConf->getString("SECTION 2.PROP2") == "value6");
-	
+
 	AbstractConfiguration::Keys keys;
 	pConf->keys(keys);
 	assertTrue (keys.size() == 4);
@@ -70,12 +70,12 @@ void IniFileConfigurationTest::testLoad()
 	assertTrue (std::find(keys.begin(), keys.end(), "prop2") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "section1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "section 2") != keys.end());
-	
+
 	pConf->keys("Section1", keys);
 	assertTrue (keys.size() == 2);
 	assertTrue (std::find(keys.begin(), keys.end(), "prop1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop2") != keys.end());
-	
+
 	pConf->setString("prop1", "value11");
 	assertTrue (pConf->getString("PROP1") == "value11");
 	pConf->setString("Prop1", "value12");
diff --git a/Util/testsuite/src/JSONConfigurationTest.cpp b/Util/testsuite/src/JSONConfigurationTest.cpp
index 5a3c22661..2fc77bb28 100644
--- a/Util/testsuite/src/JSONConfigurationTest.cpp
+++ b/Util/testsuite/src/JSONConfigurationTest.cpp
@@ -113,6 +113,26 @@ void JSONConfigurationTest::testSetArrayElement()
 }
 
 
+void JSONConfigurationTest::testConfigurationView()
+{
+	std::string json = R"json({ "foo" : [ "bar" ] })json";
+	Poco::Util::JSONConfiguration config;
+	std::istringstream stream(json);
+	config.load(stream);
+
+	Poco::Util::AbstractConfiguration::Ptr pView = config.createView("foo");
+
+	assertTrue (pView->getString("[0]") == "bar");
+
+	try
+	{
+		pView->getString("[1]");
+		fail ("must throw on index out of bounds");
+	}
+	catch(Poco::NotFoundException&){}
+}
+
+
 AbstractConfiguration::Ptr JSONConfigurationTest::allocConfiguration() const
 {
 	return new JSONConfiguration;
@@ -136,6 +156,7 @@ CppUnit::Test* JSONConfigurationTest::suite()
 	AbstractConfigurationTest_addTests(pSuite, JSONConfigurationTest);
 	CppUnit_addTest(pSuite, JSONConfigurationTest, testLoad);
 	CppUnit_addTest(pSuite, JSONConfigurationTest, testSetArrayElement);
+	CppUnit_addTest(pSuite, JSONConfigurationTest, testConfigurationView);
 
 	return pSuite;
 }
diff --git a/Util/testsuite/src/JSONConfigurationTest.h b/Util/testsuite/src/JSONConfigurationTest.h
index bf627689f..d7042c3fb 100644
--- a/Util/testsuite/src/JSONConfigurationTest.h
+++ b/Util/testsuite/src/JSONConfigurationTest.h
@@ -26,6 +26,7 @@ public:
 
 	void testLoad();
 	void testSetArrayElement();
+	void testConfigurationView();
 
 	void setUp();
 	void tearDown();
diff --git a/Util/testsuite/src/LayeredConfigurationTest.cpp b/Util/testsuite/src/LayeredConfigurationTest.cpp
index 6863acabc..55e61f118 100644
--- a/Util/testsuite/src/LayeredConfigurationTest.cpp
+++ b/Util/testsuite/src/LayeredConfigurationTest.cpp
@@ -39,11 +39,11 @@ LayeredConfigurationTest::~LayeredConfigurationTest()
 void LayeredConfigurationTest::testEmpty()
 {
 	AutoPtr<LayeredConfiguration> pLC = new LayeredConfiguration;
-	
+
 	AbstractConfiguration::Keys keys;
 	pLC->keys(keys);
 	assertTrue (keys.empty());
-	
+
 	assertTrue (!pLC->hasProperty("foo"));
 	try
 	{
@@ -53,7 +53,7 @@ void LayeredConfigurationTest::testEmpty()
 	catch (RuntimeException&)
 	{
 	}
-	
+
 	try
 	{
 		std::string s = pLC->getString("foo");
@@ -69,10 +69,10 @@ void LayeredConfigurationTest::testOneLayer()
 {
 	AutoPtr<LayeredConfiguration> pLC = new LayeredConfiguration;
 	AutoPtr<MapConfiguration> pMC = new MapConfiguration;
-	
+
 	pMC->setString("prop1", "value1");
 	pMC->setString("prop2", "value2");
-	
+
 	pLC->addWriteable(pMC, 0);
 
 	AbstractConfiguration::Keys keys;
@@ -80,7 +80,7 @@ void LayeredConfigurationTest::testOneLayer()
 	assertTrue (keys.size() == 2);
 	assertTrue (std::find(keys.begin(), keys.end(), "prop1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop2") != keys.end());
-	
+
 	assertTrue (pLC->getString("prop1") == "value1");
 	assertTrue (pLC->getString("prop2") == "value2");
 
@@ -97,12 +97,12 @@ void LayeredConfigurationTest::testTwoLayers()
 	AutoPtr<LayeredConfiguration> pLC = new LayeredConfiguration;
 	AutoPtr<MapConfiguration> pMC1 = new MapConfiguration;
 	AutoPtr<MapConfiguration> pMC2 = new MapConfiguration;
-	
+
 	pMC1->setString("prop1", "value1");
 	pMC1->setString("prop2", "value2");
 	pMC2->setString("prop2", "value3");
 	pMC2->setString("prop3", "value4");
-	
+
 	pLC->add(pMC1, 0);
 	pLC->addWriteable(pMC2, 1);
 
@@ -112,7 +112,7 @@ void LayeredConfigurationTest::testTwoLayers()
 	assertTrue (std::find(keys.begin(), keys.end(), "prop1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop2") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop3") != keys.end());
-	
+
 	assertTrue (pLC->getString("prop1") == "value1");
 	assertTrue (pLC->getString("prop2") == "value2");
 	assertTrue (pLC->getString("prop3") == "value4");
@@ -139,7 +139,7 @@ void LayeredConfigurationTest::testThreeLayers()
 	AutoPtr<MapConfiguration> pMC1 = new MapConfiguration;
 	AutoPtr<MapConfiguration> pMC2 = new MapConfiguration;
 	AutoPtr<MapConfiguration> pMC3 = new MapConfiguration;
-	
+
 	pMC1->setString("prop1", "value1");
 	pMC1->setString("prop2", "value2");
 	pMC1->setString("prop3", "value3");
@@ -147,11 +147,11 @@ void LayeredConfigurationTest::testThreeLayers()
 	pMC2->setString("prop4", "value5");
 	pMC3->setString("prop5", "value6");
 	pMC3->setString("prop1", "value7");
-	
+
 	pLC->add(pMC1, 0);
 	pLC->add(pMC2, 1);
 	pLC->add(pMC3, -1);
-	
+
 	assertTrue (pLC->getString("prop1") == "value7");
 	assertTrue (pLC->getString("prop2") == "value2");
 	assertTrue (pLC->getString("prop3") == "value3");
@@ -165,12 +165,12 @@ void LayeredConfigurationTest::testRemove()
 	AutoPtr<LayeredConfiguration> pLC = new LayeredConfiguration;
 	AutoPtr<MapConfiguration> pMC1 = new MapConfiguration;
 	AutoPtr<MapConfiguration> pMC2 = new MapConfiguration;
-	
+
 	pMC1->setString("prop1", "value1");
 	pMC1->setString("prop2", "value2");
 	pMC2->setString("prop2", "value3");
 	pMC2->setString("prop3", "value4");
-	
+
 	pLC->add(pMC1, 0);
 	pLC->add(pMC2, -1);
 
@@ -181,7 +181,7 @@ void LayeredConfigurationTest::testRemove()
 	assertTrue (std::find(keys.begin(), keys.end(), "prop1") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop2") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop3") != keys.end());
-	
+
 	assertTrue (pLC->getString("prop1") == "value1");
 	assertTrue (pLC->getString("prop2") == "value3");
 	assertTrue (pLC->getString("prop3") == "value4");
@@ -201,13 +201,13 @@ void LayeredConfigurationTest::testFind()
 	LayeredConfiguration::Ptr pLC = new LayeredConfiguration;
 	AbstractConfiguration::Ptr pMC1 = new MapConfiguration;
 	AbstractConfiguration::Ptr pMC2 = new MapConfiguration;
-	
+
 	pLC->add(pMC1, 0);
 	pLC->add(pMC2, "label", -1);
-	
+
 	AbstractConfiguration::Ptr pFound = pLC->find("label");
 	assertTrue (pFound == pMC2);
-	
+
 	pFound = pLC->find("notfound");
 	assertTrue (pFound.isNull());
 }
diff --git a/Util/testsuite/src/LoggingConfiguratorTest.cpp b/Util/testsuite/src/LoggingConfiguratorTest.cpp
index 11312f173..9f1d97d7e 100644
--- a/Util/testsuite/src/LoggingConfiguratorTest.cpp
+++ b/Util/testsuite/src/LoggingConfiguratorTest.cpp
@@ -84,7 +84,7 @@ void LoggingConfiguratorTest::testConfigurator()
 
 	LoggingConfigurator configurator;
 	configurator.configure(pConfig);
-	
+
 	Logger& root = Logger::get("");
 	assertTrue (root.getLevel() == Message::PRIO_WARNING);
 	FormattingChannel::Ptr pFC = root.getChannel().cast<FormattingChannel>();
@@ -96,7 +96,7 @@ void LoggingConfiguratorTest::testConfigurator()
 #endif
 	assertTrue (!pFC->getFormatter().cast<Poco::PatternFormatter>().isNull());
 	assertTrue ((pFC->getFormatter().cast<PatternFormatter>())->getProperty("pattern") == "%s-[%p] %t");
-	
+
 	Logger& logger1 = Logger::get("logger1");
 	assertTrue (logger1.getLevel() == Message::PRIO_INFORMATION);
 	pFC = logger1.getChannel().cast<FormattingChannel>();
@@ -113,9 +113,9 @@ void LoggingConfiguratorTest::testConfigurator()
 
 void LoggingConfiguratorTest::testBadConfiguration1()
 {
-	// this is mainly testing for memory leaks in case of 
+	// this is mainly testing for memory leaks in case of
 	// a bad configuration.
-	
+
 	static const std::string config =
 		"logging.loggers.root.channel = c1\n"
 		"logging.loggers.root.level = warning\n"
@@ -156,9 +156,9 @@ void LoggingConfiguratorTest::testBadConfiguration1()
 
 void LoggingConfiguratorTest::testBadConfiguration2()
 {
-	// this is mainly testing for memory leaks in case of 
+	// this is mainly testing for memory leaks in case of
 	// a bad configuration.
-	
+
 	static const std::string config =
 		"logging.loggers.root.channel = c1\n"
 		"logging.loggers.root.level = unknown\n"
@@ -199,9 +199,9 @@ void LoggingConfiguratorTest::testBadConfiguration2()
 
 void LoggingConfiguratorTest::testBadConfiguration3()
 {
-	// this is mainly testing for memory leaks in case of 
+	// this is mainly testing for memory leaks in case of
 	// a bad configuration.
-	
+
 	static const std::string config =
 		"logging.loggers.root.channel = c1\n"
 		"logging.loggers.root.level = warning\n"
@@ -242,9 +242,9 @@ void LoggingConfiguratorTest::testBadConfiguration3()
 
 void LoggingConfiguratorTest::testBadConfiguration4()
 {
-	// this is mainly testing for memory leaks in case of 
+	// this is mainly testing for memory leaks in case of
 	// a bad configuration.
-	
+
 	static const std::string config =
 		"logging.loggers.root.channel = c1\n"
 		"logging.loggers.root.level = warning\n"
diff --git a/Util/testsuite/src/MapConfigurationTest.cpp b/Util/testsuite/src/MapConfigurationTest.cpp
index 56737de01..261a050a7 100644
--- a/Util/testsuite/src/MapConfigurationTest.cpp
+++ b/Util/testsuite/src/MapConfigurationTest.cpp
@@ -33,10 +33,10 @@ MapConfigurationTest::~MapConfigurationTest()
 void MapConfigurationTest::testClear()
 {
 	AutoPtr<MapConfiguration> pConf = new MapConfiguration;
-	
+
 	pConf->setString("foo", "bar");
 	assertTrue (pConf->hasProperty("foo"));
-	
+
 	pConf->clear();
 	assertTrue (!pConf->hasProperty("foo"));
 }
diff --git a/Util/testsuite/src/OptionProcessorTest.cpp b/Util/testsuite/src/OptionProcessorTest.cpp
index 25874f00b..d0617ffe4 100644
--- a/Util/testsuite/src/OptionProcessorTest.cpp
+++ b/Util/testsuite/src/OptionProcessorTest.cpp
@@ -40,7 +40,7 @@ void OptionProcessorTest::testUnix()
 			.required(false)
 			.repeatable(true)
 			.argument("path"));
-			
+
 	set.addOption(
 		Option("library-dir", "L", "specify a search path for locating library files")
 			.required(false)
@@ -56,7 +56,7 @@ void OptionProcessorTest::testUnix()
 		.description("enable verbose mode")
 		.required(false)
 		.repeatable(false));
-		
+
 	set.addOption(
 		Option("optimize", "O")
 		.description("enable optimization")
@@ -64,7 +64,7 @@ void OptionProcessorTest::testUnix()
 		.repeatable(false)
 		.argument("level", false)
 		.group("mode"));
-		
+
 	set.addOption(
 		Option("debug", "g")
 		.description("generate debug information")
@@ -81,7 +81,7 @@ void OptionProcessorTest::testUnix()
 	OptionProcessor p1(set);
 	std::string name;
 	std::string value;
-	
+
 	assertTrue (p1.process("-I/usr/include", name, value));
 	assertTrue (name == "include-dir");
 	assertTrue (value == "/usr/include");
@@ -89,7 +89,7 @@ void OptionProcessorTest::testUnix()
 	assertTrue (p1.process("--include:/usr/local/include", name, value));
 	assertTrue (name == "include-dir");
 	assertTrue (value == "/usr/local/include");
-	
+
 	assertTrue (p1.process("-I", name, value));
 	assertTrue (name.empty());
 	assertTrue (value.empty());
@@ -107,14 +107,14 @@ void OptionProcessorTest::testUnix()
 	assertTrue (p1.process("--lib=/usr/local/lib", name, value));
 	assertTrue (name == "library-dir");
 	assertTrue (value == "/usr/local/lib");
-	
+
 	assertTrue (p1.process("-ofile", name, value));
 	assertTrue (name == "output");
 	assertTrue (value == "file");
-	
+
 	assertTrue (!p1.process("src/file.cpp", name, value));
 	assertTrue (!p1.process("/src/file.cpp", name, value));
-	
+
 	try
 	{
 		p1.process("--output:file", name, value);
@@ -123,11 +123,11 @@ void OptionProcessorTest::testUnix()
 	catch (Poco::Util::DuplicateOptionException&)
 	{
 	}
-	
+
 	assertTrue (p1.process("-g", name, value));
 	assertTrue (name == "debug");
 	assertTrue (value == "");
-	
+
 	try
 	{
 		p1.process("--optimize", name, value);
@@ -136,7 +136,7 @@ void OptionProcessorTest::testUnix()
 	catch (Poco::Util::IncompatibleOptionsException&)
 	{
 	}
-	
+
 	try
 	{
 		p1.process("-x", name, value);
@@ -165,7 +165,7 @@ void OptionProcessorTest::testDefault()
 			.required(false)
 			.repeatable(true)
 			.argument("path"));
-			
+
 	set.addOption(
 		Option("library-dir", "L", "specify a search path for locating library files")
 			.required(false)
@@ -181,7 +181,7 @@ void OptionProcessorTest::testDefault()
 		.description("enable verbose mode")
 		.required(false)
 		.repeatable(false));
-		
+
 	set.addOption(
 		Option("optimize", "O")
 		.description("enable optimization")
@@ -189,7 +189,7 @@ void OptionProcessorTest::testDefault()
 		.repeatable(false)
 		.argument("level", false)
 		.group("mode"));
-		
+
 	set.addOption(
 		Option("debug", "g")
 		.description("generate debug information")
@@ -207,7 +207,7 @@ void OptionProcessorTest::testDefault()
 	p1.setUnixStyle(false);
 	std::string name;
 	std::string value;
-	
+
 	assertTrue (p1.process("/Inc:/usr/include", name, value));
 	assertTrue (name == "include-dir");
 	assertTrue (value == "/usr/include");
@@ -226,14 +226,14 @@ void OptionProcessorTest::testDefault()
 	assertTrue (p1.process("/lib=/usr/local/lib", name, value));
 	assertTrue (name == "library-dir");
 	assertTrue (value == "/usr/local/lib");
-	
+
 	assertTrue (p1.process("/out:file", name, value));
 	assertTrue (name == "output");
 	assertTrue (value == "file");
-	
+
 	assertTrue (!p1.process("src/file.cpp", name, value));
 	assertTrue (!p1.process("\\src\\file.cpp", name, value));
-	
+
 	try
 	{
 		p1.process("/output:file", name, value);
@@ -242,11 +242,11 @@ void OptionProcessorTest::testDefault()
 	catch (Poco::Util::DuplicateOptionException&)
 	{
 	}
-	
+
 	assertTrue (p1.process("/debug", name, value));
 	assertTrue (name == "debug");
 	assertTrue (value == "");
-	
+
 	try
 	{
 		p1.process("/OPT", name, value);
@@ -255,7 +255,7 @@ void OptionProcessorTest::testDefault()
 	catch (Poco::Util::IncompatibleOptionsException&)
 	{
 	}
-	
+
 	try
 	{
 		p1.process("/x", name, value);
@@ -287,7 +287,7 @@ void OptionProcessorTest::testRequired()
 	OptionProcessor p1(set);
 	std::string name;
 	std::string value;
-	
+
 	try
 	{
 		p1.checkRequired();
@@ -296,7 +296,7 @@ void OptionProcessorTest::testRequired()
 	catch (Poco::Util::MissingOptionException&)
 	{
 	}
-	
+
 	assertTrue (p1.process("-o", name, value));
 	p1.checkRequired();
 }
@@ -310,7 +310,7 @@ void OptionProcessorTest::testArgs()
 			.required(false)
 			.repeatable(true)
 			.argument("path"));
-		
+
 	set.addOption(
 		Option("optimize", "O")
 		.description("enable optimization")
@@ -321,7 +321,7 @@ void OptionProcessorTest::testArgs()
 	OptionProcessor p1(set);
 	std::string name;
 	std::string value;
-	
+
 	assertTrue (p1.process("-I/usr/include", name, value));
 	assertTrue (name == "include-dir");
 	assertTrue (value == "/usr/include");
@@ -329,7 +329,7 @@ void OptionProcessorTest::testArgs()
 	assertTrue (p1.process("--include:/usr/local/include", name, value));
 	assertTrue (name == "include-dir");
 	assertTrue (value == "/usr/local/include");
-	
+
 	assertTrue (p1.process("-I", name, value));
 	assertTrue (name.empty());
 	assertTrue (value.empty());
@@ -347,7 +347,7 @@ void OptionProcessorTest::testArgs()
 	assertTrue (p1.process("-O", name, value));
 	assertTrue (name == "optimize");
 	assertTrue (value.empty());
-	
+
 	assertTrue (p1.process("-O2", name, value));
 	assertTrue (name == "optimize");
 	assertTrue (value == "2");
diff --git a/Util/testsuite/src/OptionSetTest.cpp b/Util/testsuite/src/OptionSetTest.cpp
index 33c5865df..d59d17ee1 100644
--- a/Util/testsuite/src/OptionSetTest.cpp
+++ b/Util/testsuite/src/OptionSetTest.cpp
@@ -66,7 +66,7 @@ void OptionSetTest::testOptionSet()
 			.required(false)
 			.repeatable(true)
 			.argument("path"));
-	
+
 	assertTrue (set.hasOption("include", false));
 	assertTrue (set.hasOption("I", true));
 	assertTrue (set.hasOption("Include", true));
@@ -76,12 +76,12 @@ void OptionSetTest::testOptionSet()
 	assertTrue (set.hasOption("item", false));
 	assertTrue (!set.hasOption("i", false));
 	assertTrue (!set.hasOption("in", false));
-	
+
 	assertTrue (set.hasOption("help"));
 	assertTrue (set.hasOption("h", true));
 	assertTrue (set.hasOption("helper"));
 	assertTrue (set.hasOption("H", true));
-	
+
 	const Option& opt1 = set.getOption("include");
 	assertTrue (opt1.fullName() == "include");
 
@@ -99,7 +99,7 @@ void OptionSetTest::testOptionSet()
 
 	const Option& opt6 = set.getOption("helpe");
 	assertTrue (opt6.fullName() == "helper");
-	
+
 	try
 	{
 		set.getOption("in");
diff --git a/Util/testsuite/src/OptionTest.cpp b/Util/testsuite/src/OptionTest.cpp
index b08d08aea..7e4aa248e 100644
--- a/Util/testsuite/src/OptionTest.cpp
+++ b/Util/testsuite/src/OptionTest.cpp
@@ -34,11 +34,11 @@ void OptionTest::testOption()
 		.required(false)
 		.repeatable(true)
 		.argument("path");
-		
+
 	Option libOpt = Option("library-dir", "L", "specify a library search path", false)
 		.repeatable(true)
 		.argument("path");
-		
+
 	Option outOpt = Option("output", "o", "specify the output file", true)
 		.argument("file", true);
 
@@ -46,13 +46,13 @@ void OptionTest::testOption()
 		.description("enable verbose mode")
 		.required(false)
 		.repeatable(false);
-		
+
 	Option optOpt = Option("optimize", "O")
 		.description("enable optimization")
 		.required(false)
 		.repeatable(false)
 		.argument("level", false);
-		
+
 	assertTrue (incOpt.shortName() == "I");
 	assertTrue (incOpt.fullName() == "include-dir");
 	assertTrue (incOpt.repeatable());
@@ -60,7 +60,7 @@ void OptionTest::testOption()
 	assertTrue (incOpt.argumentName() == "path");
 	assertTrue (incOpt.argumentRequired());
 	assertTrue (incOpt.takesArgument());
-		
+
 	assertTrue (libOpt.shortName() == "L");
 	assertTrue (libOpt.fullName() == "library-dir");
 	assertTrue (libOpt.repeatable());
@@ -100,7 +100,7 @@ void OptionTest::testMatches1()
 		.required(false)
 		.repeatable(true)
 		.argument("path");
-		
+
 	assertTrue (incOpt.matchesShort("Iinclude"));
 	assertTrue (incOpt.matchesPartial("include:include"));
 	assertTrue (incOpt.matchesPartial("include-dir:include"));
@@ -109,12 +109,12 @@ void OptionTest::testMatches1()
 	assertTrue (incOpt.matchesPartial("include"));
 	assertTrue (incOpt.matchesShort("I"));
 	assertTrue (incOpt.matchesPartial("i"));
-	
+
 	assertTrue (incOpt.matchesFull("include-dir:include"));
 	assertTrue (incOpt.matchesFull("INClude-dir:include"));
 	assertTrue (!incOpt.matchesFull("include:include"));
 	assertTrue (!incOpt.matchesFull("include-dir2:include"));
-	
+
 	assertTrue (!incOpt.matchesPartial("include-dir2=include"));
 	assertTrue (!incOpt.matchesShort("linclude"));
 }
@@ -126,7 +126,7 @@ void OptionTest::testMatches2()
 		.required(false)
 		.repeatable(true)
 		.argument("path");
-		
+
 	assertTrue (!incOpt.matchesShort("Iinclude"));
 	assertTrue (incOpt.matchesPartial("include:include"));
 	assertTrue (incOpt.matchesPartial("include-dir:include"));
@@ -134,12 +134,12 @@ void OptionTest::testMatches2()
 	assertTrue (incOpt.matchesPartial("INCLUDE=include"));
 	assertTrue (incOpt.matchesPartial("I"));
 	assertTrue (incOpt.matchesPartial("i"));
-	
+
 	assertTrue (incOpt.matchesFull("include-dir:include"));
 	assertTrue (incOpt.matchesFull("INClude-dir:include"));
 	assertTrue (!incOpt.matchesFull("include:include"));
 	assertTrue (!incOpt.matchesFull("include-dir2:include"));
-	
+
 	assertTrue (!incOpt.matchesFull("include-dir2=include"));
 	assertTrue (!incOpt.matchesShort("linclude"));
 }
@@ -165,7 +165,7 @@ void OptionTest::testProcess1()
 	assertTrue (arg == "/usr/include");
 	incOpt.process("Include-dir:/proj/include", arg);
 	assertTrue (arg == "/proj/include");
-	
+
 	try
 	{
 		incOpt.process("I", arg);
@@ -183,7 +183,7 @@ void OptionTest::testProcess1()
 	catch (Poco::Util::MissingArgumentException&)
 	{
 	}
-	
+
 	try
 	{
 		incOpt.process("Llib", arg);
@@ -192,17 +192,17 @@ void OptionTest::testProcess1()
 	catch (Poco::Util::UnknownOptionException&)
 	{
 	}
-	
+
 	Option vrbOpt = Option("verbose", "v")
 		.description("enable verbose mode")
 		.required(false)
 		.repeatable(false);
-	
+
 	vrbOpt.process("v", arg);
 	assertTrue (arg.empty());
 	vrbOpt.process("verbose", arg);
 	assertTrue (arg.empty());
-	
+
 	try
 	{
 		vrbOpt.process("v2", arg);
@@ -220,13 +220,13 @@ void OptionTest::testProcess1()
 	catch (Poco::Util::UnexpectedArgumentException&)
 	{
 	}
-	
+
 	Option optOpt = Option("optimize", "O")
 		.description("enable optimization")
 		.required(false)
 		.repeatable(false)
 		.argument("level", false);
-		
+
 	optOpt.process("O", arg);
 	assertTrue (arg.empty());
 	optOpt.process("O2", arg);
@@ -258,7 +258,7 @@ void OptionTest::testProcess2()
 	assertTrue (arg == "/usr/include");
 	incOpt.process("Include-dir:/proj/include", arg);
 	assertTrue (arg == "/proj/include");
-	
+
 	try
 	{
 		incOpt.process("Iinclude", arg);
@@ -267,7 +267,7 @@ void OptionTest::testProcess2()
 	catch (Poco::Util::UnknownOptionException&)
 	{
 	}
-	
+
 	try
 	{
 		incOpt.process("I", arg);
@@ -285,7 +285,7 @@ void OptionTest::testProcess2()
 	catch (Poco::Util::MissingArgumentException&)
 	{
 	}
-	
+
 	try
 	{
 		incOpt.process("Llib", arg);
@@ -294,17 +294,17 @@ void OptionTest::testProcess2()
 	catch (Poco::Util::UnknownOptionException&)
 	{
 	}
-	
+
 	Option vrbOpt = Option("verbose", "")
 		.description("enable verbose mode")
 		.required(false)
 		.repeatable(false);
-	
+
 	vrbOpt.process("v", arg);
 	assertTrue (arg.empty());
 	vrbOpt.process("verbose", arg);
 	assertTrue (arg.empty());
-	
+
 	try
 	{
 		vrbOpt.process("v2", arg);
diff --git a/Util/testsuite/src/PropertyFileConfigurationTest.cpp b/Util/testsuite/src/PropertyFileConfigurationTest.cpp
index 6f29a6f42..d073712ae 100644
--- a/Util/testsuite/src/PropertyFileConfigurationTest.cpp
+++ b/Util/testsuite/src/PropertyFileConfigurationTest.cpp
@@ -36,7 +36,7 @@ PropertyFileConfigurationTest::~PropertyFileConfigurationTest()
 
 void PropertyFileConfigurationTest::testLoad()
 {
-	static const std::string propFile = 
+	static const std::string propFile =
 		"! comment\n"
 		"! comment\n"
 		"prop1=value1\n"
@@ -50,10 +50,10 @@ void PropertyFileConfigurationTest::testLoad()
 		"prop4 = escaped[\\t\\r\\n\\f]\n"
 		"#prop4 = foo\n"
 		"prop5:foo";
-		
+
 	std::istringstream istr(propFile);
 	AutoPtr<PropertyFileConfiguration> pConf = new PropertyFileConfiguration(istr);
-	
+
 	assertTrue (pConf->getString("prop1") == "value1");
 	assertTrue (pConf->getString("prop2") == "value2");
 	assertTrue (pConf->getString("prop3.prop31") == "value3");
@@ -61,7 +61,7 @@ void PropertyFileConfigurationTest::testLoad()
 	assertTrue (pConf->getString("prop3.prop33") == "value5, value6, value7, value8, value9");
 	assertTrue (pConf->getString("prop4") == "escaped[\t\r\n\f]");
 	assertTrue (pConf->getString("prop5") == "foo");
-	
+
 	AbstractConfiguration::Keys keys;
 	pConf->keys(keys);
 	assertTrue (keys.size() == 5);
@@ -70,13 +70,13 @@ void PropertyFileConfigurationTest::testLoad()
 	assertTrue (std::find(keys.begin(), keys.end(), "prop3") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop4") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop5") != keys.end());
-	
+
 	pConf->keys("prop3", keys);
 	assertTrue (keys.size() == 3);
 	assertTrue (std::find(keys.begin(), keys.end(), "prop31") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop32") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop33") != keys.end());
-	
+
 	try
 	{
 		std::string s = pConf->getString("foo");
@@ -91,11 +91,11 @@ void PropertyFileConfigurationTest::testLoad()
 void PropertyFileConfigurationTest::testSave()
 {
 	AutoPtr<PropertyFileConfiguration> pConf = new PropertyFileConfiguration;
-	
+
 	pConf->setString("prop1", "value1");
 	pConf->setInt("prop2", 42);
 	pConf->setString("prop3", "value\\1\txxx");
-	
+
 	std::ostringstream ostr;
 	pConf->save(ostr);
 	std::string propFile = ostr.str();
diff --git a/Util/testsuite/src/SystemConfigurationTest.cpp b/Util/testsuite/src/SystemConfigurationTest.cpp
index 7caa80841..38840ae03 100644
--- a/Util/testsuite/src/SystemConfigurationTest.cpp
+++ b/Util/testsuite/src/SystemConfigurationTest.cpp
@@ -45,7 +45,7 @@ SystemConfigurationTest::~SystemConfigurationTest()
 void SystemConfigurationTest::testProperties()
 {
 	AutoPtr<SystemConfiguration> pConf = new SystemConfiguration;
-	
+
 	assertTrue (pConf->getString("system.osName") == Environment::osName());
 	assertTrue (pConf->getString("system.osVersion") == Environment::osVersion());
 	assertTrue (pConf->getString("system.osArchitecture") == Environment::osArchitecture());
@@ -53,15 +53,15 @@ void SystemConfigurationTest::testProperties()
 	assertTrue (pConf->getString("system.currentDir") == Path::current());
 	assertTrue (pConf->getString("system.homeDir") == Path::home());
 	assertTrue (pConf->getString("system.tempDir") == Path::temp());
-	
+
 	std::string dateTime = pConf->getString("system.dateTime");
 	assertTrue (dateTime.size() == 20);
-	
+
 #if !defined(POCO_VXWORKS)
 	std::string pid = pConf->getString("system.pid");
 	assertTrue (Poco::NumberParser::parse64(pid) == Poco::Process::id());
 #endif
-	
+
 #if defined(POCO_OS_FAMILY_WINDOWS)
 	std::string home = pConf->getString("system.env.HOMEPATH");
 #else
diff --git a/Util/testsuite/src/TimerTest.cpp b/Util/testsuite/src/TimerTest.cpp
index e20925617..5d4638f30 100644
--- a/Util/testsuite/src/TimerTest.cpp
+++ b/Util/testsuite/src/TimerTest.cpp
@@ -264,7 +264,7 @@ void TimerTest::testFunc()
 {
 	Timer timer;
 
-	int count = 0;
+	std::atomic<int> count(0);
 	timer.schedule(Timer::func([&count]()
 	{
 		count++;
diff --git a/Util/testsuite/src/ValidatorTest.cpp b/Util/testsuite/src/ValidatorTest.cpp
index f29941d0d..b5d4cbfc8 100644
--- a/Util/testsuite/src/ValidatorTest.cpp
+++ b/Util/testsuite/src/ValidatorTest.cpp
@@ -40,7 +40,7 @@ void ValidatorTest::testRegExpValidator()
 {
 	Option option("option", "o");
 	AutoPtr<Validator> pVal(new RegExpValidator("[0-9]+"));
-	
+
 	pVal->validate(option, "0");
 	pVal->validate(option, "12345");
 
@@ -94,11 +94,11 @@ void ValidatorTest::testIntValidator()
 {
 	Option option("option", "o");
 	AutoPtr<Validator> pVal(new IntValidator(0, 100));
-	
+
 	pVal->validate(option, "0");
 	pVal->validate(option, "100");
 	pVal->validate(option, "55");
-	
+
 	try
 	{
 		pVal->validate(option, "-1");
diff --git a/Util/testsuite/src/WinCEDriver.cpp b/Util/testsuite/src/WinCEDriver.cpp
index 7e8d692ec..5ccb12824 100644
--- a/Util/testsuite/src/WinCEDriver.cpp
+++ b/Util/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int wmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("UtilTestSuite", UtilTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/Util/testsuite/src/WinConfigurationTest.cpp b/Util/testsuite/src/WinConfigurationTest.cpp
index 95ebde38c..1686aeefc 100644
--- a/Util/testsuite/src/WinConfigurationTest.cpp
+++ b/Util/testsuite/src/WinConfigurationTest.cpp
@@ -55,7 +55,7 @@ void WinConfigurationTest::testConfiguration()
 #if defined(POCO_HAVE_INT64)
 	pReg->setUInt64("name2", std::numeric_limits<UInt64>::max()); // overwrite should also change type
 	assertTrue (pReg->getUInt64("name2") == std::numeric_limits<UInt64>::max());
-	pReg->setInt64("name2", std::numeric_limits<Int64>::min()); 
+	pReg->setInt64("name2", std::numeric_limits<Int64>::min());
 	assertTrue (pReg->getInt64("name2") == std::numeric_limits<Int64>::min());
 
 	/// write real int64 value type
@@ -75,14 +75,14 @@ void WinConfigurationTest::testConfiguration()
 
 	assertTrue (pReg->hasProperty("name1"));
 	assertTrue (pReg->hasProperty("name2"));
-	
+
 	std::string dfl = pReg->getString("nonexistent", "default");
 	assertTrue (dfl == "default");
-	
+
 	AutoPtr<Poco::Util::AbstractConfiguration> pView = pReg->createView("config");
 	dfl = pView->getString("sub.foo", "default");
 	assertTrue (dfl == "default");
-	
+
 	pView->setString("sub.foo", "bar");
 	assertTrue (pView->getString("sub.foo", "default") == "bar");
 
diff --git a/Util/testsuite/src/WinRegistryTest.cpp b/Util/testsuite/src/WinRegistryTest.cpp
index 8bf2ee588..ed0f61bd2 100644
--- a/Util/testsuite/src/WinRegistryTest.cpp
+++ b/Util/testsuite/src/WinRegistryTest.cpp
@@ -52,7 +52,7 @@ void WinRegistryTest::testRegistry()
 	assertTrue (regKey.exists("name1"));
 	assertTrue (regKey.exists("name2"));
 	assertTrue (regKey.exists());
-	
+
 	WinRegistryKey regKeyRO("HKEY_CURRENT_USER\\Software\\Applied Informatics\\Test", true);
 	assertTrue (regKeyRO.getString("name1") == "Value1");
 	try
@@ -64,7 +64,7 @@ void WinRegistryTest::testRegistry()
 		std::string msg = exc.displayText();
 	}
 	assertTrue (regKey.getString("name1") == "Value1");
-	
+
 	WinRegistryKey::Values vals;
 	regKey.values(vals);
 	assertTrue (vals.size() == 2);
@@ -75,14 +75,14 @@ void WinRegistryTest::testRegistry()
 	Environment::set("FOO", "bar");
 	regKey.setStringExpand("name3", "%FOO%");
 	assertTrue (regKey.getStringExpand("name3") == "bar");
-	
+
 	regKey.setInt("name4", 42);
 	assertTrue (regKey.getInt("name4") == 42);
-	
+
 	assertTrue (regKey.exists("name4"));
 	regKey.deleteValue("name4");
 	assertTrue (!regKey.exists("name4"));
-	
+
 #if defined(POCO_HAVE_INT64)
 	regKey.setInt64("name5", std::numeric_limits<Int64>::max());
 	assertTrue (regKey.getInt64("name5") == std::numeric_limits<Int64>::max());
diff --git a/Util/testsuite/src/WinServiceTest.cpp b/Util/testsuite/src/WinServiceTest.cpp
index afcbeb0d5..c2453a01a 100644
--- a/Util/testsuite/src/WinServiceTest.cpp
+++ b/Util/testsuite/src/WinServiceTest.cpp
@@ -6,17 +6,17 @@
 using Poco::Util::WinService;
 
 
-WinServiceTest::WinServiceTest(const std::string& name) : CppUnit::TestCase(name) 
+WinServiceTest::WinServiceTest(const std::string& name) : CppUnit::TestCase(name)
 {
 }
 
 
-WinServiceTest::~WinServiceTest() 
+WinServiceTest::~WinServiceTest()
 {
 }
 
 
-void WinServiceTest::testServiceCouldCreatedWithExistingConnection() 
+void WinServiceTest::testServiceCouldCreatedWithExistingConnection()
 {
 	SC_HANDLE scmHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
 
@@ -24,7 +24,7 @@ void WinServiceTest::testServiceCouldCreatedWithExistingConnection()
 
 	WinService spoolerService{scmHandle, "Spooler"};
 
-	assertTrue(spoolerService.isRegistered());	
+	assertTrue(spoolerService.isRegistered());
 }
 
 
@@ -37,25 +37,25 @@ void WinServiceTest::testServiceReturnsTrueIfStopped()
 }
 
 
-void WinServiceTest::testServiceReturnsFailureActionConfigured() 
+void WinServiceTest::testServiceReturnsFailureActionConfigured()
 {
 	WinService spoolerService{"Spooler"};
 
 	auto failureActions = spoolerService.getFailureActions();
 	assertEqual(3, static_cast<int>(failureActions.size()));
 
-	assertEqual(WinService::SVC_RESTART, failureActions[0]);
-	assertEqual(WinService::SVC_RESTART, failureActions[1]);
-	assertEqual(WinService::SVC_NONE, failureActions[2]);
+	assertTrue(WinService::SVC_RESTART == failureActions[0]);
+	assertTrue(WinService::SVC_RESTART == failureActions[1]);
+	assertTrue(WinService::SVC_NONE == failureActions[2]);
 }
 
 
-void WinServiceTest::setUp() 
+void WinServiceTest::setUp()
 {
 }
 
 
-void WinServiceTest::tearDown() 
+void WinServiceTest::tearDown()
 {
 	try
 	{
diff --git a/Util/testsuite/src/XMLConfigurationTest.cpp b/Util/testsuite/src/XMLConfigurationTest.cpp
index 797ddb9b9..499b5d079 100644
--- a/Util/testsuite/src/XMLConfigurationTest.cpp
+++ b/Util/testsuite/src/XMLConfigurationTest.cpp
@@ -37,7 +37,7 @@ XMLConfigurationTest::~XMLConfigurationTest()
 
 void XMLConfigurationTest::testLoad()
 {
-	static const std::string xmlFile = 
+	static const std::string xmlFile =
 		"<config>"
 		"	<prop1>value1</prop1>"
 		"	<prop2>value2</prop2>"
@@ -54,10 +54,10 @@ void XMLConfigurationTest::testLoad()
 		"       <prop7>value8</prop7>"
 		"   </prop6>"
 		"</config>";
-		
-	std::istringstream istr(xmlFile);	
+
+	std::istringstream istr(xmlFile);
 	AutoPtr<XMLConfiguration> pConf = new XMLConfiguration(istr);
-	
+
 	assertTrue (pConf->getString("prop1") == "value1");
 	assertTrue (pConf->getString("prop2") == "value2");
 	assertTrue (pConf->getString("prop3.prop4[@attr]") == "value3");
@@ -69,7 +69,7 @@ void XMLConfigurationTest::testLoad()
 	assertTrue (pConf->getString("prop5[@id='2']") == "value6");
 	assertTrue (pConf->getString("prop6[@id=foo].prop7") == "value7");
 	assertTrue (pConf->getString("prop6[@id='bar'].prop7") == "value8");
-	
+
 	AbstractConfiguration::Keys keys;
 	pConf->keys(keys);
 	assertTrue (keys.size() == 7);
@@ -80,7 +80,7 @@ void XMLConfigurationTest::testLoad()
 	assertTrue (std::find(keys.begin(), keys.end(), "prop5[1]") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop6") != keys.end());
 	assertTrue (std::find(keys.begin(), keys.end(), "prop6[1]") != keys.end());
-	
+
 	pConf->keys("prop3", keys);
 	assertTrue (keys.size() == 2);
 	assertTrue (std::find(keys.begin(), keys.end(), "prop4") != keys.end());
@@ -93,7 +93,7 @@ void XMLConfigurationTest::testLoad()
 	assertTrue (pConf->hasProperty("prop3"));
 	pConf->remove("prop3");
 	assertTrue (!pConf->hasProperty("prop3"));
-	
+
 	try
 	{
 		std::string s = pConf->getString("foo");
@@ -118,18 +118,18 @@ void XMLConfigurationTest::testSave()
 {
 	AutoPtr<XMLConfiguration> pConf = new XMLConfiguration;
 	pConf->loadEmpty("config");
-	
+
 	std::ostringstream ostr;
 	pConf->save(ostr);
 	std::string s(ostr.str());
 	assertTrue (s == "<config/>\n");
-	
+
 	pConf->setString("prop1", "value1");
 	assertTrue (pConf->getString("prop1") == "value1");
 
 	pConf->setString("prop2", "value2");
 	assertTrue (pConf->getString("prop2") == "value2");
-	
+
 	pConf->setString("prop3.prop4[@attr]", "value3");
 	assertTrue (pConf->getString("prop3.prop4[@attr]") == "value3");
 
@@ -154,11 +154,11 @@ void XMLConfigurationTest::testSave()
 	catch (Poco::InvalidArgumentException&)
 	{
 	}
-	
+
 	std::ostringstream ostr2;
 	pConf->save(ostr2);
 	s = ostr2.str();
-	
+
 	assertTrue (s ==
 		"<config>\n"
 		"\t<prop1>value1</prop1>\n"
@@ -170,7 +170,7 @@ void XMLConfigurationTest::testSave()
 		"\t<prop5>value5</prop5>\n"
 		"\t<prop5>value6</prop5>\n"
 		"</config>\n");
-		
+
 	pConf->setString("prop1", "value11");
 	assertTrue (pConf->getString("prop1") == "value11");
 
@@ -226,7 +226,7 @@ void XMLConfigurationTest::testLoadAppendSave()
 
 void XMLConfigurationTest::testOtherDelimiter()
 {
-	static const std::string xmlFile = 
+	static const std::string xmlFile =
 		"<config>"
 		"	<prop1>value1</prop1>"
 		"	<prop2>value2</prop2>"
@@ -243,10 +243,10 @@ void XMLConfigurationTest::testOtherDelimiter()
 		"       <prop7>value8</prop7>"
 		"   </prop6>"
 		"</config>";
-		
-	std::istringstream istr(xmlFile);	
+
+	std::istringstream istr(xmlFile);
 	AutoPtr<XMLConfiguration> pConf = new XMLConfiguration(istr, '/');
-	
+
 	assertTrue (pConf->getString("prop1") == "value1");
 	assertTrue (pConf->getString("prop2") == "value2");
 	assertTrue (pConf->getString("prop3/prop4[@attr]") == "value3");
diff --git a/XML/XML.progen b/XML/XML.progen
index d0db2fe0c..e8b0f0645 100644
--- a/XML/XML.progen
+++ b/XML/XML.progen
@@ -12,5 +12,6 @@ vc.project.compiler.defines = XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/XML/XML_vs170.sln b/XML/XML_vs170.sln
index bbd37dd9a..d336ae92b 100644
--- a/XML/XML_vs170.sln
+++ b/XML/XML_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.Build.0 = release_static_md|x64
 		{9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/XML/XML_vs170.vcxproj b/XML/XML_vs170.vcxproj
index 0ac5aa080..426d505ef 100644
--- a/XML/XML_vs170.vcxproj
+++ b/XML/XML_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>XML</ProjectName>
     <ProjectGuid>{9E211743-85FE-4977-82F3-4F04B40C912D}</ProjectGuid>
     <RootNamespace>XML</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoXMLA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoXMLmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoXMLmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoXMLA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoXMLmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoXMLmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoXMLd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoXMLmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoXMLmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoXMLmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoXMLmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\XML\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\XML\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\XML\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\XML\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\XML\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\XML\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\XML\$(Configuration)\</IntDir>
@@ -223,6 +328,164 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\XML\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoXMLA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoXMLA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoXMLd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\binA64\PocoXMLA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoXML.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoXMLmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoXMLmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoXMLmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoXMLmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoXMLmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoXMLmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -845,16 +1108,22 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -863,31 +1132,43 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ClCompile Include="src\xmltok_impl.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ClCompile Include="src\xmltok_ns.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -898,12 +1179,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/XML/include/Poco/DOM/Attr.h b/XML/include/Poco/DOM/Attr.h
index 13ace7ecc..451e62465 100644
--- a/XML/include/Poco/DOM/Attr.h
+++ b/XML/include/Poco/DOM/Attr.h
@@ -31,7 +31,7 @@ namespace XML {
 class XML_API Attr: public AbstractNode
 	/// The Attr interface represents an attribute in an Element object. Typically
 	/// the allowable values for the attribute are defined in a document type definition.
-	/// 
+	///
 	/// Attr objects inherit the Node interface, but since they are not actually
 	/// child nodes of the element they describe, the DOM does not consider them
 	/// part of the document tree. Thus, the Node attributes parentNode, previousSibling,
@@ -44,7 +44,7 @@ class XML_API Attr: public AbstractNode
 	/// nodes contained within a DocumentFragment. In short, users and implementors
 	/// of the DOM need to be aware that Attr nodes have some things in common with
 	/// other objects inheriting the Node interface, but they also are quite distinct.
-	/// 
+	///
 	/// The attribute's effective value is determined as follows: if this attribute
 	/// has been explicitly assigned any value, that value is the attribute's effective
 	/// value; otherwise, if there is a declaration for this attribute, and that
@@ -53,7 +53,7 @@ class XML_API Attr: public AbstractNode
 	/// in the structure model until it has been explicitly added. Note that the
 	/// nodeValue attribute on the Attr instance can also be used to retrieve the
 	/// string version of the attribute's value(s).
-	/// 
+	///
 	/// In XML, where the value of an attribute can contain entity references, the
 	/// child nodes of the Attr node provide a representation in which entity references
 	/// are not expanded. These child nodes may be either Text or EntityReference
@@ -74,7 +74,7 @@ public:
 		/// attribute. The implementation will then make a new attribute available with
 		/// specified set to false and the default value (if one exists).
 		/// In summary:
-		/// 
+		///
 		///     * If the attribute has an assigned value in the document then specified
 		///       is true, and the value is the assigned value.
 		///     * If the attribute has no assigned value in the document and has a default
@@ -106,7 +106,7 @@ public:
 
 	// DOM Level 2
 	Element* ownerElement() const;
-		/// The Element node this attribute is attached to or null 
+		/// The Element node this attribute is attached to or null
 		/// if this attribute is not in use.
 
 	// Node
@@ -127,7 +127,7 @@ protected:
 	Attr(Document* pOwnerDocument, Element* pOwnerElement, const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname, const XMLString& value, bool specified = true);
 	Attr(Document* pOwnerDocument, const Attr& attr);
 	~Attr();
-	
+
 	Node* copyNode(bool deep, Document* pOwnerDocument) const;
 
 private:
diff --git a/XML/include/Poco/DOM/AttrMap.h b/XML/include/Poco/DOM/AttrMap.h
index 41f34fd63..f7d714bb8 100644
--- a/XML/include/Poco/DOM/AttrMap.h
+++ b/XML/include/Poco/DOM/AttrMap.h
@@ -54,7 +54,7 @@ private:
 	AttrMap();
 
 	Element* _pElement;
-	
+
 	friend class Element;
 };
 
diff --git a/XML/include/Poco/DOM/CDATASection.h b/XML/include/Poco/DOM/CDATASection.h
index 7a0e82b18..93fed3b10 100644
--- a/XML/include/Poco/DOM/CDATASection.h
+++ b/XML/include/Poco/DOM/CDATASection.h
@@ -32,17 +32,17 @@ class XML_API CDATASection: public Text
 	/// in a CDATA section is the "]]>" string that ends the CDATA section. CDATA
 	/// sections cannot be nested. Their primary purpose is for including material
 	/// such as XML fragments, without needing to escape all the delimiters.
-	/// 
+	///
 	/// The DOMString attribute of the Text node holds the text that is contained
 	/// by the CDATA section. Note that this may contain characters that need to
 	/// be escaped outside of CDATA sections and that, depending on the character
 	/// encoding ("charset") chosen for serialization, it may be impossible to write
 	/// out some characters as part of a CDATA section.
-	/// 
+	///
 	/// The CDATASection interface inherits from the CharacterData interface through
 	/// the Text interface. Adjacent CDATASection nodes are not merged by use of
 	/// the normalize method on the Element interface.
-	/// 
+	///
 	/// Note: Because no markup is recognized within a CDATASection, character numeric
 	/// references cannot be used as an escape mechanism when serializing. Therefore,
 	/// action needs to be taken when serializing a CDATASection with a character
@@ -73,7 +73,7 @@ protected:
 
 private:
 	static const XMLString NODE_NAME;
-	
+
 	friend class Document;
 };
 
diff --git a/XML/include/Poco/DOM/CharacterData.h b/XML/include/Poco/DOM/CharacterData.h
index af5697da7..dc6144abe 100644
--- a/XML/include/Poco/DOM/CharacterData.h
+++ b/XML/include/Poco/DOM/CharacterData.h
@@ -33,18 +33,18 @@ class XML_API CharacterData: public AbstractNode
 	/// here rather than on each object that uses these attributes and methods.
 	/// No DOM objects correspond directly to CharacterData, though Text and others
 	/// do inherit the interface from it. All offsets in this interface start from 0.
-	/// 
+	///
 	/// Text strings in the DOM are represented in either UTF-8 (if XML_UNICODE_WCHAR_T is
 	/// not defined) or in UTF-16 (if XML_UNICODE_WCHAR_T is defined).
 	/// Indexing on character data is done in XMLChar units.
 {
 public:
 	const XMLString& data() const;
-		/// Returns the character data of the node that 
+		/// Returns the character data of the node that
 		/// implements the interface.
-	
+
 	const XMLString& getData() const;
-		/// Returns the character data of the node that 
+		/// Returns the character data of the node that
 		/// implements the interface.
 
 	void setData(const XMLString& data);
diff --git a/XML/include/Poco/DOM/ChildNodesList.h b/XML/include/Poco/DOM/ChildNodesList.h
index aa7ece1db..d5a8088ce 100644
--- a/XML/include/Poco/DOM/ChildNodesList.h
+++ b/XML/include/Poco/DOM/ChildNodesList.h
@@ -39,12 +39,12 @@ public:
 protected:
 	ChildNodesList(const Node* pParent);
 	~ChildNodesList();
-	
+
 private:
 	ChildNodesList();
 
 	const Node* _pParent;
-	
+
 	friend class AbstractNode;
 };
 
diff --git a/XML/include/Poco/DOM/Comment.h b/XML/include/Poco/DOM/Comment.h
index d1de79306..70294b560 100644
--- a/XML/include/Poco/DOM/Comment.h
+++ b/XML/include/Poco/DOM/Comment.h
@@ -47,7 +47,7 @@ protected:
 
 private:
 	static const XMLString NODE_NAME;
-	
+
 	friend class Document;
 };
 
diff --git a/XML/include/Poco/DOM/DOMBuilder.h b/XML/include/Poco/DOM/DOMBuilder.h
index ad91da45f..9bc1cfa31 100644
--- a/XML/include/Poco/DOM/DOMBuilder.h
+++ b/XML/include/Poco/DOM/DOMBuilder.h
@@ -47,7 +47,7 @@ class XML_API DOMBuilder: protected DTDHandler, protected ContentHandler, protec
 {
 public:
 	DOMBuilder(XMLReader& xmlReader, NamePool* pNamePool = 0);
-		/// Creates a DOMBuilder using the given XMLReader. 
+		/// Creates a DOMBuilder using the given XMLReader.
 		/// If a NamePool is given, it becomes the Document's NamePool.
 
 	virtual ~DOMBuilder();
@@ -87,10 +87,10 @@ protected:
 	void endEntity(const XMLString& name);
 	void startCDATA();
 	void endCDATA();
-	void comment(const XMLChar ch[], int start, int length); 
+	void comment(const XMLChar ch[], int start, int length);
 
 	void appendNode(AbstractNode* pNode);
-	
+
 	void setupParse();
 
 private:
diff --git a/XML/include/Poco/DOM/DOMException.h b/XML/include/Poco/DOM/DOMException.h
index 456526f11..a6e0d4523 100644
--- a/XML/include/Poco/DOM/DOMException.h
+++ b/XML/include/Poco/DOM/DOMException.h
@@ -32,7 +32,7 @@ class XML_API DOMException: public XMLException
 	/// because data is lost, or because the implementation has become unstable).
 	/// In general, DOM methods return specific error values in ordinary processing
 	/// situations, such as out-of-bound errors when using NodeList.
-	/// 
+	///
 	/// Implementations should raise other exceptions under other circumstances.
 	/// For example, implementations should raise an implementation-dependent exception
 	/// if a null argument is passed when null was not expected.
@@ -55,19 +55,19 @@ public:
 		INVALID_MODIFICATION_ERR,    /// an attempt is made to modify the type of the underlying object
 		NAMESPACE_ERR,               /// an attempt is made to create or change an object in a way which is incorrect with regard to namespaces
 		INVALID_ACCESS_ERR,          /// an attempt is made to use an object that is not, or is no longer, usable
-		
+
 		_NUMBER_OF_MESSAGES
 	};
 
 	DOMException(unsigned short code);
 		/// Creates a DOMException with the given error code.
-		
+
 	DOMException(const DOMException& exc);
 		/// Creates a DOMException by copying another one.
-		
+
 	~DOMException() noexcept;
 		/// Destroys the DOMException.
-		
+
 	DOMException& operator = (const DOMException& exc);
 
 	const char* name() const noexcept;
@@ -78,7 +78,7 @@ public:
 
 	Poco::Exception* clone() const;
 		/// Creates an exact copy of the exception.
-		
+
 	void rethrow() const;
 		/// (Re)Throws the exception.
 
@@ -87,12 +87,12 @@ public:
 
 protected:
 	static const std::string& message(unsigned short code);
-	
+
 private:
 	DOMException();
-	
+
 	unsigned short _code;
-	
+
 	static const std::string MESSAGES[_NUMBER_OF_MESSAGES];
 };
 
diff --git a/XML/include/Poco/DOM/DOMImplementation.h b/XML/include/Poco/DOM/DOMImplementation.h
index 0c2d7af18..74fb09f87 100644
--- a/XML/include/Poco/DOM/DOMImplementation.h
+++ b/XML/include/Poco/DOM/DOMImplementation.h
@@ -40,20 +40,20 @@ class XML_API DOMImplementation
 public:
 	DOMImplementation();
 		/// Creates the DOMImplementation.
-		
+
 	~DOMImplementation();
 		/// Destroys the DOMImplementation.
 
 	bool hasFeature(const XMLString& feature, const XMLString& version) const;
 		/// Tests if the DOM implementation implements a specific feature.
 		///
-		/// The only supported features are "XML", version "1.0" and "Core", 
+		/// The only supported features are "XML", version "1.0" and "Core",
 		/// "Events", "MutationEvents" and "Traversal", version "2.0".
-	
+
 	// DOM Level 2
 	DocumentType* createDocumentType(const XMLString& name, const XMLString& publicId, const XMLString& systemId) const;
-		/// Creates an empty DocumentType node. Entity declarations and notations 
-		/// are not made available. Entity reference expansions and default attribute 
+		/// Creates an empty DocumentType node. Entity declarations and notations
+		/// are not made available. Entity reference expansions and default attribute
 		/// additions do not occur.
 
 	Document* createDocument(const XMLString& namespaceURI, const XMLString& qualifiedName, DocumentType* doctype) const;
@@ -64,7 +64,7 @@ public:
 	static const DOMImplementation& instance();
 		/// Returns a reference to the default DOMImplementation
 		/// object.
-		
+
 private:
 	static const XMLString FEATURE_XML;
 	static const XMLString FEATURE_CORE;
@@ -72,7 +72,7 @@ private:
 	static const XMLString FEATURE_MUTATIONEVENTS;
 	static const XMLString FEATURE_TRAVERSAL;
 	static const XMLString VERSION_1_0;
-	static const XMLString VERSION_2_0;	
+	static const XMLString VERSION_2_0;
 };
 
 
diff --git a/XML/include/Poco/DOM/DOMObject.h b/XML/include/Poco/DOM/DOMObject.h
index 40b29fb2c..ca39e2419 100644
--- a/XML/include/Poco/DOM/DOMObject.h
+++ b/XML/include/Poco/DOM/DOMObject.h
@@ -62,7 +62,7 @@ public:
 		/// Decreases the object's reference count.
 		/// If the reference count reaches zero,
 		/// the object is deleted.
-		
+
 	virtual void autoRelease() = 0;
 		/// Adds the object to an appropriate
 		/// AutoReleasePool, which is usually the
@@ -76,7 +76,7 @@ protected:
 private:
 	DOMObject(const DOMObject&);
 	DOMObject& operator = (const DOMObject&);
-	
+
 	mutable int _rc;
 };
 
diff --git a/XML/include/Poco/DOM/DOMParser.h b/XML/include/Poco/DOM/DOMParser.h
index 69d0f5aaa..3c8cb55b4 100644
--- a/XML/include/Poco/DOM/DOMParser.h
+++ b/XML/include/Poco/DOM/DOMParser.h
@@ -39,13 +39,13 @@ class XML_API DOMParser
 {
 public:
 	explicit DOMParser(NamePool* pNamePool = 0);
-		/// Creates a new DOMParser. 
+		/// Creates a new DOMParser.
 		/// If a NamePool is given, it becomes the Document's NamePool.
-		
+
 	explicit DOMParser(unsigned long namePoolSize);
 		/// Creates a new DOMParser, using the given NamePool size.
 		///
-		/// The given namePoolSize should be a suitable prime number, 
+		/// The given namePoolSize should be a suitable prime number,
 		/// e.g. 251, 509, 1021 or 4093, depending on the expected
 		/// size of the document.
 
@@ -55,7 +55,7 @@ public:
 	void setEncoding(const XMLString& encoding);
 		/// Sets the encoding used by the parser if no
 		/// encoding is specified in the XML document.
-		
+
 	const XMLString& getEncoding() const;
 		/// Returns the name of the encoding used by
 		/// the parser if no encoding is specified in
@@ -100,7 +100,7 @@ public:
 		/// Sets the entity resolver on the underlying SAXParser.
 
 	static const XMLString FEATURE_FILTER_WHITESPACE;
-	
+
 private:
 	SAXParser _saxParser;
 	NamePool* _pNamePool;
diff --git a/XML/include/Poco/DOM/DOMSerializer.h b/XML/include/Poco/DOM/DOMSerializer.h
index b535105dc..7d2547c6e 100644
--- a/XML/include/Poco/DOM/DOMSerializer.h
+++ b/XML/include/Poco/DOM/DOMSerializer.h
@@ -52,10 +52,10 @@ class XML_API DOMSerializer: public XMLReader
 public:
 	DOMSerializer();
 		/// Creates the DOMSerializer.
-		
+
 	~DOMSerializer();
 		/// Destroys the DOMSerializer.
-		
+
 	void serialize(const Node* pNode);
 		/// Serializes a DOM node and its children
 		/// into a sequence of SAX events, which are
@@ -82,7 +82,7 @@ protected:
 	void parse(InputSource* pSource);
 		/// The DOMSerializer cannot parse an InputSource,
 		/// so this method simply throws an XMLException when invoked.
-		
+
 	void parse(const XMLString& systemId);
 		/// The DOMSerializer cannot parse from a system identifier,
 		/// so this method simply throws an XMLException when invoked.
@@ -111,7 +111,7 @@ private:
 	ErrorHandler*   _pErrorHandler;
 	DeclHandler*    _pDeclHandler;
 	LexicalHandler* _pLexicalHandler;
-	
+
 	static const XMLString CDATA;
 };
 
diff --git a/XML/include/Poco/DOM/DOMWriter.h b/XML/include/Poco/DOM/DOMWriter.h
index 5a5132d56..59a2a0a09 100644
--- a/XML/include/Poco/DOM/DOMWriter.h
+++ b/XML/include/Poco/DOM/DOMWriter.h
@@ -40,7 +40,7 @@ class XML_API DOMWriter
 public:
 	DOMWriter();
 		/// Creates a DOMWriter.
-		
+
 	~DOMWriter();
 		/// Destroys a DOMWriter.
 
@@ -61,7 +61,7 @@ public:
 	void setNewLine(const std::string& newLine);
 		/// Sets the line ending characters for the internal
 		/// XMLWriter. See XMLWriter::setNewLine() for a list
-		/// of supported values. 
+		/// of supported values.
 
 	const std::string& getNewLine() const;
 		/// Returns the line ending characters used by the
@@ -74,7 +74,7 @@ public:
 		/// The given string should only contain TAB or SPACE
 		/// characters (e.g., a single TAB character, or
 		/// two to four SPACE characters).
-		
+
 	const std::string& getIndent() const;
 		/// Returns the string used for one indentation step.
 
diff --git a/XML/include/Poco/DOM/DTDMap.h b/XML/include/Poco/DOM/DTDMap.h
index 2a475c358..9ec164172 100644
--- a/XML/include/Poco/DOM/DTDMap.h
+++ b/XML/include/Poco/DOM/DTDMap.h
@@ -32,7 +32,7 @@ class DocumentType;
 class XML_API DTDMap: public NamedNodeMap
 	/// This implementation of NamedNodeMap
 	/// is returned by DocumentType::entities()
-	/// and DocumentType::notations(). 
+	/// and DocumentType::notations().
 {
 public:
 	Node* getNamedItem(const XMLString& name) const;
@@ -53,10 +53,10 @@ protected:
 
 private:
 	DTDMap();
-	
+
 	const DocumentType* _pDocumentType;
 	unsigned short _type;
-	
+
 	friend class DocumentType;
 };
 
diff --git a/XML/include/Poco/DOM/Document.h b/XML/include/Poco/DOM/Document.h
index 082191c08..91754ea59 100644
--- a/XML/include/Poco/DOM/Document.h
+++ b/XML/include/Poco/DOM/Document.h
@@ -47,14 +47,14 @@ class Notation;
 
 
 class XML_API Document: public AbstractContainerNode, public DocumentEvent
-	/// The Document interface represents the entire HTML or XML document. Conceptually, 
-	/// it is the root of the document tree, and provides the primary access to the 
+	/// The Document interface represents the entire HTML or XML document. Conceptually,
+	/// it is the root of the document tree, and provides the primary access to the
 	/// document's data.
 	///
-	/// Since elements, text nodes, comments, processing instructions, etc. cannot exist 
-	/// outside the context of a Document, the Document interface also contains the 
-	/// factory methods needed to create these objects. The Node objects created have a 
-	/// ownerDocument attribute which associates them with the Document within whose 
+	/// Since elements, text nodes, comments, processing instructions, etc. cannot exist
+	/// outside the context of a Document, the Document interface also contains the
+	/// factory methods needed to create these objects. The Node objects created have a
+	/// ownerDocument attribute which associates them with the Document within whose
 	/// context they were created.
 {
 public:
@@ -65,7 +65,7 @@ public:
 		/// creates its own name pool, otherwise it uses the given name pool.
 		/// Sharing a name pool makes sense for documents containing instances
 		/// of the same schema, thus reducing memory usage.
-		
+
 	explicit Document(unsigned long namePoolSize);
 		/// Creates a new document using a name pool with the given size, which
 		/// should be a prime number (e.g., 251, 509, 1021, 4093).
@@ -141,9 +141,9 @@ public:
 	ProcessingInstruction* createProcessingInstruction(const XMLString& target, const XMLString& data) const;
 		/// Creates a ProcessingInstruction node given the specified target and data strings.
 
-	Attr* createAttribute(const XMLString& name) const;	
+	Attr* createAttribute(const XMLString& name) const;
 		/// Creates an Attr of the given name. Note that the Attr instance can then
-		/// be set on an Element using the setAttributeNode method.	
+		/// be set on an Element using the setAttributeNode method.
 
 	EntityReference* createEntityReference(const XMLString& name) const;
 		/// Creates an EntityReference object. In addition, if the referenced entity
@@ -181,18 +181,18 @@ public:
 		/// Creates an attribute of the given qualified name and namespace URI.
 
 	NodeList* getElementsByTagNameNS(const XMLString& namespaceURI, const XMLString& localName) const;
-		/// Returns a NodeList of all the Elements with a given local name and 
-		/// namespace URI in the order in which they are encountered in a 
+		/// Returns a NodeList of all the Elements with a given local name and
+		/// namespace URI in the order in which they are encountered in a
 		/// preorder traversal of the Document tree.
 
 	Element* getElementById(const XMLString& elementId) const;
-		/// Returns the Element whose ID is given by elementId. If no such 
+		/// Returns the Element whose ID is given by elementId. If no such
 		/// element exists, returns null. Behavior is not defined if more
-		/// than one element has this ID. 
+		/// than one element has this ID.
 		///
-		/// Note: The DOM implementation must have information that says 
+		/// Note: The DOM implementation must have information that says
 		/// which attributes are of type ID. Attributes with the name "ID"
-		/// are not of type ID unless so defined. Implementations that do 
+		/// are not of type ID unless so defined. Implementations that do
 		/// not know whether attributes are of type ID or not are expected to
 		/// return null. This implementation therefore returns null.
 		///
@@ -208,7 +208,7 @@ public:
 
 	// EventTarget
 	bool dispatchEvent(Event* evt);
-	
+
 	// Extensions
 	Entity* createEntity(const XMLString& name, const XMLString& publicId, const XMLString& systemId, const XMLString& notationName) const;
 		/// Creates an Entity with the given name, publicId, systemId and notationName.
@@ -222,13 +222,13 @@ public:
 
 	Element* getElementById(const XMLString& elementId, const XMLString& idAttribute) const;
 		/// Returns the first Element whose ID attribute (given in idAttribute)
-		/// has the given elementId. If no such element exists, returns null. 
+		/// has the given elementId. If no such element exists, returns null.
 		///
 		/// This method is an extension to the W3C Document Object Model.
 
 	Element* getElementByIdNS(const XMLString& elementId, const XMLString& idAttributeURI, const XMLString& idAttributeLocalName) const;
 		/// Returns the first Element whose ID attribute (given in idAttributeURI and idAttributeLocalName)
-		/// has the given elementId. If no such element exists, returns null. 
+		/// has the given elementId. If no such element exists, returns null.
 		///
 		/// This method is an extension to the W3C Document Object Model.
 
@@ -236,7 +236,7 @@ protected:
 	~Document();
 
 	Node* copyNode(bool deep, Document* pOwnerDocument) const;
-	
+
 	DocumentType* getDoctype();
 	void setDoctype(DocumentType* pDoctype);
 
@@ -247,7 +247,7 @@ private:
 	int             _eventSuspendLevel;
 
 	static const XMLString NODE_NAME;
-	
+
 	friend class DOMBuilder;
 };
 
diff --git a/XML/include/Poco/DOM/DocumentFragment.h b/XML/include/Poco/DOM/DocumentFragment.h
index 105a2171d..0adc48b96 100644
--- a/XML/include/Poco/DOM/DocumentFragment.h
+++ b/XML/include/Poco/DOM/DocumentFragment.h
@@ -37,12 +37,12 @@ class XML_API DocumentFragment: public AbstractContainerNode
 	/// could fulfill this role, a Document object can potentially be a heavyweight
 	/// object, depending on the underlying implementation. What is really needed
 	/// for this is a very lightweight object. DocumentFragment is such an object.
-	/// 
+	///
 	/// Furthermore, various operations -- such as inserting nodes as children of
 	/// another Node -- may take DocumentFragment objects as arguments; this results
 	/// in all the child nodes of the DocumentFragment being moved to the child
 	/// list of this node.
-	/// 
+	///
 	/// The children of a DocumentFragment node are zero or more nodes representing
 	/// the tops of any sub-trees defining the structure of the document. DocumentFragment
 	/// nodes do not need to be well-formed XML documents (although they do need
@@ -50,7 +50,7 @@ class XML_API DocumentFragment: public AbstractContainerNode
 	/// can have multiple top nodes). For example, a DocumentFragment might have
 	/// only one child and that child node could be a Text node. Such a structure
 	/// model represents neither an HTML document nor a well-formed XML document.
-	/// 
+	///
 	/// When a DocumentFragment is inserted into a Document (or indeed any other
 	/// Node that may take children) the children of the DocumentFragment and not
 	/// the DocumentFragment itself are inserted into the Node. This makes the DocumentFragment
@@ -68,12 +68,12 @@ protected:
 	DocumentFragment(Document* pOwnerDocument);
 	DocumentFragment(Document* pOwnerDocument, const DocumentFragment& fragment);
 	~DocumentFragment();
-	
+
 	Node* copyNode(bool deep, Document* pOwnerDocument) const;
 
 private:
 	static const XMLString NODE_NAME;
-	
+
 	friend class Document;
 };
 
diff --git a/XML/include/Poco/DOM/DocumentType.h b/XML/include/Poco/DOM/DocumentType.h
index 3d8909798..bf9d414a3 100644
--- a/XML/include/Poco/DOM/DocumentType.h
+++ b/XML/include/Poco/DOM/DocumentType.h
@@ -35,12 +35,12 @@ class XML_API DocumentType: public AbstractContainerNode
 	/// interface to the list of entities that are defined for the document, and
 	/// little else because the effect of namespaces and the various XML scheme
 	/// efforts on DTD representation are not clearly understood as of this writing.
-	/// 
+	///
 	/// The DOM Level 1 doesn't support editing DocumentType nodes.
 {
 public:
 	const XMLString& name() const;
-		/// The name of the DTD; i.e., the name immediately following the 
+		/// The name of the DTD; i.e., the name immediately following the
 		/// DOCTYPE keyword.
 
 	NamedNodeMap* entities() const;
@@ -52,7 +52,7 @@ public:
 		/// external entities are reported.
 		/// Every node in this map also implements the
 		/// Entity interface.
-		/// 
+		///
 		/// The returned NamedNodeMap must be released with a call
 		/// to release() when no longer needed.
 
@@ -61,7 +61,7 @@ public:
 		/// are discarded. Every node in this map also implements the Notation interface.
 		/// The DOM Level 1 does not support editing notations, therefore notations
 		/// cannot be altered in any way.
-		/// 
+		///
 		/// The returned NamedNodeMap must be released with a call
 		/// to release() when no longer needed.
 
@@ -91,7 +91,7 @@ private:
 	XMLString _name;
 	XMLString _publicId;
 	XMLString _systemId;
-	
+
 	friend class DOMImplementation;
 	friend class Document;
 	friend class DOMBuilder;
diff --git a/XML/include/Poco/DOM/Element.h b/XML/include/Poco/DOM/Element.h
index 90217baab..00e0b5a07 100644
--- a/XML/include/Poco/DOM/Element.h
+++ b/XML/include/Poco/DOM/Element.h
@@ -40,19 +40,19 @@ class XML_API Element: public AbstractContainerNode
 	/// methods on the Element interface to retrieve either an Attr object by name
 	/// or an attribute value by name. In XML, where an attribute value may contain
 	/// entity references, an Attr object should be retrieved to examine the possibly
-	/// fairly complex sub-tree representing the attribute value. 
+	/// fairly complex sub-tree representing the attribute value.
 {
 public:
 	const XMLString& tagName() const;
 		/// Returns the name of the element.
 		///
 		/// For example, in
-		/// 
-		///     <elementExample id="demo"> 
-        ///         ... 
+		///
+		///     <elementExample id="demo">
+		///         ...
 		///     </elementExample>
 		///
-		/// tagName has the value "elementExample". Note that this is case-preserving in XML, 
+		/// tagName has the value "elementExample". Note that this is case-preserving in XML,
 		/// as are all of the operations of the DOM.
 
 	const XMLString& getAttribute(const XMLString& name) const;
@@ -68,7 +68,7 @@ public:
 		/// markup (such as syntax to be recognized as an entity reference) is treated
 		/// as literal text, and needs to be appropriately escaped by the implementation
 		/// when it is written out.
- 
+
 	void removeAttribute(const XMLString& name);
 		/// Removes an attribute by name.
 
@@ -107,7 +107,7 @@ public:
 		/// used to ensure that the DOM view of a document is the same as if it were
 		/// saved and re-loaded, and is useful when operations (such as XPointer
 		/// lookups) that depend on a particular document tree structure are to be used.
-		/// 
+		///
 		/// Note: In cases where the document contains CDATASections, the normalize
 		/// operation alone may not be sufficient, since XPointers do not differentiate
 		/// between Text nodes and CDATASection nodes.
@@ -141,7 +141,7 @@ public:
 		/// Returns true if and only if the element has the specified attribute.
 
 	NodeList* getElementsByTagNameNS(const XMLString& namespaceURI, const XMLString& localName) const;
-		/// Returns a NodeList of all the descendant Elements with a given local name and namespace URI 
+		/// Returns a NodeList of all the descendant Elements with a given local name and namespace URI
 		/// in the order in which they are encountered in a preorder traversal of this Element tree.
 		///
 		/// The special value "*" matches all namespaces, or local names respectively.
@@ -166,19 +166,19 @@ public:
 		/// or null if such an element does not exist.
 		///
 		/// This method is an extension to the W3C Document Object Model.
-	
+
 	Element* getElementById(const XMLString& elementId, const XMLString& idAttribute) const;
 		/// Returns the first Element whose ID attribute (given in idAttribute)
-		/// has the given elementId. If no such element exists, returns null. 
+		/// has the given elementId. If no such element exists, returns null.
 		///
 		/// This method is an extension to the W3C Document Object Model.
 
 	Element* getElementByIdNS(const XMLString& elementId, const XMLString& idAttributeURI, const XMLString& idAttributeLocalName) const;
 		/// Returns the first Element whose ID attribute (given in idAttributeURI and idAttributeLocalName)
-		/// has the given elementId. If no such element exists, returns null. 
+		/// has the given elementId. If no such element exists, returns null.
 		///
 		/// This method is an extension to the W3C Document Object Model.
-	
+
 	// Node
 	const XMLString& nodeName() const;
 	NamedNodeMap* attributes() const;
diff --git a/XML/include/Poco/DOM/ElementsByTagNameList.h b/XML/include/Poco/DOM/ElementsByTagNameList.h
index 98af2e820..b377746fc 100644
--- a/XML/include/Poco/DOM/ElementsByTagNameList.h
+++ b/XML/include/Poco/DOM/ElementsByTagNameList.h
@@ -46,7 +46,7 @@ protected:
 	const Node* _pParent;
 	XMLString   _name;
 	mutable unsigned long _count;
-	
+
 	friend class AbstractContainerNode;
 	friend class Element;
 	friend class Document;
@@ -73,7 +73,7 @@ protected:
 	XMLString   _localName;
 	XMLString   _namespaceURI;
 	mutable unsigned long _count;
-	
+
 	friend class AbstractContainerNode;
 	friend class Element;
 	friend class Document;
diff --git a/XML/include/Poco/DOM/Entity.h b/XML/include/Poco/DOM/Entity.h
index 40c21f59c..8aa922634 100644
--- a/XML/include/Poco/DOM/Entity.h
+++ b/XML/include/Poco/DOM/Entity.h
@@ -32,14 +32,14 @@ class XML_API Entity: public AbstractContainerNode
 	/// document. Note that this models the entity itself not the entity declaration.
 	/// Entity declaration modeling has been left for a later Level of the DOM
 	/// specification.
-	/// 
+	///
 	/// The nodeName attribute that is inherited from Node contains the name of
 	/// the entity.
-	/// 
+	///
 	/// An XML processor may choose to completely expand entities before the structure
 	/// model is passed to the DOM; in this case there will be no EntityReference
 	/// nodes in the document tree.
-	/// 
+	///
 	/// XML does not mandate that a non-validating XML processor read and process
 	/// entity declarations made in the external subset or declared in external
 	/// parameter entities. This means that parsed entities declared in the external
@@ -47,17 +47,17 @@ class XML_API Entity: public AbstractContainerNode
 	/// replacement value of the entity may not be available. When the replacement
 	/// value is available, the corresponding Entity node's child list represents
 	/// the structure of that replacement text. Otherwise, the child list is empty.
-	/// 
+	///
 	/// The resolution of the children of the Entity (the replacement value) may
 	/// be lazily evaluated; actions by the user (such as calling the childNodes
 	/// method on the Entity Node) are assumed to trigger the evaluation.
-	/// 
+	///
 	/// The DOM Level 1 does not support editing Entity nodes; if a user wants to
 	/// make changes to the contents of an Entity, every related EntityReference
 	/// node has to be replaced in the structure model by a clone of the Entity's
 	/// contents, and then the desired changes must be made to each of those clones
 	/// instead. Entity nodes and all their descendants are readonly.
-	/// 
+	///
 	/// An Entity node does not have any parent.
 {
 public:
@@ -84,7 +84,7 @@ protected:
 	Entity(Document* pOwnerDocument, const XMLString& name, const XMLString& publicId, const XMLString& systemId, const XMLString& notationName);
 	Entity(Document* pOwnerDocument, const Entity& entity);
 	~Entity();
-	
+
 	Node* copyNode(bool deep, Document* pOwnerDocument) const;
 
 private:
diff --git a/XML/include/Poco/DOM/EntityReference.h b/XML/include/Poco/DOM/EntityReference.h
index 5ecd044b5..f2841880e 100644
--- a/XML/include/Poco/DOM/EntityReference.h
+++ b/XML/include/Poco/DOM/EntityReference.h
@@ -39,10 +39,10 @@ class XML_API EntityReference: public AbstractNode
 	/// node, it may be that there is no Entity node representing the referenced
 	/// entity. If such an Entity exists, then the child list of the EntityReference
 	/// node is the same as that of the Entity node.
-	/// 
+	///
 	/// As for Entity nodes, EntityReference nodes and all their descendants are
 	/// readonly.
-	/// 
+	///
 	/// The resolution of the children of the EntityReference (the replacement value
 	/// of the referenced Entity) may be lazily evaluated; actions by the user (such
 	/// as calling the childNodes method on the EntityReference node) are assumed
@@ -62,7 +62,7 @@ protected:
 
 private:
 	XMLString _name;
-	
+
 	friend class Document;
 };
 
diff --git a/XML/include/Poco/DOM/Event.h b/XML/include/Poco/DOM/Event.h
index 5396aa3f5..c1dfd250b 100644
--- a/XML/include/Poco/DOM/Event.h
+++ b/XML/include/Poco/DOM/Event.h
@@ -43,9 +43,9 @@ class XML_API Event: public DOMObject
 public:
 	enum PhaseType
 	{
-		CAPTURING_PHASE = 1, /// The event is currently being evaluated at the target EventTarget. 
-		AT_TARGET       = 2, /// The current event phase is the bubbling phase. 
-		BUBBLING_PHASE  = 3  /// The current event phase is the capturing phase. 
+		CAPTURING_PHASE = 1, /// The event is currently being evaluated at the target EventTarget.
+		AT_TARGET       = 2, /// The current event phase is the bubbling phase.
+		BUBBLING_PHASE  = 3  /// The current event phase is the capturing phase.
 	};
 
 	const XMLString& type() const;
@@ -55,59 +55,59 @@ public:
 		/// Used to indicate the EventTarget to which the event was originally dispatched.
 
 	EventTarget* currentTarget() const;
-		/// Used to indicate the EventTarget whose EventListeners are currently being 
+		/// Used to indicate the EventTarget whose EventListeners are currently being
 		/// processed. This is particularly useful during capturing and bubbling.
 
 	PhaseType eventPhase() const;
 		/// Used to indicate which phase of event flow is currently being evaluated.
 
 	bool bubbles() const;
-		/// Used to indicate whether or not an event is a bubbling event. 
+		/// Used to indicate whether or not an event is a bubbling event.
 		/// If the event can bubble the value is true, else the value is false.
 
 	bool cancelable() const;
-		/// Used to indicate whether or not an event can have its default action 
+		/// Used to indicate whether or not an event can have its default action
 		/// prevented. If the default action can be prevented the value is
 		/// true, else the value is false.
 
 	Poco::UInt64 timeStamp() const;
-		/// Used to specify the time (in milliseconds relative to the epoch) at 
+		/// Used to specify the time (in milliseconds relative to the epoch) at
 		/// which the event was created. Due to the fact that some
-		/// systems may not provide this information the value of timeStamp may 
+		/// systems may not provide this information the value of timeStamp may
 		/// be not available for all events. When not available, a
-		/// value of 0 will be returned. Examples of epoch time are the time of the 
+		/// value of 0 will be returned. Examples of epoch time are the time of the
 		/// system start or 0:0:0 UTC 1st January 1970.
 		/// This implementation always returns 0.
 
 	void stopPropagation();
-		/// The stopPropagation method is used prevent further propagation of an 
+		/// The stopPropagation method is used prevent further propagation of an
 		/// event during event flow. If this method is called by
-		/// any EventListener the event will cease propagating through the tree. 
+		/// any EventListener the event will cease propagating through the tree.
 		/// The event will complete dispatch to all listeners on the
-		/// current EventTarget before event flow stops. This method may be used 
-		/// during any stage of event flow. 
+		/// current EventTarget before event flow stops. This method may be used
+		/// during any stage of event flow.
 
 	void preventDefault();
-		/// If an event is cancelable, the preventDefault method is used to signify 
+		/// If an event is cancelable, the preventDefault method is used to signify
 		/// that the event is to be canceled, meaning any default
-		/// action normally taken by the implementation as a result of 
+		/// action normally taken by the implementation as a result of
 		/// the event will not occur. If, during any stage of event flow, the
-		/// preventDefault method is called the event is canceled. Any default 
+		/// preventDefault method is called the event is canceled. Any default
 		/// action associated with the event will not occur. Calling
-		/// this method for a non-cancelable event has no effect. Once 
+		/// this method for a non-cancelable event has no effect. Once
 		/// preventDefault has been called it will remain in effect throughout
-		/// the remainder of the event's propagation. This method may be 
-		/// used during any stage of event flow. 
+		/// the remainder of the event's propagation. This method may be
+		/// used during any stage of event flow.
 
 	void initEvent(const XMLString& eventType, bool canBubble, bool isCancelable);
-		/// The initEvent method is used to initialize the value of an 
+		/// The initEvent method is used to initialize the value of an
 		/// Event created through the DocumentEvent interface. This method
-		/// may only be called before the Event has been dispatched via the 
+		/// may only be called before the Event has been dispatched via the
 		/// dispatchEvent method, though it may be called multiple
-		/// times during that phase if necessary. If called multiple 
-		/// times the final invocation takes precedence. If called from 
-		/// a subclass of Event interface only the values specified in the 
-		/// initEvent method are modified, all other attributes are left unchanged. 
+		/// times during that phase if necessary. If called multiple
+		/// times the final invocation takes precedence. If called from
+		/// a subclass of Event interface only the values specified in the
+		/// initEvent method are modified, all other attributes are left unchanged.
 
 	void autoRelease();
 
@@ -141,7 +141,7 @@ private:
 	bool         _cancelable;
 	bool         _canceled;
 	bool         _stopped;
-	
+
 	friend class AbstractNode;
 };
 
diff --git a/XML/include/Poco/DOM/EventDispatcher.h b/XML/include/Poco/DOM/EventDispatcher.h
index 4e825df9c..46fdd8e46 100644
--- a/XML/include/Poco/DOM/EventDispatcher.h
+++ b/XML/include/Poco/DOM/EventDispatcher.h
@@ -43,13 +43,13 @@ class XML_API EventDispatcher
 public:
 	EventDispatcher();
 		/// Creates the EventDispatcher.
-		
+
 	~EventDispatcher();
 		/// Destroys the EventDispatcher.
-		
+
 	void addEventListener(const XMLString& type, EventListener* listener, bool useCapture);
 		/// Adds an EventListener to the internal list.
-		
+
 	void removeEventListener(const XMLString& type, EventListener* listener, bool useCapture);
 		/// Removes an EventListener from the internal list.
 		///
@@ -61,19 +61,19 @@ public:
 	void dispatchEvent(Event* evt);
 		/// Dispatches the event.
 		///
-		/// Also removes all EventListeners marked for deletion from the 
+		/// Also removes all EventListeners marked for deletion from the
 		/// event dispatcher list.
-		
+
 	void captureEvent(Event* evt);
 		/// Dispatches the event in its capturing phase.
 		///
-		/// Also removes all EventListeners marked for deletion from the 
+		/// Also removes all EventListeners marked for deletion from the
 		/// event dispatcher list.
-		
+
 	void bubbleEvent(Event* evt);
 		/// Dispatches the event in its bubbling phase.
 		///
-		/// Also removes all EventListeners marked for deletion from the 
+		/// Also removes all EventListeners marked for deletion from the
 		/// event dispatcher list.
 
 private:
@@ -85,7 +85,7 @@ private:
 	};
 
 	typedef std::list<EventListenerItem> EventListenerList;
-	
+
 	int               _inDispatch;
 	EventListenerList _listeners;
 };
diff --git a/XML/include/Poco/DOM/EventException.h b/XML/include/Poco/DOM/EventException.h
index cb8244105..503f37fdd 100644
--- a/XML/include/Poco/DOM/EventException.h
+++ b/XML/include/Poco/DOM/EventException.h
@@ -27,15 +27,15 @@ namespace XML {
 
 
 class XML_API EventException: public XMLException
-	/// Event operations may throw an EventException as 
+	/// Event operations may throw an EventException as
 	/// specified in their method descriptions.
 {
 public:
 	enum
 	{
-		UNSPECIFIED_EVENT_TYPE_ERR = 0  /// If the Event's type was not specified by initializing the 
+		UNSPECIFIED_EVENT_TYPE_ERR = 0  /// If the Event's type was not specified by initializing the
 		                                /// event before the method was called. Specification of the Event's
-                                        /// type as null or an empty string will also trigger this exception. 
+                                        /// type as null or an empty string will also trigger this exception.
 	};
 
 	EventException(int code);
@@ -60,7 +60,7 @@ public:
 
 protected:
 	Poco::Exception* clone() const;
-	
+
 private:
 	EventException();
 };
diff --git a/XML/include/Poco/DOM/EventListener.h b/XML/include/Poco/DOM/EventListener.h
index f0951b10a..b788db0d4 100644
--- a/XML/include/Poco/DOM/EventListener.h
+++ b/XML/include/Poco/DOM/EventListener.h
@@ -35,7 +35,7 @@ class XML_API EventListener
 	/// EventTarget using the AddEventListener method. The users should also remove
 	/// their EventListener from its EventTarget after they have completed using
 	/// the listener.
-	/// 
+	///
 	/// When a Node is copied using the cloneNode method the EventListeners attached
 	/// to the source Node are not attached to the copied Node. If the user wishes
 	/// the same EventListeners to be added to the newly created copy the user must
@@ -43,7 +43,7 @@ class XML_API EventListener
 {
 public:
 	virtual void handleEvent(Event* evt) = 0;
-		/// This method is called whenever an event occurs of the 
+		/// This method is called whenever an event occurs of the
 		/// type for which the EventListener interface was registered.
 
 protected:
diff --git a/XML/include/Poco/DOM/EventTarget.h b/XML/include/Poco/DOM/EventTarget.h
index 466d2151e..438def4d9 100644
--- a/XML/include/Poco/DOM/EventTarget.h
+++ b/XML/include/Poco/DOM/EventTarget.h
@@ -40,30 +40,30 @@ class XML_API EventTarget: public DOMObject
 {
 public:
 	virtual void addEventListener(const XMLString& type, EventListener* listener, bool useCapture) = 0;
-		/// This method allows the registration of event listeners on 
+		/// This method allows the registration of event listeners on
 		/// the event target. If an EventListener is added to an
-		/// EventTarget while it is processing an event, it will not 
+		/// EventTarget while it is processing an event, it will not
 		/// be triggered by the current actions but may be triggered
 		/// during a later stage of event flow, such as the bubbling phase.
-		/// If multiple identical EventListeners are registered on the same 
-		/// EventTarget with the same parameters the duplicate instances are 
+		/// If multiple identical EventListeners are registered on the same
+		/// EventTarget with the same parameters the duplicate instances are
 		/// discarded. They do not cause the EventListener to be called twice and since they are
-		/// discarded they do not need to be removed with the removeEventListener method. 	
-	
+		/// discarded they do not need to be removed with the removeEventListener method.
+
 	virtual void removeEventListener(const XMLString& type, EventListener* listener, bool useCapture) = 0;
-		/// This method allows the removal of event listeners from the event 
-		/// target. If an EventListener is removed from an EventTarget while it is 
-		/// processing an event, it will not be triggered by the current actions. 
+		/// This method allows the removal of event listeners from the event
+		/// target. If an EventListener is removed from an EventTarget while it is
+		/// processing an event, it will not be triggered by the current actions.
 		/// EventListeners can never be invoked after being removed.
-		/// Calling removeEventListener with arguments which do not identify 
-		/// any currently registered EventListener on the EventTarget has no effect. 
+		/// Calling removeEventListener with arguments which do not identify
+		/// any currently registered EventListener on the EventTarget has no effect.
 
 	virtual bool dispatchEvent(Event* evt) = 0;
-		/// This method allows the dispatch of events into the implementations 
-		/// event model. Events dispatched in this manner will have the same capturing and 
+		/// This method allows the dispatch of events into the implementations
+		/// event model. Events dispatched in this manner will have the same capturing and
 		/// bubbling behavior as events dispatched directly by the
-		/// implementation. The target of the event is the EventTarget on 
-		/// which dispatchEvent is called. 
+		/// implementation. The target of the event is the EventTarget on
+		/// which dispatchEvent is called.
 
 protected:
 	virtual ~EventTarget();
diff --git a/XML/include/Poco/DOM/MutationEvent.h b/XML/include/Poco/DOM/MutationEvent.h
index 33a8521c5..12f25cda8 100644
--- a/XML/include/Poco/DOM/MutationEvent.h
+++ b/XML/include/Poco/DOM/MutationEvent.h
@@ -30,49 +30,49 @@ class Node;
 
 
 class XML_API MutationEvent: public Event
-	/// The MutationEvent interface provides specific contextual 
+	/// The MutationEvent interface provides specific contextual
 	/// information associated with Mutation events.
 {
 public:
 	enum AttrChangeType
 	{
 		MODIFICATION = 1, /// The Attr was modified in place.
-		ADDITION     = 2, /// The Attr was just added. 
-		REMOVAL      = 3  /// The Attr was just removed. 
+		ADDITION     = 2, /// The Attr was just added.
+		REMOVAL      = 3  /// The Attr was just removed.
 	};
 
 	Node* relatedNode() const;
-		/// relatedNode is used to identify a secondary node related to a mutation 
+		/// relatedNode is used to identify a secondary node related to a mutation
 		/// event. For example, if a mutation event is dispatched
-		/// to a node indicating that its parent has changed, the relatedNode is the 
+		/// to a node indicating that its parent has changed, the relatedNode is the
 		/// changed parent. If an event is instead dispatched to a
-		/// subtree indicating a node was changed within it, the relatedNode is 
+		/// subtree indicating a node was changed within it, the relatedNode is
 		/// the changed node. In the case of the DOMAttrModified
 		/// event it indicates the Attr node which was modified, added, or removed.
 
 	const XMLString& prevValue() const;
-		/// prevValue indicates the previous value of the Attr node in DOMAttrModified 
+		/// prevValue indicates the previous value of the Attr node in DOMAttrModified
 		/// events, and of the CharacterData node in DOMCharDataModified events.
 
 	const XMLString& newValue() const;
-		/// newValue indicates the new value of the Attr node in DOMAttrModified 
+		/// newValue indicates the new value of the Attr node in DOMAttrModified
 		/// events, and of the CharacterData node in DOMCharDataModified events.
 
 	const XMLString& attrName() const;
 		/// attrName indicates the name of the changed Attr node in a DOMAttrModified event.
 
 	AttrChangeType attrChange() const;
-		/// attrChange indicates the type of change which triggered the 
+		/// attrChange indicates the type of change which triggered the
 		/// DOMAttrModified event. The values can be MODIFICATION,
 		/// ADDITION, or REMOVAL.
 
-	void initMutationEvent(const XMLString& type, bool canBubble, bool cancelable, Node* relatedNode, 
+	void initMutationEvent(const XMLString& type, bool canBubble, bool cancelable, Node* relatedNode,
 	                       const XMLString& prevValue, const XMLString& newValue, const XMLString& attrName, AttrChangeType change);
-		/// The initMutationEvent method is used to initialize the value of a 
+		/// The initMutationEvent method is used to initialize the value of a
 		/// MutationEvent created through the DocumentEvent
-		/// interface. This method may only be called before the MutationEvent 
+		/// interface. This method may only be called before the MutationEvent
 		/// has been dispatched via the dispatchEvent method,
-		/// though it may be called multiple times during that phase if 
+		/// though it may be called multiple times during that phase if
 		/// necessary. If called multiple times, the final invocation takes
 		/// precedence.
 
@@ -88,7 +88,7 @@ public:
 protected:
 	MutationEvent(Document* pOwnerDocument, const XMLString& type);
 	MutationEvent(Document* pOwnerDocument, const XMLString& type, EventTarget* pTarget, bool canBubble, bool cancelable, Node* relatedNode);
-	MutationEvent(Document* pOwnerDocument, const XMLString& type, EventTarget* pTarget, bool canBubble, bool cancelable, Node* relatedNode, 
+	MutationEvent(Document* pOwnerDocument, const XMLString& type, EventTarget* pTarget, bool canBubble, bool cancelable, Node* relatedNode,
 				  const XMLString& prevValue, const XMLString& newValue, const XMLString& attrName, AttrChangeType change);
 	~MutationEvent();
 
diff --git a/XML/include/Poco/DOM/NamedNodeMap.h b/XML/include/Poco/DOM/NamedNodeMap.h
index 7b42ca88f..e4d806e64 100644
--- a/XML/include/Poco/DOM/NamedNodeMap.h
+++ b/XML/include/Poco/DOM/NamedNodeMap.h
@@ -41,7 +41,7 @@ class XML_API NamedNodeMap: public DOMObject
 	///
 	/// NamedNodeMap objects in the DOM are live.
 	///
-	/// A NamedNodeMap returned from a method must be released with a call to 
+	/// A NamedNodeMap returned from a method must be released with a call to
 	/// release() when no longer needed.
 {
 public:
@@ -69,19 +69,19 @@ public:
 	virtual unsigned long length() const = 0;
 		/// Returns the number of nodes in the map. The range of valid
 		/// child node indices is 0 to length - 1 inclusive.
-	
+
 	// DOM Level 2
 	virtual Node* getNamedItemNS(const XMLString& namespaceURI, const XMLString& localName) const = 0;
 		/// Retrieves a node specified by name.
 
 	virtual Node* setNamedItemNS(Node* arg) = 0;
 		/// Adds a node using its nodeName attribute.
-		/// If a node with that namespace URI and that local name is already 
+		/// If a node with that namespace URI and that local name is already
 		/// present in this map, it is replaced by the new one.
 
 	virtual Node* removeNamedItemNS(const XMLString& namespaceURI, const XMLString& localName) = 0;
 		/// Removes a node specified by name.
-	
+
 protected:
 	virtual ~NamedNodeMap();
 };
diff --git a/XML/include/Poco/DOM/Node.h b/XML/include/Poco/DOM/Node.h
index 0eb934af5..821c189d9 100644
--- a/XML/include/Poco/DOM/Node.h
+++ b/XML/include/Poco/DOM/Node.h
@@ -40,7 +40,7 @@ class XML_API Node: public EventTarget
 	/// not all objects implementing the Node interface may have children. For
 	/// example, Text nodes may not have children, and adding children to such
 	/// nodes results in a DOMException being raised.
-	/// 
+	///
 	/// The attributes nodeName, nodeValue and attributes are included as a mechanism
 	/// to get at node information without casting down to the specific derived
 	/// interface. In cases where there is no obvious mapping of these attributes
@@ -117,7 +117,7 @@ public:
 	virtual NamedNodeMap* attributes() const = 0;
 		/// Returns a NamedNodeMap containing the attributes of this
 		/// node (if it is an Element) or null otherwise.
-		/// 
+		///
 		/// The returned NamedNodeMap must be released with a call
 		/// to release() when no longer needed.
 
@@ -143,14 +143,14 @@ public:
 
 	virtual Node* removeChild(Node* oldChild) = 0;
 		/// Removes the child node indicated by oldChild from the list of children
-		/// and returns it. 
+		/// and returns it.
 
 	virtual Node* appendChild(Node* newChild) = 0;
 		/// Appends the node newChild to the end of the list of children of this node.
 		/// If newChild is already in the tree, it is first removed.
 
 	virtual bool hasChildNodes() const = 0;
-		/// This is a convenience method to allow easy determination of whether a 
+		/// This is a convenience method to allow easy determination of whether a
 		/// node has any children.
 		/// Returns true if the node has any children, false otherwise.
 
@@ -168,7 +168,7 @@ public:
 		/// children of an EntityReference clone are readonly. In addition, clones of
 		/// unspecified Attr nodes are specified. And, cloning Document, DocumentType,
 		/// Entity, and Notation nodes is implementation dependent.
-	
+
 	// DOM Level 2
 	virtual void normalize() = 0;
 		/// Puts all Text nodes in the full depth of the sub-tree underneath this Node,
@@ -179,22 +179,22 @@ public:
 		/// of a document is the same as if it were saved and re-loaded, and is useful
 		/// when operations (such as XPointer lookups) that depend on a particular
 		/// document tree structure are to be used.
-		/// 
+		///
 		/// Note: In cases where the document contains CDATASections, the normalize
 		/// operation alone may not be sufficient, since XPointers do not differentiate
 		/// between Text nodes and CDATASection nodes.
 
 	virtual bool isSupported(const XMLString& feature, const XMLString& version) const = 0;
-		/// Tests whether the DOM implementation implements a specific 
+		/// Tests whether the DOM implementation implements a specific
 		/// feature and that feature is supported by this node.
 
 	virtual const XMLString& namespaceURI() const = 0;
 		/// Returns the namespace URI of the node.
-		/// This is not a computed value that is the result of a namespace lookup based on an 
-		/// examination of the namespace declarations in scope. It is merely the namespace URI 
+		/// This is not a computed value that is the result of a namespace lookup based on an
+		/// examination of the namespace declarations in scope. It is merely the namespace URI
 		/// given at creation time.
 		///
-		/// For nodes of any type other than ELEMENT_NODE and ATTRIBUTE_NODE and nodes created with a 
+		/// For nodes of any type other than ELEMENT_NODE and ATTRIBUTE_NODE and nodes created with a
 		/// DOM Level 1 method, such as createElement from the Document interface, this is always the
 		/// empty string.
 
@@ -206,27 +206,27 @@ public:
 
 	virtual bool hasAttributes() const = 0;
 		/// Returns whether this node (if it is an element) has any attributes.
-		
+
 	// Extensions
 	using NSMap = Poco::XML::NamespaceSupport;
 
 	virtual XMLString innerText() const = 0;
 		/// Returns a string containing the concatenated values of the node
-		/// and all its child nodes. 
+		/// and all its child nodes.
 		///
 		/// This method is not part of the W3C Document Object Model.
-		
+
 	virtual Node* getNodeByPath(const XMLString& path) const = 0;
-		/// Searches a node (element or attribute) based on a simplified XPath 
+		/// Searches a node (element or attribute) based on a simplified XPath
 		/// expression.
 		///
 		/// Only simple XPath expressions are supported. These are the slash
 		/// notation for specifying paths to elements, and the square bracket
-		/// expression for finding elements by their index, by attribute value, 
+		/// expression for finding elements by their index, by attribute value,
 		/// or finding attributes by names.
 		///
 		/// The slash at the beginning is optional, the evaluation always starts
-		/// at this element. A double-slash at the beginning recursively searches 
+		/// at this element. A double-slash at the beginning recursively searches
 		/// the entire subtree for the first element.
 		///
 		/// Examples:
@@ -241,18 +241,18 @@ public:
 		/// This method is an extension to the W3C Document Object Model.
 
 	virtual Node* getNodeByPathNS(const XMLString& path, const NSMap& nsMap) const = 0;
-		/// Searches a node (element or attribute) based on a simplified XPath 
+		/// Searches a node (element or attribute) based on a simplified XPath
 		/// expression. The given NSMap must contain mappings from namespace
-		/// prefixes to namespace URIs for all namespace prefixes used in 
+		/// prefixes to namespace URIs for all namespace prefixes used in
 		/// the path expression.
 		///
 		/// Only simple XPath expressions are supported. These are the slash
 		/// notation for specifying paths to elements, and the square bracket
-		/// expression for finding elements by their index, by attribute value, 
+		/// expression for finding elements by their index, by attribute value,
 		/// or finding attributes by names.
 		///
 		/// The slash at the beginning is optional, the evaluation always starts
-		/// at this element. A double-slash at the beginning recursively searches 
+		/// at this element. A double-slash at the beginning recursively searches
 		/// the entire subtree for the first element.
 		///
 		/// Examples:
diff --git a/XML/include/Poco/DOM/NodeAppender.h b/XML/include/Poco/DOM/NodeAppender.h
index 2d36be2e3..14968aeaa 100644
--- a/XML/include/Poco/DOM/NodeAppender.h
+++ b/XML/include/Poco/DOM/NodeAppender.h
@@ -37,7 +37,7 @@ class XML_API NodeAppender
 	/// In the DOM, child nodes are usually appended to a parent
 	/// node using the appendChild() method. For nodes containing
 	/// more than a few children, this method can be quite slow,
-	/// due to the way it's implemented, and because of the 
+	/// due to the way it's implemented, and because of the
 	/// requirements of the DOM specification.
 	///
 	/// While the NodeAppender is being used on an Element, no
@@ -68,7 +68,7 @@ private:
 	NodeAppender();
 	NodeAppender(const NodeAppender&);
 	NodeAppender& operator = (const NodeAppender&);
-	
+
 	Element*      _pParent;
 	AbstractNode* _pLast;
 };
diff --git a/XML/include/Poco/DOM/NodeFilter.h b/XML/include/Poco/DOM/NodeFilter.h
index ae8677bf2..8f895c95d 100644
--- a/XML/include/Poco/DOM/NodeFilter.h
+++ b/XML/include/Poco/DOM/NodeFilter.h
@@ -35,10 +35,10 @@ class XML_API NodeFilter
 	/// the next node. If the filter says to accept the node, the traversal logic
 	/// returns it; otherwise, traversal looks for the next node and pretends that
 	/// the node that was rejected was not there.
-	/// 
+	///
 	/// The DOM does not provide any filters. NodeFilter is just an interface that
 	/// users can implement to provide their own filters.
-	/// 
+	///
 	/// NodeFilters do not need to know how to traverse from node to node, nor do
 	/// they need to know anything about the data structure that is being traversed.
 	/// This makes it very easy to write filters, since the only thing they have
@@ -61,7 +61,7 @@ public:
 			/// will not return this node. For both NodeIterator and TreeWalker, the children
 			/// of this node will still be considered.
 	};
-	
+
 	enum WhatToShow
 		/// These are the available values for the whatToShow parameter used in TreeWalkers
 		/// and NodeIterators. They are the same as the set of possible types for Node,
@@ -69,18 +69,18 @@ public:
 		/// value of nodeType for the equivalent node type. If a bit in whatToShow is
 		/// set false, that will be taken as a request to skip over this type of node;
 		/// the behavior in that case is similar to that of FILTER_SKIP.
-		/// 
+		///
 		/// Note that if node types greater than 32 are ever introduced, they may not
 		/// be individually testable via whatToShow. If that need should arise, it can
 		/// be handled by selecting SHOW_ALL together with an appropriate NodeFilter.
 	{
 		SHOW_ALL                    = 0xFFFFFFFF,
 			/// Show all Nodes.
-	
+
 		SHOW_ELEMENT                = 0x00000001,
 			/// Show Element nodes.
 
-		SHOW_ATTRIBUTE              = 0x00000002, 
+		SHOW_ATTRIBUTE              = 0x00000002,
 			/// Show Attr nodes. This is meaningful only when creating an iterator or tree-walker
 			/// with an attribute node as its root; in this case, it means that the attribute
 			/// node will appear in the first position of the iteration or traversal. Since
@@ -125,7 +125,7 @@ public:
 			/// notations are not part of the document tree, they do not appear when traversing
 			/// over the document tree.
 	};
-	
+
 	virtual short acceptNode(Node* node) = 0;
 		/// Test whether a specified node is visible in the logical view of a TreeWalker
 		/// or NodeIterator. This function will be called by the implementation of TreeWalker
@@ -134,7 +134,7 @@ public:
 		/// logic.)
 		///
 		/// Returns FILTER_ACCEPT, FILTER_REJECT or FILTER_SKIP.
-		
+
 protected:
 	virtual ~NodeFilter();
 };
diff --git a/XML/include/Poco/DOM/NodeIterator.h b/XML/include/Poco/DOM/NodeIterator.h
index 1f8e9a063..a1997bcc1 100644
--- a/XML/include/Poco/DOM/NodeIterator.h
+++ b/XML/include/Poco/DOM/NodeIterator.h
@@ -48,13 +48,13 @@ class XML_API NodeIterator
 public:
 	NodeIterator(Node* root, unsigned long whatToShow, NodeFilter* pFilter = 0);
 		/// Creates a NodeIterator over the subtree rooted at the specified node.
-		
+
 	NodeIterator(const NodeIterator& iterator);
 		/// Creates a NodeIterator by copying another NodeIterator.
-		
+
 	NodeIterator& operator = (const NodeIterator& iterator);
 		/// Assignment operator.
-		
+
 	~NodeIterator();
 		/// Destroys the NodeIterator.
 
@@ -62,10 +62,10 @@ public:
 		/// The root node of the NodeIterator, as specified when it was created.
 
 	unsigned long whatToShow() const;
-		/// This attribute determines which node types are presented via the iterator. 
-		/// The available set of constants is defined in the NodeFilter interface. 
-		/// Nodes not accepted by whatToShow will be skipped, but their children may 
-		/// still be considered. Note that this skip takes precedence over the filter, 
+		/// This attribute determines which node types are presented via the iterator.
+		/// The available set of constants is defined in the NodeFilter interface.
+		/// Nodes not accepted by whatToShow will be skipped, but their children may
+		/// still be considered. Note that this skip takes precedence over the filter,
 		/// if any.
 
 	NodeFilter* filter() const;
@@ -78,7 +78,7 @@ public:
 		/// and the filter. Also note that this is currently the only situation where
 		/// NodeIterators may reject a complete subtree rather than skipping individual
 		/// nodes.
-		/// 
+		///
 		/// To produce a view of the document that has entity references expanded and
 		/// does not expose the entity reference node itself, use the whatToShow flags
 		/// to hide the entity reference node and set expandEntityReferences to true
@@ -120,7 +120,7 @@ protected:
 
 private:
 	NodeIterator();
-	
+
 	Node*         _pRoot;
 	unsigned long _whatToShow;
 	NodeFilter*   _pFilter;
diff --git a/XML/include/Poco/DOM/NodeList.h b/XML/include/Poco/DOM/NodeList.h
index 1f8c12f4c..db7e86d6a 100644
--- a/XML/include/Poco/DOM/NodeList.h
+++ b/XML/include/Poco/DOM/NodeList.h
@@ -34,10 +34,10 @@ class XML_API NodeList: public DOMObject
 	/// collection of nodes, without defining or constraining how this
 	/// collection is implemented.
 	///
-	/// The items in the NodeList are accessible via an integral index, 
+	/// The items in the NodeList are accessible via an integral index,
 	/// starting from 0.
 	///
-	/// A NodeList returned from a method must be released with a call to 
+	/// A NodeList returned from a method must be released with a call to
 	/// release() when no longer needed.
 {
 public:
@@ -49,7 +49,7 @@ public:
 	virtual unsigned long length() const = 0;
 		/// Returns the number of nodes in the list. The range of valid
 		/// node indices is 0 to length - 1 inclusive.
-	
+
 protected:
 	virtual ~NodeList();
 };
diff --git a/XML/include/Poco/DOM/Notation.h b/XML/include/Poco/DOM/Notation.h
index c9824b0e0..9506da811 100644
--- a/XML/include/Poco/DOM/Notation.h
+++ b/XML/include/Poco/DOM/Notation.h
@@ -30,15 +30,15 @@ namespace XML {
 class XML_API Notation: public AbstractNode
 	/// This interface represents a notation declared in the DTD. A notation either
 	/// declares, by name, the format of an unparsed entity (see section 4.7 of
-	/// the XML 1.0 specification <http://www.w3.org/TR/2004/REC-xml-20040204/>), 
+	/// the XML 1.0 specification <http://www.w3.org/TR/2004/REC-xml-20040204/>),
 	/// or is used for formal declaration of processing
 	/// instruction targets (see section 2.6 of the XML 1.0 specification).
 	/// The nodeName attribute inherited from Node is set to the declared name of
 	/// the notation.
-	/// 
+	///
 	/// The DOM Level 1 does not support editing Notation nodes; they are therefore
 	/// readonly.
-	/// 
+	///
 	/// A Notation node does not have any parent.
 {
 public:
@@ -60,14 +60,14 @@ protected:
 	Notation(Document* pOwnerDocument, const XMLString& name, const XMLString& publicId, const XMLString& systemId);
 	Notation(Document* pOwnerDocument, const Notation& notation);
 	~Notation();
-	
+
 	Node* copyNode(bool deep, Document* pOwnerDocument) const;
 
 private:
 	XMLString _name;
 	XMLString _publicId;
 	XMLString _systemId;
-	
+
 	friend class Document;
 };
 
diff --git a/XML/include/Poco/DOM/ProcessingInstruction.h b/XML/include/Poco/DOM/ProcessingInstruction.h
index ab600ca95..76b7467d3 100644
--- a/XML/include/Poco/DOM/ProcessingInstruction.h
+++ b/XML/include/Poco/DOM/ProcessingInstruction.h
@@ -39,12 +39,12 @@ public:
 		/// the markup that begins the processing instruction.
 
 	const XMLString& data() const;
-		/// Returns the content of this processing instruction. This is from the first non 
+		/// Returns the content of this processing instruction. This is from the first non
 		/// white space character after the target to the character immediately preceding
 		/// the ?>.
 
 	const XMLString& getData() const;
-		/// Returns the content of this processing instruction. This is from the first non 
+		/// Returns the content of this processing instruction. This is from the first non
 		/// white space character after the target to the character immediately preceding
 		/// the ?>.
 
@@ -67,7 +67,7 @@ protected:
 private:
 	XMLString _target;
 	XMLString _data;
-	
+
 	friend class Document;
 };
 
diff --git a/XML/include/Poco/DOM/Text.h b/XML/include/Poco/DOM/Text.h
index 3a7931a8b..867414baa 100644
--- a/XML/include/Poco/DOM/Text.h
+++ b/XML/include/Poco/DOM/Text.h
@@ -34,7 +34,7 @@ class XML_API Text: public CharacterData
 	/// object implementing the Text interface that is the only child of the element.
 	/// If there is markup, it is parsed into the information items (elements, comments,
 	/// etc.) and Text nodes that form the list of children of the element.
-	/// 
+	///
 	/// When a document is first made available via the DOM, there is only one Text
 	/// node for each block of text. Users may create adjacent Text nodes that represent
 	/// the contents of a given element without any intervening markup, but should
@@ -68,7 +68,7 @@ protected:
 
 private:
 	static const XMLString NODE_NAME;
-	
+
 	friend class Document;
 };
 
diff --git a/XML/include/Poco/DOM/TreeWalker.h b/XML/include/Poco/DOM/TreeWalker.h
index 884b37d3c..738c61ea4 100644
--- a/XML/include/Poco/DOM/TreeWalker.h
+++ b/XML/include/Poco/DOM/TreeWalker.h
@@ -35,7 +35,7 @@ class XML_API TreeWalker
 	/// the view of the document defined by their whatToShow flags and filter (if
 	/// any). Any function which performs navigation using a TreeWalker will automatically
 	/// support any view defined by a TreeWalker.
-	/// 
+	///
 	/// Omitting nodes from the logical view of a subtree can result in a structure
 	/// that is substantially different from the same subtree in the complete, unfiltered
 	/// document. Nodes that are siblings in the TreeWalker view may be children
@@ -50,22 +50,22 @@ class XML_API TreeWalker
 	/// Unlike most other DOM classes, TreeWalker supports value semantics.
 	///
 	/// If the TreeWalker's current node is removed from the document, the
-	/// result of calling any of the movement methods is undefined. This behavior 
+	/// result of calling any of the movement methods is undefined. This behavior
 	/// does not conform to the DOM Level 2 Traversal specification.
 {
 public:
 	TreeWalker(Node* root, unsigned long whatToShow, NodeFilter* pFilter = 0);
 		/// Creates a TreeWalker over the subtree rooted at the specified node.
-		
+
 	TreeWalker(const TreeWalker& walker);
 		/// Creates a TreeWalker by copying another TreeWalker.
-		
+
 	TreeWalker& operator = (const TreeWalker& walker);
 		/// Assignment operator.
-	
+
 	~TreeWalker();
 		/// Destroys the TreeWalker.
-	
+
 	Node* root() const;
 		/// The root node of the TreeWalker, as specified when it was created.
 
@@ -86,7 +86,7 @@ public:
 		/// and the filter. Also note that this is currently the only situation where
 		/// NodeIterators may reject a complete subtree rather than skipping individual
 		/// nodes.
-		/// 
+		///
 		/// To produce a view of the document that has entity references expanded and
 		/// does not expose the entity reference node itself, use the whatToShow flags
 		/// to hide the entity reference node and set expandEntityReferences to true
@@ -109,7 +109,7 @@ public:
 
 	Node* getCurrentNode() const;
 		/// See currentNode().
-		
+
 	void setCurrentNode(Node* pNode);
 		/// Sets the current node.
 
@@ -158,7 +158,7 @@ protected:
 
 private:
 	TreeWalker();
-	
+
 	Node*         _pRoot;
 	unsigned long _whatToShow;
 	NodeFilter*   _pFilter;
diff --git a/XML/include/Poco/SAX/Attributes.h b/XML/include/Poco/SAX/Attributes.h
index d7ba9129e..4b2328170 100644
--- a/XML/include/Poco/SAX/Attributes.h
+++ b/XML/include/Poco/SAX/Attributes.h
@@ -29,24 +29,24 @@ namespace XML {
 class XML_API Attributes
 	/// Interface for a list of XML attributes.
 	/// This interface allows access to a list of attributes in three different ways:
-	///   1.by attribute index; 
-	///   2.by Namespace-qualified name; or 
-	///   3.by qualified (prefixed) name. 
-	/// 
-	/// The list will not contain attributes that were declared #IMPLIED but not 
+	///   1.by attribute index;
+	///   2.by Namespace-qualified name; or
+	///   3.by qualified (prefixed) name.
+	///
+	/// The list will not contain attributes that were declared #IMPLIED but not
 	/// specified in the start tag. It will also not contain
-	/// attributes used as Namespace declarations (xmlns*) unless the 
+	/// attributes used as Namespace declarations (xmlns*) unless the
 	/// http://xml.org/sax/features/namespace-prefixes
 	/// feature is set to true (it is false by default).
-	/// 
-	/// If the namespace-prefixes feature (see above) is false, access by 
+	///
+	/// If the namespace-prefixes feature (see above) is false, access by
 	/// qualified name may not be available; if the
-	/// http://xml.org/sax/features/namespaces feature is false, access by 
+	/// http://xml.org/sax/features/namespaces feature is false, access by
 	/// Namespace-qualified names may not be available.
-	/// This interface replaces the now-deprecated SAX1 AttributeList interface, 
+	/// This interface replaces the now-deprecated SAX1 AttributeList interface,
 	/// which does not contain Namespace support. In
 	/// addition to Namespace support, it adds the getIndex methods (below).
-	/// The order of attributes in the list is unspecified, and will vary from 
+	/// The order of attributes in the list is unspecified, and will vary from
 	/// implementation to implementation.
 {
 public:
@@ -60,7 +60,7 @@ public:
 		/// Return the number of attributes in the list.
 		///
 		/// Once you know the number of attributes, you can iterate through the list.
-		
+
 	virtual const XMLString& getLocalName(int i) const = 0;
 		/// Look up a local attribute name by index.
 
@@ -70,14 +70,14 @@ public:
 	virtual const XMLString& getType(int i) const = 0;
 		/// Look up an attribute type by index.
 		///
-		/// The attribute type is one of the strings "CDATA", "ID", "IDREF", "IDREFS", "NMTOKEN", 
+		/// The attribute type is one of the strings "CDATA", "ID", "IDREF", "IDREFS", "NMTOKEN",
 		/// "NMTOKENS", "ENTITY", "ENTITIES", or "NOTATION" (always in upper case).
 		///
-		/// If the parser has not read a declaration for the attribute, or if the parser does not 
-		/// report attribute types, then it must return the value "CDATA" as stated in the XML 1.0 
+		/// If the parser has not read a declaration for the attribute, or if the parser does not
+		/// report attribute types, then it must return the value "CDATA" as stated in the XML 1.0
 		/// Recommendation (clause 3.3.3, "Attribute-Value Normalization").
-		/// 
-		/// For an enumerated attribute that is not a notation, the parser will report the type 
+		///
+		/// For an enumerated attribute that is not a notation, the parser will report the type
 		/// as "NMTOKEN".
 
 	virtual const XMLString& getType(const XMLString& qname) const = 0;
@@ -93,7 +93,7 @@ public:
 	virtual const XMLString& getValue(int i) const = 0;
 		/// Look up an attribute value by index.
 		///
-		/// If the attribute value is a list of tokens (IDREFS, ENTITIES, or NMTOKENS), the tokens 
+		/// If the attribute value is a list of tokens (IDREFS, ENTITIES, or NMTOKENS), the tokens
 		/// will be concatenated into a single string with each token separated by a single space.
 
 	virtual const XMLString& getValue(const XMLString& qname) const = 0;
diff --git a/XML/include/Poco/SAX/AttributesImpl.h b/XML/include/Poco/SAX/AttributesImpl.h
index 13dcf03da..5a2a97997 100644
--- a/XML/include/Poco/SAX/AttributesImpl.h
+++ b/XML/include/Poco/SAX/AttributesImpl.h
@@ -28,9 +28,9 @@ namespace XML {
 
 
 class XML_API AttributesImpl: public Attributes
-	/// This class provides a default implementation of the SAX2 Attributes interface, 
+	/// This class provides a default implementation of the SAX2 Attributes interface,
 	/// with the addition of manipulators so that the list can be modified or reused.
-	/// 
+	///
 	/// There are two typical uses of this class:
 	///     1. to take a persistent snapshot of an Attributes object in a startElement event; or
 	///     2. to construct or modify an Attributes object in a SAX2 driver or filter.
@@ -50,7 +50,7 @@ public:
 
 	AttributesImpl();
 		/// Creates the AttributesImpl.
-		
+
 	AttributesImpl(const Attributes& attributes);
 		/// Creates the AttributesImpl by copying another one.
 
@@ -134,7 +134,7 @@ public:
 
 	void clear();
 		/// Removes all attributes.
-		
+
 	void reserve(std::size_t capacity);
 		/// Reserves capacity in the internal vector.
 
@@ -152,11 +152,11 @@ public:
 
 	iterator begin() const;
 		/// Iterator support.
-		
+
 	iterator end() const;
 		/// Iterator support.
 
-protected:	
+protected:
 	Attribute* find(const XMLString& qname) const;
 	Attribute* find(const XMLString& namespaceURI, const XMLString& localName) const;
 
diff --git a/XML/include/Poco/SAX/ContentHandler.h b/XML/include/Poco/SAX/ContentHandler.h
index 58f2a253a..b92978170 100644
--- a/XML/include/Poco/SAX/ContentHandler.h
+++ b/XML/include/Poco/SAX/ContentHandler.h
@@ -31,20 +31,20 @@ class Attributes;
 
 
 class XML_API ContentHandler
-	/// Receive notification of the logical content of a document. 
+	/// Receive notification of the logical content of a document.
 	///
 	/// This is the main interface that most SAX applications implement: if the
 	/// application needs to be informed of basic parsing events, it implements
 	/// this interface and registers an instance with the SAX parser using the setContentHandler
 	/// method. The parser uses the instance to report basic document-related events
 	/// like the start and end of elements and character data.
-	/// 
+	///
 	/// The order of events in this interface is very important, and mirrors the
 	/// order of information in the document itself. For example, all of an element's
 	/// content (character data, processing instructions, and/or subelements) will
 	/// appear, in order, between the startElement event and the corresponding endElement
 	/// event.
-	/// 
+	///
 	/// This interface is similar to the now-deprecated SAX 1.0 DocumentHandler
 	/// interface, but it adds support for Namespaces and for reporting skipped
 	/// entities (in non-validating XML processors).
@@ -53,19 +53,19 @@ class XML_API ContentHandler
 public:
 	virtual void setDocumentLocator(const Locator* loc) = 0;
 		/// Receive an object for locating the origin of SAX document events.
-		/// 
+		///
 		/// SAX parsers are strongly encouraged (though not absolutely required) to
 		/// supply a locator: if it does so, it must supply the locator to the application
 		/// by invoking this method before invoking any of the other methods in the
 		/// ContentHandler interface.
-		/// 
+		///
 		/// The locator allows the application to determine the end position of any
 		/// document-related event, even if the parser is not reporting an error. Typically,
 		/// the application will use this information for reporting its own errors (such
 		/// as character content that does not match an application's business rules).
 		/// The information returned by the locator is probably not sufficient for use
 		/// with a search engine.
-		/// 
+		///
 		/// Note that the locator will return correct information only during the invocation
 		/// SAX event callbacks after startDocument returns and before endDocument is
 		/// called. The application should not attempt to use it at any other time.
@@ -73,7 +73,7 @@ public:
 	virtual void startDocument() = 0;
 		/// Receive notification of the beginning of a document.
 		///
-		/// The SAX parser calls this function one time before calling all other 
+		/// The SAX parser calls this function one time before calling all other
 		/// functions of this class (except SetDocumentLocator).
 
 	virtual void endDocument() = 0;
@@ -86,18 +86,18 @@ public:
 
 	virtual void startElement(const XMLString& uri, const XMLString& localName, const XMLString& qname, const Attributes& attrList) = 0;
 		/// Receive notification of the beginning of an element.
-		/// 
+		///
 		/// The Parser will invoke this method at the beginning of every element in
 		/// the XML document; there will be a corresponding endElement event for every
 		/// startElement event (even when the element is empty). All of the element's
 		/// content will be reported, in order, before the corresponding endElement
 		/// event.
-		/// 
+		///
 		/// This event allows up to three name components for each element:
 		///    1. the Namespace URI;
 		///    2. the local name; and
 		///    3. the qualified (prefixed) name.
-		/// 
+		///
 		/// Any or all of these may be provided, depending on the values of the http://xml.org/sax/features/namespaces
 		/// and the http://xml.org/sax/features/namespace-prefixes properties:
 		///     * the Namespace URI and local name are required when the namespaces
@@ -106,38 +106,38 @@ public:
 		///     * the qualified name is required when the namespace-prefixes property
 		///       is true, and is optional when the namespace-prefixes property is false (the
 		///       default).
-		/// 
+		///
 		/// Note that the attribute list provided will contain only attributes with
 		/// explicit values (specified or defaulted): #IMPLIED attributes will be omitted.
 		/// The attribute list will contain attributes used for Namespace declarations
 		/// (xmlns* attributes) only if the http://xml.org/sax/features/namespace-prefixes
 		/// property is true (it is false by default, and support for a true value is
 		/// optional).
-		/// 
+		///
 		/// Like characters(), attribute values may have characters that need more than
 		/// one char value.
 
 	virtual void endElement(const XMLString& uri, const XMLString& localName, const XMLString& qname) = 0;
 		/// Receive notification of the end of an element.
-		/// 
+		///
 		/// The SAX parser will invoke this method at the end of every element in the
 		/// XML document; there will be a corresponding startElement event for every
 		/// endElement event (even when the element is empty).
-		/// 
+		///
 		/// For information on the names, see startElement.
 
 	virtual void characters(const XMLChar ch[], int start, int length) = 0;
 		/// Receive notification of character data.
-		/// 
+		///
 		/// The Parser will call this method to report each chunk of character data.
 		/// SAX parsers may return all contiguous character data in a single chunk,
 		/// or they may split it into several chunks; however, all of the characters
 		/// in any single event must come from the same external entity so that the
 		/// Locator provides useful information.
-		/// 
+		///
 		/// The application must not attempt to read from the array outside of the specified
 		/// range.
-		/// 
+		///
 		/// Individual characters may consist of more than one XMLChar value. There
 		/// are three important cases where this happens, because characters can't be
 		/// represented in just sixteen bits. In one case, characters are represented
@@ -146,72 +146,72 @@ public:
 		/// case involves composite characters, such as a base character combining with
 		/// one or more accent characters. And most important, if XMLChar is a plain
 		/// char, characters are encoded in UTF-8.
-		/// 
+		///
 		/// Your code should not assume that algorithms using char-at-a-time idioms
 		/// will be working in character units; in some cases they will split characters.
 		/// This is relevant wherever XML permits arbitrary characters, such as attribute
 		/// values, processing instruction data, and comments as well as in data reported
 		/// from this method. It's also generally relevant whenever C++ code manipulates
 		/// internationalized text; the issue isn't unique to XML.
-		/// 
+		///
 		/// Note that some parsers will report whitespace in element content using the
 		/// ignorableWhitespace method rather than this one (validating parsers must
 		/// do so).
 
 	virtual void ignorableWhitespace(const XMLChar ch[], int start, int length) = 0;
 		/// Receive notification of ignorable whitespace in element content.
-		/// 
+		///
 		/// Validating Parsers must use this method to report each chunk of whitespace
 		/// in element content (see the W3C XML 1.0 recommendation, section 2.10): non-validating
 		/// parsers may also use this method if they are capable of parsing and using
 		/// content models.
-		/// 
+		///
 		/// SAX parsers may return all contiguous whitespace in a single chunk, or they
 		/// may split it into several chunks; however, all of the characters in any
 		/// single event must come from the same external entity, so that the Locator
 		/// provides useful information.
-		/// 
+		///
 		/// The application must not attempt to read from the array outside of the specified
 		/// range.
 
 	virtual void processingInstruction(const XMLString& target, const XMLString& data) = 0;
 		/// Receive notification of a processing instruction.
-		/// 
+		///
 		/// The Parser will invoke this method once for each processing instruction
 		/// found: note that processing instructions may occur before or after the main
 		/// document element.
-		/// 
+		///
 		/// A SAX parser must never report an XML declaration (XML 1.0, section 2.8)
 		/// or a text declaration (XML 1.0, section 4.3.1) using this method.
-		/// 
+		///
 		/// Like characters(), processing instruction data may have characters that
 		/// need more than one char value.
 
 	virtual void startPrefixMapping(const XMLString& prefix, const XMLString& uri) = 0;
 		/// Begin the scope of a prefix-URI Namespace mapping.
-		/// 
+		///
 		/// The information from this event is not necessary for normal Namespace processing:
 		/// the SAX XML reader will automatically replace prefixes for element and attribute
 		/// names when the http://xml.org/sax/features/namespaces feature is true (the
 		/// default).
-		/// 
+		///
 		/// There are cases, however, when applications need to use prefixes in character
 		/// data or in attribute values, where they cannot safely be expanded automatically;
 		/// the start/endPrefixMapping event supplies the information to the application
 		/// to expand prefixes in those contexts itself, if necessary.
-		/// 
+		///
 		/// Note that start/endPrefixMapping events are not guaranteed to be properly
 		/// nested relative to each other: all startPrefixMapping events will occur
 		/// immediately before the corresponding startElement event, and all endPrefixMapping
 		/// events will occur immediately after the corresponding endElement event,
 		/// but their order is not otherwise guaranteed.
-		/// 
+		///
 		/// There should never be start/endPrefixMapping events for the "xml" prefix,
 		/// since it is predeclared and immutable.
 
 	virtual void endPrefixMapping(const XMLString& prefix) = 0;
 		/// End the scope of a prefix-URI mapping.
-		/// 
+		///
 		/// See startPrefixMapping for details. These events will always occur immediately
 		/// after the corresponding endElement event, but the order of endPrefixMapping
 		/// events is not otherwise guaranteed.
@@ -222,7 +222,7 @@ public:
 		/// declarations. (The XML recommendation requires reporting skipped external
 		/// entities. SAX also reports internal entity expansion/non-expansion, except
 		/// within markup constructs.)
-		/// 
+		///
 		/// The Parser will invoke this method each time the entity is skipped. Non-validating
 		/// processors may skip entities if they have not seen the declarations (because,
 		/// for example, the entity was declared in an external DTD subset). All processors
diff --git a/XML/include/Poco/SAX/DTDHandler.h b/XML/include/Poco/SAX/DTDHandler.h
index f21a299c8..d40ba2ea1 100644
--- a/XML/include/Poco/SAX/DTDHandler.h
+++ b/XML/include/Poco/SAX/DTDHandler.h
@@ -27,52 +27,52 @@ namespace XML {
 
 
 class XML_API DTDHandler
-	/// If a SAX application needs information about notations and unparsed entities, 
-	/// then the application implements this interface and registers an instance with the 
-	/// SAX parser using the parser's setDTDHandler method. The parser uses the instance 
+	/// If a SAX application needs information about notations and unparsed entities,
+	/// then the application implements this interface and registers an instance with the
+	/// SAX parser using the parser's setDTDHandler method. The parser uses the instance
 	/// to report notation and unparsed entity declarations to the application.
 	///
-	/// Note that this interface includes only those DTD events that the XML recommendation 
+	/// Note that this interface includes only those DTD events that the XML recommendation
 	/// requires processors to report: notation and unparsed entity declarations.
 	///
-	/// The SAX parser may report these events in any order, regardless of the order in 
-	/// which the notations and unparsed entities were declared; however, all DTD events 
-	/// must be reported after the document handler's startDocument event, and before the first 
+	/// The SAX parser may report these events in any order, regardless of the order in
+	/// which the notations and unparsed entities were declared; however, all DTD events
+	/// must be reported after the document handler's startDocument event, and before the first
 	/// startElement event. (If the LexicalHandler is used, these events must also be reported before the endDTD event.)
-	/// 
-	/// It is up to the application to store the information for future use (perhaps in a hash table or 
-	/// object tree). If the application encounters attributes of type "NOTATION", "ENTITY", or "ENTITIES", 
+	///
+	/// It is up to the application to store the information for future use (perhaps in a hash table or
+	/// object tree). If the application encounters attributes of type "NOTATION", "ENTITY", or "ENTITIES",
 	/// it can use the information that it obtained through this interface to find the entity and/or notation
 	/// corresponding with the attribute value.
 {
 public:
 	virtual void notationDecl(const XMLString& name, const XMLString* publicId, const XMLString* systemId) = 0;
 		/// Receive notification of a notation declaration event.
-		/// 
-		/// It is up to the application to record the notation for later reference, 
-		/// if necessary; notations may appear as attribute values and in unparsed 
-		/// entity declarations, and are sometime used with processing instruction 
+		///
+		/// It is up to the application to record the notation for later reference,
+		/// if necessary; notations may appear as attribute values and in unparsed
+		/// entity declarations, and are sometime used with processing instruction
 		/// target names.
-		/// 
-		/// At least one of publicId and systemId must be non-null. If a system identifier 
-		/// is present, and it is a URL, the SAX parser must resolve it fully before passing 
+		///
+		/// At least one of publicId and systemId must be non-null. If a system identifier
+		/// is present, and it is a URL, the SAX parser must resolve it fully before passing
 		/// it to the application through this event.
-		/// 
-		/// There is no guarantee that the notation declaration will be reported before any 
+		///
+		/// There is no guarantee that the notation declaration will be reported before any
 		/// unparsed entities that use it.
 		///
 		/// Note that publicId and systemId maybe null, therefore we pass a pointer rather than a reference.
-		
+
 	virtual void unparsedEntityDecl(const XMLString& name, const XMLString* publicId, const XMLString& systemId, const XMLString& notationName) = 0;
 		/// Receive notification of an unparsed entity declaration event.
-		/// 
-		/// Note that the notation name corresponds to a notation reported by the 
-		/// notationDecl event. It is up to the application to record the entity for 
+		///
+		/// Note that the notation name corresponds to a notation reported by the
+		/// notationDecl event. It is up to the application to record the entity for
 		/// later reference, if necessary; unparsed entities may appear as attribute values.
-		/// 
-		/// If the system identifier is a URL, the parser must resolve it fully before 
+		///
+		/// If the system identifier is a URL, the parser must resolve it fully before
 		/// passing it to the application.
-		/// 
+		///
 		/// Note that publicId maybe null, therefore we pass a pointer rather than a reference.
 
 protected:
diff --git a/XML/include/Poco/SAX/DeclHandler.h b/XML/include/Poco/SAX/DeclHandler.h
index 578f10275..c842a8afa 100644
--- a/XML/include/Poco/SAX/DeclHandler.h
+++ b/XML/include/Poco/SAX/DeclHandler.h
@@ -27,57 +27,57 @@ namespace XML {
 
 
 class XML_API DeclHandler
-	/// This is an optional extension handler for SAX2 to provide information 
+	/// This is an optional extension handler for SAX2 to provide information
 	/// about DTD declarations in an XML document. XML
-	/// readers are not required to support this handler, and this handler is 
+	/// readers are not required to support this handler, and this handler is
 	/// not included in the core SAX2 distribution.
 	///
-	/// Note that data-related DTD declarations (unparsed entities and notations) 
+	/// Note that data-related DTD declarations (unparsed entities and notations)
 	/// are already reported through the DTDHandler interface.
-	/// If you are using the declaration handler together with a lexical handler, 
+	/// If you are using the declaration handler together with a lexical handler,
 	/// all of the events will occur between the startDTD and the endDTD events.
-	/// To set the DeclHandler for an XML reader, use the setProperty method 
-	/// with the propertyId "http://xml.org/sax/properties/declaration-handler". 
+	/// To set the DeclHandler for an XML reader, use the setProperty method
+	/// with the propertyId "http://xml.org/sax/properties/declaration-handler".
 	/// If the reader does not support declaration events, it will throw a
-	/// SAXNotRecognizedException or a SAXNotSupportedException when you attempt to 
+	/// SAXNotRecognizedException or a SAXNotSupportedException when you attempt to
 	/// register the handler.
 {
 public:
 	virtual void attributeDecl(const XMLString& eName, const XMLString& aName, const XMLString* valueDefault, const XMLString* value) = 0;
 		/// Report an attribute type declaration.
-		/// 
-		/// Only the effective (first) declaration for an attribute will be reported. 
-		/// The type will be one of the strings "CDATA", "ID", "IDREF", "IDREFS", 
-		/// "NMTOKEN", "NMTOKENS", "ENTITY", "ENTITIES", a parenthesized token group 
-		/// with the separator "|" and all whitespace removed, or the word "NOTATION" 
-		/// followed by a space followed by a parenthesized token group with all whitespace 
+		///
+		/// Only the effective (first) declaration for an attribute will be reported.
+		/// The type will be one of the strings "CDATA", "ID", "IDREF", "IDREFS",
+		/// "NMTOKEN", "NMTOKENS", "ENTITY", "ENTITIES", a parenthesized token group
+		/// with the separator "|" and all whitespace removed, or the word "NOTATION"
+		/// followed by a space followed by a parenthesized token group with all whitespace
 		/// removed.
 		///
-		/// The value will be the value as reported to applications, appropriately normalized 
-		/// and with entity and character references expanded. 
-		
+		/// The value will be the value as reported to applications, appropriately normalized
+		/// and with entity and character references expanded.
+
 	virtual void elementDecl(const XMLString& name, const XMLString& model) = 0;
 		/// Report an element type declaration.
 		///
-		/// The content model will consist of the string "EMPTY", the string "ANY", or a 
-		/// parenthesised group, optionally followed by an occurrence indicator. The model 
-		/// will be normalized so that all parameter entities are fully resolved and all 
-		/// whitespace is removed,and will include the enclosing parentheses. Other 
-		/// normalization (such as removing redundant parentheses or simplifying occurrence 
+		/// The content model will consist of the string "EMPTY", the string "ANY", or a
+		/// parenthesised group, optionally followed by an occurrence indicator. The model
+		/// will be normalized so that all parameter entities are fully resolved and all
+		/// whitespace is removed,and will include the enclosing parentheses. Other
+		/// normalization (such as removing redundant parentheses or simplifying occurrence
 		/// indicators) is at the discretion of the parser.
-		
+
 	virtual void externalEntityDecl(const XMLString& name, const XMLString* publicId, const XMLString& systemId) = 0;
 		/// Report an external entity declaration.
-		/// 
+		///
 		/// Only the effective (first) declaration for each entity will be reported.
-		/// 
-		/// If the system identifier is a URL, the parser must resolve it fully before 
+		///
+		/// If the system identifier is a URL, the parser must resolve it fully before
 		/// passing it to the application.
 
 	virtual void internalEntityDecl(const XMLString& name, const XMLString& value) = 0;
 		/// Report an internal entity declaration.
 		///
-		/// Only the effective (first) declaration for each entity will be reported. All 
+		/// Only the effective (first) declaration for each entity will be reported. All
 		/// parameter entities in the value will be expanded, but general entities will not.
 
 protected:
diff --git a/XML/include/Poco/SAX/DefaultHandler.h b/XML/include/Poco/SAX/DefaultHandler.h
index 7df1f5479..5043e0734 100644
--- a/XML/include/Poco/SAX/DefaultHandler.h
+++ b/XML/include/Poco/SAX/DefaultHandler.h
@@ -30,29 +30,29 @@ namespace XML {
 
 
 class XML_API DefaultHandler: public EntityResolver, public DTDHandler, public ContentHandler, public ErrorHandler
-	/// Default base class for SAX2 event handlers. 
-	/// This class is available as a convenience base class for SAX2 applications: 
+	/// Default base class for SAX2 event handlers.
+	/// This class is available as a convenience base class for SAX2 applications:
 	/// it provides default implementations for all of the
 	/// callbacks in the four core SAX2 handler classes:
-	///      * EntityResolver 
-	///      * DTDHandler 
-	///      * ContentHandler 
-	///      * ErrorHandler 
-	/// Application writers can extend this class when they need to implement only 
+	///      * EntityResolver
+	///      * DTDHandler
+	///      * ContentHandler
+	///      * ErrorHandler
+	/// Application writers can extend this class when they need to implement only
 	/// part of an interface; parser writers can instantiate this
 	/// class to provide default handlers when the application has not supplied its own.
 {
 public:
 	DefaultHandler();
 		/// Creates the DefaultHandler.
-		
+
 	~DefaultHandler();
 		/// Destroys the DefaultHandler.
-	
+
 	// EntityResolver
 	InputSource* resolveEntity(const XMLString* publicId, const XMLString& systemId);
 	void releaseInputSource(InputSource* pSource);
-	
+
 	// DTDHandler
 	void notationDecl(const XMLString& name, const XMLString* publicId, const XMLString* systemId);
 	void unparsedEntityDecl(const XMLString& name, const XMLString* publicId, const XMLString& systemId, const XMLString& notationName);
@@ -69,7 +69,7 @@ public:
 	void startPrefixMapping(const XMLString& prefix, const XMLString& uri);
 	void endPrefixMapping(const XMLString& prefix);
 	void skippedEntity(const XMLString& name);
-	
+
 	// ErrorHandler
 	void warning(const SAXException& exc);
 	void error(const SAXException& exc);
diff --git a/XML/include/Poco/SAX/EntityResolver.h b/XML/include/Poco/SAX/EntityResolver.h
index 3387ecfca..fc992727a 100644
--- a/XML/include/Poco/SAX/EntityResolver.h
+++ b/XML/include/Poco/SAX/EntityResolver.h
@@ -30,44 +30,44 @@ class InputSource;
 
 
 class XML_API EntityResolver
-	/// If a SAX application needs to implement customized handling for external entities, 
-	/// it must implement this interface and register an instance with the SAX driver using 
+	/// If a SAX application needs to implement customized handling for external entities,
+	/// it must implement this interface and register an instance with the SAX driver using
 	/// the setEntityResolver method.
-	/// 
-	/// The XML reader will then allow the application to intercept any external entities 
-	/// (including the external DTD subset and external parameter entities, if any) before 
+	///
+	/// The XML reader will then allow the application to intercept any external entities
+	/// (including the external DTD subset and external parameter entities, if any) before
 	/// including them.
-	/// 
-	/// Many SAX applications will not need to implement this interface, but it will be 
-	/// especially useful for applications that build XML documents from databases or other 
+	///
+	/// Many SAX applications will not need to implement this interface, but it will be
+	/// especially useful for applications that build XML documents from databases or other
 	/// specialised input sources, or for applications that use URI types other than URLs.
 	///
-	/// The application can also use this interface to redirect system identifiers to local 
+	/// The application can also use this interface to redirect system identifiers to local
 	/// URIs or to look up replacements in a catalog (possibly by using the public identifier).
 {
 public:
 	virtual InputSource* resolveEntity(const XMLString* publicId, const XMLString& systemId) = 0;
 		/// Allow the application to resolve external entities.
-		/// 
-		/// The parser will call this method before opening any external entity except the 
-		/// top-level document entity. Such entities include the external DTD subset and 
-		/// external parameter entities referenced within the DTD (in either case, only 
-		/// if the parser reads external parameter entities), and external general entities 
-		/// referenced within the document element (if the parser reads external general entities). 
-		/// The application may request that the parser locate the entity itself, that it use an 
-		/// alternative URI, or that it use data provided by the application (as a character or 
+		///
+		/// The parser will call this method before opening any external entity except the
+		/// top-level document entity. Such entities include the external DTD subset and
+		/// external parameter entities referenced within the DTD (in either case, only
+		/// if the parser reads external parameter entities), and external general entities
+		/// referenced within the document element (if the parser reads external general entities).
+		/// The application may request that the parser locate the entity itself, that it use an
+		/// alternative URI, or that it use data provided by the application (as a character or
 		/// byte input stream).
-		/// 
-		/// Application writers can use this method to redirect external system identifiers to 
-		/// secure and/or local URIs, to look up public identifiers in a catalogue, or to read an 
-		/// entity from a database or other input source (including, for example, a dialog box). 
-		/// Neither XML nor SAX specifies a preferred policy for using public or system IDs to resolve 
-		/// resources. However, SAX specifies how to interpret any InputSource returned by this method, 
+		///
+		/// Application writers can use this method to redirect external system identifiers to
+		/// secure and/or local URIs, to look up public identifiers in a catalogue, or to read an
+		/// entity from a database or other input source (including, for example, a dialog box).
+		/// Neither XML nor SAX specifies a preferred policy for using public or system IDs to resolve
+		/// resources. However, SAX specifies how to interpret any InputSource returned by this method,
 		/// and that if none is returned, then the system ID will be dereferenced as a URL.
-		/// 
-		/// If the system identifier is a URL, the SAX parser must resolve it fully before reporting it to 
+		///
+		/// If the system identifier is a URL, the SAX parser must resolve it fully before reporting it to
 		/// the application.
-		/// 
+		///
 		/// Note that publicId maybe null, therefore we pass a pointer rather than a reference.
 
 	virtual void releaseInputSource(InputSource* pSource) = 0;
diff --git a/XML/include/Poco/SAX/EntityResolverImpl.h b/XML/include/Poco/SAX/EntityResolverImpl.h
index de088c64b..b96f7e156 100644
--- a/XML/include/Poco/SAX/EntityResolverImpl.h
+++ b/XML/include/Poco/SAX/EntityResolverImpl.h
@@ -43,31 +43,31 @@ public:
 	EntityResolverImpl();
 		/// Creates an EntityResolverImpl that uses the default
 		/// URIStreamOpener.
-		
+
 	EntityResolverImpl(const Poco::URIStreamOpener& opener);
 		/// Creates an EntityResolverImpl that uses the given
 		/// URIStreamOpener.
-		
+
 	~EntityResolverImpl();
 		/// Destroys the EntityResolverImpl.
-	
+
 	InputSource* resolveEntity(const XMLString* publicId, const XMLString& systemId);
 		/// Tries to use the URIStreamOpener to create and open an istream
 		/// for the given systemId, which is interpreted as an URI.
 		///
 		/// If the systemId is not a valid URI, it is interpreted as
 		/// a local filesystem path and a Poco::FileInputStream is opened for it.
-		
+
 	void releaseInputSource(InputSource* pSource);
 		/// Deletes the InputSource's stream.
-	
+
 protected:
-	std::istream* resolveSystemId(const XMLString& systemId);	
-	
+	std::istream* resolveSystemId(const XMLString& systemId);
+
 private:
 	EntityResolverImpl(const EntityResolverImpl&);
 	EntityResolverImpl& operator = (const EntityResolverImpl&);
-	
+
 	const Poco::URIStreamOpener& _opener;
 };
 
diff --git a/XML/include/Poco/SAX/ErrorHandler.h b/XML/include/Poco/SAX/ErrorHandler.h
index 3097e2007..78d3123e8 100644
--- a/XML/include/Poco/SAX/ErrorHandler.h
+++ b/XML/include/Poco/SAX/ErrorHandler.h
@@ -29,56 +29,56 @@ class SAXException;
 
 
 class XML_API ErrorHandler
-	/// If a SAX application needs to implement customized error handling, it must 
-	/// implement this interface and then register an instance with the XML reader 
-	/// using the setErrorHandler method. The parser will then report all errors and 
+	/// If a SAX application needs to implement customized error handling, it must
+	/// implement this interface and then register an instance with the XML reader
+	/// using the setErrorHandler method. The parser will then report all errors and
 	/// warnings through this interface.
-	/// 
-	/// WARNING: If an application does not register an ErrorHandler, XML parsing errors 
-	/// will go unreported, except that SAXParseExceptions will be thrown for fatal errors. 
-	/// In order to detect validity errors, an ErrorHandler that does something with error() 
+	///
+	/// WARNING: If an application does not register an ErrorHandler, XML parsing errors
+	/// will go unreported, except that SAXParseExceptions will be thrown for fatal errors.
+	/// In order to detect validity errors, an ErrorHandler that does something with error()
 	/// calls must be registered.
-	/// 
-	/// For XML processing errors, a SAX driver must use this interface in preference to 
-	/// throwing an exception: it is up to the application to decide whether to throw an 
-	/// exception for different types of errors and warnings. Note, however, that there is no 
-	/// requirement that the parser continue to report additional errors after a call to 
-	/// fatalError. In other words, a SAX driver class may throw an exception after reporting 
-	/// any fatalError. Also parsers may throw appropriate exceptions for non-XML errors. For 
-	/// example, XMLReader::parse() would throw an IOException for errors accessing entities or 
+	///
+	/// For XML processing errors, a SAX driver must use this interface in preference to
+	/// throwing an exception: it is up to the application to decide whether to throw an
+	/// exception for different types of errors and warnings. Note, however, that there is no
+	/// requirement that the parser continue to report additional errors after a call to
+	/// fatalError. In other words, a SAX driver class may throw an exception after reporting
+	/// any fatalError. Also parsers may throw appropriate exceptions for non-XML errors. For
+	/// example, XMLReader::parse() would throw an IOException for errors accessing entities or
 	/// the document.
 {
 public:
 	virtual void warning(const SAXException& exc) = 0;
 		/// Receive notification of a warning.
-		/// 
-		/// SAX parsers will use this method to report conditions that are not errors or fatal 
+		///
+		/// SAX parsers will use this method to report conditions that are not errors or fatal
 		/// errors as defined by the XML recommendation. The default behaviour is to take no action.
-		/// 
-		/// The SAX parser must continue to provide normal parsing events after invoking this method: 
+		///
+		/// The SAX parser must continue to provide normal parsing events after invoking this method:
 		/// it should still be possible for the application to process the document through to the end.
-		/// 
+		///
 		/// Filters may use this method to report other, non-XML warnings as well.
 
 	virtual void error(const SAXException& exc) = 0;
 		/// Receive notification of a recoverable error.
-		/// 
-		/// This corresponds to the definition of "error" in section 1.2 of the W3C XML 1.0 
-		/// Recommendation. For example, a validating parser would use this callback to report 
+		///
+		/// This corresponds to the definition of "error" in section 1.2 of the W3C XML 1.0
+		/// Recommendation. For example, a validating parser would use this callback to report
 		/// the violation of a validity constraint. The default behaviour is to take no action.
-		/// 
-		/// The SAX parser must continue to provide normal parsing events after invoking this 
-		/// method: it should still be possible for the application to process the document through 
-		/// to the end. If the application cannot do so, then the parser should report a fatal error 
+		///
+		/// The SAX parser must continue to provide normal parsing events after invoking this
+		/// method: it should still be possible for the application to process the document through
+		/// to the end. If the application cannot do so, then the parser should report a fatal error
 		/// even if the XML recommendation does not require it to do so.
-		/// 
+		///
 		/// Filters may use this method to report other, non-XML errors as well.
 
 	virtual void fatalError(const SAXException& exc) = 0;
 		/// Receive notification of a non-recoverable error.
-		/// The application must assume that the document is unusable after the parser has 
-		/// invoked this method, and should continue (if at all) only for the sake of collecting 
-		/// additional error messages: in fact, SAX parsers are free to stop reporting any other 
+		/// The application must assume that the document is unusable after the parser has
+		/// invoked this method, and should continue (if at all) only for the sake of collecting
+		/// additional error messages: in fact, SAX parsers are free to stop reporting any other
 		/// events once this method has been invoked.
 
 protected:
diff --git a/XML/include/Poco/SAX/InputSource.h b/XML/include/Poco/SAX/InputSource.h
index 7fcecf258..2196ecf68 100644
--- a/XML/include/Poco/SAX/InputSource.h
+++ b/XML/include/Poco/SAX/InputSource.h
@@ -28,46 +28,46 @@ namespace XML {
 
 
 class XML_API InputSource
-	/// This class allows a SAX application to encapsulate information about an input 
-	/// source in a single object, which may include a public identifier, a system 
-	/// identifier, a byte stream (possibly with a specified encoding), and/or a character 
+	/// This class allows a SAX application to encapsulate information about an input
+	/// source in a single object, which may include a public identifier, a system
+	/// identifier, a byte stream (possibly with a specified encoding), and/or a character
 	/// stream.
-	/// 
-	/// There are two places that the application can deliver an input source to the 
-	/// parser: as the argument to the Parser.parse method, or as the return value of the 
+	///
+	/// There are two places that the application can deliver an input source to the
+	/// parser: as the argument to the Parser.parse method, or as the return value of the
 	/// EntityResolver::resolveEntity() method.
-	/// 
-	/// The SAX parser will use the InputSource object to determine how to read XML input. 
-	/// If there is a character stream available, the parser will read that stream directly, 
-	/// disregarding any text encoding declaration found in that stream. If there is no character 
-	/// stream, but there is a byte stream, the parser will use that byte stream, using the 
-	/// encoding specified in the InputSource or else (if no encoding is specified) autodetecting 
-	/// the character encoding using an algorithm such as the one in the XML specification. 
-	/// If neither a character stream nor a byte stream is available, the parser will attempt 
+	///
+	/// The SAX parser will use the InputSource object to determine how to read XML input.
+	/// If there is a character stream available, the parser will read that stream directly,
+	/// disregarding any text encoding declaration found in that stream. If there is no character
+	/// stream, but there is a byte stream, the parser will use that byte stream, using the
+	/// encoding specified in the InputSource or else (if no encoding is specified) autodetecting
+	/// the character encoding using an algorithm such as the one in the XML specification.
+	/// If neither a character stream nor a byte stream is available, the parser will attempt
 	/// to open a URI connection to the resource identified by the system identifier.
-	/// 
-	/// An InputSource object belongs to the application: the SAX parser shall never modify it in 
-	/// any way (it may modify a copy if necessary). However, standard processing of both byte and 
-	/// character streams is to close them on as part of end-of-parse cleanup, so applications should 
+	///
+	/// An InputSource object belongs to the application: the SAX parser shall never modify it in
+	/// any way (it may modify a copy if necessary). However, standard processing of both byte and
+	/// character streams is to close them on as part of end-of-parse cleanup, so applications should
 	/// not attempt to re-use such streams after they have been handed to a parser.
 {
 public:
 	InputSource();
 		/// Zero-argument default constructor.
-		
+
 	InputSource(const XMLString& systemId);
 		/// Creates a new input source with a system identifier.
-		/// Applications may use setPublicId to include a public identifier as well, 
+		/// Applications may use setPublicId to include a public identifier as well,
 		/// or setEncoding to specify the character encoding, if known.
-		/// 
-		/// If the system identifier is a URL, it must be fully resolved (it may not 
+		///
+		/// If the system identifier is a URL, it must be fully resolved (it may not
 		/// be a relative URL).
-		
+
 	InputSource(XMLByteInputStream& istr);
 		/// Creates a new input source with a byte stream.
-		/// 
+		///
 		/// Application writers should use setSystemId() to provide a base for resolving
-		/// relative URIs, may use setPublicId to include a public identifier, and may use 
+		/// relative URIs, may use setPublicId to include a public identifier, and may use
 		/// setEncoding to specify the object's character encoding.
 
 	~InputSource();
@@ -76,34 +76,34 @@ public:
 	void setPublicId(const XMLString& publicId);
 		/// Set the public identifier for this input source.
 		///
-		/// The public identifier is always optional: if the application writer includes one, 
+		/// The public identifier is always optional: if the application writer includes one,
 		/// it will be provided as part of the location information.
-		
+
 	void setSystemId(const XMLString& systemId);
 		/// Set the system identifier for this input source.
 		///
-		/// The system identifier is optional if there is a byte stream or a character stream, 
-		/// but it is still useful to provide one, since the application can use it to resolve 
-		/// relative URIs and can include it in error messages and warnings (the parser will 
-		/// attempt to open a connection to the URI only if there is no byte stream or character 
+		/// The system identifier is optional if there is a byte stream or a character stream,
+		/// but it is still useful to provide one, since the application can use it to resolve
+		/// relative URIs and can include it in error messages and warnings (the parser will
+		/// attempt to open a connection to the URI only if there is no byte stream or character
 		/// stream specified).
-		/// 
-		/// If the application knows the character encoding of the object pointed to by the system 
+		///
+		/// If the application knows the character encoding of the object pointed to by the system
 		/// identifier, it can register the encoding using the setEncoding method.
-		/// 
+		///
 		/// If the system identifier is a URL, it must be fully resolved (it may not be a relative URL).
 
 	const XMLString& getPublicId() const;
 		/// Get the public identifier for this input source.
-		
+
 	const XMLString& getSystemId() const;
 		/// Get the system identifier for this input source.
 
 	void setByteStream(XMLByteInputStream& istr);
 		/// Set the byte stream for this input source.
-		/// The SAX parser will ignore this if there is also a character stream specified, but it 
+		/// The SAX parser will ignore this if there is also a character stream specified, but it
 		/// will use a byte stream in preference to opening a URI connection itself.
-		
+
 	XMLByteInputStream* getByteStream() const;
 		/// Get the byte stream for this input source.
 
@@ -115,9 +115,9 @@ public:
 
 	void setEncoding(const XMLString& encoding);
 		/// Set the character encoding, if known.
-		/// The encoding must be a string acceptable for an XML encoding declaration 
+		/// The encoding must be a string acceptable for an XML encoding declaration
 		/// (see section 4.3.3 of the XML 1.0 recommendation).
-		
+
 	const XMLString& getEncoding() const;
 		/// Get the character encoding for a byte stream or URI.
 
diff --git a/XML/include/Poco/SAX/LexicalHandler.h b/XML/include/Poco/SAX/LexicalHandler.h
index 772bd5c3f..b26aa8b53 100644
--- a/XML/include/Poco/SAX/LexicalHandler.h
+++ b/XML/include/Poco/SAX/LexicalHandler.h
@@ -27,91 +27,91 @@ namespace XML {
 
 
 class XML_API LexicalHandler
-	/// This is an optional extension handler for SAX2 to provide lexical information 
-	/// about an XML document, such as comments and CDATA section boundaries. 
-	/// XML readers are not required to recognize this handler, and it is not part of 
+	/// This is an optional extension handler for SAX2 to provide lexical information
+	/// about an XML document, such as comments and CDATA section boundaries.
+	/// XML readers are not required to recognize this handler, and it is not part of
 	/// core-only SAX2 distributions.
-	/// 
-	/// The events in the lexical handler apply to the entire document, not just to the 
-	/// document element, and all lexical handler events must appear between the content 
+	///
+	/// The events in the lexical handler apply to the entire document, not just to the
+	/// document element, and all lexical handler events must appear between the content
 	/// handler's startDocument and endDocument events.
-	/// 
-	/// To set the LexicalHandler for an XML reader, use the setProperty method with the 
-	/// property name http://xml.org/sax/properties/lexical-handler and an object implementing 
-	/// this interface (or null) as the value. If the reader does not report lexical events, 
+	///
+	/// To set the LexicalHandler for an XML reader, use the setProperty method with the
+	/// property name http://xml.org/sax/properties/lexical-handler and an object implementing
+	/// this interface (or null) as the value. If the reader does not report lexical events,
 	/// it will throw a SAXNotRecognizedException when you attempt to register the handler.
 {
 public:
 	virtual void startDTD(const XMLString& name, const XMLString& publicId, const XMLString& systemId) = 0;
 		/// Report the start of DTD declarations, if any.
-		/// 
-		/// This method is intended to report the beginning of the DOCTYPE declaration; 
+		///
+		/// This method is intended to report the beginning of the DOCTYPE declaration;
 		/// if the document has no DOCTYPE declaration, this method will not be invoked.
-		/// 
-		/// All declarations reported through DTDHandler or DeclHandler events must appear 
-		/// between the startDTD and endDTD events. Declarations are assumed to belong to 
-		/// the internal DTD subset unless they appear between startEntity and endEntity 
-		/// events. Comments and processing instructions from the DTD should also be reported 
-		/// between the startDTD and endDTD events, in their original order of (logical) occurrence; 
-		/// they are not required to appear in their correct locations relative to DTDHandler or 
+		///
+		/// All declarations reported through DTDHandler or DeclHandler events must appear
+		/// between the startDTD and endDTD events. Declarations are assumed to belong to
+		/// the internal DTD subset unless they appear between startEntity and endEntity
+		/// events. Comments and processing instructions from the DTD should also be reported
+		/// between the startDTD and endDTD events, in their original order of (logical) occurrence;
+		/// they are not required to appear in their correct locations relative to DTDHandler or
 		/// DeclHandler events, however.
-		/// 
-		/// Note that the start/endDTD events will appear within the start/endDocument events from 
+		///
+		/// Note that the start/endDTD events will appear within the start/endDocument events from
 		/// ContentHandler and before the first startElement event.
 
 	virtual void endDTD() = 0;
 		/// Report the end of DTD declarations.
-		/// 
-		/// This method is intended to report the end of the DOCTYPE declaration; if the document 
+		///
+		/// This method is intended to report the end of the DOCTYPE declaration; if the document
 		/// has no DOCTYPE declaration, this method will not be invoked.
 
 	virtual void startEntity(const XMLString& name) = 0;
 		/// Report the beginning of some internal and external XML entities.
-		/// 
-		/// The reporting of parameter entities (including the external DTD subset) is optional, 
-		/// and SAX2 drivers that report LexicalHandler events may not implement it; you can use the 
-		/// http://xml.org/sax/features/lexical-handler/parameter-entities feature to query or control 
+		///
+		/// The reporting of parameter entities (including the external DTD subset) is optional,
+		/// and SAX2 drivers that report LexicalHandler events may not implement it; you can use the
+		/// http://xml.org/sax/features/lexical-handler/parameter-entities feature to query or control
 		/// the reporting of parameter entities.
-		/// 
-		/// General entities are reported with their regular names, parameter entities have '%' 
+		///
+		/// General entities are reported with their regular names, parameter entities have '%'
 		/// prepended to their names, and the external DTD subset has the pseudo-entity name "[dtd]".
-		/// 
-		/// When a SAX2 driver is providing these events, all other events must be properly nested 
-		/// within start/end entity events. There is no additional requirement that events from 
+		///
+		/// When a SAX2 driver is providing these events, all other events must be properly nested
+		/// within start/end entity events. There is no additional requirement that events from
 		/// DeclHandler or DTDHandler be properly ordered.
-		/// 
-		/// Note that skipped entities will be reported through the skippedEntity event, which is part of 
+		///
+		/// Note that skipped entities will be reported through the skippedEntity event, which is part of
 		/// the ContentHandler interface.
-		/// 
-		/// Because of the streaming event model that SAX uses, some entity boundaries cannot be reported under 
+		///
+		/// Because of the streaming event model that SAX uses, some entity boundaries cannot be reported under
 		/// any circumstances:
-		/// 
+		///
 		///     * general entities within attribute values
 		///     * parameter entities within declarations
 		///
 		/// These will be silently expanded, with no indication of where the original entity boundaries were.
-		/// 
+		///
 		/// Note also that the boundaries of character references (which are not really entities anyway) are not reported.
-		/// 
-		/// All start/endEntity events must be properly nested. 
+		///
+		/// All start/endEntity events must be properly nested.
 
 	virtual void endEntity(const XMLString& name) = 0;
 		/// Report the end of an entity.
-		
+
 	virtual void startCDATA() = 0;
 		/// Report the start of a CDATA section.
 		///
-		/// The contents of the CDATA section will be reported through the regular characters event; 
+		/// The contents of the CDATA section will be reported through the regular characters event;
 		/// this event is intended only to report the boundary.
 
 	virtual void endCDATA() = 0;
 		/// Report the end of a CDATA section.
-		
+
 	virtual void comment(const XMLChar ch[], int start, int length) = 0;
 		/// Report an XML comment anywhere in the document.
-		/// 
-		/// This callback will be used for comments inside or outside the document element, 
-		/// including comments in the external DTD subset (if read). Comments in the DTD must 
+		///
+		/// This callback will be used for comments inside or outside the document element,
+		/// including comments in the external DTD subset (if read). Comments in the DTD must
 		/// be properly nested inside start/endDTD and start/endEntity events (if used).
 
 protected:
diff --git a/XML/include/Poco/SAX/Locator.h b/XML/include/Poco/SAX/Locator.h
index 4f2b47d48..be4da79be 100644
--- a/XML/include/Poco/SAX/Locator.h
+++ b/XML/include/Poco/SAX/Locator.h
@@ -28,68 +28,68 @@ namespace XML {
 
 class XML_API Locator
 	/// Interface for associating a SAX event with a document location.
-	/// 
-	/// If a SAX parser provides location information to the SAX application, it does so by 
-	/// implementing this interface and then passing an instance to the application using the 
-	/// content handler's setDocumentLocator method. The application can use the object to obtain 
+	///
+	/// If a SAX parser provides location information to the SAX application, it does so by
+	/// implementing this interface and then passing an instance to the application using the
+	/// content handler's setDocumentLocator method. The application can use the object to obtain
 	/// the location of any other SAX event in the XML source document.
-	/// 
-	/// Note that the results returned by the object will be valid only during the scope of each 
-	/// callback method: the application will receive unpredictable results if it attempts to use 
+	///
+	/// Note that the results returned by the object will be valid only during the scope of each
+	/// callback method: the application will receive unpredictable results if it attempts to use
 	/// the locator at any other time, or after parsing completes.
-	/// 
-	/// SAX parsers are not required to supply a locator, but they are very strongly encouraged to 
-	/// do so. If the parser supplies a locator, it must do so before reporting any other document 
-	/// events. If no locator has been set by the time the application receives the startDocument event, 
+	///
+	/// SAX parsers are not required to supply a locator, but they are very strongly encouraged to
+	/// do so. If the parser supplies a locator, it must do so before reporting any other document
+	/// events. If no locator has been set by the time the application receives the startDocument event,
 	/// the application should assume that a locator is not available.
 {
 public:
 	virtual XMLString getPublicId() const = 0;
 		/// Return the public identifier for the current document event.
-		/// 
-		/// The return value is the public identifier of the document entity or of the external 
+		///
+		/// The return value is the public identifier of the document entity or of the external
 		/// parsed entity in which the markup triggering the event appears.
 
 	virtual XMLString getSystemId() const = 0;
 		/// Return the system identifier for the current document event.
-		/// 
-		/// The return value is the system identifier of the document entity or of the external 
+		///
+		/// The return value is the system identifier of the document entity or of the external
 		/// parsed entity in which the markup triggering the event appears.
-		/// 
-		/// If the system identifier is a URL, the parser must resolve it fully before passing 
-		/// it to the application. For example, a file name must always be provided as a 
+		///
+		/// If the system identifier is a URL, the parser must resolve it fully before passing
+		/// it to the application. For example, a file name must always be provided as a
 		/// file:... URL, and other kinds of relative URI are also resolved against their bases.
 
 	virtual int getLineNumber() const = 0;
 		/// Return the line number where the current document event ends.
 		/// Lines are delimited by line ends, which are defined in the XML specification.
-		/// 
-		/// Warning: The return value from the method is intended only as an approximation for 
-		/// the sake of diagnostics; it is not intended to provide sufficient information to 
-		/// edit the character content of the original XML document. In some cases, these "line" 
-		/// numbers match what would be displayed as columns, and in others they may not match the 
+		///
+		/// Warning: The return value from the method is intended only as an approximation for
+		/// the sake of diagnostics; it is not intended to provide sufficient information to
+		/// edit the character content of the original XML document. In some cases, these "line"
+		/// numbers match what would be displayed as columns, and in others they may not match the
 		/// source text due to internal entity expansion.
-		/// 
-		/// The return value is an approximation of the line number in the document entity or external 
+		///
+		/// The return value is an approximation of the line number in the document entity or external
 		/// parsed entity where the markup triggering the event appears.
-		/// 
-		/// If possible, the SAX driver should provide the line position of the first character after 
+		///
+		/// If possible, the SAX driver should provide the line position of the first character after
 		/// the text associated with the document event. The first line is line 1.
 
 	virtual int getColumnNumber() const = 0;
-		/// Return the column number where the current document event ends. 
+		/// Return the column number where the current document event ends.
 		/// This is one-based number of characters since the last line end.
-		/// 
-		/// Warning: The return value from the method is intended only as an approximation 
-		/// for the sake of diagnostics; it is not intended to provide sufficient information 
-		/// to edit the character content of the original XML document. For example, when lines 
-		/// contain combining character sequences, wide characters, surrogate pairs, or bi-directional 
+		///
+		/// Warning: The return value from the method is intended only as an approximation
+		/// for the sake of diagnostics; it is not intended to provide sufficient information
+		/// to edit the character content of the original XML document. For example, when lines
+		/// contain combining character sequences, wide characters, surrogate pairs, or bi-directional
 		/// text, the value may not correspond to the column in a text editor's display.
-		/// 
-		/// The return value is an approximation of the column number in the document entity or external 
+		///
+		/// The return value is an approximation of the column number in the document entity or external
 		/// parsed entity where the markup triggering the event appears.
-		/// 
-		/// If possible, the SAX driver should provide the line position of the first character after 
+		///
+		/// If possible, the SAX driver should provide the line position of the first character after
 		/// the text associated with the document event. The first column in each line is column 1.
 
 protected:
diff --git a/XML/include/Poco/SAX/LocatorImpl.h b/XML/include/Poco/SAX/LocatorImpl.h
index 2c924b3f8..a131bb845 100644
--- a/XML/include/Poco/SAX/LocatorImpl.h
+++ b/XML/include/Poco/SAX/LocatorImpl.h
@@ -33,35 +33,35 @@ class XML_API LocatorImpl: public Locator
 public:
 	LocatorImpl();
 		/// Zero-argument constructor.
-		/// 
-		/// This will not normally be useful, since the main purpose of this class is 
+		///
+		/// This will not normally be useful, since the main purpose of this class is
 		/// to make a snapshot of an existing Locator.
-		
+
 	LocatorImpl(const Locator& loc);
 		/// Copy constructor.
-		/// 
-		/// Create a persistent copy of the current state of a locator. When the original 
-		/// locator changes, this copy will still keep the original values (and it can be 
+		///
+		/// Create a persistent copy of the current state of a locator. When the original
+		/// locator changes, this copy will still keep the original values (and it can be
 		/// used outside the scope of DocumentHandler methods).
 
 	~LocatorImpl();
 		/// Destroys the Locator.
-		
+
 	LocatorImpl& operator = (const Locator& loc);
 		/// Assignment operator.
 
 	XMLString getPublicId() const;
 		/// Return the saved public identifier.
-		
+
 	XMLString getSystemId() const;
 		/// Return the saved system identifier.
 
 	int getLineNumber() const;
 		/// Return the saved line number (1-based).
-		
+
 	int getColumnNumber() const;
 		/// Return the saved column number (1-based).
-		
+
 	void setPublicId(const XMLString& publicId);
 		/// Set the public identifier for this locator.
 
diff --git a/XML/include/Poco/SAX/NamespaceSupport.h b/XML/include/Poco/SAX/NamespaceSupport.h
index 3c4244f0a..52d88b61c 100644
--- a/XML/include/Poco/SAX/NamespaceSupport.h
+++ b/XML/include/Poco/SAX/NamespaceSupport.h
@@ -30,13 +30,13 @@ namespace XML {
 
 
 class XML_API NamespaceSupport
-	/// Encapsulate Namespace logic for use by SAX drivers. 
-	/// This class encapsulates the logic of Namespace processing: 
+	/// Encapsulate Namespace logic for use by SAX drivers.
+	/// This class encapsulates the logic of Namespace processing:
 	/// it tracks the declarations currently in force for each context and
-	/// automatically processes qualified XML 1.0 names into their Namespace 
+	/// automatically processes qualified XML 1.0 names into their Namespace
 	/// parts; it can also be used in reverse for generating
 	/// XML 1.0 from Namespaces.
-	/// Namespace support objects are reusable, but the reset method 
+	/// Namespace support objects are reusable, but the reset method
 	/// must be invoked between each session.
 {
 public:
@@ -44,40 +44,40 @@ public:
 
 	NamespaceSupport();
 		/// Creates a NamespaceSupport object.
-		
+
 	~NamespaceSupport();
 		/// Destroys a NamespaceSupport object.
-	
+
 	bool declarePrefix(const XMLString& prefix, const XMLString& namespaceURI);
 		/// Declare a Namespace prefix. All prefixes must be declared before they are
 		/// referenced. For example, a SAX driver (parser) would scan an element's attributes
 		/// in two passes: first for namespace declarations, then a second pass using
 		/// processName() to interpret prefixes against (potentially redefined) prefixes.
-		/// 
+		///
 		/// This method declares a prefix in the current Namespace context; the prefix
 		/// will remain in force until this context is popped, unless it is shadowed
 		/// in a descendant context.
-		/// 
+		///
 		/// To declare the default element Namespace, use the empty string as the prefix.
-		/// 
+		///
 		/// Note that you must not declare a prefix after you've pushed and popped another
 		/// Namespace context, or treated the declarations phase as complete by processing
 		/// a prefixed name.
 		///
 		/// Returns true if the prefix was legal, false otherwise.
-	
+
 	bool undeclarePrefix(const XMLString& prefix);
 		/// Remove the given namespace prefix.
-	
+
 	void getDeclaredPrefixes(PrefixSet& prefixes) const;
 		/// Return an enumeration of all prefixes declared in this context.
-		/// 
+		///
 		/// The empty (default) prefix will be included in this enumeration; note that
 		/// this behaviour differs from that of getPrefix() and getPrefixes().
 
 	const XMLString& getPrefix(const XMLString& namespaceURI) const;
 		/// Return one of the prefixes mapped to a Namespace URI.
-		/// 
+		///
 		/// If more than one prefix is currently mapped to the same URI, this method
 		/// will make an arbitrary selection; if you want all of the prefixes, use the
 		/// getPrefixes() method instead.
@@ -90,7 +90,7 @@ public:
 		/// Return an enumeration of all prefixes whose declarations are active in the
 		/// current context. This includes declarations from parent contexts that have
 		/// not been overridden.
-		/// 
+		///
 		/// Note: if there is a default prefix, it will not be returned in this enumeration;
 		/// check for the default prefix using the getURI with an argument of "".
 
@@ -98,19 +98,19 @@ public:
 		/// Return an enumeration of all prefixes for a given URI whose declarations
 		/// are active in the current context. This includes declarations from parent
 		/// contexts that have not been overridden.
-		/// 
+		///
 		/// This method returns prefixes mapped to a specific Namespace URI. The xml:
 		/// prefix will be included. If you want only one prefix that's mapped to the
 		/// Namespace URI, and you don't care which one you get, use the getPrefix() method
 		/// instead.
-		/// 
+		///
 		/// Note: the empty (default) prefix is never included in this enumeration;
 		/// to check for the presence of a default Namespace, use the getURI() method
 		/// with an argument of "".
 
 	const XMLString& getURI(const XMLString& prefix) const;
 		/// Look up a prefix and get the currently-mapped Namespace URI.
-		/// 
+		///
 		/// This method looks up the prefix in the current context. Use the empty string
 		/// ("") for the default Namespace.
 
@@ -118,7 +118,7 @@ public:
 		/// Start a new Namespace context. The new context will automatically inherit
 		/// the declarations of its parent context, but it will also keep track of which
 		/// declarations were made within this context.
-		/// 
+		///
 		/// Event callback code should start a new context once per element. This means
 		/// being ready to call this in either of two places. For elements that don't
 		/// include namespace declarations, the ContentHandler::startElement() callback
@@ -126,9 +126,9 @@ public:
 		/// first ContentHandler::startPrefixMapping() callback. A boolean flag can be
 		/// used to track whether a context has been started yet. When either of those
 		/// methods is called, it checks the flag to see if a new context needs to be
-		/// started. If so, it starts the context and sets the flag. After 
+		/// started. If so, it starts the context and sets the flag. After
 		/// ContentHandler::startElement() does that, it always clears the flag.
-		/// 
+		///
 		/// Normally, SAX drivers would push a new context at the beginning of each
 		/// XML element. Then they perform a first pass over the attributes to process
 		/// all namespace declarations, making ContentHandler::startPrefixMapping() callbacks.
@@ -136,36 +136,36 @@ public:
 		/// all attributes and for the element name. Finally all the information for
 		/// the ContentHandler::startElement() callback is available, so it can then
 		/// be made.
-		/// 
+		///
 		/// The Namespace support object always starts with a base context already in
 		/// force: in this context, only the "xml" prefix is declared.
 
 	void popContext();
 		/// Revert to the previous Namespace context.
-		/// 
+		///
 		/// Normally, you should pop the context at the end of each XML element. After
 		/// popping the context, all Namespace prefix mappings that were previously
 		/// in force are restored.
-		/// 
+		///
 		/// You must not attempt to declare additional Namespace prefixes after popping
 		/// a context, unless you push another context first.
 
 	bool processName(const XMLString& qname, XMLString& namespaceURI, XMLString& localName, bool isAttribute) const;
-		/// Process a raw XML 1.0 name. 
-		/// This method processes a raw XML 1.0 name in the current context 
+		/// Process a raw XML 1.0 name.
+		/// This method processes a raw XML 1.0 name in the current context
 		/// by removing the prefix and looking it up among the
 		/// prefixes currently declared. The result will be returned in
 		/// namespaceURI and localName.
 		/// If the raw name has a prefix that has not been declared, then the return
 		/// value will be false, otherwise true.
 		///
-		/// Note that attribute names are processed differently than element names: 
+		/// Note that attribute names are processed differently than element names:
 		/// an unprefixed element name will receive the
 		/// default Namespace (if any), while an unprefixed attribute name will not.
 
 	void reset();
 		/// Reset this Namespace support object for reuse.
-		/// 
+		///
 		/// It is necessary to invoke this method before reusing the Namespace support
 		/// object for a new session. If namespace declaration URIs are to be supported,
 		/// that flag must also be set to a non-default value.
@@ -182,7 +182,7 @@ private:
 
 	typedef std::map<XMLString, XMLString> Context;
 	typedef std::vector<Context> ContextVec;
-	
+
 	ContextVec _contexts;
 
 	static const XMLString EMPTY_STRING;
diff --git a/XML/include/Poco/SAX/SAXException.h b/XML/include/Poco/SAX/SAXException.h
index e1f9cae8e..b313bc21a 100644
--- a/XML/include/Poco/SAX/SAXException.h
+++ b/XML/include/Poco/SAX/SAXException.h
@@ -30,31 +30,31 @@ namespace XML {
 POCO_DECLARE_EXCEPTION(XML_API, SAXException, XMLException)
 	/// The base class for all SAX-related exceptions like SAXParseException,
 	/// SAXNotRecognizedException or SAXNotSupportedException.
-	/// 
-	/// This class can contain basic error or warning information from either the XML parser 
-	/// or the application: a parser writer or application writer can subclass it to provide 
-	/// additional functionality. SAX handlers may throw this exception or any exception subclassed 
+	///
+	/// This class can contain basic error or warning information from either the XML parser
+	/// or the application: a parser writer or application writer can subclass it to provide
+	/// additional functionality. SAX handlers may throw this exception or any exception subclassed
 	/// from it.
-	/// 
-	/// If the application needs to pass through other types of exceptions, it must wrap those exceptions 
+	///
+	/// If the application needs to pass through other types of exceptions, it must wrap those exceptions
 	/// in a SAXException or an exception derived from a SAXException.
-	/// 
-	/// If the parser or application needs to include information about a specific location in an XML 
+	///
+	/// If the parser or application needs to include information about a specific location in an XML
 	/// document, it should use the SAXParseException subclass.
 
 
 POCO_DECLARE_EXCEPTION(XML_API, SAXNotRecognizedException, SAXException)
 	/// Exception class for an unrecognized identifier.
-	/// 
-	/// An XMLReader will throw this exception when it finds an unrecognized feature or property 
+	///
+	/// An XMLReader will throw this exception when it finds an unrecognized feature or property
 	/// identifier; SAX applications and extensions may use this class for other, similar purposes.
 
 
 POCO_DECLARE_EXCEPTION(XML_API, SAXNotSupportedException, SAXException)
 	/// Exception class for an unsupported operation.
-	/// 
-	/// An XMLReader will throw this exception when it recognizes a feature or property identifier, 
-	/// but cannot perform the requested operation (setting a state or value). Other SAX2 applications 
+	///
+	/// An XMLReader will throw this exception when it recognizes a feature or property identifier,
+	/// but cannot perform the requested operation (setting a state or value). Other SAX2 applications
 	/// and extensions may use this class for similar purposes.
 
 
@@ -64,15 +64,15 @@ class Locator;
 class XML_API SAXParseException: public SAXException
 	/// Encapsulate an XML parse error or warning.
 	///
-	/// This exception may include information for locating the error in the original XML document, 
-	/// as if it came from a Locator object. Note that although the application will receive a 
-	/// SAXParseException as the argument to the handlers in the ErrorHandler interface, the application 
-	/// is not actually required to throw the exception; instead, it can simply read the information in it 
+	/// This exception may include information for locating the error in the original XML document,
+	/// as if it came from a Locator object. Note that although the application will receive a
+	/// SAXParseException as the argument to the handlers in the ErrorHandler interface, the application
+	/// is not actually required to throw the exception; instead, it can simply read the information in it
 	/// and take a different action.
-	/// 
+	///
 	/// Since this exception is a subclass of SAXException, it inherits the ability to wrap another exception.
 {
-public:	
+public:
 	SAXParseException(const std::string& msg, const Locator& loc);
 		/// Create a new SAXParseException from a message and a Locator.
 
@@ -81,18 +81,18 @@ public:
 
 	SAXParseException(const std::string& msg, const XMLString& publicId, const XMLString& systemId, int lineNumber, int columnNumber);
 		/// Create a new SAXParseException with an embedded exception.
-		/// 
+		///
 		/// This constructor is most useful for parser writers.
-		/// All parameters except the message are as if they were provided by a Locator. 
-		/// For example, if the system identifier is a URL (including relative filename), 
+		/// All parameters except the message are as if they were provided by a Locator.
+		/// For example, if the system identifier is a URL (including relative filename),
 		/// the caller must resolve it fully before creating the exception.
 
 	SAXParseException(const std::string& msg, const XMLString& publicId, const XMLString& systemId, int lineNumber, int columnNumber, const Poco::Exception& exc);
 		/// Create a new SAXParseException.
-		/// 
+		///
 		/// This constructor is most useful for parser writers.
-		/// All parameters except the message are as if they were provided by a Locator. 
-		/// For example, if the system identifier is a URL (including relative filename), 
+		/// All parameters except the message are as if they were provided by a Locator.
+		/// For example, if the system identifier is a URL (including relative filename),
 		/// the caller must resolve it fully before creating the exception.
 
 	SAXParseException(const SAXParseException& exc);
@@ -103,7 +103,7 @@ public:
 
 	SAXParseException& operator = (const SAXParseException& exc);
 		/// Assignment operator.
-		
+
 	const char* name() const noexcept;
 		/// Returns a static string describing the exception.
 
@@ -112,27 +112,27 @@ public:
 
 	Poco::Exception* clone() const;
 		/// Creates an exact copy of the exception.
-		
+
 	void rethrow() const;
 		/// (Re)Throws the exception.
 
 	const XMLString& getPublicId() const;
 		/// Get the public identifier of the entity where the exception occurred.
-		
+
 	const XMLString& getSystemId() const;
 		/// Get the system identifier of the entity where the exception occurred.
-		
+
 	int getLineNumber() const;
 		/// The line number of the end of the text where the exception occurred.
 		/// The first line is line 1.
-		
+
 	int getColumnNumber() const;
 		/// The column number of the end of the text where the exception occurred.
 		/// The first column in a line is position 1.
 
 protected:
 	static std::string buildMessage(const std::string& msg, const XMLString& publicId, const XMLString& systemId, int lineNumber, int columnNumber);
-	
+
 private:
 	SAXParseException();
 
diff --git a/XML/include/Poco/SAX/WhitespaceFilter.h b/XML/include/Poco/SAX/WhitespaceFilter.h
index f4f08bc0f..b09e35037 100644
--- a/XML/include/Poco/SAX/WhitespaceFilter.h
+++ b/XML/include/Poco/SAX/WhitespaceFilter.h
@@ -35,7 +35,7 @@ class XML_API WhitespaceFilter: public XMLFilterImpl, public LexicalHandler
 public:
 	WhitespaceFilter();
 		/// Creates the WhitespaceFilter, with no parent.
-		
+
 	WhitespaceFilter(XMLReader* pReader);
 		/// Creates the WhitespaceFilter with the specified parent.
 
diff --git a/XML/include/Poco/SAX/XMLFilter.h b/XML/include/Poco/SAX/XMLFilter.h
index 0bc2e965e..1869adca3 100644
--- a/XML/include/Poco/SAX/XMLFilter.h
+++ b/XML/include/Poco/SAX/XMLFilter.h
@@ -29,27 +29,27 @@ namespace XML {
 class XML_API XMLFilter: public XMLReader
 	/// Interface for an XML filter.
 	///
-	/// An XML filter is like an XML reader, except that it obtains its events from another XML reader 
-	/// rather than a primary source like an XML document or database. Filters can modify a stream of 
+	/// An XML filter is like an XML reader, except that it obtains its events from another XML reader
+	/// rather than a primary source like an XML document or database. Filters can modify a stream of
 	/// events as they pass on to the final application.
-	/// 
-	/// The XMLFilterImpl helper class provides a convenient base for creating SAX2 filters, by passing on 
+	///
+	/// The XMLFilterImpl helper class provides a convenient base for creating SAX2 filters, by passing on
 	/// all EntityResolver, DTDHandler, ContentHandler and ErrorHandler events automatically.
 {
 public:
 	virtual XMLReader* getParent() const = 0;
 		/// Set the parent reader.
-		/// 
-		/// This method allows the application to link the filter to a parent reader (which may be another 
+		///
+		/// This method allows the application to link the filter to a parent reader (which may be another
 		/// filter). The argument may not be null.
-		
+
 	virtual void setParent(XMLReader* pParent) = 0;
 		/// Get the parent reader.
-		/// 
-		/// This method allows the application to query the parent reader (which may be another filter). 
-		/// It is generally a bad idea to perform any operations on the parent reader directly: they should 
+		///
+		/// This method allows the application to query the parent reader (which may be another filter).
+		/// It is generally a bad idea to perform any operations on the parent reader directly: they should
 		/// all pass through this filter.
-	
+
 protected:
 	virtual ~XMLFilter();
 };
diff --git a/XML/include/Poco/SAX/XMLFilterImpl.h b/XML/include/Poco/SAX/XMLFilterImpl.h
index 33c049c7b..6c6f9e6b4 100644
--- a/XML/include/Poco/SAX/XMLFilterImpl.h
+++ b/XML/include/Poco/SAX/XMLFilterImpl.h
@@ -33,25 +33,25 @@ namespace XML {
 class XML_API XMLFilterImpl: public XMLFilter, public EntityResolver, public DTDHandler, public ContentHandler, public ErrorHandler
 	/// Base class for deriving an XML filter.
 	///
-	/// This class is designed to sit between an XMLReader and the client application's event 
-	/// handlers. By default, it does nothing but pass requests up to the reader and events on to 
-	/// the handlers unmodified, but subclasses can override specific methods to modify the event 
+	/// This class is designed to sit between an XMLReader and the client application's event
+	/// handlers. By default, it does nothing but pass requests up to the reader and events on to
+	/// the handlers unmodified, but subclasses can override specific methods to modify the event
 	/// stream or the configuration requests as they pass through.
 {
 public:
 	XMLFilterImpl();
 		/// Construct an empty XML filter, with no parent.
 		///
-		/// This filter will have no parent: you must assign a parent before you start a parse or do any 
-		/// configuration with setFeature or setProperty, unless you use this as a pure event consumer rather 
+		/// This filter will have no parent: you must assign a parent before you start a parse or do any
+		/// configuration with setFeature or setProperty, unless you use this as a pure event consumer rather
 		/// than as an XMLReader.
-		
+
 	XMLFilterImpl(XMLReader* pParent);
 		/// Construct an XML filter with the specified parent.
-		
+
 	~XMLFilterImpl();
 		/// Destroys the XMLFilterImpl.
-	
+
 	// XMLFilter
 	XMLReader* getParent() const;
 	void setParent(XMLReader* pParent);
@@ -77,7 +77,7 @@ public:
 	// EntityResolver
 	InputSource* resolveEntity(const XMLString* publicId, const XMLString& systemId);
 	void releaseInputSource(InputSource* pSource);
-	
+
 	// DTDHandler
 	void notationDecl(const XMLString& name, const XMLString* publicId, const XMLString* systemId);
 	void unparsedEntityDecl(const XMLString& name, const XMLString* publicId, const XMLString& systemId, const XMLString& notationName);
@@ -104,10 +104,10 @@ protected:
 		/// Subclasses can use this method instead of
 		/// getParent() for better performance - this method
 		/// is non-virtual and implemented as inline.
-	
+
 	virtual void setupParse();
 		/// Setup the event handlers in the parent reader.
-	
+
 private:
 	XMLReader*      _pParent;
 	EntityResolver* _pEntityResolver;
diff --git a/XML/include/Poco/SAX/XMLReader.h b/XML/include/Poco/SAX/XMLReader.h
index 0b1d36032..fb2dbbf97 100644
--- a/XML/include/Poco/SAX/XMLReader.h
+++ b/XML/include/Poco/SAX/XMLReader.h
@@ -36,12 +36,12 @@ class NamespaceHandler;
 
 
 class XML_API XMLReader
-	/// Interface for reading an XML document using callbacks. 
-	/// XMLReader is the interface that an XML parser's SAX2 driver must 
+	/// Interface for reading an XML document using callbacks.
+	/// XMLReader is the interface that an XML parser's SAX2 driver must
 	/// implement. This interface allows an application to set and
-	/// query features and properties in the parser, to register event handlers 
+	/// query features and properties in the parser, to register event handlers
 	/// for document processing, and to initiate a document parse.
-	/// All SAX interfaces are assumed to be synchronous: the parse methods must not 
+	/// All SAX interfaces are assumed to be synchronous: the parse methods must not
 	/// return until parsing is complete, and readers
 	/// must wait for an event-handler callback to return before reporting the next event.
 {
@@ -49,10 +49,10 @@ public:
 	virtual void setEntityResolver(EntityResolver* pResolver) = 0;
 		/// Allow an application to register an entity resolver.
 		///
-		/// If the application does not register an entity resolver, the 
+		/// If the application does not register an entity resolver, the
 		/// XMLReader will perform its own default resolution.
-		/// 
-		/// Applications may register a new or different resolver in the middle of a 
+		///
+		/// Applications may register a new or different resolver in the middle of a
 		/// parse, and the SAX parser must begin using the new resolver immediately.
 
 	virtual EntityResolver* getEntityResolver() const = 0;
@@ -61,10 +61,10 @@ public:
 	virtual void setDTDHandler(DTDHandler* pDTDHandler) = 0;
 		/// Allow an application to register a DTD event handler.
 		///
-		/// If the application does not register a DTD handler, all DTD events reported by 
+		/// If the application does not register a DTD handler, all DTD events reported by
 		/// the SAX parser will be silently ignored.
-		/// 
-		/// Applications may register a new or different handler in the middle of a parse, 
+		///
+		/// Applications may register a new or different handler in the middle of a parse,
 		/// and the SAX parser must begin using the new handler immediately.
 
 	virtual DTDHandler* getDTDHandler() const = 0;
@@ -72,11 +72,11 @@ public:
 
 	virtual void setContentHandler(ContentHandler* pContentHandler) = 0;
 		/// Allow an application to register a content event handler.
-		/// 
-		/// If the application does not register a content handler, all content events 
+		///
+		/// If the application does not register a content handler, all content events
 		/// reported by the SAX parser will be silently ignored.
-		/// 
-		/// Applications may register a new or different handler in the middle of a parse, 
+		///
+		/// Applications may register a new or different handler in the middle of a parse,
 		/// and the SAX parser must begin using the new handler immediately.
 
 	virtual ContentHandler* getContentHandler() const = 0;
@@ -85,56 +85,56 @@ public:
 	virtual void setErrorHandler(ErrorHandler* pErrorHandler) = 0;
 		/// Allow an application to register an error event handler.
 		///
-		/// If the application does not register an error handler, all error events reported by 
-		/// the SAX parser will be silently ignored; however, normal processing may not continue. 
-		/// It is highly recommended that all SAX applications implement an error handler to avoid 
+		/// If the application does not register an error handler, all error events reported by
+		/// the SAX parser will be silently ignored; however, normal processing may not continue.
+		/// It is highly recommended that all SAX applications implement an error handler to avoid
 		/// unexpected bugs.
-		/// 
-		/// Applications may register a new or different handler in the middle of a parse, and the 
+		///
+		/// Applications may register a new or different handler in the middle of a parse, and the
 		/// SAX parser must begin using the new handler immediately.
 
 	virtual ErrorHandler* getErrorHandler() const = 0;
 		/// Return the current error handler.
-	
+
 	virtual void setFeature(const XMLString& featureId, bool state) = 0;
 		/// Set the state of a feature.
 		///
-		/// The feature name is any fully-qualified URI. It is possible for an XMLReader to 
-		/// expose a feature value but to be unable to change the current value. Some feature 
-		/// values may be immutable or mutable only in specific contexts, such as before, during, 
+		/// The feature name is any fully-qualified URI. It is possible for an XMLReader to
+		/// expose a feature value but to be unable to change the current value. Some feature
+		/// values may be immutable or mutable only in specific contexts, such as before, during,
 		/// or after a parse.
-		/// 
-		/// All XMLReaders are required to support setting http://xml.org/sax/features/namespaces 
+		///
+		/// All XMLReaders are required to support setting http://xml.org/sax/features/namespaces
 		/// to true and http://xml.org/sax/features/namespace-prefixes to false.
 
 	virtual bool getFeature(const XMLString& featureId) const = 0;
 		/// Look up the value of a feature.
 		///
-		/// The feature name is any fully-qualified URI. It is possible for an XMLReader 
-		/// to recognize a feature name but temporarily be unable to return its value. 
-		/// Some feature values may be available only in specific contexts, such as before, 
-		/// during, or after a parse. Also, some feature values may not be programmatically 
-		/// accessible. (In the case of an adapter for SAX1 Parser, there is no 
-		/// implementation-independent way to expose whether the underlying parser is performing 
+		/// The feature name is any fully-qualified URI. It is possible for an XMLReader
+		/// to recognize a feature name but temporarily be unable to return its value.
+		/// Some feature values may be available only in specific contexts, such as before,
+		/// during, or after a parse. Also, some feature values may not be programmatically
+		/// accessible. (In the case of an adapter for SAX1 Parser, there is no
+		/// implementation-independent way to expose whether the underlying parser is performing
 		/// validation, expanding external entities, and so forth.)
-		/// 
-		/// All XMLReaders are required to recognize the 
-		/// http://xml.org/sax/features/namespaces and the 
+		///
+		/// All XMLReaders are required to recognize the
+		/// http://xml.org/sax/features/namespaces and the
 		/// http://xml.org/sax/features/namespace-prefixes feature names.
-		/// Implementors are free (and encouraged) to invent their own features, 
+		/// Implementors are free (and encouraged) to invent their own features,
 		/// using names built on their own URIs.
-		
+
 	virtual void setProperty(const XMLString& propertyId, const XMLString& value) = 0;
 		/// Set the value of a property.
-		/// 
-		/// The property name is any fully-qualified URI. It is possible for an XMLReader 
-		/// to recognize a property name but to be unable to change the current value. 
-		/// Some property values may be immutable or mutable only in specific contexts, 
+		///
+		/// The property name is any fully-qualified URI. It is possible for an XMLReader
+		/// to recognize a property name but to be unable to change the current value.
+		/// Some property values may be immutable or mutable only in specific contexts,
 		/// such as before, during, or after a parse.
-		/// 
-		/// XMLReaders are not required to recognize setting any specific property names, though a 
+		///
+		/// XMLReaders are not required to recognize setting any specific property names, though a
 		/// core set is defined by SAX2.
-		/// 
+		///
 		/// This method is also the standard mechanism for setting extended handlers.
 
 	virtual void setProperty(const XMLString& propertyId, void* value) = 0;
@@ -144,40 +144,40 @@ public:
 	virtual void* getProperty(const XMLString& propertyId) const = 0;
 		/// Look up the value of a property.
 		/// String values are returned as XMLChar*
-		/// The property name is any fully-qualified URI. It is possible for an XMLReader to 
-		/// recognize a property name but temporarily be unable to return its value. Some property 
+		/// The property name is any fully-qualified URI. It is possible for an XMLReader to
+		/// recognize a property name but temporarily be unable to return its value. Some property
 		/// values may be available only in specific contexts, such as before, during, or after a parse.
 		///
-		/// XMLReaders are not required to recognize any specific property names, though an initial 
+		/// XMLReaders are not required to recognize any specific property names, though an initial
 		/// core set is documented for SAX2.
-		/// 
-		/// Implementors are free (and encouraged) to invent their own properties, using names 
+		///
+		/// Implementors are free (and encouraged) to invent their own properties, using names
 		/// built on their own URIs.
 
 	virtual void parse(InputSource* pSource) = 0;
 		/// Parse an XML document.
-		/// 
-		/// The application can use this method to instruct the XML reader to begin parsing an 
+		///
+		/// The application can use this method to instruct the XML reader to begin parsing an
 		/// XML document from any valid input source (a character stream, a byte stream, or a URI).
-		/// 
-		/// Applications may not invoke this method while a parse is in progress (they should create 
-		/// a new XMLReader instead for each nested XML document). Once a parse is complete, an 
-		/// application may reuse the same XMLReader object, possibly with a different input source. 
-		/// Configuration of the XMLReader object (such as handler bindings and values established for 
-		/// feature flags and properties) is unchanged by completion of a parse, unless the definition of that 
-		/// aspect of the configuration explicitly specifies other behavior. (For example, feature flags or 
+		///
+		/// Applications may not invoke this method while a parse is in progress (they should create
+		/// a new XMLReader instead for each nested XML document). Once a parse is complete, an
+		/// application may reuse the same XMLReader object, possibly with a different input source.
+		/// Configuration of the XMLReader object (such as handler bindings and values established for
+		/// feature flags and properties) is unchanged by completion of a parse, unless the definition of that
+		/// aspect of the configuration explicitly specifies other behavior. (For example, feature flags or
 		/// properties exposing characteristics of the document being parsed.)
-		/// 
-		/// During the parse, the XMLReader will provide information about the XML document through the registered 
+		///
+		/// During the parse, the XMLReader will provide information about the XML document through the registered
 		/// event handlers.
 		///
-		/// This method is synchronous: it will not return until parsing has ended. If a client application 
+		/// This method is synchronous: it will not return until parsing has ended. If a client application
 		/// wants to terminate parsing early, it should throw an exception.
 
 	virtual void parse(const XMLString& systemId) = 0;
 		/// Parse an XML document from a system identifier.
 		/// See also parse(InputSource*).
-		
+
 	virtual void parseMemoryNP(const char* xml, std::size_t size) = 0;
 		/// Parse an XML document from memory.
 		/// See also parse(InputSource*).
@@ -189,7 +189,7 @@ public:
 	static const XMLString FEATURE_EXTERNAL_GENERAL_ENTITIES;
 	static const XMLString FEATURE_EXTERNAL_PARAMETER_ENTITIES;
 	static const XMLString FEATURE_STRING_INTERNING;
-	
+
 	// SAX Properties
 	static const XMLString PROPERTY_DECLARATION_HANDLER;
 	static const XMLString PROPERTY_LEXICAL_HANDLER;
diff --git a/XML/include/Poco/XML/Name.h b/XML/include/Poco/XML/Name.h
index beedea2fa..d0abf7fe1 100644
--- a/XML/include/Poco/XML/Name.h
+++ b/XML/include/Poco/XML/Name.h
@@ -33,33 +33,33 @@ class XML_API Name
 public:
 	Name();
 		/// Creates an empty Name.
-		
+
 	Name(const XMLString& qname);
 		/// Creates a Name from a qualified name only.
 
 	Name(const XMLString& qname, const XMLString& namespaceURI);
 		/// Creates a Name from a qualified name and a namespace URI.
 		/// The local name is extracted from the qualified name.
-		
+
 	Name(const XMLString& qname, const XMLString& namespaceURI, const XMLString& localName);
 		/// Creates a Name from a qualified name, a namespace URI and a local name.
-		
+
 	Name(const Name& name);
 		/// Copy constructor.
 
 	Name(Name&& name) noexcept;
 		/// Move constructor.
-		
+
 	~Name();
 		/// Destroys the name.
-		
+
 	Name& operator = (const Name& name);
 		/// Assignment operator.
 
 	Name& operator = (Name&& name) noexcept;
 		/// Move assignment.
-		
-	void swap(Name& name);
+
+	void swap(Name& name) noexcept;
 		/// Swaps the name with another one.	
 		
 	void assign(const XMLString& qname);
@@ -71,31 +71,31 @@ public:
 
 	void assign(const XMLString& qname, const XMLString& namespaceURI, const XMLString& localName);
 		/// Assigns new values to the name.
-	
+
 	bool equals(const Name& name) const;
 		/// Returns true if both names are equal.
-		
+
 	bool equals(const XMLString& qname, const XMLString& namespaceURI, const XMLString& localName) const;
 		/// Returns true if all the name's components are equal to the given ones.
 
 	bool equalsWeakly(const XMLString& qname, const XMLString& namespaceURI, const XMLString& localName) const;
 		/// Returns true if either the qnames are identical or the namespaceURIs and the localNames are identical.
-	
+
 	const XMLString& qname() const;
 		/// Returns the qualified name.
-		
+
 	const XMLString& namespaceURI() const;
 		/// Returns the namespace URI.
-		
+
 	const XMLString& localName() const;
 		/// Returns the local name.
-		
+
 	XMLString prefix() const;
 		/// Returns the namespace prefix.
-		
+
 	static void split(const XMLString& qname, XMLString& prefix, XMLString& localName);
 		/// Splits the given qualified name into its prefix and localName parts.
-	
+
 	static XMLString localName(const XMLString& qname);
 		/// Returns the local name part of the given qualified name.
 
@@ -132,7 +132,7 @@ inline const XMLString& Name::localName() const
 }
 
 
-inline void swap(Name& n1, Name& n2)
+inline void swap(Name& n1, Name& n2) noexcept
 {
 	n1.swap(n2);
 }
diff --git a/XML/include/Poco/XML/NamePool.h b/XML/include/Poco/XML/NamePool.h
index 9ffadf1af..97f32afdf 100644
--- a/XML/include/Poco/XML/NamePool.h
+++ b/XML/include/Poco/XML/NamePool.h
@@ -43,15 +43,15 @@ public:
 	NamePool(unsigned long size = POCO_XML_NAMEPOOL_DEFAULT_SIZE);
 		/// Creates a name pool with room for up to size strings.
 		///
-		/// The given size should be a suitable prime number, 
+		/// The given size should be a suitable prime number,
 		/// e.g. 251, 509, 1021 or 4093.
-	
-	const Name& insert(const XMLString& qname, const XMLString& namespaceURI, const XMLString& localName);	
+
+	const Name& insert(const XMLString& qname, const XMLString& namespaceURI, const XMLString& localName);
 		/// Returns a const reference to an Name for the given names.
 		/// Creates the Name if it does not already exist.
 		/// Throws a PoolOverflowException if the name pool is full.
 
-	const Name& insert(const Name& name);	
+	const Name& insert(const Name& name);
 		/// Returns a const reference to an Name for the given name.
 		/// Creates the Name if it does not already exist.
 		/// Throws a PoolOverflowException if the name pool is full.
diff --git a/XML/include/Poco/XML/NamespaceStrategy.h b/XML/include/Poco/XML/NamespaceStrategy.h
index 1f27e3c23..75bacf59a 100644
--- a/XML/include/Poco/XML/NamespaceStrategy.h
+++ b/XML/include/Poco/XML/NamespaceStrategy.h
@@ -42,7 +42,7 @@ public:
 	virtual void startElement(const XMLChar* name, const XMLChar** atts, int specifiedCount, ContentHandler* pContentHandler) = 0;
 		/// Translate the arguments as delivered by Expat and
 		/// call the startElement() method of the ContentHandler.
-		
+
 	virtual void endElement(const XMLChar* name, ContentHandler* pContentHandler) = 0;
 		/// Translate the arguments as delivered by Expat and
 		/// call the endElement() method of the ContentHandler.
@@ -62,10 +62,10 @@ class XML_API NoNamespacesStrategy: public NamespaceStrategy
 public:
 	NoNamespacesStrategy();
 	~NoNamespacesStrategy();
-	
+
 	void startElement(const XMLChar* name, const XMLChar** atts, int specifiedCount, ContentHandler* pContentHandler);
 	void endElement(const XMLChar* name, ContentHandler* pContentHandler);
-	
+
 private:
 	XMLString _name;
 	AttributesImpl _attrs;
@@ -79,7 +79,7 @@ class XML_API NoNamespacePrefixesStrategy: public NamespaceStrategy
 public:
 	NoNamespacePrefixesStrategy();
 	~NoNamespacePrefixesStrategy();
-	
+
 	void startElement(const XMLChar* name, const XMLChar** atts, int specifiedCount, ContentHandler* pContentHandler);
 	void endElement(const XMLChar* name, ContentHandler* pContentHandler);
 
@@ -97,10 +97,10 @@ class XML_API NamespacePrefixesStrategy: public NamespaceStrategy
 public:
 	NamespacePrefixesStrategy();
 	~NamespacePrefixesStrategy();
-	
+
 	void startElement(const XMLChar* name, const XMLChar** atts, int specifiedCount, ContentHandler* pContentHandler);
 	void endElement(const XMLChar* name, ContentHandler* pContentHandler);
-	
+
 private:
 	XMLString _uri;
 	XMLString _local;
diff --git a/XML/include/Poco/XML/QName.h b/XML/include/Poco/XML/QName.h
index 9aab3305b..90777bd1a 100644
--- a/XML/include/Poco/XML/QName.h
+++ b/XML/include/Poco/XML/QName.h
@@ -47,7 +47,7 @@ public:
 
 	QName& operator = (const QName& qname);
 	QName& operator = (QName&& qname) noexcept;
-	void swap(QName& qname);
+	void swap(QName& qname) noexcept;
 
 	const std::string& namespaceURI() const;
 		/// Returns the namespace URI part of the name.
diff --git a/XML/include/Poco/XML/XML.h b/XML/include/Poco/XML/XML.h
index 19a21a3b4..2a499ef3b 100644
--- a/XML/include/Poco/XML/XML.h
+++ b/XML/include/Poco/XML/XML.h
@@ -24,10 +24,10 @@
 
 
 //
-// The following block is the standard way of creating macros which make exporting 
+// The following block is the standard way of creating macros which make exporting
 // from a DLL simpler. All files within this DLL are compiled with the XML_EXPORTS
 // symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see 
+// that uses this DLL. This way any other project whose source files include this file see
 // XML_API functions as being imported from a DLL, whereas this DLL sees symbols
 // defined with this macro as being exported.
 //
@@ -35,7 +35,7 @@
 	#if defined(XML_EXPORTS)
 		#define XML_API __declspec(dllexport)
 	#else
-		#define XML_API __declspec(dllimport)	
+		#define XML_API __declspec(dllimport)
 	#endif
 #endif
 
diff --git a/XML/include/Poco/XML/XMLString.h b/XML/include/Poco/XML/XMLString.h
index 719fe7b8b..3383f21f0 100644
--- a/XML/include/Poco/XML/XMLString.h
+++ b/XML/include/Poco/XML/XMLString.h
@@ -49,11 +49,11 @@ namespace XML {
 	std::string fromXMLString(const XMLString& str);
 		/// Converts an XMLString into an UTF-8 encoded
 		/// string.
-		
+
 	XMLString toXMLString(const std::string& str);
 		/// Converts an UTF-8 encoded string into an
 		/// XMLString
-		
+
 	#define XML_LIT(lit) L##lit
 
 #elif defined(XML_UNICODE)
@@ -75,7 +75,7 @@ namespace XML {
 	{
 		return str;
 	}
-	
+
 	#define XML_LIT(lit) lit
 
 #endif
diff --git a/XML/include/Poco/XML/XMLWriter.h b/XML/include/Poco/XML/XMLWriter.h
index 5f947ef17..5996361eb 100644
--- a/XML/include/Poco/XML/XMLWriter.h
+++ b/XML/include/Poco/XML/XMLWriter.h
@@ -42,9 +42,9 @@ class Locator;
 class XML_API XMLWriter: public ContentHandler, public LexicalHandler, public DTDHandler
 	/// This class serializes SAX2 ContentHandler, LexicalHandler and
 	/// DTDHandler events back into a stream.
-	/// 
+	///
 	/// Various consistency checks are performed on the written data
-	/// (i.e. there must be exactly one root element and every startElement() 
+	/// (i.e. there must be exactly one root element and every startElement()
 	/// must have a matching endElement()).
 	///
 	/// The XMLWriter supports optional pretty-printing of the serialized XML.
@@ -52,7 +52,7 @@ class XML_API XMLWriter: public ContentHandler, public LexicalHandler, public DT
 	/// information set of the document being written, since in
 	/// XML all whitespace is potentially relevant to an application.
 	///
-	/// The writer contains extensive support for XML Namespaces, so that a client  
+	/// The writer contains extensive support for XML Namespaces, so that a client
 	/// application does not have to keep track of prefixes and supply xmlns attributes.
 	///
 	/// If the client does not provide namespace prefixes (either by specifying them
@@ -66,23 +66,23 @@ public:
 		CANONICAL               = 0x00,
 			/// Do not write an XML declaration (default).
 
-		CANONICAL_XML           = 0x01, 
-			/// Enables basic support for Canonical XML: 
+		CANONICAL_XML           = 0x01,
+			/// Enables basic support for Canonical XML:
 			///   - do not write an XML declaration
 			///   - do not use special empty element syntax
 			///   - set the New Line character to NEWLINE_LF
-			///   - write namespace declarations and attributes 
+			///   - write namespace declarations and attributes
 			///     in canonical order
 			///   - use default namespace as much as possible
 
-		WRITE_XML_DECLARATION   = 0x02, 
+		WRITE_XML_DECLARATION   = 0x02,
 			/// Write an XML declaration.
 
-		PRETTY_PRINT            = 0x04, 
+		PRETTY_PRINT            = 0x04,
 			/// Pretty-print XML markup.
 
 		PRETTY_PRINT_ATTRIBUTES = 0x08
-			/// Write each attribute on a separate line. 
+			/// Write each attribute on a separate line.
 			/// PRETTY_PRINT must be specified as well.
 	};
 
@@ -129,7 +129,7 @@ public:
 		/// The given string should only contain TAB or SPACE
 		/// characters (e.g., a single TAB character, or
 		/// two to four SPACE characters).
-		
+
 	const std::string& getIndent() const;
 		/// Returns the string used for one indentation step.
 
@@ -168,7 +168,7 @@ public:
 	void startElement(const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname);
 		/// Writes an XML start element tag with no attributes.
 		/// See the other startElement() method for more information.
-		
+
 	void endElement(const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname);
 		/// Writes an XML end element tag.
 		///
@@ -186,7 +186,7 @@ public:
 		/// greater-than signs are escaped, unless a CDATA section
 		/// has been opened by calling startCDATA().
 		///
-		/// The characters must be encoded in UTF-8 (if XMLChar is char) or 
+		/// The characters must be encoded in UTF-8 (if XMLChar is char) or
 		/// UTF-16 (if XMLChar is wchar_t).
 
 	void characters(const XMLString& str);
@@ -194,7 +194,7 @@ public:
 		/// greater-than signs are escaped, unless a CDATA section
 		/// has been opened by calling startCDATA().
 		///
-		/// The characters must be encoded in UTF-8 (if XMLChar is char) or 
+		/// The characters must be encoded in UTF-8 (if XMLChar is char) or
 		/// UTF-16 (if XMLChar is wchar_t).
 
 	void rawCharacters(const XMLString& str);
@@ -202,7 +202,7 @@ public:
 		/// The caller is responsible for escaping characters as
 		/// necessary to produce valid XML.
 		///
-		/// The characters must be encoded in UTF-8 (if XMLChar is char) or 
+		/// The characters must be encoded in UTF-8 (if XMLChar is char) or
 		/// UTF-16 (if XMLChar is wchar_t).
 
 	void ignorableWhitespace(const XMLChar ch[], int start, int length);
@@ -222,7 +222,7 @@ public:
 	void skippedEntity(const XMLString& name);
 		/// Does nothing.
 
-	void dataElement(const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname, const XMLString& data, 
+	void dataElement(const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname, const XMLString& data,
 	                         const XMLString& attr1 = XMLString(), const XMLString& value1 = XMLString(),
 							 const XMLString& attr2 = XMLString(), const XMLString& value2 = XMLString(),
 							 const XMLString& attr3 = XMLString(), const XMLString& value3 = XMLString());
@@ -250,7 +250,7 @@ public:
 
 	void endEntity(const XMLString& name);
 		/// Does nothing.
-	
+
 	// DTDHandler
 	void notationDecl(const XMLString& name, const XMLString* publicId, const XMLString* systemId);
 	void unparsedEntityDecl(const XMLString& name, const XMLString* publicId, const XMLString& systemId, const XMLString& notationName);
@@ -268,12 +268,12 @@ public:
 	bool isNamespaceMapped(const XMLString& namespc) const;
 		/// Returns true if the given namespace has been mapped
 		/// to a prefix in the current element or its ancestors.
-		
+
 	// Misc.
 	int depth() const;
 		/// Return the number of nested XML elements.
 		///
-		/// Will be -1 if no document or fragment has been started, 
+		/// Will be -1 if no document or fragment has been started,
 		/// 0 if the document or fragment has been started,
 		/// 1 if the document element has been written and
 		/// > 1 for every element nested within the document element.
@@ -318,7 +318,7 @@ private:
 		XMLString namespaceURI;
 	};
 	typedef std::vector<Name> ElementStack;
-	
+
 	Poco::OutputStreamConverter* _pTextConverter;
 	Poco::TextEncoding*          _pInEncoding;
 	Poco::TextEncoding*          _pOutEncoding;
diff --git a/XML/samples/DOMParser/DOMParser.progen b/XML/samples/DOMParser/DOMParser.progen
index 388d29903..cd5b15cf0 100644
--- a/XML/samples/DOMParser/DOMParser.progen
+++ b/XML/samples/DOMParser/DOMParser.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/XML/samples/DOMParser/src/DOMParser.cpp b/XML/samples/DOMParser/src/DOMParser.cpp
index 8bae484e9..baf5db7f6 100644
--- a/XML/samples/DOMParser/src/DOMParser.cpp
+++ b/XML/samples/DOMParser/src/DOMParser.cpp
@@ -35,13 +35,13 @@ int main(int argc, char** argv)
 {
 	// Parse an XML document from standard input
 	// and use a NodeIterator to print out all nodes.
-	
+
 	InputSource src(std::cin);
 	try
 	{
 		DOMParser parser;
 		AutoPtr<Document> pDoc = parser.parse(&src);
-		
+
 		NodeIterator it(pDoc, NodeFilter::SHOW_ALL);
 		Node* pNode = it.nextNode();
 		while (pNode)
@@ -54,6 +54,6 @@ int main(int argc, char** argv)
 	{
 		std::cerr << exc.displayText() << std::endl;
 	}
-	
+
 	return 0;
 }
diff --git a/XML/samples/DOMWriter/DOMWriter.progen b/XML/samples/DOMWriter/DOMWriter.progen
index 388d29903..cd5b15cf0 100644
--- a/XML/samples/DOMWriter/DOMWriter.progen
+++ b/XML/samples/DOMWriter/DOMWriter.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/XML/samples/DOMWriter/src/DOMWriter.cpp b/XML/samples/DOMWriter/src/DOMWriter.cpp
index 1c0ba0ca1..c74c52206 100644
--- a/XML/samples/DOMWriter/src/DOMWriter.cpp
+++ b/XML/samples/DOMWriter/src/DOMWriter.cpp
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 	// build a DOM document and write it to standard output.
 
 	AutoPtr<Document> pDoc = new Document;
-	
+
 	AutoPtr<Element> pRoot = pDoc->createElement("root");
 	pDoc->appendChild(pRoot);
 
@@ -46,11 +46,11 @@ int main(int argc, char** argv)
 	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
 	pChild2->appendChild(pText2);
 	pRoot->appendChild(pChild2);
-	
+
 	DOMWriter writer;
 	writer.setNewLine("\n");
 	writer.setOptions(XMLWriter::PRETTY_PRINT);
 	writer.writeNode(std::cout, pDoc);
-	
+
 	return 0;
 }
diff --git a/XML/samples/PrettyPrint/PrettyPrint.progen b/XML/samples/PrettyPrint/PrettyPrint.progen
index 388d29903..cd5b15cf0 100644
--- a/XML/samples/PrettyPrint/PrettyPrint.progen
+++ b/XML/samples/PrettyPrint/PrettyPrint.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/XML/samples/PrettyPrint/src/PrettyPrint.cpp b/XML/samples/PrettyPrint/src/PrettyPrint.cpp
index 6bd8bf0e7..88dacf227 100644
--- a/XML/samples/PrettyPrint/src/PrettyPrint.cpp
+++ b/XML/samples/PrettyPrint/src/PrettyPrint.cpp
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 
 	SAXParser parser;
 	WhitespaceFilter filter(&parser);
-	
+
 	XMLWriter writer(std::cout, XMLWriter::CANONICAL | XMLWriter::PRETTY_PRINT);
 	writer.setNewLine(XMLWriter::NEWLINE_LF);
 
diff --git a/XML/samples/SAXParser/SAXParser.progen b/XML/samples/SAXParser/SAXParser.progen
index 388d29903..cd5b15cf0 100644
--- a/XML/samples/SAXParser/SAXParser.progen
+++ b/XML/samples/SAXParser/SAXParser.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/XML/samples/SAXParser/src/SAXParser.cpp b/XML/samples/SAXParser/src/SAXParser.cpp
index eeb3d8200..b730a2712 100644
--- a/XML/samples/SAXParser/src/SAXParser.cpp
+++ b/XML/samples/SAXParser/src/SAXParser.cpp
@@ -36,23 +36,23 @@ public:
 		_pLocator(0)
 	{
 	}
-	
+
 	// ContentHandler
 	void setDocumentLocator(const Locator* loc)
 	{
 		_pLocator = loc;
 	}
-	
+
 	void startDocument()
 	{
 		where("startDocument");
 	}
-	
+
 	void endDocument()
 	{
 		where("endDocument");
 	}
-	
+
 	void startElement(const XMLString& uri, const XMLString& localName, const XMLString& qname, const Attributes& attributes)
 	{
 		where("startElement");
@@ -65,83 +65,83 @@ public:
 			std::cout << attributes.getLocalName(i) << "=" << attributes.getValue(i) << std::endl;
 		}
 	}
-	
+
 	void endElement(const XMLString& uri, const XMLString& localName, const XMLString& qname)
 	{
 		where("endElement");
 	}
-	
+
 	void characters(const XMLChar ch[], int start, int length)
 	{
 		where("characters");
 		std::cout << std::string(ch + start, length) << std::endl;
 	}
-	
+
 	void ignorableWhitespace(const XMLChar ch[], int start, int length)
 	{
 		where("ignorableWhitespace");
 	}
-	
+
 	void processingInstruction(const XMLString& target, const XMLString& data)
 	{
 		where("processingInstruction");
 		std::cout << "target=" << target << ", data=" << data << std::endl;
 	}
-	
+
 	void startPrefixMapping(const XMLString& prefix, const XMLString& uri)
 	{
 		where("startPrefixMapping");
 		std::cout << "prefix=" << prefix << " uri=" << uri << std::endl;
 	}
-	
+
 	void endPrefixMapping(const XMLString& prefix)
 	{
 		where("endPrefixMapping");
 		std::cout << "prefix=" << prefix << std::endl;
 	}
-	
+
 	void skippedEntity(const XMLString& name)
 	{
 		where("skippedEntity");
 		std::cout << "name=" << name << std::endl;
 	}
-	
+
 	// LexicalHandler
 	void startDTD(const XMLString& name, const XMLString& publicId, const XMLString& systemId)
 	{
 		where("startDTD");
 	}
-	
+
 	void endDTD()
 	{
 		where("endDTD");
 	}
-	
+
 	void startEntity(const XMLString& name)
 	{
 		where("startEntity");
 	}
-	
+
 	void endEntity(const XMLString& name)
 	{
 		where("endEntity");
 	}
-	
+
 	void startCDATA()
 	{
 		where("startCDATA");
 	}
-	
+
 	void endCDATA()
 	{
 		where("endCDATA");
 	}
-	
+
 	void comment(const XMLChar ch[], int start, int length)
 	{
 		where("comment");
 	}
-	
+
 protected:
 	void where(const std::string& meth)
 	{
@@ -150,12 +150,12 @@ protected:
 		{
 			std::cout << " in "
 			          << _pLocator->getSystemId()
-			          << ", line " << _pLocator->getLineNumber() 
-			          << ", col " << _pLocator->getColumnNumber() 
+			          << ", line " << _pLocator->getLineNumber()
+			          << ", col " << _pLocator->getColumnNumber()
 			          << std::endl;
 		}
 	}
-	
+
 private:
 	const Locator* _pLocator;
 };
@@ -170,7 +170,7 @@ int main(int argc, char** argv)
 		std::cout << "usage: " << argv[0] << ": <xmlfile>" << std::endl;
 		return 1;
 	}
-	
+
 	MyHandler handler;
 
 	SAXParser parser;
@@ -178,7 +178,7 @@ int main(int argc, char** argv)
 	parser.setFeature(XMLReader::FEATURE_NAMESPACE_PREFIXES, true);
 	parser.setContentHandler(&handler);
 	parser.setProperty(XMLReader::PROPERTY_LEXICAL_HANDLER, static_cast<LexicalHandler*>(&handler));
-	
+
 	try
 	{
 		parser.parse(argv[1]);
@@ -188,6 +188,6 @@ int main(int argc, char** argv)
 		std::cerr << e.displayText() << std::endl;
 		return 2;
 	}
-	
+
 	return 0;
 }
diff --git a/XML/src/AbstractNode.cpp b/XML/src/AbstractNode.cpp
index d1c4912ea..6d048a608 100644
--- a/XML/src/AbstractNode.cpp
+++ b/XML/src/AbstractNode.cpp
@@ -233,7 +233,7 @@ void AbstractNode::addEventListener(const XMLString& type, EventListener* listen
 		_pEventDispatcher->removeEventListener(type, listener, useCapture);
 	else
 		_pEventDispatcher = new EventDispatcher;
-	
+
 	_pEventDispatcher->addEventListener(type, listener, useCapture);
 }
 
@@ -276,7 +276,7 @@ void AbstractNode::captureEvent(Event* evt)
 {
 	if (_pParent)
 		_pParent->captureEvent(evt);
-	
+
 	if (_pEventDispatcher && !evt->isStopped())
 	{
 		evt->setCurrentTarget(this);
diff --git a/XML/src/Attr.cpp b/XML/src/Attr.cpp
index b5e22dd82..15c9e1688 100644
--- a/XML/src/Attr.cpp
+++ b/XML/src/Attr.cpp
@@ -30,7 +30,7 @@ Attr::Attr(Document* pOwnerDocument, Element* pOwnerElement, const XMLString& na
 }
 
 
-Attr::Attr(Document* pOwnerDocument, const Attr& attr): 
+Attr::Attr(Document* pOwnerDocument, const Attr& attr):
 	AbstractNode(pOwnerDocument, attr),
 	_name(pOwnerDocument->namePool().insert(attr._name)),
 	_value(attr._value),
diff --git a/XML/src/AttrMap.cpp b/XML/src/AttrMap.cpp
index cb3a24133..8c14227c5 100644
--- a/XML/src/AttrMap.cpp
+++ b/XML/src/AttrMap.cpp
@@ -27,7 +27,7 @@ AttrMap::AttrMap(Element* pElement):
 	_pElement(pElement)
 {
 	poco_check_ptr (pElement);
-	
+
 	_pElement->duplicate();
 }
 
@@ -50,7 +50,7 @@ Node* AttrMap::setNamedItem(Node* arg)
 
 	if (arg->nodeType() != Node::ATTRIBUTE_NODE)
 		throw DOMException(DOMException::HIERARCHY_REQUEST_ERR);
-		
+
 	return _pElement->setAttributeNode(static_cast<Attr*>(arg));
 }
 
@@ -77,7 +77,7 @@ unsigned long AttrMap::length() const
 {
 	unsigned long result = 0;
 	AbstractNode* pAttr = _pElement->_pFirstAttr;
-	while (pAttr) 
+	while (pAttr)
 	{
 		pAttr = static_cast<AbstractNode*>(pAttr->nextSibling());
 		++result;
diff --git a/XML/src/AttributesImpl.cpp b/XML/src/AttributesImpl.cpp
index fe5b24ff2..ad1c7baa9 100644
--- a/XML/src/AttributesImpl.cpp
+++ b/XML/src/AttributesImpl.cpp
@@ -278,7 +278,7 @@ AttributesImpl::Attribute* AttributesImpl::find(const XMLString& qname) const
 {
 	for (AttributeVec::const_iterator it = _attributes.begin(); it != _attributes.end(); ++it)
 	{
-		if (it->qname == qname) 
+		if (it->qname == qname)
 			return const_cast<Attribute*>(&(*it));
 	}
 	return 0;
@@ -289,7 +289,7 @@ AttributesImpl::Attribute* AttributesImpl::find(const XMLString& namespaceURI, c
 {
 	for (AttributeVec::const_iterator it = _attributes.begin(); it != _attributes.end(); ++it)
 	{
-		if (it->namespaceURI == namespaceURI && it->localName == localName) 
+		if (it->namespaceURI == namespaceURI && it->localName == localName)
 			return const_cast<Attribute*>(&(*it));
 	}
 	return 0;
diff --git a/XML/src/CDATASection.cpp b/XML/src/CDATASection.cpp
index 229582e14..8c4c24362 100644
--- a/XML/src/CDATASection.cpp
+++ b/XML/src/CDATASection.cpp
@@ -24,13 +24,13 @@ namespace XML {
 const XMLString CDATASection::NODE_NAME = toXMLString("#cdata-section");
 
 
-CDATASection::CDATASection(Document* pOwnerDocument, const XMLString& data): 
+CDATASection::CDATASection(Document* pOwnerDocument, const XMLString& data):
 	Text(pOwnerDocument, data)
 {
 }
 
 
-CDATASection::CDATASection(Document* pOwnerDocument, const CDATASection& sec): 
+CDATASection::CDATASection(Document* pOwnerDocument, const CDATASection& sec):
 	Text(pOwnerDocument, sec)
 {
 }
diff --git a/XML/src/CharacterData.cpp b/XML/src/CharacterData.cpp
index f8a3ec324..3852c099b 100644
--- a/XML/src/CharacterData.cpp
+++ b/XML/src/CharacterData.cpp
@@ -21,14 +21,14 @@ namespace Poco {
 namespace XML {
 
 
-CharacterData::CharacterData(Document* pOwnerDocument, const XMLString& data): 
+CharacterData::CharacterData(Document* pOwnerDocument, const XMLString& data):
 	AbstractNode(pOwnerDocument),
 	_data(data)
 {
 }
 
 
-CharacterData::CharacterData(Document* pOwnerDocument, const CharacterData& data): 
+CharacterData::CharacterData(Document* pOwnerDocument, const CharacterData& data):
 	AbstractNode(pOwnerDocument, data),
 	_data(data._data)
 {
diff --git a/XML/src/Comment.cpp b/XML/src/Comment.cpp
index 090f1926e..e66499c31 100644
--- a/XML/src/Comment.cpp
+++ b/XML/src/Comment.cpp
@@ -22,13 +22,13 @@ namespace XML {
 const XMLString Comment::NODE_NAME = toXMLString("#comment");
 
 
-Comment::Comment(Document* pOwnerDocument, const XMLString& data): 
+Comment::Comment(Document* pOwnerDocument, const XMLString& data):
 	CharacterData(pOwnerDocument, data)
 {
 }
 
 
-Comment::Comment(Document* pOwnerDocument, const Comment& comment): 
+Comment::Comment(Document* pOwnerDocument, const Comment& comment):
 	CharacterData(pOwnerDocument, comment)
 {
 }
diff --git a/XML/src/DOMException.cpp b/XML/src/DOMException.cpp
index 546a1e2aa..e99d9d64f 100644
--- a/XML/src/DOMException.cpp
+++ b/XML/src/DOMException.cpp
@@ -47,19 +47,19 @@ DOMException::DOMException(unsigned short code):
 {
 }
 
-	
+
 DOMException::DOMException(const DOMException& exc):
 	XMLException(exc),
 	_code(exc._code)
 {
 }
 
-	
+
 DOMException::~DOMException() noexcept
 {
 }
 
-	
+
 DOMException& DOMException::operator = (const DOMException& exc)
 {
 	if (&exc != this)
diff --git a/XML/src/DOMImplementation.cpp b/XML/src/DOMImplementation.cpp
index b6a138d67..208d6499e 100644
--- a/XML/src/DOMImplementation.cpp
+++ b/XML/src/DOMImplementation.cpp
@@ -53,7 +53,7 @@ bool DOMImplementation::hasFeature(const XMLString& feature, const XMLString& ve
 	       (lcFeature == FEATURE_TRAVERSAL && version == VERSION_2_0);
 }
 
-		
+
 DocumentType* DOMImplementation::createDocumentType(const XMLString& name, const XMLString& publicId, const XMLString& systemId) const
 {
 	return new DocumentType(0, name, publicId, systemId);
diff --git a/XML/src/DOMObject.cpp b/XML/src/DOMObject.cpp
index a82708f0d..06f091f0d 100644
--- a/XML/src/DOMObject.cpp
+++ b/XML/src/DOMObject.cpp
@@ -23,7 +23,7 @@ DOMObject::DOMObject(): _rc(1)
 {
 }
 
-	
+
 DOMObject::~DOMObject()
 {
 }
diff --git a/XML/src/DOMSerializer.cpp b/XML/src/DOMSerializer.cpp
index 35e7950bc..e6dcff0cd 100644
--- a/XML/src/DOMSerializer.cpp
+++ b/XML/src/DOMSerializer.cpp
@@ -198,25 +198,25 @@ void DOMSerializer::handleNode(const Node* pNode) const
 	switch (pNode->nodeType())
 	{
 	case Node::ELEMENT_NODE:
-		handleElement(static_cast<const Element*>(pNode)); 
+		handleElement(static_cast<const Element*>(pNode));
 		break;
 	case Node::TEXT_NODE:
-		handleCharacterData(static_cast<const Text*>(pNode)); 
+		handleCharacterData(static_cast<const Text*>(pNode));
 		break;
 	case Node::CDATA_SECTION_NODE:
-		handleCDATASection(static_cast<const CDATASection*>(pNode)); 
+		handleCDATASection(static_cast<const CDATASection*>(pNode));
 		break;
 	case Node::ENTITY_NODE:
 		handleEntity(static_cast<const Entity*>(pNode));
 		break;
 	case Node::PROCESSING_INSTRUCTION_NODE:
-		handlePI(static_cast<const ProcessingInstruction*>(pNode)); 
+		handlePI(static_cast<const ProcessingInstruction*>(pNode));
 		break;
 	case Node::COMMENT_NODE:
-		handleComment(static_cast<const Comment*>(pNode)); 
+		handleComment(static_cast<const Comment*>(pNode));
 		break;
 	case Node::DOCUMENT_NODE:
-		handleDocument(static_cast<const Document*>(pNode)); 
+		handleDocument(static_cast<const Document*>(pNode));
 		break;
 	case Node::DOCUMENT_TYPE_NODE:
 		handleDocumentType(static_cast<const DocumentType*>(pNode));
@@ -233,7 +233,7 @@ void DOMSerializer::handleNode(const Node* pNode) const
 
 void DOMSerializer::handleElement(const Element* pElement) const
 {
-	if (_pContentHandler) 
+	if (_pContentHandler)
 	{
 		AutoPtr<NamedNodeMap> pAttrs = pElement->attributes();
 		AttributesImpl saxAttrs;
diff --git a/XML/src/DOMWriter.cpp b/XML/src/DOMWriter.cpp
index 8a087643e..17aa225df 100644
--- a/XML/src/DOMWriter.cpp
+++ b/XML/src/DOMWriter.cpp
@@ -77,7 +77,7 @@ void DOMWriter::writeNode(XMLByteOutputStream& ostr, const Node* pNode)
 	XMLWriter writer(ostr, _options, _encodingName, _pTextEncoding);
 	writer.setNewLine(_newLine);
 	writer.setIndent(_indent);
-	
+
 	DOMSerializer serializer;
 	serializer.setContentHandler(&writer);
 	serializer.setDTDHandler(&writer);
@@ -93,7 +93,7 @@ void DOMWriter::writeNode(const std::string& systemId, const Node* pNode)
 	Poco::FileOutputStream ostr(systemId);
 	if (ostr.good())
 		writeNode(ostr, pNode);
-	else 
+	else
 		throw Poco::CreateFileException(systemId);
 }
 
diff --git a/XML/src/Document.cpp b/XML/src/Document.cpp
index cb6ff125c..9a7417cfb 100644
--- a/XML/src/Document.cpp
+++ b/XML/src/Document.cpp
@@ -38,7 +38,7 @@ namespace XML {
 const XMLString Document::NODE_NAME = toXMLString("#document");
 
 
-Document::Document(NamePool* pNamePool): 
+Document::Document(NamePool* pNamePool):
 	AbstractContainerNode(0),
 	_pDocumentType(0),
 	_eventSuspendLevel(0)
@@ -55,7 +55,7 @@ Document::Document(NamePool* pNamePool):
 }
 
 
-Document::Document(unsigned long namePoolSize): 
+Document::Document(unsigned long namePoolSize):
 	AbstractContainerNode(0),
 	_pDocumentType(0),
 	_pNamePool(new NamePool(namePoolSize)),
@@ -64,7 +64,7 @@ Document::Document(unsigned long namePoolSize):
 }
 
 
-Document::Document(DocumentType* pDocumentType, NamePool* pNamePool): 
+Document::Document(DocumentType* pDocumentType, NamePool* pNamePool):
 	AbstractContainerNode(0),
 	_pDocumentType(pDocumentType),
 	_eventSuspendLevel(0)
@@ -86,7 +86,7 @@ Document::Document(DocumentType* pDocumentType, NamePool* pNamePool):
 }
 
 
-Document::Document(DocumentType* pDocumentType, unsigned long namePoolSize): 
+Document::Document(DocumentType* pDocumentType, unsigned long namePoolSize):
 	AbstractContainerNode(0),
 	_pDocumentType(pDocumentType),
 	_pNamePool(new NamePool(namePoolSize)),
@@ -155,7 +155,7 @@ Element* Document::documentElement() const
 
 Element* Document::createElement(const XMLString& tagName) const
 {
-	return new Element(const_cast<Document*>(this), EMPTY_STRING, EMPTY_STRING, tagName); 
+	return new Element(const_cast<Document*>(this), EMPTY_STRING, EMPTY_STRING, tagName);
 }
 
 
@@ -203,7 +203,7 @@ EntityReference* Document::createEntityReference(const XMLString& name) const
 
 NodeList* Document::getElementsByTagName(const XMLString& name) const
 {
-	return new ElementsByTagNameList(const_cast<Document*>(this), name);	
+	return new ElementsByTagNameList(const_cast<Document*>(this), name);
 }
 
 
@@ -239,7 +239,7 @@ Attr* Document::createAttributeNS(const XMLString& namespaceURI, const XMLString
 
 NodeList* Document::getElementsByTagNameNS(const XMLString& namespaceURI, const XMLString& localName) const
 {
-	return new ElementsByTagNameListNS(const_cast<Document*>(this), namespaceURI, localName);	
+	return new ElementsByTagNameListNS(const_cast<Document*>(this), namespaceURI, localName);
 }
 
 
diff --git a/XML/src/DocumentFragment.cpp b/XML/src/DocumentFragment.cpp
index 462be5292..1a2a21c70 100644
--- a/XML/src/DocumentFragment.cpp
+++ b/XML/src/DocumentFragment.cpp
@@ -22,13 +22,13 @@ namespace XML {
 const XMLString DocumentFragment::NODE_NAME = toXMLString("#document-fragment");
 
 
-DocumentFragment::DocumentFragment(Document* pOwnerDocument): 
+DocumentFragment::DocumentFragment(Document* pOwnerDocument):
 	AbstractContainerNode(pOwnerDocument)
 {
 }
 
 
-DocumentFragment::DocumentFragment( Document* pOwnerDocument, const DocumentFragment& fragment): 
+DocumentFragment::DocumentFragment( Document* pOwnerDocument, const DocumentFragment& fragment):
 	AbstractContainerNode(pOwnerDocument, fragment)
 {
 }
diff --git a/XML/src/DocumentType.cpp b/XML/src/DocumentType.cpp
index 26753a768..bd07be6ba 100644
--- a/XML/src/DocumentType.cpp
+++ b/XML/src/DocumentType.cpp
@@ -22,7 +22,7 @@ namespace Poco {
 namespace XML {
 
 
-DocumentType::DocumentType(Document* pOwner, const XMLString& name, const XMLString& publicId, const XMLString& systemId): 
+DocumentType::DocumentType(Document* pOwner, const XMLString& name, const XMLString& publicId, const XMLString& systemId):
 	AbstractContainerNode(pOwner),
 	_name(name),
 	_publicId(publicId),
@@ -31,7 +31,7 @@ DocumentType::DocumentType(Document* pOwner, const XMLString& name, const XMLStr
 }
 
 
-DocumentType::DocumentType(Document* pOwner, const DocumentType& doctype): 
+DocumentType::DocumentType(Document* pOwner, const DocumentType& doctype):
 	AbstractContainerNode(pOwner, doctype),
 	_name(doctype._name),
 	_publicId(doctype._publicId),
diff --git a/XML/src/Element.cpp b/XML/src/Element.cpp
index e66039ade..056466e3c 100644
--- a/XML/src/Element.cpp
+++ b/XML/src/Element.cpp
@@ -33,7 +33,7 @@ Element::Element(Document* pOwnerDocument, const XMLString& namespaceURI, const
 }
 
 
-Element::Element(Document* pOwnerDocument, const Element& element): 
+Element::Element(Document* pOwnerDocument, const Element& element):
 	AbstractContainerNode(pOwnerDocument, element),
 	_name(pOwnerDocument->namePool().insert(element._name)),
 	_pFirstAttr(0)
@@ -129,7 +129,7 @@ Attr* Element::removeAttributeNode(Attr* oldAttr)
 {
 	poco_check_ptr (oldAttr);
 
-	if (_pOwner->events()) 
+	if (_pOwner->events())
 		dispatchAttrModified(oldAttr, MutationEvent::REMOVAL, oldAttr->getValue(), EMPTY_STRING);
 
 	if (oldAttr != _pFirstAttr)
diff --git a/XML/src/ElementsByTagNameList.cpp b/XML/src/ElementsByTagNameList.cpp
index d6bc382ff..661658039 100644
--- a/XML/src/ElementsByTagNameList.cpp
+++ b/XML/src/ElementsByTagNameList.cpp
@@ -28,7 +28,7 @@ ElementsByTagNameList::ElementsByTagNameList(const Node* pParent, const XMLStrin
 	_count(0)
 {
 	poco_check_ptr (pParent);
-	
+
 	_pParent->duplicate();
 }
 
@@ -94,7 +94,7 @@ ElementsByTagNameListNS::ElementsByTagNameListNS(const Node* pParent, const XMLS
 	_count(0)
 {
 	poco_check_ptr (pParent);
-	
+
 	_pParent->duplicate();
 }
 
diff --git a/XML/src/Entity.cpp b/XML/src/Entity.cpp
index 226b57b19..43a748395 100644
--- a/XML/src/Entity.cpp
+++ b/XML/src/Entity.cpp
@@ -22,7 +22,7 @@ namespace XML {
 const XMLString Entity::NODE_NAME = toXMLString("#entity");
 
 
-Entity::Entity(Document* pOwnerDocument, const XMLString& name, const XMLString& publicId, const XMLString& systemId, const XMLString& notationName): 
+Entity::Entity(Document* pOwnerDocument, const XMLString& name, const XMLString& publicId, const XMLString& systemId, const XMLString& notationName):
 	AbstractContainerNode(pOwnerDocument),
 	_name(name),
 	_publicId(publicId),
@@ -32,7 +32,7 @@ Entity::Entity(Document* pOwnerDocument, const XMLString& name, const XMLString&
 }
 
 
-Entity::Entity(Document* pOwnerDocument, const Entity& entity): 
+Entity::Entity(Document* pOwnerDocument, const Entity& entity):
 	AbstractContainerNode(pOwnerDocument, entity),
 	_name(entity._name),
 	_publicId(entity._publicId),
diff --git a/XML/src/EntityReference.cpp b/XML/src/EntityReference.cpp
index c57b4e807..702946919 100644
--- a/XML/src/EntityReference.cpp
+++ b/XML/src/EntityReference.cpp
@@ -19,14 +19,14 @@ namespace Poco {
 namespace XML {
 
 
-EntityReference::EntityReference(Document* pOwnerDocument, const XMLString& name): 
+EntityReference::EntityReference(Document* pOwnerDocument, const XMLString& name):
 	AbstractNode(pOwnerDocument),
 	_name(name)
 {
 }
 
 
-EntityReference::EntityReference(Document* pOwnerDocument, const EntityReference& ref): 
+EntityReference::EntityReference(Document* pOwnerDocument, const EntityReference& ref):
 	AbstractNode(pOwnerDocument, ref),
 	_name(ref._name)
 {
diff --git a/XML/src/EntityResolverImpl.cpp b/XML/src/EntityResolverImpl.cpp
index a072df5e5..de940b189 100644
--- a/XML/src/EntityResolverImpl.cpp
+++ b/XML/src/EntityResolverImpl.cpp
@@ -58,7 +58,7 @@ InputSource* EntityResolverImpl::resolveEntity(const XMLString* publicId, const
 	return pInputSource;
 }
 
-		
+
 void EntityResolverImpl::releaseInputSource(InputSource* pSource)
 {
 	poco_check_ptr (pSource);
diff --git a/XML/src/EventDispatcher.cpp b/XML/src/EventDispatcher.cpp
index 4656f9b45..9ef7a0aba 100644
--- a/XML/src/EventDispatcher.cpp
+++ b/XML/src/EventDispatcher.cpp
@@ -17,7 +17,7 @@
 #include "Poco/DOM/EventListener.h"
 
 
-namespace 
+namespace
 {
 	class DispatchGuard
 	{
@@ -27,12 +27,12 @@ namespace
 		{
 			++_count;
 		}
-		
+
 		~DispatchGuard()
 		{
 			--_count;
 		}
-		
+
 	private:
 		int& _count;
 	};
@@ -48,7 +48,7 @@ EventDispatcher::EventDispatcher():
 {
 }
 
-	
+
 EventDispatcher::~EventDispatcher()
 {
 }
diff --git a/XML/src/MutationEvent.cpp b/XML/src/MutationEvent.cpp
index 485836e6b..d9a5567c7 100644
--- a/XML/src/MutationEvent.cpp
+++ b/XML/src/MutationEvent.cpp
@@ -28,7 +28,7 @@ const XMLString MutationEvent::DOMAttrModified             = toXMLString("DOMAtt
 const XMLString MutationEvent::DOMCharacterDataModified    = toXMLString("DOMCharacterDataModified");
 
 
-MutationEvent::MutationEvent(Document* pOwnerDocument, const XMLString& type): 
+MutationEvent::MutationEvent(Document* pOwnerDocument, const XMLString& type):
 	Event(pOwnerDocument, type, 0, true, false),
 	_change(MODIFICATION),
 	_pRelatedNode(0)
@@ -44,7 +44,7 @@ MutationEvent::MutationEvent(Document* pOwnerDocument, const XMLString& type, Ev
 }
 
 
-MutationEvent::MutationEvent(Document* pOwnerDocument, const XMLString& type, EventTarget* pTarget, bool canBubble, bool cancelable, Node* relatedNode, 
+MutationEvent::MutationEvent(Document* pOwnerDocument, const XMLString& type, EventTarget* pTarget, bool canBubble, bool cancelable, Node* relatedNode,
 	                         const XMLString& prevValue, const XMLString& newValue, const XMLString& attrName, AttrChangeType change):
 	Event(pOwnerDocument, type, pTarget, canBubble, cancelable),
 	_prevValue(prevValue),
@@ -61,7 +61,7 @@ MutationEvent::~MutationEvent()
 }
 
 
-void MutationEvent::initMutationEvent(const XMLString& type, bool canBubble, bool cancelable, Node* relatedNode, 
+void MutationEvent::initMutationEvent(const XMLString& type, bool canBubble, bool cancelable, Node* relatedNode,
 	                                  const XMLString& prevValue, const XMLString& newValue, const XMLString& attrName, AttrChangeType change)
 {
 	initEvent(type, canBubble, cancelable);
@@ -72,5 +72,5 @@ void MutationEvent::initMutationEvent(const XMLString& type, bool canBubble, boo
 	_change       = change;
 }
 
-	 
+
 } } // namespace Poco::XML
diff --git a/XML/src/Name.cpp b/XML/src/Name.cpp
index b14757d10..dfc184f95 100644
--- a/XML/src/Name.cpp
+++ b/XML/src/Name.cpp
@@ -65,7 +65,7 @@ Name::Name(Name&& name) noexcept:
 {
 }
 
-	
+
 Name::~Name()
 {
 }
@@ -93,7 +93,7 @@ Name& Name::operator = (Name&& name) noexcept
 }
 
 
-void Name::swap(Name& name)
+void Name::swap(Name& name) noexcept
 {
 	std::swap(_qname, name._qname);
 	std::swap(_namespaceURI, name._namespaceURI);
@@ -168,7 +168,7 @@ void Name::split(const XMLString& qname, XMLString& prefix, XMLString& localName
 XMLString Name::localName(const XMLString& qname)
 {
 	XMLString::size_type pos = qname.find(':');
-	if (pos != XMLString::npos) 
+	if (pos != XMLString::npos)
 		return XMLString(qname, pos + 1, qname.size() - pos - 1);
 	else
 		return qname;
diff --git a/XML/src/NamePool.cpp b/XML/src/NamePool.cpp
index 4e234eabf..e4284f744 100644
--- a/XML/src/NamePool.cpp
+++ b/XML/src/NamePool.cpp
@@ -27,11 +27,11 @@ public:
 	NamePoolItem(): _used(false)
 	{
 	}
-	
+
 	~NamePoolItem()
 	{
 	}
-	
+
 	bool set(const XMLString& qname, const XMLString& namespaceURI, const XMLString& localName)
 	{
 		if (!_used)
@@ -42,24 +42,24 @@ public:
 		}
 		else return _name.equals(qname, namespaceURI, localName);
 	}
-	
+
 	const Name& get() const
 	{
 		return _name;
 	}
-	
+
 	bool used() const
 	{
 		return _used;
 	}
-	
+
 private:
 	Name _name;
 	bool _used;
 };
 
 
-NamePool::NamePool(unsigned long size): 
+NamePool::NamePool(unsigned long size):
 	_size(size),
 	_salt(0),
 	_rc(1)
@@ -67,7 +67,7 @@ NamePool::NamePool(unsigned long size):
 	poco_assert (size > 1);
 
 	_pItems = new NamePoolItem[size];
-	
+
 	Poco::Random rnd;
 	rnd.seed();
 	_salt = rnd.next();
@@ -98,9 +98,9 @@ const Name& NamePool::insert(const XMLString& qname, const XMLString& namespaceU
 	unsigned long i = 0;
 	unsigned long n = (hash(qname, namespaceURI, localName) ^ _salt) % _size;
 
-	while (!_pItems[n].set(qname, namespaceURI, localName) && i++ < _size) 
+	while (!_pItems[n].set(qname, namespaceURI, localName) && i++ < _size)
 		n = (n + 1) % _size;
-		
+
 	if (i > _size) throw Poco::PoolOverflowException("XML name pool");
 
 	return _pItems[n].get();
diff --git a/XML/src/NamespaceStrategy.cpp b/XML/src/NamespaceStrategy.cpp
index cfdccd6ec..ef7af3155 100644
--- a/XML/src/NamespaceStrategy.cpp
+++ b/XML/src/NamespaceStrategy.cpp
@@ -62,12 +62,12 @@ void NamespaceStrategy::splitName(const XMLChar* qname, XMLString& uri, XMLStrin
 		else
 			prefix.assign(XML_LIT(""));
 	}
-	else 
+	else
 	{
 		uri.assign(XML_LIT(""));
 		localName = qname;
 		prefix.assign(XML_LIT(""));
-	}	
+	}
 }
 
 
diff --git a/XML/src/NamespaceSupport.cpp b/XML/src/NamespaceSupport.cpp
index b398b97f7..d06837dd1 100644
--- a/XML/src/NamespaceSupport.cpp
+++ b/XML/src/NamespaceSupport.cpp
@@ -82,7 +82,7 @@ const XMLString& NamespaceSupport::getPrefix(const XMLString& namespaceURI) cons
 	{
 		for (Context::const_iterator it = rit->begin(); it != rit->end(); ++it)
 		{
-			if (it->second == namespaceURI) 
+			if (it->second == namespaceURI)
 				return it->first;
 		}
 	}
@@ -96,7 +96,7 @@ bool NamespaceSupport::isMapped(const XMLString& namespaceURI) const
 	{
 		for (Context::const_iterator it = rit->begin(); it != rit->end(); ++it)
 		{
-			if (it->second == namespaceURI) 
+			if (it->second == namespaceURI)
 				return true;
 		}
 	}
@@ -112,7 +112,7 @@ void NamespaceSupport::getPrefixes(PrefixSet& prefixes) const
 		for (Context::const_iterator it = rit->begin(); it != rit->end(); ++it)
 		{
 			const XMLString& prefix = it->first;
-			if (!prefix.empty() && prefixes.find(prefix) == prefixes.end()) 
+			if (!prefix.empty() && prefixes.find(prefix) == prefixes.end())
 				prefixes.insert(it->first);
 		}
 	}
@@ -127,7 +127,7 @@ void NamespaceSupport::getPrefixes(const XMLString& namespaceURI, PrefixSet& pre
 		for (Context::const_iterator it = rit->begin(); it != rit->end(); ++it)
 		{
 			const XMLString& prefix = it->first;
-			if (it->second == namespaceURI && !prefix.empty() && prefixes.find(prefix) == prefixes.end()) 
+			if (it->second == namespaceURI && !prefix.empty() && prefixes.find(prefix) == prefixes.end())
 				prefixes.insert(it->first);
 		}
 	}
@@ -139,7 +139,7 @@ const XMLString& NamespaceSupport::getURI(const XMLString& prefix) const
 	for (ContextVec::const_reverse_iterator rit = _contexts.rbegin(); rit != _contexts.rend(); ++rit)
 	{
 		Context::const_iterator it = rit->find(prefix);
-		if (it != rit->end()) 
+		if (it != rit->end())
 			return it->second;
 	}
 	return EMPTY_STRING;
diff --git a/XML/src/NodeAppender.cpp b/XML/src/NodeAppender.cpp
index e0582b89c..4e8bbe391 100644
--- a/XML/src/NodeAppender.cpp
+++ b/XML/src/NodeAppender.cpp
@@ -43,7 +43,7 @@ void NodeAppender::appendChild(Node* newChild)
 
 	if (static_cast<AbstractNode*>(newChild)->_pOwner != _pParent->_pOwner)
 		throw DOMException(DOMException::WRONG_DOCUMENT_ERR);
-		
+
 	if (newChild->nodeType() == Node::DOCUMENT_FRAGMENT_NODE)
 	{
 		AbstractContainerNode* pFrag = static_cast<AbstractContainerNode*>(newChild);
@@ -67,7 +67,7 @@ void NodeAppender::appendChild(Node* newChild)
 	{
 		AbstractNode* pAN = static_cast<AbstractNode*>(newChild);
 		pAN->duplicate();
-		if (pAN->_pParent) 
+		if (pAN->_pParent)
 			pAN->_pParent->removeChild(pAN);
 		pAN->_pParent = _pParent;
 		if (_pLast)
diff --git a/XML/src/NodeIterator.cpp b/XML/src/NodeIterator.cpp
index 69685f9f4..f4d5f2c85 100644
--- a/XML/src/NodeIterator.cpp
+++ b/XML/src/NodeIterator.cpp
@@ -30,7 +30,7 @@ NodeIterator::NodeIterator(Node* root, unsigned long whatToShow, NodeFilter* pFi
 {
 }
 
-	
+
 NodeIterator::NodeIterator(const NodeIterator& iterator):
 	_pRoot(iterator._pRoot),
 	_whatToShow(iterator._whatToShow),
@@ -39,7 +39,7 @@ NodeIterator::NodeIterator(const NodeIterator& iterator):
 {
 }
 
-	
+
 NodeIterator& NodeIterator::operator = (const NodeIterator& iterator)
 {
 	if (&iterator != this)
@@ -52,7 +52,7 @@ NodeIterator& NodeIterator::operator = (const NodeIterator& iterator)
 	return *this;
 }
 
-	
+
 NodeIterator::~NodeIterator()
 {
 }
@@ -61,7 +61,7 @@ NodeIterator::~NodeIterator()
 Node* NodeIterator::nextNode()
 {
 	if (!_pRoot) throw DOMException(DOMException::INVALID_STATE_ERR);
-	
+
 	if (_pCurrent)
 		_pCurrent = next();
 	else
@@ -98,30 +98,30 @@ bool NodeIterator::accept(Node* pNode) const
 	bool accept = false;
 	switch (pNode->nodeType())
 	{
-	case Node::ELEMENT_NODE: 
+	case Node::ELEMENT_NODE:
 		accept = (_whatToShow & NodeFilter::SHOW_ELEMENT) != 0; break;
 	case Node::ATTRIBUTE_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_ATTRIBUTE) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_ATTRIBUTE) != 0; break;
 	case Node::TEXT_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_TEXT) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_TEXT) != 0; break;
 	case Node::CDATA_SECTION_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_CDATA_SECTION) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_CDATA_SECTION) != 0; break;
 	case Node::ENTITY_REFERENCE_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_ENTITY_REFERENCE) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_ENTITY_REFERENCE) != 0; break;
 	case Node::ENTITY_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_ENTITY) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_ENTITY) != 0; break;
 	case Node::PROCESSING_INSTRUCTION_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_PROCESSING_INSTRUCTION) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_PROCESSING_INSTRUCTION) != 0; break;
 	case Node::COMMENT_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_COMMENT) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_COMMENT) != 0; break;
 	case Node::DOCUMENT_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT) != 0; break;
 	case Node::DOCUMENT_TYPE_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT_TYPE) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT_TYPE) != 0; break;
 	case Node::DOCUMENT_FRAGMENT_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT_FRAGMENT) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT_FRAGMENT) != 0; break;
 	case Node::NOTATION_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_NOTATION) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_NOTATION) != 0; break;
 	}
 	if (accept && _pFilter)
 		accept = _pFilter->acceptNode(pNode) == NodeFilter::FILTER_ACCEPT;
diff --git a/XML/src/Notation.cpp b/XML/src/Notation.cpp
index fdc0cf020..db0acc48e 100644
--- a/XML/src/Notation.cpp
+++ b/XML/src/Notation.cpp
@@ -19,7 +19,7 @@ namespace Poco {
 namespace XML {
 
 
-Notation::Notation(Document* pOwnerDocument, const XMLString& name, const XMLString& publicId, const XMLString& systemId): 
+Notation::Notation(Document* pOwnerDocument, const XMLString& name, const XMLString& publicId, const XMLString& systemId):
 	AbstractNode(pOwnerDocument),
 	_name(name),
 	_publicId(publicId),
@@ -28,7 +28,7 @@ Notation::Notation(Document* pOwnerDocument, const XMLString& name, const XMLStr
 }
 
 
-Notation::Notation(Document* pOwnerDocument, const Notation& notation): 
+Notation::Notation(Document* pOwnerDocument, const Notation& notation):
 	AbstractNode(pOwnerDocument, notation),
 	_name(notation._name),
 	_publicId(notation._publicId),
diff --git a/XML/src/ProcessingInstruction.cpp b/XML/src/ProcessingInstruction.cpp
index ebfc7c158..734e39d2c 100644
--- a/XML/src/ProcessingInstruction.cpp
+++ b/XML/src/ProcessingInstruction.cpp
@@ -19,7 +19,7 @@ namespace Poco {
 namespace XML {
 
 
-ProcessingInstruction::ProcessingInstruction(Document* pOwnerDocument, const XMLString& target, const XMLString& data): 
+ProcessingInstruction::ProcessingInstruction(Document* pOwnerDocument, const XMLString& target, const XMLString& data):
 	AbstractNode(pOwnerDocument),
 	_target(target),
 	_data(data)
@@ -27,7 +27,7 @@ ProcessingInstruction::ProcessingInstruction(Document* pOwnerDocument, const XML
 }
 
 
-ProcessingInstruction::ProcessingInstruction(Document* pOwnerDocument, const ProcessingInstruction& processingInstruction): 
+ProcessingInstruction::ProcessingInstruction(Document* pOwnerDocument, const ProcessingInstruction& processingInstruction):
 	AbstractNode(pOwnerDocument, processingInstruction),
 	_target(processingInstruction._target),
 	_data(processingInstruction._data)
diff --git a/XML/src/QName.cpp b/XML/src/QName.cpp
index b9dad0f68..620c041f1 100644
--- a/XML/src/QName.cpp
+++ b/XML/src/QName.cpp
@@ -78,12 +78,12 @@ QName& QName::operator = (QName&& qname) noexcept
 	_ns = std::move(qname._ns);
 	_name = std::move(qname._name);
 	_prefix = std::move(qname._prefix);
-	
+
 	return *this;
 }
 
 
-void QName::swap(QName& qname)
+void QName::swap(QName& qname) noexcept
 {
 	std::swap(_ns, qname._ns);
 	std::swap(_name, qname._name);
diff --git a/XML/src/SAXException.cpp b/XML/src/SAXException.cpp
index 112747b08..56a7a5def 100644
--- a/XML/src/SAXException.cpp
+++ b/XML/src/SAXException.cpp
@@ -46,7 +46,7 @@ SAXParseException::SAXParseException(const std::string& msg, const Locator& loc,
 {
 }
 
-	
+
 SAXParseException::SAXParseException(const std::string& msg, const XMLString& publicId, const XMLString& systemId, int lineNumber, int columnNumber):
 	SAXException(buildMessage(msg, publicId, systemId, lineNumber, columnNumber)),
 	_publicId(publicId),
@@ -95,7 +95,7 @@ SAXParseException& SAXParseException::operator = (const SAXParseException& exc)
 	return *this;
 }
 
-	
+
 const char* SAXParseException::name() const noexcept
 {
 	return "SAXParseException";
diff --git a/XML/src/Text.cpp b/XML/src/Text.cpp
index 991c31a1d..f6bb62b90 100644
--- a/XML/src/Text.cpp
+++ b/XML/src/Text.cpp
@@ -24,13 +24,13 @@ namespace XML {
 const XMLString Text::NODE_NAME = toXMLString("#text");
 
 
-Text::Text(Document* pOwnerDocument, const XMLString& data): 
+Text::Text(Document* pOwnerDocument, const XMLString& data):
 	CharacterData(pOwnerDocument, data)
 {
 }
 
 
-Text::Text(Document* pOwnerDocument, const Text& text): 
+Text::Text(Document* pOwnerDocument, const Text& text):
 	CharacterData(pOwnerDocument, text)
 {
 }
diff --git a/XML/src/TreeWalker.cpp b/XML/src/TreeWalker.cpp
index 69c0556cd..f4c960a4a 100644
--- a/XML/src/TreeWalker.cpp
+++ b/XML/src/TreeWalker.cpp
@@ -29,7 +29,7 @@ TreeWalker::TreeWalker(Node* root, unsigned long whatToShow, NodeFilter* pFilter
 {
 }
 
-	
+
 TreeWalker::TreeWalker(const TreeWalker& walker):
 	_pRoot(walker._pRoot),
 	_whatToShow(walker._whatToShow),
@@ -38,7 +38,7 @@ TreeWalker::TreeWalker(const TreeWalker& walker):
 {
 }
 
-	
+
 TreeWalker& TreeWalker::operator = (const TreeWalker& walker)
 {
 	if (&walker != this)
@@ -51,7 +51,7 @@ TreeWalker& TreeWalker::operator = (const TreeWalker& walker)
 	return *this;
 }
 
-	
+
 TreeWalker::~TreeWalker()
 {
 }
@@ -66,7 +66,7 @@ void TreeWalker::setCurrentNode(Node* pNode)
 Node* TreeWalker::parentNode()
 {
 	if (!_pCurrent || _pCurrent == _pRoot) return 0;
-	
+
 	Node* pParent = _pCurrent->parentNode();
 	while (pParent && pParent != _pRoot && accept(pParent) != NodeFilter::FILTER_ACCEPT)
 		pParent = pParent->parentNode();
@@ -133,7 +133,7 @@ Node* TreeWalker::nextSibling()
 Node* TreeWalker::previousNode()
 {
 	if (!_pCurrent) return 0;
-	
+
 	Node* pPrev = previous(_pCurrent);
 	while (pPrev && accept(pPrev) != NodeFilter::FILTER_ACCEPT)
 		pPrev = previous(pPrev);
@@ -161,30 +161,30 @@ int TreeWalker::accept(Node* pNode) const
 	bool accept = false;
 	switch (pNode->nodeType())
 	{
-	case Node::ELEMENT_NODE: 
+	case Node::ELEMENT_NODE:
 		accept = (_whatToShow & NodeFilter::SHOW_ELEMENT) != 0; break;
 	case Node::ATTRIBUTE_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_ATTRIBUTE) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_ATTRIBUTE) != 0; break;
 	case Node::TEXT_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_TEXT) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_TEXT) != 0; break;
 	case Node::CDATA_SECTION_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_CDATA_SECTION) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_CDATA_SECTION) != 0; break;
 	case Node::ENTITY_REFERENCE_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_ENTITY_REFERENCE) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_ENTITY_REFERENCE) != 0; break;
 	case Node::ENTITY_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_ENTITY) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_ENTITY) != 0; break;
 	case Node::PROCESSING_INSTRUCTION_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_PROCESSING_INSTRUCTION) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_PROCESSING_INSTRUCTION) != 0; break;
 	case Node::COMMENT_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_COMMENT) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_COMMENT) != 0; break;
 	case Node::DOCUMENT_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT) != 0; break;
 	case Node::DOCUMENT_TYPE_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT_TYPE) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT_TYPE) != 0; break;
 	case Node::DOCUMENT_FRAGMENT_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT_FRAGMENT) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_DOCUMENT_FRAGMENT) != 0; break;
 	case Node::NOTATION_NODE:
-		accept = (_whatToShow & NodeFilter::SHOW_NOTATION) != 0; break; 
+		accept = (_whatToShow & NodeFilter::SHOW_NOTATION) != 0; break;
 	}
 	if (accept && _pFilter)
 		return _pFilter->acceptNode(pNode);
diff --git a/XML/src/WhitespaceFilter.cpp b/XML/src/WhitespaceFilter.cpp
index 0ff4d07dc..13e246074 100644
--- a/XML/src/WhitespaceFilter.cpp
+++ b/XML/src/WhitespaceFilter.cpp
@@ -26,8 +26,8 @@ WhitespaceFilter::WhitespaceFilter():
 {
 }
 
-	
-WhitespaceFilter::WhitespaceFilter(XMLReader* pReader): 
+
+WhitespaceFilter::WhitespaceFilter(XMLReader* pReader):
 	XMLFilterImpl(pReader),
 	_pLexicalHandler(0),
 	_filter(true)
@@ -121,7 +121,7 @@ void WhitespaceFilter::characters(const XMLChar ch[], int start, int length)
 		{
 			XMLFilterImpl::characters(_data.data(), 0, (int) _data.length());
 			_filter = false;
-			_data.clear();	
+			_data.clear();
 		}
 	}
 	else XMLFilterImpl::characters(ch, start, length);
diff --git a/XML/src/XMLFilterImpl.cpp b/XML/src/XMLFilterImpl.cpp
index 2256f2458..0042ca7a5 100644
--- a/XML/src/XMLFilterImpl.cpp
+++ b/XML/src/XMLFilterImpl.cpp
@@ -29,7 +29,7 @@ XMLFilterImpl::XMLFilterImpl():
 {
 }
 
-	
+
 XMLFilterImpl::XMLFilterImpl(XMLReader* pParent):
 	_pParent(pParent),
 	_pEntityResolver(0),
@@ -39,7 +39,7 @@ XMLFilterImpl::XMLFilterImpl(XMLReader* pParent):
 {
 }
 
-	
+
 XMLFilterImpl::~XMLFilterImpl()
 {
 }
diff --git a/XML/src/XMLString.cpp b/XML/src/XMLString.cpp
index e8e7a3afa..8e9e322fa 100644
--- a/XML/src/XMLString.cpp
+++ b/XML/src/XMLString.cpp
@@ -31,7 +31,7 @@ std::string fromXMLString(const XMLString& str)
 {
 	std::string result;
 	result.reserve(str.size());
-	
+
 	for (auto xc: str)
 	{
 		char c;
@@ -46,7 +46,7 @@ XMLString toXMLString(const std::string& str)
 {
 	XMLString result;
 	result.reserve(str.size());
-	
+
 	for (std::string::const_iterator it = str.begin(); it != str.end();)
 	{
 		wchar_t c;
diff --git a/XML/src/XMLWriter.cpp b/XML/src/XMLWriter.cpp
index dba21692f..f93e62724 100644
--- a/XML/src/XMLWriter.cpp
+++ b/XML/src/XMLWriter.cpp
@@ -193,7 +193,7 @@ void XMLWriter::startDocument()
 
 	if (_options & WRITE_XML_DECLARATION)
 		writeXMLDeclaration();
-	
+
 	_contentWritten = true;
 	_namespaces.reset();
 	_namespaces.pushContext();
@@ -234,7 +234,7 @@ void XMLWriter::endFragment()
 {
 	if (_depth > 1)
 		throw XMLException("Not well-formed (at least one tag has no matching end tag)");
-	
+
 	_inFragment   = false;
 	_elementCount = 0;
 	_depth        = -1;
@@ -250,14 +250,14 @@ void XMLWriter::startElement(const XMLString& namespaceURI, const XMLString& loc
 
 void XMLWriter::startElement(const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname, const Attributes& attributes)
 {
-	if (_depth == 0 && !_inFragment && _elementCount > 1) 
+	if (_depth == 0 && !_inFragment && _elementCount > 1)
 		throw XMLException("Not well-formed. Second root element found", nameToString(localName, qname));
-	
+
 	if (_unclosedStartTag) closeStartTag();
 	prettyPrint();
 	if (_options & CANONICAL_XML)
 		writeCanonicalStartElement(namespaceURI, localName, qname, attributes);
-	else		
+	else
 		writeStartElement(namespaceURI, localName, qname, attributes);
 	_elementStack.emplace_back(qname, namespaceURI, localName);
 	_contentWritten = false;
@@ -595,7 +595,7 @@ void XMLWriter::writeStartElement(const XMLString& namespaceURI, const XMLString
 		_namespaces.pushContext();
 	_nsContextPushed = false;
 	++_elementCount;
-	
+
 	declareAttributeNamespaces(attributes);
 
 	writeMarkup(MARKUP_LT);
@@ -643,7 +643,7 @@ void XMLWriter::writeCanonicalStartElement(const XMLString& namespaceURI, const
 		_namespaces.pushContext();
 	_nsContextPushed = false;
 	++_elementCount;
-	
+
 	declareNamespaces(namespaceURI, localName, qname, attributes);
 
 	writeMarkup(MARKUP_LT);
@@ -726,7 +726,7 @@ void XMLWriter::declareNamespaces(const XMLString& namespaceURI, const XMLString
 		XMLString attributeNamespaceURI = attributes.getURI(i);
 		XMLString attributeLocalName    = attributes.getLocalName(i);
 		XMLString attributeQName        = attributes.getQName(i);
-	
+
 		XMLString attributePrefix;
 		XMLString attributeLocal;
 		Name::split(attributeQName, attributePrefix, attributeLocal);
@@ -744,7 +744,7 @@ void XMLWriter::declareNamespaces(const XMLString& namespaceURI, const XMLString
 		for (const auto& nsURI: namespaceURIs)
 		{
 			XMLString prefix = p.first;
-			if (prefix.empty()) 
+			if (prefix.empty())
 				prefix = _namespaces.getPrefix(nsURI);
 			if (prefix.empty() && !_namespaces.isMapped(nsURI))
 			{
@@ -761,7 +761,7 @@ void XMLWriter::declareNamespaces(const XMLString& namespaceURI, const XMLString
 
 			}
 			const XMLString& uri = _namespaces.getURI(prefix);
-			if ((uri.empty() || uri != nsURI) && !nsURI.empty()) 
+			if ((uri.empty() || uri != nsURI) && !nsURI.empty())
 			{
 				_namespaces.declarePrefix(prefix, nsURI);
 			}
@@ -807,7 +807,7 @@ void XMLWriter::addNamespaceAttributes(AttributeMap& attributeMap)
 	{
 		XMLString uri   = _namespaces.getURI(prefix);
 		XMLString qname = NamespaceSupport::XMLNS_NAMESPACE_PREFIX;
-		
+
 		if (!prefix.empty())
 		{
 			qname.append(toXMLString(MARKUP_COLON));
@@ -826,7 +826,7 @@ void XMLWriter::addNamespaceAttributes(CanonicalAttributeMap& attributeMap)
 	{
 		XMLString uri   = _namespaces.getURI(prefix);
 		XMLString qname = NamespaceSupport::XMLNS_NAMESPACE_PREFIX;
-		
+
 		if (!prefix.empty())
 		{
 			qname.append(toXMLString(MARKUP_COLON));
@@ -923,7 +923,7 @@ void XMLWriter::writeAttributes(const AttributeMap& attributeMap)
 			default:
 				if (c >= 0 && c < 32)
 					throw XMLException("Invalid character token.");
-				else 
+				else
 					writeXML(c);
 			}
 		}
@@ -961,7 +961,7 @@ void XMLWriter::writeAttributes(const CanonicalAttributeMap& attributeMap)
 			default:
 				if (c >= 0 && c < 32)
 					throw XMLException("Invalid character token.");
-				else 
+				else
 					writeXML(c);
 			}
 		}
@@ -1001,8 +1001,8 @@ void XMLWriter::writeName(const XMLString& prefix, const XMLString& localName)
 	}
 	else
 	{
-		writeXML(prefix); 
-		writeMarkup(MARKUP_COLON); 
+		writeXML(prefix);
+		writeMarkup(MARKUP_COLON);
 		writeXML(localName);
 	}
 }
diff --git a/XML/src/xmltok.c b/XML/src/xmltok.c
index 2a50f73d7..a0d20f331 100644
--- a/XML/src/xmltok.c
+++ b/XML/src/xmltok.c
@@ -49,7 +49,7 @@
 
 #ifdef EXPAT_WIN32
 #  include "winconfig.h"
-#endif 
+#endif
 
 #include "expat_config.h"
 
diff --git a/XML/testsuite/TestSuite.progen b/XML/testsuite/TestSuite.progen
index 896977c5f..09d789f80 100644
--- a/XML/testsuite/TestSuite.progen
+++ b/XML/testsuite/TestSuite.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = iphlpapi.lib
diff --git a/XML/testsuite/TestSuite_vs170.vcxproj b/XML/testsuite/TestSuite_vs170.vcxproj
index f48c65e6a..dd76a0e2d 100644
--- a/XML/testsuite/TestSuite_vs170.vcxproj
+++ b/XML/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/XML/testsuite/src/AttributesImplTest.cpp b/XML/testsuite/src/AttributesImplTest.cpp
index a36ede1cb..7571c50eb 100644
--- a/XML/testsuite/src/AttributesImplTest.cpp
+++ b/XML/testsuite/src/AttributesImplTest.cpp
@@ -34,7 +34,7 @@ void AttributesImplTest::testNoNamespaces()
 	assertTrue (attrs.getLength() == 0);
 	assertTrue (attrs.getIndex("foo") == -1);
 	assertTrue (attrs.getValue("foo").empty());
-	
+
 	attrs.addAttribute("", "", "a1", "CDATA", "v1");
 	assertTrue (attrs.getLength() == 1);
 	assertTrue (attrs.getIndex("a1") == 0);
@@ -42,7 +42,7 @@ void AttributesImplTest::testNoNamespaces()
 	assertTrue (attrs.getType(0) == "CDATA");
 	assertTrue (attrs.getValue(0) == "v1");
 	assertTrue (attrs.isSpecified(0));
-	
+
 	assertTrue (attrs.getType("a1") == "CDATA");
 	assertTrue (attrs.getValue("a1") == "v1");
 
@@ -53,15 +53,15 @@ void AttributesImplTest::testNoNamespaces()
 	assertTrue (attrs.getType(1) == "CDATA");
 	assertTrue (attrs.getValue(1) == "v2");
 	assertTrue (attrs.isSpecified(1));
-	
+
 	assertTrue (attrs.getType("a2") == "CDATA");
 	assertTrue (attrs.getValue("a2") == "v2");
 
 	attrs.addAttribute("", "", "a3", "CDATA", "v3");
 	assertTrue (attrs.getLength() == 3);
-	assertTrue (attrs.getIndex("a3") == 2);	
+	assertTrue (attrs.getIndex("a3") == 2);
 	assertTrue (attrs.getValue("a3") == "v3");
-	
+
 	attrs.removeAttribute(0);
 	assertTrue (attrs.getLength() == 2);
 	assertTrue (attrs.getIndex("a1") == -1);
@@ -69,7 +69,7 @@ void AttributesImplTest::testNoNamespaces()
 	assertTrue (attrs.getIndex("a3") == 1);
 	assertTrue (attrs.getQName(0) == "a2");
 	assertTrue (attrs.getQName(1) == "a3");
-	
+
 	attrs.removeAttribute("a3");
 	assertTrue (attrs.getLength() == 1);
 	assertTrue (attrs.getIndex("a1") == -1);
@@ -86,7 +86,7 @@ void AttributesImplTest::testNamespaces()
 	assertTrue (attrs.getLength() == 0);
 	assertTrue (attrs.getIndex("urn:ns", "foo") == -1);
 	assertTrue (attrs.getValue("urn:ns", "foo").empty());
-	
+
 	attrs.addAttribute("urn:ns", "a1", "p:a1", "CDATA", "v1");
 	assertTrue (attrs.getLength() == 1);
 	assertTrue (attrs.getIndex("urn:ns", "a1") == 0);
@@ -96,7 +96,7 @@ void AttributesImplTest::testNamespaces()
 	assertTrue (attrs.getType(0) == "CDATA");
 	assertTrue (attrs.getValue(0) == "v1");
 	assertTrue (attrs.isSpecified(0));
-	
+
 	assertTrue (attrs.getType("urn:ns", "a1") == "CDATA");
 	assertTrue (attrs.getValue("urn:ns", "a1") == "v1");
 
@@ -109,7 +109,7 @@ void AttributesImplTest::testNamespaces()
 	assertTrue (attrs.getType(1) == "CDATA");
 	assertTrue (attrs.getValue(1) == "v2");
 	assertTrue (attrs.isSpecified(1));
-	
+
 	assertTrue (attrs.getType("urn:ns", "a2") == "CDATA");
 	assertTrue (attrs.getValue("urn:ns", "a2") == "v2");
 
@@ -117,9 +117,9 @@ void AttributesImplTest::testNamespaces()
 
 	attrs.addAttribute("urn:ns2", "a3", "q:a3", "CDATA", "v3");
 	assertTrue (attrs.getLength() == 3);
-	assertTrue (attrs.getIndex("urn:ns2", "a3") == 2);	
+	assertTrue (attrs.getIndex("urn:ns2", "a3") == 2);
 	assertTrue (attrs.getValue("urn:ns2", "a3") == "v3");
-	
+
 	attrs.removeAttribute(0);
 	assertTrue (attrs.getLength() == 2);
 	assertTrue (attrs.getIndex("urn:ns", "a1") == -1);
@@ -131,10 +131,10 @@ void AttributesImplTest::testNamespaces()
 	assertTrue (attrs.getQName(1) == "q:a3");
 	assertTrue (attrs.getLocalName(1) == "a3");
 	assertTrue (attrs.getURI(1) == "urn:ns2");
-	
+
 	attrs.removeAttribute("urn:ns", "a3");
 	assertTrue (attrs.getLength() == 2);
-	
+
 	attrs.removeAttribute("urn:ns2", "a3");
 	assertTrue (attrs.getLength() == 1);
 	assertTrue (attrs.getIndex("urn:ns", "a1") == -1);
@@ -174,19 +174,19 @@ void AttributesImplTest::testAccessors()
 	attrs.setType(0, "NMTOKEN");
 	assertTrue (attrs.getType(0) == "NMTOKEN");
 	assertTrue (attrs.getType("urn:ns1", "a1") == "NMTOKEN");
-	
+
 	attrs.setValue(1, "v2 v2");
 	assertTrue (attrs.getValue(1) == "v2 v2");
 	assertTrue (attrs.getValue("urn:ns1", "a2") == "v2 v2");
 	assertTrue (attrs.isSpecified(1));
-	
+
 	attrs.setLocalName(2, "A3");
 	assertTrue (attrs.getLocalName(2) == "A3");
 	attrs.setQName(2, "p:A3");
 	assertTrue (attrs.getQName(2) == "p:A3");
 	attrs.setURI(2, "urn:ns1");
 	assertTrue (attrs.getURI(2) == "urn:ns1");
-	
+
 	assertTrue (attrs.getValue("urn:ns1", "A3") == "v3");
 }
 
@@ -202,11 +202,11 @@ void AttributesImplTest::testCopy()
 	attrs2.setAttributes(attrs);
 
 	assertTrue (attrs2.getLength() == 3);
-	
+
 	assertTrue (attrs2.getQName(0) == "p:a1");
 	assertTrue (attrs2.getQName(1) == "p:a2");
 	assertTrue (attrs2.getQName(2) == "q:a3");
-	
+
 	assertTrue (attrs2.getLocalName(0) == "a1");
 	assertTrue (attrs2.getLocalName(1) == "a2");
 	assertTrue (attrs2.getLocalName(2) == "a3");
diff --git a/XML/testsuite/src/ChildNodesTest.cpp b/XML/testsuite/src/ChildNodesTest.cpp
index 80eaa785a..c2e0f883a 100644
--- a/XML/testsuite/src/ChildNodesTest.cpp
+++ b/XML/testsuite/src/ChildNodesTest.cpp
@@ -42,11 +42,11 @@ void ChildNodesTest::testChildNodes()
 	assertTrue (!pRoot->hasChildNodes());
 	AutoPtr<NodeList> pNL = pRoot->childNodes();
 	assertTrue (pNL->length() == 0);
-	
+
 	AutoPtr<Element> pChild1 = pDoc->createElement("child1");
 	pRoot->appendChild(pChild1);
 	assertTrue (pRoot->hasChildNodes());
-	
+
 	assertTrue (pNL->length() == 1);
 	assertTrue (pNL->item(0) == pChild1);
 
@@ -56,7 +56,7 @@ void ChildNodesTest::testChildNodes()
 	assertTrue (pNL->length() == 2);
 	assertTrue (pNL->item(0) == pChild1);
 	assertTrue (pNL->item(1) == pChild2);
-	
+
 	AutoPtr<Element> pChild0 = pDoc->createElement("child0");
 	pRoot->insertBefore(pChild0, pChild1);
 
diff --git a/XML/testsuite/src/DocumentTest.cpp b/XML/testsuite/src/DocumentTest.cpp
index b65fa8eb1..8ec29fe44 100644
--- a/XML/testsuite/src/DocumentTest.cpp
+++ b/XML/testsuite/src/DocumentTest.cpp
@@ -47,11 +47,11 @@ void DocumentTest::testDocumentElement()
 	assertTrue (pDoc->documentElement() == 0);
 	pDoc->appendChild(pRoot);
 	assertTrue (pDoc->documentElement() == pRoot);
-	
+
 	AutoPtr<Text> pText = pDoc->createTextNode("   ");
 	pDoc->insertBefore(pText, pRoot);
 	assertTrue (pDoc->documentElement() == pRoot);
-	
+
 }
 
 
@@ -61,7 +61,7 @@ void DocumentTest::testImport()
 	AutoPtr<Element> pRoot1 = pDoc1->createElement("root");
 
 	AutoPtr<Document> pDoc2 = new Document;
-	
+
 	try
 	{
 		pDoc2->appendChild(pRoot1);
@@ -70,11 +70,11 @@ void DocumentTest::testImport()
 	catch (DOMException&)
 	{
 	}
-	
+
 	AutoPtr<Element> pRoot2 = static_cast<Element*>(pDoc2->importNode(pRoot1, false));
 	assertTrue (pRoot2->ownerDocument() == pDoc2);
 	assertTrue (pRoot1->ownerDocument() == pDoc1);
-	
+
 	pDoc2->appendChild(pRoot2);
 }
 
@@ -93,7 +93,7 @@ void DocumentTest::testImportDeep()
 	pRoot1->setAttribute("a2", "v2");
 
 	AutoPtr<Document> pDoc2 = new Document;
-	
+
 	try
 	{
 		pDoc2->appendChild(pRoot1);
@@ -102,7 +102,7 @@ void DocumentTest::testImportDeep()
 	catch (DOMException&)
 	{
 	}
-	
+
 	AutoPtr<Element> pRoot2 = static_cast<Element*>(pDoc2->importNode(pRoot1, true));
 	assertTrue (pRoot2->ownerDocument() == pDoc2);
 	assertTrue (pRoot2->firstChild()->ownerDocument() == pDoc2);
@@ -110,7 +110,7 @@ void DocumentTest::testImportDeep()
 	assertTrue (pRoot1->ownerDocument() == pDoc1);
 	assertTrue (pRoot1->firstChild()->ownerDocument() == pDoc1);
 	assertTrue (pRoot1->firstChild()->firstChild()->ownerDocument() == pDoc1);
-	
+
 	pDoc2->appendChild(pRoot2);
 }
 
@@ -122,14 +122,14 @@ void DocumentTest::testElementsByTagName()
 	pDoc->appendChild(pRoot);
 	AutoPtr<NodeList> pNL1 = pDoc->getElementsByTagName("*");
 	AutoPtr<NodeList> pNL2 = pDoc->getElementsByTagName("elem");
-	
+
 	assertTrue (pNL1->length() == 1);
 	assertTrue (pNL1->item(0) == pRoot);
 	assertTrue (pNL2->length() == 0);
-	
+
 	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
 	pRoot->appendChild(pElem1);
-	
+
 	assertTrue (pNL1->length() == 2);
 	assertTrue (pNL2->length() == 1);
 	assertTrue (pNL1->item(0) == pRoot);
@@ -155,14 +155,14 @@ void DocumentTest::testElementsByTagNameNS()
 	pDoc->appendChild(pRoot);
 	AutoPtr<NodeList> pNL1 = pDoc->getElementsByTagNameNS("*", "*");
 	AutoPtr<NodeList> pNL2 = pDoc->getElementsByTagNameNS("*", "elem");
-	
+
 	assertTrue (pNL1->length() == 1);
 	assertTrue (pNL1->item(0) == pRoot);
 	assertTrue (pNL2->length() == 0);
-	
+
 	AutoPtr<Element> pElem1 = pDoc->createElementNS("urn:ns1", "elem");
 	pRoot->appendChild(pElem1);
-	
+
 	assertTrue (pNL1->length() == 2);
 	assertTrue (pNL2->length() == 1);
 	assertTrue (pNL1->item(0) == pRoot);
@@ -199,13 +199,13 @@ void DocumentTest::testElementById()
 	pRoot->appendChild(pElem1);
 	pRoot->appendChild(pElem3);
 	pDoc->appendChild(pRoot);
-	
+
 	Element* pFound = pDoc->getElementById("0", "id");
 	assertTrue (pFound == pRoot);
-	
+
 	pFound = pDoc->getElementById("1", "id");
 	assertTrue (pFound == pElem1);
-	
+
 	pFound = pDoc->getElementById("2", "id");
 	assertTrue (pFound == pElem2);
 
@@ -214,7 +214,7 @@ void DocumentTest::testElementById()
 
 	pFound = pDoc->getElementById("4", "id");
 	assertTrue (pFound == 0);
-	
+
 	pFound = pDoc->getElementById("0", "ID");
 	assertTrue (pFound == 0);
 }
@@ -241,10 +241,10 @@ void DocumentTest::testElementByIdNS()
 
 	Element* pFound = pDoc->getElementByIdNS("0", "urn:ns1", "id");
 	assertTrue (pFound == pRoot);
-	
+
 	pFound = pDoc->getElementByIdNS("1", "urn:ns1", "id");
 	assertTrue (pFound == pElem1);
-	
+
 	pFound = pDoc->getElementByIdNS("2", "urn:ns1", "id");
 	assertTrue (pFound == pElem2);
 
@@ -253,7 +253,7 @@ void DocumentTest::testElementByIdNS()
 
 	pFound = pDoc->getElementByIdNS("4", "urn:ns1", "id");
 	assertTrue (pFound == 0);
-	
+
 	pFound = pDoc->getElementByIdNS("0", "urn:ns1", "ID");
 	assertTrue (pFound == 0);
 
diff --git a/XML/testsuite/src/DocumentTypeTest.cpp b/XML/testsuite/src/DocumentTypeTest.cpp
index 8f031a08f..46ea2c95e 100644
--- a/XML/testsuite/src/DocumentTypeTest.cpp
+++ b/XML/testsuite/src/DocumentTypeTest.cpp
@@ -42,25 +42,25 @@ DocumentTypeTest::~DocumentTypeTest()
 void DocumentTypeTest::testDocumentType()
 {
 	AutoPtr<DocumentType> pDoctype = DOMImplementation::instance().createDocumentType("test", "public", "system");
-	
+
 	assertTrue (pDoctype->ownerDocument() == 0);
 	assertTrue (pDoctype->name() == "test");
 	assertTrue (pDoctype->publicId() == "public");
 	assertTrue (pDoctype->systemId() == "system");
-	
+
 	AutoPtr<Document> pDoc = new Document(pDoctype);
 	assertTrue (pDoc->doctype() == pDoctype);
 	assertTrue (pDoctype->ownerDocument() == pDoc);
 
 	AutoPtr<NamedNodeMap> pEntities = pDoctype->entities();
 	AutoPtr<NamedNodeMap> pNotations = pDoctype->notations();
-	
+
 	assertTrue (pEntities->length() == 0);
 	assertTrue (pNotations->length() == 0);
-	
+
 	AutoPtr<Entity> pEntity1 = pDoc->createEntity("entity1", "public1", "system1", "");
 	pDoctype->appendChild(pEntity1);
-	
+
 	assertTrue (pEntities->length() == 1);
 	assertTrue (pNotations->length() == 0);
 	assertTrue (pEntities->item(0) == pEntity1);
@@ -74,7 +74,7 @@ void DocumentTypeTest::testDocumentType()
 	assertTrue (pEntities->item(1) == pEntity2);
 	assertTrue (pEntities->getNamedItem("entity1") == pEntity1);
 	assertTrue (pEntities->getNamedItem("entity2") == pEntity2);
-	
+
 	AutoPtr<Notation> pNotation = pDoc->createNotation("notation", "public", "system");
 	pDoctype->appendChild(pNotation);
 	assertTrue (pEntities->length() == 2);
diff --git a/XML/testsuite/src/ElementTest.h b/XML/testsuite/src/ElementTest.h
index ecf879f28..7f1410f75 100644
--- a/XML/testsuite/src/ElementTest.h
+++ b/XML/testsuite/src/ElementTest.h
@@ -35,7 +35,7 @@ public:
 	void testChildElementNS();
 	void testNodeByPath();
 	void testNodeByPathNS();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/XML/testsuite/src/EventTest.cpp b/XML/testsuite/src/EventTest.cpp
index ed4262fe1..895f11f03 100644
--- a/XML/testsuite/src/EventTest.cpp
+++ b/XML/testsuite/src/EventTest.cpp
@@ -43,7 +43,7 @@ public:
 		_capture(capture)
 	{
 	}
-	
+
 	void handleEvent(Event* evt)
 	{
 		XMLString type = evt->type();
@@ -59,7 +59,7 @@ public:
 		}
 		Node* pTarget = static_cast<Node*>(evt->target());
 		Node* pCurrentTarget = static_cast<Node*>(evt->currentTarget());
-		
+
 		_log.append(_name);
 		_log.append(":");
 		_log.append(type);
@@ -73,7 +73,7 @@ public:
 		_log.append(evt->bubbles() ? "B" : "-");
 		_log.append(":");
 		_log.append(evt->cancelable() ? "C" : "-");
-		
+
 		MutationEvent* pME = dynamic_cast<MutationEvent*>(evt);
 		if (pME)
 		{
@@ -103,22 +103,22 @@ public:
 			_log.append(pME->newValue());
 		}
 		_log.append("\n");
-		
+
 		if (_cancel) evt->stopPropagation();
 		if (_readd)
 			pCurrentTarget->addEventListener(type, this, _capture);
 	}
-	
+
 	static const XMLString& log()
 	{
 		return _log;
 	}
-	
+
 	static void reset()
 	{
 		_log.clear();
 	}
-	
+
 private:
 	XMLString _name;
 	bool      _cancel;
@@ -158,7 +158,7 @@ void EventTest::testInsert()
 	pDoc->addEventListener(MutationEvent::DOMSubtreeModified, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeInserted, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeInsertedIntoDocument, &docCapListener, true);
-	
+
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeInserted, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeInsertedIntoDocument, &rootListener, false);
@@ -166,12 +166,12 @@ void EventTest::testInsert()
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeInserted, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeInsertedIntoDocument, &rootCapListener, true);
-	
+
 	pDoc->appendChild(pRoot);
-	
+
 	const XMLString& log = TestEventListener::log();
 
-	assertTrue (log == 
+	assertTrue (log ==
 		"docCap:DOMNodeInserted:CAPTURING_PHASE:root:#document:B:-:MODIFICATION:#document:::\n"
 		"rootCap:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
 		"root:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
@@ -182,13 +182,13 @@ void EventTest::testInsert()
 		"docCap:DOMSubtreeModified:AT_TARGET:#document:#document:B:-:MODIFICATION::::\n"
 		"doc:DOMSubtreeModified:AT_TARGET:#document:#document:B:-:MODIFICATION::::\n"
 	);
-	
+
 	TestEventListener::reset();
-	
+
 	AutoPtr<Text> pText = pDoc->createTextNode("text");
 	pRoot->appendChild(pText);
 
-	assertTrue (log == 
+	assertTrue (log ==
 		"docCap:DOMNodeInserted:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:root:::\n"
 		"rootCap:DOMNodeInserted:CAPTURING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
 		"root:DOMNodeInserted:BUBBLING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
@@ -220,7 +220,7 @@ void EventTest::testInsertSubtree()
 	pDoc->addEventListener(MutationEvent::DOMSubtreeModified, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeInserted, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeInsertedIntoDocument, &docCapListener, true);
-	
+
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeInserted, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeInsertedIntoDocument, &rootListener, false);
@@ -228,7 +228,7 @@ void EventTest::testInsertSubtree()
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeInserted, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeInsertedIntoDocument, &rootCapListener, true);
-	
+
 	AutoPtr<Text> pText = pDoc->createTextNode("text");
 	pRoot->appendChild(pText);
 
@@ -237,7 +237,7 @@ void EventTest::testInsertSubtree()
 	pDoc->appendChild(pRoot);
 
 	const XMLString& log = TestEventListener::log();
-	assertTrue (log == 
+	assertTrue (log ==
 		"docCap:DOMNodeInserted:CAPTURING_PHASE:root:#document:B:-:MODIFICATION:#document:::\n"
 		"rootCap:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
 		"root:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
@@ -270,7 +270,7 @@ void EventTest::testRemove()
 	pDoc->addEventListener(MutationEvent::DOMSubtreeModified, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeRemoved, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeRemovedFromDocument, &docCapListener, true);
-	
+
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeRemoved, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeRemovedFromDocument, &rootListener, false);
@@ -278,9 +278,9 @@ void EventTest::testRemove()
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeRemoved, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeRemovedFromDocument, &rootCapListener, true);
-	
+
 	pDoc->appendChild(pRoot);
-	
+
 	AutoPtr<Text> pText = pDoc->createTextNode("text");
 	pRoot->appendChild(pText);
 
@@ -289,7 +289,7 @@ void EventTest::testRemove()
 	pRoot->removeChild(pText);
 
 	const XMLString& log = TestEventListener::log();
-	assertTrue (log == 
+	assertTrue (log ==
 		"docCap:DOMNodeRemoved:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:root:::\n"
 		"rootCap:DOMNodeRemoved:CAPTURING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
 		"root:DOMNodeRemoved:BUBBLING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
@@ -321,7 +321,7 @@ void EventTest::testRemoveSubtree()
 	pDoc->addEventListener(MutationEvent::DOMSubtreeModified, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeRemoved, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeRemovedFromDocument, &docCapListener, true);
-	
+
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeRemoved, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeRemovedFromDocument, &rootListener, false);
@@ -329,9 +329,9 @@ void EventTest::testRemoveSubtree()
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeRemoved, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeRemovedFromDocument, &rootCapListener, true);
-	
+
 	pDoc->appendChild(pRoot);
-	
+
 	AutoPtr<Text> pText = pDoc->createTextNode("text");
 	pRoot->appendChild(pText);
 
@@ -339,8 +339,8 @@ void EventTest::testRemoveSubtree()
 
 	pDoc->removeChild(pRoot);
 
-	const XMLString& log = TestEventListener::log();	
-	assertTrue (log == 
+	const XMLString& log = TestEventListener::log();
+	assertTrue (log ==
 		"docCap:DOMNodeRemoved:CAPTURING_PHASE:root:#document:B:-:MODIFICATION:#document:::\n"
 		"rootCap:DOMNodeRemoved:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
 		"root:DOMNodeRemoved:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
@@ -372,18 +372,18 @@ void EventTest::testCharacterData()
 	TestEventListener textCapListener("textCap");
 
 	pDoc->addEventListener(MutationEvent::DOMCharacterDataModified, &docListener, false);
-	pDoc->addEventListener(MutationEvent::DOMCharacterDataModified, &docCapListener, true);	
+	pDoc->addEventListener(MutationEvent::DOMCharacterDataModified, &docCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMCharacterDataModified, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMCharacterDataModified, &rootCapListener, true);
 	pText->addEventListener(MutationEvent::DOMCharacterDataModified, &textListener, false);
 	pText->addEventListener(MutationEvent::DOMCharacterDataModified, &textCapListener, true);
 
 	TestEventListener::reset();
-	
+
 	pText->setData("modified");
 
-	const XMLString& log = TestEventListener::log();	
-	assertTrue (log == 
+	const XMLString& log = TestEventListener::log();
+	assertTrue (log ==
 		"docCap:DOMCharacterDataModified:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:::text:modified\n"
 		"rootCap:DOMCharacterDataModified:CAPTURING_PHASE:#text:root:B:-:MODIFICATION:::text:modified\n"
 		"textCap:DOMCharacterDataModified:AT_TARGET:#text:#text:B:-:MODIFICATION:::text:modified\n"
@@ -410,14 +410,14 @@ void EventTest::testCancel()
 	TestEventListener textCapListener("textCap");
 
 	pDoc->addEventListener(MutationEvent::DOMCharacterDataModified, &docListener, false);
-	pDoc->addEventListener(MutationEvent::DOMCharacterDataModified, &docCapListener, true);	
+	pDoc->addEventListener(MutationEvent::DOMCharacterDataModified, &docCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMCharacterDataModified, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMCharacterDataModified, &rootCapListener, true);
 	pText->addEventListener(MutationEvent::DOMCharacterDataModified, &textListener, false);
 	pText->addEventListener(MutationEvent::DOMCharacterDataModified, &textCapListener, true);
 
 	TestEventListener::reset();
-	
+
 	pText->setData("modified");
 
 	const XMLString& log = TestEventListener::log();
@@ -432,22 +432,22 @@ void EventTest::testAttributes()
 
 	TestEventListener rootListener("root");
 	pRoot->addEventListener(MutationEvent::DOMAttrModified, &rootListener, false);
-	
+
 	pRoot->setAttribute("a1", "v1");
 
-	const XMLString& log = TestEventListener::log();		
+	const XMLString& log = TestEventListener::log();
 	assertTrue (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:ADDITION:a1:a1::v1\n");
-	
+
 	TestEventListener::reset();
 	pRoot->setAttribute("a1", "V1");
 	assertTrue (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:MODIFICATION:a1:a1:v1:V1\n");
-	
+
 	TestEventListener::reset();
 	pRoot->setAttribute("a2", "v2");
 	assertTrue (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:ADDITION:a2:a2::v2\n");
 
 	TestEventListener::reset();
-	pRoot->removeAttribute("a1");	
+	pRoot->removeAttribute("a1");
 	assertTrue (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:REMOVAL:a1:a1:V1:\n");
 }
 
@@ -469,7 +469,7 @@ void EventTest::testAddRemoveInEvent()
 	pDoc->addEventListener(MutationEvent::DOMSubtreeModified, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeInserted, &docCapListener, true);
 	pDoc->addEventListener(MutationEvent::DOMNodeInsertedIntoDocument, &docCapListener, true);
-	
+
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeInserted, &rootListener, false);
 	pRoot->addEventListener(MutationEvent::DOMNodeInsertedIntoDocument, &rootListener, false);
@@ -477,11 +477,11 @@ void EventTest::testAddRemoveInEvent()
 	pRoot->addEventListener(MutationEvent::DOMSubtreeModified, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeInserted, &rootCapListener, true);
 	pRoot->addEventListener(MutationEvent::DOMNodeInsertedIntoDocument, &rootCapListener, true);
-	
+
 	pDoc->appendChild(pRoot);
-	
+
 	const XMLString& log = TestEventListener::log();
-	assertTrue (log == 
+	assertTrue (log ==
 		"docCap:DOMNodeInserted:CAPTURING_PHASE:root:#document:B:-:MODIFICATION:#document:::\n"
 		"rootCap:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
 		"root:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
@@ -492,13 +492,13 @@ void EventTest::testAddRemoveInEvent()
 		"docCap:DOMSubtreeModified:AT_TARGET:#document:#document:B:-:MODIFICATION::::\n"
 		"doc:DOMSubtreeModified:AT_TARGET:#document:#document:B:-:MODIFICATION::::\n"
 	);
-	
+
 	TestEventListener::reset();
-	
+
 	AutoPtr<Text> pText = pDoc->createTextNode("text");
 	pRoot->appendChild(pText);
 
-	assertTrue (log == 
+	assertTrue (log ==
 		"docCap:DOMNodeInserted:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:root:::\n"
 		"rootCap:DOMNodeInserted:CAPTURING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
 		"root:DOMNodeInserted:BUBBLING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
@@ -519,25 +519,25 @@ void EventTest::testSuspended()
 	AutoPtr<Element> pRoot = pDoc->createElement("root");
 
 	pDoc->suspendEvents();
-	
+
 	TestEventListener rootListener("root");
 	pRoot->addEventListener(MutationEvent::DOMAttrModified, &rootListener, false);
-	
+
 	pRoot->setAttribute("a1", "v1");
 
-	const XMLString& log = TestEventListener::log();		
+	const XMLString& log = TestEventListener::log();
 	assertTrue (log.empty());
-	
+
 	TestEventListener::reset();
 	pRoot->setAttribute("a1", "V1");
 	assertTrue (log.empty());
-	
+
 	TestEventListener::reset();
 	pRoot->setAttribute("a2", "v2");
 	assertTrue (log.empty());
 
 	TestEventListener::reset();
-	pRoot->removeAttribute("a1");	
+	pRoot->removeAttribute("a1");
 	assertTrue (log.empty());
 }
 
diff --git a/XML/testsuite/src/NamePoolTest.cpp b/XML/testsuite/src/NamePoolTest.cpp
index eae5944a7..896beb866 100644
--- a/XML/testsuite/src/NamePoolTest.cpp
+++ b/XML/testsuite/src/NamePoolTest.cpp
@@ -36,17 +36,17 @@ void NamePoolTest::testNamePool()
 	AutoPtr<NamePool> pool = new NamePool;
 	const Name* pName = 0;
 	Name name("pre:local", "http://www.appinf.com");
-	
+
 	pName = &pool->insert(name);
 	const Name* pName2 = &pool->insert("pre:local", "http://www.appinf.com", "local");
 	assertTrue (pName == pName2);
-	
+
 	pName2 = &pool->insert("pre:local2", "http://www.appinf.com", "local2");
 	assertTrue (pName2 != pName);
-	
+
 	pName2 = &pool->insert(name);
 	assertTrue (pName2 == pName);
-	
+
 	pName2 = &pool->insert(*pName);
 	assertTrue (pName2 == pName);
 }
diff --git a/XML/testsuite/src/NameTest.cpp b/XML/testsuite/src/NameTest.cpp
index e45441e0d..78e4641b2 100644
--- a/XML/testsuite/src/NameTest.cpp
+++ b/XML/testsuite/src/NameTest.cpp
@@ -35,12 +35,12 @@ void NameTest::testSplit()
 	Name::split(qname, prefix, local);
 	assertTrue (prefix.empty());
 	assertTrue (local == "name");
-	
+
 	qname = "p:l";
 	Name::split(qname, prefix, local);
 	assertTrue (prefix == "p");
 	assertTrue (local == "l");
-	
+
 	qname = "pre:local";
 	Name::split(qname, prefix, local);
 	assertTrue (prefix == "pre");
@@ -111,17 +111,17 @@ void NameTest::testCompare()
 	Name n1("pre:local");
 	Name n2(n1);
 	Name n3("pre:local2");
-	
+
 	assertTrue (n1.equals(n2));
 	assertTrue (!n1.equals(n3));
-	
+
 	n1.assign("pre:local", "http://www.appinf.com", "local");
 	n2.assign("pre:local", "http://www.appinf.com", "local");
 	n3.assign("pre:local2", "http://www.appinf.com", "local2");
-	
+
 	assertTrue (n1.equals(n2));
 	assertTrue (!n1.equals(n3));
-	
+
 	assertTrue (n1.equals("pre:local", "http://www.appinf.com", "local"));
 	assertTrue (!n1.equals("pre:local", "", ""));
 	assertTrue (n1.equalsWeakly("pre:local", "", ""));
diff --git a/XML/testsuite/src/NameTest.h b/XML/testsuite/src/NameTest.h
index 7065fa4ad..d8b858fbb 100644
--- a/XML/testsuite/src/NameTest.h
+++ b/XML/testsuite/src/NameTest.h
@@ -30,7 +30,7 @@ public:
 	void testName();
 	void testCompare();
 	void testSwap();
-	
+
 	void setUp();
 	void tearDown();
 
diff --git a/XML/testsuite/src/NamespaceSupportTest.cpp b/XML/testsuite/src/NamespaceSupportTest.cpp
index e82ea2af6..e8cd3682d 100644
--- a/XML/testsuite/src/NamespaceSupportTest.cpp
+++ b/XML/testsuite/src/NamespaceSupportTest.cpp
@@ -35,16 +35,16 @@ void NamespaceSupportTest::testNamespaceSupport()
 	assertTrue (prefixes.size() == 2);
 	assertTrue (prefixes.find("xml") != prefixes.end());
 	assertTrue (prefixes.find("xmlns") != prefixes.end());
-	
+
 	ns.getPrefixes(prefixes);
 	assertTrue (prefixes.size() == 2);
 	assertTrue (prefixes.find("xml") != prefixes.end());
 	assertTrue (prefixes.find("xmlns") != prefixes.end());
-	
+
 	ns.pushContext();
 	ns.declarePrefix("ns1", "urn:ns1");
 	ns.declarePrefix("ns2", "urn:ns2");
-	
+
 	ns.getDeclaredPrefixes(prefixes);
 	assertTrue (prefixes.size() == 2);
 	assertTrue (prefixes.find("ns1") != prefixes.end());
@@ -52,7 +52,7 @@ void NamespaceSupportTest::testNamespaceSupport()
 
 	ns.pushContext();
 	ns.declarePrefix("ns3", "urn:ns3");
-	
+
 	ns.getDeclaredPrefixes(prefixes);
 	assertTrue (prefixes.size() == 1);
 	assertTrue (prefixes.find("ns3") != prefixes.end());
@@ -75,20 +75,20 @@ void NamespaceSupportTest::testNamespaceSupport()
 	assertTrue (ns.isMapped("urn:ns2"));
 	assertTrue (ns.isMapped("http://www.w3.org/XML/1998/namespace"));
 	assertTrue (!ns.isMapped("urn:ns3"));
-	
+
 	ns.getPrefixes("urn:ns2", prefixes);
 	assertTrue (prefixes.size() == 1);
 	assertTrue (prefixes.find("ns2") != prefixes.end());
-	
+
 	ns.pushContext();
 	ns.declarePrefix("", "urn:ns3");
 	ns.declarePrefix("NS2", "urn:ns2");
-	
+
 	ns.getPrefixes("urn:ns2", prefixes);
 	assertTrue (prefixes.size() == 2);
 	assertTrue (prefixes.find("ns2") != prefixes.end());
 	assertTrue (prefixes.find("NS2") != prefixes.end());
-	
+
 	ns.getPrefixes(prefixes);
 	assertTrue (prefixes.size() == 5);
 	assertTrue (prefixes.find("xml") != prefixes.end());
@@ -101,11 +101,11 @@ void NamespaceSupportTest::testNamespaceSupport()
 	assertTrue (prefixes.size() == 2);
 	assertTrue (prefixes.find("") != prefixes.end());
 	assertTrue (prefixes.find("NS2") != prefixes.end());
-	
+
 	assertTrue (ns.getPrefix("urn:ns3") == "");
 	assertTrue (ns.getPrefix("urn:ns2") == "NS2");
 	assertTrue (ns.getPrefix("urn:ns4") == "");
-	
+
 	assertTrue (ns.isMapped("urn:ns3"));
 	assertTrue (ns.isMapped("urn:ns2"));
 	assertTrue (!ns.isMapped("urn:ns4"));
@@ -114,14 +114,14 @@ void NamespaceSupportTest::testNamespaceSupport()
 	assertTrue (ns.getURI("ns1") == "urn:ns1");
 	assertTrue (ns.getURI("") == "urn:ns3");
 	assertTrue (ns.getURI("NS2") == "urn:ns2");
-	
+
 	std::string localName;
 	std::string namespaceURI;
 	bool declared = ns.processName("elem", namespaceURI, localName, false);
 	assertTrue (declared);
 	assertTrue (localName == "elem");
 	assertTrue (namespaceURI == "urn:ns3");
-	
+
 	declared = ns.processName("NS2:elem", namespaceURI, localName, false);
 	assertTrue (declared);
 	assertTrue (localName == "elem");
@@ -146,18 +146,18 @@ void NamespaceSupportTest::testNamespaceSupport()
 	assertTrue (!declared);
 	assertTrue (localName == "attr");
 	assertTrue (namespaceURI == "");
-	
+
 	ns.popContext();
 	assertTrue (ns.getURI("xml") == "http://www.w3.org/XML/1998/namespace");
 	assertTrue (ns.getURI("ns1") == "urn:ns1");
 	assertTrue (ns.getURI("") == "");
 	assertTrue (ns.getURI("NS2") == "");
-	
+
 	declared = ns.processName("elem", namespaceURI, localName, false);
 	assertTrue (declared);
 	assertTrue (localName == "elem");
 	assertTrue (namespaceURI == "");
-	
+
 	declared = ns.processName("ns2:elem", namespaceURI, localName, false);
 	assertTrue (declared);
 	assertTrue (localName == "elem");
diff --git a/XML/testsuite/src/NodeAppenderTest.cpp b/XML/testsuite/src/NodeAppenderTest.cpp
index e492f77ed..8ece486b7 100644
--- a/XML/testsuite/src/NodeAppenderTest.cpp
+++ b/XML/testsuite/src/NodeAppenderTest.cpp
@@ -41,9 +41,9 @@ void NodeAppenderTest::testAppendNode()
 	AutoPtr<Document> pDoc = new Document;
 	AutoPtr<Element>  pRoot = pDoc->createElement("root");
 	pDoc->appendChild(pRoot);
-	
+
 	NodeAppender appender(pRoot);
-	
+
 	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Element> pElem3 = pDoc->createElement("elem");
@@ -54,15 +54,15 @@ void NodeAppenderTest::testAppendNode()
 
 	assertTrue (pRoot->firstChild() == pElem1);
 	assertTrue (pRoot->lastChild() == pElem3);
-	
+
 	assertTrue (pElem1->nextSibling() == pElem2);
 	assertTrue (pElem2->nextSibling() == pElem3);
 	assertTrue (pElem3->nextSibling() == 0);
-	
+
 	assertTrue (pElem1->previousSibling() == 0);
-	assertTrue (pElem2->previousSibling() == pElem1);	
-	assertTrue (pElem3->previousSibling() == pElem2);	
-	
+	assertTrue (pElem2->previousSibling() == pElem1);
+	assertTrue (pElem3->previousSibling() == pElem2);
+
 	assertTrue (pElem1->parentNode() == pRoot);
 	assertTrue (pElem2->parentNode() == pRoot);
 	assertTrue (pElem3->parentNode() == pRoot);
@@ -74,13 +74,13 @@ void NodeAppenderTest::testAppendNodeList()
 	AutoPtr<Document> pDoc = new Document;
 	AutoPtr<Element>  pRoot = pDoc->createElement("root");
 	pDoc->appendChild(pRoot);
-	
+
 	NodeAppender appender(pRoot);
-	
+
 	AutoPtr<DocumentFragment> pFrag1 = pDoc->createDocumentFragment();
 	AutoPtr<DocumentFragment> pFrag2 = pDoc->createDocumentFragment();
 	AutoPtr<DocumentFragment> pFrag3 = pDoc->createDocumentFragment();
-	
+
 	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Element> pElem3 = pDoc->createElement("elem");
@@ -89,12 +89,12 @@ void NodeAppenderTest::testAppendNodeList()
 	pFrag2->appendChild(pElem1);
 	pFrag2->appendChild(pElem2);
 	pFrag2->appendChild(pElem3);
-	
+
 	pFrag3->appendChild(pElem4);
-	
+
 	appender.appendChild(pFrag1);
 	assertTrue (pRoot->firstChild() == 0);
-	
+
 	appender.appendChild(pFrag2);
 	assertTrue (pRoot->firstChild() == pElem1);
 	assertTrue (pRoot->lastChild() == pElem3);
@@ -102,15 +102,15 @@ void NodeAppenderTest::testAppendNodeList()
 	assertTrue (pElem1->nextSibling() == pElem2);
 	assertTrue (pElem2->nextSibling() == pElem3);
 	assertTrue (pElem3->nextSibling() == 0);
-	
+
 	assertTrue (pElem1->previousSibling() == 0);
-	assertTrue (pElem2->previousSibling() == pElem1);	
-	assertTrue (pElem3->previousSibling() == pElem2);	
-	
+	assertTrue (pElem2->previousSibling() == pElem1);
+	assertTrue (pElem3->previousSibling() == pElem2);
+
 	assertTrue (pElem1->parentNode() == pRoot);
 	assertTrue (pElem2->parentNode() == pRoot);
 	assertTrue (pElem3->parentNode() == pRoot);
-	
+
 	appender.appendChild(pFrag3);
 	assertTrue (pRoot->lastChild() == pElem4);
 	assertTrue (pElem4->parentNode() == pRoot);
diff --git a/XML/testsuite/src/NodeIteratorTest.cpp b/XML/testsuite/src/NodeIteratorTest.cpp
index 222f286ef..22cda4539 100644
--- a/XML/testsuite/src/NodeIteratorTest.cpp
+++ b/XML/testsuite/src/NodeIteratorTest.cpp
@@ -62,22 +62,22 @@ void NodeIteratorTest::testShowAll()
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
 	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
+
 	pElem1->appendChild(pText1);
 	pElem2->appendChild(pText2);
 	pRoot->appendChild(pElem1);
 	pRoot->appendChild(pElem2);
 	pDoc->appendChild(pRoot);
-	
+
 	NodeIterator it(pRoot, NodeFilter::SHOW_ALL);
-	
+
 	assertTrue (it.nextNode() == pRoot);
 	assertTrue (it.nextNode() == pElem1);
 	assertTrue (it.nextNode() == pText1);
 	assertTrue (it.nextNode() == pElem2);
 	assertTrue (it.nextNode() == pText2);
 	assertTrue (it.nextNode() == 0);
-	
+
 	assertTrue (it.previousNode() == pText2);
 	assertTrue (it.previousNode() == pElem2);
 	assertTrue (it.previousNode() == pText1);
@@ -95,20 +95,20 @@ void NodeIteratorTest::testShowElements()
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
 	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
+
 	pElem1->appendChild(pText1);
 	pElem2->appendChild(pText2);
 	pRoot->appendChild(pElem1);
 	pRoot->appendChild(pElem2);
 	pDoc->appendChild(pRoot);
-	
+
 	NodeIterator it(pRoot, NodeFilter::SHOW_ELEMENT);
-	
+
 	assertTrue (it.nextNode() == pRoot);
 	assertTrue (it.nextNode() == pElem1);
 	assertTrue (it.nextNode() == pElem2);
 	assertTrue (it.nextNode() == 0);
-	
+
 	assertTrue (it.previousNode() == pElem2);
 	assertTrue (it.previousNode() == pElem1);
 	assertTrue (it.previousNode() == pRoot);
@@ -124,19 +124,19 @@ void NodeIteratorTest::testFilter()
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
 	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
+
 	pElem1->appendChild(pText1);
 	pElem2->appendChild(pText2);
 	pRoot->appendChild(pElem1);
 	pRoot->appendChild(pElem2);
 	pDoc->appendChild(pRoot);
-	
+
 	TestNodeFilter filter;
 	NodeIterator it(pRoot, NodeFilter::SHOW_ELEMENT, &filter);
-	
+
 	assertTrue (it.nextNode() == pElem1);
 	assertTrue (it.nextNode() == 0);
-	
+
 	assertTrue (it.previousNode() == pElem1);
 	assertTrue (it.previousNode() == 0);
 }
@@ -150,17 +150,17 @@ void NodeIteratorTest::testShowNothing()
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
 	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
+
 	pElem1->appendChild(pText1);
 	pElem2->appendChild(pText2);
 	pRoot->appendChild(pElem1);
 	pRoot->appendChild(pElem2);
 	pDoc->appendChild(pRoot);
-	
+
 	NodeIterator it(pRoot, 0);
-	
+
 	assertTrue (it.nextNode() == 0);
-	
+
 	assertTrue (it.previousNode() == 0);
 }
 
diff --git a/XML/testsuite/src/NodeTest.cpp b/XML/testsuite/src/NodeTest.cpp
index 538717efa..e8c62c0ea 100644
--- a/XML/testsuite/src/NodeTest.cpp
+++ b/XML/testsuite/src/NodeTest.cpp
@@ -48,10 +48,10 @@ void NodeTest::testInsert()
 	assertTrue (pRoot->hasChildNodes());
 	assertTrue (pRoot->firstChild() == pChild1);
 	assertTrue (pRoot->lastChild() == pChild1);
-	
+
 	assertTrue (pChild1->previousSibling() == 0);
 	assertTrue (pChild1->nextSibling() == 0);
-	
+
 	AutoPtr<Element> pChild3 = pDoc->createElement("child3");
 	pRoot->insertBefore(pChild3, 0);
 	assertTrue (pRoot->firstChild() == pChild1);
@@ -66,14 +66,14 @@ void NodeTest::testInsert()
 	pRoot->insertBefore(pChild0, pChild1);
 	assertTrue (pRoot->firstChild() == pChild0);
 	assertTrue (pRoot->lastChild() == pChild3);
-	
+
 	assertTrue (pChild0->previousSibling() == 0);
 	assertTrue (pChild0->nextSibling() == pChild1);
 	assertTrue (pChild1->previousSibling() == pChild0);
 	assertTrue (pChild1->nextSibling() == pChild3);
 	assertTrue (pChild3->previousSibling() == pChild1);
 	assertTrue (pChild3->nextSibling() == 0);
-	
+
 	AutoPtr<Element> pChild2 = pDoc->createElement("child2");
 	pRoot->insertBefore(pChild2, pChild3);
 	assertTrue (pRoot->firstChild() == pChild0);
@@ -143,11 +143,11 @@ void NodeTest::testRemove()
 
 	AutoPtr<Element> pChild4 = pDoc->createElement("child4");
 	pRoot->appendChild(pChild4);
-	
+
 	pRoot->removeChild(pChild2);
 	assertTrue (pChild2->previousSibling() == 0);
 	assertTrue (pChild2->nextSibling() == 0);
-	
+
 	assertTrue (pChild1->previousSibling() == 0);
 	assertTrue (pChild1->nextSibling() == pChild3);
 	assertTrue (pChild3->previousSibling() == pChild1);
@@ -158,7 +158,7 @@ void NodeTest::testRemove()
 	pRoot->removeChild(pChild4);
 	assertTrue (pChild4->previousSibling() == 0);
 	assertTrue (pChild4->nextSibling() == 0);
-	
+
 	assertTrue (pChild1->previousSibling() == 0);
 	assertTrue (pChild1->nextSibling() == pChild3);
 	assertTrue (pChild3->previousSibling() == pChild1);
@@ -170,10 +170,10 @@ void NodeTest::testRemove()
 	pRoot->removeChild(pChild1);
 	assertTrue (pChild1->previousSibling() == 0);
 	assertTrue (pChild1->nextSibling() == 0);
-	
+
 	assertTrue (pRoot->firstChild() == pChild3);
 	assertTrue (pRoot->lastChild() == pChild3);
-	
+
 	pRoot->removeChild(pChild3);
 	assertTrue (pChild3->previousSibling() == 0);
 	assertTrue (pChild3->nextSibling() == 0);
@@ -201,7 +201,7 @@ void NodeTest::testReplace()
 
 	AutoPtr<Element> pChild11 = pDoc->createElement("child11");
 	pRoot->replaceChild(pChild11, pChild1);
-	
+
 	assertTrue (pChild1->previousSibling() == 0);
 	assertTrue (pChild1->nextSibling() == 0);
 	assertTrue (pRoot->firstChild() == pChild11);
@@ -282,10 +282,10 @@ void NodeTest::testInsertFragment1()
 	assertTrue (pFrag->lastChild() == 0);
 	assertTrue (pRoot->firstChild() == pChild1);
 	assertTrue (pRoot->lastChild() == pChild1);
-	
+
 	assertTrue (pChild1->previousSibling() == 0);
 	assertTrue (pChild1->nextSibling() == 0);
-	
+
 	AutoPtr<Element> pChild3 = pDoc->createElement("child3");
 	pFrag->appendChild(pChild3);
 	pRoot->insertBefore(pFrag, 0);
@@ -302,14 +302,14 @@ void NodeTest::testInsertFragment1()
 	pRoot->insertBefore(pFrag, pChild1);
 	assertTrue (pRoot->firstChild() == pChild0);
 	assertTrue (pRoot->lastChild() == pChild3);
-	
+
 	assertTrue (pChild0->previousSibling() == 0);
 	assertTrue (pChild0->nextSibling() == pChild1);
 	assertTrue (pChild1->previousSibling() == pChild0);
 	assertTrue (pChild1->nextSibling() == pChild3);
 	assertTrue (pChild3->previousSibling() == pChild1);
 	assertTrue (pChild3->nextSibling() == 0);
-	
+
 	AutoPtr<Element> pChild2 = pDoc->createElement("child2");
 	pFrag->appendChild(pChild2);
 	pRoot->insertBefore(pFrag, pChild3);
@@ -346,12 +346,12 @@ void NodeTest::testInsertFragment2()
 	assertTrue (pFrag->lastChild() == 0);
 	assertTrue (pRoot->firstChild() == pChild2);
 	assertTrue (pRoot->lastChild() == pChild3);
-	
+
 	assertTrue (pChild2->previousSibling() == 0);
 	assertTrue (pChild2->nextSibling() == pChild3);
 	assertTrue (pChild3->previousSibling() == pChild2);
 	assertTrue (pChild3->nextSibling() == 0);
-	
+
 	AutoPtr<Element> pChild6 = pDoc->createElement("child6");
 	AutoPtr<Element> pChild7 = pDoc->createElement("child7");
 	pFrag->appendChild(pChild6);
@@ -376,7 +376,7 @@ void NodeTest::testInsertFragment2()
 	pRoot->insertBefore(pFrag, pChild2);
 	assertTrue (pRoot->firstChild() == pChild0);
 	assertTrue (pRoot->lastChild() == pChild7);
-	
+
 	assertTrue (pChild0->previousSibling() == 0);
 	assertTrue (pChild0->nextSibling() == pChild1);
 	assertTrue (pChild1->previousSibling() == pChild0);
@@ -389,7 +389,7 @@ void NodeTest::testInsertFragment2()
 	assertTrue (pChild6->nextSibling() == pChild7);
 	assertTrue (pChild7->previousSibling() == pChild6);
 	assertTrue (pChild7->nextSibling() == 0);
-	
+
 	AutoPtr<Element> pChild4 = pDoc->createElement("child4");
 	AutoPtr<Element> pChild5 = pDoc->createElement("child5");
 	pFrag->appendChild(pChild4);
@@ -438,14 +438,14 @@ void NodeTest::testInsertFragment3()
 	assertTrue (pFrag->lastChild() == 0);
 	assertTrue (pRoot->firstChild() == pChild3);
 	assertTrue (pRoot->lastChild() == pChild5);
-	
+
 	assertTrue (pChild3->previousSibling() == 0);
 	assertTrue (pChild3->nextSibling() == pChild4);
 	assertTrue (pChild4->previousSibling() == pChild3);
 	assertTrue (pChild4->nextSibling() == pChild5);
 	assertTrue (pChild5->previousSibling() == pChild4);
 	assertTrue (pChild5->nextSibling() == 0);
-	
+
 	AutoPtr<Element> pChild9  = pDoc->createElement("child9");
 	AutoPtr<Element> pChild10 = pDoc->createElement("child10");
 	AutoPtr<Element> pChild11 = pDoc->createElement("child11");
@@ -478,7 +478,7 @@ void NodeTest::testInsertFragment3()
 	pRoot->insertBefore(pFrag, pChild3);
 	assertTrue (pRoot->firstChild() == pChild0);
 	assertTrue (pRoot->lastChild() == pChild11);
-	
+
 	assertTrue (pChild0->previousSibling() == 0);
 	assertTrue (pChild0->nextSibling() == pChild1);
 	assertTrue (pChild1->previousSibling() == pChild0);
@@ -497,7 +497,7 @@ void NodeTest::testInsertFragment3()
 	assertTrue (pChild10->nextSibling() == pChild11);
 	assertTrue (pChild11->previousSibling() == pChild10);
 	assertTrue (pChild11->nextSibling() == 0);
-	
+
 	AutoPtr<Element> pChild6 = pDoc->createElement("child6");
 	AutoPtr<Element> pChild7 = pDoc->createElement("child7");
 	AutoPtr<Element> pChild8 = pDoc->createElement("child8");
@@ -539,7 +539,7 @@ void NodeTest::testAppendFragment1()
 {
 	AutoPtr<Document> pDoc = new Document;
 	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();	
+	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();
 
 	AutoPtr<Element> pChild1 = pDoc->createElement("child1");
 	pFrag->appendChild(pChild1);
@@ -582,7 +582,7 @@ void NodeTest::testAppendFragment2()
 {
 	AutoPtr<Document> pDoc = new Document;
 	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();	
+	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();
 
 	AutoPtr<Element> pChild1 = pDoc->createElement("child1");
 	AutoPtr<Element> pChild2 = pDoc->createElement("child2");
@@ -643,7 +643,7 @@ void NodeTest::testAppendFragment3()
 {
 	AutoPtr<Document> pDoc = new Document;
 	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();	
+	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();
 
 	AutoPtr<Element> pChild1 = pDoc->createElement("child1");
 	AutoPtr<Element> pChild2 = pDoc->createElement("child2");
@@ -722,7 +722,7 @@ void NodeTest::testReplaceFragment1()
 {
 	AutoPtr<Document> pDoc = new Document;
 	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();	
+	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();
 
 	AutoPtr<Element> pChild1 = pDoc->createElement("child1");
 	pRoot->appendChild(pChild1);
@@ -741,7 +741,7 @@ void NodeTest::testReplaceFragment1()
 	pRoot->replaceChild(pFrag, pChild1);
 	assertTrue (pFrag->firstChild() == 0);
 	assertTrue (pFrag->lastChild() == 0);
-	
+
 	assertTrue (pChild1->previousSibling() == 0);
 	assertTrue (pChild1->nextSibling() == 0);
 	assertTrue (pRoot->firstChild() == pChild11);
@@ -812,7 +812,7 @@ void NodeTest::testReplaceFragment2()
 {
 	AutoPtr<Document> pDoc = new Document;
 	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();	
+	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();
 
 	AutoPtr<Element> pChild1 = pDoc->createElement("child1");
 	pRoot->appendChild(pChild1);
@@ -833,7 +833,7 @@ void NodeTest::testReplaceFragment2()
 	pRoot->replaceChild(pFrag, pChild1);
 	assertTrue (pFrag->firstChild() == 0);
 	assertTrue (pFrag->lastChild() == 0);
-	
+
 	assertTrue (pChild1->previousSibling() == 0);
 	assertTrue (pChild1->nextSibling() == 0);
 	assertTrue (pRoot->firstChild() == pChild11);
@@ -930,7 +930,7 @@ void NodeTest::testReplaceFragment3()
 {
 	AutoPtr<Document> pDoc = new Document;
 	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();	
+	AutoPtr<DocumentFragment> pFrag = pDoc->createDocumentFragment();
 
 	AutoPtr<Element> pChild1 = pDoc->createElement("child1");
 	pRoot->appendChild(pChild1);
@@ -953,7 +953,7 @@ void NodeTest::testReplaceFragment3()
 	pRoot->replaceChild(pFrag, pChild1);
 	assertTrue (pFrag->firstChild() == 0);
 	assertTrue (pFrag->lastChild() == 0);
-	
+
 	assertTrue (pChild1->previousSibling() == 0);
 	assertTrue (pChild1->nextSibling() == 0);
 	assertTrue (pRoot->firstChild() == pChild11);
diff --git a/XML/testsuite/src/ParserWriterTest.cpp b/XML/testsuite/src/ParserWriterTest.cpp
index 3a6b5c265..4718decaa 100644
--- a/XML/testsuite/src/ParserWriterTest.cpp
+++ b/XML/testsuite/src/ParserWriterTest.cpp
@@ -43,13 +43,13 @@ ParserWriterTest::~ParserWriterTest()
 void ParserWriterTest::testParseWriteXHTML()
 {
 	std::ostringstream ostr;
-	
+
 	DOMParser parser;
 	parser.setFeature(XMLReader::FEATURE_NAMESPACE_PREFIXES, false);
 	DOMWriter writer;
 	AutoPtr<Document> pDoc = parser.parseString(XHTML);
 	writer.writeNode(ostr, pDoc);
-	
+
 	std::string xml = ostr.str();
 	assertTrue (xml == XHTML);
 }
@@ -58,13 +58,13 @@ void ParserWriterTest::testParseWriteXHTML()
 void ParserWriterTest::testParseWriteXHTML2()
 {
 	std::ostringstream ostr;
-	
+
 	DOMParser parser;
 	parser.setFeature(XMLReader::FEATURE_NAMESPACE_PREFIXES, true);
 	DOMWriter writer;
 	AutoPtr<Document> pDoc = parser.parseString(XHTML2);
 	writer.writeNode(ostr, pDoc);
-	
+
 	std::string xml = ostr.str();
 	assertTrue (xml == XHTML2);
 }
diff --git a/XML/testsuite/src/SAXParserTest.cpp b/XML/testsuite/src/SAXParserTest.cpp
index 182bd4b80..e58746614 100644
--- a/XML/testsuite/src/SAXParserTest.cpp
+++ b/XML/testsuite/src/SAXParserTest.cpp
@@ -53,7 +53,7 @@ public:
 		}
 		return 0;
 	}
-	
+
 	void releaseInputSource(InputSource* pSource)
 	{
 		delete pSource->getByteStream();
@@ -253,7 +253,7 @@ void SAXParserTest::testRSS()
 	filter.setEntityResolver(&resolver);
 	parser.setFeature(XMLReader::FEATURE_EXTERNAL_GENERAL_ENTITIES, true);
 	parser.setFeature(XMLReader::FEATURE_EXTERNAL_PARAMETER_ENTITIES, true);
-	
+
 	std::istringstream istr(RSS);
 	Poco::FileOutputStream ostr("rss.xml");
 	XMLWriter writer(ostr, XMLWriter::CANONICAL | XMLWriter::PRETTY_PRINT);
@@ -269,8 +269,8 @@ void SAXParserTest::testEncoding()
 {
 	SAXParser parser;
 	Poco::Latin9Encoding encoding;
-	parser.addEncoding("ISO-8859-15", &encoding); 
-	
+	parser.addEncoding("ISO-8859-15", &encoding);
+
 	std::istringstream istr(ENCODING);
 	std::ostringstream ostr;
 	XMLWriter writer(ostr, XMLWriter::WRITE_XML_DECLARATION, "ISO-8859-15", encoding);
@@ -279,7 +279,7 @@ void SAXParserTest::testEncoding()
 	parser.setProperty(XMLReader::PROPERTY_LEXICAL_HANDLER, static_cast<Poco::XML::LexicalHandler*>(&writer));
 	InputSource source(istr);
 	parser.parse(&source);
-	
+
 	std::string xml = ostr.str();
 	assertTrue (xml == ENCODING);
 }
@@ -398,7 +398,7 @@ const std::string SAXParserTest::ATTRIBUTES =
 	"</root>";
 
 
-const std::string SAXParserTest::CDATA = 
+const std::string SAXParserTest::CDATA =
 	"<data>\n"
 	"<![CDATA[\n"
 	"\tThe following <tag attr=\"value\">is inside a CDATA section</tag>.\n"
@@ -426,11 +426,11 @@ const std::string SAXParserTest::PROCESSING_INSTRUCTION =
 	"</html>";
 
 
-const std::string SAXParserTest::DTD = 
+const std::string SAXParserTest::DTD =
 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 	"<!DOCTYPE test SYSTEM \"test.dtd\">\n"
 	"<foo/>";
-	
+
 
 const std::string SAXParserTest::INTERNAL_ENTITY =
     "<!DOCTYPE sample [\n"
@@ -459,7 +459,7 @@ const std::string SAXParserTest::EXTERNAL_UNPARSED =
 	"<sample/>";
 
 
-const std::string SAXParserTest::EXTERNAL_PARSED = 
+const std::string SAXParserTest::EXTERNAL_PARSED =
 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 	"<!DOCTYPE test [\n"
 	"\t<!ENTITY include SYSTEM \"include.xml\">\n"
@@ -469,7 +469,7 @@ const std::string SAXParserTest::EXTERNAL_PARSED =
 	"</sample>\n";
 
 
-const std::string SAXParserTest::INCLUDE = 
+const std::string SAXParserTest::INCLUDE =
 	"<elem>\n"
 	"\tAn external entity.\n"
 	"</elem>\n";
diff --git a/XML/testsuite/src/TreeWalkerTest.cpp b/XML/testsuite/src/TreeWalkerTest.cpp
index 85c45dab5..0bd027235 100644
--- a/XML/testsuite/src/TreeWalkerTest.cpp
+++ b/XML/testsuite/src/TreeWalkerTest.cpp
@@ -73,29 +73,29 @@ void TreeWalkerTest::testShowAll()
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
 	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
+
 	pElem1->appendChild(pText1);
 	pElem2->appendChild(pText2);
 	pRoot->appendChild(pElem1);
 	pRoot->appendChild(pElem2);
 	pDoc->appendChild(pRoot);
-	
+
 	TreeWalker it(pRoot, NodeFilter::SHOW_ALL);
-	
+
 	assertTrue (it.currentNode() == pRoot);
 	assertTrue (it.nextNode() == pElem1);
 	assertTrue (it.nextNode() == pText1);
 	assertTrue (it.nextNode() == pElem2);
 	assertTrue (it.nextNode() == pText2);
 	assertTrue (it.nextNode() == 0);
-	
+
 	assertTrue (it.currentNode() == pText2);
 	assertTrue (it.previousNode() == pElem2);
 	assertTrue (it.previousNode() == pText1);
 	assertTrue (it.previousNode() == pElem1);
 	assertTrue (it.previousNode() == pRoot);
 	assertTrue (it.previousNode() == 0);
-	
+
 	assertTrue (it.currentNode() == pRoot);
 	assertTrue (it.parentNode() == 0);
 	assertTrue (it.currentNode() == pRoot);
@@ -124,25 +124,25 @@ void TreeWalkerTest::testShowElements()
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
 	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
+
 	pElem1->appendChild(pText1);
 	pElem2->appendChild(pText2);
 	pRoot->appendChild(pElem1);
 	pRoot->appendChild(pElem2);
 	pDoc->appendChild(pRoot);
-	
+
 	TreeWalker it(pRoot, NodeFilter::SHOW_ELEMENT);
-	
+
 	assertTrue (it.currentNode() == pRoot);
 	assertTrue (it.nextNode() == pElem1);
 	assertTrue (it.nextNode() == pElem2);
 	assertTrue (it.nextNode() == 0);
-	
+
 	assertTrue (it.currentNode() == pElem2);
 	assertTrue (it.previousNode() == pElem1);
 	assertTrue (it.previousNode() == pRoot);
 	assertTrue (it.previousNode() == 0);
-	
+
 	assertTrue (it.currentNode() == pRoot);
 	assertTrue (it.parentNode() == 0);
 	assertTrue (it.currentNode() == pRoot);
@@ -168,22 +168,22 @@ void TreeWalkerTest::testFilter()
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
 	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
+
 	pElem1->appendChild(pText1);
 	pElem2->appendChild(pText2);
 	pRoot->appendChild(pElem1);
 	pRoot->appendChild(pElem2);
 	pDoc->appendChild(pRoot);
-	
+
 	SkipNodeFilter skipFilter;
 	TreeWalker it1(pRoot, NodeFilter::SHOW_ELEMENT, &skipFilter);
-	
+
 	assertTrue (it1.nextNode() == pElem1);
 	assertTrue (it1.nextNode() == 0);
-	
+
 	assertTrue (it1.currentNode() == pElem1);
 	assertTrue (it1.previousNode() == 0);
-	
+
 	assertTrue (it1.parentNode() == 0);
 	assertTrue (it1.firstChild() == 0);
 	assertTrue (it1.lastChild() == 0);
@@ -191,17 +191,17 @@ void TreeWalkerTest::testFilter()
 	assertTrue (it1.previousSibling() == 0);
 
 	TreeWalker it2(pRoot, NodeFilter::SHOW_ALL, &skipFilter);
-	
+
 	assertTrue (it2.nextNode() == pElem1);
 	assertTrue (it2.nextNode() == pText1);
 	assertTrue (it2.nextNode() == pText2);
 	assertTrue (it2.nextNode() == 0);
-	
+
 	assertTrue (it2.currentNode() == pText2);
 	assertTrue (it2.previousNode() == pText1);
 	assertTrue (it2.previousNode() == pElem1);
 	assertTrue (it2.previousNode() == 0);
-	
+
 	assertTrue (it2.currentNode() == pElem1);
 	assertTrue (it2.parentNode() == 0);
 	assertTrue (it2.nextSibling() == 0);
@@ -213,14 +213,14 @@ void TreeWalkerTest::testFilter()
 
 	RejectNodeFilter rejectFilter;
 	TreeWalker it3(pRoot, NodeFilter::SHOW_ELEMENT, &rejectFilter);
-	
+
 	assertTrue (it3.nextNode() == pElem1);
 	assertTrue (it3.nextNode() == 0);
-	
+
 	assertTrue (it3.currentNode() == pElem1);
 	assertTrue (it3.previousNode() == pRoot);
 	assertTrue (it3.previousNode() == 0);
-	
+
 	assertTrue (it3.currentNode() == pRoot);
 	assertTrue (it3.parentNode() == 0);
 	assertTrue (it3.firstChild() == pElem1);
@@ -230,16 +230,16 @@ void TreeWalkerTest::testFilter()
 	assertTrue (it3.lastChild() == pElem1);
 
 	TreeWalker it4(pRoot, NodeFilter::SHOW_ALL, &rejectFilter);
-	
+
 	assertTrue (it4.nextNode() == pElem1);
 	assertTrue (it4.nextNode() == pText1);
 	assertTrue (it4.nextNode() == 0);
-	
+
 	assertTrue (it4.currentNode() == pText1);
 	assertTrue (it4.previousNode() == pElem1);
 	assertTrue (it4.previousNode() == pRoot);
 	assertTrue (it4.previousNode() == 0);
-	
+
 	assertTrue (it4.currentNode() == pRoot);
 	assertTrue (it4.parentNode() == 0);
 	assertTrue (it4.firstChild() == pElem1);
@@ -263,19 +263,19 @@ void TreeWalkerTest::testShowNothing()
 	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
 	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
 	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
+
 	pElem1->appendChild(pText1);
 	pElem2->appendChild(pText2);
 	pRoot->appendChild(pElem1);
 	pRoot->appendChild(pElem2);
 	pDoc->appendChild(pRoot);
-	
+
 	TreeWalker it(pRoot, 0);
-	
+
 	assertTrue (it.nextNode() == 0);
-	
+
 	assertTrue (it.previousNode() == 0);
-	
+
 	assertTrue (it.currentNode() == pRoot);
 	assertTrue (it.firstChild() == 0);
 	assertTrue (it.lastChild() == 0);
diff --git a/XML/testsuite/src/WinCEDriver.cpp b/XML/testsuite/src/WinCEDriver.cpp
index 06d2fbf19..c50dedda4 100644
--- a/XML/testsuite/src/WinCEDriver.cpp
+++ b/XML/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int wmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("XMLTestSuite", XMLTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/Zip/Zip.progen b/Zip/Zip.progen
index f6445c829..fbcba85bf 100644
--- a/Zip/Zip.progen
+++ b/Zip/Zip.progen
@@ -13,6 +13,7 @@ vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.disableWarnings = 4244;4267
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/Zip/Zip_vs170.sln b/Zip/Zip_vs170.sln
index 466a66433..33c936b80 100644
--- a/Zip/Zip_vs170.sln
+++ b/Zip/Zip_vs170.sln
@@ -9,6 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|ARM64 = debug_shared|ARM64
+		release_shared|ARM64 = release_shared|ARM64
+		debug_static_mt|ARM64 = debug_static_mt|ARM64
+		release_static_mt|ARM64 = release_static_mt|ARM64
+		debug_static_md|ARM64 = debug_static_md|ARM64
+		release_static_md|ARM64 = release_static_md|ARM64
 		debug_shared|Win32 = debug_shared|Win32
 		release_shared|Win32 = release_shared|Win32
 		debug_static_mt|Win32 = debug_static_mt|Win32
@@ -23,6 +29,24 @@ Global
 		release_static_md|x64 = release_static_md|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -59,6 +83,24 @@ Global
 		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|x64.Build.0 = release_static_md|x64
 		{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|ARM64.Build.0 = debug_shared|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|ARM64.ActiveCfg = release_shared|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|ARM64.Build.0 = release_shared|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|ARM64.Deploy.0 = release_shared|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|ARM64.Build.0 = release_static_md|ARM64
+		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64
 		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
diff --git a/Zip/Zip_vs170.vcxproj b/Zip/Zip_vs170.vcxproj
index fef32f10e..b0d0ea11e 100644
--- a/Zip/Zip_vs170.vcxproj
+++ b/Zip/Zip_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>Zip</ProjectName>
     <ProjectGuid>{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}</ProjectGuid>
     <RootNamespace>Zip</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoZipA64d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoZipmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoZipmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoZipA64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoZipmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoZipmt</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoZipd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoZipmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoZipmtd</TargetName>
@@ -171,6 +250,32 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoZipmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoZipmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Zip\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>..\binA64\</OutDir>
+    <IntDir>objA64\Zip\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Zip\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Zip\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Zip\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>..\libA64\</OutDir>
+    <IntDir>objA64\Zip\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
     <IntDir>obj\Zip\$(Configuration)\</IntDir>
@@ -223,6 +328,172 @@
     <OutDir>..\lib64\</OutDir>
     <IntDir>obj64\Zip\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoZipA64d.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\binA64\PocoZipA64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\libA64\PocoZipd.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\binA64\PocoZipA64.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\libA64\PocoZip.lib</ImportLibrary>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoZipmtd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoZipmtd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoZipmt.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\libA64\PocoZipmdd.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoZipmdd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\libA64\PocoZipmd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -652,12 +923,16 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/Zip/include/Poco/Zip/AutoDetectStream.h b/Zip/include/Poco/Zip/AutoDetectStream.h
index da14a74db..37c7b6963 100644
--- a/Zip/include/Poco/Zip/AutoDetectStream.h
+++ b/Zip/include/Poco/Zip/AutoDetectStream.h
@@ -28,13 +28,13 @@ namespace Zip {
 
 
 class Zip_API AutoDetectStreamBuf: public Poco::BufferedStreamBuf
-	/// AutoDetectStreamBuf automatically detects the end of a stream using the 
+	/// AutoDetectStreamBuf automatically detects the end of a stream using the
 	/// Data Descriptor signature.
 {
 public:
 	AutoDetectStreamBuf(std::istream& in, const std::string& prefix, const std::string& postfix, bool reposition, Poco::UInt32 start, bool needsZip64);
-		/// Creates the AutoDetectStream. 
-		
+		/// Creates the AutoDetectStream.
+
 	~AutoDetectStreamBuf();
 		/// Destroys the AutoDetectStream.
 
@@ -43,7 +43,7 @@ protected:
 	int writeToDevice(const char* buffer, std::streamsize length);
 
 private:
-	enum 
+	enum
 	{
 		STREAM_BUFFER_SIZE  = 1024
 	};
@@ -83,7 +83,7 @@ protected:
 
 
 class Zip_API AutoDetectInputStream: public AutoDetectIOS, public std::istream
-	/// AutoDetectInputStream automatically detects the end of a stream using the 
+	/// AutoDetectInputStream automatically detects the end of a stream using the
 	/// Data Descriptor signature.
 {
 public:
diff --git a/Zip/include/Poco/Zip/Compress.h b/Zip/include/Poco/Zip/Compress.h
index b71418d97..c8a33d664 100644
--- a/Zip/include/Poco/Zip/Compress.h
+++ b/Zip/include/Poco/Zip/Compress.h
@@ -66,7 +66,7 @@ public:
 
 	const std::string& getZipComment() const;
 		/// Returns the Zip file comment.
-		
+
 	ZipArchive close();
 		/// Finalizes the ZipArchive, closes it.
 
@@ -82,7 +82,7 @@ public:
 		///   - jpg
 		///   - jpeg
 		///   - png
-		
+
 	const std::set<std::string>& getStoreExtensions() const;
 		/// Returns the file extensions for which the CM_STORE compression method
 		/// is used if CM_AUTO is specified in addFile() or addRecursive().
diff --git a/Zip/include/Poco/Zip/Decompress.h b/Zip/include/Poco/Zip/Decompress.h
index 591c9718d..e74e7e47c 100644
--- a/Zip/include/Poco/Zip/Decompress.h
+++ b/Zip/include/Poco/Zip/Decompress.h
@@ -49,7 +49,7 @@ public:
 		/// Creates the Decompress. Note that istream must be good and at the very beginning of the file!
 		/// Calling decompressAllFiles will cause the stream to be in state failed once the zip file is processed.
 		/// outputDir must be a directory. If it doesn't exist yet, it will be automatically created.
-		/// If flattenDirs is set to true, the directory structure of the zip file is not recreated. 
+		/// If flattenDirs is set to true, the directory structure of the zip file is not recreated.
 		/// Instead, all files are extracted into one single directory.
 
 	~Decompress();
diff --git a/Zip/include/Poco/Zip/PartialStream.h b/Zip/include/Poco/Zip/PartialStream.h
index bdc9474c9..a1601e86a 100644
--- a/Zip/include/Poco/Zip/PartialStream.h
+++ b/Zip/include/Poco/Zip/PartialStream.h
@@ -34,12 +34,12 @@ class Zip_API PartialStreamBuf: public Poco::BufferedStreamBuf
 {
 public:
 	PartialStreamBuf(std::istream& in, std::ios::pos_type start, std::ios::pos_type end, const std::string& prefix, const std::string& postfix, bool initStream);
-		/// Creates the PartialStream. 
+		/// Creates the PartialStream.
 		/// If initStream is true the status of the stream will be cleared on the first access, and the stream will be repositioned
 		/// to position start
 
 	PartialStreamBuf(std::ostream& out, std::size_t start, std::size_t end, bool initStream);
-		/// Creates the PartialStream. 
+		/// Creates the PartialStream.
 		/// If initStream is true the status of the stream will be cleared on the first access.
 		/// start and end acts as offset values for the written content. A start value greater than zero,
 		/// means that the first bytes are not written but discarded instead,
@@ -62,7 +62,7 @@ protected:
 	int writeToDevice(const char* buffer, std::streamsize length);
 
 private:
-	enum 
+	enum
 	{
 		STREAM_BUFFER_SIZE  = 1024
 	};
@@ -153,7 +153,7 @@ public:
 		/// Examples:
 		///     start = 3; end = 1
 		///     write("hello", 5) -> "l"
-		///     
+		///
 		///     start = 3; end = 0
 		///     write("hello", 5) -> "lo"
 
diff --git a/Zip/include/Poco/Zip/ZipArchive.h b/Zip/include/Poco/Zip/ZipArchive.h
index a70f5ec45..b6446886f 100644
--- a/Zip/include/Poco/Zip/ZipArchive.h
+++ b/Zip/include/Poco/Zip/ZipArchive.h
@@ -78,7 +78,7 @@ private:
 		/// Stores directory info for all found disks
 	DirectoryInfos64 _disks64;
 		/// Stores directory info for all found disks
-		
+
 	static const std::string EMPTY_COMMENT;
 
 	friend class Compress;
diff --git a/Zip/include/Poco/Zip/ZipArchiveInfo.h b/Zip/include/Poco/Zip/ZipArchiveInfo.h
index 3605e6040..a4c4bf9d1 100644
--- a/Zip/include/Poco/Zip/ZipArchiveInfo.h
+++ b/Zip/include/Poco/Zip/ZipArchiveInfo.h
@@ -134,7 +134,7 @@ public:
 	~ZipArchiveInfo64();
 		/// Destroys the ZipArchiveInfo64.
 
-	void getVersionMadeBy(int& major, int& minor);	
+	void getVersionMadeBy(int& major, int& minor);
 		/// The ZIP version used to create the file
 
 	void getRequiredVersion(int& major, int& minor);
@@ -157,7 +157,7 @@ public:
 
 	std::streamoff getCentralDirectoryOffset() const;
 		/// Returns the offset of the central directory from beginning of first disk
-	
+
 	std::streamoff getHeaderOffset() const;
 		/// Returns the offset of the header in relation to the begin of this disk
 
@@ -175,7 +175,7 @@ public:
 
 	void setHeaderOffset(std::streamoff val);
 		/// Sets the offset of the header in relation to the begin of this disk
-	
+
 	void setTotalNumberOfDisks(Poco::UInt32 val);
 		/// Sets the offset of the central directory from beginning of first disk
 
@@ -217,7 +217,7 @@ private:
 		ENDOFCENTRALDIROFFSET_SIZE = 8,
 		TOTALNUMBEROFENDDISKS_POS = ENDOFCENTRALDIROFFSET_POS + ENDOFCENTRALDIROFFSET_SIZE,
 		TOTALNUMBEROFENDDISKS_SIZE = 4,
-			
+
 		FULL_LOCATOR_SIZE = 20
 	};
 
diff --git a/Zip/include/Poco/Zip/ZipFileInfo.h b/Zip/include/Poco/Zip/ZipFileInfo.h
index 2ea507365..3ed0f5df4 100644
--- a/Zip/include/Poco/Zip/ZipFileInfo.h
+++ b/Zip/include/Poco/Zip/ZipFileInfo.h
@@ -22,7 +22,6 @@
 #include "Poco/Zip/ZipCommon.h"
 #include "Poco/Zip/ZipUtil.h"
 
-
 namespace Poco {
 namespace Zip {
 
@@ -121,7 +120,7 @@ private:
 	void setFileNameLength(Poco::UInt16 size);
 
 	void setFileName(const std::string& str);
-	
+
 	void setExternalFileAttributes(Poco::UInt32 attrs);
 
 	void parse(std::istream& in, bool assumeHeaderRead);
@@ -143,7 +142,7 @@ private:
 	Poco::UInt16 getFileCommentLength() const;
 
 	Poco::UInt32 getExternalFileAttributes() const;
-	
+
 	void setUnixAttributes();
 
 private:
@@ -194,8 +193,8 @@ private:
 		EXTRA_DATA_OFFSET_SIZE = 8,
 		FULLEXTRA_DATA_SIZE = 28
 	};
-	
-	enum 
+
+	enum
 	{
 		DEFAULT_UNIX_FILE_MODE = 0640,
 		DEFAULT_UNIX_DIR_MODE  = 0755
@@ -455,7 +454,7 @@ inline void ZipFileInfo::setCompressionLevel(ZipCommon::CompressionLevel cl)
 {
 	// bit 1 and 2 indicate the level
 	Poco::UInt16 val = static_cast<Poco::UInt16>(cl);
-	val <<= 1; 
+	val <<= 1;
 	Poco::UInt16 mask = 0xfff9;
 	_rawInfo[GENERAL_PURPOSE_POS] = ((_rawInfo[GENERAL_PURPOSE_POS] & mask) | val);
 }
diff --git a/Zip/include/Poco/Zip/ZipManipulator.h b/Zip/include/Poco/Zip/ZipManipulator.h
index 5d9896b20..5d69c7952 100644
--- a/Zip/include/Poco/Zip/ZipManipulator.h
+++ b/Zip/include/Poco/Zip/ZipManipulator.h
@@ -61,10 +61,10 @@ public:
 		/// Adds a file to the zip file.
 
 	ZipArchive commit();
-		/// Commits all changes and re-creates the Zip File with the changes applied. 
+		/// Commits all changes and re-creates the Zip File with the changes applied.
 		/// Returns the ZipArchive for the newly created archive
 		///
-		/// Changes will be first written to a temporary file, 
+		/// Changes will be first written to a temporary file,
 		/// then the originalfile will be either deleted or renamed to .bak,
 		/// then, the temp file will be renamed to the original zip file name.
 
diff --git a/Zip/include/Poco/Zip/ZipStream.h b/Zip/include/Poco/Zip/ZipStream.h
index b8a102897..8280a7473 100644
--- a/Zip/include/Poco/Zip/ZipStream.h
+++ b/Zip/include/Poco/Zip/ZipStream.h
@@ -41,7 +41,7 @@ class Zip_API ZipStreamBuf: public Poco::BufferedStreamBuf
 public:
 	ZipStreamBuf(std::istream& istr, const ZipLocalFileHeader& fileEntry, bool reposition);
 		/// Creates the ZipStreamBuf. Set reposition to false, if you do on-the-fly decompression.
-	
+
 	ZipStreamBuf(std::ostream& ostr, ZipLocalFileHeader& fileEntry, bool reposition);
 		/// Creates the ZipStreamBuf. Set reposition to false, if you do on-the-fly compression.
 
diff --git a/Zip/include/Poco/Zip/ZipUtil.h b/Zip/include/Poco/Zip/ZipUtil.h
index 6ac74adeb..a11440509 100644
--- a/Zip/include/Poco/Zip/ZipUtil.h
+++ b/Zip/include/Poco/Zip/ZipUtil.h
@@ -38,7 +38,7 @@ public:
 	static Poco::UInt32 get32BitValue(const char* pVal, const Poco::UInt32 pos);
 
 	static Poco::UInt64 get64BitValue(const char* pVal, const Poco::UInt32 pos);
-	
+
 	static void set16BitValue(const Poco::UInt16 val, char* pVal, const Poco::UInt32 pos);
 
 	static void set32BitValue(const Poco::UInt32 val, char* pVal, const Poco::UInt32 pos);
diff --git a/Zip/samples/unzip/src/unzip.cpp b/Zip/samples/unzip/src/unzip.cpp
index 0a06a080c..ff3891d9f 100644
--- a/Zip/samples/unzip/src/unzip.cpp
+++ b/Zip/samples/unzip/src/unzip.cpp
@@ -71,26 +71,26 @@ public:
 	{
 	}
 
-protected:	
+protected:
 	void initialize(Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Application::initialize(self);
 		// add your own initialization code here
 	}
-	
+
 	void uninitialize()
 	{
 		// add your own uninitialization code here
 		Application::uninitialize();
 	}
-	
+
 	void reinitialize(Application& self)
 	{
 		Application::reinitialize(self);
 		// add your own reinitialization code here
 	}
-	
+
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -108,7 +108,7 @@ protected:
 				.argument("filename")
 				.callback(OptionCallback<UnzipApp>(this, &UnzipApp::handleFile)));
 	}
-	
+
 	void handleHelp(const std::string& name, const std::string& value)
 	{
 		_helpRequested = true;
@@ -120,7 +120,7 @@ protected:
 	{
 		_zipFile = value;
 	}
-	
+
 	void displayHelp()
 	{
 		HelpFormatter helpFormatter(options());
@@ -129,7 +129,7 @@ protected:
 		helpFormatter.setHeader("A application that demonstrates usage of Poco::Zip::Decompress class.");
 		helpFormatter.format(std::cout);
 	}
-	
+
 
 	int main(const std::vector<std::string>& args)
 	{
@@ -150,7 +150,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 	std::string _zipFile;
diff --git a/Zip/samples/unzip/unzip.progen b/Zip/samples/unzip/unzip.progen
index 29fe12bf6..2df44952a 100644
--- a/Zip/samples/unzip/unzip.progen
+++ b/Zip/samples/unzip/unzip.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Zip\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Zip/samples/zip/src/zip.cpp b/Zip/samples/zip/src/zip.cpp
index 26e052106..03f93c26c 100644
--- a/Zip/samples/zip/src/zip.cpp
+++ b/Zip/samples/zip/src/zip.cpp
@@ -45,26 +45,26 @@ public:
 	{
 	}
 
-protected:	
+protected:
 	void initialize(Application& self)
 	{
 		loadConfiguration(); // load default configuration files, if present
 		Application::initialize(self);
 		// add your own initialization code here
 	}
-	
+
 	void uninitialize()
 	{
 		// add your own uninitialization code here
 		Application::uninitialize();
 	}
-	
+
 	void reinitialize(Application& self)
 	{
 		Application::reinitialize(self);
 		// add your own reinitialization code here
 	}
-	
+
 	void defineOptions(OptionSet& options)
 	{
 		Application::defineOptions(options);
@@ -82,7 +82,7 @@ protected:
 				.argument("filename")
 				.callback(OptionCallback<ZipApp>(this, &ZipApp::handleFile)));
 	}
-	
+
 	void handleHelp(const std::string& name, const std::string& value)
 	{
 		_helpRequested = true;
@@ -94,7 +94,7 @@ protected:
 	{
 		_outFile = value;
 	}
-	
+
 	void displayHelp()
 	{
 		HelpFormatter helpFormatter(options());
@@ -103,7 +103,7 @@ protected:
 		helpFormatter.setHeader("A application that demonstrates usage of Poco::Zip::Compress class.");
 		helpFormatter.format(std::cout);
 	}
-	
+
 	void onDone(const void*, const Poco::Zip::ZipLocalFileHeader& hdr)
 	{
 		logger().information("DONE: " + hdr.getFileName());
@@ -151,7 +151,7 @@ protected:
 		}
 		return Application::EXIT_OK;
 	}
-	
+
 private:
 	bool _helpRequested;
 	std::string _outFile;
diff --git a/Zip/samples/zip/zip.progen b/Zip/samples/zip/zip.progen
index 29fe12bf6..2df44952a 100644
--- a/Zip/samples/zip/zip.progen
+++ b/Zip/samples/zip/zip.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Zip\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
diff --git a/Zip/src/AutoDetectStream.cpp b/Zip/src/AutoDetectStream.cpp
index a14d10505..e60060d36 100644
--- a/Zip/src/AutoDetectStream.cpp
+++ b/Zip/src/AutoDetectStream.cpp
@@ -127,14 +127,14 @@ int AutoDetectStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 
 							_eofDetected = true;
 							_length += offset;
-						
+
 							if (offset == 0 && !_postfix.empty())
 							{
 								offset = (_postfix.size() > length) ? length : static_cast<std::streamsize>(_postfix.size());
 								std::memcpy(buffer, _postfix.data(), offset);
 								_postfix.erase(0, offset);
 							}
-						
+
 							return static_cast<int>(offset);
 						}
 					}
@@ -151,14 +151,14 @@ int AutoDetectStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 
 							_eofDetected = true;
 							_length += offset;
-						
+
 							if (offset == 0 && !_postfix.empty())
 							{
 								offset = (_postfix.size() > length) ? length : static_cast<std::streamsize>(_postfix.size());
 								std::memcpy(buffer, _postfix.data(), offset);
 								_postfix.erase(0, offset);
 							}
-						
+
 							return static_cast<int>(offset);
 						}
 					}
diff --git a/Zip/src/Compress.cpp b/Zip/src/Compress.cpp
index 7558bd9ca..21dcd3e55 100644
--- a/Zip/src/Compress.cpp
+++ b/Zip/src/Compress.cpp
@@ -83,6 +83,12 @@ void Compress::addEntry(std::istream& in, const Poco::DateTime& lastModifiedAt,
 
 	std::streamoff localHeaderOffset = _offset;
 	ZipLocalFileHeader hdr(fileName, lastModifiedAt, cm, cl, _forceZip64);
+	std::streampos pos = in.tellg();
+	in.seekg(0, in.end);
+	std::streampos length = in.tellg();
+	in.seekg(pos);
+	if (length >= ZipCommon::ZIP64_MAGIC)
+		hdr.setZip64Data();
 	hdr.setStartPos(localHeaderOffset);
 
 	ZipOutputStream zipOut(_out, hdr, _seekableOut);
@@ -321,11 +327,11 @@ ZipArchive Compress::close()
 	ZipArchive::FileInfos::const_iterator it = _infos.begin();
 	ZipArchive::FileInfos::const_iterator itEnd = _infos.end();
 	bool needZip64 = _forceZip64;
-	needZip64 = needZip64  || _files.size() >= ZipCommon::ZIP64_MAGIC_SHORT || centralDirStart64 >= ZipCommon::ZIP64_MAGIC;
+	needZip64 = needZip64 || _files.size() >= ZipCommon::ZIP64_MAGIC_SHORT || centralDirStart64 >= ZipCommon::ZIP64_MAGIC;
 	for (; it != itEnd; ++it)
 	{
 		const ZipFileInfo& nfo = it->second;
-		needZip64 = needZip64  || nfo.needsZip64();
+		needZip64 = needZip64 || nfo.needsZip64();
 
 		std::string info(nfo.createHeader());
 		_out.write(info.c_str(), static_cast<std::streamsize>(info.size()));
@@ -334,9 +340,9 @@ ZipArchive Compress::close()
 		_offset += entrySize;
 	}
 	if (!_out) throw Poco::IOException("Bad output stream");
-	
+
 	Poco::UInt64 numEntries64 = _infos.size();
-	needZip64 = needZip64  || _offset >= ZipCommon::ZIP64_MAGIC;
+	needZip64 = needZip64 || _offset >= ZipCommon::ZIP64_MAGIC;
 	if (needZip64)
 	{
 		ZipArchiveInfo64 central;
diff --git a/Zip/src/ZipArchiveInfo.cpp b/Zip/src/ZipArchiveInfo.cpp
index 9523ca2fd..e5e52b627 100644
--- a/Zip/src/ZipArchiveInfo.cpp
+++ b/Zip/src/ZipArchiveInfo.cpp
@@ -66,7 +66,7 @@ void ZipArchiveInfo::parse(std::istream& inp, bool assumeHeaderRead)
 	{
 		std::memcpy(_rawInfo, HEADER, ZipCommon::HEADER_SIZE);
 	}
-		
+
 	// read the rest of the header
 	inp.read(_rawInfo + ZipCommon::HEADER_SIZE, FULLHEADER_SIZE - ZipCommon::HEADER_SIZE);
 	Poco::UInt16 len = getZipCommentSize();
diff --git a/Zip/src/ZipLocalFileHeader.cpp b/Zip/src/ZipLocalFileHeader.cpp
index 3f7c3d0d0..3401f8bd6 100644
--- a/Zip/src/ZipLocalFileHeader.cpp
+++ b/Zip/src/ZipLocalFileHeader.cpp
@@ -243,7 +243,8 @@ void ZipLocalFileHeader::init(const Poco::Path& fName, ZipCommon::CompressionMet
     }
     else
         setCompressionMethod(ZipCommon::CM_STORE);
-    if (_forceZip64)
+
+    if (needsZip64())
         setZip64Data();
 
     _rawHeader[GENERAL_PURPOSE_POS+1] |= 0x08; // Set "language encoding flag" to indicate that filenames and paths are in UTF-8.
diff --git a/Zip/src/ZipManipulator.cpp b/Zip/src/ZipManipulator.cpp
index 015e0d450..5e3377984 100644
--- a/Zip/src/ZipManipulator.cpp
+++ b/Zip/src/ZipManipulator.cpp
@@ -64,7 +64,7 @@ void ZipManipulator::renameFile(const std::string& zipPath, const std::string& n
 {
 	const ZipLocalFileHeader& entry = getForChange(zipPath);
 	// checked later in Compress too but the earlier one gets the error the better
-	std::string fn = ZipUtil::validZipEntryFileName(newZipPath); 
+	std::string fn = ZipUtil::validZipEntryFileName(newZipPath);
 	addOperation(zipPath, new Rename(entry, fn));
 }
 
@@ -139,7 +139,7 @@ ZipArchive ZipManipulator::compress(const std::string& outFile)
 	Poco::FileOutputStream out(outFile);
 	Compress c(out, true);
 	c.EDone += Poco::Delegate<ZipManipulator, const ZipLocalFileHeader>(this, &ZipManipulator::onEDone);
-	
+
 	ZipArchive::FileHeaders::const_iterator it = _in->headerBegin();
 	for (; it != _in->headerEnd(); ++it)
 	{
diff --git a/Zip/src/ZipUtil.cpp b/Zip/src/ZipUtil.cpp
index abe09aa72..0b9c2239b 100644
--- a/Zip/src/ZipUtil.cpp
+++ b/Zip/src/ZipUtil.cpp
@@ -38,7 +38,7 @@ Poco::DateTime ZipUtil::parseDateTime(const char* pVal, const Poco::UInt32 timeP
 	int day  = (date & 0x001fu);             // 0000 0000 0001 1111
 	int mon  = ((date & 0x01e0u) >> 5);      // 0000 0001 1110 0000
 	int year = 1980+((date & 0xfe00u) >> 9); // 1111 1110 0000 0000
-	
+
 	if (Poco::DateTime::isValid(year, mon, day, hour, min, sec))
 		return Poco::DateTime(year, mon, day, hour, min, sec);
 	else
@@ -94,7 +94,7 @@ void ZipUtil::sync(std::istream& in)
 {
 	enum
 	{
-		PREFIX = 2, 
+		PREFIX = 2,
 		BUFFER_SIZE = 1024
 	};
 	char temp[BUFFER_SIZE];
@@ -102,7 +102,7 @@ void ZipUtil::sync(std::istream& in)
 	std::size_t tempPos = PREFIX;
 
 	while (in.good() && !in.eof())
-	{ 
+	{
 		// all zip headers start withe same 2byte prefix
 		if (std::memcmp(ZipLocalFileHeader::HEADER, &temp[tempPos - PREFIX], PREFIX) == 0)
 		{
@@ -110,8 +110,8 @@ void ZipUtil::sync(std::istream& in)
 			// read the next 2 bytes
 			in.read(temp+tempPos, PREFIX);
 			tempPos += PREFIX;
-			if (std::memcmp(ZipLocalFileHeader::HEADER+PREFIX, &temp[tempPos - PREFIX], PREFIX) == 0 || 
-				std::memcmp(ZipArchiveInfo::HEADER+PREFIX, &temp[tempPos - PREFIX], PREFIX) == 0 || 
+			if (std::memcmp(ZipLocalFileHeader::HEADER+PREFIX, &temp[tempPos - PREFIX], PREFIX) == 0 ||
+				std::memcmp(ZipArchiveInfo::HEADER+PREFIX, &temp[tempPos - PREFIX], PREFIX) == 0 ||
 				std::memcmp(ZipFileInfo::HEADER+PREFIX, &temp[tempPos - PREFIX], PREFIX) == 0 ||
 				std::memcmp(ZipDataInfo::HEADER+PREFIX, &temp[tempPos - PREFIX], PREFIX) == 0)
 			{
diff --git a/Zip/testsuite/TestSuite.progen b/Zip/testsuite/TestSuite.progen
index 08bd4787b..132ab0546 100644
--- a/Zip/testsuite/TestSuite.progen
+++ b/Zip/testsuite/TestSuite.progen
@@ -7,5 +7,6 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = iphlpapi.lib
 
diff --git a/Zip/testsuite/TestSuite_vs170.vcxproj b/Zip/testsuite/TestSuite_vs170.vcxproj
index 58b0503e6..fcd864250 100644
--- a/Zip/testsuite/TestSuite_vs170.vcxproj
+++ b/Zip/testsuite/TestSuite_vs170.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|ARM64">
+      <Configuration>debug_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_shared|Win32">
       <Configuration>debug_shared</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>debug_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|ARM64">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_md|Win32">
       <Configuration>debug_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>debug_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|ARM64">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="debug_static_mt|Win32">
       <Configuration>debug_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>debug_static_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|ARM64">
+      <Configuration>release_shared</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_shared|Win32">
       <Configuration>release_shared</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>release_shared</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|ARM64">
+      <Configuration>release_static_md</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_md|Win32">
       <Configuration>release_static_md</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>release_static_md</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|ARM64">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="release_static_mt|Win32">
       <Configuration>release_static_mt</Configuration>
       <Platform>Win32</Platform>
@@ -51,6 +75,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectName>TestSuite</ProjectName>
     <ProjectGuid>{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
@@ -87,6 +112,36 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -137,6 +192,24 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
@@ -157,7 +230,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -171,6 +250,36 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <OutDir>binA64\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <OutDir>binA64\static_mt\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <OutDir>binA64\static_md\</OutDir>
+    <IntDir>objA64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>bin\</OutDir>
     <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
@@ -231,6 +340,189 @@
     <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
diff --git a/Zip/testsuite/src/PartialStreamTest.cpp b/Zip/testsuite/src/PartialStreamTest.cpp
index 79ef176d6..cb2c0b08c 100644
--- a/Zip/testsuite/src/PartialStreamTest.cpp
+++ b/Zip/testsuite/src/PartialStreamTest.cpp
@@ -102,19 +102,19 @@ void PartialStreamTest::testAutoDetect()
 {
 	std::string header = ZipUtil::fakeZLibInitString(ZipCommon::CL_NORMAL);
 	std::string crc("\01\02\03\04");
-	const char data[] = 
+	const char data[] =
 	{
-		'\x01', '\x02', '\x03', '\x04', 
+		'\x01', '\x02', '\x03', '\x04',
 		'\x05', '\x06', '\x07', '\x08', // fake data
 		'\x50', '\x4b', '\x07', '\x08', // data signature in compressed data
 		'\x01', '\x02', '\x03', '\x04',
-		'\x50', 
-		'\x50', '\x4b', '\x07', '\x08', // real data signature 
+		'\x50',
+		'\x50', '\x4b', '\x07', '\x08', // real data signature
 		'\x00', '\x00', '\x00', '\x00', // CRC (ignored)
 		'\x11', '\x00', '\x00', '\x00', // compressed size
 		'\x00', '\x00', '\x00', '\x00'  // uncompressed size (ignored)
 	};
-	
+
 	Poco::MemoryInputStream istr(data, sizeof(data));
 	AutoDetectInputStream adi(istr, header, crc, false, 0);
 	std::string result;
diff --git a/Zip/testsuite/src/WinCEDriver.cpp b/Zip/testsuite/src/WinCEDriver.cpp
index d35d1af5b..79d306206 100644
--- a/Zip/testsuite/src/WinCEDriver.cpp
+++ b/Zip/testsuite/src/WinCEDriver.cpp
@@ -24,7 +24,7 @@ int wmain(int argc, wchar_t* argv[])
 		std::wcstombs(buffer, argv[i], sizeof(buffer));
 		args.push_back(std::string(buffer));
 	}
-	CppUnit::TestRunner runner;	
+	CppUnit::TestRunner runner;
 	runner.addTest("ZipTestSuite", ZipTestSuite::suite());
 	return runner.run(args) ? 0 : 1;
 }
diff --git a/Zip/testsuite/src/ZipTest.h b/Zip/testsuite/src/ZipTest.h
index d749b933f..cd77baaae 100644
--- a/Zip/testsuite/src/ZipTest.h
+++ b/Zip/testsuite/src/ZipTest.h
@@ -51,7 +51,7 @@ public:
 
 private:
 	void onDecompressError(const void* pSender, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>& info);
-	
+
 	int _errCnt;
 };
 
diff --git a/Zip/testsuite/testfile.txt b/Zip/testsuite/testfile.txt
index ef1683290..e17f2f0a5 100644
--- a/Zip/testsuite/testfile.txt
+++ b/Zip/testsuite/testfile.txt
@@ -1,49 +1,49 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vitae arcu 
-ac arcu semper mollis. Donec lobortis mi at dui. Integer placerat, 
-sapien at suscipit faucibus, mi quam sodales sapien, non accumsan enim 
-justo sit amet sem. Proin fermentum dui vitae metus. Donec a velit et 
-lectus fermentum bibendum. Donec risus magna, fermentum tempor, tempor 
-cursus, elementum ac, turpis. Suspendisse ultricies tincidunt quam. Nam 
-quis risus. Suspendisse in lacus. Vivamus et est ac nisi sollicitudin 
-ullamcorper. Sed vitae ligula non sem suscipit tempus. Donec tincidunt, 
-justo nec tristique euismod, sapien velit consequat ante, in vestibulum 
-dolor justo nec orci. Sed placerat eros. Suspendisse potenti. Vestibulum 
-eu sem at ante aliquet varius. In quis diam nec libero pretium 
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vitae arcu
+ac arcu semper mollis. Donec lobortis mi at dui. Integer placerat,
+sapien at suscipit faucibus, mi quam sodales sapien, non accumsan enim
+justo sit amet sem. Proin fermentum dui vitae metus. Donec a velit et
+lectus fermentum bibendum. Donec risus magna, fermentum tempor, tempor
+cursus, elementum ac, turpis. Suspendisse ultricies tincidunt quam. Nam
+quis risus. Suspendisse in lacus. Vivamus et est ac nisi sollicitudin
+ullamcorper. Sed vitae ligula non sem suscipit tempus. Donec tincidunt,
+justo nec tristique euismod, sapien velit consequat ante, in vestibulum
+dolor justo nec orci. Sed placerat eros. Suspendisse potenti. Vestibulum
+eu sem at ante aliquet varius. In quis diam nec libero pretium
 vestibulum. Morbi ipsum. Vivamus eros.
 
-Nam pellentesque ante. Donec sit amet nisl. Vestibulum blandit risus sit 
-amet quam facilisis mollis. Lorem ipsum dolor sit amet, consectetur 
-adipiscing elit. Nulla mattis orci a diam. Duis ultricies massa rhoncus 
-neque. Morbi hendrerit arcu vel mi. Suspendisse lorem. Pellentesque non 
+Nam pellentesque ante. Donec sit amet nisl. Vestibulum blandit risus sit
+amet quam facilisis mollis. Lorem ipsum dolor sit amet, consectetur
+adipiscing elit. Nulla mattis orci a diam. Duis ultricies massa rhoncus
+neque. Morbi hendrerit arcu vel mi. Suspendisse lorem. Pellentesque non
 nunc molestie metus pretium tristique. Maecenas ante. Nunc sagittis.
 
-Proin ornare. Donec mi tellus, venenatis nec, ultrices ac, hendrerit in, 
-quam. Mauris nunc. Vivamus cursus rhoncus felis. Nunc at justo. In hac 
-habitasse platea dictumst. Nulla metus sapien, cursus nec, luctus eget, 
-malesuada sed, odio. Sed augue orci, sollicitudin id, auctor eu, 
-porttitor id, eros. Proin arcu dolor, iaculis quis, ullamcorper sit 
-amet, ullamcorper nec, ante. Sed dictum luctus est. Phasellus nibh. 
-Morbi fringilla magna et mi. In eleifend sem non dui luctus suscipit. 
+Proin ornare. Donec mi tellus, venenatis nec, ultrices ac, hendrerit in,
+quam. Mauris nunc. Vivamus cursus rhoncus felis. Nunc at justo. In hac
+habitasse platea dictumst. Nulla metus sapien, cursus nec, luctus eget,
+malesuada sed, odio. Sed augue orci, sollicitudin id, auctor eu,
+porttitor id, eros. Proin arcu dolor, iaculis quis, ullamcorper sit
+amet, ullamcorper nec, ante. Sed dictum luctus est. Phasellus nibh.
+Morbi fringilla magna et mi. In eleifend sem non dui luctus suscipit.
 Duis dapibus. Proin molestie. Cras vel dui.
 
-In et orci vel erat euismod sodales. Integer porta. Vivamus congue 
-turpis eu eros tincidunt fermentum. Curabitur consequat ultrices mi. 
-Praesent sit amet ante. Proin ante. Phasellus vitae nibh. Aliquam ipsum 
-massa, pretium quis, mattis sed, sagittis sit amet, justo. Integer quam. 
-Aenean leo erat, commodo quis, elementum sit amet, placerat sed, lacus. 
-Nam a nunc in sapien scelerisque sodales. Phasellus luctus arcu at 
-nulla. Pellentesque habitant morbi tristique senectus et netus et 
+In et orci vel erat euismod sodales. Integer porta. Vivamus congue
+turpis eu eros tincidunt fermentum. Curabitur consequat ultrices mi.
+Praesent sit amet ante. Proin ante. Phasellus vitae nibh. Aliquam ipsum
+massa, pretium quis, mattis sed, sagittis sit amet, justo. Integer quam.
+Aenean leo erat, commodo quis, elementum sit amet, placerat sed, lacus.
+Nam a nunc in sapien scelerisque sodales. Phasellus luctus arcu at
+nulla. Pellentesque habitant morbi tristique senectus et netus et
 malesuada fames ac turpis egestas. Donec facilisis.
 
-Nam scelerisque lacus a eros. Praesent ac arcu et nisl eleifend commodo. 
-Aenean vestibulum, augue vel posuere mattis, sem massa varius mauris, 
-non porttitor diam felis eu libero. Suspendisse vulputate, urna quis 
-dictum scelerisque, risus est pharetra orci, a iaculis dui sem quis 
-quam. Nam imperdiet quam eget velit. Mauris dui lacus, posuere in, 
-cursus eget, ultrices ut, eros. Etiam eget purus. Curabitur accumsan 
-lacinia urna. Donec aliquet dictum erat. Nulla ac magna. Quisque 
-ultrices vehicula lacus. Fusce eu quam quis est mollis adipiscing. 
-Pellentesque non libero at eros vulputate iaculis. Praesent vitae orci 
-ac sapien laoreet scelerisque. Ut ut libero. Vivamus massa urna, 
-convallis at, laoreet a, adipiscing et, eros. Suspendisse feugiat 
-malesuada felis. Suspendisse a odio eget tortor tempus pretium. 
+Nam scelerisque lacus a eros. Praesent ac arcu et nisl eleifend commodo.
+Aenean vestibulum, augue vel posuere mattis, sem massa varius mauris,
+non porttitor diam felis eu libero. Suspendisse vulputate, urna quis
+dictum scelerisque, risus est pharetra orci, a iaculis dui sem quis
+quam. Nam imperdiet quam eget velit. Mauris dui lacus, posuere in,
+cursus eget, ultrices ut, eros. Etiam eget purus. Curabitur accumsan
+lacinia urna. Donec aliquet dictum erat. Nulla ac magna. Quisque
+ultrices vehicula lacus. Fusce eu quam quis est mollis adipiscing.
+Pellentesque non libero at eros vulputate iaculis. Praesent vitae orci
+ac sapien laoreet scelerisque. Ut ut libero. Vivamus massa urna,
+convallis at, laoreet a, adipiscing et, eros. Suspendisse feugiat
+malesuada felis. Suspendisse a odio eget tortor tempus pretium.
diff --git a/Zip/testsuite/testfile2.txt b/Zip/testsuite/testfile2.txt
index ef1683290..e17f2f0a5 100644
--- a/Zip/testsuite/testfile2.txt
+++ b/Zip/testsuite/testfile2.txt
@@ -1,49 +1,49 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vitae arcu 
-ac arcu semper mollis. Donec lobortis mi at dui. Integer placerat, 
-sapien at suscipit faucibus, mi quam sodales sapien, non accumsan enim 
-justo sit amet sem. Proin fermentum dui vitae metus. Donec a velit et 
-lectus fermentum bibendum. Donec risus magna, fermentum tempor, tempor 
-cursus, elementum ac, turpis. Suspendisse ultricies tincidunt quam. Nam 
-quis risus. Suspendisse in lacus. Vivamus et est ac nisi sollicitudin 
-ullamcorper. Sed vitae ligula non sem suscipit tempus. Donec tincidunt, 
-justo nec tristique euismod, sapien velit consequat ante, in vestibulum 
-dolor justo nec orci. Sed placerat eros. Suspendisse potenti. Vestibulum 
-eu sem at ante aliquet varius. In quis diam nec libero pretium 
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vitae arcu
+ac arcu semper mollis. Donec lobortis mi at dui. Integer placerat,
+sapien at suscipit faucibus, mi quam sodales sapien, non accumsan enim
+justo sit amet sem. Proin fermentum dui vitae metus. Donec a velit et
+lectus fermentum bibendum. Donec risus magna, fermentum tempor, tempor
+cursus, elementum ac, turpis. Suspendisse ultricies tincidunt quam. Nam
+quis risus. Suspendisse in lacus. Vivamus et est ac nisi sollicitudin
+ullamcorper. Sed vitae ligula non sem suscipit tempus. Donec tincidunt,
+justo nec tristique euismod, sapien velit consequat ante, in vestibulum
+dolor justo nec orci. Sed placerat eros. Suspendisse potenti. Vestibulum
+eu sem at ante aliquet varius. In quis diam nec libero pretium
 vestibulum. Morbi ipsum. Vivamus eros.
 
-Nam pellentesque ante. Donec sit amet nisl. Vestibulum blandit risus sit 
-amet quam facilisis mollis. Lorem ipsum dolor sit amet, consectetur 
-adipiscing elit. Nulla mattis orci a diam. Duis ultricies massa rhoncus 
-neque. Morbi hendrerit arcu vel mi. Suspendisse lorem. Pellentesque non 
+Nam pellentesque ante. Donec sit amet nisl. Vestibulum blandit risus sit
+amet quam facilisis mollis. Lorem ipsum dolor sit amet, consectetur
+adipiscing elit. Nulla mattis orci a diam. Duis ultricies massa rhoncus
+neque. Morbi hendrerit arcu vel mi. Suspendisse lorem. Pellentesque non
 nunc molestie metus pretium tristique. Maecenas ante. Nunc sagittis.
 
-Proin ornare. Donec mi tellus, venenatis nec, ultrices ac, hendrerit in, 
-quam. Mauris nunc. Vivamus cursus rhoncus felis. Nunc at justo. In hac 
-habitasse platea dictumst. Nulla metus sapien, cursus nec, luctus eget, 
-malesuada sed, odio. Sed augue orci, sollicitudin id, auctor eu, 
-porttitor id, eros. Proin arcu dolor, iaculis quis, ullamcorper sit 
-amet, ullamcorper nec, ante. Sed dictum luctus est. Phasellus nibh. 
-Morbi fringilla magna et mi. In eleifend sem non dui luctus suscipit. 
+Proin ornare. Donec mi tellus, venenatis nec, ultrices ac, hendrerit in,
+quam. Mauris nunc. Vivamus cursus rhoncus felis. Nunc at justo. In hac
+habitasse platea dictumst. Nulla metus sapien, cursus nec, luctus eget,
+malesuada sed, odio. Sed augue orci, sollicitudin id, auctor eu,
+porttitor id, eros. Proin arcu dolor, iaculis quis, ullamcorper sit
+amet, ullamcorper nec, ante. Sed dictum luctus est. Phasellus nibh.
+Morbi fringilla magna et mi. In eleifend sem non dui luctus suscipit.
 Duis dapibus. Proin molestie. Cras vel dui.
 
-In et orci vel erat euismod sodales. Integer porta. Vivamus congue 
-turpis eu eros tincidunt fermentum. Curabitur consequat ultrices mi. 
-Praesent sit amet ante. Proin ante. Phasellus vitae nibh. Aliquam ipsum 
-massa, pretium quis, mattis sed, sagittis sit amet, justo. Integer quam. 
-Aenean leo erat, commodo quis, elementum sit amet, placerat sed, lacus. 
-Nam a nunc in sapien scelerisque sodales. Phasellus luctus arcu at 
-nulla. Pellentesque habitant morbi tristique senectus et netus et 
+In et orci vel erat euismod sodales. Integer porta. Vivamus congue
+turpis eu eros tincidunt fermentum. Curabitur consequat ultrices mi.
+Praesent sit amet ante. Proin ante. Phasellus vitae nibh. Aliquam ipsum
+massa, pretium quis, mattis sed, sagittis sit amet, justo. Integer quam.
+Aenean leo erat, commodo quis, elementum sit amet, placerat sed, lacus.
+Nam a nunc in sapien scelerisque sodales. Phasellus luctus arcu at
+nulla. Pellentesque habitant morbi tristique senectus et netus et
 malesuada fames ac turpis egestas. Donec facilisis.
 
-Nam scelerisque lacus a eros. Praesent ac arcu et nisl eleifend commodo. 
-Aenean vestibulum, augue vel posuere mattis, sem massa varius mauris, 
-non porttitor diam felis eu libero. Suspendisse vulputate, urna quis 
-dictum scelerisque, risus est pharetra orci, a iaculis dui sem quis 
-quam. Nam imperdiet quam eget velit. Mauris dui lacus, posuere in, 
-cursus eget, ultrices ut, eros. Etiam eget purus. Curabitur accumsan 
-lacinia urna. Donec aliquet dictum erat. Nulla ac magna. Quisque 
-ultrices vehicula lacus. Fusce eu quam quis est mollis adipiscing. 
-Pellentesque non libero at eros vulputate iaculis. Praesent vitae orci 
-ac sapien laoreet scelerisque. Ut ut libero. Vivamus massa urna, 
-convallis at, laoreet a, adipiscing et, eros. Suspendisse feugiat 
-malesuada felis. Suspendisse a odio eget tortor tempus pretium. 
+Nam scelerisque lacus a eros. Praesent ac arcu et nisl eleifend commodo.
+Aenean vestibulum, augue vel posuere mattis, sem massa varius mauris,
+non porttitor diam felis eu libero. Suspendisse vulputate, urna quis
+dictum scelerisque, risus est pharetra orci, a iaculis dui sem quis
+quam. Nam imperdiet quam eget velit. Mauris dui lacus, posuere in,
+cursus eget, ultrices ut, eros. Etiam eget purus. Curabitur accumsan
+lacinia urna. Donec aliquet dictum erat. Nulla ac magna. Quisque
+ultrices vehicula lacus. Fusce eu quam quis est mollis adipiscing.
+Pellentesque non libero at eros vulputate iaculis. Praesent vitae orci
+ac sapien laoreet scelerisque. Ut ut libero. Vivamus massa urna,
+convallis at, laoreet a, adipiscing et, eros. Suspendisse feugiat
+malesuada felis. Suspendisse a odio eget tortor tempus pretium.
diff --git a/Zip/testsuite/testfile3.txt b/Zip/testsuite/testfile3.txt
index ef1683290..e17f2f0a5 100644
--- a/Zip/testsuite/testfile3.txt
+++ b/Zip/testsuite/testfile3.txt
@@ -1,49 +1,49 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vitae arcu 
-ac arcu semper mollis. Donec lobortis mi at dui. Integer placerat, 
-sapien at suscipit faucibus, mi quam sodales sapien, non accumsan enim 
-justo sit amet sem. Proin fermentum dui vitae metus. Donec a velit et 
-lectus fermentum bibendum. Donec risus magna, fermentum tempor, tempor 
-cursus, elementum ac, turpis. Suspendisse ultricies tincidunt quam. Nam 
-quis risus. Suspendisse in lacus. Vivamus et est ac nisi sollicitudin 
-ullamcorper. Sed vitae ligula non sem suscipit tempus. Donec tincidunt, 
-justo nec tristique euismod, sapien velit consequat ante, in vestibulum 
-dolor justo nec orci. Sed placerat eros. Suspendisse potenti. Vestibulum 
-eu sem at ante aliquet varius. In quis diam nec libero pretium 
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vitae arcu
+ac arcu semper mollis. Donec lobortis mi at dui. Integer placerat,
+sapien at suscipit faucibus, mi quam sodales sapien, non accumsan enim
+justo sit amet sem. Proin fermentum dui vitae metus. Donec a velit et
+lectus fermentum bibendum. Donec risus magna, fermentum tempor, tempor
+cursus, elementum ac, turpis. Suspendisse ultricies tincidunt quam. Nam
+quis risus. Suspendisse in lacus. Vivamus et est ac nisi sollicitudin
+ullamcorper. Sed vitae ligula non sem suscipit tempus. Donec tincidunt,
+justo nec tristique euismod, sapien velit consequat ante, in vestibulum
+dolor justo nec orci. Sed placerat eros. Suspendisse potenti. Vestibulum
+eu sem at ante aliquet varius. In quis diam nec libero pretium
 vestibulum. Morbi ipsum. Vivamus eros.
 
-Nam pellentesque ante. Donec sit amet nisl. Vestibulum blandit risus sit 
-amet quam facilisis mollis. Lorem ipsum dolor sit amet, consectetur 
-adipiscing elit. Nulla mattis orci a diam. Duis ultricies massa rhoncus 
-neque. Morbi hendrerit arcu vel mi. Suspendisse lorem. Pellentesque non 
+Nam pellentesque ante. Donec sit amet nisl. Vestibulum blandit risus sit
+amet quam facilisis mollis. Lorem ipsum dolor sit amet, consectetur
+adipiscing elit. Nulla mattis orci a diam. Duis ultricies massa rhoncus
+neque. Morbi hendrerit arcu vel mi. Suspendisse lorem. Pellentesque non
 nunc molestie metus pretium tristique. Maecenas ante. Nunc sagittis.
 
-Proin ornare. Donec mi tellus, venenatis nec, ultrices ac, hendrerit in, 
-quam. Mauris nunc. Vivamus cursus rhoncus felis. Nunc at justo. In hac 
-habitasse platea dictumst. Nulla metus sapien, cursus nec, luctus eget, 
-malesuada sed, odio. Sed augue orci, sollicitudin id, auctor eu, 
-porttitor id, eros. Proin arcu dolor, iaculis quis, ullamcorper sit 
-amet, ullamcorper nec, ante. Sed dictum luctus est. Phasellus nibh. 
-Morbi fringilla magna et mi. In eleifend sem non dui luctus suscipit. 
+Proin ornare. Donec mi tellus, venenatis nec, ultrices ac, hendrerit in,
+quam. Mauris nunc. Vivamus cursus rhoncus felis. Nunc at justo. In hac
+habitasse platea dictumst. Nulla metus sapien, cursus nec, luctus eget,
+malesuada sed, odio. Sed augue orci, sollicitudin id, auctor eu,
+porttitor id, eros. Proin arcu dolor, iaculis quis, ullamcorper sit
+amet, ullamcorper nec, ante. Sed dictum luctus est. Phasellus nibh.
+Morbi fringilla magna et mi. In eleifend sem non dui luctus suscipit.
 Duis dapibus. Proin molestie. Cras vel dui.
 
-In et orci vel erat euismod sodales. Integer porta. Vivamus congue 
-turpis eu eros tincidunt fermentum. Curabitur consequat ultrices mi. 
-Praesent sit amet ante. Proin ante. Phasellus vitae nibh. Aliquam ipsum 
-massa, pretium quis, mattis sed, sagittis sit amet, justo. Integer quam. 
-Aenean leo erat, commodo quis, elementum sit amet, placerat sed, lacus. 
-Nam a nunc in sapien scelerisque sodales. Phasellus luctus arcu at 
-nulla. Pellentesque habitant morbi tristique senectus et netus et 
+In et orci vel erat euismod sodales. Integer porta. Vivamus congue
+turpis eu eros tincidunt fermentum. Curabitur consequat ultrices mi.
+Praesent sit amet ante. Proin ante. Phasellus vitae nibh. Aliquam ipsum
+massa, pretium quis, mattis sed, sagittis sit amet, justo. Integer quam.
+Aenean leo erat, commodo quis, elementum sit amet, placerat sed, lacus.
+Nam a nunc in sapien scelerisque sodales. Phasellus luctus arcu at
+nulla. Pellentesque habitant morbi tristique senectus et netus et
 malesuada fames ac turpis egestas. Donec facilisis.
 
-Nam scelerisque lacus a eros. Praesent ac arcu et nisl eleifend commodo. 
-Aenean vestibulum, augue vel posuere mattis, sem massa varius mauris, 
-non porttitor diam felis eu libero. Suspendisse vulputate, urna quis 
-dictum scelerisque, risus est pharetra orci, a iaculis dui sem quis 
-quam. Nam imperdiet quam eget velit. Mauris dui lacus, posuere in, 
-cursus eget, ultrices ut, eros. Etiam eget purus. Curabitur accumsan 
-lacinia urna. Donec aliquet dictum erat. Nulla ac magna. Quisque 
-ultrices vehicula lacus. Fusce eu quam quis est mollis adipiscing. 
-Pellentesque non libero at eros vulputate iaculis. Praesent vitae orci 
-ac sapien laoreet scelerisque. Ut ut libero. Vivamus massa urna, 
-convallis at, laoreet a, adipiscing et, eros. Suspendisse feugiat 
-malesuada felis. Suspendisse a odio eget tortor tempus pretium. 
+Nam scelerisque lacus a eros. Praesent ac arcu et nisl eleifend commodo.
+Aenean vestibulum, augue vel posuere mattis, sem massa varius mauris,
+non porttitor diam felis eu libero. Suspendisse vulputate, urna quis
+dictum scelerisque, risus est pharetra orci, a iaculis dui sem quis
+quam. Nam imperdiet quam eget velit. Mauris dui lacus, posuere in,
+cursus eget, ultrices ut, eros. Etiam eget purus. Curabitur accumsan
+lacinia urna. Donec aliquet dictum erat. Nulla ac magna. Quisque
+ultrices vehicula lacus. Fusce eu quam quis est mollis adipiscing.
+Pellentesque non libero at eros vulputate iaculis. Praesent vitae orci
+ac sapien laoreet scelerisque. Ut ut libero. Vivamus massa urna,
+convallis at, laoreet a, adipiscing et, eros. Suspendisse feugiat
+malesuada felis. Suspendisse a odio eget tortor tempus pretium.
diff --git a/build/config/AIX b/build/config/AIX
index 6c040fcff..f757030a8 100644
--- a/build/config/AIX
+++ b/build/config/AIX
@@ -50,10 +50,10 @@ LINKFLAGS32     = -q32
 LINKFLAGS64     = -q64
 STATICOPT_CC    =
 STATICOPT_CXX   =
-STATICOPT_LINK  = 
+STATICOPT_LINK  =
 SHAREDOPT_CC    = -qpic
 SHAREDOPT_CXX   = -qpic
-SHAREDOPT_LINK  = 
+SHAREDOPT_LINK  =
 DEBUGOPT_CC     = -g -D_DEBUG -qfullpath
 DEBUGOPT_CXX    = -g -D_DEBUG -qfullpath -qnoinline
 DEBUGOPT_LINK   = -g
diff --git a/build/config/ARM-Linux b/build/config/ARM-Linux
index 7d555158c..ef881710e 100644
--- a/build/config/ARM-Linux
+++ b/build/config/ARM-Linux
@@ -43,7 +43,7 @@ SHAREDLIBLINKEXT = .so
 CFLAGS          = -std=c11 $(ARCHFLAGS)
 CFLAGS32        =
 CFLAGS64        =
-CXXFLAGS        = -std=c++14 -Wall -Wno-sign-compare $(ARCHFLAGS)
+CXXFLAGS        = -std=c++14 -Wall -Wno-sign-compare -Wno-psabi $(ARCHFLAGS)
 CXXFLAGS32      =
 CXXFLAGS64      =
 LINKFLAGS       =
diff --git a/build/config/Android b/build/config/Android
index 9227a3352..95a472787 100644
--- a/build/config/Android
+++ b/build/config/Android
@@ -62,14 +62,14 @@ CFLAGS64        =
 CXXFLAGS        = $(ARCHFLAGS) -fpic -ffunction-sections -funwind-tables -fstack-protector -fno-strict-aliasing -finline-limit=64 -frtti -fexceptions
 CXXFLAGS32      =
 CXXFLAGS64      =
-LINKFLAGS      += 
+LINKFLAGS      +=
 LINKFLAGS32     =
 LINKFLAGS64     =
-STATICOPT_CC    = 
-STATICOPT_CXX   = 
+STATICOPT_CC    =
+STATICOPT_CXX   =
 STATICOPT_LINK  = -static
-SHAREDOPT_CC    = 
-SHAREDOPT_CXX   = 
+SHAREDOPT_CC    =
+SHAREDOPT_CXX   =
 SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)
 DEBUGOPT_CC     = -g -D_DEBUG
 DEBUGOPT_CXX    = -g -D_DEBUG
diff --git a/build/config/AppleTV b/build/config/AppleTV
index 1899d29ae..8f916a3e7 100644
--- a/build/config/AppleTV
+++ b/build/config/AppleTV
@@ -2,7 +2,7 @@
 # AppleTV
 #
 # Build settings for tvOS 9.0 and newer
-# 
+#
 
 #
 # General Settings
@@ -18,7 +18,7 @@ LINKMODE ?= STATIC
 # TVOS_SDK_VERSION = 9.0
 
 # if TVOS_SDK_VERSION_MIN is defined use that
-# Otherwise use the version found. 
+# Otherwise use the version found.
 
 TVOS_SDK             ?= AppleTVOS
 TVOS_SDK_ROOT        ?= $(shell xcode-select -print-path)/Platforms/$(TVOS_SDK).platform/Developer/SDKs
@@ -45,9 +45,9 @@ LINK    = $(CXX) -bind_at_load
 LIB     = libtool -static -o
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(OSFLAGS) -dynamiclib -Wl,-install_name,$@ -o $@
-DYLIB   = $(CXX) $(OSFLAGS) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@ 
+DYLIB   = $(CXX) $(OSFLAGS) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
+STRIP   =
 DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
@@ -66,23 +66,23 @@ SHAREDLIBLINKEXT = .dylib
 CFLAGS          = $(OSFLAGS) -std=gnu99
 CFLAGS32        =
 CFLAGS64        =
-CXXFLAGS        = $(OSFLAGS) -std=c++11 -stdlib=libc++ -Wall -Wno-sign-compare 
+CXXFLAGS        = $(OSFLAGS) -std=c++11 -stdlib=libc++ -Wall -Wno-sign-compare
 CXXFLAGS32      =
-CXXFLAGS64      = 
+CXXFLAGS64      =
 LINKFLAGS       = $(OSFLAGS) -stdlib=libc++
 LINKFLAGS32     =
 LINKFLAGS64     =
 STATICOPT_CC    =
 STATICOPT_CXX   =
 STATICOPT_LINK  =
-SHAREDOPT_CC    = -fPIC 
+SHAREDOPT_CC    = -fPIC
 SHAREDOPT_CXX   = -fPIC
-SHAREDOPT_LINK  = 
+SHAREDOPT_LINK  =
 DEBUGOPT_CC     = -g -D_DEBUG=$(DEBUGLEVEL)
-DEBUGOPT_CXX    = -g -D_DEBUG=$(DEBUGLEVEL) 
+DEBUGOPT_CXX    = -g -D_DEBUG=$(DEBUGLEVEL)
 DEBUGOPT_LINK   =
 RELEASEOPT_CC   = -DNDEBUG -O2
-RELEASEOPT_CXX  = -DNDEBUG -O 
+RELEASEOPT_CXX  = -DNDEBUG -O
 RELEASEOPT_LINK =
 
 #
diff --git a/build/config/AppleTVSimulator b/build/config/AppleTVSimulator
index 509bdb259..7c593ebc6 100644
--- a/build/config/AppleTVSimulator
+++ b/build/config/AppleTVSimulator
@@ -2,7 +2,7 @@
 # AppleTVSimulator
 #
 # Build settings for tvOS 9.0 Simulator
-# 
+#
 
 TVOS_SDK           = AppleTVSimulator
 POCO_TARGET_OSARCH = x86_64
diff --git a/build/config/CEGCCARM b/build/config/CEGCCARM
index 657342988..8584b79fc 100644
--- a/build/config/CEGCCARM
+++ b/build/config/CEGCCARM
@@ -1,7 +1,7 @@
 #
 # CYGWIN
 #
-# Make settings for Cygwin on WinXP/gcc 3.4 
+# Make settings for Cygwin on WinXP/gcc 3.4
 # for cross compiling to WinCE ARM with CEGCC
 #
 #
@@ -42,7 +42,7 @@ SHAREDLIBLINKEXT = .dll
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = 
+CFLAGS          =
 CFLAGS32        =
 CFLAGS64        =
 CXXFLAGS        =
@@ -54,9 +54,9 @@ LINKFLAGS64     =
 STATICOPT_CC    =
 STATICOPT_CXX   =
 STATICOPT_LINK  = -static
-SHAREDOPT_CC    = 
-SHAREDOPT_CXX   = 
-SHAREDOPT_LINK  = 
+SHAREDOPT_CC    =
+SHAREDOPT_CXX   =
+SHAREDOPT_LINK  =
 DEBUGOPT_CC     = -g -D_DEBUG
 DEBUGOPT_CXX    = -g -D_DEBUG
 DEBUGOPT_LINK   = -g
diff --git a/build/config/CygLinux b/build/config/CygLinux
index 32334e1a2..c4eca63cb 100644
--- a/build/config/CygLinux
+++ b/build/config/CygLinux
@@ -24,7 +24,7 @@ RANLIB  = $(TOOL)ranlib
 SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = $(TOOL)strip
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
@@ -39,7 +39,7 @@ SHAREDLIBLINKEXT = .so
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = 
+CFLAGS          =
 CFLAGS32        =
 CFLAGS64        =
 CXXFLAGS        = -Wall -Wno-sign-compare
diff --git a/build/config/Cygwin b/build/config/Cygwin
index bfc312b7e..9e39c820a 100644
--- a/build/config/Cygwin
+++ b/build/config/Cygwin
@@ -21,7 +21,7 @@ RANLIB  = ranlib
 SHLIB   = $(CXX) -shared -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   =
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
@@ -41,30 +41,30 @@ IMPLIBLINKEXT    = .dll.a
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = 
-CFLAGS32        = 
-CFLAGS64        = 
+CFLAGS          =
+CFLAGS32        =
+CFLAGS64        =
 CXXFLAGS        = -Wa,-mbig-obj -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING
 CXXFLAGS32      =
 CXXFLAGS64      = -Wa,-mbig-obj
 SHLIBFLAGS      = -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(notdir $@)).a -Wl,--export-all-symbols -Wl,--enable-auto-import
-SHLIBFLAGS32    = 
-SHLIBFLAGS64    = 
-LINKFLAGS       = 
-LINKFLAGS32     = 
-LINKFLAGS64     = 
-STATICOPT_CC    = 
-STATICOPT_CXX   = 
+SHLIBFLAGS32    =
+SHLIBFLAGS64    =
+LINKFLAGS       =
+LINKFLAGS32     =
+LINKFLAGS64     =
+STATICOPT_CC    =
+STATICOPT_CXX   =
 STATICOPT_LINK  = -static
-SHAREDOPT_CC    = 
-SHAREDOPT_CXX   = 
-SHAREDOPT_LINK  = 
+SHAREDOPT_CC    =
+SHAREDOPT_CXX   =
+SHAREDOPT_LINK  =
 DEBUGOPT_CC     = -g -D_DEBUG
 DEBUGOPT_CXX    = -g -D_DEBUG
 DEBUGOPT_LINK   = -g
 RELEASEOPT_CC   = -DNDEBUG
 RELEASEOPT_CXX  = -DNDEBUG
-RELEASEOPT_LINK = 
+RELEASEOPT_LINK =
 
 #
 # System Specific Flags
@@ -75,9 +75,9 @@ SYSFLAGS = -D_GNU_SOURCE
 #
 # System Specific Libraries
 #
-SYSLIBS  = 
+SYSLIBS  =
 
-# commented out until OSARCH_POSTFIX be fixed 
+# commented out until OSARCH_POSTFIX be fixed
 #ifeq ($(findstring x86_64,$(shell uname -m)),x86_64)
 #    OSARCH_64BITS = 1
 #else
diff --git a/build/config/FreeBSD-Linux-compat b/build/config/FreeBSD-Linux-compat
index e7a62b592..6c09650da 100644
--- a/build/config/FreeBSD-Linux-compat
+++ b/build/config/FreeBSD-Linux-compat
@@ -21,7 +21,7 @@ RANLIB  = ranlib
 SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = strip
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
@@ -36,7 +36,7 @@ SHAREDLIBLINKEXT = .so
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = 
+CFLAGS          =
 CFLAGS32        =
 CFLAGS64        =
 CXXFLAGS        = -Wall -Wno-sign-compare
diff --git a/build/config/HP-UX b/build/config/HP-UX
index 5ce43b93c..21ec1b40d 100644
--- a/build/config/HP-UX
+++ b/build/config/HP-UX
@@ -19,8 +19,8 @@ LIB     = ar -cr
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(LINKFLAGS) -b -Wl,+h$(notdir $@) -o $@ -Wl,+s
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-DEP     = $(POCO_BASE)/build/script/makedepend.aCC 
-STRIP   = 
+DEP     = $(POCO_BASE)/build/script/makedepend.aCC
+STRIP   =
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
diff --git a/build/config/Linux-SolarisStudio b/build/config/Linux-SolarisStudio
index 34ed18233..e50c865d1 100644
--- a/build/config/Linux-SolarisStudio
+++ b/build/config/Linux-SolarisStudio
@@ -16,12 +16,12 @@ LINKMODE ?= SHARED
 CC      = cc
 CXX     = CC
 LINK    = $(CXX)
-LIB     = $(CXX) -xar -o 
+LIB     = $(CXX) -xar -o
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@)
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = ${CROSS_COMPILE}strip
-DEP     = $(POCO_BASE)/build/script/makedepend.SunCC 
+DEP     = $(POCO_BASE)/build/script/makedepend.SunCC
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
diff --git a/build/config/Linux-clang b/build/config/Linux-clang
index f5ab587ad..43ac30d71 100644
--- a/build/config/Linux-clang
+++ b/build/config/Linux-clang
@@ -21,7 +21,7 @@ RANLIB  = ${CROSS_COMPILE}ranlib
 SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = ${CROSS_COMPILE}strip
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
diff --git a/build/config/MinGW b/build/config/MinGW
index 1e281d9b5..f3c25ee9e 100644
--- a/build/config/MinGW
+++ b/build/config/MinGW
@@ -22,7 +22,7 @@ RANLIB  = ranlib
 SHLIB   = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = strip
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
diff --git a/build/config/MinGW-CrossEnv b/build/config/MinGW-CrossEnv
index 1c09a4ddf..3b2a52e78 100644
--- a/build/config/MinGW-CrossEnv
+++ b/build/config/MinGW-CrossEnv
@@ -24,7 +24,7 @@ RANLIB  = $(CROSSENV)-ranlib
 SHLIB   = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = $(CROSSENV)-strip
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
diff --git a/build/config/NIOS2-Linux b/build/config/NIOS2-Linux
index 199f62d66..c82fc7ade 100644
--- a/build/config/NIOS2-Linux
+++ b/build/config/NIOS2-Linux
@@ -24,7 +24,7 @@ RANLIB  = nios2-linux-gnu-ranlib
 SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = nios2-linux-gnu-strip
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
diff --git a/build/config/OSF1 b/build/config/OSF1
index ba881d1b8..61db6d745 100644
--- a/build/config/OSF1
+++ b/build/config/OSF1
@@ -14,13 +14,13 @@ LINKMODE ?= SHARED
 #
 CC      = cc
 CXX     = cxx
-LINK    = $(CXX) 
+LINK    = $(CXX)
 LIB     = ar -cr
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(LINKFLAGS) -shared -o $@ -soname $(notdir $@)
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
-DEP     = $(POCO_BASE)/build/script/makedepend.cxx 
+STRIP   =
+DEP     = $(POCO_BASE)/build/script/makedepend.cxx
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
@@ -36,14 +36,14 @@ SHAREDLIBLINKEXT = .so
 # Compiler and Linker Flags
 #
 CFLAGS          = -pthread
-CFLAGS32        = 
-CFLAGS64        = 
+CFLAGS32        =
+CFLAGS64        =
 CXXFLAGS        =  -model ansi -pthread -ansi_alias -std ansi -D__USE_STD_IOSTREAM -nousing_std -nopure_cname -ieee
-CXXFLAGS32      = 
-CXXFLAGS64      = 
+CXXFLAGS32      =
+CXXFLAGS64      =
 LINKFLAGS       = -pthread -model ansi -std ansi
-LINKFLAGS32     = 
-LINKFLAGS64     = 
+LINKFLAGS32     =
+LINKFLAGS64     =
 STATICOPT_CC    = -non_shared
 STATICOPT_CXX   = -non_shared
 STATICOPT_LINK  = -non_shared
@@ -55,7 +55,7 @@ DEBUGOPT_CXX    = -gall -D_DEBUG
 DEBUGOPT_LINK   = -gall
 RELEASEOPT_CC   = +O2 -DNDEBUG
 RELEASEOPT_CXX  = +O2 -DNDEBUG
-RELEASEOPT_LINK =  
+RELEASEOPT_LINK =
 
 #
 # System Specific Flags
diff --git a/build/config/QNX b/build/config/QNX
index bb933a217..61e77ee2b 100644
--- a/build/config/QNX
+++ b/build/config/QNX
@@ -39,8 +39,8 @@ LIB     = ar -cr
 RANLIB  = ranlib
 SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
-DEP     = $(POCO_BASE)/build/script/makedepend.qcc 
+STRIP   =
+DEP     = $(POCO_BASE)/build/script/makedepend.qcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
@@ -55,7 +55,7 @@ SHAREDLIBLINKEXT = .so
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = 
+CFLAGS          =
 CFLAGS32        =
 CFLAGS64        =
 CXXFLAGS        =
diff --git a/build/config/SmartOS-gcc b/build/config/SmartOS-gcc
index f5750d618..cea8bfef9 100644
--- a/build/config/SmartOS-gcc
+++ b/build/config/SmartOS-gcc
@@ -21,7 +21,7 @@ RANLIB  = ranlib
 SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = strip
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
diff --git a/build/config/SunOS-GCC b/build/config/SunOS-GCC
index 7b93d7c46..446979e45 100644
--- a/build/config/SunOS-GCC
+++ b/build/config/SunOS-GCC
@@ -21,7 +21,7 @@ RANLIB  = ranlib
 SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 STRIP   = strip
-DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
 CP      = cp
@@ -36,7 +36,7 @@ SHAREDLIBLINKEXT = .so
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = 
+CFLAGS          =
 CFLAGS32        =
 CFLAGS64        =
 CXXFLAGS        = -Wall -Wno-sign-compare
diff --git a/build/config/SunOS-SunForte b/build/config/SunOS-SunForte
index e65b2bd85..090ff542d 100644
--- a/build/config/SunOS-SunForte
+++ b/build/config/SunOS-SunForte
@@ -19,7 +19,7 @@ LIB     = $(CXX) -xar -o $@
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@)
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
+STRIP   =
 DEP     = $(POCO_BASE)/build/script/makedepend.SunCC
 SHELL   = sh
 RM      = rm -rf
diff --git a/build/config/SunOS-SunStudio b/build/config/SunOS-SunStudio
index 6bd07fb2b..66e83a1a8 100644
--- a/build/config/SunOS-SunStudio
+++ b/build/config/SunOS-SunStudio
@@ -19,7 +19,7 @@ LIB     = $(CXX) -xar -o $@
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@)
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
+STRIP   =
 DEP     = $(POCO_BASE)/build/script/makedepend.SunCC
 SHELL   = sh
 RM      = rm -rf
diff --git a/build/config/SunOS-SunStudio11 b/build/config/SunOS-SunStudio11
index b095d3cdf..b7a8ef2e8 100644
--- a/build/config/SunOS-SunStudio11
+++ b/build/config/SunOS-SunStudio11
@@ -20,7 +20,7 @@ LIB     = ar cru
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@)
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
+STRIP   =
 DEP     = $(POCO_BASE)/build/script/makedepend.SunCC
 SHELL   = sh
 RM      = rm -rf
diff --git a/build/config/SunOS-stdcxx-x86_64 b/build/config/SunOS-stdcxx-x86_64
index e5096fd49..4f132bb2c 100644
--- a/build/config/SunOS-stdcxx-x86_64
+++ b/build/config/SunOS-stdcxx-x86_64
@@ -19,7 +19,7 @@ LIB     = $(CXX) -xar -o $@
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@)
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
+STRIP   =
 DEP     = $(POCO_BASE)/build/script/makedepend.SunCC
 SHELL   = sh
 RM      = rm -rf
diff --git a/build/config/WatchOS b/build/config/WatchOS
index cdb6a21b2..c64865ae0 100644
--- a/build/config/WatchOS
+++ b/build/config/WatchOS
@@ -2,7 +2,7 @@
 # WatchOS
 #
 # Build settings for Apple WatchOS 2.0 and newer
-# 
+#
 
 #
 # General Settings
@@ -18,7 +18,7 @@ LINKMODE ?= STATIC
 # WATCHOS_SDK_VERSION = 2.0
 
 # if WATCHOS_SDK_VERSION_MIN is defined use that
-# Otherwise use the version found. 
+# Otherwise use the version found.
 
 WATCHOS_SDK             ?= WatchOS
 WATCHOS_SDK_ROOT        ?= $(shell xcode-select -print-path)/Platforms/$(WATCHOS_SDK).platform/Developer/SDKs
@@ -45,9 +45,9 @@ LINK    = $(CXX) -bind_at_load
 LIB     = libtool -static -o
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(OSFLAGS) -dynamiclib -Wl,-install_name,$@ -o $@
-DYLIB   = $(CXX) $(OSFLAGS) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@ 
+DYLIB   = $(CXX) $(OSFLAGS) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
-STRIP   = 
+STRIP   =
 DEP     = $(POCO_BASE)/build/script/makedepend.gcc
 SHELL   = sh
 RM      = rm -rf
@@ -66,23 +66,23 @@ SHAREDLIBLINKEXT = .dylib
 CFLAGS          = $(OSFLAGS)
 CFLAGS32        =
 CFLAGS64        =
-CXXFLAGS        = $(OSFLAGS) -std=c++11 -stdlib=libc++ -Wall -Wno-sign-compare 
+CXXFLAGS        = $(OSFLAGS) -std=c++11 -stdlib=libc++ -Wall -Wno-sign-compare
 CXXFLAGS32      =
-CXXFLAGS64      = 
+CXXFLAGS64      =
 LINKFLAGS       = $(OSFLAGS) -stdlib=libc++
 LINKFLAGS32     =
 LINKFLAGS64     =
 STATICOPT_CC    =
 STATICOPT_CXX   =
 STATICOPT_LINK  =
-SHAREDOPT_CC    = -fPIC 
+SHAREDOPT_CC    = -fPIC
 SHAREDOPT_CXX   = -fPIC
-SHAREDOPT_LINK  = 
+SHAREDOPT_LINK  =
 DEBUGOPT_CC     = -g -D_DEBUG=$(DEBUGLEVEL)
-DEBUGOPT_CXX    = -g -D_DEBUG=$(DEBUGLEVEL) 
+DEBUGOPT_CXX    = -g -D_DEBUG=$(DEBUGLEVEL)
 DEBUGOPT_LINK   =
 RELEASEOPT_CC   = -DNDEBUG -O2
-RELEASEOPT_CXX  = -DNDEBUG -O 
+RELEASEOPT_CXX  = -DNDEBUG -O
 RELEASEOPT_LINK =
 
 #
diff --git a/build/config/WatchSimulator b/build/config/WatchSimulator
index 4f259374d..e543c7e4a 100644
--- a/build/config/WatchSimulator
+++ b/build/config/WatchSimulator
@@ -2,7 +2,7 @@
 # WatchSimulator
 #
 # Build settings for WatchOS 2.0 Simulator
-# 
+#
 
 WATCHOS_SDK        = WatchSimulator
 POCO_TARGET_OSARCH = i386
diff --git a/build/config/iPhone-clang b/build/config/iPhone-clang
index 2c8d6daae..77643fa2c 100644
--- a/build/config/iPhone-clang
+++ b/build/config/iPhone-clang
@@ -2,6 +2,6 @@
 # iPhone-clang
 #
 # Build settings for iPhone OS, using Apple's iPhone SDK
-# 
+#
 
 include $(POCO_BASE)/build/config/iPhone
diff --git a/build/config/iPhone-clang-libc++ b/build/config/iPhone-clang-libc++
index 21f9b8525..551beaf0a 100644
--- a/build/config/iPhone-clang-libc++
+++ b/build/config/iPhone-clang-libc++
@@ -2,6 +2,6 @@
 # iPhone-clang-libc++
 #
 # Build settings for iPhone OS, using Apple's iPhone SDK
-# 
+#
 
 include $(POCO_BASE)/build/config/iPhone
diff --git a/build/config/iPhoneSimulator b/build/config/iPhoneSimulator
index 2aaea3877..6b6ea491c 100644
--- a/build/config/iPhoneSimulator
+++ b/build/config/iPhoneSimulator
@@ -2,7 +2,7 @@
 # iPhoneSimulator
 #
 # Build settings for iPhone Simulator, using Apple's iPhone SDK
-# 
+#
 
 IPHONE_SDK         = iPhoneSimulator
 POCO_TARGET_OSARCH = i686
diff --git a/build/config/iPhoneSimulator-clang b/build/config/iPhoneSimulator-clang
index 067c3e290..26cc36906 100644
--- a/build/config/iPhoneSimulator-clang
+++ b/build/config/iPhoneSimulator-clang
@@ -2,7 +2,7 @@
 # iPhoneSimulator-clang
 #
 # Build settings for iPhone Simulator, using Apple's iPhone SDK
-# 
+#
 
 IPHONE_SDK         = iPhoneSimulator
 POCO_TARGET_OSARCH = i686
diff --git a/build/config/iPhoneSimulator-clang-libc++ b/build/config/iPhoneSimulator-clang-libc++
index 3487e0a1b..82e8db8cd 100644
--- a/build/config/iPhoneSimulator-clang-libc++
+++ b/build/config/iPhoneSimulator-clang-libc++
@@ -2,7 +2,7 @@
 # iPhoneSimulator-clang-libc++
 #
 # Build settings for iPhone Simulator, using Apple's iPhone SDK
-# 
+#
 
 IPHONE_SDK         = iPhoneSimulator
 POCO_TARGET_OSARCH = i686
diff --git a/build/rules/dylib b/build/rules/dylib
index 783defeda..4d8aca3bc 100644
--- a/build/rules/dylib
+++ b/build/rules/dylib
@@ -20,6 +20,10 @@ DYLIB      = $(SHLIB)
 DYLIBFLAGS = $(SHLIBFLAGS)
 endif
 
+target := $(strip $(target))
+target_version := $(strip $(target_version))
+target_libs := $(strip $(target_libs))
+
 DYLIB_DEBUG        = $(BINPATH)/$(target)d$(OSARCH_POSTFIX)$(SHL_EXT)
 DYLIB_RELEASE      = $(BINPATH)/$(target)$(OSARCH_POSTFIX)$(SHL_EXT)
 DYLIB_S_DEBUG      = $(BINPATH)/static/$(target)d$(OSARCH_POSTFIX)$(SHL_EXT)
diff --git a/build/rules/exec b/build/rules/exec
index ef6a75833..32ec7eef4 100644
--- a/build/rules/exec
+++ b/build/rules/exec
@@ -4,6 +4,10 @@
 # Rule definitions for building executables
 #
 
+target := $(strip $(target))
+target_version := $(strip $(target_version))
+target_libs := $(strip $(target_libs))
+
 #
 # Target names
 #
diff --git a/build/rules/global b/build/rules/global
index 32e5403a2..5e48cd988 100644
--- a/build/rules/global
+++ b/build/rules/global
@@ -13,6 +13,10 @@
 # POCO_TARGET_OSARCH: Target system architecture (forr cross builds)
 #
 
+target := $(strip $(target))
+target_version := $(strip $(target_version))
+target_libs := $(strip $(target_libs))
+
 #
 # Check for POCO_BASE
 #
@@ -324,7 +328,7 @@ LIBRARY = -L$(LIBPATH) $(POCO_LIBRARY) $(MACCHINA_LIBRARY) $(foreach p,$(POCO_AD
 # Strip Command definition
 #
 ifeq ($(strip $(STRIP)),)
-STRIPCMD = 
+STRIPCMD =
 else
 STRIPCMD = $(STRIP) $@$(BINEXT)
 endif
diff --git a/build/rules/lib b/build/rules/lib
index 376687563..9ba932039 100644
--- a/build/rules/lib
+++ b/build/rules/lib
@@ -4,6 +4,10 @@
 # Rule definitions for building libraries
 #
 
+target := $(strip $(target))
+target_version := $(strip $(target_version))
+target_libs := $(strip $(target_libs))
+
 #
 # Target names
 #
diff --git a/build/rules/sample b/build/rules/sample
index d251b904b..6852360db 100644
--- a/build/rules/sample
+++ b/build/rules/sample
@@ -4,7 +4,7 @@
 # Global build configuration for samples
 #
 # Environment variables:
-# POCO_BASE:   Path to POCO source tree. 
+# POCO_BASE:   Path to POCO source tree.
 # POCO_CONFIG: Build configuration to use.
 #              Defaults to `uname`.
 #
diff --git a/build/script/makedepend.aCC b/build/script/makedepend.aCC
index c7fe6f4ba..b38de6e62 100755
--- a/build/script/makedepend.aCC
+++ b/build/script/makedepend.aCC
@@ -20,6 +20,6 @@ dir4=$1
 shift
 
 tmpfile=`basename $target`
-aCC -E +maked $@ $source >/dev/null 
+aCC -E +maked $@ $source >/dev/null
 sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" <$tmpfile >$target
 rm $tmpfile
diff --git a/build/script/makeldpath b/build/script/makeldpath
index d4bc2d28e..5e46d2874 100755
--- a/build/script/makeldpath
+++ b/build/script/makeldpath
@@ -6,7 +6,7 @@
 #
 
 if [ "$POCO_BASE" == "" ] ; then
-	echo $0": POCO_BASE is not set." 
+	echo $0": POCO_BASE is not set."
 	exit 1
 fi
 
diff --git a/build/script/vxprogen b/build/script/vxprogen
index c62f5c338..1db614952 100755
--- a/build/script/vxprogen
+++ b/build/script/vxprogen
@@ -27,7 +27,7 @@ fi
 if [ ! -d "$POCO_BASE" ] ; then
 	echo "Fatal error: POCO_BASE does not contain a valid path to a directory. Exiting."
 	exit 1
-fi 
+fi
 
 pwd=`pwd`
 buildfile=`basename $pwd`.vxbuild
@@ -58,7 +58,7 @@ echo "Document file - DO NOT EDIT" >$out
 echo "" >>$out
 
 buildvars="
-	MACRO_AR 
+	MACRO_AR
 	MACRO_ARCHIVE
 	MACRO_AS
 	MACRO_CC
@@ -88,7 +88,7 @@ buildvars="
 
 for build in $builds ; do
 	source $POCO_BASE/build/vxconfig/$build
-	
+
 	echo "<BEGIN> BUILD_${BUILD}_BUILDRULE" >>$out
 	echo "${TARGET}.out" >>$out
 	echo "<END>" >>$out
diff --git a/buildwin.cmd b/buildwin.cmd
index eaa9e8379..d16cb405c 100644
--- a/buildwin.cmd
+++ b/buildwin.cmd
@@ -20,7 +20,7 @@ rem VS_VERSION:    140|150|160|170
 rem ACTION:        build|rebuild|clean
 rem LINKMODE:      static_mt|static_md|shared|all
 rem CONFIGURATION: release|debug|both
-rem PLATFORM:      Win32|x64
+rem PLATFORM:      Win32|x64|ARM64
 rem SAMPLES:       samples|nosamples
 rem TESTS:         tests|notests
 rem TOOL:          devenv|vcexpress|wdexpress|msbuild
@@ -99,7 +99,8 @@ rem PLATFORM [Win32|x64]
 set PLATFORM=%3
 if "%PLATFORM%"=="" (set PLATFORM=Win32)
 if not "%PLATFORM%"=="Win32" (
-if not "%PLATFORM%"=="x64" goto usage)
+if not "%PLATFORM%"=="x64" (
+if not "%PLATFORM%"=="ARM64" goto usage))
 
 rem SAMPLES [samples|nosamples]
 set SAMPLES=%4
@@ -135,7 +136,11 @@ if not defined VCINSTALLDIR (
           if %PLATFORM%==x64 (
             call "%VS170COMNTOOLS%%VS_VARSALL%" x86_amd64 8.1
           ) else (
-            call "%VS170COMNTOOLS%%VS_VARSALL%" x86 8.1
+            if %PLATFORM%==arm64 (
+              call "%VS170COMNTOOLS%%VS_VARSALL%" x86_arm64
+            ) else (
+              call "%VS170COMNTOOLS%%VS_VARSALL%" x86 8.1
+            )
           )
         )
       )
@@ -185,7 +190,8 @@ if "%VS_VERSION%"=="vs170" (set BUILD_TOOL=msbuild)
 if "%BUILD_TOOL%"=="msbuild" (
   if "%PLATFORM%"=="Win32" (set PLATFORMSW=/p:Platform=Win32) else (
   if "%PLATFORM%"=="x86"   (set PLATFORMSW=/p:Platform=Win32) else (
-  if "%PLATFORM%"=="x64"   (set PLATFORMSW=/p:Platform=x64)))
+  if "%PLATFORM%"=="x64"   (set PLATFORMSW=/p:Platform=x64) else (
+  if "%PLATFORM%"=="ARM64"   (set PLATFORMSW=/p:Platform=ARM64))))
 
   set ACTIONSW=/t:
   set CONFIGSW=/p:Configuration=
@@ -597,7 +603,7 @@ echo VS_VERSION:    "140|150|160|170"
 echo ACTION:        "build|rebuild|clean"
 echo LINKMODE:      "static_mt|static_md|shared|all"
 echo CONFIGURATION: "release|debug|both"
-echo PLATFORM:      "Win32|x64"
+echo PLATFORM:      "Win32|x64|ARM64"
 echo SAMPLES:       "samples|nosamples"
 echo TESTS:         "tests|notests"
 echo TOOL:          "devenv|vcexpress|wdexpress|msbuild"
diff --git a/ci/runtests.sh b/ci/runtests.sh
index 78fbd1500..e29454fef 100755
--- a/ci/runtests.sh
+++ b/ci/runtests.sh
@@ -5,4 +5,8 @@ export POCO_BASE=`pwd`
 export PATH=$PATH:.
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:$POCO_BASE/lib/$osname/$osarch
 export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:.:$POCO_BASE/lib/$osname/$osarch
+if [ "TSAN" = "$1" ]
+  then
+    export TSAN_OPTIONS="suppressions=$POCO_BASE/tsan.suppress,second_deadlock_stack=1"
+fi
 build/script/runtests.sh
diff --git a/cmake/FindODBC.cmake b/cmake/FindODBC.cmake
index 55318b520..d572d93bb 100644
--- a/cmake/FindODBC.cmake
+++ b/cmake/FindODBC.cmake
@@ -22,9 +22,10 @@ include(FindPackageHandleStandardArgs)
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_ODBC QUIET odbc)
 
-if(WIN32)
+if(WIN32 AND NOT MINGW)
 	get_filename_component(kit_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot]" REALPATH)
 	get_filename_component(kit81_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot81]" REALPATH)
+	set(_odbc_kit_include_dirs "${kit_dir}/Include/um" "${kit81_dir}/Include/um")
 endif()
 
 find_path(ODBC_INCLUDE_DIR
@@ -42,8 +43,7 @@ find_path(ODBC_INCLUDE_DIR
 		"C:/Program Files/Microsoft SDKs/Windows/v7.0/include"
 		"C:/Program Files/Microsoft SDKs/Windows/v6.0a/include"
 		"C:/ODBC/include"
-		"${kit_dir}/Include/um"
-		"${kit81_dir}/Include/um"
+		${_odbc_kit_include_dirs}
 	PATH_SUFFIXES
 		odbc
 		iodbc
diff --git a/cmake/FindPCRE.cmake b/cmake/FindPCRE.cmake
deleted file mode 100644
index c5bb73c5a..000000000
--- a/cmake/FindPCRE.cmake
+++ /dev/null
@@ -1,107 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindPCRE
--------
-
-Finds the PCRE library.
-
-Imported Targets
-^^^^^^^^^^^^^^^^
-
-This module provides the following imported targets, if found:
-
-``Pcre::Pcre``
-  The PCRE library
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This will define the following variables:
-
-``PCRE_FOUND``
-  True if the system has the PCRE library.
-``PCRE_VERSION``
-  The version of the PCRE library which was found.
-``PCRE_INCLUDE_DIRS``
-  Include directories needed to use PCRE.
-``PCRE_LIBRARIES``
-  Libraries needed to link to PCRE.
-
-Cache Variables
-^^^^^^^^^^^^^^^
-
-The following cache variables may also be set:
-
-``PCRE_INCLUDE_DIR``
-  The directory containing ``foo.h``.
-``PCRE_LIBRARY``
-  The path to the PCRE library.
-
-Hints
-^^^^^
-
-``PCRE_ROOT_DIR``
-  The path to the root directory of a PCRE installation.
-``PCRE_ROOT_INCLUDE_DIRS``
-  The path to the include directory of a PCRE installation.
-``PCRE_ROOT_LIBRARY_DIRS``
-  The path to the library directory of a PCRE installation.
-
-#]=======================================================================]#
-
-include(FindPackageHandleStandardArgs)
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_PCRE QUIET pcre)
-
-find_path(PCRE_INCLUDE_DIR
-  NAMES pcre.h
-  HINTS
-        ${PCRE_ROOT_DIR}/include
-        ${PCRE_ROOT_INCLUDE_DIRS}
-  PATHS 
-        ${PC_PCRE_INCLUDE_DIRS}
-  DOC "Specify the include directory containing pcre.h"
-)
-
-find_library(PCRE_LIBRARY
-  NAMES pcre
-  HINTS
-        ${PCRE_ROOT_DIR}/lib
-        ${PCRE_ROOT_LIBRARY_DIRS}
-  PATHS
-        ${PC_PCRE_LIBRARY_DIRS}
-  DOC "Specify the lib directory containing pcre"
-)
-
-set(PCRE_VERSION ${PC_PCRE_VERSION})
-
-find_package_handle_standard_args(PCRE
-  FOUND_VAR PCRE_FOUND
-  REQUIRED_VARS
-    PCRE_LIBRARY
-    PCRE_INCLUDE_DIR
-  VERSION_VAR PCRE_VERSION
-)
-
-if(PCRE_FOUND)
-  set(PCRE_LIBRARIES ${PCRE_LIBRARY})
-  set(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR})
-  set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER})
-endif()
-
-if(PCRE_FOUND AND NOT TARGET Pcre::Pcre)
-  add_library(Pcre::Pcre UNKNOWN IMPORTED)
-  set_target_properties(Pcre::Pcre PROPERTIES
-    IMPORTED_LOCATION "${PCRE_LIBRARY}"
-    INTERFACE_COMPILE_OPTIONS "${PC_PCRE_CFLAGS_OTHER}"
-    INTERFACE_INCLUDE_DIRECTORIES "${PCRE_INCLUDE_DIR}"
-  )
-endif()
-
-mark_as_advanced(
-  PCRE_INCLUDE_DIR
-  PCRE_LIBRARY
-)
diff --git a/cmake/FindPCRE2.cmake b/cmake/FindPCRE2.cmake
new file mode 100644
index 000000000..e730f32a1
--- /dev/null
+++ b/cmake/FindPCRE2.cmake
@@ -0,0 +1,107 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindPCRE2
+---------
+
+Finds the PCRE2 library.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+This module provides the following imported targets, if found:
+
+``Pcre2::Pcre2``
+  The PCRE2 library
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This will define the following variables:
+
+``PCRE2_FOUND``
+  True if the system has the PCRE2 library.
+``PCRE2_VERSION``
+  The version of the PCRE2 library which was found.
+``PCRE2_INCLUDE_DIRS``
+  Include directories needed to use PCRE2.
+``PCRE2_LIBRARIES``
+  Libraries needed to link to PCRE2.
+
+Cache Variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``PCRE2_INCLUDE_DIR``
+  The directory containing ``pcre2.h``.
+``PCRE2_LIBRARY``
+  The path to the PCRE2 library.
+
+Hints
+^^^^^
+
+``PCRE2_ROOT_DIR``
+  The path to the root directory of a PCRE2 installation.
+``PCRE2_ROOT_INCLUDE_DIRS``
+  The path to the include directory of a PCRE2 installation.
+``PCRE2_ROOT_LIBRARY_DIRS``
+  The path to the library directory of a PCRE2 installation.
+
+#]=======================================================================]#
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_PCRE2 QUIET pcre2)
+
+find_path(PCRE2_INCLUDE_DIR
+  NAMES pcre2.h
+  HINTS
+        ${PCRE2_ROOT_DIR}/include
+        ${PCRE2_ROOT_INCLUDE_DIRS}
+  PATHS
+        ${PC_PCRE2_INCLUDE_DIRS}
+  DOC "Specify the include directory containing pcre2.h"
+)
+
+find_library(PCRE2_LIBRARY
+  NAMES pcre2-8
+  HINTS
+        ${PCRE2_ROOT_DIR}/lib
+        ${PCRE2_ROOT_LIBRARY_DIRS}
+  PATHS
+        ${PC_PCRE2_LIBRARY_DIRS}
+  DOC "Specify the lib directory containing pcre2"
+)
+
+set(PCRE2_VERSION ${PC_PCRE2_VERSION})
+
+find_package_handle_standard_args(PCRE2
+  FOUND_VAR PCRE2_FOUND
+  REQUIRED_VARS
+    PCRE2_LIBRARY
+    PCRE2_INCLUDE_DIR
+  VERSION_VAR PCRE2_VERSION
+)
+
+if(PCRE2_FOUND)
+  set(PCRE2_LIBRARIES ${PCRE2_LIBRARY})
+  set(PCRE2_INCLUDE_DIRS ${PCRE2_INCLUDE_DIR})
+  set(PCRE2_DEFINITIONS ${PC_PCRE2_CFLAGS_OTHER})
+endif()
+
+if(PCRE2_FOUND AND NOT TARGET Pcre2::Pcre2)
+  add_library(Pcre2::Pcre2 UNKNOWN IMPORTED)
+  set_target_properties(Pcre2::Pcre2 PROPERTIES
+    IMPORTED_LOCATION "${PCRE2_LIBRARY}"
+    INTERFACE_COMPILE_OPTIONS "${PC_PCRE2_CFLAGS_OTHER}"
+    INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIR}"
+  )
+endif()
+
+mark_as_advanced(
+  PCRE2_INCLUDE_DIR
+  PCRE2_LIBRARY
+)
diff --git a/cmake/UseEmbeddedOpenSSL.cmake b/cmake/UseEmbeddedOpenSSL.cmake
index a35eeaf6a..ab6d24779 100644
--- a/cmake/UseEmbeddedOpenSSL.cmake
+++ b/cmake/UseEmbeddedOpenSSL.cmake
@@ -29,8 +29,8 @@ if(NOT EXISTS "${PROJECT_SOURCE_DIR}/openssl/build")
   message(STATUS "Use internal OpenSSL binaries but ${PROJECT_SOURCE_DIR}/openssl/build doesn't exists. Try to checkout ...")
   find_package(Git REQUIRED)
   execute_process(
-      COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --remote openssl 
-      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
+      COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --remote openssl
+      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
       RESULT_VARIABLE EXITCODE)
   if(NOT "${EXITCODE}" STREQUAL "0")
     message(FATAL_ERROR "Checkout ${PROJECT_SOURCE_DIR}/openssl FAILED!")
diff --git a/doc/00200-GettingStarted.page b/doc/00200-GettingStarted.page
index b7e6bb9ac..cefe4e05f 100644
--- a/doc/00200-GettingStarted.page
+++ b/doc/00200-GettingStarted.page
@@ -461,7 +461,7 @@ or
 
 To use POCO C++ Libraries in your cmake project, add following line in your project for example to use crypto:
 
-    find_package(Poco REQUIRED PocoCrypto)
+    find_package(Poco REQUIRED Crypto)
     ....
     target_link_libraries(yourTargetName ... Poco::Crypto)
 
diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page
index 680c49e0c..8d5e83872 100644
--- a/doc/99100-ReleaseNotes.page
+++ b/doc/99100-ReleaseNotes.page
@@ -5,7 +5,133 @@ AAAIntroduction
 
 !!Summary of Changes
 
-  - TODO
+  - This release introduces Prometheus library
+  - Upgraded bundled PCRE to PCRE2 10.40
+  - Upgraded double-conversion to v3.2.0
+  - Small object optimization for Any and Dynamic::Var (compile-time option, enabled by default)
+
+  - GH #709: Poco::Dynamic::Var memory leak
+  - GH #1039 Race condition in Poco::AsyncChannel close/log
+  - GH #1459 Fix Poco::Net::Socket::select() epoll and poll implementations
+  - GH #1687 SQLite Notifier has no table information
+  - GH #1884 Poco::Net::TCPServerDispatcher::run() issue
+  - GH #2084 LogFile_STD (LogFileImpl) fails to recover from getting out of space
+  - GH #2085 Crash due to race condition in TCPServerDispatcher
+  - GH #2091 Integrate windows poll
+  - GH #2222 Warning when compiling my that's use VarHolder
+  - GH #2270 Poco::Net::HTTPClientSession not supporting binding source address for proxy connect
+  - GH #2271 Poco::Net::HTTPClientSession source IP address
+  - GH #2285 Poco::Data::SQLite::Connector::open() crashes on db file with non existing directory
+  - GH #2287 Poco::Data::Statement becomes unusable after exception
+  - GH #2352 Allow setting the socket of SecureSocketImpl to no-blocking
+  - GH #2386 As of C++11, std::swap is noexcept
+  - GH #2401 Poco::Net::MailMessage::read hangs on missing final multipart boundary
+  - GH #2457 Poco::Redis after executing "auth" command next command always return "OK"
+  - GH #2465 Operating system specific thread ID is not available any more in Logger/Formatter
+  - GH #2470 Can't use Poco::MongoDB::Cursor on aggregation cursor
+  - GH #2511 Negative precision in NumberFormatter::format()
+  - GH #2513 Poco::Net::SocketConnector unregistering
+  - GH #2516 SHA3Engine hard to use with HMACEngine duplicate enhancement
+  - GH #2521 Poco::Data::MySQL::Extractor null value extraction
+  - GH #2538 Poco::Data::Session::connector() returns empty string for MySQL session
+  - GH #2569 Poco::Data::MySQL timestamp
+  - GH #2576 Add std::chrono support to Timespan
+  - GH #2590 Poco::Zip 64-bit extensions not set
+  - GH #2614 Poco::Net::NTPClient ignores second fractions enhancement
+  - GH #2619 Decoding URI query parameters incompatible with Spring 5
+  - GH #2638 Upgrade Windows SDK Used for Building Poco
+  - GH #2688 Static code analyzer warnings
+  - GH #2691 MinGW: fatal error: kernelspecs.h: No such file
+  - GH #2706 [windows bug] pollset WSAPoll with non blocking socket will not report error
+  - GH #2755 Poco::Data::MySQL LONGTEXT
+  - GH #2821 Poco::Buffer: full on creation
+  - GH #2849 setPadding does nothing when OpenSSL 1.1.x is used
+  - GH #2864 SessionImpl begin
+  - GH #2940 Add vcpkg installation instructions
+  - GH #2943 Avoid clang 10 -Wimplicit-int-float-conversion warning/error when converting int into float
+  - GH #2959 Fix percent-encoded fragment modification in Poco::URI
+  - GH #2980 Memory leaks in Poco::Any
+  - GH #2986 Once exhausted, Poco::ObjectPool does not lend out returned objects
+  - GH #3016 Poco::MongoDB::Array interface improvements
+  - GH #3026 Poco::Net::HTTPDigestCredentials added support for RFC7616 algorithms
+  - GH #3039 Poco errors with _DEBUG and NDEBUG
+  - GH #3052 Fix constness of URI::getPathSegments
+  - GH #3088 Fix error in find_package example
+  - GH #3056 Inconsistent behavior ConsoleChannel vs. WindowsConsoleChannel
+  - GH #3062 Makefile: space(s) following target name will break build (during link)
+  - GH #3073 libPocoCrypto.so: undefined reference to `pthread_atfork' when linking statically with OpenSSL 1.1
+  - GH #3104 Publicly expose Poco::Message parameters
+  - GH #3105 CMake: use GNUInstallDirs
+  - GH #3175 SharedLibrary::isLoaded() not thread safe
+  - GH #3195 MinGW also defines __GNUC__
+  - GH #3240 Task::postNotification possible leak
+  - GH #3241 Poco::Data::SessionPool change connection timeout
+  - GH #3251 Poco::JSON Serializing NAN
+  - GH #3253 Arbitrary indent of 2 applied to JSON string objects Var conversion
+  - GH #3261 Upgrade to PCRE2 latest version
+  - GH #3283 DatagramSocket does not allow IPV6_V6ONLY
+  - GH #3296 Add move semantics to Net (sockets and addresses)
+  - GH #3297 Poco::Foundation Fails to Compile With POCO_ENABLE_SOO Defined
+  - GH #3323 Extend format patterns %T and %I to support native threads
+  - GH #3342 DB into() does not compile for more than 20 members in a tuple
+  - GH #3357 Add socket proactor
+  - GH #3359 Make PollSet::poll() interruptible
+  - GH #3371 SocketReactor::getNotifier() does not use socket.impl()
+  - GH #3372 FTPClientSession::activeDataConnection 1.11.0 cannot set specific data port
+  - GH #3374 No access to padding in Cipher
+  - GH #3375 Poco::Net::PollSet::SocketModeMap poll(const Poco::Timespan& timeout) hasSignaledFDs issue slow down connections
+  - GH #3378 Poco::Net::PollSet function setMode 1.11.0 cause while(1) on windows
+  - GH #3380 Windows SO_REUSEADDR is neither reliable nor safe
+  - GH #3384 Always set thread names on POSIX platforms
+  - GH #3385 Poco::Net::IPAddress::tryParse does not work for "::"
+  - GH #3396 Poco::Data::ODBC - dbEncoding property not used for insert/update
+  - GH #3399 IPAddress::isLoopback() returns false for IPv4 mapped in IPv6
+  - GH #3404 Poco::Net: make MessageHeader limits configurable
+  - GH #3415 OpenSSL 3.0 support
+  - GH #3417 Calling SocketReactor's run() method in a program's main thread yields a lot of null pointer exceptions
+  - GH #3421 Cannot use HMACEngine with SHA2Engine
+  - GH #3452 Syslog: Include Facility to Syslog Message
+  - GH #3453 added facility to SyslogChannel
+  - GH #3460 LoongArch support
+  - GH #3481 Poco::JSON DataType support for MySQL
+  - GH #3482 Visual Studio 2022 (v170) missing from buildwin.cmd
+  - GH #3486 Windows on ARM64 support
+  - GH #3516 Fix OpenSSL 3.0 deprecated warnings
+  - GH #3529 Added LocalConfigurationView to only search inside the viewed scope
+  - GH #3543 Visual Studio Warning C4244
+  - GH #3558 Race condition in SSLManager
+  - GH #3561 Add envelope to crypto
+  - GH #3569 Readded named substring support for regexes
+  - GH #3580 Rounds very large negative numbers to the incorrect values
+  - GH #3592 Add 425 / HTTP_TOO_EARLY to HTTPResponse::HTTPStatus
+  - GH #3598 Poco::Net::Socket::available does not always return correct value for UDP
+  - GH #3602 Add Poco::Data::JSONRowFormatter
+  - GH #3603 Update minimum GCC version information
+  - GH #3611 VS2022 Arm64 projects missing or do not load
+  - GH #3613 Poco::Net::UDPHandler data race
+  - GH #3620 MariaDB still uses tx_isolation for transaction isolation unlike MySQL 8+ which uses transaction_isolation
+  - GH #3624 Upgrade double-conversion to v3.2.0
+  - GH #3628 Poco::Net::PollSet data race
+  - GH #3629 Event data race
+  - GH #3633 Poco::Redis: Support Authentication
+  - GH #3635 ConfigurationView and JSON is broken for array access
+  - GH #3639 Bugcheck: indicate compiler that functions will never return
+  - GH #3640 fix warning C4717: 'format<vector<any>': recursive on all control paths, function will cause runtime stack overflow
+  - GH #3641 FifoBuffer.advance method not throw exception when length==0
+  - GH #3642 Make ParallelSocketReactor thread namable
+  - GH #3651 Poco::Net::TCPserver missing from Net/samples/CMakeLists.txt
+  - GH #3652 Linking with Foundation on Android gives error
+  - GH #3655 Poco::Net::Socket::select EPOLL implementation returns socket in exceptList when empty list is given
+  - GH #3658 Support for chunked transfer encoding trailer
+  - GH #3661 Poco::Net::PollSet::add()/update() semantics
+  - GH #3665 MSVC does not properly recognize std version
+
+!!Incompatible Changes and Possible Transition Issues
+
+  - All swap operations are noexcept now
+  - PollSet::add() is mode-cumulative now
+  - UDPServer now requires explicit starting
+  - Move semantics for sockets and SocketAddress (compile-time option, disabled by default)
 
 
 !!!Release 1.11.2
diff --git a/doc/99200-WinCEPlatformNotes.page b/doc/99200-WinCEPlatformNotes.page
index fb343e55e..34546f66b 100644
--- a/doc/99200-WinCEPlatformNotes.page
+++ b/doc/99200-WinCEPlatformNotes.page
@@ -3,7 +3,7 @@ AAAIntroduction
 
 !!!Introduction
 
-Starting with release 1.4.0 the POCO C++ Libraries can be used on 
+Starting with release 1.4.0 the POCO C++ Libraries can be used on
 Windows CE 6. Project files for Visual Studio 2008 are provided that
 support static and shared debug and release builds.
 
@@ -14,7 +14,7 @@ The port should work for Windows CE 5 as well, however, this has not been tested
 
 The project files contain build configurations for the "Digi JumpStart (ARMV4I)"
 target. To use another target, the Visual Studio project and solution files
-must be changed accordingly. Note that the project files cannot be opened 
+must be changed accordingly. Note that the project files cannot be opened
 by Visual Studio unless the target referenced in the project and solution files is available.
 To change the project and solution files for your platform, replace
 all occurrences of the string "Digi JumpStart (ARMV4I)" with the name
@@ -28,7 +28,7 @@ files, so there's no risk breaking something).
 
 !!Poco::Environment
 
-Windows CE does not support environment variables. 
+Windows CE does not support environment variables.
 Therefore, Poco::Environment::get() and Poco::Environment::has() only support the
 following hardcoded "pseudo" environment variables:
   * TEMP
@@ -38,22 +38,22 @@ following hardcoded "pseudo" environment variables:
   * OS
   * NUMBER_OF_PROCESSORS
   * PROCESSOR_ARCHITECTURE
-  
+
 Poco::Environment::set() always throws a Poco::NotImplementedException.
 
 
 !!Date/Time Support
 
 Some date/time features are implemented with the help of [[http://wcelibcex.sourceforge.net/ WCELIBCEX]].
-The library is statically included in the Foundation library to simplify the build process. 
+The library is statically included in the Foundation library to simplify the build process.
 However, it is also possible to use WCELIBCEX as a separate library if the Foundation project file is modified accordingly
 (by removing or excluding from build the WCELIBCEX folder and modifying the header file search path accordingly).
 The following functions from WCELIBCEX are used:
   * wceex_time()
   * wceex_localtime()
   * wceex_mktime()
-  
-It should also be possible to use wcecompat instead of WCELIBCEX, as this library provides 
+
+It should also be possible to use wcecompat instead of WCELIBCEX, as this library provides
 similar features. In this case, the calls to the wceex_* functions need to be replaced with
 the wcecompat counterparts. The affected files are Random.cpp, LocalDateTime.cpp,
 Timezone_WINCE.cpp and ThreadPool.cpp.
@@ -66,7 +66,7 @@ the application.
 
 !!Poco::Path
 
-Poco::Path::listRoots() returns the root directory ("\"), as well as all mounted storage devices 
+Poco::Path::listRoots() returns the root directory ("\"), as well as all mounted storage devices
 (e.g., "\Hard Disk"), even if they are also present in the root directory.
 
 Poco::Path::current() and Poco::Path::home() always return the root directory.
@@ -91,7 +91,7 @@ samples can be used to terminate a process from the command line.
 
 !!Crypto and NetSSL
 
-Crypto and NetSSL_OpenSSL have not been tested yet. Project files are there, but they might need some adaptions depending on 
+Crypto and NetSSL_OpenSSL have not been tested yet. Project files are there, but they might need some adaptions depending on
 how OpenSSL has been built for the Windows CE target.
 
 
@@ -111,7 +111,7 @@ These are RawSocketTest::testEchoIPv4(), RawSocketTest::testSendToReceiveFromIPv
 
 !!!Build Notes
 
-Optimization settings should be set as follows for release builds 
+Optimization settings should be set as follows for release builds
 (<*Properties > Configuration Properties > C/C++ > Optimization*>):
   * Optimization: Custom
   * Inline Function Expansion: Default
@@ -120,13 +120,13 @@ Optimization settings should be set as follows for release builds
   * Favor Size or Speed: Favor Fast Code (/Ot)
   * Whole Program Optimization: No
 
-Other settings may or may not produce working programs. 
-Specifically, setting <*Optimization*> to <*Maximize Speed (/O2)*> will result in failures in the 
+Other settings may or may not produce working programs.
+Specifically, setting <*Optimization*> to <*Maximize Speed (/O2)*> will result in failures in the
 test suite for Foundation Events due to a compiler optimizer bug.
 
 For shared/DLL builds, the /FORCE:MULTIPLE option is passed to the linker. This is
-to avoid a problem with iostream classes and their methods (template instantiations), 
-which for some unknown reason (possibly bug) will be exported by the Foundation library 
+to avoid a problem with iostream classes and their methods (template instantiations),
+which for some unknown reason (possibly bug) will be exported by the Foundation library
 (and others) and thus cause multiply defined symbol errors.
 
 The reference system used for testing is a Digi ConnectCore 9P 9360 running Windows CE 6.0.
diff --git a/doc/99250-VxWorksPlatformNotes.page b/doc/99250-VxWorksPlatformNotes.page
index 8810932f2..d29d72c94 100644
--- a/doc/99250-VxWorksPlatformNotes.page
+++ b/doc/99250-VxWorksPlatformNotes.page
@@ -3,7 +3,7 @@ AAAIntroduction
 
 !!!Introduction
 
-Starting with release 1.4.1 the POCO C++ Libraries can be used on 
+Starting with release 1.4.1 the POCO C++ Libraries can be used on
 VxWorks 5.5.1 and newer. Project files for Tornado are provided that
 support debug and release builds using the Diab C++ compiler.
 
@@ -16,7 +16,7 @@ When compiling the POCO C++ Libraries for a VxWorks target, as well as
 when including POCO C++ Libraries headers in a project for a VxWorks
 target, the preprocessor macro <[POCO_VXWORKS]> must be defined. This is
 because the Diab C++ compiler does not provide a predefined macro that
-allows for reliable detection of a VxWorks target. 
+allows for reliable detection of a VxWorks target.
 
 
 !!VxWorks OS Libraries
@@ -55,7 +55,7 @@ Some OS libraries can be omitted if the POCO class requiring it
   - Poco::Environment::nodeName() returns the result of gethostname(); the host name
     can be set with sethostname().
   - Poco::Environment::processorCount() always returns 1.
-  
+
 
 !!Date/Time Support
 
@@ -70,7 +70,7 @@ Some OS libraries can be omitted if the POCO class requiring it
 
   - Poco::File::canRead() and Poco::File::canWrite() always return
     true. Poco::File::canExecute() always returns false, as does
-    Poco::File::isLink(). 
+    Poco::File::isLink().
   - Poco::File::isHidden() works the same as on Unix platforms
     (files with names starting with a period are considered hidden).
   - Poco::File::setWriteable() and Poco::File::setExecutable()
@@ -81,18 +81,18 @@ Some OS libraries can be omitted if the POCO class requiring it
 
 Poco::Path::home() returns the value of environment variable <[HOME]>, if defined,
 or else the root directory path ("/").
-  
+
 
 !!Poco::FPEnvironment
 
 The Poco::FPEnvironment class is not available on VxWorks and
 cannot be used.
-    
-    
+
+
 !!Poco::Process, Poco::Pipe, Poco::SharedMemory, Poco::NamedEvent, Poco::NamedMutex
 
 VxWorks does not support processes and POCO makes no attempt
-to hide this fact. Poco::Process, Poco::Pipe (and related stream classes), 
+to hide this fact. Poco::Process, Poco::Pipe (and related stream classes),
 Poco::SharedMemory, Poco::NamedEvent and Poco::NamedMutex are not available on VxWorks.
 
 
@@ -104,7 +104,7 @@ On VxWorks, Poco::RWLock is an ordinary mutex.
 !!Poco::SharedLibrary
 
 Symbol lookup (Poco::SharedLibrary::hasSymbol() and Poco::SharedLibrary::getSymbol()) is
-slow, as the entire symbol table has to be searched sequentially (using symEach()) 
+slow, as the entire symbol table has to be searched sequentially (using symEach())
 to find a symbol defined in a specific module.
 
 
@@ -116,7 +116,7 @@ not support std::wstring.
 
 !!Poco::Util::Application
 
-The macro <[POCO_APP_MAIN]> defines a function 
+The macro <[POCO_APP_MAIN]> defines a function
 
     int pocoAppMain(const char* appName, ...);
 ----
@@ -132,7 +132,7 @@ list of command-line arguments must be terminated by a NULL argument.
 An application waiting in Poco::Util::ServerApplication::waitForTerminationRequest()
 can be shut down by calling Poco::Util::ServerApplication::terminate().
 
-The macro <[POCO_SERVER_MAIN]> defines a function 
+The macro <[POCO_SERVER_MAIN]> defines a function
 
     int pocoSrvMain(const char* appName, ...);
 ----
@@ -170,9 +170,9 @@ will generate the project files (.wpj). On Windows, a Cygwin installation
 is required to run this script. Project files are
 generated from VxWorks build description files (<**.vxbuild*>),
 which are present in all library directories (<*$POCO_BASE/Foundation*>,
-<*$POCO_BASE/XML*>, etc.) of libraries that are available on VxWorks. Also 
-required are build configuration files that specify the build settings 
-for a specific target architecture. These are located in 
+<*$POCO_BASE/XML*>, etc.) of libraries that are available on VxWorks. Also
+required are build configuration files that specify the build settings
+for a specific target architecture. These are located in
 <*$POCO_BASE/build/vxconfig*>. To generate
 a Tornado project file, run the <[vxprogen]> script from the
 respective directory and pass the name(s) of the desired build configuration
diff --git a/doc/99300-AndroidPlatformNotes.page b/doc/99300-AndroidPlatformNotes.page
index edf5e5c93..aac4f82aa 100644
--- a/doc/99300-AndroidPlatformNotes.page
+++ b/doc/99300-AndroidPlatformNotes.page
@@ -5,7 +5,7 @@ AAAIntroduction
 
 Starting with release 1.4.2 the POCO C++ Libraries can be used on
 Android.
-In the past the android NDK used a gmake-based build system. They provided a 
+In the past the android NDK used a gmake-based build system. They provided a
 a standalone "customized" toolchain. Also they used gcc and the gnu-stl as
 build environment. But these are all obsolete.
 
@@ -15,17 +15,17 @@ standard library.
 
 !!!Requirements
 
-To build Poco for android you need as minimum the android NDK plus cmake executable. 
-You can download the newest NDK from: https://developer.android.com/ndk and 
-cmake from http://www.cmake.org or if you have already installed Android SDK, 
+To build Poco for android you need as minimum the android NDK plus cmake executable.
+You can download the newest NDK from: https://developer.android.com/ndk and
+cmake from http://www.cmake.org or if you have already installed Android SDK,
 then install the NDK and cmake executable via the <*Android SDK Manager*>.
 
 !!!Quick start
 
-<path_to_android_sdk>/cmake/<cmake_version>/bin/cmake 
--H<path_to_poco_sourcen> 
--B/tmp/poco-build 
--G'Ninja' 
+<path_to_android_sdk>/cmake/<cmake_version>/bin/cmake
+-H<path_to_poco_sourcen>
+-B/tmp/poco-build
+-G'Ninja'
 -DCMAKE_BUILD_TYPE=Release
 -DCMAKE_MAKE_PROGRAM=<path_to_android_sdk>/cmake/<cmake_version>/bin/ninja
 -DCMAKE_TOOLCHAIN_FILE=<path_to_android_sdk>/ndk-bundle/build/cmake/android.toolchain.cmake
@@ -48,7 +48,7 @@ also the ninja build tool:
 
 The easiest way is to set the PATH environment to <path_to_android_sdk>/cmake/<cmake_version>/bin
 then cmake and ninja is found via the environment.
-If you not set the PATH environment you should add -DCMAKE_MAKE_PROGRAM=<path_to_android_sdk>/cmake/<cmake_version>/bin/ninja 
+If you not set the PATH environment you should add -DCMAKE_MAKE_PROGRAM=<path_to_android_sdk>/cmake/<cmake_version>/bin/ninja
 as parameter for cmake.
 
 If you have didn't installed the Android SDK, it is also possible to use make as build tool:
@@ -56,8 +56,8 @@ If you have didn't installed the Android SDK, it is also possible to use make as
 or
 <path_to_android_sdk>/ndk/<ndk_version>/prebuilt/linux-x86_64/bin/make
 
-The easiest way is to set the PATH environment to <path_to_android_sdk>/ndk/<ndk_version>/prebuilt/linux-x86_64/bin. 
-If you not set the PATH environment you should add -DCMAKE_MAKE_PROGRAM=<path_to_android_sdk>/ndk/<ndk_version>/prebuilt/linux-x86_64/bin/make 
+The easiest way is to set the PATH environment to <path_to_android_sdk>/ndk/<ndk_version>/prebuilt/linux-x86_64/bin.
+If you not set the PATH environment you should add -DCMAKE_MAKE_PROGRAM=<path_to_android_sdk>/ndk/<ndk_version>/prebuilt/linux-x86_64/bin/make
 as parameter for cmake.
 
 The toolchain file can be found in the android NDK:
@@ -75,10 +75,10 @@ cmake -H<path_to_poco_sourcen> -B<path_to_build_dir>/poco_build -G'Ninja' -DCMAK
 
 To build with the tools from the Android SDK:
 
-<path_to_android_sdk>/cmake/<cmake_version>/bin/cmake 
--H<path_to_poco_sourcen> 
--B/tmp/poco-build 
--G'Ninja' 
+<path_to_android_sdk>/cmake/<cmake_version>/bin/cmake
+-H<path_to_poco_sourcen>
+-B/tmp/poco-build
+-G'Ninja'
 -DCMAKE_BUILD_TYPE=Release
 -DCMAKE_MAKE_PROGRAM=<path_to_android_sdk>/cmake/<cmake_version>/bin/ninja
 -DCMAKE_TOOLCHAIN_FILE=<path_to_android_sdk>/ndk-bundle/build/cmake/android.toolchain.cmake
diff --git a/packaging/README.md b/packaging/README.md
index 4b3613357..ec43637d6 100644
--- a/packaging/README.md
+++ b/packaging/README.md
@@ -3,7 +3,7 @@ POCO C++ Distribution
 
 This repository contains packaged Poco releases for various platforms and
 successive versions of Poco starting from release Poco-1.6.1.
- 
+
 CHANGELOG contains all changes for the following releases
 
 - Release 1.7.8p4 (2017-08-11)
@@ -99,7 +99,7 @@ POrtable COmponents C++ Libraries are:
 To start using POCO, see the [Guided Tour](http://pocoproject.org/docs-1.5.3/00100-GuidedTour.html) and [Getting Started](http://pocoproject.org/docs-1.5.3/00200-GettingStarted.html) documents.
 
 ----
-POCO has an active user and contributing community, please visit our [web site](http://pocoproject.org), [forum](http://pocoproject.org/forum) and [blog](http://pocoproject.org/blog). 
+POCO has an active user and contributing community, please visit our [web site](http://pocoproject.org), [forum](http://pocoproject.org/forum) and [blog](http://pocoproject.org/blog).
 Answers to POCO-related questions can also be found on [Stack Overflow](http://stackoverflow.com/questions/tagged/poco-libraries).
 
 ----
@@ -108,4 +108,4 @@ POCO is best thought of as a Boost complement (rather than replacement).
 Side-by-side use of Boost and POCO is a very common occurrence.
 
 
- 
+
diff --git a/packaging/README.txt b/packaging/README.txt
index 6c061835e..0745d6eb4 100644
--- a/packaging/README.txt
+++ b/packaging/README.txt
@@ -15,7 +15,7 @@ POrtable COmponents C++ Libraries are:
 To start using POCO, see the [Guided Tour](http://pocoproject.org/docs-1.5.3/00100-GuidedTour.html) and [Getting Started](http://pocoproject.org/docs-1.5.3/00200-GettingStarted.html) documents.
 
 ----
-POCO has an active user and contributing community, please visit our [web site](http://pocoproject.org), [forum](http://pocoproject.org/forum) and [blog](http://pocoproject.org/blog). 
+POCO has an active user and contributing community, please visit our [web site](http://pocoproject.org), [forum](http://pocoproject.org/forum) and [blog](http://pocoproject.org/blog).
 Answers to POCO-related questions can also be found on [Stack Overflow](http://stackoverflow.com/questions/tagged/poco-libraries).
 
 ----
diff --git a/packaging/Windows/NuGet/Poco.shared.nuspec b/packaging/Windows/NuGet/Poco.shared.nuspec
index 2e1d83edf..e1fd6cd6e 100644
--- a/packaging/Windows/NuGet/Poco.shared.nuspec
+++ b/packaging/Windows/NuGet/Poco.shared.nuspec
@@ -18,8 +18,8 @@
     <repository type='git' url='git@github.com:pocoproject/poco.git' branch='poco-$version$' />
     <dependencies>
       <dependency id='Poco.$id$.vs$vs$.noarch' version='$version$' />
-<dependency id='Poco.Foundation.vs$vs$.shared' version='$version$' /> 
-<dependency id='Poco.Net.vs$vs$.shared' version='$version$' /> 
+<dependency id='Poco.Foundation.vs$vs$.shared' version='$version$' />
+<dependency id='Poco.Net.vs$vs$.shared' version='$version$' />
      </dependencies>
   </metadata>
   <files>
diff --git a/packaging/Windows/NuGet/Poco.static.nuspec b/packaging/Windows/NuGet/Poco.static.nuspec
index 5810c78b6..a2e839196 100644
--- a/packaging/Windows/NuGet/Poco.static.nuspec
+++ b/packaging/Windows/NuGet/Poco.static.nuspec
@@ -18,8 +18,8 @@
     <repository type='git' url='git@github.com:pocoproject/poco.git' branch='poco-$version$' />
     <dependencies>
       <dependency id='Poco.$id$.vs$vs$.noarch' version='$version$' />
-<dependency id='Poco.Foundation.vs$vs$.static' version='$version$' /> 
-<dependency id='Poco.Net.vs$vs$.static' version='$version$' /> 
+<dependency id='Poco.Foundation.vs$vs$.static' version='$version$' />
+<dependency id='Poco.Net.vs$vs$.static' version='$version$' />
      </dependencies>
   </metadata>
   <files>
diff --git a/packaging/Windows/NuGet/Poco.static.targets b/packaging/Windows/NuGet/Poco.static.targets
index 7e3baa278..771de499d 100644
--- a/packaging/Windows/NuGet/Poco.static.targets
+++ b/packaging/Windows/NuGet/Poco.static.targets
@@ -11,4 +11,4 @@
         <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
-</Project> 
\ No newline at end of file
+</Project>
diff --git a/packaging/Windows/NuGet/bap.cmd b/packaging/Windows/NuGet/bap.cmd
index 6b4de6cd7..de16eb90d 100644
--- a/packaging/Windows/NuGet/bap.cmd
+++ b/packaging/Windows/NuGet/bap.cmd
@@ -1,7 +1,7 @@
 echo off
 rem  Usage:
 rem  ------
-rem  bap [vsvers] [release]       // bpp 150 1.10.1 
+rem  bap [vsvers] [release]       // bpp 150 1.10.1
 rem  ------
 setlocal
 if "%1"=="" goto usage
@@ -18,7 +18,7 @@ goto exit
 :usage
 echo Usage:
 echo ------
-echo bap [vsvers] [release]      // bpp 150 1.10.1 
+echo bap [vsvers] [release]      // bpp 150 1.10.1
 echo ------
 :exit
 endlocal
diff --git a/packaging/Windows/NuGet/pack.cmd b/packaging/Windows/NuGet/pack.cmd
index 2483665b1..74b898de1 100644
--- a/packaging/Windows/NuGet/pack.cmd
+++ b/packaging/Windows/NuGet/pack.cmd
@@ -1,7 +1,7 @@
 echo off
 rem echo Usage:
 rem echo ------
-rem echo pack (shared | static) [vsvers] [release]       // pack shared 150 1.10.1 
+rem echo pack (shared | static) [vsvers] [release]       // pack shared 150 1.10.1
 rem echo ------
 setlocal enableextensions enabledelayedexpansion
 if "%1"=="" goto usage
@@ -27,14 +27,14 @@ for %%G in (Data/SQLite Data/ODBC Data/MySQL Data/PostgreSQL Foundation Encoding
 	if [%%G] == [Data/MySQL] 		set module=DataMySQL		& set inc=Data\MySQL
 	if [%%G] == [Data/PostgreSQL] 	set module=DataPostgreSQL	& set inc=Data\PostgreSQL
 	call nuget pack Poco.noarch.nuspec 									-p vs=%2 -p version=%3 -p id=!module! -p inc=!inc!
-	call nuget pack Poco.%1.nuspec -symbols -symbolpackageformat snupkg	-p vs=%2 -p version=%3 -p id=!module! -p mode=%1 
+	call nuget pack Poco.%1.nuspec -symbols -symbolpackageformat snupkg	-p vs=%2 -p version=%3 -p id=!module! -p mode=%1
 )
 
 goto exit
 :usage
 echo Usage:
 echo ------
-echo "pack (shared | static) [vsvers] [release]"       // pack shared 150 1.10.1 
+echo "pack (shared | static) [vsvers] [release]"       // pack shared 150 1.10.1
 echo ------
 :exit
 endlocal
diff --git a/release/script/mkrel b/release/script/mkrel
index 1bb0e9f45..9c324416f 100755
--- a/release/script/mkrel
+++ b/release/script/mkrel
@@ -43,7 +43,7 @@ do
 	elif [ "$1" = "-c" ] ; then
 		shift
 		lineEndConv=$1
-		shift	
+		shift
 	else
 		spec=$1
 		shift
diff --git a/release/spec/all.release b/release/spec/all.release
index 55acdf124..2181ff321 100644
--- a/release/spec/all.release
+++ b/release/spec/all.release
@@ -13,3 +13,4 @@ MongoDB
 Redis
 ActiveRecord
 ActiveRecord/Compiler
+Prometheus
diff --git a/tsan.suppress b/tsan.suppress
new file mode 100644
index 000000000..c35a7079d
--- /dev/null
+++ b/tsan.suppress
@@ -0,0 +1,25 @@
+# Suppressed thread sanitizer tests
+#
+# https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions
+#
+# To apply:
+# export TSAN_OPTIONS="suppressions=$POCO_BASE/tsan.supress,second_deadlock_stack=1"
+
+##############
+# Suppressions:
+##############
+
+#
+# Foundation
+#
+
+# ActiveDispatcher false positives
+# strictly speaking, yes - ActiveDispatcher::run() is started
+# in a thread before the inheriting object is fully constructed;
+# however, nothing can happen there before some events are
+# enqueued, which can't happen until after the inheriting object
+# is fully constructed
+race:ActiveDispatcherTest
+race:ArchiveStrategy::moveFile
+
+race:ThreadTest::testNotJoin